From 38a126df66092487803d2759c1698fa86a5be01d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 11 Jun 2018 08:34:19 -0500 Subject: Rename field_map_obj to event_object_movement --- asm/field_ground_effect.s | 108 - data/event_object_movement.s | 1731 +++++++++++ data/field_map_obj.s | 1731 ----------- data/map_obj_8097404.s | 2 +- include/event_object_movement.h | 103 + include/event_object_movement_helpers.h | 35 + include/field_map_obj.h | 103 - include/field_map_obj_helpers.h | 35 - ld_script.txt | 6 +- src/battle_setup.c | 4 +- src/berry_tag_screen.c | 2 +- src/bike.c | 2 +- src/decoration.c | 2 +- src/event_object_movement.c | 5176 +++++++++++++++++++++++++++++++ src/event_object_movement_helpers.c | 705 +++++ src/field_camera.c | 2 +- src/field_effect.c | 4 +- src/field_map_obj.c | 5119 ------------------------------ src/field_map_obj_helpers.c | 705 ----- 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 +- 36 files changed, 7785 insertions(+), 7836 deletions(-) create mode 100644 data/event_object_movement.s delete mode 100644 data/field_map_obj.s create mode 100644 include/event_object_movement.h create mode 100644 include/event_object_movement_helpers.h delete mode 100644 include/field_map_obj.h delete mode 100644 include/field_map_obj_helpers.h create mode 100644 src/event_object_movement.c create mode 100755 src/event_object_movement_helpers.c delete mode 100644 src/field_map_obj.c delete mode 100755 src/field_map_obj_helpers.c diff --git a/asm/field_ground_effect.s b/asm/field_ground_effect.s index 2152a5c5b..05f8ffce0 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/event_object_movement.s b/data/event_object_movement.s new file mode 100644 index 000000000..844612a7c --- /dev/null +++ b/data/event_object_movement.s @@ -0,0 +1,1731 @@ +#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 + +gUnknown_0850557C:: @ 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 + .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/field_map_obj.s b/data/field_map_obj.s deleted file mode 100644 index 844612a7c..000000000 --- a/data/field_map_obj.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 - -gUnknown_0850557C:: @ 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 - .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/map_obj_8097404.s b/data/map_obj_8097404.s index 719a78266..b30e4b6d7 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/event_object_movement.h b/include/event_object_movement.h new file mode 100644 index 000000000..1bf3915e1 --- /dev/null +++ b/include/event_object_movement.h @@ -0,0 +1,103 @@ +#ifndef GUARD_FIELD_MAP_OBJ_H +#define GUARD_FIELD_MAP_OBJ_H + +#define NUM_OBJECT_GRAPHICS_INFO 239 +#define SPRITE_VAR 240 + +// Exported struct declarations + +enum SpinnerRunnerFollowPatterns { + RUNFOLLOW_ANY, + RUNFOLLOW_NORTH_SOUTH, + RUNFOLLOW_EAST_WEST, + RUNFOLLOW_NORTH_WEST, + RUNFOLLOW_NORTH_EAST, + RUNFOLLOW_SOUTH_WEST, + RUNFOLLOW_SOUTH_EAST, + RUNFOLLOW_NORTH_SOUTH_WEST, + RUNFOLLOW_NORTH_SOUTH_EAST, + RUNFOLLOW_NORTH_EAST_WEST, + RUNFOLLOW_SOUTH_EAST_WEST +}; + +// Exported RAM declarations + +// Exported ROM declarations + +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 sub_808D4F4(void); +void RemoveFieldObjectByLocalIdAndMap(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); +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); +void sub_80930E0(s16 *, s16 *, s16, s16); +void FieldObjectClearAnim(struct MapObject *); +void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *); +void SpawnFieldObjectsInView(s16, s16); +u8 sprite_new(u8, u8, s16, s16, u8, u8); +u8 AddPseudoFieldObject(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 *); +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 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 sub_808F254(u8, u8, u8); +void FieldObjectStep(struct MapObject *, struct Sprite *, bool8(struct MapObject *, struct Sprite *)); +u8 FieldObjectFaceOppositeDirection(struct MapObject *, 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); +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); +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); +u8 GetFaceDirectionAnimId(u32); +u8 GetGoSpeed0AnimId(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); +u8 AddCameraObject(u8 linkedSpriteId); +void UpdateFieldObjectsForCameraUpdate(s16 x, s16 y); +u8 GetSimpleGoAnimId(u32); +u8 sub_8093514(u32); + +// Exported data declarations + +extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; + +#endif //GUARD_FIELD_MAP_OBJ_H diff --git a/include/event_object_movement_helpers.h b/include/event_object_movement_helpers.h new file mode 100644 index 000000000..2e9f1d0cc --- /dev/null +++ b/include/event_object_movement_helpers.h @@ -0,0 +1,35 @@ +#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_map_obj.h b/include/field_map_obj.h deleted file mode 100644 index 1bf3915e1..000000000 --- a/include/field_map_obj.h +++ /dev/null @@ -1,103 +0,0 @@ -#ifndef GUARD_FIELD_MAP_OBJ_H -#define GUARD_FIELD_MAP_OBJ_H - -#define NUM_OBJECT_GRAPHICS_INFO 239 -#define SPRITE_VAR 240 - -// Exported struct declarations - -enum SpinnerRunnerFollowPatterns { - RUNFOLLOW_ANY, - RUNFOLLOW_NORTH_SOUTH, - RUNFOLLOW_EAST_WEST, - RUNFOLLOW_NORTH_WEST, - RUNFOLLOW_NORTH_EAST, - RUNFOLLOW_SOUTH_WEST, - RUNFOLLOW_SOUTH_EAST, - RUNFOLLOW_NORTH_SOUTH_WEST, - RUNFOLLOW_NORTH_SOUTH_EAST, - RUNFOLLOW_NORTH_EAST_WEST, - RUNFOLLOW_SOUTH_EAST_WEST -}; - -// Exported RAM declarations - -// Exported ROM declarations - -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 sub_808D4F4(void); -void RemoveFieldObjectByLocalIdAndMap(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); -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); -void sub_80930E0(s16 *, s16 *, s16, s16); -void FieldObjectClearAnim(struct MapObject *); -void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *); -void SpawnFieldObjectsInView(s16, s16); -u8 sprite_new(u8, u8, s16, s16, u8, u8); -u8 AddPseudoFieldObject(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 *); -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 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 sub_808F254(u8, u8, u8); -void FieldObjectStep(struct MapObject *, struct Sprite *, bool8(struct MapObject *, struct Sprite *)); -u8 FieldObjectFaceOppositeDirection(struct MapObject *, 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); -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); -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); -u8 GetFaceDirectionAnimId(u32); -u8 GetGoSpeed0AnimId(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); -u8 AddCameraObject(u8 linkedSpriteId); -void UpdateFieldObjectsForCameraUpdate(s16 x, s16 y); -u8 GetSimpleGoAnimId(u32); -u8 sub_8093514(u32); - -// Exported data declarations - -extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; - -#endif //GUARD_FIELD_MAP_OBJ_H diff --git a/include/field_map_obj_helpers.h b/include/field_map_obj_helpers.h deleted file mode 100644 index 2e9f1d0cc..000000000 --- a/include/field_map_obj_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/ld_script.txt b/ld_script.txt index f7e531fce..51e641fd1 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 48a2ef257..5411551f7 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 9a6e78c81..a755f4f44 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 e827707cd..d413989f0 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 08287a3cc..2fbd247a6 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/event_object_movement.c b/src/event_object_movement.c new file mode 100644 index 000000000..d847599b8 --- /dev/null +++ b/src/event_object_movement.c @@ -0,0 +1,5176 @@ +// Includes + +#include "global.h" +#include "malloc.h" +#include "sprite.h" +#include "overworld.h" +#include "random.h" +#include "event_scripts.h" +#include "berry.h" +#include "palette.h" +#include "field_player_avatar.h" +#include "fieldmap.h" +#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" +#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" + +#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->mapobj_unk_21 == (catch) && mapObject->coords1.coord == mapObject->coords2.coord)\ + {\ + mapObject->mapobj_unk_21 = (catch) + 1;\ + }\ + return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, route);\ +}\ + +// Static struct declarations + +// Static RAM declarations + +extern u8 gUnknown_020375B4; +extern u16 gUnknown_020375B6; + +// 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); +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 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 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*/ struct MapObjectTemplate *FindFieldObjectTemplateInArrayByLocalId(u8 localId, struct MapObjectTemplate *templates, u8 count); +void npc_reset(struct MapObject *, struct Sprite *); +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); +u8 GetJumpLedgeAnimId(u32); +void sub_8092F88(u32, s16 *, s16 *, s16, s16); + +bool8 FieldObjectExecRegularAnim(struct MapObject *, struct Sprite *); +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); +/*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 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 *); + +// 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 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]; + +/*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) +{ + *mapObject = (struct MapObject){}; + mapObject->localId = 0xFF; + mapObject->mapNum = -1; + mapObject->mapGroup = -1; + mapObject->mapobj_unk_1C = -1; +} + +static void npcs_clear_ids_and_state(void) +{ + u8 i; + + for (i = 0; i < NUM_FIELD_OBJECTS; i ++) + { + npc_clear_ids_and_state(&gMapObjects[i]); + } +} + +void sub_808D438(void) +{ + ZeroAllLinkPlayerMapObjects(); + npcs_clear_ids_and_state(); + ClearPlayerAvatarInfo(); + sub_808D450(); +} + +static void sub_808D450(void) +{ + u8 spriteIdx; + + 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; +} + +u8 sub_808D4F4(void) +{ + u8 i; + + for (i = 0; i < NUM_FIELD_OBJECTS; i ++) + { + if (!gMapObjects[i].active) + { + break; + } + } + return i; +} + +u8 GetFieldObjectIdByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId) +{ + if (localId < 0xff) + { + return GetFieldObjectIdByLocalIdAndMapInternal(localId, mapId, mapGroupId); + } + return GetFieldObjectIdByLocalId(localId); +} + +bool8 TryGetFieldObjectIdByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId, u8 *fieldObjectId) +{ + *fieldObjectId = GetFieldObjectIdByLocalIdAndMap(localId, mapId, mapGroupId); + if (*fieldObjectId == NUM_FIELD_OBJECTS) + { + return TRUE; + } + return FALSE; +} + +u8 GetFieldObjectIdByXY(s16 x, s16 y) +{ + u8 i; + + for (i = 0; i < NUM_FIELD_OBJECTS; i ++) + { + if (gMapObjects[i].active && gMapObjects[i].coords2.x == x && gMapObjects[i].coords2.y == y) + { + break; + } + } + return i; +} + +static u8 GetFieldObjectIdByLocalIdAndMapInternal(u8 localId, u8 mapId, u8 mapGroupId) +{ + u8 i; + + for (i = 0; i < NUM_FIELD_OBJECTS; i ++) + { + if (gMapObjects[i].active && gMapObjects[i].localId == localId && gMapObjects[i].mapNum == mapId && gMapObjects[i].mapGroup == mapGroupId) + { + return i; + } + } + return NUM_FIELD_OBJECTS; +} + +static u8 GetFieldObjectIdByLocalId(u8 localId) +{ + u8 i; + + for (i = 0; i < NUM_FIELD_OBJECTS; i ++) + { + if (gMapObjects[i].active && gMapObjects[i].localId == localId) + { + return i; + } + } + return NUM_FIELD_OBJECTS; +} + +// This function has the same nonmatching quirk as in Ruby/Sapphire. +#ifdef NONMATCHING +static u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 mapNum, u8 mapGroup) +{ + struct MapObject *mapObject; + 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)) + { + return NUM_FIELD_OBJECTS; + } + mapObject = &gMapObjects[slot]; + npc_clear_ids_and_state(mapObject); + x = template->x + 7; + y = template->y + 7; + mapObject->active = TRUE; + mapObject->mapobj_bit_2 = TRUE; + mapObject->graphicsId = template->graphicsId; + mapObject->animPattern = 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; + // 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); + FieldObjectHandleDynamicGraphicsId(mapObject); + + if (gUnknown_0850557C[mapObject->animPattern]) + { + if ((mapObject->range.as_nybbles.x) == 0) + { + // r9 is invoked here + mapObject->range.as_nybbles.x ++; + } + if ((mapObject->range.as_nybbles.y) == 0) + { + mapObject->range.as_nybbles.y ++; + } + } + return slot; +} +#else +static NAKED u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 mapId, u8 mapGroupId) +{ + asm_unified("\tpush {r4-r7,lr}\n" + "\tmov r7, r9\n" + "\tmov r6, r8\n" + "\tpush {r6,r7}\n" + "\tsub sp, 0x4\n" + "\tadds r5, r0, 0\n" + "\tlsls r1, 24\n" + "\tlsrs r6, r1, 24\n" + "\tlsls r2, 24\n" + "\tlsrs r7, r2, 24\n" + "\tldrb r0, [r5]\n" + "\tadds r1, r6, 0\n" + "\tadds r2, r7, 0\n" + "\tmov r3, sp\n" + "\tbl GetAvailableFieldObjectSlot\n" + "\tlsls r0, 24\n" + "\tcmp r0, 0\n" + "\tbeq _0808D66E\n" + "\tmovs r0, 0x10\n" + "\tb _0808D762\n" + "_0808D66E:\n" + "\tmov r0, sp\n" + "\tldrb r1, [r0]\n" + "\tlsls r0, r1, 3\n" + "\tadds r0, r1\n" + "\tlsls r0, 2\n" + "\tldr r1, =gMapObjects\n" + "\tadds r4, r0, r1\n" + "\tadds r0, r4, 0\n" + "\tbl npc_clear_ids_and_state\n" + "\tldrh r3, [r5, 0x4]\n" + "\tadds r3, 0x7\n" + "\tlsls r3, 16\n" + "\tlsrs r3, 16\n" + "\tldrh r2, [r5, 0x6]\n" + "\tadds r2, 0x7\n" + "\tlsls r2, 16\n" + "\tlsrs r2, 16\n" + "\tldrb r0, [r4]\n" + "\tmovs r1, 0x1\n" + "\torrs r0, r1\n" + "\tmovs r1, 0x4\n" + "\torrs r0, r1\n" + "\tstrb r0, [r4]\n" + "\tldrb r0, [r5, 0x1]\n" + "\tstrb r0, [r4, 0x5]\n" + "\tldrb r0, [r5, 0x9]\n" + "\tstrb r0, [r4, 0x6]\n" + "\tldrb r0, [r5]\n" + "\tstrb r0, [r4, 0x8]\n" + "\tstrb r6, [r4, 0x9]\n" + "\tstrb r7, [r4, 0xA]\n" + "\tstrh r3, [r4, 0xC]\n" + "\tstrh r2, [r4, 0xE]\n" + "\tstrh r3, [r4, 0x10]\n" + "\tstrh r2, [r4, 0x12]\n" + "\tstrh r3, [r4, 0x14]\n" + "\tstrh r2, [r4, 0x16]\n" + "\tldrb r0, [r5, 0x8]\n" + "\tmovs r7, 0xF\n" + "\tadds r1, r7, 0\n" + "\tands r1, r0\n" + "\tldrb r2, [r4, 0xB]\n" + "\tmovs r0, 0x10\n" + "\tnegs r0, r0\n" + "\tmov r8, r0\n" + "\tands r0, r2\n" + "\torrs r0, r1\n" + "\tstrb r0, [r4, 0xB]\n" + "\tldrb r1, [r5, 0x8]\n" + "\tlsls r1, 4\n" + "\tands r0, r7\n" + "\torrs r0, r1\n" + "\tstrb r0, [r4, 0xB]\n" + "\tldrb r1, [r5, 0xA]\n" + "\tlsls r1, 28\n" + "\tmovs r0, 0xF\n" + "\tmov r9, r0\n" + "\tlsrs r1, 28\n" + "\tldrb r2, [r4, 0x19]\n" + "\tmov r0, r8\n" + "\tands r0, r2\n" + "\torrs r0, r1\n" + "\tstrb r0, [r4, 0x19]\n" + "\tldrb r1, [r5, 0xA]\n" + "\tlsrs r1, 4\n" + "\tlsls r1, 4\n" + "\tands r0, r7\n" + "\torrs r0, r1\n" + "\tstrb r0, [r4, 0x19]\n" + "\tldrh r0, [r5, 0xC]\n" + "\tstrb r0, [r4, 0x7]\n" + "\tldrh r0, [r5, 0xE]\n" + "\tstrb r0, [r4, 0x1D]\n" + "\tldr r1, =gUnknown_085055CD\n" + "\tldrb r0, [r5, 0x9]\n" + "\tadds r0, r1\n" + "\tldrb r1, [r0]\n" + "\tadds r0, r4, 0\n" + "\tadds r0, 0x20\n" + "\tstrb r1, [r0]\n" + "\tldrb r1, [r0]\n" + "\tadds r0, r4, 0\n" + "\tbl FieldObjectSetDirection\n" + "\tadds r0, r4, 0\n" + "\tbl FieldObjectHandleDynamicGraphicsId\n" + "\tldr r1, =gUnknown_0850557C\n" + "\tldrb r0, [r4, 0x6]\n" + "\tadds r0, r1\n" + "\tldrb r0, [r0]\n" + "\tcmp r0, 0\n" + "\tbeq _0808D75E\n" + "\tldrb r2, [r4, 0x19]\n" + "\tadds r0, r7, 0\n" + "\tands r0, r2\n" + "\tcmp r0, 0\n" + "\tbne _0808D746\n" + "\tlsls r0, r2, 28\n" + "\tlsrs r0, 28\n" + "\tadds r0, 0x1\n" + "\tmov r1, r9\n" + "\tands r0, r1\n" + "\tmov r1, r8\n" + "\tands r1, r2\n" + "\torrs r1, r0\n" + "\tstrb r1, [r4, 0x19]\n" + "_0808D746:\n" + "\tldrb r2, [r4, 0x19]\n" + "\tmovs r0, 0xF0\n" + "\tands r0, r2\n" + "\tcmp r0, 0\n" + "\tbne _0808D75E\n" + "\tlsrs r1, r2, 4\n" + "\tadds r1, 0x1\n" + "\tlsls r1, 4\n" + "\tadds r0, r7, 0\n" + "\tands r0, r2\n" + "\torrs r0, r1\n" + "\tstrb r0, [r4, 0x19]\n" + "_0808D75E:\n" + "\tmov r0, sp\n" + "\tldrb r0, [r0]\n" + "_0808D762:\n" + "\tadd sp, 0x4\n" + "\tpop {r3,r4}\n" + "\tmov r8, r3\n" + "\tmov r9, r4\n" + "\tpop {r4-r7}\n" + "\tpop {r1}\n" + "\tbx r1\n" + ".pool"); +} +#endif + +u8 unref_sub_808D77C(u8 localId) +{ + u8 i; + u8 nObjects; + struct MapObjectTemplate *template; + + if (gMapHeader.events != NULL) + { + if (InBattlePyramid()) + { + nObjects = sub_81AAA40(); + } + else if (InTrainerHill()) + { + nObjects = 2; + } + else + { + nObjects = gMapHeader.events->mapObjectCount; + } + for (i = 0; i < nObjects; i ++) + { + template = &gSaveBlock1Ptr->mapObjectTemplates[i]; + if (template->localId == localId && !FlagGet(template->flagId)) + { + return InitFieldObjectStateFromTemplate(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + } + } + } + return NUM_FIELD_OBJECTS; +} + +static bool8 GetAvailableFieldObjectSlot(u16 localId, u8 mapNum, u8 mapGroup, u8 *result) +// Looks for an empty slot. +// Returns FALSE and the location of the available slot +// in *result. +// If no slots are available, or if the object is already +// loaded, returns TRUE. +{ + u8 i = 0; + + for (i = 0; i < NUM_FIELD_OBJECTS; i ++) + { + if (!gMapObjects[i].active) + break; + if (gMapObjects[i].localId == localId && gMapObjects[i].mapNum == mapNum && gMapObjects[i].mapGroup == mapGroup) + return TRUE; + } + if (i >= NUM_FIELD_OBJECTS) + return TRUE; + *result = i; + do + { + if (gMapObjects[i].active && gMapObjects[i].localId == localId && gMapObjects[i].mapNum == mapNum && gMapObjects[i].mapGroup == mapGroup) + return TRUE; + i ++; + } while (i < NUM_FIELD_OBJECTS); + return FALSE; +} + +static void RemoveFieldObject(struct MapObject *mapObject) +{ + mapObject->active = FALSE; + RemoveFieldObjectInternal(mapObject); +} + +void RemoveFieldObjectByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +{ + u8 index; + if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &index)) + { + FlagSet(GetFieldObjectFlagIdByFieldObjectId(index)); + RemoveFieldObject(&gMapObjects[index]); + } +} + +static void RemoveFieldObjectInternal(struct MapObject *mapObject) +{ + struct SpriteFrameImage image; + image.size = GetFieldObjectGraphicsInfo(mapObject->graphicsId)->size; + gSprites[mapObject->spriteId].images = ℑ + DestroySprite(&gSprites[mapObject->spriteId]); +} + +void unref_sub_808D958(void) +{ + u8 i; + + for (i = 0; i < NUM_FIELD_OBJECTS; i ++) + { + if (i != gPlayerAvatar.mapObjectId) + { + RemoveFieldObject(&gMapObjects[i]); + } + } +} + +static u8 SpawnFieldObjectInternal(struct MapObjectTemplate *mapObjectTemplate, struct SpriteTemplate *spriteTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY) +{ + struct MapObject *mapObject; + const struct MapObjectGraphicsInfo *graphicsInfo; + struct Sprite *sprite; + u8 mapObjectId; + u8 paletteSlot; + u8 spriteId; + + mapObjectId = InitFieldObjectStateFromTemplate(mapObjectTemplate, mapNum, mapGroup); + if (mapObjectId == NUM_FIELD_OBJECTS) + { + return NUM_FIELD_OBJECTS; + } + mapObject = &gMapObjects[mapObjectId]; + graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId); + paletteSlot = graphicsInfo->paletteSlot; + if (paletteSlot == 0) + { + npc_load_two_palettes__no_record(graphicsInfo->paletteTag1, 0); + } + else if (paletteSlot == 10) + { + npc_load_two_palettes__and_record(graphicsInfo->paletteTag1, 10); + } + else if (paletteSlot >= 16) + { + paletteSlot -= 16; + sub_808EAB0(graphicsInfo->paletteTag1, paletteSlot); + } + if (mapObject->animPattern == 0x4c) + { + mapObject->mapobj_bit_13 = TRUE; + } + *(u16 *)&spriteTemplate->paletteTag = 0xFFFF; + spriteId = CreateSprite(spriteTemplate, 0, 0, 0); + if (spriteId == MAX_SPRITES) + { + gMapObjects[mapObjectId].active = FALSE; + return NUM_FIELD_OBJECTS; + } + sprite = &gSprites[spriteId]; + sub_8092FF0(mapObject->coords2.x + cameraX, mapObject->coords2.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->mapobj_bit_12 = graphicsInfo->inanimate; + if (!mapObject->mapobj_bit_12) + { + StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObject->mapobj_unk_18)); + } + SetObjectSubpriorityByZCoord(mapObject->elevation, sprite, 1); + sub_8096518(mapObject, sprite); + return mapObjectId; +} + +static u8 SpawnFieldObject(struct MapObjectTemplate *mapObjectTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY) +{ + const struct MapObjectGraphicsInfo *graphicsInfo; + struct SpriteTemplate spriteTemplate; + const struct SubspriteTable *subspriteTables; + struct SpriteFrameImage spriteFrameImage; + u8 mapObjectId; + + subspriteTables = NULL; + graphicsInfo = GetFieldObjectGraphicsInfo(mapObjectTemplate->graphicsId); + MakeObjectTemplateFromFieldObjectTemplate(mapObjectTemplate, &spriteTemplate, &subspriteTables); + spriteFrameImage.size = graphicsInfo->size; + spriteTemplate.images = &spriteFrameImage; + mapObjectId = SpawnFieldObjectInternal(mapObjectTemplate, &spriteTemplate, mapNum, mapGroup, cameraX, cameraY); + if (mapObjectId == NUM_FIELD_OBJECTS) + { + return NUM_FIELD_OBJECTS; + } + gSprites[gMapObjects[mapObjectId].spriteId].images = graphicsInfo->images; + if (subspriteTables != NULL) + { + SetSubspriteTables(&gSprites[gMapObjects[mapObjectId].spriteId], subspriteTables); + } + return mapObjectId; +} + +u8 SpawnSpecialFieldObject(struct MapObjectTemplate *mapObjectTemplate) +{ + s16 cameraX; + s16 cameraY; + + GetFieldObjectMovingCameraOffset(&cameraX, &cameraY); + return SpawnFieldObject(mapObjectTemplate, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY); +} + +u8 SpawnSpecialFieldObjectParametrized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z) +{ + struct MapObjectTemplate mapObjectTemplate; + + 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.unkA_0 = 0; + mapObjectTemplate.unkA_4 = 0; + mapObjectTemplate.unkC = 0; + mapObjectTemplate.unkE = 0; + return SpawnSpecialFieldObject(&mapObjectTemplate); +} + +u8 show_sprite(u8 localId, u8 mapNum, u8 mapGroup) +{ + struct MapObjectTemplate *mapObjectTemplate; + s16 cameraX; + s16 cameraY; + + mapObjectTemplate = GetFieldObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup); + if (mapObjectTemplate == NULL) + { + return NUM_FIELD_OBJECTS; + } + GetFieldObjectMovingCameraOffset(&cameraX, &cameraY); + return SpawnFieldObject(mapObjectTemplate, mapNum, mapGroup, cameraX, cameraY); +} + +static void MakeObjectTemplateFromFieldObjectGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables) +{ + const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(graphicsId); + + sprTemplate->tileTag = gfxInfo->tileTag; + sprTemplate->paletteTag = gfxInfo->paletteTag1; + sprTemplate->oam = gfxInfo->oam; + sprTemplate->anims = gfxInfo->anims; + sprTemplate->images = gfxInfo->images; + sprTemplate->affineAnims = gfxInfo->affineAnims; + sprTemplate->callback = callback; + *subspriteTables = gfxInfo->subspriteTables; +} + +static void MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex(u16 graphicsId, u16 callbackIndex, struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables) +{ + MakeObjectTemplateFromFieldObjectGraphicsInfo(graphicsId, gUnknown_08505438[callbackIndex], sprTemplate, subspriteTables); +} + +static void MakeObjectTemplateFromFieldObjectTemplate(struct MapObjectTemplate *mapObjectTemplate, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) +{ + MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex(mapObjectTemplate->graphicsId, mapObjectTemplate->movementType, spriteTemplate, subspriteTables); +} + +u8 AddPseudoFieldObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority) +{ + struct SpriteTemplate *spriteTemplate; + const struct SubspriteTable *subspriteTables; + struct Sprite *sprite; + u8 spriteIdx; + + spriteTemplate = malloc(sizeof(struct SpriteTemplate)); + MakeObjectTemplateFromFieldObjectGraphicsInfo(graphicsId, callback, spriteTemplate, &subspriteTables); + if (spriteTemplate->paletteTag != 0xffff) + { + sub_808E894(spriteTemplate->paletteTag); + } + spriteIdx = CreateSprite(spriteTemplate, x, y, subpriority); + free(spriteTemplate); + + if (spriteIdx != MAX_SPRITES && subspriteTables != NULL) + { + sprite = &gSprites[spriteIdx]; + SetSubspriteTables(sprite, subspriteTables); + sprite->subspriteMode = 2; + } + return spriteIdx; +} + +u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction) +{ + const struct MapObjectGraphicsInfo *graphicsInfo; + struct SpriteTemplate spriteTemplate; + const struct SubspriteTable *subspriteTables; + u8 spriteId; + struct Sprite *sprite; + + graphicsInfo = GetFieldObjectGraphicsInfo(graphicsId); + MakeObjectTemplateFromFieldObjectGraphicsInfo(graphicsId, sub_8097AC8, &spriteTemplate, &subspriteTables); + *(u16 *)&spriteTemplate.paletteTag = 0xffff; + x += 7; + y += 7; + sub_80930E0(&x, &y, 8, 16); + spriteId = CreateSpriteAtEnd(&spriteTemplate, x, y, 0); + if (spriteId != MAX_SPRITES) + { + sprite = &gSprites[spriteId]; + sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); + sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); + sprite->pos1.y += sprite->centerToCornerVecY; + sprite->oam.paletteNum = graphicsInfo->paletteSlot; + if (sprite->oam.paletteNum >= 16) + { + sprite->oam.paletteNum -= 16; + } + sprite->coordOffsetEnabled = TRUE; + sprite->data[0] = a1; + sprite->data[1] = z; + if (graphicsInfo->paletteSlot == 10) + { + npc_load_two_palettes__and_record(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot); + } + else if (graphicsInfo->paletteSlot >= 16) + { + sub_808EAB0(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot | 0xf0); + } + if (subspriteTables != NULL) + { + SetSubspriteTables(sprite, subspriteTables); + sprite->subspriteMode = 2; + } + InitObjectPriorityByZCoord(sprite, z); + SetObjectSubpriorityByZCoord(z, sprite, 1); + StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(direction)); + } + return spriteId; +} + +void SpawnFieldObjectsInView(s16 cameraX, s16 cameraY) +{ + u8 i; + s16 left; + s16 right; + s16 top; + s16 bottom; + u8 objectCount; + s16 npcX; + s16 npcY; + + if (gMapHeader.events != NULL) + { + left = gSaveBlock1Ptr->pos.x - 2; + right = gSaveBlock1Ptr->pos.x + 17; + top = gSaveBlock1Ptr->pos.y; + bottom = gSaveBlock1Ptr->pos.y + 16; + + if (InBattlePyramid()) + { + objectCount = sub_81AAA40(); + } + else if (InTrainerHill()) + { + objectCount = 2; + } + else + { + objectCount = gMapHeader.events->mapObjectCount; + } + + for (i = 0; i < objectCount; i++) + { + struct MapObjectTemplate *template = &gSaveBlock1Ptr->mapObjectTemplates[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); + } + } +} + +/*static*/ void RemoveFieldObjectsOutsideView(void) +{ + u8 i; + u8 j; + bool8 isActiveLinkPlayer; + struct MapObject *mapObject; + + for (i = 0; i < NUM_FIELD_OBJECTS; i ++) + { + for (j = 0, isActiveLinkPlayer = FALSE; j < ARRAY_COUNT(gLinkPlayerMapObjects); j ++) + { + if (gLinkPlayerMapObjects[j].active && i == gLinkPlayerMapObjects[j].mapObjId) + isActiveLinkPlayer = TRUE; + } + if (!isActiveLinkPlayer) + { + mapObject = &gMapObjects[i]; + + if (mapObject->active && !mapObject->mapobj_bit_16) + RemoveFieldObjectIfOutsideView(mapObject); + } + } +} + +static void RemoveFieldObjectIfOutsideView(struct MapObject *mapObject) +{ + s16 left; + s16 right; + s16 top; + s16 bottom; + + left = gSaveBlock1Ptr->pos.x - 2; + right = gSaveBlock1Ptr->pos.x + 17; + 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) + return; + if (mapObject->coords1.x >= left && mapObject->coords1.x <= right + && mapObject->coords1.y >= top && mapObject->coords1.y <= bottom) + return; + RemoveFieldObject(mapObject); +} + +void sub_808E16C(s16 x, s16 y) +{ + u8 i; + + ClearPlayerAvatarInfo(); + for (i = 0; i < NUM_FIELD_OBJECTS; i ++) + { + if (gMapObjects[i].active) + { + sub_808E1B8(i, x, y); + } + } + sub_808D450(); +} + +static void sub_808E1B8(u8 mapObjectId, s16 x, s16 y) +{ + u8 spriteId; + u8 paletteSlot; + struct MapObject *mapObject; + const struct SubspriteTable *subspriteTables; + const struct MapObjectGraphicsInfo *graphicsInfo; + struct SpriteFrameImage spriteFrameImage; + struct SpriteTemplate spriteTemplate; + struct Sprite *sprite; + +#define i spriteId + for (i = 0; i < ARRAY_COUNT(gLinkPlayerMapObjects); i ++) + { + if (gLinkPlayerMapObjects[i].active && mapObjectId == gLinkPlayerMapObjects[i].mapObjId) + { + return; + } + } +#undef i + + mapObject = &gMapObjects[mapObjectId]; + subspriteTables = NULL; + graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId); + spriteFrameImage.size = graphicsInfo->size; + MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex(mapObject->graphicsId, mapObject->animPattern, &spriteTemplate, &subspriteTables); + spriteTemplate.images = &spriteFrameImage; + *(u16 *)&spriteTemplate.paletteTag = 0xffff; + paletteSlot = graphicsInfo->paletteSlot; + if (paletteSlot == 0) + { + npc_load_two_palettes__no_record(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot); + } + else if (paletteSlot == 10) + { + npc_load_two_palettes__and_record(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot); + } + else if (paletteSlot >= 16) + { + paletteSlot -= 16; + sub_808EAB0(graphicsInfo->paletteTag1, paletteSlot); + } + *(u16 *)&spriteTemplate.paletteTag = 0xffff; + spriteId = CreateSprite(&spriteTemplate, 0, 0, 0); + if (spriteId != MAX_SPRITES) + { + sprite = &gSprites[spriteId]; + sub_8092FF0(x + mapObject->coords2.x, y + mapObject->coords2.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) + { + SetPlayerAvatarFieldObjectIdAndObjectId(mapObjectId, spriteId); + mapObject->mapobj_unk_1B = sub_8154228(); + } + if (subspriteTables != NULL) + { + SetSubspriteTables(sprite, subspriteTables); + } + sprite->oam.paletteNum = paletteSlot; + sprite->coordOffsetEnabled = TRUE; + sprite->data[0] = mapObjectId; + mapObject->spriteId = spriteId; + if (!mapObject->mapobj_bit_12 && mapObject->animPattern != 0x0b) + { + StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObject->mapobj_unk_18)); + } + sub_808E38C(mapObject); + SetObjectSubpriorityByZCoord(mapObject->elevation, 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; + FieldObjectClearAnim(mapObject); +} + +static void SetPlayerAvatarFieldObjectIdAndObjectId(u8 mapObjectId, u8 spriteId) +{ + gPlayerAvatar.mapObjectId = mapObjectId; + gPlayerAvatar.spriteId = spriteId; + gPlayerAvatar.gender = GetPlayerAvatarGenderByGraphicsId(gMapObjects[mapObjectId].graphicsId); + SetPlayerAvatarExtraStateTransition(gMapObjects[mapObjectId].graphicsId, 0x20); +} + +void FieldObjectSetGraphicsId(struct MapObject *mapObject, u8 graphicsId) +{ + const struct MapObjectGraphicsInfo *graphicsInfo; + struct Sprite *sprite; + u8 paletteSlot; + + graphicsInfo = GetFieldObjectGraphicsInfo(graphicsId); + sprite = &gSprites[mapObject->spriteId]; + paletteSlot = graphicsInfo->paletteSlot; + if (paletteSlot == 0) + { + pal_patch_for_npc(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot); + } + else if (paletteSlot == 10) + { + npc_load_two_palettes__and_record(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot); + } + else if (paletteSlot >= 16) + { + paletteSlot -= 16; + sub_808EAB0(graphicsInfo->paletteTag1, paletteSlot); + } + sprite->oam.shape = graphicsInfo->oam->shape; + sprite->oam.size = graphicsInfo->oam->size; + sprite->images = graphicsInfo->images; + sprite->anims = graphicsInfo->anims; + sprite->subspriteTables = graphicsInfo->subspriteTables; + sprite->oam.paletteNum = paletteSlot; + mapObject->mapobj_bit_12 = graphicsInfo->inanimate; + mapObject->graphicsId = graphicsId; + sub_8093038(mapObject->coords2.x, mapObject->coords2.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) + { + CameraObjectReset1(); + } +} + +void FieldObjectSetGraphicsIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 graphicsId) +{ + u8 mapObjectId; + + if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) + { + FieldObjectSetGraphicsId(&gMapObjects[mapObjectId], graphicsId); + } +} + +void FieldObjectTurn(struct MapObject *mapObject, u8 direction) +{ + FieldObjectSetDirection(mapObject, direction); + if (!mapObject->mapobj_bit_12) + { + StartSpriteAnim(&gSprites[mapObject->spriteId], FieldObjectDirectionToImageAnimId(mapObject->mapobj_unk_18)); + SeekSpriteAnim(&gSprites[mapObject->spriteId], 0); + } +} + +void FieldObjectTurnByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 direction) +{ + u8 mapObjectId; + + if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) + { + FieldObjectTurn(&gMapObjects[mapObjectId], direction); + } +} + +void PlayerObjectTurn(struct PlayerAvatar *playerAvatar, u8 direction) +{ + FieldObjectTurn(&gMapObjects[playerAvatar->mapObjectId], direction); +} + +/*static*/ void get_berry_tree_graphics(struct MapObject *mapObject, struct Sprite *sprite) +{ + u8 berryStage; + u8 berryId; + + mapObject->mapobj_bit_13 = TRUE; + sprite->invisible = TRUE; + berryStage = GetStageByBerryTreeId(mapObject->trainerRange_berryTreeId); + if (berryStage != 0) + { + mapObject->mapobj_bit_13 = FALSE; + sprite->invisible = FALSE; + berryId = GetBerryTypeByBerryTreeId(mapObject->trainerRange_berryTreeId) - 1; + berryStage -= 1; + if (berryId >= NUM_BERRIES) + { + berryId = 0; + } + FieldObjectSetGraphicsId(mapObject, gBerryTreeFieldObjectGraphicsIdTablePointers[berryId][berryStage]); + sprite->images = gBerryTreePicTablePointers[berryId]; + sprite->oam.paletteNum = gBerryTreePaletteSlotTablePointers[berryId][berryStage]; + StartSpriteAnim(sprite, berryStage); + } +} + +const struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8 graphicsId) +{ + u8 bard; + + if (graphicsId >= SPRITE_VAR) + { + graphicsId = VarGetFieldObjectGraphicsId(graphicsId - SPRITE_VAR); + } + if (graphicsId == 0x45) + { + bard = GetCurrentMauvilleOldMan(); + return gMauvilleOldManGraphicsInfoPointers[bard]; + } + if (graphicsId >= NUM_OBJECT_GRAPHICS_INFO) + { + graphicsId = 0x05; // LittleBoy1 + } + return gFieldObjectGraphicsInfoPointers[graphicsId]; +} + +static void FieldObjectHandleDynamicGraphicsId(struct MapObject *mapObject) +{ + if (mapObject->graphicsId >= SPRITE_VAR) + { + mapObject->graphicsId = VarGetFieldObjectGraphicsId(mapObject->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; + + if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) + { + gMapObjects[mapObjectId].mapobj_bit_13 = state; + } +} + +void FieldObjectGetLocalIdAndMap(struct MapObject *mapObject, void *localId, void *mapNum, void *mapGroup) +{ + *(u8*)(localId) = mapObject->localId; + *(u8*)(mapNum) = mapObject->mapNum; + *(u8*)(mapGroup) = mapObject->mapGroup; +} + +void sub_808E75C(s16 x, s16 y) +{ + u8 mapObjectId; + struct MapObject *mapObject; + + mapObjectId = GetFieldObjectIdByXY(x, y); + if (mapObjectId != NUM_FIELD_OBJECTS) + { + mapObject = &gMapObjects[mapObjectId]; + mapObject->mapobj_bit_2 = TRUE; + } +} + +void sub_808E78C(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority) +{ + u8 mapObjectId; + struct MapObject *mapObject; + struct Sprite *sprite; + + if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) + { + mapObject = &gMapObjects[mapObjectId]; + sprite = &gSprites[mapObject->spriteId]; + mapObject->mapobj_bit_26 = TRUE; + sprite->subpriority = subpriority; + } +} + +void sub_808E7E4(u8 localId, u8 mapNum, u8 mapGroup) +{ + u8 mapObjectId; + struct MapObject *mapObject; + + if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) + { + mapObject = &gMapObjects[mapObjectId]; + mapObject->mapobj_bit_26 = FALSE; + mapObject->mapobj_bit_2 = TRUE; + } +} + +void sub_808E82C(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y) +{ + u8 mapObjectId; + struct Sprite *sprite; + + if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) + { + sprite = &gSprites[gMapObjects[mapObjectId].spriteId]; + sprite->pos2.x = x; + sprite->pos2.y = y; + } +} + +void gpu_pal_allocator_reset__manage_upper_four(void) +{ + FreeAllSpritePalettes(); + gReservedSpritePaletteCount = 12; +} + +static void sub_808E894(u16 paletteTag) +{ + u16 paletteSlot; + + paletteSlot = FindFieldObjectPaletteIndexByTag(paletteTag); + if (paletteSlot != 0x11ff) // always true + { + sub_808E8F4(&gUnknown_0850BBC8[paletteSlot]); + } +} + +void sub_808E8C0(u16 *paletteTags) +{ + u8 i; + + for (i = 0; paletteTags[i] != 0x11ff; i ++) + { + sub_808E894(paletteTags[i]); + } +} + +static u8 sub_808E8F4(const struct SpritePalette *spritePalette) +{ + if (IndexOfSpritePaletteTag(spritePalette->tag) != 0xff) + { + return 0xff; + } + return LoadSpritePalette(spritePalette); +} + +void pal_patch_for_npc(u16 paletteTag, u8 paletteSlot) +{ + u16 paletteIdx; + + paletteIdx = FindFieldObjectPaletteIndexByTag(paletteTag); + LoadPalette(gUnknown_0850BBC8[paletteIdx].data, 16 * paletteSlot + 256, 0x20); +} + +void pal_patch_for_npc_range(const u16 *paletteTags, u8 minSlot, u8 maxSlot) +{ + while (minSlot < maxSlot) + { + pal_patch_for_npc(*paletteTags, minSlot); + paletteTags ++; + minSlot ++; + } +} + +static u8 FindFieldObjectPaletteIndexByTag(u16 tag) +{ + u8 i; + + for (i = 0; gUnknown_0850BBC8[i].tag != 0x11ff; i ++) + { + if (gUnknown_0850BBC8[i].tag == tag) + { + return i; + } + } + return 0xff; +} + +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 ++) + { + if (gUnknown_0850BD00[i].tag == tag) + { + pal_patch_for_npc(gUnknown_0850BD00[i].data[gUnknown_020375B4], gUnknown_084975C4[slot]); + return; + } + } +} + +void npc_load_two_palettes__and_record(u16 tag, u8 slot) +{ + u8 i; + + gUnknown_020375B6 = tag; + pal_patch_for_npc(tag, slot); + for (i = 0; gUnknown_0850BD78[i].tag != 0x11ff; i ++) + { + if (gUnknown_0850BD78[i].tag == tag) + { + pal_patch_for_npc(gUnknown_0850BD78[i].data[gUnknown_020375B4], gUnknown_084975C4[slot]); + return; + } + } +} + +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) +{ + mapObject->coords3.x = mapObject->coords2.x; + mapObject->coords3.y = mapObject->coords2.y; + mapObject->coords2.x += x; + mapObject->coords2.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; +} + +/*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; +} + +void sub_808EB08(struct MapObject *mapObject, s16 x, s16 y) +{ + struct Sprite *sprite; + const struct MapObjectGraphicsInfo *graphicsInfo; + + 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); + 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) + { + CameraObjectReset1(); + } +} + +void sub_808EBA8(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y) +{ + u8 mapObjectId; + + if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) + { + x += 7; + y += 7; + sub_808EB08(&gMapObjects[mapObjectId], x, y); + } +} + +void npc_coords_shift_still(struct MapObject *mapObject) +{ + npc_coords_shift(mapObject, mapObject->coords2.x, mapObject->coords2.y); +} + +void UpdateFieldObjectCoordsForCameraUpdate(void) +{ + u8 i; + s16 dx; + s16 dy; + + if (gCamera.active) + { + dx = gCamera.x; + dy = gCamera.y; + for (i = 0; i < NUM_FIELD_OBJECTS; i ++) + { + 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; + } + } + } +} + +u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z) +{ + u8 i; + for (i = 0; i < NUM_FIELD_OBJECTS; i ++) + { + if (gMapObjects[i].active) + { + if (gMapObjects[i].coords2.x == x && gMapObjects[i].coords2.y == y && FieldObjectDoesZCoordMatch(&gMapObjects[i], z)) + { + return i; + } + } + } + return NUM_FIELD_OBJECTS; +} + +static bool8 FieldObjectDoesZCoordMatch(struct MapObject *mapObject, u8 z) +{ + if (mapObject->mapobj_unk_0B_0 != 0 && z != 0 && mapObject->mapobj_unk_0B_0 != z) + { + return FALSE; + } + return TRUE; +} + +void UpdateFieldObjectsForCameraUpdate(s16 x, s16 y) +{ + UpdateFieldObjectCoordsForCameraUpdate(); + SpawnFieldObjectsInView(x, y); + RemoveFieldObjectsOutsideView(); +} + +u8 AddCameraObject(u8 linkedSpriteId) +{ + u8 spriteId; + + spriteId = CreateSprite(&gUnknown_084975D4, 0, 0, 4); + gSprites[spriteId].invisible = TRUE; + gSprites[spriteId].data[0] = linkedSpriteId; + return spriteId; +} + +void ObjectCB_CameraObject(struct Sprite *sprite) +{ + void (*callbacks[ARRAY_COUNT(gUnknown_084975EC)])(struct Sprite *); + + memcpy(callbacks, gUnknown_084975EC, sizeof gUnknown_084975EC); + callbacks[sprite->data[1]](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; + sprite->invisible = TRUE; + sprite->data[1] = 1; + CameraObject_1(sprite); +} + +/*static*/ void CameraObject_1(struct Sprite *sprite) +{ + s16 x; + s16 y; + + y = gSprites[sprite->data[0]].pos1.y; + x = gSprites[sprite->data[0]].pos1.x; + sprite->data[2] = x - sprite->pos1.x; + sprite->data[3] = y - sprite->pos1.y; + sprite->pos1.x = x; + sprite->pos1.y = y; +} + +/*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; + sprite->data[2] = 0; + sprite->data[3] = 0; +} + +static struct Sprite *FindCameraObject(void) +{ + u8 spriteId; + + for (spriteId = 0; spriteId < MAX_SPRITES; spriteId ++) + { + if (gSprites[spriteId].inUse && gSprites[spriteId].callback == ObjectCB_CameraObject) + { + return &gSprites[spriteId]; + } + } + return NULL; +} + +void CameraObjectReset1(void) +{ + struct Sprite *cameraObject; + + cameraObject = FindCameraObject(); + if (cameraObject != NULL) + { + cameraObject->data[1] = 0; + cameraObject->callback(cameraObject); + } +} + +void CameraObjectSetFollowedObjectId(u8 objectId) +{ + struct Sprite *cameraObject; + + cameraObject = FindCameraObject(); + if (cameraObject != NULL) + { + cameraObject->data[0] = objectId; + CameraObjectReset1(); + } +} + +u8 CameraObjectGetFollowedObjectId(void) +{ + struct Sprite *cameraObject; + + cameraObject = FindCameraObject(); + if (cameraObject == NULL) + { + return MAX_SPRITES; + } + return cameraObject->data[0]; +} + +void CameraObjectReset2(void) +{ + FindCameraObject()->data[1] = 2; +} + +u8 CopySprite(struct Sprite *sprite, s16 x, s16 y, u8 subpriority) +{ + u8 i; + + for (i = 0; i < MAX_SPRITES; i ++) + { + if (!gSprites[i].inUse) + { + gSprites[i] = *sprite; + gSprites[i].pos1.x = x; + gSprites[i].pos1.y = y; + gSprites[i].subpriority = subpriority; + break; + } + } + return i; +} + +u8 obj_unfreeze(struct Sprite *sprite, s16 x, s16 y, u8 subpriority) +{ + s16 i; + + for (i = MAX_SPRITES - 1; i > -1; i --) + { + if (!gSprites[i].inUse) + { + gSprites[i] = *sprite; + gSprites[i].pos1.x = x; + gSprites[i].pos1.y = y; + gSprites[i].subpriority = subpriority; + return i; + } + } + return MAX_SPRITES; +} + +void FieldObjectSetDirection(struct MapObject *mapObject, u8 direction) +{ + s8 d2; + mapObject->mapobj_unk_20 = mapObject->mapobj_unk_18; + if (!mapObject->mapobj_bit_9) + { + d2 = direction; + mapObject->mapobj_unk_18 = d2; + } + mapObject->placeholder18 = direction; +} + +static const u8 *GetFieldObjectScriptPointerByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +{ + return GetFieldObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->script; +} + +const u8 *GetFieldObjectScriptPointerByFieldObjectId(u8 mapObjectId) +{ + return GetFieldObjectScriptPointerByLocalIdAndMap(gMapObjects[mapObjectId].localId, gMapObjects[mapObjectId].mapNum, gMapObjects[mapObjectId].mapGroup); +} + +static u16 GetFieldObjectFlagIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +{ + return GetFieldObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->flagId; +} + +u16 GetFieldObjectFlagIdByFieldObjectId(u8 mapObjectId) +{ + return GetFieldObjectFlagIdByLocalIdAndMap(gMapObjects[mapObjectId].localId, gMapObjects[mapObjectId].mapNum, gMapObjects[mapObjectId].mapGroup); +} + +u8 sub_808F080(u8 localId, u8 mapNum, u8 mapGroup) +{ + u8 mapObjectId; + + if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) + { + return 0xFF; + } + return gMapObjects[mapObjectId].trainerType; +} + +u8 sub_808F0BC(u8 mapObjectId) +{ + return gMapObjects[mapObjectId].trainerType; +} + +u8 sub_808F0D4(u8 localId, u8 mapNum, u8 mapGroup) +{ + u8 mapObjectId; + + if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) + { + return 0xFF; + } + return gMapObjects[mapObjectId].trainerRange_berryTreeId; +} + +u8 FieldObjectGetBerryTreeId(u8 mapObjectId) +{ + return gMapObjects[mapObjectId].trainerRange_berryTreeId; +} + +struct MapObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +{ + struct MapObjectTemplate *templates; + const struct MapHeader *mapHeader; + u8 count; + + if (gSaveBlock1Ptr->location.mapNum == mapNum && gSaveBlock1Ptr->location.mapGroup == mapGroup) + { + templates = gSaveBlock1Ptr->mapObjectTemplates; + count = gMapHeader.events->mapObjectCount; + } + else + { + mapHeader = Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum); + templates = mapHeader->events->mapObjects; + count = mapHeader->events->mapObjectCount; + } + return FindFieldObjectTemplateInArrayByLocalId(localId, templates, count); +} + +struct MapObjectTemplate *FindFieldObjectTemplateInArrayByLocalId(u8 localId, struct MapObjectTemplate *templates, u8 count) +{ + u8 i; + + for (i = 0; i < count; i ++) + { + if (templates[i].localId == localId) + { + return &templates[i]; + } + } + return NULL; +} + +struct MapObjectTemplate *sub_808F1B4(const struct MapObject *mapObject) +{ + int i; + + if (mapObject->mapNum != gSaveBlock1Ptr->location.mapNum || mapObject->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) + { + return &gSaveBlock1Ptr->mapObjectTemplates[i]; + } + } + return NULL; +} + +void sub_808F208(const struct MapObject *mapObject) +{ + struct MapObjectTemplate *mapObjectTemplate; + + mapObjectTemplate = sub_808F1B4(mapObject); + if (mapObjectTemplate != NULL) + { + mapObjectTemplate->x = mapObject->coords2.x - 7; + mapObjectTemplate->y = mapObject->coords2.y - 7; + } +} + +void sub_808F228(const struct MapObject *mapObject, const u8 *script) +{ + struct MapObjectTemplate *mapObjectTemplate; + + mapObjectTemplate = sub_808F1B4(mapObject); + if (mapObjectTemplate != NULL) + { + mapObjectTemplate->script = script; + } +} + +void sub_808F23C(const struct MapObject *mapObject, u8 movementType) +{ + struct MapObjectTemplate *mapObjectTemplate; + + mapObjectTemplate = sub_808F1B4(mapObject); + if (mapObjectTemplate != NULL) + { + mapObjectTemplate->movementType = movementType; + } +} + +void sub_808F254(u8 localId, u8 mapNum, u8 mapGroup) +{ + u8 mapObjectId; + + if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) + { + sub_808F208(&gMapObjects[mapObjectId]); + } +} + +void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat) +{ + u8 mapObjectId; + + if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) + { + switch (decorCat) + { + case DECORCAT_DOLL: + sub_808F228(&gMapObjects[mapObjectId], EventScript_2766A2); + break; + case DECORCAT_CUSHION: + sub_808F228(&gMapObjects[mapObjectId], EventScript_2766A6); + break; + } + } +} + +void npc_paltag_set_load(u8 palSlot) +{ + gpu_pal_allocator_reset__manage_upper_four(); + gUnknown_020375B6 = 0x11ff; + gUnknown_020375B4 = palSlot; + if (palSlot == 1) + { + pal_patch_for_npc_range(gUnknown_0850BE38[gUnknown_020375B4], 0, 6); + gReservedSpritePaletteCount = 8; + } + else + { + pal_patch_for_npc_range(gUnknown_0850BE38[gUnknown_020375B4], 0, 10); + } +} + +u16 npc_paltag_by_palslot(u8 palSlot) +{ + u8 i; + + if (palSlot < 10) + { + return gUnknown_0850BE38[gUnknown_020375B4][palSlot]; + } + for (i = 0; gUnknown_0850BD78[i].tag != 0x11ff; i ++) + { + if (gUnknown_0850BD78[i].tag == gUnknown_020375B6) + { + return gUnknown_0850BD78[i].data[gUnknown_020375B4]; + } + } + return 0x11ff; +} + +// Map Object Step Callbacks +// file boundary? + +null_object_step(NoMovement1, FALSE) + +field_object_step(GoRandomDirections, gUnknown_0850D6F4) + +bool8 sub_808F44C(struct MapObject *mapObject, struct Sprite *sprite) +{ + npc_reset(mapObject, sprite); + sprite->data[1] = 1; + return TRUE; +} + +bool8 sub_808F460(struct MapObject *mapObject, struct Sprite *sprite) +{ + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + sprite->data[1] = 2; + return TRUE; +} + +bool8 sub_808F48C(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (!FieldObjectExecRegularAnim(mapObject, sprite)) + { + return FALSE; + } + SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]); + sprite->data[1] = 3; + return TRUE; +} + +bool8 sub_808F4C8(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (RunFieldObjectStepTimer(sprite)) + { + sprite->data[1] = 4; + return TRUE; + } + return FALSE; +} + +bool8 sub_808F4E8(struct MapObject *mapObject, struct Sprite *sprite) +{ + u8 directions[4]; + u8 chosenDirection; + + memcpy(directions, gUnknown_0850D710, sizeof directions); + chosenDirection = directions[Random() & 0x03]; + FieldObjectSetDirection(mapObject, chosenDirection); + sprite->data[1] = 5; + if (npc_block_way__next_tile(mapObject, chosenDirection)) + { + sprite->data[1] = 1; + } + return TRUE; +} + +bool8 sub_808F534(struct MapObject *mapObject, struct Sprite *sprite) +{ + FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->placeholder18)); + mapObject->mapobj_bit_1 = TRUE; + sprite->data[1] = 6; + return TRUE; +} + +bool8 sub_808F564(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (FieldObjectExecRegularAnim(mapObject, sprite)) + { + mapObject->mapobj_bit_1 = FALSE; + sprite->data[1] = 1; + } + return FALSE; +} + +bool8 FieldObjectIsTrainerAndCloseToPlayer(struct MapObject *mapObject) +{ + s16 playerX; + s16 playerY; + s16 objX; + s16 objY; + s16 minX; + s16 maxX; + s16 minY; + s16 maxY; + + if (!TestPlayerAvatarFlags(0x80)) + { + return FALSE; + } + if (mapObject->trainerType != 1 && mapObject->trainerType != 3) + { + return FALSE; + } + PlayerGetDestCoords(&playerX, &playerY); + objX = mapObject->coords2.x; + objY = mapObject->coords2.y; + minX = objX - mapObject->trainerRange_berryTreeId; + minY = objY - mapObject->trainerRange_berryTreeId; + maxX = objX + mapObject->trainerRange_berryTreeId; + maxY = objY + mapObject->trainerRange_berryTreeId; + if (minX > playerX || maxX < playerX || minY > playerY || maxY < playerY) + { + return FALSE; + } + return TRUE; +} + +u8 GetRegularRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) +{ + u8 direction; + + if (absdx > absdy) + { + direction = DIR_EAST; + if (dx < 0) + { + direction = DIR_WEST; + } + } + else + { + direction = DIR_SOUTH; + if (dy < 0) + { + direction = DIR_NORTH; + } + } + return direction; +} + +u8 GetNorthSouthRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) +{ + u8 direction; + + direction = DIR_SOUTH; + if (dy < 0) + { + direction = DIR_NORTH; + } + return direction; +} + +u8 GetEastWestRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) +{ + u8 direction; + + direction = DIR_EAST; + if (dx < 0) + { + direction = DIR_WEST; + } + return direction; +} + +u8 GetNorthEastRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) +{ + u8 direction; + + direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy); + if (direction == DIR_SOUTH) + { + direction = GetEastWestRunningPastFacingDirection(dx, dy, absdx, absdy); + if (direction == DIR_EAST) + { + direction = DIR_NORTH; + } + } + else if (direction == DIR_EAST) + { + direction = GetNorthSouthRunningPastFacingDirection(dx, dy, absdx, absdy); + if (direction == DIR_SOUTH) + { + direction = DIR_NORTH; + } + } + return direction; +} + +u8 GetNorthWestRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) +{ + u8 direction; + + direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy); + if (direction == DIR_SOUTH) + { + direction = GetEastWestRunningPastFacingDirection(dx, dy, absdx, absdy); + if (direction == DIR_WEST) + { + direction = DIR_NORTH; + } + } + else if (direction == DIR_WEST) + { + direction = GetNorthSouthRunningPastFacingDirection(dx, dy, absdx, absdy); + if (direction == DIR_SOUTH) + { + direction = DIR_NORTH; + } + } + return direction; +} + +u8 GetSouthEastRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) +{ + u8 direction; + + direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy); + if (direction == DIR_NORTH) + { + direction = GetEastWestRunningPastFacingDirection(dx, dy, absdx, absdy); + if (direction == DIR_EAST) + { + direction = DIR_SOUTH; + } + } + else if (direction == DIR_EAST) + { + direction = GetNorthSouthRunningPastFacingDirection(dx, dy, absdx, absdy); + if (direction == DIR_NORTH) + { + direction = DIR_SOUTH; + } + } + return direction; +} + +u8 GetSouthWestRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) +{ + u8 direction; + + direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy); + if (direction == DIR_NORTH) + { + direction = GetEastWestRunningPastFacingDirection(dx, dy, absdx, absdy); + if (direction == DIR_WEST) + { + direction = DIR_SOUTH; + } + } + else if (direction == DIR_WEST) + { + direction = GetNorthSouthRunningPastFacingDirection(dx, dy, absdx, absdy); + if (direction == DIR_NORTH) + { + direction = DIR_SOUTH; + } + } + return direction; +} + +u8 GetNonEastRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) +{ + u8 direction; + + direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy); + if (direction == DIR_EAST) + { + direction = GetNorthSouthRunningPastFacingDirection(dx, dy, absdx, absdy); + } + return direction; +} + +u8 GetNonWestRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) +{ + u8 direction; + + direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy); + if (direction == DIR_WEST) + { + direction = GetNorthSouthRunningPastFacingDirection(dx, dy, absdx, absdy); + } + return direction; +} + +u8 GetNonSouthRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) +{ + u8 direction; + + direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy); + if (direction == DIR_SOUTH) + { + direction = GetEastWestRunningPastFacingDirection(dx, dy, absdx, absdy); + } + return direction; +} + +u8 GetNonNorthRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) +{ + u8 direction; + + direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy); + if (direction == DIR_NORTH) + { + direction = GetEastWestRunningPastFacingDirection(dx, dy, absdx, absdy); + } + return direction; +} + +u8 GetRunningPastFacingDirection(struct MapObject *mapObject, u8 movementType) +{ + s16 dx; + s16 dy; + s16 absdx; + s16 absdy; + + if (!FieldObjectIsTrainerAndCloseToPlayer(mapObject)) + { + return 0; + } + PlayerGetDestCoords(&dx, &dy); + dx -= mapObject->coords2.x; + dy -= mapObject->coords2.y; + absdx = dx; + absdy = dy; + if (absdx < 0) + { + absdx = -absdx; + } + if (absdy < 0) + { + absdy = -absdy; + } + return gUnknown_0850D714[movementType](dx, dy, absdx, absdy); +} + +field_object_step(LookRandomDirections, gUnknown_0850D740) + +bool8 sub_808F988(struct MapObject *mapObject, struct Sprite *sprite) +{ + npc_reset(mapObject, sprite); + sprite->data[1] = 1; + return TRUE; +} + +bool8 sub_808F99C(struct MapObject *mapObject, struct Sprite *sprite) +{ + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + sprite->data[1] = 2; + return TRUE; +} + +bool8 sub_808F9C8(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (FieldObjectExecRegularAnim(mapObject, sprite)) + { + SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]); + mapObject->mapobj_bit_1 = FALSE; + sprite->data[1] = 3; + } + return FALSE; +} + +bool8 sub_808FA0C(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) + { + sprite->data[1] = 4; + return TRUE; + } + return FALSE; +} + +bool8 sub_808FA3C(struct MapObject *mapObject, struct Sprite *sprite) +{ + u8 directions[4]; + u8 direction; + + memcpy(directions, gUnknown_0850D710, sizeof directions); + direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_ANY); + if (direction == 0) + { + direction = directions[Random() & 0x03]; + } + FieldObjectSetDirection(mapObject, direction); + sprite->data[1] = 1; + return TRUE; +} + +field_object_step(RandomlyGoNorthOrSouth, gUnknown_0850D754) + +bool8 sub_808FAC8(struct MapObject *mapObject, struct Sprite *sprite) +{ + npc_reset(mapObject, sprite); + sprite->data[1] = 1; + return TRUE; +} + +bool8 sub_808FADC(struct MapObject *mapObject, struct Sprite *sprite) +{ + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + sprite->data[1] = 2; + return TRUE; +} + +bool8 sub_808FB08(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (!FieldObjectExecRegularAnim(mapObject, sprite)) + { + return FALSE; + } + SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]); + sprite->data[1] = 3; + return TRUE; +} + +bool8 sub_808FB44(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (RunFieldObjectStepTimer(sprite)) + { + sprite->data[1] = 4; + return TRUE; + } + return FALSE; +} + +bool8 sub_808FB64(struct MapObject *mapObject, struct Sprite *sprite) +{ + u8 directions[2]; + u8 direction; + + memcpy(directions, gUnknown_0850D770, sizeof directions); + direction = directions[Random() & 0x01]; + FieldObjectSetDirection(mapObject, direction); + sprite->data[1] = 5; + if (npc_block_way__next_tile(mapObject, direction)) + { + sprite->data[1] = 1; + } + return TRUE; +} + +bool8 sub_808FBB0(struct MapObject *mapObject, struct Sprite *sprite) +{ + FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->placeholder18)); + mapObject->mapobj_bit_1 = TRUE; + sprite->data[1] = 6; + return TRUE; +} + +bool8 sub_808FBE0(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (FieldObjectExecRegularAnim(mapObject, sprite)) + { + mapObject->mapobj_bit_1 = FALSE; + sprite->data[1] = 1; + } + return FALSE; +} + +field_object_step(RandomlyGoEastOrWest, gUnknown_0850D774) + +bool8 sub_808FC4C(struct MapObject *mapObject, struct Sprite *sprite) +{ + npc_reset(mapObject, sprite); + sprite->data[1] = 1; + return TRUE; +} + +bool8 sub_808FC60(struct MapObject *mapObject, struct Sprite *sprite) +{ + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + sprite->data[1] = 2; + return TRUE; +} + +bool8 sub_808FC8C(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (!FieldObjectExecRegularAnim(mapObject, sprite)) + { + return FALSE; + } + SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]); + sprite->data[1] = 3; + return TRUE; +} + +bool8 sub_808FCC8(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (RunFieldObjectStepTimer(sprite)) + { + sprite->data[1] = 4; + return TRUE; + } + return FALSE; +} + +bool8 sub_808FCE8(struct MapObject *mapObject, struct Sprite *sprite) +{ + u8 directions[2]; + u8 direction; + + memcpy(directions, gUnknown_0850D790, sizeof directions); + direction = directions[Random() & 0x01]; + FieldObjectSetDirection(mapObject, direction); + sprite->data[1] = 5; + if (npc_block_way__next_tile(mapObject, direction)) + { + sprite->data[1] = 1; + } + return TRUE; +} + +bool8 sub_808FD34(struct MapObject *mapObject, struct Sprite *sprite) +{ + FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->placeholder18)); + mapObject->mapobj_bit_1 = TRUE; + sprite->data[1] = 6; + return TRUE; +} + +bool8 sub_808FD64(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (FieldObjectExecRegularAnim(mapObject, sprite)) + { + mapObject->mapobj_bit_1 = FALSE; + sprite->data[1] = 1; + } + return FALSE; +} + +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)); + sprite->data[1] = 1; + return TRUE; +} + +bool8 sub_808FDFC(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (FieldObjectExecRegularAnim(mapObject, sprite)) + { + sprite->data[1] = 2; + return TRUE; + } + return FALSE; +} + +bool8 sub_808FE1C(struct MapObject *mapObject, struct Sprite *sprite) +{ + mapObject->mapobj_bit_1 = 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) +{ + struct MapObject *mapObject; + + mapObject = &gMapObjects[sprite->data[0]]; + if (!(sprite->data[7] & 0x0001)) + { + get_berry_tree_graphics(mapObject, sprite); + sprite->data[7] |= 0x0001; + } + FieldObjectStep(mapObject, sprite, FieldObjectCB2_BerryTree); +} +static bool8 FieldObjectCB2_BerryTree(struct MapObject *mapObject, struct Sprite *sprite) +{ + return gUnknown_0850D7A0[sprite->data[1]](mapObject, sprite); +} + +bool8 do_berry_tree_growth_sparkle_1 (struct MapObject *mapObject, struct Sprite *sprite) +{ + u8 berryStage; + + npc_reset(mapObject, sprite); + mapObject->mapobj_bit_13 = 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[2] = sprite->subpriority - 1; + gFieldEffectArguments[3] = sprite->oam.priority; + FieldEffectStart(FLDEFF_BERRY_TREE_GROWTH_SPARKLE); + sprite->animNum = berryStage; + } + return FALSE; + } + mapObject->mapobj_bit_13 = FALSE; + sprite->invisible = FALSE; + berryStage --; + if (sprite->animNum != berryStage) + { + sprite->data[1] = 2; + return TRUE; + } + get_berry_tree_graphics(mapObject, sprite); + FieldObjectSetRegularAnim(mapObject, sprite, 0x39); + sprite->data[1] = 1; + return TRUE; +} + +bool8 sub_808FF48 (struct MapObject *mapObject, struct Sprite *sprite) +{ + if (FieldObjectExecRegularAnim(mapObject, sprite)) + { + sprite->data[1] = 0; + return TRUE; + } + return FALSE; +} + +bool8 do_berry_tree_growth_sparkle_2 (struct MapObject *mapObject, struct Sprite *sprite) +{ + mapObject->mapobj_bit_1 = TRUE; + sprite->data[1] = 3; + sprite->data[2] = 0; + sprite->data[7] |= 0x0002; + gFieldEffectArguments[0] = mapObject->coords2.x; + gFieldEffectArguments[1] = mapObject->coords2.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) +{ + sprite->data[2] ++; + mapObject->mapobj_bit_13 = (sprite->data[2] & 0x02) >> 1; + sprite->animPaused = TRUE; + if (sprite->data[2] > 64) + { + get_berry_tree_graphics(mapObject, sprite); + sprite->data[1] = 4; + sprite->data[2] = 0; + return TRUE; + } + return FALSE; +} + +bool8 sub_8090004 (struct MapObject *mapObject, struct Sprite *sprite) +{ + sprite->data[2] ++; + mapObject->mapobj_bit_13 = (sprite->data[2] & 0x02) >> 1; + sprite->animPaused = TRUE; + if (sprite->data[2] > 64) + { + sprite->data[1] = 0; + sprite->data[7] &= ~0x0002; + return TRUE; + } + return FALSE; +} + +field_object_step(RandomlyLookNorthOrSouth, gUnknown_0850D7B4) + +bool8 sub_8090094 (struct MapObject *mapObject, struct Sprite *sprite) +{ + npc_reset(mapObject, sprite); + sprite->data[1] = 1; + return TRUE; +} + +bool8 sub_80900A8 (struct MapObject *mapObject, struct Sprite *sprite) +{ + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + sprite->data[1] = 2; + return TRUE; +} + +bool8 sub_80900D4 (struct MapObject *mapObject, struct Sprite *sprite) +{ + if (FieldObjectExecRegularAnim(mapObject, sprite)) + { + SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]); + mapObject->mapobj_bit_1 = FALSE; + sprite->data[1] = 3; + } + return FALSE; +} + +bool8 sub_8090118 (struct MapObject *mapObject, struct Sprite *sprite) +{ + if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) + { + sprite->data[1] = 4; + return TRUE; + } + return FALSE; +} + +bool8 sub_8090148 (struct MapObject *mapObject, struct Sprite *sprite) +{ + u8 directions[2]; + u8 direction; + + memcpy(directions, gUnknown_0850D770, sizeof gUnknown_0850D770); + direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_NORTH_SOUTH); + if (direction == 0) + { + direction = directions[Random() & 0x01]; + } + FieldObjectSetDirection(mapObject, direction); + sprite->data[1] = 1; + return TRUE; +} + +field_object_step(RandomlyLookEastOrWest, gUnknown_0850D7C8) + +bool8 sub_80901D4 (struct MapObject *mapObject, struct Sprite *sprite) +{ + npc_reset(mapObject, sprite); + sprite->data[1] = 1; + return TRUE; +} + +bool8 sub_80901E8 (struct MapObject *mapObject, struct Sprite *sprite) +{ + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + sprite->data[1] = 2; + return TRUE; +} + +bool8 sub_8090214 (struct MapObject *mapObject, struct Sprite *sprite) +{ + if (FieldObjectExecRegularAnim(mapObject, sprite)) + { + SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]); + mapObject->mapobj_bit_1 = FALSE; + sprite->data[1] = 3; + } + return FALSE; +} + +bool8 sub_8090258 (struct MapObject *mapObject, struct Sprite *sprite) +{ + if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) + { + sprite->data[1] = 4; + return TRUE; + } + return FALSE; +} + +bool8 sub_8090288 (struct MapObject *mapObject, struct Sprite *sprite) +{ + u8 directions[2]; + u8 direction; + + memcpy(directions, gUnknown_0850D790, sizeof gUnknown_0850D790); + direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_EAST_WEST); + if (direction == 0) + { + direction = directions[Random() & 0x01]; + } + FieldObjectSetDirection(mapObject, direction); + sprite->data[1] = 1; + return TRUE; +} + +field_object_step(RandomlyLookNorthOrWest, gUnknown_0850D7DC) + +bool8 sub_8090314 (struct MapObject *mapObject, struct Sprite *sprite) +{ + npc_reset(mapObject, sprite); + sprite->data[1] = 1; + return TRUE; +} + +bool8 sub_8090328 (struct MapObject *mapObject, struct Sprite *sprite) +{ + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + sprite->data[1] = 2; + return TRUE; +} + +bool8 sub_8090354 (struct MapObject *mapObject, struct Sprite *sprite) +{ + if (FieldObjectExecRegularAnim(mapObject, sprite)) + { + SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); + mapObject->mapobj_bit_1 = FALSE; + sprite->data[1] = 3; + } + return FALSE; +} + +bool8 sub_8090398 (struct MapObject *mapObject, struct Sprite *sprite) +{ + if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) + { + sprite->data[1] = 4; + return TRUE; + } + return FALSE; +} + +bool8 sub_80903C8 (struct MapObject *mapObject, struct Sprite *sprite) +{ + u8 directions[2]; + u8 direction; + + memcpy(directions, gUnknown_0850D7F0, sizeof gUnknown_0850D7F0); + direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_NORTH_WEST); + if (direction == 0) + { + direction = directions[Random() & 0x01]; + } + FieldObjectSetDirection(mapObject, direction); + sprite->data[1] = 1; + return TRUE; +} + +field_object_step(RandomlyLookNorthOrEast, gUnknown_0850D7F4) + +bool8 sub_8090454 (struct MapObject *mapObject, struct Sprite *sprite) +{ + npc_reset(mapObject, sprite); + sprite->data[1] = 1; + return TRUE; +} + +bool8 sub_8090468 (struct MapObject *mapObject, struct Sprite *sprite) +{ + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + sprite->data[1] = 2; + return TRUE; +} + +bool8 sub_8090494 (struct MapObject *mapObject, struct Sprite *sprite) +{ + if (FieldObjectExecRegularAnim(mapObject, sprite)) + { + SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); + mapObject->mapobj_bit_1 = FALSE; + sprite->data[1] = 3; + } + return FALSE; +} + +bool8 sub_80904D8 (struct MapObject *mapObject, struct Sprite *sprite) +{ + if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) + { + sprite->data[1] = 4; + return TRUE; + } + return FALSE; +} + +bool8 sub_8090508 (struct MapObject *mapObject, struct Sprite *sprite) +{ + u8 directions[2]; + u8 direction; + + memcpy(directions, gUnknown_0850D808, sizeof gUnknown_0850D808); + direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_NORTH_EAST); + if (direction == 0) + { + direction = directions[Random() & 0x01]; + } + FieldObjectSetDirection(mapObject, direction); + sprite->data[1] = 1; + return TRUE; +} + +field_object_step(RandomlyLookSouthOrWest, gUnknown_0850D80C) + +bool8 sub_8090594 (struct MapObject *mapObject, struct Sprite *sprite) +{ + npc_reset(mapObject, sprite); + sprite->data[1] = 1; + return TRUE; +} + +bool8 sub_80905A8 (struct MapObject *mapObject, struct Sprite *sprite) +{ + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + sprite->data[1] = 2; + return TRUE; +} + +bool8 sub_80905D4 (struct MapObject *mapObject, struct Sprite *sprite) +{ + if (FieldObjectExecRegularAnim(mapObject, sprite)) + { + SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); + mapObject->mapobj_bit_1 = FALSE; + sprite->data[1] = 3; + } + return FALSE; +} + +bool8 sub_8090618 (struct MapObject *mapObject, struct Sprite *sprite) +{ + if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) + { + sprite->data[1] = 4; + return TRUE; + } + return FALSE; +} + +bool8 sub_8090648 (struct MapObject *mapObject, struct Sprite *sprite) +{ + u8 directions[2]; + u8 direction; + + memcpy(directions, gUnknown_0850D820, sizeof gUnknown_0850D820); + direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_SOUTH_WEST); + if (direction == 0) + { + direction = directions[Random() & 0x01]; + } + FieldObjectSetDirection(mapObject, direction); + sprite->data[1] = 1; + return TRUE; +} + +field_object_step(RandomlyLookSouthOrEast, gUnknown_0850D824) + +bool8 sub_80906D4 (struct MapObject *mapObject, struct Sprite *sprite) +{ + npc_reset(mapObject, sprite); + sprite->data[1] = 1; + return TRUE; +} + +bool8 sub_80906E8 (struct MapObject *mapObject, struct Sprite *sprite) +{ + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + sprite->data[1] = 2; + return TRUE; +} + +bool8 sub_8090714 (struct MapObject *mapObject, struct Sprite *sprite) +{ + if (FieldObjectExecRegularAnim(mapObject, sprite)) + { + SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); + mapObject->mapobj_bit_1 = FALSE; + sprite->data[1] = 3; + } + return FALSE; +} + +bool8 sub_8090758 (struct MapObject *mapObject, struct Sprite *sprite) +{ + if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) + { + sprite->data[1] = 4; + return TRUE; + } + return FALSE; +} + +bool8 sub_8090788 (struct MapObject *mapObject, struct Sprite *sprite) +{ + u8 directions[2]; + u8 direction; + + memcpy(directions, gUnknown_0850D838, sizeof gUnknown_0850D838); + direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_SOUTH_EAST); + if (direction == 0) + { + direction = directions[Random() & 0x01]; + } + FieldObjectSetDirection(mapObject, direction); + sprite->data[1] = 1; + return TRUE; +} + +field_object_step(RandomlyLookNorthOrSouthOrWest, gUnknown_0850D83C) + +bool8 sub_8090814 (struct MapObject *mapObject, struct Sprite *sprite) +{ + npc_reset(mapObject, sprite); + sprite->data[1] = 1; + return TRUE; +} + +bool8 sub_8090828 (struct MapObject *mapObject, struct Sprite *sprite) +{ + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + sprite->data[1] = 2; + return TRUE; +} + +bool8 sub_8090854 (struct MapObject *mapObject, struct Sprite *sprite) +{ + if (FieldObjectExecRegularAnim(mapObject, sprite)) + { + SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); + mapObject->mapobj_bit_1 = FALSE; + sprite->data[1] = 3; + } + return FALSE; +} + +bool8 sub_8090898 (struct MapObject *mapObject, struct Sprite *sprite) +{ + if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) + { + sprite->data[1] = 4; + return TRUE; + } + return FALSE; +} + +bool8 sub_80908C8 (struct MapObject *mapObject, struct Sprite *sprite) +{ + u8 directions[4]; + u8 direction; + + memcpy(directions, gUnknown_0850D850, sizeof gUnknown_0850D850); + direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_NORTH_SOUTH_WEST); + if (direction == 0) + { + direction = directions[Random() & 0x03]; + } + FieldObjectSetDirection(mapObject, direction); + sprite->data[1] = 1; + return TRUE; +} + +field_object_step(RandomlyLookNorthOrSouthOrEast, gUnknown_0850D854) + +bool8 sub_8090954 (struct MapObject *mapObject, struct Sprite *sprite) +{ + npc_reset(mapObject, sprite); + sprite->data[1] = 1; + return TRUE; +} + +bool8 sub_8090968 (struct MapObject *mapObject, struct Sprite *sprite) +{ + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + sprite->data[1] = 2; + return TRUE; +} + +bool8 sub_8090994 (struct MapObject *mapObject, struct Sprite *sprite) +{ + if (FieldObjectExecRegularAnim(mapObject, sprite)) + { + SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); + mapObject->mapobj_bit_1 = FALSE; + sprite->data[1] = 3; + } + return FALSE; +} + +bool8 sub_80909D8 (struct MapObject *mapObject, struct Sprite *sprite) +{ + if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) + { + sprite->data[1] = 4; + return TRUE; + } + return FALSE; +} + +bool8 sub_8090A08 (struct MapObject *mapObject, struct Sprite *sprite) +{ + u8 directions[4]; + u8 direction; + + memcpy(directions, gUnknown_0850D868, sizeof gUnknown_0850D868); + direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_NORTH_SOUTH_EAST); + if (direction == 0) + { + direction = directions[Random() & 0x03]; + } + FieldObjectSetDirection(mapObject, direction); + sprite->data[1] = 1; + return TRUE; +} + +field_object_step(RandomlyLookNorthOrEastOrWest, gUnknown_0850D86C) + +bool8 sub_8090A94 (struct MapObject *mapObject, struct Sprite *sprite) +{ + npc_reset(mapObject, sprite); + sprite->data[1] = 1; + return TRUE; +} + +bool8 sub_8090AA8 (struct MapObject *mapObject, struct Sprite *sprite) +{ + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + sprite->data[1] = 2; + return TRUE; +} + +bool8 sub_8090AD4 (struct MapObject *mapObject, struct Sprite *sprite) +{ + if (FieldObjectExecRegularAnim(mapObject, sprite)) + { + SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); + mapObject->mapobj_bit_1 = FALSE; + sprite->data[1] = 3; + } + return FALSE; +} + +bool8 sub_8090B18 (struct MapObject *mapObject, struct Sprite *sprite) +{ + if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) + { + sprite->data[1] = 4; + return TRUE; + } + return FALSE; +} + +bool8 sub_8090B48 (struct MapObject *mapObject, struct Sprite *sprite) +{ + u8 directions[4]; + u8 direction; + + memcpy(directions, gUnknown_0850D880, sizeof gUnknown_0850D880); + direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_NORTH_EAST_WEST); + if (direction == 0) + { + direction = directions[Random() & 0x03]; + } + FieldObjectSetDirection(mapObject, direction); + sprite->data[1] = 1; + return TRUE; +} + +field_object_step(RandomlyLookSouthOrEastOrWest, gUnknown_0850D884) + +bool8 sub_8090BD4 (struct MapObject *mapObject, struct Sprite *sprite) +{ + npc_reset(mapObject, sprite); + sprite->data[1] = 1; + return TRUE; +} + +bool8 sub_8090BE8 (struct MapObject *mapObject, struct Sprite *sprite) +{ + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + sprite->data[1] = 2; + return TRUE; +} + +bool8 sub_8090C14 (struct MapObject *mapObject, struct Sprite *sprite) +{ + if (FieldObjectExecRegularAnim(mapObject, sprite)) + { + SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); + mapObject->mapobj_bit_1 = FALSE; + sprite->data[1] = 3; + } + return FALSE; +} + +bool8 sub_8090C58 (struct MapObject *mapObject, struct Sprite *sprite) +{ + if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) + { + sprite->data[1] = 4; + return TRUE; + } + return FALSE; +} + +bool8 sub_8090C88 (struct MapObject *mapObject, struct Sprite *sprite) +{ + u8 directions[4]; + u8 direction; + + memcpy(directions, gUnknown_0850D898, sizeof gUnknown_0850D898); + direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_SOUTH_EAST_WEST); + if (direction == 0) + { + direction = directions[Random() & 0x03]; + } + FieldObjectSetDirection(mapObject, direction); + sprite->data[1] = 1; + return TRUE; +} + +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)); + sprite->data[1] = 1; + return TRUE; +} + +bool8 sub_8090D40 (struct MapObject *mapObject, struct Sprite *sprite) +{ + if (FieldObjectExecRegularAnim(mapObject, sprite)) + { + SetFieldObjectStepTimer(sprite, 48); + sprite->data[1] = 2; + } + return FALSE; +} + +bool8 sub_8090D64 (struct MapObject *mapObject, struct Sprite *sprite) +{ + if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) + { + sprite->data[1] = 3; + } + return FALSE; +} + +bool8 sub_8090D90 (struct MapObject *mapObject, struct Sprite *sprite) +{ + u8 directions[5]; + u8 direction; + + memcpy(directions, gUnknown_0850D8AC, sizeof gUnknown_0850D8AC); + direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_ANY); + if (direction == 0) + { + direction = directions[mapObject->mapobj_unk_18]; + } + FieldObjectSetDirection(mapObject, direction); + sprite->data[1] = 0; + return TRUE; +} + +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)); + sprite->data[1] = 1; + return TRUE; +} + +bool8 sub_8090E44 (struct MapObject *mapObject, struct Sprite *sprite) +{ + if (FieldObjectExecRegularAnim(mapObject, sprite)) + { + SetFieldObjectStepTimer(sprite, 48); + sprite->data[1] = 2; + } + return FALSE; +} + +bool8 sub_8090E68 (struct MapObject *mapObject, struct Sprite *sprite) +{ + if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) + { + sprite->data[1] = 3; + } + return FALSE; +} + +bool8 sub_8090E94 (struct MapObject *mapObject, struct Sprite *sprite) +{ + u8 directions[5]; + u8 direction; + + memcpy(directions, gUnknown_0850D8C4, sizeof gUnknown_0850D8C4); + direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_ANY); + if (direction == 0) + { + direction = directions[mapObject->mapobj_unk_18]; + } + FieldObjectSetDirection(mapObject, direction); + sprite->data[1] = 0; + return TRUE; +} + +field_object_step(AlternatelyGoInOppositeDirections, gUnknown_0850D8CC) + +bool8 sub_8090F1C (struct MapObject *mapObject, struct Sprite *sprite) +{ + npc_reset(mapObject, sprite); + sprite->data[1] = 1; + return TRUE; +} + +bool8 sub_8090F30 (struct MapObject *mapObject, struct Sprite *sprite) +{ + u8 direction; + + direction = gUnknown_085055CD[mapObject->animPattern]; + if (mapObject->mapobj_unk_21) + { + direction = GetOppositeDirection(direction); + } + FieldObjectSetDirection(mapObject, direction); + sprite->data[1] = 2; + return TRUE; +} + +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) + { + mapObject->mapobj_unk_21 = 0; + FieldObjectSetDirection(mapObject, GetOppositeDirection(mapObject->placeholder18)); + } + blockingWay = npc_block_way__next_tile(mapObject, mapObject->placeholder18); + animId = GetGoSpeed0AnimId(mapObject->placeholder18); + 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); + } + if (blockingWay) + { + animId = GetStepInPlaceDelay16AnimId(mapObject->mapobj_unk_18); + } + FieldObjectSetRegularAnim(mapObject, sprite, animId); + mapObject->mapobj_bit_1 = TRUE; + sprite->data[1] = 3; + return TRUE; +} + +bool8 sub_8091020 (struct MapObject *mapObject, struct Sprite *sprite) +{ + if (FieldObjectExecRegularAnim(mapObject, sprite)) + { + mapObject->mapobj_bit_1 = FALSE; + sprite->data[1] = 1; + } + return FALSE; +} + +bool8 sub_8091048(struct MapObject *mapObject, struct Sprite *sprite) +{ + npc_reset(mapObject, sprite); + sprite->data[1] = 1; + return TRUE; +} + +bool8 MoveFieldObjectInNextDirectionInSequence(struct MapObject *mapObject, struct Sprite *sprite, u8 *route) +{ + u8 blockingWay; + u8 animId; + + if (mapObject->mapobj_unk_21 == 3 && mapObject->coords1.x == mapObject->coords2.x && mapObject->coords1.y == mapObject->coords2.y) + { + mapObject->mapobj_unk_21 = 0; + } + FieldObjectSetDirection(mapObject, route[mapObject->mapobj_unk_21]); + animId = GetGoSpeed0AnimId(mapObject->placeholder18); + blockingWay = npc_block_way__next_tile(mapObject, mapObject->placeholder18); + 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); + } + if (blockingWay) + { + animId = GetStepInPlaceDelay16AnimId(mapObject->mapobj_unk_18); + } + FieldObjectSetRegularAnim(mapObject, sprite, animId); + mapObject->mapobj_bit_1 = TRUE; + sprite->data[1] = 2; + return TRUE; +} + +bool8 sub_8091110(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (FieldObjectExecRegularAnim(mapObject, sprite)) + { + mapObject->mapobj_bit_1 = FALSE; + 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) + +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) + { + mapObject->mapobj_unk_21 = player_get_direction_lower_nybble(); + } + sprite->data[1] = 1; + return TRUE; +} + +bool8 sub_8091EC0(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1C == 0xFF || gPlayerAvatar.tileTransitionState == 2) + { + return FALSE; + } + return gUnknown_0850DA64[player_get_x22()](mapObject, sprite, player_get_direction_upper_nybble(), NULL); +} + +bool8 sub_8091F20(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (FieldObjectExecRegularAnim(mapObject, sprite)) + { + mapObject->mapobj_bit_1 = FALSE; + sprite->data[1] = 1; + } + return FALSE; +} + +bool8 sub_8091F48(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) +{ + return FALSE; +} + +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; + sprite->data[1] = 2; + return TRUE; +} + +bool8 sub_8091F94(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) +{ + u32 direction; + s16 x; + s16 y; + + direction = playerDirection; + if (FieldObjectIsFarawayIslandMew(mapObject)) + { + direction = sub_81D427C(); + if (direction == 0) + { + direction = playerDirection; + direction = state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, direction); + FieldObjectMoveDestCoords(mapObject, direction, &x, &y); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); + mapObject->mapobj_bit_1 = TRUE; + sprite->data[1] = 2; + return TRUE; + } + } + else + { + direction = state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, 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)))) + { + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); + } + mapObject->mapobj_bit_1 = TRUE; + sprite->data[1] = 2; + return TRUE; +} + +bool8 sub_80920A4(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) +{ + u32 direction; + s16 x; + s16 y; + + direction = playerDirection; + direction = state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, 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; + sprite->data[1] = 2; + return TRUE; +} + +bool8 sub_809215C(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) +{ + u32 direction; + s16 x; + s16 y; + + direction = playerDirection; + direction = state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, 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; + sprite->data[1] = 2; + return TRUE; +} + +bool8 sub_8092214(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) +{ + u32 direction; + s16 x; + s16 y; + + direction = playerDirection; + direction = state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, 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; + sprite->data[1] = 2; + return TRUE; +} + +bool8 cph_IM_DIFFERENT(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) +{ + u32 direction; + + direction = playerDirection; + direction = state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, direction); + FieldObjectSetRegularAnim(mapObject, sprite, sub_80934BC(direction)); + mapObject->mapobj_bit_1 = TRUE; + sprite->data[1] = 2; + return TRUE; +} + +bool8 sub_8092314(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) +{ + u32 direction; + s16 x; + s16 y; + + direction = playerDirection; + direction = state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, 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; + sprite->data[1] = 2; + return TRUE; +} + +bool8 oac_hopping(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) +{ + u32 direction; + s16 x; + 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; + 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; + sprite->data[1] = 2; + return TRUE; +} + +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) + { + return FALSE; + } + return gUnknown_0850DA64[player_get_x22()](mapObject, sprite, player_get_direction_upper_nybble(), MetatileBehavior_IsPokeGrass); +} + +bool8 sub_80925AC(struct MapObject *, struct Sprite *); + +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])) + { + FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_TREE_DISGUISE); + mapObject->mapobj_unk_21 = 1; + sprite->data[7] ++; + } + FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, sub_80925AC); +} + +bool8 sub_80925AC(struct MapObject *mapObject, struct Sprite *sprite) +{ + npc_reset(mapObject, sprite); + return FALSE; +} + +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])) + { + FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE); + mapObject->mapobj_unk_21 = 1; + sprite->data[7] ++; + } + FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, sub_80925AC); +} + +extern bool8 (*const gUnknown_0850DA9C[])(struct MapObject *, struct Sprite *); +bool8 sub_809268C(struct MapObject *, struct Sprite *); + +void FieldObjectCB_Hidden1(struct Sprite *sprite) +{ + if (!sprite->data[7]) + { + gMapObjects[sprite->data[0]].mapobj_bit_26 = TRUE; + sprite->subspriteMode = 2; + sprite->oam.priority = 3; + sprite->data[7] ++; + } + FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, sub_809268C); +} + +bool8 sub_809268C(struct MapObject *mapObject, struct Sprite *sprite) +{ + return gUnknown_0850DA9C[sprite->data[1]](mapObject, sprite); +} + +bool8 sub_80926AC (struct MapObject *mapObject, struct Sprite *sprite) +{ + npc_reset(mapObject, sprite); + return FALSE; +} +bool8 sub_80926B8 (struct MapObject *mapObject, struct Sprite *sprite) +{ + if (FieldObjectExecRegularAnim(mapObject, sprite)) + { + sprite->data[1] = 0; + } + return FALSE; +} + +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)); + sprite->data[1] = 1; + return TRUE; +} + +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)); + sprite->data[1] = 1; + return TRUE; +} + +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)); + sprite->data[1] = 1; + return TRUE; +} + +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)); + sprite->data[1] = 1; + return TRUE; +} + +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; + sprite->data[1] = 1; + return TRUE; +} +bool8 sub_809290C(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (FieldObjectExecRegularAnim(mapObject, sprite)) + { + sprite->data[1] = 2; + return TRUE; + } + return FALSE; +} + +bool8 sub_809292C(struct MapObject *mapObject, struct Sprite *sprite) +{ + mapObject->mapobj_bit_1 = 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; + sprite->data[1] = 0; +} + +#define dirn2anim(name, table)\ +extern const u8 table[4];\ +u8 name(u8 direction)\ +{\ + return table[direction];\ +} + +dirn2anim(FieldObjectDirectionToImageAnimId, 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) + +// 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; + + for (retval = gUnknown_085094AC; retval->anims != NULL; retval ++) + { + if (retval->anims == anims) + { + return retval; + } + } + return NULL; +} + +void npc_apply_anim_looping(struct MapObject *mapObject, struct Sprite *sprite, u8 animNum) +{ + const struct UnkStruct_085094AC *unk85094AC; + + if (!mapObject->mapobj_bit_12) + { + sprite->animNum = animNum; + unk85094AC = sub_8092A4C(sprite->anims); + if (unk85094AC != NULL) + { + if (sprite->animCmdIndex == unk85094AC->animPos[0]) + { + sprite->animCmdIndex = unk85094AC->animPos[3]; + } + else if (sprite->animCmdIndex == unk85094AC->animPos[1]) + { + sprite->animCmdIndex = unk85094AC->animPos[2]; + } + } + SeekSpriteAnim(sprite, sprite->animCmdIndex); + } +} + +void obj_npc_animation_step(struct MapObject *mapObject, struct Sprite *sprite, u8 animNum) +{ + const struct UnkStruct_085094AC *unk85094AC; + + if (!mapObject->mapobj_bit_12) + { + u8 animPos; + + sprite->animNum = animNum; + unk85094AC = sub_8092A4C(sprite->anims); + if (unk85094AC != NULL) + { + animPos = unk85094AC->animPos[1]; + if (sprite->animCmdIndex <= unk85094AC->animPos[0]) + { + animPos = unk85094AC->animPos[0]; + } + SeekSpriteAnim(sprite, animPos); + } + } +} + +// file boundary? + +u8 sub_8092AF8(s16 x1, s16 y1, s16 x2, s16 y2) +{ + if (x1 > x2) + { + return DIR_WEST; + } + if (x1 < x2) + { + return DIR_EAST; + } + if (y1 > y2) + { + return DIR_NORTH; + } + return DIR_SOUTH; +} + +void npc_set_running_behaviour_etc(struct MapObject *mapObject, u8 animPattern) +{ + mapObject->animPattern = animPattern; + mapObject->mapobj_unk_21 = 0; + mapObject->animId = 0; + gSprites[mapObject->spriteId].callback = gUnknown_08505438[animPattern]; + gSprites[mapObject->spriteId].data[1] = 0; +} + +dirn2anim(npc_running_behaviour_by_direction, gUnknown_0850DB53) + +u8 npc_block_way__next_tile(struct MapObject *mapObject, u8 direction) +{ + s16 x; + s16 y; + + x = mapObject->coords2.x; + y = mapObject->coords2.y; + MoveCoords(direction, &x, &y); + return npc_block_way(mapObject, x, y, direction); +} + +u8 npc_block_way(struct MapObject *mapObject, s16 x, s16 y, u32 dirn) +{ + u8 direction; + + direction = dirn; + if (IsCoordOutsideFieldObjectMovementRect(mapObject, x, y)) + { + return 1; + } + if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(mapObject, x, y, direction)) + { + return 2; + } + if (mapObject->mapobj_bit_15 && !CanCameraMoveInDirection(direction)) + { + return 2; + } + if (IsZCoordMismatchAt(mapObject->mapobj_unk_0B_0, x, y)) + { + return 3; + } + if (CheckForCollisionBetweenFieldObjects(mapObject, x, y)) + { + return 4; + } + return 0; +} + +u8 sub_8092C8C(struct MapObject *mapObject, s16 x, s16 y, u8 direction) +{ + u8 retval; + + retval = 0x00; + if (IsCoordOutsideFieldObjectMovementRect(mapObject, x, y)) + { + retval |= 1; + } + if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(mapObject, x, y, direction) || (mapObject->mapobj_bit_15 && !CanCameraMoveInDirection(direction))) + { + retval |= 2; + } + if (IsZCoordMismatchAt(mapObject->mapobj_unk_0B_0, x, y)) + { + retval |= 4; + } + if (CheckForCollisionBetweenFieldObjects(mapObject, x, y)) + { + retval |= 8; + } + return retval; +} + +static bool8 IsCoordOutsideFieldObjectMovementRect(struct MapObject *mapObject, s16 x, s16 y) +{ + s16 left; + s16 right; + s16 top; + s16 bottom; + + 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; + if (left > x || right < x) + { + return TRUE; + } + } + 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; + if (top > y || bottom < y) + { + return TRUE; + } + } + return FALSE; +} + +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))) + { + return TRUE; + } + return FALSE; +} + +static bool8 CheckForCollisionBetweenFieldObjects(struct MapObject *mapObject, s16 x, s16 y) +{ + u8 i; + struct MapObject *curObject; + + for (i = 0; i < NUM_FIELD_OBJECTS; i ++) + { + 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 (AreZCoordsCompatible(mapObject->mapobj_unk_0B_0, curObject->mapobj_unk_0B_0)) + { + return TRUE; + } + } + } + } + return FALSE; +} + +bool8 sub_8092E9C(u8 localId, u8 mapNum, u8 mapGroup) +{ + u8 mapObjectId; + + if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId) && gSprites[gMapObjects[mapObjectId].spriteId].data[7] & 0x02) + { + return TRUE; + } + return FALSE; +} + +void sub_8092EF0(u8 localId, u8 mapNum, u8 mapGroup) +{ + u8 mapObjectId; + + if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) + { + gSprites[gMapObjects[mapObjectId].spriteId].data[7] |= 0x04; + } +} + +void MoveCoords(u8 direction, s16 *x, s16 *y) +{ + *x += gUnknown_0850DB7C[direction].x; + *y += gUnknown_0850DB7C[direction].y; +} + +void sub_8092F60(u8 direction, s16 *x, s16 *y) +{ + *x += gUnknown_0850DB7C[direction].x << 4; + *y += gUnknown_0850DB7C[direction].y << 4; +} + +void sub_8092F88(u32 dirn, s16 *x, s16 *y, s16 dx, s16 dy) +{ + u8 direction; + s16 dx_2; + s16 dy_2; + s16 cur_x; + s16 cur_y; + + direction = dirn; + dx_2 = dx; + dy_2 = dy; + cur_x = gUnknown_0850DB7C[direction].x; + if (cur_x > 0) + { + *x += dx_2; + } + if (cur_x < 0) + { + *x -= dx_2; + } + cur_y = gUnknown_0850DB7C[direction].y; + if (cur_y > 0) + { + *y += dy_2; + } + if (cur_y < 0) + { + *y -= dy_2; + } +} + +void sub_8092FF0(s16 x, s16 y, s16 *dest_x, s16 *dest_y) +{ + *dest_x = (x - gSaveBlock1Ptr->pos.x) << 4; + *dest_y = (y - gSaveBlock1Ptr->pos.y) << 4; + *dest_x -= gUnknown_03005DEC; + *dest_y -= gUnknown_03005DE8; +} + +void sub_8093038(s16 x, s16 y, s16 *dest_x, s16 *dest_y) +{ + s16 dx; + s16 dy; + + dx = -gUnknown_03005DEC - gUnknown_03005DD0.x; + dy = -gUnknown_03005DE8 - gUnknown_03005DD0.y; + if (gUnknown_03005DD0.x > 0) + { + dx += 0x10; + } + if (gUnknown_03005DD0.x < 0) + { + dx -= 0x10; + } + if (gUnknown_03005DD0.y > 0) + { + dy += 0x10; + } + if (gUnknown_03005DD0.y < 0) + { + dy -= 0x10; + } + *dest_x = ((x - gSaveBlock1Ptr->pos.x) << 4) + dx; + *dest_y = ((y - gSaveBlock1Ptr->pos.y) << 4) + dy; +} + +void sub_80930E0(s16 *x, s16 *y, s16 dx, s16 dy) +{ + sub_8093038(*x, *y, x, y); + *x += dx; + *y += dy; +} + +void GetFieldObjectMovingCameraOffset(s16 *x, s16 *y) +{ + *x = 0; + *y = 0; + if (gUnknown_03005DD0.x > 0) + { + (*x) ++; + } + if (gUnknown_03005DD0.x < 0) + { + (*x) --; + } + if (gUnknown_03005DD0.y > 0) + { + (*y) ++; + } + if (gUnknown_03005DD0.y < 0) + { + (*y) --; + } +} + +void FieldObjectMoveDestCoords(struct MapObject *mapObject, u32 dirn, s16 *x, s16 *y) +{ + u8 direction; + + direction = dirn; + *x = mapObject->coords2.x; + *y = mapObject->coords2.y; + MoveCoords(direction, x, y); +} + +// file boundary? + +bool8 FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct MapObject *mapObject) +{ + if (mapObject->mapobj_bit_1 || mapObject->mapobj_bit_6) + { + return TRUE; + } + return FALSE; +} + +bool8 FieldObjectIsSpecialAnimActive(struct MapObject *mapObject) +{ + if (mapObject->mapobj_bit_6 && mapObject->mapobj_unk_1C != 0xFF) + { + return TRUE; + } + return FALSE; +} + +bool8 FieldObjectSetSpecialAnim(struct MapObject *mapObject, u8 specialAnimId) +{ + if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject)) + { + return TRUE; + } + npc_sync_anim_pause_bits(mapObject); + mapObject->mapobj_unk_1C = specialAnimId; + mapObject->mapobj_bit_6 = TRUE; + mapObject->mapobj_bit_7 = FALSE; + gSprites[mapObject->spriteId].data[2] = 0; + return FALSE; +} + +void FieldObjectForceSetSpecialAnim(struct MapObject *mapObject, u8 specialAnimId) +{ + FieldObjectClearAnimIfSpecialAnimActive(mapObject); + FieldObjectSetSpecialAnim(mapObject, specialAnimId); +} + +void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *mapObject) +{ + if (mapObject->mapobj_bit_6) + { + FieldObjectClearAnim(mapObject); + } +} + +void FieldObjectClearAnim(struct MapObject *mapObject) +{ + mapObject->mapobj_unk_1C = 0xFF; + mapObject->mapobj_bit_6 = FALSE; + mapObject->mapobj_bit_7 = FALSE; + gSprites[mapObject->spriteId].data[1] = 0; + gSprites[mapObject->spriteId].data[2] = 0; +} + +u8 FieldObjectCheckIfSpecialAnimFinishedOrInactive(struct MapObject *mapObject) +{ + if (mapObject->mapobj_bit_6) + { + return mapObject->mapobj_bit_7; + } + return 0x10; +} + +u8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *mapObject) +{ + u8 specialAnimState; + + specialAnimState = FieldObjectCheckIfSpecialAnimFinishedOrInactive(mapObject); + if (specialAnimState != 0 && specialAnimState != 16) + { + FieldObjectClearAnimIfSpecialAnimActive(mapObject); + } + return specialAnimState; +} + +u8 FieldObjectGetSpecialAnim(struct MapObject *mapObject) +{ + if (mapObject->mapobj_bit_6) + { + return mapObject->mapobj_unk_1C; + } + return 0xFF; +} + +void FieldObjectStep(struct MapObject *mapObject, struct Sprite *sprite, bool8 (*callback)(struct MapObject *, struct Sprite *)) +{ + DoGroundEffects_OnSpawn(mapObject, sprite); + sub_80964E8(mapObject, sprite); + if (FieldObjectIsSpecialAnimActive(mapObject)) + { + FieldObjectExecSpecialAnim(mapObject, sprite); + } + else if (!mapObject->mapobj_bit_8) + { + while (callback(mapObject, 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); +} + +#define dirn2anim_2(name, table) \ +extern const u8 table[5]; \ +u8 name(u32 direction) \ +{ \ + u8 dirn2; \ + u8 animIds[5]; \ + dirn2 = direction; \ + memcpy(animIds, table, 5); \ + if (dirn2 > DIR_EAST) \ + { \ + dirn2 = 0; \ + } \ + return animIds[dirn2]; \ +} + +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); + +bool8 FieldObjectFaceOppositeDirection(struct MapObject *mapObject, u8 direction) +{ + return FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(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); + +extern const u8 gUnknown_0850DC27[8]; + +u8 GetOppositeDirection(u8 direction) +{ + u8 directions[sizeof gUnknown_0850DC27]; + + memcpy(directions, gUnknown_0850DC27, sizeof gUnknown_0850DC27); + if (direction < 1 || direction > (sizeof gUnknown_0850DC27)) + { + return direction; + } + return directions[direction - 1]; +} + +static u32 zffu_offset_calc(u8 a0, u8 a1) +{ + return gUnknown_0850DC2F[a0 - 1][a1 - 1]; +} + +static u32 state_to_direction(u8 a0, u32 a1, u32 a2) +{ + u32 zffuOffset; + u8 a1_2; + u8 a2_2; + + a1_2 = a1; + a2_2 = a2; + if (a1_2 == 0 || a2_2 == 0 || a1_2 > DIR_EAST || a2_2 > DIR_EAST) + { + return 0; + } + zffuOffset = zffu_offset_calc(a1_2, a2); + return gUnknown_0850DC3F[a0 - 1][zffuOffset - 1]; +} + +static void FieldObjectExecSpecialAnim(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (gUnknown_0850DC50[mapObject->mapobj_unk_1C][sprite->data[2]](mapObject, sprite)) + { + mapObject->mapobj_bit_7 = TRUE; + } +} + +bool8 FieldObjectExecRegularAnim(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (gUnknown_0850DC50[mapObject->mapobj_unk_1C][sprite->data[2]](mapObject, sprite)) + { + mapObject->mapobj_unk_1C = 0xFF; + sprite->data[2] = 0; + return TRUE; + } + return FALSE; +} + +void FieldObjectSetRegularAnim(struct MapObject *mapObject, struct Sprite *sprite, u8 animId) +{ + mapObject->mapobj_unk_1C = animId; + sprite->data[2] = 0; +} + +// file boundary? + +void an_look_any(struct MapObject *mapObject, 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->mapobj_unk_18)); + sprite->animPaused = TRUE; + sprite->data[2] = 1; +} + +bool8 sub_8093950(struct MapObject *mapObject, struct Sprite *sprite) +{ + an_look_any(mapObject, sprite, DIR_SOUTH); + return TRUE; +} + +bool8 sub_8093960(struct MapObject *mapObject, struct Sprite *sprite) +{ + an_look_any(mapObject, sprite, DIR_NORTH); + return TRUE; +} + +bool8 sub_8093970(struct MapObject *mapObject, struct Sprite *sprite) +{ + an_look_any(mapObject, sprite, DIR_WEST); + return TRUE; +} + +bool8 sub_8093980(struct MapObject *mapObject, struct Sprite *sprite) +{ + an_look_any(mapObject, sprite, DIR_EAST); + return TRUE; +} + +void npc_apply_direction(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 speed) +{ + s16 x; + s16 y; + + x = mapObject->coords2.x; + y = mapObject->coords2.y; + FieldObjectSetDirection(mapObject, direction); + MoveCoords(direction, &x, &y); + npc_coords_shift(mapObject, x, y); + oamt_npc_ministep_reset(sprite, direction, speed); + sprite->animPaused = FALSE; + if (gUnknown_020375B8 != NULL && sub_8097F78(mapObject) != 0x10) + { + sprite->animPaused = TRUE; + } + mapObject->mapobj_bit_2 = TRUE; + sprite->data[2] = 1; +} + +void do_go_anim(struct MapObject *mapObject, 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->mapobj_unk_18)); +} + +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)); +} + +bool8 npc_obj_ministep_stop_on_arrival(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (obj_npc_ministep(sprite)) + { + npc_coords_shift_still(mapObject); + mapObject->mapobj_bit_3 = TRUE; + sprite->animPaused = TRUE; + return TRUE; + } + return FALSE; +} + +void sub_8093AF0(struct MapObject *mapObject, struct Sprite *sprite, u8 direction) +{ + s16 x; + s16 y; + + x = mapObject->coords2.x; + y = mapObject->coords2.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; + 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)); +} + +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; + sprite->animPaused = TRUE; + return TRUE; + } + return FALSE; +} + +#define an_walk_any_2_macro(name, fn1, fn2, ...) \ +bool8 name##_2(struct MapObject *, struct Sprite *);\ +bool8 name(struct MapObject *mapObject, struct Sprite *sprite)\ +{\ + fn1(mapObject, sprite, __VA_ARGS__);\ + return name##_2(mapObject, sprite);\ +}\ +bool8 name##_2(struct MapObject *mapObject, struct Sprite *sprite)\ +{\ + if (fn2(mapObject, sprite))\ + {\ + sprite->data[2] = 2;\ + return TRUE;\ + }\ + return FALSE;\ +} + +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) + +void sub_8093FC4(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a5) +{ + s16 displacements[ARRAY_COUNT(gUnknown_0850DFBC)]; + s16 x; + s16 y; + + memcpy(displacements, gUnknown_0850DFBC, sizeof gUnknown_0850DFBC); + x = 0; + 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); + sub_809783C(sprite, direction, speed, a5); + sprite->data[2] = 1; + sprite->animPaused = 0; + mapObject->mapobj_bit_2 = 1; + mapObject->mapobj_bit_4 = 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)); + DoShadowFieldEffect(mapObject); +} + +u8 sub_80940C4(struct MapObject *mapObject, struct Sprite *sprite, u8 callback(struct Sprite *)) +{ + s16 displacements[ARRAY_COUNT(gUnknown_0850DFC2)]; + s16 x; + s16 y; + u8 result; + + memcpy(displacements, gUnknown_0850DFC2, sizeof gUnknown_0850DFC2); + result = callback(sprite); + if (result == 1 && displacements[sprite->data[4]] != 0) + { + 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; + } + else if (result == 0xFF) + { + npc_coords_shift_still(mapObject); + mapObject->mapobj_bit_3 = TRUE; + mapObject->mapobj_bit_5 = TRUE; + sprite->animPaused = TRUE; + } + return result; +} + +u8 sub_8094188(struct MapObject *mapObject, struct Sprite *sprite) +{ + return sub_80940C4(mapObject, sprite, sub_809785C); +} + +u8 sub_809419C(struct MapObject *mapObject, struct Sprite *sprite) +{ + return sub_80940C4(mapObject, sprite, sub_80978E4); +} + +bool8 sub_80941B0(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (sub_8094188(mapObject, sprite) == 0xFF) + { + return TRUE; + } + return FALSE; +} + +bool8 sub_80941C8(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (sub_809419C(mapObject, sprite) == 0xFF) + { + return TRUE; + } + return FALSE; +} + +bool8 sub_80941E0(struct MapObject *mapObject, struct Sprite *sprite) +{ + switch (sub_8094188(mapObject, 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)); + 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)\ +{\ + fn1(mapObject, sprite, __VA_ARGS__);\ + return name##_2(mapObject, sprite);\ +}\ +bool8 name##_2(struct MapObject *mapObject, struct Sprite *sprite)\ +{\ + if (fn2(mapObject, sprite))\ + {\ + mapObject->mapobj_bit_22 = 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) +{ + sprite->data[2] = 1; + sprite->data[3] = duration; +} + +bool8 sub_8094398(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (-- sprite->data[3] == 0) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +#define special_anim_with_timer(name, duration)\ +bool8 name(struct MapObject *mapObject, struct Sprite *sprite)\ +{\ + sub_8094390(sprite, duration);\ + return sub_8094398(mapObject, 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) + +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 MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 animNum, u16 duration) +{ + FieldObjectSetDirection(mapObject, direction); + npc_apply_anim_looping(mapObject, sprite, animNum); + sprite->animPaused = FALSE; + sprite->data[2] = 1; + sprite->data[3] = duration; +} + +bool8 sub_809459C(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (-- sprite->data[3] == 0) + { + sprite->data[2] = 2; + sprite->animPaused = TRUE; + return TRUE; + } + return FALSE; +} + +bool8 sub_80945C4(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (sprite->data[3] & 1) + { + sprite->animDelayCounter ++; + } + return sub_809459C(mapObject, sprite); +} + +#define special_anim_with_timer_2(name, direction, images, duration, timer) \ +bool8 name(struct MapObject *mapObject, struct Sprite *sprite)\ +{\ + u8 animId;\ + animId = images(DIR_##direction);\ + sub_8094554(mapObject, sprite, DIR_##direction, animId, duration);\ + return timer(mapObject, 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 MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 animNum) +{ + obj_anim_image_set_and_seek(sprite, animNum, 0); + FieldObjectSetDirection(mapObject, direction); + sprite->data[2] = 1; +} + +bool8 sub_8094DAC(struct MapObject *mapObject, struct Sprite *sprite) +{ + npc_set_direction_and_anim__an_proceed(mapObject, sprite, mapObject->placeholder18, sprite->animNum); + return FALSE; +} + +bool8 sub_8094DC4(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (sub_80979BC(sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +void sub_8094DE4(struct MapObject *mapObject, struct Sprite *sprite, u8 direction) +{ + sub_8093FC4(mapObject, 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)\ +{\ + sub_8094DE4(mapObject, sprite, direction);\ + return name##_2(mapObject, sprite);\ +}\ +bool8 name##_2(struct MapObject *mapObject, struct Sprite *sprite)\ +{\ + if (sub_80941C8(mapObject, sprite))\ + {\ + sprite->data[2] = 2;\ + mapObject->mapobj_bit_5 = 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 MapObject *mapObject, struct Sprite *sprite) +{ + u8 mapObjectId; + + 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)); + } + sprite->data[2] = 1; + return TRUE; +} + +bool8 sub_8094F94(struct MapObject *mapObject, struct Sprite *sprite) +{ + u8 mapObjectId; + + 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))); + } + sprite->data[2] = 1; + return TRUE; +} + +bool8 sub_8094FF8(struct MapObject *mapObject, struct Sprite *sprite) +{ + mapObject->mapobj_bit_9 = TRUE; + sprite->data[2] = 1; + return TRUE; +} + +bool8 sub_8095008(struct MapObject *mapObject, struct Sprite *sprite) +{ + mapObject->mapobj_bit_9 = 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 MapObject *mapObject, struct Sprite *sprite) +{ + an_look_any(mapObject, sprite, gUnknown_085055CD[mapObject->animPattern]); + return TRUE; +} + +bool8 sub_8095450(struct MapObject *mapObject, struct Sprite *sprite) +{ + npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_SOUTH, 0x14); + return FALSE; +} + +bool8 sub_8095460(struct MapObject *mapObject, struct Sprite *sprite) +{ + mapObject->mapobj_bit_25 = FALSE; + sprite->data[2] = 1; + return TRUE; +} + +bool8 sub_8095470(struct MapObject *mapObject, struct Sprite *sprite) +{ + mapObject->mapobj_bit_25 = TRUE; + sprite->data[2] = 1; + return TRUE; +} + +bool8 sub_8095480(struct MapObject *mapObject, struct Sprite *sprite) +{ + mapObject->mapobj_bit_12 = TRUE; + sprite->data[2] = 1; + return TRUE; +} + +bool8 sub_8095490(struct MapObject *mapObject, struct Sprite *sprite) +{ + mapObject->mapobj_bit_12 = GetFieldObjectGraphicsInfo(mapObject->graphicsId)->inanimate; + sprite->data[2] = 1; + return TRUE; +} + +bool8 sub_80954BC(struct MapObject *mapObject, struct Sprite *sprite) +{ + mapObject->mapobj_bit_13 = TRUE; + sprite->data[2] = 1; + return TRUE; +} + +bool8 sub_80954CC(struct MapObject *mapObject, struct Sprite *sprite) +{ + mapObject->mapobj_bit_13 = FALSE; + sprite->data[2] = 1; + return TRUE; +} + +bool8 do_exclamation_mark_bubble_1(struct MapObject *mapObject, struct Sprite *sprite) +{ + FieldObjectGetLocalIdAndMap(mapObject, &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) +{ + FieldObjectGetLocalIdAndMap(mapObject, &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) +{ + FieldObjectGetLocalIdAndMap(mapObject, &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) +{ + if (mapObject->animPattern == 0x3F) + { + sub_80B4578(mapObject); + return FALSE; + } + if (mapObject->animPattern != 0x39 && mapObject->animPattern != 0x3A) + { + sprite->data[2] = 2; + return TRUE; + } + sub_8155D78(mapObject); + sprite->data[2] = 1; + return sub_809558C(mapObject, sprite); +} + +bool8 sub_809558C(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (sub_8155DA0(mapObject)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 sub_80955AC(struct MapObject *mapObject, 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) +{ + if (sub_80979BC(sprite)) + { + SetFieldObjectStepTimer(sprite, 32); + sprite->data[2] = 2; + } + return FALSE; +} + +bool8 sub_80955EC(struct MapObject *mapObject, struct Sprite *sprite) +{ + mapObject->mapobj_bit_13 ^= TRUE; + if (RunFieldObjectStepTimer(sprite)) + { + mapObject->mapobj_bit_13 = TRUE; + sprite->data[2] = 3; + } + return FALSE; +} + +bool8 sub_8095628(struct MapObject *mapObject, 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) +{ + if (sub_80979BC(sprite)) + { + SetFieldObjectStepTimer(sprite, 32); + sprite->data[2] = 2; + } + return FALSE; +} + +bool8 sub_8095668(struct MapObject *mapObject, struct Sprite *sprite) +{ + mapObject->mapobj_bit_13 ^= TRUE; + if (RunFieldObjectStepTimer(sprite)) + { + mapObject->mapobj_bit_13 = TRUE; + sprite->data[2] = 3; + } + return FALSE; +} + +bool8 sub_80956A4(struct MapObject *mapObject, struct Sprite *sprite) +{ + mapObject->mapobj_bit_26 = TRUE; + sprite->data[2] = 1; + return TRUE; +} + +bool8 sub_80956B4(struct MapObject *mapObject, struct Sprite *sprite) +{ + mapObject->mapobj_bit_26 = FALSE; + sprite->data[2] = 1; + return TRUE; +} + +bool8 sub_80956C4(struct MapObject *mapObject, struct Sprite *sprite) +{ + sprite->oam.affineMode = 3; + InitSpriteAffineAnim(sprite); + sprite->affineAnimPaused = TRUE; + sprite->subspriteMode = 0; + return TRUE; +} + +bool8 sub_80956F4(struct MapObject *mapObject, struct Sprite *sprite) +{ + FreeOamMatrix(sprite->oam.matrixNum); + sprite->oam.affineMode = 0; + CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode); + return TRUE; +} + +bool8 sub_8095724(struct MapObject *mapObject, struct Sprite *sprite) +{ + mapObject->mapobj_bit_27 = TRUE; + return TRUE; +} + +bool8 sub_8095730(struct MapObject *mapObject, struct Sprite *sprite) +{ + mapObject->mapobj_bit_27 = 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)\ +{\ + fn(mapObject, sprite, __VA_ARGS__);\ + sprite->affineAnimPaused = FALSE;\ + action(sprite, anim);\ + return name##_2(mapObject, sprite);\ +}\ +bool8 name##_2(struct MapObject *mapObject, struct Sprite *sprite)\ +{\ + if (fn2(mapObject, sprite))\ + {\ + sprite->affineAnimPaused = TRUE;\ + sprite->data[2] = 2;\ + return TRUE;\ + }\ + return FALSE;\ +}\ + +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) + +static void sub_80958C0(struct MapObject *mapObject, struct Sprite *sprite, u8 direction) +{ + FieldObjectSetDirection(mapObject, direction); + npc_coords_shift_still(mapObject); + obj_npc_animation_step(mapObject, sprite, sub_80929FC(direction)); + sprite->animPaused = TRUE; + sprite->data[2] = 1; +} + +bool8 sub_8095900(struct MapObject *mapObject, struct Sprite *sprite) +{ + sub_80958C0(mapObject, sprite, DIR_SOUTH); + return TRUE; +} + +bool8 sub_8095910(struct MapObject *mapObject, struct Sprite *sprite) +{ + sub_80958C0(mapObject, sprite, DIR_NORTH); + return TRUE; +} + +bool8 sub_8095920(struct MapObject *mapObject, struct Sprite *sprite) +{ + sub_80958C0(mapObject, sprite, DIR_WEST); + return TRUE; +} + +bool8 sub_8095930(struct MapObject *mapObject, struct Sprite *sprite) +{ + sub_80958C0(mapObject, sprite, DIR_EAST); + return TRUE; +} + +#define set_dirn_and_anim__an_proceed(name, direction, anims)\ +bool8 name(struct MapObject *mapObject, struct Sprite *sprite)\ +{\ + npc_set_direction_and_anim__an_proceed(mapObject, sprite, direction, anims(direction));\ + 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) + +void sub_8095AF0(struct MapObject *mapObject, struct Sprite *sprite) +{ + sub_8097750(sprite); + sprite->animPaused = FALSE; +} + +bool8 sub_8095B0C(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (sub_8097758(sprite)) + { + npc_coords_shift_still(mapObject); + mapObject->mapobj_bit_3 = TRUE; + sprite->animPaused = TRUE; + return TRUE; + } + return FALSE; +} + +bool8 sub_8095B44(struct MapObject *mapObject, struct Sprite *sprite) +{ + sub_8095AF0(mapObject, sprite); + sprite->data[2] = 1; + return sub_8095B64(mapObject, sprite); +} + +bool8 sub_8095B64(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (sub_8095B0C(mapObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +void sub_8095B84(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a4) +{ + sub_8093FC4(mapObject, sprite, direction, speed, a4); + StartSpriteAnimIfDifferent(sprite, sub_80929BC(direction)); + DoShadowFieldEffect(mapObject); +} + +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) + +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) + +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)); + 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) + +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)); +} + +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) + +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)); + 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 MapObject *mapObject, struct Sprite *sprite) +{ + sub_8097FA4(mapObject); + sprite->data[2] = 1; + return TRUE; +} + +bool8 sub_809647C(struct MapObject *mapObject, struct Sprite *sprite) +{ + sub_8098044(mapObject->mapobj_unk_1B); + sprite->pos2.y = 0; + sprite->data[2] = 1; + return TRUE; +} + +bool8 sub_8096494(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (sprite->pos2.y == 0) + { + sub_8098044(mapObject->mapobj_unk_1B); + sprite->data[2] = 1; + return TRUE; + } + return FALSE; +} + +bool8 sub_80964B8(struct MapObject *mapObject, struct Sprite *sprite) +{ + return TRUE; +} + +bool8 sub_80964BC(struct MapObject *mapObject, struct Sprite *sprite) +{ + sprite->animPaused = TRUE; + return TRUE; +} + +void npc_obj_transfer_image_anim_pause_flag(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (mapObject->mapobj_bit_10) + { + sprite->animPaused = TRUE; + } +} + +void sub_80964E8(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (mapObject->mapobj_bit_11) + { + sprite->animPaused = FALSE; + mapObject->mapobj_bit_10 = FALSE; + mapObject->mapobj_bit_11 = FALSE; + } +} + +void sub_8096518(struct MapObject *mapObject, struct Sprite *sprite) +{ + sub_8096530(mapObject, sprite); + npc_update_obj_anim_flag(mapObject, sprite); +} + +static void sub_8096530(struct MapObject *mapObject, struct Sprite *sprite) +{ + u16 x; + u16 y; + u16 x2; + u16 y2; + const struct MapObjectGraphicsInfo *graphicsInfo; + + mapObject->mapobj_bit_14 = FALSE; + graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId); + 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 = graphicsInfo->width; + x2 += x; + y2 = y; + y2 += graphicsInfo->height; + if ((s16)x >= 0x100 || (s16)x2 < -0x10) + { + mapObject->mapobj_bit_14 = TRUE; + } + if ((s16)y >= 0xB0 || (s16)y2 < -0x10) + { + mapObject->mapobj_bit_14 = 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) + { + 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/event_object_movement_helpers.c b/src/event_object_movement_helpers.c new file mode 100755 index 000000000..48f3b9052 --- /dev/null +++ b/src/event_object_movement_helpers.c @@ -0,0 +1,705 @@ +#include "global.h" +#include "field_ground_effect.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->mapobj_bit_6 || mapObject->mapobj_bit_8) + { + return TRUE; + } + else + { + mapObject->mapobj_bit_8 = 1; + mapObject->mapobj_bit_23 = gSprites[mapObject->spriteId].animPaused; + mapObject->mapobj_bit_24 = 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->mapobj_bit_8) + { + mapObject->mapobj_bit_8 = 0; + gSprites[mapObject->spriteId].animPaused = mapObject->mapobj_bit_23; + gSprites[mapObject->spriteId].affineAnimPaused = mapObject->mapobj_bit_24; + } +} + +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 oe_exec_and_other_stuff(u8 fieldEffectId, struct MapObject *mapObject) +{ + FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + return FieldEffectStart(fieldEffectId); +} + +void DoShadowFieldEffect(struct MapObject *mapObject) +{ + if (!mapObject->mapobj_bit_22) + { + mapObject->mapobj_bit_22 = 1; + oe_exec_and_other_stuff(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->mapobj_bit_12 = TRUE; + mapObject->mapobj_bit_9 = 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->mapobj_bit_12 = GetFieldObjectGraphicsInfo(mapObject->graphicsId)->inanimate; + mapObject->mapobj_bit_9 = 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->mapobj_unk_1B = 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; +} diff --git a/src/field_camera.c b/src/field_camera.c index 95167ee10..b937f704b 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 692090779..79753f027 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_map_obj.c b/src/field_map_obj.c deleted file mode 100644 index af018eb16..000000000 --- a/src/field_map_obj.c +++ /dev/null @@ -1,5119 +0,0 @@ -// Includes - -#include "global.h" -#include "malloc.h" -#include "sprite.h" -#include "overworld.h" -#include "random.h" -#include "event_scripts.h" -#include "berry.h" -#include "palette.h" -#include "field_player_avatar.h" -#include "fieldmap.h" -#include "event_data.h" -#include "rom_818CFC8.h" -#include "rom_81BE66C.h" -#include "field_ground_effect.h" -#include "field_map_obj_helpers.h" -#include "mauville_old_man.h" -#include "metatile_behavior.h" -#include "field_effect.h" -#include "field_effect_helpers.h" -#include "field_camera.h" -#include "trainer_see.h" -#include "decoration.h" -#include "field_map_obj.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->mapobj_unk_21 == (catch) && mapObject->coords1.coord == mapObject->coords2.coord)\ - {\ - mapObject->mapobj_unk_21 = (catch) + 1;\ - }\ - return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, route);\ -}\ - -// Static struct declarations - -// Static RAM declarations - -extern u8 gUnknown_020375B4; -extern u16 gUnknown_020375B6; - -// 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); -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 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 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*/ struct MapObjectTemplate *FindFieldObjectTemplateInArrayByLocalId(u8 localId, struct MapObjectTemplate *templates, u8 count); -void npc_reset(struct MapObject *, struct Sprite *); -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); -u8 GetJumpLedgeAnimId(u32); -void sub_8092F88(u32, s16 *, s16 *, s16, s16); - -bool8 FieldObjectExecRegularAnim(struct MapObject *, struct Sprite *); -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); -/*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 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 *); - -// 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 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]; - -// Code - -static void npc_clear_ids_and_state(struct MapObject *mapObject) -{ - *mapObject = (struct MapObject){}; - mapObject->localId = 0xFF; - mapObject->mapNum = -1; - mapObject->mapGroup = -1; - mapObject->mapobj_unk_1C = -1; -} - -static void npcs_clear_ids_and_state(void) -{ - u8 i; - - for (i = 0; i < NUM_FIELD_OBJECTS; i ++) - { - npc_clear_ids_and_state(&gMapObjects[i]); - } -} - -void sub_808D438(void) -{ - ZeroAllLinkPlayerMapObjects(); - npcs_clear_ids_and_state(); - ClearPlayerAvatarInfo(); - sub_808D450(); -} - -static void sub_808D450(void) -{ - u8 spriteIdx; - - 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; -} - -u8 sub_808D4F4(void) -{ - u8 i; - - for (i = 0; i < NUM_FIELD_OBJECTS; i ++) - { - if (!gMapObjects[i].active) - { - break; - } - } - return i; -} - -u8 GetFieldObjectIdByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId) -{ - if (localId < 0xff) - { - return GetFieldObjectIdByLocalIdAndMapInternal(localId, mapId, mapGroupId); - } - return GetFieldObjectIdByLocalId(localId); -} - -bool8 TryGetFieldObjectIdByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId, u8 *fieldObjectId) -{ - *fieldObjectId = GetFieldObjectIdByLocalIdAndMap(localId, mapId, mapGroupId); - if (*fieldObjectId == NUM_FIELD_OBJECTS) - { - return TRUE; - } - return FALSE; -} - -u8 GetFieldObjectIdByXY(s16 x, s16 y) -{ - u8 i; - - for (i = 0; i < NUM_FIELD_OBJECTS; i ++) - { - if (gMapObjects[i].active && gMapObjects[i].coords2.x == x && gMapObjects[i].coords2.y == y) - { - break; - } - } - return i; -} - -static u8 GetFieldObjectIdByLocalIdAndMapInternal(u8 localId, u8 mapId, u8 mapGroupId) -{ - u8 i; - - for (i = 0; i < NUM_FIELD_OBJECTS; i ++) - { - if (gMapObjects[i].active && gMapObjects[i].localId == localId && gMapObjects[i].mapNum == mapId && gMapObjects[i].mapGroup == mapGroupId) - { - return i; - } - } - return NUM_FIELD_OBJECTS; -} - -static u8 GetFieldObjectIdByLocalId(u8 localId) -{ - u8 i; - - for (i = 0; i < NUM_FIELD_OBJECTS; i ++) - { - if (gMapObjects[i].active && gMapObjects[i].localId == localId) - { - return i; - } - } - return NUM_FIELD_OBJECTS; -} - -// This function has the same nonmatching quirk as in Ruby/Sapphire. -#ifdef NONMATCHING -static u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 mapNum, u8 mapGroup) -{ - struct MapObject *mapObject; - 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)) - { - return NUM_FIELD_OBJECTS; - } - mapObject = &gMapObjects[slot]; - npc_clear_ids_and_state(mapObject); - x = template->x + 7; - y = template->y + 7; - mapObject->active = TRUE; - mapObject->mapobj_bit_2 = TRUE; - mapObject->graphicsId = template->graphicsId; - mapObject->animPattern = 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; - // 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); - FieldObjectHandleDynamicGraphicsId(mapObject); - - if (gUnknown_0850557C[mapObject->animPattern]) - { - if ((mapObject->range.as_nybbles.x) == 0) - { - // r9 is invoked here - mapObject->range.as_nybbles.x ++; - } - if ((mapObject->range.as_nybbles.y) == 0) - { - mapObject->range.as_nybbles.y ++; - } - } - return slot; -} -#else -static NAKED u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 mapId, u8 mapGroupId) -{ - asm_unified("\tpush {r4-r7,lr}\n" - "\tmov r7, r9\n" - "\tmov r6, r8\n" - "\tpush {r6,r7}\n" - "\tsub sp, 0x4\n" - "\tadds r5, r0, 0\n" - "\tlsls r1, 24\n" - "\tlsrs r6, r1, 24\n" - "\tlsls r2, 24\n" - "\tlsrs r7, r2, 24\n" - "\tldrb r0, [r5]\n" - "\tadds r1, r6, 0\n" - "\tadds r2, r7, 0\n" - "\tmov r3, sp\n" - "\tbl GetAvailableFieldObjectSlot\n" - "\tlsls r0, 24\n" - "\tcmp r0, 0\n" - "\tbeq _0808D66E\n" - "\tmovs r0, 0x10\n" - "\tb _0808D762\n" - "_0808D66E:\n" - "\tmov r0, sp\n" - "\tldrb r1, [r0]\n" - "\tlsls r0, r1, 3\n" - "\tadds r0, r1\n" - "\tlsls r0, 2\n" - "\tldr r1, =gMapObjects\n" - "\tadds r4, r0, r1\n" - "\tadds r0, r4, 0\n" - "\tbl npc_clear_ids_and_state\n" - "\tldrh r3, [r5, 0x4]\n" - "\tadds r3, 0x7\n" - "\tlsls r3, 16\n" - "\tlsrs r3, 16\n" - "\tldrh r2, [r5, 0x6]\n" - "\tadds r2, 0x7\n" - "\tlsls r2, 16\n" - "\tlsrs r2, 16\n" - "\tldrb r0, [r4]\n" - "\tmovs r1, 0x1\n" - "\torrs r0, r1\n" - "\tmovs r1, 0x4\n" - "\torrs r0, r1\n" - "\tstrb r0, [r4]\n" - "\tldrb r0, [r5, 0x1]\n" - "\tstrb r0, [r4, 0x5]\n" - "\tldrb r0, [r5, 0x9]\n" - "\tstrb r0, [r4, 0x6]\n" - "\tldrb r0, [r5]\n" - "\tstrb r0, [r4, 0x8]\n" - "\tstrb r6, [r4, 0x9]\n" - "\tstrb r7, [r4, 0xA]\n" - "\tstrh r3, [r4, 0xC]\n" - "\tstrh r2, [r4, 0xE]\n" - "\tstrh r3, [r4, 0x10]\n" - "\tstrh r2, [r4, 0x12]\n" - "\tstrh r3, [r4, 0x14]\n" - "\tstrh r2, [r4, 0x16]\n" - "\tldrb r0, [r5, 0x8]\n" - "\tmovs r7, 0xF\n" - "\tadds r1, r7, 0\n" - "\tands r1, r0\n" - "\tldrb r2, [r4, 0xB]\n" - "\tmovs r0, 0x10\n" - "\tnegs r0, r0\n" - "\tmov r8, r0\n" - "\tands r0, r2\n" - "\torrs r0, r1\n" - "\tstrb r0, [r4, 0xB]\n" - "\tldrb r1, [r5, 0x8]\n" - "\tlsls r1, 4\n" - "\tands r0, r7\n" - "\torrs r0, r1\n" - "\tstrb r0, [r4, 0xB]\n" - "\tldrb r1, [r5, 0xA]\n" - "\tlsls r1, 28\n" - "\tmovs r0, 0xF\n" - "\tmov r9, r0\n" - "\tlsrs r1, 28\n" - "\tldrb r2, [r4, 0x19]\n" - "\tmov r0, r8\n" - "\tands r0, r2\n" - "\torrs r0, r1\n" - "\tstrb r0, [r4, 0x19]\n" - "\tldrb r1, [r5, 0xA]\n" - "\tlsrs r1, 4\n" - "\tlsls r1, 4\n" - "\tands r0, r7\n" - "\torrs r0, r1\n" - "\tstrb r0, [r4, 0x19]\n" - "\tldrh r0, [r5, 0xC]\n" - "\tstrb r0, [r4, 0x7]\n" - "\tldrh r0, [r5, 0xE]\n" - "\tstrb r0, [r4, 0x1D]\n" - "\tldr r1, =gUnknown_085055CD\n" - "\tldrb r0, [r5, 0x9]\n" - "\tadds r0, r1\n" - "\tldrb r1, [r0]\n" - "\tadds r0, r4, 0\n" - "\tadds r0, 0x20\n" - "\tstrb r1, [r0]\n" - "\tldrb r1, [r0]\n" - "\tadds r0, r4, 0\n" - "\tbl FieldObjectSetDirection\n" - "\tadds r0, r4, 0\n" - "\tbl FieldObjectHandleDynamicGraphicsId\n" - "\tldr r1, =gUnknown_0850557C\n" - "\tldrb r0, [r4, 0x6]\n" - "\tadds r0, r1\n" - "\tldrb r0, [r0]\n" - "\tcmp r0, 0\n" - "\tbeq _0808D75E\n" - "\tldrb r2, [r4, 0x19]\n" - "\tadds r0, r7, 0\n" - "\tands r0, r2\n" - "\tcmp r0, 0\n" - "\tbne _0808D746\n" - "\tlsls r0, r2, 28\n" - "\tlsrs r0, 28\n" - "\tadds r0, 0x1\n" - "\tmov r1, r9\n" - "\tands r0, r1\n" - "\tmov r1, r8\n" - "\tands r1, r2\n" - "\torrs r1, r0\n" - "\tstrb r1, [r4, 0x19]\n" - "_0808D746:\n" - "\tldrb r2, [r4, 0x19]\n" - "\tmovs r0, 0xF0\n" - "\tands r0, r2\n" - "\tcmp r0, 0\n" - "\tbne _0808D75E\n" - "\tlsrs r1, r2, 4\n" - "\tadds r1, 0x1\n" - "\tlsls r1, 4\n" - "\tadds r0, r7, 0\n" - "\tands r0, r2\n" - "\torrs r0, r1\n" - "\tstrb r0, [r4, 0x19]\n" - "_0808D75E:\n" - "\tmov r0, sp\n" - "\tldrb r0, [r0]\n" - "_0808D762:\n" - "\tadd sp, 0x4\n" - "\tpop {r3,r4}\n" - "\tmov r8, r3\n" - "\tmov r9, r4\n" - "\tpop {r4-r7}\n" - "\tpop {r1}\n" - "\tbx r1\n" - ".pool"); -} -#endif - -u8 unref_sub_808D77C(u8 localId) -{ - u8 i; - u8 nObjects; - struct MapObjectTemplate *template; - - if (gMapHeader.events != NULL) - { - if (InBattlePyramid()) - { - nObjects = sub_81AAA40(); - } - else if (InTrainerHill()) - { - nObjects = 2; - } - else - { - nObjects = gMapHeader.events->mapObjectCount; - } - for (i = 0; i < nObjects; i ++) - { - template = &gSaveBlock1Ptr->mapObjectTemplates[i]; - if (template->localId == localId && !FlagGet(template->flagId)) - { - return InitFieldObjectStateFromTemplate(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); - } - } - } - return NUM_FIELD_OBJECTS; -} - -static bool8 GetAvailableFieldObjectSlot(u16 localId, u8 mapNum, u8 mapGroup, u8 *result) -// Looks for an empty slot. -// Returns FALSE and the location of the available slot -// in *result. -// If no slots are available, or if the object is already -// loaded, returns TRUE. -{ - u8 i = 0; - - for (i = 0; i < NUM_FIELD_OBJECTS; i ++) - { - if (!gMapObjects[i].active) - break; - if (gMapObjects[i].localId == localId && gMapObjects[i].mapNum == mapNum && gMapObjects[i].mapGroup == mapGroup) - return TRUE; - } - if (i >= NUM_FIELD_OBJECTS) - return TRUE; - *result = i; - do - { - if (gMapObjects[i].active && gMapObjects[i].localId == localId && gMapObjects[i].mapNum == mapNum && gMapObjects[i].mapGroup == mapGroup) - return TRUE; - i ++; - } while (i < NUM_FIELD_OBJECTS); - return FALSE; -} - -static void RemoveFieldObject(struct MapObject *mapObject) -{ - mapObject->active = FALSE; - RemoveFieldObjectInternal(mapObject); -} - -void RemoveFieldObjectByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) -{ - u8 index; - if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &index)) - { - FlagSet(GetFieldObjectFlagIdByFieldObjectId(index)); - RemoveFieldObject(&gMapObjects[index]); - } -} - -static void RemoveFieldObjectInternal(struct MapObject *mapObject) -{ - struct SpriteFrameImage image; - image.size = GetFieldObjectGraphicsInfo(mapObject->graphicsId)->size; - gSprites[mapObject->spriteId].images = ℑ - DestroySprite(&gSprites[mapObject->spriteId]); -} - -void unref_sub_808D958(void) -{ - u8 i; - - for (i = 0; i < NUM_FIELD_OBJECTS; i ++) - { - if (i != gPlayerAvatar.mapObjectId) - { - RemoveFieldObject(&gMapObjects[i]); - } - } -} - -static u8 SpawnFieldObjectInternal(struct MapObjectTemplate *mapObjectTemplate, struct SpriteTemplate *spriteTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY) -{ - struct MapObject *mapObject; - const struct MapObjectGraphicsInfo *graphicsInfo; - struct Sprite *sprite; - u8 mapObjectId; - u8 paletteSlot; - u8 spriteId; - - mapObjectId = InitFieldObjectStateFromTemplate(mapObjectTemplate, mapNum, mapGroup); - if (mapObjectId == NUM_FIELD_OBJECTS) - { - return NUM_FIELD_OBJECTS; - } - mapObject = &gMapObjects[mapObjectId]; - graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId); - paletteSlot = graphicsInfo->paletteSlot; - if (paletteSlot == 0) - { - npc_load_two_palettes__no_record(graphicsInfo->paletteTag1, 0); - } - else if (paletteSlot == 10) - { - npc_load_two_palettes__and_record(graphicsInfo->paletteTag1, 10); - } - else if (paletteSlot >= 16) - { - paletteSlot -= 16; - sub_808EAB0(graphicsInfo->paletteTag1, paletteSlot); - } - if (mapObject->animPattern == 0x4c) - { - mapObject->mapobj_bit_13 = TRUE; - } - *(u16 *)&spriteTemplate->paletteTag = 0xFFFF; - spriteId = CreateSprite(spriteTemplate, 0, 0, 0); - if (spriteId == MAX_SPRITES) - { - gMapObjects[mapObjectId].active = FALSE; - return NUM_FIELD_OBJECTS; - } - sprite = &gSprites[spriteId]; - sub_8092FF0(mapObject->coords2.x + cameraX, mapObject->coords2.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->mapobj_bit_12 = graphicsInfo->inanimate; - if (!mapObject->mapobj_bit_12) - { - StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObject->mapobj_unk_18)); - } - SetObjectSubpriorityByZCoord(mapObject->elevation, sprite, 1); - sub_8096518(mapObject, sprite); - return mapObjectId; -} - -static u8 SpawnFieldObject(struct MapObjectTemplate *mapObjectTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY) -{ - const struct MapObjectGraphicsInfo *graphicsInfo; - struct SpriteTemplate spriteTemplate; - const struct SubspriteTable *subspriteTables; - struct SpriteFrameImage spriteFrameImage; - u8 mapObjectId; - - subspriteTables = NULL; - graphicsInfo = GetFieldObjectGraphicsInfo(mapObjectTemplate->graphicsId); - MakeObjectTemplateFromFieldObjectTemplate(mapObjectTemplate, &spriteTemplate, &subspriteTables); - spriteFrameImage.size = graphicsInfo->size; - spriteTemplate.images = &spriteFrameImage; - mapObjectId = SpawnFieldObjectInternal(mapObjectTemplate, &spriteTemplate, mapNum, mapGroup, cameraX, cameraY); - if (mapObjectId == NUM_FIELD_OBJECTS) - { - return NUM_FIELD_OBJECTS; - } - gSprites[gMapObjects[mapObjectId].spriteId].images = graphicsInfo->images; - if (subspriteTables != NULL) - { - SetSubspriteTables(&gSprites[gMapObjects[mapObjectId].spriteId], subspriteTables); - } - return mapObjectId; -} - -u8 SpawnSpecialFieldObject(struct MapObjectTemplate *mapObjectTemplate) -{ - s16 cameraX; - s16 cameraY; - - GetFieldObjectMovingCameraOffset(&cameraX, &cameraY); - return SpawnFieldObject(mapObjectTemplate, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY); -} - -u8 SpawnSpecialFieldObjectParametrized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z) -{ - struct MapObjectTemplate mapObjectTemplate; - - 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.unkA_0 = 0; - mapObjectTemplate.unkA_4 = 0; - mapObjectTemplate.unkC = 0; - mapObjectTemplate.unkE = 0; - return SpawnSpecialFieldObject(&mapObjectTemplate); -} - -u8 show_sprite(u8 localId, u8 mapNum, u8 mapGroup) -{ - struct MapObjectTemplate *mapObjectTemplate; - s16 cameraX; - s16 cameraY; - - mapObjectTemplate = GetFieldObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup); - if (mapObjectTemplate == NULL) - { - return NUM_FIELD_OBJECTS; - } - GetFieldObjectMovingCameraOffset(&cameraX, &cameraY); - return SpawnFieldObject(mapObjectTemplate, mapNum, mapGroup, cameraX, cameraY); -} - -static void MakeObjectTemplateFromFieldObjectGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables) -{ - const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(graphicsId); - - sprTemplate->tileTag = gfxInfo->tileTag; - sprTemplate->paletteTag = gfxInfo->paletteTag1; - sprTemplate->oam = gfxInfo->oam; - sprTemplate->anims = gfxInfo->anims; - sprTemplate->images = gfxInfo->images; - sprTemplate->affineAnims = gfxInfo->affineAnims; - sprTemplate->callback = callback; - *subspriteTables = gfxInfo->subspriteTables; -} - -static void MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex(u16 graphicsId, u16 callbackIndex, struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables) -{ - MakeObjectTemplateFromFieldObjectGraphicsInfo(graphicsId, gUnknown_08505438[callbackIndex], sprTemplate, subspriteTables); -} - -static void MakeObjectTemplateFromFieldObjectTemplate(struct MapObjectTemplate *mapObjectTemplate, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) -{ - MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex(mapObjectTemplate->graphicsId, mapObjectTemplate->movementType, spriteTemplate, subspriteTables); -} - -u8 AddPseudoFieldObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority) -{ - struct SpriteTemplate *spriteTemplate; - const struct SubspriteTable *subspriteTables; - struct Sprite *sprite; - u8 spriteIdx; - - spriteTemplate = malloc(sizeof(struct SpriteTemplate)); - MakeObjectTemplateFromFieldObjectGraphicsInfo(graphicsId, callback, spriteTemplate, &subspriteTables); - if (spriteTemplate->paletteTag != 0xffff) - { - sub_808E894(spriteTemplate->paletteTag); - } - spriteIdx = CreateSprite(spriteTemplate, x, y, subpriority); - free(spriteTemplate); - - if (spriteIdx != MAX_SPRITES && subspriteTables != NULL) - { - sprite = &gSprites[spriteIdx]; - SetSubspriteTables(sprite, subspriteTables); - sprite->subspriteMode = 2; - } - return spriteIdx; -} - -u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction) -{ - const struct MapObjectGraphicsInfo *graphicsInfo; - struct SpriteTemplate spriteTemplate; - const struct SubspriteTable *subspriteTables; - u8 spriteId; - struct Sprite *sprite; - - graphicsInfo = GetFieldObjectGraphicsInfo(graphicsId); - MakeObjectTemplateFromFieldObjectGraphicsInfo(graphicsId, sub_8097AC8, &spriteTemplate, &subspriteTables); - *(u16 *)&spriteTemplate.paletteTag = 0xffff; - x += 7; - y += 7; - sub_80930E0(&x, &y, 8, 16); - spriteId = CreateSpriteAtEnd(&spriteTemplate, x, y, 0); - if (spriteId != MAX_SPRITES) - { - sprite = &gSprites[spriteId]; - sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); - sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); - sprite->pos1.y += sprite->centerToCornerVecY; - sprite->oam.paletteNum = graphicsInfo->paletteSlot; - if (sprite->oam.paletteNum >= 16) - { - sprite->oam.paletteNum -= 16; - } - sprite->coordOffsetEnabled = TRUE; - sprite->data[0] = a1; - sprite->data[1] = z; - if (graphicsInfo->paletteSlot == 10) - { - npc_load_two_palettes__and_record(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot); - } - else if (graphicsInfo->paletteSlot >= 16) - { - sub_808EAB0(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot | 0xf0); - } - if (subspriteTables != NULL) - { - SetSubspriteTables(sprite, subspriteTables); - sprite->subspriteMode = 2; - } - InitObjectPriorityByZCoord(sprite, z); - SetObjectSubpriorityByZCoord(z, sprite, 1); - StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(direction)); - } - return spriteId; -} - -void SpawnFieldObjectsInView(s16 cameraX, s16 cameraY) -{ - u8 i; - s16 left; - s16 right; - s16 top; - s16 bottom; - u8 objectCount; - s16 npcX; - s16 npcY; - - if (gMapHeader.events != NULL) - { - left = gSaveBlock1Ptr->pos.x - 2; - right = gSaveBlock1Ptr->pos.x + 17; - top = gSaveBlock1Ptr->pos.y; - bottom = gSaveBlock1Ptr->pos.y + 16; - - if (InBattlePyramid()) - { - objectCount = sub_81AAA40(); - } - else if (InTrainerHill()) - { - objectCount = 2; - } - else - { - objectCount = gMapHeader.events->mapObjectCount; - } - - for (i = 0; i < objectCount; i++) - { - struct MapObjectTemplate *template = &gSaveBlock1Ptr->mapObjectTemplates[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); - } - } -} - -/*static*/ void RemoveFieldObjectsOutsideView(void) -{ - u8 i; - u8 j; - bool8 isActiveLinkPlayer; - struct MapObject *mapObject; - - for (i = 0; i < NUM_FIELD_OBJECTS; i ++) - { - for (j = 0, isActiveLinkPlayer = FALSE; j < ARRAY_COUNT(gLinkPlayerMapObjects); j ++) - { - if (gLinkPlayerMapObjects[j].active && i == gLinkPlayerMapObjects[j].mapObjId) - isActiveLinkPlayer = TRUE; - } - if (!isActiveLinkPlayer) - { - mapObject = &gMapObjects[i]; - - if (mapObject->active && !mapObject->mapobj_bit_16) - RemoveFieldObjectIfOutsideView(mapObject); - } - } -} - -static void RemoveFieldObjectIfOutsideView(struct MapObject *mapObject) -{ - s16 left; - s16 right; - s16 top; - s16 bottom; - - left = gSaveBlock1Ptr->pos.x - 2; - right = gSaveBlock1Ptr->pos.x + 17; - 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) - return; - if (mapObject->coords1.x >= left && mapObject->coords1.x <= right - && mapObject->coords1.y >= top && mapObject->coords1.y <= bottom) - return; - RemoveFieldObject(mapObject); -} - -void sub_808E16C(s16 x, s16 y) -{ - u8 i; - - ClearPlayerAvatarInfo(); - for (i = 0; i < NUM_FIELD_OBJECTS; i ++) - { - if (gMapObjects[i].active) - { - sub_808E1B8(i, x, y); - } - } - sub_808D450(); -} - -static void sub_808E1B8(u8 mapObjectId, s16 x, s16 y) -{ - u8 spriteId; - u8 paletteSlot; - struct MapObject *mapObject; - const struct SubspriteTable *subspriteTables; - const struct MapObjectGraphicsInfo *graphicsInfo; - struct SpriteFrameImage spriteFrameImage; - struct SpriteTemplate spriteTemplate; - struct Sprite *sprite; - -#define i spriteId - for (i = 0; i < ARRAY_COUNT(gLinkPlayerMapObjects); i ++) - { - if (gLinkPlayerMapObjects[i].active && mapObjectId == gLinkPlayerMapObjects[i].mapObjId) - { - return; - } - } -#undef i - - mapObject = &gMapObjects[mapObjectId]; - subspriteTables = NULL; - graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId); - spriteFrameImage.size = graphicsInfo->size; - MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex(mapObject->graphicsId, mapObject->animPattern, &spriteTemplate, &subspriteTables); - spriteTemplate.images = &spriteFrameImage; - *(u16 *)&spriteTemplate.paletteTag = 0xffff; - paletteSlot = graphicsInfo->paletteSlot; - if (paletteSlot == 0) - { - npc_load_two_palettes__no_record(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot); - } - else if (paletteSlot == 10) - { - npc_load_two_palettes__and_record(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot); - } - else if (paletteSlot >= 16) - { - paletteSlot -= 16; - sub_808EAB0(graphicsInfo->paletteTag1, paletteSlot); - } - *(u16 *)&spriteTemplate.paletteTag = 0xffff; - spriteId = CreateSprite(&spriteTemplate, 0, 0, 0); - if (spriteId != MAX_SPRITES) - { - sprite = &gSprites[spriteId]; - sub_8092FF0(x + mapObject->coords2.x, y + mapObject->coords2.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) - { - SetPlayerAvatarFieldObjectIdAndObjectId(mapObjectId, spriteId); - mapObject->mapobj_unk_1B = sub_8154228(); - } - if (subspriteTables != NULL) - { - SetSubspriteTables(sprite, subspriteTables); - } - sprite->oam.paletteNum = paletteSlot; - sprite->coordOffsetEnabled = TRUE; - sprite->data[0] = mapObjectId; - mapObject->spriteId = spriteId; - if (!mapObject->mapobj_bit_12 && mapObject->animPattern != 0x0b) - { - StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObject->mapobj_unk_18)); - } - sub_808E38C(mapObject); - SetObjectSubpriorityByZCoord(mapObject->elevation, 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; - FieldObjectClearAnim(mapObject); -} - -static void SetPlayerAvatarFieldObjectIdAndObjectId(u8 mapObjectId, u8 spriteId) -{ - gPlayerAvatar.mapObjectId = mapObjectId; - gPlayerAvatar.spriteId = spriteId; - gPlayerAvatar.gender = GetPlayerAvatarGenderByGraphicsId(gMapObjects[mapObjectId].graphicsId); - SetPlayerAvatarExtraStateTransition(gMapObjects[mapObjectId].graphicsId, 0x20); -} - -void FieldObjectSetGraphicsId(struct MapObject *mapObject, u8 graphicsId) -{ - const struct MapObjectGraphicsInfo *graphicsInfo; - struct Sprite *sprite; - u8 paletteSlot; - - graphicsInfo = GetFieldObjectGraphicsInfo(graphicsId); - sprite = &gSprites[mapObject->spriteId]; - paletteSlot = graphicsInfo->paletteSlot; - if (paletteSlot == 0) - { - pal_patch_for_npc(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot); - } - else if (paletteSlot == 10) - { - npc_load_two_palettes__and_record(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot); - } - else if (paletteSlot >= 16) - { - paletteSlot -= 16; - sub_808EAB0(graphicsInfo->paletteTag1, paletteSlot); - } - sprite->oam.shape = graphicsInfo->oam->shape; - sprite->oam.size = graphicsInfo->oam->size; - sprite->images = graphicsInfo->images; - sprite->anims = graphicsInfo->anims; - sprite->subspriteTables = graphicsInfo->subspriteTables; - sprite->oam.paletteNum = paletteSlot; - mapObject->mapobj_bit_12 = graphicsInfo->inanimate; - mapObject->graphicsId = graphicsId; - sub_8093038(mapObject->coords2.x, mapObject->coords2.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) - { - CameraObjectReset1(); - } -} - -void FieldObjectSetGraphicsIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 graphicsId) -{ - u8 mapObjectId; - - if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) - { - FieldObjectSetGraphicsId(&gMapObjects[mapObjectId], graphicsId); - } -} - -void FieldObjectTurn(struct MapObject *mapObject, u8 direction) -{ - FieldObjectSetDirection(mapObject, direction); - if (!mapObject->mapobj_bit_12) - { - StartSpriteAnim(&gSprites[mapObject->spriteId], FieldObjectDirectionToImageAnimId(mapObject->mapobj_unk_18)); - SeekSpriteAnim(&gSprites[mapObject->spriteId], 0); - } -} - -void FieldObjectTurnByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 direction) -{ - u8 mapObjectId; - - if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) - { - FieldObjectTurn(&gMapObjects[mapObjectId], direction); - } -} - -void PlayerObjectTurn(struct PlayerAvatar *playerAvatar, u8 direction) -{ - FieldObjectTurn(&gMapObjects[playerAvatar->mapObjectId], direction); -} - -/*static*/ void get_berry_tree_graphics(struct MapObject *mapObject, struct Sprite *sprite) -{ - u8 berryStage; - u8 berryId; - - mapObject->mapobj_bit_13 = TRUE; - sprite->invisible = TRUE; - berryStage = GetStageByBerryTreeId(mapObject->trainerRange_berryTreeId); - if (berryStage != 0) - { - mapObject->mapobj_bit_13 = FALSE; - sprite->invisible = FALSE; - berryId = GetBerryTypeByBerryTreeId(mapObject->trainerRange_berryTreeId) - 1; - berryStage -= 1; - if (berryId >= NUM_BERRIES) - { - berryId = 0; - } - FieldObjectSetGraphicsId(mapObject, gBerryTreeFieldObjectGraphicsIdTablePointers[berryId][berryStage]); - sprite->images = gBerryTreePicTablePointers[berryId]; - sprite->oam.paletteNum = gBerryTreePaletteSlotTablePointers[berryId][berryStage]; - StartSpriteAnim(sprite, berryStage); - } -} - -const struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8 graphicsId) -{ - u8 bard; - - if (graphicsId >= SPRITE_VAR) - { - graphicsId = VarGetFieldObjectGraphicsId(graphicsId - SPRITE_VAR); - } - if (graphicsId == 0x45) - { - bard = GetCurrentMauvilleOldMan(); - return gMauvilleOldManGraphicsInfoPointers[bard]; - } - if (graphicsId >= NUM_OBJECT_GRAPHICS_INFO) - { - graphicsId = 0x05; // LittleBoy1 - } - return gFieldObjectGraphicsInfoPointers[graphicsId]; -} - -static void FieldObjectHandleDynamicGraphicsId(struct MapObject *mapObject) -{ - if (mapObject->graphicsId >= SPRITE_VAR) - { - mapObject->graphicsId = VarGetFieldObjectGraphicsId(mapObject->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; - - if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) - { - gMapObjects[mapObjectId].mapobj_bit_13 = state; - } -} - -void FieldObjectGetLocalIdAndMap(struct MapObject *mapObject, void *localId, void *mapNum, void *mapGroup) -{ - *(u8*)(localId) = mapObject->localId; - *(u8*)(mapNum) = mapObject->mapNum; - *(u8*)(mapGroup) = mapObject->mapGroup; -} - -void sub_808E75C(s16 x, s16 y) -{ - u8 mapObjectId; - struct MapObject *mapObject; - - mapObjectId = GetFieldObjectIdByXY(x, y); - if (mapObjectId != NUM_FIELD_OBJECTS) - { - mapObject = &gMapObjects[mapObjectId]; - mapObject->mapobj_bit_2 = TRUE; - } -} - -void sub_808E78C(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority) -{ - u8 mapObjectId; - struct MapObject *mapObject; - struct Sprite *sprite; - - if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) - { - mapObject = &gMapObjects[mapObjectId]; - sprite = &gSprites[mapObject->spriteId]; - mapObject->mapobj_bit_26 = TRUE; - sprite->subpriority = subpriority; - } -} - -void sub_808E7E4(u8 localId, u8 mapNum, u8 mapGroup) -{ - u8 mapObjectId; - struct MapObject *mapObject; - - if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) - { - mapObject = &gMapObjects[mapObjectId]; - mapObject->mapobj_bit_26 = FALSE; - mapObject->mapobj_bit_2 = TRUE; - } -} - -void sub_808E82C(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y) -{ - u8 mapObjectId; - struct Sprite *sprite; - - if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) - { - sprite = &gSprites[gMapObjects[mapObjectId].spriteId]; - sprite->pos2.x = x; - sprite->pos2.y = y; - } -} - -void gpu_pal_allocator_reset__manage_upper_four(void) -{ - FreeAllSpritePalettes(); - gReservedSpritePaletteCount = 12; -} - -static void sub_808E894(u16 paletteTag) -{ - u16 paletteSlot; - - paletteSlot = FindFieldObjectPaletteIndexByTag(paletteTag); - if (paletteSlot != 0x11ff) // always true - { - sub_808E8F4(&gUnknown_0850BBC8[paletteSlot]); - } -} - -void sub_808E8C0(u16 *paletteTags) -{ - u8 i; - - for (i = 0; paletteTags[i] != 0x11ff; i ++) - { - sub_808E894(paletteTags[i]); - } -} - -static u8 sub_808E8F4(const struct SpritePalette *spritePalette) -{ - if (IndexOfSpritePaletteTag(spritePalette->tag) != 0xff) - { - return 0xff; - } - return LoadSpritePalette(spritePalette); -} - -void pal_patch_for_npc(u16 paletteTag, u8 paletteSlot) -{ - u16 paletteIdx; - - paletteIdx = FindFieldObjectPaletteIndexByTag(paletteTag); - LoadPalette(gUnknown_0850BBC8[paletteIdx].data, 16 * paletteSlot + 256, 0x20); -} - -void pal_patch_for_npc_range(const u16 *paletteTags, u8 minSlot, u8 maxSlot) -{ - while (minSlot < maxSlot) - { - pal_patch_for_npc(*paletteTags, minSlot); - paletteTags ++; - minSlot ++; - } -} - -static u8 FindFieldObjectPaletteIndexByTag(u16 tag) -{ - u8 i; - - for (i = 0; gUnknown_0850BBC8[i].tag != 0x11ff; i ++) - { - if (gUnknown_0850BBC8[i].tag == tag) - { - return i; - } - } - return 0xff; -} - -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 ++) - { - if (gUnknown_0850BD00[i].tag == tag) - { - pal_patch_for_npc(gUnknown_0850BD00[i].data[gUnknown_020375B4], gUnknown_084975C4[slot]); - return; - } - } -} - -void npc_load_two_palettes__and_record(u16 tag, u8 slot) -{ - u8 i; - - gUnknown_020375B6 = tag; - pal_patch_for_npc(tag, slot); - for (i = 0; gUnknown_0850BD78[i].tag != 0x11ff; i ++) - { - if (gUnknown_0850BD78[i].tag == tag) - { - pal_patch_for_npc(gUnknown_0850BD78[i].data[gUnknown_020375B4], gUnknown_084975C4[slot]); - return; - } - } -} - -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) -{ - mapObject->coords3.x = mapObject->coords2.x; - mapObject->coords3.y = mapObject->coords2.y; - mapObject->coords2.x += x; - mapObject->coords2.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; -} - -/*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; -} - -void sub_808EB08(struct MapObject *mapObject, s16 x, s16 y) -{ - struct Sprite *sprite; - const struct MapObjectGraphicsInfo *graphicsInfo; - - 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); - 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) - { - CameraObjectReset1(); - } -} - -void sub_808EBA8(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y) -{ - u8 mapObjectId; - - if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) - { - x += 7; - y += 7; - sub_808EB08(&gMapObjects[mapObjectId], x, y); - } -} - -void npc_coords_shift_still(struct MapObject *mapObject) -{ - npc_coords_shift(mapObject, mapObject->coords2.x, mapObject->coords2.y); -} - -void UpdateFieldObjectCoordsForCameraUpdate(void) -{ - u8 i; - s16 dx; - s16 dy; - - if (gCamera.active) - { - dx = gCamera.x; - dy = gCamera.y; - for (i = 0; i < NUM_FIELD_OBJECTS; i ++) - { - 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; - } - } - } -} - -u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z) -{ - u8 i; - for (i = 0; i < NUM_FIELD_OBJECTS; i ++) - { - if (gMapObjects[i].active) - { - if (gMapObjects[i].coords2.x == x && gMapObjects[i].coords2.y == y && FieldObjectDoesZCoordMatch(&gMapObjects[i], z)) - { - return i; - } - } - } - return NUM_FIELD_OBJECTS; -} - -static bool8 FieldObjectDoesZCoordMatch(struct MapObject *mapObject, u8 z) -{ - if (mapObject->mapobj_unk_0B_0 != 0 && z != 0 && mapObject->mapobj_unk_0B_0 != z) - { - return FALSE; - } - return TRUE; -} - -void UpdateFieldObjectsForCameraUpdate(s16 x, s16 y) -{ - UpdateFieldObjectCoordsForCameraUpdate(); - SpawnFieldObjectsInView(x, y); - RemoveFieldObjectsOutsideView(); -} - -u8 AddCameraObject(u8 linkedSpriteId) -{ - u8 spriteId; - - spriteId = CreateSprite(&gUnknown_084975D4, 0, 0, 4); - gSprites[spriteId].invisible = TRUE; - gSprites[spriteId].data[0] = linkedSpriteId; - return spriteId; -} - -void ObjectCB_CameraObject(struct Sprite *sprite) -{ - void (*callbacks[ARRAY_COUNT(gUnknown_084975EC)])(struct Sprite *); - - memcpy(callbacks, gUnknown_084975EC, sizeof gUnknown_084975EC); - callbacks[sprite->data[1]](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; - sprite->invisible = TRUE; - sprite->data[1] = 1; - CameraObject_1(sprite); -} - -/*static*/ void CameraObject_1(struct Sprite *sprite) -{ - s16 x; - s16 y; - - y = gSprites[sprite->data[0]].pos1.y; - x = gSprites[sprite->data[0]].pos1.x; - sprite->data[2] = x - sprite->pos1.x; - sprite->data[3] = y - sprite->pos1.y; - sprite->pos1.x = x; - sprite->pos1.y = y; -} - -/*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; - sprite->data[2] = 0; - sprite->data[3] = 0; -} - -static struct Sprite *FindCameraObject(void) -{ - u8 spriteId; - - for (spriteId = 0; spriteId < MAX_SPRITES; spriteId ++) - { - if (gSprites[spriteId].inUse && gSprites[spriteId].callback == ObjectCB_CameraObject) - { - return &gSprites[spriteId]; - } - } - return NULL; -} - -void CameraObjectReset1(void) -{ - struct Sprite *cameraObject; - - cameraObject = FindCameraObject(); - if (cameraObject != NULL) - { - cameraObject->data[1] = 0; - cameraObject->callback(cameraObject); - } -} - -void CameraObjectSetFollowedObjectId(u8 objectId) -{ - struct Sprite *cameraObject; - - cameraObject = FindCameraObject(); - if (cameraObject != NULL) - { - cameraObject->data[0] = objectId; - CameraObjectReset1(); - } -} - -u8 CameraObjectGetFollowedObjectId(void) -{ - struct Sprite *cameraObject; - - cameraObject = FindCameraObject(); - if (cameraObject == NULL) - { - return MAX_SPRITES; - } - return cameraObject->data[0]; -} - -void CameraObjectReset2(void) -{ - FindCameraObject()->data[1] = 2; -} - -u8 CopySprite(struct Sprite *sprite, s16 x, s16 y, u8 subpriority) -{ - u8 i; - - for (i = 0; i < MAX_SPRITES; i ++) - { - if (!gSprites[i].inUse) - { - gSprites[i] = *sprite; - gSprites[i].pos1.x = x; - gSprites[i].pos1.y = y; - gSprites[i].subpriority = subpriority; - break; - } - } - return i; -} - -u8 obj_unfreeze(struct Sprite *sprite, s16 x, s16 y, u8 subpriority) -{ - s16 i; - - for (i = MAX_SPRITES - 1; i > -1; i --) - { - if (!gSprites[i].inUse) - { - gSprites[i] = *sprite; - gSprites[i].pos1.x = x; - gSprites[i].pos1.y = y; - gSprites[i].subpriority = subpriority; - return i; - } - } - return MAX_SPRITES; -} - -void FieldObjectSetDirection(struct MapObject *mapObject, u8 direction) -{ - s8 d2; - mapObject->mapobj_unk_20 = mapObject->mapobj_unk_18; - if (!mapObject->mapobj_bit_9) - { - d2 = direction; - mapObject->mapobj_unk_18 = d2; - } - mapObject->placeholder18 = direction; -} - -static const u8 *GetFieldObjectScriptPointerByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) -{ - return GetFieldObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->script; -} - -const u8 *GetFieldObjectScriptPointerByFieldObjectId(u8 mapObjectId) -{ - return GetFieldObjectScriptPointerByLocalIdAndMap(gMapObjects[mapObjectId].localId, gMapObjects[mapObjectId].mapNum, gMapObjects[mapObjectId].mapGroup); -} - -static u16 GetFieldObjectFlagIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) -{ - return GetFieldObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->flagId; -} - -u16 GetFieldObjectFlagIdByFieldObjectId(u8 mapObjectId) -{ - return GetFieldObjectFlagIdByLocalIdAndMap(gMapObjects[mapObjectId].localId, gMapObjects[mapObjectId].mapNum, gMapObjects[mapObjectId].mapGroup); -} - -u8 sub_808F080(u8 localId, u8 mapNum, u8 mapGroup) -{ - u8 mapObjectId; - - if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) - { - return 0xFF; - } - return gMapObjects[mapObjectId].trainerType; -} - -u8 sub_808F0BC(u8 mapObjectId) -{ - return gMapObjects[mapObjectId].trainerType; -} - -u8 sub_808F0D4(u8 localId, u8 mapNum, u8 mapGroup) -{ - u8 mapObjectId; - - if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) - { - return 0xFF; - } - return gMapObjects[mapObjectId].trainerRange_berryTreeId; -} - -u8 FieldObjectGetBerryTreeId(u8 mapObjectId) -{ - return gMapObjects[mapObjectId].trainerRange_berryTreeId; -} - -struct MapObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) -{ - struct MapObjectTemplate *templates; - const struct MapHeader *mapHeader; - u8 count; - - if (gSaveBlock1Ptr->location.mapNum == mapNum && gSaveBlock1Ptr->location.mapGroup == mapGroup) - { - templates = gSaveBlock1Ptr->mapObjectTemplates; - count = gMapHeader.events->mapObjectCount; - } - else - { - mapHeader = Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum); - templates = mapHeader->events->mapObjects; - count = mapHeader->events->mapObjectCount; - } - return FindFieldObjectTemplateInArrayByLocalId(localId, templates, count); -} - -struct MapObjectTemplate *FindFieldObjectTemplateInArrayByLocalId(u8 localId, struct MapObjectTemplate *templates, u8 count) -{ - u8 i; - - for (i = 0; i < count; i ++) - { - if (templates[i].localId == localId) - { - return &templates[i]; - } - } - return NULL; -} - -struct MapObjectTemplate *sub_808F1B4(const struct MapObject *mapObject) -{ - int i; - - if (mapObject->mapNum != gSaveBlock1Ptr->location.mapNum || mapObject->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) - { - return &gSaveBlock1Ptr->mapObjectTemplates[i]; - } - } - return NULL; -} - -void sub_808F208(const struct MapObject *mapObject) -{ - struct MapObjectTemplate *mapObjectTemplate; - - mapObjectTemplate = sub_808F1B4(mapObject); - if (mapObjectTemplate != NULL) - { - mapObjectTemplate->x = mapObject->coords2.x - 7; - mapObjectTemplate->y = mapObject->coords2.y - 7; - } -} - -void sub_808F228(const struct MapObject *mapObject, const u8 *script) -{ - struct MapObjectTemplate *mapObjectTemplate; - - mapObjectTemplate = sub_808F1B4(mapObject); - if (mapObjectTemplate != NULL) - { - mapObjectTemplate->script = script; - } -} - -void sub_808F23C(const struct MapObject *mapObject, u8 movementType) -{ - struct MapObjectTemplate *mapObjectTemplate; - - mapObjectTemplate = sub_808F1B4(mapObject); - if (mapObjectTemplate != NULL) - { - mapObjectTemplate->movementType = movementType; - } -} - -void sub_808F254(u8 localId, u8 mapNum, u8 mapGroup) -{ - u8 mapObjectId; - - if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) - { - sub_808F208(&gMapObjects[mapObjectId]); - } -} - -void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat) -{ - u8 mapObjectId; - - if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) - { - switch (decorCat) - { - case DECORCAT_DOLL: - sub_808F228(&gMapObjects[mapObjectId], EventScript_2766A2); - break; - case DECORCAT_CUSHION: - sub_808F228(&gMapObjects[mapObjectId], EventScript_2766A6); - break; - } - } -} - -void npc_paltag_set_load(u8 palSlot) -{ - gpu_pal_allocator_reset__manage_upper_four(); - gUnknown_020375B6 = 0x11ff; - gUnknown_020375B4 = palSlot; - if (palSlot == 1) - { - pal_patch_for_npc_range(gUnknown_0850BE38[gUnknown_020375B4], 0, 6); - gReservedSpritePaletteCount = 8; - } - else - { - pal_patch_for_npc_range(gUnknown_0850BE38[gUnknown_020375B4], 0, 10); - } -} - -u16 npc_paltag_by_palslot(u8 palSlot) -{ - u8 i; - - if (palSlot < 10) - { - return gUnknown_0850BE38[gUnknown_020375B4][palSlot]; - } - for (i = 0; gUnknown_0850BD78[i].tag != 0x11ff; i ++) - { - if (gUnknown_0850BD78[i].tag == gUnknown_020375B6) - { - return gUnknown_0850BD78[i].data[gUnknown_020375B4]; - } - } - return 0x11ff; -} - -// Map Object Step Callbacks -// file boundary? - -null_object_step(NoMovement1, FALSE) - -field_object_step(GoRandomDirections, gUnknown_0850D6F4) - -bool8 sub_808F44C(struct MapObject *mapObject, struct Sprite *sprite) -{ - npc_reset(mapObject, sprite); - sprite->data[1] = 1; - return TRUE; -} - -bool8 sub_808F460(struct MapObject *mapObject, struct Sprite *sprite) -{ - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - sprite->data[1] = 2; - return TRUE; -} - -bool8 sub_808F48C(struct MapObject *mapObject, struct Sprite *sprite) -{ - if (!FieldObjectExecRegularAnim(mapObject, sprite)) - { - return FALSE; - } - SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]); - sprite->data[1] = 3; - return TRUE; -} - -bool8 sub_808F4C8(struct MapObject *mapObject, struct Sprite *sprite) -{ - if (RunFieldObjectStepTimer(sprite)) - { - sprite->data[1] = 4; - return TRUE; - } - return FALSE; -} - -bool8 sub_808F4E8(struct MapObject *mapObject, struct Sprite *sprite) -{ - u8 directions[4]; - u8 chosenDirection; - - memcpy(directions, gUnknown_0850D710, sizeof directions); - chosenDirection = directions[Random() & 0x03]; - FieldObjectSetDirection(mapObject, chosenDirection); - sprite->data[1] = 5; - if (npc_block_way__next_tile(mapObject, chosenDirection)) - { - sprite->data[1] = 1; - } - return TRUE; -} - -bool8 sub_808F534(struct MapObject *mapObject, struct Sprite *sprite) -{ - FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->placeholder18)); - mapObject->mapobj_bit_1 = TRUE; - sprite->data[1] = 6; - return TRUE; -} - -bool8 sub_808F564(struct MapObject *mapObject, struct Sprite *sprite) -{ - if (FieldObjectExecRegularAnim(mapObject, sprite)) - { - mapObject->mapobj_bit_1 = FALSE; - sprite->data[1] = 1; - } - return FALSE; -} - -bool8 FieldObjectIsTrainerAndCloseToPlayer(struct MapObject *mapObject) -{ - s16 playerX; - s16 playerY; - s16 objX; - s16 objY; - s16 minX; - s16 maxX; - s16 minY; - s16 maxY; - - if (!TestPlayerAvatarFlags(0x80)) - { - return FALSE; - } - if (mapObject->trainerType != 1 && mapObject->trainerType != 3) - { - return FALSE; - } - PlayerGetDestCoords(&playerX, &playerY); - objX = mapObject->coords2.x; - objY = mapObject->coords2.y; - minX = objX - mapObject->trainerRange_berryTreeId; - minY = objY - mapObject->trainerRange_berryTreeId; - maxX = objX + mapObject->trainerRange_berryTreeId; - maxY = objY + mapObject->trainerRange_berryTreeId; - if (minX > playerX || maxX < playerX || minY > playerY || maxY < playerY) - { - return FALSE; - } - return TRUE; -} - -u8 GetRegularRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) -{ - u8 direction; - - if (absdx > absdy) - { - direction = DIR_EAST; - if (dx < 0) - { - direction = DIR_WEST; - } - } - else - { - direction = DIR_SOUTH; - if (dy < 0) - { - direction = DIR_NORTH; - } - } - return direction; -} - -u8 GetNorthSouthRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) -{ - u8 direction; - - direction = DIR_SOUTH; - if (dy < 0) - { - direction = DIR_NORTH; - } - return direction; -} - -u8 GetEastWestRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) -{ - u8 direction; - - direction = DIR_EAST; - if (dx < 0) - { - direction = DIR_WEST; - } - return direction; -} - -u8 GetNorthEastRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) -{ - u8 direction; - - direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy); - if (direction == DIR_SOUTH) - { - direction = GetEastWestRunningPastFacingDirection(dx, dy, absdx, absdy); - if (direction == DIR_EAST) - { - direction = DIR_NORTH; - } - } - else if (direction == DIR_EAST) - { - direction = GetNorthSouthRunningPastFacingDirection(dx, dy, absdx, absdy); - if (direction == DIR_SOUTH) - { - direction = DIR_NORTH; - } - } - return direction; -} - -u8 GetNorthWestRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) -{ - u8 direction; - - direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy); - if (direction == DIR_SOUTH) - { - direction = GetEastWestRunningPastFacingDirection(dx, dy, absdx, absdy); - if (direction == DIR_WEST) - { - direction = DIR_NORTH; - } - } - else if (direction == DIR_WEST) - { - direction = GetNorthSouthRunningPastFacingDirection(dx, dy, absdx, absdy); - if (direction == DIR_SOUTH) - { - direction = DIR_NORTH; - } - } - return direction; -} - -u8 GetSouthEastRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) -{ - u8 direction; - - direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy); - if (direction == DIR_NORTH) - { - direction = GetEastWestRunningPastFacingDirection(dx, dy, absdx, absdy); - if (direction == DIR_EAST) - { - direction = DIR_SOUTH; - } - } - else if (direction == DIR_EAST) - { - direction = GetNorthSouthRunningPastFacingDirection(dx, dy, absdx, absdy); - if (direction == DIR_NORTH) - { - direction = DIR_SOUTH; - } - } - return direction; -} - -u8 GetSouthWestRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) -{ - u8 direction; - - direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy); - if (direction == DIR_NORTH) - { - direction = GetEastWestRunningPastFacingDirection(dx, dy, absdx, absdy); - if (direction == DIR_WEST) - { - direction = DIR_SOUTH; - } - } - else if (direction == DIR_WEST) - { - direction = GetNorthSouthRunningPastFacingDirection(dx, dy, absdx, absdy); - if (direction == DIR_NORTH) - { - direction = DIR_SOUTH; - } - } - return direction; -} - -u8 GetNonEastRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) -{ - u8 direction; - - direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy); - if (direction == DIR_EAST) - { - direction = GetNorthSouthRunningPastFacingDirection(dx, dy, absdx, absdy); - } - return direction; -} - -u8 GetNonWestRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) -{ - u8 direction; - - direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy); - if (direction == DIR_WEST) - { - direction = GetNorthSouthRunningPastFacingDirection(dx, dy, absdx, absdy); - } - return direction; -} - -u8 GetNonSouthRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) -{ - u8 direction; - - direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy); - if (direction == DIR_SOUTH) - { - direction = GetEastWestRunningPastFacingDirection(dx, dy, absdx, absdy); - } - return direction; -} - -u8 GetNonNorthRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) -{ - u8 direction; - - direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy); - if (direction == DIR_NORTH) - { - direction = GetEastWestRunningPastFacingDirection(dx, dy, absdx, absdy); - } - return direction; -} - -u8 GetRunningPastFacingDirection(struct MapObject *mapObject, u8 movementType) -{ - s16 dx; - s16 dy; - s16 absdx; - s16 absdy; - - if (!FieldObjectIsTrainerAndCloseToPlayer(mapObject)) - { - return 0; - } - PlayerGetDestCoords(&dx, &dy); - dx -= mapObject->coords2.x; - dy -= mapObject->coords2.y; - absdx = dx; - absdy = dy; - if (absdx < 0) - { - absdx = -absdx; - } - if (absdy < 0) - { - absdy = -absdy; - } - return gUnknown_0850D714[movementType](dx, dy, absdx, absdy); -} - -field_object_step(LookRandomDirections, gUnknown_0850D740) - -bool8 sub_808F988(struct MapObject *mapObject, struct Sprite *sprite) -{ - npc_reset(mapObject, sprite); - sprite->data[1] = 1; - return TRUE; -} - -bool8 sub_808F99C(struct MapObject *mapObject, struct Sprite *sprite) -{ - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - sprite->data[1] = 2; - return TRUE; -} - -bool8 sub_808F9C8(struct MapObject *mapObject, struct Sprite *sprite) -{ - if (FieldObjectExecRegularAnim(mapObject, sprite)) - { - SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]); - mapObject->mapobj_bit_1 = FALSE; - sprite->data[1] = 3; - } - return FALSE; -} - -bool8 sub_808FA0C(struct MapObject *mapObject, struct Sprite *sprite) -{ - if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) - { - sprite->data[1] = 4; - return TRUE; - } - return FALSE; -} - -bool8 sub_808FA3C(struct MapObject *mapObject, struct Sprite *sprite) -{ - u8 directions[4]; - u8 direction; - - memcpy(directions, gUnknown_0850D710, sizeof directions); - direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_ANY); - if (direction == 0) - { - direction = directions[Random() & 0x03]; - } - FieldObjectSetDirection(mapObject, direction); - sprite->data[1] = 1; - return TRUE; -} - -field_object_step(RandomlyGoNorthOrSouth, gUnknown_0850D754) - -bool8 sub_808FAC8(struct MapObject *mapObject, struct Sprite *sprite) -{ - npc_reset(mapObject, sprite); - sprite->data[1] = 1; - return TRUE; -} - -bool8 sub_808FADC(struct MapObject *mapObject, struct Sprite *sprite) -{ - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - sprite->data[1] = 2; - return TRUE; -} - -bool8 sub_808FB08(struct MapObject *mapObject, struct Sprite *sprite) -{ - if (!FieldObjectExecRegularAnim(mapObject, sprite)) - { - return FALSE; - } - SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]); - sprite->data[1] = 3; - return TRUE; -} - -bool8 sub_808FB44(struct MapObject *mapObject, struct Sprite *sprite) -{ - if (RunFieldObjectStepTimer(sprite)) - { - sprite->data[1] = 4; - return TRUE; - } - return FALSE; -} - -bool8 sub_808FB64(struct MapObject *mapObject, struct Sprite *sprite) -{ - u8 directions[2]; - u8 direction; - - memcpy(directions, gUnknown_0850D770, sizeof directions); - direction = directions[Random() & 0x01]; - FieldObjectSetDirection(mapObject, direction); - sprite->data[1] = 5; - if (npc_block_way__next_tile(mapObject, direction)) - { - sprite->data[1] = 1; - } - return TRUE; -} - -bool8 sub_808FBB0(struct MapObject *mapObject, struct Sprite *sprite) -{ - FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->placeholder18)); - mapObject->mapobj_bit_1 = TRUE; - sprite->data[1] = 6; - return TRUE; -} - -bool8 sub_808FBE0(struct MapObject *mapObject, struct Sprite *sprite) -{ - if (FieldObjectExecRegularAnim(mapObject, sprite)) - { - mapObject->mapobj_bit_1 = FALSE; - sprite->data[1] = 1; - } - return FALSE; -} - -field_object_step(RandomlyGoEastOrWest, gUnknown_0850D774) - -bool8 sub_808FC4C(struct MapObject *mapObject, struct Sprite *sprite) -{ - npc_reset(mapObject, sprite); - sprite->data[1] = 1; - return TRUE; -} - -bool8 sub_808FC60(struct MapObject *mapObject, struct Sprite *sprite) -{ - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - sprite->data[1] = 2; - return TRUE; -} - -bool8 sub_808FC8C(struct MapObject *mapObject, struct Sprite *sprite) -{ - if (!FieldObjectExecRegularAnim(mapObject, sprite)) - { - return FALSE; - } - SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]); - sprite->data[1] = 3; - return TRUE; -} - -bool8 sub_808FCC8(struct MapObject *mapObject, struct Sprite *sprite) -{ - if (RunFieldObjectStepTimer(sprite)) - { - sprite->data[1] = 4; - return TRUE; - } - return FALSE; -} - -bool8 sub_808FCE8(struct MapObject *mapObject, struct Sprite *sprite) -{ - u8 directions[2]; - u8 direction; - - memcpy(directions, gUnknown_0850D790, sizeof directions); - direction = directions[Random() & 0x01]; - FieldObjectSetDirection(mapObject, direction); - sprite->data[1] = 5; - if (npc_block_way__next_tile(mapObject, direction)) - { - sprite->data[1] = 1; - } - return TRUE; -} - -bool8 sub_808FD34(struct MapObject *mapObject, struct Sprite *sprite) -{ - FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->placeholder18)); - mapObject->mapobj_bit_1 = TRUE; - sprite->data[1] = 6; - return TRUE; -} - -bool8 sub_808FD64(struct MapObject *mapObject, struct Sprite *sprite) -{ - if (FieldObjectExecRegularAnim(mapObject, sprite)) - { - mapObject->mapobj_bit_1 = FALSE; - sprite->data[1] = 1; - } - return FALSE; -} - -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)); - sprite->data[1] = 1; - return TRUE; -} - -bool8 sub_808FDFC(struct MapObject *mapObject, struct Sprite *sprite) -{ - if (FieldObjectExecRegularAnim(mapObject, sprite)) - { - sprite->data[1] = 2; - return TRUE; - } - return FALSE; -} - -bool8 sub_808FE1C(struct MapObject *mapObject, struct Sprite *sprite) -{ - mapObject->mapobj_bit_1 = 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) -{ - struct MapObject *mapObject; - - mapObject = &gMapObjects[sprite->data[0]]; - if (!(sprite->data[7] & 0x0001)) - { - get_berry_tree_graphics(mapObject, sprite); - sprite->data[7] |= 0x0001; - } - FieldObjectStep(mapObject, sprite, FieldObjectCB2_BerryTree); -} -static bool8 FieldObjectCB2_BerryTree(struct MapObject *mapObject, struct Sprite *sprite) -{ - return gUnknown_0850D7A0[sprite->data[1]](mapObject, sprite); -} - -bool8 do_berry_tree_growth_sparkle_1 (struct MapObject *mapObject, struct Sprite *sprite) -{ - u8 berryStage; - - npc_reset(mapObject, sprite); - mapObject->mapobj_bit_13 = 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[2] = sprite->subpriority - 1; - gFieldEffectArguments[3] = sprite->oam.priority; - FieldEffectStart(FLDEFF_BERRY_TREE_GROWTH_SPARKLE); - sprite->animNum = berryStage; - } - return FALSE; - } - mapObject->mapobj_bit_13 = FALSE; - sprite->invisible = FALSE; - berryStage --; - if (sprite->animNum != berryStage) - { - sprite->data[1] = 2; - return TRUE; - } - get_berry_tree_graphics(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, 0x39); - sprite->data[1] = 1; - return TRUE; -} - -bool8 sub_808FF48 (struct MapObject *mapObject, struct Sprite *sprite) -{ - if (FieldObjectExecRegularAnim(mapObject, sprite)) - { - sprite->data[1] = 0; - return TRUE; - } - return FALSE; -} - -bool8 do_berry_tree_growth_sparkle_2 (struct MapObject *mapObject, struct Sprite *sprite) -{ - mapObject->mapobj_bit_1 = TRUE; - sprite->data[1] = 3; - sprite->data[2] = 0; - sprite->data[7] |= 0x0002; - gFieldEffectArguments[0] = mapObject->coords2.x; - gFieldEffectArguments[1] = mapObject->coords2.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) -{ - sprite->data[2] ++; - mapObject->mapobj_bit_13 = (sprite->data[2] & 0x02) >> 1; - sprite->animPaused = TRUE; - if (sprite->data[2] > 64) - { - get_berry_tree_graphics(mapObject, sprite); - sprite->data[1] = 4; - sprite->data[2] = 0; - return TRUE; - } - return FALSE; -} - -bool8 sub_8090004 (struct MapObject *mapObject, struct Sprite *sprite) -{ - sprite->data[2] ++; - mapObject->mapobj_bit_13 = (sprite->data[2] & 0x02) >> 1; - sprite->animPaused = TRUE; - if (sprite->data[2] > 64) - { - sprite->data[1] = 0; - sprite->data[7] &= ~0x0002; - return TRUE; - } - return FALSE; -} - -field_object_step(RandomlyLookNorthOrSouth, gUnknown_0850D7B4) - -bool8 sub_8090094 (struct MapObject *mapObject, struct Sprite *sprite) -{ - npc_reset(mapObject, sprite); - sprite->data[1] = 1; - return TRUE; -} - -bool8 sub_80900A8 (struct MapObject *mapObject, struct Sprite *sprite) -{ - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - sprite->data[1] = 2; - return TRUE; -} - -bool8 sub_80900D4 (struct MapObject *mapObject, struct Sprite *sprite) -{ - if (FieldObjectExecRegularAnim(mapObject, sprite)) - { - SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]); - mapObject->mapobj_bit_1 = FALSE; - sprite->data[1] = 3; - } - return FALSE; -} - -bool8 sub_8090118 (struct MapObject *mapObject, struct Sprite *sprite) -{ - if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) - { - sprite->data[1] = 4; - return TRUE; - } - return FALSE; -} - -bool8 sub_8090148 (struct MapObject *mapObject, struct Sprite *sprite) -{ - u8 directions[2]; - u8 direction; - - memcpy(directions, gUnknown_0850D770, sizeof gUnknown_0850D770); - direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_NORTH_SOUTH); - if (direction == 0) - { - direction = directions[Random() & 0x01]; - } - FieldObjectSetDirection(mapObject, direction); - sprite->data[1] = 1; - return TRUE; -} - -field_object_step(RandomlyLookEastOrWest, gUnknown_0850D7C8) - -bool8 sub_80901D4 (struct MapObject *mapObject, struct Sprite *sprite) -{ - npc_reset(mapObject, sprite); - sprite->data[1] = 1; - return TRUE; -} - -bool8 sub_80901E8 (struct MapObject *mapObject, struct Sprite *sprite) -{ - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - sprite->data[1] = 2; - return TRUE; -} - -bool8 sub_8090214 (struct MapObject *mapObject, struct Sprite *sprite) -{ - if (FieldObjectExecRegularAnim(mapObject, sprite)) - { - SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]); - mapObject->mapobj_bit_1 = FALSE; - sprite->data[1] = 3; - } - return FALSE; -} - -bool8 sub_8090258 (struct MapObject *mapObject, struct Sprite *sprite) -{ - if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) - { - sprite->data[1] = 4; - return TRUE; - } - return FALSE; -} - -bool8 sub_8090288 (struct MapObject *mapObject, struct Sprite *sprite) -{ - u8 directions[2]; - u8 direction; - - memcpy(directions, gUnknown_0850D790, sizeof gUnknown_0850D790); - direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_EAST_WEST); - if (direction == 0) - { - direction = directions[Random() & 0x01]; - } - FieldObjectSetDirection(mapObject, direction); - sprite->data[1] = 1; - return TRUE; -} - -field_object_step(RandomlyLookNorthOrWest, gUnknown_0850D7DC) - -bool8 sub_8090314 (struct MapObject *mapObject, struct Sprite *sprite) -{ - npc_reset(mapObject, sprite); - sprite->data[1] = 1; - return TRUE; -} - -bool8 sub_8090328 (struct MapObject *mapObject, struct Sprite *sprite) -{ - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - sprite->data[1] = 2; - return TRUE; -} - -bool8 sub_8090354 (struct MapObject *mapObject, struct Sprite *sprite) -{ - if (FieldObjectExecRegularAnim(mapObject, sprite)) - { - SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); - mapObject->mapobj_bit_1 = FALSE; - sprite->data[1] = 3; - } - return FALSE; -} - -bool8 sub_8090398 (struct MapObject *mapObject, struct Sprite *sprite) -{ - if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) - { - sprite->data[1] = 4; - return TRUE; - } - return FALSE; -} - -bool8 sub_80903C8 (struct MapObject *mapObject, struct Sprite *sprite) -{ - u8 directions[2]; - u8 direction; - - memcpy(directions, gUnknown_0850D7F0, sizeof gUnknown_0850D7F0); - direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_NORTH_WEST); - if (direction == 0) - { - direction = directions[Random() & 0x01]; - } - FieldObjectSetDirection(mapObject, direction); - sprite->data[1] = 1; - return TRUE; -} - -field_object_step(RandomlyLookNorthOrEast, gUnknown_0850D7F4) - -bool8 sub_8090454 (struct MapObject *mapObject, struct Sprite *sprite) -{ - npc_reset(mapObject, sprite); - sprite->data[1] = 1; - return TRUE; -} - -bool8 sub_8090468 (struct MapObject *mapObject, struct Sprite *sprite) -{ - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - sprite->data[1] = 2; - return TRUE; -} - -bool8 sub_8090494 (struct MapObject *mapObject, struct Sprite *sprite) -{ - if (FieldObjectExecRegularAnim(mapObject, sprite)) - { - SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); - mapObject->mapobj_bit_1 = FALSE; - sprite->data[1] = 3; - } - return FALSE; -} - -bool8 sub_80904D8 (struct MapObject *mapObject, struct Sprite *sprite) -{ - if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) - { - sprite->data[1] = 4; - return TRUE; - } - return FALSE; -} - -bool8 sub_8090508 (struct MapObject *mapObject, struct Sprite *sprite) -{ - u8 directions[2]; - u8 direction; - - memcpy(directions, gUnknown_0850D808, sizeof gUnknown_0850D808); - direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_NORTH_EAST); - if (direction == 0) - { - direction = directions[Random() & 0x01]; - } - FieldObjectSetDirection(mapObject, direction); - sprite->data[1] = 1; - return TRUE; -} - -field_object_step(RandomlyLookSouthOrWest, gUnknown_0850D80C) - -bool8 sub_8090594 (struct MapObject *mapObject, struct Sprite *sprite) -{ - npc_reset(mapObject, sprite); - sprite->data[1] = 1; - return TRUE; -} - -bool8 sub_80905A8 (struct MapObject *mapObject, struct Sprite *sprite) -{ - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - sprite->data[1] = 2; - return TRUE; -} - -bool8 sub_80905D4 (struct MapObject *mapObject, struct Sprite *sprite) -{ - if (FieldObjectExecRegularAnim(mapObject, sprite)) - { - SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); - mapObject->mapobj_bit_1 = FALSE; - sprite->data[1] = 3; - } - return FALSE; -} - -bool8 sub_8090618 (struct MapObject *mapObject, struct Sprite *sprite) -{ - if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) - { - sprite->data[1] = 4; - return TRUE; - } - return FALSE; -} - -bool8 sub_8090648 (struct MapObject *mapObject, struct Sprite *sprite) -{ - u8 directions[2]; - u8 direction; - - memcpy(directions, gUnknown_0850D820, sizeof gUnknown_0850D820); - direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_SOUTH_WEST); - if (direction == 0) - { - direction = directions[Random() & 0x01]; - } - FieldObjectSetDirection(mapObject, direction); - sprite->data[1] = 1; - return TRUE; -} - -field_object_step(RandomlyLookSouthOrEast, gUnknown_0850D824) - -bool8 sub_80906D4 (struct MapObject *mapObject, struct Sprite *sprite) -{ - npc_reset(mapObject, sprite); - sprite->data[1] = 1; - return TRUE; -} - -bool8 sub_80906E8 (struct MapObject *mapObject, struct Sprite *sprite) -{ - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - sprite->data[1] = 2; - return TRUE; -} - -bool8 sub_8090714 (struct MapObject *mapObject, struct Sprite *sprite) -{ - if (FieldObjectExecRegularAnim(mapObject, sprite)) - { - SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); - mapObject->mapobj_bit_1 = FALSE; - sprite->data[1] = 3; - } - return FALSE; -} - -bool8 sub_8090758 (struct MapObject *mapObject, struct Sprite *sprite) -{ - if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) - { - sprite->data[1] = 4; - return TRUE; - } - return FALSE; -} - -bool8 sub_8090788 (struct MapObject *mapObject, struct Sprite *sprite) -{ - u8 directions[2]; - u8 direction; - - memcpy(directions, gUnknown_0850D838, sizeof gUnknown_0850D838); - direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_SOUTH_EAST); - if (direction == 0) - { - direction = directions[Random() & 0x01]; - } - FieldObjectSetDirection(mapObject, direction); - sprite->data[1] = 1; - return TRUE; -} - -field_object_step(RandomlyLookNorthOrSouthOrWest, gUnknown_0850D83C) - -bool8 sub_8090814 (struct MapObject *mapObject, struct Sprite *sprite) -{ - npc_reset(mapObject, sprite); - sprite->data[1] = 1; - return TRUE; -} - -bool8 sub_8090828 (struct MapObject *mapObject, struct Sprite *sprite) -{ - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - sprite->data[1] = 2; - return TRUE; -} - -bool8 sub_8090854 (struct MapObject *mapObject, struct Sprite *sprite) -{ - if (FieldObjectExecRegularAnim(mapObject, sprite)) - { - SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); - mapObject->mapobj_bit_1 = FALSE; - sprite->data[1] = 3; - } - return FALSE; -} - -bool8 sub_8090898 (struct MapObject *mapObject, struct Sprite *sprite) -{ - if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) - { - sprite->data[1] = 4; - return TRUE; - } - return FALSE; -} - -bool8 sub_80908C8 (struct MapObject *mapObject, struct Sprite *sprite) -{ - u8 directions[4]; - u8 direction; - - memcpy(directions, gUnknown_0850D850, sizeof gUnknown_0850D850); - direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_NORTH_SOUTH_WEST); - if (direction == 0) - { - direction = directions[Random() & 0x03]; - } - FieldObjectSetDirection(mapObject, direction); - sprite->data[1] = 1; - return TRUE; -} - -field_object_step(RandomlyLookNorthOrSouthOrEast, gUnknown_0850D854) - -bool8 sub_8090954 (struct MapObject *mapObject, struct Sprite *sprite) -{ - npc_reset(mapObject, sprite); - sprite->data[1] = 1; - return TRUE; -} - -bool8 sub_8090968 (struct MapObject *mapObject, struct Sprite *sprite) -{ - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - sprite->data[1] = 2; - return TRUE; -} - -bool8 sub_8090994 (struct MapObject *mapObject, struct Sprite *sprite) -{ - if (FieldObjectExecRegularAnim(mapObject, sprite)) - { - SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); - mapObject->mapobj_bit_1 = FALSE; - sprite->data[1] = 3; - } - return FALSE; -} - -bool8 sub_80909D8 (struct MapObject *mapObject, struct Sprite *sprite) -{ - if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) - { - sprite->data[1] = 4; - return TRUE; - } - return FALSE; -} - -bool8 sub_8090A08 (struct MapObject *mapObject, struct Sprite *sprite) -{ - u8 directions[4]; - u8 direction; - - memcpy(directions, gUnknown_0850D868, sizeof gUnknown_0850D868); - direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_NORTH_SOUTH_EAST); - if (direction == 0) - { - direction = directions[Random() & 0x03]; - } - FieldObjectSetDirection(mapObject, direction); - sprite->data[1] = 1; - return TRUE; -} - -field_object_step(RandomlyLookNorthOrEastOrWest, gUnknown_0850D86C) - -bool8 sub_8090A94 (struct MapObject *mapObject, struct Sprite *sprite) -{ - npc_reset(mapObject, sprite); - sprite->data[1] = 1; - return TRUE; -} - -bool8 sub_8090AA8 (struct MapObject *mapObject, struct Sprite *sprite) -{ - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - sprite->data[1] = 2; - return TRUE; -} - -bool8 sub_8090AD4 (struct MapObject *mapObject, struct Sprite *sprite) -{ - if (FieldObjectExecRegularAnim(mapObject, sprite)) - { - SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); - mapObject->mapobj_bit_1 = FALSE; - sprite->data[1] = 3; - } - return FALSE; -} - -bool8 sub_8090B18 (struct MapObject *mapObject, struct Sprite *sprite) -{ - if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) - { - sprite->data[1] = 4; - return TRUE; - } - return FALSE; -} - -bool8 sub_8090B48 (struct MapObject *mapObject, struct Sprite *sprite) -{ - u8 directions[4]; - u8 direction; - - memcpy(directions, gUnknown_0850D880, sizeof gUnknown_0850D880); - direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_NORTH_EAST_WEST); - if (direction == 0) - { - direction = directions[Random() & 0x03]; - } - FieldObjectSetDirection(mapObject, direction); - sprite->data[1] = 1; - return TRUE; -} - -field_object_step(RandomlyLookSouthOrEastOrWest, gUnknown_0850D884) - -bool8 sub_8090BD4 (struct MapObject *mapObject, struct Sprite *sprite) -{ - npc_reset(mapObject, sprite); - sprite->data[1] = 1; - return TRUE; -} - -bool8 sub_8090BE8 (struct MapObject *mapObject, struct Sprite *sprite) -{ - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - sprite->data[1] = 2; - return TRUE; -} - -bool8 sub_8090C14 (struct MapObject *mapObject, struct Sprite *sprite) -{ - if (FieldObjectExecRegularAnim(mapObject, sprite)) - { - SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); - mapObject->mapobj_bit_1 = FALSE; - sprite->data[1] = 3; - } - return FALSE; -} - -bool8 sub_8090C58 (struct MapObject *mapObject, struct Sprite *sprite) -{ - if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) - { - sprite->data[1] = 4; - return TRUE; - } - return FALSE; -} - -bool8 sub_8090C88 (struct MapObject *mapObject, struct Sprite *sprite) -{ - u8 directions[4]; - u8 direction; - - memcpy(directions, gUnknown_0850D898, sizeof gUnknown_0850D898); - direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_SOUTH_EAST_WEST); - if (direction == 0) - { - direction = directions[Random() & 0x03]; - } - FieldObjectSetDirection(mapObject, direction); - sprite->data[1] = 1; - return TRUE; -} - -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)); - sprite->data[1] = 1; - return TRUE; -} - -bool8 sub_8090D40 (struct MapObject *mapObject, struct Sprite *sprite) -{ - if (FieldObjectExecRegularAnim(mapObject, sprite)) - { - SetFieldObjectStepTimer(sprite, 48); - sprite->data[1] = 2; - } - return FALSE; -} - -bool8 sub_8090D64 (struct MapObject *mapObject, struct Sprite *sprite) -{ - if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) - { - sprite->data[1] = 3; - } - return FALSE; -} - -bool8 sub_8090D90 (struct MapObject *mapObject, struct Sprite *sprite) -{ - u8 directions[5]; - u8 direction; - - memcpy(directions, gUnknown_0850D8AC, sizeof gUnknown_0850D8AC); - direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_ANY); - if (direction == 0) - { - direction = directions[mapObject->mapobj_unk_18]; - } - FieldObjectSetDirection(mapObject, direction); - sprite->data[1] = 0; - return TRUE; -} - -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)); - sprite->data[1] = 1; - return TRUE; -} - -bool8 sub_8090E44 (struct MapObject *mapObject, struct Sprite *sprite) -{ - if (FieldObjectExecRegularAnim(mapObject, sprite)) - { - SetFieldObjectStepTimer(sprite, 48); - sprite->data[1] = 2; - } - return FALSE; -} - -bool8 sub_8090E68 (struct MapObject *mapObject, struct Sprite *sprite) -{ - if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) - { - sprite->data[1] = 3; - } - return FALSE; -} - -bool8 sub_8090E94 (struct MapObject *mapObject, struct Sprite *sprite) -{ - u8 directions[5]; - u8 direction; - - memcpy(directions, gUnknown_0850D8C4, sizeof gUnknown_0850D8C4); - direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_ANY); - if (direction == 0) - { - direction = directions[mapObject->mapobj_unk_18]; - } - FieldObjectSetDirection(mapObject, direction); - sprite->data[1] = 0; - return TRUE; -} - -field_object_step(AlternatelyGoInOppositeDirections, gUnknown_0850D8CC) - -bool8 sub_8090F1C (struct MapObject *mapObject, struct Sprite *sprite) -{ - npc_reset(mapObject, sprite); - sprite->data[1] = 1; - return TRUE; -} - -bool8 sub_8090F30 (struct MapObject *mapObject, struct Sprite *sprite) -{ - u8 direction; - - direction = gUnknown_085055CD[mapObject->animPattern]; - if (mapObject->mapobj_unk_21) - { - direction = GetOppositeDirection(direction); - } - FieldObjectSetDirection(mapObject, direction); - sprite->data[1] = 2; - return TRUE; -} - -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) - { - mapObject->mapobj_unk_21 = 0; - FieldObjectSetDirection(mapObject, GetOppositeDirection(mapObject->placeholder18)); - } - blockingWay = npc_block_way__next_tile(mapObject, mapObject->placeholder18); - animId = GetGoSpeed0AnimId(mapObject->placeholder18); - 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); - } - if (blockingWay) - { - animId = GetStepInPlaceDelay16AnimId(mapObject->mapobj_unk_18); - } - FieldObjectSetRegularAnim(mapObject, sprite, animId); - mapObject->mapobj_bit_1 = TRUE; - sprite->data[1] = 3; - return TRUE; -} - -bool8 sub_8091020 (struct MapObject *mapObject, struct Sprite *sprite) -{ - if (FieldObjectExecRegularAnim(mapObject, sprite)) - { - mapObject->mapobj_bit_1 = FALSE; - sprite->data[1] = 1; - } - return FALSE; -} - -bool8 sub_8091048(struct MapObject *mapObject, struct Sprite *sprite) -{ - npc_reset(mapObject, sprite); - sprite->data[1] = 1; - return TRUE; -} - -bool8 MoveFieldObjectInNextDirectionInSequence(struct MapObject *mapObject, struct Sprite *sprite, u8 *route) -{ - u8 blockingWay; - u8 animId; - - if (mapObject->mapobj_unk_21 == 3 && mapObject->coords1.x == mapObject->coords2.x && mapObject->coords1.y == mapObject->coords2.y) - { - mapObject->mapobj_unk_21 = 0; - } - FieldObjectSetDirection(mapObject, route[mapObject->mapobj_unk_21]); - animId = GetGoSpeed0AnimId(mapObject->placeholder18); - blockingWay = npc_block_way__next_tile(mapObject, mapObject->placeholder18); - 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); - } - if (blockingWay) - { - animId = GetStepInPlaceDelay16AnimId(mapObject->mapobj_unk_18); - } - FieldObjectSetRegularAnim(mapObject, sprite, animId); - mapObject->mapobj_bit_1 = TRUE; - sprite->data[1] = 2; - return TRUE; -} - -bool8 sub_8091110(struct MapObject *mapObject, struct Sprite *sprite) -{ - if (FieldObjectExecRegularAnim(mapObject, sprite)) - { - mapObject->mapobj_bit_1 = FALSE; - 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) - -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) - { - mapObject->mapobj_unk_21 = player_get_direction_lower_nybble(); - } - sprite->data[1] = 1; - return TRUE; -} - -bool8 sub_8091EC0(struct MapObject *mapObject, struct Sprite *sprite) -{ - if (gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1C == 0xFF || gPlayerAvatar.tileTransitionState == 2) - { - return FALSE; - } - return gUnknown_0850DA64[player_get_x22()](mapObject, sprite, player_get_direction_upper_nybble(), NULL); -} - -bool8 sub_8091F20(struct MapObject *mapObject, struct Sprite *sprite) -{ - if (FieldObjectExecRegularAnim(mapObject, sprite)) - { - mapObject->mapobj_bit_1 = FALSE; - sprite->data[1] = 1; - } - return FALSE; -} - -bool8 sub_8091F48(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) -{ - return FALSE; -} - -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; - sprite->data[1] = 2; - return TRUE; -} - -bool8 sub_8091F94(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) -{ - u32 direction; - s16 x; - s16 y; - - direction = playerDirection; - if (FieldObjectIsFarawayIslandMew(mapObject)) - { - direction = sub_81D427C(); - if (direction == 0) - { - direction = playerDirection; - direction = state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, direction); - FieldObjectMoveDestCoords(mapObject, direction, &x, &y); - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); - mapObject->mapobj_bit_1 = TRUE; - sprite->data[1] = 2; - return TRUE; - } - } - else - { - direction = state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, 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)))) - { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); - } - mapObject->mapobj_bit_1 = TRUE; - sprite->data[1] = 2; - return TRUE; -} - -bool8 sub_80920A4(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) -{ - u32 direction; - s16 x; - s16 y; - - direction = playerDirection; - direction = state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, 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; - sprite->data[1] = 2; - return TRUE; -} - -bool8 sub_809215C(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) -{ - u32 direction; - s16 x; - s16 y; - - direction = playerDirection; - direction = state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, 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; - sprite->data[1] = 2; - return TRUE; -} - -bool8 sub_8092214(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) -{ - u32 direction; - s16 x; - s16 y; - - direction = playerDirection; - direction = state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, 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; - sprite->data[1] = 2; - return TRUE; -} - -bool8 cph_IM_DIFFERENT(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) -{ - u32 direction; - - direction = playerDirection; - direction = state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, direction); - FieldObjectSetRegularAnim(mapObject, sprite, sub_80934BC(direction)); - mapObject->mapobj_bit_1 = TRUE; - sprite->data[1] = 2; - return TRUE; -} - -bool8 sub_8092314(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) -{ - u32 direction; - s16 x; - s16 y; - - direction = playerDirection; - direction = state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, 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; - sprite->data[1] = 2; - return TRUE; -} - -bool8 oac_hopping(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) -{ - u32 direction; - s16 x; - 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; - 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; - sprite->data[1] = 2; - return TRUE; -} - -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) - { - return FALSE; - } - return gUnknown_0850DA64[player_get_x22()](mapObject, sprite, player_get_direction_upper_nybble(), MetatileBehavior_IsPokeGrass); -} - -bool8 sub_80925AC(struct MapObject *, struct Sprite *); - -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])) - { - FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); - mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_TREE_DISGUISE); - mapObject->mapobj_unk_21 = 1; - sprite->data[7] ++; - } - FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, sub_80925AC); -} - -bool8 sub_80925AC(struct MapObject *mapObject, struct Sprite *sprite) -{ - npc_reset(mapObject, sprite); - return FALSE; -} - -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])) - { - FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); - mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE); - mapObject->mapobj_unk_21 = 1; - sprite->data[7] ++; - } - FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, sub_80925AC); -} - -extern bool8 (*const gUnknown_0850DA9C[])(struct MapObject *, struct Sprite *); -bool8 sub_809268C(struct MapObject *, struct Sprite *); - -void FieldObjectCB_Hidden1(struct Sprite *sprite) -{ - if (!sprite->data[7]) - { - gMapObjects[sprite->data[0]].mapobj_bit_26 = TRUE; - sprite->subspriteMode = 2; - sprite->oam.priority = 3; - sprite->data[7] ++; - } - FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, sub_809268C); -} - -bool8 sub_809268C(struct MapObject *mapObject, struct Sprite *sprite) -{ - return gUnknown_0850DA9C[sprite->data[1]](mapObject, sprite); -} - -bool8 sub_80926AC (struct MapObject *mapObject, struct Sprite *sprite) -{ - npc_reset(mapObject, sprite); - return FALSE; -} -bool8 sub_80926B8 (struct MapObject *mapObject, struct Sprite *sprite) -{ - if (FieldObjectExecRegularAnim(mapObject, sprite)) - { - sprite->data[1] = 0; - } - return FALSE; -} - -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)); - sprite->data[1] = 1; - return TRUE; -} - -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)); - sprite->data[1] = 1; - return TRUE; -} - -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)); - sprite->data[1] = 1; - return TRUE; -} - -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)); - sprite->data[1] = 1; - return TRUE; -} - -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; - sprite->data[1] = 1; - return TRUE; -} -bool8 sub_809290C(struct MapObject *mapObject, struct Sprite *sprite) -{ - if (FieldObjectExecRegularAnim(mapObject, sprite)) - { - sprite->data[1] = 2; - return TRUE; - } - return FALSE; -} - -bool8 sub_809292C(struct MapObject *mapObject, struct Sprite *sprite) -{ - mapObject->mapobj_bit_1 = 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; - sprite->data[1] = 0; -} - -#define dirn2anim(name, table)\ -extern const u8 table[4];\ -u8 name(u8 direction)\ -{\ - return table[direction];\ -} - -dirn2anim(FieldObjectDirectionToImageAnimId, 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) - -// 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; - - for (retval = gUnknown_085094AC; retval->anims != NULL; retval ++) - { - if (retval->anims == anims) - { - return retval; - } - } - return NULL; -} - -void npc_apply_anim_looping(struct MapObject *mapObject, struct Sprite *sprite, u8 animNum) -{ - const struct UnkStruct_085094AC *unk85094AC; - - if (!mapObject->mapobj_bit_12) - { - sprite->animNum = animNum; - unk85094AC = sub_8092A4C(sprite->anims); - if (unk85094AC != NULL) - { - if (sprite->animCmdIndex == unk85094AC->animPos[0]) - { - sprite->animCmdIndex = unk85094AC->animPos[3]; - } - else if (sprite->animCmdIndex == unk85094AC->animPos[1]) - { - sprite->animCmdIndex = unk85094AC->animPos[2]; - } - } - SeekSpriteAnim(sprite, sprite->animCmdIndex); - } -} - -void obj_npc_animation_step(struct MapObject *mapObject, struct Sprite *sprite, u8 animNum) -{ - const struct UnkStruct_085094AC *unk85094AC; - - if (!mapObject->mapobj_bit_12) - { - u8 animPos; - - sprite->animNum = animNum; - unk85094AC = sub_8092A4C(sprite->anims); - if (unk85094AC != NULL) - { - animPos = unk85094AC->animPos[1]; - if (sprite->animCmdIndex <= unk85094AC->animPos[0]) - { - animPos = unk85094AC->animPos[0]; - } - SeekSpriteAnim(sprite, animPos); - } - } -} - -// file boundary? - -u8 sub_8092AF8(s16 x1, s16 y1, s16 x2, s16 y2) -{ - if (x1 > x2) - { - return DIR_WEST; - } - if (x1 < x2) - { - return DIR_EAST; - } - if (y1 > y2) - { - return DIR_NORTH; - } - return DIR_SOUTH; -} - -void npc_set_running_behaviour_etc(struct MapObject *mapObject, u8 animPattern) -{ - mapObject->animPattern = animPattern; - mapObject->mapobj_unk_21 = 0; - mapObject->animId = 0; - gSprites[mapObject->spriteId].callback = gUnknown_08505438[animPattern]; - gSprites[mapObject->spriteId].data[1] = 0; -} - -dirn2anim(npc_running_behaviour_by_direction, gUnknown_0850DB53) - -u8 npc_block_way__next_tile(struct MapObject *mapObject, u8 direction) -{ - s16 x; - s16 y; - - x = mapObject->coords2.x; - y = mapObject->coords2.y; - MoveCoords(direction, &x, &y); - return npc_block_way(mapObject, x, y, direction); -} - -u8 npc_block_way(struct MapObject *mapObject, s16 x, s16 y, u32 dirn) -{ - u8 direction; - - direction = dirn; - if (IsCoordOutsideFieldObjectMovementRect(mapObject, x, y)) - { - return 1; - } - if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(mapObject, x, y, direction)) - { - return 2; - } - if (mapObject->mapobj_bit_15 && !CanCameraMoveInDirection(direction)) - { - return 2; - } - if (IsZCoordMismatchAt(mapObject->mapobj_unk_0B_0, x, y)) - { - return 3; - } - if (CheckForCollisionBetweenFieldObjects(mapObject, x, y)) - { - return 4; - } - return 0; -} - -u8 sub_8092C8C(struct MapObject *mapObject, s16 x, s16 y, u8 direction) -{ - u8 retval; - - retval = 0x00; - if (IsCoordOutsideFieldObjectMovementRect(mapObject, x, y)) - { - retval |= 1; - } - if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(mapObject, x, y, direction) || (mapObject->mapobj_bit_15 && !CanCameraMoveInDirection(direction))) - { - retval |= 2; - } - if (IsZCoordMismatchAt(mapObject->mapobj_unk_0B_0, x, y)) - { - retval |= 4; - } - if (CheckForCollisionBetweenFieldObjects(mapObject, x, y)) - { - retval |= 8; - } - return retval; -} - -static bool8 IsCoordOutsideFieldObjectMovementRect(struct MapObject *mapObject, s16 x, s16 y) -{ - s16 left; - s16 right; - s16 top; - s16 bottom; - - 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; - if (left > x || right < x) - { - return TRUE; - } - } - 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; - if (top > y || bottom < y) - { - return TRUE; - } - } - return FALSE; -} - -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))) - { - return TRUE; - } - return FALSE; -} - -static bool8 CheckForCollisionBetweenFieldObjects(struct MapObject *mapObject, s16 x, s16 y) -{ - u8 i; - struct MapObject *curObject; - - for (i = 0; i < NUM_FIELD_OBJECTS; i ++) - { - 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 (AreZCoordsCompatible(mapObject->mapobj_unk_0B_0, curObject->mapobj_unk_0B_0)) - { - return TRUE; - } - } - } - } - return FALSE; -} - -bool8 sub_8092E9C(u8 localId, u8 mapNum, u8 mapGroup) -{ - u8 mapObjectId; - - if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId) && gSprites[gMapObjects[mapObjectId].spriteId].data[7] & 0x02) - { - return TRUE; - } - return FALSE; -} - -void sub_8092EF0(u8 localId, u8 mapNum, u8 mapGroup) -{ - u8 mapObjectId; - - if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) - { - gSprites[gMapObjects[mapObjectId].spriteId].data[7] |= 0x04; - } -} - -void MoveCoords(u8 direction, s16 *x, s16 *y) -{ - *x += gUnknown_0850DB7C[direction].x; - *y += gUnknown_0850DB7C[direction].y; -} - -void sub_8092F60(u8 direction, s16 *x, s16 *y) -{ - *x += gUnknown_0850DB7C[direction].x << 4; - *y += gUnknown_0850DB7C[direction].y << 4; -} - -void sub_8092F88(u32 dirn, s16 *x, s16 *y, s16 dx, s16 dy) -{ - u8 direction; - s16 dx_2; - s16 dy_2; - s16 cur_x; - s16 cur_y; - - direction = dirn; - dx_2 = dx; - dy_2 = dy; - cur_x = gUnknown_0850DB7C[direction].x; - if (cur_x > 0) - { - *x += dx_2; - } - if (cur_x < 0) - { - *x -= dx_2; - } - cur_y = gUnknown_0850DB7C[direction].y; - if (cur_y > 0) - { - *y += dy_2; - } - if (cur_y < 0) - { - *y -= dy_2; - } -} - -void sub_8092FF0(s16 x, s16 y, s16 *dest_x, s16 *dest_y) -{ - *dest_x = (x - gSaveBlock1Ptr->pos.x) << 4; - *dest_y = (y - gSaveBlock1Ptr->pos.y) << 4; - *dest_x -= gUnknown_03005DEC; - *dest_y -= gUnknown_03005DE8; -} - -void sub_8093038(s16 x, s16 y, s16 *dest_x, s16 *dest_y) -{ - s16 dx; - s16 dy; - - dx = -gUnknown_03005DEC - gUnknown_03005DD0.x; - dy = -gUnknown_03005DE8 - gUnknown_03005DD0.y; - if (gUnknown_03005DD0.x > 0) - { - dx += 0x10; - } - if (gUnknown_03005DD0.x < 0) - { - dx -= 0x10; - } - if (gUnknown_03005DD0.y > 0) - { - dy += 0x10; - } - if (gUnknown_03005DD0.y < 0) - { - dy -= 0x10; - } - *dest_x = ((x - gSaveBlock1Ptr->pos.x) << 4) + dx; - *dest_y = ((y - gSaveBlock1Ptr->pos.y) << 4) + dy; -} - -void sub_80930E0(s16 *x, s16 *y, s16 dx, s16 dy) -{ - sub_8093038(*x, *y, x, y); - *x += dx; - *y += dy; -} - -void GetFieldObjectMovingCameraOffset(s16 *x, s16 *y) -{ - *x = 0; - *y = 0; - if (gUnknown_03005DD0.x > 0) - { - (*x) ++; - } - if (gUnknown_03005DD0.x < 0) - { - (*x) --; - } - if (gUnknown_03005DD0.y > 0) - { - (*y) ++; - } - if (gUnknown_03005DD0.y < 0) - { - (*y) --; - } -} - -void FieldObjectMoveDestCoords(struct MapObject *mapObject, u32 dirn, s16 *x, s16 *y) -{ - u8 direction; - - direction = dirn; - *x = mapObject->coords2.x; - *y = mapObject->coords2.y; - MoveCoords(direction, x, y); -} - -// file boundary? - -bool8 FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct MapObject *mapObject) -{ - if (mapObject->mapobj_bit_1 || mapObject->mapobj_bit_6) - { - return TRUE; - } - return FALSE; -} - -bool8 FieldObjectIsSpecialAnimActive(struct MapObject *mapObject) -{ - if (mapObject->mapobj_bit_6 && mapObject->mapobj_unk_1C != 0xFF) - { - return TRUE; - } - return FALSE; -} - -bool8 FieldObjectSetSpecialAnim(struct MapObject *mapObject, u8 specialAnimId) -{ - if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject)) - { - return TRUE; - } - npc_sync_anim_pause_bits(mapObject); - mapObject->mapobj_unk_1C = specialAnimId; - mapObject->mapobj_bit_6 = TRUE; - mapObject->mapobj_bit_7 = FALSE; - gSprites[mapObject->spriteId].data[2] = 0; - return FALSE; -} - -void FieldObjectForceSetSpecialAnim(struct MapObject *mapObject, u8 specialAnimId) -{ - FieldObjectClearAnimIfSpecialAnimActive(mapObject); - FieldObjectSetSpecialAnim(mapObject, specialAnimId); -} - -void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *mapObject) -{ - if (mapObject->mapobj_bit_6) - { - FieldObjectClearAnim(mapObject); - } -} - -void FieldObjectClearAnim(struct MapObject *mapObject) -{ - mapObject->mapobj_unk_1C = 0xFF; - mapObject->mapobj_bit_6 = FALSE; - mapObject->mapobj_bit_7 = FALSE; - gSprites[mapObject->spriteId].data[1] = 0; - gSprites[mapObject->spriteId].data[2] = 0; -} - -u8 FieldObjectCheckIfSpecialAnimFinishedOrInactive(struct MapObject *mapObject) -{ - if (mapObject->mapobj_bit_6) - { - return mapObject->mapobj_bit_7; - } - return 0x10; -} - -u8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *mapObject) -{ - u8 specialAnimState; - - specialAnimState = FieldObjectCheckIfSpecialAnimFinishedOrInactive(mapObject); - if (specialAnimState != 0 && specialAnimState != 16) - { - FieldObjectClearAnimIfSpecialAnimActive(mapObject); - } - return specialAnimState; -} - -u8 FieldObjectGetSpecialAnim(struct MapObject *mapObject) -{ - if (mapObject->mapobj_bit_6) - { - return mapObject->mapobj_unk_1C; - } - return 0xFF; -} - -void FieldObjectStep(struct MapObject *mapObject, struct Sprite *sprite, bool8 (*callback)(struct MapObject *, struct Sprite *)) -{ - DoGroundEffects_OnSpawn(mapObject, sprite); - sub_80964E8(mapObject, sprite); - if (FieldObjectIsSpecialAnimActive(mapObject)) - { - FieldObjectExecSpecialAnim(mapObject, sprite); - } - else if (!mapObject->mapobj_bit_8) - { - while (callback(mapObject, 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); -} - -#define dirn2anim_2(name, table) \ -extern const u8 table[5]; \ -u8 name(u32 direction) \ -{ \ - u8 dirn2; \ - u8 animIds[5]; \ - dirn2 = direction; \ - memcpy(animIds, table, 5); \ - if (dirn2 > DIR_EAST) \ - { \ - dirn2 = 0; \ - } \ - return animIds[dirn2]; \ -} - -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); - -bool8 FieldObjectFaceOppositeDirection(struct MapObject *mapObject, u8 direction) -{ - return FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(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); - -extern const u8 gUnknown_0850DC27[8]; - -u8 GetOppositeDirection(u8 direction) -{ - u8 directions[sizeof gUnknown_0850DC27]; - - memcpy(directions, gUnknown_0850DC27, sizeof gUnknown_0850DC27); - if (direction < 1 || direction > (sizeof gUnknown_0850DC27)) - { - return direction; - } - return directions[direction - 1]; -} - -static u32 zffu_offset_calc(u8 a0, u8 a1) -{ - return gUnknown_0850DC2F[a0 - 1][a1 - 1]; -} - -static u32 state_to_direction(u8 a0, u32 a1, u32 a2) -{ - u32 zffuOffset; - u8 a1_2; - u8 a2_2; - - a1_2 = a1; - a2_2 = a2; - if (a1_2 == 0 || a2_2 == 0 || a1_2 > DIR_EAST || a2_2 > DIR_EAST) - { - return 0; - } - zffuOffset = zffu_offset_calc(a1_2, a2); - return gUnknown_0850DC3F[a0 - 1][zffuOffset - 1]; -} - -static void FieldObjectExecSpecialAnim(struct MapObject *mapObject, struct Sprite *sprite) -{ - if (gUnknown_0850DC50[mapObject->mapobj_unk_1C][sprite->data[2]](mapObject, sprite)) - { - mapObject->mapobj_bit_7 = TRUE; - } -} - -bool8 FieldObjectExecRegularAnim(struct MapObject *mapObject, struct Sprite *sprite) -{ - if (gUnknown_0850DC50[mapObject->mapobj_unk_1C][sprite->data[2]](mapObject, sprite)) - { - mapObject->mapobj_unk_1C = 0xFF; - sprite->data[2] = 0; - return TRUE; - } - return FALSE; -} - -void FieldObjectSetRegularAnim(struct MapObject *mapObject, struct Sprite *sprite, u8 animId) -{ - mapObject->mapobj_unk_1C = animId; - sprite->data[2] = 0; -} - -// file boundary? - -void an_look_any(struct MapObject *mapObject, 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->mapobj_unk_18)); - sprite->animPaused = TRUE; - sprite->data[2] = 1; -} - -bool8 sub_8093950(struct MapObject *mapObject, struct Sprite *sprite) -{ - an_look_any(mapObject, sprite, DIR_SOUTH); - return TRUE; -} - -bool8 sub_8093960(struct MapObject *mapObject, struct Sprite *sprite) -{ - an_look_any(mapObject, sprite, DIR_NORTH); - return TRUE; -} - -bool8 sub_8093970(struct MapObject *mapObject, struct Sprite *sprite) -{ - an_look_any(mapObject, sprite, DIR_WEST); - return TRUE; -} - -bool8 sub_8093980(struct MapObject *mapObject, struct Sprite *sprite) -{ - an_look_any(mapObject, sprite, DIR_EAST); - return TRUE; -} - -void npc_apply_direction(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 speed) -{ - s16 x; - s16 y; - - x = mapObject->coords2.x; - y = mapObject->coords2.y; - FieldObjectSetDirection(mapObject, direction); - MoveCoords(direction, &x, &y); - npc_coords_shift(mapObject, x, y); - oamt_npc_ministep_reset(sprite, direction, speed); - sprite->animPaused = FALSE; - if (gUnknown_020375B8 != NULL && sub_8097F78(mapObject) != 0x10) - { - sprite->animPaused = TRUE; - } - mapObject->mapobj_bit_2 = TRUE; - sprite->data[2] = 1; -} - -void do_go_anim(struct MapObject *mapObject, 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->mapobj_unk_18)); -} - -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)); -} - -bool8 npc_obj_ministep_stop_on_arrival(struct MapObject *mapObject, struct Sprite *sprite) -{ - if (obj_npc_ministep(sprite)) - { - npc_coords_shift_still(mapObject); - mapObject->mapobj_bit_3 = TRUE; - sprite->animPaused = TRUE; - return TRUE; - } - return FALSE; -} - -void sub_8093AF0(struct MapObject *mapObject, struct Sprite *sprite, u8 direction) -{ - s16 x; - s16 y; - - x = mapObject->coords2.x; - y = mapObject->coords2.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; - 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)); -} - -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; - sprite->animPaused = TRUE; - return TRUE; - } - return FALSE; -} - -#define an_walk_any_2_macro(name, fn1, fn2, ...) \ -bool8 name##_2(struct MapObject *, struct Sprite *);\ -bool8 name(struct MapObject *mapObject, struct Sprite *sprite)\ -{\ - fn1(mapObject, sprite, __VA_ARGS__);\ - return name##_2(mapObject, sprite);\ -}\ -bool8 name##_2(struct MapObject *mapObject, struct Sprite *sprite)\ -{\ - if (fn2(mapObject, sprite))\ - {\ - sprite->data[2] = 2;\ - return TRUE;\ - }\ - return FALSE;\ -} - -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) - -void sub_8093FC4(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a5) -{ - s16 displacements[ARRAY_COUNT(gUnknown_0850DFBC)]; - s16 x; - s16 y; - - memcpy(displacements, gUnknown_0850DFBC, sizeof gUnknown_0850DFBC); - x = 0; - 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); - sub_809783C(sprite, direction, speed, a5); - sprite->data[2] = 1; - sprite->animPaused = 0; - mapObject->mapobj_bit_2 = 1; - mapObject->mapobj_bit_4 = 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)); - DoShadowFieldEffect(mapObject); -} - -u8 sub_80940C4(struct MapObject *mapObject, struct Sprite *sprite, u8 callback(struct Sprite *)) -{ - s16 displacements[ARRAY_COUNT(gUnknown_0850DFC2)]; - s16 x; - s16 y; - u8 result; - - memcpy(displacements, gUnknown_0850DFC2, sizeof gUnknown_0850DFC2); - result = callback(sprite); - if (result == 1 && displacements[sprite->data[4]] != 0) - { - 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; - } - else if (result == 0xFF) - { - npc_coords_shift_still(mapObject); - mapObject->mapobj_bit_3 = TRUE; - mapObject->mapobj_bit_5 = TRUE; - sprite->animPaused = TRUE; - } - return result; -} - -u8 sub_8094188(struct MapObject *mapObject, struct Sprite *sprite) -{ - return sub_80940C4(mapObject, sprite, sub_809785C); -} - -u8 sub_809419C(struct MapObject *mapObject, struct Sprite *sprite) -{ - return sub_80940C4(mapObject, sprite, sub_80978E4); -} - -bool8 sub_80941B0(struct MapObject *mapObject, struct Sprite *sprite) -{ - if (sub_8094188(mapObject, sprite) == 0xFF) - { - return TRUE; - } - return FALSE; -} - -bool8 sub_80941C8(struct MapObject *mapObject, struct Sprite *sprite) -{ - if (sub_809419C(mapObject, sprite) == 0xFF) - { - return TRUE; - } - return FALSE; -} - -bool8 sub_80941E0(struct MapObject *mapObject, struct Sprite *sprite) -{ - switch (sub_8094188(mapObject, 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)); - 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)\ -{\ - fn1(mapObject, sprite, __VA_ARGS__);\ - return name##_2(mapObject, sprite);\ -}\ -bool8 name##_2(struct MapObject *mapObject, struct Sprite *sprite)\ -{\ - if (fn2(mapObject, sprite))\ - {\ - mapObject->mapobj_bit_22 = 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) -{ - sprite->data[2] = 1; - sprite->data[3] = duration; -} - -bool8 sub_8094398(struct MapObject *mapObject, struct Sprite *sprite) -{ - if (-- sprite->data[3] == 0) - { - sprite->data[2] = 2; - return TRUE; - } - return FALSE; -} - -#define special_anim_with_timer(name, duration)\ -bool8 name(struct MapObject *mapObject, struct Sprite *sprite)\ -{\ - sub_8094390(sprite, duration);\ - return sub_8094398(mapObject, 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) - -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 MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 animNum, u16 duration) -{ - FieldObjectSetDirection(mapObject, direction); - npc_apply_anim_looping(mapObject, sprite, animNum); - sprite->animPaused = FALSE; - sprite->data[2] = 1; - sprite->data[3] = duration; -} - -bool8 sub_809459C(struct MapObject *mapObject, struct Sprite *sprite) -{ - if (-- sprite->data[3] == 0) - { - sprite->data[2] = 2; - sprite->animPaused = TRUE; - return TRUE; - } - return FALSE; -} - -bool8 sub_80945C4(struct MapObject *mapObject, struct Sprite *sprite) -{ - if (sprite->data[3] & 1) - { - sprite->animDelayCounter ++; - } - return sub_809459C(mapObject, sprite); -} - -#define special_anim_with_timer_2(name, direction, images, duration, timer) \ -bool8 name(struct MapObject *mapObject, struct Sprite *sprite)\ -{\ - u8 animId;\ - animId = images(DIR_##direction);\ - sub_8094554(mapObject, sprite, DIR_##direction, animId, duration);\ - return timer(mapObject, 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 MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 animNum) -{ - obj_anim_image_set_and_seek(sprite, animNum, 0); - FieldObjectSetDirection(mapObject, direction); - sprite->data[2] = 1; -} - -bool8 sub_8094DAC(struct MapObject *mapObject, struct Sprite *sprite) -{ - npc_set_direction_and_anim__an_proceed(mapObject, sprite, mapObject->placeholder18, sprite->animNum); - return FALSE; -} - -bool8 sub_8094DC4(struct MapObject *mapObject, struct Sprite *sprite) -{ - if (sub_80979BC(sprite)) - { - sprite->data[2] = 2; - return TRUE; - } - return FALSE; -} - -void sub_8094DE4(struct MapObject *mapObject, struct Sprite *sprite, u8 direction) -{ - sub_8093FC4(mapObject, 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)\ -{\ - sub_8094DE4(mapObject, sprite, direction);\ - return name##_2(mapObject, sprite);\ -}\ -bool8 name##_2(struct MapObject *mapObject, struct Sprite *sprite)\ -{\ - if (sub_80941C8(mapObject, sprite))\ - {\ - sprite->data[2] = 2;\ - mapObject->mapobj_bit_5 = 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 MapObject *mapObject, struct Sprite *sprite) -{ - u8 mapObjectId; - - 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)); - } - sprite->data[2] = 1; - return TRUE; -} - -bool8 sub_8094F94(struct MapObject *mapObject, struct Sprite *sprite) -{ - u8 mapObjectId; - - 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))); - } - sprite->data[2] = 1; - return TRUE; -} - -bool8 sub_8094FF8(struct MapObject *mapObject, struct Sprite *sprite) -{ - mapObject->mapobj_bit_9 = TRUE; - sprite->data[2] = 1; - return TRUE; -} - -bool8 sub_8095008(struct MapObject *mapObject, struct Sprite *sprite) -{ - mapObject->mapobj_bit_9 = 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 MapObject *mapObject, struct Sprite *sprite) -{ - an_look_any(mapObject, sprite, gUnknown_085055CD[mapObject->animPattern]); - return TRUE; -} - -bool8 sub_8095450(struct MapObject *mapObject, struct Sprite *sprite) -{ - npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_SOUTH, 0x14); - return FALSE; -} - -bool8 sub_8095460(struct MapObject *mapObject, struct Sprite *sprite) -{ - mapObject->mapobj_bit_25 = FALSE; - sprite->data[2] = 1; - return TRUE; -} - -bool8 sub_8095470(struct MapObject *mapObject, struct Sprite *sprite) -{ - mapObject->mapobj_bit_25 = TRUE; - sprite->data[2] = 1; - return TRUE; -} - -bool8 sub_8095480(struct MapObject *mapObject, struct Sprite *sprite) -{ - mapObject->mapobj_bit_12 = TRUE; - sprite->data[2] = 1; - return TRUE; -} - -bool8 sub_8095490(struct MapObject *mapObject, struct Sprite *sprite) -{ - mapObject->mapobj_bit_12 = GetFieldObjectGraphicsInfo(mapObject->graphicsId)->inanimate; - sprite->data[2] = 1; - return TRUE; -} - -bool8 sub_80954BC(struct MapObject *mapObject, struct Sprite *sprite) -{ - mapObject->mapobj_bit_13 = TRUE; - sprite->data[2] = 1; - return TRUE; -} - -bool8 sub_80954CC(struct MapObject *mapObject, struct Sprite *sprite) -{ - mapObject->mapobj_bit_13 = FALSE; - sprite->data[2] = 1; - return TRUE; -} - -bool8 do_exclamation_mark_bubble_1(struct MapObject *mapObject, struct Sprite *sprite) -{ - FieldObjectGetLocalIdAndMap(mapObject, &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) -{ - FieldObjectGetLocalIdAndMap(mapObject, &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) -{ - FieldObjectGetLocalIdAndMap(mapObject, &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) -{ - if (mapObject->animPattern == 0x3F) - { - sub_80B4578(mapObject); - return FALSE; - } - if (mapObject->animPattern != 0x39 && mapObject->animPattern != 0x3A) - { - sprite->data[2] = 2; - return TRUE; - } - sub_8155D78(mapObject); - sprite->data[2] = 1; - return sub_809558C(mapObject, sprite); -} - -bool8 sub_809558C(struct MapObject *mapObject, struct Sprite *sprite) -{ - if (sub_8155DA0(mapObject)) - { - sprite->data[2] = 2; - return TRUE; - } - return FALSE; -} - -bool8 sub_80955AC(struct MapObject *mapObject, 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) -{ - if (sub_80979BC(sprite)) - { - SetFieldObjectStepTimer(sprite, 32); - sprite->data[2] = 2; - } - return FALSE; -} - -bool8 sub_80955EC(struct MapObject *mapObject, struct Sprite *sprite) -{ - mapObject->mapobj_bit_13 ^= TRUE; - if (RunFieldObjectStepTimer(sprite)) - { - mapObject->mapobj_bit_13 = TRUE; - sprite->data[2] = 3; - } - return FALSE; -} - -bool8 sub_8095628(struct MapObject *mapObject, 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) -{ - if (sub_80979BC(sprite)) - { - SetFieldObjectStepTimer(sprite, 32); - sprite->data[2] = 2; - } - return FALSE; -} - -bool8 sub_8095668(struct MapObject *mapObject, struct Sprite *sprite) -{ - mapObject->mapobj_bit_13 ^= TRUE; - if (RunFieldObjectStepTimer(sprite)) - { - mapObject->mapobj_bit_13 = TRUE; - sprite->data[2] = 3; - } - return FALSE; -} - -bool8 sub_80956A4(struct MapObject *mapObject, struct Sprite *sprite) -{ - mapObject->mapobj_bit_26 = TRUE; - sprite->data[2] = 1; - return TRUE; -} - -bool8 sub_80956B4(struct MapObject *mapObject, struct Sprite *sprite) -{ - mapObject->mapobj_bit_26 = FALSE; - sprite->data[2] = 1; - return TRUE; -} - -bool8 sub_80956C4(struct MapObject *mapObject, struct Sprite *sprite) -{ - sprite->oam.affineMode = 3; - InitSpriteAffineAnim(sprite); - sprite->affineAnimPaused = TRUE; - sprite->subspriteMode = 0; - return TRUE; -} - -bool8 sub_80956F4(struct MapObject *mapObject, struct Sprite *sprite) -{ - FreeOamMatrix(sprite->oam.matrixNum); - sprite->oam.affineMode = 0; - CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode); - return TRUE; -} - -bool8 sub_8095724(struct MapObject *mapObject, struct Sprite *sprite) -{ - mapObject->mapobj_bit_27 = TRUE; - return TRUE; -} - -bool8 sub_8095730(struct MapObject *mapObject, struct Sprite *sprite) -{ - mapObject->mapobj_bit_27 = 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)\ -{\ - fn(mapObject, sprite, __VA_ARGS__);\ - sprite->affineAnimPaused = FALSE;\ - action(sprite, anim);\ - return name##_2(mapObject, sprite);\ -}\ -bool8 name##_2(struct MapObject *mapObject, struct Sprite *sprite)\ -{\ - if (fn2(mapObject, sprite))\ - {\ - sprite->affineAnimPaused = TRUE;\ - sprite->data[2] = 2;\ - return TRUE;\ - }\ - return FALSE;\ -}\ - -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) - -static void sub_80958C0(struct MapObject *mapObject, struct Sprite *sprite, u8 direction) -{ - FieldObjectSetDirection(mapObject, direction); - npc_coords_shift_still(mapObject); - obj_npc_animation_step(mapObject, sprite, sub_80929FC(direction)); - sprite->animPaused = TRUE; - sprite->data[2] = 1; -} - -bool8 sub_8095900(struct MapObject *mapObject, struct Sprite *sprite) -{ - sub_80958C0(mapObject, sprite, DIR_SOUTH); - return TRUE; -} - -bool8 sub_8095910(struct MapObject *mapObject, struct Sprite *sprite) -{ - sub_80958C0(mapObject, sprite, DIR_NORTH); - return TRUE; -} - -bool8 sub_8095920(struct MapObject *mapObject, struct Sprite *sprite) -{ - sub_80958C0(mapObject, sprite, DIR_WEST); - return TRUE; -} - -bool8 sub_8095930(struct MapObject *mapObject, struct Sprite *sprite) -{ - sub_80958C0(mapObject, sprite, DIR_EAST); - return TRUE; -} - -#define set_dirn_and_anim__an_proceed(name, direction, anims)\ -bool8 name(struct MapObject *mapObject, struct Sprite *sprite)\ -{\ - npc_set_direction_and_anim__an_proceed(mapObject, sprite, direction, anims(direction));\ - 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) - -void sub_8095AF0(struct MapObject *mapObject, struct Sprite *sprite) -{ - sub_8097750(sprite); - sprite->animPaused = FALSE; -} - -bool8 sub_8095B0C(struct MapObject *mapObject, struct Sprite *sprite) -{ - if (sub_8097758(sprite)) - { - npc_coords_shift_still(mapObject); - mapObject->mapobj_bit_3 = TRUE; - sprite->animPaused = TRUE; - return TRUE; - } - return FALSE; -} - -bool8 sub_8095B44(struct MapObject *mapObject, struct Sprite *sprite) -{ - sub_8095AF0(mapObject, sprite); - sprite->data[2] = 1; - return sub_8095B64(mapObject, sprite); -} - -bool8 sub_8095B64(struct MapObject *mapObject, struct Sprite *sprite) -{ - if (sub_8095B0C(mapObject, sprite)) - { - sprite->data[2] = 2; - return TRUE; - } - return FALSE; -} - -void sub_8095B84(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a4) -{ - sub_8093FC4(mapObject, sprite, direction, speed, a4); - StartSpriteAnimIfDifferent(sprite, sub_80929BC(direction)); - DoShadowFieldEffect(mapObject); -} - -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) - -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) - -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)); - 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) - -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)); -} - -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) - -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)); - 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 MapObject *mapObject, struct Sprite *sprite) -{ - sub_8097FA4(mapObject); - sprite->data[2] = 1; - return TRUE; -} - -bool8 sub_809647C(struct MapObject *mapObject, struct Sprite *sprite) -{ - sub_8098044(mapObject->mapobj_unk_1B); - sprite->pos2.y = 0; - sprite->data[2] = 1; - return TRUE; -} - -bool8 sub_8096494(struct MapObject *mapObject, struct Sprite *sprite) -{ - if (sprite->pos2.y == 0) - { - sub_8098044(mapObject->mapobj_unk_1B); - sprite->data[2] = 1; - return TRUE; - } - return FALSE; -} - -bool8 sub_80964B8(struct MapObject *mapObject, struct Sprite *sprite) -{ - return TRUE; -} - -bool8 sub_80964BC(struct MapObject *mapObject, struct Sprite *sprite) -{ - sprite->animPaused = TRUE; - return TRUE; -} - -void npc_obj_transfer_image_anim_pause_flag(struct MapObject *mapObject, struct Sprite *sprite) -{ - if (mapObject->mapobj_bit_10) - { - sprite->animPaused = TRUE; - } -} - -void sub_80964E8(struct MapObject *mapObject, struct Sprite *sprite) -{ - if (mapObject->mapobj_bit_11) - { - sprite->animPaused = FALSE; - mapObject->mapobj_bit_10 = FALSE; - mapObject->mapobj_bit_11 = FALSE; - } -} - -void sub_8096518(struct MapObject *mapObject, struct Sprite *sprite) -{ - sub_8096530(mapObject, sprite); - npc_update_obj_anim_flag(mapObject, sprite); -} - -static void sub_8096530(struct MapObject *mapObject, struct Sprite *sprite) -{ - u16 x; - u16 y; - u16 x2; - u16 y2; - const struct MapObjectGraphicsInfo *graphicsInfo; - - mapObject->mapobj_bit_14 = FALSE; - graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId); - 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 = graphicsInfo->width; - x2 += x; - y2 = y; - y2 += graphicsInfo->height; - if ((s16)x >= 0x100 || (s16)x2 < -0x10) - { - mapObject->mapobj_bit_14 = TRUE; - } - if ((s16)y >= 0xB0 || (s16)y2 < -0x10) - { - mapObject->mapobj_bit_14 = 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) - { - sprite->invisible = TRUE; - } -} diff --git a/src/field_map_obj_helpers.c b/src/field_map_obj_helpers.c deleted file mode 100755 index b8efcfe72..000000000 --- a/src/field_map_obj_helpers.c +++ /dev/null @@ -1,705 +0,0 @@ -#include "global.h" -#include "field_ground_effect.h" -#include "field_map_obj.h" -#include "field_effect.h" -#include "field_map_obj_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->mapobj_bit_6 || mapObject->mapobj_bit_8) - { - return TRUE; - } - else - { - mapObject->mapobj_bit_8 = 1; - mapObject->mapobj_bit_23 = gSprites[mapObject->spriteId].animPaused; - mapObject->mapobj_bit_24 = 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->mapobj_bit_8) - { - mapObject->mapobj_bit_8 = 0; - gSprites[mapObject->spriteId].animPaused = mapObject->mapobj_bit_23; - gSprites[mapObject->spriteId].affineAnimPaused = mapObject->mapobj_bit_24; - } -} - -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 oe_exec_and_other_stuff(u8 fieldEffectId, struct MapObject *mapObject) -{ - FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); - return FieldEffectStart(fieldEffectId); -} - -void DoShadowFieldEffect(struct MapObject *mapObject) -{ - if (!mapObject->mapobj_bit_22) - { - mapObject->mapobj_bit_22 = 1; - oe_exec_and_other_stuff(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->mapobj_bit_12 = TRUE; - mapObject->mapobj_bit_9 = 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->mapobj_bit_12 = GetFieldObjectGraphicsInfo(mapObject->graphicsId)->inanimate; - mapObject->mapobj_bit_9 = 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->mapobj_unk_1B = 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; -} diff --git a/src/field_special_scene.c b/src/field_special_scene.c index a704beaab..2d9973488 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 bee4d2c4b..6da529d00 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 060915fa6..49db0f5b6 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 c4b4b15b1..75465e298 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 d036da6d3..4318a930b 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 688d0594d..3a67950de 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 0e350aa35..9ad1a9742 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 3d9a1bdc2..b895ba43e 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 c10c63dda..48be0633f 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 4a5c506b6..9b505a205 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 b07814f58..1f5ef165f 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 a29e64979..68bcd4936 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 bbeb0eedc..4d1e77d4a 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 44e980c43..71cf3f1a6 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 c248ca86b..355d0fa22 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 7706da703..28fe0064b 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 e69f6f411..5c1037293 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" -- cgit v1.2.3 From 4018acfae12ab5d39aaff9acdeaa5d713d1def0e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 11 Jun 2018 09:19:17 -0500 Subject: 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 1bf3915e1..7fd1fc93a 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 94127c554..06f3cebb2 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 5411551f7..a801367e9 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 e128eb0ec..3b5df1cc8 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 d413989f0..92f4b8a60 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 d847599b8..261f234f4 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 48f3b9052..660c8961a 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 79753f027..b80f0b5eb 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 2d9973488..8a4fb7c69 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 3a67950de..d57cc5b86 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 b895ba43e..3279ce4fb 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 28fe0064b..16520c27a 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); } -- cgit v1.2.3 From 73327f0d44195f26d1af8b894326e1b98b609681 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 11 Jun 2018 10:23:14 -0500 Subject: 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 05f8ffce0..000000000 --- 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 989d2add7..686d9396b 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 7fd1fc93a..4e0d4ad22 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 3c9e00b62..faf6290e4 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 89b14aed1..000000000 --- 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 699595580..01218493a 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 d6743b788..4b9fd2488 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 42affc938..734a1ec3f 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 51e641fd1..b4d69ec4a 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 261f234f4..5c6f503ef 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 660c8961a..6a8b410f5 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 b9760f522..ad0062c20 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 3279ce4fb..045ebb4fd 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" -- cgit v1.2.3 From eb8dbff4a783e880d950be73963e523c86a54615 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 11 Jun 2018 10:34:51 -0500 Subject: 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 844612a7c..38f488973 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 06f3cebb2..fa142e4fe 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 b4d69ec4a..bf8bfa7d5 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 5c6f503ef..a935f20d6 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 6a8b410f5..000000000 --- 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; -} -- cgit v1.2.3 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: 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 f89cfdd2b..70280170f 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[]; -- cgit v1.2.3 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: 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 70280170f..ebdea4b86 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 -- cgit v1.2.3 From 89edf6d9e989669f439fdfbf452ee4079e325785 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 11 Jun 2018 17:33:50 -0500 Subject: Move all field object data into src/data and event_object_movement.c --- data/event_object_movement.s | 1731 ------ .../field_objects/berry_tree_graphics_tables.inc | 635 -- .../field_effect_object_template_pointers.inc | 39 - .../field_objects/field_effect_objects.inc | 1208 ---- data/graphics/field_objects/field_object_anims.inc | 1029 --- .../field_objects/field_object_graphics.inc | 6530 -------------------- .../field_objects/field_object_graphics_info.inc | 4164 ------------- .../field_object_graphics_info_pointers.inc | 251 - data/graphics/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 + .../field_event_obj/berry_tree_graphics_tables.h | 570 ++ src/data/field_event_obj/event_object_anims.h | 1176 ++++ src/data/field_event_obj/event_object_graphics.h | 1667 +++++ .../field_event_obj/event_object_graphics_info.h | 250 + .../event_object_graphics_info_pointers.h | 504 ++ src/data/field_event_obj/event_object_pic_tables.h | 2179 +++++++ src/data/field_event_obj/event_object_subsprites.h | 342 + .../field_effect_object_template_pointers.h | 82 + src/data/field_event_obj/field_effect_objects.h | 997 +++ .../field_event_obj/movement_action_func_tables.h | 1499 +++++ .../field_event_obj/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 38f488973..000000000 --- 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 8d716d759..000000000 --- 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 846cdf6c2..000000000 --- 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 2c1ce3c4c..000000000 --- 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 d75df6d9d..000000000 --- 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 59333b9a4..000000000 --- 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 6a0778adf..000000000 --- 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 1faea449c..000000000 --- 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 ea4da1c02..000000000 --- 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 abd09d7c4..000000000 --- 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 425a664c9..b6926ef68 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 4e0d4ad22..a12032c93 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 2e9f1d0cc..000000000 --- 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 9cd26f6b8..b613df926 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 faf6290e4..e7517acf1 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 fa142e4fe..68277812d 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 bf8bfa7d5..ec5e036fa 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 a801367e9..bc7931025 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 000000000..4558081e7 --- /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 000000000..9e899788a --- /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 000000000..3857bf815 --- /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 000000000..9a9f096a2 --- /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 000000000..774109472 --- /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 000000000..6793a9487 --- /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 000000000..f5d6a24c3 --- /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 000000000..2ed9023fa --- /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 000000000..3b08a5ff1 --- /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 000000000..30a2297bd --- /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 000000000..86dc61345 --- /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 000000000..3334c4b5e --- /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 a935f20d6..9943dd578 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 b80f0b5eb..71bce8f41 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 75465e298..132f39c34 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 4318a930b..82d96606a 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 d57cc5b86..6647f629b 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 045ebb4fd..85bdbc5ea 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 68bcd4936..e36b60718 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 4d1e77d4a..02ab55223 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 355d0fa22..9ab8a69ba 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 16520c27a..db8cff8a1 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" -- cgit v1.2.3 From ed245b677addbb7f5c748193301507de7fed6ec4 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 11 Jun 2018 18:17:31 -0500 Subject: Add remaining rodata to event_object_movement.c --- data/map_obj_8097404.s | 130 --------- include/event_object_movement.h | 44 ++- ld_script.txt | 1 - .../field_event_obj/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 b30e4b6d7..000000000 --- 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 a12032c93..293c2e3dc 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 ec5e036fa..66af49175 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 86dc61345..d5b7b8911 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 9943dd578..84900e48e 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 "decoration.h" +#include "event_data.h" +#include "event_scripts.h" +#include "field_camera.h" +#include "field_effect.h" +#include "field_effect_helpers.h" #include "field_player_avatar.h" #include "fieldmap.h" -#include "event_data.h" -#include "rom_818CFC8.h" -#include "rom_81BE66C.h" +#include "malloc.h" #include "mauville_old_man.h" #include "metatile_behavior.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 "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); - -u8 GetFaceDirectionAnimId(u32); -u8 GetGoSpeed0AnimId(u32); -u8 GetGoSpeed1AnimId(u32); -u8 GetGoSpeed3AnimId(u32); +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 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; } -- cgit v1.2.3 From aa9a45c16fbaee2fffc94e4741e0a1f203b244bc Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 11 Jun 2018 19:11:48 -0500 Subject: 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 +- data/maps/events/AbandonedShip_CaptainsOffice.inc | 8 +- data/maps/events/AbandonedShip_Corridors_1F.inc | 8 +- data/maps/events/AbandonedShip_Corridors_B1F.inc | 8 +- .../maps/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 +- .../events/BattleFrontier_BattleArenaCorridor.inc | 6 +- .../events/BattleFrontier_BattleArenaLobby.inc | 14 +- .../events/BattleFrontier_BattleDomeBattleRoom.inc | 34 +- .../events/BattleFrontier_BattleDomeCorridor.inc | 6 +- .../maps/events/BattleFrontier_BattleDomeLobby.inc | 16 +- .../BattleFrontier_BattleDomePreBattleRoom.inc | 6 +- .../BattleFrontier_BattleFactoryBattleRoom.inc | 18 +- .../events/BattleFrontier_BattleFactoryLobby.inc | 16 +- .../BattleFrontier_BattleFactoryPreBattleRoom.inc | 6 +- .../BattleFrontier_BattlePalaceBattleRoom.inc | 14 +- .../events/BattleFrontier_BattlePalaceCorridor.inc | 18 +- .../events/BattleFrontier_BattlePalaceLobby.inc | 16 +- .../events/BattleFrontier_BattlePikeCorridor.inc | 6 +- .../maps/events/BattleFrontier_BattlePikeLobby.inc | 12 +- .../BattleFrontier_BattlePikeRandomRoom1.inc | 8 +- .../BattleFrontier_BattlePikeRandomRoom2.inc | 6 +- .../BattleFrontier_BattlePikeThreePathRoom.inc | 8 +- ...leFrontier_BattlePointExchangeServiceCorner.inc | 22 +- .../BattleFrontier_BattlePyramidEmptySquare.inc | 36 +- .../events/BattleFrontier_BattlePyramidLobby.inc | 12 +- .../events/BattleFrontier_BattlePyramidTop.inc | 8 +- .../BattleFrontier_BattleTowerBattleRoom.inc | 10 +- .../BattleFrontier_BattleTowerBattleRoom2.inc | 12 +- .../events/BattleFrontier_BattleTowerCorridor.inc | 6 +- .../events/BattleFrontier_BattleTowerCorridor2.inc | 8 +- .../events/BattleFrontier_BattleTowerElevator.inc | 6 +- .../events/BattleFrontier_BattleTowerLobby.inc | 22 +- .../BattleFrontier_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 +- data/maps/events/BattleFrontier_OutsideEast.inc | 56 +- data/maps/events/BattleFrontier_OutsideWest.inc | 52 +- .../events/BattleFrontier_PokemonCenter_1F.inc | 14 +- .../events/BattleFrontier_PokemonCenter_2F.inc | 12 +- data/maps/events/BattleFrontier_RankingHall.inc | 10 +- data/maps/events/BattleFrontier_ReceptionGate.inc | 14 +- data/maps/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 +- data/maps/events/DewfordTown_PokemonCenter_1F.inc | 10 +- data/maps/events/DewfordTown_PokemonCenter_2F.inc | 12 +- data/maps/events/EverGrandeCity_ChampionsRoom.inc | 10 +- data/maps/events/EverGrandeCity_DrakesRoom.inc | 6 +- data/maps/events/EverGrandeCity_GlaciasRoom.inc | 6 +- data/maps/events/EverGrandeCity_HallOfFame.inc | 6 +- data/maps/events/EverGrandeCity_PhoebesRoom.inc | 6 +- .../events/EverGrandeCity_PokemonCenter_1F.inc | 12 +- .../events/EverGrandeCity_PokemonCenter_2F.inc | 12 +- .../events/EverGrandeCity_PokemonLeague_1F.inc | 12 +- .../events/EverGrandeCity_PokemonLeague_2F.inc | 12 +- data/maps/events/EverGrandeCity_SidneysRoom.inc | 6 +- data/maps/events/FallarborTown.inc | 12 +- .../events/FallarborTown_BattleTentBattleRoom.inc | 10 +- .../events/FallarborTown_BattleTentCorridor.inc | 6 +- data/maps/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 +- .../maps/events/FallarborTown_PokemonCenter_1F.inc | 12 +- .../maps/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 +- data/maps/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 +- data/maps/events/FortreeCity_PokemonCenter_1F.inc | 12 +- data/maps/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 +- .../maps/events/LavaridgeTown_PokemonCenter_1F.inc | 12 +- .../maps/events/LavaridgeTown_PokemonCenter_2F.inc | 12 +- data/maps/events/LilycoveCity.inc | 48 +- data/maps/events/LilycoveCity_ContestHall.inc | 68 +- data/maps/events/LilycoveCity_ContestLobby.inc | 54 +- data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc | 6 +- data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc | 18 +- .../LilycoveCity_DepartmentStoreElevator.inc | 6 +- .../events/LilycoveCity_DepartmentStoreRooftop.inc | 12 +- .../events/LilycoveCity_DepartmentStore_1F.inc | 16 +- .../events/LilycoveCity_DepartmentStore_2F.inc | 14 +- .../events/LilycoveCity_DepartmentStore_3F.inc | 14 +- .../events/LilycoveCity_DepartmentStore_4F.inc | 14 +- .../events/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 +- .../maps/events/LilycoveCity_LilycoveMuseum_1F.inc | 24 +- .../maps/events/LilycoveCity_LilycoveMuseum_2F.inc | 12 +- .../maps/events/LilycoveCity_MoveDeletersHouse.inc | 6 +- data/maps/events/LilycoveCity_PokemonCenter_1F.inc | 14 +- data/maps/events/LilycoveCity_PokemonCenter_2F.inc | 12 +- .../events/LilycoveCity_PokemonTrainerFanClub.inc | 22 +- data/maps/events/LinkContestRoom1.inc | 22 +- data/maps/events/LittlerootTown.inc | 20 +- .../events/LittlerootTown_BrendansHouse_1F.inc | 18 +- .../events/LittlerootTown_BrendansHouse_2F.inc | 24 +- data/maps/events/LittlerootTown_MaysHouse_1F.inc | 18 +- data/maps/events/LittlerootTown_MaysHouse_2F.inc | 24 +- .../events/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 +- data/maps/events/MauvilleCity_PokemonCenter_1F.inc | 14 +- data/maps/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 +- data/maps/events/MossdeepCity_GameCorner_1F.inc | 8 +- data/maps/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 +- data/maps/events/MossdeepCity_PokemonCenter_1F.inc | 10 +- data/maps/events/MossdeepCity_PokemonCenter_2F.inc | 14 +- data/maps/events/MossdeepCity_SpaceCenter_1F.inc | 26 +- data/maps/events/MossdeepCity_SpaceCenter_2F.inc | 22 +- data/maps/events/MossdeepCity_StevensHouse.inc | 10 +- data/maps/events/MtChimney.inc | 64 +- data/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 +- data/maps/events/OldaleTown_PokemonCenter_1F.inc | 12 +- data/maps/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 +- .../events/PacifidlogTown_PokemonCenter_1F.inc | 14 +- .../events/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 +- .../maps/events/PetalburgCity_PokemonCenter_1F.inc | 14 +- .../maps/events/PetalburgCity_PokemonCenter_2F.inc | 12 +- data/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 +- .../maps/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 +- data/maps/events/Route110_TrickHouseEntrance.inc | 6 +- data/maps/events/Route110_TrickHousePuzzle1.inc | 34 +- data/maps/events/Route110_TrickHousePuzzle2.inc | 14 +- data/maps/events/Route110_TrickHousePuzzle3.inc | 18 +- data/maps/events/Route110_TrickHousePuzzle4.inc | 32 +- data/maps/events/Route110_TrickHousePuzzle5.inc | 14 +- data/maps/events/Route110_TrickHousePuzzle6.inc | 12 +- data/maps/events/Route110_TrickHousePuzzle7.inc | 22 +- data/maps/events/Route110_TrickHousePuzzle8.inc | 12 +- data/maps/events/Route111.inc | 96 +- data/maps/events/Route111_OldLadysRestStop.inc | 6 +- .../maps/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 +- data/maps/events/Route114_FossilManiacsHouse.inc | 6 +- data/maps/events/Route114_FossilManiacsTunnel.inc | 6 +- data/maps/events/Route114_LanettesHouse.inc | 6 +- data/maps/events/Route115.inc | 50 +- data/maps/events/Route116.inc | 60 +- data/maps/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 +- data/maps/events/Route119_WeatherInstitute_1F.inc | 14 +- data/maps/events/Route119_WeatherInstitute_2F.inc | 20 +- data/maps/events/Route120.inc | 92 +- data/maps/events/Route121.inc | 62 +- data/maps/events/Route121_SafariZoneEntrance.inc | 10 +- data/maps/events/Route123.inc | 90 +- data/maps/events/Route123_BerryMastersHouse.inc | 8 +- data/maps/events/Route124.inc | 28 +- .../events/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 +- data/maps/events/RustboroCity_CuttersHouse.inc | 8 +- data/maps/events/RustboroCity_DevonCorp_1F.inc | 10 +- data/maps/events/RustboroCity_DevonCorp_2F.inc | 16 +- data/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 +- data/maps/events/RustboroCity_PokemonCenter_1F.inc | 12 +- data/maps/events/RustboroCity_PokemonCenter_2F.inc | 12 +- data/maps/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 +- data/maps/events/ShoalCave_LowTideEntranceRoom.inc | 8 +- data/maps/events/ShoalCave_LowTideIceRoom.inc | 8 +- data/maps/events/ShoalCave_LowTideInnerRoom.inc | 6 +- data/maps/events/ShoalCave_LowTideLowerRoom.inc | 8 +- data/maps/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 +- .../events/SlateportCity_BattleTentBattleRoom.inc | 10 +- .../events/SlateportCity_BattleTentCorridor.inc | 6 +- data/maps/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 +- .../maps/events/SlateportCity_OceanicMuseum_1F.inc | 32 +- .../maps/events/SlateportCity_OceanicMuseum_2F.inc | 18 +- .../maps/events/SlateportCity_PokemonCenter_1F.inc | 10 +- .../maps/events/SlateportCity_PokemonCenter_2F.inc | 12 +- data/maps/events/SlateportCity_PokemonFanClub.inc | 22 +- .../events/SlateportCity_SternsShipyard_1F.inc | 12 +- .../events/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 +- .../events/SootopolisCity_LotadAndSeedotHouse.inc | 8 +- data/maps/events/SootopolisCity_Mart.inc | 10 +- .../SootopolisCity_MysteryEventsHouse_1F.inc | 6 +- .../SootopolisCity_MysteryEventsHouse_B1F.inc | 6 +- .../events/SootopolisCity_PokemonCenter_1F.inc | 12 +- .../events/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 +- data/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 +- .../events/VerdanturfTown_BattleTentBattleRoom.inc | 10 +- .../events/VerdanturfTown_BattleTentCorridor.inc | 6 +- .../maps/events/VerdanturfTown_BattleTentLobby.inc | 16 +- .../VerdanturfTown_FriendshipRatersHouse.inc | 8 +- data/maps/events/VerdanturfTown_House.inc | 8 +- data/maps/events/VerdanturfTown_Mart.inc | 12 +- .../events/VerdanturfTown_PokemonCenter_1F.inc | 12 +- .../events/VerdanturfTown_PokemonCenter_2F.inc | 12 +- data/maps/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 +- .../maps/BattleFrontier_BattlePikeRandomRoom1.inc | 2 +- .../maps/BattleFrontier_BattlePyramidTop.inc | 4 +- .../scripts/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 +- .../palettes/field_effect_object_palette_00.pal | 19 + .../palettes/field_effect_object_palette_01.pal | 19 + .../palettes/field_effect_object_palette_02.pal | 19 + .../palettes/field_effect_object_palette_03.pal | 19 + .../palettes/field_effect_object_palette_04.pal | 19 + .../palettes/field_effect_object_palette_05.pal | 19 + .../palettes/field_effect_object_palette_06.pal | 19 + .../palettes/field_effect_object_palette_07.pal | 19 + .../palettes/field_effect_object_palette_08.pal | 19 + .../palettes/field_effect_object_palette_10.pal | 19 + .../palettes/field_object_palette_00.pal | 19 + .../palettes/field_object_palette_01.pal | 19 + .../palettes/field_object_palette_02.pal | 19 + .../palettes/field_object_palette_03.pal | 19 + .../palettes/field_object_palette_04.pal | 19 + .../palettes/field_object_palette_05.pal | 19 + .../palettes/field_object_palette_06.pal | 19 + .../palettes/field_object_palette_07.pal | 19 + .../palettes/field_object_palette_08.pal | 19 + .../palettes/field_object_palette_09.pal | 19 + .../palettes/field_object_palette_10.pal | 19 + .../palettes/field_object_palette_11.pal | 19 + .../palettes/field_object_palette_12.pal | 19 + .../palettes/field_object_palette_13.pal | 19 + .../palettes/field_object_palette_14.pal | 19 + .../palettes/field_object_palette_15.pal | 19 + .../palettes/field_object_palette_16.pal | 19 + .../palettes/field_object_palette_17.pal | 19 + .../palettes/field_object_palette_18.pal | 19 + .../palettes/field_object_palette_19.pal | 19 + .../palettes/field_object_palette_20.pal | 19 + .../palettes/field_object_palette_21.pal | 19 + .../palettes/field_object_palette_22.pal | 19 + .../palettes/field_object_palette_23.pal | 19 + .../palettes/field_object_palette_24.pal | 19 + .../palettes/field_object_palette_25.pal | 19 + .../palettes/field_object_palette_26.pal | 19 + .../palettes/field_object_palette_27.pal | 19 + .../palettes/field_object_palette_28.pal | 19 + .../palettes/field_object_palette_29.pal | 19 + .../palettes/field_object_palette_30.pal | 19 + .../palettes/field_object_palette_31.pal | 19 + .../palettes/field_object_palette_32.pal | 19 + .../palettes/field_object_palette_33.pal | 19 + .../palettes/field_object_palette_34.pal | 19 + graphics/event_objects/palettes/unused_palette.pal | 19 + .../event_objects/pics/berry_trees/aguav/0.png | Bin 0 -> 225 bytes .../event_objects/pics/berry_trees/aguav/1.png | Bin 0 -> 225 bytes .../event_objects/pics/berry_trees/aguav/2.png | Bin 0 -> 269 bytes .../event_objects/pics/berry_trees/aguav/3.png | Bin 0 -> 267 bytes .../event_objects/pics/berry_trees/aguav/4.png | Bin 0 -> 288 bytes .../event_objects/pics/berry_trees/aguav/5.png | Bin 0 -> 287 bytes .../event_objects/pics/berry_trees/aspear/0.png | Bin 0 -> 262 bytes .../event_objects/pics/berry_trees/aspear/1.png | Bin 0 -> 253 bytes .../event_objects/pics/berry_trees/aspear/2.png | Bin 0 -> 315 bytes .../event_objects/pics/berry_trees/aspear/3.png | Bin 0 -> 310 bytes .../event_objects/pics/berry_trees/aspear/4.png | Bin 0 -> 319 bytes .../event_objects/pics/berry_trees/aspear/5.png | Bin 0 -> 308 bytes .../event_objects/pics/berry_trees/cheri/0.png | Bin 0 -> 269 bytes .../event_objects/pics/berry_trees/cheri/1.png | Bin 0 -> 271 bytes .../event_objects/pics/berry_trees/cheri/2.png | Bin 0 -> 288 bytes .../event_objects/pics/berry_trees/cheri/3.png | Bin 0 -> 294 bytes .../event_objects/pics/berry_trees/cheri/4.png | Bin 0 -> 290 bytes .../event_objects/pics/berry_trees/cheri/5.png | Bin 0 -> 297 bytes .../event_objects/pics/berry_trees/chesto/0.png | Bin 0 -> 265 bytes .../event_objects/pics/berry_trees/chesto/1.png | Bin 0 -> 268 bytes .../event_objects/pics/berry_trees/chesto/2.png | Bin 0 -> 308 bytes .../event_objects/pics/berry_trees/chesto/3.png | Bin 0 -> 315 bytes .../event_objects/pics/berry_trees/chesto/4.png | Bin 0 -> 310 bytes .../event_objects/pics/berry_trees/chesto/5.png | Bin 0 -> 315 bytes .../event_objects/pics/berry_trees/cornn/0.png | Bin 0 -> 226 bytes .../event_objects/pics/berry_trees/cornn/1.png | Bin 0 -> 223 bytes .../event_objects/pics/berry_trees/cornn/2.png | Bin 0 -> 296 bytes .../event_objects/pics/berry_trees/cornn/3.png | Bin 0 -> 300 bytes .../event_objects/pics/berry_trees/cornn/4.png | Bin 0 -> 283 bytes .../event_objects/pics/berry_trees/cornn/5.png | Bin 0 -> 287 bytes .../event_objects/pics/berry_trees/dirt_pile.png | Bin 0 -> 189 bytes .../event_objects/pics/berry_trees/durin/0.png | Bin 0 -> 250 bytes .../event_objects/pics/berry_trees/durin/1.png | Bin 0 -> 248 bytes .../event_objects/pics/berry_trees/durin/2.png | Bin 0 -> 281 bytes .../event_objects/pics/berry_trees/durin/3.png | Bin 0 -> 282 bytes .../event_objects/pics/berry_trees/durin/4.png | Bin 0 -> 282 bytes .../event_objects/pics/berry_trees/durin/5.png | Bin 0 -> 278 bytes graphics/event_objects/pics/berry_trees/figy/0.png | Bin 0 -> 270 bytes graphics/event_objects/pics/berry_trees/figy/1.png | Bin 0 -> 272 bytes graphics/event_objects/pics/berry_trees/figy/2.png | Bin 0 -> 298 bytes graphics/event_objects/pics/berry_trees/figy/3.png | Bin 0 -> 306 bytes graphics/event_objects/pics/berry_trees/figy/4.png | Bin 0 -> 301 bytes graphics/event_objects/pics/berry_trees/figy/5.png | Bin 0 -> 305 bytes .../event_objects/pics/berry_trees/grepa/0.png | Bin 0 -> 216 bytes .../event_objects/pics/berry_trees/grepa/1.png | Bin 0 -> 218 bytes .../event_objects/pics/berry_trees/grepa/2.png | Bin 0 -> 252 bytes .../event_objects/pics/berry_trees/grepa/3.png | Bin 0 -> 253 bytes .../event_objects/pics/berry_trees/grepa/4.png | Bin 0 -> 258 bytes .../event_objects/pics/berry_trees/grepa/5.png | Bin 0 -> 248 bytes .../event_objects/pics/berry_trees/hondew/0.png | Bin 0 -> 224 bytes .../event_objects/pics/berry_trees/hondew/1.png | Bin 0 -> 222 bytes .../event_objects/pics/berry_trees/hondew/2.png | Bin 0 -> 253 bytes .../event_objects/pics/berry_trees/hondew/3.png | Bin 0 -> 251 bytes .../event_objects/pics/berry_trees/hondew/4.png | Bin 0 -> 266 bytes .../event_objects/pics/berry_trees/hondew/5.png | Bin 0 -> 266 bytes .../event_objects/pics/berry_trees/iapapa/0.png | Bin 0 -> 179 bytes .../event_objects/pics/berry_trees/iapapa/1.png | Bin 0 -> 181 bytes .../event_objects/pics/berry_trees/iapapa/2.png | Bin 0 -> 251 bytes .../event_objects/pics/berry_trees/iapapa/3.png | Bin 0 -> 244 bytes .../event_objects/pics/berry_trees/iapapa/4.png | Bin 0 -> 194 bytes .../event_objects/pics/berry_trees/iapapa/5.png | Bin 0 -> 202 bytes .../event_objects/pics/berry_trees/kelpsy/0.png | Bin 0 -> 223 bytes .../event_objects/pics/berry_trees/kelpsy/1.png | Bin 0 -> 223 bytes .../event_objects/pics/berry_trees/kelpsy/2.png | Bin 0 -> 252 bytes .../event_objects/pics/berry_trees/kelpsy/3.png | Bin 0 -> 252 bytes .../event_objects/pics/berry_trees/kelpsy/4.png | Bin 0 -> 245 bytes .../event_objects/pics/berry_trees/kelpsy/5.png | Bin 0 -> 243 bytes .../event_objects/pics/berry_trees/lansat/0.png | Bin 0 -> 247 bytes .../event_objects/pics/berry_trees/lansat/1.png | Bin 0 -> 245 bytes .../event_objects/pics/berry_trees/lansat/2.png | Bin 0 -> 269 bytes .../event_objects/pics/berry_trees/lansat/3.png | Bin 0 -> 264 bytes .../event_objects/pics/berry_trees/lansat/4.png | Bin 0 -> 272 bytes .../event_objects/pics/berry_trees/lansat/5.png | Bin 0 -> 265 bytes .../event_objects/pics/berry_trees/leppa/0.png | Bin 0 -> 223 bytes .../event_objects/pics/berry_trees/leppa/1.png | Bin 0 -> 231 bytes .../event_objects/pics/berry_trees/leppa/2.png | Bin 0 -> 272 bytes .../event_objects/pics/berry_trees/leppa/3.png | Bin 0 -> 273 bytes .../event_objects/pics/berry_trees/leppa/4.png | Bin 0 -> 270 bytes .../event_objects/pics/berry_trees/leppa/5.png | Bin 0 -> 274 bytes .../event_objects/pics/berry_trees/liechi/0.png | Bin 0 -> 224 bytes .../event_objects/pics/berry_trees/liechi/1.png | Bin 0 -> 226 bytes .../event_objects/pics/berry_trees/liechi/2.png | Bin 0 -> 248 bytes .../event_objects/pics/berry_trees/liechi/3.png | Bin 0 -> 256 bytes .../event_objects/pics/berry_trees/liechi/4.png | Bin 0 -> 262 bytes .../event_objects/pics/berry_trees/liechi/5.png | Bin 0 -> 260 bytes graphics/event_objects/pics/berry_trees/lum/0.png | Bin 0 -> 259 bytes graphics/event_objects/pics/berry_trees/lum/1.png | Bin 0 -> 254 bytes graphics/event_objects/pics/berry_trees/lum/2.png | Bin 0 -> 280 bytes graphics/event_objects/pics/berry_trees/lum/3.png | Bin 0 -> 286 bytes graphics/event_objects/pics/berry_trees/lum/4.png | Bin 0 -> 285 bytes graphics/event_objects/pics/berry_trees/lum/5.png | Bin 0 -> 285 bytes graphics/event_objects/pics/berry_trees/mago/0.png | Bin 0 -> 246 bytes graphics/event_objects/pics/berry_trees/mago/1.png | Bin 0 -> 245 bytes graphics/event_objects/pics/berry_trees/mago/2.png | Bin 0 -> 275 bytes graphics/event_objects/pics/berry_trees/mago/3.png | Bin 0 -> 276 bytes graphics/event_objects/pics/berry_trees/mago/4.png | Bin 0 -> 279 bytes graphics/event_objects/pics/berry_trees/mago/5.png | Bin 0 -> 282 bytes .../event_objects/pics/berry_trees/nomel/0.png | Bin 0 -> 230 bytes .../event_objects/pics/berry_trees/nomel/1.png | Bin 0 -> 228 bytes .../event_objects/pics/berry_trees/nomel/2.png | Bin 0 -> 260 bytes .../event_objects/pics/berry_trees/nomel/3.png | Bin 0 -> 265 bytes .../event_objects/pics/berry_trees/nomel/4.png | Bin 0 -> 263 bytes .../event_objects/pics/berry_trees/nomel/5.png | Bin 0 -> 268 bytes graphics/event_objects/pics/berry_trees/oran/0.png | Bin 0 -> 260 bytes graphics/event_objects/pics/berry_trees/oran/1.png | Bin 0 -> 260 bytes graphics/event_objects/pics/berry_trees/oran/2.png | Bin 0 -> 303 bytes graphics/event_objects/pics/berry_trees/oran/3.png | Bin 0 -> 304 bytes graphics/event_objects/pics/berry_trees/oran/4.png | Bin 0 -> 303 bytes graphics/event_objects/pics/berry_trees/oran/5.png | Bin 0 -> 307 bytes .../event_objects/pics/berry_trees/pamtre/0.png | Bin 0 -> 240 bytes .../event_objects/pics/berry_trees/pamtre/1.png | Bin 0 -> 245 bytes .../event_objects/pics/berry_trees/pamtre/2.png | Bin 0 -> 278 bytes .../event_objects/pics/berry_trees/pamtre/3.png | Bin 0 -> 283 bytes .../event_objects/pics/berry_trees/pamtre/4.png | Bin 0 -> 280 bytes .../event_objects/pics/berry_trees/pamtre/5.png | Bin 0 -> 285 bytes .../event_objects/pics/berry_trees/pecha/0.png | Bin 0 -> 227 bytes .../event_objects/pics/berry_trees/pecha/1.png | Bin 0 -> 230 bytes .../event_objects/pics/berry_trees/pecha/2.png | Bin 0 -> 274 bytes .../event_objects/pics/berry_trees/pecha/3.png | Bin 0 -> 271 bytes .../event_objects/pics/berry_trees/pecha/4.png | Bin 0 -> 260 bytes .../event_objects/pics/berry_trees/pecha/5.png | Bin 0 -> 264 bytes .../event_objects/pics/berry_trees/persim/0.png | Bin 0 -> 248 bytes .../event_objects/pics/berry_trees/persim/1.png | Bin 0 -> 249 bytes .../event_objects/pics/berry_trees/persim/2.png | Bin 0 -> 279 bytes .../event_objects/pics/berry_trees/persim/3.png | Bin 0 -> 275 bytes .../event_objects/pics/berry_trees/persim/4.png | Bin 0 -> 286 bytes .../event_objects/pics/berry_trees/persim/5.png | Bin 0 -> 288 bytes .../event_objects/pics/berry_trees/pomeg/0.png | Bin 0 -> 225 bytes .../event_objects/pics/berry_trees/pomeg/1.png | Bin 0 -> 221 bytes .../event_objects/pics/berry_trees/pomeg/2.png | Bin 0 -> 256 bytes .../event_objects/pics/berry_trees/pomeg/3.png | Bin 0 -> 253 bytes .../event_objects/pics/berry_trees/pomeg/4.png | Bin 0 -> 258 bytes .../event_objects/pics/berry_trees/pomeg/5.png | Bin 0 -> 256 bytes .../event_objects/pics/berry_trees/rabuta/0.png | Bin 0 -> 254 bytes .../event_objects/pics/berry_trees/rabuta/1.png | Bin 0 -> 259 bytes .../event_objects/pics/berry_trees/rabuta/2.png | Bin 0 -> 267 bytes .../event_objects/pics/berry_trees/rabuta/3.png | Bin 0 -> 270 bytes .../event_objects/pics/berry_trees/rabuta/4.png | Bin 0 -> 272 bytes .../event_objects/pics/berry_trees/rabuta/5.png | Bin 0 -> 276 bytes .../event_objects/pics/berry_trees/rawst/0.png | Bin 0 -> 221 bytes .../event_objects/pics/berry_trees/rawst/1.png | Bin 0 -> 220 bytes .../event_objects/pics/berry_trees/rawst/2.png | Bin 0 -> 243 bytes .../event_objects/pics/berry_trees/rawst/3.png | Bin 0 -> 234 bytes .../event_objects/pics/berry_trees/rawst/4.png | Bin 0 -> 249 bytes .../event_objects/pics/berry_trees/rawst/5.png | Bin 0 -> 239 bytes graphics/event_objects/pics/berry_trees/razz/0.png | Bin 0 -> 243 bytes graphics/event_objects/pics/berry_trees/razz/1.png | Bin 0 -> 251 bytes graphics/event_objects/pics/berry_trees/razz/2.png | Bin 0 -> 285 bytes graphics/event_objects/pics/berry_trees/razz/3.png | Bin 0 -> 272 bytes graphics/event_objects/pics/berry_trees/razz/4.png | Bin 0 -> 284 bytes graphics/event_objects/pics/berry_trees/razz/5.png | Bin 0 -> 294 bytes .../event_objects/pics/berry_trees/sitrus/0.png | Bin 0 -> 260 bytes .../event_objects/pics/berry_trees/sitrus/1.png | Bin 0 -> 257 bytes .../event_objects/pics/berry_trees/sitrus/2.png | Bin 0 -> 296 bytes .../event_objects/pics/berry_trees/sitrus/3.png | Bin 0 -> 302 bytes .../event_objects/pics/berry_trees/sitrus/4.png | Bin 0 -> 289 bytes .../event_objects/pics/berry_trees/sitrus/5.png | Bin 0 -> 287 bytes .../event_objects/pics/berry_trees/spelon/0.png | Bin 0 -> 213 bytes .../event_objects/pics/berry_trees/spelon/1.png | Bin 0 -> 215 bytes .../event_objects/pics/berry_trees/spelon/2.png | Bin 0 -> 243 bytes .../event_objects/pics/berry_trees/spelon/3.png | Bin 0 -> 243 bytes .../event_objects/pics/berry_trees/spelon/4.png | Bin 0 -> 230 bytes .../event_objects/pics/berry_trees/spelon/5.png | Bin 0 -> 222 bytes .../event_objects/pics/berry_trees/sprout/0.png | Bin 0 -> 200 bytes .../event_objects/pics/berry_trees/sprout/1.png | Bin 0 -> 198 bytes .../event_objects/pics/berry_trees/tamato/0.png | Bin 0 -> 245 bytes .../event_objects/pics/berry_trees/tamato/1.png | Bin 0 -> 234 bytes .../event_objects/pics/berry_trees/tamato/2.png | Bin 0 -> 269 bytes .../event_objects/pics/berry_trees/tamato/3.png | Bin 0 -> 262 bytes .../event_objects/pics/berry_trees/tamato/4.png | Bin 0 -> 273 bytes .../event_objects/pics/berry_trees/tamato/5.png | Bin 0 -> 275 bytes .../event_objects/pics/berry_trees/wepear/0.png | Bin 0 -> 244 bytes .../event_objects/pics/berry_trees/wepear/1.png | Bin 0 -> 245 bytes .../event_objects/pics/berry_trees/wepear/2.png | Bin 0 -> 283 bytes .../event_objects/pics/berry_trees/wepear/3.png | Bin 0 -> 283 bytes .../event_objects/pics/berry_trees/wepear/4.png | Bin 0 -> 284 bytes .../event_objects/pics/berry_trees/wepear/5.png | Bin 0 -> 284 bytes graphics/event_objects/pics/berry_trees/wiki/0.png | Bin 0 -> 226 bytes graphics/event_objects/pics/berry_trees/wiki/1.png | Bin 0 -> 228 bytes graphics/event_objects/pics/berry_trees/wiki/2.png | Bin 0 -> 261 bytes graphics/event_objects/pics/berry_trees/wiki/3.png | Bin 0 -> 258 bytes graphics/event_objects/pics/berry_trees/wiki/4.png | Bin 0 -> 264 bytes graphics/event_objects/pics/berry_trees/wiki/5.png | Bin 0 -> 257 bytes .../event_objects/pics/cushions/ball_cushion.png | Bin 0 -> 215 bytes .../pics/cushions/diamond_cushion.png | Bin 0 -> 216 bytes .../event_objects/pics/cushions/fire_cushion.png | Bin 0 -> 209 bytes .../event_objects/pics/cushions/grass_cushion.png | Bin 0 -> 208 bytes .../event_objects/pics/cushions/kiss_cushion.png | Bin 0 -> 213 bytes .../event_objects/pics/cushions/pika_cushion.png | Bin 0 -> 199 bytes .../event_objects/pics/cushions/round_cushion.png | Bin 0 -> 214 bytes .../event_objects/pics/cushions/spin_cushion.png | Bin 0 -> 224 bytes .../event_objects/pics/cushions/water_cushion.png | Bin 0 -> 205 bytes .../event_objects/pics/cushions/zigzag_cushion.png | Bin 0 -> 226 bytes graphics/event_objects/pics/dolls/azurill_doll.png | Bin 0 -> 215 bytes graphics/event_objects/pics/dolls/baltoy_doll.png | Bin 0 -> 216 bytes .../pics/dolls/big_blastoise_doll.png | Bin 0 -> 425 bytes .../pics/dolls/big_charizard_doll.png | Bin 0 -> 398 bytes .../event_objects/pics/dolls/big_lapras_doll.png | Bin 0 -> 380 bytes .../event_objects/pics/dolls/big_regice_doll.png | Bin 0 -> 380 bytes .../event_objects/pics/dolls/big_regirock_doll.png | Bin 0 -> 390 bytes .../pics/dolls/big_registeel_doll.png | Bin 0 -> 389 bytes .../event_objects/pics/dolls/big_rhydon_doll.png | Bin 0 -> 393 bytes .../event_objects/pics/dolls/big_snorlax_doll.png | Bin 0 -> 379 bytes .../event_objects/pics/dolls/big_venusaur_doll.png | Bin 0 -> 463 bytes .../event_objects/pics/dolls/big_wailmer_doll.png | Bin 0 -> 357 bytes .../event_objects/pics/dolls/chikorita_doll.png | Bin 0 -> 213 bytes .../event_objects/pics/dolls/clefairy_doll.png | Bin 0 -> 227 bytes .../event_objects/pics/dolls/cyndaquil_doll.png | Bin 0 -> 232 bytes graphics/event_objects/pics/dolls/ditto_doll.png | Bin 0 -> 205 bytes graphics/event_objects/pics/dolls/duskull_doll.png | Bin 0 -> 228 bytes graphics/event_objects/pics/dolls/gulpin_doll.png | Bin 0 -> 215 bytes .../event_objects/pics/dolls/jigglypuff_doll.png | Bin 0 -> 229 bytes graphics/event_objects/pics/dolls/kecleon_doll.png | Bin 0 -> 236 bytes graphics/event_objects/pics/dolls/lotad_doll.png | Bin 0 -> 236 bytes graphics/event_objects/pics/dolls/marill_doll.png | Bin 0 -> 225 bytes graphics/event_objects/pics/dolls/meowth_doll.png | Bin 0 -> 248 bytes graphics/event_objects/pics/dolls/mudkip_doll.png | Bin 0 -> 225 bytes graphics/event_objects/pics/dolls/pichu_doll.png | Bin 0 -> 230 bytes graphics/event_objects/pics/dolls/pikachu_doll.png | Bin 0 -> 220 bytes graphics/event_objects/pics/dolls/seedot_doll.png | Bin 0 -> 258 bytes graphics/event_objects/pics/dolls/skitty_doll.png | Bin 0 -> 222 bytes .../event_objects/pics/dolls/smoochum_doll.png | Bin 0 -> 236 bytes graphics/event_objects/pics/dolls/swablu_doll.png | Bin 0 -> 223 bytes graphics/event_objects/pics/dolls/togepi_doll.png | Bin 0 -> 224 bytes graphics/event_objects/pics/dolls/torchic_doll.png | Bin 0 -> 239 bytes .../event_objects/pics/dolls/totodile_doll.png | Bin 0 -> 230 bytes graphics/event_objects/pics/dolls/treecko_doll.png | Bin 0 -> 233 bytes .../pics/dolls/unused_magnemite_doll.png | Bin 0 -> 223 bytes .../event_objects/pics/dolls/unused_natu_doll.png | Bin 0 -> 216 bytes .../pics/dolls/unused_pikachu_doll.png | Bin 0 -> 231 bytes .../pics/dolls/unused_porygon2_doll.png | Bin 0 -> 252 bytes .../pics/dolls/unused_squirtle_doll.png | Bin 0 -> 245 bytes .../pics/dolls/unused_wooper_doll.png | Bin 0 -> 231 bytes graphics/event_objects/pics/dolls/wynaut_doll.png | Bin 0 -> 214 bytes graphics/event_objects/pics/effects/arrow/0.png | Bin 0 -> 185 bytes graphics/event_objects/pics/effects/arrow/1.png | Bin 0 -> 183 bytes graphics/event_objects/pics/effects/arrow/2.png | Bin 0 -> 183 bytes graphics/event_objects/pics/effects/arrow/3.png | Bin 0 -> 185 bytes graphics/event_objects/pics/effects/arrow/4.png | Bin 0 -> 185 bytes graphics/event_objects/pics/effects/arrow/5.png | Bin 0 -> 183 bytes graphics/event_objects/pics/effects/arrow/6.png | Bin 0 -> 184 bytes graphics/event_objects/pics/effects/arrow/7.png | Bin 0 -> 185 bytes graphics/event_objects/pics/effects/ash/0.png | Bin 0 -> 168 bytes graphics/event_objects/pics/effects/ash/1.png | Bin 0 -> 191 bytes graphics/event_objects/pics/effects/ash/2.png | Bin 0 -> 194 bytes graphics/event_objects/pics/effects/ash/3.png | Bin 0 -> 185 bytes graphics/event_objects/pics/effects/ash/4.png | Bin 0 -> 163 bytes .../pics/effects/berry_tree_growth_sparkle/0.png | Bin 0 -> 132 bytes .../pics/effects/berry_tree_growth_sparkle/1.png | Bin 0 -> 141 bytes .../pics/effects/berry_tree_growth_sparkle/2.png | Bin 0 -> 151 bytes .../pics/effects/berry_tree_growth_sparkle/3.png | Bin 0 -> 153 bytes .../pics/effects/berry_tree_growth_sparkle/4.png | Bin 0 -> 145 bytes .../pics/effects/berry_tree_growth_sparkle/5.png | Bin 0 -> 134 bytes .../pics/effects/bike_hop_big_splash/0.png | Bin 0 -> 192 bytes .../pics/effects/bike_hop_big_splash/1.png | Bin 0 -> 193 bytes .../pics/effects/bike_hop_big_splash/2.png | Bin 0 -> 193 bytes .../pics/effects/bike_hop_big_splash/3.png | Bin 0 -> 169 bytes .../pics/effects/bike_hop_small_splash/0.png | Bin 0 -> 167 bytes .../pics/effects/bike_hop_small_splash/1.png | Bin 0 -> 176 bytes .../pics/effects/bike_hop_small_splash/2.png | Bin 0 -> 152 bytes .../pics/effects/bike_hop_tall_grass/0.png | Bin 0 -> 171 bytes .../pics/effects/bike_hop_tall_grass/1.png | Bin 0 -> 169 bytes .../pics/effects/bike_hop_tall_grass/2.png | Bin 0 -> 153 bytes .../pics/effects/bike_hop_tall_grass/3.png | Bin 0 -> 151 bytes .../pics/effects/bike_tire_tracks/0.png | Bin 0 -> 165 bytes .../pics/effects/bike_tire_tracks/1.png | Bin 0 -> 153 bytes .../pics/effects/bike_tire_tracks/2.png | Bin 0 -> 149 bytes .../pics/effects/bike_tire_tracks/3.png | Bin 0 -> 172 bytes graphics/event_objects/pics/effects/bird.png | Bin 0 -> 288 bytes graphics/event_objects/pics/effects/bubbles/0.png | Bin 0 -> 186 bytes graphics/event_objects/pics/effects/bubbles/1.png | Bin 0 -> 207 bytes graphics/event_objects/pics/effects/bubbles/2.png | Bin 0 -> 233 bytes graphics/event_objects/pics/effects/bubbles/3.png | Bin 0 -> 235 bytes graphics/event_objects/pics/effects/bubbles/4.png | Bin 0 -> 231 bytes graphics/event_objects/pics/effects/bubbles/5.png | Bin 0 -> 205 bytes graphics/event_objects/pics/effects/bubbles/6.png | Bin 0 -> 185 bytes graphics/event_objects/pics/effects/bubbles/7.png | Bin 0 -> 160 bytes .../pics/effects/deep_sand_footprints/0.png | Bin 0 -> 182 bytes .../pics/effects/deep_sand_footprints/1.png | Bin 0 -> 174 bytes .../pics/effects/ground_impact_dust/0.png | Bin 0 -> 174 bytes .../pics/effects/ground_impact_dust/1.png | Bin 0 -> 165 bytes .../pics/effects/ground_impact_dust/2.png | Bin 0 -> 158 bytes .../pics/effects/hot_springs_water.png | Bin 0 -> 150 bytes .../pics/effects/jump_out_of_ash/0.png | Bin 0 -> 175 bytes .../pics/effects/jump_out_of_ash/1.png | Bin 0 -> 191 bytes .../pics/effects/jump_out_of_ash/2.png | Bin 0 -> 208 bytes .../pics/effects/jump_out_of_ash/3.png | Bin 0 -> 196 bytes .../pics/effects/jump_out_of_ash/4.png | Bin 0 -> 190 bytes .../event_objects/pics/effects/long_grass/0.png | Bin 0 -> 236 bytes .../event_objects/pics/effects/long_grass/1.png | Bin 0 -> 230 bytes .../event_objects/pics/effects/long_grass/2.png | Bin 0 -> 231 bytes .../event_objects/pics/effects/long_grass/3.png | Bin 0 -> 236 bytes .../pics/effects/mountain_disguise/0.png | Bin 0 -> 221 bytes .../pics/effects/mountain_disguise/1.png | Bin 0 -> 248 bytes .../pics/effects/mountain_disguise/2.png | Bin 0 -> 241 bytes .../pics/effects/mountain_disguise/3.png | Bin 0 -> 237 bytes .../pics/effects/mountain_disguise/4.png | Bin 0 -> 217 bytes .../pics/effects/mountain_disguise/5.png | Bin 0 -> 200 bytes .../pics/effects/mountain_disguise/6.png | Bin 0 -> 164 bytes graphics/event_objects/pics/effects/ripple/0.png | Bin 0 -> 161 bytes graphics/event_objects/pics/effects/ripple/1.png | Bin 0 -> 171 bytes graphics/event_objects/pics/effects/ripple/2.png | Bin 0 -> 166 bytes graphics/event_objects/pics/effects/ripple/3.png | Bin 0 -> 176 bytes graphics/event_objects/pics/effects/ripple/4.png | Bin 0 -> 166 bytes .../pics/effects/sand_disguise_placeholder/0.png | Bin 0 -> 210 bytes .../pics/effects/sand_disguise_placeholder/1.png | Bin 0 -> 222 bytes .../pics/effects/sand_disguise_placeholder/2.png | Bin 0 -> 212 bytes .../pics/effects/sand_disguise_placeholder/3.png | Bin 0 -> 207 bytes .../pics/effects/sand_disguise_placeholder/4.png | Bin 0 -> 194 bytes .../pics/effects/sand_disguise_placeholder/5.png | Bin 0 -> 183 bytes .../pics/effects/sand_disguise_placeholder/6.png | Bin 0 -> 166 bytes .../pics/effects/sand_footprints/0.png | Bin 0 -> 172 bytes .../pics/effects/sand_footprints/1.png | Bin 0 -> 159 bytes .../pics/effects/shadow_extra_large.png | Bin 0 -> 165 bytes .../event_objects/pics/effects/shadow_large.png | Bin 0 -> 157 bytes .../event_objects/pics/effects/shadow_medium.png | Bin 0 -> 156 bytes .../event_objects/pics/effects/shadow_small.png | Bin 0 -> 156 bytes .../event_objects/pics/effects/short_grass/0.png | Bin 0 -> 159 bytes .../event_objects/pics/effects/short_grass/1.png | Bin 0 -> 156 bytes graphics/event_objects/pics/effects/splash/0.png | Bin 0 -> 160 bytes graphics/event_objects/pics/effects/splash/1.png | Bin 0 -> 163 bytes .../event_objects/pics/effects/surf_blob/0.png | Bin 0 -> 241 bytes .../event_objects/pics/effects/surf_blob/1.png | Bin 0 -> 244 bytes .../event_objects/pics/effects/surf_blob/2.png | Bin 0 -> 238 bytes .../event_objects/pics/effects/tall_grass/0.png | Bin 0 -> 199 bytes .../event_objects/pics/effects/tall_grass/1.png | Bin 0 -> 227 bytes .../event_objects/pics/effects/tall_grass/2.png | Bin 0 -> 219 bytes .../event_objects/pics/effects/tall_grass/3.png | Bin 0 -> 205 bytes .../event_objects/pics/effects/tall_grass/4.png | Bin 0 -> 207 bytes .../event_objects/pics/effects/tree_disguise/0.png | Bin 0 -> 270 bytes .../event_objects/pics/effects/tree_disguise/1.png | Bin 0 -> 278 bytes .../event_objects/pics/effects/tree_disguise/2.png | Bin 0 -> 248 bytes .../event_objects/pics/effects/tree_disguise/3.png | Bin 0 -> 249 bytes .../event_objects/pics/effects/tree_disguise/4.png | Bin 0 -> 227 bytes .../event_objects/pics/effects/tree_disguise/5.png | Bin 0 -> 216 bytes .../event_objects/pics/effects/tree_disguise/6.png | Bin 0 -> 164 bytes .../event_objects/pics/effects/unknown_16/0.png | Bin 0 -> 244 bytes .../event_objects/pics/effects/unknown_16/1.png | Bin 0 -> 241 bytes .../event_objects/pics/effects/unknown_16/2.png | Bin 0 -> 246 bytes .../event_objects/pics/effects/unknown_16/3.png | Bin 0 -> 249 bytes .../event_objects/pics/effects/unknown_16/4.png | Bin 0 -> 250 bytes .../event_objects/pics/effects/unknown_16/5.png | Bin 0 -> 226 bytes .../event_objects/pics/effects/unknown_17/0.png | Bin 0 -> 251 bytes .../event_objects/pics/effects/unknown_17/1.png | Bin 0 -> 248 bytes .../event_objects/pics/effects/unknown_17/2.png | Bin 0 -> 250 bytes .../event_objects/pics/effects/unknown_17/3.png | Bin 0 -> 250 bytes .../event_objects/pics/effects/unknown_17/4.png | Bin 0 -> 242 bytes .../event_objects/pics/effects/unknown_17/5.png | Bin 0 -> 240 bytes .../event_objects/pics/effects/unknown_17/6.png | Bin 0 -> 240 bytes .../event_objects/pics/effects/unknown_17/7.png | Bin 0 -> 245 bytes .../event_objects/pics/effects/unknown_18/0.png | Bin 0 -> 244 bytes .../event_objects/pics/effects/unknown_18/1.png | Bin 0 -> 245 bytes .../event_objects/pics/effects/unknown_18/2.png | Bin 0 -> 245 bytes .../event_objects/pics/effects/unknown_18/3.png | Bin 0 -> 244 bytes .../event_objects/pics/effects/unknown_19/0.png | Bin 0 -> 186 bytes .../event_objects/pics/effects/unknown_19/1.png | Bin 0 -> 204 bytes .../event_objects/pics/effects/unknown_19/2.png | Bin 0 -> 211 bytes .../event_objects/pics/effects/unknown_19/3.png | Bin 0 -> 203 bytes .../event_objects/pics/effects/unknown_20/0.png | Bin 0 -> 154 bytes .../event_objects/pics/effects/unknown_20/1.png | Bin 0 -> 171 bytes .../event_objects/pics/effects/unknown_20/2.png | Bin 0 -> 197 bytes .../event_objects/pics/effects/unknown_20/3.png | Bin 0 -> 211 bytes .../event_objects/pics/effects/unknown_20/4.png | Bin 0 -> 206 bytes .../event_objects/pics/effects/unknown_29/0.png | Bin 0 -> 164 bytes .../event_objects/pics/effects/unknown_29/1.png | Bin 0 -> 176 bytes .../event_objects/pics/effects/unknown_29/2.png | Bin 0 -> 171 bytes .../event_objects/pics/effects/unknown_33/0.png | Bin 0 -> 185 bytes .../event_objects/pics/effects/unknown_33/1.png | Bin 0 -> 224 bytes .../event_objects/pics/effects/unknown_33/2.png | Bin 0 -> 232 bytes .../event_objects/pics/effects/unknown_33/3.png | Bin 0 -> 223 bytes .../event_objects/pics/effects/unknown_33/4.png | Bin 0 -> 214 bytes .../event_objects/pics/effects/unknown_35/0.png | Bin 0 -> 157 bytes .../event_objects/pics/effects/unknown_35/1.png | Bin 0 -> 175 bytes .../pics/effects/unknown_4F6D38/0.png | Bin 0 -> 130 bytes .../pics/effects/unknown_4F7E38/0.png | Bin 0 -> 175 bytes .../event_objects/pics/effects/unused_grass/0.png | Bin 0 -> 231 bytes .../event_objects/pics/effects/unused_grass/1.png | Bin 0 -> 228 bytes .../event_objects/pics/effects/unused_grass/2.png | Bin 0 -> 230 bytes .../event_objects/pics/effects/unused_grass/3.png | Bin 0 -> 232 bytes graphics/event_objects/pics/misc/birchs_bag.png | Bin 0 -> 234 bytes .../event_objects/pics/misc/birth_island_stone.png | Bin 0 -> 224 bytes .../event_objects/pics/misc/breakable_rock/0.png | Bin 0 -> 220 bytes .../event_objects/pics/misc/breakable_rock/1.png | Bin 0 -> 219 bytes .../event_objects/pics/misc/breakable_rock/2.png | Bin 0 -> 225 bytes .../event_objects/pics/misc/breakable_rock/3.png | Bin 0 -> 221 bytes graphics/event_objects/pics/misc/cable_car.png | Bin 0 -> 569 bytes .../event_objects/pics/misc/cuttable_tree/0.png | Bin 0 -> 222 bytes .../event_objects/pics/misc/cuttable_tree/1.png | Bin 0 -> 230 bytes .../event_objects/pics/misc/cuttable_tree/2.png | Bin 0 -> 231 bytes .../event_objects/pics/misc/cuttable_tree/3.png | Bin 0 -> 181 bytes graphics/event_objects/pics/misc/fossil.png | Bin 0 -> 261 bytes graphics/event_objects/pics/misc/item_ball.png | Bin 0 -> 205 bytes graphics/event_objects/pics/misc/moving_box.png | Bin 0 -> 206 bytes .../event_objects/pics/misc/mr_brineys_boat/0.png | Bin 0 -> 307 bytes .../event_objects/pics/misc/mr_brineys_boat/1.png | Bin 0 -> 297 bytes .../event_objects/pics/misc/mr_brineys_boat/2.png | Bin 0 -> 392 bytes .../event_objects/pics/misc/pushable_boulder.png | Bin 0 -> 224 bytes graphics/event_objects/pics/misc/ss_tidal.png | Bin 0 -> 706 bytes graphics/event_objects/pics/misc/statue.png | Bin 0 -> 257 bytes .../event_objects/pics/misc/submarine_shadow.png | Bin 0 -> 256 bytes graphics/event_objects/pics/misc/truck.png | Bin 0 -> 436 bytes graphics/event_objects/pics/people/anabel/0.png | Bin 0 -> 283 bytes graphics/event_objects/pics/people/anabel/1.png | Bin 0 -> 264 bytes graphics/event_objects/pics/people/anabel/2.png | Bin 0 -> 255 bytes graphics/event_objects/pics/people/anabel/3.png | Bin 0 -> 275 bytes graphics/event_objects/pics/people/anabel/4.png | Bin 0 -> 276 bytes graphics/event_objects/pics/people/anabel/5.png | Bin 0 -> 260 bytes graphics/event_objects/pics/people/anabel/6.png | Bin 0 -> 259 bytes graphics/event_objects/pics/people/anabel/7.png | Bin 0 -> 266 bytes graphics/event_objects/pics/people/anabel/8.png | Bin 0 -> 260 bytes .../event_objects/pics/people/aqua_member_f/0.png | Bin 0 -> 295 bytes .../event_objects/pics/people/aqua_member_f/1.png | Bin 0 -> 266 bytes .../event_objects/pics/people/aqua_member_f/2.png | Bin 0 -> 262 bytes .../event_objects/pics/people/aqua_member_f/3.png | Bin 0 -> 286 bytes .../event_objects/pics/people/aqua_member_f/4.png | Bin 0 -> 285 bytes .../event_objects/pics/people/aqua_member_f/5.png | Bin 0 -> 264 bytes .../event_objects/pics/people/aqua_member_f/6.png | Bin 0 -> 265 bytes .../event_objects/pics/people/aqua_member_f/7.png | Bin 0 -> 274 bytes .../event_objects/pics/people/aqua_member_f/8.png | Bin 0 -> 270 bytes .../event_objects/pics/people/aqua_member_m/0.png | Bin 0 -> 301 bytes .../event_objects/pics/people/aqua_member_m/1.png | Bin 0 -> 286 bytes .../event_objects/pics/people/aqua_member_m/2.png | Bin 0 -> 263 bytes .../event_objects/pics/people/aqua_member_m/3.png | Bin 0 -> 287 bytes .../event_objects/pics/people/aqua_member_m/4.png | Bin 0 -> 288 bytes .../event_objects/pics/people/aqua_member_m/5.png | Bin 0 -> 271 bytes .../event_objects/pics/people/aqua_member_m/6.png | Bin 0 -> 276 bytes .../event_objects/pics/people/aqua_member_m/7.png | Bin 0 -> 269 bytes .../event_objects/pics/people/aqua_member_m/8.png | Bin 0 -> 267 bytes graphics/event_objects/pics/people/archie/0.png | Bin 0 -> 290 bytes graphics/event_objects/pics/people/archie/1.png | Bin 0 -> 265 bytes graphics/event_objects/pics/people/archie/2.png | Bin 0 -> 260 bytes graphics/event_objects/pics/people/archie/3.png | Bin 0 -> 284 bytes graphics/event_objects/pics/people/archie/4.png | Bin 0 -> 284 bytes graphics/event_objects/pics/people/archie/5.png | Bin 0 -> 256 bytes graphics/event_objects/pics/people/archie/6.png | Bin 0 -> 257 bytes graphics/event_objects/pics/people/archie/7.png | Bin 0 -> 261 bytes graphics/event_objects/pics/people/archie/8.png | Bin 0 -> 260 bytes graphics/event_objects/pics/people/artist/0.png | Bin 0 -> 302 bytes graphics/event_objects/pics/people/artist/1.png | Bin 0 -> 286 bytes graphics/event_objects/pics/people/artist/2.png | Bin 0 -> 278 bytes graphics/event_objects/pics/people/artist/3.png | Bin 0 -> 291 bytes graphics/event_objects/pics/people/artist/4.png | Bin 0 -> 291 bytes graphics/event_objects/pics/people/artist/5.png | Bin 0 -> 277 bytes graphics/event_objects/pics/people/artist/6.png | Bin 0 -> 277 bytes graphics/event_objects/pics/people/artist/7.png | Bin 0 -> 289 bytes graphics/event_objects/pics/people/artist/8.png | Bin 0 -> 283 bytes graphics/event_objects/pics/people/beauty/0.png | Bin 0 -> 296 bytes graphics/event_objects/pics/people/beauty/1.png | Bin 0 -> 290 bytes graphics/event_objects/pics/people/beauty/2.png | Bin 0 -> 264 bytes graphics/event_objects/pics/people/beauty/3.png | Bin 0 -> 284 bytes graphics/event_objects/pics/people/beauty/4.png | Bin 0 -> 283 bytes graphics/event_objects/pics/people/beauty/5.png | Bin 0 -> 280 bytes graphics/event_objects/pics/people/beauty/6.png | Bin 0 -> 278 bytes graphics/event_objects/pics/people/beauty/7.png | Bin 0 -> 269 bytes graphics/event_objects/pics/people/beauty/8.png | Bin 0 -> 269 bytes .../event_objects/pics/people/black_belt/0.png | Bin 0 -> 306 bytes .../event_objects/pics/people/black_belt/1.png | Bin 0 -> 304 bytes .../event_objects/pics/people/black_belt/2.png | Bin 0 -> 275 bytes .../event_objects/pics/people/black_belt/3.png | Bin 0 -> 295 bytes .../event_objects/pics/people/black_belt/4.png | Bin 0 -> 294 bytes .../event_objects/pics/people/black_belt/5.png | Bin 0 -> 293 bytes .../event_objects/pics/people/black_belt/6.png | Bin 0 -> 295 bytes .../event_objects/pics/people/black_belt/7.png | Bin 0 -> 278 bytes .../event_objects/pics/people/black_belt/8.png | Bin 0 -> 276 bytes graphics/event_objects/pics/people/boy_1/0.png | Bin 0 -> 283 bytes graphics/event_objects/pics/people/boy_1/1.png | Bin 0 -> 274 bytes graphics/event_objects/pics/people/boy_1/2.png | Bin 0 -> 254 bytes graphics/event_objects/pics/people/boy_1/3.png | Bin 0 -> 274 bytes graphics/event_objects/pics/people/boy_1/4.png | Bin 0 -> 275 bytes graphics/event_objects/pics/people/boy_1/5.png | Bin 0 -> 265 bytes graphics/event_objects/pics/people/boy_1/6.png | Bin 0 -> 265 bytes graphics/event_objects/pics/people/boy_1/7.png | Bin 0 -> 257 bytes graphics/event_objects/pics/people/boy_1/8.png | Bin 0 -> 259 bytes graphics/event_objects/pics/people/boy_2/0.png | Bin 0 -> 283 bytes graphics/event_objects/pics/people/boy_2/1.png | Bin 0 -> 275 bytes graphics/event_objects/pics/people/boy_2/2.png | Bin 0 -> 248 bytes graphics/event_objects/pics/people/boy_2/3.png | Bin 0 -> 277 bytes graphics/event_objects/pics/people/boy_2/4.png | Bin 0 -> 277 bytes graphics/event_objects/pics/people/boy_2/5.png | Bin 0 -> 268 bytes graphics/event_objects/pics/people/boy_2/6.png | Bin 0 -> 266 bytes graphics/event_objects/pics/people/boy_2/7.png | Bin 0 -> 251 bytes graphics/event_objects/pics/people/boy_2/8.png | Bin 0 -> 254 bytes graphics/event_objects/pics/people/boy_3/0.png | Bin 0 -> 281 bytes graphics/event_objects/pics/people/boy_3/1.png | Bin 0 -> 268 bytes graphics/event_objects/pics/people/boy_3/2.png | Bin 0 -> 247 bytes graphics/event_objects/pics/people/boy_3/3.png | Bin 0 -> 274 bytes graphics/event_objects/pics/people/boy_3/4.png | Bin 0 -> 272 bytes graphics/event_objects/pics/people/boy_3/5.png | Bin 0 -> 264 bytes graphics/event_objects/pics/people/boy_3/6.png | Bin 0 -> 261 bytes graphics/event_objects/pics/people/boy_3/7.png | Bin 0 -> 250 bytes graphics/event_objects/pics/people/boy_3/8.png | Bin 0 -> 249 bytes graphics/event_objects/pics/people/boy_4/0.png | Bin 0 -> 291 bytes graphics/event_objects/pics/people/boy_4/1.png | Bin 0 -> 280 bytes graphics/event_objects/pics/people/boy_4/2.png | Bin 0 -> 256 bytes graphics/event_objects/pics/people/boy_4/3.png | Bin 0 -> 279 bytes graphics/event_objects/pics/people/boy_4/4.png | Bin 0 -> 278 bytes graphics/event_objects/pics/people/boy_4/5.png | Bin 0 -> 277 bytes graphics/event_objects/pics/people/boy_4/6.png | Bin 0 -> 276 bytes graphics/event_objects/pics/people/boy_4/7.png | Bin 0 -> 258 bytes graphics/event_objects/pics/people/boy_4/8.png | Bin 0 -> 259 bytes graphics/event_objects/pics/people/boy_5/0.png | Bin 0 -> 282 bytes graphics/event_objects/pics/people/boy_5/1.png | Bin 0 -> 262 bytes graphics/event_objects/pics/people/boy_5/2.png | Bin 0 -> 266 bytes graphics/event_objects/pics/people/brandon/0.png | Bin 0 -> 292 bytes graphics/event_objects/pics/people/brandon/1.png | Bin 0 -> 285 bytes graphics/event_objects/pics/people/brandon/2.png | Bin 0 -> 251 bytes graphics/event_objects/pics/people/brandon/3.png | Bin 0 -> 277 bytes graphics/event_objects/pics/people/brandon/4.png | Bin 0 -> 277 bytes graphics/event_objects/pics/people/brandon/5.png | Bin 0 -> 273 bytes graphics/event_objects/pics/people/brandon/6.png | Bin 0 -> 276 bytes graphics/event_objects/pics/people/brandon/7.png | Bin 0 -> 263 bytes graphics/event_objects/pics/people/brandon/8.png | Bin 0 -> 262 bytes graphics/event_objects/pics/people/brawly/0.png | Bin 0 -> 301 bytes graphics/event_objects/pics/people/brawly/1.png | Bin 0 -> 277 bytes graphics/event_objects/pics/people/brawly/2.png | Bin 0 -> 265 bytes .../pics/people/brendan/acro_bike/00.png | Bin 0 -> 298 bytes .../pics/people/brendan/acro_bike/01.png | Bin 0 -> 285 bytes .../pics/people/brendan/acro_bike/02.png | Bin 0 -> 338 bytes .../pics/people/brendan/acro_bike/03.png | Bin 0 -> 303 bytes .../pics/people/brendan/acro_bike/04.png | Bin 0 -> 306 bytes .../pics/people/brendan/acro_bike/05.png | Bin 0 -> 279 bytes .../pics/people/brendan/acro_bike/06.png | Bin 0 -> 280 bytes .../pics/people/brendan/acro_bike/07.png | Bin 0 -> 339 bytes .../pics/people/brendan/acro_bike/08.png | Bin 0 -> 345 bytes .../pics/people/brendan/acro_bike/09.png | Bin 0 -> 298 bytes .../pics/people/brendan/acro_bike/10.png | Bin 0 -> 307 bytes .../pics/people/brendan/acro_bike/11.png | Bin 0 -> 284 bytes .../pics/people/brendan/acro_bike/12.png | Bin 0 -> 279 bytes .../pics/people/brendan/acro_bike/13.png | Bin 0 -> 288 bytes .../pics/people/brendan/acro_bike/14.png | Bin 0 -> 291 bytes .../pics/people/brendan/acro_bike/15.png | Bin 0 -> 285 bytes .../pics/people/brendan/acro_bike/16.png | Bin 0 -> 280 bytes .../pics/people/brendan/acro_bike/17.png | Bin 0 -> 343 bytes .../pics/people/brendan/acro_bike/18.png | Bin 0 -> 345 bytes .../pics/people/brendan/acro_bike/19.png | Bin 0 -> 339 bytes .../pics/people/brendan/acro_bike/20.png | Bin 0 -> 338 bytes .../pics/people/brendan/acro_bike/21.png | Bin 0 -> 311 bytes .../pics/people/brendan/acro_bike/22.png | Bin 0 -> 317 bytes .../pics/people/brendan/acro_bike/23.png | Bin 0 -> 290 bytes .../pics/people/brendan/acro_bike/24.png | Bin 0 -> 291 bytes .../pics/people/brendan/acro_bike/25.png | Bin 0 -> 342 bytes .../pics/people/brendan/acro_bike/26.png | Bin 0 -> 345 bytes .../pics/people/brendan/decorating.png | Bin 0 -> 283 bytes .../pics/people/brendan/field_move/0.png | Bin 0 -> 286 bytes .../pics/people/brendan/field_move/1.png | Bin 0 -> 284 bytes .../pics/people/brendan/field_move/2.png | Bin 0 -> 287 bytes .../pics/people/brendan/field_move/3.png | Bin 0 -> 312 bytes .../pics/people/brendan/field_move/4.png | Bin 0 -> 316 bytes .../pics/people/brendan/fishing/00.png | Bin 0 -> 299 bytes .../pics/people/brendan/fishing/01.png | Bin 0 -> 299 bytes .../pics/people/brendan/fishing/02.png | Bin 0 -> 303 bytes .../pics/people/brendan/fishing/03.png | Bin 0 -> 304 bytes .../pics/people/brendan/fishing/04.png | Bin 0 -> 284 bytes .../pics/people/brendan/fishing/05.png | Bin 0 -> 288 bytes .../pics/people/brendan/fishing/06.png | Bin 0 -> 308 bytes .../pics/people/brendan/fishing/07.png | Bin 0 -> 302 bytes .../pics/people/brendan/fishing/08.png | Bin 0 -> 297 bytes .../pics/people/brendan/fishing/09.png | Bin 0 -> 298 bytes .../pics/people/brendan/fishing/10.png | Bin 0 -> 296 bytes .../pics/people/brendan/fishing/11.png | Bin 0 -> 301 bytes .../pics/people/brendan/mach_bike/0.png | Bin 0 -> 298 bytes .../pics/people/brendan/mach_bike/1.png | Bin 0 -> 285 bytes .../pics/people/brendan/mach_bike/2.png | Bin 0 -> 338 bytes .../pics/people/brendan/mach_bike/3.png | Bin 0 -> 303 bytes .../pics/people/brendan/mach_bike/4.png | Bin 0 -> 306 bytes .../pics/people/brendan/mach_bike/5.png | Bin 0 -> 279 bytes .../pics/people/brendan/mach_bike/6.png | Bin 0 -> 280 bytes .../pics/people/brendan/mach_bike/7.png | Bin 0 -> 339 bytes .../pics/people/brendan/mach_bike/8.png | Bin 0 -> 345 bytes .../pics/people/brendan/normal/00.png | Bin 0 -> 294 bytes .../pics/people/brendan/normal/01.png | Bin 0 -> 293 bytes .../pics/people/brendan/normal/02.png | Bin 0 -> 274 bytes .../pics/people/brendan/normal/03.png | Bin 0 -> 287 bytes .../pics/people/brendan/normal/04.png | Bin 0 -> 285 bytes .../pics/people/brendan/normal/05.png | Bin 0 -> 280 bytes .../pics/people/brendan/normal/06.png | Bin 0 -> 280 bytes .../pics/people/brendan/normal/07.png | Bin 0 -> 284 bytes .../pics/people/brendan/normal/08.png | Bin 0 -> 280 bytes .../pics/people/brendan/normal/09.png | Bin 0 -> 274 bytes .../pics/people/brendan/normal/10.png | Bin 0 -> 275 bytes .../pics/people/brendan/normal/11.png | Bin 0 -> 268 bytes .../pics/people/brendan/normal/12.png | Bin 0 -> 270 bytes .../pics/people/brendan/normal/13.png | Bin 0 -> 269 bytes .../pics/people/brendan/normal/14.png | Bin 0 -> 270 bytes .../pics/people/brendan/normal/15.png | Bin 0 -> 270 bytes .../pics/people/brendan/normal/16.png | Bin 0 -> 283 bytes .../pics/people/brendan/normal/17.png | Bin 0 -> 281 bytes .../pics/people/brendan/surfing/0.png | Bin 0 -> 283 bytes .../pics/people/brendan/surfing/1.png | Bin 0 -> 286 bytes .../pics/people/brendan/surfing/2.png | Bin 0 -> 296 bytes .../pics/people/brendan/surfing/3.png | Bin 0 -> 302 bytes .../pics/people/brendan/surfing/4.png | Bin 0 -> 299 bytes .../pics/people/brendan/surfing/5.png | Bin 0 -> 295 bytes .../pics/people/brendan/underwater/0.png | Bin 0 -> 265 bytes .../pics/people/brendan/underwater/1.png | Bin 0 -> 272 bytes .../pics/people/brendan/underwater/2.png | Bin 0 -> 278 bytes .../pics/people/brendan/underwater/3.png | Bin 0 -> 278 bytes .../pics/people/brendan/watering/0.png | Bin 0 -> 293 bytes .../pics/people/brendan/watering/1.png | Bin 0 -> 294 bytes .../pics/people/brendan/watering/2.png | Bin 0 -> 311 bytes .../pics/people/brendan/watering/3.png | Bin 0 -> 297 bytes .../pics/people/brendan/watering/4.png | Bin 0 -> 295 bytes .../pics/people/brendan/watering/5.png | Bin 0 -> 311 bytes .../event_objects/pics/people/bug_catcher/0.png | Bin 0 -> 299 bytes .../event_objects/pics/people/bug_catcher/1.png | Bin 0 -> 302 bytes .../event_objects/pics/people/bug_catcher/2.png | Bin 0 -> 279 bytes .../event_objects/pics/people/bug_catcher/3.png | Bin 0 -> 292 bytes .../event_objects/pics/people/bug_catcher/4.png | Bin 0 -> 293 bytes .../event_objects/pics/people/bug_catcher/5.png | Bin 0 -> 291 bytes .../event_objects/pics/people/bug_catcher/6.png | Bin 0 -> 291 bytes .../event_objects/pics/people/bug_catcher/7.png | Bin 0 -> 284 bytes .../event_objects/pics/people/bug_catcher/8.png | Bin 0 -> 285 bytes graphics/event_objects/pics/people/cameraman/0.png | Bin 0 -> 297 bytes graphics/event_objects/pics/people/cameraman/1.png | Bin 0 -> 288 bytes graphics/event_objects/pics/people/cameraman/2.png | Bin 0 -> 273 bytes graphics/event_objects/pics/people/cameraman/3.png | Bin 0 -> 293 bytes graphics/event_objects/pics/people/cameraman/4.png | Bin 0 -> 294 bytes graphics/event_objects/pics/people/cameraman/5.png | Bin 0 -> 284 bytes graphics/event_objects/pics/people/cameraman/6.png | Bin 0 -> 286 bytes graphics/event_objects/pics/people/cameraman/7.png | Bin 0 -> 279 bytes graphics/event_objects/pics/people/cameraman/8.png | Bin 0 -> 276 bytes graphics/event_objects/pics/people/camper/0.png | Bin 0 -> 293 bytes graphics/event_objects/pics/people/camper/1.png | Bin 0 -> 282 bytes graphics/event_objects/pics/people/camper/2.png | Bin 0 -> 263 bytes graphics/event_objects/pics/people/camper/3.png | Bin 0 -> 281 bytes graphics/event_objects/pics/people/camper/4.png | Bin 0 -> 283 bytes graphics/event_objects/pics/people/camper/5.png | Bin 0 -> 271 bytes graphics/event_objects/pics/people/camper/6.png | Bin 0 -> 272 bytes graphics/event_objects/pics/people/camper/7.png | Bin 0 -> 273 bytes graphics/event_objects/pics/people/camper/8.png | Bin 0 -> 273 bytes .../pics/people/contest_old_man/0.png | Bin 0 -> 297 bytes .../pics/people/contest_old_man/1.png | Bin 0 -> 277 bytes .../pics/people/contest_old_man/2.png | Bin 0 -> 256 bytes .../pics/people/contest_old_man/3.png | Bin 0 -> 284 bytes .../pics/people/contest_old_man/4.png | Bin 0 -> 284 bytes .../pics/people/contest_old_man/5.png | Bin 0 -> 277 bytes .../pics/people/contest_old_man/6.png | Bin 0 -> 273 bytes .../pics/people/contest_old_man/7.png | Bin 0 -> 268 bytes .../pics/people/contest_old_man/8.png | Bin 0 -> 265 bytes graphics/event_objects/pics/people/cook/0.png | Bin 0 -> 303 bytes graphics/event_objects/pics/people/cook/1.png | Bin 0 -> 293 bytes graphics/event_objects/pics/people/cook/2.png | Bin 0 -> 290 bytes .../pics/people/cycling_triathlete_f/0.png | Bin 0 -> 290 bytes .../pics/people/cycling_triathlete_f/1.png | Bin 0 -> 285 bytes .../pics/people/cycling_triathlete_f/2.png | Bin 0 -> 329 bytes .../pics/people/cycling_triathlete_f/3.png | Bin 0 -> 291 bytes .../pics/people/cycling_triathlete_f/4.png | Bin 0 -> 291 bytes .../pics/people/cycling_triathlete_f/5.png | Bin 0 -> 286 bytes .../pics/people/cycling_triathlete_f/6.png | Bin 0 -> 287 bytes .../pics/people/cycling_triathlete_f/7.png | Bin 0 -> 329 bytes .../pics/people/cycling_triathlete_f/8.png | Bin 0 -> 333 bytes .../pics/people/cycling_triathlete_m/0.png | Bin 0 -> 290 bytes .../pics/people/cycling_triathlete_m/1.png | Bin 0 -> 286 bytes .../pics/people/cycling_triathlete_m/2.png | Bin 0 -> 332 bytes .../pics/people/cycling_triathlete_m/3.png | Bin 0 -> 292 bytes .../pics/people/cycling_triathlete_m/4.png | Bin 0 -> 292 bytes .../pics/people/cycling_triathlete_m/5.png | Bin 0 -> 291 bytes .../pics/people/cycling_triathlete_m/6.png | Bin 0 -> 292 bytes .../pics/people/cycling_triathlete_m/7.png | Bin 0 -> 328 bytes .../pics/people/cycling_triathlete_m/8.png | Bin 0 -> 331 bytes graphics/event_objects/pics/people/drake/0.png | Bin 0 -> 295 bytes graphics/event_objects/pics/people/drake/1.png | Bin 0 -> 280 bytes graphics/event_objects/pics/people/drake/2.png | Bin 0 -> 266 bytes graphics/event_objects/pics/people/fat_man/0.png | Bin 0 -> 292 bytes graphics/event_objects/pics/people/fat_man/1.png | Bin 0 -> 290 bytes graphics/event_objects/pics/people/fat_man/2.png | Bin 0 -> 292 bytes graphics/event_objects/pics/people/fat_man/3.png | Bin 0 -> 289 bytes graphics/event_objects/pics/people/fat_man/4.png | Bin 0 -> 287 bytes graphics/event_objects/pics/people/fat_man/5.png | Bin 0 -> 284 bytes graphics/event_objects/pics/people/fat_man/6.png | Bin 0 -> 282 bytes graphics/event_objects/pics/people/fat_man/7.png | Bin 0 -> 292 bytes graphics/event_objects/pics/people/fat_man/8.png | Bin 0 -> 289 bytes graphics/event_objects/pics/people/fisherman/0.png | Bin 0 -> 302 bytes graphics/event_objects/pics/people/fisherman/1.png | Bin 0 -> 286 bytes graphics/event_objects/pics/people/fisherman/2.png | Bin 0 -> 270 bytes graphics/event_objects/pics/people/fisherman/3.png | Bin 0 -> 291 bytes graphics/event_objects/pics/people/fisherman/4.png | Bin 0 -> 291 bytes graphics/event_objects/pics/people/fisherman/5.png | Bin 0 -> 281 bytes graphics/event_objects/pics/people/fisherman/6.png | Bin 0 -> 281 bytes graphics/event_objects/pics/people/fisherman/7.png | Bin 0 -> 273 bytes graphics/event_objects/pics/people/fisherman/8.png | Bin 0 -> 270 bytes graphics/event_objects/pics/people/flannery/0.png | Bin 0 -> 289 bytes graphics/event_objects/pics/people/flannery/1.png | Bin 0 -> 294 bytes graphics/event_objects/pics/people/flannery/2.png | Bin 0 -> 264 bytes graphics/event_objects/pics/people/gentleman/0.png | Bin 0 -> 295 bytes graphics/event_objects/pics/people/gentleman/1.png | Bin 0 -> 292 bytes graphics/event_objects/pics/people/gentleman/2.png | Bin 0 -> 268 bytes graphics/event_objects/pics/people/gentleman/3.png | Bin 0 -> 286 bytes graphics/event_objects/pics/people/gentleman/4.png | Bin 0 -> 287 bytes graphics/event_objects/pics/people/gentleman/5.png | Bin 0 -> 280 bytes graphics/event_objects/pics/people/gentleman/6.png | Bin 0 -> 281 bytes graphics/event_objects/pics/people/gentleman/7.png | Bin 0 -> 279 bytes graphics/event_objects/pics/people/gentleman/8.png | Bin 0 -> 276 bytes graphics/event_objects/pics/people/girl_1/0.png | Bin 0 -> 286 bytes graphics/event_objects/pics/people/girl_1/1.png | Bin 0 -> 271 bytes graphics/event_objects/pics/people/girl_1/2.png | Bin 0 -> 257 bytes graphics/event_objects/pics/people/girl_1/3.png | Bin 0 -> 274 bytes graphics/event_objects/pics/people/girl_1/4.png | Bin 0 -> 277 bytes graphics/event_objects/pics/people/girl_1/5.png | Bin 0 -> 260 bytes graphics/event_objects/pics/people/girl_1/6.png | Bin 0 -> 263 bytes graphics/event_objects/pics/people/girl_1/7.png | Bin 0 -> 260 bytes graphics/event_objects/pics/people/girl_1/8.png | Bin 0 -> 264 bytes graphics/event_objects/pics/people/girl_2/0.png | Bin 0 -> 288 bytes graphics/event_objects/pics/people/girl_2/1.png | Bin 0 -> 276 bytes graphics/event_objects/pics/people/girl_2/2.png | Bin 0 -> 263 bytes graphics/event_objects/pics/people/girl_2/3.png | Bin 0 -> 275 bytes graphics/event_objects/pics/people/girl_2/4.png | Bin 0 -> 277 bytes graphics/event_objects/pics/people/girl_2/5.png | Bin 0 -> 266 bytes graphics/event_objects/pics/people/girl_2/6.png | Bin 0 -> 265 bytes graphics/event_objects/pics/people/girl_2/7.png | Bin 0 -> 264 bytes graphics/event_objects/pics/people/girl_2/8.png | Bin 0 -> 267 bytes graphics/event_objects/pics/people/girl_3/0.png | Bin 0 -> 286 bytes graphics/event_objects/pics/people/girl_3/1.png | Bin 0 -> 288 bytes graphics/event_objects/pics/people/girl_3/2.png | Bin 0 -> 264 bytes graphics/event_objects/pics/people/girl_3/3.png | Bin 0 -> 275 bytes graphics/event_objects/pics/people/girl_3/4.png | Bin 0 -> 274 bytes graphics/event_objects/pics/people/girl_3/5.png | Bin 0 -> 281 bytes graphics/event_objects/pics/people/girl_3/6.png | Bin 0 -> 281 bytes graphics/event_objects/pics/people/girl_3/7.png | Bin 0 -> 272 bytes graphics/event_objects/pics/people/girl_3/8.png | Bin 0 -> 272 bytes graphics/event_objects/pics/people/glacia/0.png | Bin 0 -> 295 bytes graphics/event_objects/pics/people/glacia/1.png | Bin 0 -> 281 bytes graphics/event_objects/pics/people/glacia/2.png | Bin 0 -> 262 bytes graphics/event_objects/pics/people/greta/0.png | Bin 0 -> 277 bytes graphics/event_objects/pics/people/greta/1.png | Bin 0 -> 269 bytes graphics/event_objects/pics/people/greta/2.png | Bin 0 -> 257 bytes graphics/event_objects/pics/people/greta/3.png | Bin 0 -> 265 bytes graphics/event_objects/pics/people/greta/4.png | Bin 0 -> 266 bytes graphics/event_objects/pics/people/greta/5.png | Bin 0 -> 262 bytes graphics/event_objects/pics/people/greta/6.png | Bin 0 -> 261 bytes graphics/event_objects/pics/people/greta/7.png | Bin 0 -> 265 bytes graphics/event_objects/pics/people/greta/8.png | Bin 0 -> 263 bytes .../event_objects/pics/people/hex_maniac/0.png | Bin 0 -> 289 bytes .../event_objects/pics/people/hex_maniac/1.png | Bin 0 -> 251 bytes .../event_objects/pics/people/hex_maniac/2.png | Bin 0 -> 247 bytes .../event_objects/pics/people/hex_maniac/3.png | Bin 0 -> 279 bytes .../event_objects/pics/people/hex_maniac/4.png | Bin 0 -> 277 bytes .../event_objects/pics/people/hex_maniac/5.png | Bin 0 -> 243 bytes .../event_objects/pics/people/hex_maniac/6.png | Bin 0 -> 241 bytes .../event_objects/pics/people/hex_maniac/7.png | Bin 0 -> 249 bytes .../event_objects/pics/people/hex_maniac/8.png | Bin 0 -> 248 bytes graphics/event_objects/pics/people/hiker/0.png | Bin 0 -> 310 bytes graphics/event_objects/pics/people/hiker/1.png | Bin 0 -> 306 bytes graphics/event_objects/pics/people/hiker/2.png | Bin 0 -> 281 bytes graphics/event_objects/pics/people/hiker/3.png | Bin 0 -> 300 bytes graphics/event_objects/pics/people/hiker/4.png | Bin 0 -> 301 bytes graphics/event_objects/pics/people/hiker/5.png | Bin 0 -> 301 bytes graphics/event_objects/pics/people/hiker/6.png | Bin 0 -> 299 bytes graphics/event_objects/pics/people/hiker/7.png | Bin 0 -> 285 bytes graphics/event_objects/pics/people/hiker/8.png | Bin 0 -> 281 bytes .../pics/people/hot_springs_old_woman/0.png | Bin 0 -> 226 bytes .../pics/people/hot_springs_old_woman/1.png | Bin 0 -> 216 bytes .../pics/people/hot_springs_old_woman/2.png | Bin 0 -> 222 bytes .../pics/people/hot_springs_old_woman/3.png | Bin 0 -> 220 bytes .../pics/people/hot_springs_old_woman/4.png | Bin 0 -> 220 bytes .../pics/people/hot_springs_old_woman/5.png | Bin 0 -> 211 bytes .../pics/people/hot_springs_old_woman/6.png | Bin 0 -> 211 bytes .../pics/people/hot_springs_old_woman/7.png | Bin 0 -> 218 bytes .../pics/people/hot_springs_old_woman/8.png | Bin 0 -> 218 bytes graphics/event_objects/pics/people/juan/0.png | Bin 0 -> 291 bytes graphics/event_objects/pics/people/juan/1.png | Bin 0 -> 259 bytes graphics/event_objects/pics/people/juan/2.png | Bin 0 -> 254 bytes graphics/event_objects/pics/people/juan/3.png | Bin 0 -> 284 bytes graphics/event_objects/pics/people/juan/4.png | Bin 0 -> 282 bytes graphics/event_objects/pics/people/juan/5.png | Bin 0 -> 259 bytes graphics/event_objects/pics/people/juan/6.png | Bin 0 -> 255 bytes graphics/event_objects/pics/people/juan/7.png | Bin 0 -> 261 bytes graphics/event_objects/pics/people/juan/8.png | Bin 0 -> 261 bytes graphics/event_objects/pics/people/lass/0.png | Bin 0 -> 297 bytes graphics/event_objects/pics/people/lass/1.png | Bin 0 -> 293 bytes graphics/event_objects/pics/people/lass/2.png | Bin 0 -> 260 bytes graphics/event_objects/pics/people/lass/3.png | Bin 0 -> 290 bytes graphics/event_objects/pics/people/lass/4.png | Bin 0 -> 290 bytes graphics/event_objects/pics/people/lass/5.png | Bin 0 -> 284 bytes graphics/event_objects/pics/people/lass/6.png | Bin 0 -> 284 bytes graphics/event_objects/pics/people/lass/7.png | Bin 0 -> 263 bytes graphics/event_objects/pics/people/lass/8.png | Bin 0 -> 267 bytes graphics/event_objects/pics/people/leaf/0.png | Bin 0 -> 293 bytes graphics/event_objects/pics/people/leaf/1.png | Bin 0 -> 293 bytes graphics/event_objects/pics/people/leaf/2.png | Bin 0 -> 273 bytes graphics/event_objects/pics/people/leaf/3.png | Bin 0 -> 287 bytes graphics/event_objects/pics/people/leaf/4.png | Bin 0 -> 285 bytes graphics/event_objects/pics/people/leaf/5.png | Bin 0 -> 287 bytes graphics/event_objects/pics/people/leaf/6.png | Bin 0 -> 283 bytes graphics/event_objects/pics/people/leaf/7.png | Bin 0 -> 279 bytes graphics/event_objects/pics/people/leaf/8.png | Bin 0 -> 277 bytes .../event_objects/pics/people/little_boy_1/0.png | Bin 0 -> 232 bytes .../event_objects/pics/people/little_boy_1/1.png | Bin 0 -> 228 bytes .../event_objects/pics/people/little_boy_1/2.png | Bin 0 -> 221 bytes .../event_objects/pics/people/little_boy_1/3.png | Bin 0 -> 227 bytes .../event_objects/pics/people/little_boy_1/4.png | Bin 0 -> 226 bytes .../event_objects/pics/people/little_boy_1/5.png | Bin 0 -> 224 bytes .../event_objects/pics/people/little_boy_1/6.png | Bin 0 -> 223 bytes .../event_objects/pics/people/little_boy_1/7.png | Bin 0 -> 226 bytes .../event_objects/pics/people/little_boy_1/8.png | Bin 0 -> 222 bytes .../event_objects/pics/people/little_boy_2/0.png | Bin 0 -> 232 bytes .../event_objects/pics/people/little_boy_2/1.png | Bin 0 -> 230 bytes .../event_objects/pics/people/little_boy_2/2.png | Bin 0 -> 220 bytes .../event_objects/pics/people/little_boy_2/3.png | Bin 0 -> 226 bytes .../event_objects/pics/people/little_boy_2/4.png | Bin 0 -> 227 bytes .../event_objects/pics/people/little_boy_2/5.png | Bin 0 -> 225 bytes .../event_objects/pics/people/little_boy_2/6.png | Bin 0 -> 226 bytes .../event_objects/pics/people/little_boy_2/7.png | Bin 0 -> 222 bytes .../event_objects/pics/people/little_boy_2/8.png | Bin 0 -> 221 bytes .../event_objects/pics/people/little_girl_1/0.png | Bin 0 -> 250 bytes .../event_objects/pics/people/little_girl_1/1.png | Bin 0 -> 245 bytes .../event_objects/pics/people/little_girl_1/2.png | Bin 0 -> 241 bytes .../event_objects/pics/people/little_girl_1/3.png | Bin 0 -> 252 bytes .../event_objects/pics/people/little_girl_1/4.png | Bin 0 -> 252 bytes .../event_objects/pics/people/little_girl_1/5.png | Bin 0 -> 247 bytes .../event_objects/pics/people/little_girl_1/6.png | Bin 0 -> 248 bytes .../event_objects/pics/people/little_girl_1/7.png | Bin 0 -> 246 bytes .../event_objects/pics/people/little_girl_1/8.png | Bin 0 -> 246 bytes .../event_objects/pics/people/little_girl_2/0.png | Bin 0 -> 239 bytes .../event_objects/pics/people/little_girl_2/1.png | Bin 0 -> 232 bytes .../event_objects/pics/people/little_girl_2/2.png | Bin 0 -> 227 bytes .../event_objects/pics/people/little_girl_2/3.png | Bin 0 -> 233 bytes .../event_objects/pics/people/little_girl_2/4.png | Bin 0 -> 234 bytes .../event_objects/pics/people/little_girl_2/5.png | Bin 0 -> 229 bytes .../event_objects/pics/people/little_girl_2/6.png | Bin 0 -> 229 bytes .../event_objects/pics/people/little_girl_2/7.png | Bin 0 -> 224 bytes .../event_objects/pics/people/little_girl_2/8.png | Bin 0 -> 223 bytes graphics/event_objects/pics/people/liza/0.png | Bin 0 -> 278 bytes graphics/event_objects/pics/people/liza/1.png | Bin 0 -> 265 bytes graphics/event_objects/pics/people/liza/2.png | Bin 0 -> 267 bytes graphics/event_objects/pics/people/lucy/0.png | Bin 0 -> 284 bytes graphics/event_objects/pics/people/lucy/1.png | Bin 0 -> 242 bytes graphics/event_objects/pics/people/lucy/2.png | Bin 0 -> 254 bytes graphics/event_objects/pics/people/lucy/3.png | Bin 0 -> 270 bytes graphics/event_objects/pics/people/lucy/4.png | Bin 0 -> 272 bytes graphics/event_objects/pics/people/lucy/5.png | Bin 0 -> 228 bytes graphics/event_objects/pics/people/lucy/6.png | Bin 0 -> 231 bytes graphics/event_objects/pics/people/lucy/7.png | Bin 0 -> 262 bytes graphics/event_objects/pics/people/lucy/8.png | Bin 0 -> 264 bytes .../event_objects/pics/people/magma_member_f/0.png | Bin 0 -> 295 bytes .../event_objects/pics/people/magma_member_f/1.png | Bin 0 -> 283 bytes .../event_objects/pics/people/magma_member_f/2.png | Bin 0 -> 259 bytes .../event_objects/pics/people/magma_member_f/3.png | Bin 0 -> 282 bytes .../event_objects/pics/people/magma_member_f/4.png | Bin 0 -> 279 bytes .../event_objects/pics/people/magma_member_f/5.png | Bin 0 -> 272 bytes .../event_objects/pics/people/magma_member_f/6.png | Bin 0 -> 272 bytes .../event_objects/pics/people/magma_member_f/7.png | Bin 0 -> 262 bytes .../event_objects/pics/people/magma_member_f/8.png | Bin 0 -> 262 bytes .../event_objects/pics/people/magma_member_m/0.png | Bin 0 -> 289 bytes .../event_objects/pics/people/magma_member_m/1.png | Bin 0 -> 271 bytes .../event_objects/pics/people/magma_member_m/2.png | Bin 0 -> 255 bytes .../event_objects/pics/people/magma_member_m/3.png | Bin 0 -> 277 bytes .../event_objects/pics/people/magma_member_m/4.png | Bin 0 -> 278 bytes .../event_objects/pics/people/magma_member_m/5.png | Bin 0 -> 263 bytes .../event_objects/pics/people/magma_member_m/6.png | Bin 0 -> 262 bytes .../event_objects/pics/people/magma_member_m/7.png | Bin 0 -> 256 bytes .../event_objects/pics/people/magma_member_m/8.png | Bin 0 -> 262 bytes graphics/event_objects/pics/people/man_1/0.png | Bin 0 -> 283 bytes graphics/event_objects/pics/people/man_1/1.png | Bin 0 -> 281 bytes graphics/event_objects/pics/people/man_1/2.png | Bin 0 -> 256 bytes graphics/event_objects/pics/people/man_1/3.png | Bin 0 -> 272 bytes graphics/event_objects/pics/people/man_1/4.png | Bin 0 -> 270 bytes graphics/event_objects/pics/people/man_1/5.png | Bin 0 -> 267 bytes graphics/event_objects/pics/people/man_1/6.png | Bin 0 -> 266 bytes graphics/event_objects/pics/people/man_1/7.png | Bin 0 -> 260 bytes graphics/event_objects/pics/people/man_1/8.png | Bin 0 -> 261 bytes graphics/event_objects/pics/people/man_2/0.png | Bin 0 -> 298 bytes graphics/event_objects/pics/people/man_2/1.png | Bin 0 -> 271 bytes graphics/event_objects/pics/people/man_2/2.png | Bin 0 -> 257 bytes graphics/event_objects/pics/people/man_2/3.png | Bin 0 -> 281 bytes graphics/event_objects/pics/people/man_2/4.png | Bin 0 -> 281 bytes graphics/event_objects/pics/people/man_2/5.png | Bin 0 -> 261 bytes graphics/event_objects/pics/people/man_2/6.png | Bin 0 -> 261 bytes graphics/event_objects/pics/people/man_2/7.png | Bin 0 -> 267 bytes graphics/event_objects/pics/people/man_2/8.png | Bin 0 -> 263 bytes graphics/event_objects/pics/people/man_3/0.png | Bin 0 -> 296 bytes graphics/event_objects/pics/people/man_3/1.png | Bin 0 -> 286 bytes graphics/event_objects/pics/people/man_3/2.png | Bin 0 -> 258 bytes graphics/event_objects/pics/people/man_3/3.png | Bin 0 -> 284 bytes graphics/event_objects/pics/people/man_3/4.png | Bin 0 -> 283 bytes graphics/event_objects/pics/people/man_3/5.png | Bin 0 -> 275 bytes graphics/event_objects/pics/people/man_3/6.png | Bin 0 -> 274 bytes graphics/event_objects/pics/people/man_3/7.png | Bin 0 -> 266 bytes graphics/event_objects/pics/people/man_3/8.png | Bin 0 -> 268 bytes graphics/event_objects/pics/people/man_4/0.png | Bin 0 -> 295 bytes graphics/event_objects/pics/people/man_4/1.png | Bin 0 -> 285 bytes graphics/event_objects/pics/people/man_4/2.png | Bin 0 -> 259 bytes graphics/event_objects/pics/people/man_4/3.png | Bin 0 -> 283 bytes graphics/event_objects/pics/people/man_4/4.png | Bin 0 -> 284 bytes graphics/event_objects/pics/people/man_4/5.png | Bin 0 -> 277 bytes graphics/event_objects/pics/people/man_4/6.png | Bin 0 -> 279 bytes graphics/event_objects/pics/people/man_4/7.png | Bin 0 -> 266 bytes graphics/event_objects/pics/people/man_4/8.png | Bin 0 -> 264 bytes graphics/event_objects/pics/people/man_5/0.png | Bin 0 -> 291 bytes graphics/event_objects/pics/people/man_5/1.png | Bin 0 -> 281 bytes graphics/event_objects/pics/people/man_5/2.png | Bin 0 -> 253 bytes graphics/event_objects/pics/people/man_5/3.png | Bin 0 -> 277 bytes graphics/event_objects/pics/people/man_5/4.png | Bin 0 -> 276 bytes graphics/event_objects/pics/people/man_5/5.png | Bin 0 -> 268 bytes graphics/event_objects/pics/people/man_5/6.png | Bin 0 -> 267 bytes graphics/event_objects/pics/people/man_5/7.png | Bin 0 -> 256 bytes graphics/event_objects/pics/people/man_5/8.png | Bin 0 -> 257 bytes graphics/event_objects/pics/people/man_6/0.png | Bin 0 -> 304 bytes graphics/event_objects/pics/people/man_6/1.png | Bin 0 -> 298 bytes graphics/event_objects/pics/people/man_6/2.png | Bin 0 -> 260 bytes graphics/event_objects/pics/people/man_6/3.png | Bin 0 -> 287 bytes graphics/event_objects/pics/people/man_6/4.png | Bin 0 -> 287 bytes graphics/event_objects/pics/people/man_6/5.png | Bin 0 -> 284 bytes graphics/event_objects/pics/people/man_6/6.png | Bin 0 -> 285 bytes graphics/event_objects/pics/people/man_6/7.png | Bin 0 -> 267 bytes graphics/event_objects/pics/people/man_6/8.png | Bin 0 -> 266 bytes graphics/event_objects/pics/people/man_7/0.png | Bin 0 -> 298 bytes graphics/event_objects/pics/people/man_7/1.png | Bin 0 -> 271 bytes graphics/event_objects/pics/people/man_7/2.png | Bin 0 -> 257 bytes graphics/event_objects/pics/people/man_7/3.png | Bin 0 -> 281 bytes graphics/event_objects/pics/people/man_7/4.png | Bin 0 -> 281 bytes graphics/event_objects/pics/people/man_7/5.png | Bin 0 -> 261 bytes graphics/event_objects/pics/people/man_7/6.png | Bin 0 -> 261 bytes graphics/event_objects/pics/people/man_7/7.png | Bin 0 -> 267 bytes graphics/event_objects/pics/people/man_7/8.png | Bin 0 -> 263 bytes graphics/event_objects/pics/people/maniac/0.png | Bin 0 -> 288 bytes graphics/event_objects/pics/people/maniac/1.png | Bin 0 -> 266 bytes graphics/event_objects/pics/people/maniac/2.png | Bin 0 -> 256 bytes graphics/event_objects/pics/people/maniac/3.png | Bin 0 -> 277 bytes graphics/event_objects/pics/people/maniac/4.png | Bin 0 -> 279 bytes graphics/event_objects/pics/people/maniac/5.png | Bin 0 -> 259 bytes graphics/event_objects/pics/people/maniac/6.png | Bin 0 -> 257 bytes graphics/event_objects/pics/people/maniac/7.png | Bin 0 -> 263 bytes graphics/event_objects/pics/people/maniac/8.png | Bin 0 -> 259 bytes .../event_objects/pics/people/mart_employee/0.png | Bin 0 -> 290 bytes .../event_objects/pics/people/mart_employee/1.png | Bin 0 -> 284 bytes .../event_objects/pics/people/mart_employee/2.png | Bin 0 -> 251 bytes .../event_objects/pics/people/mart_employee/3.png | Bin 0 -> 280 bytes .../event_objects/pics/people/mart_employee/4.png | Bin 0 -> 282 bytes .../event_objects/pics/people/mart_employee/5.png | Bin 0 -> 272 bytes .../event_objects/pics/people/mart_employee/6.png | Bin 0 -> 274 bytes .../event_objects/pics/people/mart_employee/7.png | Bin 0 -> 258 bytes .../event_objects/pics/people/mart_employee/8.png | Bin 0 -> 258 bytes .../pics/people/mauville_old_man_1/0.png | Bin 0 -> 301 bytes .../pics/people/mauville_old_man_1/1.png | Bin 0 -> 292 bytes .../pics/people/mauville_old_man_1/2.png | Bin 0 -> 277 bytes .../pics/people/mauville_old_man_1/3.png | Bin 0 -> 297 bytes .../pics/people/mauville_old_man_1/4.png | Bin 0 -> 295 bytes .../pics/people/mauville_old_man_1/5.png | Bin 0 -> 289 bytes .../pics/people/mauville_old_man_1/6.png | Bin 0 -> 287 bytes .../pics/people/mauville_old_man_1/7.png | Bin 0 -> 280 bytes .../pics/people/mauville_old_man_1/8.png | Bin 0 -> 281 bytes .../pics/people/mauville_old_man_2/0.png | Bin 0 -> 297 bytes .../pics/people/mauville_old_man_2/1.png | Bin 0 -> 291 bytes .../pics/people/mauville_old_man_2/2.png | Bin 0 -> 273 bytes .../pics/people/mauville_old_man_2/3.png | Bin 0 -> 293 bytes .../pics/people/mauville_old_man_2/4.png | Bin 0 -> 291 bytes .../pics/people/mauville_old_man_2/5.png | Bin 0 -> 288 bytes .../pics/people/mauville_old_man_2/6.png | Bin 0 -> 286 bytes .../pics/people/mauville_old_man_2/7.png | Bin 0 -> 277 bytes .../pics/people/mauville_old_man_2/8.png | Bin 0 -> 278 bytes graphics/event_objects/pics/people/maxie/0.png | Bin 0 -> 291 bytes graphics/event_objects/pics/people/maxie/1.png | Bin 0 -> 273 bytes graphics/event_objects/pics/people/maxie/2.png | Bin 0 -> 261 bytes graphics/event_objects/pics/people/maxie/3.png | Bin 0 -> 291 bytes graphics/event_objects/pics/people/maxie/4.png | Bin 0 -> 292 bytes graphics/event_objects/pics/people/maxie/5.png | Bin 0 -> 266 bytes graphics/event_objects/pics/people/maxie/6.png | Bin 0 -> 267 bytes graphics/event_objects/pics/people/maxie/7.png | Bin 0 -> 261 bytes graphics/event_objects/pics/people/maxie/8.png | Bin 0 -> 257 bytes .../event_objects/pics/people/may/acro_bike/00.png | Bin 0 -> 302 bytes .../event_objects/pics/people/may/acro_bike/01.png | Bin 0 -> 297 bytes .../event_objects/pics/people/may/acro_bike/02.png | Bin 0 -> 339 bytes .../event_objects/pics/people/may/acro_bike/03.png | Bin 0 -> 304 bytes .../event_objects/pics/people/may/acro_bike/04.png | Bin 0 -> 305 bytes .../event_objects/pics/people/may/acro_bike/05.png | Bin 0 -> 299 bytes .../event_objects/pics/people/may/acro_bike/06.png | Bin 0 -> 299 bytes .../event_objects/pics/people/may/acro_bike/07.png | Bin 0 -> 336 bytes .../event_objects/pics/people/may/acro_bike/08.png | Bin 0 -> 340 bytes .../event_objects/pics/people/may/acro_bike/09.png | Bin 0 -> 301 bytes .../event_objects/pics/people/may/acro_bike/10.png | Bin 0 -> 313 bytes .../event_objects/pics/people/may/acro_bike/11.png | Bin 0 -> 291 bytes .../event_objects/pics/people/may/acro_bike/12.png | Bin 0 -> 281 bytes .../event_objects/pics/people/may/acro_bike/13.png | Bin 0 -> 297 bytes .../event_objects/pics/people/may/acro_bike/14.png | Bin 0 -> 295 bytes .../event_objects/pics/people/may/acro_bike/15.png | Bin 0 -> 283 bytes .../event_objects/pics/people/may/acro_bike/16.png | Bin 0 -> 284 bytes .../event_objects/pics/people/may/acro_bike/17.png | Bin 0 -> 331 bytes .../event_objects/pics/people/may/acro_bike/18.png | Bin 0 -> 333 bytes .../event_objects/pics/people/may/acro_bike/19.png | Bin 0 -> 334 bytes .../event_objects/pics/people/may/acro_bike/20.png | Bin 0 -> 335 bytes .../event_objects/pics/people/may/acro_bike/21.png | Bin 0 -> 314 bytes .../event_objects/pics/people/may/acro_bike/22.png | Bin 0 -> 315 bytes .../event_objects/pics/people/may/acro_bike/23.png | Bin 0 -> 302 bytes .../event_objects/pics/people/may/acro_bike/24.png | Bin 0 -> 303 bytes .../event_objects/pics/people/may/acro_bike/25.png | Bin 0 -> 337 bytes .../event_objects/pics/people/may/acro_bike/26.png | Bin 0 -> 341 bytes .../event_objects/pics/people/may/decorating.png | Bin 0 -> 279 bytes .../event_objects/pics/people/may/field_move/0.png | Bin 0 -> 295 bytes .../event_objects/pics/people/may/field_move/1.png | Bin 0 -> 295 bytes .../event_objects/pics/people/may/field_move/2.png | Bin 0 -> 293 bytes .../event_objects/pics/people/may/field_move/3.png | Bin 0 -> 324 bytes .../event_objects/pics/people/may/field_move/4.png | Bin 0 -> 327 bytes .../event_objects/pics/people/may/fishing/00.png | Bin 0 -> 298 bytes .../event_objects/pics/people/may/fishing/01.png | Bin 0 -> 291 bytes .../event_objects/pics/people/may/fishing/02.png | Bin 0 -> 294 bytes .../event_objects/pics/people/may/fishing/03.png | Bin 0 -> 291 bytes .../event_objects/pics/people/may/fishing/04.png | Bin 0 -> 302 bytes .../event_objects/pics/people/may/fishing/05.png | Bin 0 -> 304 bytes .../event_objects/pics/people/may/fishing/06.png | Bin 0 -> 310 bytes .../event_objects/pics/people/may/fishing/07.png | Bin 0 -> 301 bytes .../event_objects/pics/people/may/fishing/08.png | Bin 0 -> 295 bytes .../event_objects/pics/people/may/fishing/09.png | Bin 0 -> 302 bytes .../event_objects/pics/people/may/fishing/10.png | Bin 0 -> 301 bytes .../event_objects/pics/people/may/fishing/11.png | Bin 0 -> 313 bytes .../event_objects/pics/people/may/mach_bike/0.png | Bin 0 -> 302 bytes .../event_objects/pics/people/may/mach_bike/1.png | Bin 0 -> 297 bytes .../event_objects/pics/people/may/mach_bike/2.png | Bin 0 -> 339 bytes .../event_objects/pics/people/may/mach_bike/3.png | Bin 0 -> 304 bytes .../event_objects/pics/people/may/mach_bike/4.png | Bin 0 -> 305 bytes .../event_objects/pics/people/may/mach_bike/5.png | Bin 0 -> 299 bytes .../event_objects/pics/people/may/mach_bike/6.png | Bin 0 -> 299 bytes .../event_objects/pics/people/may/mach_bike/7.png | Bin 0 -> 336 bytes .../event_objects/pics/people/may/mach_bike/8.png | Bin 0 -> 340 bytes .../event_objects/pics/people/may/normal/00.png | Bin 0 -> 297 bytes .../event_objects/pics/people/may/normal/01.png | Bin 0 -> 294 bytes .../event_objects/pics/people/may/normal/02.png | Bin 0 -> 265 bytes .../event_objects/pics/people/may/normal/03.png | Bin 0 -> 289 bytes .../event_objects/pics/people/may/normal/04.png | Bin 0 -> 287 bytes .../event_objects/pics/people/may/normal/05.png | Bin 0 -> 286 bytes .../event_objects/pics/people/may/normal/06.png | Bin 0 -> 285 bytes .../event_objects/pics/people/may/normal/07.png | Bin 0 -> 271 bytes .../event_objects/pics/people/may/normal/08.png | Bin 0 -> 270 bytes .../event_objects/pics/people/may/normal/09.png | Bin 0 -> 283 bytes .../event_objects/pics/people/may/normal/10.png | Bin 0 -> 291 bytes .../event_objects/pics/people/may/normal/11.png | Bin 0 -> 262 bytes .../event_objects/pics/people/may/normal/12.png | Bin 0 -> 276 bytes .../event_objects/pics/people/may/normal/13.png | Bin 0 -> 275 bytes .../event_objects/pics/people/may/normal/14.png | Bin 0 -> 286 bytes .../event_objects/pics/people/may/normal/15.png | Bin 0 -> 284 bytes .../event_objects/pics/people/may/normal/16.png | Bin 0 -> 277 bytes .../event_objects/pics/people/may/normal/17.png | Bin 0 -> 280 bytes .../event_objects/pics/people/may/surfing/0.png | Bin 0 -> 300 bytes .../event_objects/pics/people/may/surfing/1.png | Bin 0 -> 291 bytes .../event_objects/pics/people/may/surfing/2.png | Bin 0 -> 284 bytes .../event_objects/pics/people/may/surfing/3.png | Bin 0 -> 303 bytes .../event_objects/pics/people/may/surfing/4.png | Bin 0 -> 296 bytes .../event_objects/pics/people/may/surfing/5.png | Bin 0 -> 287 bytes .../event_objects/pics/people/may/underwater/0.png | Bin 0 -> 290 bytes .../event_objects/pics/people/may/underwater/1.png | Bin 0 -> 283 bytes .../event_objects/pics/people/may/underwater/2.png | Bin 0 -> 286 bytes .../event_objects/pics/people/may/underwater/3.png | Bin 0 -> 285 bytes .../event_objects/pics/people/may/watering/0.png | Bin 0 -> 300 bytes .../event_objects/pics/people/may/watering/1.png | Bin 0 -> 292 bytes .../event_objects/pics/people/may/watering/2.png | Bin 0 -> 306 bytes .../event_objects/pics/people/may/watering/3.png | Bin 0 -> 305 bytes .../event_objects/pics/people/may/watering/4.png | Bin 0 -> 294 bytes .../event_objects/pics/people/may/watering/5.png | Bin 0 -> 306 bytes graphics/event_objects/pics/people/mom/0.png | Bin 0 -> 289 bytes graphics/event_objects/pics/people/mom/1.png | Bin 0 -> 265 bytes graphics/event_objects/pics/people/mom/2.png | Bin 0 -> 250 bytes graphics/event_objects/pics/people/mom/3.png | Bin 0 -> 281 bytes graphics/event_objects/pics/people/mom/4.png | Bin 0 -> 283 bytes graphics/event_objects/pics/people/mom/5.png | Bin 0 -> 253 bytes graphics/event_objects/pics/people/mom/6.png | Bin 0 -> 250 bytes graphics/event_objects/pics/people/mom/7.png | Bin 0 -> 253 bytes graphics/event_objects/pics/people/mom/8.png | Bin 0 -> 257 bytes .../pics/people/mystery_event_deliveryman/0.png | Bin 0 -> 286 bytes .../pics/people/mystery_event_deliveryman/1.png | Bin 0 -> 261 bytes .../pics/people/mystery_event_deliveryman/2.png | Bin 0 -> 259 bytes graphics/event_objects/pics/people/noland/0.png | Bin 0 -> 291 bytes graphics/event_objects/pics/people/noland/1.png | Bin 0 -> 278 bytes graphics/event_objects/pics/people/noland/2.png | Bin 0 -> 266 bytes graphics/event_objects/pics/people/noland/3.png | Bin 0 -> 277 bytes graphics/event_objects/pics/people/noland/4.png | Bin 0 -> 277 bytes graphics/event_objects/pics/people/noland/5.png | Bin 0 -> 267 bytes graphics/event_objects/pics/people/noland/6.png | Bin 0 -> 267 bytes graphics/event_objects/pics/people/noland/7.png | Bin 0 -> 271 bytes graphics/event_objects/pics/people/noland/8.png | Bin 0 -> 271 bytes graphics/event_objects/pics/people/norman/0.png | Bin 0 -> 287 bytes graphics/event_objects/pics/people/norman/1.png | Bin 0 -> 268 bytes graphics/event_objects/pics/people/norman/2.png | Bin 0 -> 256 bytes graphics/event_objects/pics/people/norman/3.png | Bin 0 -> 280 bytes graphics/event_objects/pics/people/norman/4.png | Bin 0 -> 282 bytes graphics/event_objects/pics/people/norman/5.png | Bin 0 -> 261 bytes graphics/event_objects/pics/people/norman/6.png | Bin 0 -> 261 bytes graphics/event_objects/pics/people/norman/7.png | Bin 0 -> 260 bytes graphics/event_objects/pics/people/norman/8.png | Bin 0 -> 259 bytes graphics/event_objects/pics/people/nurse/0.png | Bin 0 -> 300 bytes graphics/event_objects/pics/people/nurse/1.png | Bin 0 -> 294 bytes graphics/event_objects/pics/people/nurse/2.png | Bin 0 -> 277 bytes graphics/event_objects/pics/people/nurse/3.png | Bin 0 -> 288 bytes graphics/event_objects/pics/people/old_man_1/0.png | Bin 0 -> 291 bytes graphics/event_objects/pics/people/old_man_1/1.png | Bin 0 -> 284 bytes graphics/event_objects/pics/people/old_man_1/2.png | Bin 0 -> 255 bytes graphics/event_objects/pics/people/old_man_1/3.png | Bin 0 -> 284 bytes graphics/event_objects/pics/people/old_man_1/4.png | Bin 0 -> 285 bytes graphics/event_objects/pics/people/old_man_1/5.png | Bin 0 -> 277 bytes graphics/event_objects/pics/people/old_man_1/6.png | Bin 0 -> 278 bytes graphics/event_objects/pics/people/old_man_1/7.png | Bin 0 -> 260 bytes graphics/event_objects/pics/people/old_man_1/8.png | Bin 0 -> 259 bytes graphics/event_objects/pics/people/old_man_2/0.png | Bin 0 -> 292 bytes graphics/event_objects/pics/people/old_man_2/1.png | Bin 0 -> 289 bytes graphics/event_objects/pics/people/old_man_2/2.png | Bin 0 -> 265 bytes .../event_objects/pics/people/old_woman_1/0.png | Bin 0 -> 273 bytes .../event_objects/pics/people/old_woman_1/1.png | Bin 0 -> 270 bytes .../event_objects/pics/people/old_woman_1/2.png | Bin 0 -> 258 bytes .../event_objects/pics/people/old_woman_1/3.png | Bin 0 -> 267 bytes .../event_objects/pics/people/old_woman_1/4.png | Bin 0 -> 269 bytes .../event_objects/pics/people/old_woman_1/5.png | Bin 0 -> 267 bytes .../event_objects/pics/people/old_woman_1/6.png | Bin 0 -> 268 bytes .../event_objects/pics/people/old_woman_1/7.png | Bin 0 -> 259 bytes .../event_objects/pics/people/old_woman_1/8.png | Bin 0 -> 259 bytes .../event_objects/pics/people/old_woman_2/0.png | Bin 0 -> 280 bytes .../event_objects/pics/people/old_woman_2/1.png | Bin 0 -> 267 bytes .../event_objects/pics/people/old_woman_2/2.png | Bin 0 -> 262 bytes .../event_objects/pics/people/old_woman_2/3.png | Bin 0 -> 272 bytes .../event_objects/pics/people/old_woman_2/4.png | Bin 0 -> 274 bytes .../event_objects/pics/people/old_woman_2/5.png | Bin 0 -> 259 bytes .../event_objects/pics/people/old_woman_2/6.png | Bin 0 -> 260 bytes .../event_objects/pics/people/old_woman_2/7.png | Bin 0 -> 266 bytes .../event_objects/pics/people/old_woman_2/8.png | Bin 0 -> 265 bytes graphics/event_objects/pics/people/phoebe/0.png | Bin 0 -> 288 bytes graphics/event_objects/pics/people/phoebe/1.png | Bin 0 -> 279 bytes graphics/event_objects/pics/people/phoebe/2.png | Bin 0 -> 258 bytes graphics/event_objects/pics/people/picnicker/0.png | Bin 0 -> 300 bytes graphics/event_objects/pics/people/picnicker/1.png | Bin 0 -> 301 bytes graphics/event_objects/pics/people/picnicker/2.png | Bin 0 -> 267 bytes graphics/event_objects/pics/people/picnicker/3.png | Bin 0 -> 285 bytes graphics/event_objects/pics/people/picnicker/4.png | Bin 0 -> 286 bytes graphics/event_objects/pics/people/picnicker/5.png | Bin 0 -> 283 bytes graphics/event_objects/pics/people/picnicker/6.png | Bin 0 -> 288 bytes graphics/event_objects/pics/people/picnicker/7.png | Bin 0 -> 273 bytes graphics/event_objects/pics/people/picnicker/8.png | Bin 0 -> 274 bytes .../event_objects/pics/people/prof_birch/0.png | Bin 0 -> 301 bytes .../event_objects/pics/people/prof_birch/1.png | Bin 0 -> 284 bytes .../event_objects/pics/people/prof_birch/2.png | Bin 0 -> 266 bytes .../event_objects/pics/people/prof_birch/3.png | Bin 0 -> 295 bytes .../event_objects/pics/people/prof_birch/4.png | Bin 0 -> 293 bytes .../event_objects/pics/people/prof_birch/5.png | Bin 0 -> 279 bytes .../event_objects/pics/people/prof_birch/6.png | Bin 0 -> 279 bytes .../event_objects/pics/people/prof_birch/7.png | Bin 0 -> 273 bytes .../event_objects/pics/people/prof_birch/8.png | Bin 0 -> 271 bytes graphics/event_objects/pics/people/psychic_m/0.png | Bin 0 -> 286 bytes graphics/event_objects/pics/people/psychic_m/1.png | Bin 0 -> 276 bytes graphics/event_objects/pics/people/psychic_m/2.png | Bin 0 -> 262 bytes graphics/event_objects/pics/people/psychic_m/3.png | Bin 0 -> 280 bytes graphics/event_objects/pics/people/psychic_m/4.png | Bin 0 -> 280 bytes graphics/event_objects/pics/people/psychic_m/5.png | Bin 0 -> 269 bytes graphics/event_objects/pics/people/psychic_m/6.png | Bin 0 -> 267 bytes graphics/event_objects/pics/people/psychic_m/7.png | Bin 0 -> 266 bytes graphics/event_objects/pics/people/psychic_m/8.png | Bin 0 -> 264 bytes .../event_objects/pics/people/quinty_plump/0.png | Bin 0 -> 391 bytes .../event_objects/pics/people/quinty_plump/1.png | Bin 0 -> 363 bytes .../event_objects/pics/people/quinty_plump/2.png | Bin 0 -> 343 bytes .../event_objects/pics/people/quinty_plump/3.png | Bin 0 -> 385 bytes .../event_objects/pics/people/quinty_plump/4.png | Bin 0 -> 357 bytes .../event_objects/pics/people/quinty_plump/5.png | Bin 0 -> 363 bytes .../event_objects/pics/people/quinty_plump/6.png | Bin 0 -> 350 bytes graphics/event_objects/pics/people/red/0.png | Bin 0 -> 282 bytes graphics/event_objects/pics/people/red/1.png | Bin 0 -> 270 bytes graphics/event_objects/pics/people/red/2.png | Bin 0 -> 269 bytes graphics/event_objects/pics/people/red/3.png | Bin 0 -> 275 bytes graphics/event_objects/pics/people/red/4.png | Bin 0 -> 274 bytes graphics/event_objects/pics/people/red/5.png | Bin 0 -> 262 bytes graphics/event_objects/pics/people/red/6.png | Bin 0 -> 261 bytes graphics/event_objects/pics/people/red/7.png | Bin 0 -> 271 bytes graphics/event_objects/pics/people/red/8.png | Bin 0 -> 267 bytes .../event_objects/pics/people/reporter_f/0.png | Bin 0 -> 281 bytes .../event_objects/pics/people/reporter_f/1.png | Bin 0 -> 270 bytes .../event_objects/pics/people/reporter_f/2.png | Bin 0 -> 259 bytes .../event_objects/pics/people/reporter_f/3.png | Bin 0 -> 275 bytes .../event_objects/pics/people/reporter_f/4.png | Bin 0 -> 276 bytes .../event_objects/pics/people/reporter_f/5.png | Bin 0 -> 265 bytes .../event_objects/pics/people/reporter_f/6.png | Bin 0 -> 265 bytes .../event_objects/pics/people/reporter_f/7.png | Bin 0 -> 266 bytes .../event_objects/pics/people/reporter_f/8.png | Bin 0 -> 263 bytes .../event_objects/pics/people/reporter_m/0.png | Bin 0 -> 287 bytes .../event_objects/pics/people/reporter_m/1.png | Bin 0 -> 274 bytes .../event_objects/pics/people/reporter_m/2.png | Bin 0 -> 264 bytes .../event_objects/pics/people/reporter_m/3.png | Bin 0 -> 278 bytes .../event_objects/pics/people/reporter_m/4.png | Bin 0 -> 279 bytes .../event_objects/pics/people/reporter_m/5.png | Bin 0 -> 268 bytes .../event_objects/pics/people/reporter_m/6.png | Bin 0 -> 266 bytes .../event_objects/pics/people/reporter_m/7.png | Bin 0 -> 264 bytes .../event_objects/pics/people/reporter_m/8.png | Bin 0 -> 263 bytes .../pics/people/rooftop_sale_woman/0.png | Bin 0 -> 291 bytes .../pics/people/rooftop_sale_woman/1.png | Bin 0 -> 289 bytes .../pics/people/rooftop_sale_woman/2.png | Bin 0 -> 259 bytes .../pics/people/rooftop_sale_woman/3.png | Bin 0 -> 283 bytes .../pics/people/rooftop_sale_woman/4.png | Bin 0 -> 282 bytes .../pics/people/rooftop_sale_woman/5.png | Bin 0 -> 280 bytes .../pics/people/rooftop_sale_woman/6.png | Bin 0 -> 281 bytes .../pics/people/rooftop_sale_woman/7.png | Bin 0 -> 264 bytes .../pics/people/rooftop_sale_woman/8.png | Bin 0 -> 262 bytes graphics/event_objects/pics/people/roxanne/0.png | Bin 0 -> 302 bytes graphics/event_objects/pics/people/roxanne/1.png | Bin 0 -> 288 bytes graphics/event_objects/pics/people/roxanne/2.png | Bin 0 -> 269 bytes .../pics/people/ruby_sapphire_brendan/00.png | Bin 0 -> 289 bytes .../pics/people/ruby_sapphire_brendan/01.png | Bin 0 -> 292 bytes .../pics/people/ruby_sapphire_brendan/02.png | Bin 0 -> 272 bytes .../pics/people/ruby_sapphire_brendan/03.png | Bin 0 -> 280 bytes .../pics/people/ruby_sapphire_brendan/04.png | Bin 0 -> 280 bytes .../pics/people/ruby_sapphire_brendan/05.png | Bin 0 -> 281 bytes .../pics/people/ruby_sapphire_brendan/06.png | Bin 0 -> 280 bytes .../pics/people/ruby_sapphire_brendan/07.png | Bin 0 -> 282 bytes .../pics/people/ruby_sapphire_brendan/08.png | Bin 0 -> 278 bytes .../pics/people/ruby_sapphire_brendan/09.png | Bin 0 -> 275 bytes .../pics/people/ruby_sapphire_brendan/10.png | Bin 0 -> 275 bytes .../pics/people/ruby_sapphire_brendan/11.png | Bin 0 -> 267 bytes .../pics/people/ruby_sapphire_brendan/12.png | Bin 0 -> 270 bytes .../pics/people/ruby_sapphire_brendan/13.png | Bin 0 -> 269 bytes .../pics/people/ruby_sapphire_brendan/14.png | Bin 0 -> 270 bytes .../pics/people/ruby_sapphire_brendan/15.png | Bin 0 -> 270 bytes .../pics/people/ruby_sapphire_brendan/16.png | Bin 0 -> 283 bytes .../pics/people/ruby_sapphire_brendan/17.png | Bin 0 -> 280 bytes .../pics/people/ruby_sapphire_little_boy/0.png | Bin 0 -> 237 bytes .../pics/people/ruby_sapphire_little_boy/1.png | Bin 0 -> 231 bytes .../pics/people/ruby_sapphire_little_boy/2.png | Bin 0 -> 217 bytes .../pics/people/ruby_sapphire_little_boy/3.png | Bin 0 -> 229 bytes .../pics/people/ruby_sapphire_little_boy/4.png | Bin 0 -> 229 bytes .../pics/people/ruby_sapphire_little_boy/5.png | Bin 0 -> 226 bytes .../pics/people/ruby_sapphire_little_boy/6.png | Bin 0 -> 227 bytes .../pics/people/ruby_sapphire_little_boy/7.png | Bin 0 -> 220 bytes .../pics/people/ruby_sapphire_little_boy/8.png | Bin 0 -> 220 bytes .../pics/people/ruby_sapphire_may/00.png | Bin 0 -> 297 bytes .../pics/people/ruby_sapphire_may/01.png | Bin 0 -> 294 bytes .../pics/people/ruby_sapphire_may/02.png | Bin 0 -> 264 bytes .../pics/people/ruby_sapphire_may/03.png | Bin 0 -> 289 bytes .../pics/people/ruby_sapphire_may/04.png | Bin 0 -> 287 bytes .../pics/people/ruby_sapphire_may/05.png | Bin 0 -> 286 bytes .../pics/people/ruby_sapphire_may/06.png | Bin 0 -> 285 bytes .../pics/people/ruby_sapphire_may/07.png | Bin 0 -> 271 bytes .../pics/people/ruby_sapphire_may/08.png | Bin 0 -> 269 bytes .../pics/people/ruby_sapphire_may/09.png | Bin 0 -> 283 bytes .../pics/people/ruby_sapphire_may/10.png | Bin 0 -> 291 bytes .../pics/people/ruby_sapphire_may/11.png | Bin 0 -> 262 bytes .../pics/people/ruby_sapphire_may/12.png | Bin 0 -> 276 bytes .../pics/people/ruby_sapphire_may/13.png | Bin 0 -> 275 bytes .../pics/people/ruby_sapphire_may/14.png | Bin 0 -> 286 bytes .../pics/people/ruby_sapphire_may/15.png | Bin 0 -> 283 bytes .../pics/people/ruby_sapphire_may/16.png | Bin 0 -> 278 bytes .../pics/people/ruby_sapphire_may/17.png | Bin 0 -> 281 bytes .../pics/people/running_triathlete_f/0.png | Bin 0 -> 300 bytes .../pics/people/running_triathlete_f/1.png | Bin 0 -> 284 bytes .../pics/people/running_triathlete_f/2.png | Bin 0 -> 264 bytes .../pics/people/running_triathlete_f/3.png | Bin 0 -> 289 bytes .../pics/people/running_triathlete_f/4.png | Bin 0 -> 289 bytes .../pics/people/running_triathlete_f/5.png | Bin 0 -> 271 bytes .../pics/people/running_triathlete_f/6.png | Bin 0 -> 270 bytes .../pics/people/running_triathlete_f/7.png | Bin 0 -> 265 bytes .../pics/people/running_triathlete_f/8.png | Bin 0 -> 267 bytes .../pics/people/running_triathlete_m/0.png | Bin 0 -> 297 bytes .../pics/people/running_triathlete_m/1.png | Bin 0 -> 288 bytes .../pics/people/running_triathlete_m/2.png | Bin 0 -> 257 bytes .../pics/people/running_triathlete_m/3.png | Bin 0 -> 284 bytes .../pics/people/running_triathlete_m/4.png | Bin 0 -> 283 bytes .../pics/people/running_triathlete_m/5.png | Bin 0 -> 276 bytes .../pics/people/running_triathlete_m/6.png | Bin 0 -> 274 bytes .../pics/people/running_triathlete_m/7.png | Bin 0 -> 260 bytes .../pics/people/running_triathlete_m/8.png | Bin 0 -> 262 bytes graphics/event_objects/pics/people/sailor/0.png | Bin 0 -> 294 bytes graphics/event_objects/pics/people/sailor/1.png | Bin 0 -> 286 bytes graphics/event_objects/pics/people/sailor/2.png | Bin 0 -> 274 bytes graphics/event_objects/pics/people/sailor/3.png | Bin 0 -> 288 bytes graphics/event_objects/pics/people/sailor/4.png | Bin 0 -> 288 bytes graphics/event_objects/pics/people/sailor/5.png | Bin 0 -> 280 bytes graphics/event_objects/pics/people/sailor/6.png | Bin 0 -> 280 bytes graphics/event_objects/pics/people/sailor/7.png | Bin 0 -> 278 bytes graphics/event_objects/pics/people/sailor/8.png | Bin 0 -> 276 bytes .../event_objects/pics/people/school_kid_m/0.png | Bin 0 -> 283 bytes .../event_objects/pics/people/school_kid_m/1.png | Bin 0 -> 274 bytes .../event_objects/pics/people/school_kid_m/2.png | Bin 0 -> 249 bytes .../event_objects/pics/people/school_kid_m/3.png | Bin 0 -> 278 bytes .../event_objects/pics/people/school_kid_m/4.png | Bin 0 -> 276 bytes .../event_objects/pics/people/school_kid_m/5.png | Bin 0 -> 260 bytes .../event_objects/pics/people/school_kid_m/6.png | Bin 0 -> 263 bytes .../event_objects/pics/people/school_kid_m/7.png | Bin 0 -> 257 bytes .../event_objects/pics/people/school_kid_m/8.png | Bin 0 -> 260 bytes .../event_objects/pics/people/scientist_1/0.png | Bin 0 -> 295 bytes .../event_objects/pics/people/scientist_1/1.png | Bin 0 -> 277 bytes .../event_objects/pics/people/scientist_1/2.png | Bin 0 -> 256 bytes .../event_objects/pics/people/scientist_1/3.png | Bin 0 -> 282 bytes .../event_objects/pics/people/scientist_1/4.png | Bin 0 -> 282 bytes .../event_objects/pics/people/scientist_1/5.png | Bin 0 -> 265 bytes .../event_objects/pics/people/scientist_1/6.png | Bin 0 -> 265 bytes .../event_objects/pics/people/scientist_1/7.png | Bin 0 -> 258 bytes .../event_objects/pics/people/scientist_1/8.png | Bin 0 -> 259 bytes .../event_objects/pics/people/scientist_2/0.png | Bin 0 -> 297 bytes .../event_objects/pics/people/scientist_2/1.png | Bin 0 -> 278 bytes .../event_objects/pics/people/scientist_2/2.png | Bin 0 -> 257 bytes .../event_objects/pics/people/scientist_2/3.png | Bin 0 -> 283 bytes .../event_objects/pics/people/scientist_2/4.png | Bin 0 -> 284 bytes .../event_objects/pics/people/scientist_2/5.png | Bin 0 -> 267 bytes .../event_objects/pics/people/scientist_2/6.png | Bin 0 -> 267 bytes .../event_objects/pics/people/scientist_2/7.png | Bin 0 -> 258 bytes .../event_objects/pics/people/scientist_2/8.png | Bin 0 -> 260 bytes graphics/event_objects/pics/people/scott/0.png | Bin 0 -> 292 bytes graphics/event_objects/pics/people/scott/1.png | Bin 0 -> 286 bytes graphics/event_objects/pics/people/scott/2.png | Bin 0 -> 261 bytes graphics/event_objects/pics/people/scott/3.png | Bin 0 -> 283 bytes graphics/event_objects/pics/people/scott/4.png | Bin 0 -> 286 bytes graphics/event_objects/pics/people/scott/5.png | Bin 0 -> 280 bytes graphics/event_objects/pics/people/scott/6.png | Bin 0 -> 279 bytes graphics/event_objects/pics/people/scott/7.png | Bin 0 -> 267 bytes graphics/event_objects/pics/people/scott/8.png | Bin 0 -> 263 bytes graphics/event_objects/pics/people/sidney/0.png | Bin 0 -> 290 bytes graphics/event_objects/pics/people/sidney/1.png | Bin 0 -> 277 bytes graphics/event_objects/pics/people/sidney/2.png | Bin 0 -> 260 bytes graphics/event_objects/pics/people/spenser/0.png | Bin 0 -> 286 bytes graphics/event_objects/pics/people/spenser/1.png | Bin 0 -> 265 bytes graphics/event_objects/pics/people/spenser/2.png | Bin 0 -> 267 bytes graphics/event_objects/pics/people/spenser/3.png | Bin 0 -> 283 bytes graphics/event_objects/pics/people/spenser/4.png | Bin 0 -> 284 bytes graphics/event_objects/pics/people/spenser/5.png | Bin 0 -> 263 bytes graphics/event_objects/pics/people/spenser/6.png | Bin 0 -> 262 bytes graphics/event_objects/pics/people/spenser/7.png | Bin 0 -> 272 bytes graphics/event_objects/pics/people/spenser/8.png | Bin 0 -> 268 bytes graphics/event_objects/pics/people/steven/0.png | Bin 0 -> 290 bytes graphics/event_objects/pics/people/steven/1.png | Bin 0 -> 264 bytes graphics/event_objects/pics/people/steven/2.png | Bin 0 -> 259 bytes graphics/event_objects/pics/people/steven/3.png | Bin 0 -> 285 bytes graphics/event_objects/pics/people/steven/4.png | Bin 0 -> 284 bytes graphics/event_objects/pics/people/steven/5.png | Bin 0 -> 260 bytes graphics/event_objects/pics/people/steven/6.png | Bin 0 -> 257 bytes graphics/event_objects/pics/people/steven/7.png | Bin 0 -> 262 bytes graphics/event_objects/pics/people/steven/8.png | Bin 0 -> 260 bytes graphics/event_objects/pics/people/swimmer_f/0.png | Bin 0 -> 250 bytes graphics/event_objects/pics/people/swimmer_f/1.png | Bin 0 -> 231 bytes graphics/event_objects/pics/people/swimmer_f/2.png | Bin 0 -> 226 bytes graphics/event_objects/pics/people/swimmer_f/3.png | Bin 0 -> 254 bytes graphics/event_objects/pics/people/swimmer_f/4.png | Bin 0 -> 254 bytes graphics/event_objects/pics/people/swimmer_f/5.png | Bin 0 -> 241 bytes graphics/event_objects/pics/people/swimmer_f/6.png | Bin 0 -> 239 bytes graphics/event_objects/pics/people/swimmer_f/7.png | Bin 0 -> 234 bytes graphics/event_objects/pics/people/swimmer_f/8.png | Bin 0 -> 231 bytes graphics/event_objects/pics/people/swimmer_m/0.png | Bin 0 -> 239 bytes graphics/event_objects/pics/people/swimmer_m/1.png | Bin 0 -> 232 bytes graphics/event_objects/pics/people/swimmer_m/2.png | Bin 0 -> 227 bytes graphics/event_objects/pics/people/swimmer_m/3.png | Bin 0 -> 247 bytes graphics/event_objects/pics/people/swimmer_m/4.png | Bin 0 -> 248 bytes graphics/event_objects/pics/people/swimmer_m/5.png | Bin 0 -> 244 bytes graphics/event_objects/pics/people/swimmer_m/6.png | Bin 0 -> 245 bytes graphics/event_objects/pics/people/swimmer_m/7.png | Bin 0 -> 228 bytes graphics/event_objects/pics/people/swimmer_m/8.png | Bin 0 -> 227 bytes graphics/event_objects/pics/people/tate/0.png | Bin 0 -> 279 bytes graphics/event_objects/pics/people/tate/1.png | Bin 0 -> 255 bytes graphics/event_objects/pics/people/tate/2.png | Bin 0 -> 267 bytes graphics/event_objects/pics/people/teala/0.png | Bin 0 -> 279 bytes graphics/event_objects/pics/people/teala/1.png | Bin 0 -> 247 bytes graphics/event_objects/pics/people/teala/2.png | Bin 0 -> 261 bytes graphics/event_objects/pics/people/teala/3.png | Bin 0 -> 275 bytes graphics/event_objects/pics/people/teala/4.png | Bin 0 -> 273 bytes graphics/event_objects/pics/people/teala/5.png | Bin 0 -> 245 bytes graphics/event_objects/pics/people/teala/6.png | Bin 0 -> 250 bytes graphics/event_objects/pics/people/teala/7.png | Bin 0 -> 266 bytes graphics/event_objects/pics/people/teala/8.png | Bin 0 -> 265 bytes graphics/event_objects/pics/people/tuber_f/0.png | Bin 0 -> 260 bytes graphics/event_objects/pics/people/tuber_f/1.png | Bin 0 -> 253 bytes graphics/event_objects/pics/people/tuber_f/2.png | Bin 0 -> 243 bytes graphics/event_objects/pics/people/tuber_f/3.png | Bin 0 -> 254 bytes graphics/event_objects/pics/people/tuber_f/4.png | Bin 0 -> 254 bytes graphics/event_objects/pics/people/tuber_f/5.png | Bin 0 -> 245 bytes graphics/event_objects/pics/people/tuber_f/6.png | Bin 0 -> 245 bytes graphics/event_objects/pics/people/tuber_f/7.png | Bin 0 -> 243 bytes graphics/event_objects/pics/people/tuber_f/8.png | Bin 0 -> 242 bytes graphics/event_objects/pics/people/tuber_m/0.png | Bin 0 -> 232 bytes graphics/event_objects/pics/people/tuber_m/1.png | Bin 0 -> 224 bytes graphics/event_objects/pics/people/tuber_m/2.png | Bin 0 -> 228 bytes graphics/event_objects/pics/people/tuber_m/3.png | Bin 0 -> 230 bytes graphics/event_objects/pics/people/tuber_m/4.png | Bin 0 -> 230 bytes graphics/event_objects/pics/people/tuber_m/5.png | Bin 0 -> 222 bytes graphics/event_objects/pics/people/tuber_m/6.png | Bin 0 -> 222 bytes graphics/event_objects/pics/people/tuber_m/7.png | Bin 0 -> 231 bytes graphics/event_objects/pics/people/tuber_m/8.png | Bin 0 -> 231 bytes .../pics/people/tuber_m_swimming/0.png | Bin 0 -> 228 bytes .../pics/people/tuber_m_swimming/1.png | Bin 0 -> 221 bytes .../pics/people/tuber_m_swimming/2.png | Bin 0 -> 228 bytes .../pics/people/tuber_m_swimming/3.png | Bin 0 -> 230 bytes .../pics/people/tuber_m_swimming/4.png | Bin 0 -> 232 bytes .../pics/people/tuber_m_swimming/5.png | Bin 0 -> 225 bytes .../pics/people/tuber_m_swimming/6.png | Bin 0 -> 226 bytes .../pics/people/tuber_m_swimming/7.png | Bin 0 -> 228 bytes .../pics/people/tuber_m_swimming/8.png | Bin 0 -> 235 bytes graphics/event_objects/pics/people/tucker/0.png | Bin 0 -> 300 bytes graphics/event_objects/pics/people/tucker/1.png | Bin 0 -> 298 bytes graphics/event_objects/pics/people/tucker/2.png | Bin 0 -> 272 bytes graphics/event_objects/pics/people/tucker/3.png | Bin 0 -> 292 bytes graphics/event_objects/pics/people/tucker/4.png | Bin 0 -> 290 bytes graphics/event_objects/pics/people/tucker/5.png | Bin 0 -> 292 bytes graphics/event_objects/pics/people/tucker/6.png | Bin 0 -> 292 bytes graphics/event_objects/pics/people/tucker/7.png | Bin 0 -> 278 bytes graphics/event_objects/pics/people/tucker/8.png | Bin 0 -> 276 bytes .../pics/people/union_room_attendant/0.png | Bin 0 -> 299 bytes .../pics/people/union_room_attendant/1.png | Bin 0 -> 268 bytes .../pics/people/union_room_attendant/2.png | Bin 0 -> 268 bytes .../event_objects/pics/people/unused_woman/0.png | Bin 0 -> 295 bytes .../event_objects/pics/people/unused_woman/1.png | Bin 0 -> 281 bytes .../event_objects/pics/people/unused_woman/2.png | Bin 0 -> 272 bytes .../event_objects/pics/people/unused_woman/3.png | Bin 0 -> 288 bytes .../event_objects/pics/people/unused_woman/4.png | Bin 0 -> 286 bytes .../event_objects/pics/people/unused_woman/5.png | Bin 0 -> 275 bytes .../event_objects/pics/people/unused_woman/6.png | Bin 0 -> 277 bytes .../event_objects/pics/people/unused_woman/7.png | Bin 0 -> 278 bytes .../event_objects/pics/people/unused_woman/8.png | Bin 0 -> 277 bytes graphics/event_objects/pics/people/wallace/0.png | Bin 0 -> 313 bytes graphics/event_objects/pics/people/wallace/1.png | Bin 0 -> 276 bytes graphics/event_objects/pics/people/wallace/2.png | Bin 0 -> 270 bytes graphics/event_objects/pics/people/wallace/3.png | Bin 0 -> 301 bytes graphics/event_objects/pics/people/wallace/4.png | Bin 0 -> 303 bytes graphics/event_objects/pics/people/wallace/5.png | Bin 0 -> 269 bytes graphics/event_objects/pics/people/wallace/6.png | Bin 0 -> 270 bytes graphics/event_objects/pics/people/wallace/7.png | Bin 0 -> 281 bytes graphics/event_objects/pics/people/wallace/8.png | Bin 0 -> 274 bytes graphics/event_objects/pics/people/wally/0.png | Bin 0 -> 283 bytes graphics/event_objects/pics/people/wally/1.png | Bin 0 -> 279 bytes graphics/event_objects/pics/people/wally/2.png | Bin 0 -> 255 bytes graphics/event_objects/pics/people/wally/3.png | Bin 0 -> 273 bytes graphics/event_objects/pics/people/wally/4.png | Bin 0 -> 272 bytes graphics/event_objects/pics/people/wally/5.png | Bin 0 -> 270 bytes graphics/event_objects/pics/people/wally/6.png | Bin 0 -> 271 bytes graphics/event_objects/pics/people/wally/7.png | Bin 0 -> 258 bytes graphics/event_objects/pics/people/wally/8.png | Bin 0 -> 263 bytes graphics/event_objects/pics/people/wattson/0.png | Bin 0 -> 294 bytes graphics/event_objects/pics/people/wattson/1.png | Bin 0 -> 294 bytes graphics/event_objects/pics/people/wattson/2.png | Bin 0 -> 273 bytes graphics/event_objects/pics/people/winona/0.png | Bin 0 -> 294 bytes graphics/event_objects/pics/people/winona/1.png | Bin 0 -> 289 bytes graphics/event_objects/pics/people/winona/2.png | Bin 0 -> 266 bytes graphics/event_objects/pics/people/woman_1/0.png | Bin 0 -> 304 bytes graphics/event_objects/pics/people/woman_1/1.png | Bin 0 -> 297 bytes graphics/event_objects/pics/people/woman_1/2.png | Bin 0 -> 272 bytes graphics/event_objects/pics/people/woman_1/3.png | Bin 0 -> 293 bytes graphics/event_objects/pics/people/woman_1/4.png | Bin 0 -> 291 bytes graphics/event_objects/pics/people/woman_1/5.png | Bin 0 -> 289 bytes graphics/event_objects/pics/people/woman_1/6.png | Bin 0 -> 288 bytes graphics/event_objects/pics/people/woman_1/7.png | Bin 0 -> 276 bytes graphics/event_objects/pics/people/woman_1/8.png | Bin 0 -> 277 bytes graphics/event_objects/pics/people/woman_2/0.png | Bin 0 -> 297 bytes graphics/event_objects/pics/people/woman_2/1.png | Bin 0 -> 292 bytes graphics/event_objects/pics/people/woman_2/2.png | Bin 0 -> 266 bytes graphics/event_objects/pics/people/woman_2/3.png | Bin 0 -> 285 bytes graphics/event_objects/pics/people/woman_2/4.png | Bin 0 -> 286 bytes graphics/event_objects/pics/people/woman_2/5.png | Bin 0 -> 282 bytes graphics/event_objects/pics/people/woman_2/6.png | Bin 0 -> 282 bytes graphics/event_objects/pics/people/woman_2/7.png | Bin 0 -> 266 bytes graphics/event_objects/pics/people/woman_2/8.png | Bin 0 -> 266 bytes graphics/event_objects/pics/people/woman_3/0.png | Bin 0 -> 295 bytes graphics/event_objects/pics/people/woman_3/1.png | Bin 0 -> 282 bytes graphics/event_objects/pics/people/woman_3/2.png | Bin 0 -> 277 bytes graphics/event_objects/pics/people/woman_3/3.png | Bin 0 -> 291 bytes graphics/event_objects/pics/people/woman_3/4.png | Bin 0 -> 290 bytes graphics/event_objects/pics/people/woman_3/5.png | Bin 0 -> 268 bytes graphics/event_objects/pics/people/woman_3/6.png | Bin 0 -> 268 bytes graphics/event_objects/pics/people/woman_3/7.png | Bin 0 -> 276 bytes graphics/event_objects/pics/people/woman_3/8.png | Bin 0 -> 275 bytes graphics/event_objects/pics/people/woman_4/0.png | Bin 0 -> 300 bytes graphics/event_objects/pics/people/woman_4/1.png | Bin 0 -> 274 bytes graphics/event_objects/pics/people/woman_4/2.png | Bin 0 -> 262 bytes graphics/event_objects/pics/people/woman_4/3.png | Bin 0 -> 290 bytes graphics/event_objects/pics/people/woman_4/4.png | Bin 0 -> 290 bytes graphics/event_objects/pics/people/woman_4/5.png | Bin 0 -> 264 bytes graphics/event_objects/pics/people/woman_4/6.png | Bin 0 -> 264 bytes graphics/event_objects/pics/people/woman_4/7.png | Bin 0 -> 265 bytes graphics/event_objects/pics/people/woman_4/8.png | Bin 0 -> 266 bytes graphics/event_objects/pics/people/woman_5/0.png | Bin 0 -> 295 bytes graphics/event_objects/pics/people/woman_5/1.png | Bin 0 -> 271 bytes graphics/event_objects/pics/people/woman_5/2.png | Bin 0 -> 269 bytes graphics/event_objects/pics/people/woman_5/3.png | Bin 0 -> 287 bytes graphics/event_objects/pics/people/woman_5/4.png | Bin 0 -> 288 bytes graphics/event_objects/pics/people/woman_5/5.png | Bin 0 -> 266 bytes graphics/event_objects/pics/people/woman_5/6.png | Bin 0 -> 263 bytes graphics/event_objects/pics/people/woman_5/7.png | Bin 0 -> 265 bytes graphics/event_objects/pics/people/woman_5/8.png | Bin 0 -> 271 bytes graphics/event_objects/pics/people/woman_6/0.png | Bin 0 -> 305 bytes graphics/event_objects/pics/people/woman_6/1.png | Bin 0 -> 278 bytes graphics/event_objects/pics/people/woman_6/2.png | Bin 0 -> 265 bytes graphics/event_objects/pics/people/woman_6/3.png | Bin 0 -> 297 bytes graphics/event_objects/pics/people/woman_6/4.png | Bin 0 -> 296 bytes graphics/event_objects/pics/people/woman_6/5.png | Bin 0 -> 268 bytes graphics/event_objects/pics/people/woman_6/6.png | Bin 0 -> 266 bytes graphics/event_objects/pics/people/woman_6/7.png | Bin 0 -> 265 bytes graphics/event_objects/pics/people/woman_6/8.png | Bin 0 -> 267 bytes graphics/event_objects/pics/people/woman_7/0.png | Bin 0 -> 306 bytes graphics/event_objects/pics/people/woman_7/1.png | Bin 0 -> 280 bytes graphics/event_objects/pics/people/woman_7/2.png | Bin 0 -> 263 bytes graphics/event_objects/pics/people/woman_7/3.png | Bin 0 -> 286 bytes graphics/event_objects/pics/people/woman_7/4.png | Bin 0 -> 286 bytes graphics/event_objects/pics/people/woman_7/5.png | Bin 0 -> 267 bytes graphics/event_objects/pics/people/woman_7/6.png | Bin 0 -> 271 bytes graphics/event_objects/pics/people/woman_7/7.png | Bin 0 -> 268 bytes graphics/event_objects/pics/people/woman_7/8.png | Bin 0 -> 270 bytes graphics/event_objects/pics/people/youngster/0.png | Bin 0 -> 278 bytes graphics/event_objects/pics/people/youngster/1.png | Bin 0 -> 264 bytes graphics/event_objects/pics/people/youngster/2.png | Bin 0 -> 257 bytes graphics/event_objects/pics/people/youngster/3.png | Bin 0 -> 276 bytes graphics/event_objects/pics/people/youngster/4.png | Bin 0 -> 272 bytes graphics/event_objects/pics/people/youngster/5.png | Bin 0 -> 259 bytes graphics/event_objects/pics/people/youngster/6.png | Bin 0 -> 257 bytes graphics/event_objects/pics/people/youngster/7.png | Bin 0 -> 264 bytes graphics/event_objects/pics/people/youngster/8.png | Bin 0 -> 262 bytes .../event_objects/pics/pokemon/azumarill/0.png | Bin 0 -> 234 bytes .../event_objects/pics/pokemon/azumarill/1.png | Bin 0 -> 230 bytes .../event_objects/pics/pokemon/azumarill/2.png | Bin 0 -> 228 bytes graphics/event_objects/pics/pokemon/azurill/0.png | Bin 0 -> 225 bytes graphics/event_objects/pics/pokemon/azurill/1.png | Bin 0 -> 215 bytes graphics/event_objects/pics/pokemon/azurill/2.png | Bin 0 -> 215 bytes graphics/event_objects/pics/pokemon/deoxys/0.png | Bin 0 -> 418 bytes graphics/event_objects/pics/pokemon/deoxys/1.png | Bin 0 -> 421 bytes graphics/event_objects/pics/pokemon/dusclops/0.png | Bin 0 -> 255 bytes graphics/event_objects/pics/pokemon/dusclops/1.png | Bin 0 -> 249 bytes graphics/event_objects/pics/pokemon/dusclops/2.png | Bin 0 -> 261 bytes graphics/event_objects/pics/pokemon/dusclops/3.png | Bin 0 -> 252 bytes graphics/event_objects/pics/pokemon/dusclops/4.png | Bin 0 -> 253 bytes graphics/event_objects/pics/pokemon/dusclops/5.png | Bin 0 -> 244 bytes graphics/event_objects/pics/pokemon/dusclops/6.png | Bin 0 -> 242 bytes graphics/event_objects/pics/pokemon/dusclops/7.png | Bin 0 -> 262 bytes graphics/event_objects/pics/pokemon/dusclops/8.png | Bin 0 -> 260 bytes .../pics/pokemon/enemy_zigzagoon/0.png | Bin 0 -> 255 bytes .../pics/pokemon/enemy_zigzagoon/1.png | Bin 0 -> 252 bytes .../pics/pokemon/enemy_zigzagoon/2.png | Bin 0 -> 297 bytes .../pics/pokemon/enemy_zigzagoon/3.png | Bin 0 -> 263 bytes .../pics/pokemon/enemy_zigzagoon/4.png | Bin 0 -> 260 bytes .../pics/pokemon/enemy_zigzagoon/5.png | Bin 0 -> 261 bytes .../pics/pokemon/enemy_zigzagoon/6.png | Bin 0 -> 260 bytes .../pics/pokemon/enemy_zigzagoon/7.png | Bin 0 -> 299 bytes .../pics/pokemon/enemy_zigzagoon/8.png | Bin 0 -> 308 bytes .../event_objects/pics/pokemon/groudon_front/0.png | Bin 0 -> 443 bytes .../event_objects/pics/pokemon/groudon_front/1.png | Bin 0 -> 432 bytes .../event_objects/pics/pokemon/groudon_side/0.png | Bin 0 -> 463 bytes .../event_objects/pics/pokemon/groudon_side/1.png | Bin 0 -> 460 bytes graphics/event_objects/pics/pokemon/ho_oh/0.png | Bin 0 -> 391 bytes graphics/event_objects/pics/pokemon/ho_oh/1.png | Bin 0 -> 351 bytes graphics/event_objects/pics/pokemon/kecleon/0.png | Bin 0 -> 244 bytes graphics/event_objects/pics/pokemon/kecleon/1.png | Bin 0 -> 235 bytes graphics/event_objects/pics/pokemon/kecleon/2.png | Bin 0 -> 240 bytes graphics/event_objects/pics/pokemon/kirlia/0.png | Bin 0 -> 253 bytes graphics/event_objects/pics/pokemon/kirlia/1.png | Bin 0 -> 241 bytes graphics/event_objects/pics/pokemon/kirlia/2.png | Bin 0 -> 234 bytes graphics/event_objects/pics/pokemon/kirlia/3.png | Bin 0 -> 253 bytes graphics/event_objects/pics/pokemon/kirlia/4.png | Bin 0 -> 251 bytes graphics/event_objects/pics/pokemon/kirlia/5.png | Bin 0 -> 239 bytes graphics/event_objects/pics/pokemon/kirlia/6.png | Bin 0 -> 240 bytes graphics/event_objects/pics/pokemon/kirlia/7.png | Bin 0 -> 232 bytes graphics/event_objects/pics/pokemon/kirlia/8.png | Bin 0 -> 232 bytes .../event_objects/pics/pokemon/kyogre_front/0.png | Bin 0 -> 423 bytes .../event_objects/pics/pokemon/kyogre_front/1.png | Bin 0 -> 423 bytes .../event_objects/pics/pokemon/kyogre_side/0.png | Bin 0 -> 415 bytes .../event_objects/pics/pokemon/kyogre_side/1.png | Bin 0 -> 428 bytes .../event_objects/pics/pokemon/latias_latios/0.png | Bin 0 -> 390 bytes .../event_objects/pics/pokemon/latias_latios/1.png | Bin 0 -> 380 bytes .../event_objects/pics/pokemon/latias_latios/2.png | Bin 0 -> 370 bytes graphics/event_objects/pics/pokemon/lugia/0.png | Bin 0 -> 321 bytes graphics/event_objects/pics/pokemon/lugia/1.png | Bin 0 -> 285 bytes graphics/event_objects/pics/pokemon/mew/0.png | Bin 0 -> 279 bytes graphics/event_objects/pics/pokemon/mew/1.png | Bin 0 -> 261 bytes graphics/event_objects/pics/pokemon/mew/2.png | Bin 0 -> 266 bytes graphics/event_objects/pics/pokemon/mew/3.png | Bin 0 -> 276 bytes graphics/event_objects/pics/pokemon/mew/4.png | Bin 0 -> 270 bytes graphics/event_objects/pics/pokemon/mew/5.png | Bin 0 -> 265 bytes graphics/event_objects/pics/pokemon/mew/6.png | Bin 0 -> 261 bytes graphics/event_objects/pics/pokemon/mew/7.png | Bin 0 -> 266 bytes graphics/event_objects/pics/pokemon/mew/8.png | Bin 0 -> 261 bytes graphics/event_objects/pics/pokemon/pikachu/0.png | Bin 0 -> 246 bytes graphics/event_objects/pics/pokemon/pikachu/1.png | Bin 0 -> 226 bytes graphics/event_objects/pics/pokemon/pikachu/2.png | Bin 0 -> 234 bytes .../event_objects/pics/pokemon/poochyena/0.png | Bin 0 -> 244 bytes .../event_objects/pics/pokemon/poochyena/1.png | Bin 0 -> 239 bytes .../event_objects/pics/pokemon/poochyena/2.png | Bin 0 -> 265 bytes .../event_objects/pics/pokemon/poochyena/3.png | Bin 0 -> 250 bytes .../event_objects/pics/pokemon/poochyena/4.png | Bin 0 -> 247 bytes .../event_objects/pics/pokemon/poochyena/5.png | Bin 0 -> 245 bytes .../event_objects/pics/pokemon/poochyena/6.png | Bin 0 -> 249 bytes .../event_objects/pics/pokemon/poochyena/7.png | Bin 0 -> 272 bytes .../event_objects/pics/pokemon/poochyena/8.png | Bin 0 -> 279 bytes graphics/event_objects/pics/pokemon/rayquaza/0.png | Bin 0 -> 480 bytes graphics/event_objects/pics/pokemon/rayquaza/1.png | Bin 0 -> 481 bytes graphics/event_objects/pics/pokemon/rayquaza/2.png | Bin 0 -> 497 bytes graphics/event_objects/pics/pokemon/rayquaza/3.png | Bin 0 -> 541 bytes graphics/event_objects/pics/pokemon/rayquaza/4.png | Bin 0 -> 544 bytes .../event_objects/pics/pokemon/rayquaza_still.png | Bin 0 -> 538 bytes graphics/event_objects/pics/pokemon/regi.png | Bin 0 -> 386 bytes graphics/event_objects/pics/pokemon/skitty/0.png | Bin 0 -> 230 bytes graphics/event_objects/pics/pokemon/skitty/1.png | Bin 0 -> 218 bytes graphics/event_objects/pics/pokemon/skitty/2.png | Bin 0 -> 232 bytes .../event_objects/pics/pokemon/sudowoodo/0.png | Bin 0 -> 253 bytes .../event_objects/pics/pokemon/sudowoodo/1.png | Bin 0 -> 258 bytes .../event_objects/pics/pokemon/sudowoodo/2.png | Bin 0 -> 254 bytes .../pics/pokemon/vigoroth_carrying_box/0.png | Bin 0 -> 428 bytes .../pics/pokemon/vigoroth_carrying_box/1.png | Bin 0 -> 429 bytes .../pics/pokemon/vigoroth_carrying_box/2.png | Bin 0 -> 423 bytes .../pics/pokemon/vigoroth_facing_away/0.png | Bin 0 -> 399 bytes .../pics/pokemon/vigoroth_facing_away/1.png | Bin 0 -> 382 bytes graphics/event_objects/pics/pokemon/wingull/0.png | Bin 0 -> 206 bytes graphics/event_objects/pics/pokemon/wingull/1.png | Bin 0 -> 206 bytes graphics/event_objects/pics/pokemon/wingull/2.png | Bin 0 -> 207 bytes graphics/event_objects/pics/pokemon/wingull/3.png | Bin 0 -> 202 bytes graphics/event_objects/pics/pokemon/wingull/4.png | Bin 0 -> 200 bytes graphics/event_objects/pics/pokemon/wingull/5.png | Bin 0 -> 202 bytes .../event_objects/pics/pokemon/zigzagoon/0.png | Bin 0 -> 223 bytes .../event_objects/pics/pokemon/zigzagoon/1.png | Bin 0 -> 211 bytes .../event_objects/pics/pokemon/zigzagoon/2.png | Bin 0 -> 214 bytes .../palettes/field_effect_object_palette_00.pal | 19 - .../palettes/field_effect_object_palette_01.pal | 19 - .../palettes/field_effect_object_palette_02.pal | 19 - .../palettes/field_effect_object_palette_03.pal | 19 - .../palettes/field_effect_object_palette_04.pal | 19 - .../palettes/field_effect_object_palette_05.pal | 19 - .../palettes/field_effect_object_palette_06.pal | 19 - .../palettes/field_effect_object_palette_07.pal | 19 - .../palettes/field_effect_object_palette_08.pal | 19 - .../palettes/field_effect_object_palette_10.pal | 19 - .../palettes/field_object_palette_00.pal | 19 - .../palettes/field_object_palette_01.pal | 19 - .../palettes/field_object_palette_02.pal | 19 - .../palettes/field_object_palette_03.pal | 19 - .../palettes/field_object_palette_04.pal | 19 - .../palettes/field_object_palette_05.pal | 19 - .../palettes/field_object_palette_06.pal | 19 - .../palettes/field_object_palette_07.pal | 19 - .../palettes/field_object_palette_08.pal | 19 - .../palettes/field_object_palette_09.pal | 19 - .../palettes/field_object_palette_10.pal | 19 - .../palettes/field_object_palette_11.pal | 19 - .../palettes/field_object_palette_12.pal | 19 - .../palettes/field_object_palette_13.pal | 19 - .../palettes/field_object_palette_14.pal | 19 - .../palettes/field_object_palette_15.pal | 19 - .../palettes/field_object_palette_16.pal | 19 - .../palettes/field_object_palette_17.pal | 19 - .../palettes/field_object_palette_18.pal | 19 - .../palettes/field_object_palette_19.pal | 19 - .../palettes/field_object_palette_20.pal | 19 - .../palettes/field_object_palette_21.pal | 19 - .../palettes/field_object_palette_22.pal | 19 - .../palettes/field_object_palette_23.pal | 19 - .../palettes/field_object_palette_24.pal | 19 - .../palettes/field_object_palette_25.pal | 19 - .../palettes/field_object_palette_26.pal | 19 - .../palettes/field_object_palette_27.pal | 19 - .../palettes/field_object_palette_28.pal | 19 - .../palettes/field_object_palette_29.pal | 19 - .../palettes/field_object_palette_30.pal | 19 - .../palettes/field_object_palette_31.pal | 19 - .../palettes/field_object_palette_32.pal | 19 - .../palettes/field_object_palette_33.pal | 19 - .../palettes/field_object_palette_34.pal | 19 - graphics/map_objects/palettes/unused_palette.pal | 19 - graphics/map_objects/pics/berry_trees/aguav/0.png | Bin 225 -> 0 bytes graphics/map_objects/pics/berry_trees/aguav/1.png | Bin 225 -> 0 bytes graphics/map_objects/pics/berry_trees/aguav/2.png | Bin 269 -> 0 bytes graphics/map_objects/pics/berry_trees/aguav/3.png | Bin 267 -> 0 bytes graphics/map_objects/pics/berry_trees/aguav/4.png | Bin 288 -> 0 bytes graphics/map_objects/pics/berry_trees/aguav/5.png | Bin 287 -> 0 bytes graphics/map_objects/pics/berry_trees/aspear/0.png | Bin 262 -> 0 bytes graphics/map_objects/pics/berry_trees/aspear/1.png | Bin 253 -> 0 bytes graphics/map_objects/pics/berry_trees/aspear/2.png | Bin 315 -> 0 bytes graphics/map_objects/pics/berry_trees/aspear/3.png | Bin 310 -> 0 bytes graphics/map_objects/pics/berry_trees/aspear/4.png | Bin 319 -> 0 bytes graphics/map_objects/pics/berry_trees/aspear/5.png | Bin 308 -> 0 bytes graphics/map_objects/pics/berry_trees/cheri/0.png | Bin 269 -> 0 bytes graphics/map_objects/pics/berry_trees/cheri/1.png | Bin 271 -> 0 bytes graphics/map_objects/pics/berry_trees/cheri/2.png | Bin 288 -> 0 bytes graphics/map_objects/pics/berry_trees/cheri/3.png | Bin 294 -> 0 bytes graphics/map_objects/pics/berry_trees/cheri/4.png | Bin 290 -> 0 bytes graphics/map_objects/pics/berry_trees/cheri/5.png | Bin 297 -> 0 bytes graphics/map_objects/pics/berry_trees/chesto/0.png | Bin 265 -> 0 bytes graphics/map_objects/pics/berry_trees/chesto/1.png | Bin 268 -> 0 bytes graphics/map_objects/pics/berry_trees/chesto/2.png | Bin 308 -> 0 bytes graphics/map_objects/pics/berry_trees/chesto/3.png | Bin 315 -> 0 bytes graphics/map_objects/pics/berry_trees/chesto/4.png | Bin 310 -> 0 bytes graphics/map_objects/pics/berry_trees/chesto/5.png | Bin 315 -> 0 bytes graphics/map_objects/pics/berry_trees/cornn/0.png | Bin 226 -> 0 bytes graphics/map_objects/pics/berry_trees/cornn/1.png | Bin 223 -> 0 bytes graphics/map_objects/pics/berry_trees/cornn/2.png | Bin 296 -> 0 bytes graphics/map_objects/pics/berry_trees/cornn/3.png | Bin 300 -> 0 bytes graphics/map_objects/pics/berry_trees/cornn/4.png | Bin 283 -> 0 bytes graphics/map_objects/pics/berry_trees/cornn/5.png | Bin 287 -> 0 bytes .../map_objects/pics/berry_trees/dirt_pile.png | Bin 189 -> 0 bytes graphics/map_objects/pics/berry_trees/durin/0.png | Bin 250 -> 0 bytes graphics/map_objects/pics/berry_trees/durin/1.png | Bin 248 -> 0 bytes graphics/map_objects/pics/berry_trees/durin/2.png | Bin 281 -> 0 bytes graphics/map_objects/pics/berry_trees/durin/3.png | Bin 282 -> 0 bytes graphics/map_objects/pics/berry_trees/durin/4.png | Bin 282 -> 0 bytes graphics/map_objects/pics/berry_trees/durin/5.png | Bin 278 -> 0 bytes graphics/map_objects/pics/berry_trees/figy/0.png | Bin 270 -> 0 bytes graphics/map_objects/pics/berry_trees/figy/1.png | Bin 272 -> 0 bytes graphics/map_objects/pics/berry_trees/figy/2.png | Bin 298 -> 0 bytes graphics/map_objects/pics/berry_trees/figy/3.png | Bin 306 -> 0 bytes graphics/map_objects/pics/berry_trees/figy/4.png | Bin 301 -> 0 bytes graphics/map_objects/pics/berry_trees/figy/5.png | Bin 305 -> 0 bytes graphics/map_objects/pics/berry_trees/grepa/0.png | Bin 216 -> 0 bytes graphics/map_objects/pics/berry_trees/grepa/1.png | Bin 218 -> 0 bytes graphics/map_objects/pics/berry_trees/grepa/2.png | Bin 252 -> 0 bytes graphics/map_objects/pics/berry_trees/grepa/3.png | Bin 253 -> 0 bytes graphics/map_objects/pics/berry_trees/grepa/4.png | Bin 258 -> 0 bytes graphics/map_objects/pics/berry_trees/grepa/5.png | Bin 248 -> 0 bytes graphics/map_objects/pics/berry_trees/hondew/0.png | Bin 224 -> 0 bytes graphics/map_objects/pics/berry_trees/hondew/1.png | Bin 222 -> 0 bytes graphics/map_objects/pics/berry_trees/hondew/2.png | Bin 253 -> 0 bytes graphics/map_objects/pics/berry_trees/hondew/3.png | Bin 251 -> 0 bytes graphics/map_objects/pics/berry_trees/hondew/4.png | Bin 266 -> 0 bytes graphics/map_objects/pics/berry_trees/hondew/5.png | Bin 266 -> 0 bytes graphics/map_objects/pics/berry_trees/iapapa/0.png | Bin 179 -> 0 bytes graphics/map_objects/pics/berry_trees/iapapa/1.png | Bin 181 -> 0 bytes graphics/map_objects/pics/berry_trees/iapapa/2.png | Bin 251 -> 0 bytes graphics/map_objects/pics/berry_trees/iapapa/3.png | Bin 244 -> 0 bytes graphics/map_objects/pics/berry_trees/iapapa/4.png | Bin 194 -> 0 bytes graphics/map_objects/pics/berry_trees/iapapa/5.png | Bin 202 -> 0 bytes graphics/map_objects/pics/berry_trees/kelpsy/0.png | Bin 223 -> 0 bytes graphics/map_objects/pics/berry_trees/kelpsy/1.png | Bin 223 -> 0 bytes graphics/map_objects/pics/berry_trees/kelpsy/2.png | Bin 252 -> 0 bytes graphics/map_objects/pics/berry_trees/kelpsy/3.png | Bin 252 -> 0 bytes graphics/map_objects/pics/berry_trees/kelpsy/4.png | Bin 245 -> 0 bytes graphics/map_objects/pics/berry_trees/kelpsy/5.png | Bin 243 -> 0 bytes graphics/map_objects/pics/berry_trees/lansat/0.png | Bin 247 -> 0 bytes graphics/map_objects/pics/berry_trees/lansat/1.png | Bin 245 -> 0 bytes graphics/map_objects/pics/berry_trees/lansat/2.png | Bin 269 -> 0 bytes graphics/map_objects/pics/berry_trees/lansat/3.png | Bin 264 -> 0 bytes graphics/map_objects/pics/berry_trees/lansat/4.png | Bin 272 -> 0 bytes graphics/map_objects/pics/berry_trees/lansat/5.png | Bin 265 -> 0 bytes graphics/map_objects/pics/berry_trees/leppa/0.png | Bin 223 -> 0 bytes graphics/map_objects/pics/berry_trees/leppa/1.png | Bin 231 -> 0 bytes graphics/map_objects/pics/berry_trees/leppa/2.png | Bin 272 -> 0 bytes graphics/map_objects/pics/berry_trees/leppa/3.png | Bin 273 -> 0 bytes graphics/map_objects/pics/berry_trees/leppa/4.png | Bin 270 -> 0 bytes graphics/map_objects/pics/berry_trees/leppa/5.png | Bin 274 -> 0 bytes graphics/map_objects/pics/berry_trees/liechi/0.png | Bin 224 -> 0 bytes graphics/map_objects/pics/berry_trees/liechi/1.png | Bin 226 -> 0 bytes graphics/map_objects/pics/berry_trees/liechi/2.png | Bin 248 -> 0 bytes graphics/map_objects/pics/berry_trees/liechi/3.png | Bin 256 -> 0 bytes graphics/map_objects/pics/berry_trees/liechi/4.png | Bin 262 -> 0 bytes graphics/map_objects/pics/berry_trees/liechi/5.png | Bin 260 -> 0 bytes graphics/map_objects/pics/berry_trees/lum/0.png | Bin 259 -> 0 bytes graphics/map_objects/pics/berry_trees/lum/1.png | Bin 254 -> 0 bytes graphics/map_objects/pics/berry_trees/lum/2.png | Bin 280 -> 0 bytes graphics/map_objects/pics/berry_trees/lum/3.png | Bin 286 -> 0 bytes graphics/map_objects/pics/berry_trees/lum/4.png | Bin 285 -> 0 bytes graphics/map_objects/pics/berry_trees/lum/5.png | Bin 285 -> 0 bytes graphics/map_objects/pics/berry_trees/mago/0.png | Bin 246 -> 0 bytes graphics/map_objects/pics/berry_trees/mago/1.png | Bin 245 -> 0 bytes graphics/map_objects/pics/berry_trees/mago/2.png | Bin 275 -> 0 bytes graphics/map_objects/pics/berry_trees/mago/3.png | Bin 276 -> 0 bytes graphics/map_objects/pics/berry_trees/mago/4.png | Bin 279 -> 0 bytes graphics/map_objects/pics/berry_trees/mago/5.png | Bin 282 -> 0 bytes graphics/map_objects/pics/berry_trees/nomel/0.png | Bin 230 -> 0 bytes graphics/map_objects/pics/berry_trees/nomel/1.png | Bin 228 -> 0 bytes graphics/map_objects/pics/berry_trees/nomel/2.png | Bin 260 -> 0 bytes graphics/map_objects/pics/berry_trees/nomel/3.png | Bin 265 -> 0 bytes graphics/map_objects/pics/berry_trees/nomel/4.png | Bin 263 -> 0 bytes graphics/map_objects/pics/berry_trees/nomel/5.png | Bin 268 -> 0 bytes graphics/map_objects/pics/berry_trees/oran/0.png | Bin 260 -> 0 bytes graphics/map_objects/pics/berry_trees/oran/1.png | Bin 260 -> 0 bytes graphics/map_objects/pics/berry_trees/oran/2.png | Bin 303 -> 0 bytes graphics/map_objects/pics/berry_trees/oran/3.png | Bin 304 -> 0 bytes graphics/map_objects/pics/berry_trees/oran/4.png | Bin 303 -> 0 bytes graphics/map_objects/pics/berry_trees/oran/5.png | Bin 307 -> 0 bytes graphics/map_objects/pics/berry_trees/pamtre/0.png | Bin 240 -> 0 bytes graphics/map_objects/pics/berry_trees/pamtre/1.png | Bin 245 -> 0 bytes graphics/map_objects/pics/berry_trees/pamtre/2.png | Bin 278 -> 0 bytes graphics/map_objects/pics/berry_trees/pamtre/3.png | Bin 283 -> 0 bytes graphics/map_objects/pics/berry_trees/pamtre/4.png | Bin 280 -> 0 bytes graphics/map_objects/pics/berry_trees/pamtre/5.png | Bin 285 -> 0 bytes graphics/map_objects/pics/berry_trees/pecha/0.png | Bin 227 -> 0 bytes graphics/map_objects/pics/berry_trees/pecha/1.png | Bin 230 -> 0 bytes graphics/map_objects/pics/berry_trees/pecha/2.png | Bin 274 -> 0 bytes graphics/map_objects/pics/berry_trees/pecha/3.png | Bin 271 -> 0 bytes graphics/map_objects/pics/berry_trees/pecha/4.png | Bin 260 -> 0 bytes graphics/map_objects/pics/berry_trees/pecha/5.png | Bin 264 -> 0 bytes graphics/map_objects/pics/berry_trees/persim/0.png | Bin 248 -> 0 bytes graphics/map_objects/pics/berry_trees/persim/1.png | Bin 249 -> 0 bytes graphics/map_objects/pics/berry_trees/persim/2.png | Bin 279 -> 0 bytes graphics/map_objects/pics/berry_trees/persim/3.png | Bin 275 -> 0 bytes graphics/map_objects/pics/berry_trees/persim/4.png | Bin 286 -> 0 bytes graphics/map_objects/pics/berry_trees/persim/5.png | Bin 288 -> 0 bytes graphics/map_objects/pics/berry_trees/pomeg/0.png | Bin 225 -> 0 bytes graphics/map_objects/pics/berry_trees/pomeg/1.png | Bin 221 -> 0 bytes graphics/map_objects/pics/berry_trees/pomeg/2.png | Bin 256 -> 0 bytes graphics/map_objects/pics/berry_trees/pomeg/3.png | Bin 253 -> 0 bytes graphics/map_objects/pics/berry_trees/pomeg/4.png | Bin 258 -> 0 bytes graphics/map_objects/pics/berry_trees/pomeg/5.png | Bin 256 -> 0 bytes graphics/map_objects/pics/berry_trees/rabuta/0.png | Bin 254 -> 0 bytes graphics/map_objects/pics/berry_trees/rabuta/1.png | Bin 259 -> 0 bytes graphics/map_objects/pics/berry_trees/rabuta/2.png | Bin 267 -> 0 bytes graphics/map_objects/pics/berry_trees/rabuta/3.png | Bin 270 -> 0 bytes graphics/map_objects/pics/berry_trees/rabuta/4.png | Bin 272 -> 0 bytes graphics/map_objects/pics/berry_trees/rabuta/5.png | Bin 276 -> 0 bytes graphics/map_objects/pics/berry_trees/rawst/0.png | Bin 221 -> 0 bytes graphics/map_objects/pics/berry_trees/rawst/1.png | Bin 220 -> 0 bytes graphics/map_objects/pics/berry_trees/rawst/2.png | Bin 243 -> 0 bytes graphics/map_objects/pics/berry_trees/rawst/3.png | Bin 234 -> 0 bytes graphics/map_objects/pics/berry_trees/rawst/4.png | Bin 249 -> 0 bytes graphics/map_objects/pics/berry_trees/rawst/5.png | Bin 239 -> 0 bytes graphics/map_objects/pics/berry_trees/razz/0.png | Bin 243 -> 0 bytes graphics/map_objects/pics/berry_trees/razz/1.png | Bin 251 -> 0 bytes graphics/map_objects/pics/berry_trees/razz/2.png | Bin 285 -> 0 bytes graphics/map_objects/pics/berry_trees/razz/3.png | Bin 272 -> 0 bytes graphics/map_objects/pics/berry_trees/razz/4.png | Bin 284 -> 0 bytes graphics/map_objects/pics/berry_trees/razz/5.png | Bin 294 -> 0 bytes graphics/map_objects/pics/berry_trees/sitrus/0.png | Bin 260 -> 0 bytes graphics/map_objects/pics/berry_trees/sitrus/1.png | Bin 257 -> 0 bytes graphics/map_objects/pics/berry_trees/sitrus/2.png | Bin 296 -> 0 bytes graphics/map_objects/pics/berry_trees/sitrus/3.png | Bin 302 -> 0 bytes graphics/map_objects/pics/berry_trees/sitrus/4.png | Bin 289 -> 0 bytes graphics/map_objects/pics/berry_trees/sitrus/5.png | Bin 287 -> 0 bytes graphics/map_objects/pics/berry_trees/spelon/0.png | Bin 213 -> 0 bytes graphics/map_objects/pics/berry_trees/spelon/1.png | Bin 215 -> 0 bytes graphics/map_objects/pics/berry_trees/spelon/2.png | Bin 243 -> 0 bytes graphics/map_objects/pics/berry_trees/spelon/3.png | Bin 243 -> 0 bytes graphics/map_objects/pics/berry_trees/spelon/4.png | Bin 230 -> 0 bytes graphics/map_objects/pics/berry_trees/spelon/5.png | Bin 222 -> 0 bytes graphics/map_objects/pics/berry_trees/sprout/0.png | Bin 200 -> 0 bytes graphics/map_objects/pics/berry_trees/sprout/1.png | Bin 198 -> 0 bytes graphics/map_objects/pics/berry_trees/tamato/0.png | Bin 245 -> 0 bytes graphics/map_objects/pics/berry_trees/tamato/1.png | Bin 234 -> 0 bytes graphics/map_objects/pics/berry_trees/tamato/2.png | Bin 269 -> 0 bytes graphics/map_objects/pics/berry_trees/tamato/3.png | Bin 262 -> 0 bytes graphics/map_objects/pics/berry_trees/tamato/4.png | Bin 273 -> 0 bytes graphics/map_objects/pics/berry_trees/tamato/5.png | Bin 275 -> 0 bytes graphics/map_objects/pics/berry_trees/wepear/0.png | Bin 244 -> 0 bytes graphics/map_objects/pics/berry_trees/wepear/1.png | Bin 245 -> 0 bytes graphics/map_objects/pics/berry_trees/wepear/2.png | Bin 283 -> 0 bytes graphics/map_objects/pics/berry_trees/wepear/3.png | Bin 283 -> 0 bytes graphics/map_objects/pics/berry_trees/wepear/4.png | Bin 284 -> 0 bytes graphics/map_objects/pics/berry_trees/wepear/5.png | Bin 284 -> 0 bytes graphics/map_objects/pics/berry_trees/wiki/0.png | Bin 226 -> 0 bytes graphics/map_objects/pics/berry_trees/wiki/1.png | Bin 228 -> 0 bytes graphics/map_objects/pics/berry_trees/wiki/2.png | Bin 261 -> 0 bytes graphics/map_objects/pics/berry_trees/wiki/3.png | Bin 258 -> 0 bytes graphics/map_objects/pics/berry_trees/wiki/4.png | Bin 264 -> 0 bytes graphics/map_objects/pics/berry_trees/wiki/5.png | Bin 257 -> 0 bytes .../map_objects/pics/cushions/ball_cushion.png | Bin 215 -> 0 bytes .../map_objects/pics/cushions/diamond_cushion.png | Bin 216 -> 0 bytes .../map_objects/pics/cushions/fire_cushion.png | Bin 209 -> 0 bytes .../map_objects/pics/cushions/grass_cushion.png | Bin 208 -> 0 bytes .../map_objects/pics/cushions/kiss_cushion.png | Bin 213 -> 0 bytes .../map_objects/pics/cushions/pika_cushion.png | Bin 199 -> 0 bytes .../map_objects/pics/cushions/round_cushion.png | Bin 214 -> 0 bytes .../map_objects/pics/cushions/spin_cushion.png | Bin 224 -> 0 bytes .../map_objects/pics/cushions/water_cushion.png | Bin 205 -> 0 bytes .../map_objects/pics/cushions/zigzag_cushion.png | Bin 226 -> 0 bytes graphics/map_objects/pics/dolls/azurill_doll.png | Bin 215 -> 0 bytes graphics/map_objects/pics/dolls/baltoy_doll.png | Bin 216 -> 0 bytes .../map_objects/pics/dolls/big_blastoise_doll.png | Bin 425 -> 0 bytes .../map_objects/pics/dolls/big_charizard_doll.png | Bin 398 -> 0 bytes .../map_objects/pics/dolls/big_lapras_doll.png | Bin 380 -> 0 bytes .../map_objects/pics/dolls/big_regice_doll.png | Bin 380 -> 0 bytes .../map_objects/pics/dolls/big_regirock_doll.png | Bin 390 -> 0 bytes .../map_objects/pics/dolls/big_registeel_doll.png | Bin 389 -> 0 bytes .../map_objects/pics/dolls/big_rhydon_doll.png | Bin 393 -> 0 bytes .../map_objects/pics/dolls/big_snorlax_doll.png | Bin 379 -> 0 bytes .../map_objects/pics/dolls/big_venusaur_doll.png | Bin 463 -> 0 bytes .../map_objects/pics/dolls/big_wailmer_doll.png | Bin 357 -> 0 bytes graphics/map_objects/pics/dolls/chikorita_doll.png | Bin 213 -> 0 bytes graphics/map_objects/pics/dolls/clefairy_doll.png | Bin 227 -> 0 bytes graphics/map_objects/pics/dolls/cyndaquil_doll.png | Bin 232 -> 0 bytes graphics/map_objects/pics/dolls/ditto_doll.png | Bin 205 -> 0 bytes graphics/map_objects/pics/dolls/duskull_doll.png | Bin 228 -> 0 bytes graphics/map_objects/pics/dolls/gulpin_doll.png | Bin 215 -> 0 bytes .../map_objects/pics/dolls/jigglypuff_doll.png | Bin 229 -> 0 bytes graphics/map_objects/pics/dolls/kecleon_doll.png | Bin 236 -> 0 bytes graphics/map_objects/pics/dolls/lotad_doll.png | Bin 236 -> 0 bytes graphics/map_objects/pics/dolls/marill_doll.png | Bin 225 -> 0 bytes graphics/map_objects/pics/dolls/meowth_doll.png | Bin 248 -> 0 bytes graphics/map_objects/pics/dolls/mudkip_doll.png | Bin 225 -> 0 bytes graphics/map_objects/pics/dolls/pichu_doll.png | Bin 230 -> 0 bytes graphics/map_objects/pics/dolls/pikachu_doll.png | Bin 220 -> 0 bytes graphics/map_objects/pics/dolls/seedot_doll.png | Bin 258 -> 0 bytes graphics/map_objects/pics/dolls/skitty_doll.png | Bin 222 -> 0 bytes graphics/map_objects/pics/dolls/smoochum_doll.png | Bin 236 -> 0 bytes graphics/map_objects/pics/dolls/swablu_doll.png | Bin 223 -> 0 bytes graphics/map_objects/pics/dolls/togepi_doll.png | Bin 224 -> 0 bytes graphics/map_objects/pics/dolls/torchic_doll.png | Bin 239 -> 0 bytes graphics/map_objects/pics/dolls/totodile_doll.png | Bin 230 -> 0 bytes graphics/map_objects/pics/dolls/treecko_doll.png | Bin 233 -> 0 bytes .../pics/dolls/unused_magnemite_doll.png | Bin 223 -> 0 bytes .../map_objects/pics/dolls/unused_natu_doll.png | Bin 216 -> 0 bytes .../map_objects/pics/dolls/unused_pikachu_doll.png | Bin 231 -> 0 bytes .../pics/dolls/unused_porygon2_doll.png | Bin 252 -> 0 bytes .../pics/dolls/unused_squirtle_doll.png | Bin 245 -> 0 bytes .../map_objects/pics/dolls/unused_wooper_doll.png | Bin 231 -> 0 bytes graphics/map_objects/pics/dolls/wynaut_doll.png | Bin 214 -> 0 bytes graphics/map_objects/pics/effects/arrow/0.png | Bin 185 -> 0 bytes graphics/map_objects/pics/effects/arrow/1.png | Bin 183 -> 0 bytes graphics/map_objects/pics/effects/arrow/2.png | Bin 183 -> 0 bytes graphics/map_objects/pics/effects/arrow/3.png | Bin 185 -> 0 bytes graphics/map_objects/pics/effects/arrow/4.png | Bin 185 -> 0 bytes graphics/map_objects/pics/effects/arrow/5.png | Bin 183 -> 0 bytes graphics/map_objects/pics/effects/arrow/6.png | Bin 184 -> 0 bytes graphics/map_objects/pics/effects/arrow/7.png | Bin 185 -> 0 bytes graphics/map_objects/pics/effects/ash/0.png | Bin 168 -> 0 bytes graphics/map_objects/pics/effects/ash/1.png | Bin 191 -> 0 bytes graphics/map_objects/pics/effects/ash/2.png | Bin 194 -> 0 bytes graphics/map_objects/pics/effects/ash/3.png | Bin 185 -> 0 bytes graphics/map_objects/pics/effects/ash/4.png | Bin 163 -> 0 bytes .../pics/effects/berry_tree_growth_sparkle/0.png | Bin 132 -> 0 bytes .../pics/effects/berry_tree_growth_sparkle/1.png | Bin 141 -> 0 bytes .../pics/effects/berry_tree_growth_sparkle/2.png | Bin 151 -> 0 bytes .../pics/effects/berry_tree_growth_sparkle/3.png | Bin 153 -> 0 bytes .../pics/effects/berry_tree_growth_sparkle/4.png | Bin 145 -> 0 bytes .../pics/effects/berry_tree_growth_sparkle/5.png | Bin 134 -> 0 bytes .../pics/effects/bike_hop_big_splash/0.png | Bin 192 -> 0 bytes .../pics/effects/bike_hop_big_splash/1.png | Bin 193 -> 0 bytes .../pics/effects/bike_hop_big_splash/2.png | Bin 193 -> 0 bytes .../pics/effects/bike_hop_big_splash/3.png | Bin 169 -> 0 bytes .../pics/effects/bike_hop_small_splash/0.png | Bin 167 -> 0 bytes .../pics/effects/bike_hop_small_splash/1.png | Bin 176 -> 0 bytes .../pics/effects/bike_hop_small_splash/2.png | Bin 152 -> 0 bytes .../pics/effects/bike_hop_tall_grass/0.png | Bin 171 -> 0 bytes .../pics/effects/bike_hop_tall_grass/1.png | Bin 169 -> 0 bytes .../pics/effects/bike_hop_tall_grass/2.png | Bin 153 -> 0 bytes .../pics/effects/bike_hop_tall_grass/3.png | Bin 151 -> 0 bytes .../pics/effects/bike_tire_tracks/0.png | Bin 165 -> 0 bytes .../pics/effects/bike_tire_tracks/1.png | Bin 153 -> 0 bytes .../pics/effects/bike_tire_tracks/2.png | Bin 149 -> 0 bytes .../pics/effects/bike_tire_tracks/3.png | Bin 172 -> 0 bytes graphics/map_objects/pics/effects/bird.png | Bin 288 -> 0 bytes graphics/map_objects/pics/effects/bubbles/0.png | Bin 186 -> 0 bytes graphics/map_objects/pics/effects/bubbles/1.png | Bin 207 -> 0 bytes graphics/map_objects/pics/effects/bubbles/2.png | Bin 233 -> 0 bytes graphics/map_objects/pics/effects/bubbles/3.png | Bin 235 -> 0 bytes graphics/map_objects/pics/effects/bubbles/4.png | Bin 231 -> 0 bytes graphics/map_objects/pics/effects/bubbles/5.png | Bin 205 -> 0 bytes graphics/map_objects/pics/effects/bubbles/6.png | Bin 185 -> 0 bytes graphics/map_objects/pics/effects/bubbles/7.png | Bin 160 -> 0 bytes .../pics/effects/deep_sand_footprints/0.png | Bin 182 -> 0 bytes .../pics/effects/deep_sand_footprints/1.png | Bin 174 -> 0 bytes .../pics/effects/ground_impact_dust/0.png | Bin 174 -> 0 bytes .../pics/effects/ground_impact_dust/1.png | Bin 165 -> 0 bytes .../pics/effects/ground_impact_dust/2.png | Bin 158 -> 0 bytes .../map_objects/pics/effects/hot_springs_water.png | Bin 150 -> 0 bytes .../map_objects/pics/effects/jump_out_of_ash/0.png | Bin 175 -> 0 bytes .../map_objects/pics/effects/jump_out_of_ash/1.png | Bin 191 -> 0 bytes .../map_objects/pics/effects/jump_out_of_ash/2.png | Bin 208 -> 0 bytes .../map_objects/pics/effects/jump_out_of_ash/3.png | Bin 196 -> 0 bytes .../map_objects/pics/effects/jump_out_of_ash/4.png | Bin 190 -> 0 bytes graphics/map_objects/pics/effects/long_grass/0.png | Bin 236 -> 0 bytes graphics/map_objects/pics/effects/long_grass/1.png | Bin 230 -> 0 bytes graphics/map_objects/pics/effects/long_grass/2.png | Bin 231 -> 0 bytes graphics/map_objects/pics/effects/long_grass/3.png | Bin 236 -> 0 bytes .../pics/effects/mountain_disguise/0.png | Bin 221 -> 0 bytes .../pics/effects/mountain_disguise/1.png | Bin 248 -> 0 bytes .../pics/effects/mountain_disguise/2.png | Bin 241 -> 0 bytes .../pics/effects/mountain_disguise/3.png | Bin 237 -> 0 bytes .../pics/effects/mountain_disguise/4.png | Bin 217 -> 0 bytes .../pics/effects/mountain_disguise/5.png | Bin 200 -> 0 bytes .../pics/effects/mountain_disguise/6.png | Bin 164 -> 0 bytes graphics/map_objects/pics/effects/ripple/0.png | Bin 161 -> 0 bytes graphics/map_objects/pics/effects/ripple/1.png | Bin 171 -> 0 bytes graphics/map_objects/pics/effects/ripple/2.png | Bin 166 -> 0 bytes graphics/map_objects/pics/effects/ripple/3.png | Bin 176 -> 0 bytes graphics/map_objects/pics/effects/ripple/4.png | Bin 166 -> 0 bytes .../pics/effects/sand_disguise_placeholder/0.png | Bin 210 -> 0 bytes .../pics/effects/sand_disguise_placeholder/1.png | Bin 222 -> 0 bytes .../pics/effects/sand_disguise_placeholder/2.png | Bin 212 -> 0 bytes .../pics/effects/sand_disguise_placeholder/3.png | Bin 207 -> 0 bytes .../pics/effects/sand_disguise_placeholder/4.png | Bin 194 -> 0 bytes .../pics/effects/sand_disguise_placeholder/5.png | Bin 183 -> 0 bytes .../pics/effects/sand_disguise_placeholder/6.png | Bin 166 -> 0 bytes .../map_objects/pics/effects/sand_footprints/0.png | Bin 172 -> 0 bytes .../map_objects/pics/effects/sand_footprints/1.png | Bin 159 -> 0 bytes .../pics/effects/shadow_extra_large.png | Bin 165 -> 0 bytes graphics/map_objects/pics/effects/shadow_large.png | Bin 157 -> 0 bytes .../map_objects/pics/effects/shadow_medium.png | Bin 156 -> 0 bytes graphics/map_objects/pics/effects/shadow_small.png | Bin 156 -> 0 bytes .../map_objects/pics/effects/short_grass/0.png | Bin 159 -> 0 bytes .../map_objects/pics/effects/short_grass/1.png | Bin 156 -> 0 bytes graphics/map_objects/pics/effects/splash/0.png | Bin 160 -> 0 bytes graphics/map_objects/pics/effects/splash/1.png | Bin 163 -> 0 bytes graphics/map_objects/pics/effects/surf_blob/0.png | Bin 241 -> 0 bytes graphics/map_objects/pics/effects/surf_blob/1.png | Bin 244 -> 0 bytes graphics/map_objects/pics/effects/surf_blob/2.png | Bin 238 -> 0 bytes graphics/map_objects/pics/effects/tall_grass/0.png | Bin 199 -> 0 bytes graphics/map_objects/pics/effects/tall_grass/1.png | Bin 227 -> 0 bytes graphics/map_objects/pics/effects/tall_grass/2.png | Bin 219 -> 0 bytes graphics/map_objects/pics/effects/tall_grass/3.png | Bin 205 -> 0 bytes graphics/map_objects/pics/effects/tall_grass/4.png | Bin 207 -> 0 bytes .../map_objects/pics/effects/tree_disguise/0.png | Bin 270 -> 0 bytes .../map_objects/pics/effects/tree_disguise/1.png | Bin 278 -> 0 bytes .../map_objects/pics/effects/tree_disguise/2.png | Bin 248 -> 0 bytes .../map_objects/pics/effects/tree_disguise/3.png | Bin 249 -> 0 bytes .../map_objects/pics/effects/tree_disguise/4.png | Bin 227 -> 0 bytes .../map_objects/pics/effects/tree_disguise/5.png | Bin 216 -> 0 bytes .../map_objects/pics/effects/tree_disguise/6.png | Bin 164 -> 0 bytes graphics/map_objects/pics/effects/unknown_16/0.png | Bin 244 -> 0 bytes graphics/map_objects/pics/effects/unknown_16/1.png | Bin 241 -> 0 bytes graphics/map_objects/pics/effects/unknown_16/2.png | Bin 246 -> 0 bytes graphics/map_objects/pics/effects/unknown_16/3.png | Bin 249 -> 0 bytes graphics/map_objects/pics/effects/unknown_16/4.png | Bin 250 -> 0 bytes graphics/map_objects/pics/effects/unknown_16/5.png | Bin 226 -> 0 bytes graphics/map_objects/pics/effects/unknown_17/0.png | Bin 251 -> 0 bytes graphics/map_objects/pics/effects/unknown_17/1.png | Bin 248 -> 0 bytes graphics/map_objects/pics/effects/unknown_17/2.png | Bin 250 -> 0 bytes graphics/map_objects/pics/effects/unknown_17/3.png | Bin 250 -> 0 bytes graphics/map_objects/pics/effects/unknown_17/4.png | Bin 242 -> 0 bytes graphics/map_objects/pics/effects/unknown_17/5.png | Bin 240 -> 0 bytes graphics/map_objects/pics/effects/unknown_17/6.png | Bin 240 -> 0 bytes graphics/map_objects/pics/effects/unknown_17/7.png | Bin 245 -> 0 bytes graphics/map_objects/pics/effects/unknown_18/0.png | Bin 244 -> 0 bytes graphics/map_objects/pics/effects/unknown_18/1.png | Bin 245 -> 0 bytes graphics/map_objects/pics/effects/unknown_18/2.png | Bin 245 -> 0 bytes graphics/map_objects/pics/effects/unknown_18/3.png | Bin 244 -> 0 bytes graphics/map_objects/pics/effects/unknown_19/0.png | Bin 186 -> 0 bytes graphics/map_objects/pics/effects/unknown_19/1.png | Bin 204 -> 0 bytes graphics/map_objects/pics/effects/unknown_19/2.png | Bin 211 -> 0 bytes graphics/map_objects/pics/effects/unknown_19/3.png | Bin 203 -> 0 bytes graphics/map_objects/pics/effects/unknown_20/0.png | Bin 154 -> 0 bytes graphics/map_objects/pics/effects/unknown_20/1.png | Bin 171 -> 0 bytes graphics/map_objects/pics/effects/unknown_20/2.png | Bin 197 -> 0 bytes graphics/map_objects/pics/effects/unknown_20/3.png | Bin 211 -> 0 bytes graphics/map_objects/pics/effects/unknown_20/4.png | Bin 206 -> 0 bytes graphics/map_objects/pics/effects/unknown_29/0.png | Bin 164 -> 0 bytes graphics/map_objects/pics/effects/unknown_29/1.png | Bin 176 -> 0 bytes graphics/map_objects/pics/effects/unknown_29/2.png | Bin 171 -> 0 bytes graphics/map_objects/pics/effects/unknown_33/0.png | Bin 185 -> 0 bytes graphics/map_objects/pics/effects/unknown_33/1.png | Bin 224 -> 0 bytes graphics/map_objects/pics/effects/unknown_33/2.png | Bin 232 -> 0 bytes graphics/map_objects/pics/effects/unknown_33/3.png | Bin 223 -> 0 bytes graphics/map_objects/pics/effects/unknown_33/4.png | Bin 214 -> 0 bytes graphics/map_objects/pics/effects/unknown_35/0.png | Bin 157 -> 0 bytes graphics/map_objects/pics/effects/unknown_35/1.png | Bin 175 -> 0 bytes .../map_objects/pics/effects/unknown_4F6D38/0.png | Bin 130 -> 0 bytes .../map_objects/pics/effects/unknown_4F7E38/0.png | Bin 175 -> 0 bytes .../map_objects/pics/effects/unused_grass/0.png | Bin 231 -> 0 bytes .../map_objects/pics/effects/unused_grass/1.png | Bin 228 -> 0 bytes .../map_objects/pics/effects/unused_grass/2.png | Bin 230 -> 0 bytes .../map_objects/pics/effects/unused_grass/3.png | Bin 232 -> 0 bytes graphics/map_objects/pics/misc/birchs_bag.png | Bin 234 -> 0 bytes .../map_objects/pics/misc/birth_island_stone.png | Bin 224 -> 0 bytes .../map_objects/pics/misc/breakable_rock/0.png | Bin 220 -> 0 bytes .../map_objects/pics/misc/breakable_rock/1.png | Bin 219 -> 0 bytes .../map_objects/pics/misc/breakable_rock/2.png | Bin 225 -> 0 bytes .../map_objects/pics/misc/breakable_rock/3.png | Bin 221 -> 0 bytes graphics/map_objects/pics/misc/cable_car.png | Bin 569 -> 0 bytes graphics/map_objects/pics/misc/cuttable_tree/0.png | Bin 222 -> 0 bytes graphics/map_objects/pics/misc/cuttable_tree/1.png | Bin 230 -> 0 bytes graphics/map_objects/pics/misc/cuttable_tree/2.png | Bin 231 -> 0 bytes graphics/map_objects/pics/misc/cuttable_tree/3.png | Bin 181 -> 0 bytes graphics/map_objects/pics/misc/fossil.png | Bin 261 -> 0 bytes graphics/map_objects/pics/misc/item_ball.png | Bin 205 -> 0 bytes graphics/map_objects/pics/misc/moving_box.png | Bin 206 -> 0 bytes .../map_objects/pics/misc/mr_brineys_boat/0.png | Bin 307 -> 0 bytes .../map_objects/pics/misc/mr_brineys_boat/1.png | Bin 297 -> 0 bytes .../map_objects/pics/misc/mr_brineys_boat/2.png | Bin 392 -> 0 bytes .../map_objects/pics/misc/pushable_boulder.png | Bin 224 -> 0 bytes graphics/map_objects/pics/misc/ss_tidal.png | Bin 706 -> 0 bytes graphics/map_objects/pics/misc/statue.png | Bin 257 -> 0 bytes .../map_objects/pics/misc/submarine_shadow.png | Bin 256 -> 0 bytes graphics/map_objects/pics/misc/truck.png | Bin 436 -> 0 bytes graphics/map_objects/pics/people/anabel/0.png | Bin 283 -> 0 bytes graphics/map_objects/pics/people/anabel/1.png | Bin 264 -> 0 bytes graphics/map_objects/pics/people/anabel/2.png | Bin 255 -> 0 bytes graphics/map_objects/pics/people/anabel/3.png | Bin 275 -> 0 bytes graphics/map_objects/pics/people/anabel/4.png | Bin 276 -> 0 bytes graphics/map_objects/pics/people/anabel/5.png | Bin 260 -> 0 bytes graphics/map_objects/pics/people/anabel/6.png | Bin 259 -> 0 bytes graphics/map_objects/pics/people/anabel/7.png | Bin 266 -> 0 bytes graphics/map_objects/pics/people/anabel/8.png | Bin 260 -> 0 bytes .../map_objects/pics/people/aqua_member_f/0.png | Bin 295 -> 0 bytes .../map_objects/pics/people/aqua_member_f/1.png | Bin 266 -> 0 bytes .../map_objects/pics/people/aqua_member_f/2.png | Bin 262 -> 0 bytes .../map_objects/pics/people/aqua_member_f/3.png | Bin 286 -> 0 bytes .../map_objects/pics/people/aqua_member_f/4.png | Bin 285 -> 0 bytes .../map_objects/pics/people/aqua_member_f/5.png | Bin 264 -> 0 bytes .../map_objects/pics/people/aqua_member_f/6.png | Bin 265 -> 0 bytes .../map_objects/pics/people/aqua_member_f/7.png | Bin 274 -> 0 bytes .../map_objects/pics/people/aqua_member_f/8.png | Bin 270 -> 0 bytes .../map_objects/pics/people/aqua_member_m/0.png | Bin 301 -> 0 bytes .../map_objects/pics/people/aqua_member_m/1.png | Bin 286 -> 0 bytes .../map_objects/pics/people/aqua_member_m/2.png | Bin 263 -> 0 bytes .../map_objects/pics/people/aqua_member_m/3.png | Bin 287 -> 0 bytes .../map_objects/pics/people/aqua_member_m/4.png | Bin 288 -> 0 bytes .../map_objects/pics/people/aqua_member_m/5.png | Bin 271 -> 0 bytes .../map_objects/pics/people/aqua_member_m/6.png | Bin 276 -> 0 bytes .../map_objects/pics/people/aqua_member_m/7.png | Bin 269 -> 0 bytes .../map_objects/pics/people/aqua_member_m/8.png | Bin 267 -> 0 bytes graphics/map_objects/pics/people/archie/0.png | Bin 290 -> 0 bytes graphics/map_objects/pics/people/archie/1.png | Bin 265 -> 0 bytes graphics/map_objects/pics/people/archie/2.png | Bin 260 -> 0 bytes graphics/map_objects/pics/people/archie/3.png | Bin 284 -> 0 bytes graphics/map_objects/pics/people/archie/4.png | Bin 284 -> 0 bytes graphics/map_objects/pics/people/archie/5.png | Bin 256 -> 0 bytes graphics/map_objects/pics/people/archie/6.png | Bin 257 -> 0 bytes graphics/map_objects/pics/people/archie/7.png | Bin 261 -> 0 bytes graphics/map_objects/pics/people/archie/8.png | Bin 260 -> 0 bytes graphics/map_objects/pics/people/artist/0.png | Bin 302 -> 0 bytes graphics/map_objects/pics/people/artist/1.png | Bin 286 -> 0 bytes graphics/map_objects/pics/people/artist/2.png | Bin 278 -> 0 bytes graphics/map_objects/pics/people/artist/3.png | Bin 291 -> 0 bytes graphics/map_objects/pics/people/artist/4.png | Bin 291 -> 0 bytes graphics/map_objects/pics/people/artist/5.png | Bin 277 -> 0 bytes graphics/map_objects/pics/people/artist/6.png | Bin 277 -> 0 bytes graphics/map_objects/pics/people/artist/7.png | Bin 289 -> 0 bytes graphics/map_objects/pics/people/artist/8.png | Bin 283 -> 0 bytes graphics/map_objects/pics/people/beauty/0.png | Bin 296 -> 0 bytes graphics/map_objects/pics/people/beauty/1.png | Bin 290 -> 0 bytes graphics/map_objects/pics/people/beauty/2.png | Bin 264 -> 0 bytes graphics/map_objects/pics/people/beauty/3.png | Bin 284 -> 0 bytes graphics/map_objects/pics/people/beauty/4.png | Bin 283 -> 0 bytes graphics/map_objects/pics/people/beauty/5.png | Bin 280 -> 0 bytes graphics/map_objects/pics/people/beauty/6.png | Bin 278 -> 0 bytes graphics/map_objects/pics/people/beauty/7.png | Bin 269 -> 0 bytes graphics/map_objects/pics/people/beauty/8.png | Bin 269 -> 0 bytes graphics/map_objects/pics/people/black_belt/0.png | Bin 306 -> 0 bytes graphics/map_objects/pics/people/black_belt/1.png | Bin 304 -> 0 bytes graphics/map_objects/pics/people/black_belt/2.png | Bin 275 -> 0 bytes graphics/map_objects/pics/people/black_belt/3.png | Bin 295 -> 0 bytes graphics/map_objects/pics/people/black_belt/4.png | Bin 294 -> 0 bytes graphics/map_objects/pics/people/black_belt/5.png | Bin 293 -> 0 bytes graphics/map_objects/pics/people/black_belt/6.png | Bin 295 -> 0 bytes graphics/map_objects/pics/people/black_belt/7.png | Bin 278 -> 0 bytes graphics/map_objects/pics/people/black_belt/8.png | Bin 276 -> 0 bytes graphics/map_objects/pics/people/boy_1/0.png | Bin 283 -> 0 bytes graphics/map_objects/pics/people/boy_1/1.png | Bin 274 -> 0 bytes graphics/map_objects/pics/people/boy_1/2.png | Bin 254 -> 0 bytes graphics/map_objects/pics/people/boy_1/3.png | Bin 274 -> 0 bytes graphics/map_objects/pics/people/boy_1/4.png | Bin 275 -> 0 bytes graphics/map_objects/pics/people/boy_1/5.png | Bin 265 -> 0 bytes graphics/map_objects/pics/people/boy_1/6.png | Bin 265 -> 0 bytes graphics/map_objects/pics/people/boy_1/7.png | Bin 257 -> 0 bytes graphics/map_objects/pics/people/boy_1/8.png | Bin 259 -> 0 bytes graphics/map_objects/pics/people/boy_2/0.png | Bin 283 -> 0 bytes graphics/map_objects/pics/people/boy_2/1.png | Bin 275 -> 0 bytes graphics/map_objects/pics/people/boy_2/2.png | Bin 248 -> 0 bytes graphics/map_objects/pics/people/boy_2/3.png | Bin 277 -> 0 bytes graphics/map_objects/pics/people/boy_2/4.png | Bin 277 -> 0 bytes graphics/map_objects/pics/people/boy_2/5.png | Bin 268 -> 0 bytes graphics/map_objects/pics/people/boy_2/6.png | Bin 266 -> 0 bytes graphics/map_objects/pics/people/boy_2/7.png | Bin 251 -> 0 bytes graphics/map_objects/pics/people/boy_2/8.png | Bin 254 -> 0 bytes graphics/map_objects/pics/people/boy_3/0.png | Bin 281 -> 0 bytes graphics/map_objects/pics/people/boy_3/1.png | Bin 268 -> 0 bytes graphics/map_objects/pics/people/boy_3/2.png | Bin 247 -> 0 bytes graphics/map_objects/pics/people/boy_3/3.png | Bin 274 -> 0 bytes graphics/map_objects/pics/people/boy_3/4.png | Bin 272 -> 0 bytes graphics/map_objects/pics/people/boy_3/5.png | Bin 264 -> 0 bytes graphics/map_objects/pics/people/boy_3/6.png | Bin 261 -> 0 bytes graphics/map_objects/pics/people/boy_3/7.png | Bin 250 -> 0 bytes graphics/map_objects/pics/people/boy_3/8.png | Bin 249 -> 0 bytes graphics/map_objects/pics/people/boy_4/0.png | Bin 291 -> 0 bytes graphics/map_objects/pics/people/boy_4/1.png | Bin 280 -> 0 bytes graphics/map_objects/pics/people/boy_4/2.png | Bin 256 -> 0 bytes graphics/map_objects/pics/people/boy_4/3.png | Bin 279 -> 0 bytes graphics/map_objects/pics/people/boy_4/4.png | Bin 278 -> 0 bytes graphics/map_objects/pics/people/boy_4/5.png | Bin 277 -> 0 bytes graphics/map_objects/pics/people/boy_4/6.png | Bin 276 -> 0 bytes graphics/map_objects/pics/people/boy_4/7.png | Bin 258 -> 0 bytes graphics/map_objects/pics/people/boy_4/8.png | Bin 259 -> 0 bytes graphics/map_objects/pics/people/boy_5/0.png | Bin 282 -> 0 bytes graphics/map_objects/pics/people/boy_5/1.png | Bin 262 -> 0 bytes graphics/map_objects/pics/people/boy_5/2.png | Bin 266 -> 0 bytes graphics/map_objects/pics/people/brandon/0.png | Bin 292 -> 0 bytes graphics/map_objects/pics/people/brandon/1.png | Bin 285 -> 0 bytes graphics/map_objects/pics/people/brandon/2.png | Bin 251 -> 0 bytes graphics/map_objects/pics/people/brandon/3.png | Bin 277 -> 0 bytes graphics/map_objects/pics/people/brandon/4.png | Bin 277 -> 0 bytes graphics/map_objects/pics/people/brandon/5.png | Bin 273 -> 0 bytes graphics/map_objects/pics/people/brandon/6.png | Bin 276 -> 0 bytes graphics/map_objects/pics/people/brandon/7.png | Bin 263 -> 0 bytes graphics/map_objects/pics/people/brandon/8.png | Bin 262 -> 0 bytes graphics/map_objects/pics/people/brawly/0.png | Bin 301 -> 0 bytes graphics/map_objects/pics/people/brawly/1.png | Bin 277 -> 0 bytes graphics/map_objects/pics/people/brawly/2.png | Bin 265 -> 0 bytes .../pics/people/brendan/acro_bike/00.png | Bin 298 -> 0 bytes .../pics/people/brendan/acro_bike/01.png | Bin 285 -> 0 bytes .../pics/people/brendan/acro_bike/02.png | Bin 338 -> 0 bytes .../pics/people/brendan/acro_bike/03.png | Bin 303 -> 0 bytes .../pics/people/brendan/acro_bike/04.png | Bin 306 -> 0 bytes .../pics/people/brendan/acro_bike/05.png | Bin 279 -> 0 bytes .../pics/people/brendan/acro_bike/06.png | Bin 280 -> 0 bytes .../pics/people/brendan/acro_bike/07.png | Bin 339 -> 0 bytes .../pics/people/brendan/acro_bike/08.png | Bin 345 -> 0 bytes .../pics/people/brendan/acro_bike/09.png | Bin 298 -> 0 bytes .../pics/people/brendan/acro_bike/10.png | Bin 307 -> 0 bytes .../pics/people/brendan/acro_bike/11.png | Bin 284 -> 0 bytes .../pics/people/brendan/acro_bike/12.png | Bin 279 -> 0 bytes .../pics/people/brendan/acro_bike/13.png | Bin 288 -> 0 bytes .../pics/people/brendan/acro_bike/14.png | Bin 291 -> 0 bytes .../pics/people/brendan/acro_bike/15.png | Bin 285 -> 0 bytes .../pics/people/brendan/acro_bike/16.png | Bin 280 -> 0 bytes .../pics/people/brendan/acro_bike/17.png | Bin 343 -> 0 bytes .../pics/people/brendan/acro_bike/18.png | Bin 345 -> 0 bytes .../pics/people/brendan/acro_bike/19.png | Bin 339 -> 0 bytes .../pics/people/brendan/acro_bike/20.png | Bin 338 -> 0 bytes .../pics/people/brendan/acro_bike/21.png | Bin 311 -> 0 bytes .../pics/people/brendan/acro_bike/22.png | Bin 317 -> 0 bytes .../pics/people/brendan/acro_bike/23.png | Bin 290 -> 0 bytes .../pics/people/brendan/acro_bike/24.png | Bin 291 -> 0 bytes .../pics/people/brendan/acro_bike/25.png | Bin 342 -> 0 bytes .../pics/people/brendan/acro_bike/26.png | Bin 345 -> 0 bytes .../map_objects/pics/people/brendan/decorating.png | Bin 283 -> 0 bytes .../pics/people/brendan/field_move/0.png | Bin 286 -> 0 bytes .../pics/people/brendan/field_move/1.png | Bin 284 -> 0 bytes .../pics/people/brendan/field_move/2.png | Bin 287 -> 0 bytes .../pics/people/brendan/field_move/3.png | Bin 312 -> 0 bytes .../pics/people/brendan/field_move/4.png | Bin 316 -> 0 bytes .../map_objects/pics/people/brendan/fishing/00.png | Bin 299 -> 0 bytes .../map_objects/pics/people/brendan/fishing/01.png | Bin 299 -> 0 bytes .../map_objects/pics/people/brendan/fishing/02.png | Bin 303 -> 0 bytes .../map_objects/pics/people/brendan/fishing/03.png | Bin 304 -> 0 bytes .../map_objects/pics/people/brendan/fishing/04.png | Bin 284 -> 0 bytes .../map_objects/pics/people/brendan/fishing/05.png | Bin 288 -> 0 bytes .../map_objects/pics/people/brendan/fishing/06.png | Bin 308 -> 0 bytes .../map_objects/pics/people/brendan/fishing/07.png | Bin 302 -> 0 bytes .../map_objects/pics/people/brendan/fishing/08.png | Bin 297 -> 0 bytes .../map_objects/pics/people/brendan/fishing/09.png | Bin 298 -> 0 bytes .../map_objects/pics/people/brendan/fishing/10.png | Bin 296 -> 0 bytes .../map_objects/pics/people/brendan/fishing/11.png | Bin 301 -> 0 bytes .../pics/people/brendan/mach_bike/0.png | Bin 298 -> 0 bytes .../pics/people/brendan/mach_bike/1.png | Bin 285 -> 0 bytes .../pics/people/brendan/mach_bike/2.png | Bin 338 -> 0 bytes .../pics/people/brendan/mach_bike/3.png | Bin 303 -> 0 bytes .../pics/people/brendan/mach_bike/4.png | Bin 306 -> 0 bytes .../pics/people/brendan/mach_bike/5.png | Bin 279 -> 0 bytes .../pics/people/brendan/mach_bike/6.png | Bin 280 -> 0 bytes .../pics/people/brendan/mach_bike/7.png | Bin 339 -> 0 bytes .../pics/people/brendan/mach_bike/8.png | Bin 345 -> 0 bytes .../map_objects/pics/people/brendan/normal/00.png | Bin 294 -> 0 bytes .../map_objects/pics/people/brendan/normal/01.png | Bin 293 -> 0 bytes .../map_objects/pics/people/brendan/normal/02.png | Bin 274 -> 0 bytes .../map_objects/pics/people/brendan/normal/03.png | Bin 287 -> 0 bytes .../map_objects/pics/people/brendan/normal/04.png | Bin 285 -> 0 bytes .../map_objects/pics/people/brendan/normal/05.png | Bin 280 -> 0 bytes .../map_objects/pics/people/brendan/normal/06.png | Bin 280 -> 0 bytes .../map_objects/pics/people/brendan/normal/07.png | Bin 284 -> 0 bytes .../map_objects/pics/people/brendan/normal/08.png | Bin 280 -> 0 bytes .../map_objects/pics/people/brendan/normal/09.png | Bin 274 -> 0 bytes .../map_objects/pics/people/brendan/normal/10.png | Bin 275 -> 0 bytes .../map_objects/pics/people/brendan/normal/11.png | Bin 268 -> 0 bytes .../map_objects/pics/people/brendan/normal/12.png | Bin 270 -> 0 bytes .../map_objects/pics/people/brendan/normal/13.png | Bin 269 -> 0 bytes .../map_objects/pics/people/brendan/normal/14.png | Bin 270 -> 0 bytes .../map_objects/pics/people/brendan/normal/15.png | Bin 270 -> 0 bytes .../map_objects/pics/people/brendan/normal/16.png | Bin 283 -> 0 bytes .../map_objects/pics/people/brendan/normal/17.png | Bin 281 -> 0 bytes .../map_objects/pics/people/brendan/surfing/0.png | Bin 283 -> 0 bytes .../map_objects/pics/people/brendan/surfing/1.png | Bin 286 -> 0 bytes .../map_objects/pics/people/brendan/surfing/2.png | Bin 296 -> 0 bytes .../map_objects/pics/people/brendan/surfing/3.png | Bin 302 -> 0 bytes .../map_objects/pics/people/brendan/surfing/4.png | Bin 299 -> 0 bytes .../map_objects/pics/people/brendan/surfing/5.png | Bin 295 -> 0 bytes .../pics/people/brendan/underwater/0.png | Bin 265 -> 0 bytes .../pics/people/brendan/underwater/1.png | Bin 272 -> 0 bytes .../pics/people/brendan/underwater/2.png | Bin 278 -> 0 bytes .../pics/people/brendan/underwater/3.png | Bin 278 -> 0 bytes .../map_objects/pics/people/brendan/watering/0.png | Bin 293 -> 0 bytes .../map_objects/pics/people/brendan/watering/1.png | Bin 294 -> 0 bytes .../map_objects/pics/people/brendan/watering/2.png | Bin 311 -> 0 bytes .../map_objects/pics/people/brendan/watering/3.png | Bin 297 -> 0 bytes .../map_objects/pics/people/brendan/watering/4.png | Bin 295 -> 0 bytes .../map_objects/pics/people/brendan/watering/5.png | Bin 311 -> 0 bytes graphics/map_objects/pics/people/bug_catcher/0.png | Bin 299 -> 0 bytes graphics/map_objects/pics/people/bug_catcher/1.png | Bin 302 -> 0 bytes graphics/map_objects/pics/people/bug_catcher/2.png | Bin 279 -> 0 bytes graphics/map_objects/pics/people/bug_catcher/3.png | Bin 292 -> 0 bytes graphics/map_objects/pics/people/bug_catcher/4.png | Bin 293 -> 0 bytes graphics/map_objects/pics/people/bug_catcher/5.png | Bin 291 -> 0 bytes graphics/map_objects/pics/people/bug_catcher/6.png | Bin 291 -> 0 bytes graphics/map_objects/pics/people/bug_catcher/7.png | Bin 284 -> 0 bytes graphics/map_objects/pics/people/bug_catcher/8.png | Bin 285 -> 0 bytes graphics/map_objects/pics/people/cameraman/0.png | Bin 297 -> 0 bytes graphics/map_objects/pics/people/cameraman/1.png | Bin 288 -> 0 bytes graphics/map_objects/pics/people/cameraman/2.png | Bin 273 -> 0 bytes graphics/map_objects/pics/people/cameraman/3.png | Bin 293 -> 0 bytes graphics/map_objects/pics/people/cameraman/4.png | Bin 294 -> 0 bytes graphics/map_objects/pics/people/cameraman/5.png | Bin 284 -> 0 bytes graphics/map_objects/pics/people/cameraman/6.png | Bin 286 -> 0 bytes graphics/map_objects/pics/people/cameraman/7.png | Bin 279 -> 0 bytes graphics/map_objects/pics/people/cameraman/8.png | Bin 276 -> 0 bytes graphics/map_objects/pics/people/camper/0.png | Bin 293 -> 0 bytes graphics/map_objects/pics/people/camper/1.png | Bin 282 -> 0 bytes graphics/map_objects/pics/people/camper/2.png | Bin 263 -> 0 bytes graphics/map_objects/pics/people/camper/3.png | Bin 281 -> 0 bytes graphics/map_objects/pics/people/camper/4.png | Bin 283 -> 0 bytes graphics/map_objects/pics/people/camper/5.png | Bin 271 -> 0 bytes graphics/map_objects/pics/people/camper/6.png | Bin 272 -> 0 bytes graphics/map_objects/pics/people/camper/7.png | Bin 273 -> 0 bytes graphics/map_objects/pics/people/camper/8.png | Bin 273 -> 0 bytes .../map_objects/pics/people/contest_old_man/0.png | Bin 297 -> 0 bytes .../map_objects/pics/people/contest_old_man/1.png | Bin 277 -> 0 bytes .../map_objects/pics/people/contest_old_man/2.png | Bin 256 -> 0 bytes .../map_objects/pics/people/contest_old_man/3.png | Bin 284 -> 0 bytes .../map_objects/pics/people/contest_old_man/4.png | Bin 284 -> 0 bytes .../map_objects/pics/people/contest_old_man/5.png | Bin 277 -> 0 bytes .../map_objects/pics/people/contest_old_man/6.png | Bin 273 -> 0 bytes .../map_objects/pics/people/contest_old_man/7.png | Bin 268 -> 0 bytes .../map_objects/pics/people/contest_old_man/8.png | Bin 265 -> 0 bytes graphics/map_objects/pics/people/cook/0.png | Bin 303 -> 0 bytes graphics/map_objects/pics/people/cook/1.png | Bin 293 -> 0 bytes graphics/map_objects/pics/people/cook/2.png | Bin 290 -> 0 bytes .../pics/people/cycling_triathlete_f/0.png | Bin 290 -> 0 bytes .../pics/people/cycling_triathlete_f/1.png | Bin 285 -> 0 bytes .../pics/people/cycling_triathlete_f/2.png | Bin 329 -> 0 bytes .../pics/people/cycling_triathlete_f/3.png | Bin 291 -> 0 bytes .../pics/people/cycling_triathlete_f/4.png | Bin 291 -> 0 bytes .../pics/people/cycling_triathlete_f/5.png | Bin 286 -> 0 bytes .../pics/people/cycling_triathlete_f/6.png | Bin 287 -> 0 bytes .../pics/people/cycling_triathlete_f/7.png | Bin 329 -> 0 bytes .../pics/people/cycling_triathlete_f/8.png | Bin 333 -> 0 bytes .../pics/people/cycling_triathlete_m/0.png | Bin 290 -> 0 bytes .../pics/people/cycling_triathlete_m/1.png | Bin 286 -> 0 bytes .../pics/people/cycling_triathlete_m/2.png | Bin 332 -> 0 bytes .../pics/people/cycling_triathlete_m/3.png | Bin 292 -> 0 bytes .../pics/people/cycling_triathlete_m/4.png | Bin 292 -> 0 bytes .../pics/people/cycling_triathlete_m/5.png | Bin 291 -> 0 bytes .../pics/people/cycling_triathlete_m/6.png | Bin 292 -> 0 bytes .../pics/people/cycling_triathlete_m/7.png | Bin 328 -> 0 bytes .../pics/people/cycling_triathlete_m/8.png | Bin 331 -> 0 bytes graphics/map_objects/pics/people/drake/0.png | Bin 295 -> 0 bytes graphics/map_objects/pics/people/drake/1.png | Bin 280 -> 0 bytes graphics/map_objects/pics/people/drake/2.png | Bin 266 -> 0 bytes graphics/map_objects/pics/people/fat_man/0.png | Bin 292 -> 0 bytes graphics/map_objects/pics/people/fat_man/1.png | Bin 290 -> 0 bytes graphics/map_objects/pics/people/fat_man/2.png | Bin 292 -> 0 bytes graphics/map_objects/pics/people/fat_man/3.png | Bin 289 -> 0 bytes graphics/map_objects/pics/people/fat_man/4.png | Bin 287 -> 0 bytes graphics/map_objects/pics/people/fat_man/5.png | Bin 284 -> 0 bytes graphics/map_objects/pics/people/fat_man/6.png | Bin 282 -> 0 bytes graphics/map_objects/pics/people/fat_man/7.png | Bin 292 -> 0 bytes graphics/map_objects/pics/people/fat_man/8.png | Bin 289 -> 0 bytes graphics/map_objects/pics/people/fisherman/0.png | Bin 302 -> 0 bytes graphics/map_objects/pics/people/fisherman/1.png | Bin 286 -> 0 bytes graphics/map_objects/pics/people/fisherman/2.png | Bin 270 -> 0 bytes graphics/map_objects/pics/people/fisherman/3.png | Bin 291 -> 0 bytes graphics/map_objects/pics/people/fisherman/4.png | Bin 291 -> 0 bytes graphics/map_objects/pics/people/fisherman/5.png | Bin 281 -> 0 bytes graphics/map_objects/pics/people/fisherman/6.png | Bin 281 -> 0 bytes graphics/map_objects/pics/people/fisherman/7.png | Bin 273 -> 0 bytes graphics/map_objects/pics/people/fisherman/8.png | Bin 270 -> 0 bytes graphics/map_objects/pics/people/flannery/0.png | Bin 289 -> 0 bytes graphics/map_objects/pics/people/flannery/1.png | Bin 294 -> 0 bytes graphics/map_objects/pics/people/flannery/2.png | Bin 264 -> 0 bytes graphics/map_objects/pics/people/gentleman/0.png | Bin 295 -> 0 bytes graphics/map_objects/pics/people/gentleman/1.png | Bin 292 -> 0 bytes graphics/map_objects/pics/people/gentleman/2.png | Bin 268 -> 0 bytes graphics/map_objects/pics/people/gentleman/3.png | Bin 286 -> 0 bytes graphics/map_objects/pics/people/gentleman/4.png | Bin 287 -> 0 bytes graphics/map_objects/pics/people/gentleman/5.png | Bin 280 -> 0 bytes graphics/map_objects/pics/people/gentleman/6.png | Bin 281 -> 0 bytes graphics/map_objects/pics/people/gentleman/7.png | Bin 279 -> 0 bytes graphics/map_objects/pics/people/gentleman/8.png | Bin 276 -> 0 bytes graphics/map_objects/pics/people/girl_1/0.png | Bin 286 -> 0 bytes graphics/map_objects/pics/people/girl_1/1.png | Bin 271 -> 0 bytes graphics/map_objects/pics/people/girl_1/2.png | Bin 257 -> 0 bytes graphics/map_objects/pics/people/girl_1/3.png | Bin 274 -> 0 bytes graphics/map_objects/pics/people/girl_1/4.png | Bin 277 -> 0 bytes graphics/map_objects/pics/people/girl_1/5.png | Bin 260 -> 0 bytes graphics/map_objects/pics/people/girl_1/6.png | Bin 263 -> 0 bytes graphics/map_objects/pics/people/girl_1/7.png | Bin 260 -> 0 bytes graphics/map_objects/pics/people/girl_1/8.png | Bin 264 -> 0 bytes graphics/map_objects/pics/people/girl_2/0.png | Bin 288 -> 0 bytes graphics/map_objects/pics/people/girl_2/1.png | Bin 276 -> 0 bytes graphics/map_objects/pics/people/girl_2/2.png | Bin 263 -> 0 bytes graphics/map_objects/pics/people/girl_2/3.png | Bin 275 -> 0 bytes graphics/map_objects/pics/people/girl_2/4.png | Bin 277 -> 0 bytes graphics/map_objects/pics/people/girl_2/5.png | Bin 266 -> 0 bytes graphics/map_objects/pics/people/girl_2/6.png | Bin 265 -> 0 bytes graphics/map_objects/pics/people/girl_2/7.png | Bin 264 -> 0 bytes graphics/map_objects/pics/people/girl_2/8.png | Bin 267 -> 0 bytes graphics/map_objects/pics/people/girl_3/0.png | Bin 286 -> 0 bytes graphics/map_objects/pics/people/girl_3/1.png | Bin 288 -> 0 bytes graphics/map_objects/pics/people/girl_3/2.png | Bin 264 -> 0 bytes graphics/map_objects/pics/people/girl_3/3.png | Bin 275 -> 0 bytes graphics/map_objects/pics/people/girl_3/4.png | Bin 274 -> 0 bytes graphics/map_objects/pics/people/girl_3/5.png | Bin 281 -> 0 bytes graphics/map_objects/pics/people/girl_3/6.png | Bin 281 -> 0 bytes graphics/map_objects/pics/people/girl_3/7.png | Bin 272 -> 0 bytes graphics/map_objects/pics/people/girl_3/8.png | Bin 272 -> 0 bytes graphics/map_objects/pics/people/glacia/0.png | Bin 295 -> 0 bytes graphics/map_objects/pics/people/glacia/1.png | Bin 281 -> 0 bytes graphics/map_objects/pics/people/glacia/2.png | Bin 262 -> 0 bytes graphics/map_objects/pics/people/greta/0.png | Bin 277 -> 0 bytes graphics/map_objects/pics/people/greta/1.png | Bin 269 -> 0 bytes graphics/map_objects/pics/people/greta/2.png | Bin 257 -> 0 bytes graphics/map_objects/pics/people/greta/3.png | Bin 265 -> 0 bytes graphics/map_objects/pics/people/greta/4.png | Bin 266 -> 0 bytes graphics/map_objects/pics/people/greta/5.png | Bin 262 -> 0 bytes graphics/map_objects/pics/people/greta/6.png | Bin 261 -> 0 bytes graphics/map_objects/pics/people/greta/7.png | Bin 265 -> 0 bytes graphics/map_objects/pics/people/greta/8.png | Bin 263 -> 0 bytes graphics/map_objects/pics/people/hex_maniac/0.png | Bin 289 -> 0 bytes graphics/map_objects/pics/people/hex_maniac/1.png | Bin 251 -> 0 bytes graphics/map_objects/pics/people/hex_maniac/2.png | Bin 247 -> 0 bytes graphics/map_objects/pics/people/hex_maniac/3.png | Bin 279 -> 0 bytes graphics/map_objects/pics/people/hex_maniac/4.png | Bin 277 -> 0 bytes graphics/map_objects/pics/people/hex_maniac/5.png | Bin 243 -> 0 bytes graphics/map_objects/pics/people/hex_maniac/6.png | Bin 241 -> 0 bytes graphics/map_objects/pics/people/hex_maniac/7.png | Bin 249 -> 0 bytes graphics/map_objects/pics/people/hex_maniac/8.png | Bin 248 -> 0 bytes graphics/map_objects/pics/people/hiker/0.png | Bin 310 -> 0 bytes graphics/map_objects/pics/people/hiker/1.png | Bin 306 -> 0 bytes graphics/map_objects/pics/people/hiker/2.png | Bin 281 -> 0 bytes graphics/map_objects/pics/people/hiker/3.png | Bin 300 -> 0 bytes graphics/map_objects/pics/people/hiker/4.png | Bin 301 -> 0 bytes graphics/map_objects/pics/people/hiker/5.png | Bin 301 -> 0 bytes graphics/map_objects/pics/people/hiker/6.png | Bin 299 -> 0 bytes graphics/map_objects/pics/people/hiker/7.png | Bin 285 -> 0 bytes graphics/map_objects/pics/people/hiker/8.png | Bin 281 -> 0 bytes .../pics/people/hot_springs_old_woman/0.png | Bin 226 -> 0 bytes .../pics/people/hot_springs_old_woman/1.png | Bin 216 -> 0 bytes .../pics/people/hot_springs_old_woman/2.png | Bin 222 -> 0 bytes .../pics/people/hot_springs_old_woman/3.png | Bin 220 -> 0 bytes .../pics/people/hot_springs_old_woman/4.png | Bin 220 -> 0 bytes .../pics/people/hot_springs_old_woman/5.png | Bin 211 -> 0 bytes .../pics/people/hot_springs_old_woman/6.png | Bin 211 -> 0 bytes .../pics/people/hot_springs_old_woman/7.png | Bin 218 -> 0 bytes .../pics/people/hot_springs_old_woman/8.png | Bin 218 -> 0 bytes graphics/map_objects/pics/people/juan/0.png | Bin 291 -> 0 bytes graphics/map_objects/pics/people/juan/1.png | Bin 259 -> 0 bytes graphics/map_objects/pics/people/juan/2.png | Bin 254 -> 0 bytes graphics/map_objects/pics/people/juan/3.png | Bin 284 -> 0 bytes graphics/map_objects/pics/people/juan/4.png | Bin 282 -> 0 bytes graphics/map_objects/pics/people/juan/5.png | Bin 259 -> 0 bytes graphics/map_objects/pics/people/juan/6.png | Bin 255 -> 0 bytes graphics/map_objects/pics/people/juan/7.png | Bin 261 -> 0 bytes graphics/map_objects/pics/people/juan/8.png | Bin 261 -> 0 bytes graphics/map_objects/pics/people/lass/0.png | Bin 297 -> 0 bytes graphics/map_objects/pics/people/lass/1.png | Bin 293 -> 0 bytes graphics/map_objects/pics/people/lass/2.png | Bin 260 -> 0 bytes graphics/map_objects/pics/people/lass/3.png | Bin 290 -> 0 bytes graphics/map_objects/pics/people/lass/4.png | Bin 290 -> 0 bytes graphics/map_objects/pics/people/lass/5.png | Bin 284 -> 0 bytes graphics/map_objects/pics/people/lass/6.png | Bin 284 -> 0 bytes graphics/map_objects/pics/people/lass/7.png | Bin 263 -> 0 bytes graphics/map_objects/pics/people/lass/8.png | Bin 267 -> 0 bytes graphics/map_objects/pics/people/leaf/0.png | Bin 293 -> 0 bytes graphics/map_objects/pics/people/leaf/1.png | Bin 293 -> 0 bytes graphics/map_objects/pics/people/leaf/2.png | Bin 273 -> 0 bytes graphics/map_objects/pics/people/leaf/3.png | Bin 287 -> 0 bytes graphics/map_objects/pics/people/leaf/4.png | Bin 285 -> 0 bytes graphics/map_objects/pics/people/leaf/5.png | Bin 287 -> 0 bytes graphics/map_objects/pics/people/leaf/6.png | Bin 283 -> 0 bytes graphics/map_objects/pics/people/leaf/7.png | Bin 279 -> 0 bytes graphics/map_objects/pics/people/leaf/8.png | Bin 277 -> 0 bytes .../map_objects/pics/people/little_boy_1/0.png | Bin 232 -> 0 bytes .../map_objects/pics/people/little_boy_1/1.png | Bin 228 -> 0 bytes .../map_objects/pics/people/little_boy_1/2.png | Bin 221 -> 0 bytes .../map_objects/pics/people/little_boy_1/3.png | Bin 227 -> 0 bytes .../map_objects/pics/people/little_boy_1/4.png | Bin 226 -> 0 bytes .../map_objects/pics/people/little_boy_1/5.png | Bin 224 -> 0 bytes .../map_objects/pics/people/little_boy_1/6.png | Bin 223 -> 0 bytes .../map_objects/pics/people/little_boy_1/7.png | Bin 226 -> 0 bytes .../map_objects/pics/people/little_boy_1/8.png | Bin 222 -> 0 bytes .../map_objects/pics/people/little_boy_2/0.png | Bin 232 -> 0 bytes .../map_objects/pics/people/little_boy_2/1.png | Bin 230 -> 0 bytes .../map_objects/pics/people/little_boy_2/2.png | Bin 220 -> 0 bytes .../map_objects/pics/people/little_boy_2/3.png | Bin 226 -> 0 bytes .../map_objects/pics/people/little_boy_2/4.png | Bin 227 -> 0 bytes .../map_objects/pics/people/little_boy_2/5.png | Bin 225 -> 0 bytes .../map_objects/pics/people/little_boy_2/6.png | Bin 226 -> 0 bytes .../map_objects/pics/people/little_boy_2/7.png | Bin 222 -> 0 bytes .../map_objects/pics/people/little_boy_2/8.png | Bin 221 -> 0 bytes .../map_objects/pics/people/little_girl_1/0.png | Bin 250 -> 0 bytes .../map_objects/pics/people/little_girl_1/1.png | Bin 245 -> 0 bytes .../map_objects/pics/people/little_girl_1/2.png | Bin 241 -> 0 bytes .../map_objects/pics/people/little_girl_1/3.png | Bin 252 -> 0 bytes .../map_objects/pics/people/little_girl_1/4.png | Bin 252 -> 0 bytes .../map_objects/pics/people/little_girl_1/5.png | Bin 247 -> 0 bytes .../map_objects/pics/people/little_girl_1/6.png | Bin 248 -> 0 bytes .../map_objects/pics/people/little_girl_1/7.png | Bin 246 -> 0 bytes .../map_objects/pics/people/little_girl_1/8.png | Bin 246 -> 0 bytes .../map_objects/pics/people/little_girl_2/0.png | Bin 239 -> 0 bytes .../map_objects/pics/people/little_girl_2/1.png | Bin 232 -> 0 bytes .../map_objects/pics/people/little_girl_2/2.png | Bin 227 -> 0 bytes .../map_objects/pics/people/little_girl_2/3.png | Bin 233 -> 0 bytes .../map_objects/pics/people/little_girl_2/4.png | Bin 234 -> 0 bytes .../map_objects/pics/people/little_girl_2/5.png | Bin 229 -> 0 bytes .../map_objects/pics/people/little_girl_2/6.png | Bin 229 -> 0 bytes .../map_objects/pics/people/little_girl_2/7.png | Bin 224 -> 0 bytes .../map_objects/pics/people/little_girl_2/8.png | Bin 223 -> 0 bytes graphics/map_objects/pics/people/liza/0.png | Bin 278 -> 0 bytes graphics/map_objects/pics/people/liza/1.png | Bin 265 -> 0 bytes graphics/map_objects/pics/people/liza/2.png | Bin 267 -> 0 bytes graphics/map_objects/pics/people/lucy/0.png | Bin 284 -> 0 bytes graphics/map_objects/pics/people/lucy/1.png | Bin 242 -> 0 bytes graphics/map_objects/pics/people/lucy/2.png | Bin 254 -> 0 bytes graphics/map_objects/pics/people/lucy/3.png | Bin 270 -> 0 bytes graphics/map_objects/pics/people/lucy/4.png | Bin 272 -> 0 bytes graphics/map_objects/pics/people/lucy/5.png | Bin 228 -> 0 bytes graphics/map_objects/pics/people/lucy/6.png | Bin 231 -> 0 bytes graphics/map_objects/pics/people/lucy/7.png | Bin 262 -> 0 bytes graphics/map_objects/pics/people/lucy/8.png | Bin 264 -> 0 bytes .../map_objects/pics/people/magma_member_f/0.png | Bin 295 -> 0 bytes .../map_objects/pics/people/magma_member_f/1.png | Bin 283 -> 0 bytes .../map_objects/pics/people/magma_member_f/2.png | Bin 259 -> 0 bytes .../map_objects/pics/people/magma_member_f/3.png | Bin 282 -> 0 bytes .../map_objects/pics/people/magma_member_f/4.png | Bin 279 -> 0 bytes .../map_objects/pics/people/magma_member_f/5.png | Bin 272 -> 0 bytes .../map_objects/pics/people/magma_member_f/6.png | Bin 272 -> 0 bytes .../map_objects/pics/people/magma_member_f/7.png | Bin 262 -> 0 bytes .../map_objects/pics/people/magma_member_f/8.png | Bin 262 -> 0 bytes .../map_objects/pics/people/magma_member_m/0.png | Bin 289 -> 0 bytes .../map_objects/pics/people/magma_member_m/1.png | Bin 271 -> 0 bytes .../map_objects/pics/people/magma_member_m/2.png | Bin 255 -> 0 bytes .../map_objects/pics/people/magma_member_m/3.png | Bin 277 -> 0 bytes .../map_objects/pics/people/magma_member_m/4.png | Bin 278 -> 0 bytes .../map_objects/pics/people/magma_member_m/5.png | Bin 263 -> 0 bytes .../map_objects/pics/people/magma_member_m/6.png | Bin 262 -> 0 bytes .../map_objects/pics/people/magma_member_m/7.png | Bin 256 -> 0 bytes .../map_objects/pics/people/magma_member_m/8.png | Bin 262 -> 0 bytes graphics/map_objects/pics/people/man_1/0.png | Bin 283 -> 0 bytes graphics/map_objects/pics/people/man_1/1.png | Bin 281 -> 0 bytes graphics/map_objects/pics/people/man_1/2.png | Bin 256 -> 0 bytes graphics/map_objects/pics/people/man_1/3.png | Bin 272 -> 0 bytes graphics/map_objects/pics/people/man_1/4.png | Bin 270 -> 0 bytes graphics/map_objects/pics/people/man_1/5.png | Bin 267 -> 0 bytes graphics/map_objects/pics/people/man_1/6.png | Bin 266 -> 0 bytes graphics/map_objects/pics/people/man_1/7.png | Bin 260 -> 0 bytes graphics/map_objects/pics/people/man_1/8.png | Bin 261 -> 0 bytes graphics/map_objects/pics/people/man_2/0.png | Bin 298 -> 0 bytes graphics/map_objects/pics/people/man_2/1.png | Bin 271 -> 0 bytes graphics/map_objects/pics/people/man_2/2.png | Bin 257 -> 0 bytes graphics/map_objects/pics/people/man_2/3.png | Bin 281 -> 0 bytes graphics/map_objects/pics/people/man_2/4.png | Bin 281 -> 0 bytes graphics/map_objects/pics/people/man_2/5.png | Bin 261 -> 0 bytes graphics/map_objects/pics/people/man_2/6.png | Bin 261 -> 0 bytes graphics/map_objects/pics/people/man_2/7.png | Bin 267 -> 0 bytes graphics/map_objects/pics/people/man_2/8.png | Bin 263 -> 0 bytes graphics/map_objects/pics/people/man_3/0.png | Bin 296 -> 0 bytes graphics/map_objects/pics/people/man_3/1.png | Bin 286 -> 0 bytes graphics/map_objects/pics/people/man_3/2.png | Bin 258 -> 0 bytes graphics/map_objects/pics/people/man_3/3.png | Bin 284 -> 0 bytes graphics/map_objects/pics/people/man_3/4.png | Bin 283 -> 0 bytes graphics/map_objects/pics/people/man_3/5.png | Bin 275 -> 0 bytes graphics/map_objects/pics/people/man_3/6.png | Bin 274 -> 0 bytes graphics/map_objects/pics/people/man_3/7.png | Bin 266 -> 0 bytes graphics/map_objects/pics/people/man_3/8.png | Bin 268 -> 0 bytes graphics/map_objects/pics/people/man_4/0.png | Bin 295 -> 0 bytes graphics/map_objects/pics/people/man_4/1.png | Bin 285 -> 0 bytes graphics/map_objects/pics/people/man_4/2.png | Bin 259 -> 0 bytes graphics/map_objects/pics/people/man_4/3.png | Bin 283 -> 0 bytes graphics/map_objects/pics/people/man_4/4.png | Bin 284 -> 0 bytes graphics/map_objects/pics/people/man_4/5.png | Bin 277 -> 0 bytes graphics/map_objects/pics/people/man_4/6.png | Bin 279 -> 0 bytes graphics/map_objects/pics/people/man_4/7.png | Bin 266 -> 0 bytes graphics/map_objects/pics/people/man_4/8.png | Bin 264 -> 0 bytes graphics/map_objects/pics/people/man_5/0.png | Bin 291 -> 0 bytes graphics/map_objects/pics/people/man_5/1.png | Bin 281 -> 0 bytes graphics/map_objects/pics/people/man_5/2.png | Bin 253 -> 0 bytes graphics/map_objects/pics/people/man_5/3.png | Bin 277 -> 0 bytes graphics/map_objects/pics/people/man_5/4.png | Bin 276 -> 0 bytes graphics/map_objects/pics/people/man_5/5.png | Bin 268 -> 0 bytes graphics/map_objects/pics/people/man_5/6.png | Bin 267 -> 0 bytes graphics/map_objects/pics/people/man_5/7.png | Bin 256 -> 0 bytes graphics/map_objects/pics/people/man_5/8.png | Bin 257 -> 0 bytes graphics/map_objects/pics/people/man_6/0.png | Bin 304 -> 0 bytes graphics/map_objects/pics/people/man_6/1.png | Bin 298 -> 0 bytes graphics/map_objects/pics/people/man_6/2.png | Bin 260 -> 0 bytes graphics/map_objects/pics/people/man_6/3.png | Bin 287 -> 0 bytes graphics/map_objects/pics/people/man_6/4.png | Bin 287 -> 0 bytes graphics/map_objects/pics/people/man_6/5.png | Bin 284 -> 0 bytes graphics/map_objects/pics/people/man_6/6.png | Bin 285 -> 0 bytes graphics/map_objects/pics/people/man_6/7.png | Bin 267 -> 0 bytes graphics/map_objects/pics/people/man_6/8.png | Bin 266 -> 0 bytes graphics/map_objects/pics/people/man_7/0.png | Bin 298 -> 0 bytes graphics/map_objects/pics/people/man_7/1.png | Bin 271 -> 0 bytes graphics/map_objects/pics/people/man_7/2.png | Bin 257 -> 0 bytes graphics/map_objects/pics/people/man_7/3.png | Bin 281 -> 0 bytes graphics/map_objects/pics/people/man_7/4.png | Bin 281 -> 0 bytes graphics/map_objects/pics/people/man_7/5.png | Bin 261 -> 0 bytes graphics/map_objects/pics/people/man_7/6.png | Bin 261 -> 0 bytes graphics/map_objects/pics/people/man_7/7.png | Bin 267 -> 0 bytes graphics/map_objects/pics/people/man_7/8.png | Bin 263 -> 0 bytes graphics/map_objects/pics/people/maniac/0.png | Bin 288 -> 0 bytes graphics/map_objects/pics/people/maniac/1.png | Bin 266 -> 0 bytes graphics/map_objects/pics/people/maniac/2.png | Bin 256 -> 0 bytes graphics/map_objects/pics/people/maniac/3.png | Bin 277 -> 0 bytes graphics/map_objects/pics/people/maniac/4.png | Bin 279 -> 0 bytes graphics/map_objects/pics/people/maniac/5.png | Bin 259 -> 0 bytes graphics/map_objects/pics/people/maniac/6.png | Bin 257 -> 0 bytes graphics/map_objects/pics/people/maniac/7.png | Bin 263 -> 0 bytes graphics/map_objects/pics/people/maniac/8.png | Bin 259 -> 0 bytes .../map_objects/pics/people/mart_employee/0.png | Bin 290 -> 0 bytes .../map_objects/pics/people/mart_employee/1.png | Bin 284 -> 0 bytes .../map_objects/pics/people/mart_employee/2.png | Bin 251 -> 0 bytes .../map_objects/pics/people/mart_employee/3.png | Bin 280 -> 0 bytes .../map_objects/pics/people/mart_employee/4.png | Bin 282 -> 0 bytes .../map_objects/pics/people/mart_employee/5.png | Bin 272 -> 0 bytes .../map_objects/pics/people/mart_employee/6.png | Bin 274 -> 0 bytes .../map_objects/pics/people/mart_employee/7.png | Bin 258 -> 0 bytes .../map_objects/pics/people/mart_employee/8.png | Bin 258 -> 0 bytes .../pics/people/mauville_old_man_1/0.png | Bin 301 -> 0 bytes .../pics/people/mauville_old_man_1/1.png | Bin 292 -> 0 bytes .../pics/people/mauville_old_man_1/2.png | Bin 277 -> 0 bytes .../pics/people/mauville_old_man_1/3.png | Bin 297 -> 0 bytes .../pics/people/mauville_old_man_1/4.png | Bin 295 -> 0 bytes .../pics/people/mauville_old_man_1/5.png | Bin 289 -> 0 bytes .../pics/people/mauville_old_man_1/6.png | Bin 287 -> 0 bytes .../pics/people/mauville_old_man_1/7.png | Bin 280 -> 0 bytes .../pics/people/mauville_old_man_1/8.png | Bin 281 -> 0 bytes .../pics/people/mauville_old_man_2/0.png | Bin 297 -> 0 bytes .../pics/people/mauville_old_man_2/1.png | Bin 291 -> 0 bytes .../pics/people/mauville_old_man_2/2.png | Bin 273 -> 0 bytes .../pics/people/mauville_old_man_2/3.png | Bin 293 -> 0 bytes .../pics/people/mauville_old_man_2/4.png | Bin 291 -> 0 bytes .../pics/people/mauville_old_man_2/5.png | Bin 288 -> 0 bytes .../pics/people/mauville_old_man_2/6.png | Bin 286 -> 0 bytes .../pics/people/mauville_old_man_2/7.png | Bin 277 -> 0 bytes .../pics/people/mauville_old_man_2/8.png | Bin 278 -> 0 bytes graphics/map_objects/pics/people/maxie/0.png | Bin 291 -> 0 bytes graphics/map_objects/pics/people/maxie/1.png | Bin 273 -> 0 bytes graphics/map_objects/pics/people/maxie/2.png | Bin 261 -> 0 bytes graphics/map_objects/pics/people/maxie/3.png | Bin 291 -> 0 bytes graphics/map_objects/pics/people/maxie/4.png | Bin 292 -> 0 bytes graphics/map_objects/pics/people/maxie/5.png | Bin 266 -> 0 bytes graphics/map_objects/pics/people/maxie/6.png | Bin 267 -> 0 bytes graphics/map_objects/pics/people/maxie/7.png | Bin 261 -> 0 bytes graphics/map_objects/pics/people/maxie/8.png | Bin 257 -> 0 bytes .../map_objects/pics/people/may/acro_bike/00.png | Bin 302 -> 0 bytes .../map_objects/pics/people/may/acro_bike/01.png | Bin 297 -> 0 bytes .../map_objects/pics/people/may/acro_bike/02.png | Bin 339 -> 0 bytes .../map_objects/pics/people/may/acro_bike/03.png | Bin 304 -> 0 bytes .../map_objects/pics/people/may/acro_bike/04.png | Bin 305 -> 0 bytes .../map_objects/pics/people/may/acro_bike/05.png | Bin 299 -> 0 bytes .../map_objects/pics/people/may/acro_bike/06.png | Bin 299 -> 0 bytes .../map_objects/pics/people/may/acro_bike/07.png | Bin 336 -> 0 bytes .../map_objects/pics/people/may/acro_bike/08.png | Bin 340 -> 0 bytes .../map_objects/pics/people/may/acro_bike/09.png | Bin 301 -> 0 bytes .../map_objects/pics/people/may/acro_bike/10.png | Bin 313 -> 0 bytes .../map_objects/pics/people/may/acro_bike/11.png | Bin 291 -> 0 bytes .../map_objects/pics/people/may/acro_bike/12.png | Bin 281 -> 0 bytes .../map_objects/pics/people/may/acro_bike/13.png | Bin 297 -> 0 bytes .../map_objects/pics/people/may/acro_bike/14.png | Bin 295 -> 0 bytes .../map_objects/pics/people/may/acro_bike/15.png | Bin 283 -> 0 bytes .../map_objects/pics/people/may/acro_bike/16.png | Bin 284 -> 0 bytes .../map_objects/pics/people/may/acro_bike/17.png | Bin 331 -> 0 bytes .../map_objects/pics/people/may/acro_bike/18.png | Bin 333 -> 0 bytes .../map_objects/pics/people/may/acro_bike/19.png | Bin 334 -> 0 bytes .../map_objects/pics/people/may/acro_bike/20.png | Bin 335 -> 0 bytes .../map_objects/pics/people/may/acro_bike/21.png | Bin 314 -> 0 bytes .../map_objects/pics/people/may/acro_bike/22.png | Bin 315 -> 0 bytes .../map_objects/pics/people/may/acro_bike/23.png | Bin 302 -> 0 bytes .../map_objects/pics/people/may/acro_bike/24.png | Bin 303 -> 0 bytes .../map_objects/pics/people/may/acro_bike/25.png | Bin 337 -> 0 bytes .../map_objects/pics/people/may/acro_bike/26.png | Bin 341 -> 0 bytes .../map_objects/pics/people/may/decorating.png | Bin 279 -> 0 bytes .../map_objects/pics/people/may/field_move/0.png | Bin 295 -> 0 bytes .../map_objects/pics/people/may/field_move/1.png | Bin 295 -> 0 bytes .../map_objects/pics/people/may/field_move/2.png | Bin 293 -> 0 bytes .../map_objects/pics/people/may/field_move/3.png | Bin 324 -> 0 bytes .../map_objects/pics/people/may/field_move/4.png | Bin 327 -> 0 bytes .../map_objects/pics/people/may/fishing/00.png | Bin 298 -> 0 bytes .../map_objects/pics/people/may/fishing/01.png | Bin 291 -> 0 bytes .../map_objects/pics/people/may/fishing/02.png | Bin 294 -> 0 bytes .../map_objects/pics/people/may/fishing/03.png | Bin 291 -> 0 bytes .../map_objects/pics/people/may/fishing/04.png | Bin 302 -> 0 bytes .../map_objects/pics/people/may/fishing/05.png | Bin 304 -> 0 bytes .../map_objects/pics/people/may/fishing/06.png | Bin 310 -> 0 bytes .../map_objects/pics/people/may/fishing/07.png | Bin 301 -> 0 bytes .../map_objects/pics/people/may/fishing/08.png | Bin 295 -> 0 bytes .../map_objects/pics/people/may/fishing/09.png | Bin 302 -> 0 bytes .../map_objects/pics/people/may/fishing/10.png | Bin 301 -> 0 bytes .../map_objects/pics/people/may/fishing/11.png | Bin 313 -> 0 bytes .../map_objects/pics/people/may/mach_bike/0.png | Bin 302 -> 0 bytes .../map_objects/pics/people/may/mach_bike/1.png | Bin 297 -> 0 bytes .../map_objects/pics/people/may/mach_bike/2.png | Bin 339 -> 0 bytes .../map_objects/pics/people/may/mach_bike/3.png | Bin 304 -> 0 bytes .../map_objects/pics/people/may/mach_bike/4.png | Bin 305 -> 0 bytes .../map_objects/pics/people/may/mach_bike/5.png | Bin 299 -> 0 bytes .../map_objects/pics/people/may/mach_bike/6.png | Bin 299 -> 0 bytes .../map_objects/pics/people/may/mach_bike/7.png | Bin 336 -> 0 bytes .../map_objects/pics/people/may/mach_bike/8.png | Bin 340 -> 0 bytes graphics/map_objects/pics/people/may/normal/00.png | Bin 297 -> 0 bytes graphics/map_objects/pics/people/may/normal/01.png | Bin 294 -> 0 bytes graphics/map_objects/pics/people/may/normal/02.png | Bin 265 -> 0 bytes graphics/map_objects/pics/people/may/normal/03.png | Bin 289 -> 0 bytes graphics/map_objects/pics/people/may/normal/04.png | Bin 287 -> 0 bytes graphics/map_objects/pics/people/may/normal/05.png | Bin 286 -> 0 bytes graphics/map_objects/pics/people/may/normal/06.png | Bin 285 -> 0 bytes graphics/map_objects/pics/people/may/normal/07.png | Bin 271 -> 0 bytes graphics/map_objects/pics/people/may/normal/08.png | Bin 270 -> 0 bytes graphics/map_objects/pics/people/may/normal/09.png | Bin 283 -> 0 bytes graphics/map_objects/pics/people/may/normal/10.png | Bin 291 -> 0 bytes graphics/map_objects/pics/people/may/normal/11.png | Bin 262 -> 0 bytes graphics/map_objects/pics/people/may/normal/12.png | Bin 276 -> 0 bytes graphics/map_objects/pics/people/may/normal/13.png | Bin 275 -> 0 bytes graphics/map_objects/pics/people/may/normal/14.png | Bin 286 -> 0 bytes graphics/map_objects/pics/people/may/normal/15.png | Bin 284 -> 0 bytes graphics/map_objects/pics/people/may/normal/16.png | Bin 277 -> 0 bytes graphics/map_objects/pics/people/may/normal/17.png | Bin 280 -> 0 bytes graphics/map_objects/pics/people/may/surfing/0.png | Bin 300 -> 0 bytes graphics/map_objects/pics/people/may/surfing/1.png | Bin 291 -> 0 bytes graphics/map_objects/pics/people/may/surfing/2.png | Bin 284 -> 0 bytes graphics/map_objects/pics/people/may/surfing/3.png | Bin 303 -> 0 bytes graphics/map_objects/pics/people/may/surfing/4.png | Bin 296 -> 0 bytes graphics/map_objects/pics/people/may/surfing/5.png | Bin 287 -> 0 bytes .../map_objects/pics/people/may/underwater/0.png | Bin 290 -> 0 bytes .../map_objects/pics/people/may/underwater/1.png | Bin 283 -> 0 bytes .../map_objects/pics/people/may/underwater/2.png | Bin 286 -> 0 bytes .../map_objects/pics/people/may/underwater/3.png | Bin 285 -> 0 bytes .../map_objects/pics/people/may/watering/0.png | Bin 300 -> 0 bytes .../map_objects/pics/people/may/watering/1.png | Bin 292 -> 0 bytes .../map_objects/pics/people/may/watering/2.png | Bin 306 -> 0 bytes .../map_objects/pics/people/may/watering/3.png | Bin 305 -> 0 bytes .../map_objects/pics/people/may/watering/4.png | Bin 294 -> 0 bytes .../map_objects/pics/people/may/watering/5.png | Bin 306 -> 0 bytes graphics/map_objects/pics/people/mom/0.png | Bin 289 -> 0 bytes graphics/map_objects/pics/people/mom/1.png | Bin 265 -> 0 bytes graphics/map_objects/pics/people/mom/2.png | Bin 250 -> 0 bytes graphics/map_objects/pics/people/mom/3.png | Bin 281 -> 0 bytes graphics/map_objects/pics/people/mom/4.png | Bin 283 -> 0 bytes graphics/map_objects/pics/people/mom/5.png | Bin 253 -> 0 bytes graphics/map_objects/pics/people/mom/6.png | Bin 250 -> 0 bytes graphics/map_objects/pics/people/mom/7.png | Bin 253 -> 0 bytes graphics/map_objects/pics/people/mom/8.png | Bin 257 -> 0 bytes .../pics/people/mystery_event_deliveryman/0.png | Bin 286 -> 0 bytes .../pics/people/mystery_event_deliveryman/1.png | Bin 261 -> 0 bytes .../pics/people/mystery_event_deliveryman/2.png | Bin 259 -> 0 bytes graphics/map_objects/pics/people/noland/0.png | Bin 291 -> 0 bytes graphics/map_objects/pics/people/noland/1.png | Bin 278 -> 0 bytes graphics/map_objects/pics/people/noland/2.png | Bin 266 -> 0 bytes graphics/map_objects/pics/people/noland/3.png | Bin 277 -> 0 bytes graphics/map_objects/pics/people/noland/4.png | Bin 277 -> 0 bytes graphics/map_objects/pics/people/noland/5.png | Bin 267 -> 0 bytes graphics/map_objects/pics/people/noland/6.png | Bin 267 -> 0 bytes graphics/map_objects/pics/people/noland/7.png | Bin 271 -> 0 bytes graphics/map_objects/pics/people/noland/8.png | Bin 271 -> 0 bytes graphics/map_objects/pics/people/norman/0.png | Bin 287 -> 0 bytes graphics/map_objects/pics/people/norman/1.png | Bin 268 -> 0 bytes graphics/map_objects/pics/people/norman/2.png | Bin 256 -> 0 bytes graphics/map_objects/pics/people/norman/3.png | Bin 280 -> 0 bytes graphics/map_objects/pics/people/norman/4.png | Bin 282 -> 0 bytes graphics/map_objects/pics/people/norman/5.png | Bin 261 -> 0 bytes graphics/map_objects/pics/people/norman/6.png | Bin 261 -> 0 bytes graphics/map_objects/pics/people/norman/7.png | Bin 260 -> 0 bytes graphics/map_objects/pics/people/norman/8.png | Bin 259 -> 0 bytes graphics/map_objects/pics/people/nurse/0.png | Bin 300 -> 0 bytes graphics/map_objects/pics/people/nurse/1.png | Bin 294 -> 0 bytes graphics/map_objects/pics/people/nurse/2.png | Bin 277 -> 0 bytes graphics/map_objects/pics/people/nurse/3.png | Bin 288 -> 0 bytes graphics/map_objects/pics/people/old_man_1/0.png | Bin 291 -> 0 bytes graphics/map_objects/pics/people/old_man_1/1.png | Bin 284 -> 0 bytes graphics/map_objects/pics/people/old_man_1/2.png | Bin 255 -> 0 bytes graphics/map_objects/pics/people/old_man_1/3.png | Bin 284 -> 0 bytes graphics/map_objects/pics/people/old_man_1/4.png | Bin 285 -> 0 bytes graphics/map_objects/pics/people/old_man_1/5.png | Bin 277 -> 0 bytes graphics/map_objects/pics/people/old_man_1/6.png | Bin 278 -> 0 bytes graphics/map_objects/pics/people/old_man_1/7.png | Bin 260 -> 0 bytes graphics/map_objects/pics/people/old_man_1/8.png | Bin 259 -> 0 bytes graphics/map_objects/pics/people/old_man_2/0.png | Bin 292 -> 0 bytes graphics/map_objects/pics/people/old_man_2/1.png | Bin 289 -> 0 bytes graphics/map_objects/pics/people/old_man_2/2.png | Bin 265 -> 0 bytes graphics/map_objects/pics/people/old_woman_1/0.png | Bin 273 -> 0 bytes graphics/map_objects/pics/people/old_woman_1/1.png | Bin 270 -> 0 bytes graphics/map_objects/pics/people/old_woman_1/2.png | Bin 258 -> 0 bytes graphics/map_objects/pics/people/old_woman_1/3.png | Bin 267 -> 0 bytes graphics/map_objects/pics/people/old_woman_1/4.png | Bin 269 -> 0 bytes graphics/map_objects/pics/people/old_woman_1/5.png | Bin 267 -> 0 bytes graphics/map_objects/pics/people/old_woman_1/6.png | Bin 268 -> 0 bytes graphics/map_objects/pics/people/old_woman_1/7.png | Bin 259 -> 0 bytes graphics/map_objects/pics/people/old_woman_1/8.png | Bin 259 -> 0 bytes graphics/map_objects/pics/people/old_woman_2/0.png | Bin 280 -> 0 bytes graphics/map_objects/pics/people/old_woman_2/1.png | Bin 267 -> 0 bytes graphics/map_objects/pics/people/old_woman_2/2.png | Bin 262 -> 0 bytes graphics/map_objects/pics/people/old_woman_2/3.png | Bin 272 -> 0 bytes graphics/map_objects/pics/people/old_woman_2/4.png | Bin 274 -> 0 bytes graphics/map_objects/pics/people/old_woman_2/5.png | Bin 259 -> 0 bytes graphics/map_objects/pics/people/old_woman_2/6.png | Bin 260 -> 0 bytes graphics/map_objects/pics/people/old_woman_2/7.png | Bin 266 -> 0 bytes graphics/map_objects/pics/people/old_woman_2/8.png | Bin 265 -> 0 bytes graphics/map_objects/pics/people/phoebe/0.png | Bin 288 -> 0 bytes graphics/map_objects/pics/people/phoebe/1.png | Bin 279 -> 0 bytes graphics/map_objects/pics/people/phoebe/2.png | Bin 258 -> 0 bytes graphics/map_objects/pics/people/picnicker/0.png | Bin 300 -> 0 bytes graphics/map_objects/pics/people/picnicker/1.png | Bin 301 -> 0 bytes graphics/map_objects/pics/people/picnicker/2.png | Bin 267 -> 0 bytes graphics/map_objects/pics/people/picnicker/3.png | Bin 285 -> 0 bytes graphics/map_objects/pics/people/picnicker/4.png | Bin 286 -> 0 bytes graphics/map_objects/pics/people/picnicker/5.png | Bin 283 -> 0 bytes graphics/map_objects/pics/people/picnicker/6.png | Bin 288 -> 0 bytes graphics/map_objects/pics/people/picnicker/7.png | Bin 273 -> 0 bytes graphics/map_objects/pics/people/picnicker/8.png | Bin 274 -> 0 bytes graphics/map_objects/pics/people/prof_birch/0.png | Bin 301 -> 0 bytes graphics/map_objects/pics/people/prof_birch/1.png | Bin 284 -> 0 bytes graphics/map_objects/pics/people/prof_birch/2.png | Bin 266 -> 0 bytes graphics/map_objects/pics/people/prof_birch/3.png | Bin 295 -> 0 bytes graphics/map_objects/pics/people/prof_birch/4.png | Bin 293 -> 0 bytes graphics/map_objects/pics/people/prof_birch/5.png | Bin 279 -> 0 bytes graphics/map_objects/pics/people/prof_birch/6.png | Bin 279 -> 0 bytes graphics/map_objects/pics/people/prof_birch/7.png | Bin 273 -> 0 bytes graphics/map_objects/pics/people/prof_birch/8.png | Bin 271 -> 0 bytes graphics/map_objects/pics/people/psychic_m/0.png | Bin 286 -> 0 bytes graphics/map_objects/pics/people/psychic_m/1.png | Bin 276 -> 0 bytes graphics/map_objects/pics/people/psychic_m/2.png | Bin 262 -> 0 bytes graphics/map_objects/pics/people/psychic_m/3.png | Bin 280 -> 0 bytes graphics/map_objects/pics/people/psychic_m/4.png | Bin 280 -> 0 bytes graphics/map_objects/pics/people/psychic_m/5.png | Bin 269 -> 0 bytes graphics/map_objects/pics/people/psychic_m/6.png | Bin 267 -> 0 bytes graphics/map_objects/pics/people/psychic_m/7.png | Bin 266 -> 0 bytes graphics/map_objects/pics/people/psychic_m/8.png | Bin 264 -> 0 bytes .../map_objects/pics/people/quinty_plump/0.png | Bin 391 -> 0 bytes .../map_objects/pics/people/quinty_plump/1.png | Bin 363 -> 0 bytes .../map_objects/pics/people/quinty_plump/2.png | Bin 343 -> 0 bytes .../map_objects/pics/people/quinty_plump/3.png | Bin 385 -> 0 bytes .../map_objects/pics/people/quinty_plump/4.png | Bin 357 -> 0 bytes .../map_objects/pics/people/quinty_plump/5.png | Bin 363 -> 0 bytes .../map_objects/pics/people/quinty_plump/6.png | Bin 350 -> 0 bytes graphics/map_objects/pics/people/red/0.png | Bin 282 -> 0 bytes graphics/map_objects/pics/people/red/1.png | Bin 270 -> 0 bytes graphics/map_objects/pics/people/red/2.png | Bin 269 -> 0 bytes graphics/map_objects/pics/people/red/3.png | Bin 275 -> 0 bytes graphics/map_objects/pics/people/red/4.png | Bin 274 -> 0 bytes graphics/map_objects/pics/people/red/5.png | Bin 262 -> 0 bytes graphics/map_objects/pics/people/red/6.png | Bin 261 -> 0 bytes graphics/map_objects/pics/people/red/7.png | Bin 271 -> 0 bytes graphics/map_objects/pics/people/red/8.png | Bin 267 -> 0 bytes graphics/map_objects/pics/people/reporter_f/0.png | Bin 281 -> 0 bytes graphics/map_objects/pics/people/reporter_f/1.png | Bin 270 -> 0 bytes graphics/map_objects/pics/people/reporter_f/2.png | Bin 259 -> 0 bytes graphics/map_objects/pics/people/reporter_f/3.png | Bin 275 -> 0 bytes graphics/map_objects/pics/people/reporter_f/4.png | Bin 276 -> 0 bytes graphics/map_objects/pics/people/reporter_f/5.png | Bin 265 -> 0 bytes graphics/map_objects/pics/people/reporter_f/6.png | Bin 265 -> 0 bytes graphics/map_objects/pics/people/reporter_f/7.png | Bin 266 -> 0 bytes graphics/map_objects/pics/people/reporter_f/8.png | Bin 263 -> 0 bytes graphics/map_objects/pics/people/reporter_m/0.png | Bin 287 -> 0 bytes graphics/map_objects/pics/people/reporter_m/1.png | Bin 274 -> 0 bytes graphics/map_objects/pics/people/reporter_m/2.png | Bin 264 -> 0 bytes graphics/map_objects/pics/people/reporter_m/3.png | Bin 278 -> 0 bytes graphics/map_objects/pics/people/reporter_m/4.png | Bin 279 -> 0 bytes graphics/map_objects/pics/people/reporter_m/5.png | Bin 268 -> 0 bytes graphics/map_objects/pics/people/reporter_m/6.png | Bin 266 -> 0 bytes graphics/map_objects/pics/people/reporter_m/7.png | Bin 264 -> 0 bytes graphics/map_objects/pics/people/reporter_m/8.png | Bin 263 -> 0 bytes .../pics/people/rooftop_sale_woman/0.png | Bin 291 -> 0 bytes .../pics/people/rooftop_sale_woman/1.png | Bin 289 -> 0 bytes .../pics/people/rooftop_sale_woman/2.png | Bin 259 -> 0 bytes .../pics/people/rooftop_sale_woman/3.png | Bin 283 -> 0 bytes .../pics/people/rooftop_sale_woman/4.png | Bin 282 -> 0 bytes .../pics/people/rooftop_sale_woman/5.png | Bin 280 -> 0 bytes .../pics/people/rooftop_sale_woman/6.png | Bin 281 -> 0 bytes .../pics/people/rooftop_sale_woman/7.png | Bin 264 -> 0 bytes .../pics/people/rooftop_sale_woman/8.png | Bin 262 -> 0 bytes graphics/map_objects/pics/people/roxanne/0.png | Bin 302 -> 0 bytes graphics/map_objects/pics/people/roxanne/1.png | Bin 288 -> 0 bytes graphics/map_objects/pics/people/roxanne/2.png | Bin 269 -> 0 bytes .../pics/people/ruby_sapphire_brendan/00.png | Bin 289 -> 0 bytes .../pics/people/ruby_sapphire_brendan/01.png | Bin 292 -> 0 bytes .../pics/people/ruby_sapphire_brendan/02.png | Bin 272 -> 0 bytes .../pics/people/ruby_sapphire_brendan/03.png | Bin 280 -> 0 bytes .../pics/people/ruby_sapphire_brendan/04.png | Bin 280 -> 0 bytes .../pics/people/ruby_sapphire_brendan/05.png | Bin 281 -> 0 bytes .../pics/people/ruby_sapphire_brendan/06.png | Bin 280 -> 0 bytes .../pics/people/ruby_sapphire_brendan/07.png | Bin 282 -> 0 bytes .../pics/people/ruby_sapphire_brendan/08.png | Bin 278 -> 0 bytes .../pics/people/ruby_sapphire_brendan/09.png | Bin 275 -> 0 bytes .../pics/people/ruby_sapphire_brendan/10.png | Bin 275 -> 0 bytes .../pics/people/ruby_sapphire_brendan/11.png | Bin 267 -> 0 bytes .../pics/people/ruby_sapphire_brendan/12.png | Bin 270 -> 0 bytes .../pics/people/ruby_sapphire_brendan/13.png | Bin 269 -> 0 bytes .../pics/people/ruby_sapphire_brendan/14.png | Bin 270 -> 0 bytes .../pics/people/ruby_sapphire_brendan/15.png | Bin 270 -> 0 bytes .../pics/people/ruby_sapphire_brendan/16.png | Bin 283 -> 0 bytes .../pics/people/ruby_sapphire_brendan/17.png | Bin 280 -> 0 bytes .../pics/people/ruby_sapphire_little_boy/0.png | Bin 237 -> 0 bytes .../pics/people/ruby_sapphire_little_boy/1.png | Bin 231 -> 0 bytes .../pics/people/ruby_sapphire_little_boy/2.png | Bin 217 -> 0 bytes .../pics/people/ruby_sapphire_little_boy/3.png | Bin 229 -> 0 bytes .../pics/people/ruby_sapphire_little_boy/4.png | Bin 229 -> 0 bytes .../pics/people/ruby_sapphire_little_boy/5.png | Bin 226 -> 0 bytes .../pics/people/ruby_sapphire_little_boy/6.png | Bin 227 -> 0 bytes .../pics/people/ruby_sapphire_little_boy/7.png | Bin 220 -> 0 bytes .../pics/people/ruby_sapphire_little_boy/8.png | Bin 220 -> 0 bytes .../pics/people/ruby_sapphire_may/00.png | Bin 297 -> 0 bytes .../pics/people/ruby_sapphire_may/01.png | Bin 294 -> 0 bytes .../pics/people/ruby_sapphire_may/02.png | Bin 264 -> 0 bytes .../pics/people/ruby_sapphire_may/03.png | Bin 289 -> 0 bytes .../pics/people/ruby_sapphire_may/04.png | Bin 287 -> 0 bytes .../pics/people/ruby_sapphire_may/05.png | Bin 286 -> 0 bytes .../pics/people/ruby_sapphire_may/06.png | Bin 285 -> 0 bytes .../pics/people/ruby_sapphire_may/07.png | Bin 271 -> 0 bytes .../pics/people/ruby_sapphire_may/08.png | Bin 269 -> 0 bytes .../pics/people/ruby_sapphire_may/09.png | Bin 283 -> 0 bytes .../pics/people/ruby_sapphire_may/10.png | Bin 291 -> 0 bytes .../pics/people/ruby_sapphire_may/11.png | Bin 262 -> 0 bytes .../pics/people/ruby_sapphire_may/12.png | Bin 276 -> 0 bytes .../pics/people/ruby_sapphire_may/13.png | Bin 275 -> 0 bytes .../pics/people/ruby_sapphire_may/14.png | Bin 286 -> 0 bytes .../pics/people/ruby_sapphire_may/15.png | Bin 283 -> 0 bytes .../pics/people/ruby_sapphire_may/16.png | Bin 278 -> 0 bytes .../pics/people/ruby_sapphire_may/17.png | Bin 281 -> 0 bytes .../pics/people/running_triathlete_f/0.png | Bin 300 -> 0 bytes .../pics/people/running_triathlete_f/1.png | Bin 284 -> 0 bytes .../pics/people/running_triathlete_f/2.png | Bin 264 -> 0 bytes .../pics/people/running_triathlete_f/3.png | Bin 289 -> 0 bytes .../pics/people/running_triathlete_f/4.png | Bin 289 -> 0 bytes .../pics/people/running_triathlete_f/5.png | Bin 271 -> 0 bytes .../pics/people/running_triathlete_f/6.png | Bin 270 -> 0 bytes .../pics/people/running_triathlete_f/7.png | Bin 265 -> 0 bytes .../pics/people/running_triathlete_f/8.png | Bin 267 -> 0 bytes .../pics/people/running_triathlete_m/0.png | Bin 297 -> 0 bytes .../pics/people/running_triathlete_m/1.png | Bin 288 -> 0 bytes .../pics/people/running_triathlete_m/2.png | Bin 257 -> 0 bytes .../pics/people/running_triathlete_m/3.png | Bin 284 -> 0 bytes .../pics/people/running_triathlete_m/4.png | Bin 283 -> 0 bytes .../pics/people/running_triathlete_m/5.png | Bin 276 -> 0 bytes .../pics/people/running_triathlete_m/6.png | Bin 274 -> 0 bytes .../pics/people/running_triathlete_m/7.png | Bin 260 -> 0 bytes .../pics/people/running_triathlete_m/8.png | Bin 262 -> 0 bytes graphics/map_objects/pics/people/sailor/0.png | Bin 294 -> 0 bytes graphics/map_objects/pics/people/sailor/1.png | Bin 286 -> 0 bytes graphics/map_objects/pics/people/sailor/2.png | Bin 274 -> 0 bytes graphics/map_objects/pics/people/sailor/3.png | Bin 288 -> 0 bytes graphics/map_objects/pics/people/sailor/4.png | Bin 288 -> 0 bytes graphics/map_objects/pics/people/sailor/5.png | Bin 280 -> 0 bytes graphics/map_objects/pics/people/sailor/6.png | Bin 280 -> 0 bytes graphics/map_objects/pics/people/sailor/7.png | Bin 278 -> 0 bytes graphics/map_objects/pics/people/sailor/8.png | Bin 276 -> 0 bytes .../map_objects/pics/people/school_kid_m/0.png | Bin 283 -> 0 bytes .../map_objects/pics/people/school_kid_m/1.png | Bin 274 -> 0 bytes .../map_objects/pics/people/school_kid_m/2.png | Bin 249 -> 0 bytes .../map_objects/pics/people/school_kid_m/3.png | Bin 278 -> 0 bytes .../map_objects/pics/people/school_kid_m/4.png | Bin 276 -> 0 bytes .../map_objects/pics/people/school_kid_m/5.png | Bin 260 -> 0 bytes .../map_objects/pics/people/school_kid_m/6.png | Bin 263 -> 0 bytes .../map_objects/pics/people/school_kid_m/7.png | Bin 257 -> 0 bytes .../map_objects/pics/people/school_kid_m/8.png | Bin 260 -> 0 bytes graphics/map_objects/pics/people/scientist_1/0.png | Bin 295 -> 0 bytes graphics/map_objects/pics/people/scientist_1/1.png | Bin 277 -> 0 bytes graphics/map_objects/pics/people/scientist_1/2.png | Bin 256 -> 0 bytes graphics/map_objects/pics/people/scientist_1/3.png | Bin 282 -> 0 bytes graphics/map_objects/pics/people/scientist_1/4.png | Bin 282 -> 0 bytes graphics/map_objects/pics/people/scientist_1/5.png | Bin 265 -> 0 bytes graphics/map_objects/pics/people/scientist_1/6.png | Bin 265 -> 0 bytes graphics/map_objects/pics/people/scientist_1/7.png | Bin 258 -> 0 bytes graphics/map_objects/pics/people/scientist_1/8.png | Bin 259 -> 0 bytes graphics/map_objects/pics/people/scientist_2/0.png | Bin 297 -> 0 bytes graphics/map_objects/pics/people/scientist_2/1.png | Bin 278 -> 0 bytes graphics/map_objects/pics/people/scientist_2/2.png | Bin 257 -> 0 bytes graphics/map_objects/pics/people/scientist_2/3.png | Bin 283 -> 0 bytes graphics/map_objects/pics/people/scientist_2/4.png | Bin 284 -> 0 bytes graphics/map_objects/pics/people/scientist_2/5.png | Bin 267 -> 0 bytes graphics/map_objects/pics/people/scientist_2/6.png | Bin 267 -> 0 bytes graphics/map_objects/pics/people/scientist_2/7.png | Bin 258 -> 0 bytes graphics/map_objects/pics/people/scientist_2/8.png | Bin 260 -> 0 bytes graphics/map_objects/pics/people/scott/0.png | Bin 292 -> 0 bytes graphics/map_objects/pics/people/scott/1.png | Bin 286 -> 0 bytes graphics/map_objects/pics/people/scott/2.png | Bin 261 -> 0 bytes graphics/map_objects/pics/people/scott/3.png | Bin 283 -> 0 bytes graphics/map_objects/pics/people/scott/4.png | Bin 286 -> 0 bytes graphics/map_objects/pics/people/scott/5.png | Bin 280 -> 0 bytes graphics/map_objects/pics/people/scott/6.png | Bin 279 -> 0 bytes graphics/map_objects/pics/people/scott/7.png | Bin 267 -> 0 bytes graphics/map_objects/pics/people/scott/8.png | Bin 263 -> 0 bytes graphics/map_objects/pics/people/sidney/0.png | Bin 290 -> 0 bytes graphics/map_objects/pics/people/sidney/1.png | Bin 277 -> 0 bytes graphics/map_objects/pics/people/sidney/2.png | Bin 260 -> 0 bytes graphics/map_objects/pics/people/spenser/0.png | Bin 286 -> 0 bytes graphics/map_objects/pics/people/spenser/1.png | Bin 265 -> 0 bytes graphics/map_objects/pics/people/spenser/2.png | Bin 267 -> 0 bytes graphics/map_objects/pics/people/spenser/3.png | Bin 283 -> 0 bytes graphics/map_objects/pics/people/spenser/4.png | Bin 284 -> 0 bytes graphics/map_objects/pics/people/spenser/5.png | Bin 263 -> 0 bytes graphics/map_objects/pics/people/spenser/6.png | Bin 262 -> 0 bytes graphics/map_objects/pics/people/spenser/7.png | Bin 272 -> 0 bytes graphics/map_objects/pics/people/spenser/8.png | Bin 268 -> 0 bytes graphics/map_objects/pics/people/steven/0.png | Bin 290 -> 0 bytes graphics/map_objects/pics/people/steven/1.png | Bin 264 -> 0 bytes graphics/map_objects/pics/people/steven/2.png | Bin 259 -> 0 bytes graphics/map_objects/pics/people/steven/3.png | Bin 285 -> 0 bytes graphics/map_objects/pics/people/steven/4.png | Bin 284 -> 0 bytes graphics/map_objects/pics/people/steven/5.png | Bin 260 -> 0 bytes graphics/map_objects/pics/people/steven/6.png | Bin 257 -> 0 bytes graphics/map_objects/pics/people/steven/7.png | Bin 262 -> 0 bytes graphics/map_objects/pics/people/steven/8.png | Bin 260 -> 0 bytes graphics/map_objects/pics/people/swimmer_f/0.png | Bin 250 -> 0 bytes graphics/map_objects/pics/people/swimmer_f/1.png | Bin 231 -> 0 bytes graphics/map_objects/pics/people/swimmer_f/2.png | Bin 226 -> 0 bytes graphics/map_objects/pics/people/swimmer_f/3.png | Bin 254 -> 0 bytes graphics/map_objects/pics/people/swimmer_f/4.png | Bin 254 -> 0 bytes graphics/map_objects/pics/people/swimmer_f/5.png | Bin 241 -> 0 bytes graphics/map_objects/pics/people/swimmer_f/6.png | Bin 239 -> 0 bytes graphics/map_objects/pics/people/swimmer_f/7.png | Bin 234 -> 0 bytes graphics/map_objects/pics/people/swimmer_f/8.png | Bin 231 -> 0 bytes graphics/map_objects/pics/people/swimmer_m/0.png | Bin 239 -> 0 bytes graphics/map_objects/pics/people/swimmer_m/1.png | Bin 232 -> 0 bytes graphics/map_objects/pics/people/swimmer_m/2.png | Bin 227 -> 0 bytes graphics/map_objects/pics/people/swimmer_m/3.png | Bin 247 -> 0 bytes graphics/map_objects/pics/people/swimmer_m/4.png | Bin 248 -> 0 bytes graphics/map_objects/pics/people/swimmer_m/5.png | Bin 244 -> 0 bytes graphics/map_objects/pics/people/swimmer_m/6.png | Bin 245 -> 0 bytes graphics/map_objects/pics/people/swimmer_m/7.png | Bin 228 -> 0 bytes graphics/map_objects/pics/people/swimmer_m/8.png | Bin 227 -> 0 bytes graphics/map_objects/pics/people/tate/0.png | Bin 279 -> 0 bytes graphics/map_objects/pics/people/tate/1.png | Bin 255 -> 0 bytes graphics/map_objects/pics/people/tate/2.png | Bin 267 -> 0 bytes graphics/map_objects/pics/people/teala/0.png | Bin 279 -> 0 bytes graphics/map_objects/pics/people/teala/1.png | Bin 247 -> 0 bytes graphics/map_objects/pics/people/teala/2.png | Bin 261 -> 0 bytes graphics/map_objects/pics/people/teala/3.png | Bin 275 -> 0 bytes graphics/map_objects/pics/people/teala/4.png | Bin 273 -> 0 bytes graphics/map_objects/pics/people/teala/5.png | Bin 245 -> 0 bytes graphics/map_objects/pics/people/teala/6.png | Bin 250 -> 0 bytes graphics/map_objects/pics/people/teala/7.png | Bin 266 -> 0 bytes graphics/map_objects/pics/people/teala/8.png | Bin 265 -> 0 bytes graphics/map_objects/pics/people/tuber_f/0.png | Bin 260 -> 0 bytes graphics/map_objects/pics/people/tuber_f/1.png | Bin 253 -> 0 bytes graphics/map_objects/pics/people/tuber_f/2.png | Bin 243 -> 0 bytes graphics/map_objects/pics/people/tuber_f/3.png | Bin 254 -> 0 bytes graphics/map_objects/pics/people/tuber_f/4.png | Bin 254 -> 0 bytes graphics/map_objects/pics/people/tuber_f/5.png | Bin 245 -> 0 bytes graphics/map_objects/pics/people/tuber_f/6.png | Bin 245 -> 0 bytes graphics/map_objects/pics/people/tuber_f/7.png | Bin 243 -> 0 bytes graphics/map_objects/pics/people/tuber_f/8.png | Bin 242 -> 0 bytes graphics/map_objects/pics/people/tuber_m/0.png | Bin 232 -> 0 bytes graphics/map_objects/pics/people/tuber_m/1.png | Bin 224 -> 0 bytes graphics/map_objects/pics/people/tuber_m/2.png | Bin 228 -> 0 bytes graphics/map_objects/pics/people/tuber_m/3.png | Bin 230 -> 0 bytes graphics/map_objects/pics/people/tuber_m/4.png | Bin 230 -> 0 bytes graphics/map_objects/pics/people/tuber_m/5.png | Bin 222 -> 0 bytes graphics/map_objects/pics/people/tuber_m/6.png | Bin 222 -> 0 bytes graphics/map_objects/pics/people/tuber_m/7.png | Bin 231 -> 0 bytes graphics/map_objects/pics/people/tuber_m/8.png | Bin 231 -> 0 bytes .../map_objects/pics/people/tuber_m_swimming/0.png | Bin 228 -> 0 bytes .../map_objects/pics/people/tuber_m_swimming/1.png | Bin 221 -> 0 bytes .../map_objects/pics/people/tuber_m_swimming/2.png | Bin 228 -> 0 bytes .../map_objects/pics/people/tuber_m_swimming/3.png | Bin 230 -> 0 bytes .../map_objects/pics/people/tuber_m_swimming/4.png | Bin 232 -> 0 bytes .../map_objects/pics/people/tuber_m_swimming/5.png | Bin 225 -> 0 bytes .../map_objects/pics/people/tuber_m_swimming/6.png | Bin 226 -> 0 bytes .../map_objects/pics/people/tuber_m_swimming/7.png | Bin 228 -> 0 bytes .../map_objects/pics/people/tuber_m_swimming/8.png | Bin 235 -> 0 bytes graphics/map_objects/pics/people/tucker/0.png | Bin 300 -> 0 bytes graphics/map_objects/pics/people/tucker/1.png | Bin 298 -> 0 bytes graphics/map_objects/pics/people/tucker/2.png | Bin 272 -> 0 bytes graphics/map_objects/pics/people/tucker/3.png | Bin 292 -> 0 bytes graphics/map_objects/pics/people/tucker/4.png | Bin 290 -> 0 bytes graphics/map_objects/pics/people/tucker/5.png | Bin 292 -> 0 bytes graphics/map_objects/pics/people/tucker/6.png | Bin 292 -> 0 bytes graphics/map_objects/pics/people/tucker/7.png | Bin 278 -> 0 bytes graphics/map_objects/pics/people/tucker/8.png | Bin 276 -> 0 bytes .../pics/people/union_room_attendant/0.png | Bin 299 -> 0 bytes .../pics/people/union_room_attendant/1.png | Bin 268 -> 0 bytes .../pics/people/union_room_attendant/2.png | Bin 268 -> 0 bytes .../map_objects/pics/people/unused_woman/0.png | Bin 295 -> 0 bytes .../map_objects/pics/people/unused_woman/1.png | Bin 281 -> 0 bytes .../map_objects/pics/people/unused_woman/2.png | Bin 272 -> 0 bytes .../map_objects/pics/people/unused_woman/3.png | Bin 288 -> 0 bytes .../map_objects/pics/people/unused_woman/4.png | Bin 286 -> 0 bytes .../map_objects/pics/people/unused_woman/5.png | Bin 275 -> 0 bytes .../map_objects/pics/people/unused_woman/6.png | Bin 277 -> 0 bytes .../map_objects/pics/people/unused_woman/7.png | Bin 278 -> 0 bytes .../map_objects/pics/people/unused_woman/8.png | Bin 277 -> 0 bytes graphics/map_objects/pics/people/wallace/0.png | Bin 313 -> 0 bytes graphics/map_objects/pics/people/wallace/1.png | Bin 276 -> 0 bytes graphics/map_objects/pics/people/wallace/2.png | Bin 270 -> 0 bytes graphics/map_objects/pics/people/wallace/3.png | Bin 301 -> 0 bytes graphics/map_objects/pics/people/wallace/4.png | Bin 303 -> 0 bytes graphics/map_objects/pics/people/wallace/5.png | Bin 269 -> 0 bytes graphics/map_objects/pics/people/wallace/6.png | Bin 270 -> 0 bytes graphics/map_objects/pics/people/wallace/7.png | Bin 281 -> 0 bytes graphics/map_objects/pics/people/wallace/8.png | Bin 274 -> 0 bytes graphics/map_objects/pics/people/wally/0.png | Bin 283 -> 0 bytes graphics/map_objects/pics/people/wally/1.png | Bin 279 -> 0 bytes graphics/map_objects/pics/people/wally/2.png | Bin 255 -> 0 bytes graphics/map_objects/pics/people/wally/3.png | Bin 273 -> 0 bytes graphics/map_objects/pics/people/wally/4.png | Bin 272 -> 0 bytes graphics/map_objects/pics/people/wally/5.png | Bin 270 -> 0 bytes graphics/map_objects/pics/people/wally/6.png | Bin 271 -> 0 bytes graphics/map_objects/pics/people/wally/7.png | Bin 258 -> 0 bytes graphics/map_objects/pics/people/wally/8.png | Bin 263 -> 0 bytes graphics/map_objects/pics/people/wattson/0.png | Bin 294 -> 0 bytes graphics/map_objects/pics/people/wattson/1.png | Bin 294 -> 0 bytes graphics/map_objects/pics/people/wattson/2.png | Bin 273 -> 0 bytes graphics/map_objects/pics/people/winona/0.png | Bin 294 -> 0 bytes graphics/map_objects/pics/people/winona/1.png | Bin 289 -> 0 bytes graphics/map_objects/pics/people/winona/2.png | Bin 266 -> 0 bytes graphics/map_objects/pics/people/woman_1/0.png | Bin 304 -> 0 bytes graphics/map_objects/pics/people/woman_1/1.png | Bin 297 -> 0 bytes graphics/map_objects/pics/people/woman_1/2.png | Bin 272 -> 0 bytes graphics/map_objects/pics/people/woman_1/3.png | Bin 293 -> 0 bytes graphics/map_objects/pics/people/woman_1/4.png | Bin 291 -> 0 bytes graphics/map_objects/pics/people/woman_1/5.png | Bin 289 -> 0 bytes graphics/map_objects/pics/people/woman_1/6.png | Bin 288 -> 0 bytes graphics/map_objects/pics/people/woman_1/7.png | Bin 276 -> 0 bytes graphics/map_objects/pics/people/woman_1/8.png | Bin 277 -> 0 bytes graphics/map_objects/pics/people/woman_2/0.png | Bin 297 -> 0 bytes graphics/map_objects/pics/people/woman_2/1.png | Bin 292 -> 0 bytes graphics/map_objects/pics/people/woman_2/2.png | Bin 266 -> 0 bytes graphics/map_objects/pics/people/woman_2/3.png | Bin 285 -> 0 bytes graphics/map_objects/pics/people/woman_2/4.png | Bin 286 -> 0 bytes graphics/map_objects/pics/people/woman_2/5.png | Bin 282 -> 0 bytes graphics/map_objects/pics/people/woman_2/6.png | Bin 282 -> 0 bytes graphics/map_objects/pics/people/woman_2/7.png | Bin 266 -> 0 bytes graphics/map_objects/pics/people/woman_2/8.png | Bin 266 -> 0 bytes graphics/map_objects/pics/people/woman_3/0.png | Bin 295 -> 0 bytes graphics/map_objects/pics/people/woman_3/1.png | Bin 282 -> 0 bytes graphics/map_objects/pics/people/woman_3/2.png | Bin 277 -> 0 bytes graphics/map_objects/pics/people/woman_3/3.png | Bin 291 -> 0 bytes graphics/map_objects/pics/people/woman_3/4.png | Bin 290 -> 0 bytes graphics/map_objects/pics/people/woman_3/5.png | Bin 268 -> 0 bytes graphics/map_objects/pics/people/woman_3/6.png | Bin 268 -> 0 bytes graphics/map_objects/pics/people/woman_3/7.png | Bin 276 -> 0 bytes graphics/map_objects/pics/people/woman_3/8.png | Bin 275 -> 0 bytes graphics/map_objects/pics/people/woman_4/0.png | Bin 300 -> 0 bytes graphics/map_objects/pics/people/woman_4/1.png | Bin 274 -> 0 bytes graphics/map_objects/pics/people/woman_4/2.png | Bin 262 -> 0 bytes graphics/map_objects/pics/people/woman_4/3.png | Bin 290 -> 0 bytes graphics/map_objects/pics/people/woman_4/4.png | Bin 290 -> 0 bytes graphics/map_objects/pics/people/woman_4/5.png | Bin 264 -> 0 bytes graphics/map_objects/pics/people/woman_4/6.png | Bin 264 -> 0 bytes graphics/map_objects/pics/people/woman_4/7.png | Bin 265 -> 0 bytes graphics/map_objects/pics/people/woman_4/8.png | Bin 266 -> 0 bytes graphics/map_objects/pics/people/woman_5/0.png | Bin 295 -> 0 bytes graphics/map_objects/pics/people/woman_5/1.png | Bin 271 -> 0 bytes graphics/map_objects/pics/people/woman_5/2.png | Bin 269 -> 0 bytes graphics/map_objects/pics/people/woman_5/3.png | Bin 287 -> 0 bytes graphics/map_objects/pics/people/woman_5/4.png | Bin 288 -> 0 bytes graphics/map_objects/pics/people/woman_5/5.png | Bin 266 -> 0 bytes graphics/map_objects/pics/people/woman_5/6.png | Bin 263 -> 0 bytes graphics/map_objects/pics/people/woman_5/7.png | Bin 265 -> 0 bytes graphics/map_objects/pics/people/woman_5/8.png | Bin 271 -> 0 bytes graphics/map_objects/pics/people/woman_6/0.png | Bin 305 -> 0 bytes graphics/map_objects/pics/people/woman_6/1.png | Bin 278 -> 0 bytes graphics/map_objects/pics/people/woman_6/2.png | Bin 265 -> 0 bytes graphics/map_objects/pics/people/woman_6/3.png | Bin 297 -> 0 bytes graphics/map_objects/pics/people/woman_6/4.png | Bin 296 -> 0 bytes graphics/map_objects/pics/people/woman_6/5.png | Bin 268 -> 0 bytes graphics/map_objects/pics/people/woman_6/6.png | Bin 266 -> 0 bytes graphics/map_objects/pics/people/woman_6/7.png | Bin 265 -> 0 bytes graphics/map_objects/pics/people/woman_6/8.png | Bin 267 -> 0 bytes graphics/map_objects/pics/people/woman_7/0.png | Bin 306 -> 0 bytes graphics/map_objects/pics/people/woman_7/1.png | Bin 280 -> 0 bytes graphics/map_objects/pics/people/woman_7/2.png | Bin 263 -> 0 bytes graphics/map_objects/pics/people/woman_7/3.png | Bin 286 -> 0 bytes graphics/map_objects/pics/people/woman_7/4.png | Bin 286 -> 0 bytes graphics/map_objects/pics/people/woman_7/5.png | Bin 267 -> 0 bytes graphics/map_objects/pics/people/woman_7/6.png | Bin 271 -> 0 bytes graphics/map_objects/pics/people/woman_7/7.png | Bin 268 -> 0 bytes graphics/map_objects/pics/people/woman_7/8.png | Bin 270 -> 0 bytes graphics/map_objects/pics/people/youngster/0.png | Bin 278 -> 0 bytes graphics/map_objects/pics/people/youngster/1.png | Bin 264 -> 0 bytes graphics/map_objects/pics/people/youngster/2.png | Bin 257 -> 0 bytes graphics/map_objects/pics/people/youngster/3.png | Bin 276 -> 0 bytes graphics/map_objects/pics/people/youngster/4.png | Bin 272 -> 0 bytes graphics/map_objects/pics/people/youngster/5.png | Bin 259 -> 0 bytes graphics/map_objects/pics/people/youngster/6.png | Bin 257 -> 0 bytes graphics/map_objects/pics/people/youngster/7.png | Bin 264 -> 0 bytes graphics/map_objects/pics/people/youngster/8.png | Bin 262 -> 0 bytes graphics/map_objects/pics/pokemon/azumarill/0.png | Bin 234 -> 0 bytes graphics/map_objects/pics/pokemon/azumarill/1.png | Bin 230 -> 0 bytes graphics/map_objects/pics/pokemon/azumarill/2.png | Bin 228 -> 0 bytes graphics/map_objects/pics/pokemon/azurill/0.png | Bin 225 -> 0 bytes graphics/map_objects/pics/pokemon/azurill/1.png | Bin 215 -> 0 bytes graphics/map_objects/pics/pokemon/azurill/2.png | Bin 215 -> 0 bytes graphics/map_objects/pics/pokemon/deoxys/0.png | Bin 418 -> 0 bytes graphics/map_objects/pics/pokemon/deoxys/1.png | Bin 421 -> 0 bytes graphics/map_objects/pics/pokemon/dusclops/0.png | Bin 255 -> 0 bytes graphics/map_objects/pics/pokemon/dusclops/1.png | Bin 249 -> 0 bytes graphics/map_objects/pics/pokemon/dusclops/2.png | Bin 261 -> 0 bytes graphics/map_objects/pics/pokemon/dusclops/3.png | Bin 252 -> 0 bytes graphics/map_objects/pics/pokemon/dusclops/4.png | Bin 253 -> 0 bytes graphics/map_objects/pics/pokemon/dusclops/5.png | Bin 244 -> 0 bytes graphics/map_objects/pics/pokemon/dusclops/6.png | Bin 242 -> 0 bytes graphics/map_objects/pics/pokemon/dusclops/7.png | Bin 262 -> 0 bytes graphics/map_objects/pics/pokemon/dusclops/8.png | Bin 260 -> 0 bytes .../map_objects/pics/pokemon/enemy_zigzagoon/0.png | Bin 255 -> 0 bytes .../map_objects/pics/pokemon/enemy_zigzagoon/1.png | Bin 252 -> 0 bytes .../map_objects/pics/pokemon/enemy_zigzagoon/2.png | Bin 297 -> 0 bytes .../map_objects/pics/pokemon/enemy_zigzagoon/3.png | Bin 263 -> 0 bytes .../map_objects/pics/pokemon/enemy_zigzagoon/4.png | Bin 260 -> 0 bytes .../map_objects/pics/pokemon/enemy_zigzagoon/5.png | Bin 261 -> 0 bytes .../map_objects/pics/pokemon/enemy_zigzagoon/6.png | Bin 260 -> 0 bytes .../map_objects/pics/pokemon/enemy_zigzagoon/7.png | Bin 299 -> 0 bytes .../map_objects/pics/pokemon/enemy_zigzagoon/8.png | Bin 308 -> 0 bytes .../map_objects/pics/pokemon/groudon_front/0.png | Bin 443 -> 0 bytes .../map_objects/pics/pokemon/groudon_front/1.png | Bin 432 -> 0 bytes .../map_objects/pics/pokemon/groudon_side/0.png | Bin 463 -> 0 bytes .../map_objects/pics/pokemon/groudon_side/1.png | Bin 460 -> 0 bytes graphics/map_objects/pics/pokemon/ho_oh/0.png | Bin 391 -> 0 bytes graphics/map_objects/pics/pokemon/ho_oh/1.png | Bin 351 -> 0 bytes graphics/map_objects/pics/pokemon/kecleon/0.png | Bin 244 -> 0 bytes graphics/map_objects/pics/pokemon/kecleon/1.png | Bin 235 -> 0 bytes graphics/map_objects/pics/pokemon/kecleon/2.png | Bin 240 -> 0 bytes graphics/map_objects/pics/pokemon/kirlia/0.png | Bin 253 -> 0 bytes graphics/map_objects/pics/pokemon/kirlia/1.png | Bin 241 -> 0 bytes graphics/map_objects/pics/pokemon/kirlia/2.png | Bin 234 -> 0 bytes graphics/map_objects/pics/pokemon/kirlia/3.png | Bin 253 -> 0 bytes graphics/map_objects/pics/pokemon/kirlia/4.png | Bin 251 -> 0 bytes graphics/map_objects/pics/pokemon/kirlia/5.png | Bin 239 -> 0 bytes graphics/map_objects/pics/pokemon/kirlia/6.png | Bin 240 -> 0 bytes graphics/map_objects/pics/pokemon/kirlia/7.png | Bin 232 -> 0 bytes graphics/map_objects/pics/pokemon/kirlia/8.png | Bin 232 -> 0 bytes .../map_objects/pics/pokemon/kyogre_front/0.png | Bin 423 -> 0 bytes .../map_objects/pics/pokemon/kyogre_front/1.png | Bin 423 -> 0 bytes .../map_objects/pics/pokemon/kyogre_side/0.png | Bin 415 -> 0 bytes .../map_objects/pics/pokemon/kyogre_side/1.png | Bin 428 -> 0 bytes .../map_objects/pics/pokemon/latias_latios/0.png | Bin 390 -> 0 bytes .../map_objects/pics/pokemon/latias_latios/1.png | Bin 380 -> 0 bytes .../map_objects/pics/pokemon/latias_latios/2.png | Bin 370 -> 0 bytes graphics/map_objects/pics/pokemon/lugia/0.png | Bin 321 -> 0 bytes graphics/map_objects/pics/pokemon/lugia/1.png | Bin 285 -> 0 bytes graphics/map_objects/pics/pokemon/mew/0.png | Bin 279 -> 0 bytes graphics/map_objects/pics/pokemon/mew/1.png | Bin 261 -> 0 bytes graphics/map_objects/pics/pokemon/mew/2.png | Bin 266 -> 0 bytes graphics/map_objects/pics/pokemon/mew/3.png | Bin 276 -> 0 bytes graphics/map_objects/pics/pokemon/mew/4.png | Bin 270 -> 0 bytes graphics/map_objects/pics/pokemon/mew/5.png | Bin 265 -> 0 bytes graphics/map_objects/pics/pokemon/mew/6.png | Bin 261 -> 0 bytes graphics/map_objects/pics/pokemon/mew/7.png | Bin 266 -> 0 bytes graphics/map_objects/pics/pokemon/mew/8.png | Bin 261 -> 0 bytes graphics/map_objects/pics/pokemon/pikachu/0.png | Bin 246 -> 0 bytes graphics/map_objects/pics/pokemon/pikachu/1.png | Bin 226 -> 0 bytes graphics/map_objects/pics/pokemon/pikachu/2.png | Bin 234 -> 0 bytes graphics/map_objects/pics/pokemon/poochyena/0.png | Bin 244 -> 0 bytes graphics/map_objects/pics/pokemon/poochyena/1.png | Bin 239 -> 0 bytes graphics/map_objects/pics/pokemon/poochyena/2.png | Bin 265 -> 0 bytes graphics/map_objects/pics/pokemon/poochyena/3.png | Bin 250 -> 0 bytes graphics/map_objects/pics/pokemon/poochyena/4.png | Bin 247 -> 0 bytes graphics/map_objects/pics/pokemon/poochyena/5.png | Bin 245 -> 0 bytes graphics/map_objects/pics/pokemon/poochyena/6.png | Bin 249 -> 0 bytes graphics/map_objects/pics/pokemon/poochyena/7.png | Bin 272 -> 0 bytes graphics/map_objects/pics/pokemon/poochyena/8.png | Bin 279 -> 0 bytes graphics/map_objects/pics/pokemon/rayquaza/0.png | Bin 480 -> 0 bytes graphics/map_objects/pics/pokemon/rayquaza/1.png | Bin 481 -> 0 bytes graphics/map_objects/pics/pokemon/rayquaza/2.png | Bin 497 -> 0 bytes graphics/map_objects/pics/pokemon/rayquaza/3.png | Bin 541 -> 0 bytes graphics/map_objects/pics/pokemon/rayquaza/4.png | Bin 544 -> 0 bytes .../map_objects/pics/pokemon/rayquaza_still.png | Bin 538 -> 0 bytes graphics/map_objects/pics/pokemon/regi.png | Bin 386 -> 0 bytes graphics/map_objects/pics/pokemon/skitty/0.png | Bin 230 -> 0 bytes graphics/map_objects/pics/pokemon/skitty/1.png | Bin 218 -> 0 bytes graphics/map_objects/pics/pokemon/skitty/2.png | Bin 232 -> 0 bytes graphics/map_objects/pics/pokemon/sudowoodo/0.png | Bin 253 -> 0 bytes graphics/map_objects/pics/pokemon/sudowoodo/1.png | Bin 258 -> 0 bytes graphics/map_objects/pics/pokemon/sudowoodo/2.png | Bin 254 -> 0 bytes .../pics/pokemon/vigoroth_carrying_box/0.png | Bin 428 -> 0 bytes .../pics/pokemon/vigoroth_carrying_box/1.png | Bin 429 -> 0 bytes .../pics/pokemon/vigoroth_carrying_box/2.png | Bin 423 -> 0 bytes .../pics/pokemon/vigoroth_facing_away/0.png | Bin 399 -> 0 bytes .../pics/pokemon/vigoroth_facing_away/1.png | Bin 382 -> 0 bytes graphics/map_objects/pics/pokemon/wingull/0.png | Bin 206 -> 0 bytes graphics/map_objects/pics/pokemon/wingull/1.png | Bin 206 -> 0 bytes graphics/map_objects/pics/pokemon/wingull/2.png | Bin 207 -> 0 bytes graphics/map_objects/pics/pokemon/wingull/3.png | Bin 202 -> 0 bytes graphics/map_objects/pics/pokemon/wingull/4.png | Bin 200 -> 0 bytes graphics/map_objects/pics/pokemon/wingull/5.png | Bin 202 -> 0 bytes graphics/map_objects/pics/pokemon/zigzagoon/0.png | Bin 223 -> 0 bytes graphics/map_objects/pics/pokemon/zigzagoon/1.png | Bin 211 -> 0 bytes graphics/map_objects/pics/pokemon/zigzagoon/2.png | Bin 214 -> 0 bytes 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 | 44 +- 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 +- .../field_event_obj/berry_tree_graphics_tables.h | 784 ++-- src/data/field_event_obj/event_object_anims.h | 796 ++-- src/data/field_event_obj/event_object_graphics.h | 3266 ++++++++-------- .../field_event_obj/event_object_graphics_info.h | 490 +-- .../event_object_graphics_info_pointers.h | 988 ++--- src/data/field_event_obj/event_object_pic_tables.h | 4124 ++++++++++---------- src/data/field_event_obj/event_object_subsprites.h | 166 +- src/data/field_event_obj/field_effect_objects.h | 76 +- .../field_event_obj/movement_action_func_tables.h | 1156 +++--- .../field_event_obj/movement_type_func_tables.h | 104 +- src/decoration.c | 50 +- src/event_data.c | 2 +- src/event_obj_lock.c | 186 + src/event_object_movement.c | 2944 +++++++------- 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/map_obj_lock.c | 186 - 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 | 222 +- src/tv.c | 4 +- sym_common.txt | 2 +- sym_ewram.txt | 2 +- 3796 files changed, 13738 insertions(+), 13740 deletions(-) create mode 100644 graphics/event_objects/palettes/field_effect_object_palette_00.pal create mode 100644 graphics/event_objects/palettes/field_effect_object_palette_01.pal create mode 100644 graphics/event_objects/palettes/field_effect_object_palette_02.pal create mode 100644 graphics/event_objects/palettes/field_effect_object_palette_03.pal create mode 100644 graphics/event_objects/palettes/field_effect_object_palette_04.pal create mode 100644 graphics/event_objects/palettes/field_effect_object_palette_05.pal create mode 100644 graphics/event_objects/palettes/field_effect_object_palette_06.pal create mode 100644 graphics/event_objects/palettes/field_effect_object_palette_07.pal create mode 100644 graphics/event_objects/palettes/field_effect_object_palette_08.pal create mode 100644 graphics/event_objects/palettes/field_effect_object_palette_10.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_00.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_01.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_02.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_03.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_04.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_05.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_06.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_07.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_08.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_09.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_10.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_11.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_12.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_13.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_14.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_15.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_16.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_17.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_18.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_19.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_20.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_21.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_22.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_23.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_24.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_25.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_26.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_27.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_28.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_29.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_30.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_31.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_32.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_33.pal create mode 100644 graphics/event_objects/palettes/field_object_palette_34.pal create mode 100644 graphics/event_objects/palettes/unused_palette.pal create mode 100644 graphics/event_objects/pics/berry_trees/aguav/0.png create mode 100644 graphics/event_objects/pics/berry_trees/aguav/1.png create mode 100644 graphics/event_objects/pics/berry_trees/aguav/2.png create mode 100644 graphics/event_objects/pics/berry_trees/aguav/3.png create mode 100644 graphics/event_objects/pics/berry_trees/aguav/4.png create mode 100644 graphics/event_objects/pics/berry_trees/aguav/5.png create mode 100644 graphics/event_objects/pics/berry_trees/aspear/0.png create mode 100644 graphics/event_objects/pics/berry_trees/aspear/1.png create mode 100644 graphics/event_objects/pics/berry_trees/aspear/2.png create mode 100644 graphics/event_objects/pics/berry_trees/aspear/3.png create mode 100644 graphics/event_objects/pics/berry_trees/aspear/4.png create mode 100644 graphics/event_objects/pics/berry_trees/aspear/5.png create mode 100644 graphics/event_objects/pics/berry_trees/cheri/0.png create mode 100644 graphics/event_objects/pics/berry_trees/cheri/1.png create mode 100644 graphics/event_objects/pics/berry_trees/cheri/2.png create mode 100644 graphics/event_objects/pics/berry_trees/cheri/3.png create mode 100644 graphics/event_objects/pics/berry_trees/cheri/4.png create mode 100644 graphics/event_objects/pics/berry_trees/cheri/5.png create mode 100644 graphics/event_objects/pics/berry_trees/chesto/0.png create mode 100644 graphics/event_objects/pics/berry_trees/chesto/1.png create mode 100644 graphics/event_objects/pics/berry_trees/chesto/2.png create mode 100644 graphics/event_objects/pics/berry_trees/chesto/3.png create mode 100644 graphics/event_objects/pics/berry_trees/chesto/4.png create mode 100644 graphics/event_objects/pics/berry_trees/chesto/5.png create mode 100644 graphics/event_objects/pics/berry_trees/cornn/0.png create mode 100644 graphics/event_objects/pics/berry_trees/cornn/1.png create mode 100644 graphics/event_objects/pics/berry_trees/cornn/2.png create mode 100644 graphics/event_objects/pics/berry_trees/cornn/3.png create mode 100644 graphics/event_objects/pics/berry_trees/cornn/4.png create mode 100644 graphics/event_objects/pics/berry_trees/cornn/5.png create mode 100644 graphics/event_objects/pics/berry_trees/dirt_pile.png create mode 100644 graphics/event_objects/pics/berry_trees/durin/0.png create mode 100644 graphics/event_objects/pics/berry_trees/durin/1.png create mode 100644 graphics/event_objects/pics/berry_trees/durin/2.png create mode 100644 graphics/event_objects/pics/berry_trees/durin/3.png create mode 100644 graphics/event_objects/pics/berry_trees/durin/4.png create mode 100644 graphics/event_objects/pics/berry_trees/durin/5.png create mode 100644 graphics/event_objects/pics/berry_trees/figy/0.png create mode 100644 graphics/event_objects/pics/berry_trees/figy/1.png create mode 100644 graphics/event_objects/pics/berry_trees/figy/2.png create mode 100644 graphics/event_objects/pics/berry_trees/figy/3.png create mode 100644 graphics/event_objects/pics/berry_trees/figy/4.png create mode 100644 graphics/event_objects/pics/berry_trees/figy/5.png create mode 100644 graphics/event_objects/pics/berry_trees/grepa/0.png create mode 100644 graphics/event_objects/pics/berry_trees/grepa/1.png create mode 100644 graphics/event_objects/pics/berry_trees/grepa/2.png create mode 100644 graphics/event_objects/pics/berry_trees/grepa/3.png create mode 100644 graphics/event_objects/pics/berry_trees/grepa/4.png create mode 100644 graphics/event_objects/pics/berry_trees/grepa/5.png create mode 100644 graphics/event_objects/pics/berry_trees/hondew/0.png create mode 100644 graphics/event_objects/pics/berry_trees/hondew/1.png create mode 100644 graphics/event_objects/pics/berry_trees/hondew/2.png create mode 100644 graphics/event_objects/pics/berry_trees/hondew/3.png create mode 100644 graphics/event_objects/pics/berry_trees/hondew/4.png create mode 100644 graphics/event_objects/pics/berry_trees/hondew/5.png create mode 100644 graphics/event_objects/pics/berry_trees/iapapa/0.png create mode 100644 graphics/event_objects/pics/berry_trees/iapapa/1.png create mode 100644 graphics/event_objects/pics/berry_trees/iapapa/2.png create mode 100644 graphics/event_objects/pics/berry_trees/iapapa/3.png create mode 100644 graphics/event_objects/pics/berry_trees/iapapa/4.png create mode 100644 graphics/event_objects/pics/berry_trees/iapapa/5.png create mode 100644 graphics/event_objects/pics/berry_trees/kelpsy/0.png create mode 100644 graphics/event_objects/pics/berry_trees/kelpsy/1.png create mode 100644 graphics/event_objects/pics/berry_trees/kelpsy/2.png create mode 100644 graphics/event_objects/pics/berry_trees/kelpsy/3.png create mode 100644 graphics/event_objects/pics/berry_trees/kelpsy/4.png create mode 100644 graphics/event_objects/pics/berry_trees/kelpsy/5.png create mode 100644 graphics/event_objects/pics/berry_trees/lansat/0.png create mode 100644 graphics/event_objects/pics/berry_trees/lansat/1.png create mode 100644 graphics/event_objects/pics/berry_trees/lansat/2.png create mode 100644 graphics/event_objects/pics/berry_trees/lansat/3.png create mode 100644 graphics/event_objects/pics/berry_trees/lansat/4.png create mode 100644 graphics/event_objects/pics/berry_trees/lansat/5.png create mode 100644 graphics/event_objects/pics/berry_trees/leppa/0.png create mode 100644 graphics/event_objects/pics/berry_trees/leppa/1.png create mode 100644 graphics/event_objects/pics/berry_trees/leppa/2.png create mode 100644 graphics/event_objects/pics/berry_trees/leppa/3.png create mode 100644 graphics/event_objects/pics/berry_trees/leppa/4.png create mode 100644 graphics/event_objects/pics/berry_trees/leppa/5.png create mode 100644 graphics/event_objects/pics/berry_trees/liechi/0.png create mode 100644 graphics/event_objects/pics/berry_trees/liechi/1.png create mode 100644 graphics/event_objects/pics/berry_trees/liechi/2.png create mode 100644 graphics/event_objects/pics/berry_trees/liechi/3.png create mode 100644 graphics/event_objects/pics/berry_trees/liechi/4.png create mode 100644 graphics/event_objects/pics/berry_trees/liechi/5.png create mode 100644 graphics/event_objects/pics/berry_trees/lum/0.png create mode 100644 graphics/event_objects/pics/berry_trees/lum/1.png create mode 100644 graphics/event_objects/pics/berry_trees/lum/2.png create mode 100644 graphics/event_objects/pics/berry_trees/lum/3.png create mode 100644 graphics/event_objects/pics/berry_trees/lum/4.png create mode 100644 graphics/event_objects/pics/berry_trees/lum/5.png create mode 100644 graphics/event_objects/pics/berry_trees/mago/0.png create mode 100644 graphics/event_objects/pics/berry_trees/mago/1.png create mode 100644 graphics/event_objects/pics/berry_trees/mago/2.png create mode 100644 graphics/event_objects/pics/berry_trees/mago/3.png create mode 100644 graphics/event_objects/pics/berry_trees/mago/4.png create mode 100644 graphics/event_objects/pics/berry_trees/mago/5.png create mode 100644 graphics/event_objects/pics/berry_trees/nomel/0.png create mode 100644 graphics/event_objects/pics/berry_trees/nomel/1.png create mode 100644 graphics/event_objects/pics/berry_trees/nomel/2.png create mode 100644 graphics/event_objects/pics/berry_trees/nomel/3.png create mode 100644 graphics/event_objects/pics/berry_trees/nomel/4.png create mode 100644 graphics/event_objects/pics/berry_trees/nomel/5.png create mode 100644 graphics/event_objects/pics/berry_trees/oran/0.png create mode 100644 graphics/event_objects/pics/berry_trees/oran/1.png create mode 100644 graphics/event_objects/pics/berry_trees/oran/2.png create mode 100644 graphics/event_objects/pics/berry_trees/oran/3.png create mode 100644 graphics/event_objects/pics/berry_trees/oran/4.png create mode 100644 graphics/event_objects/pics/berry_trees/oran/5.png create mode 100644 graphics/event_objects/pics/berry_trees/pamtre/0.png create mode 100644 graphics/event_objects/pics/berry_trees/pamtre/1.png create mode 100644 graphics/event_objects/pics/berry_trees/pamtre/2.png create mode 100644 graphics/event_objects/pics/berry_trees/pamtre/3.png create mode 100644 graphics/event_objects/pics/berry_trees/pamtre/4.png create mode 100644 graphics/event_objects/pics/berry_trees/pamtre/5.png create mode 100644 graphics/event_objects/pics/berry_trees/pecha/0.png create mode 100644 graphics/event_objects/pics/berry_trees/pecha/1.png create mode 100644 graphics/event_objects/pics/berry_trees/pecha/2.png create mode 100644 graphics/event_objects/pics/berry_trees/pecha/3.png create mode 100644 graphics/event_objects/pics/berry_trees/pecha/4.png create mode 100644 graphics/event_objects/pics/berry_trees/pecha/5.png create mode 100644 graphics/event_objects/pics/berry_trees/persim/0.png create mode 100644 graphics/event_objects/pics/berry_trees/persim/1.png create mode 100644 graphics/event_objects/pics/berry_trees/persim/2.png create mode 100644 graphics/event_objects/pics/berry_trees/persim/3.png create mode 100644 graphics/event_objects/pics/berry_trees/persim/4.png create mode 100644 graphics/event_objects/pics/berry_trees/persim/5.png create mode 100644 graphics/event_objects/pics/berry_trees/pomeg/0.png create mode 100644 graphics/event_objects/pics/berry_trees/pomeg/1.png create mode 100644 graphics/event_objects/pics/berry_trees/pomeg/2.png create mode 100644 graphics/event_objects/pics/berry_trees/pomeg/3.png create mode 100644 graphics/event_objects/pics/berry_trees/pomeg/4.png create mode 100644 graphics/event_objects/pics/berry_trees/pomeg/5.png create mode 100644 graphics/event_objects/pics/berry_trees/rabuta/0.png create mode 100644 graphics/event_objects/pics/berry_trees/rabuta/1.png create mode 100644 graphics/event_objects/pics/berry_trees/rabuta/2.png create mode 100644 graphics/event_objects/pics/berry_trees/rabuta/3.png create mode 100644 graphics/event_objects/pics/berry_trees/rabuta/4.png create mode 100644 graphics/event_objects/pics/berry_trees/rabuta/5.png create mode 100644 graphics/event_objects/pics/berry_trees/rawst/0.png create mode 100644 graphics/event_objects/pics/berry_trees/rawst/1.png create mode 100644 graphics/event_objects/pics/berry_trees/rawst/2.png create mode 100644 graphics/event_objects/pics/berry_trees/rawst/3.png create mode 100644 graphics/event_objects/pics/berry_trees/rawst/4.png create mode 100644 graphics/event_objects/pics/berry_trees/rawst/5.png create mode 100644 graphics/event_objects/pics/berry_trees/razz/0.png create mode 100644 graphics/event_objects/pics/berry_trees/razz/1.png create mode 100644 graphics/event_objects/pics/berry_trees/razz/2.png create mode 100644 graphics/event_objects/pics/berry_trees/razz/3.png create mode 100644 graphics/event_objects/pics/berry_trees/razz/4.png create mode 100644 graphics/event_objects/pics/berry_trees/razz/5.png create mode 100644 graphics/event_objects/pics/berry_trees/sitrus/0.png create mode 100644 graphics/event_objects/pics/berry_trees/sitrus/1.png create mode 100644 graphics/event_objects/pics/berry_trees/sitrus/2.png create mode 100644 graphics/event_objects/pics/berry_trees/sitrus/3.png create mode 100644 graphics/event_objects/pics/berry_trees/sitrus/4.png create mode 100644 graphics/event_objects/pics/berry_trees/sitrus/5.png create mode 100644 graphics/event_objects/pics/berry_trees/spelon/0.png create mode 100644 graphics/event_objects/pics/berry_trees/spelon/1.png create mode 100644 graphics/event_objects/pics/berry_trees/spelon/2.png create mode 100644 graphics/event_objects/pics/berry_trees/spelon/3.png create mode 100644 graphics/event_objects/pics/berry_trees/spelon/4.png create mode 100644 graphics/event_objects/pics/berry_trees/spelon/5.png create mode 100644 graphics/event_objects/pics/berry_trees/sprout/0.png create mode 100644 graphics/event_objects/pics/berry_trees/sprout/1.png create mode 100644 graphics/event_objects/pics/berry_trees/tamato/0.png create mode 100644 graphics/event_objects/pics/berry_trees/tamato/1.png create mode 100644 graphics/event_objects/pics/berry_trees/tamato/2.png create mode 100644 graphics/event_objects/pics/berry_trees/tamato/3.png create mode 100644 graphics/event_objects/pics/berry_trees/tamato/4.png create mode 100644 graphics/event_objects/pics/berry_trees/tamato/5.png create mode 100644 graphics/event_objects/pics/berry_trees/wepear/0.png create mode 100644 graphics/event_objects/pics/berry_trees/wepear/1.png create mode 100644 graphics/event_objects/pics/berry_trees/wepear/2.png create mode 100644 graphics/event_objects/pics/berry_trees/wepear/3.png create mode 100644 graphics/event_objects/pics/berry_trees/wepear/4.png create mode 100644 graphics/event_objects/pics/berry_trees/wepear/5.png create mode 100644 graphics/event_objects/pics/berry_trees/wiki/0.png create mode 100644 graphics/event_objects/pics/berry_trees/wiki/1.png create mode 100644 graphics/event_objects/pics/berry_trees/wiki/2.png create mode 100644 graphics/event_objects/pics/berry_trees/wiki/3.png create mode 100644 graphics/event_objects/pics/berry_trees/wiki/4.png create mode 100644 graphics/event_objects/pics/berry_trees/wiki/5.png create mode 100644 graphics/event_objects/pics/cushions/ball_cushion.png create mode 100644 graphics/event_objects/pics/cushions/diamond_cushion.png create mode 100644 graphics/event_objects/pics/cushions/fire_cushion.png create mode 100644 graphics/event_objects/pics/cushions/grass_cushion.png create mode 100644 graphics/event_objects/pics/cushions/kiss_cushion.png create mode 100644 graphics/event_objects/pics/cushions/pika_cushion.png create mode 100644 graphics/event_objects/pics/cushions/round_cushion.png create mode 100644 graphics/event_objects/pics/cushions/spin_cushion.png create mode 100644 graphics/event_objects/pics/cushions/water_cushion.png create mode 100644 graphics/event_objects/pics/cushions/zigzag_cushion.png create mode 100644 graphics/event_objects/pics/dolls/azurill_doll.png create mode 100644 graphics/event_objects/pics/dolls/baltoy_doll.png create mode 100644 graphics/event_objects/pics/dolls/big_blastoise_doll.png create mode 100644 graphics/event_objects/pics/dolls/big_charizard_doll.png create mode 100644 graphics/event_objects/pics/dolls/big_lapras_doll.png create mode 100644 graphics/event_objects/pics/dolls/big_regice_doll.png create mode 100644 graphics/event_objects/pics/dolls/big_regirock_doll.png create mode 100644 graphics/event_objects/pics/dolls/big_registeel_doll.png create mode 100644 graphics/event_objects/pics/dolls/big_rhydon_doll.png create mode 100644 graphics/event_objects/pics/dolls/big_snorlax_doll.png create mode 100644 graphics/event_objects/pics/dolls/big_venusaur_doll.png create mode 100644 graphics/event_objects/pics/dolls/big_wailmer_doll.png create mode 100644 graphics/event_objects/pics/dolls/chikorita_doll.png create mode 100644 graphics/event_objects/pics/dolls/clefairy_doll.png create mode 100644 graphics/event_objects/pics/dolls/cyndaquil_doll.png create mode 100644 graphics/event_objects/pics/dolls/ditto_doll.png create mode 100644 graphics/event_objects/pics/dolls/duskull_doll.png create mode 100644 graphics/event_objects/pics/dolls/gulpin_doll.png create mode 100644 graphics/event_objects/pics/dolls/jigglypuff_doll.png create mode 100644 graphics/event_objects/pics/dolls/kecleon_doll.png create mode 100644 graphics/event_objects/pics/dolls/lotad_doll.png create mode 100644 graphics/event_objects/pics/dolls/marill_doll.png create mode 100644 graphics/event_objects/pics/dolls/meowth_doll.png create mode 100644 graphics/event_objects/pics/dolls/mudkip_doll.png create mode 100644 graphics/event_objects/pics/dolls/pichu_doll.png create mode 100644 graphics/event_objects/pics/dolls/pikachu_doll.png create mode 100644 graphics/event_objects/pics/dolls/seedot_doll.png create mode 100644 graphics/event_objects/pics/dolls/skitty_doll.png create mode 100644 graphics/event_objects/pics/dolls/smoochum_doll.png create mode 100644 graphics/event_objects/pics/dolls/swablu_doll.png create mode 100644 graphics/event_objects/pics/dolls/togepi_doll.png create mode 100644 graphics/event_objects/pics/dolls/torchic_doll.png create mode 100644 graphics/event_objects/pics/dolls/totodile_doll.png create mode 100644 graphics/event_objects/pics/dolls/treecko_doll.png create mode 100644 graphics/event_objects/pics/dolls/unused_magnemite_doll.png create mode 100644 graphics/event_objects/pics/dolls/unused_natu_doll.png create mode 100644 graphics/event_objects/pics/dolls/unused_pikachu_doll.png create mode 100644 graphics/event_objects/pics/dolls/unused_porygon2_doll.png create mode 100644 graphics/event_objects/pics/dolls/unused_squirtle_doll.png create mode 100644 graphics/event_objects/pics/dolls/unused_wooper_doll.png create mode 100644 graphics/event_objects/pics/dolls/wynaut_doll.png create mode 100644 graphics/event_objects/pics/effects/arrow/0.png create mode 100644 graphics/event_objects/pics/effects/arrow/1.png create mode 100644 graphics/event_objects/pics/effects/arrow/2.png create mode 100644 graphics/event_objects/pics/effects/arrow/3.png create mode 100644 graphics/event_objects/pics/effects/arrow/4.png create mode 100644 graphics/event_objects/pics/effects/arrow/5.png create mode 100644 graphics/event_objects/pics/effects/arrow/6.png create mode 100644 graphics/event_objects/pics/effects/arrow/7.png create mode 100644 graphics/event_objects/pics/effects/ash/0.png create mode 100644 graphics/event_objects/pics/effects/ash/1.png create mode 100644 graphics/event_objects/pics/effects/ash/2.png create mode 100644 graphics/event_objects/pics/effects/ash/3.png create mode 100644 graphics/event_objects/pics/effects/ash/4.png create mode 100644 graphics/event_objects/pics/effects/berry_tree_growth_sparkle/0.png create mode 100644 graphics/event_objects/pics/effects/berry_tree_growth_sparkle/1.png create mode 100644 graphics/event_objects/pics/effects/berry_tree_growth_sparkle/2.png create mode 100644 graphics/event_objects/pics/effects/berry_tree_growth_sparkle/3.png create mode 100644 graphics/event_objects/pics/effects/berry_tree_growth_sparkle/4.png create mode 100644 graphics/event_objects/pics/effects/berry_tree_growth_sparkle/5.png create mode 100644 graphics/event_objects/pics/effects/bike_hop_big_splash/0.png create mode 100644 graphics/event_objects/pics/effects/bike_hop_big_splash/1.png create mode 100644 graphics/event_objects/pics/effects/bike_hop_big_splash/2.png create mode 100644 graphics/event_objects/pics/effects/bike_hop_big_splash/3.png create mode 100644 graphics/event_objects/pics/effects/bike_hop_small_splash/0.png create mode 100644 graphics/event_objects/pics/effects/bike_hop_small_splash/1.png create mode 100644 graphics/event_objects/pics/effects/bike_hop_small_splash/2.png create mode 100644 graphics/event_objects/pics/effects/bike_hop_tall_grass/0.png create mode 100644 graphics/event_objects/pics/effects/bike_hop_tall_grass/1.png create mode 100644 graphics/event_objects/pics/effects/bike_hop_tall_grass/2.png create mode 100644 graphics/event_objects/pics/effects/bike_hop_tall_grass/3.png create mode 100644 graphics/event_objects/pics/effects/bike_tire_tracks/0.png create mode 100644 graphics/event_objects/pics/effects/bike_tire_tracks/1.png create mode 100644 graphics/event_objects/pics/effects/bike_tire_tracks/2.png create mode 100644 graphics/event_objects/pics/effects/bike_tire_tracks/3.png create mode 100644 graphics/event_objects/pics/effects/bird.png create mode 100644 graphics/event_objects/pics/effects/bubbles/0.png create mode 100644 graphics/event_objects/pics/effects/bubbles/1.png create mode 100644 graphics/event_objects/pics/effects/bubbles/2.png create mode 100644 graphics/event_objects/pics/effects/bubbles/3.png create mode 100644 graphics/event_objects/pics/effects/bubbles/4.png create mode 100644 graphics/event_objects/pics/effects/bubbles/5.png create mode 100644 graphics/event_objects/pics/effects/bubbles/6.png create mode 100644 graphics/event_objects/pics/effects/bubbles/7.png create mode 100644 graphics/event_objects/pics/effects/deep_sand_footprints/0.png create mode 100644 graphics/event_objects/pics/effects/deep_sand_footprints/1.png create mode 100644 graphics/event_objects/pics/effects/ground_impact_dust/0.png create mode 100644 graphics/event_objects/pics/effects/ground_impact_dust/1.png create mode 100644 graphics/event_objects/pics/effects/ground_impact_dust/2.png create mode 100644 graphics/event_objects/pics/effects/hot_springs_water.png create mode 100644 graphics/event_objects/pics/effects/jump_out_of_ash/0.png create mode 100644 graphics/event_objects/pics/effects/jump_out_of_ash/1.png create mode 100644 graphics/event_objects/pics/effects/jump_out_of_ash/2.png create mode 100644 graphics/event_objects/pics/effects/jump_out_of_ash/3.png create mode 100644 graphics/event_objects/pics/effects/jump_out_of_ash/4.png create mode 100644 graphics/event_objects/pics/effects/long_grass/0.png create mode 100644 graphics/event_objects/pics/effects/long_grass/1.png create mode 100644 graphics/event_objects/pics/effects/long_grass/2.png create mode 100644 graphics/event_objects/pics/effects/long_grass/3.png create mode 100644 graphics/event_objects/pics/effects/mountain_disguise/0.png create mode 100644 graphics/event_objects/pics/effects/mountain_disguise/1.png create mode 100644 graphics/event_objects/pics/effects/mountain_disguise/2.png create mode 100644 graphics/event_objects/pics/effects/mountain_disguise/3.png create mode 100644 graphics/event_objects/pics/effects/mountain_disguise/4.png create mode 100644 graphics/event_objects/pics/effects/mountain_disguise/5.png create mode 100644 graphics/event_objects/pics/effects/mountain_disguise/6.png create mode 100644 graphics/event_objects/pics/effects/ripple/0.png create mode 100644 graphics/event_objects/pics/effects/ripple/1.png create mode 100644 graphics/event_objects/pics/effects/ripple/2.png create mode 100644 graphics/event_objects/pics/effects/ripple/3.png create mode 100644 graphics/event_objects/pics/effects/ripple/4.png create mode 100644 graphics/event_objects/pics/effects/sand_disguise_placeholder/0.png create mode 100644 graphics/event_objects/pics/effects/sand_disguise_placeholder/1.png create mode 100644 graphics/event_objects/pics/effects/sand_disguise_placeholder/2.png create mode 100644 graphics/event_objects/pics/effects/sand_disguise_placeholder/3.png create mode 100644 graphics/event_objects/pics/effects/sand_disguise_placeholder/4.png create mode 100644 graphics/event_objects/pics/effects/sand_disguise_placeholder/5.png create mode 100644 graphics/event_objects/pics/effects/sand_disguise_placeholder/6.png create mode 100644 graphics/event_objects/pics/effects/sand_footprints/0.png create mode 100644 graphics/event_objects/pics/effects/sand_footprints/1.png create mode 100644 graphics/event_objects/pics/effects/shadow_extra_large.png create mode 100644 graphics/event_objects/pics/effects/shadow_large.png create mode 100644 graphics/event_objects/pics/effects/shadow_medium.png create mode 100644 graphics/event_objects/pics/effects/shadow_small.png create mode 100644 graphics/event_objects/pics/effects/short_grass/0.png create mode 100644 graphics/event_objects/pics/effects/short_grass/1.png create mode 100644 graphics/event_objects/pics/effects/splash/0.png create mode 100644 graphics/event_objects/pics/effects/splash/1.png create mode 100644 graphics/event_objects/pics/effects/surf_blob/0.png create mode 100644 graphics/event_objects/pics/effects/surf_blob/1.png create mode 100644 graphics/event_objects/pics/effects/surf_blob/2.png create mode 100644 graphics/event_objects/pics/effects/tall_grass/0.png create mode 100644 graphics/event_objects/pics/effects/tall_grass/1.png create mode 100644 graphics/event_objects/pics/effects/tall_grass/2.png create mode 100644 graphics/event_objects/pics/effects/tall_grass/3.png create mode 100644 graphics/event_objects/pics/effects/tall_grass/4.png create mode 100644 graphics/event_objects/pics/effects/tree_disguise/0.png create mode 100644 graphics/event_objects/pics/effects/tree_disguise/1.png create mode 100644 graphics/event_objects/pics/effects/tree_disguise/2.png create mode 100644 graphics/event_objects/pics/effects/tree_disguise/3.png create mode 100644 graphics/event_objects/pics/effects/tree_disguise/4.png create mode 100644 graphics/event_objects/pics/effects/tree_disguise/5.png create mode 100644 graphics/event_objects/pics/effects/tree_disguise/6.png create mode 100644 graphics/event_objects/pics/effects/unknown_16/0.png create mode 100644 graphics/event_objects/pics/effects/unknown_16/1.png create mode 100644 graphics/event_objects/pics/effects/unknown_16/2.png create mode 100644 graphics/event_objects/pics/effects/unknown_16/3.png create mode 100644 graphics/event_objects/pics/effects/unknown_16/4.png create mode 100644 graphics/event_objects/pics/effects/unknown_16/5.png create mode 100644 graphics/event_objects/pics/effects/unknown_17/0.png create mode 100644 graphics/event_objects/pics/effects/unknown_17/1.png create mode 100644 graphics/event_objects/pics/effects/unknown_17/2.png create mode 100644 graphics/event_objects/pics/effects/unknown_17/3.png create mode 100644 graphics/event_objects/pics/effects/unknown_17/4.png create mode 100644 graphics/event_objects/pics/effects/unknown_17/5.png create mode 100644 graphics/event_objects/pics/effects/unknown_17/6.png create mode 100644 graphics/event_objects/pics/effects/unknown_17/7.png create mode 100644 graphics/event_objects/pics/effects/unknown_18/0.png create mode 100644 graphics/event_objects/pics/effects/unknown_18/1.png create mode 100644 graphics/event_objects/pics/effects/unknown_18/2.png create mode 100644 graphics/event_objects/pics/effects/unknown_18/3.png create mode 100644 graphics/event_objects/pics/effects/unknown_19/0.png create mode 100644 graphics/event_objects/pics/effects/unknown_19/1.png create mode 100644 graphics/event_objects/pics/effects/unknown_19/2.png create mode 100644 graphics/event_objects/pics/effects/unknown_19/3.png create mode 100644 graphics/event_objects/pics/effects/unknown_20/0.png create mode 100644 graphics/event_objects/pics/effects/unknown_20/1.png create mode 100644 graphics/event_objects/pics/effects/unknown_20/2.png create mode 100644 graphics/event_objects/pics/effects/unknown_20/3.png create mode 100644 graphics/event_objects/pics/effects/unknown_20/4.png create mode 100644 graphics/event_objects/pics/effects/unknown_29/0.png create mode 100644 graphics/event_objects/pics/effects/unknown_29/1.png create mode 100644 graphics/event_objects/pics/effects/unknown_29/2.png create mode 100644 graphics/event_objects/pics/effects/unknown_33/0.png create mode 100644 graphics/event_objects/pics/effects/unknown_33/1.png create mode 100644 graphics/event_objects/pics/effects/unknown_33/2.png create mode 100644 graphics/event_objects/pics/effects/unknown_33/3.png create mode 100644 graphics/event_objects/pics/effects/unknown_33/4.png create mode 100644 graphics/event_objects/pics/effects/unknown_35/0.png create mode 100644 graphics/event_objects/pics/effects/unknown_35/1.png create mode 100644 graphics/event_objects/pics/effects/unknown_4F6D38/0.png create mode 100644 graphics/event_objects/pics/effects/unknown_4F7E38/0.png create mode 100644 graphics/event_objects/pics/effects/unused_grass/0.png create mode 100644 graphics/event_objects/pics/effects/unused_grass/1.png create mode 100644 graphics/event_objects/pics/effects/unused_grass/2.png create mode 100644 graphics/event_objects/pics/effects/unused_grass/3.png create mode 100644 graphics/event_objects/pics/misc/birchs_bag.png create mode 100644 graphics/event_objects/pics/misc/birth_island_stone.png create mode 100644 graphics/event_objects/pics/misc/breakable_rock/0.png create mode 100644 graphics/event_objects/pics/misc/breakable_rock/1.png create mode 100644 graphics/event_objects/pics/misc/breakable_rock/2.png create mode 100644 graphics/event_objects/pics/misc/breakable_rock/3.png create mode 100644 graphics/event_objects/pics/misc/cable_car.png create mode 100644 graphics/event_objects/pics/misc/cuttable_tree/0.png create mode 100644 graphics/event_objects/pics/misc/cuttable_tree/1.png create mode 100644 graphics/event_objects/pics/misc/cuttable_tree/2.png create mode 100644 graphics/event_objects/pics/misc/cuttable_tree/3.png create mode 100644 graphics/event_objects/pics/misc/fossil.png create mode 100644 graphics/event_objects/pics/misc/item_ball.png create mode 100644 graphics/event_objects/pics/misc/moving_box.png create mode 100644 graphics/event_objects/pics/misc/mr_brineys_boat/0.png create mode 100644 graphics/event_objects/pics/misc/mr_brineys_boat/1.png create mode 100644 graphics/event_objects/pics/misc/mr_brineys_boat/2.png create mode 100644 graphics/event_objects/pics/misc/pushable_boulder.png create mode 100644 graphics/event_objects/pics/misc/ss_tidal.png create mode 100644 graphics/event_objects/pics/misc/statue.png create mode 100644 graphics/event_objects/pics/misc/submarine_shadow.png create mode 100644 graphics/event_objects/pics/misc/truck.png create mode 100644 graphics/event_objects/pics/people/anabel/0.png create mode 100644 graphics/event_objects/pics/people/anabel/1.png create mode 100644 graphics/event_objects/pics/people/anabel/2.png create mode 100644 graphics/event_objects/pics/people/anabel/3.png create mode 100644 graphics/event_objects/pics/people/anabel/4.png create mode 100644 graphics/event_objects/pics/people/anabel/5.png create mode 100644 graphics/event_objects/pics/people/anabel/6.png create mode 100644 graphics/event_objects/pics/people/anabel/7.png create mode 100644 graphics/event_objects/pics/people/anabel/8.png create mode 100644 graphics/event_objects/pics/people/aqua_member_f/0.png create mode 100644 graphics/event_objects/pics/people/aqua_member_f/1.png create mode 100644 graphics/event_objects/pics/people/aqua_member_f/2.png create mode 100644 graphics/event_objects/pics/people/aqua_member_f/3.png create mode 100644 graphics/event_objects/pics/people/aqua_member_f/4.png create mode 100644 graphics/event_objects/pics/people/aqua_member_f/5.png create mode 100644 graphics/event_objects/pics/people/aqua_member_f/6.png create mode 100644 graphics/event_objects/pics/people/aqua_member_f/7.png create mode 100644 graphics/event_objects/pics/people/aqua_member_f/8.png create mode 100644 graphics/event_objects/pics/people/aqua_member_m/0.png create mode 100644 graphics/event_objects/pics/people/aqua_member_m/1.png create mode 100644 graphics/event_objects/pics/people/aqua_member_m/2.png create mode 100644 graphics/event_objects/pics/people/aqua_member_m/3.png create mode 100644 graphics/event_objects/pics/people/aqua_member_m/4.png create mode 100644 graphics/event_objects/pics/people/aqua_member_m/5.png create mode 100644 graphics/event_objects/pics/people/aqua_member_m/6.png create mode 100644 graphics/event_objects/pics/people/aqua_member_m/7.png create mode 100644 graphics/event_objects/pics/people/aqua_member_m/8.png create mode 100644 graphics/event_objects/pics/people/archie/0.png create mode 100644 graphics/event_objects/pics/people/archie/1.png create mode 100644 graphics/event_objects/pics/people/archie/2.png create mode 100644 graphics/event_objects/pics/people/archie/3.png create mode 100644 graphics/event_objects/pics/people/archie/4.png create mode 100644 graphics/event_objects/pics/people/archie/5.png create mode 100644 graphics/event_objects/pics/people/archie/6.png create mode 100644 graphics/event_objects/pics/people/archie/7.png create mode 100644 graphics/event_objects/pics/people/archie/8.png create mode 100644 graphics/event_objects/pics/people/artist/0.png create mode 100644 graphics/event_objects/pics/people/artist/1.png create mode 100644 graphics/event_objects/pics/people/artist/2.png create mode 100644 graphics/event_objects/pics/people/artist/3.png create mode 100644 graphics/event_objects/pics/people/artist/4.png create mode 100644 graphics/event_objects/pics/people/artist/5.png create mode 100644 graphics/event_objects/pics/people/artist/6.png create mode 100644 graphics/event_objects/pics/people/artist/7.png create mode 100644 graphics/event_objects/pics/people/artist/8.png create mode 100644 graphics/event_objects/pics/people/beauty/0.png create mode 100644 graphics/event_objects/pics/people/beauty/1.png create mode 100644 graphics/event_objects/pics/people/beauty/2.png create mode 100644 graphics/event_objects/pics/people/beauty/3.png create mode 100644 graphics/event_objects/pics/people/beauty/4.png create mode 100644 graphics/event_objects/pics/people/beauty/5.png create mode 100644 graphics/event_objects/pics/people/beauty/6.png create mode 100644 graphics/event_objects/pics/people/beauty/7.png create mode 100644 graphics/event_objects/pics/people/beauty/8.png create mode 100644 graphics/event_objects/pics/people/black_belt/0.png create mode 100644 graphics/event_objects/pics/people/black_belt/1.png create mode 100644 graphics/event_objects/pics/people/black_belt/2.png create mode 100644 graphics/event_objects/pics/people/black_belt/3.png create mode 100644 graphics/event_objects/pics/people/black_belt/4.png create mode 100644 graphics/event_objects/pics/people/black_belt/5.png create mode 100644 graphics/event_objects/pics/people/black_belt/6.png create mode 100644 graphics/event_objects/pics/people/black_belt/7.png create mode 100644 graphics/event_objects/pics/people/black_belt/8.png create mode 100644 graphics/event_objects/pics/people/boy_1/0.png create mode 100644 graphics/event_objects/pics/people/boy_1/1.png create mode 100644 graphics/event_objects/pics/people/boy_1/2.png create mode 100644 graphics/event_objects/pics/people/boy_1/3.png create mode 100644 graphics/event_objects/pics/people/boy_1/4.png create mode 100644 graphics/event_objects/pics/people/boy_1/5.png create mode 100644 graphics/event_objects/pics/people/boy_1/6.png create mode 100644 graphics/event_objects/pics/people/boy_1/7.png create mode 100644 graphics/event_objects/pics/people/boy_1/8.png create mode 100644 graphics/event_objects/pics/people/boy_2/0.png create mode 100644 graphics/event_objects/pics/people/boy_2/1.png create mode 100644 graphics/event_objects/pics/people/boy_2/2.png create mode 100644 graphics/event_objects/pics/people/boy_2/3.png create mode 100644 graphics/event_objects/pics/people/boy_2/4.png create mode 100644 graphics/event_objects/pics/people/boy_2/5.png create mode 100644 graphics/event_objects/pics/people/boy_2/6.png create mode 100644 graphics/event_objects/pics/people/boy_2/7.png create mode 100644 graphics/event_objects/pics/people/boy_2/8.png create mode 100644 graphics/event_objects/pics/people/boy_3/0.png create mode 100644 graphics/event_objects/pics/people/boy_3/1.png create mode 100644 graphics/event_objects/pics/people/boy_3/2.png create mode 100644 graphics/event_objects/pics/people/boy_3/3.png create mode 100644 graphics/event_objects/pics/people/boy_3/4.png create mode 100644 graphics/event_objects/pics/people/boy_3/5.png create mode 100644 graphics/event_objects/pics/people/boy_3/6.png create mode 100644 graphics/event_objects/pics/people/boy_3/7.png create mode 100644 graphics/event_objects/pics/people/boy_3/8.png create mode 100644 graphics/event_objects/pics/people/boy_4/0.png create mode 100644 graphics/event_objects/pics/people/boy_4/1.png create mode 100644 graphics/event_objects/pics/people/boy_4/2.png create mode 100644 graphics/event_objects/pics/people/boy_4/3.png create mode 100644 graphics/event_objects/pics/people/boy_4/4.png create mode 100644 graphics/event_objects/pics/people/boy_4/5.png create mode 100644 graphics/event_objects/pics/people/boy_4/6.png create mode 100644 graphics/event_objects/pics/people/boy_4/7.png create mode 100644 graphics/event_objects/pics/people/boy_4/8.png create mode 100644 graphics/event_objects/pics/people/boy_5/0.png create mode 100644 graphics/event_objects/pics/people/boy_5/1.png create mode 100644 graphics/event_objects/pics/people/boy_5/2.png create mode 100644 graphics/event_objects/pics/people/brandon/0.png create mode 100644 graphics/event_objects/pics/people/brandon/1.png create mode 100644 graphics/event_objects/pics/people/brandon/2.png create mode 100644 graphics/event_objects/pics/people/brandon/3.png create mode 100644 graphics/event_objects/pics/people/brandon/4.png create mode 100644 graphics/event_objects/pics/people/brandon/5.png create mode 100644 graphics/event_objects/pics/people/brandon/6.png create mode 100644 graphics/event_objects/pics/people/brandon/7.png create mode 100644 graphics/event_objects/pics/people/brandon/8.png create mode 100644 graphics/event_objects/pics/people/brawly/0.png create mode 100644 graphics/event_objects/pics/people/brawly/1.png create mode 100644 graphics/event_objects/pics/people/brawly/2.png create mode 100644 graphics/event_objects/pics/people/brendan/acro_bike/00.png create mode 100644 graphics/event_objects/pics/people/brendan/acro_bike/01.png create mode 100644 graphics/event_objects/pics/people/brendan/acro_bike/02.png create mode 100644 graphics/event_objects/pics/people/brendan/acro_bike/03.png create mode 100644 graphics/event_objects/pics/people/brendan/acro_bike/04.png create mode 100644 graphics/event_objects/pics/people/brendan/acro_bike/05.png create mode 100644 graphics/event_objects/pics/people/brendan/acro_bike/06.png create mode 100644 graphics/event_objects/pics/people/brendan/acro_bike/07.png create mode 100644 graphics/event_objects/pics/people/brendan/acro_bike/08.png create mode 100644 graphics/event_objects/pics/people/brendan/acro_bike/09.png create mode 100644 graphics/event_objects/pics/people/brendan/acro_bike/10.png create mode 100644 graphics/event_objects/pics/people/brendan/acro_bike/11.png create mode 100644 graphics/event_objects/pics/people/brendan/acro_bike/12.png create mode 100644 graphics/event_objects/pics/people/brendan/acro_bike/13.png create mode 100644 graphics/event_objects/pics/people/brendan/acro_bike/14.png create mode 100644 graphics/event_objects/pics/people/brendan/acro_bike/15.png create mode 100644 graphics/event_objects/pics/people/brendan/acro_bike/16.png create mode 100644 graphics/event_objects/pics/people/brendan/acro_bike/17.png create mode 100644 graphics/event_objects/pics/people/brendan/acro_bike/18.png create mode 100644 graphics/event_objects/pics/people/brendan/acro_bike/19.png create mode 100644 graphics/event_objects/pics/people/brendan/acro_bike/20.png create mode 100644 graphics/event_objects/pics/people/brendan/acro_bike/21.png create mode 100644 graphics/event_objects/pics/people/brendan/acro_bike/22.png create mode 100644 graphics/event_objects/pics/people/brendan/acro_bike/23.png create mode 100644 graphics/event_objects/pics/people/brendan/acro_bike/24.png create mode 100644 graphics/event_objects/pics/people/brendan/acro_bike/25.png create mode 100644 graphics/event_objects/pics/people/brendan/acro_bike/26.png create mode 100644 graphics/event_objects/pics/people/brendan/decorating.png create mode 100644 graphics/event_objects/pics/people/brendan/field_move/0.png create mode 100644 graphics/event_objects/pics/people/brendan/field_move/1.png create mode 100644 graphics/event_objects/pics/people/brendan/field_move/2.png create mode 100644 graphics/event_objects/pics/people/brendan/field_move/3.png create mode 100644 graphics/event_objects/pics/people/brendan/field_move/4.png create mode 100644 graphics/event_objects/pics/people/brendan/fishing/00.png create mode 100644 graphics/event_objects/pics/people/brendan/fishing/01.png create mode 100644 graphics/event_objects/pics/people/brendan/fishing/02.png create mode 100644 graphics/event_objects/pics/people/brendan/fishing/03.png create mode 100644 graphics/event_objects/pics/people/brendan/fishing/04.png create mode 100644 graphics/event_objects/pics/people/brendan/fishing/05.png create mode 100644 graphics/event_objects/pics/people/brendan/fishing/06.png create mode 100644 graphics/event_objects/pics/people/brendan/fishing/07.png create mode 100644 graphics/event_objects/pics/people/brendan/fishing/08.png create mode 100644 graphics/event_objects/pics/people/brendan/fishing/09.png create mode 100644 graphics/event_objects/pics/people/brendan/fishing/10.png create mode 100644 graphics/event_objects/pics/people/brendan/fishing/11.png create mode 100644 graphics/event_objects/pics/people/brendan/mach_bike/0.png create mode 100644 graphics/event_objects/pics/people/brendan/mach_bike/1.png create mode 100644 graphics/event_objects/pics/people/brendan/mach_bike/2.png create mode 100644 graphics/event_objects/pics/people/brendan/mach_bike/3.png create mode 100644 graphics/event_objects/pics/people/brendan/mach_bike/4.png create mode 100644 graphics/event_objects/pics/people/brendan/mach_bike/5.png create mode 100644 graphics/event_objects/pics/people/brendan/mach_bike/6.png create mode 100644 graphics/event_objects/pics/people/brendan/mach_bike/7.png create mode 100644 graphics/event_objects/pics/people/brendan/mach_bike/8.png create mode 100644 graphics/event_objects/pics/people/brendan/normal/00.png create mode 100644 graphics/event_objects/pics/people/brendan/normal/01.png create mode 100644 graphics/event_objects/pics/people/brendan/normal/02.png create mode 100644 graphics/event_objects/pics/people/brendan/normal/03.png create mode 100644 graphics/event_objects/pics/people/brendan/normal/04.png create mode 100644 graphics/event_objects/pics/people/brendan/normal/05.png create mode 100644 graphics/event_objects/pics/people/brendan/normal/06.png create mode 100644 graphics/event_objects/pics/people/brendan/normal/07.png create mode 100644 graphics/event_objects/pics/people/brendan/normal/08.png create mode 100644 graphics/event_objects/pics/people/brendan/normal/09.png create mode 100644 graphics/event_objects/pics/people/brendan/normal/10.png create mode 100644 graphics/event_objects/pics/people/brendan/normal/11.png create mode 100644 graphics/event_objects/pics/people/brendan/normal/12.png create mode 100644 graphics/event_objects/pics/people/brendan/normal/13.png create mode 100644 graphics/event_objects/pics/people/brendan/normal/14.png create mode 100644 graphics/event_objects/pics/people/brendan/normal/15.png create mode 100644 graphics/event_objects/pics/people/brendan/normal/16.png create mode 100644 graphics/event_objects/pics/people/brendan/normal/17.png create mode 100644 graphics/event_objects/pics/people/brendan/surfing/0.png create mode 100644 graphics/event_objects/pics/people/brendan/surfing/1.png create mode 100644 graphics/event_objects/pics/people/brendan/surfing/2.png create mode 100644 graphics/event_objects/pics/people/brendan/surfing/3.png create mode 100644 graphics/event_objects/pics/people/brendan/surfing/4.png create mode 100644 graphics/event_objects/pics/people/brendan/surfing/5.png create mode 100644 graphics/event_objects/pics/people/brendan/underwater/0.png create mode 100644 graphics/event_objects/pics/people/brendan/underwater/1.png create mode 100644 graphics/event_objects/pics/people/brendan/underwater/2.png create mode 100644 graphics/event_objects/pics/people/brendan/underwater/3.png create mode 100644 graphics/event_objects/pics/people/brendan/watering/0.png create mode 100644 graphics/event_objects/pics/people/brendan/watering/1.png create mode 100644 graphics/event_objects/pics/people/brendan/watering/2.png create mode 100644 graphics/event_objects/pics/people/brendan/watering/3.png create mode 100644 graphics/event_objects/pics/people/brendan/watering/4.png create mode 100644 graphics/event_objects/pics/people/brendan/watering/5.png create mode 100644 graphics/event_objects/pics/people/bug_catcher/0.png create mode 100644 graphics/event_objects/pics/people/bug_catcher/1.png create mode 100644 graphics/event_objects/pics/people/bug_catcher/2.png create mode 100644 graphics/event_objects/pics/people/bug_catcher/3.png create mode 100644 graphics/event_objects/pics/people/bug_catcher/4.png create mode 100644 graphics/event_objects/pics/people/bug_catcher/5.png create mode 100644 graphics/event_objects/pics/people/bug_catcher/6.png create mode 100644 graphics/event_objects/pics/people/bug_catcher/7.png create mode 100644 graphics/event_objects/pics/people/bug_catcher/8.png create mode 100644 graphics/event_objects/pics/people/cameraman/0.png create mode 100644 graphics/event_objects/pics/people/cameraman/1.png create mode 100644 graphics/event_objects/pics/people/cameraman/2.png create mode 100644 graphics/event_objects/pics/people/cameraman/3.png create mode 100644 graphics/event_objects/pics/people/cameraman/4.png create mode 100644 graphics/event_objects/pics/people/cameraman/5.png create mode 100644 graphics/event_objects/pics/people/cameraman/6.png create mode 100644 graphics/event_objects/pics/people/cameraman/7.png create mode 100644 graphics/event_objects/pics/people/cameraman/8.png create mode 100644 graphics/event_objects/pics/people/camper/0.png create mode 100644 graphics/event_objects/pics/people/camper/1.png create mode 100644 graphics/event_objects/pics/people/camper/2.png create mode 100644 graphics/event_objects/pics/people/camper/3.png create mode 100644 graphics/event_objects/pics/people/camper/4.png create mode 100644 graphics/event_objects/pics/people/camper/5.png create mode 100644 graphics/event_objects/pics/people/camper/6.png create mode 100644 graphics/event_objects/pics/people/camper/7.png create mode 100644 graphics/event_objects/pics/people/camper/8.png create mode 100644 graphics/event_objects/pics/people/contest_old_man/0.png create mode 100644 graphics/event_objects/pics/people/contest_old_man/1.png create mode 100644 graphics/event_objects/pics/people/contest_old_man/2.png create mode 100644 graphics/event_objects/pics/people/contest_old_man/3.png create mode 100644 graphics/event_objects/pics/people/contest_old_man/4.png create mode 100644 graphics/event_objects/pics/people/contest_old_man/5.png create mode 100644 graphics/event_objects/pics/people/contest_old_man/6.png create mode 100644 graphics/event_objects/pics/people/contest_old_man/7.png create mode 100644 graphics/event_objects/pics/people/contest_old_man/8.png create mode 100644 graphics/event_objects/pics/people/cook/0.png create mode 100644 graphics/event_objects/pics/people/cook/1.png create mode 100644 graphics/event_objects/pics/people/cook/2.png create mode 100644 graphics/event_objects/pics/people/cycling_triathlete_f/0.png create mode 100644 graphics/event_objects/pics/people/cycling_triathlete_f/1.png create mode 100644 graphics/event_objects/pics/people/cycling_triathlete_f/2.png create mode 100644 graphics/event_objects/pics/people/cycling_triathlete_f/3.png create mode 100644 graphics/event_objects/pics/people/cycling_triathlete_f/4.png create mode 100644 graphics/event_objects/pics/people/cycling_triathlete_f/5.png create mode 100644 graphics/event_objects/pics/people/cycling_triathlete_f/6.png create mode 100644 graphics/event_objects/pics/people/cycling_triathlete_f/7.png create mode 100644 graphics/event_objects/pics/people/cycling_triathlete_f/8.png create mode 100644 graphics/event_objects/pics/people/cycling_triathlete_m/0.png create mode 100644 graphics/event_objects/pics/people/cycling_triathlete_m/1.png create mode 100644 graphics/event_objects/pics/people/cycling_triathlete_m/2.png create mode 100644 graphics/event_objects/pics/people/cycling_triathlete_m/3.png create mode 100644 graphics/event_objects/pics/people/cycling_triathlete_m/4.png create mode 100644 graphics/event_objects/pics/people/cycling_triathlete_m/5.png create mode 100644 graphics/event_objects/pics/people/cycling_triathlete_m/6.png create mode 100644 graphics/event_objects/pics/people/cycling_triathlete_m/7.png create mode 100644 graphics/event_objects/pics/people/cycling_triathlete_m/8.png create mode 100644 graphics/event_objects/pics/people/drake/0.png create mode 100644 graphics/event_objects/pics/people/drake/1.png create mode 100644 graphics/event_objects/pics/people/drake/2.png create mode 100644 graphics/event_objects/pics/people/fat_man/0.png create mode 100644 graphics/event_objects/pics/people/fat_man/1.png create mode 100644 graphics/event_objects/pics/people/fat_man/2.png create mode 100644 graphics/event_objects/pics/people/fat_man/3.png create mode 100644 graphics/event_objects/pics/people/fat_man/4.png create mode 100644 graphics/event_objects/pics/people/fat_man/5.png create mode 100644 graphics/event_objects/pics/people/fat_man/6.png create mode 100644 graphics/event_objects/pics/people/fat_man/7.png create mode 100644 graphics/event_objects/pics/people/fat_man/8.png create mode 100644 graphics/event_objects/pics/people/fisherman/0.png create mode 100644 graphics/event_objects/pics/people/fisherman/1.png create mode 100644 graphics/event_objects/pics/people/fisherman/2.png create mode 100644 graphics/event_objects/pics/people/fisherman/3.png create mode 100644 graphics/event_objects/pics/people/fisherman/4.png create mode 100644 graphics/event_objects/pics/people/fisherman/5.png create mode 100644 graphics/event_objects/pics/people/fisherman/6.png create mode 100644 graphics/event_objects/pics/people/fisherman/7.png create mode 100644 graphics/event_objects/pics/people/fisherman/8.png create mode 100644 graphics/event_objects/pics/people/flannery/0.png create mode 100644 graphics/event_objects/pics/people/flannery/1.png create mode 100644 graphics/event_objects/pics/people/flannery/2.png create mode 100644 graphics/event_objects/pics/people/gentleman/0.png create mode 100644 graphics/event_objects/pics/people/gentleman/1.png create mode 100644 graphics/event_objects/pics/people/gentleman/2.png create mode 100644 graphics/event_objects/pics/people/gentleman/3.png create mode 100644 graphics/event_objects/pics/people/gentleman/4.png create mode 100644 graphics/event_objects/pics/people/gentleman/5.png create mode 100644 graphics/event_objects/pics/people/gentleman/6.png create mode 100644 graphics/event_objects/pics/people/gentleman/7.png create mode 100644 graphics/event_objects/pics/people/gentleman/8.png create mode 100644 graphics/event_objects/pics/people/girl_1/0.png create mode 100644 graphics/event_objects/pics/people/girl_1/1.png create mode 100644 graphics/event_objects/pics/people/girl_1/2.png create mode 100644 graphics/event_objects/pics/people/girl_1/3.png create mode 100644 graphics/event_objects/pics/people/girl_1/4.png create mode 100644 graphics/event_objects/pics/people/girl_1/5.png create mode 100644 graphics/event_objects/pics/people/girl_1/6.png create mode 100644 graphics/event_objects/pics/people/girl_1/7.png create mode 100644 graphics/event_objects/pics/people/girl_1/8.png create mode 100644 graphics/event_objects/pics/people/girl_2/0.png create mode 100644 graphics/event_objects/pics/people/girl_2/1.png create mode 100644 graphics/event_objects/pics/people/girl_2/2.png create mode 100644 graphics/event_objects/pics/people/girl_2/3.png create mode 100644 graphics/event_objects/pics/people/girl_2/4.png create mode 100644 graphics/event_objects/pics/people/girl_2/5.png create mode 100644 graphics/event_objects/pics/people/girl_2/6.png create mode 100644 graphics/event_objects/pics/people/girl_2/7.png create mode 100644 graphics/event_objects/pics/people/girl_2/8.png create mode 100644 graphics/event_objects/pics/people/girl_3/0.png create mode 100644 graphics/event_objects/pics/people/girl_3/1.png create mode 100644 graphics/event_objects/pics/people/girl_3/2.png create mode 100644 graphics/event_objects/pics/people/girl_3/3.png create mode 100644 graphics/event_objects/pics/people/girl_3/4.png create mode 100644 graphics/event_objects/pics/people/girl_3/5.png create mode 100644 graphics/event_objects/pics/people/girl_3/6.png create mode 100644 graphics/event_objects/pics/people/girl_3/7.png create mode 100644 graphics/event_objects/pics/people/girl_3/8.png create mode 100644 graphics/event_objects/pics/people/glacia/0.png create mode 100644 graphics/event_objects/pics/people/glacia/1.png create mode 100644 graphics/event_objects/pics/people/glacia/2.png create mode 100644 graphics/event_objects/pics/people/greta/0.png create mode 100644 graphics/event_objects/pics/people/greta/1.png create mode 100644 graphics/event_objects/pics/people/greta/2.png create mode 100644 graphics/event_objects/pics/people/greta/3.png create mode 100644 graphics/event_objects/pics/people/greta/4.png create mode 100644 graphics/event_objects/pics/people/greta/5.png create mode 100644 graphics/event_objects/pics/people/greta/6.png create mode 100644 graphics/event_objects/pics/people/greta/7.png create mode 100644 graphics/event_objects/pics/people/greta/8.png create mode 100644 graphics/event_objects/pics/people/hex_maniac/0.png create mode 100644 graphics/event_objects/pics/people/hex_maniac/1.png create mode 100644 graphics/event_objects/pics/people/hex_maniac/2.png create mode 100644 graphics/event_objects/pics/people/hex_maniac/3.png create mode 100644 graphics/event_objects/pics/people/hex_maniac/4.png create mode 100644 graphics/event_objects/pics/people/hex_maniac/5.png create mode 100644 graphics/event_objects/pics/people/hex_maniac/6.png create mode 100644 graphics/event_objects/pics/people/hex_maniac/7.png create mode 100644 graphics/event_objects/pics/people/hex_maniac/8.png create mode 100644 graphics/event_objects/pics/people/hiker/0.png create mode 100644 graphics/event_objects/pics/people/hiker/1.png create mode 100644 graphics/event_objects/pics/people/hiker/2.png create mode 100644 graphics/event_objects/pics/people/hiker/3.png create mode 100644 graphics/event_objects/pics/people/hiker/4.png create mode 100644 graphics/event_objects/pics/people/hiker/5.png create mode 100644 graphics/event_objects/pics/people/hiker/6.png create mode 100644 graphics/event_objects/pics/people/hiker/7.png create mode 100644 graphics/event_objects/pics/people/hiker/8.png create mode 100644 graphics/event_objects/pics/people/hot_springs_old_woman/0.png create mode 100644 graphics/event_objects/pics/people/hot_springs_old_woman/1.png create mode 100644 graphics/event_objects/pics/people/hot_springs_old_woman/2.png create mode 100644 graphics/event_objects/pics/people/hot_springs_old_woman/3.png create mode 100644 graphics/event_objects/pics/people/hot_springs_old_woman/4.png create mode 100644 graphics/event_objects/pics/people/hot_springs_old_woman/5.png create mode 100644 graphics/event_objects/pics/people/hot_springs_old_woman/6.png create mode 100644 graphics/event_objects/pics/people/hot_springs_old_woman/7.png create mode 100644 graphics/event_objects/pics/people/hot_springs_old_woman/8.png create mode 100644 graphics/event_objects/pics/people/juan/0.png create mode 100644 graphics/event_objects/pics/people/juan/1.png create mode 100644 graphics/event_objects/pics/people/juan/2.png create mode 100644 graphics/event_objects/pics/people/juan/3.png create mode 100644 graphics/event_objects/pics/people/juan/4.png create mode 100644 graphics/event_objects/pics/people/juan/5.png create mode 100644 graphics/event_objects/pics/people/juan/6.png create mode 100644 graphics/event_objects/pics/people/juan/7.png create mode 100644 graphics/event_objects/pics/people/juan/8.png create mode 100644 graphics/event_objects/pics/people/lass/0.png create mode 100644 graphics/event_objects/pics/people/lass/1.png create mode 100644 graphics/event_objects/pics/people/lass/2.png create mode 100644 graphics/event_objects/pics/people/lass/3.png create mode 100644 graphics/event_objects/pics/people/lass/4.png create mode 100644 graphics/event_objects/pics/people/lass/5.png create mode 100644 graphics/event_objects/pics/people/lass/6.png create mode 100644 graphics/event_objects/pics/people/lass/7.png create mode 100644 graphics/event_objects/pics/people/lass/8.png create mode 100644 graphics/event_objects/pics/people/leaf/0.png create mode 100644 graphics/event_objects/pics/people/leaf/1.png create mode 100644 graphics/event_objects/pics/people/leaf/2.png create mode 100644 graphics/event_objects/pics/people/leaf/3.png create mode 100644 graphics/event_objects/pics/people/leaf/4.png create mode 100644 graphics/event_objects/pics/people/leaf/5.png create mode 100644 graphics/event_objects/pics/people/leaf/6.png create mode 100644 graphics/event_objects/pics/people/leaf/7.png create mode 100644 graphics/event_objects/pics/people/leaf/8.png create mode 100644 graphics/event_objects/pics/people/little_boy_1/0.png create mode 100644 graphics/event_objects/pics/people/little_boy_1/1.png create mode 100644 graphics/event_objects/pics/people/little_boy_1/2.png create mode 100644 graphics/event_objects/pics/people/little_boy_1/3.png create mode 100644 graphics/event_objects/pics/people/little_boy_1/4.png create mode 100644 graphics/event_objects/pics/people/little_boy_1/5.png create mode 100644 graphics/event_objects/pics/people/little_boy_1/6.png create mode 100644 graphics/event_objects/pics/people/little_boy_1/7.png create mode 100644 graphics/event_objects/pics/people/little_boy_1/8.png create mode 100644 graphics/event_objects/pics/people/little_boy_2/0.png create mode 100644 graphics/event_objects/pics/people/little_boy_2/1.png create mode 100644 graphics/event_objects/pics/people/little_boy_2/2.png create mode 100644 graphics/event_objects/pics/people/little_boy_2/3.png create mode 100644 graphics/event_objects/pics/people/little_boy_2/4.png create mode 100644 graphics/event_objects/pics/people/little_boy_2/5.png create mode 100644 graphics/event_objects/pics/people/little_boy_2/6.png create mode 100644 graphics/event_objects/pics/people/little_boy_2/7.png create mode 100644 graphics/event_objects/pics/people/little_boy_2/8.png create mode 100644 graphics/event_objects/pics/people/little_girl_1/0.png create mode 100644 graphics/event_objects/pics/people/little_girl_1/1.png create mode 100644 graphics/event_objects/pics/people/little_girl_1/2.png create mode 100644 graphics/event_objects/pics/people/little_girl_1/3.png create mode 100644 graphics/event_objects/pics/people/little_girl_1/4.png create mode 100644 graphics/event_objects/pics/people/little_girl_1/5.png create mode 100644 graphics/event_objects/pics/people/little_girl_1/6.png create mode 100644 graphics/event_objects/pics/people/little_girl_1/7.png create mode 100644 graphics/event_objects/pics/people/little_girl_1/8.png create mode 100644 graphics/event_objects/pics/people/little_girl_2/0.png create mode 100644 graphics/event_objects/pics/people/little_girl_2/1.png create mode 100644 graphics/event_objects/pics/people/little_girl_2/2.png create mode 100644 graphics/event_objects/pics/people/little_girl_2/3.png create mode 100644 graphics/event_objects/pics/people/little_girl_2/4.png create mode 100644 graphics/event_objects/pics/people/little_girl_2/5.png create mode 100644 graphics/event_objects/pics/people/little_girl_2/6.png create mode 100644 graphics/event_objects/pics/people/little_girl_2/7.png create mode 100644 graphics/event_objects/pics/people/little_girl_2/8.png create mode 100644 graphics/event_objects/pics/people/liza/0.png create mode 100644 graphics/event_objects/pics/people/liza/1.png create mode 100644 graphics/event_objects/pics/people/liza/2.png create mode 100644 graphics/event_objects/pics/people/lucy/0.png create mode 100644 graphics/event_objects/pics/people/lucy/1.png create mode 100644 graphics/event_objects/pics/people/lucy/2.png create mode 100644 graphics/event_objects/pics/people/lucy/3.png create mode 100644 graphics/event_objects/pics/people/lucy/4.png create mode 100644 graphics/event_objects/pics/people/lucy/5.png create mode 100644 graphics/event_objects/pics/people/lucy/6.png create mode 100644 graphics/event_objects/pics/people/lucy/7.png create mode 100644 graphics/event_objects/pics/people/lucy/8.png create mode 100644 graphics/event_objects/pics/people/magma_member_f/0.png create mode 100644 graphics/event_objects/pics/people/magma_member_f/1.png create mode 100644 graphics/event_objects/pics/people/magma_member_f/2.png create mode 100644 graphics/event_objects/pics/people/magma_member_f/3.png create mode 100644 graphics/event_objects/pics/people/magma_member_f/4.png create mode 100644 graphics/event_objects/pics/people/magma_member_f/5.png create mode 100644 graphics/event_objects/pics/people/magma_member_f/6.png create mode 100644 graphics/event_objects/pics/people/magma_member_f/7.png create mode 100644 graphics/event_objects/pics/people/magma_member_f/8.png create mode 100644 graphics/event_objects/pics/people/magma_member_m/0.png create mode 100644 graphics/event_objects/pics/people/magma_member_m/1.png create mode 100644 graphics/event_objects/pics/people/magma_member_m/2.png create mode 100644 graphics/event_objects/pics/people/magma_member_m/3.png create mode 100644 graphics/event_objects/pics/people/magma_member_m/4.png create mode 100644 graphics/event_objects/pics/people/magma_member_m/5.png create mode 100644 graphics/event_objects/pics/people/magma_member_m/6.png create mode 100644 graphics/event_objects/pics/people/magma_member_m/7.png create mode 100644 graphics/event_objects/pics/people/magma_member_m/8.png create mode 100644 graphics/event_objects/pics/people/man_1/0.png create mode 100644 graphics/event_objects/pics/people/man_1/1.png create mode 100644 graphics/event_objects/pics/people/man_1/2.png create mode 100644 graphics/event_objects/pics/people/man_1/3.png create mode 100644 graphics/event_objects/pics/people/man_1/4.png create mode 100644 graphics/event_objects/pics/people/man_1/5.png create mode 100644 graphics/event_objects/pics/people/man_1/6.png create mode 100644 graphics/event_objects/pics/people/man_1/7.png create mode 100644 graphics/event_objects/pics/people/man_1/8.png create mode 100644 graphics/event_objects/pics/people/man_2/0.png create mode 100644 graphics/event_objects/pics/people/man_2/1.png create mode 100644 graphics/event_objects/pics/people/man_2/2.png create mode 100644 graphics/event_objects/pics/people/man_2/3.png create mode 100644 graphics/event_objects/pics/people/man_2/4.png create mode 100644 graphics/event_objects/pics/people/man_2/5.png create mode 100644 graphics/event_objects/pics/people/man_2/6.png create mode 100644 graphics/event_objects/pics/people/man_2/7.png create mode 100644 graphics/event_objects/pics/people/man_2/8.png create mode 100644 graphics/event_objects/pics/people/man_3/0.png create mode 100644 graphics/event_objects/pics/people/man_3/1.png create mode 100644 graphics/event_objects/pics/people/man_3/2.png create mode 100644 graphics/event_objects/pics/people/man_3/3.png create mode 100644 graphics/event_objects/pics/people/man_3/4.png create mode 100644 graphics/event_objects/pics/people/man_3/5.png create mode 100644 graphics/event_objects/pics/people/man_3/6.png create mode 100644 graphics/event_objects/pics/people/man_3/7.png create mode 100644 graphics/event_objects/pics/people/man_3/8.png create mode 100644 graphics/event_objects/pics/people/man_4/0.png create mode 100644 graphics/event_objects/pics/people/man_4/1.png create mode 100644 graphics/event_objects/pics/people/man_4/2.png create mode 100644 graphics/event_objects/pics/people/man_4/3.png create mode 100644 graphics/event_objects/pics/people/man_4/4.png create mode 100644 graphics/event_objects/pics/people/man_4/5.png create mode 100644 graphics/event_objects/pics/people/man_4/6.png create mode 100644 graphics/event_objects/pics/people/man_4/7.png create mode 100644 graphics/event_objects/pics/people/man_4/8.png create mode 100644 graphics/event_objects/pics/people/man_5/0.png create mode 100644 graphics/event_objects/pics/people/man_5/1.png create mode 100644 graphics/event_objects/pics/people/man_5/2.png create mode 100644 graphics/event_objects/pics/people/man_5/3.png create mode 100644 graphics/event_objects/pics/people/man_5/4.png create mode 100644 graphics/event_objects/pics/people/man_5/5.png create mode 100644 graphics/event_objects/pics/people/man_5/6.png create mode 100644 graphics/event_objects/pics/people/man_5/7.png create mode 100644 graphics/event_objects/pics/people/man_5/8.png create mode 100644 graphics/event_objects/pics/people/man_6/0.png create mode 100644 graphics/event_objects/pics/people/man_6/1.png create mode 100644 graphics/event_objects/pics/people/man_6/2.png create mode 100644 graphics/event_objects/pics/people/man_6/3.png create mode 100644 graphics/event_objects/pics/people/man_6/4.png create mode 100644 graphics/event_objects/pics/people/man_6/5.png create mode 100644 graphics/event_objects/pics/people/man_6/6.png create mode 100644 graphics/event_objects/pics/people/man_6/7.png create mode 100644 graphics/event_objects/pics/people/man_6/8.png create mode 100644 graphics/event_objects/pics/people/man_7/0.png create mode 100644 graphics/event_objects/pics/people/man_7/1.png create mode 100644 graphics/event_objects/pics/people/man_7/2.png create mode 100644 graphics/event_objects/pics/people/man_7/3.png create mode 100644 graphics/event_objects/pics/people/man_7/4.png create mode 100644 graphics/event_objects/pics/people/man_7/5.png create mode 100644 graphics/event_objects/pics/people/man_7/6.png create mode 100644 graphics/event_objects/pics/people/man_7/7.png create mode 100644 graphics/event_objects/pics/people/man_7/8.png create mode 100644 graphics/event_objects/pics/people/maniac/0.png create mode 100644 graphics/event_objects/pics/people/maniac/1.png create mode 100644 graphics/event_objects/pics/people/maniac/2.png create mode 100644 graphics/event_objects/pics/people/maniac/3.png create mode 100644 graphics/event_objects/pics/people/maniac/4.png create mode 100644 graphics/event_objects/pics/people/maniac/5.png create mode 100644 graphics/event_objects/pics/people/maniac/6.png create mode 100644 graphics/event_objects/pics/people/maniac/7.png create mode 100644 graphics/event_objects/pics/people/maniac/8.png create mode 100644 graphics/event_objects/pics/people/mart_employee/0.png create mode 100644 graphics/event_objects/pics/people/mart_employee/1.png create mode 100644 graphics/event_objects/pics/people/mart_employee/2.png create mode 100644 graphics/event_objects/pics/people/mart_employee/3.png create mode 100644 graphics/event_objects/pics/people/mart_employee/4.png create mode 100644 graphics/event_objects/pics/people/mart_employee/5.png create mode 100644 graphics/event_objects/pics/people/mart_employee/6.png create mode 100644 graphics/event_objects/pics/people/mart_employee/7.png create mode 100644 graphics/event_objects/pics/people/mart_employee/8.png create mode 100644 graphics/event_objects/pics/people/mauville_old_man_1/0.png create mode 100644 graphics/event_objects/pics/people/mauville_old_man_1/1.png create mode 100644 graphics/event_objects/pics/people/mauville_old_man_1/2.png create mode 100644 graphics/event_objects/pics/people/mauville_old_man_1/3.png create mode 100644 graphics/event_objects/pics/people/mauville_old_man_1/4.png create mode 100644 graphics/event_objects/pics/people/mauville_old_man_1/5.png create mode 100644 graphics/event_objects/pics/people/mauville_old_man_1/6.png create mode 100644 graphics/event_objects/pics/people/mauville_old_man_1/7.png create mode 100644 graphics/event_objects/pics/people/mauville_old_man_1/8.png create mode 100644 graphics/event_objects/pics/people/mauville_old_man_2/0.png create mode 100644 graphics/event_objects/pics/people/mauville_old_man_2/1.png create mode 100644 graphics/event_objects/pics/people/mauville_old_man_2/2.png create mode 100644 graphics/event_objects/pics/people/mauville_old_man_2/3.png create mode 100644 graphics/event_objects/pics/people/mauville_old_man_2/4.png create mode 100644 graphics/event_objects/pics/people/mauville_old_man_2/5.png create mode 100644 graphics/event_objects/pics/people/mauville_old_man_2/6.png create mode 100644 graphics/event_objects/pics/people/mauville_old_man_2/7.png create mode 100644 graphics/event_objects/pics/people/mauville_old_man_2/8.png create mode 100644 graphics/event_objects/pics/people/maxie/0.png create mode 100644 graphics/event_objects/pics/people/maxie/1.png create mode 100644 graphics/event_objects/pics/people/maxie/2.png create mode 100644 graphics/event_objects/pics/people/maxie/3.png create mode 100644 graphics/event_objects/pics/people/maxie/4.png create mode 100644 graphics/event_objects/pics/people/maxie/5.png create mode 100644 graphics/event_objects/pics/people/maxie/6.png create mode 100644 graphics/event_objects/pics/people/maxie/7.png create mode 100644 graphics/event_objects/pics/people/maxie/8.png create mode 100644 graphics/event_objects/pics/people/may/acro_bike/00.png create mode 100644 graphics/event_objects/pics/people/may/acro_bike/01.png create mode 100644 graphics/event_objects/pics/people/may/acro_bike/02.png create mode 100644 graphics/event_objects/pics/people/may/acro_bike/03.png create mode 100644 graphics/event_objects/pics/people/may/acro_bike/04.png create mode 100644 graphics/event_objects/pics/people/may/acro_bike/05.png create mode 100644 graphics/event_objects/pics/people/may/acro_bike/06.png create mode 100644 graphics/event_objects/pics/people/may/acro_bike/07.png create mode 100644 graphics/event_objects/pics/people/may/acro_bike/08.png create mode 100644 graphics/event_objects/pics/people/may/acro_bike/09.png create mode 100644 graphics/event_objects/pics/people/may/acro_bike/10.png create mode 100644 graphics/event_objects/pics/people/may/acro_bike/11.png create mode 100644 graphics/event_objects/pics/people/may/acro_bike/12.png create mode 100644 graphics/event_objects/pics/people/may/acro_bike/13.png create mode 100644 graphics/event_objects/pics/people/may/acro_bike/14.png create mode 100644 graphics/event_objects/pics/people/may/acro_bike/15.png create mode 100644 graphics/event_objects/pics/people/may/acro_bike/16.png create mode 100644 graphics/event_objects/pics/people/may/acro_bike/17.png create mode 100644 graphics/event_objects/pics/people/may/acro_bike/18.png create mode 100644 graphics/event_objects/pics/people/may/acro_bike/19.png create mode 100644 graphics/event_objects/pics/people/may/acro_bike/20.png create mode 100644 graphics/event_objects/pics/people/may/acro_bike/21.png create mode 100644 graphics/event_objects/pics/people/may/acro_bike/22.png create mode 100644 graphics/event_objects/pics/people/may/acro_bike/23.png create mode 100644 graphics/event_objects/pics/people/may/acro_bike/24.png create mode 100644 graphics/event_objects/pics/people/may/acro_bike/25.png create mode 100644 graphics/event_objects/pics/people/may/acro_bike/26.png create mode 100644 graphics/event_objects/pics/people/may/decorating.png create mode 100644 graphics/event_objects/pics/people/may/field_move/0.png create mode 100644 graphics/event_objects/pics/people/may/field_move/1.png create mode 100644 graphics/event_objects/pics/people/may/field_move/2.png create mode 100644 graphics/event_objects/pics/people/may/field_move/3.png create mode 100644 graphics/event_objects/pics/people/may/field_move/4.png create mode 100644 graphics/event_objects/pics/people/may/fishing/00.png create mode 100644 graphics/event_objects/pics/people/may/fishing/01.png create mode 100644 graphics/event_objects/pics/people/may/fishing/02.png create mode 100644 graphics/event_objects/pics/people/may/fishing/03.png create mode 100644 graphics/event_objects/pics/people/may/fishing/04.png create mode 100644 graphics/event_objects/pics/people/may/fishing/05.png create mode 100644 graphics/event_objects/pics/people/may/fishing/06.png create mode 100644 graphics/event_objects/pics/people/may/fishing/07.png create mode 100644 graphics/event_objects/pics/people/may/fishing/08.png create mode 100644 graphics/event_objects/pics/people/may/fishing/09.png create mode 100644 graphics/event_objects/pics/people/may/fishing/10.png create mode 100644 graphics/event_objects/pics/people/may/fishing/11.png create mode 100644 graphics/event_objects/pics/people/may/mach_bike/0.png create mode 100644 graphics/event_objects/pics/people/may/mach_bike/1.png create mode 100644 graphics/event_objects/pics/people/may/mach_bike/2.png create mode 100644 graphics/event_objects/pics/people/may/mach_bike/3.png create mode 100644 graphics/event_objects/pics/people/may/mach_bike/4.png create mode 100644 graphics/event_objects/pics/people/may/mach_bike/5.png create mode 100644 graphics/event_objects/pics/people/may/mach_bike/6.png create mode 100644 graphics/event_objects/pics/people/may/mach_bike/7.png create mode 100644 graphics/event_objects/pics/people/may/mach_bike/8.png create mode 100644 graphics/event_objects/pics/people/may/normal/00.png create mode 100644 graphics/event_objects/pics/people/may/normal/01.png create mode 100644 graphics/event_objects/pics/people/may/normal/02.png create mode 100644 graphics/event_objects/pics/people/may/normal/03.png create mode 100644 graphics/event_objects/pics/people/may/normal/04.png create mode 100644 graphics/event_objects/pics/people/may/normal/05.png create mode 100644 graphics/event_objects/pics/people/may/normal/06.png create mode 100644 graphics/event_objects/pics/people/may/normal/07.png create mode 100644 graphics/event_objects/pics/people/may/normal/08.png create mode 100644 graphics/event_objects/pics/people/may/normal/09.png create mode 100644 graphics/event_objects/pics/people/may/normal/10.png create mode 100644 graphics/event_objects/pics/people/may/normal/11.png create mode 100644 graphics/event_objects/pics/people/may/normal/12.png create mode 100644 graphics/event_objects/pics/people/may/normal/13.png create mode 100644 graphics/event_objects/pics/people/may/normal/14.png create mode 100644 graphics/event_objects/pics/people/may/normal/15.png create mode 100644 graphics/event_objects/pics/people/may/normal/16.png create mode 100644 graphics/event_objects/pics/people/may/normal/17.png create mode 100644 graphics/event_objects/pics/people/may/surfing/0.png create mode 100644 graphics/event_objects/pics/people/may/surfing/1.png create mode 100644 graphics/event_objects/pics/people/may/surfing/2.png create mode 100644 graphics/event_objects/pics/people/may/surfing/3.png create mode 100644 graphics/event_objects/pics/people/may/surfing/4.png create mode 100644 graphics/event_objects/pics/people/may/surfing/5.png create mode 100644 graphics/event_objects/pics/people/may/underwater/0.png create mode 100644 graphics/event_objects/pics/people/may/underwater/1.png create mode 100644 graphics/event_objects/pics/people/may/underwater/2.png create mode 100644 graphics/event_objects/pics/people/may/underwater/3.png create mode 100644 graphics/event_objects/pics/people/may/watering/0.png create mode 100644 graphics/event_objects/pics/people/may/watering/1.png create mode 100644 graphics/event_objects/pics/people/may/watering/2.png create mode 100644 graphics/event_objects/pics/people/may/watering/3.png create mode 100644 graphics/event_objects/pics/people/may/watering/4.png create mode 100644 graphics/event_objects/pics/people/may/watering/5.png create mode 100644 graphics/event_objects/pics/people/mom/0.png create mode 100644 graphics/event_objects/pics/people/mom/1.png create mode 100644 graphics/event_objects/pics/people/mom/2.png create mode 100644 graphics/event_objects/pics/people/mom/3.png create mode 100644 graphics/event_objects/pics/people/mom/4.png create mode 100644 graphics/event_objects/pics/people/mom/5.png create mode 100644 graphics/event_objects/pics/people/mom/6.png create mode 100644 graphics/event_objects/pics/people/mom/7.png create mode 100644 graphics/event_objects/pics/people/mom/8.png create mode 100644 graphics/event_objects/pics/people/mystery_event_deliveryman/0.png create mode 100644 graphics/event_objects/pics/people/mystery_event_deliveryman/1.png create mode 100644 graphics/event_objects/pics/people/mystery_event_deliveryman/2.png create mode 100644 graphics/event_objects/pics/people/noland/0.png create mode 100644 graphics/event_objects/pics/people/noland/1.png create mode 100644 graphics/event_objects/pics/people/noland/2.png create mode 100644 graphics/event_objects/pics/people/noland/3.png create mode 100644 graphics/event_objects/pics/people/noland/4.png create mode 100644 graphics/event_objects/pics/people/noland/5.png create mode 100644 graphics/event_objects/pics/people/noland/6.png create mode 100644 graphics/event_objects/pics/people/noland/7.png create mode 100644 graphics/event_objects/pics/people/noland/8.png create mode 100644 graphics/event_objects/pics/people/norman/0.png create mode 100644 graphics/event_objects/pics/people/norman/1.png create mode 100644 graphics/event_objects/pics/people/norman/2.png create mode 100644 graphics/event_objects/pics/people/norman/3.png create mode 100644 graphics/event_objects/pics/people/norman/4.png create mode 100644 graphics/event_objects/pics/people/norman/5.png create mode 100644 graphics/event_objects/pics/people/norman/6.png create mode 100644 graphics/event_objects/pics/people/norman/7.png create mode 100644 graphics/event_objects/pics/people/norman/8.png create mode 100644 graphics/event_objects/pics/people/nurse/0.png create mode 100644 graphics/event_objects/pics/people/nurse/1.png create mode 100644 graphics/event_objects/pics/people/nurse/2.png create mode 100644 graphics/event_objects/pics/people/nurse/3.png create mode 100644 graphics/event_objects/pics/people/old_man_1/0.png create mode 100644 graphics/event_objects/pics/people/old_man_1/1.png create mode 100644 graphics/event_objects/pics/people/old_man_1/2.png create mode 100644 graphics/event_objects/pics/people/old_man_1/3.png create mode 100644 graphics/event_objects/pics/people/old_man_1/4.png create mode 100644 graphics/event_objects/pics/people/old_man_1/5.png create mode 100644 graphics/event_objects/pics/people/old_man_1/6.png create mode 100644 graphics/event_objects/pics/people/old_man_1/7.png create mode 100644 graphics/event_objects/pics/people/old_man_1/8.png create mode 100644 graphics/event_objects/pics/people/old_man_2/0.png create mode 100644 graphics/event_objects/pics/people/old_man_2/1.png create mode 100644 graphics/event_objects/pics/people/old_man_2/2.png create mode 100644 graphics/event_objects/pics/people/old_woman_1/0.png create mode 100644 graphics/event_objects/pics/people/old_woman_1/1.png create mode 100644 graphics/event_objects/pics/people/old_woman_1/2.png create mode 100644 graphics/event_objects/pics/people/old_woman_1/3.png create mode 100644 graphics/event_objects/pics/people/old_woman_1/4.png create mode 100644 graphics/event_objects/pics/people/old_woman_1/5.png create mode 100644 graphics/event_objects/pics/people/old_woman_1/6.png create mode 100644 graphics/event_objects/pics/people/old_woman_1/7.png create mode 100644 graphics/event_objects/pics/people/old_woman_1/8.png create mode 100644 graphics/event_objects/pics/people/old_woman_2/0.png create mode 100644 graphics/event_objects/pics/people/old_woman_2/1.png create mode 100644 graphics/event_objects/pics/people/old_woman_2/2.png create mode 100644 graphics/event_objects/pics/people/old_woman_2/3.png create mode 100644 graphics/event_objects/pics/people/old_woman_2/4.png create mode 100644 graphics/event_objects/pics/people/old_woman_2/5.png create mode 100644 graphics/event_objects/pics/people/old_woman_2/6.png create mode 100644 graphics/event_objects/pics/people/old_woman_2/7.png create mode 100644 graphics/event_objects/pics/people/old_woman_2/8.png create mode 100644 graphics/event_objects/pics/people/phoebe/0.png create mode 100644 graphics/event_objects/pics/people/phoebe/1.png create mode 100644 graphics/event_objects/pics/people/phoebe/2.png create mode 100644 graphics/event_objects/pics/people/picnicker/0.png create mode 100644 graphics/event_objects/pics/people/picnicker/1.png create mode 100644 graphics/event_objects/pics/people/picnicker/2.png create mode 100644 graphics/event_objects/pics/people/picnicker/3.png create mode 100644 graphics/event_objects/pics/people/picnicker/4.png create mode 100644 graphics/event_objects/pics/people/picnicker/5.png create mode 100644 graphics/event_objects/pics/people/picnicker/6.png create mode 100644 graphics/event_objects/pics/people/picnicker/7.png create mode 100644 graphics/event_objects/pics/people/picnicker/8.png create mode 100644 graphics/event_objects/pics/people/prof_birch/0.png create mode 100644 graphics/event_objects/pics/people/prof_birch/1.png create mode 100644 graphics/event_objects/pics/people/prof_birch/2.png create mode 100644 graphics/event_objects/pics/people/prof_birch/3.png create mode 100644 graphics/event_objects/pics/people/prof_birch/4.png create mode 100644 graphics/event_objects/pics/people/prof_birch/5.png create mode 100644 graphics/event_objects/pics/people/prof_birch/6.png create mode 100644 graphics/event_objects/pics/people/prof_birch/7.png create mode 100644 graphics/event_objects/pics/people/prof_birch/8.png create mode 100644 graphics/event_objects/pics/people/psychic_m/0.png create mode 100644 graphics/event_objects/pics/people/psychic_m/1.png create mode 100644 graphics/event_objects/pics/people/psychic_m/2.png create mode 100644 graphics/event_objects/pics/people/psychic_m/3.png create mode 100644 graphics/event_objects/pics/people/psychic_m/4.png create mode 100644 graphics/event_objects/pics/people/psychic_m/5.png create mode 100644 graphics/event_objects/pics/people/psychic_m/6.png create mode 100644 graphics/event_objects/pics/people/psychic_m/7.png create mode 100644 graphics/event_objects/pics/people/psychic_m/8.png create mode 100644 graphics/event_objects/pics/people/quinty_plump/0.png create mode 100644 graphics/event_objects/pics/people/quinty_plump/1.png create mode 100644 graphics/event_objects/pics/people/quinty_plump/2.png create mode 100644 graphics/event_objects/pics/people/quinty_plump/3.png create mode 100644 graphics/event_objects/pics/people/quinty_plump/4.png create mode 100644 graphics/event_objects/pics/people/quinty_plump/5.png create mode 100644 graphics/event_objects/pics/people/quinty_plump/6.png create mode 100644 graphics/event_objects/pics/people/red/0.png create mode 100644 graphics/event_objects/pics/people/red/1.png create mode 100644 graphics/event_objects/pics/people/red/2.png create mode 100644 graphics/event_objects/pics/people/red/3.png create mode 100644 graphics/event_objects/pics/people/red/4.png create mode 100644 graphics/event_objects/pics/people/red/5.png create mode 100644 graphics/event_objects/pics/people/red/6.png create mode 100644 graphics/event_objects/pics/people/red/7.png create mode 100644 graphics/event_objects/pics/people/red/8.png create mode 100644 graphics/event_objects/pics/people/reporter_f/0.png create mode 100644 graphics/event_objects/pics/people/reporter_f/1.png create mode 100644 graphics/event_objects/pics/people/reporter_f/2.png create mode 100644 graphics/event_objects/pics/people/reporter_f/3.png create mode 100644 graphics/event_objects/pics/people/reporter_f/4.png create mode 100644 graphics/event_objects/pics/people/reporter_f/5.png create mode 100644 graphics/event_objects/pics/people/reporter_f/6.png create mode 100644 graphics/event_objects/pics/people/reporter_f/7.png create mode 100644 graphics/event_objects/pics/people/reporter_f/8.png create mode 100644 graphics/event_objects/pics/people/reporter_m/0.png create mode 100644 graphics/event_objects/pics/people/reporter_m/1.png create mode 100644 graphics/event_objects/pics/people/reporter_m/2.png create mode 100644 graphics/event_objects/pics/people/reporter_m/3.png create mode 100644 graphics/event_objects/pics/people/reporter_m/4.png create mode 100644 graphics/event_objects/pics/people/reporter_m/5.png create mode 100644 graphics/event_objects/pics/people/reporter_m/6.png create mode 100644 graphics/event_objects/pics/people/reporter_m/7.png create mode 100644 graphics/event_objects/pics/people/reporter_m/8.png create mode 100644 graphics/event_objects/pics/people/rooftop_sale_woman/0.png create mode 100644 graphics/event_objects/pics/people/rooftop_sale_woman/1.png create mode 100644 graphics/event_objects/pics/people/rooftop_sale_woman/2.png create mode 100644 graphics/event_objects/pics/people/rooftop_sale_woman/3.png create mode 100644 graphics/event_objects/pics/people/rooftop_sale_woman/4.png create mode 100644 graphics/event_objects/pics/people/rooftop_sale_woman/5.png create mode 100644 graphics/event_objects/pics/people/rooftop_sale_woman/6.png create mode 100644 graphics/event_objects/pics/people/rooftop_sale_woman/7.png create mode 100644 graphics/event_objects/pics/people/rooftop_sale_woman/8.png create mode 100644 graphics/event_objects/pics/people/roxanne/0.png create mode 100644 graphics/event_objects/pics/people/roxanne/1.png create mode 100644 graphics/event_objects/pics/people/roxanne/2.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_brendan/00.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_brendan/01.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_brendan/02.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_brendan/03.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_brendan/04.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_brendan/05.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_brendan/06.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_brendan/07.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_brendan/08.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_brendan/09.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_brendan/10.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_brendan/11.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_brendan/12.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_brendan/13.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_brendan/14.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_brendan/15.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_brendan/16.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_brendan/17.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_little_boy/0.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_little_boy/1.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_little_boy/2.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_little_boy/3.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_little_boy/4.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_little_boy/5.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_little_boy/6.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_little_boy/7.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_little_boy/8.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_may/00.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_may/01.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_may/02.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_may/03.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_may/04.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_may/05.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_may/06.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_may/07.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_may/08.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_may/09.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_may/10.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_may/11.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_may/12.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_may/13.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_may/14.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_may/15.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_may/16.png create mode 100644 graphics/event_objects/pics/people/ruby_sapphire_may/17.png create mode 100644 graphics/event_objects/pics/people/running_triathlete_f/0.png create mode 100644 graphics/event_objects/pics/people/running_triathlete_f/1.png create mode 100644 graphics/event_objects/pics/people/running_triathlete_f/2.png create mode 100644 graphics/event_objects/pics/people/running_triathlete_f/3.png create mode 100644 graphics/event_objects/pics/people/running_triathlete_f/4.png create mode 100644 graphics/event_objects/pics/people/running_triathlete_f/5.png create mode 100644 graphics/event_objects/pics/people/running_triathlete_f/6.png create mode 100644 graphics/event_objects/pics/people/running_triathlete_f/7.png create mode 100644 graphics/event_objects/pics/people/running_triathlete_f/8.png create mode 100644 graphics/event_objects/pics/people/running_triathlete_m/0.png create mode 100644 graphics/event_objects/pics/people/running_triathlete_m/1.png create mode 100644 graphics/event_objects/pics/people/running_triathlete_m/2.png create mode 100644 graphics/event_objects/pics/people/running_triathlete_m/3.png create mode 100644 graphics/event_objects/pics/people/running_triathlete_m/4.png create mode 100644 graphics/event_objects/pics/people/running_triathlete_m/5.png create mode 100644 graphics/event_objects/pics/people/running_triathlete_m/6.png create mode 100644 graphics/event_objects/pics/people/running_triathlete_m/7.png create mode 100644 graphics/event_objects/pics/people/running_triathlete_m/8.png create mode 100644 graphics/event_objects/pics/people/sailor/0.png create mode 100644 graphics/event_objects/pics/people/sailor/1.png create mode 100644 graphics/event_objects/pics/people/sailor/2.png create mode 100644 graphics/event_objects/pics/people/sailor/3.png create mode 100644 graphics/event_objects/pics/people/sailor/4.png create mode 100644 graphics/event_objects/pics/people/sailor/5.png create mode 100644 graphics/event_objects/pics/people/sailor/6.png create mode 100644 graphics/event_objects/pics/people/sailor/7.png create mode 100644 graphics/event_objects/pics/people/sailor/8.png create mode 100644 graphics/event_objects/pics/people/school_kid_m/0.png create mode 100644 graphics/event_objects/pics/people/school_kid_m/1.png create mode 100644 graphics/event_objects/pics/people/school_kid_m/2.png create mode 100644 graphics/event_objects/pics/people/school_kid_m/3.png create mode 100644 graphics/event_objects/pics/people/school_kid_m/4.png create mode 100644 graphics/event_objects/pics/people/school_kid_m/5.png create mode 100644 graphics/event_objects/pics/people/school_kid_m/6.png create mode 100644 graphics/event_objects/pics/people/school_kid_m/7.png create mode 100644 graphics/event_objects/pics/people/school_kid_m/8.png create mode 100644 graphics/event_objects/pics/people/scientist_1/0.png create mode 100644 graphics/event_objects/pics/people/scientist_1/1.png create mode 100644 graphics/event_objects/pics/people/scientist_1/2.png create mode 100644 graphics/event_objects/pics/people/scientist_1/3.png create mode 100644 graphics/event_objects/pics/people/scientist_1/4.png create mode 100644 graphics/event_objects/pics/people/scientist_1/5.png create mode 100644 graphics/event_objects/pics/people/scientist_1/6.png create mode 100644 graphics/event_objects/pics/people/scientist_1/7.png create mode 100644 graphics/event_objects/pics/people/scientist_1/8.png create mode 100644 graphics/event_objects/pics/people/scientist_2/0.png create mode 100644 graphics/event_objects/pics/people/scientist_2/1.png create mode 100644 graphics/event_objects/pics/people/scientist_2/2.png create mode 100644 graphics/event_objects/pics/people/scientist_2/3.png create mode 100644 graphics/event_objects/pics/people/scientist_2/4.png create mode 100644 graphics/event_objects/pics/people/scientist_2/5.png create mode 100644 graphics/event_objects/pics/people/scientist_2/6.png create mode 100644 graphics/event_objects/pics/people/scientist_2/7.png create mode 100644 graphics/event_objects/pics/people/scientist_2/8.png create mode 100644 graphics/event_objects/pics/people/scott/0.png create mode 100644 graphics/event_objects/pics/people/scott/1.png create mode 100644 graphics/event_objects/pics/people/scott/2.png create mode 100644 graphics/event_objects/pics/people/scott/3.png create mode 100644 graphics/event_objects/pics/people/scott/4.png create mode 100644 graphics/event_objects/pics/people/scott/5.png create mode 100644 graphics/event_objects/pics/people/scott/6.png create mode 100644 graphics/event_objects/pics/people/scott/7.png create mode 100644 graphics/event_objects/pics/people/scott/8.png create mode 100644 graphics/event_objects/pics/people/sidney/0.png create mode 100644 graphics/event_objects/pics/people/sidney/1.png create mode 100644 graphics/event_objects/pics/people/sidney/2.png create mode 100644 graphics/event_objects/pics/people/spenser/0.png create mode 100644 graphics/event_objects/pics/people/spenser/1.png create mode 100644 graphics/event_objects/pics/people/spenser/2.png create mode 100644 graphics/event_objects/pics/people/spenser/3.png create mode 100644 graphics/event_objects/pics/people/spenser/4.png create mode 100644 graphics/event_objects/pics/people/spenser/5.png create mode 100644 graphics/event_objects/pics/people/spenser/6.png create mode 100644 graphics/event_objects/pics/people/spenser/7.png create mode 100644 graphics/event_objects/pics/people/spenser/8.png create mode 100644 graphics/event_objects/pics/people/steven/0.png create mode 100644 graphics/event_objects/pics/people/steven/1.png create mode 100644 graphics/event_objects/pics/people/steven/2.png create mode 100644 graphics/event_objects/pics/people/steven/3.png create mode 100644 graphics/event_objects/pics/people/steven/4.png create mode 100644 graphics/event_objects/pics/people/steven/5.png create mode 100644 graphics/event_objects/pics/people/steven/6.png create mode 100644 graphics/event_objects/pics/people/steven/7.png create mode 100644 graphics/event_objects/pics/people/steven/8.png create mode 100644 graphics/event_objects/pics/people/swimmer_f/0.png create mode 100644 graphics/event_objects/pics/people/swimmer_f/1.png create mode 100644 graphics/event_objects/pics/people/swimmer_f/2.png create mode 100644 graphics/event_objects/pics/people/swimmer_f/3.png create mode 100644 graphics/event_objects/pics/people/swimmer_f/4.png create mode 100644 graphics/event_objects/pics/people/swimmer_f/5.png create mode 100644 graphics/event_objects/pics/people/swimmer_f/6.png create mode 100644 graphics/event_objects/pics/people/swimmer_f/7.png create mode 100644 graphics/event_objects/pics/people/swimmer_f/8.png create mode 100644 graphics/event_objects/pics/people/swimmer_m/0.png create mode 100644 graphics/event_objects/pics/people/swimmer_m/1.png create mode 100644 graphics/event_objects/pics/people/swimmer_m/2.png create mode 100644 graphics/event_objects/pics/people/swimmer_m/3.png create mode 100644 graphics/event_objects/pics/people/swimmer_m/4.png create mode 100644 graphics/event_objects/pics/people/swimmer_m/5.png create mode 100644 graphics/event_objects/pics/people/swimmer_m/6.png create mode 100644 graphics/event_objects/pics/people/swimmer_m/7.png create mode 100644 graphics/event_objects/pics/people/swimmer_m/8.png create mode 100644 graphics/event_objects/pics/people/tate/0.png create mode 100644 graphics/event_objects/pics/people/tate/1.png create mode 100644 graphics/event_objects/pics/people/tate/2.png create mode 100644 graphics/event_objects/pics/people/teala/0.png create mode 100644 graphics/event_objects/pics/people/teala/1.png create mode 100644 graphics/event_objects/pics/people/teala/2.png create mode 100644 graphics/event_objects/pics/people/teala/3.png create mode 100644 graphics/event_objects/pics/people/teala/4.png create mode 100644 graphics/event_objects/pics/people/teala/5.png create mode 100644 graphics/event_objects/pics/people/teala/6.png create mode 100644 graphics/event_objects/pics/people/teala/7.png create mode 100644 graphics/event_objects/pics/people/teala/8.png create mode 100644 graphics/event_objects/pics/people/tuber_f/0.png create mode 100644 graphics/event_objects/pics/people/tuber_f/1.png create mode 100644 graphics/event_objects/pics/people/tuber_f/2.png create mode 100644 graphics/event_objects/pics/people/tuber_f/3.png create mode 100644 graphics/event_objects/pics/people/tuber_f/4.png create mode 100644 graphics/event_objects/pics/people/tuber_f/5.png create mode 100644 graphics/event_objects/pics/people/tuber_f/6.png create mode 100644 graphics/event_objects/pics/people/tuber_f/7.png create mode 100644 graphics/event_objects/pics/people/tuber_f/8.png create mode 100644 graphics/event_objects/pics/people/tuber_m/0.png create mode 100644 graphics/event_objects/pics/people/tuber_m/1.png create mode 100644 graphics/event_objects/pics/people/tuber_m/2.png create mode 100644 graphics/event_objects/pics/people/tuber_m/3.png create mode 100644 graphics/event_objects/pics/people/tuber_m/4.png create mode 100644 graphics/event_objects/pics/people/tuber_m/5.png create mode 100644 graphics/event_objects/pics/people/tuber_m/6.png create mode 100644 graphics/event_objects/pics/people/tuber_m/7.png create mode 100644 graphics/event_objects/pics/people/tuber_m/8.png create mode 100644 graphics/event_objects/pics/people/tuber_m_swimming/0.png create mode 100644 graphics/event_objects/pics/people/tuber_m_swimming/1.png create mode 100644 graphics/event_objects/pics/people/tuber_m_swimming/2.png create mode 100644 graphics/event_objects/pics/people/tuber_m_swimming/3.png create mode 100644 graphics/event_objects/pics/people/tuber_m_swimming/4.png create mode 100644 graphics/event_objects/pics/people/tuber_m_swimming/5.png create mode 100644 graphics/event_objects/pics/people/tuber_m_swimming/6.png create mode 100644 graphics/event_objects/pics/people/tuber_m_swimming/7.png create mode 100644 graphics/event_objects/pics/people/tuber_m_swimming/8.png create mode 100644 graphics/event_objects/pics/people/tucker/0.png create mode 100644 graphics/event_objects/pics/people/tucker/1.png create mode 100644 graphics/event_objects/pics/people/tucker/2.png create mode 100644 graphics/event_objects/pics/people/tucker/3.png create mode 100644 graphics/event_objects/pics/people/tucker/4.png create mode 100644 graphics/event_objects/pics/people/tucker/5.png create mode 100644 graphics/event_objects/pics/people/tucker/6.png create mode 100644 graphics/event_objects/pics/people/tucker/7.png create mode 100644 graphics/event_objects/pics/people/tucker/8.png create mode 100644 graphics/event_objects/pics/people/union_room_attendant/0.png create mode 100644 graphics/event_objects/pics/people/union_room_attendant/1.png create mode 100644 graphics/event_objects/pics/people/union_room_attendant/2.png create mode 100644 graphics/event_objects/pics/people/unused_woman/0.png create mode 100644 graphics/event_objects/pics/people/unused_woman/1.png create mode 100644 graphics/event_objects/pics/people/unused_woman/2.png create mode 100644 graphics/event_objects/pics/people/unused_woman/3.png create mode 100644 graphics/event_objects/pics/people/unused_woman/4.png create mode 100644 graphics/event_objects/pics/people/unused_woman/5.png create mode 100644 graphics/event_objects/pics/people/unused_woman/6.png create mode 100644 graphics/event_objects/pics/people/unused_woman/7.png create mode 100644 graphics/event_objects/pics/people/unused_woman/8.png create mode 100644 graphics/event_objects/pics/people/wallace/0.png create mode 100644 graphics/event_objects/pics/people/wallace/1.png create mode 100644 graphics/event_objects/pics/people/wallace/2.png create mode 100644 graphics/event_objects/pics/people/wallace/3.png create mode 100644 graphics/event_objects/pics/people/wallace/4.png create mode 100644 graphics/event_objects/pics/people/wallace/5.png create mode 100644 graphics/event_objects/pics/people/wallace/6.png create mode 100644 graphics/event_objects/pics/people/wallace/7.png create mode 100644 graphics/event_objects/pics/people/wallace/8.png create mode 100644 graphics/event_objects/pics/people/wally/0.png create mode 100644 graphics/event_objects/pics/people/wally/1.png create mode 100644 graphics/event_objects/pics/people/wally/2.png create mode 100644 graphics/event_objects/pics/people/wally/3.png create mode 100644 graphics/event_objects/pics/people/wally/4.png create mode 100644 graphics/event_objects/pics/people/wally/5.png create mode 100644 graphics/event_objects/pics/people/wally/6.png create mode 100644 graphics/event_objects/pics/people/wally/7.png create mode 100644 graphics/event_objects/pics/people/wally/8.png create mode 100644 graphics/event_objects/pics/people/wattson/0.png create mode 100644 graphics/event_objects/pics/people/wattson/1.png create mode 100644 graphics/event_objects/pics/people/wattson/2.png create mode 100644 graphics/event_objects/pics/people/winona/0.png create mode 100644 graphics/event_objects/pics/people/winona/1.png create mode 100644 graphics/event_objects/pics/people/winona/2.png create mode 100644 graphics/event_objects/pics/people/woman_1/0.png create mode 100644 graphics/event_objects/pics/people/woman_1/1.png create mode 100644 graphics/event_objects/pics/people/woman_1/2.png create mode 100644 graphics/event_objects/pics/people/woman_1/3.png create mode 100644 graphics/event_objects/pics/people/woman_1/4.png create mode 100644 graphics/event_objects/pics/people/woman_1/5.png create mode 100644 graphics/event_objects/pics/people/woman_1/6.png create mode 100644 graphics/event_objects/pics/people/woman_1/7.png create mode 100644 graphics/event_objects/pics/people/woman_1/8.png create mode 100644 graphics/event_objects/pics/people/woman_2/0.png create mode 100644 graphics/event_objects/pics/people/woman_2/1.png create mode 100644 graphics/event_objects/pics/people/woman_2/2.png create mode 100644 graphics/event_objects/pics/people/woman_2/3.png create mode 100644 graphics/event_objects/pics/people/woman_2/4.png create mode 100644 graphics/event_objects/pics/people/woman_2/5.png create mode 100644 graphics/event_objects/pics/people/woman_2/6.png create mode 100644 graphics/event_objects/pics/people/woman_2/7.png create mode 100644 graphics/event_objects/pics/people/woman_2/8.png create mode 100644 graphics/event_objects/pics/people/woman_3/0.png create mode 100644 graphics/event_objects/pics/people/woman_3/1.png create mode 100644 graphics/event_objects/pics/people/woman_3/2.png create mode 100644 graphics/event_objects/pics/people/woman_3/3.png create mode 100644 graphics/event_objects/pics/people/woman_3/4.png create mode 100644 graphics/event_objects/pics/people/woman_3/5.png create mode 100644 graphics/event_objects/pics/people/woman_3/6.png create mode 100644 graphics/event_objects/pics/people/woman_3/7.png create mode 100644 graphics/event_objects/pics/people/woman_3/8.png create mode 100644 graphics/event_objects/pics/people/woman_4/0.png create mode 100644 graphics/event_objects/pics/people/woman_4/1.png create mode 100644 graphics/event_objects/pics/people/woman_4/2.png create mode 100644 graphics/event_objects/pics/people/woman_4/3.png create mode 100644 graphics/event_objects/pics/people/woman_4/4.png create mode 100644 graphics/event_objects/pics/people/woman_4/5.png create mode 100644 graphics/event_objects/pics/people/woman_4/6.png create mode 100644 graphics/event_objects/pics/people/woman_4/7.png create mode 100644 graphics/event_objects/pics/people/woman_4/8.png create mode 100644 graphics/event_objects/pics/people/woman_5/0.png create mode 100644 graphics/event_objects/pics/people/woman_5/1.png create mode 100644 graphics/event_objects/pics/people/woman_5/2.png create mode 100644 graphics/event_objects/pics/people/woman_5/3.png create mode 100644 graphics/event_objects/pics/people/woman_5/4.png create mode 100644 graphics/event_objects/pics/people/woman_5/5.png create mode 100644 graphics/event_objects/pics/people/woman_5/6.png create mode 100644 graphics/event_objects/pics/people/woman_5/7.png create mode 100644 graphics/event_objects/pics/people/woman_5/8.png create mode 100644 graphics/event_objects/pics/people/woman_6/0.png create mode 100644 graphics/event_objects/pics/people/woman_6/1.png create mode 100644 graphics/event_objects/pics/people/woman_6/2.png create mode 100644 graphics/event_objects/pics/people/woman_6/3.png create mode 100644 graphics/event_objects/pics/people/woman_6/4.png create mode 100644 graphics/event_objects/pics/people/woman_6/5.png create mode 100644 graphics/event_objects/pics/people/woman_6/6.png create mode 100644 graphics/event_objects/pics/people/woman_6/7.png create mode 100644 graphics/event_objects/pics/people/woman_6/8.png create mode 100644 graphics/event_objects/pics/people/woman_7/0.png create mode 100644 graphics/event_objects/pics/people/woman_7/1.png create mode 100644 graphics/event_objects/pics/people/woman_7/2.png create mode 100644 graphics/event_objects/pics/people/woman_7/3.png create mode 100644 graphics/event_objects/pics/people/woman_7/4.png create mode 100644 graphics/event_objects/pics/people/woman_7/5.png create mode 100644 graphics/event_objects/pics/people/woman_7/6.png create mode 100644 graphics/event_objects/pics/people/woman_7/7.png create mode 100644 graphics/event_objects/pics/people/woman_7/8.png create mode 100644 graphics/event_objects/pics/people/youngster/0.png create mode 100644 graphics/event_objects/pics/people/youngster/1.png create mode 100644 graphics/event_objects/pics/people/youngster/2.png create mode 100644 graphics/event_objects/pics/people/youngster/3.png create mode 100644 graphics/event_objects/pics/people/youngster/4.png create mode 100644 graphics/event_objects/pics/people/youngster/5.png create mode 100644 graphics/event_objects/pics/people/youngster/6.png create mode 100644 graphics/event_objects/pics/people/youngster/7.png create mode 100644 graphics/event_objects/pics/people/youngster/8.png create mode 100644 graphics/event_objects/pics/pokemon/azumarill/0.png create mode 100644 graphics/event_objects/pics/pokemon/azumarill/1.png create mode 100644 graphics/event_objects/pics/pokemon/azumarill/2.png create mode 100644 graphics/event_objects/pics/pokemon/azurill/0.png create mode 100644 graphics/event_objects/pics/pokemon/azurill/1.png create mode 100644 graphics/event_objects/pics/pokemon/azurill/2.png create mode 100644 graphics/event_objects/pics/pokemon/deoxys/0.png create mode 100644 graphics/event_objects/pics/pokemon/deoxys/1.png create mode 100644 graphics/event_objects/pics/pokemon/dusclops/0.png create mode 100644 graphics/event_objects/pics/pokemon/dusclops/1.png create mode 100644 graphics/event_objects/pics/pokemon/dusclops/2.png create mode 100644 graphics/event_objects/pics/pokemon/dusclops/3.png create mode 100644 graphics/event_objects/pics/pokemon/dusclops/4.png create mode 100644 graphics/event_objects/pics/pokemon/dusclops/5.png create mode 100644 graphics/event_objects/pics/pokemon/dusclops/6.png create mode 100644 graphics/event_objects/pics/pokemon/dusclops/7.png create mode 100644 graphics/event_objects/pics/pokemon/dusclops/8.png create mode 100644 graphics/event_objects/pics/pokemon/enemy_zigzagoon/0.png create mode 100644 graphics/event_objects/pics/pokemon/enemy_zigzagoon/1.png create mode 100644 graphics/event_objects/pics/pokemon/enemy_zigzagoon/2.png create mode 100644 graphics/event_objects/pics/pokemon/enemy_zigzagoon/3.png create mode 100644 graphics/event_objects/pics/pokemon/enemy_zigzagoon/4.png create mode 100644 graphics/event_objects/pics/pokemon/enemy_zigzagoon/5.png create mode 100644 graphics/event_objects/pics/pokemon/enemy_zigzagoon/6.png create mode 100644 graphics/event_objects/pics/pokemon/enemy_zigzagoon/7.png create mode 100644 graphics/event_objects/pics/pokemon/enemy_zigzagoon/8.png create mode 100644 graphics/event_objects/pics/pokemon/groudon_front/0.png create mode 100644 graphics/event_objects/pics/pokemon/groudon_front/1.png create mode 100644 graphics/event_objects/pics/pokemon/groudon_side/0.png create mode 100644 graphics/event_objects/pics/pokemon/groudon_side/1.png create mode 100644 graphics/event_objects/pics/pokemon/ho_oh/0.png create mode 100644 graphics/event_objects/pics/pokemon/ho_oh/1.png create mode 100644 graphics/event_objects/pics/pokemon/kecleon/0.png create mode 100644 graphics/event_objects/pics/pokemon/kecleon/1.png create mode 100644 graphics/event_objects/pics/pokemon/kecleon/2.png create mode 100644 graphics/event_objects/pics/pokemon/kirlia/0.png create mode 100644 graphics/event_objects/pics/pokemon/kirlia/1.png create mode 100644 graphics/event_objects/pics/pokemon/kirlia/2.png create mode 100644 graphics/event_objects/pics/pokemon/kirlia/3.png create mode 100644 graphics/event_objects/pics/pokemon/kirlia/4.png create mode 100644 graphics/event_objects/pics/pokemon/kirlia/5.png create mode 100644 graphics/event_objects/pics/pokemon/kirlia/6.png create mode 100644 graphics/event_objects/pics/pokemon/kirlia/7.png create mode 100644 graphics/event_objects/pics/pokemon/kirlia/8.png create mode 100644 graphics/event_objects/pics/pokemon/kyogre_front/0.png create mode 100644 graphics/event_objects/pics/pokemon/kyogre_front/1.png create mode 100644 graphics/event_objects/pics/pokemon/kyogre_side/0.png create mode 100644 graphics/event_objects/pics/pokemon/kyogre_side/1.png create mode 100644 graphics/event_objects/pics/pokemon/latias_latios/0.png create mode 100644 graphics/event_objects/pics/pokemon/latias_latios/1.png create mode 100644 graphics/event_objects/pics/pokemon/latias_latios/2.png create mode 100644 graphics/event_objects/pics/pokemon/lugia/0.png create mode 100644 graphics/event_objects/pics/pokemon/lugia/1.png create mode 100644 graphics/event_objects/pics/pokemon/mew/0.png create mode 100644 graphics/event_objects/pics/pokemon/mew/1.png create mode 100644 graphics/event_objects/pics/pokemon/mew/2.png create mode 100644 graphics/event_objects/pics/pokemon/mew/3.png create mode 100644 graphics/event_objects/pics/pokemon/mew/4.png create mode 100644 graphics/event_objects/pics/pokemon/mew/5.png create mode 100644 graphics/event_objects/pics/pokemon/mew/6.png create mode 100644 graphics/event_objects/pics/pokemon/mew/7.png create mode 100644 graphics/event_objects/pics/pokemon/mew/8.png create mode 100644 graphics/event_objects/pics/pokemon/pikachu/0.png create mode 100644 graphics/event_objects/pics/pokemon/pikachu/1.png create mode 100644 graphics/event_objects/pics/pokemon/pikachu/2.png create mode 100644 graphics/event_objects/pics/pokemon/poochyena/0.png create mode 100644 graphics/event_objects/pics/pokemon/poochyena/1.png create mode 100644 graphics/event_objects/pics/pokemon/poochyena/2.png create mode 100644 graphics/event_objects/pics/pokemon/poochyena/3.png create mode 100644 graphics/event_objects/pics/pokemon/poochyena/4.png create mode 100644 graphics/event_objects/pics/pokemon/poochyena/5.png create mode 100644 graphics/event_objects/pics/pokemon/poochyena/6.png create mode 100644 graphics/event_objects/pics/pokemon/poochyena/7.png create mode 100644 graphics/event_objects/pics/pokemon/poochyena/8.png create mode 100644 graphics/event_objects/pics/pokemon/rayquaza/0.png create mode 100644 graphics/event_objects/pics/pokemon/rayquaza/1.png create mode 100644 graphics/event_objects/pics/pokemon/rayquaza/2.png create mode 100644 graphics/event_objects/pics/pokemon/rayquaza/3.png create mode 100644 graphics/event_objects/pics/pokemon/rayquaza/4.png create mode 100644 graphics/event_objects/pics/pokemon/rayquaza_still.png create mode 100644 graphics/event_objects/pics/pokemon/regi.png create mode 100644 graphics/event_objects/pics/pokemon/skitty/0.png create mode 100644 graphics/event_objects/pics/pokemon/skitty/1.png create mode 100644 graphics/event_objects/pics/pokemon/skitty/2.png create mode 100644 graphics/event_objects/pics/pokemon/sudowoodo/0.png create mode 100644 graphics/event_objects/pics/pokemon/sudowoodo/1.png create mode 100644 graphics/event_objects/pics/pokemon/sudowoodo/2.png create mode 100644 graphics/event_objects/pics/pokemon/vigoroth_carrying_box/0.png create mode 100644 graphics/event_objects/pics/pokemon/vigoroth_carrying_box/1.png create mode 100644 graphics/event_objects/pics/pokemon/vigoroth_carrying_box/2.png create mode 100644 graphics/event_objects/pics/pokemon/vigoroth_facing_away/0.png create mode 100644 graphics/event_objects/pics/pokemon/vigoroth_facing_away/1.png create mode 100644 graphics/event_objects/pics/pokemon/wingull/0.png create mode 100644 graphics/event_objects/pics/pokemon/wingull/1.png create mode 100644 graphics/event_objects/pics/pokemon/wingull/2.png create mode 100644 graphics/event_objects/pics/pokemon/wingull/3.png create mode 100644 graphics/event_objects/pics/pokemon/wingull/4.png create mode 100644 graphics/event_objects/pics/pokemon/wingull/5.png create mode 100644 graphics/event_objects/pics/pokemon/zigzagoon/0.png create mode 100644 graphics/event_objects/pics/pokemon/zigzagoon/1.png create mode 100644 graphics/event_objects/pics/pokemon/zigzagoon/2.png delete mode 100644 graphics/map_objects/palettes/field_effect_object_palette_00.pal delete mode 100644 graphics/map_objects/palettes/field_effect_object_palette_01.pal delete mode 100644 graphics/map_objects/palettes/field_effect_object_palette_02.pal delete mode 100644 graphics/map_objects/palettes/field_effect_object_palette_03.pal delete mode 100644 graphics/map_objects/palettes/field_effect_object_palette_04.pal delete mode 100644 graphics/map_objects/palettes/field_effect_object_palette_05.pal delete mode 100644 graphics/map_objects/palettes/field_effect_object_palette_06.pal delete mode 100644 graphics/map_objects/palettes/field_effect_object_palette_07.pal delete mode 100644 graphics/map_objects/palettes/field_effect_object_palette_08.pal delete mode 100644 graphics/map_objects/palettes/field_effect_object_palette_10.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_00.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_01.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_02.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_03.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_04.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_05.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_06.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_07.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_08.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_09.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_10.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_11.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_12.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_13.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_14.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_15.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_16.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_17.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_18.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_19.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_20.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_21.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_22.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_23.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_24.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_25.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_26.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_27.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_28.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_29.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_30.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_31.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_32.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_33.pal delete mode 100644 graphics/map_objects/palettes/field_object_palette_34.pal delete mode 100644 graphics/map_objects/palettes/unused_palette.pal delete mode 100644 graphics/map_objects/pics/berry_trees/aguav/0.png delete mode 100644 graphics/map_objects/pics/berry_trees/aguav/1.png delete mode 100644 graphics/map_objects/pics/berry_trees/aguav/2.png delete mode 100644 graphics/map_objects/pics/berry_trees/aguav/3.png delete mode 100644 graphics/map_objects/pics/berry_trees/aguav/4.png delete mode 100644 graphics/map_objects/pics/berry_trees/aguav/5.png delete mode 100644 graphics/map_objects/pics/berry_trees/aspear/0.png delete mode 100644 graphics/map_objects/pics/berry_trees/aspear/1.png delete mode 100644 graphics/map_objects/pics/berry_trees/aspear/2.png delete mode 100644 graphics/map_objects/pics/berry_trees/aspear/3.png delete mode 100644 graphics/map_objects/pics/berry_trees/aspear/4.png delete mode 100644 graphics/map_objects/pics/berry_trees/aspear/5.png delete mode 100644 graphics/map_objects/pics/berry_trees/cheri/0.png delete mode 100644 graphics/map_objects/pics/berry_trees/cheri/1.png delete mode 100644 graphics/map_objects/pics/berry_trees/cheri/2.png delete mode 100644 graphics/map_objects/pics/berry_trees/cheri/3.png delete mode 100644 graphics/map_objects/pics/berry_trees/cheri/4.png delete mode 100644 graphics/map_objects/pics/berry_trees/cheri/5.png delete mode 100644 graphics/map_objects/pics/berry_trees/chesto/0.png delete mode 100644 graphics/map_objects/pics/berry_trees/chesto/1.png delete mode 100644 graphics/map_objects/pics/berry_trees/chesto/2.png delete mode 100644 graphics/map_objects/pics/berry_trees/chesto/3.png delete mode 100644 graphics/map_objects/pics/berry_trees/chesto/4.png delete mode 100644 graphics/map_objects/pics/berry_trees/chesto/5.png delete mode 100644 graphics/map_objects/pics/berry_trees/cornn/0.png delete mode 100644 graphics/map_objects/pics/berry_trees/cornn/1.png delete mode 100644 graphics/map_objects/pics/berry_trees/cornn/2.png delete mode 100644 graphics/map_objects/pics/berry_trees/cornn/3.png delete mode 100644 graphics/map_objects/pics/berry_trees/cornn/4.png delete mode 100644 graphics/map_objects/pics/berry_trees/cornn/5.png delete mode 100644 graphics/map_objects/pics/berry_trees/dirt_pile.png delete mode 100644 graphics/map_objects/pics/berry_trees/durin/0.png delete mode 100644 graphics/map_objects/pics/berry_trees/durin/1.png delete mode 100644 graphics/map_objects/pics/berry_trees/durin/2.png delete mode 100644 graphics/map_objects/pics/berry_trees/durin/3.png delete mode 100644 graphics/map_objects/pics/berry_trees/durin/4.png delete mode 100644 graphics/map_objects/pics/berry_trees/durin/5.png delete mode 100644 graphics/map_objects/pics/berry_trees/figy/0.png delete mode 100644 graphics/map_objects/pics/berry_trees/figy/1.png delete mode 100644 graphics/map_objects/pics/berry_trees/figy/2.png delete mode 100644 graphics/map_objects/pics/berry_trees/figy/3.png delete mode 100644 graphics/map_objects/pics/berry_trees/figy/4.png delete mode 100644 graphics/map_objects/pics/berry_trees/figy/5.png delete mode 100644 graphics/map_objects/pics/berry_trees/grepa/0.png delete mode 100644 graphics/map_objects/pics/berry_trees/grepa/1.png delete mode 100644 graphics/map_objects/pics/berry_trees/grepa/2.png delete mode 100644 graphics/map_objects/pics/berry_trees/grepa/3.png delete mode 100644 graphics/map_objects/pics/berry_trees/grepa/4.png delete mode 100644 graphics/map_objects/pics/berry_trees/grepa/5.png delete mode 100644 graphics/map_objects/pics/berry_trees/hondew/0.png delete mode 100644 graphics/map_objects/pics/berry_trees/hondew/1.png delete mode 100644 graphics/map_objects/pics/berry_trees/hondew/2.png delete mode 100644 graphics/map_objects/pics/berry_trees/hondew/3.png delete mode 100644 graphics/map_objects/pics/berry_trees/hondew/4.png delete mode 100644 graphics/map_objects/pics/berry_trees/hondew/5.png delete mode 100644 graphics/map_objects/pics/berry_trees/iapapa/0.png delete mode 100644 graphics/map_objects/pics/berry_trees/iapapa/1.png delete mode 100644 graphics/map_objects/pics/berry_trees/iapapa/2.png delete mode 100644 graphics/map_objects/pics/berry_trees/iapapa/3.png delete mode 100644 graphics/map_objects/pics/berry_trees/iapapa/4.png delete mode 100644 graphics/map_objects/pics/berry_trees/iapapa/5.png delete mode 100644 graphics/map_objects/pics/berry_trees/kelpsy/0.png delete mode 100644 graphics/map_objects/pics/berry_trees/kelpsy/1.png delete mode 100644 graphics/map_objects/pics/berry_trees/kelpsy/2.png delete mode 100644 graphics/map_objects/pics/berry_trees/kelpsy/3.png delete mode 100644 graphics/map_objects/pics/berry_trees/kelpsy/4.png delete mode 100644 graphics/map_objects/pics/berry_trees/kelpsy/5.png delete mode 100644 graphics/map_objects/pics/berry_trees/lansat/0.png delete mode 100644 graphics/map_objects/pics/berry_trees/lansat/1.png delete mode 100644 graphics/map_objects/pics/berry_trees/lansat/2.png delete mode 100644 graphics/map_objects/pics/berry_trees/lansat/3.png delete mode 100644 graphics/map_objects/pics/berry_trees/lansat/4.png delete mode 100644 graphics/map_objects/pics/berry_trees/lansat/5.png delete mode 100644 graphics/map_objects/pics/berry_trees/leppa/0.png delete mode 100644 graphics/map_objects/pics/berry_trees/leppa/1.png delete mode 100644 graphics/map_objects/pics/berry_trees/leppa/2.png delete mode 100644 graphics/map_objects/pics/berry_trees/leppa/3.png delete mode 100644 graphics/map_objects/pics/berry_trees/leppa/4.png delete mode 100644 graphics/map_objects/pics/berry_trees/leppa/5.png delete mode 100644 graphics/map_objects/pics/berry_trees/liechi/0.png delete mode 100644 graphics/map_objects/pics/berry_trees/liechi/1.png delete mode 100644 graphics/map_objects/pics/berry_trees/liechi/2.png delete mode 100644 graphics/map_objects/pics/berry_trees/liechi/3.png delete mode 100644 graphics/map_objects/pics/berry_trees/liechi/4.png delete mode 100644 graphics/map_objects/pics/berry_trees/liechi/5.png delete mode 100644 graphics/map_objects/pics/berry_trees/lum/0.png delete mode 100644 graphics/map_objects/pics/berry_trees/lum/1.png delete mode 100644 graphics/map_objects/pics/berry_trees/lum/2.png delete mode 100644 graphics/map_objects/pics/berry_trees/lum/3.png delete mode 100644 graphics/map_objects/pics/berry_trees/lum/4.png delete mode 100644 graphics/map_objects/pics/berry_trees/lum/5.png delete mode 100644 graphics/map_objects/pics/berry_trees/mago/0.png delete mode 100644 graphics/map_objects/pics/berry_trees/mago/1.png delete mode 100644 graphics/map_objects/pics/berry_trees/mago/2.png delete mode 100644 graphics/map_objects/pics/berry_trees/mago/3.png delete mode 100644 graphics/map_objects/pics/berry_trees/mago/4.png delete mode 100644 graphics/map_objects/pics/berry_trees/mago/5.png delete mode 100644 graphics/map_objects/pics/berry_trees/nomel/0.png delete mode 100644 graphics/map_objects/pics/berry_trees/nomel/1.png delete mode 100644 graphics/map_objects/pics/berry_trees/nomel/2.png delete mode 100644 graphics/map_objects/pics/berry_trees/nomel/3.png delete mode 100644 graphics/map_objects/pics/berry_trees/nomel/4.png delete mode 100644 graphics/map_objects/pics/berry_trees/nomel/5.png delete mode 100644 graphics/map_objects/pics/berry_trees/oran/0.png delete mode 100644 graphics/map_objects/pics/berry_trees/oran/1.png delete mode 100644 graphics/map_objects/pics/berry_trees/oran/2.png delete mode 100644 graphics/map_objects/pics/berry_trees/oran/3.png delete mode 100644 graphics/map_objects/pics/berry_trees/oran/4.png delete mode 100644 graphics/map_objects/pics/berry_trees/oran/5.png delete mode 100644 graphics/map_objects/pics/berry_trees/pamtre/0.png delete mode 100644 graphics/map_objects/pics/berry_trees/pamtre/1.png delete mode 100644 graphics/map_objects/pics/berry_trees/pamtre/2.png delete mode 100644 graphics/map_objects/pics/berry_trees/pamtre/3.png delete mode 100644 graphics/map_objects/pics/berry_trees/pamtre/4.png delete mode 100644 graphics/map_objects/pics/berry_trees/pamtre/5.png delete mode 100644 graphics/map_objects/pics/berry_trees/pecha/0.png delete mode 100644 graphics/map_objects/pics/berry_trees/pecha/1.png delete mode 100644 graphics/map_objects/pics/berry_trees/pecha/2.png delete mode 100644 graphics/map_objects/pics/berry_trees/pecha/3.png delete mode 100644 graphics/map_objects/pics/berry_trees/pecha/4.png delete mode 100644 graphics/map_objects/pics/berry_trees/pecha/5.png delete mode 100644 graphics/map_objects/pics/berry_trees/persim/0.png delete mode 100644 graphics/map_objects/pics/berry_trees/persim/1.png delete mode 100644 graphics/map_objects/pics/berry_trees/persim/2.png delete mode 100644 graphics/map_objects/pics/berry_trees/persim/3.png delete mode 100644 graphics/map_objects/pics/berry_trees/persim/4.png delete mode 100644 graphics/map_objects/pics/berry_trees/persim/5.png delete mode 100644 graphics/map_objects/pics/berry_trees/pomeg/0.png delete mode 100644 graphics/map_objects/pics/berry_trees/pomeg/1.png delete mode 100644 graphics/map_objects/pics/berry_trees/pomeg/2.png delete mode 100644 graphics/map_objects/pics/berry_trees/pomeg/3.png delete mode 100644 graphics/map_objects/pics/berry_trees/pomeg/4.png delete mode 100644 graphics/map_objects/pics/berry_trees/pomeg/5.png delete mode 100644 graphics/map_objects/pics/berry_trees/rabuta/0.png delete mode 100644 graphics/map_objects/pics/berry_trees/rabuta/1.png delete mode 100644 graphics/map_objects/pics/berry_trees/rabuta/2.png delete mode 100644 graphics/map_objects/pics/berry_trees/rabuta/3.png delete mode 100644 graphics/map_objects/pics/berry_trees/rabuta/4.png delete mode 100644 graphics/map_objects/pics/berry_trees/rabuta/5.png delete mode 100644 graphics/map_objects/pics/berry_trees/rawst/0.png delete mode 100644 graphics/map_objects/pics/berry_trees/rawst/1.png delete mode 100644 graphics/map_objects/pics/berry_trees/rawst/2.png delete mode 100644 graphics/map_objects/pics/berry_trees/rawst/3.png delete mode 100644 graphics/map_objects/pics/berry_trees/rawst/4.png delete mode 100644 graphics/map_objects/pics/berry_trees/rawst/5.png delete mode 100644 graphics/map_objects/pics/berry_trees/razz/0.png delete mode 100644 graphics/map_objects/pics/berry_trees/razz/1.png delete mode 100644 graphics/map_objects/pics/berry_trees/razz/2.png delete mode 100644 graphics/map_objects/pics/berry_trees/razz/3.png delete mode 100644 graphics/map_objects/pics/berry_trees/razz/4.png delete mode 100644 graphics/map_objects/pics/berry_trees/razz/5.png delete mode 100644 graphics/map_objects/pics/berry_trees/sitrus/0.png delete mode 100644 graphics/map_objects/pics/berry_trees/sitrus/1.png delete mode 100644 graphics/map_objects/pics/berry_trees/sitrus/2.png delete mode 100644 graphics/map_objects/pics/berry_trees/sitrus/3.png delete mode 100644 graphics/map_objects/pics/berry_trees/sitrus/4.png delete mode 100644 graphics/map_objects/pics/berry_trees/sitrus/5.png delete mode 100644 graphics/map_objects/pics/berry_trees/spelon/0.png delete mode 100644 graphics/map_objects/pics/berry_trees/spelon/1.png delete mode 100644 graphics/map_objects/pics/berry_trees/spelon/2.png delete mode 100644 graphics/map_objects/pics/berry_trees/spelon/3.png delete mode 100644 graphics/map_objects/pics/berry_trees/spelon/4.png delete mode 100644 graphics/map_objects/pics/berry_trees/spelon/5.png delete mode 100644 graphics/map_objects/pics/berry_trees/sprout/0.png delete mode 100644 graphics/map_objects/pics/berry_trees/sprout/1.png delete mode 100644 graphics/map_objects/pics/berry_trees/tamato/0.png delete mode 100644 graphics/map_objects/pics/berry_trees/tamato/1.png delete mode 100644 graphics/map_objects/pics/berry_trees/tamato/2.png delete mode 100644 graphics/map_objects/pics/berry_trees/tamato/3.png delete mode 100644 graphics/map_objects/pics/berry_trees/tamato/4.png delete mode 100644 graphics/map_objects/pics/berry_trees/tamato/5.png delete mode 100644 graphics/map_objects/pics/berry_trees/wepear/0.png delete mode 100644 graphics/map_objects/pics/berry_trees/wepear/1.png delete mode 100644 graphics/map_objects/pics/berry_trees/wepear/2.png delete mode 100644 graphics/map_objects/pics/berry_trees/wepear/3.png delete mode 100644 graphics/map_objects/pics/berry_trees/wepear/4.png delete mode 100644 graphics/map_objects/pics/berry_trees/wepear/5.png delete mode 100644 graphics/map_objects/pics/berry_trees/wiki/0.png delete mode 100644 graphics/map_objects/pics/berry_trees/wiki/1.png delete mode 100644 graphics/map_objects/pics/berry_trees/wiki/2.png delete mode 100644 graphics/map_objects/pics/berry_trees/wiki/3.png delete mode 100644 graphics/map_objects/pics/berry_trees/wiki/4.png delete mode 100644 graphics/map_objects/pics/berry_trees/wiki/5.png delete mode 100644 graphics/map_objects/pics/cushions/ball_cushion.png delete mode 100644 graphics/map_objects/pics/cushions/diamond_cushion.png delete mode 100644 graphics/map_objects/pics/cushions/fire_cushion.png delete mode 100644 graphics/map_objects/pics/cushions/grass_cushion.png delete mode 100644 graphics/map_objects/pics/cushions/kiss_cushion.png delete mode 100644 graphics/map_objects/pics/cushions/pika_cushion.png delete mode 100644 graphics/map_objects/pics/cushions/round_cushion.png delete mode 100644 graphics/map_objects/pics/cushions/spin_cushion.png delete mode 100644 graphics/map_objects/pics/cushions/water_cushion.png delete mode 100644 graphics/map_objects/pics/cushions/zigzag_cushion.png delete mode 100644 graphics/map_objects/pics/dolls/azurill_doll.png delete mode 100644 graphics/map_objects/pics/dolls/baltoy_doll.png delete mode 100644 graphics/map_objects/pics/dolls/big_blastoise_doll.png delete mode 100644 graphics/map_objects/pics/dolls/big_charizard_doll.png delete mode 100644 graphics/map_objects/pics/dolls/big_lapras_doll.png delete mode 100644 graphics/map_objects/pics/dolls/big_regice_doll.png delete mode 100644 graphics/map_objects/pics/dolls/big_regirock_doll.png delete mode 100644 graphics/map_objects/pics/dolls/big_registeel_doll.png delete mode 100644 graphics/map_objects/pics/dolls/big_rhydon_doll.png delete mode 100644 graphics/map_objects/pics/dolls/big_snorlax_doll.png delete mode 100644 graphics/map_objects/pics/dolls/big_venusaur_doll.png delete mode 100644 graphics/map_objects/pics/dolls/big_wailmer_doll.png delete mode 100644 graphics/map_objects/pics/dolls/chikorita_doll.png delete mode 100644 graphics/map_objects/pics/dolls/clefairy_doll.png delete mode 100644 graphics/map_objects/pics/dolls/cyndaquil_doll.png delete mode 100644 graphics/map_objects/pics/dolls/ditto_doll.png delete mode 100644 graphics/map_objects/pics/dolls/duskull_doll.png delete mode 100644 graphics/map_objects/pics/dolls/gulpin_doll.png delete mode 100644 graphics/map_objects/pics/dolls/jigglypuff_doll.png delete mode 100644 graphics/map_objects/pics/dolls/kecleon_doll.png delete mode 100644 graphics/map_objects/pics/dolls/lotad_doll.png delete mode 100644 graphics/map_objects/pics/dolls/marill_doll.png delete mode 100644 graphics/map_objects/pics/dolls/meowth_doll.png delete mode 100644 graphics/map_objects/pics/dolls/mudkip_doll.png delete mode 100644 graphics/map_objects/pics/dolls/pichu_doll.png delete mode 100644 graphics/map_objects/pics/dolls/pikachu_doll.png delete mode 100644 graphics/map_objects/pics/dolls/seedot_doll.png delete mode 100644 graphics/map_objects/pics/dolls/skitty_doll.png delete mode 100644 graphics/map_objects/pics/dolls/smoochum_doll.png delete mode 100644 graphics/map_objects/pics/dolls/swablu_doll.png delete mode 100644 graphics/map_objects/pics/dolls/togepi_doll.png delete mode 100644 graphics/map_objects/pics/dolls/torchic_doll.png delete mode 100644 graphics/map_objects/pics/dolls/totodile_doll.png delete mode 100644 graphics/map_objects/pics/dolls/treecko_doll.png delete mode 100644 graphics/map_objects/pics/dolls/unused_magnemite_doll.png delete mode 100644 graphics/map_objects/pics/dolls/unused_natu_doll.png delete mode 100644 graphics/map_objects/pics/dolls/unused_pikachu_doll.png delete mode 100644 graphics/map_objects/pics/dolls/unused_porygon2_doll.png delete mode 100644 graphics/map_objects/pics/dolls/unused_squirtle_doll.png delete mode 100644 graphics/map_objects/pics/dolls/unused_wooper_doll.png delete mode 100644 graphics/map_objects/pics/dolls/wynaut_doll.png delete mode 100644 graphics/map_objects/pics/effects/arrow/0.png delete mode 100644 graphics/map_objects/pics/effects/arrow/1.png delete mode 100644 graphics/map_objects/pics/effects/arrow/2.png delete mode 100644 graphics/map_objects/pics/effects/arrow/3.png delete mode 100644 graphics/map_objects/pics/effects/arrow/4.png delete mode 100644 graphics/map_objects/pics/effects/arrow/5.png delete mode 100644 graphics/map_objects/pics/effects/arrow/6.png delete mode 100644 graphics/map_objects/pics/effects/arrow/7.png delete mode 100644 graphics/map_objects/pics/effects/ash/0.png delete mode 100644 graphics/map_objects/pics/effects/ash/1.png delete mode 100644 graphics/map_objects/pics/effects/ash/2.png delete mode 100644 graphics/map_objects/pics/effects/ash/3.png delete mode 100644 graphics/map_objects/pics/effects/ash/4.png delete mode 100644 graphics/map_objects/pics/effects/berry_tree_growth_sparkle/0.png delete mode 100644 graphics/map_objects/pics/effects/berry_tree_growth_sparkle/1.png delete mode 100644 graphics/map_objects/pics/effects/berry_tree_growth_sparkle/2.png delete mode 100644 graphics/map_objects/pics/effects/berry_tree_growth_sparkle/3.png delete mode 100644 graphics/map_objects/pics/effects/berry_tree_growth_sparkle/4.png delete mode 100644 graphics/map_objects/pics/effects/berry_tree_growth_sparkle/5.png delete mode 100644 graphics/map_objects/pics/effects/bike_hop_big_splash/0.png delete mode 100644 graphics/map_objects/pics/effects/bike_hop_big_splash/1.png delete mode 100644 graphics/map_objects/pics/effects/bike_hop_big_splash/2.png delete mode 100644 graphics/map_objects/pics/effects/bike_hop_big_splash/3.png delete mode 100644 graphics/map_objects/pics/effects/bike_hop_small_splash/0.png delete mode 100644 graphics/map_objects/pics/effects/bike_hop_small_splash/1.png delete mode 100644 graphics/map_objects/pics/effects/bike_hop_small_splash/2.png delete mode 100644 graphics/map_objects/pics/effects/bike_hop_tall_grass/0.png delete mode 100644 graphics/map_objects/pics/effects/bike_hop_tall_grass/1.png delete mode 100644 graphics/map_objects/pics/effects/bike_hop_tall_grass/2.png delete mode 100644 graphics/map_objects/pics/effects/bike_hop_tall_grass/3.png delete mode 100644 graphics/map_objects/pics/effects/bike_tire_tracks/0.png delete mode 100644 graphics/map_objects/pics/effects/bike_tire_tracks/1.png delete mode 100644 graphics/map_objects/pics/effects/bike_tire_tracks/2.png delete mode 100644 graphics/map_objects/pics/effects/bike_tire_tracks/3.png delete mode 100644 graphics/map_objects/pics/effects/bird.png delete mode 100644 graphics/map_objects/pics/effects/bubbles/0.png delete mode 100644 graphics/map_objects/pics/effects/bubbles/1.png delete mode 100644 graphics/map_objects/pics/effects/bubbles/2.png delete mode 100644 graphics/map_objects/pics/effects/bubbles/3.png delete mode 100644 graphics/map_objects/pics/effects/bubbles/4.png delete mode 100644 graphics/map_objects/pics/effects/bubbles/5.png delete mode 100644 graphics/map_objects/pics/effects/bubbles/6.png delete mode 100644 graphics/map_objects/pics/effects/bubbles/7.png delete mode 100644 graphics/map_objects/pics/effects/deep_sand_footprints/0.png delete mode 100644 graphics/map_objects/pics/effects/deep_sand_footprints/1.png delete mode 100644 graphics/map_objects/pics/effects/ground_impact_dust/0.png delete mode 100644 graphics/map_objects/pics/effects/ground_impact_dust/1.png delete mode 100644 graphics/map_objects/pics/effects/ground_impact_dust/2.png delete mode 100644 graphics/map_objects/pics/effects/hot_springs_water.png delete mode 100644 graphics/map_objects/pics/effects/jump_out_of_ash/0.png delete mode 100644 graphics/map_objects/pics/effects/jump_out_of_ash/1.png delete mode 100644 graphics/map_objects/pics/effects/jump_out_of_ash/2.png delete mode 100644 graphics/map_objects/pics/effects/jump_out_of_ash/3.png delete mode 100644 graphics/map_objects/pics/effects/jump_out_of_ash/4.png delete mode 100644 graphics/map_objects/pics/effects/long_grass/0.png delete mode 100644 graphics/map_objects/pics/effects/long_grass/1.png delete mode 100644 graphics/map_objects/pics/effects/long_grass/2.png delete mode 100644 graphics/map_objects/pics/effects/long_grass/3.png delete mode 100644 graphics/map_objects/pics/effects/mountain_disguise/0.png delete mode 100644 graphics/map_objects/pics/effects/mountain_disguise/1.png delete mode 100644 graphics/map_objects/pics/effects/mountain_disguise/2.png delete mode 100644 graphics/map_objects/pics/effects/mountain_disguise/3.png delete mode 100644 graphics/map_objects/pics/effects/mountain_disguise/4.png delete mode 100644 graphics/map_objects/pics/effects/mountain_disguise/5.png delete mode 100644 graphics/map_objects/pics/effects/mountain_disguise/6.png delete mode 100644 graphics/map_objects/pics/effects/ripple/0.png delete mode 100644 graphics/map_objects/pics/effects/ripple/1.png delete mode 100644 graphics/map_objects/pics/effects/ripple/2.png delete mode 100644 graphics/map_objects/pics/effects/ripple/3.png delete mode 100644 graphics/map_objects/pics/effects/ripple/4.png delete mode 100644 graphics/map_objects/pics/effects/sand_disguise_placeholder/0.png delete mode 100644 graphics/map_objects/pics/effects/sand_disguise_placeholder/1.png delete mode 100644 graphics/map_objects/pics/effects/sand_disguise_placeholder/2.png delete mode 100644 graphics/map_objects/pics/effects/sand_disguise_placeholder/3.png delete mode 100644 graphics/map_objects/pics/effects/sand_disguise_placeholder/4.png delete mode 100644 graphics/map_objects/pics/effects/sand_disguise_placeholder/5.png delete mode 100644 graphics/map_objects/pics/effects/sand_disguise_placeholder/6.png delete mode 100644 graphics/map_objects/pics/effects/sand_footprints/0.png delete mode 100644 graphics/map_objects/pics/effects/sand_footprints/1.png delete mode 100644 graphics/map_objects/pics/effects/shadow_extra_large.png delete mode 100644 graphics/map_objects/pics/effects/shadow_large.png delete mode 100644 graphics/map_objects/pics/effects/shadow_medium.png delete mode 100644 graphics/map_objects/pics/effects/shadow_small.png delete mode 100644 graphics/map_objects/pics/effects/short_grass/0.png delete mode 100644 graphics/map_objects/pics/effects/short_grass/1.png delete mode 100644 graphics/map_objects/pics/effects/splash/0.png delete mode 100644 graphics/map_objects/pics/effects/splash/1.png delete mode 100644 graphics/map_objects/pics/effects/surf_blob/0.png delete mode 100644 graphics/map_objects/pics/effects/surf_blob/1.png delete mode 100644 graphics/map_objects/pics/effects/surf_blob/2.png delete mode 100644 graphics/map_objects/pics/effects/tall_grass/0.png delete mode 100644 graphics/map_objects/pics/effects/tall_grass/1.png delete mode 100644 graphics/map_objects/pics/effects/tall_grass/2.png delete mode 100644 graphics/map_objects/pics/effects/tall_grass/3.png delete mode 100644 graphics/map_objects/pics/effects/tall_grass/4.png delete mode 100644 graphics/map_objects/pics/effects/tree_disguise/0.png delete mode 100644 graphics/map_objects/pics/effects/tree_disguise/1.png delete mode 100644 graphics/map_objects/pics/effects/tree_disguise/2.png delete mode 100644 graphics/map_objects/pics/effects/tree_disguise/3.png delete mode 100644 graphics/map_objects/pics/effects/tree_disguise/4.png delete mode 100644 graphics/map_objects/pics/effects/tree_disguise/5.png delete mode 100644 graphics/map_objects/pics/effects/tree_disguise/6.png delete mode 100644 graphics/map_objects/pics/effects/unknown_16/0.png delete mode 100644 graphics/map_objects/pics/effects/unknown_16/1.png delete mode 100644 graphics/map_objects/pics/effects/unknown_16/2.png delete mode 100644 graphics/map_objects/pics/effects/unknown_16/3.png delete mode 100644 graphics/map_objects/pics/effects/unknown_16/4.png delete mode 100644 graphics/map_objects/pics/effects/unknown_16/5.png delete mode 100644 graphics/map_objects/pics/effects/unknown_17/0.png delete mode 100644 graphics/map_objects/pics/effects/unknown_17/1.png delete mode 100644 graphics/map_objects/pics/effects/unknown_17/2.png delete mode 100644 graphics/map_objects/pics/effects/unknown_17/3.png delete mode 100644 graphics/map_objects/pics/effects/unknown_17/4.png delete mode 100644 graphics/map_objects/pics/effects/unknown_17/5.png delete mode 100644 graphics/map_objects/pics/effects/unknown_17/6.png delete mode 100644 graphics/map_objects/pics/effects/unknown_17/7.png delete mode 100644 graphics/map_objects/pics/effects/unknown_18/0.png delete mode 100644 graphics/map_objects/pics/effects/unknown_18/1.png delete mode 100644 graphics/map_objects/pics/effects/unknown_18/2.png delete mode 100644 graphics/map_objects/pics/effects/unknown_18/3.png delete mode 100644 graphics/map_objects/pics/effects/unknown_19/0.png delete mode 100644 graphics/map_objects/pics/effects/unknown_19/1.png delete mode 100644 graphics/map_objects/pics/effects/unknown_19/2.png delete mode 100644 graphics/map_objects/pics/effects/unknown_19/3.png delete mode 100644 graphics/map_objects/pics/effects/unknown_20/0.png delete mode 100644 graphics/map_objects/pics/effects/unknown_20/1.png delete mode 100644 graphics/map_objects/pics/effects/unknown_20/2.png delete mode 100644 graphics/map_objects/pics/effects/unknown_20/3.png delete mode 100644 graphics/map_objects/pics/effects/unknown_20/4.png delete mode 100644 graphics/map_objects/pics/effects/unknown_29/0.png delete mode 100644 graphics/map_objects/pics/effects/unknown_29/1.png delete mode 100644 graphics/map_objects/pics/effects/unknown_29/2.png delete mode 100644 graphics/map_objects/pics/effects/unknown_33/0.png delete mode 100644 graphics/map_objects/pics/effects/unknown_33/1.png delete mode 100644 graphics/map_objects/pics/effects/unknown_33/2.png delete mode 100644 graphics/map_objects/pics/effects/unknown_33/3.png delete mode 100644 graphics/map_objects/pics/effects/unknown_33/4.png delete mode 100644 graphics/map_objects/pics/effects/unknown_35/0.png delete mode 100644 graphics/map_objects/pics/effects/unknown_35/1.png delete mode 100644 graphics/map_objects/pics/effects/unknown_4F6D38/0.png delete mode 100644 graphics/map_objects/pics/effects/unknown_4F7E38/0.png delete mode 100644 graphics/map_objects/pics/effects/unused_grass/0.png delete mode 100644 graphics/map_objects/pics/effects/unused_grass/1.png delete mode 100644 graphics/map_objects/pics/effects/unused_grass/2.png delete mode 100644 graphics/map_objects/pics/effects/unused_grass/3.png delete mode 100644 graphics/map_objects/pics/misc/birchs_bag.png delete mode 100644 graphics/map_objects/pics/misc/birth_island_stone.png delete mode 100644 graphics/map_objects/pics/misc/breakable_rock/0.png delete mode 100644 graphics/map_objects/pics/misc/breakable_rock/1.png delete mode 100644 graphics/map_objects/pics/misc/breakable_rock/2.png delete mode 100644 graphics/map_objects/pics/misc/breakable_rock/3.png delete mode 100644 graphics/map_objects/pics/misc/cable_car.png delete mode 100644 graphics/map_objects/pics/misc/cuttable_tree/0.png delete mode 100644 graphics/map_objects/pics/misc/cuttable_tree/1.png delete mode 100644 graphics/map_objects/pics/misc/cuttable_tree/2.png delete mode 100644 graphics/map_objects/pics/misc/cuttable_tree/3.png delete mode 100644 graphics/map_objects/pics/misc/fossil.png delete mode 100644 graphics/map_objects/pics/misc/item_ball.png delete mode 100644 graphics/map_objects/pics/misc/moving_box.png delete mode 100644 graphics/map_objects/pics/misc/mr_brineys_boat/0.png delete mode 100644 graphics/map_objects/pics/misc/mr_brineys_boat/1.png delete mode 100644 graphics/map_objects/pics/misc/mr_brineys_boat/2.png delete mode 100644 graphics/map_objects/pics/misc/pushable_boulder.png delete mode 100644 graphics/map_objects/pics/misc/ss_tidal.png delete mode 100644 graphics/map_objects/pics/misc/statue.png delete mode 100644 graphics/map_objects/pics/misc/submarine_shadow.png delete mode 100644 graphics/map_objects/pics/misc/truck.png delete mode 100644 graphics/map_objects/pics/people/anabel/0.png delete mode 100644 graphics/map_objects/pics/people/anabel/1.png delete mode 100644 graphics/map_objects/pics/people/anabel/2.png delete mode 100644 graphics/map_objects/pics/people/anabel/3.png delete mode 100644 graphics/map_objects/pics/people/anabel/4.png delete mode 100644 graphics/map_objects/pics/people/anabel/5.png delete mode 100644 graphics/map_objects/pics/people/anabel/6.png delete mode 100644 graphics/map_objects/pics/people/anabel/7.png delete mode 100644 graphics/map_objects/pics/people/anabel/8.png delete mode 100644 graphics/map_objects/pics/people/aqua_member_f/0.png delete mode 100644 graphics/map_objects/pics/people/aqua_member_f/1.png delete mode 100644 graphics/map_objects/pics/people/aqua_member_f/2.png delete mode 100644 graphics/map_objects/pics/people/aqua_member_f/3.png delete mode 100644 graphics/map_objects/pics/people/aqua_member_f/4.png delete mode 100644 graphics/map_objects/pics/people/aqua_member_f/5.png delete mode 100644 graphics/map_objects/pics/people/aqua_member_f/6.png delete mode 100644 graphics/map_objects/pics/people/aqua_member_f/7.png delete mode 100644 graphics/map_objects/pics/people/aqua_member_f/8.png delete mode 100644 graphics/map_objects/pics/people/aqua_member_m/0.png delete mode 100644 graphics/map_objects/pics/people/aqua_member_m/1.png delete mode 100644 graphics/map_objects/pics/people/aqua_member_m/2.png delete mode 100644 graphics/map_objects/pics/people/aqua_member_m/3.png delete mode 100644 graphics/map_objects/pics/people/aqua_member_m/4.png delete mode 100644 graphics/map_objects/pics/people/aqua_member_m/5.png delete mode 100644 graphics/map_objects/pics/people/aqua_member_m/6.png delete mode 100644 graphics/map_objects/pics/people/aqua_member_m/7.png delete mode 100644 graphics/map_objects/pics/people/aqua_member_m/8.png delete mode 100644 graphics/map_objects/pics/people/archie/0.png delete mode 100644 graphics/map_objects/pics/people/archie/1.png delete mode 100644 graphics/map_objects/pics/people/archie/2.png delete mode 100644 graphics/map_objects/pics/people/archie/3.png delete mode 100644 graphics/map_objects/pics/people/archie/4.png delete mode 100644 graphics/map_objects/pics/people/archie/5.png delete mode 100644 graphics/map_objects/pics/people/archie/6.png delete mode 100644 graphics/map_objects/pics/people/archie/7.png delete mode 100644 graphics/map_objects/pics/people/archie/8.png delete mode 100644 graphics/map_objects/pics/people/artist/0.png delete mode 100644 graphics/map_objects/pics/people/artist/1.png delete mode 100644 graphics/map_objects/pics/people/artist/2.png delete mode 100644 graphics/map_objects/pics/people/artist/3.png delete mode 100644 graphics/map_objects/pics/people/artist/4.png delete mode 100644 graphics/map_objects/pics/people/artist/5.png delete mode 100644 graphics/map_objects/pics/people/artist/6.png delete mode 100644 graphics/map_objects/pics/people/artist/7.png delete mode 100644 graphics/map_objects/pics/people/artist/8.png delete mode 100644 graphics/map_objects/pics/people/beauty/0.png delete mode 100644 graphics/map_objects/pics/people/beauty/1.png delete mode 100644 graphics/map_objects/pics/people/beauty/2.png delete mode 100644 graphics/map_objects/pics/people/beauty/3.png delete mode 100644 graphics/map_objects/pics/people/beauty/4.png delete mode 100644 graphics/map_objects/pics/people/beauty/5.png delete mode 100644 graphics/map_objects/pics/people/beauty/6.png delete mode 100644 graphics/map_objects/pics/people/beauty/7.png delete mode 100644 graphics/map_objects/pics/people/beauty/8.png delete mode 100644 graphics/map_objects/pics/people/black_belt/0.png delete mode 100644 graphics/map_objects/pics/people/black_belt/1.png delete mode 100644 graphics/map_objects/pics/people/black_belt/2.png delete mode 100644 graphics/map_objects/pics/people/black_belt/3.png delete mode 100644 graphics/map_objects/pics/people/black_belt/4.png delete mode 100644 graphics/map_objects/pics/people/black_belt/5.png delete mode 100644 graphics/map_objects/pics/people/black_belt/6.png delete mode 100644 graphics/map_objects/pics/people/black_belt/7.png delete mode 100644 graphics/map_objects/pics/people/black_belt/8.png delete mode 100644 graphics/map_objects/pics/people/boy_1/0.png delete mode 100644 graphics/map_objects/pics/people/boy_1/1.png delete mode 100644 graphics/map_objects/pics/people/boy_1/2.png delete mode 100644 graphics/map_objects/pics/people/boy_1/3.png delete mode 100644 graphics/map_objects/pics/people/boy_1/4.png delete mode 100644 graphics/map_objects/pics/people/boy_1/5.png delete mode 100644 graphics/map_objects/pics/people/boy_1/6.png delete mode 100644 graphics/map_objects/pics/people/boy_1/7.png delete mode 100644 graphics/map_objects/pics/people/boy_1/8.png delete mode 100644 graphics/map_objects/pics/people/boy_2/0.png delete mode 100644 graphics/map_objects/pics/people/boy_2/1.png delete mode 100644 graphics/map_objects/pics/people/boy_2/2.png delete mode 100644 graphics/map_objects/pics/people/boy_2/3.png delete mode 100644 graphics/map_objects/pics/people/boy_2/4.png delete mode 100644 graphics/map_objects/pics/people/boy_2/5.png delete mode 100644 graphics/map_objects/pics/people/boy_2/6.png delete mode 100644 graphics/map_objects/pics/people/boy_2/7.png delete mode 100644 graphics/map_objects/pics/people/boy_2/8.png delete mode 100644 graphics/map_objects/pics/people/boy_3/0.png delete mode 100644 graphics/map_objects/pics/people/boy_3/1.png delete mode 100644 graphics/map_objects/pics/people/boy_3/2.png delete mode 100644 graphics/map_objects/pics/people/boy_3/3.png delete mode 100644 graphics/map_objects/pics/people/boy_3/4.png delete mode 100644 graphics/map_objects/pics/people/boy_3/5.png delete mode 100644 graphics/map_objects/pics/people/boy_3/6.png delete mode 100644 graphics/map_objects/pics/people/boy_3/7.png delete mode 100644 graphics/map_objects/pics/people/boy_3/8.png delete mode 100644 graphics/map_objects/pics/people/boy_4/0.png delete mode 100644 graphics/map_objects/pics/people/boy_4/1.png delete mode 100644 graphics/map_objects/pics/people/boy_4/2.png delete mode 100644 graphics/map_objects/pics/people/boy_4/3.png delete mode 100644 graphics/map_objects/pics/people/boy_4/4.png delete mode 100644 graphics/map_objects/pics/people/boy_4/5.png delete mode 100644 graphics/map_objects/pics/people/boy_4/6.png delete mode 100644 graphics/map_objects/pics/people/boy_4/7.png delete mode 100644 graphics/map_objects/pics/people/boy_4/8.png delete mode 100644 graphics/map_objects/pics/people/boy_5/0.png delete mode 100644 graphics/map_objects/pics/people/boy_5/1.png delete mode 100644 graphics/map_objects/pics/people/boy_5/2.png delete mode 100644 graphics/map_objects/pics/people/brandon/0.png delete mode 100644 graphics/map_objects/pics/people/brandon/1.png delete mode 100644 graphics/map_objects/pics/people/brandon/2.png delete mode 100644 graphics/map_objects/pics/people/brandon/3.png delete mode 100644 graphics/map_objects/pics/people/brandon/4.png delete mode 100644 graphics/map_objects/pics/people/brandon/5.png delete mode 100644 graphics/map_objects/pics/people/brandon/6.png delete mode 100644 graphics/map_objects/pics/people/brandon/7.png delete mode 100644 graphics/map_objects/pics/people/brandon/8.png delete mode 100644 graphics/map_objects/pics/people/brawly/0.png delete mode 100644 graphics/map_objects/pics/people/brawly/1.png delete mode 100644 graphics/map_objects/pics/people/brawly/2.png delete mode 100644 graphics/map_objects/pics/people/brendan/acro_bike/00.png delete mode 100644 graphics/map_objects/pics/people/brendan/acro_bike/01.png delete mode 100644 graphics/map_objects/pics/people/brendan/acro_bike/02.png delete mode 100644 graphics/map_objects/pics/people/brendan/acro_bike/03.png delete mode 100644 graphics/map_objects/pics/people/brendan/acro_bike/04.png delete mode 100644 graphics/map_objects/pics/people/brendan/acro_bike/05.png delete mode 100644 graphics/map_objects/pics/people/brendan/acro_bike/06.png delete mode 100644 graphics/map_objects/pics/people/brendan/acro_bike/07.png delete mode 100644 graphics/map_objects/pics/people/brendan/acro_bike/08.png delete mode 100644 graphics/map_objects/pics/people/brendan/acro_bike/09.png delete mode 100644 graphics/map_objects/pics/people/brendan/acro_bike/10.png delete mode 100644 graphics/map_objects/pics/people/brendan/acro_bike/11.png delete mode 100644 graphics/map_objects/pics/people/brendan/acro_bike/12.png delete mode 100644 graphics/map_objects/pics/people/brendan/acro_bike/13.png delete mode 100644 graphics/map_objects/pics/people/brendan/acro_bike/14.png delete mode 100644 graphics/map_objects/pics/people/brendan/acro_bike/15.png delete mode 100644 graphics/map_objects/pics/people/brendan/acro_bike/16.png delete mode 100644 graphics/map_objects/pics/people/brendan/acro_bike/17.png delete mode 100644 graphics/map_objects/pics/people/brendan/acro_bike/18.png delete mode 100644 graphics/map_objects/pics/people/brendan/acro_bike/19.png delete mode 100644 graphics/map_objects/pics/people/brendan/acro_bike/20.png delete mode 100644 graphics/map_objects/pics/people/brendan/acro_bike/21.png delete mode 100644 graphics/map_objects/pics/people/brendan/acro_bike/22.png delete mode 100644 graphics/map_objects/pics/people/brendan/acro_bike/23.png delete mode 100644 graphics/map_objects/pics/people/brendan/acro_bike/24.png delete mode 100644 graphics/map_objects/pics/people/brendan/acro_bike/25.png delete mode 100644 graphics/map_objects/pics/people/brendan/acro_bike/26.png delete mode 100644 graphics/map_objects/pics/people/brendan/decorating.png delete mode 100644 graphics/map_objects/pics/people/brendan/field_move/0.png delete mode 100644 graphics/map_objects/pics/people/brendan/field_move/1.png delete mode 100644 graphics/map_objects/pics/people/brendan/field_move/2.png delete mode 100644 graphics/map_objects/pics/people/brendan/field_move/3.png delete mode 100644 graphics/map_objects/pics/people/brendan/field_move/4.png delete mode 100644 graphics/map_objects/pics/people/brendan/fishing/00.png delete mode 100644 graphics/map_objects/pics/people/brendan/fishing/01.png delete mode 100644 graphics/map_objects/pics/people/brendan/fishing/02.png delete mode 100644 graphics/map_objects/pics/people/brendan/fishing/03.png delete mode 100644 graphics/map_objects/pics/people/brendan/fishing/04.png delete mode 100644 graphics/map_objects/pics/people/brendan/fishing/05.png delete mode 100644 graphics/map_objects/pics/people/brendan/fishing/06.png delete mode 100644 graphics/map_objects/pics/people/brendan/fishing/07.png delete mode 100644 graphics/map_objects/pics/people/brendan/fishing/08.png delete mode 100644 graphics/map_objects/pics/people/brendan/fishing/09.png delete mode 100644 graphics/map_objects/pics/people/brendan/fishing/10.png delete mode 100644 graphics/map_objects/pics/people/brendan/fishing/11.png delete mode 100644 graphics/map_objects/pics/people/brendan/mach_bike/0.png delete mode 100644 graphics/map_objects/pics/people/brendan/mach_bike/1.png delete mode 100644 graphics/map_objects/pics/people/brendan/mach_bike/2.png delete mode 100644 graphics/map_objects/pics/people/brendan/mach_bike/3.png delete mode 100644 graphics/map_objects/pics/people/brendan/mach_bike/4.png delete mode 100644 graphics/map_objects/pics/people/brendan/mach_bike/5.png delete mode 100644 graphics/map_objects/pics/people/brendan/mach_bike/6.png delete mode 100644 graphics/map_objects/pics/people/brendan/mach_bike/7.png delete mode 100644 graphics/map_objects/pics/people/brendan/mach_bike/8.png delete mode 100644 graphics/map_objects/pics/people/brendan/normal/00.png delete mode 100644 graphics/map_objects/pics/people/brendan/normal/01.png delete mode 100644 graphics/map_objects/pics/people/brendan/normal/02.png delete mode 100644 graphics/map_objects/pics/people/brendan/normal/03.png delete mode 100644 graphics/map_objects/pics/people/brendan/normal/04.png delete mode 100644 graphics/map_objects/pics/people/brendan/normal/05.png delete mode 100644 graphics/map_objects/pics/people/brendan/normal/06.png delete mode 100644 graphics/map_objects/pics/people/brendan/normal/07.png delete mode 100644 graphics/map_objects/pics/people/brendan/normal/08.png delete mode 100644 graphics/map_objects/pics/people/brendan/normal/09.png delete mode 100644 graphics/map_objects/pics/people/brendan/normal/10.png delete mode 100644 graphics/map_objects/pics/people/brendan/normal/11.png delete mode 100644 graphics/map_objects/pics/people/brendan/normal/12.png delete mode 100644 graphics/map_objects/pics/people/brendan/normal/13.png delete mode 100644 graphics/map_objects/pics/people/brendan/normal/14.png delete mode 100644 graphics/map_objects/pics/people/brendan/normal/15.png delete mode 100644 graphics/map_objects/pics/people/brendan/normal/16.png delete mode 100644 graphics/map_objects/pics/people/brendan/normal/17.png delete mode 100644 graphics/map_objects/pics/people/brendan/surfing/0.png delete mode 100644 graphics/map_objects/pics/people/brendan/surfing/1.png delete mode 100644 graphics/map_objects/pics/people/brendan/surfing/2.png delete mode 100644 graphics/map_objects/pics/people/brendan/surfing/3.png delete mode 100644 graphics/map_objects/pics/people/brendan/surfing/4.png delete mode 100644 graphics/map_objects/pics/people/brendan/surfing/5.png delete mode 100644 graphics/map_objects/pics/people/brendan/underwater/0.png delete mode 100644 graphics/map_objects/pics/people/brendan/underwater/1.png delete mode 100644 graphics/map_objects/pics/people/brendan/underwater/2.png delete mode 100644 graphics/map_objects/pics/people/brendan/underwater/3.png delete mode 100644 graphics/map_objects/pics/people/brendan/watering/0.png delete mode 100644 graphics/map_objects/pics/people/brendan/watering/1.png delete mode 100644 graphics/map_objects/pics/people/brendan/watering/2.png delete mode 100644 graphics/map_objects/pics/people/brendan/watering/3.png delete mode 100644 graphics/map_objects/pics/people/brendan/watering/4.png delete mode 100644 graphics/map_objects/pics/people/brendan/watering/5.png delete mode 100644 graphics/map_objects/pics/people/bug_catcher/0.png delete mode 100644 graphics/map_objects/pics/people/bug_catcher/1.png delete mode 100644 graphics/map_objects/pics/people/bug_catcher/2.png delete mode 100644 graphics/map_objects/pics/people/bug_catcher/3.png delete mode 100644 graphics/map_objects/pics/people/bug_catcher/4.png delete mode 100644 graphics/map_objects/pics/people/bug_catcher/5.png delete mode 100644 graphics/map_objects/pics/people/bug_catcher/6.png delete mode 100644 graphics/map_objects/pics/people/bug_catcher/7.png delete mode 100644 graphics/map_objects/pics/people/bug_catcher/8.png delete mode 100644 graphics/map_objects/pics/people/cameraman/0.png delete mode 100644 graphics/map_objects/pics/people/cameraman/1.png delete mode 100644 graphics/map_objects/pics/people/cameraman/2.png delete mode 100644 graphics/map_objects/pics/people/cameraman/3.png delete mode 100644 graphics/map_objects/pics/people/cameraman/4.png delete mode 100644 graphics/map_objects/pics/people/cameraman/5.png delete mode 100644 graphics/map_objects/pics/people/cameraman/6.png delete mode 100644 graphics/map_objects/pics/people/cameraman/7.png delete mode 100644 graphics/map_objects/pics/people/cameraman/8.png delete mode 100644 graphics/map_objects/pics/people/camper/0.png delete mode 100644 graphics/map_objects/pics/people/camper/1.png delete mode 100644 graphics/map_objects/pics/people/camper/2.png delete mode 100644 graphics/map_objects/pics/people/camper/3.png delete mode 100644 graphics/map_objects/pics/people/camper/4.png delete mode 100644 graphics/map_objects/pics/people/camper/5.png delete mode 100644 graphics/map_objects/pics/people/camper/6.png delete mode 100644 graphics/map_objects/pics/people/camper/7.png delete mode 100644 graphics/map_objects/pics/people/camper/8.png delete mode 100644 graphics/map_objects/pics/people/contest_old_man/0.png delete mode 100644 graphics/map_objects/pics/people/contest_old_man/1.png delete mode 100644 graphics/map_objects/pics/people/contest_old_man/2.png delete mode 100644 graphics/map_objects/pics/people/contest_old_man/3.png delete mode 100644 graphics/map_objects/pics/people/contest_old_man/4.png delete mode 100644 graphics/map_objects/pics/people/contest_old_man/5.png delete mode 100644 graphics/map_objects/pics/people/contest_old_man/6.png delete mode 100644 graphics/map_objects/pics/people/contest_old_man/7.png delete mode 100644 graphics/map_objects/pics/people/contest_old_man/8.png delete mode 100644 graphics/map_objects/pics/people/cook/0.png delete mode 100644 graphics/map_objects/pics/people/cook/1.png delete mode 100644 graphics/map_objects/pics/people/cook/2.png delete mode 100644 graphics/map_objects/pics/people/cycling_triathlete_f/0.png delete mode 100644 graphics/map_objects/pics/people/cycling_triathlete_f/1.png delete mode 100644 graphics/map_objects/pics/people/cycling_triathlete_f/2.png delete mode 100644 graphics/map_objects/pics/people/cycling_triathlete_f/3.png delete mode 100644 graphics/map_objects/pics/people/cycling_triathlete_f/4.png delete mode 100644 graphics/map_objects/pics/people/cycling_triathlete_f/5.png delete mode 100644 graphics/map_objects/pics/people/cycling_triathlete_f/6.png delete mode 100644 graphics/map_objects/pics/people/cycling_triathlete_f/7.png delete mode 100644 graphics/map_objects/pics/people/cycling_triathlete_f/8.png delete mode 100644 graphics/map_objects/pics/people/cycling_triathlete_m/0.png delete mode 100644 graphics/map_objects/pics/people/cycling_triathlete_m/1.png delete mode 100644 graphics/map_objects/pics/people/cycling_triathlete_m/2.png delete mode 100644 graphics/map_objects/pics/people/cycling_triathlete_m/3.png delete mode 100644 graphics/map_objects/pics/people/cycling_triathlete_m/4.png delete mode 100644 graphics/map_objects/pics/people/cycling_triathlete_m/5.png delete mode 100644 graphics/map_objects/pics/people/cycling_triathlete_m/6.png delete mode 100644 graphics/map_objects/pics/people/cycling_triathlete_m/7.png delete mode 100644 graphics/map_objects/pics/people/cycling_triathlete_m/8.png delete mode 100644 graphics/map_objects/pics/people/drake/0.png delete mode 100644 graphics/map_objects/pics/people/drake/1.png delete mode 100644 graphics/map_objects/pics/people/drake/2.png delete mode 100644 graphics/map_objects/pics/people/fat_man/0.png delete mode 100644 graphics/map_objects/pics/people/fat_man/1.png delete mode 100644 graphics/map_objects/pics/people/fat_man/2.png delete mode 100644 graphics/map_objects/pics/people/fat_man/3.png delete mode 100644 graphics/map_objects/pics/people/fat_man/4.png delete mode 100644 graphics/map_objects/pics/people/fat_man/5.png delete mode 100644 graphics/map_objects/pics/people/fat_man/6.png delete mode 100644 graphics/map_objects/pics/people/fat_man/7.png delete mode 100644 graphics/map_objects/pics/people/fat_man/8.png delete mode 100644 graphics/map_objects/pics/people/fisherman/0.png delete mode 100644 graphics/map_objects/pics/people/fisherman/1.png delete mode 100644 graphics/map_objects/pics/people/fisherman/2.png delete mode 100644 graphics/map_objects/pics/people/fisherman/3.png delete mode 100644 graphics/map_objects/pics/people/fisherman/4.png delete mode 100644 graphics/map_objects/pics/people/fisherman/5.png delete mode 100644 graphics/map_objects/pics/people/fisherman/6.png delete mode 100644 graphics/map_objects/pics/people/fisherman/7.png delete mode 100644 graphics/map_objects/pics/people/fisherman/8.png delete mode 100644 graphics/map_objects/pics/people/flannery/0.png delete mode 100644 graphics/map_objects/pics/people/flannery/1.png delete mode 100644 graphics/map_objects/pics/people/flannery/2.png delete mode 100644 graphics/map_objects/pics/people/gentleman/0.png delete mode 100644 graphics/map_objects/pics/people/gentleman/1.png delete mode 100644 graphics/map_objects/pics/people/gentleman/2.png delete mode 100644 graphics/map_objects/pics/people/gentleman/3.png delete mode 100644 graphics/map_objects/pics/people/gentleman/4.png delete mode 100644 graphics/map_objects/pics/people/gentleman/5.png delete mode 100644 graphics/map_objects/pics/people/gentleman/6.png delete mode 100644 graphics/map_objects/pics/people/gentleman/7.png delete mode 100644 graphics/map_objects/pics/people/gentleman/8.png delete mode 100644 graphics/map_objects/pics/people/girl_1/0.png delete mode 100644 graphics/map_objects/pics/people/girl_1/1.png delete mode 100644 graphics/map_objects/pics/people/girl_1/2.png delete mode 100644 graphics/map_objects/pics/people/girl_1/3.png delete mode 100644 graphics/map_objects/pics/people/girl_1/4.png delete mode 100644 graphics/map_objects/pics/people/girl_1/5.png delete mode 100644 graphics/map_objects/pics/people/girl_1/6.png delete mode 100644 graphics/map_objects/pics/people/girl_1/7.png delete mode 100644 graphics/map_objects/pics/people/girl_1/8.png delete mode 100644 graphics/map_objects/pics/people/girl_2/0.png delete mode 100644 graphics/map_objects/pics/people/girl_2/1.png delete mode 100644 graphics/map_objects/pics/people/girl_2/2.png delete mode 100644 graphics/map_objects/pics/people/girl_2/3.png delete mode 100644 graphics/map_objects/pics/people/girl_2/4.png delete mode 100644 graphics/map_objects/pics/people/girl_2/5.png delete mode 100644 graphics/map_objects/pics/people/girl_2/6.png delete mode 100644 graphics/map_objects/pics/people/girl_2/7.png delete mode 100644 graphics/map_objects/pics/people/girl_2/8.png delete mode 100644 graphics/map_objects/pics/people/girl_3/0.png delete mode 100644 graphics/map_objects/pics/people/girl_3/1.png delete mode 100644 graphics/map_objects/pics/people/girl_3/2.png delete mode 100644 graphics/map_objects/pics/people/girl_3/3.png delete mode 100644 graphics/map_objects/pics/people/girl_3/4.png delete mode 100644 graphics/map_objects/pics/people/girl_3/5.png delete mode 100644 graphics/map_objects/pics/people/girl_3/6.png delete mode 100644 graphics/map_objects/pics/people/girl_3/7.png delete mode 100644 graphics/map_objects/pics/people/girl_3/8.png delete mode 100644 graphics/map_objects/pics/people/glacia/0.png delete mode 100644 graphics/map_objects/pics/people/glacia/1.png delete mode 100644 graphics/map_objects/pics/people/glacia/2.png delete mode 100644 graphics/map_objects/pics/people/greta/0.png delete mode 100644 graphics/map_objects/pics/people/greta/1.png delete mode 100644 graphics/map_objects/pics/people/greta/2.png delete mode 100644 graphics/map_objects/pics/people/greta/3.png delete mode 100644 graphics/map_objects/pics/people/greta/4.png delete mode 100644 graphics/map_objects/pics/people/greta/5.png delete mode 100644 graphics/map_objects/pics/people/greta/6.png delete mode 100644 graphics/map_objects/pics/people/greta/7.png delete mode 100644 graphics/map_objects/pics/people/greta/8.png delete mode 100644 graphics/map_objects/pics/people/hex_maniac/0.png delete mode 100644 graphics/map_objects/pics/people/hex_maniac/1.png delete mode 100644 graphics/map_objects/pics/people/hex_maniac/2.png delete mode 100644 graphics/map_objects/pics/people/hex_maniac/3.png delete mode 100644 graphics/map_objects/pics/people/hex_maniac/4.png delete mode 100644 graphics/map_objects/pics/people/hex_maniac/5.png delete mode 100644 graphics/map_objects/pics/people/hex_maniac/6.png delete mode 100644 graphics/map_objects/pics/people/hex_maniac/7.png delete mode 100644 graphics/map_objects/pics/people/hex_maniac/8.png delete mode 100644 graphics/map_objects/pics/people/hiker/0.png delete mode 100644 graphics/map_objects/pics/people/hiker/1.png delete mode 100644 graphics/map_objects/pics/people/hiker/2.png delete mode 100644 graphics/map_objects/pics/people/hiker/3.png delete mode 100644 graphics/map_objects/pics/people/hiker/4.png delete mode 100644 graphics/map_objects/pics/people/hiker/5.png delete mode 100644 graphics/map_objects/pics/people/hiker/6.png delete mode 100644 graphics/map_objects/pics/people/hiker/7.png delete mode 100644 graphics/map_objects/pics/people/hiker/8.png delete mode 100644 graphics/map_objects/pics/people/hot_springs_old_woman/0.png delete mode 100644 graphics/map_objects/pics/people/hot_springs_old_woman/1.png delete mode 100644 graphics/map_objects/pics/people/hot_springs_old_woman/2.png delete mode 100644 graphics/map_objects/pics/people/hot_springs_old_woman/3.png delete mode 100644 graphics/map_objects/pics/people/hot_springs_old_woman/4.png delete mode 100644 graphics/map_objects/pics/people/hot_springs_old_woman/5.png delete mode 100644 graphics/map_objects/pics/people/hot_springs_old_woman/6.png delete mode 100644 graphics/map_objects/pics/people/hot_springs_old_woman/7.png delete mode 100644 graphics/map_objects/pics/people/hot_springs_old_woman/8.png delete mode 100644 graphics/map_objects/pics/people/juan/0.png delete mode 100644 graphics/map_objects/pics/people/juan/1.png delete mode 100644 graphics/map_objects/pics/people/juan/2.png delete mode 100644 graphics/map_objects/pics/people/juan/3.png delete mode 100644 graphics/map_objects/pics/people/juan/4.png delete mode 100644 graphics/map_objects/pics/people/juan/5.png delete mode 100644 graphics/map_objects/pics/people/juan/6.png delete mode 100644 graphics/map_objects/pics/people/juan/7.png delete mode 100644 graphics/map_objects/pics/people/juan/8.png delete mode 100644 graphics/map_objects/pics/people/lass/0.png delete mode 100644 graphics/map_objects/pics/people/lass/1.png delete mode 100644 graphics/map_objects/pics/people/lass/2.png delete mode 100644 graphics/map_objects/pics/people/lass/3.png delete mode 100644 graphics/map_objects/pics/people/lass/4.png delete mode 100644 graphics/map_objects/pics/people/lass/5.png delete mode 100644 graphics/map_objects/pics/people/lass/6.png delete mode 100644 graphics/map_objects/pics/people/lass/7.png delete mode 100644 graphics/map_objects/pics/people/lass/8.png delete mode 100644 graphics/map_objects/pics/people/leaf/0.png delete mode 100644 graphics/map_objects/pics/people/leaf/1.png delete mode 100644 graphics/map_objects/pics/people/leaf/2.png delete mode 100644 graphics/map_objects/pics/people/leaf/3.png delete mode 100644 graphics/map_objects/pics/people/leaf/4.png delete mode 100644 graphics/map_objects/pics/people/leaf/5.png delete mode 100644 graphics/map_objects/pics/people/leaf/6.png delete mode 100644 graphics/map_objects/pics/people/leaf/7.png delete mode 100644 graphics/map_objects/pics/people/leaf/8.png delete mode 100644 graphics/map_objects/pics/people/little_boy_1/0.png delete mode 100644 graphics/map_objects/pics/people/little_boy_1/1.png delete mode 100644 graphics/map_objects/pics/people/little_boy_1/2.png delete mode 100644 graphics/map_objects/pics/people/little_boy_1/3.png delete mode 100644 graphics/map_objects/pics/people/little_boy_1/4.png delete mode 100644 graphics/map_objects/pics/people/little_boy_1/5.png delete mode 100644 graphics/map_objects/pics/people/little_boy_1/6.png delete mode 100644 graphics/map_objects/pics/people/little_boy_1/7.png delete mode 100644 graphics/map_objects/pics/people/little_boy_1/8.png delete mode 100644 graphics/map_objects/pics/people/little_boy_2/0.png delete mode 100644 graphics/map_objects/pics/people/little_boy_2/1.png delete mode 100644 graphics/map_objects/pics/people/little_boy_2/2.png delete mode 100644 graphics/map_objects/pics/people/little_boy_2/3.png delete mode 100644 graphics/map_objects/pics/people/little_boy_2/4.png delete mode 100644 graphics/map_objects/pics/people/little_boy_2/5.png delete mode 100644 graphics/map_objects/pics/people/little_boy_2/6.png delete mode 100644 graphics/map_objects/pics/people/little_boy_2/7.png delete mode 100644 graphics/map_objects/pics/people/little_boy_2/8.png delete mode 100644 graphics/map_objects/pics/people/little_girl_1/0.png delete mode 100644 graphics/map_objects/pics/people/little_girl_1/1.png delete mode 100644 graphics/map_objects/pics/people/little_girl_1/2.png delete mode 100644 graphics/map_objects/pics/people/little_girl_1/3.png delete mode 100644 graphics/map_objects/pics/people/little_girl_1/4.png delete mode 100644 graphics/map_objects/pics/people/little_girl_1/5.png delete mode 100644 graphics/map_objects/pics/people/little_girl_1/6.png delete mode 100644 graphics/map_objects/pics/people/little_girl_1/7.png delete mode 100644 graphics/map_objects/pics/people/little_girl_1/8.png delete mode 100644 graphics/map_objects/pics/people/little_girl_2/0.png delete mode 100644 graphics/map_objects/pics/people/little_girl_2/1.png delete mode 100644 graphics/map_objects/pics/people/little_girl_2/2.png delete mode 100644 graphics/map_objects/pics/people/little_girl_2/3.png delete mode 100644 graphics/map_objects/pics/people/little_girl_2/4.png delete mode 100644 graphics/map_objects/pics/people/little_girl_2/5.png delete mode 100644 graphics/map_objects/pics/people/little_girl_2/6.png delete mode 100644 graphics/map_objects/pics/people/little_girl_2/7.png delete mode 100644 graphics/map_objects/pics/people/little_girl_2/8.png delete mode 100644 graphics/map_objects/pics/people/liza/0.png delete mode 100644 graphics/map_objects/pics/people/liza/1.png delete mode 100644 graphics/map_objects/pics/people/liza/2.png delete mode 100644 graphics/map_objects/pics/people/lucy/0.png delete mode 100644 graphics/map_objects/pics/people/lucy/1.png delete mode 100644 graphics/map_objects/pics/people/lucy/2.png delete mode 100644 graphics/map_objects/pics/people/lucy/3.png delete mode 100644 graphics/map_objects/pics/people/lucy/4.png delete mode 100644 graphics/map_objects/pics/people/lucy/5.png delete mode 100644 graphics/map_objects/pics/people/lucy/6.png delete mode 100644 graphics/map_objects/pics/people/lucy/7.png delete mode 100644 graphics/map_objects/pics/people/lucy/8.png delete mode 100644 graphics/map_objects/pics/people/magma_member_f/0.png delete mode 100644 graphics/map_objects/pics/people/magma_member_f/1.png delete mode 100644 graphics/map_objects/pics/people/magma_member_f/2.png delete mode 100644 graphics/map_objects/pics/people/magma_member_f/3.png delete mode 100644 graphics/map_objects/pics/people/magma_member_f/4.png delete mode 100644 graphics/map_objects/pics/people/magma_member_f/5.png delete mode 100644 graphics/map_objects/pics/people/magma_member_f/6.png delete mode 100644 graphics/map_objects/pics/people/magma_member_f/7.png delete mode 100644 graphics/map_objects/pics/people/magma_member_f/8.png delete mode 100644 graphics/map_objects/pics/people/magma_member_m/0.png delete mode 100644 graphics/map_objects/pics/people/magma_member_m/1.png delete mode 100644 graphics/map_objects/pics/people/magma_member_m/2.png delete mode 100644 graphics/map_objects/pics/people/magma_member_m/3.png delete mode 100644 graphics/map_objects/pics/people/magma_member_m/4.png delete mode 100644 graphics/map_objects/pics/people/magma_member_m/5.png delete mode 100644 graphics/map_objects/pics/people/magma_member_m/6.png delete mode 100644 graphics/map_objects/pics/people/magma_member_m/7.png delete mode 100644 graphics/map_objects/pics/people/magma_member_m/8.png delete mode 100644 graphics/map_objects/pics/people/man_1/0.png delete mode 100644 graphics/map_objects/pics/people/man_1/1.png delete mode 100644 graphics/map_objects/pics/people/man_1/2.png delete mode 100644 graphics/map_objects/pics/people/man_1/3.png delete mode 100644 graphics/map_objects/pics/people/man_1/4.png delete mode 100644 graphics/map_objects/pics/people/man_1/5.png delete mode 100644 graphics/map_objects/pics/people/man_1/6.png delete mode 100644 graphics/map_objects/pics/people/man_1/7.png delete mode 100644 graphics/map_objects/pics/people/man_1/8.png delete mode 100644 graphics/map_objects/pics/people/man_2/0.png delete mode 100644 graphics/map_objects/pics/people/man_2/1.png delete mode 100644 graphics/map_objects/pics/people/man_2/2.png delete mode 100644 graphics/map_objects/pics/people/man_2/3.png delete mode 100644 graphics/map_objects/pics/people/man_2/4.png delete mode 100644 graphics/map_objects/pics/people/man_2/5.png delete mode 100644 graphics/map_objects/pics/people/man_2/6.png delete mode 100644 graphics/map_objects/pics/people/man_2/7.png delete mode 100644 graphics/map_objects/pics/people/man_2/8.png delete mode 100644 graphics/map_objects/pics/people/man_3/0.png delete mode 100644 graphics/map_objects/pics/people/man_3/1.png delete mode 100644 graphics/map_objects/pics/people/man_3/2.png delete mode 100644 graphics/map_objects/pics/people/man_3/3.png delete mode 100644 graphics/map_objects/pics/people/man_3/4.png delete mode 100644 graphics/map_objects/pics/people/man_3/5.png delete mode 100644 graphics/map_objects/pics/people/man_3/6.png delete mode 100644 graphics/map_objects/pics/people/man_3/7.png delete mode 100644 graphics/map_objects/pics/people/man_3/8.png delete mode 100644 graphics/map_objects/pics/people/man_4/0.png delete mode 100644 graphics/map_objects/pics/people/man_4/1.png delete mode 100644 graphics/map_objects/pics/people/man_4/2.png delete mode 100644 graphics/map_objects/pics/people/man_4/3.png delete mode 100644 graphics/map_objects/pics/people/man_4/4.png delete mode 100644 graphics/map_objects/pics/people/man_4/5.png delete mode 100644 graphics/map_objects/pics/people/man_4/6.png delete mode 100644 graphics/map_objects/pics/people/man_4/7.png delete mode 100644 graphics/map_objects/pics/people/man_4/8.png delete mode 100644 graphics/map_objects/pics/people/man_5/0.png delete mode 100644 graphics/map_objects/pics/people/man_5/1.png delete mode 100644 graphics/map_objects/pics/people/man_5/2.png delete mode 100644 graphics/map_objects/pics/people/man_5/3.png delete mode 100644 graphics/map_objects/pics/people/man_5/4.png delete mode 100644 graphics/map_objects/pics/people/man_5/5.png delete mode 100644 graphics/map_objects/pics/people/man_5/6.png delete mode 100644 graphics/map_objects/pics/people/man_5/7.png delete mode 100644 graphics/map_objects/pics/people/man_5/8.png delete mode 100644 graphics/map_objects/pics/people/man_6/0.png delete mode 100644 graphics/map_objects/pics/people/man_6/1.png delete mode 100644 graphics/map_objects/pics/people/man_6/2.png delete mode 100644 graphics/map_objects/pics/people/man_6/3.png delete mode 100644 graphics/map_objects/pics/people/man_6/4.png delete mode 100644 graphics/map_objects/pics/people/man_6/5.png delete mode 100644 graphics/map_objects/pics/people/man_6/6.png delete mode 100644 graphics/map_objects/pics/people/man_6/7.png delete mode 100644 graphics/map_objects/pics/people/man_6/8.png delete mode 100644 graphics/map_objects/pics/people/man_7/0.png delete mode 100644 graphics/map_objects/pics/people/man_7/1.png delete mode 100644 graphics/map_objects/pics/people/man_7/2.png delete mode 100644 graphics/map_objects/pics/people/man_7/3.png delete mode 100644 graphics/map_objects/pics/people/man_7/4.png delete mode 100644 graphics/map_objects/pics/people/man_7/5.png delete mode 100644 graphics/map_objects/pics/people/man_7/6.png delete mode 100644 graphics/map_objects/pics/people/man_7/7.png delete mode 100644 graphics/map_objects/pics/people/man_7/8.png delete mode 100644 graphics/map_objects/pics/people/maniac/0.png delete mode 100644 graphics/map_objects/pics/people/maniac/1.png delete mode 100644 graphics/map_objects/pics/people/maniac/2.png delete mode 100644 graphics/map_objects/pics/people/maniac/3.png delete mode 100644 graphics/map_objects/pics/people/maniac/4.png delete mode 100644 graphics/map_objects/pics/people/maniac/5.png delete mode 100644 graphics/map_objects/pics/people/maniac/6.png delete mode 100644 graphics/map_objects/pics/people/maniac/7.png delete mode 100644 graphics/map_objects/pics/people/maniac/8.png delete mode 100644 graphics/map_objects/pics/people/mart_employee/0.png delete mode 100644 graphics/map_objects/pics/people/mart_employee/1.png delete mode 100644 graphics/map_objects/pics/people/mart_employee/2.png delete mode 100644 graphics/map_objects/pics/people/mart_employee/3.png delete mode 100644 graphics/map_objects/pics/people/mart_employee/4.png delete mode 100644 graphics/map_objects/pics/people/mart_employee/5.png delete mode 100644 graphics/map_objects/pics/people/mart_employee/6.png delete mode 100644 graphics/map_objects/pics/people/mart_employee/7.png delete mode 100644 graphics/map_objects/pics/people/mart_employee/8.png delete mode 100644 graphics/map_objects/pics/people/mauville_old_man_1/0.png delete mode 100644 graphics/map_objects/pics/people/mauville_old_man_1/1.png delete mode 100644 graphics/map_objects/pics/people/mauville_old_man_1/2.png delete mode 100644 graphics/map_objects/pics/people/mauville_old_man_1/3.png delete mode 100644 graphics/map_objects/pics/people/mauville_old_man_1/4.png delete mode 100644 graphics/map_objects/pics/people/mauville_old_man_1/5.png delete mode 100644 graphics/map_objects/pics/people/mauville_old_man_1/6.png delete mode 100644 graphics/map_objects/pics/people/mauville_old_man_1/7.png delete mode 100644 graphics/map_objects/pics/people/mauville_old_man_1/8.png delete mode 100644 graphics/map_objects/pics/people/mauville_old_man_2/0.png delete mode 100644 graphics/map_objects/pics/people/mauville_old_man_2/1.png delete mode 100644 graphics/map_objects/pics/people/mauville_old_man_2/2.png delete mode 100644 graphics/map_objects/pics/people/mauville_old_man_2/3.png delete mode 100644 graphics/map_objects/pics/people/mauville_old_man_2/4.png delete mode 100644 graphics/map_objects/pics/people/mauville_old_man_2/5.png delete mode 100644 graphics/map_objects/pics/people/mauville_old_man_2/6.png delete mode 100644 graphics/map_objects/pics/people/mauville_old_man_2/7.png delete mode 100644 graphics/map_objects/pics/people/mauville_old_man_2/8.png delete mode 100644 graphics/map_objects/pics/people/maxie/0.png delete mode 100644 graphics/map_objects/pics/people/maxie/1.png delete mode 100644 graphics/map_objects/pics/people/maxie/2.png delete mode 100644 graphics/map_objects/pics/people/maxie/3.png delete mode 100644 graphics/map_objects/pics/people/maxie/4.png delete mode 100644 graphics/map_objects/pics/people/maxie/5.png delete mode 100644 graphics/map_objects/pics/people/maxie/6.png delete mode 100644 graphics/map_objects/pics/people/maxie/7.png delete mode 100644 graphics/map_objects/pics/people/maxie/8.png delete mode 100644 graphics/map_objects/pics/people/may/acro_bike/00.png delete mode 100644 graphics/map_objects/pics/people/may/acro_bike/01.png delete mode 100644 graphics/map_objects/pics/people/may/acro_bike/02.png delete mode 100644 graphics/map_objects/pics/people/may/acro_bike/03.png delete mode 100644 graphics/map_objects/pics/people/may/acro_bike/04.png delete mode 100644 graphics/map_objects/pics/people/may/acro_bike/05.png delete mode 100644 graphics/map_objects/pics/people/may/acro_bike/06.png delete mode 100644 graphics/map_objects/pics/people/may/acro_bike/07.png delete mode 100644 graphics/map_objects/pics/people/may/acro_bike/08.png delete mode 100644 graphics/map_objects/pics/people/may/acro_bike/09.png delete mode 100644 graphics/map_objects/pics/people/may/acro_bike/10.png delete mode 100644 graphics/map_objects/pics/people/may/acro_bike/11.png delete mode 100644 graphics/map_objects/pics/people/may/acro_bike/12.png delete mode 100644 graphics/map_objects/pics/people/may/acro_bike/13.png delete mode 100644 graphics/map_objects/pics/people/may/acro_bike/14.png delete mode 100644 graphics/map_objects/pics/people/may/acro_bike/15.png delete mode 100644 graphics/map_objects/pics/people/may/acro_bike/16.png delete mode 100644 graphics/map_objects/pics/people/may/acro_bike/17.png delete mode 100644 graphics/map_objects/pics/people/may/acro_bike/18.png delete mode 100644 graphics/map_objects/pics/people/may/acro_bike/19.png delete mode 100644 graphics/map_objects/pics/people/may/acro_bike/20.png delete mode 100644 graphics/map_objects/pics/people/may/acro_bike/21.png delete mode 100644 graphics/map_objects/pics/people/may/acro_bike/22.png delete mode 100644 graphics/map_objects/pics/people/may/acro_bike/23.png delete mode 100644 graphics/map_objects/pics/people/may/acro_bike/24.png delete mode 100644 graphics/map_objects/pics/people/may/acro_bike/25.png delete mode 100644 graphics/map_objects/pics/people/may/acro_bike/26.png delete mode 100644 graphics/map_objects/pics/people/may/decorating.png delete mode 100644 graphics/map_objects/pics/people/may/field_move/0.png delete mode 100644 graphics/map_objects/pics/people/may/field_move/1.png delete mode 100644 graphics/map_objects/pics/people/may/field_move/2.png delete mode 100644 graphics/map_objects/pics/people/may/field_move/3.png delete mode 100644 graphics/map_objects/pics/people/may/field_move/4.png delete mode 100644 graphics/map_objects/pics/people/may/fishing/00.png delete mode 100644 graphics/map_objects/pics/people/may/fishing/01.png delete mode 100644 graphics/map_objects/pics/people/may/fishing/02.png delete mode 100644 graphics/map_objects/pics/people/may/fishing/03.png delete mode 100644 graphics/map_objects/pics/people/may/fishing/04.png delete mode 100644 graphics/map_objects/pics/people/may/fishing/05.png delete mode 100644 graphics/map_objects/pics/people/may/fishing/06.png delete mode 100644 graphics/map_objects/pics/people/may/fishing/07.png delete mode 100644 graphics/map_objects/pics/people/may/fishing/08.png delete mode 100644 graphics/map_objects/pics/people/may/fishing/09.png delete mode 100644 graphics/map_objects/pics/people/may/fishing/10.png delete mode 100644 graphics/map_objects/pics/people/may/fishing/11.png delete mode 100644 graphics/map_objects/pics/people/may/mach_bike/0.png delete mode 100644 graphics/map_objects/pics/people/may/mach_bike/1.png delete mode 100644 graphics/map_objects/pics/people/may/mach_bike/2.png delete mode 100644 graphics/map_objects/pics/people/may/mach_bike/3.png delete mode 100644 graphics/map_objects/pics/people/may/mach_bike/4.png delete mode 100644 graphics/map_objects/pics/people/may/mach_bike/5.png delete mode 100644 graphics/map_objects/pics/people/may/mach_bike/6.png delete mode 100644 graphics/map_objects/pics/people/may/mach_bike/7.png delete mode 100644 graphics/map_objects/pics/people/may/mach_bike/8.png delete mode 100644 graphics/map_objects/pics/people/may/normal/00.png delete mode 100644 graphics/map_objects/pics/people/may/normal/01.png delete mode 100644 graphics/map_objects/pics/people/may/normal/02.png delete mode 100644 graphics/map_objects/pics/people/may/normal/03.png delete mode 100644 graphics/map_objects/pics/people/may/normal/04.png delete mode 100644 graphics/map_objects/pics/people/may/normal/05.png delete mode 100644 graphics/map_objects/pics/people/may/normal/06.png delete mode 100644 graphics/map_objects/pics/people/may/normal/07.png delete mode 100644 graphics/map_objects/pics/people/may/normal/08.png delete mode 100644 graphics/map_objects/pics/people/may/normal/09.png delete mode 100644 graphics/map_objects/pics/people/may/normal/10.png delete mode 100644 graphics/map_objects/pics/people/may/normal/11.png delete mode 100644 graphics/map_objects/pics/people/may/normal/12.png delete mode 100644 graphics/map_objects/pics/people/may/normal/13.png delete mode 100644 graphics/map_objects/pics/people/may/normal/14.png delete mode 100644 graphics/map_objects/pics/people/may/normal/15.png delete mode 100644 graphics/map_objects/pics/people/may/normal/16.png delete mode 100644 graphics/map_objects/pics/people/may/normal/17.png delete mode 100644 graphics/map_objects/pics/people/may/surfing/0.png delete mode 100644 graphics/map_objects/pics/people/may/surfing/1.png delete mode 100644 graphics/map_objects/pics/people/may/surfing/2.png delete mode 100644 graphics/map_objects/pics/people/may/surfing/3.png delete mode 100644 graphics/map_objects/pics/people/may/surfing/4.png delete mode 100644 graphics/map_objects/pics/people/may/surfing/5.png delete mode 100644 graphics/map_objects/pics/people/may/underwater/0.png delete mode 100644 graphics/map_objects/pics/people/may/underwater/1.png delete mode 100644 graphics/map_objects/pics/people/may/underwater/2.png delete mode 100644 graphics/map_objects/pics/people/may/underwater/3.png delete mode 100644 graphics/map_objects/pics/people/may/watering/0.png delete mode 100644 graphics/map_objects/pics/people/may/watering/1.png delete mode 100644 graphics/map_objects/pics/people/may/watering/2.png delete mode 100644 graphics/map_objects/pics/people/may/watering/3.png delete mode 100644 graphics/map_objects/pics/people/may/watering/4.png delete mode 100644 graphics/map_objects/pics/people/may/watering/5.png delete mode 100644 graphics/map_objects/pics/people/mom/0.png delete mode 100644 graphics/map_objects/pics/people/mom/1.png delete mode 100644 graphics/map_objects/pics/people/mom/2.png delete mode 100644 graphics/map_objects/pics/people/mom/3.png delete mode 100644 graphics/map_objects/pics/people/mom/4.png delete mode 100644 graphics/map_objects/pics/people/mom/5.png delete mode 100644 graphics/map_objects/pics/people/mom/6.png delete mode 100644 graphics/map_objects/pics/people/mom/7.png delete mode 100644 graphics/map_objects/pics/people/mom/8.png delete mode 100644 graphics/map_objects/pics/people/mystery_event_deliveryman/0.png delete mode 100644 graphics/map_objects/pics/people/mystery_event_deliveryman/1.png delete mode 100644 graphics/map_objects/pics/people/mystery_event_deliveryman/2.png delete mode 100644 graphics/map_objects/pics/people/noland/0.png delete mode 100644 graphics/map_objects/pics/people/noland/1.png delete mode 100644 graphics/map_objects/pics/people/noland/2.png delete mode 100644 graphics/map_objects/pics/people/noland/3.png delete mode 100644 graphics/map_objects/pics/people/noland/4.png delete mode 100644 graphics/map_objects/pics/people/noland/5.png delete mode 100644 graphics/map_objects/pics/people/noland/6.png delete mode 100644 graphics/map_objects/pics/people/noland/7.png delete mode 100644 graphics/map_objects/pics/people/noland/8.png delete mode 100644 graphics/map_objects/pics/people/norman/0.png delete mode 100644 graphics/map_objects/pics/people/norman/1.png delete mode 100644 graphics/map_objects/pics/people/norman/2.png delete mode 100644 graphics/map_objects/pics/people/norman/3.png delete mode 100644 graphics/map_objects/pics/people/norman/4.png delete mode 100644 graphics/map_objects/pics/people/norman/5.png delete mode 100644 graphics/map_objects/pics/people/norman/6.png delete mode 100644 graphics/map_objects/pics/people/norman/7.png delete mode 100644 graphics/map_objects/pics/people/norman/8.png delete mode 100644 graphics/map_objects/pics/people/nurse/0.png delete mode 100644 graphics/map_objects/pics/people/nurse/1.png delete mode 100644 graphics/map_objects/pics/people/nurse/2.png delete mode 100644 graphics/map_objects/pics/people/nurse/3.png delete mode 100644 graphics/map_objects/pics/people/old_man_1/0.png delete mode 100644 graphics/map_objects/pics/people/old_man_1/1.png delete mode 100644 graphics/map_objects/pics/people/old_man_1/2.png delete mode 100644 graphics/map_objects/pics/people/old_man_1/3.png delete mode 100644 graphics/map_objects/pics/people/old_man_1/4.png delete mode 100644 graphics/map_objects/pics/people/old_man_1/5.png delete mode 100644 graphics/map_objects/pics/people/old_man_1/6.png delete mode 100644 graphics/map_objects/pics/people/old_man_1/7.png delete mode 100644 graphics/map_objects/pics/people/old_man_1/8.png delete mode 100644 graphics/map_objects/pics/people/old_man_2/0.png delete mode 100644 graphics/map_objects/pics/people/old_man_2/1.png delete mode 100644 graphics/map_objects/pics/people/old_man_2/2.png delete mode 100644 graphics/map_objects/pics/people/old_woman_1/0.png delete mode 100644 graphics/map_objects/pics/people/old_woman_1/1.png delete mode 100644 graphics/map_objects/pics/people/old_woman_1/2.png delete mode 100644 graphics/map_objects/pics/people/old_woman_1/3.png delete mode 100644 graphics/map_objects/pics/people/old_woman_1/4.png delete mode 100644 graphics/map_objects/pics/people/old_woman_1/5.png delete mode 100644 graphics/map_objects/pics/people/old_woman_1/6.png delete mode 100644 graphics/map_objects/pics/people/old_woman_1/7.png delete mode 100644 graphics/map_objects/pics/people/old_woman_1/8.png delete mode 100644 graphics/map_objects/pics/people/old_woman_2/0.png delete mode 100644 graphics/map_objects/pics/people/old_woman_2/1.png delete mode 100644 graphics/map_objects/pics/people/old_woman_2/2.png delete mode 100644 graphics/map_objects/pics/people/old_woman_2/3.png delete mode 100644 graphics/map_objects/pics/people/old_woman_2/4.png delete mode 100644 graphics/map_objects/pics/people/old_woman_2/5.png delete mode 100644 graphics/map_objects/pics/people/old_woman_2/6.png delete mode 100644 graphics/map_objects/pics/people/old_woman_2/7.png delete mode 100644 graphics/map_objects/pics/people/old_woman_2/8.png delete mode 100644 graphics/map_objects/pics/people/phoebe/0.png delete mode 100644 graphics/map_objects/pics/people/phoebe/1.png delete mode 100644 graphics/map_objects/pics/people/phoebe/2.png delete mode 100644 graphics/map_objects/pics/people/picnicker/0.png delete mode 100644 graphics/map_objects/pics/people/picnicker/1.png delete mode 100644 graphics/map_objects/pics/people/picnicker/2.png delete mode 100644 graphics/map_objects/pics/people/picnicker/3.png delete mode 100644 graphics/map_objects/pics/people/picnicker/4.png delete mode 100644 graphics/map_objects/pics/people/picnicker/5.png delete mode 100644 graphics/map_objects/pics/people/picnicker/6.png delete mode 100644 graphics/map_objects/pics/people/picnicker/7.png delete mode 100644 graphics/map_objects/pics/people/picnicker/8.png delete mode 100644 graphics/map_objects/pics/people/prof_birch/0.png delete mode 100644 graphics/map_objects/pics/people/prof_birch/1.png delete mode 100644 graphics/map_objects/pics/people/prof_birch/2.png delete mode 100644 graphics/map_objects/pics/people/prof_birch/3.png delete mode 100644 graphics/map_objects/pics/people/prof_birch/4.png delete mode 100644 graphics/map_objects/pics/people/prof_birch/5.png delete mode 100644 graphics/map_objects/pics/people/prof_birch/6.png delete mode 100644 graphics/map_objects/pics/people/prof_birch/7.png delete mode 100644 graphics/map_objects/pics/people/prof_birch/8.png delete mode 100644 graphics/map_objects/pics/people/psychic_m/0.png delete mode 100644 graphics/map_objects/pics/people/psychic_m/1.png delete mode 100644 graphics/map_objects/pics/people/psychic_m/2.png delete mode 100644 graphics/map_objects/pics/people/psychic_m/3.png delete mode 100644 graphics/map_objects/pics/people/psychic_m/4.png delete mode 100644 graphics/map_objects/pics/people/psychic_m/5.png delete mode 100644 graphics/map_objects/pics/people/psychic_m/6.png delete mode 100644 graphics/map_objects/pics/people/psychic_m/7.png delete mode 100644 graphics/map_objects/pics/people/psychic_m/8.png delete mode 100644 graphics/map_objects/pics/people/quinty_plump/0.png delete mode 100644 graphics/map_objects/pics/people/quinty_plump/1.png delete mode 100644 graphics/map_objects/pics/people/quinty_plump/2.png delete mode 100644 graphics/map_objects/pics/people/quinty_plump/3.png delete mode 100644 graphics/map_objects/pics/people/quinty_plump/4.png delete mode 100644 graphics/map_objects/pics/people/quinty_plump/5.png delete mode 100644 graphics/map_objects/pics/people/quinty_plump/6.png delete mode 100644 graphics/map_objects/pics/people/red/0.png delete mode 100644 graphics/map_objects/pics/people/red/1.png delete mode 100644 graphics/map_objects/pics/people/red/2.png delete mode 100644 graphics/map_objects/pics/people/red/3.png delete mode 100644 graphics/map_objects/pics/people/red/4.png delete mode 100644 graphics/map_objects/pics/people/red/5.png delete mode 100644 graphics/map_objects/pics/people/red/6.png delete mode 100644 graphics/map_objects/pics/people/red/7.png delete mode 100644 graphics/map_objects/pics/people/red/8.png delete mode 100644 graphics/map_objects/pics/people/reporter_f/0.png delete mode 100644 graphics/map_objects/pics/people/reporter_f/1.png delete mode 100644 graphics/map_objects/pics/people/reporter_f/2.png delete mode 100644 graphics/map_objects/pics/people/reporter_f/3.png delete mode 100644 graphics/map_objects/pics/people/reporter_f/4.png delete mode 100644 graphics/map_objects/pics/people/reporter_f/5.png delete mode 100644 graphics/map_objects/pics/people/reporter_f/6.png delete mode 100644 graphics/map_objects/pics/people/reporter_f/7.png delete mode 100644 graphics/map_objects/pics/people/reporter_f/8.png delete mode 100644 graphics/map_objects/pics/people/reporter_m/0.png delete mode 100644 graphics/map_objects/pics/people/reporter_m/1.png delete mode 100644 graphics/map_objects/pics/people/reporter_m/2.png delete mode 100644 graphics/map_objects/pics/people/reporter_m/3.png delete mode 100644 graphics/map_objects/pics/people/reporter_m/4.png delete mode 100644 graphics/map_objects/pics/people/reporter_m/5.png delete mode 100644 graphics/map_objects/pics/people/reporter_m/6.png delete mode 100644 graphics/map_objects/pics/people/reporter_m/7.png delete mode 100644 graphics/map_objects/pics/people/reporter_m/8.png delete mode 100644 graphics/map_objects/pics/people/rooftop_sale_woman/0.png delete mode 100644 graphics/map_objects/pics/people/rooftop_sale_woman/1.png delete mode 100644 graphics/map_objects/pics/people/rooftop_sale_woman/2.png delete mode 100644 graphics/map_objects/pics/people/rooftop_sale_woman/3.png delete mode 100644 graphics/map_objects/pics/people/rooftop_sale_woman/4.png delete mode 100644 graphics/map_objects/pics/people/rooftop_sale_woman/5.png delete mode 100644 graphics/map_objects/pics/people/rooftop_sale_woman/6.png delete mode 100644 graphics/map_objects/pics/people/rooftop_sale_woman/7.png delete mode 100644 graphics/map_objects/pics/people/rooftop_sale_woman/8.png delete mode 100644 graphics/map_objects/pics/people/roxanne/0.png delete mode 100644 graphics/map_objects/pics/people/roxanne/1.png delete mode 100644 graphics/map_objects/pics/people/roxanne/2.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_brendan/00.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_brendan/01.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_brendan/02.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_brendan/03.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_brendan/04.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_brendan/05.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_brendan/06.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_brendan/07.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_brendan/08.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_brendan/09.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_brendan/10.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_brendan/11.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_brendan/12.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_brendan/13.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_brendan/14.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_brendan/15.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_brendan/16.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_brendan/17.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_little_boy/0.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_little_boy/1.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_little_boy/2.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_little_boy/3.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_little_boy/4.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_little_boy/5.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_little_boy/6.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_little_boy/7.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_little_boy/8.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_may/00.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_may/01.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_may/02.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_may/03.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_may/04.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_may/05.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_may/06.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_may/07.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_may/08.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_may/09.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_may/10.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_may/11.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_may/12.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_may/13.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_may/14.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_may/15.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_may/16.png delete mode 100644 graphics/map_objects/pics/people/ruby_sapphire_may/17.png delete mode 100644 graphics/map_objects/pics/people/running_triathlete_f/0.png delete mode 100644 graphics/map_objects/pics/people/running_triathlete_f/1.png delete mode 100644 graphics/map_objects/pics/people/running_triathlete_f/2.png delete mode 100644 graphics/map_objects/pics/people/running_triathlete_f/3.png delete mode 100644 graphics/map_objects/pics/people/running_triathlete_f/4.png delete mode 100644 graphics/map_objects/pics/people/running_triathlete_f/5.png delete mode 100644 graphics/map_objects/pics/people/running_triathlete_f/6.png delete mode 100644 graphics/map_objects/pics/people/running_triathlete_f/7.png delete mode 100644 graphics/map_objects/pics/people/running_triathlete_f/8.png delete mode 100644 graphics/map_objects/pics/people/running_triathlete_m/0.png delete mode 100644 graphics/map_objects/pics/people/running_triathlete_m/1.png delete mode 100644 graphics/map_objects/pics/people/running_triathlete_m/2.png delete mode 100644 graphics/map_objects/pics/people/running_triathlete_m/3.png delete mode 100644 graphics/map_objects/pics/people/running_triathlete_m/4.png delete mode 100644 graphics/map_objects/pics/people/running_triathlete_m/5.png delete mode 100644 graphics/map_objects/pics/people/running_triathlete_m/6.png delete mode 100644 graphics/map_objects/pics/people/running_triathlete_m/7.png delete mode 100644 graphics/map_objects/pics/people/running_triathlete_m/8.png delete mode 100644 graphics/map_objects/pics/people/sailor/0.png delete mode 100644 graphics/map_objects/pics/people/sailor/1.png delete mode 100644 graphics/map_objects/pics/people/sailor/2.png delete mode 100644 graphics/map_objects/pics/people/sailor/3.png delete mode 100644 graphics/map_objects/pics/people/sailor/4.png delete mode 100644 graphics/map_objects/pics/people/sailor/5.png delete mode 100644 graphics/map_objects/pics/people/sailor/6.png delete mode 100644 graphics/map_objects/pics/people/sailor/7.png delete mode 100644 graphics/map_objects/pics/people/sailor/8.png delete mode 100644 graphics/map_objects/pics/people/school_kid_m/0.png delete mode 100644 graphics/map_objects/pics/people/school_kid_m/1.png delete mode 100644 graphics/map_objects/pics/people/school_kid_m/2.png delete mode 100644 graphics/map_objects/pics/people/school_kid_m/3.png delete mode 100644 graphics/map_objects/pics/people/school_kid_m/4.png delete mode 100644 graphics/map_objects/pics/people/school_kid_m/5.png delete mode 100644 graphics/map_objects/pics/people/school_kid_m/6.png delete mode 100644 graphics/map_objects/pics/people/school_kid_m/7.png delete mode 100644 graphics/map_objects/pics/people/school_kid_m/8.png delete mode 100644 graphics/map_objects/pics/people/scientist_1/0.png delete mode 100644 graphics/map_objects/pics/people/scientist_1/1.png delete mode 100644 graphics/map_objects/pics/people/scientist_1/2.png delete mode 100644 graphics/map_objects/pics/people/scientist_1/3.png delete mode 100644 graphics/map_objects/pics/people/scientist_1/4.png delete mode 100644 graphics/map_objects/pics/people/scientist_1/5.png delete mode 100644 graphics/map_objects/pics/people/scientist_1/6.png delete mode 100644 graphics/map_objects/pics/people/scientist_1/7.png delete mode 100644 graphics/map_objects/pics/people/scientist_1/8.png delete mode 100644 graphics/map_objects/pics/people/scientist_2/0.png delete mode 100644 graphics/map_objects/pics/people/scientist_2/1.png delete mode 100644 graphics/map_objects/pics/people/scientist_2/2.png delete mode 100644 graphics/map_objects/pics/people/scientist_2/3.png delete mode 100644 graphics/map_objects/pics/people/scientist_2/4.png delete mode 100644 graphics/map_objects/pics/people/scientist_2/5.png delete mode 100644 graphics/map_objects/pics/people/scientist_2/6.png delete mode 100644 graphics/map_objects/pics/people/scientist_2/7.png delete mode 100644 graphics/map_objects/pics/people/scientist_2/8.png delete mode 100644 graphics/map_objects/pics/people/scott/0.png delete mode 100644 graphics/map_objects/pics/people/scott/1.png delete mode 100644 graphics/map_objects/pics/people/scott/2.png delete mode 100644 graphics/map_objects/pics/people/scott/3.png delete mode 100644 graphics/map_objects/pics/people/scott/4.png delete mode 100644 graphics/map_objects/pics/people/scott/5.png delete mode 100644 graphics/map_objects/pics/people/scott/6.png delete mode 100644 graphics/map_objects/pics/people/scott/7.png delete mode 100644 graphics/map_objects/pics/people/scott/8.png delete mode 100644 graphics/map_objects/pics/people/sidney/0.png delete mode 100644 graphics/map_objects/pics/people/sidney/1.png delete mode 100644 graphics/map_objects/pics/people/sidney/2.png delete mode 100644 graphics/map_objects/pics/people/spenser/0.png delete mode 100644 graphics/map_objects/pics/people/spenser/1.png delete mode 100644 graphics/map_objects/pics/people/spenser/2.png delete mode 100644 graphics/map_objects/pics/people/spenser/3.png delete mode 100644 graphics/map_objects/pics/people/spenser/4.png delete mode 100644 graphics/map_objects/pics/people/spenser/5.png delete mode 100644 graphics/map_objects/pics/people/spenser/6.png delete mode 100644 graphics/map_objects/pics/people/spenser/7.png delete mode 100644 graphics/map_objects/pics/people/spenser/8.png delete mode 100644 graphics/map_objects/pics/people/steven/0.png delete mode 100644 graphics/map_objects/pics/people/steven/1.png delete mode 100644 graphics/map_objects/pics/people/steven/2.png delete mode 100644 graphics/map_objects/pics/people/steven/3.png delete mode 100644 graphics/map_objects/pics/people/steven/4.png delete mode 100644 graphics/map_objects/pics/people/steven/5.png delete mode 100644 graphics/map_objects/pics/people/steven/6.png delete mode 100644 graphics/map_objects/pics/people/steven/7.png delete mode 100644 graphics/map_objects/pics/people/steven/8.png delete mode 100644 graphics/map_objects/pics/people/swimmer_f/0.png delete mode 100644 graphics/map_objects/pics/people/swimmer_f/1.png delete mode 100644 graphics/map_objects/pics/people/swimmer_f/2.png delete mode 100644 graphics/map_objects/pics/people/swimmer_f/3.png delete mode 100644 graphics/map_objects/pics/people/swimmer_f/4.png delete mode 100644 graphics/map_objects/pics/people/swimmer_f/5.png delete mode 100644 graphics/map_objects/pics/people/swimmer_f/6.png delete mode 100644 graphics/map_objects/pics/people/swimmer_f/7.png delete mode 100644 graphics/map_objects/pics/people/swimmer_f/8.png delete mode 100644 graphics/map_objects/pics/people/swimmer_m/0.png delete mode 100644 graphics/map_objects/pics/people/swimmer_m/1.png delete mode 100644 graphics/map_objects/pics/people/swimmer_m/2.png delete mode 100644 graphics/map_objects/pics/people/swimmer_m/3.png delete mode 100644 graphics/map_objects/pics/people/swimmer_m/4.png delete mode 100644 graphics/map_objects/pics/people/swimmer_m/5.png delete mode 100644 graphics/map_objects/pics/people/swimmer_m/6.png delete mode 100644 graphics/map_objects/pics/people/swimmer_m/7.png delete mode 100644 graphics/map_objects/pics/people/swimmer_m/8.png delete mode 100644 graphics/map_objects/pics/people/tate/0.png delete mode 100644 graphics/map_objects/pics/people/tate/1.png delete mode 100644 graphics/map_objects/pics/people/tate/2.png delete mode 100644 graphics/map_objects/pics/people/teala/0.png delete mode 100644 graphics/map_objects/pics/people/teala/1.png delete mode 100644 graphics/map_objects/pics/people/teala/2.png delete mode 100644 graphics/map_objects/pics/people/teala/3.png delete mode 100644 graphics/map_objects/pics/people/teala/4.png delete mode 100644 graphics/map_objects/pics/people/teala/5.png delete mode 100644 graphics/map_objects/pics/people/teala/6.png delete mode 100644 graphics/map_objects/pics/people/teala/7.png delete mode 100644 graphics/map_objects/pics/people/teala/8.png delete mode 100644 graphics/map_objects/pics/people/tuber_f/0.png delete mode 100644 graphics/map_objects/pics/people/tuber_f/1.png delete mode 100644 graphics/map_objects/pics/people/tuber_f/2.png delete mode 100644 graphics/map_objects/pics/people/tuber_f/3.png delete mode 100644 graphics/map_objects/pics/people/tuber_f/4.png delete mode 100644 graphics/map_objects/pics/people/tuber_f/5.png delete mode 100644 graphics/map_objects/pics/people/tuber_f/6.png delete mode 100644 graphics/map_objects/pics/people/tuber_f/7.png delete mode 100644 graphics/map_objects/pics/people/tuber_f/8.png delete mode 100644 graphics/map_objects/pics/people/tuber_m/0.png delete mode 100644 graphics/map_objects/pics/people/tuber_m/1.png delete mode 100644 graphics/map_objects/pics/people/tuber_m/2.png delete mode 100644 graphics/map_objects/pics/people/tuber_m/3.png delete mode 100644 graphics/map_objects/pics/people/tuber_m/4.png delete mode 100644 graphics/map_objects/pics/people/tuber_m/5.png delete mode 100644 graphics/map_objects/pics/people/tuber_m/6.png delete mode 100644 graphics/map_objects/pics/people/tuber_m/7.png delete mode 100644 graphics/map_objects/pics/people/tuber_m/8.png delete mode 100644 graphics/map_objects/pics/people/tuber_m_swimming/0.png delete mode 100644 graphics/map_objects/pics/people/tuber_m_swimming/1.png delete mode 100644 graphics/map_objects/pics/people/tuber_m_swimming/2.png delete mode 100644 graphics/map_objects/pics/people/tuber_m_swimming/3.png delete mode 100644 graphics/map_objects/pics/people/tuber_m_swimming/4.png delete mode 100644 graphics/map_objects/pics/people/tuber_m_swimming/5.png delete mode 100644 graphics/map_objects/pics/people/tuber_m_swimming/6.png delete mode 100644 graphics/map_objects/pics/people/tuber_m_swimming/7.png delete mode 100644 graphics/map_objects/pics/people/tuber_m_swimming/8.png delete mode 100644 graphics/map_objects/pics/people/tucker/0.png delete mode 100644 graphics/map_objects/pics/people/tucker/1.png delete mode 100644 graphics/map_objects/pics/people/tucker/2.png delete mode 100644 graphics/map_objects/pics/people/tucker/3.png delete mode 100644 graphics/map_objects/pics/people/tucker/4.png delete mode 100644 graphics/map_objects/pics/people/tucker/5.png delete mode 100644 graphics/map_objects/pics/people/tucker/6.png delete mode 100644 graphics/map_objects/pics/people/tucker/7.png delete mode 100644 graphics/map_objects/pics/people/tucker/8.png delete mode 100644 graphics/map_objects/pics/people/union_room_attendant/0.png delete mode 100644 graphics/map_objects/pics/people/union_room_attendant/1.png delete mode 100644 graphics/map_objects/pics/people/union_room_attendant/2.png delete mode 100644 graphics/map_objects/pics/people/unused_woman/0.png delete mode 100644 graphics/map_objects/pics/people/unused_woman/1.png delete mode 100644 graphics/map_objects/pics/people/unused_woman/2.png delete mode 100644 graphics/map_objects/pics/people/unused_woman/3.png delete mode 100644 graphics/map_objects/pics/people/unused_woman/4.png delete mode 100644 graphics/map_objects/pics/people/unused_woman/5.png delete mode 100644 graphics/map_objects/pics/people/unused_woman/6.png delete mode 100644 graphics/map_objects/pics/people/unused_woman/7.png delete mode 100644 graphics/map_objects/pics/people/unused_woman/8.png delete mode 100644 graphics/map_objects/pics/people/wallace/0.png delete mode 100644 graphics/map_objects/pics/people/wallace/1.png delete mode 100644 graphics/map_objects/pics/people/wallace/2.png delete mode 100644 graphics/map_objects/pics/people/wallace/3.png delete mode 100644 graphics/map_objects/pics/people/wallace/4.png delete mode 100644 graphics/map_objects/pics/people/wallace/5.png delete mode 100644 graphics/map_objects/pics/people/wallace/6.png delete mode 100644 graphics/map_objects/pics/people/wallace/7.png delete mode 100644 graphics/map_objects/pics/people/wallace/8.png delete mode 100644 graphics/map_objects/pics/people/wally/0.png delete mode 100644 graphics/map_objects/pics/people/wally/1.png delete mode 100644 graphics/map_objects/pics/people/wally/2.png delete mode 100644 graphics/map_objects/pics/people/wally/3.png delete mode 100644 graphics/map_objects/pics/people/wally/4.png delete mode 100644 graphics/map_objects/pics/people/wally/5.png delete mode 100644 graphics/map_objects/pics/people/wally/6.png delete mode 100644 graphics/map_objects/pics/people/wally/7.png delete mode 100644 graphics/map_objects/pics/people/wally/8.png delete mode 100644 graphics/map_objects/pics/people/wattson/0.png delete mode 100644 graphics/map_objects/pics/people/wattson/1.png delete mode 100644 graphics/map_objects/pics/people/wattson/2.png delete mode 100644 graphics/map_objects/pics/people/winona/0.png delete mode 100644 graphics/map_objects/pics/people/winona/1.png delete mode 100644 graphics/map_objects/pics/people/winona/2.png delete mode 100644 graphics/map_objects/pics/people/woman_1/0.png delete mode 100644 graphics/map_objects/pics/people/woman_1/1.png delete mode 100644 graphics/map_objects/pics/people/woman_1/2.png delete mode 100644 graphics/map_objects/pics/people/woman_1/3.png delete mode 100644 graphics/map_objects/pics/people/woman_1/4.png delete mode 100644 graphics/map_objects/pics/people/woman_1/5.png delete mode 100644 graphics/map_objects/pics/people/woman_1/6.png delete mode 100644 graphics/map_objects/pics/people/woman_1/7.png delete mode 100644 graphics/map_objects/pics/people/woman_1/8.png delete mode 100644 graphics/map_objects/pics/people/woman_2/0.png delete mode 100644 graphics/map_objects/pics/people/woman_2/1.png delete mode 100644 graphics/map_objects/pics/people/woman_2/2.png delete mode 100644 graphics/map_objects/pics/people/woman_2/3.png delete mode 100644 graphics/map_objects/pics/people/woman_2/4.png delete mode 100644 graphics/map_objects/pics/people/woman_2/5.png delete mode 100644 graphics/map_objects/pics/people/woman_2/6.png delete mode 100644 graphics/map_objects/pics/people/woman_2/7.png delete mode 100644 graphics/map_objects/pics/people/woman_2/8.png delete mode 100644 graphics/map_objects/pics/people/woman_3/0.png delete mode 100644 graphics/map_objects/pics/people/woman_3/1.png delete mode 100644 graphics/map_objects/pics/people/woman_3/2.png delete mode 100644 graphics/map_objects/pics/people/woman_3/3.png delete mode 100644 graphics/map_objects/pics/people/woman_3/4.png delete mode 100644 graphics/map_objects/pics/people/woman_3/5.png delete mode 100644 graphics/map_objects/pics/people/woman_3/6.png delete mode 100644 graphics/map_objects/pics/people/woman_3/7.png delete mode 100644 graphics/map_objects/pics/people/woman_3/8.png delete mode 100644 graphics/map_objects/pics/people/woman_4/0.png delete mode 100644 graphics/map_objects/pics/people/woman_4/1.png delete mode 100644 graphics/map_objects/pics/people/woman_4/2.png delete mode 100644 graphics/map_objects/pics/people/woman_4/3.png delete mode 100644 graphics/map_objects/pics/people/woman_4/4.png delete mode 100644 graphics/map_objects/pics/people/woman_4/5.png delete mode 100644 graphics/map_objects/pics/people/woman_4/6.png delete mode 100644 graphics/map_objects/pics/people/woman_4/7.png delete mode 100644 graphics/map_objects/pics/people/woman_4/8.png delete mode 100644 graphics/map_objects/pics/people/woman_5/0.png delete mode 100644 graphics/map_objects/pics/people/woman_5/1.png delete mode 100644 graphics/map_objects/pics/people/woman_5/2.png delete mode 100644 graphics/map_objects/pics/people/woman_5/3.png delete mode 100644 graphics/map_objects/pics/people/woman_5/4.png delete mode 100644 graphics/map_objects/pics/people/woman_5/5.png delete mode 100644 graphics/map_objects/pics/people/woman_5/6.png delete mode 100644 graphics/map_objects/pics/people/woman_5/7.png delete mode 100644 graphics/map_objects/pics/people/woman_5/8.png delete mode 100644 graphics/map_objects/pics/people/woman_6/0.png delete mode 100644 graphics/map_objects/pics/people/woman_6/1.png delete mode 100644 graphics/map_objects/pics/people/woman_6/2.png delete mode 100644 graphics/map_objects/pics/people/woman_6/3.png delete mode 100644 graphics/map_objects/pics/people/woman_6/4.png delete mode 100644 graphics/map_objects/pics/people/woman_6/5.png delete mode 100644 graphics/map_objects/pics/people/woman_6/6.png delete mode 100644 graphics/map_objects/pics/people/woman_6/7.png delete mode 100644 graphics/map_objects/pics/people/woman_6/8.png delete mode 100644 graphics/map_objects/pics/people/woman_7/0.png delete mode 100644 graphics/map_objects/pics/people/woman_7/1.png delete mode 100644 graphics/map_objects/pics/people/woman_7/2.png delete mode 100644 graphics/map_objects/pics/people/woman_7/3.png delete mode 100644 graphics/map_objects/pics/people/woman_7/4.png delete mode 100644 graphics/map_objects/pics/people/woman_7/5.png delete mode 100644 graphics/map_objects/pics/people/woman_7/6.png delete mode 100644 graphics/map_objects/pics/people/woman_7/7.png delete mode 100644 graphics/map_objects/pics/people/woman_7/8.png delete mode 100644 graphics/map_objects/pics/people/youngster/0.png delete mode 100644 graphics/map_objects/pics/people/youngster/1.png delete mode 100644 graphics/map_objects/pics/people/youngster/2.png delete mode 100644 graphics/map_objects/pics/people/youngster/3.png delete mode 100644 graphics/map_objects/pics/people/youngster/4.png delete mode 100644 graphics/map_objects/pics/people/youngster/5.png delete mode 100644 graphics/map_objects/pics/people/youngster/6.png delete mode 100644 graphics/map_objects/pics/people/youngster/7.png delete mode 100644 graphics/map_objects/pics/people/youngster/8.png delete mode 100644 graphics/map_objects/pics/pokemon/azumarill/0.png delete mode 100644 graphics/map_objects/pics/pokemon/azumarill/1.png delete mode 100644 graphics/map_objects/pics/pokemon/azumarill/2.png delete mode 100644 graphics/map_objects/pics/pokemon/azurill/0.png delete mode 100644 graphics/map_objects/pics/pokemon/azurill/1.png delete mode 100644 graphics/map_objects/pics/pokemon/azurill/2.png delete mode 100644 graphics/map_objects/pics/pokemon/deoxys/0.png delete mode 100644 graphics/map_objects/pics/pokemon/deoxys/1.png delete mode 100644 graphics/map_objects/pics/pokemon/dusclops/0.png delete mode 100644 graphics/map_objects/pics/pokemon/dusclops/1.png delete mode 100644 graphics/map_objects/pics/pokemon/dusclops/2.png delete mode 100644 graphics/map_objects/pics/pokemon/dusclops/3.png delete mode 100644 graphics/map_objects/pics/pokemon/dusclops/4.png delete mode 100644 graphics/map_objects/pics/pokemon/dusclops/5.png delete mode 100644 graphics/map_objects/pics/pokemon/dusclops/6.png delete mode 100644 graphics/map_objects/pics/pokemon/dusclops/7.png delete mode 100644 graphics/map_objects/pics/pokemon/dusclops/8.png delete mode 100644 graphics/map_objects/pics/pokemon/enemy_zigzagoon/0.png delete mode 100644 graphics/map_objects/pics/pokemon/enemy_zigzagoon/1.png delete mode 100644 graphics/map_objects/pics/pokemon/enemy_zigzagoon/2.png delete mode 100644 graphics/map_objects/pics/pokemon/enemy_zigzagoon/3.png delete mode 100644 graphics/map_objects/pics/pokemon/enemy_zigzagoon/4.png delete mode 100644 graphics/map_objects/pics/pokemon/enemy_zigzagoon/5.png delete mode 100644 graphics/map_objects/pics/pokemon/enemy_zigzagoon/6.png delete mode 100644 graphics/map_objects/pics/pokemon/enemy_zigzagoon/7.png delete mode 100644 graphics/map_objects/pics/pokemon/enemy_zigzagoon/8.png delete mode 100644 graphics/map_objects/pics/pokemon/groudon_front/0.png delete mode 100644 graphics/map_objects/pics/pokemon/groudon_front/1.png delete mode 100644 graphics/map_objects/pics/pokemon/groudon_side/0.png delete mode 100644 graphics/map_objects/pics/pokemon/groudon_side/1.png delete mode 100644 graphics/map_objects/pics/pokemon/ho_oh/0.png delete mode 100644 graphics/map_objects/pics/pokemon/ho_oh/1.png delete mode 100644 graphics/map_objects/pics/pokemon/kecleon/0.png delete mode 100644 graphics/map_objects/pics/pokemon/kecleon/1.png delete mode 100644 graphics/map_objects/pics/pokemon/kecleon/2.png delete mode 100644 graphics/map_objects/pics/pokemon/kirlia/0.png delete mode 100644 graphics/map_objects/pics/pokemon/kirlia/1.png delete mode 100644 graphics/map_objects/pics/pokemon/kirlia/2.png delete mode 100644 graphics/map_objects/pics/pokemon/kirlia/3.png delete mode 100644 graphics/map_objects/pics/pokemon/kirlia/4.png delete mode 100644 graphics/map_objects/pics/pokemon/kirlia/5.png delete mode 100644 graphics/map_objects/pics/pokemon/kirlia/6.png delete mode 100644 graphics/map_objects/pics/pokemon/kirlia/7.png delete mode 100644 graphics/map_objects/pics/pokemon/kirlia/8.png delete mode 100644 graphics/map_objects/pics/pokemon/kyogre_front/0.png delete mode 100644 graphics/map_objects/pics/pokemon/kyogre_front/1.png delete mode 100644 graphics/map_objects/pics/pokemon/kyogre_side/0.png delete mode 100644 graphics/map_objects/pics/pokemon/kyogre_side/1.png delete mode 100644 graphics/map_objects/pics/pokemon/latias_latios/0.png delete mode 100644 graphics/map_objects/pics/pokemon/latias_latios/1.png delete mode 100644 graphics/map_objects/pics/pokemon/latias_latios/2.png delete mode 100644 graphics/map_objects/pics/pokemon/lugia/0.png delete mode 100644 graphics/map_objects/pics/pokemon/lugia/1.png delete mode 100644 graphics/map_objects/pics/pokemon/mew/0.png delete mode 100644 graphics/map_objects/pics/pokemon/mew/1.png delete mode 100644 graphics/map_objects/pics/pokemon/mew/2.png delete mode 100644 graphics/map_objects/pics/pokemon/mew/3.png delete mode 100644 graphics/map_objects/pics/pokemon/mew/4.png delete mode 100644 graphics/map_objects/pics/pokemon/mew/5.png delete mode 100644 graphics/map_objects/pics/pokemon/mew/6.png delete mode 100644 graphics/map_objects/pics/pokemon/mew/7.png delete mode 100644 graphics/map_objects/pics/pokemon/mew/8.png delete mode 100644 graphics/map_objects/pics/pokemon/pikachu/0.png delete mode 100644 graphics/map_objects/pics/pokemon/pikachu/1.png delete mode 100644 graphics/map_objects/pics/pokemon/pikachu/2.png delete mode 100644 graphics/map_objects/pics/pokemon/poochyena/0.png delete mode 100644 graphics/map_objects/pics/pokemon/poochyena/1.png delete mode 100644 graphics/map_objects/pics/pokemon/poochyena/2.png delete mode 100644 graphics/map_objects/pics/pokemon/poochyena/3.png delete mode 100644 graphics/map_objects/pics/pokemon/poochyena/4.png delete mode 100644 graphics/map_objects/pics/pokemon/poochyena/5.png delete mode 100644 graphics/map_objects/pics/pokemon/poochyena/6.png delete mode 100644 graphics/map_objects/pics/pokemon/poochyena/7.png delete mode 100644 graphics/map_objects/pics/pokemon/poochyena/8.png delete mode 100644 graphics/map_objects/pics/pokemon/rayquaza/0.png delete mode 100644 graphics/map_objects/pics/pokemon/rayquaza/1.png delete mode 100644 graphics/map_objects/pics/pokemon/rayquaza/2.png delete mode 100644 graphics/map_objects/pics/pokemon/rayquaza/3.png delete mode 100644 graphics/map_objects/pics/pokemon/rayquaza/4.png delete mode 100644 graphics/map_objects/pics/pokemon/rayquaza_still.png delete mode 100644 graphics/map_objects/pics/pokemon/regi.png delete mode 100644 graphics/map_objects/pics/pokemon/skitty/0.png delete mode 100644 graphics/map_objects/pics/pokemon/skitty/1.png delete mode 100644 graphics/map_objects/pics/pokemon/skitty/2.png delete mode 100644 graphics/map_objects/pics/pokemon/sudowoodo/0.png delete mode 100644 graphics/map_objects/pics/pokemon/sudowoodo/1.png delete mode 100644 graphics/map_objects/pics/pokemon/sudowoodo/2.png delete mode 100644 graphics/map_objects/pics/pokemon/vigoroth_carrying_box/0.png delete mode 100644 graphics/map_objects/pics/pokemon/vigoroth_carrying_box/1.png delete mode 100644 graphics/map_objects/pics/pokemon/vigoroth_carrying_box/2.png delete mode 100644 graphics/map_objects/pics/pokemon/vigoroth_facing_away/0.png delete mode 100644 graphics/map_objects/pics/pokemon/vigoroth_facing_away/1.png delete mode 100644 graphics/map_objects/pics/pokemon/wingull/0.png delete mode 100644 graphics/map_objects/pics/pokemon/wingull/1.png delete mode 100644 graphics/map_objects/pics/pokemon/wingull/2.png delete mode 100644 graphics/map_objects/pics/pokemon/wingull/3.png delete mode 100644 graphics/map_objects/pics/pokemon/wingull/4.png delete mode 100644 graphics/map_objects/pics/pokemon/wingull/5.png delete mode 100644 graphics/map_objects/pics/pokemon/zigzagoon/0.png delete mode 100644 graphics/map_objects/pics/pokemon/zigzagoon/1.png delete mode 100644 graphics/map_objects/pics/pokemon/zigzagoon/2.png 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 create mode 100644 src/event_obj_lock.c delete mode 100644 src/map_obj_lock.c diff --git a/asm/battle_frontier_1.s b/asm/battle_frontier_1.s index 729140801..535bbbbbe 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 7f2dbcc73..c42d96640 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 bfb96cb9b..59245a1b2 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 7f2a7ca88..eb423cf4c 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 7e25c45da..ff10928cb 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 77f8213b3..08df3215c 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 f5acc1e3e..375177337 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 e35c768dd..5d5602b7f 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 852d5ce7c..6916fc6ea 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 8f1e198b8..702852445 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 2cc643547..00c8c8448 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 b7f03739a..14e418f1c 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 b241e3778..18a0cec88 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 a09d05323..b498da70d 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 32a265c97..c141e593c 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 ef73c3263..f1b28d906 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 8784ee047..228380e7b 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 b2bc10ebb..ddfab5eab 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 a2b3b906f..c3cf0f54d 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 637e658ce..8903de197 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 21a4370ce..27756e5a3 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 d22e24bde..67411fcf9 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 ac5f57a53..4791919f6 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 08846936a..e28a2ed5b 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 7e358ef75..fe9b6f7da 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 4627c4ab7..631b33746 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 667ab3876..a0bde74e3 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 4c418b286..d5b9f17d6 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 b62157d6f..c1b2f36b7 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 24f97a1ea..54ef390fd 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 148408aa9..e5899ef05 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 38a978c9b..af24f4b4a 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 fee53156b..029a59b41 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 d35c35ad0..657f912e3 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 ec84dfb77..3add19881 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 3f0429bf2..595d14b60 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 61b6e019d..9b3f387b1 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 09ebc903c..59605010f 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 6d8a8abe8..82da39a63 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 65ce8b684..48fd10c07 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 e9f54cb50..8d514f8a0 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 de03d5945..e1a0529fd 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 1314bbb40..b5fc13838 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 dc86a54b8..2b6f7f251 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 890d545ae..318ac3c49 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 2e6b8ecc7..1960c0d63 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 4580d0358..6def28528 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 c7c3a36d0..03e0a15e4 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 078882617..69c213606 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 7894ab85a..f2bca38c1 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 5e5a23fa4..63e7f2acd 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 aba4f907d..7d531b54b 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 eb56352ed..fccb4abff 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 79e4770ea..a6ca1adea 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 c9b46f8ca..af9677524 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 afab09840..2d8dcaa07 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 75d51fb28..a363801f0 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 083b877ab..c2f1e30bf 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 4f2a32d89..a4dbc6afa 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 35f6e6bca..2faa6a413 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 0292088de..3d2bb6127 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 748d86b6c..b00838290 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 c31e86ab6..0370b2a18 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 0655cea90..6349cd381 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 ae4e7c4b7..2076facee 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 cc8759d1d..a8e5f97f5 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 b2aa2b93f..be0db4f08 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 43cb50ddf..b4e6cc5eb 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 0420a702f..99aa3333c 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 ff96fc94f..7c478fabe 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 5ce69f2ee..969b54855 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 a99a7fcf0..3d7c53493 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 e6f2eef7d..7923af813 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 0a8974135..262744ce1 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 44d40453f..f9d9d408a 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 853f83ab7..81058b042 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 641723257..8984c44a0 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 fd9f2f522..4ea329ab9 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 f3c260243..0226b4fdb 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 790fb67a0..8b14a4a47 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 a8c8c59a7..4b7713426 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 ca836e2b5..dd35fcc43 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 0486f6283..766ee7626 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 65d2f2576..64ab2e226 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 9a71e2a0b..a3a0734f1 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 52a8d4911..dfcfdb451 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 bc90aa649..dc4ab38ee 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 013cd7be6..9e87c6b06 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 96dc118e5..b0ce15fb5 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 10b301d6c..08783200f 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 0a83a5441..a930160cb 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 599219cf1..a81c9b5e0 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 ef92bec9a..fe0d085bd 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 1d7e44f70..11abe791d 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 457d86314..1d6238e8f 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 e035d2f44..bb2d6036d 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 9c6cc18c6..148bb22a6 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 4a78cae40..2253dec67 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 cb5c06874..deb440ff9 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 3a4e95de9..8bb897125 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 e9a6b6477..8d7a8e460 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 f5af1fc3c..c4b6600ec 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 1990975c5..72b63dff3 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 b487372f6..901046cbc 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 c393ed795..f61966b88 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 437441e08..7098e6ed8 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 e5fbb81c1..269645dc6 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 2db37957d..761e321d6 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 7d97a2bc6..a8632b8c1 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 18ed3ebdb..0d75ef553 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 471bae1fc..dd09ad4a1 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 28491f59b..a758c4d73 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 d34c8082f..bbedf59d2 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 ee368c6e1..a19984ea2 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 499aad196..6b85a2fb0 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 9ff3d40cb..93d9a879e 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 28dab394b..e9fb7579c 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 bed082ccb..7c5842ab8 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 023ef7f0b..35bca7b85 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 6c0d25020..e261f185f 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 971236802..b3975685c 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 058c4c5af..d809bf493 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 a59da4c66..762db16f9 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 19421411e..e6c91a736 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 408ecf9db..6ddb7e9c9 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 cd321124f..27d98189e 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 6f13ca36e..d74eb9d8f 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 cd360a75f..3b68b1292 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 03ff20df1..517d32d53 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 7c25059bf..6b7e0f39d 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 6e3904b88..a06882772 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 d1eecfdef..abaae2d40 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 c54b42a6d..513097503 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 7be159493..1b788cbe2 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 d24c12520..a4050a5f6 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 3520e7249..b6bf34354 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 acb1e9471..df4877663 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 922e825c7..b6b8cfdce 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 e5a3f1ac4..c8f2356c4 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 1bad3837f..ed546c8df 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 f5981fcbe..7f4e67f33 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 ebc9467f4..7c484e9a9 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 eca46cd79..65b343202 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 3e888ec44..4cf23e63d 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 094852c5a..da1f94173 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 cc862fed1..5d970924d 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 0e16fc60c..658056768 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 a67522cb8..501cab67f 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 0c0c4adaa..af1f166ce 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 76b5ac368..9fa4c6376 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 82ae945b4..669728b66 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 db9c02f5e..5230cead9 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 11ed52f9a..8ebf9f16a 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 dc0acec14..53fc2b2cc 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 63aed18f8..c7578bec3 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 15501ebfd..c450b0cd3 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 6fc324f76..c6e900a18 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 e765a7390..d3e5374ff 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 dfc0d3bd0..60016ffbf 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 6c572ce4d..d9d6b469e 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 eb0ee1a96..7a234183d 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 10fb7f16e..ad7d79ac5 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 95c4daee0..29169a491 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 d51060bba..ff372e132 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 4b2f0f00c..ba97f6a98 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 f459b4764..85a6e871a 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 f2088e9d2..d12e31646 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 1edca4904..f4bef7d8b 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 2321844fa..36f9f50b2 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 05b36263a..f7b2e561b 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 9212c1e0e..ebf845f91 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 36b9b5ac2..297db7979 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 829db7b36..3e85e20a1 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 1b5f4bda5..3f89c8aa9 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 ba8988b96..741866843 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 024b56427..b8bd67368 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 886927d3e..427d8bc42 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 248ca948d..641c1bdd1 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 763391b09..7a2ed7c9f 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 6f6fc9df4..f97d49985 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 af470cca5..d7733b800 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 68bf13bcd..ccee2d442 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 4d26b70d7..40d0f45dc 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 cd004bcb7..7930d0f63 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 33a8a4aa0..d590a6c98 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 4ac6e0fde..eb2cca275 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 845da88b2..7d8fb6808 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 07a53f4fb..4d95b38c0 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 faeacbd12..f653cb151 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 386696d9c..b662de7d9 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 545eeea92..221775788 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 ad11733e1..b9f6bb020 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 c6da0eb61..6d89267c6 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 e8e3ef7be..0252834f4 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 1a84504f5..57e34caad 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 44ae41601..c493d4b8b 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 9b30d3119..1a1f241b5 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 5328de49f..a51483770 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 257d047cd..866c0c311 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 725e52ef3..b8b7ed7d6 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 9e5cb6e81..9e8de4b75 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 29ecbf043..76eb4f6dd 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 180b4f722..1a85565fa 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 e208273cf..454946506 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 e9f3d0db6..e66dda119 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 956965d5f..fe6a0f73f 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 1042dc803..4d07ff4c3 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 d048ecb5d..a5dfb9df9 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 c4477a44b..cbcb8b76f 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 ed9b4f660..a043926a7 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 57a717638..2a152d8f6 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 c83a09c5c..bddde5c81 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 08ab80348..e8e120c77 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 21c008770..5fec469e8 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 76245850f..923bbe86d 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 4a49376ba..c8bbd0a41 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 30e5d395c..17052105d 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 7eda9d522..13a189b51 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 4e2062365..8352fe02c 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 3de11be87..ac3bc8c7a 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 523088c40..4d9658312 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 5f026066a..e4eeb764d 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 deb754157..1c791072c 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 5270f92fd..aedb94c2f 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 86659ac47..d75442cd6 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 96dcae630..e52cd546b 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 2792fa422..1804f4615 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 f92f77965..ce7851f62 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 be6459981..b271e116c 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 5a6101968..a45d2ec2e 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 261721fb9..696d9ead3 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 6de1313e9..af7cffea3 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 eab9c8fc6..21102a474 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 695011311..34e93223f 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 a2d81c9c1..141fd04d4 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 2f2929eb5..6278db428 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 1a8edcbc6..93ffb8d72 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 c86bc109c..474487423 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 6a58118c8..57e963cd5 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 a6e424f27..65465578b 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 d520c6bcf..cbf3356a0 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 1667ccc87..b0df30af1 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 5f2c3b905..a60d8eedc 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 743395c72..26147f726 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 85d7c4f53..8f3292936 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 b552a566c..1d88d3be7 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 e078fc612..51cbaaa39 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 3a28af372..f67b4269e 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 2ae1cc480..26b9cf591 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 ad696f7ff..171790f56 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 2ee8771a0..bdd6d2da4 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 59ffd7eca..c078d6876 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 14ca86ab8..b6570b5e9 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 e5f1a1d3d..0413f795a 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 3395f43b4..5c940de5a 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 5506670c5..99312ac96 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 df04a0695..e7107f07a 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 5d6c10149..bb9b69f35 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 672abbbd4..ad9f6625d 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 aa8389e29..e942526ba 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 e128d9652..8b1551f09 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 0b1bae04a..cdd07bab1 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 2913f96c4..66a9e0edb 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 c643b364b..2088faf16 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 08f2390c0..2d6d7fe37 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 c27cff262..b7583aabd 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 ee4beeddd..866a894fa 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 8498a0f42..87d734ed4 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 340a3bd3f..61a4b521a 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 aab8c40c0..d1e85b36c 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 1e2332451..7ded7ed23 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 2b8e1571d..9dd5649fb 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 37d3065c5..23f896e4b 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 38e02b9ce..f988f9751 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 34ebbc229..62640ab29 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 a87df306b..c6a31119f 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 002ad0532..40da83bb8 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 92f2bad01..ed03f5d79 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 c3070fafe..0097717fa 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 79731353c..b6e4b2f07 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 801448b12..7ae53cdad 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 d08169a76..a36e7cd72 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 8da2bab85..39ee27853 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 5d942affa..2e44e5b74 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 9c79e2c52..bfd09e58e 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 05510b62d..3cb500bdc 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 402b6e180..bd7567d81 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 56bd16935..e2b26846e 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 e1f001aad..e33f6cb77 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 f1d07a671..4d5376cce 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 0191f8578..85d84324c 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 800af012c..1a7b58289 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 e20e9c54c..ef9ad911a 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 3fb19d06e..5521303f7 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 c6e493c73..1182d95f2 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 e59081620..63924166c 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 a28f44e92..25bc3891c 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 bc159312e..da8f9c1a0 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 5b0e89239..4478507ae 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 e9625991f..363c2132f 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 40e1e4b70..73ba40dd2 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 e78006b3c..96db2d944 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 7033c505a..38c35b40a 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 01a53d75a..6fa459ac6 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 3a68ca865..0f838709c 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 6206e713f..6f227115c 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 b58fe4858..ec6ced043 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 258571e17..39bb6123c 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 cb60786c0..0521a0592 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 cbe15cac1..719dc55c7 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 6f40347e9..8cd919a63 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 43c364e8d..1916f36b7 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 1211044f2..30fa1f18f 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 e8bfd1a5f..f6d4a71a5 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 7a486263e..b72a1d629 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 b48c8c4a2..e9efddf20 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 38ac3513c..297b9eeb2 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 d5bd41cbd..470fa9880 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 0f37a4c70..b66f47867 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 3e1287b7d..825c6fc65 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 c6cb4ac3b..6249ca026 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 6905f533f..6beb27ba5 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 26a0c1a11..3efb9fac7 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 1e779cb1e..bbed60478 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 5a92ba2fc..034c44aa3 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 a84456e44..f19ab8110 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 ec2d22707..8422ef37a 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 93185e0fd..66786ea5b 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 0fa012eda..e56741b49 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 937d1afb9..f31acb8b6 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 2ea886e54..3bed978e8 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 44c5bc37a..16f9aa3ea 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 dc395c064..d17c42d67 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 eee616f8a..d07456dc9 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 b4a00970f..5d45c64d0 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 09cf245e0..61a528cdc 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 28b614d47..e177ee10a 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 9c44870ad..56dd4ef83 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 71defda3d..f9e00e26c 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 3facee89a..ac0160e7b 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 94846323a..5c2a214b9 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 5d6d73288..1816412d6 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 0ce76cf29..e135eceae 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 81648162b..14aadda5f 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 e8ace6482..d11d31fe9 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 84505d6e6..233b55da0 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 64152d008..41c2fe198 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 863c3113a..1ab278781 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 4a0ead84c..c1e293e6f 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 3970e6eb0..61e6b93fe 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 9edb33ddb..eda3552eb 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 f5c878466..313423b51 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 3a41757e2..1118c0ab3 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 4a219357c..31fbb7d86 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 cf0c2dfad..608b45e50 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 964b45a6d..f7c919131 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 79d57dd72..3b7f6f2ee 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 b88a862ab..4fd74a9c7 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 7fd65fc08..65a1da014 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 bcd27d030..8c203021c 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 eb92a3851..301779af5 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 e2db7471f..f919cfae0 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 cc5606ac4..ba2b28eb1 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 0efdf765d..cc79f44be 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 7755a5a09..e937ac1f4 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 37a1387bf..d3885cb0d 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 14c9905a2..c0ec35e37 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 543cb0072..de9250cbb 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 ebc15ecd7..aa664f45c 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 ef7958e9a..956e3b03b 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 65dc43026..dfdbec94c 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 274a459cd..b485d0ad9 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 e20d76bc2..545426eea 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 23d023b31..0adb6b76d 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 5fe624dc3..b8f4d4ed4 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 ad432f6ff..679b313d5 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 149d5dea3..402081450 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 16037e22f..ddfbf094c 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 6fbd60683..a13916bc7 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 4032d668a..4511b236c 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 7d604b093..6fc02d447 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 592595aa8..646176740 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 bd1f69b1a..32b71c477 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 fe52f12bb..187d0dff9 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 b19a293ef..dda65b0fe 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 a02a20864..809fb146c 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 8fe34709b..4d48e1aab 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 384b6570f..d3484961e 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 6592f68d7..556524f05 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 ad8a393d6..382cafe16 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 70a9c5c21..78991499c 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 8abe8401f..792f350b8 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 a187aaf1f..c429ae7f5 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 8c13a223a..f22969d2a 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 acd0f732c..6b45c8e26 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 7b0f10331..3368d1ba2 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 307cfd1c2..b7a767f3c 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 d5151a0a1..96bf5fba9 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 f77f34456..4bd43a5d4 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 bab6768de..c952cf34e 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 1ae29ed6f..9f97d892d 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 5c3f7108d..4bad8a43d 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 52f406b71..4a6335695 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 cd9f74d39..43938e550 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 ba18519ef..db5a8b97c 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 07e93e516..6169dad1b 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 d43e45568..8224ed8ff 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 6f3bb0111..acb70f285 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 b348cebcf..60e02f3fb 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 9e0dcbadd..1d490490d 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 b7eb626e0..eaaf2d334 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 98b1b6712..d00a1fa5f 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 eaf48fd6e..b6407478c 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 eb41cbafb..223cc4f0d 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 5bffec912..66a804c1a 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 5f0f5d430..2c27b4ef2 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 3a18508a2..fbbbc5579 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 0dcb79d1b..ffd6fe203 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 de29f556b..30ff85620 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 69865a2aa..f6efd8225 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 2a02e72f2..faec348c2 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 669ce88ae..afb2d586b 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 d063a7666..21be152fa 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 7c6bc4128..11cc35658 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 a304f1832..6a89414b2 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 0e3c0f0bb..88dbdf09a 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 dea4f52c3..25dbd3139 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 873495876..0a84d3b51 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 a5574755b..832ab5838 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 4f48ef724..1ae00b9a2 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 b284db78f..0bf82c217 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 be9b40243..c79b11f5d 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 0fcbef3a3..975f08470 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 7738701b2..c30969657 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 0db3fc920..20597089a 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 7ec4cee10..539cf8b11 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 d6b5818da..3f5ea9c68 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 2441d8d41..03cf2de7a 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 803f9f666..0f37fe20b 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 6d6ca6a5d..551126235 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 9534ca9c7..d17513fd5 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 2649066d8..4fcbd0e08 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 2089da649..070092679 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 db3554ed4..511782688 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 6c57f0662..b251959ae 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 09fdb466f..5e702c0c3 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 2828036e0..1fda1133f 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 269ef2530..0cf683bb8 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 3461f8275..bcaa7dfe1 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 d071639f8..05cee99b9 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 03b7928aa..fb76a5fc7 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 6193a092e..c05d32088 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 a652c7897..a2ea5ed1d 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 793b6f4fd..6dac80f4b 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 b7d4e101c..f78f938ca 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 39cca8244..9d4aa80b6 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 1fa17b908..939995150 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/event_objects/palettes/field_effect_object_palette_00.pal b/graphics/event_objects/palettes/field_effect_object_palette_00.pal new file mode 100644 index 000000000..bbc9c778b --- /dev/null +++ b/graphics/event_objects/palettes/field_effect_object_palette_00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 172 238 +246 230 197 +238 213 180 +222 180 148 +255 255 255 +222 230 238 +189 205 230 +156 180 222 +98 156 180 +255 189 230 +0 0 0 +238 230 164 +222 205 131 +213 180 106 +205 156 82 +0 0 0 diff --git a/graphics/event_objects/palettes/field_effect_object_palette_01.pal b/graphics/event_objects/palettes/field_effect_object_palette_01.pal new file mode 100644 index 000000000..044e1c987 --- /dev/null +++ b/graphics/event_objects/palettes/field_effect_object_palette_01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 189 238 +180 255 131 +131 197 98 +57 139 49 +74 90 8 +49 65 0 +98 172 238 +98 172 197 +139 205 246 +148 230 255 +148 131 98 +180 172 148 +164 213 197 +115 197 164 +65 180 131 +24 164 106 diff --git a/graphics/event_objects/palettes/field_effect_object_palette_02.pal b/graphics/event_objects/palettes/field_effect_object_palette_02.pal new file mode 100644 index 000000000..e3a76c035 --- /dev/null +++ b/graphics/event_objects/palettes/field_effect_object_palette_02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +98 98 98 +213 213 139 +172 172 90 +139 139 65 +230 246 205 +189 238 180 +131 222 180 +98 172 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/event_objects/palettes/field_effect_object_palette_03.pal b/graphics/event_objects/palettes/field_effect_object_palette_03.pal new file mode 100644 index 000000000..b170eb1f5 --- /dev/null +++ b/graphics/event_objects/palettes/field_effect_object_palette_03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 172 74 +255 255 255 +205 246 255 +156 213 255 +74 197 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/event_objects/palettes/field_effect_object_palette_04.pal b/graphics/event_objects/palettes/field_effect_object_palette_04.pal new file mode 100644 index 000000000..2dddefa5f --- /dev/null +++ b/graphics/event_objects/palettes/field_effect_object_palette_04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +156 180 172 +106 115 115 +57 57 57 +156 24 24 +255 0 0 +255 123 123 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/event_objects/palettes/field_effect_object_palette_05.pal b/graphics/event_objects/palettes/field_effect_object_palette_05.pal new file mode 100644 index 000000000..468d7212c --- /dev/null +++ b/graphics/event_objects/palettes/field_effect_object_palette_05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +49 57 74 +172 164 255 +131 123 230 +106 98 172 +82 74 180 +82 74 98 +246 255 255 +115 172 65 +123 189 74 +148 205 90 +98 90 148 +139 156 213 +57 57 106 +148 205 90 +0 255 0 diff --git a/graphics/event_objects/palettes/field_effect_object_palette_06.pal b/graphics/event_objects/palettes/field_effect_object_palette_06.pal new file mode 100644 index 000000000..e4a49a4b9 --- /dev/null +++ b/graphics/event_objects/palettes/field_effect_object_palette_06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +180 255 82 +98 205 8 +41 115 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/event_objects/palettes/field_effect_object_palette_07.pal b/graphics/event_objects/palettes/field_effect_object_palette_07.pal new file mode 100644 index 000000000..6d9e03c67 --- /dev/null +++ b/graphics/event_objects/palettes/field_effect_object_palette_07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +213 213 213 +189 189 189 +164 164 164 +131 131 139 +0 0 0 +0 0 0 +0 0 0 +238 213 205 +222 180 164 +189 148 139 +156 115 115 +131 90 90 +98 65 82 +0 0 0 diff --git a/graphics/event_objects/palettes/field_effect_object_palette_08.pal b/graphics/event_objects/palettes/field_effect_object_palette_08.pal new file mode 100644 index 000000000..4c41030f6 --- /dev/null +++ b/graphics/event_objects/palettes/field_effect_object_palette_08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +24 41 82 +180 255 131 +131 197 98 +57 139 49 +57 82 0 +222 148 115 +106 90 90 +164 98 90 +65 57 49 +255 197 148 +222 106 98 +205 65 82 +164 213 197 +115 197 164 +65 180 131 +24 164 106 diff --git a/graphics/event_objects/palettes/field_effect_object_palette_10.pal b/graphics/event_objects/palettes/field_effect_object_palette_10.pal new file mode 100644 index 000000000..6190709ed --- /dev/null +++ b/graphics/event_objects/palettes/field_effect_object_palette_10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 172 238 +246 8 0 +238 213 180 +222 180 148 +255 255 255 +222 230 238 +189 205 230 +156 180 222 +98 156 180 +148 0 0 +197 197 197 +238 230 164 +222 205 131 +213 180 106 +205 156 82 +0 0 0 diff --git a/graphics/event_objects/palettes/field_object_palette_00.pal b/graphics/event_objects/palettes/field_object_palette_00.pal new file mode 100644 index 000000000..7bb5bd9ed --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 213 180 +255 197 148 +222 148 115 +123 65 65 +255 164 180 +213 106 123 +139 65 82 +148 197 246 +90 139 189 +16 49 82 +180 164 98 +123 115 65 +57 57 24 +255 255 255 +0 0 0 diff --git a/graphics/event_objects/palettes/field_object_palette_01.pal b/graphics/event_objects/palettes/field_object_palette_01.pal new file mode 100644 index 000000000..558095bda --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 213 180 +255 197 148 +222 148 115 +123 65 65 +255 213 32 +222 156 16 +106 57 8 +230 82 98 +197 0 49 +98 0 24 +156 98 74 +106 49 49 +49 0 24 +255 255 255 +0 0 0 diff --git a/graphics/event_objects/palettes/field_object_palette_02.pal b/graphics/event_objects/palettes/field_object_palette_02.pal new file mode 100644 index 000000000..b84930395 --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 213 180 +255 197 148 +222 148 115 +123 65 65 +205 205 222 +156 156 189 +74 74 123 +115 189 0 +65 123 0 +16 57 0 +205 98 74 +148 57 41 +82 16 0 +255 255 255 +0 0 0 diff --git a/graphics/event_objects/palettes/field_object_palette_03.pal b/graphics/event_objects/palettes/field_object_palette_03.pal new file mode 100644 index 000000000..6c53450ba --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 213 180 +255 197 148 +222 148 115 +123 65 65 +106 139 172 +57 74 98 +8 16 32 +213 115 164 +164 65 115 +82 32 65 +213 213 213 +139 139 148 +65 65 82 +255 255 255 +0 0 0 diff --git a/graphics/event_objects/palettes/field_object_palette_04.pal b/graphics/event_objects/palettes/field_object_palette_04.pal new file mode 100644 index 000000000..82c5ff3a1 --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 172 238 +255 255 255 +255 255 230 +255 230 197 +205 148 148 +255 222 238 +255 197 213 +255 164 180 +205 255 255 +180 230 255 +148 197 246 +213 197 131 +197 180 123 +180 172 123 +255 255 255 +115 131 148 diff --git a/graphics/event_objects/palettes/field_object_palette_05.pal b/graphics/event_objects/palettes/field_object_palette_05.pal new file mode 100644 index 000000000..72ae3cefb --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 172 238 +255 255 255 +255 255 230 +255 230 197 +205 148 148 +255 255 90 +255 238 65 +213 197 57 +255 139 156 +246 115 131 +230 82 98 +213 156 131 +189 131 106 +156 98 74 +255 255 255 +115 131 148 diff --git a/graphics/event_objects/palettes/field_object_palette_06.pal b/graphics/event_objects/palettes/field_object_palette_06.pal new file mode 100644 index 000000000..168a1329d --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 172 238 +255 255 255 +255 255 230 +255 230 197 +205 148 148 +255 255 255 +238 238 246 +205 205 222 +139 189 139 +115 164 115 +115 189 0 +255 156 131 +238 131 106 +205 98 74 +255 255 255 +115 131 148 diff --git a/graphics/event_objects/palettes/field_object_palette_07.pal b/graphics/event_objects/palettes/field_object_palette_07.pal new file mode 100644 index 000000000..0e604b73c --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 172 238 +255 255 255 +255 255 230 +255 230 197 +205 148 148 +156 172 222 +139 156 197 +123 139 172 +255 156 213 +230 131 189 +213 115 164 +189 189 189 +164 164 164 +139 139 148 +255 255 255 +115 131 148 diff --git a/graphics/event_objects/palettes/field_object_palette_08.pal b/graphics/event_objects/palettes/field_object_palette_08.pal new file mode 100644 index 000000000..a83ed903f --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 213 180 +255 197 148 +222 148 115 +123 65 65 +57 74 123 +41 57 98 +24 41 82 +16 32 57 +222 230 238 +115 205 115 +74 148 82 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/event_objects/palettes/field_object_palette_09.pal b/graphics/event_objects/palettes/field_object_palette_09.pal new file mode 100644 index 000000000..6a6bf4d12 --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 230 230 +255 238 213 +255 213 213 +238 180 180 +172 156 164 +164 164 180 +106 123 148 +106 123 148 +123 131 131 +238 238 255 +164 246 156 +123 205 123 +255 156 156 +230 123 139 +255 255 255 +106 115 106 diff --git a/graphics/event_objects/palettes/field_object_palette_10.pal b/graphics/event_objects/palettes/field_object_palette_10.pal new file mode 100644 index 000000000..0cebd6c4d --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 diff --git a/graphics/event_objects/palettes/field_object_palette_11.pal b/graphics/event_objects/palettes/field_object_palette_11.pal new file mode 100644 index 000000000..b28799ed8 --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +222 164 148 +205 131 115 +123 90 82 +98 123 156 +74 90 131 +49 65 106 +24 41 82 +131 164 197 +255 197 90 +189 156 90 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/event_objects/palettes/field_object_palette_12.pal b/graphics/event_objects/palettes/field_object_palette_12.pal new file mode 100644 index 000000000..b36c29ab1 --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +41 41 32 +41 41 41 +90 90 82 +139 139 115 +180 180 164 +213 156 16 +238 197 16 +255 222 98 +0 90 197 +0 131 238 +156 180 205 +213 230 238 +255 255 255 +0 139 0 +0 205 0 diff --git a/graphics/event_objects/palettes/field_object_palette_13.pal b/graphics/event_objects/palettes/field_object_palette_13.pal new file mode 100644 index 000000000..b69e9ac0a --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +139 139 131 +139 139 139 +189 189 180 +238 238 213 +255 255 255 +255 255 115 +255 255 115 +255 255 197 +98 189 255 +98 230 255 +255 255 255 +255 255 255 +255 255 255 +98 238 98 +98 255 98 diff --git a/graphics/event_objects/palettes/field_object_palette_14.pal b/graphics/event_objects/palettes/field_object_palette_14.pal new file mode 100644 index 000000000..c53a4d815 --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +131 189 98 +131 189 98 +131 189 98 +131 189 98 +222 230 238 +164 172 197 +106 123 156 +57 74 123 +90 164 255 +90 98 255 +65 65 197 +65 65 123 +49 49 82 +255 255 255 +0 0 0 diff --git a/graphics/event_objects/palettes/field_object_palette_15.pal b/graphics/event_objects/palettes/field_object_palette_15.pal new file mode 100644 index 000000000..0026c6f69 --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +238 238 238 +205 205 189 +172 172 139 +115 106 74 +164 164 156 +139 139 131 +115 123 115 +49 49 57 +213 213 230 +230 189 148 +180 123 90 +213 65 65 +139 74 82 +255 255 255 +0 0 0 diff --git a/graphics/event_objects/palettes/field_object_palette_16.pal b/graphics/event_objects/palettes/field_object_palette_16.pal new file mode 100644 index 000000000..ec3c07f20 --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_16.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 164 +205 131 115 +123 90 82 +148 139 156 +115 106 123 +57 65 82 +41 41 57 +222 230 238 +255 197 90 +172 123 90 +197 65 65 +139 49 65 +255 255 255 +0 0 0 diff --git a/graphics/event_objects/palettes/field_object_palette_17.pal b/graphics/event_objects/palettes/field_object_palette_17.pal new file mode 100644 index 000000000..2833b2613 --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_17.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +222 164 148 +205 131 115 +123 90 82 +98 98 115 +41 57 65 +164 106 82 +74 49 57 +205 205 222 +106 213 65 +65 172 32 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/event_objects/palettes/field_object_palette_18.pal b/graphics/event_objects/palettes/field_object_palette_18.pal new file mode 100644 index 000000000..78b1c89b6 --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_18.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 230 230 +255 238 213 +255 213 213 +238 180 180 +172 156 164 +131 131 180 +74 90 131 +197 139 148 +106 82 123 +238 238 255 +164 246 156 +123 205 123 +255 156 156 +230 123 139 +255 255 255 +106 115 106 diff --git a/graphics/event_objects/palettes/field_object_palette_19.pal b/graphics/event_objects/palettes/field_object_palette_19.pal new file mode 100644 index 000000000..53de0c383 --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_19.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +131 131 148 +115 115 131 +98 98 131 +255 255 255 +255 0 255 +57 57 49 +65 74 106 +41 49 90 +222 222 238 +189 189 213 +156 156 172 +189 148 139 +156 115 115 +98 98 106 +0 0 0 diff --git a/graphics/event_objects/palettes/field_object_palette_20.pal b/graphics/event_objects/palettes/field_object_palette_20.pal new file mode 100644 index 000000000..64985f6da --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_20.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +164 222 222 +98 139 139 +139 180 180 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +139 205 246 +98 172 238 +255 255 148 +238 213 82 +213 172 16 +180 106 0 +139 65 0 diff --git a/graphics/event_objects/palettes/field_object_palette_21.pal b/graphics/event_objects/palettes/field_object_palette_21.pal new file mode 100644 index 000000000..5e68e105d --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_21.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 123 197 +238 246 255 +222 230 238 +189 205 230 +156 164 189 +139 139 156 +98 98 123 +65 74 106 +197 98 98 +172 65 106 +0 0 0 +197 148 0 +246 213 24 +0 0 0 +0 0 0 +74 106 139 diff --git a/graphics/event_objects/palettes/field_object_palette_22.pal b/graphics/event_objects/palettes/field_object_palette_22.pal new file mode 100644 index 000000000..21fa9999d --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_22.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +213 213 213 +197 197 197 +156 156 156 +82 82 82 +164 164 164 +74 74 74 +16 16 16 +164 164 164 +115 115 115 +57 57 57 +213 213 213 +131 131 131 +65 65 65 +255 255 255 +0 0 0 diff --git a/graphics/event_objects/palettes/field_object_palette_23.pal b/graphics/event_objects/palettes/field_object_palette_23.pal new file mode 100644 index 000000000..73b0b1d41 --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_23.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +213 213 246 +197 197 230 +156 156 189 +82 82 115 +164 164 197 +74 74 106 +16 16 49 +164 164 197 +115 115 148 +57 57 90 +213 213 246 +131 131 164 +65 65 98 +255 255 255 +0 0 32 diff --git a/graphics/event_objects/palettes/field_object_palette_24.pal b/graphics/event_objects/palettes/field_object_palette_24.pal new file mode 100644 index 000000000..d710b6830 --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_24.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +213 213 222 +197 197 197 +156 156 156 +82 82 82 +164 164 164 +131 131 131 +57 57 57 +131 131 131 +82 82 82 +41 41 41 +106 106 106 +74 74 74 +24 24 24 +255 255 255 +0 0 0 diff --git a/graphics/event_objects/palettes/field_object_palette_25.pal b/graphics/event_objects/palettes/field_object_palette_25.pal new file mode 100644 index 000000000..f48038d41 --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_25.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +213 213 255 +197 197 230 +156 156 189 +82 82 115 +164 164 197 +131 131 164 +57 57 90 +131 131 164 +82 82 115 +41 41 74 +106 106 139 +74 74 106 +24 24 57 +255 255 255 +0 0 32 diff --git a/graphics/event_objects/palettes/field_object_palette_26.pal b/graphics/event_objects/palettes/field_object_palette_26.pal new file mode 100644 index 000000000..fe4c1c112 --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_26.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 123 197 +255 255 255 +222 230 238 +189 205 230 +156 164 189 +139 139 156 +98 98 123 +65 74 106 +197 98 98 +172 65 106 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +74 180 230 diff --git a/graphics/event_objects/palettes/field_object_palette_27.pal b/graphics/event_objects/palettes/field_object_palette_27.pal new file mode 100644 index 000000000..5ce2f4728 --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_27.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +222 164 148 +205 131 115 +123 90 82 +148 139 156 +115 106 123 +57 65 82 +41 41 57 +222 230 238 +255 197 90 +172 123 90 +197 65 65 +139 49 65 +255 255 255 +0 0 0 diff --git a/graphics/event_objects/palettes/field_object_palette_28.pal b/graphics/event_objects/palettes/field_object_palette_28.pal new file mode 100644 index 000000000..eb9930c05 --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_28.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 213 197 +255 197 148 +222 148 115 +172 106 90 +255 106 74 +197 57 57 +131 65 65 +115 164 197 +57 57 123 +255 222 90 +189 156 57 +213 213 230 +180 180 213 +255 255 255 +0 0 0 diff --git a/graphics/event_objects/palettes/field_object_palette_29.pal b/graphics/event_objects/palettes/field_object_palette_29.pal new file mode 100644 index 000000000..a69caf9df --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_29.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +246 139 115 +205 98 74 +180 82 57 +106 57 0 +123 205 197 +82 131 123 +32 65 57 +197 139 238 +148 82 172 +0 0 0 +0 0 0 +0 0 0 +74 74 74 +255 255 255 +0 0 0 diff --git a/graphics/event_objects/palettes/field_object_palette_30.pal b/graphics/event_objects/palettes/field_object_palette_30.pal new file mode 100644 index 000000000..d90c4cb38 --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_30.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +180 180 180 +148 148 148 +90 90 98 +57 57 74 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +222 222 222 +0 0 0 diff --git a/graphics/event_objects/palettes/field_object_palette_31.pal b/graphics/event_objects/palettes/field_object_palette_31.pal new file mode 100644 index 000000000..c62e8ce06 --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_31.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 213 180 +246 189 148 +222 148 115 +123 65 65 +255 222 74 +213 172 32 +131 98 0 +164 139 238 +106 82 189 +65 57 98 +238 115 65 +172 65 57 +74 49 49 +255 255 255 +0 0 0 diff --git a/graphics/event_objects/palettes/field_object_palette_32.pal b/graphics/event_objects/palettes/field_object_palette_32.pal new file mode 100644 index 000000000..e245ba013 --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_32.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 213 180 +246 189 148 +222 148 115 +123 65 65 +255 164 180 +213 106 123 +139 65 82 +148 197 238 +98 131 205 +57 57 74 +197 197 213 +139 139 148 +74 74 90 +255 255 255 +0 0 0 diff --git a/graphics/event_objects/palettes/field_object_palette_33.pal b/graphics/event_objects/palettes/field_object_palette_33.pal new file mode 100644 index 000000000..e7717d74e --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_33.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 213 180 +255 197 148 +222 148 115 +123 65 65 +57 74 123 +41 57 98 +24 41 82 +16 32 57 +222 230 238 +255 197 90 +189 156 90 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/event_objects/palettes/field_object_palette_34.pal b/graphics/event_objects/palettes/field_object_palette_34.pal new file mode 100644 index 000000000..e106ce693 --- /dev/null +++ b/graphics/event_objects/palettes/field_object_palette_34.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +222 164 148 +205 131 115 +123 90 82 +98 98 115 +41 57 65 +164 106 82 +74 49 57 +205 205 222 +255 197 90 +189 156 90 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/event_objects/palettes/unused_palette.pal b/graphics/event_objects/palettes/unused_palette.pal new file mode 100644 index 000000000..aeb04ccf8 --- /dev/null +++ b/graphics/event_objects/palettes/unused_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 255 255 +255 197 213 +238 164 180 +156 123 148 +131 131 180 +74 90 131 +197 139 148 +106 82 123 +238 238 255 +255 230 156 +222 189 156 +255 131 156 +230 98 131 +255 255 255 +32 32 65 diff --git a/graphics/event_objects/pics/berry_trees/aguav/0.png b/graphics/event_objects/pics/berry_trees/aguav/0.png new file mode 100644 index 000000000..0463d51db Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/aguav/0.png differ diff --git a/graphics/event_objects/pics/berry_trees/aguav/1.png b/graphics/event_objects/pics/berry_trees/aguav/1.png new file mode 100644 index 000000000..a5f4b8bee Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/aguav/1.png differ diff --git a/graphics/event_objects/pics/berry_trees/aguav/2.png b/graphics/event_objects/pics/berry_trees/aguav/2.png new file mode 100644 index 000000000..7af57fd97 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/aguav/2.png differ diff --git a/graphics/event_objects/pics/berry_trees/aguav/3.png b/graphics/event_objects/pics/berry_trees/aguav/3.png new file mode 100644 index 000000000..0fdd3f994 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/aguav/3.png differ diff --git a/graphics/event_objects/pics/berry_trees/aguav/4.png b/graphics/event_objects/pics/berry_trees/aguav/4.png new file mode 100644 index 000000000..f3fc70076 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/aguav/4.png differ diff --git a/graphics/event_objects/pics/berry_trees/aguav/5.png b/graphics/event_objects/pics/berry_trees/aguav/5.png new file mode 100644 index 000000000..b437940bf Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/aguav/5.png differ diff --git a/graphics/event_objects/pics/berry_trees/aspear/0.png b/graphics/event_objects/pics/berry_trees/aspear/0.png new file mode 100644 index 000000000..933957413 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/aspear/0.png differ diff --git a/graphics/event_objects/pics/berry_trees/aspear/1.png b/graphics/event_objects/pics/berry_trees/aspear/1.png new file mode 100644 index 000000000..ee750e7f3 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/aspear/1.png differ diff --git a/graphics/event_objects/pics/berry_trees/aspear/2.png b/graphics/event_objects/pics/berry_trees/aspear/2.png new file mode 100644 index 000000000..e3a4e47bb Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/aspear/2.png differ diff --git a/graphics/event_objects/pics/berry_trees/aspear/3.png b/graphics/event_objects/pics/berry_trees/aspear/3.png new file mode 100644 index 000000000..df16ae330 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/aspear/3.png differ diff --git a/graphics/event_objects/pics/berry_trees/aspear/4.png b/graphics/event_objects/pics/berry_trees/aspear/4.png new file mode 100644 index 000000000..8d9bd38fb Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/aspear/4.png differ diff --git a/graphics/event_objects/pics/berry_trees/aspear/5.png b/graphics/event_objects/pics/berry_trees/aspear/5.png new file mode 100644 index 000000000..495119480 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/aspear/5.png differ diff --git a/graphics/event_objects/pics/berry_trees/cheri/0.png b/graphics/event_objects/pics/berry_trees/cheri/0.png new file mode 100644 index 000000000..18588dc6c Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/cheri/0.png differ diff --git a/graphics/event_objects/pics/berry_trees/cheri/1.png b/graphics/event_objects/pics/berry_trees/cheri/1.png new file mode 100644 index 000000000..e9419d0fe Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/cheri/1.png differ diff --git a/graphics/event_objects/pics/berry_trees/cheri/2.png b/graphics/event_objects/pics/berry_trees/cheri/2.png new file mode 100644 index 000000000..4022a7e5e Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/cheri/2.png differ diff --git a/graphics/event_objects/pics/berry_trees/cheri/3.png b/graphics/event_objects/pics/berry_trees/cheri/3.png new file mode 100644 index 000000000..c2572383c Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/cheri/3.png differ diff --git a/graphics/event_objects/pics/berry_trees/cheri/4.png b/graphics/event_objects/pics/berry_trees/cheri/4.png new file mode 100644 index 000000000..462596c51 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/cheri/4.png differ diff --git a/graphics/event_objects/pics/berry_trees/cheri/5.png b/graphics/event_objects/pics/berry_trees/cheri/5.png new file mode 100644 index 000000000..447f1d865 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/cheri/5.png differ diff --git a/graphics/event_objects/pics/berry_trees/chesto/0.png b/graphics/event_objects/pics/berry_trees/chesto/0.png new file mode 100644 index 000000000..516a334c1 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/chesto/0.png differ diff --git a/graphics/event_objects/pics/berry_trees/chesto/1.png b/graphics/event_objects/pics/berry_trees/chesto/1.png new file mode 100644 index 000000000..dacc90fb3 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/chesto/1.png differ diff --git a/graphics/event_objects/pics/berry_trees/chesto/2.png b/graphics/event_objects/pics/berry_trees/chesto/2.png new file mode 100644 index 000000000..c0a2ec30d Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/chesto/2.png differ diff --git a/graphics/event_objects/pics/berry_trees/chesto/3.png b/graphics/event_objects/pics/berry_trees/chesto/3.png new file mode 100644 index 000000000..328fee834 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/chesto/3.png differ diff --git a/graphics/event_objects/pics/berry_trees/chesto/4.png b/graphics/event_objects/pics/berry_trees/chesto/4.png new file mode 100644 index 000000000..d40a393a2 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/chesto/4.png differ diff --git a/graphics/event_objects/pics/berry_trees/chesto/5.png b/graphics/event_objects/pics/berry_trees/chesto/5.png new file mode 100644 index 000000000..3d3d03d64 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/chesto/5.png differ diff --git a/graphics/event_objects/pics/berry_trees/cornn/0.png b/graphics/event_objects/pics/berry_trees/cornn/0.png new file mode 100644 index 000000000..8388b030c Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/cornn/0.png differ diff --git a/graphics/event_objects/pics/berry_trees/cornn/1.png b/graphics/event_objects/pics/berry_trees/cornn/1.png new file mode 100644 index 000000000..23d529796 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/cornn/1.png differ diff --git a/graphics/event_objects/pics/berry_trees/cornn/2.png b/graphics/event_objects/pics/berry_trees/cornn/2.png new file mode 100644 index 000000000..969020d39 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/cornn/2.png differ diff --git a/graphics/event_objects/pics/berry_trees/cornn/3.png b/graphics/event_objects/pics/berry_trees/cornn/3.png new file mode 100644 index 000000000..88d136547 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/cornn/3.png differ diff --git a/graphics/event_objects/pics/berry_trees/cornn/4.png b/graphics/event_objects/pics/berry_trees/cornn/4.png new file mode 100644 index 000000000..c50789645 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/cornn/4.png differ diff --git a/graphics/event_objects/pics/berry_trees/cornn/5.png b/graphics/event_objects/pics/berry_trees/cornn/5.png new file mode 100644 index 000000000..de7b7f4ad Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/cornn/5.png differ diff --git a/graphics/event_objects/pics/berry_trees/dirt_pile.png b/graphics/event_objects/pics/berry_trees/dirt_pile.png new file mode 100644 index 000000000..3790fd846 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/dirt_pile.png differ diff --git a/graphics/event_objects/pics/berry_trees/durin/0.png b/graphics/event_objects/pics/berry_trees/durin/0.png new file mode 100644 index 000000000..eefe4ba78 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/durin/0.png differ diff --git a/graphics/event_objects/pics/berry_trees/durin/1.png b/graphics/event_objects/pics/berry_trees/durin/1.png new file mode 100644 index 000000000..d5b75b3b3 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/durin/1.png differ diff --git a/graphics/event_objects/pics/berry_trees/durin/2.png b/graphics/event_objects/pics/berry_trees/durin/2.png new file mode 100644 index 000000000..cf854194d Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/durin/2.png differ diff --git a/graphics/event_objects/pics/berry_trees/durin/3.png b/graphics/event_objects/pics/berry_trees/durin/3.png new file mode 100644 index 000000000..41425502f Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/durin/3.png differ diff --git a/graphics/event_objects/pics/berry_trees/durin/4.png b/graphics/event_objects/pics/berry_trees/durin/4.png new file mode 100644 index 000000000..66337024c Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/durin/4.png differ diff --git a/graphics/event_objects/pics/berry_trees/durin/5.png b/graphics/event_objects/pics/berry_trees/durin/5.png new file mode 100644 index 000000000..22c672fac Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/durin/5.png differ diff --git a/graphics/event_objects/pics/berry_trees/figy/0.png b/graphics/event_objects/pics/berry_trees/figy/0.png new file mode 100644 index 000000000..0eea8f98c Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/figy/0.png differ diff --git a/graphics/event_objects/pics/berry_trees/figy/1.png b/graphics/event_objects/pics/berry_trees/figy/1.png new file mode 100644 index 000000000..018e0ae3f Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/figy/1.png differ diff --git a/graphics/event_objects/pics/berry_trees/figy/2.png b/graphics/event_objects/pics/berry_trees/figy/2.png new file mode 100644 index 000000000..df10bb526 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/figy/2.png differ diff --git a/graphics/event_objects/pics/berry_trees/figy/3.png b/graphics/event_objects/pics/berry_trees/figy/3.png new file mode 100644 index 000000000..bf1785f87 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/figy/3.png differ diff --git a/graphics/event_objects/pics/berry_trees/figy/4.png b/graphics/event_objects/pics/berry_trees/figy/4.png new file mode 100644 index 000000000..46d794635 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/figy/4.png differ diff --git a/graphics/event_objects/pics/berry_trees/figy/5.png b/graphics/event_objects/pics/berry_trees/figy/5.png new file mode 100644 index 000000000..945773fda Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/figy/5.png differ diff --git a/graphics/event_objects/pics/berry_trees/grepa/0.png b/graphics/event_objects/pics/berry_trees/grepa/0.png new file mode 100644 index 000000000..abd265e0b Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/grepa/0.png differ diff --git a/graphics/event_objects/pics/berry_trees/grepa/1.png b/graphics/event_objects/pics/berry_trees/grepa/1.png new file mode 100644 index 000000000..27e90c9bd Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/grepa/1.png differ diff --git a/graphics/event_objects/pics/berry_trees/grepa/2.png b/graphics/event_objects/pics/berry_trees/grepa/2.png new file mode 100644 index 000000000..22e354eb0 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/grepa/2.png differ diff --git a/graphics/event_objects/pics/berry_trees/grepa/3.png b/graphics/event_objects/pics/berry_trees/grepa/3.png new file mode 100644 index 000000000..e23824dd3 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/grepa/3.png differ diff --git a/graphics/event_objects/pics/berry_trees/grepa/4.png b/graphics/event_objects/pics/berry_trees/grepa/4.png new file mode 100644 index 000000000..4b8ad19a0 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/grepa/4.png differ diff --git a/graphics/event_objects/pics/berry_trees/grepa/5.png b/graphics/event_objects/pics/berry_trees/grepa/5.png new file mode 100644 index 000000000..9bf54a3e0 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/grepa/5.png differ diff --git a/graphics/event_objects/pics/berry_trees/hondew/0.png b/graphics/event_objects/pics/berry_trees/hondew/0.png new file mode 100644 index 000000000..ab1cffe55 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/hondew/0.png differ diff --git a/graphics/event_objects/pics/berry_trees/hondew/1.png b/graphics/event_objects/pics/berry_trees/hondew/1.png new file mode 100644 index 000000000..e24fd5b95 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/hondew/1.png differ diff --git a/graphics/event_objects/pics/berry_trees/hondew/2.png b/graphics/event_objects/pics/berry_trees/hondew/2.png new file mode 100644 index 000000000..dc7938958 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/hondew/2.png differ diff --git a/graphics/event_objects/pics/berry_trees/hondew/3.png b/graphics/event_objects/pics/berry_trees/hondew/3.png new file mode 100644 index 000000000..5c9536e87 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/hondew/3.png differ diff --git a/graphics/event_objects/pics/berry_trees/hondew/4.png b/graphics/event_objects/pics/berry_trees/hondew/4.png new file mode 100644 index 000000000..2419d058b Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/hondew/4.png differ diff --git a/graphics/event_objects/pics/berry_trees/hondew/5.png b/graphics/event_objects/pics/berry_trees/hondew/5.png new file mode 100644 index 000000000..76aa9a8e3 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/hondew/5.png differ diff --git a/graphics/event_objects/pics/berry_trees/iapapa/0.png b/graphics/event_objects/pics/berry_trees/iapapa/0.png new file mode 100644 index 000000000..506c8bb4b Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/iapapa/0.png differ diff --git a/graphics/event_objects/pics/berry_trees/iapapa/1.png b/graphics/event_objects/pics/berry_trees/iapapa/1.png new file mode 100644 index 000000000..6eae7f4ba Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/iapapa/1.png differ diff --git a/graphics/event_objects/pics/berry_trees/iapapa/2.png b/graphics/event_objects/pics/berry_trees/iapapa/2.png new file mode 100644 index 000000000..d779ca7fb Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/iapapa/2.png differ diff --git a/graphics/event_objects/pics/berry_trees/iapapa/3.png b/graphics/event_objects/pics/berry_trees/iapapa/3.png new file mode 100644 index 000000000..4bbd498e3 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/iapapa/3.png differ diff --git a/graphics/event_objects/pics/berry_trees/iapapa/4.png b/graphics/event_objects/pics/berry_trees/iapapa/4.png new file mode 100644 index 000000000..36cde6254 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/iapapa/4.png differ diff --git a/graphics/event_objects/pics/berry_trees/iapapa/5.png b/graphics/event_objects/pics/berry_trees/iapapa/5.png new file mode 100644 index 000000000..b6a39d318 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/iapapa/5.png differ diff --git a/graphics/event_objects/pics/berry_trees/kelpsy/0.png b/graphics/event_objects/pics/berry_trees/kelpsy/0.png new file mode 100644 index 000000000..bb794552a Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/kelpsy/0.png differ diff --git a/graphics/event_objects/pics/berry_trees/kelpsy/1.png b/graphics/event_objects/pics/berry_trees/kelpsy/1.png new file mode 100644 index 000000000..90257b261 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/kelpsy/1.png differ diff --git a/graphics/event_objects/pics/berry_trees/kelpsy/2.png b/graphics/event_objects/pics/berry_trees/kelpsy/2.png new file mode 100644 index 000000000..2f3fec1ec Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/kelpsy/2.png differ diff --git a/graphics/event_objects/pics/berry_trees/kelpsy/3.png b/graphics/event_objects/pics/berry_trees/kelpsy/3.png new file mode 100644 index 000000000..2efd0d160 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/kelpsy/3.png differ diff --git a/graphics/event_objects/pics/berry_trees/kelpsy/4.png b/graphics/event_objects/pics/berry_trees/kelpsy/4.png new file mode 100644 index 000000000..cf0c47d0a Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/kelpsy/4.png differ diff --git a/graphics/event_objects/pics/berry_trees/kelpsy/5.png b/graphics/event_objects/pics/berry_trees/kelpsy/5.png new file mode 100644 index 000000000..e31dfd23f Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/kelpsy/5.png differ diff --git a/graphics/event_objects/pics/berry_trees/lansat/0.png b/graphics/event_objects/pics/berry_trees/lansat/0.png new file mode 100644 index 000000000..56d59b0a7 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/lansat/0.png differ diff --git a/graphics/event_objects/pics/berry_trees/lansat/1.png b/graphics/event_objects/pics/berry_trees/lansat/1.png new file mode 100644 index 000000000..59e7edcfa Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/lansat/1.png differ diff --git a/graphics/event_objects/pics/berry_trees/lansat/2.png b/graphics/event_objects/pics/berry_trees/lansat/2.png new file mode 100644 index 000000000..f4d1145ef Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/lansat/2.png differ diff --git a/graphics/event_objects/pics/berry_trees/lansat/3.png b/graphics/event_objects/pics/berry_trees/lansat/3.png new file mode 100644 index 000000000..32ca5e3e9 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/lansat/3.png differ diff --git a/graphics/event_objects/pics/berry_trees/lansat/4.png b/graphics/event_objects/pics/berry_trees/lansat/4.png new file mode 100644 index 000000000..bf285b8ee Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/lansat/4.png differ diff --git a/graphics/event_objects/pics/berry_trees/lansat/5.png b/graphics/event_objects/pics/berry_trees/lansat/5.png new file mode 100644 index 000000000..3a8dae404 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/lansat/5.png differ diff --git a/graphics/event_objects/pics/berry_trees/leppa/0.png b/graphics/event_objects/pics/berry_trees/leppa/0.png new file mode 100644 index 000000000..cecd61e2d Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/leppa/0.png differ diff --git a/graphics/event_objects/pics/berry_trees/leppa/1.png b/graphics/event_objects/pics/berry_trees/leppa/1.png new file mode 100644 index 000000000..f3ce88199 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/leppa/1.png differ diff --git a/graphics/event_objects/pics/berry_trees/leppa/2.png b/graphics/event_objects/pics/berry_trees/leppa/2.png new file mode 100644 index 000000000..d00cf5f89 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/leppa/2.png differ diff --git a/graphics/event_objects/pics/berry_trees/leppa/3.png b/graphics/event_objects/pics/berry_trees/leppa/3.png new file mode 100644 index 000000000..8a9ed3c34 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/leppa/3.png differ diff --git a/graphics/event_objects/pics/berry_trees/leppa/4.png b/graphics/event_objects/pics/berry_trees/leppa/4.png new file mode 100644 index 000000000..dd4fc6df2 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/leppa/4.png differ diff --git a/graphics/event_objects/pics/berry_trees/leppa/5.png b/graphics/event_objects/pics/berry_trees/leppa/5.png new file mode 100644 index 000000000..056518295 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/leppa/5.png differ diff --git a/graphics/event_objects/pics/berry_trees/liechi/0.png b/graphics/event_objects/pics/berry_trees/liechi/0.png new file mode 100644 index 000000000..51827869f Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/liechi/0.png differ diff --git a/graphics/event_objects/pics/berry_trees/liechi/1.png b/graphics/event_objects/pics/berry_trees/liechi/1.png new file mode 100644 index 000000000..182400260 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/liechi/1.png differ diff --git a/graphics/event_objects/pics/berry_trees/liechi/2.png b/graphics/event_objects/pics/berry_trees/liechi/2.png new file mode 100644 index 000000000..a24565623 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/liechi/2.png differ diff --git a/graphics/event_objects/pics/berry_trees/liechi/3.png b/graphics/event_objects/pics/berry_trees/liechi/3.png new file mode 100644 index 000000000..b7bde2e7f Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/liechi/3.png differ diff --git a/graphics/event_objects/pics/berry_trees/liechi/4.png b/graphics/event_objects/pics/berry_trees/liechi/4.png new file mode 100644 index 000000000..2ed774c17 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/liechi/4.png differ diff --git a/graphics/event_objects/pics/berry_trees/liechi/5.png b/graphics/event_objects/pics/berry_trees/liechi/5.png new file mode 100644 index 000000000..d8fe39b21 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/liechi/5.png differ diff --git a/graphics/event_objects/pics/berry_trees/lum/0.png b/graphics/event_objects/pics/berry_trees/lum/0.png new file mode 100644 index 000000000..4c08ea797 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/lum/0.png differ diff --git a/graphics/event_objects/pics/berry_trees/lum/1.png b/graphics/event_objects/pics/berry_trees/lum/1.png new file mode 100644 index 000000000..b2035c555 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/lum/1.png differ diff --git a/graphics/event_objects/pics/berry_trees/lum/2.png b/graphics/event_objects/pics/berry_trees/lum/2.png new file mode 100644 index 000000000..b09991fd9 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/lum/2.png differ diff --git a/graphics/event_objects/pics/berry_trees/lum/3.png b/graphics/event_objects/pics/berry_trees/lum/3.png new file mode 100644 index 000000000..e32e7b64a Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/lum/3.png differ diff --git a/graphics/event_objects/pics/berry_trees/lum/4.png b/graphics/event_objects/pics/berry_trees/lum/4.png new file mode 100644 index 000000000..1347d66b2 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/lum/4.png differ diff --git a/graphics/event_objects/pics/berry_trees/lum/5.png b/graphics/event_objects/pics/berry_trees/lum/5.png new file mode 100644 index 000000000..1c601d09b Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/lum/5.png differ diff --git a/graphics/event_objects/pics/berry_trees/mago/0.png b/graphics/event_objects/pics/berry_trees/mago/0.png new file mode 100644 index 000000000..b58d4aba1 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/mago/0.png differ diff --git a/graphics/event_objects/pics/berry_trees/mago/1.png b/graphics/event_objects/pics/berry_trees/mago/1.png new file mode 100644 index 000000000..0ed2ad6ad Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/mago/1.png differ diff --git a/graphics/event_objects/pics/berry_trees/mago/2.png b/graphics/event_objects/pics/berry_trees/mago/2.png new file mode 100644 index 000000000..221af2806 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/mago/2.png differ diff --git a/graphics/event_objects/pics/berry_trees/mago/3.png b/graphics/event_objects/pics/berry_trees/mago/3.png new file mode 100644 index 000000000..71a8d4294 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/mago/3.png differ diff --git a/graphics/event_objects/pics/berry_trees/mago/4.png b/graphics/event_objects/pics/berry_trees/mago/4.png new file mode 100644 index 000000000..ba6bf2d00 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/mago/4.png differ diff --git a/graphics/event_objects/pics/berry_trees/mago/5.png b/graphics/event_objects/pics/berry_trees/mago/5.png new file mode 100644 index 000000000..6271425a3 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/mago/5.png differ diff --git a/graphics/event_objects/pics/berry_trees/nomel/0.png b/graphics/event_objects/pics/berry_trees/nomel/0.png new file mode 100644 index 000000000..d504524eb Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/nomel/0.png differ diff --git a/graphics/event_objects/pics/berry_trees/nomel/1.png b/graphics/event_objects/pics/berry_trees/nomel/1.png new file mode 100644 index 000000000..37ff4b082 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/nomel/1.png differ diff --git a/graphics/event_objects/pics/berry_trees/nomel/2.png b/graphics/event_objects/pics/berry_trees/nomel/2.png new file mode 100644 index 000000000..4e5c03cb4 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/nomel/2.png differ diff --git a/graphics/event_objects/pics/berry_trees/nomel/3.png b/graphics/event_objects/pics/berry_trees/nomel/3.png new file mode 100644 index 000000000..7fd46d627 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/nomel/3.png differ diff --git a/graphics/event_objects/pics/berry_trees/nomel/4.png b/graphics/event_objects/pics/berry_trees/nomel/4.png new file mode 100644 index 000000000..913274d81 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/nomel/4.png differ diff --git a/graphics/event_objects/pics/berry_trees/nomel/5.png b/graphics/event_objects/pics/berry_trees/nomel/5.png new file mode 100644 index 000000000..3af9a516a Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/nomel/5.png differ diff --git a/graphics/event_objects/pics/berry_trees/oran/0.png b/graphics/event_objects/pics/berry_trees/oran/0.png new file mode 100644 index 000000000..8770230de Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/oran/0.png differ diff --git a/graphics/event_objects/pics/berry_trees/oran/1.png b/graphics/event_objects/pics/berry_trees/oran/1.png new file mode 100644 index 000000000..afeb286a9 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/oran/1.png differ diff --git a/graphics/event_objects/pics/berry_trees/oran/2.png b/graphics/event_objects/pics/berry_trees/oran/2.png new file mode 100644 index 000000000..7b7dc8b1a Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/oran/2.png differ diff --git a/graphics/event_objects/pics/berry_trees/oran/3.png b/graphics/event_objects/pics/berry_trees/oran/3.png new file mode 100644 index 000000000..81857442d Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/oran/3.png differ diff --git a/graphics/event_objects/pics/berry_trees/oran/4.png b/graphics/event_objects/pics/berry_trees/oran/4.png new file mode 100644 index 000000000..58a197d08 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/oran/4.png differ diff --git a/graphics/event_objects/pics/berry_trees/oran/5.png b/graphics/event_objects/pics/berry_trees/oran/5.png new file mode 100644 index 000000000..8878c8550 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/oran/5.png differ diff --git a/graphics/event_objects/pics/berry_trees/pamtre/0.png b/graphics/event_objects/pics/berry_trees/pamtre/0.png new file mode 100644 index 000000000..ac56c5370 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/pamtre/0.png differ diff --git a/graphics/event_objects/pics/berry_trees/pamtre/1.png b/graphics/event_objects/pics/berry_trees/pamtre/1.png new file mode 100644 index 000000000..105974668 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/pamtre/1.png differ diff --git a/graphics/event_objects/pics/berry_trees/pamtre/2.png b/graphics/event_objects/pics/berry_trees/pamtre/2.png new file mode 100644 index 000000000..09363b8ba Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/pamtre/2.png differ diff --git a/graphics/event_objects/pics/berry_trees/pamtre/3.png b/graphics/event_objects/pics/berry_trees/pamtre/3.png new file mode 100644 index 000000000..263856830 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/pamtre/3.png differ diff --git a/graphics/event_objects/pics/berry_trees/pamtre/4.png b/graphics/event_objects/pics/berry_trees/pamtre/4.png new file mode 100644 index 000000000..509057976 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/pamtre/4.png differ diff --git a/graphics/event_objects/pics/berry_trees/pamtre/5.png b/graphics/event_objects/pics/berry_trees/pamtre/5.png new file mode 100644 index 000000000..1adf263df Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/pamtre/5.png differ diff --git a/graphics/event_objects/pics/berry_trees/pecha/0.png b/graphics/event_objects/pics/berry_trees/pecha/0.png new file mode 100644 index 000000000..8a69441a4 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/pecha/0.png differ diff --git a/graphics/event_objects/pics/berry_trees/pecha/1.png b/graphics/event_objects/pics/berry_trees/pecha/1.png new file mode 100644 index 000000000..4d1923735 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/pecha/1.png differ diff --git a/graphics/event_objects/pics/berry_trees/pecha/2.png b/graphics/event_objects/pics/berry_trees/pecha/2.png new file mode 100644 index 000000000..a93a37738 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/pecha/2.png differ diff --git a/graphics/event_objects/pics/berry_trees/pecha/3.png b/graphics/event_objects/pics/berry_trees/pecha/3.png new file mode 100644 index 000000000..5cd4f5e3c Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/pecha/3.png differ diff --git a/graphics/event_objects/pics/berry_trees/pecha/4.png b/graphics/event_objects/pics/berry_trees/pecha/4.png new file mode 100644 index 000000000..451d74260 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/pecha/4.png differ diff --git a/graphics/event_objects/pics/berry_trees/pecha/5.png b/graphics/event_objects/pics/berry_trees/pecha/5.png new file mode 100644 index 000000000..242a9b53f Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/pecha/5.png differ diff --git a/graphics/event_objects/pics/berry_trees/persim/0.png b/graphics/event_objects/pics/berry_trees/persim/0.png new file mode 100644 index 000000000..1996615ff Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/persim/0.png differ diff --git a/graphics/event_objects/pics/berry_trees/persim/1.png b/graphics/event_objects/pics/berry_trees/persim/1.png new file mode 100644 index 000000000..eda84785f Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/persim/1.png differ diff --git a/graphics/event_objects/pics/berry_trees/persim/2.png b/graphics/event_objects/pics/berry_trees/persim/2.png new file mode 100644 index 000000000..6e71b3786 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/persim/2.png differ diff --git a/graphics/event_objects/pics/berry_trees/persim/3.png b/graphics/event_objects/pics/berry_trees/persim/3.png new file mode 100644 index 000000000..f45bf0646 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/persim/3.png differ diff --git a/graphics/event_objects/pics/berry_trees/persim/4.png b/graphics/event_objects/pics/berry_trees/persim/4.png new file mode 100644 index 000000000..a5aeda410 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/persim/4.png differ diff --git a/graphics/event_objects/pics/berry_trees/persim/5.png b/graphics/event_objects/pics/berry_trees/persim/5.png new file mode 100644 index 000000000..72c69c068 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/persim/5.png differ diff --git a/graphics/event_objects/pics/berry_trees/pomeg/0.png b/graphics/event_objects/pics/berry_trees/pomeg/0.png new file mode 100644 index 000000000..c343bc210 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/pomeg/0.png differ diff --git a/graphics/event_objects/pics/berry_trees/pomeg/1.png b/graphics/event_objects/pics/berry_trees/pomeg/1.png new file mode 100644 index 000000000..cc1c08f92 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/pomeg/1.png differ diff --git a/graphics/event_objects/pics/berry_trees/pomeg/2.png b/graphics/event_objects/pics/berry_trees/pomeg/2.png new file mode 100644 index 000000000..46d0fb7cc Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/pomeg/2.png differ diff --git a/graphics/event_objects/pics/berry_trees/pomeg/3.png b/graphics/event_objects/pics/berry_trees/pomeg/3.png new file mode 100644 index 000000000..d2475b748 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/pomeg/3.png differ diff --git a/graphics/event_objects/pics/berry_trees/pomeg/4.png b/graphics/event_objects/pics/berry_trees/pomeg/4.png new file mode 100644 index 000000000..4f3019213 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/pomeg/4.png differ diff --git a/graphics/event_objects/pics/berry_trees/pomeg/5.png b/graphics/event_objects/pics/berry_trees/pomeg/5.png new file mode 100644 index 000000000..f519675ce Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/pomeg/5.png differ diff --git a/graphics/event_objects/pics/berry_trees/rabuta/0.png b/graphics/event_objects/pics/berry_trees/rabuta/0.png new file mode 100644 index 000000000..5fe85e4e3 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/rabuta/0.png differ diff --git a/graphics/event_objects/pics/berry_trees/rabuta/1.png b/graphics/event_objects/pics/berry_trees/rabuta/1.png new file mode 100644 index 000000000..0973e21cb Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/rabuta/1.png differ diff --git a/graphics/event_objects/pics/berry_trees/rabuta/2.png b/graphics/event_objects/pics/berry_trees/rabuta/2.png new file mode 100644 index 000000000..c2d027ebd Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/rabuta/2.png differ diff --git a/graphics/event_objects/pics/berry_trees/rabuta/3.png b/graphics/event_objects/pics/berry_trees/rabuta/3.png new file mode 100644 index 000000000..79b2cc45f Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/rabuta/3.png differ diff --git a/graphics/event_objects/pics/berry_trees/rabuta/4.png b/graphics/event_objects/pics/berry_trees/rabuta/4.png new file mode 100644 index 000000000..931350042 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/rabuta/4.png differ diff --git a/graphics/event_objects/pics/berry_trees/rabuta/5.png b/graphics/event_objects/pics/berry_trees/rabuta/5.png new file mode 100644 index 000000000..efa1ac89e Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/rabuta/5.png differ diff --git a/graphics/event_objects/pics/berry_trees/rawst/0.png b/graphics/event_objects/pics/berry_trees/rawst/0.png new file mode 100644 index 000000000..ef3548002 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/rawst/0.png differ diff --git a/graphics/event_objects/pics/berry_trees/rawst/1.png b/graphics/event_objects/pics/berry_trees/rawst/1.png new file mode 100644 index 000000000..dccad21b0 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/rawst/1.png differ diff --git a/graphics/event_objects/pics/berry_trees/rawst/2.png b/graphics/event_objects/pics/berry_trees/rawst/2.png new file mode 100644 index 000000000..d89f7484e Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/rawst/2.png differ diff --git a/graphics/event_objects/pics/berry_trees/rawst/3.png b/graphics/event_objects/pics/berry_trees/rawst/3.png new file mode 100644 index 000000000..afd11e0f6 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/rawst/3.png differ diff --git a/graphics/event_objects/pics/berry_trees/rawst/4.png b/graphics/event_objects/pics/berry_trees/rawst/4.png new file mode 100644 index 000000000..aada33789 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/rawst/4.png differ diff --git a/graphics/event_objects/pics/berry_trees/rawst/5.png b/graphics/event_objects/pics/berry_trees/rawst/5.png new file mode 100644 index 000000000..311044bf0 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/rawst/5.png differ diff --git a/graphics/event_objects/pics/berry_trees/razz/0.png b/graphics/event_objects/pics/berry_trees/razz/0.png new file mode 100644 index 000000000..4685d0977 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/razz/0.png differ diff --git a/graphics/event_objects/pics/berry_trees/razz/1.png b/graphics/event_objects/pics/berry_trees/razz/1.png new file mode 100644 index 000000000..396122c5b Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/razz/1.png differ diff --git a/graphics/event_objects/pics/berry_trees/razz/2.png b/graphics/event_objects/pics/berry_trees/razz/2.png new file mode 100644 index 000000000..f48a2c6e2 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/razz/2.png differ diff --git a/graphics/event_objects/pics/berry_trees/razz/3.png b/graphics/event_objects/pics/berry_trees/razz/3.png new file mode 100644 index 000000000..47e6a52c1 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/razz/3.png differ diff --git a/graphics/event_objects/pics/berry_trees/razz/4.png b/graphics/event_objects/pics/berry_trees/razz/4.png new file mode 100644 index 000000000..075c4674b Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/razz/4.png differ diff --git a/graphics/event_objects/pics/berry_trees/razz/5.png b/graphics/event_objects/pics/berry_trees/razz/5.png new file mode 100644 index 000000000..7ae7b7bba Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/razz/5.png differ diff --git a/graphics/event_objects/pics/berry_trees/sitrus/0.png b/graphics/event_objects/pics/berry_trees/sitrus/0.png new file mode 100644 index 000000000..64671e0a1 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/sitrus/0.png differ diff --git a/graphics/event_objects/pics/berry_trees/sitrus/1.png b/graphics/event_objects/pics/berry_trees/sitrus/1.png new file mode 100644 index 000000000..13f82d092 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/sitrus/1.png differ diff --git a/graphics/event_objects/pics/berry_trees/sitrus/2.png b/graphics/event_objects/pics/berry_trees/sitrus/2.png new file mode 100644 index 000000000..7a382402a Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/sitrus/2.png differ diff --git a/graphics/event_objects/pics/berry_trees/sitrus/3.png b/graphics/event_objects/pics/berry_trees/sitrus/3.png new file mode 100644 index 000000000..6bbc0dca0 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/sitrus/3.png differ diff --git a/graphics/event_objects/pics/berry_trees/sitrus/4.png b/graphics/event_objects/pics/berry_trees/sitrus/4.png new file mode 100644 index 000000000..1e6ff6838 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/sitrus/4.png differ diff --git a/graphics/event_objects/pics/berry_trees/sitrus/5.png b/graphics/event_objects/pics/berry_trees/sitrus/5.png new file mode 100644 index 000000000..cd97f552f Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/sitrus/5.png differ diff --git a/graphics/event_objects/pics/berry_trees/spelon/0.png b/graphics/event_objects/pics/berry_trees/spelon/0.png new file mode 100644 index 000000000..32bd06af1 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/spelon/0.png differ diff --git a/graphics/event_objects/pics/berry_trees/spelon/1.png b/graphics/event_objects/pics/berry_trees/spelon/1.png new file mode 100644 index 000000000..37e77e391 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/spelon/1.png differ diff --git a/graphics/event_objects/pics/berry_trees/spelon/2.png b/graphics/event_objects/pics/berry_trees/spelon/2.png new file mode 100644 index 000000000..d36cf3b16 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/spelon/2.png differ diff --git a/graphics/event_objects/pics/berry_trees/spelon/3.png b/graphics/event_objects/pics/berry_trees/spelon/3.png new file mode 100644 index 000000000..6a7099d83 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/spelon/3.png differ diff --git a/graphics/event_objects/pics/berry_trees/spelon/4.png b/graphics/event_objects/pics/berry_trees/spelon/4.png new file mode 100644 index 000000000..de1c24e58 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/spelon/4.png differ diff --git a/graphics/event_objects/pics/berry_trees/spelon/5.png b/graphics/event_objects/pics/berry_trees/spelon/5.png new file mode 100644 index 000000000..578231a24 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/spelon/5.png differ diff --git a/graphics/event_objects/pics/berry_trees/sprout/0.png b/graphics/event_objects/pics/berry_trees/sprout/0.png new file mode 100644 index 000000000..df37532a7 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/sprout/0.png differ diff --git a/graphics/event_objects/pics/berry_trees/sprout/1.png b/graphics/event_objects/pics/berry_trees/sprout/1.png new file mode 100644 index 000000000..f0a67f382 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/sprout/1.png differ diff --git a/graphics/event_objects/pics/berry_trees/tamato/0.png b/graphics/event_objects/pics/berry_trees/tamato/0.png new file mode 100644 index 000000000..499e473bc Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/tamato/0.png differ diff --git a/graphics/event_objects/pics/berry_trees/tamato/1.png b/graphics/event_objects/pics/berry_trees/tamato/1.png new file mode 100644 index 000000000..2c45d60d8 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/tamato/1.png differ diff --git a/graphics/event_objects/pics/berry_trees/tamato/2.png b/graphics/event_objects/pics/berry_trees/tamato/2.png new file mode 100644 index 000000000..ef3ac700b Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/tamato/2.png differ diff --git a/graphics/event_objects/pics/berry_trees/tamato/3.png b/graphics/event_objects/pics/berry_trees/tamato/3.png new file mode 100644 index 000000000..57b60904f Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/tamato/3.png differ diff --git a/graphics/event_objects/pics/berry_trees/tamato/4.png b/graphics/event_objects/pics/berry_trees/tamato/4.png new file mode 100644 index 000000000..823ff49a7 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/tamato/4.png differ diff --git a/graphics/event_objects/pics/berry_trees/tamato/5.png b/graphics/event_objects/pics/berry_trees/tamato/5.png new file mode 100644 index 000000000..8656cb5db Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/tamato/5.png differ diff --git a/graphics/event_objects/pics/berry_trees/wepear/0.png b/graphics/event_objects/pics/berry_trees/wepear/0.png new file mode 100644 index 000000000..ccf834a94 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/wepear/0.png differ diff --git a/graphics/event_objects/pics/berry_trees/wepear/1.png b/graphics/event_objects/pics/berry_trees/wepear/1.png new file mode 100644 index 000000000..d46390bdd Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/wepear/1.png differ diff --git a/graphics/event_objects/pics/berry_trees/wepear/2.png b/graphics/event_objects/pics/berry_trees/wepear/2.png new file mode 100644 index 000000000..040a70931 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/wepear/2.png differ diff --git a/graphics/event_objects/pics/berry_trees/wepear/3.png b/graphics/event_objects/pics/berry_trees/wepear/3.png new file mode 100644 index 000000000..94918f7ff Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/wepear/3.png differ diff --git a/graphics/event_objects/pics/berry_trees/wepear/4.png b/graphics/event_objects/pics/berry_trees/wepear/4.png new file mode 100644 index 000000000..ee242d657 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/wepear/4.png differ diff --git a/graphics/event_objects/pics/berry_trees/wepear/5.png b/graphics/event_objects/pics/berry_trees/wepear/5.png new file mode 100644 index 000000000..1b5256a9e Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/wepear/5.png differ diff --git a/graphics/event_objects/pics/berry_trees/wiki/0.png b/graphics/event_objects/pics/berry_trees/wiki/0.png new file mode 100644 index 000000000..e51325e18 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/wiki/0.png differ diff --git a/graphics/event_objects/pics/berry_trees/wiki/1.png b/graphics/event_objects/pics/berry_trees/wiki/1.png new file mode 100644 index 000000000..f7f28e44b Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/wiki/1.png differ diff --git a/graphics/event_objects/pics/berry_trees/wiki/2.png b/graphics/event_objects/pics/berry_trees/wiki/2.png new file mode 100644 index 000000000..e7d6c3824 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/wiki/2.png differ diff --git a/graphics/event_objects/pics/berry_trees/wiki/3.png b/graphics/event_objects/pics/berry_trees/wiki/3.png new file mode 100644 index 000000000..6447302a6 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/wiki/3.png differ diff --git a/graphics/event_objects/pics/berry_trees/wiki/4.png b/graphics/event_objects/pics/berry_trees/wiki/4.png new file mode 100644 index 000000000..a494a7eaa Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/wiki/4.png differ diff --git a/graphics/event_objects/pics/berry_trees/wiki/5.png b/graphics/event_objects/pics/berry_trees/wiki/5.png new file mode 100644 index 000000000..5a6b9f193 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/wiki/5.png differ diff --git a/graphics/event_objects/pics/cushions/ball_cushion.png b/graphics/event_objects/pics/cushions/ball_cushion.png new file mode 100644 index 000000000..54ecc1980 Binary files /dev/null and b/graphics/event_objects/pics/cushions/ball_cushion.png differ diff --git a/graphics/event_objects/pics/cushions/diamond_cushion.png b/graphics/event_objects/pics/cushions/diamond_cushion.png new file mode 100644 index 000000000..747866941 Binary files /dev/null and b/graphics/event_objects/pics/cushions/diamond_cushion.png differ diff --git a/graphics/event_objects/pics/cushions/fire_cushion.png b/graphics/event_objects/pics/cushions/fire_cushion.png new file mode 100644 index 000000000..aa9a70f2e Binary files /dev/null and b/graphics/event_objects/pics/cushions/fire_cushion.png differ diff --git a/graphics/event_objects/pics/cushions/grass_cushion.png b/graphics/event_objects/pics/cushions/grass_cushion.png new file mode 100644 index 000000000..8ee854f17 Binary files /dev/null and b/graphics/event_objects/pics/cushions/grass_cushion.png differ diff --git a/graphics/event_objects/pics/cushions/kiss_cushion.png b/graphics/event_objects/pics/cushions/kiss_cushion.png new file mode 100644 index 000000000..6a99348c9 Binary files /dev/null and b/graphics/event_objects/pics/cushions/kiss_cushion.png differ diff --git a/graphics/event_objects/pics/cushions/pika_cushion.png b/graphics/event_objects/pics/cushions/pika_cushion.png new file mode 100644 index 000000000..947713c39 Binary files /dev/null and b/graphics/event_objects/pics/cushions/pika_cushion.png differ diff --git a/graphics/event_objects/pics/cushions/round_cushion.png b/graphics/event_objects/pics/cushions/round_cushion.png new file mode 100644 index 000000000..0e7b71ad5 Binary files /dev/null and b/graphics/event_objects/pics/cushions/round_cushion.png differ diff --git a/graphics/event_objects/pics/cushions/spin_cushion.png b/graphics/event_objects/pics/cushions/spin_cushion.png new file mode 100644 index 000000000..81eba708c Binary files /dev/null and b/graphics/event_objects/pics/cushions/spin_cushion.png differ diff --git a/graphics/event_objects/pics/cushions/water_cushion.png b/graphics/event_objects/pics/cushions/water_cushion.png new file mode 100644 index 000000000..9ed16c633 Binary files /dev/null and b/graphics/event_objects/pics/cushions/water_cushion.png differ diff --git a/graphics/event_objects/pics/cushions/zigzag_cushion.png b/graphics/event_objects/pics/cushions/zigzag_cushion.png new file mode 100644 index 000000000..407e6a66b Binary files /dev/null and b/graphics/event_objects/pics/cushions/zigzag_cushion.png differ diff --git a/graphics/event_objects/pics/dolls/azurill_doll.png b/graphics/event_objects/pics/dolls/azurill_doll.png new file mode 100644 index 000000000..1d1f7492f Binary files /dev/null and b/graphics/event_objects/pics/dolls/azurill_doll.png differ diff --git a/graphics/event_objects/pics/dolls/baltoy_doll.png b/graphics/event_objects/pics/dolls/baltoy_doll.png new file mode 100644 index 000000000..5205123da Binary files /dev/null and b/graphics/event_objects/pics/dolls/baltoy_doll.png differ diff --git a/graphics/event_objects/pics/dolls/big_blastoise_doll.png b/graphics/event_objects/pics/dolls/big_blastoise_doll.png new file mode 100644 index 000000000..fa295f302 Binary files /dev/null and b/graphics/event_objects/pics/dolls/big_blastoise_doll.png differ diff --git a/graphics/event_objects/pics/dolls/big_charizard_doll.png b/graphics/event_objects/pics/dolls/big_charizard_doll.png new file mode 100644 index 000000000..4fa5aed45 Binary files /dev/null and b/graphics/event_objects/pics/dolls/big_charizard_doll.png differ diff --git a/graphics/event_objects/pics/dolls/big_lapras_doll.png b/graphics/event_objects/pics/dolls/big_lapras_doll.png new file mode 100644 index 000000000..572d3c810 Binary files /dev/null and b/graphics/event_objects/pics/dolls/big_lapras_doll.png differ diff --git a/graphics/event_objects/pics/dolls/big_regice_doll.png b/graphics/event_objects/pics/dolls/big_regice_doll.png new file mode 100644 index 000000000..e437d3558 Binary files /dev/null and b/graphics/event_objects/pics/dolls/big_regice_doll.png differ diff --git a/graphics/event_objects/pics/dolls/big_regirock_doll.png b/graphics/event_objects/pics/dolls/big_regirock_doll.png new file mode 100644 index 000000000..139abbb28 Binary files /dev/null and b/graphics/event_objects/pics/dolls/big_regirock_doll.png differ diff --git a/graphics/event_objects/pics/dolls/big_registeel_doll.png b/graphics/event_objects/pics/dolls/big_registeel_doll.png new file mode 100644 index 000000000..632a2cadd Binary files /dev/null and b/graphics/event_objects/pics/dolls/big_registeel_doll.png differ diff --git a/graphics/event_objects/pics/dolls/big_rhydon_doll.png b/graphics/event_objects/pics/dolls/big_rhydon_doll.png new file mode 100644 index 000000000..2e059f8c9 Binary files /dev/null and b/graphics/event_objects/pics/dolls/big_rhydon_doll.png differ diff --git a/graphics/event_objects/pics/dolls/big_snorlax_doll.png b/graphics/event_objects/pics/dolls/big_snorlax_doll.png new file mode 100644 index 000000000..397c9baac Binary files /dev/null and b/graphics/event_objects/pics/dolls/big_snorlax_doll.png differ diff --git a/graphics/event_objects/pics/dolls/big_venusaur_doll.png b/graphics/event_objects/pics/dolls/big_venusaur_doll.png new file mode 100644 index 000000000..9d1961608 Binary files /dev/null and b/graphics/event_objects/pics/dolls/big_venusaur_doll.png differ diff --git a/graphics/event_objects/pics/dolls/big_wailmer_doll.png b/graphics/event_objects/pics/dolls/big_wailmer_doll.png new file mode 100644 index 000000000..a174d30f7 Binary files /dev/null and b/graphics/event_objects/pics/dolls/big_wailmer_doll.png differ diff --git a/graphics/event_objects/pics/dolls/chikorita_doll.png b/graphics/event_objects/pics/dolls/chikorita_doll.png new file mode 100644 index 000000000..6b5e6417d Binary files /dev/null and b/graphics/event_objects/pics/dolls/chikorita_doll.png differ diff --git a/graphics/event_objects/pics/dolls/clefairy_doll.png b/graphics/event_objects/pics/dolls/clefairy_doll.png new file mode 100644 index 000000000..137b20213 Binary files /dev/null and b/graphics/event_objects/pics/dolls/clefairy_doll.png differ diff --git a/graphics/event_objects/pics/dolls/cyndaquil_doll.png b/graphics/event_objects/pics/dolls/cyndaquil_doll.png new file mode 100644 index 000000000..b76221e1d Binary files /dev/null and b/graphics/event_objects/pics/dolls/cyndaquil_doll.png differ diff --git a/graphics/event_objects/pics/dolls/ditto_doll.png b/graphics/event_objects/pics/dolls/ditto_doll.png new file mode 100644 index 000000000..da4c33018 Binary files /dev/null and b/graphics/event_objects/pics/dolls/ditto_doll.png differ diff --git a/graphics/event_objects/pics/dolls/duskull_doll.png b/graphics/event_objects/pics/dolls/duskull_doll.png new file mode 100644 index 000000000..fdfbe3fec Binary files /dev/null and b/graphics/event_objects/pics/dolls/duskull_doll.png differ diff --git a/graphics/event_objects/pics/dolls/gulpin_doll.png b/graphics/event_objects/pics/dolls/gulpin_doll.png new file mode 100644 index 000000000..48bf1824b Binary files /dev/null and b/graphics/event_objects/pics/dolls/gulpin_doll.png differ diff --git a/graphics/event_objects/pics/dolls/jigglypuff_doll.png b/graphics/event_objects/pics/dolls/jigglypuff_doll.png new file mode 100644 index 000000000..1a2c8d44a Binary files /dev/null and b/graphics/event_objects/pics/dolls/jigglypuff_doll.png differ diff --git a/graphics/event_objects/pics/dolls/kecleon_doll.png b/graphics/event_objects/pics/dolls/kecleon_doll.png new file mode 100644 index 000000000..92869882f Binary files /dev/null and b/graphics/event_objects/pics/dolls/kecleon_doll.png differ diff --git a/graphics/event_objects/pics/dolls/lotad_doll.png b/graphics/event_objects/pics/dolls/lotad_doll.png new file mode 100644 index 000000000..9ee2182d1 Binary files /dev/null and b/graphics/event_objects/pics/dolls/lotad_doll.png differ diff --git a/graphics/event_objects/pics/dolls/marill_doll.png b/graphics/event_objects/pics/dolls/marill_doll.png new file mode 100644 index 000000000..d5372f7dd Binary files /dev/null and b/graphics/event_objects/pics/dolls/marill_doll.png differ diff --git a/graphics/event_objects/pics/dolls/meowth_doll.png b/graphics/event_objects/pics/dolls/meowth_doll.png new file mode 100644 index 000000000..67ce3db4c Binary files /dev/null and b/graphics/event_objects/pics/dolls/meowth_doll.png differ diff --git a/graphics/event_objects/pics/dolls/mudkip_doll.png b/graphics/event_objects/pics/dolls/mudkip_doll.png new file mode 100644 index 000000000..8d6af157f Binary files /dev/null and b/graphics/event_objects/pics/dolls/mudkip_doll.png differ diff --git a/graphics/event_objects/pics/dolls/pichu_doll.png b/graphics/event_objects/pics/dolls/pichu_doll.png new file mode 100644 index 000000000..7a2aefc31 Binary files /dev/null and b/graphics/event_objects/pics/dolls/pichu_doll.png differ diff --git a/graphics/event_objects/pics/dolls/pikachu_doll.png b/graphics/event_objects/pics/dolls/pikachu_doll.png new file mode 100644 index 000000000..a762f1e15 Binary files /dev/null and b/graphics/event_objects/pics/dolls/pikachu_doll.png differ diff --git a/graphics/event_objects/pics/dolls/seedot_doll.png b/graphics/event_objects/pics/dolls/seedot_doll.png new file mode 100644 index 000000000..e00c485ae Binary files /dev/null and b/graphics/event_objects/pics/dolls/seedot_doll.png differ diff --git a/graphics/event_objects/pics/dolls/skitty_doll.png b/graphics/event_objects/pics/dolls/skitty_doll.png new file mode 100644 index 000000000..57ae4c5ed Binary files /dev/null and b/graphics/event_objects/pics/dolls/skitty_doll.png differ diff --git a/graphics/event_objects/pics/dolls/smoochum_doll.png b/graphics/event_objects/pics/dolls/smoochum_doll.png new file mode 100644 index 000000000..4adacdfd5 Binary files /dev/null and b/graphics/event_objects/pics/dolls/smoochum_doll.png differ diff --git a/graphics/event_objects/pics/dolls/swablu_doll.png b/graphics/event_objects/pics/dolls/swablu_doll.png new file mode 100644 index 000000000..94e3051d7 Binary files /dev/null and b/graphics/event_objects/pics/dolls/swablu_doll.png differ diff --git a/graphics/event_objects/pics/dolls/togepi_doll.png b/graphics/event_objects/pics/dolls/togepi_doll.png new file mode 100644 index 000000000..4deda750c Binary files /dev/null and b/graphics/event_objects/pics/dolls/togepi_doll.png differ diff --git a/graphics/event_objects/pics/dolls/torchic_doll.png b/graphics/event_objects/pics/dolls/torchic_doll.png new file mode 100644 index 000000000..067eae9fb Binary files /dev/null and b/graphics/event_objects/pics/dolls/torchic_doll.png differ diff --git a/graphics/event_objects/pics/dolls/totodile_doll.png b/graphics/event_objects/pics/dolls/totodile_doll.png new file mode 100644 index 000000000..b347125c9 Binary files /dev/null and b/graphics/event_objects/pics/dolls/totodile_doll.png differ diff --git a/graphics/event_objects/pics/dolls/treecko_doll.png b/graphics/event_objects/pics/dolls/treecko_doll.png new file mode 100644 index 000000000..3ccf44a58 Binary files /dev/null and b/graphics/event_objects/pics/dolls/treecko_doll.png differ diff --git a/graphics/event_objects/pics/dolls/unused_magnemite_doll.png b/graphics/event_objects/pics/dolls/unused_magnemite_doll.png new file mode 100644 index 000000000..bbf386e6a Binary files /dev/null and b/graphics/event_objects/pics/dolls/unused_magnemite_doll.png differ diff --git a/graphics/event_objects/pics/dolls/unused_natu_doll.png b/graphics/event_objects/pics/dolls/unused_natu_doll.png new file mode 100644 index 000000000..a2c4995e3 Binary files /dev/null and b/graphics/event_objects/pics/dolls/unused_natu_doll.png differ diff --git a/graphics/event_objects/pics/dolls/unused_pikachu_doll.png b/graphics/event_objects/pics/dolls/unused_pikachu_doll.png new file mode 100644 index 000000000..9bf762d02 Binary files /dev/null and b/graphics/event_objects/pics/dolls/unused_pikachu_doll.png differ diff --git a/graphics/event_objects/pics/dolls/unused_porygon2_doll.png b/graphics/event_objects/pics/dolls/unused_porygon2_doll.png new file mode 100644 index 000000000..465b7a092 Binary files /dev/null and b/graphics/event_objects/pics/dolls/unused_porygon2_doll.png differ diff --git a/graphics/event_objects/pics/dolls/unused_squirtle_doll.png b/graphics/event_objects/pics/dolls/unused_squirtle_doll.png new file mode 100644 index 000000000..ccc526aae Binary files /dev/null and b/graphics/event_objects/pics/dolls/unused_squirtle_doll.png differ diff --git a/graphics/event_objects/pics/dolls/unused_wooper_doll.png b/graphics/event_objects/pics/dolls/unused_wooper_doll.png new file mode 100644 index 000000000..29bc8fd99 Binary files /dev/null and b/graphics/event_objects/pics/dolls/unused_wooper_doll.png differ diff --git a/graphics/event_objects/pics/dolls/wynaut_doll.png b/graphics/event_objects/pics/dolls/wynaut_doll.png new file mode 100644 index 000000000..3ac3d1311 Binary files /dev/null and b/graphics/event_objects/pics/dolls/wynaut_doll.png differ diff --git a/graphics/event_objects/pics/effects/arrow/0.png b/graphics/event_objects/pics/effects/arrow/0.png new file mode 100644 index 000000000..3f06be064 Binary files /dev/null and b/graphics/event_objects/pics/effects/arrow/0.png differ diff --git a/graphics/event_objects/pics/effects/arrow/1.png b/graphics/event_objects/pics/effects/arrow/1.png new file mode 100644 index 000000000..87bbd99ff Binary files /dev/null and b/graphics/event_objects/pics/effects/arrow/1.png differ diff --git a/graphics/event_objects/pics/effects/arrow/2.png b/graphics/event_objects/pics/effects/arrow/2.png new file mode 100644 index 000000000..f9abae71d Binary files /dev/null and b/graphics/event_objects/pics/effects/arrow/2.png differ diff --git a/graphics/event_objects/pics/effects/arrow/3.png b/graphics/event_objects/pics/effects/arrow/3.png new file mode 100644 index 000000000..58d43a6d8 Binary files /dev/null and b/graphics/event_objects/pics/effects/arrow/3.png differ diff --git a/graphics/event_objects/pics/effects/arrow/4.png b/graphics/event_objects/pics/effects/arrow/4.png new file mode 100644 index 000000000..ef95afd9e Binary files /dev/null and b/graphics/event_objects/pics/effects/arrow/4.png differ diff --git a/graphics/event_objects/pics/effects/arrow/5.png b/graphics/event_objects/pics/effects/arrow/5.png new file mode 100644 index 000000000..71b7e0c27 Binary files /dev/null and b/graphics/event_objects/pics/effects/arrow/5.png differ diff --git a/graphics/event_objects/pics/effects/arrow/6.png b/graphics/event_objects/pics/effects/arrow/6.png new file mode 100644 index 000000000..53c33f44c Binary files /dev/null and b/graphics/event_objects/pics/effects/arrow/6.png differ diff --git a/graphics/event_objects/pics/effects/arrow/7.png b/graphics/event_objects/pics/effects/arrow/7.png new file mode 100644 index 000000000..bda7862da Binary files /dev/null and b/graphics/event_objects/pics/effects/arrow/7.png differ diff --git a/graphics/event_objects/pics/effects/ash/0.png b/graphics/event_objects/pics/effects/ash/0.png new file mode 100644 index 000000000..96a4b8f2a Binary files /dev/null and b/graphics/event_objects/pics/effects/ash/0.png differ diff --git a/graphics/event_objects/pics/effects/ash/1.png b/graphics/event_objects/pics/effects/ash/1.png new file mode 100644 index 000000000..8d973518d Binary files /dev/null and b/graphics/event_objects/pics/effects/ash/1.png differ diff --git a/graphics/event_objects/pics/effects/ash/2.png b/graphics/event_objects/pics/effects/ash/2.png new file mode 100644 index 000000000..eccd2e02d Binary files /dev/null and b/graphics/event_objects/pics/effects/ash/2.png differ diff --git a/graphics/event_objects/pics/effects/ash/3.png b/graphics/event_objects/pics/effects/ash/3.png new file mode 100644 index 000000000..5ad0b8e5a Binary files /dev/null and b/graphics/event_objects/pics/effects/ash/3.png differ diff --git a/graphics/event_objects/pics/effects/ash/4.png b/graphics/event_objects/pics/effects/ash/4.png new file mode 100644 index 000000000..7208f6a5b Binary files /dev/null and b/graphics/event_objects/pics/effects/ash/4.png differ diff --git a/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/0.png b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/0.png new file mode 100644 index 000000000..f3e751d3a Binary files /dev/null and b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/0.png differ diff --git a/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/1.png b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/1.png new file mode 100644 index 000000000..d48fd1234 Binary files /dev/null and b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/1.png differ diff --git a/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/2.png b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/2.png new file mode 100644 index 000000000..9a9abf73e Binary files /dev/null and b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/2.png differ diff --git a/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/3.png b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/3.png new file mode 100644 index 000000000..857abfb0b Binary files /dev/null and b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/3.png differ diff --git a/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/4.png b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/4.png new file mode 100644 index 000000000..bce9df4c7 Binary files /dev/null and b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/4.png differ diff --git a/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/5.png b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/5.png new file mode 100644 index 000000000..4c757bf6b Binary files /dev/null and b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/5.png differ diff --git a/graphics/event_objects/pics/effects/bike_hop_big_splash/0.png b/graphics/event_objects/pics/effects/bike_hop_big_splash/0.png new file mode 100644 index 000000000..420663da8 Binary files /dev/null and b/graphics/event_objects/pics/effects/bike_hop_big_splash/0.png differ diff --git a/graphics/event_objects/pics/effects/bike_hop_big_splash/1.png b/graphics/event_objects/pics/effects/bike_hop_big_splash/1.png new file mode 100644 index 000000000..72ca8fa1c Binary files /dev/null and b/graphics/event_objects/pics/effects/bike_hop_big_splash/1.png differ diff --git a/graphics/event_objects/pics/effects/bike_hop_big_splash/2.png b/graphics/event_objects/pics/effects/bike_hop_big_splash/2.png new file mode 100644 index 000000000..96c224cdf Binary files /dev/null and b/graphics/event_objects/pics/effects/bike_hop_big_splash/2.png differ diff --git a/graphics/event_objects/pics/effects/bike_hop_big_splash/3.png b/graphics/event_objects/pics/effects/bike_hop_big_splash/3.png new file mode 100644 index 000000000..b549ea78c Binary files /dev/null and b/graphics/event_objects/pics/effects/bike_hop_big_splash/3.png differ diff --git a/graphics/event_objects/pics/effects/bike_hop_small_splash/0.png b/graphics/event_objects/pics/effects/bike_hop_small_splash/0.png new file mode 100644 index 000000000..b5cccb306 Binary files /dev/null and b/graphics/event_objects/pics/effects/bike_hop_small_splash/0.png differ diff --git a/graphics/event_objects/pics/effects/bike_hop_small_splash/1.png b/graphics/event_objects/pics/effects/bike_hop_small_splash/1.png new file mode 100644 index 000000000..548198c09 Binary files /dev/null and b/graphics/event_objects/pics/effects/bike_hop_small_splash/1.png differ diff --git a/graphics/event_objects/pics/effects/bike_hop_small_splash/2.png b/graphics/event_objects/pics/effects/bike_hop_small_splash/2.png new file mode 100644 index 000000000..e8b86dfcb Binary files /dev/null and b/graphics/event_objects/pics/effects/bike_hop_small_splash/2.png differ diff --git a/graphics/event_objects/pics/effects/bike_hop_tall_grass/0.png b/graphics/event_objects/pics/effects/bike_hop_tall_grass/0.png new file mode 100644 index 000000000..d2768ec0c Binary files /dev/null and b/graphics/event_objects/pics/effects/bike_hop_tall_grass/0.png differ diff --git a/graphics/event_objects/pics/effects/bike_hop_tall_grass/1.png b/graphics/event_objects/pics/effects/bike_hop_tall_grass/1.png new file mode 100644 index 000000000..7816f4d00 Binary files /dev/null and b/graphics/event_objects/pics/effects/bike_hop_tall_grass/1.png differ diff --git a/graphics/event_objects/pics/effects/bike_hop_tall_grass/2.png b/graphics/event_objects/pics/effects/bike_hop_tall_grass/2.png new file mode 100644 index 000000000..00c51d276 Binary files /dev/null and b/graphics/event_objects/pics/effects/bike_hop_tall_grass/2.png differ diff --git a/graphics/event_objects/pics/effects/bike_hop_tall_grass/3.png b/graphics/event_objects/pics/effects/bike_hop_tall_grass/3.png new file mode 100644 index 000000000..210382b93 Binary files /dev/null and b/graphics/event_objects/pics/effects/bike_hop_tall_grass/3.png differ diff --git a/graphics/event_objects/pics/effects/bike_tire_tracks/0.png b/graphics/event_objects/pics/effects/bike_tire_tracks/0.png new file mode 100644 index 000000000..d4fd46f9b Binary files /dev/null and b/graphics/event_objects/pics/effects/bike_tire_tracks/0.png differ diff --git a/graphics/event_objects/pics/effects/bike_tire_tracks/1.png b/graphics/event_objects/pics/effects/bike_tire_tracks/1.png new file mode 100644 index 000000000..9095cdd74 Binary files /dev/null and b/graphics/event_objects/pics/effects/bike_tire_tracks/1.png differ diff --git a/graphics/event_objects/pics/effects/bike_tire_tracks/2.png b/graphics/event_objects/pics/effects/bike_tire_tracks/2.png new file mode 100644 index 000000000..56907c153 Binary files /dev/null and b/graphics/event_objects/pics/effects/bike_tire_tracks/2.png differ diff --git a/graphics/event_objects/pics/effects/bike_tire_tracks/3.png b/graphics/event_objects/pics/effects/bike_tire_tracks/3.png new file mode 100644 index 000000000..397bfb418 Binary files /dev/null and b/graphics/event_objects/pics/effects/bike_tire_tracks/3.png differ diff --git a/graphics/event_objects/pics/effects/bird.png b/graphics/event_objects/pics/effects/bird.png new file mode 100644 index 000000000..3147f98f5 Binary files /dev/null and b/graphics/event_objects/pics/effects/bird.png differ diff --git a/graphics/event_objects/pics/effects/bubbles/0.png b/graphics/event_objects/pics/effects/bubbles/0.png new file mode 100644 index 000000000..b71b193ae Binary files /dev/null and b/graphics/event_objects/pics/effects/bubbles/0.png differ diff --git a/graphics/event_objects/pics/effects/bubbles/1.png b/graphics/event_objects/pics/effects/bubbles/1.png new file mode 100644 index 000000000..0bd744ef2 Binary files /dev/null and b/graphics/event_objects/pics/effects/bubbles/1.png differ diff --git a/graphics/event_objects/pics/effects/bubbles/2.png b/graphics/event_objects/pics/effects/bubbles/2.png new file mode 100644 index 000000000..4241e8f24 Binary files /dev/null and b/graphics/event_objects/pics/effects/bubbles/2.png differ diff --git a/graphics/event_objects/pics/effects/bubbles/3.png b/graphics/event_objects/pics/effects/bubbles/3.png new file mode 100644 index 000000000..3b440d9a7 Binary files /dev/null and b/graphics/event_objects/pics/effects/bubbles/3.png differ diff --git a/graphics/event_objects/pics/effects/bubbles/4.png b/graphics/event_objects/pics/effects/bubbles/4.png new file mode 100644 index 000000000..de9e66a25 Binary files /dev/null and b/graphics/event_objects/pics/effects/bubbles/4.png differ diff --git a/graphics/event_objects/pics/effects/bubbles/5.png b/graphics/event_objects/pics/effects/bubbles/5.png new file mode 100644 index 000000000..54b9d768b Binary files /dev/null and b/graphics/event_objects/pics/effects/bubbles/5.png differ diff --git a/graphics/event_objects/pics/effects/bubbles/6.png b/graphics/event_objects/pics/effects/bubbles/6.png new file mode 100644 index 000000000..35c26e633 Binary files /dev/null and b/graphics/event_objects/pics/effects/bubbles/6.png differ diff --git a/graphics/event_objects/pics/effects/bubbles/7.png b/graphics/event_objects/pics/effects/bubbles/7.png new file mode 100644 index 000000000..6323e0cc5 Binary files /dev/null and b/graphics/event_objects/pics/effects/bubbles/7.png differ diff --git a/graphics/event_objects/pics/effects/deep_sand_footprints/0.png b/graphics/event_objects/pics/effects/deep_sand_footprints/0.png new file mode 100644 index 000000000..c449b223e Binary files /dev/null and b/graphics/event_objects/pics/effects/deep_sand_footprints/0.png differ diff --git a/graphics/event_objects/pics/effects/deep_sand_footprints/1.png b/graphics/event_objects/pics/effects/deep_sand_footprints/1.png new file mode 100644 index 000000000..2a1d5cce5 Binary files /dev/null and b/graphics/event_objects/pics/effects/deep_sand_footprints/1.png differ diff --git a/graphics/event_objects/pics/effects/ground_impact_dust/0.png b/graphics/event_objects/pics/effects/ground_impact_dust/0.png new file mode 100644 index 000000000..57e2e8898 Binary files /dev/null and b/graphics/event_objects/pics/effects/ground_impact_dust/0.png differ diff --git a/graphics/event_objects/pics/effects/ground_impact_dust/1.png b/graphics/event_objects/pics/effects/ground_impact_dust/1.png new file mode 100644 index 000000000..d91554b6e Binary files /dev/null and b/graphics/event_objects/pics/effects/ground_impact_dust/1.png differ diff --git a/graphics/event_objects/pics/effects/ground_impact_dust/2.png b/graphics/event_objects/pics/effects/ground_impact_dust/2.png new file mode 100644 index 000000000..8d0235141 Binary files /dev/null and b/graphics/event_objects/pics/effects/ground_impact_dust/2.png differ diff --git a/graphics/event_objects/pics/effects/hot_springs_water.png b/graphics/event_objects/pics/effects/hot_springs_water.png new file mode 100644 index 000000000..1b6550b19 Binary files /dev/null and b/graphics/event_objects/pics/effects/hot_springs_water.png differ diff --git a/graphics/event_objects/pics/effects/jump_out_of_ash/0.png b/graphics/event_objects/pics/effects/jump_out_of_ash/0.png new file mode 100644 index 000000000..50f9796b2 Binary files /dev/null and b/graphics/event_objects/pics/effects/jump_out_of_ash/0.png differ diff --git a/graphics/event_objects/pics/effects/jump_out_of_ash/1.png b/graphics/event_objects/pics/effects/jump_out_of_ash/1.png new file mode 100644 index 000000000..685d31fac Binary files /dev/null and b/graphics/event_objects/pics/effects/jump_out_of_ash/1.png differ diff --git a/graphics/event_objects/pics/effects/jump_out_of_ash/2.png b/graphics/event_objects/pics/effects/jump_out_of_ash/2.png new file mode 100644 index 000000000..9f11f176f Binary files /dev/null and b/graphics/event_objects/pics/effects/jump_out_of_ash/2.png differ diff --git a/graphics/event_objects/pics/effects/jump_out_of_ash/3.png b/graphics/event_objects/pics/effects/jump_out_of_ash/3.png new file mode 100644 index 000000000..124581f75 Binary files /dev/null and b/graphics/event_objects/pics/effects/jump_out_of_ash/3.png differ diff --git a/graphics/event_objects/pics/effects/jump_out_of_ash/4.png b/graphics/event_objects/pics/effects/jump_out_of_ash/4.png new file mode 100644 index 000000000..6e584a4dc Binary files /dev/null and b/graphics/event_objects/pics/effects/jump_out_of_ash/4.png differ diff --git a/graphics/event_objects/pics/effects/long_grass/0.png b/graphics/event_objects/pics/effects/long_grass/0.png new file mode 100644 index 000000000..4a02b3d17 Binary files /dev/null and b/graphics/event_objects/pics/effects/long_grass/0.png differ diff --git a/graphics/event_objects/pics/effects/long_grass/1.png b/graphics/event_objects/pics/effects/long_grass/1.png new file mode 100644 index 000000000..97f652c6d Binary files /dev/null and b/graphics/event_objects/pics/effects/long_grass/1.png differ diff --git a/graphics/event_objects/pics/effects/long_grass/2.png b/graphics/event_objects/pics/effects/long_grass/2.png new file mode 100644 index 000000000..313226f8b Binary files /dev/null and b/graphics/event_objects/pics/effects/long_grass/2.png differ diff --git a/graphics/event_objects/pics/effects/long_grass/3.png b/graphics/event_objects/pics/effects/long_grass/3.png new file mode 100644 index 000000000..0565b4069 Binary files /dev/null and b/graphics/event_objects/pics/effects/long_grass/3.png differ diff --git a/graphics/event_objects/pics/effects/mountain_disguise/0.png b/graphics/event_objects/pics/effects/mountain_disguise/0.png new file mode 100644 index 000000000..104056e46 Binary files /dev/null and b/graphics/event_objects/pics/effects/mountain_disguise/0.png differ diff --git a/graphics/event_objects/pics/effects/mountain_disguise/1.png b/graphics/event_objects/pics/effects/mountain_disguise/1.png new file mode 100644 index 000000000..4b2d35963 Binary files /dev/null and b/graphics/event_objects/pics/effects/mountain_disguise/1.png differ diff --git a/graphics/event_objects/pics/effects/mountain_disguise/2.png b/graphics/event_objects/pics/effects/mountain_disguise/2.png new file mode 100644 index 000000000..e2ea3b855 Binary files /dev/null and b/graphics/event_objects/pics/effects/mountain_disguise/2.png differ diff --git a/graphics/event_objects/pics/effects/mountain_disguise/3.png b/graphics/event_objects/pics/effects/mountain_disguise/3.png new file mode 100644 index 000000000..8f0a1be2c Binary files /dev/null and b/graphics/event_objects/pics/effects/mountain_disguise/3.png differ diff --git a/graphics/event_objects/pics/effects/mountain_disguise/4.png b/graphics/event_objects/pics/effects/mountain_disguise/4.png new file mode 100644 index 000000000..8fd4df410 Binary files /dev/null and b/graphics/event_objects/pics/effects/mountain_disguise/4.png differ diff --git a/graphics/event_objects/pics/effects/mountain_disguise/5.png b/graphics/event_objects/pics/effects/mountain_disguise/5.png new file mode 100644 index 000000000..a364b234d Binary files /dev/null and b/graphics/event_objects/pics/effects/mountain_disguise/5.png differ diff --git a/graphics/event_objects/pics/effects/mountain_disguise/6.png b/graphics/event_objects/pics/effects/mountain_disguise/6.png new file mode 100644 index 000000000..2644aa9f1 Binary files /dev/null and b/graphics/event_objects/pics/effects/mountain_disguise/6.png differ diff --git a/graphics/event_objects/pics/effects/ripple/0.png b/graphics/event_objects/pics/effects/ripple/0.png new file mode 100644 index 000000000..24055c7d2 Binary files /dev/null and b/graphics/event_objects/pics/effects/ripple/0.png differ diff --git a/graphics/event_objects/pics/effects/ripple/1.png b/graphics/event_objects/pics/effects/ripple/1.png new file mode 100644 index 000000000..a47853925 Binary files /dev/null and b/graphics/event_objects/pics/effects/ripple/1.png differ diff --git a/graphics/event_objects/pics/effects/ripple/2.png b/graphics/event_objects/pics/effects/ripple/2.png new file mode 100644 index 000000000..6670cb779 Binary files /dev/null and b/graphics/event_objects/pics/effects/ripple/2.png differ diff --git a/graphics/event_objects/pics/effects/ripple/3.png b/graphics/event_objects/pics/effects/ripple/3.png new file mode 100644 index 000000000..122df1940 Binary files /dev/null and b/graphics/event_objects/pics/effects/ripple/3.png differ diff --git a/graphics/event_objects/pics/effects/ripple/4.png b/graphics/event_objects/pics/effects/ripple/4.png new file mode 100644 index 000000000..f4f79afe2 Binary files /dev/null and b/graphics/event_objects/pics/effects/ripple/4.png differ diff --git a/graphics/event_objects/pics/effects/sand_disguise_placeholder/0.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/0.png new file mode 100644 index 000000000..df242de2f Binary files /dev/null and b/graphics/event_objects/pics/effects/sand_disguise_placeholder/0.png differ diff --git a/graphics/event_objects/pics/effects/sand_disguise_placeholder/1.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/1.png new file mode 100644 index 000000000..2e993b30e Binary files /dev/null and b/graphics/event_objects/pics/effects/sand_disguise_placeholder/1.png differ diff --git a/graphics/event_objects/pics/effects/sand_disguise_placeholder/2.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/2.png new file mode 100644 index 000000000..3d6864e41 Binary files /dev/null and b/graphics/event_objects/pics/effects/sand_disguise_placeholder/2.png differ diff --git a/graphics/event_objects/pics/effects/sand_disguise_placeholder/3.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/3.png new file mode 100644 index 000000000..690110a8c Binary files /dev/null and b/graphics/event_objects/pics/effects/sand_disguise_placeholder/3.png differ diff --git a/graphics/event_objects/pics/effects/sand_disguise_placeholder/4.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/4.png new file mode 100644 index 000000000..caa568eac Binary files /dev/null and b/graphics/event_objects/pics/effects/sand_disguise_placeholder/4.png differ diff --git a/graphics/event_objects/pics/effects/sand_disguise_placeholder/5.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/5.png new file mode 100644 index 000000000..0d0bd9886 Binary files /dev/null and b/graphics/event_objects/pics/effects/sand_disguise_placeholder/5.png differ diff --git a/graphics/event_objects/pics/effects/sand_disguise_placeholder/6.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/6.png new file mode 100644 index 000000000..ed40527d0 Binary files /dev/null and b/graphics/event_objects/pics/effects/sand_disguise_placeholder/6.png differ diff --git a/graphics/event_objects/pics/effects/sand_footprints/0.png b/graphics/event_objects/pics/effects/sand_footprints/0.png new file mode 100644 index 000000000..3cc79aa18 Binary files /dev/null and b/graphics/event_objects/pics/effects/sand_footprints/0.png differ diff --git a/graphics/event_objects/pics/effects/sand_footprints/1.png b/graphics/event_objects/pics/effects/sand_footprints/1.png new file mode 100644 index 000000000..80d33783b Binary files /dev/null and b/graphics/event_objects/pics/effects/sand_footprints/1.png differ diff --git a/graphics/event_objects/pics/effects/shadow_extra_large.png b/graphics/event_objects/pics/effects/shadow_extra_large.png new file mode 100644 index 000000000..41b37d8fb Binary files /dev/null and b/graphics/event_objects/pics/effects/shadow_extra_large.png differ diff --git a/graphics/event_objects/pics/effects/shadow_large.png b/graphics/event_objects/pics/effects/shadow_large.png new file mode 100644 index 000000000..f0e76cd7f Binary files /dev/null and b/graphics/event_objects/pics/effects/shadow_large.png differ diff --git a/graphics/event_objects/pics/effects/shadow_medium.png b/graphics/event_objects/pics/effects/shadow_medium.png new file mode 100644 index 000000000..7bf9afef7 Binary files /dev/null and b/graphics/event_objects/pics/effects/shadow_medium.png differ diff --git a/graphics/event_objects/pics/effects/shadow_small.png b/graphics/event_objects/pics/effects/shadow_small.png new file mode 100644 index 000000000..6c13c1b86 Binary files /dev/null and b/graphics/event_objects/pics/effects/shadow_small.png differ diff --git a/graphics/event_objects/pics/effects/short_grass/0.png b/graphics/event_objects/pics/effects/short_grass/0.png new file mode 100644 index 000000000..a5d5181db Binary files /dev/null and b/graphics/event_objects/pics/effects/short_grass/0.png differ diff --git a/graphics/event_objects/pics/effects/short_grass/1.png b/graphics/event_objects/pics/effects/short_grass/1.png new file mode 100644 index 000000000..17a62968a Binary files /dev/null and b/graphics/event_objects/pics/effects/short_grass/1.png differ diff --git a/graphics/event_objects/pics/effects/splash/0.png b/graphics/event_objects/pics/effects/splash/0.png new file mode 100644 index 000000000..2b29c76ae Binary files /dev/null and b/graphics/event_objects/pics/effects/splash/0.png differ diff --git a/graphics/event_objects/pics/effects/splash/1.png b/graphics/event_objects/pics/effects/splash/1.png new file mode 100644 index 000000000..180721342 Binary files /dev/null and b/graphics/event_objects/pics/effects/splash/1.png differ diff --git a/graphics/event_objects/pics/effects/surf_blob/0.png b/graphics/event_objects/pics/effects/surf_blob/0.png new file mode 100644 index 000000000..c4a14e052 Binary files /dev/null and b/graphics/event_objects/pics/effects/surf_blob/0.png differ diff --git a/graphics/event_objects/pics/effects/surf_blob/1.png b/graphics/event_objects/pics/effects/surf_blob/1.png new file mode 100644 index 000000000..25fd5ad92 Binary files /dev/null and b/graphics/event_objects/pics/effects/surf_blob/1.png differ diff --git a/graphics/event_objects/pics/effects/surf_blob/2.png b/graphics/event_objects/pics/effects/surf_blob/2.png new file mode 100644 index 000000000..532da2611 Binary files /dev/null and b/graphics/event_objects/pics/effects/surf_blob/2.png differ diff --git a/graphics/event_objects/pics/effects/tall_grass/0.png b/graphics/event_objects/pics/effects/tall_grass/0.png new file mode 100644 index 000000000..00d596b4c Binary files /dev/null and b/graphics/event_objects/pics/effects/tall_grass/0.png differ diff --git a/graphics/event_objects/pics/effects/tall_grass/1.png b/graphics/event_objects/pics/effects/tall_grass/1.png new file mode 100644 index 000000000..0c8bdd84e Binary files /dev/null and b/graphics/event_objects/pics/effects/tall_grass/1.png differ diff --git a/graphics/event_objects/pics/effects/tall_grass/2.png b/graphics/event_objects/pics/effects/tall_grass/2.png new file mode 100644 index 000000000..55d971758 Binary files /dev/null and b/graphics/event_objects/pics/effects/tall_grass/2.png differ diff --git a/graphics/event_objects/pics/effects/tall_grass/3.png b/graphics/event_objects/pics/effects/tall_grass/3.png new file mode 100644 index 000000000..0add11083 Binary files /dev/null and b/graphics/event_objects/pics/effects/tall_grass/3.png differ diff --git a/graphics/event_objects/pics/effects/tall_grass/4.png b/graphics/event_objects/pics/effects/tall_grass/4.png new file mode 100644 index 000000000..ca164d3cc Binary files /dev/null and b/graphics/event_objects/pics/effects/tall_grass/4.png differ diff --git a/graphics/event_objects/pics/effects/tree_disguise/0.png b/graphics/event_objects/pics/effects/tree_disguise/0.png new file mode 100644 index 000000000..2bce7f9ed Binary files /dev/null and b/graphics/event_objects/pics/effects/tree_disguise/0.png differ diff --git a/graphics/event_objects/pics/effects/tree_disguise/1.png b/graphics/event_objects/pics/effects/tree_disguise/1.png new file mode 100644 index 000000000..e29336cd4 Binary files /dev/null and b/graphics/event_objects/pics/effects/tree_disguise/1.png differ diff --git a/graphics/event_objects/pics/effects/tree_disguise/2.png b/graphics/event_objects/pics/effects/tree_disguise/2.png new file mode 100644 index 000000000..2cca165c5 Binary files /dev/null and b/graphics/event_objects/pics/effects/tree_disguise/2.png differ diff --git a/graphics/event_objects/pics/effects/tree_disguise/3.png b/graphics/event_objects/pics/effects/tree_disguise/3.png new file mode 100644 index 000000000..85dd30cfd Binary files /dev/null and b/graphics/event_objects/pics/effects/tree_disguise/3.png differ diff --git a/graphics/event_objects/pics/effects/tree_disguise/4.png b/graphics/event_objects/pics/effects/tree_disguise/4.png new file mode 100644 index 000000000..8c7821634 Binary files /dev/null and b/graphics/event_objects/pics/effects/tree_disguise/4.png differ diff --git a/graphics/event_objects/pics/effects/tree_disguise/5.png b/graphics/event_objects/pics/effects/tree_disguise/5.png new file mode 100644 index 000000000..2ffd56fcc Binary files /dev/null and b/graphics/event_objects/pics/effects/tree_disguise/5.png differ diff --git a/graphics/event_objects/pics/effects/tree_disguise/6.png b/graphics/event_objects/pics/effects/tree_disguise/6.png new file mode 100644 index 000000000..bc9333162 Binary files /dev/null and b/graphics/event_objects/pics/effects/tree_disguise/6.png differ diff --git a/graphics/event_objects/pics/effects/unknown_16/0.png b/graphics/event_objects/pics/effects/unknown_16/0.png new file mode 100644 index 000000000..491801c32 Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_16/0.png differ diff --git a/graphics/event_objects/pics/effects/unknown_16/1.png b/graphics/event_objects/pics/effects/unknown_16/1.png new file mode 100644 index 000000000..f83ca15da Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_16/1.png differ diff --git a/graphics/event_objects/pics/effects/unknown_16/2.png b/graphics/event_objects/pics/effects/unknown_16/2.png new file mode 100644 index 000000000..073aa9b7e Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_16/2.png differ diff --git a/graphics/event_objects/pics/effects/unknown_16/3.png b/graphics/event_objects/pics/effects/unknown_16/3.png new file mode 100644 index 000000000..e7b5c96cf Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_16/3.png differ diff --git a/graphics/event_objects/pics/effects/unknown_16/4.png b/graphics/event_objects/pics/effects/unknown_16/4.png new file mode 100644 index 000000000..8972d5d81 Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_16/4.png differ diff --git a/graphics/event_objects/pics/effects/unknown_16/5.png b/graphics/event_objects/pics/effects/unknown_16/5.png new file mode 100644 index 000000000..d570a9a8d Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_16/5.png differ diff --git a/graphics/event_objects/pics/effects/unknown_17/0.png b/graphics/event_objects/pics/effects/unknown_17/0.png new file mode 100644 index 000000000..9c804844e Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_17/0.png differ diff --git a/graphics/event_objects/pics/effects/unknown_17/1.png b/graphics/event_objects/pics/effects/unknown_17/1.png new file mode 100644 index 000000000..6628b5820 Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_17/1.png differ diff --git a/graphics/event_objects/pics/effects/unknown_17/2.png b/graphics/event_objects/pics/effects/unknown_17/2.png new file mode 100644 index 000000000..a5cdcca57 Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_17/2.png differ diff --git a/graphics/event_objects/pics/effects/unknown_17/3.png b/graphics/event_objects/pics/effects/unknown_17/3.png new file mode 100644 index 000000000..2f9a20019 Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_17/3.png differ diff --git a/graphics/event_objects/pics/effects/unknown_17/4.png b/graphics/event_objects/pics/effects/unknown_17/4.png new file mode 100644 index 000000000..ce0bc29aa Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_17/4.png differ diff --git a/graphics/event_objects/pics/effects/unknown_17/5.png b/graphics/event_objects/pics/effects/unknown_17/5.png new file mode 100644 index 000000000..f92888a3a Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_17/5.png differ diff --git a/graphics/event_objects/pics/effects/unknown_17/6.png b/graphics/event_objects/pics/effects/unknown_17/6.png new file mode 100644 index 000000000..7e740a956 Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_17/6.png differ diff --git a/graphics/event_objects/pics/effects/unknown_17/7.png b/graphics/event_objects/pics/effects/unknown_17/7.png new file mode 100644 index 000000000..25d90e16c Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_17/7.png differ diff --git a/graphics/event_objects/pics/effects/unknown_18/0.png b/graphics/event_objects/pics/effects/unknown_18/0.png new file mode 100644 index 000000000..70b39df59 Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_18/0.png differ diff --git a/graphics/event_objects/pics/effects/unknown_18/1.png b/graphics/event_objects/pics/effects/unknown_18/1.png new file mode 100644 index 000000000..392298f5a Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_18/1.png differ diff --git a/graphics/event_objects/pics/effects/unknown_18/2.png b/graphics/event_objects/pics/effects/unknown_18/2.png new file mode 100644 index 000000000..ff418e940 Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_18/2.png differ diff --git a/graphics/event_objects/pics/effects/unknown_18/3.png b/graphics/event_objects/pics/effects/unknown_18/3.png new file mode 100644 index 000000000..0e1e13438 Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_18/3.png differ diff --git a/graphics/event_objects/pics/effects/unknown_19/0.png b/graphics/event_objects/pics/effects/unknown_19/0.png new file mode 100644 index 000000000..ef8005066 Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_19/0.png differ diff --git a/graphics/event_objects/pics/effects/unknown_19/1.png b/graphics/event_objects/pics/effects/unknown_19/1.png new file mode 100644 index 000000000..6fde1a291 Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_19/1.png differ diff --git a/graphics/event_objects/pics/effects/unknown_19/2.png b/graphics/event_objects/pics/effects/unknown_19/2.png new file mode 100644 index 000000000..c385fd84c Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_19/2.png differ diff --git a/graphics/event_objects/pics/effects/unknown_19/3.png b/graphics/event_objects/pics/effects/unknown_19/3.png new file mode 100644 index 000000000..084c20314 Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_19/3.png differ diff --git a/graphics/event_objects/pics/effects/unknown_20/0.png b/graphics/event_objects/pics/effects/unknown_20/0.png new file mode 100644 index 000000000..eec853d53 Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_20/0.png differ diff --git a/graphics/event_objects/pics/effects/unknown_20/1.png b/graphics/event_objects/pics/effects/unknown_20/1.png new file mode 100644 index 000000000..f4782fc67 Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_20/1.png differ diff --git a/graphics/event_objects/pics/effects/unknown_20/2.png b/graphics/event_objects/pics/effects/unknown_20/2.png new file mode 100644 index 000000000..416dae69d Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_20/2.png differ diff --git a/graphics/event_objects/pics/effects/unknown_20/3.png b/graphics/event_objects/pics/effects/unknown_20/3.png new file mode 100644 index 000000000..3d966e81c Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_20/3.png differ diff --git a/graphics/event_objects/pics/effects/unknown_20/4.png b/graphics/event_objects/pics/effects/unknown_20/4.png new file mode 100644 index 000000000..6bbfbca12 Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_20/4.png differ diff --git a/graphics/event_objects/pics/effects/unknown_29/0.png b/graphics/event_objects/pics/effects/unknown_29/0.png new file mode 100644 index 000000000..87fe91c97 Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_29/0.png differ diff --git a/graphics/event_objects/pics/effects/unknown_29/1.png b/graphics/event_objects/pics/effects/unknown_29/1.png new file mode 100644 index 000000000..c20fb34bb Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_29/1.png differ diff --git a/graphics/event_objects/pics/effects/unknown_29/2.png b/graphics/event_objects/pics/effects/unknown_29/2.png new file mode 100644 index 000000000..def972b20 Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_29/2.png differ diff --git a/graphics/event_objects/pics/effects/unknown_33/0.png b/graphics/event_objects/pics/effects/unknown_33/0.png new file mode 100644 index 000000000..2241eabd3 Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_33/0.png differ diff --git a/graphics/event_objects/pics/effects/unknown_33/1.png b/graphics/event_objects/pics/effects/unknown_33/1.png new file mode 100644 index 000000000..5f90405d8 Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_33/1.png differ diff --git a/graphics/event_objects/pics/effects/unknown_33/2.png b/graphics/event_objects/pics/effects/unknown_33/2.png new file mode 100644 index 000000000..3f1c3a76a Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_33/2.png differ diff --git a/graphics/event_objects/pics/effects/unknown_33/3.png b/graphics/event_objects/pics/effects/unknown_33/3.png new file mode 100644 index 000000000..2696f4a5a Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_33/3.png differ diff --git a/graphics/event_objects/pics/effects/unknown_33/4.png b/graphics/event_objects/pics/effects/unknown_33/4.png new file mode 100644 index 000000000..c2d1785bf Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_33/4.png differ diff --git a/graphics/event_objects/pics/effects/unknown_35/0.png b/graphics/event_objects/pics/effects/unknown_35/0.png new file mode 100644 index 000000000..c2ae128f7 Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_35/0.png differ diff --git a/graphics/event_objects/pics/effects/unknown_35/1.png b/graphics/event_objects/pics/effects/unknown_35/1.png new file mode 100644 index 000000000..fe68b19fd Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_35/1.png differ diff --git a/graphics/event_objects/pics/effects/unknown_4F6D38/0.png b/graphics/event_objects/pics/effects/unknown_4F6D38/0.png new file mode 100644 index 000000000..3ee87e1cd Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_4F6D38/0.png differ diff --git a/graphics/event_objects/pics/effects/unknown_4F7E38/0.png b/graphics/event_objects/pics/effects/unknown_4F7E38/0.png new file mode 100644 index 000000000..685aee28b Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_4F7E38/0.png differ diff --git a/graphics/event_objects/pics/effects/unused_grass/0.png b/graphics/event_objects/pics/effects/unused_grass/0.png new file mode 100644 index 000000000..2e16f15cb Binary files /dev/null and b/graphics/event_objects/pics/effects/unused_grass/0.png differ diff --git a/graphics/event_objects/pics/effects/unused_grass/1.png b/graphics/event_objects/pics/effects/unused_grass/1.png new file mode 100644 index 000000000..dd33b0d88 Binary files /dev/null and b/graphics/event_objects/pics/effects/unused_grass/1.png differ diff --git a/graphics/event_objects/pics/effects/unused_grass/2.png b/graphics/event_objects/pics/effects/unused_grass/2.png new file mode 100644 index 000000000..345d454cd Binary files /dev/null and b/graphics/event_objects/pics/effects/unused_grass/2.png differ diff --git a/graphics/event_objects/pics/effects/unused_grass/3.png b/graphics/event_objects/pics/effects/unused_grass/3.png new file mode 100644 index 000000000..087676102 Binary files /dev/null and b/graphics/event_objects/pics/effects/unused_grass/3.png differ diff --git a/graphics/event_objects/pics/misc/birchs_bag.png b/graphics/event_objects/pics/misc/birchs_bag.png new file mode 100644 index 000000000..045e5546c Binary files /dev/null and b/graphics/event_objects/pics/misc/birchs_bag.png differ diff --git a/graphics/event_objects/pics/misc/birth_island_stone.png b/graphics/event_objects/pics/misc/birth_island_stone.png new file mode 100644 index 000000000..2ec134c22 Binary files /dev/null and b/graphics/event_objects/pics/misc/birth_island_stone.png differ diff --git a/graphics/event_objects/pics/misc/breakable_rock/0.png b/graphics/event_objects/pics/misc/breakable_rock/0.png new file mode 100644 index 000000000..058324c86 Binary files /dev/null and b/graphics/event_objects/pics/misc/breakable_rock/0.png differ diff --git a/graphics/event_objects/pics/misc/breakable_rock/1.png b/graphics/event_objects/pics/misc/breakable_rock/1.png new file mode 100644 index 000000000..6c8b3133a Binary files /dev/null and b/graphics/event_objects/pics/misc/breakable_rock/1.png differ diff --git a/graphics/event_objects/pics/misc/breakable_rock/2.png b/graphics/event_objects/pics/misc/breakable_rock/2.png new file mode 100644 index 000000000..737148d66 Binary files /dev/null and b/graphics/event_objects/pics/misc/breakable_rock/2.png differ diff --git a/graphics/event_objects/pics/misc/breakable_rock/3.png b/graphics/event_objects/pics/misc/breakable_rock/3.png new file mode 100644 index 000000000..89eedd1aa Binary files /dev/null and b/graphics/event_objects/pics/misc/breakable_rock/3.png differ diff --git a/graphics/event_objects/pics/misc/cable_car.png b/graphics/event_objects/pics/misc/cable_car.png new file mode 100644 index 000000000..e0bd21ddf Binary files /dev/null and b/graphics/event_objects/pics/misc/cable_car.png differ diff --git a/graphics/event_objects/pics/misc/cuttable_tree/0.png b/graphics/event_objects/pics/misc/cuttable_tree/0.png new file mode 100644 index 000000000..509d8b03c Binary files /dev/null and b/graphics/event_objects/pics/misc/cuttable_tree/0.png differ diff --git a/graphics/event_objects/pics/misc/cuttable_tree/1.png b/graphics/event_objects/pics/misc/cuttable_tree/1.png new file mode 100644 index 000000000..afa42cf16 Binary files /dev/null and b/graphics/event_objects/pics/misc/cuttable_tree/1.png differ diff --git a/graphics/event_objects/pics/misc/cuttable_tree/2.png b/graphics/event_objects/pics/misc/cuttable_tree/2.png new file mode 100644 index 000000000..f222ece43 Binary files /dev/null and b/graphics/event_objects/pics/misc/cuttable_tree/2.png differ diff --git a/graphics/event_objects/pics/misc/cuttable_tree/3.png b/graphics/event_objects/pics/misc/cuttable_tree/3.png new file mode 100644 index 000000000..09ffefd29 Binary files /dev/null and b/graphics/event_objects/pics/misc/cuttable_tree/3.png differ diff --git a/graphics/event_objects/pics/misc/fossil.png b/graphics/event_objects/pics/misc/fossil.png new file mode 100644 index 000000000..a8da0e8ff Binary files /dev/null and b/graphics/event_objects/pics/misc/fossil.png differ diff --git a/graphics/event_objects/pics/misc/item_ball.png b/graphics/event_objects/pics/misc/item_ball.png new file mode 100644 index 000000000..a30e02fb1 Binary files /dev/null and b/graphics/event_objects/pics/misc/item_ball.png differ diff --git a/graphics/event_objects/pics/misc/moving_box.png b/graphics/event_objects/pics/misc/moving_box.png new file mode 100644 index 000000000..3cbc41900 Binary files /dev/null and b/graphics/event_objects/pics/misc/moving_box.png differ diff --git a/graphics/event_objects/pics/misc/mr_brineys_boat/0.png b/graphics/event_objects/pics/misc/mr_brineys_boat/0.png new file mode 100644 index 000000000..593ed07c8 Binary files /dev/null and b/graphics/event_objects/pics/misc/mr_brineys_boat/0.png differ diff --git a/graphics/event_objects/pics/misc/mr_brineys_boat/1.png b/graphics/event_objects/pics/misc/mr_brineys_boat/1.png new file mode 100644 index 000000000..39b75fd73 Binary files /dev/null and b/graphics/event_objects/pics/misc/mr_brineys_boat/1.png differ diff --git a/graphics/event_objects/pics/misc/mr_brineys_boat/2.png b/graphics/event_objects/pics/misc/mr_brineys_boat/2.png new file mode 100644 index 000000000..9db6b11fe Binary files /dev/null and b/graphics/event_objects/pics/misc/mr_brineys_boat/2.png differ diff --git a/graphics/event_objects/pics/misc/pushable_boulder.png b/graphics/event_objects/pics/misc/pushable_boulder.png new file mode 100644 index 000000000..a6962123c Binary files /dev/null and b/graphics/event_objects/pics/misc/pushable_boulder.png differ diff --git a/graphics/event_objects/pics/misc/ss_tidal.png b/graphics/event_objects/pics/misc/ss_tidal.png new file mode 100644 index 000000000..40ca9a3f3 Binary files /dev/null and b/graphics/event_objects/pics/misc/ss_tidal.png differ diff --git a/graphics/event_objects/pics/misc/statue.png b/graphics/event_objects/pics/misc/statue.png new file mode 100644 index 000000000..725aa8a7b Binary files /dev/null and b/graphics/event_objects/pics/misc/statue.png differ diff --git a/graphics/event_objects/pics/misc/submarine_shadow.png b/graphics/event_objects/pics/misc/submarine_shadow.png new file mode 100644 index 000000000..b9dfc4c55 Binary files /dev/null and b/graphics/event_objects/pics/misc/submarine_shadow.png differ diff --git a/graphics/event_objects/pics/misc/truck.png b/graphics/event_objects/pics/misc/truck.png new file mode 100644 index 000000000..0d31ffbc2 Binary files /dev/null and b/graphics/event_objects/pics/misc/truck.png differ diff --git a/graphics/event_objects/pics/people/anabel/0.png b/graphics/event_objects/pics/people/anabel/0.png new file mode 100644 index 000000000..94add04bb Binary files /dev/null and b/graphics/event_objects/pics/people/anabel/0.png differ diff --git a/graphics/event_objects/pics/people/anabel/1.png b/graphics/event_objects/pics/people/anabel/1.png new file mode 100644 index 000000000..644510063 Binary files /dev/null and b/graphics/event_objects/pics/people/anabel/1.png differ diff --git a/graphics/event_objects/pics/people/anabel/2.png b/graphics/event_objects/pics/people/anabel/2.png new file mode 100644 index 000000000..92d365c9e Binary files /dev/null and b/graphics/event_objects/pics/people/anabel/2.png differ diff --git a/graphics/event_objects/pics/people/anabel/3.png b/graphics/event_objects/pics/people/anabel/3.png new file mode 100644 index 000000000..34a07e500 Binary files /dev/null and b/graphics/event_objects/pics/people/anabel/3.png differ diff --git a/graphics/event_objects/pics/people/anabel/4.png b/graphics/event_objects/pics/people/anabel/4.png new file mode 100644 index 000000000..78a3f6413 Binary files /dev/null and b/graphics/event_objects/pics/people/anabel/4.png differ diff --git a/graphics/event_objects/pics/people/anabel/5.png b/graphics/event_objects/pics/people/anabel/5.png new file mode 100644 index 000000000..df1f31dbb Binary files /dev/null and b/graphics/event_objects/pics/people/anabel/5.png differ diff --git a/graphics/event_objects/pics/people/anabel/6.png b/graphics/event_objects/pics/people/anabel/6.png new file mode 100644 index 000000000..78914f5b2 Binary files /dev/null and b/graphics/event_objects/pics/people/anabel/6.png differ diff --git a/graphics/event_objects/pics/people/anabel/7.png b/graphics/event_objects/pics/people/anabel/7.png new file mode 100644 index 000000000..beb27e3c0 Binary files /dev/null and b/graphics/event_objects/pics/people/anabel/7.png differ diff --git a/graphics/event_objects/pics/people/anabel/8.png b/graphics/event_objects/pics/people/anabel/8.png new file mode 100644 index 000000000..2d41a5e11 Binary files /dev/null and b/graphics/event_objects/pics/people/anabel/8.png differ diff --git a/graphics/event_objects/pics/people/aqua_member_f/0.png b/graphics/event_objects/pics/people/aqua_member_f/0.png new file mode 100644 index 000000000..1f8c75cb3 Binary files /dev/null and b/graphics/event_objects/pics/people/aqua_member_f/0.png differ diff --git a/graphics/event_objects/pics/people/aqua_member_f/1.png b/graphics/event_objects/pics/people/aqua_member_f/1.png new file mode 100644 index 000000000..16bc28e20 Binary files /dev/null and b/graphics/event_objects/pics/people/aqua_member_f/1.png differ diff --git a/graphics/event_objects/pics/people/aqua_member_f/2.png b/graphics/event_objects/pics/people/aqua_member_f/2.png new file mode 100644 index 000000000..3e95c8ba2 Binary files /dev/null and b/graphics/event_objects/pics/people/aqua_member_f/2.png differ diff --git a/graphics/event_objects/pics/people/aqua_member_f/3.png b/graphics/event_objects/pics/people/aqua_member_f/3.png new file mode 100644 index 000000000..8d17c85fd Binary files /dev/null and b/graphics/event_objects/pics/people/aqua_member_f/3.png differ diff --git a/graphics/event_objects/pics/people/aqua_member_f/4.png b/graphics/event_objects/pics/people/aqua_member_f/4.png new file mode 100644 index 000000000..f62fdb100 Binary files /dev/null and b/graphics/event_objects/pics/people/aqua_member_f/4.png differ diff --git a/graphics/event_objects/pics/people/aqua_member_f/5.png b/graphics/event_objects/pics/people/aqua_member_f/5.png new file mode 100644 index 000000000..6ec1ea515 Binary files /dev/null and b/graphics/event_objects/pics/people/aqua_member_f/5.png differ diff --git a/graphics/event_objects/pics/people/aqua_member_f/6.png b/graphics/event_objects/pics/people/aqua_member_f/6.png new file mode 100644 index 000000000..0d74cf4d1 Binary files /dev/null and b/graphics/event_objects/pics/people/aqua_member_f/6.png differ diff --git a/graphics/event_objects/pics/people/aqua_member_f/7.png b/graphics/event_objects/pics/people/aqua_member_f/7.png new file mode 100644 index 000000000..fe5894e5f Binary files /dev/null and b/graphics/event_objects/pics/people/aqua_member_f/7.png differ diff --git a/graphics/event_objects/pics/people/aqua_member_f/8.png b/graphics/event_objects/pics/people/aqua_member_f/8.png new file mode 100644 index 000000000..3b3f736cb Binary files /dev/null and b/graphics/event_objects/pics/people/aqua_member_f/8.png differ diff --git a/graphics/event_objects/pics/people/aqua_member_m/0.png b/graphics/event_objects/pics/people/aqua_member_m/0.png new file mode 100644 index 000000000..60a2b8ace Binary files /dev/null and b/graphics/event_objects/pics/people/aqua_member_m/0.png differ diff --git a/graphics/event_objects/pics/people/aqua_member_m/1.png b/graphics/event_objects/pics/people/aqua_member_m/1.png new file mode 100644 index 000000000..d87426a18 Binary files /dev/null and b/graphics/event_objects/pics/people/aqua_member_m/1.png differ diff --git a/graphics/event_objects/pics/people/aqua_member_m/2.png b/graphics/event_objects/pics/people/aqua_member_m/2.png new file mode 100644 index 000000000..c75f63396 Binary files /dev/null and b/graphics/event_objects/pics/people/aqua_member_m/2.png differ diff --git a/graphics/event_objects/pics/people/aqua_member_m/3.png b/graphics/event_objects/pics/people/aqua_member_m/3.png new file mode 100644 index 000000000..aaba2d9a1 Binary files /dev/null and b/graphics/event_objects/pics/people/aqua_member_m/3.png differ diff --git a/graphics/event_objects/pics/people/aqua_member_m/4.png b/graphics/event_objects/pics/people/aqua_member_m/4.png new file mode 100644 index 000000000..326628fd0 Binary files /dev/null and b/graphics/event_objects/pics/people/aqua_member_m/4.png differ diff --git a/graphics/event_objects/pics/people/aqua_member_m/5.png b/graphics/event_objects/pics/people/aqua_member_m/5.png new file mode 100644 index 000000000..647cfb95c Binary files /dev/null and b/graphics/event_objects/pics/people/aqua_member_m/5.png differ diff --git a/graphics/event_objects/pics/people/aqua_member_m/6.png b/graphics/event_objects/pics/people/aqua_member_m/6.png new file mode 100644 index 000000000..3918e64e9 Binary files /dev/null and b/graphics/event_objects/pics/people/aqua_member_m/6.png differ diff --git a/graphics/event_objects/pics/people/aqua_member_m/7.png b/graphics/event_objects/pics/people/aqua_member_m/7.png new file mode 100644 index 000000000..57064088e Binary files /dev/null and b/graphics/event_objects/pics/people/aqua_member_m/7.png differ diff --git a/graphics/event_objects/pics/people/aqua_member_m/8.png b/graphics/event_objects/pics/people/aqua_member_m/8.png new file mode 100644 index 000000000..1e59c0cae Binary files /dev/null and b/graphics/event_objects/pics/people/aqua_member_m/8.png differ diff --git a/graphics/event_objects/pics/people/archie/0.png b/graphics/event_objects/pics/people/archie/0.png new file mode 100644 index 000000000..dd091bd16 Binary files /dev/null and b/graphics/event_objects/pics/people/archie/0.png differ diff --git a/graphics/event_objects/pics/people/archie/1.png b/graphics/event_objects/pics/people/archie/1.png new file mode 100644 index 000000000..1d278db6d Binary files /dev/null and b/graphics/event_objects/pics/people/archie/1.png differ diff --git a/graphics/event_objects/pics/people/archie/2.png b/graphics/event_objects/pics/people/archie/2.png new file mode 100644 index 000000000..2e1b7a1ce Binary files /dev/null and b/graphics/event_objects/pics/people/archie/2.png differ diff --git a/graphics/event_objects/pics/people/archie/3.png b/graphics/event_objects/pics/people/archie/3.png new file mode 100644 index 000000000..576abb99d Binary files /dev/null and b/graphics/event_objects/pics/people/archie/3.png differ diff --git a/graphics/event_objects/pics/people/archie/4.png b/graphics/event_objects/pics/people/archie/4.png new file mode 100644 index 000000000..f48687318 Binary files /dev/null and b/graphics/event_objects/pics/people/archie/4.png differ diff --git a/graphics/event_objects/pics/people/archie/5.png b/graphics/event_objects/pics/people/archie/5.png new file mode 100644 index 000000000..f21490b7b Binary files /dev/null and b/graphics/event_objects/pics/people/archie/5.png differ diff --git a/graphics/event_objects/pics/people/archie/6.png b/graphics/event_objects/pics/people/archie/6.png new file mode 100644 index 000000000..29305a952 Binary files /dev/null and b/graphics/event_objects/pics/people/archie/6.png differ diff --git a/graphics/event_objects/pics/people/archie/7.png b/graphics/event_objects/pics/people/archie/7.png new file mode 100644 index 000000000..778a7e964 Binary files /dev/null and b/graphics/event_objects/pics/people/archie/7.png differ diff --git a/graphics/event_objects/pics/people/archie/8.png b/graphics/event_objects/pics/people/archie/8.png new file mode 100644 index 000000000..237101046 Binary files /dev/null and b/graphics/event_objects/pics/people/archie/8.png differ diff --git a/graphics/event_objects/pics/people/artist/0.png b/graphics/event_objects/pics/people/artist/0.png new file mode 100644 index 000000000..9f25f9ea0 Binary files /dev/null and b/graphics/event_objects/pics/people/artist/0.png differ diff --git a/graphics/event_objects/pics/people/artist/1.png b/graphics/event_objects/pics/people/artist/1.png new file mode 100644 index 000000000..6056f77a5 Binary files /dev/null and b/graphics/event_objects/pics/people/artist/1.png differ diff --git a/graphics/event_objects/pics/people/artist/2.png b/graphics/event_objects/pics/people/artist/2.png new file mode 100644 index 000000000..f1908e664 Binary files /dev/null and b/graphics/event_objects/pics/people/artist/2.png differ diff --git a/graphics/event_objects/pics/people/artist/3.png b/graphics/event_objects/pics/people/artist/3.png new file mode 100644 index 000000000..62cafaa79 Binary files /dev/null and b/graphics/event_objects/pics/people/artist/3.png differ diff --git a/graphics/event_objects/pics/people/artist/4.png b/graphics/event_objects/pics/people/artist/4.png new file mode 100644 index 000000000..718ad2d3b Binary files /dev/null and b/graphics/event_objects/pics/people/artist/4.png differ diff --git a/graphics/event_objects/pics/people/artist/5.png b/graphics/event_objects/pics/people/artist/5.png new file mode 100644 index 000000000..cb37c0138 Binary files /dev/null and b/graphics/event_objects/pics/people/artist/5.png differ diff --git a/graphics/event_objects/pics/people/artist/6.png b/graphics/event_objects/pics/people/artist/6.png new file mode 100644 index 000000000..281724e3d Binary files /dev/null and b/graphics/event_objects/pics/people/artist/6.png differ diff --git a/graphics/event_objects/pics/people/artist/7.png b/graphics/event_objects/pics/people/artist/7.png new file mode 100644 index 000000000..36157c6ee Binary files /dev/null and b/graphics/event_objects/pics/people/artist/7.png differ diff --git a/graphics/event_objects/pics/people/artist/8.png b/graphics/event_objects/pics/people/artist/8.png new file mode 100644 index 000000000..df7afa65e Binary files /dev/null and b/graphics/event_objects/pics/people/artist/8.png differ diff --git a/graphics/event_objects/pics/people/beauty/0.png b/graphics/event_objects/pics/people/beauty/0.png new file mode 100644 index 000000000..50e0ece37 Binary files /dev/null and b/graphics/event_objects/pics/people/beauty/0.png differ diff --git a/graphics/event_objects/pics/people/beauty/1.png b/graphics/event_objects/pics/people/beauty/1.png new file mode 100644 index 000000000..3a1ba51e9 Binary files /dev/null and b/graphics/event_objects/pics/people/beauty/1.png differ diff --git a/graphics/event_objects/pics/people/beauty/2.png b/graphics/event_objects/pics/people/beauty/2.png new file mode 100644 index 000000000..5787f360f Binary files /dev/null and b/graphics/event_objects/pics/people/beauty/2.png differ diff --git a/graphics/event_objects/pics/people/beauty/3.png b/graphics/event_objects/pics/people/beauty/3.png new file mode 100644 index 000000000..cc200158f Binary files /dev/null and b/graphics/event_objects/pics/people/beauty/3.png differ diff --git a/graphics/event_objects/pics/people/beauty/4.png b/graphics/event_objects/pics/people/beauty/4.png new file mode 100644 index 000000000..f49ef45c6 Binary files /dev/null and b/graphics/event_objects/pics/people/beauty/4.png differ diff --git a/graphics/event_objects/pics/people/beauty/5.png b/graphics/event_objects/pics/people/beauty/5.png new file mode 100644 index 000000000..c8eed61d1 Binary files /dev/null and b/graphics/event_objects/pics/people/beauty/5.png differ diff --git a/graphics/event_objects/pics/people/beauty/6.png b/graphics/event_objects/pics/people/beauty/6.png new file mode 100644 index 000000000..fb298aa74 Binary files /dev/null and b/graphics/event_objects/pics/people/beauty/6.png differ diff --git a/graphics/event_objects/pics/people/beauty/7.png b/graphics/event_objects/pics/people/beauty/7.png new file mode 100644 index 000000000..0b576e71a Binary files /dev/null and b/graphics/event_objects/pics/people/beauty/7.png differ diff --git a/graphics/event_objects/pics/people/beauty/8.png b/graphics/event_objects/pics/people/beauty/8.png new file mode 100644 index 000000000..77de6d5c5 Binary files /dev/null and b/graphics/event_objects/pics/people/beauty/8.png differ diff --git a/graphics/event_objects/pics/people/black_belt/0.png b/graphics/event_objects/pics/people/black_belt/0.png new file mode 100644 index 000000000..0003a1a88 Binary files /dev/null and b/graphics/event_objects/pics/people/black_belt/0.png differ diff --git a/graphics/event_objects/pics/people/black_belt/1.png b/graphics/event_objects/pics/people/black_belt/1.png new file mode 100644 index 000000000..c3e3b8a1d Binary files /dev/null and b/graphics/event_objects/pics/people/black_belt/1.png differ diff --git a/graphics/event_objects/pics/people/black_belt/2.png b/graphics/event_objects/pics/people/black_belt/2.png new file mode 100644 index 000000000..0cb8f30bf Binary files /dev/null and b/graphics/event_objects/pics/people/black_belt/2.png differ diff --git a/graphics/event_objects/pics/people/black_belt/3.png b/graphics/event_objects/pics/people/black_belt/3.png new file mode 100644 index 000000000..8bae80b47 Binary files /dev/null and b/graphics/event_objects/pics/people/black_belt/3.png differ diff --git a/graphics/event_objects/pics/people/black_belt/4.png b/graphics/event_objects/pics/people/black_belt/4.png new file mode 100644 index 000000000..aacf9c3f7 Binary files /dev/null and b/graphics/event_objects/pics/people/black_belt/4.png differ diff --git a/graphics/event_objects/pics/people/black_belt/5.png b/graphics/event_objects/pics/people/black_belt/5.png new file mode 100644 index 000000000..41c60075c Binary files /dev/null and b/graphics/event_objects/pics/people/black_belt/5.png differ diff --git a/graphics/event_objects/pics/people/black_belt/6.png b/graphics/event_objects/pics/people/black_belt/6.png new file mode 100644 index 000000000..fa1c426a1 Binary files /dev/null and b/graphics/event_objects/pics/people/black_belt/6.png differ diff --git a/graphics/event_objects/pics/people/black_belt/7.png b/graphics/event_objects/pics/people/black_belt/7.png new file mode 100644 index 000000000..013986add Binary files /dev/null and b/graphics/event_objects/pics/people/black_belt/7.png differ diff --git a/graphics/event_objects/pics/people/black_belt/8.png b/graphics/event_objects/pics/people/black_belt/8.png new file mode 100644 index 000000000..5efef483a Binary files /dev/null and b/graphics/event_objects/pics/people/black_belt/8.png differ diff --git a/graphics/event_objects/pics/people/boy_1/0.png b/graphics/event_objects/pics/people/boy_1/0.png new file mode 100644 index 000000000..ddb78aa81 Binary files /dev/null and b/graphics/event_objects/pics/people/boy_1/0.png differ diff --git a/graphics/event_objects/pics/people/boy_1/1.png b/graphics/event_objects/pics/people/boy_1/1.png new file mode 100644 index 000000000..57c6245b2 Binary files /dev/null and b/graphics/event_objects/pics/people/boy_1/1.png differ diff --git a/graphics/event_objects/pics/people/boy_1/2.png b/graphics/event_objects/pics/people/boy_1/2.png new file mode 100644 index 000000000..cc0797ac8 Binary files /dev/null and b/graphics/event_objects/pics/people/boy_1/2.png differ diff --git a/graphics/event_objects/pics/people/boy_1/3.png b/graphics/event_objects/pics/people/boy_1/3.png new file mode 100644 index 000000000..aa08c6302 Binary files /dev/null and b/graphics/event_objects/pics/people/boy_1/3.png differ diff --git a/graphics/event_objects/pics/people/boy_1/4.png b/graphics/event_objects/pics/people/boy_1/4.png new file mode 100644 index 000000000..d60c49f7e Binary files /dev/null and b/graphics/event_objects/pics/people/boy_1/4.png differ diff --git a/graphics/event_objects/pics/people/boy_1/5.png b/graphics/event_objects/pics/people/boy_1/5.png new file mode 100644 index 000000000..e60d62e06 Binary files /dev/null and b/graphics/event_objects/pics/people/boy_1/5.png differ diff --git a/graphics/event_objects/pics/people/boy_1/6.png b/graphics/event_objects/pics/people/boy_1/6.png new file mode 100644 index 000000000..9c515fb2a Binary files /dev/null and b/graphics/event_objects/pics/people/boy_1/6.png differ diff --git a/graphics/event_objects/pics/people/boy_1/7.png b/graphics/event_objects/pics/people/boy_1/7.png new file mode 100644 index 000000000..422ce9d9c Binary files /dev/null and b/graphics/event_objects/pics/people/boy_1/7.png differ diff --git a/graphics/event_objects/pics/people/boy_1/8.png b/graphics/event_objects/pics/people/boy_1/8.png new file mode 100644 index 000000000..1fcff3113 Binary files /dev/null and b/graphics/event_objects/pics/people/boy_1/8.png differ diff --git a/graphics/event_objects/pics/people/boy_2/0.png b/graphics/event_objects/pics/people/boy_2/0.png new file mode 100644 index 000000000..aefd58a96 Binary files /dev/null and b/graphics/event_objects/pics/people/boy_2/0.png differ diff --git a/graphics/event_objects/pics/people/boy_2/1.png b/graphics/event_objects/pics/people/boy_2/1.png new file mode 100644 index 000000000..8b0d448cb Binary files /dev/null and b/graphics/event_objects/pics/people/boy_2/1.png differ diff --git a/graphics/event_objects/pics/people/boy_2/2.png b/graphics/event_objects/pics/people/boy_2/2.png new file mode 100644 index 000000000..cad6a6cda Binary files /dev/null and b/graphics/event_objects/pics/people/boy_2/2.png differ diff --git a/graphics/event_objects/pics/people/boy_2/3.png b/graphics/event_objects/pics/people/boy_2/3.png new file mode 100644 index 000000000..11dea03b8 Binary files /dev/null and b/graphics/event_objects/pics/people/boy_2/3.png differ diff --git a/graphics/event_objects/pics/people/boy_2/4.png b/graphics/event_objects/pics/people/boy_2/4.png new file mode 100644 index 000000000..7aa11f526 Binary files /dev/null and b/graphics/event_objects/pics/people/boy_2/4.png differ diff --git a/graphics/event_objects/pics/people/boy_2/5.png b/graphics/event_objects/pics/people/boy_2/5.png new file mode 100644 index 000000000..0ff4cc622 Binary files /dev/null and b/graphics/event_objects/pics/people/boy_2/5.png differ diff --git a/graphics/event_objects/pics/people/boy_2/6.png b/graphics/event_objects/pics/people/boy_2/6.png new file mode 100644 index 000000000..5e7e98f4d Binary files /dev/null and b/graphics/event_objects/pics/people/boy_2/6.png differ diff --git a/graphics/event_objects/pics/people/boy_2/7.png b/graphics/event_objects/pics/people/boy_2/7.png new file mode 100644 index 000000000..3b7188f3a Binary files /dev/null and b/graphics/event_objects/pics/people/boy_2/7.png differ diff --git a/graphics/event_objects/pics/people/boy_2/8.png b/graphics/event_objects/pics/people/boy_2/8.png new file mode 100644 index 000000000..aea1fee46 Binary files /dev/null and b/graphics/event_objects/pics/people/boy_2/8.png differ diff --git a/graphics/event_objects/pics/people/boy_3/0.png b/graphics/event_objects/pics/people/boy_3/0.png new file mode 100644 index 000000000..6ac8b18c2 Binary files /dev/null and b/graphics/event_objects/pics/people/boy_3/0.png differ diff --git a/graphics/event_objects/pics/people/boy_3/1.png b/graphics/event_objects/pics/people/boy_3/1.png new file mode 100644 index 000000000..e42abeb9f Binary files /dev/null and b/graphics/event_objects/pics/people/boy_3/1.png differ diff --git a/graphics/event_objects/pics/people/boy_3/2.png b/graphics/event_objects/pics/people/boy_3/2.png new file mode 100644 index 000000000..f6fdc1f83 Binary files /dev/null and b/graphics/event_objects/pics/people/boy_3/2.png differ diff --git a/graphics/event_objects/pics/people/boy_3/3.png b/graphics/event_objects/pics/people/boy_3/3.png new file mode 100644 index 000000000..8edb25b0c Binary files /dev/null and b/graphics/event_objects/pics/people/boy_3/3.png differ diff --git a/graphics/event_objects/pics/people/boy_3/4.png b/graphics/event_objects/pics/people/boy_3/4.png new file mode 100644 index 000000000..016f12fd4 Binary files /dev/null and b/graphics/event_objects/pics/people/boy_3/4.png differ diff --git a/graphics/event_objects/pics/people/boy_3/5.png b/graphics/event_objects/pics/people/boy_3/5.png new file mode 100644 index 000000000..b5d5bda85 Binary files /dev/null and b/graphics/event_objects/pics/people/boy_3/5.png differ diff --git a/graphics/event_objects/pics/people/boy_3/6.png b/graphics/event_objects/pics/people/boy_3/6.png new file mode 100644 index 000000000..703bcdbbc Binary files /dev/null and b/graphics/event_objects/pics/people/boy_3/6.png differ diff --git a/graphics/event_objects/pics/people/boy_3/7.png b/graphics/event_objects/pics/people/boy_3/7.png new file mode 100644 index 000000000..aeaf29942 Binary files /dev/null and b/graphics/event_objects/pics/people/boy_3/7.png differ diff --git a/graphics/event_objects/pics/people/boy_3/8.png b/graphics/event_objects/pics/people/boy_3/8.png new file mode 100644 index 000000000..26ef82fc3 Binary files /dev/null and b/graphics/event_objects/pics/people/boy_3/8.png differ diff --git a/graphics/event_objects/pics/people/boy_4/0.png b/graphics/event_objects/pics/people/boy_4/0.png new file mode 100644 index 000000000..a0b93b2f4 Binary files /dev/null and b/graphics/event_objects/pics/people/boy_4/0.png differ diff --git a/graphics/event_objects/pics/people/boy_4/1.png b/graphics/event_objects/pics/people/boy_4/1.png new file mode 100644 index 000000000..9c287e39d Binary files /dev/null and b/graphics/event_objects/pics/people/boy_4/1.png differ diff --git a/graphics/event_objects/pics/people/boy_4/2.png b/graphics/event_objects/pics/people/boy_4/2.png new file mode 100644 index 000000000..e1cead5ad Binary files /dev/null and b/graphics/event_objects/pics/people/boy_4/2.png differ diff --git a/graphics/event_objects/pics/people/boy_4/3.png b/graphics/event_objects/pics/people/boy_4/3.png new file mode 100644 index 000000000..d64420afd Binary files /dev/null and b/graphics/event_objects/pics/people/boy_4/3.png differ diff --git a/graphics/event_objects/pics/people/boy_4/4.png b/graphics/event_objects/pics/people/boy_4/4.png new file mode 100644 index 000000000..f7779a135 Binary files /dev/null and b/graphics/event_objects/pics/people/boy_4/4.png differ diff --git a/graphics/event_objects/pics/people/boy_4/5.png b/graphics/event_objects/pics/people/boy_4/5.png new file mode 100644 index 000000000..76485893d Binary files /dev/null and b/graphics/event_objects/pics/people/boy_4/5.png differ diff --git a/graphics/event_objects/pics/people/boy_4/6.png b/graphics/event_objects/pics/people/boy_4/6.png new file mode 100644 index 000000000..9f63aba4e Binary files /dev/null and b/graphics/event_objects/pics/people/boy_4/6.png differ diff --git a/graphics/event_objects/pics/people/boy_4/7.png b/graphics/event_objects/pics/people/boy_4/7.png new file mode 100644 index 000000000..40d19f455 Binary files /dev/null and b/graphics/event_objects/pics/people/boy_4/7.png differ diff --git a/graphics/event_objects/pics/people/boy_4/8.png b/graphics/event_objects/pics/people/boy_4/8.png new file mode 100644 index 000000000..1ed4d0da0 Binary files /dev/null and b/graphics/event_objects/pics/people/boy_4/8.png differ diff --git a/graphics/event_objects/pics/people/boy_5/0.png b/graphics/event_objects/pics/people/boy_5/0.png new file mode 100644 index 000000000..2a0ab6a07 Binary files /dev/null and b/graphics/event_objects/pics/people/boy_5/0.png differ diff --git a/graphics/event_objects/pics/people/boy_5/1.png b/graphics/event_objects/pics/people/boy_5/1.png new file mode 100644 index 000000000..65f7f1dcf Binary files /dev/null and b/graphics/event_objects/pics/people/boy_5/1.png differ diff --git a/graphics/event_objects/pics/people/boy_5/2.png b/graphics/event_objects/pics/people/boy_5/2.png new file mode 100644 index 000000000..ece405a28 Binary files /dev/null and b/graphics/event_objects/pics/people/boy_5/2.png differ diff --git a/graphics/event_objects/pics/people/brandon/0.png b/graphics/event_objects/pics/people/brandon/0.png new file mode 100644 index 000000000..85d567a95 Binary files /dev/null and b/graphics/event_objects/pics/people/brandon/0.png differ diff --git a/graphics/event_objects/pics/people/brandon/1.png b/graphics/event_objects/pics/people/brandon/1.png new file mode 100644 index 000000000..90a67c879 Binary files /dev/null and b/graphics/event_objects/pics/people/brandon/1.png differ diff --git a/graphics/event_objects/pics/people/brandon/2.png b/graphics/event_objects/pics/people/brandon/2.png new file mode 100644 index 000000000..914c842d4 Binary files /dev/null and b/graphics/event_objects/pics/people/brandon/2.png differ diff --git a/graphics/event_objects/pics/people/brandon/3.png b/graphics/event_objects/pics/people/brandon/3.png new file mode 100644 index 000000000..dea524915 Binary files /dev/null and b/graphics/event_objects/pics/people/brandon/3.png differ diff --git a/graphics/event_objects/pics/people/brandon/4.png b/graphics/event_objects/pics/people/brandon/4.png new file mode 100644 index 000000000..60588dd0c Binary files /dev/null and b/graphics/event_objects/pics/people/brandon/4.png differ diff --git a/graphics/event_objects/pics/people/brandon/5.png b/graphics/event_objects/pics/people/brandon/5.png new file mode 100644 index 000000000..d1f8ee242 Binary files /dev/null and b/graphics/event_objects/pics/people/brandon/5.png differ diff --git a/graphics/event_objects/pics/people/brandon/6.png b/graphics/event_objects/pics/people/brandon/6.png new file mode 100644 index 000000000..68564a2a3 Binary files /dev/null and b/graphics/event_objects/pics/people/brandon/6.png differ diff --git a/graphics/event_objects/pics/people/brandon/7.png b/graphics/event_objects/pics/people/brandon/7.png new file mode 100644 index 000000000..5fdb88f6b Binary files /dev/null and b/graphics/event_objects/pics/people/brandon/7.png differ diff --git a/graphics/event_objects/pics/people/brandon/8.png b/graphics/event_objects/pics/people/brandon/8.png new file mode 100644 index 000000000..529114e45 Binary files /dev/null and b/graphics/event_objects/pics/people/brandon/8.png differ diff --git a/graphics/event_objects/pics/people/brawly/0.png b/graphics/event_objects/pics/people/brawly/0.png new file mode 100644 index 000000000..f22faad59 Binary files /dev/null and b/graphics/event_objects/pics/people/brawly/0.png differ diff --git a/graphics/event_objects/pics/people/brawly/1.png b/graphics/event_objects/pics/people/brawly/1.png new file mode 100644 index 000000000..38ab1f090 Binary files /dev/null and b/graphics/event_objects/pics/people/brawly/1.png differ diff --git a/graphics/event_objects/pics/people/brawly/2.png b/graphics/event_objects/pics/people/brawly/2.png new file mode 100644 index 000000000..0f9289d0b Binary files /dev/null and b/graphics/event_objects/pics/people/brawly/2.png differ diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/00.png b/graphics/event_objects/pics/people/brendan/acro_bike/00.png new file mode 100644 index 000000000..d0c556042 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/acro_bike/00.png differ diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/01.png b/graphics/event_objects/pics/people/brendan/acro_bike/01.png new file mode 100644 index 000000000..4a4fbb0c9 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/acro_bike/01.png differ diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/02.png b/graphics/event_objects/pics/people/brendan/acro_bike/02.png new file mode 100644 index 000000000..c657e8b37 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/acro_bike/02.png differ diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/03.png b/graphics/event_objects/pics/people/brendan/acro_bike/03.png new file mode 100644 index 000000000..38f3a08a7 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/acro_bike/03.png differ diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/04.png b/graphics/event_objects/pics/people/brendan/acro_bike/04.png new file mode 100644 index 000000000..1fa84a846 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/acro_bike/04.png differ diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/05.png b/graphics/event_objects/pics/people/brendan/acro_bike/05.png new file mode 100644 index 000000000..cb9788e69 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/acro_bike/05.png differ diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/06.png b/graphics/event_objects/pics/people/brendan/acro_bike/06.png new file mode 100644 index 000000000..345a2277e Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/acro_bike/06.png differ diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/07.png b/graphics/event_objects/pics/people/brendan/acro_bike/07.png new file mode 100644 index 000000000..0677027b0 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/acro_bike/07.png differ diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/08.png b/graphics/event_objects/pics/people/brendan/acro_bike/08.png new file mode 100644 index 000000000..a24484281 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/acro_bike/08.png differ diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/09.png b/graphics/event_objects/pics/people/brendan/acro_bike/09.png new file mode 100644 index 000000000..b209676f5 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/acro_bike/09.png differ diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/10.png b/graphics/event_objects/pics/people/brendan/acro_bike/10.png new file mode 100644 index 000000000..b472a680d Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/acro_bike/10.png differ diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/11.png b/graphics/event_objects/pics/people/brendan/acro_bike/11.png new file mode 100644 index 000000000..7a8110dd5 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/acro_bike/11.png differ diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/12.png b/graphics/event_objects/pics/people/brendan/acro_bike/12.png new file mode 100644 index 000000000..719516161 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/acro_bike/12.png differ diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/13.png b/graphics/event_objects/pics/people/brendan/acro_bike/13.png new file mode 100644 index 000000000..7b24c24f4 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/acro_bike/13.png differ diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/14.png b/graphics/event_objects/pics/people/brendan/acro_bike/14.png new file mode 100644 index 000000000..bbb91d751 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/acro_bike/14.png differ diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/15.png b/graphics/event_objects/pics/people/brendan/acro_bike/15.png new file mode 100644 index 000000000..3caacb23e Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/acro_bike/15.png differ diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/16.png b/graphics/event_objects/pics/people/brendan/acro_bike/16.png new file mode 100644 index 000000000..aa26f59cc Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/acro_bike/16.png differ diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/17.png b/graphics/event_objects/pics/people/brendan/acro_bike/17.png new file mode 100644 index 000000000..0a3d0c1a7 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/acro_bike/17.png differ diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/18.png b/graphics/event_objects/pics/people/brendan/acro_bike/18.png new file mode 100644 index 000000000..dd442bb2e Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/acro_bike/18.png differ diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/19.png b/graphics/event_objects/pics/people/brendan/acro_bike/19.png new file mode 100644 index 000000000..705c0668e Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/acro_bike/19.png differ diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/20.png b/graphics/event_objects/pics/people/brendan/acro_bike/20.png new file mode 100644 index 000000000..665d699aa Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/acro_bike/20.png differ diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/21.png b/graphics/event_objects/pics/people/brendan/acro_bike/21.png new file mode 100644 index 000000000..3ea90bb2b Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/acro_bike/21.png differ diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/22.png b/graphics/event_objects/pics/people/brendan/acro_bike/22.png new file mode 100644 index 000000000..b69f0e052 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/acro_bike/22.png differ diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/23.png b/graphics/event_objects/pics/people/brendan/acro_bike/23.png new file mode 100644 index 000000000..df87a8442 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/acro_bike/23.png differ diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/24.png b/graphics/event_objects/pics/people/brendan/acro_bike/24.png new file mode 100644 index 000000000..0e301734d Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/acro_bike/24.png differ diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/25.png b/graphics/event_objects/pics/people/brendan/acro_bike/25.png new file mode 100644 index 000000000..1cf49c09a Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/acro_bike/25.png differ diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/26.png b/graphics/event_objects/pics/people/brendan/acro_bike/26.png new file mode 100644 index 000000000..54e150a3c Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/acro_bike/26.png differ diff --git a/graphics/event_objects/pics/people/brendan/decorating.png b/graphics/event_objects/pics/people/brendan/decorating.png new file mode 100644 index 000000000..c0839120a Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/decorating.png differ diff --git a/graphics/event_objects/pics/people/brendan/field_move/0.png b/graphics/event_objects/pics/people/brendan/field_move/0.png new file mode 100644 index 000000000..d8cd793d8 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/field_move/0.png differ diff --git a/graphics/event_objects/pics/people/brendan/field_move/1.png b/graphics/event_objects/pics/people/brendan/field_move/1.png new file mode 100644 index 000000000..25550176e Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/field_move/1.png differ diff --git a/graphics/event_objects/pics/people/brendan/field_move/2.png b/graphics/event_objects/pics/people/brendan/field_move/2.png new file mode 100644 index 000000000..a817426f9 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/field_move/2.png differ diff --git a/graphics/event_objects/pics/people/brendan/field_move/3.png b/graphics/event_objects/pics/people/brendan/field_move/3.png new file mode 100644 index 000000000..527189377 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/field_move/3.png differ diff --git a/graphics/event_objects/pics/people/brendan/field_move/4.png b/graphics/event_objects/pics/people/brendan/field_move/4.png new file mode 100644 index 000000000..05ac7919d Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/field_move/4.png differ diff --git a/graphics/event_objects/pics/people/brendan/fishing/00.png b/graphics/event_objects/pics/people/brendan/fishing/00.png new file mode 100644 index 000000000..db6b3d2ff Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/fishing/00.png differ diff --git a/graphics/event_objects/pics/people/brendan/fishing/01.png b/graphics/event_objects/pics/people/brendan/fishing/01.png new file mode 100644 index 000000000..cca89997d Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/fishing/01.png differ diff --git a/graphics/event_objects/pics/people/brendan/fishing/02.png b/graphics/event_objects/pics/people/brendan/fishing/02.png new file mode 100644 index 000000000..6adbb9f55 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/fishing/02.png differ diff --git a/graphics/event_objects/pics/people/brendan/fishing/03.png b/graphics/event_objects/pics/people/brendan/fishing/03.png new file mode 100644 index 000000000..22101c8b6 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/fishing/03.png differ diff --git a/graphics/event_objects/pics/people/brendan/fishing/04.png b/graphics/event_objects/pics/people/brendan/fishing/04.png new file mode 100644 index 000000000..e8fec65a2 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/fishing/04.png differ diff --git a/graphics/event_objects/pics/people/brendan/fishing/05.png b/graphics/event_objects/pics/people/brendan/fishing/05.png new file mode 100644 index 000000000..c9ee2fa4c Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/fishing/05.png differ diff --git a/graphics/event_objects/pics/people/brendan/fishing/06.png b/graphics/event_objects/pics/people/brendan/fishing/06.png new file mode 100644 index 000000000..caaeee078 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/fishing/06.png differ diff --git a/graphics/event_objects/pics/people/brendan/fishing/07.png b/graphics/event_objects/pics/people/brendan/fishing/07.png new file mode 100644 index 000000000..c39110e1c Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/fishing/07.png differ diff --git a/graphics/event_objects/pics/people/brendan/fishing/08.png b/graphics/event_objects/pics/people/brendan/fishing/08.png new file mode 100644 index 000000000..3b1b1728c Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/fishing/08.png differ diff --git a/graphics/event_objects/pics/people/brendan/fishing/09.png b/graphics/event_objects/pics/people/brendan/fishing/09.png new file mode 100644 index 000000000..f21c37d60 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/fishing/09.png differ diff --git a/graphics/event_objects/pics/people/brendan/fishing/10.png b/graphics/event_objects/pics/people/brendan/fishing/10.png new file mode 100644 index 000000000..f80186d1f Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/fishing/10.png differ diff --git a/graphics/event_objects/pics/people/brendan/fishing/11.png b/graphics/event_objects/pics/people/brendan/fishing/11.png new file mode 100644 index 000000000..66b2b5917 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/fishing/11.png differ diff --git a/graphics/event_objects/pics/people/brendan/mach_bike/0.png b/graphics/event_objects/pics/people/brendan/mach_bike/0.png new file mode 100644 index 000000000..d0c556042 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/mach_bike/0.png differ diff --git a/graphics/event_objects/pics/people/brendan/mach_bike/1.png b/graphics/event_objects/pics/people/brendan/mach_bike/1.png new file mode 100644 index 000000000..4a4fbb0c9 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/mach_bike/1.png differ diff --git a/graphics/event_objects/pics/people/brendan/mach_bike/2.png b/graphics/event_objects/pics/people/brendan/mach_bike/2.png new file mode 100644 index 000000000..c657e8b37 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/mach_bike/2.png differ diff --git a/graphics/event_objects/pics/people/brendan/mach_bike/3.png b/graphics/event_objects/pics/people/brendan/mach_bike/3.png new file mode 100644 index 000000000..bbe403817 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/mach_bike/3.png differ diff --git a/graphics/event_objects/pics/people/brendan/mach_bike/4.png b/graphics/event_objects/pics/people/brendan/mach_bike/4.png new file mode 100644 index 000000000..9fe91dd46 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/mach_bike/4.png differ diff --git a/graphics/event_objects/pics/people/brendan/mach_bike/5.png b/graphics/event_objects/pics/people/brendan/mach_bike/5.png new file mode 100644 index 000000000..cb9788e69 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/mach_bike/5.png differ diff --git a/graphics/event_objects/pics/people/brendan/mach_bike/6.png b/graphics/event_objects/pics/people/brendan/mach_bike/6.png new file mode 100644 index 000000000..345a2277e Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/mach_bike/6.png differ diff --git a/graphics/event_objects/pics/people/brendan/mach_bike/7.png b/graphics/event_objects/pics/people/brendan/mach_bike/7.png new file mode 100644 index 000000000..0677027b0 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/mach_bike/7.png differ diff --git a/graphics/event_objects/pics/people/brendan/mach_bike/8.png b/graphics/event_objects/pics/people/brendan/mach_bike/8.png new file mode 100644 index 000000000..a24484281 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/mach_bike/8.png differ diff --git a/graphics/event_objects/pics/people/brendan/normal/00.png b/graphics/event_objects/pics/people/brendan/normal/00.png new file mode 100644 index 000000000..3d0f4c8d5 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/normal/00.png differ diff --git a/graphics/event_objects/pics/people/brendan/normal/01.png b/graphics/event_objects/pics/people/brendan/normal/01.png new file mode 100644 index 000000000..b36412513 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/normal/01.png differ diff --git a/graphics/event_objects/pics/people/brendan/normal/02.png b/graphics/event_objects/pics/people/brendan/normal/02.png new file mode 100644 index 000000000..0f3c3775e Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/normal/02.png differ diff --git a/graphics/event_objects/pics/people/brendan/normal/03.png b/graphics/event_objects/pics/people/brendan/normal/03.png new file mode 100644 index 000000000..b415377c7 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/normal/03.png differ diff --git a/graphics/event_objects/pics/people/brendan/normal/04.png b/graphics/event_objects/pics/people/brendan/normal/04.png new file mode 100644 index 000000000..fb92c09cd Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/normal/04.png differ diff --git a/graphics/event_objects/pics/people/brendan/normal/05.png b/graphics/event_objects/pics/people/brendan/normal/05.png new file mode 100644 index 000000000..a5d0518a4 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/normal/05.png differ diff --git a/graphics/event_objects/pics/people/brendan/normal/06.png b/graphics/event_objects/pics/people/brendan/normal/06.png new file mode 100644 index 000000000..66a4293b2 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/normal/06.png differ diff --git a/graphics/event_objects/pics/people/brendan/normal/07.png b/graphics/event_objects/pics/people/brendan/normal/07.png new file mode 100644 index 000000000..7710ce994 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/normal/07.png differ diff --git a/graphics/event_objects/pics/people/brendan/normal/08.png b/graphics/event_objects/pics/people/brendan/normal/08.png new file mode 100644 index 000000000..12e9f07b3 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/normal/08.png differ diff --git a/graphics/event_objects/pics/people/brendan/normal/09.png b/graphics/event_objects/pics/people/brendan/normal/09.png new file mode 100644 index 000000000..3c7aebbf4 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/normal/09.png differ diff --git a/graphics/event_objects/pics/people/brendan/normal/10.png b/graphics/event_objects/pics/people/brendan/normal/10.png new file mode 100644 index 000000000..ed928914f Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/normal/10.png differ diff --git a/graphics/event_objects/pics/people/brendan/normal/11.png b/graphics/event_objects/pics/people/brendan/normal/11.png new file mode 100644 index 000000000..754b05a78 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/normal/11.png differ diff --git a/graphics/event_objects/pics/people/brendan/normal/12.png b/graphics/event_objects/pics/people/brendan/normal/12.png new file mode 100644 index 000000000..6f707e724 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/normal/12.png differ diff --git a/graphics/event_objects/pics/people/brendan/normal/13.png b/graphics/event_objects/pics/people/brendan/normal/13.png new file mode 100644 index 000000000..10ec74720 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/normal/13.png differ diff --git a/graphics/event_objects/pics/people/brendan/normal/14.png b/graphics/event_objects/pics/people/brendan/normal/14.png new file mode 100644 index 000000000..5cf30bfb9 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/normal/14.png differ diff --git a/graphics/event_objects/pics/people/brendan/normal/15.png b/graphics/event_objects/pics/people/brendan/normal/15.png new file mode 100644 index 000000000..a1e8132d5 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/normal/15.png differ diff --git a/graphics/event_objects/pics/people/brendan/normal/16.png b/graphics/event_objects/pics/people/brendan/normal/16.png new file mode 100644 index 000000000..6a0b22992 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/normal/16.png differ diff --git a/graphics/event_objects/pics/people/brendan/normal/17.png b/graphics/event_objects/pics/people/brendan/normal/17.png new file mode 100644 index 000000000..cbf76035a Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/normal/17.png differ diff --git a/graphics/event_objects/pics/people/brendan/surfing/0.png b/graphics/event_objects/pics/people/brendan/surfing/0.png new file mode 100644 index 000000000..67f4377bd Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/surfing/0.png differ diff --git a/graphics/event_objects/pics/people/brendan/surfing/1.png b/graphics/event_objects/pics/people/brendan/surfing/1.png new file mode 100644 index 000000000..cfec0e085 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/surfing/1.png differ diff --git a/graphics/event_objects/pics/people/brendan/surfing/2.png b/graphics/event_objects/pics/people/brendan/surfing/2.png new file mode 100644 index 000000000..2d0fd5b79 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/surfing/2.png differ diff --git a/graphics/event_objects/pics/people/brendan/surfing/3.png b/graphics/event_objects/pics/people/brendan/surfing/3.png new file mode 100644 index 000000000..0c2517901 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/surfing/3.png differ diff --git a/graphics/event_objects/pics/people/brendan/surfing/4.png b/graphics/event_objects/pics/people/brendan/surfing/4.png new file mode 100644 index 000000000..abe894a45 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/surfing/4.png differ diff --git a/graphics/event_objects/pics/people/brendan/surfing/5.png b/graphics/event_objects/pics/people/brendan/surfing/5.png new file mode 100644 index 000000000..613114c39 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/surfing/5.png differ diff --git a/graphics/event_objects/pics/people/brendan/underwater/0.png b/graphics/event_objects/pics/people/brendan/underwater/0.png new file mode 100644 index 000000000..79951c29c Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/underwater/0.png differ diff --git a/graphics/event_objects/pics/people/brendan/underwater/1.png b/graphics/event_objects/pics/people/brendan/underwater/1.png new file mode 100644 index 000000000..d7c3f0783 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/underwater/1.png differ diff --git a/graphics/event_objects/pics/people/brendan/underwater/2.png b/graphics/event_objects/pics/people/brendan/underwater/2.png new file mode 100644 index 000000000..628a2ac88 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/underwater/2.png differ diff --git a/graphics/event_objects/pics/people/brendan/underwater/3.png b/graphics/event_objects/pics/people/brendan/underwater/3.png new file mode 100644 index 000000000..7756a96db Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/underwater/3.png differ diff --git a/graphics/event_objects/pics/people/brendan/watering/0.png b/graphics/event_objects/pics/people/brendan/watering/0.png new file mode 100644 index 000000000..0f8d95430 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/watering/0.png differ diff --git a/graphics/event_objects/pics/people/brendan/watering/1.png b/graphics/event_objects/pics/people/brendan/watering/1.png new file mode 100644 index 000000000..7b5ddc996 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/watering/1.png differ diff --git a/graphics/event_objects/pics/people/brendan/watering/2.png b/graphics/event_objects/pics/people/brendan/watering/2.png new file mode 100644 index 000000000..3441131fa Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/watering/2.png differ diff --git a/graphics/event_objects/pics/people/brendan/watering/3.png b/graphics/event_objects/pics/people/brendan/watering/3.png new file mode 100644 index 000000000..06baf24fc Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/watering/3.png differ diff --git a/graphics/event_objects/pics/people/brendan/watering/4.png b/graphics/event_objects/pics/people/brendan/watering/4.png new file mode 100644 index 000000000..40dbbacab Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/watering/4.png differ diff --git a/graphics/event_objects/pics/people/brendan/watering/5.png b/graphics/event_objects/pics/people/brendan/watering/5.png new file mode 100644 index 000000000..a72edf144 Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/watering/5.png differ diff --git a/graphics/event_objects/pics/people/bug_catcher/0.png b/graphics/event_objects/pics/people/bug_catcher/0.png new file mode 100644 index 000000000..860449379 Binary files /dev/null and b/graphics/event_objects/pics/people/bug_catcher/0.png differ diff --git a/graphics/event_objects/pics/people/bug_catcher/1.png b/graphics/event_objects/pics/people/bug_catcher/1.png new file mode 100644 index 000000000..a0a3b3df1 Binary files /dev/null and b/graphics/event_objects/pics/people/bug_catcher/1.png differ diff --git a/graphics/event_objects/pics/people/bug_catcher/2.png b/graphics/event_objects/pics/people/bug_catcher/2.png new file mode 100644 index 000000000..96363e4a8 Binary files /dev/null and b/graphics/event_objects/pics/people/bug_catcher/2.png differ diff --git a/graphics/event_objects/pics/people/bug_catcher/3.png b/graphics/event_objects/pics/people/bug_catcher/3.png new file mode 100644 index 000000000..472fa42cb Binary files /dev/null and b/graphics/event_objects/pics/people/bug_catcher/3.png differ diff --git a/graphics/event_objects/pics/people/bug_catcher/4.png b/graphics/event_objects/pics/people/bug_catcher/4.png new file mode 100644 index 000000000..f6da1bb97 Binary files /dev/null and b/graphics/event_objects/pics/people/bug_catcher/4.png differ diff --git a/graphics/event_objects/pics/people/bug_catcher/5.png b/graphics/event_objects/pics/people/bug_catcher/5.png new file mode 100644 index 000000000..bd5aea560 Binary files /dev/null and b/graphics/event_objects/pics/people/bug_catcher/5.png differ diff --git a/graphics/event_objects/pics/people/bug_catcher/6.png b/graphics/event_objects/pics/people/bug_catcher/6.png new file mode 100644 index 000000000..2a93fc6b7 Binary files /dev/null and b/graphics/event_objects/pics/people/bug_catcher/6.png differ diff --git a/graphics/event_objects/pics/people/bug_catcher/7.png b/graphics/event_objects/pics/people/bug_catcher/7.png new file mode 100644 index 000000000..fded025e3 Binary files /dev/null and b/graphics/event_objects/pics/people/bug_catcher/7.png differ diff --git a/graphics/event_objects/pics/people/bug_catcher/8.png b/graphics/event_objects/pics/people/bug_catcher/8.png new file mode 100644 index 000000000..df561597b Binary files /dev/null and b/graphics/event_objects/pics/people/bug_catcher/8.png differ diff --git a/graphics/event_objects/pics/people/cameraman/0.png b/graphics/event_objects/pics/people/cameraman/0.png new file mode 100644 index 000000000..af6ad2878 Binary files /dev/null and b/graphics/event_objects/pics/people/cameraman/0.png differ diff --git a/graphics/event_objects/pics/people/cameraman/1.png b/graphics/event_objects/pics/people/cameraman/1.png new file mode 100644 index 000000000..112ee86b4 Binary files /dev/null and b/graphics/event_objects/pics/people/cameraman/1.png differ diff --git a/graphics/event_objects/pics/people/cameraman/2.png b/graphics/event_objects/pics/people/cameraman/2.png new file mode 100644 index 000000000..6eaca8266 Binary files /dev/null and b/graphics/event_objects/pics/people/cameraman/2.png differ diff --git a/graphics/event_objects/pics/people/cameraman/3.png b/graphics/event_objects/pics/people/cameraman/3.png new file mode 100644 index 000000000..6091fb350 Binary files /dev/null and b/graphics/event_objects/pics/people/cameraman/3.png differ diff --git a/graphics/event_objects/pics/people/cameraman/4.png b/graphics/event_objects/pics/people/cameraman/4.png new file mode 100644 index 000000000..ffacefa38 Binary files /dev/null and b/graphics/event_objects/pics/people/cameraman/4.png differ diff --git a/graphics/event_objects/pics/people/cameraman/5.png b/graphics/event_objects/pics/people/cameraman/5.png new file mode 100644 index 000000000..44c1a768c Binary files /dev/null and b/graphics/event_objects/pics/people/cameraman/5.png differ diff --git a/graphics/event_objects/pics/people/cameraman/6.png b/graphics/event_objects/pics/people/cameraman/6.png new file mode 100644 index 000000000..e8c41883d Binary files /dev/null and b/graphics/event_objects/pics/people/cameraman/6.png differ diff --git a/graphics/event_objects/pics/people/cameraman/7.png b/graphics/event_objects/pics/people/cameraman/7.png new file mode 100644 index 000000000..2ccfeae84 Binary files /dev/null and b/graphics/event_objects/pics/people/cameraman/7.png differ diff --git a/graphics/event_objects/pics/people/cameraman/8.png b/graphics/event_objects/pics/people/cameraman/8.png new file mode 100644 index 000000000..e2af57df1 Binary files /dev/null and b/graphics/event_objects/pics/people/cameraman/8.png differ diff --git a/graphics/event_objects/pics/people/camper/0.png b/graphics/event_objects/pics/people/camper/0.png new file mode 100644 index 000000000..ffdea18b6 Binary files /dev/null and b/graphics/event_objects/pics/people/camper/0.png differ diff --git a/graphics/event_objects/pics/people/camper/1.png b/graphics/event_objects/pics/people/camper/1.png new file mode 100644 index 000000000..ea5ef4d86 Binary files /dev/null and b/graphics/event_objects/pics/people/camper/1.png differ diff --git a/graphics/event_objects/pics/people/camper/2.png b/graphics/event_objects/pics/people/camper/2.png new file mode 100644 index 000000000..c25c51a78 Binary files /dev/null and b/graphics/event_objects/pics/people/camper/2.png differ diff --git a/graphics/event_objects/pics/people/camper/3.png b/graphics/event_objects/pics/people/camper/3.png new file mode 100644 index 000000000..451f9c469 Binary files /dev/null and b/graphics/event_objects/pics/people/camper/3.png differ diff --git a/graphics/event_objects/pics/people/camper/4.png b/graphics/event_objects/pics/people/camper/4.png new file mode 100644 index 000000000..b17781df4 Binary files /dev/null and b/graphics/event_objects/pics/people/camper/4.png differ diff --git a/graphics/event_objects/pics/people/camper/5.png b/graphics/event_objects/pics/people/camper/5.png new file mode 100644 index 000000000..ea79ad5d2 Binary files /dev/null and b/graphics/event_objects/pics/people/camper/5.png differ diff --git a/graphics/event_objects/pics/people/camper/6.png b/graphics/event_objects/pics/people/camper/6.png new file mode 100644 index 000000000..7f003b53f Binary files /dev/null and b/graphics/event_objects/pics/people/camper/6.png differ diff --git a/graphics/event_objects/pics/people/camper/7.png b/graphics/event_objects/pics/people/camper/7.png new file mode 100644 index 000000000..4dcb217b3 Binary files /dev/null and b/graphics/event_objects/pics/people/camper/7.png differ diff --git a/graphics/event_objects/pics/people/camper/8.png b/graphics/event_objects/pics/people/camper/8.png new file mode 100644 index 000000000..888a0d17f Binary files /dev/null and b/graphics/event_objects/pics/people/camper/8.png differ diff --git a/graphics/event_objects/pics/people/contest_old_man/0.png b/graphics/event_objects/pics/people/contest_old_man/0.png new file mode 100644 index 000000000..118a34463 Binary files /dev/null and b/graphics/event_objects/pics/people/contest_old_man/0.png differ diff --git a/graphics/event_objects/pics/people/contest_old_man/1.png b/graphics/event_objects/pics/people/contest_old_man/1.png new file mode 100644 index 000000000..75f9010dd Binary files /dev/null and b/graphics/event_objects/pics/people/contest_old_man/1.png differ diff --git a/graphics/event_objects/pics/people/contest_old_man/2.png b/graphics/event_objects/pics/people/contest_old_man/2.png new file mode 100644 index 000000000..8ca543cef Binary files /dev/null and b/graphics/event_objects/pics/people/contest_old_man/2.png differ diff --git a/graphics/event_objects/pics/people/contest_old_man/3.png b/graphics/event_objects/pics/people/contest_old_man/3.png new file mode 100644 index 000000000..16015e53c Binary files /dev/null and b/graphics/event_objects/pics/people/contest_old_man/3.png differ diff --git a/graphics/event_objects/pics/people/contest_old_man/4.png b/graphics/event_objects/pics/people/contest_old_man/4.png new file mode 100644 index 000000000..e4fdfcc13 Binary files /dev/null and b/graphics/event_objects/pics/people/contest_old_man/4.png differ diff --git a/graphics/event_objects/pics/people/contest_old_man/5.png b/graphics/event_objects/pics/people/contest_old_man/5.png new file mode 100644 index 000000000..5de4a6b80 Binary files /dev/null and b/graphics/event_objects/pics/people/contest_old_man/5.png differ diff --git a/graphics/event_objects/pics/people/contest_old_man/6.png b/graphics/event_objects/pics/people/contest_old_man/6.png new file mode 100644 index 000000000..ebcb577d4 Binary files /dev/null and b/graphics/event_objects/pics/people/contest_old_man/6.png differ diff --git a/graphics/event_objects/pics/people/contest_old_man/7.png b/graphics/event_objects/pics/people/contest_old_man/7.png new file mode 100644 index 000000000..d01f156c1 Binary files /dev/null and b/graphics/event_objects/pics/people/contest_old_man/7.png differ diff --git a/graphics/event_objects/pics/people/contest_old_man/8.png b/graphics/event_objects/pics/people/contest_old_man/8.png new file mode 100644 index 000000000..84e5690b7 Binary files /dev/null and b/graphics/event_objects/pics/people/contest_old_man/8.png differ diff --git a/graphics/event_objects/pics/people/cook/0.png b/graphics/event_objects/pics/people/cook/0.png new file mode 100644 index 000000000..1413ce869 Binary files /dev/null and b/graphics/event_objects/pics/people/cook/0.png differ diff --git a/graphics/event_objects/pics/people/cook/1.png b/graphics/event_objects/pics/people/cook/1.png new file mode 100644 index 000000000..622e2b2d2 Binary files /dev/null and b/graphics/event_objects/pics/people/cook/1.png differ diff --git a/graphics/event_objects/pics/people/cook/2.png b/graphics/event_objects/pics/people/cook/2.png new file mode 100644 index 000000000..b2c2231a2 Binary files /dev/null and b/graphics/event_objects/pics/people/cook/2.png differ diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f/0.png b/graphics/event_objects/pics/people/cycling_triathlete_f/0.png new file mode 100644 index 000000000..452ba3daf Binary files /dev/null and b/graphics/event_objects/pics/people/cycling_triathlete_f/0.png differ diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f/1.png b/graphics/event_objects/pics/people/cycling_triathlete_f/1.png new file mode 100644 index 000000000..e4c8c78cb Binary files /dev/null and b/graphics/event_objects/pics/people/cycling_triathlete_f/1.png differ diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f/2.png b/graphics/event_objects/pics/people/cycling_triathlete_f/2.png new file mode 100644 index 000000000..20986da62 Binary files /dev/null and b/graphics/event_objects/pics/people/cycling_triathlete_f/2.png differ diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f/3.png b/graphics/event_objects/pics/people/cycling_triathlete_f/3.png new file mode 100644 index 000000000..5cfda5ff6 Binary files /dev/null and b/graphics/event_objects/pics/people/cycling_triathlete_f/3.png differ diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f/4.png b/graphics/event_objects/pics/people/cycling_triathlete_f/4.png new file mode 100644 index 000000000..e52cac84e Binary files /dev/null and b/graphics/event_objects/pics/people/cycling_triathlete_f/4.png differ diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f/5.png b/graphics/event_objects/pics/people/cycling_triathlete_f/5.png new file mode 100644 index 000000000..8376cc00e Binary files /dev/null and b/graphics/event_objects/pics/people/cycling_triathlete_f/5.png differ diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f/6.png b/graphics/event_objects/pics/people/cycling_triathlete_f/6.png new file mode 100644 index 000000000..d99951529 Binary files /dev/null and b/graphics/event_objects/pics/people/cycling_triathlete_f/6.png differ diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f/7.png b/graphics/event_objects/pics/people/cycling_triathlete_f/7.png new file mode 100644 index 000000000..a1c953c83 Binary files /dev/null and b/graphics/event_objects/pics/people/cycling_triathlete_f/7.png differ diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f/8.png b/graphics/event_objects/pics/people/cycling_triathlete_f/8.png new file mode 100644 index 000000000..63a6ebb0c Binary files /dev/null and b/graphics/event_objects/pics/people/cycling_triathlete_f/8.png differ diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m/0.png b/graphics/event_objects/pics/people/cycling_triathlete_m/0.png new file mode 100644 index 000000000..107589cbc Binary files /dev/null and b/graphics/event_objects/pics/people/cycling_triathlete_m/0.png differ diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m/1.png b/graphics/event_objects/pics/people/cycling_triathlete_m/1.png new file mode 100644 index 000000000..39cf99a21 Binary files /dev/null and b/graphics/event_objects/pics/people/cycling_triathlete_m/1.png differ diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m/2.png b/graphics/event_objects/pics/people/cycling_triathlete_m/2.png new file mode 100644 index 000000000..f5ab76d10 Binary files /dev/null and b/graphics/event_objects/pics/people/cycling_triathlete_m/2.png differ diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m/3.png b/graphics/event_objects/pics/people/cycling_triathlete_m/3.png new file mode 100644 index 000000000..d54d3fcdb Binary files /dev/null and b/graphics/event_objects/pics/people/cycling_triathlete_m/3.png differ diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m/4.png b/graphics/event_objects/pics/people/cycling_triathlete_m/4.png new file mode 100644 index 000000000..b065a1294 Binary files /dev/null and b/graphics/event_objects/pics/people/cycling_triathlete_m/4.png differ diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m/5.png b/graphics/event_objects/pics/people/cycling_triathlete_m/5.png new file mode 100644 index 000000000..bbb47a869 Binary files /dev/null and b/graphics/event_objects/pics/people/cycling_triathlete_m/5.png differ diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m/6.png b/graphics/event_objects/pics/people/cycling_triathlete_m/6.png new file mode 100644 index 000000000..7f126858f Binary files /dev/null and b/graphics/event_objects/pics/people/cycling_triathlete_m/6.png differ diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m/7.png b/graphics/event_objects/pics/people/cycling_triathlete_m/7.png new file mode 100644 index 000000000..43f2e2739 Binary files /dev/null and b/graphics/event_objects/pics/people/cycling_triathlete_m/7.png differ diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m/8.png b/graphics/event_objects/pics/people/cycling_triathlete_m/8.png new file mode 100644 index 000000000..1168c440b Binary files /dev/null and b/graphics/event_objects/pics/people/cycling_triathlete_m/8.png differ diff --git a/graphics/event_objects/pics/people/drake/0.png b/graphics/event_objects/pics/people/drake/0.png new file mode 100644 index 000000000..8c12cbe40 Binary files /dev/null and b/graphics/event_objects/pics/people/drake/0.png differ diff --git a/graphics/event_objects/pics/people/drake/1.png b/graphics/event_objects/pics/people/drake/1.png new file mode 100644 index 000000000..b401c3b14 Binary files /dev/null and b/graphics/event_objects/pics/people/drake/1.png differ diff --git a/graphics/event_objects/pics/people/drake/2.png b/graphics/event_objects/pics/people/drake/2.png new file mode 100644 index 000000000..c116a283e Binary files /dev/null and b/graphics/event_objects/pics/people/drake/2.png differ diff --git a/graphics/event_objects/pics/people/fat_man/0.png b/graphics/event_objects/pics/people/fat_man/0.png new file mode 100644 index 000000000..290a7f9ed Binary files /dev/null and b/graphics/event_objects/pics/people/fat_man/0.png differ diff --git a/graphics/event_objects/pics/people/fat_man/1.png b/graphics/event_objects/pics/people/fat_man/1.png new file mode 100644 index 000000000..d5d81dcdb Binary files /dev/null and b/graphics/event_objects/pics/people/fat_man/1.png differ diff --git a/graphics/event_objects/pics/people/fat_man/2.png b/graphics/event_objects/pics/people/fat_man/2.png new file mode 100644 index 000000000..5b99f60da Binary files /dev/null and b/graphics/event_objects/pics/people/fat_man/2.png differ diff --git a/graphics/event_objects/pics/people/fat_man/3.png b/graphics/event_objects/pics/people/fat_man/3.png new file mode 100644 index 000000000..2c6b5f0d1 Binary files /dev/null and b/graphics/event_objects/pics/people/fat_man/3.png differ diff --git a/graphics/event_objects/pics/people/fat_man/4.png b/graphics/event_objects/pics/people/fat_man/4.png new file mode 100644 index 000000000..846d52b99 Binary files /dev/null and b/graphics/event_objects/pics/people/fat_man/4.png differ diff --git a/graphics/event_objects/pics/people/fat_man/5.png b/graphics/event_objects/pics/people/fat_man/5.png new file mode 100644 index 000000000..ee751217f Binary files /dev/null and b/graphics/event_objects/pics/people/fat_man/5.png differ diff --git a/graphics/event_objects/pics/people/fat_man/6.png b/graphics/event_objects/pics/people/fat_man/6.png new file mode 100644 index 000000000..8eb76d809 Binary files /dev/null and b/graphics/event_objects/pics/people/fat_man/6.png differ diff --git a/graphics/event_objects/pics/people/fat_man/7.png b/graphics/event_objects/pics/people/fat_man/7.png new file mode 100644 index 000000000..5694df27b Binary files /dev/null and b/graphics/event_objects/pics/people/fat_man/7.png differ diff --git a/graphics/event_objects/pics/people/fat_man/8.png b/graphics/event_objects/pics/people/fat_man/8.png new file mode 100644 index 000000000..f3528f332 Binary files /dev/null and b/graphics/event_objects/pics/people/fat_man/8.png differ diff --git a/graphics/event_objects/pics/people/fisherman/0.png b/graphics/event_objects/pics/people/fisherman/0.png new file mode 100644 index 000000000..5e963f889 Binary files /dev/null and b/graphics/event_objects/pics/people/fisherman/0.png differ diff --git a/graphics/event_objects/pics/people/fisherman/1.png b/graphics/event_objects/pics/people/fisherman/1.png new file mode 100644 index 000000000..5bd83e7e1 Binary files /dev/null and b/graphics/event_objects/pics/people/fisherman/1.png differ diff --git a/graphics/event_objects/pics/people/fisherman/2.png b/graphics/event_objects/pics/people/fisherman/2.png new file mode 100644 index 000000000..f587de8d9 Binary files /dev/null and b/graphics/event_objects/pics/people/fisherman/2.png differ diff --git a/graphics/event_objects/pics/people/fisherman/3.png b/graphics/event_objects/pics/people/fisherman/3.png new file mode 100644 index 000000000..5d79a1da8 Binary files /dev/null and b/graphics/event_objects/pics/people/fisherman/3.png differ diff --git a/graphics/event_objects/pics/people/fisherman/4.png b/graphics/event_objects/pics/people/fisherman/4.png new file mode 100644 index 000000000..dd3104436 Binary files /dev/null and b/graphics/event_objects/pics/people/fisherman/4.png differ diff --git a/graphics/event_objects/pics/people/fisherman/5.png b/graphics/event_objects/pics/people/fisherman/5.png new file mode 100644 index 000000000..515f9c638 Binary files /dev/null and b/graphics/event_objects/pics/people/fisherman/5.png differ diff --git a/graphics/event_objects/pics/people/fisherman/6.png b/graphics/event_objects/pics/people/fisherman/6.png new file mode 100644 index 000000000..83ea1ff57 Binary files /dev/null and b/graphics/event_objects/pics/people/fisherman/6.png differ diff --git a/graphics/event_objects/pics/people/fisherman/7.png b/graphics/event_objects/pics/people/fisherman/7.png new file mode 100644 index 000000000..6f886b92e Binary files /dev/null and b/graphics/event_objects/pics/people/fisherman/7.png differ diff --git a/graphics/event_objects/pics/people/fisherman/8.png b/graphics/event_objects/pics/people/fisherman/8.png new file mode 100644 index 000000000..26826b5e2 Binary files /dev/null and b/graphics/event_objects/pics/people/fisherman/8.png differ diff --git a/graphics/event_objects/pics/people/flannery/0.png b/graphics/event_objects/pics/people/flannery/0.png new file mode 100644 index 000000000..5dc2e2afe Binary files /dev/null and b/graphics/event_objects/pics/people/flannery/0.png differ diff --git a/graphics/event_objects/pics/people/flannery/1.png b/graphics/event_objects/pics/people/flannery/1.png new file mode 100644 index 000000000..83f1d9c9c Binary files /dev/null and b/graphics/event_objects/pics/people/flannery/1.png differ diff --git a/graphics/event_objects/pics/people/flannery/2.png b/graphics/event_objects/pics/people/flannery/2.png new file mode 100644 index 000000000..8c96c873e Binary files /dev/null and b/graphics/event_objects/pics/people/flannery/2.png differ diff --git a/graphics/event_objects/pics/people/gentleman/0.png b/graphics/event_objects/pics/people/gentleman/0.png new file mode 100644 index 000000000..9c46f8aaf Binary files /dev/null and b/graphics/event_objects/pics/people/gentleman/0.png differ diff --git a/graphics/event_objects/pics/people/gentleman/1.png b/graphics/event_objects/pics/people/gentleman/1.png new file mode 100644 index 000000000..03eaf5570 Binary files /dev/null and b/graphics/event_objects/pics/people/gentleman/1.png differ diff --git a/graphics/event_objects/pics/people/gentleman/2.png b/graphics/event_objects/pics/people/gentleman/2.png new file mode 100644 index 000000000..3956a93d6 Binary files /dev/null and b/graphics/event_objects/pics/people/gentleman/2.png differ diff --git a/graphics/event_objects/pics/people/gentleman/3.png b/graphics/event_objects/pics/people/gentleman/3.png new file mode 100644 index 000000000..a023cf3e4 Binary files /dev/null and b/graphics/event_objects/pics/people/gentleman/3.png differ diff --git a/graphics/event_objects/pics/people/gentleman/4.png b/graphics/event_objects/pics/people/gentleman/4.png new file mode 100644 index 000000000..18e9bc6c3 Binary files /dev/null and b/graphics/event_objects/pics/people/gentleman/4.png differ diff --git a/graphics/event_objects/pics/people/gentleman/5.png b/graphics/event_objects/pics/people/gentleman/5.png new file mode 100644 index 000000000..d9203cc9f Binary files /dev/null and b/graphics/event_objects/pics/people/gentleman/5.png differ diff --git a/graphics/event_objects/pics/people/gentleman/6.png b/graphics/event_objects/pics/people/gentleman/6.png new file mode 100644 index 000000000..963b88d61 Binary files /dev/null and b/graphics/event_objects/pics/people/gentleman/6.png differ diff --git a/graphics/event_objects/pics/people/gentleman/7.png b/graphics/event_objects/pics/people/gentleman/7.png new file mode 100644 index 000000000..904e79189 Binary files /dev/null and b/graphics/event_objects/pics/people/gentleman/7.png differ diff --git a/graphics/event_objects/pics/people/gentleman/8.png b/graphics/event_objects/pics/people/gentleman/8.png new file mode 100644 index 000000000..85163c9ca Binary files /dev/null and b/graphics/event_objects/pics/people/gentleman/8.png differ diff --git a/graphics/event_objects/pics/people/girl_1/0.png b/graphics/event_objects/pics/people/girl_1/0.png new file mode 100644 index 000000000..4b812ef41 Binary files /dev/null and b/graphics/event_objects/pics/people/girl_1/0.png differ diff --git a/graphics/event_objects/pics/people/girl_1/1.png b/graphics/event_objects/pics/people/girl_1/1.png new file mode 100644 index 000000000..3ec86b337 Binary files /dev/null and b/graphics/event_objects/pics/people/girl_1/1.png differ diff --git a/graphics/event_objects/pics/people/girl_1/2.png b/graphics/event_objects/pics/people/girl_1/2.png new file mode 100644 index 000000000..4bea7b7ca Binary files /dev/null and b/graphics/event_objects/pics/people/girl_1/2.png differ diff --git a/graphics/event_objects/pics/people/girl_1/3.png b/graphics/event_objects/pics/people/girl_1/3.png new file mode 100644 index 000000000..06425c9eb Binary files /dev/null and b/graphics/event_objects/pics/people/girl_1/3.png differ diff --git a/graphics/event_objects/pics/people/girl_1/4.png b/graphics/event_objects/pics/people/girl_1/4.png new file mode 100644 index 000000000..fb940eadb Binary files /dev/null and b/graphics/event_objects/pics/people/girl_1/4.png differ diff --git a/graphics/event_objects/pics/people/girl_1/5.png b/graphics/event_objects/pics/people/girl_1/5.png new file mode 100644 index 000000000..1bf4c2dc8 Binary files /dev/null and b/graphics/event_objects/pics/people/girl_1/5.png differ diff --git a/graphics/event_objects/pics/people/girl_1/6.png b/graphics/event_objects/pics/people/girl_1/6.png new file mode 100644 index 000000000..256567cbf Binary files /dev/null and b/graphics/event_objects/pics/people/girl_1/6.png differ diff --git a/graphics/event_objects/pics/people/girl_1/7.png b/graphics/event_objects/pics/people/girl_1/7.png new file mode 100644 index 000000000..13bfe2af3 Binary files /dev/null and b/graphics/event_objects/pics/people/girl_1/7.png differ diff --git a/graphics/event_objects/pics/people/girl_1/8.png b/graphics/event_objects/pics/people/girl_1/8.png new file mode 100644 index 000000000..5675d705d Binary files /dev/null and b/graphics/event_objects/pics/people/girl_1/8.png differ diff --git a/graphics/event_objects/pics/people/girl_2/0.png b/graphics/event_objects/pics/people/girl_2/0.png new file mode 100644 index 000000000..5f336f20f Binary files /dev/null and b/graphics/event_objects/pics/people/girl_2/0.png differ diff --git a/graphics/event_objects/pics/people/girl_2/1.png b/graphics/event_objects/pics/people/girl_2/1.png new file mode 100644 index 000000000..3009e228c Binary files /dev/null and b/graphics/event_objects/pics/people/girl_2/1.png differ diff --git a/graphics/event_objects/pics/people/girl_2/2.png b/graphics/event_objects/pics/people/girl_2/2.png new file mode 100644 index 000000000..3f1c04b4b Binary files /dev/null and b/graphics/event_objects/pics/people/girl_2/2.png differ diff --git a/graphics/event_objects/pics/people/girl_2/3.png b/graphics/event_objects/pics/people/girl_2/3.png new file mode 100644 index 000000000..4713b70dd Binary files /dev/null and b/graphics/event_objects/pics/people/girl_2/3.png differ diff --git a/graphics/event_objects/pics/people/girl_2/4.png b/graphics/event_objects/pics/people/girl_2/4.png new file mode 100644 index 000000000..3a12aa48e Binary files /dev/null and b/graphics/event_objects/pics/people/girl_2/4.png differ diff --git a/graphics/event_objects/pics/people/girl_2/5.png b/graphics/event_objects/pics/people/girl_2/5.png new file mode 100644 index 000000000..885ee2de9 Binary files /dev/null and b/graphics/event_objects/pics/people/girl_2/5.png differ diff --git a/graphics/event_objects/pics/people/girl_2/6.png b/graphics/event_objects/pics/people/girl_2/6.png new file mode 100644 index 000000000..5ce644500 Binary files /dev/null and b/graphics/event_objects/pics/people/girl_2/6.png differ diff --git a/graphics/event_objects/pics/people/girl_2/7.png b/graphics/event_objects/pics/people/girl_2/7.png new file mode 100644 index 000000000..28e8ed5a8 Binary files /dev/null and b/graphics/event_objects/pics/people/girl_2/7.png differ diff --git a/graphics/event_objects/pics/people/girl_2/8.png b/graphics/event_objects/pics/people/girl_2/8.png new file mode 100644 index 000000000..e9b5e587e Binary files /dev/null and b/graphics/event_objects/pics/people/girl_2/8.png differ diff --git a/graphics/event_objects/pics/people/girl_3/0.png b/graphics/event_objects/pics/people/girl_3/0.png new file mode 100644 index 000000000..5927a264a Binary files /dev/null and b/graphics/event_objects/pics/people/girl_3/0.png differ diff --git a/graphics/event_objects/pics/people/girl_3/1.png b/graphics/event_objects/pics/people/girl_3/1.png new file mode 100644 index 000000000..6f3f32180 Binary files /dev/null and b/graphics/event_objects/pics/people/girl_3/1.png differ diff --git a/graphics/event_objects/pics/people/girl_3/2.png b/graphics/event_objects/pics/people/girl_3/2.png new file mode 100644 index 000000000..1a01b0031 Binary files /dev/null and b/graphics/event_objects/pics/people/girl_3/2.png differ diff --git a/graphics/event_objects/pics/people/girl_3/3.png b/graphics/event_objects/pics/people/girl_3/3.png new file mode 100644 index 000000000..2fb3db97b Binary files /dev/null and b/graphics/event_objects/pics/people/girl_3/3.png differ diff --git a/graphics/event_objects/pics/people/girl_3/4.png b/graphics/event_objects/pics/people/girl_3/4.png new file mode 100644 index 000000000..03287ab27 Binary files /dev/null and b/graphics/event_objects/pics/people/girl_3/4.png differ diff --git a/graphics/event_objects/pics/people/girl_3/5.png b/graphics/event_objects/pics/people/girl_3/5.png new file mode 100644 index 000000000..c30ead499 Binary files /dev/null and b/graphics/event_objects/pics/people/girl_3/5.png differ diff --git a/graphics/event_objects/pics/people/girl_3/6.png b/graphics/event_objects/pics/people/girl_3/6.png new file mode 100644 index 000000000..10eb415ad Binary files /dev/null and b/graphics/event_objects/pics/people/girl_3/6.png differ diff --git a/graphics/event_objects/pics/people/girl_3/7.png b/graphics/event_objects/pics/people/girl_3/7.png new file mode 100644 index 000000000..28fa0238b Binary files /dev/null and b/graphics/event_objects/pics/people/girl_3/7.png differ diff --git a/graphics/event_objects/pics/people/girl_3/8.png b/graphics/event_objects/pics/people/girl_3/8.png new file mode 100644 index 000000000..8dc1a2fbc Binary files /dev/null and b/graphics/event_objects/pics/people/girl_3/8.png differ diff --git a/graphics/event_objects/pics/people/glacia/0.png b/graphics/event_objects/pics/people/glacia/0.png new file mode 100644 index 000000000..4ee3c3b3e Binary files /dev/null and b/graphics/event_objects/pics/people/glacia/0.png differ diff --git a/graphics/event_objects/pics/people/glacia/1.png b/graphics/event_objects/pics/people/glacia/1.png new file mode 100644 index 000000000..866937df3 Binary files /dev/null and b/graphics/event_objects/pics/people/glacia/1.png differ diff --git a/graphics/event_objects/pics/people/glacia/2.png b/graphics/event_objects/pics/people/glacia/2.png new file mode 100644 index 000000000..5d66ef03e Binary files /dev/null and b/graphics/event_objects/pics/people/glacia/2.png differ diff --git a/graphics/event_objects/pics/people/greta/0.png b/graphics/event_objects/pics/people/greta/0.png new file mode 100644 index 000000000..033bb28e9 Binary files /dev/null and b/graphics/event_objects/pics/people/greta/0.png differ diff --git a/graphics/event_objects/pics/people/greta/1.png b/graphics/event_objects/pics/people/greta/1.png new file mode 100644 index 000000000..7035c50f3 Binary files /dev/null and b/graphics/event_objects/pics/people/greta/1.png differ diff --git a/graphics/event_objects/pics/people/greta/2.png b/graphics/event_objects/pics/people/greta/2.png new file mode 100644 index 000000000..a40dda6ac Binary files /dev/null and b/graphics/event_objects/pics/people/greta/2.png differ diff --git a/graphics/event_objects/pics/people/greta/3.png b/graphics/event_objects/pics/people/greta/3.png new file mode 100644 index 000000000..d7f33bd63 Binary files /dev/null and b/graphics/event_objects/pics/people/greta/3.png differ diff --git a/graphics/event_objects/pics/people/greta/4.png b/graphics/event_objects/pics/people/greta/4.png new file mode 100644 index 000000000..2e1331a28 Binary files /dev/null and b/graphics/event_objects/pics/people/greta/4.png differ diff --git a/graphics/event_objects/pics/people/greta/5.png b/graphics/event_objects/pics/people/greta/5.png new file mode 100644 index 000000000..3596eea6d Binary files /dev/null and b/graphics/event_objects/pics/people/greta/5.png differ diff --git a/graphics/event_objects/pics/people/greta/6.png b/graphics/event_objects/pics/people/greta/6.png new file mode 100644 index 000000000..71bbf717b Binary files /dev/null and b/graphics/event_objects/pics/people/greta/6.png differ diff --git a/graphics/event_objects/pics/people/greta/7.png b/graphics/event_objects/pics/people/greta/7.png new file mode 100644 index 000000000..5e08c3774 Binary files /dev/null and b/graphics/event_objects/pics/people/greta/7.png differ diff --git a/graphics/event_objects/pics/people/greta/8.png b/graphics/event_objects/pics/people/greta/8.png new file mode 100644 index 000000000..bc9cefcad Binary files /dev/null and b/graphics/event_objects/pics/people/greta/8.png differ diff --git a/graphics/event_objects/pics/people/hex_maniac/0.png b/graphics/event_objects/pics/people/hex_maniac/0.png new file mode 100644 index 000000000..da93178a0 Binary files /dev/null and b/graphics/event_objects/pics/people/hex_maniac/0.png differ diff --git a/graphics/event_objects/pics/people/hex_maniac/1.png b/graphics/event_objects/pics/people/hex_maniac/1.png new file mode 100644 index 000000000..7925ac221 Binary files /dev/null and b/graphics/event_objects/pics/people/hex_maniac/1.png differ diff --git a/graphics/event_objects/pics/people/hex_maniac/2.png b/graphics/event_objects/pics/people/hex_maniac/2.png new file mode 100644 index 000000000..24598f0b0 Binary files /dev/null and b/graphics/event_objects/pics/people/hex_maniac/2.png differ diff --git a/graphics/event_objects/pics/people/hex_maniac/3.png b/graphics/event_objects/pics/people/hex_maniac/3.png new file mode 100644 index 000000000..c3544aac1 Binary files /dev/null and b/graphics/event_objects/pics/people/hex_maniac/3.png differ diff --git a/graphics/event_objects/pics/people/hex_maniac/4.png b/graphics/event_objects/pics/people/hex_maniac/4.png new file mode 100644 index 000000000..f07338c7a Binary files /dev/null and b/graphics/event_objects/pics/people/hex_maniac/4.png differ diff --git a/graphics/event_objects/pics/people/hex_maniac/5.png b/graphics/event_objects/pics/people/hex_maniac/5.png new file mode 100644 index 000000000..925d6ccf9 Binary files /dev/null and b/graphics/event_objects/pics/people/hex_maniac/5.png differ diff --git a/graphics/event_objects/pics/people/hex_maniac/6.png b/graphics/event_objects/pics/people/hex_maniac/6.png new file mode 100644 index 000000000..a41a7a72b Binary files /dev/null and b/graphics/event_objects/pics/people/hex_maniac/6.png differ diff --git a/graphics/event_objects/pics/people/hex_maniac/7.png b/graphics/event_objects/pics/people/hex_maniac/7.png new file mode 100644 index 000000000..06bfa10d0 Binary files /dev/null and b/graphics/event_objects/pics/people/hex_maniac/7.png differ diff --git a/graphics/event_objects/pics/people/hex_maniac/8.png b/graphics/event_objects/pics/people/hex_maniac/8.png new file mode 100644 index 000000000..1c3a57faf Binary files /dev/null and b/graphics/event_objects/pics/people/hex_maniac/8.png differ diff --git a/graphics/event_objects/pics/people/hiker/0.png b/graphics/event_objects/pics/people/hiker/0.png new file mode 100644 index 000000000..715cdc4f9 Binary files /dev/null and b/graphics/event_objects/pics/people/hiker/0.png differ diff --git a/graphics/event_objects/pics/people/hiker/1.png b/graphics/event_objects/pics/people/hiker/1.png new file mode 100644 index 000000000..7af8fb736 Binary files /dev/null and b/graphics/event_objects/pics/people/hiker/1.png differ diff --git a/graphics/event_objects/pics/people/hiker/2.png b/graphics/event_objects/pics/people/hiker/2.png new file mode 100644 index 000000000..2b74ec3db Binary files /dev/null and b/graphics/event_objects/pics/people/hiker/2.png differ diff --git a/graphics/event_objects/pics/people/hiker/3.png b/graphics/event_objects/pics/people/hiker/3.png new file mode 100644 index 000000000..a7e0d91d5 Binary files /dev/null and b/graphics/event_objects/pics/people/hiker/3.png differ diff --git a/graphics/event_objects/pics/people/hiker/4.png b/graphics/event_objects/pics/people/hiker/4.png new file mode 100644 index 000000000..d0bb9fa9d Binary files /dev/null and b/graphics/event_objects/pics/people/hiker/4.png differ diff --git a/graphics/event_objects/pics/people/hiker/5.png b/graphics/event_objects/pics/people/hiker/5.png new file mode 100644 index 000000000..b405de51b Binary files /dev/null and b/graphics/event_objects/pics/people/hiker/5.png differ diff --git a/graphics/event_objects/pics/people/hiker/6.png b/graphics/event_objects/pics/people/hiker/6.png new file mode 100644 index 000000000..7271f7d4d Binary files /dev/null and b/graphics/event_objects/pics/people/hiker/6.png differ diff --git a/graphics/event_objects/pics/people/hiker/7.png b/graphics/event_objects/pics/people/hiker/7.png new file mode 100644 index 000000000..36db0a370 Binary files /dev/null and b/graphics/event_objects/pics/people/hiker/7.png differ diff --git a/graphics/event_objects/pics/people/hiker/8.png b/graphics/event_objects/pics/people/hiker/8.png new file mode 100644 index 000000000..dbcfd8c41 Binary files /dev/null and b/graphics/event_objects/pics/people/hiker/8.png differ diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman/0.png b/graphics/event_objects/pics/people/hot_springs_old_woman/0.png new file mode 100644 index 000000000..abb6cca16 Binary files /dev/null and b/graphics/event_objects/pics/people/hot_springs_old_woman/0.png differ diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman/1.png b/graphics/event_objects/pics/people/hot_springs_old_woman/1.png new file mode 100644 index 000000000..e45ab1ac4 Binary files /dev/null and b/graphics/event_objects/pics/people/hot_springs_old_woman/1.png differ diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman/2.png b/graphics/event_objects/pics/people/hot_springs_old_woman/2.png new file mode 100644 index 000000000..f5b9364b1 Binary files /dev/null and b/graphics/event_objects/pics/people/hot_springs_old_woman/2.png differ diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman/3.png b/graphics/event_objects/pics/people/hot_springs_old_woman/3.png new file mode 100644 index 000000000..8bd8dc9fb Binary files /dev/null and b/graphics/event_objects/pics/people/hot_springs_old_woman/3.png differ diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman/4.png b/graphics/event_objects/pics/people/hot_springs_old_woman/4.png new file mode 100644 index 000000000..8bd8dc9fb Binary files /dev/null and b/graphics/event_objects/pics/people/hot_springs_old_woman/4.png differ diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman/5.png b/graphics/event_objects/pics/people/hot_springs_old_woman/5.png new file mode 100644 index 000000000..ee043baeb Binary files /dev/null and b/graphics/event_objects/pics/people/hot_springs_old_woman/5.png differ diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman/6.png b/graphics/event_objects/pics/people/hot_springs_old_woman/6.png new file mode 100644 index 000000000..ee043baeb Binary files /dev/null and b/graphics/event_objects/pics/people/hot_springs_old_woman/6.png differ diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman/7.png b/graphics/event_objects/pics/people/hot_springs_old_woman/7.png new file mode 100644 index 000000000..f1498d71f Binary files /dev/null and b/graphics/event_objects/pics/people/hot_springs_old_woman/7.png differ diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman/8.png b/graphics/event_objects/pics/people/hot_springs_old_woman/8.png new file mode 100644 index 000000000..f1498d71f Binary files /dev/null and b/graphics/event_objects/pics/people/hot_springs_old_woman/8.png differ diff --git a/graphics/event_objects/pics/people/juan/0.png b/graphics/event_objects/pics/people/juan/0.png new file mode 100644 index 000000000..e9528a067 Binary files /dev/null and b/graphics/event_objects/pics/people/juan/0.png differ diff --git a/graphics/event_objects/pics/people/juan/1.png b/graphics/event_objects/pics/people/juan/1.png new file mode 100644 index 000000000..0d4248554 Binary files /dev/null and b/graphics/event_objects/pics/people/juan/1.png differ diff --git a/graphics/event_objects/pics/people/juan/2.png b/graphics/event_objects/pics/people/juan/2.png new file mode 100644 index 000000000..c86967d23 Binary files /dev/null and b/graphics/event_objects/pics/people/juan/2.png differ diff --git a/graphics/event_objects/pics/people/juan/3.png b/graphics/event_objects/pics/people/juan/3.png new file mode 100644 index 000000000..5d593a7ee Binary files /dev/null and b/graphics/event_objects/pics/people/juan/3.png differ diff --git a/graphics/event_objects/pics/people/juan/4.png b/graphics/event_objects/pics/people/juan/4.png new file mode 100644 index 000000000..4abb8aeec Binary files /dev/null and b/graphics/event_objects/pics/people/juan/4.png differ diff --git a/graphics/event_objects/pics/people/juan/5.png b/graphics/event_objects/pics/people/juan/5.png new file mode 100644 index 000000000..b3f28869b Binary files /dev/null and b/graphics/event_objects/pics/people/juan/5.png differ diff --git a/graphics/event_objects/pics/people/juan/6.png b/graphics/event_objects/pics/people/juan/6.png new file mode 100644 index 000000000..c46584d34 Binary files /dev/null and b/graphics/event_objects/pics/people/juan/6.png differ diff --git a/graphics/event_objects/pics/people/juan/7.png b/graphics/event_objects/pics/people/juan/7.png new file mode 100644 index 000000000..10ca59cd6 Binary files /dev/null and b/graphics/event_objects/pics/people/juan/7.png differ diff --git a/graphics/event_objects/pics/people/juan/8.png b/graphics/event_objects/pics/people/juan/8.png new file mode 100644 index 000000000..24ef412c1 Binary files /dev/null and b/graphics/event_objects/pics/people/juan/8.png differ diff --git a/graphics/event_objects/pics/people/lass/0.png b/graphics/event_objects/pics/people/lass/0.png new file mode 100644 index 000000000..602f557c7 Binary files /dev/null and b/graphics/event_objects/pics/people/lass/0.png differ diff --git a/graphics/event_objects/pics/people/lass/1.png b/graphics/event_objects/pics/people/lass/1.png new file mode 100644 index 000000000..c11380b4a Binary files /dev/null and b/graphics/event_objects/pics/people/lass/1.png differ diff --git a/graphics/event_objects/pics/people/lass/2.png b/graphics/event_objects/pics/people/lass/2.png new file mode 100644 index 000000000..887cc834b Binary files /dev/null and b/graphics/event_objects/pics/people/lass/2.png differ diff --git a/graphics/event_objects/pics/people/lass/3.png b/graphics/event_objects/pics/people/lass/3.png new file mode 100644 index 000000000..510d0812c Binary files /dev/null and b/graphics/event_objects/pics/people/lass/3.png differ diff --git a/graphics/event_objects/pics/people/lass/4.png b/graphics/event_objects/pics/people/lass/4.png new file mode 100644 index 000000000..8929a426b Binary files /dev/null and b/graphics/event_objects/pics/people/lass/4.png differ diff --git a/graphics/event_objects/pics/people/lass/5.png b/graphics/event_objects/pics/people/lass/5.png new file mode 100644 index 000000000..da422040c Binary files /dev/null and b/graphics/event_objects/pics/people/lass/5.png differ diff --git a/graphics/event_objects/pics/people/lass/6.png b/graphics/event_objects/pics/people/lass/6.png new file mode 100644 index 000000000..c9235c9aa Binary files /dev/null and b/graphics/event_objects/pics/people/lass/6.png differ diff --git a/graphics/event_objects/pics/people/lass/7.png b/graphics/event_objects/pics/people/lass/7.png new file mode 100644 index 000000000..1adfcd0ba Binary files /dev/null and b/graphics/event_objects/pics/people/lass/7.png differ diff --git a/graphics/event_objects/pics/people/lass/8.png b/graphics/event_objects/pics/people/lass/8.png new file mode 100644 index 000000000..392d65f93 Binary files /dev/null and b/graphics/event_objects/pics/people/lass/8.png differ diff --git a/graphics/event_objects/pics/people/leaf/0.png b/graphics/event_objects/pics/people/leaf/0.png new file mode 100644 index 000000000..d21024a8a Binary files /dev/null and b/graphics/event_objects/pics/people/leaf/0.png differ diff --git a/graphics/event_objects/pics/people/leaf/1.png b/graphics/event_objects/pics/people/leaf/1.png new file mode 100644 index 000000000..d14f4e29e Binary files /dev/null and b/graphics/event_objects/pics/people/leaf/1.png differ diff --git a/graphics/event_objects/pics/people/leaf/2.png b/graphics/event_objects/pics/people/leaf/2.png new file mode 100644 index 000000000..b8f8d7b6b Binary files /dev/null and b/graphics/event_objects/pics/people/leaf/2.png differ diff --git a/graphics/event_objects/pics/people/leaf/3.png b/graphics/event_objects/pics/people/leaf/3.png new file mode 100644 index 000000000..50a63ed30 Binary files /dev/null and b/graphics/event_objects/pics/people/leaf/3.png differ diff --git a/graphics/event_objects/pics/people/leaf/4.png b/graphics/event_objects/pics/people/leaf/4.png new file mode 100644 index 000000000..fdb21f0b3 Binary files /dev/null and b/graphics/event_objects/pics/people/leaf/4.png differ diff --git a/graphics/event_objects/pics/people/leaf/5.png b/graphics/event_objects/pics/people/leaf/5.png new file mode 100644 index 000000000..a90ac7c22 Binary files /dev/null and b/graphics/event_objects/pics/people/leaf/5.png differ diff --git a/graphics/event_objects/pics/people/leaf/6.png b/graphics/event_objects/pics/people/leaf/6.png new file mode 100644 index 000000000..ac69d167c Binary files /dev/null and b/graphics/event_objects/pics/people/leaf/6.png differ diff --git a/graphics/event_objects/pics/people/leaf/7.png b/graphics/event_objects/pics/people/leaf/7.png new file mode 100644 index 000000000..215fab8e8 Binary files /dev/null and b/graphics/event_objects/pics/people/leaf/7.png differ diff --git a/graphics/event_objects/pics/people/leaf/8.png b/graphics/event_objects/pics/people/leaf/8.png new file mode 100644 index 000000000..39dd27af1 Binary files /dev/null and b/graphics/event_objects/pics/people/leaf/8.png differ diff --git a/graphics/event_objects/pics/people/little_boy_1/0.png b/graphics/event_objects/pics/people/little_boy_1/0.png new file mode 100644 index 000000000..b96c644fb Binary files /dev/null and b/graphics/event_objects/pics/people/little_boy_1/0.png differ diff --git a/graphics/event_objects/pics/people/little_boy_1/1.png b/graphics/event_objects/pics/people/little_boy_1/1.png new file mode 100644 index 000000000..01f7f13d0 Binary files /dev/null and b/graphics/event_objects/pics/people/little_boy_1/1.png differ diff --git a/graphics/event_objects/pics/people/little_boy_1/2.png b/graphics/event_objects/pics/people/little_boy_1/2.png new file mode 100644 index 000000000..e080899f6 Binary files /dev/null and b/graphics/event_objects/pics/people/little_boy_1/2.png differ diff --git a/graphics/event_objects/pics/people/little_boy_1/3.png b/graphics/event_objects/pics/people/little_boy_1/3.png new file mode 100644 index 000000000..08dbedbff Binary files /dev/null and b/graphics/event_objects/pics/people/little_boy_1/3.png differ diff --git a/graphics/event_objects/pics/people/little_boy_1/4.png b/graphics/event_objects/pics/people/little_boy_1/4.png new file mode 100644 index 000000000..ed0f1c791 Binary files /dev/null and b/graphics/event_objects/pics/people/little_boy_1/4.png differ diff --git a/graphics/event_objects/pics/people/little_boy_1/5.png b/graphics/event_objects/pics/people/little_boy_1/5.png new file mode 100644 index 000000000..761263392 Binary files /dev/null and b/graphics/event_objects/pics/people/little_boy_1/5.png differ diff --git a/graphics/event_objects/pics/people/little_boy_1/6.png b/graphics/event_objects/pics/people/little_boy_1/6.png new file mode 100644 index 000000000..f8d72807f Binary files /dev/null and b/graphics/event_objects/pics/people/little_boy_1/6.png differ diff --git a/graphics/event_objects/pics/people/little_boy_1/7.png b/graphics/event_objects/pics/people/little_boy_1/7.png new file mode 100644 index 000000000..0f7c16ebb Binary files /dev/null and b/graphics/event_objects/pics/people/little_boy_1/7.png differ diff --git a/graphics/event_objects/pics/people/little_boy_1/8.png b/graphics/event_objects/pics/people/little_boy_1/8.png new file mode 100644 index 000000000..b3df6d38a Binary files /dev/null and b/graphics/event_objects/pics/people/little_boy_1/8.png differ diff --git a/graphics/event_objects/pics/people/little_boy_2/0.png b/graphics/event_objects/pics/people/little_boy_2/0.png new file mode 100644 index 000000000..1cb5472fc Binary files /dev/null and b/graphics/event_objects/pics/people/little_boy_2/0.png differ diff --git a/graphics/event_objects/pics/people/little_boy_2/1.png b/graphics/event_objects/pics/people/little_boy_2/1.png new file mode 100644 index 000000000..235933d0a Binary files /dev/null and b/graphics/event_objects/pics/people/little_boy_2/1.png differ diff --git a/graphics/event_objects/pics/people/little_boy_2/2.png b/graphics/event_objects/pics/people/little_boy_2/2.png new file mode 100644 index 000000000..ced688956 Binary files /dev/null and b/graphics/event_objects/pics/people/little_boy_2/2.png differ diff --git a/graphics/event_objects/pics/people/little_boy_2/3.png b/graphics/event_objects/pics/people/little_boy_2/3.png new file mode 100644 index 000000000..8c743b2a3 Binary files /dev/null and b/graphics/event_objects/pics/people/little_boy_2/3.png differ diff --git a/graphics/event_objects/pics/people/little_boy_2/4.png b/graphics/event_objects/pics/people/little_boy_2/4.png new file mode 100644 index 000000000..7af7cdbaa Binary files /dev/null and b/graphics/event_objects/pics/people/little_boy_2/4.png differ diff --git a/graphics/event_objects/pics/people/little_boy_2/5.png b/graphics/event_objects/pics/people/little_boy_2/5.png new file mode 100644 index 000000000..1db5b13ba Binary files /dev/null and b/graphics/event_objects/pics/people/little_boy_2/5.png differ diff --git a/graphics/event_objects/pics/people/little_boy_2/6.png b/graphics/event_objects/pics/people/little_boy_2/6.png new file mode 100644 index 000000000..00633ff85 Binary files /dev/null and b/graphics/event_objects/pics/people/little_boy_2/6.png differ diff --git a/graphics/event_objects/pics/people/little_boy_2/7.png b/graphics/event_objects/pics/people/little_boy_2/7.png new file mode 100644 index 000000000..ac2697065 Binary files /dev/null and b/graphics/event_objects/pics/people/little_boy_2/7.png differ diff --git a/graphics/event_objects/pics/people/little_boy_2/8.png b/graphics/event_objects/pics/people/little_boy_2/8.png new file mode 100644 index 000000000..fd02ff7a6 Binary files /dev/null and b/graphics/event_objects/pics/people/little_boy_2/8.png differ diff --git a/graphics/event_objects/pics/people/little_girl_1/0.png b/graphics/event_objects/pics/people/little_girl_1/0.png new file mode 100644 index 000000000..a4954285b Binary files /dev/null and b/graphics/event_objects/pics/people/little_girl_1/0.png differ diff --git a/graphics/event_objects/pics/people/little_girl_1/1.png b/graphics/event_objects/pics/people/little_girl_1/1.png new file mode 100644 index 000000000..0c6b9d411 Binary files /dev/null and b/graphics/event_objects/pics/people/little_girl_1/1.png differ diff --git a/graphics/event_objects/pics/people/little_girl_1/2.png b/graphics/event_objects/pics/people/little_girl_1/2.png new file mode 100644 index 000000000..6e3b1e77d Binary files /dev/null and b/graphics/event_objects/pics/people/little_girl_1/2.png differ diff --git a/graphics/event_objects/pics/people/little_girl_1/3.png b/graphics/event_objects/pics/people/little_girl_1/3.png new file mode 100644 index 000000000..b680b277a Binary files /dev/null and b/graphics/event_objects/pics/people/little_girl_1/3.png differ diff --git a/graphics/event_objects/pics/people/little_girl_1/4.png b/graphics/event_objects/pics/people/little_girl_1/4.png new file mode 100644 index 000000000..3211eecbb Binary files /dev/null and b/graphics/event_objects/pics/people/little_girl_1/4.png differ diff --git a/graphics/event_objects/pics/people/little_girl_1/5.png b/graphics/event_objects/pics/people/little_girl_1/5.png new file mode 100644 index 000000000..182a1a416 Binary files /dev/null and b/graphics/event_objects/pics/people/little_girl_1/5.png differ diff --git a/graphics/event_objects/pics/people/little_girl_1/6.png b/graphics/event_objects/pics/people/little_girl_1/6.png new file mode 100644 index 000000000..1b0daa637 Binary files /dev/null and b/graphics/event_objects/pics/people/little_girl_1/6.png differ diff --git a/graphics/event_objects/pics/people/little_girl_1/7.png b/graphics/event_objects/pics/people/little_girl_1/7.png new file mode 100644 index 000000000..f91406654 Binary files /dev/null and b/graphics/event_objects/pics/people/little_girl_1/7.png differ diff --git a/graphics/event_objects/pics/people/little_girl_1/8.png b/graphics/event_objects/pics/people/little_girl_1/8.png new file mode 100644 index 000000000..5c5bcbc2a Binary files /dev/null and b/graphics/event_objects/pics/people/little_girl_1/8.png differ diff --git a/graphics/event_objects/pics/people/little_girl_2/0.png b/graphics/event_objects/pics/people/little_girl_2/0.png new file mode 100644 index 000000000..fadfdad57 Binary files /dev/null and b/graphics/event_objects/pics/people/little_girl_2/0.png differ diff --git a/graphics/event_objects/pics/people/little_girl_2/1.png b/graphics/event_objects/pics/people/little_girl_2/1.png new file mode 100644 index 000000000..df2b66187 Binary files /dev/null and b/graphics/event_objects/pics/people/little_girl_2/1.png differ diff --git a/graphics/event_objects/pics/people/little_girl_2/2.png b/graphics/event_objects/pics/people/little_girl_2/2.png new file mode 100644 index 000000000..ac49cae9f Binary files /dev/null and b/graphics/event_objects/pics/people/little_girl_2/2.png differ diff --git a/graphics/event_objects/pics/people/little_girl_2/3.png b/graphics/event_objects/pics/people/little_girl_2/3.png new file mode 100644 index 000000000..869c4a1b3 Binary files /dev/null and b/graphics/event_objects/pics/people/little_girl_2/3.png differ diff --git a/graphics/event_objects/pics/people/little_girl_2/4.png b/graphics/event_objects/pics/people/little_girl_2/4.png new file mode 100644 index 000000000..b92551f18 Binary files /dev/null and b/graphics/event_objects/pics/people/little_girl_2/4.png differ diff --git a/graphics/event_objects/pics/people/little_girl_2/5.png b/graphics/event_objects/pics/people/little_girl_2/5.png new file mode 100644 index 000000000..778a644f2 Binary files /dev/null and b/graphics/event_objects/pics/people/little_girl_2/5.png differ diff --git a/graphics/event_objects/pics/people/little_girl_2/6.png b/graphics/event_objects/pics/people/little_girl_2/6.png new file mode 100644 index 000000000..1ca242176 Binary files /dev/null and b/graphics/event_objects/pics/people/little_girl_2/6.png differ diff --git a/graphics/event_objects/pics/people/little_girl_2/7.png b/graphics/event_objects/pics/people/little_girl_2/7.png new file mode 100644 index 000000000..d71a37cec Binary files /dev/null and b/graphics/event_objects/pics/people/little_girl_2/7.png differ diff --git a/graphics/event_objects/pics/people/little_girl_2/8.png b/graphics/event_objects/pics/people/little_girl_2/8.png new file mode 100644 index 000000000..dd76b53e0 Binary files /dev/null and b/graphics/event_objects/pics/people/little_girl_2/8.png differ diff --git a/graphics/event_objects/pics/people/liza/0.png b/graphics/event_objects/pics/people/liza/0.png new file mode 100644 index 000000000..e85ea4c5b Binary files /dev/null and b/graphics/event_objects/pics/people/liza/0.png differ diff --git a/graphics/event_objects/pics/people/liza/1.png b/graphics/event_objects/pics/people/liza/1.png new file mode 100644 index 000000000..dd7c4b2a6 Binary files /dev/null and b/graphics/event_objects/pics/people/liza/1.png differ diff --git a/graphics/event_objects/pics/people/liza/2.png b/graphics/event_objects/pics/people/liza/2.png new file mode 100644 index 000000000..96b4628fa Binary files /dev/null and b/graphics/event_objects/pics/people/liza/2.png differ diff --git a/graphics/event_objects/pics/people/lucy/0.png b/graphics/event_objects/pics/people/lucy/0.png new file mode 100644 index 000000000..422938505 Binary files /dev/null and b/graphics/event_objects/pics/people/lucy/0.png differ diff --git a/graphics/event_objects/pics/people/lucy/1.png b/graphics/event_objects/pics/people/lucy/1.png new file mode 100644 index 000000000..78eda0819 Binary files /dev/null and b/graphics/event_objects/pics/people/lucy/1.png differ diff --git a/graphics/event_objects/pics/people/lucy/2.png b/graphics/event_objects/pics/people/lucy/2.png new file mode 100644 index 000000000..db2579c62 Binary files /dev/null and b/graphics/event_objects/pics/people/lucy/2.png differ diff --git a/graphics/event_objects/pics/people/lucy/3.png b/graphics/event_objects/pics/people/lucy/3.png new file mode 100644 index 000000000..4f06bbb4d Binary files /dev/null and b/graphics/event_objects/pics/people/lucy/3.png differ diff --git a/graphics/event_objects/pics/people/lucy/4.png b/graphics/event_objects/pics/people/lucy/4.png new file mode 100644 index 000000000..ba42e7832 Binary files /dev/null and b/graphics/event_objects/pics/people/lucy/4.png differ diff --git a/graphics/event_objects/pics/people/lucy/5.png b/graphics/event_objects/pics/people/lucy/5.png new file mode 100644 index 000000000..980c55dd1 Binary files /dev/null and b/graphics/event_objects/pics/people/lucy/5.png differ diff --git a/graphics/event_objects/pics/people/lucy/6.png b/graphics/event_objects/pics/people/lucy/6.png new file mode 100644 index 000000000..b5d4c74cb Binary files /dev/null and b/graphics/event_objects/pics/people/lucy/6.png differ diff --git a/graphics/event_objects/pics/people/lucy/7.png b/graphics/event_objects/pics/people/lucy/7.png new file mode 100644 index 000000000..1dd07b5ec Binary files /dev/null and b/graphics/event_objects/pics/people/lucy/7.png differ diff --git a/graphics/event_objects/pics/people/lucy/8.png b/graphics/event_objects/pics/people/lucy/8.png new file mode 100644 index 000000000..2cface4e4 Binary files /dev/null and b/graphics/event_objects/pics/people/lucy/8.png differ diff --git a/graphics/event_objects/pics/people/magma_member_f/0.png b/graphics/event_objects/pics/people/magma_member_f/0.png new file mode 100644 index 000000000..ae467df02 Binary files /dev/null and b/graphics/event_objects/pics/people/magma_member_f/0.png differ diff --git a/graphics/event_objects/pics/people/magma_member_f/1.png b/graphics/event_objects/pics/people/magma_member_f/1.png new file mode 100644 index 000000000..22f8d3242 Binary files /dev/null and b/graphics/event_objects/pics/people/magma_member_f/1.png differ diff --git a/graphics/event_objects/pics/people/magma_member_f/2.png b/graphics/event_objects/pics/people/magma_member_f/2.png new file mode 100644 index 000000000..6820fc60e Binary files /dev/null and b/graphics/event_objects/pics/people/magma_member_f/2.png differ diff --git a/graphics/event_objects/pics/people/magma_member_f/3.png b/graphics/event_objects/pics/people/magma_member_f/3.png new file mode 100644 index 000000000..759d312cc Binary files /dev/null and b/graphics/event_objects/pics/people/magma_member_f/3.png differ diff --git a/graphics/event_objects/pics/people/magma_member_f/4.png b/graphics/event_objects/pics/people/magma_member_f/4.png new file mode 100644 index 000000000..5e653b471 Binary files /dev/null and b/graphics/event_objects/pics/people/magma_member_f/4.png differ diff --git a/graphics/event_objects/pics/people/magma_member_f/5.png b/graphics/event_objects/pics/people/magma_member_f/5.png new file mode 100644 index 000000000..872aaa5ae Binary files /dev/null and b/graphics/event_objects/pics/people/magma_member_f/5.png differ diff --git a/graphics/event_objects/pics/people/magma_member_f/6.png b/graphics/event_objects/pics/people/magma_member_f/6.png new file mode 100644 index 000000000..b6f96e1e1 Binary files /dev/null and b/graphics/event_objects/pics/people/magma_member_f/6.png differ diff --git a/graphics/event_objects/pics/people/magma_member_f/7.png b/graphics/event_objects/pics/people/magma_member_f/7.png new file mode 100644 index 000000000..2d7ee6980 Binary files /dev/null and b/graphics/event_objects/pics/people/magma_member_f/7.png differ diff --git a/graphics/event_objects/pics/people/magma_member_f/8.png b/graphics/event_objects/pics/people/magma_member_f/8.png new file mode 100644 index 000000000..09a2a36c7 Binary files /dev/null and b/graphics/event_objects/pics/people/magma_member_f/8.png differ diff --git a/graphics/event_objects/pics/people/magma_member_m/0.png b/graphics/event_objects/pics/people/magma_member_m/0.png new file mode 100644 index 000000000..a1886e9a1 Binary files /dev/null and b/graphics/event_objects/pics/people/magma_member_m/0.png differ diff --git a/graphics/event_objects/pics/people/magma_member_m/1.png b/graphics/event_objects/pics/people/magma_member_m/1.png new file mode 100644 index 000000000..f09d412da Binary files /dev/null and b/graphics/event_objects/pics/people/magma_member_m/1.png differ diff --git a/graphics/event_objects/pics/people/magma_member_m/2.png b/graphics/event_objects/pics/people/magma_member_m/2.png new file mode 100644 index 000000000..2b1cb90ac Binary files /dev/null and b/graphics/event_objects/pics/people/magma_member_m/2.png differ diff --git a/graphics/event_objects/pics/people/magma_member_m/3.png b/graphics/event_objects/pics/people/magma_member_m/3.png new file mode 100644 index 000000000..edfcf7850 Binary files /dev/null and b/graphics/event_objects/pics/people/magma_member_m/3.png differ diff --git a/graphics/event_objects/pics/people/magma_member_m/4.png b/graphics/event_objects/pics/people/magma_member_m/4.png new file mode 100644 index 000000000..6c8a2d2b0 Binary files /dev/null and b/graphics/event_objects/pics/people/magma_member_m/4.png differ diff --git a/graphics/event_objects/pics/people/magma_member_m/5.png b/graphics/event_objects/pics/people/magma_member_m/5.png new file mode 100644 index 000000000..4f0068f21 Binary files /dev/null and b/graphics/event_objects/pics/people/magma_member_m/5.png differ diff --git a/graphics/event_objects/pics/people/magma_member_m/6.png b/graphics/event_objects/pics/people/magma_member_m/6.png new file mode 100644 index 000000000..758bcddb1 Binary files /dev/null and b/graphics/event_objects/pics/people/magma_member_m/6.png differ diff --git a/graphics/event_objects/pics/people/magma_member_m/7.png b/graphics/event_objects/pics/people/magma_member_m/7.png new file mode 100644 index 000000000..3b4a1be19 Binary files /dev/null and b/graphics/event_objects/pics/people/magma_member_m/7.png differ diff --git a/graphics/event_objects/pics/people/magma_member_m/8.png b/graphics/event_objects/pics/people/magma_member_m/8.png new file mode 100644 index 000000000..fc5c7b53c Binary files /dev/null and b/graphics/event_objects/pics/people/magma_member_m/8.png differ diff --git a/graphics/event_objects/pics/people/man_1/0.png b/graphics/event_objects/pics/people/man_1/0.png new file mode 100644 index 000000000..83a226b7a Binary files /dev/null and b/graphics/event_objects/pics/people/man_1/0.png differ diff --git a/graphics/event_objects/pics/people/man_1/1.png b/graphics/event_objects/pics/people/man_1/1.png new file mode 100644 index 000000000..7eba03e27 Binary files /dev/null and b/graphics/event_objects/pics/people/man_1/1.png differ diff --git a/graphics/event_objects/pics/people/man_1/2.png b/graphics/event_objects/pics/people/man_1/2.png new file mode 100644 index 000000000..675851b98 Binary files /dev/null and b/graphics/event_objects/pics/people/man_1/2.png differ diff --git a/graphics/event_objects/pics/people/man_1/3.png b/graphics/event_objects/pics/people/man_1/3.png new file mode 100644 index 000000000..d29b03948 Binary files /dev/null and b/graphics/event_objects/pics/people/man_1/3.png differ diff --git a/graphics/event_objects/pics/people/man_1/4.png b/graphics/event_objects/pics/people/man_1/4.png new file mode 100644 index 000000000..a328a22f3 Binary files /dev/null and b/graphics/event_objects/pics/people/man_1/4.png differ diff --git a/graphics/event_objects/pics/people/man_1/5.png b/graphics/event_objects/pics/people/man_1/5.png new file mode 100644 index 000000000..cf993dcd4 Binary files /dev/null and b/graphics/event_objects/pics/people/man_1/5.png differ diff --git a/graphics/event_objects/pics/people/man_1/6.png b/graphics/event_objects/pics/people/man_1/6.png new file mode 100644 index 000000000..04ff3e1e8 Binary files /dev/null and b/graphics/event_objects/pics/people/man_1/6.png differ diff --git a/graphics/event_objects/pics/people/man_1/7.png b/graphics/event_objects/pics/people/man_1/7.png new file mode 100644 index 000000000..cce946285 Binary files /dev/null and b/graphics/event_objects/pics/people/man_1/7.png differ diff --git a/graphics/event_objects/pics/people/man_1/8.png b/graphics/event_objects/pics/people/man_1/8.png new file mode 100644 index 000000000..8176b427d Binary files /dev/null and b/graphics/event_objects/pics/people/man_1/8.png differ diff --git a/graphics/event_objects/pics/people/man_2/0.png b/graphics/event_objects/pics/people/man_2/0.png new file mode 100644 index 000000000..e0f0ff01b Binary files /dev/null and b/graphics/event_objects/pics/people/man_2/0.png differ diff --git a/graphics/event_objects/pics/people/man_2/1.png b/graphics/event_objects/pics/people/man_2/1.png new file mode 100644 index 000000000..e1a38fd4a Binary files /dev/null and b/graphics/event_objects/pics/people/man_2/1.png differ diff --git a/graphics/event_objects/pics/people/man_2/2.png b/graphics/event_objects/pics/people/man_2/2.png new file mode 100644 index 000000000..e05a000ef Binary files /dev/null and b/graphics/event_objects/pics/people/man_2/2.png differ diff --git a/graphics/event_objects/pics/people/man_2/3.png b/graphics/event_objects/pics/people/man_2/3.png new file mode 100644 index 000000000..946a6941b Binary files /dev/null and b/graphics/event_objects/pics/people/man_2/3.png differ diff --git a/graphics/event_objects/pics/people/man_2/4.png b/graphics/event_objects/pics/people/man_2/4.png new file mode 100644 index 000000000..eee58063f Binary files /dev/null and b/graphics/event_objects/pics/people/man_2/4.png differ diff --git a/graphics/event_objects/pics/people/man_2/5.png b/graphics/event_objects/pics/people/man_2/5.png new file mode 100644 index 000000000..c32800118 Binary files /dev/null and b/graphics/event_objects/pics/people/man_2/5.png differ diff --git a/graphics/event_objects/pics/people/man_2/6.png b/graphics/event_objects/pics/people/man_2/6.png new file mode 100644 index 000000000..f8e3eb88a Binary files /dev/null and b/graphics/event_objects/pics/people/man_2/6.png differ diff --git a/graphics/event_objects/pics/people/man_2/7.png b/graphics/event_objects/pics/people/man_2/7.png new file mode 100644 index 000000000..43fffd1d7 Binary files /dev/null and b/graphics/event_objects/pics/people/man_2/7.png differ diff --git a/graphics/event_objects/pics/people/man_2/8.png b/graphics/event_objects/pics/people/man_2/8.png new file mode 100644 index 000000000..8897d2fd3 Binary files /dev/null and b/graphics/event_objects/pics/people/man_2/8.png differ diff --git a/graphics/event_objects/pics/people/man_3/0.png b/graphics/event_objects/pics/people/man_3/0.png new file mode 100644 index 000000000..073e015f7 Binary files /dev/null and b/graphics/event_objects/pics/people/man_3/0.png differ diff --git a/graphics/event_objects/pics/people/man_3/1.png b/graphics/event_objects/pics/people/man_3/1.png new file mode 100644 index 000000000..c0762c7ff Binary files /dev/null and b/graphics/event_objects/pics/people/man_3/1.png differ diff --git a/graphics/event_objects/pics/people/man_3/2.png b/graphics/event_objects/pics/people/man_3/2.png new file mode 100644 index 000000000..21608c48a Binary files /dev/null and b/graphics/event_objects/pics/people/man_3/2.png differ diff --git a/graphics/event_objects/pics/people/man_3/3.png b/graphics/event_objects/pics/people/man_3/3.png new file mode 100644 index 000000000..85b6765b0 Binary files /dev/null and b/graphics/event_objects/pics/people/man_3/3.png differ diff --git a/graphics/event_objects/pics/people/man_3/4.png b/graphics/event_objects/pics/people/man_3/4.png new file mode 100644 index 000000000..e47dbe0fe Binary files /dev/null and b/graphics/event_objects/pics/people/man_3/4.png differ diff --git a/graphics/event_objects/pics/people/man_3/5.png b/graphics/event_objects/pics/people/man_3/5.png new file mode 100644 index 000000000..9f30a6dad Binary files /dev/null and b/graphics/event_objects/pics/people/man_3/5.png differ diff --git a/graphics/event_objects/pics/people/man_3/6.png b/graphics/event_objects/pics/people/man_3/6.png new file mode 100644 index 000000000..3f6144f1a Binary files /dev/null and b/graphics/event_objects/pics/people/man_3/6.png differ diff --git a/graphics/event_objects/pics/people/man_3/7.png b/graphics/event_objects/pics/people/man_3/7.png new file mode 100644 index 000000000..e70347dce Binary files /dev/null and b/graphics/event_objects/pics/people/man_3/7.png differ diff --git a/graphics/event_objects/pics/people/man_3/8.png b/graphics/event_objects/pics/people/man_3/8.png new file mode 100644 index 000000000..274a02280 Binary files /dev/null and b/graphics/event_objects/pics/people/man_3/8.png differ diff --git a/graphics/event_objects/pics/people/man_4/0.png b/graphics/event_objects/pics/people/man_4/0.png new file mode 100644 index 000000000..0297b592c Binary files /dev/null and b/graphics/event_objects/pics/people/man_4/0.png differ diff --git a/graphics/event_objects/pics/people/man_4/1.png b/graphics/event_objects/pics/people/man_4/1.png new file mode 100644 index 000000000..d73e6ed5c Binary files /dev/null and b/graphics/event_objects/pics/people/man_4/1.png differ diff --git a/graphics/event_objects/pics/people/man_4/2.png b/graphics/event_objects/pics/people/man_4/2.png new file mode 100644 index 000000000..6cd7f5798 Binary files /dev/null and b/graphics/event_objects/pics/people/man_4/2.png differ diff --git a/graphics/event_objects/pics/people/man_4/3.png b/graphics/event_objects/pics/people/man_4/3.png new file mode 100644 index 000000000..2486efd7f Binary files /dev/null and b/graphics/event_objects/pics/people/man_4/3.png differ diff --git a/graphics/event_objects/pics/people/man_4/4.png b/graphics/event_objects/pics/people/man_4/4.png new file mode 100644 index 000000000..732ff9c8d Binary files /dev/null and b/graphics/event_objects/pics/people/man_4/4.png differ diff --git a/graphics/event_objects/pics/people/man_4/5.png b/graphics/event_objects/pics/people/man_4/5.png new file mode 100644 index 000000000..7e20d5af9 Binary files /dev/null and b/graphics/event_objects/pics/people/man_4/5.png differ diff --git a/graphics/event_objects/pics/people/man_4/6.png b/graphics/event_objects/pics/people/man_4/6.png new file mode 100644 index 000000000..3d4ae58f0 Binary files /dev/null and b/graphics/event_objects/pics/people/man_4/6.png differ diff --git a/graphics/event_objects/pics/people/man_4/7.png b/graphics/event_objects/pics/people/man_4/7.png new file mode 100644 index 000000000..12a9d1fa8 Binary files /dev/null and b/graphics/event_objects/pics/people/man_4/7.png differ diff --git a/graphics/event_objects/pics/people/man_4/8.png b/graphics/event_objects/pics/people/man_4/8.png new file mode 100644 index 000000000..43bea13ce Binary files /dev/null and b/graphics/event_objects/pics/people/man_4/8.png differ diff --git a/graphics/event_objects/pics/people/man_5/0.png b/graphics/event_objects/pics/people/man_5/0.png new file mode 100644 index 000000000..f1da52790 Binary files /dev/null and b/graphics/event_objects/pics/people/man_5/0.png differ diff --git a/graphics/event_objects/pics/people/man_5/1.png b/graphics/event_objects/pics/people/man_5/1.png new file mode 100644 index 000000000..80dde6ec6 Binary files /dev/null and b/graphics/event_objects/pics/people/man_5/1.png differ diff --git a/graphics/event_objects/pics/people/man_5/2.png b/graphics/event_objects/pics/people/man_5/2.png new file mode 100644 index 000000000..95ee60f02 Binary files /dev/null and b/graphics/event_objects/pics/people/man_5/2.png differ diff --git a/graphics/event_objects/pics/people/man_5/3.png b/graphics/event_objects/pics/people/man_5/3.png new file mode 100644 index 000000000..52d4e65f0 Binary files /dev/null and b/graphics/event_objects/pics/people/man_5/3.png differ diff --git a/graphics/event_objects/pics/people/man_5/4.png b/graphics/event_objects/pics/people/man_5/4.png new file mode 100644 index 000000000..23e440b88 Binary files /dev/null and b/graphics/event_objects/pics/people/man_5/4.png differ diff --git a/graphics/event_objects/pics/people/man_5/5.png b/graphics/event_objects/pics/people/man_5/5.png new file mode 100644 index 000000000..c587b3762 Binary files /dev/null and b/graphics/event_objects/pics/people/man_5/5.png differ diff --git a/graphics/event_objects/pics/people/man_5/6.png b/graphics/event_objects/pics/people/man_5/6.png new file mode 100644 index 000000000..7ee45b6db Binary files /dev/null and b/graphics/event_objects/pics/people/man_5/6.png differ diff --git a/graphics/event_objects/pics/people/man_5/7.png b/graphics/event_objects/pics/people/man_5/7.png new file mode 100644 index 000000000..24a578a34 Binary files /dev/null and b/graphics/event_objects/pics/people/man_5/7.png differ diff --git a/graphics/event_objects/pics/people/man_5/8.png b/graphics/event_objects/pics/people/man_5/8.png new file mode 100644 index 000000000..6040f6f4d Binary files /dev/null and b/graphics/event_objects/pics/people/man_5/8.png differ diff --git a/graphics/event_objects/pics/people/man_6/0.png b/graphics/event_objects/pics/people/man_6/0.png new file mode 100644 index 000000000..ddcd545aa Binary files /dev/null and b/graphics/event_objects/pics/people/man_6/0.png differ diff --git a/graphics/event_objects/pics/people/man_6/1.png b/graphics/event_objects/pics/people/man_6/1.png new file mode 100644 index 000000000..0d7007e10 Binary files /dev/null and b/graphics/event_objects/pics/people/man_6/1.png differ diff --git a/graphics/event_objects/pics/people/man_6/2.png b/graphics/event_objects/pics/people/man_6/2.png new file mode 100644 index 000000000..4daabc15d Binary files /dev/null and b/graphics/event_objects/pics/people/man_6/2.png differ diff --git a/graphics/event_objects/pics/people/man_6/3.png b/graphics/event_objects/pics/people/man_6/3.png new file mode 100644 index 000000000..0373f371d Binary files /dev/null and b/graphics/event_objects/pics/people/man_6/3.png differ diff --git a/graphics/event_objects/pics/people/man_6/4.png b/graphics/event_objects/pics/people/man_6/4.png new file mode 100644 index 000000000..b0d8ee814 Binary files /dev/null and b/graphics/event_objects/pics/people/man_6/4.png differ diff --git a/graphics/event_objects/pics/people/man_6/5.png b/graphics/event_objects/pics/people/man_6/5.png new file mode 100644 index 000000000..3f95859a1 Binary files /dev/null and b/graphics/event_objects/pics/people/man_6/5.png differ diff --git a/graphics/event_objects/pics/people/man_6/6.png b/graphics/event_objects/pics/people/man_6/6.png new file mode 100644 index 000000000..5a89dfc33 Binary files /dev/null and b/graphics/event_objects/pics/people/man_6/6.png differ diff --git a/graphics/event_objects/pics/people/man_6/7.png b/graphics/event_objects/pics/people/man_6/7.png new file mode 100644 index 000000000..6c2e07884 Binary files /dev/null and b/graphics/event_objects/pics/people/man_6/7.png differ diff --git a/graphics/event_objects/pics/people/man_6/8.png b/graphics/event_objects/pics/people/man_6/8.png new file mode 100644 index 000000000..3db124eab Binary files /dev/null and b/graphics/event_objects/pics/people/man_6/8.png differ diff --git a/graphics/event_objects/pics/people/man_7/0.png b/graphics/event_objects/pics/people/man_7/0.png new file mode 100644 index 000000000..ce99c5a53 Binary files /dev/null and b/graphics/event_objects/pics/people/man_7/0.png differ diff --git a/graphics/event_objects/pics/people/man_7/1.png b/graphics/event_objects/pics/people/man_7/1.png new file mode 100644 index 000000000..4339d2481 Binary files /dev/null and b/graphics/event_objects/pics/people/man_7/1.png differ diff --git a/graphics/event_objects/pics/people/man_7/2.png b/graphics/event_objects/pics/people/man_7/2.png new file mode 100644 index 000000000..24390d9f9 Binary files /dev/null and b/graphics/event_objects/pics/people/man_7/2.png differ diff --git a/graphics/event_objects/pics/people/man_7/3.png b/graphics/event_objects/pics/people/man_7/3.png new file mode 100644 index 000000000..39051b795 Binary files /dev/null and b/graphics/event_objects/pics/people/man_7/3.png differ diff --git a/graphics/event_objects/pics/people/man_7/4.png b/graphics/event_objects/pics/people/man_7/4.png new file mode 100644 index 000000000..a72a83931 Binary files /dev/null and b/graphics/event_objects/pics/people/man_7/4.png differ diff --git a/graphics/event_objects/pics/people/man_7/5.png b/graphics/event_objects/pics/people/man_7/5.png new file mode 100644 index 000000000..3de7bd28b Binary files /dev/null and b/graphics/event_objects/pics/people/man_7/5.png differ diff --git a/graphics/event_objects/pics/people/man_7/6.png b/graphics/event_objects/pics/people/man_7/6.png new file mode 100644 index 000000000..2c9c2ee8f Binary files /dev/null and b/graphics/event_objects/pics/people/man_7/6.png differ diff --git a/graphics/event_objects/pics/people/man_7/7.png b/graphics/event_objects/pics/people/man_7/7.png new file mode 100644 index 000000000..068dc873d Binary files /dev/null and b/graphics/event_objects/pics/people/man_7/7.png differ diff --git a/graphics/event_objects/pics/people/man_7/8.png b/graphics/event_objects/pics/people/man_7/8.png new file mode 100644 index 000000000..81e41d5c4 Binary files /dev/null and b/graphics/event_objects/pics/people/man_7/8.png differ diff --git a/graphics/event_objects/pics/people/maniac/0.png b/graphics/event_objects/pics/people/maniac/0.png new file mode 100644 index 000000000..01f066910 Binary files /dev/null and b/graphics/event_objects/pics/people/maniac/0.png differ diff --git a/graphics/event_objects/pics/people/maniac/1.png b/graphics/event_objects/pics/people/maniac/1.png new file mode 100644 index 000000000..fc8efb1d4 Binary files /dev/null and b/graphics/event_objects/pics/people/maniac/1.png differ diff --git a/graphics/event_objects/pics/people/maniac/2.png b/graphics/event_objects/pics/people/maniac/2.png new file mode 100644 index 000000000..ea211288f Binary files /dev/null and b/graphics/event_objects/pics/people/maniac/2.png differ diff --git a/graphics/event_objects/pics/people/maniac/3.png b/graphics/event_objects/pics/people/maniac/3.png new file mode 100644 index 000000000..7a0ab0ba1 Binary files /dev/null and b/graphics/event_objects/pics/people/maniac/3.png differ diff --git a/graphics/event_objects/pics/people/maniac/4.png b/graphics/event_objects/pics/people/maniac/4.png new file mode 100644 index 000000000..93083333d Binary files /dev/null and b/graphics/event_objects/pics/people/maniac/4.png differ diff --git a/graphics/event_objects/pics/people/maniac/5.png b/graphics/event_objects/pics/people/maniac/5.png new file mode 100644 index 000000000..ac18fea6e Binary files /dev/null and b/graphics/event_objects/pics/people/maniac/5.png differ diff --git a/graphics/event_objects/pics/people/maniac/6.png b/graphics/event_objects/pics/people/maniac/6.png new file mode 100644 index 000000000..d8db27038 Binary files /dev/null and b/graphics/event_objects/pics/people/maniac/6.png differ diff --git a/graphics/event_objects/pics/people/maniac/7.png b/graphics/event_objects/pics/people/maniac/7.png new file mode 100644 index 000000000..647c69838 Binary files /dev/null and b/graphics/event_objects/pics/people/maniac/7.png differ diff --git a/graphics/event_objects/pics/people/maniac/8.png b/graphics/event_objects/pics/people/maniac/8.png new file mode 100644 index 000000000..5d37c6d40 Binary files /dev/null and b/graphics/event_objects/pics/people/maniac/8.png differ diff --git a/graphics/event_objects/pics/people/mart_employee/0.png b/graphics/event_objects/pics/people/mart_employee/0.png new file mode 100644 index 000000000..4dfc880b7 Binary files /dev/null and b/graphics/event_objects/pics/people/mart_employee/0.png differ diff --git a/graphics/event_objects/pics/people/mart_employee/1.png b/graphics/event_objects/pics/people/mart_employee/1.png new file mode 100644 index 000000000..25320fff0 Binary files /dev/null and b/graphics/event_objects/pics/people/mart_employee/1.png differ diff --git a/graphics/event_objects/pics/people/mart_employee/2.png b/graphics/event_objects/pics/people/mart_employee/2.png new file mode 100644 index 000000000..31ad7d75b Binary files /dev/null and b/graphics/event_objects/pics/people/mart_employee/2.png differ diff --git a/graphics/event_objects/pics/people/mart_employee/3.png b/graphics/event_objects/pics/people/mart_employee/3.png new file mode 100644 index 000000000..4e7e389d8 Binary files /dev/null and b/graphics/event_objects/pics/people/mart_employee/3.png differ diff --git a/graphics/event_objects/pics/people/mart_employee/4.png b/graphics/event_objects/pics/people/mart_employee/4.png new file mode 100644 index 000000000..4357a5946 Binary files /dev/null and b/graphics/event_objects/pics/people/mart_employee/4.png differ diff --git a/graphics/event_objects/pics/people/mart_employee/5.png b/graphics/event_objects/pics/people/mart_employee/5.png new file mode 100644 index 000000000..46ae73fd2 Binary files /dev/null and b/graphics/event_objects/pics/people/mart_employee/5.png differ diff --git a/graphics/event_objects/pics/people/mart_employee/6.png b/graphics/event_objects/pics/people/mart_employee/6.png new file mode 100644 index 000000000..9eb51a482 Binary files /dev/null and b/graphics/event_objects/pics/people/mart_employee/6.png differ diff --git a/graphics/event_objects/pics/people/mart_employee/7.png b/graphics/event_objects/pics/people/mart_employee/7.png new file mode 100644 index 000000000..b3ffb8036 Binary files /dev/null and b/graphics/event_objects/pics/people/mart_employee/7.png differ diff --git a/graphics/event_objects/pics/people/mart_employee/8.png b/graphics/event_objects/pics/people/mart_employee/8.png new file mode 100644 index 000000000..b2268286c Binary files /dev/null and b/graphics/event_objects/pics/people/mart_employee/8.png differ diff --git a/graphics/event_objects/pics/people/mauville_old_man_1/0.png b/graphics/event_objects/pics/people/mauville_old_man_1/0.png new file mode 100644 index 000000000..3c10d0abf Binary files /dev/null and b/graphics/event_objects/pics/people/mauville_old_man_1/0.png differ diff --git a/graphics/event_objects/pics/people/mauville_old_man_1/1.png b/graphics/event_objects/pics/people/mauville_old_man_1/1.png new file mode 100644 index 000000000..6f4226ccb Binary files /dev/null and b/graphics/event_objects/pics/people/mauville_old_man_1/1.png differ diff --git a/graphics/event_objects/pics/people/mauville_old_man_1/2.png b/graphics/event_objects/pics/people/mauville_old_man_1/2.png new file mode 100644 index 000000000..adf126f15 Binary files /dev/null and b/graphics/event_objects/pics/people/mauville_old_man_1/2.png differ diff --git a/graphics/event_objects/pics/people/mauville_old_man_1/3.png b/graphics/event_objects/pics/people/mauville_old_man_1/3.png new file mode 100644 index 000000000..e199433fb Binary files /dev/null and b/graphics/event_objects/pics/people/mauville_old_man_1/3.png differ diff --git a/graphics/event_objects/pics/people/mauville_old_man_1/4.png b/graphics/event_objects/pics/people/mauville_old_man_1/4.png new file mode 100644 index 000000000..359e93016 Binary files /dev/null and b/graphics/event_objects/pics/people/mauville_old_man_1/4.png differ diff --git a/graphics/event_objects/pics/people/mauville_old_man_1/5.png b/graphics/event_objects/pics/people/mauville_old_man_1/5.png new file mode 100644 index 000000000..34f15abff Binary files /dev/null and b/graphics/event_objects/pics/people/mauville_old_man_1/5.png differ diff --git a/graphics/event_objects/pics/people/mauville_old_man_1/6.png b/graphics/event_objects/pics/people/mauville_old_man_1/6.png new file mode 100644 index 000000000..07af2fb1d Binary files /dev/null and b/graphics/event_objects/pics/people/mauville_old_man_1/6.png differ diff --git a/graphics/event_objects/pics/people/mauville_old_man_1/7.png b/graphics/event_objects/pics/people/mauville_old_man_1/7.png new file mode 100644 index 000000000..a4d759a26 Binary files /dev/null and b/graphics/event_objects/pics/people/mauville_old_man_1/7.png differ diff --git a/graphics/event_objects/pics/people/mauville_old_man_1/8.png b/graphics/event_objects/pics/people/mauville_old_man_1/8.png new file mode 100644 index 000000000..8816c61aa Binary files /dev/null and b/graphics/event_objects/pics/people/mauville_old_man_1/8.png differ diff --git a/graphics/event_objects/pics/people/mauville_old_man_2/0.png b/graphics/event_objects/pics/people/mauville_old_man_2/0.png new file mode 100644 index 000000000..d913bcbdb Binary files /dev/null and b/graphics/event_objects/pics/people/mauville_old_man_2/0.png differ diff --git a/graphics/event_objects/pics/people/mauville_old_man_2/1.png b/graphics/event_objects/pics/people/mauville_old_man_2/1.png new file mode 100644 index 000000000..f98c0ecde Binary files /dev/null and b/graphics/event_objects/pics/people/mauville_old_man_2/1.png differ diff --git a/graphics/event_objects/pics/people/mauville_old_man_2/2.png b/graphics/event_objects/pics/people/mauville_old_man_2/2.png new file mode 100644 index 000000000..abe9050a0 Binary files /dev/null and b/graphics/event_objects/pics/people/mauville_old_man_2/2.png differ diff --git a/graphics/event_objects/pics/people/mauville_old_man_2/3.png b/graphics/event_objects/pics/people/mauville_old_man_2/3.png new file mode 100644 index 000000000..4d71ce720 Binary files /dev/null and b/graphics/event_objects/pics/people/mauville_old_man_2/3.png differ diff --git a/graphics/event_objects/pics/people/mauville_old_man_2/4.png b/graphics/event_objects/pics/people/mauville_old_man_2/4.png new file mode 100644 index 000000000..9e0330a61 Binary files /dev/null and b/graphics/event_objects/pics/people/mauville_old_man_2/4.png differ diff --git a/graphics/event_objects/pics/people/mauville_old_man_2/5.png b/graphics/event_objects/pics/people/mauville_old_man_2/5.png new file mode 100644 index 000000000..92135f48a Binary files /dev/null and b/graphics/event_objects/pics/people/mauville_old_man_2/5.png differ diff --git a/graphics/event_objects/pics/people/mauville_old_man_2/6.png b/graphics/event_objects/pics/people/mauville_old_man_2/6.png new file mode 100644 index 000000000..3a328ba04 Binary files /dev/null and b/graphics/event_objects/pics/people/mauville_old_man_2/6.png differ diff --git a/graphics/event_objects/pics/people/mauville_old_man_2/7.png b/graphics/event_objects/pics/people/mauville_old_man_2/7.png new file mode 100644 index 000000000..ea1b4d95b Binary files /dev/null and b/graphics/event_objects/pics/people/mauville_old_man_2/7.png differ diff --git a/graphics/event_objects/pics/people/mauville_old_man_2/8.png b/graphics/event_objects/pics/people/mauville_old_man_2/8.png new file mode 100644 index 000000000..ac7a5e12d Binary files /dev/null and b/graphics/event_objects/pics/people/mauville_old_man_2/8.png differ diff --git a/graphics/event_objects/pics/people/maxie/0.png b/graphics/event_objects/pics/people/maxie/0.png new file mode 100644 index 000000000..21ca72fd2 Binary files /dev/null and b/graphics/event_objects/pics/people/maxie/0.png differ diff --git a/graphics/event_objects/pics/people/maxie/1.png b/graphics/event_objects/pics/people/maxie/1.png new file mode 100644 index 000000000..d7347de17 Binary files /dev/null and b/graphics/event_objects/pics/people/maxie/1.png differ diff --git a/graphics/event_objects/pics/people/maxie/2.png b/graphics/event_objects/pics/people/maxie/2.png new file mode 100644 index 000000000..f80bb07a5 Binary files /dev/null and b/graphics/event_objects/pics/people/maxie/2.png differ diff --git a/graphics/event_objects/pics/people/maxie/3.png b/graphics/event_objects/pics/people/maxie/3.png new file mode 100644 index 000000000..6cb101536 Binary files /dev/null and b/graphics/event_objects/pics/people/maxie/3.png differ diff --git a/graphics/event_objects/pics/people/maxie/4.png b/graphics/event_objects/pics/people/maxie/4.png new file mode 100644 index 000000000..c513206a6 Binary files /dev/null and b/graphics/event_objects/pics/people/maxie/4.png differ diff --git a/graphics/event_objects/pics/people/maxie/5.png b/graphics/event_objects/pics/people/maxie/5.png new file mode 100644 index 000000000..fd6a81dc5 Binary files /dev/null and b/graphics/event_objects/pics/people/maxie/5.png differ diff --git a/graphics/event_objects/pics/people/maxie/6.png b/graphics/event_objects/pics/people/maxie/6.png new file mode 100644 index 000000000..ac1564204 Binary files /dev/null and b/graphics/event_objects/pics/people/maxie/6.png differ diff --git a/graphics/event_objects/pics/people/maxie/7.png b/graphics/event_objects/pics/people/maxie/7.png new file mode 100644 index 000000000..adb1aa235 Binary files /dev/null and b/graphics/event_objects/pics/people/maxie/7.png differ diff --git a/graphics/event_objects/pics/people/maxie/8.png b/graphics/event_objects/pics/people/maxie/8.png new file mode 100644 index 000000000..765803561 Binary files /dev/null and b/graphics/event_objects/pics/people/maxie/8.png differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/00.png b/graphics/event_objects/pics/people/may/acro_bike/00.png new file mode 100644 index 000000000..389f29985 Binary files /dev/null and b/graphics/event_objects/pics/people/may/acro_bike/00.png differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/01.png b/graphics/event_objects/pics/people/may/acro_bike/01.png new file mode 100644 index 000000000..d6b698965 Binary files /dev/null and b/graphics/event_objects/pics/people/may/acro_bike/01.png differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/02.png b/graphics/event_objects/pics/people/may/acro_bike/02.png new file mode 100644 index 000000000..ecb59b54f Binary files /dev/null and b/graphics/event_objects/pics/people/may/acro_bike/02.png differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/03.png b/graphics/event_objects/pics/people/may/acro_bike/03.png new file mode 100644 index 000000000..dfdd7a56a Binary files /dev/null and b/graphics/event_objects/pics/people/may/acro_bike/03.png differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/04.png b/graphics/event_objects/pics/people/may/acro_bike/04.png new file mode 100644 index 000000000..6a6fa22fd Binary files /dev/null and b/graphics/event_objects/pics/people/may/acro_bike/04.png differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/05.png b/graphics/event_objects/pics/people/may/acro_bike/05.png new file mode 100644 index 000000000..3b73f3367 Binary files /dev/null and b/graphics/event_objects/pics/people/may/acro_bike/05.png differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/06.png b/graphics/event_objects/pics/people/may/acro_bike/06.png new file mode 100644 index 000000000..368f0a05b Binary files /dev/null and b/graphics/event_objects/pics/people/may/acro_bike/06.png differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/07.png b/graphics/event_objects/pics/people/may/acro_bike/07.png new file mode 100644 index 000000000..e43d75556 Binary files /dev/null and b/graphics/event_objects/pics/people/may/acro_bike/07.png differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/08.png b/graphics/event_objects/pics/people/may/acro_bike/08.png new file mode 100644 index 000000000..ec9ef52e6 Binary files /dev/null and b/graphics/event_objects/pics/people/may/acro_bike/08.png differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/09.png b/graphics/event_objects/pics/people/may/acro_bike/09.png new file mode 100644 index 000000000..55522bd5b Binary files /dev/null and b/graphics/event_objects/pics/people/may/acro_bike/09.png differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/10.png b/graphics/event_objects/pics/people/may/acro_bike/10.png new file mode 100644 index 000000000..eff73287f Binary files /dev/null and b/graphics/event_objects/pics/people/may/acro_bike/10.png differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/11.png b/graphics/event_objects/pics/people/may/acro_bike/11.png new file mode 100644 index 000000000..092fffddb Binary files /dev/null and b/graphics/event_objects/pics/people/may/acro_bike/11.png differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/12.png b/graphics/event_objects/pics/people/may/acro_bike/12.png new file mode 100644 index 000000000..233a03266 Binary files /dev/null and b/graphics/event_objects/pics/people/may/acro_bike/12.png differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/13.png b/graphics/event_objects/pics/people/may/acro_bike/13.png new file mode 100644 index 000000000..f1736a0ec Binary files /dev/null and b/graphics/event_objects/pics/people/may/acro_bike/13.png differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/14.png b/graphics/event_objects/pics/people/may/acro_bike/14.png new file mode 100644 index 000000000..bf4ade7f0 Binary files /dev/null and b/graphics/event_objects/pics/people/may/acro_bike/14.png differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/15.png b/graphics/event_objects/pics/people/may/acro_bike/15.png new file mode 100644 index 000000000..9fccb5026 Binary files /dev/null and b/graphics/event_objects/pics/people/may/acro_bike/15.png differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/16.png b/graphics/event_objects/pics/people/may/acro_bike/16.png new file mode 100644 index 000000000..6d34e41bf Binary files /dev/null and b/graphics/event_objects/pics/people/may/acro_bike/16.png differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/17.png b/graphics/event_objects/pics/people/may/acro_bike/17.png new file mode 100644 index 000000000..e01484497 Binary files /dev/null and b/graphics/event_objects/pics/people/may/acro_bike/17.png differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/18.png b/graphics/event_objects/pics/people/may/acro_bike/18.png new file mode 100644 index 000000000..a4bee4772 Binary files /dev/null and b/graphics/event_objects/pics/people/may/acro_bike/18.png differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/19.png b/graphics/event_objects/pics/people/may/acro_bike/19.png new file mode 100644 index 000000000..f7e10f132 Binary files /dev/null and b/graphics/event_objects/pics/people/may/acro_bike/19.png differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/20.png b/graphics/event_objects/pics/people/may/acro_bike/20.png new file mode 100644 index 000000000..f9f34e4ae Binary files /dev/null and b/graphics/event_objects/pics/people/may/acro_bike/20.png differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/21.png b/graphics/event_objects/pics/people/may/acro_bike/21.png new file mode 100644 index 000000000..8784ce762 Binary files /dev/null and b/graphics/event_objects/pics/people/may/acro_bike/21.png differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/22.png b/graphics/event_objects/pics/people/may/acro_bike/22.png new file mode 100644 index 000000000..8753ad9c9 Binary files /dev/null and b/graphics/event_objects/pics/people/may/acro_bike/22.png differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/23.png b/graphics/event_objects/pics/people/may/acro_bike/23.png new file mode 100644 index 000000000..c2d8a60cb Binary files /dev/null and b/graphics/event_objects/pics/people/may/acro_bike/23.png differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/24.png b/graphics/event_objects/pics/people/may/acro_bike/24.png new file mode 100644 index 000000000..1836e5fed Binary files /dev/null and b/graphics/event_objects/pics/people/may/acro_bike/24.png differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/25.png b/graphics/event_objects/pics/people/may/acro_bike/25.png new file mode 100644 index 000000000..d93970171 Binary files /dev/null and b/graphics/event_objects/pics/people/may/acro_bike/25.png differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/26.png b/graphics/event_objects/pics/people/may/acro_bike/26.png new file mode 100644 index 000000000..8a5ba8ef6 Binary files /dev/null and b/graphics/event_objects/pics/people/may/acro_bike/26.png differ diff --git a/graphics/event_objects/pics/people/may/decorating.png b/graphics/event_objects/pics/people/may/decorating.png new file mode 100644 index 000000000..7f83dfde9 Binary files /dev/null and b/graphics/event_objects/pics/people/may/decorating.png differ diff --git a/graphics/event_objects/pics/people/may/field_move/0.png b/graphics/event_objects/pics/people/may/field_move/0.png new file mode 100644 index 000000000..9fecaa3d4 Binary files /dev/null and b/graphics/event_objects/pics/people/may/field_move/0.png differ diff --git a/graphics/event_objects/pics/people/may/field_move/1.png b/graphics/event_objects/pics/people/may/field_move/1.png new file mode 100644 index 000000000..47341322b Binary files /dev/null and b/graphics/event_objects/pics/people/may/field_move/1.png differ diff --git a/graphics/event_objects/pics/people/may/field_move/2.png b/graphics/event_objects/pics/people/may/field_move/2.png new file mode 100644 index 000000000..bdd23f0cf Binary files /dev/null and b/graphics/event_objects/pics/people/may/field_move/2.png differ diff --git a/graphics/event_objects/pics/people/may/field_move/3.png b/graphics/event_objects/pics/people/may/field_move/3.png new file mode 100644 index 000000000..c72277f74 Binary files /dev/null and b/graphics/event_objects/pics/people/may/field_move/3.png differ diff --git a/graphics/event_objects/pics/people/may/field_move/4.png b/graphics/event_objects/pics/people/may/field_move/4.png new file mode 100644 index 000000000..9e62b6869 Binary files /dev/null and b/graphics/event_objects/pics/people/may/field_move/4.png differ diff --git a/graphics/event_objects/pics/people/may/fishing/00.png b/graphics/event_objects/pics/people/may/fishing/00.png new file mode 100644 index 000000000..24d435e84 Binary files /dev/null and b/graphics/event_objects/pics/people/may/fishing/00.png differ diff --git a/graphics/event_objects/pics/people/may/fishing/01.png b/graphics/event_objects/pics/people/may/fishing/01.png new file mode 100644 index 000000000..f4ec1ccdd Binary files /dev/null and b/graphics/event_objects/pics/people/may/fishing/01.png differ diff --git a/graphics/event_objects/pics/people/may/fishing/02.png b/graphics/event_objects/pics/people/may/fishing/02.png new file mode 100644 index 000000000..9d2e66b4f Binary files /dev/null and b/graphics/event_objects/pics/people/may/fishing/02.png differ diff --git a/graphics/event_objects/pics/people/may/fishing/03.png b/graphics/event_objects/pics/people/may/fishing/03.png new file mode 100644 index 000000000..a7078e584 Binary files /dev/null and b/graphics/event_objects/pics/people/may/fishing/03.png differ diff --git a/graphics/event_objects/pics/people/may/fishing/04.png b/graphics/event_objects/pics/people/may/fishing/04.png new file mode 100644 index 000000000..f135404bc Binary files /dev/null and b/graphics/event_objects/pics/people/may/fishing/04.png differ diff --git a/graphics/event_objects/pics/people/may/fishing/05.png b/graphics/event_objects/pics/people/may/fishing/05.png new file mode 100644 index 000000000..cb45778ac Binary files /dev/null and b/graphics/event_objects/pics/people/may/fishing/05.png differ diff --git a/graphics/event_objects/pics/people/may/fishing/06.png b/graphics/event_objects/pics/people/may/fishing/06.png new file mode 100644 index 000000000..910e2f780 Binary files /dev/null and b/graphics/event_objects/pics/people/may/fishing/06.png differ diff --git a/graphics/event_objects/pics/people/may/fishing/07.png b/graphics/event_objects/pics/people/may/fishing/07.png new file mode 100644 index 000000000..a13b1cad5 Binary files /dev/null and b/graphics/event_objects/pics/people/may/fishing/07.png differ diff --git a/graphics/event_objects/pics/people/may/fishing/08.png b/graphics/event_objects/pics/people/may/fishing/08.png new file mode 100644 index 000000000..297643481 Binary files /dev/null and b/graphics/event_objects/pics/people/may/fishing/08.png differ diff --git a/graphics/event_objects/pics/people/may/fishing/09.png b/graphics/event_objects/pics/people/may/fishing/09.png new file mode 100644 index 000000000..069eb2b20 Binary files /dev/null and b/graphics/event_objects/pics/people/may/fishing/09.png differ diff --git a/graphics/event_objects/pics/people/may/fishing/10.png b/graphics/event_objects/pics/people/may/fishing/10.png new file mode 100644 index 000000000..5eca2728d Binary files /dev/null and b/graphics/event_objects/pics/people/may/fishing/10.png differ diff --git a/graphics/event_objects/pics/people/may/fishing/11.png b/graphics/event_objects/pics/people/may/fishing/11.png new file mode 100644 index 000000000..9895c388a Binary files /dev/null and b/graphics/event_objects/pics/people/may/fishing/11.png differ diff --git a/graphics/event_objects/pics/people/may/mach_bike/0.png b/graphics/event_objects/pics/people/may/mach_bike/0.png new file mode 100644 index 000000000..389f29985 Binary files /dev/null and b/graphics/event_objects/pics/people/may/mach_bike/0.png differ diff --git a/graphics/event_objects/pics/people/may/mach_bike/1.png b/graphics/event_objects/pics/people/may/mach_bike/1.png new file mode 100644 index 000000000..d6b698965 Binary files /dev/null and b/graphics/event_objects/pics/people/may/mach_bike/1.png differ diff --git a/graphics/event_objects/pics/people/may/mach_bike/2.png b/graphics/event_objects/pics/people/may/mach_bike/2.png new file mode 100644 index 000000000..ecb59b54f Binary files /dev/null and b/graphics/event_objects/pics/people/may/mach_bike/2.png differ diff --git a/graphics/event_objects/pics/people/may/mach_bike/3.png b/graphics/event_objects/pics/people/may/mach_bike/3.png new file mode 100644 index 000000000..dfdd7a56a Binary files /dev/null and b/graphics/event_objects/pics/people/may/mach_bike/3.png differ diff --git a/graphics/event_objects/pics/people/may/mach_bike/4.png b/graphics/event_objects/pics/people/may/mach_bike/4.png new file mode 100644 index 000000000..6a6fa22fd Binary files /dev/null and b/graphics/event_objects/pics/people/may/mach_bike/4.png differ diff --git a/graphics/event_objects/pics/people/may/mach_bike/5.png b/graphics/event_objects/pics/people/may/mach_bike/5.png new file mode 100644 index 000000000..3b73f3367 Binary files /dev/null and b/graphics/event_objects/pics/people/may/mach_bike/5.png differ diff --git a/graphics/event_objects/pics/people/may/mach_bike/6.png b/graphics/event_objects/pics/people/may/mach_bike/6.png new file mode 100644 index 000000000..368f0a05b Binary files /dev/null and b/graphics/event_objects/pics/people/may/mach_bike/6.png differ diff --git a/graphics/event_objects/pics/people/may/mach_bike/7.png b/graphics/event_objects/pics/people/may/mach_bike/7.png new file mode 100644 index 000000000..e43d75556 Binary files /dev/null and b/graphics/event_objects/pics/people/may/mach_bike/7.png differ diff --git a/graphics/event_objects/pics/people/may/mach_bike/8.png b/graphics/event_objects/pics/people/may/mach_bike/8.png new file mode 100644 index 000000000..ec9ef52e6 Binary files /dev/null and b/graphics/event_objects/pics/people/may/mach_bike/8.png differ diff --git a/graphics/event_objects/pics/people/may/normal/00.png b/graphics/event_objects/pics/people/may/normal/00.png new file mode 100644 index 000000000..58aac207f Binary files /dev/null and b/graphics/event_objects/pics/people/may/normal/00.png differ diff --git a/graphics/event_objects/pics/people/may/normal/01.png b/graphics/event_objects/pics/people/may/normal/01.png new file mode 100644 index 000000000..2c3641e0a Binary files /dev/null and b/graphics/event_objects/pics/people/may/normal/01.png differ diff --git a/graphics/event_objects/pics/people/may/normal/02.png b/graphics/event_objects/pics/people/may/normal/02.png new file mode 100644 index 000000000..32b7120a5 Binary files /dev/null and b/graphics/event_objects/pics/people/may/normal/02.png differ diff --git a/graphics/event_objects/pics/people/may/normal/03.png b/graphics/event_objects/pics/people/may/normal/03.png new file mode 100644 index 000000000..d1047dff8 Binary files /dev/null and b/graphics/event_objects/pics/people/may/normal/03.png differ diff --git a/graphics/event_objects/pics/people/may/normal/04.png b/graphics/event_objects/pics/people/may/normal/04.png new file mode 100644 index 000000000..848166557 Binary files /dev/null and b/graphics/event_objects/pics/people/may/normal/04.png differ diff --git a/graphics/event_objects/pics/people/may/normal/05.png b/graphics/event_objects/pics/people/may/normal/05.png new file mode 100644 index 000000000..5e6ec70ff Binary files /dev/null and b/graphics/event_objects/pics/people/may/normal/05.png differ diff --git a/graphics/event_objects/pics/people/may/normal/06.png b/graphics/event_objects/pics/people/may/normal/06.png new file mode 100644 index 000000000..0e318b466 Binary files /dev/null and b/graphics/event_objects/pics/people/may/normal/06.png differ diff --git a/graphics/event_objects/pics/people/may/normal/07.png b/graphics/event_objects/pics/people/may/normal/07.png new file mode 100644 index 000000000..e11b30b65 Binary files /dev/null and b/graphics/event_objects/pics/people/may/normal/07.png differ diff --git a/graphics/event_objects/pics/people/may/normal/08.png b/graphics/event_objects/pics/people/may/normal/08.png new file mode 100644 index 000000000..4aae3e9d6 Binary files /dev/null and b/graphics/event_objects/pics/people/may/normal/08.png differ diff --git a/graphics/event_objects/pics/people/may/normal/09.png b/graphics/event_objects/pics/people/may/normal/09.png new file mode 100644 index 000000000..eae4c02ee Binary files /dev/null and b/graphics/event_objects/pics/people/may/normal/09.png differ diff --git a/graphics/event_objects/pics/people/may/normal/10.png b/graphics/event_objects/pics/people/may/normal/10.png new file mode 100644 index 000000000..2a678208e Binary files /dev/null and b/graphics/event_objects/pics/people/may/normal/10.png differ diff --git a/graphics/event_objects/pics/people/may/normal/11.png b/graphics/event_objects/pics/people/may/normal/11.png new file mode 100644 index 000000000..7ca7d3e6f Binary files /dev/null and b/graphics/event_objects/pics/people/may/normal/11.png differ diff --git a/graphics/event_objects/pics/people/may/normal/12.png b/graphics/event_objects/pics/people/may/normal/12.png new file mode 100644 index 000000000..1e2d40894 Binary files /dev/null and b/graphics/event_objects/pics/people/may/normal/12.png differ diff --git a/graphics/event_objects/pics/people/may/normal/13.png b/graphics/event_objects/pics/people/may/normal/13.png new file mode 100644 index 000000000..ca020591c Binary files /dev/null and b/graphics/event_objects/pics/people/may/normal/13.png differ diff --git a/graphics/event_objects/pics/people/may/normal/14.png b/graphics/event_objects/pics/people/may/normal/14.png new file mode 100644 index 000000000..6a5a2e3e5 Binary files /dev/null and b/graphics/event_objects/pics/people/may/normal/14.png differ diff --git a/graphics/event_objects/pics/people/may/normal/15.png b/graphics/event_objects/pics/people/may/normal/15.png new file mode 100644 index 000000000..06d813167 Binary files /dev/null and b/graphics/event_objects/pics/people/may/normal/15.png differ diff --git a/graphics/event_objects/pics/people/may/normal/16.png b/graphics/event_objects/pics/people/may/normal/16.png new file mode 100644 index 000000000..c1fe3d367 Binary files /dev/null and b/graphics/event_objects/pics/people/may/normal/16.png differ diff --git a/graphics/event_objects/pics/people/may/normal/17.png b/graphics/event_objects/pics/people/may/normal/17.png new file mode 100644 index 000000000..334c70cf1 Binary files /dev/null and b/graphics/event_objects/pics/people/may/normal/17.png differ diff --git a/graphics/event_objects/pics/people/may/surfing/0.png b/graphics/event_objects/pics/people/may/surfing/0.png new file mode 100644 index 000000000..98b152f5f Binary files /dev/null and b/graphics/event_objects/pics/people/may/surfing/0.png differ diff --git a/graphics/event_objects/pics/people/may/surfing/1.png b/graphics/event_objects/pics/people/may/surfing/1.png new file mode 100644 index 000000000..45ae64705 Binary files /dev/null and b/graphics/event_objects/pics/people/may/surfing/1.png differ diff --git a/graphics/event_objects/pics/people/may/surfing/2.png b/graphics/event_objects/pics/people/may/surfing/2.png new file mode 100644 index 000000000..eb6f7675e Binary files /dev/null and b/graphics/event_objects/pics/people/may/surfing/2.png differ diff --git a/graphics/event_objects/pics/people/may/surfing/3.png b/graphics/event_objects/pics/people/may/surfing/3.png new file mode 100644 index 000000000..18756fe1b Binary files /dev/null and b/graphics/event_objects/pics/people/may/surfing/3.png differ diff --git a/graphics/event_objects/pics/people/may/surfing/4.png b/graphics/event_objects/pics/people/may/surfing/4.png new file mode 100644 index 000000000..ac89a2672 Binary files /dev/null and b/graphics/event_objects/pics/people/may/surfing/4.png differ diff --git a/graphics/event_objects/pics/people/may/surfing/5.png b/graphics/event_objects/pics/people/may/surfing/5.png new file mode 100644 index 000000000..2569df008 Binary files /dev/null and b/graphics/event_objects/pics/people/may/surfing/5.png differ diff --git a/graphics/event_objects/pics/people/may/underwater/0.png b/graphics/event_objects/pics/people/may/underwater/0.png new file mode 100644 index 000000000..678dc4bb6 Binary files /dev/null and b/graphics/event_objects/pics/people/may/underwater/0.png differ diff --git a/graphics/event_objects/pics/people/may/underwater/1.png b/graphics/event_objects/pics/people/may/underwater/1.png new file mode 100644 index 000000000..697cec2d1 Binary files /dev/null and b/graphics/event_objects/pics/people/may/underwater/1.png differ diff --git a/graphics/event_objects/pics/people/may/underwater/2.png b/graphics/event_objects/pics/people/may/underwater/2.png new file mode 100644 index 000000000..423f01f88 Binary files /dev/null and b/graphics/event_objects/pics/people/may/underwater/2.png differ diff --git a/graphics/event_objects/pics/people/may/underwater/3.png b/graphics/event_objects/pics/people/may/underwater/3.png new file mode 100644 index 000000000..4118573a3 Binary files /dev/null and b/graphics/event_objects/pics/people/may/underwater/3.png differ diff --git a/graphics/event_objects/pics/people/may/watering/0.png b/graphics/event_objects/pics/people/may/watering/0.png new file mode 100644 index 000000000..11e8944a1 Binary files /dev/null and b/graphics/event_objects/pics/people/may/watering/0.png differ diff --git a/graphics/event_objects/pics/people/may/watering/1.png b/graphics/event_objects/pics/people/may/watering/1.png new file mode 100644 index 000000000..84aa55502 Binary files /dev/null and b/graphics/event_objects/pics/people/may/watering/1.png differ diff --git a/graphics/event_objects/pics/people/may/watering/2.png b/graphics/event_objects/pics/people/may/watering/2.png new file mode 100644 index 000000000..5d68e4994 Binary files /dev/null and b/graphics/event_objects/pics/people/may/watering/2.png differ diff --git a/graphics/event_objects/pics/people/may/watering/3.png b/graphics/event_objects/pics/people/may/watering/3.png new file mode 100644 index 000000000..c0f732d72 Binary files /dev/null and b/graphics/event_objects/pics/people/may/watering/3.png differ diff --git a/graphics/event_objects/pics/people/may/watering/4.png b/graphics/event_objects/pics/people/may/watering/4.png new file mode 100644 index 000000000..85657cc6c Binary files /dev/null and b/graphics/event_objects/pics/people/may/watering/4.png differ diff --git a/graphics/event_objects/pics/people/may/watering/5.png b/graphics/event_objects/pics/people/may/watering/5.png new file mode 100644 index 000000000..939671a31 Binary files /dev/null and b/graphics/event_objects/pics/people/may/watering/5.png differ diff --git a/graphics/event_objects/pics/people/mom/0.png b/graphics/event_objects/pics/people/mom/0.png new file mode 100644 index 000000000..c2b592c9f Binary files /dev/null and b/graphics/event_objects/pics/people/mom/0.png differ diff --git a/graphics/event_objects/pics/people/mom/1.png b/graphics/event_objects/pics/people/mom/1.png new file mode 100644 index 000000000..e1d1797cb Binary files /dev/null and b/graphics/event_objects/pics/people/mom/1.png differ diff --git a/graphics/event_objects/pics/people/mom/2.png b/graphics/event_objects/pics/people/mom/2.png new file mode 100644 index 000000000..8cd0c1d72 Binary files /dev/null and b/graphics/event_objects/pics/people/mom/2.png differ diff --git a/graphics/event_objects/pics/people/mom/3.png b/graphics/event_objects/pics/people/mom/3.png new file mode 100644 index 000000000..3a682f892 Binary files /dev/null and b/graphics/event_objects/pics/people/mom/3.png differ diff --git a/graphics/event_objects/pics/people/mom/4.png b/graphics/event_objects/pics/people/mom/4.png new file mode 100644 index 000000000..96de53b7b Binary files /dev/null and b/graphics/event_objects/pics/people/mom/4.png differ diff --git a/graphics/event_objects/pics/people/mom/5.png b/graphics/event_objects/pics/people/mom/5.png new file mode 100644 index 000000000..567e8fb53 Binary files /dev/null and b/graphics/event_objects/pics/people/mom/5.png differ diff --git a/graphics/event_objects/pics/people/mom/6.png b/graphics/event_objects/pics/people/mom/6.png new file mode 100644 index 000000000..4dfaed492 Binary files /dev/null and b/graphics/event_objects/pics/people/mom/6.png differ diff --git a/graphics/event_objects/pics/people/mom/7.png b/graphics/event_objects/pics/people/mom/7.png new file mode 100644 index 000000000..3ce984e75 Binary files /dev/null and b/graphics/event_objects/pics/people/mom/7.png differ diff --git a/graphics/event_objects/pics/people/mom/8.png b/graphics/event_objects/pics/people/mom/8.png new file mode 100644 index 000000000..6a3da67d1 Binary files /dev/null and b/graphics/event_objects/pics/people/mom/8.png differ diff --git a/graphics/event_objects/pics/people/mystery_event_deliveryman/0.png b/graphics/event_objects/pics/people/mystery_event_deliveryman/0.png new file mode 100644 index 000000000..ec3e0ac82 Binary files /dev/null and b/graphics/event_objects/pics/people/mystery_event_deliveryman/0.png differ diff --git a/graphics/event_objects/pics/people/mystery_event_deliveryman/1.png b/graphics/event_objects/pics/people/mystery_event_deliveryman/1.png new file mode 100644 index 000000000..8be989045 Binary files /dev/null and b/graphics/event_objects/pics/people/mystery_event_deliveryman/1.png differ diff --git a/graphics/event_objects/pics/people/mystery_event_deliveryman/2.png b/graphics/event_objects/pics/people/mystery_event_deliveryman/2.png new file mode 100644 index 000000000..afff0cc5e Binary files /dev/null and b/graphics/event_objects/pics/people/mystery_event_deliveryman/2.png differ diff --git a/graphics/event_objects/pics/people/noland/0.png b/graphics/event_objects/pics/people/noland/0.png new file mode 100644 index 000000000..76fb7bdf1 Binary files /dev/null and b/graphics/event_objects/pics/people/noland/0.png differ diff --git a/graphics/event_objects/pics/people/noland/1.png b/graphics/event_objects/pics/people/noland/1.png new file mode 100644 index 000000000..4eeceffed Binary files /dev/null and b/graphics/event_objects/pics/people/noland/1.png differ diff --git a/graphics/event_objects/pics/people/noland/2.png b/graphics/event_objects/pics/people/noland/2.png new file mode 100644 index 000000000..daeff0641 Binary files /dev/null and b/graphics/event_objects/pics/people/noland/2.png differ diff --git a/graphics/event_objects/pics/people/noland/3.png b/graphics/event_objects/pics/people/noland/3.png new file mode 100644 index 000000000..e54596be6 Binary files /dev/null and b/graphics/event_objects/pics/people/noland/3.png differ diff --git a/graphics/event_objects/pics/people/noland/4.png b/graphics/event_objects/pics/people/noland/4.png new file mode 100644 index 000000000..35763f56f Binary files /dev/null and b/graphics/event_objects/pics/people/noland/4.png differ diff --git a/graphics/event_objects/pics/people/noland/5.png b/graphics/event_objects/pics/people/noland/5.png new file mode 100644 index 000000000..ef0ac5d92 Binary files /dev/null and b/graphics/event_objects/pics/people/noland/5.png differ diff --git a/graphics/event_objects/pics/people/noland/6.png b/graphics/event_objects/pics/people/noland/6.png new file mode 100644 index 000000000..dc6fa2a25 Binary files /dev/null and b/graphics/event_objects/pics/people/noland/6.png differ diff --git a/graphics/event_objects/pics/people/noland/7.png b/graphics/event_objects/pics/people/noland/7.png new file mode 100644 index 000000000..ee9820106 Binary files /dev/null and b/graphics/event_objects/pics/people/noland/7.png differ diff --git a/graphics/event_objects/pics/people/noland/8.png b/graphics/event_objects/pics/people/noland/8.png new file mode 100644 index 000000000..e8d40a08d Binary files /dev/null and b/graphics/event_objects/pics/people/noland/8.png differ diff --git a/graphics/event_objects/pics/people/norman/0.png b/graphics/event_objects/pics/people/norman/0.png new file mode 100644 index 000000000..5f0bd1686 Binary files /dev/null and b/graphics/event_objects/pics/people/norman/0.png differ diff --git a/graphics/event_objects/pics/people/norman/1.png b/graphics/event_objects/pics/people/norman/1.png new file mode 100644 index 000000000..88ea12ada Binary files /dev/null and b/graphics/event_objects/pics/people/norman/1.png differ diff --git a/graphics/event_objects/pics/people/norman/2.png b/graphics/event_objects/pics/people/norman/2.png new file mode 100644 index 000000000..04d8694ef Binary files /dev/null and b/graphics/event_objects/pics/people/norman/2.png differ diff --git a/graphics/event_objects/pics/people/norman/3.png b/graphics/event_objects/pics/people/norman/3.png new file mode 100644 index 000000000..90d16f675 Binary files /dev/null and b/graphics/event_objects/pics/people/norman/3.png differ diff --git a/graphics/event_objects/pics/people/norman/4.png b/graphics/event_objects/pics/people/norman/4.png new file mode 100644 index 000000000..0df4412fb Binary files /dev/null and b/graphics/event_objects/pics/people/norman/4.png differ diff --git a/graphics/event_objects/pics/people/norman/5.png b/graphics/event_objects/pics/people/norman/5.png new file mode 100644 index 000000000..ea68e0952 Binary files /dev/null and b/graphics/event_objects/pics/people/norman/5.png differ diff --git a/graphics/event_objects/pics/people/norman/6.png b/graphics/event_objects/pics/people/norman/6.png new file mode 100644 index 000000000..45f8e5119 Binary files /dev/null and b/graphics/event_objects/pics/people/norman/6.png differ diff --git a/graphics/event_objects/pics/people/norman/7.png b/graphics/event_objects/pics/people/norman/7.png new file mode 100644 index 000000000..27ff65ec0 Binary files /dev/null and b/graphics/event_objects/pics/people/norman/7.png differ diff --git a/graphics/event_objects/pics/people/norman/8.png b/graphics/event_objects/pics/people/norman/8.png new file mode 100644 index 000000000..aa18f3d73 Binary files /dev/null and b/graphics/event_objects/pics/people/norman/8.png differ diff --git a/graphics/event_objects/pics/people/nurse/0.png b/graphics/event_objects/pics/people/nurse/0.png new file mode 100644 index 000000000..3c6b14717 Binary files /dev/null and b/graphics/event_objects/pics/people/nurse/0.png differ diff --git a/graphics/event_objects/pics/people/nurse/1.png b/graphics/event_objects/pics/people/nurse/1.png new file mode 100644 index 000000000..a20bfc521 Binary files /dev/null and b/graphics/event_objects/pics/people/nurse/1.png differ diff --git a/graphics/event_objects/pics/people/nurse/2.png b/graphics/event_objects/pics/people/nurse/2.png new file mode 100644 index 000000000..ec048a040 Binary files /dev/null and b/graphics/event_objects/pics/people/nurse/2.png differ diff --git a/graphics/event_objects/pics/people/nurse/3.png b/graphics/event_objects/pics/people/nurse/3.png new file mode 100644 index 000000000..ae306ff49 Binary files /dev/null and b/graphics/event_objects/pics/people/nurse/3.png differ diff --git a/graphics/event_objects/pics/people/old_man_1/0.png b/graphics/event_objects/pics/people/old_man_1/0.png new file mode 100644 index 000000000..f593b13e0 Binary files /dev/null and b/graphics/event_objects/pics/people/old_man_1/0.png differ diff --git a/graphics/event_objects/pics/people/old_man_1/1.png b/graphics/event_objects/pics/people/old_man_1/1.png new file mode 100644 index 000000000..2479299b1 Binary files /dev/null and b/graphics/event_objects/pics/people/old_man_1/1.png differ diff --git a/graphics/event_objects/pics/people/old_man_1/2.png b/graphics/event_objects/pics/people/old_man_1/2.png new file mode 100644 index 000000000..e24126007 Binary files /dev/null and b/graphics/event_objects/pics/people/old_man_1/2.png differ diff --git a/graphics/event_objects/pics/people/old_man_1/3.png b/graphics/event_objects/pics/people/old_man_1/3.png new file mode 100644 index 000000000..058b699b3 Binary files /dev/null and b/graphics/event_objects/pics/people/old_man_1/3.png differ diff --git a/graphics/event_objects/pics/people/old_man_1/4.png b/graphics/event_objects/pics/people/old_man_1/4.png new file mode 100644 index 000000000..3f68a34c1 Binary files /dev/null and b/graphics/event_objects/pics/people/old_man_1/4.png differ diff --git a/graphics/event_objects/pics/people/old_man_1/5.png b/graphics/event_objects/pics/people/old_man_1/5.png new file mode 100644 index 000000000..f0eb2a0ad Binary files /dev/null and b/graphics/event_objects/pics/people/old_man_1/5.png differ diff --git a/graphics/event_objects/pics/people/old_man_1/6.png b/graphics/event_objects/pics/people/old_man_1/6.png new file mode 100644 index 000000000..3e4570a9c Binary files /dev/null and b/graphics/event_objects/pics/people/old_man_1/6.png differ diff --git a/graphics/event_objects/pics/people/old_man_1/7.png b/graphics/event_objects/pics/people/old_man_1/7.png new file mode 100644 index 000000000..2066c1170 Binary files /dev/null and b/graphics/event_objects/pics/people/old_man_1/7.png differ diff --git a/graphics/event_objects/pics/people/old_man_1/8.png b/graphics/event_objects/pics/people/old_man_1/8.png new file mode 100644 index 000000000..10af5d1e7 Binary files /dev/null and b/graphics/event_objects/pics/people/old_man_1/8.png differ diff --git a/graphics/event_objects/pics/people/old_man_2/0.png b/graphics/event_objects/pics/people/old_man_2/0.png new file mode 100644 index 000000000..0f3537c26 Binary files /dev/null and b/graphics/event_objects/pics/people/old_man_2/0.png differ diff --git a/graphics/event_objects/pics/people/old_man_2/1.png b/graphics/event_objects/pics/people/old_man_2/1.png new file mode 100644 index 000000000..d47c1bd70 Binary files /dev/null and b/graphics/event_objects/pics/people/old_man_2/1.png differ diff --git a/graphics/event_objects/pics/people/old_man_2/2.png b/graphics/event_objects/pics/people/old_man_2/2.png new file mode 100644 index 000000000..43fdd9849 Binary files /dev/null and b/graphics/event_objects/pics/people/old_man_2/2.png differ diff --git a/graphics/event_objects/pics/people/old_woman_1/0.png b/graphics/event_objects/pics/people/old_woman_1/0.png new file mode 100644 index 000000000..86eb3b887 Binary files /dev/null and b/graphics/event_objects/pics/people/old_woman_1/0.png differ diff --git a/graphics/event_objects/pics/people/old_woman_1/1.png b/graphics/event_objects/pics/people/old_woman_1/1.png new file mode 100644 index 000000000..fcab35b2e Binary files /dev/null and b/graphics/event_objects/pics/people/old_woman_1/1.png differ diff --git a/graphics/event_objects/pics/people/old_woman_1/2.png b/graphics/event_objects/pics/people/old_woman_1/2.png new file mode 100644 index 000000000..cdee1f84a Binary files /dev/null and b/graphics/event_objects/pics/people/old_woman_1/2.png differ diff --git a/graphics/event_objects/pics/people/old_woman_1/3.png b/graphics/event_objects/pics/people/old_woman_1/3.png new file mode 100644 index 000000000..40fc7f909 Binary files /dev/null and b/graphics/event_objects/pics/people/old_woman_1/3.png differ diff --git a/graphics/event_objects/pics/people/old_woman_1/4.png b/graphics/event_objects/pics/people/old_woman_1/4.png new file mode 100644 index 000000000..6b0df84d6 Binary files /dev/null and b/graphics/event_objects/pics/people/old_woman_1/4.png differ diff --git a/graphics/event_objects/pics/people/old_woman_1/5.png b/graphics/event_objects/pics/people/old_woman_1/5.png new file mode 100644 index 000000000..6490ca64a Binary files /dev/null and b/graphics/event_objects/pics/people/old_woman_1/5.png differ diff --git a/graphics/event_objects/pics/people/old_woman_1/6.png b/graphics/event_objects/pics/people/old_woman_1/6.png new file mode 100644 index 000000000..d3cc6dd56 Binary files /dev/null and b/graphics/event_objects/pics/people/old_woman_1/6.png differ diff --git a/graphics/event_objects/pics/people/old_woman_1/7.png b/graphics/event_objects/pics/people/old_woman_1/7.png new file mode 100644 index 000000000..fd63c293c Binary files /dev/null and b/graphics/event_objects/pics/people/old_woman_1/7.png differ diff --git a/graphics/event_objects/pics/people/old_woman_1/8.png b/graphics/event_objects/pics/people/old_woman_1/8.png new file mode 100644 index 000000000..955bcf3db Binary files /dev/null and b/graphics/event_objects/pics/people/old_woman_1/8.png differ diff --git a/graphics/event_objects/pics/people/old_woman_2/0.png b/graphics/event_objects/pics/people/old_woman_2/0.png new file mode 100644 index 000000000..2bccb0fb1 Binary files /dev/null and b/graphics/event_objects/pics/people/old_woman_2/0.png differ diff --git a/graphics/event_objects/pics/people/old_woman_2/1.png b/graphics/event_objects/pics/people/old_woman_2/1.png new file mode 100644 index 000000000..159e277d9 Binary files /dev/null and b/graphics/event_objects/pics/people/old_woman_2/1.png differ diff --git a/graphics/event_objects/pics/people/old_woman_2/2.png b/graphics/event_objects/pics/people/old_woman_2/2.png new file mode 100644 index 000000000..6c2cb0fbe Binary files /dev/null and b/graphics/event_objects/pics/people/old_woman_2/2.png differ diff --git a/graphics/event_objects/pics/people/old_woman_2/3.png b/graphics/event_objects/pics/people/old_woman_2/3.png new file mode 100644 index 000000000..956af24a1 Binary files /dev/null and b/graphics/event_objects/pics/people/old_woman_2/3.png differ diff --git a/graphics/event_objects/pics/people/old_woman_2/4.png b/graphics/event_objects/pics/people/old_woman_2/4.png new file mode 100644 index 000000000..f3acfbc55 Binary files /dev/null and b/graphics/event_objects/pics/people/old_woman_2/4.png differ diff --git a/graphics/event_objects/pics/people/old_woman_2/5.png b/graphics/event_objects/pics/people/old_woman_2/5.png new file mode 100644 index 000000000..b07ff25e5 Binary files /dev/null and b/graphics/event_objects/pics/people/old_woman_2/5.png differ diff --git a/graphics/event_objects/pics/people/old_woman_2/6.png b/graphics/event_objects/pics/people/old_woman_2/6.png new file mode 100644 index 000000000..7fe9b97e1 Binary files /dev/null and b/graphics/event_objects/pics/people/old_woman_2/6.png differ diff --git a/graphics/event_objects/pics/people/old_woman_2/7.png b/graphics/event_objects/pics/people/old_woman_2/7.png new file mode 100644 index 000000000..681aab7cc Binary files /dev/null and b/graphics/event_objects/pics/people/old_woman_2/7.png differ diff --git a/graphics/event_objects/pics/people/old_woman_2/8.png b/graphics/event_objects/pics/people/old_woman_2/8.png new file mode 100644 index 000000000..87d5c464d Binary files /dev/null and b/graphics/event_objects/pics/people/old_woman_2/8.png differ diff --git a/graphics/event_objects/pics/people/phoebe/0.png b/graphics/event_objects/pics/people/phoebe/0.png new file mode 100644 index 000000000..06188b539 Binary files /dev/null and b/graphics/event_objects/pics/people/phoebe/0.png differ diff --git a/graphics/event_objects/pics/people/phoebe/1.png b/graphics/event_objects/pics/people/phoebe/1.png new file mode 100644 index 000000000..505190902 Binary files /dev/null and b/graphics/event_objects/pics/people/phoebe/1.png differ diff --git a/graphics/event_objects/pics/people/phoebe/2.png b/graphics/event_objects/pics/people/phoebe/2.png new file mode 100644 index 000000000..a5f66cdbf Binary files /dev/null and b/graphics/event_objects/pics/people/phoebe/2.png differ diff --git a/graphics/event_objects/pics/people/picnicker/0.png b/graphics/event_objects/pics/people/picnicker/0.png new file mode 100644 index 000000000..310170def Binary files /dev/null and b/graphics/event_objects/pics/people/picnicker/0.png differ diff --git a/graphics/event_objects/pics/people/picnicker/1.png b/graphics/event_objects/pics/people/picnicker/1.png new file mode 100644 index 000000000..9caeb6de2 Binary files /dev/null and b/graphics/event_objects/pics/people/picnicker/1.png differ diff --git a/graphics/event_objects/pics/people/picnicker/2.png b/graphics/event_objects/pics/people/picnicker/2.png new file mode 100644 index 000000000..17ca91044 Binary files /dev/null and b/graphics/event_objects/pics/people/picnicker/2.png differ diff --git a/graphics/event_objects/pics/people/picnicker/3.png b/graphics/event_objects/pics/people/picnicker/3.png new file mode 100644 index 000000000..e80ca4b4e Binary files /dev/null and b/graphics/event_objects/pics/people/picnicker/3.png differ diff --git a/graphics/event_objects/pics/people/picnicker/4.png b/graphics/event_objects/pics/people/picnicker/4.png new file mode 100644 index 000000000..1c2ad0709 Binary files /dev/null and b/graphics/event_objects/pics/people/picnicker/4.png differ diff --git a/graphics/event_objects/pics/people/picnicker/5.png b/graphics/event_objects/pics/people/picnicker/5.png new file mode 100644 index 000000000..a5dce80dd Binary files /dev/null and b/graphics/event_objects/pics/people/picnicker/5.png differ diff --git a/graphics/event_objects/pics/people/picnicker/6.png b/graphics/event_objects/pics/people/picnicker/6.png new file mode 100644 index 000000000..1895ff667 Binary files /dev/null and b/graphics/event_objects/pics/people/picnicker/6.png differ diff --git a/graphics/event_objects/pics/people/picnicker/7.png b/graphics/event_objects/pics/people/picnicker/7.png new file mode 100644 index 000000000..62d0c2f68 Binary files /dev/null and b/graphics/event_objects/pics/people/picnicker/7.png differ diff --git a/graphics/event_objects/pics/people/picnicker/8.png b/graphics/event_objects/pics/people/picnicker/8.png new file mode 100644 index 000000000..076c2c32b Binary files /dev/null and b/graphics/event_objects/pics/people/picnicker/8.png differ diff --git a/graphics/event_objects/pics/people/prof_birch/0.png b/graphics/event_objects/pics/people/prof_birch/0.png new file mode 100644 index 000000000..2dbe3bef5 Binary files /dev/null and b/graphics/event_objects/pics/people/prof_birch/0.png differ diff --git a/graphics/event_objects/pics/people/prof_birch/1.png b/graphics/event_objects/pics/people/prof_birch/1.png new file mode 100644 index 000000000..b27c2174a Binary files /dev/null and b/graphics/event_objects/pics/people/prof_birch/1.png differ diff --git a/graphics/event_objects/pics/people/prof_birch/2.png b/graphics/event_objects/pics/people/prof_birch/2.png new file mode 100644 index 000000000..195a3da01 Binary files /dev/null and b/graphics/event_objects/pics/people/prof_birch/2.png differ diff --git a/graphics/event_objects/pics/people/prof_birch/3.png b/graphics/event_objects/pics/people/prof_birch/3.png new file mode 100644 index 000000000..5f9d2750e Binary files /dev/null and b/graphics/event_objects/pics/people/prof_birch/3.png differ diff --git a/graphics/event_objects/pics/people/prof_birch/4.png b/graphics/event_objects/pics/people/prof_birch/4.png new file mode 100644 index 000000000..a44244f15 Binary files /dev/null and b/graphics/event_objects/pics/people/prof_birch/4.png differ diff --git a/graphics/event_objects/pics/people/prof_birch/5.png b/graphics/event_objects/pics/people/prof_birch/5.png new file mode 100644 index 000000000..3c6c16ff1 Binary files /dev/null and b/graphics/event_objects/pics/people/prof_birch/5.png differ diff --git a/graphics/event_objects/pics/people/prof_birch/6.png b/graphics/event_objects/pics/people/prof_birch/6.png new file mode 100644 index 000000000..802b89fd6 Binary files /dev/null and b/graphics/event_objects/pics/people/prof_birch/6.png differ diff --git a/graphics/event_objects/pics/people/prof_birch/7.png b/graphics/event_objects/pics/people/prof_birch/7.png new file mode 100644 index 000000000..59af318a2 Binary files /dev/null and b/graphics/event_objects/pics/people/prof_birch/7.png differ diff --git a/graphics/event_objects/pics/people/prof_birch/8.png b/graphics/event_objects/pics/people/prof_birch/8.png new file mode 100644 index 000000000..0a936308a Binary files /dev/null and b/graphics/event_objects/pics/people/prof_birch/8.png differ diff --git a/graphics/event_objects/pics/people/psychic_m/0.png b/graphics/event_objects/pics/people/psychic_m/0.png new file mode 100644 index 000000000..099e65aa1 Binary files /dev/null and b/graphics/event_objects/pics/people/psychic_m/0.png differ diff --git a/graphics/event_objects/pics/people/psychic_m/1.png b/graphics/event_objects/pics/people/psychic_m/1.png new file mode 100644 index 000000000..6203b8f3a Binary files /dev/null and b/graphics/event_objects/pics/people/psychic_m/1.png differ diff --git a/graphics/event_objects/pics/people/psychic_m/2.png b/graphics/event_objects/pics/people/psychic_m/2.png new file mode 100644 index 000000000..00f19c8c3 Binary files /dev/null and b/graphics/event_objects/pics/people/psychic_m/2.png differ diff --git a/graphics/event_objects/pics/people/psychic_m/3.png b/graphics/event_objects/pics/people/psychic_m/3.png new file mode 100644 index 000000000..ec8733d45 Binary files /dev/null and b/graphics/event_objects/pics/people/psychic_m/3.png differ diff --git a/graphics/event_objects/pics/people/psychic_m/4.png b/graphics/event_objects/pics/people/psychic_m/4.png new file mode 100644 index 000000000..7a2f06947 Binary files /dev/null and b/graphics/event_objects/pics/people/psychic_m/4.png differ diff --git a/graphics/event_objects/pics/people/psychic_m/5.png b/graphics/event_objects/pics/people/psychic_m/5.png new file mode 100644 index 000000000..64133327d Binary files /dev/null and b/graphics/event_objects/pics/people/psychic_m/5.png differ diff --git a/graphics/event_objects/pics/people/psychic_m/6.png b/graphics/event_objects/pics/people/psychic_m/6.png new file mode 100644 index 000000000..7c55b4f4d Binary files /dev/null and b/graphics/event_objects/pics/people/psychic_m/6.png differ diff --git a/graphics/event_objects/pics/people/psychic_m/7.png b/graphics/event_objects/pics/people/psychic_m/7.png new file mode 100644 index 000000000..134953f5c Binary files /dev/null and b/graphics/event_objects/pics/people/psychic_m/7.png differ diff --git a/graphics/event_objects/pics/people/psychic_m/8.png b/graphics/event_objects/pics/people/psychic_m/8.png new file mode 100644 index 000000000..79ea167fe Binary files /dev/null and b/graphics/event_objects/pics/people/psychic_m/8.png differ diff --git a/graphics/event_objects/pics/people/quinty_plump/0.png b/graphics/event_objects/pics/people/quinty_plump/0.png new file mode 100644 index 000000000..7a29230f4 Binary files /dev/null and b/graphics/event_objects/pics/people/quinty_plump/0.png differ diff --git a/graphics/event_objects/pics/people/quinty_plump/1.png b/graphics/event_objects/pics/people/quinty_plump/1.png new file mode 100644 index 000000000..6fbd85a26 Binary files /dev/null and b/graphics/event_objects/pics/people/quinty_plump/1.png differ diff --git a/graphics/event_objects/pics/people/quinty_plump/2.png b/graphics/event_objects/pics/people/quinty_plump/2.png new file mode 100644 index 000000000..238f0a55c Binary files /dev/null and b/graphics/event_objects/pics/people/quinty_plump/2.png differ diff --git a/graphics/event_objects/pics/people/quinty_plump/3.png b/graphics/event_objects/pics/people/quinty_plump/3.png new file mode 100644 index 000000000..d1cb5d7e7 Binary files /dev/null and b/graphics/event_objects/pics/people/quinty_plump/3.png differ diff --git a/graphics/event_objects/pics/people/quinty_plump/4.png b/graphics/event_objects/pics/people/quinty_plump/4.png new file mode 100644 index 000000000..4afac2056 Binary files /dev/null and b/graphics/event_objects/pics/people/quinty_plump/4.png differ diff --git a/graphics/event_objects/pics/people/quinty_plump/5.png b/graphics/event_objects/pics/people/quinty_plump/5.png new file mode 100644 index 000000000..9f9404aef Binary files /dev/null and b/graphics/event_objects/pics/people/quinty_plump/5.png differ diff --git a/graphics/event_objects/pics/people/quinty_plump/6.png b/graphics/event_objects/pics/people/quinty_plump/6.png new file mode 100644 index 000000000..11316499c Binary files /dev/null and b/graphics/event_objects/pics/people/quinty_plump/6.png differ diff --git a/graphics/event_objects/pics/people/red/0.png b/graphics/event_objects/pics/people/red/0.png new file mode 100644 index 000000000..d6cf06ece Binary files /dev/null and b/graphics/event_objects/pics/people/red/0.png differ diff --git a/graphics/event_objects/pics/people/red/1.png b/graphics/event_objects/pics/people/red/1.png new file mode 100644 index 000000000..597001dfd Binary files /dev/null and b/graphics/event_objects/pics/people/red/1.png differ diff --git a/graphics/event_objects/pics/people/red/2.png b/graphics/event_objects/pics/people/red/2.png new file mode 100644 index 000000000..854948cee Binary files /dev/null and b/graphics/event_objects/pics/people/red/2.png differ diff --git a/graphics/event_objects/pics/people/red/3.png b/graphics/event_objects/pics/people/red/3.png new file mode 100644 index 000000000..6a533d4e4 Binary files /dev/null and b/graphics/event_objects/pics/people/red/3.png differ diff --git a/graphics/event_objects/pics/people/red/4.png b/graphics/event_objects/pics/people/red/4.png new file mode 100644 index 000000000..aaedd9411 Binary files /dev/null and b/graphics/event_objects/pics/people/red/4.png differ diff --git a/graphics/event_objects/pics/people/red/5.png b/graphics/event_objects/pics/people/red/5.png new file mode 100644 index 000000000..adc033530 Binary files /dev/null and b/graphics/event_objects/pics/people/red/5.png differ diff --git a/graphics/event_objects/pics/people/red/6.png b/graphics/event_objects/pics/people/red/6.png new file mode 100644 index 000000000..5a5ac80e0 Binary files /dev/null and b/graphics/event_objects/pics/people/red/6.png differ diff --git a/graphics/event_objects/pics/people/red/7.png b/graphics/event_objects/pics/people/red/7.png new file mode 100644 index 000000000..22bea3f24 Binary files /dev/null and b/graphics/event_objects/pics/people/red/7.png differ diff --git a/graphics/event_objects/pics/people/red/8.png b/graphics/event_objects/pics/people/red/8.png new file mode 100644 index 000000000..d0d544d16 Binary files /dev/null and b/graphics/event_objects/pics/people/red/8.png differ diff --git a/graphics/event_objects/pics/people/reporter_f/0.png b/graphics/event_objects/pics/people/reporter_f/0.png new file mode 100644 index 000000000..d22968ddd Binary files /dev/null and b/graphics/event_objects/pics/people/reporter_f/0.png differ diff --git a/graphics/event_objects/pics/people/reporter_f/1.png b/graphics/event_objects/pics/people/reporter_f/1.png new file mode 100644 index 000000000..fb29ac66f Binary files /dev/null and b/graphics/event_objects/pics/people/reporter_f/1.png differ diff --git a/graphics/event_objects/pics/people/reporter_f/2.png b/graphics/event_objects/pics/people/reporter_f/2.png new file mode 100644 index 000000000..4ac633368 Binary files /dev/null and b/graphics/event_objects/pics/people/reporter_f/2.png differ diff --git a/graphics/event_objects/pics/people/reporter_f/3.png b/graphics/event_objects/pics/people/reporter_f/3.png new file mode 100644 index 000000000..3fc93ee7f Binary files /dev/null and b/graphics/event_objects/pics/people/reporter_f/3.png differ diff --git a/graphics/event_objects/pics/people/reporter_f/4.png b/graphics/event_objects/pics/people/reporter_f/4.png new file mode 100644 index 000000000..fa20a54c8 Binary files /dev/null and b/graphics/event_objects/pics/people/reporter_f/4.png differ diff --git a/graphics/event_objects/pics/people/reporter_f/5.png b/graphics/event_objects/pics/people/reporter_f/5.png new file mode 100644 index 000000000..015575483 Binary files /dev/null and b/graphics/event_objects/pics/people/reporter_f/5.png differ diff --git a/graphics/event_objects/pics/people/reporter_f/6.png b/graphics/event_objects/pics/people/reporter_f/6.png new file mode 100644 index 000000000..e2c9d3d11 Binary files /dev/null and b/graphics/event_objects/pics/people/reporter_f/6.png differ diff --git a/graphics/event_objects/pics/people/reporter_f/7.png b/graphics/event_objects/pics/people/reporter_f/7.png new file mode 100644 index 000000000..1b986e616 Binary files /dev/null and b/graphics/event_objects/pics/people/reporter_f/7.png differ diff --git a/graphics/event_objects/pics/people/reporter_f/8.png b/graphics/event_objects/pics/people/reporter_f/8.png new file mode 100644 index 000000000..d1dfc31a6 Binary files /dev/null and b/graphics/event_objects/pics/people/reporter_f/8.png differ diff --git a/graphics/event_objects/pics/people/reporter_m/0.png b/graphics/event_objects/pics/people/reporter_m/0.png new file mode 100644 index 000000000..b052abfee Binary files /dev/null and b/graphics/event_objects/pics/people/reporter_m/0.png differ diff --git a/graphics/event_objects/pics/people/reporter_m/1.png b/graphics/event_objects/pics/people/reporter_m/1.png new file mode 100644 index 000000000..0a273f5aa Binary files /dev/null and b/graphics/event_objects/pics/people/reporter_m/1.png differ diff --git a/graphics/event_objects/pics/people/reporter_m/2.png b/graphics/event_objects/pics/people/reporter_m/2.png new file mode 100644 index 000000000..a47cef17b Binary files /dev/null and b/graphics/event_objects/pics/people/reporter_m/2.png differ diff --git a/graphics/event_objects/pics/people/reporter_m/3.png b/graphics/event_objects/pics/people/reporter_m/3.png new file mode 100644 index 000000000..780f128b3 Binary files /dev/null and b/graphics/event_objects/pics/people/reporter_m/3.png differ diff --git a/graphics/event_objects/pics/people/reporter_m/4.png b/graphics/event_objects/pics/people/reporter_m/4.png new file mode 100644 index 000000000..cb57002ab Binary files /dev/null and b/graphics/event_objects/pics/people/reporter_m/4.png differ diff --git a/graphics/event_objects/pics/people/reporter_m/5.png b/graphics/event_objects/pics/people/reporter_m/5.png new file mode 100644 index 000000000..6f488296c Binary files /dev/null and b/graphics/event_objects/pics/people/reporter_m/5.png differ diff --git a/graphics/event_objects/pics/people/reporter_m/6.png b/graphics/event_objects/pics/people/reporter_m/6.png new file mode 100644 index 000000000..4aad5d2c6 Binary files /dev/null and b/graphics/event_objects/pics/people/reporter_m/6.png differ diff --git a/graphics/event_objects/pics/people/reporter_m/7.png b/graphics/event_objects/pics/people/reporter_m/7.png new file mode 100644 index 000000000..7ac1d360d Binary files /dev/null and b/graphics/event_objects/pics/people/reporter_m/7.png differ diff --git a/graphics/event_objects/pics/people/reporter_m/8.png b/graphics/event_objects/pics/people/reporter_m/8.png new file mode 100644 index 000000000..25b07efb4 Binary files /dev/null and b/graphics/event_objects/pics/people/reporter_m/8.png differ diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman/0.png b/graphics/event_objects/pics/people/rooftop_sale_woman/0.png new file mode 100644 index 000000000..f73f91631 Binary files /dev/null and b/graphics/event_objects/pics/people/rooftop_sale_woman/0.png differ diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman/1.png b/graphics/event_objects/pics/people/rooftop_sale_woman/1.png new file mode 100644 index 000000000..855079988 Binary files /dev/null and b/graphics/event_objects/pics/people/rooftop_sale_woman/1.png differ diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman/2.png b/graphics/event_objects/pics/people/rooftop_sale_woman/2.png new file mode 100644 index 000000000..643eb4eb2 Binary files /dev/null and b/graphics/event_objects/pics/people/rooftop_sale_woman/2.png differ diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman/3.png b/graphics/event_objects/pics/people/rooftop_sale_woman/3.png new file mode 100644 index 000000000..dbea9b53c Binary files /dev/null and b/graphics/event_objects/pics/people/rooftop_sale_woman/3.png differ diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman/4.png b/graphics/event_objects/pics/people/rooftop_sale_woman/4.png new file mode 100644 index 000000000..d6bbc98b8 Binary files /dev/null and b/graphics/event_objects/pics/people/rooftop_sale_woman/4.png differ diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman/5.png b/graphics/event_objects/pics/people/rooftop_sale_woman/5.png new file mode 100644 index 000000000..bd99cf10f Binary files /dev/null and b/graphics/event_objects/pics/people/rooftop_sale_woman/5.png differ diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman/6.png b/graphics/event_objects/pics/people/rooftop_sale_woman/6.png new file mode 100644 index 000000000..c5c447997 Binary files /dev/null and b/graphics/event_objects/pics/people/rooftop_sale_woman/6.png differ diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman/7.png b/graphics/event_objects/pics/people/rooftop_sale_woman/7.png new file mode 100644 index 000000000..64b7691c4 Binary files /dev/null and b/graphics/event_objects/pics/people/rooftop_sale_woman/7.png differ diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman/8.png b/graphics/event_objects/pics/people/rooftop_sale_woman/8.png new file mode 100644 index 000000000..b588d2b26 Binary files /dev/null and b/graphics/event_objects/pics/people/rooftop_sale_woman/8.png differ diff --git a/graphics/event_objects/pics/people/roxanne/0.png b/graphics/event_objects/pics/people/roxanne/0.png new file mode 100644 index 000000000..0a73a0723 Binary files /dev/null and b/graphics/event_objects/pics/people/roxanne/0.png differ diff --git a/graphics/event_objects/pics/people/roxanne/1.png b/graphics/event_objects/pics/people/roxanne/1.png new file mode 100644 index 000000000..133f097bf Binary files /dev/null and b/graphics/event_objects/pics/people/roxanne/1.png differ diff --git a/graphics/event_objects/pics/people/roxanne/2.png b/graphics/event_objects/pics/people/roxanne/2.png new file mode 100644 index 000000000..946765eb2 Binary files /dev/null and b/graphics/event_objects/pics/people/roxanne/2.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/00.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/00.png new file mode 100644 index 000000000..780360c4f Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_brendan/00.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/01.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/01.png new file mode 100644 index 000000000..f83064047 Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_brendan/01.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/02.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/02.png new file mode 100644 index 000000000..ffb8ad34b Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_brendan/02.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/03.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/03.png new file mode 100644 index 000000000..d0721bbb4 Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_brendan/03.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/04.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/04.png new file mode 100644 index 000000000..07817e55f Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_brendan/04.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/05.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/05.png new file mode 100644 index 000000000..afc322129 Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_brendan/05.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/06.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/06.png new file mode 100644 index 000000000..84a8cceb1 Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_brendan/06.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/07.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/07.png new file mode 100644 index 000000000..ca518d8a0 Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_brendan/07.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/08.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/08.png new file mode 100644 index 000000000..3430ff243 Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_brendan/08.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/09.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/09.png new file mode 100644 index 000000000..392f019e7 Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_brendan/09.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/10.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/10.png new file mode 100644 index 000000000..722f2d04d Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_brendan/10.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/11.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/11.png new file mode 100644 index 000000000..eff0cbc5f Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_brendan/11.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/12.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/12.png new file mode 100644 index 000000000..0a5037d43 Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_brendan/12.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/13.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/13.png new file mode 100644 index 000000000..8dc245c0e Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_brendan/13.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/14.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/14.png new file mode 100644 index 000000000..53844c0c1 Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_brendan/14.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/15.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/15.png new file mode 100644 index 000000000..34d73e7f6 Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_brendan/15.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/16.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/16.png new file mode 100644 index 000000000..b324f5538 Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_brendan/16.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/17.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/17.png new file mode 100644 index 000000000..9a736dc02 Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_brendan/17.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_little_boy/0.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/0.png new file mode 100644 index 000000000..fb4365f0e Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/0.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_little_boy/1.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/1.png new file mode 100644 index 000000000..f681154dd Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/1.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_little_boy/2.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/2.png new file mode 100644 index 000000000..20f838bb2 Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/2.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_little_boy/3.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/3.png new file mode 100644 index 000000000..4a83b0c97 Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/3.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_little_boy/4.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/4.png new file mode 100644 index 000000000..b6573d454 Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/4.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_little_boy/5.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/5.png new file mode 100644 index 000000000..a1a9b08cf Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/5.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_little_boy/6.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/6.png new file mode 100644 index 000000000..8f34c74e4 Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/6.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_little_boy/7.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/7.png new file mode 100644 index 000000000..7d8d2c23c Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/7.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_little_boy/8.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/8.png new file mode 100644 index 000000000..4799db90c Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/8.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/00.png b/graphics/event_objects/pics/people/ruby_sapphire_may/00.png new file mode 100644 index 000000000..2ccd3399a Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_may/00.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/01.png b/graphics/event_objects/pics/people/ruby_sapphire_may/01.png new file mode 100644 index 000000000..94aad9ac7 Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_may/01.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/02.png b/graphics/event_objects/pics/people/ruby_sapphire_may/02.png new file mode 100644 index 000000000..e61943fbb Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_may/02.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/03.png b/graphics/event_objects/pics/people/ruby_sapphire_may/03.png new file mode 100644 index 000000000..b8d1255d5 Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_may/03.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/04.png b/graphics/event_objects/pics/people/ruby_sapphire_may/04.png new file mode 100644 index 000000000..7d3cac765 Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_may/04.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/05.png b/graphics/event_objects/pics/people/ruby_sapphire_may/05.png new file mode 100644 index 000000000..d5a4ab94e Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_may/05.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/06.png b/graphics/event_objects/pics/people/ruby_sapphire_may/06.png new file mode 100644 index 000000000..d22684057 Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_may/06.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/07.png b/graphics/event_objects/pics/people/ruby_sapphire_may/07.png new file mode 100644 index 000000000..d0f0c3716 Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_may/07.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/08.png b/graphics/event_objects/pics/people/ruby_sapphire_may/08.png new file mode 100644 index 000000000..dbb26c4e7 Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_may/08.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/09.png b/graphics/event_objects/pics/people/ruby_sapphire_may/09.png new file mode 100644 index 000000000..714316485 Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_may/09.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/10.png b/graphics/event_objects/pics/people/ruby_sapphire_may/10.png new file mode 100644 index 000000000..07897594f Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_may/10.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/11.png b/graphics/event_objects/pics/people/ruby_sapphire_may/11.png new file mode 100644 index 000000000..e4583aa91 Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_may/11.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/12.png b/graphics/event_objects/pics/people/ruby_sapphire_may/12.png new file mode 100644 index 000000000..34405b837 Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_may/12.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/13.png b/graphics/event_objects/pics/people/ruby_sapphire_may/13.png new file mode 100644 index 000000000..3b0ec86b3 Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_may/13.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/14.png b/graphics/event_objects/pics/people/ruby_sapphire_may/14.png new file mode 100644 index 000000000..18ee35cb9 Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_may/14.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/15.png b/graphics/event_objects/pics/people/ruby_sapphire_may/15.png new file mode 100644 index 000000000..ea5e0fd5f Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_may/15.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/16.png b/graphics/event_objects/pics/people/ruby_sapphire_may/16.png new file mode 100644 index 000000000..c7e9dd58b Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_may/16.png differ diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/17.png b/graphics/event_objects/pics/people/ruby_sapphire_may/17.png new file mode 100644 index 000000000..e79de8152 Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_may/17.png differ diff --git a/graphics/event_objects/pics/people/running_triathlete_f/0.png b/graphics/event_objects/pics/people/running_triathlete_f/0.png new file mode 100644 index 000000000..195edef7b Binary files /dev/null and b/graphics/event_objects/pics/people/running_triathlete_f/0.png differ diff --git a/graphics/event_objects/pics/people/running_triathlete_f/1.png b/graphics/event_objects/pics/people/running_triathlete_f/1.png new file mode 100644 index 000000000..1a7069621 Binary files /dev/null and b/graphics/event_objects/pics/people/running_triathlete_f/1.png differ diff --git a/graphics/event_objects/pics/people/running_triathlete_f/2.png b/graphics/event_objects/pics/people/running_triathlete_f/2.png new file mode 100644 index 000000000..aab9ca24b Binary files /dev/null and b/graphics/event_objects/pics/people/running_triathlete_f/2.png differ diff --git a/graphics/event_objects/pics/people/running_triathlete_f/3.png b/graphics/event_objects/pics/people/running_triathlete_f/3.png new file mode 100644 index 000000000..909fc0f60 Binary files /dev/null and b/graphics/event_objects/pics/people/running_triathlete_f/3.png differ diff --git a/graphics/event_objects/pics/people/running_triathlete_f/4.png b/graphics/event_objects/pics/people/running_triathlete_f/4.png new file mode 100644 index 000000000..301d13d09 Binary files /dev/null and b/graphics/event_objects/pics/people/running_triathlete_f/4.png differ diff --git a/graphics/event_objects/pics/people/running_triathlete_f/5.png b/graphics/event_objects/pics/people/running_triathlete_f/5.png new file mode 100644 index 000000000..84914d619 Binary files /dev/null and b/graphics/event_objects/pics/people/running_triathlete_f/5.png differ diff --git a/graphics/event_objects/pics/people/running_triathlete_f/6.png b/graphics/event_objects/pics/people/running_triathlete_f/6.png new file mode 100644 index 000000000..9ee690631 Binary files /dev/null and b/graphics/event_objects/pics/people/running_triathlete_f/6.png differ diff --git a/graphics/event_objects/pics/people/running_triathlete_f/7.png b/graphics/event_objects/pics/people/running_triathlete_f/7.png new file mode 100644 index 000000000..2441def63 Binary files /dev/null and b/graphics/event_objects/pics/people/running_triathlete_f/7.png differ diff --git a/graphics/event_objects/pics/people/running_triathlete_f/8.png b/graphics/event_objects/pics/people/running_triathlete_f/8.png new file mode 100644 index 000000000..a96d1e221 Binary files /dev/null and b/graphics/event_objects/pics/people/running_triathlete_f/8.png differ diff --git a/graphics/event_objects/pics/people/running_triathlete_m/0.png b/graphics/event_objects/pics/people/running_triathlete_m/0.png new file mode 100644 index 000000000..0d02be87e Binary files /dev/null and b/graphics/event_objects/pics/people/running_triathlete_m/0.png differ diff --git a/graphics/event_objects/pics/people/running_triathlete_m/1.png b/graphics/event_objects/pics/people/running_triathlete_m/1.png new file mode 100644 index 000000000..21e2fdf11 Binary files /dev/null and b/graphics/event_objects/pics/people/running_triathlete_m/1.png differ diff --git a/graphics/event_objects/pics/people/running_triathlete_m/2.png b/graphics/event_objects/pics/people/running_triathlete_m/2.png new file mode 100644 index 000000000..d571938e3 Binary files /dev/null and b/graphics/event_objects/pics/people/running_triathlete_m/2.png differ diff --git a/graphics/event_objects/pics/people/running_triathlete_m/3.png b/graphics/event_objects/pics/people/running_triathlete_m/3.png new file mode 100644 index 000000000..f60cc6b5b Binary files /dev/null and b/graphics/event_objects/pics/people/running_triathlete_m/3.png differ diff --git a/graphics/event_objects/pics/people/running_triathlete_m/4.png b/graphics/event_objects/pics/people/running_triathlete_m/4.png new file mode 100644 index 000000000..6ec60997a Binary files /dev/null and b/graphics/event_objects/pics/people/running_triathlete_m/4.png differ diff --git a/graphics/event_objects/pics/people/running_triathlete_m/5.png b/graphics/event_objects/pics/people/running_triathlete_m/5.png new file mode 100644 index 000000000..4f5742f1a Binary files /dev/null and b/graphics/event_objects/pics/people/running_triathlete_m/5.png differ diff --git a/graphics/event_objects/pics/people/running_triathlete_m/6.png b/graphics/event_objects/pics/people/running_triathlete_m/6.png new file mode 100644 index 000000000..be048ac7e Binary files /dev/null and b/graphics/event_objects/pics/people/running_triathlete_m/6.png differ diff --git a/graphics/event_objects/pics/people/running_triathlete_m/7.png b/graphics/event_objects/pics/people/running_triathlete_m/7.png new file mode 100644 index 000000000..9a972be67 Binary files /dev/null and b/graphics/event_objects/pics/people/running_triathlete_m/7.png differ diff --git a/graphics/event_objects/pics/people/running_triathlete_m/8.png b/graphics/event_objects/pics/people/running_triathlete_m/8.png new file mode 100644 index 000000000..18ea0d178 Binary files /dev/null and b/graphics/event_objects/pics/people/running_triathlete_m/8.png differ diff --git a/graphics/event_objects/pics/people/sailor/0.png b/graphics/event_objects/pics/people/sailor/0.png new file mode 100644 index 000000000..8dc44669a Binary files /dev/null and b/graphics/event_objects/pics/people/sailor/0.png differ diff --git a/graphics/event_objects/pics/people/sailor/1.png b/graphics/event_objects/pics/people/sailor/1.png new file mode 100644 index 000000000..8cb9ba620 Binary files /dev/null and b/graphics/event_objects/pics/people/sailor/1.png differ diff --git a/graphics/event_objects/pics/people/sailor/2.png b/graphics/event_objects/pics/people/sailor/2.png new file mode 100644 index 000000000..34a832cbf Binary files /dev/null and b/graphics/event_objects/pics/people/sailor/2.png differ diff --git a/graphics/event_objects/pics/people/sailor/3.png b/graphics/event_objects/pics/people/sailor/3.png new file mode 100644 index 000000000..1ad0918a8 Binary files /dev/null and b/graphics/event_objects/pics/people/sailor/3.png differ diff --git a/graphics/event_objects/pics/people/sailor/4.png b/graphics/event_objects/pics/people/sailor/4.png new file mode 100644 index 000000000..623c42211 Binary files /dev/null and b/graphics/event_objects/pics/people/sailor/4.png differ diff --git a/graphics/event_objects/pics/people/sailor/5.png b/graphics/event_objects/pics/people/sailor/5.png new file mode 100644 index 000000000..01795d75f Binary files /dev/null and b/graphics/event_objects/pics/people/sailor/5.png differ diff --git a/graphics/event_objects/pics/people/sailor/6.png b/graphics/event_objects/pics/people/sailor/6.png new file mode 100644 index 000000000..a3babaa42 Binary files /dev/null and b/graphics/event_objects/pics/people/sailor/6.png differ diff --git a/graphics/event_objects/pics/people/sailor/7.png b/graphics/event_objects/pics/people/sailor/7.png new file mode 100644 index 000000000..08abf8a71 Binary files /dev/null and b/graphics/event_objects/pics/people/sailor/7.png differ diff --git a/graphics/event_objects/pics/people/sailor/8.png b/graphics/event_objects/pics/people/sailor/8.png new file mode 100644 index 000000000..f7d2ec655 Binary files /dev/null and b/graphics/event_objects/pics/people/sailor/8.png differ diff --git a/graphics/event_objects/pics/people/school_kid_m/0.png b/graphics/event_objects/pics/people/school_kid_m/0.png new file mode 100644 index 000000000..3f700ffaf Binary files /dev/null and b/graphics/event_objects/pics/people/school_kid_m/0.png differ diff --git a/graphics/event_objects/pics/people/school_kid_m/1.png b/graphics/event_objects/pics/people/school_kid_m/1.png new file mode 100644 index 000000000..c47d69d34 Binary files /dev/null and b/graphics/event_objects/pics/people/school_kid_m/1.png differ diff --git a/graphics/event_objects/pics/people/school_kid_m/2.png b/graphics/event_objects/pics/people/school_kid_m/2.png new file mode 100644 index 000000000..b4116862b Binary files /dev/null and b/graphics/event_objects/pics/people/school_kid_m/2.png differ diff --git a/graphics/event_objects/pics/people/school_kid_m/3.png b/graphics/event_objects/pics/people/school_kid_m/3.png new file mode 100644 index 000000000..078ce5bc4 Binary files /dev/null and b/graphics/event_objects/pics/people/school_kid_m/3.png differ diff --git a/graphics/event_objects/pics/people/school_kid_m/4.png b/graphics/event_objects/pics/people/school_kid_m/4.png new file mode 100644 index 000000000..330979128 Binary files /dev/null and b/graphics/event_objects/pics/people/school_kid_m/4.png differ diff --git a/graphics/event_objects/pics/people/school_kid_m/5.png b/graphics/event_objects/pics/people/school_kid_m/5.png new file mode 100644 index 000000000..44ab9e8aa Binary files /dev/null and b/graphics/event_objects/pics/people/school_kid_m/5.png differ diff --git a/graphics/event_objects/pics/people/school_kid_m/6.png b/graphics/event_objects/pics/people/school_kid_m/6.png new file mode 100644 index 000000000..ba20fc113 Binary files /dev/null and b/graphics/event_objects/pics/people/school_kid_m/6.png differ diff --git a/graphics/event_objects/pics/people/school_kid_m/7.png b/graphics/event_objects/pics/people/school_kid_m/7.png new file mode 100644 index 000000000..c4a5444e0 Binary files /dev/null and b/graphics/event_objects/pics/people/school_kid_m/7.png differ diff --git a/graphics/event_objects/pics/people/school_kid_m/8.png b/graphics/event_objects/pics/people/school_kid_m/8.png new file mode 100644 index 000000000..047b340fb Binary files /dev/null and b/graphics/event_objects/pics/people/school_kid_m/8.png differ diff --git a/graphics/event_objects/pics/people/scientist_1/0.png b/graphics/event_objects/pics/people/scientist_1/0.png new file mode 100644 index 000000000..ef85b5985 Binary files /dev/null and b/graphics/event_objects/pics/people/scientist_1/0.png differ diff --git a/graphics/event_objects/pics/people/scientist_1/1.png b/graphics/event_objects/pics/people/scientist_1/1.png new file mode 100644 index 000000000..2a2ade370 Binary files /dev/null and b/graphics/event_objects/pics/people/scientist_1/1.png differ diff --git a/graphics/event_objects/pics/people/scientist_1/2.png b/graphics/event_objects/pics/people/scientist_1/2.png new file mode 100644 index 000000000..6d3e31618 Binary files /dev/null and b/graphics/event_objects/pics/people/scientist_1/2.png differ diff --git a/graphics/event_objects/pics/people/scientist_1/3.png b/graphics/event_objects/pics/people/scientist_1/3.png new file mode 100644 index 000000000..433dd879d Binary files /dev/null and b/graphics/event_objects/pics/people/scientist_1/3.png differ diff --git a/graphics/event_objects/pics/people/scientist_1/4.png b/graphics/event_objects/pics/people/scientist_1/4.png new file mode 100644 index 000000000..3c0594e4f Binary files /dev/null and b/graphics/event_objects/pics/people/scientist_1/4.png differ diff --git a/graphics/event_objects/pics/people/scientist_1/5.png b/graphics/event_objects/pics/people/scientist_1/5.png new file mode 100644 index 000000000..12fdc5c84 Binary files /dev/null and b/graphics/event_objects/pics/people/scientist_1/5.png differ diff --git a/graphics/event_objects/pics/people/scientist_1/6.png b/graphics/event_objects/pics/people/scientist_1/6.png new file mode 100644 index 000000000..6ea4c5577 Binary files /dev/null and b/graphics/event_objects/pics/people/scientist_1/6.png differ diff --git a/graphics/event_objects/pics/people/scientist_1/7.png b/graphics/event_objects/pics/people/scientist_1/7.png new file mode 100644 index 000000000..7496fcc98 Binary files /dev/null and b/graphics/event_objects/pics/people/scientist_1/7.png differ diff --git a/graphics/event_objects/pics/people/scientist_1/8.png b/graphics/event_objects/pics/people/scientist_1/8.png new file mode 100644 index 000000000..7487b1b46 Binary files /dev/null and b/graphics/event_objects/pics/people/scientist_1/8.png differ diff --git a/graphics/event_objects/pics/people/scientist_2/0.png b/graphics/event_objects/pics/people/scientist_2/0.png new file mode 100644 index 000000000..0a2f65a81 Binary files /dev/null and b/graphics/event_objects/pics/people/scientist_2/0.png differ diff --git a/graphics/event_objects/pics/people/scientist_2/1.png b/graphics/event_objects/pics/people/scientist_2/1.png new file mode 100644 index 000000000..c7ef46ca1 Binary files /dev/null and b/graphics/event_objects/pics/people/scientist_2/1.png differ diff --git a/graphics/event_objects/pics/people/scientist_2/2.png b/graphics/event_objects/pics/people/scientist_2/2.png new file mode 100644 index 000000000..3e8d2f530 Binary files /dev/null and b/graphics/event_objects/pics/people/scientist_2/2.png differ diff --git a/graphics/event_objects/pics/people/scientist_2/3.png b/graphics/event_objects/pics/people/scientist_2/3.png new file mode 100644 index 000000000..9c3f70989 Binary files /dev/null and b/graphics/event_objects/pics/people/scientist_2/3.png differ diff --git a/graphics/event_objects/pics/people/scientist_2/4.png b/graphics/event_objects/pics/people/scientist_2/4.png new file mode 100644 index 000000000..28ac9b4cb Binary files /dev/null and b/graphics/event_objects/pics/people/scientist_2/4.png differ diff --git a/graphics/event_objects/pics/people/scientist_2/5.png b/graphics/event_objects/pics/people/scientist_2/5.png new file mode 100644 index 000000000..836241dc9 Binary files /dev/null and b/graphics/event_objects/pics/people/scientist_2/5.png differ diff --git a/graphics/event_objects/pics/people/scientist_2/6.png b/graphics/event_objects/pics/people/scientist_2/6.png new file mode 100644 index 000000000..894ba989e Binary files /dev/null and b/graphics/event_objects/pics/people/scientist_2/6.png differ diff --git a/graphics/event_objects/pics/people/scientist_2/7.png b/graphics/event_objects/pics/people/scientist_2/7.png new file mode 100644 index 000000000..b3176d10e Binary files /dev/null and b/graphics/event_objects/pics/people/scientist_2/7.png differ diff --git a/graphics/event_objects/pics/people/scientist_2/8.png b/graphics/event_objects/pics/people/scientist_2/8.png new file mode 100644 index 000000000..4666c2f9a Binary files /dev/null and b/graphics/event_objects/pics/people/scientist_2/8.png differ diff --git a/graphics/event_objects/pics/people/scott/0.png b/graphics/event_objects/pics/people/scott/0.png new file mode 100644 index 000000000..44a9f0dc2 Binary files /dev/null and b/graphics/event_objects/pics/people/scott/0.png differ diff --git a/graphics/event_objects/pics/people/scott/1.png b/graphics/event_objects/pics/people/scott/1.png new file mode 100644 index 000000000..63510a313 Binary files /dev/null and b/graphics/event_objects/pics/people/scott/1.png differ diff --git a/graphics/event_objects/pics/people/scott/2.png b/graphics/event_objects/pics/people/scott/2.png new file mode 100644 index 000000000..ef11e8e1f Binary files /dev/null and b/graphics/event_objects/pics/people/scott/2.png differ diff --git a/graphics/event_objects/pics/people/scott/3.png b/graphics/event_objects/pics/people/scott/3.png new file mode 100644 index 000000000..8e087335f Binary files /dev/null and b/graphics/event_objects/pics/people/scott/3.png differ diff --git a/graphics/event_objects/pics/people/scott/4.png b/graphics/event_objects/pics/people/scott/4.png new file mode 100644 index 000000000..1ab051fc0 Binary files /dev/null and b/graphics/event_objects/pics/people/scott/4.png differ diff --git a/graphics/event_objects/pics/people/scott/5.png b/graphics/event_objects/pics/people/scott/5.png new file mode 100644 index 000000000..167ada21d Binary files /dev/null and b/graphics/event_objects/pics/people/scott/5.png differ diff --git a/graphics/event_objects/pics/people/scott/6.png b/graphics/event_objects/pics/people/scott/6.png new file mode 100644 index 000000000..e3c489f99 Binary files /dev/null and b/graphics/event_objects/pics/people/scott/6.png differ diff --git a/graphics/event_objects/pics/people/scott/7.png b/graphics/event_objects/pics/people/scott/7.png new file mode 100644 index 000000000..3d2b77b1b Binary files /dev/null and b/graphics/event_objects/pics/people/scott/7.png differ diff --git a/graphics/event_objects/pics/people/scott/8.png b/graphics/event_objects/pics/people/scott/8.png new file mode 100644 index 000000000..5ac07720c Binary files /dev/null and b/graphics/event_objects/pics/people/scott/8.png differ diff --git a/graphics/event_objects/pics/people/sidney/0.png b/graphics/event_objects/pics/people/sidney/0.png new file mode 100644 index 000000000..abbbcd3fb Binary files /dev/null and b/graphics/event_objects/pics/people/sidney/0.png differ diff --git a/graphics/event_objects/pics/people/sidney/1.png b/graphics/event_objects/pics/people/sidney/1.png new file mode 100644 index 000000000..e13e8ef32 Binary files /dev/null and b/graphics/event_objects/pics/people/sidney/1.png differ diff --git a/graphics/event_objects/pics/people/sidney/2.png b/graphics/event_objects/pics/people/sidney/2.png new file mode 100644 index 000000000..8c6d51434 Binary files /dev/null and b/graphics/event_objects/pics/people/sidney/2.png differ diff --git a/graphics/event_objects/pics/people/spenser/0.png b/graphics/event_objects/pics/people/spenser/0.png new file mode 100644 index 000000000..526e77c75 Binary files /dev/null and b/graphics/event_objects/pics/people/spenser/0.png differ diff --git a/graphics/event_objects/pics/people/spenser/1.png b/graphics/event_objects/pics/people/spenser/1.png new file mode 100644 index 000000000..1009f4344 Binary files /dev/null and b/graphics/event_objects/pics/people/spenser/1.png differ diff --git a/graphics/event_objects/pics/people/spenser/2.png b/graphics/event_objects/pics/people/spenser/2.png new file mode 100644 index 000000000..2b6eb8fa9 Binary files /dev/null and b/graphics/event_objects/pics/people/spenser/2.png differ diff --git a/graphics/event_objects/pics/people/spenser/3.png b/graphics/event_objects/pics/people/spenser/3.png new file mode 100644 index 000000000..5fbc2044d Binary files /dev/null and b/graphics/event_objects/pics/people/spenser/3.png differ diff --git a/graphics/event_objects/pics/people/spenser/4.png b/graphics/event_objects/pics/people/spenser/4.png new file mode 100644 index 000000000..64a194e36 Binary files /dev/null and b/graphics/event_objects/pics/people/spenser/4.png differ diff --git a/graphics/event_objects/pics/people/spenser/5.png b/graphics/event_objects/pics/people/spenser/5.png new file mode 100644 index 000000000..4e024fac0 Binary files /dev/null and b/graphics/event_objects/pics/people/spenser/5.png differ diff --git a/graphics/event_objects/pics/people/spenser/6.png b/graphics/event_objects/pics/people/spenser/6.png new file mode 100644 index 000000000..2f6fefd88 Binary files /dev/null and b/graphics/event_objects/pics/people/spenser/6.png differ diff --git a/graphics/event_objects/pics/people/spenser/7.png b/graphics/event_objects/pics/people/spenser/7.png new file mode 100644 index 000000000..23be07f56 Binary files /dev/null and b/graphics/event_objects/pics/people/spenser/7.png differ diff --git a/graphics/event_objects/pics/people/spenser/8.png b/graphics/event_objects/pics/people/spenser/8.png new file mode 100644 index 000000000..71fff631b Binary files /dev/null and b/graphics/event_objects/pics/people/spenser/8.png differ diff --git a/graphics/event_objects/pics/people/steven/0.png b/graphics/event_objects/pics/people/steven/0.png new file mode 100644 index 000000000..35cc4d404 Binary files /dev/null and b/graphics/event_objects/pics/people/steven/0.png differ diff --git a/graphics/event_objects/pics/people/steven/1.png b/graphics/event_objects/pics/people/steven/1.png new file mode 100644 index 000000000..37a8367ea Binary files /dev/null and b/graphics/event_objects/pics/people/steven/1.png differ diff --git a/graphics/event_objects/pics/people/steven/2.png b/graphics/event_objects/pics/people/steven/2.png new file mode 100644 index 000000000..4d0447529 Binary files /dev/null and b/graphics/event_objects/pics/people/steven/2.png differ diff --git a/graphics/event_objects/pics/people/steven/3.png b/graphics/event_objects/pics/people/steven/3.png new file mode 100644 index 000000000..b2094c8b6 Binary files /dev/null and b/graphics/event_objects/pics/people/steven/3.png differ diff --git a/graphics/event_objects/pics/people/steven/4.png b/graphics/event_objects/pics/people/steven/4.png new file mode 100644 index 000000000..d47448bc8 Binary files /dev/null and b/graphics/event_objects/pics/people/steven/4.png differ diff --git a/graphics/event_objects/pics/people/steven/5.png b/graphics/event_objects/pics/people/steven/5.png new file mode 100644 index 000000000..e023078ee Binary files /dev/null and b/graphics/event_objects/pics/people/steven/5.png differ diff --git a/graphics/event_objects/pics/people/steven/6.png b/graphics/event_objects/pics/people/steven/6.png new file mode 100644 index 000000000..fb885a1bd Binary files /dev/null and b/graphics/event_objects/pics/people/steven/6.png differ diff --git a/graphics/event_objects/pics/people/steven/7.png b/graphics/event_objects/pics/people/steven/7.png new file mode 100644 index 000000000..ee2fbbb5f Binary files /dev/null and b/graphics/event_objects/pics/people/steven/7.png differ diff --git a/graphics/event_objects/pics/people/steven/8.png b/graphics/event_objects/pics/people/steven/8.png new file mode 100644 index 000000000..e140731cd Binary files /dev/null and b/graphics/event_objects/pics/people/steven/8.png differ diff --git a/graphics/event_objects/pics/people/swimmer_f/0.png b/graphics/event_objects/pics/people/swimmer_f/0.png new file mode 100644 index 000000000..e34972cc7 Binary files /dev/null and b/graphics/event_objects/pics/people/swimmer_f/0.png differ diff --git a/graphics/event_objects/pics/people/swimmer_f/1.png b/graphics/event_objects/pics/people/swimmer_f/1.png new file mode 100644 index 000000000..64c3c79e5 Binary files /dev/null and b/graphics/event_objects/pics/people/swimmer_f/1.png differ diff --git a/graphics/event_objects/pics/people/swimmer_f/2.png b/graphics/event_objects/pics/people/swimmer_f/2.png new file mode 100644 index 000000000..cf4d17d5d Binary files /dev/null and b/graphics/event_objects/pics/people/swimmer_f/2.png differ diff --git a/graphics/event_objects/pics/people/swimmer_f/3.png b/graphics/event_objects/pics/people/swimmer_f/3.png new file mode 100644 index 000000000..e8edbc9a6 Binary files /dev/null and b/graphics/event_objects/pics/people/swimmer_f/3.png differ diff --git a/graphics/event_objects/pics/people/swimmer_f/4.png b/graphics/event_objects/pics/people/swimmer_f/4.png new file mode 100644 index 000000000..1f5abf77e Binary files /dev/null and b/graphics/event_objects/pics/people/swimmer_f/4.png differ diff --git a/graphics/event_objects/pics/people/swimmer_f/5.png b/graphics/event_objects/pics/people/swimmer_f/5.png new file mode 100644 index 000000000..5e19861cb Binary files /dev/null and b/graphics/event_objects/pics/people/swimmer_f/5.png differ diff --git a/graphics/event_objects/pics/people/swimmer_f/6.png b/graphics/event_objects/pics/people/swimmer_f/6.png new file mode 100644 index 000000000..c4b602391 Binary files /dev/null and b/graphics/event_objects/pics/people/swimmer_f/6.png differ diff --git a/graphics/event_objects/pics/people/swimmer_f/7.png b/graphics/event_objects/pics/people/swimmer_f/7.png new file mode 100644 index 000000000..beb17704a Binary files /dev/null and b/graphics/event_objects/pics/people/swimmer_f/7.png differ diff --git a/graphics/event_objects/pics/people/swimmer_f/8.png b/graphics/event_objects/pics/people/swimmer_f/8.png new file mode 100644 index 000000000..db5588f7c Binary files /dev/null and b/graphics/event_objects/pics/people/swimmer_f/8.png differ diff --git a/graphics/event_objects/pics/people/swimmer_m/0.png b/graphics/event_objects/pics/people/swimmer_m/0.png new file mode 100644 index 000000000..51d63bb26 Binary files /dev/null and b/graphics/event_objects/pics/people/swimmer_m/0.png differ diff --git a/graphics/event_objects/pics/people/swimmer_m/1.png b/graphics/event_objects/pics/people/swimmer_m/1.png new file mode 100644 index 000000000..d1f976558 Binary files /dev/null and b/graphics/event_objects/pics/people/swimmer_m/1.png differ diff --git a/graphics/event_objects/pics/people/swimmer_m/2.png b/graphics/event_objects/pics/people/swimmer_m/2.png new file mode 100644 index 000000000..b4087efb5 Binary files /dev/null and b/graphics/event_objects/pics/people/swimmer_m/2.png differ diff --git a/graphics/event_objects/pics/people/swimmer_m/3.png b/graphics/event_objects/pics/people/swimmer_m/3.png new file mode 100644 index 000000000..4f445b8a8 Binary files /dev/null and b/graphics/event_objects/pics/people/swimmer_m/3.png differ diff --git a/graphics/event_objects/pics/people/swimmer_m/4.png b/graphics/event_objects/pics/people/swimmer_m/4.png new file mode 100644 index 000000000..940e8cf5d Binary files /dev/null and b/graphics/event_objects/pics/people/swimmer_m/4.png differ diff --git a/graphics/event_objects/pics/people/swimmer_m/5.png b/graphics/event_objects/pics/people/swimmer_m/5.png new file mode 100644 index 000000000..d6be697b0 Binary files /dev/null and b/graphics/event_objects/pics/people/swimmer_m/5.png differ diff --git a/graphics/event_objects/pics/people/swimmer_m/6.png b/graphics/event_objects/pics/people/swimmer_m/6.png new file mode 100644 index 000000000..cb2de823b Binary files /dev/null and b/graphics/event_objects/pics/people/swimmer_m/6.png differ diff --git a/graphics/event_objects/pics/people/swimmer_m/7.png b/graphics/event_objects/pics/people/swimmer_m/7.png new file mode 100644 index 000000000..b17892261 Binary files /dev/null and b/graphics/event_objects/pics/people/swimmer_m/7.png differ diff --git a/graphics/event_objects/pics/people/swimmer_m/8.png b/graphics/event_objects/pics/people/swimmer_m/8.png new file mode 100644 index 000000000..1f3fd48d0 Binary files /dev/null and b/graphics/event_objects/pics/people/swimmer_m/8.png differ diff --git a/graphics/event_objects/pics/people/tate/0.png b/graphics/event_objects/pics/people/tate/0.png new file mode 100644 index 000000000..f2481f1e2 Binary files /dev/null and b/graphics/event_objects/pics/people/tate/0.png differ diff --git a/graphics/event_objects/pics/people/tate/1.png b/graphics/event_objects/pics/people/tate/1.png new file mode 100644 index 000000000..ff1608cf2 Binary files /dev/null and b/graphics/event_objects/pics/people/tate/1.png differ diff --git a/graphics/event_objects/pics/people/tate/2.png b/graphics/event_objects/pics/people/tate/2.png new file mode 100644 index 000000000..9fba8459d Binary files /dev/null and b/graphics/event_objects/pics/people/tate/2.png differ diff --git a/graphics/event_objects/pics/people/teala/0.png b/graphics/event_objects/pics/people/teala/0.png new file mode 100644 index 000000000..173152306 Binary files /dev/null and b/graphics/event_objects/pics/people/teala/0.png differ diff --git a/graphics/event_objects/pics/people/teala/1.png b/graphics/event_objects/pics/people/teala/1.png new file mode 100644 index 000000000..2340f3262 Binary files /dev/null and b/graphics/event_objects/pics/people/teala/1.png differ diff --git a/graphics/event_objects/pics/people/teala/2.png b/graphics/event_objects/pics/people/teala/2.png new file mode 100644 index 000000000..1900d9e8d Binary files /dev/null and b/graphics/event_objects/pics/people/teala/2.png differ diff --git a/graphics/event_objects/pics/people/teala/3.png b/graphics/event_objects/pics/people/teala/3.png new file mode 100644 index 000000000..f3d46c920 Binary files /dev/null and b/graphics/event_objects/pics/people/teala/3.png differ diff --git a/graphics/event_objects/pics/people/teala/4.png b/graphics/event_objects/pics/people/teala/4.png new file mode 100644 index 000000000..5b70939b2 Binary files /dev/null and b/graphics/event_objects/pics/people/teala/4.png differ diff --git a/graphics/event_objects/pics/people/teala/5.png b/graphics/event_objects/pics/people/teala/5.png new file mode 100644 index 000000000..fcba35792 Binary files /dev/null and b/graphics/event_objects/pics/people/teala/5.png differ diff --git a/graphics/event_objects/pics/people/teala/6.png b/graphics/event_objects/pics/people/teala/6.png new file mode 100644 index 000000000..85a574bb8 Binary files /dev/null and b/graphics/event_objects/pics/people/teala/6.png differ diff --git a/graphics/event_objects/pics/people/teala/7.png b/graphics/event_objects/pics/people/teala/7.png new file mode 100644 index 000000000..882d7adca Binary files /dev/null and b/graphics/event_objects/pics/people/teala/7.png differ diff --git a/graphics/event_objects/pics/people/teala/8.png b/graphics/event_objects/pics/people/teala/8.png new file mode 100644 index 000000000..4366d38f9 Binary files /dev/null and b/graphics/event_objects/pics/people/teala/8.png differ diff --git a/graphics/event_objects/pics/people/tuber_f/0.png b/graphics/event_objects/pics/people/tuber_f/0.png new file mode 100644 index 000000000..34081dbad Binary files /dev/null and b/graphics/event_objects/pics/people/tuber_f/0.png differ diff --git a/graphics/event_objects/pics/people/tuber_f/1.png b/graphics/event_objects/pics/people/tuber_f/1.png new file mode 100644 index 000000000..5ad154c38 Binary files /dev/null and b/graphics/event_objects/pics/people/tuber_f/1.png differ diff --git a/graphics/event_objects/pics/people/tuber_f/2.png b/graphics/event_objects/pics/people/tuber_f/2.png new file mode 100644 index 000000000..d87de1307 Binary files /dev/null and b/graphics/event_objects/pics/people/tuber_f/2.png differ diff --git a/graphics/event_objects/pics/people/tuber_f/3.png b/graphics/event_objects/pics/people/tuber_f/3.png new file mode 100644 index 000000000..17ffb8845 Binary files /dev/null and b/graphics/event_objects/pics/people/tuber_f/3.png differ diff --git a/graphics/event_objects/pics/people/tuber_f/4.png b/graphics/event_objects/pics/people/tuber_f/4.png new file mode 100644 index 000000000..9de7aa0ab Binary files /dev/null and b/graphics/event_objects/pics/people/tuber_f/4.png differ diff --git a/graphics/event_objects/pics/people/tuber_f/5.png b/graphics/event_objects/pics/people/tuber_f/5.png new file mode 100644 index 000000000..16bd9c685 Binary files /dev/null and b/graphics/event_objects/pics/people/tuber_f/5.png differ diff --git a/graphics/event_objects/pics/people/tuber_f/6.png b/graphics/event_objects/pics/people/tuber_f/6.png new file mode 100644 index 000000000..e026ea45d Binary files /dev/null and b/graphics/event_objects/pics/people/tuber_f/6.png differ diff --git a/graphics/event_objects/pics/people/tuber_f/7.png b/graphics/event_objects/pics/people/tuber_f/7.png new file mode 100644 index 000000000..fbabc200d Binary files /dev/null and b/graphics/event_objects/pics/people/tuber_f/7.png differ diff --git a/graphics/event_objects/pics/people/tuber_f/8.png b/graphics/event_objects/pics/people/tuber_f/8.png new file mode 100644 index 000000000..ad08f016b Binary files /dev/null and b/graphics/event_objects/pics/people/tuber_f/8.png differ diff --git a/graphics/event_objects/pics/people/tuber_m/0.png b/graphics/event_objects/pics/people/tuber_m/0.png new file mode 100644 index 000000000..323439703 Binary files /dev/null and b/graphics/event_objects/pics/people/tuber_m/0.png differ diff --git a/graphics/event_objects/pics/people/tuber_m/1.png b/graphics/event_objects/pics/people/tuber_m/1.png new file mode 100644 index 000000000..dfce73bbc Binary files /dev/null and b/graphics/event_objects/pics/people/tuber_m/1.png differ diff --git a/graphics/event_objects/pics/people/tuber_m/2.png b/graphics/event_objects/pics/people/tuber_m/2.png new file mode 100644 index 000000000..1b1de564f Binary files /dev/null and b/graphics/event_objects/pics/people/tuber_m/2.png differ diff --git a/graphics/event_objects/pics/people/tuber_m/3.png b/graphics/event_objects/pics/people/tuber_m/3.png new file mode 100644 index 000000000..39f37a19b Binary files /dev/null and b/graphics/event_objects/pics/people/tuber_m/3.png differ diff --git a/graphics/event_objects/pics/people/tuber_m/4.png b/graphics/event_objects/pics/people/tuber_m/4.png new file mode 100644 index 000000000..78fae1160 Binary files /dev/null and b/graphics/event_objects/pics/people/tuber_m/4.png differ diff --git a/graphics/event_objects/pics/people/tuber_m/5.png b/graphics/event_objects/pics/people/tuber_m/5.png new file mode 100644 index 000000000..690add8ad Binary files /dev/null and b/graphics/event_objects/pics/people/tuber_m/5.png differ diff --git a/graphics/event_objects/pics/people/tuber_m/6.png b/graphics/event_objects/pics/people/tuber_m/6.png new file mode 100644 index 000000000..ff61406b9 Binary files /dev/null and b/graphics/event_objects/pics/people/tuber_m/6.png differ diff --git a/graphics/event_objects/pics/people/tuber_m/7.png b/graphics/event_objects/pics/people/tuber_m/7.png new file mode 100644 index 000000000..d8c7b98cf Binary files /dev/null and b/graphics/event_objects/pics/people/tuber_m/7.png differ diff --git a/graphics/event_objects/pics/people/tuber_m/8.png b/graphics/event_objects/pics/people/tuber_m/8.png new file mode 100644 index 000000000..4ec4b5599 Binary files /dev/null and b/graphics/event_objects/pics/people/tuber_m/8.png differ diff --git a/graphics/event_objects/pics/people/tuber_m_swimming/0.png b/graphics/event_objects/pics/people/tuber_m_swimming/0.png new file mode 100644 index 000000000..c6ba83d87 Binary files /dev/null and b/graphics/event_objects/pics/people/tuber_m_swimming/0.png differ diff --git a/graphics/event_objects/pics/people/tuber_m_swimming/1.png b/graphics/event_objects/pics/people/tuber_m_swimming/1.png new file mode 100644 index 000000000..85eb42650 Binary files /dev/null and b/graphics/event_objects/pics/people/tuber_m_swimming/1.png differ diff --git a/graphics/event_objects/pics/people/tuber_m_swimming/2.png b/graphics/event_objects/pics/people/tuber_m_swimming/2.png new file mode 100644 index 000000000..1cca717b0 Binary files /dev/null and b/graphics/event_objects/pics/people/tuber_m_swimming/2.png differ diff --git a/graphics/event_objects/pics/people/tuber_m_swimming/3.png b/graphics/event_objects/pics/people/tuber_m_swimming/3.png new file mode 100644 index 000000000..253d75ed0 Binary files /dev/null and b/graphics/event_objects/pics/people/tuber_m_swimming/3.png differ diff --git a/graphics/event_objects/pics/people/tuber_m_swimming/4.png b/graphics/event_objects/pics/people/tuber_m_swimming/4.png new file mode 100644 index 000000000..d64c9033f Binary files /dev/null and b/graphics/event_objects/pics/people/tuber_m_swimming/4.png differ diff --git a/graphics/event_objects/pics/people/tuber_m_swimming/5.png b/graphics/event_objects/pics/people/tuber_m_swimming/5.png new file mode 100644 index 000000000..2a8e7d67d Binary files /dev/null and b/graphics/event_objects/pics/people/tuber_m_swimming/5.png differ diff --git a/graphics/event_objects/pics/people/tuber_m_swimming/6.png b/graphics/event_objects/pics/people/tuber_m_swimming/6.png new file mode 100644 index 000000000..c55acdf29 Binary files /dev/null and b/graphics/event_objects/pics/people/tuber_m_swimming/6.png differ diff --git a/graphics/event_objects/pics/people/tuber_m_swimming/7.png b/graphics/event_objects/pics/people/tuber_m_swimming/7.png new file mode 100644 index 000000000..7a203920f Binary files /dev/null and b/graphics/event_objects/pics/people/tuber_m_swimming/7.png differ diff --git a/graphics/event_objects/pics/people/tuber_m_swimming/8.png b/graphics/event_objects/pics/people/tuber_m_swimming/8.png new file mode 100644 index 000000000..321f8acca Binary files /dev/null and b/graphics/event_objects/pics/people/tuber_m_swimming/8.png differ diff --git a/graphics/event_objects/pics/people/tucker/0.png b/graphics/event_objects/pics/people/tucker/0.png new file mode 100644 index 000000000..ec733c959 Binary files /dev/null and b/graphics/event_objects/pics/people/tucker/0.png differ diff --git a/graphics/event_objects/pics/people/tucker/1.png b/graphics/event_objects/pics/people/tucker/1.png new file mode 100644 index 000000000..ad4af677c Binary files /dev/null and b/graphics/event_objects/pics/people/tucker/1.png differ diff --git a/graphics/event_objects/pics/people/tucker/2.png b/graphics/event_objects/pics/people/tucker/2.png new file mode 100644 index 000000000..2496ded57 Binary files /dev/null and b/graphics/event_objects/pics/people/tucker/2.png differ diff --git a/graphics/event_objects/pics/people/tucker/3.png b/graphics/event_objects/pics/people/tucker/3.png new file mode 100644 index 000000000..3f7b156f0 Binary files /dev/null and b/graphics/event_objects/pics/people/tucker/3.png differ diff --git a/graphics/event_objects/pics/people/tucker/4.png b/graphics/event_objects/pics/people/tucker/4.png new file mode 100644 index 000000000..4262e1be0 Binary files /dev/null and b/graphics/event_objects/pics/people/tucker/4.png differ diff --git a/graphics/event_objects/pics/people/tucker/5.png b/graphics/event_objects/pics/people/tucker/5.png new file mode 100644 index 000000000..53304c221 Binary files /dev/null and b/graphics/event_objects/pics/people/tucker/5.png differ diff --git a/graphics/event_objects/pics/people/tucker/6.png b/graphics/event_objects/pics/people/tucker/6.png new file mode 100644 index 000000000..0bab43c10 Binary files /dev/null and b/graphics/event_objects/pics/people/tucker/6.png differ diff --git a/graphics/event_objects/pics/people/tucker/7.png b/graphics/event_objects/pics/people/tucker/7.png new file mode 100644 index 000000000..a98ef8819 Binary files /dev/null and b/graphics/event_objects/pics/people/tucker/7.png differ diff --git a/graphics/event_objects/pics/people/tucker/8.png b/graphics/event_objects/pics/people/tucker/8.png new file mode 100644 index 000000000..7b6d30a22 Binary files /dev/null and b/graphics/event_objects/pics/people/tucker/8.png differ diff --git a/graphics/event_objects/pics/people/union_room_attendant/0.png b/graphics/event_objects/pics/people/union_room_attendant/0.png new file mode 100644 index 000000000..cfccc0049 Binary files /dev/null and b/graphics/event_objects/pics/people/union_room_attendant/0.png differ diff --git a/graphics/event_objects/pics/people/union_room_attendant/1.png b/graphics/event_objects/pics/people/union_room_attendant/1.png new file mode 100644 index 000000000..6790d092e Binary files /dev/null and b/graphics/event_objects/pics/people/union_room_attendant/1.png differ diff --git a/graphics/event_objects/pics/people/union_room_attendant/2.png b/graphics/event_objects/pics/people/union_room_attendant/2.png new file mode 100644 index 000000000..38fb1eb74 Binary files /dev/null and b/graphics/event_objects/pics/people/union_room_attendant/2.png differ diff --git a/graphics/event_objects/pics/people/unused_woman/0.png b/graphics/event_objects/pics/people/unused_woman/0.png new file mode 100644 index 000000000..01ba70b56 Binary files /dev/null and b/graphics/event_objects/pics/people/unused_woman/0.png differ diff --git a/graphics/event_objects/pics/people/unused_woman/1.png b/graphics/event_objects/pics/people/unused_woman/1.png new file mode 100644 index 000000000..78534f0dc Binary files /dev/null and b/graphics/event_objects/pics/people/unused_woman/1.png differ diff --git a/graphics/event_objects/pics/people/unused_woman/2.png b/graphics/event_objects/pics/people/unused_woman/2.png new file mode 100644 index 000000000..b42a12532 Binary files /dev/null and b/graphics/event_objects/pics/people/unused_woman/2.png differ diff --git a/graphics/event_objects/pics/people/unused_woman/3.png b/graphics/event_objects/pics/people/unused_woman/3.png new file mode 100644 index 000000000..c66653c17 Binary files /dev/null and b/graphics/event_objects/pics/people/unused_woman/3.png differ diff --git a/graphics/event_objects/pics/people/unused_woman/4.png b/graphics/event_objects/pics/people/unused_woman/4.png new file mode 100644 index 000000000..75a457c2f Binary files /dev/null and b/graphics/event_objects/pics/people/unused_woman/4.png differ diff --git a/graphics/event_objects/pics/people/unused_woman/5.png b/graphics/event_objects/pics/people/unused_woman/5.png new file mode 100644 index 000000000..e27f0760f Binary files /dev/null and b/graphics/event_objects/pics/people/unused_woman/5.png differ diff --git a/graphics/event_objects/pics/people/unused_woman/6.png b/graphics/event_objects/pics/people/unused_woman/6.png new file mode 100644 index 000000000..53102c01e Binary files /dev/null and b/graphics/event_objects/pics/people/unused_woman/6.png differ diff --git a/graphics/event_objects/pics/people/unused_woman/7.png b/graphics/event_objects/pics/people/unused_woman/7.png new file mode 100644 index 000000000..3d2d436c2 Binary files /dev/null and b/graphics/event_objects/pics/people/unused_woman/7.png differ diff --git a/graphics/event_objects/pics/people/unused_woman/8.png b/graphics/event_objects/pics/people/unused_woman/8.png new file mode 100644 index 000000000..3773e7f48 Binary files /dev/null and b/graphics/event_objects/pics/people/unused_woman/8.png differ diff --git a/graphics/event_objects/pics/people/wallace/0.png b/graphics/event_objects/pics/people/wallace/0.png new file mode 100644 index 000000000..349d65049 Binary files /dev/null and b/graphics/event_objects/pics/people/wallace/0.png differ diff --git a/graphics/event_objects/pics/people/wallace/1.png b/graphics/event_objects/pics/people/wallace/1.png new file mode 100644 index 000000000..698b03fad Binary files /dev/null and b/graphics/event_objects/pics/people/wallace/1.png differ diff --git a/graphics/event_objects/pics/people/wallace/2.png b/graphics/event_objects/pics/people/wallace/2.png new file mode 100644 index 000000000..576346bcb Binary files /dev/null and b/graphics/event_objects/pics/people/wallace/2.png differ diff --git a/graphics/event_objects/pics/people/wallace/3.png b/graphics/event_objects/pics/people/wallace/3.png new file mode 100644 index 000000000..56773b97d Binary files /dev/null and b/graphics/event_objects/pics/people/wallace/3.png differ diff --git a/graphics/event_objects/pics/people/wallace/4.png b/graphics/event_objects/pics/people/wallace/4.png new file mode 100644 index 000000000..6281a56ef Binary files /dev/null and b/graphics/event_objects/pics/people/wallace/4.png differ diff --git a/graphics/event_objects/pics/people/wallace/5.png b/graphics/event_objects/pics/people/wallace/5.png new file mode 100644 index 000000000..5f61598d9 Binary files /dev/null and b/graphics/event_objects/pics/people/wallace/5.png differ diff --git a/graphics/event_objects/pics/people/wallace/6.png b/graphics/event_objects/pics/people/wallace/6.png new file mode 100644 index 000000000..1abba4e1b Binary files /dev/null and b/graphics/event_objects/pics/people/wallace/6.png differ diff --git a/graphics/event_objects/pics/people/wallace/7.png b/graphics/event_objects/pics/people/wallace/7.png new file mode 100644 index 000000000..477dd9e01 Binary files /dev/null and b/graphics/event_objects/pics/people/wallace/7.png differ diff --git a/graphics/event_objects/pics/people/wallace/8.png b/graphics/event_objects/pics/people/wallace/8.png new file mode 100644 index 000000000..da5a51f76 Binary files /dev/null and b/graphics/event_objects/pics/people/wallace/8.png differ diff --git a/graphics/event_objects/pics/people/wally/0.png b/graphics/event_objects/pics/people/wally/0.png new file mode 100644 index 000000000..b185bc294 Binary files /dev/null and b/graphics/event_objects/pics/people/wally/0.png differ diff --git a/graphics/event_objects/pics/people/wally/1.png b/graphics/event_objects/pics/people/wally/1.png new file mode 100644 index 000000000..42f5a3f0a Binary files /dev/null and b/graphics/event_objects/pics/people/wally/1.png differ diff --git a/graphics/event_objects/pics/people/wally/2.png b/graphics/event_objects/pics/people/wally/2.png new file mode 100644 index 000000000..ed32f1f41 Binary files /dev/null and b/graphics/event_objects/pics/people/wally/2.png differ diff --git a/graphics/event_objects/pics/people/wally/3.png b/graphics/event_objects/pics/people/wally/3.png new file mode 100644 index 000000000..5d2213b2c Binary files /dev/null and b/graphics/event_objects/pics/people/wally/3.png differ diff --git a/graphics/event_objects/pics/people/wally/4.png b/graphics/event_objects/pics/people/wally/4.png new file mode 100644 index 000000000..af996a72a Binary files /dev/null and b/graphics/event_objects/pics/people/wally/4.png differ diff --git a/graphics/event_objects/pics/people/wally/5.png b/graphics/event_objects/pics/people/wally/5.png new file mode 100644 index 000000000..de23077ce Binary files /dev/null and b/graphics/event_objects/pics/people/wally/5.png differ diff --git a/graphics/event_objects/pics/people/wally/6.png b/graphics/event_objects/pics/people/wally/6.png new file mode 100644 index 000000000..42397e95e Binary files /dev/null and b/graphics/event_objects/pics/people/wally/6.png differ diff --git a/graphics/event_objects/pics/people/wally/7.png b/graphics/event_objects/pics/people/wally/7.png new file mode 100644 index 000000000..46dbdfa3b Binary files /dev/null and b/graphics/event_objects/pics/people/wally/7.png differ diff --git a/graphics/event_objects/pics/people/wally/8.png b/graphics/event_objects/pics/people/wally/8.png new file mode 100644 index 000000000..5b7038b44 Binary files /dev/null and b/graphics/event_objects/pics/people/wally/8.png differ diff --git a/graphics/event_objects/pics/people/wattson/0.png b/graphics/event_objects/pics/people/wattson/0.png new file mode 100644 index 000000000..28eaa1bf2 Binary files /dev/null and b/graphics/event_objects/pics/people/wattson/0.png differ diff --git a/graphics/event_objects/pics/people/wattson/1.png b/graphics/event_objects/pics/people/wattson/1.png new file mode 100644 index 000000000..b26ab83f4 Binary files /dev/null and b/graphics/event_objects/pics/people/wattson/1.png differ diff --git a/graphics/event_objects/pics/people/wattson/2.png b/graphics/event_objects/pics/people/wattson/2.png new file mode 100644 index 000000000..2d7fe024b Binary files /dev/null and b/graphics/event_objects/pics/people/wattson/2.png differ diff --git a/graphics/event_objects/pics/people/winona/0.png b/graphics/event_objects/pics/people/winona/0.png new file mode 100644 index 000000000..4df463363 Binary files /dev/null and b/graphics/event_objects/pics/people/winona/0.png differ diff --git a/graphics/event_objects/pics/people/winona/1.png b/graphics/event_objects/pics/people/winona/1.png new file mode 100644 index 000000000..75d255c7a Binary files /dev/null and b/graphics/event_objects/pics/people/winona/1.png differ diff --git a/graphics/event_objects/pics/people/winona/2.png b/graphics/event_objects/pics/people/winona/2.png new file mode 100644 index 000000000..569dea105 Binary files /dev/null and b/graphics/event_objects/pics/people/winona/2.png differ diff --git a/graphics/event_objects/pics/people/woman_1/0.png b/graphics/event_objects/pics/people/woman_1/0.png new file mode 100644 index 000000000..cb2949038 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_1/0.png differ diff --git a/graphics/event_objects/pics/people/woman_1/1.png b/graphics/event_objects/pics/people/woman_1/1.png new file mode 100644 index 000000000..ea8dc9119 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_1/1.png differ diff --git a/graphics/event_objects/pics/people/woman_1/2.png b/graphics/event_objects/pics/people/woman_1/2.png new file mode 100644 index 000000000..b0bd3e1b1 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_1/2.png differ diff --git a/graphics/event_objects/pics/people/woman_1/3.png b/graphics/event_objects/pics/people/woman_1/3.png new file mode 100644 index 000000000..e7ed6c112 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_1/3.png differ diff --git a/graphics/event_objects/pics/people/woman_1/4.png b/graphics/event_objects/pics/people/woman_1/4.png new file mode 100644 index 000000000..05f7e7839 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_1/4.png differ diff --git a/graphics/event_objects/pics/people/woman_1/5.png b/graphics/event_objects/pics/people/woman_1/5.png new file mode 100644 index 000000000..e23e364cd Binary files /dev/null and b/graphics/event_objects/pics/people/woman_1/5.png differ diff --git a/graphics/event_objects/pics/people/woman_1/6.png b/graphics/event_objects/pics/people/woman_1/6.png new file mode 100644 index 000000000..a1e6f69ab Binary files /dev/null and b/graphics/event_objects/pics/people/woman_1/6.png differ diff --git a/graphics/event_objects/pics/people/woman_1/7.png b/graphics/event_objects/pics/people/woman_1/7.png new file mode 100644 index 000000000..985172d52 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_1/7.png differ diff --git a/graphics/event_objects/pics/people/woman_1/8.png b/graphics/event_objects/pics/people/woman_1/8.png new file mode 100644 index 000000000..f5e560b59 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_1/8.png differ diff --git a/graphics/event_objects/pics/people/woman_2/0.png b/graphics/event_objects/pics/people/woman_2/0.png new file mode 100644 index 000000000..d9656ce73 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_2/0.png differ diff --git a/graphics/event_objects/pics/people/woman_2/1.png b/graphics/event_objects/pics/people/woman_2/1.png new file mode 100644 index 000000000..23d97812b Binary files /dev/null and b/graphics/event_objects/pics/people/woman_2/1.png differ diff --git a/graphics/event_objects/pics/people/woman_2/2.png b/graphics/event_objects/pics/people/woman_2/2.png new file mode 100644 index 000000000..f298e6eea Binary files /dev/null and b/graphics/event_objects/pics/people/woman_2/2.png differ diff --git a/graphics/event_objects/pics/people/woman_2/3.png b/graphics/event_objects/pics/people/woman_2/3.png new file mode 100644 index 000000000..53809fd32 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_2/3.png differ diff --git a/graphics/event_objects/pics/people/woman_2/4.png b/graphics/event_objects/pics/people/woman_2/4.png new file mode 100644 index 000000000..8f3fbe35f Binary files /dev/null and b/graphics/event_objects/pics/people/woman_2/4.png differ diff --git a/graphics/event_objects/pics/people/woman_2/5.png b/graphics/event_objects/pics/people/woman_2/5.png new file mode 100644 index 000000000..d02680904 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_2/5.png differ diff --git a/graphics/event_objects/pics/people/woman_2/6.png b/graphics/event_objects/pics/people/woman_2/6.png new file mode 100644 index 000000000..4999cf1b1 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_2/6.png differ diff --git a/graphics/event_objects/pics/people/woman_2/7.png b/graphics/event_objects/pics/people/woman_2/7.png new file mode 100644 index 000000000..17e669531 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_2/7.png differ diff --git a/graphics/event_objects/pics/people/woman_2/8.png b/graphics/event_objects/pics/people/woman_2/8.png new file mode 100644 index 000000000..f59199574 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_2/8.png differ diff --git a/graphics/event_objects/pics/people/woman_3/0.png b/graphics/event_objects/pics/people/woman_3/0.png new file mode 100644 index 000000000..ac9ed557e Binary files /dev/null and b/graphics/event_objects/pics/people/woman_3/0.png differ diff --git a/graphics/event_objects/pics/people/woman_3/1.png b/graphics/event_objects/pics/people/woman_3/1.png new file mode 100644 index 000000000..a7dbe7ec3 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_3/1.png differ diff --git a/graphics/event_objects/pics/people/woman_3/2.png b/graphics/event_objects/pics/people/woman_3/2.png new file mode 100644 index 000000000..23852c71b Binary files /dev/null and b/graphics/event_objects/pics/people/woman_3/2.png differ diff --git a/graphics/event_objects/pics/people/woman_3/3.png b/graphics/event_objects/pics/people/woman_3/3.png new file mode 100644 index 000000000..525958cbb Binary files /dev/null and b/graphics/event_objects/pics/people/woman_3/3.png differ diff --git a/graphics/event_objects/pics/people/woman_3/4.png b/graphics/event_objects/pics/people/woman_3/4.png new file mode 100644 index 000000000..6feabedd0 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_3/4.png differ diff --git a/graphics/event_objects/pics/people/woman_3/5.png b/graphics/event_objects/pics/people/woman_3/5.png new file mode 100644 index 000000000..f174b0184 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_3/5.png differ diff --git a/graphics/event_objects/pics/people/woman_3/6.png b/graphics/event_objects/pics/people/woman_3/6.png new file mode 100644 index 000000000..1b4b6d08a Binary files /dev/null and b/graphics/event_objects/pics/people/woman_3/6.png differ diff --git a/graphics/event_objects/pics/people/woman_3/7.png b/graphics/event_objects/pics/people/woman_3/7.png new file mode 100644 index 000000000..d8c2bfd99 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_3/7.png differ diff --git a/graphics/event_objects/pics/people/woman_3/8.png b/graphics/event_objects/pics/people/woman_3/8.png new file mode 100644 index 000000000..0517b9993 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_3/8.png differ diff --git a/graphics/event_objects/pics/people/woman_4/0.png b/graphics/event_objects/pics/people/woman_4/0.png new file mode 100644 index 000000000..88489b6a6 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_4/0.png differ diff --git a/graphics/event_objects/pics/people/woman_4/1.png b/graphics/event_objects/pics/people/woman_4/1.png new file mode 100644 index 000000000..1cc24ca36 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_4/1.png differ diff --git a/graphics/event_objects/pics/people/woman_4/2.png b/graphics/event_objects/pics/people/woman_4/2.png new file mode 100644 index 000000000..efedc4a01 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_4/2.png differ diff --git a/graphics/event_objects/pics/people/woman_4/3.png b/graphics/event_objects/pics/people/woman_4/3.png new file mode 100644 index 000000000..a186b454e Binary files /dev/null and b/graphics/event_objects/pics/people/woman_4/3.png differ diff --git a/graphics/event_objects/pics/people/woman_4/4.png b/graphics/event_objects/pics/people/woman_4/4.png new file mode 100644 index 000000000..c5cc8670d Binary files /dev/null and b/graphics/event_objects/pics/people/woman_4/4.png differ diff --git a/graphics/event_objects/pics/people/woman_4/5.png b/graphics/event_objects/pics/people/woman_4/5.png new file mode 100644 index 000000000..f08133faa Binary files /dev/null and b/graphics/event_objects/pics/people/woman_4/5.png differ diff --git a/graphics/event_objects/pics/people/woman_4/6.png b/graphics/event_objects/pics/people/woman_4/6.png new file mode 100644 index 000000000..dec6f3146 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_4/6.png differ diff --git a/graphics/event_objects/pics/people/woman_4/7.png b/graphics/event_objects/pics/people/woman_4/7.png new file mode 100644 index 000000000..4912065a5 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_4/7.png differ diff --git a/graphics/event_objects/pics/people/woman_4/8.png b/graphics/event_objects/pics/people/woman_4/8.png new file mode 100644 index 000000000..21cd91f67 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_4/8.png differ diff --git a/graphics/event_objects/pics/people/woman_5/0.png b/graphics/event_objects/pics/people/woman_5/0.png new file mode 100644 index 000000000..30ff1cf1c Binary files /dev/null and b/graphics/event_objects/pics/people/woman_5/0.png differ diff --git a/graphics/event_objects/pics/people/woman_5/1.png b/graphics/event_objects/pics/people/woman_5/1.png new file mode 100644 index 000000000..3a5cf543e Binary files /dev/null and b/graphics/event_objects/pics/people/woman_5/1.png differ diff --git a/graphics/event_objects/pics/people/woman_5/2.png b/graphics/event_objects/pics/people/woman_5/2.png new file mode 100644 index 000000000..066d52259 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_5/2.png differ diff --git a/graphics/event_objects/pics/people/woman_5/3.png b/graphics/event_objects/pics/people/woman_5/3.png new file mode 100644 index 000000000..737877bb6 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_5/3.png differ diff --git a/graphics/event_objects/pics/people/woman_5/4.png b/graphics/event_objects/pics/people/woman_5/4.png new file mode 100644 index 000000000..170d45929 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_5/4.png differ diff --git a/graphics/event_objects/pics/people/woman_5/5.png b/graphics/event_objects/pics/people/woman_5/5.png new file mode 100644 index 000000000..2bae62dde Binary files /dev/null and b/graphics/event_objects/pics/people/woman_5/5.png differ diff --git a/graphics/event_objects/pics/people/woman_5/6.png b/graphics/event_objects/pics/people/woman_5/6.png new file mode 100644 index 000000000..519897644 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_5/6.png differ diff --git a/graphics/event_objects/pics/people/woman_5/7.png b/graphics/event_objects/pics/people/woman_5/7.png new file mode 100644 index 000000000..c8ec75432 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_5/7.png differ diff --git a/graphics/event_objects/pics/people/woman_5/8.png b/graphics/event_objects/pics/people/woman_5/8.png new file mode 100644 index 000000000..c4c05fcd9 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_5/8.png differ diff --git a/graphics/event_objects/pics/people/woman_6/0.png b/graphics/event_objects/pics/people/woman_6/0.png new file mode 100644 index 000000000..61cce57b0 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_6/0.png differ diff --git a/graphics/event_objects/pics/people/woman_6/1.png b/graphics/event_objects/pics/people/woman_6/1.png new file mode 100644 index 000000000..ea399ef74 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_6/1.png differ diff --git a/graphics/event_objects/pics/people/woman_6/2.png b/graphics/event_objects/pics/people/woman_6/2.png new file mode 100644 index 000000000..574121114 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_6/2.png differ diff --git a/graphics/event_objects/pics/people/woman_6/3.png b/graphics/event_objects/pics/people/woman_6/3.png new file mode 100644 index 000000000..538e60433 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_6/3.png differ diff --git a/graphics/event_objects/pics/people/woman_6/4.png b/graphics/event_objects/pics/people/woman_6/4.png new file mode 100644 index 000000000..746cefd09 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_6/4.png differ diff --git a/graphics/event_objects/pics/people/woman_6/5.png b/graphics/event_objects/pics/people/woman_6/5.png new file mode 100644 index 000000000..4c4e2c5b0 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_6/5.png differ diff --git a/graphics/event_objects/pics/people/woman_6/6.png b/graphics/event_objects/pics/people/woman_6/6.png new file mode 100644 index 000000000..efd7b76ca Binary files /dev/null and b/graphics/event_objects/pics/people/woman_6/6.png differ diff --git a/graphics/event_objects/pics/people/woman_6/7.png b/graphics/event_objects/pics/people/woman_6/7.png new file mode 100644 index 000000000..2009f5e9a Binary files /dev/null and b/graphics/event_objects/pics/people/woman_6/7.png differ diff --git a/graphics/event_objects/pics/people/woman_6/8.png b/graphics/event_objects/pics/people/woman_6/8.png new file mode 100644 index 000000000..9dd33b643 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_6/8.png differ diff --git a/graphics/event_objects/pics/people/woman_7/0.png b/graphics/event_objects/pics/people/woman_7/0.png new file mode 100644 index 000000000..a235d670e Binary files /dev/null and b/graphics/event_objects/pics/people/woman_7/0.png differ diff --git a/graphics/event_objects/pics/people/woman_7/1.png b/graphics/event_objects/pics/people/woman_7/1.png new file mode 100644 index 000000000..62de3d528 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_7/1.png differ diff --git a/graphics/event_objects/pics/people/woman_7/2.png b/graphics/event_objects/pics/people/woman_7/2.png new file mode 100644 index 000000000..3893cd292 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_7/2.png differ diff --git a/graphics/event_objects/pics/people/woman_7/3.png b/graphics/event_objects/pics/people/woman_7/3.png new file mode 100644 index 000000000..b893b9574 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_7/3.png differ diff --git a/graphics/event_objects/pics/people/woman_7/4.png b/graphics/event_objects/pics/people/woman_7/4.png new file mode 100644 index 000000000..4f0493124 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_7/4.png differ diff --git a/graphics/event_objects/pics/people/woman_7/5.png b/graphics/event_objects/pics/people/woman_7/5.png new file mode 100644 index 000000000..6a1e56d2c Binary files /dev/null and b/graphics/event_objects/pics/people/woman_7/5.png differ diff --git a/graphics/event_objects/pics/people/woman_7/6.png b/graphics/event_objects/pics/people/woman_7/6.png new file mode 100644 index 000000000..8a3488157 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_7/6.png differ diff --git a/graphics/event_objects/pics/people/woman_7/7.png b/graphics/event_objects/pics/people/woman_7/7.png new file mode 100644 index 000000000..fe1dbe735 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_7/7.png differ diff --git a/graphics/event_objects/pics/people/woman_7/8.png b/graphics/event_objects/pics/people/woman_7/8.png new file mode 100644 index 000000000..08a1fad82 Binary files /dev/null and b/graphics/event_objects/pics/people/woman_7/8.png differ diff --git a/graphics/event_objects/pics/people/youngster/0.png b/graphics/event_objects/pics/people/youngster/0.png new file mode 100644 index 000000000..b370f8141 Binary files /dev/null and b/graphics/event_objects/pics/people/youngster/0.png differ diff --git a/graphics/event_objects/pics/people/youngster/1.png b/graphics/event_objects/pics/people/youngster/1.png new file mode 100644 index 000000000..1c1f15b89 Binary files /dev/null and b/graphics/event_objects/pics/people/youngster/1.png differ diff --git a/graphics/event_objects/pics/people/youngster/2.png b/graphics/event_objects/pics/people/youngster/2.png new file mode 100644 index 000000000..c8a936dd2 Binary files /dev/null and b/graphics/event_objects/pics/people/youngster/2.png differ diff --git a/graphics/event_objects/pics/people/youngster/3.png b/graphics/event_objects/pics/people/youngster/3.png new file mode 100644 index 000000000..c9fa72ddb Binary files /dev/null and b/graphics/event_objects/pics/people/youngster/3.png differ diff --git a/graphics/event_objects/pics/people/youngster/4.png b/graphics/event_objects/pics/people/youngster/4.png new file mode 100644 index 000000000..ba17f34ac Binary files /dev/null and b/graphics/event_objects/pics/people/youngster/4.png differ diff --git a/graphics/event_objects/pics/people/youngster/5.png b/graphics/event_objects/pics/people/youngster/5.png new file mode 100644 index 000000000..fcd2f196a Binary files /dev/null and b/graphics/event_objects/pics/people/youngster/5.png differ diff --git a/graphics/event_objects/pics/people/youngster/6.png b/graphics/event_objects/pics/people/youngster/6.png new file mode 100644 index 000000000..fd12b99ea Binary files /dev/null and b/graphics/event_objects/pics/people/youngster/6.png differ diff --git a/graphics/event_objects/pics/people/youngster/7.png b/graphics/event_objects/pics/people/youngster/7.png new file mode 100644 index 000000000..626716b8d Binary files /dev/null and b/graphics/event_objects/pics/people/youngster/7.png differ diff --git a/graphics/event_objects/pics/people/youngster/8.png b/graphics/event_objects/pics/people/youngster/8.png new file mode 100644 index 000000000..3c9662746 Binary files /dev/null and b/graphics/event_objects/pics/people/youngster/8.png differ diff --git a/graphics/event_objects/pics/pokemon/azumarill/0.png b/graphics/event_objects/pics/pokemon/azumarill/0.png new file mode 100644 index 000000000..9b219e552 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/azumarill/0.png differ diff --git a/graphics/event_objects/pics/pokemon/azumarill/1.png b/graphics/event_objects/pics/pokemon/azumarill/1.png new file mode 100644 index 000000000..16e493f8b Binary files /dev/null and b/graphics/event_objects/pics/pokemon/azumarill/1.png differ diff --git a/graphics/event_objects/pics/pokemon/azumarill/2.png b/graphics/event_objects/pics/pokemon/azumarill/2.png new file mode 100644 index 000000000..b10e6a283 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/azumarill/2.png differ diff --git a/graphics/event_objects/pics/pokemon/azurill/0.png b/graphics/event_objects/pics/pokemon/azurill/0.png new file mode 100644 index 000000000..efbcea03f Binary files /dev/null and b/graphics/event_objects/pics/pokemon/azurill/0.png differ diff --git a/graphics/event_objects/pics/pokemon/azurill/1.png b/graphics/event_objects/pics/pokemon/azurill/1.png new file mode 100644 index 000000000..4e00acdc6 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/azurill/1.png differ diff --git a/graphics/event_objects/pics/pokemon/azurill/2.png b/graphics/event_objects/pics/pokemon/azurill/2.png new file mode 100644 index 000000000..08bf43c5b Binary files /dev/null and b/graphics/event_objects/pics/pokemon/azurill/2.png differ diff --git a/graphics/event_objects/pics/pokemon/deoxys/0.png b/graphics/event_objects/pics/pokemon/deoxys/0.png new file mode 100644 index 000000000..37b90dbfe Binary files /dev/null and b/graphics/event_objects/pics/pokemon/deoxys/0.png differ diff --git a/graphics/event_objects/pics/pokemon/deoxys/1.png b/graphics/event_objects/pics/pokemon/deoxys/1.png new file mode 100644 index 000000000..4d38cb946 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/deoxys/1.png differ diff --git a/graphics/event_objects/pics/pokemon/dusclops/0.png b/graphics/event_objects/pics/pokemon/dusclops/0.png new file mode 100644 index 000000000..b738a9ef1 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/dusclops/0.png differ diff --git a/graphics/event_objects/pics/pokemon/dusclops/1.png b/graphics/event_objects/pics/pokemon/dusclops/1.png new file mode 100644 index 000000000..70ec671c8 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/dusclops/1.png differ diff --git a/graphics/event_objects/pics/pokemon/dusclops/2.png b/graphics/event_objects/pics/pokemon/dusclops/2.png new file mode 100644 index 000000000..0cbb7c620 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/dusclops/2.png differ diff --git a/graphics/event_objects/pics/pokemon/dusclops/3.png b/graphics/event_objects/pics/pokemon/dusclops/3.png new file mode 100644 index 000000000..3d5858ff6 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/dusclops/3.png differ diff --git a/graphics/event_objects/pics/pokemon/dusclops/4.png b/graphics/event_objects/pics/pokemon/dusclops/4.png new file mode 100644 index 000000000..f99269afa Binary files /dev/null and b/graphics/event_objects/pics/pokemon/dusclops/4.png differ diff --git a/graphics/event_objects/pics/pokemon/dusclops/5.png b/graphics/event_objects/pics/pokemon/dusclops/5.png new file mode 100644 index 000000000..6b496be3c Binary files /dev/null and b/graphics/event_objects/pics/pokemon/dusclops/5.png differ diff --git a/graphics/event_objects/pics/pokemon/dusclops/6.png b/graphics/event_objects/pics/pokemon/dusclops/6.png new file mode 100644 index 000000000..3ff10d7ab Binary files /dev/null and b/graphics/event_objects/pics/pokemon/dusclops/6.png differ diff --git a/graphics/event_objects/pics/pokemon/dusclops/7.png b/graphics/event_objects/pics/pokemon/dusclops/7.png new file mode 100644 index 000000000..925080a4f Binary files /dev/null and b/graphics/event_objects/pics/pokemon/dusclops/7.png differ diff --git a/graphics/event_objects/pics/pokemon/dusclops/8.png b/graphics/event_objects/pics/pokemon/dusclops/8.png new file mode 100644 index 000000000..57dcef596 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/dusclops/8.png differ diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/0.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/0.png new file mode 100644 index 000000000..9fa5da9c1 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/0.png differ diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/1.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/1.png new file mode 100644 index 000000000..b328fc844 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/1.png differ diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/2.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/2.png new file mode 100644 index 000000000..e4935a1cd Binary files /dev/null and b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/2.png differ diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/3.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/3.png new file mode 100644 index 000000000..3ea74a6ea Binary files /dev/null and b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/3.png differ diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/4.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/4.png new file mode 100644 index 000000000..ab2dbf891 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/4.png differ diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/5.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/5.png new file mode 100644 index 000000000..a16efcb6e Binary files /dev/null and b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/5.png differ diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/6.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/6.png new file mode 100644 index 000000000..38fec7b46 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/6.png differ diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/7.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/7.png new file mode 100644 index 000000000..a5a8c034d Binary files /dev/null and b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/7.png differ diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/8.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/8.png new file mode 100644 index 000000000..727908cf9 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/8.png differ diff --git a/graphics/event_objects/pics/pokemon/groudon_front/0.png b/graphics/event_objects/pics/pokemon/groudon_front/0.png new file mode 100644 index 000000000..05cb16433 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/groudon_front/0.png differ diff --git a/graphics/event_objects/pics/pokemon/groudon_front/1.png b/graphics/event_objects/pics/pokemon/groudon_front/1.png new file mode 100644 index 000000000..fcafab2a0 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/groudon_front/1.png differ diff --git a/graphics/event_objects/pics/pokemon/groudon_side/0.png b/graphics/event_objects/pics/pokemon/groudon_side/0.png new file mode 100644 index 000000000..76bd8a11c Binary files /dev/null and b/graphics/event_objects/pics/pokemon/groudon_side/0.png differ diff --git a/graphics/event_objects/pics/pokemon/groudon_side/1.png b/graphics/event_objects/pics/pokemon/groudon_side/1.png new file mode 100644 index 000000000..2ecf09822 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/groudon_side/1.png differ diff --git a/graphics/event_objects/pics/pokemon/ho_oh/0.png b/graphics/event_objects/pics/pokemon/ho_oh/0.png new file mode 100644 index 000000000..0d8ef71e1 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/ho_oh/0.png differ diff --git a/graphics/event_objects/pics/pokemon/ho_oh/1.png b/graphics/event_objects/pics/pokemon/ho_oh/1.png new file mode 100644 index 000000000..03d3b0874 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/ho_oh/1.png differ diff --git a/graphics/event_objects/pics/pokemon/kecleon/0.png b/graphics/event_objects/pics/pokemon/kecleon/0.png new file mode 100644 index 000000000..691797af0 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/kecleon/0.png differ diff --git a/graphics/event_objects/pics/pokemon/kecleon/1.png b/graphics/event_objects/pics/pokemon/kecleon/1.png new file mode 100644 index 000000000..0d82cc66d Binary files /dev/null and b/graphics/event_objects/pics/pokemon/kecleon/1.png differ diff --git a/graphics/event_objects/pics/pokemon/kecleon/2.png b/graphics/event_objects/pics/pokemon/kecleon/2.png new file mode 100644 index 000000000..2713ce057 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/kecleon/2.png differ diff --git a/graphics/event_objects/pics/pokemon/kirlia/0.png b/graphics/event_objects/pics/pokemon/kirlia/0.png new file mode 100644 index 000000000..e069df489 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/kirlia/0.png differ diff --git a/graphics/event_objects/pics/pokemon/kirlia/1.png b/graphics/event_objects/pics/pokemon/kirlia/1.png new file mode 100644 index 000000000..d158bd335 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/kirlia/1.png differ diff --git a/graphics/event_objects/pics/pokemon/kirlia/2.png b/graphics/event_objects/pics/pokemon/kirlia/2.png new file mode 100644 index 000000000..388077d93 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/kirlia/2.png differ diff --git a/graphics/event_objects/pics/pokemon/kirlia/3.png b/graphics/event_objects/pics/pokemon/kirlia/3.png new file mode 100644 index 000000000..4887b1653 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/kirlia/3.png differ diff --git a/graphics/event_objects/pics/pokemon/kirlia/4.png b/graphics/event_objects/pics/pokemon/kirlia/4.png new file mode 100644 index 000000000..e734a8f60 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/kirlia/4.png differ diff --git a/graphics/event_objects/pics/pokemon/kirlia/5.png b/graphics/event_objects/pics/pokemon/kirlia/5.png new file mode 100644 index 000000000..e2e36561b Binary files /dev/null and b/graphics/event_objects/pics/pokemon/kirlia/5.png differ diff --git a/graphics/event_objects/pics/pokemon/kirlia/6.png b/graphics/event_objects/pics/pokemon/kirlia/6.png new file mode 100644 index 000000000..0731cb711 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/kirlia/6.png differ diff --git a/graphics/event_objects/pics/pokemon/kirlia/7.png b/graphics/event_objects/pics/pokemon/kirlia/7.png new file mode 100644 index 000000000..c4f33879c Binary files /dev/null and b/graphics/event_objects/pics/pokemon/kirlia/7.png differ diff --git a/graphics/event_objects/pics/pokemon/kirlia/8.png b/graphics/event_objects/pics/pokemon/kirlia/8.png new file mode 100644 index 000000000..87fe530c5 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/kirlia/8.png differ diff --git a/graphics/event_objects/pics/pokemon/kyogre_front/0.png b/graphics/event_objects/pics/pokemon/kyogre_front/0.png new file mode 100644 index 000000000..2cfea8e01 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/kyogre_front/0.png differ diff --git a/graphics/event_objects/pics/pokemon/kyogre_front/1.png b/graphics/event_objects/pics/pokemon/kyogre_front/1.png new file mode 100644 index 000000000..8f2dcd7af Binary files /dev/null and b/graphics/event_objects/pics/pokemon/kyogre_front/1.png differ diff --git a/graphics/event_objects/pics/pokemon/kyogre_side/0.png b/graphics/event_objects/pics/pokemon/kyogre_side/0.png new file mode 100644 index 000000000..f60199f77 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/kyogre_side/0.png differ diff --git a/graphics/event_objects/pics/pokemon/kyogre_side/1.png b/graphics/event_objects/pics/pokemon/kyogre_side/1.png new file mode 100644 index 000000000..00d53d563 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/kyogre_side/1.png differ diff --git a/graphics/event_objects/pics/pokemon/latias_latios/0.png b/graphics/event_objects/pics/pokemon/latias_latios/0.png new file mode 100644 index 000000000..5338fc55a Binary files /dev/null and b/graphics/event_objects/pics/pokemon/latias_latios/0.png differ diff --git a/graphics/event_objects/pics/pokemon/latias_latios/1.png b/graphics/event_objects/pics/pokemon/latias_latios/1.png new file mode 100644 index 000000000..57cde71a9 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/latias_latios/1.png differ diff --git a/graphics/event_objects/pics/pokemon/latias_latios/2.png b/graphics/event_objects/pics/pokemon/latias_latios/2.png new file mode 100644 index 000000000..c8812bec0 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/latias_latios/2.png differ diff --git a/graphics/event_objects/pics/pokemon/lugia/0.png b/graphics/event_objects/pics/pokemon/lugia/0.png new file mode 100644 index 000000000..4e50209fe Binary files /dev/null and b/graphics/event_objects/pics/pokemon/lugia/0.png differ diff --git a/graphics/event_objects/pics/pokemon/lugia/1.png b/graphics/event_objects/pics/pokemon/lugia/1.png new file mode 100644 index 000000000..6f36abc91 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/lugia/1.png differ diff --git a/graphics/event_objects/pics/pokemon/mew/0.png b/graphics/event_objects/pics/pokemon/mew/0.png new file mode 100644 index 000000000..55955453c Binary files /dev/null and b/graphics/event_objects/pics/pokemon/mew/0.png differ diff --git a/graphics/event_objects/pics/pokemon/mew/1.png b/graphics/event_objects/pics/pokemon/mew/1.png new file mode 100644 index 000000000..3c6062bd7 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/mew/1.png differ diff --git a/graphics/event_objects/pics/pokemon/mew/2.png b/graphics/event_objects/pics/pokemon/mew/2.png new file mode 100644 index 000000000..1c3c6e52d Binary files /dev/null and b/graphics/event_objects/pics/pokemon/mew/2.png differ diff --git a/graphics/event_objects/pics/pokemon/mew/3.png b/graphics/event_objects/pics/pokemon/mew/3.png new file mode 100644 index 000000000..be04a769b Binary files /dev/null and b/graphics/event_objects/pics/pokemon/mew/3.png differ diff --git a/graphics/event_objects/pics/pokemon/mew/4.png b/graphics/event_objects/pics/pokemon/mew/4.png new file mode 100644 index 000000000..3ddbfa03a Binary files /dev/null and b/graphics/event_objects/pics/pokemon/mew/4.png differ diff --git a/graphics/event_objects/pics/pokemon/mew/5.png b/graphics/event_objects/pics/pokemon/mew/5.png new file mode 100644 index 000000000..44b7bd56b Binary files /dev/null and b/graphics/event_objects/pics/pokemon/mew/5.png differ diff --git a/graphics/event_objects/pics/pokemon/mew/6.png b/graphics/event_objects/pics/pokemon/mew/6.png new file mode 100644 index 000000000..c6abc021a Binary files /dev/null and b/graphics/event_objects/pics/pokemon/mew/6.png differ diff --git a/graphics/event_objects/pics/pokemon/mew/7.png b/graphics/event_objects/pics/pokemon/mew/7.png new file mode 100644 index 000000000..f22f4072a Binary files /dev/null and b/graphics/event_objects/pics/pokemon/mew/7.png differ diff --git a/graphics/event_objects/pics/pokemon/mew/8.png b/graphics/event_objects/pics/pokemon/mew/8.png new file mode 100644 index 000000000..c603d7ced Binary files /dev/null and b/graphics/event_objects/pics/pokemon/mew/8.png differ diff --git a/graphics/event_objects/pics/pokemon/pikachu/0.png b/graphics/event_objects/pics/pokemon/pikachu/0.png new file mode 100644 index 000000000..1a08b623c Binary files /dev/null and b/graphics/event_objects/pics/pokemon/pikachu/0.png differ diff --git a/graphics/event_objects/pics/pokemon/pikachu/1.png b/graphics/event_objects/pics/pokemon/pikachu/1.png new file mode 100644 index 000000000..f1640a1e5 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/pikachu/1.png differ diff --git a/graphics/event_objects/pics/pokemon/pikachu/2.png b/graphics/event_objects/pics/pokemon/pikachu/2.png new file mode 100644 index 000000000..68836768b Binary files /dev/null and b/graphics/event_objects/pics/pokemon/pikachu/2.png differ diff --git a/graphics/event_objects/pics/pokemon/poochyena/0.png b/graphics/event_objects/pics/pokemon/poochyena/0.png new file mode 100644 index 000000000..1ee042572 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/poochyena/0.png differ diff --git a/graphics/event_objects/pics/pokemon/poochyena/1.png b/graphics/event_objects/pics/pokemon/poochyena/1.png new file mode 100644 index 000000000..3dbdb383c Binary files /dev/null and b/graphics/event_objects/pics/pokemon/poochyena/1.png differ diff --git a/graphics/event_objects/pics/pokemon/poochyena/2.png b/graphics/event_objects/pics/pokemon/poochyena/2.png new file mode 100644 index 000000000..bda367b94 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/poochyena/2.png differ diff --git a/graphics/event_objects/pics/pokemon/poochyena/3.png b/graphics/event_objects/pics/pokemon/poochyena/3.png new file mode 100644 index 000000000..8b7d8f803 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/poochyena/3.png differ diff --git a/graphics/event_objects/pics/pokemon/poochyena/4.png b/graphics/event_objects/pics/pokemon/poochyena/4.png new file mode 100644 index 000000000..47012ad54 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/poochyena/4.png differ diff --git a/graphics/event_objects/pics/pokemon/poochyena/5.png b/graphics/event_objects/pics/pokemon/poochyena/5.png new file mode 100644 index 000000000..e256e8a07 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/poochyena/5.png differ diff --git a/graphics/event_objects/pics/pokemon/poochyena/6.png b/graphics/event_objects/pics/pokemon/poochyena/6.png new file mode 100644 index 000000000..173b9fe5e Binary files /dev/null and b/graphics/event_objects/pics/pokemon/poochyena/6.png differ diff --git a/graphics/event_objects/pics/pokemon/poochyena/7.png b/graphics/event_objects/pics/pokemon/poochyena/7.png new file mode 100644 index 000000000..8fdc28209 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/poochyena/7.png differ diff --git a/graphics/event_objects/pics/pokemon/poochyena/8.png b/graphics/event_objects/pics/pokemon/poochyena/8.png new file mode 100644 index 000000000..911619f6a Binary files /dev/null and b/graphics/event_objects/pics/pokemon/poochyena/8.png differ diff --git a/graphics/event_objects/pics/pokemon/rayquaza/0.png b/graphics/event_objects/pics/pokemon/rayquaza/0.png new file mode 100644 index 000000000..9f5db910f Binary files /dev/null and b/graphics/event_objects/pics/pokemon/rayquaza/0.png differ diff --git a/graphics/event_objects/pics/pokemon/rayquaza/1.png b/graphics/event_objects/pics/pokemon/rayquaza/1.png new file mode 100644 index 000000000..e770b6549 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/rayquaza/1.png differ diff --git a/graphics/event_objects/pics/pokemon/rayquaza/2.png b/graphics/event_objects/pics/pokemon/rayquaza/2.png new file mode 100644 index 000000000..e72c17b07 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/rayquaza/2.png differ diff --git a/graphics/event_objects/pics/pokemon/rayquaza/3.png b/graphics/event_objects/pics/pokemon/rayquaza/3.png new file mode 100644 index 000000000..edcfe94ba Binary files /dev/null and b/graphics/event_objects/pics/pokemon/rayquaza/3.png differ diff --git a/graphics/event_objects/pics/pokemon/rayquaza/4.png b/graphics/event_objects/pics/pokemon/rayquaza/4.png new file mode 100644 index 000000000..d34cb5d58 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/rayquaza/4.png differ diff --git a/graphics/event_objects/pics/pokemon/rayquaza_still.png b/graphics/event_objects/pics/pokemon/rayquaza_still.png new file mode 100644 index 000000000..1c18b2ffc Binary files /dev/null and b/graphics/event_objects/pics/pokemon/rayquaza_still.png differ diff --git a/graphics/event_objects/pics/pokemon/regi.png b/graphics/event_objects/pics/pokemon/regi.png new file mode 100644 index 000000000..8425040dd Binary files /dev/null and b/graphics/event_objects/pics/pokemon/regi.png differ diff --git a/graphics/event_objects/pics/pokemon/skitty/0.png b/graphics/event_objects/pics/pokemon/skitty/0.png new file mode 100644 index 000000000..105611a10 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/skitty/0.png differ diff --git a/graphics/event_objects/pics/pokemon/skitty/1.png b/graphics/event_objects/pics/pokemon/skitty/1.png new file mode 100644 index 000000000..66a9640e0 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/skitty/1.png differ diff --git a/graphics/event_objects/pics/pokemon/skitty/2.png b/graphics/event_objects/pics/pokemon/skitty/2.png new file mode 100644 index 000000000..2ab6cabfa Binary files /dev/null and b/graphics/event_objects/pics/pokemon/skitty/2.png differ diff --git a/graphics/event_objects/pics/pokemon/sudowoodo/0.png b/graphics/event_objects/pics/pokemon/sudowoodo/0.png new file mode 100644 index 000000000..20584b1a6 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/sudowoodo/0.png differ diff --git a/graphics/event_objects/pics/pokemon/sudowoodo/1.png b/graphics/event_objects/pics/pokemon/sudowoodo/1.png new file mode 100644 index 000000000..1d865c43a Binary files /dev/null and b/graphics/event_objects/pics/pokemon/sudowoodo/1.png differ diff --git a/graphics/event_objects/pics/pokemon/sudowoodo/2.png b/graphics/event_objects/pics/pokemon/sudowoodo/2.png new file mode 100644 index 000000000..319220edf Binary files /dev/null and b/graphics/event_objects/pics/pokemon/sudowoodo/2.png differ diff --git a/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/0.png b/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/0.png new file mode 100644 index 000000000..088986e80 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/0.png differ diff --git a/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/1.png b/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/1.png new file mode 100644 index 000000000..79d269e55 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/1.png differ diff --git a/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/2.png b/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/2.png new file mode 100644 index 000000000..2918caf22 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/2.png differ diff --git a/graphics/event_objects/pics/pokemon/vigoroth_facing_away/0.png b/graphics/event_objects/pics/pokemon/vigoroth_facing_away/0.png new file mode 100644 index 000000000..30f989ca5 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/vigoroth_facing_away/0.png differ diff --git a/graphics/event_objects/pics/pokemon/vigoroth_facing_away/1.png b/graphics/event_objects/pics/pokemon/vigoroth_facing_away/1.png new file mode 100644 index 000000000..f0edeb876 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/vigoroth_facing_away/1.png differ diff --git a/graphics/event_objects/pics/pokemon/wingull/0.png b/graphics/event_objects/pics/pokemon/wingull/0.png new file mode 100644 index 000000000..2e83a4b4e Binary files /dev/null and b/graphics/event_objects/pics/pokemon/wingull/0.png differ diff --git a/graphics/event_objects/pics/pokemon/wingull/1.png b/graphics/event_objects/pics/pokemon/wingull/1.png new file mode 100644 index 000000000..22dadf0ae Binary files /dev/null and b/graphics/event_objects/pics/pokemon/wingull/1.png differ diff --git a/graphics/event_objects/pics/pokemon/wingull/2.png b/graphics/event_objects/pics/pokemon/wingull/2.png new file mode 100644 index 000000000..9758aff0a Binary files /dev/null and b/graphics/event_objects/pics/pokemon/wingull/2.png differ diff --git a/graphics/event_objects/pics/pokemon/wingull/3.png b/graphics/event_objects/pics/pokemon/wingull/3.png new file mode 100644 index 000000000..c3404d20d Binary files /dev/null and b/graphics/event_objects/pics/pokemon/wingull/3.png differ diff --git a/graphics/event_objects/pics/pokemon/wingull/4.png b/graphics/event_objects/pics/pokemon/wingull/4.png new file mode 100644 index 000000000..11052fe99 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/wingull/4.png differ diff --git a/graphics/event_objects/pics/pokemon/wingull/5.png b/graphics/event_objects/pics/pokemon/wingull/5.png new file mode 100644 index 000000000..af5505e31 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/wingull/5.png differ diff --git a/graphics/event_objects/pics/pokemon/zigzagoon/0.png b/graphics/event_objects/pics/pokemon/zigzagoon/0.png new file mode 100644 index 000000000..0601efade Binary files /dev/null and b/graphics/event_objects/pics/pokemon/zigzagoon/0.png differ diff --git a/graphics/event_objects/pics/pokemon/zigzagoon/1.png b/graphics/event_objects/pics/pokemon/zigzagoon/1.png new file mode 100644 index 000000000..c7e067a6d Binary files /dev/null and b/graphics/event_objects/pics/pokemon/zigzagoon/1.png differ diff --git a/graphics/event_objects/pics/pokemon/zigzagoon/2.png b/graphics/event_objects/pics/pokemon/zigzagoon/2.png new file mode 100644 index 000000000..d44a71b8d Binary files /dev/null and b/graphics/event_objects/pics/pokemon/zigzagoon/2.png differ diff --git a/graphics/map_objects/palettes/field_effect_object_palette_00.pal b/graphics/map_objects/palettes/field_effect_object_palette_00.pal deleted file mode 100644 index bbc9c778b..000000000 --- a/graphics/map_objects/palettes/field_effect_object_palette_00.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -98 172 238 -246 230 197 -238 213 180 -222 180 148 -255 255 255 -222 230 238 -189 205 230 -156 180 222 -98 156 180 -255 189 230 -0 0 0 -238 230 164 -222 205 131 -213 180 106 -205 156 82 -0 0 0 diff --git a/graphics/map_objects/palettes/field_effect_object_palette_01.pal b/graphics/map_objects/palettes/field_effect_object_palette_01.pal deleted file mode 100644 index 044e1c987..000000000 --- a/graphics/map_objects/palettes/field_effect_object_palette_01.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 189 238 -180 255 131 -131 197 98 -57 139 49 -74 90 8 -49 65 0 -98 172 238 -98 172 197 -139 205 246 -148 230 255 -148 131 98 -180 172 148 -164 213 197 -115 197 164 -65 180 131 -24 164 106 diff --git a/graphics/map_objects/palettes/field_effect_object_palette_02.pal b/graphics/map_objects/palettes/field_effect_object_palette_02.pal deleted file mode 100644 index e3a76c035..000000000 --- a/graphics/map_objects/palettes/field_effect_object_palette_02.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -255 255 255 -98 98 98 -213 213 139 -172 172 90 -139 139 65 -230 246 205 -189 238 180 -131 222 180 -98 172 139 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/map_objects/palettes/field_effect_object_palette_03.pal b/graphics/map_objects/palettes/field_effect_object_palette_03.pal deleted file mode 100644 index b170eb1f5..000000000 --- a/graphics/map_objects/palettes/field_effect_object_palette_03.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -131 172 74 -255 255 255 -205 246 255 -156 213 255 -74 197 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/graphics/map_objects/palettes/field_effect_object_palette_04.pal b/graphics/map_objects/palettes/field_effect_object_palette_04.pal deleted file mode 100644 index 2dddefa5f..000000000 --- a/graphics/map_objects/palettes/field_effect_object_palette_04.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -255 255 255 -156 180 172 -106 115 115 -57 57 57 -156 24 24 -255 0 0 -255 123 123 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/map_objects/palettes/field_effect_object_palette_05.pal b/graphics/map_objects/palettes/field_effect_object_palette_05.pal deleted file mode 100644 index 468d7212c..000000000 --- a/graphics/map_objects/palettes/field_effect_object_palette_05.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -49 57 74 -172 164 255 -131 123 230 -106 98 172 -82 74 180 -82 74 98 -246 255 255 -115 172 65 -123 189 74 -148 205 90 -98 90 148 -139 156 213 -57 57 106 -148 205 90 -0 255 0 diff --git a/graphics/map_objects/palettes/field_effect_object_palette_06.pal b/graphics/map_objects/palettes/field_effect_object_palette_06.pal deleted file mode 100644 index e4a49a4b9..000000000 --- a/graphics/map_objects/palettes/field_effect_object_palette_06.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -180 255 82 -98 205 8 -41 115 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/map_objects/palettes/field_effect_object_palette_07.pal b/graphics/map_objects/palettes/field_effect_object_palette_07.pal deleted file mode 100644 index 6d9e03c67..000000000 --- a/graphics/map_objects/palettes/field_effect_object_palette_07.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -255 255 255 -213 213 213 -189 189 189 -164 164 164 -131 131 139 -0 0 0 -0 0 0 -0 0 0 -238 213 205 -222 180 164 -189 148 139 -156 115 115 -131 90 90 -98 65 82 -0 0 0 diff --git a/graphics/map_objects/palettes/field_effect_object_palette_08.pal b/graphics/map_objects/palettes/field_effect_object_palette_08.pal deleted file mode 100644 index 4c41030f6..000000000 --- a/graphics/map_objects/palettes/field_effect_object_palette_08.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -24 41 82 -180 255 131 -131 197 98 -57 139 49 -57 82 0 -222 148 115 -106 90 90 -164 98 90 -65 57 49 -255 197 148 -222 106 98 -205 65 82 -164 213 197 -115 197 164 -65 180 131 -24 164 106 diff --git a/graphics/map_objects/palettes/field_effect_object_palette_10.pal b/graphics/map_objects/palettes/field_effect_object_palette_10.pal deleted file mode 100644 index 6190709ed..000000000 --- a/graphics/map_objects/palettes/field_effect_object_palette_10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -98 172 238 -246 8 0 -238 213 180 -222 180 148 -255 255 255 -222 230 238 -189 205 230 -156 180 222 -98 156 180 -148 0 0 -197 197 197 -238 230 164 -222 205 131 -213 180 106 -205 156 82 -0 0 0 diff --git a/graphics/map_objects/palettes/field_object_palette_00.pal b/graphics/map_objects/palettes/field_object_palette_00.pal deleted file mode 100644 index 7bb5bd9ed..000000000 --- a/graphics/map_objects/palettes/field_object_palette_00.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 213 180 -255 197 148 -222 148 115 -123 65 65 -255 164 180 -213 106 123 -139 65 82 -148 197 246 -90 139 189 -16 49 82 -180 164 98 -123 115 65 -57 57 24 -255 255 255 -0 0 0 diff --git a/graphics/map_objects/palettes/field_object_palette_01.pal b/graphics/map_objects/palettes/field_object_palette_01.pal deleted file mode 100644 index 558095bda..000000000 --- a/graphics/map_objects/palettes/field_object_palette_01.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 213 180 -255 197 148 -222 148 115 -123 65 65 -255 213 32 -222 156 16 -106 57 8 -230 82 98 -197 0 49 -98 0 24 -156 98 74 -106 49 49 -49 0 24 -255 255 255 -0 0 0 diff --git a/graphics/map_objects/palettes/field_object_palette_02.pal b/graphics/map_objects/palettes/field_object_palette_02.pal deleted file mode 100644 index b84930395..000000000 --- a/graphics/map_objects/palettes/field_object_palette_02.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 213 180 -255 197 148 -222 148 115 -123 65 65 -205 205 222 -156 156 189 -74 74 123 -115 189 0 -65 123 0 -16 57 0 -205 98 74 -148 57 41 -82 16 0 -255 255 255 -0 0 0 diff --git a/graphics/map_objects/palettes/field_object_palette_03.pal b/graphics/map_objects/palettes/field_object_palette_03.pal deleted file mode 100644 index 6c53450ba..000000000 --- a/graphics/map_objects/palettes/field_object_palette_03.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 213 180 -255 197 148 -222 148 115 -123 65 65 -106 139 172 -57 74 98 -8 16 32 -213 115 164 -164 65 115 -82 32 65 -213 213 213 -139 139 148 -65 65 82 -255 255 255 -0 0 0 diff --git a/graphics/map_objects/palettes/field_object_palette_04.pal b/graphics/map_objects/palettes/field_object_palette_04.pal deleted file mode 100644 index 82c5ff3a1..000000000 --- a/graphics/map_objects/palettes/field_object_palette_04.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -98 172 238 -255 255 255 -255 255 230 -255 230 197 -205 148 148 -255 222 238 -255 197 213 -255 164 180 -205 255 255 -180 230 255 -148 197 246 -213 197 131 -197 180 123 -180 172 123 -255 255 255 -115 131 148 diff --git a/graphics/map_objects/palettes/field_object_palette_05.pal b/graphics/map_objects/palettes/field_object_palette_05.pal deleted file mode 100644 index 72ae3cefb..000000000 --- a/graphics/map_objects/palettes/field_object_palette_05.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -98 172 238 -255 255 255 -255 255 230 -255 230 197 -205 148 148 -255 255 90 -255 238 65 -213 197 57 -255 139 156 -246 115 131 -230 82 98 -213 156 131 -189 131 106 -156 98 74 -255 255 255 -115 131 148 diff --git a/graphics/map_objects/palettes/field_object_palette_06.pal b/graphics/map_objects/palettes/field_object_palette_06.pal deleted file mode 100644 index 168a1329d..000000000 --- a/graphics/map_objects/palettes/field_object_palette_06.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -98 172 238 -255 255 255 -255 255 230 -255 230 197 -205 148 148 -255 255 255 -238 238 246 -205 205 222 -139 189 139 -115 164 115 -115 189 0 -255 156 131 -238 131 106 -205 98 74 -255 255 255 -115 131 148 diff --git a/graphics/map_objects/palettes/field_object_palette_07.pal b/graphics/map_objects/palettes/field_object_palette_07.pal deleted file mode 100644 index 0e604b73c..000000000 --- a/graphics/map_objects/palettes/field_object_palette_07.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -98 172 238 -255 255 255 -255 255 230 -255 230 197 -205 148 148 -156 172 222 -139 156 197 -123 139 172 -255 156 213 -230 131 189 -213 115 164 -189 189 189 -164 164 164 -139 139 148 -255 255 255 -115 131 148 diff --git a/graphics/map_objects/palettes/field_object_palette_08.pal b/graphics/map_objects/palettes/field_object_palette_08.pal deleted file mode 100644 index a83ed903f..000000000 --- a/graphics/map_objects/palettes/field_object_palette_08.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 213 180 -255 197 148 -222 148 115 -123 65 65 -57 74 123 -41 57 98 -24 41 82 -16 32 57 -222 230 238 -115 205 115 -74 148 82 -255 98 90 -197 65 65 -255 255 255 -0 0 0 diff --git a/graphics/map_objects/palettes/field_object_palette_09.pal b/graphics/map_objects/palettes/field_object_palette_09.pal deleted file mode 100644 index 6a6bf4d12..000000000 --- a/graphics/map_objects/palettes/field_object_palette_09.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -148 230 230 -255 238 213 -255 213 213 -238 180 180 -172 156 164 -164 164 180 -106 123 148 -106 123 148 -123 131 131 -238 238 255 -164 246 156 -123 205 123 -255 156 156 -230 123 139 -255 255 255 -106 115 106 diff --git a/graphics/map_objects/palettes/field_object_palette_10.pal b/graphics/map_objects/palettes/field_object_palette_10.pal deleted file mode 100644 index 0cebd6c4d..000000000 --- a/graphics/map_objects/palettes/field_object_palette_10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 diff --git a/graphics/map_objects/palettes/field_object_palette_11.pal b/graphics/map_objects/palettes/field_object_palette_11.pal deleted file mode 100644 index b28799ed8..000000000 --- a/graphics/map_objects/palettes/field_object_palette_11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 222 205 -222 164 148 -205 131 115 -123 90 82 -98 123 156 -74 90 131 -49 65 106 -24 41 82 -131 164 197 -255 197 90 -189 156 90 -255 98 90 -197 65 65 -255 255 255 -0 0 0 diff --git a/graphics/map_objects/palettes/field_object_palette_12.pal b/graphics/map_objects/palettes/field_object_palette_12.pal deleted file mode 100644 index b36c29ab1..000000000 --- a/graphics/map_objects/palettes/field_object_palette_12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -41 41 32 -41 41 41 -90 90 82 -139 139 115 -180 180 164 -213 156 16 -238 197 16 -255 222 98 -0 90 197 -0 131 238 -156 180 205 -213 230 238 -255 255 255 -0 139 0 -0 205 0 diff --git a/graphics/map_objects/palettes/field_object_palette_13.pal b/graphics/map_objects/palettes/field_object_palette_13.pal deleted file mode 100644 index b69e9ac0a..000000000 --- a/graphics/map_objects/palettes/field_object_palette_13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 255 255 -139 139 131 -139 139 139 -189 189 180 -238 238 213 -255 255 255 -255 255 115 -255 255 115 -255 255 197 -98 189 255 -98 230 255 -255 255 255 -255 255 255 -255 255 255 -98 238 98 -98 255 98 diff --git a/graphics/map_objects/palettes/field_object_palette_14.pal b/graphics/map_objects/palettes/field_object_palette_14.pal deleted file mode 100644 index c53a4d815..000000000 --- a/graphics/map_objects/palettes/field_object_palette_14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -131 189 98 -131 189 98 -131 189 98 -131 189 98 -222 230 238 -164 172 197 -106 123 156 -57 74 123 -90 164 255 -90 98 255 -65 65 197 -65 65 123 -49 49 82 -255 255 255 -0 0 0 diff --git a/graphics/map_objects/palettes/field_object_palette_15.pal b/graphics/map_objects/palettes/field_object_palette_15.pal deleted file mode 100644 index 0026c6f69..000000000 --- a/graphics/map_objects/palettes/field_object_palette_15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -238 238 238 -205 205 189 -172 172 139 -115 106 74 -164 164 156 -139 139 131 -115 123 115 -49 49 57 -213 213 230 -230 189 148 -180 123 90 -213 65 65 -139 74 82 -255 255 255 -0 0 0 diff --git a/graphics/map_objects/palettes/field_object_palette_16.pal b/graphics/map_objects/palettes/field_object_palette_16.pal deleted file mode 100644 index ec3c07f20..000000000 --- a/graphics/map_objects/palettes/field_object_palette_16.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 222 205 -238 180 164 -205 131 115 -123 90 82 -148 139 156 -115 106 123 -57 65 82 -41 41 57 -222 230 238 -255 197 90 -172 123 90 -197 65 65 -139 49 65 -255 255 255 -0 0 0 diff --git a/graphics/map_objects/palettes/field_object_palette_17.pal b/graphics/map_objects/palettes/field_object_palette_17.pal deleted file mode 100644 index 2833b2613..000000000 --- a/graphics/map_objects/palettes/field_object_palette_17.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 222 205 -222 164 148 -205 131 115 -123 90 82 -98 98 115 -41 57 65 -164 106 82 -74 49 57 -205 205 222 -106 213 65 -65 172 32 -255 98 90 -197 65 65 -255 255 255 -0 0 0 diff --git a/graphics/map_objects/palettes/field_object_palette_18.pal b/graphics/map_objects/palettes/field_object_palette_18.pal deleted file mode 100644 index 78b1c89b6..000000000 --- a/graphics/map_objects/palettes/field_object_palette_18.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -148 230 230 -255 238 213 -255 213 213 -238 180 180 -172 156 164 -131 131 180 -74 90 131 -197 139 148 -106 82 123 -238 238 255 -164 246 156 -123 205 123 -255 156 156 -230 123 139 -255 255 255 -106 115 106 diff --git a/graphics/map_objects/palettes/field_object_palette_19.pal b/graphics/map_objects/palettes/field_object_palette_19.pal deleted file mode 100644 index 53de0c383..000000000 --- a/graphics/map_objects/palettes/field_object_palette_19.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -131 131 148 -115 115 131 -98 98 131 -255 255 255 -255 0 255 -57 57 49 -65 74 106 -41 49 90 -222 222 238 -189 189 213 -156 156 172 -189 148 139 -156 115 115 -98 98 106 -0 0 0 diff --git a/graphics/map_objects/palettes/field_object_palette_20.pal b/graphics/map_objects/palettes/field_object_palette_20.pal deleted file mode 100644 index 64985f6da..000000000 --- a/graphics/map_objects/palettes/field_object_palette_20.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -255 255 255 -164 222 222 -98 139 139 -139 180 180 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -139 205 246 -98 172 238 -255 255 148 -238 213 82 -213 172 16 -180 106 0 -139 65 0 diff --git a/graphics/map_objects/palettes/field_object_palette_21.pal b/graphics/map_objects/palettes/field_object_palette_21.pal deleted file mode 100644 index 5e68e105d..000000000 --- a/graphics/map_objects/palettes/field_object_palette_21.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 123 197 -238 246 255 -222 230 238 -189 205 230 -156 164 189 -139 139 156 -98 98 123 -65 74 106 -197 98 98 -172 65 106 -0 0 0 -197 148 0 -246 213 24 -0 0 0 -0 0 0 -74 106 139 diff --git a/graphics/map_objects/palettes/field_object_palette_22.pal b/graphics/map_objects/palettes/field_object_palette_22.pal deleted file mode 100644 index 21fa9999d..000000000 --- a/graphics/map_objects/palettes/field_object_palette_22.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -213 213 213 -197 197 197 -156 156 156 -82 82 82 -164 164 164 -74 74 74 -16 16 16 -164 164 164 -115 115 115 -57 57 57 -213 213 213 -131 131 131 -65 65 65 -255 255 255 -0 0 0 diff --git a/graphics/map_objects/palettes/field_object_palette_23.pal b/graphics/map_objects/palettes/field_object_palette_23.pal deleted file mode 100644 index 73b0b1d41..000000000 --- a/graphics/map_objects/palettes/field_object_palette_23.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -213 213 246 -197 197 230 -156 156 189 -82 82 115 -164 164 197 -74 74 106 -16 16 49 -164 164 197 -115 115 148 -57 57 90 -213 213 246 -131 131 164 -65 65 98 -255 255 255 -0 0 32 diff --git a/graphics/map_objects/palettes/field_object_palette_24.pal b/graphics/map_objects/palettes/field_object_palette_24.pal deleted file mode 100644 index d710b6830..000000000 --- a/graphics/map_objects/palettes/field_object_palette_24.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -213 213 222 -197 197 197 -156 156 156 -82 82 82 -164 164 164 -131 131 131 -57 57 57 -131 131 131 -82 82 82 -41 41 41 -106 106 106 -74 74 74 -24 24 24 -255 255 255 -0 0 0 diff --git a/graphics/map_objects/palettes/field_object_palette_25.pal b/graphics/map_objects/palettes/field_object_palette_25.pal deleted file mode 100644 index f48038d41..000000000 --- a/graphics/map_objects/palettes/field_object_palette_25.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -213 213 255 -197 197 230 -156 156 189 -82 82 115 -164 164 197 -131 131 164 -57 57 90 -131 131 164 -82 82 115 -41 41 74 -106 106 139 -74 74 106 -24 24 57 -255 255 255 -0 0 32 diff --git a/graphics/map_objects/palettes/field_object_palette_26.pal b/graphics/map_objects/palettes/field_object_palette_26.pal deleted file mode 100644 index fe4c1c112..000000000 --- a/graphics/map_objects/palettes/field_object_palette_26.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 123 197 -255 255 255 -222 230 238 -189 205 230 -156 164 189 -139 139 156 -98 98 123 -65 74 106 -197 98 98 -172 65 106 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -74 180 230 diff --git a/graphics/map_objects/palettes/field_object_palette_27.pal b/graphics/map_objects/palettes/field_object_palette_27.pal deleted file mode 100644 index 5ce2f4728..000000000 --- a/graphics/map_objects/palettes/field_object_palette_27.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 222 205 -222 164 148 -205 131 115 -123 90 82 -148 139 156 -115 106 123 -57 65 82 -41 41 57 -222 230 238 -255 197 90 -172 123 90 -197 65 65 -139 49 65 -255 255 255 -0 0 0 diff --git a/graphics/map_objects/palettes/field_object_palette_28.pal b/graphics/map_objects/palettes/field_object_palette_28.pal deleted file mode 100644 index eb9930c05..000000000 --- a/graphics/map_objects/palettes/field_object_palette_28.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 213 197 -255 197 148 -222 148 115 -172 106 90 -255 106 74 -197 57 57 -131 65 65 -115 164 197 -57 57 123 -255 222 90 -189 156 57 -213 213 230 -180 180 213 -255 255 255 -0 0 0 diff --git a/graphics/map_objects/palettes/field_object_palette_29.pal b/graphics/map_objects/palettes/field_object_palette_29.pal deleted file mode 100644 index a69caf9df..000000000 --- a/graphics/map_objects/palettes/field_object_palette_29.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -246 139 115 -205 98 74 -180 82 57 -106 57 0 -123 205 197 -82 131 123 -32 65 57 -197 139 238 -148 82 172 -0 0 0 -0 0 0 -0 0 0 -74 74 74 -255 255 255 -0 0 0 diff --git a/graphics/map_objects/palettes/field_object_palette_30.pal b/graphics/map_objects/palettes/field_object_palette_30.pal deleted file mode 100644 index d90c4cb38..000000000 --- a/graphics/map_objects/palettes/field_object_palette_30.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -180 180 180 -148 148 148 -90 90 98 -57 57 74 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -222 222 222 -0 0 0 diff --git a/graphics/map_objects/palettes/field_object_palette_31.pal b/graphics/map_objects/palettes/field_object_palette_31.pal deleted file mode 100644 index c62e8ce06..000000000 --- a/graphics/map_objects/palettes/field_object_palette_31.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 213 180 -246 189 148 -222 148 115 -123 65 65 -255 222 74 -213 172 32 -131 98 0 -164 139 238 -106 82 189 -65 57 98 -238 115 65 -172 65 57 -74 49 49 -255 255 255 -0 0 0 diff --git a/graphics/map_objects/palettes/field_object_palette_32.pal b/graphics/map_objects/palettes/field_object_palette_32.pal deleted file mode 100644 index e245ba013..000000000 --- a/graphics/map_objects/palettes/field_object_palette_32.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 213 180 -246 189 148 -222 148 115 -123 65 65 -255 164 180 -213 106 123 -139 65 82 -148 197 238 -98 131 205 -57 57 74 -197 197 213 -139 139 148 -74 74 90 -255 255 255 -0 0 0 diff --git a/graphics/map_objects/palettes/field_object_palette_33.pal b/graphics/map_objects/palettes/field_object_palette_33.pal deleted file mode 100644 index e7717d74e..000000000 --- a/graphics/map_objects/palettes/field_object_palette_33.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 213 180 -255 197 148 -222 148 115 -123 65 65 -57 74 123 -41 57 98 -24 41 82 -16 32 57 -222 230 238 -255 197 90 -189 156 90 -255 98 90 -197 65 65 -255 255 255 -0 0 0 diff --git a/graphics/map_objects/palettes/field_object_palette_34.pal b/graphics/map_objects/palettes/field_object_palette_34.pal deleted file mode 100644 index e106ce693..000000000 --- a/graphics/map_objects/palettes/field_object_palette_34.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 222 205 -222 164 148 -205 131 115 -123 90 82 -98 98 115 -41 57 65 -164 106 82 -74 49 57 -205 205 222 -255 197 90 -189 156 90 -255 98 90 -197 65 65 -255 255 255 -0 0 0 diff --git a/graphics/map_objects/palettes/unused_palette.pal b/graphics/map_objects/palettes/unused_palette.pal deleted file mode 100644 index aeb04ccf8..000000000 --- a/graphics/map_objects/palettes/unused_palette.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 255 255 -255 197 213 -238 164 180 -156 123 148 -131 131 180 -74 90 131 -197 139 148 -106 82 123 -238 238 255 -255 230 156 -222 189 156 -255 131 156 -230 98 131 -255 255 255 -32 32 65 diff --git a/graphics/map_objects/pics/berry_trees/aguav/0.png b/graphics/map_objects/pics/berry_trees/aguav/0.png deleted file mode 100644 index 0463d51db..000000000 Binary files a/graphics/map_objects/pics/berry_trees/aguav/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/aguav/1.png b/graphics/map_objects/pics/berry_trees/aguav/1.png deleted file mode 100644 index a5f4b8bee..000000000 Binary files a/graphics/map_objects/pics/berry_trees/aguav/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/aguav/2.png b/graphics/map_objects/pics/berry_trees/aguav/2.png deleted file mode 100644 index 7af57fd97..000000000 Binary files a/graphics/map_objects/pics/berry_trees/aguav/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/aguav/3.png b/graphics/map_objects/pics/berry_trees/aguav/3.png deleted file mode 100644 index 0fdd3f994..000000000 Binary files a/graphics/map_objects/pics/berry_trees/aguav/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/aguav/4.png b/graphics/map_objects/pics/berry_trees/aguav/4.png deleted file mode 100644 index f3fc70076..000000000 Binary files a/graphics/map_objects/pics/berry_trees/aguav/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/aguav/5.png b/graphics/map_objects/pics/berry_trees/aguav/5.png deleted file mode 100644 index b437940bf..000000000 Binary files a/graphics/map_objects/pics/berry_trees/aguav/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/aspear/0.png b/graphics/map_objects/pics/berry_trees/aspear/0.png deleted file mode 100644 index 933957413..000000000 Binary files a/graphics/map_objects/pics/berry_trees/aspear/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/aspear/1.png b/graphics/map_objects/pics/berry_trees/aspear/1.png deleted file mode 100644 index ee750e7f3..000000000 Binary files a/graphics/map_objects/pics/berry_trees/aspear/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/aspear/2.png b/graphics/map_objects/pics/berry_trees/aspear/2.png deleted file mode 100644 index e3a4e47bb..000000000 Binary files a/graphics/map_objects/pics/berry_trees/aspear/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/aspear/3.png b/graphics/map_objects/pics/berry_trees/aspear/3.png deleted file mode 100644 index df16ae330..000000000 Binary files a/graphics/map_objects/pics/berry_trees/aspear/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/aspear/4.png b/graphics/map_objects/pics/berry_trees/aspear/4.png deleted file mode 100644 index 8d9bd38fb..000000000 Binary files a/graphics/map_objects/pics/berry_trees/aspear/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/aspear/5.png b/graphics/map_objects/pics/berry_trees/aspear/5.png deleted file mode 100644 index 495119480..000000000 Binary files a/graphics/map_objects/pics/berry_trees/aspear/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/cheri/0.png b/graphics/map_objects/pics/berry_trees/cheri/0.png deleted file mode 100644 index 18588dc6c..000000000 Binary files a/graphics/map_objects/pics/berry_trees/cheri/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/cheri/1.png b/graphics/map_objects/pics/berry_trees/cheri/1.png deleted file mode 100644 index e9419d0fe..000000000 Binary files a/graphics/map_objects/pics/berry_trees/cheri/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/cheri/2.png b/graphics/map_objects/pics/berry_trees/cheri/2.png deleted file mode 100644 index 4022a7e5e..000000000 Binary files a/graphics/map_objects/pics/berry_trees/cheri/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/cheri/3.png b/graphics/map_objects/pics/berry_trees/cheri/3.png deleted file mode 100644 index c2572383c..000000000 Binary files a/graphics/map_objects/pics/berry_trees/cheri/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/cheri/4.png b/graphics/map_objects/pics/berry_trees/cheri/4.png deleted file mode 100644 index 462596c51..000000000 Binary files a/graphics/map_objects/pics/berry_trees/cheri/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/cheri/5.png b/graphics/map_objects/pics/berry_trees/cheri/5.png deleted file mode 100644 index 447f1d865..000000000 Binary files a/graphics/map_objects/pics/berry_trees/cheri/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/chesto/0.png b/graphics/map_objects/pics/berry_trees/chesto/0.png deleted file mode 100644 index 516a334c1..000000000 Binary files a/graphics/map_objects/pics/berry_trees/chesto/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/chesto/1.png b/graphics/map_objects/pics/berry_trees/chesto/1.png deleted file mode 100644 index dacc90fb3..000000000 Binary files a/graphics/map_objects/pics/berry_trees/chesto/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/chesto/2.png b/graphics/map_objects/pics/berry_trees/chesto/2.png deleted file mode 100644 index c0a2ec30d..000000000 Binary files a/graphics/map_objects/pics/berry_trees/chesto/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/chesto/3.png b/graphics/map_objects/pics/berry_trees/chesto/3.png deleted file mode 100644 index 328fee834..000000000 Binary files a/graphics/map_objects/pics/berry_trees/chesto/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/chesto/4.png b/graphics/map_objects/pics/berry_trees/chesto/4.png deleted file mode 100644 index d40a393a2..000000000 Binary files a/graphics/map_objects/pics/berry_trees/chesto/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/chesto/5.png b/graphics/map_objects/pics/berry_trees/chesto/5.png deleted file mode 100644 index 3d3d03d64..000000000 Binary files a/graphics/map_objects/pics/berry_trees/chesto/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/cornn/0.png b/graphics/map_objects/pics/berry_trees/cornn/0.png deleted file mode 100644 index 8388b030c..000000000 Binary files a/graphics/map_objects/pics/berry_trees/cornn/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/cornn/1.png b/graphics/map_objects/pics/berry_trees/cornn/1.png deleted file mode 100644 index 23d529796..000000000 Binary files a/graphics/map_objects/pics/berry_trees/cornn/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/cornn/2.png b/graphics/map_objects/pics/berry_trees/cornn/2.png deleted file mode 100644 index 969020d39..000000000 Binary files a/graphics/map_objects/pics/berry_trees/cornn/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/cornn/3.png b/graphics/map_objects/pics/berry_trees/cornn/3.png deleted file mode 100644 index 88d136547..000000000 Binary files a/graphics/map_objects/pics/berry_trees/cornn/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/cornn/4.png b/graphics/map_objects/pics/berry_trees/cornn/4.png deleted file mode 100644 index c50789645..000000000 Binary files a/graphics/map_objects/pics/berry_trees/cornn/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/cornn/5.png b/graphics/map_objects/pics/berry_trees/cornn/5.png deleted file mode 100644 index de7b7f4ad..000000000 Binary files a/graphics/map_objects/pics/berry_trees/cornn/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/dirt_pile.png b/graphics/map_objects/pics/berry_trees/dirt_pile.png deleted file mode 100644 index 3790fd846..000000000 Binary files a/graphics/map_objects/pics/berry_trees/dirt_pile.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/durin/0.png b/graphics/map_objects/pics/berry_trees/durin/0.png deleted file mode 100644 index eefe4ba78..000000000 Binary files a/graphics/map_objects/pics/berry_trees/durin/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/durin/1.png b/graphics/map_objects/pics/berry_trees/durin/1.png deleted file mode 100644 index d5b75b3b3..000000000 Binary files a/graphics/map_objects/pics/berry_trees/durin/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/durin/2.png b/graphics/map_objects/pics/berry_trees/durin/2.png deleted file mode 100644 index cf854194d..000000000 Binary files a/graphics/map_objects/pics/berry_trees/durin/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/durin/3.png b/graphics/map_objects/pics/berry_trees/durin/3.png deleted file mode 100644 index 41425502f..000000000 Binary files a/graphics/map_objects/pics/berry_trees/durin/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/durin/4.png b/graphics/map_objects/pics/berry_trees/durin/4.png deleted file mode 100644 index 66337024c..000000000 Binary files a/graphics/map_objects/pics/berry_trees/durin/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/durin/5.png b/graphics/map_objects/pics/berry_trees/durin/5.png deleted file mode 100644 index 22c672fac..000000000 Binary files a/graphics/map_objects/pics/berry_trees/durin/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/figy/0.png b/graphics/map_objects/pics/berry_trees/figy/0.png deleted file mode 100644 index 0eea8f98c..000000000 Binary files a/graphics/map_objects/pics/berry_trees/figy/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/figy/1.png b/graphics/map_objects/pics/berry_trees/figy/1.png deleted file mode 100644 index 018e0ae3f..000000000 Binary files a/graphics/map_objects/pics/berry_trees/figy/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/figy/2.png b/graphics/map_objects/pics/berry_trees/figy/2.png deleted file mode 100644 index df10bb526..000000000 Binary files a/graphics/map_objects/pics/berry_trees/figy/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/figy/3.png b/graphics/map_objects/pics/berry_trees/figy/3.png deleted file mode 100644 index bf1785f87..000000000 Binary files a/graphics/map_objects/pics/berry_trees/figy/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/figy/4.png b/graphics/map_objects/pics/berry_trees/figy/4.png deleted file mode 100644 index 46d794635..000000000 Binary files a/graphics/map_objects/pics/berry_trees/figy/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/figy/5.png b/graphics/map_objects/pics/berry_trees/figy/5.png deleted file mode 100644 index 945773fda..000000000 Binary files a/graphics/map_objects/pics/berry_trees/figy/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/grepa/0.png b/graphics/map_objects/pics/berry_trees/grepa/0.png deleted file mode 100644 index abd265e0b..000000000 Binary files a/graphics/map_objects/pics/berry_trees/grepa/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/grepa/1.png b/graphics/map_objects/pics/berry_trees/grepa/1.png deleted file mode 100644 index 27e90c9bd..000000000 Binary files a/graphics/map_objects/pics/berry_trees/grepa/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/grepa/2.png b/graphics/map_objects/pics/berry_trees/grepa/2.png deleted file mode 100644 index 22e354eb0..000000000 Binary files a/graphics/map_objects/pics/berry_trees/grepa/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/grepa/3.png b/graphics/map_objects/pics/berry_trees/grepa/3.png deleted file mode 100644 index e23824dd3..000000000 Binary files a/graphics/map_objects/pics/berry_trees/grepa/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/grepa/4.png b/graphics/map_objects/pics/berry_trees/grepa/4.png deleted file mode 100644 index 4b8ad19a0..000000000 Binary files a/graphics/map_objects/pics/berry_trees/grepa/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/grepa/5.png b/graphics/map_objects/pics/berry_trees/grepa/5.png deleted file mode 100644 index 9bf54a3e0..000000000 Binary files a/graphics/map_objects/pics/berry_trees/grepa/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/hondew/0.png b/graphics/map_objects/pics/berry_trees/hondew/0.png deleted file mode 100644 index ab1cffe55..000000000 Binary files a/graphics/map_objects/pics/berry_trees/hondew/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/hondew/1.png b/graphics/map_objects/pics/berry_trees/hondew/1.png deleted file mode 100644 index e24fd5b95..000000000 Binary files a/graphics/map_objects/pics/berry_trees/hondew/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/hondew/2.png b/graphics/map_objects/pics/berry_trees/hondew/2.png deleted file mode 100644 index dc7938958..000000000 Binary files a/graphics/map_objects/pics/berry_trees/hondew/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/hondew/3.png b/graphics/map_objects/pics/berry_trees/hondew/3.png deleted file mode 100644 index 5c9536e87..000000000 Binary files a/graphics/map_objects/pics/berry_trees/hondew/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/hondew/4.png b/graphics/map_objects/pics/berry_trees/hondew/4.png deleted file mode 100644 index 2419d058b..000000000 Binary files a/graphics/map_objects/pics/berry_trees/hondew/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/hondew/5.png b/graphics/map_objects/pics/berry_trees/hondew/5.png deleted file mode 100644 index 76aa9a8e3..000000000 Binary files a/graphics/map_objects/pics/berry_trees/hondew/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/iapapa/0.png b/graphics/map_objects/pics/berry_trees/iapapa/0.png deleted file mode 100644 index 506c8bb4b..000000000 Binary files a/graphics/map_objects/pics/berry_trees/iapapa/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/iapapa/1.png b/graphics/map_objects/pics/berry_trees/iapapa/1.png deleted file mode 100644 index 6eae7f4ba..000000000 Binary files a/graphics/map_objects/pics/berry_trees/iapapa/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/iapapa/2.png b/graphics/map_objects/pics/berry_trees/iapapa/2.png deleted file mode 100644 index d779ca7fb..000000000 Binary files a/graphics/map_objects/pics/berry_trees/iapapa/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/iapapa/3.png b/graphics/map_objects/pics/berry_trees/iapapa/3.png deleted file mode 100644 index 4bbd498e3..000000000 Binary files a/graphics/map_objects/pics/berry_trees/iapapa/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/iapapa/4.png b/graphics/map_objects/pics/berry_trees/iapapa/4.png deleted file mode 100644 index 36cde6254..000000000 Binary files a/graphics/map_objects/pics/berry_trees/iapapa/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/iapapa/5.png b/graphics/map_objects/pics/berry_trees/iapapa/5.png deleted file mode 100644 index b6a39d318..000000000 Binary files a/graphics/map_objects/pics/berry_trees/iapapa/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/kelpsy/0.png b/graphics/map_objects/pics/berry_trees/kelpsy/0.png deleted file mode 100644 index bb794552a..000000000 Binary files a/graphics/map_objects/pics/berry_trees/kelpsy/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/kelpsy/1.png b/graphics/map_objects/pics/berry_trees/kelpsy/1.png deleted file mode 100644 index 90257b261..000000000 Binary files a/graphics/map_objects/pics/berry_trees/kelpsy/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/kelpsy/2.png b/graphics/map_objects/pics/berry_trees/kelpsy/2.png deleted file mode 100644 index 2f3fec1ec..000000000 Binary files a/graphics/map_objects/pics/berry_trees/kelpsy/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/kelpsy/3.png b/graphics/map_objects/pics/berry_trees/kelpsy/3.png deleted file mode 100644 index 2efd0d160..000000000 Binary files a/graphics/map_objects/pics/berry_trees/kelpsy/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/kelpsy/4.png b/graphics/map_objects/pics/berry_trees/kelpsy/4.png deleted file mode 100644 index cf0c47d0a..000000000 Binary files a/graphics/map_objects/pics/berry_trees/kelpsy/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/kelpsy/5.png b/graphics/map_objects/pics/berry_trees/kelpsy/5.png deleted file mode 100644 index e31dfd23f..000000000 Binary files a/graphics/map_objects/pics/berry_trees/kelpsy/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/lansat/0.png b/graphics/map_objects/pics/berry_trees/lansat/0.png deleted file mode 100644 index 56d59b0a7..000000000 Binary files a/graphics/map_objects/pics/berry_trees/lansat/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/lansat/1.png b/graphics/map_objects/pics/berry_trees/lansat/1.png deleted file mode 100644 index 59e7edcfa..000000000 Binary files a/graphics/map_objects/pics/berry_trees/lansat/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/lansat/2.png b/graphics/map_objects/pics/berry_trees/lansat/2.png deleted file mode 100644 index f4d1145ef..000000000 Binary files a/graphics/map_objects/pics/berry_trees/lansat/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/lansat/3.png b/graphics/map_objects/pics/berry_trees/lansat/3.png deleted file mode 100644 index 32ca5e3e9..000000000 Binary files a/graphics/map_objects/pics/berry_trees/lansat/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/lansat/4.png b/graphics/map_objects/pics/berry_trees/lansat/4.png deleted file mode 100644 index bf285b8ee..000000000 Binary files a/graphics/map_objects/pics/berry_trees/lansat/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/lansat/5.png b/graphics/map_objects/pics/berry_trees/lansat/5.png deleted file mode 100644 index 3a8dae404..000000000 Binary files a/graphics/map_objects/pics/berry_trees/lansat/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/leppa/0.png b/graphics/map_objects/pics/berry_trees/leppa/0.png deleted file mode 100644 index cecd61e2d..000000000 Binary files a/graphics/map_objects/pics/berry_trees/leppa/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/leppa/1.png b/graphics/map_objects/pics/berry_trees/leppa/1.png deleted file mode 100644 index f3ce88199..000000000 Binary files a/graphics/map_objects/pics/berry_trees/leppa/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/leppa/2.png b/graphics/map_objects/pics/berry_trees/leppa/2.png deleted file mode 100644 index d00cf5f89..000000000 Binary files a/graphics/map_objects/pics/berry_trees/leppa/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/leppa/3.png b/graphics/map_objects/pics/berry_trees/leppa/3.png deleted file mode 100644 index 8a9ed3c34..000000000 Binary files a/graphics/map_objects/pics/berry_trees/leppa/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/leppa/4.png b/graphics/map_objects/pics/berry_trees/leppa/4.png deleted file mode 100644 index dd4fc6df2..000000000 Binary files a/graphics/map_objects/pics/berry_trees/leppa/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/leppa/5.png b/graphics/map_objects/pics/berry_trees/leppa/5.png deleted file mode 100644 index 056518295..000000000 Binary files a/graphics/map_objects/pics/berry_trees/leppa/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/liechi/0.png b/graphics/map_objects/pics/berry_trees/liechi/0.png deleted file mode 100644 index 51827869f..000000000 Binary files a/graphics/map_objects/pics/berry_trees/liechi/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/liechi/1.png b/graphics/map_objects/pics/berry_trees/liechi/1.png deleted file mode 100644 index 182400260..000000000 Binary files a/graphics/map_objects/pics/berry_trees/liechi/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/liechi/2.png b/graphics/map_objects/pics/berry_trees/liechi/2.png deleted file mode 100644 index a24565623..000000000 Binary files a/graphics/map_objects/pics/berry_trees/liechi/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/liechi/3.png b/graphics/map_objects/pics/berry_trees/liechi/3.png deleted file mode 100644 index b7bde2e7f..000000000 Binary files a/graphics/map_objects/pics/berry_trees/liechi/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/liechi/4.png b/graphics/map_objects/pics/berry_trees/liechi/4.png deleted file mode 100644 index 2ed774c17..000000000 Binary files a/graphics/map_objects/pics/berry_trees/liechi/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/liechi/5.png b/graphics/map_objects/pics/berry_trees/liechi/5.png deleted file mode 100644 index d8fe39b21..000000000 Binary files a/graphics/map_objects/pics/berry_trees/liechi/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/lum/0.png b/graphics/map_objects/pics/berry_trees/lum/0.png deleted file mode 100644 index 4c08ea797..000000000 Binary files a/graphics/map_objects/pics/berry_trees/lum/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/lum/1.png b/graphics/map_objects/pics/berry_trees/lum/1.png deleted file mode 100644 index b2035c555..000000000 Binary files a/graphics/map_objects/pics/berry_trees/lum/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/lum/2.png b/graphics/map_objects/pics/berry_trees/lum/2.png deleted file mode 100644 index b09991fd9..000000000 Binary files a/graphics/map_objects/pics/berry_trees/lum/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/lum/3.png b/graphics/map_objects/pics/berry_trees/lum/3.png deleted file mode 100644 index e32e7b64a..000000000 Binary files a/graphics/map_objects/pics/berry_trees/lum/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/lum/4.png b/graphics/map_objects/pics/berry_trees/lum/4.png deleted file mode 100644 index 1347d66b2..000000000 Binary files a/graphics/map_objects/pics/berry_trees/lum/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/lum/5.png b/graphics/map_objects/pics/berry_trees/lum/5.png deleted file mode 100644 index 1c601d09b..000000000 Binary files a/graphics/map_objects/pics/berry_trees/lum/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/mago/0.png b/graphics/map_objects/pics/berry_trees/mago/0.png deleted file mode 100644 index b58d4aba1..000000000 Binary files a/graphics/map_objects/pics/berry_trees/mago/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/mago/1.png b/graphics/map_objects/pics/berry_trees/mago/1.png deleted file mode 100644 index 0ed2ad6ad..000000000 Binary files a/graphics/map_objects/pics/berry_trees/mago/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/mago/2.png b/graphics/map_objects/pics/berry_trees/mago/2.png deleted file mode 100644 index 221af2806..000000000 Binary files a/graphics/map_objects/pics/berry_trees/mago/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/mago/3.png b/graphics/map_objects/pics/berry_trees/mago/3.png deleted file mode 100644 index 71a8d4294..000000000 Binary files a/graphics/map_objects/pics/berry_trees/mago/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/mago/4.png b/graphics/map_objects/pics/berry_trees/mago/4.png deleted file mode 100644 index ba6bf2d00..000000000 Binary files a/graphics/map_objects/pics/berry_trees/mago/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/mago/5.png b/graphics/map_objects/pics/berry_trees/mago/5.png deleted file mode 100644 index 6271425a3..000000000 Binary files a/graphics/map_objects/pics/berry_trees/mago/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/nomel/0.png b/graphics/map_objects/pics/berry_trees/nomel/0.png deleted file mode 100644 index d504524eb..000000000 Binary files a/graphics/map_objects/pics/berry_trees/nomel/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/nomel/1.png b/graphics/map_objects/pics/berry_trees/nomel/1.png deleted file mode 100644 index 37ff4b082..000000000 Binary files a/graphics/map_objects/pics/berry_trees/nomel/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/nomel/2.png b/graphics/map_objects/pics/berry_trees/nomel/2.png deleted file mode 100644 index 4e5c03cb4..000000000 Binary files a/graphics/map_objects/pics/berry_trees/nomel/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/nomel/3.png b/graphics/map_objects/pics/berry_trees/nomel/3.png deleted file mode 100644 index 7fd46d627..000000000 Binary files a/graphics/map_objects/pics/berry_trees/nomel/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/nomel/4.png b/graphics/map_objects/pics/berry_trees/nomel/4.png deleted file mode 100644 index 913274d81..000000000 Binary files a/graphics/map_objects/pics/berry_trees/nomel/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/nomel/5.png b/graphics/map_objects/pics/berry_trees/nomel/5.png deleted file mode 100644 index 3af9a516a..000000000 Binary files a/graphics/map_objects/pics/berry_trees/nomel/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/oran/0.png b/graphics/map_objects/pics/berry_trees/oran/0.png deleted file mode 100644 index 8770230de..000000000 Binary files a/graphics/map_objects/pics/berry_trees/oran/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/oran/1.png b/graphics/map_objects/pics/berry_trees/oran/1.png deleted file mode 100644 index afeb286a9..000000000 Binary files a/graphics/map_objects/pics/berry_trees/oran/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/oran/2.png b/graphics/map_objects/pics/berry_trees/oran/2.png deleted file mode 100644 index 7b7dc8b1a..000000000 Binary files a/graphics/map_objects/pics/berry_trees/oran/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/oran/3.png b/graphics/map_objects/pics/berry_trees/oran/3.png deleted file mode 100644 index 81857442d..000000000 Binary files a/graphics/map_objects/pics/berry_trees/oran/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/oran/4.png b/graphics/map_objects/pics/berry_trees/oran/4.png deleted file mode 100644 index 58a197d08..000000000 Binary files a/graphics/map_objects/pics/berry_trees/oran/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/oran/5.png b/graphics/map_objects/pics/berry_trees/oran/5.png deleted file mode 100644 index 8878c8550..000000000 Binary files a/graphics/map_objects/pics/berry_trees/oran/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/pamtre/0.png b/graphics/map_objects/pics/berry_trees/pamtre/0.png deleted file mode 100644 index ac56c5370..000000000 Binary files a/graphics/map_objects/pics/berry_trees/pamtre/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/pamtre/1.png b/graphics/map_objects/pics/berry_trees/pamtre/1.png deleted file mode 100644 index 105974668..000000000 Binary files a/graphics/map_objects/pics/berry_trees/pamtre/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/pamtre/2.png b/graphics/map_objects/pics/berry_trees/pamtre/2.png deleted file mode 100644 index 09363b8ba..000000000 Binary files a/graphics/map_objects/pics/berry_trees/pamtre/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/pamtre/3.png b/graphics/map_objects/pics/berry_trees/pamtre/3.png deleted file mode 100644 index 263856830..000000000 Binary files a/graphics/map_objects/pics/berry_trees/pamtre/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/pamtre/4.png b/graphics/map_objects/pics/berry_trees/pamtre/4.png deleted file mode 100644 index 509057976..000000000 Binary files a/graphics/map_objects/pics/berry_trees/pamtre/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/pamtre/5.png b/graphics/map_objects/pics/berry_trees/pamtre/5.png deleted file mode 100644 index 1adf263df..000000000 Binary files a/graphics/map_objects/pics/berry_trees/pamtre/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/pecha/0.png b/graphics/map_objects/pics/berry_trees/pecha/0.png deleted file mode 100644 index 8a69441a4..000000000 Binary files a/graphics/map_objects/pics/berry_trees/pecha/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/pecha/1.png b/graphics/map_objects/pics/berry_trees/pecha/1.png deleted file mode 100644 index 4d1923735..000000000 Binary files a/graphics/map_objects/pics/berry_trees/pecha/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/pecha/2.png b/graphics/map_objects/pics/berry_trees/pecha/2.png deleted file mode 100644 index a93a37738..000000000 Binary files a/graphics/map_objects/pics/berry_trees/pecha/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/pecha/3.png b/graphics/map_objects/pics/berry_trees/pecha/3.png deleted file mode 100644 index 5cd4f5e3c..000000000 Binary files a/graphics/map_objects/pics/berry_trees/pecha/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/pecha/4.png b/graphics/map_objects/pics/berry_trees/pecha/4.png deleted file mode 100644 index 451d74260..000000000 Binary files a/graphics/map_objects/pics/berry_trees/pecha/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/pecha/5.png b/graphics/map_objects/pics/berry_trees/pecha/5.png deleted file mode 100644 index 242a9b53f..000000000 Binary files a/graphics/map_objects/pics/berry_trees/pecha/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/persim/0.png b/graphics/map_objects/pics/berry_trees/persim/0.png deleted file mode 100644 index 1996615ff..000000000 Binary files a/graphics/map_objects/pics/berry_trees/persim/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/persim/1.png b/graphics/map_objects/pics/berry_trees/persim/1.png deleted file mode 100644 index eda84785f..000000000 Binary files a/graphics/map_objects/pics/berry_trees/persim/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/persim/2.png b/graphics/map_objects/pics/berry_trees/persim/2.png deleted file mode 100644 index 6e71b3786..000000000 Binary files a/graphics/map_objects/pics/berry_trees/persim/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/persim/3.png b/graphics/map_objects/pics/berry_trees/persim/3.png deleted file mode 100644 index f45bf0646..000000000 Binary files a/graphics/map_objects/pics/berry_trees/persim/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/persim/4.png b/graphics/map_objects/pics/berry_trees/persim/4.png deleted file mode 100644 index a5aeda410..000000000 Binary files a/graphics/map_objects/pics/berry_trees/persim/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/persim/5.png b/graphics/map_objects/pics/berry_trees/persim/5.png deleted file mode 100644 index 72c69c068..000000000 Binary files a/graphics/map_objects/pics/berry_trees/persim/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/pomeg/0.png b/graphics/map_objects/pics/berry_trees/pomeg/0.png deleted file mode 100644 index c343bc210..000000000 Binary files a/graphics/map_objects/pics/berry_trees/pomeg/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/pomeg/1.png b/graphics/map_objects/pics/berry_trees/pomeg/1.png deleted file mode 100644 index cc1c08f92..000000000 Binary files a/graphics/map_objects/pics/berry_trees/pomeg/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/pomeg/2.png b/graphics/map_objects/pics/berry_trees/pomeg/2.png deleted file mode 100644 index 46d0fb7cc..000000000 Binary files a/graphics/map_objects/pics/berry_trees/pomeg/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/pomeg/3.png b/graphics/map_objects/pics/berry_trees/pomeg/3.png deleted file mode 100644 index d2475b748..000000000 Binary files a/graphics/map_objects/pics/berry_trees/pomeg/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/pomeg/4.png b/graphics/map_objects/pics/berry_trees/pomeg/4.png deleted file mode 100644 index 4f3019213..000000000 Binary files a/graphics/map_objects/pics/berry_trees/pomeg/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/pomeg/5.png b/graphics/map_objects/pics/berry_trees/pomeg/5.png deleted file mode 100644 index f519675ce..000000000 Binary files a/graphics/map_objects/pics/berry_trees/pomeg/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/rabuta/0.png b/graphics/map_objects/pics/berry_trees/rabuta/0.png deleted file mode 100644 index 5fe85e4e3..000000000 Binary files a/graphics/map_objects/pics/berry_trees/rabuta/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/rabuta/1.png b/graphics/map_objects/pics/berry_trees/rabuta/1.png deleted file mode 100644 index 0973e21cb..000000000 Binary files a/graphics/map_objects/pics/berry_trees/rabuta/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/rabuta/2.png b/graphics/map_objects/pics/berry_trees/rabuta/2.png deleted file mode 100644 index c2d027ebd..000000000 Binary files a/graphics/map_objects/pics/berry_trees/rabuta/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/rabuta/3.png b/graphics/map_objects/pics/berry_trees/rabuta/3.png deleted file mode 100644 index 79b2cc45f..000000000 Binary files a/graphics/map_objects/pics/berry_trees/rabuta/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/rabuta/4.png b/graphics/map_objects/pics/berry_trees/rabuta/4.png deleted file mode 100644 index 931350042..000000000 Binary files a/graphics/map_objects/pics/berry_trees/rabuta/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/rabuta/5.png b/graphics/map_objects/pics/berry_trees/rabuta/5.png deleted file mode 100644 index efa1ac89e..000000000 Binary files a/graphics/map_objects/pics/berry_trees/rabuta/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/rawst/0.png b/graphics/map_objects/pics/berry_trees/rawst/0.png deleted file mode 100644 index ef3548002..000000000 Binary files a/graphics/map_objects/pics/berry_trees/rawst/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/rawst/1.png b/graphics/map_objects/pics/berry_trees/rawst/1.png deleted file mode 100644 index dccad21b0..000000000 Binary files a/graphics/map_objects/pics/berry_trees/rawst/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/rawst/2.png b/graphics/map_objects/pics/berry_trees/rawst/2.png deleted file mode 100644 index d89f7484e..000000000 Binary files a/graphics/map_objects/pics/berry_trees/rawst/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/rawst/3.png b/graphics/map_objects/pics/berry_trees/rawst/3.png deleted file mode 100644 index afd11e0f6..000000000 Binary files a/graphics/map_objects/pics/berry_trees/rawst/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/rawst/4.png b/graphics/map_objects/pics/berry_trees/rawst/4.png deleted file mode 100644 index aada33789..000000000 Binary files a/graphics/map_objects/pics/berry_trees/rawst/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/rawst/5.png b/graphics/map_objects/pics/berry_trees/rawst/5.png deleted file mode 100644 index 311044bf0..000000000 Binary files a/graphics/map_objects/pics/berry_trees/rawst/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/razz/0.png b/graphics/map_objects/pics/berry_trees/razz/0.png deleted file mode 100644 index 4685d0977..000000000 Binary files a/graphics/map_objects/pics/berry_trees/razz/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/razz/1.png b/graphics/map_objects/pics/berry_trees/razz/1.png deleted file mode 100644 index 396122c5b..000000000 Binary files a/graphics/map_objects/pics/berry_trees/razz/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/razz/2.png b/graphics/map_objects/pics/berry_trees/razz/2.png deleted file mode 100644 index f48a2c6e2..000000000 Binary files a/graphics/map_objects/pics/berry_trees/razz/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/razz/3.png b/graphics/map_objects/pics/berry_trees/razz/3.png deleted file mode 100644 index 47e6a52c1..000000000 Binary files a/graphics/map_objects/pics/berry_trees/razz/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/razz/4.png b/graphics/map_objects/pics/berry_trees/razz/4.png deleted file mode 100644 index 075c4674b..000000000 Binary files a/graphics/map_objects/pics/berry_trees/razz/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/razz/5.png b/graphics/map_objects/pics/berry_trees/razz/5.png deleted file mode 100644 index 7ae7b7bba..000000000 Binary files a/graphics/map_objects/pics/berry_trees/razz/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/sitrus/0.png b/graphics/map_objects/pics/berry_trees/sitrus/0.png deleted file mode 100644 index 64671e0a1..000000000 Binary files a/graphics/map_objects/pics/berry_trees/sitrus/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/sitrus/1.png b/graphics/map_objects/pics/berry_trees/sitrus/1.png deleted file mode 100644 index 13f82d092..000000000 Binary files a/graphics/map_objects/pics/berry_trees/sitrus/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/sitrus/2.png b/graphics/map_objects/pics/berry_trees/sitrus/2.png deleted file mode 100644 index 7a382402a..000000000 Binary files a/graphics/map_objects/pics/berry_trees/sitrus/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/sitrus/3.png b/graphics/map_objects/pics/berry_trees/sitrus/3.png deleted file mode 100644 index 6bbc0dca0..000000000 Binary files a/graphics/map_objects/pics/berry_trees/sitrus/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/sitrus/4.png b/graphics/map_objects/pics/berry_trees/sitrus/4.png deleted file mode 100644 index 1e6ff6838..000000000 Binary files a/graphics/map_objects/pics/berry_trees/sitrus/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/sitrus/5.png b/graphics/map_objects/pics/berry_trees/sitrus/5.png deleted file mode 100644 index cd97f552f..000000000 Binary files a/graphics/map_objects/pics/berry_trees/sitrus/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/spelon/0.png b/graphics/map_objects/pics/berry_trees/spelon/0.png deleted file mode 100644 index 32bd06af1..000000000 Binary files a/graphics/map_objects/pics/berry_trees/spelon/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/spelon/1.png b/graphics/map_objects/pics/berry_trees/spelon/1.png deleted file mode 100644 index 37e77e391..000000000 Binary files a/graphics/map_objects/pics/berry_trees/spelon/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/spelon/2.png b/graphics/map_objects/pics/berry_trees/spelon/2.png deleted file mode 100644 index d36cf3b16..000000000 Binary files a/graphics/map_objects/pics/berry_trees/spelon/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/spelon/3.png b/graphics/map_objects/pics/berry_trees/spelon/3.png deleted file mode 100644 index 6a7099d83..000000000 Binary files a/graphics/map_objects/pics/berry_trees/spelon/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/spelon/4.png b/graphics/map_objects/pics/berry_trees/spelon/4.png deleted file mode 100644 index de1c24e58..000000000 Binary files a/graphics/map_objects/pics/berry_trees/spelon/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/spelon/5.png b/graphics/map_objects/pics/berry_trees/spelon/5.png deleted file mode 100644 index 578231a24..000000000 Binary files a/graphics/map_objects/pics/berry_trees/spelon/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/sprout/0.png b/graphics/map_objects/pics/berry_trees/sprout/0.png deleted file mode 100644 index df37532a7..000000000 Binary files a/graphics/map_objects/pics/berry_trees/sprout/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/sprout/1.png b/graphics/map_objects/pics/berry_trees/sprout/1.png deleted file mode 100644 index f0a67f382..000000000 Binary files a/graphics/map_objects/pics/berry_trees/sprout/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/tamato/0.png b/graphics/map_objects/pics/berry_trees/tamato/0.png deleted file mode 100644 index 499e473bc..000000000 Binary files a/graphics/map_objects/pics/berry_trees/tamato/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/tamato/1.png b/graphics/map_objects/pics/berry_trees/tamato/1.png deleted file mode 100644 index 2c45d60d8..000000000 Binary files a/graphics/map_objects/pics/berry_trees/tamato/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/tamato/2.png b/graphics/map_objects/pics/berry_trees/tamato/2.png deleted file mode 100644 index ef3ac700b..000000000 Binary files a/graphics/map_objects/pics/berry_trees/tamato/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/tamato/3.png b/graphics/map_objects/pics/berry_trees/tamato/3.png deleted file mode 100644 index 57b60904f..000000000 Binary files a/graphics/map_objects/pics/berry_trees/tamato/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/tamato/4.png b/graphics/map_objects/pics/berry_trees/tamato/4.png deleted file mode 100644 index 823ff49a7..000000000 Binary files a/graphics/map_objects/pics/berry_trees/tamato/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/tamato/5.png b/graphics/map_objects/pics/berry_trees/tamato/5.png deleted file mode 100644 index 8656cb5db..000000000 Binary files a/graphics/map_objects/pics/berry_trees/tamato/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/wepear/0.png b/graphics/map_objects/pics/berry_trees/wepear/0.png deleted file mode 100644 index ccf834a94..000000000 Binary files a/graphics/map_objects/pics/berry_trees/wepear/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/wepear/1.png b/graphics/map_objects/pics/berry_trees/wepear/1.png deleted file mode 100644 index d46390bdd..000000000 Binary files a/graphics/map_objects/pics/berry_trees/wepear/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/wepear/2.png b/graphics/map_objects/pics/berry_trees/wepear/2.png deleted file mode 100644 index 040a70931..000000000 Binary files a/graphics/map_objects/pics/berry_trees/wepear/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/wepear/3.png b/graphics/map_objects/pics/berry_trees/wepear/3.png deleted file mode 100644 index 94918f7ff..000000000 Binary files a/graphics/map_objects/pics/berry_trees/wepear/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/wepear/4.png b/graphics/map_objects/pics/berry_trees/wepear/4.png deleted file mode 100644 index ee242d657..000000000 Binary files a/graphics/map_objects/pics/berry_trees/wepear/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/wepear/5.png b/graphics/map_objects/pics/berry_trees/wepear/5.png deleted file mode 100644 index 1b5256a9e..000000000 Binary files a/graphics/map_objects/pics/berry_trees/wepear/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/wiki/0.png b/graphics/map_objects/pics/berry_trees/wiki/0.png deleted file mode 100644 index e51325e18..000000000 Binary files a/graphics/map_objects/pics/berry_trees/wiki/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/wiki/1.png b/graphics/map_objects/pics/berry_trees/wiki/1.png deleted file mode 100644 index f7f28e44b..000000000 Binary files a/graphics/map_objects/pics/berry_trees/wiki/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/wiki/2.png b/graphics/map_objects/pics/berry_trees/wiki/2.png deleted file mode 100644 index e7d6c3824..000000000 Binary files a/graphics/map_objects/pics/berry_trees/wiki/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/wiki/3.png b/graphics/map_objects/pics/berry_trees/wiki/3.png deleted file mode 100644 index 6447302a6..000000000 Binary files a/graphics/map_objects/pics/berry_trees/wiki/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/wiki/4.png b/graphics/map_objects/pics/berry_trees/wiki/4.png deleted file mode 100644 index a494a7eaa..000000000 Binary files a/graphics/map_objects/pics/berry_trees/wiki/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/berry_trees/wiki/5.png b/graphics/map_objects/pics/berry_trees/wiki/5.png deleted file mode 100644 index 5a6b9f193..000000000 Binary files a/graphics/map_objects/pics/berry_trees/wiki/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/cushions/ball_cushion.png b/graphics/map_objects/pics/cushions/ball_cushion.png deleted file mode 100644 index 54ecc1980..000000000 Binary files a/graphics/map_objects/pics/cushions/ball_cushion.png and /dev/null differ diff --git a/graphics/map_objects/pics/cushions/diamond_cushion.png b/graphics/map_objects/pics/cushions/diamond_cushion.png deleted file mode 100644 index 747866941..000000000 Binary files a/graphics/map_objects/pics/cushions/diamond_cushion.png and /dev/null differ diff --git a/graphics/map_objects/pics/cushions/fire_cushion.png b/graphics/map_objects/pics/cushions/fire_cushion.png deleted file mode 100644 index aa9a70f2e..000000000 Binary files a/graphics/map_objects/pics/cushions/fire_cushion.png and /dev/null differ diff --git a/graphics/map_objects/pics/cushions/grass_cushion.png b/graphics/map_objects/pics/cushions/grass_cushion.png deleted file mode 100644 index 8ee854f17..000000000 Binary files a/graphics/map_objects/pics/cushions/grass_cushion.png and /dev/null differ diff --git a/graphics/map_objects/pics/cushions/kiss_cushion.png b/graphics/map_objects/pics/cushions/kiss_cushion.png deleted file mode 100644 index 6a99348c9..000000000 Binary files a/graphics/map_objects/pics/cushions/kiss_cushion.png and /dev/null differ diff --git a/graphics/map_objects/pics/cushions/pika_cushion.png b/graphics/map_objects/pics/cushions/pika_cushion.png deleted file mode 100644 index 947713c39..000000000 Binary files a/graphics/map_objects/pics/cushions/pika_cushion.png and /dev/null differ diff --git a/graphics/map_objects/pics/cushions/round_cushion.png b/graphics/map_objects/pics/cushions/round_cushion.png deleted file mode 100644 index 0e7b71ad5..000000000 Binary files a/graphics/map_objects/pics/cushions/round_cushion.png and /dev/null differ diff --git a/graphics/map_objects/pics/cushions/spin_cushion.png b/graphics/map_objects/pics/cushions/spin_cushion.png deleted file mode 100644 index 81eba708c..000000000 Binary files a/graphics/map_objects/pics/cushions/spin_cushion.png and /dev/null differ diff --git a/graphics/map_objects/pics/cushions/water_cushion.png b/graphics/map_objects/pics/cushions/water_cushion.png deleted file mode 100644 index 9ed16c633..000000000 Binary files a/graphics/map_objects/pics/cushions/water_cushion.png and /dev/null differ diff --git a/graphics/map_objects/pics/cushions/zigzag_cushion.png b/graphics/map_objects/pics/cushions/zigzag_cushion.png deleted file mode 100644 index 407e6a66b..000000000 Binary files a/graphics/map_objects/pics/cushions/zigzag_cushion.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/azurill_doll.png b/graphics/map_objects/pics/dolls/azurill_doll.png deleted file mode 100644 index 1d1f7492f..000000000 Binary files a/graphics/map_objects/pics/dolls/azurill_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/baltoy_doll.png b/graphics/map_objects/pics/dolls/baltoy_doll.png deleted file mode 100644 index 5205123da..000000000 Binary files a/graphics/map_objects/pics/dolls/baltoy_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/big_blastoise_doll.png b/graphics/map_objects/pics/dolls/big_blastoise_doll.png deleted file mode 100644 index fa295f302..000000000 Binary files a/graphics/map_objects/pics/dolls/big_blastoise_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/big_charizard_doll.png b/graphics/map_objects/pics/dolls/big_charizard_doll.png deleted file mode 100644 index 4fa5aed45..000000000 Binary files a/graphics/map_objects/pics/dolls/big_charizard_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/big_lapras_doll.png b/graphics/map_objects/pics/dolls/big_lapras_doll.png deleted file mode 100644 index 572d3c810..000000000 Binary files a/graphics/map_objects/pics/dolls/big_lapras_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/big_regice_doll.png b/graphics/map_objects/pics/dolls/big_regice_doll.png deleted file mode 100644 index e437d3558..000000000 Binary files a/graphics/map_objects/pics/dolls/big_regice_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/big_regirock_doll.png b/graphics/map_objects/pics/dolls/big_regirock_doll.png deleted file mode 100644 index 139abbb28..000000000 Binary files a/graphics/map_objects/pics/dolls/big_regirock_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/big_registeel_doll.png b/graphics/map_objects/pics/dolls/big_registeel_doll.png deleted file mode 100644 index 632a2cadd..000000000 Binary files a/graphics/map_objects/pics/dolls/big_registeel_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/big_rhydon_doll.png b/graphics/map_objects/pics/dolls/big_rhydon_doll.png deleted file mode 100644 index 2e059f8c9..000000000 Binary files a/graphics/map_objects/pics/dolls/big_rhydon_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/big_snorlax_doll.png b/graphics/map_objects/pics/dolls/big_snorlax_doll.png deleted file mode 100644 index 397c9baac..000000000 Binary files a/graphics/map_objects/pics/dolls/big_snorlax_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/big_venusaur_doll.png b/graphics/map_objects/pics/dolls/big_venusaur_doll.png deleted file mode 100644 index 9d1961608..000000000 Binary files a/graphics/map_objects/pics/dolls/big_venusaur_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/big_wailmer_doll.png b/graphics/map_objects/pics/dolls/big_wailmer_doll.png deleted file mode 100644 index a174d30f7..000000000 Binary files a/graphics/map_objects/pics/dolls/big_wailmer_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/chikorita_doll.png b/graphics/map_objects/pics/dolls/chikorita_doll.png deleted file mode 100644 index 6b5e6417d..000000000 Binary files a/graphics/map_objects/pics/dolls/chikorita_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/clefairy_doll.png b/graphics/map_objects/pics/dolls/clefairy_doll.png deleted file mode 100644 index 137b20213..000000000 Binary files a/graphics/map_objects/pics/dolls/clefairy_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/cyndaquil_doll.png b/graphics/map_objects/pics/dolls/cyndaquil_doll.png deleted file mode 100644 index b76221e1d..000000000 Binary files a/graphics/map_objects/pics/dolls/cyndaquil_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/ditto_doll.png b/graphics/map_objects/pics/dolls/ditto_doll.png deleted file mode 100644 index da4c33018..000000000 Binary files a/graphics/map_objects/pics/dolls/ditto_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/duskull_doll.png b/graphics/map_objects/pics/dolls/duskull_doll.png deleted file mode 100644 index fdfbe3fec..000000000 Binary files a/graphics/map_objects/pics/dolls/duskull_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/gulpin_doll.png b/graphics/map_objects/pics/dolls/gulpin_doll.png deleted file mode 100644 index 48bf1824b..000000000 Binary files a/graphics/map_objects/pics/dolls/gulpin_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/jigglypuff_doll.png b/graphics/map_objects/pics/dolls/jigglypuff_doll.png deleted file mode 100644 index 1a2c8d44a..000000000 Binary files a/graphics/map_objects/pics/dolls/jigglypuff_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/kecleon_doll.png b/graphics/map_objects/pics/dolls/kecleon_doll.png deleted file mode 100644 index 92869882f..000000000 Binary files a/graphics/map_objects/pics/dolls/kecleon_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/lotad_doll.png b/graphics/map_objects/pics/dolls/lotad_doll.png deleted file mode 100644 index 9ee2182d1..000000000 Binary files a/graphics/map_objects/pics/dolls/lotad_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/marill_doll.png b/graphics/map_objects/pics/dolls/marill_doll.png deleted file mode 100644 index d5372f7dd..000000000 Binary files a/graphics/map_objects/pics/dolls/marill_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/meowth_doll.png b/graphics/map_objects/pics/dolls/meowth_doll.png deleted file mode 100644 index 67ce3db4c..000000000 Binary files a/graphics/map_objects/pics/dolls/meowth_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/mudkip_doll.png b/graphics/map_objects/pics/dolls/mudkip_doll.png deleted file mode 100644 index 8d6af157f..000000000 Binary files a/graphics/map_objects/pics/dolls/mudkip_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/pichu_doll.png b/graphics/map_objects/pics/dolls/pichu_doll.png deleted file mode 100644 index 7a2aefc31..000000000 Binary files a/graphics/map_objects/pics/dolls/pichu_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/pikachu_doll.png b/graphics/map_objects/pics/dolls/pikachu_doll.png deleted file mode 100644 index a762f1e15..000000000 Binary files a/graphics/map_objects/pics/dolls/pikachu_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/seedot_doll.png b/graphics/map_objects/pics/dolls/seedot_doll.png deleted file mode 100644 index e00c485ae..000000000 Binary files a/graphics/map_objects/pics/dolls/seedot_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/skitty_doll.png b/graphics/map_objects/pics/dolls/skitty_doll.png deleted file mode 100644 index 57ae4c5ed..000000000 Binary files a/graphics/map_objects/pics/dolls/skitty_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/smoochum_doll.png b/graphics/map_objects/pics/dolls/smoochum_doll.png deleted file mode 100644 index 4adacdfd5..000000000 Binary files a/graphics/map_objects/pics/dolls/smoochum_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/swablu_doll.png b/graphics/map_objects/pics/dolls/swablu_doll.png deleted file mode 100644 index 94e3051d7..000000000 Binary files a/graphics/map_objects/pics/dolls/swablu_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/togepi_doll.png b/graphics/map_objects/pics/dolls/togepi_doll.png deleted file mode 100644 index 4deda750c..000000000 Binary files a/graphics/map_objects/pics/dolls/togepi_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/torchic_doll.png b/graphics/map_objects/pics/dolls/torchic_doll.png deleted file mode 100644 index 067eae9fb..000000000 Binary files a/graphics/map_objects/pics/dolls/torchic_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/totodile_doll.png b/graphics/map_objects/pics/dolls/totodile_doll.png deleted file mode 100644 index b347125c9..000000000 Binary files a/graphics/map_objects/pics/dolls/totodile_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/treecko_doll.png b/graphics/map_objects/pics/dolls/treecko_doll.png deleted file mode 100644 index 3ccf44a58..000000000 Binary files a/graphics/map_objects/pics/dolls/treecko_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/unused_magnemite_doll.png b/graphics/map_objects/pics/dolls/unused_magnemite_doll.png deleted file mode 100644 index bbf386e6a..000000000 Binary files a/graphics/map_objects/pics/dolls/unused_magnemite_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/unused_natu_doll.png b/graphics/map_objects/pics/dolls/unused_natu_doll.png deleted file mode 100644 index a2c4995e3..000000000 Binary files a/graphics/map_objects/pics/dolls/unused_natu_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/unused_pikachu_doll.png b/graphics/map_objects/pics/dolls/unused_pikachu_doll.png deleted file mode 100644 index 9bf762d02..000000000 Binary files a/graphics/map_objects/pics/dolls/unused_pikachu_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/unused_porygon2_doll.png b/graphics/map_objects/pics/dolls/unused_porygon2_doll.png deleted file mode 100644 index 465b7a092..000000000 Binary files a/graphics/map_objects/pics/dolls/unused_porygon2_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/unused_squirtle_doll.png b/graphics/map_objects/pics/dolls/unused_squirtle_doll.png deleted file mode 100644 index ccc526aae..000000000 Binary files a/graphics/map_objects/pics/dolls/unused_squirtle_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/unused_wooper_doll.png b/graphics/map_objects/pics/dolls/unused_wooper_doll.png deleted file mode 100644 index 29bc8fd99..000000000 Binary files a/graphics/map_objects/pics/dolls/unused_wooper_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/dolls/wynaut_doll.png b/graphics/map_objects/pics/dolls/wynaut_doll.png deleted file mode 100644 index 3ac3d1311..000000000 Binary files a/graphics/map_objects/pics/dolls/wynaut_doll.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/arrow/0.png b/graphics/map_objects/pics/effects/arrow/0.png deleted file mode 100644 index 3f06be064..000000000 Binary files a/graphics/map_objects/pics/effects/arrow/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/arrow/1.png b/graphics/map_objects/pics/effects/arrow/1.png deleted file mode 100644 index 87bbd99ff..000000000 Binary files a/graphics/map_objects/pics/effects/arrow/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/arrow/2.png b/graphics/map_objects/pics/effects/arrow/2.png deleted file mode 100644 index f9abae71d..000000000 Binary files a/graphics/map_objects/pics/effects/arrow/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/arrow/3.png b/graphics/map_objects/pics/effects/arrow/3.png deleted file mode 100644 index 58d43a6d8..000000000 Binary files a/graphics/map_objects/pics/effects/arrow/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/arrow/4.png b/graphics/map_objects/pics/effects/arrow/4.png deleted file mode 100644 index ef95afd9e..000000000 Binary files a/graphics/map_objects/pics/effects/arrow/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/arrow/5.png b/graphics/map_objects/pics/effects/arrow/5.png deleted file mode 100644 index 71b7e0c27..000000000 Binary files a/graphics/map_objects/pics/effects/arrow/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/arrow/6.png b/graphics/map_objects/pics/effects/arrow/6.png deleted file mode 100644 index 53c33f44c..000000000 Binary files a/graphics/map_objects/pics/effects/arrow/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/arrow/7.png b/graphics/map_objects/pics/effects/arrow/7.png deleted file mode 100644 index bda7862da..000000000 Binary files a/graphics/map_objects/pics/effects/arrow/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/ash/0.png b/graphics/map_objects/pics/effects/ash/0.png deleted file mode 100644 index 96a4b8f2a..000000000 Binary files a/graphics/map_objects/pics/effects/ash/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/ash/1.png b/graphics/map_objects/pics/effects/ash/1.png deleted file mode 100644 index 8d973518d..000000000 Binary files a/graphics/map_objects/pics/effects/ash/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/ash/2.png b/graphics/map_objects/pics/effects/ash/2.png deleted file mode 100644 index eccd2e02d..000000000 Binary files a/graphics/map_objects/pics/effects/ash/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/ash/3.png b/graphics/map_objects/pics/effects/ash/3.png deleted file mode 100644 index 5ad0b8e5a..000000000 Binary files a/graphics/map_objects/pics/effects/ash/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/ash/4.png b/graphics/map_objects/pics/effects/ash/4.png deleted file mode 100644 index 7208f6a5b..000000000 Binary files a/graphics/map_objects/pics/effects/ash/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/0.png b/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/0.png deleted file mode 100644 index f3e751d3a..000000000 Binary files a/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/1.png b/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/1.png deleted file mode 100644 index d48fd1234..000000000 Binary files a/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/2.png b/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/2.png deleted file mode 100644 index 9a9abf73e..000000000 Binary files a/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/3.png b/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/3.png deleted file mode 100644 index 857abfb0b..000000000 Binary files a/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/4.png b/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/4.png deleted file mode 100644 index bce9df4c7..000000000 Binary files a/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/5.png b/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/5.png deleted file mode 100644 index 4c757bf6b..000000000 Binary files a/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/bike_hop_big_splash/0.png b/graphics/map_objects/pics/effects/bike_hop_big_splash/0.png deleted file mode 100644 index 420663da8..000000000 Binary files a/graphics/map_objects/pics/effects/bike_hop_big_splash/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/bike_hop_big_splash/1.png b/graphics/map_objects/pics/effects/bike_hop_big_splash/1.png deleted file mode 100644 index 72ca8fa1c..000000000 Binary files a/graphics/map_objects/pics/effects/bike_hop_big_splash/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/bike_hop_big_splash/2.png b/graphics/map_objects/pics/effects/bike_hop_big_splash/2.png deleted file mode 100644 index 96c224cdf..000000000 Binary files a/graphics/map_objects/pics/effects/bike_hop_big_splash/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/bike_hop_big_splash/3.png b/graphics/map_objects/pics/effects/bike_hop_big_splash/3.png deleted file mode 100644 index b549ea78c..000000000 Binary files a/graphics/map_objects/pics/effects/bike_hop_big_splash/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/bike_hop_small_splash/0.png b/graphics/map_objects/pics/effects/bike_hop_small_splash/0.png deleted file mode 100644 index b5cccb306..000000000 Binary files a/graphics/map_objects/pics/effects/bike_hop_small_splash/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/bike_hop_small_splash/1.png b/graphics/map_objects/pics/effects/bike_hop_small_splash/1.png deleted file mode 100644 index 548198c09..000000000 Binary files a/graphics/map_objects/pics/effects/bike_hop_small_splash/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/bike_hop_small_splash/2.png b/graphics/map_objects/pics/effects/bike_hop_small_splash/2.png deleted file mode 100644 index e8b86dfcb..000000000 Binary files a/graphics/map_objects/pics/effects/bike_hop_small_splash/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/bike_hop_tall_grass/0.png b/graphics/map_objects/pics/effects/bike_hop_tall_grass/0.png deleted file mode 100644 index d2768ec0c..000000000 Binary files a/graphics/map_objects/pics/effects/bike_hop_tall_grass/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/bike_hop_tall_grass/1.png b/graphics/map_objects/pics/effects/bike_hop_tall_grass/1.png deleted file mode 100644 index 7816f4d00..000000000 Binary files a/graphics/map_objects/pics/effects/bike_hop_tall_grass/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/bike_hop_tall_grass/2.png b/graphics/map_objects/pics/effects/bike_hop_tall_grass/2.png deleted file mode 100644 index 00c51d276..000000000 Binary files a/graphics/map_objects/pics/effects/bike_hop_tall_grass/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/bike_hop_tall_grass/3.png b/graphics/map_objects/pics/effects/bike_hop_tall_grass/3.png deleted file mode 100644 index 210382b93..000000000 Binary files a/graphics/map_objects/pics/effects/bike_hop_tall_grass/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/bike_tire_tracks/0.png b/graphics/map_objects/pics/effects/bike_tire_tracks/0.png deleted file mode 100644 index d4fd46f9b..000000000 Binary files a/graphics/map_objects/pics/effects/bike_tire_tracks/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/bike_tire_tracks/1.png b/graphics/map_objects/pics/effects/bike_tire_tracks/1.png deleted file mode 100644 index 9095cdd74..000000000 Binary files a/graphics/map_objects/pics/effects/bike_tire_tracks/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/bike_tire_tracks/2.png b/graphics/map_objects/pics/effects/bike_tire_tracks/2.png deleted file mode 100644 index 56907c153..000000000 Binary files a/graphics/map_objects/pics/effects/bike_tire_tracks/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/bike_tire_tracks/3.png b/graphics/map_objects/pics/effects/bike_tire_tracks/3.png deleted file mode 100644 index 397bfb418..000000000 Binary files a/graphics/map_objects/pics/effects/bike_tire_tracks/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/bird.png b/graphics/map_objects/pics/effects/bird.png deleted file mode 100644 index 3147f98f5..000000000 Binary files a/graphics/map_objects/pics/effects/bird.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/bubbles/0.png b/graphics/map_objects/pics/effects/bubbles/0.png deleted file mode 100644 index b71b193ae..000000000 Binary files a/graphics/map_objects/pics/effects/bubbles/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/bubbles/1.png b/graphics/map_objects/pics/effects/bubbles/1.png deleted file mode 100644 index 0bd744ef2..000000000 Binary files a/graphics/map_objects/pics/effects/bubbles/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/bubbles/2.png b/graphics/map_objects/pics/effects/bubbles/2.png deleted file mode 100644 index 4241e8f24..000000000 Binary files a/graphics/map_objects/pics/effects/bubbles/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/bubbles/3.png b/graphics/map_objects/pics/effects/bubbles/3.png deleted file mode 100644 index 3b440d9a7..000000000 Binary files a/graphics/map_objects/pics/effects/bubbles/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/bubbles/4.png b/graphics/map_objects/pics/effects/bubbles/4.png deleted file mode 100644 index de9e66a25..000000000 Binary files a/graphics/map_objects/pics/effects/bubbles/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/bubbles/5.png b/graphics/map_objects/pics/effects/bubbles/5.png deleted file mode 100644 index 54b9d768b..000000000 Binary files a/graphics/map_objects/pics/effects/bubbles/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/bubbles/6.png b/graphics/map_objects/pics/effects/bubbles/6.png deleted file mode 100644 index 35c26e633..000000000 Binary files a/graphics/map_objects/pics/effects/bubbles/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/bubbles/7.png b/graphics/map_objects/pics/effects/bubbles/7.png deleted file mode 100644 index 6323e0cc5..000000000 Binary files a/graphics/map_objects/pics/effects/bubbles/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/deep_sand_footprints/0.png b/graphics/map_objects/pics/effects/deep_sand_footprints/0.png deleted file mode 100644 index c449b223e..000000000 Binary files a/graphics/map_objects/pics/effects/deep_sand_footprints/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/deep_sand_footprints/1.png b/graphics/map_objects/pics/effects/deep_sand_footprints/1.png deleted file mode 100644 index 2a1d5cce5..000000000 Binary files a/graphics/map_objects/pics/effects/deep_sand_footprints/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/ground_impact_dust/0.png b/graphics/map_objects/pics/effects/ground_impact_dust/0.png deleted file mode 100644 index 57e2e8898..000000000 Binary files a/graphics/map_objects/pics/effects/ground_impact_dust/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/ground_impact_dust/1.png b/graphics/map_objects/pics/effects/ground_impact_dust/1.png deleted file mode 100644 index d91554b6e..000000000 Binary files a/graphics/map_objects/pics/effects/ground_impact_dust/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/ground_impact_dust/2.png b/graphics/map_objects/pics/effects/ground_impact_dust/2.png deleted file mode 100644 index 8d0235141..000000000 Binary files a/graphics/map_objects/pics/effects/ground_impact_dust/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/hot_springs_water.png b/graphics/map_objects/pics/effects/hot_springs_water.png deleted file mode 100644 index 1b6550b19..000000000 Binary files a/graphics/map_objects/pics/effects/hot_springs_water.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/jump_out_of_ash/0.png b/graphics/map_objects/pics/effects/jump_out_of_ash/0.png deleted file mode 100644 index 50f9796b2..000000000 Binary files a/graphics/map_objects/pics/effects/jump_out_of_ash/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/jump_out_of_ash/1.png b/graphics/map_objects/pics/effects/jump_out_of_ash/1.png deleted file mode 100644 index 685d31fac..000000000 Binary files a/graphics/map_objects/pics/effects/jump_out_of_ash/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/jump_out_of_ash/2.png b/graphics/map_objects/pics/effects/jump_out_of_ash/2.png deleted file mode 100644 index 9f11f176f..000000000 Binary files a/graphics/map_objects/pics/effects/jump_out_of_ash/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/jump_out_of_ash/3.png b/graphics/map_objects/pics/effects/jump_out_of_ash/3.png deleted file mode 100644 index 124581f75..000000000 Binary files a/graphics/map_objects/pics/effects/jump_out_of_ash/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/jump_out_of_ash/4.png b/graphics/map_objects/pics/effects/jump_out_of_ash/4.png deleted file mode 100644 index 6e584a4dc..000000000 Binary files a/graphics/map_objects/pics/effects/jump_out_of_ash/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/long_grass/0.png b/graphics/map_objects/pics/effects/long_grass/0.png deleted file mode 100644 index 4a02b3d17..000000000 Binary files a/graphics/map_objects/pics/effects/long_grass/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/long_grass/1.png b/graphics/map_objects/pics/effects/long_grass/1.png deleted file mode 100644 index 97f652c6d..000000000 Binary files a/graphics/map_objects/pics/effects/long_grass/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/long_grass/2.png b/graphics/map_objects/pics/effects/long_grass/2.png deleted file mode 100644 index 313226f8b..000000000 Binary files a/graphics/map_objects/pics/effects/long_grass/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/long_grass/3.png b/graphics/map_objects/pics/effects/long_grass/3.png deleted file mode 100644 index 0565b4069..000000000 Binary files a/graphics/map_objects/pics/effects/long_grass/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/mountain_disguise/0.png b/graphics/map_objects/pics/effects/mountain_disguise/0.png deleted file mode 100644 index 104056e46..000000000 Binary files a/graphics/map_objects/pics/effects/mountain_disguise/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/mountain_disguise/1.png b/graphics/map_objects/pics/effects/mountain_disguise/1.png deleted file mode 100644 index 4b2d35963..000000000 Binary files a/graphics/map_objects/pics/effects/mountain_disguise/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/mountain_disguise/2.png b/graphics/map_objects/pics/effects/mountain_disguise/2.png deleted file mode 100644 index e2ea3b855..000000000 Binary files a/graphics/map_objects/pics/effects/mountain_disguise/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/mountain_disguise/3.png b/graphics/map_objects/pics/effects/mountain_disguise/3.png deleted file mode 100644 index 8f0a1be2c..000000000 Binary files a/graphics/map_objects/pics/effects/mountain_disguise/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/mountain_disguise/4.png b/graphics/map_objects/pics/effects/mountain_disguise/4.png deleted file mode 100644 index 8fd4df410..000000000 Binary files a/graphics/map_objects/pics/effects/mountain_disguise/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/mountain_disguise/5.png b/graphics/map_objects/pics/effects/mountain_disguise/5.png deleted file mode 100644 index a364b234d..000000000 Binary files a/graphics/map_objects/pics/effects/mountain_disguise/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/mountain_disguise/6.png b/graphics/map_objects/pics/effects/mountain_disguise/6.png deleted file mode 100644 index 2644aa9f1..000000000 Binary files a/graphics/map_objects/pics/effects/mountain_disguise/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/ripple/0.png b/graphics/map_objects/pics/effects/ripple/0.png deleted file mode 100644 index 24055c7d2..000000000 Binary files a/graphics/map_objects/pics/effects/ripple/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/ripple/1.png b/graphics/map_objects/pics/effects/ripple/1.png deleted file mode 100644 index a47853925..000000000 Binary files a/graphics/map_objects/pics/effects/ripple/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/ripple/2.png b/graphics/map_objects/pics/effects/ripple/2.png deleted file mode 100644 index 6670cb779..000000000 Binary files a/graphics/map_objects/pics/effects/ripple/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/ripple/3.png b/graphics/map_objects/pics/effects/ripple/3.png deleted file mode 100644 index 122df1940..000000000 Binary files a/graphics/map_objects/pics/effects/ripple/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/ripple/4.png b/graphics/map_objects/pics/effects/ripple/4.png deleted file mode 100644 index f4f79afe2..000000000 Binary files a/graphics/map_objects/pics/effects/ripple/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/sand_disguise_placeholder/0.png b/graphics/map_objects/pics/effects/sand_disguise_placeholder/0.png deleted file mode 100644 index df242de2f..000000000 Binary files a/graphics/map_objects/pics/effects/sand_disguise_placeholder/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/sand_disguise_placeholder/1.png b/graphics/map_objects/pics/effects/sand_disguise_placeholder/1.png deleted file mode 100644 index 2e993b30e..000000000 Binary files a/graphics/map_objects/pics/effects/sand_disguise_placeholder/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/sand_disguise_placeholder/2.png b/graphics/map_objects/pics/effects/sand_disguise_placeholder/2.png deleted file mode 100644 index 3d6864e41..000000000 Binary files a/graphics/map_objects/pics/effects/sand_disguise_placeholder/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/sand_disguise_placeholder/3.png b/graphics/map_objects/pics/effects/sand_disguise_placeholder/3.png deleted file mode 100644 index 690110a8c..000000000 Binary files a/graphics/map_objects/pics/effects/sand_disguise_placeholder/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/sand_disguise_placeholder/4.png b/graphics/map_objects/pics/effects/sand_disguise_placeholder/4.png deleted file mode 100644 index caa568eac..000000000 Binary files a/graphics/map_objects/pics/effects/sand_disguise_placeholder/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/sand_disguise_placeholder/5.png b/graphics/map_objects/pics/effects/sand_disguise_placeholder/5.png deleted file mode 100644 index 0d0bd9886..000000000 Binary files a/graphics/map_objects/pics/effects/sand_disguise_placeholder/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/sand_disguise_placeholder/6.png b/graphics/map_objects/pics/effects/sand_disguise_placeholder/6.png deleted file mode 100644 index ed40527d0..000000000 Binary files a/graphics/map_objects/pics/effects/sand_disguise_placeholder/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/sand_footprints/0.png b/graphics/map_objects/pics/effects/sand_footprints/0.png deleted file mode 100644 index 3cc79aa18..000000000 Binary files a/graphics/map_objects/pics/effects/sand_footprints/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/sand_footprints/1.png b/graphics/map_objects/pics/effects/sand_footprints/1.png deleted file mode 100644 index 80d33783b..000000000 Binary files a/graphics/map_objects/pics/effects/sand_footprints/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/shadow_extra_large.png b/graphics/map_objects/pics/effects/shadow_extra_large.png deleted file mode 100644 index 41b37d8fb..000000000 Binary files a/graphics/map_objects/pics/effects/shadow_extra_large.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/shadow_large.png b/graphics/map_objects/pics/effects/shadow_large.png deleted file mode 100644 index f0e76cd7f..000000000 Binary files a/graphics/map_objects/pics/effects/shadow_large.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/shadow_medium.png b/graphics/map_objects/pics/effects/shadow_medium.png deleted file mode 100644 index 7bf9afef7..000000000 Binary files a/graphics/map_objects/pics/effects/shadow_medium.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/shadow_small.png b/graphics/map_objects/pics/effects/shadow_small.png deleted file mode 100644 index 6c13c1b86..000000000 Binary files a/graphics/map_objects/pics/effects/shadow_small.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/short_grass/0.png b/graphics/map_objects/pics/effects/short_grass/0.png deleted file mode 100644 index a5d5181db..000000000 Binary files a/graphics/map_objects/pics/effects/short_grass/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/short_grass/1.png b/graphics/map_objects/pics/effects/short_grass/1.png deleted file mode 100644 index 17a62968a..000000000 Binary files a/graphics/map_objects/pics/effects/short_grass/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/splash/0.png b/graphics/map_objects/pics/effects/splash/0.png deleted file mode 100644 index 2b29c76ae..000000000 Binary files a/graphics/map_objects/pics/effects/splash/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/splash/1.png b/graphics/map_objects/pics/effects/splash/1.png deleted file mode 100644 index 180721342..000000000 Binary files a/graphics/map_objects/pics/effects/splash/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/surf_blob/0.png b/graphics/map_objects/pics/effects/surf_blob/0.png deleted file mode 100644 index c4a14e052..000000000 Binary files a/graphics/map_objects/pics/effects/surf_blob/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/surf_blob/1.png b/graphics/map_objects/pics/effects/surf_blob/1.png deleted file mode 100644 index 25fd5ad92..000000000 Binary files a/graphics/map_objects/pics/effects/surf_blob/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/surf_blob/2.png b/graphics/map_objects/pics/effects/surf_blob/2.png deleted file mode 100644 index 532da2611..000000000 Binary files a/graphics/map_objects/pics/effects/surf_blob/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/tall_grass/0.png b/graphics/map_objects/pics/effects/tall_grass/0.png deleted file mode 100644 index 00d596b4c..000000000 Binary files a/graphics/map_objects/pics/effects/tall_grass/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/tall_grass/1.png b/graphics/map_objects/pics/effects/tall_grass/1.png deleted file mode 100644 index 0c8bdd84e..000000000 Binary files a/graphics/map_objects/pics/effects/tall_grass/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/tall_grass/2.png b/graphics/map_objects/pics/effects/tall_grass/2.png deleted file mode 100644 index 55d971758..000000000 Binary files a/graphics/map_objects/pics/effects/tall_grass/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/tall_grass/3.png b/graphics/map_objects/pics/effects/tall_grass/3.png deleted file mode 100644 index 0add11083..000000000 Binary files a/graphics/map_objects/pics/effects/tall_grass/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/tall_grass/4.png b/graphics/map_objects/pics/effects/tall_grass/4.png deleted file mode 100644 index ca164d3cc..000000000 Binary files a/graphics/map_objects/pics/effects/tall_grass/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/tree_disguise/0.png b/graphics/map_objects/pics/effects/tree_disguise/0.png deleted file mode 100644 index 2bce7f9ed..000000000 Binary files a/graphics/map_objects/pics/effects/tree_disguise/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/tree_disguise/1.png b/graphics/map_objects/pics/effects/tree_disguise/1.png deleted file mode 100644 index e29336cd4..000000000 Binary files a/graphics/map_objects/pics/effects/tree_disguise/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/tree_disguise/2.png b/graphics/map_objects/pics/effects/tree_disguise/2.png deleted file mode 100644 index 2cca165c5..000000000 Binary files a/graphics/map_objects/pics/effects/tree_disguise/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/tree_disguise/3.png b/graphics/map_objects/pics/effects/tree_disguise/3.png deleted file mode 100644 index 85dd30cfd..000000000 Binary files a/graphics/map_objects/pics/effects/tree_disguise/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/tree_disguise/4.png b/graphics/map_objects/pics/effects/tree_disguise/4.png deleted file mode 100644 index 8c7821634..000000000 Binary files a/graphics/map_objects/pics/effects/tree_disguise/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/tree_disguise/5.png b/graphics/map_objects/pics/effects/tree_disguise/5.png deleted file mode 100644 index 2ffd56fcc..000000000 Binary files a/graphics/map_objects/pics/effects/tree_disguise/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/tree_disguise/6.png b/graphics/map_objects/pics/effects/tree_disguise/6.png deleted file mode 100644 index bc9333162..000000000 Binary files a/graphics/map_objects/pics/effects/tree_disguise/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_16/0.png b/graphics/map_objects/pics/effects/unknown_16/0.png deleted file mode 100644 index 491801c32..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_16/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_16/1.png b/graphics/map_objects/pics/effects/unknown_16/1.png deleted file mode 100644 index f83ca15da..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_16/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_16/2.png b/graphics/map_objects/pics/effects/unknown_16/2.png deleted file mode 100644 index 073aa9b7e..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_16/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_16/3.png b/graphics/map_objects/pics/effects/unknown_16/3.png deleted file mode 100644 index e7b5c96cf..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_16/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_16/4.png b/graphics/map_objects/pics/effects/unknown_16/4.png deleted file mode 100644 index 8972d5d81..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_16/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_16/5.png b/graphics/map_objects/pics/effects/unknown_16/5.png deleted file mode 100644 index d570a9a8d..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_16/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_17/0.png b/graphics/map_objects/pics/effects/unknown_17/0.png deleted file mode 100644 index 9c804844e..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_17/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_17/1.png b/graphics/map_objects/pics/effects/unknown_17/1.png deleted file mode 100644 index 6628b5820..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_17/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_17/2.png b/graphics/map_objects/pics/effects/unknown_17/2.png deleted file mode 100644 index a5cdcca57..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_17/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_17/3.png b/graphics/map_objects/pics/effects/unknown_17/3.png deleted file mode 100644 index 2f9a20019..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_17/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_17/4.png b/graphics/map_objects/pics/effects/unknown_17/4.png deleted file mode 100644 index ce0bc29aa..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_17/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_17/5.png b/graphics/map_objects/pics/effects/unknown_17/5.png deleted file mode 100644 index f92888a3a..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_17/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_17/6.png b/graphics/map_objects/pics/effects/unknown_17/6.png deleted file mode 100644 index 7e740a956..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_17/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_17/7.png b/graphics/map_objects/pics/effects/unknown_17/7.png deleted file mode 100644 index 25d90e16c..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_17/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_18/0.png b/graphics/map_objects/pics/effects/unknown_18/0.png deleted file mode 100644 index 70b39df59..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_18/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_18/1.png b/graphics/map_objects/pics/effects/unknown_18/1.png deleted file mode 100644 index 392298f5a..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_18/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_18/2.png b/graphics/map_objects/pics/effects/unknown_18/2.png deleted file mode 100644 index ff418e940..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_18/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_18/3.png b/graphics/map_objects/pics/effects/unknown_18/3.png deleted file mode 100644 index 0e1e13438..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_18/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_19/0.png b/graphics/map_objects/pics/effects/unknown_19/0.png deleted file mode 100644 index ef8005066..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_19/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_19/1.png b/graphics/map_objects/pics/effects/unknown_19/1.png deleted file mode 100644 index 6fde1a291..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_19/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_19/2.png b/graphics/map_objects/pics/effects/unknown_19/2.png deleted file mode 100644 index c385fd84c..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_19/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_19/3.png b/graphics/map_objects/pics/effects/unknown_19/3.png deleted file mode 100644 index 084c20314..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_19/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_20/0.png b/graphics/map_objects/pics/effects/unknown_20/0.png deleted file mode 100644 index eec853d53..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_20/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_20/1.png b/graphics/map_objects/pics/effects/unknown_20/1.png deleted file mode 100644 index f4782fc67..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_20/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_20/2.png b/graphics/map_objects/pics/effects/unknown_20/2.png deleted file mode 100644 index 416dae69d..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_20/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_20/3.png b/graphics/map_objects/pics/effects/unknown_20/3.png deleted file mode 100644 index 3d966e81c..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_20/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_20/4.png b/graphics/map_objects/pics/effects/unknown_20/4.png deleted file mode 100644 index 6bbfbca12..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_20/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_29/0.png b/graphics/map_objects/pics/effects/unknown_29/0.png deleted file mode 100644 index 87fe91c97..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_29/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_29/1.png b/graphics/map_objects/pics/effects/unknown_29/1.png deleted file mode 100644 index c20fb34bb..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_29/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_29/2.png b/graphics/map_objects/pics/effects/unknown_29/2.png deleted file mode 100644 index def972b20..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_29/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_33/0.png b/graphics/map_objects/pics/effects/unknown_33/0.png deleted file mode 100644 index 2241eabd3..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_33/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_33/1.png b/graphics/map_objects/pics/effects/unknown_33/1.png deleted file mode 100644 index 5f90405d8..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_33/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_33/2.png b/graphics/map_objects/pics/effects/unknown_33/2.png deleted file mode 100644 index 3f1c3a76a..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_33/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_33/3.png b/graphics/map_objects/pics/effects/unknown_33/3.png deleted file mode 100644 index 2696f4a5a..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_33/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_33/4.png b/graphics/map_objects/pics/effects/unknown_33/4.png deleted file mode 100644 index c2d1785bf..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_33/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_35/0.png b/graphics/map_objects/pics/effects/unknown_35/0.png deleted file mode 100644 index c2ae128f7..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_35/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_35/1.png b/graphics/map_objects/pics/effects/unknown_35/1.png deleted file mode 100644 index fe68b19fd..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_35/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_4F6D38/0.png b/graphics/map_objects/pics/effects/unknown_4F6D38/0.png deleted file mode 100644 index 3ee87e1cd..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_4F6D38/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unknown_4F7E38/0.png b/graphics/map_objects/pics/effects/unknown_4F7E38/0.png deleted file mode 100644 index 685aee28b..000000000 Binary files a/graphics/map_objects/pics/effects/unknown_4F7E38/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unused_grass/0.png b/graphics/map_objects/pics/effects/unused_grass/0.png deleted file mode 100644 index 2e16f15cb..000000000 Binary files a/graphics/map_objects/pics/effects/unused_grass/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unused_grass/1.png b/graphics/map_objects/pics/effects/unused_grass/1.png deleted file mode 100644 index dd33b0d88..000000000 Binary files a/graphics/map_objects/pics/effects/unused_grass/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unused_grass/2.png b/graphics/map_objects/pics/effects/unused_grass/2.png deleted file mode 100644 index 345d454cd..000000000 Binary files a/graphics/map_objects/pics/effects/unused_grass/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/effects/unused_grass/3.png b/graphics/map_objects/pics/effects/unused_grass/3.png deleted file mode 100644 index 087676102..000000000 Binary files a/graphics/map_objects/pics/effects/unused_grass/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/misc/birchs_bag.png b/graphics/map_objects/pics/misc/birchs_bag.png deleted file mode 100644 index 045e5546c..000000000 Binary files a/graphics/map_objects/pics/misc/birchs_bag.png and /dev/null differ diff --git a/graphics/map_objects/pics/misc/birth_island_stone.png b/graphics/map_objects/pics/misc/birth_island_stone.png deleted file mode 100644 index 2ec134c22..000000000 Binary files a/graphics/map_objects/pics/misc/birth_island_stone.png and /dev/null differ diff --git a/graphics/map_objects/pics/misc/breakable_rock/0.png b/graphics/map_objects/pics/misc/breakable_rock/0.png deleted file mode 100644 index 058324c86..000000000 Binary files a/graphics/map_objects/pics/misc/breakable_rock/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/misc/breakable_rock/1.png b/graphics/map_objects/pics/misc/breakable_rock/1.png deleted file mode 100644 index 6c8b3133a..000000000 Binary files a/graphics/map_objects/pics/misc/breakable_rock/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/misc/breakable_rock/2.png b/graphics/map_objects/pics/misc/breakable_rock/2.png deleted file mode 100644 index 737148d66..000000000 Binary files a/graphics/map_objects/pics/misc/breakable_rock/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/misc/breakable_rock/3.png b/graphics/map_objects/pics/misc/breakable_rock/3.png deleted file mode 100644 index 89eedd1aa..000000000 Binary files a/graphics/map_objects/pics/misc/breakable_rock/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/misc/cable_car.png b/graphics/map_objects/pics/misc/cable_car.png deleted file mode 100644 index e0bd21ddf..000000000 Binary files a/graphics/map_objects/pics/misc/cable_car.png and /dev/null differ diff --git a/graphics/map_objects/pics/misc/cuttable_tree/0.png b/graphics/map_objects/pics/misc/cuttable_tree/0.png deleted file mode 100644 index 509d8b03c..000000000 Binary files a/graphics/map_objects/pics/misc/cuttable_tree/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/misc/cuttable_tree/1.png b/graphics/map_objects/pics/misc/cuttable_tree/1.png deleted file mode 100644 index afa42cf16..000000000 Binary files a/graphics/map_objects/pics/misc/cuttable_tree/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/misc/cuttable_tree/2.png b/graphics/map_objects/pics/misc/cuttable_tree/2.png deleted file mode 100644 index f222ece43..000000000 Binary files a/graphics/map_objects/pics/misc/cuttable_tree/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/misc/cuttable_tree/3.png b/graphics/map_objects/pics/misc/cuttable_tree/3.png deleted file mode 100644 index 09ffefd29..000000000 Binary files a/graphics/map_objects/pics/misc/cuttable_tree/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/misc/fossil.png b/graphics/map_objects/pics/misc/fossil.png deleted file mode 100644 index a8da0e8ff..000000000 Binary files a/graphics/map_objects/pics/misc/fossil.png and /dev/null differ diff --git a/graphics/map_objects/pics/misc/item_ball.png b/graphics/map_objects/pics/misc/item_ball.png deleted file mode 100644 index a30e02fb1..000000000 Binary files a/graphics/map_objects/pics/misc/item_ball.png and /dev/null differ diff --git a/graphics/map_objects/pics/misc/moving_box.png b/graphics/map_objects/pics/misc/moving_box.png deleted file mode 100644 index 3cbc41900..000000000 Binary files a/graphics/map_objects/pics/misc/moving_box.png and /dev/null differ diff --git a/graphics/map_objects/pics/misc/mr_brineys_boat/0.png b/graphics/map_objects/pics/misc/mr_brineys_boat/0.png deleted file mode 100644 index 593ed07c8..000000000 Binary files a/graphics/map_objects/pics/misc/mr_brineys_boat/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/misc/mr_brineys_boat/1.png b/graphics/map_objects/pics/misc/mr_brineys_boat/1.png deleted file mode 100644 index 39b75fd73..000000000 Binary files a/graphics/map_objects/pics/misc/mr_brineys_boat/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/misc/mr_brineys_boat/2.png b/graphics/map_objects/pics/misc/mr_brineys_boat/2.png deleted file mode 100644 index 9db6b11fe..000000000 Binary files a/graphics/map_objects/pics/misc/mr_brineys_boat/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/misc/pushable_boulder.png b/graphics/map_objects/pics/misc/pushable_boulder.png deleted file mode 100644 index a6962123c..000000000 Binary files a/graphics/map_objects/pics/misc/pushable_boulder.png and /dev/null differ diff --git a/graphics/map_objects/pics/misc/ss_tidal.png b/graphics/map_objects/pics/misc/ss_tidal.png deleted file mode 100644 index 40ca9a3f3..000000000 Binary files a/graphics/map_objects/pics/misc/ss_tidal.png and /dev/null differ diff --git a/graphics/map_objects/pics/misc/statue.png b/graphics/map_objects/pics/misc/statue.png deleted file mode 100644 index 725aa8a7b..000000000 Binary files a/graphics/map_objects/pics/misc/statue.png and /dev/null differ diff --git a/graphics/map_objects/pics/misc/submarine_shadow.png b/graphics/map_objects/pics/misc/submarine_shadow.png deleted file mode 100644 index b9dfc4c55..000000000 Binary files a/graphics/map_objects/pics/misc/submarine_shadow.png and /dev/null differ diff --git a/graphics/map_objects/pics/misc/truck.png b/graphics/map_objects/pics/misc/truck.png deleted file mode 100644 index 0d31ffbc2..000000000 Binary files a/graphics/map_objects/pics/misc/truck.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/anabel/0.png b/graphics/map_objects/pics/people/anabel/0.png deleted file mode 100644 index 94add04bb..000000000 Binary files a/graphics/map_objects/pics/people/anabel/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/anabel/1.png b/graphics/map_objects/pics/people/anabel/1.png deleted file mode 100644 index 644510063..000000000 Binary files a/graphics/map_objects/pics/people/anabel/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/anabel/2.png b/graphics/map_objects/pics/people/anabel/2.png deleted file mode 100644 index 92d365c9e..000000000 Binary files a/graphics/map_objects/pics/people/anabel/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/anabel/3.png b/graphics/map_objects/pics/people/anabel/3.png deleted file mode 100644 index 34a07e500..000000000 Binary files a/graphics/map_objects/pics/people/anabel/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/anabel/4.png b/graphics/map_objects/pics/people/anabel/4.png deleted file mode 100644 index 78a3f6413..000000000 Binary files a/graphics/map_objects/pics/people/anabel/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/anabel/5.png b/graphics/map_objects/pics/people/anabel/5.png deleted file mode 100644 index df1f31dbb..000000000 Binary files a/graphics/map_objects/pics/people/anabel/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/anabel/6.png b/graphics/map_objects/pics/people/anabel/6.png deleted file mode 100644 index 78914f5b2..000000000 Binary files a/graphics/map_objects/pics/people/anabel/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/anabel/7.png b/graphics/map_objects/pics/people/anabel/7.png deleted file mode 100644 index beb27e3c0..000000000 Binary files a/graphics/map_objects/pics/people/anabel/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/anabel/8.png b/graphics/map_objects/pics/people/anabel/8.png deleted file mode 100644 index 2d41a5e11..000000000 Binary files a/graphics/map_objects/pics/people/anabel/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/aqua_member_f/0.png b/graphics/map_objects/pics/people/aqua_member_f/0.png deleted file mode 100644 index 1f8c75cb3..000000000 Binary files a/graphics/map_objects/pics/people/aqua_member_f/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/aqua_member_f/1.png b/graphics/map_objects/pics/people/aqua_member_f/1.png deleted file mode 100644 index 16bc28e20..000000000 Binary files a/graphics/map_objects/pics/people/aqua_member_f/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/aqua_member_f/2.png b/graphics/map_objects/pics/people/aqua_member_f/2.png deleted file mode 100644 index 3e95c8ba2..000000000 Binary files a/graphics/map_objects/pics/people/aqua_member_f/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/aqua_member_f/3.png b/graphics/map_objects/pics/people/aqua_member_f/3.png deleted file mode 100644 index 8d17c85fd..000000000 Binary files a/graphics/map_objects/pics/people/aqua_member_f/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/aqua_member_f/4.png b/graphics/map_objects/pics/people/aqua_member_f/4.png deleted file mode 100644 index f62fdb100..000000000 Binary files a/graphics/map_objects/pics/people/aqua_member_f/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/aqua_member_f/5.png b/graphics/map_objects/pics/people/aqua_member_f/5.png deleted file mode 100644 index 6ec1ea515..000000000 Binary files a/graphics/map_objects/pics/people/aqua_member_f/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/aqua_member_f/6.png b/graphics/map_objects/pics/people/aqua_member_f/6.png deleted file mode 100644 index 0d74cf4d1..000000000 Binary files a/graphics/map_objects/pics/people/aqua_member_f/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/aqua_member_f/7.png b/graphics/map_objects/pics/people/aqua_member_f/7.png deleted file mode 100644 index fe5894e5f..000000000 Binary files a/graphics/map_objects/pics/people/aqua_member_f/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/aqua_member_f/8.png b/graphics/map_objects/pics/people/aqua_member_f/8.png deleted file mode 100644 index 3b3f736cb..000000000 Binary files a/graphics/map_objects/pics/people/aqua_member_f/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/aqua_member_m/0.png b/graphics/map_objects/pics/people/aqua_member_m/0.png deleted file mode 100644 index 60a2b8ace..000000000 Binary files a/graphics/map_objects/pics/people/aqua_member_m/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/aqua_member_m/1.png b/graphics/map_objects/pics/people/aqua_member_m/1.png deleted file mode 100644 index d87426a18..000000000 Binary files a/graphics/map_objects/pics/people/aqua_member_m/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/aqua_member_m/2.png b/graphics/map_objects/pics/people/aqua_member_m/2.png deleted file mode 100644 index c75f63396..000000000 Binary files a/graphics/map_objects/pics/people/aqua_member_m/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/aqua_member_m/3.png b/graphics/map_objects/pics/people/aqua_member_m/3.png deleted file mode 100644 index aaba2d9a1..000000000 Binary files a/graphics/map_objects/pics/people/aqua_member_m/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/aqua_member_m/4.png b/graphics/map_objects/pics/people/aqua_member_m/4.png deleted file mode 100644 index 326628fd0..000000000 Binary files a/graphics/map_objects/pics/people/aqua_member_m/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/aqua_member_m/5.png b/graphics/map_objects/pics/people/aqua_member_m/5.png deleted file mode 100644 index 647cfb95c..000000000 Binary files a/graphics/map_objects/pics/people/aqua_member_m/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/aqua_member_m/6.png b/graphics/map_objects/pics/people/aqua_member_m/6.png deleted file mode 100644 index 3918e64e9..000000000 Binary files a/graphics/map_objects/pics/people/aqua_member_m/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/aqua_member_m/7.png b/graphics/map_objects/pics/people/aqua_member_m/7.png deleted file mode 100644 index 57064088e..000000000 Binary files a/graphics/map_objects/pics/people/aqua_member_m/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/aqua_member_m/8.png b/graphics/map_objects/pics/people/aqua_member_m/8.png deleted file mode 100644 index 1e59c0cae..000000000 Binary files a/graphics/map_objects/pics/people/aqua_member_m/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/archie/0.png b/graphics/map_objects/pics/people/archie/0.png deleted file mode 100644 index dd091bd16..000000000 Binary files a/graphics/map_objects/pics/people/archie/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/archie/1.png b/graphics/map_objects/pics/people/archie/1.png deleted file mode 100644 index 1d278db6d..000000000 Binary files a/graphics/map_objects/pics/people/archie/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/archie/2.png b/graphics/map_objects/pics/people/archie/2.png deleted file mode 100644 index 2e1b7a1ce..000000000 Binary files a/graphics/map_objects/pics/people/archie/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/archie/3.png b/graphics/map_objects/pics/people/archie/3.png deleted file mode 100644 index 576abb99d..000000000 Binary files a/graphics/map_objects/pics/people/archie/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/archie/4.png b/graphics/map_objects/pics/people/archie/4.png deleted file mode 100644 index f48687318..000000000 Binary files a/graphics/map_objects/pics/people/archie/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/archie/5.png b/graphics/map_objects/pics/people/archie/5.png deleted file mode 100644 index f21490b7b..000000000 Binary files a/graphics/map_objects/pics/people/archie/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/archie/6.png b/graphics/map_objects/pics/people/archie/6.png deleted file mode 100644 index 29305a952..000000000 Binary files a/graphics/map_objects/pics/people/archie/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/archie/7.png b/graphics/map_objects/pics/people/archie/7.png deleted file mode 100644 index 778a7e964..000000000 Binary files a/graphics/map_objects/pics/people/archie/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/archie/8.png b/graphics/map_objects/pics/people/archie/8.png deleted file mode 100644 index 237101046..000000000 Binary files a/graphics/map_objects/pics/people/archie/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/artist/0.png b/graphics/map_objects/pics/people/artist/0.png deleted file mode 100644 index 9f25f9ea0..000000000 Binary files a/graphics/map_objects/pics/people/artist/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/artist/1.png b/graphics/map_objects/pics/people/artist/1.png deleted file mode 100644 index 6056f77a5..000000000 Binary files a/graphics/map_objects/pics/people/artist/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/artist/2.png b/graphics/map_objects/pics/people/artist/2.png deleted file mode 100644 index f1908e664..000000000 Binary files a/graphics/map_objects/pics/people/artist/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/artist/3.png b/graphics/map_objects/pics/people/artist/3.png deleted file mode 100644 index 62cafaa79..000000000 Binary files a/graphics/map_objects/pics/people/artist/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/artist/4.png b/graphics/map_objects/pics/people/artist/4.png deleted file mode 100644 index 718ad2d3b..000000000 Binary files a/graphics/map_objects/pics/people/artist/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/artist/5.png b/graphics/map_objects/pics/people/artist/5.png deleted file mode 100644 index cb37c0138..000000000 Binary files a/graphics/map_objects/pics/people/artist/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/artist/6.png b/graphics/map_objects/pics/people/artist/6.png deleted file mode 100644 index 281724e3d..000000000 Binary files a/graphics/map_objects/pics/people/artist/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/artist/7.png b/graphics/map_objects/pics/people/artist/7.png deleted file mode 100644 index 36157c6ee..000000000 Binary files a/graphics/map_objects/pics/people/artist/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/artist/8.png b/graphics/map_objects/pics/people/artist/8.png deleted file mode 100644 index df7afa65e..000000000 Binary files a/graphics/map_objects/pics/people/artist/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/beauty/0.png b/graphics/map_objects/pics/people/beauty/0.png deleted file mode 100644 index 50e0ece37..000000000 Binary files a/graphics/map_objects/pics/people/beauty/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/beauty/1.png b/graphics/map_objects/pics/people/beauty/1.png deleted file mode 100644 index 3a1ba51e9..000000000 Binary files a/graphics/map_objects/pics/people/beauty/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/beauty/2.png b/graphics/map_objects/pics/people/beauty/2.png deleted file mode 100644 index 5787f360f..000000000 Binary files a/graphics/map_objects/pics/people/beauty/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/beauty/3.png b/graphics/map_objects/pics/people/beauty/3.png deleted file mode 100644 index cc200158f..000000000 Binary files a/graphics/map_objects/pics/people/beauty/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/beauty/4.png b/graphics/map_objects/pics/people/beauty/4.png deleted file mode 100644 index f49ef45c6..000000000 Binary files a/graphics/map_objects/pics/people/beauty/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/beauty/5.png b/graphics/map_objects/pics/people/beauty/5.png deleted file mode 100644 index c8eed61d1..000000000 Binary files a/graphics/map_objects/pics/people/beauty/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/beauty/6.png b/graphics/map_objects/pics/people/beauty/6.png deleted file mode 100644 index fb298aa74..000000000 Binary files a/graphics/map_objects/pics/people/beauty/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/beauty/7.png b/graphics/map_objects/pics/people/beauty/7.png deleted file mode 100644 index 0b576e71a..000000000 Binary files a/graphics/map_objects/pics/people/beauty/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/beauty/8.png b/graphics/map_objects/pics/people/beauty/8.png deleted file mode 100644 index 77de6d5c5..000000000 Binary files a/graphics/map_objects/pics/people/beauty/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/black_belt/0.png b/graphics/map_objects/pics/people/black_belt/0.png deleted file mode 100644 index 0003a1a88..000000000 Binary files a/graphics/map_objects/pics/people/black_belt/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/black_belt/1.png b/graphics/map_objects/pics/people/black_belt/1.png deleted file mode 100644 index c3e3b8a1d..000000000 Binary files a/graphics/map_objects/pics/people/black_belt/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/black_belt/2.png b/graphics/map_objects/pics/people/black_belt/2.png deleted file mode 100644 index 0cb8f30bf..000000000 Binary files a/graphics/map_objects/pics/people/black_belt/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/black_belt/3.png b/graphics/map_objects/pics/people/black_belt/3.png deleted file mode 100644 index 8bae80b47..000000000 Binary files a/graphics/map_objects/pics/people/black_belt/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/black_belt/4.png b/graphics/map_objects/pics/people/black_belt/4.png deleted file mode 100644 index aacf9c3f7..000000000 Binary files a/graphics/map_objects/pics/people/black_belt/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/black_belt/5.png b/graphics/map_objects/pics/people/black_belt/5.png deleted file mode 100644 index 41c60075c..000000000 Binary files a/graphics/map_objects/pics/people/black_belt/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/black_belt/6.png b/graphics/map_objects/pics/people/black_belt/6.png deleted file mode 100644 index fa1c426a1..000000000 Binary files a/graphics/map_objects/pics/people/black_belt/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/black_belt/7.png b/graphics/map_objects/pics/people/black_belt/7.png deleted file mode 100644 index 013986add..000000000 Binary files a/graphics/map_objects/pics/people/black_belt/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/black_belt/8.png b/graphics/map_objects/pics/people/black_belt/8.png deleted file mode 100644 index 5efef483a..000000000 Binary files a/graphics/map_objects/pics/people/black_belt/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_1/0.png b/graphics/map_objects/pics/people/boy_1/0.png deleted file mode 100644 index ddb78aa81..000000000 Binary files a/graphics/map_objects/pics/people/boy_1/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_1/1.png b/graphics/map_objects/pics/people/boy_1/1.png deleted file mode 100644 index 57c6245b2..000000000 Binary files a/graphics/map_objects/pics/people/boy_1/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_1/2.png b/graphics/map_objects/pics/people/boy_1/2.png deleted file mode 100644 index cc0797ac8..000000000 Binary files a/graphics/map_objects/pics/people/boy_1/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_1/3.png b/graphics/map_objects/pics/people/boy_1/3.png deleted file mode 100644 index aa08c6302..000000000 Binary files a/graphics/map_objects/pics/people/boy_1/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_1/4.png b/graphics/map_objects/pics/people/boy_1/4.png deleted file mode 100644 index d60c49f7e..000000000 Binary files a/graphics/map_objects/pics/people/boy_1/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_1/5.png b/graphics/map_objects/pics/people/boy_1/5.png deleted file mode 100644 index e60d62e06..000000000 Binary files a/graphics/map_objects/pics/people/boy_1/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_1/6.png b/graphics/map_objects/pics/people/boy_1/6.png deleted file mode 100644 index 9c515fb2a..000000000 Binary files a/graphics/map_objects/pics/people/boy_1/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_1/7.png b/graphics/map_objects/pics/people/boy_1/7.png deleted file mode 100644 index 422ce9d9c..000000000 Binary files a/graphics/map_objects/pics/people/boy_1/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_1/8.png b/graphics/map_objects/pics/people/boy_1/8.png deleted file mode 100644 index 1fcff3113..000000000 Binary files a/graphics/map_objects/pics/people/boy_1/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_2/0.png b/graphics/map_objects/pics/people/boy_2/0.png deleted file mode 100644 index aefd58a96..000000000 Binary files a/graphics/map_objects/pics/people/boy_2/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_2/1.png b/graphics/map_objects/pics/people/boy_2/1.png deleted file mode 100644 index 8b0d448cb..000000000 Binary files a/graphics/map_objects/pics/people/boy_2/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_2/2.png b/graphics/map_objects/pics/people/boy_2/2.png deleted file mode 100644 index cad6a6cda..000000000 Binary files a/graphics/map_objects/pics/people/boy_2/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_2/3.png b/graphics/map_objects/pics/people/boy_2/3.png deleted file mode 100644 index 11dea03b8..000000000 Binary files a/graphics/map_objects/pics/people/boy_2/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_2/4.png b/graphics/map_objects/pics/people/boy_2/4.png deleted file mode 100644 index 7aa11f526..000000000 Binary files a/graphics/map_objects/pics/people/boy_2/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_2/5.png b/graphics/map_objects/pics/people/boy_2/5.png deleted file mode 100644 index 0ff4cc622..000000000 Binary files a/graphics/map_objects/pics/people/boy_2/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_2/6.png b/graphics/map_objects/pics/people/boy_2/6.png deleted file mode 100644 index 5e7e98f4d..000000000 Binary files a/graphics/map_objects/pics/people/boy_2/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_2/7.png b/graphics/map_objects/pics/people/boy_2/7.png deleted file mode 100644 index 3b7188f3a..000000000 Binary files a/graphics/map_objects/pics/people/boy_2/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_2/8.png b/graphics/map_objects/pics/people/boy_2/8.png deleted file mode 100644 index aea1fee46..000000000 Binary files a/graphics/map_objects/pics/people/boy_2/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_3/0.png b/graphics/map_objects/pics/people/boy_3/0.png deleted file mode 100644 index 6ac8b18c2..000000000 Binary files a/graphics/map_objects/pics/people/boy_3/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_3/1.png b/graphics/map_objects/pics/people/boy_3/1.png deleted file mode 100644 index e42abeb9f..000000000 Binary files a/graphics/map_objects/pics/people/boy_3/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_3/2.png b/graphics/map_objects/pics/people/boy_3/2.png deleted file mode 100644 index f6fdc1f83..000000000 Binary files a/graphics/map_objects/pics/people/boy_3/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_3/3.png b/graphics/map_objects/pics/people/boy_3/3.png deleted file mode 100644 index 8edb25b0c..000000000 Binary files a/graphics/map_objects/pics/people/boy_3/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_3/4.png b/graphics/map_objects/pics/people/boy_3/4.png deleted file mode 100644 index 016f12fd4..000000000 Binary files a/graphics/map_objects/pics/people/boy_3/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_3/5.png b/graphics/map_objects/pics/people/boy_3/5.png deleted file mode 100644 index b5d5bda85..000000000 Binary files a/graphics/map_objects/pics/people/boy_3/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_3/6.png b/graphics/map_objects/pics/people/boy_3/6.png deleted file mode 100644 index 703bcdbbc..000000000 Binary files a/graphics/map_objects/pics/people/boy_3/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_3/7.png b/graphics/map_objects/pics/people/boy_3/7.png deleted file mode 100644 index aeaf29942..000000000 Binary files a/graphics/map_objects/pics/people/boy_3/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_3/8.png b/graphics/map_objects/pics/people/boy_3/8.png deleted file mode 100644 index 26ef82fc3..000000000 Binary files a/graphics/map_objects/pics/people/boy_3/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_4/0.png b/graphics/map_objects/pics/people/boy_4/0.png deleted file mode 100644 index a0b93b2f4..000000000 Binary files a/graphics/map_objects/pics/people/boy_4/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_4/1.png b/graphics/map_objects/pics/people/boy_4/1.png deleted file mode 100644 index 9c287e39d..000000000 Binary files a/graphics/map_objects/pics/people/boy_4/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_4/2.png b/graphics/map_objects/pics/people/boy_4/2.png deleted file mode 100644 index e1cead5ad..000000000 Binary files a/graphics/map_objects/pics/people/boy_4/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_4/3.png b/graphics/map_objects/pics/people/boy_4/3.png deleted file mode 100644 index d64420afd..000000000 Binary files a/graphics/map_objects/pics/people/boy_4/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_4/4.png b/graphics/map_objects/pics/people/boy_4/4.png deleted file mode 100644 index f7779a135..000000000 Binary files a/graphics/map_objects/pics/people/boy_4/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_4/5.png b/graphics/map_objects/pics/people/boy_4/5.png deleted file mode 100644 index 76485893d..000000000 Binary files a/graphics/map_objects/pics/people/boy_4/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_4/6.png b/graphics/map_objects/pics/people/boy_4/6.png deleted file mode 100644 index 9f63aba4e..000000000 Binary files a/graphics/map_objects/pics/people/boy_4/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_4/7.png b/graphics/map_objects/pics/people/boy_4/7.png deleted file mode 100644 index 40d19f455..000000000 Binary files a/graphics/map_objects/pics/people/boy_4/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_4/8.png b/graphics/map_objects/pics/people/boy_4/8.png deleted file mode 100644 index 1ed4d0da0..000000000 Binary files a/graphics/map_objects/pics/people/boy_4/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_5/0.png b/graphics/map_objects/pics/people/boy_5/0.png deleted file mode 100644 index 2a0ab6a07..000000000 Binary files a/graphics/map_objects/pics/people/boy_5/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_5/1.png b/graphics/map_objects/pics/people/boy_5/1.png deleted file mode 100644 index 65f7f1dcf..000000000 Binary files a/graphics/map_objects/pics/people/boy_5/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/boy_5/2.png b/graphics/map_objects/pics/people/boy_5/2.png deleted file mode 100644 index ece405a28..000000000 Binary files a/graphics/map_objects/pics/people/boy_5/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brandon/0.png b/graphics/map_objects/pics/people/brandon/0.png deleted file mode 100644 index 85d567a95..000000000 Binary files a/graphics/map_objects/pics/people/brandon/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brandon/1.png b/graphics/map_objects/pics/people/brandon/1.png deleted file mode 100644 index 90a67c879..000000000 Binary files a/graphics/map_objects/pics/people/brandon/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brandon/2.png b/graphics/map_objects/pics/people/brandon/2.png deleted file mode 100644 index 914c842d4..000000000 Binary files a/graphics/map_objects/pics/people/brandon/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brandon/3.png b/graphics/map_objects/pics/people/brandon/3.png deleted file mode 100644 index dea524915..000000000 Binary files a/graphics/map_objects/pics/people/brandon/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brandon/4.png b/graphics/map_objects/pics/people/brandon/4.png deleted file mode 100644 index 60588dd0c..000000000 Binary files a/graphics/map_objects/pics/people/brandon/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brandon/5.png b/graphics/map_objects/pics/people/brandon/5.png deleted file mode 100644 index d1f8ee242..000000000 Binary files a/graphics/map_objects/pics/people/brandon/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brandon/6.png b/graphics/map_objects/pics/people/brandon/6.png deleted file mode 100644 index 68564a2a3..000000000 Binary files a/graphics/map_objects/pics/people/brandon/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brandon/7.png b/graphics/map_objects/pics/people/brandon/7.png deleted file mode 100644 index 5fdb88f6b..000000000 Binary files a/graphics/map_objects/pics/people/brandon/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brandon/8.png b/graphics/map_objects/pics/people/brandon/8.png deleted file mode 100644 index 529114e45..000000000 Binary files a/graphics/map_objects/pics/people/brandon/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brawly/0.png b/graphics/map_objects/pics/people/brawly/0.png deleted file mode 100644 index f22faad59..000000000 Binary files a/graphics/map_objects/pics/people/brawly/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brawly/1.png b/graphics/map_objects/pics/people/brawly/1.png deleted file mode 100644 index 38ab1f090..000000000 Binary files a/graphics/map_objects/pics/people/brawly/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brawly/2.png b/graphics/map_objects/pics/people/brawly/2.png deleted file mode 100644 index 0f9289d0b..000000000 Binary files a/graphics/map_objects/pics/people/brawly/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/00.png b/graphics/map_objects/pics/people/brendan/acro_bike/00.png deleted file mode 100644 index d0c556042..000000000 Binary files a/graphics/map_objects/pics/people/brendan/acro_bike/00.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/01.png b/graphics/map_objects/pics/people/brendan/acro_bike/01.png deleted file mode 100644 index 4a4fbb0c9..000000000 Binary files a/graphics/map_objects/pics/people/brendan/acro_bike/01.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/02.png b/graphics/map_objects/pics/people/brendan/acro_bike/02.png deleted file mode 100644 index c657e8b37..000000000 Binary files a/graphics/map_objects/pics/people/brendan/acro_bike/02.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/03.png b/graphics/map_objects/pics/people/brendan/acro_bike/03.png deleted file mode 100644 index 38f3a08a7..000000000 Binary files a/graphics/map_objects/pics/people/brendan/acro_bike/03.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/04.png b/graphics/map_objects/pics/people/brendan/acro_bike/04.png deleted file mode 100644 index 1fa84a846..000000000 Binary files a/graphics/map_objects/pics/people/brendan/acro_bike/04.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/05.png b/graphics/map_objects/pics/people/brendan/acro_bike/05.png deleted file mode 100644 index cb9788e69..000000000 Binary files a/graphics/map_objects/pics/people/brendan/acro_bike/05.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/06.png b/graphics/map_objects/pics/people/brendan/acro_bike/06.png deleted file mode 100644 index 345a2277e..000000000 Binary files a/graphics/map_objects/pics/people/brendan/acro_bike/06.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/07.png b/graphics/map_objects/pics/people/brendan/acro_bike/07.png deleted file mode 100644 index 0677027b0..000000000 Binary files a/graphics/map_objects/pics/people/brendan/acro_bike/07.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/08.png b/graphics/map_objects/pics/people/brendan/acro_bike/08.png deleted file mode 100644 index a24484281..000000000 Binary files a/graphics/map_objects/pics/people/brendan/acro_bike/08.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/09.png b/graphics/map_objects/pics/people/brendan/acro_bike/09.png deleted file mode 100644 index b209676f5..000000000 Binary files a/graphics/map_objects/pics/people/brendan/acro_bike/09.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/10.png b/graphics/map_objects/pics/people/brendan/acro_bike/10.png deleted file mode 100644 index b472a680d..000000000 Binary files a/graphics/map_objects/pics/people/brendan/acro_bike/10.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/11.png b/graphics/map_objects/pics/people/brendan/acro_bike/11.png deleted file mode 100644 index 7a8110dd5..000000000 Binary files a/graphics/map_objects/pics/people/brendan/acro_bike/11.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/12.png b/graphics/map_objects/pics/people/brendan/acro_bike/12.png deleted file mode 100644 index 719516161..000000000 Binary files a/graphics/map_objects/pics/people/brendan/acro_bike/12.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/13.png b/graphics/map_objects/pics/people/brendan/acro_bike/13.png deleted file mode 100644 index 7b24c24f4..000000000 Binary files a/graphics/map_objects/pics/people/brendan/acro_bike/13.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/14.png b/graphics/map_objects/pics/people/brendan/acro_bike/14.png deleted file mode 100644 index bbb91d751..000000000 Binary files a/graphics/map_objects/pics/people/brendan/acro_bike/14.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/15.png b/graphics/map_objects/pics/people/brendan/acro_bike/15.png deleted file mode 100644 index 3caacb23e..000000000 Binary files a/graphics/map_objects/pics/people/brendan/acro_bike/15.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/16.png b/graphics/map_objects/pics/people/brendan/acro_bike/16.png deleted file mode 100644 index aa26f59cc..000000000 Binary files a/graphics/map_objects/pics/people/brendan/acro_bike/16.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/17.png b/graphics/map_objects/pics/people/brendan/acro_bike/17.png deleted file mode 100644 index 0a3d0c1a7..000000000 Binary files a/graphics/map_objects/pics/people/brendan/acro_bike/17.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/18.png b/graphics/map_objects/pics/people/brendan/acro_bike/18.png deleted file mode 100644 index dd442bb2e..000000000 Binary files a/graphics/map_objects/pics/people/brendan/acro_bike/18.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/19.png b/graphics/map_objects/pics/people/brendan/acro_bike/19.png deleted file mode 100644 index 705c0668e..000000000 Binary files a/graphics/map_objects/pics/people/brendan/acro_bike/19.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/20.png b/graphics/map_objects/pics/people/brendan/acro_bike/20.png deleted file mode 100644 index 665d699aa..000000000 Binary files a/graphics/map_objects/pics/people/brendan/acro_bike/20.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/21.png b/graphics/map_objects/pics/people/brendan/acro_bike/21.png deleted file mode 100644 index 3ea90bb2b..000000000 Binary files a/graphics/map_objects/pics/people/brendan/acro_bike/21.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/22.png b/graphics/map_objects/pics/people/brendan/acro_bike/22.png deleted file mode 100644 index b69f0e052..000000000 Binary files a/graphics/map_objects/pics/people/brendan/acro_bike/22.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/23.png b/graphics/map_objects/pics/people/brendan/acro_bike/23.png deleted file mode 100644 index df87a8442..000000000 Binary files a/graphics/map_objects/pics/people/brendan/acro_bike/23.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/24.png b/graphics/map_objects/pics/people/brendan/acro_bike/24.png deleted file mode 100644 index 0e301734d..000000000 Binary files a/graphics/map_objects/pics/people/brendan/acro_bike/24.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/25.png b/graphics/map_objects/pics/people/brendan/acro_bike/25.png deleted file mode 100644 index 1cf49c09a..000000000 Binary files a/graphics/map_objects/pics/people/brendan/acro_bike/25.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/26.png b/graphics/map_objects/pics/people/brendan/acro_bike/26.png deleted file mode 100644 index 54e150a3c..000000000 Binary files a/graphics/map_objects/pics/people/brendan/acro_bike/26.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/decorating.png b/graphics/map_objects/pics/people/brendan/decorating.png deleted file mode 100644 index c0839120a..000000000 Binary files a/graphics/map_objects/pics/people/brendan/decorating.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/field_move/0.png b/graphics/map_objects/pics/people/brendan/field_move/0.png deleted file mode 100644 index d8cd793d8..000000000 Binary files a/graphics/map_objects/pics/people/brendan/field_move/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/field_move/1.png b/graphics/map_objects/pics/people/brendan/field_move/1.png deleted file mode 100644 index 25550176e..000000000 Binary files a/graphics/map_objects/pics/people/brendan/field_move/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/field_move/2.png b/graphics/map_objects/pics/people/brendan/field_move/2.png deleted file mode 100644 index a817426f9..000000000 Binary files a/graphics/map_objects/pics/people/brendan/field_move/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/field_move/3.png b/graphics/map_objects/pics/people/brendan/field_move/3.png deleted file mode 100644 index 527189377..000000000 Binary files a/graphics/map_objects/pics/people/brendan/field_move/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/field_move/4.png b/graphics/map_objects/pics/people/brendan/field_move/4.png deleted file mode 100644 index 05ac7919d..000000000 Binary files a/graphics/map_objects/pics/people/brendan/field_move/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/fishing/00.png b/graphics/map_objects/pics/people/brendan/fishing/00.png deleted file mode 100644 index db6b3d2ff..000000000 Binary files a/graphics/map_objects/pics/people/brendan/fishing/00.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/fishing/01.png b/graphics/map_objects/pics/people/brendan/fishing/01.png deleted file mode 100644 index cca89997d..000000000 Binary files a/graphics/map_objects/pics/people/brendan/fishing/01.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/fishing/02.png b/graphics/map_objects/pics/people/brendan/fishing/02.png deleted file mode 100644 index 6adbb9f55..000000000 Binary files a/graphics/map_objects/pics/people/brendan/fishing/02.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/fishing/03.png b/graphics/map_objects/pics/people/brendan/fishing/03.png deleted file mode 100644 index 22101c8b6..000000000 Binary files a/graphics/map_objects/pics/people/brendan/fishing/03.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/fishing/04.png b/graphics/map_objects/pics/people/brendan/fishing/04.png deleted file mode 100644 index e8fec65a2..000000000 Binary files a/graphics/map_objects/pics/people/brendan/fishing/04.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/fishing/05.png b/graphics/map_objects/pics/people/brendan/fishing/05.png deleted file mode 100644 index c9ee2fa4c..000000000 Binary files a/graphics/map_objects/pics/people/brendan/fishing/05.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/fishing/06.png b/graphics/map_objects/pics/people/brendan/fishing/06.png deleted file mode 100644 index caaeee078..000000000 Binary files a/graphics/map_objects/pics/people/brendan/fishing/06.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/fishing/07.png b/graphics/map_objects/pics/people/brendan/fishing/07.png deleted file mode 100644 index c39110e1c..000000000 Binary files a/graphics/map_objects/pics/people/brendan/fishing/07.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/fishing/08.png b/graphics/map_objects/pics/people/brendan/fishing/08.png deleted file mode 100644 index 3b1b1728c..000000000 Binary files a/graphics/map_objects/pics/people/brendan/fishing/08.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/fishing/09.png b/graphics/map_objects/pics/people/brendan/fishing/09.png deleted file mode 100644 index f21c37d60..000000000 Binary files a/graphics/map_objects/pics/people/brendan/fishing/09.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/fishing/10.png b/graphics/map_objects/pics/people/brendan/fishing/10.png deleted file mode 100644 index f80186d1f..000000000 Binary files a/graphics/map_objects/pics/people/brendan/fishing/10.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/fishing/11.png b/graphics/map_objects/pics/people/brendan/fishing/11.png deleted file mode 100644 index 66b2b5917..000000000 Binary files a/graphics/map_objects/pics/people/brendan/fishing/11.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/0.png b/graphics/map_objects/pics/people/brendan/mach_bike/0.png deleted file mode 100644 index d0c556042..000000000 Binary files a/graphics/map_objects/pics/people/brendan/mach_bike/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/1.png b/graphics/map_objects/pics/people/brendan/mach_bike/1.png deleted file mode 100644 index 4a4fbb0c9..000000000 Binary files a/graphics/map_objects/pics/people/brendan/mach_bike/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/2.png b/graphics/map_objects/pics/people/brendan/mach_bike/2.png deleted file mode 100644 index c657e8b37..000000000 Binary files a/graphics/map_objects/pics/people/brendan/mach_bike/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/3.png b/graphics/map_objects/pics/people/brendan/mach_bike/3.png deleted file mode 100644 index bbe403817..000000000 Binary files a/graphics/map_objects/pics/people/brendan/mach_bike/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/4.png b/graphics/map_objects/pics/people/brendan/mach_bike/4.png deleted file mode 100644 index 9fe91dd46..000000000 Binary files a/graphics/map_objects/pics/people/brendan/mach_bike/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/5.png b/graphics/map_objects/pics/people/brendan/mach_bike/5.png deleted file mode 100644 index cb9788e69..000000000 Binary files a/graphics/map_objects/pics/people/brendan/mach_bike/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/6.png b/graphics/map_objects/pics/people/brendan/mach_bike/6.png deleted file mode 100644 index 345a2277e..000000000 Binary files a/graphics/map_objects/pics/people/brendan/mach_bike/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/7.png b/graphics/map_objects/pics/people/brendan/mach_bike/7.png deleted file mode 100644 index 0677027b0..000000000 Binary files a/graphics/map_objects/pics/people/brendan/mach_bike/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/8.png b/graphics/map_objects/pics/people/brendan/mach_bike/8.png deleted file mode 100644 index a24484281..000000000 Binary files a/graphics/map_objects/pics/people/brendan/mach_bike/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/normal/00.png b/graphics/map_objects/pics/people/brendan/normal/00.png deleted file mode 100644 index 3d0f4c8d5..000000000 Binary files a/graphics/map_objects/pics/people/brendan/normal/00.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/normal/01.png b/graphics/map_objects/pics/people/brendan/normal/01.png deleted file mode 100644 index b36412513..000000000 Binary files a/graphics/map_objects/pics/people/brendan/normal/01.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/normal/02.png b/graphics/map_objects/pics/people/brendan/normal/02.png deleted file mode 100644 index 0f3c3775e..000000000 Binary files a/graphics/map_objects/pics/people/brendan/normal/02.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/normal/03.png b/graphics/map_objects/pics/people/brendan/normal/03.png deleted file mode 100644 index b415377c7..000000000 Binary files a/graphics/map_objects/pics/people/brendan/normal/03.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/normal/04.png b/graphics/map_objects/pics/people/brendan/normal/04.png deleted file mode 100644 index fb92c09cd..000000000 Binary files a/graphics/map_objects/pics/people/brendan/normal/04.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/normal/05.png b/graphics/map_objects/pics/people/brendan/normal/05.png deleted file mode 100644 index a5d0518a4..000000000 Binary files a/graphics/map_objects/pics/people/brendan/normal/05.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/normal/06.png b/graphics/map_objects/pics/people/brendan/normal/06.png deleted file mode 100644 index 66a4293b2..000000000 Binary files a/graphics/map_objects/pics/people/brendan/normal/06.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/normal/07.png b/graphics/map_objects/pics/people/brendan/normal/07.png deleted file mode 100644 index 7710ce994..000000000 Binary files a/graphics/map_objects/pics/people/brendan/normal/07.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/normal/08.png b/graphics/map_objects/pics/people/brendan/normal/08.png deleted file mode 100644 index 12e9f07b3..000000000 Binary files a/graphics/map_objects/pics/people/brendan/normal/08.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/normal/09.png b/graphics/map_objects/pics/people/brendan/normal/09.png deleted file mode 100644 index 3c7aebbf4..000000000 Binary files a/graphics/map_objects/pics/people/brendan/normal/09.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/normal/10.png b/graphics/map_objects/pics/people/brendan/normal/10.png deleted file mode 100644 index ed928914f..000000000 Binary files a/graphics/map_objects/pics/people/brendan/normal/10.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/normal/11.png b/graphics/map_objects/pics/people/brendan/normal/11.png deleted file mode 100644 index 754b05a78..000000000 Binary files a/graphics/map_objects/pics/people/brendan/normal/11.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/normal/12.png b/graphics/map_objects/pics/people/brendan/normal/12.png deleted file mode 100644 index 6f707e724..000000000 Binary files a/graphics/map_objects/pics/people/brendan/normal/12.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/normal/13.png b/graphics/map_objects/pics/people/brendan/normal/13.png deleted file mode 100644 index 10ec74720..000000000 Binary files a/graphics/map_objects/pics/people/brendan/normal/13.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/normal/14.png b/graphics/map_objects/pics/people/brendan/normal/14.png deleted file mode 100644 index 5cf30bfb9..000000000 Binary files a/graphics/map_objects/pics/people/brendan/normal/14.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/normal/15.png b/graphics/map_objects/pics/people/brendan/normal/15.png deleted file mode 100644 index a1e8132d5..000000000 Binary files a/graphics/map_objects/pics/people/brendan/normal/15.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/normal/16.png b/graphics/map_objects/pics/people/brendan/normal/16.png deleted file mode 100644 index 6a0b22992..000000000 Binary files a/graphics/map_objects/pics/people/brendan/normal/16.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/normal/17.png b/graphics/map_objects/pics/people/brendan/normal/17.png deleted file mode 100644 index cbf76035a..000000000 Binary files a/graphics/map_objects/pics/people/brendan/normal/17.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/surfing/0.png b/graphics/map_objects/pics/people/brendan/surfing/0.png deleted file mode 100644 index 67f4377bd..000000000 Binary files a/graphics/map_objects/pics/people/brendan/surfing/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/surfing/1.png b/graphics/map_objects/pics/people/brendan/surfing/1.png deleted file mode 100644 index cfec0e085..000000000 Binary files a/graphics/map_objects/pics/people/brendan/surfing/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/surfing/2.png b/graphics/map_objects/pics/people/brendan/surfing/2.png deleted file mode 100644 index 2d0fd5b79..000000000 Binary files a/graphics/map_objects/pics/people/brendan/surfing/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/surfing/3.png b/graphics/map_objects/pics/people/brendan/surfing/3.png deleted file mode 100644 index 0c2517901..000000000 Binary files a/graphics/map_objects/pics/people/brendan/surfing/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/surfing/4.png b/graphics/map_objects/pics/people/brendan/surfing/4.png deleted file mode 100644 index abe894a45..000000000 Binary files a/graphics/map_objects/pics/people/brendan/surfing/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/surfing/5.png b/graphics/map_objects/pics/people/brendan/surfing/5.png deleted file mode 100644 index 613114c39..000000000 Binary files a/graphics/map_objects/pics/people/brendan/surfing/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/underwater/0.png b/graphics/map_objects/pics/people/brendan/underwater/0.png deleted file mode 100644 index 79951c29c..000000000 Binary files a/graphics/map_objects/pics/people/brendan/underwater/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/underwater/1.png b/graphics/map_objects/pics/people/brendan/underwater/1.png deleted file mode 100644 index d7c3f0783..000000000 Binary files a/graphics/map_objects/pics/people/brendan/underwater/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/underwater/2.png b/graphics/map_objects/pics/people/brendan/underwater/2.png deleted file mode 100644 index 628a2ac88..000000000 Binary files a/graphics/map_objects/pics/people/brendan/underwater/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/underwater/3.png b/graphics/map_objects/pics/people/brendan/underwater/3.png deleted file mode 100644 index 7756a96db..000000000 Binary files a/graphics/map_objects/pics/people/brendan/underwater/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/watering/0.png b/graphics/map_objects/pics/people/brendan/watering/0.png deleted file mode 100644 index 0f8d95430..000000000 Binary files a/graphics/map_objects/pics/people/brendan/watering/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/watering/1.png b/graphics/map_objects/pics/people/brendan/watering/1.png deleted file mode 100644 index 7b5ddc996..000000000 Binary files a/graphics/map_objects/pics/people/brendan/watering/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/watering/2.png b/graphics/map_objects/pics/people/brendan/watering/2.png deleted file mode 100644 index 3441131fa..000000000 Binary files a/graphics/map_objects/pics/people/brendan/watering/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/watering/3.png b/graphics/map_objects/pics/people/brendan/watering/3.png deleted file mode 100644 index 06baf24fc..000000000 Binary files a/graphics/map_objects/pics/people/brendan/watering/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/watering/4.png b/graphics/map_objects/pics/people/brendan/watering/4.png deleted file mode 100644 index 40dbbacab..000000000 Binary files a/graphics/map_objects/pics/people/brendan/watering/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/brendan/watering/5.png b/graphics/map_objects/pics/people/brendan/watering/5.png deleted file mode 100644 index a72edf144..000000000 Binary files a/graphics/map_objects/pics/people/brendan/watering/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/bug_catcher/0.png b/graphics/map_objects/pics/people/bug_catcher/0.png deleted file mode 100644 index 860449379..000000000 Binary files a/graphics/map_objects/pics/people/bug_catcher/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/bug_catcher/1.png b/graphics/map_objects/pics/people/bug_catcher/1.png deleted file mode 100644 index a0a3b3df1..000000000 Binary files a/graphics/map_objects/pics/people/bug_catcher/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/bug_catcher/2.png b/graphics/map_objects/pics/people/bug_catcher/2.png deleted file mode 100644 index 96363e4a8..000000000 Binary files a/graphics/map_objects/pics/people/bug_catcher/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/bug_catcher/3.png b/graphics/map_objects/pics/people/bug_catcher/3.png deleted file mode 100644 index 472fa42cb..000000000 Binary files a/graphics/map_objects/pics/people/bug_catcher/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/bug_catcher/4.png b/graphics/map_objects/pics/people/bug_catcher/4.png deleted file mode 100644 index f6da1bb97..000000000 Binary files a/graphics/map_objects/pics/people/bug_catcher/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/bug_catcher/5.png b/graphics/map_objects/pics/people/bug_catcher/5.png deleted file mode 100644 index bd5aea560..000000000 Binary files a/graphics/map_objects/pics/people/bug_catcher/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/bug_catcher/6.png b/graphics/map_objects/pics/people/bug_catcher/6.png deleted file mode 100644 index 2a93fc6b7..000000000 Binary files a/graphics/map_objects/pics/people/bug_catcher/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/bug_catcher/7.png b/graphics/map_objects/pics/people/bug_catcher/7.png deleted file mode 100644 index fded025e3..000000000 Binary files a/graphics/map_objects/pics/people/bug_catcher/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/bug_catcher/8.png b/graphics/map_objects/pics/people/bug_catcher/8.png deleted file mode 100644 index df561597b..000000000 Binary files a/graphics/map_objects/pics/people/bug_catcher/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/cameraman/0.png b/graphics/map_objects/pics/people/cameraman/0.png deleted file mode 100644 index af6ad2878..000000000 Binary files a/graphics/map_objects/pics/people/cameraman/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/cameraman/1.png b/graphics/map_objects/pics/people/cameraman/1.png deleted file mode 100644 index 112ee86b4..000000000 Binary files a/graphics/map_objects/pics/people/cameraman/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/cameraman/2.png b/graphics/map_objects/pics/people/cameraman/2.png deleted file mode 100644 index 6eaca8266..000000000 Binary files a/graphics/map_objects/pics/people/cameraman/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/cameraman/3.png b/graphics/map_objects/pics/people/cameraman/3.png deleted file mode 100644 index 6091fb350..000000000 Binary files a/graphics/map_objects/pics/people/cameraman/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/cameraman/4.png b/graphics/map_objects/pics/people/cameraman/4.png deleted file mode 100644 index ffacefa38..000000000 Binary files a/graphics/map_objects/pics/people/cameraman/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/cameraman/5.png b/graphics/map_objects/pics/people/cameraman/5.png deleted file mode 100644 index 44c1a768c..000000000 Binary files a/graphics/map_objects/pics/people/cameraman/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/cameraman/6.png b/graphics/map_objects/pics/people/cameraman/6.png deleted file mode 100644 index e8c41883d..000000000 Binary files a/graphics/map_objects/pics/people/cameraman/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/cameraman/7.png b/graphics/map_objects/pics/people/cameraman/7.png deleted file mode 100644 index 2ccfeae84..000000000 Binary files a/graphics/map_objects/pics/people/cameraman/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/cameraman/8.png b/graphics/map_objects/pics/people/cameraman/8.png deleted file mode 100644 index e2af57df1..000000000 Binary files a/graphics/map_objects/pics/people/cameraman/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/camper/0.png b/graphics/map_objects/pics/people/camper/0.png deleted file mode 100644 index ffdea18b6..000000000 Binary files a/graphics/map_objects/pics/people/camper/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/camper/1.png b/graphics/map_objects/pics/people/camper/1.png deleted file mode 100644 index ea5ef4d86..000000000 Binary files a/graphics/map_objects/pics/people/camper/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/camper/2.png b/graphics/map_objects/pics/people/camper/2.png deleted file mode 100644 index c25c51a78..000000000 Binary files a/graphics/map_objects/pics/people/camper/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/camper/3.png b/graphics/map_objects/pics/people/camper/3.png deleted file mode 100644 index 451f9c469..000000000 Binary files a/graphics/map_objects/pics/people/camper/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/camper/4.png b/graphics/map_objects/pics/people/camper/4.png deleted file mode 100644 index b17781df4..000000000 Binary files a/graphics/map_objects/pics/people/camper/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/camper/5.png b/graphics/map_objects/pics/people/camper/5.png deleted file mode 100644 index ea79ad5d2..000000000 Binary files a/graphics/map_objects/pics/people/camper/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/camper/6.png b/graphics/map_objects/pics/people/camper/6.png deleted file mode 100644 index 7f003b53f..000000000 Binary files a/graphics/map_objects/pics/people/camper/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/camper/7.png b/graphics/map_objects/pics/people/camper/7.png deleted file mode 100644 index 4dcb217b3..000000000 Binary files a/graphics/map_objects/pics/people/camper/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/camper/8.png b/graphics/map_objects/pics/people/camper/8.png deleted file mode 100644 index 888a0d17f..000000000 Binary files a/graphics/map_objects/pics/people/camper/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/contest_old_man/0.png b/graphics/map_objects/pics/people/contest_old_man/0.png deleted file mode 100644 index 118a34463..000000000 Binary files a/graphics/map_objects/pics/people/contest_old_man/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/contest_old_man/1.png b/graphics/map_objects/pics/people/contest_old_man/1.png deleted file mode 100644 index 75f9010dd..000000000 Binary files a/graphics/map_objects/pics/people/contest_old_man/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/contest_old_man/2.png b/graphics/map_objects/pics/people/contest_old_man/2.png deleted file mode 100644 index 8ca543cef..000000000 Binary files a/graphics/map_objects/pics/people/contest_old_man/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/contest_old_man/3.png b/graphics/map_objects/pics/people/contest_old_man/3.png deleted file mode 100644 index 16015e53c..000000000 Binary files a/graphics/map_objects/pics/people/contest_old_man/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/contest_old_man/4.png b/graphics/map_objects/pics/people/contest_old_man/4.png deleted file mode 100644 index e4fdfcc13..000000000 Binary files a/graphics/map_objects/pics/people/contest_old_man/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/contest_old_man/5.png b/graphics/map_objects/pics/people/contest_old_man/5.png deleted file mode 100644 index 5de4a6b80..000000000 Binary files a/graphics/map_objects/pics/people/contest_old_man/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/contest_old_man/6.png b/graphics/map_objects/pics/people/contest_old_man/6.png deleted file mode 100644 index ebcb577d4..000000000 Binary files a/graphics/map_objects/pics/people/contest_old_man/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/contest_old_man/7.png b/graphics/map_objects/pics/people/contest_old_man/7.png deleted file mode 100644 index d01f156c1..000000000 Binary files a/graphics/map_objects/pics/people/contest_old_man/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/contest_old_man/8.png b/graphics/map_objects/pics/people/contest_old_man/8.png deleted file mode 100644 index 84e5690b7..000000000 Binary files a/graphics/map_objects/pics/people/contest_old_man/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/cook/0.png b/graphics/map_objects/pics/people/cook/0.png deleted file mode 100644 index 1413ce869..000000000 Binary files a/graphics/map_objects/pics/people/cook/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/cook/1.png b/graphics/map_objects/pics/people/cook/1.png deleted file mode 100644 index 622e2b2d2..000000000 Binary files a/graphics/map_objects/pics/people/cook/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/cook/2.png b/graphics/map_objects/pics/people/cook/2.png deleted file mode 100644 index b2c2231a2..000000000 Binary files a/graphics/map_objects/pics/people/cook/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/0.png b/graphics/map_objects/pics/people/cycling_triathlete_f/0.png deleted file mode 100644 index 452ba3daf..000000000 Binary files a/graphics/map_objects/pics/people/cycling_triathlete_f/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/1.png b/graphics/map_objects/pics/people/cycling_triathlete_f/1.png deleted file mode 100644 index e4c8c78cb..000000000 Binary files a/graphics/map_objects/pics/people/cycling_triathlete_f/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/2.png b/graphics/map_objects/pics/people/cycling_triathlete_f/2.png deleted file mode 100644 index 20986da62..000000000 Binary files a/graphics/map_objects/pics/people/cycling_triathlete_f/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/3.png b/graphics/map_objects/pics/people/cycling_triathlete_f/3.png deleted file mode 100644 index 5cfda5ff6..000000000 Binary files a/graphics/map_objects/pics/people/cycling_triathlete_f/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/4.png b/graphics/map_objects/pics/people/cycling_triathlete_f/4.png deleted file mode 100644 index e52cac84e..000000000 Binary files a/graphics/map_objects/pics/people/cycling_triathlete_f/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/5.png b/graphics/map_objects/pics/people/cycling_triathlete_f/5.png deleted file mode 100644 index 8376cc00e..000000000 Binary files a/graphics/map_objects/pics/people/cycling_triathlete_f/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/6.png b/graphics/map_objects/pics/people/cycling_triathlete_f/6.png deleted file mode 100644 index d99951529..000000000 Binary files a/graphics/map_objects/pics/people/cycling_triathlete_f/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/7.png b/graphics/map_objects/pics/people/cycling_triathlete_f/7.png deleted file mode 100644 index a1c953c83..000000000 Binary files a/graphics/map_objects/pics/people/cycling_triathlete_f/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/8.png b/graphics/map_objects/pics/people/cycling_triathlete_f/8.png deleted file mode 100644 index 63a6ebb0c..000000000 Binary files a/graphics/map_objects/pics/people/cycling_triathlete_f/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/0.png b/graphics/map_objects/pics/people/cycling_triathlete_m/0.png deleted file mode 100644 index 107589cbc..000000000 Binary files a/graphics/map_objects/pics/people/cycling_triathlete_m/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/1.png b/graphics/map_objects/pics/people/cycling_triathlete_m/1.png deleted file mode 100644 index 39cf99a21..000000000 Binary files a/graphics/map_objects/pics/people/cycling_triathlete_m/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/2.png b/graphics/map_objects/pics/people/cycling_triathlete_m/2.png deleted file mode 100644 index f5ab76d10..000000000 Binary files a/graphics/map_objects/pics/people/cycling_triathlete_m/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/3.png b/graphics/map_objects/pics/people/cycling_triathlete_m/3.png deleted file mode 100644 index d54d3fcdb..000000000 Binary files a/graphics/map_objects/pics/people/cycling_triathlete_m/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/4.png b/graphics/map_objects/pics/people/cycling_triathlete_m/4.png deleted file mode 100644 index b065a1294..000000000 Binary files a/graphics/map_objects/pics/people/cycling_triathlete_m/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/5.png b/graphics/map_objects/pics/people/cycling_triathlete_m/5.png deleted file mode 100644 index bbb47a869..000000000 Binary files a/graphics/map_objects/pics/people/cycling_triathlete_m/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/6.png b/graphics/map_objects/pics/people/cycling_triathlete_m/6.png deleted file mode 100644 index 7f126858f..000000000 Binary files a/graphics/map_objects/pics/people/cycling_triathlete_m/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/7.png b/graphics/map_objects/pics/people/cycling_triathlete_m/7.png deleted file mode 100644 index 43f2e2739..000000000 Binary files a/graphics/map_objects/pics/people/cycling_triathlete_m/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/8.png b/graphics/map_objects/pics/people/cycling_triathlete_m/8.png deleted file mode 100644 index 1168c440b..000000000 Binary files a/graphics/map_objects/pics/people/cycling_triathlete_m/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/drake/0.png b/graphics/map_objects/pics/people/drake/0.png deleted file mode 100644 index 8c12cbe40..000000000 Binary files a/graphics/map_objects/pics/people/drake/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/drake/1.png b/graphics/map_objects/pics/people/drake/1.png deleted file mode 100644 index b401c3b14..000000000 Binary files a/graphics/map_objects/pics/people/drake/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/drake/2.png b/graphics/map_objects/pics/people/drake/2.png deleted file mode 100644 index c116a283e..000000000 Binary files a/graphics/map_objects/pics/people/drake/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/fat_man/0.png b/graphics/map_objects/pics/people/fat_man/0.png deleted file mode 100644 index 290a7f9ed..000000000 Binary files a/graphics/map_objects/pics/people/fat_man/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/fat_man/1.png b/graphics/map_objects/pics/people/fat_man/1.png deleted file mode 100644 index d5d81dcdb..000000000 Binary files a/graphics/map_objects/pics/people/fat_man/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/fat_man/2.png b/graphics/map_objects/pics/people/fat_man/2.png deleted file mode 100644 index 5b99f60da..000000000 Binary files a/graphics/map_objects/pics/people/fat_man/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/fat_man/3.png b/graphics/map_objects/pics/people/fat_man/3.png deleted file mode 100644 index 2c6b5f0d1..000000000 Binary files a/graphics/map_objects/pics/people/fat_man/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/fat_man/4.png b/graphics/map_objects/pics/people/fat_man/4.png deleted file mode 100644 index 846d52b99..000000000 Binary files a/graphics/map_objects/pics/people/fat_man/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/fat_man/5.png b/graphics/map_objects/pics/people/fat_man/5.png deleted file mode 100644 index ee751217f..000000000 Binary files a/graphics/map_objects/pics/people/fat_man/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/fat_man/6.png b/graphics/map_objects/pics/people/fat_man/6.png deleted file mode 100644 index 8eb76d809..000000000 Binary files a/graphics/map_objects/pics/people/fat_man/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/fat_man/7.png b/graphics/map_objects/pics/people/fat_man/7.png deleted file mode 100644 index 5694df27b..000000000 Binary files a/graphics/map_objects/pics/people/fat_man/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/fat_man/8.png b/graphics/map_objects/pics/people/fat_man/8.png deleted file mode 100644 index f3528f332..000000000 Binary files a/graphics/map_objects/pics/people/fat_man/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/fisherman/0.png b/graphics/map_objects/pics/people/fisherman/0.png deleted file mode 100644 index 5e963f889..000000000 Binary files a/graphics/map_objects/pics/people/fisherman/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/fisherman/1.png b/graphics/map_objects/pics/people/fisherman/1.png deleted file mode 100644 index 5bd83e7e1..000000000 Binary files a/graphics/map_objects/pics/people/fisherman/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/fisherman/2.png b/graphics/map_objects/pics/people/fisherman/2.png deleted file mode 100644 index f587de8d9..000000000 Binary files a/graphics/map_objects/pics/people/fisherman/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/fisherman/3.png b/graphics/map_objects/pics/people/fisherman/3.png deleted file mode 100644 index 5d79a1da8..000000000 Binary files a/graphics/map_objects/pics/people/fisherman/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/fisherman/4.png b/graphics/map_objects/pics/people/fisherman/4.png deleted file mode 100644 index dd3104436..000000000 Binary files a/graphics/map_objects/pics/people/fisherman/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/fisherman/5.png b/graphics/map_objects/pics/people/fisherman/5.png deleted file mode 100644 index 515f9c638..000000000 Binary files a/graphics/map_objects/pics/people/fisherman/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/fisherman/6.png b/graphics/map_objects/pics/people/fisherman/6.png deleted file mode 100644 index 83ea1ff57..000000000 Binary files a/graphics/map_objects/pics/people/fisherman/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/fisherman/7.png b/graphics/map_objects/pics/people/fisherman/7.png deleted file mode 100644 index 6f886b92e..000000000 Binary files a/graphics/map_objects/pics/people/fisherman/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/fisherman/8.png b/graphics/map_objects/pics/people/fisherman/8.png deleted file mode 100644 index 26826b5e2..000000000 Binary files a/graphics/map_objects/pics/people/fisherman/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/flannery/0.png b/graphics/map_objects/pics/people/flannery/0.png deleted file mode 100644 index 5dc2e2afe..000000000 Binary files a/graphics/map_objects/pics/people/flannery/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/flannery/1.png b/graphics/map_objects/pics/people/flannery/1.png deleted file mode 100644 index 83f1d9c9c..000000000 Binary files a/graphics/map_objects/pics/people/flannery/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/flannery/2.png b/graphics/map_objects/pics/people/flannery/2.png deleted file mode 100644 index 8c96c873e..000000000 Binary files a/graphics/map_objects/pics/people/flannery/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/gentleman/0.png b/graphics/map_objects/pics/people/gentleman/0.png deleted file mode 100644 index 9c46f8aaf..000000000 Binary files a/graphics/map_objects/pics/people/gentleman/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/gentleman/1.png b/graphics/map_objects/pics/people/gentleman/1.png deleted file mode 100644 index 03eaf5570..000000000 Binary files a/graphics/map_objects/pics/people/gentleman/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/gentleman/2.png b/graphics/map_objects/pics/people/gentleman/2.png deleted file mode 100644 index 3956a93d6..000000000 Binary files a/graphics/map_objects/pics/people/gentleman/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/gentleman/3.png b/graphics/map_objects/pics/people/gentleman/3.png deleted file mode 100644 index a023cf3e4..000000000 Binary files a/graphics/map_objects/pics/people/gentleman/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/gentleman/4.png b/graphics/map_objects/pics/people/gentleman/4.png deleted file mode 100644 index 18e9bc6c3..000000000 Binary files a/graphics/map_objects/pics/people/gentleman/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/gentleman/5.png b/graphics/map_objects/pics/people/gentleman/5.png deleted file mode 100644 index d9203cc9f..000000000 Binary files a/graphics/map_objects/pics/people/gentleman/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/gentleman/6.png b/graphics/map_objects/pics/people/gentleman/6.png deleted file mode 100644 index 963b88d61..000000000 Binary files a/graphics/map_objects/pics/people/gentleman/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/gentleman/7.png b/graphics/map_objects/pics/people/gentleman/7.png deleted file mode 100644 index 904e79189..000000000 Binary files a/graphics/map_objects/pics/people/gentleman/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/gentleman/8.png b/graphics/map_objects/pics/people/gentleman/8.png deleted file mode 100644 index 85163c9ca..000000000 Binary files a/graphics/map_objects/pics/people/gentleman/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/girl_1/0.png b/graphics/map_objects/pics/people/girl_1/0.png deleted file mode 100644 index 4b812ef41..000000000 Binary files a/graphics/map_objects/pics/people/girl_1/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/girl_1/1.png b/graphics/map_objects/pics/people/girl_1/1.png deleted file mode 100644 index 3ec86b337..000000000 Binary files a/graphics/map_objects/pics/people/girl_1/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/girl_1/2.png b/graphics/map_objects/pics/people/girl_1/2.png deleted file mode 100644 index 4bea7b7ca..000000000 Binary files a/graphics/map_objects/pics/people/girl_1/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/girl_1/3.png b/graphics/map_objects/pics/people/girl_1/3.png deleted file mode 100644 index 06425c9eb..000000000 Binary files a/graphics/map_objects/pics/people/girl_1/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/girl_1/4.png b/graphics/map_objects/pics/people/girl_1/4.png deleted file mode 100644 index fb940eadb..000000000 Binary files a/graphics/map_objects/pics/people/girl_1/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/girl_1/5.png b/graphics/map_objects/pics/people/girl_1/5.png deleted file mode 100644 index 1bf4c2dc8..000000000 Binary files a/graphics/map_objects/pics/people/girl_1/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/girl_1/6.png b/graphics/map_objects/pics/people/girl_1/6.png deleted file mode 100644 index 256567cbf..000000000 Binary files a/graphics/map_objects/pics/people/girl_1/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/girl_1/7.png b/graphics/map_objects/pics/people/girl_1/7.png deleted file mode 100644 index 13bfe2af3..000000000 Binary files a/graphics/map_objects/pics/people/girl_1/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/girl_1/8.png b/graphics/map_objects/pics/people/girl_1/8.png deleted file mode 100644 index 5675d705d..000000000 Binary files a/graphics/map_objects/pics/people/girl_1/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/girl_2/0.png b/graphics/map_objects/pics/people/girl_2/0.png deleted file mode 100644 index 5f336f20f..000000000 Binary files a/graphics/map_objects/pics/people/girl_2/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/girl_2/1.png b/graphics/map_objects/pics/people/girl_2/1.png deleted file mode 100644 index 3009e228c..000000000 Binary files a/graphics/map_objects/pics/people/girl_2/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/girl_2/2.png b/graphics/map_objects/pics/people/girl_2/2.png deleted file mode 100644 index 3f1c04b4b..000000000 Binary files a/graphics/map_objects/pics/people/girl_2/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/girl_2/3.png b/graphics/map_objects/pics/people/girl_2/3.png deleted file mode 100644 index 4713b70dd..000000000 Binary files a/graphics/map_objects/pics/people/girl_2/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/girl_2/4.png b/graphics/map_objects/pics/people/girl_2/4.png deleted file mode 100644 index 3a12aa48e..000000000 Binary files a/graphics/map_objects/pics/people/girl_2/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/girl_2/5.png b/graphics/map_objects/pics/people/girl_2/5.png deleted file mode 100644 index 885ee2de9..000000000 Binary files a/graphics/map_objects/pics/people/girl_2/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/girl_2/6.png b/graphics/map_objects/pics/people/girl_2/6.png deleted file mode 100644 index 5ce644500..000000000 Binary files a/graphics/map_objects/pics/people/girl_2/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/girl_2/7.png b/graphics/map_objects/pics/people/girl_2/7.png deleted file mode 100644 index 28e8ed5a8..000000000 Binary files a/graphics/map_objects/pics/people/girl_2/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/girl_2/8.png b/graphics/map_objects/pics/people/girl_2/8.png deleted file mode 100644 index e9b5e587e..000000000 Binary files a/graphics/map_objects/pics/people/girl_2/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/girl_3/0.png b/graphics/map_objects/pics/people/girl_3/0.png deleted file mode 100644 index 5927a264a..000000000 Binary files a/graphics/map_objects/pics/people/girl_3/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/girl_3/1.png b/graphics/map_objects/pics/people/girl_3/1.png deleted file mode 100644 index 6f3f32180..000000000 Binary files a/graphics/map_objects/pics/people/girl_3/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/girl_3/2.png b/graphics/map_objects/pics/people/girl_3/2.png deleted file mode 100644 index 1a01b0031..000000000 Binary files a/graphics/map_objects/pics/people/girl_3/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/girl_3/3.png b/graphics/map_objects/pics/people/girl_3/3.png deleted file mode 100644 index 2fb3db97b..000000000 Binary files a/graphics/map_objects/pics/people/girl_3/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/girl_3/4.png b/graphics/map_objects/pics/people/girl_3/4.png deleted file mode 100644 index 03287ab27..000000000 Binary files a/graphics/map_objects/pics/people/girl_3/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/girl_3/5.png b/graphics/map_objects/pics/people/girl_3/5.png deleted file mode 100644 index c30ead499..000000000 Binary files a/graphics/map_objects/pics/people/girl_3/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/girl_3/6.png b/graphics/map_objects/pics/people/girl_3/6.png deleted file mode 100644 index 10eb415ad..000000000 Binary files a/graphics/map_objects/pics/people/girl_3/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/girl_3/7.png b/graphics/map_objects/pics/people/girl_3/7.png deleted file mode 100644 index 28fa0238b..000000000 Binary files a/graphics/map_objects/pics/people/girl_3/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/girl_3/8.png b/graphics/map_objects/pics/people/girl_3/8.png deleted file mode 100644 index 8dc1a2fbc..000000000 Binary files a/graphics/map_objects/pics/people/girl_3/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/glacia/0.png b/graphics/map_objects/pics/people/glacia/0.png deleted file mode 100644 index 4ee3c3b3e..000000000 Binary files a/graphics/map_objects/pics/people/glacia/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/glacia/1.png b/graphics/map_objects/pics/people/glacia/1.png deleted file mode 100644 index 866937df3..000000000 Binary files a/graphics/map_objects/pics/people/glacia/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/glacia/2.png b/graphics/map_objects/pics/people/glacia/2.png deleted file mode 100644 index 5d66ef03e..000000000 Binary files a/graphics/map_objects/pics/people/glacia/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/greta/0.png b/graphics/map_objects/pics/people/greta/0.png deleted file mode 100644 index 033bb28e9..000000000 Binary files a/graphics/map_objects/pics/people/greta/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/greta/1.png b/graphics/map_objects/pics/people/greta/1.png deleted file mode 100644 index 7035c50f3..000000000 Binary files a/graphics/map_objects/pics/people/greta/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/greta/2.png b/graphics/map_objects/pics/people/greta/2.png deleted file mode 100644 index a40dda6ac..000000000 Binary files a/graphics/map_objects/pics/people/greta/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/greta/3.png b/graphics/map_objects/pics/people/greta/3.png deleted file mode 100644 index d7f33bd63..000000000 Binary files a/graphics/map_objects/pics/people/greta/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/greta/4.png b/graphics/map_objects/pics/people/greta/4.png deleted file mode 100644 index 2e1331a28..000000000 Binary files a/graphics/map_objects/pics/people/greta/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/greta/5.png b/graphics/map_objects/pics/people/greta/5.png deleted file mode 100644 index 3596eea6d..000000000 Binary files a/graphics/map_objects/pics/people/greta/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/greta/6.png b/graphics/map_objects/pics/people/greta/6.png deleted file mode 100644 index 71bbf717b..000000000 Binary files a/graphics/map_objects/pics/people/greta/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/greta/7.png b/graphics/map_objects/pics/people/greta/7.png deleted file mode 100644 index 5e08c3774..000000000 Binary files a/graphics/map_objects/pics/people/greta/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/greta/8.png b/graphics/map_objects/pics/people/greta/8.png deleted file mode 100644 index bc9cefcad..000000000 Binary files a/graphics/map_objects/pics/people/greta/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/hex_maniac/0.png b/graphics/map_objects/pics/people/hex_maniac/0.png deleted file mode 100644 index da93178a0..000000000 Binary files a/graphics/map_objects/pics/people/hex_maniac/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/hex_maniac/1.png b/graphics/map_objects/pics/people/hex_maniac/1.png deleted file mode 100644 index 7925ac221..000000000 Binary files a/graphics/map_objects/pics/people/hex_maniac/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/hex_maniac/2.png b/graphics/map_objects/pics/people/hex_maniac/2.png deleted file mode 100644 index 24598f0b0..000000000 Binary files a/graphics/map_objects/pics/people/hex_maniac/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/hex_maniac/3.png b/graphics/map_objects/pics/people/hex_maniac/3.png deleted file mode 100644 index c3544aac1..000000000 Binary files a/graphics/map_objects/pics/people/hex_maniac/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/hex_maniac/4.png b/graphics/map_objects/pics/people/hex_maniac/4.png deleted file mode 100644 index f07338c7a..000000000 Binary files a/graphics/map_objects/pics/people/hex_maniac/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/hex_maniac/5.png b/graphics/map_objects/pics/people/hex_maniac/5.png deleted file mode 100644 index 925d6ccf9..000000000 Binary files a/graphics/map_objects/pics/people/hex_maniac/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/hex_maniac/6.png b/graphics/map_objects/pics/people/hex_maniac/6.png deleted file mode 100644 index a41a7a72b..000000000 Binary files a/graphics/map_objects/pics/people/hex_maniac/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/hex_maniac/7.png b/graphics/map_objects/pics/people/hex_maniac/7.png deleted file mode 100644 index 06bfa10d0..000000000 Binary files a/graphics/map_objects/pics/people/hex_maniac/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/hex_maniac/8.png b/graphics/map_objects/pics/people/hex_maniac/8.png deleted file mode 100644 index 1c3a57faf..000000000 Binary files a/graphics/map_objects/pics/people/hex_maniac/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/hiker/0.png b/graphics/map_objects/pics/people/hiker/0.png deleted file mode 100644 index 715cdc4f9..000000000 Binary files a/graphics/map_objects/pics/people/hiker/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/hiker/1.png b/graphics/map_objects/pics/people/hiker/1.png deleted file mode 100644 index 7af8fb736..000000000 Binary files a/graphics/map_objects/pics/people/hiker/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/hiker/2.png b/graphics/map_objects/pics/people/hiker/2.png deleted file mode 100644 index 2b74ec3db..000000000 Binary files a/graphics/map_objects/pics/people/hiker/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/hiker/3.png b/graphics/map_objects/pics/people/hiker/3.png deleted file mode 100644 index a7e0d91d5..000000000 Binary files a/graphics/map_objects/pics/people/hiker/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/hiker/4.png b/graphics/map_objects/pics/people/hiker/4.png deleted file mode 100644 index d0bb9fa9d..000000000 Binary files a/graphics/map_objects/pics/people/hiker/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/hiker/5.png b/graphics/map_objects/pics/people/hiker/5.png deleted file mode 100644 index b405de51b..000000000 Binary files a/graphics/map_objects/pics/people/hiker/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/hiker/6.png b/graphics/map_objects/pics/people/hiker/6.png deleted file mode 100644 index 7271f7d4d..000000000 Binary files a/graphics/map_objects/pics/people/hiker/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/hiker/7.png b/graphics/map_objects/pics/people/hiker/7.png deleted file mode 100644 index 36db0a370..000000000 Binary files a/graphics/map_objects/pics/people/hiker/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/hiker/8.png b/graphics/map_objects/pics/people/hiker/8.png deleted file mode 100644 index dbcfd8c41..000000000 Binary files a/graphics/map_objects/pics/people/hiker/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/0.png b/graphics/map_objects/pics/people/hot_springs_old_woman/0.png deleted file mode 100644 index abb6cca16..000000000 Binary files a/graphics/map_objects/pics/people/hot_springs_old_woman/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/1.png b/graphics/map_objects/pics/people/hot_springs_old_woman/1.png deleted file mode 100644 index e45ab1ac4..000000000 Binary files a/graphics/map_objects/pics/people/hot_springs_old_woman/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/2.png b/graphics/map_objects/pics/people/hot_springs_old_woman/2.png deleted file mode 100644 index f5b9364b1..000000000 Binary files a/graphics/map_objects/pics/people/hot_springs_old_woman/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/3.png b/graphics/map_objects/pics/people/hot_springs_old_woman/3.png deleted file mode 100644 index 8bd8dc9fb..000000000 Binary files a/graphics/map_objects/pics/people/hot_springs_old_woman/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/4.png b/graphics/map_objects/pics/people/hot_springs_old_woman/4.png deleted file mode 100644 index 8bd8dc9fb..000000000 Binary files a/graphics/map_objects/pics/people/hot_springs_old_woman/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/5.png b/graphics/map_objects/pics/people/hot_springs_old_woman/5.png deleted file mode 100644 index ee043baeb..000000000 Binary files a/graphics/map_objects/pics/people/hot_springs_old_woman/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/6.png b/graphics/map_objects/pics/people/hot_springs_old_woman/6.png deleted file mode 100644 index ee043baeb..000000000 Binary files a/graphics/map_objects/pics/people/hot_springs_old_woman/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/7.png b/graphics/map_objects/pics/people/hot_springs_old_woman/7.png deleted file mode 100644 index f1498d71f..000000000 Binary files a/graphics/map_objects/pics/people/hot_springs_old_woman/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/8.png b/graphics/map_objects/pics/people/hot_springs_old_woman/8.png deleted file mode 100644 index f1498d71f..000000000 Binary files a/graphics/map_objects/pics/people/hot_springs_old_woman/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/juan/0.png b/graphics/map_objects/pics/people/juan/0.png deleted file mode 100644 index e9528a067..000000000 Binary files a/graphics/map_objects/pics/people/juan/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/juan/1.png b/graphics/map_objects/pics/people/juan/1.png deleted file mode 100644 index 0d4248554..000000000 Binary files a/graphics/map_objects/pics/people/juan/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/juan/2.png b/graphics/map_objects/pics/people/juan/2.png deleted file mode 100644 index c86967d23..000000000 Binary files a/graphics/map_objects/pics/people/juan/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/juan/3.png b/graphics/map_objects/pics/people/juan/3.png deleted file mode 100644 index 5d593a7ee..000000000 Binary files a/graphics/map_objects/pics/people/juan/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/juan/4.png b/graphics/map_objects/pics/people/juan/4.png deleted file mode 100644 index 4abb8aeec..000000000 Binary files a/graphics/map_objects/pics/people/juan/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/juan/5.png b/graphics/map_objects/pics/people/juan/5.png deleted file mode 100644 index b3f28869b..000000000 Binary files a/graphics/map_objects/pics/people/juan/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/juan/6.png b/graphics/map_objects/pics/people/juan/6.png deleted file mode 100644 index c46584d34..000000000 Binary files a/graphics/map_objects/pics/people/juan/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/juan/7.png b/graphics/map_objects/pics/people/juan/7.png deleted file mode 100644 index 10ca59cd6..000000000 Binary files a/graphics/map_objects/pics/people/juan/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/juan/8.png b/graphics/map_objects/pics/people/juan/8.png deleted file mode 100644 index 24ef412c1..000000000 Binary files a/graphics/map_objects/pics/people/juan/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/lass/0.png b/graphics/map_objects/pics/people/lass/0.png deleted file mode 100644 index 602f557c7..000000000 Binary files a/graphics/map_objects/pics/people/lass/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/lass/1.png b/graphics/map_objects/pics/people/lass/1.png deleted file mode 100644 index c11380b4a..000000000 Binary files a/graphics/map_objects/pics/people/lass/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/lass/2.png b/graphics/map_objects/pics/people/lass/2.png deleted file mode 100644 index 887cc834b..000000000 Binary files a/graphics/map_objects/pics/people/lass/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/lass/3.png b/graphics/map_objects/pics/people/lass/3.png deleted file mode 100644 index 510d0812c..000000000 Binary files a/graphics/map_objects/pics/people/lass/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/lass/4.png b/graphics/map_objects/pics/people/lass/4.png deleted file mode 100644 index 8929a426b..000000000 Binary files a/graphics/map_objects/pics/people/lass/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/lass/5.png b/graphics/map_objects/pics/people/lass/5.png deleted file mode 100644 index da422040c..000000000 Binary files a/graphics/map_objects/pics/people/lass/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/lass/6.png b/graphics/map_objects/pics/people/lass/6.png deleted file mode 100644 index c9235c9aa..000000000 Binary files a/graphics/map_objects/pics/people/lass/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/lass/7.png b/graphics/map_objects/pics/people/lass/7.png deleted file mode 100644 index 1adfcd0ba..000000000 Binary files a/graphics/map_objects/pics/people/lass/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/lass/8.png b/graphics/map_objects/pics/people/lass/8.png deleted file mode 100644 index 392d65f93..000000000 Binary files a/graphics/map_objects/pics/people/lass/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/leaf/0.png b/graphics/map_objects/pics/people/leaf/0.png deleted file mode 100644 index d21024a8a..000000000 Binary files a/graphics/map_objects/pics/people/leaf/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/leaf/1.png b/graphics/map_objects/pics/people/leaf/1.png deleted file mode 100644 index d14f4e29e..000000000 Binary files a/graphics/map_objects/pics/people/leaf/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/leaf/2.png b/graphics/map_objects/pics/people/leaf/2.png deleted file mode 100644 index b8f8d7b6b..000000000 Binary files a/graphics/map_objects/pics/people/leaf/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/leaf/3.png b/graphics/map_objects/pics/people/leaf/3.png deleted file mode 100644 index 50a63ed30..000000000 Binary files a/graphics/map_objects/pics/people/leaf/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/leaf/4.png b/graphics/map_objects/pics/people/leaf/4.png deleted file mode 100644 index fdb21f0b3..000000000 Binary files a/graphics/map_objects/pics/people/leaf/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/leaf/5.png b/graphics/map_objects/pics/people/leaf/5.png deleted file mode 100644 index a90ac7c22..000000000 Binary files a/graphics/map_objects/pics/people/leaf/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/leaf/6.png b/graphics/map_objects/pics/people/leaf/6.png deleted file mode 100644 index ac69d167c..000000000 Binary files a/graphics/map_objects/pics/people/leaf/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/leaf/7.png b/graphics/map_objects/pics/people/leaf/7.png deleted file mode 100644 index 215fab8e8..000000000 Binary files a/graphics/map_objects/pics/people/leaf/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/leaf/8.png b/graphics/map_objects/pics/people/leaf/8.png deleted file mode 100644 index 39dd27af1..000000000 Binary files a/graphics/map_objects/pics/people/leaf/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_boy_1/0.png b/graphics/map_objects/pics/people/little_boy_1/0.png deleted file mode 100644 index b96c644fb..000000000 Binary files a/graphics/map_objects/pics/people/little_boy_1/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_boy_1/1.png b/graphics/map_objects/pics/people/little_boy_1/1.png deleted file mode 100644 index 01f7f13d0..000000000 Binary files a/graphics/map_objects/pics/people/little_boy_1/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_boy_1/2.png b/graphics/map_objects/pics/people/little_boy_1/2.png deleted file mode 100644 index e080899f6..000000000 Binary files a/graphics/map_objects/pics/people/little_boy_1/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_boy_1/3.png b/graphics/map_objects/pics/people/little_boy_1/3.png deleted file mode 100644 index 08dbedbff..000000000 Binary files a/graphics/map_objects/pics/people/little_boy_1/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_boy_1/4.png b/graphics/map_objects/pics/people/little_boy_1/4.png deleted file mode 100644 index ed0f1c791..000000000 Binary files a/graphics/map_objects/pics/people/little_boy_1/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_boy_1/5.png b/graphics/map_objects/pics/people/little_boy_1/5.png deleted file mode 100644 index 761263392..000000000 Binary files a/graphics/map_objects/pics/people/little_boy_1/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_boy_1/6.png b/graphics/map_objects/pics/people/little_boy_1/6.png deleted file mode 100644 index f8d72807f..000000000 Binary files a/graphics/map_objects/pics/people/little_boy_1/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_boy_1/7.png b/graphics/map_objects/pics/people/little_boy_1/7.png deleted file mode 100644 index 0f7c16ebb..000000000 Binary files a/graphics/map_objects/pics/people/little_boy_1/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_boy_1/8.png b/graphics/map_objects/pics/people/little_boy_1/8.png deleted file mode 100644 index b3df6d38a..000000000 Binary files a/graphics/map_objects/pics/people/little_boy_1/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_boy_2/0.png b/graphics/map_objects/pics/people/little_boy_2/0.png deleted file mode 100644 index 1cb5472fc..000000000 Binary files a/graphics/map_objects/pics/people/little_boy_2/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_boy_2/1.png b/graphics/map_objects/pics/people/little_boy_2/1.png deleted file mode 100644 index 235933d0a..000000000 Binary files a/graphics/map_objects/pics/people/little_boy_2/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_boy_2/2.png b/graphics/map_objects/pics/people/little_boy_2/2.png deleted file mode 100644 index ced688956..000000000 Binary files a/graphics/map_objects/pics/people/little_boy_2/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_boy_2/3.png b/graphics/map_objects/pics/people/little_boy_2/3.png deleted file mode 100644 index 8c743b2a3..000000000 Binary files a/graphics/map_objects/pics/people/little_boy_2/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_boy_2/4.png b/graphics/map_objects/pics/people/little_boy_2/4.png deleted file mode 100644 index 7af7cdbaa..000000000 Binary files a/graphics/map_objects/pics/people/little_boy_2/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_boy_2/5.png b/graphics/map_objects/pics/people/little_boy_2/5.png deleted file mode 100644 index 1db5b13ba..000000000 Binary files a/graphics/map_objects/pics/people/little_boy_2/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_boy_2/6.png b/graphics/map_objects/pics/people/little_boy_2/6.png deleted file mode 100644 index 00633ff85..000000000 Binary files a/graphics/map_objects/pics/people/little_boy_2/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_boy_2/7.png b/graphics/map_objects/pics/people/little_boy_2/7.png deleted file mode 100644 index ac2697065..000000000 Binary files a/graphics/map_objects/pics/people/little_boy_2/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_boy_2/8.png b/graphics/map_objects/pics/people/little_boy_2/8.png deleted file mode 100644 index fd02ff7a6..000000000 Binary files a/graphics/map_objects/pics/people/little_boy_2/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_girl_1/0.png b/graphics/map_objects/pics/people/little_girl_1/0.png deleted file mode 100644 index a4954285b..000000000 Binary files a/graphics/map_objects/pics/people/little_girl_1/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_girl_1/1.png b/graphics/map_objects/pics/people/little_girl_1/1.png deleted file mode 100644 index 0c6b9d411..000000000 Binary files a/graphics/map_objects/pics/people/little_girl_1/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_girl_1/2.png b/graphics/map_objects/pics/people/little_girl_1/2.png deleted file mode 100644 index 6e3b1e77d..000000000 Binary files a/graphics/map_objects/pics/people/little_girl_1/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_girl_1/3.png b/graphics/map_objects/pics/people/little_girl_1/3.png deleted file mode 100644 index b680b277a..000000000 Binary files a/graphics/map_objects/pics/people/little_girl_1/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_girl_1/4.png b/graphics/map_objects/pics/people/little_girl_1/4.png deleted file mode 100644 index 3211eecbb..000000000 Binary files a/graphics/map_objects/pics/people/little_girl_1/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_girl_1/5.png b/graphics/map_objects/pics/people/little_girl_1/5.png deleted file mode 100644 index 182a1a416..000000000 Binary files a/graphics/map_objects/pics/people/little_girl_1/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_girl_1/6.png b/graphics/map_objects/pics/people/little_girl_1/6.png deleted file mode 100644 index 1b0daa637..000000000 Binary files a/graphics/map_objects/pics/people/little_girl_1/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_girl_1/7.png b/graphics/map_objects/pics/people/little_girl_1/7.png deleted file mode 100644 index f91406654..000000000 Binary files a/graphics/map_objects/pics/people/little_girl_1/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_girl_1/8.png b/graphics/map_objects/pics/people/little_girl_1/8.png deleted file mode 100644 index 5c5bcbc2a..000000000 Binary files a/graphics/map_objects/pics/people/little_girl_1/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_girl_2/0.png b/graphics/map_objects/pics/people/little_girl_2/0.png deleted file mode 100644 index fadfdad57..000000000 Binary files a/graphics/map_objects/pics/people/little_girl_2/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_girl_2/1.png b/graphics/map_objects/pics/people/little_girl_2/1.png deleted file mode 100644 index df2b66187..000000000 Binary files a/graphics/map_objects/pics/people/little_girl_2/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_girl_2/2.png b/graphics/map_objects/pics/people/little_girl_2/2.png deleted file mode 100644 index ac49cae9f..000000000 Binary files a/graphics/map_objects/pics/people/little_girl_2/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_girl_2/3.png b/graphics/map_objects/pics/people/little_girl_2/3.png deleted file mode 100644 index 869c4a1b3..000000000 Binary files a/graphics/map_objects/pics/people/little_girl_2/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_girl_2/4.png b/graphics/map_objects/pics/people/little_girl_2/4.png deleted file mode 100644 index b92551f18..000000000 Binary files a/graphics/map_objects/pics/people/little_girl_2/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_girl_2/5.png b/graphics/map_objects/pics/people/little_girl_2/5.png deleted file mode 100644 index 778a644f2..000000000 Binary files a/graphics/map_objects/pics/people/little_girl_2/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_girl_2/6.png b/graphics/map_objects/pics/people/little_girl_2/6.png deleted file mode 100644 index 1ca242176..000000000 Binary files a/graphics/map_objects/pics/people/little_girl_2/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_girl_2/7.png b/graphics/map_objects/pics/people/little_girl_2/7.png deleted file mode 100644 index d71a37cec..000000000 Binary files a/graphics/map_objects/pics/people/little_girl_2/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/little_girl_2/8.png b/graphics/map_objects/pics/people/little_girl_2/8.png deleted file mode 100644 index dd76b53e0..000000000 Binary files a/graphics/map_objects/pics/people/little_girl_2/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/liza/0.png b/graphics/map_objects/pics/people/liza/0.png deleted file mode 100644 index e85ea4c5b..000000000 Binary files a/graphics/map_objects/pics/people/liza/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/liza/1.png b/graphics/map_objects/pics/people/liza/1.png deleted file mode 100644 index dd7c4b2a6..000000000 Binary files a/graphics/map_objects/pics/people/liza/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/liza/2.png b/graphics/map_objects/pics/people/liza/2.png deleted file mode 100644 index 96b4628fa..000000000 Binary files a/graphics/map_objects/pics/people/liza/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/lucy/0.png b/graphics/map_objects/pics/people/lucy/0.png deleted file mode 100644 index 422938505..000000000 Binary files a/graphics/map_objects/pics/people/lucy/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/lucy/1.png b/graphics/map_objects/pics/people/lucy/1.png deleted file mode 100644 index 78eda0819..000000000 Binary files a/graphics/map_objects/pics/people/lucy/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/lucy/2.png b/graphics/map_objects/pics/people/lucy/2.png deleted file mode 100644 index db2579c62..000000000 Binary files a/graphics/map_objects/pics/people/lucy/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/lucy/3.png b/graphics/map_objects/pics/people/lucy/3.png deleted file mode 100644 index 4f06bbb4d..000000000 Binary files a/graphics/map_objects/pics/people/lucy/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/lucy/4.png b/graphics/map_objects/pics/people/lucy/4.png deleted file mode 100644 index ba42e7832..000000000 Binary files a/graphics/map_objects/pics/people/lucy/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/lucy/5.png b/graphics/map_objects/pics/people/lucy/5.png deleted file mode 100644 index 980c55dd1..000000000 Binary files a/graphics/map_objects/pics/people/lucy/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/lucy/6.png b/graphics/map_objects/pics/people/lucy/6.png deleted file mode 100644 index b5d4c74cb..000000000 Binary files a/graphics/map_objects/pics/people/lucy/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/lucy/7.png b/graphics/map_objects/pics/people/lucy/7.png deleted file mode 100644 index 1dd07b5ec..000000000 Binary files a/graphics/map_objects/pics/people/lucy/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/lucy/8.png b/graphics/map_objects/pics/people/lucy/8.png deleted file mode 100644 index 2cface4e4..000000000 Binary files a/graphics/map_objects/pics/people/lucy/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/magma_member_f/0.png b/graphics/map_objects/pics/people/magma_member_f/0.png deleted file mode 100644 index ae467df02..000000000 Binary files a/graphics/map_objects/pics/people/magma_member_f/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/magma_member_f/1.png b/graphics/map_objects/pics/people/magma_member_f/1.png deleted file mode 100644 index 22f8d3242..000000000 Binary files a/graphics/map_objects/pics/people/magma_member_f/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/magma_member_f/2.png b/graphics/map_objects/pics/people/magma_member_f/2.png deleted file mode 100644 index 6820fc60e..000000000 Binary files a/graphics/map_objects/pics/people/magma_member_f/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/magma_member_f/3.png b/graphics/map_objects/pics/people/magma_member_f/3.png deleted file mode 100644 index 759d312cc..000000000 Binary files a/graphics/map_objects/pics/people/magma_member_f/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/magma_member_f/4.png b/graphics/map_objects/pics/people/magma_member_f/4.png deleted file mode 100644 index 5e653b471..000000000 Binary files a/graphics/map_objects/pics/people/magma_member_f/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/magma_member_f/5.png b/graphics/map_objects/pics/people/magma_member_f/5.png deleted file mode 100644 index 872aaa5ae..000000000 Binary files a/graphics/map_objects/pics/people/magma_member_f/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/magma_member_f/6.png b/graphics/map_objects/pics/people/magma_member_f/6.png deleted file mode 100644 index b6f96e1e1..000000000 Binary files a/graphics/map_objects/pics/people/magma_member_f/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/magma_member_f/7.png b/graphics/map_objects/pics/people/magma_member_f/7.png deleted file mode 100644 index 2d7ee6980..000000000 Binary files a/graphics/map_objects/pics/people/magma_member_f/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/magma_member_f/8.png b/graphics/map_objects/pics/people/magma_member_f/8.png deleted file mode 100644 index 09a2a36c7..000000000 Binary files a/graphics/map_objects/pics/people/magma_member_f/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/magma_member_m/0.png b/graphics/map_objects/pics/people/magma_member_m/0.png deleted file mode 100644 index a1886e9a1..000000000 Binary files a/graphics/map_objects/pics/people/magma_member_m/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/magma_member_m/1.png b/graphics/map_objects/pics/people/magma_member_m/1.png deleted file mode 100644 index f09d412da..000000000 Binary files a/graphics/map_objects/pics/people/magma_member_m/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/magma_member_m/2.png b/graphics/map_objects/pics/people/magma_member_m/2.png deleted file mode 100644 index 2b1cb90ac..000000000 Binary files a/graphics/map_objects/pics/people/magma_member_m/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/magma_member_m/3.png b/graphics/map_objects/pics/people/magma_member_m/3.png deleted file mode 100644 index edfcf7850..000000000 Binary files a/graphics/map_objects/pics/people/magma_member_m/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/magma_member_m/4.png b/graphics/map_objects/pics/people/magma_member_m/4.png deleted file mode 100644 index 6c8a2d2b0..000000000 Binary files a/graphics/map_objects/pics/people/magma_member_m/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/magma_member_m/5.png b/graphics/map_objects/pics/people/magma_member_m/5.png deleted file mode 100644 index 4f0068f21..000000000 Binary files a/graphics/map_objects/pics/people/magma_member_m/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/magma_member_m/6.png b/graphics/map_objects/pics/people/magma_member_m/6.png deleted file mode 100644 index 758bcddb1..000000000 Binary files a/graphics/map_objects/pics/people/magma_member_m/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/magma_member_m/7.png b/graphics/map_objects/pics/people/magma_member_m/7.png deleted file mode 100644 index 3b4a1be19..000000000 Binary files a/graphics/map_objects/pics/people/magma_member_m/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/magma_member_m/8.png b/graphics/map_objects/pics/people/magma_member_m/8.png deleted file mode 100644 index fc5c7b53c..000000000 Binary files a/graphics/map_objects/pics/people/magma_member_m/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_1/0.png b/graphics/map_objects/pics/people/man_1/0.png deleted file mode 100644 index 83a226b7a..000000000 Binary files a/graphics/map_objects/pics/people/man_1/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_1/1.png b/graphics/map_objects/pics/people/man_1/1.png deleted file mode 100644 index 7eba03e27..000000000 Binary files a/graphics/map_objects/pics/people/man_1/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_1/2.png b/graphics/map_objects/pics/people/man_1/2.png deleted file mode 100644 index 675851b98..000000000 Binary files a/graphics/map_objects/pics/people/man_1/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_1/3.png b/graphics/map_objects/pics/people/man_1/3.png deleted file mode 100644 index d29b03948..000000000 Binary files a/graphics/map_objects/pics/people/man_1/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_1/4.png b/graphics/map_objects/pics/people/man_1/4.png deleted file mode 100644 index a328a22f3..000000000 Binary files a/graphics/map_objects/pics/people/man_1/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_1/5.png b/graphics/map_objects/pics/people/man_1/5.png deleted file mode 100644 index cf993dcd4..000000000 Binary files a/graphics/map_objects/pics/people/man_1/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_1/6.png b/graphics/map_objects/pics/people/man_1/6.png deleted file mode 100644 index 04ff3e1e8..000000000 Binary files a/graphics/map_objects/pics/people/man_1/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_1/7.png b/graphics/map_objects/pics/people/man_1/7.png deleted file mode 100644 index cce946285..000000000 Binary files a/graphics/map_objects/pics/people/man_1/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_1/8.png b/graphics/map_objects/pics/people/man_1/8.png deleted file mode 100644 index 8176b427d..000000000 Binary files a/graphics/map_objects/pics/people/man_1/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_2/0.png b/graphics/map_objects/pics/people/man_2/0.png deleted file mode 100644 index e0f0ff01b..000000000 Binary files a/graphics/map_objects/pics/people/man_2/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_2/1.png b/graphics/map_objects/pics/people/man_2/1.png deleted file mode 100644 index e1a38fd4a..000000000 Binary files a/graphics/map_objects/pics/people/man_2/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_2/2.png b/graphics/map_objects/pics/people/man_2/2.png deleted file mode 100644 index e05a000ef..000000000 Binary files a/graphics/map_objects/pics/people/man_2/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_2/3.png b/graphics/map_objects/pics/people/man_2/3.png deleted file mode 100644 index 946a6941b..000000000 Binary files a/graphics/map_objects/pics/people/man_2/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_2/4.png b/graphics/map_objects/pics/people/man_2/4.png deleted file mode 100644 index eee58063f..000000000 Binary files a/graphics/map_objects/pics/people/man_2/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_2/5.png b/graphics/map_objects/pics/people/man_2/5.png deleted file mode 100644 index c32800118..000000000 Binary files a/graphics/map_objects/pics/people/man_2/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_2/6.png b/graphics/map_objects/pics/people/man_2/6.png deleted file mode 100644 index f8e3eb88a..000000000 Binary files a/graphics/map_objects/pics/people/man_2/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_2/7.png b/graphics/map_objects/pics/people/man_2/7.png deleted file mode 100644 index 43fffd1d7..000000000 Binary files a/graphics/map_objects/pics/people/man_2/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_2/8.png b/graphics/map_objects/pics/people/man_2/8.png deleted file mode 100644 index 8897d2fd3..000000000 Binary files a/graphics/map_objects/pics/people/man_2/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_3/0.png b/graphics/map_objects/pics/people/man_3/0.png deleted file mode 100644 index 073e015f7..000000000 Binary files a/graphics/map_objects/pics/people/man_3/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_3/1.png b/graphics/map_objects/pics/people/man_3/1.png deleted file mode 100644 index c0762c7ff..000000000 Binary files a/graphics/map_objects/pics/people/man_3/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_3/2.png b/graphics/map_objects/pics/people/man_3/2.png deleted file mode 100644 index 21608c48a..000000000 Binary files a/graphics/map_objects/pics/people/man_3/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_3/3.png b/graphics/map_objects/pics/people/man_3/3.png deleted file mode 100644 index 85b6765b0..000000000 Binary files a/graphics/map_objects/pics/people/man_3/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_3/4.png b/graphics/map_objects/pics/people/man_3/4.png deleted file mode 100644 index e47dbe0fe..000000000 Binary files a/graphics/map_objects/pics/people/man_3/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_3/5.png b/graphics/map_objects/pics/people/man_3/5.png deleted file mode 100644 index 9f30a6dad..000000000 Binary files a/graphics/map_objects/pics/people/man_3/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_3/6.png b/graphics/map_objects/pics/people/man_3/6.png deleted file mode 100644 index 3f6144f1a..000000000 Binary files a/graphics/map_objects/pics/people/man_3/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_3/7.png b/graphics/map_objects/pics/people/man_3/7.png deleted file mode 100644 index e70347dce..000000000 Binary files a/graphics/map_objects/pics/people/man_3/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_3/8.png b/graphics/map_objects/pics/people/man_3/8.png deleted file mode 100644 index 274a02280..000000000 Binary files a/graphics/map_objects/pics/people/man_3/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_4/0.png b/graphics/map_objects/pics/people/man_4/0.png deleted file mode 100644 index 0297b592c..000000000 Binary files a/graphics/map_objects/pics/people/man_4/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_4/1.png b/graphics/map_objects/pics/people/man_4/1.png deleted file mode 100644 index d73e6ed5c..000000000 Binary files a/graphics/map_objects/pics/people/man_4/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_4/2.png b/graphics/map_objects/pics/people/man_4/2.png deleted file mode 100644 index 6cd7f5798..000000000 Binary files a/graphics/map_objects/pics/people/man_4/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_4/3.png b/graphics/map_objects/pics/people/man_4/3.png deleted file mode 100644 index 2486efd7f..000000000 Binary files a/graphics/map_objects/pics/people/man_4/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_4/4.png b/graphics/map_objects/pics/people/man_4/4.png deleted file mode 100644 index 732ff9c8d..000000000 Binary files a/graphics/map_objects/pics/people/man_4/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_4/5.png b/graphics/map_objects/pics/people/man_4/5.png deleted file mode 100644 index 7e20d5af9..000000000 Binary files a/graphics/map_objects/pics/people/man_4/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_4/6.png b/graphics/map_objects/pics/people/man_4/6.png deleted file mode 100644 index 3d4ae58f0..000000000 Binary files a/graphics/map_objects/pics/people/man_4/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_4/7.png b/graphics/map_objects/pics/people/man_4/7.png deleted file mode 100644 index 12a9d1fa8..000000000 Binary files a/graphics/map_objects/pics/people/man_4/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_4/8.png b/graphics/map_objects/pics/people/man_4/8.png deleted file mode 100644 index 43bea13ce..000000000 Binary files a/graphics/map_objects/pics/people/man_4/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_5/0.png b/graphics/map_objects/pics/people/man_5/0.png deleted file mode 100644 index f1da52790..000000000 Binary files a/graphics/map_objects/pics/people/man_5/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_5/1.png b/graphics/map_objects/pics/people/man_5/1.png deleted file mode 100644 index 80dde6ec6..000000000 Binary files a/graphics/map_objects/pics/people/man_5/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_5/2.png b/graphics/map_objects/pics/people/man_5/2.png deleted file mode 100644 index 95ee60f02..000000000 Binary files a/graphics/map_objects/pics/people/man_5/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_5/3.png b/graphics/map_objects/pics/people/man_5/3.png deleted file mode 100644 index 52d4e65f0..000000000 Binary files a/graphics/map_objects/pics/people/man_5/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_5/4.png b/graphics/map_objects/pics/people/man_5/4.png deleted file mode 100644 index 23e440b88..000000000 Binary files a/graphics/map_objects/pics/people/man_5/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_5/5.png b/graphics/map_objects/pics/people/man_5/5.png deleted file mode 100644 index c587b3762..000000000 Binary files a/graphics/map_objects/pics/people/man_5/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_5/6.png b/graphics/map_objects/pics/people/man_5/6.png deleted file mode 100644 index 7ee45b6db..000000000 Binary files a/graphics/map_objects/pics/people/man_5/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_5/7.png b/graphics/map_objects/pics/people/man_5/7.png deleted file mode 100644 index 24a578a34..000000000 Binary files a/graphics/map_objects/pics/people/man_5/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_5/8.png b/graphics/map_objects/pics/people/man_5/8.png deleted file mode 100644 index 6040f6f4d..000000000 Binary files a/graphics/map_objects/pics/people/man_5/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_6/0.png b/graphics/map_objects/pics/people/man_6/0.png deleted file mode 100644 index ddcd545aa..000000000 Binary files a/graphics/map_objects/pics/people/man_6/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_6/1.png b/graphics/map_objects/pics/people/man_6/1.png deleted file mode 100644 index 0d7007e10..000000000 Binary files a/graphics/map_objects/pics/people/man_6/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_6/2.png b/graphics/map_objects/pics/people/man_6/2.png deleted file mode 100644 index 4daabc15d..000000000 Binary files a/graphics/map_objects/pics/people/man_6/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_6/3.png b/graphics/map_objects/pics/people/man_6/3.png deleted file mode 100644 index 0373f371d..000000000 Binary files a/graphics/map_objects/pics/people/man_6/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_6/4.png b/graphics/map_objects/pics/people/man_6/4.png deleted file mode 100644 index b0d8ee814..000000000 Binary files a/graphics/map_objects/pics/people/man_6/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_6/5.png b/graphics/map_objects/pics/people/man_6/5.png deleted file mode 100644 index 3f95859a1..000000000 Binary files a/graphics/map_objects/pics/people/man_6/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_6/6.png b/graphics/map_objects/pics/people/man_6/6.png deleted file mode 100644 index 5a89dfc33..000000000 Binary files a/graphics/map_objects/pics/people/man_6/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_6/7.png b/graphics/map_objects/pics/people/man_6/7.png deleted file mode 100644 index 6c2e07884..000000000 Binary files a/graphics/map_objects/pics/people/man_6/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_6/8.png b/graphics/map_objects/pics/people/man_6/8.png deleted file mode 100644 index 3db124eab..000000000 Binary files a/graphics/map_objects/pics/people/man_6/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_7/0.png b/graphics/map_objects/pics/people/man_7/0.png deleted file mode 100644 index ce99c5a53..000000000 Binary files a/graphics/map_objects/pics/people/man_7/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_7/1.png b/graphics/map_objects/pics/people/man_7/1.png deleted file mode 100644 index 4339d2481..000000000 Binary files a/graphics/map_objects/pics/people/man_7/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_7/2.png b/graphics/map_objects/pics/people/man_7/2.png deleted file mode 100644 index 24390d9f9..000000000 Binary files a/graphics/map_objects/pics/people/man_7/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_7/3.png b/graphics/map_objects/pics/people/man_7/3.png deleted file mode 100644 index 39051b795..000000000 Binary files a/graphics/map_objects/pics/people/man_7/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_7/4.png b/graphics/map_objects/pics/people/man_7/4.png deleted file mode 100644 index a72a83931..000000000 Binary files a/graphics/map_objects/pics/people/man_7/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_7/5.png b/graphics/map_objects/pics/people/man_7/5.png deleted file mode 100644 index 3de7bd28b..000000000 Binary files a/graphics/map_objects/pics/people/man_7/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_7/6.png b/graphics/map_objects/pics/people/man_7/6.png deleted file mode 100644 index 2c9c2ee8f..000000000 Binary files a/graphics/map_objects/pics/people/man_7/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_7/7.png b/graphics/map_objects/pics/people/man_7/7.png deleted file mode 100644 index 068dc873d..000000000 Binary files a/graphics/map_objects/pics/people/man_7/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/man_7/8.png b/graphics/map_objects/pics/people/man_7/8.png deleted file mode 100644 index 81e41d5c4..000000000 Binary files a/graphics/map_objects/pics/people/man_7/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/maniac/0.png b/graphics/map_objects/pics/people/maniac/0.png deleted file mode 100644 index 01f066910..000000000 Binary files a/graphics/map_objects/pics/people/maniac/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/maniac/1.png b/graphics/map_objects/pics/people/maniac/1.png deleted file mode 100644 index fc8efb1d4..000000000 Binary files a/graphics/map_objects/pics/people/maniac/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/maniac/2.png b/graphics/map_objects/pics/people/maniac/2.png deleted file mode 100644 index ea211288f..000000000 Binary files a/graphics/map_objects/pics/people/maniac/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/maniac/3.png b/graphics/map_objects/pics/people/maniac/3.png deleted file mode 100644 index 7a0ab0ba1..000000000 Binary files a/graphics/map_objects/pics/people/maniac/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/maniac/4.png b/graphics/map_objects/pics/people/maniac/4.png deleted file mode 100644 index 93083333d..000000000 Binary files a/graphics/map_objects/pics/people/maniac/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/maniac/5.png b/graphics/map_objects/pics/people/maniac/5.png deleted file mode 100644 index ac18fea6e..000000000 Binary files a/graphics/map_objects/pics/people/maniac/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/maniac/6.png b/graphics/map_objects/pics/people/maniac/6.png deleted file mode 100644 index d8db27038..000000000 Binary files a/graphics/map_objects/pics/people/maniac/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/maniac/7.png b/graphics/map_objects/pics/people/maniac/7.png deleted file mode 100644 index 647c69838..000000000 Binary files a/graphics/map_objects/pics/people/maniac/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/maniac/8.png b/graphics/map_objects/pics/people/maniac/8.png deleted file mode 100644 index 5d37c6d40..000000000 Binary files a/graphics/map_objects/pics/people/maniac/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mart_employee/0.png b/graphics/map_objects/pics/people/mart_employee/0.png deleted file mode 100644 index 4dfc880b7..000000000 Binary files a/graphics/map_objects/pics/people/mart_employee/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mart_employee/1.png b/graphics/map_objects/pics/people/mart_employee/1.png deleted file mode 100644 index 25320fff0..000000000 Binary files a/graphics/map_objects/pics/people/mart_employee/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mart_employee/2.png b/graphics/map_objects/pics/people/mart_employee/2.png deleted file mode 100644 index 31ad7d75b..000000000 Binary files a/graphics/map_objects/pics/people/mart_employee/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mart_employee/3.png b/graphics/map_objects/pics/people/mart_employee/3.png deleted file mode 100644 index 4e7e389d8..000000000 Binary files a/graphics/map_objects/pics/people/mart_employee/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mart_employee/4.png b/graphics/map_objects/pics/people/mart_employee/4.png deleted file mode 100644 index 4357a5946..000000000 Binary files a/graphics/map_objects/pics/people/mart_employee/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mart_employee/5.png b/graphics/map_objects/pics/people/mart_employee/5.png deleted file mode 100644 index 46ae73fd2..000000000 Binary files a/graphics/map_objects/pics/people/mart_employee/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mart_employee/6.png b/graphics/map_objects/pics/people/mart_employee/6.png deleted file mode 100644 index 9eb51a482..000000000 Binary files a/graphics/map_objects/pics/people/mart_employee/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mart_employee/7.png b/graphics/map_objects/pics/people/mart_employee/7.png deleted file mode 100644 index b3ffb8036..000000000 Binary files a/graphics/map_objects/pics/people/mart_employee/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mart_employee/8.png b/graphics/map_objects/pics/people/mart_employee/8.png deleted file mode 100644 index b2268286c..000000000 Binary files a/graphics/map_objects/pics/people/mart_employee/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/0.png b/graphics/map_objects/pics/people/mauville_old_man_1/0.png deleted file mode 100644 index 3c10d0abf..000000000 Binary files a/graphics/map_objects/pics/people/mauville_old_man_1/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/1.png b/graphics/map_objects/pics/people/mauville_old_man_1/1.png deleted file mode 100644 index 6f4226ccb..000000000 Binary files a/graphics/map_objects/pics/people/mauville_old_man_1/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/2.png b/graphics/map_objects/pics/people/mauville_old_man_1/2.png deleted file mode 100644 index adf126f15..000000000 Binary files a/graphics/map_objects/pics/people/mauville_old_man_1/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/3.png b/graphics/map_objects/pics/people/mauville_old_man_1/3.png deleted file mode 100644 index e199433fb..000000000 Binary files a/graphics/map_objects/pics/people/mauville_old_man_1/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/4.png b/graphics/map_objects/pics/people/mauville_old_man_1/4.png deleted file mode 100644 index 359e93016..000000000 Binary files a/graphics/map_objects/pics/people/mauville_old_man_1/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/5.png b/graphics/map_objects/pics/people/mauville_old_man_1/5.png deleted file mode 100644 index 34f15abff..000000000 Binary files a/graphics/map_objects/pics/people/mauville_old_man_1/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/6.png b/graphics/map_objects/pics/people/mauville_old_man_1/6.png deleted file mode 100644 index 07af2fb1d..000000000 Binary files a/graphics/map_objects/pics/people/mauville_old_man_1/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/7.png b/graphics/map_objects/pics/people/mauville_old_man_1/7.png deleted file mode 100644 index a4d759a26..000000000 Binary files a/graphics/map_objects/pics/people/mauville_old_man_1/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/8.png b/graphics/map_objects/pics/people/mauville_old_man_1/8.png deleted file mode 100644 index 8816c61aa..000000000 Binary files a/graphics/map_objects/pics/people/mauville_old_man_1/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/0.png b/graphics/map_objects/pics/people/mauville_old_man_2/0.png deleted file mode 100644 index d913bcbdb..000000000 Binary files a/graphics/map_objects/pics/people/mauville_old_man_2/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/1.png b/graphics/map_objects/pics/people/mauville_old_man_2/1.png deleted file mode 100644 index f98c0ecde..000000000 Binary files a/graphics/map_objects/pics/people/mauville_old_man_2/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/2.png b/graphics/map_objects/pics/people/mauville_old_man_2/2.png deleted file mode 100644 index abe9050a0..000000000 Binary files a/graphics/map_objects/pics/people/mauville_old_man_2/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/3.png b/graphics/map_objects/pics/people/mauville_old_man_2/3.png deleted file mode 100644 index 4d71ce720..000000000 Binary files a/graphics/map_objects/pics/people/mauville_old_man_2/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/4.png b/graphics/map_objects/pics/people/mauville_old_man_2/4.png deleted file mode 100644 index 9e0330a61..000000000 Binary files a/graphics/map_objects/pics/people/mauville_old_man_2/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/5.png b/graphics/map_objects/pics/people/mauville_old_man_2/5.png deleted file mode 100644 index 92135f48a..000000000 Binary files a/graphics/map_objects/pics/people/mauville_old_man_2/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/6.png b/graphics/map_objects/pics/people/mauville_old_man_2/6.png deleted file mode 100644 index 3a328ba04..000000000 Binary files a/graphics/map_objects/pics/people/mauville_old_man_2/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/7.png b/graphics/map_objects/pics/people/mauville_old_man_2/7.png deleted file mode 100644 index ea1b4d95b..000000000 Binary files a/graphics/map_objects/pics/people/mauville_old_man_2/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/8.png b/graphics/map_objects/pics/people/mauville_old_man_2/8.png deleted file mode 100644 index ac7a5e12d..000000000 Binary files a/graphics/map_objects/pics/people/mauville_old_man_2/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/maxie/0.png b/graphics/map_objects/pics/people/maxie/0.png deleted file mode 100644 index 21ca72fd2..000000000 Binary files a/graphics/map_objects/pics/people/maxie/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/maxie/1.png b/graphics/map_objects/pics/people/maxie/1.png deleted file mode 100644 index d7347de17..000000000 Binary files a/graphics/map_objects/pics/people/maxie/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/maxie/2.png b/graphics/map_objects/pics/people/maxie/2.png deleted file mode 100644 index f80bb07a5..000000000 Binary files a/graphics/map_objects/pics/people/maxie/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/maxie/3.png b/graphics/map_objects/pics/people/maxie/3.png deleted file mode 100644 index 6cb101536..000000000 Binary files a/graphics/map_objects/pics/people/maxie/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/maxie/4.png b/graphics/map_objects/pics/people/maxie/4.png deleted file mode 100644 index c513206a6..000000000 Binary files a/graphics/map_objects/pics/people/maxie/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/maxie/5.png b/graphics/map_objects/pics/people/maxie/5.png deleted file mode 100644 index fd6a81dc5..000000000 Binary files a/graphics/map_objects/pics/people/maxie/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/maxie/6.png b/graphics/map_objects/pics/people/maxie/6.png deleted file mode 100644 index ac1564204..000000000 Binary files a/graphics/map_objects/pics/people/maxie/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/maxie/7.png b/graphics/map_objects/pics/people/maxie/7.png deleted file mode 100644 index adb1aa235..000000000 Binary files a/graphics/map_objects/pics/people/maxie/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/maxie/8.png b/graphics/map_objects/pics/people/maxie/8.png deleted file mode 100644 index 765803561..000000000 Binary files a/graphics/map_objects/pics/people/maxie/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/acro_bike/00.png b/graphics/map_objects/pics/people/may/acro_bike/00.png deleted file mode 100644 index 389f29985..000000000 Binary files a/graphics/map_objects/pics/people/may/acro_bike/00.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/acro_bike/01.png b/graphics/map_objects/pics/people/may/acro_bike/01.png deleted file mode 100644 index d6b698965..000000000 Binary files a/graphics/map_objects/pics/people/may/acro_bike/01.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/acro_bike/02.png b/graphics/map_objects/pics/people/may/acro_bike/02.png deleted file mode 100644 index ecb59b54f..000000000 Binary files a/graphics/map_objects/pics/people/may/acro_bike/02.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/acro_bike/03.png b/graphics/map_objects/pics/people/may/acro_bike/03.png deleted file mode 100644 index dfdd7a56a..000000000 Binary files a/graphics/map_objects/pics/people/may/acro_bike/03.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/acro_bike/04.png b/graphics/map_objects/pics/people/may/acro_bike/04.png deleted file mode 100644 index 6a6fa22fd..000000000 Binary files a/graphics/map_objects/pics/people/may/acro_bike/04.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/acro_bike/05.png b/graphics/map_objects/pics/people/may/acro_bike/05.png deleted file mode 100644 index 3b73f3367..000000000 Binary files a/graphics/map_objects/pics/people/may/acro_bike/05.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/acro_bike/06.png b/graphics/map_objects/pics/people/may/acro_bike/06.png deleted file mode 100644 index 368f0a05b..000000000 Binary files a/graphics/map_objects/pics/people/may/acro_bike/06.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/acro_bike/07.png b/graphics/map_objects/pics/people/may/acro_bike/07.png deleted file mode 100644 index e43d75556..000000000 Binary files a/graphics/map_objects/pics/people/may/acro_bike/07.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/acro_bike/08.png b/graphics/map_objects/pics/people/may/acro_bike/08.png deleted file mode 100644 index ec9ef52e6..000000000 Binary files a/graphics/map_objects/pics/people/may/acro_bike/08.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/acro_bike/09.png b/graphics/map_objects/pics/people/may/acro_bike/09.png deleted file mode 100644 index 55522bd5b..000000000 Binary files a/graphics/map_objects/pics/people/may/acro_bike/09.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/acro_bike/10.png b/graphics/map_objects/pics/people/may/acro_bike/10.png deleted file mode 100644 index eff73287f..000000000 Binary files a/graphics/map_objects/pics/people/may/acro_bike/10.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/acro_bike/11.png b/graphics/map_objects/pics/people/may/acro_bike/11.png deleted file mode 100644 index 092fffddb..000000000 Binary files a/graphics/map_objects/pics/people/may/acro_bike/11.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/acro_bike/12.png b/graphics/map_objects/pics/people/may/acro_bike/12.png deleted file mode 100644 index 233a03266..000000000 Binary files a/graphics/map_objects/pics/people/may/acro_bike/12.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/acro_bike/13.png b/graphics/map_objects/pics/people/may/acro_bike/13.png deleted file mode 100644 index f1736a0ec..000000000 Binary files a/graphics/map_objects/pics/people/may/acro_bike/13.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/acro_bike/14.png b/graphics/map_objects/pics/people/may/acro_bike/14.png deleted file mode 100644 index bf4ade7f0..000000000 Binary files a/graphics/map_objects/pics/people/may/acro_bike/14.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/acro_bike/15.png b/graphics/map_objects/pics/people/may/acro_bike/15.png deleted file mode 100644 index 9fccb5026..000000000 Binary files a/graphics/map_objects/pics/people/may/acro_bike/15.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/acro_bike/16.png b/graphics/map_objects/pics/people/may/acro_bike/16.png deleted file mode 100644 index 6d34e41bf..000000000 Binary files a/graphics/map_objects/pics/people/may/acro_bike/16.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/acro_bike/17.png b/graphics/map_objects/pics/people/may/acro_bike/17.png deleted file mode 100644 index e01484497..000000000 Binary files a/graphics/map_objects/pics/people/may/acro_bike/17.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/acro_bike/18.png b/graphics/map_objects/pics/people/may/acro_bike/18.png deleted file mode 100644 index a4bee4772..000000000 Binary files a/graphics/map_objects/pics/people/may/acro_bike/18.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/acro_bike/19.png b/graphics/map_objects/pics/people/may/acro_bike/19.png deleted file mode 100644 index f7e10f132..000000000 Binary files a/graphics/map_objects/pics/people/may/acro_bike/19.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/acro_bike/20.png b/graphics/map_objects/pics/people/may/acro_bike/20.png deleted file mode 100644 index f9f34e4ae..000000000 Binary files a/graphics/map_objects/pics/people/may/acro_bike/20.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/acro_bike/21.png b/graphics/map_objects/pics/people/may/acro_bike/21.png deleted file mode 100644 index 8784ce762..000000000 Binary files a/graphics/map_objects/pics/people/may/acro_bike/21.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/acro_bike/22.png b/graphics/map_objects/pics/people/may/acro_bike/22.png deleted file mode 100644 index 8753ad9c9..000000000 Binary files a/graphics/map_objects/pics/people/may/acro_bike/22.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/acro_bike/23.png b/graphics/map_objects/pics/people/may/acro_bike/23.png deleted file mode 100644 index c2d8a60cb..000000000 Binary files a/graphics/map_objects/pics/people/may/acro_bike/23.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/acro_bike/24.png b/graphics/map_objects/pics/people/may/acro_bike/24.png deleted file mode 100644 index 1836e5fed..000000000 Binary files a/graphics/map_objects/pics/people/may/acro_bike/24.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/acro_bike/25.png b/graphics/map_objects/pics/people/may/acro_bike/25.png deleted file mode 100644 index d93970171..000000000 Binary files a/graphics/map_objects/pics/people/may/acro_bike/25.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/acro_bike/26.png b/graphics/map_objects/pics/people/may/acro_bike/26.png deleted file mode 100644 index 8a5ba8ef6..000000000 Binary files a/graphics/map_objects/pics/people/may/acro_bike/26.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/decorating.png b/graphics/map_objects/pics/people/may/decorating.png deleted file mode 100644 index 7f83dfde9..000000000 Binary files a/graphics/map_objects/pics/people/may/decorating.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/field_move/0.png b/graphics/map_objects/pics/people/may/field_move/0.png deleted file mode 100644 index 9fecaa3d4..000000000 Binary files a/graphics/map_objects/pics/people/may/field_move/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/field_move/1.png b/graphics/map_objects/pics/people/may/field_move/1.png deleted file mode 100644 index 47341322b..000000000 Binary files a/graphics/map_objects/pics/people/may/field_move/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/field_move/2.png b/graphics/map_objects/pics/people/may/field_move/2.png deleted file mode 100644 index bdd23f0cf..000000000 Binary files a/graphics/map_objects/pics/people/may/field_move/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/field_move/3.png b/graphics/map_objects/pics/people/may/field_move/3.png deleted file mode 100644 index c72277f74..000000000 Binary files a/graphics/map_objects/pics/people/may/field_move/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/field_move/4.png b/graphics/map_objects/pics/people/may/field_move/4.png deleted file mode 100644 index 9e62b6869..000000000 Binary files a/graphics/map_objects/pics/people/may/field_move/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/fishing/00.png b/graphics/map_objects/pics/people/may/fishing/00.png deleted file mode 100644 index 24d435e84..000000000 Binary files a/graphics/map_objects/pics/people/may/fishing/00.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/fishing/01.png b/graphics/map_objects/pics/people/may/fishing/01.png deleted file mode 100644 index f4ec1ccdd..000000000 Binary files a/graphics/map_objects/pics/people/may/fishing/01.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/fishing/02.png b/graphics/map_objects/pics/people/may/fishing/02.png deleted file mode 100644 index 9d2e66b4f..000000000 Binary files a/graphics/map_objects/pics/people/may/fishing/02.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/fishing/03.png b/graphics/map_objects/pics/people/may/fishing/03.png deleted file mode 100644 index a7078e584..000000000 Binary files a/graphics/map_objects/pics/people/may/fishing/03.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/fishing/04.png b/graphics/map_objects/pics/people/may/fishing/04.png deleted file mode 100644 index f135404bc..000000000 Binary files a/graphics/map_objects/pics/people/may/fishing/04.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/fishing/05.png b/graphics/map_objects/pics/people/may/fishing/05.png deleted file mode 100644 index cb45778ac..000000000 Binary files a/graphics/map_objects/pics/people/may/fishing/05.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/fishing/06.png b/graphics/map_objects/pics/people/may/fishing/06.png deleted file mode 100644 index 910e2f780..000000000 Binary files a/graphics/map_objects/pics/people/may/fishing/06.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/fishing/07.png b/graphics/map_objects/pics/people/may/fishing/07.png deleted file mode 100644 index a13b1cad5..000000000 Binary files a/graphics/map_objects/pics/people/may/fishing/07.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/fishing/08.png b/graphics/map_objects/pics/people/may/fishing/08.png deleted file mode 100644 index 297643481..000000000 Binary files a/graphics/map_objects/pics/people/may/fishing/08.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/fishing/09.png b/graphics/map_objects/pics/people/may/fishing/09.png deleted file mode 100644 index 069eb2b20..000000000 Binary files a/graphics/map_objects/pics/people/may/fishing/09.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/fishing/10.png b/graphics/map_objects/pics/people/may/fishing/10.png deleted file mode 100644 index 5eca2728d..000000000 Binary files a/graphics/map_objects/pics/people/may/fishing/10.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/fishing/11.png b/graphics/map_objects/pics/people/may/fishing/11.png deleted file mode 100644 index 9895c388a..000000000 Binary files a/graphics/map_objects/pics/people/may/fishing/11.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/mach_bike/0.png b/graphics/map_objects/pics/people/may/mach_bike/0.png deleted file mode 100644 index 389f29985..000000000 Binary files a/graphics/map_objects/pics/people/may/mach_bike/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/mach_bike/1.png b/graphics/map_objects/pics/people/may/mach_bike/1.png deleted file mode 100644 index d6b698965..000000000 Binary files a/graphics/map_objects/pics/people/may/mach_bike/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/mach_bike/2.png b/graphics/map_objects/pics/people/may/mach_bike/2.png deleted file mode 100644 index ecb59b54f..000000000 Binary files a/graphics/map_objects/pics/people/may/mach_bike/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/mach_bike/3.png b/graphics/map_objects/pics/people/may/mach_bike/3.png deleted file mode 100644 index dfdd7a56a..000000000 Binary files a/graphics/map_objects/pics/people/may/mach_bike/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/mach_bike/4.png b/graphics/map_objects/pics/people/may/mach_bike/4.png deleted file mode 100644 index 6a6fa22fd..000000000 Binary files a/graphics/map_objects/pics/people/may/mach_bike/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/mach_bike/5.png b/graphics/map_objects/pics/people/may/mach_bike/5.png deleted file mode 100644 index 3b73f3367..000000000 Binary files a/graphics/map_objects/pics/people/may/mach_bike/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/mach_bike/6.png b/graphics/map_objects/pics/people/may/mach_bike/6.png deleted file mode 100644 index 368f0a05b..000000000 Binary files a/graphics/map_objects/pics/people/may/mach_bike/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/mach_bike/7.png b/graphics/map_objects/pics/people/may/mach_bike/7.png deleted file mode 100644 index e43d75556..000000000 Binary files a/graphics/map_objects/pics/people/may/mach_bike/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/mach_bike/8.png b/graphics/map_objects/pics/people/may/mach_bike/8.png deleted file mode 100644 index ec9ef52e6..000000000 Binary files a/graphics/map_objects/pics/people/may/mach_bike/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/normal/00.png b/graphics/map_objects/pics/people/may/normal/00.png deleted file mode 100644 index 58aac207f..000000000 Binary files a/graphics/map_objects/pics/people/may/normal/00.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/normal/01.png b/graphics/map_objects/pics/people/may/normal/01.png deleted file mode 100644 index 2c3641e0a..000000000 Binary files a/graphics/map_objects/pics/people/may/normal/01.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/normal/02.png b/graphics/map_objects/pics/people/may/normal/02.png deleted file mode 100644 index 32b7120a5..000000000 Binary files a/graphics/map_objects/pics/people/may/normal/02.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/normal/03.png b/graphics/map_objects/pics/people/may/normal/03.png deleted file mode 100644 index d1047dff8..000000000 Binary files a/graphics/map_objects/pics/people/may/normal/03.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/normal/04.png b/graphics/map_objects/pics/people/may/normal/04.png deleted file mode 100644 index 848166557..000000000 Binary files a/graphics/map_objects/pics/people/may/normal/04.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/normal/05.png b/graphics/map_objects/pics/people/may/normal/05.png deleted file mode 100644 index 5e6ec70ff..000000000 Binary files a/graphics/map_objects/pics/people/may/normal/05.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/normal/06.png b/graphics/map_objects/pics/people/may/normal/06.png deleted file mode 100644 index 0e318b466..000000000 Binary files a/graphics/map_objects/pics/people/may/normal/06.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/normal/07.png b/graphics/map_objects/pics/people/may/normal/07.png deleted file mode 100644 index e11b30b65..000000000 Binary files a/graphics/map_objects/pics/people/may/normal/07.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/normal/08.png b/graphics/map_objects/pics/people/may/normal/08.png deleted file mode 100644 index 4aae3e9d6..000000000 Binary files a/graphics/map_objects/pics/people/may/normal/08.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/normal/09.png b/graphics/map_objects/pics/people/may/normal/09.png deleted file mode 100644 index eae4c02ee..000000000 Binary files a/graphics/map_objects/pics/people/may/normal/09.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/normal/10.png b/graphics/map_objects/pics/people/may/normal/10.png deleted file mode 100644 index 2a678208e..000000000 Binary files a/graphics/map_objects/pics/people/may/normal/10.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/normal/11.png b/graphics/map_objects/pics/people/may/normal/11.png deleted file mode 100644 index 7ca7d3e6f..000000000 Binary files a/graphics/map_objects/pics/people/may/normal/11.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/normal/12.png b/graphics/map_objects/pics/people/may/normal/12.png deleted file mode 100644 index 1e2d40894..000000000 Binary files a/graphics/map_objects/pics/people/may/normal/12.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/normal/13.png b/graphics/map_objects/pics/people/may/normal/13.png deleted file mode 100644 index ca020591c..000000000 Binary files a/graphics/map_objects/pics/people/may/normal/13.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/normal/14.png b/graphics/map_objects/pics/people/may/normal/14.png deleted file mode 100644 index 6a5a2e3e5..000000000 Binary files a/graphics/map_objects/pics/people/may/normal/14.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/normal/15.png b/graphics/map_objects/pics/people/may/normal/15.png deleted file mode 100644 index 06d813167..000000000 Binary files a/graphics/map_objects/pics/people/may/normal/15.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/normal/16.png b/graphics/map_objects/pics/people/may/normal/16.png deleted file mode 100644 index c1fe3d367..000000000 Binary files a/graphics/map_objects/pics/people/may/normal/16.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/normal/17.png b/graphics/map_objects/pics/people/may/normal/17.png deleted file mode 100644 index 334c70cf1..000000000 Binary files a/graphics/map_objects/pics/people/may/normal/17.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/surfing/0.png b/graphics/map_objects/pics/people/may/surfing/0.png deleted file mode 100644 index 98b152f5f..000000000 Binary files a/graphics/map_objects/pics/people/may/surfing/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/surfing/1.png b/graphics/map_objects/pics/people/may/surfing/1.png deleted file mode 100644 index 45ae64705..000000000 Binary files a/graphics/map_objects/pics/people/may/surfing/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/surfing/2.png b/graphics/map_objects/pics/people/may/surfing/2.png deleted file mode 100644 index eb6f7675e..000000000 Binary files a/graphics/map_objects/pics/people/may/surfing/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/surfing/3.png b/graphics/map_objects/pics/people/may/surfing/3.png deleted file mode 100644 index 18756fe1b..000000000 Binary files a/graphics/map_objects/pics/people/may/surfing/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/surfing/4.png b/graphics/map_objects/pics/people/may/surfing/4.png deleted file mode 100644 index ac89a2672..000000000 Binary files a/graphics/map_objects/pics/people/may/surfing/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/surfing/5.png b/graphics/map_objects/pics/people/may/surfing/5.png deleted file mode 100644 index 2569df008..000000000 Binary files a/graphics/map_objects/pics/people/may/surfing/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/underwater/0.png b/graphics/map_objects/pics/people/may/underwater/0.png deleted file mode 100644 index 678dc4bb6..000000000 Binary files a/graphics/map_objects/pics/people/may/underwater/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/underwater/1.png b/graphics/map_objects/pics/people/may/underwater/1.png deleted file mode 100644 index 697cec2d1..000000000 Binary files a/graphics/map_objects/pics/people/may/underwater/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/underwater/2.png b/graphics/map_objects/pics/people/may/underwater/2.png deleted file mode 100644 index 423f01f88..000000000 Binary files a/graphics/map_objects/pics/people/may/underwater/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/underwater/3.png b/graphics/map_objects/pics/people/may/underwater/3.png deleted file mode 100644 index 4118573a3..000000000 Binary files a/graphics/map_objects/pics/people/may/underwater/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/watering/0.png b/graphics/map_objects/pics/people/may/watering/0.png deleted file mode 100644 index 11e8944a1..000000000 Binary files a/graphics/map_objects/pics/people/may/watering/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/watering/1.png b/graphics/map_objects/pics/people/may/watering/1.png deleted file mode 100644 index 84aa55502..000000000 Binary files a/graphics/map_objects/pics/people/may/watering/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/watering/2.png b/graphics/map_objects/pics/people/may/watering/2.png deleted file mode 100644 index 5d68e4994..000000000 Binary files a/graphics/map_objects/pics/people/may/watering/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/watering/3.png b/graphics/map_objects/pics/people/may/watering/3.png deleted file mode 100644 index c0f732d72..000000000 Binary files a/graphics/map_objects/pics/people/may/watering/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/watering/4.png b/graphics/map_objects/pics/people/may/watering/4.png deleted file mode 100644 index 85657cc6c..000000000 Binary files a/graphics/map_objects/pics/people/may/watering/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/may/watering/5.png b/graphics/map_objects/pics/people/may/watering/5.png deleted file mode 100644 index 939671a31..000000000 Binary files a/graphics/map_objects/pics/people/may/watering/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mom/0.png b/graphics/map_objects/pics/people/mom/0.png deleted file mode 100644 index c2b592c9f..000000000 Binary files a/graphics/map_objects/pics/people/mom/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mom/1.png b/graphics/map_objects/pics/people/mom/1.png deleted file mode 100644 index e1d1797cb..000000000 Binary files a/graphics/map_objects/pics/people/mom/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mom/2.png b/graphics/map_objects/pics/people/mom/2.png deleted file mode 100644 index 8cd0c1d72..000000000 Binary files a/graphics/map_objects/pics/people/mom/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mom/3.png b/graphics/map_objects/pics/people/mom/3.png deleted file mode 100644 index 3a682f892..000000000 Binary files a/graphics/map_objects/pics/people/mom/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mom/4.png b/graphics/map_objects/pics/people/mom/4.png deleted file mode 100644 index 96de53b7b..000000000 Binary files a/graphics/map_objects/pics/people/mom/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mom/5.png b/graphics/map_objects/pics/people/mom/5.png deleted file mode 100644 index 567e8fb53..000000000 Binary files a/graphics/map_objects/pics/people/mom/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mom/6.png b/graphics/map_objects/pics/people/mom/6.png deleted file mode 100644 index 4dfaed492..000000000 Binary files a/graphics/map_objects/pics/people/mom/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mom/7.png b/graphics/map_objects/pics/people/mom/7.png deleted file mode 100644 index 3ce984e75..000000000 Binary files a/graphics/map_objects/pics/people/mom/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mom/8.png b/graphics/map_objects/pics/people/mom/8.png deleted file mode 100644 index 6a3da67d1..000000000 Binary files a/graphics/map_objects/pics/people/mom/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mystery_event_deliveryman/0.png b/graphics/map_objects/pics/people/mystery_event_deliveryman/0.png deleted file mode 100644 index ec3e0ac82..000000000 Binary files a/graphics/map_objects/pics/people/mystery_event_deliveryman/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mystery_event_deliveryman/1.png b/graphics/map_objects/pics/people/mystery_event_deliveryman/1.png deleted file mode 100644 index 8be989045..000000000 Binary files a/graphics/map_objects/pics/people/mystery_event_deliveryman/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/mystery_event_deliveryman/2.png b/graphics/map_objects/pics/people/mystery_event_deliveryman/2.png deleted file mode 100644 index afff0cc5e..000000000 Binary files a/graphics/map_objects/pics/people/mystery_event_deliveryman/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/noland/0.png b/graphics/map_objects/pics/people/noland/0.png deleted file mode 100644 index 76fb7bdf1..000000000 Binary files a/graphics/map_objects/pics/people/noland/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/noland/1.png b/graphics/map_objects/pics/people/noland/1.png deleted file mode 100644 index 4eeceffed..000000000 Binary files a/graphics/map_objects/pics/people/noland/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/noland/2.png b/graphics/map_objects/pics/people/noland/2.png deleted file mode 100644 index daeff0641..000000000 Binary files a/graphics/map_objects/pics/people/noland/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/noland/3.png b/graphics/map_objects/pics/people/noland/3.png deleted file mode 100644 index e54596be6..000000000 Binary files a/graphics/map_objects/pics/people/noland/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/noland/4.png b/graphics/map_objects/pics/people/noland/4.png deleted file mode 100644 index 35763f56f..000000000 Binary files a/graphics/map_objects/pics/people/noland/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/noland/5.png b/graphics/map_objects/pics/people/noland/5.png deleted file mode 100644 index ef0ac5d92..000000000 Binary files a/graphics/map_objects/pics/people/noland/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/noland/6.png b/graphics/map_objects/pics/people/noland/6.png deleted file mode 100644 index dc6fa2a25..000000000 Binary files a/graphics/map_objects/pics/people/noland/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/noland/7.png b/graphics/map_objects/pics/people/noland/7.png deleted file mode 100644 index ee9820106..000000000 Binary files a/graphics/map_objects/pics/people/noland/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/noland/8.png b/graphics/map_objects/pics/people/noland/8.png deleted file mode 100644 index e8d40a08d..000000000 Binary files a/graphics/map_objects/pics/people/noland/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/norman/0.png b/graphics/map_objects/pics/people/norman/0.png deleted file mode 100644 index 5f0bd1686..000000000 Binary files a/graphics/map_objects/pics/people/norman/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/norman/1.png b/graphics/map_objects/pics/people/norman/1.png deleted file mode 100644 index 88ea12ada..000000000 Binary files a/graphics/map_objects/pics/people/norman/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/norman/2.png b/graphics/map_objects/pics/people/norman/2.png deleted file mode 100644 index 04d8694ef..000000000 Binary files a/graphics/map_objects/pics/people/norman/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/norman/3.png b/graphics/map_objects/pics/people/norman/3.png deleted file mode 100644 index 90d16f675..000000000 Binary files a/graphics/map_objects/pics/people/norman/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/norman/4.png b/graphics/map_objects/pics/people/norman/4.png deleted file mode 100644 index 0df4412fb..000000000 Binary files a/graphics/map_objects/pics/people/norman/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/norman/5.png b/graphics/map_objects/pics/people/norman/5.png deleted file mode 100644 index ea68e0952..000000000 Binary files a/graphics/map_objects/pics/people/norman/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/norman/6.png b/graphics/map_objects/pics/people/norman/6.png deleted file mode 100644 index 45f8e5119..000000000 Binary files a/graphics/map_objects/pics/people/norman/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/norman/7.png b/graphics/map_objects/pics/people/norman/7.png deleted file mode 100644 index 27ff65ec0..000000000 Binary files a/graphics/map_objects/pics/people/norman/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/norman/8.png b/graphics/map_objects/pics/people/norman/8.png deleted file mode 100644 index aa18f3d73..000000000 Binary files a/graphics/map_objects/pics/people/norman/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/nurse/0.png b/graphics/map_objects/pics/people/nurse/0.png deleted file mode 100644 index 3c6b14717..000000000 Binary files a/graphics/map_objects/pics/people/nurse/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/nurse/1.png b/graphics/map_objects/pics/people/nurse/1.png deleted file mode 100644 index a20bfc521..000000000 Binary files a/graphics/map_objects/pics/people/nurse/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/nurse/2.png b/graphics/map_objects/pics/people/nurse/2.png deleted file mode 100644 index ec048a040..000000000 Binary files a/graphics/map_objects/pics/people/nurse/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/nurse/3.png b/graphics/map_objects/pics/people/nurse/3.png deleted file mode 100644 index ae306ff49..000000000 Binary files a/graphics/map_objects/pics/people/nurse/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/old_man_1/0.png b/graphics/map_objects/pics/people/old_man_1/0.png deleted file mode 100644 index f593b13e0..000000000 Binary files a/graphics/map_objects/pics/people/old_man_1/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/old_man_1/1.png b/graphics/map_objects/pics/people/old_man_1/1.png deleted file mode 100644 index 2479299b1..000000000 Binary files a/graphics/map_objects/pics/people/old_man_1/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/old_man_1/2.png b/graphics/map_objects/pics/people/old_man_1/2.png deleted file mode 100644 index e24126007..000000000 Binary files a/graphics/map_objects/pics/people/old_man_1/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/old_man_1/3.png b/graphics/map_objects/pics/people/old_man_1/3.png deleted file mode 100644 index 058b699b3..000000000 Binary files a/graphics/map_objects/pics/people/old_man_1/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/old_man_1/4.png b/graphics/map_objects/pics/people/old_man_1/4.png deleted file mode 100644 index 3f68a34c1..000000000 Binary files a/graphics/map_objects/pics/people/old_man_1/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/old_man_1/5.png b/graphics/map_objects/pics/people/old_man_1/5.png deleted file mode 100644 index f0eb2a0ad..000000000 Binary files a/graphics/map_objects/pics/people/old_man_1/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/old_man_1/6.png b/graphics/map_objects/pics/people/old_man_1/6.png deleted file mode 100644 index 3e4570a9c..000000000 Binary files a/graphics/map_objects/pics/people/old_man_1/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/old_man_1/7.png b/graphics/map_objects/pics/people/old_man_1/7.png deleted file mode 100644 index 2066c1170..000000000 Binary files a/graphics/map_objects/pics/people/old_man_1/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/old_man_1/8.png b/graphics/map_objects/pics/people/old_man_1/8.png deleted file mode 100644 index 10af5d1e7..000000000 Binary files a/graphics/map_objects/pics/people/old_man_1/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/old_man_2/0.png b/graphics/map_objects/pics/people/old_man_2/0.png deleted file mode 100644 index 0f3537c26..000000000 Binary files a/graphics/map_objects/pics/people/old_man_2/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/old_man_2/1.png b/graphics/map_objects/pics/people/old_man_2/1.png deleted file mode 100644 index d47c1bd70..000000000 Binary files a/graphics/map_objects/pics/people/old_man_2/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/old_man_2/2.png b/graphics/map_objects/pics/people/old_man_2/2.png deleted file mode 100644 index 43fdd9849..000000000 Binary files a/graphics/map_objects/pics/people/old_man_2/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/old_woman_1/0.png b/graphics/map_objects/pics/people/old_woman_1/0.png deleted file mode 100644 index 86eb3b887..000000000 Binary files a/graphics/map_objects/pics/people/old_woman_1/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/old_woman_1/1.png b/graphics/map_objects/pics/people/old_woman_1/1.png deleted file mode 100644 index fcab35b2e..000000000 Binary files a/graphics/map_objects/pics/people/old_woman_1/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/old_woman_1/2.png b/graphics/map_objects/pics/people/old_woman_1/2.png deleted file mode 100644 index cdee1f84a..000000000 Binary files a/graphics/map_objects/pics/people/old_woman_1/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/old_woman_1/3.png b/graphics/map_objects/pics/people/old_woman_1/3.png deleted file mode 100644 index 40fc7f909..000000000 Binary files a/graphics/map_objects/pics/people/old_woman_1/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/old_woman_1/4.png b/graphics/map_objects/pics/people/old_woman_1/4.png deleted file mode 100644 index 6b0df84d6..000000000 Binary files a/graphics/map_objects/pics/people/old_woman_1/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/old_woman_1/5.png b/graphics/map_objects/pics/people/old_woman_1/5.png deleted file mode 100644 index 6490ca64a..000000000 Binary files a/graphics/map_objects/pics/people/old_woman_1/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/old_woman_1/6.png b/graphics/map_objects/pics/people/old_woman_1/6.png deleted file mode 100644 index d3cc6dd56..000000000 Binary files a/graphics/map_objects/pics/people/old_woman_1/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/old_woman_1/7.png b/graphics/map_objects/pics/people/old_woman_1/7.png deleted file mode 100644 index fd63c293c..000000000 Binary files a/graphics/map_objects/pics/people/old_woman_1/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/old_woman_1/8.png b/graphics/map_objects/pics/people/old_woman_1/8.png deleted file mode 100644 index 955bcf3db..000000000 Binary files a/graphics/map_objects/pics/people/old_woman_1/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/old_woman_2/0.png b/graphics/map_objects/pics/people/old_woman_2/0.png deleted file mode 100644 index 2bccb0fb1..000000000 Binary files a/graphics/map_objects/pics/people/old_woman_2/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/old_woman_2/1.png b/graphics/map_objects/pics/people/old_woman_2/1.png deleted file mode 100644 index 159e277d9..000000000 Binary files a/graphics/map_objects/pics/people/old_woman_2/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/old_woman_2/2.png b/graphics/map_objects/pics/people/old_woman_2/2.png deleted file mode 100644 index 6c2cb0fbe..000000000 Binary files a/graphics/map_objects/pics/people/old_woman_2/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/old_woman_2/3.png b/graphics/map_objects/pics/people/old_woman_2/3.png deleted file mode 100644 index 956af24a1..000000000 Binary files a/graphics/map_objects/pics/people/old_woman_2/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/old_woman_2/4.png b/graphics/map_objects/pics/people/old_woman_2/4.png deleted file mode 100644 index f3acfbc55..000000000 Binary files a/graphics/map_objects/pics/people/old_woman_2/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/old_woman_2/5.png b/graphics/map_objects/pics/people/old_woman_2/5.png deleted file mode 100644 index b07ff25e5..000000000 Binary files a/graphics/map_objects/pics/people/old_woman_2/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/old_woman_2/6.png b/graphics/map_objects/pics/people/old_woman_2/6.png deleted file mode 100644 index 7fe9b97e1..000000000 Binary files a/graphics/map_objects/pics/people/old_woman_2/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/old_woman_2/7.png b/graphics/map_objects/pics/people/old_woman_2/7.png deleted file mode 100644 index 681aab7cc..000000000 Binary files a/graphics/map_objects/pics/people/old_woman_2/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/old_woman_2/8.png b/graphics/map_objects/pics/people/old_woman_2/8.png deleted file mode 100644 index 87d5c464d..000000000 Binary files a/graphics/map_objects/pics/people/old_woman_2/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/phoebe/0.png b/graphics/map_objects/pics/people/phoebe/0.png deleted file mode 100644 index 06188b539..000000000 Binary files a/graphics/map_objects/pics/people/phoebe/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/phoebe/1.png b/graphics/map_objects/pics/people/phoebe/1.png deleted file mode 100644 index 505190902..000000000 Binary files a/graphics/map_objects/pics/people/phoebe/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/phoebe/2.png b/graphics/map_objects/pics/people/phoebe/2.png deleted file mode 100644 index a5f66cdbf..000000000 Binary files a/graphics/map_objects/pics/people/phoebe/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/picnicker/0.png b/graphics/map_objects/pics/people/picnicker/0.png deleted file mode 100644 index 310170def..000000000 Binary files a/graphics/map_objects/pics/people/picnicker/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/picnicker/1.png b/graphics/map_objects/pics/people/picnicker/1.png deleted file mode 100644 index 9caeb6de2..000000000 Binary files a/graphics/map_objects/pics/people/picnicker/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/picnicker/2.png b/graphics/map_objects/pics/people/picnicker/2.png deleted file mode 100644 index 17ca91044..000000000 Binary files a/graphics/map_objects/pics/people/picnicker/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/picnicker/3.png b/graphics/map_objects/pics/people/picnicker/3.png deleted file mode 100644 index e80ca4b4e..000000000 Binary files a/graphics/map_objects/pics/people/picnicker/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/picnicker/4.png b/graphics/map_objects/pics/people/picnicker/4.png deleted file mode 100644 index 1c2ad0709..000000000 Binary files a/graphics/map_objects/pics/people/picnicker/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/picnicker/5.png b/graphics/map_objects/pics/people/picnicker/5.png deleted file mode 100644 index a5dce80dd..000000000 Binary files a/graphics/map_objects/pics/people/picnicker/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/picnicker/6.png b/graphics/map_objects/pics/people/picnicker/6.png deleted file mode 100644 index 1895ff667..000000000 Binary files a/graphics/map_objects/pics/people/picnicker/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/picnicker/7.png b/graphics/map_objects/pics/people/picnicker/7.png deleted file mode 100644 index 62d0c2f68..000000000 Binary files a/graphics/map_objects/pics/people/picnicker/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/picnicker/8.png b/graphics/map_objects/pics/people/picnicker/8.png deleted file mode 100644 index 076c2c32b..000000000 Binary files a/graphics/map_objects/pics/people/picnicker/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/prof_birch/0.png b/graphics/map_objects/pics/people/prof_birch/0.png deleted file mode 100644 index 2dbe3bef5..000000000 Binary files a/graphics/map_objects/pics/people/prof_birch/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/prof_birch/1.png b/graphics/map_objects/pics/people/prof_birch/1.png deleted file mode 100644 index b27c2174a..000000000 Binary files a/graphics/map_objects/pics/people/prof_birch/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/prof_birch/2.png b/graphics/map_objects/pics/people/prof_birch/2.png deleted file mode 100644 index 195a3da01..000000000 Binary files a/graphics/map_objects/pics/people/prof_birch/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/prof_birch/3.png b/graphics/map_objects/pics/people/prof_birch/3.png deleted file mode 100644 index 5f9d2750e..000000000 Binary files a/graphics/map_objects/pics/people/prof_birch/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/prof_birch/4.png b/graphics/map_objects/pics/people/prof_birch/4.png deleted file mode 100644 index a44244f15..000000000 Binary files a/graphics/map_objects/pics/people/prof_birch/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/prof_birch/5.png b/graphics/map_objects/pics/people/prof_birch/5.png deleted file mode 100644 index 3c6c16ff1..000000000 Binary files a/graphics/map_objects/pics/people/prof_birch/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/prof_birch/6.png b/graphics/map_objects/pics/people/prof_birch/6.png deleted file mode 100644 index 802b89fd6..000000000 Binary files a/graphics/map_objects/pics/people/prof_birch/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/prof_birch/7.png b/graphics/map_objects/pics/people/prof_birch/7.png deleted file mode 100644 index 59af318a2..000000000 Binary files a/graphics/map_objects/pics/people/prof_birch/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/prof_birch/8.png b/graphics/map_objects/pics/people/prof_birch/8.png deleted file mode 100644 index 0a936308a..000000000 Binary files a/graphics/map_objects/pics/people/prof_birch/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/psychic_m/0.png b/graphics/map_objects/pics/people/psychic_m/0.png deleted file mode 100644 index 099e65aa1..000000000 Binary files a/graphics/map_objects/pics/people/psychic_m/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/psychic_m/1.png b/graphics/map_objects/pics/people/psychic_m/1.png deleted file mode 100644 index 6203b8f3a..000000000 Binary files a/graphics/map_objects/pics/people/psychic_m/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/psychic_m/2.png b/graphics/map_objects/pics/people/psychic_m/2.png deleted file mode 100644 index 00f19c8c3..000000000 Binary files a/graphics/map_objects/pics/people/psychic_m/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/psychic_m/3.png b/graphics/map_objects/pics/people/psychic_m/3.png deleted file mode 100644 index ec8733d45..000000000 Binary files a/graphics/map_objects/pics/people/psychic_m/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/psychic_m/4.png b/graphics/map_objects/pics/people/psychic_m/4.png deleted file mode 100644 index 7a2f06947..000000000 Binary files a/graphics/map_objects/pics/people/psychic_m/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/psychic_m/5.png b/graphics/map_objects/pics/people/psychic_m/5.png deleted file mode 100644 index 64133327d..000000000 Binary files a/graphics/map_objects/pics/people/psychic_m/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/psychic_m/6.png b/graphics/map_objects/pics/people/psychic_m/6.png deleted file mode 100644 index 7c55b4f4d..000000000 Binary files a/graphics/map_objects/pics/people/psychic_m/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/psychic_m/7.png b/graphics/map_objects/pics/people/psychic_m/7.png deleted file mode 100644 index 134953f5c..000000000 Binary files a/graphics/map_objects/pics/people/psychic_m/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/psychic_m/8.png b/graphics/map_objects/pics/people/psychic_m/8.png deleted file mode 100644 index 79ea167fe..000000000 Binary files a/graphics/map_objects/pics/people/psychic_m/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/quinty_plump/0.png b/graphics/map_objects/pics/people/quinty_plump/0.png deleted file mode 100644 index 7a29230f4..000000000 Binary files a/graphics/map_objects/pics/people/quinty_plump/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/quinty_plump/1.png b/graphics/map_objects/pics/people/quinty_plump/1.png deleted file mode 100644 index 6fbd85a26..000000000 Binary files a/graphics/map_objects/pics/people/quinty_plump/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/quinty_plump/2.png b/graphics/map_objects/pics/people/quinty_plump/2.png deleted file mode 100644 index 238f0a55c..000000000 Binary files a/graphics/map_objects/pics/people/quinty_plump/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/quinty_plump/3.png b/graphics/map_objects/pics/people/quinty_plump/3.png deleted file mode 100644 index d1cb5d7e7..000000000 Binary files a/graphics/map_objects/pics/people/quinty_plump/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/quinty_plump/4.png b/graphics/map_objects/pics/people/quinty_plump/4.png deleted file mode 100644 index 4afac2056..000000000 Binary files a/graphics/map_objects/pics/people/quinty_plump/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/quinty_plump/5.png b/graphics/map_objects/pics/people/quinty_plump/5.png deleted file mode 100644 index 9f9404aef..000000000 Binary files a/graphics/map_objects/pics/people/quinty_plump/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/quinty_plump/6.png b/graphics/map_objects/pics/people/quinty_plump/6.png deleted file mode 100644 index 11316499c..000000000 Binary files a/graphics/map_objects/pics/people/quinty_plump/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/red/0.png b/graphics/map_objects/pics/people/red/0.png deleted file mode 100644 index d6cf06ece..000000000 Binary files a/graphics/map_objects/pics/people/red/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/red/1.png b/graphics/map_objects/pics/people/red/1.png deleted file mode 100644 index 597001dfd..000000000 Binary files a/graphics/map_objects/pics/people/red/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/red/2.png b/graphics/map_objects/pics/people/red/2.png deleted file mode 100644 index 854948cee..000000000 Binary files a/graphics/map_objects/pics/people/red/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/red/3.png b/graphics/map_objects/pics/people/red/3.png deleted file mode 100644 index 6a533d4e4..000000000 Binary files a/graphics/map_objects/pics/people/red/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/red/4.png b/graphics/map_objects/pics/people/red/4.png deleted file mode 100644 index aaedd9411..000000000 Binary files a/graphics/map_objects/pics/people/red/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/red/5.png b/graphics/map_objects/pics/people/red/5.png deleted file mode 100644 index adc033530..000000000 Binary files a/graphics/map_objects/pics/people/red/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/red/6.png b/graphics/map_objects/pics/people/red/6.png deleted file mode 100644 index 5a5ac80e0..000000000 Binary files a/graphics/map_objects/pics/people/red/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/red/7.png b/graphics/map_objects/pics/people/red/7.png deleted file mode 100644 index 22bea3f24..000000000 Binary files a/graphics/map_objects/pics/people/red/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/red/8.png b/graphics/map_objects/pics/people/red/8.png deleted file mode 100644 index d0d544d16..000000000 Binary files a/graphics/map_objects/pics/people/red/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/reporter_f/0.png b/graphics/map_objects/pics/people/reporter_f/0.png deleted file mode 100644 index d22968ddd..000000000 Binary files a/graphics/map_objects/pics/people/reporter_f/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/reporter_f/1.png b/graphics/map_objects/pics/people/reporter_f/1.png deleted file mode 100644 index fb29ac66f..000000000 Binary files a/graphics/map_objects/pics/people/reporter_f/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/reporter_f/2.png b/graphics/map_objects/pics/people/reporter_f/2.png deleted file mode 100644 index 4ac633368..000000000 Binary files a/graphics/map_objects/pics/people/reporter_f/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/reporter_f/3.png b/graphics/map_objects/pics/people/reporter_f/3.png deleted file mode 100644 index 3fc93ee7f..000000000 Binary files a/graphics/map_objects/pics/people/reporter_f/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/reporter_f/4.png b/graphics/map_objects/pics/people/reporter_f/4.png deleted file mode 100644 index fa20a54c8..000000000 Binary files a/graphics/map_objects/pics/people/reporter_f/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/reporter_f/5.png b/graphics/map_objects/pics/people/reporter_f/5.png deleted file mode 100644 index 015575483..000000000 Binary files a/graphics/map_objects/pics/people/reporter_f/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/reporter_f/6.png b/graphics/map_objects/pics/people/reporter_f/6.png deleted file mode 100644 index e2c9d3d11..000000000 Binary files a/graphics/map_objects/pics/people/reporter_f/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/reporter_f/7.png b/graphics/map_objects/pics/people/reporter_f/7.png deleted file mode 100644 index 1b986e616..000000000 Binary files a/graphics/map_objects/pics/people/reporter_f/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/reporter_f/8.png b/graphics/map_objects/pics/people/reporter_f/8.png deleted file mode 100644 index d1dfc31a6..000000000 Binary files a/graphics/map_objects/pics/people/reporter_f/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/reporter_m/0.png b/graphics/map_objects/pics/people/reporter_m/0.png deleted file mode 100644 index b052abfee..000000000 Binary files a/graphics/map_objects/pics/people/reporter_m/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/reporter_m/1.png b/graphics/map_objects/pics/people/reporter_m/1.png deleted file mode 100644 index 0a273f5aa..000000000 Binary files a/graphics/map_objects/pics/people/reporter_m/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/reporter_m/2.png b/graphics/map_objects/pics/people/reporter_m/2.png deleted file mode 100644 index a47cef17b..000000000 Binary files a/graphics/map_objects/pics/people/reporter_m/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/reporter_m/3.png b/graphics/map_objects/pics/people/reporter_m/3.png deleted file mode 100644 index 780f128b3..000000000 Binary files a/graphics/map_objects/pics/people/reporter_m/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/reporter_m/4.png b/graphics/map_objects/pics/people/reporter_m/4.png deleted file mode 100644 index cb57002ab..000000000 Binary files a/graphics/map_objects/pics/people/reporter_m/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/reporter_m/5.png b/graphics/map_objects/pics/people/reporter_m/5.png deleted file mode 100644 index 6f488296c..000000000 Binary files a/graphics/map_objects/pics/people/reporter_m/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/reporter_m/6.png b/graphics/map_objects/pics/people/reporter_m/6.png deleted file mode 100644 index 4aad5d2c6..000000000 Binary files a/graphics/map_objects/pics/people/reporter_m/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/reporter_m/7.png b/graphics/map_objects/pics/people/reporter_m/7.png deleted file mode 100644 index 7ac1d360d..000000000 Binary files a/graphics/map_objects/pics/people/reporter_m/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/reporter_m/8.png b/graphics/map_objects/pics/people/reporter_m/8.png deleted file mode 100644 index 25b07efb4..000000000 Binary files a/graphics/map_objects/pics/people/reporter_m/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/0.png b/graphics/map_objects/pics/people/rooftop_sale_woman/0.png deleted file mode 100644 index f73f91631..000000000 Binary files a/graphics/map_objects/pics/people/rooftop_sale_woman/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/1.png b/graphics/map_objects/pics/people/rooftop_sale_woman/1.png deleted file mode 100644 index 855079988..000000000 Binary files a/graphics/map_objects/pics/people/rooftop_sale_woman/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/2.png b/graphics/map_objects/pics/people/rooftop_sale_woman/2.png deleted file mode 100644 index 643eb4eb2..000000000 Binary files a/graphics/map_objects/pics/people/rooftop_sale_woman/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/3.png b/graphics/map_objects/pics/people/rooftop_sale_woman/3.png deleted file mode 100644 index dbea9b53c..000000000 Binary files a/graphics/map_objects/pics/people/rooftop_sale_woman/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/4.png b/graphics/map_objects/pics/people/rooftop_sale_woman/4.png deleted file mode 100644 index d6bbc98b8..000000000 Binary files a/graphics/map_objects/pics/people/rooftop_sale_woman/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/5.png b/graphics/map_objects/pics/people/rooftop_sale_woman/5.png deleted file mode 100644 index bd99cf10f..000000000 Binary files a/graphics/map_objects/pics/people/rooftop_sale_woman/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/6.png b/graphics/map_objects/pics/people/rooftop_sale_woman/6.png deleted file mode 100644 index c5c447997..000000000 Binary files a/graphics/map_objects/pics/people/rooftop_sale_woman/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/7.png b/graphics/map_objects/pics/people/rooftop_sale_woman/7.png deleted file mode 100644 index 64b7691c4..000000000 Binary files a/graphics/map_objects/pics/people/rooftop_sale_woman/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/8.png b/graphics/map_objects/pics/people/rooftop_sale_woman/8.png deleted file mode 100644 index b588d2b26..000000000 Binary files a/graphics/map_objects/pics/people/rooftop_sale_woman/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/roxanne/0.png b/graphics/map_objects/pics/people/roxanne/0.png deleted file mode 100644 index 0a73a0723..000000000 Binary files a/graphics/map_objects/pics/people/roxanne/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/roxanne/1.png b/graphics/map_objects/pics/people/roxanne/1.png deleted file mode 100644 index 133f097bf..000000000 Binary files a/graphics/map_objects/pics/people/roxanne/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/roxanne/2.png b/graphics/map_objects/pics/people/roxanne/2.png deleted file mode 100644 index 946765eb2..000000000 Binary files a/graphics/map_objects/pics/people/roxanne/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/00.png b/graphics/map_objects/pics/people/ruby_sapphire_brendan/00.png deleted file mode 100644 index 780360c4f..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_brendan/00.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/01.png b/graphics/map_objects/pics/people/ruby_sapphire_brendan/01.png deleted file mode 100644 index f83064047..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_brendan/01.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/02.png b/graphics/map_objects/pics/people/ruby_sapphire_brendan/02.png deleted file mode 100644 index ffb8ad34b..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_brendan/02.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/03.png b/graphics/map_objects/pics/people/ruby_sapphire_brendan/03.png deleted file mode 100644 index d0721bbb4..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_brendan/03.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/04.png b/graphics/map_objects/pics/people/ruby_sapphire_brendan/04.png deleted file mode 100644 index 07817e55f..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_brendan/04.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/05.png b/graphics/map_objects/pics/people/ruby_sapphire_brendan/05.png deleted file mode 100644 index afc322129..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_brendan/05.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/06.png b/graphics/map_objects/pics/people/ruby_sapphire_brendan/06.png deleted file mode 100644 index 84a8cceb1..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_brendan/06.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/07.png b/graphics/map_objects/pics/people/ruby_sapphire_brendan/07.png deleted file mode 100644 index ca518d8a0..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_brendan/07.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/08.png b/graphics/map_objects/pics/people/ruby_sapphire_brendan/08.png deleted file mode 100644 index 3430ff243..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_brendan/08.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/09.png b/graphics/map_objects/pics/people/ruby_sapphire_brendan/09.png deleted file mode 100644 index 392f019e7..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_brendan/09.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/10.png b/graphics/map_objects/pics/people/ruby_sapphire_brendan/10.png deleted file mode 100644 index 722f2d04d..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_brendan/10.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/11.png b/graphics/map_objects/pics/people/ruby_sapphire_brendan/11.png deleted file mode 100644 index eff0cbc5f..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_brendan/11.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/12.png b/graphics/map_objects/pics/people/ruby_sapphire_brendan/12.png deleted file mode 100644 index 0a5037d43..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_brendan/12.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/13.png b/graphics/map_objects/pics/people/ruby_sapphire_brendan/13.png deleted file mode 100644 index 8dc245c0e..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_brendan/13.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/14.png b/graphics/map_objects/pics/people/ruby_sapphire_brendan/14.png deleted file mode 100644 index 53844c0c1..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_brendan/14.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/15.png b/graphics/map_objects/pics/people/ruby_sapphire_brendan/15.png deleted file mode 100644 index 34d73e7f6..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_brendan/15.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/16.png b/graphics/map_objects/pics/people/ruby_sapphire_brendan/16.png deleted file mode 100644 index b324f5538..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_brendan/16.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/17.png b/graphics/map_objects/pics/people/ruby_sapphire_brendan/17.png deleted file mode 100644 index 9a736dc02..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_brendan/17.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/0.png b/graphics/map_objects/pics/people/ruby_sapphire_little_boy/0.png deleted file mode 100644 index fb4365f0e..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/1.png b/graphics/map_objects/pics/people/ruby_sapphire_little_boy/1.png deleted file mode 100644 index f681154dd..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/2.png b/graphics/map_objects/pics/people/ruby_sapphire_little_boy/2.png deleted file mode 100644 index 20f838bb2..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/3.png b/graphics/map_objects/pics/people/ruby_sapphire_little_boy/3.png deleted file mode 100644 index 4a83b0c97..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/4.png b/graphics/map_objects/pics/people/ruby_sapphire_little_boy/4.png deleted file mode 100644 index b6573d454..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/5.png b/graphics/map_objects/pics/people/ruby_sapphire_little_boy/5.png deleted file mode 100644 index a1a9b08cf..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/6.png b/graphics/map_objects/pics/people/ruby_sapphire_little_boy/6.png deleted file mode 100644 index 8f34c74e4..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/7.png b/graphics/map_objects/pics/people/ruby_sapphire_little_boy/7.png deleted file mode 100644 index 7d8d2c23c..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/8.png b/graphics/map_objects/pics/people/ruby_sapphire_little_boy/8.png deleted file mode 100644 index 4799db90c..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/00.png b/graphics/map_objects/pics/people/ruby_sapphire_may/00.png deleted file mode 100644 index 2ccd3399a..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_may/00.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/01.png b/graphics/map_objects/pics/people/ruby_sapphire_may/01.png deleted file mode 100644 index 94aad9ac7..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_may/01.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/02.png b/graphics/map_objects/pics/people/ruby_sapphire_may/02.png deleted file mode 100644 index e61943fbb..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_may/02.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/03.png b/graphics/map_objects/pics/people/ruby_sapphire_may/03.png deleted file mode 100644 index b8d1255d5..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_may/03.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/04.png b/graphics/map_objects/pics/people/ruby_sapphire_may/04.png deleted file mode 100644 index 7d3cac765..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_may/04.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/05.png b/graphics/map_objects/pics/people/ruby_sapphire_may/05.png deleted file mode 100644 index d5a4ab94e..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_may/05.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/06.png b/graphics/map_objects/pics/people/ruby_sapphire_may/06.png deleted file mode 100644 index d22684057..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_may/06.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/07.png b/graphics/map_objects/pics/people/ruby_sapphire_may/07.png deleted file mode 100644 index d0f0c3716..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_may/07.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/08.png b/graphics/map_objects/pics/people/ruby_sapphire_may/08.png deleted file mode 100644 index dbb26c4e7..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_may/08.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/09.png b/graphics/map_objects/pics/people/ruby_sapphire_may/09.png deleted file mode 100644 index 714316485..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_may/09.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/10.png b/graphics/map_objects/pics/people/ruby_sapphire_may/10.png deleted file mode 100644 index 07897594f..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_may/10.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/11.png b/graphics/map_objects/pics/people/ruby_sapphire_may/11.png deleted file mode 100644 index e4583aa91..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_may/11.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/12.png b/graphics/map_objects/pics/people/ruby_sapphire_may/12.png deleted file mode 100644 index 34405b837..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_may/12.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/13.png b/graphics/map_objects/pics/people/ruby_sapphire_may/13.png deleted file mode 100644 index 3b0ec86b3..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_may/13.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/14.png b/graphics/map_objects/pics/people/ruby_sapphire_may/14.png deleted file mode 100644 index 18ee35cb9..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_may/14.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/15.png b/graphics/map_objects/pics/people/ruby_sapphire_may/15.png deleted file mode 100644 index ea5e0fd5f..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_may/15.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/16.png b/graphics/map_objects/pics/people/ruby_sapphire_may/16.png deleted file mode 100644 index c7e9dd58b..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_may/16.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/17.png b/graphics/map_objects/pics/people/ruby_sapphire_may/17.png deleted file mode 100644 index e79de8152..000000000 Binary files a/graphics/map_objects/pics/people/ruby_sapphire_may/17.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/running_triathlete_f/0.png b/graphics/map_objects/pics/people/running_triathlete_f/0.png deleted file mode 100644 index 195edef7b..000000000 Binary files a/graphics/map_objects/pics/people/running_triathlete_f/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/running_triathlete_f/1.png b/graphics/map_objects/pics/people/running_triathlete_f/1.png deleted file mode 100644 index 1a7069621..000000000 Binary files a/graphics/map_objects/pics/people/running_triathlete_f/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/running_triathlete_f/2.png b/graphics/map_objects/pics/people/running_triathlete_f/2.png deleted file mode 100644 index aab9ca24b..000000000 Binary files a/graphics/map_objects/pics/people/running_triathlete_f/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/running_triathlete_f/3.png b/graphics/map_objects/pics/people/running_triathlete_f/3.png deleted file mode 100644 index 909fc0f60..000000000 Binary files a/graphics/map_objects/pics/people/running_triathlete_f/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/running_triathlete_f/4.png b/graphics/map_objects/pics/people/running_triathlete_f/4.png deleted file mode 100644 index 301d13d09..000000000 Binary files a/graphics/map_objects/pics/people/running_triathlete_f/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/running_triathlete_f/5.png b/graphics/map_objects/pics/people/running_triathlete_f/5.png deleted file mode 100644 index 84914d619..000000000 Binary files a/graphics/map_objects/pics/people/running_triathlete_f/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/running_triathlete_f/6.png b/graphics/map_objects/pics/people/running_triathlete_f/6.png deleted file mode 100644 index 9ee690631..000000000 Binary files a/graphics/map_objects/pics/people/running_triathlete_f/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/running_triathlete_f/7.png b/graphics/map_objects/pics/people/running_triathlete_f/7.png deleted file mode 100644 index 2441def63..000000000 Binary files a/graphics/map_objects/pics/people/running_triathlete_f/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/running_triathlete_f/8.png b/graphics/map_objects/pics/people/running_triathlete_f/8.png deleted file mode 100644 index a96d1e221..000000000 Binary files a/graphics/map_objects/pics/people/running_triathlete_f/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/running_triathlete_m/0.png b/graphics/map_objects/pics/people/running_triathlete_m/0.png deleted file mode 100644 index 0d02be87e..000000000 Binary files a/graphics/map_objects/pics/people/running_triathlete_m/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/running_triathlete_m/1.png b/graphics/map_objects/pics/people/running_triathlete_m/1.png deleted file mode 100644 index 21e2fdf11..000000000 Binary files a/graphics/map_objects/pics/people/running_triathlete_m/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/running_triathlete_m/2.png b/graphics/map_objects/pics/people/running_triathlete_m/2.png deleted file mode 100644 index d571938e3..000000000 Binary files a/graphics/map_objects/pics/people/running_triathlete_m/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/running_triathlete_m/3.png b/graphics/map_objects/pics/people/running_triathlete_m/3.png deleted file mode 100644 index f60cc6b5b..000000000 Binary files a/graphics/map_objects/pics/people/running_triathlete_m/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/running_triathlete_m/4.png b/graphics/map_objects/pics/people/running_triathlete_m/4.png deleted file mode 100644 index 6ec60997a..000000000 Binary files a/graphics/map_objects/pics/people/running_triathlete_m/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/running_triathlete_m/5.png b/graphics/map_objects/pics/people/running_triathlete_m/5.png deleted file mode 100644 index 4f5742f1a..000000000 Binary files a/graphics/map_objects/pics/people/running_triathlete_m/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/running_triathlete_m/6.png b/graphics/map_objects/pics/people/running_triathlete_m/6.png deleted file mode 100644 index be048ac7e..000000000 Binary files a/graphics/map_objects/pics/people/running_triathlete_m/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/running_triathlete_m/7.png b/graphics/map_objects/pics/people/running_triathlete_m/7.png deleted file mode 100644 index 9a972be67..000000000 Binary files a/graphics/map_objects/pics/people/running_triathlete_m/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/running_triathlete_m/8.png b/graphics/map_objects/pics/people/running_triathlete_m/8.png deleted file mode 100644 index 18ea0d178..000000000 Binary files a/graphics/map_objects/pics/people/running_triathlete_m/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/sailor/0.png b/graphics/map_objects/pics/people/sailor/0.png deleted file mode 100644 index 8dc44669a..000000000 Binary files a/graphics/map_objects/pics/people/sailor/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/sailor/1.png b/graphics/map_objects/pics/people/sailor/1.png deleted file mode 100644 index 8cb9ba620..000000000 Binary files a/graphics/map_objects/pics/people/sailor/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/sailor/2.png b/graphics/map_objects/pics/people/sailor/2.png deleted file mode 100644 index 34a832cbf..000000000 Binary files a/graphics/map_objects/pics/people/sailor/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/sailor/3.png b/graphics/map_objects/pics/people/sailor/3.png deleted file mode 100644 index 1ad0918a8..000000000 Binary files a/graphics/map_objects/pics/people/sailor/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/sailor/4.png b/graphics/map_objects/pics/people/sailor/4.png deleted file mode 100644 index 623c42211..000000000 Binary files a/graphics/map_objects/pics/people/sailor/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/sailor/5.png b/graphics/map_objects/pics/people/sailor/5.png deleted file mode 100644 index 01795d75f..000000000 Binary files a/graphics/map_objects/pics/people/sailor/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/sailor/6.png b/graphics/map_objects/pics/people/sailor/6.png deleted file mode 100644 index a3babaa42..000000000 Binary files a/graphics/map_objects/pics/people/sailor/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/sailor/7.png b/graphics/map_objects/pics/people/sailor/7.png deleted file mode 100644 index 08abf8a71..000000000 Binary files a/graphics/map_objects/pics/people/sailor/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/sailor/8.png b/graphics/map_objects/pics/people/sailor/8.png deleted file mode 100644 index f7d2ec655..000000000 Binary files a/graphics/map_objects/pics/people/sailor/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/school_kid_m/0.png b/graphics/map_objects/pics/people/school_kid_m/0.png deleted file mode 100644 index 3f700ffaf..000000000 Binary files a/graphics/map_objects/pics/people/school_kid_m/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/school_kid_m/1.png b/graphics/map_objects/pics/people/school_kid_m/1.png deleted file mode 100644 index c47d69d34..000000000 Binary files a/graphics/map_objects/pics/people/school_kid_m/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/school_kid_m/2.png b/graphics/map_objects/pics/people/school_kid_m/2.png deleted file mode 100644 index b4116862b..000000000 Binary files a/graphics/map_objects/pics/people/school_kid_m/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/school_kid_m/3.png b/graphics/map_objects/pics/people/school_kid_m/3.png deleted file mode 100644 index 078ce5bc4..000000000 Binary files a/graphics/map_objects/pics/people/school_kid_m/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/school_kid_m/4.png b/graphics/map_objects/pics/people/school_kid_m/4.png deleted file mode 100644 index 330979128..000000000 Binary files a/graphics/map_objects/pics/people/school_kid_m/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/school_kid_m/5.png b/graphics/map_objects/pics/people/school_kid_m/5.png deleted file mode 100644 index 44ab9e8aa..000000000 Binary files a/graphics/map_objects/pics/people/school_kid_m/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/school_kid_m/6.png b/graphics/map_objects/pics/people/school_kid_m/6.png deleted file mode 100644 index ba20fc113..000000000 Binary files a/graphics/map_objects/pics/people/school_kid_m/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/school_kid_m/7.png b/graphics/map_objects/pics/people/school_kid_m/7.png deleted file mode 100644 index c4a5444e0..000000000 Binary files a/graphics/map_objects/pics/people/school_kid_m/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/school_kid_m/8.png b/graphics/map_objects/pics/people/school_kid_m/8.png deleted file mode 100644 index 047b340fb..000000000 Binary files a/graphics/map_objects/pics/people/school_kid_m/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/scientist_1/0.png b/graphics/map_objects/pics/people/scientist_1/0.png deleted file mode 100644 index ef85b5985..000000000 Binary files a/graphics/map_objects/pics/people/scientist_1/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/scientist_1/1.png b/graphics/map_objects/pics/people/scientist_1/1.png deleted file mode 100644 index 2a2ade370..000000000 Binary files a/graphics/map_objects/pics/people/scientist_1/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/scientist_1/2.png b/graphics/map_objects/pics/people/scientist_1/2.png deleted file mode 100644 index 6d3e31618..000000000 Binary files a/graphics/map_objects/pics/people/scientist_1/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/scientist_1/3.png b/graphics/map_objects/pics/people/scientist_1/3.png deleted file mode 100644 index 433dd879d..000000000 Binary files a/graphics/map_objects/pics/people/scientist_1/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/scientist_1/4.png b/graphics/map_objects/pics/people/scientist_1/4.png deleted file mode 100644 index 3c0594e4f..000000000 Binary files a/graphics/map_objects/pics/people/scientist_1/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/scientist_1/5.png b/graphics/map_objects/pics/people/scientist_1/5.png deleted file mode 100644 index 12fdc5c84..000000000 Binary files a/graphics/map_objects/pics/people/scientist_1/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/scientist_1/6.png b/graphics/map_objects/pics/people/scientist_1/6.png deleted file mode 100644 index 6ea4c5577..000000000 Binary files a/graphics/map_objects/pics/people/scientist_1/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/scientist_1/7.png b/graphics/map_objects/pics/people/scientist_1/7.png deleted file mode 100644 index 7496fcc98..000000000 Binary files a/graphics/map_objects/pics/people/scientist_1/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/scientist_1/8.png b/graphics/map_objects/pics/people/scientist_1/8.png deleted file mode 100644 index 7487b1b46..000000000 Binary files a/graphics/map_objects/pics/people/scientist_1/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/scientist_2/0.png b/graphics/map_objects/pics/people/scientist_2/0.png deleted file mode 100644 index 0a2f65a81..000000000 Binary files a/graphics/map_objects/pics/people/scientist_2/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/scientist_2/1.png b/graphics/map_objects/pics/people/scientist_2/1.png deleted file mode 100644 index c7ef46ca1..000000000 Binary files a/graphics/map_objects/pics/people/scientist_2/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/scientist_2/2.png b/graphics/map_objects/pics/people/scientist_2/2.png deleted file mode 100644 index 3e8d2f530..000000000 Binary files a/graphics/map_objects/pics/people/scientist_2/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/scientist_2/3.png b/graphics/map_objects/pics/people/scientist_2/3.png deleted file mode 100644 index 9c3f70989..000000000 Binary files a/graphics/map_objects/pics/people/scientist_2/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/scientist_2/4.png b/graphics/map_objects/pics/people/scientist_2/4.png deleted file mode 100644 index 28ac9b4cb..000000000 Binary files a/graphics/map_objects/pics/people/scientist_2/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/scientist_2/5.png b/graphics/map_objects/pics/people/scientist_2/5.png deleted file mode 100644 index 836241dc9..000000000 Binary files a/graphics/map_objects/pics/people/scientist_2/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/scientist_2/6.png b/graphics/map_objects/pics/people/scientist_2/6.png deleted file mode 100644 index 894ba989e..000000000 Binary files a/graphics/map_objects/pics/people/scientist_2/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/scientist_2/7.png b/graphics/map_objects/pics/people/scientist_2/7.png deleted file mode 100644 index b3176d10e..000000000 Binary files a/graphics/map_objects/pics/people/scientist_2/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/scientist_2/8.png b/graphics/map_objects/pics/people/scientist_2/8.png deleted file mode 100644 index 4666c2f9a..000000000 Binary files a/graphics/map_objects/pics/people/scientist_2/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/scott/0.png b/graphics/map_objects/pics/people/scott/0.png deleted file mode 100644 index 44a9f0dc2..000000000 Binary files a/graphics/map_objects/pics/people/scott/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/scott/1.png b/graphics/map_objects/pics/people/scott/1.png deleted file mode 100644 index 63510a313..000000000 Binary files a/graphics/map_objects/pics/people/scott/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/scott/2.png b/graphics/map_objects/pics/people/scott/2.png deleted file mode 100644 index ef11e8e1f..000000000 Binary files a/graphics/map_objects/pics/people/scott/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/scott/3.png b/graphics/map_objects/pics/people/scott/3.png deleted file mode 100644 index 8e087335f..000000000 Binary files a/graphics/map_objects/pics/people/scott/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/scott/4.png b/graphics/map_objects/pics/people/scott/4.png deleted file mode 100644 index 1ab051fc0..000000000 Binary files a/graphics/map_objects/pics/people/scott/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/scott/5.png b/graphics/map_objects/pics/people/scott/5.png deleted file mode 100644 index 167ada21d..000000000 Binary files a/graphics/map_objects/pics/people/scott/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/scott/6.png b/graphics/map_objects/pics/people/scott/6.png deleted file mode 100644 index e3c489f99..000000000 Binary files a/graphics/map_objects/pics/people/scott/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/scott/7.png b/graphics/map_objects/pics/people/scott/7.png deleted file mode 100644 index 3d2b77b1b..000000000 Binary files a/graphics/map_objects/pics/people/scott/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/scott/8.png b/graphics/map_objects/pics/people/scott/8.png deleted file mode 100644 index 5ac07720c..000000000 Binary files a/graphics/map_objects/pics/people/scott/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/sidney/0.png b/graphics/map_objects/pics/people/sidney/0.png deleted file mode 100644 index abbbcd3fb..000000000 Binary files a/graphics/map_objects/pics/people/sidney/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/sidney/1.png b/graphics/map_objects/pics/people/sidney/1.png deleted file mode 100644 index e13e8ef32..000000000 Binary files a/graphics/map_objects/pics/people/sidney/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/sidney/2.png b/graphics/map_objects/pics/people/sidney/2.png deleted file mode 100644 index 8c6d51434..000000000 Binary files a/graphics/map_objects/pics/people/sidney/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/spenser/0.png b/graphics/map_objects/pics/people/spenser/0.png deleted file mode 100644 index 526e77c75..000000000 Binary files a/graphics/map_objects/pics/people/spenser/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/spenser/1.png b/graphics/map_objects/pics/people/spenser/1.png deleted file mode 100644 index 1009f4344..000000000 Binary files a/graphics/map_objects/pics/people/spenser/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/spenser/2.png b/graphics/map_objects/pics/people/spenser/2.png deleted file mode 100644 index 2b6eb8fa9..000000000 Binary files a/graphics/map_objects/pics/people/spenser/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/spenser/3.png b/graphics/map_objects/pics/people/spenser/3.png deleted file mode 100644 index 5fbc2044d..000000000 Binary files a/graphics/map_objects/pics/people/spenser/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/spenser/4.png b/graphics/map_objects/pics/people/spenser/4.png deleted file mode 100644 index 64a194e36..000000000 Binary files a/graphics/map_objects/pics/people/spenser/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/spenser/5.png b/graphics/map_objects/pics/people/spenser/5.png deleted file mode 100644 index 4e024fac0..000000000 Binary files a/graphics/map_objects/pics/people/spenser/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/spenser/6.png b/graphics/map_objects/pics/people/spenser/6.png deleted file mode 100644 index 2f6fefd88..000000000 Binary files a/graphics/map_objects/pics/people/spenser/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/spenser/7.png b/graphics/map_objects/pics/people/spenser/7.png deleted file mode 100644 index 23be07f56..000000000 Binary files a/graphics/map_objects/pics/people/spenser/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/spenser/8.png b/graphics/map_objects/pics/people/spenser/8.png deleted file mode 100644 index 71fff631b..000000000 Binary files a/graphics/map_objects/pics/people/spenser/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/steven/0.png b/graphics/map_objects/pics/people/steven/0.png deleted file mode 100644 index 35cc4d404..000000000 Binary files a/graphics/map_objects/pics/people/steven/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/steven/1.png b/graphics/map_objects/pics/people/steven/1.png deleted file mode 100644 index 37a8367ea..000000000 Binary files a/graphics/map_objects/pics/people/steven/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/steven/2.png b/graphics/map_objects/pics/people/steven/2.png deleted file mode 100644 index 4d0447529..000000000 Binary files a/graphics/map_objects/pics/people/steven/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/steven/3.png b/graphics/map_objects/pics/people/steven/3.png deleted file mode 100644 index b2094c8b6..000000000 Binary files a/graphics/map_objects/pics/people/steven/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/steven/4.png b/graphics/map_objects/pics/people/steven/4.png deleted file mode 100644 index d47448bc8..000000000 Binary files a/graphics/map_objects/pics/people/steven/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/steven/5.png b/graphics/map_objects/pics/people/steven/5.png deleted file mode 100644 index e023078ee..000000000 Binary files a/graphics/map_objects/pics/people/steven/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/steven/6.png b/graphics/map_objects/pics/people/steven/6.png deleted file mode 100644 index fb885a1bd..000000000 Binary files a/graphics/map_objects/pics/people/steven/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/steven/7.png b/graphics/map_objects/pics/people/steven/7.png deleted file mode 100644 index ee2fbbb5f..000000000 Binary files a/graphics/map_objects/pics/people/steven/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/steven/8.png b/graphics/map_objects/pics/people/steven/8.png deleted file mode 100644 index e140731cd..000000000 Binary files a/graphics/map_objects/pics/people/steven/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/swimmer_f/0.png b/graphics/map_objects/pics/people/swimmer_f/0.png deleted file mode 100644 index e34972cc7..000000000 Binary files a/graphics/map_objects/pics/people/swimmer_f/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/swimmer_f/1.png b/graphics/map_objects/pics/people/swimmer_f/1.png deleted file mode 100644 index 64c3c79e5..000000000 Binary files a/graphics/map_objects/pics/people/swimmer_f/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/swimmer_f/2.png b/graphics/map_objects/pics/people/swimmer_f/2.png deleted file mode 100644 index cf4d17d5d..000000000 Binary files a/graphics/map_objects/pics/people/swimmer_f/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/swimmer_f/3.png b/graphics/map_objects/pics/people/swimmer_f/3.png deleted file mode 100644 index e8edbc9a6..000000000 Binary files a/graphics/map_objects/pics/people/swimmer_f/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/swimmer_f/4.png b/graphics/map_objects/pics/people/swimmer_f/4.png deleted file mode 100644 index 1f5abf77e..000000000 Binary files a/graphics/map_objects/pics/people/swimmer_f/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/swimmer_f/5.png b/graphics/map_objects/pics/people/swimmer_f/5.png deleted file mode 100644 index 5e19861cb..000000000 Binary files a/graphics/map_objects/pics/people/swimmer_f/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/swimmer_f/6.png b/graphics/map_objects/pics/people/swimmer_f/6.png deleted file mode 100644 index c4b602391..000000000 Binary files a/graphics/map_objects/pics/people/swimmer_f/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/swimmer_f/7.png b/graphics/map_objects/pics/people/swimmer_f/7.png deleted file mode 100644 index beb17704a..000000000 Binary files a/graphics/map_objects/pics/people/swimmer_f/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/swimmer_f/8.png b/graphics/map_objects/pics/people/swimmer_f/8.png deleted file mode 100644 index db5588f7c..000000000 Binary files a/graphics/map_objects/pics/people/swimmer_f/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/swimmer_m/0.png b/graphics/map_objects/pics/people/swimmer_m/0.png deleted file mode 100644 index 51d63bb26..000000000 Binary files a/graphics/map_objects/pics/people/swimmer_m/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/swimmer_m/1.png b/graphics/map_objects/pics/people/swimmer_m/1.png deleted file mode 100644 index d1f976558..000000000 Binary files a/graphics/map_objects/pics/people/swimmer_m/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/swimmer_m/2.png b/graphics/map_objects/pics/people/swimmer_m/2.png deleted file mode 100644 index b4087efb5..000000000 Binary files a/graphics/map_objects/pics/people/swimmer_m/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/swimmer_m/3.png b/graphics/map_objects/pics/people/swimmer_m/3.png deleted file mode 100644 index 4f445b8a8..000000000 Binary files a/graphics/map_objects/pics/people/swimmer_m/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/swimmer_m/4.png b/graphics/map_objects/pics/people/swimmer_m/4.png deleted file mode 100644 index 940e8cf5d..000000000 Binary files a/graphics/map_objects/pics/people/swimmer_m/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/swimmer_m/5.png b/graphics/map_objects/pics/people/swimmer_m/5.png deleted file mode 100644 index d6be697b0..000000000 Binary files a/graphics/map_objects/pics/people/swimmer_m/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/swimmer_m/6.png b/graphics/map_objects/pics/people/swimmer_m/6.png deleted file mode 100644 index cb2de823b..000000000 Binary files a/graphics/map_objects/pics/people/swimmer_m/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/swimmer_m/7.png b/graphics/map_objects/pics/people/swimmer_m/7.png deleted file mode 100644 index b17892261..000000000 Binary files a/graphics/map_objects/pics/people/swimmer_m/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/swimmer_m/8.png b/graphics/map_objects/pics/people/swimmer_m/8.png deleted file mode 100644 index 1f3fd48d0..000000000 Binary files a/graphics/map_objects/pics/people/swimmer_m/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tate/0.png b/graphics/map_objects/pics/people/tate/0.png deleted file mode 100644 index f2481f1e2..000000000 Binary files a/graphics/map_objects/pics/people/tate/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tate/1.png b/graphics/map_objects/pics/people/tate/1.png deleted file mode 100644 index ff1608cf2..000000000 Binary files a/graphics/map_objects/pics/people/tate/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tate/2.png b/graphics/map_objects/pics/people/tate/2.png deleted file mode 100644 index 9fba8459d..000000000 Binary files a/graphics/map_objects/pics/people/tate/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/teala/0.png b/graphics/map_objects/pics/people/teala/0.png deleted file mode 100644 index 173152306..000000000 Binary files a/graphics/map_objects/pics/people/teala/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/teala/1.png b/graphics/map_objects/pics/people/teala/1.png deleted file mode 100644 index 2340f3262..000000000 Binary files a/graphics/map_objects/pics/people/teala/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/teala/2.png b/graphics/map_objects/pics/people/teala/2.png deleted file mode 100644 index 1900d9e8d..000000000 Binary files a/graphics/map_objects/pics/people/teala/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/teala/3.png b/graphics/map_objects/pics/people/teala/3.png deleted file mode 100644 index f3d46c920..000000000 Binary files a/graphics/map_objects/pics/people/teala/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/teala/4.png b/graphics/map_objects/pics/people/teala/4.png deleted file mode 100644 index 5b70939b2..000000000 Binary files a/graphics/map_objects/pics/people/teala/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/teala/5.png b/graphics/map_objects/pics/people/teala/5.png deleted file mode 100644 index fcba35792..000000000 Binary files a/graphics/map_objects/pics/people/teala/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/teala/6.png b/graphics/map_objects/pics/people/teala/6.png deleted file mode 100644 index 85a574bb8..000000000 Binary files a/graphics/map_objects/pics/people/teala/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/teala/7.png b/graphics/map_objects/pics/people/teala/7.png deleted file mode 100644 index 882d7adca..000000000 Binary files a/graphics/map_objects/pics/people/teala/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/teala/8.png b/graphics/map_objects/pics/people/teala/8.png deleted file mode 100644 index 4366d38f9..000000000 Binary files a/graphics/map_objects/pics/people/teala/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tuber_f/0.png b/graphics/map_objects/pics/people/tuber_f/0.png deleted file mode 100644 index 34081dbad..000000000 Binary files a/graphics/map_objects/pics/people/tuber_f/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tuber_f/1.png b/graphics/map_objects/pics/people/tuber_f/1.png deleted file mode 100644 index 5ad154c38..000000000 Binary files a/graphics/map_objects/pics/people/tuber_f/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tuber_f/2.png b/graphics/map_objects/pics/people/tuber_f/2.png deleted file mode 100644 index d87de1307..000000000 Binary files a/graphics/map_objects/pics/people/tuber_f/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tuber_f/3.png b/graphics/map_objects/pics/people/tuber_f/3.png deleted file mode 100644 index 17ffb8845..000000000 Binary files a/graphics/map_objects/pics/people/tuber_f/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tuber_f/4.png b/graphics/map_objects/pics/people/tuber_f/4.png deleted file mode 100644 index 9de7aa0ab..000000000 Binary files a/graphics/map_objects/pics/people/tuber_f/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tuber_f/5.png b/graphics/map_objects/pics/people/tuber_f/5.png deleted file mode 100644 index 16bd9c685..000000000 Binary files a/graphics/map_objects/pics/people/tuber_f/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tuber_f/6.png b/graphics/map_objects/pics/people/tuber_f/6.png deleted file mode 100644 index e026ea45d..000000000 Binary files a/graphics/map_objects/pics/people/tuber_f/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tuber_f/7.png b/graphics/map_objects/pics/people/tuber_f/7.png deleted file mode 100644 index fbabc200d..000000000 Binary files a/graphics/map_objects/pics/people/tuber_f/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tuber_f/8.png b/graphics/map_objects/pics/people/tuber_f/8.png deleted file mode 100644 index ad08f016b..000000000 Binary files a/graphics/map_objects/pics/people/tuber_f/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tuber_m/0.png b/graphics/map_objects/pics/people/tuber_m/0.png deleted file mode 100644 index 323439703..000000000 Binary files a/graphics/map_objects/pics/people/tuber_m/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tuber_m/1.png b/graphics/map_objects/pics/people/tuber_m/1.png deleted file mode 100644 index dfce73bbc..000000000 Binary files a/graphics/map_objects/pics/people/tuber_m/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tuber_m/2.png b/graphics/map_objects/pics/people/tuber_m/2.png deleted file mode 100644 index 1b1de564f..000000000 Binary files a/graphics/map_objects/pics/people/tuber_m/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tuber_m/3.png b/graphics/map_objects/pics/people/tuber_m/3.png deleted file mode 100644 index 39f37a19b..000000000 Binary files a/graphics/map_objects/pics/people/tuber_m/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tuber_m/4.png b/graphics/map_objects/pics/people/tuber_m/4.png deleted file mode 100644 index 78fae1160..000000000 Binary files a/graphics/map_objects/pics/people/tuber_m/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tuber_m/5.png b/graphics/map_objects/pics/people/tuber_m/5.png deleted file mode 100644 index 690add8ad..000000000 Binary files a/graphics/map_objects/pics/people/tuber_m/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tuber_m/6.png b/graphics/map_objects/pics/people/tuber_m/6.png deleted file mode 100644 index ff61406b9..000000000 Binary files a/graphics/map_objects/pics/people/tuber_m/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tuber_m/7.png b/graphics/map_objects/pics/people/tuber_m/7.png deleted file mode 100644 index d8c7b98cf..000000000 Binary files a/graphics/map_objects/pics/people/tuber_m/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tuber_m/8.png b/graphics/map_objects/pics/people/tuber_m/8.png deleted file mode 100644 index 4ec4b5599..000000000 Binary files a/graphics/map_objects/pics/people/tuber_m/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/0.png b/graphics/map_objects/pics/people/tuber_m_swimming/0.png deleted file mode 100644 index c6ba83d87..000000000 Binary files a/graphics/map_objects/pics/people/tuber_m_swimming/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/1.png b/graphics/map_objects/pics/people/tuber_m_swimming/1.png deleted file mode 100644 index 85eb42650..000000000 Binary files a/graphics/map_objects/pics/people/tuber_m_swimming/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/2.png b/graphics/map_objects/pics/people/tuber_m_swimming/2.png deleted file mode 100644 index 1cca717b0..000000000 Binary files a/graphics/map_objects/pics/people/tuber_m_swimming/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/3.png b/graphics/map_objects/pics/people/tuber_m_swimming/3.png deleted file mode 100644 index 253d75ed0..000000000 Binary files a/graphics/map_objects/pics/people/tuber_m_swimming/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/4.png b/graphics/map_objects/pics/people/tuber_m_swimming/4.png deleted file mode 100644 index d64c9033f..000000000 Binary files a/graphics/map_objects/pics/people/tuber_m_swimming/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/5.png b/graphics/map_objects/pics/people/tuber_m_swimming/5.png deleted file mode 100644 index 2a8e7d67d..000000000 Binary files a/graphics/map_objects/pics/people/tuber_m_swimming/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/6.png b/graphics/map_objects/pics/people/tuber_m_swimming/6.png deleted file mode 100644 index c55acdf29..000000000 Binary files a/graphics/map_objects/pics/people/tuber_m_swimming/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/7.png b/graphics/map_objects/pics/people/tuber_m_swimming/7.png deleted file mode 100644 index 7a203920f..000000000 Binary files a/graphics/map_objects/pics/people/tuber_m_swimming/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/8.png b/graphics/map_objects/pics/people/tuber_m_swimming/8.png deleted file mode 100644 index 321f8acca..000000000 Binary files a/graphics/map_objects/pics/people/tuber_m_swimming/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tucker/0.png b/graphics/map_objects/pics/people/tucker/0.png deleted file mode 100644 index ec733c959..000000000 Binary files a/graphics/map_objects/pics/people/tucker/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tucker/1.png b/graphics/map_objects/pics/people/tucker/1.png deleted file mode 100644 index ad4af677c..000000000 Binary files a/graphics/map_objects/pics/people/tucker/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tucker/2.png b/graphics/map_objects/pics/people/tucker/2.png deleted file mode 100644 index 2496ded57..000000000 Binary files a/graphics/map_objects/pics/people/tucker/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tucker/3.png b/graphics/map_objects/pics/people/tucker/3.png deleted file mode 100644 index 3f7b156f0..000000000 Binary files a/graphics/map_objects/pics/people/tucker/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tucker/4.png b/graphics/map_objects/pics/people/tucker/4.png deleted file mode 100644 index 4262e1be0..000000000 Binary files a/graphics/map_objects/pics/people/tucker/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tucker/5.png b/graphics/map_objects/pics/people/tucker/5.png deleted file mode 100644 index 53304c221..000000000 Binary files a/graphics/map_objects/pics/people/tucker/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tucker/6.png b/graphics/map_objects/pics/people/tucker/6.png deleted file mode 100644 index 0bab43c10..000000000 Binary files a/graphics/map_objects/pics/people/tucker/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tucker/7.png b/graphics/map_objects/pics/people/tucker/7.png deleted file mode 100644 index a98ef8819..000000000 Binary files a/graphics/map_objects/pics/people/tucker/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/tucker/8.png b/graphics/map_objects/pics/people/tucker/8.png deleted file mode 100644 index 7b6d30a22..000000000 Binary files a/graphics/map_objects/pics/people/tucker/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/union_room_attendant/0.png b/graphics/map_objects/pics/people/union_room_attendant/0.png deleted file mode 100644 index cfccc0049..000000000 Binary files a/graphics/map_objects/pics/people/union_room_attendant/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/union_room_attendant/1.png b/graphics/map_objects/pics/people/union_room_attendant/1.png deleted file mode 100644 index 6790d092e..000000000 Binary files a/graphics/map_objects/pics/people/union_room_attendant/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/union_room_attendant/2.png b/graphics/map_objects/pics/people/union_room_attendant/2.png deleted file mode 100644 index 38fb1eb74..000000000 Binary files a/graphics/map_objects/pics/people/union_room_attendant/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/unused_woman/0.png b/graphics/map_objects/pics/people/unused_woman/0.png deleted file mode 100644 index 01ba70b56..000000000 Binary files a/graphics/map_objects/pics/people/unused_woman/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/unused_woman/1.png b/graphics/map_objects/pics/people/unused_woman/1.png deleted file mode 100644 index 78534f0dc..000000000 Binary files a/graphics/map_objects/pics/people/unused_woman/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/unused_woman/2.png b/graphics/map_objects/pics/people/unused_woman/2.png deleted file mode 100644 index b42a12532..000000000 Binary files a/graphics/map_objects/pics/people/unused_woman/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/unused_woman/3.png b/graphics/map_objects/pics/people/unused_woman/3.png deleted file mode 100644 index c66653c17..000000000 Binary files a/graphics/map_objects/pics/people/unused_woman/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/unused_woman/4.png b/graphics/map_objects/pics/people/unused_woman/4.png deleted file mode 100644 index 75a457c2f..000000000 Binary files a/graphics/map_objects/pics/people/unused_woman/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/unused_woman/5.png b/graphics/map_objects/pics/people/unused_woman/5.png deleted file mode 100644 index e27f0760f..000000000 Binary files a/graphics/map_objects/pics/people/unused_woman/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/unused_woman/6.png b/graphics/map_objects/pics/people/unused_woman/6.png deleted file mode 100644 index 53102c01e..000000000 Binary files a/graphics/map_objects/pics/people/unused_woman/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/unused_woman/7.png b/graphics/map_objects/pics/people/unused_woman/7.png deleted file mode 100644 index 3d2d436c2..000000000 Binary files a/graphics/map_objects/pics/people/unused_woman/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/unused_woman/8.png b/graphics/map_objects/pics/people/unused_woman/8.png deleted file mode 100644 index 3773e7f48..000000000 Binary files a/graphics/map_objects/pics/people/unused_woman/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/wallace/0.png b/graphics/map_objects/pics/people/wallace/0.png deleted file mode 100644 index 349d65049..000000000 Binary files a/graphics/map_objects/pics/people/wallace/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/wallace/1.png b/graphics/map_objects/pics/people/wallace/1.png deleted file mode 100644 index 698b03fad..000000000 Binary files a/graphics/map_objects/pics/people/wallace/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/wallace/2.png b/graphics/map_objects/pics/people/wallace/2.png deleted file mode 100644 index 576346bcb..000000000 Binary files a/graphics/map_objects/pics/people/wallace/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/wallace/3.png b/graphics/map_objects/pics/people/wallace/3.png deleted file mode 100644 index 56773b97d..000000000 Binary files a/graphics/map_objects/pics/people/wallace/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/wallace/4.png b/graphics/map_objects/pics/people/wallace/4.png deleted file mode 100644 index 6281a56ef..000000000 Binary files a/graphics/map_objects/pics/people/wallace/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/wallace/5.png b/graphics/map_objects/pics/people/wallace/5.png deleted file mode 100644 index 5f61598d9..000000000 Binary files a/graphics/map_objects/pics/people/wallace/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/wallace/6.png b/graphics/map_objects/pics/people/wallace/6.png deleted file mode 100644 index 1abba4e1b..000000000 Binary files a/graphics/map_objects/pics/people/wallace/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/wallace/7.png b/graphics/map_objects/pics/people/wallace/7.png deleted file mode 100644 index 477dd9e01..000000000 Binary files a/graphics/map_objects/pics/people/wallace/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/wallace/8.png b/graphics/map_objects/pics/people/wallace/8.png deleted file mode 100644 index da5a51f76..000000000 Binary files a/graphics/map_objects/pics/people/wallace/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/wally/0.png b/graphics/map_objects/pics/people/wally/0.png deleted file mode 100644 index b185bc294..000000000 Binary files a/graphics/map_objects/pics/people/wally/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/wally/1.png b/graphics/map_objects/pics/people/wally/1.png deleted file mode 100644 index 42f5a3f0a..000000000 Binary files a/graphics/map_objects/pics/people/wally/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/wally/2.png b/graphics/map_objects/pics/people/wally/2.png deleted file mode 100644 index ed32f1f41..000000000 Binary files a/graphics/map_objects/pics/people/wally/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/wally/3.png b/graphics/map_objects/pics/people/wally/3.png deleted file mode 100644 index 5d2213b2c..000000000 Binary files a/graphics/map_objects/pics/people/wally/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/wally/4.png b/graphics/map_objects/pics/people/wally/4.png deleted file mode 100644 index af996a72a..000000000 Binary files a/graphics/map_objects/pics/people/wally/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/wally/5.png b/graphics/map_objects/pics/people/wally/5.png deleted file mode 100644 index de23077ce..000000000 Binary files a/graphics/map_objects/pics/people/wally/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/wally/6.png b/graphics/map_objects/pics/people/wally/6.png deleted file mode 100644 index 42397e95e..000000000 Binary files a/graphics/map_objects/pics/people/wally/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/wally/7.png b/graphics/map_objects/pics/people/wally/7.png deleted file mode 100644 index 46dbdfa3b..000000000 Binary files a/graphics/map_objects/pics/people/wally/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/wally/8.png b/graphics/map_objects/pics/people/wally/8.png deleted file mode 100644 index 5b7038b44..000000000 Binary files a/graphics/map_objects/pics/people/wally/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/wattson/0.png b/graphics/map_objects/pics/people/wattson/0.png deleted file mode 100644 index 28eaa1bf2..000000000 Binary files a/graphics/map_objects/pics/people/wattson/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/wattson/1.png b/graphics/map_objects/pics/people/wattson/1.png deleted file mode 100644 index b26ab83f4..000000000 Binary files a/graphics/map_objects/pics/people/wattson/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/wattson/2.png b/graphics/map_objects/pics/people/wattson/2.png deleted file mode 100644 index 2d7fe024b..000000000 Binary files a/graphics/map_objects/pics/people/wattson/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/winona/0.png b/graphics/map_objects/pics/people/winona/0.png deleted file mode 100644 index 4df463363..000000000 Binary files a/graphics/map_objects/pics/people/winona/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/winona/1.png b/graphics/map_objects/pics/people/winona/1.png deleted file mode 100644 index 75d255c7a..000000000 Binary files a/graphics/map_objects/pics/people/winona/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/winona/2.png b/graphics/map_objects/pics/people/winona/2.png deleted file mode 100644 index 569dea105..000000000 Binary files a/graphics/map_objects/pics/people/winona/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_1/0.png b/graphics/map_objects/pics/people/woman_1/0.png deleted file mode 100644 index cb2949038..000000000 Binary files a/graphics/map_objects/pics/people/woman_1/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_1/1.png b/graphics/map_objects/pics/people/woman_1/1.png deleted file mode 100644 index ea8dc9119..000000000 Binary files a/graphics/map_objects/pics/people/woman_1/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_1/2.png b/graphics/map_objects/pics/people/woman_1/2.png deleted file mode 100644 index b0bd3e1b1..000000000 Binary files a/graphics/map_objects/pics/people/woman_1/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_1/3.png b/graphics/map_objects/pics/people/woman_1/3.png deleted file mode 100644 index e7ed6c112..000000000 Binary files a/graphics/map_objects/pics/people/woman_1/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_1/4.png b/graphics/map_objects/pics/people/woman_1/4.png deleted file mode 100644 index 05f7e7839..000000000 Binary files a/graphics/map_objects/pics/people/woman_1/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_1/5.png b/graphics/map_objects/pics/people/woman_1/5.png deleted file mode 100644 index e23e364cd..000000000 Binary files a/graphics/map_objects/pics/people/woman_1/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_1/6.png b/graphics/map_objects/pics/people/woman_1/6.png deleted file mode 100644 index a1e6f69ab..000000000 Binary files a/graphics/map_objects/pics/people/woman_1/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_1/7.png b/graphics/map_objects/pics/people/woman_1/7.png deleted file mode 100644 index 985172d52..000000000 Binary files a/graphics/map_objects/pics/people/woman_1/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_1/8.png b/graphics/map_objects/pics/people/woman_1/8.png deleted file mode 100644 index f5e560b59..000000000 Binary files a/graphics/map_objects/pics/people/woman_1/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_2/0.png b/graphics/map_objects/pics/people/woman_2/0.png deleted file mode 100644 index d9656ce73..000000000 Binary files a/graphics/map_objects/pics/people/woman_2/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_2/1.png b/graphics/map_objects/pics/people/woman_2/1.png deleted file mode 100644 index 23d97812b..000000000 Binary files a/graphics/map_objects/pics/people/woman_2/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_2/2.png b/graphics/map_objects/pics/people/woman_2/2.png deleted file mode 100644 index f298e6eea..000000000 Binary files a/graphics/map_objects/pics/people/woman_2/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_2/3.png b/graphics/map_objects/pics/people/woman_2/3.png deleted file mode 100644 index 53809fd32..000000000 Binary files a/graphics/map_objects/pics/people/woman_2/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_2/4.png b/graphics/map_objects/pics/people/woman_2/4.png deleted file mode 100644 index 8f3fbe35f..000000000 Binary files a/graphics/map_objects/pics/people/woman_2/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_2/5.png b/graphics/map_objects/pics/people/woman_2/5.png deleted file mode 100644 index d02680904..000000000 Binary files a/graphics/map_objects/pics/people/woman_2/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_2/6.png b/graphics/map_objects/pics/people/woman_2/6.png deleted file mode 100644 index 4999cf1b1..000000000 Binary files a/graphics/map_objects/pics/people/woman_2/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_2/7.png b/graphics/map_objects/pics/people/woman_2/7.png deleted file mode 100644 index 17e669531..000000000 Binary files a/graphics/map_objects/pics/people/woman_2/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_2/8.png b/graphics/map_objects/pics/people/woman_2/8.png deleted file mode 100644 index f59199574..000000000 Binary files a/graphics/map_objects/pics/people/woman_2/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_3/0.png b/graphics/map_objects/pics/people/woman_3/0.png deleted file mode 100644 index ac9ed557e..000000000 Binary files a/graphics/map_objects/pics/people/woman_3/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_3/1.png b/graphics/map_objects/pics/people/woman_3/1.png deleted file mode 100644 index a7dbe7ec3..000000000 Binary files a/graphics/map_objects/pics/people/woman_3/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_3/2.png b/graphics/map_objects/pics/people/woman_3/2.png deleted file mode 100644 index 23852c71b..000000000 Binary files a/graphics/map_objects/pics/people/woman_3/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_3/3.png b/graphics/map_objects/pics/people/woman_3/3.png deleted file mode 100644 index 525958cbb..000000000 Binary files a/graphics/map_objects/pics/people/woman_3/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_3/4.png b/graphics/map_objects/pics/people/woman_3/4.png deleted file mode 100644 index 6feabedd0..000000000 Binary files a/graphics/map_objects/pics/people/woman_3/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_3/5.png b/graphics/map_objects/pics/people/woman_3/5.png deleted file mode 100644 index f174b0184..000000000 Binary files a/graphics/map_objects/pics/people/woman_3/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_3/6.png b/graphics/map_objects/pics/people/woman_3/6.png deleted file mode 100644 index 1b4b6d08a..000000000 Binary files a/graphics/map_objects/pics/people/woman_3/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_3/7.png b/graphics/map_objects/pics/people/woman_3/7.png deleted file mode 100644 index d8c2bfd99..000000000 Binary files a/graphics/map_objects/pics/people/woman_3/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_3/8.png b/graphics/map_objects/pics/people/woman_3/8.png deleted file mode 100644 index 0517b9993..000000000 Binary files a/graphics/map_objects/pics/people/woman_3/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_4/0.png b/graphics/map_objects/pics/people/woman_4/0.png deleted file mode 100644 index 88489b6a6..000000000 Binary files a/graphics/map_objects/pics/people/woman_4/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_4/1.png b/graphics/map_objects/pics/people/woman_4/1.png deleted file mode 100644 index 1cc24ca36..000000000 Binary files a/graphics/map_objects/pics/people/woman_4/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_4/2.png b/graphics/map_objects/pics/people/woman_4/2.png deleted file mode 100644 index efedc4a01..000000000 Binary files a/graphics/map_objects/pics/people/woman_4/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_4/3.png b/graphics/map_objects/pics/people/woman_4/3.png deleted file mode 100644 index a186b454e..000000000 Binary files a/graphics/map_objects/pics/people/woman_4/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_4/4.png b/graphics/map_objects/pics/people/woman_4/4.png deleted file mode 100644 index c5cc8670d..000000000 Binary files a/graphics/map_objects/pics/people/woman_4/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_4/5.png b/graphics/map_objects/pics/people/woman_4/5.png deleted file mode 100644 index f08133faa..000000000 Binary files a/graphics/map_objects/pics/people/woman_4/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_4/6.png b/graphics/map_objects/pics/people/woman_4/6.png deleted file mode 100644 index dec6f3146..000000000 Binary files a/graphics/map_objects/pics/people/woman_4/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_4/7.png b/graphics/map_objects/pics/people/woman_4/7.png deleted file mode 100644 index 4912065a5..000000000 Binary files a/graphics/map_objects/pics/people/woman_4/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_4/8.png b/graphics/map_objects/pics/people/woman_4/8.png deleted file mode 100644 index 21cd91f67..000000000 Binary files a/graphics/map_objects/pics/people/woman_4/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_5/0.png b/graphics/map_objects/pics/people/woman_5/0.png deleted file mode 100644 index 30ff1cf1c..000000000 Binary files a/graphics/map_objects/pics/people/woman_5/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_5/1.png b/graphics/map_objects/pics/people/woman_5/1.png deleted file mode 100644 index 3a5cf543e..000000000 Binary files a/graphics/map_objects/pics/people/woman_5/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_5/2.png b/graphics/map_objects/pics/people/woman_5/2.png deleted file mode 100644 index 066d52259..000000000 Binary files a/graphics/map_objects/pics/people/woman_5/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_5/3.png b/graphics/map_objects/pics/people/woman_5/3.png deleted file mode 100644 index 737877bb6..000000000 Binary files a/graphics/map_objects/pics/people/woman_5/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_5/4.png b/graphics/map_objects/pics/people/woman_5/4.png deleted file mode 100644 index 170d45929..000000000 Binary files a/graphics/map_objects/pics/people/woman_5/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_5/5.png b/graphics/map_objects/pics/people/woman_5/5.png deleted file mode 100644 index 2bae62dde..000000000 Binary files a/graphics/map_objects/pics/people/woman_5/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_5/6.png b/graphics/map_objects/pics/people/woman_5/6.png deleted file mode 100644 index 519897644..000000000 Binary files a/graphics/map_objects/pics/people/woman_5/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_5/7.png b/graphics/map_objects/pics/people/woman_5/7.png deleted file mode 100644 index c8ec75432..000000000 Binary files a/graphics/map_objects/pics/people/woman_5/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_5/8.png b/graphics/map_objects/pics/people/woman_5/8.png deleted file mode 100644 index c4c05fcd9..000000000 Binary files a/graphics/map_objects/pics/people/woman_5/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_6/0.png b/graphics/map_objects/pics/people/woman_6/0.png deleted file mode 100644 index 61cce57b0..000000000 Binary files a/graphics/map_objects/pics/people/woman_6/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_6/1.png b/graphics/map_objects/pics/people/woman_6/1.png deleted file mode 100644 index ea399ef74..000000000 Binary files a/graphics/map_objects/pics/people/woman_6/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_6/2.png b/graphics/map_objects/pics/people/woman_6/2.png deleted file mode 100644 index 574121114..000000000 Binary files a/graphics/map_objects/pics/people/woman_6/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_6/3.png b/graphics/map_objects/pics/people/woman_6/3.png deleted file mode 100644 index 538e60433..000000000 Binary files a/graphics/map_objects/pics/people/woman_6/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_6/4.png b/graphics/map_objects/pics/people/woman_6/4.png deleted file mode 100644 index 746cefd09..000000000 Binary files a/graphics/map_objects/pics/people/woman_6/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_6/5.png b/graphics/map_objects/pics/people/woman_6/5.png deleted file mode 100644 index 4c4e2c5b0..000000000 Binary files a/graphics/map_objects/pics/people/woman_6/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_6/6.png b/graphics/map_objects/pics/people/woman_6/6.png deleted file mode 100644 index efd7b76ca..000000000 Binary files a/graphics/map_objects/pics/people/woman_6/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_6/7.png b/graphics/map_objects/pics/people/woman_6/7.png deleted file mode 100644 index 2009f5e9a..000000000 Binary files a/graphics/map_objects/pics/people/woman_6/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_6/8.png b/graphics/map_objects/pics/people/woman_6/8.png deleted file mode 100644 index 9dd33b643..000000000 Binary files a/graphics/map_objects/pics/people/woman_6/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_7/0.png b/graphics/map_objects/pics/people/woman_7/0.png deleted file mode 100644 index a235d670e..000000000 Binary files a/graphics/map_objects/pics/people/woman_7/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_7/1.png b/graphics/map_objects/pics/people/woman_7/1.png deleted file mode 100644 index 62de3d528..000000000 Binary files a/graphics/map_objects/pics/people/woman_7/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_7/2.png b/graphics/map_objects/pics/people/woman_7/2.png deleted file mode 100644 index 3893cd292..000000000 Binary files a/graphics/map_objects/pics/people/woman_7/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_7/3.png b/graphics/map_objects/pics/people/woman_7/3.png deleted file mode 100644 index b893b9574..000000000 Binary files a/graphics/map_objects/pics/people/woman_7/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_7/4.png b/graphics/map_objects/pics/people/woman_7/4.png deleted file mode 100644 index 4f0493124..000000000 Binary files a/graphics/map_objects/pics/people/woman_7/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_7/5.png b/graphics/map_objects/pics/people/woman_7/5.png deleted file mode 100644 index 6a1e56d2c..000000000 Binary files a/graphics/map_objects/pics/people/woman_7/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_7/6.png b/graphics/map_objects/pics/people/woman_7/6.png deleted file mode 100644 index 8a3488157..000000000 Binary files a/graphics/map_objects/pics/people/woman_7/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_7/7.png b/graphics/map_objects/pics/people/woman_7/7.png deleted file mode 100644 index fe1dbe735..000000000 Binary files a/graphics/map_objects/pics/people/woman_7/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/woman_7/8.png b/graphics/map_objects/pics/people/woman_7/8.png deleted file mode 100644 index 08a1fad82..000000000 Binary files a/graphics/map_objects/pics/people/woman_7/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/youngster/0.png b/graphics/map_objects/pics/people/youngster/0.png deleted file mode 100644 index b370f8141..000000000 Binary files a/graphics/map_objects/pics/people/youngster/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/youngster/1.png b/graphics/map_objects/pics/people/youngster/1.png deleted file mode 100644 index 1c1f15b89..000000000 Binary files a/graphics/map_objects/pics/people/youngster/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/youngster/2.png b/graphics/map_objects/pics/people/youngster/2.png deleted file mode 100644 index c8a936dd2..000000000 Binary files a/graphics/map_objects/pics/people/youngster/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/youngster/3.png b/graphics/map_objects/pics/people/youngster/3.png deleted file mode 100644 index c9fa72ddb..000000000 Binary files a/graphics/map_objects/pics/people/youngster/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/youngster/4.png b/graphics/map_objects/pics/people/youngster/4.png deleted file mode 100644 index ba17f34ac..000000000 Binary files a/graphics/map_objects/pics/people/youngster/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/youngster/5.png b/graphics/map_objects/pics/people/youngster/5.png deleted file mode 100644 index fcd2f196a..000000000 Binary files a/graphics/map_objects/pics/people/youngster/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/youngster/6.png b/graphics/map_objects/pics/people/youngster/6.png deleted file mode 100644 index fd12b99ea..000000000 Binary files a/graphics/map_objects/pics/people/youngster/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/youngster/7.png b/graphics/map_objects/pics/people/youngster/7.png deleted file mode 100644 index 626716b8d..000000000 Binary files a/graphics/map_objects/pics/people/youngster/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/youngster/8.png b/graphics/map_objects/pics/people/youngster/8.png deleted file mode 100644 index 3c9662746..000000000 Binary files a/graphics/map_objects/pics/people/youngster/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/azumarill/0.png b/graphics/map_objects/pics/pokemon/azumarill/0.png deleted file mode 100644 index 9b219e552..000000000 Binary files a/graphics/map_objects/pics/pokemon/azumarill/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/azumarill/1.png b/graphics/map_objects/pics/pokemon/azumarill/1.png deleted file mode 100644 index 16e493f8b..000000000 Binary files a/graphics/map_objects/pics/pokemon/azumarill/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/azumarill/2.png b/graphics/map_objects/pics/pokemon/azumarill/2.png deleted file mode 100644 index b10e6a283..000000000 Binary files a/graphics/map_objects/pics/pokemon/azumarill/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/azurill/0.png b/graphics/map_objects/pics/pokemon/azurill/0.png deleted file mode 100644 index efbcea03f..000000000 Binary files a/graphics/map_objects/pics/pokemon/azurill/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/azurill/1.png b/graphics/map_objects/pics/pokemon/azurill/1.png deleted file mode 100644 index 4e00acdc6..000000000 Binary files a/graphics/map_objects/pics/pokemon/azurill/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/azurill/2.png b/graphics/map_objects/pics/pokemon/azurill/2.png deleted file mode 100644 index 08bf43c5b..000000000 Binary files a/graphics/map_objects/pics/pokemon/azurill/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/deoxys/0.png b/graphics/map_objects/pics/pokemon/deoxys/0.png deleted file mode 100644 index 37b90dbfe..000000000 Binary files a/graphics/map_objects/pics/pokemon/deoxys/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/deoxys/1.png b/graphics/map_objects/pics/pokemon/deoxys/1.png deleted file mode 100644 index 4d38cb946..000000000 Binary files a/graphics/map_objects/pics/pokemon/deoxys/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/dusclops/0.png b/graphics/map_objects/pics/pokemon/dusclops/0.png deleted file mode 100644 index b738a9ef1..000000000 Binary files a/graphics/map_objects/pics/pokemon/dusclops/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/dusclops/1.png b/graphics/map_objects/pics/pokemon/dusclops/1.png deleted file mode 100644 index 70ec671c8..000000000 Binary files a/graphics/map_objects/pics/pokemon/dusclops/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/dusclops/2.png b/graphics/map_objects/pics/pokemon/dusclops/2.png deleted file mode 100644 index 0cbb7c620..000000000 Binary files a/graphics/map_objects/pics/pokemon/dusclops/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/dusclops/3.png b/graphics/map_objects/pics/pokemon/dusclops/3.png deleted file mode 100644 index 3d5858ff6..000000000 Binary files a/graphics/map_objects/pics/pokemon/dusclops/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/dusclops/4.png b/graphics/map_objects/pics/pokemon/dusclops/4.png deleted file mode 100644 index f99269afa..000000000 Binary files a/graphics/map_objects/pics/pokemon/dusclops/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/dusclops/5.png b/graphics/map_objects/pics/pokemon/dusclops/5.png deleted file mode 100644 index 6b496be3c..000000000 Binary files a/graphics/map_objects/pics/pokemon/dusclops/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/dusclops/6.png b/graphics/map_objects/pics/pokemon/dusclops/6.png deleted file mode 100644 index 3ff10d7ab..000000000 Binary files a/graphics/map_objects/pics/pokemon/dusclops/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/dusclops/7.png b/graphics/map_objects/pics/pokemon/dusclops/7.png deleted file mode 100644 index 925080a4f..000000000 Binary files a/graphics/map_objects/pics/pokemon/dusclops/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/dusclops/8.png b/graphics/map_objects/pics/pokemon/dusclops/8.png deleted file mode 100644 index 57dcef596..000000000 Binary files a/graphics/map_objects/pics/pokemon/dusclops/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/0.png b/graphics/map_objects/pics/pokemon/enemy_zigzagoon/0.png deleted file mode 100644 index 9fa5da9c1..000000000 Binary files a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/1.png b/graphics/map_objects/pics/pokemon/enemy_zigzagoon/1.png deleted file mode 100644 index b328fc844..000000000 Binary files a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/2.png b/graphics/map_objects/pics/pokemon/enemy_zigzagoon/2.png deleted file mode 100644 index e4935a1cd..000000000 Binary files a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/3.png b/graphics/map_objects/pics/pokemon/enemy_zigzagoon/3.png deleted file mode 100644 index 3ea74a6ea..000000000 Binary files a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/4.png b/graphics/map_objects/pics/pokemon/enemy_zigzagoon/4.png deleted file mode 100644 index ab2dbf891..000000000 Binary files a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/5.png b/graphics/map_objects/pics/pokemon/enemy_zigzagoon/5.png deleted file mode 100644 index a16efcb6e..000000000 Binary files a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/6.png b/graphics/map_objects/pics/pokemon/enemy_zigzagoon/6.png deleted file mode 100644 index 38fec7b46..000000000 Binary files a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/7.png b/graphics/map_objects/pics/pokemon/enemy_zigzagoon/7.png deleted file mode 100644 index a5a8c034d..000000000 Binary files a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/8.png b/graphics/map_objects/pics/pokemon/enemy_zigzagoon/8.png deleted file mode 100644 index 727908cf9..000000000 Binary files a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/groudon_front/0.png b/graphics/map_objects/pics/pokemon/groudon_front/0.png deleted file mode 100644 index 05cb16433..000000000 Binary files a/graphics/map_objects/pics/pokemon/groudon_front/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/groudon_front/1.png b/graphics/map_objects/pics/pokemon/groudon_front/1.png deleted file mode 100644 index fcafab2a0..000000000 Binary files a/graphics/map_objects/pics/pokemon/groudon_front/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/groudon_side/0.png b/graphics/map_objects/pics/pokemon/groudon_side/0.png deleted file mode 100644 index 76bd8a11c..000000000 Binary files a/graphics/map_objects/pics/pokemon/groudon_side/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/groudon_side/1.png b/graphics/map_objects/pics/pokemon/groudon_side/1.png deleted file mode 100644 index 2ecf09822..000000000 Binary files a/graphics/map_objects/pics/pokemon/groudon_side/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/ho_oh/0.png b/graphics/map_objects/pics/pokemon/ho_oh/0.png deleted file mode 100644 index 0d8ef71e1..000000000 Binary files a/graphics/map_objects/pics/pokemon/ho_oh/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/ho_oh/1.png b/graphics/map_objects/pics/pokemon/ho_oh/1.png deleted file mode 100644 index 03d3b0874..000000000 Binary files a/graphics/map_objects/pics/pokemon/ho_oh/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/kecleon/0.png b/graphics/map_objects/pics/pokemon/kecleon/0.png deleted file mode 100644 index 691797af0..000000000 Binary files a/graphics/map_objects/pics/pokemon/kecleon/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/kecleon/1.png b/graphics/map_objects/pics/pokemon/kecleon/1.png deleted file mode 100644 index 0d82cc66d..000000000 Binary files a/graphics/map_objects/pics/pokemon/kecleon/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/kecleon/2.png b/graphics/map_objects/pics/pokemon/kecleon/2.png deleted file mode 100644 index 2713ce057..000000000 Binary files a/graphics/map_objects/pics/pokemon/kecleon/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/kirlia/0.png b/graphics/map_objects/pics/pokemon/kirlia/0.png deleted file mode 100644 index e069df489..000000000 Binary files a/graphics/map_objects/pics/pokemon/kirlia/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/kirlia/1.png b/graphics/map_objects/pics/pokemon/kirlia/1.png deleted file mode 100644 index d158bd335..000000000 Binary files a/graphics/map_objects/pics/pokemon/kirlia/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/kirlia/2.png b/graphics/map_objects/pics/pokemon/kirlia/2.png deleted file mode 100644 index 388077d93..000000000 Binary files a/graphics/map_objects/pics/pokemon/kirlia/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/kirlia/3.png b/graphics/map_objects/pics/pokemon/kirlia/3.png deleted file mode 100644 index 4887b1653..000000000 Binary files a/graphics/map_objects/pics/pokemon/kirlia/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/kirlia/4.png b/graphics/map_objects/pics/pokemon/kirlia/4.png deleted file mode 100644 index e734a8f60..000000000 Binary files a/graphics/map_objects/pics/pokemon/kirlia/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/kirlia/5.png b/graphics/map_objects/pics/pokemon/kirlia/5.png deleted file mode 100644 index e2e36561b..000000000 Binary files a/graphics/map_objects/pics/pokemon/kirlia/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/kirlia/6.png b/graphics/map_objects/pics/pokemon/kirlia/6.png deleted file mode 100644 index 0731cb711..000000000 Binary files a/graphics/map_objects/pics/pokemon/kirlia/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/kirlia/7.png b/graphics/map_objects/pics/pokemon/kirlia/7.png deleted file mode 100644 index c4f33879c..000000000 Binary files a/graphics/map_objects/pics/pokemon/kirlia/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/kirlia/8.png b/graphics/map_objects/pics/pokemon/kirlia/8.png deleted file mode 100644 index 87fe530c5..000000000 Binary files a/graphics/map_objects/pics/pokemon/kirlia/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/kyogre_front/0.png b/graphics/map_objects/pics/pokemon/kyogre_front/0.png deleted file mode 100644 index 2cfea8e01..000000000 Binary files a/graphics/map_objects/pics/pokemon/kyogre_front/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/kyogre_front/1.png b/graphics/map_objects/pics/pokemon/kyogre_front/1.png deleted file mode 100644 index 8f2dcd7af..000000000 Binary files a/graphics/map_objects/pics/pokemon/kyogre_front/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/kyogre_side/0.png b/graphics/map_objects/pics/pokemon/kyogre_side/0.png deleted file mode 100644 index f60199f77..000000000 Binary files a/graphics/map_objects/pics/pokemon/kyogre_side/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/kyogre_side/1.png b/graphics/map_objects/pics/pokemon/kyogre_side/1.png deleted file mode 100644 index 00d53d563..000000000 Binary files a/graphics/map_objects/pics/pokemon/kyogre_side/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/latias_latios/0.png b/graphics/map_objects/pics/pokemon/latias_latios/0.png deleted file mode 100644 index 5338fc55a..000000000 Binary files a/graphics/map_objects/pics/pokemon/latias_latios/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/latias_latios/1.png b/graphics/map_objects/pics/pokemon/latias_latios/1.png deleted file mode 100644 index 57cde71a9..000000000 Binary files a/graphics/map_objects/pics/pokemon/latias_latios/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/latias_latios/2.png b/graphics/map_objects/pics/pokemon/latias_latios/2.png deleted file mode 100644 index c8812bec0..000000000 Binary files a/graphics/map_objects/pics/pokemon/latias_latios/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/lugia/0.png b/graphics/map_objects/pics/pokemon/lugia/0.png deleted file mode 100644 index 4e50209fe..000000000 Binary files a/graphics/map_objects/pics/pokemon/lugia/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/lugia/1.png b/graphics/map_objects/pics/pokemon/lugia/1.png deleted file mode 100644 index 6f36abc91..000000000 Binary files a/graphics/map_objects/pics/pokemon/lugia/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/mew/0.png b/graphics/map_objects/pics/pokemon/mew/0.png deleted file mode 100644 index 55955453c..000000000 Binary files a/graphics/map_objects/pics/pokemon/mew/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/mew/1.png b/graphics/map_objects/pics/pokemon/mew/1.png deleted file mode 100644 index 3c6062bd7..000000000 Binary files a/graphics/map_objects/pics/pokemon/mew/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/mew/2.png b/graphics/map_objects/pics/pokemon/mew/2.png deleted file mode 100644 index 1c3c6e52d..000000000 Binary files a/graphics/map_objects/pics/pokemon/mew/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/mew/3.png b/graphics/map_objects/pics/pokemon/mew/3.png deleted file mode 100644 index be04a769b..000000000 Binary files a/graphics/map_objects/pics/pokemon/mew/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/mew/4.png b/graphics/map_objects/pics/pokemon/mew/4.png deleted file mode 100644 index 3ddbfa03a..000000000 Binary files a/graphics/map_objects/pics/pokemon/mew/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/mew/5.png b/graphics/map_objects/pics/pokemon/mew/5.png deleted file mode 100644 index 44b7bd56b..000000000 Binary files a/graphics/map_objects/pics/pokemon/mew/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/mew/6.png b/graphics/map_objects/pics/pokemon/mew/6.png deleted file mode 100644 index c6abc021a..000000000 Binary files a/graphics/map_objects/pics/pokemon/mew/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/mew/7.png b/graphics/map_objects/pics/pokemon/mew/7.png deleted file mode 100644 index f22f4072a..000000000 Binary files a/graphics/map_objects/pics/pokemon/mew/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/mew/8.png b/graphics/map_objects/pics/pokemon/mew/8.png deleted file mode 100644 index c603d7ced..000000000 Binary files a/graphics/map_objects/pics/pokemon/mew/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/pikachu/0.png b/graphics/map_objects/pics/pokemon/pikachu/0.png deleted file mode 100644 index 1a08b623c..000000000 Binary files a/graphics/map_objects/pics/pokemon/pikachu/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/pikachu/1.png b/graphics/map_objects/pics/pokemon/pikachu/1.png deleted file mode 100644 index f1640a1e5..000000000 Binary files a/graphics/map_objects/pics/pokemon/pikachu/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/pikachu/2.png b/graphics/map_objects/pics/pokemon/pikachu/2.png deleted file mode 100644 index 68836768b..000000000 Binary files a/graphics/map_objects/pics/pokemon/pikachu/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/poochyena/0.png b/graphics/map_objects/pics/pokemon/poochyena/0.png deleted file mode 100644 index 1ee042572..000000000 Binary files a/graphics/map_objects/pics/pokemon/poochyena/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/poochyena/1.png b/graphics/map_objects/pics/pokemon/poochyena/1.png deleted file mode 100644 index 3dbdb383c..000000000 Binary files a/graphics/map_objects/pics/pokemon/poochyena/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/poochyena/2.png b/graphics/map_objects/pics/pokemon/poochyena/2.png deleted file mode 100644 index bda367b94..000000000 Binary files a/graphics/map_objects/pics/pokemon/poochyena/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/poochyena/3.png b/graphics/map_objects/pics/pokemon/poochyena/3.png deleted file mode 100644 index 8b7d8f803..000000000 Binary files a/graphics/map_objects/pics/pokemon/poochyena/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/poochyena/4.png b/graphics/map_objects/pics/pokemon/poochyena/4.png deleted file mode 100644 index 47012ad54..000000000 Binary files a/graphics/map_objects/pics/pokemon/poochyena/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/poochyena/5.png b/graphics/map_objects/pics/pokemon/poochyena/5.png deleted file mode 100644 index e256e8a07..000000000 Binary files a/graphics/map_objects/pics/pokemon/poochyena/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/poochyena/6.png b/graphics/map_objects/pics/pokemon/poochyena/6.png deleted file mode 100644 index 173b9fe5e..000000000 Binary files a/graphics/map_objects/pics/pokemon/poochyena/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/poochyena/7.png b/graphics/map_objects/pics/pokemon/poochyena/7.png deleted file mode 100644 index 8fdc28209..000000000 Binary files a/graphics/map_objects/pics/pokemon/poochyena/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/poochyena/8.png b/graphics/map_objects/pics/pokemon/poochyena/8.png deleted file mode 100644 index 911619f6a..000000000 Binary files a/graphics/map_objects/pics/pokemon/poochyena/8.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/rayquaza/0.png b/graphics/map_objects/pics/pokemon/rayquaza/0.png deleted file mode 100644 index 9f5db910f..000000000 Binary files a/graphics/map_objects/pics/pokemon/rayquaza/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/rayquaza/1.png b/graphics/map_objects/pics/pokemon/rayquaza/1.png deleted file mode 100644 index e770b6549..000000000 Binary files a/graphics/map_objects/pics/pokemon/rayquaza/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/rayquaza/2.png b/graphics/map_objects/pics/pokemon/rayquaza/2.png deleted file mode 100644 index e72c17b07..000000000 Binary files a/graphics/map_objects/pics/pokemon/rayquaza/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/rayquaza/3.png b/graphics/map_objects/pics/pokemon/rayquaza/3.png deleted file mode 100644 index edcfe94ba..000000000 Binary files a/graphics/map_objects/pics/pokemon/rayquaza/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/rayquaza/4.png b/graphics/map_objects/pics/pokemon/rayquaza/4.png deleted file mode 100644 index d34cb5d58..000000000 Binary files a/graphics/map_objects/pics/pokemon/rayquaza/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/rayquaza_still.png b/graphics/map_objects/pics/pokemon/rayquaza_still.png deleted file mode 100644 index 1c18b2ffc..000000000 Binary files a/graphics/map_objects/pics/pokemon/rayquaza_still.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/regi.png b/graphics/map_objects/pics/pokemon/regi.png deleted file mode 100644 index 8425040dd..000000000 Binary files a/graphics/map_objects/pics/pokemon/regi.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/skitty/0.png b/graphics/map_objects/pics/pokemon/skitty/0.png deleted file mode 100644 index 105611a10..000000000 Binary files a/graphics/map_objects/pics/pokemon/skitty/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/skitty/1.png b/graphics/map_objects/pics/pokemon/skitty/1.png deleted file mode 100644 index 66a9640e0..000000000 Binary files a/graphics/map_objects/pics/pokemon/skitty/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/skitty/2.png b/graphics/map_objects/pics/pokemon/skitty/2.png deleted file mode 100644 index 2ab6cabfa..000000000 Binary files a/graphics/map_objects/pics/pokemon/skitty/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/sudowoodo/0.png b/graphics/map_objects/pics/pokemon/sudowoodo/0.png deleted file mode 100644 index 20584b1a6..000000000 Binary files a/graphics/map_objects/pics/pokemon/sudowoodo/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/sudowoodo/1.png b/graphics/map_objects/pics/pokemon/sudowoodo/1.png deleted file mode 100644 index 1d865c43a..000000000 Binary files a/graphics/map_objects/pics/pokemon/sudowoodo/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/sudowoodo/2.png b/graphics/map_objects/pics/pokemon/sudowoodo/2.png deleted file mode 100644 index 319220edf..000000000 Binary files a/graphics/map_objects/pics/pokemon/sudowoodo/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/vigoroth_carrying_box/0.png b/graphics/map_objects/pics/pokemon/vigoroth_carrying_box/0.png deleted file mode 100644 index 088986e80..000000000 Binary files a/graphics/map_objects/pics/pokemon/vigoroth_carrying_box/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/vigoroth_carrying_box/1.png b/graphics/map_objects/pics/pokemon/vigoroth_carrying_box/1.png deleted file mode 100644 index 79d269e55..000000000 Binary files a/graphics/map_objects/pics/pokemon/vigoroth_carrying_box/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/vigoroth_carrying_box/2.png b/graphics/map_objects/pics/pokemon/vigoroth_carrying_box/2.png deleted file mode 100644 index 2918caf22..000000000 Binary files a/graphics/map_objects/pics/pokemon/vigoroth_carrying_box/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/vigoroth_facing_away/0.png b/graphics/map_objects/pics/pokemon/vigoroth_facing_away/0.png deleted file mode 100644 index 30f989ca5..000000000 Binary files a/graphics/map_objects/pics/pokemon/vigoroth_facing_away/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/vigoroth_facing_away/1.png b/graphics/map_objects/pics/pokemon/vigoroth_facing_away/1.png deleted file mode 100644 index f0edeb876..000000000 Binary files a/graphics/map_objects/pics/pokemon/vigoroth_facing_away/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/wingull/0.png b/graphics/map_objects/pics/pokemon/wingull/0.png deleted file mode 100644 index 2e83a4b4e..000000000 Binary files a/graphics/map_objects/pics/pokemon/wingull/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/wingull/1.png b/graphics/map_objects/pics/pokemon/wingull/1.png deleted file mode 100644 index 22dadf0ae..000000000 Binary files a/graphics/map_objects/pics/pokemon/wingull/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/wingull/2.png b/graphics/map_objects/pics/pokemon/wingull/2.png deleted file mode 100644 index 9758aff0a..000000000 Binary files a/graphics/map_objects/pics/pokemon/wingull/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/wingull/3.png b/graphics/map_objects/pics/pokemon/wingull/3.png deleted file mode 100644 index c3404d20d..000000000 Binary files a/graphics/map_objects/pics/pokemon/wingull/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/wingull/4.png b/graphics/map_objects/pics/pokemon/wingull/4.png deleted file mode 100644 index 11052fe99..000000000 Binary files a/graphics/map_objects/pics/pokemon/wingull/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/wingull/5.png b/graphics/map_objects/pics/pokemon/wingull/5.png deleted file mode 100644 index af5505e31..000000000 Binary files a/graphics/map_objects/pics/pokemon/wingull/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/zigzagoon/0.png b/graphics/map_objects/pics/pokemon/zigzagoon/0.png deleted file mode 100644 index 0601efade..000000000 Binary files a/graphics/map_objects/pics/pokemon/zigzagoon/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/zigzagoon/1.png b/graphics/map_objects/pics/pokemon/zigzagoon/1.png deleted file mode 100644 index c7e067a6d..000000000 Binary files a/graphics/map_objects/pics/pokemon/zigzagoon/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/pokemon/zigzagoon/2.png b/graphics/map_objects/pics/pokemon/zigzagoon/2.png deleted file mode 100644 index d44a71b8d..000000000 Binary files a/graphics/map_objects/pics/pokemon/zigzagoon/2.png and /dev/null differ diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index dad4ea026..fb250ad82 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 e4bae6fdb..0caa3df27 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 b6926ef68..1a8b7fa25 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 000000000..d04f0a1f9 --- /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 d5b983005..000000000 --- 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 976c6a739..ed4a7797b 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 9a3f8a222..6b3ed699f 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 f829d3b87..e09b32d44 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 000000000..59532fdcb --- /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 293c2e3dc..ca2449a6d 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 b915d1419..3c4ad030f 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 b613df926..5e7cec4cb 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_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_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_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 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 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 e7517acf1..547f515eb 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 0b9ea385c..970f47d5f 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 68277812d..7b38f9ddc 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 4a0fdb70a..d26184270 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 0868316c8..5fb5f6c42 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 a10648f2f..000000000 --- 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 e318ac8bb..9d71e81aa 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 15d7bb362..ace988f4e 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 734a1ec3f..2bca4db94 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 5b4f80249..900daf4e7 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 847380782..39f3cd8b0 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 66af49175..1949d0480 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 bc7931025..2875aaff2 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 8b9b50140..41729eec9 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 3b5df1cc8..7b83743a7 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 92f4b8a60..d44bb1043 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 4558081e7..1aa6987c3 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 9e899788a..31d515a82 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 3857bf815..9b897651d 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 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[] = +const union AnimCmd *const gEventObjectImageAnimTable_Inanimate[] = { + gEventObjectImageAnim_StayStill, +}; + +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 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 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 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 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 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 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 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 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 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 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 gEventObjectImageAnimTable_FieldMove[] = { + gEventObjectImageAnim_FieldMove, +}; + +const union AnimCmd *const gEventObjectImageAnimTable_BerryTree[] = { + gEventObjectImageAnim_BerryTreeStage0, + gEventObjectImageAnim_BerryTreeStage1, + gEventObjectImageAnim_BerryTreeStage2, + gEventObjectImageAnim_BerryTreeStage3, + gEventObjectImageAnim_BerryTreeStage4, +}; + +const union AnimCmd *const gEventObjectImageAnimTable_BreakableRock[] = { + gEventObjectImageAnim_StayStill, + gEventObjectImageAnim_RockBreak, +}; + +const union AnimCmd *const gEventObjectImageAnimTable_CuttableTree[] = { + gEventObjectImageAnim_StayStill, + gEventObjectImageAnim_TreeCut, +}; + +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 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 9a9f096a2..3d4303189 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 774109472..14ef4983d 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 6793a9487..c0ca57b60 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 f5d6a24c3..892af7e9b 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 2ed9023fa..db5fddf1e 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 30a2297bd..c8633daa7 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 d5b7b8911..519ca771a 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 (*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 *const gUnknown_0850DC50[])(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 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 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 3334c4b5e..3b18c90d1 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 2fbd247a6..83030ccb7 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 9f1432f17..efd439a3c 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/event_obj_lock.c b/src/event_obj_lock.c new file mode 100644 index 000000000..1582c00f8 --- /dev/null +++ b/src/event_obj_lock.c @@ -0,0 +1,186 @@ +#include "global.h" +#include "event_data.h" +#include "event_object_movement.h" +#include "field_player_avatar.h" +#include "event_obj_lock.h" +#include "script_movement.h" +#include "task.h" +#include "trainer_see.h" + +bool8 walkrun_is_standing_still(void) +{ + if (gPlayerAvatar.tileTransitionState == T_TILE_TRANSITION) + return FALSE; + else + return TRUE; +} + +static void sub_80983A4(u8 taskId) +{ + if (walkrun_is_standing_still()) + { + sub_808B864(); + DestroyTask(taskId); + } +} + +bool8 sub_80983C4(void) +{ + if (FuncIsActiveTask(sub_80983A4)) + { + return FALSE; + } + else + { + sub_808BCF4(); + return TRUE; + } +} + + +void ScriptFreezeEventObjects(void) +{ + FreezeEventObjects(); + CreateTask(sub_80983A4, 80); +} + +static void sub_8098400(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + if (!task->data[0] && walkrun_is_standing_still() == TRUE) + { + sub_808B864(); + task->data[0] = 1; + } + if (!task->data[1] && !gEventObjects[gSelectedEventObject].singleMovementActive) + { + FreezeEventObject(&gEventObjects[gSelectedEventObject]); + task->data[1] = 1; + } + if (task->data[0] && task->data[1]) + DestroyTask(taskId); +} + +bool8 sub_809847C(void) +{ + if (FuncIsActiveTask(sub_8098400)) + { + return FALSE; + } + else + { + sub_808BCF4(); + return TRUE; + } +} + +void LockSelectedEventObject(void) +{ + u8 taskId; + FreezeEventObjectsExceptOne(gSelectedEventObject); + taskId = CreateTask(sub_8098400, 80); + if (!gEventObjects[gSelectedEventObject].singleMovementActive) + { + FreezeEventObject(&gEventObjects[gSelectedEventObject]); + gTasks[taskId].data[1] = 1; + } +} + +void sub_80984F4(void) +{ + u8 objectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); + EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[objectId]); + sub_80D338C(); + UnfreezeEventObjects(); +} + +void sub_8098524(void) +{ + u8 objectId; + + if (gEventObjects[gSelectedEventObject].active) + EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[gSelectedEventObject]); + objectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); + EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[objectId]); + sub_80D338C(); + UnfreezeEventObjects(); +} + +void sub_8098574(void) +{ + EventObjectFaceOppositeDirection(&gEventObjects[gSelectedEventObject], gSpecialVar_Facing); +} + +void sub_809859C(void) +{ + EventObjectClearAnimIfSpecialAnimActive(&gEventObjects[gSelectedEventObject]); +} + +static void sub_80985BC(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + u8 eventObjectId = task->data[2]; + + if (!task->data[0] && walkrun_is_standing_still() == TRUE) + { + sub_808B864(); + task->data[0] = 1; + } + if (!task->data[1] && !gEventObjects[eventObjectId].singleMovementActive) + { + FreezeEventObject(&gEventObjects[eventObjectId]); + task->data[1] = 1; + } + if (task->data[0] && task->data[1]) + DestroyTask(taskId); +} + +void sub_8098630(void) +{ + u8 trainerObjectId1, trainerObjectId2, taskId; + trainerObjectId1 = GetChosenApproachingTrainerEventObjectId(0); + if(gNoOfApproachingTrainers == 2) + { + trainerObjectId2 = GetChosenApproachingTrainerEventObjectId(1); + sub_8098074(trainerObjectId1, trainerObjectId2); + taskId = CreateTask(sub_80985BC, 80); + gTasks[taskId].data[2] = trainerObjectId1; + if(!gEventObjects[trainerObjectId1].singleMovementActive) + { + FreezeEventObject(&gEventObjects[trainerObjectId1]); + gTasks[taskId].data[1] = 1; + } + taskId = CreateTask(sub_80985BC, 81); + gTasks[taskId].data[2] = trainerObjectId2; + if(!gEventObjects[trainerObjectId2].singleMovementActive) + { + FreezeEventObject(&gEventObjects[trainerObjectId2]); + gTasks[taskId].data[1] = 1; + } + } + else + { + FreezeEventObjectsExceptOne(trainerObjectId1); + taskId = CreateTask(sub_80985BC, 80); + gTasks[taskId].data[2] = trainerObjectId1; + if(!gEventObjects[trainerObjectId1].singleMovementActive) + { + FreezeEventObject(&gEventObjects[trainerObjectId1]); + gTasks[taskId].data[1] = 1; + } + } +} + +bool8 sub_8098734(void) +{ + if (FuncIsActiveTask(sub_80985BC)) + { + return FALSE; + } + else + { + sub_808BCF4(); + return TRUE; + } +} diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 84900e48e..d23bba92b 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 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*/ 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 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 b937f704b..f4d9550a3 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 71bce8f41..4ad3bd916 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 8a4fb7c69..a5058b363 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 6da529d00..60b078982 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 132f39c34..0642c771e 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 82d96606a..2044a8c87 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 917c1dfe1..0c6df7662 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/map_obj_lock.c b/src/map_obj_lock.c deleted file mode 100644 index 6647f629b..000000000 --- a/src/map_obj_lock.c +++ /dev/null @@ -1,186 +0,0 @@ -#include "global.h" -#include "event_data.h" -#include "event_object_movement.h" -#include "field_player_avatar.h" -#include "map_obj_lock.h" -#include "script_movement.h" -#include "task.h" -#include "trainer_see.h" - -bool8 walkrun_is_standing_still(void) -{ - if (gPlayerAvatar.tileTransitionState == T_TILE_TRANSITION) - return FALSE; - else - return TRUE; -} - -static void sub_80983A4(u8 taskId) -{ - if (walkrun_is_standing_still()) - { - sub_808B864(); - DestroyTask(taskId); - } -} - -bool8 sub_80983C4(void) -{ - if (FuncIsActiveTask(sub_80983A4)) - { - return FALSE; - } - else - { - sub_808BCF4(); - return TRUE; - } -} - - -void ScriptFreezeMapObjects(void) -{ - FreezeMapObjects(); - CreateTask(sub_80983A4, 80); -} - -static void sub_8098400(u8 taskId) -{ - struct Task *task = &gTasks[taskId]; - - if (!task->data[0] && walkrun_is_standing_still() == TRUE) - { - sub_808B864(); - task->data[0] = 1; - } - if (!task->data[1] && !gMapObjects[gSelectedMapObject].singleMovementActive) - { - FreezeMapObject(&gMapObjects[gSelectedMapObject]); - task->data[1] = 1; - } - if (task->data[0] && task->data[1]) - DestroyTask(taskId); -} - -bool8 sub_809847C(void) -{ - if (FuncIsActiveTask(sub_8098400)) - { - return FALSE; - } - else - { - sub_808BCF4(); - return TRUE; - } -} - -void LockSelectedMapObject(void) -{ - u8 taskId; - FreezeMapObjectsExceptOne(gSelectedMapObject); - taskId = CreateTask(sub_8098400, 80); - if (!gMapObjects[gSelectedMapObject].singleMovementActive) - { - FreezeMapObject(&gMapObjects[gSelectedMapObject]); - gTasks[taskId].data[1] = 1; - } -} - -void sub_80984F4(void) -{ - u8 objectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0); - FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[objectId]); - sub_80D338C(); - UnfreezeMapObjects(); -} - -void sub_8098524(void) -{ - u8 objectId; - - if (gMapObjects[gSelectedMapObject].active) - FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[gSelectedMapObject]); - objectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0); - FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[objectId]); - sub_80D338C(); - UnfreezeMapObjects(); -} - -void sub_8098574(void) -{ - FieldObjectFaceOppositeDirection(&gMapObjects[gSelectedMapObject], gSpecialVar_Facing); -} - -void sub_809859C(void) -{ - FieldObjectClearAnimIfSpecialAnimActive(&gMapObjects[gSelectedMapObject]); -} - -static void sub_80985BC(u8 taskId) -{ - struct Task *task = &gTasks[taskId]; - u8 mapObjectId = 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) - { - FreezeMapObject(&gMapObjects[mapObjectId]); - task->data[1] = 1; - } - if (task->data[0] && task->data[1]) - DestroyTask(taskId); -} - -void sub_8098630(void) -{ - u8 trainerObjectId1, trainerObjectId2, taskId; - trainerObjectId1 = GetChosenApproachingTrainerMapObjectId(0); - if(gNoOfApproachingTrainers == 2) - { - trainerObjectId2 = GetChosenApproachingTrainerMapObjectId(1); - sub_8098074(trainerObjectId1, trainerObjectId2); - taskId = CreateTask(sub_80985BC, 80); - gTasks[taskId].data[2] = trainerObjectId1; - 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].singleMovementActive) - { - FreezeMapObject(&gMapObjects[trainerObjectId2]); - gTasks[taskId].data[1] = 1; - } - } - else - { - FreezeMapObjectsExceptOne(trainerObjectId1); - taskId = CreateTask(sub_80985BC, 80); - gTasks[taskId].data[2] = trainerObjectId1; - if(!gMapObjects[trainerObjectId1].singleMovementActive) - { - FreezeMapObject(&gMapObjects[trainerObjectId1]); - gTasks[taskId].data[1] = 1; - } - } -} - -bool8 sub_8098734(void) -{ - if (FuncIsActiveTask(sub_80985BC)) - { - return FALSE; - } - else - { - sub_808BCF4(); - return TRUE; - } -} diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index 2ce8a271d..591e3ad9a 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 9ad1a9742..f99d23bc3 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 85bdbc5ea..5b92b8023 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 9b505a205..60447f641 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 e36b60718..e3edb5abf 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 02ab55223..27280addf 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 71cf3f1a6..d6f4e24a5 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 9ab8a69ba..7080ae6a8 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 db8cff8a1..cf47bbe2a 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 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 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 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 5c1037293..2219a720b 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 64bfa88ec..3fa302968 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 49fef1ad8..17fe48f70 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 -- cgit v1.2.3 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: 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 8527e570d..fdfa76343 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 -- cgit v1.2.3 From 4d13e3394ad44eaa5dab972e73985dd1820069ea Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 13 Jun 2018 17:51:26 -0500 Subject: 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 +- .../field_event_obj/movement_action_func_tables.h | 2398 ++++---- .../field_event_obj/movement_type_func_tables.h | 594 +- src/decoration.c | 2 +- src/event_obj_lock.c | 8 +- src/event_object_movement.c | 5800 +++++++++++++------- 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, 6019 insertions(+), 4211 deletions(-) diff --git a/asm/battle_frontier_1.s b/asm/battle_frontier_1.s index 535bbbbbe..522c5d5f5 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 c42d96640..b2b454278 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 ff10928cb..c2b13e2bf 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 08df3215c..6cf62ba8b 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 375177337..c0becc6da 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 5d5602b7f..08eaf949a 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 6916fc6ea..3db508001 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 702852445..840d38f64 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 14e418f1c..f906304ca 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 8dfbd6782..581b72e43 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 0631a5d33..8a8e2baed 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 939995150..dfbac56fa 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 ca2449a6d..8a1749b0b 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 +{ + 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 { +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 5e7cec4cb..800048605 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 970f47d5f..8cd6c275b 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 ace988f4e..a81f10b0d 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 39f3cd8b0..43f8b82d2 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 2875aaff2..ccc36b7c2 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 7b83743a7..f8a0204c4 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 d44bb1043..87110b87b 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 519ca771a..b24f5dea4 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 (*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 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 gUnknown_0850DEC8[])(struct EventObject *, struct Sprite *) = { - sub_8093950, - sub_80964BC, -}; - -u8 (*const gUnknown_0850DED0[])(struct EventObject *, struct Sprite *) = { - sub_8093960, - sub_80964BC, -}; - -u8 (*const gUnknown_0850DED8[])(struct EventObject *, struct Sprite *) = { - sub_8093970, - sub_80964BC, -}; - -u8 (*const gUnknown_0850DEE0[])(struct EventObject *, struct Sprite *) = { - sub_8093980, - sub_80964BC, +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 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 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 gMovementActionFuncs_FaceDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_FaceDown_Step0, + MovementAction_PauseSpriteAnim, +}; + +u8 (*const gMovementActionFuncs_FaceUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_FaceUp_Step0, + MovementAction_PauseSpriteAnim, +}; + +u8 (*const gMovementActionFuncs_FaceLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_FaceLeft_Step0, + MovementAction_PauseSpriteAnim, +}; + +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 gMovementActionFuncs_Jump2Up[])(struct EventObject *, struct Sprite *) = { + MovementAction_Jump2Up_Step0, + MovementAction_Jump2Up_Step1, + MovementAction_PauseSpriteAnim, +}; + +u8 (*const gMovementActionFuncs_Jump2Left[])(struct EventObject *, struct Sprite *) = { + MovementAction_Jump2Left_Step0, + MovementAction_Jump2Left_Step1, + MovementAction_PauseSpriteAnim, +}; + +u8 (*const gMovementActionFuncs_Jump2Right[])(struct EventObject *, struct Sprite *) = { + MovementAction_Jump2Right_Step0, + MovementAction_Jump2Right_Step1, + MovementAction_PauseSpriteAnim, +}; + +u8 (*const gMovementActionFuncs_Delay1[])(struct EventObject *, struct Sprite *) = { + MovementAction_Delay1_Step0, + MovementAction_Delay_Step1, + MovementAction_Finish, }; -u8 (*const gUnknown_0850DFD4[])(struct EventObject *, struct Sprite *) = { - sub_8094288, - sub_8094288_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_Delay2[])(struct EventObject *, struct Sprite *) = { + MovementAction_Delay2_Step0, + MovementAction_Delay_Step1, + MovementAction_Finish, }; -u8 (*const gUnknown_0850DFE0[])(struct EventObject *, struct Sprite *) = { - sub_80942E0, - sub_80942E0_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_Delay4[])(struct EventObject *, struct Sprite *) = { + MovementAction_Delay4_Step0, + MovementAction_Delay_Step1, + MovementAction_Finish, }; -u8 (*const gUnknown_0850DFEC[])(struct EventObject *, struct Sprite *) = { - sub_8094338, - sub_8094338_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_Delay8[])(struct EventObject *, struct Sprite *) = { + MovementAction_Delay8_Step0, + MovementAction_Delay_Step1, + MovementAction_Finish, }; -u8 (*const gUnknown_0850DFF8[])(struct EventObject *, struct Sprite *) = { - sub_80943B4, - sub_8094398, - sub_80964B8, +u8 (*const gMovementActionFuncs_Delay16[])(struct EventObject *, struct Sprite *) = { + MovementAction_Delay16_Step0, + MovementAction_Delay_Step1, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E004[])(struct EventObject *, struct Sprite *) = { - sub_80943D4, - sub_8094398, - sub_80964B8, +u8 (*const gMovementActionFuncs_WalkFastDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkFastDown_Step0, + MovementAction_WalkFastDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E010[])(struct EventObject *, struct Sprite *) = { - sub_80943F4, - sub_8094398, - sub_80964B8, +u8 (*const gMovementActionFuncs_WalkFastUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkFastUp_Step0, + MovementAction_WalkFastUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E01C[])(struct EventObject *, struct Sprite *) = { - sub_8094414, - sub_8094398, - sub_80964B8, +u8 (*const gMovementActionFuncs_WalkFastLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkFastLeft_Step0, + MovementAction_WalkFastLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E028[])(struct EventObject *, struct Sprite *) = { - sub_8094434, - sub_8094398, - sub_80964B8, +u8 (*const gMovementActionFuncs_WalkFastRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkFastRight_Step0, + MovementAction_WalkFastRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E034[])(struct EventObject *, struct Sprite *) = { - sub_8094454, - sub_8094454_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceSlowDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceSlowDown_Step0, + MovementAction_WalkInPlaceSlow_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E040[])(struct EventObject *, struct Sprite *) = { - sub_8094494, - sub_8094494_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceSlowUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceSlowUp_Step0, + MovementAction_WalkInPlaceSlow_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E04C[])(struct EventObject *, struct Sprite *) = { - sub_80944D4, - sub_80944D4_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceSlowLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceSlowLeft_Step0, + MovementAction_WalkInPlaceSlow_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E058[])(struct EventObject *, struct Sprite *) = { - sub_8094514, - sub_8094514_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceSlowRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceSlowRight_Step0, + MovementAction_WalkInPlaceSlow_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E064[])(struct EventObject *, struct Sprite *) = { - sub_8094600, - sub_80945C4, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceNormalDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceNormalDown_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E070[])(struct EventObject *, struct Sprite *) = { - sub_8094638, - sub_80945C4, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceNormalUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceNormalUp_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E07C[])(struct EventObject *, struct Sprite *) = { - sub_8094670, - sub_80945C4, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceNormalLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceNormalLeft_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E088[])(struct EventObject *, struct Sprite *) = { - sub_80946A8, - sub_80945C4, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceNormalRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceNormalRight_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E094[])(struct EventObject *, struct Sprite *) = { - sub_80946E0, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceFastDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceFastDown_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E0A0[])(struct EventObject *, struct Sprite *) = { - sub_8094718, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceFastUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceFastUp_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E0AC[])(struct EventObject *, struct Sprite *) = { - sub_8094750, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceFastLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceFastLeft_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E0B8[])(struct EventObject *, struct Sprite *) = { - sub_8094788, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceFastRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceFastRight_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E0C4[])(struct EventObject *, struct Sprite *) = { - sub_80947C0, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceFastestDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceFastestDown_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E0D0[])(struct EventObject *, struct Sprite *) = { - sub_80947F8, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceFastestUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceFastestUp_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E0DC[])(struct EventObject *, struct Sprite *) = { - sub_8094830, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceFastestLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceFastestLeft_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E0E8[])(struct EventObject *, struct Sprite *) = { - sub_8094868, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceFastestRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceFastestRight_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E0F4[])(struct EventObject *, struct Sprite *) = { - sub_80948A0, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_RideWaterCurrentDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_RideWaterCurrentDown_Step0, + MovementAction_RideWaterCurrentDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E100[])(struct EventObject *, struct Sprite *) = { - sub_80948D8, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_RideWaterCurrentUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_RideWaterCurrentUp_Step0, + MovementAction_RideWaterCurrentUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E10C[])(struct EventObject *, struct Sprite *) = { - sub_8094910, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_RideWaterCurrentLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_RideWaterCurrentLeft_Step0, + MovementAction_RideWaterCurrentLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E118[])(struct EventObject *, struct Sprite *) = { - sub_8094948, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_RideWaterCurrentRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_RideWaterCurrentRight_Step0, + MovementAction_RideWaterCurrentRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E124[])(struct EventObject *, struct Sprite *) = { - sub_8094980, - sub_8094980_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkFastestDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkFastestDown_Step0, + MovementAction_WalkFastestDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E130[])(struct EventObject *, struct Sprite *) = { - sub_80949C0, - sub_80949C0_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkFastestUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkFastestUp_Step0, + MovementAction_WalkFastestUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E13C[])(struct EventObject *, struct Sprite *) = { - sub_8094A00, - sub_8094A00_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkFastestLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkFastestLeft_Step0, + MovementAction_WalkFastestLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E148[])(struct EventObject *, struct Sprite *) = { - sub_8094A40, - sub_8094A40_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkFastestRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkFastestRight_Step0, + MovementAction_WalkFastestRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E154[])(struct EventObject *, struct Sprite *) = { - sub_8094A80, - sub_8094A80_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_SlideDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_SlideDown_Step0, + MovementAction_SlideDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E160[])(struct EventObject *, struct Sprite *) = { - sub_8094AC0, - sub_8094AC0_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_SlideUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_SlideUp_Step0, + MovementAction_SlideUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E16C[])(struct EventObject *, struct Sprite *) = { - sub_8094B00, - sub_8094B00_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_SlideLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_SlideLeft_Step0, + MovementAction_SlideLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E178[])(struct EventObject *, struct Sprite *) = { - sub_8094B40, - sub_8094B40_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_SlideRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_SlideRight_Step0, + MovementAction_SlideRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E184[])(struct EventObject *, struct Sprite *) = { - sub_8094B80, - sub_8094B80_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_PlayerRunDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_PlayerRunDown_Step0, + MovementAction_PlayerRunDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E190[])(struct EventObject *, struct Sprite *) = { - sub_8094BC0, - sub_8094BC0_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_PlayerRunUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_PlayerRunUp_Step0, + MovementAction_PlayerRunUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E19C[])(struct EventObject *, struct Sprite *) = { - sub_8094C00, - sub_8094C00_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_PlayerRunLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_PlayerRunLeft_Step0, + MovementAction_PlayerRunLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E1A8[])(struct EventObject *, struct Sprite *) = { - sub_8094C40, - sub_8094C40_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_PlayerRunRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_PlayerRunRight_Step0, + MovementAction_PlayerRunRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E1B4[])(struct EventObject *, struct Sprite *) = { - sub_8094C80, - sub_8094C80_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_StartAnimInDirection[])(struct EventObject *, struct Sprite *) = { + MovementAction_StartAnimInDirection_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E1C0[])(struct EventObject *, struct Sprite *) = { - sub_8094CC0, - sub_8094CC0_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpSpecialDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpSpecialDown_Step0, + MovementAction_JumpSpecialDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E1CC[])(struct EventObject *, struct Sprite *) = { - sub_8094D00, - sub_8094D00_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpSpecialUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpSpecialUp_Step0, + MovementAction_JumpSpecialUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E1D8[])(struct EventObject *, struct Sprite *) = { - sub_8094D40, - sub_8094D40_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpSpecialLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpSpecialLeft_Step0, + MovementAction_JumpSpecialLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E1E4[])(struct EventObject *, struct Sprite *) = { - sub_8094DAC, - sub_8094DC4, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpSpecialRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpSpecialRight_Step0, + MovementAction_JumpSpecialRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E1F0[])(struct EventObject *, struct Sprite *) = { - sub_8094E18, - sub_8094E18_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_FacePlayer[])(struct EventObject *, struct Sprite *) = { + MovementAction_FacePlayer_Step0, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E1FC[])(struct EventObject *, struct Sprite *) = { - sub_8094E60, - sub_8094E60_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_FaceAwayPlayer[])(struct EventObject *, struct Sprite *) = { + MovementAction_FaceAwayPlayer_Step0, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E208[])(struct EventObject *, struct Sprite *) = { - sub_8094EB8, - sub_8094EB8_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_LockFacingDirection[])(struct EventObject *, struct Sprite *) = { + MovementAction_LockFacingDirection_Step0, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E214[])(struct EventObject *, struct Sprite *) = { - sub_8094710, - sub_8094710_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_UnlockFacingDirection[])(struct EventObject *, struct Sprite *) = { + MovementAction_UnlockFacingDirection_Step0, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E220[])(struct EventObject *, struct Sprite *) = { - sub_8094F38, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpDown_Step0, + MovementAction_JumpDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E228[])(struct EventObject *, struct Sprite *) = { - sub_8094F94, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpUp_Step0, + MovementAction_JumpUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E230[])(struct EventObject *, struct Sprite *) = { - sub_8094FF8, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpLeft_Step0, + MovementAction_JumpLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E238[])(struct EventObject *, struct Sprite *) = { - sub_8095008, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpRight_Step0, + MovementAction_JumpRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E240[])(struct EventObject *, struct Sprite *) = { - sub_8095018, - sub_8095018_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpInPlaceDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpInPlaceDown_Step0, + MovementAction_JumpInPlaceDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E24C[])(struct EventObject *, struct Sprite *) = { - sub_8095070, - sub_8095070_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpInPlaceUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpInPlaceUp_Step0, + MovementAction_JumpInPlaceUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E258[])(struct EventObject *, struct Sprite *) = { - sub_80950C8, - sub_80950C8_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpInPlaceLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpInPlaceLeft_Step0, + MovementAction_JumpInPlaceLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E264[])(struct EventObject *, struct Sprite *) = { - sub_8095120, - sub_8095120_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpInPlaceRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpInPlaceRight_Step0, + MovementAction_JumpInPlaceRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E270[])(struct EventObject *, struct Sprite *) = { - sub_8095178, - sub_8095178_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpInPlaceDownUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpInPlaceDownUp_Step0, + MovementAction_JumpInPlaceDownUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E27C[])(struct EventObject *, struct Sprite *) = { - sub_80951D0, - sub_80951D0_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpInPlaceUpDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpInPlaceUpDown_Step0, + MovementAction_JumpInPlaceUpDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E288[])(struct EventObject *, struct Sprite *) = { - sub_8095228, - sub_8095228_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpInPlaceLeftRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpInPlaceLeftRight_Step0, + MovementAction_JumpInPlaceLeftRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E294[])(struct EventObject *, struct Sprite *) = { - sub_8095280, - sub_8095280_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpInPlaceRightLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpInPlaceRightLeft_Step0, + MovementAction_JumpInPlaceRightLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E2A0[])(struct EventObject *, struct Sprite *) = { - sub_80952D8, - sub_80952D8_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_FaceOriginalDirection[])(struct EventObject *, struct Sprite *) = { + MovementAction_FaceOriginalDirection_Step0, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E2AC[])(struct EventObject *, struct Sprite *) = { - sub_8095330, - sub_8095330_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_NurseJoyBowDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_NurseJoyBowDown_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E2B8[])(struct EventObject *, struct Sprite *) = { - sub_8095388, - sub_8095388_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_EnableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *) = { + MovementAction_EnableJumpLandingGroundEffect_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E2C4[])(struct EventObject *, struct Sprite *) = { - sub_80953E0, - sub_80953E0_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_DisableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *) = { + MovementAction_DisableJumpLandingGroundEffect_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E2D0[])(struct EventObject *, struct Sprite *) = { - sub_8095438, - sub_80964BC, +u8 (*const gMovementActionFuncs_DisableAnimation[])(struct EventObject *, struct Sprite *) = { + MovementAction_DisableAnimation_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E2D8[])(struct EventObject *, struct Sprite *) = { - sub_8095450, - sub_8094DC4, - sub_80964BC, +u8 (*const gMovementActionFuncs_RestoreAnimation[])(struct EventObject *, struct Sprite *) = { + MovementAction_RestoreAnimation_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E2E4[])(struct EventObject *, struct Sprite *) = { - sub_8095460, - sub_80964B8, +u8 (*const gMovementActionFuncs_SetInvisible[])(struct EventObject *, struct Sprite *) = { + MovementAction_SetInvisible_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E2EC[])(struct EventObject *, struct Sprite *) = { - sub_8095470, - sub_80964B8, +u8 (*const gMovementActionFuncs_SetVisible[])(struct EventObject *, struct Sprite *) = { + MovementAction_SetVisible_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E2F4[])(struct EventObject *, struct Sprite *) = { - sub_8095480, - sub_80964B8, +u8 (*const gMovementActionFuncs_EmoteExclamationMark[])(struct EventObject *, struct Sprite *) = { + MovementAction_EmoteExclamationMark_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E2FC[])(struct EventObject *, struct Sprite *) = { - sub_8095490, - sub_80964B8, +u8 (*const gMovementActionFuncs_EmoteQuestionMark[])(struct EventObject *, struct Sprite *) = { + MovementAction_EmoteQuestionMark_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E304[])(struct EventObject *, struct Sprite *) = { - sub_80954BC, - sub_80964B8, +u8 (*const gMovementActionFuncs_EmoteHeart[])(struct EventObject *, struct Sprite *) = { + MovementAction_EmoteHeart_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E30C[])(struct EventObject *, struct Sprite *) = { - sub_80954CC, - sub_80964B8, +u8 (*const gMovementActionFuncs_RevealTrainer[])(struct EventObject *, struct Sprite *) = { + MovementAction_RevealTrainer_Step0, + MovementAction_RevealTrainer_Step1, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E314[])(struct EventObject *, struct Sprite *) = { - do_exclamation_mark_bubble_1, - sub_80964B8, +u8 (*const gMovementActionFuncs_RockSmashBreak[])(struct EventObject *, struct Sprite *) = { + MovementAction_RockSmashBreak_Step0, + MovementAction_RockSmashBreak_Step1, + MovementAction_RockSmashBreak_Step2, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E31C[])(struct EventObject *, struct Sprite *) = { - do_exclamation_mark_bubble_2, - sub_80964B8, +u8 (*const gMovementActionFuncs_CutTree[])(struct EventObject *, struct Sprite *) = { + MovementAction_CutTree_Step0, + MovementAction_CutTree_Step1, + MovementAction_CutTree_Step2, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E324[])(struct EventObject *, struct Sprite *) = { - do_heart_bubble, - sub_80964B8, +u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct EventObject *, struct Sprite *) = { + MovementAction_SetFixedPriority_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E32C[])(struct EventObject *, struct Sprite *) = { - sub_8095548, - sub_809558C, - sub_80964B8, +u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct EventObject *, struct Sprite *) = { + MovementAction_ClearFixedPriority_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E338[])(struct EventObject *, struct Sprite *) = { - sub_80955AC, - sub_80955C8, - sub_80955EC, - sub_80964B8, +u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct EventObject *, struct Sprite *) = { + MovementAction_InitAffineAnim_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E348[])(struct EventObject *, struct Sprite *) = { - sub_8095628, - sub_8095644, - sub_8095668, - sub_80964B8, +u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct EventObject *, struct Sprite *) = { + MovementAction_ClearAffineAnim_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E358[])(struct EventObject *, struct Sprite *) = { - sub_80956A4, - sub_80964B8, +u8 (*const gMovementActionFuncs_Unknown1[])(struct EventObject *, struct Sprite *) = { + MovementAction_Unknown1_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E360[])(struct EventObject *, struct Sprite *) = { - sub_80956B4, - sub_80964B8, +u8 (*const gMovementActionFuncs_Unknown2[])(struct EventObject *, struct Sprite *) = { + MovementAction_Unknown2_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E368[])(struct EventObject *, struct Sprite *) = { - sub_80956C4, - sub_80964B8, +u8 (*const gMovementActionFuncs_WalkDownStartAffine[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkDownStartAffine_Step0, + MovementAction_WalkDownStartAffine_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E370[])(struct EventObject *, struct Sprite *) = { - sub_80956F4, - sub_80964B8, +u8 (*const gMovementActionFuncs_WalkDownAffine[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkDownAffine_Step0, + MovementAction_WalkDownAffine_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E378[])(struct EventObject *, struct Sprite *) = { - sub_8095724, - sub_80964B8, +u8 (*const gMovementActionFuncs_WalkLeftAffine[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkLeftAffine_Step0, + MovementAction_WalkLeftAffine_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E380[])(struct EventObject *, struct Sprite *) = { - sub_8095730, - sub_80964B8, +u8 (*const gMovementActionFuncs_WalkRightAffine[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkRightAffine_Step0, + MovementAction_WalkRightAffine_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E388[])(struct EventObject *, struct Sprite *) = { - sub_8095740, - sub_8095740_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieFaceDown_Step0, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E394[])(struct EventObject *, struct Sprite *) = { - sub_80957A0, - sub_80957A0_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieFaceUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieFaceUp_Step0, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E3A0[])(struct EventObject *, struct Sprite *) = { - sub_8095800, - sub_8095800_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieFaceLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieFaceLeft_Step0, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E3AC[])(struct EventObject *, struct Sprite *) = { - sub_8095860, - sub_8095860_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieFaceRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieFaceRight_Step0, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E3B8[])(struct EventObject *, struct Sprite *) = { - sub_8095900, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroPopWheelieDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroPopWheelieDown_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E3C0[])(struct EventObject *, struct Sprite *) = { - sub_8095910, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroPopWheelieUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroPopWheelieUp_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E3C8[])(struct EventObject *, struct Sprite *) = { - sub_8095920, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroPopWheelieLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroPopWheelieLeft_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E3D0[])(struct EventObject *, struct Sprite *) = { - sub_8095930, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroPopWheelieRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroPopWheelieRight_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E3D8[])(struct EventObject *, struct Sprite *) = { - sub_8095940, - sub_8094DC4, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroEndWheelieFaceDown_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E3E4[])(struct EventObject *, struct Sprite *) = { - sub_8095964, - sub_8094DC4, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroEndWheelieFaceUp_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E3F0[])(struct EventObject *, struct Sprite *) = { - sub_8095988, - sub_8094DC4, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroEndWheelieFaceLeft_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E3FC[])(struct EventObject *, struct Sprite *) = { - sub_80959AC, - sub_8094DC4, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroEndWheelieFaceRight_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E408[])(struct EventObject *, struct Sprite *) = { - sub_80959D0, - sub_8094DC4, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroUnusedAcroActionDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_UnusedAcroActionDown_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E414[])(struct EventObject *, struct Sprite *) = { - sub_80959F4, - sub_8094DC4, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroUnusedAcroActionUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_UnusedAcroActionUp_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E420[])(struct EventObject *, struct Sprite *) = { - sub_8095A18, - sub_8094DC4, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroUnusedAcroActionLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_UnusedAcroActionLeft_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_AcroUnusedAcroActionRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_UnusedAcroActionRight_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E468[])(struct EventObject *, struct Sprite *) = { - sub_8095B44, - sub_8095B64, - sub_80964BC, +u8 (*const gMovementActionFuncs_Figure8[])(struct EventObject *, struct Sprite *) = { + MovementAction_Figure8_Step0, + MovementAction_Figure8_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E474[])(struct EventObject *, struct Sprite *) = { - sub_8095BC8, - sub_8095BC8_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieHopFaceDown_Step0, + MovementAction_AcroWheelieHopFaceDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E480[])(struct EventObject *, struct Sprite *) = { - sub_8095C20, - sub_8095C20_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieHopFaceUp_Step0, + MovementAction_AcroWheelieHopFaceUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E48C[])(struct EventObject *, struct Sprite *) = { - sub_8095C78, - sub_8095C78_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieHopFaceLeft_Step0, + MovementAction_AcroWheelieHopFaceLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E498[])(struct EventObject *, struct Sprite *) = { - sub_8095CD0, - sub_8095CD0_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieHopFaceRight_Step0, + MovementAction_AcroWheelieHopFaceRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E4A4[])(struct EventObject *, struct Sprite *) = { - sub_8095D28, - sub_8095D28_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieHopDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieHopDown_Step0, + MovementAction_AcroWheelieHopDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E4B0[])(struct EventObject *, struct Sprite *) = { - sub_8095D80, - sub_8095D80_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieHopUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieHopUp_Step0, + MovementAction_AcroWheelieHopUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E4BC[])(struct EventObject *, struct Sprite *) = { - sub_8095DD8, - sub_8095DD8_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieHopLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieHopLeft_Step0, + MovementAction_AcroWheelieHopLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E4C8[])(struct EventObject *, struct Sprite *) = { - sub_8095E30, - sub_8095E30_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieHopRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieHopRight_Step0, + MovementAction_AcroWheelieHopRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E4D4[])(struct EventObject *, struct Sprite *) = { - sub_8095E88, - sub_8095E88_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieJumpDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieJumpDown_Step0, + MovementAction_AcroWheelieJumpDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E4E0[])(struct EventObject *, struct Sprite *) = { - sub_8095EE0, - sub_8095EE0_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieJumpUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieJumpUp_Step0, + MovementAction_AcroWheelieJumpUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E4EC[])(struct EventObject *, struct Sprite *) = { - sub_8095F38, - sub_8095F38_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieJumpLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieJumpLeft_Step0, + MovementAction_AcroWheelieJumpLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E4F8[])(struct EventObject *, struct Sprite *) = { - sub_8095F90, - sub_8095F90_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieJumpRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieJumpRight_Step0, + MovementAction_AcroWheelieJumpRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E504[])(struct EventObject *, struct Sprite *) = { - sub_8095FE8, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieInPlaceDown_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E510[])(struct EventObject *, struct Sprite *) = { - sub_8096020, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieInPlaceUp_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E51C[])(struct EventObject *, struct Sprite *) = { - sub_8096058, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieInPlaceLeft_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E528[])(struct EventObject *, struct Sprite *) = { - sub_8096090, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieInPlaceRight_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E534[])(struct EventObject *, struct Sprite *) = { - sub_8096100, - sub_8096100_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroPopWheelieMoveDown_Step0, + MovementAction_AcroPopWheelieMoveDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E540[])(struct EventObject *, struct Sprite *) = { - sub_8096140, - sub_8096140_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroPopWheelieMoveUp_Step0, + MovementAction_AcroPopWheelieMoveUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E54C[])(struct EventObject *, struct Sprite *) = { - sub_8096180, - sub_8096180_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroPopWheelieMoveLeft_Step0, + MovementAction_AcroPopWheelieMoveLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E558[])(struct EventObject *, struct Sprite *) = { - sub_80961C0, - sub_80961C0_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroPopWheelieMoveRight_Step0, + MovementAction_AcroPopWheelieMoveRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E564[])(struct EventObject *, struct Sprite *) = { - sub_8096230, - sub_8096230_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieMoveDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieMoveDown_Step0, + MovementAction_AcroWheelieMoveDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E570[])(struct EventObject *, struct Sprite *) = { - sub_8096270, - sub_8096270_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieMoveUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieMoveUp_Step0, + MovementAction_AcroWheelieMoveUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E57C[])(struct EventObject *, struct Sprite *) = { - sub_80962B0, - sub_80962B0_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieMoveLeft_Step0, + MovementAction_AcroWheelieMoveLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E588[])(struct EventObject *, struct Sprite *) = { - sub_80962F0, - sub_80962F0_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieMoveRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieMoveRight_Step0, + MovementAction_AcroWheelieMoveRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E594[])(struct EventObject *, struct Sprite *) = { - sub_8096368, - sub_8096368_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroEndWheelieMoveDown_Step0, + MovementAction_AcroEndWheelieMoveDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E5A0[])(struct EventObject *, struct Sprite *) = { - sub_80963A8, - sub_80963A8_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroEndWheelieMoveUp_Step0, + MovementAction_AcroEndWheelieMoveUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E5AC[])(struct EventObject *, struct Sprite *) = { - sub_80963E8, - sub_80963E8_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroEndWheelieMoveLeft_Step0, + MovementAction_AcroEndWheelieMoveLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E5B8[])(struct EventObject *, struct Sprite *) = { - sub_8096428, - sub_8096428_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroEndWheelieMoveRight_Step0, + MovementAction_AcroEndWheelieMoveRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E5C4[])(struct EventObject *, struct Sprite *) = { - sub_8096468, - sub_80964B8, +u8 (*const gMovementActionFuncs_Levitate[])(struct EventObject *, struct Sprite *) = { + MovementAction_Levitate_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E5CC[])(struct EventObject *, struct Sprite *) = { - sub_809647C, - sub_80964B8, +u8 (*const gMovementActionFuncs_StopLevitate[])(struct EventObject *, struct Sprite *) = { + MovementAction_StopLevitate_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E5D4[])(struct EventObject *, struct Sprite *) = { - sub_8096494, - sub_80964B8, +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 3b18c90d1..165e96220 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}; - -u8 (*const gUnknown_0850D714[])(s16, s16, s16, s16) = { - GetRegularRunningPastFacingDirection, - GetNorthSouthRunningPastFacingDirection, - GetEastWestRunningPastFacingDirection, - GetNorthEastRunningPastFacingDirection, - GetNorthWestRunningPastFacingDirection, - GetSouthEastRunningPastFacingDirection, - GetSouthWestRunningPastFacingDirection, - GetNonEastRunningPastFacingDirection, - GetNonWestRunningPastFacingDirection, - GetNonSouthRunningPastFacingDirection, - GetNonNorthRunningPastFacingDirection, +const u8 gStandardDirections[] = {DIR_SOUTH, DIR_NORTH, DIR_WEST, DIR_EAST}; + +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 83030ccb7..ad2cdfa30 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 1582c00f8..efa498c0f 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 d23bba92b..35b04ea1e 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 *) = -{ - 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, +static void (*const sMovementTypeCallbacks[])(struct Sprite *) = +{ + 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 gUnknown_0850DAD5[] = { - 0x04, - 0x04, - 0x05, - 0x06, - 0x07, - 0x04, - 0x04, - 0x05, - 0x05, +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 gUnknown_0850DADE[] = { - 0x08, - 0x08, - 0x09, - 0x0a, - 0x0b, - 0x08, - 0x08, - 0x09, - 0x09, +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 gUnknown_0850DAE7[] = { - 0x0c, - 0x0c, - 0x0d, - 0x0e, - 0x0f, - 0x0c, - 0x0c, - 0x0d, - 0x0d, +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 gUnknown_0850DAF0[] = { - 0x10, - 0x10, - 0x11, - 0x12, - 0x13, - 0x10, - 0x10, - 0x11, - 0x11, +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 gUnknown_0850DAF9[] = { - 0x14, - 0x14, - 0x15, - 0x16, - 0x17, - 0x14, - 0x14, - 0x15, - 0x15, +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 gUnknown_0850DB02[] = { - 0x14, - 0x14, - 0x15, - 0x16, - 0x17, - 0x14, - 0x14, - 0x15, - 0x15, +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 gUnknown_0850DB0B[] = { - 0x18, - 0x18, - 0x19, - 0x1a, - 0x1b, - 0x18, - 0x18, - 0x19, - 0x19, +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 gUnknown_0850DB14[] = { - 0x1c, - 0x1c, - 0x1d, - 0x1e, - 0x1f, - 0x1c, - 0x1c, - 0x1d, - 0x1d, +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 gUnknown_0850DB1D[] = { - 0x20, - 0x20, - 0x21, - 0x22, - 0x23, - 0x20, - 0x20, - 0x21, - 0x21, +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 gUnknown_0850DB26[] = { - 0x24, - 0x24, - 0x25, - 0x26, - 0x27, - 0x24, - 0x24, - 0x25, - 0x25, +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 gUnknown_0850DB2F[] = { - 0x00, - 0x00, - 0x01, - 0x02, - 0x03, - 0x00, - 0x00, - 0x01, - 0x01, +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 gUnknown_0850DB38[] = { - 0x04, - 0x04, - 0x05, - 0x06, - 0x07, - 0x04, - 0x04, - 0x05, - 0x05, +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 gUnknown_0850DB41[] = { - 0x08, - 0x08, - 0x09, - 0x0a, - 0x0b, - 0x08, - 0x08, - 0x09, - 0x09, +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 gUnknown_0850DB4A[] = { - 0x14, - 0x14, - 0x15, - 0x16, - 0x17, - 0x14, - 0x14, - 0x15, - 0x15, +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_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? - -null_object_step(NoMovement1, FALSE) - -field_object_step(GoRandomDirections, gUnknown_0850D6F4) +movement_type_empty_callback(MovementType_None) +movement_type_def(MovementType_WanderAround, gMovementTypeFuncs_WanderAround) -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 directions[4]; u8 direction; + u8 directions[4]; + 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 directions[4]; u8 direction; - - memcpy(directions, gUnknown_0850D850, sizeof gUnknown_0850D850); - direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_NORTH_SOUTH_WEST); + u8 directions[4]; + 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) - -field_object_step(CopyPlayer1, gUnknown_0850DA58) - -bool8 mss_npc_reset_oampriv3_1_unk2_unk3(struct EventObject *eventObject, struct Sprite *sprite) -{ - npc_reset(eventObject, sprite); - if (eventObject->directionSequenceIndex == 0) - { - eventObject->directionSequenceIndex = player_get_direction_lower_nybble(); +movement_type_def(MovementType_WalkSequenceUpRightLeftDown, gMovementTypeFuncs_WalkSequenceUpRightLeftDown) + +u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct EventObject *eventObject, struct Sprite *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 = 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];\ -} - -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 GetFaceDirectionAnimNum(u8 direction) +{ + return gFaceDirectionAnimNums[direction]; +} + +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]; \ -} - -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); +#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];\ +} + +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;\ -} - -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_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8093B60(eventObject, sprite, DIR_NORTHWEST); + return MovementAction_WalkSlowDiagonalUpLeft_Step1(eventObject, sprite); +} + +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,343 +5709,1584 @@ 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; +} + + +void sub_8094390(struct Sprite *sprite, u16 duration) +{ + sprite->data[2] = 1; + sprite->data[3] = duration; +} + +bool8 MovementAction_Delay_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (-- sprite->data[3] == 0) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_Delay1_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8094390(sprite, 1); + return MovementAction_Delay_Step1(eventObject, sprite); +} + +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; +} + + +void sub_8094554(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 animNum, u16 duration) +{ + SetEventObjectDirection(eventObject, direction); + npc_apply_anim_looping(eventObject, sprite, animNum); + sprite->animPaused = FALSE; + sprite->data[2] = 1; + sprite->data[3] = duration; +} + +bool8 MovementAction_WalkInPlace_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (-- sprite->data[3] == 0) + { + sprite->data[2] = 2; + sprite->animPaused = TRUE; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_WalkInPlaceSlow_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sprite->data[3] & 1) + { + sprite->animDelayCounter++; + } + return MovementAction_WalkInPlace_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkInPlaceSlowDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8094554(eventObject, sprite, DIR_SOUTH, GetMoveDirectionAnimNum(DIR_SOUTH), 32); + return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkInPlaceSlowUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + 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 MovementAction_RideWaterCurrentUp_Step0(struct EventObject *eventObject, struct Sprite *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; + } + return FALSE; +} + +void sub_8094DE4(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +{ + sub_8093FC4(eventObject, sprite, direction, 1, 0); + StartSpriteAnim(sprite, GetJumpSpecialDirectionAnimNum(direction)); +} + +bool8 MovementAction_JumpSpecialDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8094DE4(eventObject, sprite, DIR_SOUTH); + return MovementAction_JumpSpecialDown_Step1(eventObject, sprite); +} + +bool8 MovementAction_JumpSpecialDown_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_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 MovementAction_FaceAwayPlayer_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + u8 playerObjectId; + + if (!TryGetEventObjectIdByLocalIdAndMap(0xFF, 0, 0, &playerObjectId)) + { + 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 MovementAction_LockFacingDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + eventObject->facingDirectionLocked = TRUE; + sprite->data[2] = 1; + return TRUE; +} + +bool8 MovementAction_UnlockFacingDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + eventObject->facingDirectionLocked = FALSE; + sprite->data[2] = 1; + return TRUE; +} + +bool8 MovementAction_JumpDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + maybe_shadow_1(eventObject, sprite, DIR_SOUTH, 1, 2); + return MovementAction_JumpDown_Step1(eventObject, sprite); +} + +bool8 MovementAction_JumpDown_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_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 MovementAction_DisableJumpLandingGroundEffect_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + eventObject->disableJumpLandingGroundEffect = TRUE; + sprite->data[2] = 1; + return TRUE; +} + +bool8 MovementAction_DisableAnimation_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + eventObject->inanimate = TRUE; + sprite->data[2] = 1; + return TRUE; +} + +bool8 MovementAction_RestoreAnimation_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + eventObject->inanimate = GetEventObjectGraphicsInfo(eventObject->graphicsId)->inanimate; + sprite->data[2] = 1; + return TRUE; +} + +bool8 MovementAction_SetInvisible_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + eventObject->invisible = TRUE; + sprite->data[2] = 1; + return TRUE; +} + +bool8 MovementAction_SetVisible_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + eventObject->invisible = FALSE; + sprite->data[2] = 1; + return TRUE; +} + +bool8 MovementAction_EmoteExclamationMark_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON); + sprite->data[2] = 1; + return TRUE; +} + +bool8 MovementAction_EmoteQuestionMark_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + FieldEffectStart(FLDEFF_QUESTION_MARK_ICON); + sprite->data[2] = 1; + return TRUE; +} + +bool8 MovementAction_EmoteHeart_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + FieldEffectStart(FLDEFF_HEART_ICON); + sprite->data[2] = 1; + return TRUE; +} + +bool8 MovementAction_RevealTrainer_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (eventObject->movementType == MOVEMENT_TYPE_HIDDEN) + { + sub_80B4578(eventObject); + return FALSE; + } + 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 MovementAction_RevealTrainer_Step1(eventObject, sprite); +} + +bool8 MovementAction_RevealTrainer_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_8155DA0(eventObject)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_RockSmashBreak_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + SetAndStartSpriteAnim(sprite, 1, 0); + sprite->data[2] = 1; + return FALSE; +} + +bool8 MovementAction_RockSmashBreak_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (SpriteAnimEnded(sprite)) + { + SetMovementDelay(sprite, 32); + sprite->data[2] = 2; + } + return FALSE; +} + +bool8 MovementAction_RockSmashBreak_Step2(struct EventObject *eventObject, struct Sprite *sprite) +{ + eventObject->invisible ^= TRUE; + if (WaitForMovementDelay(sprite)) + { + eventObject->invisible = TRUE; + sprite->data[2] = 3; + } + return FALSE; +} + +bool8 MovementAction_CutTree_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + SetAndStartSpriteAnim(sprite, 1, 0); + sprite->data[2] = 1; + return FALSE; +} + +bool8 MovementAction_CutTree_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (SpriteAnimEnded(sprite)) + { + SetMovementDelay(sprite, 32); + sprite->data[2] = 2; + } + return FALSE; +} + +bool8 MovementAction_CutTree_Step2(struct EventObject *eventObject, struct Sprite *sprite) +{ + eventObject->invisible ^= TRUE; + if (WaitForMovementDelay(sprite)) + { + eventObject->invisible = TRUE; + sprite->data[2] = 3; + } + return FALSE; +} + +bool8 MovementAction_SetFixedPriority_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + eventObject->fixedPriority = TRUE; + sprite->data[2] = 1; + return TRUE; +} + +bool8 MovementAction_ClearFixedPriority_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + eventObject->fixedPriority = FALSE; + sprite->data[2] = 1; + return TRUE; +} + +bool8 MovementAction_InitAffineAnim_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sprite->oam.affineMode = ST_OAM_AFFINE_DOUBLE; + InitSpriteAffineAnim(sprite); + sprite->affineAnimPaused = TRUE; + sprite->subspriteMode = 0; + return TRUE; +} + +bool8 MovementAction_ClearAffineAnim_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + FreeOamMatrix(sprite->oam.matrixNum); + sprite->oam.affineMode = ST_OAM_AFFINE_OFF; + CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode); + return TRUE; +} + +bool8 MovementAction_Unknown1_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + eventObject->unk3_3 = TRUE; + return TRUE; +} + +bool8 MovementAction_Unknown2_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + eventObject->unk3_3 = FALSE; + return TRUE; +} + +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); +} + +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) +{ + SetEventObjectDirection(eventObject, direction); + ShiftStillEventObjectCoords(eventObject); + obj_npc_animation_step(eventObject, sprite, GetAcroWheeliePedalDirectionAnimNum(direction)); + sprite->animPaused = TRUE; + sprite->data[2] = 1; +} + +bool8 MovementAction_AcroWheelieFaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_80958C0(eventObject, sprite, DIR_SOUTH); + return TRUE; +} + +bool8 MovementAction_AcroWheelieFaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_80958C0(eventObject, sprite, DIR_NORTH); + return TRUE; +} + +bool8 MovementAction_AcroWheelieFaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_80958C0(eventObject, sprite, DIR_WEST); + return TRUE; +} + +bool8 MovementAction_AcroWheelieFaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_80958C0(eventObject, sprite, DIR_EAST); + return TRUE; +} + +bool8 MovementAction_AcroPopWheelieDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + StartSpriteAnimInDirection(eventObject, sprite, DIR_SOUTH, GetAcroWheelieDirectionAnimNum(DIR_SOUTH)); + return FALSE; +} + +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) +{ + sub_8097750(sprite); + sprite->animPaused = FALSE; +} + +bool8 sub_8095B0C(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_8097758(sprite)) + { + ShiftStillEventObjectCoords(eventObject); + eventObject->triggerGroundEffectsOnStop = TRUE; + sprite->animPaused = TRUE; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_Figure8_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8095AF0(eventObject, sprite); + sprite->data[2] = 1; + return MovementAction_Figure8_Step1(eventObject, sprite); +} + +bool8 MovementAction_Figure8_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_8095B0C(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +void sub_8095B84(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a4) +{ + sub_8093FC4(eventObject, sprite, direction, speed, a4); + StartSpriteAnimIfDifferent(sprite, GetAcroWheelieDirectionAnimNum(direction)); + DoShadowFieldEffect(eventObject); } -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) +bool8 MovementAction_AcroWheelieHopFaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - sprite->data[2] = 1; - sprite->data[3] = duration; + sub_8095B84(eventObject, sprite, DIR_SOUTH, 0, 1); + return MovementAction_AcroWheelieHopFaceDown_Step1(eventObject, sprite); } -bool8 sub_8094398(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - if (-- sprite->data[3] == 0) + if (sub_80941B0(eventObject, sprite)) { + eventObject->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } 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);\ -} - -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) - -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) +bool8 MovementAction_AcroWheelieHopFaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - EventObjectSetDirection(eventObject, direction); - npc_apply_anim_looping(eventObject, sprite, animNum); - sprite->animPaused = FALSE; - sprite->data[2] = 1; - sprite->data[3] = duration; + sub_8095B84(eventObject, sprite, DIR_NORTH, 0, 1); + return MovementAction_AcroWheelieHopFaceUp_Step1(eventObject, sprite); } -bool8 sub_809459C(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - if (-- sprite->data[3] == 0) + if (sub_80941B0(eventObject, sprite)) { + eventObject->hasShadow = FALSE; sprite->data[2] = 2; - sprite->animPaused = TRUE; return TRUE; } return FALSE; } -bool8 sub_80945C4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - if (sprite->data[3] & 1) + 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)) { - sprite->animDelayCounter ++; + eventObject->hasShadow = FALSE; + sprite->data[2] = 2; + return TRUE; } - return sub_809459C(eventObject, sprite); + return FALSE; } -#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) -{ - obj_anim_image_set_and_seek(sprite, animNum, 0); - EventObjectSetDirection(eventObject, direction); - sprite->data[2] = 1; +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 sub_8094DAC(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - npc_set_direction_and_anim__an_proceed(eventObject, sprite, eventObject->movementDirection, sprite->animNum); + if (sub_80941B0(eventObject, sprite)) + { + eventObject->hasShadow = FALSE; + sprite->data[2] = 2; + return TRUE; + } return FALSE; } -bool8 sub_8094DC4(struct EventObject *eventObject, struct Sprite *sprite) +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_80979BC(sprite)) + if (sub_80941B0(eventObject, sprite)) { + eventObject->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -void sub_8094DE4(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +bool8 MovementAction_AcroWheelieHopUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - sub_8093FC4(eventObject, sprite, direction, 1, 0); - StartSpriteAnim(sprite, sub_80929AC(direction)); + sub_8095B84(eventObject, sprite, DIR_NORTH, 1, 1); + return MovementAction_AcroWheelieHopUp_Step1(eventObject, sprite); } -#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;\ +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; } -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_AcroWheelieHopLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - u8 eventObjectId; + sub_8095B84(eventObject, sprite, DIR_WEST, 1, 1); + return MovementAction_AcroWheelieHopLeft_Step1(eventObject, sprite); +} - if (!TryGetEventObjectIdByLocalIdAndMap(0xFF, 0, 0, &eventObjectId)) +bool8 MovementAction_AcroWheelieHopLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941B0(eventObject, sprite)) { - an_look_any(eventObject, sprite, sub_8092AF8(eventObject->currentCoords.x, eventObject->currentCoords.y, gEventObjects[eventObjectId].currentCoords.x, gEventObjects[eventObjectId].currentCoords.y)); + eventObject->hasShadow = FALSE; + sprite->data[2] = 2; + return TRUE; } - sprite->data[2] = 1; - return TRUE; + return FALSE; } -bool8 sub_8094F94(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - u8 eventObjectId; + sub_8095B84(eventObject, sprite, DIR_EAST, 1, 1); + return MovementAction_AcroWheelieHopRight_Step1(eventObject, sprite); +} - if (!TryGetEventObjectIdByLocalIdAndMap(0xFF, 0, 0, &eventObjectId)) +bool8 MovementAction_AcroWheelieHopRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941B0(eventObject, sprite)) { - an_look_any(eventObject, sprite, GetOppositeDirection(sub_8092AF8(eventObject->currentCoords.x, eventObject->currentCoords.y, gEventObjects[eventObjectId].currentCoords.x, gEventObjects[eventObjectId].currentCoords.y))); + eventObject->hasShadow = FALSE; + sprite->data[2] = 2; + return TRUE; } - sprite->data[2] = 1; - return TRUE; + return FALSE; } -bool8 sub_8094FF8(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - eventObject->facingDirectionLocked = TRUE; - sprite->data[2] = 1; - return TRUE; + sub_8095B84(eventObject, sprite, DIR_SOUTH, 2, 0); + return MovementAction_AcroWheelieJumpDown_Step1(eventObject, sprite); } -bool8 sub_8095008(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - eventObject->facingDirectionLocked = FALSE; - sprite->data[2] = 1; - return TRUE; + if (sub_80941B0(eventObject, sprite)) + { + eventObject->hasShadow = FALSE; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; } -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_AcroWheelieJumpUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - an_look_any(eventObject, sprite, gInitialMovementTypeFacingDirections[eventObject->movementType]); - return TRUE; + sub_8095B84(eventObject, sprite, DIR_NORTH, 2, 0); + return MovementAction_AcroWheelieJumpUp_Step1(eventObject, sprite); } -bool8 sub_8095450(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpUp_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 = FALSE; + sprite->data[2] = 2; + return TRUE; + } return FALSE; } -bool8 sub_8095460(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - eventObject->disableJumpLandingGroundEffect = FALSE; - sprite->data[2] = 1; - return TRUE; + sub_8095B84(eventObject, sprite, DIR_WEST, 2, 0); + return MovementAction_AcroWheelieJumpLeft_Step1(eventObject, sprite); } -bool8 sub_8095470(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - eventObject->disableJumpLandingGroundEffect = TRUE; - sprite->data[2] = 1; - return TRUE; + if (sub_80941B0(eventObject, sprite)) + { + eventObject->hasShadow = FALSE; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; } -bool8 sub_8095480(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - eventObject->inanimate = TRUE; - sprite->data[2] = 1; - return TRUE; + sub_8095B84(eventObject, sprite, DIR_EAST, 2, 0); + return MovementAction_AcroWheelieJumpRight_Step1(eventObject, sprite); } -bool8 sub_8095490(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - eventObject->inanimate = GetEventObjectGraphicsInfo(eventObject->graphicsId)->inanimate; - sprite->data[2] = 1; - return TRUE; + if (sub_80941B0(eventObject, sprite)) + { + eventObject->hasShadow = FALSE; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; } -bool8 sub_80954BC(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieInPlaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - eventObject->invisible = TRUE; - sprite->data[2] = 1; - return TRUE; + sub_8094554(eventObject, sprite, DIR_SOUTH, GetAcroWheeliePedalDirectionAnimNum(DIR_SOUTH), 8); + return MovementAction_WalkInPlace_Step1(eventObject, sprite); } -bool8 sub_80954CC(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieInPlaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - eventObject->invisible = FALSE; - sprite->data[2] = 1; - return TRUE; + sub_8094554(eventObject, sprite, DIR_NORTH, GetAcroWheeliePedalDirectionAnimNum(DIR_NORTH), 8); + return MovementAction_WalkInPlace_Step1(eventObject, sprite); } -bool8 do_exclamation_mark_bubble_1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieInPlaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); - FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1); - sprite->data[2] = 1; - return TRUE; + sub_8094554(eventObject, sprite, DIR_WEST, GetAcroWheeliePedalDirectionAnimNum(DIR_WEST), 8); + return MovementAction_WalkInPlace_Step1(eventObject, sprite); } -bool8 do_exclamation_mark_bubble_2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieInPlaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); - FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_2); - sprite->data[2] = 1; - return TRUE; + sub_8094554(eventObject, sprite, DIR_EAST, GetAcroWheeliePedalDirectionAnimNum(DIR_EAST), 8); + return MovementAction_WalkInPlace_Step1(eventObject, sprite); } -bool8 do_heart_bubble(struct EventObject *eventObject, struct Sprite *sprite) +void sub_80960C8(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) { - EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); - FieldEffectStart(FLDEFF_HEART_ICON); - sprite->data[2] = 1; - return TRUE; + npc_apply_direction(eventObject, sprite, direction, speed); + StartSpriteAnim(sprite, GetAcroWheelieDirectionAnimNum(eventObject->facingDirection)); + SeekSpriteAnim(sprite, 0); } -bool8 sub_8095548(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - if (eventObject->movementType == 0x3F) - { - sub_80B4578(eventObject); - return FALSE; - } - if (eventObject->movementType != 0x39 && eventObject->movementType != 0x3A) - { - sprite->data[2] = 2; - return TRUE; - } - sub_8155D78(eventObject); - sprite->data[2] = 1; - return sub_809558C(eventObject, sprite); + sub_80960C8(eventObject, sprite, DIR_SOUTH, 1); + return MovementAction_AcroPopWheelieMoveDown_Step1(eventObject, sprite); } -bool8 sub_809558C(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - if (sub_8155DA0(eventObject)) + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5628,211 +7294,156 @@ bool8 sub_809558C(struct EventObject *eventObject, struct Sprite *sprite) return FALSE; } -bool8 sub_80955AC(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - obj_anim_image_set_and_seek(sprite, 1, 0); - sprite->data[2] = 1; - return FALSE; + sub_80960C8(eventObject, sprite, DIR_NORTH, 1); + return MovementAction_AcroPopWheelieMoveUp_Step1(eventObject, sprite); } -bool8 sub_80955C8(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - if (sub_80979BC(sprite)) + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) { - SetEventObjectStepTimer(sprite, 32); sprite->data[2] = 2; + return TRUE; } return FALSE; } -bool8 sub_80955EC(struct EventObject *eventObject, struct Sprite *sprite) -{ - eventObject->invisible ^= TRUE; - if (RunEventObjectStepTimer(sprite)) - { - eventObject->invisible = TRUE; - sprite->data[2] = 3; - } - return FALSE; -} - -bool8 sub_8095628(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - obj_anim_image_set_and_seek(sprite, 1, 0); - sprite->data[2] = 1; - return FALSE; + sub_80960C8(eventObject, sprite, DIR_WEST, 1); + return MovementAction_AcroPopWheelieMoveLeft_Step1(eventObject, sprite); } -bool8 sub_8095644(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - if (sub_80979BC(sprite)) + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) { - SetEventObjectStepTimer(sprite, 32); sprite->data[2] = 2; + return TRUE; } return FALSE; } -bool8 sub_8095668(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - eventObject->invisible ^= TRUE; - if (RunEventObjectStepTimer(sprite)) - { - eventObject->invisible = TRUE; - sprite->data[2] = 3; - } - return FALSE; + sub_80960C8(eventObject, sprite, DIR_EAST, 1); + return MovementAction_AcroPopWheelieMoveRight_Step1(eventObject, sprite); } -bool8 sub_80956A4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - eventObject->fixedPriority = TRUE; - sprite->data[2] = 1; - return TRUE; + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; } -bool8 sub_80956B4(struct EventObject *eventObject, struct Sprite *sprite) +void sub_8096200(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) { - eventObject->fixedPriority = FALSE; - sprite->data[2] = 1; - return TRUE; + npc_apply_direction(eventObject, sprite, direction, speed); + npc_apply_anim_looping(eventObject, sprite, GetAcroWheeliePedalDirectionAnimNum(eventObject->facingDirection)); } -bool8 sub_80956C4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - sprite->oam.affineMode = 3; - InitSpriteAffineAnim(sprite); - sprite->affineAnimPaused = TRUE; - sprite->subspriteMode = 0; - return TRUE; + sub_8096200(eventObject, sprite, DIR_SOUTH, 1); + return MovementAction_AcroWheelieMoveDown_Step1(eventObject, sprite); } -bool8 sub_80956F4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - FreeOamMatrix(sprite->oam.matrixNum); - sprite->oam.affineMode = 0; - CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode); - return TRUE; + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; } -bool8 sub_8095724(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - eventObject->unk3_3 = TRUE; - return TRUE; + sub_8096200(eventObject, sprite, DIR_NORTH, 1); + return MovementAction_AcroWheelieMoveUp_Step1(eventObject, sprite); } -bool8 sub_8095730(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - eventObject->unk3_3 = FALSE; - return TRUE; + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; } -#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;\ -}\ - -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) - -static void sub_80958C0(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +bool8 MovementAction_AcroWheelieMoveLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - EventObjectSetDirection(eventObject, direction); - npc_coords_shift_still(eventObject); - obj_npc_animation_step(eventObject, sprite, sub_80929FC(direction)); - sprite->animPaused = TRUE; - sprite->data[2] = 1; + sub_8096200(eventObject, sprite, DIR_WEST, 1); + return MovementAction_AcroWheelieMoveLeft_Step1(eventObject, sprite); } -bool8 sub_8095900(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - sub_80958C0(eventObject, sprite, DIR_SOUTH); - return TRUE; + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; } -bool8 sub_8095910(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - sub_80958C0(eventObject, sprite, DIR_NORTH); - return TRUE; + sub_8096200(eventObject, sprite, DIR_EAST, 1); + return MovementAction_AcroWheelieMoveRight_Step1(eventObject, sprite); } -bool8 sub_8095920(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - sub_80958C0(eventObject, sprite, DIR_WEST); - return TRUE; + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; } -bool8 sub_8095930(struct EventObject *eventObject, struct Sprite *sprite) +void sub_8096330(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) { - sub_80958C0(eventObject, sprite, DIR_EAST); - return TRUE; + npc_apply_direction(eventObject, sprite, direction, speed); + StartSpriteAnim(sprite, GetAcroEndWheelieDirectionAnimNum(eventObject->facingDirection)); + SeekSpriteAnim(sprite, 0); } -#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;\ -} - -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) - -void sub_8095AF0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - sub_8097750(sprite); - sprite->animPaused = FALSE; + sub_8096330(eventObject, sprite, DIR_SOUTH, 1); + return MovementAction_AcroEndWheelieMoveDown_Step1(eventObject, sprite); } -bool8 sub_8095B0C(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - if (sub_8097758(sprite)) + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) { - npc_coords_shift_still(eventObject); - eventObject->triggerGroundEffectsOnStop = TRUE; - sprite->animPaused = TRUE; + sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 sub_8095B44(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - sub_8095AF0(eventObject, sprite); - sprite->data[2] = 1; - return sub_8095B64(eventObject, sprite); + sub_8096330(eventObject, sprite, DIR_NORTH, 1); + return MovementAction_AcroEndWheelieMoveUp_Step1(eventObject, sprite); } -bool8 sub_8095B64(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - if (sub_8095B0C(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5840,103 +7451,76 @@ bool8 sub_8095B64(struct EventObject *eventObject, struct Sprite *sprite) return FALSE; } -void sub_8095B84(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a4) +bool8 MovementAction_AcroEndWheelieMoveLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - sub_8093FC4(eventObject, sprite, direction, speed, a4); - StartSpriteAnimIfDifferent(sprite, sub_80929BC(direction)); - DoShadowFieldEffect(eventObject); + sub_8096330(eventObject, sprite, DIR_WEST, 1); + return MovementAction_AcroEndWheelieMoveLeft_Step1(eventObject, sprite); } -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) - -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) - -void sub_80960C8(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) +bool8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - npc_apply_direction(eventObject, sprite, direction, speed); - StartSpriteAnim(sprite, sub_80929BC(eventObject->facingDirection)); - SeekSpriteAnim(sprite, 0); + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; } -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) - -void sub_8096200(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) +bool8 MovementAction_AcroEndWheelieMoveRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - npc_apply_direction(eventObject, sprite, direction, speed); - npc_apply_anim_looping(eventObject, sprite, sub_80929FC(eventObject->facingDirection)); + sub_8096330(eventObject, sprite, DIR_EAST, 1); + return MovementAction_AcroEndWheelieMoveRight_Step1(eventObject, sprite); } -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) - -void sub_8096330(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) +bool8 MovementAction_AcroEndWheelieMoveRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - npc_apply_direction(eventObject, sprite, direction, speed); - StartSpriteAnim(sprite, sub_80929DC(eventObject->facingDirection)); - SeekSpriteAnim(sprite, 0); + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; } -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_Levitate_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - sub_8097FA4(eventObject); + 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 f4d9550a3..d7063bd89 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 4ad3bd916..00814192e 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 a5058b363..39977808f 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 2044a8c87..96f63ee3e 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 5b92b8023..1e4116053 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 60447f641..cdc1064dd 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 e3edb5abf..4e3fceb10 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 27280addf..9fee9e060 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 cf47bbe2a..f5e9c300e 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 17fe48f70..7ea9bef79 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" -- cgit v1.2.3 From e01dd90bb36f850fe88f2b1edae65c74b3bc48b1 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 13 Jun 2018 18:19:19 -0500 Subject: 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 +- .../maps/BattleFrontier_BattleArenaBattleRoom.inc | 84 +-- .../maps/BattleFrontier_BattleArenaCorridor.inc | 90 +-- .../maps/BattleFrontier_BattleArenaLobby.inc | 82 +-- .../maps/BattleFrontier_BattleDomeBattleRoom.inc | 416 +++++------ .../maps/BattleFrontier_BattleDomeCorridor.inc | 158 ++-- .../maps/BattleFrontier_BattleDomeLobby.inc | 20 +- .../BattleFrontier_BattleDomePreBattleRoom.inc | 18 +- .../BattleFrontier_BattleFactoryBattleRoom.inc | 34 +- .../maps/BattleFrontier_BattleFactoryLobby.inc | 16 +- .../BattleFrontier_BattleFactoryPreBattleRoom.inc | 76 +- .../maps/BattleFrontier_BattlePalaceBattleRoom.inc | 126 ++-- .../maps/BattleFrontier_BattlePalaceCorridor.inc | 62 +- .../maps/BattleFrontier_BattlePalaceLobby.inc | 12 +- .../maps/BattleFrontier_BattlePikeCorridor.inc | 18 +- .../maps/BattleFrontier_BattlePikeLobby.inc | 8 +- .../maps/BattleFrontier_BattlePikeRandomRoom1.inc | 136 ++-- .../maps/BattleFrontier_BattlePikeRandomRoom2.inc | 4 +- .../BattleFrontier_BattlePikeThreePathRoom.inc | 26 +- .../maps/BattleFrontier_BattlePyramidLobby.inc | 38 +- .../maps/BattleFrontier_BattlePyramidTop.inc | 28 +- .../maps/BattleFrontier_BattleTowerBattleRoom.inc | 100 +-- .../maps/BattleFrontier_BattleTowerBattleRoom2.inc | 72 +- .../maps/BattleFrontier_BattleTowerCorridor.inc | 18 +- .../maps/BattleFrontier_BattleTowerCorridor2.inc | 74 +- .../maps/BattleFrontier_BattleTowerElevator.inc | 24 +- .../maps/BattleFrontier_BattleTowerLobby.inc | 28 +- .../BattleFrontier_BattleTowerMultiBattleRoom.inc | 58 +- data/scripts/maps/BattleFrontier_OutsideEast.inc | 30 +- data/scripts/maps/BattleFrontier_OutsideWest.inc | 16 +- data/scripts/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 +- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 82 +-- data/scripts/maps/EverGrandeCity_HallOfFame.inc | 22 +- .../maps/EverGrandeCity_PokemonCenter_1F.inc | 24 +- .../maps/EverGrandeCity_PokemonLeague_1F.inc | 20 +- .../maps/FallarborTown_BattleTentBattleRoom.inc | 52 +- .../maps/FallarborTown_BattleTentCorridor.inc | 14 +- .../scripts/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 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 216 +++--- .../scripts/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 +- .../maps/LilycoveCity_PokemonTrainerFanClub.inc | 40 +- data/scripts/maps/LittlerootTown.inc | 298 ++++---- .../maps/LittlerootTown_BrendansHouse_1F.inc | 110 +-- .../maps/LittlerootTown_BrendansHouse_2F.inc | 136 ++-- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 110 +-- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 138 ++-- .../maps/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 +- data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc | 20 +- data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc | 56 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 24 +- data/scripts/maps/MtChimney.inc | 378 +++++----- data/scripts/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 ++-- .../maps/Route110_SeasideCyclingRoadEntrance1.inc | 2 +- .../maps/Route110_SeasideCyclingRoadEntrance2.inc | 2 +- data/scripts/maps/Route110_TrickHouseEnd.inc | 4 +- data/scripts/maps/Route110_TrickHouseEntrance.inc | 34 +- data/scripts/maps/Route110_TrickHousePuzzle5.inc | 150 ++-- data/scripts/maps/Route111.inc | 34 +- data/scripts/maps/Route112_CableCarStation.inc | 32 +- data/scripts/maps/Route116.inc | 74 +- data/scripts/maps/Route118.inc | 68 +- data/scripts/maps/Route119.inc | 136 ++-- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 46 +- data/scripts/maps/Route120.inc | 4 +- data/scripts/maps/Route121.inc | 48 +- data/scripts/maps/Route121_SafariZoneEntrance.inc | 34 +- data/scripts/maps/Route128.inc | 120 +-- data/scripts/maps/RustboroCity.inc | 230 +++--- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 108 +-- data/scripts/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 ++--- .../maps/SlateportCity_BattleTentBattleRoom.inc | 18 +- .../maps/SlateportCity_BattleTentCorridor.inc | 28 +- .../scripts/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 +- .../maps/SootopolisCity_MysteryEventsHouse_1F.inc | 32 +- .../maps/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 +- .../maps/VerdanturfTown_BattleTentBattleRoom.inc | 30 +- .../maps/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 5a810c497..99b5c8f84 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 8fc2939c6..ce2490579 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 841a9935c..ec9ddb86a 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 9a34d2e61..523aa67ca 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 a6a0ebcc2..6a13f39ba 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 07ed1b82d..d9b8a89ac 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 44631cc20..df25056ea 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 0cf683bb8..5a03a0e98 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 ccf8997d7..fd3868512 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 2f952936f..27ea23b59 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 cecd5b44c..83b602fc4 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 68ac57fcd..7a0695445 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 52981a07d..c46358aed 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 ad6204fd5..6a97382d4 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 35bf3f5a6..b08d0ca89 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 f3693e179..d19b4b999 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 bd76e111d..cdfd6edd6 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 640e96b4d..4f2dea343 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 93a5f2caf..875a3a220 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 5aff5ad81..07ccbe79d 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 91fb31ad3..89697ff33 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 067e18fa2..a5cb11081 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 5293b6cfa..4171da314 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 0cee28347..74bdb1d78 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 bcaa7dfe1..fd5fd81e0 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 14f543284..39045c317 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 6952412f2..6bef7ba12 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 2862722ce..e92c8d97f 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 05cee99b9..9d83ab4e0 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 63306af2a..087752d8f 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 f22b0de26..81c2dd563 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 a1dfa2abc..ef1102175 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 af2c67eac..39157609e 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 095e75394..433d8e181 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 9f2099b32..d899b1cbe 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 e6c99541d..c1d3534d3 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 bf0d3ff16..dff56322a 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 f5886bfff..fa2ff7e36 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 eca861f85..ec38c3e9d 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 6fd637461..b2427e95d 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 f78d4ea15..1edc1407d 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 4d4c3732d..37122a640 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 71410a43f..bed242a2b 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 de29dca0f..60f0dd1ad 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 a9e27ec73..ed6e6a497 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 4fd73b3bf..f1a6ce17f 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 f6750009d..48703897e 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 1325b0332..f1d3024c0 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 327221120..1bde88e7d 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 1cc3999f7..15f5d2b9e 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 42b18983f..e7d67431d 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 0b4b71c2b..4a28a180b 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 521e99021..27ead9ec2 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 9d61bc1a5..b057a0548 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 8a8e2baed..5670d9b6e 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 1c4d21970..1f65b88fd 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 5f2b79a5d..3468299a9 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 f57ca14b5..6357326c1 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 8103a623c..507997416 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 97dba4704..6b4f0f3da 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 cdcef8e9a..74146fc7e 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 0fcdc46d5..67b1f9381 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 0f3fa1a0e..53825a84c 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 a5223d38a..429c933fc 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 e0229b9ea..9fc2fe53e 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 f300b5849..5501f5ad5 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 c7d968d78..75b83b6a1 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 cb0580580..0cc0fea56 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 c8e7c6fad..9c821e14f 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 40578a907..abb527d7f 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 50b218f04..b786dc961 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 4e8531a4e..8cce8efeb 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 972d5f4e8..bb6bfd9de 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 7707690fb..c61f74d99 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 8fc55295f..2edf6d251 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 cee99c4d5..52d01db6c 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 fb2665e8b..14d0cd5c7 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 b4825579c..28135bb1e 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 1dd9c2725..b6c2118db 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 fed63f0e0..fe39e9d48 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 c05d32088..67ddbc373 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 3c075cad0..32bca3703 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 c297d61a7..891b5a25a 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 2751e345e..663165611 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 907f07623..7c9a1ae49 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 4d4334aca..c2807d50b 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 d71ec729c..8bf597902 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 314b47e1d..a432f0d94 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 123f78db1..b1ac87e30 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 9d00303c9..40d6a2e69 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 5087d304c..9579df56c 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 97e7452ec..499969d6e 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 b8db4697b..a2997a49b 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 4bf7eb10a..5e03fa165 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 cd14f0060..3bdf93b12 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 37d77d095..094a52895 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 72c003d99..94e442a48 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 a8d73397c..68a32c3b5 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 27a2539e1..818111b81 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 41e0fbbfe..a4b6a5fb1 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 0bd6c12f2..b2341bf3d 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 461823e47..7d6876aeb 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 d579401b8..f133ffe56 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 1369b5721..0e9cf9636 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 f62f78404..8e2742ff5 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 f8426a7eb..5e323211a 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 9547fbd67..ffc2614cb 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 46887b9c6..f5030facd 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 52dca4c95..5e42be78d 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 ad10e2669..6d83c8841 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 4be06d00b..239a2efda 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 a2247286c..e8f6323c1 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 cced073aa..e9fbf4ad6 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 a2ea5ed1d..334acc8ac 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 fe7cfc0fd..d860e6e7c 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 4c5aa0371..d79849a6c 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 47ca641ce..7446c1002 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 6353856e3..187ed0751 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 a66e0e6d9..ca6ab50b5 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 ba8575c66..4464ee582 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 a7a24757f..4172c47ef 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 6dac80f4b..6a26ee0ff 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 6a53dc57c..02ac01f2b 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 54ade5181..8d6b4631f 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 5a4a09735..142a8e70e 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 8784a6424..bf57aa9ce 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 f78f938ca..432667cc9 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 be532733d..5152f85cf 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 7886f91b8..155c31877 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 6dc934f3c..84543ff2b 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 24c319337..d7233a3aa 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 0d0470fc1..96bd1f114 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 85c5f33c7..468a34991 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 4dd00035a..2ed1c6baf 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 8f8d493f8..734831f7f 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 9d4aa80b6..9c4b46ae2 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 c75fb9b48..76a4ee8f1 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 -- cgit v1.2.3 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: 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 ebdea4b86..aaa05bcc8 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"); -- cgit v1.2.3 From acc1a5d4461476567facf08ee0fa64e28cdd3c76 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 14 Jun 2018 22:00:09 -0500 Subject: 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 + .../BattleFrontier_OutsideEast/connections.inc | 2 +- .../BattleFrontier_OutsideWest/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 +- data/maps/SafariZone_Northeast/connections.inc | 4 +- data/maps/SafariZone_Northwest/connections.inc | 4 +- data/maps/SafariZone_South/connections.inc | 6 +- data/maps/SafariZone_Southeast/connections.inc | 4 +- data/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 +- data/maps/events/AbandonedShip_CaptainsOffice.inc | 4 +- data/maps/events/AbandonedShip_Corridors_1F.inc | 24 +- data/maps/events/AbandonedShip_Corridors_B1F.inc | 16 +- data/maps/events/AbandonedShip_Deck.inc | 10 +- .../events/AbandonedShip_HiddenFloorCorridors.inc | 12 +- .../maps/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 +- data/maps/events/AbandonedShip_Underwater1.inc | 4 +- data/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 +- .../events/BattleFrontier_BattleArenaLobby.inc | 2 +- .../events/BattleFrontier_BattleDomeCorridor.inc | 4 +- .../maps/events/BattleFrontier_BattleDomeLobby.inc | 4 +- .../BattleFrontier_BattleDomePreBattleRoom.inc | 4 +- .../events/BattleFrontier_BattleFactoryLobby.inc | 4 +- .../BattleFrontier_BattlePalaceBattleRoom.inc | 4 +- .../events/BattleFrontier_BattlePalaceCorridor.inc | 8 +- .../events/BattleFrontier_BattlePalaceLobby.inc | 6 +- .../maps/events/BattleFrontier_BattlePikeLobby.inc | 6 +- ...leFrontier_BattlePointExchangeServiceCorner.inc | 6 +- .../events/BattleFrontier_BattlePyramidLobby.inc | 2 +- .../BattleFrontier_BattleTowerBattleRoom.inc | 4 +- .../events/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 +- data/maps/events/BattleFrontier_OutsideEast.inc | 28 +- data/maps/events/BattleFrontier_OutsideWest.inc | 22 +- .../events/BattleFrontier_PokemonCenter_1F.inc | 6 +- .../events/BattleFrontier_PokemonCenter_2F.inc | 6 +- data/maps/events/BattleFrontier_RankingHall.inc | 4 +- data/maps/events/BattleFrontier_ReceptionGate.inc | 4 +- data/maps/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 +- .../events/CaveOfOrigin_UnusedRubySapphireMap1.inc | 4 +- .../events/CaveOfOrigin_UnusedRubySapphireMap2.inc | 4 +- .../events/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 +- data/maps/events/DewfordTown_PokemonCenter_1F.inc | 6 +- data/maps/events/DewfordTown_PokemonCenter_2F.inc | 6 +- data/maps/events/DoubleBattleColosseum.inc | 8 +- data/maps/events/EverGrandeCity.inc | 8 +- data/maps/events/EverGrandeCity_ChampionsRoom.inc | 4 +- data/maps/events/EverGrandeCity_DrakesRoom.inc | 4 +- data/maps/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 +- data/maps/events/EverGrandeCity_HallOfFame.inc | 2 +- data/maps/events/EverGrandeCity_PhoebesRoom.inc | 4 +- .../events/EverGrandeCity_PokemonCenter_1F.inc | 6 +- .../events/EverGrandeCity_PokemonCenter_2F.inc | 6 +- .../events/EverGrandeCity_PokemonLeague_1F.inc | 10 +- .../events/EverGrandeCity_PokemonLeague_2F.inc | 6 +- data/maps/events/EverGrandeCity_SidneysRoom.inc | 4 +- data/maps/events/FallarborTown.inc | 10 +- data/maps/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 +- .../maps/events/FallarborTown_PokemonCenter_1F.inc | 6 +- .../maps/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 +- data/maps/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 +- data/maps/events/FortreeCity_PokemonCenter_1F.inc | 6 +- data/maps/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 +- .../maps/events/LavaridgeTown_PokemonCenter_1F.inc | 8 +- .../maps/events/LavaridgeTown_PokemonCenter_2F.inc | 6 +- data/maps/events/LilycoveCity.inc | 28 +- data/maps/events/LilycoveCity_ContestHall.inc | 8 +- data/maps/events/LilycoveCity_ContestLobby.inc | 8 +- data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc | 6 +- data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc | 2 +- .../LilycoveCity_DepartmentStoreElevator.inc | 4 +- .../events/LilycoveCity_DepartmentStoreRooftop.inc | 2 +- .../events/LilycoveCity_DepartmentStore_1F.inc | 8 +- .../events/LilycoveCity_DepartmentStore_2F.inc | 6 +- .../events/LilycoveCity_DepartmentStore_3F.inc | 6 +- .../events/LilycoveCity_DepartmentStore_4F.inc | 6 +- .../events/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 +- .../maps/events/LilycoveCity_LilycoveMuseum_1F.inc | 6 +- .../maps/events/LilycoveCity_LilycoveMuseum_2F.inc | 2 +- .../maps/events/LilycoveCity_MoveDeletersHouse.inc | 4 +- data/maps/events/LilycoveCity_PokemonCenter_1F.inc | 6 +- data/maps/events/LilycoveCity_PokemonCenter_2F.inc | 6 +- .../events/LilycoveCity_PokemonTrainerFanClub.inc | 4 +- data/maps/events/LilycoveCity_UnusedMart.inc | 4 +- data/maps/events/LittlerootTown.inc | 6 +- .../events/LittlerootTown_BrendansHouse_1F.inc | 6 +- .../events/LittlerootTown_BrendansHouse_2F.inc | 2 +- data/maps/events/LittlerootTown_MaysHouse_1F.inc | 6 +- data/maps/events/LittlerootTown_MaysHouse_2F.inc | 2 +- .../events/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 +- data/maps/events/MauvilleCity_PokemonCenter_1F.inc | 6 +- data/maps/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 +- data/maps/events/MossdeepCity_GameCorner_1F.inc | 6 +- data/maps/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 +- data/maps/events/MossdeepCity_PokemonCenter_1F.inc | 6 +- data/maps/events/MossdeepCity_PokemonCenter_2F.inc | 6 +- data/maps/events/MossdeepCity_SpaceCenter_1F.inc | 6 +- data/maps/events/MossdeepCity_SpaceCenter_2F.inc | 2 +- data/maps/events/MossdeepCity_StevensHouse.inc | 4 +- data/maps/events/MtChimney.inc | 8 +- data/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 +- data/maps/events/OldaleTown_PokemonCenter_1F.inc | 6 +- data/maps/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 +- .../events/PacifidlogTown_PokemonCenter_1F.inc | 6 +- .../events/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 +- .../maps/events/PetalburgCity_PokemonCenter_1F.inc | 6 +- .../maps/events/PetalburgCity_PokemonCenter_2F.inc | 6 +- data/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 +- .../maps/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 +- data/maps/events/Route110_TrickHouseCorridor.inc | 8 +- data/maps/events/Route110_TrickHouseEnd.inc | 4 +- data/maps/events/Route110_TrickHouseEntrance.inc | 6 +- data/maps/events/Route110_TrickHousePuzzle1.inc | 6 +- data/maps/events/Route110_TrickHousePuzzle2.inc | 6 +- data/maps/events/Route110_TrickHousePuzzle3.inc | 6 +- data/maps/events/Route110_TrickHousePuzzle4.inc | 6 +- data/maps/events/Route110_TrickHousePuzzle5.inc | 6 +- data/maps/events/Route110_TrickHousePuzzle6.inc | 6 +- data/maps/events/Route110_TrickHousePuzzle7.inc | 26 +- data/maps/events/Route110_TrickHousePuzzle8.inc | 6 +- data/maps/events/Route111.inc | 10 +- data/maps/events/Route111_OldLadysRestStop.inc | 4 +- .../maps/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 +- data/maps/events/Route114_FossilManiacsHouse.inc | 6 +- data/maps/events/Route114_FossilManiacsTunnel.inc | 6 +- data/maps/events/Route114_LanettesHouse.inc | 4 +- data/maps/events/Route115.inc | 6 +- data/maps/events/Route116.inc | 10 +- data/maps/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 +- data/maps/events/Route119_WeatherInstitute_1F.inc | 6 +- data/maps/events/Route119_WeatherInstitute_2F.inc | 2 +- data/maps/events/Route120.inc | 4 +- data/maps/events/Route121.inc | 2 +- data/maps/events/Route121_SafariZoneEntrance.inc | 8 +- data/maps/events/Route122.inc | 2 +- data/maps/events/Route123.inc | 2 +- data/maps/events/Route123_BerryMastersHouse.inc | 4 +- data/maps/events/Route124.inc | 2 +- .../events/Route124_DivingTreasureHuntersHouse.inc | 4 +- data/maps/events/Route125.inc | 2 +- data/maps/events/Route131.inc | 2 +- data/maps/events/RustboroCity.inc | 24 +- data/maps/events/RustboroCity_CuttersHouse.inc | 4 +- data/maps/events/RustboroCity_DevonCorp_1F.inc | 6 +- data/maps/events/RustboroCity_DevonCorp_2F.inc | 4 +- data/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 +- data/maps/events/RustboroCity_PokemonCenter_1F.inc | 6 +- data/maps/events/RustboroCity_PokemonCenter_2F.inc | 6 +- data/maps/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 +- data/maps/events/ShoalCave_LowTideEntranceRoom.inc | 8 +- data/maps/events/ShoalCave_LowTideIceRoom.inc | 2 +- data/maps/events/ShoalCave_LowTideInnerRoom.inc | 16 +- data/maps/events/ShoalCave_LowTideLowerRoom.inc | 8 +- data/maps/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 +- data/maps/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 +- .../maps/events/SlateportCity_OceanicMuseum_1F.inc | 6 +- .../maps/events/SlateportCity_OceanicMuseum_2F.inc | 2 +- .../maps/events/SlateportCity_PokemonCenter_1F.inc | 6 +- .../maps/events/SlateportCity_PokemonCenter_2F.inc | 6 +- data/maps/events/SlateportCity_PokemonFanClub.inc | 4 +- .../events/SlateportCity_SternsShipyard_1F.inc | 6 +- .../events/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 +- .../events/SootopolisCity_LotadAndSeedotHouse.inc | 4 +- data/maps/events/SootopolisCity_Mart.inc | 4 +- .../SootopolisCity_MysteryEventsHouse_1F.inc | 6 +- .../SootopolisCity_MysteryEventsHouse_B1F.inc | 2 +- .../events/SootopolisCity_PokemonCenter_1F.inc | 6 +- .../events/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 +- data/maps/events/Underwater_SeafloorCavern.inc | 2 +- data/maps/events/Underwater_SealedChamber.inc | 2 +- data/maps/events/Underwater_SootopolisCity.inc | 4 +- data/maps/events/UnionRoom.inc | 4 +- data/maps/events/VerdanturfTown.inc | 14 +- .../maps/events/VerdanturfTown_BattleTentLobby.inc | 4 +- .../VerdanturfTown_FriendshipRatersHouse.inc | 4 +- data/maps/events/VerdanturfTown_House.inc | 4 +- data/maps/events/VerdanturfTown_Mart.inc | 4 +- .../events/VerdanturfTown_PokemonCenter_1F.inc | 6 +- .../events/VerdanturfTown_PokemonCenter_2F.inc | 6 +- data/maps/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 +- data/scripts/maps/AbandonedShip_Corridors_B1F.inc | 2 +- .../maps/AbandonedShip_HiddenFloorCorridors.inc | 2 +- data/scripts/maps/AbandonedShip_Rooms_B1F.inc | 2 +- data/scripts/maps/AbandonedShip_Underwater1.inc | 2 +- data/scripts/maps/AbandonedShip_Underwater2.inc | 2 +- .../maps/BattleFrontier_BattleArenaBattleRoom.inc | 8 +- .../maps/BattleFrontier_BattleArenaCorridor.inc | 2 +- .../maps/BattleFrontier_BattleArenaLobby.inc | 2 +- .../maps/BattleFrontier_BattleDomeBattleRoom.inc | 10 +- .../maps/BattleFrontier_BattleDomeCorridor.inc | 2 +- .../maps/BattleFrontier_BattleDomeLobby.inc | 2 +- .../BattleFrontier_BattleDomePreBattleRoom.inc | 2 +- .../BattleFrontier_BattleFactoryBattleRoom.inc | 10 +- .../maps/BattleFrontier_BattleFactoryLobby.inc | 2 +- .../BattleFrontier_BattleFactoryPreBattleRoom.inc | 2 +- .../maps/BattleFrontier_BattlePalaceBattleRoom.inc | 10 +- .../maps/BattleFrontier_BattlePalaceCorridor.inc | 2 +- .../maps/BattleFrontier_BattlePalaceLobby.inc | 2 +- .../maps/BattleFrontier_BattlePikeCorridor.inc | 2 +- .../maps/BattleFrontier_BattlePikeLobby.inc | 2 +- .../maps/BattleFrontier_BattlePikeRandomRoom1.inc | 4 +- .../maps/BattleFrontier_BattlePikeRandomRoom2.inc | 2 +- .../maps/BattleFrontier_BattlePikeRandomRoom3.inc | 2 +- .../BattleFrontier_BattlePikeThreePathRoom.inc | 2 +- .../BattleFrontier_BattlePyramidEmptySquare.inc | 6 +- .../maps/BattleFrontier_BattlePyramidLobby.inc | 2 +- .../maps/BattleFrontier_BattlePyramidTop.inc | 2 +- .../maps/BattleFrontier_BattleTowerBattleRoom.inc | 8 +- .../maps/BattleFrontier_BattleTowerBattleRoom2.inc | 2 +- .../maps/BattleFrontier_BattleTowerCorridor.inc | 2 +- .../maps/BattleFrontier_BattleTowerCorridor2.inc | 16 +- .../maps/BattleFrontier_BattleTowerElevator.inc | 8 +- .../maps/BattleFrontier_BattleTowerLobby.inc | 2 +- .../BattleFrontier_BattleTowerMultiBattleRoom.inc | 4 +- data/scripts/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 +- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 2 +- .../maps/FallarborTown_BattleTentBattleRoom.inc | 10 +- .../maps/FallarborTown_BattleTentCorridor.inc | 2 +- .../scripts/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 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 10 +- .../maps/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 +- data/scripts/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 +- data/scripts/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 +- data/scripts/maps/Route110_TrickHouseEntrance.inc | 22 +- data/scripts/maps/Route110_TrickHousePuzzle5.inc | 2 +- data/scripts/maps/Route110_TrickHousePuzzle7.inc | 2 +- data/scripts/maps/Route111.inc | 4 +- data/scripts/maps/Route112_CableCarStation.inc | 2 +- data/scripts/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 +- .../maps/SlateportCity_BattleTentBattleRoom.inc | 10 +- .../maps/SlateportCity_BattleTentCorridor.inc | 2 +- .../scripts/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 +- .../maps/SootopolisCity_MysteryEventsHouse_1F.inc | 2 +- .../maps/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 +- data/scripts/maps/Underwater_SeafloorCavern.inc | 2 +- data/scripts/maps/Underwater_SealedChamber.inc | 4 +- data/scripts/maps/Underwater_SootopolisCity.inc | 2 +- data/scripts/maps/UnknownMap_25_34.inc | 12 +- .../maps/VerdanturfTown_BattleTentBattleRoom.inc | 8 +- .../maps/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 5367ad712..a6f9f2dae 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 5e133bba4..27d554ad0 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 a061d2501..000000000 --- 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 ec9ddb86a..e18dec836 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 228380e7b..31b4b00d2 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 8848ac242..92f5544a1 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 5bc70f3b4..5a2d13f7f 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 2ec2e4348..1d20172f2 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 4386e2295..d03004922 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 a472e456a..830240b07 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 27b654f90..3808099d8 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 08541215c..83b48c0ad 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 c522a3460..0b8181615 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 e19e02829..d5469e561 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 3f8f421f5..0fed8d8e1 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 172a7bc05..ee1f4e72a 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 04a3f0c4b..a1845c04c 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 f6b5336bb..db0232f83 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 fcbdec008..5c84301bf 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 4a75eea3a..96bd6cbce 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 aee630352..f5f35e974 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 7fa2d516f..419cfeec9 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 10d98cec7..0759d872f 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 0486aba98..ce605c828 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 44357db1e..ac03944b7 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 a3b16c452..18f181d2b 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 2e17530d6..04ad13b07 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 1208a2138..f80d0ade2 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 8e1ff175f..25a7a0e91 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 92a12b42a..22000354f 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 8133a0b78..6a57d275e 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 a8d94d710..132c4ff76 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 1ba0cf64c..3067ee23b 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 8569b143f..760c2ddc0 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 3f283eb91..4518e31fa 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 e037bff3b..fef193c0f 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 ab64dd3b6..2780eac5a 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 fe473be52..8069f036e 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 20dd27498..4987e049e 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 f05e65739..c599e6a2c 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 47d55b65d..94116a03e 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 2d6f53859..2a0442a05 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 ef10fb974..616c365ef 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 72e358f4c..ed10daab9 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 1abbf0979..2b5f944c9 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 c2beee1d8..b1f0f6d81 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 2b4136c3c..3ad7057a3 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 5355677de..5b2f0665d 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 f373faff2..1293e8235 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 f4972fa38..b977d43bc 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 4470802dd..150ea7023 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 0e18aa2f2..5a70e3471 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 b133d8804..1f22ea960 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 8429378e4..861c82b4d 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 01e5aff35..dbca1662d 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 c2052ea07..d99826f0d 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 c23dd3e4c..c762c485a 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 9a466f082..010a13cc2 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 79ba1a010..856bb30ab 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 4855182e9..16b39e87b 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 936a1dc82..83398e3a3 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 d8544954a..1485b313b 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 6215c5e88..b0b1aa108 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 20ef02321..11df3eaec 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 30ab15908..db8b0947b 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 61880749b..8a63d54a4 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 6eafa49d6..15a3322ed 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 4d2960b36..432ab625f 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 16d0e47e5..82803997c 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 0e2abd0af..de6fdface 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 ddfab5eab..c66185abf 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 c3cf0f54d..60e5a0f4f 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 8903de197..7fb31aca0 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 ca01ccec8..289f917af 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 3bff54076..fd5cb4ac8 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 27756e5a3..239d6a455 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 67411fcf9..10bcc33dd 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 4791919f6..18b2b031d 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 e28a2ed5b..4bd68449c 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 fe9b6f7da..a3b61b7e9 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 631b33746..03690b801 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 a92bed422..5c9af3c10 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 de84626f3..f06c21b2a 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 296076932..898038715 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 a0bde74e3..31d31ccbc 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 d5b9f17d6..6e4ef5068 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 c1b2f36b7..1ad010c28 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 54ef390fd..9cfd51a10 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 e5899ef05..e6752fc3a 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 af24f4b4a..e91c3211f 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 3add19881..9c7d333a0 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 9b3f387b1..34f39fa0e 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 59605010f..c91db7429 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 82da39a63..be18e491a 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 8d514f8a0..322a2e66e 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 b5fc13838..520f92838 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 2b6f7f251..a605a89ea 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 318ac3c49..a333fa100 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 6def28528..e9aa08917 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 63e7f2acd..8dce267b4 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 fccb4abff..0fc086feb 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 af9677524..bea8a6484 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 2faa6a413..34c808268 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 b00838290..a026f1734 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 0370b2a18..a04ee9bec 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 6349cd381..529e42c66 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 2076facee..5bdfa4e12 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 a8e5f97f5..1d68986cc 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 be0db4f08..12853012e 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 b4e6cc5eb..bfe0ae7e8 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 99aa3333c..be16a6107 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 7c478fabe..5e294b384 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 969b54855..495be5f63 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 3d7c53493..62423b9c1 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 7923af813..60f10c8b5 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 262744ce1..79b37aead 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 f9d9d408a..f94c24b00 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 81058b042..bfe61cda1 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 8984c44a0..aca73394c 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 4ea329ab9..5e9ff1912 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 1d6238e8f..e61935ebe 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 bb2d6036d..fe4a55b25 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 8dfdb78d0..bdc629846 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 148bb22a6..1c951f240 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 96946936b..5a5ad59f7 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 f60a5e1a2..c9eeaff22 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 256b6179e..c8e9bbeeb 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 87a99e5d2..953eef558 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 2253dec67..510a18998 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 deb440ff9..ea53189ad 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 8bb897125..9d2c34dc9 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 8d7a8e460..f5a4452bb 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 c4b6600ec..39f4fad75 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 72b63dff3..887165b82 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 901046cbc..9cacd146d 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 f61966b88..ab2f8c74a 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 7098e6ed8..b2147e4f0 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 d1d4f0fef..f28e9e3e1 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 fb471b4ff..b8ca9eea4 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 269645dc6..6318c7bb7 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 761e321d6..823965d78 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 a8632b8c1..dd2e33d52 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 8f9e791a8..3351b42e0 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 c9426ceea..e3eacab10 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 68f506d00..e44182b4f 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 4e7c4f7e6..b2d011234 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 69fa9a629..687920b71 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 0d75ef553..671c31224 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 dd09ad4a1..0a8d48d29 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 a758c4d73..745c23309 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 bbedf59d2..19741159a 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 a19984ea2..129de15cc 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 6b85a2fb0..3e453781a 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 93d9a879e..295633242 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 e9fb7579c..abe98828c 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 e261f185f..cdc525c0a 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 b3975685c..42f5e1950 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 d809bf493..853aa5d2b 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 762db16f9..fee24d963 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 e6c91a736..1be0bd783 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 6ddb7e9c9..c72ccf88a 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 27d98189e..2c6a007bf 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 d74eb9d8f..5d41d11d1 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 3b68b1292..6979786aa 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 517d32d53..cb9e70e07 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 6b7e0f39d..7abb73fed 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 a06882772..3f8e8d634 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 abaae2d40..754758c5c 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 513097503..742688c1d 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 1b788cbe2..13d1e079e 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 a4050a5f6..3c6886e3c 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 b6bf34354..7849df43e 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 df4877663..450007097 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 b6b8cfdce..e2555bd2c 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 c8f2356c4..b03f27efa 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 ed546c8df..d14cf38ca 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 7f4e67f33..f393dd720 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 7c484e9a9..776520196 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 65b343202..26233c0d7 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 4cf23e63d..60d8fc7bd 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 da1f94173..71d94e0cd 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 5d970924d..fa6dabcff 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 658056768..7419f67d6 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 501cab67f..784b7b857 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 af1f166ce..88dae4c5e 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 9fa4c6376..939a8752e 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 669728b66..c97aea86a 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 5230cead9..77f372aa2 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 8ebf9f16a..07ca2e7c0 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 53fc2b2cc..27d0f6fec 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 c7578bec3..5020993d8 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 c450b0cd3..615f2682c 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 c6e900a18..b183b4f16 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 d3e5374ff..77d075034 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 60016ffbf..48aae9c0c 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 d9d6b469e..ef97e90c6 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 7a234183d..095b201d9 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 ad7d79ac5..0a8bd70b8 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 29169a491..9356a7ae0 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 ff372e132..a26dc39d2 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 ba97f6a98..dd5a87e99 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 85a6e871a..63ddcdb35 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 d12e31646..0f786ca84 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 f4bef7d8b..64ad5ea1b 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 36f9f50b2..037b195ad 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 f7b2e561b..25d2cb333 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 ebf845f91..7556d0092 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 297db7979..6780d3f18 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 3e85e20a1..e95ec1075 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 3f89c8aa9..83fbf0288 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 741866843..fb2e41948 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 b8bd67368..6522dc799 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 427d8bc42..476a6ebab 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 9affe49bd..0481a1c0b 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 7a2ed7c9f..d4388bc33 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 f97d49985..e5320f071 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 d7733b800..0ed661234 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 ccee2d442..2ceb34c8e 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 40d0f45dc..121c6164b 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 7930d0f63..bbae39ce8 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 d590a6c98..8462b4731 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 eb2cca275..1073518f2 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 7d8fb6808..e27fc5dc1 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 3795ef568..ca379a0c7 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 4d95b38c0..baf535984 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 f653cb151..e643a1c3f 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 b662de7d9..e40619a49 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 221775788..808f1b7da 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 b9f6bb020..199465a69 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 e00290acb..4db3e1ddc 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 6d89267c6..a73145ae2 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 0252834f4..cd4f43bb3 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 57e34caad..18e12ac65 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 c493d4b8b..0a931723e 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 1a1f241b5..b3ff72929 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 a51483770..d96a2cd5d 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 866c0c311..bc22e5bb0 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 b8b7ed7d6..fc76f6b76 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 9e8de4b75..f22b9f057 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 76eb4f6dd..2e6195b60 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 1a85565fa..3561e7c5e 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 410dd90c0..039f316d9 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 454946506..92d60a60a 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 e66dda119..9a2556e8a 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 5bf9568bb..f35ce6d2a 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 07814433a..fdbafbe06 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 fe6a0f73f..062a137fc 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 4d07ff4c3..848eeb88e 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 a5dfb9df9..531fb141b 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 cbcb8b76f..a271897b7 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 a043926a7..2955da0b0 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 2a152d8f6..23951059d 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 bddde5c81..6342bcc55 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 e8e120c77..9596aa7bd 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 5fec469e8..19933fb6a 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 923bbe86d..fc7203950 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 c8bbd0a41..91811e9e9 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 17052105d..7c8b8b702 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 13a189b51..4fa7dff99 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 8352fe02c..d3b27947a 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 ac3bc8c7a..e2f778bec 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 4d9658312..2b0562d34 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 e4eeb764d..a26025830 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 1c791072c..e519d5281 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 aedb94c2f..99e6e88d2 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 d75442cd6..89e8dd553 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 e52cd546b..a60b1cec0 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 1804f4615..4cb8ccd6f 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 ce7851f62..4bd96526e 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 b271e116c..b160f4896 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 a45d2ec2e..446e04072 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 696d9ead3..e2512c586 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 541b11fca..e83d221dd 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 af7cffea3..ae5c36cf1 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 b644f47ad..3a6045215 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 dfa088f49..7441539c9 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 723bc8934..20dabdfaf 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 9f5148611..e50f6fe23 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 df8981e2a..500d38e9b 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 c32dc9500..077367747 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 35191f0ba..83f7ce9a6 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 a55307cfa..38bef10e8 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 7816eb358..e3843e759 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 20e7ac6cd..805e399b4 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 eea34db90..505a6ed6d 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 9d470a864..ee45485a7 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 57a6d5a6e..66bbf376f 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 4e3f5a801..869dc0f08 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 21102a474..04b452b4e 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 34e93223f..65618f8ea 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 292278a85..fd0741a6a 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 55c4b4315..bd142b997 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 c67cc7b17..9491e5dac 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 c1091ae52..3d81f1523 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 876841b6d..29f46af20 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 141fd04d4..41ef85fce 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 6278db428..46fc07609 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 93ffb8d72..6b8cf653b 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 474487423..b083217ce 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 57e963cd5..ac5678a51 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 65465578b..f8e16522c 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 cbf3356a0..c71b8608d 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 b0df30af1..1430294e2 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 a60d8eedc..5734b534a 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 26147f726..1933cc143 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 8f3292936..b8573a434 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 1d88d3be7..8363ff2ae 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 51cbaaa39..9c8ce51fa 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 f67b4269e..6448139c3 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 26b9cf591..2750b1830 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 171790f56..b8baf4437 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 bdd6d2da4..051c82549 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 c078d6876..2727161ff 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 b6570b5e9..26cc07568 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 0413f795a..d717f14d1 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 5c940de5a..fcb50b871 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 99312ac96..3bdcdfb12 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 e7107f07a..7516e89e1 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 bb9b69f35..70153850c 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 ad9f6625d..f10ac533e 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 cdd07bab1..6d8ab1306 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 66a9e0edb..d4dd12b70 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 2088faf16..a1240dba4 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 2d6d7fe37..8464ada1d 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 b7583aabd..67a1c72bb 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 866a894fa..aac793811 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 61a4b521a..81c1fb79c 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 d1e85b36c..a5e210b51 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 7ded7ed23..d7d9ab49a 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 9dd5649fb..5ba048482 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 23f896e4b..86f8883a3 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 f988f9751..245dc0eaf 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 eaef9c9a2..e9d84d56b 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 62640ab29..5acd3d9fb 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 c6a31119f..ff7c2182e 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 40da83bb8..56ec5beaa 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 ed03f5d79..dcc1f5efe 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 0097717fa..3fb140aa7 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 b6e4b2f07..652974cf7 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 7ae53cdad..004c71506 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 a36e7cd72..0da7ac619 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 39ee27853..fd5748a76 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 2e44e5b74..821801eac 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 bfd09e58e..e259215de 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 3cb500bdc..ecb54bda3 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 bd7567d81..62961b46c 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 e2b26846e..e063a1283 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 e33f6cb77..15df206a0 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 4d5376cce..269aeac3e 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 85d84324c..7701918e3 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 1a7b58289..b785fd55a 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 ef9ad911a..87f2e8a51 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 5521303f7..f14e6cd65 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 1182d95f2..c7b2fdfef 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 63924166c..5ff749096 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 25bc3891c..a1c706e45 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 da8f9c1a0..d84600bf6 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 4478507ae..628ac7aab 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 363c2132f..b5b1a1960 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 73ba40dd2..dcd27a75d 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 96db2d944..c057150a4 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 38c35b40a..9b5dbb2d8 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 6fa459ac6..d06f52da9 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 0f838709c..6a9d375ed 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 6f227115c..6060c20da 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 ec6ced043..5446772bf 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 39bb6123c..b19240c8d 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 10330d8e3..4c5b9b464 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 0521a0592..f6d8f986d 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 719dc55c7..d250f8f39 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 8cd919a63..dc4adebc4 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 1916f36b7..d4fb69d74 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 30fa1f18f..81a9dbcea 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 b66f47867..bea728a70 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 3efb9fac7..355539f00 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 bbed60478..34d6c282d 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 034c44aa3..b36e7c1c7 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 f19ab8110..35fb23324 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 8422ef37a..0d4687ad5 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 66786ea5b..f7e7cacdb 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 e56741b49..c7ed5e558 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 f31acb8b6..bb5e5b11d 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 3bed978e8..e0a4419d3 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 16f9aa3ea..1b487cb0f 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 d17c42d67..5285e5b38 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 d07456dc9..9702820df 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 5d45c64d0..2e9cd945b 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 61a528cdc..0cbb78d18 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 e177ee10a..1780ce501 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 56dd4ef83..f287000ba 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 f9e00e26c..2d3ff8777 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 ac0160e7b..3a5ab1416 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 5c2a214b9..38b3885b4 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 1816412d6..80e65eb94 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 e135eceae..3cf22e65f 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 14aadda5f..0eb0017b3 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 1ab278781..7f7e66bf6 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 c1e293e6f..1415cf9e6 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 eda3552eb..da88db1c3 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 313423b51..d55facfab 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 1118c0ab3..7f2619b0f 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 31fbb7d86..b8f21b4de 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 608b45e50..0c5a8dd48 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 f7c919131..a49565f4d 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 3b7f6f2ee..ca44cc403 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 4fd74a9c7..b9fa6997d 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 2293f359d..99c10d87e 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 002154473..2d8fca999 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 65a1da014..8049afd96 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 8c203021c..ffa9830ed 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 753d6dbfb..dd331570e 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 21be37675..0181f3193 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 301779af5..c495a2b4c 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 f919cfae0..0c3d9dc29 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 ba2b28eb1..fb8018dca 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 cc79f44be..d6da82af5 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 e937ac1f4..52c7cc504 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 d3885cb0d..5849476fe 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 c0ec35e37..3b0b49552 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 de9250cbb..d298884a5 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 aa664f45c..51ea10312 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 956e3b03b..eeda14062 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 dfdbec94c..3b72537b3 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 b485d0ad9..e375824e9 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 545426eea..133e21afd 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 0adb6b76d..12ee64648 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 b8f4d4ed4..57d0c07ad 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 679b313d5..234a30943 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 402081450..73b572717 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 ddfbf094c..d45021a2e 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 a13916bc7..c903add8d 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 4511b236c..45a9182d0 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 6fc02d447..5f2779b27 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 646176740..2eb1f8660 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 32b71c477..ca749ef06 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 187d0dff9..ab8a4d010 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 dda65b0fe..4b5ce0315 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 809fb146c..4ecc5efe4 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 4d48e1aab..4d610e828 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 d3484961e..752482a7e 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 556524f05..6df886e80 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 382cafe16..ac59cd8da 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 c9eda68b0..59ac1aac0 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 1c81f7838..780db9ccc 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 c8a97565b..2e7697395 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 a399d1364..248e36f95 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 d6ce944cb..c0acb14c0 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 5a63e2496..92cf0da9b 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 78991499c..f16f577ef 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 792f350b8..2634e9dfd 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 c429ae7f5..c4f629f5b 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 3368d1ba2..bb33b654a 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 b7a767f3c..f501f871d 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 96bf5fba9..40fc70d01 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 4bd43a5d4..519bc696f 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 c952cf34e..88d6132c7 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 9f97d892d..70e05b38a 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 4bad8a43d..31ed1d3e4 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 4a6335695..f59fde2b3 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 43938e550..02b6e8f64 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 db5a8b97c..4f4a7eac7 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 6169dad1b..76ead03e7 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 8224ed8ff..487e38743 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 acb70f285..12340b727 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 60e02f3fb..b7ed20bae 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 1d490490d..83f87c6f6 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 eaaf2d334..349891e23 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 d00a1fa5f..e22dbabb0 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 b6407478c..1cddb1569 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 223cc4f0d..7b54379ce 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 66a804c1a..7e313bb78 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 2c27b4ef2..0a5f01936 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 fbbbc5579..ddb32e092 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 ffd6fe203..fe16e6629 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 30ff85620..263e12a87 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 f6efd8225..3c3742ba0 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 faec348c2..605343baa 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 afb2d586b..3ef5954c5 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 21be152fa..af62b1aed 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 11cc35658..4285b6a0f 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 6a89414b2..86b4af816 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 88dbdf09a..97edc03e4 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 3cea5a7c6..a176c548d 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 25dbd3139..9595b920c 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 ae8fecee7..2a2428f57 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 dc0e071a2..ca50380d5 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 c022f16d2..e12394655 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 7007a69a7..e9696de15 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 0a84d3b51..fe9af5243 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 832ab5838..3c8c4a82f 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 1ae00b9a2..826b774dd 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 097dbdc65..416e9fe86 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 66b7b8758..ba8ed9508 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 b1846f1aa..5f8b99b64 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 7f72f3771..4b902cf96 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 ba5883d7c..a624efba3 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 0841a343e..fba9324f6 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 9266cc5c3..685abaa16 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 03ed08535..3a5219511 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 0bf82c217..718fe9ebb 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 9ef7be29e..350cca5d6 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 4b0cda4eb..78839e8a1 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 c79b11f5d..cfa69c7f4 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 c30969657..3144323a3 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 3f5ea9c68..f32feeb2d 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 03cf2de7a..9dd15bca9 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 0f37fe20b..d90d304e1 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 551126235..c4ffa1369 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 d17513fd5..a020bf418 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 4fcbd0e08..76df12cd2 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 070092679..a9e0c86b7 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 511782688..43c3b5c54 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 b251959ae..eda774701 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 5e702c0c3..080993cfe 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 523aa67ca..f02ffbe66 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 3f019f4d8..f19dfe322 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 b1bca85aa..2cd278f91 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 784d44c2e..d4a5c9233 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 49971cde7..7e39b1939 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 19a786956..17f52c691 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 27ea23b59..076eeab6e 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 83b602fc4..a353379c2 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 7a0695445..a376bfe22 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 c46358aed..e853afda0 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 6a97382d4..989ebe2f3 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 b08d0ca89..1e50357bc 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 d19b4b999..024162cee 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 cdfd6edd6..5b6a674fb 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 4f2dea343..ec2483390 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 875a3a220..e05c49885 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 07ccbe79d..2ae154927 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 89697ff33..c8142a207 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 a5cb11081..91c1abd0f 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 4171da314..23ad26692 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 74bdb1d78..5323c4a6b 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 fd5fd81e0..509806531 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 39045c317..4f0d4632b 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 d93913df2..9256764e8 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 6bef7ba12..a4725036b 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 148ea97c1..eacee4cf3 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 e92c8d97f..07b9fee47 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 9d83ab4e0..886b3fe01 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 087752d8f..f684e215d 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 81c2dd563..d1b07451c 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 ef1102175..9ff6bbc59 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 39157609e..36cf93ada 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 433d8e181..248c1f9ca 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 d899b1cbe..478d61656 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 c1d3534d3..a2f003b85 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 fa2ff7e36..bd9d508dd 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 bf82aa6d1..fe939172d 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 a4b96a48f..1a771ae82 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 1edc1407d..157c1f4d5 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 bed242a2b..3e68f4fed 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 48703897e..e373ff5ad 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 f1d3024c0..f1a144a14 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 1bde88e7d..00efa5394 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 ff8af2e9f..08331b33b 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 bf5c4297f..360b10a08 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 3c4b241ac..963dd196d 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 1f65b88fd..a4609ab54 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 b7ba17125..234751910 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 6357326c1..1dfd9c29a 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 507997416..c2f3be7d6 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 67b1f9381..eb78368af 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 53825a84c..4c904b001 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 9fc2fe53e..99d47f938 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 a1f5489fe..24b288050 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 c1a1d18d0..79f3cce2a 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 bcf847344..1ec82de55 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 10d465b74..1e079c5d7 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 bb6bfd9de..f38fd606d 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 52d01db6c..0052f09aa 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 9a479846f..de8520954 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 c7acaf066..7f5a9e4c7 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 891b5a25a..67a9f83f3 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 663165611..e95e434b5 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 c2807d50b..9593ae59e 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 a432f0d94..83cfe5d92 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 c0c3888e1..1721fa4a0 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 b1ac87e30..84f7b7c34 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 a2997a49b..4e15ddbe7 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 5e03fa165..859a28d6a 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 3bdf93b12..5afce1c88 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 35e5e1522..fdf734423 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 094a52895..fcbf32c91 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 94e442a48..93e8ea759 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 0e9cf9636..1973b0e9e 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 8ee5b781a..bdec88c42 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 5e323211a..6eb8d48bc 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 6d83c8841..2e1b4cfa4 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 239a2efda..19f51b873 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 b5fdc5e42..9eb71d5e3 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 e8f6323c1..cbfbccfe4 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 b7b55f256..e9e79d1e9 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 b22afaf54..c15f1f8c4 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 15d055f02..3884864d7 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 d860e6e7c..9a5e41b15 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 d79849a6c..150cc425b 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 7446c1002..0a9eb6cf5 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 187ed0751..fc66d7387 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 ca6ab50b5..e1f373bb2 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 6a26ee0ff..5de8c7d12 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 02ac01f2b..af661890f 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 8d6b4631f..cdcf5866c 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 142a8e70e..b29ef99a5 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 bf57aa9ce..d303e0614 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 155c31877..ac2d5c8a7 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 c18534c61..ac96e3a9b 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 a06f87b48..786de1757 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 d3f0aa5e5..128cb31c0 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 f8c7b02af..7ac032c5f 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 3337b72f1..cbeefcb1d 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 e92087ebd..eb6bf8da4 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 d7233a3aa..b7f687cdf 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 96bd1f114..a4c2e502c 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 468a34991..26f0680a0 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 c2d217f93..e4b1fce41 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 fb1cb82a8..f6096e1c5 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 f73c6bb55..fe9de01fd 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 279b6e672..862672e19 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, -- cgit v1.2.3 From 2807abe3ba0d331f26b935b3716cbee81d5feb20 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 14 Jun 2018 22:00:20 -0500 Subject: Remove filler bytes from object_event macro --- asm/macros/map.inc | 8 +- data/maps/events/AbandonedShip_CaptainsOffice.inc | 4 +- data/maps/events/AbandonedShip_Corridors_1F.inc | 4 +- data/maps/events/AbandonedShip_Corridors_B1F.inc | 4 +- .../maps/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 ++--- .../events/BattleFrontier_BattleArenaCorridor.inc | 2 +- .../events/BattleFrontier_BattleArenaLobby.inc | 10 +-- .../events/BattleFrontier_BattleDomeBattleRoom.inc | 30 +++---- .../events/BattleFrontier_BattleDomeCorridor.inc | 2 +- .../maps/events/BattleFrontier_BattleDomeLobby.inc | 12 +-- .../BattleFrontier_BattleDomePreBattleRoom.inc | 2 +- .../BattleFrontier_BattleFactoryBattleRoom.inc | 16 ++-- .../events/BattleFrontier_BattleFactoryLobby.inc | 12 +-- .../BattleFrontier_BattleFactoryPreBattleRoom.inc | 2 +- .../BattleFrontier_BattlePalaceBattleRoom.inc | 10 +-- .../events/BattleFrontier_BattlePalaceCorridor.inc | 14 ++-- .../events/BattleFrontier_BattlePalaceLobby.inc | 12 +-- .../events/BattleFrontier_BattlePikeCorridor.inc | 2 +- .../maps/events/BattleFrontier_BattlePikeLobby.inc | 8 +- .../BattleFrontier_BattlePikeRandomRoom1.inc | 4 +- .../BattleFrontier_BattlePikeRandomRoom2.inc | 2 +- .../BattleFrontier_BattlePikeThreePathRoom.inc | 4 +- ...leFrontier_BattlePointExchangeServiceCorner.inc | 18 ++--- .../BattleFrontier_BattlePyramidEmptySquare.inc | 32 ++++---- .../events/BattleFrontier_BattlePyramidLobby.inc | 8 +- .../events/BattleFrontier_BattlePyramidTop.inc | 4 +- .../BattleFrontier_BattleTowerBattleRoom.inc | 6 +- .../BattleFrontier_BattleTowerBattleRoom2.inc | 12 +-- .../events/BattleFrontier_BattleTowerCorridor.inc | 2 +- .../events/BattleFrontier_BattleTowerCorridor2.inc | 8 +- .../events/BattleFrontier_BattleTowerElevator.inc | 2 +- .../events/BattleFrontier_BattleTowerLobby.inc | 18 ++--- .../BattleFrontier_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 +- data/maps/events/BattleFrontier_OutsideEast.inc | 52 ++++++------ data/maps/events/BattleFrontier_OutsideWest.inc | 48 +++++------ .../events/BattleFrontier_PokemonCenter_1F.inc | 10 +-- .../events/BattleFrontier_PokemonCenter_2F.inc | 8 +- data/maps/events/BattleFrontier_RankingHall.inc | 6 +- data/maps/events/BattleFrontier_ReceptionGate.inc | 10 +-- data/maps/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 +- data/maps/events/DewfordTown_PokemonCenter_1F.inc | 6 +- data/maps/events/DewfordTown_PokemonCenter_2F.inc | 8 +- data/maps/events/EverGrandeCity_ChampionsRoom.inc | 6 +- data/maps/events/EverGrandeCity_DrakesRoom.inc | 2 +- data/maps/events/EverGrandeCity_GlaciasRoom.inc | 2 +- data/maps/events/EverGrandeCity_HallOfFame.inc | 2 +- data/maps/events/EverGrandeCity_PhoebesRoom.inc | 2 +- .../events/EverGrandeCity_PokemonCenter_1F.inc | 8 +- .../events/EverGrandeCity_PokemonCenter_2F.inc | 8 +- .../events/EverGrandeCity_PokemonLeague_1F.inc | 8 +- .../events/EverGrandeCity_PokemonLeague_2F.inc | 8 +- data/maps/events/EverGrandeCity_SidneysRoom.inc | 2 +- data/maps/events/FallarborTown.inc | 8 +- .../events/FallarborTown_BattleTentBattleRoom.inc | 6 +- .../events/FallarborTown_BattleTentCorridor.inc | 2 +- data/maps/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 +-- .../maps/events/FallarborTown_PokemonCenter_1F.inc | 8 +- .../maps/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 ++-- data/maps/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 +- data/maps/events/FortreeCity_PokemonCenter_1F.inc | 8 +- data/maps/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 +- .../maps/events/LavaridgeTown_PokemonCenter_1F.inc | 8 +- .../maps/events/LavaridgeTown_PokemonCenter_2F.inc | 8 +- data/maps/events/LilycoveCity.inc | 44 +++++------ data/maps/events/LilycoveCity_ContestHall.inc | 64 +++++++-------- data/maps/events/LilycoveCity_ContestLobby.inc | 50 ++++++------ data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc | 2 +- data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc | 14 ++-- .../LilycoveCity_DepartmentStoreElevator.inc | 2 +- .../events/LilycoveCity_DepartmentStoreRooftop.inc | 8 +- .../events/LilycoveCity_DepartmentStore_1F.inc | 12 +-- .../events/LilycoveCity_DepartmentStore_2F.inc | 10 +-- .../events/LilycoveCity_DepartmentStore_3F.inc | 10 +-- .../events/LilycoveCity_DepartmentStore_4F.inc | 10 +-- .../events/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 +- .../maps/events/LilycoveCity_LilycoveMuseum_1F.inc | 20 ++--- .../maps/events/LilycoveCity_LilycoveMuseum_2F.inc | 8 +- .../maps/events/LilycoveCity_MoveDeletersHouse.inc | 2 +- data/maps/events/LilycoveCity_PokemonCenter_1F.inc | 10 +-- data/maps/events/LilycoveCity_PokemonCenter_2F.inc | 8 +- .../events/LilycoveCity_PokemonTrainerFanClub.inc | 18 ++--- data/maps/events/LinkContestRoom1.inc | 30 +++---- data/maps/events/LittlerootTown.inc | 16 ++-- .../events/LittlerootTown_BrendansHouse_1F.inc | 14 ++-- .../events/LittlerootTown_BrendansHouse_2F.inc | 32 ++++---- data/maps/events/LittlerootTown_MaysHouse_1F.inc | 14 ++-- data/maps/events/LittlerootTown_MaysHouse_2F.inc | 32 ++++---- .../events/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 +- data/maps/events/MauvilleCity_PokemonCenter_1F.inc | 10 +-- data/maps/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 ++++---- data/maps/events/MossdeepCity_GameCorner_1F.inc | 4 +- data/maps/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 +- data/maps/events/MossdeepCity_PokemonCenter_1F.inc | 6 +- data/maps/events/MossdeepCity_PokemonCenter_2F.inc | 10 +-- data/maps/events/MossdeepCity_SpaceCenter_1F.inc | 22 +++--- data/maps/events/MossdeepCity_SpaceCenter_2F.inc | 18 ++--- data/maps/events/MossdeepCity_StevensHouse.inc | 6 +- data/maps/events/MtChimney.inc | 60 +++++++------- data/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 +- data/maps/events/OldaleTown_PokemonCenter_1F.inc | 8 +- data/maps/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 +- .../events/PacifidlogTown_PokemonCenter_1F.inc | 10 +-- .../events/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 +- .../maps/events/PetalburgCity_PokemonCenter_1F.inc | 10 +-- .../maps/events/PetalburgCity_PokemonCenter_2F.inc | 8 +- data/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 +- .../maps/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 +- data/maps/events/Route110_TrickHouseEntrance.inc | 2 +- data/maps/events/Route110_TrickHousePuzzle1.inc | 30 +++---- data/maps/events/Route110_TrickHousePuzzle2.inc | 10 +-- data/maps/events/Route110_TrickHousePuzzle3.inc | 14 ++-- data/maps/events/Route110_TrickHousePuzzle4.inc | 28 +++---- data/maps/events/Route110_TrickHousePuzzle5.inc | 10 +-- data/maps/events/Route110_TrickHousePuzzle6.inc | 8 +- data/maps/events/Route110_TrickHousePuzzle7.inc | 18 ++--- data/maps/events/Route110_TrickHousePuzzle8.inc | 8 +- data/maps/events/Route111.inc | 92 +++++++++++----------- data/maps/events/Route111_OldLadysRestStop.inc | 2 +- .../maps/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 ++++++------- data/maps/events/Route114_FossilManiacsHouse.inc | 2 +- data/maps/events/Route114_FossilManiacsTunnel.inc | 2 +- data/maps/events/Route114_LanettesHouse.inc | 2 +- data/maps/events/Route115.inc | 46 +++++------ data/maps/events/Route116.inc | 56 ++++++------- data/maps/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 ++-- data/maps/events/Route119_WeatherInstitute_1F.inc | 10 +-- data/maps/events/Route119_WeatherInstitute_2F.inc | 16 ++-- data/maps/events/Route120.inc | 88 ++++++++++----------- data/maps/events/Route121.inc | 58 +++++++------- data/maps/events/Route121_SafariZoneEntrance.inc | 6 +- data/maps/events/Route123.inc | 86 ++++++++++---------- data/maps/events/Route123_BerryMastersHouse.inc | 4 +- data/maps/events/Route124.inc | 24 +++--- .../events/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 ++++---- data/maps/events/RustboroCity_CuttersHouse.inc | 4 +- data/maps/events/RustboroCity_DevonCorp_1F.inc | 6 +- data/maps/events/RustboroCity_DevonCorp_2F.inc | 12 +-- data/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 +- data/maps/events/RustboroCity_PokemonCenter_1F.inc | 8 +- data/maps/events/RustboroCity_PokemonCenter_2F.inc | 8 +- data/maps/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 +++---- data/maps/events/ShoalCave_LowTideEntranceRoom.inc | 4 +- data/maps/events/ShoalCave_LowTideIceRoom.inc | 4 +- data/maps/events/ShoalCave_LowTideInnerRoom.inc | 2 +- data/maps/events/ShoalCave_LowTideLowerRoom.inc | 4 +- data/maps/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 ++++++++-------- .../events/SlateportCity_BattleTentBattleRoom.inc | 6 +- .../events/SlateportCity_BattleTentCorridor.inc | 2 +- data/maps/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 +- .../maps/events/SlateportCity_OceanicMuseum_1F.inc | 28 +++---- .../maps/events/SlateportCity_OceanicMuseum_2F.inc | 14 ++-- .../maps/events/SlateportCity_PokemonCenter_1F.inc | 6 +- .../maps/events/SlateportCity_PokemonCenter_2F.inc | 8 +- data/maps/events/SlateportCity_PokemonFanClub.inc | 18 ++--- .../events/SlateportCity_SternsShipyard_1F.inc | 8 +- .../events/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 +- .../events/SootopolisCity_LotadAndSeedotHouse.inc | 4 +- data/maps/events/SootopolisCity_Mart.inc | 6 +- .../SootopolisCity_MysteryEventsHouse_1F.inc | 2 +- .../SootopolisCity_MysteryEventsHouse_B1F.inc | 2 +- .../events/SootopolisCity_PokemonCenter_1F.inc | 8 +- .../events/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 +- data/maps/events/Underwater_SeafloorCavern.inc | 8 +- data/maps/events/UnionRoom.inc | 18 ++--- data/maps/events/VerdanturfTown.inc | 8 +- .../events/VerdanturfTown_BattleTentBattleRoom.inc | 6 +- .../events/VerdanturfTown_BattleTentCorridor.inc | 2 +- .../maps/events/VerdanturfTown_BattleTentLobby.inc | 12 +-- .../VerdanturfTown_FriendshipRatersHouse.inc | 4 +- data/maps/events/VerdanturfTown_House.inc | 4 +- data/maps/events/VerdanturfTown_Mart.inc | 8 +- .../events/VerdanturfTown_PokemonCenter_1F.inc | 8 +- .../events/VerdanturfTown_PokemonCenter_2F.inc | 8 +- data/maps/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 a6f9f2dae..8a0795266 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 c66185abf..b01dd1e72 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 60e5a0f4f..3c3a18d4a 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 7fb31aca0..7a71cdcfc 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 239d6a455..dbc5d432b 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 10bcc33dd..cf6369dd6 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 18b2b031d..12bbe1366 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 4bd68449c..1aa5ad50f 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 a3b61b7e9..429159059 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 03690b801..3b3d5976b 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 31d31ccbc..007154587 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 6e4ef5068..44d9b8fea 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 1ad010c28..e279951fc 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 9cfd51a10..15cedf8b9 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 e6752fc3a..33c1cb945 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 e91c3211f..fb9f89623 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 029a59b41..c8cd0042e 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 657f912e3..14f1b7d86 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 9c7d333a0..d1c689967 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 595d14b60..b811d409e 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 34f39fa0e..815740549 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 c91db7429..da6e3ef87 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 be18e491a..db8cccf1c 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 48fd10c07..c3d3ea89e 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 322a2e66e..b25212cde 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 e1a0529fd..a3bcf13b3 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 520f92838..9b9e3d717 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 a605a89ea..91311b8da 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 a333fa100..42b4da80e 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 1960c0d63..df9bd1572 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 e9aa08917..4cd129739 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 03e0a15e4..d5b5898cd 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 69c213606..95b7c6781 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 f2bca38c1..e1668644e 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 8dce267b4..574da0ed3 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 7d531b54b..141482321 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 0fc086feb..429312ef0 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 a6ca1adea..7aede3926 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 bea8a6484..7e702f40b 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 2d8dcaa07..991c0843a 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 a363801f0..1e0e49315 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 c2f1e30bf..454e83ffb 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 a4dbc6afa..6ee887d94 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 34c808268..3b6c1a6f2 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 3d2bb6127..0c313dc97 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 a026f1734..fac8f7838 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 a04ee9bec..bb08de8c7 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 529e42c66..6475115ac 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 5bdfa4e12..5f10cb1b8 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 1d68986cc..f33ceeb65 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 12853012e..24dca320a 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 bfe0ae7e8..bccac94bd 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 be16a6107..816e07782 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 5e294b384..7864c3179 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 495be5f63..18e37be73 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 62423b9c1..a5772cf1a 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 60f10c8b5..cbbd9af32 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 79b37aead..9566f2fe2 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 f94c24b00..548e1a351 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 bfe61cda1..636b6c281 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 aca73394c..f73308cb9 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 5e9ff1912..11c166684 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 0226b4fdb..99ac3006d 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 8b14a4a47..28242dded 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 4b7713426..bec280de6 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 dd35fcc43..5b517b23b 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 766ee7626..7e08946d4 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 64ab2e226..608021a71 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 a3a0734f1..79e6065a8 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 dfcfdb451..6d286a003 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 dc4ab38ee..c8c99f4b9 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 9e87c6b06..3f0c6b6aa 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 b0ce15fb5..e4cec618d 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 08783200f..aadd2f71f 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 a930160cb..be42aa8d2 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 a81c9b5e0..656685c60 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 fe0d085bd..ddf3bf62f 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 11abe791d..d402e98b9 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 e61935ebe..06af73f75 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 fe4a55b25..f10f53a56 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 1c951f240..5fc4bb914 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 510a18998..b0d3b4ddf 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 ea53189ad..ade5f063a 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 9d2c34dc9..2d62e7010 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 f5a4452bb..c922f9c3a 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 39f4fad75..deb53eba5 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 887165b82..9bed65eba 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 9cacd146d..13fa5d0cf 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 ab2f8c74a..c6e4d09c6 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 b2147e4f0..2c2b2c3a2 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 6318c7bb7..1fe09d043 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 823965d78..2a9d327a0 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 dd2e33d52..5e90b9294 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 671c31224..6951814ae 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 0a8d48d29..91a85ca54 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 745c23309..5cb55a34a 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 19741159a..09117ab15 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 129de15cc..22e40d240 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 3e453781a..8900d7f8e 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 295633242..3547e1349 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 abe98828c..8d90f004e 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 7c5842ab8..b1f7eb6db 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 35bca7b85..08762f267 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 cdc525c0a..d672c382a 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 42f5e1950..d5eea14e3 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 853aa5d2b..cb3094441 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 fee24d963..e44e4098f 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 1be0bd783..d8113295f 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 c72ccf88a..513c483fd 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 2c6a007bf..ec06d4312 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 5d41d11d1..fa8f709cc 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 6979786aa..c37b27057 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 cb9e70e07..262b6c6a7 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 7abb73fed..a956d1b20 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 3f8e8d634..478393dc6 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 754758c5c..c5efd81e6 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 742688c1d..aa384c3ed 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 13d1e079e..d247f002c 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 3c6886e3c..c7bebb95b 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 7849df43e..cea1ff532 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 450007097..49e2adc71 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 e2555bd2c..5ddc96e63 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 b03f27efa..21f920838 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 d14cf38ca..05f53c968 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 f393dd720..914da7523 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 776520196..d1ba08ba3 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 26233c0d7..c6abd9e5a 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 60d8fc7bd..dbda93e9c 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 71d94e0cd..3738636c8 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 fa6dabcff..12dd9bdd2 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 7419f67d6..cf3f26095 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 784b7b857..24521f246 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 88dae4c5e..0169d4a56 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 939a8752e..f8b0a950c 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 c97aea86a..436d5c41a 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 77f372aa2..bb12cf30c 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 07ca2e7c0..674ebef23 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 27d0f6fec..889dcb9b7 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 5020993d8..d1c602705 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 615f2682c..036bf0173 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 b183b4f16..879c720c0 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 77d075034..e93810aa9 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 48aae9c0c..fd0afa038 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 ef97e90c6..e8e472283 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 095b201d9..d0bb04e59 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 0a8bd70b8..4d8dcf9c2 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 9356a7ae0..e66e9bc35 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 a26dc39d2..ff535abf5 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 dd5a87e99..b344e7d3d 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 63ddcdb35..62db69ab6 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 0f786ca84..3d03eea7e 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 64ad5ea1b..dc14e4291 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 037b195ad..9c7237adc 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 25d2cb333..63051a087 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 7556d0092..db9bc7469 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 6780d3f18..ef490466c 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 e95ec1075..f4338de64 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 83fbf0288..5d1c20b47 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 fb2e41948..17dab4016 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 6522dc799..525622b61 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 476a6ebab..dee64a91f 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 641c1bdd1..0d524368e 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 d4388bc33..47c07619f 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 e5320f071..9105ae42c 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 0ed661234..094e010be 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 2ceb34c8e..aecede5ed 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 121c6164b..b2038db60 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 bbae39ce8..318b3171b 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 8462b4731..6418b5acc 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 1073518f2..51ca352a2 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 e27fc5dc1..262fc3378 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 baf535984..c5710463d 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 e643a1c3f..59ff76519 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 e40619a49..acbe98510 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 808f1b7da..0c7b58257 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 199465a69..a5db369da 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 a73145ae2..b4a0eddaf 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 cd4f43bb3..dbd7cc795 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 18e12ac65..59a40a11f 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 0a931723e..30d757b43 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 b3ff72929..dcdec217a 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 d96a2cd5d..9dc17584a 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 bc22e5bb0..be12e7d02 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 fc76f6b76..6134b9d35 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 f22b9f057..52cf72422 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 2e6195b60..d0f3aa45e 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 3561e7c5e..c5bb29dfc 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 92d60a60a..8396ced4c 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 9a2556e8a..e5547c698 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 062a137fc..4163ccee9 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 848eeb88e..f751efe02 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 531fb141b..3d3a7ee4e 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 a271897b7..00f32e95a 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 2955da0b0..8a7cfe939 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 23951059d..3071139a7 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 6342bcc55..5da968bfa 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 9596aa7bd..f1b535b17 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 19933fb6a..2cca573a8 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 fc7203950..30a5719a8 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 91811e9e9..888473e5c 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 7c8b8b702..999d16a11 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 4fa7dff99..aa37daee5 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 d3b27947a..5ffce1444 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 e2f778bec..30b594234 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 2b0562d34..db7f2ed59 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 a26025830..3be5fbbe5 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 e519d5281..5c3f44889 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 99e6e88d2..9cebbca5e 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 89e8dd553..9d9ceb376 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 a60b1cec0..c788ae13d 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 4cb8ccd6f..5374e6048 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 4bd96526e..591b90bef 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 b160f4896..8c319b3a0 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 446e04072..cb3ea04d1 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 e2512c586..25b61fe19 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 ae5c36cf1..49743dfe4 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 04b452b4e..60e4a6935 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 65618f8ea..ec3d8322a 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 41ef85fce..5ecd2f8bf 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 46fc07609..c68db0e45 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 6b8cf653b..a6be12d7a 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 b083217ce..715dd39aa 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 ac5678a51..b5e49095a 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 f8e16522c..6aff86066 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 c71b8608d..d0fc7a9d3 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 1430294e2..ab11ee74e 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 5734b534a..21dc0c13f 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 1933cc143..a16c5220b 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 b8573a434..649f6b288 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 8363ff2ae..f9b415d68 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 9c8ce51fa..a5548861d 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 6448139c3..13525ab16 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 2750b1830..3d4626c69 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 b8baf4437..a5f45989b 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 051c82549..26d992172 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 2727161ff..b4667f6ed 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 26cc07568..85e686c19 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 d717f14d1..8dedf60a7 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 fcb50b871..29b3917f5 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 3bdcdfb12..9ebe184ef 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 7516e89e1..d681d2b92 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 70153850c..08fe0e6ae 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 f10ac533e..3019e5f3c 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 e942526ba..f8c17146b 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 8b1551f09..68abe716b 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 6d8ab1306..c7ce68b44 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 d4dd12b70..6d35c1bee 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 a1240dba4..d14d62c2b 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 8464ada1d..abd57bcd0 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 67a1c72bb..4654b470a 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 aac793811..2697c4240 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 87d734ed4..609c6a808 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 81c1fb79c..64e9f746c 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 a5e210b51..e21a54ab2 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 d7d9ab49a..4812c3d06 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 5ba048482..3fc6257cc 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 86f8883a3..c84b06c1a 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 245dc0eaf..4f9ea356c 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 5acd3d9fb..d868b6cd0 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 ff7c2182e..3ce8e5942 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 56ec5beaa..f3abb09d7 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 dcc1f5efe..dd02e5319 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 3fb140aa7..683718363 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 652974cf7..93856f7b6 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 004c71506..9bf01f4b6 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 0da7ac619..8e29b4ee1 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 fd5748a76..e6d50dca5 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 821801eac..1556a9516 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 e259215de..1d9aa1111 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 ecb54bda3..4fd7d1952 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 62961b46c..3585e27e6 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 e063a1283..683f43ffd 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 15df206a0..7a18ffd40 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 269aeac3e..990df8f7f 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 7701918e3..7502ed737 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 b785fd55a..d250d801e 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 87f2e8a51..06788e39d 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 f14e6cd65..64ff21b89 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 c7b2fdfef..81633507d 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 5ff749096..a698b98d8 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 a1c706e45..e36c02de4 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 d84600bf6..7a7ce7855 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 628ac7aab..df4bf6f11 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 b5b1a1960..3182c9c83 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 dcd27a75d..6b3379504 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 c057150a4..a5e781b87 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 9b5dbb2d8..31dd51afd 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 d06f52da9..2e308bf4f 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 6a9d375ed..bf900b67b 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 6060c20da..d2b22f730 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 5446772bf..77dec98a5 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 b19240c8d..2b56e1b1a 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 f6d8f986d..717fce4d0 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 d250f8f39..f889fe387 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 dc4adebc4..6125be0cf 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 d4fb69d74..71bbc705f 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 81a9dbcea..2ca6fb70b 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 f6d4a71a5..981e6f1d4 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 b72a1d629..656733d0d 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 e9efddf20..42cab969e 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 297b9eeb2..21c6fc6bd 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 470fa9880..a895743d1 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 bea728a70..5dff94bb7 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 825c6fc65..49cfd07e4 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 6249ca026..13bd5f6e2 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 6beb27ba5..df70e9af8 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 355539f00..67d3d3eaa 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 34d6c282d..fd69ad6de 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 b36e7c1c7..1746830f0 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 35fb23324..da0c5ece2 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 0d4687ad5..56e4295d0 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 f7e7cacdb..dd869ef29 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 c7ed5e558..bafe8d868 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 bb5e5b11d..df833517f 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 e0a4419d3..76454e567 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 1b487cb0f..dd6e34257 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 5285e5b38..47842da53 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 9702820df..985fad05a 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 2e9cd945b..a75f50ab1 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 0cbb78d18..0e8c6ca9e 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 1780ce501..9eba87eda 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 f287000ba..94293fcb5 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 2d3ff8777..e91cca2c8 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 3a5ab1416..56077139f 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 38b3885b4..a72400e5b 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 80e65eb94..866fdf78e 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 3cf22e65f..ef83b3293 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 0eb0017b3..42f5fd605 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 d11d31fe9..99d2b5860 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 233b55da0..d355654cd 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 41c2fe198..2fa67c714 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 7f7e66bf6..9ba24ae2b 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 1415cf9e6..d1fbf95ed 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 61e6b93fe..f14779cdb 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 da88db1c3..a6567b476 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 d55facfab..160a59a3c 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 7f2619b0f..7bb9d1ae4 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 b8f21b4de..83b69c739 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 0c5a8dd48..c8f58a15c 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 a49565f4d..8319729bf 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 ca44cc403..846e33964 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 b9fa6997d..17ead20a3 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 8049afd96..1fa73357d 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 ffa9830ed..3e370d8dc 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 c495a2b4c..2a0f7eff1 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 0c3d9dc29..68e554b05 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 fb8018dca..de02278b3 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 d6da82af5..9b9f577b7 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 52c7cc504..b1edf9985 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 5849476fe..dceb7a584 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 3b0b49552..4b8b7674f 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 d298884a5..1c2ad2d49 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 51ea10312..72592ec7d 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 eeda14062..0aae19f6a 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 3b72537b3..acdc616d2 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 e375824e9..b5863d41c 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 133e21afd..051297cd3 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 12ee64648..e9acfd82b 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 57d0c07ad..965d19f70 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 234a30943..60de85b7f 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 73b572717..01052acc2 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 d45021a2e..0317dfbcf 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 c903add8d..061179987 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 45a9182d0..b190e4f1e 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 5f2779b27..623c8f970 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 2eb1f8660..60434dec9 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 ca749ef06..dda1bf65b 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 ab8a4d010..f525839b5 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 4b5ce0315..f044adda4 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 4ecc5efe4..10ce11a10 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 4d610e828..d6ba2a87f 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 752482a7e..6063c4e85 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 6df886e80..7e477c0f2 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 ac59cd8da..809a69ee8 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 f16f577ef..6afadc9e8 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 2634e9dfd..14b562cf7 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 c4f629f5b..3b9571d8b 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 f22969d2a..4330ec1dd 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 6b45c8e26..57292c37f 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 bb33b654a..da8a11ebf 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 f501f871d..16782cbe6 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 40fc70d01..bb5e3c89f 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 519bc696f..55a83d72c 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 88d6132c7..e09928a4c 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 70e05b38a..9d18bcd82 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 31ed1d3e4..f404c972b 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 f59fde2b3..d0c3b1d3c 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 02b6e8f64..3861219ec 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 4f4a7eac7..68d8f3082 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 76ead03e7..b4c6e9973 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 487e38743..de45f1922 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 12340b727..6835fc726 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 b7ed20bae..b0f2f6aa9 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 83f87c6f6..a493060de 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 349891e23..af321c802 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 e22dbabb0..f0e2b4455 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 1cddb1569..bd85df987 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 7b54379ce..0e94e891f 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 7e313bb78..a574df2e9 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 0a5f01936..4e1b102d8 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 ddb32e092..da06db206 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 fe16e6629..9f17b52da 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 263e12a87..3a38d7a58 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 3c3742ba0..9bd3c91d5 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 605343baa..22bcf07ea 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 3ef5954c5..92f09cdd9 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 af62b1aed..a7937f820 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 4285b6a0f..8f1a22b22 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 86b4af816..0a53cc249 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 97edc03e4..e46dad94b 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 9595b920c..c767f78df 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 fe9af5243..ac7a4d9f5 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 3c8c4a82f..04fac8066 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 826b774dd..3ce2b9684 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 718fe9ebb..4d9d8ba14 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 cfa69c7f4..5aa373053 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 3144323a3..385d92e88 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 20597089a..240d64cdd 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 539cf8b11..1b85d4a3f 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 f32feeb2d..fa54d8b65 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 9dd15bca9..001d6ac1a 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 d90d304e1..feaf1afa1 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 c4ffa1369..2d2440d55 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 a020bf418..8727bc43f 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 76df12cd2..92fc90e6d 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 a9e0c86b7..e537d66f8 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 43c3b5c54..e9958393a 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 eda774701..b480855d9 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 080993cfe..d5f92efdb 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 -- cgit v1.2.3 From f807eb1f2de629ef094c3dae37d6380049980a8f Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 14 Jun 2018 22:00:27 -0500 Subject: Split out movement radius in object_event macro --- asm/macros/map.inc | 4 +- data/maps/events/AbandonedShip_CaptainsOffice.inc | 4 +- data/maps/events/AbandonedShip_Corridors_1F.inc | 4 +- data/maps/events/AbandonedShip_Corridors_B1F.inc | 4 +- .../maps/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 ++--- .../events/BattleFrontier_BattleArenaCorridor.inc | 2 +- .../events/BattleFrontier_BattleArenaLobby.inc | 10 +-- .../events/BattleFrontier_BattleDomeBattleRoom.inc | 30 +++---- .../events/BattleFrontier_BattleDomeCorridor.inc | 2 +- .../maps/events/BattleFrontier_BattleDomeLobby.inc | 12 +-- .../BattleFrontier_BattleDomePreBattleRoom.inc | 2 +- .../BattleFrontier_BattleFactoryBattleRoom.inc | 16 ++-- .../events/BattleFrontier_BattleFactoryLobby.inc | 12 +-- .../BattleFrontier_BattleFactoryPreBattleRoom.inc | 2 +- .../BattleFrontier_BattlePalaceBattleRoom.inc | 10 +-- .../events/BattleFrontier_BattlePalaceCorridor.inc | 14 ++-- .../events/BattleFrontier_BattlePalaceLobby.inc | 12 +-- .../events/BattleFrontier_BattlePikeCorridor.inc | 2 +- .../maps/events/BattleFrontier_BattlePikeLobby.inc | 8 +- .../BattleFrontier_BattlePikeRandomRoom1.inc | 4 +- .../BattleFrontier_BattlePikeRandomRoom2.inc | 2 +- .../BattleFrontier_BattlePikeThreePathRoom.inc | 4 +- ...leFrontier_BattlePointExchangeServiceCorner.inc | 18 ++--- .../BattleFrontier_BattlePyramidEmptySquare.inc | 32 ++++---- .../events/BattleFrontier_BattlePyramidLobby.inc | 8 +- .../events/BattleFrontier_BattlePyramidTop.inc | 4 +- .../BattleFrontier_BattleTowerBattleRoom.inc | 6 +- .../BattleFrontier_BattleTowerBattleRoom2.inc | 12 +-- .../events/BattleFrontier_BattleTowerCorridor.inc | 2 +- .../events/BattleFrontier_BattleTowerCorridor2.inc | 8 +- .../events/BattleFrontier_BattleTowerElevator.inc | 2 +- .../events/BattleFrontier_BattleTowerLobby.inc | 18 ++--- .../BattleFrontier_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 +- data/maps/events/BattleFrontier_OutsideEast.inc | 52 ++++++------ data/maps/events/BattleFrontier_OutsideWest.inc | 48 +++++------ .../events/BattleFrontier_PokemonCenter_1F.inc | 10 +-- .../events/BattleFrontier_PokemonCenter_2F.inc | 8 +- data/maps/events/BattleFrontier_RankingHall.inc | 6 +- data/maps/events/BattleFrontier_ReceptionGate.inc | 10 +-- data/maps/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 +- data/maps/events/DewfordTown_PokemonCenter_1F.inc | 6 +- data/maps/events/DewfordTown_PokemonCenter_2F.inc | 8 +- data/maps/events/EverGrandeCity_ChampionsRoom.inc | 6 +- data/maps/events/EverGrandeCity_DrakesRoom.inc | 2 +- data/maps/events/EverGrandeCity_GlaciasRoom.inc | 2 +- data/maps/events/EverGrandeCity_HallOfFame.inc | 2 +- data/maps/events/EverGrandeCity_PhoebesRoom.inc | 2 +- .../events/EverGrandeCity_PokemonCenter_1F.inc | 8 +- .../events/EverGrandeCity_PokemonCenter_2F.inc | 8 +- .../events/EverGrandeCity_PokemonLeague_1F.inc | 8 +- .../events/EverGrandeCity_PokemonLeague_2F.inc | 8 +- data/maps/events/EverGrandeCity_SidneysRoom.inc | 2 +- data/maps/events/FallarborTown.inc | 8 +- .../events/FallarborTown_BattleTentBattleRoom.inc | 6 +- .../events/FallarborTown_BattleTentCorridor.inc | 2 +- data/maps/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 +-- .../maps/events/FallarborTown_PokemonCenter_1F.inc | 8 +- .../maps/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 ++-- data/maps/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 +- data/maps/events/FortreeCity_PokemonCenter_1F.inc | 8 +- data/maps/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 +- .../maps/events/LavaridgeTown_PokemonCenter_1F.inc | 8 +- .../maps/events/LavaridgeTown_PokemonCenter_2F.inc | 8 +- data/maps/events/LilycoveCity.inc | 44 +++++------ data/maps/events/LilycoveCity_ContestHall.inc | 64 +++++++-------- data/maps/events/LilycoveCity_ContestLobby.inc | 50 ++++++------ data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc | 2 +- data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc | 14 ++-- .../LilycoveCity_DepartmentStoreElevator.inc | 2 +- .../events/LilycoveCity_DepartmentStoreRooftop.inc | 8 +- .../events/LilycoveCity_DepartmentStore_1F.inc | 12 +-- .../events/LilycoveCity_DepartmentStore_2F.inc | 10 +-- .../events/LilycoveCity_DepartmentStore_3F.inc | 10 +-- .../events/LilycoveCity_DepartmentStore_4F.inc | 10 +-- .../events/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 +- .../maps/events/LilycoveCity_LilycoveMuseum_1F.inc | 20 ++--- .../maps/events/LilycoveCity_LilycoveMuseum_2F.inc | 8 +- .../maps/events/LilycoveCity_MoveDeletersHouse.inc | 2 +- data/maps/events/LilycoveCity_PokemonCenter_1F.inc | 10 +-- data/maps/events/LilycoveCity_PokemonCenter_2F.inc | 8 +- .../events/LilycoveCity_PokemonTrainerFanClub.inc | 18 ++--- data/maps/events/LinkContestRoom1.inc | 30 +++---- data/maps/events/LittlerootTown.inc | 16 ++-- .../events/LittlerootTown_BrendansHouse_1F.inc | 14 ++-- .../events/LittlerootTown_BrendansHouse_2F.inc | 32 ++++---- data/maps/events/LittlerootTown_MaysHouse_1F.inc | 14 ++-- data/maps/events/LittlerootTown_MaysHouse_2F.inc | 32 ++++---- .../events/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 +- data/maps/events/MauvilleCity_PokemonCenter_1F.inc | 10 +-- data/maps/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 ++++---- data/maps/events/MossdeepCity_GameCorner_1F.inc | 4 +- data/maps/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 +- data/maps/events/MossdeepCity_PokemonCenter_1F.inc | 6 +- data/maps/events/MossdeepCity_PokemonCenter_2F.inc | 10 +-- data/maps/events/MossdeepCity_SpaceCenter_1F.inc | 22 +++--- data/maps/events/MossdeepCity_SpaceCenter_2F.inc | 18 ++--- data/maps/events/MossdeepCity_StevensHouse.inc | 6 +- data/maps/events/MtChimney.inc | 60 +++++++------- data/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 +- data/maps/events/OldaleTown_PokemonCenter_1F.inc | 8 +- data/maps/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 +- .../events/PacifidlogTown_PokemonCenter_1F.inc | 10 +-- .../events/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 +- .../maps/events/PetalburgCity_PokemonCenter_1F.inc | 10 +-- .../maps/events/PetalburgCity_PokemonCenter_2F.inc | 8 +- data/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 +- .../maps/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 +- data/maps/events/Route110_TrickHouseEntrance.inc | 2 +- data/maps/events/Route110_TrickHousePuzzle1.inc | 30 +++---- data/maps/events/Route110_TrickHousePuzzle2.inc | 10 +-- data/maps/events/Route110_TrickHousePuzzle3.inc | 14 ++-- data/maps/events/Route110_TrickHousePuzzle4.inc | 28 +++---- data/maps/events/Route110_TrickHousePuzzle5.inc | 10 +-- data/maps/events/Route110_TrickHousePuzzle6.inc | 8 +- data/maps/events/Route110_TrickHousePuzzle7.inc | 18 ++--- data/maps/events/Route110_TrickHousePuzzle8.inc | 8 +- data/maps/events/Route111.inc | 92 +++++++++++----------- data/maps/events/Route111_OldLadysRestStop.inc | 2 +- .../maps/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 ++++++------- data/maps/events/Route114_FossilManiacsHouse.inc | 2 +- data/maps/events/Route114_FossilManiacsTunnel.inc | 2 +- data/maps/events/Route114_LanettesHouse.inc | 2 +- data/maps/events/Route115.inc | 46 +++++------ data/maps/events/Route116.inc | 56 ++++++------- data/maps/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 ++-- data/maps/events/Route119_WeatherInstitute_1F.inc | 10 +-- data/maps/events/Route119_WeatherInstitute_2F.inc | 16 ++-- data/maps/events/Route120.inc | 88 ++++++++++----------- data/maps/events/Route121.inc | 58 +++++++------- data/maps/events/Route121_SafariZoneEntrance.inc | 6 +- data/maps/events/Route123.inc | 86 ++++++++++---------- data/maps/events/Route123_BerryMastersHouse.inc | 4 +- data/maps/events/Route124.inc | 24 +++--- .../events/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 ++++---- data/maps/events/RustboroCity_CuttersHouse.inc | 4 +- data/maps/events/RustboroCity_DevonCorp_1F.inc | 6 +- data/maps/events/RustboroCity_DevonCorp_2F.inc | 12 +-- data/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 +- data/maps/events/RustboroCity_PokemonCenter_1F.inc | 8 +- data/maps/events/RustboroCity_PokemonCenter_2F.inc | 8 +- data/maps/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 +++---- data/maps/events/ShoalCave_LowTideEntranceRoom.inc | 4 +- data/maps/events/ShoalCave_LowTideIceRoom.inc | 4 +- data/maps/events/ShoalCave_LowTideInnerRoom.inc | 2 +- data/maps/events/ShoalCave_LowTideLowerRoom.inc | 4 +- data/maps/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 ++++++++-------- .../events/SlateportCity_BattleTentBattleRoom.inc | 6 +- .../events/SlateportCity_BattleTentCorridor.inc | 2 +- data/maps/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 +- .../maps/events/SlateportCity_OceanicMuseum_1F.inc | 28 +++---- .../maps/events/SlateportCity_OceanicMuseum_2F.inc | 14 ++-- .../maps/events/SlateportCity_PokemonCenter_1F.inc | 6 +- .../maps/events/SlateportCity_PokemonCenter_2F.inc | 8 +- data/maps/events/SlateportCity_PokemonFanClub.inc | 18 ++--- .../events/SlateportCity_SternsShipyard_1F.inc | 8 +- .../events/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 +- .../events/SootopolisCity_LotadAndSeedotHouse.inc | 4 +- data/maps/events/SootopolisCity_Mart.inc | 6 +- .../SootopolisCity_MysteryEventsHouse_1F.inc | 2 +- .../SootopolisCity_MysteryEventsHouse_B1F.inc | 2 +- .../events/SootopolisCity_PokemonCenter_1F.inc | 8 +- .../events/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 +- data/maps/events/Underwater_SeafloorCavern.inc | 8 +- data/maps/events/UnionRoom.inc | 18 ++--- data/maps/events/VerdanturfTown.inc | 8 +- .../events/VerdanturfTown_BattleTentBattleRoom.inc | 6 +- .../events/VerdanturfTown_BattleTentCorridor.inc | 2 +- .../maps/events/VerdanturfTown_BattleTentLobby.inc | 12 +-- .../VerdanturfTown_FriendshipRatersHouse.inc | 4 +- data/maps/events/VerdanturfTown_House.inc | 4 +- data/maps/events/VerdanturfTown_Mart.inc | 8 +- .../events/VerdanturfTown_PokemonCenter_1F.inc | 8 +- .../events/VerdanturfTown_PokemonCenter_2F.inc | 8 +- data/maps/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 8a0795266..69b3629f6 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 b01dd1e72..e7e48568c 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 3c3a18d4a..f0e276032 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 7a71cdcfc..d1ee69499 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 dbc5d432b..e352635a5 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 cf6369dd6..1f1cab59a 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 12bbe1366..7dfb4d059 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 1aa5ad50f..40e4600af 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 429159059..072892b0a 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 3b3d5976b..50bc7c0ee 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 007154587..4950be4ac 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 44d9b8fea..7d0befd16 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 e279951fc..31108fa9c 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 15cedf8b9..eca22f5f7 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 33c1cb945..edd7429a3 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 fb9f89623..a0b96c316 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 c8cd0042e..ce6eeb952 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 14f1b7d86..03a2cb14d 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 d1c689967..d0343228b 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 b811d409e..2500a826b 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 815740549..8a8d5448e 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 da6e3ef87..9c6eb2649 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 db8cccf1c..7f2133ac5 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 c3d3ea89e..2ea1fbd41 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 b25212cde..13de4c539 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 a3bcf13b3..b8ffbfc6d 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 9b9e3d717..bc1d5a525 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 91311b8da..f6baf26f6 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 42b4da80e..56da378cb 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 df9bd1572..67ceaaae6 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 4cd129739..45d3da103 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 d5b5898cd..80c1fc3bf 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 95b7c6781..9cff20517 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 e1668644e..7a23ba892 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 574da0ed3..7a8c584ac 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 141482321..f7d22a5ed 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 429312ef0..28b5f5c61 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 7aede3926..f724f4f9f 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 7e702f40b..0bc8d0434 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 991c0843a..f97d8ad0c 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 1e0e49315..23f3377f3 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 454e83ffb..9dce5da52 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 6ee887d94..321fc90e3 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 3b6c1a6f2..86e159b63 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 0c313dc97..0c730f37d 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 fac8f7838..b6c6ecdd0 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 bb08de8c7..0616573bd 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 6475115ac..dbaa20fe1 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 5f10cb1b8..613adfae2 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 f33ceeb65..0224ae0a9 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 24dca320a..092be452b 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 bccac94bd..c5490d6c9 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 816e07782..116cc007f 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 7864c3179..6500ab66a 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 18e37be73..669945b99 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 a5772cf1a..37fa6e7bd 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 cbbd9af32..643e26e2e 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 9566f2fe2..ba07ed15c 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 548e1a351..bb5bb6119 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 636b6c281..239c372c6 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 f73308cb9..34db359fc 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 11c166684..6e3de083c 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 99ac3006d..677499152 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 28242dded..1133979ee 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 bec280de6..95fdb77bc 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 5b517b23b..3b19c7f09 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 7e08946d4..17f6aab60 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 608021a71..6ae39b52f 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 79e6065a8..788c5e40c 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 6d286a003..780fab9ed 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 c8c99f4b9..569059af5 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 3f0c6b6aa..ae3c4f88e 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 e4cec618d..0389ee141 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 aadd2f71f..db27c6c64 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 be42aa8d2..12ac8ffe7 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 656685c60..c63fabee3 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 ddf3bf62f..f2332f18b 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 d402e98b9..38d398b5b 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 06af73f75..86f4d43cb 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 f10f53a56..f5c38358d 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 5fc4bb914..72a2c6210 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 b0d3b4ddf..b7ccd35b0 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 ade5f063a..05fb939a0 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 2d62e7010..c96b4c95e 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 c922f9c3a..11f5d5a92 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 deb53eba5..e12a02a3c 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 9bed65eba..849bb0244 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 13fa5d0cf..8aec9176b 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 c6e4d09c6..aad05249c 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 2c2b2c3a2..9c739974b 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 1fe09d043..6226fe527 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 2a9d327a0..56eda4374 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 5e90b9294..c8d85fd98 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 6951814ae..50fc7fbdc 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 91a85ca54..c9b5ef7fd 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 5cb55a34a..1f7e26046 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 09117ab15..98671f414 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 22e40d240..536dbf934 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 8900d7f8e..a09e8ed31 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 3547e1349..1823af7cd 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 8d90f004e..91a98cc28 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 b1f7eb6db..c4e35ebbb 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 08762f267..471ca66a3 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 d672c382a..570287ae3 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 d5eea14e3..5c2323b74 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 cb3094441..342e2e60b 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 e44e4098f..6d7188c6a 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 d8113295f..368190914 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 513c483fd..9162a2822 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 ec06d4312..8af15533b 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 fa8f709cc..c2cd25b40 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 c37b27057..37fecaf5e 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 262b6c6a7..c943e230d 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 a956d1b20..fe85e94d6 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 478393dc6..234c10b0c 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 c5efd81e6..99d34626c 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 aa384c3ed..2d78b2774 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 d247f002c..54ac6ed6a 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 c7bebb95b..1bddf3416 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 cea1ff532..d6c03578e 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 49e2adc71..115b04ccd 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 5ddc96e63..4b681b5cb 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 21f920838..7a7f666b2 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 05f53c968..83368e186 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 914da7523..90b0f498e 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 d1ba08ba3..d7ce41812 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 c6abd9e5a..49e808cda 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 dbda93e9c..5dafdf1fd 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 3738636c8..d7807a725 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 12dd9bdd2..fe193cd97 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 cf3f26095..cf32b8377 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 24521f246..cc35053f0 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 0169d4a56..eabf8e51d 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 f8b0a950c..dd5ffdbe9 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 436d5c41a..17809fc45 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 bb12cf30c..0206eefd7 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 674ebef23..767f01713 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 889dcb9b7..3191e7533 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 d1c602705..343249c2d 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 036bf0173..dd5655beb 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 879c720c0..d7c31c837 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 e93810aa9..7ccbc4aec 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 fd0afa038..631eba91b 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 e8e472283..bdeda0bd9 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 d0bb04e59..aca7598ec 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 4d8dcf9c2..17a6db615 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 e66e9bc35..1747ece5a 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 ff535abf5..93ef37b4b 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 b344e7d3d..5e6d0d94a 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 62db69ab6..f2b9b130a 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 3d03eea7e..73d21e9ce 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 dc14e4291..d268037ba 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 9c7237adc..7e5276102 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 63051a087..4f582bdef 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 db9bc7469..e85c296d3 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 ef490466c..47b39c6ee 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 f4338de64..ba1e74e65 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 5d1c20b47..784b388ae 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 17dab4016..dce57df3d 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 525622b61..ec8e4cf6e 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 dee64a91f..228e56e4d 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 0d524368e..c1bdfe3fb 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 47c07619f..23b8cc3e5 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 9105ae42c..cd08fbad8 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 094e010be..a6649c9b6 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 aecede5ed..6822c20e8 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 b2038db60..a5f1dd43c 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 318b3171b..a4596ce5c 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 6418b5acc..1274e2373 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 51ca352a2..32f835efc 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 262fc3378..5567bf9cf 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 c5710463d..b2f157f57 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 59ff76519..27ea129c3 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 acbe98510..3f96b5652 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 0c7b58257..1865c3b84 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 a5db369da..14903539b 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 b4a0eddaf..c8318005c 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 dbd7cc795..b4c0d19df 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 59a40a11f..a956f16d8 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 30d757b43..08c8db444 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 dcdec217a..2590e33b9 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 9dc17584a..f8e04f5ea 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 be12e7d02..f67840783 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 6134b9d35..adab7d3e4 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 52cf72422..c3a0c4990 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 d0f3aa45e..977559950 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 c5bb29dfc..0436851c5 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 8396ced4c..8e2c9e1c4 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 e5547c698..ff920f86d 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 4163ccee9..e12b4873d 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 f751efe02..7b215a83a 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 3d3a7ee4e..d288400b5 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 00f32e95a..42face3c4 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 8a7cfe939..7146d30b8 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 3071139a7..e383463af 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 5da968bfa..a7832fb09 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 f1b535b17..86ba58946 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 2cca573a8..e40e79e10 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 30a5719a8..96d8fe7d8 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 888473e5c..d8314e6e5 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 999d16a11..7e56185b2 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 aa37daee5..c5d5af15a 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 5ffce1444..fa5a8f3bb 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 30b594234..bf143934e 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 db7f2ed59..0ee8e7d15 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 3be5fbbe5..bb7e1a913 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 5c3f44889..19385b3d5 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 9cebbca5e..80bf46c2e 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 9d9ceb376..d5b24c06f 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 c788ae13d..bf0d1af77 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 5374e6048..e39075d8b 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 591b90bef..03a9b773f 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 8c319b3a0..1f00209b2 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 cb3ea04d1..badd884f9 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 25b61fe19..2df3aaafd 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 49743dfe4..fec170ae9 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 60e4a6935..2ffdc5fa1 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 ec3d8322a..dc7c1e7df 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 5ecd2f8bf..794f1965c 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 c68db0e45..b7bc6ab08 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 a6be12d7a..cf853c8ac 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 715dd39aa..2feeb8949 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 b5e49095a..f850fa482 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 6aff86066..bb102baab 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 d0fc7a9d3..b25b155ea 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 ab11ee74e..41d54e9fc 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 21dc0c13f..77ca4c832 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 a16c5220b..450533014 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 649f6b288..635ba86a7 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 f9b415d68..e5f8dd4f1 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 a5548861d..febb80ad6 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 13525ab16..66b8caa67 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 3d4626c69..1aa279980 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 a5f45989b..29fe0e02e 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 26d992172..2df386d2c 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 b4667f6ed..dcd3b071f 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 85e686c19..7d1a863cb 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 8dedf60a7..3dc327c6a 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 29b3917f5..e7a4ec6e6 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 9ebe184ef..7d2ff52f4 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 d681d2b92..563d61579 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 08fe0e6ae..da904f8ef 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 3019e5f3c..7970c14ba 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 f8c17146b..82b674f9e 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 68abe716b..fc30a195c 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 c7ce68b44..e4bf74177 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 6d35c1bee..315b5614e 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 d14d62c2b..9eccc2286 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 abd57bcd0..025daad04 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 4654b470a..bbe9cf73b 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 2697c4240..8fdbaad5f 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 609c6a808..f748e2ff9 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 64e9f746c..0a0b448c4 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 e21a54ab2..1d847897d 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 4812c3d06..140b92a21 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 3fc6257cc..c982ededf 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 c84b06c1a..ed1750f79 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 4f9ea356c..5ad30e6c1 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 d868b6cd0..12659457a 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 3ce8e5942..30a6892df 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 f3abb09d7..05824aa38 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 dd02e5319..a7259e3b3 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 683718363..2f95cf052 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 93856f7b6..b0dd3abf6 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 9bf01f4b6..8da7daf11 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 8e29b4ee1..7fc098f2c 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 e6d50dca5..e72aa929a 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 1556a9516..eacc9e940 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 1d9aa1111..cea2db8d5 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 4fd7d1952..5ade76ba3 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 3585e27e6..0fe5b5df4 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 683f43ffd..0e218cd78 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 7a18ffd40..77f37d72c 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 990df8f7f..25287a747 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 7502ed737..1d5104e1c 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 d250d801e..3e48c5721 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 06788e39d..c947d9d8f 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 64ff21b89..99edadee1 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 81633507d..352bb2037 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 a698b98d8..37d886e7f 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 e36c02de4..16afe4482 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 7a7ce7855..8d133ab6d 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 df4bf6f11..f84ef6212 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 3182c9c83..05220bdc9 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 6b3379504..5e732890d 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 a5e781b87..bd10dc05b 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 31dd51afd..05d426fe5 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 2e308bf4f..ee9f42ac5 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 bf900b67b..4196be41b 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 d2b22f730..a19a70f33 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 77dec98a5..17ddae47f 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 2b56e1b1a..2d8351534 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 717fce4d0..0fc1b015b 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 f889fe387..3f4725870 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 6125be0cf..2dc839783 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 71bbc705f..606138e38 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 2ca6fb70b..b767e512d 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 981e6f1d4..cf87bb74e 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 656733d0d..b7c378a96 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 42cab969e..c34f6eb16 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 21c6fc6bd..7c1425ebe 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 a895743d1..ad1429553 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 5dff94bb7..2bb2c5cbc 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 49cfd07e4..19ff5ccc8 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 13bd5f6e2..6adfce330 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 df70e9af8..5a2d57417 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 67d3d3eaa..b71bdb875 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 fd69ad6de..db9b6f56d 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 1746830f0..c6d4048c4 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 da0c5ece2..31a3d1de6 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 56e4295d0..8db3c085c 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 dd869ef29..1f2ae85fd 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 bafe8d868..647e7a437 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 df833517f..392f5b1fa 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 76454e567..9914eed3c 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 dd6e34257..4a67fdc47 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 47842da53..193c41685 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 985fad05a..1d2b2d0b7 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 a75f50ab1..3a4e5e15e 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 0e8c6ca9e..07234fc2e 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 9eba87eda..038d13bf7 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 94293fcb5..e2945f435 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 e91cca2c8..d1ec1adb9 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 56077139f..2deabdb5c 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 a72400e5b..e294e200e 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 866fdf78e..8f0b1de77 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 ef83b3293..969830d37 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 42f5fd605..a9900294c 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 99d2b5860..88b41669b 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 d355654cd..e71ba4dd5 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 2fa67c714..8e5b242b9 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 9ba24ae2b..0607ffcc7 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 d1fbf95ed..46173d11a 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 f14779cdb..af2da0575 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 a6567b476..ccd775dd2 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 160a59a3c..588b7a9ae 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 7bb9d1ae4..e27362f00 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 83b69c739..261314b9b 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 c8f58a15c..01f6f3ba5 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 8319729bf..300db40c5 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 846e33964..6b6df78f2 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 17ead20a3..97787ebbf 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 1fa73357d..42dcf9faa 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 3e370d8dc..ac3337bed 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 2a0f7eff1..2905764cf 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 68e554b05..8202b7a42 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 de02278b3..733b674b7 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 9b9f577b7..afd1622b8 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 b1edf9985..e4fffab49 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 dceb7a584..29e90b592 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 4b8b7674f..3322b9d5a 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 1c2ad2d49..310033947 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 72592ec7d..eba992586 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 0aae19f6a..c6f534965 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 acdc616d2..dda054b44 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 b5863d41c..54e33dc3d 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 051297cd3..acdac9692 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 e9acfd82b..a370d2e72 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 965d19f70..942be3617 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 60de85b7f..a027b266b 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 01052acc2..3379e8ecb 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 0317dfbcf..e330951cf 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 061179987..b4a8c2eb3 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 b190e4f1e..4c57fcdfd 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 623c8f970..e7f4ed7ce 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 60434dec9..84aabf3d4 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 dda1bf65b..2e1d61708 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 f525839b5..07ac363ac 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 f044adda4..1f4a008e3 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 10ce11a10..57922e322 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 d6ba2a87f..f1d894264 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 6063c4e85..d3d656452 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 7e477c0f2..875f337a5 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 809a69ee8..4ef0de89f 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 6afadc9e8..4fb4cc010 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 14b562cf7..26bccf67f 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 3b9571d8b..b8480dfb6 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 4330ec1dd..ce13a5899 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 57292c37f..b56b50a0e 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 da8a11ebf..0ceca119b 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 16782cbe6..af274e22f 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 bb5e3c89f..493bb2922 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 55a83d72c..42d0e3660 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 e09928a4c..d6391598e 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 9d18bcd82..cfe385a3c 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 f404c972b..dc0c8a8d9 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 d0c3b1d3c..f59413aba 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 3861219ec..f59512311 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 68d8f3082..92974f5b4 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 b4c6e9973..b231f9816 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 de45f1922..450f40fe7 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 6835fc726..96aaefd9c 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 b0f2f6aa9..925acc34b 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 a493060de..1ed20fc94 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 af321c802..4ddbd23ea 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 f0e2b4455..213fe39d3 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 bd85df987..0feca97cb 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 0e94e891f..1f14ba6e9 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 a574df2e9..566631c02 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 4e1b102d8..a85356317 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 da06db206..65b0cf9dd 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 9f17b52da..84e642bac 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 3a38d7a58..0c32cb482 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 9bd3c91d5..bf06c2cd9 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 22bcf07ea..21ea255a4 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 92f09cdd9..9bca02a56 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 a7937f820..8498f9de2 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 8f1a22b22..69cddf603 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 0a53cc249..c31a5568b 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 e46dad94b..61edb1e28 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 c767f78df..89e5eac90 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 ac7a4d9f5..7af4c5425 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 04fac8066..4b974ce9b 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 3ce2b9684..c322d7e96 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 4d9d8ba14..a22465ca0 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 5aa373053..1a50ea7d8 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 385d92e88..c844cfa1a 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 240d64cdd..6276192b3 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 1b85d4a3f..4fa836d58 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 fa54d8b65..570e600fe 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 001d6ac1a..fd5fa0292 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 feaf1afa1..49b8d47ee 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 2d2440d55..804f39647 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 8727bc43f..77bd6748c 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 92fc90e6d..40cbe6aec 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 e537d66f8..cfa46e102 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 e9958393a..d5fa881dc 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 b480855d9..26d67171d 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 d5f92efdb..a25c76c81 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 -- cgit v1.2.3 From 7ea5dd7923eb9a44609a6cdaff331f7cd97bb34a Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 16 Jun 2018 00:45:48 +0200 Subject: start fldeffect cut --- asm/fldeff_80F9BCC.s | 24 +- asm/fldeff_cut.s | 1294 +--------------------- asm/party_menu.s | 38 +- asm/pokemon_summary_screen.s | 2 +- src/data/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 840d38f64..3cfbe215a 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 19a29d729..fa7ac7321 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 4001b7144..5c1e6c1b0 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 c7f2ad085..d758aa314 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 3d4303189..b226b066a 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 d9c3078da..59990f22e 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 9929dd6f9..a007c8ca7 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" + +// tileset 0 as first +#define METATILE_ID_GRASS 0x1 +#define METATILE_ID_POKE_GRASS 0xD + +#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 +*/ -// Static type declarations +#define CUT_HYPER_SIDE 5 +#define CUT_HYPER_AREA CUT_HYPER_SIDE * CUT_HYPER_SIDE +/* P - player + X - cut area -// Static RAM declarations + 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]; + +struct HyperCutterUnk +{ + s8 x; + s8 y; + u8 unk2[2]; +}; + +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}}, +}; + +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; +} -// Static ROM declarations +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]); -// .rodata + 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]++; -// .text + 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 4f3a091ce..654f02c23 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 162479c73..52b76edb4 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 100e440a5..14da87eb3 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 1b88b42d7..e82a26cd1 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 ad0062c20..a5e328e4a 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 1e4116053..99670dfe2 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 cdc1064dd..cec2cfcb6 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 7080ae6a8..6371acff0 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 -- cgit v1.2.3 From 3bcd30969a8b7ced6e9fa54e1fc0f8447c2983bc Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 16 Jun 2018 14:04:29 +0200 Subject: 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 +- graphics/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 | 445 ++++++++++++--------- src/item_use.c | 8 +- src/start_menu.c | 10 +- sym_ewram.txt | 9 +- 21 files changed, 296 insertions(+), 462 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 08eaf949a..27627ac58 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 fa7ac7321..000000000 --- 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 00c8c8448..ecba5a627 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 687b67545..a3b97a759 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 581b72e43..c0c74496f 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 ee5a09c37..000000000 --- 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 ebd596870..eedcd4377 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 000000000..3c41d28b3 Binary files /dev/null and b/graphics/event_objects/pics/effects/cut_grass.png differ 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 3ee87e1cd..000000000 Binary files a/graphics/event_objects/pics/effects/unknown_4F6D38/0.png and /dev/null differ diff --git a/include/field_effect.h b/include/field_effect.h index 800048605..9c9501bfa 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -78,8 +78,8 @@ enum FieldEffectScriptIdx }; extern s32 gFieldEffectArguments[8]; -extern void (*gUnknown_0203CEEC)(void); -extern bool8 (*gUnknown_03005DB0)(void); +extern void (*gPostMenuFieldCallback)(void); +extern bool8 (*gFieldCallback2)(void); u32 FieldEffectStart(u8); bool8 FieldEffectActiveListContains(u8 id); diff --git a/include/fldeff_cut.h b/include/fldeff_cut.h index f985fd82d..c89d3b6ca 100644 --- a/include/fldeff_cut.h +++ b/include/fldeff_cut.h @@ -1,7 +1,13 @@ #ifndef GUARD_FLDEFF_CUT_H #define GUARD_FLDEFF_CUT_H -void sub_80D423C(s16, s16); -void sub_80D42B8(s16, s16); +extern const struct SpritePalette gFieldEffectObjectPaletteInfo6; + +bool8 SetUpFieldMove_Cut(void); +bool8 FldEff_UseCutOnGrass(void); +bool8 FldEff_UseCutOnTree(void); +bool8 FldEff_CutGrass(void); +void sub_80D423C(s16 x, s16 y); +void sub_80D42B8(s16 x, s16 y); #endif // GUARD_FLDEFF_CUT_H diff --git a/include/global.h b/include/global.h index d26184270..f4d5202ab 100644 --- a/include/global.h +++ b/include/global.h @@ -859,7 +859,7 @@ struct MapPosition { s16 x; s16 y; - u8 height; + s8 height; }; struct UnkStruct_8054FF8 diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h index 4b9fd2488..86a67ab3e 100644 --- a/include/metatile_behavior.h +++ b/include/metatile_behavior.h @@ -74,7 +74,7 @@ bool8 MetatileBehavior_IsPuddle(u8); bool8 MetatileBehavior_IsTallGrass(u8); bool8 MetatileBehavior_IsLongGrass(u8); bool8 MetatileBehavior_IsBerryTreeSoil(u8); -bool8 MetatileBehavior_IsAsh(u8); +bool8 MetatileBehavior_IsAshGrass(u8); bool8 MetatileBehavior_IsUnusedFootprintMetatile(u8); bool8 MetatileBehavior_IsBridge(u8); u8 MetatileBehavior_GetBridgeSth(u8); diff --git a/include/party_menu.h b/include/party_menu.h index c96eb0d9d..2cf17f1e4 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -28,7 +28,7 @@ void DoWallyTutorialBagMenu(void); u8 pokemon_ailments_get_primary(u32 status); u8 *GetMonNickname(struct Pokemon *mon, u8 *dst); u8 GetCursorSelectionMonId(void); -bool8 FieldCallback_Teleport(void); +bool8 FieldCallback_PrepareFadeInFromMenu(void); void sub_81B7F60(void); void sub_81B0FCC(u8 partyIdx, u8 a); diff --git a/include/rom6.h b/include/rom6.h index 058504fe2..629df57fe 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 npc_before_player_of_type(u8); +bool8 SetLastTalkedObjectInFrontOfPlayer(u8); u8 oei_task_add(void); #endif //GUARD_ROM6_H diff --git a/ld_script.txt b/ld_script.txt index 1949d0480..9e622eeb6 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -128,7 +128,7 @@ SECTIONS { asm/pokemon_storage_system.o(.text); src/pokemon_icon.o(.text); src/script_movement.o(.text); - asm/fldeff_cut.o(.text); + src/fldeff_cut.o(.text); src/mail_data.o(.text); src/map_name_popup.o(.text); src/item_menu_icons.o(.text); @@ -424,7 +424,7 @@ SECTIONS { src/pokemon_storage_system.o(.rodata); data/pokemon_storage_system.o(.rodata); src/pokemon_icon.o(.rodata); - data/fldeff_cut.o(.rodata); + src/fldeff_cut.o(.rodata); src/map_name_popup.o(.rodata); src/item_menu_icons.o(.rodata); data/contest.o(.rodata); diff --git a/src/event_obj_lock.c b/src/event_obj_lock.c index efa498c0f..8c324ea82 100644 --- a/src/event_obj_lock.c +++ b/src/event_obj_lock.c @@ -87,7 +87,7 @@ void LockSelectedEventObject(void) } } -void sub_80984F4(void) +void ScriptUnfreezeEventObjects(void) { u8 objectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); EventObjectClearHeldMovementIfFinished(&gEventObjects[objectId]); diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index a007c8ca7..615de0202 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -1,4 +1,5 @@ #include "global.h" +#include "fldeff_cut.h" #include "field_camera.h" #include "field_effect.h" #include "event_object_movement.h" @@ -18,6 +19,19 @@ #include "constants/songs.h" #include "constants/abilities.h" +extern bool8 SetLastTalkedObjectInFrontOfPlayer(u8); +extern u8 oei_task_add(void); +extern void ScriptUnfreezeEventObjects(void); +extern bool8 IsMewPlayingHideAndSeek(void); + +extern struct MapPosition gPlayerFacingPosition; + +extern const u8 Route103_EventScript_290705[]; +extern const u8 FarawayIsland_Interior_EventScript_267EDB[]; + +extern const u8 gFieldEffectPic_CutGrass[]; +extern const u16 gFieldEffectObjectPalette6[]; + // tileset 0 as first #define METATILE_ID_GRASS 0x1 #define METATILE_ID_POKE_GRASS 0xD @@ -31,7 +45,7 @@ #define METATILE_ID_GRASS_TREE_LEFT 0x1CE #define METATILE_ID_GRASS_TREE_RIGHT 0x1CF -#define METATILE_ID_POKE_TALL_GRASS 0x15 +#define METATILE_ID_POKE_LONG_GRASS 0x15 // tileset 6 as second #define METATILE_ID_POKE_STEP_LAVA_GRASS 0x206 @@ -44,53 +58,24 @@ #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); +#define METATILE_ID_POKE_LONG_GRASS_START 0x208 -extern struct MapPosition gPlayerFacingPosition; -extern u8 *gCutGrassSpriteArrayPtr; +#define METATILE_ID_SECRET_BASE_LEFT_LONG_GRASS 0x279 +#define METATILE_ID_SECRET_BASE_CENTER_LONG_GRASS 0x27A +#define METATILE_ID_SECRET_BASE_RIGHT_LONG_GRASS 0x27B -extern const u8 Route103_EventScript_290705[]; -extern const u8 gFieldEffectPic_CutGrass[]; -extern const u16 gFieldEffectObjectPalette6[]; +#define METATILE_ID_SECRET_BASE_LEFT_POKE_LONG_GRASS 0x281 +#define METATILE_ID_SECRET_BASE_CENTER_POKE_LONG_GRASS 0x282 +#define METATILE_ID_SECRET_BASE_RIGHT_POKE_LONG_GRASS 0x283 +// cut 'square' defines #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 bool8 gUnknown_03001108[CUT_HYPER_AREA]; + +#define CUT_SPRITE_ARRAY_COUNT 8 struct HyperCutterUnk { @@ -99,7 +84,30 @@ struct HyperCutterUnk u8 unk2[2]; }; -const struct HyperCutterUnk gUnknown_0857C608[] = +// this file's functions +static void FieldCallback_CutTree(void); +static void FieldCallback_CutGrass(void); +static void StartCutTreeFieldEffect(void); +static void StartCutGrassFieldEffect(void); +static void SetCutGrassMetatile(s16, s16); +static void SetCutGrassMetatiles(s16, s16); +static void CutGrassSpriteCallback1(struct Sprite *); +static void CutGrassSpriteCallback2(struct Sprite *); +static void CutGrassSpriteCallbackEnd(struct Sprite *); +static void HandleLongGrassOnHyper(u8, s16, s16); + +// IWRAM variables +static IWRAM_DATA u8 sCutSquareSide; +static IWRAM_DATA u8 sTileCountFromPlayer_X; +static IWRAM_DATA u8 sTileCountFromPlayer_Y; +static IWRAM_DATA u32 sUnused; +static IWRAM_DATA bool8 sHyperCutTiles[CUT_HYPER_AREA]; + +// EWRAM variables +static EWRAM_DATA u8 *sCutGrassSpriteArrayPtr = NULL; + +// const rom data +static const struct HyperCutterUnk sHyperCutStruct[] = { {-2, -2, {1}}, {-1, -2, {1}}, @@ -119,7 +127,7 @@ const struct HyperCutterUnk gUnknown_0857C608[] = {2, 2, {9}}, }; -const struct OamData gOamData_CutGrass = +static const struct OamData sOamData_CutGrass = { .y = 0, .affineMode = 0, @@ -136,53 +144,43 @@ const struct OamData gOamData_CutGrass = .affineParam = 0, }; -const union AnimCmd gSpriteAnim_CutGrass[] = +static const union AnimCmd sSpriteAnim_CutGrass[] = { ANIMCMD_FRAME(0, 30), ANIMCMD_JUMP(0), }; -const union AnimCmd *const gSpriteAnimTable_CutGrass[] = +static const union AnimCmd *const sSpriteAnimTable_CutGrass[] = { - gSpriteAnim_CutGrass, + sSpriteAnim_CutGrass, }; -const struct SpriteFrameImage gSpriteImageTable_CutGrass[] = +static const struct SpriteFrameImage sSpriteImageTable_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 = +static const struct SpriteTemplate sSpriteTemplate_CutGrass = { .tileTag = 0xFFFF, .paletteTag = 0x1000, - .oam = &gOamData_CutGrass, - .anims = gSpriteAnimTable_CutGrass, - .images = gSpriteImageTable_CutGrass, + .oam = &sOamData_CutGrass, + .anims = sSpriteAnimTable_CutGrass, + .images = sSpriteImageTable_CutGrass, .affineAnims = gDummySpriteAffineAnimTable, .callback = CutGrassSpriteCallback1, }; +// code bool8 SetUpFieldMove_Cut(void) { s16 x, y; u8 i, j; u8 tileBehavior; u8 userAbility; - bool8 array[CUT_NORMAL_AREA]; + bool8 cutTiles[CUT_NORMAL_AREA]; bool8 ret; if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_CUTTABLE_TREE) == TRUE) @@ -198,28 +196,28 @@ bool8 SetUpFieldMove_Cut(void) userAbility = GetMonAbility(&gPlayerParty[GetCursorSelectionMonId()]); if (userAbility == ABILITY_HYPER_CUTTER) { - gUnknown_03001100 = 5; - gUnknown_03001101 = 2; - gUnknown_03001102 = 2; + sCutSquareSide = CUT_HYPER_SIDE; + sTileCountFromPlayer_X = 2; + sTileCountFromPlayer_Y = 2; } else { - gUnknown_03001100 = 3; - gUnknown_03001101 = 1; - gUnknown_03001102 = 1; + sCutSquareSide = CUT_NORMAL_SIDE; + sTileCountFromPlayer_X = 1; + sTileCountFromPlayer_Y = 1; } for (i = 0; i < CUT_NORMAL_AREA; i++) - array[i] = FALSE; + cutTiles[i] = FALSE; for (i = 0; i < CUT_HYPER_AREA; i++) - gUnknown_03001108[i] = FALSE; + sHyperCutTiles[i] = FALSE; ret = FALSE; - for (i = 0; i < 3; i++) + for (i = 0; i < CUT_NORMAL_SIDE; i++) { y = i - 1 + gPlayerFacingPosition.y; - for (j = 0; j < 3; j++) + for (j = 0; j < CUT_NORMAL_SIDE; j++) { x = j - 1 + gPlayerFacingPosition.x; if (MapGridGetZCoordAt(x, y) == gPlayerFacingPosition.height) @@ -229,23 +227,23 @@ bool8 SetUpFieldMove_Cut(void) || MetatileBehavior_IsAshGrass(tileBehavior) == TRUE) { // Standing in front of grass. - gUnknown_03001108[6 + (i * 5) + j] = TRUE; + sHyperCutTiles[6 + (i * 5) + j] = TRUE; ret = TRUE; } if (MapGridIsImpassableAt(x, y) == TRUE) { - array[i * 3 + j] = FALSE; + cutTiles[i * 3 + j] = FALSE; } else { - array[i * 3 + j] = TRUE; + cutTiles[i * 3 + j] = TRUE; if (MetatileBehavior_IsCuttableGrass(tileBehavior) == TRUE) - gUnknown_03001108[6 + (i * 5) + j] = TRUE; + sHyperCutTiles[6 + (i * 5) + j] = TRUE; } } else { - array[i * 3 + j] = FALSE; + cutTiles[i * 3 + j] = FALSE; } } } @@ -260,45 +258,45 @@ bool8 SetUpFieldMove_Cut(void) } else { - bool8 r7; + bool8 tileCuttable; for (i = 0; i < 16; i++) { - x = gPlayerFacingPosition.x + gUnknown_0857C608[i].x; - y = gPlayerFacingPosition.y + gUnknown_0857C608[i].y; - r7 = TRUE; + x = gPlayerFacingPosition.x + sHyperCutStruct[i].x; + y = gPlayerFacingPosition.y + sHyperCutStruct[i].y; + tileCuttable = TRUE; j = 0; while (1) { - if (gUnknown_0857C608[i].unk2[j] == 0) + if (sHyperCutStruct[i].unk2[j] == 0) break; - if (array[(u8)(gUnknown_0857C608[i].unk2[j] - 1)] == FALSE) + if (cutTiles[(u8)(sHyperCutStruct[i].unk2[j] - 1)] == FALSE) { - r7 = FALSE; + tileCuttable = FALSE; break; } if (++j >= 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 96f63ee3e..5bbc1d50e 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 6371acff0..5900cced1 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 7ea9bef79..a4eece919 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 -- cgit v1.2.3 From 46f9b83fe54b2c0b2a81c60de143ba0abcb75ec9 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 16 Jun 2018 11:39:54 -0500 Subject: 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 fef1fc0eb..aad16906c 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 000000000..8ee02036d --- /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 000000000..336a8103e --- /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 -- cgit v1.2.3 From 4ab87bf8f3fd527d0b5120344f84b73d309693db Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 16 Jun 2018 18:50:31 -0500 Subject: 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 336a8103e..86da74c87 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 -- cgit v1.2.3 From 0fe3e612ebd3e7f49f930f7ae40aa9d9267862fa Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 17 Jun 2018 12:30:09 +0200 Subject: 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 | 30 +- src/recorded_battle.c | 8 +- src/start_menu.c | 82 +++-- src/tv.c | 22 +- src/wild_encounter.c | 4 +- 23 files changed, 465 insertions(+), 806 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 8253d4f98..c967390d0 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 06cfac50e..000000000 --- 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 3f8f8049d..d410749b9 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 9d4553132..d8a3dc9a8 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 d26184270..b877592bd 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 2088d1826..7e1169ec3 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 1949d0480..566059e20 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 a4aac55e2..e81fcabe6 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 d742d5df2..aaaaebd8d 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 e0694029a..9fc0c68ea 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 2b918d018..0a712c79b 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 8649209c0..ace481c26 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 ccc36b7c2..c8440a35f 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 000000000..85640e8e5 --- /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 319d167fc..30710d08a 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 1782e9af8..34415a16e 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 c387bce65..8b8436d10 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 800b7c0cd..dac8e0197 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 35e518d8a..8b21e214f 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_120[i].field_8 = gSaveBlock2Ptr->field_CFC[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->frontier.field_CFC[i]; } } diff --git a/src/recorded_battle.c b/src/recorded_battle.c index eb48ab15a..a9360d49a 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 7080ae6a8..dad107887 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 2219a720b..297754dfb 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 862672e19..97fa186ea 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; -- cgit v1.2.3 From 9329ffc2bc4435337f456334046eba18e2d27302 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 17 Jun 2018 12:39:58 +0200 Subject: 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 00814192e..f047c78a3 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 615de0202..bdc9b7868 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 52b76edb4..fb5aa5e95 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 cec2cfcb6..6c7439622 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; -- cgit v1.2.3 From caa36b530a93dc51727822abf6c4c31fa8cbaf63 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 17 Jun 2018 16:48:58 +0200 Subject: 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 | 688 +++++++++++++++++++++++++---- 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, 1363 insertions(+), 847 deletions(-) diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s index b2b454278..02bfe8b3b 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 eb423cf4c..a6b522a7e 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 4001b7144..6e2b1e55a 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 5988eb732..f2b9a5563 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 c7f2ad085..901669715 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 00c8c8448..a9c1ec7e6 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 f906304ca..b43978f84 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 b498da70d..515174151 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 fc475c2e3..1719833a5 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 b96fb8ca9..0d7353938 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 8d759b0b2..17a44ecbc 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 ae8a1c98a..bf875ad9d 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 316f76de6..d23ad048a 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 7fc09fbf7..dac41c992 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 bf9b590af..f792ff7b0 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 e5c1aaf18..0b5590011 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 2ac13fab7..3d2b8692f 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 e1a9168a9..131598985 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: - 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_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: + 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 (BATTLE_HISTORY->usedMoves[gBattlerTarget].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; - } + } + 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 83ad2b4fd..a105e7edf 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 8071736e6..b6f726897 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 2316b9759..5a829171e 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 d4bfd297a..4895e9643 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 a4aac55e2..905e957ea 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 d742d5df2..3178bad0e 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 64cf16b86..ae407af24 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 e0694029a..627b13e22 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 f18f582f7..25eef4c5c 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 4d1ccbaca..b4bdfaa4e 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 b16c3f307..24cb58ea4 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 09776f150..245447d8d 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 ca7b2fd44..e8efb404f 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 8649209c0..2d24d0dab 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 1f338db92..896b2197e 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[] = -{ - 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 +static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = +{ + { // 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[] = -{ - 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 +static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = +{ + { // 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 811aba128..c26e5ac11 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 2edb14748..55431af72 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 ca2037d2f..266ea8250 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 1ed38c67e..00e6236fe 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 74eac32de..84f00418c 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 b7d677c90..1edf1ab51 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 83df30d05..b0388e971 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 0642c771e..5a0929a7c 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 de7de8269..d4a8976a5 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 3490424af..0f703a014 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 dedfcc3be..79c70e619 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 8a7671c5b..c7247b696 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 216c9e2c5..518acd792 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 db92d56a8..d3fdbd355 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 f16787fc9..0a6c08234 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 45f0f5a9e..4456e450c 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 4e3fceb10..a09e911f0 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 7080ae6a8..43b4f85f2 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 480edbcb7..b2160a5a6 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 c3b9f7197..35afc2004 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 c8898d08f..1fb4c411f 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 f15bbbc27..80383c26d 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(); -- cgit v1.2.3 From 94752d420769dfc205b3f717c660f33a6eb2b6fb Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 19 Jun 2018 00:43:15 +0200 Subject: 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 | 132 +++--- src/battle_interface.c | 740 +++++++++++++++--------------- src/pokeball.c | 6 +- 15 files changed, 469 insertions(+), 447 deletions(-) diff --git a/include/battle.h b/include/battle.h index bf875ad9d..62caa2cfe 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 e1c6325b6..16253e760 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 fe8c03f70..b917d2cb3 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 905e957ea..b2c05664b 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 3178bad0e..f7abe589a 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 ae407af24..21b45dabf 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 627b13e22..599ebfee4 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 25eef4c5c..df075522e 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 b4bdfaa4e..69f93d7e2 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 24cb58ea4..54ca4578b 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 e8efb404f..955799ee3 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 2b918d018..8a7ff7b5d 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 d2c242553..47af1b9dd 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]); - - 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); + 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[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 9ef45020d..94b5a2be9 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 8173c4a90..3dbbb2967 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); -- cgit v1.2.3 From ab36efdaf4a7f64df9bbfae153eb88cd9c5b29b0 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 20 Jun 2018 23:07:51 +0200 Subject: 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 | 194 +++++++++++++++-------------- src/hall_of_fame.c | 2 +- 17 files changed, 327 insertions(+), 296 deletions(-) diff --git a/include/battle.h b/include/battle.h index 62caa2cfe..2651407fb 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 a0fc41b52..c5f5f48d7 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 a725b631f..27e61c8fc 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 d26184270..5a37cdc1b 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 b2c05664b..0a53c2893 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 f7abe589a..f5987c0ce 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 21b45dabf..83dac5436 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 599ebfee4..63dc989be 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 df075522e..17ed1c24f 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 69f93d7e2..9d213fc6b 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 54ca4578b..d1836c092 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 245447d8d..3cdd952ef 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 955799ee3..05c7b9e1f 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 8a7ff7b5d..1c60e22ef 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 94b5a2be9..f5e031cb9 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 2d24d0dab..9afbc7f40 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; - } - else - { - if (gBattleSpritesDataPtr->healthBoxesData[battler].flag_x4) + break; + case BOUNCE_MON: + if (gBattleSpritesDataPtr->healthBoxesData[battler].battlerIsBouncing) return; + break; } - bounceHealthBoxSpriteId = CreateInvisibleSpriteWithCallback(SpriteCB_HealthBoxBounce); - if (b == TRUE) + invisibleSpriteId = CreateInvisibleSpriteWithCallback(SpriteCB_BounceEffect); + if (which == BOUNCE_HEALTHBOX) { - spriteId2 = gHealthboxSpriteIds[battler]; - gBattleSpritesDataPtr->healthBoxesData[battler].field_2 = bounceHealthBoxSpriteId; - gBattleSpritesDataPtr->healthBoxesData[battler].flag_x2 = 1; - gSprites[bounceHealthBoxSpriteId].data[0] = 0x80; + bouncerSpriteId = gHealthboxSpriteIds[battler]; + gBattleSpritesDataPtr->healthBoxesData[battler].healthboxBounceSpriteId = invisibleSpriteId; + gBattleSpritesDataPtr->healthBoxesData[battler].healthboxIsBouncing = 1; + gSprites[invisibleSpriteId].sSinIndex = 128; // 0 } 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; + bouncerSpriteId = gBattlerSpriteIds[battler]; + gBattleSpritesDataPtr->healthBoxesData[battler].battlerBounceSpriteId = invisibleSpriteId; + gBattleSpritesDataPtr->healthBoxesData[battler].battlerIsBouncing = 1; + gSprites[invisibleSpriteId].sSinIndex = 192; // -1 + } + 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 b0388e971..78b615407 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 -- cgit v1.2.3 From 89d35e82a27c7328bf5987b4993b3456bb78f440 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:41:17 -0500 Subject: Move 'map attributes' into 'layouts' --- Makefile | 2 +- data/layouts.inc | 441 ++ .../AbandonedShip_CaptainsOffice/border.bin | 1 + .../AbandonedShip_CaptainsOffice/layout.inc | 16 + data/layouts/AbandonedShip_CaptainsOffice/map.bin | Bin 0 -> 126 bytes data/layouts/AbandonedShip_Corridors_1F/border.bin | 1 + data/layouts/AbandonedShip_Corridors_1F/layout.inc | 16 + data/layouts/AbandonedShip_Corridors_1F/map.bin | 3 + .../layouts/AbandonedShip_Corridors_B1F/border.bin | 1 + .../layouts/AbandonedShip_Corridors_B1F/layout.inc | 16 + data/layouts/AbandonedShip_Corridors_B1F/map.bin | 1 + data/layouts/AbandonedShip_Deck/border.bin | 1 + data/layouts/AbandonedShip_Deck/layout.inc | 16 + data/layouts/AbandonedShip_Deck/map.bin | 1 + .../AbandonedShip_HiddenFloorCorridors/border.bin | 1 + .../AbandonedShip_HiddenFloorCorridors/layout.inc | 16 + .../AbandonedShip_HiddenFloorCorridors/map.bin | 1 + .../AbandonedShip_HiddenFloorRooms/border.bin | 1 + .../AbandonedShip_HiddenFloorRooms/layout.inc | 16 + .../layouts/AbandonedShip_HiddenFloorRooms/map.bin | 1 + data/layouts/AbandonedShip_Room_B1F/border.bin | 1 + data/layouts/AbandonedShip_Room_B1F/layout.inc | 16 + data/layouts/AbandonedShip_Room_B1F/map.bin | 1 + data/layouts/AbandonedShip_Rooms2_1F/border.bin | 1 + data/layouts/AbandonedShip_Rooms2_1F/layout.inc | 16 + data/layouts/AbandonedShip_Rooms2_1F/map.bin | 1 + data/layouts/AbandonedShip_Rooms2_B1F/border.bin | 1 + data/layouts/AbandonedShip_Rooms2_B1F/layout.inc | 16 + data/layouts/AbandonedShip_Rooms2_B1F/map.bin | 1 + data/layouts/AbandonedShip_Rooms_1F/border.bin | 1 + data/layouts/AbandonedShip_Rooms_1F/layout.inc | 16 + data/layouts/AbandonedShip_Rooms_1F/map.bin | 1 + data/layouts/AbandonedShip_Rooms_B1F/border.bin | 1 + data/layouts/AbandonedShip_Rooms_B1F/layout.inc | 16 + data/layouts/AbandonedShip_Rooms_B1F/map.bin | 1 + data/layouts/AbandonedShip_Underwater1/border.bin | 1 + data/layouts/AbandonedShip_Underwater1/layout.inc | 16 + data/layouts/AbandonedShip_Underwater1/map.bin | 1 + data/layouts/AbandonedShip_Underwater2/border.bin | 1 + data/layouts/AbandonedShip_Underwater2/layout.inc | 16 + data/layouts/AbandonedShip_Underwater2/map.bin | 1 + data/layouts/AlteringCave/border.bin | 1 + data/layouts/AlteringCave/layout.inc | 16 + data/layouts/AlteringCave/map.bin | 1 + data/layouts/AncientTomb/border.bin | 1 + data/layouts/AncientTomb/layout.inc | 16 + data/layouts/AncientTomb/map.bin | Bin 0 -> 1122 bytes data/layouts/AquaHideout_1F/border.bin | 1 + data/layouts/AquaHideout_1F/layout.inc | 16 + data/layouts/AquaHideout_1F/map.bin | 55 + data/layouts/AquaHideout_B1F/border.bin | 1 + data/layouts/AquaHideout_B1F/layout.inc | 16 + data/layouts/AquaHideout_B1F/map.bin | 83 + data/layouts/AquaHideout_B2F/border.bin | 1 + data/layouts/AquaHideout_B2F/layout.inc | 16 + data/layouts/AquaHideout_B2F/map.bin | 51 + data/layouts/AquaHideout_UnusedRubyMap1/border.bin | 1 + data/layouts/AquaHideout_UnusedRubyMap1/layout.inc | 16 + data/layouts/AquaHideout_UnusedRubyMap1/map.bin | Bin 0 -> 1680 bytes data/layouts/AquaHideout_UnusedRubyMap2/border.bin | 1 + data/layouts/AquaHideout_UnusedRubyMap2/layout.inc | 16 + data/layouts/AquaHideout_UnusedRubyMap2/map.bin | 95 + data/layouts/AquaHideout_UnusedRubyMap3/border.bin | 1 + data/layouts/AquaHideout_UnusedRubyMap3/layout.inc | 16 + data/layouts/AquaHideout_UnusedRubyMap3/map.bin | 49 + data/layouts/ArtisanCave_1F/border.bin | 1 + data/layouts/ArtisanCave_1F/layout.inc | 16 + data/layouts/ArtisanCave_1F/map.bin | 1 + data/layouts/ArtisanCave_B1F/border.bin | 1 + data/layouts/ArtisanCave_B1F/layout.inc | 16 + data/layouts/ArtisanCave_B1F/map.bin | 1 + data/layouts/BattleElevator/border.bin | Bin 0 -> 8 bytes data/layouts/BattleElevator/layout.inc | 16 + data/layouts/BattleElevator/map.bin | 1 + .../border.bin | Bin 0 -> 8 bytes .../layout.inc | 16 + .../BattleFrontier_BattleArenaBattleRoom/map.bin | 1 + .../BattleFrontier_BattleArenaCorridor/border.bin | Bin 0 -> 8 bytes .../BattleFrontier_BattleArenaCorridor/layout.inc | 16 + .../BattleFrontier_BattleArenaCorridor/map.bin | 1 + .../BattleFrontier_BattleArenaLobby/border.bin | Bin 0 -> 8 bytes .../BattleFrontier_BattleArenaLobby/layout.inc | 16 + .../BattleFrontier_BattleArenaLobby/map.bin | 3 + .../BattleFrontier_BattleDomeBattleRoom/border.bin | Bin 0 -> 8 bytes .../BattleFrontier_BattleDomeBattleRoom/layout.inc | 16 + .../BattleFrontier_BattleDomeBattleRoom/map.bin | 2 + .../BattleFrontier_BattleDomeCorridor/border.bin | Bin 0 -> 8 bytes .../BattleFrontier_BattleDomeCorridor/layout.inc | 16 + .../BattleFrontier_BattleDomeCorridor/map.bin | 1 + .../BattleFrontier_BattleDomeLobby/border.bin | Bin 0 -> 8 bytes .../BattleFrontier_BattleDomeLobby/layout.inc | 16 + .../layouts/BattleFrontier_BattleDomeLobby/map.bin | 1 + .../border.bin | Bin 0 -> 8 bytes .../layout.inc | 16 + .../BattleFrontier_BattleDomePreBattleRoom/map.bin | Bin 0 -> 144 bytes .../border.bin | Bin 0 -> 8 bytes .../layout.inc | 16 + .../BattleFrontier_BattleFactoryBattleRoom/map.bin | Bin 0 -> 312 bytes .../BattleFrontier_BattleFactoryLobby/border.bin | Bin 0 -> 8 bytes .../BattleFrontier_BattleFactoryLobby/layout.inc | 16 + .../BattleFrontier_BattleFactoryLobby/map.bin | 2 + .../border.bin | Bin 0 -> 8 bytes .../layout.inc | 16 + .../map.bin | 2 + .../border.bin | Bin 0 -> 8 bytes .../layout.inc | 16 + .../BattleFrontier_BattlePalaceBattleRoom/map.bin | 1 + .../BattleFrontier_BattlePalaceCorridor/border.bin | Bin 0 -> 8 bytes .../BattleFrontier_BattlePalaceCorridor/layout.inc | 16 + .../BattleFrontier_BattlePalaceCorridor/map.bin | Bin 0 -> 476 bytes .../BattleFrontier_BattlePalaceLobby/border.bin | Bin 0 -> 8 bytes .../BattleFrontier_BattlePalaceLobby/layout.inc | 16 + .../BattleFrontier_BattlePalaceLobby/map.bin | 7 + .../BattleFrontier_BattlePikeCorridor/border.bin | Bin 0 -> 8 bytes .../BattleFrontier_BattlePikeCorridor/layout.inc | 16 + .../BattleFrontier_BattlePikeCorridor/map.bin | 1 + .../BattleFrontier_BattlePikeLobby/border.bin | Bin 0 -> 8 bytes .../BattleFrontier_BattlePikeLobby/layout.inc | 16 + .../layouts/BattleFrontier_BattlePikeLobby/map.bin | 1 + .../border.bin | Bin 0 -> 8 bytes .../layout.inc | 16 + .../BattleFrontier_BattlePikeRandomRoom1/map.bin | 1 + .../border.bin | Bin 0 -> 8 bytes .../layout.inc | 16 + .../BattleFrontier_BattlePikeRandomRoom2/map.bin | 1 + .../border.bin | Bin 0 -> 8 bytes .../layout.inc | 16 + .../BattleFrontier_BattlePikeRandomRoom3/map.bin | 1 + .../border.bin | Bin 0 -> 8 bytes .../layout.inc | 16 + .../BattleFrontier_BattlePikeThreePathRoom/map.bin | 1 + .../border.bin | Bin 0 -> 8 bytes .../layout.inc | 16 + .../map.bin | 2 + .../border.bin | Bin 0 -> 8 bytes .../layout.inc | 16 + .../map.bin | 1 + .../BattleFrontier_BattlePyramidLobby/border.bin | Bin 0 -> 8 bytes .../BattleFrontier_BattlePyramidLobby/layout.inc | 16 + .../BattleFrontier_BattlePyramidLobby/map.bin | 2 + .../BattleFrontier_BattlePyramidTop/border.bin | Bin 0 -> 8 bytes .../BattleFrontier_BattlePyramidTop/layout.inc | 16 + .../BattleFrontier_BattlePyramidTop/map.bin | 1 + .../border.bin | Bin 0 -> 8 bytes .../layout.inc | 16 + .../BattleFrontier_BattleTowerBattleRoom/map.bin | 1 + .../BattleFrontier_BattleTowerCorridor/border.bin | Bin 0 -> 8 bytes .../BattleFrontier_BattleTowerCorridor/layout.inc | 16 + .../BattleFrontier_BattleTowerCorridor/map.bin | Bin 0 -> 170 bytes .../BattleFrontier_BattleTowerCorridor2/border.bin | Bin 0 -> 8 bytes .../BattleFrontier_BattleTowerCorridor2/layout.inc | 16 + .../BattleFrontier_BattleTowerCorridor2/map.bin | Bin 0 -> 170 bytes .../BattleFrontier_BattleTowerLobby/border.bin | Bin 0 -> 8 bytes .../BattleFrontier_BattleTowerLobby/layout.inc | 16 + .../BattleFrontier_BattleTowerLobby/map.bin | Bin 0 -> 500 bytes .../border.bin | Bin 0 -> 8 bytes .../layout.inc | 16 + .../map.bin | Bin 0 -> 630 bytes data/layouts/BattleFrontier_Lounge1/border.bin | Bin 0 -> 8 bytes data/layouts/BattleFrontier_Lounge1/layout.inc | 16 + data/layouts/BattleFrontier_Lounge1/map.bin | 1 + data/layouts/BattleFrontier_Lounge2/border.bin | Bin 0 -> 8 bytes data/layouts/BattleFrontier_Lounge2/layout.inc | 16 + data/layouts/BattleFrontier_Lounge2/map.bin | 1 + data/layouts/BattleFrontier_OutsideEast/border.bin | 1 + data/layouts/BattleFrontier_OutsideEast/layout.inc | 16 + data/layouts/BattleFrontier_OutsideEast/map.bin | Bin 0 -> 10368 bytes data/layouts/BattleFrontier_OutsideWest/border.bin | 1 + data/layouts/BattleFrontier_OutsideWest/layout.inc | 16 + data/layouts/BattleFrontier_OutsideWest/map.bin | Bin 0 -> 8064 bytes data/layouts/BattleFrontier_RankingHall/border.bin | Bin 0 -> 8 bytes data/layouts/BattleFrontier_RankingHall/layout.inc | 16 + data/layouts/BattleFrontier_RankingHall/map.bin | 64 + .../BattleFrontier_ReceptionGate/border.bin | Bin 0 -> 8 bytes .../BattleFrontier_ReceptionGate/layout.inc | 16 + data/layouts/BattleFrontier_ReceptionGate/map.bin | Bin 0 -> 252 bytes data/layouts/BattleFrontier_ScottsHouse/border.bin | Bin 0 -> 8 bytes data/layouts/BattleFrontier_ScottsHouse/layout.inc | 16 + data/layouts/BattleFrontier_ScottsHouse/map.bin | 1 + data/layouts/BattlePyramidSquare01/border.bin | Bin 0 -> 8 bytes data/layouts/BattlePyramidSquare01/layout.inc | 16 + data/layouts/BattlePyramidSquare01/map.bin | 1 + data/layouts/BattlePyramidSquare02/border.bin | Bin 0 -> 8 bytes data/layouts/BattlePyramidSquare02/layout.inc | 16 + data/layouts/BattlePyramidSquare02/map.bin | 1 + data/layouts/BattlePyramidSquare03/border.bin | Bin 0 -> 8 bytes data/layouts/BattlePyramidSquare03/layout.inc | 16 + data/layouts/BattlePyramidSquare03/map.bin | 1 + data/layouts/BattlePyramidSquare04/border.bin | Bin 0 -> 8 bytes data/layouts/BattlePyramidSquare04/layout.inc | 16 + data/layouts/BattlePyramidSquare04/map.bin | 1 + data/layouts/BattlePyramidSquare05/border.bin | Bin 0 -> 8 bytes data/layouts/BattlePyramidSquare05/layout.inc | 16 + data/layouts/BattlePyramidSquare05/map.bin | 1 + data/layouts/BattlePyramidSquare06/border.bin | Bin 0 -> 8 bytes data/layouts/BattlePyramidSquare06/layout.inc | 16 + data/layouts/BattlePyramidSquare06/map.bin | 1 + data/layouts/BattlePyramidSquare07/border.bin | Bin 0 -> 8 bytes data/layouts/BattlePyramidSquare07/layout.inc | 16 + data/layouts/BattlePyramidSquare07/map.bin | 1 + data/layouts/BattlePyramidSquare08/border.bin | Bin 0 -> 8 bytes data/layouts/BattlePyramidSquare08/layout.inc | 16 + data/layouts/BattlePyramidSquare08/map.bin | 1 + data/layouts/BattlePyramidSquare09/border.bin | Bin 0 -> 8 bytes data/layouts/BattlePyramidSquare09/layout.inc | 16 + data/layouts/BattlePyramidSquare09/map.bin | 1 + data/layouts/BattlePyramidSquare10/border.bin | Bin 0 -> 8 bytes data/layouts/BattlePyramidSquare10/layout.inc | 16 + data/layouts/BattlePyramidSquare10/map.bin | 1 + data/layouts/BattlePyramidSquare11/border.bin | Bin 0 -> 8 bytes data/layouts/BattlePyramidSquare11/layout.inc | 16 + data/layouts/BattlePyramidSquare11/map.bin | 1 + data/layouts/BattlePyramidSquare12/border.bin | Bin 0 -> 8 bytes data/layouts/BattlePyramidSquare12/layout.inc | 16 + data/layouts/BattlePyramidSquare12/map.bin | 1 + data/layouts/BattlePyramidSquare13/border.bin | Bin 0 -> 8 bytes data/layouts/BattlePyramidSquare13/layout.inc | 16 + data/layouts/BattlePyramidSquare13/map.bin | 1 + data/layouts/BattlePyramidSquare14/border.bin | Bin 0 -> 8 bytes data/layouts/BattlePyramidSquare14/layout.inc | 16 + data/layouts/BattlePyramidSquare14/map.bin | 1 + data/layouts/BattlePyramidSquare15/border.bin | Bin 0 -> 8 bytes data/layouts/BattlePyramidSquare15/layout.inc | 16 + data/layouts/BattlePyramidSquare15/map.bin | 1 + data/layouts/BattlePyramidSquare16/border.bin | Bin 0 -> 8 bytes data/layouts/BattlePyramidSquare16/layout.inc | 16 + data/layouts/BattlePyramidSquare16/map.bin | 1 + data/layouts/BattleTentBattleRoom/border.bin | Bin 0 -> 8 bytes data/layouts/BattleTentBattleRoom/layout.inc | 16 + data/layouts/BattleTentBattleRoom/map.bin | Bin 0 -> 180 bytes data/layouts/BattleTentCorridor/border.bin | Bin 0 -> 8 bytes data/layouts/BattleTentCorridor/layout.inc | 16 + data/layouts/BattleTentCorridor/map.bin | 1 + data/layouts/BattleTentLobby/border.bin | Bin 0 -> 8 bytes data/layouts/BattleTentLobby/layout.inc | 16 + data/layouts/BattleTentLobby/map.bin | 2 + data/layouts/BirthIsland_Exterior/border.bin | 1 + data/layouts/BirthIsland_Exterior/layout.inc | 16 + data/layouts/BirthIsland_Exterior/map.bin | Bin 0 -> 1800 bytes data/layouts/CableCarStation/border.bin | 1 + data/layouts/CableCarStation/layout.inc | 16 + data/layouts/CableCarStation/map.bin | Bin 0 -> 312 bytes data/layouts/CaveOfOrigin_1F/border.bin | 1 + data/layouts/CaveOfOrigin_1F/layout.inc | 16 + data/layouts/CaveOfOrigin_1F/map.bin | 1 + data/layouts/CaveOfOrigin_B1F/border.bin | 1 + data/layouts/CaveOfOrigin_B1F/layout.inc | 16 + data/layouts/CaveOfOrigin_B1F/map.bin | 1 + data/layouts/CaveOfOrigin_Entrance/border.bin | 1 + data/layouts/CaveOfOrigin_Entrance/layout.inc | 16 + data/layouts/CaveOfOrigin_Entrance/map.bin | 1 + .../CaveOfOrigin_UnusedRubySapphireMap1/border.bin | 1 + .../CaveOfOrigin_UnusedRubySapphireMap1/layout.inc | 16 + .../CaveOfOrigin_UnusedRubySapphireMap1/map.bin | 1 + .../CaveOfOrigin_UnusedRubySapphireMap2/border.bin | 1 + .../CaveOfOrigin_UnusedRubySapphireMap2/layout.inc | 16 + .../CaveOfOrigin_UnusedRubySapphireMap2/map.bin | 1 + .../CaveOfOrigin_UnusedRubySapphireMap3/border.bin | 1 + .../CaveOfOrigin_UnusedRubySapphireMap3/layout.inc | 16 + .../CaveOfOrigin_UnusedRubySapphireMap3/map.bin | 1 + data/layouts/DesertRuins/border.bin | 1 + data/layouts/DesertRuins/layout.inc | 16 + data/layouts/DesertRuins/map.bin | Bin 0 -> 1122 bytes data/layouts/DesertUnderpass/border.bin | 1 + data/layouts/DesertUnderpass/layout.inc | 16 + data/layouts/DesertUnderpass/map.bin | 1 + data/layouts/DewfordTown/border.bin | 1 + data/layouts/DewfordTown/layout.inc | 16 + data/layouts/DewfordTown/map.bin | 2 + data/layouts/DewfordTown_Gym/border.bin | Bin 0 -> 8 bytes data/layouts/DewfordTown_Gym/layout.inc | 16 + data/layouts/DewfordTown_Gym/map.bin | Bin 0 -> 1008 bytes data/layouts/DewfordTown_Hall/border.bin | 1 + data/layouts/DewfordTown_Hall/layout.inc | 16 + data/layouts/DewfordTown_Hall/map.bin | Bin 0 -> 306 bytes data/layouts/DoubleBattleColosseum/border.bin | 1 + data/layouts/DoubleBattleColosseum/layout.inc | 16 + data/layouts/DoubleBattleColosseum/map.bin | 1 + data/layouts/EverGrandeCity/border.bin | 1 + data/layouts/EverGrandeCity/layout.inc | 16 + data/layouts/EverGrandeCity/map.bin | Bin 0 -> 6400 bytes .../EverGrandeCity_ChampionsRoom/border.bin | Bin 0 -> 8 bytes .../EverGrandeCity_ChampionsRoom/layout.inc | 16 + data/layouts/EverGrandeCity_ChampionsRoom/map.bin | Bin 0 -> 338 bytes data/layouts/EverGrandeCity_DrakesRoom/border.bin | Bin 0 -> 8 bytes data/layouts/EverGrandeCity_DrakesRoom/layout.inc | 16 + data/layouts/EverGrandeCity_DrakesRoom/map.bin | 2 + data/layouts/EverGrandeCity_GlaciasRoom/border.bin | Bin 0 -> 8 bytes data/layouts/EverGrandeCity_GlaciasRoom/layout.inc | 16 + data/layouts/EverGrandeCity_GlaciasRoom/map.bin | 2 + data/layouts/EverGrandeCity_Hall4/border.bin | Bin 0 -> 8 bytes data/layouts/EverGrandeCity_Hall4/layout.inc | 16 + data/layouts/EverGrandeCity_Hall4/map.bin | 1 + data/layouts/EverGrandeCity_HallOfFame/border.bin | Bin 0 -> 8 bytes data/layouts/EverGrandeCity_HallOfFame/layout.inc | 16 + data/layouts/EverGrandeCity_HallOfFame/map.bin | 1 + data/layouts/EverGrandeCity_PhoebesRoom/border.bin | Bin 0 -> 8 bytes data/layouts/EverGrandeCity_PhoebesRoom/layout.inc | 16 + data/layouts/EverGrandeCity_PhoebesRoom/map.bin | 2 + .../EverGrandeCity_PokemonLeague_1F/border.bin | 1 + .../EverGrandeCity_PokemonLeague_1F/layout.inc | 16 + .../EverGrandeCity_PokemonLeague_1F/map.bin | 2 + data/layouts/EverGrandeCity_ShortHall/border.bin | Bin 0 -> 8 bytes data/layouts/EverGrandeCity_ShortHall/layout.inc | 16 + data/layouts/EverGrandeCity_ShortHall/map.bin | 1 + data/layouts/EverGrandeCity_SidneysRoom/border.bin | Bin 0 -> 8 bytes data/layouts/EverGrandeCity_SidneysRoom/layout.inc | 16 + data/layouts/EverGrandeCity_SidneysRoom/map.bin | 2 + data/layouts/FallarborTown/border.bin | 1 + data/layouts/FallarborTown/layout.inc | 16 + data/layouts/FallarborTown/map.bin | 1 + .../FallarborTown_LeftoverRSContestHall/border.bin | 1 + .../FallarborTown_LeftoverRSContestHall/layout.inc | 16 + .../FallarborTown_LeftoverRSContestHall/map.bin | 1 + .../border.bin | 1 + .../layout.inc | 16 + .../FallarborTown_LeftoverRSContestLobby/map.bin | 1 + data/layouts/FarawayIsland_Entrance/border.bin | 1 + data/layouts/FarawayIsland_Entrance/layout.inc | 16 + data/layouts/FarawayIsland_Entrance/map.bin | Bin 0 -> 3128 bytes data/layouts/FarawayIsland_Interior/border.bin | Bin 0 -> 8 bytes data/layouts/FarawayIsland_Interior/layout.inc | 16 + data/layouts/FarawayIsland_Interior/map.bin | Bin 0 -> 1508 bytes data/layouts/FieryPath/border.bin | 1 + data/layouts/FieryPath/layout.inc | 16 + data/layouts/FieryPath/map.bin | 10 + data/layouts/FortreeCity/border.bin | Bin 0 -> 8 bytes data/layouts/FortreeCity/layout.inc | 16 + data/layouts/FortreeCity/map.bin | 1 + data/layouts/FortreeCity_DecorationShop/border.bin | 1 + data/layouts/FortreeCity_DecorationShop/layout.inc | 16 + data/layouts/FortreeCity_DecorationShop/map.bin | 1 + data/layouts/FortreeCity_Gym/border.bin | Bin 0 -> 8 bytes data/layouts/FortreeCity_Gym/layout.inc | 16 + data/layouts/FortreeCity_Gym/map.bin | Bin 0 -> 1000 bytes data/layouts/FortreeCity_House1/border.bin | 1 + data/layouts/FortreeCity_House1/layout.inc | 16 + data/layouts/FortreeCity_House1/map.bin | 1 + data/layouts/FortreeCity_House2/border.bin | 1 + data/layouts/FortreeCity_House2/layout.inc | 16 + data/layouts/FortreeCity_House2/map.bin | 1 + data/layouts/GraniteCave_1F/border.bin | 1 + data/layouts/GraniteCave_1F/layout.inc | 16 + data/layouts/GraniteCave_1F/map.bin | 5 + data/layouts/GraniteCave_B1F/border.bin | 1 + data/layouts/GraniteCave_B1F/layout.inc | 16 + data/layouts/GraniteCave_B1F/map.bin | 10 + data/layouts/GraniteCave_B2F/border.bin | 1 + data/layouts/GraniteCave_B2F/layout.inc | 16 + data/layouts/GraniteCave_B2F/map.bin | 2 + data/layouts/GraniteCave_StevensRoom/border.bin | 1 + data/layouts/GraniteCave_StevensRoom/layout.inc | 16 + data/layouts/GraniteCave_StevensRoom/map.bin | 4 + data/layouts/Harbor/border.bin | 1 + data/layouts/Harbor/layout.inc | 16 + data/layouts/Harbor/map.bin | 1 + data/layouts/House1/border.bin | Bin 0 -> 8 bytes data/layouts/House1/layout.inc | 16 + data/layouts/House1/map.bin | 1 + data/layouts/House2/border.bin | Bin 0 -> 8 bytes data/layouts/House2/layout.inc | 16 + data/layouts/House2/map.bin | 1 + data/layouts/House3/border.bin | 1 + data/layouts/House3/layout.inc | 16 + data/layouts/House3/map.bin | 1 + data/layouts/House4/border.bin | 1 + data/layouts/House4/layout.inc | 16 + data/layouts/House4/map.bin | 1 + data/layouts/HouseWithBed/border.bin | 1 + data/layouts/HouseWithBed/layout.inc | 16 + data/layouts/HouseWithBed/map.bin | 1 + data/layouts/InsideOfTruck/border.bin | 1 + data/layouts/InsideOfTruck/layout.inc | 16 + data/layouts/InsideOfTruck/map.bin | 2 + data/layouts/IslandCave/border.bin | 1 + data/layouts/IslandCave/layout.inc | 16 + data/layouts/IslandCave/map.bin | Bin 0 -> 1122 bytes data/layouts/IslandHarbor/border.bin | 1 + data/layouts/IslandHarbor/layout.inc | 16 + data/layouts/IslandHarbor/map.bin | 1 + data/layouts/JaggedPass/border.bin | 1 + data/layouts/JaggedPass/layout.inc | 16 + data/layouts/JaggedPass/map.bin | Bin 0 -> 2760 bytes data/layouts/LavaridgeTown/border.bin | 1 + data/layouts/LavaridgeTown/layout.inc | 16 + data/layouts/LavaridgeTown/map.bin | 3 + data/layouts/LavaridgeTown_Gym_1F/border.bin | Bin 0 -> 8 bytes data/layouts/LavaridgeTown_Gym_1F/layout.inc | 16 + data/layouts/LavaridgeTown_Gym_1F/map.bin | 3 + data/layouts/LavaridgeTown_Gym_B1F/border.bin | Bin 0 -> 8 bytes data/layouts/LavaridgeTown_Gym_B1F/layout.inc | 16 + data/layouts/LavaridgeTown_Gym_B1F/map.bin | 6 + data/layouts/LavaridgeTown_HerbShop/border.bin | Bin 0 -> 8 bytes data/layouts/LavaridgeTown_HerbShop/layout.inc | 16 + data/layouts/LavaridgeTown_HerbShop/map.bin | 1 + .../LavaridgeTown_PokemonCenter_1F/border.bin | 1 + .../LavaridgeTown_PokemonCenter_1F/layout.inc | 16 + .../layouts/LavaridgeTown_PokemonCenter_1F/map.bin | 1 + data/layouts/LilycoveCity/border.bin | 1 + data/layouts/LilycoveCity/layout.inc | 16 + data/layouts/LilycoveCity/map.bin | Bin 0 -> 6400 bytes data/layouts/LilycoveCity_ContestHall/border.bin | 1 + data/layouts/LilycoveCity_ContestHall/layout.inc | 16 + data/layouts/LilycoveCity_ContestHall/map.bin | 3 + data/layouts/LilycoveCity_ContestLobby/border.bin | 1 + data/layouts/LilycoveCity_ContestLobby/layout.inc | 16 + data/layouts/LilycoveCity_ContestLobby/map.bin | 1 + .../LilycoveCity_CoveLilyMotel_1F/border.bin | 1 + .../LilycoveCity_CoveLilyMotel_1F/layout.inc | 16 + data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin | 1 + .../LilycoveCity_CoveLilyMotel_2F/border.bin | 1 + .../LilycoveCity_CoveLilyMotel_2F/layout.inc | 16 + data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin | 1 + .../border.bin | Bin 0 -> 8 bytes .../layout.inc | 16 + .../LilycoveCity_DepartmentStoreElevator/map.bin | 1 + .../LilycoveCity_DepartmentStoreRooftop/border.bin | 1 + .../LilycoveCity_DepartmentStoreRooftop/layout.inc | 16 + .../LilycoveCity_DepartmentStoreRooftop/map.bin | 1 + .../LilycoveCity_DepartmentStore_1F/border.bin | Bin 0 -> 8 bytes .../LilycoveCity_DepartmentStore_1F/layout.inc | 16 + .../LilycoveCity_DepartmentStore_1F/map.bin | 1 + .../LilycoveCity_DepartmentStore_2F/border.bin | Bin 0 -> 8 bytes .../LilycoveCity_DepartmentStore_2F/layout.inc | 16 + .../LilycoveCity_DepartmentStore_2F/map.bin | 1 + .../LilycoveCity_DepartmentStore_3F/border.bin | Bin 0 -> 8 bytes .../LilycoveCity_DepartmentStore_3F/layout.inc | 16 + .../LilycoveCity_DepartmentStore_3F/map.bin | 1 + .../LilycoveCity_DepartmentStore_4F/border.bin | Bin 0 -> 8 bytes .../LilycoveCity_DepartmentStore_4F/layout.inc | 16 + .../LilycoveCity_DepartmentStore_4F/map.bin | 1 + .../LilycoveCity_DepartmentStore_5F/border.bin | Bin 0 -> 8 bytes .../LilycoveCity_DepartmentStore_5F/layout.inc | 16 + .../LilycoveCity_DepartmentStore_5F/map.bin | Bin 0 -> 288 bytes data/layouts/LilycoveCity_House2/border.bin | 1 + data/layouts/LilycoveCity_House2/layout.inc | 16 + data/layouts/LilycoveCity_House2/map.bin | 1 + .../LilycoveCity_LilycoveMuseum_1F/border.bin | 1 + .../LilycoveCity_LilycoveMuseum_1F/layout.inc | 16 + .../layouts/LilycoveCity_LilycoveMuseum_1F/map.bin | 1 + .../LilycoveCity_LilycoveMuseum_2F/border.bin | 1 + .../LilycoveCity_LilycoveMuseum_2F/layout.inc | 16 + .../layouts/LilycoveCity_LilycoveMuseum_2F/map.bin | 1 + .../LilycoveCity_PokemonTrainerFanClub/border.bin | 1 + .../LilycoveCity_PokemonTrainerFanClub/layout.inc | 16 + .../LilycoveCity_PokemonTrainerFanClub/map.bin | 2 + data/layouts/LinkContestRoom1/border.bin | 1 + data/layouts/LinkContestRoom1/layout.inc | 16 + data/layouts/LinkContestRoom1/map.bin | 1 + data/layouts/LinkContestRoom2/border.bin | 1 + data/layouts/LinkContestRoom2/layout.inc | 16 + data/layouts/LinkContestRoom2/map.bin | 1 + data/layouts/LinkContestRoom3/border.bin | 1 + data/layouts/LinkContestRoom3/layout.inc | 16 + data/layouts/LinkContestRoom3/map.bin | 1 + data/layouts/LinkContestRoom4/border.bin | 1 + data/layouts/LinkContestRoom4/layout.inc | 16 + data/layouts/LinkContestRoom4/map.bin | 1 + data/layouts/LinkContestRoom5/border.bin | 1 + data/layouts/LinkContestRoom5/layout.inc | 16 + data/layouts/LinkContestRoom5/map.bin | 1 + data/layouts/LinkContestRoom6/border.bin | 1 + data/layouts/LinkContestRoom6/layout.inc | 16 + data/layouts/LinkContestRoom6/map.bin | 1 + data/layouts/LittlerootTown/border.bin | 1 + data/layouts/LittlerootTown/layout.inc | 16 + data/layouts/LittlerootTown/map.bin | 3 + .../LittlerootTown_BrendansHouse_1F/border.bin | Bin 0 -> 8 bytes .../LittlerootTown_BrendansHouse_1F/layout.inc | 16 + .../LittlerootTown_BrendansHouse_1F/map.bin | 1 + .../LittlerootTown_BrendansHouse_2F/border.bin | 1 + .../LittlerootTown_BrendansHouse_2F/layout.inc | 16 + .../LittlerootTown_BrendansHouse_2F/map.bin | 1 + .../layouts/LittlerootTown_MaysHouse_1F/border.bin | 1 + .../layouts/LittlerootTown_MaysHouse_1F/layout.inc | 16 + data/layouts/LittlerootTown_MaysHouse_1F/map.bin | 1 + .../layouts/LittlerootTown_MaysHouse_2F/border.bin | 1 + .../layouts/LittlerootTown_MaysHouse_2F/layout.inc | 16 + data/layouts/LittlerootTown_MaysHouse_2F/map.bin | 2 + .../LittlerootTown_ProfessorBirchsLab/border.bin | 1 + .../LittlerootTown_ProfessorBirchsLab/layout.inc | 16 + .../LittlerootTown_ProfessorBirchsLab/map.bin | 5 + data/layouts/MagmaHideout_1F/border.bin | 1 + data/layouts/MagmaHideout_1F/layout.inc | 16 + data/layouts/MagmaHideout_1F/map.bin | Bin 0 -> 2812 bytes data/layouts/MagmaHideout_2F_1R/border.bin | 1 + data/layouts/MagmaHideout_2F_1R/layout.inc | 16 + data/layouts/MagmaHideout_2F_1R/map.bin | 2 + data/layouts/MagmaHideout_2F_2R/border.bin | 1 + data/layouts/MagmaHideout_2F_2R/layout.inc | 16 + data/layouts/MagmaHideout_2F_2R/map.bin | 5 + data/layouts/MagmaHideout_2F_3R/border.bin | 1 + data/layouts/MagmaHideout_2F_3R/layout.inc | 16 + data/layouts/MagmaHideout_2F_3R/map.bin | 1 + data/layouts/MagmaHideout_3F_1R/border.bin | 1 + data/layouts/MagmaHideout_3F_1R/layout.inc | 16 + data/layouts/MagmaHideout_3F_1R/map.bin | 1 + data/layouts/MagmaHideout_3F_2R/border.bin | 1 + data/layouts/MagmaHideout_3F_2R/layout.inc | 16 + data/layouts/MagmaHideout_3F_2R/map.bin | 7 + data/layouts/MagmaHideout_3F_3R/border.bin | 1 + data/layouts/MagmaHideout_3F_3R/layout.inc | 16 + data/layouts/MagmaHideout_3F_3R/map.bin | 1 + data/layouts/MagmaHideout_4F/border.bin | 1 + data/layouts/MagmaHideout_4F/layout.inc | 16 + data/layouts/MagmaHideout_4F/map.bin | 1 + data/layouts/MarineCave_End/border.bin | 1 + data/layouts/MarineCave_End/layout.inc | 16 + data/layouts/MarineCave_End/map.bin | 14 + data/layouts/MarineCave_Entrance/border.bin | 1 + data/layouts/MarineCave_Entrance/layout.inc | 16 + data/layouts/MarineCave_Entrance/map.bin | 7 + data/layouts/Mart/border.bin | Bin 0 -> 8 bytes data/layouts/Mart/layout.inc | 16 + data/layouts/Mart/map.bin | 3 + data/layouts/MauvilleCity/border.bin | 1 + data/layouts/MauvilleCity/layout.inc | 16 + data/layouts/MauvilleCity/map.bin | Bin 0 -> 1600 bytes data/layouts/MauvilleCity_BikeShop/border.bin | 1 + data/layouts/MauvilleCity_BikeShop/layout.inc | 16 + data/layouts/MauvilleCity_BikeShop/map.bin | 2 + data/layouts/MauvilleCity_GameCorner/border.bin | Bin 0 -> 8 bytes data/layouts/MauvilleCity_GameCorner/layout.inc | 16 + data/layouts/MauvilleCity_GameCorner/map.bin | 3 + data/layouts/MauvilleCity_Gym/border.bin | Bin 0 -> 8 bytes data/layouts/MauvilleCity_Gym/layout.inc | 16 + data/layouts/MauvilleCity_Gym/map.bin | Bin 0 -> 420 bytes data/layouts/MeteorFalls_1F_1R/border.bin | 1 + data/layouts/MeteorFalls_1F_1R/layout.inc | 16 + data/layouts/MeteorFalls_1F_1R/map.bin | 1 + data/layouts/MeteorFalls_1F_2R/border.bin | 1 + data/layouts/MeteorFalls_1F_2R/layout.inc | 16 + data/layouts/MeteorFalls_1F_2R/map.bin | 2 + data/layouts/MeteorFalls_B1F_1R/border.bin | 1 + data/layouts/MeteorFalls_B1F_1R/layout.inc | 16 + data/layouts/MeteorFalls_B1F_1R/map.bin | 6 + data/layouts/MeteorFalls_B1F_2R/border.bin | 1 + data/layouts/MeteorFalls_B1F_2R/layout.inc | 16 + data/layouts/MeteorFalls_B1F_2R/map.bin | 1 + data/layouts/MeteorFalls_StevensCave/border.bin | 1 + data/layouts/MeteorFalls_StevensCave/layout.inc | 16 + data/layouts/MeteorFalls_StevensCave/map.bin | 21 + data/layouts/MirageTower_1F/border.bin | 1 + data/layouts/MirageTower_1F/layout.inc | 16 + data/layouts/MirageTower_1F/map.bin | 3 + data/layouts/MirageTower_2F/border.bin | 1 + data/layouts/MirageTower_2F/layout.inc | 16 + data/layouts/MirageTower_2F/map.bin | 3 + data/layouts/MirageTower_3F/border.bin | 1 + data/layouts/MirageTower_3F/layout.inc | 16 + data/layouts/MirageTower_3F/map.bin | 6 + data/layouts/MirageTower_4F/border.bin | 1 + data/layouts/MirageTower_4F/layout.inc | 16 + data/layouts/MirageTower_4F/map.bin | 2 + data/layouts/MossdeepCity/border.bin | 1 + data/layouts/MossdeepCity/layout.inc | 16 + data/layouts/MossdeepCity/map.bin | Bin 0 -> 6400 bytes data/layouts/MossdeepCity_GameCorner_1F/border.bin | Bin 0 -> 8 bytes data/layouts/MossdeepCity_GameCorner_1F/layout.inc | 16 + data/layouts/MossdeepCity_GameCorner_1F/map.bin | 53 + .../layouts/MossdeepCity_GameCorner_B1F/border.bin | Bin 0 -> 8 bytes .../layouts/MossdeepCity_GameCorner_B1F/layout.inc | 16 + data/layouts/MossdeepCity_GameCorner_B1F/map.bin | 2 + data/layouts/MossdeepCity_Gym/border.bin | 1 + data/layouts/MossdeepCity_Gym/layout.inc | 16 + data/layouts/MossdeepCity_Gym/map.bin | 40 + .../layouts/MossdeepCity_SpaceCenter_1F/border.bin | 1 + .../layouts/MossdeepCity_SpaceCenter_1F/layout.inc | 16 + data/layouts/MossdeepCity_SpaceCenter_1F/map.bin | Bin 0 -> 320 bytes .../layouts/MossdeepCity_SpaceCenter_2F/border.bin | 1 + .../layouts/MossdeepCity_SpaceCenter_2F/layout.inc | 16 + data/layouts/MossdeepCity_SpaceCenter_2F/map.bin | Bin 0 -> 320 bytes data/layouts/MossdeepCity_StevensHouse/border.bin | Bin 0 -> 8 bytes data/layouts/MossdeepCity_StevensHouse/layout.inc | 16 + data/layouts/MossdeepCity_StevensHouse/map.bin | 1 + data/layouts/MtChimney/border.bin | 1 + data/layouts/MtChimney/layout.inc | 16 + data/layouts/MtChimney/map.bin | 1 + data/layouts/MtPyre_1F/border.bin | 1 + data/layouts/MtPyre_1F/layout.inc | 16 + data/layouts/MtPyre_1F/map.bin | 1 + data/layouts/MtPyre_2F/border.bin | 1 + data/layouts/MtPyre_2F/layout.inc | 16 + data/layouts/MtPyre_2F/map.bin | 1 + data/layouts/MtPyre_3F/border.bin | 1 + data/layouts/MtPyre_3F/layout.inc | 16 + data/layouts/MtPyre_3F/map.bin | 1 + data/layouts/MtPyre_4F/border.bin | 1 + data/layouts/MtPyre_4F/layout.inc | 16 + data/layouts/MtPyre_4F/map.bin | 1 + data/layouts/MtPyre_5F/border.bin | 1 + data/layouts/MtPyre_5F/layout.inc | 16 + data/layouts/MtPyre_5F/map.bin | 1 + data/layouts/MtPyre_6F/border.bin | 1 + data/layouts/MtPyre_6F/layout.inc | 16 + data/layouts/MtPyre_6F/map.bin | 1 + data/layouts/MtPyre_Exterior/border.bin | Bin 0 -> 8 bytes data/layouts/MtPyre_Exterior/layout.inc | 16 + data/layouts/MtPyre_Exterior/map.bin | Bin 0 -> 3876 bytes data/layouts/MtPyre_Summit/border.bin | Bin 0 -> 8 bytes data/layouts/MtPyre_Summit/layout.inc | 16 + data/layouts/MtPyre_Summit/map.bin | Bin 0 -> 3700 bytes data/layouts/NavelRock_B1F/border.bin | 1 + data/layouts/NavelRock_B1F/layout.inc | 16 + data/layouts/NavelRock_B1F/map.bin | 1 + data/layouts/NavelRock_Bottom/border.bin | 1 + data/layouts/NavelRock_Bottom/layout.inc | 16 + data/layouts/NavelRock_Bottom/map.bin | 1 + data/layouts/NavelRock_Entrance/border.bin | 1 + data/layouts/NavelRock_Entrance/layout.inc | 16 + data/layouts/NavelRock_Entrance/map.bin | 1 + data/layouts/NavelRock_Exterior/border.bin | 1 + data/layouts/NavelRock_Exterior/layout.inc | 16 + data/layouts/NavelRock_Exterior/map.bin | Bin 0 -> 1008 bytes data/layouts/NavelRock_Fork/border.bin | 1 + data/layouts/NavelRock_Fork/layout.inc | 16 + data/layouts/NavelRock_Fork/map.bin | 1 + data/layouts/NavelRock_LadderRoom1/border.bin | 1 + data/layouts/NavelRock_LadderRoom1/layout.inc | 16 + data/layouts/NavelRock_LadderRoom1/map.bin | 1 + data/layouts/NavelRock_LadderRoom2/border.bin | 1 + data/layouts/NavelRock_LadderRoom2/layout.inc | 16 + data/layouts/NavelRock_LadderRoom2/map.bin | 1 + data/layouts/NavelRock_Top/border.bin | 1 + data/layouts/NavelRock_Top/layout.inc | 16 + data/layouts/NavelRock_Top/map.bin | 1 + data/layouts/NewMauville_Entrance/border.bin | Bin 0 -> 8 bytes data/layouts/NewMauville_Entrance/layout.inc | 16 + data/layouts/NewMauville_Entrance/map.bin | 1 + data/layouts/NewMauville_Inside/border.bin | 1 + data/layouts/NewMauville_Inside/layout.inc | 16 + data/layouts/NewMauville_Inside/map.bin | 1 + data/layouts/OldaleTown/border.bin | 1 + data/layouts/OldaleTown/layout.inc | 16 + data/layouts/OldaleTown/map.bin | 1 + data/layouts/PacifidlogTown/border.bin | 1 + data/layouts/PacifidlogTown/layout.inc | 16 + data/layouts/PacifidlogTown/map.bin | 6 + data/layouts/PacifidlogTown_House1/border.bin | 1 + data/layouts/PacifidlogTown_House1/layout.inc | 16 + data/layouts/PacifidlogTown_House1/map.bin | 1 + data/layouts/PacifidlogTown_House2/border.bin | 1 + data/layouts/PacifidlogTown_House2/layout.inc | 16 + data/layouts/PacifidlogTown_House2/map.bin | 1 + data/layouts/PetalburgCity/border.bin | 1 + data/layouts/PetalburgCity/layout.inc | 16 + data/layouts/PetalburgCity/map.bin | 4 + data/layouts/PetalburgCity_Gym/border.bin | 1 + data/layouts/PetalburgCity_Gym/layout.inc | 16 + data/layouts/PetalburgCity_Gym/map.bin | 10 + data/layouts/PetalburgWoods/border.bin | 1 + data/layouts/PetalburgWoods/layout.inc | 16 + data/layouts/PetalburgWoods/map.bin | 1 + data/layouts/PokemonCenter_1F/border.bin | 1 + data/layouts/PokemonCenter_1F/layout.inc | 16 + data/layouts/PokemonCenter_1F/map.bin | 1 + data/layouts/PokemonCenter_2F/border.bin | 1 + data/layouts/PokemonCenter_2F/layout.inc | 16 + data/layouts/PokemonCenter_2F/map.bin | 1 + data/layouts/RecordCorner/border.bin | 1 + data/layouts/RecordCorner/layout.inc | 16 + data/layouts/RecordCorner/map.bin | 1 + data/layouts/Route101/border.bin | 1 + data/layouts/Route101/layout.inc | 16 + data/layouts/Route101/map.bin | 1 + data/layouts/Route102/border.bin | 1 + data/layouts/Route102/layout.inc | 16 + data/layouts/Route102/map.bin | 1 + data/layouts/Route103/border.bin | 1 + data/layouts/Route103/layout.inc | 16 + data/layouts/Route103/map.bin | 1 + data/layouts/Route104/border.bin | 1 + data/layouts/Route104/layout.inc | 16 + data/layouts/Route104/map.bin | Bin 0 -> 6400 bytes data/layouts/Route104_MrBrineysHouse/border.bin | 1 + data/layouts/Route104_MrBrineysHouse/layout.inc | 16 + data/layouts/Route104_MrBrineysHouse/map.bin | 1 + .../Route104_PrettyPetalFlowerShop/border.bin | Bin 0 -> 8 bytes .../Route104_PrettyPetalFlowerShop/layout.inc | 16 + .../layouts/Route104_PrettyPetalFlowerShop/map.bin | Bin 0 -> 270 bytes data/layouts/Route104_Prototype/border.bin | 1 + data/layouts/Route104_Prototype/layout.inc | 16 + data/layouts/Route104_Prototype/map.bin | 1 + data/layouts/Route105/border.bin | 1 + data/layouts/Route105/layout.inc | 16 + data/layouts/Route105/map.bin | Bin 0 -> 6400 bytes data/layouts/Route106/border.bin | 1 + data/layouts/Route106/layout.inc | 16 + data/layouts/Route106/map.bin | Bin 0 -> 3200 bytes data/layouts/Route107/border.bin | 1 + data/layouts/Route107/layout.inc | 16 + data/layouts/Route107/map.bin | Bin 0 -> 2400 bytes data/layouts/Route108/border.bin | 1 + data/layouts/Route108/layout.inc | 16 + data/layouts/Route108/map.bin | 1 + data/layouts/Route109/border.bin | 1 + data/layouts/Route109/layout.inc | 16 + data/layouts/Route109/map.bin | Bin 0 -> 5040 bytes data/layouts/Route109_SeashoreHouse/border.bin | Bin 0 -> 8 bytes data/layouts/Route109_SeashoreHouse/layout.inc | 16 + data/layouts/Route109_SeashoreHouse/map.bin | 3 + data/layouts/Route110/border.bin | 1 + data/layouts/Route110/layout.inc | 16 + data/layouts/Route110/map.bin | Bin 0 -> 8000 bytes .../Route110_SeasideCyclingRoadEntrance/border.bin | Bin 0 -> 8 bytes .../Route110_SeasideCyclingRoadEntrance/layout.inc | 16 + .../Route110_SeasideCyclingRoadEntrance/map.bin | 1 + .../layouts/Route110_TrickHouseCorridor/border.bin | 1 + .../layouts/Route110_TrickHouseCorridor/layout.inc | 16 + data/layouts/Route110_TrickHouseCorridor/map.bin | 1 + data/layouts/Route110_TrickHouseEnd/border.bin | 1 + data/layouts/Route110_TrickHouseEnd/layout.inc | 16 + data/layouts/Route110_TrickHouseEnd/map.bin | 1 + .../layouts/Route110_TrickHouseEntrance/border.bin | 1 + .../layouts/Route110_TrickHouseEntrance/layout.inc | 16 + data/layouts/Route110_TrickHouseEntrance/map.bin | 1 + data/layouts/Route110_TrickHousePuzzle1/border.bin | Bin 0 -> 8 bytes data/layouts/Route110_TrickHousePuzzle1/layout.inc | 16 + data/layouts/Route110_TrickHousePuzzle1/map.bin | 2 + data/layouts/Route110_TrickHousePuzzle2/border.bin | Bin 0 -> 8 bytes data/layouts/Route110_TrickHousePuzzle2/layout.inc | 16 + data/layouts/Route110_TrickHousePuzzle2/map.bin | 2 + data/layouts/Route110_TrickHousePuzzle3/border.bin | Bin 0 -> 8 bytes data/layouts/Route110_TrickHousePuzzle3/layout.inc | 16 + data/layouts/Route110_TrickHousePuzzle3/map.bin | 2 + data/layouts/Route110_TrickHousePuzzle4/border.bin | Bin 0 -> 8 bytes data/layouts/Route110_TrickHousePuzzle4/layout.inc | 16 + data/layouts/Route110_TrickHousePuzzle4/map.bin | 2 + data/layouts/Route110_TrickHousePuzzle5/border.bin | Bin 0 -> 8 bytes data/layouts/Route110_TrickHousePuzzle5/layout.inc | 16 + data/layouts/Route110_TrickHousePuzzle5/map.bin | 2 + data/layouts/Route110_TrickHousePuzzle6/border.bin | Bin 0 -> 8 bytes data/layouts/Route110_TrickHousePuzzle6/layout.inc | 16 + data/layouts/Route110_TrickHousePuzzle6/map.bin | 2 + data/layouts/Route110_TrickHousePuzzle7/border.bin | Bin 0 -> 8 bytes data/layouts/Route110_TrickHousePuzzle7/layout.inc | 16 + data/layouts/Route110_TrickHousePuzzle7/map.bin | 2 + data/layouts/Route110_TrickHousePuzzle8/border.bin | Bin 0 -> 8 bytes data/layouts/Route110_TrickHousePuzzle8/layout.inc | 16 + data/layouts/Route110_TrickHousePuzzle8/map.bin | 2 + data/layouts/Route111/border.bin | Bin 0 -> 8 bytes data/layouts/Route111/layout.inc | 16 + data/layouts/Route111/map.bin | Bin 0 -> 11200 bytes data/layouts/Route112/border.bin | 1 + data/layouts/Route112/layout.inc | 16 + data/layouts/Route112/map.bin | Bin 0 -> 4800 bytes data/layouts/Route113/border.bin | 1 + data/layouts/Route113/layout.inc | 16 + data/layouts/Route113/map.bin | Bin 0 -> 4000 bytes data/layouts/Route114/border.bin | 1 + data/layouts/Route114/layout.inc | 16 + data/layouts/Route114/map.bin | Bin 0 -> 6400 bytes .../layouts/Route114_FossilManiacsHouse/border.bin | 1 + .../layouts/Route114_FossilManiacsHouse/layout.inc | 16 + data/layouts/Route114_FossilManiacsHouse/map.bin | 1 + .../Route114_FossilManiacsTunnel/border.bin | 1 + .../Route114_FossilManiacsTunnel/layout.inc | 16 + data/layouts/Route114_FossilManiacsTunnel/map.bin | 1 + data/layouts/Route114_LanettesHouse/border.bin | 1 + data/layouts/Route114_LanettesHouse/layout.inc | 16 + data/layouts/Route114_LanettesHouse/map.bin | 2 + data/layouts/Route115/border.bin | 1 + data/layouts/Route115/layout.inc | 16 + data/layouts/Route115/map.bin | Bin 0 -> 6400 bytes data/layouts/Route116/border.bin | 1 + data/layouts/Route116/layout.inc | 16 + data/layouts/Route116/map.bin | Bin 0 -> 4000 bytes .../layouts/Route116_TunnelersRestHouse/border.bin | 1 + .../layouts/Route116_TunnelersRestHouse/layout.inc | 16 + data/layouts/Route116_TunnelersRestHouse/map.bin | 1 + data/layouts/Route117/border.bin | Bin 0 -> 8 bytes data/layouts/Route117/layout.inc | 16 + data/layouts/Route117/map.bin | 10 + data/layouts/Route117_PokemonDayCare/border.bin | 1 + data/layouts/Route117_PokemonDayCare/layout.inc | 16 + data/layouts/Route117_PokemonDayCare/map.bin | 2 + data/layouts/Route118/border.bin | 1 + data/layouts/Route118/layout.inc | 16 + data/layouts/Route118/map.bin | Bin 0 -> 3200 bytes data/layouts/Route119/border.bin | Bin 0 -> 8 bytes data/layouts/Route119/layout.inc | 16 + data/layouts/Route119/map.bin | Bin 0 -> 11200 bytes .../Route119_WeatherInstitute_1F/border.bin | 1 + .../Route119_WeatherInstitute_1F/layout.inc | 16 + data/layouts/Route119_WeatherInstitute_1F/map.bin | 1 + .../Route119_WeatherInstitute_2F/border.bin | 1 + .../Route119_WeatherInstitute_2F/layout.inc | 16 + data/layouts/Route119_WeatherInstitute_2F/map.bin | 1 + data/layouts/Route120/border.bin | Bin 0 -> 8 bytes data/layouts/Route120/layout.inc | 16 + data/layouts/Route120/map.bin | Bin 0 -> 8000 bytes data/layouts/Route121/border.bin | 1 + data/layouts/Route121/layout.inc | 16 + data/layouts/Route121/map.bin | 1 + .../layouts/Route121_SafariZoneEntrance/border.bin | Bin 0 -> 8 bytes .../layouts/Route121_SafariZoneEntrance/layout.inc | 16 + data/layouts/Route121_SafariZoneEntrance/map.bin | 1 + data/layouts/Route122/border.bin | 1 + data/layouts/Route122/layout.inc | 16 + data/layouts/Route122/map.bin | Bin 0 -> 3200 bytes data/layouts/Route123/border.bin | Bin 0 -> 8 bytes data/layouts/Route123/layout.inc | 16 + data/layouts/Route123/map.bin | 2 + data/layouts/Route124/border.bin | 1 + data/layouts/Route124/layout.inc | 16 + data/layouts/Route124/map.bin | Bin 0 -> 12800 bytes .../Route124_DivingTreasureHuntersHouse/border.bin | Bin 0 -> 8 bytes .../Route124_DivingTreasureHuntersHouse/layout.inc | 16 + .../Route124_DivingTreasureHuntersHouse/map.bin | 1 + data/layouts/Route125/border.bin | 1 + data/layouts/Route125/layout.inc | 16 + data/layouts/Route125/map.bin | Bin 0 -> 6400 bytes data/layouts/Route126/border.bin | 1 + data/layouts/Route126/layout.inc | 16 + data/layouts/Route126/map.bin | Bin 0 -> 12800 bytes data/layouts/Route127/border.bin | 1 + data/layouts/Route127/layout.inc | 16 + data/layouts/Route127/map.bin | Bin 0 -> 12800 bytes data/layouts/Route128/border.bin | 1 + data/layouts/Route128/layout.inc | 16 + data/layouts/Route128/map.bin | Bin 0 -> 9600 bytes data/layouts/Route129/border.bin | 1 + data/layouts/Route129/layout.inc | 16 + data/layouts/Route129/map.bin | Bin 0 -> 6400 bytes data/layouts/Route130/border.bin | 1 + data/layouts/Route130/layout.inc | 16 + data/layouts/Route130/map.bin | 1 + data/layouts/Route131/border.bin | 1 + data/layouts/Route131/layout.inc | 16 + data/layouts/Route131/map.bin | 1 + data/layouts/Route132/border.bin | 1 + data/layouts/Route132/layout.inc | 16 + data/layouts/Route132/map.bin | Bin 0 -> 6400 bytes data/layouts/Route133/border.bin | 1 + data/layouts/Route133/layout.inc | 16 + data/layouts/Route133/map.bin | 1 + data/layouts/Route134/border.bin | 1 + data/layouts/Route134/layout.inc | 16 + data/layouts/Route134/map.bin | Bin 0 -> 6400 bytes data/layouts/RustboroCity/border.bin | 1 + data/layouts/RustboroCity/layout.inc | 16 + data/layouts/RustboroCity/map.bin | Bin 0 -> 4800 bytes data/layouts/RustboroCity_CuttersHouse/border.bin | 1 + data/layouts/RustboroCity_CuttersHouse/layout.inc | 16 + data/layouts/RustboroCity_CuttersHouse/map.bin | 1 + data/layouts/RustboroCity_DevonCorp_1F/border.bin | 1 + data/layouts/RustboroCity_DevonCorp_1F/layout.inc | 16 + data/layouts/RustboroCity_DevonCorp_1F/map.bin | 1 + data/layouts/RustboroCity_DevonCorp_2F/border.bin | 1 + data/layouts/RustboroCity_DevonCorp_2F/layout.inc | 16 + data/layouts/RustboroCity_DevonCorp_2F/map.bin | 1 + data/layouts/RustboroCity_DevonCorp_3F/border.bin | 1 + data/layouts/RustboroCity_DevonCorp_3F/layout.inc | 16 + data/layouts/RustboroCity_DevonCorp_3F/map.bin | 1 + data/layouts/RustboroCity_Flat1_1F/border.bin | 1 + data/layouts/RustboroCity_Flat1_1F/layout.inc | 16 + data/layouts/RustboroCity_Flat1_1F/map.bin | 1 + data/layouts/RustboroCity_Flat1_2F/border.bin | 1 + data/layouts/RustboroCity_Flat1_2F/layout.inc | 16 + data/layouts/RustboroCity_Flat1_2F/map.bin | 1 + data/layouts/RustboroCity_Flat2_1F/border.bin | 1 + data/layouts/RustboroCity_Flat2_1F/layout.inc | 16 + data/layouts/RustboroCity_Flat2_1F/map.bin | Bin 0 -> 252 bytes data/layouts/RustboroCity_Flat2_2F/border.bin | 1 + data/layouts/RustboroCity_Flat2_2F/layout.inc | 16 + data/layouts/RustboroCity_Flat2_2F/map.bin | Bin 0 -> 252 bytes data/layouts/RustboroCity_Flat2_3F/border.bin | 1 + data/layouts/RustboroCity_Flat2_3F/layout.inc | 16 + data/layouts/RustboroCity_Flat2_3F/map.bin | Bin 0 -> 252 bytes data/layouts/RustboroCity_Gym/border.bin | Bin 0 -> 8 bytes data/layouts/RustboroCity_Gym/layout.inc | 16 + data/layouts/RustboroCity_Gym/map.bin | 2 + data/layouts/RustboroCity_House/border.bin | 1 + data/layouts/RustboroCity_House/layout.inc | 16 + data/layouts/RustboroCity_House/map.bin | 1 + data/layouts/RustboroCity_House1/border.bin | 1 + data/layouts/RustboroCity_House1/layout.inc | 16 + data/layouts/RustboroCity_House1/map.bin | 1 + data/layouts/RustboroCity_PokemonSchool/border.bin | 1 + data/layouts/RustboroCity_PokemonSchool/layout.inc | 16 + data/layouts/RustboroCity_PokemonSchool/map.bin | Bin 0 -> 264 bytes data/layouts/RusturfTunnel/border.bin | 1 + data/layouts/RusturfTunnel/layout.inc | 16 + data/layouts/RusturfTunnel/map.bin | 2 + data/layouts/SSTidalCorridor/border.bin | 1 + data/layouts/SSTidalCorridor/layout.inc | 16 + data/layouts/SSTidalCorridor/map.bin | 1 + data/layouts/SSTidalLowerDeck/border.bin | 1 + data/layouts/SSTidalLowerDeck/layout.inc | 16 + data/layouts/SSTidalLowerDeck/map.bin | 1 + data/layouts/SSTidalRooms/border.bin | 1 + data/layouts/SSTidalRooms/layout.inc | 16 + data/layouts/SSTidalRooms/map.bin | 1 + data/layouts/SafariZone_North/border.bin | 1 + data/layouts/SafariZone_North/layout.inc | 16 + data/layouts/SafariZone_North/map.bin | Bin 0 -> 3200 bytes data/layouts/SafariZone_Northeast/border.bin | 1 + data/layouts/SafariZone_Northeast/layout.inc | 16 + data/layouts/SafariZone_Northeast/map.bin | Bin 0 -> 3200 bytes data/layouts/SafariZone_Northwest/border.bin | 1 + data/layouts/SafariZone_Northwest/layout.inc | 16 + data/layouts/SafariZone_Northwest/map.bin | Bin 0 -> 3200 bytes data/layouts/SafariZone_RestHouse/border.bin | Bin 0 -> 8 bytes data/layouts/SafariZone_RestHouse/layout.inc | 16 + data/layouts/SafariZone_RestHouse/map.bin | 1 + data/layouts/SafariZone_South/border.bin | 1 + data/layouts/SafariZone_South/layout.inc | 16 + data/layouts/SafariZone_South/map.bin | Bin 0 -> 3200 bytes data/layouts/SafariZone_Southeast/border.bin | 1 + data/layouts/SafariZone_Southeast/layout.inc | 16 + data/layouts/SafariZone_Southeast/map.bin | Bin 0 -> 3200 bytes data/layouts/SafariZone_Southwest/border.bin | 1 + data/layouts/SafariZone_Southwest/layout.inc | 16 + data/layouts/SafariZone_Southwest/map.bin | Bin 0 -> 3200 bytes data/layouts/ScorchedSlab/border.bin | 1 + data/layouts/ScorchedSlab/layout.inc | 16 + data/layouts/ScorchedSlab/map.bin | 1 + data/layouts/SeafloorCavern_Entrance/border.bin | 1 + data/layouts/SeafloorCavern_Entrance/layout.inc | 16 + data/layouts/SeafloorCavern_Entrance/map.bin | 11 + data/layouts/SeafloorCavern_Room1/border.bin | 1 + data/layouts/SeafloorCavern_Room1/layout.inc | 16 + data/layouts/SeafloorCavern_Room1/map.bin | 1 + data/layouts/SeafloorCavern_Room2/border.bin | 1 + data/layouts/SeafloorCavern_Room2/layout.inc | 16 + data/layouts/SeafloorCavern_Room2/map.bin | 7 + data/layouts/SeafloorCavern_Room3/border.bin | 1 + data/layouts/SeafloorCavern_Room3/layout.inc | 16 + data/layouts/SeafloorCavern_Room3/map.bin | 1 + data/layouts/SeafloorCavern_Room4/border.bin | 1 + data/layouts/SeafloorCavern_Room4/layout.inc | 16 + data/layouts/SeafloorCavern_Room4/map.bin | 1 + data/layouts/SeafloorCavern_Room5/border.bin | 1 + data/layouts/SeafloorCavern_Room5/layout.inc | 16 + data/layouts/SeafloorCavern_Room5/map.bin | 1 + data/layouts/SeafloorCavern_Room6/border.bin | 1 + data/layouts/SeafloorCavern_Room6/layout.inc | 16 + data/layouts/SeafloorCavern_Room6/map.bin | 1 + data/layouts/SeafloorCavern_Room7/border.bin | 1 + data/layouts/SeafloorCavern_Room7/layout.inc | 16 + data/layouts/SeafloorCavern_Room7/map.bin | 1 + data/layouts/SeafloorCavern_Room8/border.bin | 1 + data/layouts/SeafloorCavern_Room8/layout.inc | 16 + data/layouts/SeafloorCavern_Room8/map.bin | 1 + data/layouts/SeafloorCavern_Room9/border.bin | 1 + data/layouts/SeafloorCavern_Room9/layout.inc | 16 + data/layouts/SeafloorCavern_Room9/map.bin | 1 + data/layouts/SealedChamber_InnerRoom/border.bin | Bin 0 -> 8 bytes data/layouts/SealedChamber_InnerRoom/layout.inc | 16 + data/layouts/SealedChamber_InnerRoom/map.bin | 1 + data/layouts/SealedChamber_OuterRoom/border.bin | Bin 0 -> 8 bytes data/layouts/SealedChamber_OuterRoom/layout.inc | 16 + data/layouts/SealedChamber_OuterRoom/map.bin | 11 + data/layouts/SecretBase_BlueCave1/border.bin | 1 + data/layouts/SecretBase_BlueCave1/layout.inc | 16 + data/layouts/SecretBase_BlueCave1/map.bin | 50 + data/layouts/SecretBase_BlueCave2/border.bin | 1 + data/layouts/SecretBase_BlueCave2/layout.inc | 16 + data/layouts/SecretBase_BlueCave2/map.bin | 57 + data/layouts/SecretBase_BlueCave3/border.bin | 1 + data/layouts/SecretBase_BlueCave3/layout.inc | 16 + data/layouts/SecretBase_BlueCave3/map.bin | 51 + data/layouts/SecretBase_BlueCave4/border.bin | 1 + data/layouts/SecretBase_BlueCave4/layout.inc | 16 + data/layouts/SecretBase_BlueCave4/map.bin | 57 + data/layouts/SecretBase_BrownCave1/border.bin | 1 + data/layouts/SecretBase_BrownCave1/layout.inc | 16 + data/layouts/SecretBase_BrownCave1/map.bin | 54 + data/layouts/SecretBase_BrownCave2/border.bin | 1 + data/layouts/SecretBase_BrownCave2/layout.inc | 16 + data/layouts/SecretBase_BrownCave2/map.bin | 56 + data/layouts/SecretBase_BrownCave3/border.bin | 1 + data/layouts/SecretBase_BrownCave3/layout.inc | 16 + data/layouts/SecretBase_BrownCave3/map.bin | 69 + data/layouts/SecretBase_BrownCave4/border.bin | 1 + data/layouts/SecretBase_BrownCave4/layout.inc | 16 + data/layouts/SecretBase_BrownCave4/map.bin | 70 + data/layouts/SecretBase_RedCave1/border.bin | 1 + data/layouts/SecretBase_RedCave1/layout.inc | 16 + data/layouts/SecretBase_RedCave1/map.bin | 51 + data/layouts/SecretBase_RedCave2/border.bin | 1 + data/layouts/SecretBase_RedCave2/layout.inc | 16 + data/layouts/SecretBase_RedCave2/map.bin | 42 + data/layouts/SecretBase_RedCave3/border.bin | 1 + data/layouts/SecretBase_RedCave3/layout.inc | 16 + data/layouts/SecretBase_RedCave3/map.bin | 47 + data/layouts/SecretBase_RedCave4/border.bin | 1 + data/layouts/SecretBase_RedCave4/layout.inc | 16 + data/layouts/SecretBase_RedCave4/map.bin | 56 + data/layouts/SecretBase_Shrub1/border.bin | 1 + data/layouts/SecretBase_Shrub1/layout.inc | 16 + data/layouts/SecretBase_Shrub1/map.bin | 53 + data/layouts/SecretBase_Shrub2/border.bin | 1 + data/layouts/SecretBase_Shrub2/layout.inc | 16 + data/layouts/SecretBase_Shrub2/map.bin | 57 + data/layouts/SecretBase_Shrub3/border.bin | 1 + data/layouts/SecretBase_Shrub3/layout.inc | 16 + data/layouts/SecretBase_Shrub3/map.bin | 65 + data/layouts/SecretBase_Shrub4/border.bin | 1 + data/layouts/SecretBase_Shrub4/layout.inc | 16 + data/layouts/SecretBase_Shrub4/map.bin | 69 + data/layouts/SecretBase_Tree1/border.bin | 1 + data/layouts/SecretBase_Tree1/layout.inc | 16 + data/layouts/SecretBase_Tree1/map.bin | 56 + data/layouts/SecretBase_Tree2/border.bin | 1 + data/layouts/SecretBase_Tree2/layout.inc | 16 + data/layouts/SecretBase_Tree2/map.bin | 48 + data/layouts/SecretBase_Tree3/border.bin | 1 + data/layouts/SecretBase_Tree3/layout.inc | 16 + data/layouts/SecretBase_Tree3/map.bin | 63 + data/layouts/SecretBase_Tree4/border.bin | 1 + data/layouts/SecretBase_Tree4/layout.inc | 16 + data/layouts/SecretBase_Tree4/map.bin | 77 + data/layouts/SecretBase_YellowCave1/border.bin | 1 + data/layouts/SecretBase_YellowCave1/layout.inc | 16 + data/layouts/SecretBase_YellowCave1/map.bin | 57 + data/layouts/SecretBase_YellowCave2/border.bin | 1 + data/layouts/SecretBase_YellowCave2/layout.inc | 16 + data/layouts/SecretBase_YellowCave2/map.bin | 56 + data/layouts/SecretBase_YellowCave3/border.bin | 1 + data/layouts/SecretBase_YellowCave3/layout.inc | 16 + data/layouts/SecretBase_YellowCave3/map.bin | 63 + data/layouts/SecretBase_YellowCave4/border.bin | 1 + data/layouts/SecretBase_YellowCave4/layout.inc | 16 + data/layouts/SecretBase_YellowCave4/map.bin | 80 + .../ShoalCave_HighTideEntranceRoom/border.bin | 1 + .../ShoalCave_HighTideEntranceRoom/layout.inc | 16 + .../layouts/ShoalCave_HighTideEntranceRoom/map.bin | 1 + .../layouts/ShoalCave_HighTideInnerRoom/border.bin | 1 + .../layouts/ShoalCave_HighTideInnerRoom/layout.inc | 16 + data/layouts/ShoalCave_HighTideInnerRoom/map.bin | 1 + .../ShoalCave_LowTideEntranceRoom/border.bin | 1 + .../ShoalCave_LowTideEntranceRoom/layout.inc | 16 + data/layouts/ShoalCave_LowTideEntranceRoom/map.bin | 3 + data/layouts/ShoalCave_LowTideIceRoom/border.bin | 1 + data/layouts/ShoalCave_LowTideIceRoom/layout.inc | 16 + data/layouts/ShoalCave_LowTideIceRoom/map.bin | 1 + data/layouts/ShoalCave_LowTideInnerRoom/border.bin | 1 + data/layouts/ShoalCave_LowTideInnerRoom/layout.inc | 16 + data/layouts/ShoalCave_LowTideInnerRoom/map.bin | 2 + data/layouts/ShoalCave_LowTideLowerRoom/border.bin | 1 + data/layouts/ShoalCave_LowTideLowerRoom/layout.inc | 16 + data/layouts/ShoalCave_LowTideLowerRoom/map.bin | 4 + .../layouts/ShoalCave_LowTideStairsRoom/border.bin | 1 + .../layouts/ShoalCave_LowTideStairsRoom/layout.inc | 16 + data/layouts/ShoalCave_LowTideStairsRoom/map.bin | 1 + data/layouts/SingleBattleColosseum/border.bin | 1 + data/layouts/SingleBattleColosseum/layout.inc | 16 + data/layouts/SingleBattleColosseum/map.bin | 1 + data/layouts/SkyPillar_1F/border.bin | 1 + data/layouts/SkyPillar_1F/layout.inc | 16 + data/layouts/SkyPillar_1F/map.bin | 1 + data/layouts/SkyPillar_2F/border.bin | 1 + data/layouts/SkyPillar_2F/layout.inc | 16 + data/layouts/SkyPillar_2F/map.bin | 1 + data/layouts/SkyPillar_3F/border.bin | 1 + data/layouts/SkyPillar_3F/layout.inc | 16 + data/layouts/SkyPillar_3F/map.bin | 1 + data/layouts/SkyPillar_4F/border.bin | 1 + data/layouts/SkyPillar_4F/layout.inc | 16 + data/layouts/SkyPillar_4F/map.bin | 1 + data/layouts/SkyPillar_5F/border.bin | 1 + data/layouts/SkyPillar_5F/layout.inc | 16 + data/layouts/SkyPillar_5F/map.bin | 1 + data/layouts/SkyPillar_Entrance/border.bin | 1 + data/layouts/SkyPillar_Entrance/layout.inc | 16 + data/layouts/SkyPillar_Entrance/map.bin | 1 + data/layouts/SkyPillar_Outside/border.bin | 1 + data/layouts/SkyPillar_Outside/layout.inc | 16 + data/layouts/SkyPillar_Outside/map.bin | 1 + data/layouts/SkyPillar_Top/border.bin | 1 + data/layouts/SkyPillar_Top/layout.inc | 16 + data/layouts/SkyPillar_Top/map.bin | 1 + data/layouts/SlateportCity/border.bin | 1 + data/layouts/SlateportCity/layout.inc | 16 + data/layouts/SlateportCity/map.bin | Bin 0 -> 4800 bytes .../SlateportCity_OceanicMuseum_1F/border.bin | Bin 0 -> 8 bytes .../SlateportCity_OceanicMuseum_1F/layout.inc | 16 + .../layouts/SlateportCity_OceanicMuseum_1F/map.bin | 2 + .../SlateportCity_OceanicMuseum_2F/border.bin | Bin 0 -> 8 bytes .../SlateportCity_OceanicMuseum_2F/layout.inc | 16 + .../layouts/SlateportCity_OceanicMuseum_2F/map.bin | 1 + .../SlateportCity_PokemonFanClub/border.bin | Bin 0 -> 8 bytes .../SlateportCity_PokemonFanClub/layout.inc | 16 + data/layouts/SlateportCity_PokemonFanClub/map.bin | Bin 0 -> 308 bytes .../SlateportCity_SternsShipyard_1F/border.bin | 1 + .../SlateportCity_SternsShipyard_1F/layout.inc | 16 + .../SlateportCity_SternsShipyard_1F/map.bin | 7 + .../SlateportCity_SternsShipyard_2F/border.bin | 1 + .../SlateportCity_SternsShipyard_2F/layout.inc | 16 + .../SlateportCity_SternsShipyard_2F/map.bin | 1 + data/layouts/SootopolisCity/border.bin | 1 + data/layouts/SootopolisCity/layout.inc | 16 + data/layouts/SootopolisCity/map.bin | 12 + data/layouts/SootopolisCity_Gym_1F/border.bin | Bin 0 -> 8 bytes data/layouts/SootopolisCity_Gym_1F/layout.inc | 16 + data/layouts/SootopolisCity_Gym_1F/map.bin | Bin 0 -> 884 bytes data/layouts/SootopolisCity_Gym_B1F/border.bin | Bin 0 -> 8 bytes data/layouts/SootopolisCity_Gym_B1F/layout.inc | 16 + data/layouts/SootopolisCity_Gym_B1F/map.bin | 1 + data/layouts/SootopolisCity_House1/border.bin | 1 + data/layouts/SootopolisCity_House1/layout.inc | 16 + data/layouts/SootopolisCity_House1/map.bin | 1 + data/layouts/SootopolisCity_House2/border.bin | 1 + data/layouts/SootopolisCity_House2/layout.inc | 16 + data/layouts/SootopolisCity_House2/map.bin | 1 + data/layouts/SootopolisCity_House3/border.bin | 1 + data/layouts/SootopolisCity_House3/layout.inc | 16 + data/layouts/SootopolisCity_House3/map.bin | 1 + .../SootopolisCity_LotadAndSeedotHouse/border.bin | Bin 0 -> 8 bytes .../SootopolisCity_LotadAndSeedotHouse/layout.inc | 16 + .../SootopolisCity_LotadAndSeedotHouse/map.bin | 1 + .../border.bin | Bin 0 -> 8 bytes .../layout.inc | 16 + .../SootopolisCity_MysteryEventsHouse_1F/map.bin | 1 + .../border.bin | Bin 0 -> 8 bytes .../layout.inc | 16 + .../SootopolisCity_MysteryEventsHouse_B1F/map.bin | 2 + data/layouts/SouthernIsland_Exterior/border.bin | 1 + data/layouts/SouthernIsland_Exterior/layout.inc | 16 + data/layouts/SouthernIsland_Exterior/map.bin | 1 + data/layouts/SouthernIsland_Interior/border.bin | 1 + data/layouts/SouthernIsland_Interior/layout.inc | 16 + data/layouts/SouthernIsland_Interior/map.bin | 1 + data/layouts/TerraCave_End/border.bin | 1 + data/layouts/TerraCave_End/layout.inc | 16 + data/layouts/TerraCave_End/map.bin | 9 + data/layouts/TerraCave_Entrance/border.bin | 1 + data/layouts/TerraCave_Entrance/layout.inc | 16 + data/layouts/TerraCave_Entrance/map.bin | 33 + data/layouts/TradeCenter/border.bin | 1 + data/layouts/TradeCenter/layout.inc | 16 + data/layouts/TradeCenter/map.bin | 2 + data/layouts/TrainerHill_1F/border.bin | 1 + data/layouts/TrainerHill_1F/layout.inc | 16 + data/layouts/TrainerHill_1F/map.bin | 2 + data/layouts/TrainerHill_2F/border.bin | 1 + data/layouts/TrainerHill_2F/layout.inc | 16 + data/layouts/TrainerHill_2F/map.bin | 2 + data/layouts/TrainerHill_3F/border.bin | 1 + data/layouts/TrainerHill_3F/layout.inc | 16 + data/layouts/TrainerHill_3F/map.bin | 2 + data/layouts/TrainerHill_4F/border.bin | 1 + data/layouts/TrainerHill_4F/layout.inc | 16 + data/layouts/TrainerHill_4F/map.bin | 2 + data/layouts/TrainerHill_Entrance/border.bin | 1 + data/layouts/TrainerHill_Entrance/layout.inc | 16 + data/layouts/TrainerHill_Entrance/map.bin | 2 + data/layouts/TrainerHill_Roof/border.bin | 1 + data/layouts/TrainerHill_Roof/layout.inc | 16 + data/layouts/TrainerHill_Roof/map.bin | 1 + data/layouts/Underwater1/border.bin | 1 + data/layouts/Underwater1/layout.inc | 16 + data/layouts/Underwater1/map.bin | 17 + data/layouts/Underwater2/border.bin | 1 + data/layouts/Underwater2/layout.inc | 16 + data/layouts/Underwater2/map.bin | 35 + data/layouts/Underwater3/border.bin | 1 + data/layouts/Underwater3/layout.inc | 16 + data/layouts/Underwater3/map.bin | 1 + data/layouts/Underwater4/border.bin | 1 + data/layouts/Underwater4/layout.inc | 16 + data/layouts/Underwater4/map.bin | 1 + data/layouts/Underwater5/border.bin | 1 + data/layouts/Underwater5/layout.inc | 16 + data/layouts/Underwater5/map.bin | 1 + data/layouts/Underwater6/border.bin | 1 + data/layouts/Underwater6/layout.inc | 16 + data/layouts/Underwater6/map.bin | 1 + data/layouts/Underwater7/border.bin | 1 + data/layouts/Underwater7/layout.inc | 16 + data/layouts/Underwater7/map.bin | 1 + data/layouts/Underwater_MarineCave/border.bin | 1 + data/layouts/Underwater_MarineCave/layout.inc | 16 + data/layouts/Underwater_MarineCave/map.bin | 1 + data/layouts/Underwater_Route134/border.bin | 1 + data/layouts/Underwater_Route134/layout.inc | 16 + data/layouts/Underwater_Route134/map.bin | 2 + data/layouts/Underwater_SeafloorCavern/border.bin | 1 + data/layouts/Underwater_SeafloorCavern/layout.inc | 16 + data/layouts/Underwater_SeafloorCavern/map.bin | 2 + data/layouts/Underwater_SealedChamber/border.bin | 1 + data/layouts/Underwater_SealedChamber/layout.inc | 16 + data/layouts/Underwater_SealedChamber/map.bin | 1 + data/layouts/Underwater_SootopolisCity/border.bin | 1 + data/layouts/Underwater_SootopolisCity/layout.inc | 16 + data/layouts/Underwater_SootopolisCity/map.bin | 2 + data/layouts/UnionRoom/border.bin | Bin 0 -> 8 bytes data/layouts/UnionRoom/layout.inc | 16 + data/layouts/UnionRoom/map.bin | 11 + data/layouts/UnknownMap_08417FC4/border.bin | 1 + data/layouts/UnknownMap_08417FC4/layout.inc | 16 + data/layouts/UnknownMap_08417FC4/map.bin | 1 + data/layouts/UnknownMap_08428450/border.bin | 1 + data/layouts/UnknownMap_08428450/layout.inc | 16 + data/layouts/UnknownMap_08428450/map.bin | Bin 0 -> 4 bytes data/layouts/UnknownMap_084294C4/border.bin | 1 + data/layouts/UnknownMap_084294C4/layout.inc | 16 + data/layouts/UnknownMap_084294C4/map.bin | Bin 0 -> 4 bytes data/layouts/UnknownMap_084294E8/border.bin | 1 + data/layouts/UnknownMap_084294E8/layout.inc | 16 + data/layouts/UnknownMap_084294E8/map.bin | Bin 0 -> 4 bytes data/layouts/UnknownMap_0843E6C0/border.bin | 1 + data/layouts/UnknownMap_0843E6C0/layout.inc | 16 + data/layouts/UnknownMap_0843E6C0/map.bin | Bin 0 -> 4 bytes data/layouts/UnknownMap_0843E6E4/border.bin | 1 + data/layouts/UnknownMap_0843E6E4/layout.inc | 16 + data/layouts/UnknownMap_0843E6E4/map.bin | Bin 0 -> 4 bytes data/layouts/UnknownMap_0843E708/border.bin | 1 + data/layouts/UnknownMap_0843E708/layout.inc | 16 + data/layouts/UnknownMap_0843E708/map.bin | Bin 0 -> 4 bytes data/layouts/UnknownMap_0843E72C/border.bin | 1 + data/layouts/UnknownMap_0843E72C/layout.inc | 16 + data/layouts/UnknownMap_0843E72C/map.bin | Bin 0 -> 4 bytes data/layouts/UnknownMap_0843E750/border.bin | 1 + data/layouts/UnknownMap_0843E750/layout.inc | 16 + data/layouts/UnknownMap_0843E750/map.bin | Bin 0 -> 4 bytes data/layouts/UnknownMap_0843E774/border.bin | 1 + data/layouts/UnknownMap_0843E774/layout.inc | 16 + data/layouts/UnknownMap_0843E774/map.bin | Bin 0 -> 4 bytes data/layouts/UnknownMap_0843E798/border.bin | 1 + data/layouts/UnknownMap_0843E798/layout.inc | 16 + data/layouts/UnknownMap_0843E798/map.bin | Bin 0 -> 4 bytes data/layouts/UnknownMap_0843E7BC/border.bin | 1 + data/layouts/UnknownMap_0843E7BC/layout.inc | 16 + data/layouts/UnknownMap_0843E7BC/map.bin | Bin 0 -> 4 bytes data/layouts/UnknownMap_0843E7E0/border.bin | 1 + data/layouts/UnknownMap_0843E7E0/layout.inc | 16 + data/layouts/UnknownMap_0843E7E0/map.bin | Bin 0 -> 4 bytes data/layouts/UnknownMap_0843E804/border.bin | 1 + data/layouts/UnknownMap_0843E804/layout.inc | 16 + data/layouts/UnknownMap_0843E804/map.bin | Bin 0 -> 4 bytes data/layouts/UnknownMap_0843E828/border.bin | 1 + data/layouts/UnknownMap_0843E828/layout.inc | 16 + data/layouts/UnknownMap_0843E828/map.bin | Bin 0 -> 4 bytes data/layouts/UnknownMap_0843E84C/border.bin | 1 + data/layouts/UnknownMap_0843E84C/layout.inc | 16 + data/layouts/UnknownMap_0843E84C/map.bin | Bin 0 -> 4 bytes data/layouts/UnknownMap_0843E870/border.bin | 1 + data/layouts/UnknownMap_0843E870/layout.inc | 16 + data/layouts/UnknownMap_0843E870/map.bin | Bin 0 -> 4 bytes data/layouts/UnknownMap_0843E894/border.bin | 1 + data/layouts/UnknownMap_0843E894/layout.inc | 15 + data/layouts/UnknownMap_0843E894/map.bin | Bin 0 -> 4 bytes data/layouts/UnknownMap_08447028/border.bin | 1 + data/layouts/UnknownMap_08447028/layout.inc | 16 + data/layouts/UnknownMap_08447028/map.bin | 3 + data/layouts/UnknownMap_0845A394/border.bin | 1 + data/layouts/UnknownMap_0845A394/layout.inc | 16 + data/layouts/UnknownMap_0845A394/map.bin | Bin 0 -> 724 bytes data/layouts/UnknownMap_0845D470/border.bin | 1 + data/layouts/UnknownMap_0845D470/layout.inc | 16 + data/layouts/UnknownMap_0845D470/map.bin | 1 + data/layouts/UnknownMap_0845ECB4/border.bin | 1 + data/layouts/UnknownMap_0845ECB4/layout.inc | 16 + data/layouts/UnknownMap_0845ECB4/map.bin | 1 + data/layouts/UnknownMap_08469200/border.bin | 1 + data/layouts/UnknownMap_08469200/layout.inc | 16 + data/layouts/UnknownMap_08469200/map.bin | 12 + data/layouts/UnknownMap_084693AC/border.bin | Bin 0 -> 8 bytes data/layouts/UnknownMap_084693AC/layout.inc | 16 + data/layouts/UnknownMap_084693AC/map.bin | Bin 0 -> 4 bytes data/layouts/UnknownMap_08470BD8/border.bin | Bin 0 -> 8 bytes data/layouts/UnknownMap_08470BD8/layout.inc | 16 + data/layouts/UnknownMap_08470BD8/map.bin | Bin 0 -> 11200 bytes data/layouts/UnknownMap_08480DAC/border.bin | 1 + data/layouts/UnknownMap_08480DAC/layout.inc | 16 + data/layouts/UnknownMap_08480DAC/map.bin | Bin 0 -> 340 bytes data/layouts/UnknownMap_08480F54/border.bin | 1 + data/layouts/UnknownMap_08480F54/layout.inc | 16 + data/layouts/UnknownMap_08480F54/map.bin | 1 + data/layouts/UnknownMap_084810FC/border.bin | 1 + data/layouts/UnknownMap_084810FC/layout.inc | 16 + data/layouts/UnknownMap_084810FC/map.bin | 1 + data/layouts/UnknownMap_084812A4/border.bin | 1 + data/layouts/UnknownMap_084812A4/layout.inc | 16 + data/layouts/UnknownMap_084812A4/map.bin | 1 + data/layouts/UnknownMap_0848144C/border.bin | 1 + data/layouts/UnknownMap_0848144C/layout.inc | 16 + data/layouts/UnknownMap_0848144C/map.bin | 1 + data/layouts/UnknownMap_084815F4/border.bin | 1 + data/layouts/UnknownMap_084815F4/layout.inc | 16 + data/layouts/UnknownMap_084815F4/map.bin | 1 + data/layouts/UnknownMap_08481B24/border.bin | 1 + data/layouts/UnknownMap_08481B24/layout.inc | 16 + data/layouts/UnknownMap_08481B24/map.bin | 1 + data/layouts/UnknownMap_08481DBC/border.bin | Bin 0 -> 8 bytes data/layouts/UnknownMap_08481DBC/layout.inc | 16 + data/layouts/UnknownMap_08481DBC/map.bin | 2 + data/layouts/UnknownMap_25_29/border.bin | 1 + data/layouts/UnknownMap_25_29/layout.inc | 16 + data/layouts/UnknownMap_25_29/map.bin | 1 + data/layouts/UnknownMap_25_30/border.bin | 1 + data/layouts/UnknownMap_25_30/layout.inc | 16 + data/layouts/UnknownMap_25_30/map.bin | 1 + data/layouts/UnknownMap_25_31/border.bin | 1 + data/layouts/UnknownMap_25_31/layout.inc | 16 + data/layouts/UnknownMap_25_31/map.bin | 1 + data/layouts/UnknownMap_25_32/border.bin | 1 + data/layouts/UnknownMap_25_32/layout.inc | 16 + data/layouts/UnknownMap_25_32/map.bin | 1 + data/layouts/UnknownMap_25_33/border.bin | 1 + data/layouts/UnknownMap_25_33/layout.inc | 16 + data/layouts/UnknownMap_25_33/map.bin | 1 + data/layouts/UnknownMap_25_34/border.bin | 1 + data/layouts/UnknownMap_25_34/layout.inc | 16 + data/layouts/UnknownMap_25_34/map.bin | 1 + data/layouts/VerdanturfTown/border.bin | Bin 0 -> 8 bytes data/layouts/VerdanturfTown/layout.inc | 16 + data/layouts/VerdanturfTown/map.bin | Bin 0 -> 800 bytes .../VerdanturfTown_BattleTentBattleRoom/border.bin | Bin 0 -> 8 bytes .../VerdanturfTown_BattleTentBattleRoom/layout.inc | 16 + .../VerdanturfTown_BattleTentBattleRoom/map.bin | Bin 0 -> 234 bytes data/layouts/VerdanturfTown_WandasHouse/border.bin | Bin 0 -> 8 bytes data/layouts/VerdanturfTown_WandasHouse/layout.inc | 16 + data/layouts/VerdanturfTown_WandasHouse/map.bin | Bin 0 -> 272 bytes data/layouts/VictoryRoad_1F/border.bin | 1 + data/layouts/VictoryRoad_1F/layout.inc | 16 + data/layouts/VictoryRoad_1F/map.bin | 10 + data/layouts/VictoryRoad_B1F/border.bin | 1 + data/layouts/VictoryRoad_B1F/layout.inc | 16 + data/layouts/VictoryRoad_B1F/map.bin | 25 + data/layouts/VictoryRoad_B2F/border.bin | 1 + data/layouts/VictoryRoad_B2F/layout.inc | 16 + data/layouts/VictoryRoad_B2F/map.bin | 1 + data/layouts_table.inc | 444 ++ data/maps.s | 6 +- data/maps/AbandonedShip_CaptainsOffice/border.bin | 1 - data/maps/AbandonedShip_CaptainsOffice/header.inc | 2 +- data/maps/AbandonedShip_CaptainsOffice/map.bin | Bin 126 -> 0 bytes data/maps/AbandonedShip_Corridors_1F/border.bin | 1 - data/maps/AbandonedShip_Corridors_1F/header.inc | 2 +- data/maps/AbandonedShip_Corridors_1F/map.bin | 3 - data/maps/AbandonedShip_Corridors_B1F/border.bin | 1 - data/maps/AbandonedShip_Corridors_B1F/header.inc | 2 +- data/maps/AbandonedShip_Corridors_B1F/map.bin | 1 - data/maps/AbandonedShip_Deck/border.bin | 1 - data/maps/AbandonedShip_Deck/header.inc | 2 +- data/maps/AbandonedShip_Deck/map.bin | 1 - .../AbandonedShip_HiddenFloorCorridors/border.bin | 1 - .../AbandonedShip_HiddenFloorCorridors/header.inc | 2 +- .../AbandonedShip_HiddenFloorCorridors/map.bin | 1 - .../maps/AbandonedShip_HiddenFloorRooms/border.bin | 1 - .../maps/AbandonedShip_HiddenFloorRooms/header.inc | 2 +- data/maps/AbandonedShip_HiddenFloorRooms/map.bin | 1 - data/maps/AbandonedShip_Room_B1F/border.bin | 1 - data/maps/AbandonedShip_Room_B1F/header.inc | 2 +- data/maps/AbandonedShip_Room_B1F/map.bin | 1 - data/maps/AbandonedShip_Rooms2_1F/border.bin | 1 - data/maps/AbandonedShip_Rooms2_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_1F/map.bin | 1 - data/maps/AbandonedShip_Rooms2_B1F/border.bin | 1 - data/maps/AbandonedShip_Rooms2_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_B1F/map.bin | 1 - data/maps/AbandonedShip_Rooms_1F/border.bin | 1 - data/maps/AbandonedShip_Rooms_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_1F/map.bin | 1 - data/maps/AbandonedShip_Rooms_B1F/border.bin | 1 - data/maps/AbandonedShip_Rooms_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_B1F/map.bin | 1 - data/maps/AbandonedShip_Underwater1/border.bin | 1 - data/maps/AbandonedShip_Underwater1/header.inc | 2 +- data/maps/AbandonedShip_Underwater1/map.bin | 1 - data/maps/AbandonedShip_Underwater2/border.bin | 1 - data/maps/AbandonedShip_Underwater2/header.inc | 2 +- data/maps/AbandonedShip_Underwater2/map.bin | 1 - data/maps/AlteringCave/border.bin | 1 - data/maps/AlteringCave/header.inc | 2 +- data/maps/AlteringCave/map.bin | 1 - data/maps/AncientTomb/border.bin | 1 - data/maps/AncientTomb/header.inc | 2 +- data/maps/AncientTomb/map.bin | Bin 1122 -> 0 bytes data/maps/AquaHideout_1F/border.bin | 1 - data/maps/AquaHideout_1F/header.inc | 2 +- data/maps/AquaHideout_1F/map.bin | 55 - data/maps/AquaHideout_B1F/border.bin | 1 - data/maps/AquaHideout_B1F/header.inc | 2 +- data/maps/AquaHideout_B1F/map.bin | 83 - data/maps/AquaHideout_B2F/border.bin | 1 - data/maps/AquaHideout_B2F/header.inc | 2 +- data/maps/AquaHideout_B2F/map.bin | 51 - data/maps/AquaHideout_UnusedRubyMap1/border.bin | 1 - data/maps/AquaHideout_UnusedRubyMap1/header.inc | 2 +- data/maps/AquaHideout_UnusedRubyMap1/map.bin | Bin 1680 -> 0 bytes data/maps/AquaHideout_UnusedRubyMap2/border.bin | 1 - data/maps/AquaHideout_UnusedRubyMap2/header.inc | 2 +- data/maps/AquaHideout_UnusedRubyMap2/map.bin | 95 - data/maps/AquaHideout_UnusedRubyMap3/border.bin | 1 - data/maps/AquaHideout_UnusedRubyMap3/header.inc | 2 +- data/maps/AquaHideout_UnusedRubyMap3/map.bin | 49 - data/maps/ArtisanCave_1F/border.bin | 1 - data/maps/ArtisanCave_1F/header.inc | 2 +- data/maps/ArtisanCave_1F/map.bin | 1 - data/maps/ArtisanCave_B1F/border.bin | 1 - data/maps/ArtisanCave_B1F/header.inc | 2 +- data/maps/ArtisanCave_B1F/map.bin | 1 - .../border.bin | Bin 8 -> 0 bytes .../header.inc | 2 +- .../BattleFrontier_BattleArenaBattleRoom/map.bin | 1 - .../BattleFrontier_BattleArenaCorridor/border.bin | Bin 8 -> 0 bytes .../BattleFrontier_BattleArenaCorridor/header.inc | 2 +- .../BattleFrontier_BattleArenaCorridor/map.bin | 1 - .../BattleFrontier_BattleArenaLobby/border.bin | Bin 8 -> 0 bytes .../BattleFrontier_BattleArenaLobby/header.inc | 2 +- data/maps/BattleFrontier_BattleArenaLobby/map.bin | 3 - .../BattleFrontier_BattleDomeBattleRoom/border.bin | Bin 8 -> 0 bytes .../BattleFrontier_BattleDomeBattleRoom/header.inc | 2 +- .../BattleFrontier_BattleDomeBattleRoom/map.bin | 2 - .../BattleFrontier_BattleDomeCorridor/border.bin | Bin 8 -> 0 bytes .../BattleFrontier_BattleDomeCorridor/header.inc | 2 +- .../maps/BattleFrontier_BattleDomeCorridor/map.bin | 1 - .../maps/BattleFrontier_BattleDomeLobby/border.bin | Bin 8 -> 0 bytes .../maps/BattleFrontier_BattleDomeLobby/header.inc | 2 +- data/maps/BattleFrontier_BattleDomeLobby/map.bin | 1 - .../border.bin | Bin 8 -> 0 bytes .../header.inc | 2 +- .../BattleFrontier_BattleDomePreBattleRoom/map.bin | Bin 144 -> 0 bytes .../border.bin | Bin 8 -> 0 bytes .../header.inc | 2 +- .../BattleFrontier_BattleFactoryBattleRoom/map.bin | Bin 312 -> 0 bytes .../BattleFrontier_BattleFactoryLobby/border.bin | Bin 8 -> 0 bytes .../BattleFrontier_BattleFactoryLobby/header.inc | 2 +- .../maps/BattleFrontier_BattleFactoryLobby/map.bin | 2 - .../border.bin | Bin 8 -> 0 bytes .../header.inc | 2 +- .../map.bin | 2 - .../border.bin | Bin 8 -> 0 bytes .../header.inc | 2 +- .../BattleFrontier_BattlePalaceBattleRoom/map.bin | 1 - .../BattleFrontier_BattlePalaceCorridor/border.bin | Bin 8 -> 0 bytes .../BattleFrontier_BattlePalaceCorridor/header.inc | 2 +- .../BattleFrontier_BattlePalaceCorridor/map.bin | Bin 476 -> 0 bytes .../BattleFrontier_BattlePalaceLobby/border.bin | Bin 8 -> 0 bytes .../BattleFrontier_BattlePalaceLobby/header.inc | 2 +- data/maps/BattleFrontier_BattlePalaceLobby/map.bin | 7 - .../BattleFrontier_BattlePikeCorridor/border.bin | Bin 8 -> 0 bytes .../BattleFrontier_BattlePikeCorridor/header.inc | 2 +- .../maps/BattleFrontier_BattlePikeCorridor/map.bin | 1 - .../maps/BattleFrontier_BattlePikeLobby/border.bin | Bin 8 -> 0 bytes .../maps/BattleFrontier_BattlePikeLobby/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeLobby/map.bin | 1 - .../border.bin | Bin 8 -> 0 bytes .../header.inc | 2 +- .../BattleFrontier_BattlePikeRandomRoom1/map.bin | 1 - .../border.bin | Bin 8 -> 0 bytes .../header.inc | 2 +- .../BattleFrontier_BattlePikeRandomRoom2/map.bin | 1 - .../border.bin | Bin 8 -> 0 bytes .../header.inc | 2 +- .../BattleFrontier_BattlePikeRandomRoom3/map.bin | 1 - .../border.bin | Bin 8 -> 0 bytes .../header.inc | 2 +- .../BattleFrontier_BattlePikeThreePathRoom/map.bin | 1 - .../border.bin | Bin 8 -> 0 bytes .../header.inc | 2 +- .../map.bin | 2 - .../border.bin | Bin 8 -> 0 bytes .../header.inc | 2 +- .../map.bin | 1 - .../BattleFrontier_BattlePyramidLobby/border.bin | Bin 8 -> 0 bytes .../BattleFrontier_BattlePyramidLobby/header.inc | 2 +- .../maps/BattleFrontier_BattlePyramidLobby/map.bin | 2 - .../BattleFrontier_BattlePyramidTop/border.bin | Bin 8 -> 0 bytes .../BattleFrontier_BattlePyramidTop/header.inc | 2 +- data/maps/BattleFrontier_BattlePyramidTop/map.bin | 1 - .../border.bin | Bin 8 -> 0 bytes .../header.inc | 2 +- .../BattleFrontier_BattleTowerBattleRoom/map.bin | 1 - .../header.inc | 2 +- .../BattleFrontier_BattleTowerCorridor/border.bin | Bin 8 -> 0 bytes .../BattleFrontier_BattleTowerCorridor/header.inc | 2 +- .../BattleFrontier_BattleTowerCorridor/map.bin | Bin 170 -> 0 bytes .../BattleFrontier_BattleTowerCorridor2/border.bin | Bin 8 -> 0 bytes .../BattleFrontier_BattleTowerCorridor2/header.inc | 2 +- .../BattleFrontier_BattleTowerCorridor2/map.bin | Bin 170 -> 0 bytes .../BattleFrontier_BattleTowerElevator/border.bin | Bin 8 -> 0 bytes .../BattleFrontier_BattleTowerElevator/header.inc | 2 +- .../BattleFrontier_BattleTowerElevator/map.bin | 1 - .../BattleFrontier_BattleTowerLobby/border.bin | Bin 8 -> 0 bytes .../BattleFrontier_BattleTowerLobby/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerLobby/map.bin | Bin 500 -> 0 bytes .../border.bin | Bin 8 -> 0 bytes .../header.inc | 2 +- .../map.bin | Bin 630 -> 0 bytes data/maps/BattleFrontier_Lounge1/border.bin | Bin 8 -> 0 bytes data/maps/BattleFrontier_Lounge1/header.inc | 2 +- data/maps/BattleFrontier_Lounge1/map.bin | 1 - data/maps/BattleFrontier_Lounge2/border.bin | Bin 8 -> 0 bytes data/maps/BattleFrontier_Lounge2/header.inc | 2 +- data/maps/BattleFrontier_Lounge2/map.bin | 1 - 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/border.bin | 1 - data/maps/BattleFrontier_OutsideEast/header.inc | 2 +- data/maps/BattleFrontier_OutsideEast/map.bin | Bin 10368 -> 0 bytes data/maps/BattleFrontier_OutsideWest/border.bin | 1 - data/maps/BattleFrontier_OutsideWest/header.inc | 2 +- data/maps/BattleFrontier_OutsideWest/map.bin | Bin 8064 -> 0 bytes .../BattleFrontier_PokemonCenter_1F/header.inc | 2 +- .../BattleFrontier_PokemonCenter_2F/header.inc | 2 +- data/maps/BattleFrontier_RankingHall/border.bin | Bin 8 -> 0 bytes data/maps/BattleFrontier_RankingHall/header.inc | 2 +- data/maps/BattleFrontier_RankingHall/map.bin | 64 - data/maps/BattleFrontier_ReceptionGate/border.bin | Bin 8 -> 0 bytes data/maps/BattleFrontier_ReceptionGate/header.inc | 2 +- data/maps/BattleFrontier_ReceptionGate/map.bin | Bin 252 -> 0 bytes data/maps/BattleFrontier_ScottsHouse/border.bin | Bin 8 -> 0 bytes data/maps/BattleFrontier_ScottsHouse/header.inc | 2 +- data/maps/BattleFrontier_ScottsHouse/map.bin | 1 - data/maps/BattlePyramidSquare01/border.bin | Bin 8 -> 0 bytes data/maps/BattlePyramidSquare01/header.inc | 2 +- data/maps/BattlePyramidSquare01/map.bin | 1 - data/maps/BattlePyramidSquare02/border.bin | Bin 8 -> 0 bytes data/maps/BattlePyramidSquare02/header.inc | 2 +- data/maps/BattlePyramidSquare02/map.bin | 1 - data/maps/BattlePyramidSquare03/border.bin | Bin 8 -> 0 bytes data/maps/BattlePyramidSquare03/header.inc | 2 +- data/maps/BattlePyramidSquare03/map.bin | 1 - data/maps/BattlePyramidSquare04/border.bin | Bin 8 -> 0 bytes data/maps/BattlePyramidSquare04/header.inc | 2 +- data/maps/BattlePyramidSquare04/map.bin | 1 - data/maps/BattlePyramidSquare05/border.bin | Bin 8 -> 0 bytes data/maps/BattlePyramidSquare05/header.inc | 2 +- data/maps/BattlePyramidSquare05/map.bin | 1 - data/maps/BattlePyramidSquare06/border.bin | Bin 8 -> 0 bytes data/maps/BattlePyramidSquare06/header.inc | 2 +- data/maps/BattlePyramidSquare06/map.bin | 1 - data/maps/BattlePyramidSquare07/border.bin | Bin 8 -> 0 bytes data/maps/BattlePyramidSquare07/header.inc | 2 +- data/maps/BattlePyramidSquare07/map.bin | 1 - data/maps/BattlePyramidSquare08/border.bin | Bin 8 -> 0 bytes data/maps/BattlePyramidSquare08/header.inc | 2 +- data/maps/BattlePyramidSquare08/map.bin | 1 - data/maps/BattlePyramidSquare09/border.bin | Bin 8 -> 0 bytes data/maps/BattlePyramidSquare09/header.inc | 2 +- data/maps/BattlePyramidSquare09/map.bin | 1 - data/maps/BattlePyramidSquare10/border.bin | Bin 8 -> 0 bytes data/maps/BattlePyramidSquare10/header.inc | 2 +- data/maps/BattlePyramidSquare10/map.bin | 1 - data/maps/BattlePyramidSquare11/border.bin | Bin 8 -> 0 bytes data/maps/BattlePyramidSquare11/header.inc | 2 +- data/maps/BattlePyramidSquare11/map.bin | 1 - data/maps/BattlePyramidSquare12/border.bin | Bin 8 -> 0 bytes data/maps/BattlePyramidSquare12/header.inc | 2 +- data/maps/BattlePyramidSquare12/map.bin | 1 - data/maps/BattlePyramidSquare13/border.bin | Bin 8 -> 0 bytes data/maps/BattlePyramidSquare13/header.inc | 2 +- data/maps/BattlePyramidSquare13/map.bin | 1 - data/maps/BattlePyramidSquare14/border.bin | Bin 8 -> 0 bytes data/maps/BattlePyramidSquare14/header.inc | 2 +- data/maps/BattlePyramidSquare14/map.bin | 1 - data/maps/BattlePyramidSquare15/border.bin | Bin 8 -> 0 bytes data/maps/BattlePyramidSquare15/header.inc | 2 +- data/maps/BattlePyramidSquare15/map.bin | 1 - data/maps/BattlePyramidSquare16/border.bin | Bin 8 -> 0 bytes data/maps/BattlePyramidSquare16/header.inc | 2 +- data/maps/BattlePyramidSquare16/map.bin | 1 - data/maps/BirthIsland_Exterior/border.bin | 1 - data/maps/BirthIsland_Exterior/header.inc | 2 +- data/maps/BirthIsland_Exterior/map.bin | Bin 1800 -> 0 bytes data/maps/BirthIsland_Harbor/border.bin | 1 - data/maps/BirthIsland_Harbor/header.inc | 2 +- data/maps/BirthIsland_Harbor/map.bin | 1 - data/maps/CaveOfOrigin_1F/border.bin | 1 - data/maps/CaveOfOrigin_1F/header.inc | 2 +- data/maps/CaveOfOrigin_1F/map.bin | 1 - data/maps/CaveOfOrigin_B1F/border.bin | 1 - data/maps/CaveOfOrigin_B1F/header.inc | 2 +- data/maps/CaveOfOrigin_B1F/map.bin | 1 - data/maps/CaveOfOrigin_Entrance/border.bin | 1 - data/maps/CaveOfOrigin_Entrance/header.inc | 2 +- data/maps/CaveOfOrigin_Entrance/map.bin | 1 - .../CaveOfOrigin_UnusedRubySapphireMap1/border.bin | 1 - .../CaveOfOrigin_UnusedRubySapphireMap1/header.inc | 2 +- .../CaveOfOrigin_UnusedRubySapphireMap1/map.bin | 1 - .../CaveOfOrigin_UnusedRubySapphireMap2/border.bin | 1 - .../CaveOfOrigin_UnusedRubySapphireMap2/header.inc | 2 +- .../CaveOfOrigin_UnusedRubySapphireMap2/map.bin | 1 - .../CaveOfOrigin_UnusedRubySapphireMap3/border.bin | 1 - .../CaveOfOrigin_UnusedRubySapphireMap3/header.inc | 2 +- .../CaveOfOrigin_UnusedRubySapphireMap3/map.bin | 1 - data/maps/DesertRuins/border.bin | 1 - data/maps/DesertRuins/header.inc | 2 +- data/maps/DesertRuins/map.bin | Bin 1122 -> 0 bytes data/maps/DesertUnderpass/border.bin | 1 - data/maps/DesertUnderpass/header.inc | 2 +- data/maps/DesertUnderpass/map.bin | 1 - data/maps/DewfordTown/border.bin | 1 - data/maps/DewfordTown/header.inc | 2 +- data/maps/DewfordTown/map.bin | 2 - data/maps/DewfordTown_Gym/border.bin | Bin 8 -> 0 bytes data/maps/DewfordTown_Gym/header.inc | 2 +- data/maps/DewfordTown_Gym/map.bin | Bin 1008 -> 0 bytes data/maps/DewfordTown_Hall/border.bin | 1 - data/maps/DewfordTown_Hall/header.inc | 2 +- data/maps/DewfordTown_Hall/map.bin | Bin 306 -> 0 bytes data/maps/DewfordTown_House1/border.bin | 1 - data/maps/DewfordTown_House1/header.inc | 2 +- data/maps/DewfordTown_House1/map.bin | 1 - data/maps/DewfordTown_House2/border.bin | 1 - data/maps/DewfordTown_House2/header.inc | 2 +- data/maps/DewfordTown_House2/map.bin | 1 - data/maps/DewfordTown_PokemonCenter_1F/header.inc | 2 +- data/maps/DewfordTown_PokemonCenter_2F/header.inc | 2 +- data/maps/DoubleBattleColosseum/border.bin | 1 - data/maps/DoubleBattleColosseum/header.inc | 2 +- data/maps/DoubleBattleColosseum/map.bin | 1 - data/maps/EverGrandeCity/border.bin | 1 - data/maps/EverGrandeCity/header.inc | 2 +- data/maps/EverGrandeCity/map.bin | Bin 6400 -> 0 bytes data/maps/EverGrandeCity_ChampionsRoom/border.bin | Bin 8 -> 0 bytes data/maps/EverGrandeCity_ChampionsRoom/header.inc | 2 +- data/maps/EverGrandeCity_ChampionsRoom/map.bin | Bin 338 -> 0 bytes data/maps/EverGrandeCity_DrakesRoom/border.bin | Bin 8 -> 0 bytes data/maps/EverGrandeCity_DrakesRoom/header.inc | 2 +- data/maps/EverGrandeCity_DrakesRoom/map.bin | 2 - data/maps/EverGrandeCity_GlaciasRoom/border.bin | Bin 8 -> 0 bytes data/maps/EverGrandeCity_GlaciasRoom/header.inc | 2 +- data/maps/EverGrandeCity_GlaciasRoom/map.bin | 2 - data/maps/EverGrandeCity_Hall1/border.bin | Bin 8 -> 0 bytes data/maps/EverGrandeCity_Hall1/header.inc | 2 +- data/maps/EverGrandeCity_Hall1/map.bin | 1 - data/maps/EverGrandeCity_Hall2/header.inc | 2 +- data/maps/EverGrandeCity_Hall3/header.inc | 2 +- data/maps/EverGrandeCity_Hall4/border.bin | Bin 8 -> 0 bytes data/maps/EverGrandeCity_Hall4/header.inc | 2 +- data/maps/EverGrandeCity_Hall4/map.bin | 1 - data/maps/EverGrandeCity_Hall5/header.inc | 2 +- data/maps/EverGrandeCity_HallOfFame/border.bin | Bin 8 -> 0 bytes data/maps/EverGrandeCity_HallOfFame/header.inc | 2 +- data/maps/EverGrandeCity_HallOfFame/map.bin | 1 - data/maps/EverGrandeCity_PhoebesRoom/border.bin | Bin 8 -> 0 bytes data/maps/EverGrandeCity_PhoebesRoom/header.inc | 2 +- data/maps/EverGrandeCity_PhoebesRoom/map.bin | 2 - .../EverGrandeCity_PokemonCenter_1F/header.inc | 2 +- .../EverGrandeCity_PokemonCenter_2F/header.inc | 2 +- .../EverGrandeCity_PokemonLeague_1F/border.bin | 1 - .../EverGrandeCity_PokemonLeague_1F/header.inc | 2 +- data/maps/EverGrandeCity_PokemonLeague_1F/map.bin | 2 - .../EverGrandeCity_PokemonLeague_2F/header.inc | 2 +- data/maps/EverGrandeCity_SidneysRoom/border.bin | Bin 8 -> 0 bytes data/maps/EverGrandeCity_SidneysRoom/header.inc | 2 +- data/maps/EverGrandeCity_SidneysRoom/map.bin | 2 - data/maps/FallarborTown/border.bin | 1 - data/maps/FallarborTown/header.inc | 2 +- data/maps/FallarborTown/map.bin | 1 - .../FallarborTown_BattleTentBattleRoom/border.bin | Bin 8 -> 0 bytes .../FallarborTown_BattleTentBattleRoom/header.inc | 2 +- .../FallarborTown_BattleTentBattleRoom/map.bin | Bin 180 -> 0 bytes .../FallarborTown_BattleTentCorridor/border.bin | Bin 8 -> 0 bytes .../FallarborTown_BattleTentCorridor/header.inc | 2 +- data/maps/FallarborTown_BattleTentCorridor/map.bin | 1 - data/maps/FallarborTown_BattleTentLobby/border.bin | Bin 8 -> 0 bytes data/maps/FallarborTown_BattleTentLobby/header.inc | 2 +- data/maps/FallarborTown_BattleTentLobby/map.bin | 2 - data/maps/FallarborTown_House1/header.inc | 2 +- data/maps/FallarborTown_House2/header.inc | 2 +- .../FallarborTown_LeftoverRSContestHall/border.bin | 1 - .../FallarborTown_LeftoverRSContestHall/map.bin | 1 - .../border.bin | 1 - .../FallarborTown_LeftoverRSContestLobby/map.bin | 1 - data/maps/FallarborTown_Mart/header.inc | 2 +- .../maps/FallarborTown_PokemonCenter_1F/header.inc | 2 +- .../maps/FallarborTown_PokemonCenter_2F/header.inc | 2 +- data/maps/FarawayIsland_Entrance/border.bin | 1 - data/maps/FarawayIsland_Entrance/header.inc | 2 +- data/maps/FarawayIsland_Entrance/map.bin | Bin 3128 -> 0 bytes data/maps/FarawayIsland_Interior/border.bin | Bin 8 -> 0 bytes data/maps/FarawayIsland_Interior/header.inc | 2 +- data/maps/FarawayIsland_Interior/map.bin | Bin 1508 -> 0 bytes data/maps/FieryPath/border.bin | 1 - data/maps/FieryPath/header.inc | 2 +- data/maps/FieryPath/map.bin | 10 - data/maps/FortreeCity/border.bin | Bin 8 -> 0 bytes data/maps/FortreeCity/header.inc | 2 +- data/maps/FortreeCity/map.bin | 1 - data/maps/FortreeCity_DecorationShop/border.bin | 1 - data/maps/FortreeCity_DecorationShop/header.inc | 2 +- data/maps/FortreeCity_DecorationShop/map.bin | 1 - data/maps/FortreeCity_Gym/border.bin | Bin 8 -> 0 bytes data/maps/FortreeCity_Gym/header.inc | 2 +- data/maps/FortreeCity_Gym/map.bin | Bin 1000 -> 0 bytes data/maps/FortreeCity_House1/border.bin | 1 - data/maps/FortreeCity_House1/header.inc | 2 +- data/maps/FortreeCity_House1/map.bin | 1 - data/maps/FortreeCity_House2/border.bin | 1 - data/maps/FortreeCity_House2/header.inc | 2 +- data/maps/FortreeCity_House2/map.bin | 1 - 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/border.bin | 1 - data/maps/GraniteCave_1F/header.inc | 2 +- data/maps/GraniteCave_1F/map.bin | 5 - data/maps/GraniteCave_B1F/border.bin | 1 - data/maps/GraniteCave_B1F/header.inc | 2 +- data/maps/GraniteCave_B1F/map.bin | 10 - data/maps/GraniteCave_B2F/border.bin | 1 - data/maps/GraniteCave_B2F/header.inc | 2 +- data/maps/GraniteCave_B2F/map.bin | 2 - data/maps/GraniteCave_StevensRoom/border.bin | 1 - data/maps/GraniteCave_StevensRoom/header.inc | 2 +- data/maps/GraniteCave_StevensRoom/map.bin | 4 - data/maps/InsideOfTruck/border.bin | 1 - data/maps/InsideOfTruck/header.inc | 2 +- data/maps/InsideOfTruck/map.bin | 2 - data/maps/IslandCave/border.bin | 1 - data/maps/IslandCave/header.inc | 2 +- data/maps/IslandCave/map.bin | Bin 1122 -> 0 bytes data/maps/JaggedPass/border.bin | 1 - data/maps/JaggedPass/header.inc | 2 +- data/maps/JaggedPass/map.bin | Bin 2760 -> 0 bytes data/maps/LavaridgeTown/border.bin | 1 - data/maps/LavaridgeTown/header.inc | 2 +- data/maps/LavaridgeTown/map.bin | 3 - data/maps/LavaridgeTown_Gym_1F/border.bin | Bin 8 -> 0 bytes data/maps/LavaridgeTown_Gym_1F/header.inc | 2 +- data/maps/LavaridgeTown_Gym_1F/map.bin | 3 - data/maps/LavaridgeTown_Gym_B1F/border.bin | Bin 8 -> 0 bytes data/maps/LavaridgeTown_Gym_B1F/header.inc | 2 +- data/maps/LavaridgeTown_Gym_B1F/map.bin | 6 - data/maps/LavaridgeTown_HerbShop/border.bin | Bin 8 -> 0 bytes data/maps/LavaridgeTown_HerbShop/header.inc | 2 +- data/maps/LavaridgeTown_HerbShop/map.bin | 1 - data/maps/LavaridgeTown_House/header.inc | 2 +- data/maps/LavaridgeTown_Mart/header.inc | 2 +- .../maps/LavaridgeTown_PokemonCenter_1F/border.bin | 1 - .../maps/LavaridgeTown_PokemonCenter_1F/header.inc | 2 +- data/maps/LavaridgeTown_PokemonCenter_1F/map.bin | 1 - .../maps/LavaridgeTown_PokemonCenter_2F/header.inc | 2 +- data/maps/LilycoveCity/border.bin | 1 - data/maps/LilycoveCity/header.inc | 2 +- data/maps/LilycoveCity/map.bin | Bin 6400 -> 0 bytes data/maps/LilycoveCity_ContestHall/border.bin | 1 - data/maps/LilycoveCity_ContestHall/header.inc | 2 +- data/maps/LilycoveCity_ContestHall/map.bin | 3 - data/maps/LilycoveCity_ContestLobby/border.bin | 1 - data/maps/LilycoveCity_ContestLobby/header.inc | 2 +- data/maps/LilycoveCity_ContestLobby/map.bin | 1 - data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin | 1 - data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc | 2 +- data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin | 1 - data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin | 1 - data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc | 2 +- data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin | 1 - .../border.bin | Bin 8 -> 0 bytes .../header.inc | 2 +- .../LilycoveCity_DepartmentStoreElevator/map.bin | 1 - .../LilycoveCity_DepartmentStoreRooftop/border.bin | 1 - .../LilycoveCity_DepartmentStoreRooftop/header.inc | 2 +- .../LilycoveCity_DepartmentStoreRooftop/map.bin | 1 - .../LilycoveCity_DepartmentStore_1F/border.bin | Bin 8 -> 0 bytes .../LilycoveCity_DepartmentStore_1F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_1F/map.bin | 1 - .../LilycoveCity_DepartmentStore_2F/border.bin | Bin 8 -> 0 bytes .../LilycoveCity_DepartmentStore_2F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_2F/map.bin | 1 - .../LilycoveCity_DepartmentStore_3F/border.bin | Bin 8 -> 0 bytes .../LilycoveCity_DepartmentStore_3F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_3F/map.bin | 1 - .../LilycoveCity_DepartmentStore_4F/border.bin | Bin 8 -> 0 bytes .../LilycoveCity_DepartmentStore_4F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_4F/map.bin | 1 - .../LilycoveCity_DepartmentStore_5F/border.bin | Bin 8 -> 0 bytes .../LilycoveCity_DepartmentStore_5F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_5F/map.bin | Bin 288 -> 0 bytes data/maps/LilycoveCity_Harbor/header.inc | 2 +- data/maps/LilycoveCity_House1/header.inc | 2 +- data/maps/LilycoveCity_House2/border.bin | 1 - data/maps/LilycoveCity_House2/header.inc | 2 +- data/maps/LilycoveCity_House2/map.bin | 1 - data/maps/LilycoveCity_House3/header.inc | 2 +- data/maps/LilycoveCity_House4/header.inc | 2 +- .../maps/LilycoveCity_LilycoveMuseum_1F/border.bin | 1 - .../maps/LilycoveCity_LilycoveMuseum_1F/header.inc | 2 +- data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin | 1 - .../maps/LilycoveCity_LilycoveMuseum_2F/border.bin | 1 - .../maps/LilycoveCity_LilycoveMuseum_2F/header.inc | 2 +- data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin | 1 - .../maps/LilycoveCity_MoveDeletersHouse/header.inc | 2 +- data/maps/LilycoveCity_PokemonCenter_1F/header.inc | 2 +- data/maps/LilycoveCity_PokemonCenter_2F/header.inc | 2 +- .../LilycoveCity_PokemonTrainerFanClub/border.bin | 1 - .../LilycoveCity_PokemonTrainerFanClub/header.inc | 2 +- .../LilycoveCity_PokemonTrainerFanClub/map.bin | 2 - data/maps/LilycoveCity_UnusedMart/header.inc | 2 +- data/maps/LinkContestRoom1/border.bin | 1 - data/maps/LinkContestRoom1/header.inc | 2 +- data/maps/LinkContestRoom1/map.bin | 1 - data/maps/LinkContestRoom2/border.bin | 1 - data/maps/LinkContestRoom2/header.inc | 2 +- data/maps/LinkContestRoom2/map.bin | 1 - data/maps/LinkContestRoom3/border.bin | 1 - data/maps/LinkContestRoom3/header.inc | 2 +- data/maps/LinkContestRoom3/map.bin | 1 - data/maps/LinkContestRoom4/border.bin | 1 - data/maps/LinkContestRoom4/header.inc | 2 +- data/maps/LinkContestRoom4/map.bin | 1 - data/maps/LinkContestRoom5/border.bin | 1 - data/maps/LinkContestRoom5/header.inc | 2 +- data/maps/LinkContestRoom5/map.bin | 1 - data/maps/LinkContestRoom6/border.bin | 1 - data/maps/LinkContestRoom6/header.inc | 2 +- data/maps/LinkContestRoom6/map.bin | 1 - data/maps/LittlerootTown/border.bin | 1 - data/maps/LittlerootTown/header.inc | 2 +- data/maps/LittlerootTown/map.bin | 3 - .../LittlerootTown_BrendansHouse_1F/border.bin | Bin 8 -> 0 bytes .../LittlerootTown_BrendansHouse_1F/header.inc | 2 +- data/maps/LittlerootTown_BrendansHouse_1F/map.bin | 1 - .../LittlerootTown_BrendansHouse_2F/border.bin | 1 - .../LittlerootTown_BrendansHouse_2F/header.inc | 2 +- data/maps/LittlerootTown_BrendansHouse_2F/map.bin | 1 - data/maps/LittlerootTown_MaysHouse_1F/border.bin | 1 - data/maps/LittlerootTown_MaysHouse_1F/header.inc | 2 +- data/maps/LittlerootTown_MaysHouse_1F/map.bin | 1 - data/maps/LittlerootTown_MaysHouse_2F/border.bin | 1 - data/maps/LittlerootTown_MaysHouse_2F/header.inc | 2 +- data/maps/LittlerootTown_MaysHouse_2F/map.bin | 2 - .../LittlerootTown_ProfessorBirchsLab/border.bin | 1 - .../LittlerootTown_ProfessorBirchsLab/header.inc | 2 +- .../maps/LittlerootTown_ProfessorBirchsLab/map.bin | 5 - data/maps/MagmaHideout_1F/border.bin | 1 - data/maps/MagmaHideout_1F/header.inc | 2 +- data/maps/MagmaHideout_1F/map.bin | Bin 2812 -> 0 bytes data/maps/MagmaHideout_2F_1R/border.bin | 1 - data/maps/MagmaHideout_2F_1R/header.inc | 2 +- data/maps/MagmaHideout_2F_1R/map.bin | 2 - data/maps/MagmaHideout_2F_2R/border.bin | 1 - data/maps/MagmaHideout_2F_2R/header.inc | 2 +- data/maps/MagmaHideout_2F_2R/map.bin | 5 - data/maps/MagmaHideout_2F_3R/border.bin | 1 - data/maps/MagmaHideout_2F_3R/header.inc | 2 +- data/maps/MagmaHideout_2F_3R/map.bin | 1 - data/maps/MagmaHideout_3F_1R/border.bin | 1 - data/maps/MagmaHideout_3F_1R/header.inc | 2 +- data/maps/MagmaHideout_3F_1R/map.bin | 1 - data/maps/MagmaHideout_3F_2R/border.bin | 1 - data/maps/MagmaHideout_3F_2R/header.inc | 2 +- data/maps/MagmaHideout_3F_2R/map.bin | 7 - data/maps/MagmaHideout_3F_3R/border.bin | 1 - data/maps/MagmaHideout_3F_3R/header.inc | 2 +- data/maps/MagmaHideout_3F_3R/map.bin | 1 - data/maps/MagmaHideout_4F/border.bin | 1 - data/maps/MagmaHideout_4F/header.inc | 2 +- data/maps/MagmaHideout_4F/map.bin | 1 - data/maps/MarineCave_End/border.bin | 1 - data/maps/MarineCave_End/header.inc | 2 +- data/maps/MarineCave_End/map.bin | 14 - data/maps/MarineCave_Entrance/border.bin | 1 - data/maps/MarineCave_Entrance/header.inc | 2 +- data/maps/MarineCave_Entrance/map.bin | 7 - data/maps/MauvilleCity/border.bin | 1 - data/maps/MauvilleCity/header.inc | 2 +- data/maps/MauvilleCity/map.bin | Bin 1600 -> 0 bytes data/maps/MauvilleCity_BikeShop/border.bin | 1 - data/maps/MauvilleCity_BikeShop/header.inc | 2 +- data/maps/MauvilleCity_BikeShop/map.bin | 2 - data/maps/MauvilleCity_GameCorner/border.bin | Bin 8 -> 0 bytes data/maps/MauvilleCity_GameCorner/header.inc | 2 +- data/maps/MauvilleCity_GameCorner/map.bin | 3 - data/maps/MauvilleCity_Gym/border.bin | Bin 8 -> 0 bytes data/maps/MauvilleCity_Gym/header.inc | 2 +- data/maps/MauvilleCity_Gym/map.bin | Bin 420 -> 0 bytes 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/border.bin | 1 - data/maps/MeteorFalls_1F_1R/header.inc | 2 +- data/maps/MeteorFalls_1F_1R/map.bin | 1 - data/maps/MeteorFalls_1F_2R/border.bin | 1 - data/maps/MeteorFalls_1F_2R/header.inc | 2 +- data/maps/MeteorFalls_1F_2R/map.bin | 2 - data/maps/MeteorFalls_B1F_1R/border.bin | 1 - data/maps/MeteorFalls_B1F_1R/header.inc | 2 +- data/maps/MeteorFalls_B1F_1R/map.bin | 6 - data/maps/MeteorFalls_B1F_2R/border.bin | 1 - data/maps/MeteorFalls_B1F_2R/header.inc | 2 +- data/maps/MeteorFalls_B1F_2R/map.bin | 1 - data/maps/MeteorFalls_StevensCave/border.bin | 1 - data/maps/MeteorFalls_StevensCave/header.inc | 2 +- data/maps/MeteorFalls_StevensCave/map.bin | 21 - data/maps/MirageTower_1F/border.bin | 1 - data/maps/MirageTower_1F/header.inc | 2 +- data/maps/MirageTower_1F/map.bin | 3 - data/maps/MirageTower_2F/border.bin | 1 - data/maps/MirageTower_2F/header.inc | 2 +- data/maps/MirageTower_2F/map.bin | 3 - data/maps/MirageTower_3F/border.bin | 1 - data/maps/MirageTower_3F/header.inc | 2 +- data/maps/MirageTower_3F/map.bin | 6 - data/maps/MirageTower_4F/border.bin | 1 - data/maps/MirageTower_4F/header.inc | 2 +- data/maps/MirageTower_4F/map.bin | 2 - data/maps/MossdeepCity/border.bin | 1 - data/maps/MossdeepCity/header.inc | 2 +- data/maps/MossdeepCity/map.bin | Bin 6400 -> 0 bytes data/maps/MossdeepCity_GameCorner_1F/border.bin | Bin 8 -> 0 bytes data/maps/MossdeepCity_GameCorner_1F/header.inc | 2 +- data/maps/MossdeepCity_GameCorner_1F/map.bin | 53 - data/maps/MossdeepCity_GameCorner_B1F/border.bin | Bin 8 -> 0 bytes data/maps/MossdeepCity_GameCorner_B1F/header.inc | 2 +- data/maps/MossdeepCity_GameCorner_B1F/map.bin | 2 - data/maps/MossdeepCity_Gym/border.bin | 1 - data/maps/MossdeepCity_Gym/header.inc | 2 +- data/maps/MossdeepCity_Gym/map.bin | 40 - 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/border.bin | 1 - data/maps/MossdeepCity_SpaceCenter_1F/header.inc | 2 +- data/maps/MossdeepCity_SpaceCenter_1F/map.bin | Bin 320 -> 0 bytes data/maps/MossdeepCity_SpaceCenter_2F/border.bin | 1 - data/maps/MossdeepCity_SpaceCenter_2F/header.inc | 2 +- data/maps/MossdeepCity_SpaceCenter_2F/map.bin | Bin 320 -> 0 bytes data/maps/MossdeepCity_StevensHouse/border.bin | Bin 8 -> 0 bytes data/maps/MossdeepCity_StevensHouse/header.inc | 2 +- data/maps/MossdeepCity_StevensHouse/map.bin | 1 - data/maps/MtChimney/border.bin | 1 - data/maps/MtChimney/header.inc | 2 +- data/maps/MtChimney/map.bin | 1 - data/maps/MtChimney_CableCarStation/header.inc | 2 +- data/maps/MtPyre_1F/border.bin | 1 - data/maps/MtPyre_1F/header.inc | 2 +- data/maps/MtPyre_1F/map.bin | 1 - data/maps/MtPyre_2F/border.bin | 1 - data/maps/MtPyre_2F/header.inc | 2 +- data/maps/MtPyre_2F/map.bin | 1 - data/maps/MtPyre_3F/border.bin | 1 - data/maps/MtPyre_3F/header.inc | 2 +- data/maps/MtPyre_3F/map.bin | 1 - data/maps/MtPyre_4F/border.bin | 1 - data/maps/MtPyre_4F/header.inc | 2 +- data/maps/MtPyre_4F/map.bin | 1 - data/maps/MtPyre_5F/border.bin | 1 - data/maps/MtPyre_5F/header.inc | 2 +- data/maps/MtPyre_5F/map.bin | 1 - data/maps/MtPyre_6F/border.bin | 1 - data/maps/MtPyre_6F/header.inc | 2 +- data/maps/MtPyre_6F/map.bin | 1 - data/maps/MtPyre_Exterior/border.bin | Bin 8 -> 0 bytes data/maps/MtPyre_Exterior/header.inc | 2 +- data/maps/MtPyre_Exterior/map.bin | Bin 3876 -> 0 bytes data/maps/MtPyre_Summit/border.bin | Bin 8 -> 0 bytes data/maps/MtPyre_Summit/header.inc | 2 +- data/maps/MtPyre_Summit/map.bin | Bin 3700 -> 0 bytes data/maps/NavelRock_B1F/border.bin | 1 - data/maps/NavelRock_B1F/header.inc | 2 +- data/maps/NavelRock_B1F/map.bin | 1 - data/maps/NavelRock_Bottom/border.bin | 1 - data/maps/NavelRock_Bottom/header.inc | 2 +- data/maps/NavelRock_Bottom/map.bin | 1 - 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/border.bin | 1 - data/maps/NavelRock_Entrance/header.inc | 2 +- data/maps/NavelRock_Entrance/map.bin | 1 - data/maps/NavelRock_Exterior/border.bin | 1 - data/maps/NavelRock_Exterior/header.inc | 2 +- data/maps/NavelRock_Exterior/map.bin | Bin 1008 -> 0 bytes data/maps/NavelRock_Fork/border.bin | 1 - data/maps/NavelRock_Fork/header.inc | 2 +- data/maps/NavelRock_Fork/map.bin | 1 - data/maps/NavelRock_Harbor/header.inc | 2 +- data/maps/NavelRock_Top/border.bin | 1 - data/maps/NavelRock_Top/header.inc | 2 +- data/maps/NavelRock_Top/map.bin | 1 - data/maps/NavelRock_Up1/border.bin | 1 - data/maps/NavelRock_Up1/header.inc | 2 +- data/maps/NavelRock_Up1/map.bin | 1 - data/maps/NavelRock_Up2/border.bin | 1 - data/maps/NavelRock_Up2/header.inc | 2 +- data/maps/NavelRock_Up2/map.bin | 1 - data/maps/NavelRock_Up3/header.inc | 2 +- data/maps/NavelRock_Up4/header.inc | 2 +- data/maps/NewMauville_Entrance/border.bin | Bin 8 -> 0 bytes data/maps/NewMauville_Entrance/header.inc | 2 +- data/maps/NewMauville_Entrance/map.bin | 1 - data/maps/NewMauville_Inside/border.bin | 1 - data/maps/NewMauville_Inside/header.inc | 2 +- data/maps/NewMauville_Inside/map.bin | 1 - data/maps/OldaleTown/border.bin | 1 - data/maps/OldaleTown/header.inc | 2 +- data/maps/OldaleTown/map.bin | 1 - data/maps/OldaleTown_House1/border.bin | Bin 8 -> 0 bytes data/maps/OldaleTown_House1/header.inc | 2 +- data/maps/OldaleTown_House1/map.bin | 1 - data/maps/OldaleTown_House2/border.bin | Bin 8 -> 0 bytes data/maps/OldaleTown_House2/header.inc | 2 +- data/maps/OldaleTown_House2/map.bin | 1 - data/maps/OldaleTown_Mart/border.bin | Bin 8 -> 0 bytes data/maps/OldaleTown_Mart/header.inc | 2 +- data/maps/OldaleTown_Mart/map.bin | 3 - data/maps/OldaleTown_PokemonCenter_1F/border.bin | 1 - data/maps/OldaleTown_PokemonCenter_1F/header.inc | 2 +- data/maps/OldaleTown_PokemonCenter_1F/map.bin | 1 - data/maps/OldaleTown_PokemonCenter_2F/border.bin | 1 - data/maps/OldaleTown_PokemonCenter_2F/header.inc | 2 +- data/maps/OldaleTown_PokemonCenter_2F/map.bin | 1 - data/maps/PacifidlogTown/border.bin | 1 - data/maps/PacifidlogTown/header.inc | 2 +- data/maps/PacifidlogTown/map.bin | 6 - data/maps/PacifidlogTown_House1/border.bin | 1 - data/maps/PacifidlogTown_House1/header.inc | 2 +- data/maps/PacifidlogTown_House1/map.bin | 1 - data/maps/PacifidlogTown_House2/border.bin | 1 - data/maps/PacifidlogTown_House2/header.inc | 2 +- data/maps/PacifidlogTown_House2/map.bin | 1 - data/maps/PacifidlogTown_House3/header.inc | 2 +- data/maps/PacifidlogTown_House4/header.inc | 2 +- data/maps/PacifidlogTown_House5/header.inc | 2 +- .../PacifidlogTown_PokemonCenter_1F/header.inc | 2 +- .../PacifidlogTown_PokemonCenter_2F/header.inc | 2 +- data/maps/PetalburgCity/border.bin | 1 - data/maps/PetalburgCity/header.inc | 2 +- data/maps/PetalburgCity/map.bin | 4 - data/maps/PetalburgCity_Gym/border.bin | 1 - data/maps/PetalburgCity_Gym/header.inc | 2 +- data/maps/PetalburgCity_Gym/map.bin | 10 - data/maps/PetalburgCity_House1/header.inc | 2 +- data/maps/PetalburgCity_House2/border.bin | 1 - data/maps/PetalburgCity_House2/header.inc | 2 +- data/maps/PetalburgCity_House2/map.bin | 1 - data/maps/PetalburgCity_Mart/header.inc | 2 +- .../maps/PetalburgCity_PokemonCenter_1F/header.inc | 2 +- .../maps/PetalburgCity_PokemonCenter_2F/header.inc | 2 +- data/maps/PetalburgCity_WallysHouse/header.inc | 2 +- data/maps/PetalburgWoods/border.bin | 1 - data/maps/PetalburgWoods/header.inc | 2 +- data/maps/PetalburgWoods/map.bin | 1 - data/maps/RecordCorner/border.bin | 1 - data/maps/RecordCorner/header.inc | 2 +- data/maps/RecordCorner/map.bin | 1 - data/maps/Route101/border.bin | 1 - data/maps/Route101/header.inc | 2 +- data/maps/Route101/map.bin | 1 - data/maps/Route102/border.bin | 1 - data/maps/Route102/header.inc | 2 +- data/maps/Route102/map.bin | 1 - data/maps/Route103/border.bin | 1 - data/maps/Route103/header.inc | 2 +- data/maps/Route103/map.bin | 1 - data/maps/Route104/border.bin | 1 - data/maps/Route104/header.inc | 2 +- data/maps/Route104/map.bin | Bin 6400 -> 0 bytes data/maps/Route104_MrBrineysHouse/border.bin | 1 - data/maps/Route104_MrBrineysHouse/header.inc | 2 +- data/maps/Route104_MrBrineysHouse/map.bin | 1 - .../maps/Route104_PrettyPetalFlowerShop/border.bin | Bin 8 -> 0 bytes .../maps/Route104_PrettyPetalFlowerShop/header.inc | 2 +- data/maps/Route104_PrettyPetalFlowerShop/map.bin | Bin 270 -> 0 bytes data/maps/Route104_Prototype/border.bin | 1 - data/maps/Route104_Prototype/header.inc | 2 +- data/maps/Route104_Prototype/map.bin | 1 - .../header.inc | 2 +- data/maps/Route105/border.bin | 1 - data/maps/Route105/header.inc | 2 +- data/maps/Route105/map.bin | Bin 6400 -> 0 bytes data/maps/Route106/border.bin | 1 - data/maps/Route106/header.inc | 2 +- data/maps/Route106/map.bin | Bin 3200 -> 0 bytes data/maps/Route107/border.bin | 1 - data/maps/Route107/header.inc | 2 +- data/maps/Route107/map.bin | Bin 2400 -> 0 bytes data/maps/Route108/border.bin | 1 - data/maps/Route108/header.inc | 2 +- data/maps/Route108/map.bin | 1 - data/maps/Route109/border.bin | 1 - data/maps/Route109/header.inc | 2 +- data/maps/Route109/map.bin | Bin 5040 -> 0 bytes data/maps/Route109_SeashoreHouse/border.bin | Bin 8 -> 0 bytes data/maps/Route109_SeashoreHouse/header.inc | 2 +- data/maps/Route109_SeashoreHouse/map.bin | 3 - data/maps/Route110/border.bin | 1 - data/maps/Route110/header.inc | 2 +- data/maps/Route110/map.bin | Bin 8000 -> 0 bytes .../border.bin | Bin 8 -> 0 bytes .../header.inc | 2 +- .../Route110_SeasideCyclingRoadEntrance1/map.bin | 1 - .../header.inc | 2 +- data/maps/Route110_TrickHouseCorridor/border.bin | 1 - data/maps/Route110_TrickHouseCorridor/header.inc | 2 +- data/maps/Route110_TrickHouseCorridor/map.bin | 1 - data/maps/Route110_TrickHouseEnd/border.bin | 1 - data/maps/Route110_TrickHouseEnd/header.inc | 2 +- data/maps/Route110_TrickHouseEnd/map.bin | 1 - data/maps/Route110_TrickHouseEntrance/border.bin | 1 - data/maps/Route110_TrickHouseEntrance/header.inc | 2 +- data/maps/Route110_TrickHouseEntrance/map.bin | 1 - data/maps/Route110_TrickHousePuzzle1/border.bin | Bin 8 -> 0 bytes data/maps/Route110_TrickHousePuzzle1/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle1/map.bin | 2 - data/maps/Route110_TrickHousePuzzle2/border.bin | Bin 8 -> 0 bytes data/maps/Route110_TrickHousePuzzle2/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle2/map.bin | 2 - data/maps/Route110_TrickHousePuzzle3/border.bin | Bin 8 -> 0 bytes data/maps/Route110_TrickHousePuzzle3/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle3/map.bin | 2 - data/maps/Route110_TrickHousePuzzle4/border.bin | Bin 8 -> 0 bytes data/maps/Route110_TrickHousePuzzle4/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle4/map.bin | 2 - data/maps/Route110_TrickHousePuzzle5/border.bin | Bin 8 -> 0 bytes data/maps/Route110_TrickHousePuzzle5/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle5/map.bin | 2 - data/maps/Route110_TrickHousePuzzle6/border.bin | Bin 8 -> 0 bytes data/maps/Route110_TrickHousePuzzle6/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle6/map.bin | 2 - data/maps/Route110_TrickHousePuzzle7/border.bin | Bin 8 -> 0 bytes data/maps/Route110_TrickHousePuzzle7/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle7/map.bin | 2 - data/maps/Route110_TrickHousePuzzle8/border.bin | Bin 8 -> 0 bytes data/maps/Route110_TrickHousePuzzle8/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle8/map.bin | 2 - data/maps/Route111/border.bin | Bin 8 -> 0 bytes data/maps/Route111/header.inc | 2 +- data/maps/Route111/map.bin | Bin 11200 -> 0 bytes data/maps/Route111_OldLadysRestStop/header.inc | 2 +- .../maps/Route111_WinstrateFamilysHouse/header.inc | 2 +- data/maps/Route112/border.bin | 1 - data/maps/Route112/header.inc | 2 +- data/maps/Route112/map.bin | Bin 4800 -> 0 bytes data/maps/Route112_CableCarStation/border.bin | 1 - data/maps/Route112_CableCarStation/header.inc | 2 +- data/maps/Route112_CableCarStation/map.bin | Bin 312 -> 0 bytes data/maps/Route113/border.bin | 1 - data/maps/Route113/header.inc | 2 +- data/maps/Route113/map.bin | Bin 4000 -> 0 bytes data/maps/Route113_GlassWorkshop/header.inc | 2 +- data/maps/Route114/border.bin | 1 - data/maps/Route114/header.inc | 2 +- data/maps/Route114/map.bin | Bin 6400 -> 0 bytes data/maps/Route114_FossilManiacsHouse/border.bin | 1 - data/maps/Route114_FossilManiacsHouse/header.inc | 2 +- data/maps/Route114_FossilManiacsHouse/map.bin | 1 - data/maps/Route114_FossilManiacsTunnel/border.bin | 1 - data/maps/Route114_FossilManiacsTunnel/header.inc | 2 +- data/maps/Route114_FossilManiacsTunnel/map.bin | 1 - data/maps/Route114_LanettesHouse/border.bin | 1 - data/maps/Route114_LanettesHouse/header.inc | 2 +- data/maps/Route114_LanettesHouse/map.bin | 2 - data/maps/Route115/border.bin | 1 - data/maps/Route115/header.inc | 2 +- data/maps/Route115/map.bin | Bin 6400 -> 0 bytes data/maps/Route116/border.bin | 1 - data/maps/Route116/header.inc | 2 +- data/maps/Route116/map.bin | Bin 4000 -> 0 bytes data/maps/Route116_TunnelersRestHouse/border.bin | 1 - data/maps/Route116_TunnelersRestHouse/header.inc | 2 +- data/maps/Route116_TunnelersRestHouse/map.bin | 1 - data/maps/Route117/border.bin | Bin 8 -> 0 bytes data/maps/Route117/header.inc | 2 +- data/maps/Route117/map.bin | 10 - data/maps/Route117_PokemonDayCare/border.bin | 1 - data/maps/Route117_PokemonDayCare/header.inc | 2 +- data/maps/Route117_PokemonDayCare/map.bin | 2 - data/maps/Route118/border.bin | 1 - data/maps/Route118/header.inc | 2 +- data/maps/Route118/map.bin | Bin 3200 -> 0 bytes data/maps/Route119/border.bin | Bin 8 -> 0 bytes data/maps/Route119/header.inc | 2 +- data/maps/Route119/map.bin | Bin 11200 -> 0 bytes data/maps/Route119_House/header.inc | 2 +- data/maps/Route119_WeatherInstitute_1F/border.bin | 1 - data/maps/Route119_WeatherInstitute_1F/header.inc | 2 +- data/maps/Route119_WeatherInstitute_1F/map.bin | 1 - data/maps/Route119_WeatherInstitute_2F/border.bin | 1 - data/maps/Route119_WeatherInstitute_2F/header.inc | 2 +- data/maps/Route119_WeatherInstitute_2F/map.bin | 1 - data/maps/Route120/border.bin | Bin 8 -> 0 bytes data/maps/Route120/header.inc | 2 +- data/maps/Route120/map.bin | Bin 8000 -> 0 bytes data/maps/Route121/border.bin | 1 - data/maps/Route121/header.inc | 2 +- data/maps/Route121/map.bin | 1 - data/maps/Route121_SafariZoneEntrance/border.bin | Bin 8 -> 0 bytes data/maps/Route121_SafariZoneEntrance/header.inc | 2 +- data/maps/Route121_SafariZoneEntrance/map.bin | 1 - data/maps/Route122/border.bin | 1 - data/maps/Route122/header.inc | 2 +- data/maps/Route122/map.bin | Bin 3200 -> 0 bytes data/maps/Route123/border.bin | Bin 8 -> 0 bytes data/maps/Route123/header.inc | 2 +- data/maps/Route123/map.bin | 2 - data/maps/Route123_BerryMastersHouse/header.inc | 2 +- data/maps/Route124/border.bin | 1 - data/maps/Route124/header.inc | 2 +- data/maps/Route124/map.bin | Bin 12800 -> 0 bytes .../Route124_DivingTreasureHuntersHouse/border.bin | Bin 8 -> 0 bytes .../Route124_DivingTreasureHuntersHouse/header.inc | 2 +- .../Route124_DivingTreasureHuntersHouse/map.bin | 1 - data/maps/Route125/border.bin | 1 - data/maps/Route125/header.inc | 2 +- data/maps/Route125/map.bin | Bin 6400 -> 0 bytes data/maps/Route126/border.bin | 1 - data/maps/Route126/header.inc | 2 +- data/maps/Route126/map.bin | Bin 12800 -> 0 bytes data/maps/Route127/border.bin | 1 - data/maps/Route127/header.inc | 2 +- data/maps/Route127/map.bin | Bin 12800 -> 0 bytes data/maps/Route128/border.bin | 1 - data/maps/Route128/header.inc | 2 +- data/maps/Route128/map.bin | Bin 9600 -> 0 bytes data/maps/Route129/border.bin | 1 - data/maps/Route129/header.inc | 2 +- data/maps/Route129/map.bin | Bin 6400 -> 0 bytes data/maps/Route130/border.bin | 1 - data/maps/Route130/header.inc | 2 +- data/maps/Route130/map.bin | 1 - data/maps/Route131/border.bin | 1 - data/maps/Route131/header.inc | 2 +- data/maps/Route131/map.bin | 1 - data/maps/Route132/border.bin | 1 - data/maps/Route132/header.inc | 2 +- data/maps/Route132/map.bin | Bin 6400 -> 0 bytes data/maps/Route133/border.bin | 1 - data/maps/Route133/header.inc | 2 +- data/maps/Route133/map.bin | 1 - data/maps/Route134/border.bin | 1 - data/maps/Route134/header.inc | 2 +- data/maps/Route134/map.bin | Bin 6400 -> 0 bytes data/maps/RustboroCity/border.bin | 1 - data/maps/RustboroCity/header.inc | 2 +- data/maps/RustboroCity/map.bin | Bin 4800 -> 0 bytes data/maps/RustboroCity_CuttersHouse/border.bin | 1 - data/maps/RustboroCity_CuttersHouse/header.inc | 2 +- data/maps/RustboroCity_CuttersHouse/map.bin | 1 - data/maps/RustboroCity_DevonCorp_1F/border.bin | 1 - data/maps/RustboroCity_DevonCorp_1F/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_1F/map.bin | 1 - data/maps/RustboroCity_DevonCorp_2F/border.bin | 1 - data/maps/RustboroCity_DevonCorp_2F/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_2F/map.bin | 1 - data/maps/RustboroCity_DevonCorp_3F/border.bin | 1 - data/maps/RustboroCity_DevonCorp_3F/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_3F/map.bin | 1 - data/maps/RustboroCity_Flat1_1F/border.bin | 1 - data/maps/RustboroCity_Flat1_1F/header.inc | 2 +- data/maps/RustboroCity_Flat1_1F/map.bin | 1 - data/maps/RustboroCity_Flat1_2F/border.bin | 1 - data/maps/RustboroCity_Flat1_2F/header.inc | 2 +- data/maps/RustboroCity_Flat1_2F/map.bin | 1 - data/maps/RustboroCity_Flat2_1F/border.bin | 1 - data/maps/RustboroCity_Flat2_1F/header.inc | 2 +- data/maps/RustboroCity_Flat2_1F/map.bin | Bin 252 -> 0 bytes data/maps/RustboroCity_Flat2_2F/border.bin | 1 - data/maps/RustboroCity_Flat2_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_2F/map.bin | Bin 252 -> 0 bytes data/maps/RustboroCity_Flat2_3F/border.bin | 1 - data/maps/RustboroCity_Flat2_3F/header.inc | 2 +- data/maps/RustboroCity_Flat2_3F/map.bin | Bin 252 -> 0 bytes data/maps/RustboroCity_Gym/border.bin | Bin 8 -> 0 bytes data/maps/RustboroCity_Gym/header.inc | 2 +- data/maps/RustboroCity_Gym/map.bin | 2 - data/maps/RustboroCity_House1/border.bin | 1 - data/maps/RustboroCity_House1/header.inc | 2 +- data/maps/RustboroCity_House1/map.bin | 1 - data/maps/RustboroCity_House2/border.bin | 1 - data/maps/RustboroCity_House2/header.inc | 2 +- data/maps/RustboroCity_House2/map.bin | 1 - 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/border.bin | 1 - data/maps/RustboroCity_PokemonSchool/header.inc | 2 +- data/maps/RustboroCity_PokemonSchool/map.bin | Bin 264 -> 0 bytes data/maps/RusturfTunnel/border.bin | 1 - data/maps/RusturfTunnel/header.inc | 2 +- data/maps/RusturfTunnel/map.bin | 2 - data/maps/SSTidalCorridor/border.bin | 1 - data/maps/SSTidalCorridor/header.inc | 2 +- data/maps/SSTidalCorridor/map.bin | 1 - data/maps/SSTidalLowerDeck/border.bin | 1 - data/maps/SSTidalLowerDeck/header.inc | 2 +- data/maps/SSTidalLowerDeck/map.bin | 1 - data/maps/SSTidalRooms/border.bin | 1 - data/maps/SSTidalRooms/header.inc | 2 +- data/maps/SSTidalRooms/map.bin | 1 - data/maps/SafariZone_North/border.bin | 1 - data/maps/SafariZone_North/header.inc | 2 +- data/maps/SafariZone_North/map.bin | Bin 3200 -> 0 bytes data/maps/SafariZone_Northeast/border.bin | 1 - data/maps/SafariZone_Northeast/header.inc | 2 +- data/maps/SafariZone_Northeast/map.bin | Bin 3200 -> 0 bytes data/maps/SafariZone_Northwest/border.bin | 1 - data/maps/SafariZone_Northwest/header.inc | 2 +- data/maps/SafariZone_Northwest/map.bin | Bin 3200 -> 0 bytes data/maps/SafariZone_RestHouse/border.bin | Bin 8 -> 0 bytes data/maps/SafariZone_RestHouse/header.inc | 2 +- data/maps/SafariZone_RestHouse/map.bin | 1 - data/maps/SafariZone_South/border.bin | 1 - data/maps/SafariZone_South/header.inc | 2 +- data/maps/SafariZone_South/map.bin | Bin 3200 -> 0 bytes data/maps/SafariZone_Southeast/border.bin | 1 - data/maps/SafariZone_Southeast/header.inc | 2 +- data/maps/SafariZone_Southeast/map.bin | Bin 3200 -> 0 bytes data/maps/SafariZone_Southwest/border.bin | 1 - data/maps/SafariZone_Southwest/header.inc | 2 +- data/maps/SafariZone_Southwest/map.bin | Bin 3200 -> 0 bytes data/maps/ScorchedSlab/border.bin | 1 - data/maps/ScorchedSlab/header.inc | 2 +- data/maps/ScorchedSlab/map.bin | 1 - data/maps/SeafloorCavern_Entrance/border.bin | 1 - data/maps/SeafloorCavern_Entrance/header.inc | 2 +- data/maps/SeafloorCavern_Entrance/map.bin | 11 - data/maps/SeafloorCavern_Room1/border.bin | 1 - data/maps/SeafloorCavern_Room1/header.inc | 2 +- data/maps/SeafloorCavern_Room1/map.bin | 1 - data/maps/SeafloorCavern_Room2/border.bin | 1 - data/maps/SeafloorCavern_Room2/header.inc | 2 +- data/maps/SeafloorCavern_Room2/map.bin | 7 - data/maps/SeafloorCavern_Room3/border.bin | 1 - data/maps/SeafloorCavern_Room3/header.inc | 2 +- data/maps/SeafloorCavern_Room3/map.bin | 1 - data/maps/SeafloorCavern_Room4/border.bin | 1 - data/maps/SeafloorCavern_Room4/header.inc | 2 +- data/maps/SeafloorCavern_Room4/map.bin | 1 - data/maps/SeafloorCavern_Room5/border.bin | 1 - data/maps/SeafloorCavern_Room5/header.inc | 2 +- data/maps/SeafloorCavern_Room5/map.bin | 1 - data/maps/SeafloorCavern_Room6/border.bin | 1 - data/maps/SeafloorCavern_Room6/header.inc | 2 +- data/maps/SeafloorCavern_Room6/map.bin | 1 - data/maps/SeafloorCavern_Room7/border.bin | 1 - data/maps/SeafloorCavern_Room7/header.inc | 2 +- data/maps/SeafloorCavern_Room7/map.bin | 1 - data/maps/SeafloorCavern_Room8/border.bin | 1 - data/maps/SeafloorCavern_Room8/header.inc | 2 +- data/maps/SeafloorCavern_Room8/map.bin | 1 - data/maps/SeafloorCavern_Room9/border.bin | 1 - data/maps/SeafloorCavern_Room9/header.inc | 2 +- data/maps/SeafloorCavern_Room9/map.bin | 1 - data/maps/SealedChamber_InnerRoom/border.bin | Bin 8 -> 0 bytes data/maps/SealedChamber_InnerRoom/header.inc | 2 +- data/maps/SealedChamber_InnerRoom/map.bin | 1 - data/maps/SealedChamber_OuterRoom/border.bin | Bin 8 -> 0 bytes data/maps/SealedChamber_OuterRoom/header.inc | 2 +- data/maps/SealedChamber_OuterRoom/map.bin | 11 - data/maps/SecretBase_BlueCave1/border.bin | 1 - data/maps/SecretBase_BlueCave1/header.inc | 2 +- data/maps/SecretBase_BlueCave1/map.bin | 50 - data/maps/SecretBase_BlueCave2/border.bin | 1 - data/maps/SecretBase_BlueCave2/header.inc | 2 +- data/maps/SecretBase_BlueCave2/map.bin | 57 - data/maps/SecretBase_BlueCave3/border.bin | 1 - data/maps/SecretBase_BlueCave3/header.inc | 2 +- data/maps/SecretBase_BlueCave3/map.bin | 51 - data/maps/SecretBase_BlueCave4/border.bin | 1 - data/maps/SecretBase_BlueCave4/header.inc | 2 +- data/maps/SecretBase_BlueCave4/map.bin | 57 - data/maps/SecretBase_BrownCave1/border.bin | 1 - data/maps/SecretBase_BrownCave1/header.inc | 2 +- data/maps/SecretBase_BrownCave1/map.bin | 54 - data/maps/SecretBase_BrownCave2/border.bin | 1 - data/maps/SecretBase_BrownCave2/header.inc | 2 +- data/maps/SecretBase_BrownCave2/map.bin | 56 - data/maps/SecretBase_BrownCave3/border.bin | 1 - data/maps/SecretBase_BrownCave3/header.inc | 2 +- data/maps/SecretBase_BrownCave3/map.bin | 69 - data/maps/SecretBase_BrownCave4/border.bin | 1 - data/maps/SecretBase_BrownCave4/header.inc | 2 +- data/maps/SecretBase_BrownCave4/map.bin | 70 - data/maps/SecretBase_RedCave1/border.bin | 1 - data/maps/SecretBase_RedCave1/header.inc | 2 +- data/maps/SecretBase_RedCave1/map.bin | 51 - data/maps/SecretBase_RedCave2/border.bin | 1 - data/maps/SecretBase_RedCave2/header.inc | 2 +- data/maps/SecretBase_RedCave2/map.bin | 42 - data/maps/SecretBase_RedCave3/border.bin | 1 - data/maps/SecretBase_RedCave3/header.inc | 2 +- data/maps/SecretBase_RedCave3/map.bin | 47 - data/maps/SecretBase_RedCave4/border.bin | 1 - data/maps/SecretBase_RedCave4/header.inc | 2 +- data/maps/SecretBase_RedCave4/map.bin | 56 - data/maps/SecretBase_Shrub1/border.bin | 1 - data/maps/SecretBase_Shrub1/header.inc | 2 +- data/maps/SecretBase_Shrub1/map.bin | 53 - data/maps/SecretBase_Shrub2/border.bin | 1 - data/maps/SecretBase_Shrub2/header.inc | 2 +- data/maps/SecretBase_Shrub2/map.bin | 57 - data/maps/SecretBase_Shrub3/border.bin | 1 - data/maps/SecretBase_Shrub3/header.inc | 2 +- data/maps/SecretBase_Shrub3/map.bin | 65 - data/maps/SecretBase_Shrub4/border.bin | 1 - data/maps/SecretBase_Shrub4/header.inc | 2 +- data/maps/SecretBase_Shrub4/map.bin | 69 - data/maps/SecretBase_Tree1/border.bin | 1 - data/maps/SecretBase_Tree1/header.inc | 2 +- data/maps/SecretBase_Tree1/map.bin | 56 - data/maps/SecretBase_Tree2/border.bin | 1 - data/maps/SecretBase_Tree2/header.inc | 2 +- data/maps/SecretBase_Tree2/map.bin | 48 - data/maps/SecretBase_Tree3/border.bin | 1 - data/maps/SecretBase_Tree3/header.inc | 2 +- data/maps/SecretBase_Tree3/map.bin | 63 - data/maps/SecretBase_Tree4/border.bin | 1 - data/maps/SecretBase_Tree4/header.inc | 2 +- data/maps/SecretBase_Tree4/map.bin | 77 - data/maps/SecretBase_YellowCave1/border.bin | 1 - data/maps/SecretBase_YellowCave1/header.inc | 2 +- data/maps/SecretBase_YellowCave1/map.bin | 57 - data/maps/SecretBase_YellowCave2/border.bin | 1 - data/maps/SecretBase_YellowCave2/header.inc | 2 +- data/maps/SecretBase_YellowCave2/map.bin | 56 - data/maps/SecretBase_YellowCave3/border.bin | 1 - data/maps/SecretBase_YellowCave3/header.inc | 2 +- data/maps/SecretBase_YellowCave3/map.bin | 63 - data/maps/SecretBase_YellowCave4/border.bin | 1 - data/maps/SecretBase_YellowCave4/header.inc | 2 +- data/maps/SecretBase_YellowCave4/map.bin | 80 - .../maps/ShoalCave_HighTideEntranceRoom/border.bin | 1 - .../maps/ShoalCave_HighTideEntranceRoom/header.inc | 2 +- data/maps/ShoalCave_HighTideEntranceRoom/map.bin | 1 - data/maps/ShoalCave_HighTideInnerRoom/border.bin | 1 - data/maps/ShoalCave_HighTideInnerRoom/header.inc | 2 +- data/maps/ShoalCave_HighTideInnerRoom/map.bin | 1 - data/maps/ShoalCave_LowTideEntranceRoom/border.bin | 1 - data/maps/ShoalCave_LowTideEntranceRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideEntranceRoom/map.bin | 3 - data/maps/ShoalCave_LowTideIceRoom/border.bin | 1 - data/maps/ShoalCave_LowTideIceRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideIceRoom/map.bin | 1 - data/maps/ShoalCave_LowTideInnerRoom/border.bin | 1 - data/maps/ShoalCave_LowTideInnerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideInnerRoom/map.bin | 2 - data/maps/ShoalCave_LowTideLowerRoom/border.bin | 1 - data/maps/ShoalCave_LowTideLowerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideLowerRoom/map.bin | 4 - data/maps/ShoalCave_LowTideStairsRoom/border.bin | 1 - data/maps/ShoalCave_LowTideStairsRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideStairsRoom/map.bin | 1 - data/maps/SingleBattleColosseum/border.bin | 1 - data/maps/SingleBattleColosseum/header.inc | 2 +- data/maps/SingleBattleColosseum/map.bin | 1 - data/maps/SkyPillar_1F/border.bin | 1 - data/maps/SkyPillar_1F/header.inc | 2 +- data/maps/SkyPillar_1F/map.bin | 1 - data/maps/SkyPillar_2F/border.bin | 1 - data/maps/SkyPillar_2F/header.inc | 2 +- data/maps/SkyPillar_2F/map.bin | 1 - data/maps/SkyPillar_3F/border.bin | 1 - data/maps/SkyPillar_3F/header.inc | 2 +- data/maps/SkyPillar_3F/map.bin | 1 - data/maps/SkyPillar_4F/border.bin | 1 - data/maps/SkyPillar_4F/header.inc | 2 +- data/maps/SkyPillar_4F/map.bin | 1 - data/maps/SkyPillar_5F/border.bin | 1 - data/maps/SkyPillar_5F/header.inc | 2 +- data/maps/SkyPillar_5F/map.bin | 1 - data/maps/SkyPillar_Entrance/border.bin | 1 - data/maps/SkyPillar_Entrance/header.inc | 2 +- data/maps/SkyPillar_Entrance/map.bin | 1 - data/maps/SkyPillar_Outside/border.bin | 1 - data/maps/SkyPillar_Outside/header.inc | 2 +- data/maps/SkyPillar_Outside/map.bin | 1 - data/maps/SkyPillar_Top/border.bin | 1 - data/maps/SkyPillar_Top/header.inc | 2 +- data/maps/SkyPillar_Top/map.bin | 1 - data/maps/SlateportCity/border.bin | 1 - data/maps/SlateportCity/header.inc | 2 +- data/maps/SlateportCity/map.bin | Bin 4800 -> 0 bytes .../SlateportCity_BattleTentBattleRoom/header.inc | 2 +- .../SlateportCity_BattleTentCorridor/header.inc | 2 +- data/maps/SlateportCity_BattleTentLobby/header.inc | 2 +- data/maps/SlateportCity_Harbor/border.bin | 1 - data/maps/SlateportCity_Harbor/header.inc | 2 +- data/maps/SlateportCity_Harbor/map.bin | 1 - data/maps/SlateportCity_House1/header.inc | 2 +- data/maps/SlateportCity_House2/header.inc | 2 +- data/maps/SlateportCity_Mart/header.inc | 2 +- .../maps/SlateportCity_OceanicMuseum_1F/border.bin | Bin 8 -> 0 bytes .../maps/SlateportCity_OceanicMuseum_1F/header.inc | 2 +- data/maps/SlateportCity_OceanicMuseum_1F/map.bin | 2 - .../maps/SlateportCity_OceanicMuseum_2F/border.bin | Bin 8 -> 0 bytes .../maps/SlateportCity_OceanicMuseum_2F/header.inc | 2 +- data/maps/SlateportCity_OceanicMuseum_2F/map.bin | 1 - .../maps/SlateportCity_PokemonCenter_1F/header.inc | 2 +- .../maps/SlateportCity_PokemonCenter_2F/header.inc | 2 +- data/maps/SlateportCity_PokemonFanClub/border.bin | Bin 8 -> 0 bytes data/maps/SlateportCity_PokemonFanClub/header.inc | 2 +- data/maps/SlateportCity_PokemonFanClub/map.bin | Bin 308 -> 0 bytes .../SlateportCity_SternsShipyard_1F/border.bin | 1 - .../SlateportCity_SternsShipyard_1F/header.inc | 2 +- data/maps/SlateportCity_SternsShipyard_1F/map.bin | 7 - .../SlateportCity_SternsShipyard_2F/border.bin | 1 - .../SlateportCity_SternsShipyard_2F/header.inc | 2 +- data/maps/SlateportCity_SternsShipyard_2F/map.bin | 1 - data/maps/SootopolisCity/border.bin | 1 - data/maps/SootopolisCity/header.inc | 2 +- data/maps/SootopolisCity/map.bin | 12 - data/maps/SootopolisCity_Gym_1F/border.bin | Bin 8 -> 0 bytes data/maps/SootopolisCity_Gym_1F/header.inc | 2 +- data/maps/SootopolisCity_Gym_1F/map.bin | Bin 884 -> 0 bytes data/maps/SootopolisCity_Gym_B1F/border.bin | Bin 8 -> 0 bytes data/maps/SootopolisCity_Gym_B1F/header.inc | 2 +- data/maps/SootopolisCity_Gym_B1F/map.bin | 1 - data/maps/SootopolisCity_House1/border.bin | 1 - data/maps/SootopolisCity_House1/header.inc | 2 +- data/maps/SootopolisCity_House1/map.bin | 1 - data/maps/SootopolisCity_House2/border.bin | 1 - data/maps/SootopolisCity_House2/header.inc | 2 +- data/maps/SootopolisCity_House2/map.bin | 1 - data/maps/SootopolisCity_House3/border.bin | 1 - data/maps/SootopolisCity_House3/header.inc | 2 +- data/maps/SootopolisCity_House3/map.bin | 1 - 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 +- .../SootopolisCity_LotadAndSeedotHouse/border.bin | Bin 8 -> 0 bytes .../SootopolisCity_LotadAndSeedotHouse/header.inc | 2 +- .../SootopolisCity_LotadAndSeedotHouse/map.bin | 1 - data/maps/SootopolisCity_Mart/header.inc | 2 +- .../border.bin | Bin 8 -> 0 bytes .../header.inc | 2 +- .../SootopolisCity_MysteryEventsHouse_1F/map.bin | 1 - .../border.bin | Bin 8 -> 0 bytes .../header.inc | 2 +- .../SootopolisCity_MysteryEventsHouse_B1F/map.bin | 2 - .../SootopolisCity_PokemonCenter_1F/header.inc | 2 +- .../SootopolisCity_PokemonCenter_2F/header.inc | 2 +- data/maps/SouthernIsland_Exterior/border.bin | 1 - data/maps/SouthernIsland_Exterior/header.inc | 2 +- data/maps/SouthernIsland_Exterior/map.bin | 1 - data/maps/SouthernIsland_Interior/border.bin | 1 - data/maps/SouthernIsland_Interior/header.inc | 2 +- data/maps/SouthernIsland_Interior/map.bin | 1 - data/maps/TerraCave_End/border.bin | 1 - data/maps/TerraCave_End/header.inc | 2 +- data/maps/TerraCave_End/map.bin | 9 - data/maps/TerraCave_Entrance/border.bin | 1 - data/maps/TerraCave_Entrance/header.inc | 2 +- data/maps/TerraCave_Entrance/map.bin | 33 - data/maps/TradeCenter/border.bin | 1 - data/maps/TradeCenter/header.inc | 2 +- data/maps/TradeCenter/map.bin | 2 - data/maps/TrainerHill_1F/border.bin | 1 - data/maps/TrainerHill_1F/header.inc | 2 +- data/maps/TrainerHill_1F/map.bin | 2 - data/maps/TrainerHill_2F/border.bin | 1 - data/maps/TrainerHill_2F/header.inc | 2 +- data/maps/TrainerHill_2F/map.bin | 2 - data/maps/TrainerHill_3F/border.bin | 1 - data/maps/TrainerHill_3F/header.inc | 2 +- data/maps/TrainerHill_3F/map.bin | 2 - data/maps/TrainerHill_4F/border.bin | 1 - data/maps/TrainerHill_4F/header.inc | 2 +- data/maps/TrainerHill_4F/map.bin | 2 - data/maps/TrainerHill_Elevator/header.inc | 2 +- data/maps/TrainerHill_Entrance/border.bin | 1 - data/maps/TrainerHill_Entrance/header.inc | 2 +- data/maps/TrainerHill_Entrance/map.bin | 2 - data/maps/TrainerHill_Roof/border.bin | 1 - data/maps/TrainerHill_Roof/header.inc | 2 +- data/maps/TrainerHill_Roof/map.bin | 1 - data/maps/Underwater1/border.bin | 1 - data/maps/Underwater1/header.inc | 2 +- data/maps/Underwater1/map.bin | 17 - data/maps/Underwater2/border.bin | 1 - data/maps/Underwater2/header.inc | 2 +- data/maps/Underwater2/map.bin | 35 - data/maps/Underwater3/border.bin | 1 - data/maps/Underwater3/header.inc | 2 +- data/maps/Underwater3/map.bin | 1 - data/maps/Underwater4/border.bin | 1 - data/maps/Underwater4/header.inc | 2 +- data/maps/Underwater4/map.bin | 1 - data/maps/Underwater5/border.bin | 1 - data/maps/Underwater5/header.inc | 2 +- data/maps/Underwater5/map.bin | 1 - data/maps/Underwater6/border.bin | 1 - data/maps/Underwater6/header.inc | 2 +- data/maps/Underwater6/map.bin | 1 - data/maps/Underwater7/border.bin | 1 - data/maps/Underwater7/header.inc | 2 +- data/maps/Underwater7/map.bin | 1 - data/maps/Underwater_MarineCave/border.bin | 1 - data/maps/Underwater_MarineCave/header.inc | 2 +- data/maps/Underwater_MarineCave/map.bin | 1 - data/maps/Underwater_Route134/border.bin | 1 - data/maps/Underwater_Route134/header.inc | 2 +- data/maps/Underwater_Route134/map.bin | 2 - data/maps/Underwater_SeafloorCavern/border.bin | 1 - data/maps/Underwater_SeafloorCavern/header.inc | 2 +- data/maps/Underwater_SeafloorCavern/map.bin | 2 - data/maps/Underwater_SealedChamber/border.bin | 1 - data/maps/Underwater_SealedChamber/header.inc | 2 +- data/maps/Underwater_SealedChamber/map.bin | 1 - data/maps/Underwater_SootopolisCity/border.bin | 1 - data/maps/Underwater_SootopolisCity/header.inc | 2 +- data/maps/Underwater_SootopolisCity/map.bin | 2 - data/maps/UnionRoom/border.bin | Bin 8 -> 0 bytes data/maps/UnionRoom/header.inc | 2 +- data/maps/UnionRoom/map.bin | 11 - data/maps/UnknownMap_08417FC4/border.bin | 1 - data/maps/UnknownMap_08417FC4/map.bin | 1 - data/maps/UnknownMap_08428450/border.bin | 1 - data/maps/UnknownMap_08428450/map.bin | Bin 4 -> 0 bytes data/maps/UnknownMap_084294C4/border.bin | 1 - data/maps/UnknownMap_084294C4/map.bin | Bin 4 -> 0 bytes data/maps/UnknownMap_084294E8/border.bin | 1 - data/maps/UnknownMap_084294E8/map.bin | Bin 4 -> 0 bytes data/maps/UnknownMap_0843E6C0/border.bin | 1 - data/maps/UnknownMap_0843E6C0/map.bin | Bin 4 -> 0 bytes data/maps/UnknownMap_0843E6E4/border.bin | 1 - data/maps/UnknownMap_0843E6E4/map.bin | Bin 4 -> 0 bytes data/maps/UnknownMap_0843E708/border.bin | 1 - data/maps/UnknownMap_0843E708/map.bin | Bin 4 -> 0 bytes data/maps/UnknownMap_0843E72C/border.bin | 1 - data/maps/UnknownMap_0843E72C/map.bin | Bin 4 -> 0 bytes data/maps/UnknownMap_0843E750/border.bin | 1 - data/maps/UnknownMap_0843E750/map.bin | Bin 4 -> 0 bytes data/maps/UnknownMap_0843E774/border.bin | 1 - data/maps/UnknownMap_0843E774/map.bin | Bin 4 -> 0 bytes data/maps/UnknownMap_0843E798/border.bin | 1 - data/maps/UnknownMap_0843E798/map.bin | Bin 4 -> 0 bytes data/maps/UnknownMap_0843E7BC/border.bin | 1 - data/maps/UnknownMap_0843E7BC/map.bin | Bin 4 -> 0 bytes data/maps/UnknownMap_0843E7E0/border.bin | 1 - data/maps/UnknownMap_0843E7E0/map.bin | Bin 4 -> 0 bytes data/maps/UnknownMap_0843E804/border.bin | 1 - data/maps/UnknownMap_0843E804/map.bin | Bin 4 -> 0 bytes data/maps/UnknownMap_0843E828/border.bin | 1 - data/maps/UnknownMap_0843E828/map.bin | Bin 4 -> 0 bytes data/maps/UnknownMap_0843E84C/border.bin | 1 - data/maps/UnknownMap_0843E84C/map.bin | Bin 4 -> 0 bytes data/maps/UnknownMap_0843E870/border.bin | 1 - data/maps/UnknownMap_0843E870/map.bin | Bin 4 -> 0 bytes data/maps/UnknownMap_0843E894/border.bin | 1 - data/maps/UnknownMap_0843E894/map.bin | Bin 4 -> 0 bytes data/maps/UnknownMap_08447028/border.bin | 1 - data/maps/UnknownMap_08447028/map.bin | 3 - data/maps/UnknownMap_0845A394/border.bin | 1 - data/maps/UnknownMap_0845A394/map.bin | Bin 724 -> 0 bytes data/maps/UnknownMap_0845D470/border.bin | 1 - data/maps/UnknownMap_0845D470/map.bin | 1 - data/maps/UnknownMap_0845ECB4/border.bin | 1 - data/maps/UnknownMap_0845ECB4/map.bin | 1 - data/maps/UnknownMap_08469200/border.bin | 1 - data/maps/UnknownMap_08469200/map.bin | 12 - data/maps/UnknownMap_084693AC/border.bin | Bin 8 -> 0 bytes data/maps/UnknownMap_084693AC/map.bin | Bin 4 -> 0 bytes data/maps/UnknownMap_08470BD8/border.bin | Bin 8 -> 0 bytes data/maps/UnknownMap_08470BD8/map.bin | Bin 11200 -> 0 bytes data/maps/UnknownMap_08480DAC/border.bin | 1 - data/maps/UnknownMap_08480DAC/map.bin | Bin 340 -> 0 bytes data/maps/UnknownMap_08480F54/border.bin | 1 - data/maps/UnknownMap_08480F54/map.bin | 1 - data/maps/UnknownMap_084810FC/border.bin | 1 - data/maps/UnknownMap_084810FC/map.bin | 1 - data/maps/UnknownMap_084812A4/border.bin | 1 - data/maps/UnknownMap_084812A4/map.bin | 1 - data/maps/UnknownMap_0848144C/border.bin | 1 - data/maps/UnknownMap_0848144C/map.bin | 1 - data/maps/UnknownMap_084815F4/border.bin | 1 - data/maps/UnknownMap_084815F4/map.bin | 1 - data/maps/UnknownMap_08481B24/border.bin | 1 - data/maps/UnknownMap_08481B24/map.bin | 1 - data/maps/UnknownMap_08481DBC/border.bin | Bin 8 -> 0 bytes data/maps/UnknownMap_08481DBC/map.bin | 2 - data/maps/UnknownMap_25_29/border.bin | 1 - data/maps/UnknownMap_25_29/header.inc | 2 +- data/maps/UnknownMap_25_29/map.bin | 1 - data/maps/UnknownMap_25_30/border.bin | 1 - data/maps/UnknownMap_25_30/header.inc | 2 +- data/maps/UnknownMap_25_30/map.bin | 1 - data/maps/UnknownMap_25_31/border.bin | 1 - data/maps/UnknownMap_25_31/header.inc | 2 +- data/maps/UnknownMap_25_31/map.bin | 1 - data/maps/UnknownMap_25_32/border.bin | 1 - data/maps/UnknownMap_25_32/header.inc | 2 +- data/maps/UnknownMap_25_32/map.bin | 1 - data/maps/UnknownMap_25_33/border.bin | 1 - data/maps/UnknownMap_25_33/header.inc | 2 +- data/maps/UnknownMap_25_33/map.bin | 1 - data/maps/UnknownMap_25_34/border.bin | 1 - data/maps/UnknownMap_25_34/header.inc | 2 +- data/maps/UnknownMap_25_34/map.bin | 1 - data/maps/VerdanturfTown/border.bin | Bin 8 -> 0 bytes data/maps/VerdanturfTown/header.inc | 2 +- data/maps/VerdanturfTown/map.bin | Bin 800 -> 0 bytes .../VerdanturfTown_BattleTentBattleRoom/border.bin | Bin 8 -> 0 bytes .../VerdanturfTown_BattleTentBattleRoom/header.inc | 2 +- .../VerdanturfTown_BattleTentBattleRoom/map.bin | Bin 234 -> 0 bytes .../VerdanturfTown_BattleTentCorridor/header.inc | 2 +- .../maps/VerdanturfTown_BattleTentLobby/header.inc | 2 +- .../header.inc | 2 +- data/maps/VerdanturfTown_House/header.inc | 2 +- data/maps/VerdanturfTown_Mart/header.inc | 2 +- .../VerdanturfTown_PokemonCenter_1F/header.inc | 2 +- .../VerdanturfTown_PokemonCenter_2F/header.inc | 2 +- data/maps/VerdanturfTown_WandasHouse/border.bin | Bin 8 -> 0 bytes data/maps/VerdanturfTown_WandasHouse/header.inc | 2 +- data/maps/VerdanturfTown_WandasHouse/map.bin | Bin 272 -> 0 bytes data/maps/VictoryRoad_1F/border.bin | 1 - data/maps/VictoryRoad_1F/header.inc | 2 +- data/maps/VictoryRoad_1F/map.bin | 10 - data/maps/VictoryRoad_B1F/border.bin | 1 - data/maps/VictoryRoad_B1F/header.inc | 2 +- data/maps/VictoryRoad_B1F/map.bin | 25 - data/maps/VictoryRoad_B2F/border.bin | 1 - data/maps/VictoryRoad_B2F/header.inc | 2 +- data/maps/VictoryRoad_B2F/map.bin | 1 - data/maps/_assets.inc | 7606 -------------------- data/maps/_groups.inc | 623 -- data/maps/attributes_table.inc | 444 -- data/maps/groups.inc | 623 ++ 2731 files changed, 11994 insertions(+), 12104 deletions(-) create mode 100755 data/layouts.inc create mode 100644 data/layouts/AbandonedShip_CaptainsOffice/border.bin create mode 100644 data/layouts/AbandonedShip_CaptainsOffice/layout.inc create mode 100644 data/layouts/AbandonedShip_CaptainsOffice/map.bin create mode 100644 data/layouts/AbandonedShip_Corridors_1F/border.bin create mode 100644 data/layouts/AbandonedShip_Corridors_1F/layout.inc create mode 100644 data/layouts/AbandonedShip_Corridors_1F/map.bin create mode 100644 data/layouts/AbandonedShip_Corridors_B1F/border.bin create mode 100644 data/layouts/AbandonedShip_Corridors_B1F/layout.inc create mode 100644 data/layouts/AbandonedShip_Corridors_B1F/map.bin create mode 100644 data/layouts/AbandonedShip_Deck/border.bin create mode 100644 data/layouts/AbandonedShip_Deck/layout.inc create mode 100644 data/layouts/AbandonedShip_Deck/map.bin create mode 100644 data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin create mode 100644 data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc create mode 100644 data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin create mode 100644 data/layouts/AbandonedShip_HiddenFloorRooms/border.bin create mode 100644 data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc create mode 100644 data/layouts/AbandonedShip_HiddenFloorRooms/map.bin create mode 100644 data/layouts/AbandonedShip_Room_B1F/border.bin create mode 100644 data/layouts/AbandonedShip_Room_B1F/layout.inc create mode 100644 data/layouts/AbandonedShip_Room_B1F/map.bin create mode 100644 data/layouts/AbandonedShip_Rooms2_1F/border.bin create mode 100644 data/layouts/AbandonedShip_Rooms2_1F/layout.inc create mode 100644 data/layouts/AbandonedShip_Rooms2_1F/map.bin create mode 100644 data/layouts/AbandonedShip_Rooms2_B1F/border.bin create mode 100644 data/layouts/AbandonedShip_Rooms2_B1F/layout.inc create mode 100644 data/layouts/AbandonedShip_Rooms2_B1F/map.bin create mode 100644 data/layouts/AbandonedShip_Rooms_1F/border.bin create mode 100644 data/layouts/AbandonedShip_Rooms_1F/layout.inc create mode 100644 data/layouts/AbandonedShip_Rooms_1F/map.bin create mode 100644 data/layouts/AbandonedShip_Rooms_B1F/border.bin create mode 100644 data/layouts/AbandonedShip_Rooms_B1F/layout.inc create mode 100644 data/layouts/AbandonedShip_Rooms_B1F/map.bin create mode 100644 data/layouts/AbandonedShip_Underwater1/border.bin create mode 100644 data/layouts/AbandonedShip_Underwater1/layout.inc create mode 100644 data/layouts/AbandonedShip_Underwater1/map.bin create mode 100644 data/layouts/AbandonedShip_Underwater2/border.bin create mode 100644 data/layouts/AbandonedShip_Underwater2/layout.inc create mode 100644 data/layouts/AbandonedShip_Underwater2/map.bin create mode 100644 data/layouts/AlteringCave/border.bin create mode 100644 data/layouts/AlteringCave/layout.inc create mode 100644 data/layouts/AlteringCave/map.bin create mode 100644 data/layouts/AncientTomb/border.bin create mode 100644 data/layouts/AncientTomb/layout.inc create mode 100644 data/layouts/AncientTomb/map.bin create mode 100644 data/layouts/AquaHideout_1F/border.bin create mode 100644 data/layouts/AquaHideout_1F/layout.inc create mode 100644 data/layouts/AquaHideout_1F/map.bin create mode 100644 data/layouts/AquaHideout_B1F/border.bin create mode 100644 data/layouts/AquaHideout_B1F/layout.inc create mode 100644 data/layouts/AquaHideout_B1F/map.bin create mode 100644 data/layouts/AquaHideout_B2F/border.bin create mode 100644 data/layouts/AquaHideout_B2F/layout.inc create mode 100644 data/layouts/AquaHideout_B2F/map.bin create mode 100644 data/layouts/AquaHideout_UnusedRubyMap1/border.bin create mode 100644 data/layouts/AquaHideout_UnusedRubyMap1/layout.inc create mode 100644 data/layouts/AquaHideout_UnusedRubyMap1/map.bin create mode 100644 data/layouts/AquaHideout_UnusedRubyMap2/border.bin create mode 100644 data/layouts/AquaHideout_UnusedRubyMap2/layout.inc create mode 100644 data/layouts/AquaHideout_UnusedRubyMap2/map.bin create mode 100644 data/layouts/AquaHideout_UnusedRubyMap3/border.bin create mode 100644 data/layouts/AquaHideout_UnusedRubyMap3/layout.inc create mode 100644 data/layouts/AquaHideout_UnusedRubyMap3/map.bin create mode 100644 data/layouts/ArtisanCave_1F/border.bin create mode 100644 data/layouts/ArtisanCave_1F/layout.inc create mode 100644 data/layouts/ArtisanCave_1F/map.bin create mode 100644 data/layouts/ArtisanCave_B1F/border.bin create mode 100644 data/layouts/ArtisanCave_B1F/layout.inc create mode 100644 data/layouts/ArtisanCave_B1F/map.bin create mode 100644 data/layouts/BattleElevator/border.bin create mode 100644 data/layouts/BattleElevator/layout.inc create mode 100644 data/layouts/BattleElevator/map.bin create mode 100644 data/layouts/BattleFrontier_BattleArenaBattleRoom/border.bin create mode 100644 data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc create mode 100644 data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin create mode 100644 data/layouts/BattleFrontier_BattleArenaCorridor/border.bin create mode 100644 data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc create mode 100644 data/layouts/BattleFrontier_BattleArenaCorridor/map.bin create mode 100644 data/layouts/BattleFrontier_BattleArenaLobby/border.bin create mode 100644 data/layouts/BattleFrontier_BattleArenaLobby/layout.inc create mode 100644 data/layouts/BattleFrontier_BattleArenaLobby/map.bin create mode 100644 data/layouts/BattleFrontier_BattleDomeBattleRoom/border.bin create mode 100644 data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc create mode 100644 data/layouts/BattleFrontier_BattleDomeBattleRoom/map.bin create mode 100644 data/layouts/BattleFrontier_BattleDomeCorridor/border.bin create mode 100644 data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc create mode 100644 data/layouts/BattleFrontier_BattleDomeCorridor/map.bin create mode 100644 data/layouts/BattleFrontier_BattleDomeLobby/border.bin create mode 100644 data/layouts/BattleFrontier_BattleDomeLobby/layout.inc create mode 100644 data/layouts/BattleFrontier_BattleDomeLobby/map.bin create mode 100644 data/layouts/BattleFrontier_BattleDomePreBattleRoom/border.bin create mode 100644 data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc create mode 100644 data/layouts/BattleFrontier_BattleDomePreBattleRoom/map.bin create mode 100644 data/layouts/BattleFrontier_BattleFactoryBattleRoom/border.bin create mode 100644 data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc create mode 100644 data/layouts/BattleFrontier_BattleFactoryBattleRoom/map.bin create mode 100644 data/layouts/BattleFrontier_BattleFactoryLobby/border.bin create mode 100644 data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc create mode 100644 data/layouts/BattleFrontier_BattleFactoryLobby/map.bin create mode 100644 data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/border.bin create mode 100644 data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc create mode 100644 data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/map.bin create mode 100644 data/layouts/BattleFrontier_BattlePalaceBattleRoom/border.bin create mode 100644 data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc create mode 100644 data/layouts/BattleFrontier_BattlePalaceBattleRoom/map.bin create mode 100644 data/layouts/BattleFrontier_BattlePalaceCorridor/border.bin create mode 100644 data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc create mode 100644 data/layouts/BattleFrontier_BattlePalaceCorridor/map.bin create mode 100644 data/layouts/BattleFrontier_BattlePalaceLobby/border.bin create mode 100644 data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc create mode 100644 data/layouts/BattleFrontier_BattlePalaceLobby/map.bin create mode 100644 data/layouts/BattleFrontier_BattlePikeCorridor/border.bin create mode 100644 data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc create mode 100644 data/layouts/BattleFrontier_BattlePikeCorridor/map.bin create mode 100644 data/layouts/BattleFrontier_BattlePikeLobby/border.bin create mode 100644 data/layouts/BattleFrontier_BattlePikeLobby/layout.inc create mode 100644 data/layouts/BattleFrontier_BattlePikeLobby/map.bin create mode 100644 data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin create mode 100644 data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc create mode 100644 data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin create mode 100644 data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin create mode 100644 data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc create mode 100644 data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin create mode 100644 data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin create mode 100644 data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc create mode 100644 data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin create mode 100644 data/layouts/BattleFrontier_BattlePikeThreePathRoom/border.bin create mode 100644 data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc create mode 100644 data/layouts/BattleFrontier_BattlePikeThreePathRoom/map.bin create mode 100644 data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin create mode 100644 data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc create mode 100644 data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin create mode 100644 data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin create mode 100644 data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc create mode 100644 data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin create mode 100644 data/layouts/BattleFrontier_BattlePyramidLobby/border.bin create mode 100644 data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc create mode 100644 data/layouts/BattleFrontier_BattlePyramidLobby/map.bin create mode 100644 data/layouts/BattleFrontier_BattlePyramidTop/border.bin create mode 100644 data/layouts/BattleFrontier_BattlePyramidTop/layout.inc create mode 100644 data/layouts/BattleFrontier_BattlePyramidTop/map.bin create mode 100644 data/layouts/BattleFrontier_BattleTowerBattleRoom/border.bin create mode 100644 data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc create mode 100644 data/layouts/BattleFrontier_BattleTowerBattleRoom/map.bin create mode 100644 data/layouts/BattleFrontier_BattleTowerCorridor/border.bin create mode 100644 data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc create mode 100644 data/layouts/BattleFrontier_BattleTowerCorridor/map.bin create mode 100644 data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin create mode 100644 data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc create mode 100644 data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin create mode 100644 data/layouts/BattleFrontier_BattleTowerLobby/border.bin create mode 100644 data/layouts/BattleFrontier_BattleTowerLobby/layout.inc create mode 100644 data/layouts/BattleFrontier_BattleTowerLobby/map.bin create mode 100644 data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin create mode 100644 data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc create mode 100644 data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin create mode 100644 data/layouts/BattleFrontier_Lounge1/border.bin create mode 100644 data/layouts/BattleFrontier_Lounge1/layout.inc create mode 100644 data/layouts/BattleFrontier_Lounge1/map.bin create mode 100644 data/layouts/BattleFrontier_Lounge2/border.bin create mode 100644 data/layouts/BattleFrontier_Lounge2/layout.inc create mode 100644 data/layouts/BattleFrontier_Lounge2/map.bin create mode 100644 data/layouts/BattleFrontier_OutsideEast/border.bin create mode 100644 data/layouts/BattleFrontier_OutsideEast/layout.inc create mode 100644 data/layouts/BattleFrontier_OutsideEast/map.bin create mode 100644 data/layouts/BattleFrontier_OutsideWest/border.bin create mode 100644 data/layouts/BattleFrontier_OutsideWest/layout.inc create mode 100644 data/layouts/BattleFrontier_OutsideWest/map.bin create mode 100644 data/layouts/BattleFrontier_RankingHall/border.bin create mode 100644 data/layouts/BattleFrontier_RankingHall/layout.inc create mode 100644 data/layouts/BattleFrontier_RankingHall/map.bin create mode 100644 data/layouts/BattleFrontier_ReceptionGate/border.bin create mode 100644 data/layouts/BattleFrontier_ReceptionGate/layout.inc create mode 100644 data/layouts/BattleFrontier_ReceptionGate/map.bin create mode 100644 data/layouts/BattleFrontier_ScottsHouse/border.bin create mode 100644 data/layouts/BattleFrontier_ScottsHouse/layout.inc create mode 100644 data/layouts/BattleFrontier_ScottsHouse/map.bin create mode 100644 data/layouts/BattlePyramidSquare01/border.bin create mode 100644 data/layouts/BattlePyramidSquare01/layout.inc create mode 100644 data/layouts/BattlePyramidSquare01/map.bin create mode 100644 data/layouts/BattlePyramidSquare02/border.bin create mode 100644 data/layouts/BattlePyramidSquare02/layout.inc create mode 100644 data/layouts/BattlePyramidSquare02/map.bin create mode 100644 data/layouts/BattlePyramidSquare03/border.bin create mode 100644 data/layouts/BattlePyramidSquare03/layout.inc create mode 100644 data/layouts/BattlePyramidSquare03/map.bin create mode 100644 data/layouts/BattlePyramidSquare04/border.bin create mode 100644 data/layouts/BattlePyramidSquare04/layout.inc create mode 100644 data/layouts/BattlePyramidSquare04/map.bin create mode 100644 data/layouts/BattlePyramidSquare05/border.bin create mode 100644 data/layouts/BattlePyramidSquare05/layout.inc create mode 100644 data/layouts/BattlePyramidSquare05/map.bin create mode 100644 data/layouts/BattlePyramidSquare06/border.bin create mode 100644 data/layouts/BattlePyramidSquare06/layout.inc create mode 100644 data/layouts/BattlePyramidSquare06/map.bin create mode 100644 data/layouts/BattlePyramidSquare07/border.bin create mode 100644 data/layouts/BattlePyramidSquare07/layout.inc create mode 100644 data/layouts/BattlePyramidSquare07/map.bin create mode 100644 data/layouts/BattlePyramidSquare08/border.bin create mode 100644 data/layouts/BattlePyramidSquare08/layout.inc create mode 100644 data/layouts/BattlePyramidSquare08/map.bin create mode 100644 data/layouts/BattlePyramidSquare09/border.bin create mode 100644 data/layouts/BattlePyramidSquare09/layout.inc create mode 100644 data/layouts/BattlePyramidSquare09/map.bin create mode 100644 data/layouts/BattlePyramidSquare10/border.bin create mode 100644 data/layouts/BattlePyramidSquare10/layout.inc create mode 100644 data/layouts/BattlePyramidSquare10/map.bin create mode 100644 data/layouts/BattlePyramidSquare11/border.bin create mode 100644 data/layouts/BattlePyramidSquare11/layout.inc create mode 100644 data/layouts/BattlePyramidSquare11/map.bin create mode 100644 data/layouts/BattlePyramidSquare12/border.bin create mode 100644 data/layouts/BattlePyramidSquare12/layout.inc create mode 100644 data/layouts/BattlePyramidSquare12/map.bin create mode 100644 data/layouts/BattlePyramidSquare13/border.bin create mode 100644 data/layouts/BattlePyramidSquare13/layout.inc create mode 100644 data/layouts/BattlePyramidSquare13/map.bin create mode 100644 data/layouts/BattlePyramidSquare14/border.bin create mode 100644 data/layouts/BattlePyramidSquare14/layout.inc create mode 100644 data/layouts/BattlePyramidSquare14/map.bin create mode 100644 data/layouts/BattlePyramidSquare15/border.bin create mode 100644 data/layouts/BattlePyramidSquare15/layout.inc create mode 100644 data/layouts/BattlePyramidSquare15/map.bin create mode 100644 data/layouts/BattlePyramidSquare16/border.bin create mode 100644 data/layouts/BattlePyramidSquare16/layout.inc create mode 100644 data/layouts/BattlePyramidSquare16/map.bin create mode 100644 data/layouts/BattleTentBattleRoom/border.bin create mode 100644 data/layouts/BattleTentBattleRoom/layout.inc create mode 100644 data/layouts/BattleTentBattleRoom/map.bin create mode 100644 data/layouts/BattleTentCorridor/border.bin create mode 100644 data/layouts/BattleTentCorridor/layout.inc create mode 100644 data/layouts/BattleTentCorridor/map.bin create mode 100644 data/layouts/BattleTentLobby/border.bin create mode 100644 data/layouts/BattleTentLobby/layout.inc create mode 100644 data/layouts/BattleTentLobby/map.bin create mode 100644 data/layouts/BirthIsland_Exterior/border.bin create mode 100644 data/layouts/BirthIsland_Exterior/layout.inc create mode 100644 data/layouts/BirthIsland_Exterior/map.bin create mode 100644 data/layouts/CableCarStation/border.bin create mode 100644 data/layouts/CableCarStation/layout.inc create mode 100644 data/layouts/CableCarStation/map.bin create mode 100644 data/layouts/CaveOfOrigin_1F/border.bin create mode 100644 data/layouts/CaveOfOrigin_1F/layout.inc create mode 100644 data/layouts/CaveOfOrigin_1F/map.bin create mode 100644 data/layouts/CaveOfOrigin_B1F/border.bin create mode 100644 data/layouts/CaveOfOrigin_B1F/layout.inc create mode 100644 data/layouts/CaveOfOrigin_B1F/map.bin create mode 100644 data/layouts/CaveOfOrigin_Entrance/border.bin create mode 100644 data/layouts/CaveOfOrigin_Entrance/layout.inc create mode 100644 data/layouts/CaveOfOrigin_Entrance/map.bin create mode 100644 data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/border.bin create mode 100644 data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc create mode 100644 data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/map.bin create mode 100644 data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/border.bin create mode 100644 data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc create mode 100644 data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/map.bin create mode 100644 data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/border.bin create mode 100644 data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc create mode 100644 data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/map.bin create mode 100644 data/layouts/DesertRuins/border.bin create mode 100644 data/layouts/DesertRuins/layout.inc create mode 100644 data/layouts/DesertRuins/map.bin create mode 100644 data/layouts/DesertUnderpass/border.bin create mode 100644 data/layouts/DesertUnderpass/layout.inc create mode 100644 data/layouts/DesertUnderpass/map.bin create mode 100644 data/layouts/DewfordTown/border.bin create mode 100644 data/layouts/DewfordTown/layout.inc create mode 100644 data/layouts/DewfordTown/map.bin create mode 100644 data/layouts/DewfordTown_Gym/border.bin create mode 100644 data/layouts/DewfordTown_Gym/layout.inc create mode 100644 data/layouts/DewfordTown_Gym/map.bin create mode 100644 data/layouts/DewfordTown_Hall/border.bin create mode 100644 data/layouts/DewfordTown_Hall/layout.inc create mode 100644 data/layouts/DewfordTown_Hall/map.bin create mode 100644 data/layouts/DoubleBattleColosseum/border.bin create mode 100644 data/layouts/DoubleBattleColosseum/layout.inc create mode 100644 data/layouts/DoubleBattleColosseum/map.bin create mode 100644 data/layouts/EverGrandeCity/border.bin create mode 100644 data/layouts/EverGrandeCity/layout.inc create mode 100644 data/layouts/EverGrandeCity/map.bin create mode 100644 data/layouts/EverGrandeCity_ChampionsRoom/border.bin create mode 100644 data/layouts/EverGrandeCity_ChampionsRoom/layout.inc create mode 100644 data/layouts/EverGrandeCity_ChampionsRoom/map.bin create mode 100644 data/layouts/EverGrandeCity_DrakesRoom/border.bin create mode 100644 data/layouts/EverGrandeCity_DrakesRoom/layout.inc create mode 100644 data/layouts/EverGrandeCity_DrakesRoom/map.bin create mode 100644 data/layouts/EverGrandeCity_GlaciasRoom/border.bin create mode 100644 data/layouts/EverGrandeCity_GlaciasRoom/layout.inc create mode 100644 data/layouts/EverGrandeCity_GlaciasRoom/map.bin create mode 100644 data/layouts/EverGrandeCity_Hall4/border.bin create mode 100644 data/layouts/EverGrandeCity_Hall4/layout.inc create mode 100644 data/layouts/EverGrandeCity_Hall4/map.bin create mode 100644 data/layouts/EverGrandeCity_HallOfFame/border.bin create mode 100644 data/layouts/EverGrandeCity_HallOfFame/layout.inc create mode 100644 data/layouts/EverGrandeCity_HallOfFame/map.bin create mode 100644 data/layouts/EverGrandeCity_PhoebesRoom/border.bin create mode 100644 data/layouts/EverGrandeCity_PhoebesRoom/layout.inc create mode 100644 data/layouts/EverGrandeCity_PhoebesRoom/map.bin create mode 100644 data/layouts/EverGrandeCity_PokemonLeague_1F/border.bin create mode 100644 data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc create mode 100644 data/layouts/EverGrandeCity_PokemonLeague_1F/map.bin create mode 100644 data/layouts/EverGrandeCity_ShortHall/border.bin create mode 100644 data/layouts/EverGrandeCity_ShortHall/layout.inc create mode 100644 data/layouts/EverGrandeCity_ShortHall/map.bin create mode 100644 data/layouts/EverGrandeCity_SidneysRoom/border.bin create mode 100644 data/layouts/EverGrandeCity_SidneysRoom/layout.inc create mode 100644 data/layouts/EverGrandeCity_SidneysRoom/map.bin create mode 100644 data/layouts/FallarborTown/border.bin create mode 100644 data/layouts/FallarborTown/layout.inc create mode 100644 data/layouts/FallarborTown/map.bin create mode 100644 data/layouts/FallarborTown_LeftoverRSContestHall/border.bin create mode 100644 data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc create mode 100644 data/layouts/FallarborTown_LeftoverRSContestHall/map.bin create mode 100644 data/layouts/FallarborTown_LeftoverRSContestLobby/border.bin create mode 100644 data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc create mode 100644 data/layouts/FallarborTown_LeftoverRSContestLobby/map.bin create mode 100644 data/layouts/FarawayIsland_Entrance/border.bin create mode 100644 data/layouts/FarawayIsland_Entrance/layout.inc create mode 100644 data/layouts/FarawayIsland_Entrance/map.bin create mode 100644 data/layouts/FarawayIsland_Interior/border.bin create mode 100644 data/layouts/FarawayIsland_Interior/layout.inc create mode 100644 data/layouts/FarawayIsland_Interior/map.bin create mode 100644 data/layouts/FieryPath/border.bin create mode 100644 data/layouts/FieryPath/layout.inc create mode 100644 data/layouts/FieryPath/map.bin create mode 100644 data/layouts/FortreeCity/border.bin create mode 100644 data/layouts/FortreeCity/layout.inc create mode 100644 data/layouts/FortreeCity/map.bin create mode 100644 data/layouts/FortreeCity_DecorationShop/border.bin create mode 100644 data/layouts/FortreeCity_DecorationShop/layout.inc create mode 100644 data/layouts/FortreeCity_DecorationShop/map.bin create mode 100644 data/layouts/FortreeCity_Gym/border.bin create mode 100644 data/layouts/FortreeCity_Gym/layout.inc create mode 100644 data/layouts/FortreeCity_Gym/map.bin create mode 100644 data/layouts/FortreeCity_House1/border.bin create mode 100644 data/layouts/FortreeCity_House1/layout.inc create mode 100644 data/layouts/FortreeCity_House1/map.bin create mode 100644 data/layouts/FortreeCity_House2/border.bin create mode 100644 data/layouts/FortreeCity_House2/layout.inc create mode 100644 data/layouts/FortreeCity_House2/map.bin create mode 100644 data/layouts/GraniteCave_1F/border.bin create mode 100644 data/layouts/GraniteCave_1F/layout.inc create mode 100644 data/layouts/GraniteCave_1F/map.bin create mode 100644 data/layouts/GraniteCave_B1F/border.bin create mode 100644 data/layouts/GraniteCave_B1F/layout.inc create mode 100644 data/layouts/GraniteCave_B1F/map.bin create mode 100644 data/layouts/GraniteCave_B2F/border.bin create mode 100644 data/layouts/GraniteCave_B2F/layout.inc create mode 100644 data/layouts/GraniteCave_B2F/map.bin create mode 100644 data/layouts/GraniteCave_StevensRoom/border.bin create mode 100644 data/layouts/GraniteCave_StevensRoom/layout.inc create mode 100644 data/layouts/GraniteCave_StevensRoom/map.bin create mode 100644 data/layouts/Harbor/border.bin create mode 100644 data/layouts/Harbor/layout.inc create mode 100644 data/layouts/Harbor/map.bin create mode 100644 data/layouts/House1/border.bin create mode 100644 data/layouts/House1/layout.inc create mode 100644 data/layouts/House1/map.bin create mode 100644 data/layouts/House2/border.bin create mode 100644 data/layouts/House2/layout.inc create mode 100644 data/layouts/House2/map.bin create mode 100644 data/layouts/House3/border.bin create mode 100644 data/layouts/House3/layout.inc create mode 100644 data/layouts/House3/map.bin create mode 100644 data/layouts/House4/border.bin create mode 100644 data/layouts/House4/layout.inc create mode 100644 data/layouts/House4/map.bin create mode 100644 data/layouts/HouseWithBed/border.bin create mode 100644 data/layouts/HouseWithBed/layout.inc create mode 100644 data/layouts/HouseWithBed/map.bin create mode 100644 data/layouts/InsideOfTruck/border.bin create mode 100644 data/layouts/InsideOfTruck/layout.inc create mode 100644 data/layouts/InsideOfTruck/map.bin create mode 100644 data/layouts/IslandCave/border.bin create mode 100644 data/layouts/IslandCave/layout.inc create mode 100644 data/layouts/IslandCave/map.bin create mode 100644 data/layouts/IslandHarbor/border.bin create mode 100644 data/layouts/IslandHarbor/layout.inc create mode 100644 data/layouts/IslandHarbor/map.bin create mode 100644 data/layouts/JaggedPass/border.bin create mode 100644 data/layouts/JaggedPass/layout.inc create mode 100644 data/layouts/JaggedPass/map.bin create mode 100644 data/layouts/LavaridgeTown/border.bin create mode 100644 data/layouts/LavaridgeTown/layout.inc create mode 100644 data/layouts/LavaridgeTown/map.bin create mode 100644 data/layouts/LavaridgeTown_Gym_1F/border.bin create mode 100644 data/layouts/LavaridgeTown_Gym_1F/layout.inc create mode 100644 data/layouts/LavaridgeTown_Gym_1F/map.bin create mode 100644 data/layouts/LavaridgeTown_Gym_B1F/border.bin create mode 100644 data/layouts/LavaridgeTown_Gym_B1F/layout.inc create mode 100644 data/layouts/LavaridgeTown_Gym_B1F/map.bin create mode 100644 data/layouts/LavaridgeTown_HerbShop/border.bin create mode 100644 data/layouts/LavaridgeTown_HerbShop/layout.inc create mode 100644 data/layouts/LavaridgeTown_HerbShop/map.bin create mode 100644 data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin create mode 100644 data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc create mode 100644 data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin create mode 100644 data/layouts/LilycoveCity/border.bin create mode 100644 data/layouts/LilycoveCity/layout.inc create mode 100644 data/layouts/LilycoveCity/map.bin create mode 100644 data/layouts/LilycoveCity_ContestHall/border.bin create mode 100644 data/layouts/LilycoveCity_ContestHall/layout.inc create mode 100644 data/layouts/LilycoveCity_ContestHall/map.bin create mode 100644 data/layouts/LilycoveCity_ContestLobby/border.bin create mode 100644 data/layouts/LilycoveCity_ContestLobby/layout.inc create mode 100644 data/layouts/LilycoveCity_ContestLobby/map.bin create mode 100644 data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin create mode 100644 data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc create mode 100644 data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin create mode 100644 data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin create mode 100644 data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc create mode 100644 data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin create mode 100644 data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin create mode 100644 data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc create mode 100644 data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin create mode 100644 data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin create mode 100644 data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc create mode 100644 data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin create mode 100644 data/layouts/LilycoveCity_DepartmentStore_1F/border.bin create mode 100644 data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc create mode 100644 data/layouts/LilycoveCity_DepartmentStore_1F/map.bin create mode 100644 data/layouts/LilycoveCity_DepartmentStore_2F/border.bin create mode 100644 data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc create mode 100644 data/layouts/LilycoveCity_DepartmentStore_2F/map.bin create mode 100644 data/layouts/LilycoveCity_DepartmentStore_3F/border.bin create mode 100644 data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc create mode 100644 data/layouts/LilycoveCity_DepartmentStore_3F/map.bin create mode 100644 data/layouts/LilycoveCity_DepartmentStore_4F/border.bin create mode 100644 data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc create mode 100644 data/layouts/LilycoveCity_DepartmentStore_4F/map.bin create mode 100644 data/layouts/LilycoveCity_DepartmentStore_5F/border.bin create mode 100644 data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc create mode 100644 data/layouts/LilycoveCity_DepartmentStore_5F/map.bin create mode 100644 data/layouts/LilycoveCity_House2/border.bin create mode 100644 data/layouts/LilycoveCity_House2/layout.inc create mode 100644 data/layouts/LilycoveCity_House2/map.bin create mode 100644 data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin create mode 100644 data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc create mode 100644 data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin create mode 100644 data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin create mode 100644 data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc create mode 100644 data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin create mode 100644 data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin create mode 100644 data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc create mode 100644 data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin create mode 100644 data/layouts/LinkContestRoom1/border.bin create mode 100644 data/layouts/LinkContestRoom1/layout.inc create mode 100644 data/layouts/LinkContestRoom1/map.bin create mode 100644 data/layouts/LinkContestRoom2/border.bin create mode 100644 data/layouts/LinkContestRoom2/layout.inc create mode 100644 data/layouts/LinkContestRoom2/map.bin create mode 100644 data/layouts/LinkContestRoom3/border.bin create mode 100644 data/layouts/LinkContestRoom3/layout.inc create mode 100644 data/layouts/LinkContestRoom3/map.bin create mode 100644 data/layouts/LinkContestRoom4/border.bin create mode 100644 data/layouts/LinkContestRoom4/layout.inc create mode 100644 data/layouts/LinkContestRoom4/map.bin create mode 100644 data/layouts/LinkContestRoom5/border.bin create mode 100644 data/layouts/LinkContestRoom5/layout.inc create mode 100644 data/layouts/LinkContestRoom5/map.bin create mode 100644 data/layouts/LinkContestRoom6/border.bin create mode 100644 data/layouts/LinkContestRoom6/layout.inc create mode 100644 data/layouts/LinkContestRoom6/map.bin create mode 100644 data/layouts/LittlerootTown/border.bin create mode 100644 data/layouts/LittlerootTown/layout.inc create mode 100644 data/layouts/LittlerootTown/map.bin create mode 100644 data/layouts/LittlerootTown_BrendansHouse_1F/border.bin create mode 100644 data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc create mode 100644 data/layouts/LittlerootTown_BrendansHouse_1F/map.bin create mode 100644 data/layouts/LittlerootTown_BrendansHouse_2F/border.bin create mode 100644 data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc create mode 100644 data/layouts/LittlerootTown_BrendansHouse_2F/map.bin create mode 100644 data/layouts/LittlerootTown_MaysHouse_1F/border.bin create mode 100644 data/layouts/LittlerootTown_MaysHouse_1F/layout.inc create mode 100644 data/layouts/LittlerootTown_MaysHouse_1F/map.bin create mode 100644 data/layouts/LittlerootTown_MaysHouse_2F/border.bin create mode 100644 data/layouts/LittlerootTown_MaysHouse_2F/layout.inc create mode 100644 data/layouts/LittlerootTown_MaysHouse_2F/map.bin create mode 100644 data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin create mode 100644 data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc create mode 100644 data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin create mode 100644 data/layouts/MagmaHideout_1F/border.bin create mode 100644 data/layouts/MagmaHideout_1F/layout.inc create mode 100644 data/layouts/MagmaHideout_1F/map.bin create mode 100644 data/layouts/MagmaHideout_2F_1R/border.bin create mode 100644 data/layouts/MagmaHideout_2F_1R/layout.inc create mode 100644 data/layouts/MagmaHideout_2F_1R/map.bin create mode 100644 data/layouts/MagmaHideout_2F_2R/border.bin create mode 100644 data/layouts/MagmaHideout_2F_2R/layout.inc create mode 100644 data/layouts/MagmaHideout_2F_2R/map.bin create mode 100644 data/layouts/MagmaHideout_2F_3R/border.bin create mode 100644 data/layouts/MagmaHideout_2F_3R/layout.inc create mode 100644 data/layouts/MagmaHideout_2F_3R/map.bin create mode 100644 data/layouts/MagmaHideout_3F_1R/border.bin create mode 100644 data/layouts/MagmaHideout_3F_1R/layout.inc create mode 100644 data/layouts/MagmaHideout_3F_1R/map.bin create mode 100644 data/layouts/MagmaHideout_3F_2R/border.bin create mode 100644 data/layouts/MagmaHideout_3F_2R/layout.inc create mode 100644 data/layouts/MagmaHideout_3F_2R/map.bin create mode 100644 data/layouts/MagmaHideout_3F_3R/border.bin create mode 100644 data/layouts/MagmaHideout_3F_3R/layout.inc create mode 100644 data/layouts/MagmaHideout_3F_3R/map.bin create mode 100644 data/layouts/MagmaHideout_4F/border.bin create mode 100644 data/layouts/MagmaHideout_4F/layout.inc create mode 100644 data/layouts/MagmaHideout_4F/map.bin create mode 100644 data/layouts/MarineCave_End/border.bin create mode 100644 data/layouts/MarineCave_End/layout.inc create mode 100644 data/layouts/MarineCave_End/map.bin create mode 100644 data/layouts/MarineCave_Entrance/border.bin create mode 100644 data/layouts/MarineCave_Entrance/layout.inc create mode 100644 data/layouts/MarineCave_Entrance/map.bin create mode 100644 data/layouts/Mart/border.bin create mode 100644 data/layouts/Mart/layout.inc create mode 100644 data/layouts/Mart/map.bin create mode 100644 data/layouts/MauvilleCity/border.bin create mode 100644 data/layouts/MauvilleCity/layout.inc create mode 100644 data/layouts/MauvilleCity/map.bin create mode 100644 data/layouts/MauvilleCity_BikeShop/border.bin create mode 100644 data/layouts/MauvilleCity_BikeShop/layout.inc create mode 100644 data/layouts/MauvilleCity_BikeShop/map.bin create mode 100644 data/layouts/MauvilleCity_GameCorner/border.bin create mode 100644 data/layouts/MauvilleCity_GameCorner/layout.inc create mode 100644 data/layouts/MauvilleCity_GameCorner/map.bin create mode 100644 data/layouts/MauvilleCity_Gym/border.bin create mode 100644 data/layouts/MauvilleCity_Gym/layout.inc create mode 100644 data/layouts/MauvilleCity_Gym/map.bin create mode 100644 data/layouts/MeteorFalls_1F_1R/border.bin create mode 100644 data/layouts/MeteorFalls_1F_1R/layout.inc create mode 100644 data/layouts/MeteorFalls_1F_1R/map.bin create mode 100644 data/layouts/MeteorFalls_1F_2R/border.bin create mode 100644 data/layouts/MeteorFalls_1F_2R/layout.inc create mode 100644 data/layouts/MeteorFalls_1F_2R/map.bin create mode 100644 data/layouts/MeteorFalls_B1F_1R/border.bin create mode 100644 data/layouts/MeteorFalls_B1F_1R/layout.inc create mode 100644 data/layouts/MeteorFalls_B1F_1R/map.bin create mode 100644 data/layouts/MeteorFalls_B1F_2R/border.bin create mode 100644 data/layouts/MeteorFalls_B1F_2R/layout.inc create mode 100644 data/layouts/MeteorFalls_B1F_2R/map.bin create mode 100644 data/layouts/MeteorFalls_StevensCave/border.bin create mode 100644 data/layouts/MeteorFalls_StevensCave/layout.inc create mode 100644 data/layouts/MeteorFalls_StevensCave/map.bin create mode 100644 data/layouts/MirageTower_1F/border.bin create mode 100644 data/layouts/MirageTower_1F/layout.inc create mode 100644 data/layouts/MirageTower_1F/map.bin create mode 100644 data/layouts/MirageTower_2F/border.bin create mode 100644 data/layouts/MirageTower_2F/layout.inc create mode 100644 data/layouts/MirageTower_2F/map.bin create mode 100644 data/layouts/MirageTower_3F/border.bin create mode 100644 data/layouts/MirageTower_3F/layout.inc create mode 100644 data/layouts/MirageTower_3F/map.bin create mode 100644 data/layouts/MirageTower_4F/border.bin create mode 100644 data/layouts/MirageTower_4F/layout.inc create mode 100644 data/layouts/MirageTower_4F/map.bin create mode 100644 data/layouts/MossdeepCity/border.bin create mode 100644 data/layouts/MossdeepCity/layout.inc create mode 100644 data/layouts/MossdeepCity/map.bin create mode 100644 data/layouts/MossdeepCity_GameCorner_1F/border.bin create mode 100644 data/layouts/MossdeepCity_GameCorner_1F/layout.inc create mode 100644 data/layouts/MossdeepCity_GameCorner_1F/map.bin create mode 100644 data/layouts/MossdeepCity_GameCorner_B1F/border.bin create mode 100644 data/layouts/MossdeepCity_GameCorner_B1F/layout.inc create mode 100644 data/layouts/MossdeepCity_GameCorner_B1F/map.bin create mode 100644 data/layouts/MossdeepCity_Gym/border.bin create mode 100644 data/layouts/MossdeepCity_Gym/layout.inc create mode 100644 data/layouts/MossdeepCity_Gym/map.bin create mode 100644 data/layouts/MossdeepCity_SpaceCenter_1F/border.bin create mode 100644 data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc create mode 100644 data/layouts/MossdeepCity_SpaceCenter_1F/map.bin create mode 100644 data/layouts/MossdeepCity_SpaceCenter_2F/border.bin create mode 100644 data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc create mode 100644 data/layouts/MossdeepCity_SpaceCenter_2F/map.bin create mode 100644 data/layouts/MossdeepCity_StevensHouse/border.bin create mode 100644 data/layouts/MossdeepCity_StevensHouse/layout.inc create mode 100644 data/layouts/MossdeepCity_StevensHouse/map.bin create mode 100644 data/layouts/MtChimney/border.bin create mode 100644 data/layouts/MtChimney/layout.inc create mode 100644 data/layouts/MtChimney/map.bin create mode 100644 data/layouts/MtPyre_1F/border.bin create mode 100644 data/layouts/MtPyre_1F/layout.inc create mode 100644 data/layouts/MtPyre_1F/map.bin create mode 100644 data/layouts/MtPyre_2F/border.bin create mode 100644 data/layouts/MtPyre_2F/layout.inc create mode 100644 data/layouts/MtPyre_2F/map.bin create mode 100644 data/layouts/MtPyre_3F/border.bin create mode 100644 data/layouts/MtPyre_3F/layout.inc create mode 100644 data/layouts/MtPyre_3F/map.bin create mode 100644 data/layouts/MtPyre_4F/border.bin create mode 100644 data/layouts/MtPyre_4F/layout.inc create mode 100644 data/layouts/MtPyre_4F/map.bin create mode 100644 data/layouts/MtPyre_5F/border.bin create mode 100644 data/layouts/MtPyre_5F/layout.inc create mode 100644 data/layouts/MtPyre_5F/map.bin create mode 100644 data/layouts/MtPyre_6F/border.bin create mode 100644 data/layouts/MtPyre_6F/layout.inc create mode 100644 data/layouts/MtPyre_6F/map.bin create mode 100644 data/layouts/MtPyre_Exterior/border.bin create mode 100644 data/layouts/MtPyre_Exterior/layout.inc create mode 100644 data/layouts/MtPyre_Exterior/map.bin create mode 100644 data/layouts/MtPyre_Summit/border.bin create mode 100644 data/layouts/MtPyre_Summit/layout.inc create mode 100644 data/layouts/MtPyre_Summit/map.bin create mode 100644 data/layouts/NavelRock_B1F/border.bin create mode 100644 data/layouts/NavelRock_B1F/layout.inc create mode 100644 data/layouts/NavelRock_B1F/map.bin create mode 100644 data/layouts/NavelRock_Bottom/border.bin create mode 100644 data/layouts/NavelRock_Bottom/layout.inc create mode 100644 data/layouts/NavelRock_Bottom/map.bin create mode 100644 data/layouts/NavelRock_Entrance/border.bin create mode 100644 data/layouts/NavelRock_Entrance/layout.inc create mode 100644 data/layouts/NavelRock_Entrance/map.bin create mode 100644 data/layouts/NavelRock_Exterior/border.bin create mode 100644 data/layouts/NavelRock_Exterior/layout.inc create mode 100644 data/layouts/NavelRock_Exterior/map.bin create mode 100644 data/layouts/NavelRock_Fork/border.bin create mode 100644 data/layouts/NavelRock_Fork/layout.inc create mode 100644 data/layouts/NavelRock_Fork/map.bin create mode 100644 data/layouts/NavelRock_LadderRoom1/border.bin create mode 100644 data/layouts/NavelRock_LadderRoom1/layout.inc create mode 100644 data/layouts/NavelRock_LadderRoom1/map.bin create mode 100644 data/layouts/NavelRock_LadderRoom2/border.bin create mode 100644 data/layouts/NavelRock_LadderRoom2/layout.inc create mode 100644 data/layouts/NavelRock_LadderRoom2/map.bin create mode 100644 data/layouts/NavelRock_Top/border.bin create mode 100644 data/layouts/NavelRock_Top/layout.inc create mode 100644 data/layouts/NavelRock_Top/map.bin create mode 100644 data/layouts/NewMauville_Entrance/border.bin create mode 100644 data/layouts/NewMauville_Entrance/layout.inc create mode 100644 data/layouts/NewMauville_Entrance/map.bin create mode 100644 data/layouts/NewMauville_Inside/border.bin create mode 100644 data/layouts/NewMauville_Inside/layout.inc create mode 100644 data/layouts/NewMauville_Inside/map.bin create mode 100644 data/layouts/OldaleTown/border.bin create mode 100644 data/layouts/OldaleTown/layout.inc create mode 100644 data/layouts/OldaleTown/map.bin create mode 100644 data/layouts/PacifidlogTown/border.bin create mode 100644 data/layouts/PacifidlogTown/layout.inc create mode 100644 data/layouts/PacifidlogTown/map.bin create mode 100644 data/layouts/PacifidlogTown_House1/border.bin create mode 100644 data/layouts/PacifidlogTown_House1/layout.inc create mode 100644 data/layouts/PacifidlogTown_House1/map.bin create mode 100644 data/layouts/PacifidlogTown_House2/border.bin create mode 100644 data/layouts/PacifidlogTown_House2/layout.inc create mode 100644 data/layouts/PacifidlogTown_House2/map.bin create mode 100644 data/layouts/PetalburgCity/border.bin create mode 100644 data/layouts/PetalburgCity/layout.inc create mode 100644 data/layouts/PetalburgCity/map.bin create mode 100644 data/layouts/PetalburgCity_Gym/border.bin create mode 100644 data/layouts/PetalburgCity_Gym/layout.inc create mode 100644 data/layouts/PetalburgCity_Gym/map.bin create mode 100644 data/layouts/PetalburgWoods/border.bin create mode 100644 data/layouts/PetalburgWoods/layout.inc create mode 100644 data/layouts/PetalburgWoods/map.bin create mode 100644 data/layouts/PokemonCenter_1F/border.bin create mode 100644 data/layouts/PokemonCenter_1F/layout.inc create mode 100644 data/layouts/PokemonCenter_1F/map.bin create mode 100644 data/layouts/PokemonCenter_2F/border.bin create mode 100644 data/layouts/PokemonCenter_2F/layout.inc create mode 100644 data/layouts/PokemonCenter_2F/map.bin create mode 100644 data/layouts/RecordCorner/border.bin create mode 100644 data/layouts/RecordCorner/layout.inc create mode 100644 data/layouts/RecordCorner/map.bin create mode 100644 data/layouts/Route101/border.bin create mode 100644 data/layouts/Route101/layout.inc create mode 100644 data/layouts/Route101/map.bin create mode 100644 data/layouts/Route102/border.bin create mode 100644 data/layouts/Route102/layout.inc create mode 100644 data/layouts/Route102/map.bin create mode 100644 data/layouts/Route103/border.bin create mode 100644 data/layouts/Route103/layout.inc create mode 100644 data/layouts/Route103/map.bin create mode 100644 data/layouts/Route104/border.bin create mode 100644 data/layouts/Route104/layout.inc create mode 100644 data/layouts/Route104/map.bin create mode 100644 data/layouts/Route104_MrBrineysHouse/border.bin create mode 100644 data/layouts/Route104_MrBrineysHouse/layout.inc create mode 100644 data/layouts/Route104_MrBrineysHouse/map.bin create mode 100644 data/layouts/Route104_PrettyPetalFlowerShop/border.bin create mode 100644 data/layouts/Route104_PrettyPetalFlowerShop/layout.inc create mode 100644 data/layouts/Route104_PrettyPetalFlowerShop/map.bin create mode 100644 data/layouts/Route104_Prototype/border.bin create mode 100644 data/layouts/Route104_Prototype/layout.inc create mode 100644 data/layouts/Route104_Prototype/map.bin create mode 100644 data/layouts/Route105/border.bin create mode 100644 data/layouts/Route105/layout.inc create mode 100644 data/layouts/Route105/map.bin create mode 100644 data/layouts/Route106/border.bin create mode 100644 data/layouts/Route106/layout.inc create mode 100644 data/layouts/Route106/map.bin create mode 100644 data/layouts/Route107/border.bin create mode 100644 data/layouts/Route107/layout.inc create mode 100644 data/layouts/Route107/map.bin create mode 100644 data/layouts/Route108/border.bin create mode 100644 data/layouts/Route108/layout.inc create mode 100644 data/layouts/Route108/map.bin create mode 100644 data/layouts/Route109/border.bin create mode 100644 data/layouts/Route109/layout.inc create mode 100644 data/layouts/Route109/map.bin create mode 100644 data/layouts/Route109_SeashoreHouse/border.bin create mode 100644 data/layouts/Route109_SeashoreHouse/layout.inc create mode 100644 data/layouts/Route109_SeashoreHouse/map.bin create mode 100644 data/layouts/Route110/border.bin create mode 100644 data/layouts/Route110/layout.inc create mode 100644 data/layouts/Route110/map.bin create mode 100644 data/layouts/Route110_SeasideCyclingRoadEntrance/border.bin create mode 100644 data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc create mode 100644 data/layouts/Route110_SeasideCyclingRoadEntrance/map.bin create mode 100644 data/layouts/Route110_TrickHouseCorridor/border.bin create mode 100644 data/layouts/Route110_TrickHouseCorridor/layout.inc create mode 100644 data/layouts/Route110_TrickHouseCorridor/map.bin create mode 100644 data/layouts/Route110_TrickHouseEnd/border.bin create mode 100644 data/layouts/Route110_TrickHouseEnd/layout.inc create mode 100644 data/layouts/Route110_TrickHouseEnd/map.bin create mode 100644 data/layouts/Route110_TrickHouseEntrance/border.bin create mode 100644 data/layouts/Route110_TrickHouseEntrance/layout.inc create mode 100644 data/layouts/Route110_TrickHouseEntrance/map.bin create mode 100644 data/layouts/Route110_TrickHousePuzzle1/border.bin create mode 100644 data/layouts/Route110_TrickHousePuzzle1/layout.inc create mode 100644 data/layouts/Route110_TrickHousePuzzle1/map.bin create mode 100644 data/layouts/Route110_TrickHousePuzzle2/border.bin create mode 100644 data/layouts/Route110_TrickHousePuzzle2/layout.inc create mode 100644 data/layouts/Route110_TrickHousePuzzle2/map.bin create mode 100644 data/layouts/Route110_TrickHousePuzzle3/border.bin create mode 100644 data/layouts/Route110_TrickHousePuzzle3/layout.inc create mode 100644 data/layouts/Route110_TrickHousePuzzle3/map.bin create mode 100644 data/layouts/Route110_TrickHousePuzzle4/border.bin create mode 100644 data/layouts/Route110_TrickHousePuzzle4/layout.inc create mode 100644 data/layouts/Route110_TrickHousePuzzle4/map.bin create mode 100644 data/layouts/Route110_TrickHousePuzzle5/border.bin create mode 100644 data/layouts/Route110_TrickHousePuzzle5/layout.inc create mode 100644 data/layouts/Route110_TrickHousePuzzle5/map.bin create mode 100644 data/layouts/Route110_TrickHousePuzzle6/border.bin create mode 100644 data/layouts/Route110_TrickHousePuzzle6/layout.inc create mode 100644 data/layouts/Route110_TrickHousePuzzle6/map.bin create mode 100644 data/layouts/Route110_TrickHousePuzzle7/border.bin create mode 100644 data/layouts/Route110_TrickHousePuzzle7/layout.inc create mode 100644 data/layouts/Route110_TrickHousePuzzle7/map.bin create mode 100644 data/layouts/Route110_TrickHousePuzzle8/border.bin create mode 100644 data/layouts/Route110_TrickHousePuzzle8/layout.inc create mode 100644 data/layouts/Route110_TrickHousePuzzle8/map.bin create mode 100644 data/layouts/Route111/border.bin create mode 100644 data/layouts/Route111/layout.inc create mode 100644 data/layouts/Route111/map.bin create mode 100644 data/layouts/Route112/border.bin create mode 100644 data/layouts/Route112/layout.inc create mode 100644 data/layouts/Route112/map.bin create mode 100644 data/layouts/Route113/border.bin create mode 100644 data/layouts/Route113/layout.inc create mode 100644 data/layouts/Route113/map.bin create mode 100644 data/layouts/Route114/border.bin create mode 100644 data/layouts/Route114/layout.inc create mode 100644 data/layouts/Route114/map.bin create mode 100644 data/layouts/Route114_FossilManiacsHouse/border.bin create mode 100644 data/layouts/Route114_FossilManiacsHouse/layout.inc create mode 100644 data/layouts/Route114_FossilManiacsHouse/map.bin create mode 100644 data/layouts/Route114_FossilManiacsTunnel/border.bin create mode 100644 data/layouts/Route114_FossilManiacsTunnel/layout.inc create mode 100644 data/layouts/Route114_FossilManiacsTunnel/map.bin create mode 100644 data/layouts/Route114_LanettesHouse/border.bin create mode 100644 data/layouts/Route114_LanettesHouse/layout.inc create mode 100644 data/layouts/Route114_LanettesHouse/map.bin create mode 100644 data/layouts/Route115/border.bin create mode 100644 data/layouts/Route115/layout.inc create mode 100644 data/layouts/Route115/map.bin create mode 100644 data/layouts/Route116/border.bin create mode 100644 data/layouts/Route116/layout.inc create mode 100644 data/layouts/Route116/map.bin create mode 100644 data/layouts/Route116_TunnelersRestHouse/border.bin create mode 100644 data/layouts/Route116_TunnelersRestHouse/layout.inc create mode 100644 data/layouts/Route116_TunnelersRestHouse/map.bin create mode 100644 data/layouts/Route117/border.bin create mode 100644 data/layouts/Route117/layout.inc create mode 100644 data/layouts/Route117/map.bin create mode 100644 data/layouts/Route117_PokemonDayCare/border.bin create mode 100644 data/layouts/Route117_PokemonDayCare/layout.inc create mode 100644 data/layouts/Route117_PokemonDayCare/map.bin create mode 100644 data/layouts/Route118/border.bin create mode 100644 data/layouts/Route118/layout.inc create mode 100644 data/layouts/Route118/map.bin create mode 100644 data/layouts/Route119/border.bin create mode 100644 data/layouts/Route119/layout.inc create mode 100644 data/layouts/Route119/map.bin create mode 100644 data/layouts/Route119_WeatherInstitute_1F/border.bin create mode 100644 data/layouts/Route119_WeatherInstitute_1F/layout.inc create mode 100644 data/layouts/Route119_WeatherInstitute_1F/map.bin create mode 100644 data/layouts/Route119_WeatherInstitute_2F/border.bin create mode 100644 data/layouts/Route119_WeatherInstitute_2F/layout.inc create mode 100644 data/layouts/Route119_WeatherInstitute_2F/map.bin create mode 100644 data/layouts/Route120/border.bin create mode 100644 data/layouts/Route120/layout.inc create mode 100644 data/layouts/Route120/map.bin create mode 100644 data/layouts/Route121/border.bin create mode 100644 data/layouts/Route121/layout.inc create mode 100644 data/layouts/Route121/map.bin create mode 100644 data/layouts/Route121_SafariZoneEntrance/border.bin create mode 100644 data/layouts/Route121_SafariZoneEntrance/layout.inc create mode 100644 data/layouts/Route121_SafariZoneEntrance/map.bin create mode 100644 data/layouts/Route122/border.bin create mode 100644 data/layouts/Route122/layout.inc create mode 100644 data/layouts/Route122/map.bin create mode 100644 data/layouts/Route123/border.bin create mode 100644 data/layouts/Route123/layout.inc create mode 100644 data/layouts/Route123/map.bin create mode 100644 data/layouts/Route124/border.bin create mode 100644 data/layouts/Route124/layout.inc create mode 100644 data/layouts/Route124/map.bin create mode 100644 data/layouts/Route124_DivingTreasureHuntersHouse/border.bin create mode 100644 data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc create mode 100644 data/layouts/Route124_DivingTreasureHuntersHouse/map.bin create mode 100644 data/layouts/Route125/border.bin create mode 100644 data/layouts/Route125/layout.inc create mode 100644 data/layouts/Route125/map.bin create mode 100644 data/layouts/Route126/border.bin create mode 100644 data/layouts/Route126/layout.inc create mode 100644 data/layouts/Route126/map.bin create mode 100644 data/layouts/Route127/border.bin create mode 100644 data/layouts/Route127/layout.inc create mode 100644 data/layouts/Route127/map.bin create mode 100644 data/layouts/Route128/border.bin create mode 100644 data/layouts/Route128/layout.inc create mode 100644 data/layouts/Route128/map.bin create mode 100644 data/layouts/Route129/border.bin create mode 100644 data/layouts/Route129/layout.inc create mode 100644 data/layouts/Route129/map.bin create mode 100644 data/layouts/Route130/border.bin create mode 100644 data/layouts/Route130/layout.inc create mode 100644 data/layouts/Route130/map.bin create mode 100644 data/layouts/Route131/border.bin create mode 100644 data/layouts/Route131/layout.inc create mode 100644 data/layouts/Route131/map.bin create mode 100644 data/layouts/Route132/border.bin create mode 100644 data/layouts/Route132/layout.inc create mode 100644 data/layouts/Route132/map.bin create mode 100644 data/layouts/Route133/border.bin create mode 100644 data/layouts/Route133/layout.inc create mode 100644 data/layouts/Route133/map.bin create mode 100644 data/layouts/Route134/border.bin create mode 100644 data/layouts/Route134/layout.inc create mode 100644 data/layouts/Route134/map.bin create mode 100644 data/layouts/RustboroCity/border.bin create mode 100644 data/layouts/RustboroCity/layout.inc create mode 100644 data/layouts/RustboroCity/map.bin create mode 100644 data/layouts/RustboroCity_CuttersHouse/border.bin create mode 100644 data/layouts/RustboroCity_CuttersHouse/layout.inc create mode 100644 data/layouts/RustboroCity_CuttersHouse/map.bin create mode 100644 data/layouts/RustboroCity_DevonCorp_1F/border.bin create mode 100644 data/layouts/RustboroCity_DevonCorp_1F/layout.inc create mode 100644 data/layouts/RustboroCity_DevonCorp_1F/map.bin create mode 100644 data/layouts/RustboroCity_DevonCorp_2F/border.bin create mode 100644 data/layouts/RustboroCity_DevonCorp_2F/layout.inc create mode 100644 data/layouts/RustboroCity_DevonCorp_2F/map.bin create mode 100644 data/layouts/RustboroCity_DevonCorp_3F/border.bin create mode 100644 data/layouts/RustboroCity_DevonCorp_3F/layout.inc create mode 100644 data/layouts/RustboroCity_DevonCorp_3F/map.bin create mode 100644 data/layouts/RustboroCity_Flat1_1F/border.bin create mode 100644 data/layouts/RustboroCity_Flat1_1F/layout.inc create mode 100644 data/layouts/RustboroCity_Flat1_1F/map.bin create mode 100644 data/layouts/RustboroCity_Flat1_2F/border.bin create mode 100644 data/layouts/RustboroCity_Flat1_2F/layout.inc create mode 100644 data/layouts/RustboroCity_Flat1_2F/map.bin create mode 100644 data/layouts/RustboroCity_Flat2_1F/border.bin create mode 100644 data/layouts/RustboroCity_Flat2_1F/layout.inc create mode 100644 data/layouts/RustboroCity_Flat2_1F/map.bin create mode 100644 data/layouts/RustboroCity_Flat2_2F/border.bin create mode 100644 data/layouts/RustboroCity_Flat2_2F/layout.inc create mode 100644 data/layouts/RustboroCity_Flat2_2F/map.bin create mode 100644 data/layouts/RustboroCity_Flat2_3F/border.bin create mode 100644 data/layouts/RustboroCity_Flat2_3F/layout.inc create mode 100644 data/layouts/RustboroCity_Flat2_3F/map.bin create mode 100644 data/layouts/RustboroCity_Gym/border.bin create mode 100644 data/layouts/RustboroCity_Gym/layout.inc create mode 100644 data/layouts/RustboroCity_Gym/map.bin create mode 100644 data/layouts/RustboroCity_House/border.bin create mode 100644 data/layouts/RustboroCity_House/layout.inc create mode 100644 data/layouts/RustboroCity_House/map.bin create mode 100644 data/layouts/RustboroCity_House1/border.bin create mode 100644 data/layouts/RustboroCity_House1/layout.inc create mode 100644 data/layouts/RustboroCity_House1/map.bin create mode 100644 data/layouts/RustboroCity_PokemonSchool/border.bin create mode 100644 data/layouts/RustboroCity_PokemonSchool/layout.inc create mode 100644 data/layouts/RustboroCity_PokemonSchool/map.bin create mode 100644 data/layouts/RusturfTunnel/border.bin create mode 100644 data/layouts/RusturfTunnel/layout.inc create mode 100644 data/layouts/RusturfTunnel/map.bin create mode 100644 data/layouts/SSTidalCorridor/border.bin create mode 100644 data/layouts/SSTidalCorridor/layout.inc create mode 100644 data/layouts/SSTidalCorridor/map.bin create mode 100644 data/layouts/SSTidalLowerDeck/border.bin create mode 100644 data/layouts/SSTidalLowerDeck/layout.inc create mode 100644 data/layouts/SSTidalLowerDeck/map.bin create mode 100644 data/layouts/SSTidalRooms/border.bin create mode 100644 data/layouts/SSTidalRooms/layout.inc create mode 100644 data/layouts/SSTidalRooms/map.bin create mode 100644 data/layouts/SafariZone_North/border.bin create mode 100644 data/layouts/SafariZone_North/layout.inc create mode 100644 data/layouts/SafariZone_North/map.bin create mode 100644 data/layouts/SafariZone_Northeast/border.bin create mode 100644 data/layouts/SafariZone_Northeast/layout.inc create mode 100644 data/layouts/SafariZone_Northeast/map.bin create mode 100644 data/layouts/SafariZone_Northwest/border.bin create mode 100644 data/layouts/SafariZone_Northwest/layout.inc create mode 100644 data/layouts/SafariZone_Northwest/map.bin create mode 100644 data/layouts/SafariZone_RestHouse/border.bin create mode 100644 data/layouts/SafariZone_RestHouse/layout.inc create mode 100644 data/layouts/SafariZone_RestHouse/map.bin create mode 100644 data/layouts/SafariZone_South/border.bin create mode 100644 data/layouts/SafariZone_South/layout.inc create mode 100644 data/layouts/SafariZone_South/map.bin create mode 100644 data/layouts/SafariZone_Southeast/border.bin create mode 100644 data/layouts/SafariZone_Southeast/layout.inc create mode 100644 data/layouts/SafariZone_Southeast/map.bin create mode 100644 data/layouts/SafariZone_Southwest/border.bin create mode 100644 data/layouts/SafariZone_Southwest/layout.inc create mode 100644 data/layouts/SafariZone_Southwest/map.bin create mode 100644 data/layouts/ScorchedSlab/border.bin create mode 100644 data/layouts/ScorchedSlab/layout.inc create mode 100644 data/layouts/ScorchedSlab/map.bin create mode 100644 data/layouts/SeafloorCavern_Entrance/border.bin create mode 100644 data/layouts/SeafloorCavern_Entrance/layout.inc create mode 100644 data/layouts/SeafloorCavern_Entrance/map.bin create mode 100644 data/layouts/SeafloorCavern_Room1/border.bin create mode 100644 data/layouts/SeafloorCavern_Room1/layout.inc create mode 100644 data/layouts/SeafloorCavern_Room1/map.bin create mode 100644 data/layouts/SeafloorCavern_Room2/border.bin create mode 100644 data/layouts/SeafloorCavern_Room2/layout.inc create mode 100644 data/layouts/SeafloorCavern_Room2/map.bin create mode 100644 data/layouts/SeafloorCavern_Room3/border.bin create mode 100644 data/layouts/SeafloorCavern_Room3/layout.inc create mode 100644 data/layouts/SeafloorCavern_Room3/map.bin create mode 100644 data/layouts/SeafloorCavern_Room4/border.bin create mode 100644 data/layouts/SeafloorCavern_Room4/layout.inc create mode 100644 data/layouts/SeafloorCavern_Room4/map.bin create mode 100644 data/layouts/SeafloorCavern_Room5/border.bin create mode 100644 data/layouts/SeafloorCavern_Room5/layout.inc create mode 100644 data/layouts/SeafloorCavern_Room5/map.bin create mode 100644 data/layouts/SeafloorCavern_Room6/border.bin create mode 100644 data/layouts/SeafloorCavern_Room6/layout.inc create mode 100644 data/layouts/SeafloorCavern_Room6/map.bin create mode 100644 data/layouts/SeafloorCavern_Room7/border.bin create mode 100644 data/layouts/SeafloorCavern_Room7/layout.inc create mode 100644 data/layouts/SeafloorCavern_Room7/map.bin create mode 100644 data/layouts/SeafloorCavern_Room8/border.bin create mode 100644 data/layouts/SeafloorCavern_Room8/layout.inc create mode 100644 data/layouts/SeafloorCavern_Room8/map.bin create mode 100644 data/layouts/SeafloorCavern_Room9/border.bin create mode 100644 data/layouts/SeafloorCavern_Room9/layout.inc create mode 100644 data/layouts/SeafloorCavern_Room9/map.bin create mode 100644 data/layouts/SealedChamber_InnerRoom/border.bin create mode 100644 data/layouts/SealedChamber_InnerRoom/layout.inc create mode 100644 data/layouts/SealedChamber_InnerRoom/map.bin create mode 100644 data/layouts/SealedChamber_OuterRoom/border.bin create mode 100644 data/layouts/SealedChamber_OuterRoom/layout.inc create mode 100644 data/layouts/SealedChamber_OuterRoom/map.bin create mode 100644 data/layouts/SecretBase_BlueCave1/border.bin create mode 100644 data/layouts/SecretBase_BlueCave1/layout.inc create mode 100644 data/layouts/SecretBase_BlueCave1/map.bin create mode 100644 data/layouts/SecretBase_BlueCave2/border.bin create mode 100644 data/layouts/SecretBase_BlueCave2/layout.inc create mode 100644 data/layouts/SecretBase_BlueCave2/map.bin create mode 100644 data/layouts/SecretBase_BlueCave3/border.bin create mode 100644 data/layouts/SecretBase_BlueCave3/layout.inc create mode 100644 data/layouts/SecretBase_BlueCave3/map.bin create mode 100644 data/layouts/SecretBase_BlueCave4/border.bin create mode 100644 data/layouts/SecretBase_BlueCave4/layout.inc create mode 100644 data/layouts/SecretBase_BlueCave4/map.bin create mode 100644 data/layouts/SecretBase_BrownCave1/border.bin create mode 100644 data/layouts/SecretBase_BrownCave1/layout.inc create mode 100644 data/layouts/SecretBase_BrownCave1/map.bin create mode 100644 data/layouts/SecretBase_BrownCave2/border.bin create mode 100644 data/layouts/SecretBase_BrownCave2/layout.inc create mode 100644 data/layouts/SecretBase_BrownCave2/map.bin create mode 100644 data/layouts/SecretBase_BrownCave3/border.bin create mode 100644 data/layouts/SecretBase_BrownCave3/layout.inc create mode 100644 data/layouts/SecretBase_BrownCave3/map.bin create mode 100644 data/layouts/SecretBase_BrownCave4/border.bin create mode 100644 data/layouts/SecretBase_BrownCave4/layout.inc create mode 100644 data/layouts/SecretBase_BrownCave4/map.bin create mode 100644 data/layouts/SecretBase_RedCave1/border.bin create mode 100644 data/layouts/SecretBase_RedCave1/layout.inc create mode 100644 data/layouts/SecretBase_RedCave1/map.bin create mode 100644 data/layouts/SecretBase_RedCave2/border.bin create mode 100644 data/layouts/SecretBase_RedCave2/layout.inc create mode 100644 data/layouts/SecretBase_RedCave2/map.bin create mode 100644 data/layouts/SecretBase_RedCave3/border.bin create mode 100644 data/layouts/SecretBase_RedCave3/layout.inc create mode 100644 data/layouts/SecretBase_RedCave3/map.bin create mode 100644 data/layouts/SecretBase_RedCave4/border.bin create mode 100644 data/layouts/SecretBase_RedCave4/layout.inc create mode 100644 data/layouts/SecretBase_RedCave4/map.bin create mode 100644 data/layouts/SecretBase_Shrub1/border.bin create mode 100644 data/layouts/SecretBase_Shrub1/layout.inc create mode 100644 data/layouts/SecretBase_Shrub1/map.bin create mode 100644 data/layouts/SecretBase_Shrub2/border.bin create mode 100644 data/layouts/SecretBase_Shrub2/layout.inc create mode 100644 data/layouts/SecretBase_Shrub2/map.bin create mode 100644 data/layouts/SecretBase_Shrub3/border.bin create mode 100644 data/layouts/SecretBase_Shrub3/layout.inc create mode 100644 data/layouts/SecretBase_Shrub3/map.bin create mode 100644 data/layouts/SecretBase_Shrub4/border.bin create mode 100644 data/layouts/SecretBase_Shrub4/layout.inc create mode 100644 data/layouts/SecretBase_Shrub4/map.bin create mode 100644 data/layouts/SecretBase_Tree1/border.bin create mode 100644 data/layouts/SecretBase_Tree1/layout.inc create mode 100644 data/layouts/SecretBase_Tree1/map.bin create mode 100644 data/layouts/SecretBase_Tree2/border.bin create mode 100644 data/layouts/SecretBase_Tree2/layout.inc create mode 100644 data/layouts/SecretBase_Tree2/map.bin create mode 100644 data/layouts/SecretBase_Tree3/border.bin create mode 100644 data/layouts/SecretBase_Tree3/layout.inc create mode 100644 data/layouts/SecretBase_Tree3/map.bin create mode 100644 data/layouts/SecretBase_Tree4/border.bin create mode 100644 data/layouts/SecretBase_Tree4/layout.inc create mode 100644 data/layouts/SecretBase_Tree4/map.bin create mode 100644 data/layouts/SecretBase_YellowCave1/border.bin create mode 100644 data/layouts/SecretBase_YellowCave1/layout.inc create mode 100644 data/layouts/SecretBase_YellowCave1/map.bin create mode 100644 data/layouts/SecretBase_YellowCave2/border.bin create mode 100644 data/layouts/SecretBase_YellowCave2/layout.inc create mode 100644 data/layouts/SecretBase_YellowCave2/map.bin create mode 100644 data/layouts/SecretBase_YellowCave3/border.bin create mode 100644 data/layouts/SecretBase_YellowCave3/layout.inc create mode 100644 data/layouts/SecretBase_YellowCave3/map.bin create mode 100644 data/layouts/SecretBase_YellowCave4/border.bin create mode 100644 data/layouts/SecretBase_YellowCave4/layout.inc create mode 100644 data/layouts/SecretBase_YellowCave4/map.bin create mode 100644 data/layouts/ShoalCave_HighTideEntranceRoom/border.bin create mode 100644 data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc create mode 100644 data/layouts/ShoalCave_HighTideEntranceRoom/map.bin create mode 100644 data/layouts/ShoalCave_HighTideInnerRoom/border.bin create mode 100644 data/layouts/ShoalCave_HighTideInnerRoom/layout.inc create mode 100644 data/layouts/ShoalCave_HighTideInnerRoom/map.bin create mode 100644 data/layouts/ShoalCave_LowTideEntranceRoom/border.bin create mode 100644 data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc create mode 100644 data/layouts/ShoalCave_LowTideEntranceRoom/map.bin create mode 100644 data/layouts/ShoalCave_LowTideIceRoom/border.bin create mode 100644 data/layouts/ShoalCave_LowTideIceRoom/layout.inc create mode 100644 data/layouts/ShoalCave_LowTideIceRoom/map.bin create mode 100644 data/layouts/ShoalCave_LowTideInnerRoom/border.bin create mode 100644 data/layouts/ShoalCave_LowTideInnerRoom/layout.inc create mode 100644 data/layouts/ShoalCave_LowTideInnerRoom/map.bin create mode 100644 data/layouts/ShoalCave_LowTideLowerRoom/border.bin create mode 100644 data/layouts/ShoalCave_LowTideLowerRoom/layout.inc create mode 100644 data/layouts/ShoalCave_LowTideLowerRoom/map.bin create mode 100644 data/layouts/ShoalCave_LowTideStairsRoom/border.bin create mode 100644 data/layouts/ShoalCave_LowTideStairsRoom/layout.inc create mode 100644 data/layouts/ShoalCave_LowTideStairsRoom/map.bin create mode 100644 data/layouts/SingleBattleColosseum/border.bin create mode 100644 data/layouts/SingleBattleColosseum/layout.inc create mode 100644 data/layouts/SingleBattleColosseum/map.bin create mode 100644 data/layouts/SkyPillar_1F/border.bin create mode 100644 data/layouts/SkyPillar_1F/layout.inc create mode 100644 data/layouts/SkyPillar_1F/map.bin create mode 100644 data/layouts/SkyPillar_2F/border.bin create mode 100644 data/layouts/SkyPillar_2F/layout.inc create mode 100644 data/layouts/SkyPillar_2F/map.bin create mode 100644 data/layouts/SkyPillar_3F/border.bin create mode 100644 data/layouts/SkyPillar_3F/layout.inc create mode 100644 data/layouts/SkyPillar_3F/map.bin create mode 100644 data/layouts/SkyPillar_4F/border.bin create mode 100644 data/layouts/SkyPillar_4F/layout.inc create mode 100644 data/layouts/SkyPillar_4F/map.bin create mode 100644 data/layouts/SkyPillar_5F/border.bin create mode 100644 data/layouts/SkyPillar_5F/layout.inc create mode 100644 data/layouts/SkyPillar_5F/map.bin create mode 100644 data/layouts/SkyPillar_Entrance/border.bin create mode 100644 data/layouts/SkyPillar_Entrance/layout.inc create mode 100644 data/layouts/SkyPillar_Entrance/map.bin create mode 100644 data/layouts/SkyPillar_Outside/border.bin create mode 100644 data/layouts/SkyPillar_Outside/layout.inc create mode 100644 data/layouts/SkyPillar_Outside/map.bin create mode 100644 data/layouts/SkyPillar_Top/border.bin create mode 100644 data/layouts/SkyPillar_Top/layout.inc create mode 100644 data/layouts/SkyPillar_Top/map.bin create mode 100644 data/layouts/SlateportCity/border.bin create mode 100644 data/layouts/SlateportCity/layout.inc create mode 100644 data/layouts/SlateportCity/map.bin create mode 100644 data/layouts/SlateportCity_OceanicMuseum_1F/border.bin create mode 100644 data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc create mode 100644 data/layouts/SlateportCity_OceanicMuseum_1F/map.bin create mode 100644 data/layouts/SlateportCity_OceanicMuseum_2F/border.bin create mode 100644 data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc create mode 100644 data/layouts/SlateportCity_OceanicMuseum_2F/map.bin create mode 100644 data/layouts/SlateportCity_PokemonFanClub/border.bin create mode 100644 data/layouts/SlateportCity_PokemonFanClub/layout.inc create mode 100644 data/layouts/SlateportCity_PokemonFanClub/map.bin create mode 100644 data/layouts/SlateportCity_SternsShipyard_1F/border.bin create mode 100644 data/layouts/SlateportCity_SternsShipyard_1F/layout.inc create mode 100644 data/layouts/SlateportCity_SternsShipyard_1F/map.bin create mode 100644 data/layouts/SlateportCity_SternsShipyard_2F/border.bin create mode 100644 data/layouts/SlateportCity_SternsShipyard_2F/layout.inc create mode 100644 data/layouts/SlateportCity_SternsShipyard_2F/map.bin create mode 100644 data/layouts/SootopolisCity/border.bin create mode 100644 data/layouts/SootopolisCity/layout.inc create mode 100644 data/layouts/SootopolisCity/map.bin create mode 100644 data/layouts/SootopolisCity_Gym_1F/border.bin create mode 100644 data/layouts/SootopolisCity_Gym_1F/layout.inc create mode 100644 data/layouts/SootopolisCity_Gym_1F/map.bin create mode 100644 data/layouts/SootopolisCity_Gym_B1F/border.bin create mode 100644 data/layouts/SootopolisCity_Gym_B1F/layout.inc create mode 100644 data/layouts/SootopolisCity_Gym_B1F/map.bin create mode 100644 data/layouts/SootopolisCity_House1/border.bin create mode 100644 data/layouts/SootopolisCity_House1/layout.inc create mode 100644 data/layouts/SootopolisCity_House1/map.bin create mode 100644 data/layouts/SootopolisCity_House2/border.bin create mode 100644 data/layouts/SootopolisCity_House2/layout.inc create mode 100644 data/layouts/SootopolisCity_House2/map.bin create mode 100644 data/layouts/SootopolisCity_House3/border.bin create mode 100644 data/layouts/SootopolisCity_House3/layout.inc create mode 100644 data/layouts/SootopolisCity_House3/map.bin create mode 100644 data/layouts/SootopolisCity_LotadAndSeedotHouse/border.bin create mode 100644 data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc create mode 100644 data/layouts/SootopolisCity_LotadAndSeedotHouse/map.bin create mode 100644 data/layouts/SootopolisCity_MysteryEventsHouse_1F/border.bin create mode 100644 data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc create mode 100644 data/layouts/SootopolisCity_MysteryEventsHouse_1F/map.bin create mode 100644 data/layouts/SootopolisCity_MysteryEventsHouse_B1F/border.bin create mode 100644 data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc create mode 100644 data/layouts/SootopolisCity_MysteryEventsHouse_B1F/map.bin create mode 100644 data/layouts/SouthernIsland_Exterior/border.bin create mode 100644 data/layouts/SouthernIsland_Exterior/layout.inc create mode 100644 data/layouts/SouthernIsland_Exterior/map.bin create mode 100644 data/layouts/SouthernIsland_Interior/border.bin create mode 100644 data/layouts/SouthernIsland_Interior/layout.inc create mode 100644 data/layouts/SouthernIsland_Interior/map.bin create mode 100644 data/layouts/TerraCave_End/border.bin create mode 100644 data/layouts/TerraCave_End/layout.inc create mode 100644 data/layouts/TerraCave_End/map.bin create mode 100644 data/layouts/TerraCave_Entrance/border.bin create mode 100644 data/layouts/TerraCave_Entrance/layout.inc create mode 100644 data/layouts/TerraCave_Entrance/map.bin create mode 100644 data/layouts/TradeCenter/border.bin create mode 100644 data/layouts/TradeCenter/layout.inc create mode 100644 data/layouts/TradeCenter/map.bin create mode 100644 data/layouts/TrainerHill_1F/border.bin create mode 100644 data/layouts/TrainerHill_1F/layout.inc create mode 100644 data/layouts/TrainerHill_1F/map.bin create mode 100644 data/layouts/TrainerHill_2F/border.bin create mode 100644 data/layouts/TrainerHill_2F/layout.inc create mode 100644 data/layouts/TrainerHill_2F/map.bin create mode 100644 data/layouts/TrainerHill_3F/border.bin create mode 100644 data/layouts/TrainerHill_3F/layout.inc create mode 100644 data/layouts/TrainerHill_3F/map.bin create mode 100644 data/layouts/TrainerHill_4F/border.bin create mode 100644 data/layouts/TrainerHill_4F/layout.inc create mode 100644 data/layouts/TrainerHill_4F/map.bin create mode 100644 data/layouts/TrainerHill_Entrance/border.bin create mode 100644 data/layouts/TrainerHill_Entrance/layout.inc create mode 100644 data/layouts/TrainerHill_Entrance/map.bin create mode 100644 data/layouts/TrainerHill_Roof/border.bin create mode 100644 data/layouts/TrainerHill_Roof/layout.inc create mode 100644 data/layouts/TrainerHill_Roof/map.bin create mode 100644 data/layouts/Underwater1/border.bin create mode 100644 data/layouts/Underwater1/layout.inc create mode 100644 data/layouts/Underwater1/map.bin create mode 100644 data/layouts/Underwater2/border.bin create mode 100644 data/layouts/Underwater2/layout.inc create mode 100644 data/layouts/Underwater2/map.bin create mode 100644 data/layouts/Underwater3/border.bin create mode 100644 data/layouts/Underwater3/layout.inc create mode 100644 data/layouts/Underwater3/map.bin create mode 100644 data/layouts/Underwater4/border.bin create mode 100644 data/layouts/Underwater4/layout.inc create mode 100644 data/layouts/Underwater4/map.bin create mode 100644 data/layouts/Underwater5/border.bin create mode 100644 data/layouts/Underwater5/layout.inc create mode 100644 data/layouts/Underwater5/map.bin create mode 100644 data/layouts/Underwater6/border.bin create mode 100644 data/layouts/Underwater6/layout.inc create mode 100644 data/layouts/Underwater6/map.bin create mode 100644 data/layouts/Underwater7/border.bin create mode 100644 data/layouts/Underwater7/layout.inc create mode 100644 data/layouts/Underwater7/map.bin create mode 100644 data/layouts/Underwater_MarineCave/border.bin create mode 100644 data/layouts/Underwater_MarineCave/layout.inc create mode 100644 data/layouts/Underwater_MarineCave/map.bin create mode 100644 data/layouts/Underwater_Route134/border.bin create mode 100644 data/layouts/Underwater_Route134/layout.inc create mode 100644 data/layouts/Underwater_Route134/map.bin create mode 100644 data/layouts/Underwater_SeafloorCavern/border.bin create mode 100644 data/layouts/Underwater_SeafloorCavern/layout.inc create mode 100644 data/layouts/Underwater_SeafloorCavern/map.bin create mode 100644 data/layouts/Underwater_SealedChamber/border.bin create mode 100644 data/layouts/Underwater_SealedChamber/layout.inc create mode 100644 data/layouts/Underwater_SealedChamber/map.bin create mode 100644 data/layouts/Underwater_SootopolisCity/border.bin create mode 100644 data/layouts/Underwater_SootopolisCity/layout.inc create mode 100644 data/layouts/Underwater_SootopolisCity/map.bin create mode 100644 data/layouts/UnionRoom/border.bin create mode 100644 data/layouts/UnionRoom/layout.inc create mode 100644 data/layouts/UnionRoom/map.bin create mode 100644 data/layouts/UnknownMap_08417FC4/border.bin create mode 100644 data/layouts/UnknownMap_08417FC4/layout.inc create mode 100644 data/layouts/UnknownMap_08417FC4/map.bin create mode 100644 data/layouts/UnknownMap_08428450/border.bin create mode 100644 data/layouts/UnknownMap_08428450/layout.inc create mode 100644 data/layouts/UnknownMap_08428450/map.bin create mode 100644 data/layouts/UnknownMap_084294C4/border.bin create mode 100644 data/layouts/UnknownMap_084294C4/layout.inc create mode 100644 data/layouts/UnknownMap_084294C4/map.bin create mode 100644 data/layouts/UnknownMap_084294E8/border.bin create mode 100644 data/layouts/UnknownMap_084294E8/layout.inc create mode 100644 data/layouts/UnknownMap_084294E8/map.bin create mode 100644 data/layouts/UnknownMap_0843E6C0/border.bin create mode 100644 data/layouts/UnknownMap_0843E6C0/layout.inc create mode 100644 data/layouts/UnknownMap_0843E6C0/map.bin create mode 100644 data/layouts/UnknownMap_0843E6E4/border.bin create mode 100644 data/layouts/UnknownMap_0843E6E4/layout.inc create mode 100644 data/layouts/UnknownMap_0843E6E4/map.bin create mode 100644 data/layouts/UnknownMap_0843E708/border.bin create mode 100644 data/layouts/UnknownMap_0843E708/layout.inc create mode 100644 data/layouts/UnknownMap_0843E708/map.bin create mode 100644 data/layouts/UnknownMap_0843E72C/border.bin create mode 100644 data/layouts/UnknownMap_0843E72C/layout.inc create mode 100644 data/layouts/UnknownMap_0843E72C/map.bin create mode 100644 data/layouts/UnknownMap_0843E750/border.bin create mode 100644 data/layouts/UnknownMap_0843E750/layout.inc create mode 100644 data/layouts/UnknownMap_0843E750/map.bin create mode 100644 data/layouts/UnknownMap_0843E774/border.bin create mode 100644 data/layouts/UnknownMap_0843E774/layout.inc create mode 100644 data/layouts/UnknownMap_0843E774/map.bin create mode 100644 data/layouts/UnknownMap_0843E798/border.bin create mode 100644 data/layouts/UnknownMap_0843E798/layout.inc create mode 100644 data/layouts/UnknownMap_0843E798/map.bin create mode 100644 data/layouts/UnknownMap_0843E7BC/border.bin create mode 100644 data/layouts/UnknownMap_0843E7BC/layout.inc create mode 100644 data/layouts/UnknownMap_0843E7BC/map.bin create mode 100644 data/layouts/UnknownMap_0843E7E0/border.bin create mode 100644 data/layouts/UnknownMap_0843E7E0/layout.inc create mode 100644 data/layouts/UnknownMap_0843E7E0/map.bin create mode 100644 data/layouts/UnknownMap_0843E804/border.bin create mode 100644 data/layouts/UnknownMap_0843E804/layout.inc create mode 100644 data/layouts/UnknownMap_0843E804/map.bin create mode 100644 data/layouts/UnknownMap_0843E828/border.bin create mode 100644 data/layouts/UnknownMap_0843E828/layout.inc create mode 100644 data/layouts/UnknownMap_0843E828/map.bin create mode 100644 data/layouts/UnknownMap_0843E84C/border.bin create mode 100644 data/layouts/UnknownMap_0843E84C/layout.inc create mode 100644 data/layouts/UnknownMap_0843E84C/map.bin create mode 100644 data/layouts/UnknownMap_0843E870/border.bin create mode 100644 data/layouts/UnknownMap_0843E870/layout.inc create mode 100644 data/layouts/UnknownMap_0843E870/map.bin create mode 100644 data/layouts/UnknownMap_0843E894/border.bin create mode 100755 data/layouts/UnknownMap_0843E894/layout.inc create mode 100644 data/layouts/UnknownMap_0843E894/map.bin create mode 100644 data/layouts/UnknownMap_08447028/border.bin create mode 100644 data/layouts/UnknownMap_08447028/layout.inc create mode 100644 data/layouts/UnknownMap_08447028/map.bin create mode 100644 data/layouts/UnknownMap_0845A394/border.bin create mode 100644 data/layouts/UnknownMap_0845A394/layout.inc create mode 100644 data/layouts/UnknownMap_0845A394/map.bin create mode 100644 data/layouts/UnknownMap_0845D470/border.bin create mode 100644 data/layouts/UnknownMap_0845D470/layout.inc create mode 100644 data/layouts/UnknownMap_0845D470/map.bin create mode 100644 data/layouts/UnknownMap_0845ECB4/border.bin create mode 100644 data/layouts/UnknownMap_0845ECB4/layout.inc create mode 100644 data/layouts/UnknownMap_0845ECB4/map.bin create mode 100644 data/layouts/UnknownMap_08469200/border.bin create mode 100644 data/layouts/UnknownMap_08469200/layout.inc create mode 100644 data/layouts/UnknownMap_08469200/map.bin create mode 100644 data/layouts/UnknownMap_084693AC/border.bin create mode 100644 data/layouts/UnknownMap_084693AC/layout.inc create mode 100644 data/layouts/UnknownMap_084693AC/map.bin create mode 100644 data/layouts/UnknownMap_08470BD8/border.bin create mode 100644 data/layouts/UnknownMap_08470BD8/layout.inc create mode 100644 data/layouts/UnknownMap_08470BD8/map.bin create mode 100644 data/layouts/UnknownMap_08480DAC/border.bin create mode 100644 data/layouts/UnknownMap_08480DAC/layout.inc create mode 100644 data/layouts/UnknownMap_08480DAC/map.bin create mode 100644 data/layouts/UnknownMap_08480F54/border.bin create mode 100644 data/layouts/UnknownMap_08480F54/layout.inc create mode 100644 data/layouts/UnknownMap_08480F54/map.bin create mode 100644 data/layouts/UnknownMap_084810FC/border.bin create mode 100644 data/layouts/UnknownMap_084810FC/layout.inc create mode 100644 data/layouts/UnknownMap_084810FC/map.bin create mode 100644 data/layouts/UnknownMap_084812A4/border.bin create mode 100644 data/layouts/UnknownMap_084812A4/layout.inc create mode 100644 data/layouts/UnknownMap_084812A4/map.bin create mode 100644 data/layouts/UnknownMap_0848144C/border.bin create mode 100644 data/layouts/UnknownMap_0848144C/layout.inc create mode 100644 data/layouts/UnknownMap_0848144C/map.bin create mode 100644 data/layouts/UnknownMap_084815F4/border.bin create mode 100644 data/layouts/UnknownMap_084815F4/layout.inc create mode 100644 data/layouts/UnknownMap_084815F4/map.bin create mode 100644 data/layouts/UnknownMap_08481B24/border.bin create mode 100644 data/layouts/UnknownMap_08481B24/layout.inc create mode 100644 data/layouts/UnknownMap_08481B24/map.bin create mode 100644 data/layouts/UnknownMap_08481DBC/border.bin create mode 100644 data/layouts/UnknownMap_08481DBC/layout.inc create mode 100644 data/layouts/UnknownMap_08481DBC/map.bin create mode 100644 data/layouts/UnknownMap_25_29/border.bin create mode 100644 data/layouts/UnknownMap_25_29/layout.inc create mode 100644 data/layouts/UnknownMap_25_29/map.bin create mode 100644 data/layouts/UnknownMap_25_30/border.bin create mode 100644 data/layouts/UnknownMap_25_30/layout.inc create mode 100644 data/layouts/UnknownMap_25_30/map.bin create mode 100644 data/layouts/UnknownMap_25_31/border.bin create mode 100644 data/layouts/UnknownMap_25_31/layout.inc create mode 100644 data/layouts/UnknownMap_25_31/map.bin create mode 100644 data/layouts/UnknownMap_25_32/border.bin create mode 100644 data/layouts/UnknownMap_25_32/layout.inc create mode 100644 data/layouts/UnknownMap_25_32/map.bin create mode 100644 data/layouts/UnknownMap_25_33/border.bin create mode 100644 data/layouts/UnknownMap_25_33/layout.inc create mode 100644 data/layouts/UnknownMap_25_33/map.bin create mode 100644 data/layouts/UnknownMap_25_34/border.bin create mode 100644 data/layouts/UnknownMap_25_34/layout.inc create mode 100644 data/layouts/UnknownMap_25_34/map.bin create mode 100644 data/layouts/VerdanturfTown/border.bin create mode 100644 data/layouts/VerdanturfTown/layout.inc create mode 100644 data/layouts/VerdanturfTown/map.bin create mode 100644 data/layouts/VerdanturfTown_BattleTentBattleRoom/border.bin create mode 100644 data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc create mode 100644 data/layouts/VerdanturfTown_BattleTentBattleRoom/map.bin create mode 100644 data/layouts/VerdanturfTown_WandasHouse/border.bin create mode 100644 data/layouts/VerdanturfTown_WandasHouse/layout.inc create mode 100644 data/layouts/VerdanturfTown_WandasHouse/map.bin create mode 100644 data/layouts/VictoryRoad_1F/border.bin create mode 100644 data/layouts/VictoryRoad_1F/layout.inc create mode 100644 data/layouts/VictoryRoad_1F/map.bin create mode 100644 data/layouts/VictoryRoad_B1F/border.bin create mode 100644 data/layouts/VictoryRoad_B1F/layout.inc create mode 100644 data/layouts/VictoryRoad_B1F/map.bin create mode 100644 data/layouts/VictoryRoad_B2F/border.bin create mode 100644 data/layouts/VictoryRoad_B2F/layout.inc create mode 100644 data/layouts/VictoryRoad_B2F/map.bin create mode 100644 data/layouts_table.inc delete mode 100644 data/maps/AbandonedShip_CaptainsOffice/border.bin delete mode 100644 data/maps/AbandonedShip_CaptainsOffice/map.bin delete mode 100644 data/maps/AbandonedShip_Corridors_1F/border.bin delete mode 100644 data/maps/AbandonedShip_Corridors_1F/map.bin delete mode 100644 data/maps/AbandonedShip_Corridors_B1F/border.bin delete mode 100644 data/maps/AbandonedShip_Corridors_B1F/map.bin delete mode 100644 data/maps/AbandonedShip_Deck/border.bin delete mode 100644 data/maps/AbandonedShip_Deck/map.bin delete mode 100644 data/maps/AbandonedShip_HiddenFloorCorridors/border.bin delete mode 100644 data/maps/AbandonedShip_HiddenFloorCorridors/map.bin delete mode 100644 data/maps/AbandonedShip_HiddenFloorRooms/border.bin delete mode 100644 data/maps/AbandonedShip_HiddenFloorRooms/map.bin delete mode 100644 data/maps/AbandonedShip_Room_B1F/border.bin delete mode 100644 data/maps/AbandonedShip_Room_B1F/map.bin delete mode 100644 data/maps/AbandonedShip_Rooms2_1F/border.bin delete mode 100644 data/maps/AbandonedShip_Rooms2_1F/map.bin delete mode 100644 data/maps/AbandonedShip_Rooms2_B1F/border.bin delete mode 100644 data/maps/AbandonedShip_Rooms2_B1F/map.bin delete mode 100644 data/maps/AbandonedShip_Rooms_1F/border.bin delete mode 100644 data/maps/AbandonedShip_Rooms_1F/map.bin delete mode 100644 data/maps/AbandonedShip_Rooms_B1F/border.bin delete mode 100644 data/maps/AbandonedShip_Rooms_B1F/map.bin delete mode 100644 data/maps/AbandonedShip_Underwater1/border.bin delete mode 100644 data/maps/AbandonedShip_Underwater1/map.bin delete mode 100644 data/maps/AbandonedShip_Underwater2/border.bin delete mode 100644 data/maps/AbandonedShip_Underwater2/map.bin delete mode 100644 data/maps/AlteringCave/border.bin delete mode 100644 data/maps/AlteringCave/map.bin delete mode 100644 data/maps/AncientTomb/border.bin delete mode 100644 data/maps/AncientTomb/map.bin delete mode 100644 data/maps/AquaHideout_1F/border.bin delete mode 100644 data/maps/AquaHideout_1F/map.bin delete mode 100644 data/maps/AquaHideout_B1F/border.bin delete mode 100644 data/maps/AquaHideout_B1F/map.bin delete mode 100644 data/maps/AquaHideout_B2F/border.bin delete mode 100644 data/maps/AquaHideout_B2F/map.bin delete mode 100644 data/maps/AquaHideout_UnusedRubyMap1/border.bin delete mode 100644 data/maps/AquaHideout_UnusedRubyMap1/map.bin delete mode 100644 data/maps/AquaHideout_UnusedRubyMap2/border.bin delete mode 100644 data/maps/AquaHideout_UnusedRubyMap2/map.bin delete mode 100644 data/maps/AquaHideout_UnusedRubyMap3/border.bin delete mode 100644 data/maps/AquaHideout_UnusedRubyMap3/map.bin delete mode 100644 data/maps/ArtisanCave_1F/border.bin delete mode 100644 data/maps/ArtisanCave_1F/map.bin delete mode 100644 data/maps/ArtisanCave_B1F/border.bin delete mode 100644 data/maps/ArtisanCave_B1F/map.bin delete mode 100644 data/maps/BattleFrontier_BattleArenaBattleRoom/border.bin delete mode 100644 data/maps/BattleFrontier_BattleArenaBattleRoom/map.bin delete mode 100644 data/maps/BattleFrontier_BattleArenaCorridor/border.bin delete mode 100644 data/maps/BattleFrontier_BattleArenaCorridor/map.bin delete mode 100644 data/maps/BattleFrontier_BattleArenaLobby/border.bin delete mode 100644 data/maps/BattleFrontier_BattleArenaLobby/map.bin delete mode 100644 data/maps/BattleFrontier_BattleDomeBattleRoom/border.bin delete mode 100644 data/maps/BattleFrontier_BattleDomeBattleRoom/map.bin delete mode 100644 data/maps/BattleFrontier_BattleDomeCorridor/border.bin delete mode 100644 data/maps/BattleFrontier_BattleDomeCorridor/map.bin delete mode 100644 data/maps/BattleFrontier_BattleDomeLobby/border.bin delete mode 100644 data/maps/BattleFrontier_BattleDomeLobby/map.bin delete mode 100644 data/maps/BattleFrontier_BattleDomePreBattleRoom/border.bin delete mode 100644 data/maps/BattleFrontier_BattleDomePreBattleRoom/map.bin delete mode 100644 data/maps/BattleFrontier_BattleFactoryBattleRoom/border.bin delete mode 100644 data/maps/BattleFrontier_BattleFactoryBattleRoom/map.bin delete mode 100644 data/maps/BattleFrontier_BattleFactoryLobby/border.bin delete mode 100644 data/maps/BattleFrontier_BattleFactoryLobby/map.bin delete mode 100644 data/maps/BattleFrontier_BattleFactoryPreBattleRoom/border.bin delete mode 100644 data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.bin delete mode 100644 data/maps/BattleFrontier_BattlePalaceBattleRoom/border.bin delete mode 100644 data/maps/BattleFrontier_BattlePalaceBattleRoom/map.bin delete mode 100644 data/maps/BattleFrontier_BattlePalaceCorridor/border.bin delete mode 100644 data/maps/BattleFrontier_BattlePalaceCorridor/map.bin delete mode 100644 data/maps/BattleFrontier_BattlePalaceLobby/border.bin delete mode 100644 data/maps/BattleFrontier_BattlePalaceLobby/map.bin delete mode 100644 data/maps/BattleFrontier_BattlePikeCorridor/border.bin delete mode 100644 data/maps/BattleFrontier_BattlePikeCorridor/map.bin delete mode 100644 data/maps/BattleFrontier_BattlePikeLobby/border.bin delete mode 100644 data/maps/BattleFrontier_BattlePikeLobby/map.bin delete mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom1/border.bin delete mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom1/map.bin delete mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom2/border.bin delete mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom2/map.bin delete mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom3/border.bin delete mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom3/map.bin delete mode 100644 data/maps/BattleFrontier_BattlePikeThreePathRoom/border.bin delete mode 100644 data/maps/BattleFrontier_BattlePikeThreePathRoom/map.bin delete mode 100644 data/maps/BattleFrontier_BattlePointExchangeServiceCorner/border.bin delete mode 100644 data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.bin delete mode 100644 data/maps/BattleFrontier_BattlePyramidEmptySquare/border.bin delete mode 100644 data/maps/BattleFrontier_BattlePyramidEmptySquare/map.bin delete mode 100644 data/maps/BattleFrontier_BattlePyramidLobby/border.bin delete mode 100644 data/maps/BattleFrontier_BattlePyramidLobby/map.bin delete mode 100644 data/maps/BattleFrontier_BattlePyramidTop/border.bin delete mode 100644 data/maps/BattleFrontier_BattlePyramidTop/map.bin delete mode 100644 data/maps/BattleFrontier_BattleTowerBattleRoom/border.bin delete mode 100644 data/maps/BattleFrontier_BattleTowerBattleRoom/map.bin delete mode 100644 data/maps/BattleFrontier_BattleTowerCorridor/border.bin delete mode 100644 data/maps/BattleFrontier_BattleTowerCorridor/map.bin delete mode 100644 data/maps/BattleFrontier_BattleTowerCorridor2/border.bin delete mode 100644 data/maps/BattleFrontier_BattleTowerCorridor2/map.bin delete mode 100644 data/maps/BattleFrontier_BattleTowerElevator/border.bin delete mode 100644 data/maps/BattleFrontier_BattleTowerElevator/map.bin delete mode 100644 data/maps/BattleFrontier_BattleTowerLobby/border.bin delete mode 100644 data/maps/BattleFrontier_BattleTowerLobby/map.bin delete mode 100644 data/maps/BattleFrontier_BattleTowerMultiBattleRoom/border.bin delete mode 100644 data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.bin delete mode 100644 data/maps/BattleFrontier_Lounge1/border.bin delete mode 100644 data/maps/BattleFrontier_Lounge1/map.bin delete mode 100644 data/maps/BattleFrontier_Lounge2/border.bin delete mode 100644 data/maps/BattleFrontier_Lounge2/map.bin delete mode 100644 data/maps/BattleFrontier_OutsideEast/border.bin delete mode 100644 data/maps/BattleFrontier_OutsideEast/map.bin delete mode 100644 data/maps/BattleFrontier_OutsideWest/border.bin delete mode 100644 data/maps/BattleFrontier_OutsideWest/map.bin delete mode 100644 data/maps/BattleFrontier_RankingHall/border.bin delete mode 100644 data/maps/BattleFrontier_RankingHall/map.bin delete mode 100644 data/maps/BattleFrontier_ReceptionGate/border.bin delete mode 100644 data/maps/BattleFrontier_ReceptionGate/map.bin delete mode 100644 data/maps/BattleFrontier_ScottsHouse/border.bin delete mode 100644 data/maps/BattleFrontier_ScottsHouse/map.bin delete mode 100644 data/maps/BattlePyramidSquare01/border.bin delete mode 100644 data/maps/BattlePyramidSquare01/map.bin delete mode 100644 data/maps/BattlePyramidSquare02/border.bin delete mode 100644 data/maps/BattlePyramidSquare02/map.bin delete mode 100644 data/maps/BattlePyramidSquare03/border.bin delete mode 100644 data/maps/BattlePyramidSquare03/map.bin delete mode 100644 data/maps/BattlePyramidSquare04/border.bin delete mode 100644 data/maps/BattlePyramidSquare04/map.bin delete mode 100644 data/maps/BattlePyramidSquare05/border.bin delete mode 100644 data/maps/BattlePyramidSquare05/map.bin delete mode 100644 data/maps/BattlePyramidSquare06/border.bin delete mode 100644 data/maps/BattlePyramidSquare06/map.bin delete mode 100644 data/maps/BattlePyramidSquare07/border.bin delete mode 100644 data/maps/BattlePyramidSquare07/map.bin delete mode 100644 data/maps/BattlePyramidSquare08/border.bin delete mode 100644 data/maps/BattlePyramidSquare08/map.bin delete mode 100644 data/maps/BattlePyramidSquare09/border.bin delete mode 100644 data/maps/BattlePyramidSquare09/map.bin delete mode 100644 data/maps/BattlePyramidSquare10/border.bin delete mode 100644 data/maps/BattlePyramidSquare10/map.bin delete mode 100644 data/maps/BattlePyramidSquare11/border.bin delete mode 100644 data/maps/BattlePyramidSquare11/map.bin delete mode 100644 data/maps/BattlePyramidSquare12/border.bin delete mode 100644 data/maps/BattlePyramidSquare12/map.bin delete mode 100644 data/maps/BattlePyramidSquare13/border.bin delete mode 100644 data/maps/BattlePyramidSquare13/map.bin delete mode 100644 data/maps/BattlePyramidSquare14/border.bin delete mode 100644 data/maps/BattlePyramidSquare14/map.bin delete mode 100644 data/maps/BattlePyramidSquare15/border.bin delete mode 100644 data/maps/BattlePyramidSquare15/map.bin delete mode 100644 data/maps/BattlePyramidSquare16/border.bin delete mode 100644 data/maps/BattlePyramidSquare16/map.bin delete mode 100644 data/maps/BirthIsland_Exterior/border.bin delete mode 100644 data/maps/BirthIsland_Exterior/map.bin delete mode 100644 data/maps/BirthIsland_Harbor/border.bin delete mode 100644 data/maps/BirthIsland_Harbor/map.bin delete mode 100644 data/maps/CaveOfOrigin_1F/border.bin delete mode 100644 data/maps/CaveOfOrigin_1F/map.bin delete mode 100644 data/maps/CaveOfOrigin_B1F/border.bin delete mode 100644 data/maps/CaveOfOrigin_B1F/map.bin delete mode 100644 data/maps/CaveOfOrigin_Entrance/border.bin delete mode 100644 data/maps/CaveOfOrigin_Entrance/map.bin delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap1/border.bin delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.bin delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap2/border.bin delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.bin delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap3/border.bin delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.bin delete mode 100644 data/maps/DesertRuins/border.bin delete mode 100644 data/maps/DesertRuins/map.bin delete mode 100644 data/maps/DesertUnderpass/border.bin delete mode 100644 data/maps/DesertUnderpass/map.bin delete mode 100644 data/maps/DewfordTown/border.bin delete mode 100644 data/maps/DewfordTown/map.bin delete mode 100644 data/maps/DewfordTown_Gym/border.bin delete mode 100644 data/maps/DewfordTown_Gym/map.bin delete mode 100644 data/maps/DewfordTown_Hall/border.bin delete mode 100644 data/maps/DewfordTown_Hall/map.bin delete mode 100644 data/maps/DewfordTown_House1/border.bin delete mode 100644 data/maps/DewfordTown_House1/map.bin delete mode 100644 data/maps/DewfordTown_House2/border.bin delete mode 100644 data/maps/DewfordTown_House2/map.bin delete mode 100644 data/maps/DoubleBattleColosseum/border.bin delete mode 100644 data/maps/DoubleBattleColosseum/map.bin delete mode 100644 data/maps/EverGrandeCity/border.bin delete mode 100644 data/maps/EverGrandeCity/map.bin delete mode 100644 data/maps/EverGrandeCity_ChampionsRoom/border.bin delete mode 100644 data/maps/EverGrandeCity_ChampionsRoom/map.bin delete mode 100644 data/maps/EverGrandeCity_DrakesRoom/border.bin delete mode 100644 data/maps/EverGrandeCity_DrakesRoom/map.bin delete mode 100644 data/maps/EverGrandeCity_GlaciasRoom/border.bin delete mode 100644 data/maps/EverGrandeCity_GlaciasRoom/map.bin delete mode 100644 data/maps/EverGrandeCity_Hall1/border.bin delete mode 100644 data/maps/EverGrandeCity_Hall1/map.bin delete mode 100644 data/maps/EverGrandeCity_Hall4/border.bin delete mode 100644 data/maps/EverGrandeCity_Hall4/map.bin delete mode 100644 data/maps/EverGrandeCity_HallOfFame/border.bin delete mode 100644 data/maps/EverGrandeCity_HallOfFame/map.bin delete mode 100644 data/maps/EverGrandeCity_PhoebesRoom/border.bin delete mode 100644 data/maps/EverGrandeCity_PhoebesRoom/map.bin delete mode 100644 data/maps/EverGrandeCity_PokemonLeague_1F/border.bin delete mode 100644 data/maps/EverGrandeCity_PokemonLeague_1F/map.bin delete mode 100644 data/maps/EverGrandeCity_SidneysRoom/border.bin delete mode 100644 data/maps/EverGrandeCity_SidneysRoom/map.bin delete mode 100644 data/maps/FallarborTown/border.bin delete mode 100644 data/maps/FallarborTown/map.bin delete mode 100644 data/maps/FallarborTown_BattleTentBattleRoom/border.bin delete mode 100644 data/maps/FallarborTown_BattleTentBattleRoom/map.bin delete mode 100644 data/maps/FallarborTown_BattleTentCorridor/border.bin delete mode 100644 data/maps/FallarborTown_BattleTentCorridor/map.bin delete mode 100644 data/maps/FallarborTown_BattleTentLobby/border.bin delete mode 100644 data/maps/FallarborTown_BattleTentLobby/map.bin delete mode 100644 data/maps/FallarborTown_LeftoverRSContestHall/border.bin delete mode 100644 data/maps/FallarborTown_LeftoverRSContestHall/map.bin delete mode 100644 data/maps/FallarborTown_LeftoverRSContestLobby/border.bin delete mode 100644 data/maps/FallarborTown_LeftoverRSContestLobby/map.bin delete mode 100644 data/maps/FarawayIsland_Entrance/border.bin delete mode 100644 data/maps/FarawayIsland_Entrance/map.bin delete mode 100644 data/maps/FarawayIsland_Interior/border.bin delete mode 100644 data/maps/FarawayIsland_Interior/map.bin delete mode 100644 data/maps/FieryPath/border.bin delete mode 100644 data/maps/FieryPath/map.bin delete mode 100644 data/maps/FortreeCity/border.bin delete mode 100644 data/maps/FortreeCity/map.bin delete mode 100644 data/maps/FortreeCity_DecorationShop/border.bin delete mode 100644 data/maps/FortreeCity_DecorationShop/map.bin delete mode 100644 data/maps/FortreeCity_Gym/border.bin delete mode 100644 data/maps/FortreeCity_Gym/map.bin delete mode 100644 data/maps/FortreeCity_House1/border.bin delete mode 100644 data/maps/FortreeCity_House1/map.bin delete mode 100644 data/maps/FortreeCity_House2/border.bin delete mode 100644 data/maps/FortreeCity_House2/map.bin delete mode 100644 data/maps/GraniteCave_1F/border.bin delete mode 100644 data/maps/GraniteCave_1F/map.bin delete mode 100644 data/maps/GraniteCave_B1F/border.bin delete mode 100644 data/maps/GraniteCave_B1F/map.bin delete mode 100644 data/maps/GraniteCave_B2F/border.bin delete mode 100644 data/maps/GraniteCave_B2F/map.bin delete mode 100644 data/maps/GraniteCave_StevensRoom/border.bin delete mode 100644 data/maps/GraniteCave_StevensRoom/map.bin delete mode 100644 data/maps/InsideOfTruck/border.bin delete mode 100644 data/maps/InsideOfTruck/map.bin delete mode 100644 data/maps/IslandCave/border.bin delete mode 100644 data/maps/IslandCave/map.bin delete mode 100644 data/maps/JaggedPass/border.bin delete mode 100644 data/maps/JaggedPass/map.bin delete mode 100644 data/maps/LavaridgeTown/border.bin delete mode 100644 data/maps/LavaridgeTown/map.bin delete mode 100644 data/maps/LavaridgeTown_Gym_1F/border.bin delete mode 100644 data/maps/LavaridgeTown_Gym_1F/map.bin delete mode 100644 data/maps/LavaridgeTown_Gym_B1F/border.bin delete mode 100644 data/maps/LavaridgeTown_Gym_B1F/map.bin delete mode 100644 data/maps/LavaridgeTown_HerbShop/border.bin delete mode 100644 data/maps/LavaridgeTown_HerbShop/map.bin delete mode 100644 data/maps/LavaridgeTown_PokemonCenter_1F/border.bin delete mode 100644 data/maps/LavaridgeTown_PokemonCenter_1F/map.bin delete mode 100644 data/maps/LilycoveCity/border.bin delete mode 100644 data/maps/LilycoveCity/map.bin delete mode 100644 data/maps/LilycoveCity_ContestHall/border.bin delete mode 100644 data/maps/LilycoveCity_ContestHall/map.bin delete mode 100644 data/maps/LilycoveCity_ContestLobby/border.bin delete mode 100644 data/maps/LilycoveCity_ContestLobby/map.bin delete mode 100644 data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin delete mode 100644 data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin delete mode 100644 data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin delete mode 100644 data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin delete mode 100644 data/maps/LilycoveCity_DepartmentStoreElevator/border.bin delete mode 100644 data/maps/LilycoveCity_DepartmentStoreElevator/map.bin delete mode 100644 data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin delete mode 100644 data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin delete mode 100644 data/maps/LilycoveCity_DepartmentStore_1F/border.bin delete mode 100644 data/maps/LilycoveCity_DepartmentStore_1F/map.bin delete mode 100644 data/maps/LilycoveCity_DepartmentStore_2F/border.bin delete mode 100644 data/maps/LilycoveCity_DepartmentStore_2F/map.bin delete mode 100644 data/maps/LilycoveCity_DepartmentStore_3F/border.bin delete mode 100644 data/maps/LilycoveCity_DepartmentStore_3F/map.bin delete mode 100644 data/maps/LilycoveCity_DepartmentStore_4F/border.bin delete mode 100644 data/maps/LilycoveCity_DepartmentStore_4F/map.bin delete mode 100644 data/maps/LilycoveCity_DepartmentStore_5F/border.bin delete mode 100644 data/maps/LilycoveCity_DepartmentStore_5F/map.bin delete mode 100644 data/maps/LilycoveCity_House2/border.bin delete mode 100644 data/maps/LilycoveCity_House2/map.bin delete mode 100644 data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin delete mode 100644 data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin delete mode 100644 data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin delete mode 100644 data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin delete mode 100644 data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin delete mode 100644 data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin delete mode 100644 data/maps/LinkContestRoom1/border.bin delete mode 100644 data/maps/LinkContestRoom1/map.bin delete mode 100644 data/maps/LinkContestRoom2/border.bin delete mode 100644 data/maps/LinkContestRoom2/map.bin delete mode 100644 data/maps/LinkContestRoom3/border.bin delete mode 100644 data/maps/LinkContestRoom3/map.bin delete mode 100644 data/maps/LinkContestRoom4/border.bin delete mode 100644 data/maps/LinkContestRoom4/map.bin delete mode 100644 data/maps/LinkContestRoom5/border.bin delete mode 100644 data/maps/LinkContestRoom5/map.bin delete mode 100644 data/maps/LinkContestRoom6/border.bin delete mode 100644 data/maps/LinkContestRoom6/map.bin delete mode 100644 data/maps/LittlerootTown/border.bin delete mode 100644 data/maps/LittlerootTown/map.bin delete mode 100644 data/maps/LittlerootTown_BrendansHouse_1F/border.bin delete mode 100644 data/maps/LittlerootTown_BrendansHouse_1F/map.bin delete mode 100644 data/maps/LittlerootTown_BrendansHouse_2F/border.bin delete mode 100644 data/maps/LittlerootTown_BrendansHouse_2F/map.bin delete mode 100644 data/maps/LittlerootTown_MaysHouse_1F/border.bin delete mode 100644 data/maps/LittlerootTown_MaysHouse_1F/map.bin delete mode 100644 data/maps/LittlerootTown_MaysHouse_2F/border.bin delete mode 100644 data/maps/LittlerootTown_MaysHouse_2F/map.bin delete mode 100644 data/maps/LittlerootTown_ProfessorBirchsLab/border.bin delete mode 100644 data/maps/LittlerootTown_ProfessorBirchsLab/map.bin delete mode 100644 data/maps/MagmaHideout_1F/border.bin delete mode 100644 data/maps/MagmaHideout_1F/map.bin delete mode 100644 data/maps/MagmaHideout_2F_1R/border.bin delete mode 100644 data/maps/MagmaHideout_2F_1R/map.bin delete mode 100644 data/maps/MagmaHideout_2F_2R/border.bin delete mode 100644 data/maps/MagmaHideout_2F_2R/map.bin delete mode 100644 data/maps/MagmaHideout_2F_3R/border.bin delete mode 100644 data/maps/MagmaHideout_2F_3R/map.bin delete mode 100644 data/maps/MagmaHideout_3F_1R/border.bin delete mode 100644 data/maps/MagmaHideout_3F_1R/map.bin delete mode 100644 data/maps/MagmaHideout_3F_2R/border.bin delete mode 100644 data/maps/MagmaHideout_3F_2R/map.bin delete mode 100644 data/maps/MagmaHideout_3F_3R/border.bin delete mode 100644 data/maps/MagmaHideout_3F_3R/map.bin delete mode 100644 data/maps/MagmaHideout_4F/border.bin delete mode 100644 data/maps/MagmaHideout_4F/map.bin delete mode 100644 data/maps/MarineCave_End/border.bin delete mode 100644 data/maps/MarineCave_End/map.bin delete mode 100644 data/maps/MarineCave_Entrance/border.bin delete mode 100644 data/maps/MarineCave_Entrance/map.bin delete mode 100644 data/maps/MauvilleCity/border.bin delete mode 100644 data/maps/MauvilleCity/map.bin delete mode 100644 data/maps/MauvilleCity_BikeShop/border.bin delete mode 100644 data/maps/MauvilleCity_BikeShop/map.bin delete mode 100644 data/maps/MauvilleCity_GameCorner/border.bin delete mode 100644 data/maps/MauvilleCity_GameCorner/map.bin delete mode 100644 data/maps/MauvilleCity_Gym/border.bin delete mode 100644 data/maps/MauvilleCity_Gym/map.bin delete mode 100644 data/maps/MeteorFalls_1F_1R/border.bin delete mode 100644 data/maps/MeteorFalls_1F_1R/map.bin delete mode 100644 data/maps/MeteorFalls_1F_2R/border.bin delete mode 100644 data/maps/MeteorFalls_1F_2R/map.bin delete mode 100644 data/maps/MeteorFalls_B1F_1R/border.bin delete mode 100644 data/maps/MeteorFalls_B1F_1R/map.bin delete mode 100644 data/maps/MeteorFalls_B1F_2R/border.bin delete mode 100644 data/maps/MeteorFalls_B1F_2R/map.bin delete mode 100644 data/maps/MeteorFalls_StevensCave/border.bin delete mode 100644 data/maps/MeteorFalls_StevensCave/map.bin delete mode 100644 data/maps/MirageTower_1F/border.bin delete mode 100644 data/maps/MirageTower_1F/map.bin delete mode 100644 data/maps/MirageTower_2F/border.bin delete mode 100644 data/maps/MirageTower_2F/map.bin delete mode 100644 data/maps/MirageTower_3F/border.bin delete mode 100644 data/maps/MirageTower_3F/map.bin delete mode 100644 data/maps/MirageTower_4F/border.bin delete mode 100644 data/maps/MirageTower_4F/map.bin delete mode 100644 data/maps/MossdeepCity/border.bin delete mode 100644 data/maps/MossdeepCity/map.bin delete mode 100644 data/maps/MossdeepCity_GameCorner_1F/border.bin delete mode 100644 data/maps/MossdeepCity_GameCorner_1F/map.bin delete mode 100644 data/maps/MossdeepCity_GameCorner_B1F/border.bin delete mode 100644 data/maps/MossdeepCity_GameCorner_B1F/map.bin delete mode 100644 data/maps/MossdeepCity_Gym/border.bin delete mode 100644 data/maps/MossdeepCity_Gym/map.bin delete mode 100644 data/maps/MossdeepCity_SpaceCenter_1F/border.bin delete mode 100644 data/maps/MossdeepCity_SpaceCenter_1F/map.bin delete mode 100644 data/maps/MossdeepCity_SpaceCenter_2F/border.bin delete mode 100644 data/maps/MossdeepCity_SpaceCenter_2F/map.bin delete mode 100644 data/maps/MossdeepCity_StevensHouse/border.bin delete mode 100644 data/maps/MossdeepCity_StevensHouse/map.bin delete mode 100644 data/maps/MtChimney/border.bin delete mode 100644 data/maps/MtChimney/map.bin delete mode 100644 data/maps/MtPyre_1F/border.bin delete mode 100644 data/maps/MtPyre_1F/map.bin delete mode 100644 data/maps/MtPyre_2F/border.bin delete mode 100644 data/maps/MtPyre_2F/map.bin delete mode 100644 data/maps/MtPyre_3F/border.bin delete mode 100644 data/maps/MtPyre_3F/map.bin delete mode 100644 data/maps/MtPyre_4F/border.bin delete mode 100644 data/maps/MtPyre_4F/map.bin delete mode 100644 data/maps/MtPyre_5F/border.bin delete mode 100644 data/maps/MtPyre_5F/map.bin delete mode 100644 data/maps/MtPyre_6F/border.bin delete mode 100644 data/maps/MtPyre_6F/map.bin delete mode 100644 data/maps/MtPyre_Exterior/border.bin delete mode 100644 data/maps/MtPyre_Exterior/map.bin delete mode 100644 data/maps/MtPyre_Summit/border.bin delete mode 100644 data/maps/MtPyre_Summit/map.bin delete mode 100644 data/maps/NavelRock_B1F/border.bin delete mode 100644 data/maps/NavelRock_B1F/map.bin delete mode 100644 data/maps/NavelRock_Bottom/border.bin delete mode 100644 data/maps/NavelRock_Bottom/map.bin delete mode 100644 data/maps/NavelRock_Entrance/border.bin delete mode 100644 data/maps/NavelRock_Entrance/map.bin delete mode 100644 data/maps/NavelRock_Exterior/border.bin delete mode 100644 data/maps/NavelRock_Exterior/map.bin delete mode 100644 data/maps/NavelRock_Fork/border.bin delete mode 100644 data/maps/NavelRock_Fork/map.bin delete mode 100644 data/maps/NavelRock_Top/border.bin delete mode 100644 data/maps/NavelRock_Top/map.bin delete mode 100644 data/maps/NavelRock_Up1/border.bin delete mode 100644 data/maps/NavelRock_Up1/map.bin delete mode 100644 data/maps/NavelRock_Up2/border.bin delete mode 100644 data/maps/NavelRock_Up2/map.bin delete mode 100644 data/maps/NewMauville_Entrance/border.bin delete mode 100644 data/maps/NewMauville_Entrance/map.bin delete mode 100644 data/maps/NewMauville_Inside/border.bin delete mode 100644 data/maps/NewMauville_Inside/map.bin delete mode 100644 data/maps/OldaleTown/border.bin delete mode 100644 data/maps/OldaleTown/map.bin delete mode 100644 data/maps/OldaleTown_House1/border.bin delete mode 100644 data/maps/OldaleTown_House1/map.bin delete mode 100644 data/maps/OldaleTown_House2/border.bin delete mode 100644 data/maps/OldaleTown_House2/map.bin delete mode 100644 data/maps/OldaleTown_Mart/border.bin delete mode 100644 data/maps/OldaleTown_Mart/map.bin delete mode 100644 data/maps/OldaleTown_PokemonCenter_1F/border.bin delete mode 100644 data/maps/OldaleTown_PokemonCenter_1F/map.bin delete mode 100644 data/maps/OldaleTown_PokemonCenter_2F/border.bin delete mode 100644 data/maps/OldaleTown_PokemonCenter_2F/map.bin delete mode 100644 data/maps/PacifidlogTown/border.bin delete mode 100644 data/maps/PacifidlogTown/map.bin delete mode 100644 data/maps/PacifidlogTown_House1/border.bin delete mode 100644 data/maps/PacifidlogTown_House1/map.bin delete mode 100644 data/maps/PacifidlogTown_House2/border.bin delete mode 100644 data/maps/PacifidlogTown_House2/map.bin delete mode 100644 data/maps/PetalburgCity/border.bin delete mode 100644 data/maps/PetalburgCity/map.bin delete mode 100644 data/maps/PetalburgCity_Gym/border.bin delete mode 100644 data/maps/PetalburgCity_Gym/map.bin delete mode 100644 data/maps/PetalburgCity_House2/border.bin delete mode 100644 data/maps/PetalburgCity_House2/map.bin delete mode 100644 data/maps/PetalburgWoods/border.bin delete mode 100644 data/maps/PetalburgWoods/map.bin delete mode 100644 data/maps/RecordCorner/border.bin delete mode 100644 data/maps/RecordCorner/map.bin delete mode 100644 data/maps/Route101/border.bin delete mode 100644 data/maps/Route101/map.bin delete mode 100644 data/maps/Route102/border.bin delete mode 100644 data/maps/Route102/map.bin delete mode 100644 data/maps/Route103/border.bin delete mode 100644 data/maps/Route103/map.bin delete mode 100644 data/maps/Route104/border.bin delete mode 100644 data/maps/Route104/map.bin delete mode 100644 data/maps/Route104_MrBrineysHouse/border.bin delete mode 100644 data/maps/Route104_MrBrineysHouse/map.bin delete mode 100644 data/maps/Route104_PrettyPetalFlowerShop/border.bin delete mode 100644 data/maps/Route104_PrettyPetalFlowerShop/map.bin delete mode 100644 data/maps/Route104_Prototype/border.bin delete mode 100644 data/maps/Route104_Prototype/map.bin delete mode 100644 data/maps/Route105/border.bin delete mode 100644 data/maps/Route105/map.bin delete mode 100644 data/maps/Route106/border.bin delete mode 100644 data/maps/Route106/map.bin delete mode 100644 data/maps/Route107/border.bin delete mode 100644 data/maps/Route107/map.bin delete mode 100644 data/maps/Route108/border.bin delete mode 100644 data/maps/Route108/map.bin delete mode 100644 data/maps/Route109/border.bin delete mode 100644 data/maps/Route109/map.bin delete mode 100644 data/maps/Route109_SeashoreHouse/border.bin delete mode 100644 data/maps/Route109_SeashoreHouse/map.bin delete mode 100644 data/maps/Route110/border.bin delete mode 100644 data/maps/Route110/map.bin delete mode 100644 data/maps/Route110_SeasideCyclingRoadEntrance1/border.bin delete mode 100644 data/maps/Route110_SeasideCyclingRoadEntrance1/map.bin delete mode 100644 data/maps/Route110_TrickHouseCorridor/border.bin delete mode 100644 data/maps/Route110_TrickHouseCorridor/map.bin delete mode 100644 data/maps/Route110_TrickHouseEnd/border.bin delete mode 100644 data/maps/Route110_TrickHouseEnd/map.bin delete mode 100644 data/maps/Route110_TrickHouseEntrance/border.bin delete mode 100644 data/maps/Route110_TrickHouseEntrance/map.bin delete mode 100644 data/maps/Route110_TrickHousePuzzle1/border.bin delete mode 100644 data/maps/Route110_TrickHousePuzzle1/map.bin delete mode 100644 data/maps/Route110_TrickHousePuzzle2/border.bin delete mode 100644 data/maps/Route110_TrickHousePuzzle2/map.bin delete mode 100644 data/maps/Route110_TrickHousePuzzle3/border.bin delete mode 100644 data/maps/Route110_TrickHousePuzzle3/map.bin delete mode 100644 data/maps/Route110_TrickHousePuzzle4/border.bin delete mode 100644 data/maps/Route110_TrickHousePuzzle4/map.bin delete mode 100644 data/maps/Route110_TrickHousePuzzle5/border.bin delete mode 100644 data/maps/Route110_TrickHousePuzzle5/map.bin delete mode 100644 data/maps/Route110_TrickHousePuzzle6/border.bin delete mode 100644 data/maps/Route110_TrickHousePuzzle6/map.bin delete mode 100644 data/maps/Route110_TrickHousePuzzle7/border.bin delete mode 100644 data/maps/Route110_TrickHousePuzzle7/map.bin delete mode 100644 data/maps/Route110_TrickHousePuzzle8/border.bin delete mode 100644 data/maps/Route110_TrickHousePuzzle8/map.bin delete mode 100644 data/maps/Route111/border.bin delete mode 100644 data/maps/Route111/map.bin delete mode 100644 data/maps/Route112/border.bin delete mode 100644 data/maps/Route112/map.bin delete mode 100644 data/maps/Route112_CableCarStation/border.bin delete mode 100644 data/maps/Route112_CableCarStation/map.bin delete mode 100644 data/maps/Route113/border.bin delete mode 100644 data/maps/Route113/map.bin delete mode 100644 data/maps/Route114/border.bin delete mode 100644 data/maps/Route114/map.bin delete mode 100644 data/maps/Route114_FossilManiacsHouse/border.bin delete mode 100644 data/maps/Route114_FossilManiacsHouse/map.bin delete mode 100644 data/maps/Route114_FossilManiacsTunnel/border.bin delete mode 100644 data/maps/Route114_FossilManiacsTunnel/map.bin delete mode 100644 data/maps/Route114_LanettesHouse/border.bin delete mode 100644 data/maps/Route114_LanettesHouse/map.bin delete mode 100644 data/maps/Route115/border.bin delete mode 100644 data/maps/Route115/map.bin delete mode 100644 data/maps/Route116/border.bin delete mode 100644 data/maps/Route116/map.bin delete mode 100644 data/maps/Route116_TunnelersRestHouse/border.bin delete mode 100644 data/maps/Route116_TunnelersRestHouse/map.bin delete mode 100644 data/maps/Route117/border.bin delete mode 100644 data/maps/Route117/map.bin delete mode 100644 data/maps/Route117_PokemonDayCare/border.bin delete mode 100644 data/maps/Route117_PokemonDayCare/map.bin delete mode 100644 data/maps/Route118/border.bin delete mode 100644 data/maps/Route118/map.bin delete mode 100644 data/maps/Route119/border.bin delete mode 100644 data/maps/Route119/map.bin delete mode 100644 data/maps/Route119_WeatherInstitute_1F/border.bin delete mode 100644 data/maps/Route119_WeatherInstitute_1F/map.bin delete mode 100644 data/maps/Route119_WeatherInstitute_2F/border.bin delete mode 100644 data/maps/Route119_WeatherInstitute_2F/map.bin delete mode 100644 data/maps/Route120/border.bin delete mode 100644 data/maps/Route120/map.bin delete mode 100644 data/maps/Route121/border.bin delete mode 100644 data/maps/Route121/map.bin delete mode 100644 data/maps/Route121_SafariZoneEntrance/border.bin delete mode 100644 data/maps/Route121_SafariZoneEntrance/map.bin delete mode 100644 data/maps/Route122/border.bin delete mode 100644 data/maps/Route122/map.bin delete mode 100644 data/maps/Route123/border.bin delete mode 100644 data/maps/Route123/map.bin delete mode 100644 data/maps/Route124/border.bin delete mode 100644 data/maps/Route124/map.bin delete mode 100644 data/maps/Route124_DivingTreasureHuntersHouse/border.bin delete mode 100644 data/maps/Route124_DivingTreasureHuntersHouse/map.bin delete mode 100644 data/maps/Route125/border.bin delete mode 100644 data/maps/Route125/map.bin delete mode 100644 data/maps/Route126/border.bin delete mode 100644 data/maps/Route126/map.bin delete mode 100644 data/maps/Route127/border.bin delete mode 100644 data/maps/Route127/map.bin delete mode 100644 data/maps/Route128/border.bin delete mode 100644 data/maps/Route128/map.bin delete mode 100644 data/maps/Route129/border.bin delete mode 100644 data/maps/Route129/map.bin delete mode 100644 data/maps/Route130/border.bin delete mode 100644 data/maps/Route130/map.bin delete mode 100644 data/maps/Route131/border.bin delete mode 100644 data/maps/Route131/map.bin delete mode 100644 data/maps/Route132/border.bin delete mode 100644 data/maps/Route132/map.bin delete mode 100644 data/maps/Route133/border.bin delete mode 100644 data/maps/Route133/map.bin delete mode 100644 data/maps/Route134/border.bin delete mode 100644 data/maps/Route134/map.bin delete mode 100644 data/maps/RustboroCity/border.bin delete mode 100644 data/maps/RustboroCity/map.bin delete mode 100644 data/maps/RustboroCity_CuttersHouse/border.bin delete mode 100644 data/maps/RustboroCity_CuttersHouse/map.bin delete mode 100644 data/maps/RustboroCity_DevonCorp_1F/border.bin delete mode 100644 data/maps/RustboroCity_DevonCorp_1F/map.bin delete mode 100644 data/maps/RustboroCity_DevonCorp_2F/border.bin delete mode 100644 data/maps/RustboroCity_DevonCorp_2F/map.bin delete mode 100644 data/maps/RustboroCity_DevonCorp_3F/border.bin delete mode 100644 data/maps/RustboroCity_DevonCorp_3F/map.bin delete mode 100644 data/maps/RustboroCity_Flat1_1F/border.bin delete mode 100644 data/maps/RustboroCity_Flat1_1F/map.bin delete mode 100644 data/maps/RustboroCity_Flat1_2F/border.bin delete mode 100644 data/maps/RustboroCity_Flat1_2F/map.bin delete mode 100644 data/maps/RustboroCity_Flat2_1F/border.bin delete mode 100644 data/maps/RustboroCity_Flat2_1F/map.bin delete mode 100644 data/maps/RustboroCity_Flat2_2F/border.bin delete mode 100644 data/maps/RustboroCity_Flat2_2F/map.bin delete mode 100644 data/maps/RustboroCity_Flat2_3F/border.bin delete mode 100644 data/maps/RustboroCity_Flat2_3F/map.bin delete mode 100644 data/maps/RustboroCity_Gym/border.bin delete mode 100644 data/maps/RustboroCity_Gym/map.bin delete mode 100644 data/maps/RustboroCity_House1/border.bin delete mode 100644 data/maps/RustboroCity_House1/map.bin delete mode 100644 data/maps/RustboroCity_House2/border.bin delete mode 100644 data/maps/RustboroCity_House2/map.bin delete mode 100644 data/maps/RustboroCity_PokemonSchool/border.bin delete mode 100644 data/maps/RustboroCity_PokemonSchool/map.bin delete mode 100644 data/maps/RusturfTunnel/border.bin delete mode 100644 data/maps/RusturfTunnel/map.bin delete mode 100644 data/maps/SSTidalCorridor/border.bin delete mode 100644 data/maps/SSTidalCorridor/map.bin delete mode 100644 data/maps/SSTidalLowerDeck/border.bin delete mode 100644 data/maps/SSTidalLowerDeck/map.bin delete mode 100644 data/maps/SSTidalRooms/border.bin delete mode 100644 data/maps/SSTidalRooms/map.bin delete mode 100644 data/maps/SafariZone_North/border.bin delete mode 100644 data/maps/SafariZone_North/map.bin delete mode 100644 data/maps/SafariZone_Northeast/border.bin delete mode 100644 data/maps/SafariZone_Northeast/map.bin delete mode 100644 data/maps/SafariZone_Northwest/border.bin delete mode 100644 data/maps/SafariZone_Northwest/map.bin delete mode 100644 data/maps/SafariZone_RestHouse/border.bin delete mode 100644 data/maps/SafariZone_RestHouse/map.bin delete mode 100644 data/maps/SafariZone_South/border.bin delete mode 100644 data/maps/SafariZone_South/map.bin delete mode 100644 data/maps/SafariZone_Southeast/border.bin delete mode 100644 data/maps/SafariZone_Southeast/map.bin delete mode 100644 data/maps/SafariZone_Southwest/border.bin delete mode 100644 data/maps/SafariZone_Southwest/map.bin delete mode 100644 data/maps/ScorchedSlab/border.bin delete mode 100644 data/maps/ScorchedSlab/map.bin delete mode 100644 data/maps/SeafloorCavern_Entrance/border.bin delete mode 100644 data/maps/SeafloorCavern_Entrance/map.bin delete mode 100644 data/maps/SeafloorCavern_Room1/border.bin delete mode 100644 data/maps/SeafloorCavern_Room1/map.bin delete mode 100644 data/maps/SeafloorCavern_Room2/border.bin delete mode 100644 data/maps/SeafloorCavern_Room2/map.bin delete mode 100644 data/maps/SeafloorCavern_Room3/border.bin delete mode 100644 data/maps/SeafloorCavern_Room3/map.bin delete mode 100644 data/maps/SeafloorCavern_Room4/border.bin delete mode 100644 data/maps/SeafloorCavern_Room4/map.bin delete mode 100644 data/maps/SeafloorCavern_Room5/border.bin delete mode 100644 data/maps/SeafloorCavern_Room5/map.bin delete mode 100644 data/maps/SeafloorCavern_Room6/border.bin delete mode 100644 data/maps/SeafloorCavern_Room6/map.bin delete mode 100644 data/maps/SeafloorCavern_Room7/border.bin delete mode 100644 data/maps/SeafloorCavern_Room7/map.bin delete mode 100644 data/maps/SeafloorCavern_Room8/border.bin delete mode 100644 data/maps/SeafloorCavern_Room8/map.bin delete mode 100644 data/maps/SeafloorCavern_Room9/border.bin delete mode 100644 data/maps/SeafloorCavern_Room9/map.bin delete mode 100644 data/maps/SealedChamber_InnerRoom/border.bin delete mode 100644 data/maps/SealedChamber_InnerRoom/map.bin delete mode 100644 data/maps/SealedChamber_OuterRoom/border.bin delete mode 100644 data/maps/SealedChamber_OuterRoom/map.bin delete mode 100644 data/maps/SecretBase_BlueCave1/border.bin delete mode 100644 data/maps/SecretBase_BlueCave1/map.bin delete mode 100644 data/maps/SecretBase_BlueCave2/border.bin delete mode 100644 data/maps/SecretBase_BlueCave2/map.bin delete mode 100644 data/maps/SecretBase_BlueCave3/border.bin delete mode 100644 data/maps/SecretBase_BlueCave3/map.bin delete mode 100644 data/maps/SecretBase_BlueCave4/border.bin delete mode 100644 data/maps/SecretBase_BlueCave4/map.bin delete mode 100644 data/maps/SecretBase_BrownCave1/border.bin delete mode 100644 data/maps/SecretBase_BrownCave1/map.bin delete mode 100644 data/maps/SecretBase_BrownCave2/border.bin delete mode 100644 data/maps/SecretBase_BrownCave2/map.bin delete mode 100644 data/maps/SecretBase_BrownCave3/border.bin delete mode 100644 data/maps/SecretBase_BrownCave3/map.bin delete mode 100644 data/maps/SecretBase_BrownCave4/border.bin delete mode 100644 data/maps/SecretBase_BrownCave4/map.bin delete mode 100644 data/maps/SecretBase_RedCave1/border.bin delete mode 100644 data/maps/SecretBase_RedCave1/map.bin delete mode 100644 data/maps/SecretBase_RedCave2/border.bin delete mode 100644 data/maps/SecretBase_RedCave2/map.bin delete mode 100644 data/maps/SecretBase_RedCave3/border.bin delete mode 100644 data/maps/SecretBase_RedCave3/map.bin delete mode 100644 data/maps/SecretBase_RedCave4/border.bin delete mode 100644 data/maps/SecretBase_RedCave4/map.bin delete mode 100644 data/maps/SecretBase_Shrub1/border.bin delete mode 100644 data/maps/SecretBase_Shrub1/map.bin delete mode 100644 data/maps/SecretBase_Shrub2/border.bin delete mode 100644 data/maps/SecretBase_Shrub2/map.bin delete mode 100644 data/maps/SecretBase_Shrub3/border.bin delete mode 100644 data/maps/SecretBase_Shrub3/map.bin delete mode 100644 data/maps/SecretBase_Shrub4/border.bin delete mode 100644 data/maps/SecretBase_Shrub4/map.bin delete mode 100644 data/maps/SecretBase_Tree1/border.bin delete mode 100644 data/maps/SecretBase_Tree1/map.bin delete mode 100644 data/maps/SecretBase_Tree2/border.bin delete mode 100644 data/maps/SecretBase_Tree2/map.bin delete mode 100644 data/maps/SecretBase_Tree3/border.bin delete mode 100644 data/maps/SecretBase_Tree3/map.bin delete mode 100644 data/maps/SecretBase_Tree4/border.bin delete mode 100644 data/maps/SecretBase_Tree4/map.bin delete mode 100644 data/maps/SecretBase_YellowCave1/border.bin delete mode 100644 data/maps/SecretBase_YellowCave1/map.bin delete mode 100644 data/maps/SecretBase_YellowCave2/border.bin delete mode 100644 data/maps/SecretBase_YellowCave2/map.bin delete mode 100644 data/maps/SecretBase_YellowCave3/border.bin delete mode 100644 data/maps/SecretBase_YellowCave3/map.bin delete mode 100644 data/maps/SecretBase_YellowCave4/border.bin delete mode 100644 data/maps/SecretBase_YellowCave4/map.bin delete mode 100644 data/maps/ShoalCave_HighTideEntranceRoom/border.bin delete mode 100644 data/maps/ShoalCave_HighTideEntranceRoom/map.bin delete mode 100644 data/maps/ShoalCave_HighTideInnerRoom/border.bin delete mode 100644 data/maps/ShoalCave_HighTideInnerRoom/map.bin delete mode 100644 data/maps/ShoalCave_LowTideEntranceRoom/border.bin delete mode 100644 data/maps/ShoalCave_LowTideEntranceRoom/map.bin delete mode 100644 data/maps/ShoalCave_LowTideIceRoom/border.bin delete mode 100644 data/maps/ShoalCave_LowTideIceRoom/map.bin delete mode 100644 data/maps/ShoalCave_LowTideInnerRoom/border.bin delete mode 100644 data/maps/ShoalCave_LowTideInnerRoom/map.bin delete mode 100644 data/maps/ShoalCave_LowTideLowerRoom/border.bin delete mode 100644 data/maps/ShoalCave_LowTideLowerRoom/map.bin delete mode 100644 data/maps/ShoalCave_LowTideStairsRoom/border.bin delete mode 100644 data/maps/ShoalCave_LowTideStairsRoom/map.bin delete mode 100644 data/maps/SingleBattleColosseum/border.bin delete mode 100644 data/maps/SingleBattleColosseum/map.bin delete mode 100644 data/maps/SkyPillar_1F/border.bin delete mode 100644 data/maps/SkyPillar_1F/map.bin delete mode 100644 data/maps/SkyPillar_2F/border.bin delete mode 100644 data/maps/SkyPillar_2F/map.bin delete mode 100644 data/maps/SkyPillar_3F/border.bin delete mode 100644 data/maps/SkyPillar_3F/map.bin delete mode 100644 data/maps/SkyPillar_4F/border.bin delete mode 100644 data/maps/SkyPillar_4F/map.bin delete mode 100644 data/maps/SkyPillar_5F/border.bin delete mode 100644 data/maps/SkyPillar_5F/map.bin delete mode 100644 data/maps/SkyPillar_Entrance/border.bin delete mode 100644 data/maps/SkyPillar_Entrance/map.bin delete mode 100644 data/maps/SkyPillar_Outside/border.bin delete mode 100644 data/maps/SkyPillar_Outside/map.bin delete mode 100644 data/maps/SkyPillar_Top/border.bin delete mode 100644 data/maps/SkyPillar_Top/map.bin delete mode 100644 data/maps/SlateportCity/border.bin delete mode 100644 data/maps/SlateportCity/map.bin delete mode 100644 data/maps/SlateportCity_Harbor/border.bin delete mode 100644 data/maps/SlateportCity_Harbor/map.bin delete mode 100644 data/maps/SlateportCity_OceanicMuseum_1F/border.bin delete mode 100644 data/maps/SlateportCity_OceanicMuseum_1F/map.bin delete mode 100644 data/maps/SlateportCity_OceanicMuseum_2F/border.bin delete mode 100644 data/maps/SlateportCity_OceanicMuseum_2F/map.bin delete mode 100644 data/maps/SlateportCity_PokemonFanClub/border.bin delete mode 100644 data/maps/SlateportCity_PokemonFanClub/map.bin delete mode 100644 data/maps/SlateportCity_SternsShipyard_1F/border.bin delete mode 100644 data/maps/SlateportCity_SternsShipyard_1F/map.bin delete mode 100644 data/maps/SlateportCity_SternsShipyard_2F/border.bin delete mode 100644 data/maps/SlateportCity_SternsShipyard_2F/map.bin delete mode 100644 data/maps/SootopolisCity/border.bin delete mode 100644 data/maps/SootopolisCity/map.bin delete mode 100644 data/maps/SootopolisCity_Gym_1F/border.bin delete mode 100644 data/maps/SootopolisCity_Gym_1F/map.bin delete mode 100644 data/maps/SootopolisCity_Gym_B1F/border.bin delete mode 100644 data/maps/SootopolisCity_Gym_B1F/map.bin delete mode 100644 data/maps/SootopolisCity_House1/border.bin delete mode 100644 data/maps/SootopolisCity_House1/map.bin delete mode 100644 data/maps/SootopolisCity_House2/border.bin delete mode 100644 data/maps/SootopolisCity_House2/map.bin delete mode 100644 data/maps/SootopolisCity_House3/border.bin delete mode 100644 data/maps/SootopolisCity_House3/map.bin delete mode 100644 data/maps/SootopolisCity_LotadAndSeedotHouse/border.bin delete mode 100644 data/maps/SootopolisCity_LotadAndSeedotHouse/map.bin delete mode 100644 data/maps/SootopolisCity_MysteryEventsHouse_1F/border.bin delete mode 100644 data/maps/SootopolisCity_MysteryEventsHouse_1F/map.bin delete mode 100644 data/maps/SootopolisCity_MysteryEventsHouse_B1F/border.bin delete mode 100644 data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.bin delete mode 100644 data/maps/SouthernIsland_Exterior/border.bin delete mode 100644 data/maps/SouthernIsland_Exterior/map.bin delete mode 100644 data/maps/SouthernIsland_Interior/border.bin delete mode 100644 data/maps/SouthernIsland_Interior/map.bin delete mode 100644 data/maps/TerraCave_End/border.bin delete mode 100644 data/maps/TerraCave_End/map.bin delete mode 100644 data/maps/TerraCave_Entrance/border.bin delete mode 100644 data/maps/TerraCave_Entrance/map.bin delete mode 100644 data/maps/TradeCenter/border.bin delete mode 100644 data/maps/TradeCenter/map.bin delete mode 100644 data/maps/TrainerHill_1F/border.bin delete mode 100644 data/maps/TrainerHill_1F/map.bin delete mode 100644 data/maps/TrainerHill_2F/border.bin delete mode 100644 data/maps/TrainerHill_2F/map.bin delete mode 100644 data/maps/TrainerHill_3F/border.bin delete mode 100644 data/maps/TrainerHill_3F/map.bin delete mode 100644 data/maps/TrainerHill_4F/border.bin delete mode 100644 data/maps/TrainerHill_4F/map.bin delete mode 100644 data/maps/TrainerHill_Entrance/border.bin delete mode 100644 data/maps/TrainerHill_Entrance/map.bin delete mode 100644 data/maps/TrainerHill_Roof/border.bin delete mode 100644 data/maps/TrainerHill_Roof/map.bin delete mode 100644 data/maps/Underwater1/border.bin delete mode 100644 data/maps/Underwater1/map.bin delete mode 100644 data/maps/Underwater2/border.bin delete mode 100644 data/maps/Underwater2/map.bin delete mode 100644 data/maps/Underwater3/border.bin delete mode 100644 data/maps/Underwater3/map.bin delete mode 100644 data/maps/Underwater4/border.bin delete mode 100644 data/maps/Underwater4/map.bin delete mode 100644 data/maps/Underwater5/border.bin delete mode 100644 data/maps/Underwater5/map.bin delete mode 100644 data/maps/Underwater6/border.bin delete mode 100644 data/maps/Underwater6/map.bin delete mode 100644 data/maps/Underwater7/border.bin delete mode 100644 data/maps/Underwater7/map.bin delete mode 100644 data/maps/Underwater_MarineCave/border.bin delete mode 100644 data/maps/Underwater_MarineCave/map.bin delete mode 100644 data/maps/Underwater_Route134/border.bin delete mode 100644 data/maps/Underwater_Route134/map.bin delete mode 100644 data/maps/Underwater_SeafloorCavern/border.bin delete mode 100644 data/maps/Underwater_SeafloorCavern/map.bin delete mode 100644 data/maps/Underwater_SealedChamber/border.bin delete mode 100644 data/maps/Underwater_SealedChamber/map.bin delete mode 100644 data/maps/Underwater_SootopolisCity/border.bin delete mode 100644 data/maps/Underwater_SootopolisCity/map.bin delete mode 100644 data/maps/UnionRoom/border.bin delete mode 100644 data/maps/UnionRoom/map.bin delete mode 100644 data/maps/UnknownMap_08417FC4/border.bin delete mode 100644 data/maps/UnknownMap_08417FC4/map.bin delete mode 100644 data/maps/UnknownMap_08428450/border.bin delete mode 100644 data/maps/UnknownMap_08428450/map.bin delete mode 100644 data/maps/UnknownMap_084294C4/border.bin delete mode 100644 data/maps/UnknownMap_084294C4/map.bin delete mode 100644 data/maps/UnknownMap_084294E8/border.bin delete mode 100644 data/maps/UnknownMap_084294E8/map.bin delete mode 100644 data/maps/UnknownMap_0843E6C0/border.bin delete mode 100644 data/maps/UnknownMap_0843E6C0/map.bin delete mode 100644 data/maps/UnknownMap_0843E6E4/border.bin delete mode 100644 data/maps/UnknownMap_0843E6E4/map.bin delete mode 100644 data/maps/UnknownMap_0843E708/border.bin delete mode 100644 data/maps/UnknownMap_0843E708/map.bin delete mode 100644 data/maps/UnknownMap_0843E72C/border.bin delete mode 100644 data/maps/UnknownMap_0843E72C/map.bin delete mode 100644 data/maps/UnknownMap_0843E750/border.bin delete mode 100644 data/maps/UnknownMap_0843E750/map.bin delete mode 100644 data/maps/UnknownMap_0843E774/border.bin delete mode 100644 data/maps/UnknownMap_0843E774/map.bin delete mode 100644 data/maps/UnknownMap_0843E798/border.bin delete mode 100644 data/maps/UnknownMap_0843E798/map.bin delete mode 100644 data/maps/UnknownMap_0843E7BC/border.bin delete mode 100644 data/maps/UnknownMap_0843E7BC/map.bin delete mode 100644 data/maps/UnknownMap_0843E7E0/border.bin delete mode 100644 data/maps/UnknownMap_0843E7E0/map.bin delete mode 100644 data/maps/UnknownMap_0843E804/border.bin delete mode 100644 data/maps/UnknownMap_0843E804/map.bin delete mode 100644 data/maps/UnknownMap_0843E828/border.bin delete mode 100644 data/maps/UnknownMap_0843E828/map.bin delete mode 100644 data/maps/UnknownMap_0843E84C/border.bin delete mode 100644 data/maps/UnknownMap_0843E84C/map.bin delete mode 100644 data/maps/UnknownMap_0843E870/border.bin delete mode 100644 data/maps/UnknownMap_0843E870/map.bin delete mode 100644 data/maps/UnknownMap_0843E894/border.bin delete mode 100644 data/maps/UnknownMap_0843E894/map.bin delete mode 100644 data/maps/UnknownMap_08447028/border.bin delete mode 100644 data/maps/UnknownMap_08447028/map.bin delete mode 100644 data/maps/UnknownMap_0845A394/border.bin delete mode 100644 data/maps/UnknownMap_0845A394/map.bin delete mode 100644 data/maps/UnknownMap_0845D470/border.bin delete mode 100644 data/maps/UnknownMap_0845D470/map.bin delete mode 100644 data/maps/UnknownMap_0845ECB4/border.bin delete mode 100644 data/maps/UnknownMap_0845ECB4/map.bin delete mode 100644 data/maps/UnknownMap_08469200/border.bin delete mode 100644 data/maps/UnknownMap_08469200/map.bin delete mode 100644 data/maps/UnknownMap_084693AC/border.bin delete mode 100644 data/maps/UnknownMap_084693AC/map.bin delete mode 100644 data/maps/UnknownMap_08470BD8/border.bin delete mode 100644 data/maps/UnknownMap_08470BD8/map.bin delete mode 100644 data/maps/UnknownMap_08480DAC/border.bin delete mode 100644 data/maps/UnknownMap_08480DAC/map.bin delete mode 100644 data/maps/UnknownMap_08480F54/border.bin delete mode 100644 data/maps/UnknownMap_08480F54/map.bin delete mode 100644 data/maps/UnknownMap_084810FC/border.bin delete mode 100644 data/maps/UnknownMap_084810FC/map.bin delete mode 100644 data/maps/UnknownMap_084812A4/border.bin delete mode 100644 data/maps/UnknownMap_084812A4/map.bin delete mode 100644 data/maps/UnknownMap_0848144C/border.bin delete mode 100644 data/maps/UnknownMap_0848144C/map.bin delete mode 100644 data/maps/UnknownMap_084815F4/border.bin delete mode 100644 data/maps/UnknownMap_084815F4/map.bin delete mode 100644 data/maps/UnknownMap_08481B24/border.bin delete mode 100644 data/maps/UnknownMap_08481B24/map.bin delete mode 100644 data/maps/UnknownMap_08481DBC/border.bin delete mode 100644 data/maps/UnknownMap_08481DBC/map.bin delete mode 100644 data/maps/UnknownMap_25_29/border.bin delete mode 100644 data/maps/UnknownMap_25_29/map.bin delete mode 100644 data/maps/UnknownMap_25_30/border.bin delete mode 100644 data/maps/UnknownMap_25_30/map.bin delete mode 100644 data/maps/UnknownMap_25_31/border.bin delete mode 100644 data/maps/UnknownMap_25_31/map.bin delete mode 100644 data/maps/UnknownMap_25_32/border.bin delete mode 100644 data/maps/UnknownMap_25_32/map.bin delete mode 100644 data/maps/UnknownMap_25_33/border.bin delete mode 100644 data/maps/UnknownMap_25_33/map.bin delete mode 100644 data/maps/UnknownMap_25_34/border.bin delete mode 100644 data/maps/UnknownMap_25_34/map.bin delete mode 100644 data/maps/VerdanturfTown/border.bin delete mode 100644 data/maps/VerdanturfTown/map.bin delete mode 100644 data/maps/VerdanturfTown_BattleTentBattleRoom/border.bin delete mode 100644 data/maps/VerdanturfTown_BattleTentBattleRoom/map.bin delete mode 100644 data/maps/VerdanturfTown_WandasHouse/border.bin delete mode 100644 data/maps/VerdanturfTown_WandasHouse/map.bin delete mode 100644 data/maps/VictoryRoad_1F/border.bin delete mode 100644 data/maps/VictoryRoad_1F/map.bin delete mode 100644 data/maps/VictoryRoad_B1F/border.bin delete mode 100644 data/maps/VictoryRoad_B1F/map.bin delete mode 100644 data/maps/VictoryRoad_B2F/border.bin delete mode 100644 data/maps/VictoryRoad_B2F/map.bin delete mode 100644 data/maps/_assets.inc delete mode 100644 data/maps/_groups.inc delete mode 100644 data/maps/attributes_table.inc create mode 100644 data/maps/groups.inc diff --git a/Makefile b/Makefile index 2afb830cf..eb15d11ab 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) $(////—6ž/////?>/////·2ž/////GF/////—6ž/////?>h;2;2;2;2;2;2;2;2;2;2;2?>:2;2;2665;2™6š6;2;2;2;2ON:2;2;2;2;2;2;2g2;2;2™6š6;2?>=28282828282a282828282ª6?>«682a2^6_682b 6¢682828282;2;2<28282b6828282828282 6¢682?>=282V6W68282828282a28282?>=28282`2828282828282828282?>=282828282`282828282828282?>«682^6_6828282828282`282?>=2`2828282828282828282a282?>«682V6W682828282b6828282a2?>=28282828282828282828282?>=2828282828282828282828282?>=282^6_6828282a282828282ª6?6''''''''''''76'''''''''''''76'''''''''''''7>////////////?>/////////////?>/////////////?>:2g2;2;2;2;25;2;2;2;2;2?>:2;2;2;2;2;2;2;2;2;2;2;2;2?>:2;2;2g2;2;2;2;2;2;2™6š6;2?>=282828282a2828282V6W682?>=28282828282`2828282b682ª6?>«682828282V6W6828282 6¢682?>=28282828282828282^6_682?>=28282a2`28282828282828282?>=282828282^6_68282a2828282?>«682`2828282828282828282?>=2V6W682828282828282828282?>=28282828282828282828282ª6?>=282828282d2e282828282ª6?>=2^6_6828282d2e2828282a282?>=2`282b68282d2e282828282a2? \ No newline at end of file diff --git a/data/layouts/AbandonedShip_Room_B1F/border.bin b/data/layouts/AbandonedShip_Room_B1F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/AbandonedShip_Room_B1F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/AbandonedShip_Room_B1F/layout.inc b/data/layouts/AbandonedShip_Room_B1F/layout.inc new file mode 100644 index 000000000..62c4127f8 --- /dev/null +++ b/data/layouts/AbandonedShip_Room_B1F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +AbandonedShip_Room_B1F_Layout:: + .4byte 0x9 + .4byte 0x8 + .4byte AbandonedShip_Room_B1F_MapBorder + .4byte AbandonedShip_Room_B1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_InsideShip diff --git a/data/layouts/AbandonedShip_Room_B1F/map.bin b/data/layouts/AbandonedShip_Room_B1F/map.bin new file mode 100644 index 000000000..cb8393eb2 --- /dev/null +++ b/data/layouts/AbandonedShip_Room_B1F/map.bin @@ -0,0 +1 @@ +6'''''''7>///////?>:2;2;2;2;2;2;2?>=282a282828282?>=2`28282828282?>=282828282a282?>=2828282828282?>=28282d2e282b? \ No newline at end of file diff --git a/data/layouts/AbandonedShip_Rooms2_1F/border.bin b/data/layouts/AbandonedShip_Rooms2_1F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/AbandonedShip_Rooms2_1F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/AbandonedShip_Rooms2_1F/layout.inc b/data/layouts/AbandonedShip_Rooms2_1F/layout.inc new file mode 100644 index 000000000..26789691e --- /dev/null +++ b/data/layouts/AbandonedShip_Rooms2_1F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +AbandonedShip_Rooms2_1F_Layout:: + .4byte 0x9 + .4byte 0x11 + .4byte AbandonedShip_Rooms2_1F_MapBorder + .4byte AbandonedShip_Rooms2_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_InsideShip diff --git a/data/layouts/AbandonedShip_Rooms2_1F/map.bin b/data/layouts/AbandonedShip_Rooms2_1F/map.bin new file mode 100644 index 000000000..c897ce8a0 --- /dev/null +++ b/data/layouts/AbandonedShip_Rooms2_1F/map.bin @@ -0,0 +1 @@ +6@k•c–''7>Hs—6ž//?>PQ:2;2;2;2;2?>XY=282828282?>2;2<28282a282?>=2828282828282?>=282b82a28282?>=2828282828282?=26'''=2'''7>///=2///?>:2;2;2<2;2;2;2?>=2828282828282?>=2VW82a28282?>=2^_a2828282?>=2828282828282?>=28282d2e28282? \ No newline at end of file diff --git a/data/layouts/AbandonedShip_Rooms2_B1F/border.bin b/data/layouts/AbandonedShip_Rooms2_B1F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/AbandonedShip_Rooms2_B1F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc b/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc new file mode 100644 index 000000000..35b92addd --- /dev/null +++ b/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +AbandonedShip_Rooms2_B1F_Layout:: + .4byte 0x12 + .4byte 0x8 + .4byte AbandonedShip_Rooms2_B1F_MapBorder + .4byte AbandonedShip_Rooms2_B1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_InsideShip diff --git a/data/layouts/AbandonedShip_Rooms2_B1F/map.bin b/data/layouts/AbandonedShip_Rooms2_B1F/map.bin new file mode 100644 index 000000000..7865bb69d --- /dev/null +++ b/data/layouts/AbandonedShip_Rooms2_B1F/map.bin @@ -0,0 +1 @@ +6@AB''''76@AB'CDE7>HIJ////?>HIJ/KLM?>PQ:2;2;2;2;2GFPQ:2;2;2TU?>XY=282VWª6ONXY=28282\]?>:2;2<282^_82;2;2;2;2f28282;2;2?>=2828282828282?>=28282828282ª6?>«6828282828282?>«682828282`282?>=28282d2e282b?>=28282d2e28282? \ No newline at end of file diff --git a/data/layouts/AbandonedShip_Rooms_1F/border.bin b/data/layouts/AbandonedShip_Rooms_1F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/AbandonedShip_Rooms_1F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/AbandonedShip_Rooms_1F/layout.inc b/data/layouts/AbandonedShip_Rooms_1F/layout.inc new file mode 100644 index 000000000..0109a26f0 --- /dev/null +++ b/data/layouts/AbandonedShip_Rooms_1F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +AbandonedShip_Rooms_1F_Layout:: + .4byte 0x12 + .4byte 0x11 + .4byte AbandonedShip_Rooms_1F_MapBorder + .4byte AbandonedShip_Rooms_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_InsideShip diff --git a/data/layouts/AbandonedShip_Rooms_1F/map.bin b/data/layouts/AbandonedShip_Rooms_1F/map.bin new file mode 100644 index 000000000..20529b3df --- /dev/null +++ b/data/layouts/AbandonedShip_Rooms_1F/map.bin @@ -0,0 +1 @@ +6''•c–''76@k•c–''7>//—6ž//?>Hs—6ž//?>:2;2;2;2;2;2;2?>PQ:2;2;2;2;2?>=2828282828282?>XY=2828282ª6?>«682828282a282?>:2;2<282828282?>=2828282828282?>=2828282`28282?>=2b8282828282?>«6828282828282?>=2828282a28282?>=2828282828282?=26@AB'''E76'''=2CDE7>HIJ////?>///=2KLM?>PQ:2;2;2;2;2GF:2;2;2<2;2TU?>XY=282`28282ON=282828282\]?>:2;2<2b828282;2;2<282828282;2;2?>=2828282828282?>=2VW828282ª6?>=2a28282828282?>=2^_82828282?>«68282d2e28282?>=28282d2e28282? \ No newline at end of file diff --git a/data/layouts/AbandonedShip_Rooms_B1F/border.bin b/data/layouts/AbandonedShip_Rooms_B1F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/AbandonedShip_Rooms_B1F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/AbandonedShip_Rooms_B1F/layout.inc b/data/layouts/AbandonedShip_Rooms_B1F/layout.inc new file mode 100644 index 000000000..40ef7680a --- /dev/null +++ b/data/layouts/AbandonedShip_Rooms_B1F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +AbandonedShip_Rooms_B1F_Layout:: + .4byte 0x1b + .4byte 0x8 + .4byte AbandonedShip_Rooms_B1F_MapBorder + .4byte AbandonedShip_Rooms_B1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_InsideShip diff --git a/data/layouts/AbandonedShip_Rooms_B1F/map.bin b/data/layouts/AbandonedShip_Rooms_B1F/map.bin new file mode 100644 index 000000000..b18509507 --- /dev/null +++ b/data/layouts/AbandonedShip_Rooms_B1F/map.bin @@ -0,0 +1 @@ +6@k•¯–mE@k•c–''@k•¯–mE7>Hs·2žuMHs—6ž//Hs·2žuM?>PQ:2;2;2TUPQ:2;2;2;2;2PQ:2;2;2TU?>XY=28282\]XY=28282a282XY=2a282\]?>:2;2<2a282;2;2:2;2<2828282ª6:2;2<28282;2;2?>=2VW828282ª6=2€‰‰‰82=28282a2828282?>=2^_82`28282=2pVp’82=2`2828282b82?>«6828282828282=2VGV’82=28282828282ª6? \ No newline at end of file diff --git a/data/layouts/AbandonedShip_Underwater1/border.bin b/data/layouts/AbandonedShip_Underwater1/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/AbandonedShip_Underwater1/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/AbandonedShip_Underwater1/layout.inc b/data/layouts/AbandonedShip_Underwater1/layout.inc new file mode 100644 index 000000000..5619d0dba --- /dev/null +++ b/data/layouts/AbandonedShip_Underwater1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +AbandonedShip_Underwater1_MapBorder:: + .incbin "data/layouts/AbandonedShip_Underwater1/border.bin" + + .align 2 +AbandonedShip_Underwater1_MapBlockdata:: + .incbin "data/layouts/AbandonedShip_Underwater1/map.bin" + + .align 2 +AbandonedShip_Underwater1_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte AbandonedShip_Underwater1_MapBorder + .4byte AbandonedShip_Underwater1_MapBlockdata + .4byte gTileset_General + .4byte gTileset_InsideShip diff --git a/data/layouts/AbandonedShip_Underwater1/map.bin b/data/layouts/AbandonedShip_Underwater1/map.bin new file mode 100644 index 000000000..2c73cfe86 --- /dev/null +++ b/data/layouts/AbandonedShip_Underwater1/map.bin @@ -0,0 +1 @@ +ÍÎÌÎÌÎÍÎÕ×ÔÖÔÖÕÖÏ2Ï2Ï2Ï2Ï2Ï2Ð2Ñ2Ï2ø2Ò2Ó2É2É2Ï2Ï2ø2É2É2É2É2É2É2Ï2ø2É2É2É2Ò2Ó2É2Ï2ú2É2É2É2É2É2É2Ð2÷2ï2É2Ê2Ë2É2ù2Ï2 \ No newline at end of file diff --git a/data/layouts/AbandonedShip_Underwater2/border.bin b/data/layouts/AbandonedShip_Underwater2/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/AbandonedShip_Underwater2/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/AbandonedShip_Underwater2/layout.inc b/data/layouts/AbandonedShip_Underwater2/layout.inc new file mode 100644 index 000000000..1d123c8c7 --- /dev/null +++ b/data/layouts/AbandonedShip_Underwater2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +AbandonedShip_Underwater2_MapBorder:: + .incbin "data/layouts/AbandonedShip_Underwater2/border.bin" + + .align 2 +AbandonedShip_Underwater2_MapBlockdata:: + .incbin "data/layouts/AbandonedShip_Underwater2/map.bin" + + .align 2 +AbandonedShip_Underwater2_Layout:: + .4byte 0x15 + .4byte 0x7 + .4byte AbandonedShip_Underwater2_MapBorder + .4byte AbandonedShip_Underwater2_MapBlockdata + .4byte gTileset_General + .4byte gTileset_InsideShip diff --git a/data/layouts/AbandonedShip_Underwater2/map.bin b/data/layouts/AbandonedShip_Underwater2/map.bin new file mode 100644 index 000000000..9dbd5c71a --- /dev/null +++ b/data/layouts/AbandonedShip_Underwater2/map.bin @@ -0,0 +1 @@ +ÌÎØÙÚÎÍÎÌÎÍÎÌÎÌÎÍÎÍÎÌÔÖÛÜ2ÝÖÕÖÔÖÕ×Ô×ÔÖÕ×ÕÖÔÏ2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ð2Ñ2Ï2Ï2Ï2ø2É2Ò2Ó2É2Ñ2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2ø2É2É2É2É2É2Ï2Ï2Ï2Ï2Ï2Ï2Ð2Ñ2Ï2Ï2Ï2Ï2Ï2Ï2ø2É2É2É2É2É2É2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2÷2ï2É2É2É2É2Ò2Ð2Ñ2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ð2Ñ2÷2ï2É2É2É2É2 \ No newline at end of file diff --git a/data/layouts/AlteringCave/border.bin b/data/layouts/AlteringCave/border.bin new file mode 100644 index 000000000..423a0732e --- /dev/null +++ b/data/layouts/AlteringCave/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/AlteringCave/layout.inc b/data/layouts/AlteringCave/layout.inc new file mode 100644 index 000000000..e69cc1dd0 --- /dev/null +++ b/data/layouts/AlteringCave/layout.inc @@ -0,0 +1,16 @@ + .align 2 +AlteringCave_MapBorder:: + .incbin "data/layouts/AlteringCave/border.bin" + + .align 2 +AlteringCave_MapBlockdata:: + .incbin "data/layouts/AlteringCave/map.bin" + + .align 2 +AlteringCave_Layout:: + .4byte 0x20 + .4byte 0x18 + .4byte AlteringCave_MapBorder + .4byte AlteringCave_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/AlteringCave/map.bin b/data/layouts/AlteringCave/map.bin new file mode 100644 index 000000000..38bec91fa --- /dev/null +++ b/data/layouts/AlteringCave/map.bin @@ -0,0 +1 @@ +f222f222ff6662222226662222226662f2222222222222######"f22222222#######"2222222 !B!B!B!B!B!B"P22222222BBBBBBP22˜2™2™2š2222222fP222BBBBBB22˜2¡2¡2¡2¢22222ffPf2BBBBBB22 2¡2¡2¡2¡2š2222222222BBBBB22 2¡2¡2¡2¡2¢2222222222222¨2¡2¡2¡2¡2¢222f2222222222222222f22¨2©2©2©2ª22222Pf22222222222222222P2222222222f22222222222222222####"22222222222222222 ##################"22222222666666222222226666662222222 #666666###"2<22#XYZ## \ No newline at end of file diff --git a/data/layouts/AncientTomb/border.bin b/data/layouts/AncientTomb/border.bin new file mode 100644 index 000000000..c07869a9f --- /dev/null +++ b/data/layouts/AncientTomb/border.bin @@ -0,0 +1 @@ +ÙÙÙÙ \ No newline at end of file diff --git a/data/layouts/AncientTomb/layout.inc b/data/layouts/AncientTomb/layout.inc new file mode 100644 index 000000000..7aabb07cc --- /dev/null +++ b/data/layouts/AncientTomb/layout.inc @@ -0,0 +1,16 @@ + .align 2 +AncientTomb_MapBorder:: + .incbin "data/layouts/AncientTomb/border.bin" + + .align 2 +AncientTomb_MapBlockdata:: + .incbin "data/layouts/AncientTomb/map.bin" + + .align 2 +AncientTomb_Layout:: + .4byte 0x11 + .4byte 0x21 + .4byte AncientTomb_MapBorder + .4byte AncientTomb_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/AncientTomb/map.bin b/data/layouts/AncientTomb/map.bin new file mode 100644 index 000000000..406cf7279 Binary files /dev/null and b/data/layouts/AncientTomb/map.bin differ diff --git a/data/layouts/AquaHideout_1F/border.bin b/data/layouts/AquaHideout_1F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/AquaHideout_1F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/AquaHideout_1F/layout.inc b/data/layouts/AquaHideout_1F/layout.inc new file mode 100644 index 000000000..645be578f --- /dev/null +++ b/data/layouts/AquaHideout_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +AquaHideout_1F_MapBorder:: + .incbin "data/layouts/AquaHideout_1F/border.bin" + + .align 2 +AquaHideout_1F_MapBlockdata:: + .incbin "data/layouts/AquaHideout_1F/map.bin" + + .align 2 +AquaHideout_1F_Layout:: + .4byte 0x1c + .4byte 0x1e + .4byte AquaHideout_1F_MapBorder + .4byte AquaHideout_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/layouts/AquaHideout_1F/map.bin b/data/layouts/AquaHideout_1F/map.bin new file mode 100644 index 000000000..2330fe015 --- /dev/null +++ b/data/layouts/AquaHideout_1F/map.bin @@ -0,0 +1,55 @@ +STSTÃÄÅ [\21$#![\0!21!!ËÌ2Í" +cd:292)2)2)2cd82)2:292)2)2Æ2)2Ç2)2' + +!!! k2l2¡2(2(2(2(2k2l2¡2(2(2(2(2(2(2(2(2(27 + +2)2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2)2 + +'//¡2(2(2]iiiiiiiiii^™2(2(2(2(2(2 + +/'/¡2(2(2`q1q1q1q1q1q1q1q1q1q1¤¡2(2(2(2(2(2 + +'/±2©2(2(2`q1p1p1p1p1p1p1p1p1q1¤¡2(2(2(2(2(2 + +/±2©2(2(2(2hiiiiiiiiii¬¡2(2(2(2(2 + +)2©2(2(2(2(2*2*2*2*2*2*2*2*2*2*2*2*2©2(2(2(2(2' + +)2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2/ + +)2(2(2]iiiiiif(2(2eiiiiii^™2(2' + +)2(2(2`t||||||¯0Ï0||||||‰¤¡2(2/ + +)2(2(2`u€‰‰‰‰‰‰‰‰‰‰‰‰s¤¡2(2*2 + +)2(2(2`upppppppppppp’s¤¡2(2(2 + +Š2ƒ2(2`upppppppppppp’s¤¡2(2(2 + +ˆ‰¡2ªupppppppppppp’sy¡2(2(2 + +‘¡2*­BBBBtppppprBBBBB*©2(2(2 + +)2*2©2((BBBBuypppxsBBBBB((2‚2ƒ2 + +)2(2(2–t|||}ppp’{||||‰•™2ˆ‰ + +)2(2(2`u€‰‰‰˜pppš‰‰‰‰s¤¡2‘ + +)2(2(2`upppppppppppp’s¤¡2*2*2 + +Š2ƒ2(2`upppppppppppp’s¤¡2(2(2 + +ˆ‰¡2`upppppppppppp’s¤¡2‚2ƒ2 + +‘¡2ªupppppppppppp’sy¡2ˆ‰ + +)2*2©2*­BBBBBtppprBBBBBB*©2‘ + +)2(2(2((BBBBBuypxsB(B(B(B(B(B((2*2*2 + +mmmmmmmmoug’snmmmmmmmmm + +qqqqqqqqu¿ÈÉʾsqqqqqqqqq +¿llllllll¿lllll¾lllllllll¾ \ No newline at end of file diff --git a/data/layouts/AquaHideout_B1F/border.bin b/data/layouts/AquaHideout_B1F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/AquaHideout_B1F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/AquaHideout_B1F/layout.inc b/data/layouts/AquaHideout_B1F/layout.inc new file mode 100644 index 000000000..10cfd2d9b --- /dev/null +++ b/data/layouts/AquaHideout_B1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +AquaHideout_B1F_MapBorder:: + .incbin "data/layouts/AquaHideout_B1F/border.bin" + + .align 2 +AquaHideout_B1F_MapBlockdata:: + .incbin "data/layouts/AquaHideout_B1F/map.bin" + + .align 2 +AquaHideout_B1F_Layout:: + .4byte 0x33 + .4byte 0x18 + .4byte AquaHideout_B1F_MapBorder + .4byte AquaHideout_B1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/layouts/AquaHideout_B1F/map.bin b/data/layouts/AquaHideout_B1F/map.bin new file mode 100644 index 000000000..97efacec8 --- /dev/null +++ b/data/layouts/AquaHideout_B1F/map.bin @@ -0,0 +1,83 @@ +àààÃÄÅààÃÄÅààààààà³´µààààààààààà 01!ËÌ2Í +11ËÌ2Í!ØÙØÙ +!!»¼2½!! + +ØÙ!!!ØÙØÙ +àÃÄÅST8292)2Æ2)2Ç2 +9292Æ2)2Ç2)2ÚÛÚÛ +')2Æ2)2Ç2)2' + +ÚÛ)2)2)2ÚÛÚÛ + +!ËÌ2Í[\ )2(2(2(2(2(2 +)2(2(2(2(2(2ÜÝ7ÚÛ +/¡2(2(2(2(2/ + +ÜÝ7¡2(2ß2ÜÝ7ÚÛ + +)2Æ2)2Ç2cd2)2(2(2(2(2(2 +)2(2(2(2(2ß2*2*2ÜÝ7 +)2ß2(2(2(2ß2(2 + +)2*2©2(2(2*2*2ÜÝ7 + +)2(2(2(2k2l2¡2(2(2(2(2(2(2  2Y2Y2Y2Y2Y2Y2Y2Y2Y2  2Y2Y2Y2Y2Y2Y2  +)2ß2(2(2ß2(2(2ß2(2 + +)2(2(2(22A2B2222(2(2(2ààÕÔÕàààààààà+,-. +†iiiiiii^ + +)2(2(2(2IJ222(2(2(2 +ãã$#$!!! +0013456 + +`®2§2§2§2§2§2§2¦ + +)2(2(2(2222A2B22(2(2(2 +êêæ3ó7ô7æõCæ66 +828292;<=> + +hiiiiiii¬ + +)2(2(2(2222IJ(2(2(2 +3€3å3Ã7Å7åýCå3å3å3 +)263(2CDEF + +)2ß2(2(2ß2(2(2ß2(2 + +)2(2(2(2222222(2(2(2 +3€3å3û3ü3åúå3ß2å3 +)2(2(2KLMN + +†iiiiiii^ +  2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2 î3í3í3í3í3í3í3í3í3í3 )2(2(2(2UV)2 + +`®2§2§2§2§2§2§2¦ +ààààààààààààààààààààààà)2ß2(2(2(2(2(2 + +hiiiiiii¬ + +!!!!!!!!!!!!! !!!!!!!!!!  2Y2Y2Y2Y2Y2Y2  +)2ß2(2(2ß2(2(2ß2(2 + +)2)2)2)2)2)2)2)2)2)2)2)2)22)222222222à3ààààààà +†iiiiiii^ + +)2(2ß2(2(2(2(2(2(2(2(2(2(2(2(2é3  222ðñá7 !!!!!!! + +`®2§2§2§2§2§2§2¦ + +†iiiiiiiiiiiii^è222øùèD322222)2)2 + +hiiiiiii¬ + +`®2§2§2§2§2§2§2§2§2§2§2§2§2¦222222222222222(2(2 + +)2ß2(2(2ß2(2(2ß2(2 + +`¯2O1O1O1O1O1O1O1O1O1O1O1O1¤2A2B2222A2B2é3é322222(2(2 +  2Y2Y2Y2Y2Y2Y2Y2Y2  +hiiiiiiiiiiiii¬2IJ222IJèè22222(2ß2 +ààààààààà +)2*2ß2*2*2*2*2*2*2*2*2*2*2*2*2222222222222222(2(2 + !!!!!!!!!   2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2 àààààààààààààààààààààààààààààààà !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!  \ No newline at end of file diff --git a/data/layouts/AquaHideout_B2F/border.bin b/data/layouts/AquaHideout_B2F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/AquaHideout_B2F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/AquaHideout_B2F/layout.inc b/data/layouts/AquaHideout_B2F/layout.inc new file mode 100644 index 000000000..188e51fcc --- /dev/null +++ b/data/layouts/AquaHideout_B2F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +AquaHideout_B2F_MapBorder:: + .incbin "data/layouts/AquaHideout_B2F/border.bin" + + .align 2 +AquaHideout_B2F_MapBlockdata:: + .incbin "data/layouts/AquaHideout_B2F/map.bin" + + .align 2 +AquaHideout_B2F_Layout:: + .4byte 0x22 + .4byte 0x18 + .4byte AquaHideout_B2F_MapBorder + .4byte AquaHideout_B2F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/layouts/AquaHideout_B2F/map.bin b/data/layouts/AquaHideout_B2F/map.bin new file mode 100644 index 000000000..2e843a8e4 --- /dev/null +++ b/data/layouts/AquaHideout_B2F/map.bin @@ -0,0 +1,51 @@ +ST³´µ³´µ+,-.+,-.222 [\01»¼2½ +!!»¼2½3456!!3456!!! +à³´µàcd8292Æ2)2Ç2 +)2)2Æ2)2Ç2;<=>)2)2;<=>)2)2)2 + +!»¼2½! +k2l2¡2(2(2(2(2 +)2(2(2(2(2CDEF¡2(2CDEF¡2(2(2 + +)2Æ2)2Ç2)2 +)2(2(2(2(2(2(2 +)2(2(2(2(2KLMN¡2(2KLMN¡2(2(2 + +)2(2(2(2(2 +)2(2(22A2B22 +)2(2(2(2(2(2UV¡2(2(2(2UV¡2(2(2(2 + +)2(2(2 +)2(2(22IJ +)2(2‚2ƒ2(2(2*2*2©2(2(2(2*2*2©2(2(2(2 + +)2//(2 +)2(2(22222 +)2(2ˆ‰¡2(2‚2ƒ2(2(2‚2ƒ2(2‚2ƒ2(2(2(2 + +)277/ß2 +)2ß2(22222 +)2(2‘¡20ˆ‰¡2(2ˆ‰2ˆ‰¡2ß2(2 +  2Y2Y2Y2Y2  2Y2Y2Y2Y2Y2Y2 )2(2*2*2©282‘¡2(2‘:2‘¡2(2(2 +àààààààààààà)2(2(2(2(2(2*2*2©2(2*2*2©2*2*2©2(2(2 + +!!!!! 012!!!! +)2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2 + +)2)2)2)2)228292:2)2)2)2)2 +)2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2  +)2(2(2(2(2(2(2(2(2(2(2ß2(2 )2(2(2ß2(2(2(2'2Y2Y2Y2Y2Y2Y2Y2Y2 +)2(2(2(2(2(2(2(2(2(2(2(2(2)2(2(2(2(2(2'/àààààààà + +Žiiiiiiiiiiif )2(2(2(2(2(2/// !!!!!!!! + +€‰‰‰‰‰‰‰‰‰‰‰2Žiiiiiii^2)2)2)2)2)2)2)2)2 + +VVVVVVVVpppš‰‰‰‰‰‰‰‰¦¡2(2(2(2(2(2(2ß2(2 + +GGGGGGGVVVVVVVVppppp’y¡2(2(2(2(2 + +GGGGGGGGGGGGGGVVVVVp’*2©2(2(2(2(2''// + +GGGGGGGGGGGGGGGGGGVp’•™2(2(2(2(2//)2ß2 + GGGGGGGGGGGGGGGGGGVp’¦Œ2Y2Y2Y2Y2 2 2 2Y2 GGGGGGGGGGGGGGGGGGVp’bàààààààà Žiiiiiiiiiiiiiiiiiiiiij !!!!!!!!  \ No newline at end of file diff --git a/data/layouts/AquaHideout_UnusedRubyMap1/border.bin b/data/layouts/AquaHideout_UnusedRubyMap1/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/AquaHideout_UnusedRubyMap1/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc b/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc new file mode 100644 index 000000000..643993a22 --- /dev/null +++ b/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +AquaHideout_UnusedRubyMap1_MapBorder:: + .incbin "data/layouts/AquaHideout_UnusedRubyMap1/border.bin" + + .align 2 +AquaHideout_UnusedRubyMap1_MapBlockdata:: + .incbin "data/layouts/AquaHideout_UnusedRubyMap1/map.bin" + + .align 2 +AquaHideout_UnusedRubyMap1_Layout:: + .4byte 0x1c + .4byte 0x1e + .4byte AquaHideout_UnusedRubyMap1_MapBorder + .4byte AquaHideout_UnusedRubyMap1_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/layouts/AquaHideout_UnusedRubyMap1/map.bin b/data/layouts/AquaHideout_UnusedRubyMap1/map.bin new file mode 100644 index 000000000..52c2d57eb Binary files /dev/null and b/data/layouts/AquaHideout_UnusedRubyMap1/map.bin differ diff --git a/data/layouts/AquaHideout_UnusedRubyMap2/border.bin b/data/layouts/AquaHideout_UnusedRubyMap2/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/AquaHideout_UnusedRubyMap2/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc b/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc new file mode 100644 index 000000000..6fdf6b31c --- /dev/null +++ b/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +AquaHideout_UnusedRubyMap2_MapBorder:: + .incbin "data/layouts/AquaHideout_UnusedRubyMap2/border.bin" + + .align 2 +AquaHideout_UnusedRubyMap2_MapBlockdata:: + .incbin "data/layouts/AquaHideout_UnusedRubyMap2/map.bin" + + .align 2 +AquaHideout_UnusedRubyMap2_Layout:: + .4byte 0x3e + .4byte 0x18 + .4byte AquaHideout_UnusedRubyMap2_MapBorder + .4byte AquaHideout_UnusedRubyMap2_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/layouts/AquaHideout_UnusedRubyMap2/map.bin b/data/layouts/AquaHideout_UnusedRubyMap2/map.bin new file mode 100644 index 000000000..1406dde5d --- /dev/null +++ b/data/layouts/AquaHideout_UnusedRubyMap2/map.bin @@ -0,0 +1,95 @@ +ÃÄÅÃÄÅààààààààà 01!ËÌ2Í +01ËÌ2Í!!!!!!!Ø3Ù3Ø3Ù3 + +ØÙ!!!ØÙØÙ +àÃÄÅSTÃÄÅST8292)2Æ2)2Ç2 +8292Æ2)2Ç2)2)2)2)2)2)2)2Ü7Ý7Ú7Û7// + +ÚÛ)2)2)2ÚÛÚÛ + +!ËÌ2Í[\01!! +ËÌ2Í[\ +)2(2(2(2(2(2 +)2(2(2(2(22A2B222(2(2*2*2Ü7Ý777 + +ÜÝ7¡2(2ß2ÜÝ7ÚÛ + +)2Æ2)2Ç2cd8292)2)2 +'Æ2)2Ç2cd +)2(2(2(2(2(2 +)2(2(2(2(22IJ2(2(2(2(2*2*2*2*2 + +)2*2©2(2(2*2*2ÜÝ7 + +)2(2(2(2k2l2(2ß2(2(2 +/¡2(2(2k2l2 +)2(2(2(2ß2(2 +)2(2(2(2(222222(2(2(2ß2(2(2(2(2 + +)2ß2(2(2ß2(2(2ß2(2 + +)2(2(2(2(2(2(2(2(2(2 +'¡2(2(2(2(2 +)22A2B222  2Y2Y2Y2Y2Y2Y2Y2Y22Y2Y2Y2Y2Y2Y2Y2Y2  +âmmmmmmmo + +)2(2(2(2(2(2(2ß2(2(2 +/6¡2(2(2(2(2 +)22IJ2ààÕÔÕàààààààààààà +vq0q0q0q0q0q0q0w +  2Y2Y2Y2Y2Y2Y2Y2Y2Y2 )2©2ß2(2(2(2 +)222222 +ãã$#$!! +001!Ø3Ù3Ø3Ù3 + +~yyyyyyy +àààààààààà)2(2(2(2(2(2 +)2(2(2(2(2(2 +ê7ê7æ3óôæ3õ +828292)2ÜÝÚÛ + +)2ß2(2(2ß2(2(2ß2(2 + !!!!!!!!!!  2Y2Y2Y2Y2Y2  2Y2Y2Y2Y2Y2 3€3å3ÃÅåýCå3å3 +)2(2(2(2*2*2ÜÝ + +âmmmmmmmo ++,-.àààààààà3€3å3û3ü3å3úå3ß2 +)2(2ß2(2(2ß2*2*2 + +vq0q0q0q0q0q0q0w + +345601 +0011!! î3í3í3í3í3í3í3í3í3  2Y2Y2Y2Y2Y2Y2Y2  +~yyyyyyy + +;<=>8292 +82829292)2)2ààààààààààààààààà +)2ß2(2(2ß2(2(2ß2(2 + +CDEF)2…2 +)2(2ß2(2(2(2 !!!!!!!!! !!!!!!!! + +âmmmmmmmo + +KLMN)2(2 +)2(2(2(2(2(22)2)2)2)2)2)2)2)2)22)2)2)2)2)2)2)2)2 + +vq0q0q0q0q0q0q0w + +)2UV)2ß2(2  2Y2Y2Y2Y2Y2Y2Y2Y22é3222222222222(2(2 + +~yyyyyyy + +)2)2)2)2(2(2àààààààààá  2A2B222@2B2é3é32(2(2 + +)2ß2(2(2ß2(2(2ß2(2 + +)2(2(2(2Ø3Ù3 +!!!!!!!!! è2IJ22HJèè2(2(2 +  2Y2Y2Y2Y2Y2Y2Y2Y2  +)2(2Ø3Ù3ÜÝ +)2)2)2)2)2)2)2)2)222222222222222(2ß2 +ààààààààà +Ø3Ù3Ú7Û7(2(2 +)2(2ß2(2(2(2(2(2(2(22222222222222(2(2 + !!!!!!!!!  ç7ï7ç7ï7çï  2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2 ààààààààààààààààààààààààààààààà !!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!  \ No newline at end of file diff --git a/data/layouts/AquaHideout_UnusedRubyMap3/border.bin b/data/layouts/AquaHideout_UnusedRubyMap3/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/AquaHideout_UnusedRubyMap3/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc b/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc new file mode 100644 index 000000000..070fb2bac --- /dev/null +++ b/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc @@ -0,0 +1,16 @@ + .align 2 +AquaHideout_UnusedRubyMap3_MapBorder:: + .incbin "data/layouts/AquaHideout_UnusedRubyMap3/border.bin" + + .align 2 +AquaHideout_UnusedRubyMap3_MapBlockdata:: + .incbin "data/layouts/AquaHideout_UnusedRubyMap3/map.bin" + + .align 2 +AquaHideout_UnusedRubyMap3_Layout:: + .4byte 0x22 + .4byte 0x18 + .4byte AquaHideout_UnusedRubyMap3_MapBorder + .4byte AquaHideout_UnusedRubyMap3_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/layouts/AquaHideout_UnusedRubyMap3/map.bin b/data/layouts/AquaHideout_UnusedRubyMap3/map.bin new file mode 100644 index 000000000..68afb0063 --- /dev/null +++ b/data/layouts/AquaHideout_UnusedRubyMap3/map.bin @@ -0,0 +1,49 @@ +ST³´µ³´µ|}~|}~ [\01»¼2½ +!!»¼2½3456!!3456!!! +à³´µàcd8292Æ2)2Ç2 +)2)2Æ2)2Ç2;<=>)2)2;<=>)2)2)2 + +»¼2½! k2l2¡2(2(2(2(2 +)2(2(2(2(2CDEF(2(2CDEF¡2(2(2 + +'Æ2)2Ç2)22)2(2(2(2(2(2(2 +)2(2(2(2(2KLMN(2(2KLMN¡2ß2(2 + +/(2(2(2(22A2B222(2(2(2 +)2‚2ƒ2(2(2(2UV¡2(2(2(2UV¡2(2(2(2 + +/(2(2(2(22IJ2(2(2(2 +)2ˆ‰2¡2(2(2(2(2(2(2(2*2*2©2(2(2(2 + +)2(2(2(2(222222(2(2(2 +)2‘:2¡2(2(2(2(2(2(2‚2ƒ2(2‚2ƒ2(2(2 + +)2(2(2(2(222222(2(2(2 +)2*2*2©2(2(2(2(2(2(2(2ˆ‰2ˆ‰¡2(2 +  2Y22Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2  2Y2Y2Y2Y2Y2Y2Y22(2(2‘:2‘¡2(2 +àààààààààààààààààààà(2(2*2*2©2*2*2©2(2 + +01 +!!!!!!!!!! +!!!!!!!! (2(2(2(2(2(2(2(2(2 + +8292 +)2)2)2)2)2)2)2)2)2)2 )2)2)2)2)2)2)2)22(2(2(2(2(22Y2Y2Y2  +)2(2 +)2(2(2(2(2(2(2(2ß2(2)2(2ß2(2(2(2(2(2(2(2(2(2(2(2ààà +)2ß2 +)2(2(2(2(2(2(2(2(2(2 Žiiiiiiiiiiii^ !!! + +)2(2 +)2(2(2(2piiiif2€‰‰‰‰‰‰‰‰‰‰‰¦2)2)2)2 + +)2(2 )2(2(2(2`€‰‰‰‰‰˜pppppVVVVVV’b¡2(2ß2(2 + +)2(2)2(2(2(2`ppppppVVVVVGGGGGV’b¡2(2(2(2 + +)2(2 )2(2(2(2xpppVVVGGGGGGGGGGV’b¡2(2(2(2 + +)2(22)2(2(2(2*2pVVGGGGGGGGGGGGGV’b¡2(2(2(2 + +)2(2(2(2(2(2(2–VGGGGGGGGGGGGGGGV’b¡2(2(2(2 +  2Y2Y2Y2Y2Y22`VGGGGGGGGGGGGGGGV’b{3(2(2(2 àààààà`VGGGGGGGGGGGGGGGV’bààà !!!!!! hiiiiiiiiiiiiiiiiiiij !!!  \ No newline at end of file diff --git a/data/layouts/ArtisanCave_1F/border.bin b/data/layouts/ArtisanCave_1F/border.bin new file mode 100644 index 000000000..423a0732e --- /dev/null +++ b/data/layouts/ArtisanCave_1F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/ArtisanCave_1F/layout.inc b/data/layouts/ArtisanCave_1F/layout.inc new file mode 100644 index 000000000..7a5d63690 --- /dev/null +++ b/data/layouts/ArtisanCave_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +ArtisanCave_1F_MapBorder:: + .incbin "data/layouts/ArtisanCave_1F/border.bin" + + .align 2 +ArtisanCave_1F_MapBlockdata:: + .incbin "data/layouts/ArtisanCave_1F/map.bin" + + .align 2 +ArtisanCave_1F_Layout:: + .4byte 0x15 + .4byte 0x16 + .4byte ArtisanCave_1F_MapBorder + .4byte ArtisanCave_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/ArtisanCave_1F/map.bin b/data/layouts/ArtisanCave_1F/map.bin new file mode 100644 index 000000000..2009f24f4 --- /dev/null +++ b/data/layouts/ArtisanCave_1F/map.bin @@ -0,0 +1 @@ +666666666666666666666666666666666666666666666666666666666666666666?262666666262666666262666666262666666226666662266666626U266666622262226666662226222666666 6 6 6"22U22  6 6 6666666666"22222 666666666666"222 6666666666662<2666666666666 6XYZ 6666666666666 6 6 6 6 6 6 6666666666666 6 6 6 6 6 6 6 6 6666666666666666666666666666 \ No newline at end of file diff --git a/data/layouts/ArtisanCave_B1F/border.bin b/data/layouts/ArtisanCave_B1F/border.bin new file mode 100644 index 000000000..423a0732e --- /dev/null +++ b/data/layouts/ArtisanCave_B1F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/ArtisanCave_B1F/layout.inc b/data/layouts/ArtisanCave_B1F/layout.inc new file mode 100644 index 000000000..97e409473 --- /dev/null +++ b/data/layouts/ArtisanCave_B1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +ArtisanCave_B1F_MapBorder:: + .incbin "data/layouts/ArtisanCave_B1F/border.bin" + + .align 2 +ArtisanCave_B1F_MapBlockdata:: + .incbin "data/layouts/ArtisanCave_B1F/map.bin" + + .align 2 +ArtisanCave_B1F_Layout:: + .4byte 0x2e + .4byte 0x36 + .4byte ArtisanCave_B1F_MapBorder + .4byte ArtisanCave_B1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/ArtisanCave_B1F/map.bin b/data/layouts/ArtisanCave_B1F/map.bin new file mode 100644 index 000000000..c5ce45c52 --- /dev/null +++ b/data/layouts/ArtisanCave_B1F/map.bin @@ -0,0 +1 @@ +22222666666666666666666666666666666666666222226666666666666666666666666666666666666222266'6622226'666666662222666666622222266222222266662222'226666666'2222222222222222266662222 6 6"2662222  B B"222222222266662222662U222 "222222222666622226622222222222222 BB"2222222266662222 6 6"222222  B B B B B B B B B BBB B B B B B B"222266662222 2 6"22222   6 6 6 6"BBBBBBBBBBBB"22266662222U2222   6"B"2266662222U222266B2266662222U222266B2266662222222266B222222222222266662222'2222'66B22  6 6 6 6"2222266662222222  6 6 6B2  " ""2222666622222  6 6666BB B B B B B BU"222666622222  6 6 6 6 6BBBBBBBBBBU    6 6 6 66622222  B B B B BBBB             6 6 6 6 6"6622222BBBBBBBB     "   " " " "6622222BUBBUUU662222222222BBUBBUUU6622222BBBBBBU        662222222222BBBBBBUBBBBBBBB6666666662222222222BBBBBBBUB         2222222222BBBBBBBBB        22222BBBBBBBBB22266666  2222222222BBBBBBBBB226     62222222222BUBBBBBB2226     2222 6 6"2222BBBBBBBB'       6    2222 6"62222BBBBBBBBB  "     62222 2" 6" 6"222BUBBBBBBBBU6666622222U6222BBBBBBBBUBBBBBBBBB62222U6U222BBBBBB66666622226622  B B2222222BBBBBB662222U622BB22BB2226U22226622BBBBBBB22BB2226666662222U22B22BB22266666622222222B22222B       66666622222222B22222B'        66666622222222U2222U6        6666662222222222222266U6        66666622222222222222'U66U66222222222222222666622222222222222222666622222222U222222222666666622222<22222222222226666666666666666666662222 XYZ             6666666666666666666662222                      6666666666666666662222  6  6  6  6  6  6   6                       666622222666666666666666666666666666666666666666662222266666666666666666666666666666666666666666 \ No newline at end of file diff --git a/data/layouts/BattleElevator/border.bin b/data/layouts/BattleElevator/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleElevator/border.bin differ diff --git a/data/layouts/BattleElevator/layout.inc b/data/layouts/BattleElevator/layout.inc new file mode 100644 index 000000000..b101dbdda --- /dev/null +++ b/data/layouts/BattleElevator/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleElevator_MapBorder:: + .incbin "data/layouts/BattleElevator/border.bin" + + .align 2 +BattleElevator_MapBlockdata:: + .incbin "data/layouts/BattleElevator/map.bin" + + .align 2 +BattleElevator_Layout:: + .4byte 0x5 + .4byte 0x7 + .4byte BattleElevator_MapBorder + .4byte BattleElevator_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleFrontier diff --git a/data/layouts/BattleElevator/map.bin b/data/layouts/BattleElevator/map.bin new file mode 100644 index 000000000..16dfe34ab --- /dev/null +++ b/data/layouts/BattleElevator/map.bin @@ -0,0 +1 @@ +(***,011148999<\2]2]2]2]2d2e2e2e2e2d2e2e2e2e2d2O2W2e2e2 \ No newline at end of file diff --git a/data/layouts/BattleFrontier_BattleArenaBattleRoom/border.bin b/data/layouts/BattleFrontier_BattleArenaBattleRoom/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattleArenaBattleRoom/border.bin differ diff --git a/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc new file mode 100644 index 000000000..6b0f61b5f --- /dev/null +++ b/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattleArenaBattleRoom_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattleArenaBattleRoom/border.bin" + + .align 2 +BattleFrontier_BattleArenaBattleRoom_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin" + + .align 2 +BattleFrontier_BattleArenaBattleRoom_Layout:: + .4byte 0x10 + .4byte 0xb + .4byte BattleFrontier_BattleArenaBattleRoom_MapBorder + .4byte BattleFrontier_BattleArenaBattleRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleArena diff --git a/data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin b/data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin new file mode 100644 index 000000000..526de2248 --- /dev/null +++ b/data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin @@ -0,0 +1 @@ +PPQPPQPPPPUPPUPPXXYXXYXXXX]XX]XX``a``a````e``e``22222222222222222222(2)2*2+2,2-2.2/22222}2}2}2}20212223242526272}2}2}2}222228292:2;2<2=2>2?22222u2u2v2w2@2A2B2C2D2E2F2G2u2v2u2u2 2 2 2 2H2I2J2K2L2M2N2O2 2 2 2 222222'2'222'2'2222222222222222222222 \ No newline at end of file diff --git a/data/layouts/BattleFrontier_BattleArenaCorridor/border.bin b/data/layouts/BattleFrontier_BattleArenaCorridor/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattleArenaCorridor/border.bin differ diff --git a/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc b/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc new file mode 100644 index 000000000..c984be1fb --- /dev/null +++ b/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattleArenaCorridor_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattleArenaCorridor/border.bin" + + .align 2 +BattleFrontier_BattleArenaCorridor_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattleArenaCorridor/map.bin" + + .align 2 +BattleFrontier_BattleArenaCorridor_Layout:: + .4byte 0x12 + .4byte 0xe + .4byte BattleFrontier_BattleArenaCorridor_MapBorder + .4byte BattleFrontier_BattleArenaCorridor_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleArena diff --git a/data/layouts/BattleFrontier_BattleArenaCorridor/map.bin b/data/layouts/BattleFrontier_BattleArenaCorridor/map.bin new file mode 100644 index 000000000..1b124b610 --- /dev/null +++ b/data/layouts/BattleFrontier_BattleArenaCorridor/map.bin @@ -0,0 +1 @@ +VWWVWWôôôôôôWWkWWk^__^__ôôôôôô__s__sf6g6g6f6g6g6ôôôôôôg6g6{6g6g6{6¥˜ôôôôôô¨¦n ôôôôôô°onôôôôôôôôôôôôonôôôôôôôôôôôôonôôôôôôôôôôôôonoVWWVWWWWkWWknonoVWWVWWWWkWWknono^__^____s__snonof6g6g6f6g6g6g6g6{6g6g6{6nont2222222222222z22o2£222222”•–222222¤ \ No newline at end of file diff --git a/data/layouts/BattleFrontier_BattleArenaLobby/border.bin b/data/layouts/BattleFrontier_BattleArenaLobby/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattleArenaLobby/border.bin differ diff --git a/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc b/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc new file mode 100644 index 000000000..bda4799ec --- /dev/null +++ b/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattleArenaLobby_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattleArenaLobby/border.bin" + + .align 2 +BattleFrontier_BattleArenaLobby_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattleArenaLobby/map.bin" + + .align 2 +BattleFrontier_BattleArenaLobby_Layout:: + .4byte 0x10 + .4byte 0xd + .4byte BattleFrontier_BattleArenaLobby_MapBorder + .4byte BattleFrontier_BattleArenaLobby_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleArena diff --git a/data/layouts/BattleFrontier_BattleArenaLobby/map.bin b/data/layouts/BattleFrontier_BattleArenaLobby/map.bin new file mode 100644 index 000000000..2792d7979 --- /dev/null +++ b/data/layouts/BattleFrontier_BattleArenaLobby/map.bin @@ -0,0 +1,3 @@ +P6Q6P6P6P6P6S6X6R6P6P6P6P6U6P6P6X6Y666Z6[6S6\6R6Z6[666]6X6X6`6a666b6c6T6d6a6b6c666e6`6`6FFFFFFF¢FFFFFFFFFFFFFFFFFFFFFFFFFFFF#FFFFFF$FFF€FFF‘’“2%FFFFFF&F2‰4…‡™š› 2FFFFFF 2§2¡ +2 2 22222'222 22 22222 2‚2ƒ2„2 2 22222‰2222 2Š2‹2Œ2222222†22222222222222Ž +222222œ22ž2222222— \ No newline at end of file diff --git a/data/layouts/BattleFrontier_BattleDomeBattleRoom/border.bin b/data/layouts/BattleFrontier_BattleDomeBattleRoom/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattleDomeBattleRoom/border.bin differ diff --git a/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc new file mode 100644 index 000000000..3ed732898 --- /dev/null +++ b/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattleDomeBattleRoom_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattleDomeBattleRoom/border.bin" + + .align 2 +BattleFrontier_BattleDomeBattleRoom_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattleDomeBattleRoom/map.bin" + + .align 2 +BattleFrontier_BattleDomeBattleRoom_Layout:: + .4byte 0x14 + .4byte 0xa + .4byte BattleFrontier_BattleDomeBattleRoom_MapBorder + .4byte BattleFrontier_BattleDomeBattleRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleDome diff --git a/data/layouts/BattleFrontier_BattleDomeBattleRoom/map.bin b/data/layouts/BattleFrontier_BattleDomeBattleRoom/map.bin new file mode 100644 index 000000000..ffb450f3c --- /dev/null +++ b/data/layouts/BattleFrontier_BattleDomeBattleRoom/map.bin @@ -0,0 +1,2 @@ +ÐÐÑÐÐÐÐÐÐÐÑÐÐÐÐÐÑÐÐÐÐÐÑÐÐÐÐÐÐÐÑÐÐÐÐÐÑÐÐÐÒÒÓÒÒÒÒÒÒÒÓÒÒÒÒÒÓÒÒÒÔÕÖ×ØÙÚÔÕÖ×ØÙÚÔÕÖ×ØÙ  áâãäåæç      éêëìíîï      ñòóôõö÷ !"#$%&      ùúûüýþÿ()*+,-.      0123456        +   89:;<=>>    \ No newline at end of file diff --git a/data/layouts/BattleFrontier_BattleDomeCorridor/border.bin b/data/layouts/BattleFrontier_BattleDomeCorridor/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattleDomeCorridor/border.bin differ diff --git a/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc b/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc new file mode 100644 index 000000000..f4354caf0 --- /dev/null +++ b/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattleDomeCorridor_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattleDomeCorridor/border.bin" + + .align 2 +BattleFrontier_BattleDomeCorridor_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattleDomeCorridor/map.bin" + + .align 2 +BattleFrontier_BattleDomeCorridor_Layout:: + .4byte 0x30 + .4byte 0x7 + .4byte BattleFrontier_BattleDomeCorridor_MapBorder + .4byte BattleFrontier_BattleDomeCorridor_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleDome diff --git a/data/layouts/BattleFrontier_BattleDomeCorridor/map.bin b/data/layouts/BattleFrontier_BattleDomeCorridor/map.bin new file mode 100644 index 000000000..2a9c49675 --- /dev/null +++ b/data/layouts/BattleFrontier_BattleDomeCorridor/map.bin @@ -0,0 +1 @@ +ABCDEFGDABCDEFGDABCDEFGDABCDEFGDABCDEFGDABCDEFGDIJKLMNOLIJKLMNOLIJKLMNOLIJKLMNOLIJKLMNOLIJKLMNOLQRSSUVWTQRSTUVWTQRSTUVWTQRSTUVWTQRSTUVWTQRSTUVWTYZ[[]^_\YZ[\]^_\YZ[\]^_\YZ[\]^_\YZ[\]^_\YZ[\]^_\DBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBHA@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@AI@A@A@A@A@A@A@A@A@A@A@A=>@A@A@A@A@A@A@A@A@A@A@A@ \ No newline at end of file diff --git a/data/layouts/BattleFrontier_BattleDomeLobby/border.bin b/data/layouts/BattleFrontier_BattleDomeLobby/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattleDomeLobby/border.bin differ diff --git a/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc b/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc new file mode 100644 index 000000000..d9127802a --- /dev/null +++ b/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattleDomeLobby_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattleDomeLobby/border.bin" + + .align 2 +BattleFrontier_BattleDomeLobby_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattleDomeLobby/map.bin" + + .align 2 +BattleFrontier_BattleDomeLobby_Layout:: + .4byte 0x17 + .4byte 0x11 + .4byte BattleFrontier_BattleDomeLobby_MapBorder + .4byte BattleFrontier_BattleDomeLobby_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleDome diff --git a/data/layouts/BattleFrontier_BattleDomeLobby/map.bin b/data/layouts/BattleFrontier_BattleDomeLobby/map.bin new file mode 100644 index 000000000..655c6a39c --- /dev/null +++ b/data/layouts/BattleFrontier_BattleDomeLobby/map.bin @@ -0,0 +1 @@ +%&%&%&  -.  -.    -.  -.   567     567    34     34  $; <$$; <$DBCBCBCBCBCBCBCBCBCBCBCHA@A@A@A@A@A@A@A@A@A@A@I@‘A@A@A@A@A@A@A@Aqr@AHA˜™@A@A@ÝÞsÛÜ@A@A@yzI@I@ ¡’@tuv@A{A@`ab@“‚HAßܨ©šI|}~àÞƒßÜhijI›‰ŠàÞI@CBœžBCTA@A@CB”•–BCTAHA@A@A@A@A@A@A@A@A@A@A@‹„†„†@A@A@A@A@A@A@A„†„†Œ…‡…‡A@A@A@A@A@A@A@…‡…‡'„†@A@A@A@A@A@A@A„†„†„†/…‡A@A@A@A@=>A@A@…‡…‡…‡ \ No newline at end of file diff --git a/data/layouts/BattleFrontier_BattleDomePreBattleRoom/border.bin b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/border.bin differ diff --git a/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc new file mode 100644 index 000000000..4ac7a79df --- /dev/null +++ b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattleDomePreBattleRoom_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattleDomePreBattleRoom/border.bin" + + .align 2 +BattleFrontier_BattleDomePreBattleRoom_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattleDomePreBattleRoom/map.bin" + + .align 2 +BattleFrontier_BattleDomePreBattleRoom_Layout:: + .4byte 0x9 + .4byte 0x8 + .4byte BattleFrontier_BattleDomePreBattleRoom_MapBorder + .4byte BattleFrontier_BattleDomePreBattleRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleDome diff --git a/data/layouts/BattleFrontier_BattleDomePreBattleRoom/map.bin b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/map.bin new file mode 100644 index 000000000..49f40213a Binary files /dev/null and b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/map.bin differ diff --git a/data/layouts/BattleFrontier_BattleFactoryBattleRoom/border.bin b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/border.bin differ diff --git a/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc new file mode 100644 index 000000000..35b8a1dec --- /dev/null +++ b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattleFactoryBattleRoom_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattleFactoryBattleRoom/border.bin" + + .align 2 +BattleFrontier_BattleFactoryBattleRoom_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattleFactoryBattleRoom/map.bin" + + .align 2 +BattleFrontier_BattleFactoryBattleRoom_Layout:: + .4byte 0xd + .4byte 0xc + .4byte BattleFrontier_BattleFactoryBattleRoom_MapBorder + .4byte BattleFrontier_BattleFactoryBattleRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleFactory diff --git a/data/layouts/BattleFrontier_BattleFactoryBattleRoom/map.bin b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/map.bin new file mode 100644 index 000000000..feffbf038 Binary files /dev/null and b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/map.bin differ diff --git a/data/layouts/BattleFrontier_BattleFactoryLobby/border.bin b/data/layouts/BattleFrontier_BattleFactoryLobby/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattleFactoryLobby/border.bin differ diff --git a/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc b/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc new file mode 100644 index 000000000..2071dd54a --- /dev/null +++ b/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattleFactoryLobby_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattleFactoryLobby/border.bin" + + .align 2 +BattleFrontier_BattleFactoryLobby_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattleFactoryLobby/map.bin" + + .align 2 +BattleFrontier_BattleFactoryLobby_Layout:: + .4byte 0x13 + .4byte 0xc + .4byte BattleFrontier_BattleFactoryLobby_MapBorder + .4byte BattleFrontier_BattleFactoryLobby_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleFactory diff --git a/data/layouts/BattleFrontier_BattleFactoryLobby/map.bin b/data/layouts/BattleFrontier_BattleFactoryLobby/map.bin new file mode 100644 index 000000000..66037e302 --- /dev/null +++ b/data/layouts/BattleFrontier_BattleFactoryLobby/map.bin @@ -0,0 +1,2 @@ +#""#"""#"""#""#$()$(%)$(%)$()$ÕÖÖÖ×*+,ÝÞÞÞß*+,9<S234KTUVK234S<<A:`S\3]3^3LO;I22a-.=3202;/-432432 4!_1 4!3323322XYZ22532222PQR273243222222222222222228332222222222222222@4322222222  +  H \ No newline at end of file diff --git a/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/border.bin b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/border.bin differ diff --git a/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc new file mode 100644 index 000000000..f458fb9c2 --- /dev/null +++ b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattleFactoryPreBattleRoom_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/border.bin" + + .align 2 +BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/map.bin" + + .align 2 +BattleFrontier_BattleFactoryPreBattleRoom_Layout:: + .4byte 0x11 + .4byte 0xe + .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapBorder + .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleFactory diff --git a/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/map.bin b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/map.bin new file mode 100644 index 000000000..15e97cb30 --- /dev/null +++ b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/map.bin @@ -0,0 +1,2 @@ +ýþÿ01ýåæçBíîïR%&'JRRõö÷=>?-./ //=>?]^_*+,*+,ABCOMN234234DEFS\UVSSSHIJS`abcdÒÓDhijkl3ÚÛL4PQ33PQXY Z[4&'4 XY&'3&'3  + \ No newline at end of file diff --git a/data/layouts/BattleFrontier_BattlePalaceBattleRoom/border.bin b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/border.bin new file mode 100644 index 000000000..9afd13cdc Binary files /dev/null and b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/border.bin differ diff --git a/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc new file mode 100644 index 000000000..2a570bbd7 --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattlePalaceBattleRoom_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattlePalaceBattleRoom/border.bin" + + .align 2 +BattleFrontier_BattlePalaceBattleRoom_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattlePalaceBattleRoom/map.bin" + + .align 2 +BattleFrontier_BattlePalaceBattleRoom_Layout:: + .4byte 0xf + .4byte 0xa + .4byte BattleFrontier_BattlePalaceBattleRoom_MapBorder + .4byte BattleFrontier_BattlePalaceBattleRoom_MapBlockdata + .4byte gTileset_General + .4byte gTileset_BattlePalace diff --git a/data/layouts/BattleFrontier_BattlePalaceBattleRoom/map.bin b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/map.bin new file mode 100644 index 000000000..58d0a581f --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/map.bin @@ -0,0 +1 @@ +K2L2?6K2L2?6K2L2?6K2L2?6H6I2JM2N2G6M2N2G6M2N2G6M2N2G6P6Q2RU2V2O6U2V2O6U2V2O6U2V2O6£¤¥‰1‰1‰11X2Y6Z6[6\6]6^6€112222&2’`6a6b6c6d6e6f6’12222&2’1hijklmn’12222’pqrstuv’12222’xyz{|}~’12222š‰‰‰‰‰‰‰˜’12222pppppppppš‰‰ \ No newline at end of file diff --git a/data/layouts/BattleFrontier_BattlePalaceCorridor/border.bin b/data/layouts/BattleFrontier_BattlePalaceCorridor/border.bin new file mode 100644 index 000000000..9afd13cdc Binary files /dev/null and b/data/layouts/BattleFrontier_BattlePalaceCorridor/border.bin differ diff --git a/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc b/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc new file mode 100644 index 000000000..b76b87cb5 --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattlePalaceCorridor_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattlePalaceCorridor/border.bin" + + .align 2 +BattleFrontier_BattlePalaceCorridor_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattlePalaceCorridor/map.bin" + + .align 2 +BattleFrontier_BattlePalaceCorridor_Layout:: + .4byte 0x11 + .4byte 0xe + .4byte BattleFrontier_BattlePalaceCorridor_MapBorder + .4byte BattleFrontier_BattlePalaceCorridor_MapBlockdata + .4byte gTileset_General + .4byte gTileset_BattlePalace diff --git a/data/layouts/BattleFrontier_BattlePalaceCorridor/map.bin b/data/layouts/BattleFrontier_BattlePalaceCorridor/map.bin new file mode 100644 index 000000000..f2bc6aca4 Binary files /dev/null and b/data/layouts/BattleFrontier_BattlePalaceCorridor/map.bin differ diff --git a/data/layouts/BattleFrontier_BattlePalaceLobby/border.bin b/data/layouts/BattleFrontier_BattlePalaceLobby/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattlePalaceLobby/border.bin differ diff --git a/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc b/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc new file mode 100644 index 000000000..08c904db8 --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattlePalaceLobby_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattlePalaceLobby/border.bin" + + .align 2 +BattleFrontier_BattlePalaceLobby_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattlePalaceLobby/map.bin" + + .align 2 +BattleFrontier_BattlePalaceLobby_Layout:: + .4byte 0x19 + .4byte 0xc + .4byte BattleFrontier_BattlePalaceLobby_MapBorder + .4byte BattleFrontier_BattlePalaceLobby_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePalace diff --git a/data/layouts/BattleFrontier_BattlePalaceLobby/map.bin b/data/layouts/BattleFrontier_BattlePalaceLobby/map.bin new file mode 100644 index 000000000..cda8ff10e --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePalaceLobby/map.bin @@ -0,0 +1,7 @@ +  +   +    +     +     +    +   6   6 2 2 2 6 2 2 2 2 6666 2 6 2 2 2 6 2  6 6   666 6 2‹Œ 6666 2 666 6 2  6 666 6626 66“”• 6#6$6%66 6626 666 6 !@A›œ+,- !@AŽ)*ˆ‰ŠŽ)*ˆ‰Š–1¨©ª‘’"–1«¬­‘’"žž \ No newline at end of file diff --git a/data/layouts/BattleFrontier_BattlePikeCorridor/border.bin b/data/layouts/BattleFrontier_BattlePikeCorridor/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattlePikeCorridor/border.bin differ diff --git a/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc b/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc new file mode 100644 index 000000000..7dd3dcbaa --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattlePikeCorridor_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattlePikeCorridor/border.bin" + + .align 2 +BattleFrontier_BattlePikeCorridor_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattlePikeCorridor/map.bin" + + .align 2 +BattleFrontier_BattlePikeCorridor_Layout:: + .4byte 0xe + .4byte 0x8 + .4byte BattleFrontier_BattlePikeCorridor_MapBorder + .4byte BattleFrontier_BattlePikeCorridor_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePike diff --git a/data/layouts/BattleFrontier_BattlePikeCorridor/map.bin b/data/layouts/BattleFrontier_BattlePikeCorridor/map.bin new file mode 100644 index 000000000..5e02c145b --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePikeCorridor/map.bin @@ -0,0 +1 @@ +¡¦§ ¡¢£¤¥¦ ¡¦§©®¯¨©ª«¬­®¨©®¯±6¶6·6°6±6²6³6´6µ6¶°±¶·¹¾¿$¹º»2¼½%¸¹¾¿Ù2Ú2Ú2,Ú2ã2ä2å2Ú2,Ú2Ú2Ú2Ú2Ã2Á2Á2Ú22Þ2ü2ß22Ú2Á2Á2Á2Á2Ã2Á22Á2Þ2ü2ß2Á22Á2Á2Á2Ã2Á2Á2Ú2æ2è2ç2Ú2Á2Á2Á2Á2 \ No newline at end of file diff --git a/data/layouts/BattleFrontier_BattlePikeLobby/border.bin b/data/layouts/BattleFrontier_BattlePikeLobby/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattlePikeLobby/border.bin differ diff --git a/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc b/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc new file mode 100644 index 000000000..a1bd10dd3 --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattlePikeLobby_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattlePikeLobby/border.bin" + + .align 2 +BattleFrontier_BattlePikeLobby_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattlePikeLobby/map.bin" + + .align 2 +BattleFrontier_BattlePikeLobby_Layout:: + .4byte 0xb + .4byte 0xd + .4byte BattleFrontier_BattlePikeLobby_MapBorder + .4byte BattleFrontier_BattlePikeLobby_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePike diff --git a/data/layouts/BattleFrontier_BattlePikeLobby/map.bin b/data/layouts/BattleFrontier_BattlePikeLobby/map.bin new file mode 100644 index 000000000..4cbdfb405 --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePikeLobby/map.bin @@ -0,0 +1 @@ +¦6§6 6¡¢6£6¤6¥6¦6§6 6®6¯¨6©ª6«6¬6­6®6¯¨6*+,±²³´µ(·)2342º»2¼20¿1:3;3<32Ô2283Ô293Ä2Ô2Â2Ô2 Â2 Ô2Â2Â2Â2Ä22Â2Â2 3!3"3Â2Â22Â22 Â22Â2Â2Â22Â2 2 Ô2Â2 Â2Â2Â2 Â2Ô2 Õ22Â2Ô2Â2Â2Â2Ô2Â22Ô2Ä2 Â2Â2Â2Â2Â2Â2Â2 Â2Ä2Ô2Â22í2î2ï22Â2Ô2Â2Ä2Â2Â2 333 Â2Â2Â2 \ No newline at end of file diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin differ diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc new file mode 100644 index 000000000..c860deb93 --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattlePikeRandomRoom1_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin" + + .align 2 +BattleFrontier_BattlePikeRandomRoom1_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin" + + .align 2 +BattleFrontier_BattlePikeRandomRoom1_Layout:: + .4byte 0x9 + .4byte 0x8 + .4byte BattleFrontier_BattlePikeRandomRoom1_MapBorder + .4byte BattleFrontier_BattlePikeRandomRoom1_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePike diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin new file mode 100644 index 000000000..142150cbe --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin @@ -0,0 +1 @@ +§ ¡¢£¤¥¦§¯¨©ª«¬­®¯·°±²6³6´6µ¶·¿6¸6Û6º6»2¼6Û6¾6¿6Ù2Ú2,ã2ä2å2,Ú2Ú2Ã2Á2Ú2Þ2ü2ß2Ú2Á2Á2Ã2Á23Þ2ü2ß23Á2Á2Ã2Á2-æ2è2ç2-Á2Á2 \ No newline at end of file diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin differ diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc new file mode 100644 index 000000000..1ad2a90cc --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattlePikeRandomRoom2_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin" + + .align 2 +BattleFrontier_BattlePikeRandomRoom2_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin" + + .align 2 +BattleFrontier_BattlePikeRandomRoom2_Layout:: + .4byte 0x5 + .4byte 0x8 + .4byte BattleFrontier_BattlePikeRandomRoom2_MapBorder + .4byte BattleFrontier_BattlePikeRandomRoom2_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePike diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin new file mode 100644 index 000000000..27a6e52aa --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin @@ -0,0 +1 @@ +¥6¦6§6 6¡6­6®6¯6¨6©6µ6¶6·6°6±652¾¿¸52=@3A3B3=Ù2H3I3J3Ú242P3Q3R3Ý2<X3Y3Z3ù \ No newline at end of file diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin differ diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc new file mode 100644 index 000000000..b60e07361 --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattlePikeRandomRoom3_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin" + + .align 2 +BattleFrontier_BattlePikeRandomRoom3_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin" + + .align 2 +BattleFrontier_BattlePikeRandomRoom3_Layout:: + .4byte 0x9 + .4byte 0x14 + .4byte BattleFrontier_BattlePikeRandomRoom3_MapBorder + .4byte BattleFrontier_BattlePikeRandomRoom3_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePike diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin new file mode 100644 index 000000000..8ce7f1c37 --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin @@ -0,0 +1 @@ +§ ¡¢£¤¥¦§¯¨©ª«¬­®¯·°±²6³6´6µ¶·¿6¸6Û2º6»2¼6Û2¾6¿Ù2Ú2Üã2ä2å2ÜÚ2Ú242Ý2 3æ2è2ç2 3Ý2Ý2>ùùÁ2Á2Á2ùùù72 3 3Ý2Ý2Ý2 3 3Ú2>ùùùùùùùÁ2Ù2 3 3 3 3 3 3 3Ý2Ã2ùùùùùùùù42 3 3 3 3 3 3Ú2 3>ùùùùùùÁ2ù3Ú2 3 3 3 3 3Ý2 3>Á2ùùùùùùù72Ý2 3 3 3 3 3Ú2 3>ùùùùùùÁ2ù3 3Ú2Ú2Ú2Ú2Ú2Ý2 3>ù3ã2ä2å23ùùÙ2Ú2æ2è2ç2Ú2Ú2 \ No newline at end of file diff --git a/data/layouts/BattleFrontier_BattlePikeThreePathRoom/border.bin b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/border.bin differ diff --git a/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc new file mode 100644 index 000000000..d4f99085b --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattlePikeThreePathRoom_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattlePikeThreePathRoom/border.bin" + + .align 2 +BattleFrontier_BattlePikeThreePathRoom_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattlePikeThreePathRoom/map.bin" + + .align 2 +BattleFrontier_BattlePikeThreePathRoom_Layout:: + .4byte 0xd + .4byte 0xb + .4byte BattleFrontier_BattlePikeThreePathRoom_MapBorder + .4byte BattleFrontier_BattlePikeThreePathRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePike diff --git a/data/layouts/BattleFrontier_BattlePikeThreePathRoom/map.bin b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/map.bin new file mode 100644 index 000000000..9618fe22a --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/map.bin @@ -0,0 +1 @@ +¡¢£¤¡¢£¤¡¢£¤¥©ª«¬©ª«¬©ª«¬­±6²³´±²³´±²³´µÛ6º»2¼Û6º»2¼Û6º»2¼Û6Üã2ä2å2Üã2ä2å2Üã2ä2å2ÜÙ2æ2è2ç2Ú2æ2è2ç2Ú2æ2è2ç2Ú2Ã2Á2Á2Á2Á2Á2Á2Á2Á2Á2Á2Á2Á2Ã2Á2Á2Á2Á2Á2Á2Á2Á2Á2Á2Á2Á2Ã2Á2Á2Á2Á2Á2Á2Á2Á2Á2Á2Á2Á2Ã2Á2Á23Á2Á2Á2Á23Á2Á2Á2Á2Ã2Á2Á2-à2á2á2â2-Á2Á2Á2Á2 \ No newline at end of file diff --git a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin differ diff --git a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc new file mode 100644 index 000000000..8a991e45d --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattlePointExchangeServiceCorner_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin" + + .align 2 +BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin" + + .align 2 +BattleFrontier_BattlePointExchangeServiceCorner_Layout:: + .4byte 0xf + .4byte 0xb + .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapBorder + .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleFrontier diff --git a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin new file mode 100644 index 000000000..62d5761e0 --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin @@ -0,0 +1,2 @@ +àáâàáâàáâàáâàáøèéêðùú  +ûüòèéºÀÁ†ýþ  †ºÀ·Ž¹¸†¸¹¸†Ì¹¸–¸¹†Í¸¹¸¹¸¹†Í¸¹ž¹¸†¦ÓÔÓÔÓԆ̹¸Í¸¹øòòòòòòòü͸¹Ž¹¸ÁÀÁÀÁÀÁÀÁÕ¹¸ž¸¹¸¹¸¹¸¹¸¹¸¹¸¹Í¸¹¸¹mno¹¸¹¸¹Í¸¹¸uvw¸¹¸¹ \ No newline at end of file diff --git a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin differ diff --git a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc new file mode 100644 index 000000000..2097173cc --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattlePyramidEmptySquare_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin" + + .align 2 +BattleFrontier_BattlePyramidEmptySquare_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin" + + .align 2 +BattleFrontier_BattlePyramidEmptySquare_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattleFrontier_BattlePyramidEmptySquare_MapBorder + .4byte BattleFrontier_BattlePyramidEmptySquare_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin new file mode 100644 index 000000000..7c224d524 --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin @@ -0,0 +1 @@ +22222222222222222222222222222222 \ No newline at end of file diff --git a/data/layouts/BattleFrontier_BattlePyramidLobby/border.bin b/data/layouts/BattleFrontier_BattlePyramidLobby/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattlePyramidLobby/border.bin differ diff --git a/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc b/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc new file mode 100644 index 000000000..ecdceec7f --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattlePyramidLobby_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattlePyramidLobby/border.bin" + + .align 2 +BattleFrontier_BattlePyramidLobby_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattlePyramidLobby/map.bin" + + .align 2 +BattleFrontier_BattlePyramidLobby_Layout:: + .4byte 0xf + .4byte 0x12 + .4byte BattleFrontier_BattlePyramidLobby_MapBorder + .4byte BattleFrontier_BattlePyramidLobby_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/layouts/BattleFrontier_BattlePyramidLobby/map.bin b/data/layouts/BattleFrontier_BattlePyramidLobby/map.bin new file mode 100644 index 000000000..32f23d3de --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePyramidLobby/map.bin @@ -0,0 +1,2 @@ +FF F +FFFFFFFF F!F"FFFFFFFFFFFFF(F)F*FFFFFFFFFFFFFF0FFFFFF+FFFFF+FF0FFFFFF3FF F B F3FF0FFFBBF BF B B B B BF B1FBBBBB B B B B B B B B BBBB B B B B B B B B B B B B B B B B B BFFF#F$B%FFFF B B B B B BFFF#F$B%FFFF B B BFFF#F$B%FFFFFFFÊËÌFFÈ#F$B%FFFFFFÒÓÔFFÐ#F$B%FFFFF&FÚÛÜ B BØÀBÁBÂB B B B B.B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B BÃBÄBÅB B B B B B B \ No newline at end of file diff --git a/data/layouts/BattleFrontier_BattlePyramidTop/border.bin b/data/layouts/BattleFrontier_BattlePyramidTop/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattlePyramidTop/border.bin differ diff --git a/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc b/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc new file mode 100644 index 000000000..e96259589 --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattlePyramidTop_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattlePyramidTop/border.bin" + + .align 2 +BattleFrontier_BattlePyramidTop_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattlePyramidTop/map.bin" + + .align 2 +BattleFrontier_BattlePyramidTop_Layout:: + .4byte 0x22 + .4byte 0x17 + .4byte BattleFrontier_BattlePyramidTop_MapBorder + .4byte BattleFrontier_BattlePyramidTop_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/layouts/BattleFrontier_BattlePyramidTop/map.bin b/data/layouts/BattleFrontier_BattlePyramidTop/map.bin new file mode 100644 index 000000000..dba9cf1b0 --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePyramidTop/map.bin @@ -0,0 +1 @@ +}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}…………………………………………………………………………………………;;;;;;;;;;;;;;;xyz{|;;;;;;;;;;;;;;;;;;;;;;;;;;;;;€‚ƒ„;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ˆ‰Š‹Œ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;‘’“”;;;;;;;;;;;;;;;;;;;;;;;;;;;;;˜™BšB›Bœ;;;;;;;;;;;;;;;;;;;;;;;;;;;;8b9b@BABBB9b:b;;;;;;;;;;;;;;;;;;;;;;;;;8B9B@bAb@BIBJBAbBb9B:B;;;;;;;;;;;CCCCCCCCCC8b9b@BABHbAbPQRAbBbABBB9bFbCCCCCCCCCKKKKKKKKLBMB@bAbHBAB@bIbXbYbXbIbBbABBBAbBbMBNBKKKKKKKSSSSSSTU@BAB@bIb@BIBPZZQZZRIBBBAbBbABBBUVSSSSS[[[[\]@AHBAB@bIb@BIBXBXBXBYBXBXBXBIBBBIbBbABBBAB]^[[[[[\]@A@AHBAB@bIbPZZZZQZZZZRIbBbIBBBIBAB]^[\^@A@AHA@BAB@bIbXbXbXbXbXbYbXbXbXbXbXbIbBbIBBBIBIBAB^@B@AHAHA@BABPZZZZZZQZZZZZZRIBBBIBIBIBBHAHAHA@AHBABXBXBXBXBXBXBXBYBXBXBXBXBXBXBXBIBBBIBIBIBIHAHA@AHAPZZZZZZZZZZZZZZZZZRIBIBIBI@A@AHAHAXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBIBIBIBIHAHAHAPZZZZZZZZZZZZZZZZZZZZZRIBIBIHAHAHAXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBIBIBIHAHAPZZZZZZZZZZZZZZZZZZZZZZZZZRIBI \ No newline at end of file diff --git a/data/layouts/BattleFrontier_BattleTowerBattleRoom/border.bin b/data/layouts/BattleFrontier_BattleTowerBattleRoom/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattleTowerBattleRoom/border.bin differ diff --git a/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc new file mode 100644 index 000000000..8738d81e1 --- /dev/null +++ b/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattleTowerBattleRoom_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattleTowerBattleRoom/border.bin" + + .align 2 +BattleFrontier_BattleTowerBattleRoom_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattleTowerBattleRoom/map.bin" + + .align 2 +BattleFrontier_BattleTowerBattleRoom_Layout:: + .4byte 0xa + .4byte 0x9 + .4byte BattleFrontier_BattleTowerBattleRoom_MapBorder + .4byte BattleFrontier_BattleTowerBattleRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleFrontier diff --git a/data/layouts/BattleFrontier_BattleTowerBattleRoom/map.bin b/data/layouts/BattleFrontier_BattleTowerBattleRoom/map.bin new file mode 100644 index 000000000..42d99b5a6 --- /dev/null +++ b/data/layouts/BattleFrontier_BattleTowerBattleRoom/map.bin @@ -0,0 +1 @@ +///LMMN///?77TU2U2V77?G<2<2<2<2<2<2<2<2;2:2H2B2I2J2B2K2:2:2;2:2D2P2Q2R2S2E2:2:2;2:2D2X2Y2Z2[2E2:2:2;2:2D2`2a2b2c2E2:2:2~2:2@2C21292C2A2:2>2:2:2:222:2:2:2F \ No newline at end of file diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor/border.bin b/data/layouts/BattleFrontier_BattleTowerCorridor/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattleTowerCorridor/border.bin differ diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc b/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc new file mode 100644 index 000000000..c54c38812 --- /dev/null +++ b/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattleTowerCorridor_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattleTowerCorridor/border.bin" + + .align 2 +BattleFrontier_BattleTowerCorridor_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattleTowerCorridor/map.bin" + + .align 2 +BattleFrontier_BattleTowerCorridor_Layout:: + .4byte 0x11 + .4byte 0x5 + .4byte BattleFrontier_BattleTowerCorridor_MapBorder + .4byte BattleFrontier_BattleTowerCorridor_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleFrontier diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor/map.bin b/data/layouts/BattleFrontier_BattleTowerCorridor/map.bin new file mode 100644 index 000000000..0b0803f91 Binary files /dev/null and b/data/layouts/BattleFrontier_BattleTowerCorridor/map.bin differ diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin b/data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin differ diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc b/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc new file mode 100644 index 000000000..9e822f0f9 --- /dev/null +++ b/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattleTowerCorridor2_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin" + + .align 2 +BattleFrontier_BattleTowerCorridor2_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin" + + .align 2 +BattleFrontier_BattleTowerCorridor2_Layout:: + .4byte 0x11 + .4byte 0x5 + .4byte BattleFrontier_BattleTowerCorridor2_MapBorder + .4byte BattleFrontier_BattleTowerCorridor2_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleFrontier diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin b/data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin new file mode 100644 index 000000000..87e93b640 Binary files /dev/null and b/data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin differ diff --git a/data/layouts/BattleFrontier_BattleTowerLobby/border.bin b/data/layouts/BattleFrontier_BattleTowerLobby/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattleTowerLobby/border.bin differ diff --git a/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc b/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc new file mode 100644 index 000000000..dc3733bc0 --- /dev/null +++ b/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattleTowerLobby_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattleTowerLobby/border.bin" + + .align 2 +BattleFrontier_BattleTowerLobby_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattleTowerLobby/map.bin" + + .align 2 +BattleFrontier_BattleTowerLobby_Layout:: + .4byte 0x19 + .4byte 0xa + .4byte BattleFrontier_BattleTowerLobby_MapBorder + .4byte BattleFrontier_BattleTowerLobby_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleFrontier diff --git a/data/layouts/BattleFrontier_BattleTowerLobby/map.bin b/data/layouts/BattleFrontier_BattleTowerLobby/map.bin new file mode 100644 index 000000000..77926803a Binary files /dev/null and b/data/layouts/BattleFrontier_BattleTowerLobby/map.bin differ diff --git a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin differ diff --git a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc new file mode 100644 index 000000000..dbd77c420 --- /dev/null +++ b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattleTowerMultiBattleRoom_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin" + + .align 2 +BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin" + + .align 2 +BattleFrontier_BattleTowerMultiBattleRoom_Layout:: + .4byte 0x15 + .4byte 0xf + .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapBorder + .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleFrontier diff --git a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin new file mode 100644 index 000000000..b0a58e016 Binary files /dev/null and b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin differ diff --git a/data/layouts/BattleFrontier_Lounge1/border.bin b/data/layouts/BattleFrontier_Lounge1/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_Lounge1/border.bin differ diff --git a/data/layouts/BattleFrontier_Lounge1/layout.inc b/data/layouts/BattleFrontier_Lounge1/layout.inc new file mode 100644 index 000000000..cc22cc8d7 --- /dev/null +++ b/data/layouts/BattleFrontier_Lounge1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_Lounge1_MapBorder:: + .incbin "data/layouts/BattleFrontier_Lounge1/border.bin" + + .align 2 +BattleFrontier_Lounge1_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_Lounge1/map.bin" + + .align 2 +BattleFrontier_Lounge1_Layout:: + .4byte 0xd + .4byte 0x8 + .4byte BattleFrontier_Lounge1_MapBorder + .4byte BattleFrontier_Lounge1_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleFrontier diff --git a/data/layouts/BattleFrontier_Lounge1/map.bin b/data/layouts/BattleFrontier_Lounge1/map.bin new file mode 100644 index 000000000..11ae8d6ee --- /dev/null +++ b/data/layouts/BattleFrontier_Lounge1/map.bin @@ -0,0 +1 @@ +½¾½¾¿½¤¾½½½½½ÅÆÇÆÇÆÆÇÆÇÆÅÐ3ÎÏÎÏÎ¥3ÎÏÎÏÎÊ3Ý3È3÷3È3ç3È3Ü3È3É3È3ç3È3Ú3å3É3ï3É3ß3É3äÉ3ï3É3ß3É3à3í3È3É3È3É3È3Ü3È3÷3È3ç3È3è3Ñ3É3È3É3È3É3äÉ3ï3É3ß3É3È3µ3¶3È3É3È3É3È3É3È3É3È3 \ No newline at end of file diff --git a/data/layouts/BattleFrontier_Lounge2/border.bin b/data/layouts/BattleFrontier_Lounge2/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_Lounge2/border.bin differ diff --git a/data/layouts/BattleFrontier_Lounge2/layout.inc b/data/layouts/BattleFrontier_Lounge2/layout.inc new file mode 100644 index 000000000..1f8df21ae --- /dev/null +++ b/data/layouts/BattleFrontier_Lounge2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_Lounge2_MapBorder:: + .incbin "data/layouts/BattleFrontier_Lounge2/border.bin" + + .align 2 +BattleFrontier_Lounge2_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_Lounge2/map.bin" + + .align 2 +BattleFrontier_Lounge2_Layout:: + .4byte 0x9 + .4byte 0xa + .4byte BattleFrontier_Lounge2_MapBorder + .4byte BattleFrontier_Lounge2_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleFrontier diff --git a/data/layouts/BattleFrontier_Lounge2/map.bin b/data/layouts/BattleFrontier_Lounge2/map.bin new file mode 100644 index 000000000..f5f1745b1 --- /dev/null +++ b/data/layouts/BattleFrontier_Lounge2/map.bin @@ -0,0 +1 @@ +½¾¿¾¾¿¾¿ÆÆÇÆ•ÆÇÆÇ×ÎÏÎÎÏÎÏÝÈÉÈ¥ÈÉÈÚíÉïÉÈÉßÉàÝÈ÷ÈÉÈçÈèåÉßÉÈÉïÉÚíÈçÈÉÈ÷ÈèÑÉÈÉÈÉÈÉÈÑɬ­®ÉÈ \ No newline at end of file diff --git a/data/layouts/BattleFrontier_OutsideEast/border.bin b/data/layouts/BattleFrontier_OutsideEast/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/BattleFrontier_OutsideEast/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/BattleFrontier_OutsideEast/layout.inc b/data/layouts/BattleFrontier_OutsideEast/layout.inc new file mode 100644 index 000000000..e79db8ee7 --- /dev/null +++ b/data/layouts/BattleFrontier_OutsideEast/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_OutsideEast_MapBorder:: + .incbin "data/layouts/BattleFrontier_OutsideEast/border.bin" + + .align 2 +BattleFrontier_OutsideEast_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_OutsideEast/map.bin" + + .align 2 +BattleFrontier_OutsideEast_Layout:: + .4byte 0x48 + .4byte 0x48 + .4byte BattleFrontier_OutsideEast_MapBorder + .4byte BattleFrontier_OutsideEast_MapBlockdata + .4byte gTileset_General + .4byte gTileset_BattleFrontierOutsideEast diff --git a/data/layouts/BattleFrontier_OutsideEast/map.bin b/data/layouts/BattleFrontier_OutsideEast/map.bin new file mode 100644 index 000000000..b073c4585 Binary files /dev/null and b/data/layouts/BattleFrontier_OutsideEast/map.bin differ diff --git a/data/layouts/BattleFrontier_OutsideWest/border.bin b/data/layouts/BattleFrontier_OutsideWest/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/BattleFrontier_OutsideWest/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/BattleFrontier_OutsideWest/layout.inc b/data/layouts/BattleFrontier_OutsideWest/layout.inc new file mode 100644 index 000000000..0644d4b2b --- /dev/null +++ b/data/layouts/BattleFrontier_OutsideWest/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_OutsideWest_MapBorder:: + .incbin "data/layouts/BattleFrontier_OutsideWest/border.bin" + + .align 2 +BattleFrontier_OutsideWest_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_OutsideWest/map.bin" + + .align 2 +BattleFrontier_OutsideWest_Layout:: + .4byte 0x38 + .4byte 0x48 + .4byte BattleFrontier_OutsideWest_MapBorder + .4byte BattleFrontier_OutsideWest_MapBlockdata + .4byte gTileset_General + .4byte gTileset_BattleFrontierOutsideWest diff --git a/data/layouts/BattleFrontier_OutsideWest/map.bin b/data/layouts/BattleFrontier_OutsideWest/map.bin new file mode 100644 index 000000000..d43111bda Binary files /dev/null and b/data/layouts/BattleFrontier_OutsideWest/map.bin differ diff --git a/data/layouts/BattleFrontier_RankingHall/border.bin b/data/layouts/BattleFrontier_RankingHall/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_RankingHall/border.bin differ diff --git a/data/layouts/BattleFrontier_RankingHall/layout.inc b/data/layouts/BattleFrontier_RankingHall/layout.inc new file mode 100644 index 000000000..03639f203 --- /dev/null +++ b/data/layouts/BattleFrontier_RankingHall/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_RankingHall_MapBorder:: + .incbin "data/layouts/BattleFrontier_RankingHall/border.bin" + + .align 2 +BattleFrontier_RankingHall_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_RankingHall/map.bin" + + .align 2 +BattleFrontier_RankingHall_Layout:: + .4byte 0x35 + .4byte 0xf + .4byte BattleFrontier_RankingHall_MapBorder + .4byte BattleFrontier_RankingHall_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleFrontierRankingHall diff --git a/data/layouts/BattleFrontier_RankingHall/map.bin b/data/layouts/BattleFrontier_RankingHall/map.bin new file mode 100644 index 000000000..df32e0665 --- /dev/null +++ b/data/layouts/BattleFrontier_RankingHall/map.bin @@ -0,0 +1,64 @@ +(((((00000((((($88888%(((((00000&'2222222&'00000$88888%A2 2 +2 2 +22 +2 2 +2 2F2$88888%2222222I222222222N22222222&' 2 2 +22 +2 2 +2&'((("# 2 2 +2 2 +2 2 +2 2 +2 2 +2"#(((&' 2 +2 22 2 +2 2&'+22222222220P02222222222222220Q0222222222232 2 +22 +2 2 +22 +2 2 +2$8X8% 2 2 +2 2 2K2L2M2 2 2 +2 2 +2$8Y8% 2 2 +22 +2 2 +22 +2 2 +2+22222222222222222222STU2222222222222222222232 2 +2 2 +2 2 +2 2 +2 2 +2 2 +2 2 +2 2 +2 2 +2 2 +2 2[2\2]2 2 +2 2 +2 2 +2 2 +2 2 +2 2 +2 2 +2 2 +2 2 +2 2 +2 2 +22222222222222222222222222222222222222,2-2 +2 2 +2.2/2 +2 2 +2 2 +2 2 +2 2 +2 2 +2 +2;2 +2;2 +2;2 +242522226272222222222222C22C22C22 +2 2 +200 2 +2 \ No newline at end of file diff --git a/data/layouts/BattleFrontier_ReceptionGate/border.bin b/data/layouts/BattleFrontier_ReceptionGate/border.bin new file mode 100644 index 000000000..9afd13cdc Binary files /dev/null and b/data/layouts/BattleFrontier_ReceptionGate/border.bin differ diff --git a/data/layouts/BattleFrontier_ReceptionGate/layout.inc b/data/layouts/BattleFrontier_ReceptionGate/layout.inc new file mode 100644 index 000000000..11beca5e5 --- /dev/null +++ b/data/layouts/BattleFrontier_ReceptionGate/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_ReceptionGate_MapBorder:: + .incbin "data/layouts/BattleFrontier_ReceptionGate/border.bin" + + .align 2 +BattleFrontier_ReceptionGate_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_ReceptionGate/map.bin" + + .align 2 +BattleFrontier_ReceptionGate_Layout:: + .4byte 0x9 + .4byte 0xe + .4byte BattleFrontier_ReceptionGate_MapBorder + .4byte BattleFrontier_ReceptionGate_MapBlockdata + .4byte gTileset_General + .4byte gTileset_BattleFrontier diff --git a/data/layouts/BattleFrontier_ReceptionGate/map.bin b/data/layouts/BattleFrontier_ReceptionGate/map.bin new file mode 100644 index 000000000..2b75ea851 Binary files /dev/null and b/data/layouts/BattleFrontier_ReceptionGate/map.bin differ diff --git a/data/layouts/BattleFrontier_ScottsHouse/border.bin b/data/layouts/BattleFrontier_ScottsHouse/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_ScottsHouse/border.bin differ diff --git a/data/layouts/BattleFrontier_ScottsHouse/layout.inc b/data/layouts/BattleFrontier_ScottsHouse/layout.inc new file mode 100644 index 000000000..913d636d1 --- /dev/null +++ b/data/layouts/BattleFrontier_ScottsHouse/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_ScottsHouse_MapBorder:: + .incbin "data/layouts/BattleFrontier_ScottsHouse/border.bin" + + .align 2 +BattleFrontier_ScottsHouse_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_ScottsHouse/map.bin" + + .align 2 +BattleFrontier_ScottsHouse_Layout:: + .4byte 0x6 + .4byte 0x8 + .4byte BattleFrontier_ScottsHouse_MapBorder + .4byte BattleFrontier_ScottsHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleFrontier diff --git a/data/layouts/BattleFrontier_ScottsHouse/map.bin b/data/layouts/BattleFrontier_ScottsHouse/map.bin new file mode 100644 index 000000000..8844e94dd --- /dev/null +++ b/data/layouts/BattleFrontier_ScottsHouse/map.bin @@ -0,0 +1 @@ +»¼»¼»¼ÃÄÃÄÃÄÐËÊËÊËÒÈÉÈÉßÑÉÈÉÈÜÒÈÉÈÉäÑÉÈÉÈÉѵ3¶3É \ No newline at end of file diff --git a/data/layouts/BattlePyramidSquare01/border.bin b/data/layouts/BattlePyramidSquare01/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattlePyramidSquare01/border.bin differ diff --git a/data/layouts/BattlePyramidSquare01/layout.inc b/data/layouts/BattlePyramidSquare01/layout.inc new file mode 100644 index 000000000..103f35b31 --- /dev/null +++ b/data/layouts/BattlePyramidSquare01/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare01_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare01/border.bin" + + .align 2 +BattlePyramidSquare01_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare01/map.bin" + + .align 2 +BattlePyramidSquare01_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare01_MapBorder + .4byte BattlePyramidSquare01_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/layouts/BattlePyramidSquare01/map.bin b/data/layouts/BattlePyramidSquare01/map.bin new file mode 100644 index 000000000..586ccbdbd --- /dev/null +++ b/data/layouts/BattlePyramidSquare01/map.bin @@ -0,0 +1 @@ +BBBBBBBBBBBBBBaBB`tjBBsBBsBBBBsBBsBŽBBBsBBsBBhtrBBqBBBBBBBBBBBBBB \ No newline at end of file diff --git a/data/layouts/BattlePyramidSquare02/border.bin b/data/layouts/BattlePyramidSquare02/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattlePyramidSquare02/border.bin differ diff --git a/data/layouts/BattlePyramidSquare02/layout.inc b/data/layouts/BattlePyramidSquare02/layout.inc new file mode 100644 index 000000000..c831af0a8 --- /dev/null +++ b/data/layouts/BattlePyramidSquare02/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare02_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare02/border.bin" + + .align 2 +BattlePyramidSquare02_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare02/map.bin" + + .align 2 +BattlePyramidSquare02_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare02_MapBorder + .4byte BattlePyramidSquare02_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/layouts/BattlePyramidSquare02/map.bin b/data/layouts/BattlePyramidSquare02/map.bin new file mode 100644 index 000000000..5a9b8d4ce --- /dev/null +++ b/data/layouts/BattlePyramidSquare02/map.bin @@ -0,0 +1 @@ +BBhtttjBBBBBBBBBBBBBBBBBaBBBBBaBsBBŽBBqBsBBBBBBBsBBBBBBBptjBhjBB \ No newline at end of file diff --git a/data/layouts/BattlePyramidSquare03/border.bin b/data/layouts/BattlePyramidSquare03/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattlePyramidSquare03/border.bin differ diff --git a/data/layouts/BattlePyramidSquare03/layout.inc b/data/layouts/BattlePyramidSquare03/layout.inc new file mode 100644 index 000000000..fb1da5213 --- /dev/null +++ b/data/layouts/BattlePyramidSquare03/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare03_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare03/border.bin" + + .align 2 +BattlePyramidSquare03_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare03/map.bin" + + .align 2 +BattlePyramidSquare03_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare03_MapBorder + .4byte BattlePyramidSquare03_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/layouts/BattlePyramidSquare03/map.bin b/data/layouts/BattlePyramidSquare03/map.bin new file mode 100644 index 000000000..903b8a49b --- /dev/null +++ b/data/layouts/BattlePyramidSquare03/map.bin @@ -0,0 +1 @@ +BBBBBBBBBaBBBBBBBsBBBBaBBsBBBBqBhkjBBBBBBBBBBBaBB`ttttrBŽBqBBBBBB \ No newline at end of file diff --git a/data/layouts/BattlePyramidSquare04/border.bin b/data/layouts/BattlePyramidSquare04/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattlePyramidSquare04/border.bin differ diff --git a/data/layouts/BattlePyramidSquare04/layout.inc b/data/layouts/BattlePyramidSquare04/layout.inc new file mode 100644 index 000000000..b8b7ce24f --- /dev/null +++ b/data/layouts/BattlePyramidSquare04/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare04_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare04/border.bin" + + .align 2 +BattlePyramidSquare04_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare04/map.bin" + + .align 2 +BattlePyramidSquare04_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare04_MapBorder + .4byte BattlePyramidSquare04_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/layouts/BattlePyramidSquare04/map.bin b/data/layouts/BattlePyramidSquare04/map.bin new file mode 100644 index 000000000..32a264546 --- /dev/null +++ b/data/layouts/BattlePyramidSquare04/map.bin @@ -0,0 +1 @@ +BBBBBBBBB`ttttjBBsBBBBBBBqBBBBBBBBBBBBBBBaBBBBBBBqBBBBŽBBBBBBBBBB \ No newline at end of file diff --git a/data/layouts/BattlePyramidSquare05/border.bin b/data/layouts/BattlePyramidSquare05/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattlePyramidSquare05/border.bin differ diff --git a/data/layouts/BattlePyramidSquare05/layout.inc b/data/layouts/BattlePyramidSquare05/layout.inc new file mode 100644 index 000000000..f6f61cd5f --- /dev/null +++ b/data/layouts/BattlePyramidSquare05/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare05_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare05/border.bin" + + .align 2 +BattlePyramidSquare05_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare05/map.bin" + + .align 2 +BattlePyramidSquare05_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare05_MapBorder + .4byte BattlePyramidSquare05_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/layouts/BattlePyramidSquare05/map.bin b/data/layouts/BattlePyramidSquare05/map.bin new file mode 100644 index 000000000..d6c5a6897 --- /dev/null +++ b/data/layouts/BattlePyramidSquare05/map.bin @@ -0,0 +1 @@ +BBBBBBBBBhbBBBBBBBsBBaBBBBsBBsBBBBsBBsBBBBqBBsBBBBŽBBpjBBBBBBBBB \ No newline at end of file diff --git a/data/layouts/BattlePyramidSquare06/border.bin b/data/layouts/BattlePyramidSquare06/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattlePyramidSquare06/border.bin differ diff --git a/data/layouts/BattlePyramidSquare06/layout.inc b/data/layouts/BattlePyramidSquare06/layout.inc new file mode 100644 index 000000000..3774ce871 --- /dev/null +++ b/data/layouts/BattlePyramidSquare06/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare06_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare06/border.bin" + + .align 2 +BattlePyramidSquare06_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare06/map.bin" + + .align 2 +BattlePyramidSquare06_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare06_MapBorder + .4byte BattlePyramidSquare06_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/layouts/BattlePyramidSquare06/map.bin b/data/layouts/BattlePyramidSquare06/map.bin new file mode 100644 index 000000000..c30533aab --- /dev/null +++ b/data/layouts/BattlePyramidSquare06/map.bin @@ -0,0 +1 @@ +BBBBBBBBBaBhjBaBBsBBBBqBBqBBBBBBBBBŽBBaBBaBBBBsBBqBhjBqBBBBBBBBB \ No newline at end of file diff --git a/data/layouts/BattlePyramidSquare07/border.bin b/data/layouts/BattlePyramidSquare07/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattlePyramidSquare07/border.bin differ diff --git a/data/layouts/BattlePyramidSquare07/layout.inc b/data/layouts/BattlePyramidSquare07/layout.inc new file mode 100644 index 000000000..cd5f16b0e --- /dev/null +++ b/data/layouts/BattlePyramidSquare07/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare07_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare07/border.bin" + + .align 2 +BattlePyramidSquare07_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare07/map.bin" + + .align 2 +BattlePyramidSquare07_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare07_MapBorder + .4byte BattlePyramidSquare07_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/layouts/BattlePyramidSquare07/map.bin b/data/layouts/BattlePyramidSquare07/map.bin new file mode 100644 index 000000000..25f9c1529 --- /dev/null +++ b/data/layouts/BattlePyramidSquare07/map.bin @@ -0,0 +1 @@ +ŽBaBBBBBBBsBBaBaBhrBBqBsBBBBBBBqBBBBBaBBhttttrBaBBBBBBBsBBBBBBBq \ No newline at end of file diff --git a/data/layouts/BattlePyramidSquare08/border.bin b/data/layouts/BattlePyramidSquare08/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattlePyramidSquare08/border.bin differ diff --git a/data/layouts/BattlePyramidSquare08/layout.inc b/data/layouts/BattlePyramidSquare08/layout.inc new file mode 100644 index 000000000..bc3ac3005 --- /dev/null +++ b/data/layouts/BattlePyramidSquare08/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare08_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare08/border.bin" + + .align 2 +BattlePyramidSquare08_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare08/map.bin" + + .align 2 +BattlePyramidSquare08_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare08_MapBorder + .4byte BattlePyramidSquare08_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/layouts/BattlePyramidSquare08/map.bin b/data/layouts/BattlePyramidSquare08/map.bin new file mode 100644 index 000000000..86a830696 --- /dev/null +++ b/data/layouts/BattlePyramidSquare08/map.bin @@ -0,0 +1 @@ +BBttttjBBBBBBBBBsBBBBBBasBBŽBBBssBBBBBBssBBBBBBsqBBBBBBqBBhttjB \ No newline at end of file diff --git a/data/layouts/BattlePyramidSquare09/border.bin b/data/layouts/BattlePyramidSquare09/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattlePyramidSquare09/border.bin differ diff --git a/data/layouts/BattlePyramidSquare09/layout.inc b/data/layouts/BattlePyramidSquare09/layout.inc new file mode 100644 index 000000000..1794f72b3 --- /dev/null +++ b/data/layouts/BattlePyramidSquare09/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare09_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare09/border.bin" + + .align 2 +BattlePyramidSquare09_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare09/map.bin" + + .align 2 +BattlePyramidSquare09_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare09_MapBorder + .4byte BattlePyramidSquare09_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/layouts/BattlePyramidSquare09/map.bin b/data/layouts/BattlePyramidSquare09/map.bin new file mode 100644 index 000000000..e4f648704 --- /dev/null +++ b/data/layouts/BattlePyramidSquare09/map.bin @@ -0,0 +1 @@ +BBaBBBBBB`rBBaBBBqBBhrBBBBBBBBBBaBBBBBa`rBBaB`rqBB`rBqBŽBBqBBBB \ No newline at end of file diff --git a/data/layouts/BattlePyramidSquare10/border.bin b/data/layouts/BattlePyramidSquare10/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattlePyramidSquare10/border.bin differ diff --git a/data/layouts/BattlePyramidSquare10/layout.inc b/data/layouts/BattlePyramidSquare10/layout.inc new file mode 100644 index 000000000..49150f493 --- /dev/null +++ b/data/layouts/BattlePyramidSquare10/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare10_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare10/border.bin" + + .align 2 +BattlePyramidSquare10_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare10/map.bin" + + .align 2 +BattlePyramidSquare10_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare10_MapBorder + .4byte BattlePyramidSquare10_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/layouts/BattlePyramidSquare10/map.bin b/data/layouts/BattlePyramidSquare10/map.bin new file mode 100644 index 000000000..4aa7fd771 --- /dev/null +++ b/data/layouts/BattlePyramidSquare10/map.bin @@ -0,0 +1 @@ +BBBBhtjBBBBBBBBBBhjBhtjBBBBBBBBBhtjŽBhtjBBBBBBBBBhtjBBBBBBBBBBBBB \ No newline at end of file diff --git a/data/layouts/BattlePyramidSquare11/border.bin b/data/layouts/BattlePyramidSquare11/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattlePyramidSquare11/border.bin differ diff --git a/data/layouts/BattlePyramidSquare11/layout.inc b/data/layouts/BattlePyramidSquare11/layout.inc new file mode 100644 index 000000000..8385b6f3a --- /dev/null +++ b/data/layouts/BattlePyramidSquare11/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare11_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare11/border.bin" + + .align 2 +BattlePyramidSquare11_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare11/map.bin" + + .align 2 +BattlePyramidSquare11_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare11_MapBorder + .4byte BattlePyramidSquare11_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/layouts/BattlePyramidSquare11/map.bin b/data/layouts/BattlePyramidSquare11/map.bin new file mode 100644 index 000000000..f393f51e5 --- /dev/null +++ b/data/layouts/BattlePyramidSquare11/map.bin @@ -0,0 +1 @@ +BBBBBhjBBB`jBBBBBBsBBaBBhtrBBptbBBBŽBBqBBaBBBBBhrBBBBBBBBBhjBB \ No newline at end of file diff --git a/data/layouts/BattlePyramidSquare12/border.bin b/data/layouts/BattlePyramidSquare12/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattlePyramidSquare12/border.bin differ diff --git a/data/layouts/BattlePyramidSquare12/layout.inc b/data/layouts/BattlePyramidSquare12/layout.inc new file mode 100644 index 000000000..a63f1dc34 --- /dev/null +++ b/data/layouts/BattlePyramidSquare12/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare12_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare12/border.bin" + + .align 2 +BattlePyramidSquare12_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare12/map.bin" + + .align 2 +BattlePyramidSquare12_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare12_MapBorder + .4byte BattlePyramidSquare12_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/layouts/BattlePyramidSquare12/map.bin b/data/layouts/BattlePyramidSquare12/map.bin new file mode 100644 index 000000000..64dd96955 --- /dev/null +++ b/data/layouts/BattlePyramidSquare12/map.bin @@ -0,0 +1 @@ +htjBhtjŽBBBBBBBBBBBBBBBBBhjBhttjBBBBBBBBBBBBBBBBBBBBBBBBhtttttjB \ No newline at end of file diff --git a/data/layouts/BattlePyramidSquare13/border.bin b/data/layouts/BattlePyramidSquare13/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattlePyramidSquare13/border.bin differ diff --git a/data/layouts/BattlePyramidSquare13/layout.inc b/data/layouts/BattlePyramidSquare13/layout.inc new file mode 100644 index 000000000..6f145fe96 --- /dev/null +++ b/data/layouts/BattlePyramidSquare13/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare13_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare13/border.bin" + + .align 2 +BattlePyramidSquare13_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare13/map.bin" + + .align 2 +BattlePyramidSquare13_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare13_MapBorder + .4byte BattlePyramidSquare13_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/layouts/BattlePyramidSquare13/map.bin b/data/layouts/BattlePyramidSquare13/map.bin new file mode 100644 index 000000000..5fc1485a7 --- /dev/null +++ b/data/layouts/BattlePyramidSquare13/map.bin @@ -0,0 +1 @@ +aBBBaBBBsBaBsBaBqBqBsBsBBBBBqBqBBBŽBBBBsBsBaaBqBsBqBsBBBqBBBqB \ No newline at end of file diff --git a/data/layouts/BattlePyramidSquare14/border.bin b/data/layouts/BattlePyramidSquare14/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattlePyramidSquare14/border.bin differ diff --git a/data/layouts/BattlePyramidSquare14/layout.inc b/data/layouts/BattlePyramidSquare14/layout.inc new file mode 100644 index 000000000..ec69a1b54 --- /dev/null +++ b/data/layouts/BattlePyramidSquare14/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare14_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare14/border.bin" + + .align 2 +BattlePyramidSquare14_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare14/map.bin" + + .align 2 +BattlePyramidSquare14_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare14_MapBorder + .4byte BattlePyramidSquare14_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/layouts/BattlePyramidSquare14/map.bin b/data/layouts/BattlePyramidSquare14/map.bin new file mode 100644 index 000000000..21655a872 --- /dev/null +++ b/data/layouts/BattlePyramidSquare14/map.bin @@ -0,0 +1 @@ +BeBeBeBeBBBBBBBBeBeBeBeBBBBŽBBBBBeBeBeBeBBBBBBBBeBeBeBeBBBBBBBBB \ No newline at end of file diff --git a/data/layouts/BattlePyramidSquare15/border.bin b/data/layouts/BattlePyramidSquare15/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattlePyramidSquare15/border.bin differ diff --git a/data/layouts/BattlePyramidSquare15/layout.inc b/data/layouts/BattlePyramidSquare15/layout.inc new file mode 100644 index 000000000..29c5444f9 --- /dev/null +++ b/data/layouts/BattlePyramidSquare15/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare15_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare15/border.bin" + + .align 2 +BattlePyramidSquare15_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare15/map.bin" + + .align 2 +BattlePyramidSquare15_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare15_MapBorder + .4byte BattlePyramidSquare15_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/layouts/BattlePyramidSquare15/map.bin b/data/layouts/BattlePyramidSquare15/map.bin new file mode 100644 index 000000000..ccbd87d9a --- /dev/null +++ b/data/layouts/BattlePyramidSquare15/map.bin @@ -0,0 +1 @@ +BBBeBBBeBeBBBeBBBBBeBBBeBeBBŽeBBBBBeBBBeBeBBBeBBBBBeBBBeBeBBBeBB \ No newline at end of file diff --git a/data/layouts/BattlePyramidSquare16/border.bin b/data/layouts/BattlePyramidSquare16/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattlePyramidSquare16/border.bin differ diff --git a/data/layouts/BattlePyramidSquare16/layout.inc b/data/layouts/BattlePyramidSquare16/layout.inc new file mode 100644 index 000000000..cc2895943 --- /dev/null +++ b/data/layouts/BattlePyramidSquare16/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare16_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare16/border.bin" + + .align 2 +BattlePyramidSquare16_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare16/map.bin" + + .align 2 +BattlePyramidSquare16_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare16_MapBorder + .4byte BattlePyramidSquare16_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/layouts/BattlePyramidSquare16/map.bin b/data/layouts/BattlePyramidSquare16/map.bin new file mode 100644 index 000000000..601eb526e --- /dev/null +++ b/data/layouts/BattlePyramidSquare16/map.bin @@ -0,0 +1 @@ +BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBŽBBBBBBBBBBBBBBBBBBBBBBBBBBBBB \ No newline at end of file diff --git a/data/layouts/BattleTentBattleRoom/border.bin b/data/layouts/BattleTentBattleRoom/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleTentBattleRoom/border.bin differ diff --git a/data/layouts/BattleTentBattleRoom/layout.inc b/data/layouts/BattleTentBattleRoom/layout.inc new file mode 100644 index 000000000..97be7fdb4 --- /dev/null +++ b/data/layouts/BattleTentBattleRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleTentBattleRoom_MapBorder:: + .incbin "data/layouts/BattleTentBattleRoom/border.bin" + + .align 2 +BattleTentBattleRoom_MapBlockdata:: + .incbin "data/layouts/BattleTentBattleRoom/map.bin" + + .align 2 +BattleTentBattleRoom_Layout:: + .4byte 0xa + .4byte 0x9 + .4byte BattleTentBattleRoom_MapBorder + .4byte BattleTentBattleRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleTent diff --git a/data/layouts/BattleTentBattleRoom/map.bin b/data/layouts/BattleTentBattleRoom/map.bin new file mode 100644 index 000000000..92a738d5e Binary files /dev/null and b/data/layouts/BattleTentBattleRoom/map.bin differ diff --git a/data/layouts/BattleTentCorridor/border.bin b/data/layouts/BattleTentCorridor/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleTentCorridor/border.bin differ diff --git a/data/layouts/BattleTentCorridor/layout.inc b/data/layouts/BattleTentCorridor/layout.inc new file mode 100644 index 000000000..21f6c94fd --- /dev/null +++ b/data/layouts/BattleTentCorridor/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleTentCorridor_MapBorder:: + .incbin "data/layouts/BattleTentCorridor/border.bin" + + .align 2 +BattleTentCorridor_MapBlockdata:: + .incbin "data/layouts/BattleTentCorridor/map.bin" + + .align 2 +BattleTentCorridor_Layout:: + .4byte 0x5 + .4byte 0x8 + .4byte BattleTentCorridor_MapBorder + .4byte BattleTentCorridor_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleTent diff --git a/data/layouts/BattleTentCorridor/map.bin b/data/layouts/BattleTentCorridor/map.bin new file mode 100644 index 000000000..4cd270b21 --- /dev/null +++ b/data/layouts/BattleTentCorridor/map.bin @@ -0,0 +1 @@ +6b6c6d66 jkl +*+*#:;:;$;:;:#:;:;$;:;:#%; \ No newline at end of file diff --git a/data/layouts/BattleTentLobby/border.bin b/data/layouts/BattleTentLobby/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleTentLobby/border.bin differ diff --git a/data/layouts/BattleTentLobby/layout.inc b/data/layouts/BattleTentLobby/layout.inc new file mode 100644 index 000000000..a740ae2f9 --- /dev/null +++ b/data/layouts/BattleTentLobby/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleTentLobby_MapBorder:: + .incbin "data/layouts/BattleTentLobby/border.bin" + + .align 2 +BattleTentLobby_MapBlockdata:: + .incbin "data/layouts/BattleTentLobby/map.bin" + + .align 2 +BattleTentLobby_Layout:: + .4byte 0xd + .4byte 0xa + .4byte BattleTentLobby_MapBorder + .4byte BattleTentLobby_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleTent diff --git a/data/layouts/BattleTentLobby/map.bin b/data/layouts/BattleTentLobby/map.bin new file mode 100644 index 000000000..9ff37dc2c --- /dev/null +++ b/data/layouts/BattleTentLobby/map.bin @@ -0,0 +1,2 @@ +666b6c6d6666 + `a jkl fg2hi 22 22 2no2p 22222 w6"2xyz{2|}~6'”22€‚ƒ2„…†‡&22“22ˆ2‰2Š2‹22Œ22Ž2222’2222222222222•222222222220(2222./222( \ No newline at end of file diff --git a/data/layouts/BirthIsland_Exterior/border.bin b/data/layouts/BirthIsland_Exterior/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/BirthIsland_Exterior/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/BirthIsland_Exterior/layout.inc b/data/layouts/BirthIsland_Exterior/layout.inc new file mode 100644 index 000000000..0fe3899ae --- /dev/null +++ b/data/layouts/BirthIsland_Exterior/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BirthIsland_Exterior_MapBorder:: + .incbin "data/layouts/BirthIsland_Exterior/border.bin" + + .align 2 +BirthIsland_Exterior_MapBlockdata:: + .incbin "data/layouts/BirthIsland_Exterior/map.bin" + + .align 2 +BirthIsland_Exterior_Layout:: + .4byte 0x1e + .4byte 0x1e + .4byte BirthIsland_Exterior_MapBorder + .4byte BirthIsland_Exterior_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Dewford diff --git a/data/layouts/BirthIsland_Exterior/map.bin b/data/layouts/BirthIsland_Exterior/map.bin new file mode 100644 index 000000000..38dfe77a8 Binary files /dev/null and b/data/layouts/BirthIsland_Exterior/map.bin differ diff --git a/data/layouts/CableCarStation/border.bin b/data/layouts/CableCarStation/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/CableCarStation/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/CableCarStation/layout.inc b/data/layouts/CableCarStation/layout.inc new file mode 100644 index 000000000..c2727063f --- /dev/null +++ b/data/layouts/CableCarStation/layout.inc @@ -0,0 +1,16 @@ + .align 2 +CableCarStation_MapBorder:: + .incbin "data/layouts/CableCarStation/border.bin" + + .align 2 +CableCarStation_MapBlockdata:: + .incbin "data/layouts/CableCarStation/map.bin" + + .align 2 +CableCarStation_Layout:: + .4byte 0xd + .4byte 0xc + .4byte CableCarStation_MapBorder + .4byte CableCarStation_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/layouts/CableCarStation/map.bin b/data/layouts/CableCarStation/map.bin new file mode 100644 index 000000000..93db9d5f0 Binary files /dev/null and b/data/layouts/CableCarStation/map.bin differ diff --git a/data/layouts/CaveOfOrigin_1F/border.bin b/data/layouts/CaveOfOrigin_1F/border.bin new file mode 100644 index 000000000..f1629c020 --- /dev/null +++ b/data/layouts/CaveOfOrigin_1F/border.bin @@ -0,0 +1 @@ +3333 \ No newline at end of file diff --git a/data/layouts/CaveOfOrigin_1F/layout.inc b/data/layouts/CaveOfOrigin_1F/layout.inc new file mode 100644 index 000000000..d82ecddd0 --- /dev/null +++ b/data/layouts/CaveOfOrigin_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +CaveOfOrigin_1F_MapBorder:: + .incbin "data/layouts/CaveOfOrigin_1F/border.bin" + + .align 2 +CaveOfOrigin_1F_MapBlockdata:: + .incbin "data/layouts/CaveOfOrigin_1F/map.bin" + + .align 2 +CaveOfOrigin_1F_Layout:: + .4byte 0x17 + .4byte 0x17 + .4byte CaveOfOrigin_1F_MapBorder + .4byte CaveOfOrigin_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/CaveOfOrigin_1F/map.bin b/data/layouts/CaveOfOrigin_1F/map.bin new file mode 100644 index 000000000..c3c5e7abf --- /dev/null +++ b/data/layouts/CaveOfOrigin_1F/map.bin @@ -0,0 +1 @@ +)))))))))))))))))))))"33333333))))3333333 ")))))))*3333()))))) ""33)))))))))))))33  ""3*333)))))))) 33  ""3"3))*33333=333  33  ""3"*33333333333  33  "$""33333333322$ 33  "3"""33333222$333 33  "3"""3333$3333333 3$ "3"""333$33333333( 3 "3"""333 3333333333  3 "3"""333 3333333333  3 "3"""333()333)))  3 "*""33333()))*333   3 ""3""3333333333333   3 ""3"$33333333333$  3 ""3"3$3333;33333$3  3 ""3$3$22289:222$2$ 3 "$3$222222222222$33 $"3"33222223332222$ 3"3$22$33333$222$3332$3$222222222222222222$333 \ No newline at end of file diff --git a/data/layouts/CaveOfOrigin_B1F/border.bin b/data/layouts/CaveOfOrigin_B1F/border.bin new file mode 100644 index 000000000..f1629c020 --- /dev/null +++ b/data/layouts/CaveOfOrigin_B1F/border.bin @@ -0,0 +1 @@ +3333 \ No newline at end of file diff --git a/data/layouts/CaveOfOrigin_B1F/layout.inc b/data/layouts/CaveOfOrigin_B1F/layout.inc new file mode 100644 index 000000000..41158462c --- /dev/null +++ b/data/layouts/CaveOfOrigin_B1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +CaveOfOrigin_B1F_MapBorder:: + .incbin "data/layouts/CaveOfOrigin_B1F/border.bin" + + .align 2 +CaveOfOrigin_B1F_MapBlockdata:: + .incbin "data/layouts/CaveOfOrigin_B1F/map.bin" + + .align 2 +CaveOfOrigin_B1F_Layout:: + .4byte 0x13 + .4byte 0x13 + .4byte CaveOfOrigin_B1F_MapBorder + .4byte CaveOfOrigin_B1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/CaveOfOrigin_B1F/map.bin b/data/layouts/CaveOfOrigin_B1F/map.bin new file mode 100644 index 000000000..1fb2d71bb --- /dev/null +++ b/data/layouts/CaveOfOrigin_B1F/map.bin @@ -0,0 +1 @@ +)))))))))))))))))3)))))))))))))3 "3"333))@))333H3 "*3)*33A333()3( "3*333333333(3 H"3M333)))333 3& ""3"33*#0#(33N3  ""33*0###0(3 3 H"3"3"####### 3 3  ""3"3"0##0##0 3H3& "3M3"####### 3 3  ""3"3$30###0$33N3&H"3"33$3#0#$333 3  "M3$33$3$3$3$3$333$3  "$3$3333333$3$ "3332222222$233N3 "3$22223332222$3 "333333$222$333333N$222222232222222$ \ No newline at end of file diff --git a/data/layouts/CaveOfOrigin_Entrance/border.bin b/data/layouts/CaveOfOrigin_Entrance/border.bin new file mode 100644 index 000000000..f1629c020 --- /dev/null +++ b/data/layouts/CaveOfOrigin_Entrance/border.bin @@ -0,0 +1 @@ +3333 \ No newline at end of file diff --git a/data/layouts/CaveOfOrigin_Entrance/layout.inc b/data/layouts/CaveOfOrigin_Entrance/layout.inc new file mode 100644 index 000000000..3e6375d3e --- /dev/null +++ b/data/layouts/CaveOfOrigin_Entrance/layout.inc @@ -0,0 +1,16 @@ + .align 2 +CaveOfOrigin_Entrance_MapBorder:: + .incbin "data/layouts/CaveOfOrigin_Entrance/border.bin" + + .align 2 +CaveOfOrigin_Entrance_MapBlockdata:: + .incbin "data/layouts/CaveOfOrigin_Entrance/map.bin" + + .align 2 +CaveOfOrigin_Entrance_Layout:: + .4byte 0x13 + .4byte 0x1a + .4byte CaveOfOrigin_Entrance_MapBorder + .4byte CaveOfOrigin_Entrance_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/CaveOfOrigin_Entrance/map.bin b/data/layouts/CaveOfOrigin_Entrance/map.bin new file mode 100644 index 000000000..4bbffd109 --- /dev/null +++ b/data/layouts/CaveOfOrigin_Entrance/map.bin @@ -0,0 +1 @@ +3333333333333333333333333))))))3333333)))*)))3())3333")))*333())) 3333"")))-./))3 (333"""3)5637) 3 3 33*""3"33333333  3( 33"3""3"33333333  33  33"3""3"33333333  33  33"3""3"33333333 (3 (**"3"33333333 3 3 3 "3"3"3"33333333 3 3 3 "3"3"3"33333333 3( 3 "3"3"3"33333333 33  3 "3"3"3"33333333 33 ( "*3"3"33333333 33 3  ""33"3"33333333 33 3  ""33"3"33333333 3$3  ""3*3"33333333 3 33  ""3"33"33333333 3 33  ""3"33"333#3333 3 33  "%"33$289:2$3 33  "3"$22233322$33  "3"3333$222$33333  "3$22222222222222$ $222222233322222$ \ No newline at end of file diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/border.bin b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/border.bin new file mode 100644 index 000000000..f1629c020 --- /dev/null +++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/border.bin @@ -0,0 +1 @@ +3333 \ No newline at end of file diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc new file mode 100644 index 000000000..dfaf8b8a6 --- /dev/null +++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +CaveOfOrigin_UnusedRubySapphireMap1_MapBorder:: + .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/border.bin" + + .align 2 +CaveOfOrigin_UnusedRubySapphireMap1_MapBlockdata:: + .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/map.bin" + + .align 2 +CaveOfOrigin_UnusedRubySapphireMap1_Layout:: + .4byte 0x17 + .4byte 0x17 + .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapBorder + .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/map.bin b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/map.bin new file mode 100644 index 000000000..0ffbdaaa0 --- /dev/null +++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/map.bin @@ -0,0 +1 @@ +33))))))))))))))))33333"33)))3333))) 33333"33"333())))*333 (33)*33"3))))))))3( 33"33)*3"))))))(3  33"33"333""3333<33( 3  33"3*333""3333333  3  33"3"3333%%333333  3  33"3"333333%23333  3  33"*)))333%333  2 33""3")(333"33   3 33""3""=3( 333""33   3 33""3""33  33*"33   3 33""3""33 ())**33   3 33""3""33())))*333   3 33""3""33333333333  ( 33""3"%333333333% 3  33""3"3%3333333%3 3  33""3%3%2222222%2%3  33"%3%2222222222%32% 33"3%23322222233 33 33%33%22%333333%22%2%333%2222222222222222%3333 \ No newline at end of file diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/border.bin b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/border.bin new file mode 100644 index 000000000..4117717f2 --- /dev/null +++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/border.bin @@ -0,0 +1 @@ +#### \ No newline at end of file diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc new file mode 100644 index 000000000..5caa1b9e5 --- /dev/null +++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +CaveOfOrigin_UnusedRubySapphireMap2_MapBorder:: + .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/border.bin" + + .align 2 +CaveOfOrigin_UnusedRubySapphireMap2_MapBlockdata:: + .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/map.bin" + + .align 2 +CaveOfOrigin_UnusedRubySapphireMap2_Layout:: + .4byte 0x15 + .4byte 0x15 + .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapBorder + .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/map.bin b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/map.bin new file mode 100644 index 000000000..4c1fd5ab8 --- /dev/null +++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/map.bin @@ -0,0 +1 @@ +)))))###))))##)"#####()))*))())*# "#))))))))*##()))) "#"##))))))))))##  "#"##"))))))))(#  "*)*"33333333( #  ""#")*333333333  % ""#""333223333   # ""#""33%##%333   %""#""33 ####%33    #""#""<33 #####"33    #""#"%22%#####"33    #"%%2#####)*33    #"#"##"#)))*3333   ("#"##"#"=33333332  # "#"##%"333333%#  # "#"###"%222222%2%( "#"###%22222222%###  "#%222##222222##  %222#%22%######%22% ####%222222222222222% \ No newline at end of file diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/border.bin b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/border.bin new file mode 100644 index 000000000..f1629c020 --- /dev/null +++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/border.bin @@ -0,0 +1 @@ +3333 \ No newline at end of file diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc new file mode 100644 index 000000000..6290452c0 --- /dev/null +++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc @@ -0,0 +1,16 @@ + .align 2 +CaveOfOrigin_UnusedRubySapphireMap3_MapBorder:: + .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/border.bin" + + .align 2 +CaveOfOrigin_UnusedRubySapphireMap3_MapBlockdata:: + .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/map.bin" + + .align 2 +CaveOfOrigin_UnusedRubySapphireMap3_Layout:: + .4byte 0x13 + .4byte 0x15 + .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapBorder + .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/map.bin b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/map.bin new file mode 100644 index 000000000..ea574b224 --- /dev/null +++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/map.bin @@ -0,0 +1 @@ +)))))))))))))))))")))3333)))333 ""333())))*333()) ""33)))))))))33  ""33")))))))(3  ""3*"3333333( 3  "$"*333333=33  $ "3"""3322233   3 "3"""3$333$3   3 "3"""3 33333"$  3 "3"""3(3333" 3  3 "3"""33(33* 3  3 "*""333 33"$3 ( ""3""333())* 33 3  ""3"$3<33333 2$3  ""3$"333333  333  ""33"$222222$ 333  ""33$22222222$333  "$2233332222222$ "333$2222$3222222$$2222222222$3333333 \ No newline at end of file diff --git a/data/layouts/DesertRuins/border.bin b/data/layouts/DesertRuins/border.bin new file mode 100644 index 000000000..c07869a9f --- /dev/null +++ b/data/layouts/DesertRuins/border.bin @@ -0,0 +1 @@ +ÙÙÙÙ \ No newline at end of file diff --git a/data/layouts/DesertRuins/layout.inc b/data/layouts/DesertRuins/layout.inc new file mode 100644 index 000000000..6c4bff886 --- /dev/null +++ b/data/layouts/DesertRuins/layout.inc @@ -0,0 +1,16 @@ + .align 2 +DesertRuins_MapBorder:: + .incbin "data/layouts/DesertRuins/border.bin" + + .align 2 +DesertRuins_MapBlockdata:: + .incbin "data/layouts/DesertRuins/map.bin" + + .align 2 +DesertRuins_Layout:: + .4byte 0x11 + .4byte 0x21 + .4byte DesertRuins_MapBorder + .4byte DesertRuins_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/DesertRuins/map.bin b/data/layouts/DesertRuins/map.bin new file mode 100644 index 000000000..406cf7279 Binary files /dev/null and b/data/layouts/DesertRuins/map.bin differ diff --git a/data/layouts/DesertUnderpass/border.bin b/data/layouts/DesertUnderpass/border.bin new file mode 100644 index 000000000..423a0732e --- /dev/null +++ b/data/layouts/DesertUnderpass/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/DesertUnderpass/layout.inc b/data/layouts/DesertUnderpass/layout.inc new file mode 100644 index 000000000..3871e181e --- /dev/null +++ b/data/layouts/DesertUnderpass/layout.inc @@ -0,0 +1,16 @@ + .align 2 +DesertUnderpass_MapBorder:: + .incbin "data/layouts/DesertUnderpass/border.bin" + + .align 2 +DesertUnderpass_MapBlockdata:: + .incbin "data/layouts/DesertUnderpass/map.bin" + + .align 2 +DesertUnderpass_Layout:: + .4byte 0x8b + .4byte 0x17 + .4byte DesertUnderpass_MapBorder + .4byte DesertUnderpass_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/DesertUnderpass/map.bin b/data/layouts/DesertUnderpass/map.bin new file mode 100644 index 000000000..2f82e9357 --- /dev/null +++ b/data/layouts/DesertUnderpass/map.bin @@ -0,0 +1 @@ + ##" #" !!" !!"##" #" #" ####" ####" #" #" "#"˜™™™™š ###" # #˜š #" "#" ¡©©©ª # #"#" #"¨ª ###" "¨ª ######"##˜š' # " " ' ¡š #˜š˜¡¡¡š#"#"' "˜¡¢˜š˜¡¡¡¡¡š#"˜š˜h˜¡©¡š˜¡ª˜™¡¡¡¡¡¡¢˜™¡ª¨¡š˜¡ª ¢˜¡ª˜¡¡¡¡¡¡¡¡¢ ####" ##" ##" #"¨©ª¨¡š¨ª¨ª¨ª #q¡¡¡¡¡¡¡¡¢##"##"< # #"#" " # "#" " ##" #####" ##"##"¨ª ###"˜š q¡¡¡¡¡¡¡¢#"#"#XYZ# ##"#"#" #" " ###" " #"#" # #" #"" ###"  #""˜¡¢ ###q¡¡¡¡¡p######" ##"  #01##"##" 0#101#####"#####" ####" #### #01######q¡¢ 0##101##q¡¡¡p#"" ######" #######"  ##"##" #"#" ##########" #####"#q¢###### "####################" ##########" #############" #"" " #####" #" ########" ##############" #### ######" #####" ##" ##" ##"  ##" #" ###" # ####" ######"" # " ##"˜š#"'˜š˜š ## ##"##" # #"#" # "#########" ########" ##"#" #"### ##### #"##### " ##"####"#" #####" ###### # ##"### ##"#" ## ######" "### " ###"#"#"#" # #" #" #"#" ## #####" ##" # " #" ###"### ## " #"##"#"#"###" ##"##" #####" ##" #"## # # #"#" #"#" ############# \ No newline at end of file diff --git a/data/layouts/DewfordTown/border.bin b/data/layouts/DewfordTown/border.bin new file mode 100644 index 000000000..281762f5b --- /dev/null +++ b/data/layouts/DewfordTown/border.bin @@ -0,0 +1 @@ +CCCC \ No newline at end of file diff --git a/data/layouts/DewfordTown/layout.inc b/data/layouts/DewfordTown/layout.inc new file mode 100644 index 000000000..077262836 --- /dev/null +++ b/data/layouts/DewfordTown/layout.inc @@ -0,0 +1,16 @@ + .align 2 +DewfordTown_MapBorder:: + .incbin "data/layouts/DewfordTown/border.bin" + + .align 2 +DewfordTown_MapBlockdata:: + .incbin "data/layouts/DewfordTown/map.bin" + + .align 2 +DewfordTown_Layout:: + .4byte 0x14 + .4byte 0x14 + .4byte DewfordTown_MapBorder + .4byte DewfordTown_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Dewford diff --git a/data/layouts/DewfordTown/map.bin b/data/layouts/DewfordTown/map.bin new file mode 100644 index 000000000..e8a1154e8 --- /dev/null +++ b/data/layouts/DewfordTown/map.bin @@ -0,0 +1,2 @@ +C 2 2 2$1$1$1$1$1%pzCCC92C92C$1$1$1$1$1%pzC:CCCC:$1$1$1$1$1%pzC92CC:C92'%&$1$1$1$1$1%pz5CC:C92:C$1$1$1$1$1$1$19292%pzCC92CC92:$1$1$1$1$1$1 2 2%pz:::CCC$1$1$1$1$1$1$1%p‚yy‰:::$12222$1$1%pppp‚yyy$1PQRS$1$1%&%pppppppp$1XYZ[$1$1$1$1$1$1(2)2)2pppppp$1 ab +$1$1$1$1$101111111$1$1$1$1$1$1$1$1$1$1$1>111=1$1 2 2 2 2$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1222222$1$1$1$1$192$1$1$1$1"####$$1$1$1$1$1%&C$1$1$1$1+,-³./2$1$1$1$1$1$1â92C$1$1$1$1345Å67$1$1$1$1$1$1$1C:92$1$1$1;2<2=Í>?2$1$1$1$1$1929292:92C92$1$1$1$1$1$1$1$1$1$1â49292:CCâCCC9292929292929292929292CC92CC92 \ No newline at end of file diff --git a/data/layouts/DewfordTown_Gym/border.bin b/data/layouts/DewfordTown_Gym/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/DewfordTown_Gym/border.bin differ diff --git a/data/layouts/DewfordTown_Gym/layout.inc b/data/layouts/DewfordTown_Gym/layout.inc new file mode 100644 index 000000000..89eb39936 --- /dev/null +++ b/data/layouts/DewfordTown_Gym/layout.inc @@ -0,0 +1,16 @@ + .align 2 +DewfordTown_Gym_MapBorder:: + .incbin "data/layouts/DewfordTown_Gym/border.bin" + + .align 2 +DewfordTown_Gym_MapBlockdata:: + .incbin "data/layouts/DewfordTown_Gym/map.bin" + + .align 2 +DewfordTown_Gym_Layout:: + .4byte 0x12 + .4byte 0x1c + .4byte DewfordTown_Gym_MapBorder + .4byte DewfordTown_Gym_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_DewfordGym diff --git a/data/layouts/DewfordTown_Gym/map.bin b/data/layouts/DewfordTown_Gym/map.bin new file mode 100644 index 000000000..43cd6e64a Binary files /dev/null and b/data/layouts/DewfordTown_Gym/map.bin differ diff --git a/data/layouts/DewfordTown_Hall/border.bin b/data/layouts/DewfordTown_Hall/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/DewfordTown_Hall/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/DewfordTown_Hall/layout.inc b/data/layouts/DewfordTown_Hall/layout.inc new file mode 100644 index 000000000..59e88cd47 --- /dev/null +++ b/data/layouts/DewfordTown_Hall/layout.inc @@ -0,0 +1,16 @@ + .align 2 +DewfordTown_Hall_MapBorder:: + .incbin "data/layouts/DewfordTown_Hall/border.bin" + + .align 2 +DewfordTown_Hall_MapBlockdata:: + .incbin "data/layouts/DewfordTown_Hall/map.bin" + + .align 2 +DewfordTown_Hall_Layout:: + .4byte 0x11 + .4byte 0x9 + .4byte DewfordTown_Hall_MapBorder + .4byte DewfordTown_Hall_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/DewfordTown_Hall/map.bin b/data/layouts/DewfordTown_Hall/map.bin new file mode 100644 index 000000000..5fd13209d Binary files /dev/null and b/data/layouts/DewfordTown_Hall/map.bin differ diff --git a/data/layouts/DoubleBattleColosseum/border.bin b/data/layouts/DoubleBattleColosseum/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/DoubleBattleColosseum/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/DoubleBattleColosseum/layout.inc b/data/layouts/DoubleBattleColosseum/layout.inc new file mode 100644 index 000000000..9641fb2bf --- /dev/null +++ b/data/layouts/DoubleBattleColosseum/layout.inc @@ -0,0 +1,16 @@ + .align 2 +DoubleBattleColosseum_MapBorder:: + .incbin "data/layouts/DoubleBattleColosseum/border.bin" + + .align 2 +DoubleBattleColosseum_MapBlockdata:: + .incbin "data/layouts/DoubleBattleColosseum/map.bin" + + .align 2 +DoubleBattleColosseum_Layout:: + .4byte 0xe + .4byte 0x9 + .4byte DoubleBattleColosseum_MapBorder + .4byte DoubleBattleColosseum_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_CableClub diff --git a/data/layouts/DoubleBattleColosseum/map.bin b/data/layouts/DoubleBattleColosseum/map.bin new file mode 100644 index 000000000..77606e818 --- /dev/null +++ b/data/layouts/DoubleBattleColosseum/map.bin @@ -0,0 +1 @@ +hijjjkllmjjjoOpqrrrstturrrwWxyzzz{||}zzz_€2‚2L2M2ƒ2„2„2…2M2N2‚2†2‡ŒŠ2U2`2U2U2b2c2U2U2a2U2‹2ŒŠ2U2T2U2U2d2e2U2U2V2U2‹2ŒŠ2U2`2U2U2f2g2U2U2a2U2‹2ˆ‰2U2\2]2]2]2]2]2]2^2U2Ž2!2!2!2!2 \ No newline at end of file diff --git a/data/layouts/EverGrandeCity/border.bin b/data/layouts/EverGrandeCity/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/EverGrandeCity/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/EverGrandeCity/layout.inc b/data/layouts/EverGrandeCity/layout.inc new file mode 100644 index 000000000..e12d3c259 --- /dev/null +++ b/data/layouts/EverGrandeCity/layout.inc @@ -0,0 +1,16 @@ + .align 2 +EverGrandeCity_MapBorder:: + .incbin "data/layouts/EverGrandeCity/border.bin" + + .align 2 +EverGrandeCity_MapBlockdata:: + .incbin "data/layouts/EverGrandeCity/map.bin" + + .align 2 +EverGrandeCity_Layout:: + .4byte 0x28 + .4byte 0x50 + .4byte EverGrandeCity_MapBorder + .4byte EverGrandeCity_MapBlockdata + .4byte gTileset_General + .4byte gTileset_EverGrande diff --git a/data/layouts/EverGrandeCity/map.bin b/data/layouts/EverGrandeCity/map.bin new file mode 100644 index 000000000..33b271d5d Binary files /dev/null and b/data/layouts/EverGrandeCity/map.bin differ diff --git a/data/layouts/EverGrandeCity_ChampionsRoom/border.bin b/data/layouts/EverGrandeCity_ChampionsRoom/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/EverGrandeCity_ChampionsRoom/border.bin differ diff --git a/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc b/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc new file mode 100644 index 000000000..c92ee599d --- /dev/null +++ b/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +EverGrandeCity_ChampionsRoom_MapBorder:: + .incbin "data/layouts/EverGrandeCity_ChampionsRoom/border.bin" + + .align 2 +EverGrandeCity_ChampionsRoom_MapBlockdata:: + .incbin "data/layouts/EverGrandeCity_ChampionsRoom/map.bin" + + .align 2 +EverGrandeCity_ChampionsRoom_Layout:: + .4byte 0xd + .4byte 0xd + .4byte EverGrandeCity_ChampionsRoom_MapBorder + .4byte EverGrandeCity_ChampionsRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_EliteFour diff --git a/data/layouts/EverGrandeCity_ChampionsRoom/map.bin b/data/layouts/EverGrandeCity_ChampionsRoom/map.bin new file mode 100644 index 000000000..a234307b5 Binary files /dev/null and b/data/layouts/EverGrandeCity_ChampionsRoom/map.bin differ diff --git a/data/layouts/EverGrandeCity_DrakesRoom/border.bin b/data/layouts/EverGrandeCity_DrakesRoom/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/EverGrandeCity_DrakesRoom/border.bin differ diff --git a/data/layouts/EverGrandeCity_DrakesRoom/layout.inc b/data/layouts/EverGrandeCity_DrakesRoom/layout.inc new file mode 100644 index 000000000..1cd96a760 --- /dev/null +++ b/data/layouts/EverGrandeCity_DrakesRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +EverGrandeCity_DrakesRoom_MapBorder:: + .incbin "data/layouts/EverGrandeCity_DrakesRoom/border.bin" + + .align 2 +EverGrandeCity_DrakesRoom_MapBlockdata:: + .incbin "data/layouts/EverGrandeCity_DrakesRoom/map.bin" + + .align 2 +EverGrandeCity_DrakesRoom_Layout:: + .4byte 0xd + .4byte 0xe + .4byte EverGrandeCity_DrakesRoom_MapBorder + .4byte EverGrandeCity_DrakesRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_EliteFour diff --git a/data/layouts/EverGrandeCity_DrakesRoom/map.bin b/data/layouts/EverGrandeCity_DrakesRoom/map.bin new file mode 100644 index 000000000..3b5248d98 --- /dev/null +++ b/data/layouts/EverGrandeCity_DrakesRoom/map.bin @@ -0,0 +1,2 @@ +       +      ¢2¢2¢2¢2¢2¸2¸2¸2¢2¢2¢2¢2¢2Φ¼2¼2 2£2£2£2¤2¼2¼2§¥­®¼2¼2¨2©2ª2«2¬2¼2¼2¯­µ¶¼2¼2°2±2²2³2´2¼2¼2·µ½¡¼2¼2¨2¹2º2»2¬2¼2¼2·½½¾¼2¼2¨2Á2Â2Ã2¬2¼2¼2¿½Í2Æ2¼2¼2È2Ë2Ë2Ë2Ì2¼2¼2Ç2Å2Ê2É2É2É2É2É2É2É2É2É2É2É2É22222222222222ÕÖÕÖå¼2¼2¼2×ÕÖÕÖHIHIæÄ2Ä2Ä2ßHIHI \ No newline at end of file diff --git a/data/layouts/EverGrandeCity_GlaciasRoom/border.bin b/data/layouts/EverGrandeCity_GlaciasRoom/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/EverGrandeCity_GlaciasRoom/border.bin differ diff --git a/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc b/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc new file mode 100644 index 000000000..17031e546 --- /dev/null +++ b/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +EverGrandeCity_GlaciasRoom_MapBorder:: + .incbin "data/layouts/EverGrandeCity_GlaciasRoom/border.bin" + + .align 2 +EverGrandeCity_GlaciasRoom_MapBlockdata:: + .incbin "data/layouts/EverGrandeCity_GlaciasRoom/map.bin" + + .align 2 +EverGrandeCity_GlaciasRoom_Layout:: + .4byte 0xd + .4byte 0xe + .4byte EverGrandeCity_GlaciasRoom_MapBorder + .4byte EverGrandeCity_GlaciasRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_EliteFour diff --git a/data/layouts/EverGrandeCity_GlaciasRoom/map.bin b/data/layouts/EverGrandeCity_GlaciasRoom/map.bin new file mode 100644 index 000000000..2d7db7377 --- /dev/null +++ b/data/layouts/EverGrandeCity_GlaciasRoom/map.bin @@ -0,0 +1,2 @@ +       +      r2r2r2r2r2ˆ2ˆ2ˆ2r2r2r2r2r2žvŒ2Œ2p2s2s2s2t2Œ2Œ2wu}~Œ2Œ2x2y2z2{2|2Œ2Œ2}…†Œ2Œ2€22‚2ƒ2„2Œ2Œ2‡…qŒ2Œ2x2‰2Š2‹2|2Œ2Œ2‡ŽŒ2Œ2x2‘2’2“2|2Œ2Œ22–2Œ2Œ2˜2›2›2›2œ2Œ2Œ2—2•2š2™2™2™2™2™2™2™2™2™2™2™2™22222222222222ÕÖÕÖåŒ2Œ2Œ2×ÕÖÕÖHIHIæ”2”2”2ßHIHI \ No newline at end of file diff --git a/data/layouts/EverGrandeCity_Hall4/border.bin b/data/layouts/EverGrandeCity_Hall4/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/EverGrandeCity_Hall4/border.bin differ diff --git a/data/layouts/EverGrandeCity_Hall4/layout.inc b/data/layouts/EverGrandeCity_Hall4/layout.inc new file mode 100644 index 000000000..169d5fda7 --- /dev/null +++ b/data/layouts/EverGrandeCity_Hall4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +EverGrandeCity_Hall4_MapBorder:: + .incbin "data/layouts/EverGrandeCity_Hall4/border.bin" + + .align 2 +EverGrandeCity_Hall4_MapBlockdata:: + .incbin "data/layouts/EverGrandeCity_Hall4/map.bin" + + .align 2 +EverGrandeCity_Hall4_Layout:: + .4byte 0xb + .4byte 0x22 + .4byte EverGrandeCity_Hall4_MapBorder + .4byte EverGrandeCity_Hall4_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_EliteFour diff --git a/data/layouts/EverGrandeCity_Hall4/map.bin b/data/layouts/EverGrandeCity_Hall4/map.bin new file mode 100644 index 000000000..580ae095a --- /dev/null +++ b/data/layouts/EverGrandeCity_Hall4/map.bin @@ -0,0 +1 @@ +ÕÖÕÖDÕÖÕÖ     E     Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ð2Ð2Ð2Ð2Ð2Ð2Ð2Ð2Ð2Ð2Ð2ÜÜÜØÙ2Ú2Ú2ÛÜÜÜäääàá2â2â2ãäääçJçàá2â2â2ãçJççççàá2â2â2ãççççJçàá2â2â2ãçJççççàá2â2â2ãççççJçàá2â2â2ãçJççççàá2â2â2ãççççççàá2â2â2ãççççJçàá2â2â2ãçJççççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççççJçàá2â2â2ãçJççççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççççJçàá2â2â2ãçJççççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççç \ No newline at end of file diff --git a/data/layouts/EverGrandeCity_HallOfFame/border.bin b/data/layouts/EverGrandeCity_HallOfFame/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/EverGrandeCity_HallOfFame/border.bin differ diff --git a/data/layouts/EverGrandeCity_HallOfFame/layout.inc b/data/layouts/EverGrandeCity_HallOfFame/layout.inc new file mode 100644 index 000000000..f7442adde --- /dev/null +++ b/data/layouts/EverGrandeCity_HallOfFame/layout.inc @@ -0,0 +1,16 @@ + .align 2 +EverGrandeCity_HallOfFame_MapBorder:: + .incbin "data/layouts/EverGrandeCity_HallOfFame/border.bin" + + .align 2 +EverGrandeCity_HallOfFame_MapBlockdata:: + .incbin "data/layouts/EverGrandeCity_HallOfFame/map.bin" + + .align 2 +EverGrandeCity_HallOfFame_Layout:: + .4byte 0xf + .4byte 0x11 + .4byte EverGrandeCity_HallOfFame_MapBorder + .4byte EverGrandeCity_HallOfFame_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_CableClub diff --git a/data/layouts/EverGrandeCity_HallOfFame/map.bin b/data/layouts/EverGrandeCity_HallOfFame/map.bin new file mode 100644 index 000000000..1df9e4804 --- /dev/null +++ b/data/layouts/EverGrandeCity_HallOfFame/map.bin @@ -0,0 +1 @@ +ÌÍôõôÐÑÑÒÓôõôÎÏÔÕüýüØÙÙÚÛüýüÖ×ÜÝþ2þ2þ2àááâãþ2þ2þ2Þßäå2ö2ö2ö2èéêðëö2ö2ö2æ2çäå2ö2ö2ö2ö2ñòóö2ö2ö2ö2æ2çäå2ö2ö2ö2ö2ù2ú2û2ö2ö2ö2ö2æ2çäå2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2æ2çäå2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2æ2çäå2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2æ2çäå2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2æ2çäå2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2æ2çäå2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2æ2çäå2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2æ2çäå2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2æ2çäå2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2æ2çìí2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2î2ïÿ6ø2ø2ø2÷6 \ No newline at end of file diff --git a/data/layouts/EverGrandeCity_PhoebesRoom/border.bin b/data/layouts/EverGrandeCity_PhoebesRoom/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/EverGrandeCity_PhoebesRoom/border.bin differ diff --git a/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc b/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc new file mode 100644 index 000000000..dc2847ed0 --- /dev/null +++ b/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +EverGrandeCity_PhoebesRoom_MapBorder:: + .incbin "data/layouts/EverGrandeCity_PhoebesRoom/border.bin" + + .align 2 +EverGrandeCity_PhoebesRoom_MapBlockdata:: + .incbin "data/layouts/EverGrandeCity_PhoebesRoom/map.bin" + + .align 2 +EverGrandeCity_PhoebesRoom_Layout:: + .4byte 0xd + .4byte 0xe + .4byte EverGrandeCity_PhoebesRoom_MapBorder + .4byte EverGrandeCity_PhoebesRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_EliteFour diff --git a/data/layouts/EverGrandeCity_PhoebesRoom/map.bin b/data/layouts/EverGrandeCity_PhoebesRoom/map.bin new file mode 100644 index 000000000..2e75b706c --- /dev/null +++ b/data/layouts/EverGrandeCity_PhoebesRoom/map.bin @@ -0,0 +1,2 @@ +       +      B2B2B2B2B2X2X2X2B2B2B2B2B2EF\2\2@2C2C2C2D2\2\2GAMN\2\2H2I2J2K2L2\2\2O@UV\2\2P2Q2R2S2T2\2\2WA]^\2\2H2Y2Z2[2L2\2\2WBef\2\2H2a2b2c2L2\2\2gCm2n2\2\2h2k2k2k2l2\2\2o2`2j2i2i2i2i2i2i2i2i2i2i2i2i22222222222222ÕÖÕÖå\2\2\2×ÕÖÕÖHIHIæd2d2d2ßHIHI \ No newline at end of file diff --git a/data/layouts/EverGrandeCity_PokemonLeague_1F/border.bin b/data/layouts/EverGrandeCity_PokemonLeague_1F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/EverGrandeCity_PokemonLeague_1F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc b/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc new file mode 100644 index 000000000..da1a3de82 --- /dev/null +++ b/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +EverGrandeCity_PokemonLeague_1F_Layout:: + .4byte 0x13 + .4byte 0xc + .4byte EverGrandeCity_PokemonLeague_1F_MapBorder + .4byte EverGrandeCity_PokemonLeague_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_PokemonCenter diff --git a/data/layouts/EverGrandeCity_PokemonLeague_1F/map.bin b/data/layouts/EverGrandeCity_PokemonLeague_1F/map.bin new file mode 100644 index 000000000..6bab68102 --- /dev/null +++ b/data/layouts/EverGrandeCity_PokemonLeague_1F/map.bin @@ -0,0 +1,2 @@ +  JK   ³´´µ     "#RSI»¼2¼2½Hs2*+2[Q$22Ã2Ä2Ä2Å222P}2)2t2u2!!!!Y<2@2@2@2@2@2@2@2X!!! 222222%2@2@20232@2@2@2g2222D2 2@2@2@2@2@2@2@2v2{2{2w2@2@2@2@2@2@2'2€2222@2@2@202{2†2‡2{232@2@2@2@2^2 +2ˆ6‰B2@2@2@282|2Ž22|2;2@2@2@2&2f2‘22@2@2@2@2@2~2|2|22@2@2@2=>@2'2 2@2@2&2@2@2@2@2@2A2B2@2@2@2@2EF42'2 2^2^2=>42@2@2@2@2@2@2@2@22&242@2'2(ffEF&2@2@2@222@2@2@2@2@2@2@27 \ No newline at end of file diff --git a/data/layouts/EverGrandeCity_ShortHall/border.bin b/data/layouts/EverGrandeCity_ShortHall/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/EverGrandeCity_ShortHall/border.bin differ diff --git a/data/layouts/EverGrandeCity_ShortHall/layout.inc b/data/layouts/EverGrandeCity_ShortHall/layout.inc new file mode 100644 index 000000000..b880ee439 --- /dev/null +++ b/data/layouts/EverGrandeCity_ShortHall/layout.inc @@ -0,0 +1,16 @@ + .align 2 +EverGrandeCity_ShortHall_MapBorder:: + .incbin "data/layouts/EverGrandeCity_ShortHall/border.bin" + + .align 2 +EverGrandeCity_ShortHall_MapBlockdata:: + .incbin "data/layouts/EverGrandeCity_ShortHall/map.bin" + + .align 2 +EverGrandeCity_ShortHall_Layout:: + .4byte 0xb + .4byte 0xd + .4byte EverGrandeCity_ShortHall_MapBorder + .4byte EverGrandeCity_ShortHall_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_EliteFour diff --git a/data/layouts/EverGrandeCity_ShortHall/map.bin b/data/layouts/EverGrandeCity_ShortHall/map.bin new file mode 100644 index 000000000..75812b238 --- /dev/null +++ b/data/layouts/EverGrandeCity_ShortHall/map.bin @@ -0,0 +1 @@ +ÕÖÕÖDÕÖÕÖHIHI E HIHIÑ2Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ð2Ð2Ð2Ð2Ð2Ð2Ð2Ð2Ð2Ð2Ð2ÜÜÜØÙ2Ú2Ú2ÛÜÜÜäääàá2â2â2ãäääçççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççç \ No newline at end of file diff --git a/data/layouts/EverGrandeCity_SidneysRoom/border.bin b/data/layouts/EverGrandeCity_SidneysRoom/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/EverGrandeCity_SidneysRoom/border.bin differ diff --git a/data/layouts/EverGrandeCity_SidneysRoom/layout.inc b/data/layouts/EverGrandeCity_SidneysRoom/layout.inc new file mode 100644 index 000000000..f43fdae6b --- /dev/null +++ b/data/layouts/EverGrandeCity_SidneysRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +EverGrandeCity_SidneysRoom_MapBorder:: + .incbin "data/layouts/EverGrandeCity_SidneysRoom/border.bin" + + .align 2 +EverGrandeCity_SidneysRoom_MapBlockdata:: + .incbin "data/layouts/EverGrandeCity_SidneysRoom/map.bin" + + .align 2 +EverGrandeCity_SidneysRoom_Layout:: + .4byte 0xd + .4byte 0xe + .4byte EverGrandeCity_SidneysRoom_MapBorder + .4byte EverGrandeCity_SidneysRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_EliteFour diff --git a/data/layouts/EverGrandeCity_SidneysRoom/map.bin b/data/layouts/EverGrandeCity_SidneysRoom/map.bin new file mode 100644 index 000000000..ebca00c5c --- /dev/null +++ b/data/layouts/EverGrandeCity_SidneysRoom/map.bin @@ -0,0 +1,2 @@ +       +      22222(2(2(222222>,2,222222,2,2,2,222222,2,2%&,2,2 2!2"2#2$2,2,2'%?:,2,22)2*2+22,2,2'?-.,2,221222322,2,2/-=262,2,282;2;2;2<2,2,27252922222222222222222222222222ÕÖÕÖå,2,2,2×ÕÖÕÖHIHIæ424242ßHIHI \ No newline at end of file diff --git a/data/layouts/FallarborTown/border.bin b/data/layouts/FallarborTown/border.bin new file mode 100644 index 000000000..23e2a92e5 --- /dev/null +++ b/data/layouts/FallarborTown/border.bin @@ -0,0 +1 @@ +klst \ No newline at end of file diff --git a/data/layouts/FallarborTown/layout.inc b/data/layouts/FallarborTown/layout.inc new file mode 100644 index 000000000..f8ba2bf1a --- /dev/null +++ b/data/layouts/FallarborTown/layout.inc @@ -0,0 +1,16 @@ + .align 2 +FallarborTown_MapBorder:: + .incbin "data/layouts/FallarborTown/border.bin" + + .align 2 +FallarborTown_MapBlockdata:: + .incbin "data/layouts/FallarborTown/map.bin" + + .align 2 +FallarborTown_Layout:: + .4byte 0x14 + .4byte 0x14 + .4byte FallarborTown_MapBorder + .4byte FallarborTown_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Fallarbor diff --git a/data/layouts/FallarborTown/map.bin b/data/layouts/FallarborTown/map.bin new file mode 100644 index 000000000..950a54761 --- /dev/null +++ b/data/layouts/FallarborTown/map.bin @@ -0,0 +1 @@ +yyyyyiiiiiiiiiiiiijiiiiiiiiiiiijziiiiij"##$ÂÃJKLMNjziiiiijz…††‡Ê6Ë6RSTUVzi ¡¢£jziž§2y2Z[\]^q2q2PQRSzii•¥¦—y2#6bcdef#6y2XYZ[q2q2q2y2y2y2y2#6jklmn#6y2©abªy2y2Ÿ2Ÿ2y2y2y2y2y2è2é2ê2y2y2y2y2è2ê2y2y2y2y2y2è2é2é2é2é2é2ñ2ñ2ñ2é2é2é2é2ñ2ñ2é2é2ê2y2y2ø2ù2ù2ù2ù2ù2ù2ù2ù2ù2ñ2ñ2ù2ù2ù2ù2ù2ú2y2y2Ÿ2Ÿ2Ÿ2Ÿ2y2y2y2y2y2ð2ò2y2y2Ÿ2Ÿ2Ÿ2Ÿ2y2y2y2y2y2y2y2y2y2y2y2y2ð2ò2y2»2¨2¨2¼2y2y2y2y2y2y2y2y2y2 3!3y2y2ð2ò2y20123y2Ÿ2y2%3&3'3y2}2~2(3)3y2y2ð2ò2y289:;22y2-3.3/3y2…††‡y2Ÿ2ð2ò2y2©AB«6t6y2536373y2žy2y2ð2ñ2é2é2ê2y2Ÿ22l2y2y2y2y2•¥¦—y2y2ø2ù2ù2ù2ú2y22s6t6k222§2y2y2y2y2y2y2y2y2y2222l6kllklk2222222222st6sts6t6 \ No newline at end of file diff --git a/data/layouts/FallarborTown_LeftoverRSContestHall/border.bin b/data/layouts/FallarborTown_LeftoverRSContestHall/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/FallarborTown_LeftoverRSContestHall/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc b/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc new file mode 100644 index 000000000..70d1a079f --- /dev/null +++ b/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc @@ -0,0 +1,16 @@ + .align 2 +FallarborTown_LeftoverRSContestHall_MapBorder:: + .incbin "data/layouts/FallarborTown_LeftoverRSContestHall/border.bin" + + .align 2 +FallarborTown_LeftoverRSContestHall_MapBlockdata:: + .incbin "data/layouts/FallarborTown_LeftoverRSContestHall/map.bin" + + .align 2 +FallarborTown_LeftoverRSContestHall_Layout:: + .4byte 0x15 + .4byte 0x12 + .4byte FallarborTown_LeftoverRSContestHall_MapBorder + .4byte FallarborTown_LeftoverRSContestHall_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/layouts/FallarborTown_LeftoverRSContestHall/map.bin b/data/layouts/FallarborTown_LeftoverRSContestHall/map.bin new file mode 100644 index 000000000..d65e7c489 --- /dev/null +++ b/data/layouts/FallarborTown_LeftoverRSContestHall/map.bin @@ -0,0 +1 @@ +/////////////////////nnn€€€bbbbbbbbbbbbbbbbbbbbb 2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2"2(2`2`2              f2`2*2(2`2`2$%2%2%2%2%2%2%2%2%2%2%2%2%2&f2`2*2(2`2`2$%2%2hiiiiiiij%2%2&f2`2*2(2`2`2$%2%2pq2q2q2q2q2o2q2r%2%2&f2`2*2(2`2`2$%2%2pq2q2q22qwBqr%2%2&f2`2*2(2`2`2$%2%2pq2q2q2‰2q2qq2r%2%2&f2`2*2(2`2`2$%2%2pq2q2q2q2q2q2q2r%2%2&f2`2*2(2`2`2$%2%2xyyk2l2m2yyz%2%2&f2`2*2(2`2`222222s2t2u222222f2`2*2(2`2`26s2t2u26f2`2*2(2`2`2Æ2_2_2_2_2_2_2_2_2_2_2_2_2_2_2g2`2*2(2`2J2`2`2J2`2`2`2`2`2`2`2`2`2J2`2`2J2`2*2(2`2R6`2`2R6`2`2`2`2`2`2`2R6`2`2R6`2*2 \ No newline at end of file diff --git a/data/layouts/FallarborTown_LeftoverRSContestLobby/border.bin b/data/layouts/FallarborTown_LeftoverRSContestLobby/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/FallarborTown_LeftoverRSContestLobby/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc b/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc new file mode 100644 index 000000000..c30723a04 --- /dev/null +++ b/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc @@ -0,0 +1,16 @@ + .align 2 +FallarborTown_LeftoverRSContestLobby_MapBorder:: + .incbin "data/layouts/FallarborTown_LeftoverRSContestLobby/border.bin" + + .align 2 +FallarborTown_LeftoverRSContestLobby_MapBlockdata:: + .incbin "data/layouts/FallarborTown_LeftoverRSContestLobby/map.bin" + + .align 2 +FallarborTown_LeftoverRSContestLobby_Layout:: + .4byte 0xf + .4byte 0x7 + .4byte FallarborTown_LeftoverRSContestLobby_MapBorder + .4byte FallarborTown_LeftoverRSContestLobby_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/layouts/FallarborTown_LeftoverRSContestLobby/map.bin b/data/layouts/FallarborTown_LeftoverRSContestLobby/map.bin new file mode 100644 index 000000000..87407546a --- /dev/null +++ b/data/layouts/FallarborTown_LeftoverRSContestLobby/map.bin @@ -0,0 +1 @@ +[\]ÊËNËÊMÊÊÊÊÊÊcdeÌbVbÌbbÉbTb 2!2!2ÐÑ2Ò2Ó2ÔU2!2!2!2!2!2"2(2`2`2ØÙÚÛÜf2`2Ý`2`2`292(2`2`2Æ2_2_2_2_2g2`2`2`2`2`2A2(2`2`2`2`2`2`2`2`2`2`2`2Ý`292(2`2`2`2`2`2`2`2`2`2`2`2A2 \ No newline at end of file diff --git a/data/layouts/FarawayIsland_Entrance/border.bin b/data/layouts/FarawayIsland_Entrance/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/FarawayIsland_Entrance/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/FarawayIsland_Entrance/layout.inc b/data/layouts/FarawayIsland_Entrance/layout.inc new file mode 100644 index 000000000..4a1c6c36b --- /dev/null +++ b/data/layouts/FarawayIsland_Entrance/layout.inc @@ -0,0 +1,16 @@ + .align 2 +FarawayIsland_Entrance_MapBorder:: + .incbin "data/layouts/FarawayIsland_Entrance/border.bin" + + .align 2 +FarawayIsland_Entrance_MapBlockdata:: + .incbin "data/layouts/FarawayIsland_Entrance/map.bin" + + .align 2 +FarawayIsland_Entrance_Layout:: + .4byte 0x22 + .4byte 0x2e + .4byte FarawayIsland_Entrance_MapBorder + .4byte FarawayIsland_Entrance_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Rustboro diff --git a/data/layouts/FarawayIsland_Entrance/map.bin b/data/layouts/FarawayIsland_Entrance/map.bin new file mode 100644 index 000000000..389f6b0cd Binary files /dev/null and b/data/layouts/FarawayIsland_Entrance/map.bin differ diff --git a/data/layouts/FarawayIsland_Interior/border.bin b/data/layouts/FarawayIsland_Interior/border.bin new file mode 100644 index 000000000..addb5d6ce Binary files /dev/null and b/data/layouts/FarawayIsland_Interior/border.bin differ diff --git a/data/layouts/FarawayIsland_Interior/layout.inc b/data/layouts/FarawayIsland_Interior/layout.inc new file mode 100644 index 000000000..bf8cbdbf4 --- /dev/null +++ b/data/layouts/FarawayIsland_Interior/layout.inc @@ -0,0 +1,16 @@ + .align 2 +FarawayIsland_Interior_MapBorder:: + .incbin "data/layouts/FarawayIsland_Interior/border.bin" + + .align 2 +FarawayIsland_Interior_MapBlockdata:: + .incbin "data/layouts/FarawayIsland_Interior/map.bin" + + .align 2 +FarawayIsland_Interior_Layout:: + .4byte 0x1d + .4byte 0x1a + .4byte FarawayIsland_Interior_MapBorder + .4byte FarawayIsland_Interior_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Fortree diff --git a/data/layouts/FarawayIsland_Interior/map.bin b/data/layouts/FarawayIsland_Interior/map.bin new file mode 100644 index 000000000..847295734 Binary files /dev/null and b/data/layouts/FarawayIsland_Interior/map.bin differ diff --git a/data/layouts/FieryPath/border.bin b/data/layouts/FieryPath/border.bin new file mode 100644 index 000000000..9ae2c2126 --- /dev/null +++ b/data/layouts/FieryPath/border.bin @@ -0,0 +1 @@ +qqqq \ No newline at end of file diff --git a/data/layouts/FieryPath/layout.inc b/data/layouts/FieryPath/layout.inc new file mode 100644 index 000000000..7fff04df1 --- /dev/null +++ b/data/layouts/FieryPath/layout.inc @@ -0,0 +1,16 @@ + .align 2 +FieryPath_MapBorder:: + .incbin "data/layouts/FieryPath/border.bin" + + .align 2 +FieryPath_MapBlockdata:: + .incbin "data/layouts/FieryPath/map.bin" + + .align 2 +FieryPath_Layout:: + .4byte 0x23 + .4byte 0x26 + .4byte FieryPath_MapBorder + .4byte FieryPath_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lavaridge diff --git a/data/layouts/FieryPath/map.bin b/data/layouts/FieryPath/map.bin new file mode 100644 index 000000000..5928fb173 --- /dev/null +++ b/data/layouts/FieryPath/map.bin @@ -0,0 +1,10 @@ +qqqq{ttttttt|qqqq{ttttttttttt|qqqqqqqqqr{ttt|qpqqqqr{tttttttt|qpqqqqqqqq{z{333|pqqq{z33333333|pqqqqqqqqrq33333pqqqrq333333333pqqqqqqq{zq33333pqqqr{3333333 33pqqqqqq{zq3 +   ~pqqqr3333 +   ~~qqqqqqr{tt3h   ~qqqr333 +pqqqqqqqqqqqqqrr3333pqqqqqqr333pqqqqqqqqqqqqqrr3 + 3pqqqqqqqr333pqqqqqqqqqqqqqrr33xttttt|qr333pqqqqqqqqqqqqqrr33ttttt|pqr333pqqqqqqqqqqqqqrr3333333333pqr333pqqqqqqqqqqqqqrr3 +      3 +~xtz333pqqqqqqqqqqqqqrr3qqq 3qqqq333pqqqqqqqqqqqqqrr3h  jr33tttt333x|qqqqqqqqqqqqrr3pqrr33333333333pqqqqqqqqqqqqrr3pqqrr333 +    333qpqqqqqqqqqqqqrr3pqqr   ~h j333|x|qqqqqqqqqqrr3pqq     ~qr3333qxtttt|qqqqq{zr3xt|qqqqqqqqr3333tttt|pqqqqqr{3t|xt|qqqqqqr 33333333|pqqqqqrr33 73|x|qqqqqr333333333pqqqqqrr33333|qpqqqqqj333333333pqqqqqr   333qpqqqqqqr     3333pqqqqq  jr333qpqqqqqqiiiij3333pqqqqqqqqrr33 +~qpqqqqqqqqqqqr3333pqqqqqqqqrr3 +~qqpqqqqqqqqqqqr 333pqqqqqqqrr3tt|pqqqqqqqqqqqrq333pqqqqqqqqrr3333ppqqqqqqqqqqqj333pqqqqqqq{z 333pxt|qqqqqqqqqqr333pqqqqqqqr{tz333xt|pqqqqqqqqqqr333pqqqqqqqrr 33333 ppqqqqqqqqqqr333pqqqqqqqrr3333333ppqqqqqqqqqqr333pqqqqqqqrr3333333ppqqqqqqqqqqr333pqqqqqqqrr3333333ppqqqqqqqqqqr333pqqqqqqqr       ~pqqqqqqqqqqr333pqqqqqqqiiiiiiiii~qqqqqqqqqqr3 33pqqqqqqqqqqqqqqqqqqqqqqqqqqqq ~~qqqqq \ No newline at end of file diff --git a/data/layouts/FortreeCity/border.bin b/data/layouts/FortreeCity/border.bin new file mode 100644 index 000000000..addb5d6ce Binary files /dev/null and b/data/layouts/FortreeCity/border.bin differ diff --git a/data/layouts/FortreeCity/layout.inc b/data/layouts/FortreeCity/layout.inc new file mode 100644 index 000000000..e273287de --- /dev/null +++ b/data/layouts/FortreeCity/layout.inc @@ -0,0 +1,16 @@ + .align 2 +FortreeCity_MapBorder:: + .incbin "data/layouts/FortreeCity/border.bin" + + .align 2 +FortreeCity_MapBlockdata:: + .incbin "data/layouts/FortreeCity/map.bin" + + .align 2 +FortreeCity_Layout:: + .4byte 0x28 + .4byte 0x14 + .4byte FortreeCity_MapBorder + .4byte FortreeCity_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Fortree diff --git a/data/layouts/FortreeCity/map.bin b/data/layouts/FortreeCity/map.bin new file mode 100644 index 000000000..a2aa40e98 --- /dev/null +++ b/data/layouts/FortreeCity/map.bin @@ -0,0 +1 @@ +ÇÇÇÇÆÇÆÇÆÇÇÇÇÆÆÆÆÆÇÇÆÆÆÇÇÇÇÇÆÆÆ$%&ÆÇÇÇÇÇÇHIJÆÇÆÇÆ$%&ÆÆÆ*$%&ÆÆÆÆÆ$%&ÆÆÆ+,-./ÇÇÇÇÇÆPQR+,-./**+,-./ÆÆÆ+,-./ÆÆ34567ÇÇÇÇÇÇD\DHIJK34567ÆÆ34567Ç**34567Æ*3B>B7ÇÇÇÇÇÇÆÇÇPQRS3B?BVBVB;BB>B?BVBVBVB;BB?BVBVB;BB>B7ÇÇÇÇÇÇÇÆXYZ[CFEFGDDCFFFGDDDCFEFGDDCFEFGÇÇÇÇÇ0`abcÆÇMÇHIJÇÇÇÇÇÇÇÇÇÇMÇÇHIJÇMÇÇÇÇ00000X2Y2Y2SSa2ÇPQRÇÇÇÇcddddea2ÇÇPQRÇa2SSS00000000`2a2a2a2a2a2ÇÇAÇÇÇÇDz³³³³´a2SÇÇAÇÇa2a2a2b2000000000h2a2a2a2a2ÇÇsÆÆÇÇS¸¹º³»¼`2U2ÇÇsÆÇa2a2a2j200000000000h2a2a2a2ÇÇÆÆÆÇÇ0ÀÁÂÅÃÄ`2]ÇÆÆ*Sa2a2j200000Æ00(0)0)0+00`2a2K2$%&**ÇÇ0È1É1ÊÍËÌ1`2a2ÇÆÆÇa2a2a20Æ$%&ÆÆÆÆ01230`2K2+,-./ÇÇÇÇ0X2Y2Y2Y2Y2a2K2Ç*ÇSa2a2a2Ç+,-./ÆÆÆ89:;0`2Æ34567ÆÇÇÇÇK2K2K2K2K2K2ÇÇÇÇ0h2i2i2Ç34567ÆÆÆ`ABCX2a2Æ3B?BVBVBVBVBVBVBVBVBVBVBVBVBVBVBVBNòNòNòNòVB;BB>B7ÆÆÆ000X2a2a2SCFEFGDDDDDDDDDDDDDDD00X2Y2DCFEF6GÆÆÆÆX2Y2a2a2a2a2SSMÆHIJÆÆÆÆÆÆÆÆÇÇÇÇÇL2Y2a2a2S6S6S6MÇÇÆÆÆÆK2K2a2a2a2a2a2a2a2ÆPQRÆÆÆÆÆÆÆÆÇÇHIJÇK2a2a2a2a2a2a2ÇÇÆÆÆÆÆÆK2K2K2a2a2a2a2ÆD\DÆÆÆÆÆÆÆÆÆÇPQRÇÇK2K2a2a2a2K2ÇÇÇ**ÆÆÆÆÆÆK2K2K2K2ÆÆÇÇ*ÇÆÆÆÆÆÆÆÇD\DÇÇÇÇK2K2K2ÇÇÇ \ No newline at end of file diff --git a/data/layouts/FortreeCity_DecorationShop/border.bin b/data/layouts/FortreeCity_DecorationShop/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/FortreeCity_DecorationShop/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/FortreeCity_DecorationShop/layout.inc b/data/layouts/FortreeCity_DecorationShop/layout.inc new file mode 100644 index 000000000..e4727cf75 --- /dev/null +++ b/data/layouts/FortreeCity_DecorationShop/layout.inc @@ -0,0 +1,16 @@ + .align 2 +FortreeCity_DecorationShop_MapBorder:: + .incbin "data/layouts/FortreeCity_DecorationShop/border.bin" + + .align 2 +FortreeCity_DecorationShop_MapBlockdata:: + .incbin "data/layouts/FortreeCity_DecorationShop/map.bin" + + .align 2 +FortreeCity_DecorationShop_Layout:: + .4byte 0x8 + .4byte 0x6 + .4byte FortreeCity_DecorationShop_MapBorder + .4byte FortreeCity_DecorationShop_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/FortreeCity_DecorationShop/map.bin b/data/layouts/FortreeCity_DecorationShop/map.bin new file mode 100644 index 000000000..6ca8b4e61 --- /dev/null +++ b/data/layouts/FortreeCity_DecorationShop/map.bin @@ -0,0 +1 @@ +ÈÉɾ¿ÉÉÊÐÑѾ¿ÑÑÒíî3Ï3¾¿Î3î3ïõö×ÆÇÖö÷Ù3Ù3Ù3Ù3Ù3Ù3Ù3Ù3Ì7Ù3Ù3ÔÕÙ3Ù3Í7 \ No newline at end of file diff --git a/data/layouts/FortreeCity_Gym/border.bin b/data/layouts/FortreeCity_Gym/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/FortreeCity_Gym/border.bin differ diff --git a/data/layouts/FortreeCity_Gym/layout.inc b/data/layouts/FortreeCity_Gym/layout.inc new file mode 100644 index 000000000..81994276b --- /dev/null +++ b/data/layouts/FortreeCity_Gym/layout.inc @@ -0,0 +1,16 @@ + .align 2 +FortreeCity_Gym_MapBorder:: + .incbin "data/layouts/FortreeCity_Gym/border.bin" + + .align 2 +FortreeCity_Gym_MapBlockdata:: + .incbin "data/layouts/FortreeCity_Gym/map.bin" + + .align 2 +FortreeCity_Gym_Layout:: + .4byte 0x14 + .4byte 0x19 + .4byte FortreeCity_Gym_MapBorder + .4byte FortreeCity_Gym_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_FortreeGym diff --git a/data/layouts/FortreeCity_Gym/map.bin b/data/layouts/FortreeCity_Gym/map.bin new file mode 100644 index 000000000..cff943707 Binary files /dev/null and b/data/layouts/FortreeCity_Gym/map.bin differ diff --git a/data/layouts/FortreeCity_House1/border.bin b/data/layouts/FortreeCity_House1/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/FortreeCity_House1/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/FortreeCity_House1/layout.inc b/data/layouts/FortreeCity_House1/layout.inc new file mode 100644 index 000000000..dd9962fde --- /dev/null +++ b/data/layouts/FortreeCity_House1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +FortreeCity_House1_MapBorder:: + .incbin "data/layouts/FortreeCity_House1/border.bin" + + .align 2 +FortreeCity_House1_MapBlockdata:: + .incbin "data/layouts/FortreeCity_House1/map.bin" + + .align 2 +FortreeCity_House1_Layout:: + .4byte 0x8 + .4byte 0x6 + .4byte FortreeCity_House1_MapBorder + .4byte FortreeCity_House1_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/FortreeCity_House1/map.bin b/data/layouts/FortreeCity_House1/map.bin new file mode 100644 index 000000000..5a3ac8cb6 --- /dev/null +++ b/data/layouts/FortreeCity_House1/map.bin @@ -0,0 +1 @@ +ÈÉɾ¿ÉÉÊÐàѾ¿ÑÑÒØ3è3Ü3¾¿Û3Ù3Ú3Ù3Ù3Ü3ÆÇÛ3Ù3Ù3Ù3Ù3Ù3Ù3Ù3Ù3Ù3Ù3Ì7Ù3Ù3ÔÕÙ3Ù3Í7 \ No newline at end of file diff --git a/data/layouts/FortreeCity_House2/border.bin b/data/layouts/FortreeCity_House2/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/FortreeCity_House2/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/FortreeCity_House2/layout.inc b/data/layouts/FortreeCity_House2/layout.inc new file mode 100644 index 000000000..5ab659b9a --- /dev/null +++ b/data/layouts/FortreeCity_House2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +FortreeCity_House2_MapBorder:: + .incbin "data/layouts/FortreeCity_House2/border.bin" + + .align 2 +FortreeCity_House2_MapBlockdata:: + .incbin "data/layouts/FortreeCity_House2/map.bin" + + .align 2 +FortreeCity_House2_Layout:: + .4byte 0x8 + .4byte 0x6 + .4byte FortreeCity_House2_MapBorder + .4byte FortreeCity_House2_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/FortreeCity_House2/map.bin b/data/layouts/FortreeCity_House2/map.bin new file mode 100644 index 000000000..3fbcd6043 --- /dev/null +++ b/data/layouts/FortreeCity_House2/map.bin @@ -0,0 +1 @@ +ÈÉɾ¿ÉËÊÐã便ÑÒØ3ë7ì7¾¿Û3Ó3Ú3Ù3Ù3Ü3ÆÇÛ3Ù3Ù3Ù3Ù3Ù3Ù3Ù3Ù3Ù3Ù3Ì7Ù3Ù3ÔÕÙ3Ù3Í7 \ No newline at end of file diff --git a/data/layouts/GraniteCave_1F/border.bin b/data/layouts/GraniteCave_1F/border.bin new file mode 100644 index 000000000..423a0732e --- /dev/null +++ b/data/layouts/GraniteCave_1F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/GraniteCave_1F/layout.inc b/data/layouts/GraniteCave_1F/layout.inc new file mode 100644 index 000000000..641310f75 --- /dev/null +++ b/data/layouts/GraniteCave_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +GraniteCave_1F_MapBorder:: + .incbin "data/layouts/GraniteCave_1F/border.bin" + + .align 2 +GraniteCave_1F_MapBlockdata:: + .incbin "data/layouts/GraniteCave_1F/map.bin" + + .align 2 +GraniteCave_1F_Layout:: + .4byte 0x2a + .4byte 0xf + .4byte GraniteCave_1F_MapBorder + .4byte GraniteCave_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/GraniteCave_1F/map.bin b/data/layouts/GraniteCave_1F/map.bin new file mode 100644 index 000000000..58c7945ab --- /dev/null +++ b/data/layouts/GraniteCave_1F/map.bin @@ -0,0 +1,5 @@ +22222222222222222222222?22''2222222222222222222222222222222    "2222222222222222222222222222222222222222222222222222222222226222222   +222222222222222222222J6R6F622222 $#  +22222222222<22222222;62;622222# +22222222# XYZ  "222;62;62?22      "#     +2222# "# "2;2;6222#   "2222#      "#       $'# XYZ$$#            $#         $ \ No newline at end of file diff --git a/data/layouts/GraniteCave_B1F/border.bin b/data/layouts/GraniteCave_B1F/border.bin new file mode 100644 index 000000000..423a0732e --- /dev/null +++ b/data/layouts/GraniteCave_B1F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/GraniteCave_B1F/layout.inc b/data/layouts/GraniteCave_B1F/layout.inc new file mode 100644 index 000000000..dcdafcd4e --- /dev/null +++ b/data/layouts/GraniteCave_B1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +GraniteCave_B1F_MapBorder:: + .incbin "data/layouts/GraniteCave_B1F/border.bin" + + .align 2 +GraniteCave_B1F_MapBlockdata:: + .incbin "data/layouts/GraniteCave_B1F/map.bin" + + .align 2 +GraniteCave_B1F_Layout:: + .4byte 0x20 + .4byte 0x1a + .4byte GraniteCave_B1F_MapBorder + .4byte GraniteCave_B1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/GraniteCave_B1F/map.bin b/data/layouts/GraniteCave_B1F/map.bin new file mode 100644 index 000000000..27f98c6cf --- /dev/null +++ b/data/layouts/GraniteCave_B1F/map.bin @@ -0,0 +1,10 @@ +2/2/2/2/2/2/22222222/2/2/2/2/2/2/2/2!!!! +222/2/2/2/2/2/22222222/2/2/2/2/2/2/2/2?2222!!!!!! +2?222/2/2/2/2/2/2/2/22222!!!!! +/2/2/2/2/2/222222222/2/2/222?222/2/2/2/2/2/2/222222222/2/2/222222/2/2/2/2/2/2/222222#!#!! +222222#!#!#!#!!!!!!!#222222è0Ž2•è0–222222222222222222222222222222222222222222222222>2222?22222   +222   +222222222222222222222222222  #222222222222222#   +2222222222222222222222222222222222#   +222222=22#  +222 !!!!"2222?222222222#     !!!"#   ###    ##      #     ##       ##                              # \ No newline at end of file diff --git a/data/layouts/GraniteCave_B2F/border.bin b/data/layouts/GraniteCave_B2F/border.bin new file mode 100644 index 000000000..423a0732e --- /dev/null +++ b/data/layouts/GraniteCave_B2F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/GraniteCave_B2F/layout.inc b/data/layouts/GraniteCave_B2F/layout.inc new file mode 100644 index 000000000..90d63c5bb --- /dev/null +++ b/data/layouts/GraniteCave_B2F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +GraniteCave_B2F_MapBorder:: + .incbin "data/layouts/GraniteCave_B2F/border.bin" + + .align 2 +GraniteCave_B2F_MapBlockdata:: + .incbin "data/layouts/GraniteCave_B2F/map.bin" + + .align 2 +GraniteCave_B2F_Layout:: + .4byte 0x20 + .4byte 0x1a + .4byte GraniteCave_B2F_MapBorder + .4byte GraniteCave_B2F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/GraniteCave_B2F/map.bin b/data/layouts/GraniteCave_B2F/map.bin new file mode 100644 index 000000000..bbf8dc7af --- /dev/null +++ b/data/layouts/GraniteCave_B2F/map.bin @@ -0,0 +1,2 @@ +2222222222222222222222262222222222S22222222222222'62>22222222222:2>22222222222222222222222222:2     "222222222222222222>22BR22222226222222222222222222222 $P622            $$        $    666666666666666666666666666666666666666666666S66622  2 2b6 2 2"22S622222222222222222222222222222222222222>2222222222222222222222222222'2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222     +222222222222222222222222222222'222   $22=222222222222     "'222$            $$    $$                $$      $$                              # \ No newline at end of file diff --git a/data/layouts/GraniteCave_StevensRoom/border.bin b/data/layouts/GraniteCave_StevensRoom/border.bin new file mode 100644 index 000000000..423a0732e --- /dev/null +++ b/data/layouts/GraniteCave_StevensRoom/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/GraniteCave_StevensRoom/layout.inc b/data/layouts/GraniteCave_StevensRoom/layout.inc new file mode 100644 index 000000000..ea6147343 --- /dev/null +++ b/data/layouts/GraniteCave_StevensRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +GraniteCave_StevensRoom_MapBorder:: + .incbin "data/layouts/GraniteCave_StevensRoom/border.bin" + + .align 2 +GraniteCave_StevensRoom_MapBlockdata:: + .incbin "data/layouts/GraniteCave_StevensRoom/map.bin" + + .align 2 +GraniteCave_StevensRoom_Layout:: + .4byte 0xf + .4byte 0xe + .4byte GraniteCave_StevensRoom_MapBorder + .4byte GraniteCave_StevensRoom_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/GraniteCave_StevensRoom/map.bin b/data/layouts/GraniteCave_StevensRoom/map.bin new file mode 100644 index 000000000..3dc6987c2 --- /dev/null +++ b/data/layouts/GraniteCave_StevensRoom/map.bin @@ -0,0 +1,4 @@ +   22222222222222222222222222$! +22222$ +2222$ +$!!!!!$$!!!!!!!!$$!!!!!!!!!!$ \ No newline at end of file diff --git a/data/layouts/Harbor/border.bin b/data/layouts/Harbor/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/Harbor/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Harbor/layout.inc b/data/layouts/Harbor/layout.inc new file mode 100644 index 000000000..ab5f0e032 --- /dev/null +++ b/data/layouts/Harbor/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Harbor_MapBorder:: + .incbin "data/layouts/Harbor/border.bin" + + .align 2 +Harbor_MapBlockdata:: + .incbin "data/layouts/Harbor/map.bin" + + .align 2 +Harbor_Layout:: + .4byte 0x18 + .4byte 0xf + .4byte Harbor_MapBorder + .4byte Harbor_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/layouts/Harbor/map.bin b/data/layouts/Harbor/map.bin new file mode 100644 index 000000000..c77c1edfb --- /dev/null +++ b/data/layouts/Harbor/map.bin @@ -0,0 +1 @@ +²¶¶²²²¶¶²²²¶¶²²²¶¶²²²¶¶²²··²²²··²²²··²²²··²²²··²!!!!!!!!!!!!!!!!!!!!!!!!222MNNNNNNNNNNNNNNNNNNNN222Gqqqqqqqqqqqqqqqqqqqq222Gqppppppppppppppppppp222Gqppppppppppppppppppp222Gqppppppppppppppppppp222Gqppppppppppppppppppp222hVVW[3[3UVVVVVVVFÞ7ß7VVVV222222222%222%222%22`Ú7Û7Ø7Ù7±6*622222222222222222`Ü7Ý7Ü7Ý7Ø7Ù722222222222222222`*6*6*6*6Ú7Û7222222222222222`(6(6(6(6Ü7Ý7 \ No newline at end of file diff --git a/data/layouts/House1/border.bin b/data/layouts/House1/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/House1/border.bin differ diff --git a/data/layouts/House1/layout.inc b/data/layouts/House1/layout.inc new file mode 100644 index 000000000..0d1c9a699 --- /dev/null +++ b/data/layouts/House1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +House1_MapBorder:: + .incbin "data/layouts/House1/border.bin" + + .align 2 +House1_MapBlockdata:: + .incbin "data/layouts/House1/map.bin" + + .align 2 +House1_Layout:: + .4byte 0xa + .4byte 0x9 + .4byte House1_MapBorder + .4byte House1_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/House1/map.bin b/data/layouts/House1/map.bin new file mode 100644 index 000000000..ea185484d --- /dev/null +++ b/data/layouts/House1/map.bin @@ -0,0 +1 @@ +†‡yzŽ‚   22–2—2‰2Š2$2$2$2$2˜˜9252626262626272#2#292=H6I6â2>2>2?2#2#292=P6Q6â2>2>2?2#2#292E2F2F2F2F2F2G2#2#292#2#2#2#2#2#2#2#2"292#2#2 #2#2#2#2*6 \ No newline at end of file diff --git a/data/layouts/House2/border.bin b/data/layouts/House2/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/House2/border.bin differ diff --git a/data/layouts/House2/layout.inc b/data/layouts/House2/layout.inc new file mode 100644 index 000000000..357e6022f --- /dev/null +++ b/data/layouts/House2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +House2_MapBorder:: + .incbin "data/layouts/House2/border.bin" + + .align 2 +House2_MapBlockdata:: + .incbin "data/layouts/House2/map.bin" + + .align 2 +House2_Layout:: + .4byte 0xb + .4byte 0x8 + .4byte House2_MapBorder + .4byte House2_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/House2/map.bin b/data/layouts/House2/map.bin new file mode 100644 index 000000000..0e9f07964 --- /dev/null +++ b/data/layouts/House2/map.bin @@ -0,0 +1 @@ +†‡0xŽ   hlm€–2—282$2$2$2$2p2t2u2ˆ292#2#2#2#2#2#2#2#2#2#292#2#2#2+2JK,2#2#2#292#2#2#2+2RS,2#2#2#2‘2#2#2#2#2#2#2#2#2#2"2™#2#2 #2#2#2#2#2* \ No newline at end of file diff --git a/data/layouts/House3/border.bin b/data/layouts/House3/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/House3/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/House3/layout.inc b/data/layouts/House3/layout.inc new file mode 100644 index 000000000..2fe4bee46 --- /dev/null +++ b/data/layouts/House3/layout.inc @@ -0,0 +1,16 @@ + .align 2 +House3_MapBorder:: + .incbin "data/layouts/House3/border.bin" + + .align 2 +House3_MapBlockdata:: + .incbin "data/layouts/House3/map.bin" + + .align 2 +House3_Layout:: + .4byte 0xa + .4byte 0x8 + .4byte House3_MapBorder + .4byte House3_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/House3/map.bin b/data/layouts/House3/map.bin new file mode 100644 index 000000000..1f732ba3f --- /dev/null +++ b/data/layouts/House3/map.bin @@ -0,0 +1 @@ +㾿¦§äëÆÇ®¯¡ìó2Î2Ï2!2!2@2¶2·2©2ô2!2)2)2D2NOD2)2)2)2!2)2)2D2VWD2)2)2)2!2)2)2)2)2)2)2)2)2)2 3333333333#33333333 \ No newline at end of file diff --git a/data/layouts/House4/border.bin b/data/layouts/House4/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/House4/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/House4/layout.inc b/data/layouts/House4/layout.inc new file mode 100644 index 000000000..caeca73a8 --- /dev/null +++ b/data/layouts/House4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +House4_MapBorder:: + .incbin "data/layouts/House4/border.bin" + + .align 2 +House4_MapBlockdata:: + .incbin "data/layouts/House4/map.bin" + + .align 2 +House4_Layout:: + .4byte 0xa + .4byte 0x9 + .4byte House4_MapBorder + .4byte House4_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/House4/map.bin b/data/layouts/House4/map.bin new file mode 100644 index 000000000..6274e4418 --- /dev/null +++ b/data/layouts/House4/map.bin @@ -0,0 +1 @@ +㾿äëÆÇ ìó2Î2Ï2³6³6!2!2!2¨2ô2!2)2D2)2)2)2)2)2)2)2!2)2)2)2)2)2)2N_D2!2)2)2)2)2)2D2VWD2!2)2)2)2)2)2)2)2)2)2 3333333333#33333333 \ No newline at end of file diff --git a/data/layouts/HouseWithBed/border.bin b/data/layouts/HouseWithBed/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/HouseWithBed/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/HouseWithBed/layout.inc b/data/layouts/HouseWithBed/layout.inc new file mode 100644 index 000000000..bdb047feb --- /dev/null +++ b/data/layouts/HouseWithBed/layout.inc @@ -0,0 +1,16 @@ + .align 2 +HouseWithBed_MapBorder:: + .incbin "data/layouts/HouseWithBed/border.bin" + + .align 2 +HouseWithBed_MapBlockdata:: + .incbin "data/layouts/HouseWithBed/map.bin" + + .align 2 +HouseWithBed_Layout:: + .4byte 0xa + .4byte 0x8 + .4byte HouseWithBed_MapBorder + .4byte HouseWithBed_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/HouseWithBed/map.bin b/data/layouts/HouseWithBed/map.bin new file mode 100644 index 000000000..b91b7153b --- /dev/null +++ b/data/layouts/HouseWithBed/map.bin @@ -0,0 +1 @@ +nohi    vwp2q2$2$2$2$2$2$2~22Z6[6#2#2#2#2#2#2#2,2b6c6#2#2#2#2#2#2LM92#2#2#2#2#2#2+2TU92#2#2#2#2#2#2#2#2#292#2#2 #2#2#2#2#2 \ No newline at end of file diff --git a/data/layouts/InsideOfTruck/border.bin b/data/layouts/InsideOfTruck/border.bin new file mode 100644 index 000000000..8459c2996 --- /dev/null +++ b/data/layouts/InsideOfTruck/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/InsideOfTruck/layout.inc b/data/layouts/InsideOfTruck/layout.inc new file mode 100644 index 000000000..dc93f12a8 --- /dev/null +++ b/data/layouts/InsideOfTruck/layout.inc @@ -0,0 +1,16 @@ + .align 2 +InsideOfTruck_MapBorder:: + .incbin "data/layouts/InsideOfTruck/border.bin" + + .align 2 +InsideOfTruck_MapBlockdata:: + .incbin "data/layouts/InsideOfTruck/map.bin" + + .align 2 +InsideOfTruck_Layout:: + .4byte 0x5 + .4byte 0x5 + .4byte InsideOfTruck_MapBorder + .4byte InsideOfTruck_MapBlockdata + .4byte gTileset_General + .4byte gTileset_InsideOfTruck diff --git a/data/layouts/InsideOfTruck/map.bin b/data/layouts/InsideOfTruck/map.bin new file mode 100644 index 000000000..84b946be5 --- /dev/null +++ b/data/layouts/InsideOfTruck/map.bin @@ -0,0 +1,2 @@ +  +2 2 22222!"#$  \ No newline at end of file diff --git a/data/layouts/IslandCave/border.bin b/data/layouts/IslandCave/border.bin new file mode 100644 index 000000000..c07869a9f --- /dev/null +++ b/data/layouts/IslandCave/border.bin @@ -0,0 +1 @@ +ÙÙÙÙ \ No newline at end of file diff --git a/data/layouts/IslandCave/layout.inc b/data/layouts/IslandCave/layout.inc new file mode 100644 index 000000000..25d870e68 --- /dev/null +++ b/data/layouts/IslandCave/layout.inc @@ -0,0 +1,16 @@ + .align 2 +IslandCave_MapBorder:: + .incbin "data/layouts/IslandCave/border.bin" + + .align 2 +IslandCave_MapBlockdata:: + .incbin "data/layouts/IslandCave/map.bin" + + .align 2 +IslandCave_Layout:: + .4byte 0x11 + .4byte 0x21 + .4byte IslandCave_MapBorder + .4byte IslandCave_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/IslandCave/map.bin b/data/layouts/IslandCave/map.bin new file mode 100644 index 000000000..a7fa61b4d Binary files /dev/null and b/data/layouts/IslandCave/map.bin differ diff --git a/data/layouts/IslandHarbor/border.bin b/data/layouts/IslandHarbor/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/IslandHarbor/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/IslandHarbor/layout.inc b/data/layouts/IslandHarbor/layout.inc new file mode 100644 index 000000000..7a1c43284 --- /dev/null +++ b/data/layouts/IslandHarbor/layout.inc @@ -0,0 +1,16 @@ + .align 2 +IslandHarbor_MapBorder:: + .incbin "data/layouts/IslandHarbor/border.bin" + + .align 2 +IslandHarbor_MapBlockdata:: + .incbin "data/layouts/IslandHarbor/map.bin" + + .align 2 +IslandHarbor_Layout:: + .4byte 0x11 + .4byte 0xd + .4byte IslandHarbor_MapBorder + .4byte IslandHarbor_MapBlockdata + .4byte gTileset_General + .4byte gTileset_IslandHarbor diff --git a/data/layouts/IslandHarbor/map.bin b/data/layouts/IslandHarbor/map.bin new file mode 100644 index 000000000..e14816107 --- /dev/null +++ b/data/layouts/IslandHarbor/map.bin @@ -0,0 +1 @@ +¥      ¥­ ­¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡Á     Å‰‰‰‰*+89:+.€‰‰‰‰ppppš‰‰@AB‰‰˜pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂà \ No newline at end of file diff --git a/data/layouts/JaggedPass/border.bin b/data/layouts/JaggedPass/border.bin new file mode 100644 index 000000000..9ae2c2126 --- /dev/null +++ b/data/layouts/JaggedPass/border.bin @@ -0,0 +1 @@ +qqqq \ No newline at end of file diff --git a/data/layouts/JaggedPass/layout.inc b/data/layouts/JaggedPass/layout.inc new file mode 100644 index 000000000..6aefbf605 --- /dev/null +++ b/data/layouts/JaggedPass/layout.inc @@ -0,0 +1,16 @@ + .align 2 +JaggedPass_MapBorder:: + .incbin "data/layouts/JaggedPass/border.bin" + + .align 2 +JaggedPass_MapBlockdata:: + .incbin "data/layouts/JaggedPass/map.bin" + + .align 2 +JaggedPass_Layout:: + .4byte 0x1e + .4byte 0x2e + .4byte JaggedPass_MapBorder + .4byte JaggedPass_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lavaridge diff --git a/data/layouts/JaggedPass/map.bin b/data/layouts/JaggedPass/map.bin new file mode 100644 index 000000000..57195b4f5 Binary files /dev/null and b/data/layouts/JaggedPass/map.bin differ diff --git a/data/layouts/LavaridgeTown/border.bin b/data/layouts/LavaridgeTown/border.bin new file mode 100644 index 000000000..9ae2c2126 --- /dev/null +++ b/data/layouts/LavaridgeTown/border.bin @@ -0,0 +1 @@ +qqqq \ No newline at end of file diff --git a/data/layouts/LavaridgeTown/layout.inc b/data/layouts/LavaridgeTown/layout.inc new file mode 100644 index 000000000..48d0bbe58 --- /dev/null +++ b/data/layouts/LavaridgeTown/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LavaridgeTown_MapBorder:: + .incbin "data/layouts/LavaridgeTown/border.bin" + + .align 2 +LavaridgeTown_MapBlockdata:: + .incbin "data/layouts/LavaridgeTown/map.bin" + + .align 2 +LavaridgeTown_Layout:: + .4byte 0x14 + .4byte 0x14 + .4byte LavaridgeTown_MapBorder + .4byte LavaridgeTown_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lavaridge diff --git a/data/layouts/LavaridgeTown/map.bin b/data/layouts/LavaridgeTown/map.bin new file mode 100644 index 000000000..604ad5f3f --- /dev/null +++ b/data/layouts/LavaridgeTown/map.bin @@ -0,0 +1,3 @@ +qqqq{ttttt|qqqqqqq66{tttzq2®2®2®2®2xttttttttr{™š››œ2tž2|qqqNKLOq6rr¡£2¼2£2£2¥JHIMyy0123rr¡»233»2¥PQRS2289:;Æ4Æ4rr©ª2£2¼2¬2­XYZ[Ö5×5`ABCÆ4Æ4rr±²³³´µ`abcæ5ç50 1"1044rrº2¨2¨2¨2¹2Š20 1"10000 1"1000rr¨2˜2¨2˜2Œ2’20 1"1000 1"1000rr¨ B¨ BŠ00 1!11111!1!1111rr‘2‘‘2‘’200(1)1)1)1)1)1)1)1)1)1)1rrª1«1«1«1«1¬1000000000000rr²³³³³´0000 0 0 +00 0 0 +00rr¸¹º³»¼0000rrÀÁÂÅß000  Æ4rrÈ1É1ÊÍ˧000 !" !"Æ4rr00000000000040000Æ4m000000000000000Æ4Æ4qqrm0000000000000044qqllllllllllllllll \ No newline at end of file diff --git a/data/layouts/LavaridgeTown_Gym_1F/border.bin b/data/layouts/LavaridgeTown_Gym_1F/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/LavaridgeTown_Gym_1F/border.bin differ diff --git a/data/layouts/LavaridgeTown_Gym_1F/layout.inc b/data/layouts/LavaridgeTown_Gym_1F/layout.inc new file mode 100644 index 000000000..e881e9d58 --- /dev/null +++ b/data/layouts/LavaridgeTown_Gym_1F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +LavaridgeTown_Gym_1F_Layout:: + .4byte 0x11 + .4byte 0x13 + .4byte LavaridgeTown_Gym_1F_MapBorder + .4byte LavaridgeTown_Gym_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_LavaridgeGym diff --git a/data/layouts/LavaridgeTown_Gym_1F/map.bin b/data/layouts/LavaridgeTown_Gym_1F/map.bin new file mode 100644 index 000000000..31d16da5e --- /dev/null +++ b/data/layouts/LavaridgeTown_Gym_1F/map.bin @@ -0,0 +1,3 @@ +   22222' 222 2222  22222  2222 222  222222  2222  2222  222222  2222  2222 2222  22  222      2222 2 2  22  22  22  !"#$  2222  22  22  22222  2222  22  22  2222  2222  22  22 %&&&&  22 2  22 22222 222 %&  22 22222 2222  22  222 +2222222222 +22  222222222 2222222  22220022 \ No newline at end of file diff --git a/data/layouts/LavaridgeTown_Gym_B1F/border.bin b/data/layouts/LavaridgeTown_Gym_B1F/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/LavaridgeTown_Gym_B1F/border.bin differ diff --git a/data/layouts/LavaridgeTown_Gym_B1F/layout.inc b/data/layouts/LavaridgeTown_Gym_B1F/layout.inc new file mode 100644 index 000000000..1fa258cba --- /dev/null +++ b/data/layouts/LavaridgeTown_Gym_B1F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +LavaridgeTown_Gym_B1F_Layout:: + .4byte 0x11 + .4byte 0x13 + .4byte LavaridgeTown_Gym_B1F_MapBorder + .4byte LavaridgeTown_Gym_B1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_LavaridgeGym diff --git a/data/layouts/LavaridgeTown_Gym_B1F/map.bin b/data/layouts/LavaridgeTown_Gym_B1F/map.bin new file mode 100644 index 000000000..aeaf0177c --- /dev/null +++ b/data/layouts/LavaridgeTown_Gym_B1F/map.bin @@ -0,0 +1,6 @@ +++++)+++++)++++++3333(33333(3333332222022;220222222 22822 +222222 +282222++++)++)+)+++)+++33331331313331333<22;1221212221222 22221 221 21 2221 222 22221 221 21 2221 222 22221 22191 2221 22292221 221 21%&&1%&& 22221%&1 21 2221 222%&&&1 221 21 2281 222 22221 221 21 2221 222 2822(92( 21 2221 222 22220 220 21%&&( 222 2222: +222 +21 2220 2229222222221 222: +222 22228222219222222 \ No newline at end of file diff --git a/data/layouts/LavaridgeTown_HerbShop/border.bin b/data/layouts/LavaridgeTown_HerbShop/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/LavaridgeTown_HerbShop/border.bin differ diff --git a/data/layouts/LavaridgeTown_HerbShop/layout.inc b/data/layouts/LavaridgeTown_HerbShop/layout.inc new file mode 100644 index 000000000..bf107dca9 --- /dev/null +++ b/data/layouts/LavaridgeTown_HerbShop/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LavaridgeTown_HerbShop_MapBorder:: + .incbin "data/layouts/LavaridgeTown_HerbShop/border.bin" + + .align 2 +LavaridgeTown_HerbShop_MapBlockdata:: + .incbin "data/layouts/LavaridgeTown_HerbShop/map.bin" + + .align 2 +LavaridgeTown_HerbShop_Layout:: + .4byte 0xb + .4byte 0x8 + .4byte LavaridgeTown_HerbShop_MapBorder + .4byte LavaridgeTown_HerbShop_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Shop diff --git a/data/layouts/LavaridgeTown_HerbShop/map.bin b/data/layouts/LavaridgeTown_HerbShop/map.bin new file mode 100644 index 000000000..cc0294a80 --- /dev/null +++ b/data/layouts/LavaridgeTown_HerbShop/map.bin @@ -0,0 +1 @@ +ˆ‹ˆˆˆ‡‡“•‡‡‡3¦2¦2¦2¦2¥x2p2p2p2p2¢¢¢¢¢­€2h2h2h2x2p2p2p2p2p2y2h2h2h23€2h2h2h2h2h2h2h2h2h2ß2g2h2h2h2h2h2h2h2f2Z2abh2h2h2h2h2ab \ No newline at end of file diff --git a/data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin b/data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc b/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc new file mode 100644 index 000000000..e0ba92bbf --- /dev/null +++ b/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +LavaridgeTown_PokemonCenter_1F_Layout:: + .4byte 0xe + .4byte 0x9 + .4byte LavaridgeTown_PokemonCenter_1F_MapBorder + .4byte LavaridgeTown_PokemonCenter_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_PokemonCenter diff --git a/data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin b/data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin new file mode 100644 index 000000000..d841f9f1a --- /dev/null +++ b/data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin @@ -0,0 +1 @@ +°±²   JK   ¸¹ºH"#RSI2À2Á2Â2P*+2[Q$2222 2&222X!!!Y<222'2 24222`2l2m2n2o22%222'2€22222021222322222'2ˆ6‰B228292:2;2242=>'22‘2222@2A2B2C22&2EF'2(2222222222&2427 \ No newline at end of file diff --git a/data/layouts/LilycoveCity/border.bin b/data/layouts/LilycoveCity/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/LilycoveCity/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/LilycoveCity/layout.inc b/data/layouts/LilycoveCity/layout.inc new file mode 100644 index 000000000..fedb7a91e --- /dev/null +++ b/data/layouts/LilycoveCity/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LilycoveCity_MapBorder:: + .incbin "data/layouts/LilycoveCity/border.bin" + + .align 2 +LilycoveCity_MapBlockdata:: + .incbin "data/layouts/LilycoveCity/map.bin" + + .align 2 +LilycoveCity_Layout:: + .4byte 0x50 + .4byte 0x28 + .4byte LilycoveCity_MapBorder + .4byte LilycoveCity_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lilycove diff --git a/data/layouts/LilycoveCity/map.bin b/data/layouts/LilycoveCity/map.bin new file mode 100644 index 000000000..5d6b56ad9 Binary files /dev/null and b/data/layouts/LilycoveCity/map.bin differ diff --git a/data/layouts/LilycoveCity_ContestHall/border.bin b/data/layouts/LilycoveCity_ContestHall/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/LilycoveCity_ContestHall/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/LilycoveCity_ContestHall/layout.inc b/data/layouts/LilycoveCity_ContestHall/layout.inc new file mode 100644 index 000000000..e0ce089f7 --- /dev/null +++ b/data/layouts/LilycoveCity_ContestHall/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LilycoveCity_ContestHall_MapBorder:: + .incbin "data/layouts/LilycoveCity_ContestHall/border.bin" + + .align 2 +LilycoveCity_ContestHall_MapBlockdata:: + .incbin "data/layouts/LilycoveCity_ContestHall/map.bin" + + .align 2 +LilycoveCity_ContestHall_Layout:: + .4byte 0x33 + .4byte 0x21 + .4byte LilycoveCity_ContestHall_MapBorder + .4byte LilycoveCity_ContestHall_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/layouts/LilycoveCity_ContestHall/map.bin b/data/layouts/LilycoveCity_ContestHall/map.bin new file mode 100644 index 000000000..06fdae4f7 --- /dev/null +++ b/data/layouts/LilycoveCity_ContestHall/map.bin @@ -0,0 +1,3 @@ +///////////////////////////////2222222222~†–vŽ 2222222222//// +˜¨ˆ ////22222<=>bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb<=> 22222//// +DEF. 2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2"2,DEF////<=>bbbb6(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*24bbbb<=>DEF. 2!2!2!2!202`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`222!2!2!2!2"2,DEFbbbb6(2`2`2`2`2`2`2`2`2`2`2`2`2              f2`2`2`2`2`2`2`2`2`2`2`2*24bbbb 2!2!2!2!202`2`2J2`2`2`2`2`2`2`2`2`2$%2%2%2%2%2%2%2%2%2%2%2%2%2&f2`2`2`2`2`2`2`2`2J2`2`222!2!2!2!2"2(2`2`2`2`2`2`2`2R`2`2`2`2`2`2`2`2`2$%2%2hiiiiiiij%2%2&f2`2`2`2`2`2`2`2`2R`2`2`2`2`2`2`2*2(2`2J2`2`2J2`2`2`2`2`2`2H2`2H2`2`2`2$%2%2pq2q2q2q2q2o2q2r%2%2&f2`2`2I2`2I2`2`2`2`2`2`2J2`2`2J2`2*2(2`2R`2`2R`2`2`2`2`2`2P2`2P2`2`2`2$%2%2pq2q2q2‘2qwBqr%2%2&f2`2`2Q2`2Q2`2`2`2`2`2`2R`2`2R`2*2(2`2`2`2`2`2`2`2`2`2`2`2X2`2X2`2`2`2$%2%2pq2q2q2™2q2qq2r%2%2&f2`2`2Y2`2Y2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2$%2%2pq2q2q2q2q2q2q2r%2%2&f2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2H2`2H2`2`2`2$%2%2xyy{2|2}2yyz%2%2&f2`2`2I2`2I2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2P2`2P2`2`2`222222ƒ2„2…222222f2`2`2Q2`2Q2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2ƒ2„2…2f2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2Æ2_2_2_2_2_2_2_2_2_2_2_2_2_2_2g2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2              f2`2`2`2`2`2`2`2`2              f2`2`2`2`2*2(2`2`2`2`2`2$%2%2%2%2%2%2%2%2%2%2%2%2%2&f2`2`2`2`2`2`2`2`2$%2%2%2%2%2%2%2%2%2%2%2%2%2&f2`2`2`2`2*2(2`2`2`2`2`2$%2%2hiiiiiiij%2%2&f2I2`2`2`2`2`2H2`2$%2%2hiiiiiiij%2%2&f2`2`2`2`2*2(2`2H2`2H2`2$%2%2pq2q2q2q2q2o2q2r%2%2&f2Q2`2`2`2`2`2P2`2$%2%2pq2q2q2q2q2o2q2r%2%2&f2I2`2I2`2*2(2`2P2`2P2`2$%2%2pq2q2q2¡2qwBqr%2%2&f2Y2`2`2`2`2`2X2`2$%2%2pq2q2q2’2qwBqr%2%2&f2Q2`2Q2`2*2(2`2X2`2X2`2$%2%2pq2q2q2©2q2qq2r%2%2&f2`2`2`2`2`2`2`2`2$%2%2pq2q2q2š2q2qq2r%2%2&f2Y2`2Y2`2*2(2`2`2`2`2`2$%2%2pq2q2q2q2q2q2q2r%2%2&f2I2`2`2`2`2`2H2`2$%2%2pq2q2q2q2q2q2q2r%2%2&f2`2`2`2`2*2(2`2H2`2H2`2$%2%2xyy‹2Œ22yyz%2%2&f2Q2`2`2`2`2`2P2`2$%2%2xyy«2¬2­2yyz%2%2&f2I2`2I2`2*2(2`2P2`2P2`222222“2”2•222222f2Y2`2`2`2`2`2X2`222222³2´2µ222222f2Q2`2Q2`2*2(2`2X2`2X2`2“2”2•2f2`2`2`2`2`2`2`2`2³2´2µ2f2Y2`2Y2`2*2(2`2`2`2`2`2Æ2_2_2_2_2_2_2_2_2_2_2_2_2_2_2g2`2`2`2`2`2`2`2`2Æ2_2_2_2_2_2_2_2_2_2_2_2_2_2_2g2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2J2`2`2`2J2`2`2`2J2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2J2`2`2`2J2`2`2`2J2`2`2*2(2`2`2R`2`2`2R`2`2`2R`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2R`2`2`2R`2`2`2R`2`2*2 \ No newline at end of file diff --git a/data/layouts/LilycoveCity_ContestLobby/border.bin b/data/layouts/LilycoveCity_ContestLobby/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/LilycoveCity_ContestLobby/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/LilycoveCity_ContestLobby/layout.inc b/data/layouts/LilycoveCity_ContestLobby/layout.inc new file mode 100644 index 000000000..8ca1d160f --- /dev/null +++ b/data/layouts/LilycoveCity_ContestLobby/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LilycoveCity_ContestLobby_MapBorder:: + .incbin "data/layouts/LilycoveCity_ContestLobby/border.bin" + + .align 2 +LilycoveCity_ContestLobby_MapBlockdata:: + .incbin "data/layouts/LilycoveCity_ContestLobby/map.bin" + + .align 2 +LilycoveCity_ContestLobby_Layout:: + .4byte 0x1f + .4byte 0xc + .4byte LilycoveCity_ContestLobby_MapBorder + .4byte LilycoveCity_ContestLobby_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/layouts/LilycoveCity_ContestLobby/map.bin b/data/layouts/LilycoveCity_ContestLobby/map.bin new file mode 100644 index 000000000..122962e42 --- /dev/null +++ b/data/layouts/LilycoveCity_ContestLobby/map.bin @@ -0,0 +1 @@ +ÊÊÊÊÊÊÊÊ[\]ÊÊÊ:;ÊÊÊM[\]ÊÊÊÊÊÊÊÊbbbÉbÉbÉc6deÌbbBCbbÌc6deÉbÉbÉbbT 2!2!2!2!2!2!2!2!2!2!2ÐÑ2ž2×2×2®2Ñ2àU2!2!2!2!2!2!2!2!2!2!2"2(2`2`2`2`2`2`2`2`2`2`2ØÙ¦ß߶Ùèf2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2Æ2_2_2_2_2_2_2_2g2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2Ý`2`2`2Ý`2`2*282`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`292@2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2A2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*282`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2Ý`2`2`2Ý`2`292@2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2A2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*2 \ No newline at end of file diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin b/data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc b/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc new file mode 100644 index 000000000..3c6c30cdc --- /dev/null +++ b/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +LilycoveCity_CoveLilyMotel_1F_Layout:: + .4byte 0xc + .4byte 0x9 + .4byte LilycoveCity_CoveLilyMotel_1F_MapBorder + .4byte LilycoveCity_CoveLilyMotel_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin b/data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin new file mode 100644 index 000000000..5242f8e57 --- /dev/null +++ b/data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin @@ -0,0 +1 @@ +ãa¾¿äë ÆÇ ìó2!2!2!2!2Î2Ï2¨2!2!2@2ô2!2)2)2)2)2)2)2)2)2)2)2)2!2D2NOD2)2)2D2N_D2)2!2D2VWD2)2)2D2VWD2)2!2)2)2)2)2)2)2)2)2)2)2)2 333333333333#3333333333 \ No newline at end of file diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin b/data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc b/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc new file mode 100644 index 000000000..c65508e1a --- /dev/null +++ b/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +LilycoveCity_CoveLilyMotel_2F_Layout:: + .4byte 0xc + .4byte 0x9 + .4byte LilycoveCity_CoveLilyMotel_2F_MapBorder + .4byte LilycoveCity_CoveLilyMotel_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin b/data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin new file mode 100644 index 000000000..4484b5b55 --- /dev/null +++ b/data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin @@ -0,0 +1 @@ +ãa°¾¿äë¸ÆÇìó2!2!2!2!2!2!2!2À2Î2Ï2ô2!2)2N_D2)2)2D2NOD2)2!2D2VWD2)2)2D2VWD2)2!2)2)2)2)2)2)2)2)2)2)2)2!2D2NOD2)2)2)2N_)2)2!2D2VWD2)2)2D2VW)2)2!2)2)2)2)2)2)2)2)2)2)2)2 \ No newline at end of file diff --git a/data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin b/data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin differ diff --git a/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc b/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc new file mode 100644 index 000000000..53d452438 --- /dev/null +++ b/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LilycoveCity_DepartmentStoreElevator_MapBorder:: + .incbin "data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin" + + .align 2 +LilycoveCity_DepartmentStoreElevator_MapBlockdata:: + .incbin "data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin" + + .align 2 +LilycoveCity_DepartmentStoreElevator_Layout:: + .4byte 0x5 + .4byte 0x6 + .4byte LilycoveCity_DepartmentStoreElevator_MapBorder + .4byte LilycoveCity_DepartmentStoreElevator_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleFrontier diff --git a/data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin b/data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin new file mode 100644 index 000000000..7d9ae193b --- /dev/null +++ b/data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin @@ -0,0 +1 @@ +(***,011148999<\2]2]2]2]2d2e2e2e2f2d2O2W2e2f2 \ No newline at end of file diff --git a/data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin b/data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin new file mode 100644 index 000000000..c1b82435c --- /dev/null +++ b/data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc b/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc new file mode 100644 index 000000000..61a5db9c2 --- /dev/null +++ b/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LilycoveCity_DepartmentStoreRooftop_MapBorder:: + .incbin "data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin" + + .align 2 +LilycoveCity_DepartmentStoreRooftop_MapBlockdata:: + .incbin "data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin" + + .align 2 +LilycoveCity_DepartmentStoreRooftop_Layout:: + .4byte 0x12 + .4byte 0xc + .4byte LilycoveCity_DepartmentStoreRooftop_MapBorder + .4byte LilycoveCity_DepartmentStoreRooftop_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Shop diff --git a/data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin b/data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin new file mode 100644 index 000000000..e9125baf0 --- /dev/null +++ b/data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin @@ -0,0 +1 @@ +&oo'.S2S2S2S2S2S2S2S2wwS2NO5/6É2Ê2J2J2J2J2J2J2M2M23VW=z'6ËÌJ2J2J2J2J2J2J2J2J2^_ET2S2/6É2Ê2J2J2J2J2J2J2J2J2J2M2M2M2M2À676ËÌJ2J2Á6Â6J2J2Á6Â6J2J2J2J2J2À67>U2[2[2[2[2[2[2[2[2[2[2[2[2[2[2[2?FccccccccccccccccGäååååååååååååååååæìðñíííííðñíííííðñîìøùíííííøùíííííøùîìííííííííííííííííî \ No newline at end of file diff --git a/data/layouts/LilycoveCity_DepartmentStore_1F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_1F/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/LilycoveCity_DepartmentStore_1F/border.bin differ diff --git a/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc new file mode 100644 index 000000000..441cfc474 --- /dev/null +++ b/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +LilycoveCity_DepartmentStore_1F_Layout:: + .4byte 0x12 + .4byte 0x8 + .4byte LilycoveCity_DepartmentStore_1F_MapBorder + .4byte LilycoveCity_DepartmentStore_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Shop diff --git a/data/layouts/LilycoveCity_DepartmentStore_1F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_1F/map.bin new file mode 100644 index 000000000..2d3d15360 --- /dev/null +++ b/data/layouts/LilycoveCity_DepartmentStore_1F/map.bin @@ -0,0 +1 @@ +ˆ|}~ˆˆˆˆˆˆˆˆˆˆˆ  „…†œPx2Ž2Ÿ22p2p2¤Ô2˜2™2˜2¥x2p2p2p2p2p2€2h2h2h2h2h2¬¡ ¡ ­€2h2h2h2n2h2ß2g2h2h2h2h2q2p2p2p2p2p2y2h2h2h2h2h2abhh2h2h2h2h2h2h2h2h2h2h2h2h2n2h2ß2g2h2h2h2h2h2h2h2h2h2h2h2h2l2h2l2l2abh2h2h2h2h2h2h2h2h2h2th2tt \ No newline at end of file diff --git a/data/layouts/LilycoveCity_DepartmentStore_2F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_2F/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/LilycoveCity_DepartmentStore_2F/border.bin differ diff --git a/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc new file mode 100644 index 000000000..54ede95cd --- /dev/null +++ b/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +LilycoveCity_DepartmentStore_2F_Layout:: + .4byte 0x12 + .4byte 0x8 + .4byte LilycoveCity_DepartmentStore_2F_MapBorder + .4byte LilycoveCity_DepartmentStore_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Shop diff --git a/data/layouts/LilycoveCity_DepartmentStore_2F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_2F/map.bin new file mode 100644 index 000000000..82ca90b08 --- /dev/null +++ b/data/layouts/LilycoveCity_DepartmentStore_2F/map.bin @@ -0,0 +1 @@ +ˆ|}~ˆˆˆˆˆˆ    „…†PQ 2–2§2—22222222222222222222222222222222m222ª«22Ý2›2›2›2›2Ý222ª«2u223422ž££££ž22342222²³22¤ 2222ž22²³2m2222222Þ2222Ñ22222u \ No newline at end of file diff --git a/data/layouts/LilycoveCity_DepartmentStore_3F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_3F/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/LilycoveCity_DepartmentStore_3F/border.bin differ diff --git a/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc new file mode 100644 index 000000000..a16342425 --- /dev/null +++ b/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +LilycoveCity_DepartmentStore_3F_Layout:: + .4byte 0x12 + .4byte 0x8 + .4byte LilycoveCity_DepartmentStore_3F_MapBorder + .4byte LilycoveCity_DepartmentStore_3F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Shop diff --git a/data/layouts/LilycoveCity_DepartmentStore_3F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_3F/map.bin new file mode 100644 index 000000000..c10b776f5 --- /dev/null +++ b/data/layouts/LilycoveCity_DepartmentStore_3F/map.bin @@ -0,0 +1 @@ +ˆ|}~ˆˆˆˆ6    „…†œ•‡‡‡6QP 2–2¯2—222¤C2®2®2®2¥ 222222222222¬¢¢¢¢­22222222+,2222222222+,2222342222222222342222;<2222222222;<22222222222222222222 \ No newline at end of file diff --git a/data/layouts/LilycoveCity_DepartmentStore_4F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_4F/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/LilycoveCity_DepartmentStore_4F/border.bin differ diff --git a/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc new file mode 100644 index 000000000..26806016a --- /dev/null +++ b/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +LilycoveCity_DepartmentStore_4F_Layout:: + .4byte 0x12 + .4byte 0x8 + .4byte LilycoveCity_DepartmentStore_4F_MapBorder + .4byte LilycoveCity_DepartmentStore_4F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Shop diff --git a/data/layouts/LilycoveCity_DepartmentStore_4F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_4F/map.bin new file mode 100644 index 000000000..bc1a09e2c --- /dev/null +++ b/data/layouts/LilycoveCity_DepartmentStore_4F/map.bin @@ -0,0 +1 @@ +ˆ|}~ˆˆˆˆ    „…†PQ 2–2·2—222222222222222222222222222222222222222Ý2›2›2›2Ý222222222ª6«6222ž£££ž22ª6«6ª6«622²6³6222¤ 222ž22²6³6²6³62222222Þ222Ñ2222222 \ No newline at end of file diff --git a/data/layouts/LilycoveCity_DepartmentStore_5F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_5F/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/LilycoveCity_DepartmentStore_5F/border.bin differ diff --git a/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc new file mode 100644 index 000000000..6b5a98fe4 --- /dev/null +++ b/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +LilycoveCity_DepartmentStore_5F_Layout:: + .4byte 0x12 + .4byte 0x8 + .4byte LilycoveCity_DepartmentStore_5F_MapBorder + .4byte LilycoveCity_DepartmentStore_5F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Shop diff --git a/data/layouts/LilycoveCity_DepartmentStore_5F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_5F/map.bin new file mode 100644 index 000000000..80acc3900 Binary files /dev/null and b/data/layouts/LilycoveCity_DepartmentStore_5F/map.bin differ diff --git a/data/layouts/LilycoveCity_House2/border.bin b/data/layouts/LilycoveCity_House2/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/LilycoveCity_House2/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/LilycoveCity_House2/layout.inc b/data/layouts/LilycoveCity_House2/layout.inc new file mode 100644 index 000000000..a7926872f --- /dev/null +++ b/data/layouts/LilycoveCity_House2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LilycoveCity_House2_MapBorder:: + .incbin "data/layouts/LilycoveCity_House2/border.bin" + + .align 2 +LilycoveCity_House2_MapBlockdata:: + .incbin "data/layouts/LilycoveCity_House2/map.bin" + + .align 2 +LilycoveCity_House2_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte LilycoveCity_House2_MapBorder + .4byte LilycoveCity_House2_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/LilycoveCity_House2/map.bin b/data/layouts/LilycoveCity_House2/map.bin new file mode 100644 index 000000000..e381f20eb --- /dev/null +++ b/data/layouts/LilycoveCity_House2/map.bin @@ -0,0 +1 @@ +ã±²¾¿ä빺ÆÇìó2Á2Â2!2!2Î2Ï2ô2Y2N6O6)2)2)2)2)2Y2V6W6D2)2)2)2)2!2)2)2)2)2)2)2)2 33333333#333333 \ No newline at end of file diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin b/data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc b/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc new file mode 100644 index 000000000..3a0215859 --- /dev/null +++ b/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +LilycoveCity_LilycoveMuseum_1F_Layout:: + .4byte 0x15 + .4byte 0xe + .4byte LilycoveCity_LilycoveMuseum_1F_MapBorder + .4byte LilycoveCity_LilycoveMuseum_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_LilycoveMuseum diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin b/data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin new file mode 100644 index 000000000..6e92a8b58 --- /dev/null +++ b/data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin @@ -0,0 +1 @@ +          !"#$% &'222222222222222222222222222222222 22222222 2 2 2 2 2 2 2 222222222222  -.  /  ‹2222222222256722222:2;2;2;2<22222222222 22222B()*DO222222222222222J012LO22:2;2;2;2;2<222222222RSSSTO22HSAS@I>22222222?2?2?2?2?2F22M2?2?2?2O22222222+222,>222842;2;2;29O222222223>22?2F222RSSSSTO222222?2F22222 \ No newline at end of file diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin b/data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc b/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc new file mode 100644 index 000000000..0cc19b039 --- /dev/null +++ b/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +LilycoveCity_LilycoveMuseum_2F_Layout:: + .4byte 0x16 + .4byte 0xd + .4byte LilycoveCity_LilycoveMuseum_2F_MapBorder + .4byte LilycoveCity_LilycoveMuseum_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_LilycoveMuseum diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin b/data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin new file mode 100644 index 000000000..76a918838 --- /dev/null +++ b/data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin @@ -0,0 +1 @@ +yyyzjklxyyy‚‰‰‰‰‰‰‰„rst…‰‰€‰‰‰Šq2p2q2p2q2p2q2Œq2p2q2q2p2ˆ‰‰‰p2q2p2q2p2i2h2i2h2i2h2i2h2i2h2i2h2i2p2q2p2q2q2d2e2f2g2h2i2h2i2d2e2f2g2h2i2h2i2d2e2f2g2h2p2†nnoƒ2h2i2h2†nnoƒ2h2i2h2†nnoƒ2q2ŽXYw{2i2h2i2ŽXYw{2i2h2i2ŽXYw{2p2|2}2~22ƒ2h2i2h2|2}2~22ƒ2h2i2h2|2}2~22ƒ2q2h2i2h2i2d2e2f2g2h2i2h2i2d2e2f2g2h2i2h2i2h2p2i2h2i2h2†nnoƒ2h2i2h2†nnoƒ2h2i2h2i2q2h2i2h2i2ŽXYw{2i2h2i2ŽXYw{2i2h2i2h2p2i2h2i2h2|2}2~22ƒ2h2i2h2|2}2~22ƒ2h2i2h2i2q2h2i2h2i2h2i2h2i2h2i2h2i2h2i2h2i2h2i2h2i2h2 \ No newline at end of file diff --git a/data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin b/data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc b/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc new file mode 100644 index 000000000..3a3a624bd --- /dev/null +++ b/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LilycoveCity_PokemonTrainerFanClub_MapBorder:: + .incbin "data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin" + + .align 2 +LilycoveCity_PokemonTrainerFanClub_MapBlockdata:: + .incbin "data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin" + + .align 2 +LilycoveCity_PokemonTrainerFanClub_Layout:: + .4byte 0xc + .4byte 0xe + .4byte LilycoveCity_PokemonTrainerFanClub_MapBorder + .4byte LilycoveCity_PokemonTrainerFanClub_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin b/data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin new file mode 100644 index 000000000..cddfe5d9d --- /dev/null +++ b/data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin @@ -0,0 +1,2 @@ +no0vwi    ƒ„~22q2$2$2$2$2$282$2‹2Œ292#2#2+2LMLM,2#2#2#292#2#2#2TUTU#2#2#2#292#2#2#2#2#2#2,2#2#2#2#2 3û2ü2#2#2#2#2#2#2ú2û2û2#2#2#2#2#2#2ƒ„ 526262626272 +hi‹2Œ2$2=2H^HI?2%2p2q292#2#2=2PQPQ?2#2#2#292#2#2E2F2F2F2F2G2#2#2#292#2#2#2#2#2#2#2#2#2#2#292#2#2#2#2 #2#2#2#2#2 \ No newline at end of file diff --git a/data/layouts/LinkContestRoom1/border.bin b/data/layouts/LinkContestRoom1/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/LinkContestRoom1/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/LinkContestRoom1/layout.inc b/data/layouts/LinkContestRoom1/layout.inc new file mode 100644 index 000000000..38af49829 --- /dev/null +++ b/data/layouts/LinkContestRoom1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LinkContestRoom1_MapBorder:: + .incbin "data/layouts/LinkContestRoom1/border.bin" + + .align 2 +LinkContestRoom1_MapBlockdata:: + .incbin "data/layouts/LinkContestRoom1/map.bin" + + .align 2 +LinkContestRoom1_Layout:: + .4byte 0xf + .4byte 0xb + .4byte LinkContestRoom1_MapBorder + .4byte LinkContestRoom1_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Contest diff --git a/data/layouts/LinkContestRoom1/map.bin b/data/layouts/LinkContestRoom1/map.bin new file mode 100644 index 000000000..a8853f6ae --- /dev/null +++ b/data/layouts/LinkContestRoom1/map.bin @@ -0,0 +1 @@ +```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q22q2w6q2r%2%2&$%2%2pq2q2q2‰2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyyk2l2m2yyz%2%2&22222s2t2u2222226s2t2u26 \ No newline at end of file diff --git a/data/layouts/LinkContestRoom2/border.bin b/data/layouts/LinkContestRoom2/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/LinkContestRoom2/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/LinkContestRoom2/layout.inc b/data/layouts/LinkContestRoom2/layout.inc new file mode 100644 index 000000000..d09439edd --- /dev/null +++ b/data/layouts/LinkContestRoom2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LinkContestRoom2_MapBorder:: + .incbin "data/layouts/LinkContestRoom2/border.bin" + + .align 2 +LinkContestRoom2_MapBlockdata:: + .incbin "data/layouts/LinkContestRoom2/map.bin" + + .align 2 +LinkContestRoom2_Layout:: + .4byte 0xf + .4byte 0xb + .4byte LinkContestRoom2_MapBorder + .4byte LinkContestRoom2_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Contest diff --git a/data/layouts/LinkContestRoom2/map.bin b/data/layouts/LinkContestRoom2/map.bin new file mode 100644 index 000000000..7cb63b40d --- /dev/null +++ b/data/layouts/LinkContestRoom2/map.bin @@ -0,0 +1 @@ +```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q2‘2q2w6q2r%2%2&$%2%2pq2q2q2™2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy{2|2}2yyz%2%2&22222ƒ2„2…2222226ƒ2„2…26 \ No newline at end of file diff --git a/data/layouts/LinkContestRoom3/border.bin b/data/layouts/LinkContestRoom3/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/LinkContestRoom3/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/LinkContestRoom3/layout.inc b/data/layouts/LinkContestRoom3/layout.inc new file mode 100644 index 000000000..c969be1ac --- /dev/null +++ b/data/layouts/LinkContestRoom3/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LinkContestRoom3_MapBorder:: + .incbin "data/layouts/LinkContestRoom3/border.bin" + + .align 2 +LinkContestRoom3_MapBlockdata:: + .incbin "data/layouts/LinkContestRoom3/map.bin" + + .align 2 +LinkContestRoom3_Layout:: + .4byte 0xf + .4byte 0xb + .4byte LinkContestRoom3_MapBorder + .4byte LinkContestRoom3_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Contest diff --git a/data/layouts/LinkContestRoom3/map.bin b/data/layouts/LinkContestRoom3/map.bin new file mode 100644 index 000000000..59e9e9182 --- /dev/null +++ b/data/layouts/LinkContestRoom3/map.bin @@ -0,0 +1 @@ +```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q2±2q2w6q2r%2%2&$%2%2pq2q2q2¹2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy›2œ22yyz%2%2&22222£2¤2¥2222226£2¤2¥26 \ No newline at end of file diff --git a/data/layouts/LinkContestRoom4/border.bin b/data/layouts/LinkContestRoom4/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/LinkContestRoom4/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/LinkContestRoom4/layout.inc b/data/layouts/LinkContestRoom4/layout.inc new file mode 100644 index 000000000..61b03a2ce --- /dev/null +++ b/data/layouts/LinkContestRoom4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LinkContestRoom4_MapBorder:: + .incbin "data/layouts/LinkContestRoom4/border.bin" + + .align 2 +LinkContestRoom4_MapBlockdata:: + .incbin "data/layouts/LinkContestRoom4/map.bin" + + .align 2 +LinkContestRoom4_Layout:: + .4byte 0xf + .4byte 0xb + .4byte LinkContestRoom4_MapBorder + .4byte LinkContestRoom4_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Contest diff --git a/data/layouts/LinkContestRoom4/map.bin b/data/layouts/LinkContestRoom4/map.bin new file mode 100644 index 000000000..4e2166c19 --- /dev/null +++ b/data/layouts/LinkContestRoom4/map.bin @@ -0,0 +1 @@ +```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q2¢2q2w6q2r%2%2&$%2%2pq2q2q2ª2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy»2¼2½2yyz%2%2&22222Ã2Ä2Å2222226Ã2Ä2Å26 \ No newline at end of file diff --git a/data/layouts/LinkContestRoom5/border.bin b/data/layouts/LinkContestRoom5/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/LinkContestRoom5/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/LinkContestRoom5/layout.inc b/data/layouts/LinkContestRoom5/layout.inc new file mode 100644 index 000000000..38f1e42cd --- /dev/null +++ b/data/layouts/LinkContestRoom5/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LinkContestRoom5_MapBorder:: + .incbin "data/layouts/LinkContestRoom5/border.bin" + + .align 2 +LinkContestRoom5_MapBlockdata:: + .incbin "data/layouts/LinkContestRoom5/map.bin" + + .align 2 +LinkContestRoom5_Layout:: + .4byte 0xf + .4byte 0xb + .4byte LinkContestRoom5_MapBorder + .4byte LinkContestRoom5_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Contest diff --git a/data/layouts/LinkContestRoom5/map.bin b/data/layouts/LinkContestRoom5/map.bin new file mode 100644 index 000000000..ad068fe7c --- /dev/null +++ b/data/layouts/LinkContestRoom5/map.bin @@ -0,0 +1 @@ +```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q2¡2q2w6q2r%2%2&$%2%2pq2q2q2©2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy‹2Œ22yyz%2%2&22222“2”2•2222226“2”2•26 \ No newline at end of file diff --git a/data/layouts/LinkContestRoom6/border.bin b/data/layouts/LinkContestRoom6/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/LinkContestRoom6/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/LinkContestRoom6/layout.inc b/data/layouts/LinkContestRoom6/layout.inc new file mode 100644 index 000000000..39349840a --- /dev/null +++ b/data/layouts/LinkContestRoom6/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LinkContestRoom6_MapBorder:: + .incbin "data/layouts/LinkContestRoom6/border.bin" + + .align 2 +LinkContestRoom6_MapBlockdata:: + .incbin "data/layouts/LinkContestRoom6/map.bin" + + .align 2 +LinkContestRoom6_Layout:: + .4byte 0xf + .4byte 0xb + .4byte LinkContestRoom6_MapBorder + .4byte LinkContestRoom6_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Contest diff --git a/data/layouts/LinkContestRoom6/map.bin b/data/layouts/LinkContestRoom6/map.bin new file mode 100644 index 000000000..9fcec5a5e --- /dev/null +++ b/data/layouts/LinkContestRoom6/map.bin @@ -0,0 +1 @@ +```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q2’2q2w6q2r%2%2&$%2%2pq2q2q2š2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy«2¬2­2yyz%2%2&22222³2´2µ2222226³2´2µ26 \ No newline at end of file diff --git a/data/layouts/LittlerootTown/border.bin b/data/layouts/LittlerootTown/border.bin new file mode 100644 index 000000000..03bcafef1 --- /dev/null +++ b/data/layouts/LittlerootTown/border.bin @@ -0,0 +1 @@ +ÔÕÜÝ \ No newline at end of file diff --git a/data/layouts/LittlerootTown/layout.inc b/data/layouts/LittlerootTown/layout.inc new file mode 100644 index 000000000..5f8254576 --- /dev/null +++ b/data/layouts/LittlerootTown/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LittlerootTown_MapBorder:: + .incbin "data/layouts/LittlerootTown/border.bin" + + .align 2 +LittlerootTown_MapBlockdata:: + .incbin "data/layouts/LittlerootTown/map.bin" + + .align 2 +LittlerootTown_Layout:: + .4byte 0x14 + .4byte 0x14 + .4byte LittlerootTown_MapBorder + .4byte LittlerootTown_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Petalburg diff --git a/data/layouts/LittlerootTown/map.bin b/data/layouts/LittlerootTown/map.bin new file mode 100644 index 000000000..9af76f90e --- /dev/null +++ b/data/layouts/LittlerootTown/map.bin @@ -0,0 +1,3 @@ +ÔÕÔÕÔÕÔÕÔÕ500ÔÕÔÕÔÕÔÕÜÝäåäåäåäç00æåäåäåÜÝÔÕ0000000000000000ÔÕäç0000000000000000æå002 2 2 2 +20000002 2 2 2 +2000000000000000000000000"20@!000000 @12#0000*:8H)400004(H9:+000000020000000020000000ð00000000ð0000000000000000000000000000000 2B2C2 2 2 220000000000000JK0000000000000000000000000,A-00000000Î1Ï1000&4I5'00000000ÖÕÎ1Ï10000200000000Î1Ï1ÜÝÔ×00000000000000ÖÕÔÕÜÝÎ1Ï1Î1Ï1Î1Ï1Î1Ï1Î1Ï1Î1Ï1Î1Ï1ÜÝÜÝ \ No newline at end of file diff --git a/data/layouts/LittlerootTown_BrendansHouse_1F/border.bin b/data/layouts/LittlerootTown_BrendansHouse_1F/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/LittlerootTown_BrendansHouse_1F/border.bin differ diff --git a/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc b/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc new file mode 100644 index 000000000..0ccddcca8 --- /dev/null +++ b/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +LittlerootTown_BrendansHouse_1F_Layout:: + .4byte 0xb + .4byte 0x9 + .4byte LittlerootTown_BrendansHouse_1F_MapBorder + .4byte LittlerootTown_BrendansHouse_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BrendansMaysHouse diff --git a/data/layouts/LittlerootTown_BrendansHouse_1F/map.bin b/data/layouts/LittlerootTown_BrendansHouse_1F/map.bin new file mode 100644 index 000000000..3ae8e69a6 --- /dev/null +++ b/data/layouts/LittlerootTown_BrendansHouse_1F/map.bin @@ -0,0 +1 @@ +nnnn01234&&  M89:;<222222B222d222222@A222222252H2I2J2.2622222222662222222 2!2"#$2%222222(2)2*2+2,2-222 \ No newline at end of file diff --git a/data/layouts/LittlerootTown_BrendansHouse_2F/border.bin b/data/layouts/LittlerootTown_BrendansHouse_2F/border.bin new file mode 100644 index 000000000..c1b82435c --- /dev/null +++ b/data/layouts/LittlerootTown_BrendansHouse_2F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc b/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc new file mode 100644 index 000000000..f626ecfb0 --- /dev/null +++ b/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +LittlerootTown_BrendansHouse_2F_Layout:: + .4byte 0x9 + .4byte 0x8 + .4byte LittlerootTown_BrendansHouse_2F_MapBorder + .4byte LittlerootTown_BrendansHouse_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BrendansMaysHouse diff --git a/data/layouts/LittlerootTown_BrendansHouse_2F/map.bin b/data/layouts/LittlerootTown_BrendansHouse_2F/map.bin new file mode 100644 index 000000000..bfa5b907e --- /dev/null +++ b/data/layouts/LittlerootTown_BrendansHouse_2F/map.bin @@ -0,0 +1 @@ +RTPTV‡   Z[Ueb2c2x2f2]2x2222{2|2}22˜2™2™2š22ƒ„2…2 2¡2¡2¢22‹BŒB 2¡2¡2¢2222¨2©2©2ª22222222222 \ No newline at end of file diff --git a/data/layouts/LittlerootTown_MaysHouse_1F/border.bin b/data/layouts/LittlerootTown_MaysHouse_1F/border.bin new file mode 100644 index 000000000..c1b82435c --- /dev/null +++ b/data/layouts/LittlerootTown_MaysHouse_1F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc b/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc new file mode 100644 index 000000000..42d1365c3 --- /dev/null +++ b/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +LittlerootTown_MaysHouse_1F_Layout:: + .4byte 0xb + .4byte 0x9 + .4byte LittlerootTown_MaysHouse_1F_MapBorder + .4byte LittlerootTown_MaysHouse_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BrendansMaysHouse diff --git a/data/layouts/LittlerootTown_MaysHouse_1F/map.bin b/data/layouts/LittlerootTown_MaysHouse_1F/map.bin new file mode 100644 index 000000000..21f62ebe3 --- /dev/null +++ b/data/layouts/LittlerootTown_MaysHouse_1F/map.bin @@ -0,0 +1 @@ +nnnnno m&&CD120vwux22KL9:82222y22F22222222222@A222222°¸³±²»22222£À¹ºÃ¥22222£ÀÁÂÃ¥222«¬¬¬¬­2 \ No newline at end of file diff --git a/data/layouts/LittlerootTown_MaysHouse_2F/border.bin b/data/layouts/LittlerootTown_MaysHouse_2F/border.bin new file mode 100644 index 000000000..c1b82435c --- /dev/null +++ b/data/layouts/LittlerootTown_MaysHouse_2F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc b/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc new file mode 100644 index 000000000..c0770b8f6 --- /dev/null +++ b/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +LittlerootTown_MaysHouse_2F_Layout:: + .4byte 0x9 + .4byte 0x8 + .4byte LittlerootTown_MaysHouse_2F_MapBorder + .4byte LittlerootTown_MaysHouse_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BrendansMaysHouse diff --git a/data/layouts/LittlerootTown_MaysHouse_2F/map.bin b/data/layouts/LittlerootTown_MaysHouse_2F/map.bin new file mode 100644 index 000000000..5904a9639 --- /dev/null +++ b/data/layouts/LittlerootTown_MaysHouse_2F/map.bin @@ -0,0 +1,2 @@ +  +'VTPTQ/WUXYE2222]2g22`2a22›2œ2œ222€22‚22£2¤2¤2¥22ˆ‰2Š2£2¤2¤2¥2B‘’B2«2¬2¬2­222222222222 \ No newline at end of file diff --git a/data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin b/data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc b/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc new file mode 100644 index 000000000..77d07033f --- /dev/null +++ b/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LittlerootTown_ProfessorBirchsLab_MapBorder:: + .incbin "data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin" + + .align 2 +LittlerootTown_ProfessorBirchsLab_MapBlockdata:: + .incbin "data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin" + + .align 2 +LittlerootTown_ProfessorBirchsLab_Layout:: + .4byte 0xd + .4byte 0xd + .4byte LittlerootTown_ProfessorBirchsLab_MapBorder + .4byte LittlerootTown_ProfessorBirchsLab_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Lab diff --git a/data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin b/data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin new file mode 100644 index 000000000..0f84e80b2 --- /dev/null +++ b/data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin @@ -0,0 +1,5 @@ +  < +    + + + !2D"2#2>2"232"232>2šš(2*2*2A22222)2:2222222222221B22$2%2627222222?2?222,-,-22222224545222222=2>2>2>2222222G2?2’220222222222;.H8922222222I2C:2H@2&22222222KBO2?22.22222?2?2 \ No newline at end of file diff --git a/data/layouts/MagmaHideout_1F/border.bin b/data/layouts/MagmaHideout_1F/border.bin new file mode 100644 index 000000000..9ae2c2126 --- /dev/null +++ b/data/layouts/MagmaHideout_1F/border.bin @@ -0,0 +1 @@ +qqqq \ No newline at end of file diff --git a/data/layouts/MagmaHideout_1F/layout.inc b/data/layouts/MagmaHideout_1F/layout.inc new file mode 100644 index 000000000..2721bb6ff --- /dev/null +++ b/data/layouts/MagmaHideout_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MagmaHideout_1F_MapBorder:: + .incbin "data/layouts/MagmaHideout_1F/border.bin" + + .align 2 +MagmaHideout_1F_MapBlockdata:: + .incbin "data/layouts/MagmaHideout_1F/map.bin" + + .align 2 +MagmaHideout_1F_Layout:: + .4byte 0x25 + .4byte 0x26 + .4byte MagmaHideout_1F_MapBorder + .4byte MagmaHideout_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lavaridge diff --git a/data/layouts/MagmaHideout_1F/map.bin b/data/layouts/MagmaHideout_1F/map.bin new file mode 100644 index 000000000..fdf0d4252 Binary files /dev/null and b/data/layouts/MagmaHideout_1F/map.bin differ diff --git a/data/layouts/MagmaHideout_2F_1R/border.bin b/data/layouts/MagmaHideout_2F_1R/border.bin new file mode 100644 index 000000000..9ae2c2126 --- /dev/null +++ b/data/layouts/MagmaHideout_2F_1R/border.bin @@ -0,0 +1 @@ +qqqq \ No newline at end of file diff --git a/data/layouts/MagmaHideout_2F_1R/layout.inc b/data/layouts/MagmaHideout_2F_1R/layout.inc new file mode 100644 index 000000000..9d16b20b0 --- /dev/null +++ b/data/layouts/MagmaHideout_2F_1R/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +MagmaHideout_2F_1R_Layout:: + .4byte 0x21 + .4byte 0x27 + .4byte MagmaHideout_2F_1R_MapBorder + .4byte MagmaHideout_2F_1R_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lavaridge diff --git a/data/layouts/MagmaHideout_2F_1R/map.bin b/data/layouts/MagmaHideout_2F_1R/map.bin new file mode 100644 index 000000000..d74c32347 --- /dev/null +++ b/data/layouts/MagmaHideout_2F_1R/map.bin @@ -0,0 +1,2 @@ +qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq{tttttVttttttttttttttttttttt|qqqqrqqq{t^ttttt-|qqqqq{ttttt|qqqqqrqq33333333tttttz33333qqqqqqrqqq33333333333333333333t|qqqqr{tt3333333333333333333333qqqqrr3333333333333333333333333qqqqrr{ttttttttttttttttt¯¯t|333qqqqrrr33333333333333333333333qqqqrrr33333333333333333333tt|qqqqrrr33333333333333333333333qqqqrrr33333333333333333333333qqqqrrr{ttt¯¯tttttttttttttttt|pqqqqrrrr7{t¯¯ttttttttttttt|77pqqqqrrrr7r33333333333377pqqqqrrr17r333333333333t|pqqqqrrrr7r333333€mn33333333pqqqqrrrr7r333333ˆ‰uv33333333pqqqqrrrr{333333‘}~33333333pqqqqrrrrr3333333333333333333pqqqqrrrrr3333333333333333333pqqqqrrrrr{tttttttttttt¯¯ttt|pqqqqrrrrrr{ttVt#tttttt¯¯tt|pqqqqrrrrrrr{t^tt|333333333qqqqrrr1rrrr3333|33333333qqqqrrrrrrrr33333t¯ttttt|pqqqqrrrrrrrr3333333333333pqqqqrrrrrrrr3333333333333pqqqqrrrrrrrr{t¯tttt-tttt|pqqqqrrrrrrrrr{¯tttttttt|pqqqqrrrrrrrrr1333333333pqqqqrrrrrrr1rr3333333 +7 pqqqqrrrrrrrrrr3333333qqpqqqqrrrrrrrrrr33333 33qqpqqqqrrrrrrrr1     ~qqpqqqqrrrrrrrrrqqqqqqqqqqqpqqqqrrrrrrrrrqqqqqqqqqpqqqqrrrrrrrrrqqqqqqqqqqpqqqqrrrr1rrrrqqqqqqqqqqqpqq \ No newline at end of file diff --git a/data/layouts/MagmaHideout_2F_2R/border.bin b/data/layouts/MagmaHideout_2F_2R/border.bin new file mode 100644 index 000000000..9ae2c2126 --- /dev/null +++ b/data/layouts/MagmaHideout_2F_2R/border.bin @@ -0,0 +1 @@ +qqqq \ No newline at end of file diff --git a/data/layouts/MagmaHideout_2F_2R/layout.inc b/data/layouts/MagmaHideout_2F_2R/layout.inc new file mode 100644 index 000000000..47a492f52 --- /dev/null +++ b/data/layouts/MagmaHideout_2F_2R/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +MagmaHideout_2F_2R_Layout:: + .4byte 0x31 + .4byte 0x1c + .4byte MagmaHideout_2F_2R_MapBorder + .4byte MagmaHideout_2F_2R_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lavaridge diff --git a/data/layouts/MagmaHideout_2F_2R/map.bin b/data/layouts/MagmaHideout_2F_2R/map.bin new file mode 100644 index 000000000..34cbf7eaa --- /dev/null +++ b/data/layouts/MagmaHideout_2F_2R/map.bin @@ -0,0 +1,5 @@ +qqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqxtttttttttt|qq{ttt|qqqqqqqqqqqqqqq{t„…‚ƒtttttttttttttt„…‚ƒt|p{¢¢¢x|qqqqqqqqqqqqq{z{ŒŠ‹ttt-ttttttttttŒŠ‹|pp{¢¢¢¢¢pqqqqqqqqqqqqr{z¨©–—{GGGGGGGGGGG|¢¨©–—pppr¢¢¢¢¢x|qqqqqqttttttzr¢¢¢¢¢F½½½½½½½½‰¢¢¢¢¢ppp  j¢¢pqqqqqqqqqqqqqrq23¢¢q2¤£½½½½½½‰¢¢¢¢hppqqq{¢¢x|qqqqqqqqqqqqr¢¢¢¢¢¢¢¤£½££££¤¢3¢¢pqpx|qqqr{¯|¢pqqqqqqqqqqqqr¢¢h     jF½‰3¢¢¢¢¢¢¢¢pqx|pqq{r¢p¢pqqqqqqqqqq{z¢¢pqh  j££j¢¢¢¢¢¢h qqppq{{¢x|x|qqqqqqqqqqr¢¢¢ppqqjqqqq j¢¢¢¢ph   p{qr{¯|x|pqqqqqqqqqqr¢¢¢pqpqq{z{tt|qqj¢¢¢px|qqqpr{tr¢pq2ppqqqqqqqqqqr¢¢¢pqpq{zqrqqpqqqr¢¢¢x|xt|qxr{tx|pxttttqqqqq{z¢¢¢x|xtz{tzqhqqr¢¢¢¢x|qx|{tr{t¯|pxtttttqqqqqr{t¯t|xt-tzqqqpqqq{¢3¢¢¢x|qxq{r33ppqqqqqqqqqqq1r333ttttt-t|x|qqr{-t¯tt|xt-ttqr33ppqqqqqqqqqqqrr33333333333pqxttzr33333xttttttt33ppqqqqqqqqqqqrr33333333333xttttt3333333333333333ppqqqqqqqqqqqrr33333 +   3333333333333333333333333ppqh    qqqqq 3333pqqr3333333333333 +           pqpqqqqqqqqqqqr 333pqq  3333333 +               qpqqqqqqqqqqqr1333pqqqq 33333 +qqqqqqqqqqqqqqqqqqpqqqqqqqqqqrr3 33pqqqqq     qqqqqqqqqqqqqqqqqqpqqqqqqqqqqq qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqq \ No newline at end of file diff --git a/data/layouts/MagmaHideout_2F_3R/border.bin b/data/layouts/MagmaHideout_2F_3R/border.bin new file mode 100644 index 000000000..9ae2c2126 --- /dev/null +++ b/data/layouts/MagmaHideout_2F_3R/border.bin @@ -0,0 +1 @@ +qqqq \ No newline at end of file diff --git a/data/layouts/MagmaHideout_2F_3R/layout.inc b/data/layouts/MagmaHideout_2F_3R/layout.inc new file mode 100644 index 000000000..cf1310587 --- /dev/null +++ b/data/layouts/MagmaHideout_2F_3R/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +MagmaHideout_2F_3R_Layout:: + .4byte 0x3c + .4byte 0x13 + .4byte MagmaHideout_2F_3R_MapBorder + .4byte MagmaHideout_2F_3R_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lavaridge diff --git a/data/layouts/MagmaHideout_2F_3R/map.bin b/data/layouts/MagmaHideout_2F_3R/map.bin new file mode 100644 index 000000000..f25017291 --- /dev/null +++ b/data/layouts/MagmaHideout_2F_3R/map.bin @@ -0,0 +1 @@ +{tttttttttttttttVttttttttttttttt|r{ttt#ttt#tttttt^ttttttttttr{ttt#ttt#tttttt^tttttttttttttt|rr{tttttttttttt|{tttttt###rr{tttttttttttt|{tttttt###ttt|rr{tttttt#ttt|x¯z{ttttttttrr{tttttt#ttt|x¯z{tttttttttt|rrr{tttttttt|r{tttt#ttrrr{tttttttt|r{tttt#ttt|rrrr{tttttt|xt¯tzr{tt#tttrrrr{tttttt|xt¯tzr{tt#ttt|rrrrr{tttt|xtt¯ttzr{tttt|rrrrr{tttt|xtt¯ttzr{tttt|rrrrrr{tt|xttt¯tttzr{tt|rrrrrr{tt|xttt¯tttzr{tt|rrrrrrr{|xtttt¯ttttzr{|rrrrrrr{|xtttt¯ttttzr{|rrrrrrrrxtttt#¯ttt#tzrrrrrrrrrxtttt#¯ttt#tzrrrrrrrrrxtttttt¯ttt#ttzrrrrrrrrxtttttt¯ttt#ttzrrrrrrrrXYXYrrrrrrrrXYXYrrrrrrrr`a`arrrrrrrr`a`arrrrr1rr rrrrr1rr                           qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqx|pxttttqqqqq{z¢¢¢x|xtz{t \ No newline at end of file diff --git a/data/layouts/MagmaHideout_3F_1R/border.bin b/data/layouts/MagmaHideout_3F_1R/border.bin new file mode 100644 index 000000000..9ae2c2126 --- /dev/null +++ b/data/layouts/MagmaHideout_3F_1R/border.bin @@ -0,0 +1 @@ +qqqq \ No newline at end of file diff --git a/data/layouts/MagmaHideout_3F_1R/layout.inc b/data/layouts/MagmaHideout_3F_1R/layout.inc new file mode 100644 index 000000000..6e7215914 --- /dev/null +++ b/data/layouts/MagmaHideout_3F_1R/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +MagmaHideout_3F_1R_Layout:: + .4byte 0x1c + .4byte 0x18 + .4byte MagmaHideout_3F_1R_MapBorder + .4byte MagmaHideout_3F_1R_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lavaridge diff --git a/data/layouts/MagmaHideout_3F_1R/map.bin b/data/layouts/MagmaHideout_3F_1R/map.bin new file mode 100644 index 000000000..da590f5dd --- /dev/null +++ b/data/layouts/MagmaHideout_3F_1R/map.bin @@ -0,0 +1 @@ +qqqqqqqqqqqq{tttttt|qqqqqq{ttttttttt|qqqr{„…‚ƒ|qqqqqr{-t#tt-t|xtttzrŒˆ‰xtVttt|r*+++++,xt#-tt}~‘xtt^tt|r12½3½½3+++,r23½3½½½3½34r:;;;;;;;;;<r{t„…t|r{tttt¯ttttttz{Œ|xtVttt|rrr{ttt¯ttttt-tz}~xtt^tt|rMrrrrrr{t„…‚ƒt|rrMr{ttz{ŒŠ‹|xttttt¯tt|rrrrr{t#z}~‘x--t#tt¯t|rrrrr1¢¢{GGGGGGGGGG|¢¢rrrrrr¢F3½½½3½½½½½‰¢¢rrrrrr¢¢¤£½3½½3½3½‰¢rr1rrr¢¢¢F½½½3½½½¤¢qrrrrrr¢¢{G½3½½½½½‰¢¢¢rrrrrr¢F½3½½3½½£¤¢¢¢rrrrMr¢¢¤£½3½½½‰¢¢¢¢rrrrrr¢¢¤£££££¤¢¢¢¢~~~~~~ iiiiiiiiiiiii~~~~~~qqqqqqqqqqqqqqqqqqqqqqqqq \ No newline at end of file diff --git a/data/layouts/MagmaHideout_3F_2R/border.bin b/data/layouts/MagmaHideout_3F_2R/border.bin new file mode 100644 index 000000000..9ae2c2126 --- /dev/null +++ b/data/layouts/MagmaHideout_3F_2R/border.bin @@ -0,0 +1 @@ +qqqq \ No newline at end of file diff --git a/data/layouts/MagmaHideout_3F_2R/layout.inc b/data/layouts/MagmaHideout_3F_2R/layout.inc new file mode 100644 index 000000000..6f108d198 --- /dev/null +++ b/data/layouts/MagmaHideout_3F_2R/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +MagmaHideout_3F_2R_Layout:: + .4byte 0x18 + .4byte 0x11 + .4byte MagmaHideout_3F_2R_MapBorder + .4byte MagmaHideout_3F_2R_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lavaridge diff --git a/data/layouts/MagmaHideout_3F_2R/map.bin b/data/layouts/MagmaHideout_3F_2R/map.bin new file mode 100644 index 000000000..49857819a --- /dev/null +++ b/data/layouts/MagmaHideout_3F_2R/map.bin @@ -0,0 +1,7 @@ +qqqqq{tttttttttttttt|qqqqqqqqr{’“’“’“”•”•”•|qqqqqqqqrr`a`a`abcbcbcxtt|qqqqrrXYXYZ[7„…|qqqqqrr`a`abcuvq{-ttzr}~qr{‚ƒ‚ƒhijkkknZ[qrˆ‰Š‹pqrsssvbcqrr‘‘xyz{{{~Z[qrXY€mnmnbcqrr`aXYˆ‰uvuv +7 ~~qr`a‘}~}~ +7p6q6q6q6qrr +7~~7q6q6q~~  7 +7p6q6qqqq6q6q6q6r  7 +7~~q6qqqq6qq6q67rq6r 7  +7p6q6q6q6q6q6q6q67q6q6q6~~~~     ~~q6q6qqq6 \ No newline at end of file diff --git a/data/layouts/MagmaHideout_3F_3R/border.bin b/data/layouts/MagmaHideout_3F_3R/border.bin new file mode 100644 index 000000000..9ae2c2126 --- /dev/null +++ b/data/layouts/MagmaHideout_3F_3R/border.bin @@ -0,0 +1 @@ +qqqq \ No newline at end of file diff --git a/data/layouts/MagmaHideout_3F_3R/layout.inc b/data/layouts/MagmaHideout_3F_3R/layout.inc new file mode 100644 index 000000000..6508e73bf --- /dev/null +++ b/data/layouts/MagmaHideout_3F_3R/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +MagmaHideout_3F_3R_Layout:: + .4byte 0x21 + .4byte 0x18 + .4byte MagmaHideout_3F_3R_MapBorder + .4byte MagmaHideout_3F_3R_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lavaridge diff --git a/data/layouts/MagmaHideout_3F_3R/map.bin b/data/layouts/MagmaHideout_3F_3R/map.bin new file mode 100644 index 000000000..7c808ffb5 --- /dev/null +++ b/data/layouts/MagmaHideout_3F_3R/map.bin @@ -0,0 +1 @@ +{tttttttttttttttVttttttttttttttt|r{tttttttttttttt^tttttttttttttt|rr{tttttttttttt|¢{tttttttttttt|rr{tttttttttt|x¯z{tttttttttt|rr1r{tttttttt|¢¢¢r{tttt#ttt|rr1rr{tttttt|xt¯tzr{tttttt|rrrrr{tttt|¢¢¢¢¢rr{tttt|rrrrrr{#t|xtt¯ttzrr{#t|rrrrrrr{|¢¢¢¢¢¢¢rrr{|rrrrrrrrxttt¯#t#zrrrrrrrrrrrr¢¢¢¢¢¢¢¢{zrrrrMrrrrrrx#ttt¯tttz¢rrrrrrrrrrrx|¢¢¢¢¢¢¢¢rrrrrrrrrrr¢xtttt¯ttt#tzrrrrrrrrrr¢¢¢¢¢¢¢¢¢{ttzrrrrrrrrrxt#tttt¯tttz{G|rrrrrrrrr¢¢¢¢¢¢¢¢¢¢¢F½‰rrrrrrrrr{GGGG|qq{GGG½‰rrrrrrrrrF½½½‰qqF½½½½‰rrrrrrrrr¤½½‰¢¢¤££½½‰rrrrrMrrrF½½‰q¢¢efF½½‰rrrrrrrrr¢~£££¤¢¢œF½½‰~~~~~~~~~iiiiii ii~~~~~~~~~~~qqqqqqqqqqqqqqqqqqqqqqqqqqqqqq \ No newline at end of file diff --git a/data/layouts/MagmaHideout_4F/border.bin b/data/layouts/MagmaHideout_4F/border.bin new file mode 100644 index 000000000..9ae2c2126 --- /dev/null +++ b/data/layouts/MagmaHideout_4F/border.bin @@ -0,0 +1 @@ +qqqq \ No newline at end of file diff --git a/data/layouts/MagmaHideout_4F/layout.inc b/data/layouts/MagmaHideout_4F/layout.inc new file mode 100644 index 000000000..32db60101 --- /dev/null +++ b/data/layouts/MagmaHideout_4F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MagmaHideout_4F_MapBorder:: + .incbin "data/layouts/MagmaHideout_4F/border.bin" + + .align 2 +MagmaHideout_4F_MapBlockdata:: + .incbin "data/layouts/MagmaHideout_4F/map.bin" + + .align 2 +MagmaHideout_4F_Layout:: + .4byte 0x3b + .4byte 0x1c + .4byte MagmaHideout_4F_MapBorder + .4byte MagmaHideout_4F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lavaridge diff --git a/data/layouts/MagmaHideout_4F/map.bin b/data/layouts/MagmaHideout_4F/map.bin new file mode 100644 index 000000000..45a5547c6 --- /dev/null +++ b/data/layouts/MagmaHideout_4F/map.bin @@ -0,0 +1 @@ +qqqqqqqqq{tttttttt-ttttt|{|ppqqqqpqhiiiiijpppqqq{ttz{ttttttqqqq{ttttz{ttttttt|qq{-|xzppxttt|pqxttt|qrppp{ttz{ttzqqqqqqqqqqr{t„…tz{’“’“|qp{tzqx|qpxt|qqpxtt-t|pqrppxzq{tz{tttttttt{-ttzr{Œ’“zš›š›x|xz{-t|pqx|qpqqpqqqqqppqrppq{zqqrhiiiiiiir{t‚ƒzr¨©š›¢¢¢¢¢xttz¢¢pxt|x|pqqx--t|qppqrpxttzqq{zpqqqqqqrr{Š‹tz¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢xt||pxttttt|pqpxtzxttttt-zqpqqqqqqqrrr–—¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢pqpxtt|qqqppqxt|q{tttVttt|p{ttttttrrr¢qef¢¢¢¢¢¢h     jq¢¢¢¢x|tt|t|ppqqqpq1{tt^tt|ppr{tttttrrr¢qœ¢¢¢¢h {-t#| j¢¢¢¢pqqqt|pqpxt|qxtzrppxzrqqqqqrrj¢¢¢¢¢h {t{G|xt|j¢¢¢x„…†‡|px|pqqpqq{zpxttzqq{ttrrqr¢¢qhjqr{G½G|x|j¢¢¢ŒŽppqpx|qxtttzxttttttzqqMrqr¢¢¢hp{{F½½½3½‰qx|j¢¢¨©–—ppqx|p{-tttttt¯¯ttttttt-ttttrjr¢¢¢ppr{{3½½½3|qpr¢¢¢¢¢¢pxt|pxz{ttttt-¯¯ttttt|qqqhijjrr¢¢¢pp1rqF½½3½½½½|x|j¢¢¢¢¢x|qppqqr{t„…‚ƒ¯¯tttt|pqhqrqrrM¢¢¢ppr1{3½½½½33½|pq  j¢¢x|pxttzr{ŒŠ‹¯¯’“-|ppqhqqr{rr¢¢¢pxzrF½½3½3½½½3½‰ph  j1¢¢¢¢px|q{tzr¨©–—qqš›¢ppphqqqrr{r¢¢¢pqq1F3½½½½3½½½½‰pphjrj¢¢¢x|pr{tz¢¢¢¢¢¢¢¢¢ppppqqqrrrqM¢¢|qrF½½½½½½3½3pppprjr¢¢¢¢ppqrr¢¢¢¢¢¢¢ef¢ppppqqqqrr1qr¢¢¢qtz¤\½3½½½½½‰ppppjrr¢¢¢¢pp{zr¢ef¢¢¢¢¢œ¢pppxtt|qrrr{¢¢¢q¢¢¢¢¤d½3½½½½‰ppppqrrr¢¢¢¢pxz{z¢œ¢¢¢¢¢¢¢¢pppqqqpqrrrrmn¢¢¢¢¢¢¢¢F½½½½£¤ppppqrrj¢¢x|qrq¢¢¢¢¢¢¢¢¢h ppqqqpqrrrruv†‡q¢¢¢¢¢¢¤££££¢ppppqrjr¢¢¢¢xtzq¢¢¢h     h pqqqpqrr1r}~Žmn¢¢¢¢¢q¢h   qjrr¢¢¢¢¢¢¢h  qqqqqpqpqqqpqr j–—uv¢qmn†‡pqqqqqqqqqqq j¢¢¢q¢pqqqh     qqpqqqpqrqqqqr j}~¢¢quvŽpqqqqqqqqqqqqqqrj¢¢¢¢¢pqqqpqqqhiiiiqqpqrqqqq     j}~–—pqqqqqqqqqqqqqqq     qqqpqqqpqqhiiiiiqrqqqqqqqqqq    qqqqqqqqh                qqqpqhqqqqqqqrqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqpqxttttttttz \ No newline at end of file diff --git a/data/layouts/MarineCave_End/border.bin b/data/layouts/MarineCave_End/border.bin new file mode 100644 index 000000000..f0eabd248 --- /dev/null +++ b/data/layouts/MarineCave_End/border.bin @@ -0,0 +1 @@ +ññññ \ No newline at end of file diff --git a/data/layouts/MarineCave_End/layout.inc b/data/layouts/MarineCave_End/layout.inc new file mode 100644 index 000000000..f69952dce --- /dev/null +++ b/data/layouts/MarineCave_End/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MarineCave_End_MapBorder:: + .incbin "data/layouts/MarineCave_End/border.bin" + + .align 2 +MarineCave_End_MapBlockdata:: + .incbin "data/layouts/MarineCave_End/map.bin" + + .align 2 +MarineCave_End_Layout:: + .4byte 0x1b + .4byte 0x1e + .4byte MarineCave_End_MapBorder + .4byte MarineCave_End_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/MarineCave_End/map.bin b/data/layouts/MarineCave_End/map.bin new file mode 100644 index 000000000..85138661d --- /dev/null +++ b/data/layouts/MarineCave_End/map.bin @@ -0,0 +1,14 @@ +ññññññññëùùùùùùùùùùùùùùùìññññññññññ ëùùùùùùùùùùùùùì +ñññññññññë õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2 + +ñññññññññ ëõ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2 + +ñññññññññ  õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2öõ2õ2 + +ñññññññññ  õ2õ2õ2õ2õ2õ2õ2ééåæçéé +ññññññññë õ2õ2õ2õ2õ2õ2õ2 +ññññéééññññññññ ñ õ2õ2õ2õ2õ2õ2õ2 +ññññ +ññññññëùùùùëõ2õ2õ2õ2õ2õ2õ2 +ññññùìññññ ëùùùùúùùùùìñðññññ ò  "22222222222ðñ +ññññ ò222222222ðñùìññ ò2222222222222ðñññìñ ò#####"2222222øùìññðñ ò#####"##"22222222ðññðñ ò##"2222ðññðñ ò#"22222ðññðñ ò‰‘2#"2222øùìðñ ò‰’O2222ððñ ò‰‘’OOO‘‘222222ððñ òŠNOOOOOONˆ222222ððñ òŠNOOOOOONˆ222222ððñ ò‰’NNOOOONNˆ222222ððñ òŠNNNNOONNNˆ222222ððñ ò#2lpNNNNNNpˆ222222ððñ ò2#2lpppppjs2s2222222ððñ ò#"2#2s2s2s2s2s2$222222 ##2ððñ ò2###"2222222222222222ððñ óóóóóóóóóóóóóóóóóóóóóóóóðñóóóóóóóóóóóóóóóóóóóóóóóóóó \ No newline at end of file diff --git a/data/layouts/MarineCave_Entrance/border.bin b/data/layouts/MarineCave_Entrance/border.bin new file mode 100644 index 000000000..f0eabd248 --- /dev/null +++ b/data/layouts/MarineCave_Entrance/border.bin @@ -0,0 +1 @@ +ññññ \ No newline at end of file diff --git a/data/layouts/MarineCave_Entrance/layout.inc b/data/layouts/MarineCave_Entrance/layout.inc new file mode 100644 index 000000000..b6c9248c6 --- /dev/null +++ b/data/layouts/MarineCave_Entrance/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MarineCave_Entrance_MapBorder:: + .incbin "data/layouts/MarineCave_Entrance/border.bin" + + .align 2 +MarineCave_Entrance_MapBlockdata:: + .incbin "data/layouts/MarineCave_Entrance/map.bin" + + .align 2 +MarineCave_Entrance_Layout:: + .4byte 0x14 + .4byte 0x14 + .4byte MarineCave_Entrance_MapBorder + .4byte MarineCave_Entrance_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/MarineCave_Entrance/map.bin b/data/layouts/MarineCave_Entrance/map.bin new file mode 100644 index 000000000..62aa8537f --- /dev/null +++ b/data/layouts/MarineCave_Entrance/map.bin @@ -0,0 +1,7 @@ +ñññññññññññëùþÿùìññññññññññëùùë3ìðññññññññññ ëùù $1$1$1ðññññññññëù$1$1$1$1$1$1ðññññññññ ëù $1Ž1¦1¦1¦11ðññññññëù$1$1Ž1§1ž1ž1ž11ðññññññ ëù $1Ž1§1ž1ž1ž1ž11ðñññññë$1$1Ž1§1ž1¤¾¾£1ðñññññ ë $1Ž1§1ž1¤¿ppµ1ðñññëù$1Ž1§1ž1¤¿pppµ1ùìñ ëù Ž1§1ž1¤¿ppppµ1 ùì +ñ $1Ž1§1ž1¤¿pppppµ¥11$1 +ñ Ž1§1ž1¤¿ppppppµž11$1 +ñ Ÿ1ž1¤¿ppppppp½£¥11 +ñ §1ž1·pppppppppµž11 +ñ ž1ž1·pppppppppµž11 +ñô§ž1·ppVVVVpppµ¯—óóñññ§·pV””””Vp˜ñññññññ™V””””V˜ñññññññññññññññññ \ No newline at end of file diff --git a/data/layouts/Mart/border.bin b/data/layouts/Mart/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/Mart/border.bin differ diff --git a/data/layouts/Mart/layout.inc b/data/layouts/Mart/layout.inc new file mode 100644 index 000000000..33c232059 --- /dev/null +++ b/data/layouts/Mart/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Mart_MapBorder:: + .incbin "data/layouts/Mart/border.bin" + + .align 2 +Mart_MapBlockdata:: + .incbin "data/layouts/Mart/map.bin" + + .align 2 +Mart_Layout:: + .4byte 0xb + .4byte 0x8 + .4byte Mart_MapBorder + .4byte Mart_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Shop diff --git a/data/layouts/Mart/map.bin b/data/layouts/Mart/map.bin new file mode 100644 index 000000000..08f393264 --- /dev/null +++ b/data/layouts/Mart/map.bin @@ -0,0 +1,3 @@ +"#$#$D*()() 222 2220212!212%292:2222222- AB222+,22+ +22222234223 +222222;<22;222222222 \ No newline at end of file diff --git a/data/layouts/MauvilleCity/border.bin b/data/layouts/MauvilleCity/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/MauvilleCity/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/MauvilleCity/layout.inc b/data/layouts/MauvilleCity/layout.inc new file mode 100644 index 000000000..ba7785c3e --- /dev/null +++ b/data/layouts/MauvilleCity/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MauvilleCity_MapBorder:: + .incbin "data/layouts/MauvilleCity/border.bin" + + .align 2 +MauvilleCity_MapBlockdata:: + .incbin "data/layouts/MauvilleCity/map.bin" + + .align 2 +MauvilleCity_Layout:: + .4byte 0x28 + .4byte 0x14 + .4byte MauvilleCity_MapBorder + .4byte MauvilleCity_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Mauville diff --git a/data/layouts/MauvilleCity/map.bin b/data/layouts/MauvilleCity/map.bin new file mode 100644 index 000000000..80a38e902 Binary files /dev/null and b/data/layouts/MauvilleCity/map.bin differ diff --git a/data/layouts/MauvilleCity_BikeShop/border.bin b/data/layouts/MauvilleCity_BikeShop/border.bin new file mode 100644 index 000000000..064786e8c --- /dev/null +++ b/data/layouts/MauvilleCity_BikeShop/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/MauvilleCity_BikeShop/layout.inc b/data/layouts/MauvilleCity_BikeShop/layout.inc new file mode 100644 index 000000000..4814becf8 --- /dev/null +++ b/data/layouts/MauvilleCity_BikeShop/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MauvilleCity_BikeShop_MapBorder:: + .incbin "data/layouts/MauvilleCity_BikeShop/border.bin" + + .align 2 +MauvilleCity_BikeShop_MapBlockdata:: + .incbin "data/layouts/MauvilleCity_BikeShop/map.bin" + + .align 2 +MauvilleCity_BikeShop_Layout:: + .4byte 0xc + .4byte 0x9 + .4byte MauvilleCity_BikeShop_MapBorder + .4byte MauvilleCity_BikeShop_MapBlockdata + .4byte gTileset_General + .4byte gTileset_BikeShop diff --git a/data/layouts/MauvilleCity_BikeShop/map.bin b/data/layouts/MauvilleCity_BikeShop/map.bin new file mode 100644 index 000000000..9891b9fd5 --- /dev/null +++ b/data/layouts/MauvilleCity_BikeShop/map.bin @@ -0,0 +1,2 @@ +()*+,-  +    012345222892:2;2<2:2@A2B2?2C2D2!"#2$2%2&2HIJ2?2KL?2?2?2?2P2Q2R2?2ST"?2?2?2?2?2?2?2?2EF!"?2?2?2?2?2?2?2?2MN6?22 2?2?2?2?2?2UV \ No newline at end of file diff --git a/data/layouts/MauvilleCity_GameCorner/border.bin b/data/layouts/MauvilleCity_GameCorner/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/MauvilleCity_GameCorner/border.bin differ diff --git a/data/layouts/MauvilleCity_GameCorner/layout.inc b/data/layouts/MauvilleCity_GameCorner/layout.inc new file mode 100644 index 000000000..9403c9df6 --- /dev/null +++ b/data/layouts/MauvilleCity_GameCorner/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MauvilleCity_GameCorner_MapBorder:: + .incbin "data/layouts/MauvilleCity_GameCorner/border.bin" + + .align 2 +MauvilleCity_GameCorner_MapBlockdata:: + .incbin "data/layouts/MauvilleCity_GameCorner/map.bin" + + .align 2 +MauvilleCity_GameCorner_Layout:: + .4byte 0x16 + .4byte 0xb + .4byte MauvilleCity_GameCorner_MapBorder + .4byte MauvilleCity_GameCorner_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_MauvilleGameCorner diff --git a/data/layouts/MauvilleCity_GameCorner/map.bin b/data/layouts/MauvilleCity_GameCorner/map.bin new file mode 100644 index 000000000..ce3f9bf73 --- /dev/null +++ b/data/layouts/MauvilleCity_GameCorner/map.bin @@ -0,0 +1,3 @@ +<=>>>>?  + + ///DFEFFFG.227772LC2M2N2M2M2O22222222222TVUVUUW 222222222222222\2]2^2^2^2]2_2 22222622$2%2222$2%222222222222222&2,-'22&2,-'22222"# 22"# 222&2,-'22&2,-'22222*+ 22*+ 222&2,-'22&2,-'2222223 2223 222&245'22&245'22222222222222222222222222222222222 \ No newline at end of file diff --git a/data/layouts/MauvilleCity_Gym/border.bin b/data/layouts/MauvilleCity_Gym/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/MauvilleCity_Gym/border.bin differ diff --git a/data/layouts/MauvilleCity_Gym/layout.inc b/data/layouts/MauvilleCity_Gym/layout.inc new file mode 100644 index 000000000..1fdaf921e --- /dev/null +++ b/data/layouts/MauvilleCity_Gym/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MauvilleCity_Gym_MapBorder:: + .incbin "data/layouts/MauvilleCity_Gym/border.bin" + + .align 2 +MauvilleCity_Gym_MapBlockdata:: + .incbin "data/layouts/MauvilleCity_Gym/map.bin" + + .align 2 +MauvilleCity_Gym_Layout:: + .4byte 0xa + .4byte 0x15 + .4byte MauvilleCity_Gym_MapBorder + .4byte MauvilleCity_Gym_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_MauvilleGym diff --git a/data/layouts/MauvilleCity_Gym/map.bin b/data/layouts/MauvilleCity_Gym/map.bin new file mode 100644 index 000000000..8860e5651 Binary files /dev/null and b/data/layouts/MauvilleCity_Gym/map.bin differ diff --git a/data/layouts/MeteorFalls_1F_1R/border.bin b/data/layouts/MeteorFalls_1F_1R/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/MeteorFalls_1F_1R/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/MeteorFalls_1F_1R/layout.inc b/data/layouts/MeteorFalls_1F_1R/layout.inc new file mode 100644 index 000000000..3fea20553 --- /dev/null +++ b/data/layouts/MeteorFalls_1F_1R/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +MeteorFalls_1F_1R_Layout:: + .4byte 0x1e + .4byte 0x2a + .4byte MeteorFalls_1F_1R_MapBorder + .4byte MeteorFalls_1F_1R_MapBlockdata + .4byte gTileset_General + .4byte gTileset_MeteorFalls diff --git a/data/layouts/MeteorFalls_1F_1R/map.bin b/data/layouts/MeteorFalls_1F_1R/map.bin new file mode 100644 index 000000000..4891475a3 --- /dev/null +++ b/data/layouts/MeteorFalls_1F_1R/map.bin @@ -0,0 +1 @@ +4deDDDLDDDDDDDDDDDDDDdeDDDDfg<4lmDDDTDDDDDDfgDDDDDDlmDDDDno<4tu.D/\.DEFGDnoDDDDD/tu.DDDno<42222242DMN2O/vw.DD<22222242vw<42222 242222242€‰‰‰(<222222422<42‚2ƒ222?2>2>2>2>2?2ppp’(<222222?222<42Š2‹22422€‰‰‰‰˜ppp’(<222224222<42222?2€˜pppppppp’(<2222242222<4>2>2>2?2ppppppppp’(=2>2>2>2>2?2222<46666>272yppppppx5262>2>2>2<4deDDDD/»³³³³³³¼.DDfgDDDdeD2D<4lmDDDD/¹¹¹¹¹¹¹¹.DDnoDDDlmD2D<4tu.DDD/¹¹¹¹¹¹¹¹.LDnoDD/tu.2D<42242DD/¹¹¹¹¹¹¹¹.TDnoDD<2‚2ƒ22<42242*D/LLLLLLLL.\.vw.(<2Š2‹222<4>2>2?2*€‰TTTTTTTT‰Z[22((=2>2>2>2>2<422ppppppppppXYš‰(<4>2>2>2?2pppp8pBqBqBqBqBrB9pp’(>><42>2>2>2>2>2>222Š2‹22(=B?B*pp’(01111<4>2?2LDD2Dde<2222272yp’011111<4fgTDD2Dlm=2>2>2?2DLDD/»³¼.DDDDD<4no\)2)2)2)2tu.DDD/DTDD/¹¹¹.DDDDD<4vw)2)2)2)2)2)2)2.DDD/\.D/¹¹¹.DDDDL<4)2)2)2)2)2)2)2)2)2)2)2)2)2)2*DD/¹¹¹.DEFGT<4)2)2)2ŽU2V2W2)2)2)2)2)2)2**D/¹¹¹.DMN2O\<411ž]^_1111212**/LLL.<2222<4*)2ŽU2W2U2V2V2W2)2)2)2)2)2***€TTT(<222<42ž]_]^^_112112**ppp’(<2222<41žŽU2V2V2V2W2U2W2)2)2)2)**ppp’(<2‚2ƒ22<41ž]^^^_]_121112*ppp’(<2Š2‹22<4*ŽU2W2U2V2V2W2U2V2W2)2)2)2)2*ppp’(<2222<4*–]_]^^_]^_•)2‚2ƒ2)22pPQ’(=222<4*–U2V2V2V2W2U2V2V2W2•)2Š2‹2)2*€˜pXY’0=2>2<4*–]^^^_]^^_21112ppppš0111<4*)2)2)2)2)2)2)2)2)2)2)2)2)2€˜pppppš‰Z[<42)2)2)2$2)2)2)2)2)2)2)2)26)2ppppPQppXY’<4XXYHIJY")2)2)2)2)2)26ppppXYpppp’<6666666666666666666666666666 \ No newline at end of file diff --git a/data/layouts/MeteorFalls_1F_2R/border.bin b/data/layouts/MeteorFalls_1F_2R/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/MeteorFalls_1F_2R/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/MeteorFalls_1F_2R/layout.inc b/data/layouts/MeteorFalls_1F_2R/layout.inc new file mode 100644 index 000000000..ac91e848e --- /dev/null +++ b/data/layouts/MeteorFalls_1F_2R/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +MeteorFalls_1F_2R_Layout:: + .4byte 0x1e + .4byte 0x20 + .4byte MeteorFalls_1F_2R_MapBorder + .4byte MeteorFalls_1F_2R_MapBlockdata + .4byte gTileset_General + .4byte gTileset_MeteorFalls diff --git a/data/layouts/MeteorFalls_1F_2R/map.bin b/data/layouts/MeteorFalls_1F_2R/map.bin new file mode 100644 index 000000000..67ce2b784 --- /dev/null +++ b/data/layouts/MeteorFalls_1F_2R/map.bin @@ -0,0 +1,2 @@ +>>>>>>>>>>>>>>4111111111111<4222222222222(=>>>>?22222222222201111=>>>>>>>>?2>2>2>2>2>2ŽU2V2V2W2U2W2=>>01111111111212111ž]^^_]_11=>>>>>11111112>2>2>2>2>2ŽU2W2U2V2V2V2W2=01111114112111ž]_]^^^_1111<>>>>?*>2>2>2>2>2ŽU2V2W2U2W2U2V2V2W2=>>(<4111121211ž]^_]_]^^_11(<4*11112>2>2>2ŽU2W2U2V2V2W22U2V2V2W2=((=>4**4111121ž]_]^^_Œ]^^_(01<4**?222222Œ2U2V2V2W22Œ22222•01(<4**22222Œ22]^^_Œ2U2W2U2V2W2•=>((<4** 22222ŽU2V2V2W222Œ2]_]^_1((<4**2222Œž]^^_…‡Ž2222222(((<4**†††‡ +2222222•<4–2U2W2U2V2V2W2(((<4**>?2222U2V2W2•=?–2]_]^^_(((<4**?22Ž]^_ž2222222(((<4**?2222•–2222Œ222222222(((<4**22 222ž2222222Œ222222(((<4**22222€‰Z[22222222223††(<4**€‰‰‰‰˜pXYš‰‰222222(<(<4**pppppPQpppp’2222 22((3††4**dQppPQXYpppp’222222(((<4**lYPQXYpppppp’222222(((<4**pXYppppp’6262622223††((<4**pppppppp’222222(<((<4**pp’626262626262222222(<3†(<4**pp’222222222222(<(<34**kzqqzk}Q†††††††††(<(<66†††††††††††††††††††††† \ No newline at end of file diff --git a/data/layouts/MeteorFalls_B1F_1R/border.bin b/data/layouts/MeteorFalls_B1F_1R/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/MeteorFalls_B1F_1R/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/MeteorFalls_B1F_1R/layout.inc b/data/layouts/MeteorFalls_B1F_1R/layout.inc new file mode 100644 index 000000000..c424edf3b --- /dev/null +++ b/data/layouts/MeteorFalls_B1F_1R/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +MeteorFalls_B1F_1R_Layout:: + .4byte 0x1d + .4byte 0x26 + .4byte MeteorFalls_B1F_1R_MapBorder + .4byte MeteorFalls_B1F_1R_MapBlockdata + .4byte gTileset_General + .4byte gTileset_MeteorFalls diff --git a/data/layouts/MeteorFalls_B1F_1R/map.bin b/data/layouts/MeteorFalls_B1F_1R/map.bin new file mode 100644 index 000000000..a37afdb17 --- /dev/null +++ b/data/layouts/MeteorFalls_B1F_1R/map.bin @@ -0,0 +1,6 @@ +>>>>>>>>>>>>>>>?DDDDDDDDDD=>>>4DDDD/DDDEFGDDDD.DD<?DDD/DDDMN2ODDDD.D(<411111D/22222222.((<4*11c11B*222222222€‰(((<4*BB BBBBB*2222222222p’(((<4*BBBBBB*€‰‰‰‰‰‰‰‰‰˜p’(((<4*BBBBBB*ppppppppppp’((=4*BB…R†R‡R +*ppppppppppp’((0<4*BBR?R*p’(BB*pppp’(<4*RRRRRR4RBBBBB12pppp’(<4R RRRRR>R?RBBBBB*€‰˜pppp’(<4RRR4RBBBBB*pppppp’(<4RRRR4RBBBBBBB*pppppp’(<4RRRR4RBBBBBBB2pppppxk(<6††††††††††‡ +B*€˜ppppx(<(<R4 +*ppppp’(<(<R4*ppppp’(<…(<R4*ppppp’(<…R4*ppppp’(<<R4*ppppp’(<<R4*ppppp’(<<R4*2222222<<R4*222222<<R4*222222<<R†66†††}~††††† \ No newline at end of file diff --git a/data/layouts/MeteorFalls_B1F_2R/border.bin b/data/layouts/MeteorFalls_B1F_2R/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/MeteorFalls_B1F_2R/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/MeteorFalls_B1F_2R/layout.inc b/data/layouts/MeteorFalls_B1F_2R/layout.inc new file mode 100644 index 000000000..b7ee944cc --- /dev/null +++ b/data/layouts/MeteorFalls_B1F_2R/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +MeteorFalls_B1F_2R_Layout:: + .4byte 0xb + .4byte 0x12 + .4byte MeteorFalls_B1F_2R_MapBorder + .4byte MeteorFalls_B1F_2R_MapBlockdata + .4byte gTileset_General + .4byte gTileset_MeteorFalls diff --git a/data/layouts/MeteorFalls_B1F_2R/map.bin b/data/layouts/MeteorFalls_B1F_2R/map.bin new file mode 100644 index 000000000..5f4497752 --- /dev/null +++ b/data/layouts/MeteorFalls_B1F_2R/map.bin @@ -0,0 +1 @@ +>>>>>>>>>41111111<4*11111(<4**22222((<4**22222((<4**€‰‰‰((<4**ppp’((<4**ppp’((<4**ppp’((<4**ppp’((<4**ppp’((<4**ppp’((<4**ppp’((<4**ppp’((<4**22222((<4**22222((<4*††}~††(<††††††††† \ No newline at end of file diff --git a/data/layouts/MeteorFalls_StevensCave/border.bin b/data/layouts/MeteorFalls_StevensCave/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/MeteorFalls_StevensCave/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/MeteorFalls_StevensCave/layout.inc b/data/layouts/MeteorFalls_StevensCave/layout.inc new file mode 100644 index 000000000..992e7d174 --- /dev/null +++ b/data/layouts/MeteorFalls_StevensCave/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MeteorFalls_StevensCave_MapBorder:: + .incbin "data/layouts/MeteorFalls_StevensCave/border.bin" + + .align 2 +MeteorFalls_StevensCave_MapBlockdata:: + .incbin "data/layouts/MeteorFalls_StevensCave/map.bin" + + .align 2 +MeteorFalls_StevensCave_Layout:: + .4byte 0x1e + .4byte 0x20 + .4byte MeteorFalls_StevensCave_MapBorder + .4byte MeteorFalls_StevensCave_MapBlockdata + .4byte gTileset_General + .4byte gTileset_MeteorFalls diff --git a/data/layouts/MeteorFalls_StevensCave/map.bin b/data/layouts/MeteorFalls_StevensCave/map.bin new file mode 100644 index 000000000..e509d66c2 --- /dev/null +++ b/data/layouts/MeteorFalls_StevensCave/map.bin @@ -0,0 +1,21 @@ +               "11111      +             "111((    +(  "1111111121((((666(61111111122((((1112(61111111122(((111112(61111111122((111116(61111111122(11111(6(6222Œ222222011111((6(6Œ22Œ22Œ222222222(((6(62222Œ222         (6(622Œ2222(        +(6(1ž2222222((1111111ž(6(111ž       +22(111111!!611111ž     " +21 +1((  +111111ž  +222((Œ((((6111111((6  +22((2((((61111(((6622((2((((6*2222(((1ž622(ž–2((((6*2222(((61262211ž2((((6*2ŒŒ2(((612ž2Œ22222((((6*2Œ22(((*1ž222ŒŒ222((((6    +222(((6**22222Œ22    (6  + +Œ2((ž**2222Œ22(6   6(6** +2(ž222222((6(   +(6***2ž222   ((6(( +(6***222222222Œ2(66  6((((6**  +2222Œ22ŒŒ2(6(666((((6**6   +22222222(((   (((6*    +*222Œ2   ((((6  ((6*    +**22222(   (((6(66ž(6    +* HIJ   (666(((6žž               ž \ No newline at end of file diff --git a/data/layouts/MirageTower_1F/border.bin b/data/layouts/MirageTower_1F/border.bin new file mode 100644 index 000000000..58596f99a --- /dev/null +++ b/data/layouts/MirageTower_1F/border.bin @@ -0,0 +1 @@ +EEEE \ No newline at end of file diff --git a/data/layouts/MirageTower_1F/layout.inc b/data/layouts/MirageTower_1F/layout.inc new file mode 100644 index 000000000..e4bb92d74 --- /dev/null +++ b/data/layouts/MirageTower_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MirageTower_1F_MapBorder:: + .incbin "data/layouts/MirageTower_1F/border.bin" + + .align 2 +MirageTower_1F_MapBlockdata:: + .incbin "data/layouts/MirageTower_1F/map.bin" + + .align 2 +MirageTower_1F_Layout:: + .4byte 0x15 + .4byte 0x11 + .4byte MirageTower_1F_MapBorder + .4byte MirageTower_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_MirageTower diff --git a/data/layouts/MirageTower_1F/map.bin b/data/layouts/MirageTower_1F/map.bin new file mode 100644 index 000000000..b77d14890 --- /dev/null +++ b/data/layouts/MirageTower_1F/map.bin @@ -0,0 +1,3 @@ +EE  EEEEEE22˜2™2™2™2™2™2™2š2222˜2™2¡2¡2©2©2©2©2©2¡2š22222 2¡2¡2p     q¢2˜2š2222 2¡2p 22222 q™2¡2¡2š222¨2p2222222q¡2¡2¢22222222222 2¡2¢22222222222 2¡2¢2˜2™2š22222222 2¡2¢2¨2¡2¢222222 2¡2¢22¨2¡2hi¡2¡2ª2š22 2¡2hi¡2¡2¢2   +¨2©2¡2š22222˜2™2¡2¡2¡2p     +22¨2ª22<2¨2©2©2©2ª2   E      XY       EE                 E \ No newline at end of file diff --git a/data/layouts/MirageTower_2F/border.bin b/data/layouts/MirageTower_2F/border.bin new file mode 100644 index 000000000..58596f99a --- /dev/null +++ b/data/layouts/MirageTower_2F/border.bin @@ -0,0 +1 @@ +EEEE \ No newline at end of file diff --git a/data/layouts/MirageTower_2F/layout.inc b/data/layouts/MirageTower_2F/layout.inc new file mode 100644 index 000000000..601dd9de2 --- /dev/null +++ b/data/layouts/MirageTower_2F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MirageTower_2F_MapBorder:: + .incbin "data/layouts/MirageTower_2F/border.bin" + + .align 2 +MirageTower_2F_MapBlockdata:: + .incbin "data/layouts/MirageTower_2F/map.bin" + + .align 2 +MirageTower_2F_Layout:: + .4byte 0x15 + .4byte 0x11 + .4byte MirageTower_2F_MapBorder + .4byte MirageTower_2F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_MirageTower diff --git a/data/layouts/MirageTower_2F/map.bin b/data/layouts/MirageTower_2F/map.bin new file mode 100644 index 000000000..79c3056a9 --- /dev/null +++ b/data/layouts/MirageTower_2F/map.bin @@ -0,0 +1,3 @@ +EE  EEEEEE222˜2™2™2™2™2™2š22?2222˜2¡2©2©2©2©2©2¡2š222/2/22˜2¡2p     q¢2222/2/2˜2¡2p 22222 q™2š222/2/2¨2p2222222qª222/2/222222222222/2222222222/2˜2222222222/2˜2¢222222222¨2¡2hiš2222 2¡2hi©2ª222   +¨2©2ª2222222¨2ª222     +2222222222222   E2               2EE2                 2E \ No newline at end of file diff --git a/data/layouts/MirageTower_3F/border.bin b/data/layouts/MirageTower_3F/border.bin new file mode 100644 index 000000000..58596f99a --- /dev/null +++ b/data/layouts/MirageTower_3F/border.bin @@ -0,0 +1 @@ +EEEE \ No newline at end of file diff --git a/data/layouts/MirageTower_3F/layout.inc b/data/layouts/MirageTower_3F/layout.inc new file mode 100644 index 000000000..2bcd9806d --- /dev/null +++ b/data/layouts/MirageTower_3F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MirageTower_3F_MapBorder:: + .incbin "data/layouts/MirageTower_3F/border.bin" + + .align 2 +MirageTower_3F_MapBlockdata:: + .incbin "data/layouts/MirageTower_3F/map.bin" + + .align 2 +MirageTower_3F_Layout:: + .4byte 0x15 + .4byte 0x11 + .4byte MirageTower_3F_MapBorder + .4byte MirageTower_3F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_MirageTower diff --git a/data/layouts/MirageTower_3F/map.bin b/data/layouts/MirageTower_3F/map.bin new file mode 100644 index 000000000..376ac2836 --- /dev/null +++ b/data/layouts/MirageTower_3F/map.bin @@ -0,0 +1,6 @@ +EE  EEEEEE˜2™2™2™2™2™2š2222˜2™2š2¨2©2©2©2©2©2ª2222 2¡2ª222222      +¨2ª22222222 22222  +22222222222 +/222˜2š22222222/22/2¡2¢222222222˜2š2˜2¡2¢22222222˜2¡2¢2¨2¡2¢222222¨2©2ª22 2¢22222¨2ª222222   +222˜2™2™2™2™2™2™2™2š22     +222¨2©2©2©2©2©2©2©2ª22   E2               2EE2                 2E \ No newline at end of file diff --git a/data/layouts/MirageTower_4F/border.bin b/data/layouts/MirageTower_4F/border.bin new file mode 100644 index 000000000..58596f99a --- /dev/null +++ b/data/layouts/MirageTower_4F/border.bin @@ -0,0 +1 @@ +EEEE \ No newline at end of file diff --git a/data/layouts/MirageTower_4F/layout.inc b/data/layouts/MirageTower_4F/layout.inc new file mode 100644 index 000000000..babf2a5c7 --- /dev/null +++ b/data/layouts/MirageTower_4F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MirageTower_4F_MapBorder:: + .incbin "data/layouts/MirageTower_4F/border.bin" + + .align 2 +MirageTower_4F_MapBlockdata:: + .incbin "data/layouts/MirageTower_4F/map.bin" + + .align 2 +MirageTower_4F_Layout:: + .4byte 0xd + .4byte 0xa + .4byte MirageTower_4F_MapBorder + .4byte MirageTower_4F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_MirageTower diff --git a/data/layouts/MirageTower_4F/map.bin b/data/layouts/MirageTower_4F/map.bin new file mode 100644 index 000000000..283534fb7 --- /dev/null +++ b/data/layouts/MirageTower_4F/map.bin @@ -0,0 +1,2 @@ +EE EE2˜2™2™2™2™2š22  B B B B Bqš222˜2˜B™B™B™BšB¡2š22 2 B¡B¡B¡B¢B¡2ª22¨2¨B©B©B©BªB¢2222iª222222˜2™2¡2¢222   +˜2™2™2¡2¡2¡2¢2   E         E \ No newline at end of file diff --git a/data/layouts/MossdeepCity/border.bin b/data/layouts/MossdeepCity/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/MossdeepCity/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/MossdeepCity/layout.inc b/data/layouts/MossdeepCity/layout.inc new file mode 100644 index 000000000..b5d392dc7 --- /dev/null +++ b/data/layouts/MossdeepCity/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MossdeepCity_MapBorder:: + .incbin "data/layouts/MossdeepCity/border.bin" + + .align 2 +MossdeepCity_MapBlockdata:: + .incbin "data/layouts/MossdeepCity/map.bin" + + .align 2 +MossdeepCity_Layout:: + .4byte 0x50 + .4byte 0x28 + .4byte MossdeepCity_MapBorder + .4byte MossdeepCity_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Mossdeep diff --git a/data/layouts/MossdeepCity/map.bin b/data/layouts/MossdeepCity/map.bin new file mode 100644 index 000000000..bf150f5bb Binary files /dev/null and b/data/layouts/MossdeepCity/map.bin differ diff --git a/data/layouts/MossdeepCity_GameCorner_1F/border.bin b/data/layouts/MossdeepCity_GameCorner_1F/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/MossdeepCity_GameCorner_1F/border.bin differ diff --git a/data/layouts/MossdeepCity_GameCorner_1F/layout.inc b/data/layouts/MossdeepCity_GameCorner_1F/layout.inc new file mode 100644 index 000000000..e03619423 --- /dev/null +++ b/data/layouts/MossdeepCity_GameCorner_1F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +MossdeepCity_GameCorner_1F_Layout:: + .4byte 0xc + .4byte 0xa + .4byte MossdeepCity_GameCorner_1F_MapBorder + .4byte MossdeepCity_GameCorner_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_MossdeepGameCorner diff --git a/data/layouts/MossdeepCity_GameCorner_1F/map.bin b/data/layouts/MossdeepCity_GameCorner_1F/map.bin new file mode 100644 index 000000000..8be990dde --- /dev/null +++ b/data/layouts/MossdeepCity_GameCorner_1F/map.bin @@ -0,0 +1,53 @@ +)2(2  12  22*22022 2 +2"#$2%&' +2 +2 +2 2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 2 +222 +2 +2 +222 +2 +2 +2 22 +2 +2 +22 +2 +2 22 ! +2 +2 +2 !2 +2 +2 2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 2 +2 +2 +2 +2-2.2 +2 +2 +2 +2 +2 \ No newline at end of file diff --git a/data/layouts/MossdeepCity_GameCorner_B1F/border.bin b/data/layouts/MossdeepCity_GameCorner_B1F/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/MossdeepCity_GameCorner_B1F/border.bin differ diff --git a/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc b/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc new file mode 100644 index 000000000..b51e18362 --- /dev/null +++ b/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +MossdeepCity_GameCorner_B1F_Layout:: + .4byte 0xc + .4byte 0x9 + .4byte MossdeepCity_GameCorner_B1F_MapBorder + .4byte MossdeepCity_GameCorner_B1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/MossdeepCity_GameCorner_B1F/map.bin b/data/layouts/MossdeepCity_GameCorner_B1F/map.bin new file mode 100644 index 000000000..399d05705 --- /dev/null +++ b/data/layouts/MossdeepCity_GameCorner_B1F/map.bin @@ -0,0 +1,2 @@ +  +        ˜6$2$2$2$2$2$2$2$2$2$2˜692#2#2#2#2#2#2#2#2#2#2#292#2#2#252626272#2#2#2#292#2#2#2=2>2>2?2#2#2#2#292#2#2#2E2F2F2G2#2#2#2#2‘2#2#2#2#2#2#2#2#2#2#2"2™#2#2#2#2#2#2#2#2#2#2* \ No newline at end of file diff --git a/data/layouts/MossdeepCity_Gym/border.bin b/data/layouts/MossdeepCity_Gym/border.bin new file mode 100644 index 000000000..064786e8c --- /dev/null +++ b/data/layouts/MossdeepCity_Gym/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/MossdeepCity_Gym/layout.inc b/data/layouts/MossdeepCity_Gym/layout.inc new file mode 100644 index 000000000..fbdfa6fdd --- /dev/null +++ b/data/layouts/MossdeepCity_Gym/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MossdeepCity_Gym_MapBorder:: + .incbin "data/layouts/MossdeepCity_Gym/border.bin" + + .align 2 +MossdeepCity_Gym_MapBlockdata:: + .incbin "data/layouts/MossdeepCity_Gym/map.bin" + + .align 2 +MossdeepCity_Gym_Layout:: + .4byte 0x1a + .4byte 0x24 + .4byte MossdeepCity_Gym_MapBorder + .4byte MossdeepCity_Gym_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_MossdeepGym diff --git a/data/layouts/MossdeepCity_Gym/map.bin b/data/layouts/MossdeepCity_Gym/map.bin new file mode 100644 index 000000000..da585f73f --- /dev/null +++ b/data/layouts/MossdeepCity_Gym/map.bin @@ -0,0 +1,40 @@ +666666666666666666666666666666626666666666666666666 66666666666666666 66666666666666666$ 666666666666666  +q2r2 +q2r266666666 6666  +p2s2t2 p2s266666666()6666 \2 + 666666666 6666  +Y2Z2Y2Z2666666666  !"#666666X2[2 +X2[2 +666666666  + + + +66666666]2666666666666666666666666 666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666266 +66666666666666Q2R2 +66666666666 6T2P2S266666666666666m26  + + + +66666666666666i2j2i2j26266666666666666666h2k2 +h2k266666666666666666666 +l2 +66666666666666666666666i2j2 +$6666666666666666666h2k2 +66 6666666666666666  +6666666666666666666Q2R2Q2R26666666666666 66P2S2T2P2S2% 666666666 66  + + + +$666666666 6 + + + +$6666626  + + + +6a2b26666666   + + 6`2c2 +6d26666666 $00$62 +6666666666666 \ No newline at end of file diff --git a/data/layouts/MossdeepCity_SpaceCenter_1F/border.bin b/data/layouts/MossdeepCity_SpaceCenter_1F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/MossdeepCity_SpaceCenter_1F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc b/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc new file mode 100644 index 000000000..c5fc2f570 --- /dev/null +++ b/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +MossdeepCity_SpaceCenter_1F_Layout:: + .4byte 0x10 + .4byte 0xa + .4byte MossdeepCity_SpaceCenter_1F_MapBorder + .4byte MossdeepCity_SpaceCenter_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/layouts/MossdeepCity_SpaceCenter_1F/map.bin b/data/layouts/MossdeepCity_SpaceCenter_1F/map.bin new file mode 100644 index 000000000..44f5081b9 Binary files /dev/null and b/data/layouts/MossdeepCity_SpaceCenter_1F/map.bin differ diff --git a/data/layouts/MossdeepCity_SpaceCenter_2F/border.bin b/data/layouts/MossdeepCity_SpaceCenter_2F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/MossdeepCity_SpaceCenter_2F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc b/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc new file mode 100644 index 000000000..4d406accc --- /dev/null +++ b/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +MossdeepCity_SpaceCenter_2F_Layout:: + .4byte 0x10 + .4byte 0xa + .4byte MossdeepCity_SpaceCenter_2F_MapBorder + .4byte MossdeepCity_SpaceCenter_2F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/layouts/MossdeepCity_SpaceCenter_2F/map.bin b/data/layouts/MossdeepCity_SpaceCenter_2F/map.bin new file mode 100644 index 000000000..d2e52d780 Binary files /dev/null and b/data/layouts/MossdeepCity_SpaceCenter_2F/map.bin differ diff --git a/data/layouts/MossdeepCity_StevensHouse/border.bin b/data/layouts/MossdeepCity_StevensHouse/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/MossdeepCity_StevensHouse/border.bin differ diff --git a/data/layouts/MossdeepCity_StevensHouse/layout.inc b/data/layouts/MossdeepCity_StevensHouse/layout.inc new file mode 100644 index 000000000..29aede186 --- /dev/null +++ b/data/layouts/MossdeepCity_StevensHouse/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MossdeepCity_StevensHouse_MapBorder:: + .incbin "data/layouts/MossdeepCity_StevensHouse/border.bin" + + .align 2 +MossdeepCity_StevensHouse_MapBlockdata:: + .incbin "data/layouts/MossdeepCity_StevensHouse/map.bin" + + .align 2 +MossdeepCity_StevensHouse_Layout:: + .4byte 0xb + .4byte 0x8 + .4byte MossdeepCity_StevensHouse_MapBorder + .4byte MossdeepCity_StevensHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/MossdeepCity_StevensHouse/map.bin b/data/layouts/MossdeepCity_StevensHouse/map.bin new file mode 100644 index 000000000..ade25497a --- /dev/null +++ b/data/layouts/MossdeepCity_StevensHouse/map.bin @@ -0,0 +1 @@ +†‡Žh     ii–2—2p2$2$2$2$2$2$2q2q292#2#2#2è6é6é6ê6#2#2[392#2#2#2ð6ñ6Ñ6ò6#2#2c792#2#2#2#2#2,2#2#2#2[392#2#2#2#2#2#2#2#2#2c792#2#2 #2#2#2#2#2#2 \ No newline at end of file diff --git a/data/layouts/MtChimney/border.bin b/data/layouts/MtChimney/border.bin new file mode 100644 index 000000000..9ae2c2126 --- /dev/null +++ b/data/layouts/MtChimney/border.bin @@ -0,0 +1 @@ +qqqq \ No newline at end of file diff --git a/data/layouts/MtChimney/layout.inc b/data/layouts/MtChimney/layout.inc new file mode 100644 index 000000000..f0afefe3b --- /dev/null +++ b/data/layouts/MtChimney/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MtChimney_MapBorder:: + .incbin "data/layouts/MtChimney/border.bin" + + .align 2 +MtChimney_MapBlockdata:: + .incbin "data/layouts/MtChimney/map.bin" + + .align 2 +MtChimney_Layout:: + .4byte 0x28 + .4byte 0x2f + .4byte MtChimney_MapBorder + .4byte MtChimney_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lavaridge diff --git a/data/layouts/MtChimney/map.bin b/data/layouts/MtChimney/map.bin new file mode 100644 index 000000000..1e7e2868d --- /dev/null +++ b/data/layouts/MtChimney/map.bin @@ -0,0 +1 @@ +h~qpqqpqpqrrrq2r‰x|q2{z½‰ppppqrrqqqrqqpqqpqqpqpqrrr{z½|xtz{½~6ppppqrrqqqrqqpqh~qqph~qrrrr{½yyy½‰qppppqrrqqqrq{pqpqqqppqqrrrr½½½½½½½‰h~pppqrrqq{zqrpqpqqqppqqrrrr½½½½½½½½‰ph~pxtzrqqrqqrpqpqqqppq{zrrrU½½½½½½½½~pph~2q2q2q2rqqrqqrpqpqqqpxtzq22227½½½½½½½‰qpppq2q2q2q2rq{zqqrpqpqqqpq2q2q2q2q2q2q2q2½½½½½½½‰h~ppq2q2q2q2rqrqq{zpqpqqqpq2q2q2q2{ttt½½½½½‰pqppq2q2q2q2rqrqqrqpqx|qqpq2q2q2q2rrr½½½½½½~~h~pq2q2q2{zqrq{zqx|qpqqphijq2rr£½½½£pqh~h~2q2q2q2rq{zqrqqqpqx|qppqrq222jqqr££££~h~qph~2q2q2q2q2rqrqqrq{qpqqpqpxtzq2q2q22i2jiiiii~qh~6pq2q2q2q2q2rqrqqrqr|x|qx|x|q2q2q2q2hijriijqqhii~6q6pq2q2q2q2q2rqrqqr{zpqpqqpqx|q2q2q2pqr2i2jii~hi2i2i2~2q2q2q2q2q2rqrq{zr{x|x|qpqqpq2q2q2xtzq2q22i2i2i2i2~2q2q2q2q2q2q2q2q2q2r{zqr{zrqpqpqx|qpq2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2{zrq{zr{z|pqpqqpqx|q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2rq6rqrqrrqppqx|qpqqxt|q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2rq6r{z{zr{px|qx|xttt|pq2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2{zq6rrqrqrrpqx|qxttt|pxt|q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2{zq6q6rrqr{zrpqqxt|qqqppq6q6x|q2q2q2q2q2q2q2q2q2q2q2q2q2{z{ttzrqrrqrxtt|qxt|qpxt|q2xt|q2q2{ttttt¯2ttz{z{ttz{zrqrqqqxt|qpqxt|xtt|xttzq2q2q2q2q2q2{ttz{z{ttz{zqrttt|qx|xt|qxt|q6x|q2q2{¯2tttttzq2q2{z{z{ttz{tztt|pqqxt|x|qqxt|xttzq2q2q2q2q2q2q2q2q2r{z{z{ttzqqqqpx|qqqpqxtt|qxt|q2q2q2q2q2q2q2q2q2{tzrq2rq2rqqq2{tqqpqxt|qÅ|qqqx|qqx|q2q2q2{ttt¯2z{tz{Ç{zqq{Çqqqx|qÄ2pqÌ6pqqqqxtt|xtttzq2q2q2q2{zq2q2rÌ6r{ttzÍqqqqx|ÍÅt|xttttt|qxtttttttt¯2zq2q2q2rqrrqÄ2q2Ì6Ä2qqqqpÌ6Ì6qpqqqqqqxtttttt|q2q2q2q2q2q2q2q2r{ÇrqÌ6qqÌ6qqqqxtt|pqq2qqŽ––––––––pq2q2q2q2q2{ttzrÌ6rÄ2Ä2{tt|qqqqqqppqq2qqq2&2'2!2!2"2q2q2xttt¯2tzq2q2q2r{zÍÌ6rÄ2qxtt|qqqppqÄ2Ä2q&2.6/))*Z2Z2Z2Z2Z2Z2Z2Z2T2S2q2{zrÄ2Ì6{zÍÄ2tt|pqqqppqÌ6Íq-67112q2q2q2q2q2q2q2q2\2[2R2Qq2rÌ6{zÄ2Ì6Ì6qqpxt|Ä2pxt|Ì6Ä2->?9:%q2q2q2q2q2q2q2q2d6q2q2YRQqrqÌ6{Æ|qxt|pÍÅt|Å|Í5FGABWq2q2q2q2q2q2q2q2q2q2q2rqYRQq{zÌ6pqÄ2qppÌ6Ì6qpÍpÍÄ2Ä2q2q2q2q2q2q2q2q24q2q2q2Ä2Ä2q2rqrqYRQ{tpÄ2ÍÄ2pxt|qpÌ6pÌ6Ì6Ì6q2q2q2q2q2q2q2q2q2q2q2q2Ì6Ì6{z{ÇÄ2rqYPapÌ6Ì6ÍÅt|pÄ2x|pq“––––‡q2q2q2q2…–––––{z{ÇÍÌ6rÄ2rrYxÆ|Ì6Ì6qppÍqpÅÆtÆ|q2q2“q2q2q2q2”q2q2q2q2{z{zÌ6Ì6{zÍrrrqÍÅt|qppÌ6qpÌ6Ì6qÍÅtÆ6ÆÆ22ÆÆÆ6ttÆz{zÄ2q2q2rq2Ì6rrrqÌ6Ì6qpÄ2px|Ä2ÅÆÆ|Ì6ÍÄ2ÍÍÍ77ÍÍÍÄ2Ä2Í6{zq2Ì6{Æzq2{zrrtt|qpÍx|pÌ6Ì6Ì6ÍÅ|ÍÍÍÍÍ77ÍÍÍÍÍÌ6rq2q2{zÍÄ2q2rq2rrÄ2Ä2pÄ2pÍqpÅtÆ|ÍÍpÍÍÍÍÍÍÍÍÍÍÍÍ{zÄ2Ä2rq2ÍÍq2rÄ2rrÍÍpÍpÍÄ2pÌ6qÌ6pÌ6ÍpÌ6ÍÍÍÍÍÍÍÍÍÍÍrÄ2ÍÍrÄ2Ì6Ì6Ä2rÍrrÍÍpÍpÌ6Íxtt|x|Íx|Ì6ÍÍÍÍÍÍÍÍÍÍrÍÍÌ6rÍÄ2Ä2ÍrÍrr \ No newline at end of file diff --git a/data/layouts/MtPyre_1F/border.bin b/data/layouts/MtPyre_1F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/MtPyre_1F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/MtPyre_1F/layout.inc b/data/layouts/MtPyre_1F/layout.inc new file mode 100644 index 000000000..bd7fd82d5 --- /dev/null +++ b/data/layouts/MtPyre_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MtPyre_1F_MapBorder:: + .incbin "data/layouts/MtPyre_1F/border.bin" + + .align 2 +MtPyre_1F_MapBlockdata:: + .incbin "data/layouts/MtPyre_1F/map.bin" + + .align 2 +MtPyre_1F_Layout:: + .4byte 0x16 + .4byte 0x13 + .4byte MtPyre_1F_MapBorder + .4byte MtPyre_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/layouts/MtPyre_1F/map.bin b/data/layouts/MtPyre_1F/map.bin new file mode 100644 index 000000000..60b992a73 --- /dev/null +++ b/data/layouts/MtPyre_1F/map.bin @@ -0,0 +1 @@ +ï³´µïïäïïäïïä÷»¼2½÷÷ì÷÷ì÷÷ìç2è2ç2é2&7&7ç2ç2ç2ç2ç2ç2ç2ïäïïäç2æ2æ2æ2î6î6æ2î6î6î6æ2î6î6÷ì÷÷ì'7ç2æ2æ2æ2î6î6æ2î6î6î6æ2î6î6ç2ç2ç2ç2ç2ç2ç2æ2æ2æ2î6î6æ2æ2æ2æ2æ2æ2æ222æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2î6î6î6æ2î6î6&7î6æ2æ2æ2æ2æ2î6î6î6æ2î6î6&7î6æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2ç2æ2î6î6æ2æ2æ2æ2æ2æ2æ2æ2æ2ç2æ2î6î6æ2æ2æ2æ2æ2æ2æ2æ2æ2&7î6æ2æ2î6î6æ2æ2æ2æ2æ2î6î6&7î6æ2æ2î6î6æ2æ2æ2æ2æ2î6î6ç2æ2ç2æ2ç2æ2ç2æ2ç2æ222 \ No newline at end of file diff --git a/data/layouts/MtPyre_2F/border.bin b/data/layouts/MtPyre_2F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/MtPyre_2F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/MtPyre_2F/layout.inc b/data/layouts/MtPyre_2F/layout.inc new file mode 100644 index 000000000..cbf534f69 --- /dev/null +++ b/data/layouts/MtPyre_2F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MtPyre_2F_MapBorder:: + .incbin "data/layouts/MtPyre_2F/border.bin" + + .align 2 +MtPyre_2F_MapBlockdata:: + .incbin "data/layouts/MtPyre_2F/map.bin" + + .align 2 +MtPyre_2F_Layout:: + .4byte 0xd + .4byte 0xd + .4byte MtPyre_2F_MapBorder + .4byte MtPyre_2F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/layouts/MtPyre_2F/map.bin b/data/layouts/MtPyre_2F/map.bin new file mode 100644 index 000000000..97b7e9e31 --- /dev/null +++ b/data/layouts/MtPyre_2F/map.bin @@ -0,0 +1 @@ +äÃÄÅïäïäï³´µäìËÌ2Í÷ì÷ì÷»¼2½ìç2è2ç2é2ç2ç2&&ç2è2ç2é2&ç2æ2æ2æ2æ2æ2æ2îæ2æ2æ2æ2î&îæ2æ2æ2æ2îæ2îîæ2æ2æ2&îæ2æ2æ2æ2îæ2îæ2æ2æ2æ2ç2æ2îæ2æ2æ2æ2æ2æ2æ2îîæ2ç2æ2îæ2æ2æ2æ2æ2æ2æ2îîæ2&îîîîîæ2æ2îîæ2æ2î&æ2æ2æ2îîæ2æ2îîæ2ò3îç2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2&îæ2æ2îîæ2æ2îîæ2îî&îæ2æ2îîæ2æ2îîæ2îî \ No newline at end of file diff --git a/data/layouts/MtPyre_3F/border.bin b/data/layouts/MtPyre_3F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/MtPyre_3F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/MtPyre_3F/layout.inc b/data/layouts/MtPyre_3F/layout.inc new file mode 100644 index 000000000..ceaa1bea9 --- /dev/null +++ b/data/layouts/MtPyre_3F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MtPyre_3F_MapBorder:: + .incbin "data/layouts/MtPyre_3F/border.bin" + + .align 2 +MtPyre_3F_MapBlockdata:: + .incbin "data/layouts/MtPyre_3F/map.bin" + + .align 2 +MtPyre_3F_Layout:: + .4byte 0xd + .4byte 0xd + .4byte MtPyre_3F_MapBorder + .4byte MtPyre_3F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/layouts/MtPyre_3F/map.bin b/data/layouts/MtPyre_3F/map.bin new file mode 100644 index 000000000..758eccc3a --- /dev/null +++ b/data/layouts/MtPyre_3F/map.bin @@ -0,0 +1 @@ +ä³´µïäïäïÃÄÅä컼2½÷ì÷ì÷ËÌ2Íì&è2ç2é2ç2&&&ç2è2ç2é2&&æ2æ2æ2îîîîîæ2æ2æ2îç2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2&æ2æ2æ2æ2æ2îæ2æ2æ2æ2æ2î&æ2æ2îîîîîîîæ2æ2îç2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2&îîîîîîîîîæ2æ2æ2&îîîîîîîîîæ2æ2æ2ç2æ2æ2æ2æ2æ2æ2îîæ2æ2æ2æ2ç2æ2æ2îîæ2æ2îîæ2æ2îîç2æ2æ2îîæ2ò3îîæ2ò3îî \ No newline at end of file diff --git a/data/layouts/MtPyre_4F/border.bin b/data/layouts/MtPyre_4F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/MtPyre_4F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/MtPyre_4F/layout.inc b/data/layouts/MtPyre_4F/layout.inc new file mode 100644 index 000000000..5bd0eab59 --- /dev/null +++ b/data/layouts/MtPyre_4F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MtPyre_4F_MapBorder:: + .incbin "data/layouts/MtPyre_4F/border.bin" + + .align 2 +MtPyre_4F_MapBlockdata:: + .incbin "data/layouts/MtPyre_4F/map.bin" + + .align 2 +MtPyre_4F_Layout:: + .4byte 0xd + .4byte 0xd + .4byte MtPyre_4F_MapBorder + .4byte MtPyre_4F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/layouts/MtPyre_4F/map.bin b/data/layouts/MtPyre_4F/map.bin new file mode 100644 index 000000000..98dc679ff --- /dev/null +++ b/data/layouts/MtPyre_4F/map.bin @@ -0,0 +1 @@ +äï³´µêì÷»¼2½ëïïïïïï&&è2ç2é2&÷÷÷÷÷÷'&îæ2æ2æ2îïÃÄÅïïïïêÞ2Ï0Ï0ä÷ËÌ2Í÷÷÷÷ëÞ2Ï0Ï0ì&è2ç2é2&&&&&ç2ç2ç2&&æ2æ2æ2îîîîîæ2æ2æ2æ2ç2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2îîîîîîîîîîæ2æ2æ2î&æ2æ2í6æ2æ2îîîò3æ2æ2æ2&æ2æ2æ2æ2æ2îîîîîîî&æ2ò3æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2 \ No newline at end of file diff --git a/data/layouts/MtPyre_5F/border.bin b/data/layouts/MtPyre_5F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/MtPyre_5F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/MtPyre_5F/layout.inc b/data/layouts/MtPyre_5F/layout.inc new file mode 100644 index 000000000..fed3f9ae2 --- /dev/null +++ b/data/layouts/MtPyre_5F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MtPyre_5F_MapBorder:: + .incbin "data/layouts/MtPyre_5F/border.bin" + + .align 2 +MtPyre_5F_MapBlockdata:: + .incbin "data/layouts/MtPyre_5F/map.bin" + + .align 2 +MtPyre_5F_Layout:: + .4byte 0xd + .4byte 0xd + .4byte MtPyre_5F_MapBorder + .4byte MtPyre_5F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/layouts/MtPyre_5F/map.bin b/data/layouts/MtPyre_5F/map.bin new file mode 100644 index 000000000..12fbeeb7e --- /dev/null +++ b/data/layouts/MtPyre_5F/map.bin @@ -0,0 +1 @@ +ä³´µïê컼2½÷ë&è2ç2é2&ç2ïïïïïï&æ2æ2æ2îæ2÷÷÷÷÷÷ïêÞ2äïïïïïÃÄÅï÷ëÞ2ì÷÷÷÷÷ËÌ2Í÷&ç2ç2ç2&&&&&è2ç2é2&&æ2æ2æ2îæ2æ2æ2îæ2æ2æ2îç2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2&îæ2æ2æ2îîîæ2æ2æ2îîç2æ2îîîæ2í6æ2îîîæ2ò3&æ2æ2îæ2æ2æ2æ2æ2îæ2æ2î&æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2ò3 \ No newline at end of file diff --git a/data/layouts/MtPyre_6F/border.bin b/data/layouts/MtPyre_6F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/MtPyre_6F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/MtPyre_6F/layout.inc b/data/layouts/MtPyre_6F/layout.inc new file mode 100644 index 000000000..0fe9f6982 --- /dev/null +++ b/data/layouts/MtPyre_6F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MtPyre_6F_MapBorder:: + .incbin "data/layouts/MtPyre_6F/border.bin" + + .align 2 +MtPyre_6F_MapBlockdata:: + .incbin "data/layouts/MtPyre_6F/map.bin" + + .align 2 +MtPyre_6F_Layout:: + .4byte 0xd + .4byte 0xd + .4byte MtPyre_6F_MapBorder + .4byte MtPyre_6F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/layouts/MtPyre_6F/map.bin b/data/layouts/MtPyre_6F/map.bin new file mode 100644 index 000000000..1f7438bfb --- /dev/null +++ b/data/layouts/MtPyre_6F/map.bin @@ -0,0 +1 @@ +êÃÄÅäïïïïïïïïëËÌ2Íì÷÷÷÷÷÷÷÷&è2ç2é2&&ç2ç2ç2ç2ç2ç2&ç2æ2æ2æ2îæ2æ2æ2æ2æ2æ2æ2æ2ç2æ2æ2îîæ2æ2æ2î6æ2æ2æ2æ2&æ2æ2æ2æ2æ2æ2î6î6æ2æ2æ2îïïïïïïïïïêÞ2äï÷÷÷÷÷÷÷÷÷ëÞ2ì÷&ç2ç2&&ç2×7ç2&&ç2ç2&ç2æ2æ2îæ2æ2æ2æ2æ2îæ2æ2æ2ç2ò3æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2ç2æ2æ2îæ2æ2æ2æ2æ2îæ2æ2æ2&æ2æ2îîæ2æ2æ2îîæ2æ2î \ No newline at end of file diff --git a/data/layouts/MtPyre_Exterior/border.bin b/data/layouts/MtPyre_Exterior/border.bin new file mode 100644 index 000000000..1d7df4a00 Binary files /dev/null and b/data/layouts/MtPyre_Exterior/border.bin differ diff --git a/data/layouts/MtPyre_Exterior/layout.inc b/data/layouts/MtPyre_Exterior/layout.inc new file mode 100644 index 000000000..2f81759d7 --- /dev/null +++ b/data/layouts/MtPyre_Exterior/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MtPyre_Exterior_MapBorder:: + .incbin "data/layouts/MtPyre_Exterior/border.bin" + + .align 2 +MtPyre_Exterior_MapBlockdata:: + .incbin "data/layouts/MtPyre_Exterior/map.bin" + + .align 2 +MtPyre_Exterior_Layout:: + .4byte 0x26 + .4byte 0x33 + .4byte MtPyre_Exterior_MapBorder + .4byte MtPyre_Exterior_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/layouts/MtPyre_Exterior/map.bin b/data/layouts/MtPyre_Exterior/map.bin new file mode 100644 index 000000000..7ab1e0461 Binary files /dev/null and b/data/layouts/MtPyre_Exterior/map.bin differ diff --git a/data/layouts/MtPyre_Summit/border.bin b/data/layouts/MtPyre_Summit/border.bin new file mode 100644 index 000000000..1d7df4a00 Binary files /dev/null and b/data/layouts/MtPyre_Summit/border.bin differ diff --git a/data/layouts/MtPyre_Summit/layout.inc b/data/layouts/MtPyre_Summit/layout.inc new file mode 100644 index 000000000..4f30ac9e1 --- /dev/null +++ b/data/layouts/MtPyre_Summit/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MtPyre_Summit_MapBorder:: + .incbin "data/layouts/MtPyre_Summit/border.bin" + + .align 2 +MtPyre_Summit_MapBlockdata:: + .incbin "data/layouts/MtPyre_Summit/map.bin" + + .align 2 +MtPyre_Summit_Layout:: + .4byte 0x32 + .4byte 0x25 + .4byte MtPyre_Summit_MapBorder + .4byte MtPyre_Summit_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/layouts/MtPyre_Summit/map.bin b/data/layouts/MtPyre_Summit/map.bin new file mode 100644 index 000000000..1de8bd5ea Binary files /dev/null and b/data/layouts/MtPyre_Summit/map.bin differ diff --git a/data/layouts/NavelRock_B1F/border.bin b/data/layouts/NavelRock_B1F/border.bin new file mode 100644 index 000000000..423a0732e --- /dev/null +++ b/data/layouts/NavelRock_B1F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/NavelRock_B1F/layout.inc b/data/layouts/NavelRock_B1F/layout.inc new file mode 100644 index 000000000..899aa8eed --- /dev/null +++ b/data/layouts/NavelRock_B1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +NavelRock_B1F_MapBorder:: + .incbin "data/layouts/NavelRock_B1F/border.bin" + + .align 2 +NavelRock_B1F_MapBlockdata:: + .incbin "data/layouts/NavelRock_B1F/map.bin" + + .align 2 +NavelRock_B1F_Layout:: + .4byte 0x17 + .4byte 0xb + .4byte NavelRock_B1F_MapBorder + .4byte NavelRock_B1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_NavelRock diff --git a/data/layouts/NavelRock_B1F/map.bin b/data/layouts/NavelRock_B1F/map.bin new file mode 100644 index 000000000..861fb6575 --- /dev/null +++ b/data/layouts/NavelRock_B1F/map.bin @@ -0,0 +1 @@ +222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222?22GGGGGGGGGGGGGGGGGGGGG \ No newline at end of file diff --git a/data/layouts/NavelRock_Bottom/border.bin b/data/layouts/NavelRock_Bottom/border.bin new file mode 100644 index 000000000..423a0732e --- /dev/null +++ b/data/layouts/NavelRock_Bottom/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/NavelRock_Bottom/layout.inc b/data/layouts/NavelRock_Bottom/layout.inc new file mode 100644 index 000000000..043a977de --- /dev/null +++ b/data/layouts/NavelRock_Bottom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +NavelRock_Bottom_MapBorder:: + .incbin "data/layouts/NavelRock_Bottom/border.bin" + + .align 2 +NavelRock_Bottom_MapBlockdata:: + .incbin "data/layouts/NavelRock_Bottom/map.bin" + + .align 2 +NavelRock_Bottom_Layout:: + .4byte 0x16 + .4byte 0x16 + .4byte NavelRock_Bottom_MapBorder + .4byte NavelRock_Bottom_MapBlockdata + .4byte gTileset_General + .4byte gTileset_NavelRock diff --git a/data/layouts/NavelRock_Bottom/map.bin b/data/layouts/NavelRock_Bottom/map.bin new file mode 100644 index 000000000..af2f8a245 --- /dev/null +++ b/data/layouts/NavelRock_Bottom/map.bin @@ -0,0 +1 @@ +r¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeFGcc¸  pr¢¢ºeFF]ddd[GG¸  pr¢¢ºedde]d[cdd¸  pr¢¢ºeddee{ccdd¸  pr¢¢ºeddeFdGcdd¸  pr¢¢ºedde=ddcdd¸  pr¢¢ºeslmdddkƒt¸  pr¢¢ºee=ddddd‹c¸  pr¢¢ºeed=dddd>c¸  pGGGGGGGGGGGGGGGGGGGGGG \ No newline at end of file diff --git a/data/layouts/NavelRock_Entrance/border.bin b/data/layouts/NavelRock_Entrance/border.bin new file mode 100644 index 000000000..423a0732e --- /dev/null +++ b/data/layouts/NavelRock_Entrance/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/NavelRock_Entrance/layout.inc b/data/layouts/NavelRock_Entrance/layout.inc new file mode 100644 index 000000000..d9a12b71d --- /dev/null +++ b/data/layouts/NavelRock_Entrance/layout.inc @@ -0,0 +1,16 @@ + .align 2 +NavelRock_Entrance_MapBorder:: + .incbin "data/layouts/NavelRock_Entrance/border.bin" + + .align 2 +NavelRock_Entrance_MapBlockdata:: + .incbin "data/layouts/NavelRock_Entrance/map.bin" + + .align 2 +NavelRock_Entrance_Layout:: + .4byte 0x15 + .4byte 0x20 + .4byte NavelRock_Entrance_MapBorder + .4byte NavelRock_Entrance_MapBlockdata + .4byte gTileset_General + .4byte gTileset_NavelRock diff --git a/data/layouts/NavelRock_Entrance/map.bin b/data/layouts/NavelRock_Entrance/map.bin new file mode 100644 index 000000000..6fd5b9fa0 --- /dev/null +++ b/data/layouts/NavelRock_Entrance/map.bin @@ -0,0 +1 @@ +22222222222222222222222222222222222?2222222222222222222222222222222222222222222222222222222222222222222ÜGGGGÒ2222222ÐGGGGGÒ2222ÕÐ222222222222222222222222222222Ù2222Õ22222222222222Õ222222222222222222222222GGXYZGGGGGGGGGGG \ No newline at end of file diff --git a/data/layouts/NavelRock_Exterior/border.bin b/data/layouts/NavelRock_Exterior/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/NavelRock_Exterior/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/NavelRock_Exterior/layout.inc b/data/layouts/NavelRock_Exterior/layout.inc new file mode 100644 index 000000000..b3fc825cf --- /dev/null +++ b/data/layouts/NavelRock_Exterior/layout.inc @@ -0,0 +1,16 @@ + .align 2 +NavelRock_Exterior_MapBorder:: + .incbin "data/layouts/NavelRock_Exterior/border.bin" + + .align 2 +NavelRock_Exterior_MapBlockdata:: + .incbin "data/layouts/NavelRock_Exterior/map.bin" + + .align 2 +NavelRock_Exterior_Layout:: + .4byte 0x15 + .4byte 0x18 + .4byte NavelRock_Exterior_MapBorder + .4byte NavelRock_Exterior_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Dewford diff --git a/data/layouts/NavelRock_Exterior/map.bin b/data/layouts/NavelRock_Exterior/map.bin new file mode 100644 index 000000000..9b3342a1a Binary files /dev/null and b/data/layouts/NavelRock_Exterior/map.bin differ diff --git a/data/layouts/NavelRock_Fork/border.bin b/data/layouts/NavelRock_Fork/border.bin new file mode 100644 index 000000000..423a0732e --- /dev/null +++ b/data/layouts/NavelRock_Fork/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/NavelRock_Fork/layout.inc b/data/layouts/NavelRock_Fork/layout.inc new file mode 100644 index 000000000..0f7956e5e --- /dev/null +++ b/data/layouts/NavelRock_Fork/layout.inc @@ -0,0 +1,16 @@ + .align 2 +NavelRock_Fork_MapBorder:: + .incbin "data/layouts/NavelRock_Fork/border.bin" + + .align 2 +NavelRock_Fork_MapBlockdata:: + .incbin "data/layouts/NavelRock_Fork/map.bin" + + .align 2 +NavelRock_Fork_Layout:: + .4byte 0x1b + .4byte 0x56 + .4byte NavelRock_Fork_MapBorder + .4byte NavelRock_Fork_MapBlockdata + .4byte gTileset_General + .4byte gTileset_NavelRock diff --git a/data/layouts/NavelRock_Fork/map.bin b/data/layouts/NavelRock_Fork/map.bin new file mode 100644 index 000000000..0b314cc16 --- /dev/null +++ b/data/layouts/NavelRock_Fork/map.bin @@ -0,0 +1 @@ +2222222222222222222?22222222222222222222222222222222222222222222GGGGGGGGGGÒ222ÐGGGGGGGGGG2222222222222222222222222222222222222222222222222222222222222222222ÐGGGGGGGGGG22Ð222222222222222222222222222GGGGGGGGGGÒ22Ò2222222222222222222222222222Óáâ2àáÔÓâ2àáÔ2222222222222222222222222GGGGGGGGGGGGGGGG \ No newline at end of file diff --git a/data/layouts/NavelRock_LadderRoom1/border.bin b/data/layouts/NavelRock_LadderRoom1/border.bin new file mode 100644 index 000000000..423a0732e --- /dev/null +++ b/data/layouts/NavelRock_LadderRoom1/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/NavelRock_LadderRoom1/layout.inc b/data/layouts/NavelRock_LadderRoom1/layout.inc new file mode 100644 index 000000000..34ff05e39 --- /dev/null +++ b/data/layouts/NavelRock_LadderRoom1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +NavelRock_LadderRoom1_MapBorder:: + .incbin "data/layouts/NavelRock_LadderRoom1/border.bin" + + .align 2 +NavelRock_LadderRoom1_MapBlockdata:: + .incbin "data/layouts/NavelRock_LadderRoom1/map.bin" + + .align 2 +NavelRock_LadderRoom1_Layout:: + .4byte 0x9 + .4byte 0x8 + .4byte NavelRock_LadderRoom1_MapBorder + .4byte NavelRock_LadderRoom1_MapBlockdata + .4byte gTileset_General + .4byte gTileset_NavelRock diff --git a/data/layouts/NavelRock_LadderRoom1/map.bin b/data/layouts/NavelRock_LadderRoom1/map.bin new file mode 100644 index 000000000..c2951c043 --- /dev/null +++ b/data/layouts/NavelRock_LadderRoom1/map.bin @@ -0,0 +1 @@ +22222222?2GGGGGGGGGGGG \ No newline at end of file diff --git a/data/layouts/NavelRock_LadderRoom2/border.bin b/data/layouts/NavelRock_LadderRoom2/border.bin new file mode 100644 index 000000000..423a0732e --- /dev/null +++ b/data/layouts/NavelRock_LadderRoom2/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/NavelRock_LadderRoom2/layout.inc b/data/layouts/NavelRock_LadderRoom2/layout.inc new file mode 100644 index 000000000..a50a32690 --- /dev/null +++ b/data/layouts/NavelRock_LadderRoom2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +NavelRock_LadderRoom2_MapBorder:: + .incbin "data/layouts/NavelRock_LadderRoom2/border.bin" + + .align 2 +NavelRock_LadderRoom2_MapBlockdata:: + .incbin "data/layouts/NavelRock_LadderRoom2/map.bin" + + .align 2 +NavelRock_LadderRoom2_Layout:: + .4byte 0x9 + .4byte 0x8 + .4byte NavelRock_LadderRoom2_MapBorder + .4byte NavelRock_LadderRoom2_MapBlockdata + .4byte gTileset_General + .4byte gTileset_NavelRock diff --git a/data/layouts/NavelRock_LadderRoom2/map.bin b/data/layouts/NavelRock_LadderRoom2/map.bin new file mode 100644 index 000000000..47dd37b93 --- /dev/null +++ b/data/layouts/NavelRock_LadderRoom2/map.bin @@ -0,0 +1 @@ +?22V22^22fGGGGGGGGGGGG \ No newline at end of file diff --git a/data/layouts/NavelRock_Top/border.bin b/data/layouts/NavelRock_Top/border.bin new file mode 100644 index 000000000..8d839d092 --- /dev/null +++ b/data/layouts/NavelRock_Top/border.bin @@ -0,0 +1 @@ +<<<< \ No newline at end of file diff --git a/data/layouts/NavelRock_Top/layout.inc b/data/layouts/NavelRock_Top/layout.inc new file mode 100644 index 000000000..6e99e9bf4 --- /dev/null +++ b/data/layouts/NavelRock_Top/layout.inc @@ -0,0 +1,16 @@ + .align 2 +NavelRock_Top_MapBorder:: + .incbin "data/layouts/NavelRock_Top/border.bin" + + .align 2 +NavelRock_Top_MapBlockdata:: + .incbin "data/layouts/NavelRock_Top/map.bin" + + .align 2 +NavelRock_Top_Layout:: + .4byte 0x19 + .4byte 0x1c + .4byte NavelRock_Top_MapBorder + .4byte NavelRock_Top_MapBlockdata + .4byte gTileset_General + .4byte gTileset_NavelRock diff --git a/data/layouts/NavelRock_Top/map.bin b/data/layouts/NavelRock_Top/map.bin new file mode 100644 index 000000000..fce085ae6 --- /dev/null +++ b/data/layouts/NavelRock_Top/map.bin @@ -0,0 +1 @@ +<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<PQ3R<<<<<<<<<<<<<<<<<<<<<P2R<<<<<<<<<<<<<<<<<<<P2R<<<<<<<<<<<<<<<<<<X2Z<<<<<<<<<<<<<<<<<<X2Z<<<<<<<<<<<<<<<<<<X2Z<<<<<<<<<<<<<<<<<<X2Z<<<<<<<<<<<<<<<<<<X22222Z<<<<<<<<<<<<<<<<CDp22222rDE<<<<<<<<<<<<CDFLp22222rLGDE<<<<<<<<<CF[\\p22222r\\]GE<<<<<<<CFLcLLp222?22rLLeLGE<<<<<CFL[FLLp22222rLLG]LGE<<DDFL[FLLL“”LLLG]LGDD\\\\F[\\\›œ\\]LG\\\\LL[\\FLLL£ÁÁÁÁÁ¤LLGG]LLLLL[FLLLL[\«lllll¬\]LLG]LLLFFLLLL[FL«lllll¬LG]LLG\\\LLLL[\FLL«lllll¬LLGG]LLLL \ No newline at end of file diff --git a/data/layouts/NewMauville_Entrance/border.bin b/data/layouts/NewMauville_Entrance/border.bin new file mode 100644 index 000000000..4531975c7 Binary files /dev/null and b/data/layouts/NewMauville_Entrance/border.bin differ diff --git a/data/layouts/NewMauville_Entrance/layout.inc b/data/layouts/NewMauville_Entrance/layout.inc new file mode 100644 index 000000000..78e3edee4 --- /dev/null +++ b/data/layouts/NewMauville_Entrance/layout.inc @@ -0,0 +1,16 @@ + .align 2 +NewMauville_Entrance_MapBorder:: + .incbin "data/layouts/NewMauville_Entrance/border.bin" + + .align 2 +NewMauville_Entrance_MapBlockdata:: + .incbin "data/layouts/NewMauville_Entrance/map.bin" + + .align 2 +NewMauville_Entrance_Layout:: + .4byte 0x9 + .4byte 0x9 + .4byte NewMauville_Entrance_MapBorder + .4byte NewMauville_Entrance_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/layouts/NewMauville_Entrance/map.bin b/data/layouts/NewMauville_Entrance/map.bin new file mode 100644 index 000000000..1e3f471e8 --- /dev/null +++ b/data/layouts/NewMauville_Entrance/map.bin @@ -0,0 +1 @@ +t||ÃÄÅ||‰ut©ËÌ2Í©‰suuÐ3Î3Ð3Ï3Ð3ÔsuuÐ3Ð3Ð3Ð3Ð3ÔsuuÐ3Ð3Ð3Ð3Ð3ÔsuuÐ3Ð3Ð3Ð3Ð3ÔsuuÐ3Ð3Ç3Ð3Ð3Ôsu¿ÖÑÒÓÖ¾s¿lllllll¾ \ No newline at end of file diff --git a/data/layouts/NewMauville_Inside/border.bin b/data/layouts/NewMauville_Inside/border.bin new file mode 100644 index 000000000..064786e8c --- /dev/null +++ b/data/layouts/NewMauville_Inside/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/NewMauville_Inside/layout.inc b/data/layouts/NewMauville_Inside/layout.inc new file mode 100644 index 000000000..d7dbe6a62 --- /dev/null +++ b/data/layouts/NewMauville_Inside/layout.inc @@ -0,0 +1,16 @@ + .align 2 +NewMauville_Inside_MapBorder:: + .incbin "data/layouts/NewMauville_Inside/border.bin" + + .align 2 +NewMauville_Inside_MapBlockdata:: + .incbin "data/layouts/NewMauville_Inside/map.bin" + + .align 2 +NewMauville_Inside_Layout:: + .4byte 0x29 + .4byte 0x29 + .4byte NewMauville_Inside_MapBorder + .4byte NewMauville_Inside_MapBlockdata + .4byte gTileset_General + .4byte gTileset_BikeShop diff --git a/data/layouts/NewMauville_Inside/map.bin b/data/layouts/NewMauville_Inside/map.bin new file mode 100644 index 000000000..78d1e39ce --- /dev/null +++ b/data/layouts/NewMauville_Inside/map.bin @@ -0,0 +1 @@ +h¨·jh™šjp'°±'''¿'××Örp×'¡¢ÔÕ'ÐÑÒÓÖ×ÔÕrpu2¸2¹2u2/2/2Ç6/2ï2ß2Þ2Œ¶‹ß2u2©2ª2Ü6Ýu2ØÙÚÛÞ2ß2Ü6Ý6rp}2Ž272727272Ï672722…2”'''''¾''“}2222ä6å6}2à6á6â6ã6}2È2ä6å6rp}2–'''''''•}22/2/2/2/2/2Æ6/2/2/2~22222/2~2è6é6ê6ë6}222/2rh‹}2Œ™šjp}2Ž27272727272Î672722…22222222/2/2/2~2222rp'³“}2”¡¢rp}2–''''''''•}22222222>22222ÁÀrpu2»2/2~22©2ª2rh‹}2Œ™šjp}22Á22222222Á2ÀÀr‰y2o22…2ž2o272ŠpÖ“}2”'¡¢rxy27272727272727272727272727272zp'w¥}2¦w'rpÞ2/2~22/2©2ª2r€'''''''''''''''‚pu2/2/2~22/2/2rp}262222.22rp}2.2222622rxy2727272727272z‰y2722…2ž27272Š€'''''''‚pÔÕ¥}2¦''rh¨™ˆjpÜ6Ý6u2~22/2/2rp'°±''Ö²¡'ÔÕÖ×rpä6å6}22222rpu2¸2¹2u2/2î2Ä2©2u2Ü6Ý6Þ2ß2rpu2/2~22222Œ·‹}22222222˜}2ä6å6}22rp}2Á22222”'¿“}22222222 }22/2~22rpÃ22£2¤2222/2Ç6/2~222222222~2222.2rpÂX62«6¬622Ž272Ï62…22ž272727272’272o27272o272ŠpÂÁX62È222–''•}22¦'''''w''Ö×r‰y2o272o272o272Šp}222/2/2/2/2u2/2/2/2î2ß2rŸ¨§p'w'w³w´rp}22226222}222222Œ¶`'´´'°±ajpu2/2/2/2»2/2¼2rp}222222Á}222222”'¾“u2¼2½2/2¸2¹2”'''rp}2Á2ÁÀÁÀŒ¶‹—2722…2ž27272‘‡22…22222/2Æ6/2~2222222/2/2/2rpÃ6222ÁÀÀ”'¾“¦'¥}2¦³´'¥}2222Ž272Î62…222222Ž2722…2rpÃÀ2622222/2Æ6/2/2/2/2~22»2¼2˜u2/2~2222–''•}222222–'•}2rpÂÀ22222Ž272Î62…2À22222 }222222rxy27272727272zp}2rpÂÀ222ÀÀ–''•}2ÀÁ22222~222222r€''''''‚p}2rxy22…22Ž27272zxy272727272727272727272727272zp}2r€'•}22–''‚€''''''''''''''‚p}2rp}22rp}2rp}22rh™šˆjh™š\n]™š§p}2rp}22rp¡¢'³²³rp¡¢²´“v2”¡¢a¶‹}2rp}22Œ‹µ2ª2u2»2º2»2Œ·‹µ2ª2º2¼2/2/2/2©2ª2”¾“}2rp}22”'³³²³''“}22˜}2222”'¿''“}2222222222Æ6/2~2rp}222/2»2»2º2»2/2/2/2~22 }2.2222/2Ç6/2/2/2~2222ž2o2727272Ž2Î67272zxy27272727272727272722…222~2222Ž272Ï672722…2222¦w´´'–'''‚€''''''''''•}2222222–''''•}222622/2¼2½2/2rxy2727272727272zxy27272727272727272z€'''''''‚€'''''''''‚ \ No newline at end of file diff --git a/data/layouts/OldaleTown/border.bin b/data/layouts/OldaleTown/border.bin new file mode 100644 index 000000000..03bcafef1 --- /dev/null +++ b/data/layouts/OldaleTown/border.bin @@ -0,0 +1 @@ +ÔÕÜÝ \ No newline at end of file diff --git a/data/layouts/OldaleTown/layout.inc b/data/layouts/OldaleTown/layout.inc new file mode 100644 index 000000000..7d266cfba --- /dev/null +++ b/data/layouts/OldaleTown/layout.inc @@ -0,0 +1,16 @@ + .align 2 +OldaleTown_MapBorder:: + .incbin "data/layouts/OldaleTown/border.bin" + + .align 2 +OldaleTown_MapBlockdata:: + .incbin "data/layouts/OldaleTown/map.bin" + + .align 2 +OldaleTown_Layout:: + .4byte 0x14 + .4byte 0x14 + .4byte OldaleTown_MapBorder + .4byte OldaleTown_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Petalburg diff --git a/data/layouts/OldaleTown/map.bin b/data/layouts/OldaleTown/map.bin new file mode 100644 index 000000000..28b17c441 --- /dev/null +++ b/data/layouts/OldaleTown/map.bin @@ -0,0 +1 @@ +ÔÕÔÕÔÕÔÕ0Ð1Ò10ÔÕÔÕÔÕÔÕÜÝÜÝäåäçÐ1Ù1Ú10æåäåÜÝÜÝÔÕÔÕ0000Ø1Ù1Ù1Ò10000ÔÕÔÕÜÝäç0000Ø1Ù1Ù1Ú10(0)0)0…åÜÝÔÕ00l2m2m2n2Ø1Ù1Ù1Ú1001230ÔÕÜÝ00tuuvØ1Ù1Ù1Ù1Ò189:;0ÜÝÔÕ00|}~Ø1Ù1Ù1Ù1Ú1`ABC0ÔÕÜÝ00„‡†Ø1á1á1á1Ù1Ñ1Ñ1Ñ1Ñ1Ò1æåÔÕ000Ð1Ñ1Ñ1Ú1000Ø1Ù1Ù1Ù1Ù1Ù1Ò10äç0Ð1Ñ1Ù1Ù1Ù1Ú100Ø1Ù1Ù1Ù1Ù1Ù1â1020Ð1Ù1Ù1Ù1Ù1Ù1Ú1000Ø1Ù1Ù1Ù1Ù1â1002Ï1à1á1á1Ù1Ù1Ù1Ù1Ñ1Ñ1Ñ1Ù1Ù1Ù1á1â10Î1Ï1Ô×000à1á1Ù1Ù1Ù1Ù1Ù1Ù1Ù1Ú1000ÖÕÜÝ000H0I0‚2ƒ2Ù1Ù1Ù1Ù1á1l2m2m2n2ÜÝÔÕ000PQRSÙ1Ù1Ù1Ú10tuuvÔÕÜÝÎ1Ï10XYZ[Ø1Ù1Ù1Ú10|}~ÜÝÔÕÔ×0`abcØ1Ù1Ù1â10„‡†ÔÕÜÝÜÝ000Ð1Ñ1Ù1Ù1Ú10000Î1Ï1ÜÝÔÕÔÕ000Ø1Ù1Ù1Ù1Ú10000ÖÕÔÕÜÝÜÝÎ1Ï1Î1x2Ù1Ù1Ù1â1Î1Ï1Î1Ï1ÜÝÜÝ \ No newline at end of file diff --git a/data/layouts/PacifidlogTown/border.bin b/data/layouts/PacifidlogTown/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/PacifidlogTown/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/PacifidlogTown/layout.inc b/data/layouts/PacifidlogTown/layout.inc new file mode 100644 index 000000000..a87de7036 --- /dev/null +++ b/data/layouts/PacifidlogTown/layout.inc @@ -0,0 +1,16 @@ + .align 2 +PacifidlogTown_MapBorder:: + .incbin "data/layouts/PacifidlogTown/border.bin" + + .align 2 +PacifidlogTown_MapBlockdata:: + .incbin "data/layouts/PacifidlogTown/map.bin" + + .align 2 +PacifidlogTown_Layout:: + .4byte 0x14 + .4byte 0x28 + .4byte PacifidlogTown_MapBorder + .4byte PacifidlogTown_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/layouts/PacifidlogTown/map.bin b/data/layouts/PacifidlogTown/map.bin new file mode 100644 index 000000000..02c1454bb --- /dev/null +++ b/data/layouts/PacifidlogTown/map.bin @@ -0,0 +1,6 @@ +qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqt||‰qqqqqqqqqqqqqt||}‰q{‰qqqqqqqqqqt|}qqq{‰q{y|||||||||}qqt||‰{|©©©‰qqqqqqt©||}qt{©©©©‰{y|||||}t©©©|}‰‰‰‰{©©©©©©©©}€‰‰‰‰pppš‰‰‰‰‰‰‰‰‰‰˜ppuv  +  pppppppppppp}~22ppppppppp  +  p22pp0123ppp22p2!2!2!22pPQRS p22p 2!2!2!2$2p2XYZ[2p 2!2!2!2$2p())*2,p2HabK2p()*2),ppX2p2!2!2!22pX2ppp`2P2Q2 2!2!2!2!2$2P2Q2P2Q2`2pp()*2)),pppppppppppppX2ppppp  +  p  +  pp`2ppppp22p22ppX2pppp22p22pp`2p  +   2!2!2!2$2p 2!2!2!2$2ppX2p22()*2),()*2),`2p22ppX2ppppX2ppppX2p 2!2!2!2$2pp`2ppppp`2P2Q2P2Q2`2p()*2),ppX2ppppppppX2P2Q2P2Q2P2Q2P2Q2`2pppppppp`2pppppppppppuvpppppppppppppppppp}~ppppppppppppppuvppppr{{{{{{{{{{{{t}~pp{{´qqqqklllllmq´{{{{qqqqkll¾qqqqq¿lllmqqkll¾¾qqqqqqqqqqqq¿ll¾qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq \ No newline at end of file diff --git a/data/layouts/PacifidlogTown_House1/border.bin b/data/layouts/PacifidlogTown_House1/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/PacifidlogTown_House1/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/PacifidlogTown_House1/layout.inc b/data/layouts/PacifidlogTown_House1/layout.inc new file mode 100644 index 000000000..16f9402ca --- /dev/null +++ b/data/layouts/PacifidlogTown_House1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +PacifidlogTown_House1_MapBorder:: + .incbin "data/layouts/PacifidlogTown_House1/border.bin" + + .align 2 +PacifidlogTown_House1_MapBlockdata:: + .incbin "data/layouts/PacifidlogTown_House1/map.bin" + + .align 2 +PacifidlogTown_House1_Layout:: + .4byte 0xa + .4byte 0x9 + .4byte PacifidlogTown_House1_MapBorder + .4byte PacifidlogTown_House1_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/PacifidlogTown_House1/map.bin b/data/layouts/PacifidlogTown_House1/map.bin new file mode 100644 index 000000000..7865fdc7c --- /dev/null +++ b/data/layouts/PacifidlogTown_House1/map.bin @@ -0,0 +1 @@ +‘´µ‘‘‘‘—’˜¨¼½™™¸¹Ÿš 3°3Ä3Å3¡3·7À3Á3§3¢3¡3”3•3•3•3•3•3•3–3£3¡3œ33®3ª«¯33ž3£3·7œ33®3²³¯33ž3£3¡3¤3¥3¥3¥3¥3¥3¥3¦3£3·7£3£3£3£3£3£3£3£3£3æ7£3£3£3¬­£3£3£3ç7 \ No newline at end of file diff --git a/data/layouts/PacifidlogTown_House2/border.bin b/data/layouts/PacifidlogTown_House2/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/PacifidlogTown_House2/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/PacifidlogTown_House2/layout.inc b/data/layouts/PacifidlogTown_House2/layout.inc new file mode 100644 index 000000000..deb111059 --- /dev/null +++ b/data/layouts/PacifidlogTown_House2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +PacifidlogTown_House2_MapBorder:: + .incbin "data/layouts/PacifidlogTown_House2/border.bin" + + .align 2 +PacifidlogTown_House2_MapBlockdata:: + .incbin "data/layouts/PacifidlogTown_House2/map.bin" + + .align 2 +PacifidlogTown_House2_Layout:: + .4byte 0xa + .4byte 0x9 + .4byte PacifidlogTown_House2_MapBorder + .4byte PacifidlogTown_House2_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/PacifidlogTown_House2/map.bin b/data/layouts/PacifidlogTown_House2/map.bin new file mode 100644 index 000000000..617346322 --- /dev/null +++ b/data/layouts/PacifidlogTown_House2/map.bin @@ -0,0 +1 @@ +º»´µ‘‘“‘’˜ÆǼ½™™©š 3Â3Ã3Ä3Å3¡3¡3›3±3¢3·7”3•3•3•3•3•3•3–3£3·7œ333ª«¯33ž3£3¡3œ33®3²³33ž3£3¡3¤3¥3¥3¥3¥3¥3¥3¦3£3¡3£3£3£3£3£3£3£3£3£3æ7£3£3£3¬­£3£3£3ç7 \ No newline at end of file diff --git a/data/layouts/PetalburgCity/border.bin b/data/layouts/PetalburgCity/border.bin new file mode 100644 index 000000000..03bcafef1 --- /dev/null +++ b/data/layouts/PetalburgCity/border.bin @@ -0,0 +1 @@ +ÔÕÜÝ \ No newline at end of file diff --git a/data/layouts/PetalburgCity/layout.inc b/data/layouts/PetalburgCity/layout.inc new file mode 100644 index 000000000..c458140a9 --- /dev/null +++ b/data/layouts/PetalburgCity/layout.inc @@ -0,0 +1,16 @@ + .align 2 +PetalburgCity_MapBorder:: + .incbin "data/layouts/PetalburgCity/border.bin" + + .align 2 +PetalburgCity_MapBlockdata:: + .incbin "data/layouts/PetalburgCity/map.bin" + + .align 2 +PetalburgCity_Layout:: + .4byte 0x1e + .4byte 0x1e + .4byte PetalburgCity_MapBorder + .4byte PetalburgCity_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Petalburg diff --git a/data/layouts/PetalburgCity/map.bin b/data/layouts/PetalburgCity/map.bin new file mode 100644 index 000000000..35f0172ca --- /dev/null +++ b/data/layouts/PetalburgCity/map.bin @@ -0,0 +1,4 @@ +ÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÜÝÜÝUNMNMNVòóòóòóòóåäåäåäåÜÝÜÝÔÕÔÕD    +FÔÕÔÕÔÕÔÕ000°±±²ÔÕÔÕÜÝÜÝLLæ5åäåäåäç5°±±À¡¡ºÜÝÜÝÔÕÔÕT  L?ª««««¬?¸¡¡¡¡¡ºÔÕÔÕÜÝÜÝ0 !"LL²³³³³´L¸¡¡¡¡¡ºÜÝÜÝÔÕÔÕ001100LL¸¹º³»¼L¸¡¡¡¡¡ºÔÕÔÕÜÝÜÝ00 1"100LLÀÁÂÅÃÄL¸¡¡¡¡¡ºÜÝÜÝÔÕÔÕ00 1"10<2fLÈ1É1ÊÍËÌ1L¸¡¡¡¡¡ºÔÕÔÕÜÝä5ç500 1"1deT0011101T00000P2Q2XYÜÝÔÕ0000 1"1000000 1!1"110000000123ÔÕæ5ç50000 1"1000000 1!1"1000000089:;ÜÝ001111!1!1111111!1!1"10000000`ABCÔÕÎ1Ï1(1)1)1)1)1R2S2)1)1)1)1)1)1!1"100H0I0J0K000110ÜÝÔ×°±±±²Ö×000000 1"100PQRS00 1"10ÔÕÜݸ¡¡¡ºÜÝ000000 1"100XYZ[00 1"10æ5åÔÕ¸¡¡¡ºÔÕ0 0 0 +000 1"10`abc00 1"1000Üݸ¡¡¡ºÜÝ00 1!111111111!1!1100ÔÕ¸¡¡¡ºÔÕ 00 1!1)1)1)1)1)1)1)1)1)1)1*100Üݸ¡¡¡ºæ5ç5 !"00 1"1000000000Î1Ï1Î1Ï1ÔÕ¸¡¡¡º00020000 1"10<2=2=2=2=2=2=2>2ÖÕÔÕÜݸ¡¡¡º00000000 1"10D   +EEFÜÝÜÝÔÕ¸¡¡¡º00000000 1"10LLÔÕÔÕÜݸ¡¡¡Â±±±±²Î1Ï10 1"10T LÜÝÜÝÔÕ¸¡¡¡¡¡¡¡¡ºÖ×0 1"100 !"00LÔÕÔÕÜݸ¡¡¡¡¡¡¡¡ºÜÝ0 1!111111000LÜÝÜÝÔÕ¸¡¡¡¡¡¡¡¡ºÔÕ0(1)1)1)1)1)1*1000TÔÕÔÕÜݸ¡¡þÿþÿþÿºÜÝÎ1Ï1Î1Ï1Î1Ï1Î1Ï1Î1Ï1Î1Ï1ÜÝÜÝÔÕ000üýüýüý0ÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÜÝÎ1Ï1Î1óòóòóòÏ1ÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝ \ No newline at end of file diff --git a/data/layouts/PetalburgCity_Gym/border.bin b/data/layouts/PetalburgCity_Gym/border.bin new file mode 100644 index 000000000..064786e8c --- /dev/null +++ b/data/layouts/PetalburgCity_Gym/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/PetalburgCity_Gym/layout.inc b/data/layouts/PetalburgCity_Gym/layout.inc new file mode 100644 index 000000000..974b95baf --- /dev/null +++ b/data/layouts/PetalburgCity_Gym/layout.inc @@ -0,0 +1,16 @@ + .align 2 +PetalburgCity_Gym_MapBorder:: + .incbin "data/layouts/PetalburgCity_Gym/border.bin" + + .align 2 +PetalburgCity_Gym_MapBlockdata:: + .incbin "data/layouts/PetalburgCity_Gym/map.bin" + + .align 2 +PetalburgCity_Gym_Layout:: + .4byte 0x9 + .4byte 0x70 + .4byte PetalburgCity_Gym_MapBorder + .4byte PetalburgCity_Gym_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_PetalburgGym diff --git a/data/layouts/PetalburgCity_Gym/map.bin b/data/layouts/PetalburgCity_Gym/map.bin new file mode 100644 index 000000000..17d5ba980 --- /dev/null +++ b/data/layouts/PetalburgCity_Gym/map.bin @@ -0,0 +1,10 @@ +()() +01  01 2*234567*22 222;<=>?222 222222222 222222222 222222222 222222222 +        222222222 2A2B2C2D2E2F2G22 2I2J2K2L2M2N2O22 2Q2R2S2T2U2V2W22 2Y2Z2[2\2]2^2_22 222222222 +        222222222 2A2B2C2D2E2F2G22 2I2J2K2L2M2N2O22 2Q2R2S2T2U2V2W22 2Y2Z2[2\2]2^2_22 222222222 +        222222222 2ABCDEFG2 2IJKLMNO2 2QRSTUVW2 2YZ[\]^_2 222222222 +        222222222 2ÁÂÃÄÅÆÇ2 2ÉÊËÌÍÎÏ2 2ÑÒÓÔÕÖ×2 2ÙÚÛÜÝÞß2 222222222 +        222222222 2¡¢£¤¥¦§2 2©ª«¬­®¯2 2±²³´µ¶·2 2¹º»¼½¾¿2 222222222 +        222222222 2ÁÂÃÄÅÆÇ2 2ÉÊËÌÍÎÏ2 2ÑÒÓÔÕÖ×2 2ÙÚÛÜÝÞß2 222222222 +        222222222 2¡¢£¤¥¦§2 2©ª«¬­®¯2 2±²³´µ¶·2 2¹º»¼½¾¿2 222222222P ° +  X¨¸    222222222,++++++++,++++++++,@+++++@2+,H++++H2,2+00+22 \ No newline at end of file diff --git a/data/layouts/PetalburgWoods/border.bin b/data/layouts/PetalburgWoods/border.bin new file mode 100644 index 000000000..03bcafef1 --- /dev/null +++ b/data/layouts/PetalburgWoods/border.bin @@ -0,0 +1 @@ +ÔÕÜÝ \ No newline at end of file diff --git a/data/layouts/PetalburgWoods/layout.inc b/data/layouts/PetalburgWoods/layout.inc new file mode 100644 index 000000000..6ee24ef31 --- /dev/null +++ b/data/layouts/PetalburgWoods/layout.inc @@ -0,0 +1,16 @@ + .align 2 +PetalburgWoods_MapBorder:: + .incbin "data/layouts/PetalburgWoods/border.bin" + + .align 2 +PetalburgWoods_MapBlockdata:: + .incbin "data/layouts/PetalburgWoods/map.bin" + + .align 2 +PetalburgWoods_Layout:: + .4byte 0x30 + .4byte 0x2c + .4byte PetalburgWoods_MapBorder + .4byte PetalburgWoods_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Rustboro diff --git a/data/layouts/PetalburgWoods/map.bin b/data/layouts/PetalburgWoods/map.bin new file mode 100644 index 000000000..a032b4c43 --- /dev/null +++ b/data/layouts/PetalburgWoods/map.bin @@ -0,0 +1 @@ +ÔÕÔÕÔÕÔÕÔÕÔÕÜÝÜÝÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÜÝÜÝÜÝÜÝÜÝÜÝÔÕÔÕÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÔÕÔÕÔÕÔÕÔÕÔÕÜÝÜÝÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÜÝÜÝÜÝÜÝÜÝÜÝÔÕÔÕÜÝÜÝÜÝÜÝÜÝÜÝÜÝäåäåäåäåäåäåÜÝÜÝÔÕÔÕÔÕÔÕÔÕÔÕäçæåÔÕÔÕÔÕÔÕÔÕÔÕÔÕ000000 0 0 0 0 0 0ÔÕÔÕÜÝÜÝÜÝÜÝÜÝÜÝIIIIÜÝÜÝÜÝÜÝäòóòóç00000Æ1Ç1Æ1Ç1 0 0 0æåÜÝÔÕÔÕÔÕÔÕÔÕÔÕ000000ÔÕÔÕÔÕÔÕ0ÔÕÔÕ000000Ö5Õ5Ô5×5 0 0 000ÔÕÜÝÜÝäåäåäåäç000000ÜÝÜÝÜÝäç0æåäç000000ÜÝÜÝ 0 0000ÜÝÔÕÔÕ000 0 0 0 04000000ÔÕÔÕÔÕ 0 0000000 0 0 000ÔÕÔÕÕ‡‡‡ÖÔÕÜÝÜÝ0 0 0 0 0 0 00000000æåäåäç 0 0 00Î1Ï1Æ1Ç1Æ1Ç1 0 00æåäç00000ÜÝÔÕÔÕ 0 0 0 0 0 0 00000000000 0 0 0 0 0 0 0Ö5Õ5Ô5Õ5Ô5×5 0 0 000000000 0ÔÕÜÝÜÝ 0 0 0 0Æ1Ç1Î1Ï1Î1Ï10000Î1Ï1Î1Ï1Æ1Ç1Æ1Ç1Æ1Ç1ÜÝÜÝÜÝÆ1Ç1Æ1Ç1Î1Ï10000 0 0ÜÝÔÕÔÕ0 0 0 0Ö5Õ5Ô5Õ5Ô5×50000Ö5Õ5Ô5Õ5Ô5Õ5Ô5Õ5Ô5Õ5ÔÕÔÕÔÕÔÕ5Ô5Õ5Ô5×5000 0 0 0ÔÕÜÝÜÝ0000ÜÝÜÝÜÝ0000æòóòóòóòóòóòóòóòóòóòóòÏ100 0 0 0ÜÝÔÕÔÕ0000ÔÕÔÕÔÕÕ‡‡‡ÖÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔ×500 0 0 0ÔÕÜÝÜÝ000 0æåäåäç00000æåäåäåäåäòóòóòóòóòóòóòÏ10 0 0 0ÜÝÔÕÔÕ0 0 0 0 0 0 000000000000000000ÔÕÔÕÔÕÔÕÔÕÔÕÔ×50 0 0 0ÔÕÜÝÜÝ 0 0 0 0 0 0 0000000 0 0 0 00000000ÜÝÜÝÜÝÜÝÜÝÜÝÜÝ00 0 0ÜÝÔÕÔÕ 0 0 0 0 0 0 000000 0 0 0 0 0 0 0 0 0000ÔÕÔÕÔÕÔÕÔÕÔÕÔÕ000 0ÔÕÜÝÜÝÎ1Ç1Æ1Ç1Æ1Ç1Î1Ï10000Æ1Ç1Æ1Ç1Æ1Ç1Æ1Ç1Æ1Ç100ÜÝÜÝÜÝäåÜÝÜÝÜÝ0000ÜÝÔÕÔÕÔ5Õ5Ô5Õ5Ô5Õ5Ô5×50000Ö5Õ5Ô5Õ5Ô5Õ5Ô5Õ5Ô5×500ÔÕÔÕÔÕ00ÔÕÔÕÔÕÕ‡‡ÖÔÕÜÝÜÝÜÝÜÝÜÝÜÝ0000ÜÝÜÝÜÝÜÝÜÝ00ÜÝÜÝäç00æåÜÝÜÝ 0000ÜÝÔÕÔÕÔÕÔÕÔÕÔÕÕ‡‡ÖÔÕÔÕÔÕÔÕÔÕ00ÔÕÔÕ 000000ÔÕÔÕ 0 000ÔÕÜÝÜÝÜÝäåäåäç0000æåäåäåäåäç00ÜÝÜÝ 000000æåäç 0 0 00ÜÝÔÕÔÕÔÕ000000000000 0 0 0 0 0 0 0 000ÔÕÔÕ 0 0000000 0 0 0 0 00ÔÕÜÝÜÝäç 0 0 00000000000 0 0 0 0 0 0000ÜÝÜÝ 0 0 00Î1Ï10 0 0 0 0 0 0 0ÜÝÔÕÔÕ0 0 0 0 0 0 0 0 0000000000000000ÔÕÔÕ 0 0 0 0Ö5×50 0 0 0 0 0 0 0ÔÕÜÝÜÝ 0 0 0 0 0 0Æ1Ç1Æ1Ç1Î1Ï1000000Î1Ï1Î1Ï1Î1Ï1ÜÝÜÝ 0 0 0 0ÜÝÎ1Ç1 0 0 0 0Æ1Ç1ÜÝÔÕÔÕ 0 0 0 0 0 0Ö5ÕÔÕÔ5×5000000Ö5Õ5Ô5Õ5Ô5Õ5ÔÕÔÕ 0 0 0 0ÔÕÔ×5 0 0 0 0Ö5ÕÔÕÜÝÜÝ 0 0 0 0 0 0ÜÝÜÝÜÝ000000ÜÝÜÝÜÝÜÝÜÝ0 0 0 0ÜÝÜÝÎ1Ç1Æ1Ç1ÜÝÜÝÔÕÔÕ 0 0 0 0 0 0ÔÕÔÕÔÕÕ‡‡‡‡ÖÔÕÔÕÔÕÔÕÔÕ000 0ÔÕÔÕÔÕÔÕÔÕÔÕÜÝÜÝ 0 0 0 0 0 0æåäåäç000000æåäåÜÝÜÝÜÝ0000ÜÝÜÝÜÝÜÝÜÝÜÝÔÕÔÕ0 0 0 0 0 0 0 0 0 040000000 0 0 0 0ÔÕÔÕÔÕÕ‡‡ÖÔÕÔÕÔÕÔÕÔÕÔÕÜÝÜÝÎ1Ï10 0 0 0 0 0 000000000 0 0 0 0 0æåäåäç0000æåäåäåÜÝÜÝÜÝÔÕÔÕÔ×5000000000000000 0 0 0 0 0 0 000000000 0 0 0 0 0 0ÔÕÔÕÔÕÜÝÜÝÜÝÎ1Ï1Î1Ï1Î1Ï1Î1Ï1000000Î1Ç1Æ1Ç1Æ1Ç1Æ1Ï1Î1Ï1Î1Ï1Î1Ï1000 0 00 0 0ÜÝÜÝÜÝÔÕÔÕÔÕÔÕÔÕÔÕÔ×5000000Ö5ÕÔÕÔÕÔÕÔÕÔÕÔ×5000 0 0 0 0 0ÔÕÔÕÔÕÜÝÜÝÜÝÜÝÜÝÜÝÜÝ000000ÜÝÜÝÜÝÜÝÜÝÜÝÜÝ0000 0 0Æ1Ç1ÜÝÜÝÜÝÔÕÔÕÔÕÔÕÔÕÔÕÔÕIIIIÔÕÔÕÔÕÔÕÔÕÔÕÔÕIIIIÖ5ÕÔÕÔÕÔÕÜÝÜÝÜÝÜÝÜÝÜÝÜÝÎÏÎÏÜÝÜÝÜÝÜÝÜÝÜÝÜÝÎÏÎÏÜÝÜÝÜÝÜÝÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔ×ÖÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔ×ÖÕÔÕÔÕÔÕÔÕÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝ \ No newline at end of file diff --git a/data/layouts/PokemonCenter_1F/border.bin b/data/layouts/PokemonCenter_1F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/PokemonCenter_1F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/PokemonCenter_1F/layout.inc b/data/layouts/PokemonCenter_1F/layout.inc new file mode 100644 index 000000000..4d299d407 --- /dev/null +++ b/data/layouts/PokemonCenter_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +PokemonCenter_1F_MapBorder:: + .incbin "data/layouts/PokemonCenter_1F/border.bin" + + .align 2 +PokemonCenter_1F_MapBlockdata:: + .incbin "data/layouts/PokemonCenter_1F/map.bin" + + .align 2 +PokemonCenter_1F_Layout:: + .4byte 0xe + .4byte 0x9 + .4byte PokemonCenter_1F_MapBorder + .4byte PokemonCenter_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_PokemonCenter diff --git a/data/layouts/PokemonCenter_1F/map.bin b/data/layouts/PokemonCenter_1F/map.bin new file mode 100644 index 000000000..5201dde15 --- /dev/null +++ b/data/layouts/PokemonCenter_1F/map.bin @@ -0,0 +1 @@ + ij   JK   qrH"#RSI22y2z2P*+2[Q$2222 2&2422X!!!Y<222'2 2222`2l2m2n2o22%222'2€22222021222322222'2ˆ6‰B228292:2;2242=>'22‘2222@2A2B2C22&2EF'2(2222222222&24276 \ No newline at end of file diff --git a/data/layouts/PokemonCenter_2F/border.bin b/data/layouts/PokemonCenter_2F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/PokemonCenter_2F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/PokemonCenter_2F/layout.inc b/data/layouts/PokemonCenter_2F/layout.inc new file mode 100644 index 000000000..cc2aba89a --- /dev/null +++ b/data/layouts/PokemonCenter_2F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +PokemonCenter_2F_MapBorder:: + .incbin "data/layouts/PokemonCenter_2F/border.bin" + + .align 2 +PokemonCenter_2F_MapBlockdata:: + .incbin "data/layouts/PokemonCenter_2F/map.bin" + + .align 2 +PokemonCenter_2F_Layout:: + .4byte 0xe + .4byte 0xa + .4byte PokemonCenter_2F_MapBorder + .4byte PokemonCenter_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_PokemonCenter diff --git a/data/layouts/PokemonCenter_2F/map.bin b/data/layouts/PokemonCenter_2F/map.bin new file mode 100644 index 000000000..c623d86fc --- /dev/null +++ b/data/layouts/PokemonCenter_2F/map.bin @@ -0,0 +1 @@ +  ? \  ?\  ?Gd6Gd6GØÙÙ¦Ï2ÍÏO2ÍÏOb2Öàà×]Õ×Û]Õ×Ú/2 2l2l2¶2a2¿2l2ã<¿2l2â/2˜2™222Ê2Ë2Ì22g2È2É22g2D ¡B2Ò2Ó2Ô222Ð2Ñ222'2¨2©222222222222'2 22222^2^222^2^222'2(622422ff42&2ff&24276 \ No newline at end of file diff --git a/data/layouts/RecordCorner/border.bin b/data/layouts/RecordCorner/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/RecordCorner/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/RecordCorner/layout.inc b/data/layouts/RecordCorner/layout.inc new file mode 100644 index 000000000..ab18faa0d --- /dev/null +++ b/data/layouts/RecordCorner/layout.inc @@ -0,0 +1,16 @@ + .align 2 +RecordCorner_MapBorder:: + .incbin "data/layouts/RecordCorner/border.bin" + + .align 2 +RecordCorner_MapBlockdata:: + .incbin "data/layouts/RecordCorner/map.bin" + + .align 2 +RecordCorner_Layout:: + .4byte 0x14 + .4byte 0xa + .4byte RecordCorner_MapBorder + .4byte RecordCorner_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_CableClub diff --git a/data/layouts/RecordCorner/map.bin b/data/layouts/RecordCorner/map.bin new file mode 100644 index 000000000..51dfb6e5a --- /dev/null +++ b/data/layouts/RecordCorner/map.bin @@ -0,0 +1 @@ +‘———”••–———’“˜™ŸŸŸœžŸŸŸš› ¡2§2§2§2¤2¥2¥2¦2§2§2§2¢2£¨©2Ä2Ä2´2Ä2Ä2Ä2Ä2¶2Ä2Ä2ª2«¨©2Ä2¬2¼¸¹º»¾®2Ä2ª2«¨©2Ä2Ä2µ2ÀÁÂ÷2Ä2Ä2ª2«¨©2Ä2­2½ÈÉÊË¿¯2Ä2ª2«¨©2Ä2Ä2Æ2Æ2Æ2Æ2Æ2Æ2Ä2Ä2ª2«°±2Ä2Ä2Ä2Ä2Ä2Ä2Ä2Ä2Ä2Ä2²2³"2"2"2"2 \ No newline at end of file diff --git a/data/layouts/Route101/border.bin b/data/layouts/Route101/border.bin new file mode 100644 index 000000000..03bcafef1 --- /dev/null +++ b/data/layouts/Route101/border.bin @@ -0,0 +1 @@ +ÔÕÜÝ \ No newline at end of file diff --git a/data/layouts/Route101/layout.inc b/data/layouts/Route101/layout.inc new file mode 100644 index 000000000..54193c343 --- /dev/null +++ b/data/layouts/Route101/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route101_MapBorder:: + .incbin "data/layouts/Route101/border.bin" + + .align 2 +Route101_MapBlockdata:: + .incbin "data/layouts/Route101/map.bin" + + .align 2 +Route101_Layout:: + .4byte 0x14 + .4byte 0x14 + .4byte Route101_MapBorder + .4byte Route101_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Petalburg diff --git a/data/layouts/Route101/map.bin b/data/layouts/Route101/map.bin new file mode 100644 index 000000000..fab3a1d69 --- /dev/null +++ b/data/layouts/Route101/map.bin @@ -0,0 +1 @@ +ÔÕÔÕÔÕÔ×Ø1Ù1Ú10ÖÕÔÕÔÕÔÕÜÝäåäåäçà1á1â10æåäåÜÝÜÝÔÕ 0 0 000000000 0 0 0ÔÕÔÕäç5 0 0 0 0000000 0 0 0 0äåÜÝ 0 0 0 0 0 0000000 0 0 0 0 0 0ÔÕÆ1Ç1 0 0 0000000Î1Ç1 0 0 0 0 0æåÔ× 0 000n‡‡‡ÖÖ×Æ1Ç1 0 0000ÜÝÕ‡‡‡Ž0000ÜÝÔ×00Ð1Ò10ÔÕÎ1Ï10000000ÔÕäç0Ð1Ù1Ú10ÜÝÔ×00Ð1Ñ1Ò10æç 0 00à1Ù1Ù1Ò1ÔÕÜÝ0Ð1Ñ1Ù1Ù1Ú10 0 0 0 0 00à1Ù1Ú1ÜÝÔÕ0à1Ù1Ù1Ù1â10 0 0 0 0 0 00à1â1ÔÕäç00à1á1â100 0 0 0 0 0 0000äç 0 00000Õ‡‡ÖÆ1Ç1 0 0 00Î1Ï1 0 0 0 0 00000000Ö× 0 000ÖÕÆ1Ç1 0 0 0 0000000ÜÝÆ1Ç1Î1Ï1ÜÝÔ× 0 0 0 0000000ÔÕÔÕÔÕÔÕÜÝÆ1Ç1Æ1Ï1Î1Ï1Î1Ï100ÜÝÜÝÜÝÜÝÔÕÔÕÔÕÔÕÔ×00ÔÕÔÕÔÕÔÕÜÝÜÝÜÝÜÝÜÝ00ÜÝÜÝÜÝÜÝ \ No newline at end of file diff --git a/data/layouts/Route102/border.bin b/data/layouts/Route102/border.bin new file mode 100644 index 000000000..03bcafef1 --- /dev/null +++ b/data/layouts/Route102/border.bin @@ -0,0 +1 @@ +ÔÕÜÝ \ No newline at end of file diff --git a/data/layouts/Route102/layout.inc b/data/layouts/Route102/layout.inc new file mode 100644 index 000000000..eaf962db2 --- /dev/null +++ b/data/layouts/Route102/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route102_MapBorder:: + .incbin "data/layouts/Route102/border.bin" + + .align 2 +Route102_MapBlockdata:: + .incbin "data/layouts/Route102/map.bin" + + .align 2 +Route102_Layout:: + .4byte 0x32 + .4byte 0x14 + .4byte Route102_MapBorder + .4byte Route102_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Petalburg diff --git a/data/layouts/Route102/map.bin b/data/layouts/Route102/map.bin new file mode 100644 index 000000000..7378bb44b --- /dev/null +++ b/data/layouts/Route102/map.bin @@ -0,0 +1 @@ +ÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÜÝÜÝÜÝÜÝäåäåäåäåäåäåäåäåäåäåÜÝÜÝÜÝÜÝäåäåäåäåÜÝÜÝÜÝÔÕÔÕÔÕÔÕ 0 0 000000000000Œ266Ž20ÔÕÔÕÔÕÔÕ 0 0 0 0°±±²ÔÕÔÕÔÕÜÝäåäåäç 0 0 0000Ð1Ñ1Ñ1Ò10000011110æåäåäåäç 0 0 0 0¸¡¡ºäåÜÝÜÝÔÕ 0 0 0 0 0 0 0 0 00Ð1Ñ1Ù1Ù1Ù1Ù1Ñ1Ò100000000000000ÿ0 0 0 0 0¸¡¡Â±²ÔÕÔÕäç 0 0 0 0 0 0 0 00Ð1Ù1Ù1q2y2á1á1á1â10000000000Î1Ï100†00 0 0 0¸¡¡¡¡ºÜÝÜÝ000 0 0 0 0 0 0 00Ø1Ù1â1Ö×ÕÖ00Õ‡‡‡‡ÖÎ1Ï1Î1Ï1Ö×00†000 0 0¸¡¡¡¡ºÔÕÔÕ0000 0 0 0 0000à1r2Ï1ÜÝ0000 0 0 0 0 00ÖÕÔÕÜÝÎ1Ï1†00000000000æåÜÝ000000000000ÖÕÔÕ00 0 0 0 0 0 0 00ÜÝÜÝÔÕÔ×{0000000000000ÔÕÎ1Ï1Î1Ï1Î1Ï1Î1Ï10000ÜÝÜÝ0 0 0 0 0 0 0 000ÔÕÔÕÜÝÜÝÎ1Ï100000000000æåÔÕÔÕÔÕÔ×00Î1Ï1ÔÕÔÕ 0 0 0 0 0 00000ÜÝÜÝÔÕÔÕÔ×00000Ð1Ñ1Ñ1Ò100000ÜÝÜÝÜÝäç00ÖÕÜÝÜÝ 0 0 0 0000000ÔÕÔÕäåÜÝÜÝ00Ð1Ñ1Ñ1Ù1Ù1Ù1Ú1000Î1Ï1ÔÕÔÕÔÕ 0 000æåÔÕÔÕ 0 0 000Î1Ï1000æåäç 0 0ÔÕÔÕÐ1Ñ1Ù1Ù1Ù1Ù1Ù1á1â1000ÖÕÜÝÜÝÜÝ 0 0Õ‡‡ÖÜÝÜÝÆ1Ç1000Ö×Î1Ï1000 0 0 0 0æåäçØ1Ù1Ù1Ù1Ù1á1â10Î1Ï1Î1Ï1ÜÝÔÕÔÕÔÕ 0 0 0000ÔÕÔÕÔ×000æåÔ×000 0 0 0 0 000Ð1Ù1Ù1á1á1â1000ÖÕÔÕÔÕÜÝÜÝÜÝ 0 0 00Î1Ï1ÜÝÜÝÜÝ00 0 0 0æç0000 0 0 0000à1á1â100Î1Ï1Î1Ï1ÜÝÜÝÜÝÔÕÔÕÔÕ 0 0 0 0ÖÕÔÕÔÕÔÕ0 0 0 0 0 0 0 000000000000000ÖÕÔÕÔÕÔÕÔÕÜÝÜÝÜÝÆ1Ç1Æ1Ç1ÜÝÜÝÜÝÜÝÎ1Ç1Æ1Ç1Æ1Ç1 0 0 000000Î1Ï1Î1Ï1Î1Ï1Î1Ï1ÜÝÜÝÜÝÜÝÜÝÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔ× 0 0 0 00000ÖÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÆ1Ç1Æ1Ç1Î1Ï1Î1Ï1ÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝ \ No newline at end of file diff --git a/data/layouts/Route103/border.bin b/data/layouts/Route103/border.bin new file mode 100644 index 000000000..03bcafef1 --- /dev/null +++ b/data/layouts/Route103/border.bin @@ -0,0 +1 @@ +ÔÕÜÝ \ No newline at end of file diff --git a/data/layouts/Route103/layout.inc b/data/layouts/Route103/layout.inc new file mode 100644 index 000000000..eaf00808e --- /dev/null +++ b/data/layouts/Route103/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route103_MapBorder:: + .incbin "data/layouts/Route103/border.bin" + + .align 2 +Route103_MapBlockdata:: + .incbin "data/layouts/Route103/map.bin" + + .align 2 +Route103_Layout:: + .4byte 0x50 + .4byte 0x16 + .4byte Route103_MapBorder + .4byte Route103_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Petalburg diff --git a/data/layouts/Route103/map.bin b/data/layouts/Route103/map.bin new file mode 100644 index 000000000..44518dc92 --- /dev/null +++ b/data/layouts/Route103/map.bin @@ -0,0 +1 @@ +ÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕpppppppppp’sq{‰sqqqt}qsqqqqqqqqqqqqqqqqqqqqqqqt|}qqquÜÝÜÝäåäåäåäåäåäåÜÝÜÝÜÝÜÝÜÝuvpppppppp’{|‰s{‰qquqq{‰qqqqt|||||||‰qqqqqqqqt}qqqqquÔÕÔÕ000000 0 0 0 0 0 0ÔÕÔÕÔÕÔÕÔÕ}~ppppppppš‰s{‰sqquqt‰{||||}qt©©©‰q{||||||||}qqqqqquÜÝäç000Ð1Ñ1Ñ1Ò1 0 0 0 0 0æåÜÝÜÝÜÝäçppppppuvPQpp’{‰s{‰ququ{©©|||||}qqq{|©©©©©©©©©©||||||}ÔÕ 0 0000à1á1á1â100 0 0 0 0 0ÔÕÔÕÔÕˆ‰˜puvppp}~XYppšs{‰{|}t}t‘‘‘‘‘‘‘‘yyy‘ÎÎÎΑ‘‘‘ÎÎÎÎÎÎÎÎÎÎÜÝ 0 0 0 0Õ4‡4‡4‡4‡4‡4‡4o4 0 0 0 0æåÜÝÜÝdQpp}~uvPQpppuvPesq{|||}qr0000000K1L5L5L5M1ÇÇ0000ÇÇÇÇÇÇÇÇÔÕ 0 0 0 0 0 0 000004‡4‡4‡4‡4‡4Ö4ÔÕÔÕlYuvpp}~XYppp}~Xm{|‘‘‘‘‘yz0ÆÆÆÆÆÆ1111100000Ç0ÇÇÜÝ 0 0 0 0 0 0 000000000000æåäçp}~ppppppppppppš‰‰Š000000ÆÆÆÆÆ000000Ç00000000ÇÇÇÇ0Ç0ÔÕ 0 0 0 0 0 0 00000Ð1Ñ1Ñ1Ñ1Ò10000ˆ‰˜ppppppppppppppppppš‰‰‰‰Š000ÆÆÇÇ00000000000000Ç00ÜÝÆ1Ç1 0 0 0 0 00040à1á1Ù1Ù1Ù1Ò1000ppppppppppppppppppppppppp’0000ÇÇÇ0Ç0Ç00000Ç0000111ÔÕÔ× 0 0 0 00000000à1á1á1â1000ppppppppppppppppppppppppp’011110ÇÇÇ000000000011!1!1)1ÜÝÜÝ 0 0 0 0000000 0 0 0 00000ppppppppppppppppppppppppp’0(1)1!1!1111100000011!1!1)1*10ÔÕÔÕÕ4‡4‡4‡4‡4‡4‡4‡4‡4Ö4 0 0 0 0 00000Ô0yppppppppppppppppppppppp’000(1)1)1)1!1!1111111111111111!1!1)1*100ÇÜÝÜÝ0000000 0 0 0 0 0 0 0Æ1Ï1Î1Ï1Î1Ï1dQPQppppppppppuvppppp“““’0000000(1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1*10000ÇÔÕÔÕ0000000 0 0 0 0 0 0 0Ö5Õ5Ô5Õ5Ô×lYXYuvppppPQPQ}~puvpxÆÆÆ000ÇÇÇ0Ç000000000000000000000ÇÇÇÜÝÜÝÎ1Ï1000000Æ1Ç1Æ1Ç1Æ1Ç1ÜÝÜÝÜ݈2‰2yp}~uvPQXYXYpPQ}~PeÆÇÇÇÇÇÇÇÇÇÇÇ00000000Ç0ÇÇÇÇÔÕÔÕÔ×000000Ö5ÕÔÕÔÕÔÕÔÕÔÕÔ×ppp}~XYpppppXYppXmÆÆÆÆÇÇÇÇÇÇÇÇ000000000ÇÇÇÇÇÜÝÜÝÜÝÎ1Ï10000ÜÝÜÝÜÝÜÝÜÝÜÝÜÝuvppppppppppppppp’ÆÆÆÆÇÇÇÇÇÇÇÇÇ0Ç0Ç0Ç0Ç0Ç0Ç0Ç0Ç0ÇÇÇÇÇÔÕÔÕÔÕÔ5×50000ÔÕÔÕÔÕÔÕÔÕÔÕÔÕ}~ppppppppppppppx0ÆÆÆÆÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÜÝÜÝÜÝÜÝ0000ÜÝÜÝÜÝÜÝÜÝÜÝÜÝpppppppppppppppp’ÆÆÆÆÆÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÔÕÔÕÔÕÔ5×50000ÔÕÔÕÔÕÔÕÔÕÔÕÔÕpppppppppppppppp’ÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÜÝÜÝÜÝÜÝ0000ÜÝÜÝÜÝÜÝÜÝÜÝÜÝpppppppppppppppp’ÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆ \ No newline at end of file diff --git a/data/layouts/Route104/border.bin b/data/layouts/Route104/border.bin new file mode 100644 index 000000000..03bcafef1 --- /dev/null +++ b/data/layouts/Route104/border.bin @@ -0,0 +1 @@ +ÔÕÜÝ \ No newline at end of file diff --git a/data/layouts/Route104/layout.inc b/data/layouts/Route104/layout.inc new file mode 100644 index 000000000..58a000d70 --- /dev/null +++ b/data/layouts/Route104/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route104_MapBorder:: + .incbin "data/layouts/Route104/border.bin" + + .align 2 +Route104_MapBlockdata:: + .incbin "data/layouts/Route104/map.bin" + + .align 2 +Route104_Layout:: + .4byte 0x28 + .4byte 0x50 + .4byte Route104_MapBorder + .4byte Route104_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Rustboro diff --git a/data/layouts/Route104/map.bin b/data/layouts/Route104/map.bin new file mode 100644 index 000000000..7731bc31c Binary files /dev/null and b/data/layouts/Route104/map.bin differ diff --git a/data/layouts/Route104_MrBrineysHouse/border.bin b/data/layouts/Route104_MrBrineysHouse/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/Route104_MrBrineysHouse/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Route104_MrBrineysHouse/layout.inc b/data/layouts/Route104_MrBrineysHouse/layout.inc new file mode 100644 index 000000000..039901d0a --- /dev/null +++ b/data/layouts/Route104_MrBrineysHouse/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route104_MrBrineysHouse_MapBorder:: + .incbin "data/layouts/Route104_MrBrineysHouse/border.bin" + + .align 2 +Route104_MrBrineysHouse_MapBlockdata:: + .incbin "data/layouts/Route104_MrBrineysHouse/map.bin" + + .align 2 +Route104_MrBrineysHouse_Layout:: + .4byte 0xc + .4byte 0x9 + .4byte Route104_MrBrineysHouse_MapBorder + .4byte Route104_MrBrineysHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/Route104_MrBrineysHouse/map.bin b/data/layouts/Route104_MrBrineysHouse/map.bin new file mode 100644 index 000000000..7660fd5d7 --- /dev/null +++ b/data/layouts/Route104_MrBrineysHouse/map.bin @@ -0,0 +1 @@ +ã±²ã便ä빺ëì ÆÇìó2Á2Â2!2ó2!2!2ô2¨2Î2Ï2ô2³6´6)2)2)2)2)2)2)2)2)2)2³6)2)2)2)2)2)2NO)2)2)2!2)2)2)2)2)2)2VWD2)2)2!2)2)2)2)2)2)2)2)2)2)2)2 333333333333#3333333333 \ No newline at end of file diff --git a/data/layouts/Route104_PrettyPetalFlowerShop/border.bin b/data/layouts/Route104_PrettyPetalFlowerShop/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/Route104_PrettyPetalFlowerShop/border.bin differ diff --git a/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc b/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc new file mode 100644 index 000000000..0510c9028 --- /dev/null +++ b/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route104_PrettyPetalFlowerShop_MapBorder:: + .incbin "data/layouts/Route104_PrettyPetalFlowerShop/border.bin" + + .align 2 +Route104_PrettyPetalFlowerShop_MapBlockdata:: + .incbin "data/layouts/Route104_PrettyPetalFlowerShop/map.bin" + + .align 2 +Route104_PrettyPetalFlowerShop_Layout:: + .4byte 0xf + .4byte 0x9 + .4byte Route104_PrettyPetalFlowerShop_MapBorder + .4byte Route104_PrettyPetalFlowerShop_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_PrettyPetalFlowerShop diff --git a/data/layouts/Route104_PrettyPetalFlowerShop/map.bin b/data/layouts/Route104_PrettyPetalFlowerShop/map.bin new file mode 100644 index 000000000..d34ff5c1a Binary files /dev/null and b/data/layouts/Route104_PrettyPetalFlowerShop/map.bin differ diff --git a/data/layouts/Route104_Prototype/border.bin b/data/layouts/Route104_Prototype/border.bin new file mode 100644 index 000000000..03bcafef1 --- /dev/null +++ b/data/layouts/Route104_Prototype/border.bin @@ -0,0 +1 @@ +ÔÕÜÝ \ No newline at end of file diff --git a/data/layouts/Route104_Prototype/layout.inc b/data/layouts/Route104_Prototype/layout.inc new file mode 100644 index 000000000..eb70f55c9 --- /dev/null +++ b/data/layouts/Route104_Prototype/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route104_Prototype_MapBorder:: + .incbin "data/layouts/Route104_Prototype/border.bin" + + .align 2 +Route104_Prototype_MapBlockdata:: + .incbin "data/layouts/Route104_Prototype/map.bin" + + .align 2 +Route104_Prototype_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte Route104_Prototype_MapBorder + .4byte Route104_Prototype_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Rustboro diff --git a/data/layouts/Route104_Prototype/map.bin b/data/layouts/Route104_Prototype/map.bin new file mode 100644 index 000000000..71bd63e62 --- /dev/null +++ b/data/layouts/Route104_Prototype/map.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Route105/border.bin b/data/layouts/Route105/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/Route105/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/Route105/layout.inc b/data/layouts/Route105/layout.inc new file mode 100644 index 000000000..4156bc9a4 --- /dev/null +++ b/data/layouts/Route105/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route105_MapBorder:: + .incbin "data/layouts/Route105/border.bin" + + .align 2 +Route105_MapBlockdata:: + .incbin "data/layouts/Route105/map.bin" + + .align 2 +Route105_Layout:: + .4byte 0x28 + .4byte 0x50 + .4byte Route105_MapBorder + .4byte Route105_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Dewford diff --git a/data/layouts/Route105/map.bin b/data/layouts/Route105/map.bin new file mode 100644 index 000000000..c4bd8286c Binary files /dev/null and b/data/layouts/Route105/map.bin differ diff --git a/data/layouts/Route106/border.bin b/data/layouts/Route106/border.bin new file mode 100644 index 000000000..281762f5b --- /dev/null +++ b/data/layouts/Route106/border.bin @@ -0,0 +1 @@ +CCCC \ No newline at end of file diff --git a/data/layouts/Route106/layout.inc b/data/layouts/Route106/layout.inc new file mode 100644 index 000000000..ff43ced2e --- /dev/null +++ b/data/layouts/Route106/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route106_MapBorder:: + .incbin "data/layouts/Route106/border.bin" + + .align 2 +Route106_MapBlockdata:: + .incbin "data/layouts/Route106/map.bin" + + .align 2 +Route106_Layout:: + .4byte 0x50 + .4byte 0x14 + .4byte Route106_MapBorder + .4byte Route106_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Dewford diff --git a/data/layouts/Route106/map.bin b/data/layouts/Route106/map.bin new file mode 100644 index 000000000..b7e7d7238 Binary files /dev/null and b/data/layouts/Route106/map.bin differ diff --git a/data/layouts/Route107/border.bin b/data/layouts/Route107/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/Route107/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/Route107/layout.inc b/data/layouts/Route107/layout.inc new file mode 100644 index 000000000..9de501c61 --- /dev/null +++ b/data/layouts/Route107/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route107_MapBorder:: + .incbin "data/layouts/Route107/border.bin" + + .align 2 +Route107_MapBlockdata:: + .incbin "data/layouts/Route107/map.bin" + + .align 2 +Route107_Layout:: + .4byte 0x3c + .4byte 0x14 + .4byte Route107_MapBorder + .4byte Route107_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Dewford diff --git a/data/layouts/Route107/map.bin b/data/layouts/Route107/map.bin new file mode 100644 index 000000000..521997b0f Binary files /dev/null and b/data/layouts/Route107/map.bin differ diff --git a/data/layouts/Route108/border.bin b/data/layouts/Route108/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/Route108/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/Route108/layout.inc b/data/layouts/Route108/layout.inc new file mode 100644 index 000000000..10fd278b3 --- /dev/null +++ b/data/layouts/Route108/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route108_MapBorder:: + .incbin "data/layouts/Route108/border.bin" + + .align 2 +Route108_MapBlockdata:: + .incbin "data/layouts/Route108/map.bin" + + .align 2 +Route108_Layout:: + .4byte 0x3c + .4byte 0x14 + .4byte Route108_MapBorder + .4byte Route108_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Slateport diff --git a/data/layouts/Route108/map.bin b/data/layouts/Route108/map.bin new file mode 100644 index 000000000..138ddc020 --- /dev/null +++ b/data/layouts/Route108/map.bin @@ -0,0 +1 @@ +ppppppppppppppppPQpp­®1®1®1®1®1®1®1®1®1®1®1®1¯pppppppppppppPQpppppppppppPQppppppppppppppXYp­›1ž1”5ž1ž1^5_5ž1”5^5_5ž1ž1bQppppppppppppXYpppppppppPQXY­®1®1¯pPQpppppppppPc^5_5ž1”5”5n5o5”5ž1n5o5”5”5jYppp­1®1®1®1®1®1®1¯pPQppuvpuvPQXYpPc^5_5bQXY­®1®1¯pPQppXkn5o5ž1ž1ž1^5_5ž1Q3R3S3T3”5·puvPc^5_5ž1”5ž1”5bQXYpp}~p}~XYpppXkn5o5jYpPc^5_5bQXYuvp½¾¾¾¾£n5o5X7YZ[\7]·p}~Xkn5o5”5ž1”5ž1jYppPQpPQpppppppp½¾¾¿ppXkn5o5jYpp}~pppppp½£ž1`abcde·pppp½£ž1ž1ž1ž1¤¿pppXYpXYppppppppppppppp½¾¾¿pppppppppppp½¾£i3j3k3¤¾¿ppppp½¾¾¾¾¿pppppppppppppppppppppppppppppppppppppppppp½¾¾¾¿pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppuvppppppppppppppPQp­®1®1¯pppppppppppppppPQpppppppppppppppppppp}~ppppppppp­®1®1¯pXY­›1”5ž1œ1¯ppppppppppppppXYpppppppppppppp­®1®1®1¯ppppPQppPQpp½£”5·pppµž1”5ž1ž1·pp­®1®1¯ppppppPQppPQuvppppp­®1®1¯p½£”5ž1·ppuvXYuvXYppp½¾¿uvp½¾¾¾¾¿pPc^5_5bQpppppXYppXY}~uvppPc^5_5bQp½¾¾¿PQ}~pp}~puvppPQp}~PQppPQuvXkn5o5jYppppPQppppppp}~PQXkn5o5jYpPQuvXYppppppp}~PQXYuvpXYPQXY}~p½¾¾¿pPQPQXYpppppppppXYp½¾¾¿PQXY}~pppPQppppppXYpp}~pppXYpppppPQpppXYXYppppppppppppppppppXYpppppppXYppppppppppppppppppppppXYppppppp \ No newline at end of file diff --git a/data/layouts/Route109/border.bin b/data/layouts/Route109/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/Route109/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/Route109/layout.inc b/data/layouts/Route109/layout.inc new file mode 100644 index 000000000..f6d4864bf --- /dev/null +++ b/data/layouts/Route109/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route109_MapBorder:: + .incbin "data/layouts/Route109/border.bin" + + .align 2 +Route109_MapBlockdata:: + .incbin "data/layouts/Route109/map.bin" + + .align 2 +Route109_Layout:: + .4byte 0x28 + .4byte 0x3f + .4byte Route109_MapBorder + .4byte Route109_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Slateport diff --git a/data/layouts/Route109/map.bin b/data/layouts/Route109/map.bin new file mode 100644 index 000000000..62350867e Binary files /dev/null and b/data/layouts/Route109/map.bin differ diff --git a/data/layouts/Route109_SeashoreHouse/border.bin b/data/layouts/Route109_SeashoreHouse/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/Route109_SeashoreHouse/border.bin differ diff --git a/data/layouts/Route109_SeashoreHouse/layout.inc b/data/layouts/Route109_SeashoreHouse/layout.inc new file mode 100644 index 000000000..316c1fc1b --- /dev/null +++ b/data/layouts/Route109_SeashoreHouse/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route109_SeashoreHouse_MapBorder:: + .incbin "data/layouts/Route109_SeashoreHouse/border.bin" + + .align 2 +Route109_SeashoreHouse_MapBlockdata:: + .incbin "data/layouts/Route109_SeashoreHouse/map.bin" + + .align 2 +Route109_SeashoreHouse_Layout:: + .4byte 0xf + .4byte 0xa + .4byte Route109_SeashoreHouse_MapBorder + .4byte Route109_SeashoreHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_SeashoreHouse diff --git a/data/layouts/Route109_SeashoreHouse/map.bin b/data/layouts/Route109_SeashoreHouse/map.bin new file mode 100644 index 000000000..cb7853a17 --- /dev/null +++ b/data/layouts/Route109_SeashoreHouse/map.bin @@ -0,0 +1,3 @@ +./   67 + +   22222'22222"2,2,2-2$2$2,2,2-2$2$2$2,2,2&2 %2%2%2%2%2!22*2222*2*2222*2*222 $2$2$2$2$2!22%2222%2%2222%2%222 *2*2*2*2*2*2*2*2*2*2*2!22%2%2%2%2%2%2%2%2%222 \ No newline at end of file diff --git a/data/layouts/Route110/border.bin b/data/layouts/Route110/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/Route110/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/Route110/layout.inc b/data/layouts/Route110/layout.inc new file mode 100644 index 000000000..1539ae91d --- /dev/null +++ b/data/layouts/Route110/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route110_MapBorder:: + .incbin "data/layouts/Route110/border.bin" + + .align 2 +Route110_MapBlockdata:: + .incbin "data/layouts/Route110/map.bin" + + .align 2 +Route110_Layout:: + .4byte 0x28 + .4byte 0x64 + .4byte Route110_MapBorder + .4byte Route110_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Mauville diff --git a/data/layouts/Route110/map.bin b/data/layouts/Route110/map.bin new file mode 100644 index 000000000..ac83cb93d Binary files /dev/null and b/data/layouts/Route110/map.bin differ diff --git a/data/layouts/Route110_SeasideCyclingRoadEntrance/border.bin b/data/layouts/Route110_SeasideCyclingRoadEntrance/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/Route110_SeasideCyclingRoadEntrance/border.bin differ diff --git a/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc b/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc new file mode 100644 index 000000000..4f804ef53 --- /dev/null +++ b/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route110_SeasideCyclingRoadEntrance_MapBorder:: + .incbin "data/layouts/Route110_SeasideCyclingRoadEntrance/border.bin" + + .align 2 +Route110_SeasideCyclingRoadEntrance_MapBlockdata:: + .incbin "data/layouts/Route110_SeasideCyclingRoadEntrance/map.bin" + + .align 2 +Route110_SeasideCyclingRoadEntrance_Layout:: + .4byte 0xf + .4byte 0x6 + .4byte Route110_SeasideCyclingRoadEntrance_MapBorder + .4byte Route110_SeasideCyclingRoadEntrance_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Shop diff --git a/data/layouts/Route110_SeasideCyclingRoadEntrance/map.bin b/data/layouts/Route110_SeasideCyclingRoadEntrance/map.bin new file mode 100644 index 000000000..e9fc770d4 --- /dev/null +++ b/data/layouts/Route110_SeasideCyclingRoadEntrance/map.bin @@ -0,0 +1 @@ +ˆˆˆˆˆˆˆ‹ˆˆˆˆˆˆœ•“œx2p2p2p2p2¨6™2˜2™2™2©6x2p2p2p2€2h2h2h2h2°6¡6 6¡6¡6±6€2h2h2h2\2h2h2h2h2p2Y2Z2Y2Z2p2y2h2h2l2d6h2h2h2a6b6a6b6h2h2t6 \ No newline at end of file diff --git a/data/layouts/Route110_TrickHouseCorridor/border.bin b/data/layouts/Route110_TrickHouseCorridor/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/Route110_TrickHouseCorridor/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Route110_TrickHouseCorridor/layout.inc b/data/layouts/Route110_TrickHouseCorridor/layout.inc new file mode 100644 index 000000000..8f9c4d9ee --- /dev/null +++ b/data/layouts/Route110_TrickHouseCorridor/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route110_TrickHouseCorridor_MapBorder:: + .incbin "data/layouts/Route110_TrickHouseCorridor/border.bin" + + .align 2 +Route110_TrickHouseCorridor_MapBlockdata:: + .incbin "data/layouts/Route110_TrickHouseCorridor/map.bin" + + .align 2 +Route110_TrickHouseCorridor_Layout:: + .4byte 0xf + .4byte 0x18 + .4byte Route110_TrickHouseCorridor_MapBorder + .4byte Route110_TrickHouseCorridor_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/Route110_TrickHouseCorridor/map.bin b/data/layouts/Route110_TrickHouseCorridor/map.bin new file mode 100644 index 000000000..8981d28bd --- /dev/null +++ b/data/layouts/Route110_TrickHouseCorridor/map.bin @@ -0,0 +1 @@ +ãäëìó2!2!2!2!2!2!2!2!2!2!2ô2!2)2)2)2)2)2)2)2)2)2)2)2!2)2)2!2)2)2ãä!2)2)2ëì!2)2)2ó2!2ô2!2)2)2!2)2)2)2)2)2!2)2)2)2)2)2!2)2)2!2)2)2!2)2)2!2)2)2!2)2)2!2)2)2!2)2)2!2)2)2!2)2)2!2)2)2ãä!2)2)2ëì!2)2)2ó2!2ô2!2)2)2)222 \ No newline at end of file diff --git a/data/layouts/Route110_TrickHouseEnd/border.bin b/data/layouts/Route110_TrickHouseEnd/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/Route110_TrickHouseEnd/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Route110_TrickHouseEnd/layout.inc b/data/layouts/Route110_TrickHouseEnd/layout.inc new file mode 100644 index 000000000..ee2b6b47f --- /dev/null +++ b/data/layouts/Route110_TrickHouseEnd/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route110_TrickHouseEnd_MapBorder:: + .incbin "data/layouts/Route110_TrickHouseEnd/border.bin" + + .align 2 +Route110_TrickHouseEnd_MapBlockdata:: + .incbin "data/layouts/Route110_TrickHouseEnd/map.bin" + + .align 2 +Route110_TrickHouseEnd_Layout:: + .4byte 0xc + .4byte 0x8 + .4byte Route110_TrickHouseEnd_MapBorder + .4byte Route110_TrickHouseEnd_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/Route110_TrickHouseEnd/map.bin b/data/layouts/Route110_TrickHouseEnd/map.bin new file mode 100644 index 000000000..506fdb644 --- /dev/null +++ b/data/layouts/Route110_TrickHouseEnd/map.bin @@ -0,0 +1 @@ +íîïãäõö2÷ëì6 26!2ý2þ2ÿ2ó2!2!2!2ô2!2!2!2!2)2)2)2)2)2D2)2)2)2)2)2!2)2)2)2)2NO)2)2)2)2)2!2)2)2)2D2VWD2)2)2)2)2!2)2)2)2)2)2)2)2)2)2)2)2!2)2)2)2)2)2)2)2)2)2)2)2 \ No newline at end of file diff --git a/data/layouts/Route110_TrickHouseEntrance/border.bin b/data/layouts/Route110_TrickHouseEntrance/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/Route110_TrickHouseEntrance/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Route110_TrickHouseEntrance/layout.inc b/data/layouts/Route110_TrickHouseEntrance/layout.inc new file mode 100644 index 000000000..ec9636627 --- /dev/null +++ b/data/layouts/Route110_TrickHouseEntrance/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route110_TrickHouseEntrance_MapBorder:: + .incbin "data/layouts/Route110_TrickHouseEntrance/border.bin" + + .align 2 +Route110_TrickHouseEntrance_MapBlockdata:: + .incbin "data/layouts/Route110_TrickHouseEntrance/map.bin" + + .align 2 +Route110_TrickHouseEntrance_Layout:: + .4byte 0xc + .4byte 0x8 + .4byte Route110_TrickHouseEntrance_MapBorder + .4byte Route110_TrickHouseEntrance_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/Route110_TrickHouseEntrance/map.bin b/data/layouts/Route110_TrickHouseEntrance/map.bin new file mode 100644 index 000000000..1306bb9b5 --- /dev/null +++ b/data/layouts/Route110_TrickHouseEntrance/map.bin @@ -0,0 +1 @@ +¾¿6 ÆÇ!2!2!2!2!2!2!2!2!2¨2Î2Ï2!2)2)2)2D2NOD2)2)2)2)23)2)2)2D2VWD2)2)2)23'7)2)2)2)2)2)2)2)2)2)2"7 333333333333#333332233333 \ No newline at end of file diff --git a/data/layouts/Route110_TrickHousePuzzle1/border.bin b/data/layouts/Route110_TrickHousePuzzle1/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/Route110_TrickHousePuzzle1/border.bin differ diff --git a/data/layouts/Route110_TrickHousePuzzle1/layout.inc b/data/layouts/Route110_TrickHousePuzzle1/layout.inc new file mode 100644 index 000000000..d8aadf110 --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route110_TrickHousePuzzle1_MapBorder:: + .incbin "data/layouts/Route110_TrickHousePuzzle1/border.bin" + + .align 2 +Route110_TrickHousePuzzle1_MapBlockdata:: + .incbin "data/layouts/Route110_TrickHousePuzzle1/map.bin" + + .align 2 +Route110_TrickHousePuzzle1_Layout:: + .4byte 0xf + .4byte 0x16 + .4byte Route110_TrickHousePuzzle1_MapBorder + .4byte Route110_TrickHousePuzzle1_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle diff --git a/data/layouts/Route110_TrickHousePuzzle1/map.bin b/data/layouts/Route110_TrickHousePuzzle1/map.bin new file mode 100644 index 000000000..2bf5b392c --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle1/map.bin @@ -0,0 +1,2 @@ +o233333333334 +w6 #$+$$$+$+$$!222Z2Z2*Z2Z2Z2*Z2*Z2Z2"22222222222222"22222,222,2,22,2222#$$+$$$$$$+%202Z2Z2Z2*Z2Z2Z2Z2Z2Z2*Z22Z22"22222222222222,22(220%22,2220$!2#!2Z2Z22#+$$%Z2Z2*2Z2"22"2Z2*Z2Z2Z222222"22"22222222(22,22,22,22222#$+$+$$$$+$%222Z2Z2"Z2*Z2Z2Z2Z2*Z2Z22222"2Z2222222222222,222222,222#$$$+$$$$+$$%20Z2Z2Z2Z2*Z2Z2Z2Z2*Z2Z2Z22Z22222Z22222Z222222222222222222222 \ No newline at end of file diff --git a/data/layouts/Route110_TrickHousePuzzle2/border.bin b/data/layouts/Route110_TrickHousePuzzle2/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/Route110_TrickHousePuzzle2/border.bin differ diff --git a/data/layouts/Route110_TrickHousePuzzle2/layout.inc b/data/layouts/Route110_TrickHousePuzzle2/layout.inc new file mode 100644 index 000000000..59bc2d06c --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route110_TrickHousePuzzle2_MapBorder:: + .incbin "data/layouts/Route110_TrickHousePuzzle2/border.bin" + + .align 2 +Route110_TrickHousePuzzle2_MapBlockdata:: + .incbin "data/layouts/Route110_TrickHousePuzzle2/map.bin" + + .align 2 +Route110_TrickHousePuzzle2_Layout:: + .4byte 0xf + .4byte 0x16 + .4byte Route110_TrickHousePuzzle2_MapBorder + .4byte Route110_TrickHousePuzzle2_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle diff --git a/data/layouts/Route110_TrickHousePuzzle2/map.bin b/data/layouts/Route110_TrickHousePuzzle2/map.bin new file mode 100644 index 000000000..cb35a063e --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle2/map.bin @@ -0,0 +1,2 @@ +o          +w6 222222222€22222222‰‚‚ƒ22ˆ22222X22ˆ222222‰‚‚ƒ‚‚’2‚Š222ˆ22X222222i2‘‚‚‚’2222€222€2222222222ˆ22‰”‚‚‚‚‚‚Š222ˆ22ˆ2222222ˆ222ˆ22ˆ2‰‚Š222ˆ222‘Š2ˆ2ˆX2ˆ2‰‚”Š222ˆ2ˆ22ˆ2ˆX22ˆi„iˆ2ˆ222ˆ2ˆ22ˆ222‘‚”‚‚‚’2ˆ22ˆ2222222i22ˆ22‘ƒ2€2‚‚“‚‚“”Š2222ˆ2222ˆ22ˆ2‘ƒ222ˆ222222ˆ2222222€22222ˆ22ƒ2222‘‚‚‚‚‚’22222222222222222222 \ No newline at end of file diff --git a/data/layouts/Route110_TrickHousePuzzle3/border.bin b/data/layouts/Route110_TrickHousePuzzle3/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/Route110_TrickHousePuzzle3/border.bin differ diff --git a/data/layouts/Route110_TrickHousePuzzle3/layout.inc b/data/layouts/Route110_TrickHousePuzzle3/layout.inc new file mode 100644 index 000000000..384a84032 --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle3/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route110_TrickHousePuzzle3_MapBorder:: + .incbin "data/layouts/Route110_TrickHousePuzzle3/border.bin" + + .align 2 +Route110_TrickHousePuzzle3_MapBlockdata:: + .incbin "data/layouts/Route110_TrickHousePuzzle3/map.bin" + + .align 2 +Route110_TrickHousePuzzle3_Layout:: + .4byte 0xf + .4byte 0x16 + .4byte Route110_TrickHousePuzzle3_MapBorder + .4byte Route110_TrickHousePuzzle3_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle diff --git a/data/layouts/Route110_TrickHousePuzzle3/map.bin b/data/layouts/Route110_TrickHousePuzzle3/map.bin new file mode 100644 index 000000000..ac4f344d9 --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle3/map.bin @@ -0,0 +1,2 @@ +o          +w6 &22&22&2X2&22&22-8292-22-22-22-82925@A522M22:225@Aq222q222U222B22X222K2L2829222&8292225S2T2M@A522"@AM22q222222U222"22q222K2L2./8292-22K2L25S2T25675@A5225S2T2q222X222q222U222U22282928292228292&225@AM@A5225@A"22~22U2X22q222q222"22./K2L2&./22-K2L2567:S2T2"67M225S2T2q2q2q2B22"q2q2U222222228292-228292225225@A5225@A522q222q222q222q222q222222222222222222 \ No newline at end of file diff --git a/data/layouts/Route110_TrickHousePuzzle4/border.bin b/data/layouts/Route110_TrickHousePuzzle4/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/Route110_TrickHousePuzzle4/border.bin differ diff --git a/data/layouts/Route110_TrickHousePuzzle4/layout.inc b/data/layouts/Route110_TrickHousePuzzle4/layout.inc new file mode 100644 index 000000000..3524e092d --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route110_TrickHousePuzzle4_MapBorder:: + .incbin "data/layouts/Route110_TrickHousePuzzle4/border.bin" + + .align 2 +Route110_TrickHousePuzzle4_MapBlockdata:: + .incbin "data/layouts/Route110_TrickHousePuzzle4/map.bin" + + .align 2 +Route110_TrickHousePuzzle4_Layout:: + .4byte 0xf + .4byte 0x16 + .4byte Route110_TrickHousePuzzle4_MapBorder + .4byte Route110_TrickHousePuzzle4_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle diff --git a/data/layouts/Route110_TrickHousePuzzle4/map.bin b/data/layouts/Route110_TrickHousePuzzle4/map.bin new file mode 100644 index 000000000..2dbcf251b --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle4/map.bin @@ -0,0 +1,2 @@ +o             +w6 2222Š22222€22222222ˆ2222‰’22222Š2‘ƒ2€2ˆ2222222ˆ2222ˆ2ˆ22‰ƒ2222222ˆ2‘ƒ22‚ƒ22222ˆ22222222222€2222222222222ˆ222‚‚‚‚ƒ22222ˆ22222222222‰‚‚”‚“‚ƒ2222222ˆ22222222‰‚ƒ2‰’22€222€22ˆ22ˆ222Œ‚‚‚’2‹222ˆ222222222222Œ‚ƒ22222„222222ˆ222€2222222222††††††„†††††2q2q2q2q2q2q2q2q2q2q2q2q2q2q2222222222222222222222222222222 \ No newline at end of file diff --git a/data/layouts/Route110_TrickHousePuzzle5/border.bin b/data/layouts/Route110_TrickHousePuzzle5/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/Route110_TrickHousePuzzle5/border.bin differ diff --git a/data/layouts/Route110_TrickHousePuzzle5/layout.inc b/data/layouts/Route110_TrickHousePuzzle5/layout.inc new file mode 100644 index 000000000..06f105c71 --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle5/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route110_TrickHousePuzzle5_MapBorder:: + .incbin "data/layouts/Route110_TrickHousePuzzle5/border.bin" + + .align 2 +Route110_TrickHousePuzzle5_MapBlockdata:: + .incbin "data/layouts/Route110_TrickHousePuzzle5/map.bin" + + .align 2 +Route110_TrickHousePuzzle5_Layout:: + .4byte 0xf + .4byte 0x16 + .4byte Route110_TrickHousePuzzle5_MapBorder + .4byte Route110_TrickHousePuzzle5_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle diff --git a/data/layouts/Route110_TrickHousePuzzle5/map.bin b/data/layouts/Route110_TrickHousePuzzle5/map.bin new file mode 100644 index 000000000..470e3eba3 --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle5/map.bin @@ -0,0 +1,2 @@ +o             +w6 hh222hhhhhh2222h22222hhhhh2hhh2222222hhh222hh2222222hh22222h2222222h22222222222222222222222222222h2222222h22222hh2222222h22222hh2222222h22222hhh22222hhh222hhhh22222hhh222hhhh22222hhhh2hhhhhh222hhhh222hhhhh222hhh22222hhhhh2hhh2222222hhh222hhh22222hhh22222hhh222hhh22222222222hhhhh22222h22hhhhhhhh22hh \ No newline at end of file diff --git a/data/layouts/Route110_TrickHousePuzzle6/border.bin b/data/layouts/Route110_TrickHousePuzzle6/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/Route110_TrickHousePuzzle6/border.bin differ diff --git a/data/layouts/Route110_TrickHousePuzzle6/layout.inc b/data/layouts/Route110_TrickHousePuzzle6/layout.inc new file mode 100644 index 000000000..b11da0a1d --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle6/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route110_TrickHousePuzzle6_MapBorder:: + .incbin "data/layouts/Route110_TrickHousePuzzle6/border.bin" + + .align 2 +Route110_TrickHousePuzzle6_MapBlockdata:: + .incbin "data/layouts/Route110_TrickHousePuzzle6/map.bin" + + .align 2 +Route110_TrickHousePuzzle6_Layout:: + .4byte 0xf + .4byte 0x16 + .4byte Route110_TrickHousePuzzle6_MapBorder + .4byte Route110_TrickHousePuzzle6_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle diff --git a/data/layouts/Route110_TrickHousePuzzle6/map.bin b/data/layouts/Route110_TrickHousePuzzle6/map.bin new file mode 100644 index 000000000..45dc20ba1 --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle6/map.bin @@ -0,0 +1,2 @@ +o             +w6 ‰ƒ222€222222€22ˆ222222€222ˆ222222222ˆ2€2Œƒ222222€2222ˆ22222‰‚’222222ˆ2222222222€22ˆ2„22222“ƒ222ˆ22222222ˆ2222’2262€2€2ˆ222€2222‚’2ˆ2222ˆ22222222ˆ22Š2‘Š2222222‘Š22ˆ22ˆ222‰‚ƒ22ˆ222”Š2€ˆ2222ˆ22222222€22ˆ22„2222222222‘ƒ22222222222222222ƒ2€22222222222222ˆ222222‰ƒ2222‰‚’2222222222’2222 \ No newline at end of file diff --git a/data/layouts/Route110_TrickHousePuzzle7/border.bin b/data/layouts/Route110_TrickHousePuzzle7/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/Route110_TrickHousePuzzle7/border.bin differ diff --git a/data/layouts/Route110_TrickHousePuzzle7/layout.inc b/data/layouts/Route110_TrickHousePuzzle7/layout.inc new file mode 100644 index 000000000..8d9e88b7e --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle7/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route110_TrickHousePuzzle7_MapBorder:: + .incbin "data/layouts/Route110_TrickHousePuzzle7/border.bin" + + .align 2 +Route110_TrickHousePuzzle7_MapBlockdata:: + .incbin "data/layouts/Route110_TrickHousePuzzle7/map.bin" + + .align 2 +Route110_TrickHousePuzzle7_Layout:: + .4byte 0xf + .4byte 0x16 + .4byte Route110_TrickHousePuzzle7_MapBorder + .4byte Route110_TrickHousePuzzle7_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle diff --git a/data/layouts/Route110_TrickHousePuzzle7/map.bin b/data/layouts/Route110_TrickHousePuzzle7/map.bin new file mode 100644 index 000000000..68ac73547 --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle7/map.bin @@ -0,0 +1,2 @@ +o             +w6 €22€22€222±²22€ˆ‡‡ˆ‡2ˆ‡22°³‰‚‹ˆ22ˆ22Œ‚‚‚‚‚‹‡ˆˆ222”‚Š222ˆ2ˆˆ22©ª2¬2‘‚ƒ2ˆ2ˆ‘‚ƒ¨«€222´22ˆ2ˆ2222‰”‚‚‚‚ƒ2ˆ2ˆ2‰‚‚’2222222ˆ2ˆ2ˆ22222‰‚Š22ˆ2ˆ‡ˆ2‰‚‚Šˆ2‘Š2ˆ‡ˆ’2ˆ22ˆˆ‡2ˆ2Œ‚‹222ˆ‡2ˆˆ2‰’22ˆ¤22‘‚‚’‘‚’2222ˆ222222222222€2ˆ‰‚‚‚‚‚‚“‚‚Š2ˆ2ˆˆ‡2¡¢2ˆ™šˆ22ˆ‘‚Š £‰‚’˜›222ˆ22‘‚Šˆ22œ222€2ˆ2222‘’2€™š€2ˆ2ˆ2222222˜›‘‚”‚’ \ No newline at end of file diff --git a/data/layouts/Route110_TrickHousePuzzle8/border.bin b/data/layouts/Route110_TrickHousePuzzle8/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/Route110_TrickHousePuzzle8/border.bin differ diff --git a/data/layouts/Route110_TrickHousePuzzle8/layout.inc b/data/layouts/Route110_TrickHousePuzzle8/layout.inc new file mode 100644 index 000000000..139cefadc --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle8/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route110_TrickHousePuzzle8_MapBorder:: + .incbin "data/layouts/Route110_TrickHousePuzzle8/border.bin" + + .align 2 +Route110_TrickHousePuzzle8_MapBlockdata:: + .incbin "data/layouts/Route110_TrickHousePuzzle8/map.bin" + + .align 2 +Route110_TrickHousePuzzle8_Layout:: + .4byte 0xf + .4byte 0x16 + .4byte Route110_TrickHousePuzzle8_MapBorder + .4byte Route110_TrickHousePuzzle8_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle diff --git a/data/layouts/Route110_TrickHousePuzzle8/map.bin b/data/layouts/Route110_TrickHousePuzzle8/map.bin new file mode 100644 index 000000000..b59b0f606 --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle8/map.bin @@ -0,0 +1,2 @@ +o             +w6 222622222222226k2k2l6l6l6k2l6l6l6l6l6l6l6l6l6k2k2k2k2l6k2l6k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2l6k2222662266666k262626666666262k262k2l6k2k2k2k2l6l6k2k2k2k2k2k22k2k2k2k2l6k2k2k2k2k2l6k2k2k2k2k2k2k2k2l6k2k2k2k2k2l6k2k2k2k2k2k2k2k2l6k2k2k2k2k2l6k2k2k2k2k2k2k2k2l6k2k2k2k2k2l6k2k2k2k2k2l6k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2k2k2k22k2l6k2k2k2k2k2k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2l6l6l6k2l6k2k2k2l6k2k2k2k2226662622262222226622622222222 \ No newline at end of file diff --git a/data/layouts/Route111/border.bin b/data/layouts/Route111/border.bin new file mode 100644 index 000000000..4531975c7 Binary files /dev/null and b/data/layouts/Route111/border.bin differ diff --git a/data/layouts/Route111/layout.inc b/data/layouts/Route111/layout.inc new file mode 100644 index 000000000..911ecfcb0 --- /dev/null +++ b/data/layouts/Route111/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route111_MapBorder:: + .incbin "data/layouts/Route111/border.bin" + + .align 2 +Route111_MapBlockdata:: + .incbin "data/layouts/Route111/map.bin" + + .align 2 +Route111_Layout:: + .4byte 0x28 + .4byte 0x8c + .4byte Route111_MapBorder + .4byte Route111_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Mauville diff --git a/data/layouts/Route111/map.bin b/data/layouts/Route111/map.bin new file mode 100644 index 000000000..4ce11a8a9 Binary files /dev/null and b/data/layouts/Route111/map.bin differ diff --git a/data/layouts/Route112/border.bin b/data/layouts/Route112/border.bin new file mode 100644 index 000000000..9ae2c2126 --- /dev/null +++ b/data/layouts/Route112/border.bin @@ -0,0 +1 @@ +qqqq \ No newline at end of file diff --git a/data/layouts/Route112/layout.inc b/data/layouts/Route112/layout.inc new file mode 100644 index 000000000..22aae208c --- /dev/null +++ b/data/layouts/Route112/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route112_MapBorder:: + .incbin "data/layouts/Route112/border.bin" + + .align 2 +Route112_MapBlockdata:: + .incbin "data/layouts/Route112/map.bin" + + .align 2 +Route112_Layout:: + .4byte 0x28 + .4byte 0x3c + .4byte Route112_MapBorder + .4byte Route112_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lavaridge diff --git a/data/layouts/Route112/map.bin b/data/layouts/Route112/map.bin new file mode 100644 index 000000000..ef3fd5f10 Binary files /dev/null and b/data/layouts/Route112/map.bin differ diff --git a/data/layouts/Route113/border.bin b/data/layouts/Route113/border.bin new file mode 100644 index 000000000..73e1e3c60 --- /dev/null +++ b/data/layouts/Route113/border.bin @@ -0,0 +1 @@ +mnuv \ No newline at end of file diff --git a/data/layouts/Route113/layout.inc b/data/layouts/Route113/layout.inc new file mode 100644 index 000000000..a6a438986 --- /dev/null +++ b/data/layouts/Route113/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route113_MapBorder:: + .incbin "data/layouts/Route113/border.bin" + + .align 2 +Route113_MapBlockdata:: + .incbin "data/layouts/Route113/map.bin" + + .align 2 +Route113_Layout:: + .4byte 0x64 + .4byte 0x14 + .4byte Route113_MapBorder + .4byte Route113_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Fallarbor diff --git a/data/layouts/Route113/map.bin b/data/layouts/Route113/map.bin new file mode 100644 index 000000000..609690de2 Binary files /dev/null and b/data/layouts/Route113/map.bin differ diff --git a/data/layouts/Route114/border.bin b/data/layouts/Route114/border.bin new file mode 100644 index 000000000..23e2a92e5 --- /dev/null +++ b/data/layouts/Route114/border.bin @@ -0,0 +1 @@ +klst \ No newline at end of file diff --git a/data/layouts/Route114/layout.inc b/data/layouts/Route114/layout.inc new file mode 100644 index 000000000..1391ce296 --- /dev/null +++ b/data/layouts/Route114/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route114_MapBorder:: + .incbin "data/layouts/Route114/border.bin" + + .align 2 +Route114_MapBlockdata:: + .incbin "data/layouts/Route114/map.bin" + + .align 2 +Route114_Layout:: + .4byte 0x28 + .4byte 0x50 + .4byte Route114_MapBorder + .4byte Route114_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Fallarbor diff --git a/data/layouts/Route114/map.bin b/data/layouts/Route114/map.bin new file mode 100644 index 000000000..3bad45e04 Binary files /dev/null and b/data/layouts/Route114/map.bin differ diff --git a/data/layouts/Route114_FossilManiacsHouse/border.bin b/data/layouts/Route114_FossilManiacsHouse/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/Route114_FossilManiacsHouse/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Route114_FossilManiacsHouse/layout.inc b/data/layouts/Route114_FossilManiacsHouse/layout.inc new file mode 100644 index 000000000..314090849 --- /dev/null +++ b/data/layouts/Route114_FossilManiacsHouse/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route114_FossilManiacsHouse_MapBorder:: + .incbin "data/layouts/Route114_FossilManiacsHouse/border.bin" + + .align 2 +Route114_FossilManiacsHouse_MapBlockdata:: + .incbin "data/layouts/Route114_FossilManiacsHouse/map.bin" + + .align 2 +Route114_FossilManiacsHouse_Layout:: + .4byte 0xa + .4byte 0x8 + .4byte Route114_FossilManiacsHouse_MapBorder + .4byte Route114_FossilManiacsHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/Route114_FossilManiacsHouse/map.bin b/data/layouts/Route114_FossilManiacsHouse/map.bin new file mode 100644 index 000000000..ea2d94fda --- /dev/null +++ b/data/layouts/Route114_FossilManiacsHouse/map.bin @@ -0,0 +1 @@ +±²íîﹺõö÷6Á2Â2!2ý2þ233®¯@2!2)2)2)2)277¶2·2Ö2!2NOD2)2Ö2Ö2)2)2)2Y2VW)2)2)2)2)2)2)2 3333333333#33333333 \ No newline at end of file diff --git a/data/layouts/Route114_FossilManiacsTunnel/border.bin b/data/layouts/Route114_FossilManiacsTunnel/border.bin new file mode 100644 index 000000000..580a207f4 --- /dev/null +++ b/data/layouts/Route114_FossilManiacsTunnel/border.bin @@ -0,0 +1 @@ +wwww \ No newline at end of file diff --git a/data/layouts/Route114_FossilManiacsTunnel/layout.inc b/data/layouts/Route114_FossilManiacsTunnel/layout.inc new file mode 100644 index 000000000..90a891b57 --- /dev/null +++ b/data/layouts/Route114_FossilManiacsTunnel/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route114_FossilManiacsTunnel_MapBorder:: + .incbin "data/layouts/Route114_FossilManiacsTunnel/border.bin" + + .align 2 +Route114_FossilManiacsTunnel_MapBlockdata:: + .incbin "data/layouts/Route114_FossilManiacsTunnel/map.bin" + + .align 2 +Route114_FossilManiacsTunnel_Layout:: + .4byte 0xd + .4byte 0x1a + .4byte Route114_FossilManiacsTunnel_MapBorder + .4byte Route114_FossilManiacsTunnel_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Fallarbor diff --git a/data/layouts/Route114_FossilManiacsTunnel/map.bin b/data/layouts/Route114_FossilManiacsTunnel/map.bin new file mode 100644 index 000000000..61838bff2 --- /dev/null +++ b/data/layouts/Route114_FossilManiacsTunnel/map.bin @@ -0,0 +1 @@ +w2whiiiiiijw2w2w2whxhiiGijrw2wwwphxhiOjrzjwww2pphx33rzjrwwwppp33ý2zjrrwwwppp¯6y233rrrwwwppp3y2y2Ç6rrrwwwppp3y2y2ý2rrrwwwpp-2Åy2y2ý2rrrwwwp-2¸p3y2¿6rrrwwww2¸pp3y2ý2rrrwwww2ppp3y2Æ6,rrwwww2ppp¯6ý2r·6rzjw2ww2ppp3ý2r3zjrw2ww2ppp3ý2r3y6rrw2ww2ppp3ý2r3y6rrw2whxp-2Åý2r3y6rrw2wpý2pý2p 3r77rrw2wpÇ6pý2p 3zj3rzjwpý2p¿6p 33r3r3rwpý2pý2p3ý2r3r7rwpý2pý2p3¿6r3zjrhxý2p7p3ý2r77rrpy6ý2phx3ý2zj3rrpy6ý2pp3333r3rrpy6ý2pp3±2²2ý2r3rr \ No newline at end of file diff --git a/data/layouts/Route114_LanettesHouse/border.bin b/data/layouts/Route114_LanettesHouse/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/Route114_LanettesHouse/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Route114_LanettesHouse/layout.inc b/data/layouts/Route114_LanettesHouse/layout.inc new file mode 100644 index 000000000..e1f2354c1 --- /dev/null +++ b/data/layouts/Route114_LanettesHouse/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route114_LanettesHouse_MapBorder:: + .incbin "data/layouts/Route114_LanettesHouse/border.bin" + + .align 2 +Route114_LanettesHouse_MapBlockdata:: + .incbin "data/layouts/Route114_LanettesHouse/map.bin" + + .align 2 +Route114_LanettesHouse_Layout:: + .4byte 0xb + .4byte 0x8 + .4byte Route114_LanettesHouse_MapBorder + .4byte Route114_LanettesHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Lab diff --git a/data/layouts/Route114_LanettesHouse/map.bin b/data/layouts/Route114_LanettesHouse/map.bin new file mode 100644 index 000000000..de1858be4 --- /dev/null +++ b/data/layouts/Route114_LanettesHouse/map.bin @@ -0,0 +1,2 @@ +   +L  !2 !22"2#2"2#2 !2(2(202PQ2(:2Q62%2282XY22BY,-2@22J262%2P4522222)2,-XJ2222145 \ No newline at end of file diff --git a/data/layouts/Route115/border.bin b/data/layouts/Route115/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/Route115/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/Route115/layout.inc b/data/layouts/Route115/layout.inc new file mode 100644 index 000000000..1a5121474 --- /dev/null +++ b/data/layouts/Route115/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route115_MapBorder:: + .incbin "data/layouts/Route115/border.bin" + + .align 2 +Route115_MapBlockdata:: + .incbin "data/layouts/Route115/map.bin" + + .align 2 +Route115_Layout:: + .4byte 0x28 + .4byte 0x50 + .4byte Route115_MapBorder + .4byte Route115_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Fallarbor diff --git a/data/layouts/Route115/map.bin b/data/layouts/Route115/map.bin new file mode 100644 index 000000000..64a58e691 Binary files /dev/null and b/data/layouts/Route115/map.bin differ diff --git a/data/layouts/Route116/border.bin b/data/layouts/Route116/border.bin new file mode 100644 index 000000000..03bcafef1 --- /dev/null +++ b/data/layouts/Route116/border.bin @@ -0,0 +1 @@ +ÔÕÜÝ \ No newline at end of file diff --git a/data/layouts/Route116/layout.inc b/data/layouts/Route116/layout.inc new file mode 100644 index 000000000..54471a0e0 --- /dev/null +++ b/data/layouts/Route116/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route116_MapBorder:: + .incbin "data/layouts/Route116/border.bin" + + .align 2 +Route116_MapBlockdata:: + .incbin "data/layouts/Route116/map.bin" + + .align 2 +Route116_Layout:: + .4byte 0x64 + .4byte 0x14 + .4byte Route116_MapBorder + .4byte Route116_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Rustboro diff --git a/data/layouts/Route116/map.bin b/data/layouts/Route116/map.bin new file mode 100644 index 000000000..a6e9d8843 Binary files /dev/null and b/data/layouts/Route116/map.bin differ diff --git a/data/layouts/Route116_TunnelersRestHouse/border.bin b/data/layouts/Route116_TunnelersRestHouse/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/Route116_TunnelersRestHouse/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Route116_TunnelersRestHouse/layout.inc b/data/layouts/Route116_TunnelersRestHouse/layout.inc new file mode 100644 index 000000000..4faea6ce6 --- /dev/null +++ b/data/layouts/Route116_TunnelersRestHouse/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route116_TunnelersRestHouse_MapBorder:: + .incbin "data/layouts/Route116_TunnelersRestHouse/border.bin" + + .align 2 +Route116_TunnelersRestHouse_MapBlockdata:: + .incbin "data/layouts/Route116_TunnelersRestHouse/map.bin" + + .align 2 +Route116_TunnelersRestHouse_Layout:: + .4byte 0xa + .4byte 0x9 + .4byte Route116_TunnelersRestHouse_MapBorder + .4byte Route116_TunnelersRestHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/Route116_TunnelersRestHouse/map.bin b/data/layouts/Route116_TunnelersRestHouse/map.bin new file mode 100644 index 000000000..91e2c2019 --- /dev/null +++ b/data/layouts/Route116_TunnelersRestHouse/map.bin @@ -0,0 +1 @@ +ã±²¾¿ä빺ÆÇìó2Á2Â2!2!2!2!2Î2Ï2ô2!2)2)2)2)2)2)2)2)2)2Y2NO)2)2)2)2NOD2!2VWD2)2)2D2VWD2!2)2)2)2)2)2)2)2)2)2 3333333333#33333333 \ No newline at end of file diff --git a/data/layouts/Route117/border.bin b/data/layouts/Route117/border.bin new file mode 100644 index 000000000..addb5d6ce Binary files /dev/null and b/data/layouts/Route117/border.bin differ diff --git a/data/layouts/Route117/layout.inc b/data/layouts/Route117/layout.inc new file mode 100644 index 000000000..75b7f0d98 --- /dev/null +++ b/data/layouts/Route117/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route117_MapBorder:: + .incbin "data/layouts/Route117/border.bin" + + .align 2 +Route117_MapBlockdata:: + .incbin "data/layouts/Route117/map.bin" + + .align 2 +Route117_Layout:: + .4byte 0x3c + .4byte 0x14 + .4byte Route117_MapBorder + .4byte Route117_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Mauville diff --git a/data/layouts/Route117/map.bin b/data/layouts/Route117/map.bin new file mode 100644 index 000000000..bdeda9cd4 --- /dev/null +++ b/data/layouts/Route117/map.bin @@ -0,0 +1,10 @@ +ÆÇÆÆÆÆÆÆÆÆÆÆÆÆÆÆ5670 2 000Ð0Ñ0Ñ0Ò000 0 0 +200000000ÇÇÇÇÆÆÆÇ00 0 00000°±±±±±²Æºh4s4q0u4i0j4000 2 0Ð0Ñ0Ñ0Ò040 0 0 0 00000000ÆÇÇÇÆÆÆ 0 0 0 0 0 0 00000000¸¡¡¡¡¡Â²ˆp4{4|4}4q0r440 0 00Ð0Ñ0Ù0Ú0 0000 0 0 +0000000ÇÇÇÇÇÇÇ8IIIIII:0000000¸¡¡¡¡¡¡Â²ˆp4q0q0t4y4z40 0 00È0Ñ0Ò0 0 200 2004000ÆÇÇÇÇÇÇ@2 22 +222B000000 +2¸¡¡¡¡¡¡¡ºˆx4y4y4z400 00 04Ø0Ù0Ú0000 20 000000ÇÇÇÇÇ@222 22 +2B00000000000Ì¡¡¡º‘‘‘‘‘‘‘‘‘‘‘‘‘‘‘0‘ !"‘‘‘‘‘‘20@2222 22B000000000 +2¸¡¡¡º02000000000000000000000000000IIIIIIIHI0000IJ0111111100000Ì¡º200011111111111111100000000002202020200000000 1!1)1)1)1)1*1000000000011!1!1!1)1x2y2x2y2x2y2x2y2!1!1!111000000002200202011111111!1"1000000000011111!1!1!1!1*10ÖÕÔÕÔÕÔ×(1)1!1!1!11110000022020202 !!!!!!!!1"100°±² 20000(1)1!1!1!1!1!1!1*10Î1óòóòóòóòÏ10(1!1!1!1)1*10000022200000(1)1)1)1)1)1)1)1)1*100¸¡Â²200000(1)1!1!1!1"100ÖÕÔÕÔÕÔÕÔ×00 1!1*1000000020202000000000000000¸¡¡Â±²000000(1!1!1"100ÜÝäåäåäòóç0 1"100000000II@@@@II8II000II:0 0 0¸¡¡¡¡º0200000 1!1!110ÔÕK1L5L5L5M1ÔÕ001!1"1000000ÆÆ00ÆÇÆÆ00@22 22 +222B 0 0 0¸¡¡¡¡Â±²0 0 0 00(1!1!1"10æç11111äç00 1!1*1000ÆÆÆÆÆ0ÇÆÆÆÆÆÆ@222 22 +22B 0 0 0¸¡¡¡¡¡¡º 0 0 0 0 00 1!1!1100000000001!1"100ÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆ@2222 22 +2B 0 0 0¸¡¡¡¡¡¡º 0 0 0 0 0 0(1!1!1!11111111111!1!1*100ÆÆÆÆÆÆÆÆÆÆH0IIIIIIJ@@@¸------º%0%0 0 0 0 0 0(1)1)1)1)1)1)1)1)1)1)1)1)1)1*100ÆÆÆÆÆÆÆÆÇÇÇ00000000000000ÆÆÆ0ÆÆÆÆÆÆ0ÆÆ%0%0 0 0 00000000000000000ÆÆÆÆÆÆÆÆÆÆÆÆÆ0ÆÆÆÆÆ0ÆÆÆÆÆ0ÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆ%0%0%000ÆÆÆÆÆÆÆÆÆÆÆ00ÆÆÆÆÆÇÇÇÇÇ \ No newline at end of file diff --git a/data/layouts/Route117_PokemonDayCare/border.bin b/data/layouts/Route117_PokemonDayCare/border.bin new file mode 100644 index 000000000..7f603e844 --- /dev/null +++ b/data/layouts/Route117_PokemonDayCare/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Route117_PokemonDayCare/layout.inc b/data/layouts/Route117_PokemonDayCare/layout.inc new file mode 100644 index 000000000..0589c2d1b --- /dev/null +++ b/data/layouts/Route117_PokemonDayCare/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route117_PokemonDayCare_MapBorder:: + .incbin "data/layouts/Route117_PokemonDayCare/border.bin" + + .align 2 +Route117_PokemonDayCare_MapBlockdata:: + .incbin "data/layouts/Route117_PokemonDayCare/map.bin" + + .align 2 +Route117_PokemonDayCare_Layout:: + .4byte 0xc + .4byte 0x9 + .4byte Route117_PokemonDayCare_MapBorder + .4byte Route117_PokemonDayCare_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_PokemonDayCare diff --git a/data/layouts/Route117_PokemonDayCare/map.bin b/data/layouts/Route117_PokemonDayCare/map.bin new file mode 100644 index 000000000..bd4b64e13 --- /dev/null +++ b/data/layouts/Route117_PokemonDayCare/map.bin @@ -0,0 +1,2 @@ +567       +=>?$2&22&244222 22 .!.#222222222(222322222-2022222222222)*%2222222820212222222C222922%2;<22@AAAAA \ No newline at end of file diff --git a/data/layouts/Route118/border.bin b/data/layouts/Route118/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/Route118/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/Route118/layout.inc b/data/layouts/Route118/layout.inc new file mode 100644 index 000000000..a78bd28de --- /dev/null +++ b/data/layouts/Route118/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route118_MapBorder:: + .incbin "data/layouts/Route118/border.bin" + + .align 2 +Route118_MapBlockdata:: + .incbin "data/layouts/Route118/map.bin" + + .align 2 +Route118_Layout:: + .4byte 0x50 + .4byte 0x14 + .4byte Route118_MapBorder + .4byte Route118_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Mauville diff --git a/data/layouts/Route118/map.bin b/data/layouts/Route118/map.bin new file mode 100644 index 000000000..dfd8a293d Binary files /dev/null and b/data/layouts/Route118/map.bin differ diff --git a/data/layouts/Route119/border.bin b/data/layouts/Route119/border.bin new file mode 100644 index 000000000..864ac15fa Binary files /dev/null and b/data/layouts/Route119/border.bin differ diff --git a/data/layouts/Route119/layout.inc b/data/layouts/Route119/layout.inc new file mode 100644 index 000000000..0f288c2c5 --- /dev/null +++ b/data/layouts/Route119/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route119_MapBorder:: + .incbin "data/layouts/Route119/border.bin" + + .align 2 +Route119_MapBlockdata:: + .incbin "data/layouts/Route119/map.bin" + + .align 2 +Route119_Layout:: + .4byte 0x28 + .4byte 0x8c + .4byte Route119_MapBorder + .4byte Route119_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Fortree diff --git a/data/layouts/Route119/map.bin b/data/layouts/Route119/map.bin new file mode 100644 index 000000000..1126455a2 Binary files /dev/null and b/data/layouts/Route119/map.bin differ diff --git a/data/layouts/Route119_WeatherInstitute_1F/border.bin b/data/layouts/Route119_WeatherInstitute_1F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/Route119_WeatherInstitute_1F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Route119_WeatherInstitute_1F/layout.inc b/data/layouts/Route119_WeatherInstitute_1F/layout.inc new file mode 100644 index 000000000..35ae95d37 --- /dev/null +++ b/data/layouts/Route119_WeatherInstitute_1F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +Route119_WeatherInstitute_1F_Layout:: + .4byte 0x14 + .4byte 0xd + .4byte Route119_WeatherInstitute_1F_MapBorder + .4byte Route119_WeatherInstitute_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Lab diff --git a/data/layouts/Route119_WeatherInstitute_1F/map.bin b/data/layouts/Route119_WeatherInstitute_1F/map.bin new file mode 100644 index 000000000..07a4e7ebb --- /dev/null +++ b/data/layouts/Route119_WeatherInstitute_1F/map.bin @@ -0,0 +1 @@ +__nk___k_____ˆ‰_|}~_ggkgggk,-,-g‘g„…†lmv2kj2z2z2k4545j2˜2™2z2Œ22Ž2‡tuR2sr2R2R2sj2z2z2z2w2R2R2R2R2R2R2R2r2R2R2pr2R2R2pr2R2R2`aR2R2R2`aR2R2r2R2R2xr2R2R2xr2R2^2STV2R2^2STV2R2r2U2R2€2w2R2R2€2w2R2R2Š‹R2R2R2Š‹R2U22fZ2h2R2R2R2h2Z2Z2Z2Z2Z2Z2Z2Z2Z2Z2Z2f___pR2R2R2p____________gggxR2R2R2xggggggggggggj2z2z2€2R2R2R2€2z2z2z2z2z2z2z2z2z2z2z2z2r2R2R2R2R2R2R2R2U2R2R2U2R2R2R2R2R2R2R2R2r2R2R2R2R2R2R2R2]]R2R2R2R2R2R2R2R2 \ No newline at end of file diff --git a/data/layouts/Route119_WeatherInstitute_2F/border.bin b/data/layouts/Route119_WeatherInstitute_2F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/Route119_WeatherInstitute_2F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Route119_WeatherInstitute_2F/layout.inc b/data/layouts/Route119_WeatherInstitute_2F/layout.inc new file mode 100644 index 000000000..476ebf4fa --- /dev/null +++ b/data/layouts/Route119_WeatherInstitute_2F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +Route119_WeatherInstitute_2F_Layout:: + .4byte 0x14 + .4byte 0xb + .4byte Route119_WeatherInstitute_2F_MapBorder + .4byte Route119_WeatherInstitute_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Lab diff --git a/data/layouts/Route119_WeatherInstitute_2F/map.bin b/data/layouts/Route119_WeatherInstitute_2F/map.bin new file mode 100644 index 000000000..97953f463 --- /dev/null +++ b/data/layouts/Route119_WeatherInstitute_2F/map.bin @@ -0,0 +1 @@ +_ˆ‰_k___________|6}6~6_g‘gk,-,-,-,-,-g„6ƒ†6gj2˜2™2z2k4545454545j2Œ2z2Ž2z2r2`i2i2sj2z2z2dez2z2z2dew2i2i2i2i2W2Ti2i2pr2i2^2STV2i2^2STV2i2i2i2i2r2\i2i2xr2i2i2Š‹i2i2i2Š‹i2i2i2i2i2r2i2i2i2€2w2i2i2i2i2i2i2i2i2i2i2i2i2i2i2r2i2i2i2r2i2i2`ai2i2i2`ai2i2i2i2i2r2`i2i2kr2i2^2STi2i2^2STV2i2i2i2i2W2Ti2i2kr2i2i2Š‹i2i2i2Š‹i2i2i2i2i2r2\i2i2kr2i2i2i2i2i2i2i2i2i2i2i2i2i2i2 \ No newline at end of file diff --git a/data/layouts/Route120/border.bin b/data/layouts/Route120/border.bin new file mode 100644 index 000000000..864ac15fa Binary files /dev/null and b/data/layouts/Route120/border.bin differ diff --git a/data/layouts/Route120/layout.inc b/data/layouts/Route120/layout.inc new file mode 100644 index 000000000..a58e60aee --- /dev/null +++ b/data/layouts/Route120/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route120_MapBorder:: + .incbin "data/layouts/Route120/border.bin" + + .align 2 +Route120_MapBlockdata:: + .incbin "data/layouts/Route120/map.bin" + + .align 2 +Route120_Layout:: + .4byte 0x28 + .4byte 0x64 + .4byte Route120_MapBorder + .4byte Route120_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Fortree diff --git a/data/layouts/Route120/map.bin b/data/layouts/Route120/map.bin new file mode 100644 index 000000000..599e6014d Binary files /dev/null and b/data/layouts/Route120/map.bin differ diff --git a/data/layouts/Route121/border.bin b/data/layouts/Route121/border.bin new file mode 100644 index 000000000..03bcafef1 --- /dev/null +++ b/data/layouts/Route121/border.bin @@ -0,0 +1 @@ +ÔÕÜÝ \ No newline at end of file diff --git a/data/layouts/Route121/layout.inc b/data/layouts/Route121/layout.inc new file mode 100644 index 000000000..0e39c4d35 --- /dev/null +++ b/data/layouts/Route121/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route121_MapBorder:: + .incbin "data/layouts/Route121/border.bin" + + .align 2 +Route121_MapBlockdata:: + .incbin "data/layouts/Route121/map.bin" + + .align 2 +Route121_Layout:: + .4byte 0x50 + .4byte 0x14 + .4byte Route121_MapBorder + .4byte Route121_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lilycove diff --git a/data/layouts/Route121/map.bin b/data/layouts/Route121/map.bin new file mode 100644 index 000000000..cfee98f2a --- /dev/null +++ b/data/layouts/Route121/map.bin @@ -0,0 +1 @@ +ÆÆÆÆurÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕXÔÕÔÕÔÕÔÕ01112ÔÕ0Z6urÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÆÆÆÆurÜÝÜÝÜÝÜÝäåäåÜÝÜÝÜÝÜÝXæåäåäåäç01112æç0ZuræåæåæåäåÜÝÜÝæåæåæåæåæåÜÝÜÝÜÝÜÝÜÝÜÝÆÆurÔÕÔÕÔÕÔÕs6L5L5u6ÔÕÔÕÔÕÔÕX0000000001112000Zur00000000ÔÕÔÕ0000000000ÔÕÔÕÔÕÔÕÔÕÔÕ00urÜÝÜÝÜÝÜÝ{211}2æ5åäåäåäç5X000000008999:000Zur00000000æåäç0000000000æåäåäåäåäåäå||||}rÔÕÔÕÔÕÔÕ 0 0 0PQQQQQQQQQQQQQQQQQ3$%&5QQQRurPQQQQQQQQQQQQQQQQQR0PQQQQQQAQQQQQR‘‘‘‘‘Dæ5åäåäåäç5 0 0 0 000000 0 0 0000000Î1Ï10BD-EC0tyy}r00000000 0 0 0 0 0000000000 0 0 0 00Z0000000000000000000000000000 0 0 0 0 000000Ö×000000r00tz000000000 0 0 0 0 0 0 000000 0 0 0 0 0 0Z0000000000000000000000000000 0 0 0 0 000000ÜÝÎ1Ï100000r&'rPQQQQR00PQQR00PQR00PQQQQQQQQR000000000001111111100000000 0 0 0 0 0 0 00000ÔÕÔ×t¯0Ï0yyz00r 0 0000000000Z0000Z00X0 0 00 0 0 00Z00000000011!1!1)1)1)1)1)1*10 0 0 0PQQQQQQQQQQQR00æåäçr0000000r 0 0 0PQQQQR0PR0000Z00X0 0 0 0 0 0 00Z0000Î1Ï1111!1!1!1*100000 0 0 0 0 0 0 0 0 0 0 00t|||||¯0Ï0||||z0000000r 0 0 0 0 0 0 00000Z 0 000Z0000 0 0 0 0 0 00000Î1Ï1Ö5Õ5)1)1)1)1)1*100Î1Ï1Î1Ç1Æ1Ç1Æ1Ç1 0 0 0 0t|||}t‘‘‘‘¯0Ï0‘‘‘‘‘yyy y¯0Ï0zPQQQQQQQQQQR 0 0 00Z00000000000000Ö5Õ5ä5å500000000ÖÕÔÕÔÕÔ×t|||}t‘‘‘z000000000000 0 0 0 0 0000000000000 0 0 0 0 00ZPQQQQQQQQR0000æ5å5t|00000000æ5åäç5äåäç5ut ‘‘z00000tyy¯0Ï0yy‰0000 0 0 0 0 0 0 0000000000 0 0 0 0 00Z011111100000t|||}€yyyðñyyy||||||||}r00000t|||}]^0^0^0_{||||‰ 0 0 0 0 0 0 00000000 0 0 0 0 0PQR0Õ2Ý6Ý6Ý6Ý6å200000u€‰‰‰˜PPPÖ×PPPt©©©©©©©©}t||||}€‰‰]^0^0^0^0_€‰‰‰{||||||||||||||||||||||||||||||||||}p1p1p1p1Î1Ï1Pæ5ç5t||}q0q0q0q0q0q0t©©}€‰‰‰‰˜pPe]^0^0^0^0_dQppš‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰˜p1p1p1p1Ö×Pt|}t©©||||||}€‰‰˜ppppppXm]^0^0^0^0_lYPQpppppppppppppppppppppppppppppp1p1p1p1p1p1p1p1p1p1p1p1p1æ5ç5t}q0q0u€‰‰‰‰‰‰‰‰˜ppppppppPQ’e^0^0^0^0gpXYPQPQpppppppppppppppppppppppppp1p1p1p1p1p1p1p1p1p1p1p1p1Pt}q0t|}pppppppppppppppppXYš‰‰‰‰‰‰˜pppXYXYpppppppppppppppppppppppppp1p1p1p1p1p1p1p1p1p1p1p1p1 \ No newline at end of file diff --git a/data/layouts/Route121_SafariZoneEntrance/border.bin b/data/layouts/Route121_SafariZoneEntrance/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/Route121_SafariZoneEntrance/border.bin differ diff --git a/data/layouts/Route121_SafariZoneEntrance/layout.inc b/data/layouts/Route121_SafariZoneEntrance/layout.inc new file mode 100644 index 000000000..f28d1b4dc --- /dev/null +++ b/data/layouts/Route121_SafariZoneEntrance/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route121_SafariZoneEntrance_MapBorder:: + .incbin "data/layouts/Route121_SafariZoneEntrance/border.bin" + + .align 2 +Route121_SafariZoneEntrance_MapBlockdata:: + .incbin "data/layouts/Route121_SafariZoneEntrance/map.bin" + + .align 2 +Route121_SafariZoneEntrance_Layout:: + .4byte 0x12 + .4byte 0xe + .4byte Route121_SafariZoneEntrance_MapBorder + .4byte Route121_SafariZoneEntrance_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Shop diff --git a/data/layouts/Route121_SafariZoneEntrance/map.bin b/data/layouts/Route121_SafariZoneEntrance/map.bin new file mode 100644 index 000000000..35c1badac --- /dev/null +++ b/data/layouts/Route121_SafariZoneEntrance/map.bin @@ -0,0 +1 @@ +ˆˆˆˆˆˆˆˆˆˆˆ]ˆˆ‹ˆˆœ•œ“x2p2p2p2p2p2¨Ô2˜2™2™2©e2x2p2p2p2p2€2h2h2h2h2h2°¡ ¡¡±€2h2È2h2h2º2\2h2h2h2h2h2q2Y2Z2Y2Z2p2y2h2h2h2h2º2d6h2h2h2h2ababh2h2h2h2h2h2h2€2h2h2h2Ã2Ã2\2h2h2h2ÐÑdh2h2h2Ðx2€2h2h2h2Ѐ2€2h2h2h2ÐÒ2€2h2h2h2ÑÑ\2h2h2h2q2Ó2d6h2h2t6 \ No newline at end of file diff --git a/data/layouts/Route122/border.bin b/data/layouts/Route122/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/Route122/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/Route122/layout.inc b/data/layouts/Route122/layout.inc new file mode 100644 index 000000000..39f70e4e4 --- /dev/null +++ b/data/layouts/Route122/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route122_MapBorder:: + .incbin "data/layouts/Route122/border.bin" + + .align 2 +Route122_MapBlockdata:: + .incbin "data/layouts/Route122/map.bin" + + .align 2 +Route122_Layout:: + .4byte 0x28 + .4byte 0x28 + .4byte Route122_MapBorder + .4byte Route122_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lilycove diff --git a/data/layouts/Route122/map.bin b/data/layouts/Route122/map.bin new file mode 100644 index 000000000..1c76b0b0a Binary files /dev/null and b/data/layouts/Route122/map.bin differ diff --git a/data/layouts/Route123/border.bin b/data/layouts/Route123/border.bin new file mode 100644 index 000000000..864ac15fa Binary files /dev/null and b/data/layouts/Route123/border.bin differ diff --git a/data/layouts/Route123/layout.inc b/data/layouts/Route123/layout.inc new file mode 100644 index 000000000..db9093ba9 --- /dev/null +++ b/data/layouts/Route123/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route123_MapBorder:: + .incbin "data/layouts/Route123/border.bin" + + .align 2 +Route123_MapBlockdata:: + .incbin "data/layouts/Route123/map.bin" + + .align 2 +Route123_Layout:: + .4byte 0x8c + .4byte 0x14 + .4byte Route123_MapBorder + .4byte Route123_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lilycove diff --git a/data/layouts/Route123/map.bin b/data/layouts/Route123/map.bin new file mode 100644 index 000000000..e1ab62bd7 --- /dev/null +++ b/data/layouts/Route123/map.bin @@ -0,0 +1,2 @@ +ÆÆÆÇÆÇÆÆÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÆÆÇÆÆÆÇÇÇÆÆÆÆÆÇÆÇÇÇÆÇÆÇÆÇÇppppppppppppppppppppp’E00GpppppppppppppppppÆÆÆÆÇÆÇÇÆ@000000000ÇÇÇÇÇ@ÇÇÇÇÇÇÇÇÇÆÆÇÇÇ00hiiiiiiiiiiiijÇÇÇÇÆ 0 0 0 0ÇÆ 00 0 0þà4K1L5L5L5M1ÇÇÆÇÆÇÆÇÇÆp““pppppppppppppppppp’E00GpppppppppppppppppÆÆÆÇÆÇÆÆÇ@AIIIIIIII90@ÇÇÇÇÇÇÇÇÇÇÇ00000pqqqqqqqqqqqqrÇÇÇÆ0 0 0 0 0 0 0ÇÆ 0 0 0 0…011111ÇÇÇÆÇÆÇÆÆÆ00ÇÇ“ppppppppppppppppp’E00GpppppppppppppppppÆÆÆÆÇÆÇÇÆ@Bs6u60s6u60s6u6@00 0 0 +00@ÇÇÇÇÇÇÇ000000à40x y yyy‰qqqqqrÇÇÇ00 0 0 0 0 0 0Æ 0 0 0 0…000000ÇÆÇÆÇÆÆÆÆÇÆÆÇÇ“pppppppppppppppp’E00GpppppppppppppppppÆÆÆÇÆÇÆÆÇ@B{2}20{2}20{2}2@00@ÇÇÇÇÇÇÇ°±±±±±±²000000þ00 0 0x‰qqqqrÇÇÇ000 0 0 0 0 0 0 0 0 0 0 0…0000000ÆÇÇÇÇÇÇÇ“ppppppppppppppp’E00GpppppppppppppppppÆÆÆÆÆÆÇÆ@Bs6u60s6u60s6u6@0 0@ÇÇÇÇǸ¡¡¡¡¡¡º000000…0 0 0 0 0xyy wÆÆÇÕ4‡4‡4‡4‡4‡4Ö40 0 0000 0 0…0000 0 000000000ÆÆÇÆÆÇÇÇÇ““ppppppppppppp’E00GpppppppppppppppppÆÆÆÇÆÇ0@B{2}20{2}20{2}2@0 !"0@Ç00¸¡¡¡¡¡¡º000000… 0 0 0 0 0Õ4o00ÆÆÆ0000000Æ 0000000…000 0 0 0 0 0ÇÇÇÇ0ÇÇÇÇÇÇÇÇÆÆÆ““ppppppppppp’E00Gpppppppppppppp“““ÇÆÆÆ000@3II0000II2400000@0þà4000¸¡¡¡¡¡¡º000000… 0 0 0 0 0 0…000ÇÇ0000000ÆÆ000000000 0 0 0 0 0 0 0ÇÆÇÇ0ÇÇÇÇÇÇÇÇÆÆÆÆÆ“pppppppppp’E00Gpppppppppppp““ÇÇÇÇ00000@0000000000000000@00…0000¸¡¡¡¡¡¡º000000%0%0 0 0 0 0…000Ç00000000ÆÆ0à400000ÆÆ%0 0 0 0 0 0 0ÇÇÇ0ÇÇÇÇÇÇÇÇÇÇÇÇÆÆ““pppppppp’E00Gppppppppp“““ÇÆÇÇÇ00000000@Ç000000000Ð1Ò1000@00…000000000000000à4000ÆÆ%0 0 0 0…000Õ4‡4‡4‡4‡4Ö40 0 0 0ÆÆÆ00000ÆÆÆÆ%0 0 0 0 0 0 0ÇÇÇ0ÇÇÇÆÆÆÆ“““““ppp’E00Gpp“““““““ÆÇÆÇÆÇÆÇ000000000@0000000000Ø1Ú1000@00…00000000000000000ÆÆÆÆÆ 0 00…0Æ00000000Æ%0 0 0ÆÆ0000ÆÆÆÆ%0 0 0 0 0 0ÇÇ0000000000ÇÇÇÇÇÆÆÇÆÇÇÇ>4>4>40000>4>4>4ÇÆÇÆÇÆÇÆÆÆÆÆÆÇÇ000000000HIIIIIIIIII0Ø1Ú10II200‡4‡4ÇÇÇ0Õ4‡4‡4‡4‡4‡4o4000ÆÆÆÆÆÆ000ÆÆ00000000ÆÆ 0 0 0 0Õ4‡‡‡ÖÆÆÆÆ000 0 0 00ÇÇÇ0ÇÇÇÆÇÆÇÆÇÆÇ0à40001100à40ÇÆÇÇ000000000040000000000Ø1Ú1000000000ÇÇÇ000000…ÇÇÇÇÆÆÆÆ0000Æ0000000ÆÆÆ%0 0 0 0 0000000000000000000 0 0 0ÇÇÇ0ÇÇÇÇÇÆ000001!1"100000ÆÆÆ0000000000ÇÇÇÇÇ00000000000000000Ø1Ú10000000000000000…ÆÆÆÇÇÇ0000Õ4‡4‡4‡4‡4‡4Ö4ÆÆÆÆÆ%0%0 0 000000000þ00à400000000 0 0 0 0 00ÆÆÆÆK1L5L5L5M100111!1!1*1000000ÇÇÇÆÆÆÆÆÆÆÆÇÇÆÆ00Ð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Ò100…0ÆÆÆÆÕ4‡4‡4‡4‡4‡4o0000000ÆÆÆÆ 0000011110…11111000000 0 0 0 0 0 0 000001111111!1!1!1!1*100000000000ÇÇÆÆÇÆÆ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â100…000000000…0111111100þ0111!1!1)1*10…(1)1)1!1!11111à40 0 0 0 0 0 0 00011111111111!1!1!1)1)1*100à400ÆÆÆÆÆ00000000000ÇÇÆÇÇÆÇÇ0000000000000000000000000000000000…0011111111000…0(1)1)1)1)1!1!1111110…0(1)1)1)1*1000…000(1)1)1)1)1*10%0%0%0 0 0 0 0 000(1)1)1)1)1)1)1)1)1)1)1)1)1*1000000ÇÇÇÆÆÆÆ0ÆÆÆÆÆÆÆÆ0ÆÇÆÇÆÇÆÇÇÇÇ@4I0IIIIIIIIIII@4@4IIIII0@4ÆÆÆÆ00000…00(1)1)1)1)1)1)1*1000000000(1)1)1)1)1)1*10…0000000à40000000000ÆÆÆÆ%0%0%0%0 000000000à400000000000ÇÆÇÆÆÆÆÆÆ0ÇÇÇÆÇÆÇÆÆÇÆÇ0000000000000ÇÇ000000ÆÇÆÆÆÆÆÆ00Ç000000à4000000ÆÆ00000000à40000000000000ÆÆ000ÆÆÇÆÆÆÇÆÆÆÆÆ00à4000000000000ÆÆÆÆÆÇÆÇÆÆÆÆÆÆÆ0000000000ÇÇÆÇÆÇÆÇÇÆÇÆÇÆÆÇÆÇÆÆÆÆÆÆÆÆÆÆ0ÆÆÆÇÆÇÆÇÇÆÇÇÇÇ0ÇÇÇ000000ÇÆÆÆÆÆÆÆÆÆÆ000000000ÇÇÇ000ÇÇÇÆÆÆÇÆÇÆÇÆÇÆÇÆÇÆÆÆÇÆÇ00000000ÆÆÇÆÇÇÆÇÆÇÆÇÆÇÆÇÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆ \ No newline at end of file diff --git a/data/layouts/Route124/border.bin b/data/layouts/Route124/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/Route124/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/Route124/layout.inc b/data/layouts/Route124/layout.inc new file mode 100644 index 000000000..e2c9abffc --- /dev/null +++ b/data/layouts/Route124/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route124_MapBorder:: + .incbin "data/layouts/Route124/border.bin" + + .align 2 +Route124_MapBlockdata:: + .incbin "data/layouts/Route124/map.bin" + + .align 2 +Route124_Layout:: + .4byte 0x50 + .4byte 0x50 + .4byte Route124_MapBorder + .4byte Route124_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Mossdeep diff --git a/data/layouts/Route124/map.bin b/data/layouts/Route124/map.bin new file mode 100644 index 000000000..acd4a65fb Binary files /dev/null and b/data/layouts/Route124/map.bin differ diff --git a/data/layouts/Route124_DivingTreasureHuntersHouse/border.bin b/data/layouts/Route124_DivingTreasureHuntersHouse/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/Route124_DivingTreasureHuntersHouse/border.bin differ diff --git a/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc b/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc new file mode 100644 index 000000000..2179d7208 --- /dev/null +++ b/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route124_DivingTreasureHuntersHouse_MapBorder:: + .incbin "data/layouts/Route124_DivingTreasureHuntersHouse/border.bin" + + .align 2 +Route124_DivingTreasureHuntersHouse_MapBlockdata:: + .incbin "data/layouts/Route124_DivingTreasureHuntersHouse/map.bin" + + .align 2 +Route124_DivingTreasureHuntersHouse_Layout:: + .4byte 0xa + .4byte 0x9 + .4byte Route124_DivingTreasureHuntersHouse_MapBorder + .4byte Route124_DivingTreasureHuntersHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/Route124_DivingTreasureHuntersHouse/map.bin b/data/layouts/Route124_DivingTreasureHuntersHouse/map.bin new file mode 100644 index 000000000..8f1f6cbef --- /dev/null +++ b/data/layouts/Route124_DivingTreasureHuntersHouse/map.bin @@ -0,0 +1 @@ +†‡yzXŽ‚  g 2–2—2‰2Š2$2$2$2$2$2˜9252626262626272#2#292=á2H6I6â>?#2#292=á2P6Q6â>?#2#292E2F2F2F2F2F2G#2#292#2#2#2#2#2#2#2#2"292#2#2 #2#2#2#2*6 \ No newline at end of file diff --git a/data/layouts/Route125/border.bin b/data/layouts/Route125/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/Route125/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/Route125/layout.inc b/data/layouts/Route125/layout.inc new file mode 100644 index 000000000..7c894c943 --- /dev/null +++ b/data/layouts/Route125/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route125_MapBorder:: + .incbin "data/layouts/Route125/border.bin" + + .align 2 +Route125_MapBlockdata:: + .incbin "data/layouts/Route125/map.bin" + + .align 2 +Route125_Layout:: + .4byte 0x50 + .4byte 0x28 + .4byte Route125_MapBorder + .4byte Route125_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Mossdeep diff --git a/data/layouts/Route125/map.bin b/data/layouts/Route125/map.bin new file mode 100644 index 000000000..078f2713d Binary files /dev/null and b/data/layouts/Route125/map.bin differ diff --git a/data/layouts/Route126/border.bin b/data/layouts/Route126/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/Route126/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/Route126/layout.inc b/data/layouts/Route126/layout.inc new file mode 100644 index 000000000..b7f2e3e3c --- /dev/null +++ b/data/layouts/Route126/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route126_MapBorder:: + .incbin "data/layouts/Route126/border.bin" + + .align 2 +Route126_MapBlockdata:: + .incbin "data/layouts/Route126/map.bin" + + .align 2 +Route126_Layout:: + .4byte 0x50 + .4byte 0x50 + .4byte Route126_MapBorder + .4byte Route126_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Mossdeep diff --git a/data/layouts/Route126/map.bin b/data/layouts/Route126/map.bin new file mode 100644 index 000000000..2d684cf64 Binary files /dev/null and b/data/layouts/Route126/map.bin differ diff --git a/data/layouts/Route127/border.bin b/data/layouts/Route127/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/Route127/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/Route127/layout.inc b/data/layouts/Route127/layout.inc new file mode 100644 index 000000000..637bd29b6 --- /dev/null +++ b/data/layouts/Route127/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route127_MapBorder:: + .incbin "data/layouts/Route127/border.bin" + + .align 2 +Route127_MapBlockdata:: + .incbin "data/layouts/Route127/map.bin" + + .align 2 +Route127_Layout:: + .4byte 0x50 + .4byte 0x50 + .4byte Route127_MapBorder + .4byte Route127_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Mossdeep diff --git a/data/layouts/Route127/map.bin b/data/layouts/Route127/map.bin new file mode 100644 index 000000000..fa44f9960 Binary files /dev/null and b/data/layouts/Route127/map.bin differ diff --git a/data/layouts/Route128/border.bin b/data/layouts/Route128/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/Route128/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/Route128/layout.inc b/data/layouts/Route128/layout.inc new file mode 100644 index 000000000..09265d811 --- /dev/null +++ b/data/layouts/Route128/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route128_MapBorder:: + .incbin "data/layouts/Route128/border.bin" + + .align 2 +Route128_MapBlockdata:: + .incbin "data/layouts/Route128/map.bin" + + .align 2 +Route128_Layout:: + .4byte 0x78 + .4byte 0x28 + .4byte Route128_MapBorder + .4byte Route128_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Mossdeep diff --git a/data/layouts/Route128/map.bin b/data/layouts/Route128/map.bin new file mode 100644 index 000000000..fae8a373e Binary files /dev/null and b/data/layouts/Route128/map.bin differ diff --git a/data/layouts/Route129/border.bin b/data/layouts/Route129/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/Route129/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/Route129/layout.inc b/data/layouts/Route129/layout.inc new file mode 100644 index 000000000..926213af4 --- /dev/null +++ b/data/layouts/Route129/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route129_MapBorder:: + .incbin "data/layouts/Route129/border.bin" + + .align 2 +Route129_MapBlockdata:: + .incbin "data/layouts/Route129/map.bin" + + .align 2 +Route129_Layout:: + .4byte 0x50 + .4byte 0x28 + .4byte Route129_MapBorder + .4byte Route129_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Mossdeep diff --git a/data/layouts/Route129/map.bin b/data/layouts/Route129/map.bin new file mode 100644 index 000000000..8d09787fd Binary files /dev/null and b/data/layouts/Route129/map.bin differ diff --git a/data/layouts/Route130/border.bin b/data/layouts/Route130/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/Route130/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/Route130/layout.inc b/data/layouts/Route130/layout.inc new file mode 100644 index 000000000..30a1053bf --- /dev/null +++ b/data/layouts/Route130/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route130_MapBorder:: + .incbin "data/layouts/Route130/border.bin" + + .align 2 +Route130_MapBlockdata:: + .incbin "data/layouts/Route130/map.bin" + + .align 2 +Route130_Layout:: + .4byte 0x50 + .4byte 0x28 + .4byte Route130_MapBorder + .4byte Route130_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/Route130/map.bin b/data/layouts/Route130/map.bin new file mode 100644 index 000000000..b06fa74dc --- /dev/null +++ b/data/layouts/Route130/map.bin @@ -0,0 +1 @@ +pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppr{{{{{{vpppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppr´qkllmq´vppppuvpppppppppppppppppppppppppppppppppppppppppppppppr{{{{{{{vpppppppu´qk´qquqq|uvpp}~pu{vppppppppppppppppppppppppppppppppppppppppu{{´qklllmq´vppppuv‚‰q{|||}qt„}~pppppzq|ppppuvuvppppppppppppppppppppppppppppppppzqqqk¾klm¾mq´vppp}~p‚y‰qqqty„ppu{{vpp‚y„ppPQ}~}~ppppppppppppppppppppppppppppppuvzqqqsq{|}quqq|ppPQpppp‚yyy„ppppzqq|pPQppuvXYppppPQppppppppppppppppppppppppppuv}~‚‰qq{‰qqqt}qt„ppXYpppuvppppppuv‚yy„pXYpp}~ppppppXYpppppppppppppppppppppPQppp}~ppp‚y‰q{|||}qt„puv{vppp}~pppppp}~pppPQpppppppppppppr{vpppppppppppppppppppXYu{{vpppPQp‚y‘‘‘‘‘y„pp}~q|ppppppppppPQppppXYppPQpppppppu{´q´{vpppppppppppppppuvu{´qq|pppXYppppppppuvppppy„ppppppppppXYppppppppXYpppppuv‚‰qqqq´vpppppppppppppp}~zqqqt„ppppppppppppp}~ppppppppppppppppppppppppuvppppppp}~p‚yyyyy„uvppppppu{{vpuvp‚yyy„uvppppppuvppppppppppppuvppppppppppppu{{v}~ppppppppppppppppp}~pppu{{´km´v}~pppppp}~pppppp}~pppppppppppp}~u{vpppppppuv‚yy„ppppppppppppppppppppuvppzqqq{}q|puvpppppppppppppppppppppppppuvppzt„ppppppp}~pppppppppppppppppppppppp}~PQ‚yy‰qqt„p}~ppppppppppppppppppppppppp}~pp‚„ppppppppppppppppppppppppppppppppppppXYppp‚yy„ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppPQpppppppuvppppppppppppppppppppppppppppppppppu{vpppppppppppppppppppppppppppppPQpXYppr{{{v}~ppu{{vppppppppppppppppppppppppppppzq|uvpppppppppppppppppppppppppppXYpppr{´qqq´vpuv´qq|ppppppppppppppppppppppppppuv‚y„}~pppppppppppppppppppppppppppppu{{´qqqqqq´v}~qqt„pPQpppppppppppppppppppppuv}~ppppppppppppppppppppppppppuvpuvppp‚‰qqqqqqqqq´vpyy„uvXYPQu{vpuvpppppppPQpppp}~pppppppppppppppppppppppppppp}~p}~pppp‚y‰qqqqqqty„pppp}~ppXY‚y„p}~pppppppXYu{{{vpppuvppppppppppppppppppppppPQpuvpu{{{vpp‚yyyyyy„PQpppppppppppppuvpPQpppuvppzqqq´{vp}~ppppppuvppppppppppppppXYp}~p‚‰qq´vpppppppppXYupppppppppppp}~pXYu{v}~uv‚yy‰qq´vpuvpppPQ}~pppppppPQppppr{{{vppp‚‰ty„ppppppppppp}pppppPQppppppppppzq|pp}~ppp‚yyy„p}~PQpXYppu{{vpuvXYppr{´qkm´vppp‚„pppppppppppppppppppXYpppppppppp‚y„pppppppppppppppXYuvppp‚‰q´v}~pu{{´klm{}q|pppppppppppppppppppppppppppppppppppppppppppppppppppppppp}~pppp‚yy„ppp‚‰qq{|}qqt„ppppppppppppppppppppppppppppppPQpppppppppppppppppppppppppppppppppppPQp‚yy‘‘‘yy„pppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppp \ No newline at end of file diff --git a/data/layouts/Route131/border.bin b/data/layouts/Route131/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/Route131/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/Route131/layout.inc b/data/layouts/Route131/layout.inc new file mode 100644 index 000000000..0762566a8 --- /dev/null +++ b/data/layouts/Route131/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route131_MapBorder:: + .incbin "data/layouts/Route131/border.bin" + + .align 2 +Route131_MapBlockdata:: + .incbin "data/layouts/Route131/map.bin" + + .align 2 +Route131_Layout:: + .4byte 0x3c + .4byte 0x28 + .4byte Route131_MapBorder + .4byte Route131_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/layouts/Route131/map.bin b/data/layouts/Route131/map.bin new file mode 100644 index 000000000..096d6e116 --- /dev/null +++ b/data/layouts/Route131/map.bin @@ -0,0 +1 @@ +qqqqqqqqqqqt||}ut©|}€˜ppVOOOOOOOOOOOOOOOOOVpppppppppppppppppqqqqqqqqt||}qqt}u€‰‰˜pppVOOOOOOOOOOOOOOOOOVppppppppppppppppp||||||||}qqqt|}t}pppppppVOOOOOOOOOOOOOOOOVpppppppppppppppppqqqqqt©©©|||}qt}€˜pppppppVOOOOOOOOOOOOOOOVppppppppppppppppppqqt||}qqqt©©©|}€˜ppppppppVOOOOOOOOOOOOOOOVpppppppppppppppppp||}qt©|||}€‰‰‰‰˜ppuvppppppVOOOOOOOOOOOOOOVpppppppppppppppppp©©©|}€‰‰‰‰˜uvpu{vp}~ppppppVOOOOOOOOOOOOOVppppppppppppppppppp€‰Z[‰˜ppppp}~pzq|ppppppppppVOOOOOOOOOOOOVpppppppPQpppppppppp˜pXYppppuvpppp‚y„pppppppuvpVOOOOOOOOOOOOVppuvu{vXYppppppppppppppu{vp}~ppuvPQppppppPQ}~pVOOOOOOOOOOOVpuv}~zq|ppuvppppppppppppzq|ppppp}~XYppuvppXYpu{vVOOOOOOOOOOVp}~pp‚y„PQ}~ppppppppPQpp‚y„ppuvPQpppPQ}~pPQppzq|VOOOOOOOOOVpuvppppppXYpu{{vpppppXYpppppPQ}~XYpuvXYpPQXYpp‚y„pVOOOOOOOOVu´|pppuvpppu´qq´vpppppppppppXYppppp}~pppXYppppppuvpVOOOOOOVpzq|ppp}~PQp‚yyyy„PQppppppppppppppppppppuvppppppp}~uvVVVVVVuv‚y„pppppXYuvppPQpXYu{pppppppppppppppppp}~u{vpppppp}~ppppPQ}~pppppppppp}~ppXYpppzqppppppppppppppppppppzq´{vppppuvppuvXYpppppppu{vpppppPQppuv‚ypppppppppppppppppppp‚yyy„pppp}~uv}~pppppppu{´q|pppppXYpp}~ppppppppppppppppppppppppppppppppp}~pppppppPQzqqq|ppppppPQpppPQppppppppppppppppppppppppppppppppppppppppXY‚yyy„ppppppXYpppXYppppppppppppppppppppppppPQppuvpppppppu{vppppppppppppppppppppppppppppppppppppppppppppXYPQ}~ppppuvu´q|ppppppppppppppppppppppppppppppppppppppppppppppXYppu{{v}~‚yy„pppppppppppppppppppppppppppppppppppppppppppppppppp‚yy„ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppPQppppppppppppppppppppppppppppppppppppppppppppuvppppppPQppppXYppppppppppppppppppppppppppppppppppPQuvpppppp}~pppuvpXYppppppppuvppppppppppppppppppppppppppppppXY}~ppppppu{PQp}~pppu{vpppppz´vpuvpppppppppppppuvpppppppppuvppppppppppzqXYppppppzq|puvpp‚‰´v}~pppppppppppPQ}~pppppppuv}~ppppppppPQ‚y{{{{tppp‚y„p}~uvp‚y„pppppppu{{vppXYpuvpppppp}~pppPQpuvppXYppqqqq´{tppppuvp}~ppuvpppppppzqq´{vppp}~uvpppu{{vppXYp}~puvpppllllmq´{{{t}~pppuv}~ppu{{vp‚‰qqq´vpppp}~ppu´qq´{{vu{{{v}~pppqqqq¿llmqq´{tppp}~ppu{´qq|uv‚yyyy„ppppppPQ‚yyy‰qq´´qqt„pppppqqqqqqq¿mqqqutppppppzqqqt„}~ppppppppppppXYpppp‚y‰qqqt„ppppPQqqqqqqqq¿llmuu{tppuv‚yyy„ppppppppppppppppppppppp‚yyy„pppppXYqqqqqqqqqqq¿¿¿l¿tp}~ppppppppppppppppppppppppppppppppppppppppqqqqqqqqqqqqqqqqutpppppppppppppppppppppppppppppppppppppppppp \ No newline at end of file diff --git a/data/layouts/Route132/border.bin b/data/layouts/Route132/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/Route132/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/Route132/layout.inc b/data/layouts/Route132/layout.inc new file mode 100644 index 000000000..3838b85bc --- /dev/null +++ b/data/layouts/Route132/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route132_MapBorder:: + .incbin "data/layouts/Route132/border.bin" + + .align 2 +Route132_MapBlockdata:: + .incbin "data/layouts/Route132/map.bin" + + .align 2 +Route132_Layout:: + .4byte 0x50 + .4byte 0x28 + .4byte Route132_MapBorder + .4byte Route132_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/layouts/Route132/map.bin b/data/layouts/Route132/map.bin new file mode 100644 index 000000000..3250c0429 Binary files /dev/null and b/data/layouts/Route132/map.bin differ diff --git a/data/layouts/Route133/border.bin b/data/layouts/Route133/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/Route133/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/Route133/layout.inc b/data/layouts/Route133/layout.inc new file mode 100644 index 000000000..c380a9ca1 --- /dev/null +++ b/data/layouts/Route133/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route133_MapBorder:: + .incbin "data/layouts/Route133/border.bin" + + .align 2 +Route133_MapBlockdata:: + .incbin "data/layouts/Route133/map.bin" + + .align 2 +Route133_Layout:: + .4byte 0x50 + .4byte 0x28 + .4byte Route133_MapBorder + .4byte Route133_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/layouts/Route133/map.bin b/data/layouts/Route133/map.bin new file mode 100644 index 000000000..1d4e74f73 --- /dev/null +++ b/data/layouts/Route133/map.bin @@ -0,0 +1 @@ +ppppuvuvPQppppPQppppppuvppppPQPQppppuvPQPQPQpppPQppPQppuvPQuvppppPQPQuvPQuvpppPQPQpp}~}~XYppuvXYPQuvPQ}~PQuvXYXYppPQ}~XYXYXYpuvXYPQXYPQ}~XY}~PQuvXYXY}~XY}~PQpXYXYuvppppppuv}~ppXY}~XYccXY}~ppppPQXYpppppppPQ}~ppXYppXYccppppXY}~cccccpppppXYPQppp}~pppppp}~ppppppppcccccpppppppXYcppppppppXYpppppppcccccccpppcccccccccccppppXYpccppppppppppppppccccccccccccccccccccPQŒŒŒcccccpppppcccccccccccccccccccccccccccccccccppppuvppuvpppuvccccVF2F2F2WccccƒƒƒcXYŒŒcccpppppcccccccccccccccccVF2F2F2F2F2F2F2F2F2F2F2F2Wccccccpuv}~pp}~ppp}~VF2F2F2>2ž1ž1ž1_ccccPQƒƒccccccccccccccccccccccccccccc^ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1_ccccccc}~­®1®1®1®1®1®1®1®1®1®1›1^WWWW_OgccccXYcŒŒŒŒŒcccccccccccƒƒƒƒƒƒccccccccfGGNž1ž1ž1ž1ž1ž1ž1ž1ž1_ccccVF2F2F2F2›1ž1ž1ž1^WWWWWWW´ßßtyo_ccccccŒŒŒŒccccccccccccccccccƒƒƒƒƒƒƒƒcccccfGGNž1ž1ž1ž1ž1ž1_cccc^^W_ž1ž1ž1ž1ž1fßßßßßßßtyyož1ž1_ccccŒŒŒŒcccccccccccccccVF2F2F2WcccccƒƒƒƒƒƒcccccfGNž1ž1ž1ž1_cccV>2fß¾_ž1ž1^W¾ßtyyyyyož1ž1ž1OGgccŒŒŒcccccccccccccccccc^ž1ž1ž1?2F2F2WcccccƒƒƒƒƒƒƒcccfGGGGgccc^^¾ßß¿WW¾tyyož1ž1ž1ž1ž1ž1ž1OGgccŒŒŒcccccccccccccƒƒƒƒcccfNž1ž1ž1ž1ž1?2F2F2WcccccƒƒƒƒƒƒƒccccccccV>2fßßßßßßßž1ž1ž1ž1ž1ž1ž1OGGgccŒŒŒcccu{{{{{{{{{{{{tƒƒƒƒccfNž1ž1ž1ž1ž1ž1ž1?2F2F2Wcccccƒƒƒƒƒƒcccccc^ž1fßßtyyyyož1OGGGGGgccŒŒŒŒŒcu{{´ßßßßßßßßßßßß´{{tƒƒccfNž1ž1ž1ž1ž1ž1ž1ž1ž1?2F2F2Wcccccƒƒƒƒƒcccc^ž1nyyož1ž1ž1ž1ž1ž1_cccccŒŒŒŒŒcccu´ßßßtyyyyyyyyyy‰ßßß´{tƒccfNž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1?2F2F2Wccccccccccc^ž1ž1ž1ž1ž1ž1ž1OGGGgccŒŒŒŒŒcccu{{´ßtyy’$1$1$1$1$1$1$1$1$1$1yyy‰ß|ƒƒccfNž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1_cccccccccccfGNž1ž1ž1ž1Ogccccccccccccu{´tyyy’$1Ž1¦1¦1¦1¦11$1$1Ž1¦1¦1¦11$1$1$1ˆß´tccccfGGGGGGGGGGGGGgcƒƒƒcccccccccfGGGGgcccccccccccccztyo¦1¦1¦1¦1¦1§1¤¾¾£¥1¦1¦1§1¤¾£¥1¦1¦1¦1ny‰´tcccccccccccccccccccPQƒƒƒcccccccccccccccccccccccccc}~½¾¾¾¾¾¾¾¿pp½¾¾¾¾¿p½¾¾¾¾¾¿}y~cccccccccccccccccccXYcƒƒƒccccccccccccccccccccccccccppppppppppppppppppppppppppccccccccccccccccccccccccccƒƒƒƒcccccccccccccccccccccccpppppppppppppppppppppppppcccccccccccccccccccccccccccccccccccccccccccccccccccccccccpppppppppppppppppppppccccccccccccccccccccccccccccccccccccccccccccccccccccccccccPQppPQppppPQppppppppu{{{{{{{{{{tcccPQccPQcccccPQcccccPQPQccccccccccccccccccccPQcXYPQXYPQPQXYppppu{{{´ßßßßßßßßßß´tPQXYccXYcPQPQXYPQcPQXYXYcccccccccccccccccuvcXYcccXYppXYXYpppppu´ßtyyyyy‰ßtyyyyy~XYcccccccXYXYppXYcXYO1O1O1O1cccccccccccccccuv}~lllcccpppppppppppu{´ßtož1ž1”ž1ž1n‰Šž1ž1”ž1ž1?2WcccccpppppppppppPQO1O1O1O1O1F2Wcccccccccccuv}~llllcccccccpppppu{{´tyyož1ž1ž1ž1”ž1ž1nož1ž1ž1ž1ž1ž1?2WccpppppppppppPQXYO1O1O1O1O1ž1_cccccccccuv}~llllcccccccccccppu´ßßtož1ž1ž1ž1ž1^_ž1ž1ž1ž1ž1ž1”^_ž1ž1ž1_cppppppppppppXYO1O1O1O1O1O1O1ž1_ccccccccc}~llllccccccccccccccc}yyyož1ž1”ž1ž1ž1nož1ž1ž1ž1ž1ž1ž1fg^_ž1_ccpppppppppppPQO1O1O1O1O1O1O1ž1_cccccccccclllccccccccccccccccccccc^ž1ž1ž1ž1^_ž1ž1ž1ž1ž1ž1ž1ž1ž1nofgž1_cccppppppppppXYO1O1O1O1O1O1O1ž1_ccccccccccccccccccccccccccccccccccfGNž1ž1fgž1”ž1ž1ž1ž1ž1ž1ž1ž1ž1nož1_cccccppppppƒccPQO1O1O1O1O1O1ž1_cccccccccccccccccccccccccccccccccccc^ž1ž1nož1ž1ž1ž1OGGGNž1ž1ž1ž1OgcccccccppPQƒccXYPQO1O1O1O1ž1_cccccccccc\\\cccccccccccccccccccccccfNž1ž1ž1ž1ž1OGgcccfGGGGgccccccccccXYƒƒƒccXYPQPQOgccccccccccPQ\\\\cccccccccccccccccccccfNž1ž1ž1OgccccccccccccccccccccccccƒƒƒƒccXYXYgcccccccccccXYPQ\\\\\cccccccccccccccccccfGGGgccccccccccccccccccccccccpPQƒƒƒƒccccccccccccccccccXYuvPQ\\\ccccccccccpppppppccccccccccccccccccccccccuvccppXYppƒƒƒƒccuvccccccccccuvpp}~XYccccccPQccccPQpppppPQuvccccccccccpppuvppPQuv}~ppppppppppPQPQ}~ccccccuvPQ}~ppppuvccccccXYuvPQXYpppppXY}~PQccccppPQuvp}~PQXY}~PQppuvppppPQXYXYppPQPQuv}~XYpppppp}~uvuvPQuv}~XYpPQuvPQuvppXYPQuvuvXY}~PQpXYppppXYuv}~PQuvXYppppppXYXY}~pppppppppppp}~}~XY}~pppppXY}~XY}~ppppXY}~}~ppppXYppppppppp}~ppXY}~pppppp \ No newline at end of file diff --git a/data/layouts/Route134/border.bin b/data/layouts/Route134/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/Route134/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/Route134/layout.inc b/data/layouts/Route134/layout.inc new file mode 100644 index 000000000..46c4ea9dc --- /dev/null +++ b/data/layouts/Route134/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route134_MapBorder:: + .incbin "data/layouts/Route134/border.bin" + + .align 2 +Route134_MapBlockdata:: + .incbin "data/layouts/Route134/map.bin" + + .align 2 +Route134_Layout:: + .4byte 0x50 + .4byte 0x28 + .4byte Route134_MapBorder + .4byte Route134_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/layouts/Route134/map.bin b/data/layouts/Route134/map.bin new file mode 100644 index 000000000..7b78a2d3c Binary files /dev/null and b/data/layouts/Route134/map.bin differ diff --git a/data/layouts/RustboroCity/border.bin b/data/layouts/RustboroCity/border.bin new file mode 100644 index 000000000..03bcafef1 --- /dev/null +++ b/data/layouts/RustboroCity/border.bin @@ -0,0 +1 @@ +ÔÕÜÝ \ No newline at end of file diff --git a/data/layouts/RustboroCity/layout.inc b/data/layouts/RustboroCity/layout.inc new file mode 100644 index 000000000..e1451aff6 --- /dev/null +++ b/data/layouts/RustboroCity/layout.inc @@ -0,0 +1,16 @@ + .align 2 +RustboroCity_MapBorder:: + .incbin "data/layouts/RustboroCity/border.bin" + + .align 2 +RustboroCity_MapBlockdata:: + .incbin "data/layouts/RustboroCity/map.bin" + + .align 2 +RustboroCity_Layout:: + .4byte 0x28 + .4byte 0x3c + .4byte RustboroCity_MapBorder + .4byte RustboroCity_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Rustboro diff --git a/data/layouts/RustboroCity/map.bin b/data/layouts/RustboroCity/map.bin new file mode 100644 index 000000000..06736e47e Binary files /dev/null and b/data/layouts/RustboroCity/map.bin differ diff --git a/data/layouts/RustboroCity_CuttersHouse/border.bin b/data/layouts/RustboroCity_CuttersHouse/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/RustboroCity_CuttersHouse/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/RustboroCity_CuttersHouse/layout.inc b/data/layouts/RustboroCity_CuttersHouse/layout.inc new file mode 100644 index 000000000..a0df17833 --- /dev/null +++ b/data/layouts/RustboroCity_CuttersHouse/layout.inc @@ -0,0 +1,16 @@ + .align 2 +RustboroCity_CuttersHouse_MapBorder:: + .incbin "data/layouts/RustboroCity_CuttersHouse/border.bin" + + .align 2 +RustboroCity_CuttersHouse_MapBlockdata:: + .incbin "data/layouts/RustboroCity_CuttersHouse/map.bin" + + .align 2 +RustboroCity_CuttersHouse_Layout:: + .4byte 0xb + .4byte 0x9 + .4byte RustboroCity_CuttersHouse_MapBorder + .4byte RustboroCity_CuttersHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/RustboroCity_CuttersHouse/map.bin b/data/layouts/RustboroCity_CuttersHouse/map.bin new file mode 100644 index 000000000..5515d00cf --- /dev/null +++ b/data/layouts/RustboroCity_CuttersHouse/map.bin @@ -0,0 +1 @@ +yzfg8898x88‚no@@A@€VW‰3Š3v3w3+3+3+3+3ˆ3^3_3+3{3|3|3}3,3,3,3,3,3,3+3ƒ3>2>2…3,3,3,3j7k7E3+3ƒ3>2>2…3,3,3D3r7s7E3+3‹3Œ3Œ33,3,3,3,3,3,3F3G3,3,3,3,3,3,3,3,3,3N7O7,3,3,3LM,3,3,3,3 \ No newline at end of file diff --git a/data/layouts/RustboroCity_DevonCorp_1F/border.bin b/data/layouts/RustboroCity_DevonCorp_1F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/RustboroCity_DevonCorp_1F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/RustboroCity_DevonCorp_1F/layout.inc b/data/layouts/RustboroCity_DevonCorp_1F/layout.inc new file mode 100644 index 000000000..6662b05c9 --- /dev/null +++ b/data/layouts/RustboroCity_DevonCorp_1F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +RustboroCity_DevonCorp_1F_Layout:: + .4byte 0x13 + .4byte 0x9 + .4byte RustboroCity_DevonCorp_1F_MapBorder + .4byte RustboroCity_DevonCorp_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Facility diff --git a/data/layouts/RustboroCity_DevonCorp_1F/map.bin b/data/layouts/RustboroCity_DevonCorp_1F/map.bin new file mode 100644 index 000000000..09f86a742 --- /dev/null +++ b/data/layouts/RustboroCity_DevonCorp_1F/map.bin @@ -0,0 +1 @@ +šˆ‰ˆˆ‰ˆ›šŠ‹3Œ›˜ö‘‘ö™˜’“”™˜þ3333þ™˜333™ˆ‰ †333‡3€¡ˆˆ 3€3€3¡‰ˆ‘Žœœœ„33€3€3‘3333ƒ3ƒ3ƒ3ƒ3…333333€3€33333€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€33€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€33€3€3€3€322€3€3€3€3€3€3€3€3€3€3€3€3 \ No newline at end of file diff --git a/data/layouts/RustboroCity_DevonCorp_2F/border.bin b/data/layouts/RustboroCity_DevonCorp_2F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/RustboroCity_DevonCorp_2F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/RustboroCity_DevonCorp_2F/layout.inc b/data/layouts/RustboroCity_DevonCorp_2F/layout.inc new file mode 100644 index 000000000..f6331ab38 --- /dev/null +++ b/data/layouts/RustboroCity_DevonCorp_2F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +RustboroCity_DevonCorp_2F_Layout:: + .4byte 0x13 + .4byte 0x9 + .4byte RustboroCity_DevonCorp_2F_MapBorder + .4byte RustboroCity_DevonCorp_2F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/layouts/RustboroCity_DevonCorp_2F/map.bin b/data/layouts/RustboroCity_DevonCorp_2F/map.bin new file mode 100644 index 000000000..03985c572 --- /dev/null +++ b/data/layouts/RustboroCity_DevonCorp_2F/map.bin @@ -0,0 +1 @@ +šŠ‹Œˆ‰ˆ‰ˆ‰ˆ‰ˆŠ‹Œ‰ˆ› ’“”‘‘‘‘•–—‘¡3333333333333333333€3€3€3€3£3¤3€3€3£3¤3€3€3£3¤3€3€3337¥7¦7€3€3«7¬7€3€3«7¬7€3€3«7¬7€3€3€33§3­7®7€3€3§37€3€3§3€3€3€3§3€3€3€3€33€3§3§3€3€3£3¤3€3€3£3¤3€3€3£3¤3€3€3€33€3€3€3€3€3«7¬7€3€3«7¬7€3€3«7¬7€3€3€33€3€3€3€3€3§3€3€3€3§3€3€3€3§3€3€3€3€3 \ No newline at end of file diff --git a/data/layouts/RustboroCity_DevonCorp_3F/border.bin b/data/layouts/RustboroCity_DevonCorp_3F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/RustboroCity_DevonCorp_3F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/RustboroCity_DevonCorp_3F/layout.inc b/data/layouts/RustboroCity_DevonCorp_3F/layout.inc new file mode 100644 index 000000000..2d265b6c8 --- /dev/null +++ b/data/layouts/RustboroCity_DevonCorp_3F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +RustboroCity_DevonCorp_3F_Layout:: + .4byte 0x13 + .4byte 0x9 + .4byte RustboroCity_DevonCorp_3F_MapBorder + .4byte RustboroCity_DevonCorp_3F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Facility diff --git a/data/layouts/RustboroCity_DevonCorp_3F/map.bin b/data/layouts/RustboroCity_DevonCorp_3F/map.bin new file mode 100644 index 000000000..5a55ee4ab --- /dev/null +++ b/data/layouts/RustboroCity_DevonCorp_3F/map.bin @@ -0,0 +1 @@ +ˆŠ‹Œˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ•–—‘‘IJK‘‘‘‘33333333Q3R3S3333333333€3€3€3€3€€3¸3¹3¹3¹3º3€3€3€3¸3º3€€33Ý2€3€3€3HC€ÀÁÁÁ€3€3€3ÀÂÿB€33å€3€3€3PC€»¼¼¼½€3€3€3»½C€33Ý2€3€3€¨C€ÃÄÄÄÅ€3€3€3ÃÅ©C€3å€3€3€3€€3¾3Æ3Æ3Æ3¿3€3€3€3¾3¿3€€33€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3 \ No newline at end of file diff --git a/data/layouts/RustboroCity_Flat1_1F/border.bin b/data/layouts/RustboroCity_Flat1_1F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/RustboroCity_Flat1_1F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/RustboroCity_Flat1_1F/layout.inc b/data/layouts/RustboroCity_Flat1_1F/layout.inc new file mode 100644 index 000000000..fc61a4201 --- /dev/null +++ b/data/layouts/RustboroCity_Flat1_1F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +RustboroCity_Flat1_1F_Layout:: + .4byte 0xe + .4byte 0x8 + .4byte RustboroCity_Flat1_1F_MapBorder + .4byte RustboroCity_Flat1_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/RustboroCity_Flat1_1F/map.bin b/data/layouts/RustboroCity_Flat1_1F/map.bin new file mode 100644 index 000000000..017298e71 --- /dev/null +++ b/data/layouts/RustboroCity_Flat1_1F/map.bin @@ -0,0 +1 @@ +8()*:888:8x88:H0 2B@@@B@€VWBP3+3+3+3+3+3+3+3+3+3ˆ3^3_3+3+3D3,3,3,3,3,3,3{3|3|3|3|3}3+3h7i7,3,3,3,3,3ƒ3á2H6I6â2…3+3p7q7E3,3,3,3,3ƒ3>2P6Q6â2…3F3G3,3,3,3,3,3,3‹3Œ3Œ3Œ3Œ33N7O7,3,3,3,3LM,3,3,3,3,3,3 \ No newline at end of file diff --git a/data/layouts/RustboroCity_Flat1_2F/border.bin b/data/layouts/RustboroCity_Flat1_2F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/RustboroCity_Flat1_2F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/RustboroCity_Flat1_2F/layout.inc b/data/layouts/RustboroCity_Flat1_2F/layout.inc new file mode 100644 index 000000000..b80a34322 --- /dev/null +++ b/data/layouts/RustboroCity_Flat1_2F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +RustboroCity_Flat1_2F_Layout:: + .4byte 0xe + .4byte 0x8 + .4byte RustboroCity_Flat1_2F_MapBorder + .4byte RustboroCity_Flat1_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/RustboroCity_Flat1_2F/map.bin b/data/layouts/RustboroCity_Flat1_2F/map.bin new file mode 100644 index 000000000..936907d32 --- /dev/null +++ b/data/layouts/RustboroCity_Flat1_2F/map.bin @@ -0,0 +1 @@ +8()*:888:8888:@02B@@@BT7UIB+3+3+3+3+3+3+3+3+3\3?3]3Q3+3+3,3,3,3,3,3,3,3,3,3,3,3,3,3+3D3~77Ž7E3,3{|||},3,3+3,3†7‡77E3,3ƒ:2!7/3…,3,3+3G3G3,3,3,3,3ƒ„3¶ý3…,3,3+3O7O7,3,3,3,3‹ŒŒŒ,3,3 \ No newline at end of file diff --git a/data/layouts/RustboroCity_Flat2_1F/border.bin b/data/layouts/RustboroCity_Flat2_1F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/RustboroCity_Flat2_1F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/RustboroCity_Flat2_1F/layout.inc b/data/layouts/RustboroCity_Flat2_1F/layout.inc new file mode 100644 index 000000000..55c38f906 --- /dev/null +++ b/data/layouts/RustboroCity_Flat2_1F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +RustboroCity_Flat2_1F_Layout:: + .4byte 0xe + .4byte 0x9 + .4byte RustboroCity_Flat2_1F_MapBorder + .4byte RustboroCity_Flat2_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/RustboroCity_Flat2_1F/map.bin b/data/layouts/RustboroCity_Flat2_1F/map.bin new file mode 100644 index 000000000..0f6829f9c Binary files /dev/null and b/data/layouts/RustboroCity_Flat2_1F/map.bin differ diff --git a/data/layouts/RustboroCity_Flat2_2F/border.bin b/data/layouts/RustboroCity_Flat2_2F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/RustboroCity_Flat2_2F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/RustboroCity_Flat2_2F/layout.inc b/data/layouts/RustboroCity_Flat2_2F/layout.inc new file mode 100644 index 000000000..c099b5f9a --- /dev/null +++ b/data/layouts/RustboroCity_Flat2_2F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +RustboroCity_Flat2_2F_Layout:: + .4byte 0xe + .4byte 0x9 + .4byte RustboroCity_Flat2_2F_MapBorder + .4byte RustboroCity_Flat2_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/RustboroCity_Flat2_2F/map.bin b/data/layouts/RustboroCity_Flat2_2F/map.bin new file mode 100644 index 000000000..9f3750fb4 Binary files /dev/null and b/data/layouts/RustboroCity_Flat2_2F/map.bin differ diff --git a/data/layouts/RustboroCity_Flat2_3F/border.bin b/data/layouts/RustboroCity_Flat2_3F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/RustboroCity_Flat2_3F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/RustboroCity_Flat2_3F/layout.inc b/data/layouts/RustboroCity_Flat2_3F/layout.inc new file mode 100644 index 000000000..5e938f7d6 --- /dev/null +++ b/data/layouts/RustboroCity_Flat2_3F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +RustboroCity_Flat2_3F_Layout:: + .4byte 0xe + .4byte 0x9 + .4byte RustboroCity_Flat2_3F_MapBorder + .4byte RustboroCity_Flat2_3F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/RustboroCity_Flat2_3F/map.bin b/data/layouts/RustboroCity_Flat2_3F/map.bin new file mode 100644 index 000000000..2112fe799 Binary files /dev/null and b/data/layouts/RustboroCity_Flat2_3F/map.bin differ diff --git a/data/layouts/RustboroCity_Gym/border.bin b/data/layouts/RustboroCity_Gym/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/RustboroCity_Gym/border.bin differ diff --git a/data/layouts/RustboroCity_Gym/layout.inc b/data/layouts/RustboroCity_Gym/layout.inc new file mode 100644 index 000000000..cd9b907fb --- /dev/null +++ b/data/layouts/RustboroCity_Gym/layout.inc @@ -0,0 +1,16 @@ + .align 2 +RustboroCity_Gym_MapBorder:: + .incbin "data/layouts/RustboroCity_Gym/border.bin" + + .align 2 +RustboroCity_Gym_MapBlockdata:: + .incbin "data/layouts/RustboroCity_Gym/map.bin" + + .align 2 +RustboroCity_Gym_Layout:: + .4byte 0xb + .4byte 0x14 + .4byte RustboroCity_Gym_MapBorder + .4byte RustboroCity_Gym_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_RustboroGym diff --git a/data/layouts/RustboroCity_Gym/map.bin b/data/layouts/RustboroCity_Gym/map.bin new file mode 100644 index 000000000..4451674a7 --- /dev/null +++ b/data/layouts/RustboroCity_Gym/map.bin @@ -0,0 +1,2 @@ + '226 2 +2 2 6222226222622722222222222222222222222#/22 !!!!!!"#22()))))"#2272022,2.22 "#222#/2 "/2 "#22212(*2 "#2()*222-242%"#222.222(!!"#2 "/2272()"#2 $5222322 "+2()*/2(*/2(*227222272227222222222222222&/22222&/222272220027222 \ No newline at end of file diff --git a/data/layouts/RustboroCity_House/border.bin b/data/layouts/RustboroCity_House/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/RustboroCity_House/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/RustboroCity_House/layout.inc b/data/layouts/RustboroCity_House/layout.inc new file mode 100644 index 000000000..80f658fcd --- /dev/null +++ b/data/layouts/RustboroCity_House/layout.inc @@ -0,0 +1,16 @@ + .align 2 +RustboroCity_House_MapBorder:: + .incbin "data/layouts/RustboroCity_House/border.bin" + + .align 2 +RustboroCity_House_MapBlockdata:: + .incbin "data/layouts/RustboroCity_House/map.bin" + + .align 2 +RustboroCity_House_Layouts:: + .4byte 0xc + .4byte 0x9 + .4byte RustboroCity_House_MapBorder + .4byte RustboroCity_House_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/RustboroCity_House/map.bin b/data/layouts/RustboroCity_House/map.bin new file mode 100644 index 000000000..5a53bbc77 --- /dev/null +++ b/data/layouts/RustboroCity_House/map.bin @@ -0,0 +1 @@ +yz89888819fg‚IA@@JKAno‰3Š3Q3+3+3+3R3S363+3v3w3+3,3,3{3|3|3|3|3}3,3,3,3+3,3,3ƒ3á2H^â2…3,3,3,3+3,3,3ƒ3á2PQâ2…3,3,3,3+3,3,3‹3Œ3Œ3Œ3Œ33,3,3,3F3,3,3,3,3,3,3,3,3,3,3G3N,3,3,3,3LM,3,3,3,3O \ No newline at end of file diff --git a/data/layouts/RustboroCity_House1/border.bin b/data/layouts/RustboroCity_House1/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/RustboroCity_House1/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/RustboroCity_House1/layout.inc b/data/layouts/RustboroCity_House1/layout.inc new file mode 100644 index 000000000..f88e3a80b --- /dev/null +++ b/data/layouts/RustboroCity_House1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +RustboroCity_House1_MapBorder:: + .incbin "data/layouts/RustboroCity_House1/border.bin" + + .align 2 +RustboroCity_House1_MapBlockdata:: + .incbin "data/layouts/RustboroCity_House1/map.bin" + + .align 2 +RustboroCity_House1_Layout:: + .4byte 0xd + .4byte 0x8 + .4byte RustboroCity_House1_MapBorder + .4byte RustboroCity_House1_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/RustboroCity_House1/map.bin b/data/layouts/RustboroCity_House1/map.bin new file mode 100644 index 000000000..a14fc0405 --- /dev/null +++ b/data/layouts/RustboroCity_House1/map.bin @@ -0,0 +1 @@ +888188::88888CJK@@BB@TUICN7R3S363+3+3+3+3+3\3]3Q3N7+3,3,3,3,3,3,3,3{3|3|3}3,3+3,3D3~77Ž7E3,3ƒ3>2>2…3,3+3,3D3†7‡77,3,3‹3Œ3Œ33,3F3,3,3,3,3,3,3,3,3,3,3,3G3N7,3,3,3,3LM,3,3,3,3,3O7 \ No newline at end of file diff --git a/data/layouts/RustboroCity_PokemonSchool/border.bin b/data/layouts/RustboroCity_PokemonSchool/border.bin new file mode 100644 index 000000000..8f857616b --- /dev/null +++ b/data/layouts/RustboroCity_PokemonSchool/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/RustboroCity_PokemonSchool/layout.inc b/data/layouts/RustboroCity_PokemonSchool/layout.inc new file mode 100644 index 000000000..470baa66e --- /dev/null +++ b/data/layouts/RustboroCity_PokemonSchool/layout.inc @@ -0,0 +1,16 @@ + .align 2 +RustboroCity_PokemonSchool_MapBorder:: + .incbin "data/layouts/RustboroCity_PokemonSchool/border.bin" + + .align 2 +RustboroCity_PokemonSchool_MapBlockdata:: + .incbin "data/layouts/RustboroCity_PokemonSchool/map.bin" + + .align 2 +RustboroCity_PokemonSchool_Layout:: + .4byte 0xc + .4byte 0xb + .4byte RustboroCity_PokemonSchool_MapBorder + .4byte RustboroCity_PokemonSchool_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_PokemonSchool diff --git a/data/layouts/RustboroCity_PokemonSchool/map.bin b/data/layouts/RustboroCity_PokemonSchool/map.bin new file mode 100644 index 000000000..3f3b183d3 Binary files /dev/null and b/data/layouts/RustboroCity_PokemonSchool/map.bin differ diff --git a/data/layouts/RusturfTunnel/border.bin b/data/layouts/RusturfTunnel/border.bin new file mode 100644 index 000000000..423a0732e --- /dev/null +++ b/data/layouts/RusturfTunnel/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/RusturfTunnel/layout.inc b/data/layouts/RusturfTunnel/layout.inc new file mode 100644 index 000000000..feb5b0fc0 --- /dev/null +++ b/data/layouts/RusturfTunnel/layout.inc @@ -0,0 +1,16 @@ + .align 2 +RusturfTunnel_MapBorder:: + .incbin "data/layouts/RusturfTunnel/border.bin" + + .align 2 +RusturfTunnel_MapBlockdata:: + .incbin "data/layouts/RusturfTunnel/map.bin" + + .align 2 +RusturfTunnel_Layout:: + .4byte 0x24 + .4byte 0x18 + .4byte RusturfTunnel_MapBorder + .4byte RusturfTunnel_MapBlockdata + .4byte gTileset_General + .4byte gTileset_RusturfTunnel diff --git a/data/layouts/RusturfTunnel/map.bin b/data/layouts/RusturfTunnel/map.bin new file mode 100644 index 000000000..87ce9bc73 --- /dev/null +++ b/data/layouts/RusturfTunnel/map.bin @@ -0,0 +1,2 @@ +3!43!!!4222222@<A@<<<A22222222222222222222222222222222222222222222222222222222222222222                  +2222222223!!4222222222234@<<A3422222222222@A@A22222222222 PQR   3!422         @<A2223!!4      "22222222234@<<A342222222222   "@A   @A2222222222222 "  2222222222222      2222     PQR  342222            @A2222            222   PQR  3!4        3!4@<A           @<A \ No newline at end of file diff --git a/data/layouts/SSTidalCorridor/border.bin b/data/layouts/SSTidalCorridor/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/SSTidalCorridor/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SSTidalCorridor/layout.inc b/data/layouts/SSTidalCorridor/layout.inc new file mode 100644 index 000000000..8180f0a4d --- /dev/null +++ b/data/layouts/SSTidalCorridor/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SSTidalCorridor_MapBorder:: + .incbin "data/layouts/SSTidalCorridor/border.bin" + + .align 2 +SSTidalCorridor_MapBlockdata:: + .incbin "data/layouts/SSTidalCorridor/map.bin" + + .align 2 +SSTidalCorridor_Layout:: + .4byte 0x12 + .4byte 0xd + .4byte SSTidalCorridor_MapBorder + .4byte SSTidalCorridor_MapBlockdata + .4byte gTileset_General + .4byte gTileset_InsideShip diff --git a/data/layouts/SSTidalCorridor/map.bin b/data/layouts/SSTidalCorridor/map.bin new file mode 100644 index 000000000..f8cf1725d --- /dev/null +++ b/data/layouts/SSTidalCorridor/map.bin @@ -0,0 +1 @@ +¹¸¹¸¹¸¹¸¹¸¹¸¹¸¹¸¹ÁÀÁÀÁÀÁÀÁÀÁÀÁÀÁÀÁ»2»2»2»2»2»2»2»2»2»2»2»2»2»2»2´2 6¼2º2Â2Ä2Å2Ã2Ä2Å2Ã2Ä2Å2Ã2Ä2Æ2º2º2Ç2¼2º2011111111112¼2º2º2¼2º2011111111112¼2º2º2¼2º2011111111112¼2º2º2¼2º2011111111112¼2º2º2¼2º2%#$"#$"#$"#&¼2º2º2¼2º2-+6{*+6{*+6{*+6û¼2º2º2¼2º2½2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¿2º2º2 µ2º2º2º2º2º2º2º2º2º2º2º2º2º2º2º2º2 \ No newline at end of file diff --git a/data/layouts/SSTidalLowerDeck/border.bin b/data/layouts/SSTidalLowerDeck/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/SSTidalLowerDeck/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SSTidalLowerDeck/layout.inc b/data/layouts/SSTidalLowerDeck/layout.inc new file mode 100644 index 000000000..ece1a572e --- /dev/null +++ b/data/layouts/SSTidalLowerDeck/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SSTidalLowerDeck_MapBorder:: + .incbin "data/layouts/SSTidalLowerDeck/border.bin" + + .align 2 +SSTidalLowerDeck_MapBlockdata:: + .incbin "data/layouts/SSTidalLowerDeck/map.bin" + + .align 2 +SSTidalLowerDeck_Layout:: + .4byte 0x11 + .4byte 0xd + .4byte SSTidalLowerDeck_MapBorder + .4byte SSTidalLowerDeck_MapBlockdata + .4byte gTileset_General + .4byte gTileset_InsideShip diff --git a/data/layouts/SSTidalLowerDeck/map.bin b/data/layouts/SSTidalLowerDeck/map.bin new file mode 100644 index 000000000..059ce30fe --- /dev/null +++ b/data/layouts/SSTidalLowerDeck/map.bin @@ -0,0 +1 @@ +©©©©©©©©©©©©©©©±±èê±±àê±±ëìí±±±2èê22èê2ëìí2222 2ðòî2 2ðòî2 2óôõî2 2 2 22 2ç2ç2ö2 2ç2ç2ö2 2ç2ç2ç2ö2 2 2 22à2á2â2à2á2â2 2ã2å2 2ã2ä2å2 2 2 22ëìíèéêî2èêî2ëìíî2 2 22óôõðñòî2ðòî2óôõî2 2 22ç2ç2ç2ç2ç2ç2ö2ç2ç2ö2ç2ç2ç2ö2 2 22 2 2 2 2 2 2 2 2 2 2 2 2 2 2à2â22à2á2â2à2á2â2 2à2â2 2ã2å2 2 2èê2èéêèéêî2ðòî2óõî2 2ã6å6ðñòðñòî2ç2ç2ö2ç2ç2ö2 2óõ \ No newline at end of file diff --git a/data/layouts/SSTidalRooms/border.bin b/data/layouts/SSTidalRooms/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/SSTidalRooms/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SSTidalRooms/layout.inc b/data/layouts/SSTidalRooms/layout.inc new file mode 100644 index 000000000..8cd255d8c --- /dev/null +++ b/data/layouts/SSTidalRooms/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SSTidalRooms_MapBorder:: + .incbin "data/layouts/SSTidalRooms/border.bin" + + .align 2 +SSTidalRooms_MapBlockdata:: + .incbin "data/layouts/SSTidalRooms/map.bin" + + .align 2 +SSTidalRooms_Layout:: + .4byte 0x24 + .4byte 0x12 + .4byte SSTidalRooms_MapBorder + .4byte SSTidalRooms_MapBlockdata + .4byte gTileset_General + .4byte gTileset_InsideShip diff --git a/data/layouts/SSTidalRooms/map.bin b/data/layouts/SSTidalRooms/map.bin new file mode 100644 index 000000000..6103ad0c2 --- /dev/null +++ b/data/layouts/SSTidalRooms/map.bin @@ -0,0 +1 @@ +6@k•c–mE@k•c–mE@k•c–''@k•c–mE7>Hs—žuMHs—žuMHs—ž////—žuM?>PQ:2;2;2TUPQ:2;2;2TUPQ:2;2;2;2;2™š;2;2;2TU?>XY=28282\]XY=28282\]XY=282828282¡¢828282\]?>:;2<28282;2;2:;2<28282;2;2:2;2<282828282w682828282;2;2?>=2828282828282w68282VW8282=282`2VWa282=28282828282a2?>=2828282VW82=282`2^_a282=282`2^_a282=282828282VW?>=28282`2^_b=2828282828282=2828282b8282=2828282`2^_?6@klvlmElvllCDE@lvlvmE@kv'vmE7>Hst~tuMt~ttKij/t~t~uMHs~/~//?>PQ:2;2;2TU:2;2;2;2;2qr™6š6;2;2;2TUPQ:2;2;2;2|2?>XY=28282\]=2VW8282yz¡¢828282\]XY=2VppW?>:;2<28282;2|2=2^_a282;256=282828282;2;2h;2<2^xx_?>=2828282828282=2828282828282=2828282828282=28282`2828282?>=2828282828282=2828282828282=2828282828282=2828282828282?>=28282de8282=28282de8282=28282de8282=28282de8282? \ No newline at end of file diff --git a/data/layouts/SafariZone_North/border.bin b/data/layouts/SafariZone_North/border.bin new file mode 100644 index 000000000..03bcafef1 --- /dev/null +++ b/data/layouts/SafariZone_North/border.bin @@ -0,0 +1 @@ +ÔÕÜÝ \ No newline at end of file diff --git a/data/layouts/SafariZone_North/layout.inc b/data/layouts/SafariZone_North/layout.inc new file mode 100644 index 000000000..f539c2ced --- /dev/null +++ b/data/layouts/SafariZone_North/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SafariZone_North_MapBorder:: + .incbin "data/layouts/SafariZone_North/border.bin" + + .align 2 +SafariZone_North_MapBlockdata:: + .incbin "data/layouts/SafariZone_North/map.bin" + + .align 2 +SafariZone_North_Layout:: + .4byte 0x28 + .4byte 0x28 + .4byte SafariZone_North_MapBorder + .4byte SafariZone_North_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lilycove diff --git a/data/layouts/SafariZone_North/map.bin b/data/layouts/SafariZone_North/map.bin new file mode 100644 index 000000000..4f5296815 Binary files /dev/null and b/data/layouts/SafariZone_North/map.bin differ diff --git a/data/layouts/SafariZone_Northeast/border.bin b/data/layouts/SafariZone_Northeast/border.bin new file mode 100644 index 000000000..03bcafef1 --- /dev/null +++ b/data/layouts/SafariZone_Northeast/border.bin @@ -0,0 +1 @@ +ÔÕÜÝ \ No newline at end of file diff --git a/data/layouts/SafariZone_Northeast/layout.inc b/data/layouts/SafariZone_Northeast/layout.inc new file mode 100644 index 000000000..903a6c9e0 --- /dev/null +++ b/data/layouts/SafariZone_Northeast/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SafariZone_Northeast_MapBorder:: + .incbin "data/layouts/SafariZone_Northeast/border.bin" + + .align 2 +SafariZone_Northeast_MapBlockdata:: + .incbin "data/layouts/SafariZone_Northeast/map.bin" + + .align 2 +SafariZone_Northeast_Layout:: + .4byte 0x28 + .4byte 0x28 + .4byte SafariZone_Northeast_MapBorder + .4byte SafariZone_Northeast_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lilycove diff --git a/data/layouts/SafariZone_Northeast/map.bin b/data/layouts/SafariZone_Northeast/map.bin new file mode 100644 index 000000000..9a8803a6a Binary files /dev/null and b/data/layouts/SafariZone_Northeast/map.bin differ diff --git a/data/layouts/SafariZone_Northwest/border.bin b/data/layouts/SafariZone_Northwest/border.bin new file mode 100644 index 000000000..03bcafef1 --- /dev/null +++ b/data/layouts/SafariZone_Northwest/border.bin @@ -0,0 +1 @@ +ÔÕÜÝ \ No newline at end of file diff --git a/data/layouts/SafariZone_Northwest/layout.inc b/data/layouts/SafariZone_Northwest/layout.inc new file mode 100644 index 000000000..469e25617 --- /dev/null +++ b/data/layouts/SafariZone_Northwest/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SafariZone_Northwest_MapBorder:: + .incbin "data/layouts/SafariZone_Northwest/border.bin" + + .align 2 +SafariZone_Northwest_MapBlockdata:: + .incbin "data/layouts/SafariZone_Northwest/map.bin" + + .align 2 +SafariZone_Northwest_Layout:: + .4byte 0x28 + .4byte 0x28 + .4byte SafariZone_Northwest_MapBorder + .4byte SafariZone_Northwest_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lilycove diff --git a/data/layouts/SafariZone_Northwest/map.bin b/data/layouts/SafariZone_Northwest/map.bin new file mode 100644 index 000000000..1825a1c92 Binary files /dev/null and b/data/layouts/SafariZone_Northwest/map.bin differ diff --git a/data/layouts/SafariZone_RestHouse/border.bin b/data/layouts/SafariZone_RestHouse/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/SafariZone_RestHouse/border.bin differ diff --git a/data/layouts/SafariZone_RestHouse/layout.inc b/data/layouts/SafariZone_RestHouse/layout.inc new file mode 100644 index 000000000..7cb238719 --- /dev/null +++ b/data/layouts/SafariZone_RestHouse/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SafariZone_RestHouse_MapBorder:: + .incbin "data/layouts/SafariZone_RestHouse/border.bin" + + .align 2 +SafariZone_RestHouse_MapBlockdata:: + .incbin "data/layouts/SafariZone_RestHouse/map.bin" + + .align 2 +SafariZone_RestHouse_Layout:: + .4byte 0xa + .4byte 0x9 + .4byte SafariZone_RestHouse_MapBorder + .4byte SafariZone_RestHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/SafariZone_RestHouse/map.bin b/data/layouts/SafariZone_RestHouse/map.bin new file mode 100644 index 000000000..c57c99c7b --- /dev/null +++ b/data/layouts/SafariZone_RestHouse/map.bin @@ -0,0 +1 @@ +        $2$2$2$2$2$2$2$2$2$292#242è6ê6<2#2#2#2#292#242ð6ò6<2#2#2#2#292#2#2#2#2#2#2#2#2#292#2#2 #2#2#2#2#2 \ No newline at end of file diff --git a/data/layouts/SafariZone_South/border.bin b/data/layouts/SafariZone_South/border.bin new file mode 100644 index 000000000..03bcafef1 --- /dev/null +++ b/data/layouts/SafariZone_South/border.bin @@ -0,0 +1 @@ +ÔÕÜÝ \ No newline at end of file diff --git a/data/layouts/SafariZone_South/layout.inc b/data/layouts/SafariZone_South/layout.inc new file mode 100644 index 000000000..6431c6c01 --- /dev/null +++ b/data/layouts/SafariZone_South/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SafariZone_South_MapBorder:: + .incbin "data/layouts/SafariZone_South/border.bin" + + .align 2 +SafariZone_South_MapBlockdata:: + .incbin "data/layouts/SafariZone_South/map.bin" + + .align 2 +SafariZone_South_Layout:: + .4byte 0x28 + .4byte 0x28 + .4byte SafariZone_South_MapBorder + .4byte SafariZone_South_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lilycove diff --git a/data/layouts/SafariZone_South/map.bin b/data/layouts/SafariZone_South/map.bin new file mode 100644 index 000000000..50497b503 Binary files /dev/null and b/data/layouts/SafariZone_South/map.bin differ diff --git a/data/layouts/SafariZone_Southeast/border.bin b/data/layouts/SafariZone_Southeast/border.bin new file mode 100644 index 000000000..03bcafef1 --- /dev/null +++ b/data/layouts/SafariZone_Southeast/border.bin @@ -0,0 +1 @@ +ÔÕÜÝ \ No newline at end of file diff --git a/data/layouts/SafariZone_Southeast/layout.inc b/data/layouts/SafariZone_Southeast/layout.inc new file mode 100644 index 000000000..450efcd07 --- /dev/null +++ b/data/layouts/SafariZone_Southeast/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SafariZone_Southeast_MapBorder:: + .incbin "data/layouts/SafariZone_Southeast/border.bin" + + .align 2 +SafariZone_Southeast_MapBlockdata:: + .incbin "data/layouts/SafariZone_Southeast/map.bin" + + .align 2 +SafariZone_Southeast_Layout:: + .4byte 0x28 + .4byte 0x28 + .4byte SafariZone_Southeast_MapBorder + .4byte SafariZone_Southeast_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lilycove diff --git a/data/layouts/SafariZone_Southeast/map.bin b/data/layouts/SafariZone_Southeast/map.bin new file mode 100644 index 000000000..a778b8797 Binary files /dev/null and b/data/layouts/SafariZone_Southeast/map.bin differ diff --git a/data/layouts/SafariZone_Southwest/border.bin b/data/layouts/SafariZone_Southwest/border.bin new file mode 100644 index 000000000..03bcafef1 --- /dev/null +++ b/data/layouts/SafariZone_Southwest/border.bin @@ -0,0 +1 @@ +ÔÕÜÝ \ No newline at end of file diff --git a/data/layouts/SafariZone_Southwest/layout.inc b/data/layouts/SafariZone_Southwest/layout.inc new file mode 100644 index 000000000..559736b9f --- /dev/null +++ b/data/layouts/SafariZone_Southwest/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SafariZone_Southwest_MapBorder:: + .incbin "data/layouts/SafariZone_Southwest/border.bin" + + .align 2 +SafariZone_Southwest_MapBlockdata:: + .incbin "data/layouts/SafariZone_Southwest/map.bin" + + .align 2 +SafariZone_Southwest_Layout:: + .4byte 0x28 + .4byte 0x28 + .4byte SafariZone_Southwest_MapBorder + .4byte SafariZone_Southwest_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lilycove diff --git a/data/layouts/SafariZone_Southwest/map.bin b/data/layouts/SafariZone_Southwest/map.bin new file mode 100644 index 000000000..0074b6e55 Binary files /dev/null and b/data/layouts/SafariZone_Southwest/map.bin differ diff --git a/data/layouts/ScorchedSlab/border.bin b/data/layouts/ScorchedSlab/border.bin new file mode 100644 index 000000000..423a0732e --- /dev/null +++ b/data/layouts/ScorchedSlab/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/ScorchedSlab/layout.inc b/data/layouts/ScorchedSlab/layout.inc new file mode 100644 index 000000000..e9f30c74c --- /dev/null +++ b/data/layouts/ScorchedSlab/layout.inc @@ -0,0 +1,16 @@ + .align 2 +ScorchedSlab_MapBorder:: + .incbin "data/layouts/ScorchedSlab/border.bin" + + .align 2 +ScorchedSlab_MapBlockdata:: + .incbin "data/layouts/ScorchedSlab/map.bin" + + .align 2 +ScorchedSlab_Layout:: + .4byte 0xf + .4byte 0x14 + .4byte ScorchedSlab_MapBorder + .4byte ScorchedSlab_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/ScorchedSlab/map.bin b/data/layouts/ScorchedSlab/map.bin new file mode 100644 index 000000000..edbd982ee --- /dev/null +++ b/data/layouts/ScorchedSlab/map.bin @@ -0,0 +1 @@ +222222222222222222222222222222222‰‘‘‘‘‘Šppppp‰’ppppppˆŠpppppppˆŠpppppppˆŠpppppppˆŠpppppppˆŠpppppppˆŠpppƒpppˆGG^^‹Œ„^^GGG          $G \ No newline at end of file diff --git a/data/layouts/SeafloorCavern_Entrance/border.bin b/data/layouts/SeafloorCavern_Entrance/border.bin new file mode 100644 index 000000000..f0eabd248 --- /dev/null +++ b/data/layouts/SeafloorCavern_Entrance/border.bin @@ -0,0 +1 @@ +ññññ \ No newline at end of file diff --git a/data/layouts/SeafloorCavern_Entrance/layout.inc b/data/layouts/SeafloorCavern_Entrance/layout.inc new file mode 100644 index 000000000..eaed336bc --- /dev/null +++ b/data/layouts/SeafloorCavern_Entrance/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SeafloorCavern_Entrance_MapBorder:: + .incbin "data/layouts/SeafloorCavern_Entrance/border.bin" + + .align 2 +SeafloorCavern_Entrance_MapBlockdata:: + .incbin "data/layouts/SeafloorCavern_Entrance/map.bin" + + .align 2 +SeafloorCavern_Entrance_Layout:: + .4byte 0x14 + .4byte 0x14 + .4byte SeafloorCavern_Entrance_MapBorder + .4byte SeafloorCavern_Entrance_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/SeafloorCavern_Entrance/map.bin b/data/layouts/SeafloorCavern_Entrance/map.bin new file mode 100644 index 000000000..f41e6e77d --- /dev/null +++ b/data/layouts/SeafloorCavern_Entrance/map.bin @@ -0,0 +1,11 @@ +ññññññëùùþÿùùìñññññññññëùëù3ùìùìñññññññ ëù $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$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$1$1$1Ž1¦1¦1¦11$1$1$1$1$1 +ñ $1$1$1Ž1¦1§1ž1ž1ž1¥1¦11$1$1$1 +ñ $1$1Ž1§1ž1ž1ž1ž1ž1ž1ž1¥11$1$1 +ñ $1Ž1§1ž1¤¾¾¾¾¾£ž1¥11$1 +ñ Ž1§1ž1¤¿ppppp½£ž11$1 +ñ Ÿ1ž1¤¿ppppppp½£¥11 +ñ §1ž1·pppppppppµž11 +ñ ž1ž1·pppppppppµž11 +ñô§ž1·ppVVVVpppµ¯—óóñññ§·pV””””Vp˜ñññññññ™V””””V˜ñññññññññññññññññ \ No newline at end of file diff --git a/data/layouts/SeafloorCavern_Room1/border.bin b/data/layouts/SeafloorCavern_Room1/border.bin new file mode 100644 index 000000000..f0eabd248 --- /dev/null +++ b/data/layouts/SeafloorCavern_Room1/border.bin @@ -0,0 +1 @@ +ññññ \ No newline at end of file diff --git a/data/layouts/SeafloorCavern_Room1/layout.inc b/data/layouts/SeafloorCavern_Room1/layout.inc new file mode 100644 index 000000000..6deb54493 --- /dev/null +++ b/data/layouts/SeafloorCavern_Room1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SeafloorCavern_Room1_MapBorder:: + .incbin "data/layouts/SeafloorCavern_Room1/border.bin" + + .align 2 +SeafloorCavern_Room1_MapBlockdata:: + .incbin "data/layouts/SeafloorCavern_Room1/map.bin" + + .align 2 +SeafloorCavern_Room1_Layout:: + .4byte 0x14 + .4byte 0x15 + .4byte SeafloorCavern_Room1_MapBorder + .4byte SeafloorCavern_Room1_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/SeafloorCavern_Room1/map.bin b/data/layouts/SeafloorCavern_Room1/map.bin new file mode 100644 index 000000000..57cd82f78 --- /dev/null +++ b/data/layouts/SeafloorCavern_Room1/map.bin @@ -0,0 +1 @@ +ññññññññññññññññññññññëùùþÿùùùùùùìñ2ñ2ñ2ññññòñë3ì22222øìñ2ñ2ññññòñò222ð222222øìñ2ññññòñò222øù2ì2222ðñ2ññññòñòí22222øì222ðñ2ññññòñôêï622222øì22øìññññòññò÷6222222ð222ðññññòññôéééééê2ð222øìñññòëùùìññññò2ð222íðñññòò22øùùùùú2øì222øìññòò2222222222ð222íðññòò22èé6é6é6é6ê2íð2222ðññòò22ðñ6ñ6ñ6ñ6ò22ð22<22ðññòò2èó6ñ6ñ6ñ6ñ6ò22ðåæçóññòò2ðñ6ñ6ëùùú22ððññññññòò2øùùú22222ððññññññòò2222222èééôðññññññòò2222222ðñññðññññññòôåæçééééóñññðññññññóééééééééééééóññññ \ No newline at end of file diff --git a/data/layouts/SeafloorCavern_Room2/border.bin b/data/layouts/SeafloorCavern_Room2/border.bin new file mode 100644 index 000000000..f0eabd248 --- /dev/null +++ b/data/layouts/SeafloorCavern_Room2/border.bin @@ -0,0 +1 @@ +ññññ \ No newline at end of file diff --git a/data/layouts/SeafloorCavern_Room2/layout.inc b/data/layouts/SeafloorCavern_Room2/layout.inc new file mode 100644 index 000000000..c0dfdcedc --- /dev/null +++ b/data/layouts/SeafloorCavern_Room2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SeafloorCavern_Room2_MapBorder:: + .incbin "data/layouts/SeafloorCavern_Room2/border.bin" + + .align 2 +SeafloorCavern_Room2_MapBlockdata:: + .incbin "data/layouts/SeafloorCavern_Room2/map.bin" + + .align 2 +SeafloorCavern_Room2_Layout:: + .4byte 0x12 + .4byte 0xc + .4byte SeafloorCavern_Room2_MapBorder + .4byte SeafloorCavern_Room2_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/SeafloorCavern_Room2/map.bin b/data/layouts/SeafloorCavern_Room2/map.bin new file mode 100644 index 000000000..72a064870 --- /dev/null +++ b/data/layouts/SeafloorCavern_Room2/map.bin @@ -0,0 +1,7 @@ +ññëùþÿìëþÿÿìñññññ ë3ìøúë3ìøìññññ ò222øùùú22øì +ññññ ò2222222222ð +ñññëò2èê2èê2èê2ð +ñññ ëú2øú2ðò2øú2ð +ñññ ò22222øú2222ð +ñññ ò222222222èéé +ñññ òf2èéééåæçéééñññ ò22øùìñññééñññññ ò2222ðéééñññññññóéåæçéóóñññññññññ \ No newline at end of file diff --git a/data/layouts/SeafloorCavern_Room3/border.bin b/data/layouts/SeafloorCavern_Room3/border.bin new file mode 100644 index 000000000..f0eabd248 --- /dev/null +++ b/data/layouts/SeafloorCavern_Room3/border.bin @@ -0,0 +1 @@ +ññññ \ No newline at end of file diff --git a/data/layouts/SeafloorCavern_Room3/layout.inc b/data/layouts/SeafloorCavern_Room3/layout.inc new file mode 100644 index 000000000..58ce10cdf --- /dev/null +++ b/data/layouts/SeafloorCavern_Room3/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SeafloorCavern_Room3_MapBorder:: + .incbin "data/layouts/SeafloorCavern_Room3/border.bin" + + .align 2 +SeafloorCavern_Room3_MapBlockdata:: + .incbin "data/layouts/SeafloorCavern_Room3/map.bin" + + .align 2 +SeafloorCavern_Room3_Layout:: + .4byte 0x10 + .4byte 0x11 + .4byte SeafloorCavern_Room3_MapBorder + .4byte SeafloorCavern_Room3_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/SeafloorCavern_Room3/map.bin b/data/layouts/SeafloorCavern_Room3/map.bin new file mode 100644 index 000000000..01d18c73c --- /dev/null +++ b/data/layouts/SeafloorCavern_Room3/map.bin @@ -0,0 +1 @@ +ñ6ñ6ñ6ñ6ëùùþÿùùìñ6ñ6ñ6ñ6ñ6ñ6ñ6òëùù3ùìðñ6ñ6ñ6ñ6ñ6ñ6ëúò22222ðìñ6ñ6ñ6ñ6ñ6òñ6ò22222ìùìñ6ñ6ñ6òëú222222ìñ6ðñ6ñ6ñ6òò22222222ìðñ6ñ6ñ6òò222èéê222ððñ6ñ6ñ6òò222ðñ6ò222ððëùùò222ðñ6ò222ððòëùùú222ðñ6ò222ððòò222222øùú222ððòò222222222222ððòò222222222222ððòòQQQM22222222ððòò22222èåæçéééôðòò22222ðééééééôôôéåæçéôôñ6ñ6ñ6ñ6ñ6ñ6ñ6 \ No newline at end of file diff --git a/data/layouts/SeafloorCavern_Room4/border.bin b/data/layouts/SeafloorCavern_Room4/border.bin new file mode 100644 index 000000000..f0eabd248 --- /dev/null +++ b/data/layouts/SeafloorCavern_Room4/border.bin @@ -0,0 +1 @@ +ññññ \ No newline at end of file diff --git a/data/layouts/SeafloorCavern_Room4/layout.inc b/data/layouts/SeafloorCavern_Room4/layout.inc new file mode 100644 index 000000000..f4ff113ff --- /dev/null +++ b/data/layouts/SeafloorCavern_Room4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SeafloorCavern_Room4_MapBorder:: + .incbin "data/layouts/SeafloorCavern_Room4/border.bin" + + .align 2 +SeafloorCavern_Room4_MapBlockdata:: + .incbin "data/layouts/SeafloorCavern_Room4/map.bin" + + .align 2 +SeafloorCavern_Room4_Layout:: + .4byte 0x12 + .4byte 0x13 + .4byte SeafloorCavern_Room4_MapBorder + .4byte SeafloorCavern_Room4_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/SeafloorCavern_Room4/map.bin b/data/layouts/SeafloorCavern_Room4/map.bin new file mode 100644 index 000000000..928749c95 --- /dev/null +++ b/data/layouts/SeafloorCavern_Room4/map.bin @@ -0,0 +1 @@ +ëùùþÿùùùùùùþÿùùìòëù3ìññññë3ìñ6ðòò2222ðññññò222ðñ6ðòò2222ðññññò222ðñ6ðòòLQQMøùùùùú222ðñ6ðòò2222222292222øìðòò22222222922222ððòò22222èééôê2222ððòò2222èðñ6ñ6ñ6òê222ððòò2222ðøþÿúò222ððòò2222øù3ùú222ððòò22222922222222ððòôéê2229222222èéôðòññôééééêLQQQMðññðôéñññññò22222ðññðññôéñññò22222ðññðññññôéñôåæçééôññðññññññòññññññññéôññññññôééééééééôññ \ No newline at end of file diff --git a/data/layouts/SeafloorCavern_Room5/border.bin b/data/layouts/SeafloorCavern_Room5/border.bin new file mode 100644 index 000000000..f0eabd248 --- /dev/null +++ b/data/layouts/SeafloorCavern_Room5/border.bin @@ -0,0 +1 @@ +ññññ \ No newline at end of file diff --git a/data/layouts/SeafloorCavern_Room5/layout.inc b/data/layouts/SeafloorCavern_Room5/layout.inc new file mode 100644 index 000000000..69218f64b --- /dev/null +++ b/data/layouts/SeafloorCavern_Room5/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SeafloorCavern_Room5_MapBorder:: + .incbin "data/layouts/SeafloorCavern_Room5/border.bin" + + .align 2 +SeafloorCavern_Room5_MapBlockdata:: + .incbin "data/layouts/SeafloorCavern_Room5/map.bin" + + .align 2 +SeafloorCavern_Room5_Layout:: + .4byte 0x14 + .4byte 0x14 + .4byte SeafloorCavern_Room5_MapBorder + .4byte SeafloorCavern_Room5_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/SeafloorCavern_Room5/map.bin b/data/layouts/SeafloorCavern_Room5/map.bin new file mode 100644 index 000000000..386430fe4 --- /dev/null +++ b/data/layouts/SeafloorCavern_Room5/map.bin @@ -0,0 +1 @@ +ñëùþÿùùùùùìñññññññññòë3ùùùùìðññ‰‘‘‘ññòò2222222ððññŠ“““ˆññòò2222222ððññŠ“““ˆññóóéééê222ððññó󂓈ñ‰‘ñññòê22ðøùùù슓ˆñŠ“ˆñëùúò22øùùùìðóóóñóóóñòëùú222222ððñññññëùùúò22222222ðøùùùìñòëùùú222èéê22øùùùìðñòò22222èðñòê22222ððñòò22222ððñòò22222ððñòò22èéêððñòò22222ððñòò22ðòððñóóéåæçéóóñòò2èóòðøùìññññ‰‘‘ñòò2øùùúøùìðñññ‰’““ˆñòò2222222ððñ‰‘’“““ˆñòò2222222ððñŠ““““€óñóóéééåæçéóóñó‚“€óóñññññññññññññññóóóñññ \ No newline at end of file diff --git a/data/layouts/SeafloorCavern_Room6/border.bin b/data/layouts/SeafloorCavern_Room6/border.bin new file mode 100644 index 000000000..a00c39057 --- /dev/null +++ b/data/layouts/SeafloorCavern_Room6/border.bin @@ -0,0 +1 @@ +~~~~ \ No newline at end of file diff --git a/data/layouts/SeafloorCavern_Room6/layout.inc b/data/layouts/SeafloorCavern_Room6/layout.inc new file mode 100644 index 000000000..d18506d6b --- /dev/null +++ b/data/layouts/SeafloorCavern_Room6/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SeafloorCavern_Room6_MapBorder:: + .incbin "data/layouts/SeafloorCavern_Room6/border.bin" + + .align 2 +SeafloorCavern_Room6_MapBlockdata:: + .incbin "data/layouts/SeafloorCavern_Room6/map.bin" + + .align 2 +SeafloorCavern_Room6_Layout:: + .4byte 0x18 + .4byte 0x17 + .4byte SeafloorCavern_Room6_MapBorder + .4byte SeafloorCavern_Room6_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/layouts/SeafloorCavern_Room6/map.bin b/data/layouts/SeafloorCavern_Room6/map.bin new file mode 100644 index 000000000..452263326 --- /dev/null +++ b/data/layouts/SeafloorCavern_Room6/map.bin @@ -0,0 +1 @@ +‰ŠŽz‘2’Žxzzy2y2y2y2€‰‰‰‰‰‰‰‰‰‰‰‰‰‰xxzzy2y2y2y2pŒ‹‹‹‹‹‹‹‹‹‹‹‹’xxzzy2y2y2y2pŒpppppppppppƒ’xxzzy2y2y2y2pŒpppÃvvvÅpppƒ’xxzz€‰‰‰˜pŒppu~~~—wppƒ’xxzzpppppŒpp}€ˆ‰Š‚ppƒ’xxzzpp„„„Œpp…††‘††‡ppƒ’xxzzpƒpppŒpppppƒpppp„ƒ’xxzzpƒpppŒp„„„„ƒppppƒƒ’xxzzpƒpppŒpƒpppppŒ‹‹pƒ’xxzzpƒpŒ‹p„ƒŒ‹‹‹‹‹ppƒp’xxzzpƒpŒpŒppŒpppppppƒp’xxzzpƒpŒpŒpp„„„Œppppƒp’xxzzpƒpŒpŒpppppŒppppƒp’xxzzpƒpŒpŒpppp„p„„„„ƒp’xxzzpƒpŒpŒppppƒ„„„„ƒpp’xxzzpƒpŒp„„„„„ƒppppppp’xxzzpƒ‹‹ppƒpppƒpppppÃvvvvzzpppppÃœo2o2o2›vÅpÃvv~~~~vvvvvvvvvz~2–2~2x~vvv~~~~~~~~~~~~~~~”˜™š“~~~~~~~~~~ \ No newline at end of file diff --git a/data/layouts/SeafloorCavern_Room7/border.bin b/data/layouts/SeafloorCavern_Room7/border.bin new file mode 100644 index 000000000..a00c39057 --- /dev/null +++ b/data/layouts/SeafloorCavern_Room7/border.bin @@ -0,0 +1 @@ +~~~~ \ No newline at end of file diff --git a/data/layouts/SeafloorCavern_Room7/layout.inc b/data/layouts/SeafloorCavern_Room7/layout.inc new file mode 100644 index 000000000..6e953c06e --- /dev/null +++ b/data/layouts/SeafloorCavern_Room7/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SeafloorCavern_Room7_MapBorder:: + .incbin "data/layouts/SeafloorCavern_Room7/border.bin" + + .align 2 +SeafloorCavern_Room7_MapBlockdata:: + .incbin "data/layouts/SeafloorCavern_Room7/map.bin" + + .align 2 +SeafloorCavern_Room7_Layout:: + .4byte 0x17 + .4byte 0x19 + .4byte SeafloorCavern_Room7_MapBorder + .4byte SeafloorCavern_Room7_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/layouts/SeafloorCavern_Room7/map.bin b/data/layouts/SeafloorCavern_Room7/map.bin new file mode 100644 index 000000000..7fa1d903d --- /dev/null +++ b/data/layouts/SeafloorCavern_Room7/map.bin @@ -0,0 +1 @@ +ˆ‰ŠŽz‘2’Ž~6~6~6~6~6~6~6~6~6xzzy2y2y2y2y2y2y2y2y2y2x~6~6~6~6~6~6~6~6~6xzzy2y2y2y2y2€‰‰‰€Žxzz€‰‰‰‰˜pppš‰‰‰‰‰‰‰‰xxzzppppppppppppppppp’xxzzpŒ‹‹‹‹‹‹‹‹‹‹‹‹‹‹p’xxzzpŒpppppppppppppƒp’xxzzpŒŒ„„„„„„„„„„„„ƒp’xxzzpŒŒppppŒppppppppp’xxzzppŒpppp„„„„„„„„Œp’xxzzppŒppppppppppppŒp’xxzzŒpŒpp‹‹‹‹‹‹‹‹‹pŒp’xxzzŒpŒppŒ‹ppppppƒpŒp’xxzzŒpŒppŒƒppppppƒpŒp’xxzzŒp„„„Œƒ‹‹‹‹‹‹p„Œp’xxzzŒppppŒpppppppƒpŒp’xxzzŒppppŒpppppppƒpŒp’xxzzŒ‹‹‹‹‹‹‹‹‹pppƒ‹‹‹’xxz“6œ6q2ypppppppƒpppƒppp’xxzy6z6y2pppppppƒpppƒppp’xxzy6z6y2q2q2q2q2q2yppƒpppƒppp’xxz6‚6y2y2y2y2y2y2ppƒpppƒppp’xxzzy2•2y2y2sy2tpp„pppƒppp’xx””˜™š“““““vvvvvvvvvv“““ \ No newline at end of file diff --git a/data/layouts/SeafloorCavern_Room8/border.bin b/data/layouts/SeafloorCavern_Room8/border.bin new file mode 100644 index 000000000..f0eabd248 --- /dev/null +++ b/data/layouts/SeafloorCavern_Room8/border.bin @@ -0,0 +1 @@ +ññññ \ No newline at end of file diff --git a/data/layouts/SeafloorCavern_Room8/layout.inc b/data/layouts/SeafloorCavern_Room8/layout.inc new file mode 100644 index 000000000..1a0477b68 --- /dev/null +++ b/data/layouts/SeafloorCavern_Room8/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SeafloorCavern_Room8_MapBorder:: + .incbin "data/layouts/SeafloorCavern_Room8/border.bin" + + .align 2 +SeafloorCavern_Room8_MapBlockdata:: + .incbin "data/layouts/SeafloorCavern_Room8/map.bin" + + .align 2 +SeafloorCavern_Room8_Layout:: + .4byte 0xb + .4byte 0xe + .4byte SeafloorCavern_Room8_MapBorder + .4byte SeafloorCavern_Room8_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/SeafloorCavern_Room8/map.bin b/data/layouts/SeafloorCavern_Room8/map.bin new file mode 100644 index 000000000..e70e95b47 --- /dev/null +++ b/data/layouts/SeafloorCavern_Room8/map.bin @@ -0,0 +1 @@ +ññññññññññññëùùþÿùù6ìññòñë3ìñðññòëú222øìðññòò22222ððññòò22222ððññòò22222ððññòò22222ððññòò22222ððññòò22222ððññòò2LQM2ððññòò22222ððññòò22222ððññóóéåæçéôôñ \ No newline at end of file diff --git a/data/layouts/SeafloorCavern_Room9/border.bin b/data/layouts/SeafloorCavern_Room9/border.bin new file mode 100644 index 000000000..f0eabd248 --- /dev/null +++ b/data/layouts/SeafloorCavern_Room9/border.bin @@ -0,0 +1 @@ +ññññ \ No newline at end of file diff --git a/data/layouts/SeafloorCavern_Room9/layout.inc b/data/layouts/SeafloorCavern_Room9/layout.inc new file mode 100644 index 000000000..115db570b --- /dev/null +++ b/data/layouts/SeafloorCavern_Room9/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SeafloorCavern_Room9_MapBorder:: + .incbin "data/layouts/SeafloorCavern_Room9/border.bin" + + .align 2 +SeafloorCavern_Room9_MapBlockdata:: + .incbin "data/layouts/SeafloorCavern_Room9/map.bin" + + .align 2 +SeafloorCavern_Room9_Layout:: + .4byte 0x1b + .4byte 0x2e + .4byte SeafloorCavern_Room9_MapBorder + .4byte SeafloorCavern_Room9_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/SeafloorCavern_Room9/map.bin b/data/layouts/SeafloorCavern_Room9/map.bin new file mode 100644 index 000000000..252112ac2 --- /dev/null +++ b/data/layouts/SeafloorCavern_Room9/map.bin @@ -0,0 +1 @@ +ëùùùùùùùùùùùùùìññññññññññññòëùùùùùùùùùùùìðññññññññññññòòõ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2ðøùùìñññññññññòôéõ2õ2õ2õ2õ2õ2õ2õ2õ2øùùìðñññññññññòññòõ2ö2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2ððñññññññññôéêôåæçéõ2õ2õ2õ2õ2õ2õ2ððñññññññññññòñññññòõ2õ2õ2õ2õ2õ2õ2ððñññññññññññôééêññòëùù2ùùìðøìñññññññññññññòññòòõ2õ2õ2õ2õ2ððñðñññññññññññññòññòòõ2õ2õ2õ2õ2ððñøìññññññññññññòññòòõ2õ2õ2õ2õ2ðøìñðññññññññññññòñëúòëù2ùìðñðñðññññññññññññòñòëúòõ2õ2õ2ððñðñøìññññññññññëúñòòëúõ2õ2õ2ðøìøìñðññññññññññòññòòòõ2õ2õ2õ2øìðñðñøìññññññëùùúñëúòòõ2õ2õ2õ2õ2ððñðññðññññññòññññòëúò2ðøìðññðñññññùúñëùùúòëú222øìððññðññññññññòñññòò222ðððññðñññññëùùúñëùúò22222ðððññðñññññòññññòññò22222ððøùìøùùùùùòññëùúññò2ððññðññññññòñëúññëùú222ðøùìøùùùùùìúñòññëú222øùìøùùùùùìðùùúññò  222øùùùùìñððñëùùùú 222   ðñðøñò 2222222 ðñøùñò2222222222ðñññëú 2222222    #øùùìò 222    #ðò2222 #  ðò2222      ðò2222 #    ðò2222 ‰‘‘ ðò222 # ‰’OO ðò222‰‘’OOOO‘ðò222ŠpNOOOONpˆðò222ŠppNNNNppˆðò22222‰’ppppppppˆðò22222 Špppppppppˆðò22222222#2s2lppppppppˆðóóó222222222#2lpppppjs2s2$2ðñññóé22222222#2s2s2s2s2s2$2222ðñññóééé2222222222222ôôôñññññññññóééé222222ééôññññññññññññññññóééééééóññññññ \ No newline at end of file diff --git a/data/layouts/SealedChamber_InnerRoom/border.bin b/data/layouts/SealedChamber_InnerRoom/border.bin new file mode 100644 index 000000000..9afd13cdc Binary files /dev/null and b/data/layouts/SealedChamber_InnerRoom/border.bin differ diff --git a/data/layouts/SealedChamber_InnerRoom/layout.inc b/data/layouts/SealedChamber_InnerRoom/layout.inc new file mode 100644 index 000000000..3de6298e2 --- /dev/null +++ b/data/layouts/SealedChamber_InnerRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SealedChamber_InnerRoom_MapBorder:: + .incbin "data/layouts/SealedChamber_InnerRoom/border.bin" + + .align 2 +SealedChamber_InnerRoom_MapBlockdata:: + .incbin "data/layouts/SealedChamber_InnerRoom/map.bin" + + .align 2 +SealedChamber_InnerRoom_Layout:: + .4byte 0x15 + .4byte 0x17 + .4byte SealedChamber_InnerRoom_MapBorder + .4byte SealedChamber_InnerRoom_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/SealedChamber_InnerRoom/map.bin b/data/layouts/SealedChamber_InnerRoom/map.bin new file mode 100644 index 000000000..823fa5fab --- /dev/null +++ b/data/layouts/SealedChamber_InnerRoom/map.bin @@ -0,0 +1 @@ +ñëùùùùùùùùùùùùùùùùùìññòëùùùùùùùùùùùùùùùìðñëúòëùùùùìñññëùùùùìðøìòëúò2222ðñññò2222ðøìðòòëú2222ø777ú2222øìððòòò222222222222222ðððòòò22èéê22222èéê22ðððòòò22ðñò22222ðñò22ðððòòò22ø7ú22222ø7ú22ðððòòò222222222222222ðððòòò222222222222222ðððòòòèéê222222222èéêðððòòòðñò222222222ðñòðððòòòø7ú222222222ø7úðððòòò222222222222222ðððòòò222222222222222ðððòòò22èéê22222èéê22ðððòòò22ðñò22222ðñò22ðððòòôê2ø7ú22222ø7ú2èóððòôò2222222222222ðóðôòôéééééåæçéééééóðóñòôéééééééééééééééóðññôéééééééééééééééééóñ \ No newline at end of file diff --git a/data/layouts/SealedChamber_OuterRoom/border.bin b/data/layouts/SealedChamber_OuterRoom/border.bin new file mode 100644 index 000000000..9afd13cdc Binary files /dev/null and b/data/layouts/SealedChamber_OuterRoom/border.bin differ diff --git a/data/layouts/SealedChamber_OuterRoom/layout.inc b/data/layouts/SealedChamber_OuterRoom/layout.inc new file mode 100644 index 000000000..b966d00ef --- /dev/null +++ b/data/layouts/SealedChamber_OuterRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SealedChamber_OuterRoom_MapBorder:: + .incbin "data/layouts/SealedChamber_OuterRoom/border.bin" + + .align 2 +SealedChamber_OuterRoom_MapBlockdata:: + .incbin "data/layouts/SealedChamber_OuterRoom/map.bin" + + .align 2 +SealedChamber_OuterRoom_Layout:: + .4byte 0x15 + .4byte 0x17 + .4byte SealedChamber_OuterRoom_MapBorder + .4byte SealedChamber_OuterRoom_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/SealedChamber_OuterRoom/map.bin b/data/layouts/SealedChamber_OuterRoom/map.bin new file mode 100644 index 000000000..bf1482f97 --- /dev/null +++ b/data/layouts/SealedChamber_OuterRoom/map.bin @@ -0,0 +1,11 @@ +`*+,a)2324)222222222222222222222222222222    +2    +2  +555255525222222222222222    +2    +2  +555255525222222222222222    +2    +222255525552222222222222222222    +2    +22225552555222222222222222222222222€‰‰‰2222222222VVV’2222222222VGV’22222$ggggg_____ggggg#$                 #$$                 ## \ No newline at end of file diff --git a/data/layouts/SecretBase_BlueCave1/border.bin b/data/layouts/SecretBase_BlueCave1/border.bin new file mode 100644 index 000000000..5c0908a6a --- /dev/null +++ b/data/layouts/SecretBase_BlueCave1/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SecretBase_BlueCave1/layout.inc b/data/layouts/SecretBase_BlueCave1/layout.inc new file mode 100644 index 000000000..7e3110f48 --- /dev/null +++ b/data/layouts/SecretBase_BlueCave1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_BlueCave1_MapBorder:: + .incbin "data/layouts/SecretBase_BlueCave1/border.bin" + + .align 2 +SecretBase_BlueCave1_MapBlockdata:: + .incbin "data/layouts/SecretBase_BlueCave1/map.bin" + + .align 2 +SecretBase_BlueCave1_Layout:: + .4byte 0xb + .4byte 0x9 + .4byte SecretBase_BlueCave1_MapBorder + .4byte SecretBase_BlueCave1_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBlueCave diff --git a/data/layouts/SecretBase_BlueCave1/map.bin b/data/layouts/SecretBase_BlueCave1/map.bin new file mode 100644 index 000000000..371b2a8d5 --- /dev/null +++ b/data/layouts/SecretBase_BlueCave1/map.bin @@ -0,0 +1,50 @@ +6 +2 +2 +2 +2 +2   6 +2 +22 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 +26  +2 +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 +2 6 +2 +22 +2 +2 +2   \ No newline at end of file diff --git a/data/layouts/SecretBase_BlueCave2/border.bin b/data/layouts/SecretBase_BlueCave2/border.bin new file mode 100644 index 000000000..5c0908a6a --- /dev/null +++ b/data/layouts/SecretBase_BlueCave2/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SecretBase_BlueCave2/layout.inc b/data/layouts/SecretBase_BlueCave2/layout.inc new file mode 100644 index 000000000..7a3228832 --- /dev/null +++ b/data/layouts/SecretBase_BlueCave2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_BlueCave2_MapBorder:: + .incbin "data/layouts/SecretBase_BlueCave2/border.bin" + + .align 2 +SecretBase_BlueCave2_MapBlockdata:: + .incbin "data/layouts/SecretBase_BlueCave2/map.bin" + + .align 2 +SecretBase_BlueCave2_Layout:: + .4byte 0xf + .4byte 0x7 + .4byte SecretBase_BlueCave2_MapBorder + .4byte SecretBase_BlueCave2_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBlueCave diff --git a/data/layouts/SecretBase_BlueCave2/map.bin b/data/layouts/SecretBase_BlueCave2/map.bin new file mode 100644 index 000000000..4993e5b65 --- /dev/null +++ b/data/layouts/SecretBase_BlueCave2/map.bin @@ -0,0 +1,57 @@ +  62 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 6 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 6 +2 +2 +2 +2 +22 +2 +2 +26  \ No newline at end of file diff --git a/data/layouts/SecretBase_BlueCave3/border.bin b/data/layouts/SecretBase_BlueCave3/border.bin new file mode 100644 index 000000000..5c0908a6a --- /dev/null +++ b/data/layouts/SecretBase_BlueCave3/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SecretBase_BlueCave3/layout.inc b/data/layouts/SecretBase_BlueCave3/layout.inc new file mode 100644 index 000000000..a1921a475 --- /dev/null +++ b/data/layouts/SecretBase_BlueCave3/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_BlueCave3_MapBorder:: + .incbin "data/layouts/SecretBase_BlueCave3/border.bin" + + .align 2 +SecretBase_BlueCave3_MapBlockdata:: + .incbin "data/layouts/SecretBase_BlueCave3/map.bin" + + .align 2 +SecretBase_BlueCave3_Layout:: + .4byte 0xa + .4byte 0x11 + .4byte SecretBase_BlueCave3_MapBorder + .4byte SecretBase_BlueCave3_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBlueCave diff --git a/data/layouts/SecretBase_BlueCave3/map.bin b/data/layouts/SecretBase_BlueCave3/map.bin new file mode 100644 index 000000000..968aade07 --- /dev/null +++ b/data/layouts/SecretBase_BlueCave3/map.bin @@ -0,0 +1,51 @@ +  +2 +2 +2 +22 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 +2   +2 +2  +2 +2   +2 +2   +2 +222 +2 +2 +2 +2  +2   +2  +2   +2 +2 +22 +2   +2 +2   +2 6 +222   +2 +22 +2 +2   \ No newline at end of file diff --git a/data/layouts/SecretBase_BlueCave4/border.bin b/data/layouts/SecretBase_BlueCave4/border.bin new file mode 100644 index 000000000..5c0908a6a --- /dev/null +++ b/data/layouts/SecretBase_BlueCave4/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SecretBase_BlueCave4/layout.inc b/data/layouts/SecretBase_BlueCave4/layout.inc new file mode 100644 index 000000000..81509d18c --- /dev/null +++ b/data/layouts/SecretBase_BlueCave4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_BlueCave4_MapBorder:: + .incbin "data/layouts/SecretBase_BlueCave4/border.bin" + + .align 2 +SecretBase_BlueCave4_MapBlockdata:: + .incbin "data/layouts/SecretBase_BlueCave4/map.bin" + + .align 2 +SecretBase_BlueCave4_Layout:: + .4byte 0x9 + .4byte 0x11 + .4byte SecretBase_BlueCave4_MapBorder + .4byte SecretBase_BlueCave4_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBlueCave diff --git a/data/layouts/SecretBase_BlueCave4/map.bin b/data/layouts/SecretBase_BlueCave4/map.bin new file mode 100644 index 000000000..631ac0f81 --- /dev/null +++ b/data/layouts/SecretBase_BlueCave4/map.bin @@ -0,0 +1,57 @@ +  +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +22   +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 6 +2 +2"6  #6  2  +2   6 +22   +2 +2 +2   +22 +2   \ No newline at end of file diff --git a/data/layouts/SecretBase_BrownCave1/border.bin b/data/layouts/SecretBase_BrownCave1/border.bin new file mode 100644 index 000000000..5c0908a6a --- /dev/null +++ b/data/layouts/SecretBase_BrownCave1/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SecretBase_BrownCave1/layout.inc b/data/layouts/SecretBase_BrownCave1/layout.inc new file mode 100644 index 000000000..e1bec323a --- /dev/null +++ b/data/layouts/SecretBase_BrownCave1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_BrownCave1_MapBorder:: + .incbin "data/layouts/SecretBase_BrownCave1/border.bin" + + .align 2 +SecretBase_BrownCave1_MapBlockdata:: + .incbin "data/layouts/SecretBase_BrownCave1/map.bin" + + .align 2 +SecretBase_BrownCave1_Layout:: + .4byte 0xb + .4byte 0x9 + .4byte SecretBase_BrownCave1_MapBorder + .4byte SecretBase_BrownCave1_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBrownCave diff --git a/data/layouts/SecretBase_BrownCave1/map.bin b/data/layouts/SecretBase_BrownCave1/map.bin new file mode 100644 index 000000000..56d3436ca --- /dev/null +++ b/data/layouts/SecretBase_BrownCave1/map.bin @@ -0,0 +1,54 @@ +6 +2 +2 +2 +2 +2 +2 +2   +2 6 +2 +22 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 +26 +2 +2 +2 +2 +2 +2 +2   +2 +2 +22 +2 +2 +2   \ No newline at end of file diff --git a/data/layouts/SecretBase_BrownCave2/border.bin b/data/layouts/SecretBase_BrownCave2/border.bin new file mode 100644 index 000000000..5c0908a6a --- /dev/null +++ b/data/layouts/SecretBase_BrownCave2/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SecretBase_BrownCave2/layout.inc b/data/layouts/SecretBase_BrownCave2/layout.inc new file mode 100644 index 000000000..52d595212 --- /dev/null +++ b/data/layouts/SecretBase_BrownCave2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_BrownCave2_MapBorder:: + .incbin "data/layouts/SecretBase_BrownCave2/border.bin" + + .align 2 +SecretBase_BrownCave2_MapBlockdata:: + .incbin "data/layouts/SecretBase_BrownCave2/map.bin" + + .align 2 +SecretBase_BrownCave2_Layout:: + .4byte 0xe + .4byte 0x9 + .4byte SecretBase_BrownCave2_MapBorder + .4byte SecretBase_BrownCave2_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBrownCave diff --git a/data/layouts/SecretBase_BrownCave2/map.bin b/data/layouts/SecretBase_BrownCave2/map.bin new file mode 100644 index 000000000..184896975 --- /dev/null +++ b/data/layouts/SecretBase_BrownCave2/map.bin @@ -0,0 +1,56 @@ +  +2 +2 +2 +2 +2 +2 +2 +2 6   +26 +2 +2 +2 +2 +2 +22 +2   +2   +2 +2 +2 +2 +2 +2 +2 +2   +2   +2 +2 +2 +2 +2 +2 +2 +2   +2   +2 +2 +2 +2 +2 +2 +2 +2   +2   +2 +2 +2 +2 +2 +2 +2 2 6 +2 +2 +2 +2   \ No newline at end of file diff --git a/data/layouts/SecretBase_BrownCave3/border.bin b/data/layouts/SecretBase_BrownCave3/border.bin new file mode 100644 index 000000000..5c0908a6a --- /dev/null +++ b/data/layouts/SecretBase_BrownCave3/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SecretBase_BrownCave3/layout.inc b/data/layouts/SecretBase_BrownCave3/layout.inc new file mode 100644 index 000000000..4fa22e613 --- /dev/null +++ b/data/layouts/SecretBase_BrownCave3/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_BrownCave3_MapBorder:: + .incbin "data/layouts/SecretBase_BrownCave3/border.bin" + + .align 2 +SecretBase_BrownCave3_MapBlockdata:: + .incbin "data/layouts/SecretBase_BrownCave3/map.bin" + + .align 2 +SecretBase_BrownCave3_Layout:: + .4byte 0xf + .4byte 0xb + .4byte SecretBase_BrownCave3_MapBorder + .4byte SecretBase_BrownCave3_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBrownCave diff --git a/data/layouts/SecretBase_BrownCave3/map.bin b/data/layouts/SecretBase_BrownCave3/map.bin new file mode 100644 index 000000000..d9967522a --- /dev/null +++ b/data/layouts/SecretBase_BrownCave3/map.bin @@ -0,0 +1,69 @@ +  +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +26 +2 +2 +2 66 +2 +2 +2   +2 +2 +2 6   +2 +2 +2   +2 +2 +2 +2   +2 +2 +2   +2 +2 +2 +2  +2 +2 +2   +2 +2 +2 +2  2 +2 +2 +2   +2 +2 +2 +2   +2 +2 +2 +2   +2 +2 +2 +2   +2 +2 +2 +2   +22 +2 +2   \ No newline at end of file diff --git a/data/layouts/SecretBase_BrownCave4/border.bin b/data/layouts/SecretBase_BrownCave4/border.bin new file mode 100644 index 000000000..5c0908a6a --- /dev/null +++ b/data/layouts/SecretBase_BrownCave4/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SecretBase_BrownCave4/layout.inc b/data/layouts/SecretBase_BrownCave4/layout.inc new file mode 100644 index 000000000..65566a482 --- /dev/null +++ b/data/layouts/SecretBase_BrownCave4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_BrownCave4_MapBorder:: + .incbin "data/layouts/SecretBase_BrownCave4/border.bin" + + .align 2 +SecretBase_BrownCave4_MapBlockdata:: + .incbin "data/layouts/SecretBase_BrownCave4/map.bin" + + .align 2 +SecretBase_BrownCave4_Layout:: + .4byte 0xe + .4byte 0xc + .4byte SecretBase_BrownCave4_MapBorder + .4byte SecretBase_BrownCave4_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBrownCave diff --git a/data/layouts/SecretBase_BrownCave4/map.bin b/data/layouts/SecretBase_BrownCave4/map.bin new file mode 100644 index 000000000..8b5a763c4 --- /dev/null +++ b/data/layouts/SecretBase_BrownCave4/map.bin @@ -0,0 +1,70 @@ +  62 +2 +2 +2 +2 +2 +2 +2"6 +2 +2   +2 +2 +2 +2 +2 +2 +2 +2 +2#6 +2 +2   +2 +2 +2 +2   +2 +2 +2   +2   +2 +2 +2  +2   +2 +2 +2   +2 +2 +2 +22 +2   +2 +2 +2   +2 +2 +2 +2 +2 +2   +22 +2   +2 +2 +2 +2 +2 +2    +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2  \ No newline at end of file diff --git a/data/layouts/SecretBase_RedCave1/border.bin b/data/layouts/SecretBase_RedCave1/border.bin new file mode 100644 index 000000000..5c0908a6a --- /dev/null +++ b/data/layouts/SecretBase_RedCave1/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SecretBase_RedCave1/layout.inc b/data/layouts/SecretBase_RedCave1/layout.inc new file mode 100644 index 000000000..f9dcde880 --- /dev/null +++ b/data/layouts/SecretBase_RedCave1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_RedCave1_MapBorder:: + .incbin "data/layouts/SecretBase_RedCave1/border.bin" + + .align 2 +SecretBase_RedCave1_MapBlockdata:: + .incbin "data/layouts/SecretBase_RedCave1/map.bin" + + .align 2 +SecretBase_RedCave1_Layout:: + .4byte 0xb + .4byte 0x9 + .4byte SecretBase_RedCave1_MapBorder + .4byte SecretBase_RedCave1_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseRedCave diff --git a/data/layouts/SecretBase_RedCave1/map.bin b/data/layouts/SecretBase_RedCave1/map.bin new file mode 100644 index 000000000..ce666b57d --- /dev/null +++ b/data/layouts/SecretBase_RedCave1/map.bin @@ -0,0 +1,51 @@ + +2 +2 +2 +2 +2 +2 +2   6 +2 +2 +2 +2 +2 +2 +2 6  +2 +2 +2 +2 +2 +2 +2 +26  +2 +2 +2 +2 +2 +22 +2   +2 +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 +2 6 +2 +22 +2 +2 +26  \ No newline at end of file diff --git a/data/layouts/SecretBase_RedCave2/border.bin b/data/layouts/SecretBase_RedCave2/border.bin new file mode 100644 index 000000000..5c0908a6a --- /dev/null +++ b/data/layouts/SecretBase_RedCave2/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SecretBase_RedCave2/layout.inc b/data/layouts/SecretBase_RedCave2/layout.inc new file mode 100644 index 000000000..667a744ad --- /dev/null +++ b/data/layouts/SecretBase_RedCave2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_RedCave2_MapBorder:: + .incbin "data/layouts/SecretBase_RedCave2/border.bin" + + .align 2 +SecretBase_RedCave2_MapBlockdata:: + .incbin "data/layouts/SecretBase_RedCave2/map.bin" + + .align 2 +SecretBase_RedCave2_Layout:: + .4byte 0x7 + .4byte 0x10 + .4byte SecretBase_RedCave2_MapBorder + .4byte SecretBase_RedCave2_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseRedCave diff --git a/data/layouts/SecretBase_RedCave2/map.bin b/data/layouts/SecretBase_RedCave2/map.bin new file mode 100644 index 000000000..4fa03acfe --- /dev/null +++ b/data/layouts/SecretBase_RedCave2/map.bin @@ -0,0 +1,42 @@ +  +22 +2   +2 +2 +2   +2 +2 +2  +2 +2 +2  2 +2 +2 +2   +2 +2 +2 +2   +2 +2 +2 +2 6  +2 +2 +2 +2 6   +2 +2 +2 +2 +2   +2 +2 +2 +2 +2  +2 +2 +26 +26  +2  2   \ No newline at end of file diff --git a/data/layouts/SecretBase_RedCave3/border.bin b/data/layouts/SecretBase_RedCave3/border.bin new file mode 100644 index 000000000..5c0908a6a --- /dev/null +++ b/data/layouts/SecretBase_RedCave3/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SecretBase_RedCave3/layout.inc b/data/layouts/SecretBase_RedCave3/layout.inc new file mode 100644 index 000000000..39a079d2b --- /dev/null +++ b/data/layouts/SecretBase_RedCave3/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_RedCave3_MapBorder:: + .incbin "data/layouts/SecretBase_RedCave3/border.bin" + + .align 2 +SecretBase_RedCave3_MapBlockdata:: + .incbin "data/layouts/SecretBase_RedCave3/map.bin" + + .align 2 +SecretBase_RedCave3_Layout:: + .4byte 0xf + .4byte 0x8 + .4byte SecretBase_RedCave3_MapBorder + .4byte SecretBase_RedCave3_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseRedCave diff --git a/data/layouts/SecretBase_RedCave3/map.bin b/data/layouts/SecretBase_RedCave3/map.bin new file mode 100644 index 000000000..0528e565d --- /dev/null +++ b/data/layouts/SecretBase_RedCave3/map.bin @@ -0,0 +1,47 @@ +  +2 +22 +2   6 +2 +2 +2 +2   +2 +2 +2 +2   +2 +2 +2 +2 +2 6 +2 +2 +2 +2   +2 +2 +2 +2 +222 +22 +2 +2 +2 +2   +2 +2 +2 +2 +26 +2 +2 +2 +2   +2 +22 +2 +2 6 +2 +2 +2   \ No newline at end of file diff --git a/data/layouts/SecretBase_RedCave4/border.bin b/data/layouts/SecretBase_RedCave4/border.bin new file mode 100644 index 000000000..5c0908a6a --- /dev/null +++ b/data/layouts/SecretBase_RedCave4/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SecretBase_RedCave4/layout.inc b/data/layouts/SecretBase_RedCave4/layout.inc new file mode 100644 index 000000000..890c1c3b5 --- /dev/null +++ b/data/layouts/SecretBase_RedCave4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_RedCave4_MapBorder:: + .incbin "data/layouts/SecretBase_RedCave4/border.bin" + + .align 2 +SecretBase_RedCave4_MapBlockdata:: + .incbin "data/layouts/SecretBase_RedCave4/map.bin" + + .align 2 +SecretBase_RedCave4_Layout:: + .4byte 0x9 + .4byte 0xf + .4byte SecretBase_RedCave4_MapBorder + .4byte SecretBase_RedCave4_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseRedCave diff --git a/data/layouts/SecretBase_RedCave4/map.bin b/data/layouts/SecretBase_RedCave4/map.bin new file mode 100644 index 000000000..526763290 --- /dev/null +++ b/data/layouts/SecretBase_RedCave4/map.bin @@ -0,0 +1,56 @@ +  +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 "66 #6 2   +2 +2 +2 +22 +2   +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 6  +22 +2 +2 +2 +2 6   +2 +2 +2  \ No newline at end of file diff --git a/data/layouts/SecretBase_Shrub1/border.bin b/data/layouts/SecretBase_Shrub1/border.bin new file mode 100644 index 000000000..064786e8c --- /dev/null +++ b/data/layouts/SecretBase_Shrub1/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SecretBase_Shrub1/layout.inc b/data/layouts/SecretBase_Shrub1/layout.inc new file mode 100644 index 000000000..835028c64 --- /dev/null +++ b/data/layouts/SecretBase_Shrub1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_Shrub1_MapBorder:: + .incbin "data/layouts/SecretBase_Shrub1/border.bin" + + .align 2 +SecretBase_Shrub1_MapBlockdata:: + .incbin "data/layouts/SecretBase_Shrub1/map.bin" + + .align 2 +SecretBase_Shrub1_Layout:: + .4byte 0xb + .4byte 0x9 + .4byte SecretBase_Shrub1_MapBorder + .4byte SecretBase_Shrub1_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseShrub diff --git a/data/layouts/SecretBase_Shrub1/map.bin b/data/layouts/SecretBase_Shrub1/map.bin new file mode 100644 index 000000000..4b566cc1b --- /dev/null +++ b/data/layouts/SecretBase_Shrub1/map.bin @@ -0,0 +1,53 @@ +  +2 +2  +2 +2 +2 +2   +2 +2 6 +22 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 +26 +2 +2 +2 +2 +2 +2 +2   +2 +2 +22 +2 +2 +2   \ No newline at end of file diff --git a/data/layouts/SecretBase_Shrub2/border.bin b/data/layouts/SecretBase_Shrub2/border.bin new file mode 100644 index 000000000..064786e8c --- /dev/null +++ b/data/layouts/SecretBase_Shrub2/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SecretBase_Shrub2/layout.inc b/data/layouts/SecretBase_Shrub2/layout.inc new file mode 100644 index 000000000..cd1fe6119 --- /dev/null +++ b/data/layouts/SecretBase_Shrub2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_Shrub2_MapBorder:: + .incbin "data/layouts/SecretBase_Shrub2/border.bin" + + .align 2 +SecretBase_Shrub2_MapBlockdata:: + .incbin "data/layouts/SecretBase_Shrub2/map.bin" + + .align 2 +SecretBase_Shrub2_Layout:: + .4byte 0xf + .4byte 0x7 + .4byte SecretBase_Shrub2_MapBorder + .4byte SecretBase_Shrub2_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseShrub diff --git a/data/layouts/SecretBase_Shrub2/map.bin b/data/layouts/SecretBase_Shrub2/map.bin new file mode 100644 index 000000000..8cb88cc44 --- /dev/null +++ b/data/layouts/SecretBase_Shrub2/map.bin @@ -0,0 +1,57 @@ +  6 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +22   +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2  +2 +22 +2 +2 +2 +2 +2  \ No newline at end of file diff --git a/data/layouts/SecretBase_Shrub3/border.bin b/data/layouts/SecretBase_Shrub3/border.bin new file mode 100644 index 000000000..064786e8c --- /dev/null +++ b/data/layouts/SecretBase_Shrub3/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SecretBase_Shrub3/layout.inc b/data/layouts/SecretBase_Shrub3/layout.inc new file mode 100644 index 000000000..721df1201 --- /dev/null +++ b/data/layouts/SecretBase_Shrub3/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_Shrub3_MapBorder:: + .incbin "data/layouts/SecretBase_Shrub3/border.bin" + + .align 2 +SecretBase_Shrub3_MapBlockdata:: + .incbin "data/layouts/SecretBase_Shrub3/map.bin" + + .align 2 +SecretBase_Shrub3_Layout:: + .4byte 0xd + .4byte 0xb + .4byte SecretBase_Shrub3_MapBorder + .4byte SecretBase_Shrub3_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseShrub diff --git a/data/layouts/SecretBase_Shrub3/map.bin b/data/layouts/SecretBase_Shrub3/map.bin new file mode 100644 index 000000000..d51aeea21 --- /dev/null +++ b/data/layouts/SecretBase_Shrub3/map.bin @@ -0,0 +1,65 @@ +  +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2  +2 +2 +2 +2 +2 +2 +2 +2 +2 +2  +2  +2  +2   +2 +2 +2 +22 +2 6 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +22 +2 +2 +2 +2 +2   \ No newline at end of file diff --git a/data/layouts/SecretBase_Shrub4/border.bin b/data/layouts/SecretBase_Shrub4/border.bin new file mode 100644 index 000000000..064786e8c --- /dev/null +++ b/data/layouts/SecretBase_Shrub4/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SecretBase_Shrub4/layout.inc b/data/layouts/SecretBase_Shrub4/layout.inc new file mode 100644 index 000000000..71a2495ad --- /dev/null +++ b/data/layouts/SecretBase_Shrub4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_Shrub4_MapBorder:: + .incbin "data/layouts/SecretBase_Shrub4/border.bin" + + .align 2 +SecretBase_Shrub4_MapBlockdata:: + .incbin "data/layouts/SecretBase_Shrub4/map.bin" + + .align 2 +SecretBase_Shrub4_Layout:: + .4byte 0xe + .4byte 0xb + .4byte SecretBase_Shrub4_MapBorder + .4byte SecretBase_Shrub4_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseShrub diff --git a/data/layouts/SecretBase_Shrub4/map.bin b/data/layouts/SecretBase_Shrub4/map.bin new file mode 100644 index 000000000..8a4cf836d --- /dev/null +++ b/data/layouts/SecretBase_Shrub4/map.bin @@ -0,0 +1,69 @@ +  +2 +2"6 +2 +2 +2 +2 +2 +2 +2 +2 +2   +2 +2#6 +2 +2 +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2   +2 +2  +2 +2 +2   +2 +22 +2 +2   6 +2 +2 +2   +2 +2 +2 +2 +2   +2 +2 +2 +2   +2 +2 +2 +2 +2  2 +2 +2 +2   +2 +2 +2 +2 +2  +22 +2   +2 +2 +2 +2 +2   \ No newline at end of file diff --git a/data/layouts/SecretBase_Tree1/border.bin b/data/layouts/SecretBase_Tree1/border.bin new file mode 100644 index 000000000..064786e8c --- /dev/null +++ b/data/layouts/SecretBase_Tree1/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SecretBase_Tree1/layout.inc b/data/layouts/SecretBase_Tree1/layout.inc new file mode 100644 index 000000000..45889b449 --- /dev/null +++ b/data/layouts/SecretBase_Tree1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_Tree1_MapBorder:: + .incbin "data/layouts/SecretBase_Tree1/border.bin" + + .align 2 +SecretBase_Tree1_MapBlockdata:: + .incbin "data/layouts/SecretBase_Tree1/map.bin" + + .align 2 +SecretBase_Tree1_Layout:: + .4byte 0xb + .4byte 0x9 + .4byte SecretBase_Tree1_MapBorder + .4byte SecretBase_Tree1_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseTree diff --git a/data/layouts/SecretBase_Tree1/map.bin b/data/layouts/SecretBase_Tree1/map.bin new file mode 100644 index 000000000..907f1486a --- /dev/null +++ b/data/layouts/SecretBase_Tree1/map.bin @@ -0,0 +1,56 @@ + +2 +22 +2 +2 +2 +2   +2 6 +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 +26 +2 +2 +22 +2 +2 +2   \ No newline at end of file diff --git a/data/layouts/SecretBase_Tree2/border.bin b/data/layouts/SecretBase_Tree2/border.bin new file mode 100644 index 000000000..064786e8c --- /dev/null +++ b/data/layouts/SecretBase_Tree2/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SecretBase_Tree2/layout.inc b/data/layouts/SecretBase_Tree2/layout.inc new file mode 100644 index 000000000..ca1106b26 --- /dev/null +++ b/data/layouts/SecretBase_Tree2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_Tree2_MapBorder:: + .incbin "data/layouts/SecretBase_Tree2/border.bin" + + .align 2 +SecretBase_Tree2_MapBlockdata:: + .incbin "data/layouts/SecretBase_Tree2/map.bin" + + .align 2 +SecretBase_Tree2_Layout:: + .4byte 0x7 + .4byte 0x10 + .4byte SecretBase_Tree2_MapBorder + .4byte SecretBase_Tree2_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseTree diff --git a/data/layouts/SecretBase_Tree2/map.bin b/data/layouts/SecretBase_Tree2/map.bin new file mode 100644 index 000000000..c2e5698b0 --- /dev/null +++ b/data/layouts/SecretBase_Tree2/map.bin @@ -0,0 +1,48 @@ +  +2 +22 +2   +2 +2 +2 +2   +2 +2 +2 +2   +2 +2 +2 +2 6  +2 +2 +2 +2 6   +2 +2 +2 +2 +2   +2 +2 +2 +2 +2   +2 +2 +2 +2 +2  +2 +2 +2 +2   +2 +2 +2 +2   +2 +2 +26 +26  +2  2   \ No newline at end of file diff --git a/data/layouts/SecretBase_Tree3/border.bin b/data/layouts/SecretBase_Tree3/border.bin new file mode 100644 index 000000000..064786e8c --- /dev/null +++ b/data/layouts/SecretBase_Tree3/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SecretBase_Tree3/layout.inc b/data/layouts/SecretBase_Tree3/layout.inc new file mode 100644 index 000000000..28a4ecbcc --- /dev/null +++ b/data/layouts/SecretBase_Tree3/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_Tree3_MapBorder:: + .incbin "data/layouts/SecretBase_Tree3/border.bin" + + .align 2 +SecretBase_Tree3_MapBlockdata:: + .incbin "data/layouts/SecretBase_Tree3/map.bin" + + .align 2 +SecretBase_Tree3_Layout:: + .4byte 0x11 + .4byte 0x8 + .4byte SecretBase_Tree3_MapBorder + .4byte SecretBase_Tree3_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseTree diff --git a/data/layouts/SecretBase_Tree3/map.bin b/data/layouts/SecretBase_Tree3/map.bin new file mode 100644 index 000000000..b6ae04b00 --- /dev/null +++ b/data/layouts/SecretBase_Tree3/map.bin @@ -0,0 +1,63 @@ +  +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 6 2 +2 +2 +2 +2 +2 +2 +2 +2 +2 6   +2 +2 +2 +2 +2   +2   +2 +2 +2 +2 +2   +2 +2 +2 +2 +2   +2   +2 +2 +2 +2 +2  +2 +2 +2 +2   +2   +2 +2 +2 +2 +2  +2 +2 +2  2  +2 +2 +2 +2   \ No newline at end of file diff --git a/data/layouts/SecretBase_Tree4/border.bin b/data/layouts/SecretBase_Tree4/border.bin new file mode 100644 index 000000000..064786e8c --- /dev/null +++ b/data/layouts/SecretBase_Tree4/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SecretBase_Tree4/layout.inc b/data/layouts/SecretBase_Tree4/layout.inc new file mode 100644 index 000000000..6f869a74e --- /dev/null +++ b/data/layouts/SecretBase_Tree4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_Tree4_MapBorder:: + .incbin "data/layouts/SecretBase_Tree4/border.bin" + + .align 2 +SecretBase_Tree4_MapBlockdata:: + .incbin "data/layouts/SecretBase_Tree4/map.bin" + + .align 2 +SecretBase_Tree4_Layout:: + .4byte 0xe + .4byte 0xe + .4byte SecretBase_Tree4_MapBorder + .4byte SecretBase_Tree4_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseTree diff --git a/data/layouts/SecretBase_Tree4/map.bin b/data/layouts/SecretBase_Tree4/map.bin new file mode 100644 index 000000000..b3b381d9e --- /dev/null +++ b/data/layouts/SecretBase_Tree4/map.bin @@ -0,0 +1,77 @@ +  +2 +2 +2 +2 +2   +2 +2 +2 +2 +2   +2 +2 +2 +2 +2   +2 +2 +2 +2 +2   +2 +2 +2 +2 +2   +2 +2 +2 +2 +2   +2 +2 +2 +2 +2  +2 +2  +2 +2 +2 +2 +2 "6   +2 +2 +2 +2 #6 "6  2 #6   +2 6 +2 +2 +2 +2 +222   +2 +2 +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +22 +2 +26  \ No newline at end of file diff --git a/data/layouts/SecretBase_YellowCave1/border.bin b/data/layouts/SecretBase_YellowCave1/border.bin new file mode 100644 index 000000000..5c0908a6a --- /dev/null +++ b/data/layouts/SecretBase_YellowCave1/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SecretBase_YellowCave1/layout.inc b/data/layouts/SecretBase_YellowCave1/layout.inc new file mode 100644 index 000000000..d34c182c3 --- /dev/null +++ b/data/layouts/SecretBase_YellowCave1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_YellowCave1_MapBorder:: + .incbin "data/layouts/SecretBase_YellowCave1/border.bin" + + .align 2 +SecretBase_YellowCave1_MapBlockdata:: + .incbin "data/layouts/SecretBase_YellowCave1/map.bin" + + .align 2 +SecretBase_YellowCave1_Layout:: + .4byte 0xb + .4byte 0x9 + .4byte SecretBase_YellowCave1_MapBorder + .4byte SecretBase_YellowCave1_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseYellowCave diff --git a/data/layouts/SecretBase_YellowCave1/map.bin b/data/layouts/SecretBase_YellowCave1/map.bin new file mode 100644 index 000000000..1301e7317 --- /dev/null +++ b/data/layouts/SecretBase_YellowCave1/map.bin @@ -0,0 +1,57 @@ +  +2 +22 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 +2 6   +2 +2 +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 +2 +2  +2 +2 +22 +2 +2  \ No newline at end of file diff --git a/data/layouts/SecretBase_YellowCave2/border.bin b/data/layouts/SecretBase_YellowCave2/border.bin new file mode 100644 index 000000000..5c0908a6a --- /dev/null +++ b/data/layouts/SecretBase_YellowCave2/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SecretBase_YellowCave2/layout.inc b/data/layouts/SecretBase_YellowCave2/layout.inc new file mode 100644 index 000000000..fc5813858 --- /dev/null +++ b/data/layouts/SecretBase_YellowCave2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_YellowCave2_MapBorder:: + .incbin "data/layouts/SecretBase_YellowCave2/border.bin" + + .align 2 +SecretBase_YellowCave2_MapBlockdata:: + .incbin "data/layouts/SecretBase_YellowCave2/map.bin" + + .align 2 +SecretBase_YellowCave2_Layout:: + .4byte 0xe + .4byte 0x9 + .4byte SecretBase_YellowCave2_MapBorder + .4byte SecretBase_YellowCave2_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseYellowCave diff --git a/data/layouts/SecretBase_YellowCave2/map.bin b/data/layouts/SecretBase_YellowCave2/map.bin new file mode 100644 index 000000000..e18cb47c6 --- /dev/null +++ b/data/layouts/SecretBase_YellowCave2/map.bin @@ -0,0 +1,56 @@ + 2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +26 +2   +2 +2 +2 +2 +2 +2 +2   +2  +2 +2 +2 +2 +2 +2   +2   +2 +2 +2 +2 +2 +2   +2   +2 +2 +2 +2 +2 +2 6   +2   +2 +2 +2 +2 +2 +2 +2  2   \ No newline at end of file diff --git a/data/layouts/SecretBase_YellowCave3/border.bin b/data/layouts/SecretBase_YellowCave3/border.bin new file mode 100644 index 000000000..5c0908a6a --- /dev/null +++ b/data/layouts/SecretBase_YellowCave3/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SecretBase_YellowCave3/layout.inc b/data/layouts/SecretBase_YellowCave3/layout.inc new file mode 100644 index 000000000..005af813a --- /dev/null +++ b/data/layouts/SecretBase_YellowCave3/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_YellowCave3_MapBorder:: + .incbin "data/layouts/SecretBase_YellowCave3/border.bin" + + .align 2 +SecretBase_YellowCave3_MapBlockdata:: + .incbin "data/layouts/SecretBase_YellowCave3/map.bin" + + .align 2 +SecretBase_YellowCave3_Layout:: + .4byte 0xc + .4byte 0xb + .4byte SecretBase_YellowCave3_MapBorder + .4byte SecretBase_YellowCave3_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseYellowCave diff --git a/data/layouts/SecretBase_YellowCave3/map.bin b/data/layouts/SecretBase_YellowCave3/map.bin new file mode 100644 index 000000000..b7d80a0ab --- /dev/null +++ b/data/layouts/SecretBase_YellowCave3/map.bin @@ -0,0 +1,63 @@ +  +2 +2 +2   +2 +2   +2 +2 +2   +2 +2   +2 +2 +2   +2 +2  +2 +2 +2   +2 +2 6 +2 +2 +22 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 +2 +266 +2 +2 +22 +2 +2 +2 +2   \ No newline at end of file diff --git a/data/layouts/SecretBase_YellowCave4/border.bin b/data/layouts/SecretBase_YellowCave4/border.bin new file mode 100644 index 000000000..5c0908a6a --- /dev/null +++ b/data/layouts/SecretBase_YellowCave4/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SecretBase_YellowCave4/layout.inc b/data/layouts/SecretBase_YellowCave4/layout.inc new file mode 100644 index 000000000..5dfaa435c --- /dev/null +++ b/data/layouts/SecretBase_YellowCave4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_YellowCave4_MapBorder:: + .incbin "data/layouts/SecretBase_YellowCave4/border.bin" + + .align 2 +SecretBase_YellowCave4_MapBlockdata:: + .incbin "data/layouts/SecretBase_YellowCave4/map.bin" + + .align 2 +SecretBase_YellowCave4_Layout:: + .4byte 0xd + .4byte 0xe + .4byte SecretBase_YellowCave4_MapBorder + .4byte SecretBase_YellowCave4_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseYellowCave diff --git a/data/layouts/SecretBase_YellowCave4/map.bin b/data/layouts/SecretBase_YellowCave4/map.bin new file mode 100644 index 000000000..d3c3e0204 --- /dev/null +++ b/data/layouts/SecretBase_YellowCave4/map.bin @@ -0,0 +1,80 @@ +  +2 +2 +2 +2 +2 +2 +2 +2"6 +2 +2   +2 +2 +2 +2 +2 +2 +2 +2#6 +2 +2   +2 +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2   +2 +2   +2 +2   +2 +2  +2 +2   +2 +2 6 +2 +2 +22 +2 +2   +2 +2 +2 +2 +2 +2 +2 +2 +2   +2 +2 +2 +2 +2 +2 +2 +2  +2 +2 +2 +2 +2 +2 +2  +2 +2 +22 +2 +2 +2   \ No newline at end of file diff --git a/data/layouts/ShoalCave_HighTideEntranceRoom/border.bin b/data/layouts/ShoalCave_HighTideEntranceRoom/border.bin new file mode 100644 index 000000000..423a0732e --- /dev/null +++ b/data/layouts/ShoalCave_HighTideEntranceRoom/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc b/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc new file mode 100644 index 000000000..43df2d495 --- /dev/null +++ b/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +ShoalCave_HighTideEntranceRoom_MapBorder:: + .incbin "data/layouts/ShoalCave_HighTideEntranceRoom/border.bin" + + .align 2 +ShoalCave_HighTideEntranceRoom_MapBlockdata:: + .incbin "data/layouts/ShoalCave_HighTideEntranceRoom/map.bin" + + .align 2 +ShoalCave_HighTideEntranceRoom_Layout:: + .4byte 0x23 + .4byte 0x23 + .4byte ShoalCave_HighTideEntranceRoom_MapBorder + .4byte ShoalCave_HighTideEntranceRoom_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/ShoalCave_HighTideEntranceRoom/map.bin b/data/layouts/ShoalCave_HighTideEntranceRoom/map.bin new file mode 100644 index 000000000..0e4b88c8f --- /dev/null +++ b/data/layouts/ShoalCave_HighTideEntranceRoom/map.bin @@ -0,0 +1 @@ +      22˜2™2™2™2™2™2™2™2™2™2™2š2´´´´´´´22822222 2¡2¡2¡2¡2¡2¡2¡2¡2¡2¡2¢2|“““““““z22822222 2¡2¡2¡2©2©2©2©2©2©2©2ª2|“ppppp“z22@QQQQQ 2¡2¡2¢2´´´´2´´µ“ppppp“z22222222 2¡2¡2¢2|“““““““““ppppp“z22222222 2¡2¡2¢2|“ppppppppppppp“³´2´´´22¨2©2©2ª2|“ppppppppppppp“““““““z22´´´µ“ppppppppppppppppppp“z22|“““““ppppppppppppppppppp“z22|“ppppppppppppppppppppppp“z22|“ppppppppppppppppppppppp“z22|“pppppppppppp­®1®1®1®1®1®1®1®1®1®1¦2C22]C]CUCUCUCUC^“ppppppµž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1£22BBBBBB|“ppppppµž1ž1ž1ž1ž1ž1ž1ž1ž1ž1m#222BBBBB|“pppppp½¾¾¾¾£ž1ž1ž1ž1ž1£222BBB´2µ“pppppppppppµž1ž1ž1ž1ž1£    BBB|““““pppppppppppµž1ž1ž1ž1ž1£BBB|“ppppppppppppppµž1ž1ž1mn#  BBB|“ppppppppppppppµž1ž1ž1£BBB’¦2¯pppppppppppppµž1ž1ž1£BBB¥ž1œ1®1®1®1®1®1®1®1®1®1®1®1®1®1›1ž1ž1ž1£  BBB¥ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1£   BBB¥ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1£BBB¥ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1£BBB#BnBnBnBnBnBnBož1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1£BBBBBBBBBB¥ž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ž1u2ž1ž1ž1ž1ž1£        " nnnnnXYZnnnn   "                                                                         \ No newline at end of file diff --git a/data/layouts/ShoalCave_HighTideInnerRoom/border.bin b/data/layouts/ShoalCave_HighTideInnerRoom/border.bin new file mode 100644 index 000000000..423a0732e --- /dev/null +++ b/data/layouts/ShoalCave_HighTideInnerRoom/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc b/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc new file mode 100644 index 000000000..22fde10c6 --- /dev/null +++ b/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +ShoalCave_HighTideInnerRoom_MapBorder:: + .incbin "data/layouts/ShoalCave_HighTideInnerRoom/border.bin" + + .align 2 +ShoalCave_HighTideInnerRoom_MapBlockdata:: + .incbin "data/layouts/ShoalCave_HighTideInnerRoom/map.bin" + + .align 2 +ShoalCave_HighTideInnerRoom_Layout:: + .4byte 0x2e + .4byte 0x26 + .4byte ShoalCave_HighTideInnerRoom_MapBorder + .4byte ShoalCave_HighTideInnerRoom_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/ShoalCave_HighTideInnerRoom/map.bin b/data/layouts/ShoalCave_HighTideInnerRoom/map.bin new file mode 100644 index 000000000..c540a4008 --- /dev/null +++ b/data/layouts/ShoalCave_HighTideInnerRoom/map.bin @@ -0,0 +1 @@ +BB¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬BBBBBBB¥¤¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾££BB22222BBBBB»B»B“ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó”ó½B½BBB22222BBBBBÃBÃB›óóóóóóóóóóóóóóóóóóóóóóóóóœóÅBÅBBBBBBBB¥·ppppppppppppppppppppppppµ£BBBBBBBBBB¥·ppppppppppppppppppppppppµ£BBBBBBBBBB[32¥·ppppppppppppppppppppppppµ£BBB22¥·ppp­®1®1®1®1®1®1®1®1®1®1®1®1®1®1®1®1®1®1®1®1›1£RRRRR[SRBBB22¥·pppµž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1£RRRRRRBBB22¥·pppµmnRnRnRnRnRnRnRnRnRnRnRož1ž1ž1ž1ž1ž1ž1ž1«¬2¬¬¬¬BBB2­·pppµ£R[S  B B B B B B B"#R Rož1ž1¤¾¾¾¾¾¾¾¾¾££BBB¥¤¾¿pppµ£RRBBBBBBBRR¥ž1ž1·pppppppppµ£BBB¥·pppppµ£RRBBBBBBBRR¥ž1ž1·pppppppppµ£BBB¥·pppppµ£RRBBBBRR¥ž1ž1·pppppppppµ£BBB¥·pppppµ«¬¬¬BBBBRR¥ž1ž1œ1®1®1®1®1®1®1®1®1®1›1£BBB¥·ppppp½¾£ž1ž1ž1£BBBBRR¥ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1£BBB¥·ppppppp½¾¾££BBBBRR¥ž1ž1ž1ž1ž1ž1mnRnRnRnRnRnR#RBBB¥·ppppppppppµ£BBBBRR¥ž1ž1ž1ž1ž1ž1£RRRRR[SRBBB»B»B“ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó”ó½B½BBBBBRR¥ž1ž1ž1ž1ž1ž1£RRRRRRRBBBÃBÃB›óóóóóóóóóóóœóÅBÅBBBBB¥ž1ž1ž1ž1ž1ž1£RRRRRRR¥·ppppppppppµ£B2­ž1ž1ž1ž1ž1ž1«¬RRRR¬¬­œ1®1®1¯pppppppµ£BBBBBB¥¤¾¾¾¾¾£ž1ž1ž1ž1£RRRR#RnRnRnRnRnRo·pppppppµ£BBBBBB¥·ppppp½¾¾¾££RRRRRRRRRR¥·ppppp­®1›1£BBBBBB¥·pppppppppµ£RRRRRRR­·pppppµmn#     "¥·pppppppppµ£RRRRRRR¥ž1ž1ž1œ1®1®1®1®1®1›1£   ¥·pppppppppµ£RRRRRRR¥ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1£¥·pppppppppµ£RRRRRRR¥ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1£     "¥œ1®1®1®1®1®1®1®1®1®1›1£RRRRRRR#RnRnRnRnRnRnRnRnRnRnR#R¥ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1£RRRRRRRRRRRRRRRRRRR##nnnnnnnnnn1#RRRRRRRRRRRRRRRR6D22>6C22>6D22>6C222)6C2222K22`6C22`6 + `6C22`6C2222K2 \ No newline at end of file diff --git a/data/layouts/SlateportCity_OceanicMuseum_2F/border.bin b/data/layouts/SlateportCity_OceanicMuseum_2F/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/SlateportCity_OceanicMuseum_2F/border.bin differ diff --git a/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc b/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc new file mode 100644 index 000000000..0072fe2c5 --- /dev/null +++ b/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +SlateportCity_OceanicMuseum_2F_Layout:: + .4byte 0x14 + .4byte 0x9 + .4byte SlateportCity_OceanicMuseum_2F_MapBorder + .4byte SlateportCity_OceanicMuseum_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_OceanicMuseum diff --git a/data/layouts/SlateportCity_OceanicMuseum_2F/map.bin b/data/layouts/SlateportCity_OceanicMuseum_2F/map.bin new file mode 100644 index 000000000..1fa2cdc18 --- /dev/null +++ b/data/layouts/SlateportCity_OceanicMuseum_2F/map.bin @@ -0,0 +1 @@ +ac %       bd%   22M2N2N2O22222-222222222C2289@,C22225C2S2T22S2T22 22C222334C22222K2[\2[\2(C2C22E2F2F2G2K2222222222222K2C22*01,C2222222Q2R2222 22C222334C2222222YZC222(C2C222222K222222222K2222K2 \ No newline at end of file diff --git a/data/layouts/SlateportCity_PokemonFanClub/border.bin b/data/layouts/SlateportCity_PokemonFanClub/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/SlateportCity_PokemonFanClub/border.bin differ diff --git a/data/layouts/SlateportCity_PokemonFanClub/layout.inc b/data/layouts/SlateportCity_PokemonFanClub/layout.inc new file mode 100644 index 000000000..789c78b67 --- /dev/null +++ b/data/layouts/SlateportCity_PokemonFanClub/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SlateportCity_PokemonFanClub_MapBorder:: + .incbin "data/layouts/SlateportCity_PokemonFanClub/border.bin" + + .align 2 +SlateportCity_PokemonFanClub_MapBlockdata:: + .incbin "data/layouts/SlateportCity_PokemonFanClub/map.bin" + + .align 2 +SlateportCity_PokemonFanClub_Layout:: + .4byte 0xe + .4byte 0xb + .4byte SlateportCity_PokemonFanClub_MapBorder + .4byte SlateportCity_PokemonFanClub_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_PokemonFanClub diff --git a/data/layouts/SlateportCity_PokemonFanClub/map.bin b/data/layouts/SlateportCity_PokemonFanClub/map.bin new file mode 100644 index 000000000..effff6653 Binary files /dev/null and b/data/layouts/SlateportCity_PokemonFanClub/map.bin differ diff --git a/data/layouts/SlateportCity_SternsShipyard_1F/border.bin b/data/layouts/SlateportCity_SternsShipyard_1F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/SlateportCity_SternsShipyard_1F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc b/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc new file mode 100644 index 000000000..5ffddafa6 --- /dev/null +++ b/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +SlateportCity_SternsShipyard_1F_Layout:: + .4byte 0x15 + .4byte 0xf + .4byte SlateportCity_SternsShipyard_1F_MapBorder + .4byte SlateportCity_SternsShipyard_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/layouts/SlateportCity_SternsShipyard_1F/map.bin b/data/layouts/SlateportCity_SternsShipyard_1F/map.bin new file mode 100644 index 000000000..036f5ce26 --- /dev/null +++ b/data/layouts/SlateportCity_SternsShipyard_1F/map.bin @@ -0,0 +1,7 @@ +³´µ»¼½! +!012! #!$!"!!"¶22·22 +)28292:2)22)2)2)2)2)2)2)2)2222222  2 2 2 2 2 2 2 2&2)2)2)2)22A2B22222?ÕÖ×ÐÑÒÓ)2)2)2'IJ2222 +G$[\3456 )2)2)2''2222   O)2cd;<=>2)2)2)2/7A2B222)2)2k2l2CDEF)2)2)2)2)2)2IJ2222 )2)2)2)2K2LMN2)2)2)2)2)2)22222222)2)2)253)2UV)2)2)2)2)2)2)2A2B222222)2)2(2_2(2*2*253)2)2)2)2)22IJ22222)2(2_2(2(2(2_2)2)2)2'222222 +'2(2W(2(2(2W)2)2)2'''222222 +/'(2(2(2(2(2)2)2)2//7222222 +77/)2)2)2)2)2)2)2)2)2)2)2 \ No newline at end of file diff --git a/data/layouts/SlateportCity_SternsShipyard_2F/border.bin b/data/layouts/SlateportCity_SternsShipyard_2F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/SlateportCity_SternsShipyard_2F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc b/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc new file mode 100644 index 000000000..fe76a83e8 --- /dev/null +++ b/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +SlateportCity_SternsShipyard_2F_Layout:: + .4byte 0x11 + .4byte 0xf + .4byte SlateportCity_SternsShipyard_2F_MapBorder + .4byte SlateportCity_SternsShipyard_2F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/layouts/SlateportCity_SternsShipyard_2F/map.bin b/data/layouts/SlateportCity_SternsShipyard_2F/map.bin new file mode 100644 index 000000000..d10ed2ac2 --- /dev/null +++ b/data/layouts/SlateportCity_SternsShipyard_2F/map.bin @@ -0,0 +1 @@ +ÃÄÅ!!ËÌÍ!$#! !!$! !!22¶22·2222222222222222222222  22  22@2B2A2B2222222222HJIJ2222PQQQQQQR222222222`cd;<=>2A2B2@2B22222`klCDEF2IJHJ2222`))KLMN222222222`)5)UV)2A2B2@2B22222`(W2(**52IJHJ222`(W2(((W2222222222hi—iii—j222222222222%2%2222222222222222222222 \ No newline at end of file diff --git a/data/layouts/SootopolisCity/border.bin b/data/layouts/SootopolisCity/border.bin new file mode 100644 index 000000000..c07869a9f --- /dev/null +++ b/data/layouts/SootopolisCity/border.bin @@ -0,0 +1 @@ +ÙÙÙÙ \ No newline at end of file diff --git a/data/layouts/SootopolisCity/layout.inc b/data/layouts/SootopolisCity/layout.inc new file mode 100644 index 000000000..91a877c38 --- /dev/null +++ b/data/layouts/SootopolisCity/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SootopolisCity_MapBorder:: + .incbin "data/layouts/SootopolisCity/border.bin" + + .align 2 +SootopolisCity_MapBlockdata:: + .incbin "data/layouts/SootopolisCity/map.bin" + + .align 2 +SootopolisCity_Layout:: + .4byte 0x3c + .4byte 0x3c + .4byte SootopolisCity_MapBorder + .4byte SootopolisCity_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Sootopolis diff --git a/data/layouts/SootopolisCity/map.bin b/data/layouts/SootopolisCity/map.bin new file mode 100644 index 000000000..ff03ebc3b --- /dev/null +++ b/data/layouts/SootopolisCity/map.bin @@ -0,0 +1,12 @@ +ÙÙÙÙÙÙÙÚÙÙÓáááâÚÙ2ÚÙ2Ù2ÙÙÙÙÙÓáá9áááááÔàÔàÔÙ2Ù2Ù2Ù2Ù2àááááááá9áÔÙ2Ù2Ù2Ù2Ù2ÙÙÙÙÓááâÙÙÚÙÓááâÓâÙ2Ù2Óáá9áâÓKLMÔàÔàÔàááááááááááááà9ááÔÙ2ÙÓááâÙÓáá9âÙÚÙ2Ù2Ù2ÚÙ2Ù2Ù2ÚÓáâ  +  ØÙ2àÔàááááÔÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2  + ÔØÙ2áâÙÙÓáâÙáâÓááâÙ2Ù2Ù2ÚÚ  + Ù2Ù2%7'ØÙ2Ù2àÔÙ2Ù2Ù2Ù2àáKLMÙ2Ù2Ù2Ù2  + ØàáÙÙÓáâÙÓá  + UÙÚÓáááááâÚÙ2Ù2-?/àÔÙ2Ù2àÔ@AAAB ZÔÙ2Ù2Ù2àáÔááâÙÙÓâÙ2#$_ÓâÚÙ2Ù2Ù2Ù2Ù2Ù2Ú Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2àáÔÙ2àáÔÙ2Ù2Ù2àÔÙ2Ù2Ù2Ù2Ù2 Ù2Ù2ØÙÓKLMâÙ2Ù2+,_ÚÓâÙ2Ù2ÓáD2E2âÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2ØÙ2Ù2Ù2ØÙ2Ù2Ù2Ù2Ø@AAAAAAABÙ2àÓâ @AAFÙ2G\ÚÚÙ2Ù2Ù2ÚÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2@AFÙ2Ù2GAAABàÔÙ2Ù2àááááD2áÔàááááááááÔÙ2Ù2âÙ%6'Ù2ÓábD2cáâÚÙ2Ù2Ù2ÚÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2ÓábD2E2cááááÔàááááÔÙ2Ù2Ù2Ù2àááááá9ááÔØÙ2Ù2ÙÙ->/Ù2ÚÙ2ÓD2áááâÙ2Ù2Ù2ÚÓáááááááâÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2àáááÔÙàááD2ááááááÔØàáÔAAAAABÚÙ2ÚÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2ÚÚÙ2Ù2ÓááááááááááááD2E2áááÔàÔÙÙÓD2áááááÔ  + ØàáÔàááááááâÓâÓáááááD2E2âÚÓáâÓáááááááááááD2E2ááÔØÙ2ØÙÙÚÙ2Ù2Ù2Ù2Ù2Ù2ØØÙ2Ù2ØÙ2Ù2Ù2ÓááááâÓâÙ2Ù2Ù2Ù2Ù2Ù2Ù2ÓâÚÓáâÙ2ÓáááááááááD2E2ÔÙ2ØàÔàááâ6Ù2Ù2Ù2Ù2Ù2Ù2Ø ØÙ2Ù2àáááâÙ2Óáááâ82Ù2ÓáááD2E2âÙ2ÚÚÓááâÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2àÔàÔàááá9ááÔÙ2Ù2Ù2àÔÙ2Ù2àáÔÙ2Ù2Ù2Ù2Ù2Ù2ÚÙ2ÓáâÙ2Ù2Ù2Ù2Ù2Ù2ÓâÚÚ@AFÙ2Ù2GAAAAAAAABàÔàáááÔØÙ2Ù2Ù2Ù2ØÙ2Ù2Ù2Ù2àáÔÙ2ÓááâÙ2ÚT  + BÙ2Ù2Ù2Ù2Ù2Ù2ÚÙ2ÚÚÙ2ÓbD2E2cáQR[RSáÔÙ2Ù2àáÔTA  + ØØÙ2Ù2Ù2Ù2ØÙ282Ù2Ù2Ù2Ù2àÙ2;Ù2Ù2Ù2Ù2Ú^#$Ù2Ù2Ù2ÓáD2E2âÙ2ÚÚÙ2ÚÙ2Ù2Ù2Ù2Ó á!2á"ÔàááÔÙ2Ø^Ù2#$ØØÙ2Ù2Ù2Ù2àáááÔ2Ù2Ù2Ù2Ú^+,Ù2Ù2Ù2ÚÓD2E2ááâÚÙ2ÚÙ2Ù2Ù2Ù2Ú()2)2)2*óÙ2Ù2Ù2àÔØ^Ù2+,ØàÔÙ2Ù2Ù2Ù2  + à  + ÓKLM^Ù2Ù2Ù2Ù2Ù2Ù2ÚÚÙ2Ù2Ù2Ù2Ù2ÚÓânÙ2Ù2oÚ0q0q0q02óÙ2Ù2Ù2Ù2ØØ^Ù2Ù2Ù2Ù2ØÙ2àD2E2áÔ Ù2Ú ^Ù2Ù2Ù2Ù2Ù2Ù2ÚÚÙ2Ù2Ù2Ù2Ù2ÚÚÓbD2E2cýq0€6q0€6q0ûáÔÙ2Ù2ØØ^Ù2Ù2Ù2Ù2àááD2E2ÔØ%7'Ù2Ú%7']AAABÙ2Ù2ÚÚÙ2Ù2ÓáD2âÚÚq0q0q0q0q0q0€6q0€6q0q0q0ûáÔØØ^Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2ØàááÔ-?/Ù2AABÚ-?/Ù2ÓáááD2E2âÚÙ2Ù2ÚÓD2áâÚq0q0q0q0q0q0q0q0q0q0q0q0q0q0ÎØØ]ABÙ2Ù2Ù2Ù2Ù2Ù2Ù2ØÙ2Ù2Ù2àáááÔáááâÓáááâÙ2Ù2Ù2Ù2Ù2Ù2ÚÙ2Ù2ÚÚÙ2Ù2Ù2Úq0q0q0q0q0q0q0q0q0q0q0q0q0q0ÎØàáááD2E2áKLMÔàááÔÙ2Ù2Ù2Ù2àÙÙÓáâÙ2ÓáKLMáD2E2áâÓáâÚÙ2Ù2Ù2Úq0q0t||||||||||‰ÎàáÔTBÙ2Ù2Ù2 ØÙ2Ù2Ù2àÔÙ2Ù2Ù2Ù2áKLÙ2Ù2ÚTYZBÙ2Ù2ÓáâÓáâÓD2E2Íty}ñ±±±±±±±ÄsÖáÔØ^Ù2Ù2Ù2Ù2ØÙ2Ù2Ù2Ù2ØÙ2Ù2Ù2Ù2Ù2 Ù2Ù2Ú^Ù2Ù2Ù2ÚÓáâÙ2Ù2Úq0q0t}ñÀyyyyyyyyº{y‰óØ^Ù2Ù2Ù2Ù2ØÙ2àÔÙ2Ù2Ù2Ù2%6'Ù2Ù2Ú^Ù2Ù2Ù2ÚÚk6l6l6m6Úq0q0uÃÀyyyyyyyyyy±ÄsóØ^Ù2Ù2Ù2Ù2Ù2Ù2Ù2àÔ Ù2ØÙ2Ù2Ù2Ù2->/Ù2Ù2Ú^Ù2Ù2Ù2Ù2Ù2Ù2ÚÚ0123Úq0q0u¸yyyyyyyyyyyyyºsóØ]AABÙ2Ù2Ù2Ù2Ù2ØÙ2àÔÙ2Ù2AAAABÓâ]AAAABÓâÚ89:;Úq0q0u¸yyy‚ƒƒƒƒ„yyyyºsóà{|}~ÔÙ2Ù2Ù2Ù2ØÙ2Ù2ØÙ2Ù2Ù2Ù2ÓááâÓááááááâÓâABwÚq0q0u¸yyËŠ‹‹‹‹ŒÌyyyºsóTPQRSØÙ2Ù2Ù2Ù2àáD2ÔÙ2Ù2àÔÙ2Ù2ÓâÙ2ÓáâÙ2Ù2Ù2ÓáááâÙ2Ù2Ù2Ù2Ù2Úq0q0u¸yyº¸¹º³»¼¸yyyºsó^XYZ[ØÙ2Ù2Ù2Ù2Ù2Ù2Ù2ØÙ2Ù2Ù2ØÙ2Ù2ÚÙ2Ù2ÚÙ2Ù2Ù2Ù2Ù2ÚÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Óýq0q0u¸yyºÀÁÂÅÃĸyyyºsó^abvàáD2E2ÔÙ2Ù2Ù2àááÔàÔÓâÙ2Ù2ÚÓáKLMâÙ2Ù2Ù2Ù2Ù2ÓD2E2ýq0q0q0u¸yËÓ0È1É1ÊÍËÌ1Ô0Ìyyºsó^Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2àááÔÙ2Ù2Ù2ØÙ2ØâÙ2Ù2ÓâÚTYZBÙ2Ù2Ù2Ù2Óýq0q0q0q0q0q0u¸yº000000010¸yyºsó^Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2222à9áÔØÙ2ØÙ2Ù2Ù2ÚÙ2Ú^Ù2Ù2Ù2Ù2Óýq0q0q0q0q0q0t}¸yº00000010¸yyºsó]BÙ2Ù2@AFÙ2Ù2 222ØØÙ2ØÙ2ÓáâÓâ^Ù2Ù2Ù2Ù2Úq0tÞßD2E2yzÃÀyº00000000¸yyºsûááD2E2áÔNÙ2Ù2  + ØØÙ2ØÓâÙ2Ù2ÚÙ2^Ù2Ù2Ù2Ù2Ù2Ù2Ù2Úq0rÖ×0000¸yyº00000000¸yyº{yyyD2E2‰óNÙ2Ù2ØàÔØâÓááâÙ2]BÙ2Ù2Ù2Ù2Óáýq0ræç0000¸yy±±±±±±±±Àyy²04000póNÙ2Ù2Ù2Ù2Ù2ØÙ2ØØÙ2ÚÙ2Ù2Óáááááááýtyyz0°±±±±Àyyyyyyyyyyyyyyyº00000póV@AAAAAABàÔØàÓâÙ2ÓýqtyÞßÞßyz0000¸yyyyyyyyyyyyyyyyyyyyº00000pûáááááááÔÙÙØàÔÚÙÙ2Úqqr0Ö×Ö×000000¸yyyyyyyyyyyyyyyyyyyy±²000xyyyy‰qqqóÙÙØÙØÚÙÙ2Úqqr0æåÜÝ000000¸yyyyyyyyyyyyyyyyyyyyyyº00000000xÞ߉ûÔÙàÔØÚÙÙ2Úqqr000ÔÕ000000¸yyyyyyyyyyyyyyyyyyyyyyº000000000Ö×pqóÙÙØØÚÙÙ2Úqqr000æç000000¸yyyyyyyyyyyyyyyyyyyyyy±±²0000Î1Ï1ÜÝpqûÔÙØØÚÙÙ2Úqqr0000000Î1Ï100¸yyyyyyyyyyyyyyyyyyyyyyyyyº0000ÖÕÔÕpqqóÙØØÜÒÙ2ìíqr0000000Ö×00¸yyyyyyyyyyyyyyyyyyyyyyyyyº0000ÜÝÜÝpqqóÙØØÙÚÙÙÜí¿iiij000ÜÝ°±Àyyyyyyyyyyyyyyyyyyyyyyyyy±±±²ÔÕÔÕpqqóÙØØÙÜÑÑÒÜìììí¿ij0ÔÕ¸yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyºæåäçpëìÛÙØØÙÙÙÙÜÑÑÒÙÜìír0æç¸yyyyyyyyyyyyyyyyyyyyyyyyyyyyyy˜`ii0i0i0¾0óÙÐÑÛÛÙÙÙÙÙÙÙÜÑÒÙÚ¿iij¸yyyyyyyyyyyyyyyyyyyyyyyyyyyyyy qqqqëìÛÐØÙÙÙÑÑÑÒÙÙÙÙÙÚÙÜìíqr¸yyyyyyyyyyyyyyyyyyyyyyyy˜iiiiiiqëììÛÙÙØØÙÙÙÙÙÙÜÑÒÙÙÙÜÑÑÒÜír¸yyyyyyyyyyyyyyyyyyyyyyyy qqqqqqqóÙÙÙÐÑÛØÙÙÙÙÙÙÙÙÚÙÙÙÙÙÙÚÙÚr¸yyyyyyyyy…†††‡yyyyyy˜iiiiqqqqëììÛÙÙÙØÙÙØÙÙÙÙÙÙÙÙÜÑÒÙÙÙÙÜÒÚr¸yyyyyyy…†ŽŽŽ†‡yyyy qqqqqqqëÛÐÑÑÑÑÑÛÐÑÛÙÙÙÙÙÙÙÙÙÙÚÙÙÙÙÙÚÚr¸yyyyyy…ŽŽŽŽŽŽŽ‡yyy qqqqqëìÛÙØÙÙÙÙÐÑÛÙÙÙÙÙÙÙÙÙÙÙÙÜÑÒÙÙÙÚÚiiiišyy…ŽŽŽŽŽŽŽŽŽ‡˜iiqqëììÛÙÙÙØÐÑÑÑÛÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÚÙÙÙÚÚqqqqiiiiiiiiiiiiiiiiiqqqqóÙÐÑÑÑÑÛØÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÜÑÒÙÚÜíqqqqqqqqqqqqqqqqqqqqqëììÛÙØÐÑÑÑÑÛÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÚÙÚÙÜìììììììììììììììììììììÛÙÐÑÑÛØÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÚÙÜÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÛÙÙÙØÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙ \ No newline at end of file diff --git a/data/layouts/SootopolisCity_Gym_1F/border.bin b/data/layouts/SootopolisCity_Gym_1F/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/SootopolisCity_Gym_1F/border.bin differ diff --git a/data/layouts/SootopolisCity_Gym_1F/layout.inc b/data/layouts/SootopolisCity_Gym_1F/layout.inc new file mode 100644 index 000000000..ce7a15e5e --- /dev/null +++ b/data/layouts/SootopolisCity_Gym_1F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +SootopolisCity_Gym_1F_Layout:: + .4byte 0x11 + .4byte 0x1a + .4byte SootopolisCity_Gym_1F_MapBorder + .4byte SootopolisCity_Gym_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_SootopolisGym diff --git a/data/layouts/SootopolisCity_Gym_1F/map.bin b/data/layouts/SootopolisCity_Gym_1F/map.bin new file mode 100644 index 000000000..dd52448c9 Binary files /dev/null and b/data/layouts/SootopolisCity_Gym_1F/map.bin differ diff --git a/data/layouts/SootopolisCity_Gym_B1F/border.bin b/data/layouts/SootopolisCity_Gym_B1F/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/SootopolisCity_Gym_B1F/border.bin differ diff --git a/data/layouts/SootopolisCity_Gym_B1F/layout.inc b/data/layouts/SootopolisCity_Gym_B1F/layout.inc new file mode 100644 index 000000000..a97138cd5 --- /dev/null +++ b/data/layouts/SootopolisCity_Gym_B1F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +SootopolisCity_Gym_B1F_Layout:: + .4byte 0x11 + .4byte 0x1a + .4byte SootopolisCity_Gym_B1F_MapBorder + .4byte SootopolisCity_Gym_B1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_SootopolisGym diff --git a/data/layouts/SootopolisCity_Gym_B1F/map.bin b/data/layouts/SootopolisCity_Gym_B1F/map.bin new file mode 100644 index 000000000..58410408f --- /dev/null +++ b/data/layouts/SootopolisCity_Gym_B1F/map.bin @@ -0,0 +1 @@ +%&&&&&&&&&&&&&&&'-%             '/-]2222222222222^/-]2222222222222^/-]2222222222222^/5]2222222222222^7&57&..-%        '/..-]222222222^/-]222222222^/&&5]222222222^7&&&&&5=7&&&....-.%  './....-]222^/&&&&5]222^7&&&&&&&&&&]222^&&&&&&...%&&&&&&'...-%      '/-]222222^/-]2222222^/-]2222222^/-]2222222^/ \ No newline at end of file diff --git a/data/layouts/SootopolisCity_House1/border.bin b/data/layouts/SootopolisCity_House1/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/SootopolisCity_House1/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SootopolisCity_House1/layout.inc b/data/layouts/SootopolisCity_House1/layout.inc new file mode 100644 index 000000000..5c37828ef --- /dev/null +++ b/data/layouts/SootopolisCity_House1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SootopolisCity_House1_MapBorder:: + .incbin "data/layouts/SootopolisCity_House1/border.bin" + + .align 2 +SootopolisCity_House1_MapBlockdata:: + .incbin "data/layouts/SootopolisCity_House1/map.bin" + + .align 2 +SootopolisCity_House1_Layout:: + .4byte 0x8 + .4byte 0x7 + .4byte SootopolisCity_House1_MapBorder + .4byte SootopolisCity_House1_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/SootopolisCity_House1/map.bin b/data/layouts/SootopolisCity_House1/map.bin new file mode 100644 index 000000000..43f11b194 --- /dev/null +++ b/data/layouts/SootopolisCity_House1/map.bin @@ -0,0 +1 @@ +ððñððñð0ÍøùøøùøÕ2ÿ3ÿ3ÿ3ÿ3ÿ3ÿ3µ2ÿ3þ3Ý2ó7ô7Þ2þ3þ3ÿ3þ3Ý2û7ü7Þ2þ3þ3ÿ3þ3þ3þ3þ3þ3þ3þ3ÿ3þ3þ3 þ3þ3þ3 \ No newline at end of file diff --git a/data/layouts/SootopolisCity_House2/border.bin b/data/layouts/SootopolisCity_House2/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/SootopolisCity_House2/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SootopolisCity_House2/layout.inc b/data/layouts/SootopolisCity_House2/layout.inc new file mode 100644 index 000000000..ffa3c5ad1 --- /dev/null +++ b/data/layouts/SootopolisCity_House2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SootopolisCity_House2_MapBorder:: + .incbin "data/layouts/SootopolisCity_House2/border.bin" + + .align 2 +SootopolisCity_House2_MapBlockdata:: + .incbin "data/layouts/SootopolisCity_House2/map.bin" + + .align 2 +SootopolisCity_House2_Layout:: + .4byte 0x8 + .4byte 0x7 + .4byte SootopolisCity_House2_MapBorder + .4byte SootopolisCity_House2_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/SootopolisCity_House2/map.bin b/data/layouts/SootopolisCity_House2/map.bin new file mode 100644 index 000000000..632e1e36a --- /dev/null +++ b/data/layouts/SootopolisCity_House2/map.bin @@ -0,0 +1 @@ +ðÈÉððòðð”vwÍøúø”œ6Ø2Ù2Õ2ÿ3ÿ3ÿ3œ6ÿ3þ3þ3Ý2ó7ô7Þ2þ3ÿ3þ3þ3þ3û7ü7Þ2þ3ÿ3þ3þ3þ3þ3þ3þ3þ3ÿ3þ3þ3 þ3þ3þ3 \ No newline at end of file diff --git a/data/layouts/SootopolisCity_House3/border.bin b/data/layouts/SootopolisCity_House3/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/SootopolisCity_House3/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SootopolisCity_House3/layout.inc b/data/layouts/SootopolisCity_House3/layout.inc new file mode 100644 index 000000000..3d1fa421c --- /dev/null +++ b/data/layouts/SootopolisCity_House3/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SootopolisCity_House3_MapBorder:: + .incbin "data/layouts/SootopolisCity_House3/border.bin" + + .align 2 +SootopolisCity_House3_MapBlockdata:: + .incbin "data/layouts/SootopolisCity_House3/map.bin" + + .align 2 +SootopolisCity_House3_Layout:: + .4byte 0x8 + .4byte 0x7 + .4byte SootopolisCity_House3_MapBorder + .4byte SootopolisCity_House3_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/SootopolisCity_House3/map.bin b/data/layouts/SootopolisCity_House3/map.bin new file mode 100644 index 000000000..8bbd6c517 --- /dev/null +++ b/data/layouts/SootopolisCity_House3/map.bin @@ -0,0 +1 @@ +ðððòòððð½»¼úúø’“Å6Ã2Ä2ÿ3ÿ3ÿ3š2›2ÿ3þ3þ3þ3þ3þ3þ3þ3Ý7Þ7Þ2þ3þ3þ3þ3þ3å7ß7þ3þ3þ3þ3þ3þ3ÿ3þ3þ3 þ3þ3þ3 \ No newline at end of file diff --git a/data/layouts/SootopolisCity_LotadAndSeedotHouse/border.bin b/data/layouts/SootopolisCity_LotadAndSeedotHouse/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/SootopolisCity_LotadAndSeedotHouse/border.bin differ diff --git a/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc b/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc new file mode 100644 index 000000000..1a0e7b418 --- /dev/null +++ b/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SootopolisCity_LotadAndSeedotHouse_MapBorder:: + .incbin "data/layouts/SootopolisCity_LotadAndSeedotHouse/border.bin" + + .align 2 +SootopolisCity_LotadAndSeedotHouse_MapBlockdata:: + .incbin "data/layouts/SootopolisCity_LotadAndSeedotHouse/map.bin" + + .align 2 +SootopolisCity_LotadAndSeedotHouse_Layout:: + .4byte 0x8 + .4byte 0x7 + .4byte SootopolisCity_LotadAndSeedotHouse_MapBorder + .4byte SootopolisCity_LotadAndSeedotHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/SootopolisCity_LotadAndSeedotHouse/map.bin b/data/layouts/SootopolisCity_LotadAndSeedotHouse/map.bin new file mode 100644 index 000000000..ffeea7269 --- /dev/null +++ b/data/layouts/SootopolisCity_LotadAndSeedotHouse/map.bin @@ -0,0 +1 @@ +ÈÉXX®¯`øø`””Ø2Ù2ÿ3ÿ3ÿ3ÿ3œ6œ6ÿ3þ3þ3ó7ô7þ3þ3þ3ÿ3þ3Ý2û7ü7Þ2þ3þ3ÿ3þ3þ3þ3þ3þ3þ3þ3ÿ3þ3þ3 þ3þ3þ3 \ No newline at end of file diff --git a/data/layouts/SootopolisCity_MysteryEventsHouse_1F/border.bin b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/border.bin differ diff --git a/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc new file mode 100644 index 000000000..127128a2e --- /dev/null +++ b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +SootopolisCity_MysteryEventsHouse_1F_Layout:: + .4byte 0xb + .4byte 0x8 + .4byte SootopolisCity_MysteryEventsHouse_1F_MapBorder + .4byte SootopolisCity_MysteryEventsHouse_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_MysteryEventsHouse diff --git a/data/layouts/SootopolisCity_MysteryEventsHouse_1F/map.bin b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/map.bin new file mode 100644 index 000000000..a9b17a746 --- /dev/null +++ b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/map.bin @@ -0,0 +1 @@ +89:' @AB /6666-7$%655555555556555555655555565555555555655 555555 \ No newline at end of file diff --git a/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/border.bin b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/border.bin differ diff --git a/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc new file mode 100644 index 000000000..951b90582 --- /dev/null +++ b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +SootopolisCity_MysteryEventsHouse_B1F_Layout:: + .4byte 0xc + .4byte 0x9 + .4byte SootopolisCity_MysteryEventsHouse_B1F_MapBorder + .4byte SootopolisCity_MysteryEventsHouse_B1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_MysteryEventsHouse diff --git a/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/map.bin b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/map.bin new file mode 100644 index 000000000..558e1584e --- /dev/null +++ b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/map.bin @@ -0,0 +1,2 @@ +  +        6666666666655555555555655 !!!!"555655())))*5556550111125555555555555#5555555555 \ No newline at end of file diff --git a/data/layouts/SouthernIsland_Exterior/border.bin b/data/layouts/SouthernIsland_Exterior/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/SouthernIsland_Exterior/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/SouthernIsland_Exterior/layout.inc b/data/layouts/SouthernIsland_Exterior/layout.inc new file mode 100644 index 000000000..e5747d2e9 --- /dev/null +++ b/data/layouts/SouthernIsland_Exterior/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SouthernIsland_Exterior_MapBorder:: + .incbin "data/layouts/SouthernIsland_Exterior/border.bin" + + .align 2 +SouthernIsland_Exterior_MapBlockdata:: + .incbin "data/layouts/SouthernIsland_Exterior/map.bin" + + .align 2 +SouthernIsland_Exterior_Layout:: + .4byte 0x21 + .4byte 0x1e + .4byte SouthernIsland_Exterior_MapBorder + .4byte SouthernIsland_Exterior_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Rustboro diff --git a/data/layouts/SouthernIsland_Exterior/map.bin b/data/layouts/SouthernIsland_Exterior/map.bin new file mode 100644 index 000000000..8c2c2df4a --- /dev/null +++ b/data/layouts/SouthernIsland_Exterior/map.bin @@ -0,0 +1 @@ +qssÆ4Æ4ÆÆ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ40uuuuqssÆ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4t}uuuqssÆ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4uquuuqssÆ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4uquuuqssÆ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ477Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4ut}uuqss4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ433Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ44uuquu‰ss04Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ44334Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4t}ut}uss{|‰Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ40004Æ4Æ4444444Æ4uquut}s{‰qsÆ4Æ4Æ4Æ4Æ4Æ4Æ4Æ40000440000004ut}uu€˜{‰sqs4Æ4Æ4Æ4Æ4Æ4Æ4Æ40000000Æ4Æ4Æ4000uuquup‰s{‰s044Æ4Æ4Æ4Æ4Æ4Æ400000Æ4Æ4Æ4Æ4400uuquups{‰s{À6Î4‰4Æ4Æ4Æ4Æ4Æ4Æ400044444t¯0Ï0zuquup{‰s{‰44p044Æ4Æ4Æ4Æ4Æ4Æ44tÀ6À6À6À6z000ut}upssq{|‰{||‰444444tz4444t¯0Ï0yzuqup’ssqqq{Î4Î4‰{À6À6À6|||}tyyyyz0000ut}p’s{|||‰44x‰444t‘‘‘z0000000t|}u€˜p’sqqqq{||‰xyyyz0000000000t}qt}pp’{||‰qqqqs0000000000t||||}t|}€˜ppš‰‰{||‰q{|||||¯0Ï0|||}t©©©©}€‰˜ppppppš‰‰{|©©©©©]^0^0_©©©}€‰‰‰‰˜pppppppppppš‰‰‰‰‰‰‰]^0^0_Ÿ‰‰‰˜ppppppppppppppppppppUV0V0V0…2^0^0_qpppppppppppppppppppppppp]^0^0^0^0^0^0_qppppppppppppppppppppppppSTTV3W3TTUqpppppppppppppppppppppppp[\\\\\\]qppppppppppppppppppppppppqqqqqqqqqpppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp \ No newline at end of file diff --git a/data/layouts/SouthernIsland_Interior/border.bin b/data/layouts/SouthernIsland_Interior/border.bin new file mode 100644 index 000000000..03bcafef1 --- /dev/null +++ b/data/layouts/SouthernIsland_Interior/border.bin @@ -0,0 +1 @@ +ÔÕÜÝ \ No newline at end of file diff --git a/data/layouts/SouthernIsland_Interior/layout.inc b/data/layouts/SouthernIsland_Interior/layout.inc new file mode 100644 index 000000000..3ac1a6a82 --- /dev/null +++ b/data/layouts/SouthernIsland_Interior/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SouthernIsland_Interior_MapBorder:: + .incbin "data/layouts/SouthernIsland_Interior/border.bin" + + .align 2 +SouthernIsland_Interior_MapBlockdata:: + .incbin "data/layouts/SouthernIsland_Interior/map.bin" + + .align 2 +SouthernIsland_Interior_Layout:: + .4byte 0x1b + .4byte 0x18 + .4byte SouthernIsland_Interior_MapBorder + .4byte SouthernIsland_Interior_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Rustboro diff --git a/data/layouts/SouthernIsland_Interior/map.bin b/data/layouts/SouthernIsland_Interior/map.bin new file mode 100644 index 000000000..db1e4b153 --- /dev/null +++ b/data/layouts/SouthernIsland_Interior/map.bin @@ -0,0 +1 @@ +ÜÝÔÕÜÝÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÜÝÔÕÜÔÕÜÝÔÕÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÔÕÜÝÔæåÔÕÜÝÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÜÝÔÕäÎÏæåÔÕÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÔÕäòÏÔ×ÎÏæåÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕäòÏÔÕÜÝÔ×ÎÏæåÜÝäåäåäåäòóçäòÏÔÕÜÝÔÕÜÝÔ×ÎÏÔÕ0000000ÔÕÎÏÔÕÜÝÔÕÜÝÔÕÜÝÔÕäç0000000æåÔÕÜÝÔÕÜÝÔÕÜÝÔÕÜÝ00000000000ÜÝÔÕÜÝÔÕÜÝÔÕÜÝÔÕ00È0É0Ê00È0É0Ê000ÔÕÜÝÔÕÜÝÔÕÜÝÔÕÜÝ00Ð0Ñ0Ú00Ø0Ñ0Ò000ÜÝÔÕÜÝÔÕÜÝÔÕÜÝÔÕ00Ð0Ò00Á60Ð0Ò000ÔÕÜÝÔÕÜÝÔÕÜÝÔÕÜÝ00Ð0Ò0000Ð0Ò000ÜÝÔÕÜÝÔÕÜÝÔÕÜÝÔÕ00Ð0Ñ0É0É0É0Ñ0Ò000ÔÕÜÝÔÕÜÝÔÕÜÝÔÕÜÝ00Ø0Ñ0Ñ0Ñ0Ñ0Ñ0Ú000ÜÝÔÕÜÝÔÕÜÝÔÕÜÝÔÕÎ1Ï10Ø0Ù0Ù0Ù0Ú00ÎÏÔÕÜÝÔÕÜÝÔÕÜÝÔÕäåÔ×0000000ÖÕäåÔÕÜÝÔÕÜÝÔÕäòÏ1ÎóòÏ1Î1Ï100Î1Ï1ÜÝÎÏæåÔÕÜÝÔÕäòÏ1ÔÕÔÕÔÕÔ×22ÖÕÔÕÔ×ÎÏæåÔÕäòÏ1ÔÕÜÝÜÝÜÝÜÝÐÒÜÝÜÝÜÝÔ×ÎÏæåÏ1ÔÕÜÝÖÕÔÕÔÕÔÕØÚÔÕÔÕÔÕÜÝÔ×ÎÏÕÜÝÖÕÜÝÜÝÜÝÜÝØÚÜÝÜÝÜÝÔÕÜÝÔ×ÝÖÕÜÝÖÕÔÕÔÕÔÕØÚÔÕÔÕÔÕÜÝÔÕÜÝÕÜÝÖÕÜÝÜÝÜÝÜÝØÚÜÝÜÝÜÝÔÕÜÝÔÕ \ No newline at end of file diff --git a/data/layouts/TerraCave_End/border.bin b/data/layouts/TerraCave_End/border.bin new file mode 100644 index 000000000..f0eabd248 --- /dev/null +++ b/data/layouts/TerraCave_End/border.bin @@ -0,0 +1 @@ +ññññ \ No newline at end of file diff --git a/data/layouts/TerraCave_End/layout.inc b/data/layouts/TerraCave_End/layout.inc new file mode 100644 index 000000000..42ba6309b --- /dev/null +++ b/data/layouts/TerraCave_End/layout.inc @@ -0,0 +1,16 @@ + .align 2 +TerraCave_End_MapBorder:: + .incbin "data/layouts/TerraCave_End/border.bin" + + .align 2 +TerraCave_End_MapBlockdata:: + .incbin "data/layouts/TerraCave_End/map.bin" + + .align 2 +TerraCave_End_Layout:: + .4byte 0x1b + .4byte 0x1e + .4byte TerraCave_End_MapBorder + .4byte TerraCave_End_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/TerraCave_End/map.bin b/data/layouts/TerraCave_End/map.bin new file mode 100644 index 000000000..93121190d --- /dev/null +++ b/data/layouts/TerraCave_End/map.bin @@ -0,0 +1,9 @@ +ññññññññëùùùùùùùùìñññññññññññññññññ ëùùùìñññ +ñññññññññññëùùùùù õ2õ2õ2 +ñññ +ñññññññññññ ëùùùùùõ2õ2õ2ùùì +ñññññññññññ  õ2ö2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2ð +ñññññññññññ ôåæçéõ2õ2õ2õ2õ2õ2õ2ð +ñññññññññññééééñ õ2õ2õ2õ2õ2õ2õ2ð +ñññññññññññññññ ñ õ2õ2õ2õ2õ2õ2õ2ðùùùìññññññëùùùùëõ2õ2õ2õ2õ2õ2õ2 +ññññøùùùùìñ ëùùùùúùùùùùùìññðñ ò222222  "ðññðñ ò2222222222ðññðñ ò22222222   #øùìðñ ò222222  #       "ððñ ò22222 ##ððñ ò22222ððñ ò2222 ##ððñ ò2222efgððñ ò222 #esdrfgððñ ò222efsdd_drfgððñ ò222qdd__d_ddpððñ ò222qd_d____dpððñ ò2222es_d__d_d_pððñ ò2222qdd___d_ddpððñ ò2222#2#2bdd_d_d_dpððñ ò222222#2b_d_d_`a3a3#2ððñ ò2222222222#2a3a3a3a3a3#2    ððñ ò       "2222222222ððñ óóóóóóóóóóóóóóóóóóóóóóóóðñóóóóóóóóóóóóóóóóóóóóóóóóóó \ No newline at end of file diff --git a/data/layouts/TerraCave_Entrance/border.bin b/data/layouts/TerraCave_Entrance/border.bin new file mode 100644 index 000000000..f0eabd248 --- /dev/null +++ b/data/layouts/TerraCave_Entrance/border.bin @@ -0,0 +1 @@ +ññññ \ No newline at end of file diff --git a/data/layouts/TerraCave_Entrance/layout.inc b/data/layouts/TerraCave_Entrance/layout.inc new file mode 100644 index 000000000..8b0a09650 --- /dev/null +++ b/data/layouts/TerraCave_Entrance/layout.inc @@ -0,0 +1,16 @@ + .align 2 +TerraCave_Entrance_MapBorder:: + .incbin "data/layouts/TerraCave_Entrance/border.bin" + + .align 2 +TerraCave_Entrance_MapBlockdata:: + .incbin "data/layouts/TerraCave_Entrance/map.bin" + + .align 2 +TerraCave_Entrance_Layout:: + .4byte 0x14 + .4byte 0x14 + .4byte TerraCave_Entrance_MapBorder + .4byte TerraCave_Entrance_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/TerraCave_Entrance/map.bin b/data/layouts/TerraCave_Entrance/map.bin new file mode 100644 index 000000000..a8108c2ca --- /dev/null +++ b/data/layouts/TerraCave_Entrance/map.bin @@ -0,0 +1,33 @@ +ññññ ññññññëùþÿùìññññññ ñññëùùë3ì +ññññññ ñññ ëùùõ2õ2õ2 + +ññññññ ñëù õ2õ2õ2õ2õ2õ2 + +ñññññëñ ëùõ2õ2óõ2 + +ñññññ ëù õ2õ2õ2õ2 +ñ õ2 + +ññññë ëùõ2õ2õ2õ2 +ñ õ2 + +ññññ ë õ2õ2õ2õ2õ2õ2 +ñ õ2 + +ññëù ëõ2õ2óóóóñ õ2 + +ññ ëù õ2õ2óñëùùùõ2 + +ññ  ëùõ2õ2 +ññ õ2õ2õ2õ2õ2 + +ññ   õ2õ2õ2õ2 +ñëõ2õ2õ2õ2õ2 + +ññ   õ2õ2õ2õ2 +ëõ2õ2õ2õ2õ2õ2 +ùì   õ2õ2õ2õ2õ2õ2õ2õ2õ2ùì +   õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2 + õ2õ2õ2ð +   õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2ð + ôõ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2ôó ññõ2õ2õ2õ2õ2õ2õ2ôôôôôññ ñññôõ2öõ2õ2ôñññññññ ñññññôåæçôôññññññññ \ No newline at end of file diff --git a/data/layouts/TradeCenter/border.bin b/data/layouts/TradeCenter/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/TradeCenter/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/TradeCenter/layout.inc b/data/layouts/TradeCenter/layout.inc new file mode 100644 index 000000000..59d257c62 --- /dev/null +++ b/data/layouts/TradeCenter/layout.inc @@ -0,0 +1,16 @@ + .align 2 +TradeCenter_MapBorder:: + .incbin "data/layouts/TradeCenter/border.bin" + + .align 2 +TradeCenter_MapBlockdata:: + .incbin "data/layouts/TradeCenter/map.bin" + + .align 2 +TradeCenter_Layout:: + .4byte 0xc + .4byte 0x9 + .4byte TradeCenter_MapBorder + .4byte TradeCenter_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_CableClub diff --git a/data/layouts/TradeCenter/map.bin b/data/layouts/TradeCenter/map.bin new file mode 100644 index 000000000..7e592dbe6 --- /dev/null +++ b/data/layouts/TradeCenter/map.bin @@ -0,0 +1,2 @@ +017456742389?<=  >?<:;@AGDE((FGDBCHI2.2222222.2J2KP22 +2 2 2 22222SPQ2+22222+2R2SP2222222222SXY222#2$2%2&222Z2[,2-2 \ No newline at end of file diff --git a/data/layouts/TrainerHill_1F/border.bin b/data/layouts/TrainerHill_1F/border.bin new file mode 100644 index 000000000..064786e8c --- /dev/null +++ b/data/layouts/TrainerHill_1F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/TrainerHill_1F/layout.inc b/data/layouts/TrainerHill_1F/layout.inc new file mode 100644 index 000000000..0cb5fee4a --- /dev/null +++ b/data/layouts/TrainerHill_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +TrainerHill_1F_MapBorder:: + .incbin "data/layouts/TrainerHill_1F/border.bin" + + .align 2 +TrainerHill_1F_MapBlockdata:: + .incbin "data/layouts/TrainerHill_1F/map.bin" + + .align 2 +TrainerHill_1F_Layout:: + .4byte 0x10 + .4byte 0x15 + .4byte TrainerHill_1F_MapBorder + .4byte TrainerHill_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrainerHill diff --git a/data/layouts/TrainerHill_1F/map.bin b/data/layouts/TrainerHill_1F/map.bin new file mode 100644 index 000000000..d72e84a5c --- /dev/null +++ b/data/layouts/TrainerHill_1F/map.bin @@ -0,0 +1,2 @@ +'  2/(282929292/(8292929212;2;2;2 +12;2;2;212;2;2;2       12;2;2;212;2;2;292928292:2;2;2;212;2;2;2;2;2929292:2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;2 \ No newline at end of file diff --git a/data/layouts/TrainerHill_2F/border.bin b/data/layouts/TrainerHill_2F/border.bin new file mode 100644 index 000000000..064786e8c --- /dev/null +++ b/data/layouts/TrainerHill_2F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/TrainerHill_2F/layout.inc b/data/layouts/TrainerHill_2F/layout.inc new file mode 100644 index 000000000..25ac09eb9 --- /dev/null +++ b/data/layouts/TrainerHill_2F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +TrainerHill_2F_MapBorder:: + .incbin "data/layouts/TrainerHill_2F/border.bin" + + .align 2 +TrainerHill_2F_MapBlockdata:: + .incbin "data/layouts/TrainerHill_2F/map.bin" + + .align 2 +TrainerHill_2F_Layout:: + .4byte 0x10 + .4byte 0x15 + .4byte TrainerHill_2F_MapBorder + .4byte TrainerHill_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrainerHill diff --git a/data/layouts/TrainerHill_2F/map.bin b/data/layouts/TrainerHill_2F/map.bin new file mode 100644 index 000000000..8b78fd0b4 --- /dev/null +++ b/data/layouts/TrainerHill_2F/map.bin @@ -0,0 +1,2 @@ +'  2/(282929292/(8292929212;2;2;2 +12;2;2;212;2;2;2      12;2;2;212;2;2;292928292:2;2;2;212;2;2;2;2;2929292:2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;2 \ No newline at end of file diff --git a/data/layouts/TrainerHill_3F/border.bin b/data/layouts/TrainerHill_3F/border.bin new file mode 100644 index 000000000..064786e8c --- /dev/null +++ b/data/layouts/TrainerHill_3F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/TrainerHill_3F/layout.inc b/data/layouts/TrainerHill_3F/layout.inc new file mode 100644 index 000000000..2b9f74cc7 --- /dev/null +++ b/data/layouts/TrainerHill_3F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +TrainerHill_3F_MapBorder:: + .incbin "data/layouts/TrainerHill_3F/border.bin" + + .align 2 +TrainerHill_3F_MapBlockdata:: + .incbin "data/layouts/TrainerHill_3F/map.bin" + + .align 2 +TrainerHill_3F_Layout:: + .4byte 0x10 + .4byte 0x15 + .4byte TrainerHill_3F_MapBorder + .4byte TrainerHill_3F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrainerHill diff --git a/data/layouts/TrainerHill_3F/map.bin b/data/layouts/TrainerHill_3F/map.bin new file mode 100644 index 000000000..5280752f4 --- /dev/null +++ b/data/layouts/TrainerHill_3F/map.bin @@ -0,0 +1,2 @@ +'  2/(282929292/(8292929212;2;2;2 +12;2;2;212;2;2;2      12;2;2;212;2;2;292928292:2;2;2;212;2;2;2;2;2929292:2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;2 \ No newline at end of file diff --git a/data/layouts/TrainerHill_4F/border.bin b/data/layouts/TrainerHill_4F/border.bin new file mode 100644 index 000000000..064786e8c --- /dev/null +++ b/data/layouts/TrainerHill_4F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/TrainerHill_4F/layout.inc b/data/layouts/TrainerHill_4F/layout.inc new file mode 100644 index 000000000..8664a3c90 --- /dev/null +++ b/data/layouts/TrainerHill_4F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +TrainerHill_4F_MapBorder:: + .incbin "data/layouts/TrainerHill_4F/border.bin" + + .align 2 +TrainerHill_4F_MapBlockdata:: + .incbin "data/layouts/TrainerHill_4F/map.bin" + + .align 2 +TrainerHill_4F_Layout:: + .4byte 0x10 + .4byte 0x15 + .4byte TrainerHill_4F_MapBorder + .4byte TrainerHill_4F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrainerHill diff --git a/data/layouts/TrainerHill_4F/map.bin b/data/layouts/TrainerHill_4F/map.bin new file mode 100644 index 000000000..3a285b7f8 --- /dev/null +++ b/data/layouts/TrainerHill_4F/map.bin @@ -0,0 +1,2 @@ +'  2/(282929292/(8292929212;2;2;2 +12;2;2;212;2;2;2      12;2;2;212;2;2;292928292:2;2;2;212;2;2;2;2;2929292:2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;2 \ No newline at end of file diff --git a/data/layouts/TrainerHill_Entrance/border.bin b/data/layouts/TrainerHill_Entrance/border.bin new file mode 100644 index 000000000..064786e8c --- /dev/null +++ b/data/layouts/TrainerHill_Entrance/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/TrainerHill_Entrance/layout.inc b/data/layouts/TrainerHill_Entrance/layout.inc new file mode 100644 index 000000000..0fc549f46 --- /dev/null +++ b/data/layouts/TrainerHill_Entrance/layout.inc @@ -0,0 +1,16 @@ + .align 2 +TrainerHill_Entrance_MapBorder:: + .incbin "data/layouts/TrainerHill_Entrance/border.bin" + + .align 2 +TrainerHill_Entrance_MapBlockdata:: + .incbin "data/layouts/TrainerHill_Entrance/map.bin" + + .align 2 +TrainerHill_Entrance_Layout:: + .4byte 0x13 + .4byte 0x11 + .4byte TrainerHill_Entrance_MapBorder + .4byte TrainerHill_Entrance_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrainerHill diff --git a/data/layouts/TrainerHill_Entrance/map.bin b/data/layouts/TrainerHill_Entrance/map.bin new file mode 100644 index 000000000..fc00c0a5f --- /dev/null +++ b/data/layouts/TrainerHill_Entrance/map.bin @@ -0,0 +1,2 @@ + !:;7<!'()BC3D)/(8335333/(O3N313M3L3/(K73J/(937393/(7373R73/&!!!ST"P373Q3*!!!#$%UV73)))+,-.   33I73H33 33533A3534 +393353353353@3130353353353353373031303130313031303130313031303130313631303130313031303130313031303130313037333313031303130313031303133331363   0313031303130313031303   03730313031303130313000313031303130313 \ No newline at end of file diff --git a/data/layouts/TrainerHill_Roof/border.bin b/data/layouts/TrainerHill_Roof/border.bin new file mode 100644 index 000000000..064786e8c --- /dev/null +++ b/data/layouts/TrainerHill_Roof/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/TrainerHill_Roof/layout.inc b/data/layouts/TrainerHill_Roof/layout.inc new file mode 100644 index 000000000..bfa1aeb35 --- /dev/null +++ b/data/layouts/TrainerHill_Roof/layout.inc @@ -0,0 +1,16 @@ + .align 2 +TrainerHill_Roof_MapBorder:: + .incbin "data/layouts/TrainerHill_Roof/border.bin" + + .align 2 +TrainerHill_Roof_MapBlockdata:: + .incbin "data/layouts/TrainerHill_Roof/map.bin" + + .align 2 +TrainerHill_Roof_Layout:: + .4byte 0x19 + .4byte 0x10 + .4byte TrainerHill_Roof_MapBorder + .4byte TrainerHill_Roof_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrainerHill diff --git a/data/layouts/TrainerHill_Roof/map.bin b/data/layouts/TrainerHill_Roof/map.bin new file mode 100644 index 000000000..815ec1067 --- /dev/null +++ b/data/layouts/TrainerHill_Roof/map.bin @@ -0,0 +1 @@ +€€€€€€€XYajjZggd\]€€€€€€€€€€€€€€`ajjjZgggde€€€€€€€…………………hijjjZggglm…………………gggggg¿pqrijZglstu¿ggggggkkkkkkÅxyz^_bvw{|}ÅkkkkkkkkkkkkÅk3‚3fg[~ƒ„k3ÅkkkkkkÎkÎkkkÅk3k3k3n3oc†‡3k3k3k3ÅkkkÎkÎÏkÏkkkÅk3k3k3k3k3k3k3k3k3k3k3ÅkkkÏkÏkkkkkkÅk3k3k3k3k3k3k3k3k3k3k3ÅkkkkkkkkkkkkÆk3k3k3k3k3k3k3k3k3k3k3Ækkkkkk”•3k3¾3¾3¾3¾3¾3¾3¾3k3¨3©¦¦¦¦¦¦À—————ˆ“”¶ÇÇÇÇÇ·©ª¥®®®®®ÁŸŸŸŸŸ‘’“”•k¨©ª«¬­ŸŸŸŸŸÃŸŸŸŸŸ˜™š›œŽ°±²³´µŸŸŸŸŸÃŸ§§§Ÿ˜¸¹‹Œ– ¡¢¼½µŸ§§§ŸÃŸ¯¯¯Ÿ˜ÈÉʉ€žW¤ËÌ͵Ÿ¯¯¯ŸÃ \ No newline at end of file diff --git a/data/layouts/Underwater1/border.bin b/data/layouts/Underwater1/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/Underwater1/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Underwater1/layout.inc b/data/layouts/Underwater1/layout.inc new file mode 100644 index 000000000..f2b61dfbc --- /dev/null +++ b/data/layouts/Underwater1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Underwater1_MapBorder:: + .incbin "data/layouts/Underwater1/border.bin" + + .align 2 +Underwater1_MapBlockdata:: + .incbin "data/layouts/Underwater1/map.bin" + + .align 2 +Underwater1_Layout:: + .4byte 0x50 + .4byte 0x50 + .4byte Underwater1_MapBorder + .4byte Underwater1_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/layouts/Underwater1/map.bin b/data/layouts/Underwater1/map.bin new file mode 100644 index 000000000..230e3dcd2 --- /dev/null +++ b/data/layouts/Underwater1/map.bin @@ -0,0 +1,17 @@ +22„„„„„„„„„„„„„„„„„„„„„„2222€2©2©22©2©2222222222©2©2222©2©2…„„„„„22„„„„2222€2©222222©2©222©2©2©222222©2©2©2©22222‚22°222€2©2©2©2…# 22 +"##~22222222©2©222222©2©2©222222‚22222€2©2©2©2©2Ž#  "#####~2222222©2©2©2©2}####### 22 +||~©22Ž###~22©2©2©2©2©2©2Ž#  "22Ž######~©2©2Ž22Ž„„„„„„„„„22©2©2Ž22…22©2©2©2©2©2©2‚22222©2©2…222Ž†222©2©2©2©2©2‚222222©2©2Ž222Ž22222}|||| 22 +"2©2©2…222Ž22222Ž#  "22©2©2…©222Ž22222Ž222©2©2…„„„„„„„„„„†©2©22Ž22222Ž222©2©2©2©2©2©2©2222222©2©2©2©2Ž22222Ž#|~22©2222©2©2©22222©2©2©2©2©2Ž#~222©2Ž#||~22222©2©2©2©2©2©2©2©2©2©2Ž2©2©2©2Ž#|||||||||||~©2©2©2Ž#~©2©2©2…„22#~©2©2Ž©2©2©2©2‚22222©2©2Ž#~©2©2©2‚22222©22Ž#|||# 22 +"©22Ž#  "„„„„„„„„22Ž22222222Ž22Ž†22222222…22Ž†2222222222…„22Ž2222©2©2©2222222Ž©22Ž†2222©2©2©2©222222Ž†©22Ž2222222©2©2©22222…222©2©2Ž222222222©222222Ž22222©2©2Ž22222‰2‰222©2©22222Ž22222©2©2Ž222222‚222€2©2©2©2©2©222Ž# 22 +"©2©2}"22222222‚222€2©222©2©222Žy2y2Ž©2©2Ž22°2222222y2y2©2222©2©222Ž©2©2Ž22†©2©2Ž# 22 +""~2222222222©2222Ž©2©2Ž22°22€2©2©2Ž#  "222222222222}|"†2©2Ž2222€2©2©2Ž22222222222222Ž222Ž# 22 +|||"2222222222222222Ž222Ž#  "2222"~2222©22222}|"222Ž# 22 +""|~22222}|"22}|#  ""|||||"©2©2Ž©2©2Ž©2©2Ž©2©2…©2©2©2…„„„„„„„„„©2©2©2©2©2©2©2©2©22222…„22†©2©2©2©2©2©2©2©22222222…2222©2©2©2©2©2}||~22222222Ž2222©2©2©2©2}"22222222Ž# 22 +"†©2©2©2©2Ž"~2222©222Ž#  "22©2©2©2©2}""|~}"2222©2©2©2}""|||||2222©2©2©2Ž22°22©2©2©2…# 22 +"©2©2©2©2Ž#  "©2©2©2©2…22"~©2©2©2©2Ž2222"~©2©2©2Ž222222„„„„„„„"~©2©2Žz222 +"2222€2©2©22222…„„©2©2Ž©2y2y2Ž2222€2©2©22222222…„©2©2Ž#~©2©2Ž# 22 +"||||~222222Ž‰2‰2Ž2©2Ž22#  "#|~2222…„„„2222…2°222©2©2©2©2©2©2©2‚22222222Ž2222#|~©2©2©2©2©2‚22222222Ž# 22 +"||||||# 22 +"222Ž#  "#  "©222Ž©2©22Ž†©2©2}"22ˆ2©2©2Ž2222ˆ2‰2Ž2222 + "# 22 +"#  " \ No newline at end of file diff --git a/data/layouts/Underwater2/border.bin b/data/layouts/Underwater2/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/Underwater2/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Underwater2/layout.inc b/data/layouts/Underwater2/layout.inc new file mode 100644 index 000000000..ab8892c86 --- /dev/null +++ b/data/layouts/Underwater2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Underwater2_MapBorder:: + .incbin "data/layouts/Underwater2/border.bin" + + .align 2 +Underwater2_MapBlockdata:: + .incbin "data/layouts/Underwater2/map.bin" + + .align 2 +Underwater2_Layout:: + .4byte 0x50 + .4byte 0x50 + .4byte Underwater2_MapBorder + .4byte Underwater2_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/layouts/Underwater2/map.bin b/data/layouts/Underwater2/map.bin new file mode 100644 index 000000000..0c6377c30 --- /dev/null +++ b/data/layouts/Underwater2/map.bin @@ -0,0 +1,35 @@ +†©2Š222ˆ2Ž†‰2‰2…†222222©2‚22222Ž‚222€2©2©2©22222222©2‚22222Ž‚222€2©2©2©2©2222222©2©2z222x2Ž#~6y2y2©2©2}||||||||||||||##||||#2222222222222222222222222#       22222222222/# 222222222222222222 +    222222222222222222222#  22222222222222222222222# 22222222222222222222222222# 222222222222222222222222°2222222222222222222222222 +    22222222222222222222222222222222 +" #  222/2222°222 22222222222222°2222±2±2±2Ž "#/#   "# 22222 +"222222222222222222©2©2©2Ž##     " "2222222222222222222©2©2©2Ž/ "222222 +  2222222222©2©2©2Ž22222 +  22222222¨2¨2¨2Ž222222/  2222222222/2222222222222/#  22222# 222222222222222222222222 +"#22/2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222 +"2222222222222222222222222222222222222222222222222# 22222222222222222 +   2222222222222222222222222222222222222222 +   "#     22222222222222222222222222222222222 + " /#           22222222222222/2222222222 +"/ " #/#  22222222/222°2222222222 + " " "# /#/# 22222222°22222222222 + " "/ "#/#/# 2222222222222222222 +" "/ "#/## 2222222222 +"222222 +" " "#/#/# 22222# 2°22/2222222 "/ "### 22222#/222222222 +" "##22222222222222 " "#/# 2222222222222## 2222## 2 +"22222 +  "/2222/# "/222222 "##2222#22222222222#2222222/### 2222/2222222//622222/222222 + 22222222222/22222#222222/222222222222/222222#2222222222222//2222222222222 +"22222222222222222222//62222222/# 2222222/2222222/ "2222222/2222222 +"## 2222222/222222 +" "22222222222222/222222222/222°222 +"/ "# 222222222/22222222222222222//2222222 "222222222222//2222222 +"#/# 22222222222222efg2222222222/ "„„„„##   222222222222222222mno222222222222222†©2‰2‰2©2… #  222222222222222222222222222222222222222222 +" "†©2Š222ˆ2©2Ž /#  222222222222222222222222222222222222222 +"„†©2‚22222€2Ž##    22222222222222222222222222222222 +  " "6©2©2©2‚22222€2Ž/# 222222222222222222222222222222 +"/62©2©2©2z222x2©2Ž##  2222222222222222222222222 +  " "622}~©2y2y2©2} #   22222222222222222222 + "622Ž |||| ##   222222222222222 + "/ "622Ž/#  2222222 +     "622…„##       "/ "62222…„// "6222222Ž#"22222©2Ž|~22222Ž ||||   \ No newline at end of file diff --git a/data/layouts/Underwater3/border.bin b/data/layouts/Underwater3/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/Underwater3/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Underwater3/layout.inc b/data/layouts/Underwater3/layout.inc new file mode 100644 index 000000000..b1238bc1f --- /dev/null +++ b/data/layouts/Underwater3/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Underwater3_MapBorder:: + .incbin "data/layouts/Underwater3/border.bin" + + .align 2 +Underwater3_MapBlockdata:: + .incbin "data/layouts/Underwater3/map.bin" + + .align 2 +Underwater3_Layout:: + .4byte 0x50 + .4byte 0x50 + .4byte Underwater3_MapBorder + .4byte Underwater3_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/layouts/Underwater3/map.bin b/data/layouts/Underwater3/map.bin new file mode 100644 index 000000000..fc5c331a5 --- /dev/null +++ b/data/layouts/Underwater3/map.bin @@ -0,0 +1 @@ +66666666666666666666666666666666666666666666666666666666666666&666666666666„.„„6666666666666©2©2©2©2Ž;2;266666666666666©2©2©2©2Ž;2;2;2;266666666666†©2‰2‰2©2…@2C2C2A26666666666©2Š222ˆ2©2Ž<2P2Q2:266666666666‚22222€2Ž<2T2R:266666666666‚22222€2Ž<2T2R:2666666666666©2z222x2©2Ž@2G2T2R2:266666666666@2A2©2©2y2y2©2}#@2G2P2\2R2B2A266666666666@2D2B2A2#######<2P2\2V2Z2Q2:266666666666?2P2Q2B2:2<2K2L2V2V2R2B2A266666666666?2W2]2Q2:23242T2V2V2R2S2:266666666666?2W2S2U2:2# ?2K2L2V2Z2Q2:266666666666?2W2S2U2:23242T2V2V2R2:26666666666?2Y2O2U2B2A2## ?2K2K2L2R2:26666666666I242W2U2S2:2#3242¸2L2R2:26666666666  ?2W2]2Q2:2## 42Ó2L2R2:26666666666?2Y2O2U2:2#3242L2R2:2666666666I242W2U2B2A2## 42T2R2:26666666666  ?2W2U2S2:2#42T2R2:2666666666?2W2]2Q2:242T2R20 66666666?2W2S2U2:2;242T2R2866666666?2Y2O2U2B2A242T2R28 "666666666   I242W2U2S2:2;2„„42T2R28 "666666666  ?2W2]2Q2:2@2C2A2†‰2‰2…###!a6`"  666666666?2W2S2U2:2?2S2:2†Š222ˆ2…###" "666666666?2W2S2U2B2A2?2S2:2‚22222€2Ž 66666666?2W2S2U2S2:2?2S2B2A2‚22222€2Ž "66666666?2W2S2U2S2:23242S2:2#~z222x2}# "66666666?2W2S2U2S2:2@2A2# ?2S2B2A2©2y2y2©2Ž "# "66666666?2W2S2]2Q2:2?2B2A2?2S2S2:2©2©2©2©2Ž##666666666?2W2P2Q2U2:2?2S2:2?2¸2S2:2#~©2©2©2Ž666666666?2W2T2R2U2:2?2S2:2?2S2S2:2   #~©2©2Ž&#"666666666@2A2?2W2T2R2U2:2?2S2B2A2?2S2S2:2#~©2…„„.„# "666666666<2:2?2W2T2R2U2:2@2D2P2Q2:2?2S2S2:2©2©2©2©2©2©2Ž#  666666666@2Ä2B2A2?2W2T2R2U2:2?2P2_2U2:2@2D2S2S2:2#~©2©2©2©2}##"666666666@2Ä2Ó2Ó2:2?2W2T2R2U2:2?2W2S2U2:2?2S2S22232#######666666666<2Ó2¸2Ó2B2A2?2W2T2R2U2:2;2?2W2S2U2:2?2S2S2:2" "666666666<2Ó2Ð2Ñ2S2:2;2?2W2T2R2U2B2A2?2W2S2U2:2;2?2S2S2:266666666I242T2Z2Q2:2@2G2W2T2R2U2S2:2?2W2S2U2B2A2@2D2S2S2:2#"66666666# ?2Y2L2R2B2A2?2S2W2T2R2]2Q2:2?2K2O2U2S2:2?2S2S2S2:2„„66666666I242T2Z2Q2:2?2P2_2T2Z2Q2U2:23242T2U2S2:2?2S2S22232†©2©2…6666666 6# ?2Y2L2R2:2?2W2S2T2V2R2U2:2  ?2T2U22232?2S2S2:2"  †©2‰2‰2©2…66666666I242T2R2:2?2W2P2\2V2R2U2:2;2?2T2U2:2 ?2S22232  ©2Š222ˆ2©2Ž66 66666# ?2T2R2B2A2?2W2T2V2V2R2U2B2A2?2T2U2:2@2D2S2:2"†‚22222€2Ž66666666?2T2Z2Q2:2?2W2T2V2V2R2U2S2:2?2T2U2:2?2S2S2:2  †©2‚22222€2Ž66666#?2Y2L2R2:2?2W2T2V2V2R2]2Q2:2?2T2U2:2@2D2S22232©2©2©2z222x2©2Ž66666#66I242T2R2B2A2>2?2T2Y2L2V2Z2Q2U2:2>2?2T2U2:2?2S2S2:2"  ©2©2©2©2y2y2©2}#666666666# ?2T2R2S2:2>2?2Y2O2T2V2V2R2U2:2>2>2@2D2T2U2:2@2D2S2S2:2  †‰2‰2©2©2©2©2©2Ž6666666?2T2Z2Q2:2>2?2S2W2Y2L2V2R2U2B2A2>2<2Ð2_2U2:2?2S2S22232  †Š222ˆ2©2©2©2}#666666#66#6?2T2V2R2:2>2?2S2Y2O2T2V2R2]2Q2B2C2D2T2M2K2:2?2S2S2:2" "‚22222€2©2}#666666666?2T2V2R2:2>2I242S2W2T2V2Z2Q2U2S2S2Ð2_2U22232?2S22232 "‚22222€2©2Ž66666#6666#?2Y2L2R2:2>2>2?2S2W2T2V2V2R2U2S2S2T2S2U2:2"?2S2:2"#6#~z222x2©2}|6666666#I242T2R2:2>2>2?2S2W2T2V2V2R2]2^2^2_2S2U2:2?2S2:2 """©2y2y2©2©2Ž6666#666#66# ?2T2R2:2# >2I242W2Y2L2V2Z2Q2S2S2S2M2K2:2?2S20" #~©2©2}|#666666666?2T2R20" >2>2?2Y2O2T2V2V2Z2Q2S2M2K2S2:2#!!"  #6©2©2Ž666666666##1T2R28 " >2>2I242W2Y2L2V2V2R2S2U2S22232 "#6#~}|666666669T2R28 ">2>2>2?2Y2O2T2V2V2R2M2K22232"   "Ž66666666#6##9T2R28# >2>2?2S2W2T2V2V2R2U2S2:2>2 "  #6##6666666669T2R28#>2>2I242W2T2V2V2R2U2S2:2" "  666666669T2R28>2>2>2?2W2Y2L2V2R2U2S2:2 " "666666#6669T2R28## >2>2?2Y2O2T2V2R2U22232 " "#6666666666##)) ## >2I242W2T2V2R2U2:2>2#666666666#  >2>2?2W2T2J2K2U2:2"#666666#6666# " "### >2?2W2T2R2S2U2:2 "  666666666# ">2?2W2T2R2S2U2:2 "#6#666666666 "##>2?2W2T2R2S2U2:2 " "#666#6666666#">2?2W2T2R2¸2U2:2666666666#>2?2W2T2R2S2U2:2666666666>2?2W2T2R2S2U2:2666666666>2?2W2T2R2S2U2:2666666666>2?2W2T2Z2Ñ2U2:26666666#66 ">2?2W2T2V2R2U2:2666666666>2?2W2T2V2R2U2:2#6666666666>2?2W2T2V2R2U2:2#6#6#6#6 \ No newline at end of file diff --git a/data/layouts/Underwater4/border.bin b/data/layouts/Underwater4/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/Underwater4/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Underwater4/layout.inc b/data/layouts/Underwater4/layout.inc new file mode 100644 index 000000000..ed46c9f5b --- /dev/null +++ b/data/layouts/Underwater4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Underwater4_MapBorder:: + .incbin "data/layouts/Underwater4/border.bin" + + .align 2 +Underwater4_MapBlockdata:: + .incbin "data/layouts/Underwater4/map.bin" + + .align 2 +Underwater4_Layout:: + .4byte 0x78 + .4byte 0x28 + .4byte Underwater4_MapBorder + .4byte Underwater4_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/layouts/Underwater4/map.bin b/data/layouts/Underwater4/map.bin new file mode 100644 index 000000000..23f987681 --- /dev/null +++ b/data/layouts/Underwater4/map.bin @@ -0,0 +1 @@ +666666666  >2?2W2T2V2R2U2:2666666666>2?2W2T2V2R2U2:2666666666>2?2W2K2L2R2U2:2666666666# ?2K2O2T2R2U2:2666666666 3242W2T2R2U2:2666666666 "# ?2W2T2R2U2:2 66666666#?2W2T2R2U2:2#666666666 "?2W2T2R2U2B2A2 666 666666?2W2T2R2]2Q2B2C2C2C2A2 # #6666666666?2W2T2Z2Q2]2[2[2[2Q2B2C2C2C2A2 #   #6666666666#)aV2V2Z2[2[2[2Q2]2[2[2[2Q2:2;2;2;2  666666666 6 6aV2V2V2V2V2Z2[2[2[2Q2U2B2A2@2C2C2C2C2C2C2C2C2C28 666666666##))))))aV2V2R2]2Q2B2C2A2@2C2C2D2P2[2[2[2[2[2[2[2[28666666666 #)))a]2[2Q2B2C2C2C2C2D2P2[2[2_2P2[2[2[2[2[2[2`#666666 66666666 "#a[2]2[2[2[2[2[2[2_2P2[2[2\2V2V2V2V2`)"66666666666666##a[2[2[2[2[2[2[2[2\2V2V2`))))"66666666666666#aV2V2V2V2V2V2V2V2`)"66666666666d2V2V2V2V2V2`)"@2C2A2 6666 6666666666@2C2C2A2<2L2V2V2V2`" @2D2¸2B2C2A26666666 6666666<2Ó2¸2:2<2T2L2V2b28 " #<2P2[2[2Q2B2C2C2C2C2C2A26666666666666@2A2## 1Ó2:2@2D2T2T2J20 #1W2P2Q2]2[2[2[2[2[2Q2B2C2A2666666666666666@2D2B2A2" !""<2P2_2T2R28#aT2Z2[2[2[2[2[2Q2]2[2Q2B2C26666 66666666666<2P2Q2:2<2T2P2V2R28#aV2V2V2V2V2V2Z2[2[2]2[2`"666666666666666<2T2R2:2<2T2T2V2R28#)aV2V2V2V2`))))"666666666666666#1T2R2B2A2@2D2T2T2V2R28#))))"666666666666666#aZ2Q2B2C2A2efg@2C2D2P2_2T2V2R28  6666666666666666#aZ2[2Q2B2C2A2mn2o@2D2P2[2_2P2V2`)"# 6666666666666666#aQ2]2[2Q2B2C2C2C2A2;2;2;2;2;2<2P2_2P2[2`)" # "#6666666666666666#)aQ2]2[2[2[2Q2B2C2C2C2C2C2D2T2P2V2` "6666666666666666#))a[2Q2]2[2[2[2[2[2[2[2_2T2` "6666666666666666 #aZ2[2[2[2[2[2[2[2[2[2b2 6666666666666666 "##)aV2V2V2V2V2V2V2J2:2 " "666666666666666 d2V2V2V2V2V2J2U2:2 " "6666666666666666@2D2L2V2V2V2V2R2U2B2A2 " "6666666 666666666#<2P2_2L2V2V2V2R2]2Q2B2C2C2C2C2C2C2C2C2A2 6666666666666666#<2T2P2\2V2`)))a[2[2[2[2[2[2[2[2Q2:26666666666666666#@2D2T2`))"#))a[2[2[2[2`))"6666666666666666# @2C2C2D2P2`" #))))" "66666666666666666""# )))))" "#66666666666666666#"#" \ No newline at end of file diff --git a/data/layouts/Underwater5/border.bin b/data/layouts/Underwater5/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/Underwater5/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Underwater5/layout.inc b/data/layouts/Underwater5/layout.inc new file mode 100644 index 000000000..cef2c5d76 --- /dev/null +++ b/data/layouts/Underwater5/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Underwater5_MapBorder:: + .incbin "data/layouts/Underwater5/border.bin" + + .align 2 +Underwater5_MapBlockdata:: + .incbin "data/layouts/Underwater5/map.bin" + + .align 2 +Underwater5_Layout:: + .4byte 0x50 + .4byte 0x28 + .4byte Underwater5_MapBorder + .4byte Underwater5_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/layouts/Underwater5/map.bin b/data/layouts/Underwater5/map.bin new file mode 100644 index 000000000..902f0dbdc --- /dev/null +++ b/data/layouts/Underwater5/map.bin @@ -0,0 +1 @@ +„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„&„„„„„ „„„.„„„ ©2©2©2©2©2©2©2Ž #©2©2©2}#~©2Ž #©2©2©2Ž©2Ž†©2©2}#©2Ž "†©2©2}#†©2Ž†©2©2©2Ž†©2©2Ž†©2©2©2}#†©2©2©2Ž„„†©2©2©2}#©2©2©2©2Ž†©2©2©2©2©2}#†©2©2}"##†©2‰2‰2©2©2}#„†©2©2©2Ž©2Š222ˆ2©2…„†©2©2©2}"#„„†‚22222€2©2©2©2©2©2©2Ž#©2©2‚22222€2©2©2©2©2}"# """#„„©2©2©2z222x2©2©2©2}"# ""†©2©2…©2©2©2©2y2y2©2©2©2©2Ž ""†©2‰2‰2©2…############©2Š222ˆ2©2Ž ""&†‚22222€2Ž„„.„„„„„†©2‚22222€2Ž#©2©2©2©2©2©2©2©2©2©2©2z222x2©2Ž©2©2©2©2©2©2©2©2©2©2©2©2y2y2©2}"##""""""""""""""""#  # " " "  "############ \ No newline at end of file diff --git a/data/layouts/Underwater6/border.bin b/data/layouts/Underwater6/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/Underwater6/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Underwater6/layout.inc b/data/layouts/Underwater6/layout.inc new file mode 100644 index 000000000..c6f8b9742 --- /dev/null +++ b/data/layouts/Underwater6/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Underwater6_MapBorder:: + .incbin "data/layouts/Underwater6/border.bin" + + .align 2 +Underwater6_MapBlockdata:: + .incbin "data/layouts/Underwater6/map.bin" + + .align 2 +Underwater6_Layout:: + .4byte 0x28 + .4byte 0x50 + .4byte Underwater6_MapBorder + .4byte Underwater6_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/layouts/Underwater6/map.bin b/data/layouts/Underwater6/map.bin new file mode 100644 index 000000000..92bd56031 --- /dev/null +++ b/data/layouts/Underwater6/map.bin @@ -0,0 +1 @@ +&/„„.©2©2©2Ž/©2©2©2Ž©2©2©2Ž©2©2©2…©2©2©2©2Ž/„†©2©2©2©2Ž†©2©2©2©2}##†©2©2©2©2©2Ž„†©2©2©2©2}##©2©2©2©2©2©2Ž©2©2©2©2©2©2Ž©2©2©2©2}##©2©2©2©2Ž/#~©2©2©2Ž©2©2©2Ž#~©2©2Ž#©2©2…„©2©2©2©2Ž©2©2©2©2Ž©2©2©2©2Ž©2©2©2©2…„„„©2©2©2©2©2©2©2©2Ž©2©2©2‰2‰2©2©2©2Ž#~©2Š222ˆ2©2©2Ž/###‚22222€2©2Ž‚22222€2©2…„„„©2z222x2©2©2©2©2©2©2Ž©2©2y2y2©2©2©2©2©2©2©2Ž©2©2©2©2©2©2©2©2©2©2©2Ž####"""##########"""""""""""""""                                # ##   †©2‰2‰2©2©2Ž ©2Š222ˆ2©2Ž ‚22222€2Ž ## ##‚22222€2Ž   #~z222x2©2Ž #~y2y2©2©2Ž#~©2©2©2Ž ~©2©2Ž ~©2Ž†©2Ž  #©2©2©2Ž   ©2©2©2Ž ©2}## &©2Ž .†©2Ž ©2©2©2©2©2©2©2Ž  #~©2©2©2©2©2©2Ž #~©2©2©2©2©2Ž#~©2©2©2©2Ž ####"""    #  ##  # #  # ######"" \ No newline at end of file diff --git a/data/layouts/Underwater7/border.bin b/data/layouts/Underwater7/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/Underwater7/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Underwater7/layout.inc b/data/layouts/Underwater7/layout.inc new file mode 100644 index 000000000..e910152e4 --- /dev/null +++ b/data/layouts/Underwater7/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Underwater7_MapBorder:: + .incbin "data/layouts/Underwater7/border.bin" + + .align 2 +Underwater7_MapBlockdata:: + .incbin "data/layouts/Underwater7/map.bin" + + .align 2 +Underwater7_Layout:: + .4byte 0x50 + .4byte 0x28 + .4byte Underwater7_MapBorder + .4byte Underwater7_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/layouts/Underwater7/map.bin b/data/layouts/Underwater7/map.bin new file mode 100644 index 000000000..660f585ae --- /dev/null +++ b/data/layouts/Underwater7/map.bin @@ -0,0 +1 @@ +9<?WTVVVVVVV9<?WTVVVVVVV„„„„„„9<?WTVVVVVVV„„„„9<?WTVVVVVVV„9<?WTVVVVVVV„„„„„„„„„„„9<?WTVVVVVVV„9<?WTVVVVVVV9<?WTVVVVVVV„„„„„„„„„„„„„†9<?WTVVVVVVV„„„„„&„„„„9<?WTVVVVVVV„„„„„„„.„„9<?WTVVVVVVV„„„„„„†©2©2©2©2©2©2©2©2©2©2Ž9<?WTVVVVVVV©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2Ž9<?WTVVVVVVV„†©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2Ž9<?WTVVVVVVV©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2Ž9<?WTVVVVVVV©2©2‰2‰2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2Ž††9<?WTVVVVVVV©2Š222ˆ2©2©2©2©2©2©2©2©2©2©2©2©2©2}#„„„„„„9<?WTVVVVVVV‚22222€2©2©2©2©2©2©2©2©2©2©2}"#©2©2‰2‰2©2©2Ž9<?WTVVVVVVV‚22222€2©2©2©2©2©2©2©2©2©2©2Ž©2Š222ˆ2©2Ž9<?WTVVVVVVV©2z222x2©2©2}#########‚22222€2Ž9<?WTVVVVVVV©2©2y2y2©2©2©2Ž†‚22222€2Ž9<?WTVVVVVVV#########©2z222x2©2Ž9<?WTVVVVVVV©2©2y2y2©2©2Ž9<?WTVVVVVVV #†©2©2©2©2©2©2Ž9<?WTVVVVVVV †©2©2©2©2©2©2Ž9<?WTVVVVVVV#†©2©2©2©2©2©2Ž9<?WTVVVVVVV†©2}~©2©2©2…„9<?WTVVVVVVV††©2…†©2©2©2©2©2…9<?WTVVVVVVV#†©2©2©2©2©2}~©2©2©2Ž9<?WTVVVVVVV "&†©2©2©2©2©2…†©2©2©2Ž9<?WTVVVVVVV#„„.„„„†©2©2©2©2©2©2©2©2©2©2Ž9<?WTVVVVVVV #©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2Ž9<?WTVVVVVVV©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2Ž9<?WTVVVVVVV   ##""""""""""""""""""9<?WTVVVVVVV 9<?WTVVVVVVV "# # 9<?WTVVVVVVV# #9<?WTVVVVVVV## # ##9<?WTVVVVVVV# ##9<?WTVVVVVVV9<?WTVVVVVVV \ No newline at end of file diff --git a/data/layouts/Underwater_MarineCave/border.bin b/data/layouts/Underwater_MarineCave/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/Underwater_MarineCave/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Underwater_MarineCave/layout.inc b/data/layouts/Underwater_MarineCave/layout.inc new file mode 100644 index 000000000..c51bbeb35 --- /dev/null +++ b/data/layouts/Underwater_MarineCave/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Underwater_MarineCave_MapBorder:: + .incbin "data/layouts/Underwater_MarineCave/border.bin" + + .align 2 +Underwater_MarineCave_MapBlockdata:: + .incbin "data/layouts/Underwater_MarineCave/map.bin" + + .align 2 +Underwater_MarineCave_Layout:: + .4byte 0x14 + .4byte 0xa + .4byte Underwater_MarineCave_MapBorder + .4byte Underwater_MarineCave_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/layouts/Underwater_MarineCave/map.bin b/data/layouts/Underwater_MarineCave/map.bin new file mode 100644 index 000000000..1904f4757 --- /dev/null +++ b/data/layouts/Underwater_MarineCave/map.bin @@ -0,0 +1 @@ +(((((((2$(2"""""+,-""""" \ No newline at end of file diff --git a/data/layouts/Underwater_Route134/border.bin b/data/layouts/Underwater_Route134/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/Underwater_Route134/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Underwater_Route134/layout.inc b/data/layouts/Underwater_Route134/layout.inc new file mode 100644 index 000000000..a4bcf2043 --- /dev/null +++ b/data/layouts/Underwater_Route134/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Underwater_Route134_MapBorder:: + .incbin "data/layouts/Underwater_Route134/border.bin" + + .align 2 +Underwater_Route134_MapBlockdata:: + .incbin "data/layouts/Underwater_Route134/map.bin" + + .align 2 +Underwater_Route134_Layout:: + .4byte 0x12 + .4byte 0xa + .4byte Underwater_Route134_MapBorder + .4byte Underwater_Route134_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/layouts/Underwater_Route134/map.bin b/data/layouts/Underwater_Route134/map.bin new file mode 100644 index 000000000..77bdd37aa --- /dev/null +++ b/data/layouts/Underwater_Route134/map.bin @@ -0,0 +1,2 @@ +(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2### # (2(2$(2(2(2 +""""# +,-  " \ No newline at end of file diff --git a/data/layouts/Underwater_SeafloorCavern/border.bin b/data/layouts/Underwater_SeafloorCavern/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/Underwater_SeafloorCavern/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Underwater_SeafloorCavern/layout.inc b/data/layouts/Underwater_SeafloorCavern/layout.inc new file mode 100644 index 000000000..5d610efb1 --- /dev/null +++ b/data/layouts/Underwater_SeafloorCavern/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Underwater_SeafloorCavern_MapBorder:: + .incbin "data/layouts/Underwater_SeafloorCavern/border.bin" + + .align 2 +Underwater_SeafloorCavern_MapBlockdata:: + .incbin "data/layouts/Underwater_SeafloorCavern/map.bin" + + .align 2 +Underwater_SeafloorCavern_Layout:: + .4byte 0xe + .4byte 0x9 + .4byte Underwater_SeafloorCavern_MapBorder + .4byte Underwater_SeafloorCavern_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/layouts/Underwater_SeafloorCavern/map.bin b/data/layouts/Underwater_SeafloorCavern/map.bin new file mode 100644 index 000000000..4cacc495e --- /dev/null +++ b/data/layouts/Underwater_SeafloorCavern/map.bin @@ -0,0 +1,2 @@ +äåæçà6á6â6ã6(2è2é2ê2ë2(2(2(2(2(2(2(2(2### (2(2$(2(2(2 +"""# +,-  " \ No newline at end of file diff --git a/data/layouts/Underwater_SealedChamber/border.bin b/data/layouts/Underwater_SealedChamber/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/Underwater_SealedChamber/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Underwater_SealedChamber/layout.inc b/data/layouts/Underwater_SealedChamber/layout.inc new file mode 100644 index 000000000..a6f924c18 --- /dev/null +++ b/data/layouts/Underwater_SealedChamber/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Underwater_SealedChamber_MapBorder:: + .incbin "data/layouts/Underwater_SealedChamber/border.bin" + + .align 2 +Underwater_SealedChamber_MapBlockdata:: + .incbin "data/layouts/Underwater_SealedChamber/map.bin" + + .align 2 +Underwater_SealedChamber_Layout:: + .4byte 0x16 + .4byte 0x30 + .4byte Underwater_SealedChamber_MapBorder + .4byte Underwater_SealedChamber_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/layouts/Underwater_SealedChamber/map.bin b/data/layouts/Underwater_SealedChamber/map.bin new file mode 100644 index 000000000..5ac0b4a73 --- /dev/null +++ b/data/layouts/Underwater_SealedChamber/map.bin @@ -0,0 +1 @@ +efgmnoÀ2Ã2Ã2Á2À2Ä2Ð2Ñ2º2¼2Ð2Ü2Ò2º2¼2Ô2Ö2Ò2º2¼2Ô2Ö2Ò2º2¼2Ô2Ö2Ò2º2¾2¼2Ô2Ö2Ò2º2¾2¼2Ô2Ö2Ò2º2À2Ä2Ô2Ö2Ò2º2¾2¼2Ó2Ô2Ö2Ò2º2¾2¼2Ó2Ô2Ö2Ò2º2¾2¼2Ó2Ô2Ö2Ò2Â2Á2¼2Ó2Ô2Ö2Ò2Ó2º2¼2Ó2Ô2Ö2Ú2Ñ2º2¼2Ó2Ô2Ö2Ö2Ò2º2³2´2Ë2Ì2Ö2Ò2Â2Á2  ¼2Ó2Ô2Ö2Ò2Ó2º2#¼2Ó2Ô2Ö2Ú2Ñ2º2³2´2Ô2Ö2Ö2Ò2º2¾2¼2Ô2Ö2Ö2Ò2º2  ¼2Ô2Ö2Ö2Ò2º2¼2Ë2Ì2Ö2Ò2º2#³2´2Ô2Ö2Ò2Â2Á2  ¼2Ô2Ö2Ú2Ñ2º2¼2Ù2Ì2Ö2Ò2º2#É2´2Ô2Ö2Ò2Â2Á2  ¼2Ô2Ö2Ò2Ó2º2¼2Ô2Ö2Ú2Ñ2º2¼2Ù2Ì2Ö2Ò2º2¼2Ó2Ô2Ö2Ò2º2#É2´2Ô2Ö2Ò2º2  ¼2Ô2Ö2Ò2º2¼2Ô2Ê2Ë2º2¼2Ë2Ë2Ó2º2¼2Ó2Ó2Ó2º2¼2Ó2Ó2Ó2Â2Ã2Ã2Á2À2Ã2Ä2Ó2Ó2Ó2Ó2Ó2Ó2Â2Ã2Á2À2Ã2Ä2Ó2     Ó2Ó2º2¼2Ó2Ó2²2´2Ó2Â2Á2¼2Ó2Ó2º2¼2Ó2Ó2º2¼2Ó2Ó2º2¼2Ó2Ó2º2¼2Ó2Ó2º2p¼2Ó2Ó2º2¼2Ó2Ó2Â2Ã2Ã2C2C2C2Ã2Ã2Ä2Ó2Ó2º2³2´2Ó2Ó2Ó2Ó2S2S2S2Ó2Ó2Ó2²2³2³2# ¼2Ó2Ó2Ó2Ó2S2S2S2Ó2Ó2Ó2º2 "#            " \ No newline at end of file diff --git a/data/layouts/Underwater_SootopolisCity/border.bin b/data/layouts/Underwater_SootopolisCity/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/Underwater_SootopolisCity/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Underwater_SootopolisCity/layout.inc b/data/layouts/Underwater_SootopolisCity/layout.inc new file mode 100644 index 000000000..22d42167e --- /dev/null +++ b/data/layouts/Underwater_SootopolisCity/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Underwater_SootopolisCity_MapBorder:: + .incbin "data/layouts/Underwater_SootopolisCity/border.bin" + + .align 2 +Underwater_SootopolisCity_MapBlockdata:: + .incbin "data/layouts/Underwater_SootopolisCity/map.bin" + + .align 2 +Underwater_SootopolisCity_Layout:: + .4byte 0x14 + .4byte 0xa + .4byte Underwater_SootopolisCity_MapBorder + .4byte Underwater_SootopolisCity_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/layouts/Underwater_SootopolisCity/map.bin b/data/layouts/Underwater_SootopolisCity/map.bin new file mode 100644 index 000000000..71346ab72 --- /dev/null +++ b/data/layouts/Underwater_SootopolisCity/map.bin @@ -0,0 +1,2 @@ +(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2### # (2(2(2$(2(2(2(2(2 +""""#  +,-    " \ No newline at end of file diff --git a/data/layouts/UnionRoom/border.bin b/data/layouts/UnionRoom/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/UnionRoom/border.bin differ diff --git a/data/layouts/UnionRoom/layout.inc b/data/layouts/UnionRoom/layout.inc new file mode 100644 index 000000000..2c7e821a9 --- /dev/null +++ b/data/layouts/UnionRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnionRoom_MapBorder:: + .incbin "data/layouts/UnionRoom/border.bin" + + .align 2 +UnionRoom_MapBlockdata:: + .incbin "data/layouts/UnionRoom/map.bin" + + .align 2 +UnionRoom_Layout:: + .4byte 0xf + .4byte 0xc + .4byte UnionRoom_MapBorder + .4byte UnionRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_UnionRoom diff --git a/data/layouts/UnionRoom/map.bin b/data/layouts/UnionRoom/map.bin new file mode 100644 index 000000000..cb1b009c3 --- /dev/null +++ b/data/layouts/UnionRoom/map.bin @@ -0,0 +1,11 @@ +(   # + + + + + + + + + +0222222222222222222222222222222222222222222222222222222222222222222222222222222222 2!2"2222222222222222222222222222222222222 222222222222222222 \ No newline at end of file diff --git a/data/layouts/UnknownMap_08417FC4/border.bin b/data/layouts/UnknownMap_08417FC4/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/UnknownMap_08417FC4/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/UnknownMap_08417FC4/layout.inc b/data/layouts/UnknownMap_08417FC4/layout.inc new file mode 100644 index 000000000..0f3b5504d --- /dev/null +++ b/data/layouts/UnknownMap_08417FC4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_08417FC4_MapBorder:: + .incbin "data/layouts/UnknownMap_08417FC4/border.bin" + + .align 2 +UnknownMap_08417FC4_MapBlockdata:: + .incbin "data/layouts/UnknownMap_08417FC4/map.bin" + + .align 2 +UnknownMap_08417FC4_Layout:: + .4byte 0x50 + .4byte 0x28 + .4byte UnknownMap_08417FC4_MapBorder + .4byte UnknownMap_08417FC4_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/UnknownMap_08417FC4/map.bin b/data/layouts/UnknownMap_08417FC4/map.bin new file mode 100644 index 000000000..17a14a8d5 --- /dev/null +++ b/data/layouts/UnknownMap_08417FC4/map.bin @@ -0,0 +1 @@ +pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp…Ó0000000000000Ô0†ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp…0000000 0 0 000000Ô0†ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp…0000000 0 0 0 0 0 0 0 000Ô0†ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp…s00Æ000 0 0 0 0 0 0 0 0 0 000r†pppppppppppppppppppppppppppppppppppppppppppppppppppppppp…0000ÆÆÆ00 0 0 0 0 0 0 0 0 0 0 0000Ô0†ppppppppppppppppppppppppppppppr{{{{{{vppppppppppppppp…0000ÆÆÆÆ00 0 0 0 0 0 0 0 0 0 0 0 0000Ô0†ppppPQppppppppppppppppppppppr´qkllmq´vppppuvppppPQprs000ÆÆÆÆÆ000 0 0 0 0 0 0 0 0 0 0 01110utpPQXYpppppr{{{{{{{vpppppppu´qk´qquqq|uvpp}~pu{vXYrss000ÆÆ0000000 0 0 0 0 0 0 0 1 5 10uutXYpuvpu{{´qklllmq´vppppuv‚‰q{|||}qt„}~pppppzq|­}sss0000000000ÆÆ4Æ400 0 0 0 0 01110uuu~¯p}~pzqqqk¾klm¾mq´vppp}~p‚y‰qqqty„ppu{{vpp‚y„µfsss00000000000ÆÆÆ4Æ4Æ4Æ400 0 0 00000uuug·ppuvzqqqsq{|}quqq|ppPQpppp‚yyy„ppppzqq|puvppµfsss00000000000ÆÆ4Æ4Æ4Æ4Æ4Æ40 000000uuug·uv}~‚‰qq{‰qqqt}qt„ppXYpppuvppppppuv‚yy„p}~ppµfss{|||‰00000000Æ4Æ4Æ4Æ4Æ4Æ4Æ400t|||}uug·}~ppp‚y‰q{|||}qt„puv{vppp}~pppppp}~pppPQppppµfs{©©©‰s0000000004Æ4Æ4Æ4Æ4Æ4Æ400ut©©©}ug·ppppPQp‚y‘‘‘‘‘y„pp}~q|ppppppppppPQppppXYppuvµf{©©©‰ss0000000000Æ4Æ4Æ4Æ44400uut©©©}g·ppppXYppppppppuvppppy„ppppppppppXYpppppppp}~µn‘‘‘‰ss{|||‰0000004444t|||}uut‘‘‘o·puvppppppppppp}~ppppppppppppppppppppppppuvppµ1$1$1$1ˆs{©©©‰{||‰0000t||}t©©©}ur$1$1$1Ÿ1·p}~pppppuvppppppppppppuvpppppppppppppppp}~ppµ¥1¦11$1ˆ{©©©‰{©©‰{|22|}t©©}t©©©}r$1$1$1Ÿ1·pppppppp}~pppppppppppp}~u{vpppppppuvppppppppµž1ž11$1‘‘‘‰{©©‰{©©22©©}t©©}t‘‘‘’$1$1$1Ÿ1·ppppppppppppppppppppuvppzt„ppppppp}~ppppppppµž1ž11$1$1$1"10x‘‘‰{©©©22©©©}t‘‘z00 1$1$1$1Ž1§1·pppppppppppppppppppp}~pp‚„pppppppppppppppppp½¾£¥1¦11$1"10000x‘‘‘‘22‘‘‘‘z00000 1$1$1Ž1§1¤¿ppppppppppppppppppppppppppppppppppppppppppppppµž1ž11$1$1100000000000000000001$1$1Ž1§1ž1·pppppppppppppppppppppppppppppppppppppppppppppppµž1ž11$1$1!11000000000000000011$1$1Ž1§1ž1¤¿pppppppppppppppppppppppppppppppppppppppppppppppµž1ž1¥11$1$1!11100000000000111$1$1$1$1Ÿ1ž1ž1·ppppppppppppppppppppppppppppppppppppppppppppppppµž1ž1ž11$1$1$1$1"100000000011$1$1$1$1$1$1Ž1§1ž1ž1·pppppppppppppppppppppppppppppppppppppppppppppppp½¾£ž1¥1¦11$1$1$1111111111$1$1$1$1$1$1$1$1Ÿ1ž1¤¾¿pppppppppPQpppppppuvppppppppppppppppppppppppppppppµž1ž1ž11$1$1$1$1$1$1$1$1$1$1$1$1$1$1Ž1¦1¦1¦1¦1¦1§1ž1·ppppppppPQpXYppr{{{v}~ppu{{vpppppppppppppppppppppppp½£ž1ž1¥1¦11$1$1$1$1$1$1$1$1$1$1$1$1Ÿ1ž1ž1ž1¤¾¾¾¿ppppppppXYpppr{´qqq´vpuv´qq|pppppppppppppppppppppppppµž1ž1ž1ž1¥1¦1¦1¦1¦1¦1¦1¦1¦1¦1¦1¦1¦1§1ž1ž1¤¿ppppppppppppppu{{´qqqqqq´v}~qqt„pPQpppppppppppppppppppppp½¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¿ppppppppppuvppp‚‰qqqqqqqqq´vpyy„uvXYPQu{vpuvpppppppPQppppppppppppppppppppppppppppppppppppp}~pppp‚y‰qqqqqqty„pppp}~ppXY‚y„p}~pppppppXYu{{{vpppuvppppppppppppppppppppppPQpuvpu{{{vpp‚yyyyyy„PQpppppppppppppuvpPQpppuvppzqqq´{vp}~ppppppuvppppppppppppppXYp}~p‚‰qq´vpppppppppXYupppppppppppp}~pXYu{v}~uv‚yy‰qq´vpuvpppPQ}~pppppppPQppppr{{{vppp‚‰ty„ppppppppppp}pppppPQppppppppppzq|pp}~ppp‚yyy„p}~PQpXYppu{{vpuvXYppr{´qkm´vppp‚„pppppppppppppppppppXYpppppppppp‚y„pppppppppppppppXYuvppp‚‰q´v}~pu{{´klm{}q|pppppppppppppppppppppppppppppppppppppppppppppppppppppppp}~pppp‚yy„ppp‚‰qq{|}qqt„ppppppppppppppppppppppppppppppPQpppppppppppppppppppppppppppppppppppPQp‚yy‘‘‘yy„pppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppp \ No newline at end of file diff --git a/data/layouts/UnknownMap_08428450/border.bin b/data/layouts/UnknownMap_08428450/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/UnknownMap_08428450/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/UnknownMap_08428450/layout.inc b/data/layouts/UnknownMap_08428450/layout.inc new file mode 100644 index 000000000..603919b42 --- /dev/null +++ b/data/layouts/UnknownMap_08428450/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_08428450_MapBorder:: + .incbin "data/layouts/UnknownMap_08428450/border.bin" + + .align 2 +UnknownMap_08428450_MapBlockdata:: + .incbin "data/layouts/UnknownMap_08428450/map.bin" + + .align 2 +UnknownMap_08428450_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_08428450_MapBorder + .4byte UnknownMap_08428450_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/layouts/UnknownMap_08428450/map.bin b/data/layouts/UnknownMap_08428450/map.bin new file mode 100644 index 000000000..ca93fa0e2 Binary files /dev/null and b/data/layouts/UnknownMap_08428450/map.bin differ diff --git a/data/layouts/UnknownMap_084294C4/border.bin b/data/layouts/UnknownMap_084294C4/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/UnknownMap_084294C4/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/UnknownMap_084294C4/layout.inc b/data/layouts/UnknownMap_084294C4/layout.inc new file mode 100644 index 000000000..3e565369a --- /dev/null +++ b/data/layouts/UnknownMap_084294C4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_084294C4_MapBorder:: + .incbin "data/layouts/UnknownMap_084294C4/border.bin" + + .align 2 +UnknownMap_084294C4_MapBlockdata:: + .incbin "data/layouts/UnknownMap_084294C4/map.bin" + + .align 2 +UnknownMap_084294C4_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_084294C4_MapBorder + .4byte UnknownMap_084294C4_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/layouts/UnknownMap_084294C4/map.bin b/data/layouts/UnknownMap_084294C4/map.bin new file mode 100644 index 000000000..37f05b971 Binary files /dev/null and b/data/layouts/UnknownMap_084294C4/map.bin differ diff --git a/data/layouts/UnknownMap_084294E8/border.bin b/data/layouts/UnknownMap_084294E8/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/UnknownMap_084294E8/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/UnknownMap_084294E8/layout.inc b/data/layouts/UnknownMap_084294E8/layout.inc new file mode 100644 index 000000000..fd157b999 --- /dev/null +++ b/data/layouts/UnknownMap_084294E8/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_084294E8_MapBorder:: + .incbin "data/layouts/UnknownMap_084294E8/border.bin" + + .align 2 +UnknownMap_084294E8_MapBlockdata:: + .incbin "data/layouts/UnknownMap_084294E8/map.bin" + + .align 2 +UnknownMap_084294E8_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_084294E8_MapBorder + .4byte UnknownMap_084294E8_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/layouts/UnknownMap_084294E8/map.bin b/data/layouts/UnknownMap_084294E8/map.bin new file mode 100644 index 000000000..ca93fa0e2 Binary files /dev/null and b/data/layouts/UnknownMap_084294E8/map.bin differ diff --git a/data/layouts/UnknownMap_0843E6C0/border.bin b/data/layouts/UnknownMap_0843E6C0/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/UnknownMap_0843E6C0/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/UnknownMap_0843E6C0/layout.inc b/data/layouts/UnknownMap_0843E6C0/layout.inc new file mode 100644 index 000000000..9cc060b76 --- /dev/null +++ b/data/layouts/UnknownMap_0843E6C0/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0843E6C0_MapBorder:: + .incbin "data/layouts/UnknownMap_0843E6C0/border.bin" + + .align 2 +UnknownMap_0843E6C0_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0843E6C0/map.bin" + + .align 2 +UnknownMap_0843E6C0_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_0843E6C0_MapBorder + .4byte UnknownMap_0843E6C0_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/UnknownMap_0843E6C0/map.bin b/data/layouts/UnknownMap_0843E6C0/map.bin new file mode 100644 index 000000000..22a47d94e Binary files /dev/null and b/data/layouts/UnknownMap_0843E6C0/map.bin differ diff --git a/data/layouts/UnknownMap_0843E6E4/border.bin b/data/layouts/UnknownMap_0843E6E4/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/UnknownMap_0843E6E4/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/UnknownMap_0843E6E4/layout.inc b/data/layouts/UnknownMap_0843E6E4/layout.inc new file mode 100644 index 000000000..5651df7df --- /dev/null +++ b/data/layouts/UnknownMap_0843E6E4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0843E6E4_MapBorder:: + .incbin "data/layouts/UnknownMap_0843E6E4/border.bin" + + .align 2 +UnknownMap_0843E6E4_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0843E6E4/map.bin" + + .align 2 +UnknownMap_0843E6E4_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_0843E6E4_MapBorder + .4byte UnknownMap_0843E6E4_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/UnknownMap_0843E6E4/map.bin b/data/layouts/UnknownMap_0843E6E4/map.bin new file mode 100644 index 000000000..22a47d94e Binary files /dev/null and b/data/layouts/UnknownMap_0843E6E4/map.bin differ diff --git a/data/layouts/UnknownMap_0843E708/border.bin b/data/layouts/UnknownMap_0843E708/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/UnknownMap_0843E708/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/UnknownMap_0843E708/layout.inc b/data/layouts/UnknownMap_0843E708/layout.inc new file mode 100644 index 000000000..b79c2d34b --- /dev/null +++ b/data/layouts/UnknownMap_0843E708/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0843E708_MapBorder:: + .incbin "data/layouts/UnknownMap_0843E708/border.bin" + + .align 2 +UnknownMap_0843E708_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0843E708/map.bin" + + .align 2 +UnknownMap_0843E708_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_0843E708_MapBorder + .4byte UnknownMap_0843E708_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/UnknownMap_0843E708/map.bin b/data/layouts/UnknownMap_0843E708/map.bin new file mode 100644 index 000000000..22a47d94e Binary files /dev/null and b/data/layouts/UnknownMap_0843E708/map.bin differ diff --git a/data/layouts/UnknownMap_0843E72C/border.bin b/data/layouts/UnknownMap_0843E72C/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/UnknownMap_0843E72C/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/UnknownMap_0843E72C/layout.inc b/data/layouts/UnknownMap_0843E72C/layout.inc new file mode 100644 index 000000000..36aee8b80 --- /dev/null +++ b/data/layouts/UnknownMap_0843E72C/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0843E72C_MapBorder:: + .incbin "data/layouts/UnknownMap_0843E72C/border.bin" + + .align 2 +UnknownMap_0843E72C_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0843E72C/map.bin" + + .align 2 +UnknownMap_0843E72C_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_0843E72C_MapBorder + .4byte UnknownMap_0843E72C_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/UnknownMap_0843E72C/map.bin b/data/layouts/UnknownMap_0843E72C/map.bin new file mode 100644 index 000000000..22a47d94e Binary files /dev/null and b/data/layouts/UnknownMap_0843E72C/map.bin differ diff --git a/data/layouts/UnknownMap_0843E750/border.bin b/data/layouts/UnknownMap_0843E750/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/UnknownMap_0843E750/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/UnknownMap_0843E750/layout.inc b/data/layouts/UnknownMap_0843E750/layout.inc new file mode 100644 index 000000000..c233955f1 --- /dev/null +++ b/data/layouts/UnknownMap_0843E750/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0843E750_MapBorder:: + .incbin "data/layouts/UnknownMap_0843E750/border.bin" + + .align 2 +UnknownMap_0843E750_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0843E750/map.bin" + + .align 2 +UnknownMap_0843E750_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_0843E750_MapBorder + .4byte UnknownMap_0843E750_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/UnknownMap_0843E750/map.bin b/data/layouts/UnknownMap_0843E750/map.bin new file mode 100644 index 000000000..22a47d94e Binary files /dev/null and b/data/layouts/UnknownMap_0843E750/map.bin differ diff --git a/data/layouts/UnknownMap_0843E774/border.bin b/data/layouts/UnknownMap_0843E774/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/UnknownMap_0843E774/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/UnknownMap_0843E774/layout.inc b/data/layouts/UnknownMap_0843E774/layout.inc new file mode 100644 index 000000000..bc2c238f3 --- /dev/null +++ b/data/layouts/UnknownMap_0843E774/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0843E774_MapBorder:: + .incbin "data/layouts/UnknownMap_0843E774/border.bin" + + .align 2 +UnknownMap_0843E774_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0843E774/map.bin" + + .align 2 +UnknownMap_0843E774_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_0843E774_MapBorder + .4byte UnknownMap_0843E774_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/UnknownMap_0843E774/map.bin b/data/layouts/UnknownMap_0843E774/map.bin new file mode 100644 index 000000000..22a47d94e Binary files /dev/null and b/data/layouts/UnknownMap_0843E774/map.bin differ diff --git a/data/layouts/UnknownMap_0843E798/border.bin b/data/layouts/UnknownMap_0843E798/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/UnknownMap_0843E798/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/UnknownMap_0843E798/layout.inc b/data/layouts/UnknownMap_0843E798/layout.inc new file mode 100644 index 000000000..352db474d --- /dev/null +++ b/data/layouts/UnknownMap_0843E798/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0843E798_MapBorder:: + .incbin "data/layouts/UnknownMap_0843E798/border.bin" + + .align 2 +UnknownMap_0843E798_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0843E798/map.bin" + + .align 2 +UnknownMap_0843E798_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_0843E798_MapBorder + .4byte UnknownMap_0843E798_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/UnknownMap_0843E798/map.bin b/data/layouts/UnknownMap_0843E798/map.bin new file mode 100644 index 000000000..22a47d94e Binary files /dev/null and b/data/layouts/UnknownMap_0843E798/map.bin differ diff --git a/data/layouts/UnknownMap_0843E7BC/border.bin b/data/layouts/UnknownMap_0843E7BC/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/UnknownMap_0843E7BC/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/UnknownMap_0843E7BC/layout.inc b/data/layouts/UnknownMap_0843E7BC/layout.inc new file mode 100644 index 000000000..c0edd37eb --- /dev/null +++ b/data/layouts/UnknownMap_0843E7BC/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0843E7BC_MapBorder:: + .incbin "data/layouts/UnknownMap_0843E7BC/border.bin" + + .align 2 +UnknownMap_0843E7BC_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0843E7BC/map.bin" + + .align 2 +UnknownMap_0843E7BC_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_0843E7BC_MapBorder + .4byte UnknownMap_0843E7BC_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/UnknownMap_0843E7BC/map.bin b/data/layouts/UnknownMap_0843E7BC/map.bin new file mode 100644 index 000000000..22a47d94e Binary files /dev/null and b/data/layouts/UnknownMap_0843E7BC/map.bin differ diff --git a/data/layouts/UnknownMap_0843E7E0/border.bin b/data/layouts/UnknownMap_0843E7E0/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/UnknownMap_0843E7E0/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/UnknownMap_0843E7E0/layout.inc b/data/layouts/UnknownMap_0843E7E0/layout.inc new file mode 100644 index 000000000..b421cf662 --- /dev/null +++ b/data/layouts/UnknownMap_0843E7E0/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0843E7E0_MapBorder:: + .incbin "data/layouts/UnknownMap_0843E7E0/border.bin" + + .align 2 +UnknownMap_0843E7E0_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0843E7E0/map.bin" + + .align 2 +UnknownMap_0843E7E0_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_0843E7E0_MapBorder + .4byte UnknownMap_0843E7E0_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/UnknownMap_0843E7E0/map.bin b/data/layouts/UnknownMap_0843E7E0/map.bin new file mode 100644 index 000000000..22a47d94e Binary files /dev/null and b/data/layouts/UnknownMap_0843E7E0/map.bin differ diff --git a/data/layouts/UnknownMap_0843E804/border.bin b/data/layouts/UnknownMap_0843E804/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/UnknownMap_0843E804/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/UnknownMap_0843E804/layout.inc b/data/layouts/UnknownMap_0843E804/layout.inc new file mode 100644 index 000000000..d8bc1cfb0 --- /dev/null +++ b/data/layouts/UnknownMap_0843E804/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0843E804_MapBorder:: + .incbin "data/layouts/UnknownMap_0843E804/border.bin" + + .align 2 +UnknownMap_0843E804_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0843E804/map.bin" + + .align 2 +UnknownMap_0843E804_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_0843E804_MapBorder + .4byte UnknownMap_0843E804_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/UnknownMap_0843E804/map.bin b/data/layouts/UnknownMap_0843E804/map.bin new file mode 100644 index 000000000..22a47d94e Binary files /dev/null and b/data/layouts/UnknownMap_0843E804/map.bin differ diff --git a/data/layouts/UnknownMap_0843E828/border.bin b/data/layouts/UnknownMap_0843E828/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/UnknownMap_0843E828/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/UnknownMap_0843E828/layout.inc b/data/layouts/UnknownMap_0843E828/layout.inc new file mode 100644 index 000000000..dddd408cc --- /dev/null +++ b/data/layouts/UnknownMap_0843E828/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0843E828_MapBorder:: + .incbin "data/layouts/UnknownMap_0843E828/border.bin" + + .align 2 +UnknownMap_0843E828_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0843E828/map.bin" + + .align 2 +UnknownMap_0843E828_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_0843E828_MapBorder + .4byte UnknownMap_0843E828_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/UnknownMap_0843E828/map.bin b/data/layouts/UnknownMap_0843E828/map.bin new file mode 100644 index 000000000..22a47d94e Binary files /dev/null and b/data/layouts/UnknownMap_0843E828/map.bin differ diff --git a/data/layouts/UnknownMap_0843E84C/border.bin b/data/layouts/UnknownMap_0843E84C/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/UnknownMap_0843E84C/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/UnknownMap_0843E84C/layout.inc b/data/layouts/UnknownMap_0843E84C/layout.inc new file mode 100644 index 000000000..34c5282d5 --- /dev/null +++ b/data/layouts/UnknownMap_0843E84C/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0843E84C_MapBorder:: + .incbin "data/layouts/UnknownMap_0843E84C/border.bin" + + .align 2 +UnknownMap_0843E84C_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0843E84C/map.bin" + + .align 2 +UnknownMap_0843E84C_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_0843E84C_MapBorder + .4byte UnknownMap_0843E84C_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/UnknownMap_0843E84C/map.bin b/data/layouts/UnknownMap_0843E84C/map.bin new file mode 100644 index 000000000..22a47d94e Binary files /dev/null and b/data/layouts/UnknownMap_0843E84C/map.bin differ diff --git a/data/layouts/UnknownMap_0843E870/border.bin b/data/layouts/UnknownMap_0843E870/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/UnknownMap_0843E870/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/UnknownMap_0843E870/layout.inc b/data/layouts/UnknownMap_0843E870/layout.inc new file mode 100644 index 000000000..0ddc0f858 --- /dev/null +++ b/data/layouts/UnknownMap_0843E870/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0843E870_MapBorder:: + .incbin "data/layouts/UnknownMap_0843E870/border.bin" + + .align 2 +UnknownMap_0843E870_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0843E870/map.bin" + + .align 2 +UnknownMap_0843E870_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_0843E870_MapBorder + .4byte UnknownMap_0843E870_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/UnknownMap_0843E870/map.bin b/data/layouts/UnknownMap_0843E870/map.bin new file mode 100644 index 000000000..22a47d94e Binary files /dev/null and b/data/layouts/UnknownMap_0843E870/map.bin differ diff --git a/data/layouts/UnknownMap_0843E894/border.bin b/data/layouts/UnknownMap_0843E894/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/UnknownMap_0843E894/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/UnknownMap_0843E894/layout.inc b/data/layouts/UnknownMap_0843E894/layout.inc new file mode 100755 index 000000000..0b3cc1697 --- /dev/null +++ b/data/layouts/UnknownMap_0843E894/layout.inc @@ -0,0 +1,15 @@ + .align 2 +UnknownMap_0843E894_MapBorder:: + .incbin "data/layouts/UnknownMap_0843E894/border.bin" + +UnknownMap_0843E894_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0843E894/map.bin" + + .align 2 +UnknownMap_0843E894_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_0843E894_MapBorder + .4byte UnknownMap_0843E894_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/UnknownMap_0843E894/map.bin b/data/layouts/UnknownMap_0843E894/map.bin new file mode 100644 index 000000000..22a47d94e Binary files /dev/null and b/data/layouts/UnknownMap_0843E894/map.bin differ diff --git a/data/layouts/UnknownMap_08447028/border.bin b/data/layouts/UnknownMap_08447028/border.bin new file mode 100644 index 000000000..9e4b3fb7a --- /dev/null +++ b/data/layouts/UnknownMap_08447028/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/UnknownMap_08447028/layout.inc b/data/layouts/UnknownMap_08447028/layout.inc new file mode 100644 index 000000000..ea5e6288d --- /dev/null +++ b/data/layouts/UnknownMap_08447028/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_08447028_MapBorder:: + .incbin "data/layouts/UnknownMap_08447028/border.bin" + + .align 2 +UnknownMap_08447028_MapBlockdata:: + .incbin "data/layouts/UnknownMap_08447028/map.bin" + + .align 2 +UnknownMap_08447028_Layout:: + .4byte 0x3A + .4byte 0x1A + .4byte UnknownMap_08447028_MapBorder + .4byte UnknownMap_08447028_MapBlockdata + .4byte gTileset_General + .4byte 0 diff --git a/data/layouts/UnknownMap_08447028/map.bin b/data/layouts/UnknownMap_08447028/map.bin new file mode 100644 index 000000000..028da0526 --- /dev/null +++ b/data/layouts/UnknownMap_08447028/map.bin @@ -0,0 +1,3 @@ +22222222222222222222222222222222222222222222222222222222222222222222222222662222222222222222222222222222222222222222222222226666 ò ò ò ò662222222222222222222222222òòòòòò ò ò ò òòòò ò ò +ò2266662òòòòBBBBòò2222222222222222222222222666666BBBB66BBBB222222266666622222g2g2g2g2g2g2g2g22222222222202GG2NdedeOKLQ2$%&'22222g2g2g2g2g2g2g2g222222222222822222:$!&'2 !"#:VcccWcSTa2222222g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2H2222:Vccccccca22222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f222222222222:Vccccccca22222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2222ò ò ò +òIIIIB^_______Y222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2222BBBB222222222222222222222222222222222222222222222822CEED22()*G22 ò ò ò ò22222222222222222222222222228223522 %"#:2BBBB222222222222222222222222222282235222:2+,-222222222222222222222222222222822GG2222222:2$%&'222222222222222222222222222222822222r2222H2<<222222222222222222222222222222228222222222222222222222222222222222222222222222222222222282222q2222p222222222222222222222222222222222222222222228222222222222222222222222222222222222222222222222222222282h2h2h2h2k2222s22CIIIIIID2222222222222222222222222222222222282j2222k22222235222:22222222222222222222222282j2222k22222235222:22222222222222222222222282j2222k22222235222:22222222222222222222222282j2i22i2i22222235222:22222222222222222222222282222222222235222:22222222222222222222222282222222235222:222222222222222222222222 \ No newline at end of file diff --git a/data/layouts/UnknownMap_0845A394/border.bin b/data/layouts/UnknownMap_0845A394/border.bin new file mode 100644 index 000000000..f1629c020 --- /dev/null +++ b/data/layouts/UnknownMap_0845A394/border.bin @@ -0,0 +1 @@ +3333 \ No newline at end of file diff --git a/data/layouts/UnknownMap_0845A394/layout.inc b/data/layouts/UnknownMap_0845A394/layout.inc new file mode 100644 index 000000000..d9951db4d --- /dev/null +++ b/data/layouts/UnknownMap_0845A394/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0845A394_MapBorder:: + .incbin "data/layouts/UnknownMap_0845A394/border.bin" + + .align 2 +UnknownMap_0845A394_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0845A394/map.bin" + + .align 2 +UnknownMap_0845A394_Layout:: + .4byte 0x13 + .4byte 0x13 + .4byte UnknownMap_0845A394_MapBorder + .4byte UnknownMap_0845A394_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/UnknownMap_0845A394/map.bin b/data/layouts/UnknownMap_0845A394/map.bin new file mode 100644 index 000000000..fd294d9b6 Binary files /dev/null and b/data/layouts/UnknownMap_0845A394/map.bin differ diff --git a/data/layouts/UnknownMap_0845D470/border.bin b/data/layouts/UnknownMap_0845D470/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/UnknownMap_0845D470/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/UnknownMap_0845D470/layout.inc b/data/layouts/UnknownMap_0845D470/layout.inc new file mode 100644 index 000000000..36421f503 --- /dev/null +++ b/data/layouts/UnknownMap_0845D470/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0845D470_MapBorder:: + .incbin "data/layouts/UnknownMap_0845D470/border.bin" + + .align 2 +UnknownMap_0845D470_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0845D470/map.bin" + + .align 2 +UnknownMap_0845D470_Layout:: + .4byte 0x3C + .4byte 0x28 + .4byte UnknownMap_0845D470_MapBorder + .4byte UnknownMap_0845D470_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/layouts/UnknownMap_0845D470/map.bin b/data/layouts/UnknownMap_0845D470/map.bin new file mode 100644 index 000000000..cd136de41 --- /dev/null +++ b/data/layouts/UnknownMap_0845D470/map.bin @@ -0,0 +1 @@ +qqqqqqqqqqqt||}ut©|}€˜pppš{‰qs{‰$1â4$1$1$1$1â4$1$1uuqupppppppppppppqqqqqqqqt||}qqt}u€‰‰˜pppppš{‰{‰s$1$1$1$1$1$1$1$1t}ut}ppppppppppppp||||||||}qqqt|}t}pppppppppšsqs{‰$1$1$1â4$1t|}quu€˜pppppppppppppqqqqqt©©©|||}qt}€˜pppppppppPesq{‰{‰â4$1$1t}qt|}uppppppppppppppqqt||}qqqt©©©|}€˜ppppppppppXm{‰q{‰{|||}qt}t|}pppppppppppppp||}qt©|||}€‰‰‰‰˜ppuvpppppPQpš{‰q{©©Ÿ©©|}qu€‰˜pppppppppppppp©©©|}€‰‰‰‰˜uvpu{vp}~pppppXYppš{|©©©§0©©©©|}pppppppppppppppp€‰Z[‰˜ppppp}~pzq|pppppppppPQppš‰‰$1$1$1$1$1€‰Z[˜ppppPQpppppppppp˜pXYppppuvpppp‚y„pppppppuvXYppppp’$1$1$1$1$1pXYu{{{vXYppppppppppppppu{vp}~ppuvPQppppppPQ}~pppppppš‰‰‰‰‰˜puv‚y‰q|ppuvppppppppppppzq|ppppp}~XYppuvppXYpu{vppppppppppppp}~pp‚y„PQ}~ppppppppPQpp‚y„ppuvPQpppPQ}~pPQppzq|uvppppppppppuvppppppXYpu{{vpppppXYpppppPQ}~XYpuvXYpPQXYpp‚y„}~ppuvpppppu´|ppppppppu´qq´vpppppppppppXYppppp}~pppXYppppppppppp}~pppppzq|pppppppp‚yyyy„PQppppppppppppppppppppuvpppppppppppppppppuv‚y„pppppppuvppPQpXYu{pppppppppppppppppp}~u{vppppppppppppPQ}~pppppppppp}~ppXYpppzqppppppppppppppppppppzq´{vppppuvppuvXYpppppppu{vpppppPQppuv‚ypppppppppppppppppppp‚yyy„pppp}~uv}~pppppppu{´q|pppppXYpp}~pppppppppppppppppppppppppuvpppppp}~pppppppppzqqq|ppppppPQpppPQppppppppppppppppppppppp}~ppppppppppppppppp‚yyy„ppppppXYpppXYppppppppppppppppppppppppPQppuvpppppppu{vppppppppppppppppppppppppppppppppppppppppppppXYPQ}~ppppuvu´q|ppppppppppppppppppppppppppppppppppppppppppppppXYppu{{v}~‚yy„pppppppppppppppppppppppppppppppppppppppppppppppppp‚yy„ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppPQppppppppppppppppppppppppppppppppppppppppppppuvppppppPQppppXYppppppppppppppppppppppppppppppppppPQuvpppppp}~pppuvpXYppppppppuvppppppppppppppppppppppppppppppXY}~ppppppu{PQp}~pppu{vpppppz´vpuvpppppppppppppuvpppppppppuvppppppppppzqXYppppppzq|puvpp‚‰´v}~pppppppppppPQ}~pppppppuv}~ppppppppPQ‚y{{{{tppp‚y„p}~uvp‚y„pppppppu{{vppXYpuvpppppp}~pppPQpuvppXYppqqqq´{tppppuvp}~ppuvpppppppzqq´{vppp}~uvpppu{{vppXYp}~puvpppllllmq´{{{t}~pppuv}~ppu{{vp‚‰qqq´vpppp}~ppu´qq´{{vu{{{v}~pppqqqq¿llmqq´{tppp}~ppu{´qq|uv‚yyyy„ppppppPQ‚yyy‰qq´´qqt„pppppqqqqqqq¿mqqqutppppppzqqqt„}~ppppppppppppXYpppp‚y‰qqqt„ppppPQqqqqqqqq¿llmuu{tppuv‚yyy„ppppppppppppppppppppppp‚yyy„pppppXYqqqqqqqqqqq¿¿¿l¿tp}~ppppppppppppppppppppppppppppppppppppppppqqqqqqqqqqqqqqqqutpppppppppppppppppppppppppppppppppppppppppp \ No newline at end of file diff --git a/data/layouts/UnknownMap_0845ECB4/border.bin b/data/layouts/UnknownMap_0845ECB4/border.bin new file mode 100644 index 000000000..f0eabd248 --- /dev/null +++ b/data/layouts/UnknownMap_0845ECB4/border.bin @@ -0,0 +1 @@ +ññññ \ No newline at end of file diff --git a/data/layouts/UnknownMap_0845ECB4/layout.inc b/data/layouts/UnknownMap_0845ECB4/layout.inc new file mode 100644 index 000000000..ca018989b --- /dev/null +++ b/data/layouts/UnknownMap_0845ECB4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0845ECB4_MapBorder:: + .incbin "data/layouts/UnknownMap_0845ECB4/border.bin" + + .align 2 +UnknownMap_0845ECB4_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0845ECB4/map.bin" + + .align 2 +UnknownMap_0845ECB4_Layout:: + .4byte 0x1B + .4byte 0x2E + .4byte UnknownMap_0845ECB4_MapBorder + .4byte UnknownMap_0845ECB4_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/UnknownMap_0845ECB4/map.bin b/data/layouts/UnknownMap_0845ECB4/map.bin new file mode 100644 index 000000000..ec344933f --- /dev/null +++ b/data/layouts/UnknownMap_0845ECB4/map.bin @@ -0,0 +1 @@ +ëùùùùùùùùùùùùùìññññññññññññòëùùùùùùùùùùùìðññññññññññññòòõ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2ðøùùìñññññññññòôéõ2õ2õ2õ2õ2õ2õ2õ2õ2øùùìðñññññññññòññòõ2ö2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2ððñññññññññôéêôåæçéõ2õ2õ2õ2õ2õ2õ2ððñññññññññññòñññññòõ2õ2õ2õ2õ2õ2õ2ððñññññññññññôééêññòëùù2ùùìðøìñññññññññññññòññòòõ2õ2õ2õ2õ2ððñðñññññññññññññòññòòõ2õ2õ2õ2õ2ððñøìññññññññññññòññòòõ2õ2õ2õ2õ2ðøìñðññññññññññññòñëúòëù2ùìðñðñðññññññññññññòñòëúòõ2õ2õ2ððñðñøìññññññññññëúñòòëúõ2õ2õ2ðøìøìñðññññññññññòññòòòõ2õ2õ2õ2øìðñðñøìññññññëùùúñëúòòõ2õ2õ2õ2õ2ððñðññðññññññòññññòëúò2ðøìðññðñññññùúñëùùúòëú222øìððññðññññññññòñññòò222ðððññðñññññëùùúñëùúò22222ðððññðñññññòññññòññò22222ððøùìøùùùùùòññëùúññò2ððññðññññññòñëúññëùú222ðøùìøùùùùùìúñòññëú222øùìøùùùùùìðùùúññò  222øùùùùìñððñëùùùú 222   ðñðøñò 2222222 ðñøùñò2222222222ðñññëú 2222222    #øùùìò 222    #ðò2222 #  ðò2222     ðò2222 #    ðò2222 efg  ðò222 # esdrfg ðò222efsd_ddrfgðò222qdd_d__ddpðò222qd______dpðò22222es_d____d_pðò22222 qdd______dpðò22222222#2#2bdd_d_d_dpðóóó222222222#2b_d_d_`a3a3#2ðñññóé22222222#2a3a3a3a3a3#2222ðñññóééé2222222222222ôôôñññññññññóééé222222ééôññññññññññññññññóééééééóññññññ \ No newline at end of file diff --git a/data/layouts/UnknownMap_08469200/border.bin b/data/layouts/UnknownMap_08469200/border.bin new file mode 100644 index 000000000..c07869a9f --- /dev/null +++ b/data/layouts/UnknownMap_08469200/border.bin @@ -0,0 +1 @@ +ÙÙÙÙ \ No newline at end of file diff --git a/data/layouts/UnknownMap_08469200/layout.inc b/data/layouts/UnknownMap_08469200/layout.inc new file mode 100644 index 000000000..babdb2c61 --- /dev/null +++ b/data/layouts/UnknownMap_08469200/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_08469200_MapBorder:: + .incbin "data/layouts/UnknownMap_08469200/border.bin" + + .align 2 +UnknownMap_08469200_MapBlockdata:: + .incbin "data/layouts/UnknownMap_08469200/map.bin" + + .align 2 +UnknownMap_08469200_Layout:: + .4byte 0x3C + .4byte 0x3C + .4byte UnknownMap_08469200_MapBorder + .4byte UnknownMap_08469200_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Sootopolis diff --git a/data/layouts/UnknownMap_08469200/map.bin b/data/layouts/UnknownMap_08469200/map.bin new file mode 100644 index 000000000..67085fd37 --- /dev/null +++ b/data/layouts/UnknownMap_08469200/map.bin @@ -0,0 +1,12 @@ +ÙÙÙÙÙÙÙÚÙÙÓáááâÚÙ2ÚÙ2Ù2ÙÙÙÙÙÓáá9áááááÔàÔàÔÙ2Ù2Ù2Ù2Ù2àááááááá9áÔÙ2Ù2Ù2Ù2Ù2ÙÙÙÙÓááâÙÙÚÙÓááâÓâÙ2Ù2Óáá9áâÓKLMÔàÔàÔàááááááááááááà9ááÔÙ2ÙÓááâÙÓáá9âÙÚÙ2Ù2Ù2ÚÙ2Ù2Ù2ÚÓáâ  +  ØÙ2àÔàááááÔÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2  + ÔØÙ2áâÙÙÓáâÙáâÓááâÙ2Ù2Ù2ÚÚ  + Ù2Ù2%7'ØÙ2Ù2àÔÙ2Ù2Ù2Ù2àáKLMÙ2Ù2Ù2Ù2  + ØàáÙÙÓáâÙÓá  + UÙÚÓáááááâÚÙ2Ù2-?/àÔÙ2Ù2àÔ@AAAB ZÔÙ2Ù2Ù2àáÔááâÙÙÓâÙ2#$_ÓâÚÙ2Ù2Ù2Ù2Ù2Ù2Ú Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2àáÔÙ2àáÔÙ2Ù2Ù2àÔÙ2Ù2Ù2Ù2Ù2 Ù2Ù2ØÙÓKLMâÙ2Ù2+,_ÚÓâÙ2Ù2ÓáD2E2âÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2ØÙ2Ù2Ù2ØÙ2Ù2Ù2Ù2Ø@AAAAAAABÙ2àÓâ @AAFÙ2G\ÚÚÙ2Ù2Ù2ÚÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2@AFÙ2Ù2GAAABàÔÙ2Ù2àááááD2áÔàááááááááÔÙ2Ù2âÙ%6'Ù2ÓábD2cáâÚÙ2Ù2Ù2ÚÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2ÓábD2E2cááááÔàááááÔÙ2Ù2Ù2Ù2àááááá9ááÔØÙ2Ù2ÙÙ->/Ù2ÚÙ2ÓD2áááâÙ2Ù2Ù2ÚÓáááááááâÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2àáááÔÙàááD2ááááááÔØàáÔAAAAABÚÙ2ÚÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2ÚÚÙ2Ù2ÓááááááááááááD2E2áááÔàÔÙÙÓD2áááááÔ  + ØàáÔàááááááâÓâÓáááááD2E2âÚÓáâÓáááááááááááD2E2ááÔØÙ2ØÙÙÚÙ2Ù2Ù2Ù2Ù2Ù2ØØÙ2Ù2ØÙ2Ù2Ù2ÓááááâÓâÙ2Ù2Ù2Ù2Ù2Ù2Ù2ÓâÚÓáâÙ2ÓáááááááááD2E2ÔÙ2ØàÔàááâ6Ù2Ù2Ù2Ù2Ù2Ù2Ø ØÙ2Ù2àáááâÙ2Óáááâ82Ù2ÓáááD2E2âÙ2ÚÚÓááâÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2àÔàÔàááá9ááÔÙ2Ù2Ù2àÔÙ2Ù2àáÔÙ2Ù2Ù2Ù2Ù2Ù2ÚÙ2ÓáâÙ2Ù2Ù2Ù2Ù2Ù2ÓâÚÚ@AFÙ2Ù2GAAAAAAAABàÔàáááÔØÙ2Ù2Ù2Ù2ØÙ2Ù2Ù2Ù2àáÔÙ2ÓááâÙ2ÚT  + BÙ2Ù2Ù2Ù2Ù2Ù2ÚÙ2ÚÚÙ2ÓbD2E2cáQR[RSáÔÙ2Ù2àáÔTA  + ØØÙ2Ù2Ù2Ù2ØÙ282Ù2Ù2Ù2Ù2àÙ2;Ù2Ù2Ù2Ù2Ú^#$Ù2Ù2Ù2ÓáD2E2âÙ2ÚÚÙ2ÚÙ2Ù2Ù2Ù2Ó á!2á"ÔàááÔÙ2Ø^Ù2#$ØØÙ2Ù2Ù2Ù2àáááÔ2Ù2Ù2Ù2Ú^+,Ù2Ù2Ù2ÚÓD2E2ááâÚÙ2ÚÙ2Ù2Ù2Ù2Ú()2)2)2*óÙ2Ù2Ù2àÔØ^Ù2+,ØàÔÙ2Ù2Ù2Ù2  + à  + ÓKLM^Ù2Ù2Ù2Ù2Ù2Ù2ÚÚÙ2Ù2Ù2Ù2Ù2ÚÓânÙ2Ù2oÚ0q0q0q02óÙ2Ù2Ù2Ù2ØØ^Ù2Ù2Ù2Ù2ØÙ2àD2E2áÔ Ù2Ú ^Ù2Ù2Ù2Ù2Ù2Ù2ÚÚÙ2Ù2Ù2Ù2Ù2ÚÚÓbD2E2cýq0€6q0€6q0ûáÔÙ2Ù2ØØ^Ù2Ù2Ù2Ù2àááD2E2ÔØ%7'Ù2Ú%7']AAABÙ2Ù2ÚÚÙ2Ù2ÓáD2âÚÚq0q0q0q0q0q0€6q0€6q0q0q0ûáÔØØ^Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2ØàááÔ-?/Ù2AABÚ-?/Ù2ÓáááD2E2âÚÙ2Ù2ÚÓD2áâÚq0q0q0q0q0q0q0q0q0q0q0q0q0q0ÎØØ]ABÙ2Ù2Ù2Ù2Ù2Ù2Ù2ØÙ2Ù2Ù2àáááÔáááâÓáááâÙ2Ù2Ù2Ù2Ù2Ù2ÚÙ2Ù2ÚÚÙ2Ù2Ù2Úq0q0q0q0q0q0q0q0q0q0q0q0q0q0ÎØàáááD2E2áKLMÔàááÔÙ2Ù2Ù2Ù2àÙÙÓáâÙ2ÓáKLMáD2E2áâÓáâÚÙ2Ù2Ù2Úq0q0t||||||||||‰ÎàáÔTBÙ2Ù2Ù2 ØÙ2Ù2Ù2àÔÙ2Ù2Ù2Ù2áKLÙ2Ù2ÚTYZBÙ2Ù2ÓáâÓáâÓD2E2Íty}’““““““““”sÖáÔØ^Ù2Ù2Ù2Ù2ØÙ2Ù2Ù2Ù2ØÙ2Ù2Ù2Ù2Ù2 Ù2Ù2Ú^Ù2Ù2Ù2ÚÓáâÙ2Ù2Úq0q0t}’“¢œ{y‰óØ^Ù2Ù2Ù2Ù2ØÙ2àÔÙ2Ù2Ù2Ù2%6'Ù2Ù2Ú^Ù2Ù2Ù2ÚÚk6l6l6m6Úq0q0u’¢¤“”sóØ^Ù2Ù2Ù2Ù2Ù2Ù2Ù2àÔ Ù2ØÙ2Ù2Ù2Ù2->/Ù2Ù2Ú^Ù2Ù2Ù2Ù2Ù2Ù2ÚÚ0123Úq0q0ušœsóØ]AABÙ2Ù2Ù2Ù2Ù2ØÙ2àÔÙ2Ù2AAAABÓâ]AAAABÓâÚ89:;Úq0q0uš˜™™™™ œsóà{|}~ÔÙ2Ù2Ù2Ù2ØÙ2Ù2ØÙ2Ù2Ù2Ù2ÓááâÓááááááâÓâABwÚq0q0ušœŠ‹‹‹‹ŒšœsóTPQRSØÙ2Ù2Ù2Ù2àáD2ÔÙ2Ù2àÔÙ2Ù2ÓâÙ2ÓáâÙ2Ù2Ù2ÓáááâÙ2Ù2Ù2Ù2Ù2Úq0q0ušœ¸¹º³»¼šœsó^XYZ[ØÙ2Ù2Ù2Ù2Ù2Ù2Ù2ØÙ2Ù2Ù2ØÙ2Ù2ÚÙ2Ù2ÚÙ2Ù2Ù2Ù2Ù2ÚÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Óýq0q0ušœÀÁÂÅÃÄšœsó^abvàáD2E2ÔÙ2Ù2Ù2àááÔàÔÓâÙ2Ù2ÚÓáKLMâÙ2Ù2Ù2Ù2Ù2ÓD2E2ýq0q0q0ušœÓ0È1É1ÊÍËÌ1Ô0šœsó^Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2àááÔÙ2Ù2Ù2ØÙ2ØâÙ2Ù2ÓâÚTYZBÙ2Ù2Ù2Ù2Óýq0q0q0q0q0q0ušœ000000010šœsó^Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2222à9áÔØÙ2ØÙ2Ù2Ù2ÚÙ2Ú^Ù2Ù2Ù2Ù2Óýq0q0q0q0q0q0t}šœ00000010šœsó]BÙ2Ù2@AFÙ2Ù2 222ØØÙ2ØÙ2ÓáâÓâ^Ù2Ù2Ù2Ù2Úq0tÞßD2E2yz’¢œ00000000šœsûááD2E2áÔNÙ2Ù2  + ØØÙ2ØÓâÙ2Ù2ÚÙ2^Ù2Ù2Ù2Ù2Ù2Ù2Ù2Úq0rÖ×0000šœ00000000šœ{yyyD2E2‰óNÙ2Ù2ØàÔØâÓááâÙ2]BÙ2Ù2Ù2Ù2Óáýq0ræç0000š¤““““““““¢¤”04000póNÙ2Ù2Ù2Ù2Ù2ØÙ2ØØÙ2ÚÙ2Ù2Óáááááááýtyyz0’““““¢œ00000póV@AAAAAABàÔØàÓâÙ2ÓýqtyÞßÞßyz0000šœ00000pûáááááááÔÙÙØàÔÚÙÙ2Úqqr0Ö×Ö×000000š¤“”000xyyyy‰qqqóÙÙØÙØÚÙÙ2Úqqr0æåÜÝ000000šœ00000000xÞ߉ûÔÙàÔØÚÙÙ2Úqqr000ÔÕ000000šœ000000000Ö×pqóÙÙØØÚÙÙ2Úqqr000æç000000š´µ¶·°±²³¤““”0000Î1Ï1ÜÝpqûÔÙØØÚÙÙ2Úqqr0000000Î1Ï100š¼½¾¿¸¹º»œ0000ÖÕÔÕpqqóÙØØÜÒÙ2ìíqr0000000Ö×00šÄÅÆÇÀÁÂÃœ0000ÜÝÜÝpqqóÙØØÙÚÙÙÜí¿iiij000ÜÝ’“¢¤“““”ÔÕÔÕpqqóÙØØÙÜÑÑÒÜìììí¿ij0ÔÕšœæåäçpëìÛÙØØÙÙÙÙÜÑÑÒÙÜìír0æçšî©i0i0i0i0¾0óÙÐÑÛÛÙÙÙÙÙÙÙÜÑÒÙÚ¿iijšqqqqëìÛÐØÙÙÙÑÑÑÒÙÙÙÙÙÚÙÜìíqršî¨¨¨¨¨©qëììÛÙÙØØÙÙÙÙÙÙÜÑÒÙÙÙÜÑÑÒÜíršqqqqqqqóÙÙÙÐÑÛØÙÙÙÙÙÙÙÙÚÙÙÙÙÙÙÚÙÚrš¥¦¦¦§î¨¨¨©qqqqëììÛÙÙÙØÙÙØÙÙÙÙÙÙÙÙÜÑÒÙÙÙÙÜÒÚrš¥¦­‘‘‘¯¦§qqqqqqqëÛÐÑÑÑÑÑÛÐÑÛÙÙÙÙÙÙÙÙÙÙÚÙÙÙÙÙÚÚrš¥­‘‘‘‘‘‘‘¯§qqqqqëìÛÙØÙÙÙÙÐÑÛÙÙÙÙÙÙÙÙÙÙÙÙÜÑÒÙÙÙÚÚ©¨¨¨ï¥­‘‘‘‘‘‘‘‘‘¯§î¨©qqëììÛÙÙÙØÐÑÑÑÛÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÚÙÙÙÚÚqqqq©¨¨ªªªªªªªªªªªªª©qqqqóÙÐÑÑÑÑÛØÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÜÑÒÙÚÜíqqqqqqqqqqqqqqqqqqqqqëììÛÙØÐÑÑÑÑÛÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÚÙÚÙÜìììììììììììììììììììììÛÙÐÑÑÛØÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÚÙÜÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÛÙÙÙØÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙ \ No newline at end of file diff --git a/data/layouts/UnknownMap_084693AC/border.bin b/data/layouts/UnknownMap_084693AC/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/UnknownMap_084693AC/border.bin differ diff --git a/data/layouts/UnknownMap_084693AC/layout.inc b/data/layouts/UnknownMap_084693AC/layout.inc new file mode 100644 index 000000000..f4b882fde --- /dev/null +++ b/data/layouts/UnknownMap_084693AC/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_084693AC_MapBorder:: + .incbin "data/layouts/UnknownMap_084693AC/border.bin" + + .align 2 +UnknownMap_084693AC_MapBlockdata:: + .incbin "data/layouts/UnknownMap_084693AC/map.bin" + + .align 2 +UnknownMap_084693AC_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_084693AC_MapBorder + .4byte UnknownMap_084693AC_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePike diff --git a/data/layouts/UnknownMap_084693AC/map.bin b/data/layouts/UnknownMap_084693AC/map.bin new file mode 100644 index 000000000..a179d8997 Binary files /dev/null and b/data/layouts/UnknownMap_084693AC/map.bin differ diff --git a/data/layouts/UnknownMap_08470BD8/border.bin b/data/layouts/UnknownMap_08470BD8/border.bin new file mode 100644 index 000000000..4531975c7 Binary files /dev/null and b/data/layouts/UnknownMap_08470BD8/border.bin differ diff --git a/data/layouts/UnknownMap_08470BD8/layout.inc b/data/layouts/UnknownMap_08470BD8/layout.inc new file mode 100644 index 000000000..f1a0e90ea --- /dev/null +++ b/data/layouts/UnknownMap_08470BD8/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_08470BD8_MapBorder:: + .incbin "data/layouts/UnknownMap_08470BD8/border.bin" + + .align 2 +UnknownMap_08470BD8_MapBlockdata:: + .incbin "data/layouts/UnknownMap_08470BD8/map.bin" + + .align 2 +UnknownMap_08470BD8_Layout:: + .4byte 0x28 + .4byte 0x8C + .4byte UnknownMap_08470BD8_MapBorder + .4byte UnknownMap_08470BD8_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Mauville diff --git a/data/layouts/UnknownMap_08470BD8/map.bin b/data/layouts/UnknownMap_08470BD8/map.bin new file mode 100644 index 000000000..0f7bbb958 Binary files /dev/null and b/data/layouts/UnknownMap_08470BD8/map.bin differ diff --git a/data/layouts/UnknownMap_08480DAC/border.bin b/data/layouts/UnknownMap_08480DAC/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/UnknownMap_08480DAC/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/UnknownMap_08480DAC/layout.inc b/data/layouts/UnknownMap_08480DAC/layout.inc new file mode 100644 index 000000000..8239461fc --- /dev/null +++ b/data/layouts/UnknownMap_08480DAC/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_08480DAC_MapBorder:: + .incbin "data/layouts/UnknownMap_08480DAC/border.bin" + + .align 2 +UnknownMap_08480DAC_MapBlockdata:: + .incbin "data/layouts/UnknownMap_08480DAC/map.bin" + + .align 2 +UnknownMap_08480DAC_Layout:: + .4byte 0xD + .4byte 0xD + .4byte UnknownMap_08480DAC_MapBorder + .4byte UnknownMap_08480DAC_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Lab diff --git a/data/layouts/UnknownMap_08480DAC/map.bin b/data/layouts/UnknownMap_08480DAC/map.bin new file mode 100644 index 000000000..d1277f280 Binary files /dev/null and b/data/layouts/UnknownMap_08480DAC/map.bin differ diff --git a/data/layouts/UnknownMap_08480F54/border.bin b/data/layouts/UnknownMap_08480F54/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/UnknownMap_08480F54/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/UnknownMap_08480F54/layout.inc b/data/layouts/UnknownMap_08480F54/layout.inc new file mode 100644 index 000000000..6916f61ae --- /dev/null +++ b/data/layouts/UnknownMap_08480F54/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_08480F54_MapBorder:: + .incbin "data/layouts/UnknownMap_08480F54/border.bin" + + .align 2 +UnknownMap_08480F54_MapBlockdata:: + .incbin "data/layouts/UnknownMap_08480F54/map.bin" + + .align 2 +UnknownMap_08480F54_Layout:: + .4byte 0xE + .4byte 0xE + .4byte UnknownMap_08480F54_MapBorder + .4byte UnknownMap_08480F54_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/layouts/UnknownMap_08480F54/map.bin b/data/layouts/UnknownMap_08480F54/map.bin new file mode 100644 index 000000000..f0d9c299c --- /dev/null +++ b/data/layouts/UnknownMap_08480F54/map.bin @@ -0,0 +1 @@ +''''''''';<=''/////////CD2E//¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½289999:½2½2½2½2½2½2½2½2@AAAAB½2½2½2½2½2½2½2½2AAAAAA½2½2½2½2½2½2½2½2AAAAAA½2½2½2½2½2½2½2½2AAAAAA½2½2½2½2½2½2½2½2IMMMMJ½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2"2#2½2½2½2½2½2½2 \ No newline at end of file diff --git a/data/layouts/UnknownMap_084810FC/border.bin b/data/layouts/UnknownMap_084810FC/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/UnknownMap_084810FC/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/UnknownMap_084810FC/layout.inc b/data/layouts/UnknownMap_084810FC/layout.inc new file mode 100644 index 000000000..6e0116512 --- /dev/null +++ b/data/layouts/UnknownMap_084810FC/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_084810FC_MapBorder:: + .incbin "data/layouts/UnknownMap_084810FC/border.bin" + + .align 2 +UnknownMap_084810FC_MapBlockdata:: + .incbin "data/layouts/UnknownMap_084810FC/map.bin" + + .align 2 +UnknownMap_084810FC_Layout:: + .4byte 0xE + .4byte 0xE + .4byte UnknownMap_084810FC_MapBorder + .4byte UnknownMap_084810FC_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/layouts/UnknownMap_084810FC/map.bin b/data/layouts/UnknownMap_084810FC/map.bin new file mode 100644 index 000000000..908158cf4 --- /dev/null +++ b/data/layouts/UnknownMap_084810FC/map.bin @@ -0,0 +1 @@ +'';<='''';<=''//CD2E////CL2E//5252525252525252525252525252424242424242424242424242424242424242424242424242424242424242424289999:4242424242424242@AAAAB4242424242424242AAAAAA4242424242424242AAAAAA4242424242424242AAAAAA4242424242424242IMMMMJ42424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242 \ No newline at end of file diff --git a/data/layouts/UnknownMap_084812A4/border.bin b/data/layouts/UnknownMap_084812A4/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/UnknownMap_084812A4/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/UnknownMap_084812A4/layout.inc b/data/layouts/UnknownMap_084812A4/layout.inc new file mode 100644 index 000000000..3f7a2770d --- /dev/null +++ b/data/layouts/UnknownMap_084812A4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_084812A4_MapBorder:: + .incbin "data/layouts/UnknownMap_084812A4/border.bin" + + .align 2 +UnknownMap_084812A4_MapBlockdata:: + .incbin "data/layouts/UnknownMap_084812A4/map.bin" + + .align 2 +UnknownMap_084812A4_Layout:: + .4byte 0xE + .4byte 0xE + .4byte UnknownMap_084812A4_MapBorder + .4byte UnknownMap_084812A4_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/layouts/UnknownMap_084812A4/map.bin b/data/layouts/UnknownMap_084812A4/map.bin new file mode 100644 index 000000000..d033bc4d2 --- /dev/null +++ b/data/layouts/UnknownMap_084812A4/map.bin @@ -0,0 +1 @@ +'';<=';<=';<='//CL2E/CD2E/CD2E/¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½289999:½2½2½2½2½2½2½2½2@AAAAA½2½2½2½2½2½2½2½2AAAAAA½2½2½2½2½2½2½2½2AAAAAA½2½2½2½2½2½2½2½2AAAAAA½2½2½2½2½2½2½2½2IMMMMJ½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2 \ No newline at end of file diff --git a/data/layouts/UnknownMap_0848144C/border.bin b/data/layouts/UnknownMap_0848144C/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/UnknownMap_0848144C/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/UnknownMap_0848144C/layout.inc b/data/layouts/UnknownMap_0848144C/layout.inc new file mode 100644 index 000000000..fe7f90b16 --- /dev/null +++ b/data/layouts/UnknownMap_0848144C/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0848144C_MapBorder:: + .incbin "data/layouts/UnknownMap_0848144C/border.bin" + + .align 2 +UnknownMap_0848144C_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0848144C/map.bin" + + .align 2 +UnknownMap_0848144C_Layout:: + .4byte 0xE + .4byte 0xE + .4byte UnknownMap_0848144C_MapBorder + .4byte UnknownMap_0848144C_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/layouts/UnknownMap_0848144C/map.bin b/data/layouts/UnknownMap_0848144C/map.bin new file mode 100644 index 000000000..eeccae9ae --- /dev/null +++ b/data/layouts/UnknownMap_0848144C/map.bin @@ -0,0 +1 @@ +'';<=';<=';<='//CD2E/CL2E/CL2E/525252525252525265252525252626266642424242424242426262426264242424242424289999:4242424242424242@AAAAB4242424242424242AAAAAA4242424242424242AAAAAA4242424242424242AAAAAA4242424242424242IMMMMJ42424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242 \ No newline at end of file diff --git a/data/layouts/UnknownMap_084815F4/border.bin b/data/layouts/UnknownMap_084815F4/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/UnknownMap_084815F4/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/UnknownMap_084815F4/layout.inc b/data/layouts/UnknownMap_084815F4/layout.inc new file mode 100644 index 000000000..a501c6cc6 --- /dev/null +++ b/data/layouts/UnknownMap_084815F4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_084815F4_MapBorder:: + .incbin "data/layouts/UnknownMap_084815F4/border.bin" + + .align 2 +UnknownMap_084815F4_MapBlockdata:: + .incbin "data/layouts/UnknownMap_084815F4/map.bin" + + .align 2 +UnknownMap_084815F4_Layout:: + .4byte 0xE + .4byte 0xE + .4byte UnknownMap_084815F4_MapBorder + .4byte UnknownMap_084815F4_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/layouts/UnknownMap_084815F4/map.bin b/data/layouts/UnknownMap_084815F4/map.bin new file mode 100644 index 000000000..8507a4932 --- /dev/null +++ b/data/layouts/UnknownMap_084815F4/map.bin @@ -0,0 +1 @@ +'';<='''';<=''//CL2E////CD2E//¾2¾2¾2¾2¾2¾2¾2¾2¾26¾2¾2¾2¾2½2½2½2½2½2½2½2½26½2½2½2½2½2½2½2½28999999:½2½2½2½2½2½2@AAAAAAB½2½2½2½2½2½2AAAAAAAA½2½2½2½2½2½2AAAAAAAA½2½2½2½2½2½2AAAAAAAA½2½2½2½2½2½2AAAAAAAA½2½2½2½2½2½2AAAAAAAA½2½2½2½2½2½2IMMMMMMJ½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2 \ No newline at end of file diff --git a/data/layouts/UnknownMap_08481B24/border.bin b/data/layouts/UnknownMap_08481B24/border.bin new file mode 100644 index 000000000..e9d1c658c --- /dev/null +++ b/data/layouts/UnknownMap_08481B24/border.bin @@ -0,0 +1 @@ +ÁÁÁÁ \ No newline at end of file diff --git a/data/layouts/UnknownMap_08481B24/layout.inc b/data/layouts/UnknownMap_08481B24/layout.inc new file mode 100644 index 000000000..52a6a8acf --- /dev/null +++ b/data/layouts/UnknownMap_08481B24/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_08481B24_MapBorder:: + .incbin "data/layouts/UnknownMap_08481B24/border.bin" + + .align 2 +UnknownMap_08481B24_MapBlockdata:: + .incbin "data/layouts/UnknownMap_08481B24/map.bin" + + .align 2 +UnknownMap_08481B24_Layout:: + .4byte 0x1B + .4byte 0x18 + .4byte UnknownMap_08481B24_MapBorder + .4byte UnknownMap_08481B24_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/layouts/UnknownMap_08481B24/map.bin b/data/layouts/UnknownMap_08481B24/map.bin new file mode 100644 index 000000000..2a47bca91 --- /dev/null +++ b/data/layouts/UnknownMap_08481B24/map.bin @@ -0,0 +1 @@ +ÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁd2d2d2­6d2d2d2­6d2d2d2­6­6­6­6­6­6­6d2d2d2­6d2d2d2­6d24242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242''''''''''m2ž2n';<='''''''''//////////j2ž2k/CL2E/////////52525252525252525252525252525252525252424242424242424242424242424242424242424242424242424242424242424242424242424242[[[[[[[[[[[[[[[[[[[[[[[[[[[¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢ \ No newline at end of file diff --git a/data/layouts/UnknownMap_08481DBC/border.bin b/data/layouts/UnknownMap_08481DBC/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/UnknownMap_08481DBC/border.bin differ diff --git a/data/layouts/UnknownMap_08481DBC/layout.inc b/data/layouts/UnknownMap_08481DBC/layout.inc new file mode 100644 index 000000000..314a94b88 --- /dev/null +++ b/data/layouts/UnknownMap_08481DBC/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_08481DBC_MapBorder:: + .incbin "data/layouts/UnknownMap_08481DBC/border.bin" + + .align 2 +UnknownMap_08481DBC_MapBlockdata:: + .incbin "data/layouts/UnknownMap_08481DBC/map.bin" + + .align 2 +UnknownMap_08481DBC_Layout:: + .4byte 0xB + .4byte 0x8 + .4byte UnknownMap_08481DBC_MapBorder + .4byte UnknownMap_08481DBC_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_MysteryEventsHouse diff --git a/data/layouts/UnknownMap_08481DBC/map.bin b/data/layouts/UnknownMap_08481DBC/map.bin new file mode 100644 index 000000000..603f55c93 --- /dev/null +++ b/data/layouts/UnknownMap_08481DBC/map.bin @@ -0,0 +1,2 @@ +' +  +/6666-7$%655555555556555555655555565555555555655 555555 \ No newline at end of file diff --git a/data/layouts/UnknownMap_25_29/border.bin b/data/layouts/UnknownMap_25_29/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/UnknownMap_25_29/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/UnknownMap_25_29/layout.inc b/data/layouts/UnknownMap_25_29/layout.inc new file mode 100644 index 000000000..30eb032e4 --- /dev/null +++ b/data/layouts/UnknownMap_25_29/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +UnknownMap_25_29_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_25_29_MapBorder + .4byte UnknownMap_25_29_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/layouts/UnknownMap_25_29/map.bin b/data/layouts/UnknownMap_25_29/map.bin new file mode 100644 index 000000000..5fc1e81ec --- /dev/null +++ b/data/layouts/UnknownMap_25_29/map.bin @@ -0,0 +1 @@ +  \ No newline at end of file diff --git a/data/layouts/UnknownMap_25_30/border.bin b/data/layouts/UnknownMap_25_30/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/UnknownMap_25_30/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/UnknownMap_25_30/layout.inc b/data/layouts/UnknownMap_25_30/layout.inc new file mode 100644 index 000000000..3423735c3 --- /dev/null +++ b/data/layouts/UnknownMap_25_30/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +UnknownMap_25_30_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_25_30_MapBorder + .4byte UnknownMap_25_30_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/layouts/UnknownMap_25_30/map.bin b/data/layouts/UnknownMap_25_30/map.bin new file mode 100644 index 000000000..5fc1e81ec --- /dev/null +++ b/data/layouts/UnknownMap_25_30/map.bin @@ -0,0 +1 @@ +  \ No newline at end of file diff --git a/data/layouts/UnknownMap_25_31/border.bin b/data/layouts/UnknownMap_25_31/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/UnknownMap_25_31/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/UnknownMap_25_31/layout.inc b/data/layouts/UnknownMap_25_31/layout.inc new file mode 100644 index 000000000..20fbdc9c8 --- /dev/null +++ b/data/layouts/UnknownMap_25_31/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +UnknownMap_25_31_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_25_31_MapBorder + .4byte UnknownMap_25_31_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/layouts/UnknownMap_25_31/map.bin b/data/layouts/UnknownMap_25_31/map.bin new file mode 100644 index 000000000..5fc1e81ec --- /dev/null +++ b/data/layouts/UnknownMap_25_31/map.bin @@ -0,0 +1 @@ +  \ No newline at end of file diff --git a/data/layouts/UnknownMap_25_32/border.bin b/data/layouts/UnknownMap_25_32/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/UnknownMap_25_32/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/UnknownMap_25_32/layout.inc b/data/layouts/UnknownMap_25_32/layout.inc new file mode 100644 index 000000000..2efcab4e0 --- /dev/null +++ b/data/layouts/UnknownMap_25_32/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +UnknownMap_25_32_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_25_32_MapBorder + .4byte UnknownMap_25_32_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/layouts/UnknownMap_25_32/map.bin b/data/layouts/UnknownMap_25_32/map.bin new file mode 100644 index 000000000..5fc1e81ec --- /dev/null +++ b/data/layouts/UnknownMap_25_32/map.bin @@ -0,0 +1 @@ +  \ No newline at end of file diff --git a/data/layouts/UnknownMap_25_33/border.bin b/data/layouts/UnknownMap_25_33/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/UnknownMap_25_33/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/UnknownMap_25_33/layout.inc b/data/layouts/UnknownMap_25_33/layout.inc new file mode 100644 index 000000000..4d27276dc --- /dev/null +++ b/data/layouts/UnknownMap_25_33/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +UnknownMap_25_33_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_25_33_MapBorder + .4byte UnknownMap_25_33_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/layouts/UnknownMap_25_33/map.bin b/data/layouts/UnknownMap_25_33/map.bin new file mode 100644 index 000000000..5fc1e81ec --- /dev/null +++ b/data/layouts/UnknownMap_25_33/map.bin @@ -0,0 +1 @@ +  \ No newline at end of file diff --git a/data/layouts/UnknownMap_25_34/border.bin b/data/layouts/UnknownMap_25_34/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/UnknownMap_25_34/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/UnknownMap_25_34/layout.inc b/data/layouts/UnknownMap_25_34/layout.inc new file mode 100644 index 000000000..3dea1f9af --- /dev/null +++ b/data/layouts/UnknownMap_25_34/layout.inc @@ -0,0 +1,16 @@ + .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" + + .align 2 +UnknownMap_25_34_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_25_34_MapBorder + .4byte UnknownMap_25_34_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/layouts/UnknownMap_25_34/map.bin b/data/layouts/UnknownMap_25_34/map.bin new file mode 100644 index 000000000..5fc1e81ec --- /dev/null +++ b/data/layouts/UnknownMap_25_34/map.bin @@ -0,0 +1 @@ +  \ No newline at end of file diff --git a/data/layouts/VerdanturfTown/border.bin b/data/layouts/VerdanturfTown/border.bin new file mode 100644 index 000000000..864ac15fa Binary files /dev/null and b/data/layouts/VerdanturfTown/border.bin differ diff --git a/data/layouts/VerdanturfTown/layout.inc b/data/layouts/VerdanturfTown/layout.inc new file mode 100644 index 000000000..2f329b930 --- /dev/null +++ b/data/layouts/VerdanturfTown/layout.inc @@ -0,0 +1,16 @@ + .align 2 +VerdanturfTown_MapBorder:: + .incbin "data/layouts/VerdanturfTown/border.bin" + + .align 2 +VerdanturfTown_MapBlockdata:: + .incbin "data/layouts/VerdanturfTown/map.bin" + + .align 2 +VerdanturfTown_Layout:: + .4byte 0x14 + .4byte 0x14 + .4byte VerdanturfTown_MapBorder + .4byte VerdanturfTown_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Mauville diff --git a/data/layouts/VerdanturfTown/map.bin b/data/layouts/VerdanturfTown/map.bin new file mode 100644 index 000000000..8ed6ea56b Binary files /dev/null and b/data/layouts/VerdanturfTown/map.bin differ diff --git a/data/layouts/VerdanturfTown_BattleTentBattleRoom/border.bin b/data/layouts/VerdanturfTown_BattleTentBattleRoom/border.bin new file mode 100644 index 000000000..9afd13cdc Binary files /dev/null and b/data/layouts/VerdanturfTown_BattleTentBattleRoom/border.bin differ diff --git a/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc b/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc new file mode 100644 index 000000000..89d82169c --- /dev/null +++ b/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +VerdanturfTown_BattleTentBattleRoom_MapBorder:: + .incbin "data/layouts/VerdanturfTown_BattleTentBattleRoom/border.bin" + + .align 2 +VerdanturfTown_BattleTentBattleRoom_MapBlockdata:: + .incbin "data/layouts/VerdanturfTown_BattleTentBattleRoom/map.bin" + + .align 2 +VerdanturfTown_BattleTentBattleRoom_Layout:: + .4byte 0xd + .4byte 0x9 + .4byte VerdanturfTown_BattleTentBattleRoom_MapBorder + .4byte VerdanturfTown_BattleTentBattleRoom_MapBlockdata + .4byte gTileset_General + .4byte gTileset_BattleTent diff --git a/data/layouts/VerdanturfTown_BattleTentBattleRoom/map.bin b/data/layouts/VerdanturfTown_BattleTentBattleRoom/map.bin new file mode 100644 index 000000000..c405aabfc Binary files /dev/null and b/data/layouts/VerdanturfTown_BattleTentBattleRoom/map.bin differ diff --git a/data/layouts/VerdanturfTown_WandasHouse/border.bin b/data/layouts/VerdanturfTown_WandasHouse/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/VerdanturfTown_WandasHouse/border.bin differ diff --git a/data/layouts/VerdanturfTown_WandasHouse/layout.inc b/data/layouts/VerdanturfTown_WandasHouse/layout.inc new file mode 100644 index 000000000..8791f34bb --- /dev/null +++ b/data/layouts/VerdanturfTown_WandasHouse/layout.inc @@ -0,0 +1,16 @@ + .align 2 +VerdanturfTown_WandasHouse_MapBorder:: + .incbin "data/layouts/VerdanturfTown_WandasHouse/border.bin" + + .align 2 +VerdanturfTown_WandasHouse_MapBlockdata:: + .incbin "data/layouts/VerdanturfTown_WandasHouse/map.bin" + + .align 2 +VerdanturfTown_WandasHouse_Layout:: + .4byte 0x11 + .4byte 0x8 + .4byte VerdanturfTown_WandasHouse_MapBorder + .4byte VerdanturfTown_WandasHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/layouts/VerdanturfTown_WandasHouse/map.bin b/data/layouts/VerdanturfTown_WandasHouse/map.bin new file mode 100644 index 000000000..95d14d3c4 Binary files /dev/null and b/data/layouts/VerdanturfTown_WandasHouse/map.bin differ diff --git a/data/layouts/VictoryRoad_1F/border.bin b/data/layouts/VictoryRoad_1F/border.bin new file mode 100644 index 000000000..423a0732e --- /dev/null +++ b/data/layouts/VictoryRoad_1F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/VictoryRoad_1F/layout.inc b/data/layouts/VictoryRoad_1F/layout.inc new file mode 100644 index 000000000..9ef50f743 --- /dev/null +++ b/data/layouts/VictoryRoad_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +VictoryRoad_1F_MapBorder:: + .incbin "data/layouts/VictoryRoad_1F/border.bin" + + .align 2 +VictoryRoad_1F_MapBlockdata:: + .incbin "data/layouts/VictoryRoad_1F/map.bin" + + .align 2 +VictoryRoad_1F_Layout:: + .4byte 0x2e + .4byte 0x2d + .4byte VictoryRoad_1F_MapBorder + .4byte VictoryRoad_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/VictoryRoad_1F/map.bin b/data/layouts/VictoryRoad_1F/map.bin new file mode 100644 index 000000000..a78316ef9 --- /dev/null +++ b/data/layouts/VictoryRoad_1F/map.bin @@ -0,0 +1,10 @@ +2222222222622222222222'222222222226222    XYZ #    +222         #222        #F222222222222BBBBBBBBBBBB2222BBBBBBBBBBBBBB2222BBBBBBBBBBBBBB#  # +222222      +BBBBBBBBBBBB  B B B"22222#BBBBBB»B»B¼B¼B½B½BBBB»B»B¼ò¼ò¼ò¼ò¼ò½B¼B B B B B"BBBBBBÃBÃBÄBÄBÅBÅBBBBÃBÃBÄòÄòÄòÄòÄòÅBÄBBBBBBBB22222BB2222222BB222222222222BB222222222222222222222222222BB22222222222222222222222BB222      +2222222222222222222222BB»B»B¼B¼ò¼ò¼ò½B¼B B B B"22222222222222222222222BBÃBÃBÄBÄòÄòÄòÅBÄBBBB22      +2222    +2222222222  B B B¼B»B¼ò¼ò¼ò¼ò¼B½B¼B B"22L6Q6M6222P6BBBÄBÃBÄòÄòÅòÅòÄBÅBÄBB2222222222222228#2222222222222222222228# +222222222222222222228222222222222222222      +2228222222222222222222  B B B"2228#   #22222222BBB»B»B¼ò¼ò¼ò¼B½B¼B B B B"22222222222222#22BBBÃBÃBÄòÄòÄòÄBÅBÄBBBB222222222222222 #B2222282222222222   ###B222228222222222#  B B#B#BB22222222222@QI22222222  ## #  B#BBBBBB22222'62222222822222222  B B B B B B#BBBBBBBB#    +2262222222822     #              ##   "#     XYZ   # #      #            ## "#               #   #  ##"#                      ##                            # \ No newline at end of file diff --git a/data/layouts/VictoryRoad_B1F/border.bin b/data/layouts/VictoryRoad_B1F/border.bin new file mode 100644 index 000000000..423a0732e --- /dev/null +++ b/data/layouts/VictoryRoad_B1F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/VictoryRoad_B1F/layout.inc b/data/layouts/VictoryRoad_B1F/layout.inc new file mode 100644 index 000000000..fed9804fe --- /dev/null +++ b/data/layouts/VictoryRoad_B1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +VictoryRoad_B1F_MapBorder:: + .incbin "data/layouts/VictoryRoad_B1F/border.bin" + + .align 2 +VictoryRoad_B1F_MapBlockdata:: + .incbin "data/layouts/VictoryRoad_B1F/map.bin" + + .align 2 +VictoryRoad_B1F_Layout:: + .4byte 0x2e + .4byte 0x1f + .4byte VictoryRoad_B1F_MapBorder + .4byte VictoryRoad_B1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/VictoryRoad_B1F/map.bin b/data/layouts/VictoryRoad_B1F/map.bin new file mode 100644 index 000000000..c1ea2f657 --- /dev/null +++ b/data/layouts/VictoryRoad_B1F/map.bin @@ -0,0 +1,25 @@ +BBBBBBBBB2222222BBBB2222222P22222222# +222BBBB2   +2282222222222  +222# +222BBBB222R2222   +2#222# +22 #BBBB2222222    +2# #22#2#BBBBB# +2   +22  B B B B¼B»B¼ò¼ò½B¼B B B B B +2fBBBf#"2222BBBBÄBÃBÄòÄòÅBÄBBBBB2BBBBB2222222222222BfBB#     +2#2222222#"#  "2222222222P2222222222#"2222222   +22228222#  +22222 ##       ##  +228222#   +22  B B#B #22R222 #B B B B¼B»B¼ò¼ò½B½BBBB222222622#    +22BBBBÄBÃBÄòÄòÅBÅBBBB2222222222222222222BBB22222222222222 #2222BBB22#       +2222222222#22BB #22#  +2222#  +2222#22BB22222#222#    #222BB22#22#  +22222BB22# +222# +222222# +2222222222222222222222222P222# +222222222222222222222282222222222222 #2222222222R222#                 ##              ##                                          ##                                            # \ No newline at end of file diff --git a/data/layouts/VictoryRoad_B2F/border.bin b/data/layouts/VictoryRoad_B2F/border.bin new file mode 100644 index 000000000..423a0732e --- /dev/null +++ b/data/layouts/VictoryRoad_B2F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/VictoryRoad_B2F/layout.inc b/data/layouts/VictoryRoad_B2F/layout.inc new file mode 100644 index 000000000..77a9542f9 --- /dev/null +++ b/data/layouts/VictoryRoad_B2F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +VictoryRoad_B2F_MapBorder:: + .incbin "data/layouts/VictoryRoad_B2F/border.bin" + + .align 2 +VictoryRoad_B2F_MapBlockdata:: + .incbin "data/layouts/VictoryRoad_B2F/map.bin" + + .align 2 +VictoryRoad_B2F_Layout:: + .4byte 0x2e + .4byte 0x1f + .4byte VictoryRoad_B2F_MapBorder + .4byte VictoryRoad_B2F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/layouts/VictoryRoad_B2F/map.bin b/data/layouts/VictoryRoad_B2F/map.bin new file mode 100644 index 000000000..24c4f646a --- /dev/null +++ b/data/layouts/VictoryRoad_B2F/map.bin @@ -0,0 +1 @@ +€‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰2{{{{{{{{{{{{{{{{{{{{{{’2222{{{{{{{{{{{{{{{{{{{{{{’22222222{{{{{{{{{{{{{{{{{{{{{{’222222222{{{{{TUUUV{{{{{{{{{{{{’22222222222W3W3W3y{’W3W3W3W3W3W3W3W3y{{{’222  "22222222222{’22222222W3W3y{’ #B22#B"222222222222{’222222222222{’222222222222222{’»³¼22222222222{’¹¹¹222222222»³¼¹¹¹222222222¹¹¹€‰222€Z[‰tuv‰‰‰‰222222222¹¹¹{’222XY{{{{{{{{’22222222222€tuv‰‰‰‰‰˜{š‰‰‰˜{PQ{{{{{{{š‰‰22222222{{{{{{{{{{{{{{{{XY{{{{{{{{{{x  #222222¤¤UUUUV{{{{{{{{{TUUUUUUUUUUV{{’  2#2222222#     "¤V{{{TUUUU¤         "D2D2D22222222#2 2 2  B B"D2D2D2     #  B B B B B B»B»B»B¼ò¼ò¼ò½B½B½BB222222222BB»B»B»B»B¼ò¼ò¼ò»B»B»B B B B B#BBBBBBBÃBÃBÃBÄòÄòÄòÅBÅBÅBB2222BBÃBÃBÃBÃBÄòÄòÄòÃBÃBÃBBBBBBBBBBB222NRRRO222BBBBBBBB22222222222222222222222222222222222222222222222222222222222222222262222222222222222222222222226#             ##              #6#               ##                  ##                                          ##                                            # \ No newline at end of file diff --git a/data/layouts_table.inc b/data/layouts_table.inc new file mode 100644 index 000000000..cf3cac646 --- /dev/null +++ b/data/layouts_table.inc @@ -0,0 +1,444 @@ + .align 2 +gMapAttributes:: @ 8481DD4 + .4byte PetalburgCity_Layout + .4byte SlateportCity_Layout + .4byte MauvilleCity_Layout + .4byte RustboroCity_Layout + .4byte FortreeCity_Layout + .4byte LilycoveCity_Layout + .4byte MossdeepCity_Layout + .4byte SootopolisCity_Layout + .4byte EverGrandeCity_Layout + .4byte LittlerootTown_Layout + .4byte OldaleTown_Layout + .4byte DewfordTown_Layout + .4byte LavaridgeTown_Layout + .4byte FallarborTown_Layout + .4byte VerdanturfTown_Layout + .4byte PacifidlogTown_Layout + .4byte Route101_Layout + .4byte Route102_Layout + .4byte Route103_Layout + .4byte Route104_Layout + .4byte Route105_Layout + .4byte Route106_Layout + .4byte Route107_Layout + .4byte Route108_Layout + .4byte Route109_Layout + .4byte Route110_Layout + .4byte Route111_Layout + .4byte Route112_Layout + .4byte Route113_Layout + .4byte Route114_Layout + .4byte Route115_Layout + .4byte Route116_Layout + .4byte Route117_Layout + .4byte Route118_Layout + .4byte Route119_Layout + .4byte Route120_Layout + .4byte Route121_Layout + .4byte Route122_Layout + .4byte Route123_Layout + .4byte Route124_Layout + .4byte Route125_Layout + .4byte Route126_Layout + .4byte Route127_Layout + .4byte Route128_Layout + .4byte Route129_Layout + .4byte UnknownMap_08417FC4_Layout + .4byte Route131_Layout + .4byte Route132_Layout + .4byte Route133_Layout + .4byte Route134_Layout + .4byte Underwater2_Layout + .4byte Underwater3_Layout + .4byte Underwater4_Layout + .4byte LittlerootTown_BrendansHouse_1F_Layout + .4byte LittlerootTown_BrendansHouse_2F_Layout + .4byte LittlerootTown_MaysHouse_1F_Layout + .4byte LittlerootTown_MaysHouse_2F_Layout + .4byte LittlerootTown_ProfessorBirchsLab_Layout + .4byte House1_Layout + .4byte House2_Layout + .4byte PokemonCenter_1F_Layout + .4byte PokemonCenter_2F_Layout + .4byte Mart_Layout + .4byte House3_Layout + .4byte DewfordTown_Gym_Layout + .4byte DewfordTown_Hall_Layout + .4byte House4_Layout + .4byte LavaridgeTown_HerbShop_Layout + .4byte LavaridgeTown_Gym_1F_Layout + .4byte LavaridgeTown_Gym_B1F_Layout + .4byte LavaridgeTown_PokemonCenter_1F_Layout + .4byte FallarborTown_LeftoverRSContestLobby_Layout + .4byte FallarborTown_LeftoverRSContestHall_Layout + .4byte LilycoveCity_House2_Layout + .4byte UnknownMap_08428450_Layout + .4byte VerdanturfTown_WandasHouse_Layout + .4byte PacifidlogTown_House1_Layout + .4byte PacifidlogTown_House2_Layout + .4byte PetalburgCity_Gym_Layout + .4byte HouseWithBed_Layout + .4byte SlateportCity_SternsShipyard_1F_Layout + .4byte SlateportCity_SternsShipyard_2F_Layout + .4byte UnknownMap_084294C4_Layout + .4byte UnknownMap_084294E8_Layout + .4byte SlateportCity_PokemonFanClub_Layout + .4byte SlateportCity_OceanicMuseum_1F_Layout + .4byte SlateportCity_OceanicMuseum_2F_Layout + .4byte Harbor_Layout + .4byte MauvilleCity_Gym_Layout + .4byte MauvilleCity_BikeShop_Layout + .4byte MauvilleCity_GameCorner_Layout + .4byte RustboroCity_DevonCorp_1F_Layout + .4byte RustboroCity_DevonCorp_2F_Layout + .4byte RustboroCity_Gym_Layout + .4byte RustboroCity_PokemonSchool_Layout + .4byte RustboroCity_House_Layouts + .4byte RustboroCity_House1_Layout + .4byte RustboroCity_CuttersHouse_Layout + .4byte FortreeCity_House1_Layout + .4byte FortreeCity_Gym_Layout + .4byte FortreeCity_House2_Layout + .4byte Route104_MrBrineysHouse_Layout + .4byte LilycoveCity_LilycoveMuseum_1F_Layout + .4byte LilycoveCity_LilycoveMuseum_2F_Layout + .4byte LilycoveCity_ContestLobby_Layout + .4byte LilycoveCity_ContestHall_Layout + .4byte LilycoveCity_PokemonTrainerFanClub_Layout + .4byte MossdeepCity_Gym_Layout + .4byte SootopolisCity_Gym_1F_Layout + .4byte SootopolisCity_Gym_B1F_Layout + .4byte EverGrandeCity_SidneysRoom_Layout + .4byte EverGrandeCity_PhoebesRoom_Layout + .4byte EverGrandeCity_GlaciasRoom_Layout + .4byte EverGrandeCity_DrakesRoom_Layout + .4byte EverGrandeCity_ChampionsRoom_Layout + .4byte EverGrandeCity_ShortHall_Layout + .4byte Route104_PrettyPetalFlowerShop_Layout + .4byte CableCarStation_Layout + .4byte Route114_FossilManiacsHouse_Layout + .4byte Route114_FossilManiacsTunnel_Layout + .4byte Route114_LanettesHouse_Layout + .4byte Route116_TunnelersRestHouse_Layout + .4byte Route117_PokemonDayCare_Layout + .4byte Route121_SafariZoneEntrance_Layout + .4byte MeteorFalls_1F_1R_Layout + .4byte MeteorFalls_1F_2R_Layout + .4byte MeteorFalls_B1F_1R_Layout + .4byte MeteorFalls_B1F_2R_Layout + .4byte RusturfTunnel_Layout + .4byte Underwater_SootopolisCity_Layout + .4byte DesertRuins_Layout + .4byte GraniteCave_1F_Layout + .4byte GraniteCave_B1F_Layout + .4byte GraniteCave_B2F_Layout + .4byte PetalburgWoods_Layout + .4byte MtChimney_Layout + .4byte MtPyre_1F_Layout + .4byte MtPyre_2F_Layout + .4byte MtPyre_3F_Layout + .4byte MtPyre_4F_Layout + .4byte MtPyre_5F_Layout + .4byte MtPyre_6F_Layout + .4byte AquaHideout_1F_Layout + .4byte AquaHideout_B1F_Layout + .4byte AquaHideout_B2F_Layout + .4byte Underwater_SeafloorCavern_Layout + .4byte SeafloorCavern_Entrance_Layout + .4byte SeafloorCavern_Room1_Layout + .4byte SeafloorCavern_Room2_Layout + .4byte SeafloorCavern_Room3_Layout + .4byte SeafloorCavern_Room4_Layout + .4byte SeafloorCavern_Room5_Layout + .4byte SeafloorCavern_Room6_Layout + .4byte SeafloorCavern_Room7_Layout + .4byte SeafloorCavern_Room8_Layout + .4byte SeafloorCavern_Room9_Layout + .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 VictoryRoad_1F_Layout + .4byte ShoalCave_LowTideEntranceRoom_Layout + .4byte ShoalCave_LowTideInnerRoom_Layout + .4byte ShoalCave_LowTideStairsRoom_Layout + .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 NewMauville_Entrance_Layout + .4byte NewMauville_Inside_Layout + .4byte AbandonedShip_Deck_Layout + .4byte AbandonedShip_Corridors_1F_Layout + .4byte AbandonedShip_Rooms_1F_Layout + .4byte AbandonedShip_Corridors_B1F_Layout + .4byte AbandonedShip_Rooms_B1F_Layout + .4byte AbandonedShip_Rooms2_B1F_Layout + .4byte AbandonedShip_Underwater1_Layout + .4byte AbandonedShip_Room_B1F_Layout + .4byte AbandonedShip_Rooms2_1F_Layout + .4byte AbandonedShip_CaptainsOffice_Layout + .4byte AbandonedShip_Underwater2_Layout + .4byte SecretBase_RedCave1_Layout + .4byte SecretBase_BrownCave1_Layout + .4byte SecretBase_BlueCave1_Layout + .4byte SecretBase_YellowCave1_Layout + .4byte SecretBase_Tree1_Layout + .4byte SecretBase_Shrub1_Layout + .4byte SecretBase_RedCave2_Layout + .4byte SecretBase_BrownCave2_Layout + .4byte SecretBase_BlueCave2_Layout + .4byte SecretBase_YellowCave2_Layout + .4byte SecretBase_Tree2_Layout + .4byte SecretBase_Shrub2_Layout + .4byte SecretBase_RedCave3_Layout + .4byte SecretBase_BrownCave3_Layout + .4byte SecretBase_BlueCave3_Layout + .4byte SecretBase_YellowCave3_Layout + .4byte SecretBase_Tree3_Layout + .4byte SecretBase_Shrub3_Layout + .4byte SecretBase_RedCave4_Layout + .4byte SecretBase_BrownCave4_Layout + .4byte SecretBase_BlueCave4_Layout + .4byte SecretBase_YellowCave4_Layout + .4byte SecretBase_Tree4_Layout + .4byte SecretBase_Shrub4_Layout + .4byte SingleBattleColosseum_Layout + .4byte TradeCenter_Layout + .4byte RecordCorner_Layout + .4byte DoubleBattleColosseum_Layout + .4byte LinkContestRoom1_Layout + .4byte UnknownMap_25_29_Layout + .4byte UnknownMap_25_30_Layout + .4byte UnknownMap_25_31_Layout + .4byte UnknownMap_25_32_Layout + .4byte UnknownMap_25_33_Layout + .4byte UnknownMap_25_34_Layout + .4byte LinkContestRoom2_Layout + .4byte LinkContestRoom3_Layout + .4byte LinkContestRoom4_Layout + .4byte LinkContestRoom5_Layout + .4byte LinkContestRoom6_Layout + .4byte InsideOfTruck_Layout + .4byte SafariZone_Northwest_Layout + .4byte SafariZone_North_Layout + .4byte SafariZone_Southwest_Layout + .4byte SafariZone_South_Layout + .4byte UnknownMap_08447028_Layout + .4byte Route109_SeashoreHouse_Layout + .4byte Route110_TrickHouseEntrance_Layout + .4byte Route110_TrickHouseEnd_Layout + .4byte Route110_TrickHouseCorridor_Layout + .4byte Route110_TrickHousePuzzle1_Layout + .4byte Route110_TrickHousePuzzle2_Layout + .4byte Route110_TrickHousePuzzle3_Layout + .4byte Route110_TrickHousePuzzle4_Layout + .4byte Route110_TrickHousePuzzle5_Layout + .4byte Route110_TrickHousePuzzle6_Layout + .4byte Route110_TrickHousePuzzle7_Layout + .4byte Route110_TrickHousePuzzle8_Layout + .4byte FortreeCity_DecorationShop_Layout + .4byte Route110_SeasideCyclingRoadEntrance_Layout + .4byte LilycoveCity_DepartmentStore_1F_Layout + .4byte LilycoveCity_DepartmentStore_2F_Layout + .4byte LilycoveCity_DepartmentStore_3F_Layout + .4byte LilycoveCity_DepartmentStore_4F_Layout + .4byte LilycoveCity_DepartmentStore_5F_Layout + .4byte LilycoveCity_DepartmentStoreRooftop_Layout + .4byte Route130_Layout + .4byte BattleFrontier_BattleTowerLobby_Layout + .4byte BattleFrontier_OutsideWest_Layout + .4byte BattleElevator_Layout + .4byte BattleFrontier_BattleTowerCorridor_Layout + .4byte BattleFrontier_BattleTowerBattleRoom_Layout + .4byte RustboroCity_DevonCorp_3F_Layout + .4byte EverGrandeCity_PokemonLeague_1F_Layout + .4byte Route119_WeatherInstitute_1F_Layout + .4byte Route119_WeatherInstitute_2F_Layout + .4byte LilycoveCity_DepartmentStoreElevator_Layout + .4byte Underwater1_Layout + .4byte MossdeepCity_SpaceCenter_1F_Layout + .4byte MossdeepCity_SpaceCenter_2F_Layout + .4byte SSTidalCorridor_Layout + .4byte SSTidalLowerDeck_Layout + .4byte SSTidalRooms_Layout + .4byte IslandCave_Layout + .4byte AncientTomb_Layout + .4byte Underwater_Route134_Layout + .4byte Underwater_SealedChamber_Layout + .4byte SealedChamber_OuterRoom_Layout + .4byte VictoryRoad_B1F_Layout + .4byte VictoryRoad_B2F_Layout + .4byte Route104_Prototype_Layout + .4byte GraniteCave_StevensRoom_Layout + .4byte AbandonedShip_HiddenFloorCorridors_Layout + .4byte SouthernIsland_Exterior_Layout + .4byte SouthernIsland_Interior_Layout + .4byte JaggedPass_Layout + .4byte FieryPath_Layout + .4byte RustboroCity_Flat2_1F_Layout + .4byte RustboroCity_Flat2_2F_Layout + .4byte RustboroCity_Flat2_3F_Layout + .4byte SootopolisCity_LotadAndSeedotHouse_Layout + .4byte EverGrandeCity_HallOfFame_Layout + .4byte LilycoveCity_CoveLilyMotel_1F_Layout + .4byte LilycoveCity_CoveLilyMotel_2F_Layout + .4byte Route124_DivingTreasureHuntersHouse_Layout + .4byte MtPyre_Exterior_Layout + .4byte MtPyre_Summit_Layout + .4byte SealedChamber_InnerRoom_Layout + .4byte MossdeepCity_GameCorner_1F_Layout + .4byte MossdeepCity_GameCorner_B1F_Layout + .4byte SootopolisCity_House1_Layout + .4byte SootopolisCity_House2_Layout + .4byte SootopolisCity_House3_Layout + .4byte AbandonedShip_HiddenFloorRooms_Layout + .4byte ScorchedSlab_Layout + .4byte UnknownMap_0845A394_Layout + .4byte RustboroCity_Flat1_1F_Layout + .4byte RustboroCity_Flat1_2F_Layout + .4byte EverGrandeCity_Hall4_Layout + .4byte AquaHideout_UnusedRubyMap1_Layout + .4byte AquaHideout_UnusedRubyMap2_Layout + .4byte AquaHideout_UnusedRubyMap3_Layout + .4byte UnknownMap_0845D470_Layout + .4byte SkyPillar_Entrance_Layout + .4byte SkyPillar_Outside_Layout + .4byte SkyPillar_1F_Layout + .4byte SkyPillar_2F_Layout + .4byte SkyPillar_3F_Layout + .4byte SkyPillar_4F_Layout + .4byte UnknownMap_0845ECB4_Layout + .4byte MossdeepCity_StevensHouse_Layout + .4byte ShoalCave_LowTideIceRoom_Layout + .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 + diff --git a/data/maps.s b/data/maps.s index 92f5544a1..91c108c7a 100644 --- a/data/maps.s +++ b/data/maps.s @@ -5,8 +5,8 @@ .section .rodata - .include "data/maps/_assets.inc" - .include "data/maps/attributes_table.inc" + .include "data/layouts.inc" + .include "data/layouts_table.inc" .include "data/maps/headers.inc" - .include "data/maps/_groups.inc" + .include "data/maps/groups.inc" .include "data/maps/connections.inc" diff --git a/data/maps/AbandonedShip_CaptainsOffice/border.bin b/data/maps/AbandonedShip_CaptainsOffice/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AbandonedShip_CaptainsOffice/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc index 5c6bae920..0348798fc 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/header.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc @@ -1,5 +1,5 @@ AbandonedShip_CaptainsOffice: @ 84845A4 - .4byte AbandonedShip_CaptainsOffice_MapAttributes + .4byte AbandonedShip_CaptainsOffice_Layout .4byte AbandonedShip_CaptainsOffice_MapEvents .4byte AbandonedShip_CaptainsOffice_MapScripts .4byte 0x0 diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.bin b/data/maps/AbandonedShip_CaptainsOffice/map.bin deleted file mode 100644 index c9097fa63..000000000 Binary files a/data/maps/AbandonedShip_CaptainsOffice/map.bin and /dev/null differ diff --git a/data/maps/AbandonedShip_Corridors_1F/border.bin b/data/maps/AbandonedShip_Corridors_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AbandonedShip_Corridors_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc index 7d1582721..2ce374617 100644 --- a/data/maps/AbandonedShip_Corridors_1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_1F/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Corridors_1F: @ 84844C4 - .4byte AbandonedShip_Corridors_1F_MapAttributes + .4byte AbandonedShip_Corridors_1F_Layout .4byte AbandonedShip_Corridors_1F_MapEvents .4byte AbandonedShip_Corridors_1F_MapScripts .4byte 0x0 diff --git a/data/maps/AbandonedShip_Corridors_1F/map.bin b/data/maps/AbandonedShip_Corridors_1F/map.bin deleted file mode 100644 index 5ef5ca949..000000000 --- a/data/maps/AbandonedShip_Corridors_1F/map.bin +++ /dev/null @@ -1,3 +0,0 @@ - ¨©¨ ¨© ¨ °±°°±°22222 -2 6­62222222 -2 622222222222222222­62012222201111222220122222011112222201222220111122222012222201111222­62%#&2222%®$"#&2222-+6.2222-¶2,*+6.2¬622222222222222222›2œ222222›2œ222222222 \ No newline at end of file diff --git a/data/maps/AbandonedShip_Corridors_B1F/border.bin b/data/maps/AbandonedShip_Corridors_B1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AbandonedShip_Corridors_B1F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc index 2205786fe..e8d5fc419 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Corridors_B1F: @ 84844FC - .4byte AbandonedShip_Corridors_B1F_MapAttributes + .4byte AbandonedShip_Corridors_B1F_Layout .4byte AbandonedShip_Corridors_B1F_MapEvents .4byte AbandonedShip_Corridors_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.bin b/data/maps/AbandonedShip_Corridors_B1F/map.bin deleted file mode 100644 index 24b1a7b61..000000000 --- a/data/maps/AbandonedShip_Corridors_B1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -!!011112!!011)Ÿ011112)Ÿ011¦2§011112¦2§01122%#$"®&22%#$22-+6,*¶2.22-+6,2222222222222222222222222¬62222222222222­62220111111122222011111112 \ No newline at end of file diff --git a/data/maps/AbandonedShip_Deck/border.bin b/data/maps/AbandonedShip_Deck/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/AbandonedShip_Deck/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc index f83905c8f..cac71c430 100644 --- a/data/maps/AbandonedShip_Deck/header.inc +++ b/data/maps/AbandonedShip_Deck/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Deck: @ 84844A8 - .4byte AbandonedShip_Deck_MapAttributes + .4byte AbandonedShip_Deck_Layout .4byte AbandonedShip_Deck_MapEvents .4byte AbandonedShip_Deck_MapScripts .4byte 0x0 diff --git a/data/maps/AbandonedShip_Deck/map.bin b/data/maps/AbandonedShip_Deck/map.bin deleted file mode 100644 index 67cdde3d7..000000000 --- a/data/maps/AbandonedShip_Deck/map.bin +++ /dev/null @@ -1 +0,0 @@ -(((`(`(((((b`(((((((((((`(''`(eif(b`((¡(((((((`('/`(((((b`('¡(¡(ef(`(/'hiiiiij`(''¡('¡((((`(*/ÉÉÉÃÄÅ`(//¡(/¡((((`(È* ]]]ËÌ2Íhiiiiiiii(((`(((33È*2*2¾2*2¿2ÉÉÉÉÉÉÉÉef(hiiiiif(2(2ei ÌÍÌÍÌÍÌÍ(((ÉÉÉÃÄů0Ï0ÃijÉÉÉÉÉÉÉÉ((( ]]]ËÌ2ͯ0Ï0ËÌ2Í]]]]]]]](((33*2*2Ⱦ2*2¿2*2Ⱦ2*2¿2È*2*2*2*2*2*2*2((((È((È(2(2(2(2È(2(2(2È(2È(2(2(2(2iiiiiiiiiiiif(2(2eiiiiiiiÉÉÉÉÉÉÉÉÉÉÉɯ0Ï0ÉÉÉÉÉÉÉËËËËËËËËËËËË ¯0Ï0 ËËËËËËËÊÊÊÊÊÊÊÊÊÊÊÊ Î2Ï2 ÊÊÊÊÊÊÊžžžžžžžžžžžž4žž4žžžžžžžžžžžžžžžžžžžžžžžžžžžžžž£žžžžžžžžžžžžžžžžžžžžžž½¾¾¾¾¾¾¾£žžžžžžžžžžžžžžpppppppp½¾¾¾¾¾¾¾¾¾¾¾¾¾¾ \ No newline at end of file diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/border.bin b/data/maps/AbandonedShip_HiddenFloorCorridors/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc index fc93ec42d..c03eba0b8 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc @@ -1,5 +1,5 @@ AbandonedShip_HiddenFloorCorridors: @ 84845DC - .4byte AbandonedShip_HiddenFloorCorridors_MapAttributes + .4byte AbandonedShip_HiddenFloorCorridors_Layout .4byte AbandonedShip_HiddenFloorCorridors_MapEvents .4byte AbandonedShip_HiddenFloorCorridors_MapScripts .4byte 0x0 diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/map.bin b/data/maps/AbandonedShip_HiddenFloorCorridors/map.bin deleted file mode 100644 index a4637ccbe..000000000 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/map.bin +++ /dev/null @@ -1 +0,0 @@ - ¨  ©¨ ±°°±±°2222222222222­622422222242222220111111122¬6­6201111111222220111111122222%#$"#$"#&22‰-36,*36,*+6.22Vš2222222222GVx2222222222 \ No newline at end of file diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/border.bin b/data/maps/AbandonedShip_HiddenFloorRooms/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AbandonedShip_HiddenFloorRooms/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc index cb8f99732..efa3a0bb9 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc @@ -1,5 +1,5 @@ AbandonedShip_HiddenFloorRooms: @ 84845F8 - .4byte AbandonedShip_HiddenFloorRooms_MapAttributes + .4byte AbandonedShip_HiddenFloorRooms_Layout .4byte AbandonedShip_HiddenFloorRooms_MapEvents .4byte AbandonedShip_HiddenFloorRooms_MapScripts .4byte 0x0 diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.bin b/data/maps/AbandonedShip_HiddenFloorRooms/map.bin deleted file mode 100644 index b63eeabe6..000000000 --- a/data/maps/AbandonedShip_HiddenFloorRooms/map.bin +++ /dev/null @@ -1 +0,0 @@ -6''''•c–'''''76'''''•¯–'''''76'''''•c–'''''7>////—6ž/////?>/////·2ž/////GF/////—6ž/////?>h;2;2;2;2;2;2;2;2;2;2;2?>:2;2;2665;2™6š6;2;2;2;2ON:2;2;2;2;2;2;2g2;2;2™6š6;2?>=28282828282a282828282ª6?>«682a2^6_682b 6¢682828282;2;2<28282b6828282828282 6¢682?>=282V6W68282828282a28282?>=28282`2828282828282828282?>=282828282`282828282828282?>«682^6_6828282828282`282?>=2`2828282828282828282a282?>«682V6W682828282b6828282a2?>=28282828282828282828282?>=2828282828282828282828282?>=282^6_6828282a282828282ª6?6''''''''''''76'''''''''''''76'''''''''''''7>////////////?>/////////////?>/////////////?>:2g2;2;2;2;25;2;2;2;2;2?>:2;2;2;2;2;2;2;2;2;2;2;2;2?>:2;2;2g2;2;2;2;2;2;2™6š6;2?>=282828282a2828282V6W682?>=28282828282`2828282b682ª6?>«682828282V6W6828282 6¢682?>=28282828282828282^6_682?>=28282a2`28282828282828282?>=282828282^6_68282a2828282?>«682`2828282828282828282?>=2V6W682828282828282828282?>=28282828282828282828282ª6?>=282828282d2e282828282ª6?>=2^6_6828282d2e2828282a282?>=2`282b68282d2e282828282a2? \ No newline at end of file diff --git a/data/maps/AbandonedShip_Room_B1F/border.bin b/data/maps/AbandonedShip_Room_B1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AbandonedShip_Room_B1F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc index 68b484f68..e2021ea85 100644 --- a/data/maps/AbandonedShip_Room_B1F/header.inc +++ b/data/maps/AbandonedShip_Room_B1F/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Room_B1F: @ 848456C - .4byte AbandonedShip_Room_B1F_MapAttributes + .4byte AbandonedShip_Room_B1F_Layout .4byte AbandonedShip_Room_B1F_MapEvents .4byte AbandonedShip_Room_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/AbandonedShip_Room_B1F/map.bin b/data/maps/AbandonedShip_Room_B1F/map.bin deleted file mode 100644 index cb8393eb2..000000000 --- a/data/maps/AbandonedShip_Room_B1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -6'''''''7>///////?>:2;2;2;2;2;2;2?>=282a282828282?>=2`28282828282?>=282828282a282?>=2828282828282?>=28282d2e282b? \ No newline at end of file diff --git a/data/maps/AbandonedShip_Rooms2_1F/border.bin b/data/maps/AbandonedShip_Rooms2_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AbandonedShip_Rooms2_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc index d712be55f..227bf3e8f 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Rooms2_1F: @ 8484588 - .4byte AbandonedShip_Rooms2_1F_MapAttributes + .4byte AbandonedShip_Rooms2_1F_Layout .4byte AbandonedShip_Rooms2_1F_MapEvents .4byte AbandonedShip_Rooms2_1F_MapScripts .4byte 0x0 diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.bin b/data/maps/AbandonedShip_Rooms2_1F/map.bin deleted file mode 100644 index c897ce8a0..000000000 --- a/data/maps/AbandonedShip_Rooms2_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -6@k•c–''7>Hs—6ž//?>PQ:2;2;2;2;2?>XY=282828282?>2;2<28282a282?>=2828282828282?>=282b82a28282?>=2828282828282?=26'''=2'''7>///=2///?>:2;2;2<2;2;2;2?>=2828282828282?>=2VW82a28282?>=2^_a2828282?>=2828282828282?>=28282d2e28282? \ No newline at end of file diff --git a/data/maps/AbandonedShip_Rooms2_B1F/border.bin b/data/maps/AbandonedShip_Rooms2_B1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AbandonedShip_Rooms2_B1F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc index 1b5cbb68a..55d228f47 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Rooms2_B1F: @ 8484534 - .4byte AbandonedShip_Rooms2_B1F_MapAttributes + .4byte AbandonedShip_Rooms2_B1F_Layout .4byte AbandonedShip_Rooms2_B1F_MapEvents .4byte AbandonedShip_Rooms2_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.bin b/data/maps/AbandonedShip_Rooms2_B1F/map.bin deleted file mode 100644 index 7865bb69d..000000000 --- a/data/maps/AbandonedShip_Rooms2_B1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -6@AB''''76@AB'CDE7>HIJ////?>HIJ/KLM?>PQ:2;2;2;2;2GFPQ:2;2;2TU?>XY=282VWª6ONXY=28282\]?>:2;2<282^_82;2;2;2;2f28282;2;2?>=2828282828282?>=28282828282ª6?>«6828282828282?>«682828282`282?>=28282d2e282b?>=28282d2e28282? \ No newline at end of file diff --git a/data/maps/AbandonedShip_Rooms_1F/border.bin b/data/maps/AbandonedShip_Rooms_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AbandonedShip_Rooms_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc index 68dbcbbdb..62991d12e 100644 --- a/data/maps/AbandonedShip_Rooms_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_1F/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Rooms_1F: @ 84844E0 - .4byte AbandonedShip_Rooms_1F_MapAttributes + .4byte AbandonedShip_Rooms_1F_Layout .4byte AbandonedShip_Rooms_1F_MapEvents .4byte AbandonedShip_Rooms_1F_MapScripts .4byte 0x0 diff --git a/data/maps/AbandonedShip_Rooms_1F/map.bin b/data/maps/AbandonedShip_Rooms_1F/map.bin deleted file mode 100644 index 20529b3df..000000000 --- a/data/maps/AbandonedShip_Rooms_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -6''•c–''76@k•c–''7>//—6ž//?>Hs—6ž//?>:2;2;2;2;2;2;2?>PQ:2;2;2;2;2?>=2828282828282?>XY=2828282ª6?>«682828282a282?>:2;2<282828282?>=2828282828282?>=2828282`28282?>=2b8282828282?>«6828282828282?>=2828282a28282?>=2828282828282?=26@AB'''E76'''=2CDE7>HIJ////?>///=2KLM?>PQ:2;2;2;2;2GF:2;2;2<2;2TU?>XY=282`28282ON=282828282\]?>:2;2<2b828282;2;2<282828282;2;2?>=2828282828282?>=2VW828282ª6?>=2a28282828282?>=2^_82828282?>«68282d2e28282?>=28282d2e28282? \ No newline at end of file diff --git a/data/maps/AbandonedShip_Rooms_B1F/border.bin b/data/maps/AbandonedShip_Rooms_B1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AbandonedShip_Rooms_B1F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc index 219410a9f..7838b8875 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Rooms_B1F: @ 8484518 - .4byte AbandonedShip_Rooms_B1F_MapAttributes + .4byte AbandonedShip_Rooms_B1F_Layout .4byte AbandonedShip_Rooms_B1F_MapEvents .4byte AbandonedShip_Rooms_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.bin b/data/maps/AbandonedShip_Rooms_B1F/map.bin deleted file mode 100644 index b18509507..000000000 --- a/data/maps/AbandonedShip_Rooms_B1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -6@k•¯–mE@k•c–''@k•¯–mE7>Hs·2žuMHs—6ž//Hs·2žuM?>PQ:2;2;2TUPQ:2;2;2;2;2PQ:2;2;2TU?>XY=28282\]XY=28282a282XY=2a282\]?>:2;2<2a282;2;2:2;2<2828282ª6:2;2<28282;2;2?>=2VW828282ª6=2€‰‰‰82=28282a2828282?>=2^_82`28282=2pVp’82=2`2828282b82?>«6828282828282=2VGV’82=28282828282ª6? \ No newline at end of file diff --git a/data/maps/AbandonedShip_Underwater1/border.bin b/data/maps/AbandonedShip_Underwater1/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AbandonedShip_Underwater1/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc index b314f5028..cc9db3443 100644 --- a/data/maps/AbandonedShip_Underwater1/header.inc +++ b/data/maps/AbandonedShip_Underwater1/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Underwater1: @ 8484550 - .4byte AbandonedShip_Underwater1_MapAttributes + .4byte AbandonedShip_Underwater1_Layout .4byte AbandonedShip_Underwater1_MapEvents .4byte AbandonedShip_Underwater1_MapScripts .4byte 0x0 diff --git a/data/maps/AbandonedShip_Underwater1/map.bin b/data/maps/AbandonedShip_Underwater1/map.bin deleted file mode 100644 index 2c73cfe86..000000000 --- a/data/maps/AbandonedShip_Underwater1/map.bin +++ /dev/null @@ -1 +0,0 @@ -ÍÎÌÎÌÎÍÎÕ×ÔÖÔÖÕÖÏ2Ï2Ï2Ï2Ï2Ï2Ð2Ñ2Ï2ø2Ò2Ó2É2É2Ï2Ï2ø2É2É2É2É2É2É2Ï2ø2É2É2É2Ò2Ó2É2Ï2ú2É2É2É2É2É2É2Ð2÷2ï2É2Ê2Ë2É2ù2Ï2 \ No newline at end of file diff --git a/data/maps/AbandonedShip_Underwater2/border.bin b/data/maps/AbandonedShip_Underwater2/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AbandonedShip_Underwater2/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc index 3f15871b7..87650f5b2 100644 --- a/data/maps/AbandonedShip_Underwater2/header.inc +++ b/data/maps/AbandonedShip_Underwater2/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Underwater2: @ 84845C0 - .4byte AbandonedShip_Underwater2_MapAttributes + .4byte AbandonedShip_Underwater2_Layout .4byte AbandonedShip_Underwater2_MapEvents .4byte AbandonedShip_Underwater2_MapScripts .4byte 0x0 diff --git a/data/maps/AbandonedShip_Underwater2/map.bin b/data/maps/AbandonedShip_Underwater2/map.bin deleted file mode 100644 index 9dbd5c71a..000000000 --- a/data/maps/AbandonedShip_Underwater2/map.bin +++ /dev/null @@ -1 +0,0 @@ -ÌÎØÙÚÎÍÎÌÎÍÎÌÎÌÎÍÎÍÎÌÔÖÛÜ2ÝÖÕÖÔÖÕ×Ô×ÔÖÕ×ÕÖÔÏ2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ð2Ñ2Ï2Ï2Ï2ø2É2Ò2Ó2É2Ñ2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2ø2É2É2É2É2É2Ï2Ï2Ï2Ï2Ï2Ï2Ð2Ñ2Ï2Ï2Ï2Ï2Ï2Ï2ø2É2É2É2É2É2É2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2÷2ï2É2É2É2É2Ò2Ð2Ñ2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ð2Ñ2÷2ï2É2É2É2É2 \ No newline at end of file diff --git a/data/maps/AlteringCave/border.bin b/data/maps/AlteringCave/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/AlteringCave/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/AlteringCave/header.inc b/data/maps/AlteringCave/header.inc index 98a23f76a..2361bf769 100644 --- a/data/maps/AlteringCave/header.inc +++ b/data/maps/AlteringCave/header.inc @@ -1,5 +1,5 @@ AlteringCave: @ 8484A58 - .4byte AlteringCave_MapAttributes + .4byte AlteringCave_Layout .4byte AlteringCave_MapEvents .4byte AlteringCave_MapScripts .4byte 0x0 diff --git a/data/maps/AlteringCave/map.bin b/data/maps/AlteringCave/map.bin deleted file mode 100644 index 38bec91fa..000000000 --- a/data/maps/AlteringCave/map.bin +++ /dev/null @@ -1 +0,0 @@ -f222f222ff6662222226662222226662f2222222222222######"f22222222#######"2222222 !B!B!B!B!B!B"P22222222BBBBBBP22˜2™2™2š2222222fP222BBBBBB22˜2¡2¡2¡2¢22222ffPf2BBBBBB22 2¡2¡2¡2¡2š2222222222BBBBB22 2¡2¡2¡2¡2¢2222222222222¨2¡2¡2¡2¡2¢222f2222222222222222f22¨2©2©2©2ª22222Pf22222222222222222P2222222222f22222222222222222####"22222222222222222 ##################"22222222666666222222226666662222222 #666666###"2<22#XYZ## \ No newline at end of file diff --git a/data/maps/AncientTomb/border.bin b/data/maps/AncientTomb/border.bin deleted file mode 100644 index c07869a9f..000000000 --- a/data/maps/AncientTomb/border.bin +++ /dev/null @@ -1 +0,0 @@ -ÙÙÙÙ \ No newline at end of file diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc index 2d384b07b..5e958c6bd 100644 --- a/data/maps/AncientTomb/header.inc +++ b/data/maps/AncientTomb/header.inc @@ -1,5 +1,5 @@ AncientTomb: @ 8484630 - .4byte AncientTomb_MapAttributes + .4byte AncientTomb_Layout .4byte AncientTomb_MapEvents .4byte AncientTomb_MapScripts .4byte 0x0 diff --git a/data/maps/AncientTomb/map.bin b/data/maps/AncientTomb/map.bin deleted file mode 100644 index 406cf7279..000000000 Binary files a/data/maps/AncientTomb/map.bin and /dev/null differ diff --git a/data/maps/AquaHideout_1F/border.bin b/data/maps/AquaHideout_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AquaHideout_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc index d2f8601bf..afbba5738 100644 --- a/data/maps/AquaHideout_1F/header.inc +++ b/data/maps/AquaHideout_1F/header.inc @@ -1,5 +1,5 @@ AquaHideout_1F: @ 8484144 - .4byte AquaHideout_1F_MapAttributes + .4byte AquaHideout_1F_Layout .4byte AquaHideout_1F_MapEvents .4byte AquaHideout_1F_MapScripts .4byte 0x0 diff --git a/data/maps/AquaHideout_1F/map.bin b/data/maps/AquaHideout_1F/map.bin deleted file mode 100644 index 2330fe015..000000000 --- a/data/maps/AquaHideout_1F/map.bin +++ /dev/null @@ -1,55 +0,0 @@ -STSTÃÄÅ [\21$#![\0!21!!ËÌ2Í" -cd:292)2)2)2cd82)2:292)2)2Æ2)2Ç2)2' - -!!! k2l2¡2(2(2(2(2k2l2¡2(2(2(2(2(2(2(2(2(27 - -2)2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2)2 - -'//¡2(2(2]iiiiiiiiii^™2(2(2(2(2(2 - -/'/¡2(2(2`q1q1q1q1q1q1q1q1q1q1¤¡2(2(2(2(2(2 - -'/±2©2(2(2`q1p1p1p1p1p1p1p1p1q1¤¡2(2(2(2(2(2 - -/±2©2(2(2(2hiiiiiiiiii¬¡2(2(2(2(2 - -)2©2(2(2(2(2*2*2*2*2*2*2*2*2*2*2*2*2©2(2(2(2(2' - -)2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2/ - -)2(2(2]iiiiiif(2(2eiiiiii^™2(2' - -)2(2(2`t||||||¯0Ï0||||||‰¤¡2(2/ - -)2(2(2`u€‰‰‰‰‰‰‰‰‰‰‰‰s¤¡2(2*2 - -)2(2(2`upppppppppppp’s¤¡2(2(2 - -Š2ƒ2(2`upppppppppppp’s¤¡2(2(2 - -ˆ‰¡2ªupppppppppppp’sy¡2(2(2 - -‘¡2*­BBBBtppppprBBBBB*©2(2(2 - -)2*2©2((BBBBuypppxsBBBBB((2‚2ƒ2 - -)2(2(2–t|||}ppp’{||||‰•™2ˆ‰ - -)2(2(2`u€‰‰‰˜pppš‰‰‰‰s¤¡2‘ - -)2(2(2`upppppppppppp’s¤¡2*2*2 - -Š2ƒ2(2`upppppppppppp’s¤¡2(2(2 - -ˆ‰¡2`upppppppppppp’s¤¡2‚2ƒ2 - -‘¡2ªupppppppppppp’sy¡2ˆ‰ - -)2*2©2*­BBBBBtppprBBBBBB*©2‘ - -)2(2(2((BBBBBuypxsB(B(B(B(B(B((2*2*2 - -mmmmmmmmoug’snmmmmmmmmm - -qqqqqqqqu¿ÈÉʾsqqqqqqqqq -¿llllllll¿lllll¾lllllllll¾ \ No newline at end of file diff --git a/data/maps/AquaHideout_B1F/border.bin b/data/maps/AquaHideout_B1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AquaHideout_B1F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc index e5a70a5c0..079c18ee9 100644 --- a/data/maps/AquaHideout_B1F/header.inc +++ b/data/maps/AquaHideout_B1F/header.inc @@ -1,5 +1,5 @@ AquaHideout_B1F: @ 8484160 - .4byte AquaHideout_B1F_MapAttributes + .4byte AquaHideout_B1F_Layout .4byte AquaHideout_B1F_MapEvents .4byte AquaHideout_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/AquaHideout_B1F/map.bin b/data/maps/AquaHideout_B1F/map.bin deleted file mode 100644 index 97efacec8..000000000 --- a/data/maps/AquaHideout_B1F/map.bin +++ /dev/null @@ -1,83 +0,0 @@ -àààÃÄÅààÃÄÅààààààà³´µààààààààààà 01!ËÌ2Í -11ËÌ2Í!ØÙØÙ -!!»¼2½!! - -ØÙ!!!ØÙØÙ -àÃÄÅST8292)2Æ2)2Ç2 -9292Æ2)2Ç2)2ÚÛÚÛ -')2Æ2)2Ç2)2' - -ÚÛ)2)2)2ÚÛÚÛ - -!ËÌ2Í[\ )2(2(2(2(2(2 -)2(2(2(2(2(2ÜÝ7ÚÛ -/¡2(2(2(2(2/ - -ÜÝ7¡2(2ß2ÜÝ7ÚÛ - -)2Æ2)2Ç2cd2)2(2(2(2(2(2 -)2(2(2(2(2ß2*2*2ÜÝ7 -)2ß2(2(2(2ß2(2 - -)2*2©2(2(2*2*2ÜÝ7 - -)2(2(2(2k2l2¡2(2(2(2(2(2(2  2Y2Y2Y2Y2Y2Y2Y2Y2Y2  2Y2Y2Y2Y2Y2Y2  -)2ß2(2(2ß2(2(2ß2(2 - -)2(2(2(22A2B2222(2(2(2ààÕÔÕàààààààà+,-. -†iiiiiii^ - -)2(2(2(2IJ222(2(2(2 -ãã$#$!!! -0013456 - -`®2§2§2§2§2§2§2¦ - -)2(2(2(2222A2B22(2(2(2 -êêæ3ó7ô7æõCæ66 -828292;<=> - -hiiiiiii¬ - -)2(2(2(2222IJ(2(2(2 -3€3å3Ã7Å7åýCå3å3å3 -)263(2CDEF - -)2ß2(2(2ß2(2(2ß2(2 - -)2(2(2(2222222(2(2(2 -3€3å3û3ü3åúå3ß2å3 -)2(2(2KLMN - -†iiiiiii^ -  2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2 î3í3í3í3í3í3í3í3í3í3 )2(2(2(2UV)2 - -`®2§2§2§2§2§2§2¦ -ààààààààààààààààààààààà)2ß2(2(2(2(2(2 - -hiiiiiii¬ - -!!!!!!!!!!!!! !!!!!!!!!!  2Y2Y2Y2Y2Y2Y2  -)2ß2(2(2ß2(2(2ß2(2 - -)2)2)2)2)2)2)2)2)2)2)2)2)22)222222222à3ààààààà -†iiiiiii^ - -)2(2ß2(2(2(2(2(2(2(2(2(2(2(2(2é3  222ðñá7 !!!!!!! - -`®2§2§2§2§2§2§2¦ - -†iiiiiiiiiiiii^è222øùèD322222)2)2 - -hiiiiiii¬ - -`®2§2§2§2§2§2§2§2§2§2§2§2§2¦222222222222222(2(2 - -)2ß2(2(2ß2(2(2ß2(2 - -`¯2O1O1O1O1O1O1O1O1O1O1O1O1¤2A2B2222A2B2é3é322222(2(2 -  2Y2Y2Y2Y2Y2Y2Y2Y2  -hiiiiiiiiiiiii¬2IJ222IJèè22222(2ß2 -ààààààààà -)2*2ß2*2*2*2*2*2*2*2*2*2*2*2*2222222222222222(2(2 - !!!!!!!!!   2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2 àààààààààààààààààààààààààààààààà !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!  \ No newline at end of file diff --git a/data/maps/AquaHideout_B2F/border.bin b/data/maps/AquaHideout_B2F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AquaHideout_B2F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc index 0f3849799..8089a1634 100644 --- a/data/maps/AquaHideout_B2F/header.inc +++ b/data/maps/AquaHideout_B2F/header.inc @@ -1,5 +1,5 @@ AquaHideout_B2F: @ 848417C - .4byte AquaHideout_B2F_MapAttributes + .4byte AquaHideout_B2F_Layout .4byte AquaHideout_B2F_MapEvents .4byte AquaHideout_B2F_MapScripts .4byte 0x0 diff --git a/data/maps/AquaHideout_B2F/map.bin b/data/maps/AquaHideout_B2F/map.bin deleted file mode 100644 index 2e843a8e4..000000000 --- a/data/maps/AquaHideout_B2F/map.bin +++ /dev/null @@ -1,51 +0,0 @@ -ST³´µ³´µ+,-.+,-.222 [\01»¼2½ -!!»¼2½3456!!3456!!! -à³´µàcd8292Æ2)2Ç2 -)2)2Æ2)2Ç2;<=>)2)2;<=>)2)2)2 - -!»¼2½! -k2l2¡2(2(2(2(2 -)2(2(2(2(2CDEF¡2(2CDEF¡2(2(2 - -)2Æ2)2Ç2)2 -)2(2(2(2(2(2(2 -)2(2(2(2(2KLMN¡2(2KLMN¡2(2(2 - -)2(2(2(2(2 -)2(2(22A2B22 -)2(2(2(2(2(2UV¡2(2(2(2UV¡2(2(2(2 - -)2(2(2 -)2(2(22IJ -)2(2‚2ƒ2(2(2*2*2©2(2(2(2*2*2©2(2(2(2 - -)2//(2 -)2(2(22222 -)2(2ˆ‰¡2(2‚2ƒ2(2(2‚2ƒ2(2‚2ƒ2(2(2(2 - -)277/ß2 -)2ß2(22222 -)2(2‘¡20ˆ‰¡2(2ˆ‰2ˆ‰¡2ß2(2 -  2Y2Y2Y2Y2  2Y2Y2Y2Y2Y2Y2 )2(2*2*2©282‘¡2(2‘:2‘¡2(2(2 -àààààààààààà)2(2(2(2(2(2*2*2©2(2*2*2©2*2*2©2(2(2 - -!!!!! 012!!!! -)2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2 - -)2)2)2)2)228292:2)2)2)2)2 -)2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2  -)2(2(2(2(2(2(2(2(2(2(2ß2(2 )2(2(2ß2(2(2(2'2Y2Y2Y2Y2Y2Y2Y2Y2 -)2(2(2(2(2(2(2(2(2(2(2(2(2)2(2(2(2(2(2'/àààààààà - -Žiiiiiiiiiiif )2(2(2(2(2(2/// !!!!!!!! - -€‰‰‰‰‰‰‰‰‰‰‰2Žiiiiiii^2)2)2)2)2)2)2)2)2 - -VVVVVVVVpppš‰‰‰‰‰‰‰‰¦¡2(2(2(2(2(2(2ß2(2 - -GGGGGGGVVVVVVVVppppp’y¡2(2(2(2(2 - -GGGGGGGGGGGGGGVVVVVp’*2©2(2(2(2(2''// - -GGGGGGGGGGGGGGGGGGVp’•™2(2(2(2(2//)2ß2 - GGGGGGGGGGGGGGGGGGVp’¦Œ2Y2Y2Y2Y2 2 2 2Y2 GGGGGGGGGGGGGGGGGGVp’bàààààààà Žiiiiiiiiiiiiiiiiiiiiij !!!!!!!!  \ No newline at end of file diff --git a/data/maps/AquaHideout_UnusedRubyMap1/border.bin b/data/maps/AquaHideout_UnusedRubyMap1/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AquaHideout_UnusedRubyMap1/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/AquaHideout_UnusedRubyMap1/header.inc b/data/maps/AquaHideout_UnusedRubyMap1/header.inc index b32ecf901..a643b729e 100644 --- a/data/maps/AquaHideout_UnusedRubyMap1/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap1/header.inc @@ -1,5 +1,5 @@ AquaHideout_UnusedRubyMap1: @ 84846D8 - .4byte AquaHideout_UnusedRubyMap1_MapAttributes + .4byte AquaHideout_UnusedRubyMap1_Layout .4byte AquaHideout_UnusedRubyMap1_MapEvents .4byte AquaHideout_UnusedRubyMap1_MapScripts .4byte 0x0 diff --git a/data/maps/AquaHideout_UnusedRubyMap1/map.bin b/data/maps/AquaHideout_UnusedRubyMap1/map.bin deleted file mode 100644 index 52c2d57eb..000000000 Binary files a/data/maps/AquaHideout_UnusedRubyMap1/map.bin and /dev/null differ diff --git a/data/maps/AquaHideout_UnusedRubyMap2/border.bin b/data/maps/AquaHideout_UnusedRubyMap2/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AquaHideout_UnusedRubyMap2/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/AquaHideout_UnusedRubyMap2/header.inc b/data/maps/AquaHideout_UnusedRubyMap2/header.inc index dec1a5311..bb82dba18 100644 --- a/data/maps/AquaHideout_UnusedRubyMap2/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap2/header.inc @@ -1,5 +1,5 @@ AquaHideout_UnusedRubyMap2: @ 84846F4 - .4byte AquaHideout_UnusedRubyMap2_MapAttributes + .4byte AquaHideout_UnusedRubyMap2_Layout .4byte AquaHideout_UnusedRubyMap2_MapEvents .4byte AquaHideout_UnusedRubyMap2_MapScripts .4byte 0x0 diff --git a/data/maps/AquaHideout_UnusedRubyMap2/map.bin b/data/maps/AquaHideout_UnusedRubyMap2/map.bin deleted file mode 100644 index 1406dde5d..000000000 --- a/data/maps/AquaHideout_UnusedRubyMap2/map.bin +++ /dev/null @@ -1,95 +0,0 @@ -ÃÄÅÃÄÅààààààààà 01!ËÌ2Í -01ËÌ2Í!!!!!!!Ø3Ù3Ø3Ù3 - -ØÙ!!!ØÙØÙ -àÃÄÅSTÃÄÅST8292)2Æ2)2Ç2 -8292Æ2)2Ç2)2)2)2)2)2)2)2Ü7Ý7Ú7Û7// - -ÚÛ)2)2)2ÚÛÚÛ - -!ËÌ2Í[\01!! -ËÌ2Í[\ -)2(2(2(2(2(2 -)2(2(2(2(22A2B222(2(2*2*2Ü7Ý777 - -ÜÝ7¡2(2ß2ÜÝ7ÚÛ - -)2Æ2)2Ç2cd8292)2)2 -'Æ2)2Ç2cd -)2(2(2(2(2(2 -)2(2(2(2(22IJ2(2(2(2(2*2*2*2*2 - -)2*2©2(2(2*2*2ÜÝ7 - -)2(2(2(2k2l2(2ß2(2(2 -/¡2(2(2k2l2 -)2(2(2(2ß2(2 -)2(2(2(2(222222(2(2(2ß2(2(2(2(2 - -)2ß2(2(2ß2(2(2ß2(2 - -)2(2(2(2(2(2(2(2(2(2 -'¡2(2(2(2(2 -)22A2B222  2Y2Y2Y2Y2Y2Y2Y2Y22Y2Y2Y2Y2Y2Y2Y2Y2  -âmmmmmmmo - -)2(2(2(2(2(2(2ß2(2(2 -/6¡2(2(2(2(2 -)22IJ2ààÕÔÕàààààààààààà -vq0q0q0q0q0q0q0w -  2Y2Y2Y2Y2Y2Y2Y2Y2Y2 )2©2ß2(2(2(2 -)222222 -ãã$#$!! -001!Ø3Ù3Ø3Ù3 - -~yyyyyyy -àààààààààà)2(2(2(2(2(2 -)2(2(2(2(2(2 -ê7ê7æ3óôæ3õ -828292)2ÜÝÚÛ - -)2ß2(2(2ß2(2(2ß2(2 - !!!!!!!!!!  2Y2Y2Y2Y2Y2  2Y2Y2Y2Y2Y2 3€3å3ÃÅåýCå3å3 -)2(2(2(2*2*2ÜÝ - -âmmmmmmmo -+,-.àààààààà3€3å3û3ü3å3úå3ß2 -)2(2ß2(2(2ß2*2*2 - -vq0q0q0q0q0q0q0w - -345601 -0011!! î3í3í3í3í3í3í3í3í3  2Y2Y2Y2Y2Y2Y2Y2  -~yyyyyyy - -;<=>8292 -82829292)2)2ààààààààààààààààà -)2ß2(2(2ß2(2(2ß2(2 - -CDEF)2…2 -)2(2ß2(2(2(2 !!!!!!!!! !!!!!!!! - -âmmmmmmmo - -KLMN)2(2 -)2(2(2(2(2(22)2)2)2)2)2)2)2)2)22)2)2)2)2)2)2)2)2 - -vq0q0q0q0q0q0q0w - -)2UV)2ß2(2  2Y2Y2Y2Y2Y2Y2Y2Y22é3222222222222(2(2 - -~yyyyyyy - -)2)2)2)2(2(2àààààààààá  2A2B222@2B2é3é32(2(2 - -)2ß2(2(2ß2(2(2ß2(2 - -)2(2(2(2Ø3Ù3 -!!!!!!!!! è2IJ22HJèè2(2(2 -  2Y2Y2Y2Y2Y2Y2Y2Y2  -)2(2Ø3Ù3ÜÝ -)2)2)2)2)2)2)2)2)222222222222222(2ß2 -ààààààààà -Ø3Ù3Ú7Û7(2(2 -)2(2ß2(2(2(2(2(2(2(22222222222222(2(2 - !!!!!!!!!  ç7ï7ç7ï7çï  2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2 ààààààààààààààààààààààààààààààà !!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!  \ No newline at end of file diff --git a/data/maps/AquaHideout_UnusedRubyMap3/border.bin b/data/maps/AquaHideout_UnusedRubyMap3/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AquaHideout_UnusedRubyMap3/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/AquaHideout_UnusedRubyMap3/header.inc b/data/maps/AquaHideout_UnusedRubyMap3/header.inc index a2383a4a6..1fa34aab4 100644 --- a/data/maps/AquaHideout_UnusedRubyMap3/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap3/header.inc @@ -1,5 +1,5 @@ AquaHideout_UnusedRubyMap3: @ 8484710 - .4byte AquaHideout_UnusedRubyMap3_MapAttributes + .4byte AquaHideout_UnusedRubyMap3_Layout .4byte AquaHideout_UnusedRubyMap3_MapEvents .4byte AquaHideout_UnusedRubyMap3_MapScripts .4byte 0x0 diff --git a/data/maps/AquaHideout_UnusedRubyMap3/map.bin b/data/maps/AquaHideout_UnusedRubyMap3/map.bin deleted file mode 100644 index 68afb0063..000000000 --- a/data/maps/AquaHideout_UnusedRubyMap3/map.bin +++ /dev/null @@ -1,49 +0,0 @@ -ST³´µ³´µ|}~|}~ [\01»¼2½ -!!»¼2½3456!!3456!!! -à³´µàcd8292Æ2)2Ç2 -)2)2Æ2)2Ç2;<=>)2)2;<=>)2)2)2 - -»¼2½! k2l2¡2(2(2(2(2 -)2(2(2(2(2CDEF(2(2CDEF¡2(2(2 - -'Æ2)2Ç2)22)2(2(2(2(2(2(2 -)2(2(2(2(2KLMN(2(2KLMN¡2ß2(2 - -/(2(2(2(22A2B222(2(2(2 -)2‚2ƒ2(2(2(2UV¡2(2(2(2UV¡2(2(2(2 - -/(2(2(2(22IJ2(2(2(2 -)2ˆ‰2¡2(2(2(2(2(2(2(2*2*2©2(2(2(2 - -)2(2(2(2(222222(2(2(2 -)2‘:2¡2(2(2(2(2(2(2‚2ƒ2(2‚2ƒ2(2(2 - -)2(2(2(2(222222(2(2(2 -)2*2*2©2(2(2(2(2(2(2(2ˆ‰2ˆ‰¡2(2 -  2Y22Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2  2Y2Y2Y2Y2Y2Y2Y22(2(2‘:2‘¡2(2 -àààààààààààààààààààà(2(2*2*2©2*2*2©2(2 - -01 -!!!!!!!!!! -!!!!!!!! (2(2(2(2(2(2(2(2(2 - -8292 -)2)2)2)2)2)2)2)2)2)2 )2)2)2)2)2)2)2)22(2(2(2(2(22Y2Y2Y2  -)2(2 -)2(2(2(2(2(2(2(2ß2(2)2(2ß2(2(2(2(2(2(2(2(2(2(2(2ààà -)2ß2 -)2(2(2(2(2(2(2(2(2(2 Žiiiiiiiiiiii^ !!! - -)2(2 -)2(2(2(2piiiif2€‰‰‰‰‰‰‰‰‰‰‰¦2)2)2)2 - -)2(2 )2(2(2(2`€‰‰‰‰‰˜pppppVVVVVV’b¡2(2ß2(2 - -)2(2)2(2(2(2`ppppppVVVVVGGGGGV’b¡2(2(2(2 - -)2(2 )2(2(2(2xpppVVVGGGGGGGGGGV’b¡2(2(2(2 - -)2(22)2(2(2(2*2pVVGGGGGGGGGGGGGV’b¡2(2(2(2 - -)2(2(2(2(2(2(2–VGGGGGGGGGGGGGGGV’b¡2(2(2(2 -  2Y2Y2Y2Y2Y22`VGGGGGGGGGGGGGGGV’b{3(2(2(2 àààààà`VGGGGGGGGGGGGGGGV’bààà !!!!!! hiiiiiiiiiiiiiiiiiiij !!!  \ No newline at end of file diff --git a/data/maps/ArtisanCave_1F/border.bin b/data/maps/ArtisanCave_1F/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/ArtisanCave_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/ArtisanCave_1F/header.inc b/data/maps/ArtisanCave_1F/header.inc index 1c363e7c9..a8d91737e 100644 --- a/data/maps/ArtisanCave_1F/header.inc +++ b/data/maps/ArtisanCave_1F/header.inc @@ -1,5 +1,5 @@ ArtisanCave_1F: @ 84849B0 - .4byte ArtisanCave_1F_MapAttributes + .4byte ArtisanCave_1F_Layout .4byte ArtisanCave_1F_MapEvents .4byte ArtisanCave_1F_MapScripts .4byte 0x0 diff --git a/data/maps/ArtisanCave_1F/map.bin b/data/maps/ArtisanCave_1F/map.bin deleted file mode 100644 index 2009f24f4..000000000 --- a/data/maps/ArtisanCave_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -666666666666666666666666666666666666666666666666666666666666666666?262666666262666666262666666262666666226666662266666626U266666622262226666662226222666666 6 6 6"22U22  6 6 6666666666"22222 666666666666"222 6666666666662<2666666666666 6XYZ 6666666666666 6 6 6 6 6 6 6666666666666 6 6 6 6 6 6 6 6 6666666666666666666666666666 \ No newline at end of file diff --git a/data/maps/ArtisanCave_B1F/border.bin b/data/maps/ArtisanCave_B1F/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/ArtisanCave_B1F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/ArtisanCave_B1F/header.inc b/data/maps/ArtisanCave_B1F/header.inc index 844f627c1..a82cd93f6 100644 --- a/data/maps/ArtisanCave_B1F/header.inc +++ b/data/maps/ArtisanCave_B1F/header.inc @@ -1,5 +1,5 @@ ArtisanCave_B1F: @ 8484994 - .4byte ArtisanCave_B1F_MapAttributes + .4byte ArtisanCave_B1F_Layout .4byte ArtisanCave_B1F_MapEvents .4byte ArtisanCave_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/ArtisanCave_B1F/map.bin b/data/maps/ArtisanCave_B1F/map.bin deleted file mode 100644 index c5ce45c52..000000000 --- a/data/maps/ArtisanCave_B1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -22222666666666666666666666666666666666666222226666666666666666666666666666666666666222266'6622226'666666662222666666622222266222222266662222'226666666'2222222222222222266662222 6 6"2662222  B B"222222222266662222662U222 "222222222666622226622222222222222 BB"2222222266662222 6 6"222222  B B B B B B B B B BBB B B B B B B"222266662222 2 6"22222   6 6 6 6"BBBBBBBBBBBB"22266662222U2222   6"B"2266662222U222266B2266662222U222266B2266662222222266B222222222222266662222'2222'66B22  6 6 6 6"2222266662222222  6 6 6B2  " ""2222666622222  6 6666BB B B B B B BU"222666622222  6 6 6 6 6BBBBBBBBBBU    6 6 6 66622222  B B B B BBBB             6 6 6 6 6"6622222BBBBBBBB     "   " " " "6622222BUBBUUU662222222222BBUBBUUU6622222BBBBBBU        662222222222BBBBBBUBBBBBBBB6666666662222222222BBBBBBBUB         2222222222BBBBBBBBB        22222BBBBBBBBB22266666  2222222222BBBBBBBBB226     62222222222BUBBBBBB2226     2222 6 6"2222BBBBBBBB'       6    2222 6"62222BBBBBBBBB  "     62222 2" 6" 6"222BUBBBBBBBBU6666622222U6222BBBBBBBBUBBBBBBBBB62222U6U222BBBBBB66666622226622  B B2222222BBBBBB662222U622BB22BB2226U22226622BBBBBBB22BB2226666662222U22B22BB22266666622222222B22222B       66666622222222B22222B'        66666622222222U2222U6        6666662222222222222266U6        66666622222222222222'U66U66222222222222222666622222222222222222666622222222U222222222666666622222<22222222222226666666666666666666662222 XYZ             6666666666666666666662222                      6666666666666666662222  6  6  6  6  6  6   6                       666622222666666666666666666666666666666666666666662222266666666666666666666666666666666666666666 \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/border.bin b/data/maps/BattleFrontier_BattleArenaBattleRoom/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattleFrontier_BattleArenaBattleRoom/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc index 19e6f0413..7a8afda58 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleArenaBattleRoom: @ 8485484 - .4byte BattleFrontier_BattleArenaBattleRoom_MapAttributes + .4byte BattleFrontier_BattleArenaBattleRoom_Layout .4byte BattleFrontier_BattleArenaBattleRoom_MapEvents .4byte BattleFrontier_BattleArenaBattleRoom_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/map.bin b/data/maps/BattleFrontier_BattleArenaBattleRoom/map.bin deleted file mode 100644 index 526de2248..000000000 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/map.bin +++ /dev/null @@ -1 +0,0 @@ -PPQPPQPPPPUPPUPPXXYXXYXXXX]XX]XX``a``a````e``e``22222222222222222222(2)2*2+2,2-2.2/22222}2}2}2}20212223242526272}2}2}2}222228292:2;2<2=2>2?22222u2u2v2w2@2A2B2C2D2E2F2G2u2v2u2u2 2 2 2 2H2I2J2K2L2M2N2O2 2 2 2 222222'2'222'2'2222222222222222222222 \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/border.bin b/data/maps/BattleFrontier_BattleArenaCorridor/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattleFrontier_BattleArenaCorridor/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc index d70d50b1d..5312dd0fe 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleArenaCorridor: @ 8485468 - .4byte BattleFrontier_BattleArenaCorridor_MapAttributes + .4byte BattleFrontier_BattleArenaCorridor_Layout .4byte BattleFrontier_BattleArenaCorridor_MapEvents .4byte BattleFrontier_BattleArenaCorridor_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/map.bin b/data/maps/BattleFrontier_BattleArenaCorridor/map.bin deleted file mode 100644 index 1b124b610..000000000 --- a/data/maps/BattleFrontier_BattleArenaCorridor/map.bin +++ /dev/null @@ -1 +0,0 @@ -VWWVWWôôôôôôWWkWWk^__^__ôôôôôô__s__sf6g6g6f6g6g6ôôôôôôg6g6{6g6g6{6¥˜ôôôôôô¨¦n ôôôôôô°onôôôôôôôôôôôôonôôôôôôôôôôôôonôôôôôôôôôôôôonoVWWVWWWWkWWknonoVWWVWWWWkWWknono^__^____s__snonof6g6g6f6g6g6g6g6{6g6g6{6nont2222222222222z22o2£222222”•–222222¤ \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleArenaLobby/border.bin b/data/maps/BattleFrontier_BattleArenaLobby/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattleFrontier_BattleArenaLobby/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattleArenaLobby/header.inc b/data/maps/BattleFrontier_BattleArenaLobby/header.inc index 36522126d..3f5e0ff4e 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/header.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleArenaLobby: @ 848544C - .4byte BattleFrontier_BattleArenaLobby_MapAttributes + .4byte BattleFrontier_BattleArenaLobby_Layout .4byte BattleFrontier_BattleArenaLobby_MapEvents .4byte BattleFrontier_BattleArenaLobby_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleArenaLobby/map.bin b/data/maps/BattleFrontier_BattleArenaLobby/map.bin deleted file mode 100644 index 2792d7979..000000000 --- a/data/maps/BattleFrontier_BattleArenaLobby/map.bin +++ /dev/null @@ -1,3 +0,0 @@ -P6Q6P6P6P6P6S6X6R6P6P6P6P6U6P6P6X6Y666Z6[6S6\6R6Z6[666]6X6X6`6a666b6c6T6d6a6b6c666e6`6`6FFFFFFF¢FFFFFFFFFFFFFFFFFFFFFFFFFFFF#FFFFFF$FFF€FFF‘’“2%FFFFFF&F2‰4…‡™š› 2FFFFFF 2§2¡ -2 2 22222'222 22 22222 2‚2ƒ2„2 2 22222‰2222 2Š2‹2Œ2222222†22222222222222Ž -222222œ22ž2222222— \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/border.bin b/data/maps/BattleFrontier_BattleDomeBattleRoom/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattleFrontier_BattleDomeBattleRoom/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc index ab6254403..3edfad730 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleDomeBattleRoom: @ 8485388 - .4byte BattleFrontier_BattleDomeBattleRoom_MapAttributes + .4byte BattleFrontier_BattleDomeBattleRoom_Layout .4byte BattleFrontier_BattleDomeBattleRoom_MapEvents .4byte BattleFrontier_BattleDomeBattleRoom_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/map.bin b/data/maps/BattleFrontier_BattleDomeBattleRoom/map.bin deleted file mode 100644 index ffb450f3c..000000000 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -ÐÐÑÐÐÐÐÐÐÐÑÐÐÐÐÐÑÐÐÐÐÐÑÐÐÐÐÐÐÐÑÐÐÐÐÐÑÐÐÐÒÒÓÒÒÒÒÒÒÒÓÒÒÒÒÒÓÒÒÒÔÕÖ×ØÙÚÔÕÖ×ØÙÚÔÕÖ×ØÙ  áâãäåæç      éêëìíîï      ñòóôõö÷ !"#$%&      ùúûüýþÿ()*+,-.      0123456        -   89:;<=>>    \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/border.bin b/data/maps/BattleFrontier_BattleDomeCorridor/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattleFrontier_BattleDomeCorridor/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc index f91cfe2d4..133115e33 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleDomeCorridor: @ 8485350 - .4byte BattleFrontier_BattleDomeCorridor_MapAttributes + .4byte BattleFrontier_BattleDomeCorridor_Layout .4byte BattleFrontier_BattleDomeCorridor_MapEvents .4byte BattleFrontier_BattleDomeCorridor_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/map.bin b/data/maps/BattleFrontier_BattleDomeCorridor/map.bin deleted file mode 100644 index 2a9c49675..000000000 --- a/data/maps/BattleFrontier_BattleDomeCorridor/map.bin +++ /dev/null @@ -1 +0,0 @@ -ABCDEFGDABCDEFGDABCDEFGDABCDEFGDABCDEFGDABCDEFGDIJKLMNOLIJKLMNOLIJKLMNOLIJKLMNOLIJKLMNOLIJKLMNOLQRSSUVWTQRSTUVWTQRSTUVWTQRSTUVWTQRSTUVWTQRSTUVWTYZ[[]^_\YZ[\]^_\YZ[\]^_\YZ[\]^_\YZ[\]^_\YZ[\]^_\DBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBHA@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@AI@A@A@A@A@A@A@A@A@A@A@A=>@A@A@A@A@A@A@A@A@A@A@A@ \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleDomeLobby/border.bin b/data/maps/BattleFrontier_BattleDomeLobby/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattleFrontier_BattleDomeLobby/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattleDomeLobby/header.inc b/data/maps/BattleFrontier_BattleDomeLobby/header.inc index 0626aea77..26813d1f1 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/header.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleDomeLobby: @ 8485334 - .4byte BattleFrontier_BattleDomeLobby_MapAttributes + .4byte BattleFrontier_BattleDomeLobby_Layout .4byte BattleFrontier_BattleDomeLobby_MapEvents .4byte BattleFrontier_BattleDomeLobby_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleDomeLobby/map.bin b/data/maps/BattleFrontier_BattleDomeLobby/map.bin deleted file mode 100644 index 655c6a39c..000000000 --- a/data/maps/BattleFrontier_BattleDomeLobby/map.bin +++ /dev/null @@ -1 +0,0 @@ -%&%&%&  -.  -.    -.  -.   567     567    34     34  $; <$$; <$DBCBCBCBCBCBCBCBCBCBCBCHA@A@A@A@A@A@A@A@A@A@A@I@‘A@A@A@A@A@A@A@Aqr@AHA˜™@A@A@ÝÞsÛÜ@A@A@yzI@I@ ¡’@tuv@A{A@`ab@“‚HAßܨ©šI|}~àÞƒßÜhijI›‰ŠàÞI@CBœžBCTA@A@CB”•–BCTAHA@A@A@A@A@A@A@A@A@A@A@‹„†„†@A@A@A@A@A@A@A„†„†Œ…‡…‡A@A@A@A@A@A@A@…‡…‡'„†@A@A@A@A@A@A@A„†„†„†/…‡A@A@A@A@=>A@A@…‡…‡…‡ \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/border.bin b/data/maps/BattleFrontier_BattleDomePreBattleRoom/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattleFrontier_BattleDomePreBattleRoom/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc index 7e06ab60a..e25a62ce8 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleDomePreBattleRoom: @ 848536C - .4byte BattleFrontier_BattleDomePreBattleRoom_MapAttributes + .4byte BattleFrontier_BattleDomePreBattleRoom_Layout .4byte BattleFrontier_BattleDomePreBattleRoom_MapEvents .4byte BattleFrontier_BattleDomePreBattleRoom_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.bin b/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.bin deleted file mode 100644 index 49f40213a..000000000 Binary files a/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/border.bin b/data/maps/BattleFrontier_BattleFactoryBattleRoom/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattleFrontier_BattleFactoryBattleRoom/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc index 51aa2cb06..f3050926a 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleFactoryBattleRoom: @ 84854D8 - .4byte BattleFrontier_BattleFactoryBattleRoom_MapAttributes + .4byte BattleFrontier_BattleFactoryBattleRoom_Layout .4byte BattleFrontier_BattleFactoryBattleRoom_MapEvents .4byte BattleFrontier_BattleFactoryBattleRoom_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.bin b/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.bin deleted file mode 100644 index feffbf038..000000000 Binary files a/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/border.bin b/data/maps/BattleFrontier_BattleFactoryLobby/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattleFrontier_BattleFactoryLobby/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc index f4304d579..7da242183 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleFactoryLobby: @ 84854A0 - .4byte BattleFrontier_BattleFactoryLobby_MapAttributes + .4byte BattleFrontier_BattleFactoryLobby_Layout .4byte BattleFrontier_BattleFactoryLobby_MapEvents .4byte BattleFrontier_BattleFactoryLobby_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/map.bin b/data/maps/BattleFrontier_BattleFactoryLobby/map.bin deleted file mode 100644 index 66037e302..000000000 --- a/data/maps/BattleFrontier_BattleFactoryLobby/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -#""#"""#"""#""#$()$(%)$(%)$()$ÕÖÖÖ×*+,ÝÞÞÞß*+,9<S234KTUVK234S<<A:`S\3]3^3LO;I22a-.=3202;/-432432 4!_1 4!3323322XYZ22532222PQR273243222222222222222228332222222222222222@4322222222  -  H \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/border.bin b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc index debeb0c12..eb6e06a0f 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC - .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapAttributes + .4byte BattleFrontier_BattleFactoryPreBattleRoom_Layout .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapEvents .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.bin b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.bin deleted file mode 100644 index 15e97cb30..000000000 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -ýþÿ01ýåæçBíîïR%&'JRRõö÷=>?-./ //=>?]^_*+,*+,ABCOMN234234DEFS\UVSSSHIJS`abcdÒÓDhijkl3ÚÛL4PQ33PQXY Z[4&'4 XY&'3&'3  - \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/border.bin b/data/maps/BattleFrontier_BattlePalaceBattleRoom/border.bin deleted file mode 100644 index 9afd13cdc..000000000 Binary files a/data/maps/BattleFrontier_BattlePalaceBattleRoom/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc index 99c95d07d..b03d993fa 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePalaceBattleRoom: @ 84853DC - .4byte BattleFrontier_BattlePalaceBattleRoom_MapAttributes + .4byte BattleFrontier_BattlePalaceBattleRoom_Layout .4byte BattleFrontier_BattlePalaceBattleRoom_MapEvents .4byte BattleFrontier_BattlePalaceBattleRoom_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.bin b/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.bin deleted file mode 100644 index 58d0a581f..000000000 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.bin +++ /dev/null @@ -1 +0,0 @@ -K2L2?6K2L2?6K2L2?6K2L2?6H6I2JM2N2G6M2N2G6M2N2G6M2N2G6P6Q2RU2V2O6U2V2O6U2V2O6U2V2O6£¤¥‰1‰1‰11X2Y6Z6[6\6]6^6€112222&2’`6a6b6c6d6e6f6’12222&2’1hijklmn’12222’pqrstuv’12222’xyz{|}~’12222š‰‰‰‰‰‰‰˜’12222pppppppppš‰‰ \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/border.bin b/data/maps/BattleFrontier_BattlePalaceCorridor/border.bin deleted file mode 100644 index 9afd13cdc..000000000 Binary files a/data/maps/BattleFrontier_BattlePalaceCorridor/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc index 4dec7d651..4b62687e7 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePalaceCorridor: @ 84853C0 - .4byte BattleFrontier_BattlePalaceCorridor_MapAttributes + .4byte BattleFrontier_BattlePalaceCorridor_Layout .4byte BattleFrontier_BattlePalaceCorridor_MapEvents .4byte BattleFrontier_BattlePalaceCorridor_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/map.bin b/data/maps/BattleFrontier_BattlePalaceCorridor/map.bin deleted file mode 100644 index f2bc6aca4..000000000 Binary files a/data/maps/BattleFrontier_BattlePalaceCorridor/map.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/border.bin b/data/maps/BattleFrontier_BattlePalaceLobby/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattleFrontier_BattlePalaceLobby/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc index 4bf9326b7..8104eadfc 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePalaceLobby: @ 84853A4 - .4byte BattleFrontier_BattlePalaceLobby_MapAttributes + .4byte BattleFrontier_BattlePalaceLobby_Layout .4byte BattleFrontier_BattlePalaceLobby_MapEvents .4byte BattleFrontier_BattlePalaceLobby_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/map.bin b/data/maps/BattleFrontier_BattlePalaceLobby/map.bin deleted file mode 100644 index cda8ff10e..000000000 --- a/data/maps/BattleFrontier_BattlePalaceLobby/map.bin +++ /dev/null @@ -1,7 +0,0 @@ -  -   -    -     -     -    -   6   6 2 2 2 6 2 2 2 2 6666 2 6 2 2 2 6 2  6 6   666 6 2‹Œ 6666 2 666 6 2  6 666 6626 66“”• 6#6$6%66 6626 666 6 !@A›œ+,- !@AŽ)*ˆ‰ŠŽ)*ˆ‰Š–1¨©ª‘’"–1«¬­‘’"žž \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/border.bin b/data/maps/BattleFrontier_BattlePikeCorridor/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattleFrontier_BattlePikeCorridor/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc index f2bf0501b..a2b84a22c 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePikeCorridor: @ 8485510 - .4byte BattleFrontier_BattlePikeCorridor_MapAttributes + .4byte BattleFrontier_BattlePikeCorridor_Layout .4byte BattleFrontier_BattlePikeCorridor_MapEvents .4byte BattleFrontier_BattlePikeCorridor_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/map.bin b/data/maps/BattleFrontier_BattlePikeCorridor/map.bin deleted file mode 100644 index 5e02c145b..000000000 --- a/data/maps/BattleFrontier_BattlePikeCorridor/map.bin +++ /dev/null @@ -1 +0,0 @@ -¡¦§ ¡¢£¤¥¦ ¡¦§©®¯¨©ª«¬­®¨©®¯±6¶6·6°6±6²6³6´6µ6¶°±¶·¹¾¿$¹º»2¼½%¸¹¾¿Ù2Ú2Ú2,Ú2ã2ä2å2Ú2,Ú2Ú2Ú2Ú2Ã2Á2Á2Ú22Þ2ü2ß22Ú2Á2Á2Á2Á2Ã2Á22Á2Þ2ü2ß2Á22Á2Á2Á2Ã2Á2Á2Ú2æ2è2ç2Ú2Á2Á2Á2Á2 \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePikeLobby/border.bin b/data/maps/BattleFrontier_BattlePikeLobby/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattleFrontier_BattlePikeLobby/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattlePikeLobby/header.inc b/data/maps/BattleFrontier_BattlePikeLobby/header.inc index 2b7709152..96d249ab9 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePikeLobby: @ 84854F4 - .4byte BattleFrontier_BattlePikeLobby_MapAttributes + .4byte BattleFrontier_BattlePikeLobby_Layout .4byte BattleFrontier_BattlePikeLobby_MapEvents .4byte BattleFrontier_BattlePikeLobby_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeLobby/map.bin b/data/maps/BattleFrontier_BattlePikeLobby/map.bin deleted file mode 100644 index 4cbdfb405..000000000 --- a/data/maps/BattleFrontier_BattlePikeLobby/map.bin +++ /dev/null @@ -1 +0,0 @@ -¦6§6 6¡¢6£6¤6¥6¦6§6 6®6¯¨6©ª6«6¬6­6®6¯¨6*+,±²³´µ(·)2342º»2¼20¿1:3;3<32Ô2283Ô293Ä2Ô2Â2Ô2 Â2 Ô2Â2Â2Â2Ä22Â2Â2 3!3"3Â2Â22Â22 Â22Â2Â2Â22Â2 2 Ô2Â2 Â2Â2Â2 Â2Ô2 Õ22Â2Ô2Â2Â2Â2Ô2Â22Ô2Ä2 Â2Â2Â2Â2Â2Â2Â2 Â2Ä2Ô2Â22í2î2ï22Â2Ô2Â2Ä2Â2Â2 333 Â2Â2Â2 \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/border.bin b/data/maps/BattleFrontier_BattlePikeRandomRoom1/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattleFrontier_BattlePikeRandomRoom1/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc index 89c74c18a..58a662bb3 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePikeRandomRoom1: @ 8485548 - .4byte BattleFrontier_BattlePikeRandomRoom1_MapAttributes + .4byte BattleFrontier_BattlePikeRandomRoom1_Layout .4byte BattleFrontier_BattlePikeRandomRoom1_MapEvents .4byte BattleFrontier_BattlePikeRandomRoom1_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.bin b/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.bin deleted file mode 100644 index 142150cbe..000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.bin +++ /dev/null @@ -1 +0,0 @@ -§ ¡¢£¤¥¦§¯¨©ª«¬­®¯·°±²6³6´6µ¶·¿6¸6Û6º6»2¼6Û6¾6¿6Ù2Ú2,ã2ä2å2,Ú2Ú2Ã2Á2Ú2Þ2ü2ß2Ú2Á2Á2Ã2Á23Þ2ü2ß23Á2Á2Ã2Á2-æ2è2ç2-Á2Á2 \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/border.bin b/data/maps/BattleFrontier_BattlePikeRandomRoom2/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattleFrontier_BattlePikeRandomRoom2/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc index 425df7bcb..5dde0fc15 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePikeRandomRoom2: @ 8485564 - .4byte BattleFrontier_BattlePikeRandomRoom2_MapAttributes + .4byte BattleFrontier_BattlePikeRandomRoom2_Layout .4byte BattleFrontier_BattlePikeRandomRoom2_MapEvents .4byte BattleFrontier_BattlePikeRandomRoom2_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.bin b/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.bin deleted file mode 100644 index 27a6e52aa..000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.bin +++ /dev/null @@ -1 +0,0 @@ -¥6¦6§6 6¡6­6®6¯6¨6©6µ6¶6·6°6±652¾¿¸52=@3A3B3=Ù2H3I3J3Ú242P3Q3R3Ý2<X3Y3Z3ù \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/border.bin b/data/maps/BattleFrontier_BattlePikeRandomRoom3/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattleFrontier_BattlePikeRandomRoom3/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc index e3518c68b..1d8848d23 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePikeRandomRoom3: @ 8485580 - .4byte BattleFrontier_BattlePikeRandomRoom3_MapAttributes + .4byte BattleFrontier_BattlePikeRandomRoom3_Layout .4byte BattleFrontier_BattlePikeRandomRoom3_MapEvents .4byte BattleFrontier_BattlePikeRandomRoom3_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.bin b/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.bin deleted file mode 100644 index 8ce7f1c37..000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.bin +++ /dev/null @@ -1 +0,0 @@ -§ ¡¢£¤¥¦§¯¨©ª«¬­®¯·°±²6³6´6µ¶·¿6¸6Û2º6»2¼6Û2¾6¿Ù2Ú2Üã2ä2å2ÜÚ2Ú242Ý2 3æ2è2ç2 3Ý2Ý2>ùùÁ2Á2Á2ùùù72 3 3Ý2Ý2Ý2 3 3Ú2>ùùùùùùùÁ2Ù2 3 3 3 3 3 3 3Ý2Ã2ùùùùùùùù42 3 3 3 3 3 3Ú2 3>ùùùùùùÁ2ù3Ú2 3 3 3 3 3Ý2 3>Á2ùùùùùùù72Ý2 3 3 3 3 3Ú2 3>ùùùùùùÁ2ù3 3Ú2Ú2Ú2Ú2Ú2Ý2 3>ù3ã2ä2å23ùùÙ2Ú2æ2è2ç2Ú2Ú2 \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/border.bin b/data/maps/BattleFrontier_BattlePikeThreePathRoom/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattleFrontier_BattlePikeThreePathRoom/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc index a9e768832..b1178e0a0 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePikeThreePathRoom: @ 848552C - .4byte BattleFrontier_BattlePikeThreePathRoom_MapAttributes + .4byte BattleFrontier_BattlePikeThreePathRoom_Layout .4byte BattleFrontier_BattlePikeThreePathRoom_MapEvents .4byte BattleFrontier_BattlePikeThreePathRoom_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.bin b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.bin deleted file mode 100644 index 9618fe22a..000000000 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.bin +++ /dev/null @@ -1 +0,0 @@ -¡¢£¤¡¢£¤¡¢£¤¥©ª«¬©ª«¬©ª«¬­±6²³´±²³´±²³´µÛ6º»2¼Û6º»2¼Û6º»2¼Û6Üã2ä2å2Üã2ä2å2Üã2ä2å2ÜÙ2æ2è2ç2Ú2æ2è2ç2Ú2æ2è2ç2Ú2Ã2Á2Á2Á2Á2Á2Á2Á2Á2Á2Á2Á2Á2Ã2Á2Á2Á2Á2Á2Á2Á2Á2Á2Á2Á2Á2Ã2Á2Á2Á2Á2Á2Á2Á2Á2Á2Á2Á2Á2Ã2Á2Á23Á2Á2Á2Á23Á2Á2Á2Á2Ã2Á2Á2-à2á2á2â2-Á2Á2Á2Á2 \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/border.bin b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc index 150d9cc03..069dc6f76 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4 - .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapAttributes + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Layout .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapEvents .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.bin b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.bin deleted file mode 100644 index 62d5761e0..000000000 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -àáâàáâàáâàáâàáøèéêðùú  -ûüòèéºÀÁ†ýþ  †ºÀ·Ž¹¸†¸¹¸†Ì¹¸–¸¹†Í¸¹¸¹¸¹†Í¸¹ž¹¸†¦ÓÔÓÔÓԆ̹¸Í¸¹øòòòòòòòü͸¹Ž¹¸ÁÀÁÀÁÀÁÀÁÕ¹¸ž¸¹¸¹¸¹¸¹¸¹¸¹¸¹Í¸¹¸¹mno¹¸¹¸¹Í¸¹¸uvw¸¹¸¹ \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/border.bin b/data/maps/BattleFrontier_BattlePyramidEmptySquare/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattleFrontier_BattlePyramidEmptySquare/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc index ead91f494..f2eccb9f4 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePyramidEmptySquare: @ 8485414 - .4byte BattleFrontier_BattlePyramidEmptySquare_MapAttributes + .4byte BattleFrontier_BattlePyramidEmptySquare_Layout .4byte BattleFrontier_BattlePyramidEmptySquare_MapEvents .4byte BattleFrontier_BattlePyramidEmptySquare_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.bin b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.bin deleted file mode 100644 index 7c224d524..000000000 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.bin +++ /dev/null @@ -1 +0,0 @@ -22222222222222222222222222222222 \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/border.bin b/data/maps/BattleFrontier_BattlePyramidLobby/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattleFrontier_BattlePyramidLobby/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc index ab9d35d81..ed68e86c7 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePyramidLobby: @ 84853F8 - .4byte BattleFrontier_BattlePyramidLobby_MapAttributes + .4byte BattleFrontier_BattlePyramidLobby_Layout .4byte BattleFrontier_BattlePyramidLobby_MapEvents .4byte BattleFrontier_BattlePyramidLobby_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/map.bin b/data/maps/BattleFrontier_BattlePyramidLobby/map.bin deleted file mode 100644 index 32f23d3de..000000000 --- a/data/maps/BattleFrontier_BattlePyramidLobby/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -FF F -FFFFFFFF F!F"FFFFFFFFFFFFF(F)F*FFFFFFFFFFFFFF0FFFFFF+FFFFF+FF0FFFFFF3FF F B F3FF0FFFBBF BF B B B B BF B1FBBBBB B B B B B B B B BBBB B B B B B B B B B B B B B B B B B BFFF#F$B%FFFF B B B B B BFFF#F$B%FFFF B B BFFF#F$B%FFFFFFFÊËÌFFÈ#F$B%FFFFFFÒÓÔFFÐ#F$B%FFFFF&FÚÛÜ B BØÀBÁBÂB B B B B.B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B BÃBÄBÅB B B B B B B \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePyramidTop/border.bin b/data/maps/BattleFrontier_BattlePyramidTop/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattleFrontier_BattlePyramidTop/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattlePyramidTop/header.inc b/data/maps/BattleFrontier_BattlePyramidTop/header.inc index fe3964510..9e9508e7e 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePyramidTop: @ 8485430 - .4byte BattleFrontier_BattlePyramidTop_MapAttributes + .4byte BattleFrontier_BattlePyramidTop_Layout .4byte BattleFrontier_BattlePyramidTop_MapEvents .4byte BattleFrontier_BattlePyramidTop_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattlePyramidTop/map.bin b/data/maps/BattleFrontier_BattlePyramidTop/map.bin deleted file mode 100644 index dba9cf1b0..000000000 --- a/data/maps/BattleFrontier_BattlePyramidTop/map.bin +++ /dev/null @@ -1 +0,0 @@ -}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}…………………………………………………………………………………………;;;;;;;;;;;;;;;xyz{|;;;;;;;;;;;;;;;;;;;;;;;;;;;;;€‚ƒ„;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ˆ‰Š‹Œ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;‘’“”;;;;;;;;;;;;;;;;;;;;;;;;;;;;;˜™BšB›Bœ;;;;;;;;;;;;;;;;;;;;;;;;;;;;8b9b@BABBB9b:b;;;;;;;;;;;;;;;;;;;;;;;;;8B9B@bAb@BIBJBAbBb9B:B;;;;;;;;;;;CCCCCCCCCC8b9b@BABHbAbPQRAbBbABBB9bFbCCCCCCCCCKKKKKKKKLBMB@bAbHBAB@bIbXbYbXbIbBbABBBAbBbMBNBKKKKKKKSSSSSSTU@BAB@bIb@BIBPZZQZZRIBBBAbBbABBBUVSSSSS[[[[\]@AHBAB@bIb@BIBXBXBXBYBXBXBXBIBBBIbBbABBBAB]^[[[[[\]@A@AHBAB@bIbPZZZZQZZZZRIbBbIBBBIBAB]^[\^@A@AHA@BAB@bIbXbXbXbXbXbYbXbXbXbXbXbIbBbIBBBIBIBAB^@B@AHAHA@BABPZZZZZZQZZZZZZRIBBBIBIBIBBHAHAHA@AHBABXBXBXBXBXBXBXBYBXBXBXBXBXBXBXBIBBBIBIBIBIHAHA@AHAPZZZZZZZZZZZZZZZZZRIBIBIBI@A@AHAHAXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBIBIBIBIHAHAHAPZZZZZZZZZZZZZZZZZZZZZRIBIBIHAHAHAXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBIBIBIHAHAPZZZZZZZZZZZZZZZZZZZZZZZZZRIBI \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/border.bin b/data/maps/BattleFrontier_BattleTowerBattleRoom/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattleFrontier_BattleTowerBattleRoom/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc index bc54d421a..32b789720 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleTowerBattleRoom: @ 848521C - .4byte BattleFrontier_BattleTowerBattleRoom_MapAttributes + .4byte BattleFrontier_BattleTowerBattleRoom_Layout .4byte BattleFrontier_BattleTowerBattleRoom_MapEvents .4byte BattleFrontier_BattleTowerBattleRoom_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.bin b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.bin deleted file mode 100644 index 42d99b5a6..000000000 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.bin +++ /dev/null @@ -1 +0,0 @@ -///LMMN///?77TU2U2V77?G<2<2<2<2<2<2<2<2;2:2H2B2I2J2B2K2:2:2;2:2D2P2Q2R2S2E2:2:2;2:2D2X2Y2Z2[2E2:2:2;2:2D2`2a2b2c2E2:2:2~2:2@2C21292C2A2:2>2:2:2:222:2:2:2F \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc index b9e17e9aa..a9eb2b2c5 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleTowerBattleRoom2: @ 8485318 - .4byte BattleFrontier_BattleTowerBattleRoom2_MapAttributes + .4byte BattleFrontier_BattleTowerBattleRoom_Layout .4byte BattleFrontier_BattleTowerBattleRoom2_MapEvents .4byte BattleFrontier_BattleTowerBattleRoom2_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/border.bin b/data/maps/BattleFrontier_BattleTowerCorridor/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattleFrontier_BattleTowerCorridor/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc index f72c8fe29..361e6be03 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleTowerCorridor: @ 8485200 - .4byte BattleFrontier_BattleTowerCorridor_MapAttributes + .4byte BattleFrontier_BattleTowerCorridor_Layout .4byte BattleFrontier_BattleTowerCorridor_MapEvents .4byte BattleFrontier_BattleTowerCorridor_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/map.bin b/data/maps/BattleFrontier_BattleTowerCorridor/map.bin deleted file mode 100644 index 0b0803f91..000000000 Binary files a/data/maps/BattleFrontier_BattleTowerCorridor/map.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/border.bin b/data/maps/BattleFrontier_BattleTowerCorridor2/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattleFrontier_BattleTowerCorridor2/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc index 6332bc83b..ccdcb013f 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleTowerCorridor2: @ 84852FC - .4byte BattleFrontier_BattleTowerCorridor2_MapAttributes + .4byte BattleFrontier_BattleTowerCorridor2_Layout .4byte BattleFrontier_BattleTowerCorridor2_MapEvents .4byte BattleFrontier_BattleTowerCorridor2_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/map.bin b/data/maps/BattleFrontier_BattleTowerCorridor2/map.bin deleted file mode 100644 index 87e93b640..000000000 Binary files a/data/maps/BattleFrontier_BattleTowerCorridor2/map.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattleTowerElevator/border.bin b/data/maps/BattleFrontier_BattleTowerElevator/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattleFrontier_BattleTowerElevator/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattleTowerElevator/header.inc b/data/maps/BattleFrontier_BattleTowerElevator/header.inc index 1dd6b495e..112c7f938 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/header.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleTowerElevator: @ 84851E4 - .4byte BattleFrontier_BattleTowerElevator_MapAttributes + .4byte BattleElevator_Layout .4byte BattleFrontier_BattleTowerElevator_MapEvents .4byte BattleFrontier_BattleTowerElevator_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerElevator/map.bin b/data/maps/BattleFrontier_BattleTowerElevator/map.bin deleted file mode 100644 index 16dfe34ab..000000000 --- a/data/maps/BattleFrontier_BattleTowerElevator/map.bin +++ /dev/null @@ -1 +0,0 @@ -(***,011148999<\2]2]2]2]2d2e2e2e2e2d2e2e2e2e2d2O2W2e2e2 \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleTowerLobby/border.bin b/data/maps/BattleFrontier_BattleTowerLobby/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattleFrontier_BattleTowerLobby/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattleTowerLobby/header.inc b/data/maps/BattleFrontier_BattleTowerLobby/header.inc index 94d43eb89..6e0e3b470 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/header.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleTowerLobby: @ 84851C8 - .4byte BattleFrontier_BattleTowerLobby_MapAttributes + .4byte BattleFrontier_BattleTowerLobby_Layout .4byte BattleFrontier_BattleTowerLobby_MapEvents .4byte BattleFrontier_BattleTowerLobby_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerLobby/map.bin b/data/maps/BattleFrontier_BattleTowerLobby/map.bin deleted file mode 100644 index 77926803a..000000000 Binary files a/data/maps/BattleFrontier_BattleTowerLobby/map.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/border.bin b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc index 293fd6418..cc55ae591 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleTowerMultiBattleRoom: @ 84852E0 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapAttributes + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Layout .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapEvents .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.bin b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.bin deleted file mode 100644 index b0a58e016..000000000 Binary files a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_Lounge1/border.bin b/data/maps/BattleFrontier_Lounge1/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattleFrontier_Lounge1/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_Lounge1/header.inc b/data/maps/BattleFrontier_Lounge1/header.inc index 97eb721b6..44acc4b6a 100644 --- a/data/maps/BattleFrontier_Lounge1/header.inc +++ b/data/maps/BattleFrontier_Lounge1/header.inc @@ -1,5 +1,5 @@ BattleFrontier_Lounge1: @ 84855B8 - .4byte BattleFrontier_Lounge1_MapAttributes + .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge1_MapEvents .4byte BattleFrontier_Lounge1_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_Lounge1/map.bin b/data/maps/BattleFrontier_Lounge1/map.bin deleted file mode 100644 index f5f1745b1..000000000 --- a/data/maps/BattleFrontier_Lounge1/map.bin +++ /dev/null @@ -1 +0,0 @@ -½¾¿¾¾¿¾¿ÆÆÇÆ•ÆÇÆÇ×ÎÏÎÎÏÎÏÝÈÉÈ¥ÈÉÈÚíÉïÉÈÉßÉàÝÈ÷ÈÉÈçÈèåÉßÉÈÉïÉÚíÈçÈÉÈ÷ÈèÑÉÈÉÈÉÈÉÈÑɬ­®ÉÈ \ No newline at end of file diff --git a/data/maps/BattleFrontier_Lounge2/border.bin b/data/maps/BattleFrontier_Lounge2/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattleFrontier_Lounge2/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_Lounge2/header.inc b/data/maps/BattleFrontier_Lounge2/header.inc index b5a1367b5..69a6dba30 100644 --- a/data/maps/BattleFrontier_Lounge2/header.inc +++ b/data/maps/BattleFrontier_Lounge2/header.inc @@ -1,5 +1,5 @@ BattleFrontier_Lounge2: @ 84855F0 - .4byte BattleFrontier_Lounge2_MapAttributes + .4byte BattleFrontier_Lounge1_Layout .4byte BattleFrontier_Lounge2_MapEvents .4byte BattleFrontier_Lounge2_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_Lounge2/map.bin b/data/maps/BattleFrontier_Lounge2/map.bin deleted file mode 100644 index 11ae8d6ee..000000000 --- a/data/maps/BattleFrontier_Lounge2/map.bin +++ /dev/null @@ -1 +0,0 @@ -½¾½¾¿½¤¾½½½½½ÅÆÇÆÇÆÆÇÆÇÆÅÐ3ÎÏÎÏÎ¥3ÎÏÎÏÎÊ3Ý3È3÷3È3ç3È3Ü3È3É3È3ç3È3Ú3å3É3ï3É3ß3É3äÉ3ï3É3ß3É3à3í3È3É3È3É3È3Ü3È3÷3È3ç3È3è3Ñ3É3È3É3È3É3äÉ3ï3É3ß3É3È3µ3¶3È3É3È3É3È3É3È3É3È3 \ No newline at end of file diff --git a/data/maps/BattleFrontier_Lounge3/header.inc b/data/maps/BattleFrontier_Lounge3/header.inc index 21cd2cc38..3a18ce347 100644 --- a/data/maps/BattleFrontier_Lounge3/header.inc +++ b/data/maps/BattleFrontier_Lounge3/header.inc @@ -1,5 +1,5 @@ BattleFrontier_Lounge3: @ 848560C - .4byte BattleFrontier_Lounge3_MapAttributes + .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge3_MapEvents .4byte BattleFrontier_Lounge3_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_Lounge4/header.inc b/data/maps/BattleFrontier_Lounge4/header.inc index e550557ca..e052e6ce6 100644 --- a/data/maps/BattleFrontier_Lounge4/header.inc +++ b/data/maps/BattleFrontier_Lounge4/header.inc @@ -1,5 +1,5 @@ BattleFrontier_Lounge4: @ 8485628 - .4byte BattleFrontier_Lounge4_MapAttributes + .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge4_MapEvents .4byte BattleFrontier_Lounge4_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_Lounge5/header.inc b/data/maps/BattleFrontier_Lounge5/header.inc index dbe0afa67..a6fa1470f 100644 --- a/data/maps/BattleFrontier_Lounge5/header.inc +++ b/data/maps/BattleFrontier_Lounge5/header.inc @@ -1,5 +1,5 @@ BattleFrontier_Lounge5: @ 8485660 - .4byte BattleFrontier_Lounge5_MapAttributes + .4byte BattleFrontier_Lounge1_Layout .4byte BattleFrontier_Lounge5_MapEvents .4byte BattleFrontier_Lounge5_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_Lounge6/header.inc b/data/maps/BattleFrontier_Lounge6/header.inc index c41376cfd..ec6cfb105 100644 --- a/data/maps/BattleFrontier_Lounge6/header.inc +++ b/data/maps/BattleFrontier_Lounge6/header.inc @@ -1,5 +1,5 @@ BattleFrontier_Lounge6: @ 848567C - .4byte BattleFrontier_Lounge6_MapAttributes + .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge6_MapEvents .4byte BattleFrontier_Lounge6_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_Lounge7/header.inc b/data/maps/BattleFrontier_Lounge7/header.inc index 0348fd64c..5124822a8 100644 --- a/data/maps/BattleFrontier_Lounge7/header.inc +++ b/data/maps/BattleFrontier_Lounge7/header.inc @@ -1,5 +1,5 @@ BattleFrontier_Lounge7: @ 8485698 - .4byte BattleFrontier_Lounge7_MapAttributes + .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge7_MapEvents .4byte BattleFrontier_Lounge7_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_Lounge8/header.inc b/data/maps/BattleFrontier_Lounge8/header.inc index 9ec0f336f..46fe25e2d 100644 --- a/data/maps/BattleFrontier_Lounge8/header.inc +++ b/data/maps/BattleFrontier_Lounge8/header.inc @@ -1,5 +1,5 @@ BattleFrontier_Lounge8: @ 84856D0 - .4byte BattleFrontier_Lounge8_MapAttributes + .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge8_MapEvents .4byte BattleFrontier_Lounge8_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_Lounge9/header.inc b/data/maps/BattleFrontier_Lounge9/header.inc index d88f40095..24e7b3005 100644 --- a/data/maps/BattleFrontier_Lounge9/header.inc +++ b/data/maps/BattleFrontier_Lounge9/header.inc @@ -1,5 +1,5 @@ BattleFrontier_Lounge9: @ 84856EC - .4byte BattleFrontier_Lounge9_MapAttributes + .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge9_MapEvents .4byte BattleFrontier_Lounge9_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_Mart/header.inc b/data/maps/BattleFrontier_Mart/header.inc index b0cd11e40..1067fc70c 100644 --- a/data/maps/BattleFrontier_Mart/header.inc +++ b/data/maps/BattleFrontier_Mart/header.inc @@ -1,5 +1,5 @@ BattleFrontier_Mart: @ 8485740 - .4byte BattleFrontier_Mart_MapAttributes + .4byte Mart_Layout .4byte BattleFrontier_Mart_MapEvents .4byte BattleFrontier_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_OutsideEast/border.bin b/data/maps/BattleFrontier_OutsideEast/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/BattleFrontier_OutsideEast/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/BattleFrontier_OutsideEast/header.inc b/data/maps/BattleFrontier_OutsideEast/header.inc index f40bfc1f3..f9dc82cba 100644 --- a/data/maps/BattleFrontier_OutsideEast/header.inc +++ b/data/maps/BattleFrontier_OutsideEast/header.inc @@ -1,5 +1,5 @@ BattleFrontier_OutsideEast: @ 84852C4 - .4byte BattleFrontier_OutsideEast_MapAttributes + .4byte BattleFrontier_OutsideEast_Layout .4byte BattleFrontier_OutsideEast_MapEvents .4byte BattleFrontier_OutsideEast_MapScripts .4byte BattleFrontier_OutsideEast_MapConnections diff --git a/data/maps/BattleFrontier_OutsideEast/map.bin b/data/maps/BattleFrontier_OutsideEast/map.bin deleted file mode 100644 index b073c4585..000000000 Binary files a/data/maps/BattleFrontier_OutsideEast/map.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_OutsideWest/border.bin b/data/maps/BattleFrontier_OutsideWest/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/BattleFrontier_OutsideWest/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/BattleFrontier_OutsideWest/header.inc b/data/maps/BattleFrontier_OutsideWest/header.inc index 24f1ce14b..319ecec6a 100644 --- a/data/maps/BattleFrontier_OutsideWest/header.inc +++ b/data/maps/BattleFrontier_OutsideWest/header.inc @@ -1,5 +1,5 @@ BattleFrontier_OutsideWest: @ 84851AC - .4byte BattleFrontier_OutsideWest_MapAttributes + .4byte BattleFrontier_OutsideWest_Layout .4byte BattleFrontier_OutsideWest_MapEvents .4byte BattleFrontier_OutsideWest_MapScripts .4byte BattleFrontier_OutsideWest_MapConnections diff --git a/data/maps/BattleFrontier_OutsideWest/map.bin b/data/maps/BattleFrontier_OutsideWest/map.bin deleted file mode 100644 index d43111bda..000000000 Binary files a/data/maps/BattleFrontier_OutsideWest/map.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc index 561aba67e..22e3ff616 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ BattleFrontier_PokemonCenter_1F: @ 8485708 - .4byte BattleFrontier_PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte BattleFrontier_PokemonCenter_1F_MapEvents .4byte BattleFrontier_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc index 6aa965d08..361c58a04 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ BattleFrontier_PokemonCenter_2F: @ 8485724 - .4byte BattleFrontier_PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte BattleFrontier_PokemonCenter_2F_MapEvents .4byte BattleFrontier_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_RankingHall/border.bin b/data/maps/BattleFrontier_RankingHall/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattleFrontier_RankingHall/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_RankingHall/header.inc b/data/maps/BattleFrontier_RankingHall/header.inc index b068fbacc..340ba9597 100644 --- a/data/maps/BattleFrontier_RankingHall/header.inc +++ b/data/maps/BattleFrontier_RankingHall/header.inc @@ -1,5 +1,5 @@ BattleFrontier_RankingHall: @ 848559C - .4byte BattleFrontier_RankingHall_MapAttributes + .4byte BattleFrontier_RankingHall_Layout .4byte BattleFrontier_RankingHall_MapEvents .4byte BattleFrontier_RankingHall_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_RankingHall/map.bin b/data/maps/BattleFrontier_RankingHall/map.bin deleted file mode 100644 index df32e0665..000000000 --- a/data/maps/BattleFrontier_RankingHall/map.bin +++ /dev/null @@ -1,64 +0,0 @@ -(((((00000((((($88888%(((((00000&'2222222&'00000$88888%A2 2 -2 2 -22 -2 2 -2 2F2$88888%2222222I222222222N22222222&' 2 2 -22 -2 2 -2&'((("# 2 2 -2 2 -2 2 -2 2 -2 2 -2"#(((&' 2 -2 22 2 -2 2&'+22222222220P02222222222222220Q0222222222232 2 -22 -2 2 -22 -2 2 -2$8X8% 2 2 -2 2 2K2L2M2 2 2 -2 2 -2$8Y8% 2 2 -22 -2 2 -22 -2 2 -2+22222222222222222222STU2222222222222222222232 2 -2 2 -2 2 -2 2 -2 2 -2 2 -2 2 -2 2 -2 2 -2 2 -2 2[2\2]2 2 -2 2 -2 2 -2 2 -2 2 -2 2 -2 2 -2 2 -2 2 -2 2 -2 2 -22222222222222222222222222222222222222,2-2 -2 2 -2.2/2 -2 2 -2 2 -2 2 -2 2 -2 2 -2 -2;2 -2;2 -2;2 -242522226272222222222222C22C22C22 -2 2 -200 2 -2 \ No newline at end of file diff --git a/data/maps/BattleFrontier_ReceptionGate/border.bin b/data/maps/BattleFrontier_ReceptionGate/border.bin deleted file mode 100644 index 9afd13cdc..000000000 Binary files a/data/maps/BattleFrontier_ReceptionGate/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_ReceptionGate/header.inc b/data/maps/BattleFrontier_ReceptionGate/header.inc index 32387ef0d..8f395bae4 100644 --- a/data/maps/BattleFrontier_ReceptionGate/header.inc +++ b/data/maps/BattleFrontier_ReceptionGate/header.inc @@ -1,5 +1,5 @@ BattleFrontier_ReceptionGate: @ 84856B4 - .4byte BattleFrontier_ReceptionGate_MapAttributes + .4byte BattleFrontier_ReceptionGate_Layout .4byte BattleFrontier_ReceptionGate_MapEvents .4byte BattleFrontier_ReceptionGate_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_ReceptionGate/map.bin b/data/maps/BattleFrontier_ReceptionGate/map.bin deleted file mode 100644 index 2b75ea851..000000000 Binary files a/data/maps/BattleFrontier_ReceptionGate/map.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_ScottsHouse/border.bin b/data/maps/BattleFrontier_ScottsHouse/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattleFrontier_ScottsHouse/border.bin and /dev/null differ diff --git a/data/maps/BattleFrontier_ScottsHouse/header.inc b/data/maps/BattleFrontier_ScottsHouse/header.inc index 1ac7c9524..f0e0be773 100644 --- a/data/maps/BattleFrontier_ScottsHouse/header.inc +++ b/data/maps/BattleFrontier_ScottsHouse/header.inc @@ -1,5 +1,5 @@ BattleFrontier_ScottsHouse: @ 8485644 - .4byte BattleFrontier_ScottsHouse_MapAttributes + .4byte BattleFrontier_ScottsHouse_Layout .4byte BattleFrontier_ScottsHouse_MapEvents .4byte BattleFrontier_ScottsHouse_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_ScottsHouse/map.bin b/data/maps/BattleFrontier_ScottsHouse/map.bin deleted file mode 100644 index 8844e94dd..000000000 --- a/data/maps/BattleFrontier_ScottsHouse/map.bin +++ /dev/null @@ -1 +0,0 @@ -»¼»¼»¼ÃÄÃÄÃÄÐËÊËÊËÒÈÉÈÉßÑÉÈÉÈÜÒÈÉÈÉäÑÉÈÉÈÉѵ3¶3É \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare01/border.bin b/data/maps/BattlePyramidSquare01/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattlePyramidSquare01/border.bin and /dev/null differ diff --git a/data/maps/BattlePyramidSquare01/header.inc b/data/maps/BattlePyramidSquare01/header.inc index 94605c92c..7ed6b181b 100644 --- a/data/maps/BattlePyramidSquare01/header.inc +++ b/data/maps/BattlePyramidSquare01/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare01: @ 8484F60 - .4byte BattlePyramidSquare01_MapAttributes + .4byte BattlePyramidSquare01_Layout .4byte BattlePyramidSquare01_MapEvents .4byte BattlePyramidSquare01_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare01/map.bin b/data/maps/BattlePyramidSquare01/map.bin deleted file mode 100644 index 586ccbdbd..000000000 --- a/data/maps/BattlePyramidSquare01/map.bin +++ /dev/null @@ -1 +0,0 @@ -BBBBBBBBBBBBBBaBB`tjBBsBBsBBBBsBBsBŽBBBsBBsBBhtrBBqBBBBBBBBBBBBBB \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare02/border.bin b/data/maps/BattlePyramidSquare02/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattlePyramidSquare02/border.bin and /dev/null differ diff --git a/data/maps/BattlePyramidSquare02/header.inc b/data/maps/BattlePyramidSquare02/header.inc index 44a5e7a99..9eb6ef754 100644 --- a/data/maps/BattlePyramidSquare02/header.inc +++ b/data/maps/BattlePyramidSquare02/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare02: @ 8484F7C - .4byte BattlePyramidSquare02_MapAttributes + .4byte BattlePyramidSquare02_Layout .4byte BattlePyramidSquare02_MapEvents .4byte BattlePyramidSquare02_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare02/map.bin b/data/maps/BattlePyramidSquare02/map.bin deleted file mode 100644 index 5a9b8d4ce..000000000 --- a/data/maps/BattlePyramidSquare02/map.bin +++ /dev/null @@ -1 +0,0 @@ -BBhtttjBBBBBBBBBBBBBBBBBaBBBBBaBsBBŽBBqBsBBBBBBBsBBBBBBBptjBhjBB \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare03/border.bin b/data/maps/BattlePyramidSquare03/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattlePyramidSquare03/border.bin and /dev/null differ diff --git a/data/maps/BattlePyramidSquare03/header.inc b/data/maps/BattlePyramidSquare03/header.inc index 300825ffa..3f07295ae 100644 --- a/data/maps/BattlePyramidSquare03/header.inc +++ b/data/maps/BattlePyramidSquare03/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare03: @ 8484F98 - .4byte BattlePyramidSquare03_MapAttributes + .4byte BattlePyramidSquare03_Layout .4byte BattlePyramidSquare03_MapEvents .4byte BattlePyramidSquare03_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare03/map.bin b/data/maps/BattlePyramidSquare03/map.bin deleted file mode 100644 index 903b8a49b..000000000 --- a/data/maps/BattlePyramidSquare03/map.bin +++ /dev/null @@ -1 +0,0 @@ -BBBBBBBBBaBBBBBBBsBBBBaBBsBBBBqBhkjBBBBBBBBBBBaBB`ttttrBŽBqBBBBBB \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare04/border.bin b/data/maps/BattlePyramidSquare04/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattlePyramidSquare04/border.bin and /dev/null differ diff --git a/data/maps/BattlePyramidSquare04/header.inc b/data/maps/BattlePyramidSquare04/header.inc index 4031f62e3..978c4f466 100644 --- a/data/maps/BattlePyramidSquare04/header.inc +++ b/data/maps/BattlePyramidSquare04/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare04: @ 8484FB4 - .4byte BattlePyramidSquare04_MapAttributes + .4byte BattlePyramidSquare04_Layout .4byte BattlePyramidSquare04_MapEvents .4byte BattlePyramidSquare04_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare04/map.bin b/data/maps/BattlePyramidSquare04/map.bin deleted file mode 100644 index 32a264546..000000000 --- a/data/maps/BattlePyramidSquare04/map.bin +++ /dev/null @@ -1 +0,0 @@ -BBBBBBBBB`ttttjBBsBBBBBBBqBBBBBBBBBBBBBBBaBBBBBBBqBBBBŽBBBBBBBBBB \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare05/border.bin b/data/maps/BattlePyramidSquare05/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattlePyramidSquare05/border.bin and /dev/null differ diff --git a/data/maps/BattlePyramidSquare05/header.inc b/data/maps/BattlePyramidSquare05/header.inc index 72575d629..09a7e4703 100644 --- a/data/maps/BattlePyramidSquare05/header.inc +++ b/data/maps/BattlePyramidSquare05/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare05: @ 8484FD0 - .4byte BattlePyramidSquare05_MapAttributes + .4byte BattlePyramidSquare05_Layout .4byte BattlePyramidSquare05_MapEvents .4byte BattlePyramidSquare05_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare05/map.bin b/data/maps/BattlePyramidSquare05/map.bin deleted file mode 100644 index d6c5a6897..000000000 --- a/data/maps/BattlePyramidSquare05/map.bin +++ /dev/null @@ -1 +0,0 @@ -BBBBBBBBBhbBBBBBBBsBBaBBBBsBBsBBBBsBBsBBBBqBBsBBBBŽBBpjBBBBBBBBB \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare06/border.bin b/data/maps/BattlePyramidSquare06/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattlePyramidSquare06/border.bin and /dev/null differ diff --git a/data/maps/BattlePyramidSquare06/header.inc b/data/maps/BattlePyramidSquare06/header.inc index 8d0fa49b1..e99531da8 100644 --- a/data/maps/BattlePyramidSquare06/header.inc +++ b/data/maps/BattlePyramidSquare06/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare06: @ 8484FEC - .4byte BattlePyramidSquare06_MapAttributes + .4byte BattlePyramidSquare06_Layout .4byte BattlePyramidSquare06_MapEvents .4byte BattlePyramidSquare06_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare06/map.bin b/data/maps/BattlePyramidSquare06/map.bin deleted file mode 100644 index c30533aab..000000000 --- a/data/maps/BattlePyramidSquare06/map.bin +++ /dev/null @@ -1 +0,0 @@ -BBBBBBBBBaBhjBaBBsBBBBqBBqBBBBBBBBBŽBBaBBaBBBBsBBqBhjBqBBBBBBBBB \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare07/border.bin b/data/maps/BattlePyramidSquare07/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattlePyramidSquare07/border.bin and /dev/null differ diff --git a/data/maps/BattlePyramidSquare07/header.inc b/data/maps/BattlePyramidSquare07/header.inc index 12c74516a..13c23c24b 100644 --- a/data/maps/BattlePyramidSquare07/header.inc +++ b/data/maps/BattlePyramidSquare07/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare07: @ 8485008 - .4byte BattlePyramidSquare07_MapAttributes + .4byte BattlePyramidSquare07_Layout .4byte BattlePyramidSquare07_MapEvents .4byte BattlePyramidSquare07_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare07/map.bin b/data/maps/BattlePyramidSquare07/map.bin deleted file mode 100644 index 25f9c1529..000000000 --- a/data/maps/BattlePyramidSquare07/map.bin +++ /dev/null @@ -1 +0,0 @@ -ŽBaBBBBBBBsBBaBaBhrBBqBsBBBBBBBqBBBBBaBBhttttrBaBBBBBBBsBBBBBBBq \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare08/border.bin b/data/maps/BattlePyramidSquare08/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattlePyramidSquare08/border.bin and /dev/null differ diff --git a/data/maps/BattlePyramidSquare08/header.inc b/data/maps/BattlePyramidSquare08/header.inc index cfe221f4b..a12b6016e 100644 --- a/data/maps/BattlePyramidSquare08/header.inc +++ b/data/maps/BattlePyramidSquare08/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare08: @ 8485024 - .4byte BattlePyramidSquare08_MapAttributes + .4byte BattlePyramidSquare08_Layout .4byte BattlePyramidSquare08_MapEvents .4byte BattlePyramidSquare08_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare08/map.bin b/data/maps/BattlePyramidSquare08/map.bin deleted file mode 100644 index 86a830696..000000000 --- a/data/maps/BattlePyramidSquare08/map.bin +++ /dev/null @@ -1 +0,0 @@ -BBttttjBBBBBBBBBsBBBBBBasBBŽBBBssBBBBBBssBBBBBBsqBBBBBBqBBhttjB \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare09/border.bin b/data/maps/BattlePyramidSquare09/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattlePyramidSquare09/border.bin and /dev/null differ diff --git a/data/maps/BattlePyramidSquare09/header.inc b/data/maps/BattlePyramidSquare09/header.inc index 624b64800..486c74bc0 100644 --- a/data/maps/BattlePyramidSquare09/header.inc +++ b/data/maps/BattlePyramidSquare09/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare09: @ 8485040 - .4byte BattlePyramidSquare09_MapAttributes + .4byte BattlePyramidSquare09_Layout .4byte BattlePyramidSquare09_MapEvents .4byte BattlePyramidSquare09_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare09/map.bin b/data/maps/BattlePyramidSquare09/map.bin deleted file mode 100644 index e4f648704..000000000 --- a/data/maps/BattlePyramidSquare09/map.bin +++ /dev/null @@ -1 +0,0 @@ -BBaBBBBBB`rBBaBBBqBBhrBBBBBBBBBBaBBBBBa`rBBaB`rqBB`rBqBŽBBqBBBB \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare10/border.bin b/data/maps/BattlePyramidSquare10/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattlePyramidSquare10/border.bin and /dev/null differ diff --git a/data/maps/BattlePyramidSquare10/header.inc b/data/maps/BattlePyramidSquare10/header.inc index 16206bfe9..a73718125 100644 --- a/data/maps/BattlePyramidSquare10/header.inc +++ b/data/maps/BattlePyramidSquare10/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare10: @ 848505C - .4byte BattlePyramidSquare10_MapAttributes + .4byte BattlePyramidSquare10_Layout .4byte BattlePyramidSquare10_MapEvents .4byte BattlePyramidSquare10_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare10/map.bin b/data/maps/BattlePyramidSquare10/map.bin deleted file mode 100644 index 4aa7fd771..000000000 --- a/data/maps/BattlePyramidSquare10/map.bin +++ /dev/null @@ -1 +0,0 @@ -BBBBhtjBBBBBBBBBBhjBhtjBBBBBBBBBhtjŽBhtjBBBBBBBBBhtjBBBBBBBBBBBBB \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare11/border.bin b/data/maps/BattlePyramidSquare11/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattlePyramidSquare11/border.bin and /dev/null differ diff --git a/data/maps/BattlePyramidSquare11/header.inc b/data/maps/BattlePyramidSquare11/header.inc index 34a53fdee..eac3cb1c7 100644 --- a/data/maps/BattlePyramidSquare11/header.inc +++ b/data/maps/BattlePyramidSquare11/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare11: @ 8485078 - .4byte BattlePyramidSquare11_MapAttributes + .4byte BattlePyramidSquare11_Layout .4byte BattlePyramidSquare11_MapEvents .4byte BattlePyramidSquare11_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare11/map.bin b/data/maps/BattlePyramidSquare11/map.bin deleted file mode 100644 index f393f51e5..000000000 --- a/data/maps/BattlePyramidSquare11/map.bin +++ /dev/null @@ -1 +0,0 @@ -BBBBBhjBBB`jBBBBBBsBBaBBhtrBBptbBBBŽBBqBBaBBBBBhrBBBBBBBBBhjBB \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare12/border.bin b/data/maps/BattlePyramidSquare12/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattlePyramidSquare12/border.bin and /dev/null differ diff --git a/data/maps/BattlePyramidSquare12/header.inc b/data/maps/BattlePyramidSquare12/header.inc index c514b4f4f..a1d5585c8 100644 --- a/data/maps/BattlePyramidSquare12/header.inc +++ b/data/maps/BattlePyramidSquare12/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare12: @ 8485094 - .4byte BattlePyramidSquare12_MapAttributes + .4byte BattlePyramidSquare12_Layout .4byte BattlePyramidSquare12_MapEvents .4byte BattlePyramidSquare12_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare12/map.bin b/data/maps/BattlePyramidSquare12/map.bin deleted file mode 100644 index 64dd96955..000000000 --- a/data/maps/BattlePyramidSquare12/map.bin +++ /dev/null @@ -1 +0,0 @@ -htjBhtjŽBBBBBBBBBBBBBBBBBhjBhttjBBBBBBBBBBBBBBBBBBBBBBBBhtttttjB \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare13/border.bin b/data/maps/BattlePyramidSquare13/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattlePyramidSquare13/border.bin and /dev/null differ diff --git a/data/maps/BattlePyramidSquare13/header.inc b/data/maps/BattlePyramidSquare13/header.inc index 23df0c29c..1c67b55e7 100644 --- a/data/maps/BattlePyramidSquare13/header.inc +++ b/data/maps/BattlePyramidSquare13/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare13: @ 84850B0 - .4byte BattlePyramidSquare13_MapAttributes + .4byte BattlePyramidSquare13_Layout .4byte BattlePyramidSquare13_MapEvents .4byte BattlePyramidSquare13_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare13/map.bin b/data/maps/BattlePyramidSquare13/map.bin deleted file mode 100644 index 5fc1485a7..000000000 --- a/data/maps/BattlePyramidSquare13/map.bin +++ /dev/null @@ -1 +0,0 @@ -aBBBaBBBsBaBsBaBqBqBsBsBBBBBqBqBBBŽBBBBsBsBaaBqBsBqBsBBBqBBBqB \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare14/border.bin b/data/maps/BattlePyramidSquare14/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattlePyramidSquare14/border.bin and /dev/null differ diff --git a/data/maps/BattlePyramidSquare14/header.inc b/data/maps/BattlePyramidSquare14/header.inc index 8570d95ef..9dcea14fa 100644 --- a/data/maps/BattlePyramidSquare14/header.inc +++ b/data/maps/BattlePyramidSquare14/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare14: @ 84850CC - .4byte BattlePyramidSquare14_MapAttributes + .4byte BattlePyramidSquare14_Layout .4byte BattlePyramidSquare14_MapEvents .4byte BattlePyramidSquare14_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare14/map.bin b/data/maps/BattlePyramidSquare14/map.bin deleted file mode 100644 index 21655a872..000000000 --- a/data/maps/BattlePyramidSquare14/map.bin +++ /dev/null @@ -1 +0,0 @@ -BeBeBeBeBBBBBBBBeBeBeBeBBBBŽBBBBBeBeBeBeBBBBBBBBeBeBeBeBBBBBBBBB \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare15/border.bin b/data/maps/BattlePyramidSquare15/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattlePyramidSquare15/border.bin and /dev/null differ diff --git a/data/maps/BattlePyramidSquare15/header.inc b/data/maps/BattlePyramidSquare15/header.inc index 6120ec220..0429cbb0b 100644 --- a/data/maps/BattlePyramidSquare15/header.inc +++ b/data/maps/BattlePyramidSquare15/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare15: @ 84850E8 - .4byte BattlePyramidSquare15_MapAttributes + .4byte BattlePyramidSquare15_Layout .4byte BattlePyramidSquare15_MapEvents .4byte BattlePyramidSquare15_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare15/map.bin b/data/maps/BattlePyramidSquare15/map.bin deleted file mode 100644 index ccbd87d9a..000000000 --- a/data/maps/BattlePyramidSquare15/map.bin +++ /dev/null @@ -1 +0,0 @@ -BBBeBBBeBeBBBeBBBBBeBBBeBeBBŽeBBBBBeBBBeBeBBBeBBBBBeBBBeBeBBBeBB \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare16/border.bin b/data/maps/BattlePyramidSquare16/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattlePyramidSquare16/border.bin and /dev/null differ diff --git a/data/maps/BattlePyramidSquare16/header.inc b/data/maps/BattlePyramidSquare16/header.inc index 4df56bbc7..ea4627aa5 100644 --- a/data/maps/BattlePyramidSquare16/header.inc +++ b/data/maps/BattlePyramidSquare16/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare16: @ 8485104 - .4byte BattlePyramidSquare16_MapAttributes + .4byte BattlePyramidSquare16_Layout .4byte BattlePyramidSquare16_MapEvents .4byte BattlePyramidSquare16_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare16/map.bin b/data/maps/BattlePyramidSquare16/map.bin deleted file mode 100644 index 601eb526e..000000000 --- a/data/maps/BattlePyramidSquare16/map.bin +++ /dev/null @@ -1 +0,0 @@ -BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBŽBBBBBBBBBBBBBBBBBBBBBBBBBBBBB \ No newline at end of file diff --git a/data/maps/BirthIsland_Exterior/border.bin b/data/maps/BirthIsland_Exterior/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/BirthIsland_Exterior/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/BirthIsland_Exterior/header.inc b/data/maps/BirthIsland_Exterior/header.inc index 5697555de..069bbc99c 100644 --- a/data/maps/BirthIsland_Exterior/header.inc +++ b/data/maps/BirthIsland_Exterior/header.inc @@ -1,5 +1,5 @@ BirthIsland_Exterior: @ 8485794 - .4byte BirthIsland_Exterior_MapAttributes + .4byte BirthIsland_Exterior_Layout .4byte BirthIsland_Exterior_MapEvents .4byte BirthIsland_Exterior_MapScripts .4byte 0x0 diff --git a/data/maps/BirthIsland_Exterior/map.bin b/data/maps/BirthIsland_Exterior/map.bin deleted file mode 100644 index 38dfe77a8..000000000 Binary files a/data/maps/BirthIsland_Exterior/map.bin and /dev/null differ diff --git a/data/maps/BirthIsland_Harbor/border.bin b/data/maps/BirthIsland_Harbor/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/BirthIsland_Harbor/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/BirthIsland_Harbor/header.inc b/data/maps/BirthIsland_Harbor/header.inc index 9a9a5954b..e9dc265f5 100644 --- a/data/maps/BirthIsland_Harbor/header.inc +++ b/data/maps/BirthIsland_Harbor/header.inc @@ -1,5 +1,5 @@ BirthIsland_Harbor: @ 84857B0 - .4byte BirthIsland_Harbor_MapAttributes + .4byte IslandHarbor_Layout .4byte BirthIsland_Harbor_MapEvents .4byte BirthIsland_Harbor_MapScripts .4byte 0x0 diff --git a/data/maps/BirthIsland_Harbor/map.bin b/data/maps/BirthIsland_Harbor/map.bin deleted file mode 100644 index e14816107..000000000 --- a/data/maps/BirthIsland_Harbor/map.bin +++ /dev/null @@ -1 +0,0 @@ -¥      ¥­ ­¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡Á     Å‰‰‰‰*+89:+.€‰‰‰‰ppppš‰‰@AB‰‰˜pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂà \ No newline at end of file diff --git a/data/maps/CaveOfOrigin_1F/border.bin b/data/maps/CaveOfOrigin_1F/border.bin deleted file mode 100644 index f1629c020..000000000 --- a/data/maps/CaveOfOrigin_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -3333 \ No newline at end of file diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc index 97b1a7664..0fa252cc5 100644 --- a/data/maps/CaveOfOrigin_1F/header.inc +++ b/data/maps/CaveOfOrigin_1F/header.inc @@ -1,5 +1,5 @@ CaveOfOrigin_1F: @ 84842E8 - .4byte CaveOfOrigin_1F_MapAttributes + .4byte CaveOfOrigin_1F_Layout .4byte CaveOfOrigin_1F_MapEvents .4byte CaveOfOrigin_1F_MapScripts .4byte 0x0 diff --git a/data/maps/CaveOfOrigin_1F/map.bin b/data/maps/CaveOfOrigin_1F/map.bin deleted file mode 100644 index c3c5e7abf..000000000 --- a/data/maps/CaveOfOrigin_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -)))))))))))))))))))))"33333333))))3333333 ")))))))*3333()))))) ""33)))))))))))))33  ""3*333)))))))) 33  ""3"3))*33333=333  33  ""3"*33333333333  33  "$""33333333322$ 33  "3"""33333222$333 33  "3"""3333$3333333 3$ "3"""333$33333333( 3 "3"""333 3333333333  3 "3"""333 3333333333  3 "3"""333()333)))  3 "*""33333()))*333   3 ""3""3333333333333   3 ""3"$33333333333$  3 ""3"3$3333;33333$3  3 ""3$3$22289:222$2$ 3 "$3$222222222222$33 $"3"33222223332222$ 3"3$22$33333$222$3332$3$222222222222222222$333 \ No newline at end of file diff --git a/data/maps/CaveOfOrigin_B1F/border.bin b/data/maps/CaveOfOrigin_B1F/border.bin deleted file mode 100644 index f1629c020..000000000 --- a/data/maps/CaveOfOrigin_B1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -3333 \ No newline at end of file diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc index d9d011a50..629806ad6 100644 --- a/data/maps/CaveOfOrigin_B1F/header.inc +++ b/data/maps/CaveOfOrigin_B1F/header.inc @@ -1,5 +1,5 @@ CaveOfOrigin_B1F: @ 8484358 - .4byte CaveOfOrigin_B1F_MapAttributes + .4byte CaveOfOrigin_B1F_Layout .4byte CaveOfOrigin_B1F_MapEvents .4byte CaveOfOrigin_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/CaveOfOrigin_B1F/map.bin b/data/maps/CaveOfOrigin_B1F/map.bin deleted file mode 100644 index 1fb2d71bb..000000000 --- a/data/maps/CaveOfOrigin_B1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -)))))))))))))))))3)))))))))))))3 "3"333))@))333H3 "*3)*33A333()3( "3*333333333(3 H"3M333)))333 3& ""3"33*#0#(33N3  ""33*0###0(3 3 H"3"3"####### 3 3  ""3"3"0##0##0 3H3& "3M3"####### 3 3  ""3"3$30###0$33N3&H"3"33$3#0#$333 3  "M3$33$3$3$3$3$333$3  "$3$3333333$3$ "3332222222$233N3 "3$22223332222$3 "333333$222$333333N$222222232222222$ \ No newline at end of file diff --git a/data/maps/CaveOfOrigin_Entrance/border.bin b/data/maps/CaveOfOrigin_Entrance/border.bin deleted file mode 100644 index f1629c020..000000000 --- a/data/maps/CaveOfOrigin_Entrance/border.bin +++ /dev/null @@ -1 +0,0 @@ -3333 \ No newline at end of file diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc index f2eab2e2b..b3e4dea97 100644 --- a/data/maps/CaveOfOrigin_Entrance/header.inc +++ b/data/maps/CaveOfOrigin_Entrance/header.inc @@ -1,5 +1,5 @@ CaveOfOrigin_Entrance: @ 84842CC - .4byte CaveOfOrigin_Entrance_MapAttributes + .4byte CaveOfOrigin_Entrance_Layout .4byte CaveOfOrigin_Entrance_MapEvents .4byte CaveOfOrigin_Entrance_MapScripts .4byte 0x0 diff --git a/data/maps/CaveOfOrigin_Entrance/map.bin b/data/maps/CaveOfOrigin_Entrance/map.bin deleted file mode 100644 index 4bbffd109..000000000 --- a/data/maps/CaveOfOrigin_Entrance/map.bin +++ /dev/null @@ -1 +0,0 @@ -3333333333333333333333333))))))3333333)))*)))3())3333")))*333())) 3333"")))-./))3 (333"""3)5637) 3 3 33*""3"33333333  3( 33"3""3"33333333  33  33"3""3"33333333  33  33"3""3"33333333 (3 (**"3"33333333 3 3 3 "3"3"3"33333333 3 3 3 "3"3"3"33333333 3( 3 "3"3"3"33333333 33  3 "3"3"3"33333333 33 ( "*3"3"33333333 33 3  ""33"3"33333333 33 3  ""33"3"33333333 3$3  ""3*3"33333333 3 33  ""3"33"33333333 3 33  ""3"33"333#3333 3 33  "%"33$289:2$3 33  "3"$22233322$33  "3"3333$222$33333  "3$22222222222222$ $222222233322222$ \ No newline at end of file diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/border.bin b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/border.bin deleted file mode 100644 index f1629c020..000000000 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/border.bin +++ /dev/null @@ -1 +0,0 @@ -3333 \ No newline at end of file diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc index 081d1bba3..1edd4c6c2 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc @@ -1,5 +1,5 @@ CaveOfOrigin_UnusedRubySapphireMap1: @ 8484304 - .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapAttributes + .4byte CaveOfOrigin_UnusedRubySapphireMap1_Layout .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapEvents .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapScripts .4byte 0x0 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.bin b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.bin deleted file mode 100644 index 0ffbdaaa0..000000000 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.bin +++ /dev/null @@ -1 +0,0 @@ -33))))))))))))))))33333"33)))3333))) 33333"33"333())))*333 (33)*33"3))))))))3( 33"33)*3"))))))(3  33"33"333""3333<33( 3  33"3*333""3333333  3  33"3"3333%%333333  3  33"3"333333%23333  3  33"*)))333%333  2 33""3")(333"33   3 33""3""=3( 333""33   3 33""3""33  33*"33   3 33""3""33 ())**33   3 33""3""33())))*333   3 33""3""33333333333  ( 33""3"%333333333% 3  33""3"3%3333333%3 3  33""3%3%2222222%2%3  33"%3%2222222222%32% 33"3%23322222233 33 33%33%22%333333%22%2%333%2222222222222222%3333 \ No newline at end of file diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/border.bin b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/border.bin deleted file mode 100644 index 4117717f2..000000000 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/border.bin +++ /dev/null @@ -1 +0,0 @@ -#### \ No newline at end of file diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc index ef1747de8..6b046b61a 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc @@ -1,5 +1,5 @@ CaveOfOrigin_UnusedRubySapphireMap2: @ 8484320 - .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapAttributes + .4byte CaveOfOrigin_UnusedRubySapphireMap2_Layout .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapEvents .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapScripts .4byte 0x0 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.bin b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.bin deleted file mode 100644 index 4c1fd5ab8..000000000 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.bin +++ /dev/null @@ -1 +0,0 @@ -)))))###))))##)"#####()))*))())*# "#))))))))*##()))) "#"##))))))))))##  "#"##"))))))))(#  "*)*"33333333( #  ""#")*333333333  % ""#""333223333   # ""#""33%##%333   %""#""33 ####%33    #""#""<33 #####"33    #""#"%22%#####"33    #"%%2#####)*33    #"#"##"#)))*3333   ("#"##"#"=33333332  # "#"##%"333333%#  # "#"###"%222222%2%( "#"###%22222222%###  "#%222##222222##  %222#%22%######%22% ####%222222222222222% \ No newline at end of file diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/border.bin b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/border.bin deleted file mode 100644 index f1629c020..000000000 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/border.bin +++ /dev/null @@ -1 +0,0 @@ -3333 \ No newline at end of file diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc index 623c9c2bc..819afc08f 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc @@ -1,5 +1,5 @@ CaveOfOrigin_UnusedRubySapphireMap3: @ 848433C - .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapAttributes + .4byte CaveOfOrigin_UnusedRubySapphireMap3_Layout .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapEvents .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapScripts .4byte 0x0 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.bin b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.bin deleted file mode 100644 index ea574b224..000000000 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.bin +++ /dev/null @@ -1 +0,0 @@ -)))))))))))))))))")))3333)))333 ""333())))*333()) ""33)))))))))33  ""33")))))))(3  ""3*"3333333( 3  "$"*333333=33  $ "3"""3322233   3 "3"""3$333$3   3 "3"""3 33333"$  3 "3"""3(3333" 3  3 "3"""33(33* 3  3 "*""333 33"$3 ( ""3""333())* 33 3  ""3"$3<33333 2$3  ""3$"333333  333  ""33"$222222$ 333  ""33$22222222$333  "$2233332222222$ "333$2222$3222222$$2222222222$3333333 \ No newline at end of file diff --git a/data/maps/DesertRuins/border.bin b/data/maps/DesertRuins/border.bin deleted file mode 100644 index c07869a9f..000000000 --- a/data/maps/DesertRuins/border.bin +++ /dev/null @@ -1 +0,0 @@ -ÙÙÙÙ \ No newline at end of file diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc index dcc150a4f..8f076bf77 100644 --- a/data/maps/DesertRuins/header.inc +++ b/data/maps/DesertRuins/header.inc @@ -1,5 +1,5 @@ DesertRuins: @ 8483F68 - .4byte DesertRuins_MapAttributes + .4byte DesertRuins_Layout .4byte DesertRuins_MapEvents .4byte DesertRuins_MapScripts .4byte 0x0 diff --git a/data/maps/DesertRuins/map.bin b/data/maps/DesertRuins/map.bin deleted file mode 100644 index 406cf7279..000000000 Binary files a/data/maps/DesertRuins/map.bin and /dev/null differ diff --git a/data/maps/DesertUnderpass/border.bin b/data/maps/DesertUnderpass/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/DesertUnderpass/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/DesertUnderpass/header.inc b/data/maps/DesertUnderpass/header.inc index b01e7638a..2a420d703 100644 --- a/data/maps/DesertUnderpass/header.inc +++ b/data/maps/DesertUnderpass/header.inc @@ -1,5 +1,5 @@ DesertUnderpass: @ 8484978 - .4byte DesertUnderpass_MapAttributes + .4byte DesertUnderpass_Layout .4byte DesertUnderpass_MapEvents .4byte DesertUnderpass_MapScripts .4byte 0x0 diff --git a/data/maps/DesertUnderpass/map.bin b/data/maps/DesertUnderpass/map.bin deleted file mode 100644 index 2f82e9357..000000000 --- a/data/maps/DesertUnderpass/map.bin +++ /dev/null @@ -1 +0,0 @@ - ##" #" !!" !!"##" #" #" ####" ####" #" #" "#"˜™™™™š ###" # #˜š #" "#" ¡©©©ª # #"#" #"¨ª ###" "¨ª ######"##˜š' # " " ' ¡š #˜š˜¡¡¡š#"#"' "˜¡¢˜š˜¡¡¡¡¡š#"˜š˜h˜¡©¡š˜¡ª˜™¡¡¡¡¡¡¢˜™¡ª¨¡š˜¡ª ¢˜¡ª˜¡¡¡¡¡¡¡¡¢ ####" ##" ##" #"¨©ª¨¡š¨ª¨ª¨ª #q¡¡¡¡¡¡¡¡¢##"##"< # #"#" " # "#" " ##" #####" ##"##"¨ª ###"˜š q¡¡¡¡¡¡¡¢#"#"#XYZ# ##"#"#" #" " ###" " #"#" # #" #"" ###"  #""˜¡¢ ###q¡¡¡¡¡p######" ##"  #01##"##" 0#101#####"#####" ####" #### #01######q¡¢ 0##101##q¡¡¡p#"" ######" #######"  ##"##" #"#" ##########" #####"#q¢###### "####################" ##########" #############" #"" " #####" #" ########" ##############" #### ######" #####" ##" ##" ##"  ##" #" ###" # ####" ######"" # " ##"˜š#"'˜š˜š ## ##"##" # #"#" # "#########" ########" ##"#" #"### ##### #"##### " ##"####"#" #####" ###### # ##"### ##"#" ## ######" "### " ###"#"#"#" # #" #" #"#" ## #####" ##" # " #" ###"### ## " #"##"#"#"###" ##"##" #####" ##" #"## # # #"#" #"#" ############# \ No newline at end of file diff --git a/data/maps/DewfordTown/border.bin b/data/maps/DewfordTown/border.bin deleted file mode 100644 index 281762f5b..000000000 --- a/data/maps/DewfordTown/border.bin +++ /dev/null @@ -1 +0,0 @@ -CCCC \ No newline at end of file diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc index 7437a42a2..7c6638aed 100644 --- a/data/maps/DewfordTown/header.inc +++ b/data/maps/DewfordTown/header.inc @@ -1,5 +1,5 @@ DewfordTown: @ 84825EC - .4byte DewfordTown_MapAttributes + .4byte DewfordTown_Layout .4byte DewfordTown_MapEvents .4byte DewfordTown_MapScripts .4byte DewfordTown_MapConnections diff --git a/data/maps/DewfordTown/map.bin b/data/maps/DewfordTown/map.bin deleted file mode 100644 index e8a1154e8..000000000 --- a/data/maps/DewfordTown/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -C 2 2 2$1$1$1$1$1%pzCCC92C92C$1$1$1$1$1%pzC:CCCC:$1$1$1$1$1%pzC92CC:C92'%&$1$1$1$1$1%pz5CC:C92:C$1$1$1$1$1$1$19292%pzCC92CC92:$1$1$1$1$1$1 2 2%pz:::CCC$1$1$1$1$1$1$1%p‚yy‰:::$12222$1$1%pppp‚yyy$1PQRS$1$1%&%pppppppp$1XYZ[$1$1$1$1$1$1(2)2)2pppppp$1 ab -$1$1$1$1$101111111$1$1$1$1$1$1$1$1$1$1$1>111=1$1 2 2 2 2$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1222222$1$1$1$1$192$1$1$1$1"####$$1$1$1$1$1%&C$1$1$1$1+,-³./2$1$1$1$1$1$1â92C$1$1$1$1345Å67$1$1$1$1$1$1$1C:92$1$1$1;2<2=Í>?2$1$1$1$1$1929292:92C92$1$1$1$1$1$1$1$1$1$1â49292:CCâCCC9292929292929292929292CC92CC92 \ No newline at end of file diff --git a/data/maps/DewfordTown_Gym/border.bin b/data/maps/DewfordTown_Gym/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/DewfordTown_Gym/border.bin and /dev/null differ diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc index 4d2dbcef9..fcb55ee29 100644 --- a/data/maps/DewfordTown_Gym/header.inc +++ b/data/maps/DewfordTown_Gym/header.inc @@ -1,5 +1,5 @@ DewfordTown_Gym: @ 8482C60 - .4byte DewfordTown_Gym_MapAttributes + .4byte DewfordTown_Gym_Layout .4byte DewfordTown_Gym_MapEvents .4byte DewfordTown_Gym_MapScripts .4byte 0x0 diff --git a/data/maps/DewfordTown_Gym/map.bin b/data/maps/DewfordTown_Gym/map.bin deleted file mode 100644 index 43cd6e64a..000000000 Binary files a/data/maps/DewfordTown_Gym/map.bin and /dev/null differ diff --git a/data/maps/DewfordTown_Hall/border.bin b/data/maps/DewfordTown_Hall/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/DewfordTown_Hall/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc index 22466b2a8..31af0f14d 100644 --- a/data/maps/DewfordTown_Hall/header.inc +++ b/data/maps/DewfordTown_Hall/header.inc @@ -1,5 +1,5 @@ DewfordTown_Hall: @ 8482C7C - .4byte DewfordTown_Hall_MapAttributes + .4byte DewfordTown_Hall_Layout .4byte DewfordTown_Hall_MapEvents .4byte DewfordTown_Hall_MapScripts .4byte 0x0 diff --git a/data/maps/DewfordTown_Hall/map.bin b/data/maps/DewfordTown_Hall/map.bin deleted file mode 100644 index 5fd13209d..000000000 Binary files a/data/maps/DewfordTown_Hall/map.bin and /dev/null differ diff --git a/data/maps/DewfordTown_House1/border.bin b/data/maps/DewfordTown_House1/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/DewfordTown_House1/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc index 399786aa9..c317b12bb 100644 --- a/data/maps/DewfordTown_House1/header.inc +++ b/data/maps/DewfordTown_House1/header.inc @@ -1,5 +1,5 @@ DewfordTown_House1: @ 8482C0C - .4byte DewfordTown_House1_MapAttributes + .4byte House3_Layout .4byte DewfordTown_House1_MapEvents .4byte DewfordTown_House1_MapScripts .4byte 0x0 diff --git a/data/maps/DewfordTown_House1/map.bin b/data/maps/DewfordTown_House1/map.bin deleted file mode 100644 index 1f732ba3f..000000000 --- a/data/maps/DewfordTown_House1/map.bin +++ /dev/null @@ -1 +0,0 @@ -㾿¦§äëÆÇ®¯¡ìó2Î2Ï2!2!2@2¶2·2©2ô2!2)2)2D2NOD2)2)2)2!2)2)2D2VWD2)2)2)2!2)2)2)2)2)2)2)2)2)2 3333333333#33333333 \ No newline at end of file diff --git a/data/maps/DewfordTown_House2/border.bin b/data/maps/DewfordTown_House2/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/DewfordTown_House2/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc index d9a2162e2..6d285c437 100644 --- a/data/maps/DewfordTown_House2/header.inc +++ b/data/maps/DewfordTown_House2/header.inc @@ -1,5 +1,5 @@ DewfordTown_House2: @ 8482C98 - .4byte DewfordTown_House2_MapAttributes + .4byte House4_Layout .4byte DewfordTown_House2_MapEvents .4byte DewfordTown_House2_MapScripts .4byte 0x0 diff --git a/data/maps/DewfordTown_House2/map.bin b/data/maps/DewfordTown_House2/map.bin deleted file mode 100644 index 6274e4418..000000000 --- a/data/maps/DewfordTown_House2/map.bin +++ /dev/null @@ -1 +0,0 @@ -㾿äëÆÇ ìó2Î2Ï2³6³6!2!2!2¨2ô2!2)2D2)2)2)2)2)2)2)2!2)2)2)2)2)2)2N_D2!2)2)2)2)2)2D2VWD2!2)2)2)2)2)2)2)2)2)2 3333333333#33333333 \ No newline at end of file diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc index bdc1b5090..99d29f69c 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ DewfordTown_PokemonCenter_1F: @ 8482C28 - .4byte DewfordTown_PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte DewfordTown_PokemonCenter_1F_MapEvents .4byte DewfordTown_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc index f5302fff1..4d6a71785 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ DewfordTown_PokemonCenter_2F: @ 8482C44 - .4byte DewfordTown_PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte DewfordTown_PokemonCenter_2F_MapEvents .4byte DewfordTown_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/DoubleBattleColosseum/border.bin b/data/maps/DoubleBattleColosseum/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/DoubleBattleColosseum/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc index 6d102c5b1..d8275de59 100644 --- a/data/maps/DoubleBattleColosseum/header.inc +++ b/data/maps/DoubleBattleColosseum/header.inc @@ -1,5 +1,5 @@ DoubleBattleColosseum: @ 8484D84 - .4byte DoubleBattleColosseum_MapAttributes + .4byte DoubleBattleColosseum_Layout .4byte DoubleBattleColosseum_MapEvents .4byte DoubleBattleColosseum_MapScripts .4byte 0x0 diff --git a/data/maps/DoubleBattleColosseum/map.bin b/data/maps/DoubleBattleColosseum/map.bin deleted file mode 100644 index 77606e818..000000000 --- a/data/maps/DoubleBattleColosseum/map.bin +++ /dev/null @@ -1 +0,0 @@ -hijjjkllmjjjoOpqrrrstturrrwWxyzzz{||}zzz_€2‚2L2M2ƒ2„2„2…2M2N2‚2†2‡ŒŠ2U2`2U2U2b2c2U2U2a2U2‹2ŒŠ2U2T2U2U2d2e2U2U2V2U2‹2ŒŠ2U2`2U2U2f2g2U2U2a2U2‹2ˆ‰2U2\2]2]2]2]2]2]2^2U2Ž2!2!2!2!2 \ No newline at end of file diff --git a/data/maps/EverGrandeCity/border.bin b/data/maps/EverGrandeCity/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/EverGrandeCity/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc index f7fc65752..890d8b79f 100644 --- a/data/maps/EverGrandeCity/header.inc +++ b/data/maps/EverGrandeCity/header.inc @@ -1,5 +1,5 @@ EverGrandeCity: @ 8482598 - .4byte EverGrandeCity_MapAttributes + .4byte EverGrandeCity_Layout .4byte EverGrandeCity_MapEvents .4byte EverGrandeCity_MapScripts .4byte EverGrandeCity_MapConnections diff --git a/data/maps/EverGrandeCity/map.bin b/data/maps/EverGrandeCity/map.bin deleted file mode 100644 index 33b271d5d..000000000 Binary files a/data/maps/EverGrandeCity/map.bin and /dev/null differ diff --git a/data/maps/EverGrandeCity_ChampionsRoom/border.bin b/data/maps/EverGrandeCity_ChampionsRoom/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/EverGrandeCity_ChampionsRoom/border.bin and /dev/null differ diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc index 445536d27..e239ed146 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_ChampionsRoom: @ 8483C3C - .4byte EverGrandeCity_ChampionsRoom_MapAttributes + .4byte EverGrandeCity_ChampionsRoom_Layout .4byte EverGrandeCity_ChampionsRoom_MapEvents .4byte EverGrandeCity_ChampionsRoom_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_ChampionsRoom/map.bin b/data/maps/EverGrandeCity_ChampionsRoom/map.bin deleted file mode 100644 index a234307b5..000000000 Binary files a/data/maps/EverGrandeCity_ChampionsRoom/map.bin and /dev/null differ diff --git a/data/maps/EverGrandeCity_DrakesRoom/border.bin b/data/maps/EverGrandeCity_DrakesRoom/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/EverGrandeCity_DrakesRoom/border.bin and /dev/null differ diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc index 6d6438a79..0a4878176 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/header.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_DrakesRoom: @ 8483C20 - .4byte EverGrandeCity_DrakesRoom_MapAttributes + .4byte EverGrandeCity_DrakesRoom_Layout .4byte EverGrandeCity_DrakesRoom_MapEvents .4byte EverGrandeCity_DrakesRoom_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.bin b/data/maps/EverGrandeCity_DrakesRoom/map.bin deleted file mode 100644 index 3b5248d98..000000000 --- a/data/maps/EverGrandeCity_DrakesRoom/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -       -      ¢2¢2¢2¢2¢2¸2¸2¸2¢2¢2¢2¢2¢2Φ¼2¼2 2£2£2£2¤2¼2¼2§¥­®¼2¼2¨2©2ª2«2¬2¼2¼2¯­µ¶¼2¼2°2±2²2³2´2¼2¼2·µ½¡¼2¼2¨2¹2º2»2¬2¼2¼2·½½¾¼2¼2¨2Á2Â2Ã2¬2¼2¼2¿½Í2Æ2¼2¼2È2Ë2Ë2Ë2Ì2¼2¼2Ç2Å2Ê2É2É2É2É2É2É2É2É2É2É2É2É22222222222222ÕÖÕÖå¼2¼2¼2×ÕÖÕÖHIHIæÄ2Ä2Ä2ßHIHI \ No newline at end of file diff --git a/data/maps/EverGrandeCity_GlaciasRoom/border.bin b/data/maps/EverGrandeCity_GlaciasRoom/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/EverGrandeCity_GlaciasRoom/border.bin and /dev/null differ diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc index b301c2aa1..dbc20fd80 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_GlaciasRoom: @ 8483C04 - .4byte EverGrandeCity_GlaciasRoom_MapAttributes + .4byte EverGrandeCity_GlaciasRoom_Layout .4byte EverGrandeCity_GlaciasRoom_MapEvents .4byte EverGrandeCity_GlaciasRoom_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.bin b/data/maps/EverGrandeCity_GlaciasRoom/map.bin deleted file mode 100644 index 2d7db7377..000000000 --- a/data/maps/EverGrandeCity_GlaciasRoom/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -       -      r2r2r2r2r2ˆ2ˆ2ˆ2r2r2r2r2r2žvŒ2Œ2p2s2s2s2t2Œ2Œ2wu}~Œ2Œ2x2y2z2{2|2Œ2Œ2}…†Œ2Œ2€22‚2ƒ2„2Œ2Œ2‡…qŒ2Œ2x2‰2Š2‹2|2Œ2Œ2‡ŽŒ2Œ2x2‘2’2“2|2Œ2Œ22–2Œ2Œ2˜2›2›2›2œ2Œ2Œ2—2•2š2™2™2™2™2™2™2™2™2™2™2™2™22222222222222ÕÖÕÖåŒ2Œ2Œ2×ÕÖÕÖHIHIæ”2”2”2ßHIHI \ No newline at end of file diff --git a/data/maps/EverGrandeCity_Hall1/border.bin b/data/maps/EverGrandeCity_Hall1/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/EverGrandeCity_Hall1/border.bin and /dev/null differ diff --git a/data/maps/EverGrandeCity_Hall1/header.inc b/data/maps/EverGrandeCity_Hall1/header.inc index 332a6cbb2..4dacefc77 100644 --- a/data/maps/EverGrandeCity_Hall1/header.inc +++ b/data/maps/EverGrandeCity_Hall1/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_Hall1: @ 8483C58 - .4byte EverGrandeCity_Hall1_MapAttributes + .4byte EverGrandeCity_ShortHall_Layout .4byte EverGrandeCity_Hall1_MapEvents .4byte EverGrandeCity_Hall1_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_Hall1/map.bin b/data/maps/EverGrandeCity_Hall1/map.bin deleted file mode 100644 index 75812b238..000000000 --- a/data/maps/EverGrandeCity_Hall1/map.bin +++ /dev/null @@ -1 +0,0 @@ -ÕÖÕÖDÕÖÕÖHIHI E HIHIÑ2Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ð2Ð2Ð2Ð2Ð2Ð2Ð2Ð2Ð2Ð2Ð2ÜÜÜØÙ2Ú2Ú2ÛÜÜÜäääàá2â2â2ãäääçççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççç \ No newline at end of file diff --git a/data/maps/EverGrandeCity_Hall2/header.inc b/data/maps/EverGrandeCity_Hall2/header.inc index b9029c027..0c160c76e 100644 --- a/data/maps/EverGrandeCity_Hall2/header.inc +++ b/data/maps/EverGrandeCity_Hall2/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_Hall2: @ 8483C74 - .4byte EverGrandeCity_Hall2_MapAttributes + .4byte EverGrandeCity_ShortHall_Layout .4byte EverGrandeCity_Hall2_MapEvents .4byte EverGrandeCity_Hall2_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_Hall3/header.inc b/data/maps/EverGrandeCity_Hall3/header.inc index 282d06c66..da2ef5259 100644 --- a/data/maps/EverGrandeCity_Hall3/header.inc +++ b/data/maps/EverGrandeCity_Hall3/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_Hall3: @ 8483C90 - .4byte EverGrandeCity_Hall3_MapAttributes + .4byte EverGrandeCity_ShortHall_Layout .4byte EverGrandeCity_Hall3_MapEvents .4byte EverGrandeCity_Hall3_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_Hall4/border.bin b/data/maps/EverGrandeCity_Hall4/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/EverGrandeCity_Hall4/border.bin and /dev/null differ diff --git a/data/maps/EverGrandeCity_Hall4/header.inc b/data/maps/EverGrandeCity_Hall4/header.inc index 72fa22d75..da0b96380 100644 --- a/data/maps/EverGrandeCity_Hall4/header.inc +++ b/data/maps/EverGrandeCity_Hall4/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_Hall4: @ 8483CAC - .4byte EverGrandeCity_Hall4_MapAttributes + .4byte EverGrandeCity_Hall4_Layout .4byte EverGrandeCity_Hall4_MapEvents .4byte EverGrandeCity_Hall4_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_Hall4/map.bin b/data/maps/EverGrandeCity_Hall4/map.bin deleted file mode 100644 index 580ae095a..000000000 --- a/data/maps/EverGrandeCity_Hall4/map.bin +++ /dev/null @@ -1 +0,0 @@ -ÕÖÕÖDÕÖÕÖ     E     Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ð2Ð2Ð2Ð2Ð2Ð2Ð2Ð2Ð2Ð2Ð2ÜÜÜØÙ2Ú2Ú2ÛÜÜÜäääàá2â2â2ãäääçJçàá2â2â2ãçJççççàá2â2â2ãççççJçàá2â2â2ãçJççççàá2â2â2ãççççJçàá2â2â2ãçJççççàá2â2â2ãççççççàá2â2â2ãççççJçàá2â2â2ãçJççççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççççJçàá2â2â2ãçJççççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççççJçàá2â2â2ãçJççççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççç \ No newline at end of file diff --git a/data/maps/EverGrandeCity_Hall5/header.inc b/data/maps/EverGrandeCity_Hall5/header.inc index eac2ba3fa..0c541bd58 100644 --- a/data/maps/EverGrandeCity_Hall5/header.inc +++ b/data/maps/EverGrandeCity_Hall5/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_Hall5: @ 8483CC8 - .4byte EverGrandeCity_Hall5_MapAttributes + .4byte EverGrandeCity_ShortHall_Layout .4byte EverGrandeCity_Hall5_MapEvents .4byte EverGrandeCity_Hall5_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_HallOfFame/border.bin b/data/maps/EverGrandeCity_HallOfFame/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/EverGrandeCity_HallOfFame/border.bin and /dev/null differ diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc index dd3726db9..786b7c598 100644 --- a/data/maps/EverGrandeCity_HallOfFame/header.inc +++ b/data/maps/EverGrandeCity_HallOfFame/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_HallOfFame: @ 8483D00 - .4byte EverGrandeCity_HallOfFame_MapAttributes + .4byte EverGrandeCity_HallOfFame_Layout .4byte EverGrandeCity_HallOfFame_MapEvents .4byte EverGrandeCity_HallOfFame_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_HallOfFame/map.bin b/data/maps/EverGrandeCity_HallOfFame/map.bin deleted file mode 100644 index 1df9e4804..000000000 --- a/data/maps/EverGrandeCity_HallOfFame/map.bin +++ /dev/null @@ -1 +0,0 @@ -ÌÍôõôÐÑÑÒÓôõôÎÏÔÕüýüØÙÙÚÛüýüÖ×ÜÝþ2þ2þ2àááâãþ2þ2þ2Þßäå2ö2ö2ö2èéêðëö2ö2ö2æ2çäå2ö2ö2ö2ö2ñòóö2ö2ö2ö2æ2çäå2ö2ö2ö2ö2ù2ú2û2ö2ö2ö2ö2æ2çäå2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2æ2çäå2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2æ2çäå2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2æ2çäå2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2æ2çäå2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2æ2çäå2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2æ2çäå2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2æ2çäå2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2æ2çäå2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2æ2çìí2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2î2ïÿ6ø2ø2ø2÷6 \ No newline at end of file diff --git a/data/maps/EverGrandeCity_PhoebesRoom/border.bin b/data/maps/EverGrandeCity_PhoebesRoom/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/EverGrandeCity_PhoebesRoom/border.bin and /dev/null differ diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc index a5ebfb823..2e7bef16d 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_PhoebesRoom: @ 8483BE8 - .4byte EverGrandeCity_PhoebesRoom_MapAttributes + .4byte EverGrandeCity_PhoebesRoom_Layout .4byte EverGrandeCity_PhoebesRoom_MapEvents .4byte EverGrandeCity_PhoebesRoom_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.bin b/data/maps/EverGrandeCity_PhoebesRoom/map.bin deleted file mode 100644 index 2e75b706c..000000000 --- a/data/maps/EverGrandeCity_PhoebesRoom/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -       -      B2B2B2B2B2X2X2X2B2B2B2B2B2EF\2\2@2C2C2C2D2\2\2GAMN\2\2H2I2J2K2L2\2\2O@UV\2\2P2Q2R2S2T2\2\2WA]^\2\2H2Y2Z2[2L2\2\2WBef\2\2H2a2b2c2L2\2\2gCm2n2\2\2h2k2k2k2l2\2\2o2`2j2i2i2i2i2i2i2i2i2i2i2i2i22222222222222ÕÖÕÖå\2\2\2×ÕÖÕÖHIHIæd2d2d2ßHIHI \ No newline at end of file diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc index a3747320b..613b47446 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_PokemonCenter_1F: @ 8483D1C - .4byte EverGrandeCity_PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte EverGrandeCity_PokemonCenter_1F_MapEvents .4byte EverGrandeCity_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc index 1ad6c5727..63539b7a1 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_PokemonCenter_2F: @ 8483D38 - .4byte EverGrandeCity_PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte EverGrandeCity_PokemonCenter_2F_MapEvents .4byte EverGrandeCity_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/border.bin b/data/maps/EverGrandeCity_PokemonLeague_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc index 46fa79a73..d99e18907 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_PokemonLeague_1F: @ 8483CE4 - .4byte EverGrandeCity_PokemonLeague_1F_MapAttributes + .4byte EverGrandeCity_PokemonLeague_1F_Layout .4byte EverGrandeCity_PokemonLeague_1F_MapEvents .4byte EverGrandeCity_PokemonLeague_1F_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/map.bin b/data/maps/EverGrandeCity_PokemonLeague_1F/map.bin deleted file mode 100644 index 6bab68102..000000000 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -  JK   ³´´µ     "#RSI»¼2¼2½Hs2*+2[Q$22Ã2Ä2Ä2Å222P}2)2t2u2!!!!Y<2@2@2@2@2@2@2@2X!!! 222222%2@2@20232@2@2@2g2222D2 2@2@2@2@2@2@2@2v2{2{2w2@2@2@2@2@2@2'2€2222@2@2@202{2†2‡2{232@2@2@2@2^2 -2ˆ6‰B2@2@2@282|2Ž22|2;2@2@2@2&2f2‘22@2@2@2@2@2~2|2|22@2@2@2=>@2'2 2@2@2&2@2@2@2@2@2A2B2@2@2@2@2EF42'2 2^2^2=>42@2@2@2@2@2@2@2@22&242@2'2(ffEF&2@2@2@222@2@2@2@2@2@2@27 \ No newline at end of file diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc index 1d7775bfc..61d0b857a 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_PokemonLeague_2F: @ 8483D54 - .4byte EverGrandeCity_PokemonLeague_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte EverGrandeCity_PokemonLeague_2F_MapEvents .4byte EverGrandeCity_PokemonLeague_2F_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_SidneysRoom/border.bin b/data/maps/EverGrandeCity_SidneysRoom/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/EverGrandeCity_SidneysRoom/border.bin and /dev/null differ diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc index 594347dc3..3855eb87a 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/header.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_SidneysRoom: @ 8483BCC - .4byte EverGrandeCity_SidneysRoom_MapAttributes + .4byte EverGrandeCity_SidneysRoom_Layout .4byte EverGrandeCity_SidneysRoom_MapEvents .4byte EverGrandeCity_SidneysRoom_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.bin b/data/maps/EverGrandeCity_SidneysRoom/map.bin deleted file mode 100644 index ebca00c5c..000000000 --- a/data/maps/EverGrandeCity_SidneysRoom/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -       -      22222(2(2(222222>,2,222222,2,2,2,222222,2,2%&,2,2 2!2"2#2$2,2,2'%?:,2,22)2*2+22,2,2'?-.,2,221222322,2,2/-=262,2,282;2;2;2<2,2,27252922222222222222222222222222ÕÖÕÖå,2,2,2×ÕÖÕÖHIHIæ424242ßHIHI \ No newline at end of file diff --git a/data/maps/FallarborTown/border.bin b/data/maps/FallarborTown/border.bin deleted file mode 100644 index 23e2a92e5..000000000 --- a/data/maps/FallarborTown/border.bin +++ /dev/null @@ -1 +0,0 @@ -klst \ No newline at end of file diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc index a6ea87c04..c26b91f29 100644 --- a/data/maps/FallarborTown/header.inc +++ b/data/maps/FallarborTown/header.inc @@ -1,5 +1,5 @@ FallarborTown: @ 8482624 - .4byte FallarborTown_MapAttributes + .4byte FallarborTown_Layout .4byte FallarborTown_MapEvents .4byte FallarborTown_MapScripts .4byte FallarborTown_MapConnections diff --git a/data/maps/FallarborTown/map.bin b/data/maps/FallarborTown/map.bin deleted file mode 100644 index 950a54761..000000000 --- a/data/maps/FallarborTown/map.bin +++ /dev/null @@ -1 +0,0 @@ -yyyyyiiiiiiiiiiiiijiiiiiiiiiiiijziiiiij"##$ÂÃJKLMNjziiiiijz…††‡Ê6Ë6RSTUVzi ¡¢£jziž§2y2Z[\]^q2q2PQRSzii•¥¦—y2#6bcdef#6y2XYZ[q2q2q2y2y2y2y2#6jklmn#6y2©abªy2y2Ÿ2Ÿ2y2y2y2y2y2è2é2ê2y2y2y2y2è2ê2y2y2y2y2y2è2é2é2é2é2é2ñ2ñ2ñ2é2é2é2é2ñ2ñ2é2é2ê2y2y2ø2ù2ù2ù2ù2ù2ù2ù2ù2ù2ñ2ñ2ù2ù2ù2ù2ù2ú2y2y2Ÿ2Ÿ2Ÿ2Ÿ2y2y2y2y2y2ð2ò2y2y2Ÿ2Ÿ2Ÿ2Ÿ2y2y2y2y2y2y2y2y2y2y2y2y2ð2ò2y2»2¨2¨2¼2y2y2y2y2y2y2y2y2y2 3!3y2y2ð2ò2y20123y2Ÿ2y2%3&3'3y2}2~2(3)3y2y2ð2ò2y289:;22y2-3.3/3y2…††‡y2Ÿ2ð2ò2y2©AB«6t6y2536373y2žy2y2ð2ñ2é2é2ê2y2Ÿ22l2y2y2y2y2•¥¦—y2y2ø2ù2ù2ù2ú2y22s6t6k222§2y2y2y2y2y2y2y2y2y2222l6kllklk2222222222st6sts6t6 \ No newline at end of file diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/border.bin b/data/maps/FallarborTown_BattleTentBattleRoom/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/FallarborTown_BattleTentBattleRoom/border.bin and /dev/null differ diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc index 2a5695153..be81ffe6e 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc @@ -1,5 +1,5 @@ FallarborTown_BattleTentBattleRoom: @ 8482DCC - .4byte FallarborTown_BattleTentBattleRoom_MapAttributes + .4byte BattleTentBattleRoom_Layout .4byte FallarborTown_BattleTentBattleRoom_MapEvents .4byte FallarborTown_BattleTentBattleRoom_MapScripts .4byte 0x0 diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/map.bin b/data/maps/FallarborTown_BattleTentBattleRoom/map.bin deleted file mode 100644 index 92a738d5e..000000000 Binary files a/data/maps/FallarborTown_BattleTentBattleRoom/map.bin and /dev/null differ diff --git a/data/maps/FallarborTown_BattleTentCorridor/border.bin b/data/maps/FallarborTown_BattleTentCorridor/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/FallarborTown_BattleTentCorridor/border.bin and /dev/null differ diff --git a/data/maps/FallarborTown_BattleTentCorridor/header.inc b/data/maps/FallarborTown_BattleTentCorridor/header.inc index 6ac376874..5f2023a71 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/header.inc +++ b/data/maps/FallarborTown_BattleTentCorridor/header.inc @@ -1,5 +1,5 @@ FallarborTown_BattleTentCorridor: @ 8482DB0 - .4byte FallarborTown_BattleTentCorridor_MapAttributes + .4byte BattleTentCorridor_Layout .4byte FallarborTown_BattleTentCorridor_MapEvents .4byte FallarborTown_BattleTentCorridor_MapScripts .4byte 0x0 diff --git a/data/maps/FallarborTown_BattleTentCorridor/map.bin b/data/maps/FallarborTown_BattleTentCorridor/map.bin deleted file mode 100644 index 4cd270b21..000000000 --- a/data/maps/FallarborTown_BattleTentCorridor/map.bin +++ /dev/null @@ -1 +0,0 @@ -6b6c6d66 jkl +*+*#:;:;$;:;:#:;:;$;:;:#%; \ No newline at end of file diff --git a/data/maps/FallarborTown_BattleTentLobby/border.bin b/data/maps/FallarborTown_BattleTentLobby/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/FallarborTown_BattleTentLobby/border.bin and /dev/null differ diff --git a/data/maps/FallarborTown_BattleTentLobby/header.inc b/data/maps/FallarborTown_BattleTentLobby/header.inc index 64d4180a5..ba86df464 100644 --- a/data/maps/FallarborTown_BattleTentLobby/header.inc +++ b/data/maps/FallarborTown_BattleTentLobby/header.inc @@ -1,5 +1,5 @@ FallarborTown_BattleTentLobby: @ 8482D94 - .4byte FallarborTown_BattleTentLobby_MapAttributes + .4byte BattleTentLobby_Layout .4byte FallarborTown_BattleTentLobby_MapEvents .4byte FallarborTown_BattleTentLobby_MapScripts .4byte 0x0 diff --git a/data/maps/FallarborTown_BattleTentLobby/map.bin b/data/maps/FallarborTown_BattleTentLobby/map.bin deleted file mode 100644 index 9ff37dc2c..000000000 --- a/data/maps/FallarborTown_BattleTentLobby/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -666b6c6d6666 - `a jkl fg2hi 22 22 2no2p 22222 w6"2xyz{2|}~6'”22€‚ƒ2„…†‡&22“22ˆ2‰2Š2‹22Œ22Ž2222’2222222222222•222222222220(2222./222( \ No newline at end of file diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc index bbe9d895c..443a4dc27 100644 --- a/data/maps/FallarborTown_House1/header.inc +++ b/data/maps/FallarborTown_House1/header.inc @@ -1,5 +1,5 @@ FallarborTown_House1: @ 8482E20 - .4byte FallarborTown_House1_MapAttributes + .4byte House1_Layout .4byte FallarborTown_House1_MapEvents .4byte FallarborTown_House1_MapScripts .4byte 0x0 diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc index bf6d91d02..17cadef2b 100644 --- a/data/maps/FallarborTown_House2/header.inc +++ b/data/maps/FallarborTown_House2/header.inc @@ -1,5 +1,5 @@ FallarborTown_House2: @ 8482E3C - .4byte FallarborTown_House2_MapAttributes + .4byte House2_Layout .4byte FallarborTown_House2_MapEvents .4byte FallarborTown_House2_MapScripts .4byte 0x0 diff --git a/data/maps/FallarborTown_LeftoverRSContestHall/border.bin b/data/maps/FallarborTown_LeftoverRSContestHall/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/FallarborTown_LeftoverRSContestHall/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/FallarborTown_LeftoverRSContestHall/map.bin b/data/maps/FallarborTown_LeftoverRSContestHall/map.bin deleted file mode 100644 index d65e7c489..000000000 --- a/data/maps/FallarborTown_LeftoverRSContestHall/map.bin +++ /dev/null @@ -1 +0,0 @@ -/////////////////////nnn€€€bbbbbbbbbbbbbbbbbbbbb 2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2"2(2`2`2              f2`2*2(2`2`2$%2%2%2%2%2%2%2%2%2%2%2%2%2&f2`2*2(2`2`2$%2%2hiiiiiiij%2%2&f2`2*2(2`2`2$%2%2pq2q2q2q2q2o2q2r%2%2&f2`2*2(2`2`2$%2%2pq2q2q22qwBqr%2%2&f2`2*2(2`2`2$%2%2pq2q2q2‰2q2qq2r%2%2&f2`2*2(2`2`2$%2%2pq2q2q2q2q2q2q2r%2%2&f2`2*2(2`2`2$%2%2xyyk2l2m2yyz%2%2&f2`2*2(2`2`222222s2t2u222222f2`2*2(2`2`26s2t2u26f2`2*2(2`2`2Æ2_2_2_2_2_2_2_2_2_2_2_2_2_2_2g2`2*2(2`2J2`2`2J2`2`2`2`2`2`2`2`2`2J2`2`2J2`2*2(2`2R6`2`2R6`2`2`2`2`2`2`2R6`2`2R6`2*2 \ No newline at end of file diff --git a/data/maps/FallarborTown_LeftoverRSContestLobby/border.bin b/data/maps/FallarborTown_LeftoverRSContestLobby/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/FallarborTown_LeftoverRSContestLobby/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/FallarborTown_LeftoverRSContestLobby/map.bin b/data/maps/FallarborTown_LeftoverRSContestLobby/map.bin deleted file mode 100644 index 87407546a..000000000 --- a/data/maps/FallarborTown_LeftoverRSContestLobby/map.bin +++ /dev/null @@ -1 +0,0 @@ -[\]ÊËNËÊMÊÊÊÊÊÊcdeÌbVbÌbbÉbTb 2!2!2ÐÑ2Ò2Ó2ÔU2!2!2!2!2!2"2(2`2`2ØÙÚÛÜf2`2Ý`2`2`292(2`2`2Æ2_2_2_2_2g2`2`2`2`2`2A2(2`2`2`2`2`2`2`2`2`2`2`2Ý`292(2`2`2`2`2`2`2`2`2`2`2`2A2 \ No newline at end of file diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc index 70ff79eb7..6e8aa3ef3 100644 --- a/data/maps/FallarborTown_Mart/header.inc +++ b/data/maps/FallarborTown_Mart/header.inc @@ -1,5 +1,5 @@ FallarborTown_Mart: @ 8482D78 - .4byte FallarborTown_Mart_MapAttributes + .4byte Mart_Layout .4byte FallarborTown_Mart_MapEvents .4byte FallarborTown_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc index c3b9ec95d..515518d9a 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ FallarborTown_PokemonCenter_1F: @ 8482DE8 - .4byte FallarborTown_PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte FallarborTown_PokemonCenter_1F_MapEvents .4byte FallarborTown_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc index 655221b8a..2c67be178 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ FallarborTown_PokemonCenter_2F: @ 8482E04 - .4byte FallarborTown_PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte FallarborTown_PokemonCenter_2F_MapEvents .4byte FallarborTown_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/FarawayIsland_Entrance/border.bin b/data/maps/FarawayIsland_Entrance/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/FarawayIsland_Entrance/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/FarawayIsland_Entrance/header.inc b/data/maps/FarawayIsland_Entrance/header.inc index 8e943d6c3..5d7879d64 100644 --- a/data/maps/FarawayIsland_Entrance/header.inc +++ b/data/maps/FarawayIsland_Entrance/header.inc @@ -1,5 +1,5 @@ FarawayIsland_Entrance: @ 848575C - .4byte FarawayIsland_Entrance_MapAttributes + .4byte FarawayIsland_Entrance_Layout .4byte FarawayIsland_Entrance_MapEvents .4byte FarawayIsland_Entrance_MapScripts .4byte 0x0 diff --git a/data/maps/FarawayIsland_Entrance/map.bin b/data/maps/FarawayIsland_Entrance/map.bin deleted file mode 100644 index 389f6b0cd..000000000 Binary files a/data/maps/FarawayIsland_Entrance/map.bin and /dev/null differ diff --git a/data/maps/FarawayIsland_Interior/border.bin b/data/maps/FarawayIsland_Interior/border.bin deleted file mode 100644 index addb5d6ce..000000000 Binary files a/data/maps/FarawayIsland_Interior/border.bin and /dev/null differ diff --git a/data/maps/FarawayIsland_Interior/header.inc b/data/maps/FarawayIsland_Interior/header.inc index 6d5e3f2d7..dd29fcc26 100644 --- a/data/maps/FarawayIsland_Interior/header.inc +++ b/data/maps/FarawayIsland_Interior/header.inc @@ -1,5 +1,5 @@ FarawayIsland_Interior: @ 8485778 - .4byte FarawayIsland_Interior_MapAttributes + .4byte FarawayIsland_Interior_Layout .4byte FarawayIsland_Interior_MapEvents .4byte FarawayIsland_Interior_MapScripts .4byte 0x0 diff --git a/data/maps/FarawayIsland_Interior/map.bin b/data/maps/FarawayIsland_Interior/map.bin deleted file mode 100644 index 847295734..000000000 Binary files a/data/maps/FarawayIsland_Interior/map.bin and /dev/null differ diff --git a/data/maps/FieryPath/border.bin b/data/maps/FieryPath/border.bin deleted file mode 100644 index 9ae2c2126..000000000 --- a/data/maps/FieryPath/border.bin +++ /dev/null @@ -1 +0,0 @@ -qqqq \ No newline at end of file diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc index 0cb60553b..c02896935 100644 --- a/data/maps/FieryPath/header.inc +++ b/data/maps/FieryPath/header.inc @@ -1,5 +1,5 @@ FieryPath: @ 8484048 - .4byte FieryPath_MapAttributes + .4byte FieryPath_Layout .4byte FieryPath_MapEvents .4byte FieryPath_MapScripts .4byte 0x0 diff --git a/data/maps/FieryPath/map.bin b/data/maps/FieryPath/map.bin deleted file mode 100644 index 5928fb173..000000000 --- a/data/maps/FieryPath/map.bin +++ /dev/null @@ -1,10 +0,0 @@ -qqqq{ttttttt|qqqq{ttttttttttt|qqqqqqqqqr{ttt|qpqqqqr{tttttttt|qpqqqqqqqq{z{333|pqqq{z33333333|pqqqqqqqqrq33333pqqqrq333333333pqqqqqqq{zq33333pqqqr{3333333 33pqqqqqq{zq3 -   ~pqqqr3333 -   ~~qqqqqqr{tt3h   ~qqqr333 -pqqqqqqqqqqqqqrr3333pqqqqqqr333pqqqqqqqqqqqqqrr3 - 3pqqqqqqqr333pqqqqqqqqqqqqqrr33xttttt|qr333pqqqqqqqqqqqqqrr33ttttt|pqr333pqqqqqqqqqqqqqrr3333333333pqr333pqqqqqqqqqqqqqrr3 -      3 -~xtz333pqqqqqqqqqqqqqrr3qqq 3qqqq333pqqqqqqqqqqqqqrr3h  jr33tttt333x|qqqqqqqqqqqqrr3pqrr33333333333pqqqqqqqqqqqqrr3pqqrr333 -    333qpqqqqqqqqqqqqrr3pqqr   ~h j333|x|qqqqqqqqqqrr3pqq     ~qr3333qxtttt|qqqqq{zr3xt|qqqqqqqqr3333tttt|pqqqqqr{3t|xt|qqqqqqr 33333333|pqqqqqrr33 73|x|qqqqqr333333333pqqqqqrr33333|qpqqqqqj333333333pqqqqqr   333qpqqqqqqr     3333pqqqqq  jr333qpqqqqqqiiiij3333pqqqqqqqqrr33 -~qpqqqqqqqqqqqr3333pqqqqqqqqrr3 -~qqpqqqqqqqqqqqr 333pqqqqqqqrr3tt|pqqqqqqqqqqqrq333pqqqqqqqqrr3333ppqqqqqqqqqqqj333pqqqqqqq{z 333pxt|qqqqqqqqqqr333pqqqqqqqr{tz333xt|pqqqqqqqqqqr333pqqqqqqqrr 33333 ppqqqqqqqqqqr333pqqqqqqqrr3333333ppqqqqqqqqqqr333pqqqqqqqrr3333333ppqqqqqqqqqqr333pqqqqqqqrr3333333ppqqqqqqqqqqr333pqqqqqqqr       ~pqqqqqqqqqqr333pqqqqqqqiiiiiiiii~qqqqqqqqqqr3 33pqqqqqqqqqqqqqqqqqqqqqqqqqqqq ~~qqqqq \ No newline at end of file diff --git a/data/maps/FortreeCity/border.bin b/data/maps/FortreeCity/border.bin deleted file mode 100644 index addb5d6ce..000000000 Binary files a/data/maps/FortreeCity/border.bin and /dev/null differ diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc index 6b78eeee1..b091e166f 100644 --- a/data/maps/FortreeCity/header.inc +++ b/data/maps/FortreeCity/header.inc @@ -1,5 +1,5 @@ FortreeCity: @ 8482528 - .4byte FortreeCity_MapAttributes + .4byte FortreeCity_Layout .4byte FortreeCity_MapEvents .4byte FortreeCity_MapScripts .4byte FortreeCity_MapConnections diff --git a/data/maps/FortreeCity/map.bin b/data/maps/FortreeCity/map.bin deleted file mode 100644 index a2aa40e98..000000000 --- a/data/maps/FortreeCity/map.bin +++ /dev/null @@ -1 +0,0 @@ -ÇÇÇÇÆÇÆÇÆÇÇÇÇÆÆÆÆÆÇÇÆÆÆÇÇÇÇÇÆÆÆ$%&ÆÇÇÇÇÇÇHIJÆÇÆÇÆ$%&ÆÆÆ*$%&ÆÆÆÆÆ$%&ÆÆÆ+,-./ÇÇÇÇÇÆPQR+,-./**+,-./ÆÆÆ+,-./ÆÆ34567ÇÇÇÇÇÇD\DHIJK34567ÆÆ34567Ç**34567Æ*3B>B7ÇÇÇÇÇÇÆÇÇPQRS3B?BVBVB;BB>B?BVBVBVB;BB?BVBVB;BB>B7ÇÇÇÇÇÇÇÆXYZ[CFEFGDDCFFFGDDDCFEFGDDCFEFGÇÇÇÇÇ0`abcÆÇMÇHIJÇÇÇÇÇÇÇÇÇÇMÇÇHIJÇMÇÇÇÇ00000X2Y2Y2SSa2ÇPQRÇÇÇÇcddddea2ÇÇPQRÇa2SSS00000000`2a2a2a2a2a2ÇÇAÇÇÇÇDz³³³³´a2SÇÇAÇÇa2a2a2b2000000000h2a2a2a2a2ÇÇsÆÆÇÇS¸¹º³»¼`2U2ÇÇsÆÇa2a2a2j200000000000h2a2a2a2ÇÇÆÆÆÇÇ0ÀÁÂÅÃÄ`2]ÇÆÆ*Sa2a2j200000Æ00(0)0)0+00`2a2K2$%&**ÇÇ0È1É1ÊÍËÌ1`2a2ÇÆÆÇa2a2a20Æ$%&ÆÆÆÆ01230`2K2+,-./ÇÇÇÇ0X2Y2Y2Y2Y2a2K2Ç*ÇSa2a2a2Ç+,-./ÆÆÆ89:;0`2Æ34567ÆÇÇÇÇK2K2K2K2K2K2ÇÇÇÇ0h2i2i2Ç34567ÆÆÆ`ABCX2a2Æ3B?BVBVBVBVBVBVBVBVBVBVBVBVBVBVBVBNòNòNòNòVB;BB>B7ÆÆÆ000X2a2a2SCFEFGDDDDDDDDDDDDDDD00X2Y2DCFEF6GÆÆÆÆX2Y2a2a2a2a2SSMÆHIJÆÆÆÆÆÆÆÆÇÇÇÇÇL2Y2a2a2S6S6S6MÇÇÆÆÆÆK2K2a2a2a2a2a2a2a2ÆPQRÆÆÆÆÆÆÆÆÇÇHIJÇK2a2a2a2a2a2a2ÇÇÆÆÆÆÆÆK2K2K2a2a2a2a2ÆD\DÆÆÆÆÆÆÆÆÆÇPQRÇÇK2K2a2a2a2K2ÇÇÇ**ÆÆÆÆÆÆK2K2K2K2ÆÆÇÇ*ÇÆÆÆÆÆÆÆÇD\DÇÇÇÇK2K2K2ÇÇÇ \ No newline at end of file diff --git a/data/maps/FortreeCity_DecorationShop/border.bin b/data/maps/FortreeCity_DecorationShop/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/FortreeCity_DecorationShop/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc index 000c589c6..4ebde8a93 100644 --- a/data/maps/FortreeCity_DecorationShop/header.inc +++ b/data/maps/FortreeCity_DecorationShop/header.inc @@ -1,5 +1,5 @@ FortreeCity_DecorationShop: @ 848361C - .4byte FortreeCity_DecorationShop_MapAttributes + .4byte FortreeCity_DecorationShop_Layout .4byte FortreeCity_DecorationShop_MapEvents .4byte FortreeCity_DecorationShop_MapScripts .4byte 0x0 diff --git a/data/maps/FortreeCity_DecorationShop/map.bin b/data/maps/FortreeCity_DecorationShop/map.bin deleted file mode 100644 index 6ca8b4e61..000000000 --- a/data/maps/FortreeCity_DecorationShop/map.bin +++ /dev/null @@ -1 +0,0 @@ -ÈÉɾ¿ÉÉÊÐÑѾ¿ÑÑÒíî3Ï3¾¿Î3î3ïõö×ÆÇÖö÷Ù3Ù3Ù3Ù3Ù3Ù3Ù3Ù3Ì7Ù3Ù3ÔÕÙ3Ù3Í7 \ No newline at end of file diff --git a/data/maps/FortreeCity_Gym/border.bin b/data/maps/FortreeCity_Gym/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/FortreeCity_Gym/border.bin and /dev/null differ diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc index 08e50e944..eb241b368 100644 --- a/data/maps/FortreeCity_Gym/header.inc +++ b/data/maps/FortreeCity_Gym/header.inc @@ -1,5 +1,5 @@ FortreeCity_Gym: @ 848353C - .4byte FortreeCity_Gym_MapAttributes + .4byte FortreeCity_Gym_Layout .4byte FortreeCity_Gym_MapEvents .4byte FortreeCity_Gym_MapScripts .4byte 0x0 diff --git a/data/maps/FortreeCity_Gym/map.bin b/data/maps/FortreeCity_Gym/map.bin deleted file mode 100644 index cff943707..000000000 Binary files a/data/maps/FortreeCity_Gym/map.bin and /dev/null differ diff --git a/data/maps/FortreeCity_House1/border.bin b/data/maps/FortreeCity_House1/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/FortreeCity_House1/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc index 4aeeb4425..06dd18e1c 100644 --- a/data/maps/FortreeCity_House1/header.inc +++ b/data/maps/FortreeCity_House1/header.inc @@ -1,5 +1,5 @@ FortreeCity_House1: @ 8483520 - .4byte FortreeCity_House1_MapAttributes + .4byte FortreeCity_House1_Layout .4byte FortreeCity_House1_MapEvents .4byte FortreeCity_House1_MapScripts .4byte 0x0 diff --git a/data/maps/FortreeCity_House1/map.bin b/data/maps/FortreeCity_House1/map.bin deleted file mode 100644 index 5a3ac8cb6..000000000 --- a/data/maps/FortreeCity_House1/map.bin +++ /dev/null @@ -1 +0,0 @@ -ÈÉɾ¿ÉÉÊÐàѾ¿ÑÑÒØ3è3Ü3¾¿Û3Ù3Ú3Ù3Ù3Ü3ÆÇÛ3Ù3Ù3Ù3Ù3Ù3Ù3Ù3Ù3Ù3Ù3Ì7Ù3Ù3ÔÕÙ3Ù3Í7 \ No newline at end of file diff --git a/data/maps/FortreeCity_House2/border.bin b/data/maps/FortreeCity_House2/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/FortreeCity_House2/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc index 30cad4def..62461784f 100644 --- a/data/maps/FortreeCity_House2/header.inc +++ b/data/maps/FortreeCity_House2/header.inc @@ -1,5 +1,5 @@ FortreeCity_House2: @ 84835AC - .4byte FortreeCity_House2_MapAttributes + .4byte FortreeCity_House2_Layout .4byte FortreeCity_House2_MapEvents .4byte FortreeCity_House2_MapScripts .4byte 0x0 diff --git a/data/maps/FortreeCity_House2/map.bin b/data/maps/FortreeCity_House2/map.bin deleted file mode 100644 index 3fbcd6043..000000000 --- a/data/maps/FortreeCity_House2/map.bin +++ /dev/null @@ -1 +0,0 @@ -ÈÉɾ¿ÉËÊÐã便ÑÒØ3ë7ì7¾¿Û3Ó3Ú3Ù3Ù3Ü3ÆÇÛ3Ù3Ù3Ù3Ù3Ù3Ù3Ù3Ù3Ù3Ù3Ì7Ù3Ù3ÔÕÙ3Ù3Í7 \ No newline at end of file diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc index 2e2c7813d..54297f446 100644 --- a/data/maps/FortreeCity_House3/header.inc +++ b/data/maps/FortreeCity_House3/header.inc @@ -1,5 +1,5 @@ FortreeCity_House3: @ 84835C8 - .4byte FortreeCity_House3_MapAttributes + .4byte FortreeCity_House1_Layout .4byte FortreeCity_House3_MapEvents .4byte FortreeCity_House3_MapScripts .4byte 0x0 diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc index 59c17803e..71002c7da 100644 --- a/data/maps/FortreeCity_House4/header.inc +++ b/data/maps/FortreeCity_House4/header.inc @@ -1,5 +1,5 @@ FortreeCity_House4: @ 84835E4 - .4byte FortreeCity_House4_MapAttributes + .4byte FortreeCity_House2_Layout .4byte FortreeCity_House4_MapEvents .4byte FortreeCity_House4_MapScripts .4byte 0x0 diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc index deaa634a8..6513cde1e 100644 --- a/data/maps/FortreeCity_House5/header.inc +++ b/data/maps/FortreeCity_House5/header.inc @@ -1,5 +1,5 @@ FortreeCity_House5: @ 8483600 - .4byte FortreeCity_House5_MapAttributes + .4byte FortreeCity_House1_Layout .4byte FortreeCity_House5_MapEvents .4byte FortreeCity_House5_MapScripts .4byte 0x0 diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc index 03ee88852..18cb7b971 100644 --- a/data/maps/FortreeCity_Mart/header.inc +++ b/data/maps/FortreeCity_Mart/header.inc @@ -1,5 +1,5 @@ FortreeCity_Mart: @ 8483590 - .4byte FortreeCity_Mart_MapAttributes + .4byte Mart_Layout .4byte FortreeCity_Mart_MapEvents .4byte FortreeCity_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc index d065198ad..ae2b8e0e8 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ FortreeCity_PokemonCenter_1F: @ 8483558 - .4byte FortreeCity_PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte FortreeCity_PokemonCenter_1F_MapEvents .4byte FortreeCity_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc index 5eb3483c3..adb7a7bde 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ FortreeCity_PokemonCenter_2F: @ 8483574 - .4byte FortreeCity_PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte FortreeCity_PokemonCenter_2F_MapEvents .4byte FortreeCity_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/GraniteCave_1F/border.bin b/data/maps/GraniteCave_1F/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/GraniteCave_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc index ebd93d4eb..3d29c272a 100644 --- a/data/maps/GraniteCave_1F/header.inc +++ b/data/maps/GraniteCave_1F/header.inc @@ -1,5 +1,5 @@ GraniteCave_1F: @ 8483F84 - .4byte GraniteCave_1F_MapAttributes + .4byte GraniteCave_1F_Layout .4byte GraniteCave_1F_MapEvents .4byte GraniteCave_1F_MapScripts .4byte 0x0 diff --git a/data/maps/GraniteCave_1F/map.bin b/data/maps/GraniteCave_1F/map.bin deleted file mode 100644 index 58c7945ab..000000000 --- a/data/maps/GraniteCave_1F/map.bin +++ /dev/null @@ -1,5 +0,0 @@ -22222222222222222222222?22''2222222222222222222222222222222    "2222222222222222222222222222222222222222222222222222222222226222222   -222222222222222222222J6R6F622222 $#  -22222222222<22222222;62;622222# -22222222# XYZ  "222;62;62?22      "#     -2222# "# "2;2;6222#   "2222#      "#       $'# XYZ$$#            $#         $ \ No newline at end of file diff --git a/data/maps/GraniteCave_B1F/border.bin b/data/maps/GraniteCave_B1F/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/GraniteCave_B1F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc index de946f84c..6ab42f082 100644 --- a/data/maps/GraniteCave_B1F/header.inc +++ b/data/maps/GraniteCave_B1F/header.inc @@ -1,5 +1,5 @@ GraniteCave_B1F: @ 8483FA0 - .4byte GraniteCave_B1F_MapAttributes + .4byte GraniteCave_B1F_Layout .4byte GraniteCave_B1F_MapEvents .4byte GraniteCave_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/GraniteCave_B1F/map.bin b/data/maps/GraniteCave_B1F/map.bin deleted file mode 100644 index 27f98c6cf..000000000 --- a/data/maps/GraniteCave_B1F/map.bin +++ /dev/null @@ -1,10 +0,0 @@ -2/2/2/2/2/2/22222222/2/2/2/2/2/2/2/2!!!! -222/2/2/2/2/2/22222222/2/2/2/2/2/2/2/2?2222!!!!!! -2?222/2/2/2/2/2/2/2/22222!!!!! -/2/2/2/2/2/222222222/2/2/222?222/2/2/2/2/2/2/222222222/2/2/222222/2/2/2/2/2/2/222222#!#!! -222222#!#!#!#!!!!!!!#222222è0Ž2•è0–222222222222222222222222222222222222222222222222>2222?22222   -222   -222222222222222222222222222  #222222222222222#   -2222222222222222222222222222222222#   -222222=22#  -222 !!!!"2222?222222222#     !!!"#   ###    ##      #     ##       ##                              # \ No newline at end of file diff --git a/data/maps/GraniteCave_B2F/border.bin b/data/maps/GraniteCave_B2F/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/GraniteCave_B2F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc index 0442638f9..95935c283 100644 --- a/data/maps/GraniteCave_B2F/header.inc +++ b/data/maps/GraniteCave_B2F/header.inc @@ -1,5 +1,5 @@ GraniteCave_B2F: @ 8483FBC - .4byte GraniteCave_B2F_MapAttributes + .4byte GraniteCave_B2F_Layout .4byte GraniteCave_B2F_MapEvents .4byte GraniteCave_B2F_MapScripts .4byte 0x0 diff --git a/data/maps/GraniteCave_B2F/map.bin b/data/maps/GraniteCave_B2F/map.bin deleted file mode 100644 index bbf8dc7af..000000000 --- a/data/maps/GraniteCave_B2F/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -2222222222222222222222262222222222S22222222222222'62>22222222222:2>22222222222222222222222222:2     "222222222222222222>22BR22222226222222222222222222222 $P622            $$        $    666666666666666666666666666666666666666666666S66622  2 2b6 2 2"22S622222222222222222222222222222222222222>2222222222222222222222222222'2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222     -222222222222222222222222222222'222   $22=222222222222     "'222$            $$    $$                $$      $$                              # \ No newline at end of file diff --git a/data/maps/GraniteCave_StevensRoom/border.bin b/data/maps/GraniteCave_StevensRoom/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/GraniteCave_StevensRoom/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc index 569d46b98..0644d8cb7 100644 --- a/data/maps/GraniteCave_StevensRoom/header.inc +++ b/data/maps/GraniteCave_StevensRoom/header.inc @@ -1,5 +1,5 @@ GraniteCave_StevensRoom: @ 8483FD8 - .4byte GraniteCave_StevensRoom_MapAttributes + .4byte GraniteCave_StevensRoom_Layout .4byte GraniteCave_StevensRoom_MapEvents .4byte GraniteCave_StevensRoom_MapScripts .4byte 0x0 diff --git a/data/maps/GraniteCave_StevensRoom/map.bin b/data/maps/GraniteCave_StevensRoom/map.bin deleted file mode 100644 index 3dc6987c2..000000000 --- a/data/maps/GraniteCave_StevensRoom/map.bin +++ /dev/null @@ -1,4 +0,0 @@ -   22222222222222222222222222$! -22222$ -2222$ -$!!!!!$$!!!!!!!!$$!!!!!!!!!!$ \ No newline at end of file diff --git a/data/maps/InsideOfTruck/border.bin b/data/maps/InsideOfTruck/border.bin deleted file mode 100644 index 8459c2996..000000000 --- a/data/maps/InsideOfTruck/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc index 7e63d060f..c77ea5934 100644 --- a/data/maps/InsideOfTruck/header.inc +++ b/data/maps/InsideOfTruck/header.inc @@ -1,5 +1,5 @@ InsideOfTruck: @ 8484EF0 - .4byte InsideOfTruck_MapAttributes + .4byte InsideOfTruck_Layout .4byte InsideOfTruck_MapEvents .4byte InsideOfTruck_MapScripts .4byte 0x0 diff --git a/data/maps/InsideOfTruck/map.bin b/data/maps/InsideOfTruck/map.bin deleted file mode 100644 index 84b946be5..000000000 --- a/data/maps/InsideOfTruck/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -  -2 2 22222!"#$  \ No newline at end of file diff --git a/data/maps/IslandCave/border.bin b/data/maps/IslandCave/border.bin deleted file mode 100644 index c07869a9f..000000000 --- a/data/maps/IslandCave/border.bin +++ /dev/null @@ -1 +0,0 @@ -ÙÙÙÙ \ No newline at end of file diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc index 9b9e2b739..6ff291c29 100644 --- a/data/maps/IslandCave/header.inc +++ b/data/maps/IslandCave/header.inc @@ -1,5 +1,5 @@ IslandCave: @ 8484614 - .4byte IslandCave_MapAttributes + .4byte IslandCave_Layout .4byte IslandCave_MapEvents .4byte IslandCave_MapScripts .4byte 0x0 diff --git a/data/maps/IslandCave/map.bin b/data/maps/IslandCave/map.bin deleted file mode 100644 index a7fa61b4d..000000000 Binary files a/data/maps/IslandCave/map.bin and /dev/null differ diff --git a/data/maps/JaggedPass/border.bin b/data/maps/JaggedPass/border.bin deleted file mode 100644 index 9ae2c2126..000000000 --- a/data/maps/JaggedPass/border.bin +++ /dev/null @@ -1 +0,0 @@ -qqqq \ No newline at end of file diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc index ad1a4640f..f6fc90e4e 100644 --- a/data/maps/JaggedPass/header.inc +++ b/data/maps/JaggedPass/header.inc @@ -1,5 +1,5 @@ JaggedPass: @ 848402C - .4byte JaggedPass_MapAttributes + .4byte JaggedPass_Layout .4byte JaggedPass_MapEvents .4byte JaggedPass_MapScripts .4byte 0x0 diff --git a/data/maps/JaggedPass/map.bin b/data/maps/JaggedPass/map.bin deleted file mode 100644 index 57195b4f5..000000000 Binary files a/data/maps/JaggedPass/map.bin and /dev/null differ diff --git a/data/maps/LavaridgeTown/border.bin b/data/maps/LavaridgeTown/border.bin deleted file mode 100644 index 9ae2c2126..000000000 --- a/data/maps/LavaridgeTown/border.bin +++ /dev/null @@ -1 +0,0 @@ -qqqq \ No newline at end of file diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc index 138cc6778..12cc74b5f 100644 --- a/data/maps/LavaridgeTown/header.inc +++ b/data/maps/LavaridgeTown/header.inc @@ -1,5 +1,5 @@ LavaridgeTown: @ 8482608 - .4byte LavaridgeTown_MapAttributes + .4byte LavaridgeTown_Layout .4byte LavaridgeTown_MapEvents .4byte LavaridgeTown_MapScripts .4byte LavaridgeTown_MapConnections diff --git a/data/maps/LavaridgeTown/map.bin b/data/maps/LavaridgeTown/map.bin deleted file mode 100644 index 604ad5f3f..000000000 --- a/data/maps/LavaridgeTown/map.bin +++ /dev/null @@ -1,3 +0,0 @@ -qqqq{ttttt|qqqqqqq66{tttzq2®2®2®2®2xttttttttr{™š››œ2tž2|qqqNKLOq6rr¡£2¼2£2£2¥JHIMyy0123rr¡»233»2¥PQRS2289:;Æ4Æ4rr©ª2£2¼2¬2­XYZ[Ö5×5`ABCÆ4Æ4rr±²³³´µ`abcæ5ç50 1"1044rrº2¨2¨2¨2¹2Š20 1"10000 1"1000rr¨2˜2¨2˜2Œ2’20 1"1000 1"1000rr¨ B¨ BŠ00 1!11111!1!1111rr‘2‘‘2‘’200(1)1)1)1)1)1)1)1)1)1)1rrª1«1«1«1«1¬1000000000000rr²³³³³´0000 0 0 -00 0 0 -00rr¸¹º³»¼0000rrÀÁÂÅß000  Æ4rrÈ1É1ÊÍ˧000 !" !"Æ4rr00000000000040000Æ4m000000000000000Æ4Æ4qqrm0000000000000044qqllllllllllllllll \ No newline at end of file diff --git a/data/maps/LavaridgeTown_Gym_1F/border.bin b/data/maps/LavaridgeTown_Gym_1F/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/LavaridgeTown_Gym_1F/border.bin and /dev/null differ diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc index f473ddaee..30cde2e9c 100644 --- a/data/maps/LavaridgeTown_Gym_1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_1F/header.inc @@ -1,5 +1,5 @@ LavaridgeTown_Gym_1F: @ 8482CD0 - .4byte LavaridgeTown_Gym_1F_MapAttributes + .4byte LavaridgeTown_Gym_1F_Layout .4byte LavaridgeTown_Gym_1F_MapEvents .4byte LavaridgeTown_Gym_1F_MapScripts .4byte 0x0 diff --git a/data/maps/LavaridgeTown_Gym_1F/map.bin b/data/maps/LavaridgeTown_Gym_1F/map.bin deleted file mode 100644 index 31d16da5e..000000000 --- a/data/maps/LavaridgeTown_Gym_1F/map.bin +++ /dev/null @@ -1,3 +0,0 @@ -   22222' 222 2222  22222  2222 222  222222  2222  2222  222222  2222  2222 2222  22  222      2222 2 2  22  22  22  !"#$  2222  22  22  22222  2222  22  22  2222  2222  22  22 %&&&&  22 2  22 22222 222 %&  22 22222 2222  22  222 -2222222222 -22  222222222 2222222  22220022 \ No newline at end of file diff --git a/data/maps/LavaridgeTown_Gym_B1F/border.bin b/data/maps/LavaridgeTown_Gym_B1F/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/LavaridgeTown_Gym_B1F/border.bin and /dev/null differ diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc index c188cd5ba..66d732921 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc @@ -1,5 +1,5 @@ LavaridgeTown_Gym_B1F: @ 8482CEC - .4byte LavaridgeTown_Gym_B1F_MapAttributes + .4byte LavaridgeTown_Gym_B1F_Layout .4byte LavaridgeTown_Gym_B1F_MapEvents .4byte LavaridgeTown_Gym_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/LavaridgeTown_Gym_B1F/map.bin b/data/maps/LavaridgeTown_Gym_B1F/map.bin deleted file mode 100644 index aeaf0177c..000000000 --- a/data/maps/LavaridgeTown_Gym_B1F/map.bin +++ /dev/null @@ -1,6 +0,0 @@ -++++)+++++)++++++3333(33333(3333332222022;220222222 22822 -222222 -282222++++)++)+)+++)+++33331331313331333<22;1221212221222 22221 221 21 2221 222 22221 221 21 2221 222 22221 22191 2221 22292221 221 21%&&1%&& 22221%&1 21 2221 222%&&&1 221 21 2281 222 22221 221 21 2221 222 2822(92( 21 2221 222 22220 220 21%&&( 222 2222: -222 -21 2220 2229222222221 222: -222 22228222219222222 \ No newline at end of file diff --git a/data/maps/LavaridgeTown_HerbShop/border.bin b/data/maps/LavaridgeTown_HerbShop/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/LavaridgeTown_HerbShop/border.bin and /dev/null differ diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc index 5e3fd99a0..c9ef33f92 100644 --- a/data/maps/LavaridgeTown_HerbShop/header.inc +++ b/data/maps/LavaridgeTown_HerbShop/header.inc @@ -1,5 +1,5 @@ LavaridgeTown_HerbShop: @ 8482CB4 - .4byte LavaridgeTown_HerbShop_MapAttributes + .4byte LavaridgeTown_HerbShop_Layout .4byte LavaridgeTown_HerbShop_MapEvents .4byte LavaridgeTown_HerbShop_MapScripts .4byte 0x0 diff --git a/data/maps/LavaridgeTown_HerbShop/map.bin b/data/maps/LavaridgeTown_HerbShop/map.bin deleted file mode 100644 index cc0294a80..000000000 --- a/data/maps/LavaridgeTown_HerbShop/map.bin +++ /dev/null @@ -1 +0,0 @@ -ˆ‹ˆˆˆ‡‡“•‡‡‡3¦2¦2¦2¦2¥x2p2p2p2p2¢¢¢¢¢­€2h2h2h2x2p2p2p2p2p2y2h2h2h23€2h2h2h2h2h2h2h2h2h2ß2g2h2h2h2h2h2h2h2f2Z2abh2h2h2h2h2ab \ No newline at end of file diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc index f48bf4035..aa8a822f5 100644 --- a/data/maps/LavaridgeTown_House/header.inc +++ b/data/maps/LavaridgeTown_House/header.inc @@ -1,5 +1,5 @@ LavaridgeTown_House: @ 8482D08 - .4byte LavaridgeTown_House_MapAttributes + .4byte House3_Layout .4byte LavaridgeTown_House_MapEvents .4byte LavaridgeTown_House_MapScripts .4byte 0x0 diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc index b3f901570..72d8699f1 100644 --- a/data/maps/LavaridgeTown_Mart/header.inc +++ b/data/maps/LavaridgeTown_Mart/header.inc @@ -1,5 +1,5 @@ LavaridgeTown_Mart: @ 8482D24 - .4byte LavaridgeTown_Mart_MapAttributes + .4byte Mart_Layout .4byte LavaridgeTown_Mart_MapEvents .4byte LavaridgeTown_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/border.bin b/data/maps/LavaridgeTown_PokemonCenter_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc index 30009b084..b3444dc0f 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ LavaridgeTown_PokemonCenter_1F: @ 8482D40 - .4byte LavaridgeTown_PokemonCenter_1F_MapAttributes + .4byte LavaridgeTown_PokemonCenter_1F_Layout .4byte LavaridgeTown_PokemonCenter_1F_MapEvents .4byte LavaridgeTown_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.bin b/data/maps/LavaridgeTown_PokemonCenter_1F/map.bin deleted file mode 100644 index d841f9f1a..000000000 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -°±²   JK   ¸¹ºH"#RSI2À2Á2Â2P*+2[Q$2222 2&222X!!!Y<222'2 24222`2l2m2n2o22%222'2€22222021222322222'2ˆ6‰B228292:2;2242=>'22‘2222@2A2B2C22&2EF'2(2222222222&2427 \ No newline at end of file diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc index 26a5fd642..596b0e189 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ LavaridgeTown_PokemonCenter_2F: @ 8482D5C - .4byte LavaridgeTown_PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte LavaridgeTown_PokemonCenter_2F_MapEvents .4byte LavaridgeTown_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity/border.bin b/data/maps/LilycoveCity/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/LilycoveCity/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc index 37ec48371..1ec7fa26e 100644 --- a/data/maps/LilycoveCity/header.inc +++ b/data/maps/LilycoveCity/header.inc @@ -1,5 +1,5 @@ LilycoveCity: @ 8482544 - .4byte LilycoveCity_MapAttributes + .4byte LilycoveCity_Layout .4byte LilycoveCity_MapEvents .4byte LilycoveCity_MapScripts .4byte LilycoveCity_MapConnections diff --git a/data/maps/LilycoveCity/map.bin b/data/maps/LilycoveCity/map.bin deleted file mode 100644 index 5d6b56ad9..000000000 Binary files a/data/maps/LilycoveCity/map.bin and /dev/null differ diff --git a/data/maps/LilycoveCity_ContestHall/border.bin b/data/maps/LilycoveCity_ContestHall/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LilycoveCity_ContestHall/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc index f8f05f874..d0b17f863 100644 --- a/data/maps/LilycoveCity_ContestHall/header.inc +++ b/data/maps/LilycoveCity_ContestHall/header.inc @@ -1,5 +1,5 @@ LilycoveCity_ContestHall: @ 84836C4 - .4byte LilycoveCity_ContestHall_MapAttributes + .4byte LilycoveCity_ContestHall_Layout .4byte LilycoveCity_ContestHall_MapEvents .4byte LilycoveCity_ContestHall_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_ContestHall/map.bin b/data/maps/LilycoveCity_ContestHall/map.bin deleted file mode 100644 index 06fdae4f7..000000000 --- a/data/maps/LilycoveCity_ContestHall/map.bin +++ /dev/null @@ -1,3 +0,0 @@ -///////////////////////////////2222222222~†–vŽ 2222222222//// -˜¨ˆ ////22222<=>bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb<=> 22222//// -DEF. 2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2"2,DEF////<=>bbbb6(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*24bbbb<=>DEF. 2!2!2!2!202`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`222!2!2!2!2"2,DEFbbbb6(2`2`2`2`2`2`2`2`2`2`2`2`2              f2`2`2`2`2`2`2`2`2`2`2`2*24bbbb 2!2!2!2!202`2`2J2`2`2`2`2`2`2`2`2`2$%2%2%2%2%2%2%2%2%2%2%2%2%2&f2`2`2`2`2`2`2`2`2J2`2`222!2!2!2!2"2(2`2`2`2`2`2`2`2R`2`2`2`2`2`2`2`2`2$%2%2hiiiiiiij%2%2&f2`2`2`2`2`2`2`2`2R`2`2`2`2`2`2`2*2(2`2J2`2`2J2`2`2`2`2`2`2H2`2H2`2`2`2$%2%2pq2q2q2q2q2o2q2r%2%2&f2`2`2I2`2I2`2`2`2`2`2`2J2`2`2J2`2*2(2`2R`2`2R`2`2`2`2`2`2P2`2P2`2`2`2$%2%2pq2q2q2‘2qwBqr%2%2&f2`2`2Q2`2Q2`2`2`2`2`2`2R`2`2R`2*2(2`2`2`2`2`2`2`2`2`2`2`2X2`2X2`2`2`2$%2%2pq2q2q2™2q2qq2r%2%2&f2`2`2Y2`2Y2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2$%2%2pq2q2q2q2q2q2q2r%2%2&f2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2H2`2H2`2`2`2$%2%2xyy{2|2}2yyz%2%2&f2`2`2I2`2I2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2P2`2P2`2`2`222222ƒ2„2…222222f2`2`2Q2`2Q2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2ƒ2„2…2f2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2Æ2_2_2_2_2_2_2_2_2_2_2_2_2_2_2g2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2              f2`2`2`2`2`2`2`2`2              f2`2`2`2`2*2(2`2`2`2`2`2$%2%2%2%2%2%2%2%2%2%2%2%2%2&f2`2`2`2`2`2`2`2`2$%2%2%2%2%2%2%2%2%2%2%2%2%2&f2`2`2`2`2*2(2`2`2`2`2`2$%2%2hiiiiiiij%2%2&f2I2`2`2`2`2`2H2`2$%2%2hiiiiiiij%2%2&f2`2`2`2`2*2(2`2H2`2H2`2$%2%2pq2q2q2q2q2o2q2r%2%2&f2Q2`2`2`2`2`2P2`2$%2%2pq2q2q2q2q2o2q2r%2%2&f2I2`2I2`2*2(2`2P2`2P2`2$%2%2pq2q2q2¡2qwBqr%2%2&f2Y2`2`2`2`2`2X2`2$%2%2pq2q2q2’2qwBqr%2%2&f2Q2`2Q2`2*2(2`2X2`2X2`2$%2%2pq2q2q2©2q2qq2r%2%2&f2`2`2`2`2`2`2`2`2$%2%2pq2q2q2š2q2qq2r%2%2&f2Y2`2Y2`2*2(2`2`2`2`2`2$%2%2pq2q2q2q2q2q2q2r%2%2&f2I2`2`2`2`2`2H2`2$%2%2pq2q2q2q2q2q2q2r%2%2&f2`2`2`2`2*2(2`2H2`2H2`2$%2%2xyy‹2Œ22yyz%2%2&f2Q2`2`2`2`2`2P2`2$%2%2xyy«2¬2­2yyz%2%2&f2I2`2I2`2*2(2`2P2`2P2`222222“2”2•222222f2Y2`2`2`2`2`2X2`222222³2´2µ222222f2Q2`2Q2`2*2(2`2X2`2X2`2“2”2•2f2`2`2`2`2`2`2`2`2³2´2µ2f2Y2`2Y2`2*2(2`2`2`2`2`2Æ2_2_2_2_2_2_2_2_2_2_2_2_2_2_2g2`2`2`2`2`2`2`2`2Æ2_2_2_2_2_2_2_2_2_2_2_2_2_2_2g2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2J2`2`2`2J2`2`2`2J2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2J2`2`2`2J2`2`2`2J2`2`2*2(2`2`2R`2`2`2R`2`2`2R`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2R`2`2`2R`2`2`2R`2`2*2 \ No newline at end of file diff --git a/data/maps/LilycoveCity_ContestLobby/border.bin b/data/maps/LilycoveCity_ContestLobby/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LilycoveCity_ContestLobby/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc index 674726f47..ddd0d6284 100644 --- a/data/maps/LilycoveCity_ContestLobby/header.inc +++ b/data/maps/LilycoveCity_ContestLobby/header.inc @@ -1,5 +1,5 @@ LilycoveCity_ContestLobby: @ 84836A8 - .4byte LilycoveCity_ContestLobby_MapAttributes + .4byte LilycoveCity_ContestLobby_Layout .4byte LilycoveCity_ContestLobby_MapEvents .4byte LilycoveCity_ContestLobby_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_ContestLobby/map.bin b/data/maps/LilycoveCity_ContestLobby/map.bin deleted file mode 100644 index 122962e42..000000000 --- a/data/maps/LilycoveCity_ContestLobby/map.bin +++ /dev/null @@ -1 +0,0 @@ -ÊÊÊÊÊÊÊÊ[\]ÊÊÊ:;ÊÊÊM[\]ÊÊÊÊÊÊÊÊbbbÉbÉbÉc6deÌbbBCbbÌc6deÉbÉbÉbbT 2!2!2!2!2!2!2!2!2!2!2ÐÑ2ž2×2×2®2Ñ2àU2!2!2!2!2!2!2!2!2!2!2"2(2`2`2`2`2`2`2`2`2`2`2ØÙ¦ß߶Ùèf2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2Æ2_2_2_2_2_2_2_2g2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2Ý`2`2`2Ý`2`2*282`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`292@2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2A2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*282`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2Ý`2`2`2Ý`2`292@2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2A2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*2 \ No newline at end of file diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin b/data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc index 149ff5359..ed380598b 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_CoveLilyMotel_1F: @ 8483638 - .4byte LilycoveCity_CoveLilyMotel_1F_MapAttributes + .4byte LilycoveCity_CoveLilyMotel_1F_Layout .4byte LilycoveCity_CoveLilyMotel_1F_MapEvents .4byte LilycoveCity_CoveLilyMotel_1F_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin deleted file mode 100644 index 5242f8e57..000000000 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -ãa¾¿äë ÆÇ ìó2!2!2!2!2Î2Ï2¨2!2!2@2ô2!2)2)2)2)2)2)2)2)2)2)2)2!2D2NOD2)2)2D2N_D2)2!2D2VWD2)2)2D2VWD2)2!2)2)2)2)2)2)2)2)2)2)2)2 333333333333#3333333333 \ No newline at end of file diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin b/data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc index ade9f1a37..200e1b7bb 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_CoveLilyMotel_2F: @ 8483654 - .4byte LilycoveCity_CoveLilyMotel_2F_MapAttributes + .4byte LilycoveCity_CoveLilyMotel_2F_Layout .4byte LilycoveCity_CoveLilyMotel_2F_MapEvents .4byte LilycoveCity_CoveLilyMotel_2F_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin deleted file mode 100644 index 4484b5b55..000000000 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin +++ /dev/null @@ -1 +0,0 @@ -ãa°¾¿äë¸ÆÇìó2!2!2!2!2!2!2!2À2Î2Ï2ô2!2)2N_D2)2)2D2NOD2)2!2D2VWD2)2)2D2VWD2)2!2)2)2)2)2)2)2)2)2)2)2)2!2D2NOD2)2)2)2N_)2)2!2D2VWD2)2)2D2VW)2)2!2)2)2)2)2)2)2)2)2)2)2)2 \ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/border.bin b/data/maps/LilycoveCity_DepartmentStoreElevator/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/LilycoveCity_DepartmentStoreElevator/border.bin and /dev/null differ diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc index 959699237..b5135b1ff 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStoreElevator: @ 84838A0 - .4byte LilycoveCity_DepartmentStoreElevator_MapAttributes + .4byte LilycoveCity_DepartmentStoreElevator_Layout .4byte LilycoveCity_DepartmentStoreElevator_MapEvents .4byte LilycoveCity_DepartmentStoreElevator_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.bin b/data/maps/LilycoveCity_DepartmentStoreElevator/map.bin deleted file mode 100644 index 7d9ae193b..000000000 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/map.bin +++ /dev/null @@ -1 +0,0 @@ -(***,011148999<\2]2]2]2]2d2e2e2e2f2d2O2W2e2f2 \ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin b/data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin deleted file mode 100644 index c1b82435c..000000000 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc index 3cf0cac45..3a96f4c3b 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStoreRooftop: @ 8483884 - .4byte LilycoveCity_DepartmentStoreRooftop_MapAttributes + .4byte LilycoveCity_DepartmentStoreRooftop_Layout .4byte LilycoveCity_DepartmentStoreRooftop_MapEvents .4byte LilycoveCity_DepartmentStoreRooftop_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin deleted file mode 100644 index e9125baf0..000000000 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin +++ /dev/null @@ -1 +0,0 @@ -&oo'.S2S2S2S2S2S2S2S2wwS2NO5/6É2Ê2J2J2J2J2J2J2M2M23VW=z'6ËÌJ2J2J2J2J2J2J2J2J2^_ET2S2/6É2Ê2J2J2J2J2J2J2J2J2J2M2M2M2M2À676ËÌJ2J2Á6Â6J2J2Á6Â6J2J2J2J2J2À67>U2[2[2[2[2[2[2[2[2[2[2[2[2[2[2[2?FccccccccccccccccGäååååååååååååååååæìðñíííííðñíííííðñîìøùíííííøùíííííøùîìííííííííííííííííî \ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/border.bin b/data/maps/LilycoveCity_DepartmentStore_1F/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/LilycoveCity_DepartmentStore_1F/border.bin and /dev/null differ diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc index 140fe3568..2ad060976 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStore_1F: @ 84837F8 - .4byte LilycoveCity_DepartmentStore_1F_MapAttributes + .4byte LilycoveCity_DepartmentStore_1F_Layout .4byte LilycoveCity_DepartmentStore_1F_MapEvents .4byte LilycoveCity_DepartmentStore_1F_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.bin b/data/maps/LilycoveCity_DepartmentStore_1F/map.bin deleted file mode 100644 index 2d3d15360..000000000 --- a/data/maps/LilycoveCity_DepartmentStore_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -ˆ|}~ˆˆˆˆˆˆˆˆˆˆˆ  „…†œPx2Ž2Ÿ22p2p2¤Ô2˜2™2˜2¥x2p2p2p2p2p2€2h2h2h2h2h2¬¡ ¡ ­€2h2h2h2n2h2ß2g2h2h2h2h2q2p2p2p2p2p2y2h2h2h2h2h2abhh2h2h2h2h2h2h2h2h2h2h2h2h2n2h2ß2g2h2h2h2h2h2h2h2h2h2h2h2h2l2h2l2l2abh2h2h2h2h2h2h2h2h2h2th2tt \ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/border.bin b/data/maps/LilycoveCity_DepartmentStore_2F/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/LilycoveCity_DepartmentStore_2F/border.bin and /dev/null differ diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc index 7d28c44b6..e4ebc314a 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStore_2F: @ 8483814 - .4byte LilycoveCity_DepartmentStore_2F_MapAttributes + .4byte LilycoveCity_DepartmentStore_2F_Layout .4byte LilycoveCity_DepartmentStore_2F_MapEvents .4byte LilycoveCity_DepartmentStore_2F_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.bin b/data/maps/LilycoveCity_DepartmentStore_2F/map.bin deleted file mode 100644 index 82ca90b08..000000000 --- a/data/maps/LilycoveCity_DepartmentStore_2F/map.bin +++ /dev/null @@ -1 +0,0 @@ -ˆ|}~ˆˆˆˆˆˆ    „…†PQ 2–2§2—22222222222222222222222222222222m222ª«22Ý2›2›2›2›2Ý222ª«2u223422ž££££ž22342222²³22¤ 2222ž22²³2m2222222Þ2222Ñ22222u \ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/border.bin b/data/maps/LilycoveCity_DepartmentStore_3F/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/LilycoveCity_DepartmentStore_3F/border.bin and /dev/null differ diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc index 2f94cc924..bb8cd73f7 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStore_3F: @ 8483830 - .4byte LilycoveCity_DepartmentStore_3F_MapAttributes + .4byte LilycoveCity_DepartmentStore_3F_Layout .4byte LilycoveCity_DepartmentStore_3F_MapEvents .4byte LilycoveCity_DepartmentStore_3F_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.bin b/data/maps/LilycoveCity_DepartmentStore_3F/map.bin deleted file mode 100644 index c10b776f5..000000000 --- a/data/maps/LilycoveCity_DepartmentStore_3F/map.bin +++ /dev/null @@ -1 +0,0 @@ -ˆ|}~ˆˆˆˆ6    „…†œ•‡‡‡6QP 2–2¯2—222¤C2®2®2®2¥ 222222222222¬¢¢¢¢­22222222+,2222222222+,2222342222222222342222;<2222222222;<22222222222222222222 \ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/border.bin b/data/maps/LilycoveCity_DepartmentStore_4F/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/LilycoveCity_DepartmentStore_4F/border.bin and /dev/null differ diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc index 8318c0edc..9bc54b809 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStore_4F: @ 848384C - .4byte LilycoveCity_DepartmentStore_4F_MapAttributes + .4byte LilycoveCity_DepartmentStore_4F_Layout .4byte LilycoveCity_DepartmentStore_4F_MapEvents .4byte LilycoveCity_DepartmentStore_4F_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.bin b/data/maps/LilycoveCity_DepartmentStore_4F/map.bin deleted file mode 100644 index bc1a09e2c..000000000 --- a/data/maps/LilycoveCity_DepartmentStore_4F/map.bin +++ /dev/null @@ -1 +0,0 @@ -ˆ|}~ˆˆˆˆ    „…†PQ 2–2·2—222222222222222222222222222222222222222Ý2›2›2›2Ý222222222ª6«6222ž£££ž22ª6«6ª6«622²6³6222¤ 222ž22²6³6²6³62222222Þ222Ñ2222222 \ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/border.bin b/data/maps/LilycoveCity_DepartmentStore_5F/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/LilycoveCity_DepartmentStore_5F/border.bin and /dev/null differ diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc index da0c4a399..cf1448ab8 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStore_5F: @ 8483868 - .4byte LilycoveCity_DepartmentStore_5F_MapAttributes + .4byte LilycoveCity_DepartmentStore_5F_Layout .4byte LilycoveCity_DepartmentStore_5F_MapEvents .4byte LilycoveCity_DepartmentStore_5F_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.bin b/data/maps/LilycoveCity_DepartmentStore_5F/map.bin deleted file mode 100644 index 80acc3900..000000000 Binary files a/data/maps/LilycoveCity_DepartmentStore_5F/map.bin and /dev/null differ diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc index 1d8faa5d4..abaf3ad3f 100644 --- a/data/maps/LilycoveCity_Harbor/header.inc +++ b/data/maps/LilycoveCity_Harbor/header.inc @@ -1,5 +1,5 @@ LilycoveCity_Harbor: @ 8483750 - .4byte LilycoveCity_Harbor_MapAttributes + .4byte Harbor_Layout .4byte LilycoveCity_Harbor_MapEvents .4byte LilycoveCity_Harbor_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc index c298fe5f1..3d884a5d2 100644 --- a/data/maps/LilycoveCity_House1/header.inc +++ b/data/maps/LilycoveCity_House1/header.inc @@ -1,5 +1,5 @@ LilycoveCity_House1: @ 8483788 - .4byte LilycoveCity_House1_MapAttributes + .4byte House1_Layout .4byte LilycoveCity_House1_MapEvents .4byte LilycoveCity_House1_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_House2/border.bin b/data/maps/LilycoveCity_House2/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LilycoveCity_House2/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc index b2276441c..3d184d345 100644 --- a/data/maps/LilycoveCity_House2/header.inc +++ b/data/maps/LilycoveCity_House2/header.inc @@ -1,5 +1,5 @@ LilycoveCity_House2: @ 84837A4 - .4byte LilycoveCity_House2_MapAttributes + .4byte LilycoveCity_House2_Layout .4byte LilycoveCity_House2_MapEvents .4byte LilycoveCity_House2_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_House2/map.bin b/data/maps/LilycoveCity_House2/map.bin deleted file mode 100644 index e381f20eb..000000000 --- a/data/maps/LilycoveCity_House2/map.bin +++ /dev/null @@ -1 +0,0 @@ -ã±²¾¿ä빺ÆÇìó2Á2Â2!2!2Î2Ï2ô2Y2N6O6)2)2)2)2)2Y2V6W6D2)2)2)2)2!2)2)2)2)2)2)2)2 33333333#333333 \ No newline at end of file diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc index 2f3c3dc74..1a818490e 100644 --- a/data/maps/LilycoveCity_House3/header.inc +++ b/data/maps/LilycoveCity_House3/header.inc @@ -1,5 +1,5 @@ LilycoveCity_House3: @ 84837C0 - .4byte LilycoveCity_House3_MapAttributes + .4byte House2_Layout .4byte LilycoveCity_House3_MapEvents .4byte LilycoveCity_House3_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc index 6a2acb155..9632ffa39 100644 --- a/data/maps/LilycoveCity_House4/header.inc +++ b/data/maps/LilycoveCity_House4/header.inc @@ -1,5 +1,5 @@ LilycoveCity_House4: @ 84837DC - .4byte LilycoveCity_House4_MapAttributes + .4byte House1_Layout .4byte LilycoveCity_House4_MapEvents .4byte LilycoveCity_House4_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin b/data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc index 8b534ed9a..3721b4432 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_LilycoveMuseum_1F: @ 8483670 - .4byte LilycoveCity_LilycoveMuseum_1F_MapAttributes + .4byte LilycoveCity_LilycoveMuseum_1F_Layout .4byte LilycoveCity_LilycoveMuseum_1F_MapEvents .4byte LilycoveCity_LilycoveMuseum_1F_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin deleted file mode 100644 index 6e92a8b58..000000000 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -          !"#$% &'222222222222222222222222222222222 22222222 2 2 2 2 2 2 2 222222222222  -.  /  ‹2222222222256722222:2;2;2;2<22222222222 22222B()*DO222222222222222J012LO22:2;2;2;2;2<222222222RSSSTO22HSAS@I>22222222?2?2?2?2?2F22M2?2?2?2O22222222+222,>222842;2;2;29O222222223>22?2F222RSSSSTO222222?2F22222 \ No newline at end of file diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin b/data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc index 0cbbfb2e5..c5adc0fb1 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_LilycoveMuseum_2F: @ 848368C - .4byte LilycoveCity_LilycoveMuseum_2F_MapAttributes + .4byte LilycoveCity_LilycoveMuseum_2F_Layout .4byte LilycoveCity_LilycoveMuseum_2F_MapEvents .4byte LilycoveCity_LilycoveMuseum_2F_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin deleted file mode 100644 index 76a918838..000000000 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin +++ /dev/null @@ -1 +0,0 @@ -yyyzjklxyyy‚‰‰‰‰‰‰‰„rst…‰‰€‰‰‰Šq2p2q2p2q2p2q2Œq2p2q2q2p2ˆ‰‰‰p2q2p2q2p2i2h2i2h2i2h2i2h2i2h2i2h2i2p2q2p2q2q2d2e2f2g2h2i2h2i2d2e2f2g2h2i2h2i2d2e2f2g2h2p2†nnoƒ2h2i2h2†nnoƒ2h2i2h2†nnoƒ2q2ŽXYw{2i2h2i2ŽXYw{2i2h2i2ŽXYw{2p2|2}2~22ƒ2h2i2h2|2}2~22ƒ2h2i2h2|2}2~22ƒ2q2h2i2h2i2d2e2f2g2h2i2h2i2d2e2f2g2h2i2h2i2h2p2i2h2i2h2†nnoƒ2h2i2h2†nnoƒ2h2i2h2i2q2h2i2h2i2ŽXYw{2i2h2i2ŽXYw{2i2h2i2h2p2i2h2i2h2|2}2~22ƒ2h2i2h2|2}2~22ƒ2h2i2h2i2q2h2i2h2i2h2i2h2i2h2i2h2i2h2i2h2i2h2i2h2i2h2 \ No newline at end of file diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc index 5ef550b69..19e61cf16 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc @@ -1,5 +1,5 @@ LilycoveCity_MoveDeletersHouse: @ 848376C - .4byte LilycoveCity_MoveDeletersHouse_MapAttributes + .4byte House2_Layout .4byte LilycoveCity_MoveDeletersHouse_MapEvents .4byte LilycoveCity_MoveDeletersHouse_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc index 81f460c86..782efd3d0 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_PokemonCenter_1F: @ 84836E0 - .4byte LilycoveCity_PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte LilycoveCity_PokemonCenter_1F_MapEvents .4byte LilycoveCity_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc index d145bab55..7db9bcb62 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_PokemonCenter_2F: @ 84836FC - .4byte LilycoveCity_PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte LilycoveCity_PokemonCenter_2F_MapEvents .4byte LilycoveCity_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin b/data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc index 8d2f17dc6..0e23469c1 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc @@ -1,5 +1,5 @@ LilycoveCity_PokemonTrainerFanClub: @ 8483734 - .4byte LilycoveCity_PokemonTrainerFanClub_MapAttributes + .4byte LilycoveCity_PokemonTrainerFanClub_Layout .4byte LilycoveCity_PokemonTrainerFanClub_MapEvents .4byte LilycoveCity_PokemonTrainerFanClub_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin deleted file mode 100644 index cddfe5d9d..000000000 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -no0vwi    ƒ„~22q2$2$2$2$2$282$2‹2Œ292#2#2+2LMLM,2#2#2#292#2#2#2TUTU#2#2#2#292#2#2#2#2#2#2,2#2#2#2#2 3û2ü2#2#2#2#2#2#2ú2û2û2#2#2#2#2#2#2ƒ„ 526262626272 -hi‹2Œ2$2=2H^HI?2%2p2q292#2#2=2PQPQ?2#2#2#292#2#2E2F2F2F2F2G2#2#2#292#2#2#2#2#2#2#2#2#2#2#292#2#2#2#2 #2#2#2#2#2 \ No newline at end of file diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc index 29e3bd57c..bf648b5da 100644 --- a/data/maps/LilycoveCity_UnusedMart/header.inc +++ b/data/maps/LilycoveCity_UnusedMart/header.inc @@ -1,5 +1,5 @@ LilycoveCity_UnusedMart: @ 8483718 - .4byte LilycoveCity_UnusedMart_MapAttributes + .4byte Mart_Layout .4byte LilycoveCity_UnusedMart_MapEvents .4byte LilycoveCity_UnusedMart_MapScripts .4byte 0x0 diff --git a/data/maps/LinkContestRoom1/border.bin b/data/maps/LinkContestRoom1/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LinkContestRoom1/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc index f5d7b9b78..dcd7be859 100644 --- a/data/maps/LinkContestRoom1/header.inc +++ b/data/maps/LinkContestRoom1/header.inc @@ -1,5 +1,5 @@ LinkContestRoom1: @ 8484DA0 - .4byte LinkContestRoom1_MapAttributes + .4byte LinkContestRoom1_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 diff --git a/data/maps/LinkContestRoom1/map.bin b/data/maps/LinkContestRoom1/map.bin deleted file mode 100644 index a8853f6ae..000000000 --- a/data/maps/LinkContestRoom1/map.bin +++ /dev/null @@ -1 +0,0 @@ -```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q22q2w6q2r%2%2&$%2%2pq2q2q2‰2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyyk2l2m2yyz%2%2&22222s2t2u2222226s2t2u26 \ No newline at end of file diff --git a/data/maps/LinkContestRoom2/border.bin b/data/maps/LinkContestRoom2/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LinkContestRoom2/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc index b083a3a93..2afb7ae00 100644 --- a/data/maps/LinkContestRoom2/header.inc +++ b/data/maps/LinkContestRoom2/header.inc @@ -1,5 +1,5 @@ LinkContestRoom2: @ 8484E64 - .4byte LinkContestRoom2_MapAttributes + .4byte LinkContestRoom2_Layout .4byte LinkContestRoom2_MapEvents .4byte LinkContestRoom2_MapScripts .4byte 0x0 diff --git a/data/maps/LinkContestRoom2/map.bin b/data/maps/LinkContestRoom2/map.bin deleted file mode 100644 index 7cb63b40d..000000000 --- a/data/maps/LinkContestRoom2/map.bin +++ /dev/null @@ -1 +0,0 @@ -```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q2‘2q2w6q2r%2%2&$%2%2pq2q2q2™2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy{2|2}2yyz%2%2&22222ƒ2„2…2222226ƒ2„2…26 \ No newline at end of file diff --git a/data/maps/LinkContestRoom3/border.bin b/data/maps/LinkContestRoom3/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LinkContestRoom3/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc index ec0e6ee7b..97f0cdcae 100644 --- a/data/maps/LinkContestRoom3/header.inc +++ b/data/maps/LinkContestRoom3/header.inc @@ -1,5 +1,5 @@ LinkContestRoom3: @ 8484E80 - .4byte LinkContestRoom3_MapAttributes + .4byte LinkContestRoom3_Layout .4byte LinkContestRoom3_MapEvents .4byte LinkContestRoom3_MapScripts .4byte 0x0 diff --git a/data/maps/LinkContestRoom3/map.bin b/data/maps/LinkContestRoom3/map.bin deleted file mode 100644 index 59e9e9182..000000000 --- a/data/maps/LinkContestRoom3/map.bin +++ /dev/null @@ -1 +0,0 @@ -```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q2±2q2w6q2r%2%2&$%2%2pq2q2q2¹2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy›2œ22yyz%2%2&22222£2¤2¥2222226£2¤2¥26 \ No newline at end of file diff --git a/data/maps/LinkContestRoom4/border.bin b/data/maps/LinkContestRoom4/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LinkContestRoom4/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc index 4a172b61f..9c0dfdc65 100644 --- a/data/maps/LinkContestRoom4/header.inc +++ b/data/maps/LinkContestRoom4/header.inc @@ -1,5 +1,5 @@ LinkContestRoom4: @ 8484E9C - .4byte LinkContestRoom4_MapAttributes + .4byte LinkContestRoom4_Layout .4byte LinkContestRoom4_MapEvents .4byte LinkContestRoom4_MapScripts .4byte 0x0 diff --git a/data/maps/LinkContestRoom4/map.bin b/data/maps/LinkContestRoom4/map.bin deleted file mode 100644 index 4e2166c19..000000000 --- a/data/maps/LinkContestRoom4/map.bin +++ /dev/null @@ -1 +0,0 @@ -```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q2¢2q2w6q2r%2%2&$%2%2pq2q2q2ª2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy»2¼2½2yyz%2%2&22222Ã2Ä2Å2222226Ã2Ä2Å26 \ No newline at end of file diff --git a/data/maps/LinkContestRoom5/border.bin b/data/maps/LinkContestRoom5/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LinkContestRoom5/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc index a26034ac6..42c2f3fdb 100644 --- a/data/maps/LinkContestRoom5/header.inc +++ b/data/maps/LinkContestRoom5/header.inc @@ -1,5 +1,5 @@ LinkContestRoom5: @ 8484EB8 - .4byte LinkContestRoom5_MapAttributes + .4byte LinkContestRoom5_Layout .4byte LinkContestRoom5_MapEvents .4byte LinkContestRoom5_MapScripts .4byte 0x0 diff --git a/data/maps/LinkContestRoom5/map.bin b/data/maps/LinkContestRoom5/map.bin deleted file mode 100644 index ad068fe7c..000000000 --- a/data/maps/LinkContestRoom5/map.bin +++ /dev/null @@ -1 +0,0 @@ -```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q2¡2q2w6q2r%2%2&$%2%2pq2q2q2©2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy‹2Œ22yyz%2%2&22222“2”2•2222226“2”2•26 \ No newline at end of file diff --git a/data/maps/LinkContestRoom6/border.bin b/data/maps/LinkContestRoom6/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LinkContestRoom6/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc index 436f89047..f1487f334 100644 --- a/data/maps/LinkContestRoom6/header.inc +++ b/data/maps/LinkContestRoom6/header.inc @@ -1,5 +1,5 @@ LinkContestRoom6: @ 8484ED4 - .4byte LinkContestRoom6_MapAttributes + .4byte LinkContestRoom6_Layout .4byte LinkContestRoom6_MapEvents .4byte LinkContestRoom6_MapScripts .4byte 0x0 diff --git a/data/maps/LinkContestRoom6/map.bin b/data/maps/LinkContestRoom6/map.bin deleted file mode 100644 index 9fcec5a5e..000000000 --- a/data/maps/LinkContestRoom6/map.bin +++ /dev/null @@ -1 +0,0 @@ -```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q2’2q2w6q2r%2%2&$%2%2pq2q2q2š2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy«2¬2­2yyz%2%2&22222³2´2µ2222226³2´2µ26 \ No newline at end of file diff --git a/data/maps/LittlerootTown/border.bin b/data/maps/LittlerootTown/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/LittlerootTown/border.bin +++ /dev/null @@ -1 +0,0 @@ -ÔÕÜÝ \ No newline at end of file diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc index 240429a6d..04010b50c 100644 --- a/data/maps/LittlerootTown/header.inc +++ b/data/maps/LittlerootTown/header.inc @@ -1,5 +1,5 @@ LittlerootTown: @ 84825B4 - .4byte LittlerootTown_MapAttributes + .4byte LittlerootTown_Layout .4byte LittlerootTown_MapEvents .4byte LittlerootTown_MapScripts .4byte LittlerootTown_MapConnections diff --git a/data/maps/LittlerootTown/map.bin b/data/maps/LittlerootTown/map.bin deleted file mode 100644 index 9af76f90e..000000000 --- a/data/maps/LittlerootTown/map.bin +++ /dev/null @@ -1,3 +0,0 @@ -ÔÕÔÕÔÕÔÕÔÕ500ÔÕÔÕÔÕÔÕÜÝäåäåäåäç00æåäåäåÜÝÔÕ0000000000000000ÔÕäç0000000000000000æå002 2 2 2 -20000002 2 2 2 -2000000000000000000000000"20@!000000 @12#0000*:8H)400004(H9:+000000020000000020000000ð00000000ð0000000000000000000000000000000 2B2C2 2 2 220000000000000JK0000000000000000000000000,A-00000000Î1Ï1000&4I5'00000000ÖÕÎ1Ï10000200000000Î1Ï1ÜÝÔ×00000000000000ÖÕÔÕÜÝÎ1Ï1Î1Ï1Î1Ï1Î1Ï1Î1Ï1Î1Ï1Î1Ï1ÜÝÜÝ \ No newline at end of file diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/border.bin b/data/maps/LittlerootTown_BrendansHouse_1F/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/LittlerootTown_BrendansHouse_1F/border.bin and /dev/null differ diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc index 781e37506..d5a87bae9 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc @@ -1,5 +1,5 @@ LittlerootTown_BrendansHouse_1F: @ 8482AF4 - .4byte LittlerootTown_BrendansHouse_1F_MapAttributes + .4byte LittlerootTown_BrendansHouse_1F_Layout .4byte LittlerootTown_BrendansHouse_1F_MapEvents .4byte LittlerootTown_BrendansHouse_1F_MapScripts .4byte 0x0 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.bin b/data/maps/LittlerootTown_BrendansHouse_1F/map.bin deleted file mode 100644 index 3ae8e69a6..000000000 --- a/data/maps/LittlerootTown_BrendansHouse_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -nnnn01234&&  M89:;<222222B222d222222@A222222252H2I2J2.2622222222662222222 2!2"#$2%222222(2)2*2+2,2-222 \ No newline at end of file diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/border.bin b/data/maps/LittlerootTown_BrendansHouse_2F/border.bin deleted file mode 100644 index c1b82435c..000000000 --- a/data/maps/LittlerootTown_BrendansHouse_2F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc index 12047b040..0153a3f27 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc @@ -1,5 +1,5 @@ LittlerootTown_BrendansHouse_2F: @ 8482B10 - .4byte LittlerootTown_BrendansHouse_2F_MapAttributes + .4byte LittlerootTown_BrendansHouse_2F_Layout .4byte LittlerootTown_BrendansHouse_2F_MapEvents .4byte LittlerootTown_BrendansHouse_2F_MapScripts .4byte 0x0 diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.bin b/data/maps/LittlerootTown_BrendansHouse_2F/map.bin deleted file mode 100644 index bfa5b907e..000000000 --- a/data/maps/LittlerootTown_BrendansHouse_2F/map.bin +++ /dev/null @@ -1 +0,0 @@ -RTPTV‡   Z[Ueb2c2x2f2]2x2222{2|2}22˜2™2™2š22ƒ„2…2 2¡2¡2¢22‹BŒB 2¡2¡2¢2222¨2©2©2ª22222222222 \ No newline at end of file diff --git a/data/maps/LittlerootTown_MaysHouse_1F/border.bin b/data/maps/LittlerootTown_MaysHouse_1F/border.bin deleted file mode 100644 index c1b82435c..000000000 --- a/data/maps/LittlerootTown_MaysHouse_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc index 624be65cb..1e72c91b5 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc @@ -1,5 +1,5 @@ LittlerootTown_MaysHouse_1F: @ 8482B2C - .4byte LittlerootTown_MaysHouse_1F_MapAttributes + .4byte LittlerootTown_MaysHouse_1F_Layout .4byte LittlerootTown_MaysHouse_1F_MapEvents .4byte LittlerootTown_MaysHouse_1F_MapScripts .4byte 0x0 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.bin b/data/maps/LittlerootTown_MaysHouse_1F/map.bin deleted file mode 100644 index 21f62ebe3..000000000 --- a/data/maps/LittlerootTown_MaysHouse_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -nnnnno m&&CD120vwux22KL9:82222y22F22222222222@A222222°¸³±²»22222£À¹ºÃ¥22222£ÀÁÂÃ¥222«¬¬¬¬­2 \ No newline at end of file diff --git a/data/maps/LittlerootTown_MaysHouse_2F/border.bin b/data/maps/LittlerootTown_MaysHouse_2F/border.bin deleted file mode 100644 index c1b82435c..000000000 --- a/data/maps/LittlerootTown_MaysHouse_2F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc index a22e64716..20e9e3f5a 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc @@ -1,5 +1,5 @@ LittlerootTown_MaysHouse_2F: @ 8482B48 - .4byte LittlerootTown_MaysHouse_2F_MapAttributes + .4byte LittlerootTown_MaysHouse_2F_Layout .4byte LittlerootTown_MaysHouse_2F_MapEvents .4byte LittlerootTown_MaysHouse_2F_MapScripts .4byte 0x0 diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.bin b/data/maps/LittlerootTown_MaysHouse_2F/map.bin deleted file mode 100644 index 5904a9639..000000000 --- a/data/maps/LittlerootTown_MaysHouse_2F/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -  -'VTPTQ/WUXYE2222]2g22`2a22›2œ2œ222€22‚22£2¤2¤2¥22ˆ‰2Š2£2¤2¤2¥2B‘’B2«2¬2¬2­222222222222 \ No newline at end of file diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/border.bin b/data/maps/LittlerootTown_ProfessorBirchsLab/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc index c58220612..8cd5eaf79 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc @@ -1,5 +1,5 @@ LittlerootTown_ProfessorBirchsLab: @ 8482B64 - .4byte LittlerootTown_ProfessorBirchsLab_MapAttributes + .4byte LittlerootTown_ProfessorBirchsLab_Layout .4byte LittlerootTown_ProfessorBirchsLab_MapEvents .4byte LittlerootTown_ProfessorBirchsLab_MapScripts .4byte 0x0 diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.bin b/data/maps/LittlerootTown_ProfessorBirchsLab/map.bin deleted file mode 100644 index 0f84e80b2..000000000 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/map.bin +++ /dev/null @@ -1,5 +0,0 @@ -  < -    - - - !2D"2#2>2"232"232>2šš(2*2*2A22222)2:2222222222221B22$2%2627222222?2?222,-,-22222224545222222=2>2>2>2222222G2?2’220222222222;.H8922222222I2C:2H@2&22222222KBO2?22.22222?2?2 \ No newline at end of file diff --git a/data/maps/MagmaHideout_1F/border.bin b/data/maps/MagmaHideout_1F/border.bin deleted file mode 100644 index 9ae2c2126..000000000 --- a/data/maps/MagmaHideout_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -qqqq \ No newline at end of file diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc index eab20d0d0..6158ed3cb 100644 --- a/data/maps/MagmaHideout_1F/header.inc +++ b/data/maps/MagmaHideout_1F/header.inc @@ -1,5 +1,5 @@ MagmaHideout_1F: @ 8484828 - .4byte MagmaHideout_1F_MapAttributes + .4byte MagmaHideout_1F_Layout .4byte MagmaHideout_1F_MapEvents .4byte MagmaHideout_1F_MapScripts .4byte 0x0 diff --git a/data/maps/MagmaHideout_1F/map.bin b/data/maps/MagmaHideout_1F/map.bin deleted file mode 100644 index fdf0d4252..000000000 Binary files a/data/maps/MagmaHideout_1F/map.bin and /dev/null differ diff --git a/data/maps/MagmaHideout_2F_1R/border.bin b/data/maps/MagmaHideout_2F_1R/border.bin deleted file mode 100644 index 9ae2c2126..000000000 --- a/data/maps/MagmaHideout_2F_1R/border.bin +++ /dev/null @@ -1 +0,0 @@ -qqqq \ No newline at end of file diff --git a/data/maps/MagmaHideout_2F_1R/header.inc b/data/maps/MagmaHideout_2F_1R/header.inc index ff19befab..1a685fe55 100644 --- a/data/maps/MagmaHideout_2F_1R/header.inc +++ b/data/maps/MagmaHideout_2F_1R/header.inc @@ -1,5 +1,5 @@ MagmaHideout_2F_1R: @ 8484844 - .4byte MagmaHideout_2F_1R_MapAttributes + .4byte MagmaHideout_2F_1R_Layout .4byte MagmaHideout_2F_1R_MapEvents .4byte MagmaHideout_2F_1R_MapScripts .4byte 0x0 diff --git a/data/maps/MagmaHideout_2F_1R/map.bin b/data/maps/MagmaHideout_2F_1R/map.bin deleted file mode 100644 index d74c32347..000000000 --- a/data/maps/MagmaHideout_2F_1R/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq{tttttVttttttttttttttttttttt|qqqqrqqq{t^ttttt-|qqqqq{ttttt|qqqqqrqq33333333tttttz33333qqqqqqrqqq33333333333333333333t|qqqqr{tt3333333333333333333333qqqqrr3333333333333333333333333qqqqrr{ttttttttttttttttt¯¯t|333qqqqrrr33333333333333333333333qqqqrrr33333333333333333333tt|qqqqrrr33333333333333333333333qqqqrrr33333333333333333333333qqqqrrr{ttt¯¯tttttttttttttttt|pqqqqrrrr7{t¯¯ttttttttttttt|77pqqqqrrrr7r33333333333377pqqqqrrr17r333333333333t|pqqqqrrrr7r333333€mn33333333pqqqqrrrr7r333333ˆ‰uv33333333pqqqqrrrr{333333‘}~33333333pqqqqrrrrr3333333333333333333pqqqqrrrrr3333333333333333333pqqqqrrrrr{tttttttttttt¯¯ttt|pqqqqrrrrrr{ttVt#tttttt¯¯tt|pqqqqrrrrrrr{t^tt|333333333qqqqrrr1rrrr3333|33333333qqqqrrrrrrrr33333t¯ttttt|pqqqqrrrrrrrr3333333333333pqqqqrrrrrrrr3333333333333pqqqqrrrrrrrr{t¯tttt-tttt|pqqqqrrrrrrrrr{¯tttttttt|pqqqqrrrrrrrrr1333333333pqqqqrrrrrrr1rr3333333 -7 pqqqqrrrrrrrrrr3333333qqpqqqqrrrrrrrrrr33333 33qqpqqqqrrrrrrrr1     ~qqpqqqqrrrrrrrrrqqqqqqqqqqqpqqqqrrrrrrrrrqqqqqqqqqpqqqqrrrrrrrrrqqqqqqqqqqpqqqqrrrr1rrrrqqqqqqqqqqqpqq \ No newline at end of file diff --git a/data/maps/MagmaHideout_2F_2R/border.bin b/data/maps/MagmaHideout_2F_2R/border.bin deleted file mode 100644 index 9ae2c2126..000000000 --- a/data/maps/MagmaHideout_2F_2R/border.bin +++ /dev/null @@ -1 +0,0 @@ -qqqq \ No newline at end of file diff --git a/data/maps/MagmaHideout_2F_2R/header.inc b/data/maps/MagmaHideout_2F_2R/header.inc index 8fe07f9ca..410522097 100644 --- a/data/maps/MagmaHideout_2F_2R/header.inc +++ b/data/maps/MagmaHideout_2F_2R/header.inc @@ -1,5 +1,5 @@ MagmaHideout_2F_2R: @ 8484860 - .4byte MagmaHideout_2F_2R_MapAttributes + .4byte MagmaHideout_2F_2R_Layout .4byte MagmaHideout_2F_2R_MapEvents .4byte MagmaHideout_2F_2R_MapScripts .4byte 0x0 diff --git a/data/maps/MagmaHideout_2F_2R/map.bin b/data/maps/MagmaHideout_2F_2R/map.bin deleted file mode 100644 index 34cbf7eaa..000000000 --- a/data/maps/MagmaHideout_2F_2R/map.bin +++ /dev/null @@ -1,5 +0,0 @@ -qqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqxtttttttttt|qq{ttt|qqqqqqqqqqqqqqq{t„…‚ƒtttttttttttttt„…‚ƒt|p{¢¢¢x|qqqqqqqqqqqqq{z{ŒŠ‹ttt-ttttttttttŒŠ‹|pp{¢¢¢¢¢pqqqqqqqqqqqqr{z¨©–—{GGGGGGGGGGG|¢¨©–—pppr¢¢¢¢¢x|qqqqqqttttttzr¢¢¢¢¢F½½½½½½½½‰¢¢¢¢¢ppp  j¢¢pqqqqqqqqqqqqqrq23¢¢q2¤£½½½½½½‰¢¢¢¢hppqqq{¢¢x|qqqqqqqqqqqqr¢¢¢¢¢¢¢¤£½££££¤¢3¢¢pqpx|qqqr{¯|¢pqqqqqqqqqqqqr¢¢h     jF½‰3¢¢¢¢¢¢¢¢pqx|pqq{r¢p¢pqqqqqqqqqq{z¢¢pqh  j££j¢¢¢¢¢¢h qqppq{{¢x|x|qqqqqqqqqqr¢¢¢ppqqjqqqq j¢¢¢¢ph   p{qr{¯|x|pqqqqqqqqqqr¢¢¢pqpqq{z{tt|qqj¢¢¢px|qqqpr{tr¢pq2ppqqqqqqqqqqr¢¢¢pqpq{zqrqqpqqqr¢¢¢x|xt|qxr{tx|pxttttqqqqq{z¢¢¢x|xtz{tzqhqqr¢¢¢¢x|qx|{tr{t¯|pxtttttqqqqqr{t¯t|xt-tzqqqpqqq{¢3¢¢¢x|qxq{r33ppqqqqqqqqqqq1r333ttttt-t|x|qqr{-t¯tt|xt-ttqr33ppqqqqqqqqqqqrr33333333333pqxttzr33333xttttttt33ppqqqqqqqqqqqrr33333333333xttttt3333333333333333ppqqqqqqqqqqqrr33333 -   3333333333333333333333333ppqh    qqqqq 3333pqqr3333333333333 -           pqpqqqqqqqqqqqr 333pqq  3333333 -               qpqqqqqqqqqqqr1333pqqqq 33333 -qqqqqqqqqqqqqqqqqqpqqqqqqqqqqrr3 33pqqqqq     qqqqqqqqqqqqqqqqqqpqqqqqqqqqqq qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqq \ No newline at end of file diff --git a/data/maps/MagmaHideout_2F_3R/border.bin b/data/maps/MagmaHideout_2F_3R/border.bin deleted file mode 100644 index 9ae2c2126..000000000 --- a/data/maps/MagmaHideout_2F_3R/border.bin +++ /dev/null @@ -1 +0,0 @@ -qqqq \ No newline at end of file diff --git a/data/maps/MagmaHideout_2F_3R/header.inc b/data/maps/MagmaHideout_2F_3R/header.inc index 45ea7c94b..407408bf3 100644 --- a/data/maps/MagmaHideout_2F_3R/header.inc +++ b/data/maps/MagmaHideout_2F_3R/header.inc @@ -1,5 +1,5 @@ MagmaHideout_2F_3R: @ 84848EC - .4byte MagmaHideout_2F_3R_MapAttributes + .4byte MagmaHideout_2F_3R_Layout .4byte MagmaHideout_2F_3R_MapEvents .4byte MagmaHideout_2F_3R_MapScripts .4byte 0x0 diff --git a/data/maps/MagmaHideout_2F_3R/map.bin b/data/maps/MagmaHideout_2F_3R/map.bin deleted file mode 100644 index f25017291..000000000 --- a/data/maps/MagmaHideout_2F_3R/map.bin +++ /dev/null @@ -1 +0,0 @@ -{tttttttttttttttVttttttttttttttt|r{ttt#ttt#tttttt^ttttttttttr{ttt#ttt#tttttt^tttttttttttttt|rr{tttttttttttt|{tttttt###rr{tttttttttttt|{tttttt###ttt|rr{tttttt#ttt|x¯z{ttttttttrr{tttttt#ttt|x¯z{tttttttttt|rrr{tttttttt|r{tttt#ttrrr{tttttttt|r{tttt#ttt|rrrr{tttttt|xt¯tzr{tt#tttrrrr{tttttt|xt¯tzr{tt#ttt|rrrrr{tttt|xtt¯ttzr{tttt|rrrrr{tttt|xtt¯ttzr{tttt|rrrrrr{tt|xttt¯tttzr{tt|rrrrrr{tt|xttt¯tttzr{tt|rrrrrrr{|xtttt¯ttttzr{|rrrrrrr{|xtttt¯ttttzr{|rrrrrrrrxtttt#¯ttt#tzrrrrrrrrrxtttt#¯ttt#tzrrrrrrrrrxtttttt¯ttt#ttzrrrrrrrrxtttttt¯ttt#ttzrrrrrrrrXYXYrrrrrrrrXYXYrrrrrrrr`a`arrrrrrrr`a`arrrrr1rr rrrrr1rr                           qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqx|pxttttqqqqq{z¢¢¢x|xtz{t \ No newline at end of file diff --git a/data/maps/MagmaHideout_3F_1R/border.bin b/data/maps/MagmaHideout_3F_1R/border.bin deleted file mode 100644 index 9ae2c2126..000000000 --- a/data/maps/MagmaHideout_3F_1R/border.bin +++ /dev/null @@ -1 +0,0 @@ -qqqq \ No newline at end of file diff --git a/data/maps/MagmaHideout_3F_1R/header.inc b/data/maps/MagmaHideout_3F_1R/header.inc index 70ce39e74..228b197eb 100644 --- a/data/maps/MagmaHideout_3F_1R/header.inc +++ b/data/maps/MagmaHideout_3F_1R/header.inc @@ -1,5 +1,5 @@ MagmaHideout_3F_1R: @ 848487C - .4byte MagmaHideout_3F_1R_MapAttributes + .4byte MagmaHideout_3F_1R_Layout .4byte MagmaHideout_3F_1R_MapEvents .4byte MagmaHideout_3F_1R_MapScripts .4byte 0x0 diff --git a/data/maps/MagmaHideout_3F_1R/map.bin b/data/maps/MagmaHideout_3F_1R/map.bin deleted file mode 100644 index da590f5dd..000000000 --- a/data/maps/MagmaHideout_3F_1R/map.bin +++ /dev/null @@ -1 +0,0 @@ -qqqqqqqqqqqq{tttttt|qqqqqq{ttttttttt|qqqr{„…‚ƒ|qqqqqr{-t#tt-t|xtttzrŒˆ‰xtVttt|r*+++++,xt#-tt}~‘xtt^tt|r12½3½½3+++,r23½3½½½3½34r:;;;;;;;;;<r{t„…t|r{tttt¯ttttttz{Œ|xtVttt|rrr{ttt¯ttttt-tz}~xtt^tt|rMrrrrrr{t„…‚ƒt|rrMr{ttz{ŒŠ‹|xttttt¯tt|rrrrr{t#z}~‘x--t#tt¯t|rrrrr1¢¢{GGGGGGGGGG|¢¢rrrrrr¢F3½½½3½½½½½‰¢¢rrrrrr¢¢¤£½3½½3½3½‰¢rr1rrr¢¢¢F½½½3½½½¤¢qrrrrrr¢¢{G½3½½½½½‰¢¢¢rrrrrr¢F½3½½3½½£¤¢¢¢rrrrMr¢¢¤£½3½½½‰¢¢¢¢rrrrrr¢¢¤£££££¤¢¢¢¢~~~~~~ iiiiiiiiiiiii~~~~~~qqqqqqqqqqqqqqqqqqqqqqqqq \ No newline at end of file diff --git a/data/maps/MagmaHideout_3F_2R/border.bin b/data/maps/MagmaHideout_3F_2R/border.bin deleted file mode 100644 index 9ae2c2126..000000000 --- a/data/maps/MagmaHideout_3F_2R/border.bin +++ /dev/null @@ -1 +0,0 @@ -qqqq \ No newline at end of file diff --git a/data/maps/MagmaHideout_3F_2R/header.inc b/data/maps/MagmaHideout_3F_2R/header.inc index 74266da9c..d070dd32a 100644 --- a/data/maps/MagmaHideout_3F_2R/header.inc +++ b/data/maps/MagmaHideout_3F_2R/header.inc @@ -1,5 +1,5 @@ MagmaHideout_3F_2R: @ 8484898 - .4byte MagmaHideout_3F_2R_MapAttributes + .4byte MagmaHideout_3F_2R_Layout .4byte MagmaHideout_3F_2R_MapEvents .4byte MagmaHideout_3F_2R_MapScripts .4byte 0x0 diff --git a/data/maps/MagmaHideout_3F_2R/map.bin b/data/maps/MagmaHideout_3F_2R/map.bin deleted file mode 100644 index 49857819a..000000000 --- a/data/maps/MagmaHideout_3F_2R/map.bin +++ /dev/null @@ -1,7 +0,0 @@ -qqqqq{tttttttttttttt|qqqqqqqqr{’“’“’“”•”•”•|qqqqqqqqrr`a`a`abcbcbcxtt|qqqqrrXYXYZ[7„…|qqqqqrr`a`abcuvq{-ttzr}~qr{‚ƒ‚ƒhijkkknZ[qrˆ‰Š‹pqrsssvbcqrr‘‘xyz{{{~Z[qrXY€mnmnbcqrr`aXYˆ‰uvuv -7 ~~qr`a‘}~}~ -7p6q6q6q6qrr -7~~7q6q6q~~  7 -7p6q6qqqq6q6q6q6r  7 -7~~q6qqqq6qq6q67rq6r 7  -7p6q6q6q6q6q6q6q67q6q6q6~~~~     ~~q6q6qqq6 \ No newline at end of file diff --git a/data/maps/MagmaHideout_3F_3R/border.bin b/data/maps/MagmaHideout_3F_3R/border.bin deleted file mode 100644 index 9ae2c2126..000000000 --- a/data/maps/MagmaHideout_3F_3R/border.bin +++ /dev/null @@ -1 +0,0 @@ -qqqq \ No newline at end of file diff --git a/data/maps/MagmaHideout_3F_3R/header.inc b/data/maps/MagmaHideout_3F_3R/header.inc index 5c1cdc9de..24ed48ff5 100644 --- a/data/maps/MagmaHideout_3F_3R/header.inc +++ b/data/maps/MagmaHideout_3F_3R/header.inc @@ -1,5 +1,5 @@ MagmaHideout_3F_3R: @ 84848D0 - .4byte MagmaHideout_3F_3R_MapAttributes + .4byte MagmaHideout_3F_3R_Layout .4byte MagmaHideout_3F_3R_MapEvents .4byte MagmaHideout_3F_3R_MapScripts .4byte 0x0 diff --git a/data/maps/MagmaHideout_3F_3R/map.bin b/data/maps/MagmaHideout_3F_3R/map.bin deleted file mode 100644 index 7c808ffb5..000000000 --- a/data/maps/MagmaHideout_3F_3R/map.bin +++ /dev/null @@ -1 +0,0 @@ -{tttttttttttttttVttttttttttttttt|r{tttttttttttttt^tttttttttttttt|rr{tttttttttttt|¢{tttttttttttt|rr{tttttttttt|x¯z{tttttttttt|rr1r{tttttttt|¢¢¢r{tttt#ttt|rr1rr{tttttt|xt¯tzr{tttttt|rrrrr{tttt|¢¢¢¢¢rr{tttt|rrrrrr{#t|xtt¯ttzrr{#t|rrrrrrr{|¢¢¢¢¢¢¢rrr{|rrrrrrrrxttt¯#t#zrrrrrrrrrrrr¢¢¢¢¢¢¢¢{zrrrrMrrrrrrx#ttt¯tttz¢rrrrrrrrrrrx|¢¢¢¢¢¢¢¢rrrrrrrrrrr¢xtttt¯ttt#tzrrrrrrrrrr¢¢¢¢¢¢¢¢¢{ttzrrrrrrrrrxt#tttt¯tttz{G|rrrrrrrrr¢¢¢¢¢¢¢¢¢¢¢F½‰rrrrrrrrr{GGGG|qq{GGG½‰rrrrrrrrrF½½½‰qqF½½½½‰rrrrrrrrr¤½½‰¢¢¤££½½‰rrrrrMrrrF½½‰q¢¢efF½½‰rrrrrrrrr¢~£££¤¢¢œF½½‰~~~~~~~~~iiiiii ii~~~~~~~~~~~qqqqqqqqqqqqqqqqqqqqqqqqqqqqqq \ No newline at end of file diff --git a/data/maps/MagmaHideout_4F/border.bin b/data/maps/MagmaHideout_4F/border.bin deleted file mode 100644 index 9ae2c2126..000000000 --- a/data/maps/MagmaHideout_4F/border.bin +++ /dev/null @@ -1 +0,0 @@ -qqqq \ No newline at end of file diff --git a/data/maps/MagmaHideout_4F/header.inc b/data/maps/MagmaHideout_4F/header.inc index 441643653..45b5a40e6 100644 --- a/data/maps/MagmaHideout_4F/header.inc +++ b/data/maps/MagmaHideout_4F/header.inc @@ -1,5 +1,5 @@ MagmaHideout_4F: @ 84848B4 - .4byte MagmaHideout_4F_MapAttributes + .4byte MagmaHideout_4F_Layout .4byte MagmaHideout_4F_MapEvents .4byte MagmaHideout_4F_MapScripts .4byte 0x0 diff --git a/data/maps/MagmaHideout_4F/map.bin b/data/maps/MagmaHideout_4F/map.bin deleted file mode 100644 index 45a5547c6..000000000 --- a/data/maps/MagmaHideout_4F/map.bin +++ /dev/null @@ -1 +0,0 @@ -qqqqqqqqq{tttttttt-ttttt|{|ppqqqqpqhiiiiijpppqqq{ttz{ttttttqqqq{ttttz{ttttttt|qq{-|xzppxttt|pqxttt|qrppp{ttz{ttzqqqqqqqqqqr{t„…tz{’“’“|qp{tzqx|qpxt|qqpxtt-t|pqrppxzq{tz{tttttttt{-ttzr{Œ’“zš›š›x|xz{-t|pqx|qpqqpqqqqqppqrppq{zqqrhiiiiiiir{t‚ƒzr¨©š›¢¢¢¢¢xttz¢¢pxt|x|pqqx--t|qppqrpxttzqq{zpqqqqqqrr{Š‹tz¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢xt||pxttttt|pqpxtzxttttt-zqpqqqqqqqrrr–—¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢pqpxtt|qqqppqxt|q{tttVttt|p{ttttttrrr¢qef¢¢¢¢¢¢h     jq¢¢¢¢x|tt|t|ppqqqpq1{tt^tt|ppr{tttttrrr¢qœ¢¢¢¢h {-t#| j¢¢¢¢pqqqt|pqpxt|qxtzrppxzrqqqqqrrj¢¢¢¢¢h {t{G|xt|j¢¢¢x„…†‡|px|pqqpqq{zpxttzqq{ttrrqr¢¢qhjqr{G½G|x|j¢¢¢ŒŽppqpx|qxtttzxttttttzqqMrqr¢¢¢hp{{F½½½3½‰qx|j¢¢¨©–—ppqx|p{-tttttt¯¯ttttttt-ttttrjr¢¢¢ppr{{3½½½3|qpr¢¢¢¢¢¢pxt|pxz{ttttt-¯¯ttttt|qqqhijjrr¢¢¢pp1rqF½½3½½½½|x|j¢¢¢¢¢x|qppqqr{t„…‚ƒ¯¯tttt|pqhqrqrrM¢¢¢ppr1{3½½½½33½|pq  j¢¢x|pxttzr{ŒŠ‹¯¯’“-|ppqhqqr{rr¢¢¢pxzrF½½3½3½½½3½‰ph  j1¢¢¢¢px|q{tzr¨©–—qqš›¢ppphqqqrr{r¢¢¢pqq1F3½½½½3½½½½‰pphjrj¢¢¢x|pr{tz¢¢¢¢¢¢¢¢¢ppppqqqrrrqM¢¢|qrF½½½½½½3½3pppprjr¢¢¢¢ppqrr¢¢¢¢¢¢¢ef¢ppppqqqqrr1qr¢¢¢qtz¤\½3½½½½½‰ppppjrr¢¢¢¢pp{zr¢ef¢¢¢¢¢œ¢pppxtt|qrrr{¢¢¢q¢¢¢¢¤d½3½½½½‰ppppqrrr¢¢¢¢pxz{z¢œ¢¢¢¢¢¢¢¢pppqqqpqrrrrmn¢¢¢¢¢¢¢¢F½½½½£¤ppppqrrj¢¢x|qrq¢¢¢¢¢¢¢¢¢h ppqqqpqrrrruv†‡q¢¢¢¢¢¢¤££££¢ppppqrjr¢¢¢¢xtzq¢¢¢h     h pqqqpqrr1r}~Žmn¢¢¢¢¢q¢h   qjrr¢¢¢¢¢¢¢h  qqqqqpqpqqqpqr j–—uv¢qmn†‡pqqqqqqqqqqq j¢¢¢q¢pqqqh     qqpqqqpqrqqqqr j}~¢¢quvŽpqqqqqqqqqqqqqqrj¢¢¢¢¢pqqqpqqqhiiiiqqpqrqqqq     j}~–—pqqqqqqqqqqqqqqq     qqqpqqqpqqhiiiiiqrqqqqqqqqqq    qqqqqqqqh                qqqpqhqqqqqqqrqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqpqxttttttttz \ No newline at end of file diff --git a/data/maps/MarineCave_End/border.bin b/data/maps/MarineCave_End/border.bin deleted file mode 100644 index f0eabd248..000000000 --- a/data/maps/MarineCave_End/border.bin +++ /dev/null @@ -1 +0,0 @@ -ññññ \ No newline at end of file diff --git a/data/maps/MarineCave_End/header.inc b/data/maps/MarineCave_End/header.inc index 2eda73be9..8e3cf5a5f 100644 --- a/data/maps/MarineCave_End/header.inc +++ b/data/maps/MarineCave_End/header.inc @@ -1,5 +1,5 @@ MarineCave_End: @ 8484A04 - .4byte MarineCave_End_MapAttributes + .4byte MarineCave_End_Layout .4byte MarineCave_End_MapEvents .4byte MarineCave_End_MapScripts .4byte 0x0 diff --git a/data/maps/MarineCave_End/map.bin b/data/maps/MarineCave_End/map.bin deleted file mode 100644 index 85138661d..000000000 --- a/data/maps/MarineCave_End/map.bin +++ /dev/null @@ -1,14 +0,0 @@ -ññññññññëùùùùùùùùùùùùùùùìññññññññññ ëùùùùùùùùùùùùùì -ñññññññññë õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2 - -ñññññññññ ëõ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2 - -ñññññññññ  õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2öõ2õ2 - -ñññññññññ  õ2õ2õ2õ2õ2õ2õ2ééåæçéé -ññññññññë õ2õ2õ2õ2õ2õ2õ2 -ññññéééññññññññ ñ õ2õ2õ2õ2õ2õ2õ2 -ññññ -ññññññëùùùùëõ2õ2õ2õ2õ2õ2õ2 -ññññùìññññ ëùùùùúùùùùìñðññññ ò  "22222222222ðñ -ññññ ò222222222ðñùìññ ò2222222222222ðñññìñ ò#####"2222222øùìññðñ ò#####"##"22222222ðññðñ ò##"2222ðññðñ ò#"22222ðññðñ ò‰‘2#"2222øùìðñ ò‰’O2222ððñ ò‰‘’OOO‘‘222222ððñ òŠNOOOOOONˆ222222ððñ òŠNOOOOOONˆ222222ððñ ò‰’NNOOOONNˆ222222ððñ òŠNNNNOONNNˆ222222ððñ ò#2lpNNNNNNpˆ222222ððñ ò2#2lpppppjs2s2222222ððñ ò#"2#2s2s2s2s2s2$222222 ##2ððñ ò2###"2222222222222222ððñ óóóóóóóóóóóóóóóóóóóóóóóóðñóóóóóóóóóóóóóóóóóóóóóóóóóó \ No newline at end of file diff --git a/data/maps/MarineCave_Entrance/border.bin b/data/maps/MarineCave_Entrance/border.bin deleted file mode 100644 index f0eabd248..000000000 --- a/data/maps/MarineCave_Entrance/border.bin +++ /dev/null @@ -1 +0,0 @@ -ññññ \ No newline at end of file diff --git a/data/maps/MarineCave_Entrance/header.inc b/data/maps/MarineCave_Entrance/header.inc index a1e97eb95..17212c4f6 100644 --- a/data/maps/MarineCave_Entrance/header.inc +++ b/data/maps/MarineCave_Entrance/header.inc @@ -1,5 +1,5 @@ MarineCave_Entrance: @ 84849E8 - .4byte MarineCave_Entrance_MapAttributes + .4byte MarineCave_Entrance_Layout .4byte MarineCave_Entrance_MapEvents .4byte MarineCave_Entrance_MapScripts .4byte 0x0 diff --git a/data/maps/MarineCave_Entrance/map.bin b/data/maps/MarineCave_Entrance/map.bin deleted file mode 100644 index 62aa8537f..000000000 --- a/data/maps/MarineCave_Entrance/map.bin +++ /dev/null @@ -1,7 +0,0 @@ -ñññññññññññëùþÿùìññññññññññëùùë3ìðññññññññññ ëùù $1$1$1ðññññññññëù$1$1$1$1$1$1ðññññññññ ëù $1Ž1¦1¦1¦11ðññññññëù$1$1Ž1§1ž1ž1ž11ðññññññ ëù $1Ž1§1ž1ž1ž1ž11ðñññññë$1$1Ž1§1ž1¤¾¾£1ðñññññ ë $1Ž1§1ž1¤¿ppµ1ðñññëù$1Ž1§1ž1¤¿pppµ1ùìñ ëù Ž1§1ž1¤¿ppppµ1 ùì -ñ $1Ž1§1ž1¤¿pppppµ¥11$1 -ñ Ž1§1ž1¤¿ppppppµž11$1 -ñ Ÿ1ž1¤¿ppppppp½£¥11 -ñ §1ž1·pppppppppµž11 -ñ ž1ž1·pppppppppµž11 -ñô§ž1·ppVVVVpppµ¯—óóñññ§·pV””””Vp˜ñññññññ™V””””V˜ñññññññññññññññññ \ No newline at end of file diff --git a/data/maps/MauvilleCity/border.bin b/data/maps/MauvilleCity/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/MauvilleCity/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc index f8dada766..6e83a33bd 100644 --- a/data/maps/MauvilleCity/header.inc +++ b/data/maps/MauvilleCity/header.inc @@ -1,5 +1,5 @@ MauvilleCity: @ 84824F0 - .4byte MauvilleCity_MapAttributes + .4byte MauvilleCity_Layout .4byte MauvilleCity_MapEvents .4byte MauvilleCity_MapScripts .4byte MauvilleCity_MapConnections diff --git a/data/maps/MauvilleCity/map.bin b/data/maps/MauvilleCity/map.bin deleted file mode 100644 index 80a38e902..000000000 Binary files a/data/maps/MauvilleCity/map.bin and /dev/null differ diff --git a/data/maps/MauvilleCity_BikeShop/border.bin b/data/maps/MauvilleCity_BikeShop/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/MauvilleCity_BikeShop/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc index 723d61151..8b7ecd54d 100644 --- a/data/maps/MauvilleCity_BikeShop/header.inc +++ b/data/maps/MauvilleCity_BikeShop/header.inc @@ -1,5 +1,5 @@ MauvilleCity_BikeShop: @ 8483280 - .4byte MauvilleCity_BikeShop_MapAttributes + .4byte MauvilleCity_BikeShop_Layout .4byte MauvilleCity_BikeShop_MapEvents .4byte MauvilleCity_BikeShop_MapScripts .4byte 0x0 diff --git a/data/maps/MauvilleCity_BikeShop/map.bin b/data/maps/MauvilleCity_BikeShop/map.bin deleted file mode 100644 index 9891b9fd5..000000000 --- a/data/maps/MauvilleCity_BikeShop/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -()*+,-  -    012345222892:2;2<2:2@A2B2?2C2D2!"#2$2%2&2HIJ2?2KL?2?2?2?2P2Q2R2?2ST"?2?2?2?2?2?2?2?2EF!"?2?2?2?2?2?2?2?2MN6?22 2?2?2?2?2?2UV \ No newline at end of file diff --git a/data/maps/MauvilleCity_GameCorner/border.bin b/data/maps/MauvilleCity_GameCorner/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/MauvilleCity_GameCorner/border.bin and /dev/null differ diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc index 9ef8ce976..11a71f8c6 100644 --- a/data/maps/MauvilleCity_GameCorner/header.inc +++ b/data/maps/MauvilleCity_GameCorner/header.inc @@ -1,5 +1,5 @@ MauvilleCity_GameCorner: @ 84832B8 - .4byte MauvilleCity_GameCorner_MapAttributes + .4byte MauvilleCity_GameCorner_Layout .4byte MauvilleCity_GameCorner_MapEvents .4byte MauvilleCity_GameCorner_MapScripts .4byte 0x0 diff --git a/data/maps/MauvilleCity_GameCorner/map.bin b/data/maps/MauvilleCity_GameCorner/map.bin deleted file mode 100644 index ce3f9bf73..000000000 --- a/data/maps/MauvilleCity_GameCorner/map.bin +++ /dev/null @@ -1,3 +0,0 @@ -<=>>>>?  - - ///DFEFFFG.227772LC2M2N2M2M2O22222222222TVUVUUW 222222222222222\2]2^2^2^2]2_2 22222622$2%2222$2%222222222222222&2,-'22&2,-'22222"# 22"# 222&2,-'22&2,-'22222*+ 22*+ 222&2,-'22&2,-'2222223 2223 222&245'22&245'22222222222222222222222222222222222 \ No newline at end of file diff --git a/data/maps/MauvilleCity_Gym/border.bin b/data/maps/MauvilleCity_Gym/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/MauvilleCity_Gym/border.bin and /dev/null differ diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc index 343a2f01a..aa6430475 100644 --- a/data/maps/MauvilleCity_Gym/header.inc +++ b/data/maps/MauvilleCity_Gym/header.inc @@ -1,5 +1,5 @@ MauvilleCity_Gym: @ 8483264 - .4byte MauvilleCity_Gym_MapAttributes + .4byte MauvilleCity_Gym_Layout .4byte MauvilleCity_Gym_MapEvents .4byte MauvilleCity_Gym_MapScripts .4byte 0x0 diff --git a/data/maps/MauvilleCity_Gym/map.bin b/data/maps/MauvilleCity_Gym/map.bin deleted file mode 100644 index 8860e5651..000000000 Binary files a/data/maps/MauvilleCity_Gym/map.bin and /dev/null differ diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc index 1cf42f8cf..db4371175 100644 --- a/data/maps/MauvilleCity_House1/header.inc +++ b/data/maps/MauvilleCity_House1/header.inc @@ -1,5 +1,5 @@ MauvilleCity_House1: @ 848329C - .4byte MauvilleCity_House1_MapAttributes + .4byte House2_Layout .4byte MauvilleCity_House1_MapEvents .4byte MauvilleCity_House1_MapScripts .4byte 0x0 diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc index c1d2da264..4acd48c6d 100644 --- a/data/maps/MauvilleCity_House2/header.inc +++ b/data/maps/MauvilleCity_House2/header.inc @@ -1,5 +1,5 @@ MauvilleCity_House2: @ 84832D4 - .4byte MauvilleCity_House2_MapAttributes + .4byte House1_Layout .4byte MauvilleCity_House2_MapEvents .4byte MauvilleCity_House2_MapScripts .4byte 0x0 diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc index c8f5dfb88..3130c2d35 100644 --- a/data/maps/MauvilleCity_Mart/header.inc +++ b/data/maps/MauvilleCity_Mart/header.inc @@ -1,5 +1,5 @@ MauvilleCity_Mart: @ 8483328 - .4byte MauvilleCity_Mart_MapAttributes + .4byte Mart_Layout .4byte MauvilleCity_Mart_MapEvents .4byte MauvilleCity_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc index 39a942e6f..5bb682b98 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ MauvilleCity_PokemonCenter_1F: @ 84832F0 - .4byte MauvilleCity_PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte MauvilleCity_PokemonCenter_1F_MapEvents .4byte MauvilleCity_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc index c09589b5a..d29063e86 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ MauvilleCity_PokemonCenter_2F: @ 848330C - .4byte MauvilleCity_PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte MauvilleCity_PokemonCenter_2F_MapEvents .4byte MauvilleCity_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/MeteorFalls_1F_1R/border.bin b/data/maps/MeteorFalls_1F_1R/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/MeteorFalls_1F_1R/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc index 6ec850978..1b1371370 100644 --- a/data/maps/MeteorFalls_1F_1R/header.inc +++ b/data/maps/MeteorFalls_1F_1R/header.inc @@ -1,5 +1,5 @@ MeteorFalls_1F_1R: @ 8483EC0 - .4byte MeteorFalls_1F_1R_MapAttributes + .4byte MeteorFalls_1F_1R_Layout .4byte MeteorFalls_1F_1R_MapEvents .4byte MeteorFalls_1F_1R_MapScripts .4byte 0x0 diff --git a/data/maps/MeteorFalls_1F_1R/map.bin b/data/maps/MeteorFalls_1F_1R/map.bin deleted file mode 100644 index 4891475a3..000000000 --- a/data/maps/MeteorFalls_1F_1R/map.bin +++ /dev/null @@ -1 +0,0 @@ -4deDDDLDDDDDDDDDDDDDDdeDDDDfg<4lmDDDTDDDDDDfgDDDDDDlmDDDDno<4tu.D/\.DEFGDnoDDDDD/tu.DDDno<42222242DMN2O/vw.DD<22222242vw<42222 242222242€‰‰‰(<222222422<42‚2ƒ222?2>2>2>2>2?2ppp’(<222222?222<42Š2‹22422€‰‰‰‰˜ppp’(<222224222<42222?2€˜pppppppp’(<2222242222<4>2>2>2?2ppppppppp’(=2>2>2>2>2?2222<46666>272yppppppx5262>2>2>2<4deDDDD/»³³³³³³¼.DDfgDDDdeD2D<4lmDDDD/¹¹¹¹¹¹¹¹.DDnoDDDlmD2D<4tu.DDD/¹¹¹¹¹¹¹¹.LDnoDD/tu.2D<42242DD/¹¹¹¹¹¹¹¹.TDnoDD<2‚2ƒ22<42242*D/LLLLLLLL.\.vw.(<2Š2‹222<4>2>2?2*€‰TTTTTTTT‰Z[22((=2>2>2>2>2<422ppppppppppXYš‰(<4>2>2>2?2pppp8pBqBqBqBqBrB9pp’(>><42>2>2>2>2>2>222Š2‹22(=B?B*pp’(01111<4>2?2LDD2Dde<2222272yp’011111<4fgTDD2Dlm=2>2>2?2DLDD/»³¼.DDDDD<4no\)2)2)2)2tu.DDD/DTDD/¹¹¹.DDDDD<4vw)2)2)2)2)2)2)2.DDD/\.D/¹¹¹.DDDDL<4)2)2)2)2)2)2)2)2)2)2)2)2)2)2*DD/¹¹¹.DEFGT<4)2)2)2ŽU2V2W2)2)2)2)2)2)2**D/¹¹¹.DMN2O\<411ž]^_1111212**/LLL.<2222<4*)2ŽU2W2U2V2V2W2)2)2)2)2)2***€TTT(<222<42ž]_]^^_112112**ppp’(<2222<41žŽU2V2V2V2W2U2W2)2)2)2)**ppp’(<2‚2ƒ22<41ž]^^^_]_121112*ppp’(<2Š2‹22<4*ŽU2W2U2V2V2W2U2V2W2)2)2)2)2*ppp’(<2222<4*–]_]^^_]^_•)2‚2ƒ2)22pPQ’(=222<4*–U2V2V2V2W2U2V2V2W2•)2Š2‹2)2*€˜pXY’0=2>2<4*–]^^^_]^^_21112ppppš0111<4*)2)2)2)2)2)2)2)2)2)2)2)2)2€˜pppppš‰Z[<42)2)2)2$2)2)2)2)2)2)2)2)26)2ppppPQppXY’<4XXYHIJY")2)2)2)2)2)26ppppXYpppp’<6666666666666666666666666666 \ No newline at end of file diff --git a/data/maps/MeteorFalls_1F_2R/border.bin b/data/maps/MeteorFalls_1F_2R/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/MeteorFalls_1F_2R/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc index 946b15c66..a96c5648e 100644 --- a/data/maps/MeteorFalls_1F_2R/header.inc +++ b/data/maps/MeteorFalls_1F_2R/header.inc @@ -1,5 +1,5 @@ MeteorFalls_1F_2R: @ 8483EDC - .4byte MeteorFalls_1F_2R_MapAttributes + .4byte MeteorFalls_1F_2R_Layout .4byte MeteorFalls_1F_2R_MapEvents .4byte MeteorFalls_1F_2R_MapScripts .4byte 0x0 diff --git a/data/maps/MeteorFalls_1F_2R/map.bin b/data/maps/MeteorFalls_1F_2R/map.bin deleted file mode 100644 index 67ce2b784..000000000 --- a/data/maps/MeteorFalls_1F_2R/map.bin +++ /dev/null @@ -1,2 +0,0 @@ ->>>>>>>>>>>>>>4111111111111<4222222222222(=>>>>?22222222222201111=>>>>>>>>?2>2>2>2>2>2ŽU2V2V2W2U2W2=>>01111111111212111ž]^^_]_11=>>>>>11111112>2>2>2>2>2ŽU2W2U2V2V2V2W2=01111114112111ž]_]^^^_1111<>>>>?*>2>2>2>2>2ŽU2V2W2U2W2U2V2V2W2=>>(<4111121211ž]^_]_]^^_11(<4*11112>2>2>2ŽU2W2U2V2V2W22U2V2V2W2=((=>4**4111121ž]_]^^_Œ]^^_(01<4**?222222Œ2U2V2V2W22Œ22222•01(<4**22222Œ22]^^_Œ2U2W2U2V2W2•=>((<4** 22222ŽU2V2V2W222Œ2]_]^_1((<4**2222Œž]^^_…‡Ž2222222(((<4**†††‡ -2222222•<4–2U2W2U2V2V2W2(((<4**>?2222U2V2W2•=?–2]_]^^_(((<4**?22Ž]^_ž2222222(((<4**?2222•–2222Œ222222222(((<4**22 222ž2222222Œ222222(((<4**22222€‰Z[22222222223††(<4**€‰‰‰‰˜pXYš‰‰222222(<(<4**pppppPQpppp’2222 22((3††4**dQppPQXYpppp’222222(((<4**lYPQXYpppppp’222222(((<4**pXYppppp’6262622223††((<4**pppppppp’222222(<((<4**pp’626262626262222222(<3†(<4**pp’222222222222(<(<34**kzqqzk}Q†††††††††(<(<66†††††††††††††††††††††† \ No newline at end of file diff --git a/data/maps/MeteorFalls_B1F_1R/border.bin b/data/maps/MeteorFalls_B1F_1R/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/MeteorFalls_B1F_1R/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc index a138eeb06..11402d3d5 100644 --- a/data/maps/MeteorFalls_B1F_1R/header.inc +++ b/data/maps/MeteorFalls_B1F_1R/header.inc @@ -1,5 +1,5 @@ MeteorFalls_B1F_1R: @ 8483EF8 - .4byte MeteorFalls_B1F_1R_MapAttributes + .4byte MeteorFalls_B1F_1R_Layout .4byte MeteorFalls_B1F_1R_MapEvents .4byte MeteorFalls_B1F_1R_MapScripts .4byte 0x0 diff --git a/data/maps/MeteorFalls_B1F_1R/map.bin b/data/maps/MeteorFalls_B1F_1R/map.bin deleted file mode 100644 index a37afdb17..000000000 --- a/data/maps/MeteorFalls_B1F_1R/map.bin +++ /dev/null @@ -1,6 +0,0 @@ ->>>>>>>>>>>>>>>?DDDDDDDDDD=>>>4DDDD/DDDEFGDDDD.DD<?DDD/DDDMN2ODDDD.D(<411111D/22222222.((<4*11c11B*222222222€‰(((<4*BB BBBBB*2222222222p’(((<4*BBBBBB*€‰‰‰‰‰‰‰‰‰˜p’(((<4*BBBBBB*ppppppppppp’((=4*BB…R†R‡R -*ppppppppppp’((0<4*BBR?R*p’(BB*pppp’(<4*RRRRRR4RBBBBB12pppp’(<4R RRRRR>R?RBBBBB*€‰˜pppp’(<4RRR4RBBBBB*pppppp’(<4RRRR4RBBBBBBB*pppppp’(<4RRRR4RBBBBBBB2pppppxk(<6††††††††††‡ -B*€˜ppppx(<(<R4 -*ppppp’(<(<R4*ppppp’(<…(<R4*ppppp’(<…R4*ppppp’(<<R4*ppppp’(<<R4*ppppp’(<<R4*2222222<<R4*222222<<R4*222222<<R†66†††}~††††† \ No newline at end of file diff --git a/data/maps/MeteorFalls_B1F_2R/border.bin b/data/maps/MeteorFalls_B1F_2R/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/MeteorFalls_B1F_2R/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc index 2d3f50932..81c6276d2 100644 --- a/data/maps/MeteorFalls_B1F_2R/header.inc +++ b/data/maps/MeteorFalls_B1F_2R/header.inc @@ -1,5 +1,5 @@ MeteorFalls_B1F_2R: @ 8483F14 - .4byte MeteorFalls_B1F_2R_MapAttributes + .4byte MeteorFalls_B1F_2R_Layout .4byte MeteorFalls_B1F_2R_MapEvents .4byte MeteorFalls_B1F_2R_MapScripts .4byte 0x0 diff --git a/data/maps/MeteorFalls_B1F_2R/map.bin b/data/maps/MeteorFalls_B1F_2R/map.bin deleted file mode 100644 index 5f4497752..000000000 --- a/data/maps/MeteorFalls_B1F_2R/map.bin +++ /dev/null @@ -1 +0,0 @@ ->>>>>>>>>41111111<4*11111(<4**22222((<4**22222((<4**€‰‰‰((<4**ppp’((<4**ppp’((<4**ppp’((<4**ppp’((<4**ppp’((<4**ppp’((<4**ppp’((<4**ppp’((<4**22222((<4**22222((<4*††}~††(<††††††††† \ No newline at end of file diff --git a/data/maps/MeteorFalls_StevensCave/border.bin b/data/maps/MeteorFalls_StevensCave/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/MeteorFalls_StevensCave/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/MeteorFalls_StevensCave/header.inc b/data/maps/MeteorFalls_StevensCave/header.inc index d5415ea46..22b3aaeb6 100644 --- a/data/maps/MeteorFalls_StevensCave/header.inc +++ b/data/maps/MeteorFalls_StevensCave/header.inc @@ -1,5 +1,5 @@ MeteorFalls_StevensCave: @ 8484A74 - .4byte MeteorFalls_StevensCave_MapAttributes + .4byte MeteorFalls_StevensCave_Layout .4byte MeteorFalls_StevensCave_MapEvents .4byte MeteorFalls_StevensCave_MapScripts .4byte 0x0 diff --git a/data/maps/MeteorFalls_StevensCave/map.bin b/data/maps/MeteorFalls_StevensCave/map.bin deleted file mode 100644 index e509d66c2..000000000 --- a/data/maps/MeteorFalls_StevensCave/map.bin +++ /dev/null @@ -1,21 +0,0 @@ -               "11111      -             "111((    -(  "1111111121((((666(61111111122((((1112(61111111122(((111112(61111111122((111116(61111111122(11111(6(6222Œ222222011111((6(6Œ22Œ22Œ222222222(((6(62222Œ222         (6(622Œ2222(        -(6(1ž2222222((1111111ž(6(111ž       -22(111111!!611111ž     " -21 -1((  -111111ž  -222((Œ((((6111111((6  -22((2((((61111(((6622((2((((6*2222(((1ž622(ž–2((((6*2222(((61262211ž2((((6*2ŒŒ2(((612ž2Œ22222((((6*2Œ22(((*1ž222ŒŒ222((((6    -222(((6**22222Œ22    (6  - -Œ2((ž**2222Œ22(6   6(6** -2(ž222222((6(   -(6***2ž222   ((6(( -(6***222222222Œ2(66  6((((6**  -2222Œ22ŒŒ2(6(666((((6**6   -22222222(((   (((6*    -*222Œ2   ((((6  ((6*    -**22222(   (((6(66ž(6    -* HIJ   (666(((6žž               ž \ No newline at end of file diff --git a/data/maps/MirageTower_1F/border.bin b/data/maps/MirageTower_1F/border.bin deleted file mode 100644 index 58596f99a..000000000 --- a/data/maps/MirageTower_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -EEEE \ No newline at end of file diff --git a/data/maps/MirageTower_1F/header.inc b/data/maps/MirageTower_1F/header.inc index 27611506e..cd0717add 100644 --- a/data/maps/MirageTower_1F/header.inc +++ b/data/maps/MirageTower_1F/header.inc @@ -1,5 +1,5 @@ MirageTower_1F: @ 8484908 - .4byte MirageTower_1F_MapAttributes + .4byte MirageTower_1F_Layout .4byte MirageTower_1F_MapEvents .4byte MirageTower_1F_MapScripts .4byte 0x0 diff --git a/data/maps/MirageTower_1F/map.bin b/data/maps/MirageTower_1F/map.bin deleted file mode 100644 index b77d14890..000000000 --- a/data/maps/MirageTower_1F/map.bin +++ /dev/null @@ -1,3 +0,0 @@ -EE  EEEEEE22˜2™2™2™2™2™2™2š2222˜2™2¡2¡2©2©2©2©2©2¡2š22222 2¡2¡2p     q¢2˜2š2222 2¡2p 22222 q™2¡2¡2š222¨2p2222222q¡2¡2¢22222222222 2¡2¢22222222222 2¡2¢2˜2™2š22222222 2¡2¢2¨2¡2¢222222 2¡2¢22¨2¡2hi¡2¡2ª2š22 2¡2hi¡2¡2¢2   -¨2©2¡2š22222˜2™2¡2¡2¡2p     -22¨2ª22<2¨2©2©2©2ª2   E      XY       EE                 E \ No newline at end of file diff --git a/data/maps/MirageTower_2F/border.bin b/data/maps/MirageTower_2F/border.bin deleted file mode 100644 index 58596f99a..000000000 --- a/data/maps/MirageTower_2F/border.bin +++ /dev/null @@ -1 +0,0 @@ -EEEE \ No newline at end of file diff --git a/data/maps/MirageTower_2F/header.inc b/data/maps/MirageTower_2F/header.inc index f512754e7..e449c3a37 100644 --- a/data/maps/MirageTower_2F/header.inc +++ b/data/maps/MirageTower_2F/header.inc @@ -1,5 +1,5 @@ MirageTower_2F: @ 8484924 - .4byte MirageTower_2F_MapAttributes + .4byte MirageTower_2F_Layout .4byte MirageTower_2F_MapEvents .4byte MirageTower_2F_MapScripts .4byte 0x0 diff --git a/data/maps/MirageTower_2F/map.bin b/data/maps/MirageTower_2F/map.bin deleted file mode 100644 index 79c3056a9..000000000 --- a/data/maps/MirageTower_2F/map.bin +++ /dev/null @@ -1,3 +0,0 @@ -EE  EEEEEE222˜2™2™2™2™2™2š22?2222˜2¡2©2©2©2©2©2¡2š222/2/22˜2¡2p     q¢2222/2/2˜2¡2p 22222 q™2š222/2/2¨2p2222222qª222/2/222222222222/2222222222/2˜2222222222/2˜2¢222222222¨2¡2hiš2222 2¡2hi©2ª222   -¨2©2ª2222222¨2ª222     -2222222222222   E2               2EE2                 2E \ No newline at end of file diff --git a/data/maps/MirageTower_3F/border.bin b/data/maps/MirageTower_3F/border.bin deleted file mode 100644 index 58596f99a..000000000 --- a/data/maps/MirageTower_3F/border.bin +++ /dev/null @@ -1 +0,0 @@ -EEEE \ No newline at end of file diff --git a/data/maps/MirageTower_3F/header.inc b/data/maps/MirageTower_3F/header.inc index bdd93292e..def0a15c9 100644 --- a/data/maps/MirageTower_3F/header.inc +++ b/data/maps/MirageTower_3F/header.inc @@ -1,5 +1,5 @@ MirageTower_3F: @ 8484940 - .4byte MirageTower_3F_MapAttributes + .4byte MirageTower_3F_Layout .4byte MirageTower_3F_MapEvents .4byte MirageTower_3F_MapScripts .4byte 0x0 diff --git a/data/maps/MirageTower_3F/map.bin b/data/maps/MirageTower_3F/map.bin deleted file mode 100644 index 376ac2836..000000000 --- a/data/maps/MirageTower_3F/map.bin +++ /dev/null @@ -1,6 +0,0 @@ -EE  EEEEEE˜2™2™2™2™2™2š2222˜2™2š2¨2©2©2©2©2©2ª2222 2¡2ª222222      -¨2ª22222222 22222  -22222222222 -/222˜2š22222222/22/2¡2¢222222222˜2š2˜2¡2¢22222222˜2¡2¢2¨2¡2¢222222¨2©2ª22 2¢22222¨2ª222222   -222˜2™2™2™2™2™2™2™2š22     -222¨2©2©2©2©2©2©2©2ª22   E2               2EE2                 2E \ No newline at end of file diff --git a/data/maps/MirageTower_4F/border.bin b/data/maps/MirageTower_4F/border.bin deleted file mode 100644 index 58596f99a..000000000 --- a/data/maps/MirageTower_4F/border.bin +++ /dev/null @@ -1 +0,0 @@ -EEEE \ No newline at end of file diff --git a/data/maps/MirageTower_4F/header.inc b/data/maps/MirageTower_4F/header.inc index ff38fd9ca..7c1351ea6 100644 --- a/data/maps/MirageTower_4F/header.inc +++ b/data/maps/MirageTower_4F/header.inc @@ -1,5 +1,5 @@ MirageTower_4F: @ 848495C - .4byte MirageTower_4F_MapAttributes + .4byte MirageTower_4F_Layout .4byte MirageTower_4F_MapEvents .4byte MirageTower_4F_MapScripts .4byte 0x0 diff --git a/data/maps/MirageTower_4F/map.bin b/data/maps/MirageTower_4F/map.bin deleted file mode 100644 index 283534fb7..000000000 --- a/data/maps/MirageTower_4F/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -EE EE2˜2™2™2™2™2š22  B B B B Bqš222˜2˜B™B™B™BšB¡2š22 2 B¡B¡B¡B¢B¡2ª22¨2¨B©B©B©BªB¢2222iª222222˜2™2¡2¢222   -˜2™2™2¡2¡2¡2¢2   E         E \ No newline at end of file diff --git a/data/maps/MossdeepCity/border.bin b/data/maps/MossdeepCity/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/MossdeepCity/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc index c21d4f7f9..fc5af866a 100644 --- a/data/maps/MossdeepCity/header.inc +++ b/data/maps/MossdeepCity/header.inc @@ -1,5 +1,5 @@ MossdeepCity: @ 8482560 - .4byte MossdeepCity_MapAttributes + .4byte MossdeepCity_Layout .4byte MossdeepCity_MapEvents .4byte MossdeepCity_MapScripts .4byte MossdeepCity_MapConnections diff --git a/data/maps/MossdeepCity/map.bin b/data/maps/MossdeepCity/map.bin deleted file mode 100644 index bf150f5bb..000000000 Binary files a/data/maps/MossdeepCity/map.bin and /dev/null differ diff --git a/data/maps/MossdeepCity_GameCorner_1F/border.bin b/data/maps/MossdeepCity_GameCorner_1F/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/MossdeepCity_GameCorner_1F/border.bin and /dev/null differ diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc index 7e2adace8..9b886677e 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc @@ -1,5 +1,5 @@ MossdeepCity_GameCorner_1F: @ 84839F0 - .4byte MossdeepCity_GameCorner_1F_MapAttributes + .4byte MossdeepCity_GameCorner_1F_Layout .4byte MossdeepCity_GameCorner_1F_MapEvents .4byte MossdeepCity_GameCorner_1F_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_GameCorner_1F/map.bin b/data/maps/MossdeepCity_GameCorner_1F/map.bin deleted file mode 100644 index 8be990dde..000000000 --- a/data/maps/MossdeepCity_GameCorner_1F/map.bin +++ /dev/null @@ -1,53 +0,0 @@ -)2(2  12  22*22022 2 -2"#$2%&' -2 -2 -2 2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 2 -222 -2 -2 -222 -2 -2 -2 22 -2 -2 -22 -2 -2 22 ! -2 -2 -2 !2 -2 -2 2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 2 -2 -2 -2 -2-2.2 -2 -2 -2 -2 -2 \ No newline at end of file diff --git a/data/maps/MossdeepCity_GameCorner_B1F/border.bin b/data/maps/MossdeepCity_GameCorner_B1F/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/MossdeepCity_GameCorner_B1F/border.bin and /dev/null differ diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc index 6b4a75713..623b5f970 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc @@ -1,5 +1,5 @@ MossdeepCity_GameCorner_B1F: @ 8483A0C - .4byte MossdeepCity_GameCorner_B1F_MapAttributes + .4byte MossdeepCity_GameCorner_B1F_Layout .4byte MossdeepCity_GameCorner_B1F_MapEvents .4byte MossdeepCity_GameCorner_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_GameCorner_B1F/map.bin b/data/maps/MossdeepCity_GameCorner_B1F/map.bin deleted file mode 100644 index 399d05705..000000000 --- a/data/maps/MossdeepCity_GameCorner_B1F/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -  -        ˜6$2$2$2$2$2$2$2$2$2$2˜692#2#2#2#2#2#2#2#2#2#2#292#2#2#252626272#2#2#2#292#2#2#2=2>2>2?2#2#2#2#292#2#2#2E2F2F2G2#2#2#2#2‘2#2#2#2#2#2#2#2#2#2#2"2™#2#2#2#2#2#2#2#2#2#2* \ No newline at end of file diff --git a/data/maps/MossdeepCity_Gym/border.bin b/data/maps/MossdeepCity_Gym/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/MossdeepCity_Gym/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc index 1bb806541..321271f78 100644 --- a/data/maps/MossdeepCity_Gym/header.inc +++ b/data/maps/MossdeepCity_Gym/header.inc @@ -1,5 +1,5 @@ MossdeepCity_Gym: @ 84838BC - .4byte MossdeepCity_Gym_MapAttributes + .4byte MossdeepCity_Gym_Layout .4byte MossdeepCity_Gym_MapEvents .4byte MossdeepCity_Gym_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_Gym/map.bin b/data/maps/MossdeepCity_Gym/map.bin deleted file mode 100644 index da585f73f..000000000 --- a/data/maps/MossdeepCity_Gym/map.bin +++ /dev/null @@ -1,40 +0,0 @@ -666666666666666666666666666666626666666666666666666 66666666666666666 66666666666666666$ 666666666666666  -q2r2 -q2r266666666 6666  -p2s2t2 p2s266666666()6666 \2 - 666666666 6666  -Y2Z2Y2Z2666666666  !"#666666X2[2 -X2[2 -666666666  - - - -66666666]2666666666666666666666666 666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666266 -66666666666666Q2R2 -66666666666 6T2P2S266666666666666m26  - - - -66666666666666i2j2i2j26266666666666666666h2k2 -h2k266666666666666666666 -l2 -66666666666666666666666i2j2 -$6666666666666666666h2k2 -66 6666666666666666  -6666666666666666666Q2R2Q2R26666666666666 66P2S2T2P2S2% 666666666 66  - - - -$666666666 6 - - - -$6666626  - - - -6a2b26666666   - - 6`2c2 -6d26666666 $00$62 -6666666666666 \ No newline at end of file diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc index 5260cf931..64dedcba6 100644 --- a/data/maps/MossdeepCity_House1/header.inc +++ b/data/maps/MossdeepCity_House1/header.inc @@ -1,5 +1,5 @@ MossdeepCity_House1: @ 84838D8 - .4byte MossdeepCity_House1_MapAttributes + .4byte House2_Layout .4byte MossdeepCity_House1_MapEvents .4byte MossdeepCity_House1_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc index 1d0463231..b3cf19738 100644 --- a/data/maps/MossdeepCity_House2/header.inc +++ b/data/maps/MossdeepCity_House2/header.inc @@ -1,5 +1,5 @@ MossdeepCity_House2: @ 84838F4 - .4byte MossdeepCity_House2_MapAttributes + .4byte House1_Layout .4byte MossdeepCity_House2_MapEvents .4byte MossdeepCity_House2_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc index d474eab75..d54538b4e 100644 --- a/data/maps/MossdeepCity_House3/header.inc +++ b/data/maps/MossdeepCity_House3/header.inc @@ -1,5 +1,5 @@ MossdeepCity_House3: @ 8483964 - .4byte MossdeepCity_House3_MapAttributes + .4byte House2_Layout .4byte MossdeepCity_House3_MapEvents .4byte MossdeepCity_House3_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc index 30fe8c01a..33acf2e51 100644 --- a/data/maps/MossdeepCity_House4/header.inc +++ b/data/maps/MossdeepCity_House4/header.inc @@ -1,5 +1,5 @@ MossdeepCity_House4: @ 848399C - .4byte MossdeepCity_House4_MapAttributes + .4byte HouseWithBed_Layout .4byte MossdeepCity_House4_MapEvents .4byte MossdeepCity_House4_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc index d745cc8f4..586c976e7 100644 --- a/data/maps/MossdeepCity_Mart/header.inc +++ b/data/maps/MossdeepCity_Mart/header.inc @@ -1,5 +1,5 @@ MossdeepCity_Mart: @ 8483948 - .4byte MossdeepCity_Mart_MapAttributes + .4byte Mart_Layout .4byte MossdeepCity_Mart_MapEvents .4byte MossdeepCity_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc index 0b9faca99..5ee83f3ce 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ MossdeepCity_PokemonCenter_1F: @ 8483910 - .4byte MossdeepCity_PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte MossdeepCity_PokemonCenter_1F_MapEvents .4byte MossdeepCity_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc index 45e4f0881..a6659fafb 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ MossdeepCity_PokemonCenter_2F: @ 848392C - .4byte MossdeepCity_PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte MossdeepCity_PokemonCenter_2F_MapEvents .4byte MossdeepCity_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/border.bin b/data/maps/MossdeepCity_SpaceCenter_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/MossdeepCity_SpaceCenter_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc index b503f8580..abfb64ee8 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc @@ -1,5 +1,5 @@ MossdeepCity_SpaceCenter_1F: @ 84839B8 - .4byte MossdeepCity_SpaceCenter_1F_MapAttributes + .4byte MossdeepCity_SpaceCenter_1F_Layout .4byte MossdeepCity_SpaceCenter_1F_MapEvents .4byte MossdeepCity_SpaceCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.bin b/data/maps/MossdeepCity_SpaceCenter_1F/map.bin deleted file mode 100644 index 44f5081b9..000000000 Binary files a/data/maps/MossdeepCity_SpaceCenter_1F/map.bin and /dev/null differ diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/border.bin b/data/maps/MossdeepCity_SpaceCenter_2F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/MossdeepCity_SpaceCenter_2F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc index 388482c64..3a7fce680 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc @@ -1,5 +1,5 @@ MossdeepCity_SpaceCenter_2F: @ 84839D4 - .4byte MossdeepCity_SpaceCenter_2F_MapAttributes + .4byte MossdeepCity_SpaceCenter_2F_Layout .4byte MossdeepCity_SpaceCenter_2F_MapEvents .4byte MossdeepCity_SpaceCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.bin b/data/maps/MossdeepCity_SpaceCenter_2F/map.bin deleted file mode 100644 index d2e52d780..000000000 Binary files a/data/maps/MossdeepCity_SpaceCenter_2F/map.bin and /dev/null differ diff --git a/data/maps/MossdeepCity_StevensHouse/border.bin b/data/maps/MossdeepCity_StevensHouse/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/MossdeepCity_StevensHouse/border.bin and /dev/null differ diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc index 179ebd36e..83a907bda 100644 --- a/data/maps/MossdeepCity_StevensHouse/header.inc +++ b/data/maps/MossdeepCity_StevensHouse/header.inc @@ -1,5 +1,5 @@ MossdeepCity_StevensHouse: @ 8483980 - .4byte MossdeepCity_StevensHouse_MapAttributes + .4byte MossdeepCity_StevensHouse_Layout .4byte MossdeepCity_StevensHouse_MapEvents .4byte MossdeepCity_StevensHouse_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_StevensHouse/map.bin b/data/maps/MossdeepCity_StevensHouse/map.bin deleted file mode 100644 index ade25497a..000000000 --- a/data/maps/MossdeepCity_StevensHouse/map.bin +++ /dev/null @@ -1 +0,0 @@ -†‡Žh     ii–2—2p2$2$2$2$2$2$2q2q292#2#2#2è6é6é6ê6#2#2[392#2#2#2ð6ñ6Ñ6ò6#2#2c792#2#2#2#2#2,2#2#2#2[392#2#2#2#2#2#2#2#2#2c792#2#2 #2#2#2#2#2#2 \ No newline at end of file diff --git a/data/maps/MtChimney/border.bin b/data/maps/MtChimney/border.bin deleted file mode 100644 index 9ae2c2126..000000000 --- a/data/maps/MtChimney/border.bin +++ /dev/null @@ -1 +0,0 @@ -qqqq \ No newline at end of file diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc index 885541dde..bbdfaeb44 100644 --- a/data/maps/MtChimney/header.inc +++ b/data/maps/MtChimney/header.inc @@ -1,5 +1,5 @@ MtChimney: @ 8484010 - .4byte MtChimney_MapAttributes + .4byte MtChimney_Layout .4byte MtChimney_MapEvents .4byte MtChimney_MapScripts .4byte 0x0 diff --git a/data/maps/MtChimney/map.bin b/data/maps/MtChimney/map.bin deleted file mode 100644 index 1e7e2868d..000000000 --- a/data/maps/MtChimney/map.bin +++ /dev/null @@ -1 +0,0 @@ -h~qpqqpqpqrrrq2r‰x|q2{z½‰ppppqrrqqqrqqpqqpqqpqpqrrr{z½|xtz{½~6ppppqrrqqqrqqpqh~qqph~qrrrr{½yyy½‰qppppqrrqqqrq{pqpqqqppqqrrrr½½½½½½½‰h~pppqrrqq{zqrpqpqqqppqqrrrr½½½½½½½½‰ph~pxtzrqqrqqrpqpqqqppq{zrrrU½½½½½½½½~pph~2q2q2q2rqqrqqrpqpqqqpxtzq22227½½½½½½½‰qpppq2q2q2q2rq{zqqrpqpqqqpq2q2q2q2q2q2q2q2½½½½½½½‰h~ppq2q2q2q2rqrqq{zpqpqqqpq2q2q2q2{ttt½½½½½‰pqppq2q2q2q2rqrqqrqpqx|qqpq2q2q2q2rrr½½½½½½~~h~pq2q2q2{zqrq{zqx|qpqqphijq2rr£½½½£pqh~h~2q2q2q2rq{zqrqqqpqx|qppqrq222jqqr££££~h~qph~2q2q2q2q2rqrqqrq{qpqqpqpxtzq2q2q22i2jiiiii~qh~6pq2q2q2q2q2rqrqqrqr|x|qx|x|q2q2q2q2hijriijqqhii~6q6pq2q2q2q2q2rqrqqr{zpqpqqpqx|q2q2q2pqr2i2jii~hi2i2i2~2q2q2q2q2q2rqrq{zr{x|x|qpqqpq2q2q2xtzq2q22i2i2i2i2~2q2q2q2q2q2q2q2q2q2r{zqr{zrqpqpqx|qpq2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2{zrq{zr{z|pqpqqpqx|q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2rq6rqrqrrqppqx|qpqqxt|q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2rq6r{z{zr{px|qx|xttt|pq2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2{zq6rrqrqrrpqx|qxttt|pxt|q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2{zq6q6rrqr{zrpqqxt|qqqppq6q6x|q2q2q2q2q2q2q2q2q2q2q2q2q2{z{ttzrqrrqrxtt|qxt|qpxt|q2xt|q2q2{ttttt¯2ttz{z{ttz{zrqrqqqxt|qpqxt|xtt|xttzq2q2q2q2q2q2{ttz{z{ttz{zqrttt|qx|xt|qxt|q6x|q2q2{¯2tttttzq2q2{z{z{ttz{tztt|pqqxt|x|qqxt|xttzq2q2q2q2q2q2q2q2q2r{z{z{ttzqqqqpx|qqqpqxtt|qxt|q2q2q2q2q2q2q2q2q2{tzrq2rq2rqqq2{tqqpqxt|qÅ|qqqx|qqx|q2q2q2{ttt¯2z{tz{Ç{zqq{Çqqqx|qÄ2pqÌ6pqqqqxtt|xtttzq2q2q2q2{zq2q2rÌ6r{ttzÍqqqqx|ÍÅt|xttttt|qxtttttttt¯2zq2q2q2rqrrqÄ2q2Ì6Ä2qqqqpÌ6Ì6qpqqqqqqxtttttt|q2q2q2q2q2q2q2q2r{ÇrqÌ6qqÌ6qqqqxtt|pqq2qqŽ––––––––pq2q2q2q2q2{ttzrÌ6rÄ2Ä2{tt|qqqqqqppqq2qqq2&2'2!2!2"2q2q2xttt¯2tzq2q2q2r{zÍÌ6rÄ2qxtt|qqqppqÄ2Ä2q&2.6/))*Z2Z2Z2Z2Z2Z2Z2Z2T2S2q2{zrÄ2Ì6{zÍÄ2tt|pqqqppqÌ6Íq-67112q2q2q2q2q2q2q2q2\2[2R2Qq2rÌ6{zÄ2Ì6Ì6qqpxt|Ä2pxt|Ì6Ä2->?9:%q2q2q2q2q2q2q2q2d6q2q2YRQqrqÌ6{Æ|qxt|pÍÅt|Å|Í5FGABWq2q2q2q2q2q2q2q2q2q2q2rqYRQq{zÌ6pqÄ2qppÌ6Ì6qpÍpÍÄ2Ä2q2q2q2q2q2q2q2q24q2q2q2Ä2Ä2q2rqrqYRQ{tpÄ2ÍÄ2pxt|qpÌ6pÌ6Ì6Ì6q2q2q2q2q2q2q2q2q2q2q2q2Ì6Ì6{z{ÇÄ2rqYPapÌ6Ì6ÍÅt|pÄ2x|pq“––––‡q2q2q2q2…–––––{z{ÇÍÌ6rÄ2rrYxÆ|Ì6Ì6qppÍqpÅÆtÆ|q2q2“q2q2q2q2”q2q2q2q2{z{zÌ6Ì6{zÍrrrqÍÅt|qppÌ6qpÌ6Ì6qÍÅtÆ6ÆÆ22ÆÆÆ6ttÆz{zÄ2q2q2rq2Ì6rrrqÌ6Ì6qpÄ2px|Ä2ÅÆÆ|Ì6ÍÄ2ÍÍÍ77ÍÍÍÄ2Ä2Í6{zq2Ì6{Æzq2{zrrtt|qpÍx|pÌ6Ì6Ì6ÍÅ|ÍÍÍÍÍ77ÍÍÍÍÍÌ6rq2q2{zÍÄ2q2rq2rrÄ2Ä2pÄ2pÍqpÅtÆ|ÍÍpÍÍÍÍÍÍÍÍÍÍÍÍ{zÄ2Ä2rq2ÍÍq2rÄ2rrÍÍpÍpÍÄ2pÌ6qÌ6pÌ6ÍpÌ6ÍÍÍÍÍÍÍÍÍÍÍrÄ2ÍÍrÄ2Ì6Ì6Ä2rÍrrÍÍpÍpÌ6Íxtt|x|Íx|Ì6ÍÍÍÍÍÍÍÍÍÍrÍÍÌ6rÍÄ2Ä2ÍrÍrr \ No newline at end of file diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc index e3f29070f..efd224564 100644 --- a/data/maps/MtChimney_CableCarStation/header.inc +++ b/data/maps/MtChimney_CableCarStation/header.inc @@ -1,5 +1,5 @@ MtChimney_CableCarStation: @ 8483DFC - .4byte MtChimney_CableCarStation_MapAttributes + .4byte CableCarStation_Layout .4byte MtChimney_CableCarStation_MapEvents .4byte MtChimney_CableCarStation_MapScripts .4byte 0x0 diff --git a/data/maps/MtPyre_1F/border.bin b/data/maps/MtPyre_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/MtPyre_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc index 519211b49..17b7673c7 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -1,5 +1,5 @@ MtPyre_1F: @ 8484064 - .4byte MtPyre_1F_MapAttributes + .4byte MtPyre_1F_Layout .4byte MtPyre_1F_MapEvents .4byte MtPyre_1F_MapScripts .4byte 0x0 diff --git a/data/maps/MtPyre_1F/map.bin b/data/maps/MtPyre_1F/map.bin deleted file mode 100644 index 60b992a73..000000000 --- a/data/maps/MtPyre_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -ï³´µïïäïïäïïä÷»¼2½÷÷ì÷÷ì÷÷ìç2è2ç2é2&7&7ç2ç2ç2ç2ç2ç2ç2ïäïïäç2æ2æ2æ2î6î6æ2î6î6î6æ2î6î6÷ì÷÷ì'7ç2æ2æ2æ2î6î6æ2î6î6î6æ2î6î6ç2ç2ç2ç2ç2ç2ç2æ2æ2æ2î6î6æ2æ2æ2æ2æ2æ2æ222æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2î6î6î6æ2î6î6&7î6æ2æ2æ2æ2æ2î6î6î6æ2î6î6&7î6æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2ç2æ2î6î6æ2æ2æ2æ2æ2æ2æ2æ2æ2ç2æ2î6î6æ2æ2æ2æ2æ2æ2æ2æ2æ2&7î6æ2æ2î6î6æ2æ2æ2æ2æ2î6î6&7î6æ2æ2î6î6æ2æ2æ2æ2æ2î6î6ç2æ2ç2æ2ç2æ2ç2æ2ç2æ222 \ No newline at end of file diff --git a/data/maps/MtPyre_2F/border.bin b/data/maps/MtPyre_2F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/MtPyre_2F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc index 6eb960c01..d4a35c4c6 100644 --- a/data/maps/MtPyre_2F/header.inc +++ b/data/maps/MtPyre_2F/header.inc @@ -1,5 +1,5 @@ MtPyre_2F: @ 8484080 - .4byte MtPyre_2F_MapAttributes + .4byte MtPyre_2F_Layout .4byte MtPyre_2F_MapEvents .4byte MtPyre_2F_MapScripts .4byte 0x0 diff --git a/data/maps/MtPyre_2F/map.bin b/data/maps/MtPyre_2F/map.bin deleted file mode 100644 index 97b7e9e31..000000000 --- a/data/maps/MtPyre_2F/map.bin +++ /dev/null @@ -1 +0,0 @@ -äÃÄÅïäïäï³´µäìËÌ2Í÷ì÷ì÷»¼2½ìç2è2ç2é2ç2ç2&&ç2è2ç2é2&ç2æ2æ2æ2æ2æ2æ2îæ2æ2æ2æ2î&îæ2æ2æ2æ2îæ2îîæ2æ2æ2&îæ2æ2æ2æ2îæ2îæ2æ2æ2æ2ç2æ2îæ2æ2æ2æ2æ2æ2æ2îîæ2ç2æ2îæ2æ2æ2æ2æ2æ2æ2îîæ2&îîîîîæ2æ2îîæ2æ2î&æ2æ2æ2îîæ2æ2îîæ2ò3îç2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2&îæ2æ2îîæ2æ2îîæ2îî&îæ2æ2îîæ2æ2îîæ2îî \ No newline at end of file diff --git a/data/maps/MtPyre_3F/border.bin b/data/maps/MtPyre_3F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/MtPyre_3F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc index 9dcd40578..8bf9f015a 100644 --- a/data/maps/MtPyre_3F/header.inc +++ b/data/maps/MtPyre_3F/header.inc @@ -1,5 +1,5 @@ MtPyre_3F: @ 848409C - .4byte MtPyre_3F_MapAttributes + .4byte MtPyre_3F_Layout .4byte MtPyre_3F_MapEvents .4byte MtPyre_3F_MapScripts .4byte 0x0 diff --git a/data/maps/MtPyre_3F/map.bin b/data/maps/MtPyre_3F/map.bin deleted file mode 100644 index 758eccc3a..000000000 --- a/data/maps/MtPyre_3F/map.bin +++ /dev/null @@ -1 +0,0 @@ -ä³´µïäïäïÃÄÅä컼2½÷ì÷ì÷ËÌ2Íì&è2ç2é2ç2&&&ç2è2ç2é2&&æ2æ2æ2îîîîîæ2æ2æ2îç2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2&æ2æ2æ2æ2æ2îæ2æ2æ2æ2æ2î&æ2æ2îîîîîîîæ2æ2îç2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2&îîîîîîîîîæ2æ2æ2&îîîîîîîîîæ2æ2æ2ç2æ2æ2æ2æ2æ2æ2îîæ2æ2æ2æ2ç2æ2æ2îîæ2æ2îîæ2æ2îîç2æ2æ2îîæ2ò3îîæ2ò3îî \ No newline at end of file diff --git a/data/maps/MtPyre_4F/border.bin b/data/maps/MtPyre_4F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/MtPyre_4F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc index c94284c2f..9360976d4 100644 --- a/data/maps/MtPyre_4F/header.inc +++ b/data/maps/MtPyre_4F/header.inc @@ -1,5 +1,5 @@ MtPyre_4F: @ 84840B8 - .4byte MtPyre_4F_MapAttributes + .4byte MtPyre_4F_Layout .4byte MtPyre_4F_MapEvents .4byte MtPyre_4F_MapScripts .4byte 0x0 diff --git a/data/maps/MtPyre_4F/map.bin b/data/maps/MtPyre_4F/map.bin deleted file mode 100644 index 98dc679ff..000000000 --- a/data/maps/MtPyre_4F/map.bin +++ /dev/null @@ -1 +0,0 @@ -äï³´µêì÷»¼2½ëïïïïïï&&è2ç2é2&÷÷÷÷÷÷'&îæ2æ2æ2îïÃÄÅïïïïêÞ2Ï0Ï0ä÷ËÌ2Í÷÷÷÷ëÞ2Ï0Ï0ì&è2ç2é2&&&&&ç2ç2ç2&&æ2æ2æ2îîîîîæ2æ2æ2æ2ç2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2îîîîîîîîîîæ2æ2æ2î&æ2æ2í6æ2æ2îîîò3æ2æ2æ2&æ2æ2æ2æ2æ2îîîîîîî&æ2ò3æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2 \ No newline at end of file diff --git a/data/maps/MtPyre_5F/border.bin b/data/maps/MtPyre_5F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/MtPyre_5F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc index efabc0917..193120ca8 100644 --- a/data/maps/MtPyre_5F/header.inc +++ b/data/maps/MtPyre_5F/header.inc @@ -1,5 +1,5 @@ MtPyre_5F: @ 84840D4 - .4byte MtPyre_5F_MapAttributes + .4byte MtPyre_5F_Layout .4byte MtPyre_5F_MapEvents .4byte MtPyre_5F_MapScripts .4byte 0x0 diff --git a/data/maps/MtPyre_5F/map.bin b/data/maps/MtPyre_5F/map.bin deleted file mode 100644 index 12fbeeb7e..000000000 --- a/data/maps/MtPyre_5F/map.bin +++ /dev/null @@ -1 +0,0 @@ -ä³´µïê컼2½÷ë&è2ç2é2&ç2ïïïïïï&æ2æ2æ2îæ2÷÷÷÷÷÷ïêÞ2äïïïïïÃÄÅï÷ëÞ2ì÷÷÷÷÷ËÌ2Í÷&ç2ç2ç2&&&&&è2ç2é2&&æ2æ2æ2îæ2æ2æ2îæ2æ2æ2îç2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2&îæ2æ2æ2îîîæ2æ2æ2îîç2æ2îîîæ2í6æ2îîîæ2ò3&æ2æ2îæ2æ2æ2æ2æ2îæ2æ2î&æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2ò3 \ No newline at end of file diff --git a/data/maps/MtPyre_6F/border.bin b/data/maps/MtPyre_6F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/MtPyre_6F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc index f6931369b..3c390f962 100644 --- a/data/maps/MtPyre_6F/header.inc +++ b/data/maps/MtPyre_6F/header.inc @@ -1,5 +1,5 @@ MtPyre_6F: @ 84840F0 - .4byte MtPyre_6F_MapAttributes + .4byte MtPyre_6F_Layout .4byte MtPyre_6F_MapEvents .4byte MtPyre_6F_MapScripts .4byte 0x0 diff --git a/data/maps/MtPyre_6F/map.bin b/data/maps/MtPyre_6F/map.bin deleted file mode 100644 index 1f7438bfb..000000000 --- a/data/maps/MtPyre_6F/map.bin +++ /dev/null @@ -1 +0,0 @@ -êÃÄÅäïïïïïïïïëËÌ2Íì÷÷÷÷÷÷÷÷&è2ç2é2&&ç2ç2ç2ç2ç2ç2&ç2æ2æ2æ2îæ2æ2æ2æ2æ2æ2æ2æ2ç2æ2æ2îîæ2æ2æ2î6æ2æ2æ2æ2&æ2æ2æ2æ2æ2æ2î6î6æ2æ2æ2îïïïïïïïïïêÞ2äï÷÷÷÷÷÷÷÷÷ëÞ2ì÷&ç2ç2&&ç2×7ç2&&ç2ç2&ç2æ2æ2îæ2æ2æ2æ2æ2îæ2æ2æ2ç2ò3æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2ç2æ2æ2îæ2æ2æ2æ2æ2îæ2æ2æ2&æ2æ2îîæ2æ2æ2îîæ2æ2î \ No newline at end of file diff --git a/data/maps/MtPyre_Exterior/border.bin b/data/maps/MtPyre_Exterior/border.bin deleted file mode 100644 index 1d7df4a00..000000000 Binary files a/data/maps/MtPyre_Exterior/border.bin and /dev/null differ diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc index 7d9df6a8e..013d84e84 100644 --- a/data/maps/MtPyre_Exterior/header.inc +++ b/data/maps/MtPyre_Exterior/header.inc @@ -1,5 +1,5 @@ MtPyre_Exterior: @ 848410C - .4byte MtPyre_Exterior_MapAttributes + .4byte MtPyre_Exterior_Layout .4byte MtPyre_Exterior_MapEvents .4byte MtPyre_Exterior_MapScripts .4byte 0x0 diff --git a/data/maps/MtPyre_Exterior/map.bin b/data/maps/MtPyre_Exterior/map.bin deleted file mode 100644 index 7ab1e0461..000000000 Binary files a/data/maps/MtPyre_Exterior/map.bin and /dev/null differ diff --git a/data/maps/MtPyre_Summit/border.bin b/data/maps/MtPyre_Summit/border.bin deleted file mode 100644 index 1d7df4a00..000000000 Binary files a/data/maps/MtPyre_Summit/border.bin and /dev/null differ diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc index ffdb8fb8a..55f9d512b 100644 --- a/data/maps/MtPyre_Summit/header.inc +++ b/data/maps/MtPyre_Summit/header.inc @@ -1,5 +1,5 @@ MtPyre_Summit: @ 8484128 - .4byte MtPyre_Summit_MapAttributes + .4byte MtPyre_Summit_Layout .4byte MtPyre_Summit_MapEvents .4byte MtPyre_Summit_MapScripts .4byte 0x0 diff --git a/data/maps/MtPyre_Summit/map.bin b/data/maps/MtPyre_Summit/map.bin deleted file mode 100644 index 1de8bd5ea..000000000 Binary files a/data/maps/MtPyre_Summit/map.bin and /dev/null differ diff --git a/data/maps/NavelRock_B1F/border.bin b/data/maps/NavelRock_B1F/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/NavelRock_B1F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/NavelRock_B1F/header.inc b/data/maps/NavelRock_B1F/header.inc index 8570628b2..9a9b308de 100644 --- a/data/maps/NavelRock_B1F/header.inc +++ b/data/maps/NavelRock_B1F/header.inc @@ -1,5 +1,5 @@ NavelRock_B1F: @ 84858C8 - .4byte NavelRock_B1F_MapAttributes + .4byte NavelRock_B1F_Layout .4byte NavelRock_B1F_MapEvents .4byte NavelRock_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_B1F/map.bin b/data/maps/NavelRock_B1F/map.bin deleted file mode 100644 index 861fb6575..000000000 --- a/data/maps/NavelRock_B1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222?22GGGGGGGGGGGGGGGGGGGGG \ No newline at end of file diff --git a/data/maps/NavelRock_Bottom/border.bin b/data/maps/NavelRock_Bottom/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/NavelRock_Bottom/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/NavelRock_Bottom/header.inc b/data/maps/NavelRock_Bottom/header.inc index e40c64d91..84d942a9e 100644 --- a/data/maps/NavelRock_Bottom/header.inc +++ b/data/maps/NavelRock_Bottom/header.inc @@ -1,5 +1,5 @@ NavelRock_Bottom: @ 8485AC0 - .4byte NavelRock_Bottom_MapAttributes + .4byte NavelRock_Bottom_Layout .4byte NavelRock_Bottom_MapEvents .4byte NavelRock_Bottom_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Bottom/map.bin b/data/maps/NavelRock_Bottom/map.bin deleted file mode 100644 index af2f8a245..000000000 --- a/data/maps/NavelRock_Bottom/map.bin +++ /dev/null @@ -1 +0,0 @@ -r¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeFGcc¸  pr¢¢ºeFF]ddd[GG¸  pr¢¢ºedde]d[cdd¸  pr¢¢ºeddee{ccdd¸  pr¢¢ºeddeFdGcdd¸  pr¢¢ºedde=ddcdd¸  pr¢¢ºeslmdddkƒt¸  pr¢¢ºee=ddddd‹c¸  pr¢¢ºeed=dddd>c¸  pGGGGGGGGGGGGGGGGGGGGGG \ No newline at end of file diff --git a/data/maps/NavelRock_Down01/header.inc b/data/maps/NavelRock_Down01/header.inc index af66bb9bc..4f8237761 100644 --- a/data/maps/NavelRock_Down01/header.inc +++ b/data/maps/NavelRock_Down01/header.inc @@ -1,5 +1,5 @@ NavelRock_Down01: @ 848598C - .4byte NavelRock_Down01_MapAttributes + .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Down01_MapEvents .4byte NavelRock_Down01_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Down02/header.inc b/data/maps/NavelRock_Down02/header.inc index 8b70d543f..027de3f91 100644 --- a/data/maps/NavelRock_Down02/header.inc +++ b/data/maps/NavelRock_Down02/header.inc @@ -1,5 +1,5 @@ NavelRock_Down02: @ 84859A8 - .4byte NavelRock_Down02_MapAttributes + .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Down02_MapEvents .4byte NavelRock_Down02_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Down03/header.inc b/data/maps/NavelRock_Down03/header.inc index 78d1e1db3..41ae68722 100644 --- a/data/maps/NavelRock_Down03/header.inc +++ b/data/maps/NavelRock_Down03/header.inc @@ -1,5 +1,5 @@ NavelRock_Down03: @ 84859C4 - .4byte NavelRock_Down03_MapAttributes + .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Down03_MapEvents .4byte NavelRock_Down03_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Down04/header.inc b/data/maps/NavelRock_Down04/header.inc index ea459e2ff..a45886c16 100644 --- a/data/maps/NavelRock_Down04/header.inc +++ b/data/maps/NavelRock_Down04/header.inc @@ -1,5 +1,5 @@ NavelRock_Down04: @ 84859E0 - .4byte NavelRock_Down04_MapAttributes + .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Down04_MapEvents .4byte NavelRock_Down04_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Down05/header.inc b/data/maps/NavelRock_Down05/header.inc index ddb4d997f..2ab0c76ba 100644 --- a/data/maps/NavelRock_Down05/header.inc +++ b/data/maps/NavelRock_Down05/header.inc @@ -1,5 +1,5 @@ NavelRock_Down05: @ 84859FC - .4byte NavelRock_Down05_MapAttributes + .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Down05_MapEvents .4byte NavelRock_Down05_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Down06/header.inc b/data/maps/NavelRock_Down06/header.inc index 256d2d1c1..d8a17e85f 100644 --- a/data/maps/NavelRock_Down06/header.inc +++ b/data/maps/NavelRock_Down06/header.inc @@ -1,5 +1,5 @@ NavelRock_Down06: @ 8485A18 - .4byte NavelRock_Down06_MapAttributes + .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Down06_MapEvents .4byte NavelRock_Down06_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Down07/header.inc b/data/maps/NavelRock_Down07/header.inc index d49181bc4..0a77e6406 100644 --- a/data/maps/NavelRock_Down07/header.inc +++ b/data/maps/NavelRock_Down07/header.inc @@ -1,5 +1,5 @@ NavelRock_Down07: @ 8485A34 - .4byte NavelRock_Down07_MapAttributes + .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Down07_MapEvents .4byte NavelRock_Down07_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Down08/header.inc b/data/maps/NavelRock_Down08/header.inc index db1c426c2..a3cbed38a 100644 --- a/data/maps/NavelRock_Down08/header.inc +++ b/data/maps/NavelRock_Down08/header.inc @@ -1,5 +1,5 @@ NavelRock_Down08: @ 8485A50 - .4byte NavelRock_Down08_MapAttributes + .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Down08_MapEvents .4byte NavelRock_Down08_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Down09/header.inc b/data/maps/NavelRock_Down09/header.inc index 6f53a936f..6aed92500 100644 --- a/data/maps/NavelRock_Down09/header.inc +++ b/data/maps/NavelRock_Down09/header.inc @@ -1,5 +1,5 @@ NavelRock_Down09: @ 8485A6C - .4byte NavelRock_Down09_MapAttributes + .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Down09_MapEvents .4byte NavelRock_Down09_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Down10/header.inc b/data/maps/NavelRock_Down10/header.inc index f3945194a..bb96b7e3d 100644 --- a/data/maps/NavelRock_Down10/header.inc +++ b/data/maps/NavelRock_Down10/header.inc @@ -1,5 +1,5 @@ NavelRock_Down10: @ 8485A88 - .4byte NavelRock_Down10_MapAttributes + .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Down10_MapEvents .4byte NavelRock_Down10_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Down11/header.inc b/data/maps/NavelRock_Down11/header.inc index d02b578a1..48ed319eb 100644 --- a/data/maps/NavelRock_Down11/header.inc +++ b/data/maps/NavelRock_Down11/header.inc @@ -1,5 +1,5 @@ NavelRock_Down11: @ 8485AA4 - .4byte NavelRock_Down11_MapAttributes + .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Down11_MapEvents .4byte NavelRock_Down11_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Entrance/border.bin b/data/maps/NavelRock_Entrance/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/NavelRock_Entrance/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/NavelRock_Entrance/header.inc b/data/maps/NavelRock_Entrance/header.inc index 521af14c7..cc8d2446b 100644 --- a/data/maps/NavelRock_Entrance/header.inc +++ b/data/maps/NavelRock_Entrance/header.inc @@ -1,5 +1,5 @@ NavelRock_Entrance: @ 84858AC - .4byte NavelRock_Entrance_MapAttributes + .4byte NavelRock_Entrance_Layout .4byte NavelRock_Entrance_MapEvents .4byte NavelRock_Entrance_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Entrance/map.bin b/data/maps/NavelRock_Entrance/map.bin deleted file mode 100644 index 6fd5b9fa0..000000000 --- a/data/maps/NavelRock_Entrance/map.bin +++ /dev/null @@ -1 +0,0 @@ -22222222222222222222222222222222222?2222222222222222222222222222222222222222222222222222222222222222222ÜGGGGÒ2222222ÐGGGGGÒ2222ÕÐ222222222222222222222222222222Ù2222Õ22222222222222Õ222222222222222222222222GGXYZGGGGGGGGGGG \ No newline at end of file diff --git a/data/maps/NavelRock_Exterior/border.bin b/data/maps/NavelRock_Exterior/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/NavelRock_Exterior/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/NavelRock_Exterior/header.inc b/data/maps/NavelRock_Exterior/header.inc index 5d74b9eab..a01250cab 100644 --- a/data/maps/NavelRock_Exterior/header.inc +++ b/data/maps/NavelRock_Exterior/header.inc @@ -1,5 +1,5 @@ NavelRock_Exterior: @ 8485874 - .4byte NavelRock_Exterior_MapAttributes + .4byte NavelRock_Exterior_Layout .4byte NavelRock_Exterior_MapEvents .4byte NavelRock_Exterior_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Exterior/map.bin b/data/maps/NavelRock_Exterior/map.bin deleted file mode 100644 index 9b3342a1a..000000000 Binary files a/data/maps/NavelRock_Exterior/map.bin and /dev/null differ diff --git a/data/maps/NavelRock_Fork/border.bin b/data/maps/NavelRock_Fork/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/NavelRock_Fork/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/NavelRock_Fork/header.inc b/data/maps/NavelRock_Fork/header.inc index 94740f43b..a6dab9d20 100644 --- a/data/maps/NavelRock_Fork/header.inc +++ b/data/maps/NavelRock_Fork/header.inc @@ -1,5 +1,5 @@ NavelRock_Fork: @ 84858E4 - .4byte NavelRock_Fork_MapAttributes + .4byte NavelRock_Fork_Layout .4byte NavelRock_Fork_MapEvents .4byte NavelRock_Fork_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Fork/map.bin b/data/maps/NavelRock_Fork/map.bin deleted file mode 100644 index 0b314cc16..000000000 --- a/data/maps/NavelRock_Fork/map.bin +++ /dev/null @@ -1 +0,0 @@ -2222222222222222222?22222222222222222222222222222222222222222222GGGGGGGGGGÒ222ÐGGGGGGGGGG2222222222222222222222222222222222222222222222222222222222222222222ÐGGGGGGGGGG22Ð222222222222222222222222222GGGGGGGGGGÒ22Ò2222222222222222222222222222Óáâ2àáÔÓâ2àáÔ2222222222222222222222222GGGGGGGGGGGGGGGG \ No newline at end of file diff --git a/data/maps/NavelRock_Harbor/header.inc b/data/maps/NavelRock_Harbor/header.inc index 644442986..c7243f452 100644 --- a/data/maps/NavelRock_Harbor/header.inc +++ b/data/maps/NavelRock_Harbor/header.inc @@ -1,5 +1,5 @@ NavelRock_Harbor: @ 8485890 - .4byte NavelRock_Harbor_MapAttributes + .4byte IslandHarbor_Layout .4byte NavelRock_Harbor_MapEvents .4byte NavelRock_Harbor_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Top/border.bin b/data/maps/NavelRock_Top/border.bin deleted file mode 100644 index 8d839d092..000000000 --- a/data/maps/NavelRock_Top/border.bin +++ /dev/null @@ -1 +0,0 @@ -<<<< \ No newline at end of file diff --git a/data/maps/NavelRock_Top/header.inc b/data/maps/NavelRock_Top/header.inc index f6e72236f..4d1535615 100644 --- a/data/maps/NavelRock_Top/header.inc +++ b/data/maps/NavelRock_Top/header.inc @@ -1,5 +1,5 @@ NavelRock_Top: @ 8485970 - .4byte NavelRock_Top_MapAttributes + .4byte NavelRock_Top_Layout .4byte NavelRock_Top_MapEvents .4byte NavelRock_Top_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Top/map.bin b/data/maps/NavelRock_Top/map.bin deleted file mode 100644 index fce085ae6..000000000 --- a/data/maps/NavelRock_Top/map.bin +++ /dev/null @@ -1 +0,0 @@ -<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<PQ3R<<<<<<<<<<<<<<<<<<<<<P2R<<<<<<<<<<<<<<<<<<<P2R<<<<<<<<<<<<<<<<<<X2Z<<<<<<<<<<<<<<<<<<X2Z<<<<<<<<<<<<<<<<<<X2Z<<<<<<<<<<<<<<<<<<X2Z<<<<<<<<<<<<<<<<<<X22222Z<<<<<<<<<<<<<<<<CDp22222rDE<<<<<<<<<<<<CDFLp22222rLGDE<<<<<<<<<CF[\\p22222r\\]GE<<<<<<<CFLcLLp222?22rLLeLGE<<<<<CFL[FLLp22222rLLG]LGE<<DDFL[FLLL“”LLLG]LGDD\\\\F[\\\›œ\\]LG\\\\LL[\\FLLL£ÁÁÁÁÁ¤LLGG]LLLLL[FLLLL[\«lllll¬\]LLG]LLLFFLLLL[FL«lllll¬LG]LLG\\\LLLL[\FLL«lllll¬LLGG]LLLL \ No newline at end of file diff --git a/data/maps/NavelRock_Up1/border.bin b/data/maps/NavelRock_Up1/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/NavelRock_Up1/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/NavelRock_Up1/header.inc b/data/maps/NavelRock_Up1/header.inc index d9a51ab0f..c7484c59f 100644 --- a/data/maps/NavelRock_Up1/header.inc +++ b/data/maps/NavelRock_Up1/header.inc @@ -1,5 +1,5 @@ NavelRock_Up1: @ 8485900 - .4byte NavelRock_Up1_MapAttributes + .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Up1_MapEvents .4byte NavelRock_Up1_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Up1/map.bin b/data/maps/NavelRock_Up1/map.bin deleted file mode 100644 index c2951c043..000000000 --- a/data/maps/NavelRock_Up1/map.bin +++ /dev/null @@ -1 +0,0 @@ -22222222?2GGGGGGGGGGGG \ No newline at end of file diff --git a/data/maps/NavelRock_Up2/border.bin b/data/maps/NavelRock_Up2/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/NavelRock_Up2/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/NavelRock_Up2/header.inc b/data/maps/NavelRock_Up2/header.inc index 94d42c6c4..824ef267d 100644 --- a/data/maps/NavelRock_Up2/header.inc +++ b/data/maps/NavelRock_Up2/header.inc @@ -1,5 +1,5 @@ NavelRock_Up2: @ 848591C - .4byte NavelRock_Up2_MapAttributes + .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Up2_MapEvents .4byte NavelRock_Up2_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Up2/map.bin b/data/maps/NavelRock_Up2/map.bin deleted file mode 100644 index 47dd37b93..000000000 --- a/data/maps/NavelRock_Up2/map.bin +++ /dev/null @@ -1 +0,0 @@ -?22V22^22fGGGGGGGGGGGG \ No newline at end of file diff --git a/data/maps/NavelRock_Up3/header.inc b/data/maps/NavelRock_Up3/header.inc index 2a57b2444..7782ca0f4 100644 --- a/data/maps/NavelRock_Up3/header.inc +++ b/data/maps/NavelRock_Up3/header.inc @@ -1,5 +1,5 @@ NavelRock_Up3: @ 8485938 - .4byte NavelRock_Up3_MapAttributes + .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Up3_MapEvents .4byte NavelRock_Up3_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Up4/header.inc b/data/maps/NavelRock_Up4/header.inc index 17e8ae965..c022d9d0b 100644 --- a/data/maps/NavelRock_Up4/header.inc +++ b/data/maps/NavelRock_Up4/header.inc @@ -1,5 +1,5 @@ NavelRock_Up4: @ 8485954 - .4byte NavelRock_Up4_MapAttributes + .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Up4_MapEvents .4byte NavelRock_Up4_MapScripts .4byte 0x0 diff --git a/data/maps/NewMauville_Entrance/border.bin b/data/maps/NewMauville_Entrance/border.bin deleted file mode 100644 index 4531975c7..000000000 Binary files a/data/maps/NewMauville_Entrance/border.bin and /dev/null differ diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc index 8bdf39e18..147f003d0 100644 --- a/data/maps/NewMauville_Entrance/header.inc +++ b/data/maps/NewMauville_Entrance/header.inc @@ -1,5 +1,5 @@ NewMauville_Entrance: @ 8484470 - .4byte NewMauville_Entrance_MapAttributes + .4byte NewMauville_Entrance_Layout .4byte NewMauville_Entrance_MapEvents .4byte NewMauville_Entrance_MapScripts .4byte 0x0 diff --git a/data/maps/NewMauville_Entrance/map.bin b/data/maps/NewMauville_Entrance/map.bin deleted file mode 100644 index 1e3f471e8..000000000 --- a/data/maps/NewMauville_Entrance/map.bin +++ /dev/null @@ -1 +0,0 @@ -t||ÃÄÅ||‰ut©ËÌ2Í©‰suuÐ3Î3Ð3Ï3Ð3ÔsuuÐ3Ð3Ð3Ð3Ð3ÔsuuÐ3Ð3Ð3Ð3Ð3ÔsuuÐ3Ð3Ð3Ð3Ð3ÔsuuÐ3Ð3Ç3Ð3Ð3Ôsu¿ÖÑÒÓÖ¾s¿lllllll¾ \ No newline at end of file diff --git a/data/maps/NewMauville_Inside/border.bin b/data/maps/NewMauville_Inside/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/NewMauville_Inside/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc index 585719630..3eda8df5e 100644 --- a/data/maps/NewMauville_Inside/header.inc +++ b/data/maps/NewMauville_Inside/header.inc @@ -1,5 +1,5 @@ NewMauville_Inside: @ 848448C - .4byte NewMauville_Inside_MapAttributes + .4byte NewMauville_Inside_Layout .4byte NewMauville_Inside_MapEvents .4byte NewMauville_Inside_MapScripts .4byte 0x0 diff --git a/data/maps/NewMauville_Inside/map.bin b/data/maps/NewMauville_Inside/map.bin deleted file mode 100644 index 78d1e39ce..000000000 --- a/data/maps/NewMauville_Inside/map.bin +++ /dev/null @@ -1 +0,0 @@ -h¨·jh™šjp'°±'''¿'××Örp×'¡¢ÔÕ'ÐÑÒÓÖ×ÔÕrpu2¸2¹2u2/2/2Ç6/2ï2ß2Þ2Œ¶‹ß2u2©2ª2Ü6Ýu2ØÙÚÛÞ2ß2Ü6Ý6rp}2Ž272727272Ï672722…2”'''''¾''“}2222ä6å6}2à6á6â6ã6}2È2ä6å6rp}2–'''''''•}22/2/2/2/2/2Æ6/2/2/2~22222/2~2è6é6ê6ë6}222/2rh‹}2Œ™šjp}2Ž27272727272Î672722…22222222/2/2/2~2222rp'³“}2”¡¢rp}2–''''''''•}22222222>22222ÁÀrpu2»2/2~22©2ª2rh‹}2Œ™šjp}22Á22222222Á2ÀÀr‰y2o22…2ž2o272ŠpÖ“}2”'¡¢rxy27272727272727272727272727272zp'w¥}2¦w'rpÞ2/2~22/2©2ª2r€'''''''''''''''‚pu2/2/2~22/2/2rp}262222.22rp}2.2222622rxy2727272727272z‰y2722…2ž27272Š€'''''''‚pÔÕ¥}2¦''rh¨™ˆjpÜ6Ý6u2~22/2/2rp'°±''Ö²¡'ÔÕÖ×rpä6å6}22222rpu2¸2¹2u2/2î2Ä2©2u2Ü6Ý6Þ2ß2rpu2/2~22222Œ·‹}22222222˜}2ä6å6}22rp}2Á22222”'¿“}22222222 }22/2~22rpÃ22£2¤2222/2Ç6/2~222222222~2222.2rpÂX62«6¬622Ž272Ï62…22ž272727272’272o27272o272ŠpÂÁX62È222–''•}22¦'''''w''Ö×r‰y2o272o272o272Šp}222/2/2/2/2u2/2/2/2î2ß2rŸ¨§p'w'w³w´rp}22226222}222222Œ¶`'´´'°±ajpu2/2/2/2»2/2¼2rp}222222Á}222222”'¾“u2¼2½2/2¸2¹2”'''rp}2Á2ÁÀÁÀŒ¶‹—2722…2ž27272‘‡22…22222/2Æ6/2~2222222/2/2/2rpÃ6222ÁÀÀ”'¾“¦'¥}2¦³´'¥}2222Ž272Î62…222222Ž2722…2rpÃÀ2622222/2Æ6/2/2/2/2~22»2¼2˜u2/2~2222–''•}222222–'•}2rpÂÀ22222Ž272Î62…2À22222 }222222rxy27272727272zp}2rpÂÀ222ÀÀ–''•}2ÀÁ22222~222222r€''''''‚p}2rxy22…22Ž27272zxy272727272727272727272727272zp}2r€'•}22–''‚€''''''''''''''‚p}2rp}22rp}2rp}22rh™šˆjh™š\n]™š§p}2rp}22rp¡¢'³²³rp¡¢²´“v2”¡¢a¶‹}2rp}22Œ‹µ2ª2u2»2º2»2Œ·‹µ2ª2º2¼2/2/2/2©2ª2”¾“}2rp}22”'³³²³''“}22˜}2222”'¿''“}2222222222Æ6/2~2rp}222/2»2»2º2»2/2/2/2~22 }2.2222/2Ç6/2/2/2~2222ž2o2727272Ž2Î67272zxy27272727272727272722…222~2222Ž272Ï672722…2222¦w´´'–'''‚€''''''''''•}2222222–''''•}222622/2¼2½2/2rxy2727272727272zxy27272727272727272z€'''''''‚€'''''''''‚ \ No newline at end of file diff --git a/data/maps/OldaleTown/border.bin b/data/maps/OldaleTown/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/OldaleTown/border.bin +++ /dev/null @@ -1 +0,0 @@ -ÔÕÜÝ \ No newline at end of file diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc index 3eeb1e72d..3d8ae1db5 100644 --- a/data/maps/OldaleTown/header.inc +++ b/data/maps/OldaleTown/header.inc @@ -1,5 +1,5 @@ OldaleTown: @ 84825D0 - .4byte OldaleTown_MapAttributes + .4byte OldaleTown_Layout .4byte OldaleTown_MapEvents .4byte OldaleTown_MapScripts .4byte OldaleTown_MapConnections diff --git a/data/maps/OldaleTown/map.bin b/data/maps/OldaleTown/map.bin deleted file mode 100644 index 28b17c441..000000000 --- a/data/maps/OldaleTown/map.bin +++ /dev/null @@ -1 +0,0 @@ -ÔÕÔÕÔÕÔÕ0Ð1Ò10ÔÕÔÕÔÕÔÕÜÝÜÝäåäçÐ1Ù1Ú10æåäåÜÝÜÝÔÕÔÕ0000Ø1Ù1Ù1Ò10000ÔÕÔÕÜÝäç0000Ø1Ù1Ù1Ú10(0)0)0…åÜÝÔÕ00l2m2m2n2Ø1Ù1Ù1Ú1001230ÔÕÜÝ00tuuvØ1Ù1Ù1Ù1Ò189:;0ÜÝÔÕ00|}~Ø1Ù1Ù1Ù1Ú1`ABC0ÔÕÜÝ00„‡†Ø1á1á1á1Ù1Ñ1Ñ1Ñ1Ñ1Ò1æåÔÕ000Ð1Ñ1Ñ1Ú1000Ø1Ù1Ù1Ù1Ù1Ù1Ò10äç0Ð1Ñ1Ù1Ù1Ù1Ú100Ø1Ù1Ù1Ù1Ù1Ù1â1020Ð1Ù1Ù1Ù1Ù1Ù1Ú1000Ø1Ù1Ù1Ù1Ù1â1002Ï1à1á1á1Ù1Ù1Ù1Ù1Ñ1Ñ1Ñ1Ù1Ù1Ù1á1â10Î1Ï1Ô×000à1á1Ù1Ù1Ù1Ù1Ù1Ù1Ù1Ú1000ÖÕÜÝ000H0I0‚2ƒ2Ù1Ù1Ù1Ù1á1l2m2m2n2ÜÝÔÕ000PQRSÙ1Ù1Ù1Ú10tuuvÔÕÜÝÎ1Ï10XYZ[Ø1Ù1Ù1Ú10|}~ÜÝÔÕÔ×0`abcØ1Ù1Ù1â10„‡†ÔÕÜÝÜÝ000Ð1Ñ1Ù1Ù1Ú10000Î1Ï1ÜÝÔÕÔÕ000Ø1Ù1Ù1Ù1Ú10000ÖÕÔÕÜÝÜÝÎ1Ï1Î1x2Ù1Ù1Ù1â1Î1Ï1Î1Ï1ÜÝÜÝ \ No newline at end of file diff --git a/data/maps/OldaleTown_House1/border.bin b/data/maps/OldaleTown_House1/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/OldaleTown_House1/border.bin and /dev/null differ diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc index 245f1e146..6039540cc 100644 --- a/data/maps/OldaleTown_House1/header.inc +++ b/data/maps/OldaleTown_House1/header.inc @@ -1,5 +1,5 @@ OldaleTown_House1: @ 8482B80 - .4byte OldaleTown_House1_MapAttributes + .4byte House1_Layout .4byte OldaleTown_House1_MapEvents .4byte OldaleTown_House1_MapScripts .4byte 0x0 diff --git a/data/maps/OldaleTown_House1/map.bin b/data/maps/OldaleTown_House1/map.bin deleted file mode 100644 index ea185484d..000000000 --- a/data/maps/OldaleTown_House1/map.bin +++ /dev/null @@ -1 +0,0 @@ -†‡yzŽ‚   22–2—2‰2Š2$2$2$2$2˜˜9252626262626272#2#292=H6I6â2>2>2?2#2#292=P6Q6â2>2>2?2#2#292E2F2F2F2F2F2G2#2#292#2#2#2#2#2#2#2#2"292#2#2 #2#2#2#2*6 \ No newline at end of file diff --git a/data/maps/OldaleTown_House2/border.bin b/data/maps/OldaleTown_House2/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/OldaleTown_House2/border.bin and /dev/null differ diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc index 7bf092b6b..75753041f 100644 --- a/data/maps/OldaleTown_House2/header.inc +++ b/data/maps/OldaleTown_House2/header.inc @@ -1,5 +1,5 @@ OldaleTown_House2: @ 8482B9C - .4byte OldaleTown_House2_MapAttributes + .4byte House2_Layout .4byte OldaleTown_House2_MapEvents .4byte OldaleTown_House2_MapScripts .4byte 0x0 diff --git a/data/maps/OldaleTown_House2/map.bin b/data/maps/OldaleTown_House2/map.bin deleted file mode 100644 index 0e9f07964..000000000 --- a/data/maps/OldaleTown_House2/map.bin +++ /dev/null @@ -1 +0,0 @@ -†‡0xŽ   hlm€–2—282$2$2$2$2p2t2u2ˆ292#2#2#2#2#2#2#2#2#2#292#2#2#2+2JK,2#2#2#292#2#2#2+2RS,2#2#2#2‘2#2#2#2#2#2#2#2#2#2"2™#2#2 #2#2#2#2#2* \ No newline at end of file diff --git a/data/maps/OldaleTown_Mart/border.bin b/data/maps/OldaleTown_Mart/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/OldaleTown_Mart/border.bin and /dev/null differ diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc index 4f4ea646f..043acab8d 100644 --- a/data/maps/OldaleTown_Mart/header.inc +++ b/data/maps/OldaleTown_Mart/header.inc @@ -1,5 +1,5 @@ OldaleTown_Mart: @ 8482BF0 - .4byte OldaleTown_Mart_MapAttributes + .4byte Mart_Layout .4byte OldaleTown_Mart_MapEvents .4byte OldaleTown_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/OldaleTown_Mart/map.bin b/data/maps/OldaleTown_Mart/map.bin deleted file mode 100644 index 08f393264..000000000 --- a/data/maps/OldaleTown_Mart/map.bin +++ /dev/null @@ -1,3 +0,0 @@ -"#$#$D*()() 222 2220212!212%292:2222222- AB222+,22+ -22222234223 -222222;<22;222222222 \ No newline at end of file diff --git a/data/maps/OldaleTown_PokemonCenter_1F/border.bin b/data/maps/OldaleTown_PokemonCenter_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/OldaleTown_PokemonCenter_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc index cc564e6ae..d51331b61 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ OldaleTown_PokemonCenter_1F: @ 8482BB8 - .4byte OldaleTown_PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte OldaleTown_PokemonCenter_1F_MapEvents .4byte OldaleTown_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.bin b/data/maps/OldaleTown_PokemonCenter_1F/map.bin deleted file mode 100644 index 5201dde15..000000000 --- a/data/maps/OldaleTown_PokemonCenter_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ - ij   JK   qrH"#RSI22y2z2P*+2[Q$2222 2&2422X!!!Y<222'2 2222`2l2m2n2o22%222'2€22222021222322222'2ˆ6‰B228292:2;2242=>'22‘2222@2A2B2C22&2EF'2(2222222222&24276 \ No newline at end of file diff --git a/data/maps/OldaleTown_PokemonCenter_2F/border.bin b/data/maps/OldaleTown_PokemonCenter_2F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/OldaleTown_PokemonCenter_2F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc index 798a5f72b..9b9df67fd 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ OldaleTown_PokemonCenter_2F: @ 8482BD4 - .4byte OldaleTown_PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte OldaleTown_PokemonCenter_2F_MapEvents .4byte OldaleTown_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.bin b/data/maps/OldaleTown_PokemonCenter_2F/map.bin deleted file mode 100644 index c623d86fc..000000000 --- a/data/maps/OldaleTown_PokemonCenter_2F/map.bin +++ /dev/null @@ -1 +0,0 @@ -  ? \  ?\  ?Gd6Gd6GØÙÙ¦Ï2ÍÏO2ÍÏOb2Öàà×]Õ×Û]Õ×Ú/2 2l2l2¶2a2¿2l2ã<¿2l2â/2˜2™222Ê2Ë2Ì22g2È2É22g2D ¡B2Ò2Ó2Ô222Ð2Ñ222'2¨2©222222222222'2 22222^2^222^2^222'2(622422ff42&2ff&24276 \ No newline at end of file diff --git a/data/maps/PacifidlogTown/border.bin b/data/maps/PacifidlogTown/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/PacifidlogTown/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc index a630f5efa..3244c01b8 100644 --- a/data/maps/PacifidlogTown/header.inc +++ b/data/maps/PacifidlogTown/header.inc @@ -1,5 +1,5 @@ PacifidlogTown: @ 848265C - .4byte PacifidlogTown_MapAttributes + .4byte PacifidlogTown_Layout .4byte PacifidlogTown_MapEvents .4byte PacifidlogTown_MapScripts .4byte PacifidlogTown_MapConnections diff --git a/data/maps/PacifidlogTown/map.bin b/data/maps/PacifidlogTown/map.bin deleted file mode 100644 index 02c1454bb..000000000 --- a/data/maps/PacifidlogTown/map.bin +++ /dev/null @@ -1,6 +0,0 @@ -qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqt||‰qqqqqqqqqqqqqt||}‰q{‰qqqqqqqqqqt|}qqq{‰q{y|||||||||}qqt||‰{|©©©‰qqqqqqt©||}qt{©©©©‰{y|||||}t©©©|}‰‰‰‰{©©©©©©©©}€‰‰‰‰pppš‰‰‰‰‰‰‰‰‰‰˜ppuv  -  pppppppppppp}~22ppppppppp  -  p22pp0123ppp22p2!2!2!22pPQRS p22p 2!2!2!2$2p2XYZ[2p 2!2!2!2$2p())*2,p2HabK2p()*2),ppX2p2!2!2!22pX2ppp`2P2Q2 2!2!2!2!2$2P2Q2P2Q2`2pp()*2)),pppppppppppppX2ppppp  -  p  -  pp`2ppppp22p22ppX2pppp22p22pp`2p  -   2!2!2!2$2p 2!2!2!2$2ppX2p22()*2),()*2),`2p22ppX2ppppX2ppppX2p 2!2!2!2$2pp`2ppppp`2P2Q2P2Q2`2p()*2),ppX2ppppppppX2P2Q2P2Q2P2Q2P2Q2`2pppppppp`2pppppppppppuvpppppppppppppppppp}~ppppppppppppppuvppppr{{{{{{{{{{{{t}~pp{{´qqqqklllllmq´{{{{qqqqkll¾qqqqq¿lllmqqkll¾¾qqqqqqqqqqqq¿ll¾qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq \ No newline at end of file diff --git a/data/maps/PacifidlogTown_House1/border.bin b/data/maps/PacifidlogTown_House1/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/PacifidlogTown_House1/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc index a0e8763e3..b78d36a2a 100644 --- a/data/maps/PacifidlogTown_House1/header.inc +++ b/data/maps/PacifidlogTown_House1/header.inc @@ -1,5 +1,5 @@ PacifidlogTown_House1: @ 8482F8C - .4byte PacifidlogTown_House1_MapAttributes + .4byte PacifidlogTown_House1_Layout .4byte PacifidlogTown_House1_MapEvents .4byte PacifidlogTown_House1_MapScripts .4byte 0x0 diff --git a/data/maps/PacifidlogTown_House1/map.bin b/data/maps/PacifidlogTown_House1/map.bin deleted file mode 100644 index 7865fdc7c..000000000 --- a/data/maps/PacifidlogTown_House1/map.bin +++ /dev/null @@ -1 +0,0 @@ -‘´µ‘‘‘‘—’˜¨¼½™™¸¹Ÿš 3°3Ä3Å3¡3·7À3Á3§3¢3¡3”3•3•3•3•3•3•3–3£3¡3œ33®3ª«¯33ž3£3·7œ33®3²³¯33ž3£3¡3¤3¥3¥3¥3¥3¥3¥3¦3£3·7£3£3£3£3£3£3£3£3£3æ7£3£3£3¬­£3£3£3ç7 \ No newline at end of file diff --git a/data/maps/PacifidlogTown_House2/border.bin b/data/maps/PacifidlogTown_House2/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/PacifidlogTown_House2/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc index 8548cfc32..571dcd9ce 100644 --- a/data/maps/PacifidlogTown_House2/header.inc +++ b/data/maps/PacifidlogTown_House2/header.inc @@ -1,5 +1,5 @@ PacifidlogTown_House2: @ 8482FA8 - .4byte PacifidlogTown_House2_MapAttributes + .4byte PacifidlogTown_House2_Layout .4byte PacifidlogTown_House2_MapEvents .4byte PacifidlogTown_House2_MapScripts .4byte 0x0 diff --git a/data/maps/PacifidlogTown_House2/map.bin b/data/maps/PacifidlogTown_House2/map.bin deleted file mode 100644 index 617346322..000000000 --- a/data/maps/PacifidlogTown_House2/map.bin +++ /dev/null @@ -1 +0,0 @@ -º»´µ‘‘“‘’˜ÆǼ½™™©š 3Â3Ã3Ä3Å3¡3¡3›3±3¢3·7”3•3•3•3•3•3•3–3£3·7œ333ª«¯33ž3£3¡3œ33®3²³33ž3£3¡3¤3¥3¥3¥3¥3¥3¥3¦3£3¡3£3£3£3£3£3£3£3£3£3æ7£3£3£3¬­£3£3£3ç7 \ No newline at end of file diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc index 7fa97cda2..fb60530a6 100644 --- a/data/maps/PacifidlogTown_House3/header.inc +++ b/data/maps/PacifidlogTown_House3/header.inc @@ -1,5 +1,5 @@ PacifidlogTown_House3: @ 8482FC4 - .4byte PacifidlogTown_House3_MapAttributes + .4byte PacifidlogTown_House1_Layout .4byte PacifidlogTown_House3_MapEvents .4byte PacifidlogTown_House3_MapScripts .4byte 0x0 diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc index b505892ad..7beed0a39 100644 --- a/data/maps/PacifidlogTown_House4/header.inc +++ b/data/maps/PacifidlogTown_House4/header.inc @@ -1,5 +1,5 @@ PacifidlogTown_House4: @ 8482FE0 - .4byte PacifidlogTown_House4_MapAttributes + .4byte PacifidlogTown_House2_Layout .4byte PacifidlogTown_House4_MapEvents .4byte PacifidlogTown_House4_MapScripts .4byte 0x0 diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc index 055a1b566..671c7d28e 100644 --- a/data/maps/PacifidlogTown_House5/header.inc +++ b/data/maps/PacifidlogTown_House5/header.inc @@ -1,5 +1,5 @@ PacifidlogTown_House5: @ 8482FFC - .4byte PacifidlogTown_House5_MapAttributes + .4byte PacifidlogTown_House1_Layout .4byte PacifidlogTown_House5_MapEvents .4byte PacifidlogTown_House5_MapScripts .4byte 0x0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc index 0c84c8b8a..d11ea93d2 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ PacifidlogTown_PokemonCenter_1F: @ 8482F54 - .4byte PacifidlogTown_PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte PacifidlogTown_PokemonCenter_1F_MapEvents .4byte PacifidlogTown_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc index 6804ac368..00724203f 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ PacifidlogTown_PokemonCenter_2F: @ 8482F70 - .4byte PacifidlogTown_PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte PacifidlogTown_PokemonCenter_2F_MapEvents .4byte PacifidlogTown_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/PetalburgCity/border.bin b/data/maps/PetalburgCity/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/PetalburgCity/border.bin +++ /dev/null @@ -1 +0,0 @@ -ÔÕÜÝ \ No newline at end of file diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc index d87259512..248c6d2ae 100644 --- a/data/maps/PetalburgCity/header.inc +++ b/data/maps/PetalburgCity/header.inc @@ -1,5 +1,5 @@ PetalburgCity: @ 84824B8 - .4byte PetalburgCity_MapAttributes + .4byte PetalburgCity_Layout .4byte PetalburgCity_MapEvents .4byte gStdScripts_End .4byte PetalburgCity_MapConnections diff --git a/data/maps/PetalburgCity/map.bin b/data/maps/PetalburgCity/map.bin deleted file mode 100644 index 35f0172ca..000000000 --- a/data/maps/PetalburgCity/map.bin +++ /dev/null @@ -1,4 +0,0 @@ -ÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÜÝÜÝUNMNMNVòóòóòóòóåäåäåäåÜÝÜÝÔÕÔÕD    -FÔÕÔÕÔÕÔÕ000°±±²ÔÕÔÕÜÝÜÝLLæ5åäåäåäç5°±±À¡¡ºÜÝÜÝÔÕÔÕT  L?ª««««¬?¸¡¡¡¡¡ºÔÕÔÕÜÝÜÝ0 !"LL²³³³³´L¸¡¡¡¡¡ºÜÝÜÝÔÕÔÕ001100LL¸¹º³»¼L¸¡¡¡¡¡ºÔÕÔÕÜÝÜÝ00 1"100LLÀÁÂÅÃÄL¸¡¡¡¡¡ºÜÝÜÝÔÕÔÕ00 1"10<2fLÈ1É1ÊÍËÌ1L¸¡¡¡¡¡ºÔÕÔÕÜÝä5ç500 1"1deT0011101T00000P2Q2XYÜÝÔÕ0000 1"1000000 1!1"110000000123ÔÕæ5ç50000 1"1000000 1!1"1000000089:;ÜÝ001111!1!1111111!1!1"10000000`ABCÔÕÎ1Ï1(1)1)1)1)1R2S2)1)1)1)1)1)1!1"100H0I0J0K000110ÜÝÔ×°±±±²Ö×000000 1"100PQRS00 1"10ÔÕÜݸ¡¡¡ºÜÝ000000 1"100XYZ[00 1"10æ5åÔÕ¸¡¡¡ºÔÕ0 0 0 -000 1"10`abc00 1"1000Üݸ¡¡¡ºÜÝ00 1!111111111!1!1100ÔÕ¸¡¡¡ºÔÕ 00 1!1)1)1)1)1)1)1)1)1)1)1*100Üݸ¡¡¡ºæ5ç5 !"00 1"1000000000Î1Ï1Î1Ï1ÔÕ¸¡¡¡º00020000 1"10<2=2=2=2=2=2=2>2ÖÕÔÕÜݸ¡¡¡º00000000 1"10D   -EEFÜÝÜÝÔÕ¸¡¡¡º00000000 1"10LLÔÕÔÕÜݸ¡¡¡Â±±±±²Î1Ï10 1"10T LÜÝÜÝÔÕ¸¡¡¡¡¡¡¡¡ºÖ×0 1"100 !"00LÔÕÔÕÜݸ¡¡¡¡¡¡¡¡ºÜÝ0 1!111111000LÜÝÜÝÔÕ¸¡¡¡¡¡¡¡¡ºÔÕ0(1)1)1)1)1)1*1000TÔÕÔÕÜݸ¡¡þÿþÿþÿºÜÝÎ1Ï1Î1Ï1Î1Ï1Î1Ï1Î1Ï1Î1Ï1ÜÝÜÝÔÕ000üýüýüý0ÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÜÝÎ1Ï1Î1óòóòóòÏ1ÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝ \ No newline at end of file diff --git a/data/maps/PetalburgCity_Gym/border.bin b/data/maps/PetalburgCity_Gym/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/PetalburgCity_Gym/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc index 18a39e943..739f19b74 100644 --- a/data/maps/PetalburgCity_Gym/header.inc +++ b/data/maps/PetalburgCity_Gym/header.inc @@ -1,5 +1,5 @@ PetalburgCity_Gym: @ 8483034 - .4byte PetalburgCity_Gym_MapAttributes + .4byte PetalburgCity_Gym_Layout .4byte PetalburgCity_Gym_MapEvents .4byte PetalburgCity_Gym_MapScripts .4byte 0x0 diff --git a/data/maps/PetalburgCity_Gym/map.bin b/data/maps/PetalburgCity_Gym/map.bin deleted file mode 100644 index 17d5ba980..000000000 --- a/data/maps/PetalburgCity_Gym/map.bin +++ /dev/null @@ -1,10 +0,0 @@ -()() -01  01 2*234567*22 222;<=>?222 222222222 222222222 222222222 222222222 -        222222222 2A2B2C2D2E2F2G22 2I2J2K2L2M2N2O22 2Q2R2S2T2U2V2W22 2Y2Z2[2\2]2^2_22 222222222 -        222222222 2A2B2C2D2E2F2G22 2I2J2K2L2M2N2O22 2Q2R2S2T2U2V2W22 2Y2Z2[2\2]2^2_22 222222222 -        222222222 2ABCDEFG2 2IJKLMNO2 2QRSTUVW2 2YZ[\]^_2 222222222 -        222222222 2ÁÂÃÄÅÆÇ2 2ÉÊËÌÍÎÏ2 2ÑÒÓÔÕÖ×2 2ÙÚÛÜÝÞß2 222222222 -        222222222 2¡¢£¤¥¦§2 2©ª«¬­®¯2 2±²³´µ¶·2 2¹º»¼½¾¿2 222222222 -        222222222 2ÁÂÃÄÅÆÇ2 2ÉÊËÌÍÎÏ2 2ÑÒÓÔÕÖ×2 2ÙÚÛÜÝÞß2 222222222 -        222222222 2¡¢£¤¥¦§2 2©ª«¬­®¯2 2±²³´µ¶·2 2¹º»¼½¾¿2 222222222P ° -  X¨¸    222222222,++++++++,++++++++,@+++++@2+,H++++H2,2+00+22 \ No newline at end of file diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc index 2175ff856..6aeb5deef 100644 --- a/data/maps/PetalburgCity_House1/header.inc +++ b/data/maps/PetalburgCity_House1/header.inc @@ -1,5 +1,5 @@ PetalburgCity_House1: @ 8483050 - .4byte PetalburgCity_House1_MapAttributes + .4byte House1_Layout .4byte PetalburgCity_House1_MapEvents .4byte PetalburgCity_House1_MapScripts .4byte 0x0 diff --git a/data/maps/PetalburgCity_House2/border.bin b/data/maps/PetalburgCity_House2/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/PetalburgCity_House2/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc index 9213bc710..9595c1372 100644 --- a/data/maps/PetalburgCity_House2/header.inc +++ b/data/maps/PetalburgCity_House2/header.inc @@ -1,5 +1,5 @@ PetalburgCity_House2: @ 848306C - .4byte PetalburgCity_House2_MapAttributes + .4byte HouseWithBed_Layout .4byte PetalburgCity_House2_MapEvents .4byte PetalburgCity_House2_MapScripts .4byte 0x0 diff --git a/data/maps/PetalburgCity_House2/map.bin b/data/maps/PetalburgCity_House2/map.bin deleted file mode 100644 index b91b7153b..000000000 --- a/data/maps/PetalburgCity_House2/map.bin +++ /dev/null @@ -1 +0,0 @@ -nohi    vwp2q2$2$2$2$2$2$2~22Z6[6#2#2#2#2#2#2#2,2b6c6#2#2#2#2#2#2LM92#2#2#2#2#2#2+2TU92#2#2#2#2#2#2#2#2#292#2#2 #2#2#2#2#2 \ No newline at end of file diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc index d2dc3edf3..7742f8bfe 100644 --- a/data/maps/PetalburgCity_Mart/header.inc +++ b/data/maps/PetalburgCity_Mart/header.inc @@ -1,5 +1,5 @@ PetalburgCity_Mart: @ 84830C0 - .4byte PetalburgCity_Mart_MapAttributes + .4byte Mart_Layout .4byte PetalburgCity_Mart_MapEvents .4byte PetalburgCity_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc index 581432e20..af57b7bab 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ PetalburgCity_PokemonCenter_1F: @ 8483088 - .4byte PetalburgCity_PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte PetalburgCity_PokemonCenter_1F_MapEvents .4byte PetalburgCity_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc index c16cfdee2..1528ab624 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ PetalburgCity_PokemonCenter_2F: @ 84830A4 - .4byte PetalburgCity_PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte PetalburgCity_PokemonCenter_2F_MapEvents .4byte PetalburgCity_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc index fc953bf81..4e207706d 100644 --- a/data/maps/PetalburgCity_WallysHouse/header.inc +++ b/data/maps/PetalburgCity_WallysHouse/header.inc @@ -1,5 +1,5 @@ PetalburgCity_WallysHouse: @ 8483018 - .4byte PetalburgCity_WallysHouse_MapAttributes + .4byte House2_Layout .4byte PetalburgCity_WallysHouse_MapEvents .4byte PetalburgCity_WallysHouse_MapScripts .4byte 0x0 diff --git a/data/maps/PetalburgWoods/border.bin b/data/maps/PetalburgWoods/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/PetalburgWoods/border.bin +++ /dev/null @@ -1 +0,0 @@ -ÔÕÜÝ \ No newline at end of file diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc index 1b1731f58..096f4a704 100644 --- a/data/maps/PetalburgWoods/header.inc +++ b/data/maps/PetalburgWoods/header.inc @@ -1,5 +1,5 @@ PetalburgWoods: @ 8483FF4 - .4byte PetalburgWoods_MapAttributes + .4byte PetalburgWoods_Layout .4byte PetalburgWoods_MapEvents .4byte PetalburgWoods_MapScripts .4byte 0x0 diff --git a/data/maps/PetalburgWoods/map.bin b/data/maps/PetalburgWoods/map.bin deleted file mode 100644 index a032b4c43..000000000 --- a/data/maps/PetalburgWoods/map.bin +++ /dev/null @@ -1 +0,0 @@ -ÔÕÔÕÔÕÔÕÔÕÔÕÜÝÜÝÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÜÝÜÝÜÝÜÝÜÝÜÝÔÕÔÕÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÔÕÔÕÔÕÔÕÔÕÔÕÜÝÜÝÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÜÝÜÝÜÝÜÝÜÝÜÝÔÕÔÕÜÝÜÝÜÝÜÝÜÝÜÝÜÝäåäåäåäåäåäåÜÝÜÝÔÕÔÕÔÕÔÕÔÕÔÕäçæåÔÕÔÕÔÕÔÕÔÕÔÕÔÕ000000 0 0 0 0 0 0ÔÕÔÕÜÝÜÝÜÝÜÝÜÝÜÝIIIIÜÝÜÝÜÝÜÝäòóòóç00000Æ1Ç1Æ1Ç1 0 0 0æåÜÝÔÕÔÕÔÕÔÕÔÕÔÕ000000ÔÕÔÕÔÕÔÕ0ÔÕÔÕ000000Ö5Õ5Ô5×5 0 0 000ÔÕÜÝÜÝäåäåäåäç000000ÜÝÜÝÜÝäç0æåäç000000ÜÝÜÝ 0 0000ÜÝÔÕÔÕ000 0 0 0 04000000ÔÕÔÕÔÕ 0 0000000 0 0 000ÔÕÔÕÕ‡‡‡ÖÔÕÜÝÜÝ0 0 0 0 0 0 00000000æåäåäç 0 0 00Î1Ï1Æ1Ç1Æ1Ç1 0 00æåäç00000ÜÝÔÕÔÕ 0 0 0 0 0 0 00000000000 0 0 0 0 0 0 0Ö5Õ5Ô5Õ5Ô5×5 0 0 000000000 0ÔÕÜÝÜÝ 0 0 0 0Æ1Ç1Î1Ï1Î1Ï10000Î1Ï1Î1Ï1Æ1Ç1Æ1Ç1Æ1Ç1ÜÝÜÝÜÝÆ1Ç1Æ1Ç1Î1Ï10000 0 0ÜÝÔÕÔÕ0 0 0 0Ö5Õ5Ô5Õ5Ô5×50000Ö5Õ5Ô5Õ5Ô5Õ5Ô5Õ5Ô5Õ5ÔÕÔÕÔÕÔÕ5Ô5Õ5Ô5×5000 0 0 0ÔÕÜÝÜÝ0000ÜÝÜÝÜÝ0000æòóòóòóòóòóòóòóòóòóòóòÏ100 0 0 0ÜÝÔÕÔÕ0000ÔÕÔÕÔÕÕ‡‡‡ÖÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔ×500 0 0 0ÔÕÜÝÜÝ000 0æåäåäç00000æåäåäåäåäòóòóòóòóòóòóòÏ10 0 0 0ÜÝÔÕÔÕ0 0 0 0 0 0 000000000000000000ÔÕÔÕÔÕÔÕÔÕÔÕÔ×50 0 0 0ÔÕÜÝÜÝ 0 0 0 0 0 0 0000000 0 0 0 00000000ÜÝÜÝÜÝÜÝÜÝÜÝÜÝ00 0 0ÜÝÔÕÔÕ 0 0 0 0 0 0 000000 0 0 0 0 0 0 0 0 0000ÔÕÔÕÔÕÔÕÔÕÔÕÔÕ000 0ÔÕÜÝÜÝÎ1Ç1Æ1Ç1Æ1Ç1Î1Ï10000Æ1Ç1Æ1Ç1Æ1Ç1Æ1Ç1Æ1Ç100ÜÝÜÝÜÝäåÜÝÜÝÜÝ0000ÜÝÔÕÔÕÔ5Õ5Ô5Õ5Ô5Õ5Ô5×50000Ö5Õ5Ô5Õ5Ô5Õ5Ô5Õ5Ô5×500ÔÕÔÕÔÕ00ÔÕÔÕÔÕÕ‡‡ÖÔÕÜÝÜÝÜÝÜÝÜÝÜÝ0000ÜÝÜÝÜÝÜÝÜÝ00ÜÝÜÝäç00æåÜÝÜÝ 0000ÜÝÔÕÔÕÔÕÔÕÔÕÔÕÕ‡‡ÖÔÕÔÕÔÕÔÕÔÕ00ÔÕÔÕ 000000ÔÕÔÕ 0 000ÔÕÜÝÜÝÜÝäåäåäç0000æåäåäåäåäç00ÜÝÜÝ 000000æåäç 0 0 00ÜÝÔÕÔÕÔÕ000000000000 0 0 0 0 0 0 0 000ÔÕÔÕ 0 0000000 0 0 0 0 00ÔÕÜÝÜÝäç 0 0 00000000000 0 0 0 0 0 0000ÜÝÜÝ 0 0 00Î1Ï10 0 0 0 0 0 0 0ÜÝÔÕÔÕ0 0 0 0 0 0 0 0 0000000000000000ÔÕÔÕ 0 0 0 0Ö5×50 0 0 0 0 0 0 0ÔÕÜÝÜÝ 0 0 0 0 0 0Æ1Ç1Æ1Ç1Î1Ï1000000Î1Ï1Î1Ï1Î1Ï1ÜÝÜÝ 0 0 0 0ÜÝÎ1Ç1 0 0 0 0Æ1Ç1ÜÝÔÕÔÕ 0 0 0 0 0 0Ö5ÕÔÕÔ5×5000000Ö5Õ5Ô5Õ5Ô5Õ5ÔÕÔÕ 0 0 0 0ÔÕÔ×5 0 0 0 0Ö5ÕÔÕÜÝÜÝ 0 0 0 0 0 0ÜÝÜÝÜÝ000000ÜÝÜÝÜÝÜÝÜÝ0 0 0 0ÜÝÜÝÎ1Ç1Æ1Ç1ÜÝÜÝÔÕÔÕ 0 0 0 0 0 0ÔÕÔÕÔÕÕ‡‡‡‡ÖÔÕÔÕÔÕÔÕÔÕ000 0ÔÕÔÕÔÕÔÕÔÕÔÕÜÝÜÝ 0 0 0 0 0 0æåäåäç000000æåäåÜÝÜÝÜÝ0000ÜÝÜÝÜÝÜÝÜÝÜÝÔÕÔÕ0 0 0 0 0 0 0 0 0 040000000 0 0 0 0ÔÕÔÕÔÕÕ‡‡ÖÔÕÔÕÔÕÔÕÔÕÔÕÜÝÜÝÎ1Ï10 0 0 0 0 0 000000000 0 0 0 0 0æåäåäç0000æåäåäåÜÝÜÝÜÝÔÕÔÕÔ×5000000000000000 0 0 0 0 0 0 000000000 0 0 0 0 0 0ÔÕÔÕÔÕÜÝÜÝÜÝÎ1Ï1Î1Ï1Î1Ï1Î1Ï1000000Î1Ç1Æ1Ç1Æ1Ç1Æ1Ï1Î1Ï1Î1Ï1Î1Ï1000 0 00 0 0ÜÝÜÝÜÝÔÕÔÕÔÕÔÕÔÕÔÕÔ×5000000Ö5ÕÔÕÔÕÔÕÔÕÔÕÔ×5000 0 0 0 0 0ÔÕÔÕÔÕÜÝÜÝÜÝÜÝÜÝÜÝÜÝ000000ÜÝÜÝÜÝÜÝÜÝÜÝÜÝ0000 0 0Æ1Ç1ÜÝÜÝÜÝÔÕÔÕÔÕÔÕÔÕÔÕÔÕIIIIÔÕÔÕÔÕÔÕÔÕÔÕÔÕIIIIÖ5ÕÔÕÔÕÔÕÜÝÜÝÜÝÜÝÜÝÜÝÜÝÎÏÎÏÜÝÜÝÜÝÜÝÜÝÜÝÜÝÎÏÎÏÜÝÜÝÜÝÜÝÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔ×ÖÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔ×ÖÕÔÕÔÕÔÕÔÕÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝ \ No newline at end of file diff --git a/data/maps/RecordCorner/border.bin b/data/maps/RecordCorner/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/RecordCorner/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc index 67ebd9405..7235504fa 100644 --- a/data/maps/RecordCorner/header.inc +++ b/data/maps/RecordCorner/header.inc @@ -1,5 +1,5 @@ RecordCorner: @ 8484D68 - .4byte RecordCorner_MapAttributes + .4byte RecordCorner_Layout .4byte RecordCorner_MapEvents .4byte RecordCorner_MapScripts .4byte 0x0 diff --git a/data/maps/RecordCorner/map.bin b/data/maps/RecordCorner/map.bin deleted file mode 100644 index 51dfb6e5a..000000000 --- a/data/maps/RecordCorner/map.bin +++ /dev/null @@ -1 +0,0 @@ -‘———”••–———’“˜™ŸŸŸœžŸŸŸš› ¡2§2§2§2¤2¥2¥2¦2§2§2§2¢2£¨©2Ä2Ä2´2Ä2Ä2Ä2Ä2¶2Ä2Ä2ª2«¨©2Ä2¬2¼¸¹º»¾®2Ä2ª2«¨©2Ä2Ä2µ2ÀÁÂ÷2Ä2Ä2ª2«¨©2Ä2­2½ÈÉÊË¿¯2Ä2ª2«¨©2Ä2Ä2Æ2Æ2Æ2Æ2Æ2Æ2Ä2Ä2ª2«°±2Ä2Ä2Ä2Ä2Ä2Ä2Ä2Ä2Ä2Ä2²2³"2"2"2"2 \ No newline at end of file diff --git a/data/maps/Route101/border.bin b/data/maps/Route101/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/Route101/border.bin +++ /dev/null @@ -1 +0,0 @@ -ÔÕÜÝ \ No newline at end of file diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc index 9550dc26b..ef027d1c6 100644 --- a/data/maps/Route101/header.inc +++ b/data/maps/Route101/header.inc @@ -1,5 +1,5 @@ Route101: @ 8482678 - .4byte Route101_MapAttributes + .4byte Route101_Layout .4byte Route101_MapEvents .4byte Route101_MapScripts .4byte Route101_MapConnections diff --git a/data/maps/Route101/map.bin b/data/maps/Route101/map.bin deleted file mode 100644 index fab3a1d69..000000000 --- a/data/maps/Route101/map.bin +++ /dev/null @@ -1 +0,0 @@ -ÔÕÔÕÔÕÔ×Ø1Ù1Ú10ÖÕÔÕÔÕÔÕÜÝäåäåäçà1á1â10æåäåÜÝÜÝÔÕ 0 0 000000000 0 0 0ÔÕÔÕäç5 0 0 0 0000000 0 0 0 0äåÜÝ 0 0 0 0 0 0000000 0 0 0 0 0 0ÔÕÆ1Ç1 0 0 0000000Î1Ç1 0 0 0 0 0æåÔ× 0 000n‡‡‡ÖÖ×Æ1Ç1 0 0000ÜÝÕ‡‡‡Ž0000ÜÝÔ×00Ð1Ò10ÔÕÎ1Ï10000000ÔÕäç0Ð1Ù1Ú10ÜÝÔ×00Ð1Ñ1Ò10æç 0 00à1Ù1Ù1Ò1ÔÕÜÝ0Ð1Ñ1Ù1Ù1Ú10 0 0 0 0 00à1Ù1Ú1ÜÝÔÕ0à1Ù1Ù1Ù1â10 0 0 0 0 0 00à1â1ÔÕäç00à1á1â100 0 0 0 0 0 0000äç 0 00000Õ‡‡ÖÆ1Ç1 0 0 00Î1Ï1 0 0 0 0 00000000Ö× 0 000ÖÕÆ1Ç1 0 0 0 0000000ÜÝÆ1Ç1Î1Ï1ÜÝÔ× 0 0 0 0000000ÔÕÔÕÔÕÔÕÜÝÆ1Ç1Æ1Ï1Î1Ï1Î1Ï100ÜÝÜÝÜÝÜÝÔÕÔÕÔÕÔÕÔ×00ÔÕÔÕÔÕÔÕÜÝÜÝÜÝÜÝÜÝ00ÜÝÜÝÜÝÜÝ \ No newline at end of file diff --git a/data/maps/Route102/border.bin b/data/maps/Route102/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/Route102/border.bin +++ /dev/null @@ -1 +0,0 @@ -ÔÕÜÝ \ No newline at end of file diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc index 2c06344b0..22da93b7a 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -1,5 +1,5 @@ Route102: @ 8482694 - .4byte Route102_MapAttributes + .4byte Route102_Layout .4byte Route102_MapEvents .4byte Route102_MapScripts .4byte Route102_MapConnections diff --git a/data/maps/Route102/map.bin b/data/maps/Route102/map.bin deleted file mode 100644 index 7378bb44b..000000000 --- a/data/maps/Route102/map.bin +++ /dev/null @@ -1 +0,0 @@ -ÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÜÝÜÝÜÝÜÝäåäåäåäåäåäåäåäåäåäåÜÝÜÝÜÝÜÝäåäåäåäåÜÝÜÝÜÝÔÕÔÕÔÕÔÕ 0 0 000000000000Œ266Ž20ÔÕÔÕÔÕÔÕ 0 0 0 0°±±²ÔÕÔÕÔÕÜÝäåäåäç 0 0 0000Ð1Ñ1Ñ1Ò10000011110æåäåäåäç 0 0 0 0¸¡¡ºäåÜÝÜÝÔÕ 0 0 0 0 0 0 0 0 00Ð1Ñ1Ù1Ù1Ù1Ù1Ñ1Ò100000000000000ÿ0 0 0 0 0¸¡¡Â±²ÔÕÔÕäç 0 0 0 0 0 0 0 00Ð1Ù1Ù1q2y2á1á1á1â10000000000Î1Ï100†00 0 0 0¸¡¡¡¡ºÜÝÜÝ000 0 0 0 0 0 0 00Ø1Ù1â1Ö×ÕÖ00Õ‡‡‡‡ÖÎ1Ï1Î1Ï1Ö×00†000 0 0¸¡¡¡¡ºÔÕÔÕ0000 0 0 0 0000à1r2Ï1ÜÝ0000 0 0 0 0 00ÖÕÔÕÜÝÎ1Ï1†00000000000æåÜÝ000000000000ÖÕÔÕ00 0 0 0 0 0 0 00ÜÝÜÝÔÕÔ×{0000000000000ÔÕÎ1Ï1Î1Ï1Î1Ï1Î1Ï10000ÜÝÜÝ0 0 0 0 0 0 0 000ÔÕÔÕÜÝÜÝÎ1Ï100000000000æåÔÕÔÕÔÕÔ×00Î1Ï1ÔÕÔÕ 0 0 0 0 0 00000ÜÝÜÝÔÕÔÕÔ×00000Ð1Ñ1Ñ1Ò100000ÜÝÜÝÜÝäç00ÖÕÜÝÜÝ 0 0 0 0000000ÔÕÔÕäåÜÝÜÝ00Ð1Ñ1Ñ1Ù1Ù1Ù1Ú1000Î1Ï1ÔÕÔÕÔÕ 0 000æåÔÕÔÕ 0 0 000Î1Ï1000æåäç 0 0ÔÕÔÕÐ1Ñ1Ù1Ù1Ù1Ù1Ù1á1â1000ÖÕÜÝÜÝÜÝ 0 0Õ‡‡ÖÜÝÜÝÆ1Ç1000Ö×Î1Ï1000 0 0 0 0æåäçØ1Ù1Ù1Ù1Ù1á1â10Î1Ï1Î1Ï1ÜÝÔÕÔÕÔÕ 0 0 0000ÔÕÔÕÔ×000æåÔ×000 0 0 0 0 000Ð1Ù1Ù1á1á1â1000ÖÕÔÕÔÕÜÝÜÝÜÝ 0 0 00Î1Ï1ÜÝÜÝÜÝ00 0 0 0æç0000 0 0 0000à1á1â100Î1Ï1Î1Ï1ÜÝÜÝÜÝÔÕÔÕÔÕ 0 0 0 0ÖÕÔÕÔÕÔÕ0 0 0 0 0 0 0 000000000000000ÖÕÔÕÔÕÔÕÔÕÜÝÜÝÜÝÆ1Ç1Æ1Ç1ÜÝÜÝÜÝÜÝÎ1Ç1Æ1Ç1Æ1Ç1 0 0 000000Î1Ï1Î1Ï1Î1Ï1Î1Ï1ÜÝÜÝÜÝÜÝÜÝÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔ× 0 0 0 00000ÖÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÆ1Ç1Æ1Ç1Î1Ï1Î1Ï1ÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝ \ No newline at end of file diff --git a/data/maps/Route103/border.bin b/data/maps/Route103/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/Route103/border.bin +++ /dev/null @@ -1 +0,0 @@ -ÔÕÜÝ \ No newline at end of file diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc index 6bc4c0070..1a8825bc1 100644 --- a/data/maps/Route103/header.inc +++ b/data/maps/Route103/header.inc @@ -1,5 +1,5 @@ Route103: @ 84826B0 - .4byte Route103_MapAttributes + .4byte Route103_Layout .4byte Route103_MapEvents .4byte Route103_MapScripts .4byte Route103_MapConnections diff --git a/data/maps/Route103/map.bin b/data/maps/Route103/map.bin deleted file mode 100644 index 44518dc92..000000000 --- a/data/maps/Route103/map.bin +++ /dev/null @@ -1 +0,0 @@ -ÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕpppppppppp’sq{‰sqqqt}qsqqqqqqqqqqqqqqqqqqqqqqqt|}qqquÜÝÜÝäåäåäåäåäåäåÜÝÜÝÜÝÜÝÜÝuvpppppppp’{|‰s{‰qquqq{‰qqqqt|||||||‰qqqqqqqqt}qqqqquÔÕÔÕ000000 0 0 0 0 0 0ÔÕÔÕÔÕÔÕÔÕ}~ppppppppš‰s{‰sqquqt‰{||||}qt©©©‰q{||||||||}qqqqqquÜÝäç000Ð1Ñ1Ñ1Ò1 0 0 0 0 0æåÜÝÜÝÜÝäçppppppuvPQpp’{‰s{‰ququ{©©|||||}qqq{|©©©©©©©©©©||||||}ÔÕ 0 0000à1á1á1â100 0 0 0 0 0ÔÕÔÕÔÕˆ‰˜puvppp}~XYppšs{‰{|}t}t‘‘‘‘‘‘‘‘yyy‘ÎÎÎΑ‘‘‘ÎÎÎÎÎÎÎÎÎÎÜÝ 0 0 0 0Õ4‡4‡4‡4‡4‡4‡4o4 0 0 0 0æåÜÝÜÝdQpp}~uvPQpppuvPesq{|||}qr0000000K1L5L5L5M1ÇÇ0000ÇÇÇÇÇÇÇÇÔÕ 0 0 0 0 0 0 000004‡4‡4‡4‡4‡4Ö4ÔÕÔÕlYuvpp}~XYppp}~Xm{|‘‘‘‘‘yz0ÆÆÆÆÆÆ1111100000Ç0ÇÇÜÝ 0 0 0 0 0 0 000000000000æåäçp}~ppppppppppppš‰‰Š000000ÆÆÆÆÆ000000Ç00000000ÇÇÇÇ0Ç0ÔÕ 0 0 0 0 0 0 00000Ð1Ñ1Ñ1Ñ1Ò10000ˆ‰˜ppppppppppppppppppš‰‰‰‰Š000ÆÆÇÇ00000000000000Ç00ÜÝÆ1Ç1 0 0 0 0 00040à1á1Ù1Ù1Ù1Ò1000ppppppppppppppppppppppppp’0000ÇÇÇ0Ç0Ç00000Ç0000111ÔÕÔ× 0 0 0 00000000à1á1á1â1000ppppppppppppppppppppppppp’011110ÇÇÇ000000000011!1!1)1ÜÝÜÝ 0 0 0 0000000 0 0 0 00000ppppppppppppppppppppppppp’0(1)1!1!1111100000011!1!1)1*10ÔÕÔÕÕ4‡4‡4‡4‡4‡4‡4‡4‡4Ö4 0 0 0 0 00000Ô0yppppppppppppppppppppppp’000(1)1)1)1!1!1111111111111111!1!1)1*100ÇÜÝÜÝ0000000 0 0 0 0 0 0 0Æ1Ï1Î1Ï1Î1Ï1dQPQppppppppppuvppppp“““’0000000(1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1*10000ÇÔÕÔÕ0000000 0 0 0 0 0 0 0Ö5Õ5Ô5Õ5Ô×lYXYuvppppPQPQ}~puvpxÆÆÆ000ÇÇÇ0Ç000000000000000000000ÇÇÇÜÝÜÝÎ1Ï1000000Æ1Ç1Æ1Ç1Æ1Ç1ÜÝÜÝÜ݈2‰2yp}~uvPQXYXYpPQ}~PeÆÇÇÇÇÇÇÇÇÇÇÇ00000000Ç0ÇÇÇÇÔÕÔÕÔ×000000Ö5ÕÔÕÔÕÔÕÔÕÔÕÔ×ppp}~XYpppppXYppXmÆÆÆÆÇÇÇÇÇÇÇÇ000000000ÇÇÇÇÇÜÝÜÝÜÝÎ1Ï10000ÜÝÜÝÜÝÜÝÜÝÜÝÜÝuvppppppppppppppp’ÆÆÆÆÇÇÇÇÇÇÇÇÇ0Ç0Ç0Ç0Ç0Ç0Ç0Ç0Ç0ÇÇÇÇÇÔÕÔÕÔÕÔ5×50000ÔÕÔÕÔÕÔÕÔÕÔÕÔÕ}~ppppppppppppppx0ÆÆÆÆÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÜÝÜÝÜÝÜÝ0000ÜÝÜÝÜÝÜÝÜÝÜÝÜÝpppppppppppppppp’ÆÆÆÆÆÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÔÕÔÕÔÕÔ5×50000ÔÕÔÕÔÕÔÕÔÕÔÕÔÕpppppppppppppppp’ÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÜÝÜÝÜÝÜÝ0000ÜÝÜÝÜÝÜÝÜÝÜÝÜÝpppppppppppppppp’ÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆ \ No newline at end of file diff --git a/data/maps/Route104/border.bin b/data/maps/Route104/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/Route104/border.bin +++ /dev/null @@ -1 +0,0 @@ -ÔÕÜÝ \ No newline at end of file diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc index 7bcef3b0b..f431118c1 100644 --- a/data/maps/Route104/header.inc +++ b/data/maps/Route104/header.inc @@ -1,5 +1,5 @@ Route104: @ 84826CC - .4byte Route104_MapAttributes + .4byte Route104_Layout .4byte Route104_MapEvents .4byte Route104_MapScripts .4byte Route104_MapConnections diff --git a/data/maps/Route104/map.bin b/data/maps/Route104/map.bin deleted file mode 100644 index 7731bc31c..000000000 Binary files a/data/maps/Route104/map.bin and /dev/null differ diff --git a/data/maps/Route104_MrBrineysHouse/border.bin b/data/maps/Route104_MrBrineysHouse/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/Route104_MrBrineysHouse/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc index f285f28ee..c6335b13f 100644 --- a/data/maps/Route104_MrBrineysHouse/header.inc +++ b/data/maps/Route104_MrBrineysHouse/header.inc @@ -1,5 +1,5 @@ Route104_MrBrineysHouse: @ 8483D70 - .4byte Route104_MrBrineysHouse_MapAttributes + .4byte Route104_MrBrineysHouse_Layout .4byte Route104_MrBrineysHouse_MapEvents .4byte Route104_MrBrineysHouse_MapScripts .4byte 0x0 diff --git a/data/maps/Route104_MrBrineysHouse/map.bin b/data/maps/Route104_MrBrineysHouse/map.bin deleted file mode 100644 index 7660fd5d7..000000000 --- a/data/maps/Route104_MrBrineysHouse/map.bin +++ /dev/null @@ -1 +0,0 @@ -ã±²ã便ä빺ëì ÆÇìó2Á2Â2!2ó2!2!2ô2¨2Î2Ï2ô2³6´6)2)2)2)2)2)2)2)2)2)2³6)2)2)2)2)2)2NO)2)2)2!2)2)2)2)2)2)2VWD2)2)2!2)2)2)2)2)2)2)2)2)2)2)2 333333333333#3333333333 \ No newline at end of file diff --git a/data/maps/Route104_PrettyPetalFlowerShop/border.bin b/data/maps/Route104_PrettyPetalFlowerShop/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/Route104_PrettyPetalFlowerShop/border.bin and /dev/null differ diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc index ceac3651f..e23012fb4 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc @@ -1,5 +1,5 @@ Route104_PrettyPetalFlowerShop: @ 8483D8C - .4byte Route104_PrettyPetalFlowerShop_MapAttributes + .4byte Route104_PrettyPetalFlowerShop_Layout .4byte Route104_PrettyPetalFlowerShop_MapEvents .4byte Route104_PrettyPetalFlowerShop_MapScripts .4byte 0x0 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.bin b/data/maps/Route104_PrettyPetalFlowerShop/map.bin deleted file mode 100644 index d34ff5c1a..000000000 Binary files a/data/maps/Route104_PrettyPetalFlowerShop/map.bin and /dev/null differ diff --git a/data/maps/Route104_Prototype/border.bin b/data/maps/Route104_Prototype/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/Route104_Prototype/border.bin +++ /dev/null @@ -1 +0,0 @@ -ÔÕÜÝ \ No newline at end of file diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc index 9728190a1..50f1b7b08 100644 --- a/data/maps/Route104_Prototype/header.inc +++ b/data/maps/Route104_Prototype/header.inc @@ -1,5 +1,5 @@ Route104_Prototype: @ 8485AF8 - .4byte Route104_Prototype_MapAttributes + .4byte Route104_Prototype_Layout .4byte Route104_Prototype_MapEvents .4byte Route104_Prototype_MapScripts .4byte 0x0 diff --git a/data/maps/Route104_Prototype/map.bin b/data/maps/Route104_Prototype/map.bin deleted file mode 100644 index 71bd63e62..000000000 --- a/data/maps/Route104_Prototype/map.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc index ac5604d72..61217a576 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc @@ -1,5 +1,5 @@ Route104_PrototypePrettyPetalFlowerShop: @ 8485B14 - .4byte Route104_PrototypePrettyPetalFlowerShop_MapAttributes + .4byte Route104_PrettyPetalFlowerShop_Layout .4byte Route104_PrototypePrettyPetalFlowerShop_MapEvents .4byte Route104_PrototypePrettyPetalFlowerShop_MapScripts .4byte 0x0 diff --git a/data/maps/Route105/border.bin b/data/maps/Route105/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route105/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc index de48be1a5..f7538b723 100644 --- a/data/maps/Route105/header.inc +++ b/data/maps/Route105/header.inc @@ -1,5 +1,5 @@ Route105: @ 84826E8 - .4byte Route105_MapAttributes + .4byte Route105_Layout .4byte Route105_MapEvents .4byte Route105_MapScripts .4byte Route105_MapConnections diff --git a/data/maps/Route105/map.bin b/data/maps/Route105/map.bin deleted file mode 100644 index c4bd8286c..000000000 Binary files a/data/maps/Route105/map.bin and /dev/null differ diff --git a/data/maps/Route106/border.bin b/data/maps/Route106/border.bin deleted file mode 100644 index 281762f5b..000000000 --- a/data/maps/Route106/border.bin +++ /dev/null @@ -1 +0,0 @@ -CCCC \ No newline at end of file diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc index 5ee6a3071..93f4bd835 100644 --- a/data/maps/Route106/header.inc +++ b/data/maps/Route106/header.inc @@ -1,5 +1,5 @@ Route106: @ 8482704 - .4byte Route106_MapAttributes + .4byte Route106_Layout .4byte Route106_MapEvents .4byte Route106_MapScripts .4byte Route106_MapConnections diff --git a/data/maps/Route106/map.bin b/data/maps/Route106/map.bin deleted file mode 100644 index b7e7d7238..000000000 Binary files a/data/maps/Route106/map.bin and /dev/null differ diff --git a/data/maps/Route107/border.bin b/data/maps/Route107/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route107/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc index d6dffda04..a27885664 100644 --- a/data/maps/Route107/header.inc +++ b/data/maps/Route107/header.inc @@ -1,5 +1,5 @@ Route107: @ 8482720 - .4byte Route107_MapAttributes + .4byte Route107_Layout .4byte Route107_MapEvents .4byte Route107_MapScripts .4byte Route107_MapConnections diff --git a/data/maps/Route107/map.bin b/data/maps/Route107/map.bin deleted file mode 100644 index 521997b0f..000000000 Binary files a/data/maps/Route107/map.bin and /dev/null differ diff --git a/data/maps/Route108/border.bin b/data/maps/Route108/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route108/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc index e0a0c9f42..2c4cea90d 100644 --- a/data/maps/Route108/header.inc +++ b/data/maps/Route108/header.inc @@ -1,5 +1,5 @@ Route108: @ 848273C - .4byte Route108_MapAttributes + .4byte Route108_Layout .4byte Route108_MapEvents .4byte Route108_MapScripts .4byte Route108_MapConnections diff --git a/data/maps/Route108/map.bin b/data/maps/Route108/map.bin deleted file mode 100644 index 138ddc020..000000000 --- a/data/maps/Route108/map.bin +++ /dev/null @@ -1 +0,0 @@ -ppppppppppppppppPQpp­®1®1®1®1®1®1®1®1®1®1®1®1¯pppppppppppppPQpppppppppppPQppppppppppppppXYp­›1ž1”5ž1ž1^5_5ž1”5^5_5ž1ž1bQppppppppppppXYpppppppppPQXY­®1®1¯pPQpppppppppPc^5_5ž1”5”5n5o5”5ž1n5o5”5”5jYppp­1®1®1®1®1®1®1¯pPQppuvpuvPQXYpPc^5_5bQXY­®1®1¯pPQppXkn5o5ž1ž1ž1^5_5ž1Q3R3S3T3”5·puvPc^5_5ž1”5ž1”5bQXYpp}~p}~XYpppXkn5o5jYpPc^5_5bQXYuvp½¾¾¾¾£n5o5X7YZ[\7]·p}~Xkn5o5”5ž1”5ž1jYppPQpPQpppppppp½¾¾¿ppXkn5o5jYpp}~pppppp½£ž1`abcde·pppp½£ž1ž1ž1ž1¤¿pppXYpXYppppppppppppppp½¾¾¿pppppppppppp½¾£i3j3k3¤¾¿ppppp½¾¾¾¾¿pppppppppppppppppppppppppppppppppppppppppp½¾¾¾¿pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppuvppppppppppppppPQp­®1®1¯pppppppppppppppPQpppppppppppppppppppp}~ppppppppp­®1®1¯pXY­›1”5ž1œ1¯ppppppppppppppXYpppppppppppppp­®1®1®1¯ppppPQppPQpp½£”5·pppµž1”5ž1ž1·pp­®1®1¯ppppppPQppPQuvppppp­®1®1¯p½£”5ž1·ppuvXYuvXYppp½¾¿uvp½¾¾¾¾¿pPc^5_5bQpppppXYppXY}~uvppPc^5_5bQp½¾¾¿PQ}~pp}~puvppPQp}~PQppPQuvXkn5o5jYppppPQppppppp}~PQXkn5o5jYpPQuvXYppppppp}~PQXYuvpXYPQXY}~p½¾¾¿pPQPQXYpppppppppXYp½¾¾¿PQXY}~pppPQppppppXYpp}~pppXYpppppPQpppXYXYppppppppppppppppppXYpppppppXYppppppppppppppppppppppXYppppppp \ No newline at end of file diff --git a/data/maps/Route109/border.bin b/data/maps/Route109/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route109/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc index 532443e1b..c9482cf31 100644 --- a/data/maps/Route109/header.inc +++ b/data/maps/Route109/header.inc @@ -1,5 +1,5 @@ Route109: @ 8482758 - .4byte Route109_MapAttributes + .4byte Route109_Layout .4byte Route109_MapEvents .4byte Route109_MapScripts .4byte Route109_MapConnections diff --git a/data/maps/Route109/map.bin b/data/maps/Route109/map.bin deleted file mode 100644 index 62350867e..000000000 Binary files a/data/maps/Route109/map.bin and /dev/null differ diff --git a/data/maps/Route109_SeashoreHouse/border.bin b/data/maps/Route109_SeashoreHouse/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/Route109_SeashoreHouse/border.bin and /dev/null differ diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc index 99c905eaa..cec1ace27 100644 --- a/data/maps/Route109_SeashoreHouse/header.inc +++ b/data/maps/Route109_SeashoreHouse/header.inc @@ -1,5 +1,5 @@ Route109_SeashoreHouse: @ 8485B30 - .4byte Route109_SeashoreHouse_MapAttributes + .4byte Route109_SeashoreHouse_Layout .4byte Route109_SeashoreHouse_MapEvents .4byte Route109_SeashoreHouse_MapScripts .4byte 0x0 diff --git a/data/maps/Route109_SeashoreHouse/map.bin b/data/maps/Route109_SeashoreHouse/map.bin deleted file mode 100644 index cb7853a17..000000000 --- a/data/maps/Route109_SeashoreHouse/map.bin +++ /dev/null @@ -1,3 +0,0 @@ -./   67 - -   22222'22222"2,2,2-2$2$2,2,2-2$2$2$2,2,2&2 %2%2%2%2%2!22*2222*2*2222*2*222 $2$2$2$2$2!22%2222%2%2222%2%222 *2*2*2*2*2*2*2*2*2*2*2!22%2%2%2%2%2%2%2%2%222 \ No newline at end of file diff --git a/data/maps/Route110/border.bin b/data/maps/Route110/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route110/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc index 5a74c1d6c..d6d394209 100644 --- a/data/maps/Route110/header.inc +++ b/data/maps/Route110/header.inc @@ -1,5 +1,5 @@ Route110: @ 8482774 - .4byte Route110_MapAttributes + .4byte Route110_Layout .4byte Route110_MapEvents .4byte Route110_MapScripts .4byte Route110_MapConnections diff --git a/data/maps/Route110/map.bin b/data/maps/Route110/map.bin deleted file mode 100644 index ac83cb93d..000000000 Binary files a/data/maps/Route110/map.bin and /dev/null differ diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance1/border.bin b/data/maps/Route110_SeasideCyclingRoadEntrance1/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/Route110_SeasideCyclingRoadEntrance1/border.bin and /dev/null differ diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc b/data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc index 433849c14..a2d6a37a5 100644 --- a/data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc @@ -1,5 +1,5 @@ Route110_SeasideCyclingRoadEntrance1: @ 8485C80 - .4byte Route110_SeasideCyclingRoadEntrance1_MapAttributes + .4byte Route110_SeasideCyclingRoadEntrance_Layout .4byte Route110_SeasideCyclingRoadEntrance1_MapEvents .4byte Route110_SeasideCyclingRoadEntrance1_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance1/map.bin b/data/maps/Route110_SeasideCyclingRoadEntrance1/map.bin deleted file mode 100644 index e9fc770d4..000000000 --- a/data/maps/Route110_SeasideCyclingRoadEntrance1/map.bin +++ /dev/null @@ -1 +0,0 @@ -ˆˆˆˆˆˆˆ‹ˆˆˆˆˆˆœ•“œx2p2p2p2p2¨6™2˜2™2™2©6x2p2p2p2€2h2h2h2h2°6¡6 6¡6¡6±6€2h2h2h2\2h2h2h2h2p2Y2Z2Y2Z2p2y2h2h2l2d6h2h2h2a6b6a6b6h2h2t6 \ No newline at end of file diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc b/data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc index 755b6a5ff..1720a77a2 100644 --- a/data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc @@ -1,5 +1,5 @@ Route110_SeasideCyclingRoadEntrance2: @ 8485C9C - .4byte Route110_SeasideCyclingRoadEntrance2_MapAttributes + .4byte Route110_SeasideCyclingRoadEntrance_Layout .4byte Route110_SeasideCyclingRoadEntrance2_MapEvents .4byte Route110_SeasideCyclingRoadEntrance2_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHouseCorridor/border.bin b/data/maps/Route110_TrickHouseCorridor/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/Route110_TrickHouseCorridor/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc index b8f569c6a..99a4a694a 100644 --- a/data/maps/Route110_TrickHouseCorridor/header.inc +++ b/data/maps/Route110_TrickHouseCorridor/header.inc @@ -1,5 +1,5 @@ Route110_TrickHouseCorridor: @ 8485B84 - .4byte Route110_TrickHouseCorridor_MapAttributes + .4byte Route110_TrickHouseCorridor_Layout .4byte Route110_TrickHouseCorridor_MapEvents .4byte Route110_TrickHouseCorridor_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHouseCorridor/map.bin b/data/maps/Route110_TrickHouseCorridor/map.bin deleted file mode 100644 index 8981d28bd..000000000 --- a/data/maps/Route110_TrickHouseCorridor/map.bin +++ /dev/null @@ -1 +0,0 @@ -ãäëìó2!2!2!2!2!2!2!2!2!2!2ô2!2)2)2)2)2)2)2)2)2)2)2)2!2)2)2!2)2)2ãä!2)2)2ëì!2)2)2ó2!2ô2!2)2)2!2)2)2)2)2)2!2)2)2)2)2)2!2)2)2!2)2)2!2)2)2!2)2)2!2)2)2!2)2)2!2)2)2!2)2)2!2)2)2!2)2)2ãä!2)2)2ëì!2)2)2ó2!2ô2!2)2)2)222 \ No newline at end of file diff --git a/data/maps/Route110_TrickHouseEnd/border.bin b/data/maps/Route110_TrickHouseEnd/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/Route110_TrickHouseEnd/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc index 7f69874d1..0b38de121 100644 --- a/data/maps/Route110_TrickHouseEnd/header.inc +++ b/data/maps/Route110_TrickHouseEnd/header.inc @@ -1,5 +1,5 @@ Route110_TrickHouseEnd: @ 8485B68 - .4byte Route110_TrickHouseEnd_MapAttributes + .4byte Route110_TrickHouseEnd_Layout .4byte Route110_TrickHouseEnd_MapEvents .4byte Route110_TrickHouseEnd_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHouseEnd/map.bin b/data/maps/Route110_TrickHouseEnd/map.bin deleted file mode 100644 index 506fdb644..000000000 --- a/data/maps/Route110_TrickHouseEnd/map.bin +++ /dev/null @@ -1 +0,0 @@ -íîïãäõö2÷ëì6 26!2ý2þ2ÿ2ó2!2!2!2ô2!2!2!2!2)2)2)2)2)2D2)2)2)2)2)2!2)2)2)2)2NO)2)2)2)2)2!2)2)2)2D2VWD2)2)2)2)2!2)2)2)2)2)2)2)2)2)2)2)2!2)2)2)2)2)2)2)2)2)2)2)2 \ No newline at end of file diff --git a/data/maps/Route110_TrickHouseEntrance/border.bin b/data/maps/Route110_TrickHouseEntrance/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/Route110_TrickHouseEntrance/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc index f3aa39cc5..842b2f32d 100644 --- a/data/maps/Route110_TrickHouseEntrance/header.inc +++ b/data/maps/Route110_TrickHouseEntrance/header.inc @@ -1,5 +1,5 @@ Route110_TrickHouseEntrance: @ 8485B4C - .4byte Route110_TrickHouseEntrance_MapAttributes + .4byte Route110_TrickHouseEntrance_Layout .4byte Route110_TrickHouseEntrance_MapEvents .4byte Route110_TrickHouseEntrance_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHouseEntrance/map.bin b/data/maps/Route110_TrickHouseEntrance/map.bin deleted file mode 100644 index 1306bb9b5..000000000 --- a/data/maps/Route110_TrickHouseEntrance/map.bin +++ /dev/null @@ -1 +0,0 @@ -¾¿6 ÆÇ!2!2!2!2!2!2!2!2!2¨2Î2Ï2!2)2)2)2D2NOD2)2)2)2)23)2)2)2D2VWD2)2)2)23'7)2)2)2)2)2)2)2)2)2)2"7 333333333333#333332233333 \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle1/border.bin b/data/maps/Route110_TrickHousePuzzle1/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/Route110_TrickHousePuzzle1/border.bin and /dev/null differ diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc index ff78e3652..ef5388364 100644 --- a/data/maps/Route110_TrickHousePuzzle1/header.inc +++ b/data/maps/Route110_TrickHousePuzzle1/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle1: @ 8485BA0 - .4byte Route110_TrickHousePuzzle1_MapAttributes + .4byte Route110_TrickHousePuzzle1_Layout .4byte Route110_TrickHousePuzzle1_MapEvents .4byte Route110_TrickHousePuzzle1_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHousePuzzle1/map.bin b/data/maps/Route110_TrickHousePuzzle1/map.bin deleted file mode 100644 index 2bf5b392c..000000000 --- a/data/maps/Route110_TrickHousePuzzle1/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -o233333333334 -w6 #$+$$$+$+$$!222Z2Z2*Z2Z2Z2*Z2*Z2Z2"22222222222222"22222,222,2,22,2222#$$+$$$$$$+%202Z2Z2Z2*Z2Z2Z2Z2Z2Z2*Z22Z22"22222222222222,22(220%22,2220$!2#!2Z2Z22#+$$%Z2Z2*2Z2"22"2Z2*Z2Z2Z222222"22"22222222(22,22,22,22222#$+$+$$$$+$%222Z2Z2"Z2*Z2Z2Z2Z2*Z2Z22222"2Z2222222222222,222222,222#$$$+$$$$+$$%20Z2Z2Z2Z2*Z2Z2Z2Z2*Z2Z2Z22Z22222Z22222Z222222222222222222222 \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle2/border.bin b/data/maps/Route110_TrickHousePuzzle2/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/Route110_TrickHousePuzzle2/border.bin and /dev/null differ diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc index 25aa8b8dc..d54eb7752 100644 --- a/data/maps/Route110_TrickHousePuzzle2/header.inc +++ b/data/maps/Route110_TrickHousePuzzle2/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle2: @ 8485BBC - .4byte Route110_TrickHousePuzzle2_MapAttributes + .4byte Route110_TrickHousePuzzle2_Layout .4byte Route110_TrickHousePuzzle2_MapEvents .4byte Route110_TrickHousePuzzle2_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHousePuzzle2/map.bin b/data/maps/Route110_TrickHousePuzzle2/map.bin deleted file mode 100644 index cb35a063e..000000000 --- a/data/maps/Route110_TrickHousePuzzle2/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -o          -w6 222222222€22222222‰‚‚ƒ22ˆ22222X22ˆ222222‰‚‚ƒ‚‚’2‚Š222ˆ22X222222i2‘‚‚‚’2222€222€2222222222ˆ22‰”‚‚‚‚‚‚Š222ˆ22ˆ2222222ˆ222ˆ22ˆ2‰‚Š222ˆ222‘Š2ˆ2ˆX2ˆ2‰‚”Š222ˆ2ˆ22ˆ2ˆX22ˆi„iˆ2ˆ222ˆ2ˆ22ˆ222‘‚”‚‚‚’2ˆ22ˆ2222222i22ˆ22‘ƒ2€2‚‚“‚‚“”Š2222ˆ2222ˆ22ˆ2‘ƒ222ˆ222222ˆ2222222€22222ˆ22ƒ2222‘‚‚‚‚‚’22222222222222222222 \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle3/border.bin b/data/maps/Route110_TrickHousePuzzle3/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/Route110_TrickHousePuzzle3/border.bin and /dev/null differ diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc index 9cd8c45be..3bcf40de1 100644 --- a/data/maps/Route110_TrickHousePuzzle3/header.inc +++ b/data/maps/Route110_TrickHousePuzzle3/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle3: @ 8485BD8 - .4byte Route110_TrickHousePuzzle3_MapAttributes + .4byte Route110_TrickHousePuzzle3_Layout .4byte Route110_TrickHousePuzzle3_MapEvents .4byte Route110_TrickHousePuzzle3_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHousePuzzle3/map.bin b/data/maps/Route110_TrickHousePuzzle3/map.bin deleted file mode 100644 index ac4f344d9..000000000 --- a/data/maps/Route110_TrickHousePuzzle3/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -o          -w6 &22&22&2X2&22&22-8292-22-22-22-82925@A522M22:225@Aq222q222U222B22X222K2L2829222&8292225S2T2M@A522"@AM22q222222U222"22q222K2L2./8292-22K2L25S2T25675@A5225S2T2q222X222q222U222U22282928292228292&225@AM@A5225@A"22~22U2X22q222q222"22./K2L2&./22-K2L2567:S2T2"67M225S2T2q2q2q2B22"q2q2U222222228292-228292225225@A5225@A522q222q222q222q222q222222222222222222 \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle4/border.bin b/data/maps/Route110_TrickHousePuzzle4/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/Route110_TrickHousePuzzle4/border.bin and /dev/null differ diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc index c928f08f3..85df95a1a 100644 --- a/data/maps/Route110_TrickHousePuzzle4/header.inc +++ b/data/maps/Route110_TrickHousePuzzle4/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle4: @ 8485BF4 - .4byte Route110_TrickHousePuzzle4_MapAttributes + .4byte Route110_TrickHousePuzzle4_Layout .4byte Route110_TrickHousePuzzle4_MapEvents .4byte Route110_TrickHousePuzzle4_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHousePuzzle4/map.bin b/data/maps/Route110_TrickHousePuzzle4/map.bin deleted file mode 100644 index 2dbcf251b..000000000 --- a/data/maps/Route110_TrickHousePuzzle4/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -o             -w6 2222Š22222€22222222ˆ2222‰’22222Š2‘ƒ2€2ˆ2222222ˆ2222ˆ2ˆ22‰ƒ2222222ˆ2‘ƒ22‚ƒ22222ˆ22222222222€2222222222222ˆ222‚‚‚‚ƒ22222ˆ22222222222‰‚‚”‚“‚ƒ2222222ˆ22222222‰‚ƒ2‰’22€222€22ˆ22ˆ222Œ‚‚‚’2‹222ˆ222222222222Œ‚ƒ22222„222222ˆ222€2222222222††††††„†††††2q2q2q2q2q2q2q2q2q2q2q2q2q2q2222222222222222222222222222222 \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle5/border.bin b/data/maps/Route110_TrickHousePuzzle5/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/Route110_TrickHousePuzzle5/border.bin and /dev/null differ diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc index d8b57d744..2402f4cc5 100644 --- a/data/maps/Route110_TrickHousePuzzle5/header.inc +++ b/data/maps/Route110_TrickHousePuzzle5/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle5: @ 8485C10 - .4byte Route110_TrickHousePuzzle5_MapAttributes + .4byte Route110_TrickHousePuzzle5_Layout .4byte Route110_TrickHousePuzzle5_MapEvents .4byte Route110_TrickHousePuzzle5_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHousePuzzle5/map.bin b/data/maps/Route110_TrickHousePuzzle5/map.bin deleted file mode 100644 index 470e3eba3..000000000 --- a/data/maps/Route110_TrickHousePuzzle5/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -o             -w6 hh222hhhhhh2222h22222hhhhh2hhh2222222hhh222hh2222222hh22222h2222222h22222222222222222222222222222h2222222h22222hh2222222h22222hh2222222h22222hhh22222hhh222hhhh22222hhh222hhhh22222hhhh2hhhhhh222hhhh222hhhhh222hhh22222hhhhh2hhh2222222hhh222hhh22222hhh22222hhh222hhh22222222222hhhhh22222h22hhhhhhhh22hh \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle6/border.bin b/data/maps/Route110_TrickHousePuzzle6/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/Route110_TrickHousePuzzle6/border.bin and /dev/null differ diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc index 5864cdd59..946ad91f4 100644 --- a/data/maps/Route110_TrickHousePuzzle6/header.inc +++ b/data/maps/Route110_TrickHousePuzzle6/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle6: @ 8485C2C - .4byte Route110_TrickHousePuzzle6_MapAttributes + .4byte Route110_TrickHousePuzzle6_Layout .4byte Route110_TrickHousePuzzle6_MapEvents .4byte Route110_TrickHousePuzzle6_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHousePuzzle6/map.bin b/data/maps/Route110_TrickHousePuzzle6/map.bin deleted file mode 100644 index 45dc20ba1..000000000 --- a/data/maps/Route110_TrickHousePuzzle6/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -o             -w6 ‰ƒ222€222222€22ˆ222222€222ˆ222222222ˆ2€2Œƒ222222€2222ˆ22222‰‚’222222ˆ2222222222€22ˆ2„22222“ƒ222ˆ22222222ˆ2222’2262€2€2ˆ222€2222‚’2ˆ2222ˆ22222222ˆ22Š2‘Š2222222‘Š22ˆ22ˆ222‰‚ƒ22ˆ222”Š2€ˆ2222ˆ22222222€22ˆ22„2222222222‘ƒ22222222222222222ƒ2€22222222222222ˆ222222‰ƒ2222‰‚’2222222222’2222 \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle7/border.bin b/data/maps/Route110_TrickHousePuzzle7/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/Route110_TrickHousePuzzle7/border.bin and /dev/null differ diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc index e9217f7e2..5de9d6400 100644 --- a/data/maps/Route110_TrickHousePuzzle7/header.inc +++ b/data/maps/Route110_TrickHousePuzzle7/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle7: @ 8485C48 - .4byte Route110_TrickHousePuzzle7_MapAttributes + .4byte Route110_TrickHousePuzzle7_Layout .4byte Route110_TrickHousePuzzle7_MapEvents .4byte Route110_TrickHousePuzzle7_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHousePuzzle7/map.bin b/data/maps/Route110_TrickHousePuzzle7/map.bin deleted file mode 100644 index 68ac73547..000000000 --- a/data/maps/Route110_TrickHousePuzzle7/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -o             -w6 €22€22€222±²22€ˆ‡‡ˆ‡2ˆ‡22°³‰‚‹ˆ22ˆ22Œ‚‚‚‚‚‹‡ˆˆ222”‚Š222ˆ2ˆˆ22©ª2¬2‘‚ƒ2ˆ2ˆ‘‚ƒ¨«€222´22ˆ2ˆ2222‰”‚‚‚‚ƒ2ˆ2ˆ2‰‚‚’2222222ˆ2ˆ2ˆ22222‰‚Š22ˆ2ˆ‡ˆ2‰‚‚Šˆ2‘Š2ˆ‡ˆ’2ˆ22ˆˆ‡2ˆ2Œ‚‹222ˆ‡2ˆˆ2‰’22ˆ¤22‘‚‚’‘‚’2222ˆ222222222222€2ˆ‰‚‚‚‚‚‚“‚‚Š2ˆ2ˆˆ‡2¡¢2ˆ™šˆ22ˆ‘‚Š £‰‚’˜›222ˆ22‘‚Šˆ22œ222€2ˆ2222‘’2€™š€2ˆ2ˆ2222222˜›‘‚”‚’ \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle8/border.bin b/data/maps/Route110_TrickHousePuzzle8/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/Route110_TrickHousePuzzle8/border.bin and /dev/null differ diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc index d9fce791e..750270dea 100644 --- a/data/maps/Route110_TrickHousePuzzle8/header.inc +++ b/data/maps/Route110_TrickHousePuzzle8/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle8: @ 8485C64 - .4byte Route110_TrickHousePuzzle8_MapAttributes + .4byte Route110_TrickHousePuzzle8_Layout .4byte Route110_TrickHousePuzzle8_MapEvents .4byte Route110_TrickHousePuzzle8_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHousePuzzle8/map.bin b/data/maps/Route110_TrickHousePuzzle8/map.bin deleted file mode 100644 index b59b0f606..000000000 --- a/data/maps/Route110_TrickHousePuzzle8/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -o             -w6 222622222222226k2k2l6l6l6k2l6l6l6l6l6l6l6l6l6k2k2k2k2l6k2l6k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2l6k2222662266666k262626666666262k262k2l6k2k2k2k2l6l6k2k2k2k2k2k22k2k2k2k2l6k2k2k2k2k2l6k2k2k2k2k2k2k2k2l6k2k2k2k2k2l6k2k2k2k2k2k2k2k2l6k2k2k2k2k2l6k2k2k2k2k2k2k2k2l6k2k2k2k2k2l6k2k2k2k2k2l6k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2k2k2k22k2l6k2k2k2k2k2k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2l6l6l6k2l6k2k2k2l6k2k2k2k2226662622262222226622622222222 \ No newline at end of file diff --git a/data/maps/Route111/border.bin b/data/maps/Route111/border.bin deleted file mode 100644 index 4531975c7..000000000 Binary files a/data/maps/Route111/border.bin and /dev/null differ diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc index 804a36387..89feae870 100644 --- a/data/maps/Route111/header.inc +++ b/data/maps/Route111/header.inc @@ -1,5 +1,5 @@ Route111: @ 8482790 - .4byte Route111_MapAttributes + .4byte Route111_Layout .4byte Route111_MapEvents .4byte Route111_MapScripts .4byte Route111_MapConnections diff --git a/data/maps/Route111/map.bin b/data/maps/Route111/map.bin deleted file mode 100644 index 4ce11a8a9..000000000 Binary files a/data/maps/Route111/map.bin and /dev/null differ diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc index 8de668c4b..c2c055af6 100644 --- a/data/maps/Route111_OldLadysRestStop/header.inc +++ b/data/maps/Route111_OldLadysRestStop/header.inc @@ -1,5 +1,5 @@ Route111_OldLadysRestStop: @ 8483DC4 - .4byte Route111_OldLadysRestStop_MapAttributes + .4byte House3_Layout .4byte Route111_OldLadysRestStop_MapEvents .4byte Route111_OldLadysRestStop_MapScripts .4byte 0x0 diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc index 86a766b6d..4cf6ca023 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/header.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc @@ -1,5 +1,5 @@ Route111_WinstrateFamilysHouse: @ 8483DA8 - .4byte Route111_WinstrateFamilysHouse_MapAttributes + .4byte House2_Layout .4byte Route111_WinstrateFamilysHouse_MapEvents .4byte Route111_WinstrateFamilysHouse_MapScripts .4byte 0x0 diff --git a/data/maps/Route112/border.bin b/data/maps/Route112/border.bin deleted file mode 100644 index 9ae2c2126..000000000 --- a/data/maps/Route112/border.bin +++ /dev/null @@ -1 +0,0 @@ -qqqq \ No newline at end of file diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc index e0411ce05..397c0060a 100644 --- a/data/maps/Route112/header.inc +++ b/data/maps/Route112/header.inc @@ -1,5 +1,5 @@ Route112: @ 84827AC - .4byte Route112_MapAttributes + .4byte Route112_Layout .4byte Route112_MapEvents .4byte Route112_MapScripts .4byte Route112_MapConnections diff --git a/data/maps/Route112/map.bin b/data/maps/Route112/map.bin deleted file mode 100644 index ef3fd5f10..000000000 Binary files a/data/maps/Route112/map.bin and /dev/null differ diff --git a/data/maps/Route112_CableCarStation/border.bin b/data/maps/Route112_CableCarStation/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/Route112_CableCarStation/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc index 6caefade9..72667053d 100644 --- a/data/maps/Route112_CableCarStation/header.inc +++ b/data/maps/Route112_CableCarStation/header.inc @@ -1,5 +1,5 @@ Route112_CableCarStation: @ 8483DE0 - .4byte Route112_CableCarStation_MapAttributes + .4byte CableCarStation_Layout .4byte Route112_CableCarStation_MapEvents .4byte Route112_CableCarStation_MapScripts .4byte 0x0 diff --git a/data/maps/Route112_CableCarStation/map.bin b/data/maps/Route112_CableCarStation/map.bin deleted file mode 100644 index 93db9d5f0..000000000 Binary files a/data/maps/Route112_CableCarStation/map.bin and /dev/null differ diff --git a/data/maps/Route113/border.bin b/data/maps/Route113/border.bin deleted file mode 100644 index 73e1e3c60..000000000 --- a/data/maps/Route113/border.bin +++ /dev/null @@ -1 +0,0 @@ -mnuv \ No newline at end of file diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc index a8c19f49d..87d56215e 100644 --- a/data/maps/Route113/header.inc +++ b/data/maps/Route113/header.inc @@ -1,5 +1,5 @@ Route113: @ 84827C8 - .4byte Route113_MapAttributes + .4byte Route113_Layout .4byte Route113_MapEvents .4byte Route113_MapScripts .4byte Route113_MapConnections diff --git a/data/maps/Route113/map.bin b/data/maps/Route113/map.bin deleted file mode 100644 index 609690de2..000000000 Binary files a/data/maps/Route113/map.bin and /dev/null differ diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc index 49c0005b0..e9424580a 100644 --- a/data/maps/Route113_GlassWorkshop/header.inc +++ b/data/maps/Route113_GlassWorkshop/header.inc @@ -1,5 +1,5 @@ Route113_GlassWorkshop: @ 8485CB8 - .4byte Route113_GlassWorkshop_MapAttributes + .4byte House4_Layout .4byte Route113_GlassWorkshop_MapEvents .4byte Route113_GlassWorkshop_MapScripts .4byte 0x0 diff --git a/data/maps/Route114/border.bin b/data/maps/Route114/border.bin deleted file mode 100644 index 23e2a92e5..000000000 --- a/data/maps/Route114/border.bin +++ /dev/null @@ -1 +0,0 @@ -klst \ No newline at end of file diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc index 5b9db262a..cda0036b3 100644 --- a/data/maps/Route114/header.inc +++ b/data/maps/Route114/header.inc @@ -1,5 +1,5 @@ Route114: @ 84827E4 - .4byte Route114_MapAttributes + .4byte Route114_Layout .4byte Route114_MapEvents .4byte Route114_MapScripts .4byte Route114_MapConnections diff --git a/data/maps/Route114/map.bin b/data/maps/Route114/map.bin deleted file mode 100644 index 3bad45e04..000000000 Binary files a/data/maps/Route114/map.bin and /dev/null differ diff --git a/data/maps/Route114_FossilManiacsHouse/border.bin b/data/maps/Route114_FossilManiacsHouse/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/Route114_FossilManiacsHouse/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc index 277c0c0df..efe6a1b76 100644 --- a/data/maps/Route114_FossilManiacsHouse/header.inc +++ b/data/maps/Route114_FossilManiacsHouse/header.inc @@ -1,5 +1,5 @@ Route114_FossilManiacsHouse: @ 8483E18 - .4byte Route114_FossilManiacsHouse_MapAttributes + .4byte Route114_FossilManiacsHouse_Layout .4byte Route114_FossilManiacsHouse_MapEvents .4byte Route114_FossilManiacsHouse_MapScripts .4byte 0x0 diff --git a/data/maps/Route114_FossilManiacsHouse/map.bin b/data/maps/Route114_FossilManiacsHouse/map.bin deleted file mode 100644 index ea2d94fda..000000000 --- a/data/maps/Route114_FossilManiacsHouse/map.bin +++ /dev/null @@ -1 +0,0 @@ -±²íîﹺõö÷6Á2Â2!2ý2þ233®¯@2!2)2)2)2)277¶2·2Ö2!2NOD2)2Ö2Ö2)2)2)2Y2VW)2)2)2)2)2)2)2 3333333333#33333333 \ No newline at end of file diff --git a/data/maps/Route114_FossilManiacsTunnel/border.bin b/data/maps/Route114_FossilManiacsTunnel/border.bin deleted file mode 100644 index 580a207f4..000000000 --- a/data/maps/Route114_FossilManiacsTunnel/border.bin +++ /dev/null @@ -1 +0,0 @@ -wwww \ No newline at end of file diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc index 169b0b7a4..c20e1b2d3 100644 --- a/data/maps/Route114_FossilManiacsTunnel/header.inc +++ b/data/maps/Route114_FossilManiacsTunnel/header.inc @@ -1,5 +1,5 @@ Route114_FossilManiacsTunnel: @ 8483E34 - .4byte Route114_FossilManiacsTunnel_MapAttributes + .4byte Route114_FossilManiacsTunnel_Layout .4byte Route114_FossilManiacsTunnel_MapEvents .4byte Route114_FossilManiacsTunnel_MapScripts .4byte 0x0 diff --git a/data/maps/Route114_FossilManiacsTunnel/map.bin b/data/maps/Route114_FossilManiacsTunnel/map.bin deleted file mode 100644 index 61838bff2..000000000 --- a/data/maps/Route114_FossilManiacsTunnel/map.bin +++ /dev/null @@ -1 +0,0 @@ -w2whiiiiiijw2w2w2whxhiiGijrw2wwwphxhiOjrzjwww2pphx33rzjrwwwppp33ý2zjrrwwwppp¯6y233rrrwwwppp3y2y2Ç6rrrwwwppp3y2y2ý2rrrwwwpp-2Åy2y2ý2rrrwwwp-2¸p3y2¿6rrrwwww2¸pp3y2ý2rrrwwww2ppp3y2Æ6,rrwwww2ppp¯6ý2r·6rzjw2ww2ppp3ý2r3zjrw2ww2ppp3ý2r3y6rrw2ww2ppp3ý2r3y6rrw2whxp-2Åý2r3y6rrw2wpý2pý2p 3r77rrw2wpÇ6pý2p 3zj3rzjwpý2p¿6p 33r3r3rwpý2pý2p3ý2r3r7rwpý2pý2p3¿6r3zjrhxý2p7p3ý2r77rrpy6ý2phx3ý2zj3rrpy6ý2pp3333r3rrpy6ý2pp3±2²2ý2r3rr \ No newline at end of file diff --git a/data/maps/Route114_LanettesHouse/border.bin b/data/maps/Route114_LanettesHouse/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/Route114_LanettesHouse/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc index ba4cccfd5..9a5763394 100644 --- a/data/maps/Route114_LanettesHouse/header.inc +++ b/data/maps/Route114_LanettesHouse/header.inc @@ -1,5 +1,5 @@ Route114_LanettesHouse: @ 8483E50 - .4byte Route114_LanettesHouse_MapAttributes + .4byte Route114_LanettesHouse_Layout .4byte Route114_LanettesHouse_MapEvents .4byte Route114_LanettesHouse_MapScripts .4byte 0x0 diff --git a/data/maps/Route114_LanettesHouse/map.bin b/data/maps/Route114_LanettesHouse/map.bin deleted file mode 100644 index de1858be4..000000000 --- a/data/maps/Route114_LanettesHouse/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -   -L  !2 !22"2#2"2#2 !2(2(202PQ2(:2Q62%2282XY22BY,-2@22J262%2P4522222)2,-XJ2222145 \ No newline at end of file diff --git a/data/maps/Route115/border.bin b/data/maps/Route115/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route115/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc index 4d135e0b6..97156442e 100644 --- a/data/maps/Route115/header.inc +++ b/data/maps/Route115/header.inc @@ -1,5 +1,5 @@ Route115: @ 8482800 - .4byte Route115_MapAttributes + .4byte Route115_Layout .4byte Route115_MapEvents .4byte Route115_MapScripts .4byte Route115_MapConnections diff --git a/data/maps/Route115/map.bin b/data/maps/Route115/map.bin deleted file mode 100644 index 64a58e691..000000000 Binary files a/data/maps/Route115/map.bin and /dev/null differ diff --git a/data/maps/Route116/border.bin b/data/maps/Route116/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/Route116/border.bin +++ /dev/null @@ -1 +0,0 @@ -ÔÕÜÝ \ No newline at end of file diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc index 27009ad3f..919dffa6f 100644 --- a/data/maps/Route116/header.inc +++ b/data/maps/Route116/header.inc @@ -1,5 +1,5 @@ Route116: @ 848281C - .4byte Route116_MapAttributes + .4byte Route116_Layout .4byte Route116_MapEvents .4byte Route116_MapScripts .4byte Route116_MapConnections diff --git a/data/maps/Route116/map.bin b/data/maps/Route116/map.bin deleted file mode 100644 index a6e9d8843..000000000 Binary files a/data/maps/Route116/map.bin and /dev/null differ diff --git a/data/maps/Route116_TunnelersRestHouse/border.bin b/data/maps/Route116_TunnelersRestHouse/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/Route116_TunnelersRestHouse/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc index 489c5a8b9..ac319327f 100644 --- a/data/maps/Route116_TunnelersRestHouse/header.inc +++ b/data/maps/Route116_TunnelersRestHouse/header.inc @@ -1,5 +1,5 @@ Route116_TunnelersRestHouse: @ 8483E6C - .4byte Route116_TunnelersRestHouse_MapAttributes + .4byte Route116_TunnelersRestHouse_Layout .4byte Route116_TunnelersRestHouse_MapEvents .4byte Route116_TunnelersRestHouse_MapScripts .4byte 0x0 diff --git a/data/maps/Route116_TunnelersRestHouse/map.bin b/data/maps/Route116_TunnelersRestHouse/map.bin deleted file mode 100644 index 91e2c2019..000000000 --- a/data/maps/Route116_TunnelersRestHouse/map.bin +++ /dev/null @@ -1 +0,0 @@ -ã±²¾¿ä빺ÆÇìó2Á2Â2!2!2!2!2Î2Ï2ô2!2)2)2)2)2)2)2)2)2)2Y2NO)2)2)2)2NOD2!2VWD2)2)2D2VWD2!2)2)2)2)2)2)2)2)2)2 3333333333#33333333 \ No newline at end of file diff --git a/data/maps/Route117/border.bin b/data/maps/Route117/border.bin deleted file mode 100644 index addb5d6ce..000000000 Binary files a/data/maps/Route117/border.bin and /dev/null differ diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc index d92b96e30..897d37afb 100644 --- a/data/maps/Route117/header.inc +++ b/data/maps/Route117/header.inc @@ -1,5 +1,5 @@ Route117: @ 8482838 - .4byte Route117_MapAttributes + .4byte Route117_Layout .4byte Route117_MapEvents .4byte Route117_MapScripts .4byte Route117_MapConnections diff --git a/data/maps/Route117/map.bin b/data/maps/Route117/map.bin deleted file mode 100644 index bdeda9cd4..000000000 --- a/data/maps/Route117/map.bin +++ /dev/null @@ -1,10 +0,0 @@ -ÆÇÆÆÆÆÆÆÆÆÆÆÆÆÆÆ5670 2 000Ð0Ñ0Ñ0Ò000 0 0 -200000000ÇÇÇÇÆÆÆÇ00 0 00000°±±±±±²Æºh4s4q0u4i0j4000 2 0Ð0Ñ0Ñ0Ò040 0 0 0 00000000ÆÇÇÇÆÆÆ 0 0 0 0 0 0 00000000¸¡¡¡¡¡Â²ˆp4{4|4}4q0r440 0 00Ð0Ñ0Ù0Ú0 0000 0 0 -0000000ÇÇÇÇÇÇÇ8IIIIII:0000000¸¡¡¡¡¡¡Â²ˆp4q0q0t4y4z40 0 00È0Ñ0Ò0 0 200 2004000ÆÇÇÇÇÇÇ@2 22 -222B000000 -2¸¡¡¡¡¡¡¡ºˆx4y4y4z400 00 04Ø0Ù0Ú0000 20 000000ÇÇÇÇÇ@222 22 -2B00000000000Ì¡¡¡º‘‘‘‘‘‘‘‘‘‘‘‘‘‘‘0‘ !"‘‘‘‘‘‘20@2222 22B000000000 -2¸¡¡¡º02000000000000000000000000000IIIIIIIHI0000IJ0111111100000Ì¡º200011111111111111100000000002202020200000000 1!1)1)1)1)1*1000000000011!1!1!1)1x2y2x2y2x2y2x2y2!1!1!111000000002200202011111111!1"1000000000011111!1!1!1!1*10ÖÕÔÕÔÕÔ×(1)1!1!1!11110000022020202 !!!!!!!!1"100°±² 20000(1)1!1!1!1!1!1!1*10Î1óòóòóòóòÏ10(1!1!1!1)1*10000022200000(1)1)1)1)1)1)1)1)1*100¸¡Â²200000(1)1!1!1!1"100ÖÕÔÕÔÕÔÕÔ×00 1!1*1000000020202000000000000000¸¡¡Â±²000000(1!1!1"100ÜÝäåäåäòóç0 1"100000000II@@@@II8II000II:0 0 0¸¡¡¡¡º0200000 1!1!110ÔÕK1L5L5L5M1ÔÕ001!1"1000000ÆÆ00ÆÇÆÆ00@22 22 -222B 0 0 0¸¡¡¡¡Â±²0 0 0 00(1!1!1"10æç11111äç00 1!1*1000ÆÆÆÆÆ0ÇÆÆÆÆÆÆ@222 22 -22B 0 0 0¸¡¡¡¡¡¡º 0 0 0 0 00 1!1!1100000000001!1"100ÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆ@2222 22 -2B 0 0 0¸¡¡¡¡¡¡º 0 0 0 0 0 0(1!1!1!11111111111!1!1*100ÆÆÆÆÆÆÆÆÆÆH0IIIIIIJ@@@¸------º%0%0 0 0 0 0 0(1)1)1)1)1)1)1)1)1)1)1)1)1)1*100ÆÆÆÆÆÆÆÆÇÇÇ00000000000000ÆÆÆ0ÆÆÆÆÆÆ0ÆÆ%0%0 0 0 00000000000000000ÆÆÆÆÆÆÆÆÆÆÆÆÆ0ÆÆÆÆÆ0ÆÆÆÆÆ0ÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆ%0%0%000ÆÆÆÆÆÆÆÆÆÆÆ00ÆÆÆÆÆÇÇÇÇÇ \ No newline at end of file diff --git a/data/maps/Route117_PokemonDayCare/border.bin b/data/maps/Route117_PokemonDayCare/border.bin deleted file mode 100644 index 7f603e844..000000000 --- a/data/maps/Route117_PokemonDayCare/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc index 1ace346b5..f690fa432 100644 --- a/data/maps/Route117_PokemonDayCare/header.inc +++ b/data/maps/Route117_PokemonDayCare/header.inc @@ -1,5 +1,5 @@ Route117_PokemonDayCare: @ 8483E88 - .4byte Route117_PokemonDayCare_MapAttributes + .4byte Route117_PokemonDayCare_Layout .4byte Route117_PokemonDayCare_MapEvents .4byte Route117_PokemonDayCare_MapScripts .4byte 0x0 diff --git a/data/maps/Route117_PokemonDayCare/map.bin b/data/maps/Route117_PokemonDayCare/map.bin deleted file mode 100644 index bd4b64e13..000000000 --- a/data/maps/Route117_PokemonDayCare/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -567       -=>?$2&22&244222 22 .!.#222222222(222322222-2022222222222)*%2222222820212222222C222922%2;<22@AAAAA \ No newline at end of file diff --git a/data/maps/Route118/border.bin b/data/maps/Route118/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route118/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc index 5567df47f..3bf779b27 100644 --- a/data/maps/Route118/header.inc +++ b/data/maps/Route118/header.inc @@ -1,5 +1,5 @@ Route118: @ 8482854 - .4byte Route118_MapAttributes + .4byte Route118_Layout .4byte Route118_MapEvents .4byte Route118_MapScripts .4byte Route118_MapConnections diff --git a/data/maps/Route118/map.bin b/data/maps/Route118/map.bin deleted file mode 100644 index dfd8a293d..000000000 Binary files a/data/maps/Route118/map.bin and /dev/null differ diff --git a/data/maps/Route119/border.bin b/data/maps/Route119/border.bin deleted file mode 100644 index 864ac15fa..000000000 Binary files a/data/maps/Route119/border.bin and /dev/null differ diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc index 17d13f572..cb61c3a38 100644 --- a/data/maps/Route119/header.inc +++ b/data/maps/Route119/header.inc @@ -1,5 +1,5 @@ Route119: @ 8482870 - .4byte Route119_MapAttributes + .4byte Route119_Layout .4byte Route119_MapEvents .4byte Route119_MapScripts .4byte Route119_MapConnections diff --git a/data/maps/Route119/map.bin b/data/maps/Route119/map.bin deleted file mode 100644 index 1126455a2..000000000 Binary files a/data/maps/Route119/map.bin and /dev/null differ diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc index 86f968efc..754b0c245 100644 --- a/data/maps/Route119_House/header.inc +++ b/data/maps/Route119_House/header.inc @@ -1,5 +1,5 @@ Route119_House: @ 8485D28 - .4byte Route119_House_MapAttributes + .4byte House1_Layout .4byte Route119_House_MapEvents .4byte Route119_House_MapScripts .4byte 0x0 diff --git a/data/maps/Route119_WeatherInstitute_1F/border.bin b/data/maps/Route119_WeatherInstitute_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/Route119_WeatherInstitute_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc index 1f555389a..fac499e3f 100644 --- a/data/maps/Route119_WeatherInstitute_1F/header.inc +++ b/data/maps/Route119_WeatherInstitute_1F/header.inc @@ -1,5 +1,5 @@ Route119_WeatherInstitute_1F: @ 8485CF0 - .4byte Route119_WeatherInstitute_1F_MapAttributes + .4byte Route119_WeatherInstitute_1F_Layout .4byte Route119_WeatherInstitute_1F_MapEvents .4byte Route119_WeatherInstitute_1F_MapScripts .4byte 0x0 diff --git a/data/maps/Route119_WeatherInstitute_1F/map.bin b/data/maps/Route119_WeatherInstitute_1F/map.bin deleted file mode 100644 index 07a4e7ebb..000000000 --- a/data/maps/Route119_WeatherInstitute_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -__nk___k_____ˆ‰_|}~_ggkgggk,-,-g‘g„…†lmv2kj2z2z2k4545j2˜2™2z2Œ22Ž2‡tuR2sr2R2R2sj2z2z2z2w2R2R2R2R2R2R2R2r2R2R2pr2R2R2pr2R2R2`aR2R2R2`aR2R2r2R2R2xr2R2R2xr2R2^2STV2R2^2STV2R2r2U2R2€2w2R2R2€2w2R2R2Š‹R2R2R2Š‹R2U22fZ2h2R2R2R2h2Z2Z2Z2Z2Z2Z2Z2Z2Z2Z2Z2f___pR2R2R2p____________gggxR2R2R2xggggggggggggj2z2z2€2R2R2R2€2z2z2z2z2z2z2z2z2z2z2z2z2r2R2R2R2R2R2R2R2U2R2R2U2R2R2R2R2R2R2R2R2r2R2R2R2R2R2R2R2]]R2R2R2R2R2R2R2R2 \ No newline at end of file diff --git a/data/maps/Route119_WeatherInstitute_2F/border.bin b/data/maps/Route119_WeatherInstitute_2F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/Route119_WeatherInstitute_2F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc index 048ccbf77..69a351082 100644 --- a/data/maps/Route119_WeatherInstitute_2F/header.inc +++ b/data/maps/Route119_WeatherInstitute_2F/header.inc @@ -1,5 +1,5 @@ Route119_WeatherInstitute_2F: @ 8485D0C - .4byte Route119_WeatherInstitute_2F_MapAttributes + .4byte Route119_WeatherInstitute_2F_Layout .4byte Route119_WeatherInstitute_2F_MapEvents .4byte Route119_WeatherInstitute_2F_MapScripts .4byte 0x0 diff --git a/data/maps/Route119_WeatherInstitute_2F/map.bin b/data/maps/Route119_WeatherInstitute_2F/map.bin deleted file mode 100644 index 97953f463..000000000 --- a/data/maps/Route119_WeatherInstitute_2F/map.bin +++ /dev/null @@ -1 +0,0 @@ -_ˆ‰_k___________|6}6~6_g‘gk,-,-,-,-,-g„6ƒ†6gj2˜2™2z2k4545454545j2Œ2z2Ž2z2r2`i2i2sj2z2z2dez2z2z2dew2i2i2i2i2W2Ti2i2pr2i2^2STV2i2^2STV2i2i2i2i2r2\i2i2xr2i2i2Š‹i2i2i2Š‹i2i2i2i2i2r2i2i2i2€2w2i2i2i2i2i2i2i2i2i2i2i2i2i2i2r2i2i2i2r2i2i2`ai2i2i2`ai2i2i2i2i2r2`i2i2kr2i2^2STi2i2^2STV2i2i2i2i2W2Ti2i2kr2i2i2Š‹i2i2i2Š‹i2i2i2i2i2r2\i2i2kr2i2i2i2i2i2i2i2i2i2i2i2i2i2i2 \ No newline at end of file diff --git a/data/maps/Route120/border.bin b/data/maps/Route120/border.bin deleted file mode 100644 index 864ac15fa..000000000 Binary files a/data/maps/Route120/border.bin and /dev/null differ diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc index ab7022f9c..9b8d641d9 100644 --- a/data/maps/Route120/header.inc +++ b/data/maps/Route120/header.inc @@ -1,5 +1,5 @@ Route120: @ 848288C - .4byte Route120_MapAttributes + .4byte Route120_Layout .4byte Route120_MapEvents .4byte Route120_MapScripts .4byte Route120_MapConnections diff --git a/data/maps/Route120/map.bin b/data/maps/Route120/map.bin deleted file mode 100644 index 599e6014d..000000000 Binary files a/data/maps/Route120/map.bin and /dev/null differ diff --git a/data/maps/Route121/border.bin b/data/maps/Route121/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/Route121/border.bin +++ /dev/null @@ -1 +0,0 @@ -ÔÕÜÝ \ No newline at end of file diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc index 5347f6d3d..4a05c76fe 100644 --- a/data/maps/Route121/header.inc +++ b/data/maps/Route121/header.inc @@ -1,5 +1,5 @@ Route121: @ 84828A8 - .4byte Route121_MapAttributes + .4byte Route121_Layout .4byte Route121_MapEvents .4byte Route121_MapScripts .4byte Route121_MapConnections diff --git a/data/maps/Route121/map.bin b/data/maps/Route121/map.bin deleted file mode 100644 index cfee98f2a..000000000 --- a/data/maps/Route121/map.bin +++ /dev/null @@ -1 +0,0 @@ -ÆÆÆÆurÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕXÔÕÔÕÔÕÔÕ01112ÔÕ0Z6urÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÆÆÆÆurÜÝÜÝÜÝÜÝäåäåÜÝÜÝÜÝÜÝXæåäåäåäç01112æç0ZuræåæåæåäåÜÝÜÝæåæåæåæåæåÜÝÜÝÜÝÜÝÜÝÜÝÆÆurÔÕÔÕÔÕÔÕs6L5L5u6ÔÕÔÕÔÕÔÕX0000000001112000Zur00000000ÔÕÔÕ0000000000ÔÕÔÕÔÕÔÕÔÕÔÕ00urÜÝÜÝÜÝÜÝ{211}2æ5åäåäåäç5X000000008999:000Zur00000000æåäç0000000000æåäåäåäåäåäå||||}rÔÕÔÕÔÕÔÕ 0 0 0PQQQQQQQQQQQQQQQQQ3$%&5QQQRurPQQQQQQQQQQQQQQQQQR0PQQQQQQAQQQQQR‘‘‘‘‘Dæ5åäåäåäç5 0 0 0 000000 0 0 0000000Î1Ï10BD-EC0tyy}r00000000 0 0 0 0 0000000000 0 0 0 00Z0000000000000000000000000000 0 0 0 0 000000Ö×000000r00tz000000000 0 0 0 0 0 0 000000 0 0 0 0 0 0Z0000000000000000000000000000 0 0 0 0 000000ÜÝÎ1Ï100000r&'rPQQQQR00PQQR00PQR00PQQQQQQQQR000000000001111111100000000 0 0 0 0 0 0 00000ÔÕÔ×t¯0Ï0yyz00r 0 0000000000Z0000Z00X0 0 00 0 0 00Z00000000011!1!1)1)1)1)1)1*10 0 0 0PQQQQQQQQQQQR00æåäçr0000000r 0 0 0PQQQQR0PR0000Z00X0 0 0 0 0 0 00Z0000Î1Ï1111!1!1!1*100000 0 0 0 0 0 0 0 0 0 0 00t|||||¯0Ï0||||z0000000r 0 0 0 0 0 0 00000Z 0 000Z0000 0 0 0 0 0 00000Î1Ï1Ö5Õ5)1)1)1)1)1*100Î1Ï1Î1Ç1Æ1Ç1Æ1Ç1 0 0 0 0t|||}t‘‘‘‘¯0Ï0‘‘‘‘‘yyy y¯0Ï0zPQQQQQQQQQQR 0 0 00Z00000000000000Ö5Õ5ä5å500000000ÖÕÔÕÔÕÔ×t|||}t‘‘‘z000000000000 0 0 0 0 0000000000000 0 0 0 0 00ZPQQQQQQQQR0000æ5å5t|00000000æ5åäç5äåäç5ut ‘‘z00000tyy¯0Ï0yy‰0000 0 0 0 0 0 0 0000000000 0 0 0 0 00Z011111100000t|||}€yyyðñyyy||||||||}r00000t|||}]^0^0^0_{||||‰ 0 0 0 0 0 0 00000000 0 0 0 0 0PQR0Õ2Ý6Ý6Ý6Ý6å200000u€‰‰‰˜PPPÖ×PPPt©©©©©©©©}t||||}€‰‰]^0^0^0^0_€‰‰‰{||||||||||||||||||||||||||||||||||}p1p1p1p1Î1Ï1Pæ5ç5t||}q0q0q0q0q0q0t©©}€‰‰‰‰˜pPe]^0^0^0^0_dQppš‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰˜p1p1p1p1Ö×Pt|}t©©||||||}€‰‰˜ppppppXm]^0^0^0^0_lYPQpppppppppppppppppppppppppppppp1p1p1p1p1p1p1p1p1p1p1p1p1æ5ç5t}q0q0u€‰‰‰‰‰‰‰‰˜ppppppppPQ’e^0^0^0^0gpXYPQPQpppppppppppppppppppppppppp1p1p1p1p1p1p1p1p1p1p1p1p1Pt}q0t|}pppppppppppppppppXYš‰‰‰‰‰‰˜pppXYXYpppppppppppppppppppppppppp1p1p1p1p1p1p1p1p1p1p1p1p1 \ No newline at end of file diff --git a/data/maps/Route121_SafariZoneEntrance/border.bin b/data/maps/Route121_SafariZoneEntrance/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/Route121_SafariZoneEntrance/border.bin and /dev/null differ diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc index 3ce3d22e7..56a07a3fa 100644 --- a/data/maps/Route121_SafariZoneEntrance/header.inc +++ b/data/maps/Route121_SafariZoneEntrance/header.inc @@ -1,5 +1,5 @@ Route121_SafariZoneEntrance: @ 8483EA4 - .4byte Route121_SafariZoneEntrance_MapAttributes + .4byte Route121_SafariZoneEntrance_Layout .4byte Route121_SafariZoneEntrance_MapEvents .4byte Route121_SafariZoneEntrance_MapScripts .4byte 0x0 diff --git a/data/maps/Route121_SafariZoneEntrance/map.bin b/data/maps/Route121_SafariZoneEntrance/map.bin deleted file mode 100644 index 35c1badac..000000000 --- a/data/maps/Route121_SafariZoneEntrance/map.bin +++ /dev/null @@ -1 +0,0 @@ -ˆˆˆˆˆˆˆˆˆˆˆ]ˆˆ‹ˆˆœ•œ“x2p2p2p2p2p2¨Ô2˜2™2™2©e2x2p2p2p2p2€2h2h2h2h2h2°¡ ¡¡±€2h2È2h2h2º2\2h2h2h2h2h2q2Y2Z2Y2Z2p2y2h2h2h2h2º2d6h2h2h2h2ababh2h2h2h2h2h2h2€2h2h2h2Ã2Ã2\2h2h2h2ÐÑdh2h2h2Ðx2€2h2h2h2Ѐ2€2h2h2h2ÐÒ2€2h2h2h2ÑÑ\2h2h2h2q2Ó2d6h2h2t6 \ No newline at end of file diff --git a/data/maps/Route122/border.bin b/data/maps/Route122/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route122/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc index f4856b8ab..591501de1 100644 --- a/data/maps/Route122/header.inc +++ b/data/maps/Route122/header.inc @@ -1,5 +1,5 @@ Route122: @ 84828C4 - .4byte Route122_MapAttributes + .4byte Route122_Layout .4byte Route122_MapEvents .4byte Route122_MapScripts .4byte Route122_MapConnections diff --git a/data/maps/Route122/map.bin b/data/maps/Route122/map.bin deleted file mode 100644 index 1c76b0b0a..000000000 Binary files a/data/maps/Route122/map.bin and /dev/null differ diff --git a/data/maps/Route123/border.bin b/data/maps/Route123/border.bin deleted file mode 100644 index 864ac15fa..000000000 Binary files a/data/maps/Route123/border.bin and /dev/null differ diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc index ff3ab332f..7d7a4590f 100644 --- a/data/maps/Route123/header.inc +++ b/data/maps/Route123/header.inc @@ -1,5 +1,5 @@ Route123: @ 84828E0 - .4byte Route123_MapAttributes + .4byte Route123_Layout .4byte Route123_MapEvents .4byte Route123_MapScripts .4byte Route123_MapConnections diff --git a/data/maps/Route123/map.bin b/data/maps/Route123/map.bin deleted file mode 100644 index e1ab62bd7..000000000 --- a/data/maps/Route123/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -ÆÆÆÇÆÇÆÆÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÆÆÇÆÆÆÇÇÇÆÆÆÆÆÇÆÇÇÇÆÇÆÇÆÇÇppppppppppppppppppppp’E00GpppppppppppppppppÆÆÆÆÇÆÇÇÆ@000000000ÇÇÇÇÇ@ÇÇÇÇÇÇÇÇÇÆÆÇÇÇ00hiiiiiiiiiiiijÇÇÇÇÆ 0 0 0 0ÇÆ 00 0 0þà4K1L5L5L5M1ÇÇÆÇÆÇÆÇÇÆp““pppppppppppppppppp’E00GpppppppppppppppppÆÆÆÇÆÇÆÆÇ@AIIIIIIII90@ÇÇÇÇÇÇÇÇÇÇÇ00000pqqqqqqqqqqqqrÇÇÇÆ0 0 0 0 0 0 0ÇÆ 0 0 0 0…011111ÇÇÇÆÇÆÇÆÆÆ00ÇÇ“ppppppppppppppppp’E00GpppppppppppppppppÆÆÆÆÇÆÇÇÆ@Bs6u60s6u60s6u6@00 0 0 -00@ÇÇÇÇÇÇÇ000000à40x y yyy‰qqqqqrÇÇÇ00 0 0 0 0 0 0Æ 0 0 0 0…000000ÇÆÇÆÇÆÆÆÆÇÆÆÇÇ“pppppppppppppppp’E00GpppppppppppppppppÆÆÆÇÆÇÆÆÇ@B{2}20{2}20{2}2@00@ÇÇÇÇÇÇÇ°±±±±±±²000000þ00 0 0x‰qqqqrÇÇÇ000 0 0 0 0 0 0 0 0 0 0 0…0000000ÆÇÇÇÇÇÇÇ“ppppppppppppppp’E00GpppppppppppppppppÆÆÆÆÆÆÇÆ@Bs6u60s6u60s6u6@0 0@ÇÇÇÇǸ¡¡¡¡¡¡º000000…0 0 0 0 0xyy wÆÆÇÕ4‡4‡4‡4‡4‡4Ö40 0 0000 0 0…0000 0 000000000ÆÆÇÆÆÇÇÇÇ““ppppppppppppp’E00GpppppppppppppppppÆÆÆÇÆÇ0@B{2}20{2}20{2}2@0 !"0@Ç00¸¡¡¡¡¡¡º000000… 0 0 0 0 0Õ4o00ÆÆÆ0000000Æ 0000000…000 0 0 0 0 0ÇÇÇÇ0ÇÇÇÇÇÇÇÇÆÆÆ““ppppppppppp’E00Gpppppppppppppp“““ÇÆÆÆ000@3II0000II2400000@0þà4000¸¡¡¡¡¡¡º000000… 0 0 0 0 0 0…000ÇÇ0000000ÆÆ000000000 0 0 0 0 0 0 0ÇÆÇÇ0ÇÇÇÇÇÇÇÇÆÆÆÆÆ“pppppppppp’E00Gpppppppppppp““ÇÇÇÇ00000@0000000000000000@00…0000¸¡¡¡¡¡¡º000000%0%0 0 0 0 0…000Ç00000000ÆÆ0à400000ÆÆ%0 0 0 0 0 0 0ÇÇÇ0ÇÇÇÇÇÇÇÇÇÇÇÇÆÆ““pppppppp’E00Gppppppppp“““ÇÆÇÇÇ00000000@Ç000000000Ð1Ò1000@00…000000000000000à4000ÆÆ%0 0 0 0…000Õ4‡4‡4‡4‡4Ö40 0 0 0ÆÆÆ00000ÆÆÆÆ%0 0 0 0 0 0 0ÇÇÇ0ÇÇÇÆÆÆÆ“““““ppp’E00Gpp“““““““ÆÇÆÇÆÇÆÇ000000000@0000000000Ø1Ú1000@00…00000000000000000ÆÆÆÆÆ 0 00…0Æ00000000Æ%0 0 0ÆÆ0000ÆÆÆÆ%0 0 0 0 0 0ÇÇ0000000000ÇÇÇÇÇÆÆÇÆÇÇÇ>4>4>40000>4>4>4ÇÆÇÆÇÆÇÆÆÆÆÆÆÇÇ000000000HIIIIIIIIII0Ø1Ú10II200‡4‡4ÇÇÇ0Õ4‡4‡4‡4‡4‡4o4000ÆÆÆÆÆÆ000ÆÆ00000000ÆÆ 0 0 0 0Õ4‡‡‡ÖÆÆÆÆ000 0 0 00ÇÇÇ0ÇÇÇÆÇÆÇÆÇÆÇ0à40001100à40ÇÆÇÇ000000000040000000000Ø1Ú1000000000ÇÇÇ000000…ÇÇÇÇÆÆÆÆ0000Æ0000000ÆÆÆ%0 0 0 0 0000000000000000000 0 0 0ÇÇÇ0ÇÇÇÇÇÆ000001!1"100000ÆÆÆ0000000000ÇÇÇÇÇ00000000000000000Ø1Ú10000000000000000…ÆÆÆÇÇÇ0000Õ4‡4‡4‡4‡4‡4Ö4ÆÆÆÆÆ%0%0 0 000000000þ00à400000000 0 0 0 0 00ÆÆÆÆK1L5L5L5M100111!1!1*1000000ÇÇÇÆÆÆÆÆÆÆÆÇÇÆÆ00Ð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Ò100…0ÆÆÆÆÕ4‡4‡4‡4‡4‡4o0000000ÆÆÆÆ 0000011110…11111000000 0 0 0 0 0 0 000001111111!1!1!1!1*100000000000ÇÇÆÆÇÆÆ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â100…000000000…0111111100þ0111!1!1)1*10…(1)1)1!1!11111à40 0 0 0 0 0 0 00011111111111!1!1!1)1)1*100à400ÆÆÆÆÆ00000000000ÇÇÆÇÇÆÇÇ0000000000000000000000000000000000…0011111111000…0(1)1)1)1)1!1!1111110…0(1)1)1)1*1000…000(1)1)1)1)1*10%0%0%0 0 0 0 0 000(1)1)1)1)1)1)1)1)1)1)1)1)1*1000000ÇÇÇÆÆÆÆ0ÆÆÆÆÆÆÆÆ0ÆÇÆÇÆÇÆÇÇÇÇ@4I0IIIIIIIIIII@4@4IIIII0@4ÆÆÆÆ00000…00(1)1)1)1)1)1)1*1000000000(1)1)1)1)1)1*10…0000000à40000000000ÆÆÆÆ%0%0%0%0 000000000à400000000000ÇÆÇÆÆÆÆÆÆ0ÇÇÇÆÇÆÇÆÆÇÆÇ0000000000000ÇÇ000000ÆÇÆÆÆÆÆÆ00Ç000000à4000000ÆÆ00000000à40000000000000ÆÆ000ÆÆÇÆÆÆÇÆÆÆÆÆ00à4000000000000ÆÆÆÆÆÇÆÇÆÆÆÆÆÆÆ0000000000ÇÇÆÇÆÇÆÇÇÆÇÆÇÆÆÇÆÇÆÆÆÆÆÆÆÆÆÆ0ÆÆÆÇÆÇÆÇÇÆÇÇÇÇ0ÇÇÇ000000ÇÆÆÆÆÆÆÆÆÆÆ000000000ÇÇÇ000ÇÇÇÆÆÆÇÆÇÆÇÆÇÆÇÆÇÆÆÆÇÆÇ00000000ÆÆÇÆÇÇÆÇÆÇÆÇÆÇÆÇÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆ \ No newline at end of file diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc index f086368ad..f1466f9e7 100644 --- a/data/maps/Route123_BerryMastersHouse/header.inc +++ b/data/maps/Route123_BerryMastersHouse/header.inc @@ -1,5 +1,5 @@ Route123_BerryMastersHouse: @ 8485CD4 - .4byte Route123_BerryMastersHouse_MapAttributes + .4byte House2_Layout .4byte Route123_BerryMastersHouse_MapEvents .4byte Route123_BerryMastersHouse_MapScripts .4byte 0x0 diff --git a/data/maps/Route124/border.bin b/data/maps/Route124/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route124/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc index e4c690104..811fb3ec7 100644 --- a/data/maps/Route124/header.inc +++ b/data/maps/Route124/header.inc @@ -1,5 +1,5 @@ Route124: @ 84828FC - .4byte Route124_MapAttributes + .4byte Route124_Layout .4byte Route124_MapEvents .4byte Route124_MapScripts .4byte Route124_MapConnections diff --git a/data/maps/Route124/map.bin b/data/maps/Route124/map.bin deleted file mode 100644 index acd4a65fb..000000000 Binary files a/data/maps/Route124/map.bin and /dev/null differ diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/border.bin b/data/maps/Route124_DivingTreasureHuntersHouse/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/Route124_DivingTreasureHuntersHouse/border.bin and /dev/null differ diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc index d277004eb..a7501cddc 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc @@ -1,5 +1,5 @@ Route124_DivingTreasureHuntersHouse: @ 8485D44 - .4byte Route124_DivingTreasureHuntersHouse_MapAttributes + .4byte Route124_DivingTreasureHuntersHouse_Layout .4byte Route124_DivingTreasureHuntersHouse_MapEvents .4byte Route124_DivingTreasureHuntersHouse_MapScripts .4byte 0x0 diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.bin b/data/maps/Route124_DivingTreasureHuntersHouse/map.bin deleted file mode 100644 index 8f1f6cbef..000000000 --- a/data/maps/Route124_DivingTreasureHuntersHouse/map.bin +++ /dev/null @@ -1 +0,0 @@ -†‡yzXŽ‚  g 2–2—2‰2Š2$2$2$2$2$2˜9252626262626272#2#292=á2H6I6â>?#2#292=á2P6Q6â>?#2#292E2F2F2F2F2F2G#2#292#2#2#2#2#2#2#2#2"292#2#2 #2#2#2#2*6 \ No newline at end of file diff --git a/data/maps/Route125/border.bin b/data/maps/Route125/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route125/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc index 09afc815f..4e67b3cb6 100644 --- a/data/maps/Route125/header.inc +++ b/data/maps/Route125/header.inc @@ -1,5 +1,5 @@ Route125: @ 8482918 - .4byte Route125_MapAttributes + .4byte Route125_Layout .4byte Route125_MapEvents .4byte Route125_MapScripts .4byte Route125_MapConnections diff --git a/data/maps/Route125/map.bin b/data/maps/Route125/map.bin deleted file mode 100644 index 078f2713d..000000000 Binary files a/data/maps/Route125/map.bin and /dev/null differ diff --git a/data/maps/Route126/border.bin b/data/maps/Route126/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route126/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc index f87efc723..13e741159 100644 --- a/data/maps/Route126/header.inc +++ b/data/maps/Route126/header.inc @@ -1,5 +1,5 @@ Route126: @ 8482934 - .4byte Route126_MapAttributes + .4byte Route126_Layout .4byte Route126_MapEvents .4byte Route126_MapScripts .4byte Route126_MapConnections diff --git a/data/maps/Route126/map.bin b/data/maps/Route126/map.bin deleted file mode 100644 index 2d684cf64..000000000 Binary files a/data/maps/Route126/map.bin and /dev/null differ diff --git a/data/maps/Route127/border.bin b/data/maps/Route127/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route127/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc index 070f9996f..fa3ee0200 100644 --- a/data/maps/Route127/header.inc +++ b/data/maps/Route127/header.inc @@ -1,5 +1,5 @@ Route127: @ 8482950 - .4byte Route127_MapAttributes + .4byte Route127_Layout .4byte Route127_MapEvents .4byte Route127_MapScripts .4byte Route127_MapConnections diff --git a/data/maps/Route127/map.bin b/data/maps/Route127/map.bin deleted file mode 100644 index fa44f9960..000000000 Binary files a/data/maps/Route127/map.bin and /dev/null differ diff --git a/data/maps/Route128/border.bin b/data/maps/Route128/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route128/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc index 01d1a46ba..08acd71f2 100644 --- a/data/maps/Route128/header.inc +++ b/data/maps/Route128/header.inc @@ -1,5 +1,5 @@ Route128: @ 848296C - .4byte Route128_MapAttributes + .4byte Route128_Layout .4byte Route128_MapEvents .4byte Route128_MapScripts .4byte Route128_MapConnections diff --git a/data/maps/Route128/map.bin b/data/maps/Route128/map.bin deleted file mode 100644 index fae8a373e..000000000 Binary files a/data/maps/Route128/map.bin and /dev/null differ diff --git a/data/maps/Route129/border.bin b/data/maps/Route129/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route129/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc index 4e5b177df..53abdbebe 100644 --- a/data/maps/Route129/header.inc +++ b/data/maps/Route129/header.inc @@ -1,5 +1,5 @@ Route129: @ 8482988 - .4byte Route129_MapAttributes + .4byte Route129_Layout .4byte Route129_MapEvents .4byte Route129_MapScripts .4byte Route129_MapConnections diff --git a/data/maps/Route129/map.bin b/data/maps/Route129/map.bin deleted file mode 100644 index 8d09787fd..000000000 Binary files a/data/maps/Route129/map.bin and /dev/null differ diff --git a/data/maps/Route130/border.bin b/data/maps/Route130/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route130/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc index f4e1f3292..47b4b613c 100644 --- a/data/maps/Route130/header.inc +++ b/data/maps/Route130/header.inc @@ -1,5 +1,5 @@ Route130: @ 84829A4 - .4byte Route130_MapAttributes + .4byte Route130_Layout .4byte Route130_MapEvents .4byte Route130_MapScripts .4byte Route130_MapConnections diff --git a/data/maps/Route130/map.bin b/data/maps/Route130/map.bin deleted file mode 100644 index b06fa74dc..000000000 --- a/data/maps/Route130/map.bin +++ /dev/null @@ -1 +0,0 @@ -pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppr{{{{{{vpppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppr´qkllmq´vppppuvpppppppppppppppppppppppppppppppppppppppppppppppr{{{{{{{vpppppppu´qk´qquqq|uvpp}~pu{vppppppppppppppppppppppppppppppppppppppppu{{´qklllmq´vppppuv‚‰q{|||}qt„}~pppppzq|ppppuvuvppppppppppppppppppppppppppppppppzqqqk¾klm¾mq´vppp}~p‚y‰qqqty„ppu{{vpp‚y„ppPQ}~}~ppppppppppppppppppppppppppppppuvzqqqsq{|}quqq|ppPQpppp‚yyy„ppppzqq|pPQppuvXYppppPQppppppppppppppppppppppppppuv}~‚‰qq{‰qqqt}qt„ppXYpppuvppppppuv‚yy„pXYpp}~ppppppXYpppppppppppppppppppppPQppp}~ppp‚y‰q{|||}qt„puv{vppp}~pppppp}~pppPQpppppppppppppr{vpppppppppppppppppppXYu{{vpppPQp‚y‘‘‘‘‘y„pp}~q|ppppppppppPQppppXYppPQpppppppu{´q´{vpppppppppppppppuvu{´qq|pppXYppppppppuvppppy„ppppppppppXYppppppppXYpppppuv‚‰qqqq´vpppppppppppppp}~zqqqt„ppppppppppppp}~ppppppppppppppppppppppppuvppppppp}~p‚yyyyy„uvppppppu{{vpuvp‚yyy„uvppppppuvppppppppppppuvppppppppppppu{{v}~ppppppppppppppppp}~pppu{{´km´v}~pppppp}~pppppp}~pppppppppppp}~u{vpppppppuv‚yy„ppppppppppppppppppppuvppzqqq{}q|puvpppppppppppppppppppppppppuvppzt„ppppppp}~pppppppppppppppppppppppp}~PQ‚yy‰qqt„p}~ppppppppppppppppppppppppp}~pp‚„ppppppppppppppppppppppppppppppppppppXYppp‚yy„ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppPQpppppppuvppppppppppppppppppppppppppppppppppu{vpppppppppppppppppppppppppppppPQpXYppr{{{v}~ppu{{vppppppppppppppppppppppppppppzq|uvpppppppppppppppppppppppppppXYpppr{´qqq´vpuv´qq|ppppppppppppppppppppppppppuv‚y„}~pppppppppppppppppppppppppppppu{{´qqqqqq´v}~qqt„pPQpppppppppppppppppppppuv}~ppppppppppppppppppppppppppuvpuvppp‚‰qqqqqqqqq´vpyy„uvXYPQu{vpuvpppppppPQpppp}~pppppppppppppppppppppppppppp}~p}~pppp‚y‰qqqqqqty„pppp}~ppXY‚y„p}~pppppppXYu{{{vpppuvppppppppppppppppppppppPQpuvpu{{{vpp‚yyyyyy„PQpppppppppppppuvpPQpppuvppzqqq´{vp}~ppppppuvppppppppppppppXYp}~p‚‰qq´vpppppppppXYupppppppppppp}~pXYu{v}~uv‚yy‰qq´vpuvpppPQ}~pppppppPQppppr{{{vppp‚‰ty„ppppppppppp}pppppPQppppppppppzq|pp}~ppp‚yyy„p}~PQpXYppu{{vpuvXYppr{´qkm´vppp‚„pppppppppppppppppppXYpppppppppp‚y„pppppppppppppppXYuvppp‚‰q´v}~pu{{´klm{}q|pppppppppppppppppppppppppppppppppppppppppppppppppppppppp}~pppp‚yy„ppp‚‰qq{|}qqt„ppppppppppppppppppppppppppppppPQpppppppppppppppppppppppppppppppppppPQp‚yy‘‘‘yy„pppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppp \ No newline at end of file diff --git a/data/maps/Route131/border.bin b/data/maps/Route131/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route131/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc index 44a8921ba..b13a344fc 100644 --- a/data/maps/Route131/header.inc +++ b/data/maps/Route131/header.inc @@ -1,5 +1,5 @@ Route131: @ 84829C0 - .4byte Route131_MapAttributes + .4byte Route131_Layout .4byte Route131_MapEvents .4byte Route131_MapScripts .4byte Route131_MapConnections diff --git a/data/maps/Route131/map.bin b/data/maps/Route131/map.bin deleted file mode 100644 index 096d6e116..000000000 --- a/data/maps/Route131/map.bin +++ /dev/null @@ -1 +0,0 @@ -qqqqqqqqqqqt||}ut©|}€˜ppVOOOOOOOOOOOOOOOOOVpppppppppppppppppqqqqqqqqt||}qqt}u€‰‰˜pppVOOOOOOOOOOOOOOOOOVppppppppppppppppp||||||||}qqqt|}t}pppppppVOOOOOOOOOOOOOOOOVpppppppppppppppppqqqqqt©©©|||}qt}€˜pppppppVOOOOOOOOOOOOOOOVppppppppppppppppppqqt||}qqqt©©©|}€˜ppppppppVOOOOOOOOOOOOOOOVpppppppppppppppppp||}qt©|||}€‰‰‰‰˜ppuvppppppVOOOOOOOOOOOOOOVpppppppppppppppppp©©©|}€‰‰‰‰˜uvpu{vp}~ppppppVOOOOOOOOOOOOOVppppppppppppppppppp€‰Z[‰˜ppppp}~pzq|ppppppppppVOOOOOOOOOOOOVpppppppPQpppppppppp˜pXYppppuvpppp‚y„pppppppuvpVOOOOOOOOOOOOVppuvu{vXYppppppppppppppu{vp}~ppuvPQppppppPQ}~pVOOOOOOOOOOOVpuv}~zq|ppuvppppppppppppzq|ppppp}~XYppuvppXYpu{vVOOOOOOOOOOVp}~pp‚y„PQ}~ppppppppPQpp‚y„ppuvPQpppPQ}~pPQppzq|VOOOOOOOOOVpuvppppppXYpu{{vpppppXYpppppPQ}~XYpuvXYpPQXYpp‚y„pVOOOOOOOOVu´|pppuvpppu´qq´vpppppppppppXYppppp}~pppXYppppppuvpVOOOOOOVpzq|ppp}~PQp‚yyyy„PQppppppppppppppppppppuvppppppp}~uvVVVVVVuv‚y„pppppXYuvppPQpXYu{pppppppppppppppppp}~u{vpppppp}~ppppPQ}~pppppppppp}~ppXYpppzqppppppppppppppppppppzq´{vppppuvppuvXYpppppppu{vpppppPQppuv‚ypppppppppppppppppppp‚yyy„pppp}~uv}~pppppppu{´q|pppppXYpp}~ppppppppppppppppppppppppppppppppp}~pppppppPQzqqq|ppppppPQpppPQppppppppppppppppppppppppppppppppppppppppXY‚yyy„ppppppXYpppXYppppppppppppppppppppppppPQppuvpppppppu{vppppppppppppppppppppppppppppppppppppppppppppXYPQ}~ppppuvu´q|ppppppppppppppppppppppppppppppppppppppppppppppXYppu{{v}~‚yy„pppppppppppppppppppppppppppppppppppppppppppppppppp‚yy„ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppPQppppppppppppppppppppppppppppppppppppppppppppuvppppppPQppppXYppppppppppppppppppppppppppppppppppPQuvpppppp}~pppuvpXYppppppppuvppppppppppppppppppppppppppppppXY}~ppppppu{PQp}~pppu{vpppppz´vpuvpppppppppppppuvpppppppppuvppppppppppzqXYppppppzq|puvpp‚‰´v}~pppppppppppPQ}~pppppppuv}~ppppppppPQ‚y{{{{tppp‚y„p}~uvp‚y„pppppppu{{vppXYpuvpppppp}~pppPQpuvppXYppqqqq´{tppppuvp}~ppuvpppppppzqq´{vppp}~uvpppu{{vppXYp}~puvpppllllmq´{{{t}~pppuv}~ppu{{vp‚‰qqq´vpppp}~ppu´qq´{{vu{{{v}~pppqqqq¿llmqq´{tppp}~ppu{´qq|uv‚yyyy„ppppppPQ‚yyy‰qq´´qqt„pppppqqqqqqq¿mqqqutppppppzqqqt„}~ppppppppppppXYpppp‚y‰qqqt„ppppPQqqqqqqqq¿llmuu{tppuv‚yyy„ppppppppppppppppppppppp‚yyy„pppppXYqqqqqqqqqqq¿¿¿l¿tp}~ppppppppppppppppppppppppppppppppppppppppqqqqqqqqqqqqqqqqutpppppppppppppppppppppppppppppppppppppppppp \ No newline at end of file diff --git a/data/maps/Route132/border.bin b/data/maps/Route132/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route132/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc index df2aadbfa..b4fe2bc0d 100644 --- a/data/maps/Route132/header.inc +++ b/data/maps/Route132/header.inc @@ -1,5 +1,5 @@ Route132: @ 84829DC - .4byte Route132_MapAttributes + .4byte Route132_Layout .4byte Route132_MapEvents .4byte Route132_MapScripts .4byte Route132_MapConnections diff --git a/data/maps/Route132/map.bin b/data/maps/Route132/map.bin deleted file mode 100644 index 3250c0429..000000000 Binary files a/data/maps/Route132/map.bin and /dev/null differ diff --git a/data/maps/Route133/border.bin b/data/maps/Route133/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route133/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc index 30a69f94d..e8bc66e6f 100644 --- a/data/maps/Route133/header.inc +++ b/data/maps/Route133/header.inc @@ -1,5 +1,5 @@ Route133: @ 84829F8 - .4byte Route133_MapAttributes + .4byte Route133_Layout .4byte Route133_MapEvents .4byte Route133_MapScripts .4byte Route133_MapConnections diff --git a/data/maps/Route133/map.bin b/data/maps/Route133/map.bin deleted file mode 100644 index 1d4e74f73..000000000 --- a/data/maps/Route133/map.bin +++ /dev/null @@ -1 +0,0 @@ -ppppuvuvPQppppPQppppppuvppppPQPQppppuvPQPQPQpppPQppPQppuvPQuvppppPQPQuvPQuvpppPQPQpp}~}~XYppuvXYPQuvPQ}~PQuvXYXYppPQ}~XYXYXYpuvXYPQXYPQ}~XY}~PQuvXYXY}~XY}~PQpXYXYuvppppppuv}~ppXY}~XYccXY}~ppppPQXYpppppppPQ}~ppXYppXYccppppXY}~cccccpppppXYPQppp}~pppppp}~ppppppppcccccpppppppXYcppppppppXYpppppppcccccccpppcccccccccccppppXYpccppppppppppppppccccccccccccccccccccPQŒŒŒcccccpppppcccccccccccccccccccccccccccccccccppppuvppuvpppuvccccVF2F2F2WccccƒƒƒcXYŒŒcccpppppcccccccccccccccccVF2F2F2F2F2F2F2F2F2F2F2F2Wccccccpuv}~pp}~ppp}~VF2F2F2>2ž1ž1ž1_ccccPQƒƒccccccccccccccccccccccccccccc^ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1_ccccccc}~­®1®1®1®1®1®1®1®1®1®1›1^WWWW_OgccccXYcŒŒŒŒŒcccccccccccƒƒƒƒƒƒccccccccfGGNž1ž1ž1ž1ž1ž1ž1ž1ž1_ccccVF2F2F2F2›1ž1ž1ž1^WWWWWWW´ßßtyo_ccccccŒŒŒŒccccccccccccccccccƒƒƒƒƒƒƒƒcccccfGGNž1ž1ž1ž1ž1ž1_cccc^^W_ž1ž1ž1ž1ž1fßßßßßßßtyyož1ž1_ccccŒŒŒŒcccccccccccccccVF2F2F2WcccccƒƒƒƒƒƒcccccfGNž1ž1ž1ž1_cccV>2fß¾_ž1ž1^W¾ßtyyyyyož1ž1ž1OGgccŒŒŒcccccccccccccccccc^ž1ž1ž1?2F2F2WcccccƒƒƒƒƒƒƒcccfGGGGgccc^^¾ßß¿WW¾tyyož1ž1ž1ž1ž1ž1ž1OGgccŒŒŒcccccccccccccƒƒƒƒcccfNž1ž1ž1ž1ž1?2F2F2WcccccƒƒƒƒƒƒƒccccccccV>2fßßßßßßßž1ž1ž1ž1ž1ž1ž1OGGgccŒŒŒcccu{{{{{{{{{{{{tƒƒƒƒccfNž1ž1ž1ž1ž1ž1ž1?2F2F2Wcccccƒƒƒƒƒƒcccccc^ž1fßßtyyyyož1OGGGGGgccŒŒŒŒŒcu{{´ßßßßßßßßßßßß´{{tƒƒccfNž1ž1ž1ž1ž1ž1ž1ž1ž1?2F2F2Wcccccƒƒƒƒƒcccc^ž1nyyož1ž1ž1ž1ž1ž1_cccccŒŒŒŒŒcccu´ßßßtyyyyyyyyyy‰ßßß´{tƒccfNž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1?2F2F2Wccccccccccc^ž1ž1ž1ž1ž1ž1ž1OGGGgccŒŒŒŒŒcccu{{´ßtyy’$1$1$1$1$1$1$1$1$1$1yyy‰ß|ƒƒccfNž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1_cccccccccccfGNž1ž1ž1ž1Ogccccccccccccu{´tyyy’$1Ž1¦1¦1¦1¦11$1$1Ž1¦1¦1¦11$1$1$1ˆß´tccccfGGGGGGGGGGGGGgcƒƒƒcccccccccfGGGGgcccccccccccccztyo¦1¦1¦1¦1¦1§1¤¾¾£¥1¦1¦1§1¤¾£¥1¦1¦1¦1ny‰´tcccccccccccccccccccPQƒƒƒcccccccccccccccccccccccccc}~½¾¾¾¾¾¾¾¿pp½¾¾¾¾¿p½¾¾¾¾¾¿}y~cccccccccccccccccccXYcƒƒƒccccccccccccccccccccccccccppppppppppppppppppppppppppccccccccccccccccccccccccccƒƒƒƒcccccccccccccccccccccccpppppppppppppppppppppppppcccccccccccccccccccccccccccccccccccccccccccccccccccccccccpppppppppppppppppppppccccccccccccccccccccccccccccccccccccccccccccccccccccccccccPQppPQppppPQppppppppu{{{{{{{{{{tcccPQccPQcccccPQcccccPQPQccccccccccccccccccccPQcXYPQXYPQPQXYppppu{{{´ßßßßßßßßßß´tPQXYccXYcPQPQXYPQcPQXYXYcccccccccccccccccuvcXYcccXYppXYXYpppppu´ßtyyyyy‰ßtyyyyy~XYcccccccXYXYppXYcXYO1O1O1O1cccccccccccccccuv}~lllcccpppppppppppu{´ßtož1ž1”ž1ž1n‰Šž1ž1”ž1ž1?2WcccccpppppppppppPQO1O1O1O1O1F2Wcccccccccccuv}~llllcccccccpppppu{{´tyyož1ž1ž1ž1”ž1ž1nož1ž1ž1ž1ž1ž1?2WccpppppppppppPQXYO1O1O1O1O1ž1_cccccccccuv}~llllcccccccccccppu´ßßtož1ž1ž1ž1ž1^_ž1ž1ž1ž1ž1ž1”^_ž1ž1ž1_cppppppppppppXYO1O1O1O1O1O1O1ž1_ccccccccc}~llllccccccccccccccc}yyyož1ž1”ž1ž1ž1nož1ž1ž1ž1ž1ž1ž1fg^_ž1_ccpppppppppppPQO1O1O1O1O1O1O1ž1_cccccccccclllccccccccccccccccccccc^ž1ž1ž1ž1^_ž1ž1ž1ž1ž1ž1ž1ž1ž1nofgž1_cccppppppppppXYO1O1O1O1O1O1O1ž1_ccccccccccccccccccccccccccccccccccfGNž1ž1fgž1”ž1ž1ž1ž1ž1ž1ž1ž1ž1nož1_cccccppppppƒccPQO1O1O1O1O1O1ž1_cccccccccccccccccccccccccccccccccccc^ž1ž1nož1ž1ž1ž1OGGGNž1ž1ž1ž1OgcccccccppPQƒccXYPQO1O1O1O1ž1_cccccccccc\\\cccccccccccccccccccccccfNž1ž1ž1ž1ž1OGgcccfGGGGgccccccccccXYƒƒƒccXYPQPQOgccccccccccPQ\\\\cccccccccccccccccccccfNž1ž1ž1OgccccccccccccccccccccccccƒƒƒƒccXYXYgcccccccccccXYPQ\\\\\cccccccccccccccccccfGGGgccccccccccccccccccccccccpPQƒƒƒƒccccccccccccccccccXYuvPQ\\\ccccccccccpppppppccccccccccccccccccccccccuvccppXYppƒƒƒƒccuvccccccccccuvpp}~XYccccccPQccccPQpppppPQuvccccccccccpppuvppPQuv}~ppppppppppPQPQ}~ccccccuvPQ}~ppppuvccccccXYuvPQXYpppppXY}~PQccccppPQuvp}~PQXY}~PQppuvppppPQXYXYppPQPQuv}~XYpppppp}~uvuvPQuv}~XYpPQuvPQuvppXYPQuvuvXY}~PQpXYppppXYuv}~PQuvXYppppppXYXY}~pppppppppppp}~}~XY}~pppppXY}~XY}~ppppXY}~}~ppppXYppppppppp}~ppXY}~pppppp \ No newline at end of file diff --git a/data/maps/Route134/border.bin b/data/maps/Route134/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route134/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc index 9730f5036..20f6dd90a 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -1,5 +1,5 @@ Route134: @ 8482A14 - .4byte Route134_MapAttributes + .4byte Route134_Layout .4byte Route134_MapEvents .4byte Route134_MapScripts .4byte Route134_MapConnections diff --git a/data/maps/Route134/map.bin b/data/maps/Route134/map.bin deleted file mode 100644 index 7b78a2d3c..000000000 Binary files a/data/maps/Route134/map.bin and /dev/null differ diff --git a/data/maps/RustboroCity/border.bin b/data/maps/RustboroCity/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/RustboroCity/border.bin +++ /dev/null @@ -1 +0,0 @@ -ÔÕÜÝ \ No newline at end of file diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc index 9698b81de..adce7ef75 100644 --- a/data/maps/RustboroCity/header.inc +++ b/data/maps/RustboroCity/header.inc @@ -1,5 +1,5 @@ RustboroCity: @ 848250C - .4byte RustboroCity_MapAttributes + .4byte RustboroCity_Layout .4byte RustboroCity_MapEvents .4byte RustboroCity_MapScripts .4byte RustboroCity_MapConnections diff --git a/data/maps/RustboroCity/map.bin b/data/maps/RustboroCity/map.bin deleted file mode 100644 index 06736e47e..000000000 Binary files a/data/maps/RustboroCity/map.bin and /dev/null differ diff --git a/data/maps/RustboroCity_CuttersHouse/border.bin b/data/maps/RustboroCity_CuttersHouse/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/RustboroCity_CuttersHouse/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc index e7b936a19..5423772bf 100644 --- a/data/maps/RustboroCity_CuttersHouse/header.inc +++ b/data/maps/RustboroCity_CuttersHouse/header.inc @@ -1,5 +1,5 @@ RustboroCity_CuttersHouse: @ 8483478 - .4byte RustboroCity_CuttersHouse_MapAttributes + .4byte RustboroCity_CuttersHouse_Layout .4byte RustboroCity_CuttersHouse_MapEvents .4byte RustboroCity_CuttersHouse_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_CuttersHouse/map.bin b/data/maps/RustboroCity_CuttersHouse/map.bin deleted file mode 100644 index 5515d00cf..000000000 --- a/data/maps/RustboroCity_CuttersHouse/map.bin +++ /dev/null @@ -1 +0,0 @@ -yzfg8898x88‚no@@A@€VW‰3Š3v3w3+3+3+3+3ˆ3^3_3+3{3|3|3}3,3,3,3,3,3,3+3ƒ3>2>2…3,3,3,3j7k7E3+3ƒ3>2>2…3,3,3D3r7s7E3+3‹3Œ3Œ33,3,3,3,3,3,3F3G3,3,3,3,3,3,3,3,3,3N7O7,3,3,3LM,3,3,3,3 \ No newline at end of file diff --git a/data/maps/RustboroCity_DevonCorp_1F/border.bin b/data/maps/RustboroCity_DevonCorp_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/RustboroCity_DevonCorp_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc index 68b72454f..9e270b9fc 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc @@ -1,5 +1,5 @@ RustboroCity_DevonCorp_1F: @ 8483344 - .4byte RustboroCity_DevonCorp_1F_MapAttributes + .4byte RustboroCity_DevonCorp_1F_Layout .4byte RustboroCity_DevonCorp_1F_MapEvents .4byte RustboroCity_DevonCorp_1F_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.bin b/data/maps/RustboroCity_DevonCorp_1F/map.bin deleted file mode 100644 index 09f86a742..000000000 --- a/data/maps/RustboroCity_DevonCorp_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -šˆ‰ˆˆ‰ˆ›šŠ‹3Œ›˜ö‘‘ö™˜’“”™˜þ3333þ™˜333™ˆ‰ †333‡3€¡ˆˆ 3€3€3¡‰ˆ‘Žœœœ„33€3€3‘3333ƒ3ƒ3ƒ3ƒ3…333333€3€33333€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€33€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€33€3€3€3€322€3€3€3€3€3€3€3€3€3€3€3€3 \ No newline at end of file diff --git a/data/maps/RustboroCity_DevonCorp_2F/border.bin b/data/maps/RustboroCity_DevonCorp_2F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/RustboroCity_DevonCorp_2F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc index 5e4dc392b..f3954aed0 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc @@ -1,5 +1,5 @@ RustboroCity_DevonCorp_2F: @ 8483360 - .4byte RustboroCity_DevonCorp_2F_MapAttributes + .4byte RustboroCity_DevonCorp_2F_Layout .4byte RustboroCity_DevonCorp_2F_MapEvents .4byte RustboroCity_DevonCorp_2F_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.bin b/data/maps/RustboroCity_DevonCorp_2F/map.bin deleted file mode 100644 index 03985c572..000000000 --- a/data/maps/RustboroCity_DevonCorp_2F/map.bin +++ /dev/null @@ -1 +0,0 @@ -šŠ‹Œˆ‰ˆ‰ˆ‰ˆ‰ˆŠ‹Œ‰ˆ› ’“”‘‘‘‘•–—‘¡3333333333333333333€3€3€3€3£3¤3€3€3£3¤3€3€3£3¤3€3€3337¥7¦7€3€3«7¬7€3€3«7¬7€3€3«7¬7€3€3€33§3­7®7€3€3§37€3€3§3€3€3€3§3€3€3€3€33€3§3§3€3€3£3¤3€3€3£3¤3€3€3£3¤3€3€3€33€3€3€3€3€3«7¬7€3€3«7¬7€3€3«7¬7€3€3€33€3€3€3€3€3§3€3€3€3§3€3€3€3§3€3€3€3€3 \ No newline at end of file diff --git a/data/maps/RustboroCity_DevonCorp_3F/border.bin b/data/maps/RustboroCity_DevonCorp_3F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/RustboroCity_DevonCorp_3F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc index 54ae910d3..c0bbdebd1 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc @@ -1,5 +1,5 @@ RustboroCity_DevonCorp_3F: @ 848337C - .4byte RustboroCity_DevonCorp_3F_MapAttributes + .4byte RustboroCity_DevonCorp_3F_Layout .4byte RustboroCity_DevonCorp_3F_MapEvents .4byte RustboroCity_DevonCorp_3F_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.bin b/data/maps/RustboroCity_DevonCorp_3F/map.bin deleted file mode 100644 index 5a55ee4ab..000000000 --- a/data/maps/RustboroCity_DevonCorp_3F/map.bin +++ /dev/null @@ -1 +0,0 @@ -ˆŠ‹Œˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ•–—‘‘IJK‘‘‘‘33333333Q3R3S3333333333€3€3€3€3€€3¸3¹3¹3¹3º3€3€3€3¸3º3€€33Ý2€3€3€3HC€ÀÁÁÁ€3€3€3ÀÂÿB€33å€3€3€3PC€»¼¼¼½€3€3€3»½C€33Ý2€3€3€¨C€ÃÄÄÄÅ€3€3€3ÃÅ©C€3å€3€3€3€€3¾3Æ3Æ3Æ3¿3€3€3€3¾3¿3€€33€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3 \ No newline at end of file diff --git a/data/maps/RustboroCity_Flat1_1F/border.bin b/data/maps/RustboroCity_Flat1_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/RustboroCity_Flat1_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc index ede158338..4f424b853 100644 --- a/data/maps/RustboroCity_Flat1_1F/header.inc +++ b/data/maps/RustboroCity_Flat1_1F/header.inc @@ -1,5 +1,5 @@ RustboroCity_Flat1_1F: @ 8483424 - .4byte RustboroCity_Flat1_1F_MapAttributes + .4byte RustboroCity_Flat1_1F_Layout .4byte RustboroCity_Flat1_1F_MapEvents .4byte RustboroCity_Flat1_1F_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_Flat1_1F/map.bin b/data/maps/RustboroCity_Flat1_1F/map.bin deleted file mode 100644 index 017298e71..000000000 --- a/data/maps/RustboroCity_Flat1_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -8()*:888:8x88:H0 2B@@@B@€VWBP3+3+3+3+3+3+3+3+3+3ˆ3^3_3+3+3D3,3,3,3,3,3,3{3|3|3|3|3}3+3h7i7,3,3,3,3,3ƒ3á2H6I6â2…3+3p7q7E3,3,3,3,3ƒ3>2P6Q6â2…3F3G3,3,3,3,3,3,3‹3Œ3Œ3Œ3Œ33N7O7,3,3,3,3LM,3,3,3,3,3,3 \ No newline at end of file diff --git a/data/maps/RustboroCity_Flat1_2F/border.bin b/data/maps/RustboroCity_Flat1_2F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/RustboroCity_Flat1_2F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc index c1a83cdbb..49e5c1481 100644 --- a/data/maps/RustboroCity_Flat1_2F/header.inc +++ b/data/maps/RustboroCity_Flat1_2F/header.inc @@ -1,5 +1,5 @@ RustboroCity_Flat1_2F: @ 8483440 - .4byte RustboroCity_Flat1_2F_MapAttributes + .4byte RustboroCity_Flat1_2F_Layout .4byte RustboroCity_Flat1_2F_MapEvents .4byte RustboroCity_Flat1_2F_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_Flat1_2F/map.bin b/data/maps/RustboroCity_Flat1_2F/map.bin deleted file mode 100644 index 936907d32..000000000 --- a/data/maps/RustboroCity_Flat1_2F/map.bin +++ /dev/null @@ -1 +0,0 @@ -8()*:888:8888:@02B@@@BT7UIB+3+3+3+3+3+3+3+3+3\3?3]3Q3+3+3,3,3,3,3,3,3,3,3,3,3,3,3,3+3D3~77Ž7E3,3{|||},3,3+3,3†7‡77E3,3ƒ:2!7/3…,3,3+3G3G3,3,3,3,3ƒ„3¶ý3…,3,3+3O7O7,3,3,3,3‹ŒŒŒ,3,3 \ No newline at end of file diff --git a/data/maps/RustboroCity_Flat2_1F/border.bin b/data/maps/RustboroCity_Flat2_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/RustboroCity_Flat2_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc index 14d40b97a..4080980a0 100644 --- a/data/maps/RustboroCity_Flat2_1F/header.inc +++ b/data/maps/RustboroCity_Flat2_1F/header.inc @@ -1,5 +1,5 @@ RustboroCity_Flat2_1F: @ 84834B0 - .4byte RustboroCity_Flat2_1F_MapAttributes + .4byte RustboroCity_Flat2_1F_Layout .4byte RustboroCity_Flat2_1F_MapEvents .4byte RustboroCity_Flat2_1F_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_Flat2_1F/map.bin b/data/maps/RustboroCity_Flat2_1F/map.bin deleted file mode 100644 index 0f6829f9c..000000000 Binary files a/data/maps/RustboroCity_Flat2_1F/map.bin and /dev/null differ diff --git a/data/maps/RustboroCity_Flat2_2F/border.bin b/data/maps/RustboroCity_Flat2_2F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/RustboroCity_Flat2_2F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc index 989069c30..d4ad99dbc 100644 --- a/data/maps/RustboroCity_Flat2_2F/header.inc +++ b/data/maps/RustboroCity_Flat2_2F/header.inc @@ -1,5 +1,5 @@ RustboroCity_Flat2_2F: @ 84834CC - .4byte RustboroCity_Flat2_2F_MapAttributes + .4byte RustboroCity_Flat2_2F_Layout .4byte RustboroCity_Flat2_2F_MapEvents .4byte RustboroCity_Flat2_2F_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_Flat2_2F/map.bin b/data/maps/RustboroCity_Flat2_2F/map.bin deleted file mode 100644 index 9f3750fb4..000000000 Binary files a/data/maps/RustboroCity_Flat2_2F/map.bin and /dev/null differ diff --git a/data/maps/RustboroCity_Flat2_3F/border.bin b/data/maps/RustboroCity_Flat2_3F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/RustboroCity_Flat2_3F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc index d531fcf98..90918421f 100644 --- a/data/maps/RustboroCity_Flat2_3F/header.inc +++ b/data/maps/RustboroCity_Flat2_3F/header.inc @@ -1,5 +1,5 @@ RustboroCity_Flat2_3F: @ 84834E8 - .4byte RustboroCity_Flat2_3F_MapAttributes + .4byte RustboroCity_Flat2_3F_Layout .4byte RustboroCity_Flat2_3F_MapEvents .4byte RustboroCity_Flat2_3F_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_Flat2_3F/map.bin b/data/maps/RustboroCity_Flat2_3F/map.bin deleted file mode 100644 index 2112fe799..000000000 Binary files a/data/maps/RustboroCity_Flat2_3F/map.bin and /dev/null differ diff --git a/data/maps/RustboroCity_Gym/border.bin b/data/maps/RustboroCity_Gym/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/RustboroCity_Gym/border.bin and /dev/null differ diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc index 4b49e1077..8aef6fe28 100644 --- a/data/maps/RustboroCity_Gym/header.inc +++ b/data/maps/RustboroCity_Gym/header.inc @@ -1,5 +1,5 @@ RustboroCity_Gym: @ 8483398 - .4byte RustboroCity_Gym_MapAttributes + .4byte RustboroCity_Gym_Layout .4byte RustboroCity_Gym_MapEvents .4byte RustboroCity_Gym_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_Gym/map.bin b/data/maps/RustboroCity_Gym/map.bin deleted file mode 100644 index 4451674a7..000000000 --- a/data/maps/RustboroCity_Gym/map.bin +++ /dev/null @@ -1,2 +0,0 @@ - '226 2 -2 2 6222226222622722222222222222222222222#/22 !!!!!!"#22()))))"#2272022,2.22 "#222#/2 "/2 "#22212(*2 "#2()*222-242%"#222.222(!!"#2 "/2272()"#2 $5222322 "+2()*/2(*/2(*227222272227222222222222222&/22222&/222272220027222 \ No newline at end of file diff --git a/data/maps/RustboroCity_House1/border.bin b/data/maps/RustboroCity_House1/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/RustboroCity_House1/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc index 49445724b..c921d3a5e 100644 --- a/data/maps/RustboroCity_House1/header.inc +++ b/data/maps/RustboroCity_House1/header.inc @@ -1,5 +1,5 @@ RustboroCity_House1: @ 848345C - .4byte RustboroCity_House1_MapAttributes + .4byte RustboroCity_House1_Layout .4byte RustboroCity_House1_MapEvents .4byte RustboroCity_House1_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_House1/map.bin b/data/maps/RustboroCity_House1/map.bin deleted file mode 100644 index a14fc0405..000000000 --- a/data/maps/RustboroCity_House1/map.bin +++ /dev/null @@ -1 +0,0 @@ -888188::88888CJK@@BB@TUICN7R3S363+3+3+3+3+3\3]3Q3N7+3,3,3,3,3,3,3,3{3|3|3}3,3+3,3D3~77Ž7E3,3ƒ3>2>2…3,3+3,3D3†7‡77,3,3‹3Œ3Œ33,3F3,3,3,3,3,3,3,3,3,3,3,3G3N7,3,3,3,3LM,3,3,3,3,3O7 \ No newline at end of file diff --git a/data/maps/RustboroCity_House2/border.bin b/data/maps/RustboroCity_House2/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/RustboroCity_House2/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc index ec04d74d9..6f4d6c02d 100644 --- a/data/maps/RustboroCity_House2/header.inc +++ b/data/maps/RustboroCity_House2/header.inc @@ -1,5 +1,5 @@ RustboroCity_House2: @ 8483494 - .4byte RustboroCity_House2_MapAttributes + .4byte RustboroCity_House_Layouts .4byte RustboroCity_House2_MapEvents .4byte RustboroCity_House2_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_House2/map.bin b/data/maps/RustboroCity_House2/map.bin deleted file mode 100644 index 5a53bbc77..000000000 --- a/data/maps/RustboroCity_House2/map.bin +++ /dev/null @@ -1 +0,0 @@ -yz89888819fg‚IA@@JKAno‰3Š3Q3+3+3+3R3S363+3v3w3+3,3,3{3|3|3|3|3}3,3,3,3+3,3,3ƒ3á2H^â2…3,3,3,3+3,3,3ƒ3á2PQâ2…3,3,3,3+3,3,3‹3Œ3Œ3Œ3Œ33,3,3,3F3,3,3,3,3,3,3,3,3,3,3G3N,3,3,3,3LM,3,3,3,3O \ No newline at end of file diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc index 9ffe65113..73b5d4a0b 100644 --- a/data/maps/RustboroCity_House3/header.inc +++ b/data/maps/RustboroCity_House3/header.inc @@ -1,5 +1,5 @@ RustboroCity_House3: @ 8483504 - .4byte RustboroCity_House3_MapAttributes + .4byte RustboroCity_House_Layouts .4byte RustboroCity_House3_MapEvents .4byte RustboroCity_House3_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc index be134394a..cb82a6500 100644 --- a/data/maps/RustboroCity_Mart/header.inc +++ b/data/maps/RustboroCity_Mart/header.inc @@ -1,5 +1,5 @@ RustboroCity_Mart: @ 8483408 - .4byte RustboroCity_Mart_MapAttributes + .4byte Mart_Layout .4byte RustboroCity_Mart_MapEvents .4byte RustboroCity_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc index fb88549f7..3db96f00d 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ RustboroCity_PokemonCenter_1F: @ 84833D0 - .4byte RustboroCity_PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte RustboroCity_PokemonCenter_1F_MapEvents .4byte RustboroCity_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc index 0acf68eaa..74f264702 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ RustboroCity_PokemonCenter_2F: @ 84833EC - .4byte RustboroCity_PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte RustboroCity_PokemonCenter_2F_MapEvents .4byte RustboroCity_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_PokemonSchool/border.bin b/data/maps/RustboroCity_PokemonSchool/border.bin deleted file mode 100644 index 8f857616b..000000000 --- a/data/maps/RustboroCity_PokemonSchool/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc index a3d257cfb..3d68afc48 100644 --- a/data/maps/RustboroCity_PokemonSchool/header.inc +++ b/data/maps/RustboroCity_PokemonSchool/header.inc @@ -1,5 +1,5 @@ RustboroCity_PokemonSchool: @ 84833B4 - .4byte RustboroCity_PokemonSchool_MapAttributes + .4byte RustboroCity_PokemonSchool_Layout .4byte RustboroCity_PokemonSchool_MapEvents .4byte RustboroCity_PokemonSchool_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_PokemonSchool/map.bin b/data/maps/RustboroCity_PokemonSchool/map.bin deleted file mode 100644 index 3f3b183d3..000000000 Binary files a/data/maps/RustboroCity_PokemonSchool/map.bin and /dev/null differ diff --git a/data/maps/RusturfTunnel/border.bin b/data/maps/RusturfTunnel/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/RusturfTunnel/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc index 0ce8c9e12..d4f1fdad5 100644 --- a/data/maps/RusturfTunnel/header.inc +++ b/data/maps/RusturfTunnel/header.inc @@ -1,5 +1,5 @@ RusturfTunnel: @ 8483F30 - .4byte RusturfTunnel_MapAttributes + .4byte RusturfTunnel_Layout .4byte RusturfTunnel_MapEvents .4byte RusturfTunnel_MapScripts .4byte 0x0 diff --git a/data/maps/RusturfTunnel/map.bin b/data/maps/RusturfTunnel/map.bin deleted file mode 100644 index 87ce9bc73..000000000 --- a/data/maps/RusturfTunnel/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -3!43!!!4222222@<A@<<<A22222222222222222222222222222222222222222222222222222222222222222                  -2222222223!!4222222222234@<<A3422222222222@A@A22222222222 PQR   3!422         @<A2223!!4      "22222222234@<<A342222222222   "@A   @A2222222222222 "  2222222222222      2222     PQR  342222            @A2222            222   PQR  3!4        3!4@<A           @<A \ No newline at end of file diff --git a/data/maps/SSTidalCorridor/border.bin b/data/maps/SSTidalCorridor/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/SSTidalCorridor/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc index 606d682ba..046eedc85 100644 --- a/data/maps/SSTidalCorridor/header.inc +++ b/data/maps/SSTidalCorridor/header.inc @@ -1,5 +1,5 @@ SSTidalCorridor: @ 8484F0C - .4byte SSTidalCorridor_MapAttributes + .4byte SSTidalCorridor_Layout .4byte SSTidalCorridor_MapEvents .4byte SSTidalCorridor_MapScripts .4byte 0x0 diff --git a/data/maps/SSTidalCorridor/map.bin b/data/maps/SSTidalCorridor/map.bin deleted file mode 100644 index f8cf1725d..000000000 --- a/data/maps/SSTidalCorridor/map.bin +++ /dev/null @@ -1 +0,0 @@ -¹¸¹¸¹¸¹¸¹¸¹¸¹¸¹¸¹ÁÀÁÀÁÀÁÀÁÀÁÀÁÀÁÀÁ»2»2»2»2»2»2»2»2»2»2»2»2»2»2»2´2 6¼2º2Â2Ä2Å2Ã2Ä2Å2Ã2Ä2Å2Ã2Ä2Æ2º2º2Ç2¼2º2011111111112¼2º2º2¼2º2011111111112¼2º2º2¼2º2011111111112¼2º2º2¼2º2011111111112¼2º2º2¼2º2%#$"#$"#$"#&¼2º2º2¼2º2-+6{*+6{*+6{*+6û¼2º2º2¼2º2½2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¿2º2º2 µ2º2º2º2º2º2º2º2º2º2º2º2º2º2º2º2º2 \ No newline at end of file diff --git a/data/maps/SSTidalLowerDeck/border.bin b/data/maps/SSTidalLowerDeck/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/SSTidalLowerDeck/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc index c1f883c84..3e2f5bacb 100644 --- a/data/maps/SSTidalLowerDeck/header.inc +++ b/data/maps/SSTidalLowerDeck/header.inc @@ -1,5 +1,5 @@ SSTidalLowerDeck: @ 8484F28 - .4byte SSTidalLowerDeck_MapAttributes + .4byte SSTidalLowerDeck_Layout .4byte SSTidalLowerDeck_MapEvents .4byte SSTidalLowerDeck_MapScripts .4byte 0x0 diff --git a/data/maps/SSTidalLowerDeck/map.bin b/data/maps/SSTidalLowerDeck/map.bin deleted file mode 100644 index 059ce30fe..000000000 --- a/data/maps/SSTidalLowerDeck/map.bin +++ /dev/null @@ -1 +0,0 @@ -©©©©©©©©©©©©©©©±±èê±±àê±±ëìí±±±2èê22èê2ëìí2222 2ðòî2 2ðòî2 2óôõî2 2 2 22 2ç2ç2ö2 2ç2ç2ö2 2ç2ç2ç2ö2 2 2 22à2á2â2à2á2â2 2ã2å2 2ã2ä2å2 2 2 22ëìíèéêî2èêî2ëìíî2 2 22óôõðñòî2ðòî2óôõî2 2 22ç2ç2ç2ç2ç2ç2ö2ç2ç2ö2ç2ç2ç2ö2 2 22 2 2 2 2 2 2 2 2 2 2 2 2 2 2à2â22à2á2â2à2á2â2 2à2â2 2ã2å2 2 2èê2èéêèéêî2ðòî2óõî2 2ã6å6ðñòðñòî2ç2ç2ö2ç2ç2ö2 2óõ \ No newline at end of file diff --git a/data/maps/SSTidalRooms/border.bin b/data/maps/SSTidalRooms/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/SSTidalRooms/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc index 09bfb8652..c5f0aaa00 100644 --- a/data/maps/SSTidalRooms/header.inc +++ b/data/maps/SSTidalRooms/header.inc @@ -1,5 +1,5 @@ SSTidalRooms: @ 8484F44 - .4byte SSTidalRooms_MapAttributes + .4byte SSTidalRooms_Layout .4byte SSTidalRooms_MapEvents .4byte SSTidalRooms_MapScripts .4byte 0x0 diff --git a/data/maps/SSTidalRooms/map.bin b/data/maps/SSTidalRooms/map.bin deleted file mode 100644 index 6103ad0c2..000000000 --- a/data/maps/SSTidalRooms/map.bin +++ /dev/null @@ -1 +0,0 @@ -6@k•c–mE@k•c–mE@k•c–''@k•c–mE7>Hs—žuMHs—žuMHs—ž////—žuM?>PQ:2;2;2TUPQ:2;2;2TUPQ:2;2;2;2;2™š;2;2;2TU?>XY=28282\]XY=28282\]XY=282828282¡¢828282\]?>:;2<28282;2;2:;2<28282;2;2:2;2<282828282w682828282;2;2?>=2828282828282w68282VW8282=282`2VWa282=28282828282a2?>=2828282VW82=282`2^_a282=282`2^_a282=282828282VW?>=28282`2^_b=2828282828282=2828282b8282=2828282`2^_?6@klvlmElvllCDE@lvlvmE@kv'vmE7>Hst~tuMt~ttKij/t~t~uMHs~/~//?>PQ:2;2;2TU:2;2;2;2;2qr™6š6;2;2;2TUPQ:2;2;2;2|2?>XY=28282\]=2VW8282yz¡¢828282\]XY=2VppW?>:;2<28282;2|2=2^_a282;256=282828282;2;2h;2<2^xx_?>=2828282828282=2828282828282=2828282828282=28282`2828282?>=2828282828282=2828282828282=2828282828282=2828282828282?>=28282de8282=28282de8282=28282de8282=28282de8282? \ No newline at end of file diff --git a/data/maps/SafariZone_North/border.bin b/data/maps/SafariZone_North/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/SafariZone_North/border.bin +++ /dev/null @@ -1 +0,0 @@ -ÔÕÜÝ \ No newline at end of file diff --git a/data/maps/SafariZone_North/header.inc b/data/maps/SafariZone_North/header.inc index ce05b1eea..d7ad06ffa 100644 --- a/data/maps/SafariZone_North/header.inc +++ b/data/maps/SafariZone_North/header.inc @@ -1,5 +1,5 @@ SafariZone_North: @ 8485158 - .4byte SafariZone_North_MapAttributes + .4byte SafariZone_North_Layout .4byte SafariZone_North_MapEvents .4byte SafariZone_North_MapScripts .4byte SafariZone_North_MapConnections diff --git a/data/maps/SafariZone_North/map.bin b/data/maps/SafariZone_North/map.bin deleted file mode 100644 index 4f5296815..000000000 Binary files a/data/maps/SafariZone_North/map.bin and /dev/null differ diff --git a/data/maps/SafariZone_Northeast/border.bin b/data/maps/SafariZone_Northeast/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/SafariZone_Northeast/border.bin +++ /dev/null @@ -1 +0,0 @@ -ÔÕÜÝ \ No newline at end of file diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc index e5efff7b6..58685eafe 100644 --- a/data/maps/SafariZone_Northeast/header.inc +++ b/data/maps/SafariZone_Northeast/header.inc @@ -1,5 +1,5 @@ SafariZone_Northeast: @ 848528C - .4byte SafariZone_Northeast_MapAttributes + .4byte SafariZone_Northeast_Layout .4byte SafariZone_Northeast_MapEvents .4byte SafariZone_Northeast_MapScripts .4byte SafariZone_Northeast_MapConnections diff --git a/data/maps/SafariZone_Northeast/map.bin b/data/maps/SafariZone_Northeast/map.bin deleted file mode 100644 index 9a8803a6a..000000000 Binary files a/data/maps/SafariZone_Northeast/map.bin and /dev/null differ diff --git a/data/maps/SafariZone_Northwest/border.bin b/data/maps/SafariZone_Northwest/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/SafariZone_Northwest/border.bin +++ /dev/null @@ -1 +0,0 @@ -ÔÕÜÝ \ No newline at end of file diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc index 810826106..81718dc65 100644 --- a/data/maps/SafariZone_Northwest/header.inc +++ b/data/maps/SafariZone_Northwest/header.inc @@ -1,5 +1,5 @@ SafariZone_Northwest: @ 848513C - .4byte SafariZone_Northwest_MapAttributes + .4byte SafariZone_Northwest_Layout .4byte SafariZone_Northwest_MapEvents .4byte SafariZone_Northwest_MapScripts .4byte SafariZone_Northwest_MapConnections diff --git a/data/maps/SafariZone_Northwest/map.bin b/data/maps/SafariZone_Northwest/map.bin deleted file mode 100644 index 1825a1c92..000000000 Binary files a/data/maps/SafariZone_Northwest/map.bin and /dev/null differ diff --git a/data/maps/SafariZone_RestHouse/border.bin b/data/maps/SafariZone_RestHouse/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/SafariZone_RestHouse/border.bin and /dev/null differ diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc index 591de9fc1..92488b12d 100644 --- a/data/maps/SafariZone_RestHouse/header.inc +++ b/data/maps/SafariZone_RestHouse/header.inc @@ -1,5 +1,5 @@ SafariZone_RestHouse: @ 8485270 - .4byte SafariZone_RestHouse_MapAttributes + .4byte SafariZone_RestHouse_Layout .4byte SafariZone_RestHouse_MapEvents .4byte SafariZone_RestHouse_MapScripts .4byte 0x0 diff --git a/data/maps/SafariZone_RestHouse/map.bin b/data/maps/SafariZone_RestHouse/map.bin deleted file mode 100644 index c57c99c7b..000000000 --- a/data/maps/SafariZone_RestHouse/map.bin +++ /dev/null @@ -1 +0,0 @@ -        $2$2$2$2$2$2$2$2$2$292#242è6ê6<2#2#2#2#292#242ð6ò6<2#2#2#2#292#2#2#2#2#2#2#2#2#292#2#2 #2#2#2#2#2 \ No newline at end of file diff --git a/data/maps/SafariZone_South/border.bin b/data/maps/SafariZone_South/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/SafariZone_South/border.bin +++ /dev/null @@ -1 +0,0 @@ -ÔÕÜÝ \ No newline at end of file diff --git a/data/maps/SafariZone_South/header.inc b/data/maps/SafariZone_South/header.inc index 58239408f..3ffd068c2 100644 --- a/data/maps/SafariZone_South/header.inc +++ b/data/maps/SafariZone_South/header.inc @@ -1,5 +1,5 @@ SafariZone_South: @ 8485190 - .4byte SafariZone_South_MapAttributes + .4byte SafariZone_South_Layout .4byte SafariZone_South_MapEvents .4byte SafariZone_South_MapScripts .4byte SafariZone_South_MapConnections diff --git a/data/maps/SafariZone_South/map.bin b/data/maps/SafariZone_South/map.bin deleted file mode 100644 index 50497b503..000000000 Binary files a/data/maps/SafariZone_South/map.bin and /dev/null differ diff --git a/data/maps/SafariZone_Southeast/border.bin b/data/maps/SafariZone_Southeast/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/SafariZone_Southeast/border.bin +++ /dev/null @@ -1 +0,0 @@ -ÔÕÜÝ \ No newline at end of file diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc index 56e8aa094..438d3ea7f 100644 --- a/data/maps/SafariZone_Southeast/header.inc +++ b/data/maps/SafariZone_Southeast/header.inc @@ -1,5 +1,5 @@ SafariZone_Southeast: @ 84852A8 - .4byte SafariZone_Southeast_MapAttributes + .4byte SafariZone_Southeast_Layout .4byte SafariZone_Southeast_MapEvents .4byte SafariZone_Southeast_MapScripts .4byte SafariZone_Southeast_MapConnections diff --git a/data/maps/SafariZone_Southeast/map.bin b/data/maps/SafariZone_Southeast/map.bin deleted file mode 100644 index a778b8797..000000000 Binary files a/data/maps/SafariZone_Southeast/map.bin and /dev/null differ diff --git a/data/maps/SafariZone_Southwest/border.bin b/data/maps/SafariZone_Southwest/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/SafariZone_Southwest/border.bin +++ /dev/null @@ -1 +0,0 @@ -ÔÕÜÝ \ No newline at end of file diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc index 3eaf59e98..5cff316ae 100644 --- a/data/maps/SafariZone_Southwest/header.inc +++ b/data/maps/SafariZone_Southwest/header.inc @@ -1,5 +1,5 @@ SafariZone_Southwest: @ 8485174 - .4byte SafariZone_Southwest_MapAttributes + .4byte SafariZone_Southwest_Layout .4byte SafariZone_Southwest_MapEvents .4byte SafariZone_Southwest_MapScripts .4byte SafariZone_Southwest_MapConnections diff --git a/data/maps/SafariZone_Southwest/map.bin b/data/maps/SafariZone_Southwest/map.bin deleted file mode 100644 index 0074b6e55..000000000 Binary files a/data/maps/SafariZone_Southwest/map.bin and /dev/null differ diff --git a/data/maps/ScorchedSlab/border.bin b/data/maps/ScorchedSlab/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/ScorchedSlab/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc index e9b0a7b7e..543f83ebb 100644 --- a/data/maps/ScorchedSlab/header.inc +++ b/data/maps/ScorchedSlab/header.inc @@ -1,5 +1,5 @@ ScorchedSlab: @ 84846BC - .4byte ScorchedSlab_MapAttributes + .4byte ScorchedSlab_Layout .4byte ScorchedSlab_MapEvents .4byte ScorchedSlab_MapScripts .4byte 0x0 diff --git a/data/maps/ScorchedSlab/map.bin b/data/maps/ScorchedSlab/map.bin deleted file mode 100644 index edbd982ee..000000000 --- a/data/maps/ScorchedSlab/map.bin +++ /dev/null @@ -1 +0,0 @@ -222222222222222222222222222222222‰‘‘‘‘‘Šppppp‰’ppppppˆŠpppppppˆŠpppppppˆŠpppppppˆŠpppppppˆŠpppppppˆŠpppƒpppˆGG^^‹Œ„^^GGG          $G \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Entrance/border.bin b/data/maps/SeafloorCavern_Entrance/border.bin deleted file mode 100644 index f0eabd248..000000000 --- a/data/maps/SeafloorCavern_Entrance/border.bin +++ /dev/null @@ -1 +0,0 @@ -ññññ \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc index be05d04fa..3e26232dc 100644 --- a/data/maps/SeafloorCavern_Entrance/header.inc +++ b/data/maps/SeafloorCavern_Entrance/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Entrance: @ 84841B4 - .4byte SeafloorCavern_Entrance_MapAttributes + .4byte SeafloorCavern_Entrance_Layout .4byte SeafloorCavern_Entrance_MapEvents .4byte SeafloorCavern_Entrance_MapScripts .4byte 0x0 diff --git a/data/maps/SeafloorCavern_Entrance/map.bin b/data/maps/SeafloorCavern_Entrance/map.bin deleted file mode 100644 index f41e6e77d..000000000 --- a/data/maps/SeafloorCavern_Entrance/map.bin +++ /dev/null @@ -1,11 +0,0 @@ -ññññññëùùþÿùùìñññññññññëùëù3ùìùìñññññññ ëù $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$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$1$1$1Ž1¦1¦1¦11$1$1$1$1$1 -ñ $1$1$1Ž1¦1§1ž1ž1ž1¥1¦11$1$1$1 -ñ $1$1Ž1§1ž1ž1ž1ž1ž1ž1ž1¥11$1$1 -ñ $1Ž1§1ž1¤¾¾¾¾¾£ž1¥11$1 -ñ Ž1§1ž1¤¿ppppp½£ž11$1 -ñ Ÿ1ž1¤¿ppppppp½£¥11 -ñ §1ž1·pppppppppµž11 -ñ ž1ž1·pppppppppµž11 -ñô§ž1·ppVVVVpppµ¯—óóñññ§·pV””””Vp˜ñññññññ™V””””V˜ñññññññññññññññññ \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room1/border.bin b/data/maps/SeafloorCavern_Room1/border.bin deleted file mode 100644 index f0eabd248..000000000 --- a/data/maps/SeafloorCavern_Room1/border.bin +++ /dev/null @@ -1 +0,0 @@ -ññññ \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc index 094095d7e..29a75081f 100644 --- a/data/maps/SeafloorCavern_Room1/header.inc +++ b/data/maps/SeafloorCavern_Room1/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room1: @ 84841D0 - .4byte SeafloorCavern_Room1_MapAttributes + .4byte SeafloorCavern_Room1_Layout .4byte SeafloorCavern_Room1_MapEvents .4byte SeafloorCavern_Room1_MapScripts .4byte 0x0 diff --git a/data/maps/SeafloorCavern_Room1/map.bin b/data/maps/SeafloorCavern_Room1/map.bin deleted file mode 100644 index 57cd82f78..000000000 --- a/data/maps/SeafloorCavern_Room1/map.bin +++ /dev/null @@ -1 +0,0 @@ -ññññññññññññññññññññññëùùþÿùùùùùùìñ2ñ2ñ2ññññòñë3ì22222øìñ2ñ2ññññòñò222ð222222øìñ2ññññòñò222øù2ì2222ðñ2ññññòñòí22222øì222ðñ2ññññòñôêï622222øì22øìññññòññò÷6222222ð222ðññññòññôéééééê2ð222øìñññòëùùìññññò2ð222íðñññòò22øùùùùú2øì222øìññòò2222222222ð222íðññòò22èé6é6é6é6ê2íð2222ðññòò22ðñ6ñ6ñ6ñ6ò22ð22<22ðññòò2èó6ñ6ñ6ñ6ñ6ò22ðåæçóññòò2ðñ6ñ6ëùùú22ððññññññòò2øùùú22222ððññññññòò2222222èééôðññññññòò2222222ðñññðññññññòôåæçééééóñññðññññññóééééééééééééóññññ \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room2/border.bin b/data/maps/SeafloorCavern_Room2/border.bin deleted file mode 100644 index f0eabd248..000000000 --- a/data/maps/SeafloorCavern_Room2/border.bin +++ /dev/null @@ -1 +0,0 @@ -ññññ \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc index ebbfc58bc..749b4b9ee 100644 --- a/data/maps/SeafloorCavern_Room2/header.inc +++ b/data/maps/SeafloorCavern_Room2/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room2: @ 84841EC - .4byte SeafloorCavern_Room2_MapAttributes + .4byte SeafloorCavern_Room2_Layout .4byte SeafloorCavern_Room2_MapEvents .4byte SeafloorCavern_Room2_MapScripts .4byte 0x0 diff --git a/data/maps/SeafloorCavern_Room2/map.bin b/data/maps/SeafloorCavern_Room2/map.bin deleted file mode 100644 index 72a064870..000000000 --- a/data/maps/SeafloorCavern_Room2/map.bin +++ /dev/null @@ -1,7 +0,0 @@ -ññëùþÿìëþÿÿìñññññ ë3ìøúë3ìøìññññ ò222øùùú22øì -ññññ ò2222222222ð -ñññëò2èê2èê2èê2ð -ñññ ëú2øú2ðò2øú2ð -ñññ ò22222øú2222ð -ñññ ò222222222èéé -ñññ òf2èéééåæçéééñññ ò22øùìñññééñññññ ò2222ðéééñññññññóéåæçéóóñññññññññ \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room3/border.bin b/data/maps/SeafloorCavern_Room3/border.bin deleted file mode 100644 index f0eabd248..000000000 --- a/data/maps/SeafloorCavern_Room3/border.bin +++ /dev/null @@ -1 +0,0 @@ -ññññ \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc index 56dd1c14b..4ef0565be 100644 --- a/data/maps/SeafloorCavern_Room3/header.inc +++ b/data/maps/SeafloorCavern_Room3/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room3: @ 8484208 - .4byte SeafloorCavern_Room3_MapAttributes + .4byte SeafloorCavern_Room3_Layout .4byte SeafloorCavern_Room3_MapEvents .4byte SeafloorCavern_Room3_MapScripts .4byte 0x0 diff --git a/data/maps/SeafloorCavern_Room3/map.bin b/data/maps/SeafloorCavern_Room3/map.bin deleted file mode 100644 index 01d18c73c..000000000 --- a/data/maps/SeafloorCavern_Room3/map.bin +++ /dev/null @@ -1 +0,0 @@ -ñ6ñ6ñ6ñ6ëùùþÿùùìñ6ñ6ñ6ñ6ñ6ñ6ñ6òëùù3ùìðñ6ñ6ñ6ñ6ñ6ñ6ëúò22222ðìñ6ñ6ñ6ñ6ñ6òñ6ò22222ìùìñ6ñ6ñ6òëú222222ìñ6ðñ6ñ6ñ6òò22222222ìðñ6ñ6ñ6òò222èéê222ððñ6ñ6ñ6òò222ðñ6ò222ððëùùò222ðñ6ò222ððòëùùú222ðñ6ò222ððòò222222øùú222ððòò222222222222ððòò222222222222ððòòQQQM22222222ððòò22222èåæçéééôðòò22222ðééééééôôôéåæçéôôñ6ñ6ñ6ñ6ñ6ñ6ñ6 \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room4/border.bin b/data/maps/SeafloorCavern_Room4/border.bin deleted file mode 100644 index f0eabd248..000000000 --- a/data/maps/SeafloorCavern_Room4/border.bin +++ /dev/null @@ -1 +0,0 @@ -ññññ \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc index 1f710ac3a..0edd39d4a 100644 --- a/data/maps/SeafloorCavern_Room4/header.inc +++ b/data/maps/SeafloorCavern_Room4/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room4: @ 8484224 - .4byte SeafloorCavern_Room4_MapAttributes + .4byte SeafloorCavern_Room4_Layout .4byte SeafloorCavern_Room4_MapEvents .4byte SeafloorCavern_Room4_MapScripts .4byte 0x0 diff --git a/data/maps/SeafloorCavern_Room4/map.bin b/data/maps/SeafloorCavern_Room4/map.bin deleted file mode 100644 index 928749c95..000000000 --- a/data/maps/SeafloorCavern_Room4/map.bin +++ /dev/null @@ -1 +0,0 @@ -ëùùþÿùùùùùùþÿùùìòëù3ìññññë3ìñ6ðòò2222ðññññò222ðñ6ðòò2222ðññññò222ðñ6ðòòLQQMøùùùùú222ðñ6ðòò2222222292222øìðòò22222222922222ððòò22222èééôê2222ððòò2222èðñ6ñ6ñ6òê222ððòò2222ðøþÿúò222ððòò2222øù3ùú222ððòò22222922222222ððòôéê2229222222èéôðòññôééééêLQQQMðññðôéñññññò22222ðññðññôéñññò22222ðññðññññôéñôåæçééôññðññññññòññññññññéôññññññôééééééééôññ \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room5/border.bin b/data/maps/SeafloorCavern_Room5/border.bin deleted file mode 100644 index f0eabd248..000000000 --- a/data/maps/SeafloorCavern_Room5/border.bin +++ /dev/null @@ -1 +0,0 @@ -ññññ \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc index 8f9edd756..013f447dc 100644 --- a/data/maps/SeafloorCavern_Room5/header.inc +++ b/data/maps/SeafloorCavern_Room5/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room5: @ 8484240 - .4byte SeafloorCavern_Room5_MapAttributes + .4byte SeafloorCavern_Room5_Layout .4byte SeafloorCavern_Room5_MapEvents .4byte SeafloorCavern_Room5_MapScripts .4byte 0x0 diff --git a/data/maps/SeafloorCavern_Room5/map.bin b/data/maps/SeafloorCavern_Room5/map.bin deleted file mode 100644 index 386430fe4..000000000 --- a/data/maps/SeafloorCavern_Room5/map.bin +++ /dev/null @@ -1 +0,0 @@ -ñëùþÿùùùùùìñññññññññòë3ùùùùìðññ‰‘‘‘ññòò2222222ððññŠ“““ˆññòò2222222ððññŠ“““ˆññóóéééê222ððññó󂓈ñ‰‘ñññòê22ðøùùù슓ˆñŠ“ˆñëùúò22øùùùìðóóóñóóóñòëùú222222ððñññññëùùúò22222222ðøùùùìñòëùùú222èéê22øùùùìðñòò22222èðñòê22222ððñòò22222ððñòò22222ððñòò22èéêððñòò22222ððñòò22ðòððñóóéåæçéóóñòò2èóòðøùìññññ‰‘‘ñòò2øùùúøùìðñññ‰’““ˆñòò2222222ððñ‰‘’“““ˆñòò2222222ððñŠ““““€óñóóéééåæçéóóñó‚“€óóñññññññññññññññóóóñññ \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room6/border.bin b/data/maps/SeafloorCavern_Room6/border.bin deleted file mode 100644 index a00c39057..000000000 --- a/data/maps/SeafloorCavern_Room6/border.bin +++ /dev/null @@ -1 +0,0 @@ -~~~~ \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc index e1aab7b08..9bbb14463 100644 --- a/data/maps/SeafloorCavern_Room6/header.inc +++ b/data/maps/SeafloorCavern_Room6/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room6: @ 848425C - .4byte SeafloorCavern_Room6_MapAttributes + .4byte SeafloorCavern_Room6_Layout .4byte SeafloorCavern_Room6_MapEvents .4byte SeafloorCavern_Room6_MapScripts .4byte 0x0 diff --git a/data/maps/SeafloorCavern_Room6/map.bin b/data/maps/SeafloorCavern_Room6/map.bin deleted file mode 100644 index 452263326..000000000 --- a/data/maps/SeafloorCavern_Room6/map.bin +++ /dev/null @@ -1 +0,0 @@ -‰ŠŽz‘2’Žxzzy2y2y2y2€‰‰‰‰‰‰‰‰‰‰‰‰‰‰xxzzy2y2y2y2pŒ‹‹‹‹‹‹‹‹‹‹‹‹’xxzzy2y2y2y2pŒpppppppppppƒ’xxzzy2y2y2y2pŒpppÃvvvÅpppƒ’xxzz€‰‰‰˜pŒppu~~~—wppƒ’xxzzpppppŒpp}€ˆ‰Š‚ppƒ’xxzzpp„„„Œpp…††‘††‡ppƒ’xxzzpƒpppŒpppppƒpppp„ƒ’xxzzpƒpppŒp„„„„ƒppppƒƒ’xxzzpƒpppŒpƒpppppŒ‹‹pƒ’xxzzpƒpŒ‹p„ƒŒ‹‹‹‹‹ppƒp’xxzzpƒpŒpŒppŒpppppppƒp’xxzzpƒpŒpŒpp„„„Œppppƒp’xxzzpƒpŒpŒpppppŒppppƒp’xxzzpƒpŒpŒpppp„p„„„„ƒp’xxzzpƒpŒpŒppppƒ„„„„ƒpp’xxzzpƒpŒp„„„„„ƒppppppp’xxzzpƒ‹‹ppƒpppƒpppppÃvvvvzzpppppÃœo2o2o2›vÅpÃvv~~~~vvvvvvvvvz~2–2~2x~vvv~~~~~~~~~~~~~~~”˜™š“~~~~~~~~~~ \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room7/border.bin b/data/maps/SeafloorCavern_Room7/border.bin deleted file mode 100644 index a00c39057..000000000 --- a/data/maps/SeafloorCavern_Room7/border.bin +++ /dev/null @@ -1 +0,0 @@ -~~~~ \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc index fd0b49c93..d4b0db267 100644 --- a/data/maps/SeafloorCavern_Room7/header.inc +++ b/data/maps/SeafloorCavern_Room7/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room7: @ 8484278 - .4byte SeafloorCavern_Room7_MapAttributes + .4byte SeafloorCavern_Room7_Layout .4byte SeafloorCavern_Room7_MapEvents .4byte SeafloorCavern_Room7_MapScripts .4byte 0x0 diff --git a/data/maps/SeafloorCavern_Room7/map.bin b/data/maps/SeafloorCavern_Room7/map.bin deleted file mode 100644 index 7fa1d903d..000000000 --- a/data/maps/SeafloorCavern_Room7/map.bin +++ /dev/null @@ -1 +0,0 @@ -ˆ‰ŠŽz‘2’Ž~6~6~6~6~6~6~6~6~6xzzy2y2y2y2y2y2y2y2y2y2x~6~6~6~6~6~6~6~6~6xzzy2y2y2y2y2€‰‰‰€Žxzz€‰‰‰‰˜pppš‰‰‰‰‰‰‰‰xxzzppppppppppppppppp’xxzzpŒ‹‹‹‹‹‹‹‹‹‹‹‹‹‹p’xxzzpŒpppppppppppppƒp’xxzzpŒŒ„„„„„„„„„„„„ƒp’xxzzpŒŒppppŒppppppppp’xxzzppŒpppp„„„„„„„„Œp’xxzzppŒppppppppppppŒp’xxzzŒpŒpp‹‹‹‹‹‹‹‹‹pŒp’xxzzŒpŒppŒ‹ppppppƒpŒp’xxzzŒpŒppŒƒppppppƒpŒp’xxzzŒp„„„Œƒ‹‹‹‹‹‹p„Œp’xxzzŒppppŒpppppppƒpŒp’xxzzŒppppŒpppppppƒpŒp’xxzzŒ‹‹‹‹‹‹‹‹‹pppƒ‹‹‹’xxz“6œ6q2ypppppppƒpppƒppp’xxzy6z6y2pppppppƒpppƒppp’xxzy6z6y2q2q2q2q2q2yppƒpppƒppp’xxz6‚6y2y2y2y2y2y2ppƒpppƒppp’xxzzy2•2y2y2sy2tpp„pppƒppp’xx””˜™š“““““vvvvvvvvvv“““ \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room8/border.bin b/data/maps/SeafloorCavern_Room8/border.bin deleted file mode 100644 index f0eabd248..000000000 --- a/data/maps/SeafloorCavern_Room8/border.bin +++ /dev/null @@ -1 +0,0 @@ -ññññ \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc index a5ecc196a..903e25a14 100644 --- a/data/maps/SeafloorCavern_Room8/header.inc +++ b/data/maps/SeafloorCavern_Room8/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room8: @ 8484294 - .4byte SeafloorCavern_Room8_MapAttributes + .4byte SeafloorCavern_Room8_Layout .4byte SeafloorCavern_Room8_MapEvents .4byte SeafloorCavern_Room8_MapScripts .4byte 0x0 diff --git a/data/maps/SeafloorCavern_Room8/map.bin b/data/maps/SeafloorCavern_Room8/map.bin deleted file mode 100644 index e70e95b47..000000000 --- a/data/maps/SeafloorCavern_Room8/map.bin +++ /dev/null @@ -1 +0,0 @@ -ññññññññññññëùùþÿùù6ìññòñë3ìñðññòëú222øìðññòò22222ððññòò22222ððññòò22222ððññòò22222ððññòò22222ððññòò22222ððññòò2LQM2ððññòò22222ððññòò22222ððññóóéåæçéôôñ \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room9/border.bin b/data/maps/SeafloorCavern_Room9/border.bin deleted file mode 100644 index f0eabd248..000000000 --- a/data/maps/SeafloorCavern_Room9/border.bin +++ /dev/null @@ -1 +0,0 @@ -ññññ \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc index 4df3870e6..0d43deb23 100644 --- a/data/maps/SeafloorCavern_Room9/header.inc +++ b/data/maps/SeafloorCavern_Room9/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room9: @ 84842B0 - .4byte SeafloorCavern_Room9_MapAttributes + .4byte SeafloorCavern_Room9_Layout .4byte SeafloorCavern_Room9_MapEvents .4byte SeafloorCavern_Room9_MapScripts .4byte 0x0 diff --git a/data/maps/SeafloorCavern_Room9/map.bin b/data/maps/SeafloorCavern_Room9/map.bin deleted file mode 100644 index 252112ac2..000000000 --- a/data/maps/SeafloorCavern_Room9/map.bin +++ /dev/null @@ -1 +0,0 @@ -ëùùùùùùùùùùùùùìññññññññññññòëùùùùùùùùùùùìðññññññññññññòòõ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2ðøùùìñññññññññòôéõ2õ2õ2õ2õ2õ2õ2õ2õ2øùùìðñññññññññòññòõ2ö2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2ððñññññññññôéêôåæçéõ2õ2õ2õ2õ2õ2õ2ððñññññññññññòñññññòõ2õ2õ2õ2õ2õ2õ2ððñññññññññññôééêññòëùù2ùùìðøìñññññññññññññòññòòõ2õ2õ2õ2õ2ððñðñññññññññññññòññòòõ2õ2õ2õ2õ2ððñøìññññññññññññòññòòõ2õ2õ2õ2õ2ðøìñðññññññññññññòñëúòëù2ùìðñðñðññññññññññññòñòëúòõ2õ2õ2ððñðñøìññññññññññëúñòòëúõ2õ2õ2ðøìøìñðññññññññññòññòòòõ2õ2õ2õ2øìðñðñøìññññññëùùúñëúòòõ2õ2õ2õ2õ2ððñðññðññññññòññññòëúò2ðøìðññðñññññùúñëùùúòëú222øìððññðññññññññòñññòò222ðððññðñññññëùùúñëùúò22222ðððññðñññññòññññòññò22222ððøùìøùùùùùòññëùúññò2ððññðññññññòñëúññëùú222ðøùìøùùùùùìúñòññëú222øùìøùùùùùìðùùúññò  222øùùùùìñððñëùùùú 222   ðñðøñò 2222222 ðñøùñò2222222222ðñññëú 2222222    #øùùìò 222    #ðò2222 #  ðò2222      ðò2222 #    ðò2222 ‰‘‘ ðò222 # ‰’OO ðò222‰‘’OOOO‘ðò222ŠpNOOOONpˆðò222ŠppNNNNppˆðò22222‰’ppppppppˆðò22222 Špppppppppˆðò22222222#2s2lppppppppˆðóóó222222222#2lpppppjs2s2$2ðñññóé22222222#2s2s2s2s2s2$2222ðñññóééé2222222222222ôôôñññññññññóééé222222ééôññññññññññññññññóééééééóññññññ \ No newline at end of file diff --git a/data/maps/SealedChamber_InnerRoom/border.bin b/data/maps/SealedChamber_InnerRoom/border.bin deleted file mode 100644 index 9afd13cdc..000000000 Binary files a/data/maps/SealedChamber_InnerRoom/border.bin and /dev/null differ diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc index 87b73cfa1..4a26587bc 100644 --- a/data/maps/SealedChamber_InnerRoom/header.inc +++ b/data/maps/SealedChamber_InnerRoom/header.inc @@ -1,5 +1,5 @@ SealedChamber_InnerRoom: @ 84846A0 - .4byte SealedChamber_InnerRoom_MapAttributes + .4byte SealedChamber_InnerRoom_Layout .4byte SealedChamber_InnerRoom_MapEvents .4byte SealedChamber_InnerRoom_MapScripts .4byte 0x0 diff --git a/data/maps/SealedChamber_InnerRoom/map.bin b/data/maps/SealedChamber_InnerRoom/map.bin deleted file mode 100644 index 823fa5fab..000000000 --- a/data/maps/SealedChamber_InnerRoom/map.bin +++ /dev/null @@ -1 +0,0 @@ -ñëùùùùùùùùùùùùùùùùùìññòëùùùùùùùùùùùùùùùìðñëúòëùùùùìñññëùùùùìðøìòëúò2222ðñññò2222ðøìðòòëú2222ø777ú2222øìððòòò222222222222222ðððòòò22èéê22222èéê22ðððòòò22ðñò22222ðñò22ðððòòò22ø7ú22222ø7ú22ðððòòò222222222222222ðððòòò222222222222222ðððòòòèéê222222222èéêðððòòòðñò222222222ðñòðððòòòø7ú222222222ø7úðððòòò222222222222222ðððòòò222222222222222ðððòòò22èéê22222èéê22ðððòòò22ðñò22222ðñò22ðððòòôê2ø7ú22222ø7ú2èóððòôò2222222222222ðóðôòôéééééåæçéééééóðóñòôéééééééééééééééóðññôéééééééééééééééééóñ \ No newline at end of file diff --git a/data/maps/SealedChamber_OuterRoom/border.bin b/data/maps/SealedChamber_OuterRoom/border.bin deleted file mode 100644 index 9afd13cdc..000000000 Binary files a/data/maps/SealedChamber_OuterRoom/border.bin and /dev/null differ diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc index fc55dd8d2..fd5fe39f3 100644 --- a/data/maps/SealedChamber_OuterRoom/header.inc +++ b/data/maps/SealedChamber_OuterRoom/header.inc @@ -1,5 +1,5 @@ SealedChamber_OuterRoom: @ 8484684 - .4byte SealedChamber_OuterRoom_MapAttributes + .4byte SealedChamber_OuterRoom_Layout .4byte SealedChamber_OuterRoom_MapEvents .4byte SealedChamber_OuterRoom_MapScripts .4byte 0x0 diff --git a/data/maps/SealedChamber_OuterRoom/map.bin b/data/maps/SealedChamber_OuterRoom/map.bin deleted file mode 100644 index bf1482f97..000000000 --- a/data/maps/SealedChamber_OuterRoom/map.bin +++ /dev/null @@ -1,11 +0,0 @@ -`*+,a)2324)222222222222222222222222222222    -2    -2  -555255525222222222222222    -2    -2  -555255525222222222222222    -2    -222255525552222222222222222222    -2    -22225552555222222222222222222222222€‰‰‰2222222222VVV’2222222222VGV’22222$ggggg_____ggggg#$                 #$$                 ## \ No newline at end of file diff --git a/data/maps/SecretBase_BlueCave1/border.bin b/data/maps/SecretBase_BlueCave1/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_BlueCave1/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc index 8914ffdc5..4e987702c 100644 --- a/data/maps/SecretBase_BlueCave1/header.inc +++ b/data/maps/SecretBase_BlueCave1/header.inc @@ -1,5 +1,5 @@ SecretBase_BlueCave1: @ 8484AC8 - .4byte SecretBase_BlueCave1_MapAttributes + .4byte SecretBase_BlueCave1_Layout .4byte SecretBase_BlueCave1_MapEvents .4byte SecretBase_BlueCave1_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_BlueCave1/map.bin b/data/maps/SecretBase_BlueCave1/map.bin deleted file mode 100644 index 371b2a8d5..000000000 --- a/data/maps/SecretBase_BlueCave1/map.bin +++ /dev/null @@ -1,50 +0,0 @@ -6 -2 -2 -2 -2 -2   6 -2 -22 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -26  -2 -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2 6 -2 -22 -2 -2 -2   \ No newline at end of file diff --git a/data/maps/SecretBase_BlueCave2/border.bin b/data/maps/SecretBase_BlueCave2/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_BlueCave2/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc index e36e3dc8e..ed22bbb04 100644 --- a/data/maps/SecretBase_BlueCave2/header.inc +++ b/data/maps/SecretBase_BlueCave2/header.inc @@ -1,5 +1,5 @@ SecretBase_BlueCave2: @ 8484B70 - .4byte SecretBase_BlueCave2_MapAttributes + .4byte SecretBase_BlueCave2_Layout .4byte SecretBase_BlueCave2_MapEvents .4byte SecretBase_BlueCave2_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_BlueCave2/map.bin b/data/maps/SecretBase_BlueCave2/map.bin deleted file mode 100644 index 4993e5b65..000000000 --- a/data/maps/SecretBase_BlueCave2/map.bin +++ /dev/null @@ -1,57 +0,0 @@ -  62 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 6 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 6 -2 -2 -2 -2 -22 -2 -2 -26  \ No newline at end of file diff --git a/data/maps/SecretBase_BlueCave3/border.bin b/data/maps/SecretBase_BlueCave3/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_BlueCave3/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc index a1cbd4c33..412d1f4af 100644 --- a/data/maps/SecretBase_BlueCave3/header.inc +++ b/data/maps/SecretBase_BlueCave3/header.inc @@ -1,5 +1,5 @@ SecretBase_BlueCave3: @ 8484C18 - .4byte SecretBase_BlueCave3_MapAttributes + .4byte SecretBase_BlueCave3_Layout .4byte SecretBase_BlueCave3_MapEvents .4byte SecretBase_BlueCave3_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_BlueCave3/map.bin b/data/maps/SecretBase_BlueCave3/map.bin deleted file mode 100644 index 968aade07..000000000 --- a/data/maps/SecretBase_BlueCave3/map.bin +++ /dev/null @@ -1,51 +0,0 @@ -  -2 -2 -2 -22 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2   -2 -2  -2 -2   -2 -2   -2 -222 -2 -2 -2 -2  -2   -2  -2   -2 -2 -22 -2   -2 -2   -2 6 -222   -2 -22 -2 -2   \ No newline at end of file diff --git a/data/maps/SecretBase_BlueCave4/border.bin b/data/maps/SecretBase_BlueCave4/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_BlueCave4/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc index 4fb353150..542df3954 100644 --- a/data/maps/SecretBase_BlueCave4/header.inc +++ b/data/maps/SecretBase_BlueCave4/header.inc @@ -1,5 +1,5 @@ SecretBase_BlueCave4: @ 8484CC0 - .4byte SecretBase_BlueCave4_MapAttributes + .4byte SecretBase_BlueCave4_Layout .4byte SecretBase_BlueCave4_MapEvents .4byte SecretBase_BlueCave4_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_BlueCave4/map.bin b/data/maps/SecretBase_BlueCave4/map.bin deleted file mode 100644 index 631ac0f81..000000000 --- a/data/maps/SecretBase_BlueCave4/map.bin +++ /dev/null @@ -1,57 +0,0 @@ -  -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -22   -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 6 -2 -2"6  #6  2  -2   6 -22   -2 -2 -2   -22 -2   \ No newline at end of file diff --git a/data/maps/SecretBase_BrownCave1/border.bin b/data/maps/SecretBase_BrownCave1/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_BrownCave1/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc index 57f27c823..aceddbfda 100644 --- a/data/maps/SecretBase_BrownCave1/header.inc +++ b/data/maps/SecretBase_BrownCave1/header.inc @@ -1,5 +1,5 @@ SecretBase_BrownCave1: @ 8484AAC - .4byte SecretBase_BrownCave1_MapAttributes + .4byte SecretBase_BrownCave1_Layout .4byte SecretBase_BrownCave1_MapEvents .4byte SecretBase_BrownCave1_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_BrownCave1/map.bin b/data/maps/SecretBase_BrownCave1/map.bin deleted file mode 100644 index 56d3436ca..000000000 --- a/data/maps/SecretBase_BrownCave1/map.bin +++ /dev/null @@ -1,54 +0,0 @@ -6 -2 -2 -2 -2 -2 -2 -2   -2 6 -2 -22 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -26 -2 -2 -2 -2 -2 -2 -2   -2 -2 -22 -2 -2 -2   \ No newline at end of file diff --git a/data/maps/SecretBase_BrownCave2/border.bin b/data/maps/SecretBase_BrownCave2/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_BrownCave2/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc index 3c8bf24d7..de95374ba 100644 --- a/data/maps/SecretBase_BrownCave2/header.inc +++ b/data/maps/SecretBase_BrownCave2/header.inc @@ -1,5 +1,5 @@ SecretBase_BrownCave2: @ 8484B54 - .4byte SecretBase_BrownCave2_MapAttributes + .4byte SecretBase_BrownCave2_Layout .4byte SecretBase_BrownCave2_MapEvents .4byte SecretBase_BrownCave2_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_BrownCave2/map.bin b/data/maps/SecretBase_BrownCave2/map.bin deleted file mode 100644 index 184896975..000000000 --- a/data/maps/SecretBase_BrownCave2/map.bin +++ /dev/null @@ -1,56 +0,0 @@ -  -2 -2 -2 -2 -2 -2 -2 -2 6   -26 -2 -2 -2 -2 -2 -22 -2   -2   -2 -2 -2 -2 -2 -2 -2 -2   -2   -2 -2 -2 -2 -2 -2 -2 -2   -2   -2 -2 -2 -2 -2 -2 -2 -2   -2   -2 -2 -2 -2 -2 -2 -2 2 6 -2 -2 -2 -2   \ No newline at end of file diff --git a/data/maps/SecretBase_BrownCave3/border.bin b/data/maps/SecretBase_BrownCave3/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_BrownCave3/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc index 78ebb6fd8..8535b1e89 100644 --- a/data/maps/SecretBase_BrownCave3/header.inc +++ b/data/maps/SecretBase_BrownCave3/header.inc @@ -1,5 +1,5 @@ SecretBase_BrownCave3: @ 8484BFC - .4byte SecretBase_BrownCave3_MapAttributes + .4byte SecretBase_BrownCave3_Layout .4byte SecretBase_BrownCave3_MapEvents .4byte SecretBase_BrownCave3_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_BrownCave3/map.bin b/data/maps/SecretBase_BrownCave3/map.bin deleted file mode 100644 index d9967522a..000000000 --- a/data/maps/SecretBase_BrownCave3/map.bin +++ /dev/null @@ -1,69 +0,0 @@ -  -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -26 -2 -2 -2 66 -2 -2 -2   -2 -2 -2 6   -2 -2 -2   -2 -2 -2 -2   -2 -2 -2   -2 -2 -2 -2  -2 -2 -2   -2 -2 -2 -2  2 -2 -2 -2   -2 -2 -2 -2   -2 -2 -2 -2   -2 -2 -2 -2   -2 -2 -2 -2   -22 -2 -2   \ No newline at end of file diff --git a/data/maps/SecretBase_BrownCave4/border.bin b/data/maps/SecretBase_BrownCave4/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_BrownCave4/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc index 4d92c301c..d73f38257 100644 --- a/data/maps/SecretBase_BrownCave4/header.inc +++ b/data/maps/SecretBase_BrownCave4/header.inc @@ -1,5 +1,5 @@ SecretBase_BrownCave4: @ 8484CA4 - .4byte SecretBase_BrownCave4_MapAttributes + .4byte SecretBase_BrownCave4_Layout .4byte SecretBase_BrownCave4_MapEvents .4byte SecretBase_BrownCave4_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_BrownCave4/map.bin b/data/maps/SecretBase_BrownCave4/map.bin deleted file mode 100644 index 8b5a763c4..000000000 --- a/data/maps/SecretBase_BrownCave4/map.bin +++ /dev/null @@ -1,70 +0,0 @@ -  62 -2 -2 -2 -2 -2 -2 -2"6 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2 -2#6 -2 -2   -2 -2 -2 -2   -2 -2 -2   -2   -2 -2 -2  -2   -2 -2 -2   -2 -2 -2 -22 -2   -2 -2 -2   -2 -2 -2 -2 -2 -2   -22 -2   -2 -2 -2 -2 -2 -2    -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2  \ No newline at end of file diff --git a/data/maps/SecretBase_RedCave1/border.bin b/data/maps/SecretBase_RedCave1/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_RedCave1/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc index 8e730661d..1cb6c4f5e 100644 --- a/data/maps/SecretBase_RedCave1/header.inc +++ b/data/maps/SecretBase_RedCave1/header.inc @@ -1,5 +1,5 @@ SecretBase_RedCave1: @ 8484A90 - .4byte SecretBase_RedCave1_MapAttributes + .4byte SecretBase_RedCave1_Layout .4byte SecretBase_RedCave1_MapEvents .4byte SecretBase_RedCave1_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_RedCave1/map.bin b/data/maps/SecretBase_RedCave1/map.bin deleted file mode 100644 index ce666b57d..000000000 --- a/data/maps/SecretBase_RedCave1/map.bin +++ /dev/null @@ -1,51 +0,0 @@ - -2 -2 -2 -2 -2 -2 -2   6 -2 -2 -2 -2 -2 -2 -2 6  -2 -2 -2 -2 -2 -2 -2 -26  -2 -2 -2 -2 -2 -22 -2   -2 -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2 6 -2 -22 -2 -2 -26  \ No newline at end of file diff --git a/data/maps/SecretBase_RedCave2/border.bin b/data/maps/SecretBase_RedCave2/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_RedCave2/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc index b86e69ecf..744e8b24e 100644 --- a/data/maps/SecretBase_RedCave2/header.inc +++ b/data/maps/SecretBase_RedCave2/header.inc @@ -1,5 +1,5 @@ SecretBase_RedCave2: @ 8484B38 - .4byte SecretBase_RedCave2_MapAttributes + .4byte SecretBase_RedCave2_Layout .4byte SecretBase_RedCave2_MapEvents .4byte SecretBase_RedCave2_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_RedCave2/map.bin b/data/maps/SecretBase_RedCave2/map.bin deleted file mode 100644 index 4fa03acfe..000000000 --- a/data/maps/SecretBase_RedCave2/map.bin +++ /dev/null @@ -1,42 +0,0 @@ -  -22 -2   -2 -2 -2   -2 -2 -2  -2 -2 -2  2 -2 -2 -2   -2 -2 -2 -2   -2 -2 -2 -2 6  -2 -2 -2 -2 6   -2 -2 -2 -2 -2   -2 -2 -2 -2 -2  -2 -2 -26 -26  -2  2   \ No newline at end of file diff --git a/data/maps/SecretBase_RedCave3/border.bin b/data/maps/SecretBase_RedCave3/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_RedCave3/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc index 9d4f26d36..c153e74c6 100644 --- a/data/maps/SecretBase_RedCave3/header.inc +++ b/data/maps/SecretBase_RedCave3/header.inc @@ -1,5 +1,5 @@ SecretBase_RedCave3: @ 8484BE0 - .4byte SecretBase_RedCave3_MapAttributes + .4byte SecretBase_RedCave3_Layout .4byte SecretBase_RedCave3_MapEvents .4byte SecretBase_RedCave3_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_RedCave3/map.bin b/data/maps/SecretBase_RedCave3/map.bin deleted file mode 100644 index 0528e565d..000000000 --- a/data/maps/SecretBase_RedCave3/map.bin +++ /dev/null @@ -1,47 +0,0 @@ -  -2 -22 -2   6 -2 -2 -2 -2   -2 -2 -2 -2   -2 -2 -2 -2 -2 6 -2 -2 -2 -2   -2 -2 -2 -2 -222 -22 -2 -2 -2 -2   -2 -2 -2 -2 -26 -2 -2 -2 -2   -2 -22 -2 -2 6 -2 -2 -2   \ No newline at end of file diff --git a/data/maps/SecretBase_RedCave4/border.bin b/data/maps/SecretBase_RedCave4/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_RedCave4/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc index 163780567..be475a7ad 100644 --- a/data/maps/SecretBase_RedCave4/header.inc +++ b/data/maps/SecretBase_RedCave4/header.inc @@ -1,5 +1,5 @@ SecretBase_RedCave4: @ 8484C88 - .4byte SecretBase_RedCave4_MapAttributes + .4byte SecretBase_RedCave4_Layout .4byte SecretBase_RedCave4_MapEvents .4byte SecretBase_RedCave4_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_RedCave4/map.bin b/data/maps/SecretBase_RedCave4/map.bin deleted file mode 100644 index 526763290..000000000 --- a/data/maps/SecretBase_RedCave4/map.bin +++ /dev/null @@ -1,56 +0,0 @@ -  -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 "66 #6 2   -2 -2 -2 -22 -2   -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 6  -22 -2 -2 -2 -2 6   -2 -2 -2  \ No newline at end of file diff --git a/data/maps/SecretBase_Shrub1/border.bin b/data/maps/SecretBase_Shrub1/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/SecretBase_Shrub1/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc index 8f5fd7198..6ab9f9d94 100644 --- a/data/maps/SecretBase_Shrub1/header.inc +++ b/data/maps/SecretBase_Shrub1/header.inc @@ -1,5 +1,5 @@ SecretBase_Shrub1: @ 8484B1C - .4byte SecretBase_Shrub1_MapAttributes + .4byte SecretBase_Shrub1_Layout .4byte SecretBase_Shrub1_MapEvents .4byte SecretBase_Shrub1_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_Shrub1/map.bin b/data/maps/SecretBase_Shrub1/map.bin deleted file mode 100644 index 4b566cc1b..000000000 --- a/data/maps/SecretBase_Shrub1/map.bin +++ /dev/null @@ -1,53 +0,0 @@ -  -2 -2  -2 -2 -2 -2   -2 -2 6 -22 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -26 -2 -2 -2 -2 -2 -2 -2   -2 -2 -22 -2 -2 -2   \ No newline at end of file diff --git a/data/maps/SecretBase_Shrub2/border.bin b/data/maps/SecretBase_Shrub2/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/SecretBase_Shrub2/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc index 77b3ae833..760781e47 100644 --- a/data/maps/SecretBase_Shrub2/header.inc +++ b/data/maps/SecretBase_Shrub2/header.inc @@ -1,5 +1,5 @@ SecretBase_Shrub2: @ 8484BC4 - .4byte SecretBase_Shrub2_MapAttributes + .4byte SecretBase_Shrub2_Layout .4byte SecretBase_Shrub2_MapEvents .4byte SecretBase_Shrub2_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_Shrub2/map.bin b/data/maps/SecretBase_Shrub2/map.bin deleted file mode 100644 index 8cb88cc44..000000000 --- a/data/maps/SecretBase_Shrub2/map.bin +++ /dev/null @@ -1,57 +0,0 @@ -  6 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -22   -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2  -2 -22 -2 -2 -2 -2 -2  \ No newline at end of file diff --git a/data/maps/SecretBase_Shrub3/border.bin b/data/maps/SecretBase_Shrub3/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/SecretBase_Shrub3/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc index 7fb14ec94..cef2a4597 100644 --- a/data/maps/SecretBase_Shrub3/header.inc +++ b/data/maps/SecretBase_Shrub3/header.inc @@ -1,5 +1,5 @@ SecretBase_Shrub3: @ 8484C6C - .4byte SecretBase_Shrub3_MapAttributes + .4byte SecretBase_Shrub3_Layout .4byte SecretBase_Shrub3_MapEvents .4byte SecretBase_Shrub3_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_Shrub3/map.bin b/data/maps/SecretBase_Shrub3/map.bin deleted file mode 100644 index d51aeea21..000000000 --- a/data/maps/SecretBase_Shrub3/map.bin +++ /dev/null @@ -1,65 +0,0 @@ -  -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2  -2 -2 -2 -2 -2 -2 -2 -2 -2 -2  -2  -2  -2   -2 -2 -2 -22 -2 6 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -22 -2 -2 -2 -2 -2   \ No newline at end of file diff --git a/data/maps/SecretBase_Shrub4/border.bin b/data/maps/SecretBase_Shrub4/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/SecretBase_Shrub4/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc index 10a4d4ca4..12fa26c3c 100644 --- a/data/maps/SecretBase_Shrub4/header.inc +++ b/data/maps/SecretBase_Shrub4/header.inc @@ -1,5 +1,5 @@ SecretBase_Shrub4: @ 8484D14 - .4byte SecretBase_Shrub4_MapAttributes + .4byte SecretBase_Shrub4_Layout .4byte SecretBase_Shrub4_MapEvents .4byte SecretBase_Shrub4_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_Shrub4/map.bin b/data/maps/SecretBase_Shrub4/map.bin deleted file mode 100644 index 8a4cf836d..000000000 --- a/data/maps/SecretBase_Shrub4/map.bin +++ /dev/null @@ -1,69 +0,0 @@ -  -2 -2"6 -2 -2 -2 -2 -2 -2 -2 -2 -2   -2 -2#6 -2 -2 -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2   -2 -2  -2 -2 -2   -2 -22 -2 -2   6 -2 -2 -2   -2 -2 -2 -2 -2   -2 -2 -2 -2   -2 -2 -2 -2 -2  2 -2 -2 -2   -2 -2 -2 -2 -2  -22 -2   -2 -2 -2 -2 -2   \ No newline at end of file diff --git a/data/maps/SecretBase_Tree1/border.bin b/data/maps/SecretBase_Tree1/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/SecretBase_Tree1/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc index 157173fbb..c5b5a2aed 100644 --- a/data/maps/SecretBase_Tree1/header.inc +++ b/data/maps/SecretBase_Tree1/header.inc @@ -1,5 +1,5 @@ SecretBase_Tree1: @ 8484B00 - .4byte SecretBase_Tree1_MapAttributes + .4byte SecretBase_Tree1_Layout .4byte SecretBase_Tree1_MapEvents .4byte SecretBase_Tree1_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_Tree1/map.bin b/data/maps/SecretBase_Tree1/map.bin deleted file mode 100644 index 907f1486a..000000000 --- a/data/maps/SecretBase_Tree1/map.bin +++ /dev/null @@ -1,56 +0,0 @@ - -2 -22 -2 -2 -2 -2   -2 6 -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -26 -2 -2 -22 -2 -2 -2   \ No newline at end of file diff --git a/data/maps/SecretBase_Tree2/border.bin b/data/maps/SecretBase_Tree2/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/SecretBase_Tree2/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc index 6708af92b..ddea5c0bc 100644 --- a/data/maps/SecretBase_Tree2/header.inc +++ b/data/maps/SecretBase_Tree2/header.inc @@ -1,5 +1,5 @@ SecretBase_Tree2: @ 8484BA8 - .4byte SecretBase_Tree2_MapAttributes + .4byte SecretBase_Tree2_Layout .4byte SecretBase_Tree2_MapEvents .4byte SecretBase_Tree2_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_Tree2/map.bin b/data/maps/SecretBase_Tree2/map.bin deleted file mode 100644 index c2e5698b0..000000000 --- a/data/maps/SecretBase_Tree2/map.bin +++ /dev/null @@ -1,48 +0,0 @@ -  -2 -22 -2   -2 -2 -2 -2   -2 -2 -2 -2   -2 -2 -2 -2 6  -2 -2 -2 -2 6   -2 -2 -2 -2 -2   -2 -2 -2 -2 -2   -2 -2 -2 -2 -2  -2 -2 -2 -2   -2 -2 -2 -2   -2 -2 -26 -26  -2  2   \ No newline at end of file diff --git a/data/maps/SecretBase_Tree3/border.bin b/data/maps/SecretBase_Tree3/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/SecretBase_Tree3/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc index fd0c56856..630dbb6e3 100644 --- a/data/maps/SecretBase_Tree3/header.inc +++ b/data/maps/SecretBase_Tree3/header.inc @@ -1,5 +1,5 @@ SecretBase_Tree3: @ 8484C50 - .4byte SecretBase_Tree3_MapAttributes + .4byte SecretBase_Tree3_Layout .4byte SecretBase_Tree3_MapEvents .4byte SecretBase_Tree3_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_Tree3/map.bin b/data/maps/SecretBase_Tree3/map.bin deleted file mode 100644 index b6ae04b00..000000000 --- a/data/maps/SecretBase_Tree3/map.bin +++ /dev/null @@ -1,63 +0,0 @@ -  -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 6 2 -2 -2 -2 -2 -2 -2 -2 -2 -2 6   -2 -2 -2 -2 -2   -2   -2 -2 -2 -2 -2   -2 -2 -2 -2 -2   -2   -2 -2 -2 -2 -2  -2 -2 -2 -2   -2   -2 -2 -2 -2 -2  -2 -2 -2  2  -2 -2 -2 -2   \ No newline at end of file diff --git a/data/maps/SecretBase_Tree4/border.bin b/data/maps/SecretBase_Tree4/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/SecretBase_Tree4/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc index c2f0b3350..bc6f84664 100644 --- a/data/maps/SecretBase_Tree4/header.inc +++ b/data/maps/SecretBase_Tree4/header.inc @@ -1,5 +1,5 @@ SecretBase_Tree4: @ 8484CF8 - .4byte SecretBase_Tree4_MapAttributes + .4byte SecretBase_Tree4_Layout .4byte SecretBase_Tree4_MapEvents .4byte SecretBase_Tree4_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_Tree4/map.bin b/data/maps/SecretBase_Tree4/map.bin deleted file mode 100644 index b3b381d9e..000000000 --- a/data/maps/SecretBase_Tree4/map.bin +++ /dev/null @@ -1,77 +0,0 @@ -  -2 -2 -2 -2 -2   -2 -2 -2 -2 -2   -2 -2 -2 -2 -2   -2 -2 -2 -2 -2   -2 -2 -2 -2 -2   -2 -2 -2 -2 -2   -2 -2 -2 -2 -2  -2 -2  -2 -2 -2 -2 -2 "6   -2 -2 -2 -2 #6 "6  2 #6   -2 6 -2 -2 -2 -2 -222   -2 -2 -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -22 -2 -26  \ No newline at end of file diff --git a/data/maps/SecretBase_YellowCave1/border.bin b/data/maps/SecretBase_YellowCave1/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_YellowCave1/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc index 77a446dbd..9a6ae5438 100644 --- a/data/maps/SecretBase_YellowCave1/header.inc +++ b/data/maps/SecretBase_YellowCave1/header.inc @@ -1,5 +1,5 @@ SecretBase_YellowCave1: @ 8484AE4 - .4byte SecretBase_YellowCave1_MapAttributes + .4byte SecretBase_YellowCave1_Layout .4byte SecretBase_YellowCave1_MapEvents .4byte SecretBase_YellowCave1_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_YellowCave1/map.bin b/data/maps/SecretBase_YellowCave1/map.bin deleted file mode 100644 index 1301e7317..000000000 --- a/data/maps/SecretBase_YellowCave1/map.bin +++ /dev/null @@ -1,57 +0,0 @@ -  -2 -22 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2 6   -2 -2 -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2 -2  -2 -2 -22 -2 -2  \ No newline at end of file diff --git a/data/maps/SecretBase_YellowCave2/border.bin b/data/maps/SecretBase_YellowCave2/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_YellowCave2/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc index ae9200fc1..da1949abe 100644 --- a/data/maps/SecretBase_YellowCave2/header.inc +++ b/data/maps/SecretBase_YellowCave2/header.inc @@ -1,5 +1,5 @@ SecretBase_YellowCave2: @ 8484B8C - .4byte SecretBase_YellowCave2_MapAttributes + .4byte SecretBase_YellowCave2_Layout .4byte SecretBase_YellowCave2_MapEvents .4byte SecretBase_YellowCave2_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_YellowCave2/map.bin b/data/maps/SecretBase_YellowCave2/map.bin deleted file mode 100644 index e18cb47c6..000000000 --- a/data/maps/SecretBase_YellowCave2/map.bin +++ /dev/null @@ -1,56 +0,0 @@ - 2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -26 -2   -2 -2 -2 -2 -2 -2 -2   -2  -2 -2 -2 -2 -2 -2   -2   -2 -2 -2 -2 -2 -2   -2   -2 -2 -2 -2 -2 -2 6   -2   -2 -2 -2 -2 -2 -2 -2  2   \ No newline at end of file diff --git a/data/maps/SecretBase_YellowCave3/border.bin b/data/maps/SecretBase_YellowCave3/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_YellowCave3/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc index d63751987..8bfeff0f5 100644 --- a/data/maps/SecretBase_YellowCave3/header.inc +++ b/data/maps/SecretBase_YellowCave3/header.inc @@ -1,5 +1,5 @@ SecretBase_YellowCave3: @ 8484C34 - .4byte SecretBase_YellowCave3_MapAttributes + .4byte SecretBase_YellowCave3_Layout .4byte SecretBase_YellowCave3_MapEvents .4byte SecretBase_YellowCave3_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_YellowCave3/map.bin b/data/maps/SecretBase_YellowCave3/map.bin deleted file mode 100644 index b7d80a0ab..000000000 --- a/data/maps/SecretBase_YellowCave3/map.bin +++ /dev/null @@ -1,63 +0,0 @@ -  -2 -2 -2   -2 -2   -2 -2 -2   -2 -2   -2 -2 -2   -2 -2  -2 -2 -2   -2 -2 6 -2 -2 -22 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2 -266 -2 -2 -22 -2 -2 -2 -2   \ No newline at end of file diff --git a/data/maps/SecretBase_YellowCave4/border.bin b/data/maps/SecretBase_YellowCave4/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_YellowCave4/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc index 1a5c43da5..baf6b7d89 100644 --- a/data/maps/SecretBase_YellowCave4/header.inc +++ b/data/maps/SecretBase_YellowCave4/header.inc @@ -1,5 +1,5 @@ SecretBase_YellowCave4: @ 8484CDC - .4byte SecretBase_YellowCave4_MapAttributes + .4byte SecretBase_YellowCave4_Layout .4byte SecretBase_YellowCave4_MapEvents .4byte SecretBase_YellowCave4_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_YellowCave4/map.bin b/data/maps/SecretBase_YellowCave4/map.bin deleted file mode 100644 index d3c3e0204..000000000 --- a/data/maps/SecretBase_YellowCave4/map.bin +++ /dev/null @@ -1,80 +0,0 @@ -  -2 -2 -2 -2 -2 -2 -2 -2"6 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2#6 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2   -2 -2   -2 -2   -2 -2  -2 -2   -2 -2 6 -2 -2 -22 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2  -2 -2 -2 -2 -2 -2 -2  -2 -2 -22 -2 -2 -2   \ No newline at end of file diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/border.bin b/data/maps/ShoalCave_HighTideEntranceRoom/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/ShoalCave_HighTideEntranceRoom/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc index 5694fead4..2f3f34b43 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc @@ -1,5 +1,5 @@ ShoalCave_HighTideEntranceRoom: @ 8484438 - .4byte ShoalCave_HighTideEntranceRoom_MapAttributes + .4byte ShoalCave_HighTideEntranceRoom_Layout .4byte ShoalCave_HighTideEntranceRoom_MapEvents .4byte ShoalCave_HighTideEntranceRoom_MapScripts .4byte 0x0 diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/map.bin b/data/maps/ShoalCave_HighTideEntranceRoom/map.bin deleted file mode 100644 index 0e4b88c8f..000000000 --- a/data/maps/ShoalCave_HighTideEntranceRoom/map.bin +++ /dev/null @@ -1 +0,0 @@ -      22˜2™2™2™2™2™2™2™2™2™2™2š2´´´´´´´22822222 2¡2¡2¡2¡2¡2¡2¡2¡2¡2¡2¢2|“““““““z22822222 2¡2¡2¡2©2©2©2©2©2©2©2ª2|“ppppp“z22@QQQQQ 2¡2¡2¢2´´´´2´´µ“ppppp“z22222222 2¡2¡2¢2|“““““““““ppppp“z22222222 2¡2¡2¢2|“ppppppppppppp“³´2´´´22¨2©2©2ª2|“ppppppppppppp“““““““z22´´´µ“ppppppppppppppppppp“z22|“““““ppppppppppppppppppp“z22|“ppppppppppppppppppppppp“z22|“ppppppppppppppppppppppp“z22|“pppppppppppp­®1®1®1®1®1®1®1®1®1®1¦2C22]C]CUCUCUCUC^“ppppppµž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1£22BBBBBB|“ppppppµž1ž1ž1ž1ž1ž1ž1ž1ž1ž1m#222BBBBB|“pppppp½¾¾¾¾£ž1ž1ž1ž1ž1£222BBB´2µ“pppppppppppµž1ž1ž1ž1ž1£    BBB|““““pppppppppppµž1ž1ž1ž1ž1£BBB|“ppppppppppppppµž1ž1ž1mn#  BBB|“ppppppppppppppµž1ž1ž1£BBB’¦2¯pppppppppppppµž1ž1ž1£BBB¥ž1œ1®1®1®1®1®1®1®1®1®1®1®1®1®1›1ž1ž1ž1£  BBB¥ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1£   BBB¥ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1£BBB¥ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1£BBB#BnBnBnBnBnBnBož1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1£BBBBBBBBBB¥ž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ž1u2ž1ž1ž1ž1ž1£        " nnnnnXYZnnnn   "                                                                         \ No newline at end of file diff --git a/data/maps/ShoalCave_HighTideInnerRoom/border.bin b/data/maps/ShoalCave_HighTideInnerRoom/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/ShoalCave_HighTideInnerRoom/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc index a6fd687b2..673bc6bec 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc @@ -1,5 +1,5 @@ ShoalCave_HighTideInnerRoom: @ 8484454 - .4byte ShoalCave_HighTideInnerRoom_MapAttributes + .4byte ShoalCave_HighTideInnerRoom_Layout .4byte ShoalCave_HighTideInnerRoom_MapEvents .4byte ShoalCave_HighTideInnerRoom_MapScripts .4byte 0x0 diff --git a/data/maps/ShoalCave_HighTideInnerRoom/map.bin b/data/maps/ShoalCave_HighTideInnerRoom/map.bin deleted file mode 100644 index c540a4008..000000000 --- a/data/maps/ShoalCave_HighTideInnerRoom/map.bin +++ /dev/null @@ -1 +0,0 @@ -BB¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬BBBBBBB¥¤¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾££BB22222BBBBB»B»B“ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó”ó½B½BBB22222BBBBBÃBÃB›óóóóóóóóóóóóóóóóóóóóóóóóóœóÅBÅBBBBBBBB¥·ppppppppppppppppppppppppµ£BBBBBBBBBB¥·ppppppppppppppppppppppppµ£BBBBBBBBBB[32¥·ppppppppppppppppppppppppµ£BBB22¥·ppp­®1®1®1®1®1®1®1®1®1®1®1®1®1®1®1®1®1®1®1®1›1£RRRRR[SRBBB22¥·pppµž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1£RRRRRRBBB22¥·pppµmnRnRnRnRnRnRnRnRnRnRnRož1ž1ž1ž1ž1ž1ž1ž1«¬2¬¬¬¬BBB2­·pppµ£R[S  B B B B B B B"#R Rož1ž1¤¾¾¾¾¾¾¾¾¾££BBB¥¤¾¿pppµ£RRBBBBBBBRR¥ž1ž1·pppppppppµ£BBB¥·pppppµ£RRBBBBBBBRR¥ž1ž1·pppppppppµ£BBB¥·pppppµ£RRBBBBRR¥ž1ž1·pppppppppµ£BBB¥·pppppµ«¬¬¬BBBBRR¥ž1ž1œ1®1®1®1®1®1®1®1®1®1›1£BBB¥·ppppp½¾£ž1ž1ž1£BBBBRR¥ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1£BBB¥·ppppppp½¾¾££BBBBRR¥ž1ž1ž1ž1ž1ž1mnRnRnRnRnRnR#RBBB¥·ppppppppppµ£BBBBRR¥ž1ž1ž1ž1ž1ž1£RRRRR[SRBBB»B»B“ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó”ó½B½BBBBBRR¥ž1ž1ž1ž1ž1ž1£RRRRRRRBBBÃBÃB›óóóóóóóóóóóœóÅBÅBBBBB¥ž1ž1ž1ž1ž1ž1£RRRRRRR¥·ppppppppppµ£B2­ž1ž1ž1ž1ž1ž1«¬RRRR¬¬­œ1®1®1¯pppppppµ£BBBBBB¥¤¾¾¾¾¾£ž1ž1ž1ž1£RRRR#RnRnRnRnRnRo·pppppppµ£BBBBBB¥·ppppp½¾¾¾££RRRRRRRRRR¥·ppppp­®1›1£BBBBBB¥·pppppppppµ£RRRRRRR­·pppppµmn#     "¥·pppppppppµ£RRRRRRR¥ž1ž1ž1œ1®1®1®1®1®1›1£   ¥·pppppppppµ£RRRRRRR¥ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1£¥·pppppppppµ£RRRRRRR¥ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1£     "¥œ1®1®1®1®1®1®1®1®1®1›1£RRRRRRR#RnRnRnRnRnRnRnRnRnRnR#R¥ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1£RRRRRRRRRRRRRRRRRRR##nnnnnnnnnn1#RRRRRRRRRRRRRRRR6D22>6C22>6D22>6C222)6C2222K22`6C22`6 - `6C22`6C2222K2 \ No newline at end of file diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/border.bin b/data/maps/SlateportCity_OceanicMuseum_2F/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/SlateportCity_OceanicMuseum_2F/border.bin and /dev/null differ diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc index 6d9439419..7d4272d09 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc @@ -1,5 +1,5 @@ SlateportCity_OceanicMuseum_2F: @ 84831BC - .4byte SlateportCity_OceanicMuseum_2F_MapAttributes + .4byte SlateportCity_OceanicMuseum_2F_Layout .4byte SlateportCity_OceanicMuseum_2F_MapEvents .4byte SlateportCity_OceanicMuseum_2F_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.bin b/data/maps/SlateportCity_OceanicMuseum_2F/map.bin deleted file mode 100644 index 1fa2cdc18..000000000 --- a/data/maps/SlateportCity_OceanicMuseum_2F/map.bin +++ /dev/null @@ -1 +0,0 @@ -ac %       bd%   22M2N2N2O22222-222222222C2289@,C22225C2S2T22S2T22 22C222334C22222K2[\2[\2(C2C22E2F2F2G2K2222222222222K2C22*01,C2222222Q2R2222 22C222334C2222222YZC222(C2C222222K222222222K2222K2 \ No newline at end of file diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc index c19ff9c4b..8d1e8cc17 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ SlateportCity_PokemonCenter_1F: @ 8483210 - .4byte SlateportCity_PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte SlateportCity_PokemonCenter_1F_MapEvents .4byte SlateportCity_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc index 345e8632a..7bf64b603 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ SlateportCity_PokemonCenter_2F: @ 848322C - .4byte SlateportCity_PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte SlateportCity_PokemonCenter_2F_MapEvents .4byte SlateportCity_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity_PokemonFanClub/border.bin b/data/maps/SlateportCity_PokemonFanClub/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/SlateportCity_PokemonFanClub/border.bin and /dev/null differ diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc index 70d0dc41c..87a6c0c5b 100644 --- a/data/maps/SlateportCity_PokemonFanClub/header.inc +++ b/data/maps/SlateportCity_PokemonFanClub/header.inc @@ -1,5 +1,5 @@ SlateportCity_PokemonFanClub: @ 8483184 - .4byte SlateportCity_PokemonFanClub_MapAttributes + .4byte SlateportCity_PokemonFanClub_Layout .4byte SlateportCity_PokemonFanClub_MapEvents .4byte SlateportCity_PokemonFanClub_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity_PokemonFanClub/map.bin b/data/maps/SlateportCity_PokemonFanClub/map.bin deleted file mode 100644 index effff6653..000000000 Binary files a/data/maps/SlateportCity_PokemonFanClub/map.bin and /dev/null differ diff --git a/data/maps/SlateportCity_SternsShipyard_1F/border.bin b/data/maps/SlateportCity_SternsShipyard_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/SlateportCity_SternsShipyard_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc index f30894e60..c04b411f1 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc @@ -1,5 +1,5 @@ SlateportCity_SternsShipyard_1F: @ 84830DC - .4byte SlateportCity_SternsShipyard_1F_MapAttributes + .4byte SlateportCity_SternsShipyard_1F_Layout .4byte SlateportCity_SternsShipyard_1F_MapEvents .4byte SlateportCity_SternsShipyard_1F_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.bin b/data/maps/SlateportCity_SternsShipyard_1F/map.bin deleted file mode 100644 index 036f5ce26..000000000 --- a/data/maps/SlateportCity_SternsShipyard_1F/map.bin +++ /dev/null @@ -1,7 +0,0 @@ -³´µ»¼½! -!012! #!$!"!!"¶22·22 -)28292:2)22)2)2)2)2)2)2)2)2222222  2 2 2 2 2 2 2 2&2)2)2)2)22A2B22222?ÕÖ×ÐÑÒÓ)2)2)2'IJ2222 -G$[\3456 )2)2)2''2222   O)2cd;<=>2)2)2)2/7A2B222)2)2k2l2CDEF)2)2)2)2)2)2IJ2222 )2)2)2)2K2LMN2)2)2)2)2)2)22222222)2)2)253)2UV)2)2)2)2)2)2)2A2B222222)2)2(2_2(2*2*253)2)2)2)2)22IJ22222)2(2_2(2(2(2_2)2)2)2'222222 -'2(2W(2(2(2W)2)2)2'''222222 -/'(2(2(2(2(2)2)2)2//7222222 -77/)2)2)2)2)2)2)2)2)2)2)2 \ No newline at end of file diff --git a/data/maps/SlateportCity_SternsShipyard_2F/border.bin b/data/maps/SlateportCity_SternsShipyard_2F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/SlateportCity_SternsShipyard_2F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc index c409b3df7..e3b36f4ed 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc @@ -1,5 +1,5 @@ SlateportCity_SternsShipyard_2F: @ 84830F8 - .4byte SlateportCity_SternsShipyard_2F_MapAttributes + .4byte SlateportCity_SternsShipyard_2F_Layout .4byte SlateportCity_SternsShipyard_2F_MapEvents .4byte SlateportCity_SternsShipyard_2F_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.bin b/data/maps/SlateportCity_SternsShipyard_2F/map.bin deleted file mode 100644 index d10ed2ac2..000000000 --- a/data/maps/SlateportCity_SternsShipyard_2F/map.bin +++ /dev/null @@ -1 +0,0 @@ -ÃÄÅ!!ËÌÍ!$#! !!$! !!22¶22·2222222222222222222222  22  22@2B2A2B2222222222HJIJ2222PQQQQQQR222222222`cd;<=>2A2B2@2B22222`klCDEF2IJHJ2222`))KLMN222222222`)5)UV)2A2B2@2B22222`(W2(**52IJHJ222`(W2(((W2222222222hi—iii—j222222222222%2%2222222222222222222222 \ No newline at end of file diff --git a/data/maps/SootopolisCity/border.bin b/data/maps/SootopolisCity/border.bin deleted file mode 100644 index c07869a9f..000000000 --- a/data/maps/SootopolisCity/border.bin +++ /dev/null @@ -1 +0,0 @@ -ÙÙÙÙ \ No newline at end of file diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc index cb8f65244..74469da7c 100644 --- a/data/maps/SootopolisCity/header.inc +++ b/data/maps/SootopolisCity/header.inc @@ -1,5 +1,5 @@ SootopolisCity: @ 848257C - .4byte SootopolisCity_MapAttributes + .4byte SootopolisCity_Layout .4byte SootopolisCity_MapEvents .4byte SootopolisCity_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity/map.bin b/data/maps/SootopolisCity/map.bin deleted file mode 100644 index ff03ebc3b..000000000 --- a/data/maps/SootopolisCity/map.bin +++ /dev/null @@ -1,12 +0,0 @@ -ÙÙÙÙÙÙÙÚÙÙÓáááâÚÙ2ÚÙ2Ù2ÙÙÙÙÙÓáá9áááááÔàÔàÔÙ2Ù2Ù2Ù2Ù2àááááááá9áÔÙ2Ù2Ù2Ù2Ù2ÙÙÙÙÓááâÙÙÚÙÓááâÓâÙ2Ù2Óáá9áâÓKLMÔàÔàÔàááááááááááááà9ááÔÙ2ÙÓááâÙÓáá9âÙÚÙ2Ù2Ù2ÚÙ2Ù2Ù2ÚÓáâ  -  ØÙ2àÔàááááÔÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2  - ÔØÙ2áâÙÙÓáâÙáâÓááâÙ2Ù2Ù2ÚÚ  - Ù2Ù2%7'ØÙ2Ù2àÔÙ2Ù2Ù2Ù2àáKLMÙ2Ù2Ù2Ù2  - ØàáÙÙÓáâÙÓá  - UÙÚÓáááááâÚÙ2Ù2-?/àÔÙ2Ù2àÔ@AAAB ZÔÙ2Ù2Ù2àáÔááâÙÙÓâÙ2#$_ÓâÚÙ2Ù2Ù2Ù2Ù2Ù2Ú Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2àáÔÙ2àáÔÙ2Ù2Ù2àÔÙ2Ù2Ù2Ù2Ù2 Ù2Ù2ØÙÓKLMâÙ2Ù2+,_ÚÓâÙ2Ù2ÓáD2E2âÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2ØÙ2Ù2Ù2ØÙ2Ù2Ù2Ù2Ø@AAAAAAABÙ2àÓâ @AAFÙ2G\ÚÚÙ2Ù2Ù2ÚÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2@AFÙ2Ù2GAAABàÔÙ2Ù2àááááD2áÔàááááááááÔÙ2Ù2âÙ%6'Ù2ÓábD2cáâÚÙ2Ù2Ù2ÚÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2ÓábD2E2cááááÔàááááÔÙ2Ù2Ù2Ù2àááááá9ááÔØÙ2Ù2ÙÙ->/Ù2ÚÙ2ÓD2áááâÙ2Ù2Ù2ÚÓáááááááâÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2àáááÔÙàááD2ááááááÔØàáÔAAAAABÚÙ2ÚÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2ÚÚÙ2Ù2ÓááááááááááááD2E2áááÔàÔÙÙÓD2áááááÔ  - ØàáÔàááááááâÓâÓáááááD2E2âÚÓáâÓáááááááááááD2E2ááÔØÙ2ØÙÙÚÙ2Ù2Ù2Ù2Ù2Ù2ØØÙ2Ù2ØÙ2Ù2Ù2ÓááááâÓâÙ2Ù2Ù2Ù2Ù2Ù2Ù2ÓâÚÓáâÙ2ÓáááááááááD2E2ÔÙ2ØàÔàááâ6Ù2Ù2Ù2Ù2Ù2Ù2Ø ØÙ2Ù2àáááâÙ2Óáááâ82Ù2ÓáááD2E2âÙ2ÚÚÓááâÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2àÔàÔàááá9ááÔÙ2Ù2Ù2àÔÙ2Ù2àáÔÙ2Ù2Ù2Ù2Ù2Ù2ÚÙ2ÓáâÙ2Ù2Ù2Ù2Ù2Ù2ÓâÚÚ@AFÙ2Ù2GAAAAAAAABàÔàáááÔØÙ2Ù2Ù2Ù2ØÙ2Ù2Ù2Ù2àáÔÙ2ÓááâÙ2ÚT  - BÙ2Ù2Ù2Ù2Ù2Ù2ÚÙ2ÚÚÙ2ÓbD2E2cáQR[RSáÔÙ2Ù2àáÔTA  - ØØÙ2Ù2Ù2Ù2ØÙ282Ù2Ù2Ù2Ù2àÙ2;Ù2Ù2Ù2Ù2Ú^#$Ù2Ù2Ù2ÓáD2E2âÙ2ÚÚÙ2ÚÙ2Ù2Ù2Ù2Ó á!2á"ÔàááÔÙ2Ø^Ù2#$ØØÙ2Ù2Ù2Ù2àáááÔ2Ù2Ù2Ù2Ú^+,Ù2Ù2Ù2ÚÓD2E2ááâÚÙ2ÚÙ2Ù2Ù2Ù2Ú()2)2)2*óÙ2Ù2Ù2àÔØ^Ù2+,ØàÔÙ2Ù2Ù2Ù2  - à  - ÓKLM^Ù2Ù2Ù2Ù2Ù2Ù2ÚÚÙ2Ù2Ù2Ù2Ù2ÚÓânÙ2Ù2oÚ0q0q0q02óÙ2Ù2Ù2Ù2ØØ^Ù2Ù2Ù2Ù2ØÙ2àD2E2áÔ Ù2Ú ^Ù2Ù2Ù2Ù2Ù2Ù2ÚÚÙ2Ù2Ù2Ù2Ù2ÚÚÓbD2E2cýq0€6q0€6q0ûáÔÙ2Ù2ØØ^Ù2Ù2Ù2Ù2àááD2E2ÔØ%7'Ù2Ú%7']AAABÙ2Ù2ÚÚÙ2Ù2ÓáD2âÚÚq0q0q0q0q0q0€6q0€6q0q0q0ûáÔØØ^Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2ØàááÔ-?/Ù2AABÚ-?/Ù2ÓáááD2E2âÚÙ2Ù2ÚÓD2áâÚq0q0q0q0q0q0q0q0q0q0q0q0q0q0ÎØØ]ABÙ2Ù2Ù2Ù2Ù2Ù2Ù2ØÙ2Ù2Ù2àáááÔáááâÓáááâÙ2Ù2Ù2Ù2Ù2Ù2ÚÙ2Ù2ÚÚÙ2Ù2Ù2Úq0q0q0q0q0q0q0q0q0q0q0q0q0q0ÎØàáááD2E2áKLMÔàááÔÙ2Ù2Ù2Ù2àÙÙÓáâÙ2ÓáKLMáD2E2áâÓáâÚÙ2Ù2Ù2Úq0q0t||||||||||‰ÎàáÔTBÙ2Ù2Ù2 ØÙ2Ù2Ù2àÔÙ2Ù2Ù2Ù2áKLÙ2Ù2ÚTYZBÙ2Ù2ÓáâÓáâÓD2E2Íty}ñ±±±±±±±ÄsÖáÔØ^Ù2Ù2Ù2Ù2ØÙ2Ù2Ù2Ù2ØÙ2Ù2Ù2Ù2Ù2 Ù2Ù2Ú^Ù2Ù2Ù2ÚÓáâÙ2Ù2Úq0q0t}ñÀyyyyyyyyº{y‰óØ^Ù2Ù2Ù2Ù2ØÙ2àÔÙ2Ù2Ù2Ù2%6'Ù2Ù2Ú^Ù2Ù2Ù2ÚÚk6l6l6m6Úq0q0uÃÀyyyyyyyyyy±ÄsóØ^Ù2Ù2Ù2Ù2Ù2Ù2Ù2àÔ Ù2ØÙ2Ù2Ù2Ù2->/Ù2Ù2Ú^Ù2Ù2Ù2Ù2Ù2Ù2ÚÚ0123Úq0q0u¸yyyyyyyyyyyyyºsóØ]AABÙ2Ù2Ù2Ù2Ù2ØÙ2àÔÙ2Ù2AAAABÓâ]AAAABÓâÚ89:;Úq0q0u¸yyy‚ƒƒƒƒ„yyyyºsóà{|}~ÔÙ2Ù2Ù2Ù2ØÙ2Ù2ØÙ2Ù2Ù2Ù2ÓááâÓááááááâÓâABwÚq0q0u¸yyËŠ‹‹‹‹ŒÌyyyºsóTPQRSØÙ2Ù2Ù2Ù2àáD2ÔÙ2Ù2àÔÙ2Ù2ÓâÙ2ÓáâÙ2Ù2Ù2ÓáááâÙ2Ù2Ù2Ù2Ù2Úq0q0u¸yyº¸¹º³»¼¸yyyºsó^XYZ[ØÙ2Ù2Ù2Ù2Ù2Ù2Ù2ØÙ2Ù2Ù2ØÙ2Ù2ÚÙ2Ù2ÚÙ2Ù2Ù2Ù2Ù2ÚÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Óýq0q0u¸yyºÀÁÂÅÃĸyyyºsó^abvàáD2E2ÔÙ2Ù2Ù2àááÔàÔÓâÙ2Ù2ÚÓáKLMâÙ2Ù2Ù2Ù2Ù2ÓD2E2ýq0q0q0u¸yËÓ0È1É1ÊÍËÌ1Ô0Ìyyºsó^Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2àááÔÙ2Ù2Ù2ØÙ2ØâÙ2Ù2ÓâÚTYZBÙ2Ù2Ù2Ù2Óýq0q0q0q0q0q0u¸yº000000010¸yyºsó^Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2222à9áÔØÙ2ØÙ2Ù2Ù2ÚÙ2Ú^Ù2Ù2Ù2Ù2Óýq0q0q0q0q0q0t}¸yº00000010¸yyºsó]BÙ2Ù2@AFÙ2Ù2 222ØØÙ2ØÙ2ÓáâÓâ^Ù2Ù2Ù2Ù2Úq0tÞßD2E2yzÃÀyº00000000¸yyºsûááD2E2áÔNÙ2Ù2  - ØØÙ2ØÓâÙ2Ù2ÚÙ2^Ù2Ù2Ù2Ù2Ù2Ù2Ù2Úq0rÖ×0000¸yyº00000000¸yyº{yyyD2E2‰óNÙ2Ù2ØàÔØâÓááâÙ2]BÙ2Ù2Ù2Ù2Óáýq0ræç0000¸yy±±±±±±±±Àyy²04000póNÙ2Ù2Ù2Ù2Ù2ØÙ2ØØÙ2ÚÙ2Ù2Óáááááááýtyyz0°±±±±Àyyyyyyyyyyyyyyyº00000póV@AAAAAABàÔØàÓâÙ2ÓýqtyÞßÞßyz0000¸yyyyyyyyyyyyyyyyyyyyº00000pûáááááááÔÙÙØàÔÚÙÙ2Úqqr0Ö×Ö×000000¸yyyyyyyyyyyyyyyyyyyy±²000xyyyy‰qqqóÙÙØÙØÚÙÙ2Úqqr0æåÜÝ000000¸yyyyyyyyyyyyyyyyyyyyyyº00000000xÞ߉ûÔÙàÔØÚÙÙ2Úqqr000ÔÕ000000¸yyyyyyyyyyyyyyyyyyyyyyº000000000Ö×pqóÙÙØØÚÙÙ2Úqqr000æç000000¸yyyyyyyyyyyyyyyyyyyyyy±±²0000Î1Ï1ÜÝpqûÔÙØØÚÙÙ2Úqqr0000000Î1Ï100¸yyyyyyyyyyyyyyyyyyyyyyyyyº0000ÖÕÔÕpqqóÙØØÜÒÙ2ìíqr0000000Ö×00¸yyyyyyyyyyyyyyyyyyyyyyyyyº0000ÜÝÜÝpqqóÙØØÙÚÙÙÜí¿iiij000ÜÝ°±Àyyyyyyyyyyyyyyyyyyyyyyyyy±±±²ÔÕÔÕpqqóÙØØÙÜÑÑÒÜìììí¿ij0ÔÕ¸yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyºæåäçpëìÛÙØØÙÙÙÙÜÑÑÒÙÜìír0æç¸yyyyyyyyyyyyyyyyyyyyyyyyyyyyyy˜`ii0i0i0¾0óÙÐÑÛÛÙÙÙÙÙÙÙÜÑÒÙÚ¿iij¸yyyyyyyyyyyyyyyyyyyyyyyyyyyyyy qqqqëìÛÐØÙÙÙÑÑÑÒÙÙÙÙÙÚÙÜìíqr¸yyyyyyyyyyyyyyyyyyyyyyyy˜iiiiiiqëììÛÙÙØØÙÙÙÙÙÙÜÑÒÙÙÙÜÑÑÒÜír¸yyyyyyyyyyyyyyyyyyyyyyyy qqqqqqqóÙÙÙÐÑÛØÙÙÙÙÙÙÙÙÚÙÙÙÙÙÙÚÙÚr¸yyyyyyyyy…†††‡yyyyyy˜iiiiqqqqëììÛÙÙÙØÙÙØÙÙÙÙÙÙÙÙÜÑÒÙÙÙÙÜÒÚr¸yyyyyyy…†ŽŽŽ†‡yyyy qqqqqqqëÛÐÑÑÑÑÑÛÐÑÛÙÙÙÙÙÙÙÙÙÙÚÙÙÙÙÙÚÚr¸yyyyyy…ŽŽŽŽŽŽŽ‡yyy qqqqqëìÛÙØÙÙÙÙÐÑÛÙÙÙÙÙÙÙÙÙÙÙÙÜÑÒÙÙÙÚÚiiiišyy…ŽŽŽŽŽŽŽŽŽ‡˜iiqqëììÛÙÙÙØÐÑÑÑÛÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÚÙÙÙÚÚqqqqiiiiiiiiiiiiiiiiiqqqqóÙÐÑÑÑÑÛØÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÜÑÒÙÚÜíqqqqqqqqqqqqqqqqqqqqqëììÛÙØÐÑÑÑÑÛÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÚÙÚÙÜìììììììììììììììììììììÛÙÐÑÑÛØÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÚÙÜÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÛÙÙÙØÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙ \ No newline at end of file diff --git a/data/maps/SootopolisCity_Gym_1F/border.bin b/data/maps/SootopolisCity_Gym_1F/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/SootopolisCity_Gym_1F/border.bin and /dev/null differ diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc index b17a271d8..4200a7ed8 100644 --- a/data/maps/SootopolisCity_Gym_1F/header.inc +++ b/data/maps/SootopolisCity_Gym_1F/header.inc @@ -1,5 +1,5 @@ SootopolisCity_Gym_1F: @ 8483A28 - .4byte SootopolisCity_Gym_1F_MapAttributes + .4byte SootopolisCity_Gym_1F_Layout .4byte SootopolisCity_Gym_1F_MapEvents .4byte SootopolisCity_Gym_1F_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_Gym_1F/map.bin b/data/maps/SootopolisCity_Gym_1F/map.bin deleted file mode 100644 index dd52448c9..000000000 Binary files a/data/maps/SootopolisCity_Gym_1F/map.bin and /dev/null differ diff --git a/data/maps/SootopolisCity_Gym_B1F/border.bin b/data/maps/SootopolisCity_Gym_B1F/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/SootopolisCity_Gym_B1F/border.bin and /dev/null differ diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc index 5473a347b..6265830e9 100644 --- a/data/maps/SootopolisCity_Gym_B1F/header.inc +++ b/data/maps/SootopolisCity_Gym_B1F/header.inc @@ -1,5 +1,5 @@ SootopolisCity_Gym_B1F: @ 8483A44 - .4byte SootopolisCity_Gym_B1F_MapAttributes + .4byte SootopolisCity_Gym_B1F_Layout .4byte SootopolisCity_Gym_B1F_MapEvents .4byte SootopolisCity_Gym_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_Gym_B1F/map.bin b/data/maps/SootopolisCity_Gym_B1F/map.bin deleted file mode 100644 index 58410408f..000000000 --- a/data/maps/SootopolisCity_Gym_B1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -%&&&&&&&&&&&&&&&'-%             '/-]2222222222222^/-]2222222222222^/-]2222222222222^/5]2222222222222^7&57&..-%        '/..-]222222222^/-]222222222^/&&5]222222222^7&&&&&5=7&&&....-.%  './....-]222^/&&&&5]222^7&&&&&&&&&&]222^&&&&&&...%&&&&&&'...-%      '/-]222222^/-]2222222^/-]2222222^/-]2222222^/ \ No newline at end of file diff --git a/data/maps/SootopolisCity_House1/border.bin b/data/maps/SootopolisCity_House1/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/SootopolisCity_House1/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc index 8359334d0..2551aedc1 100644 --- a/data/maps/SootopolisCity_House1/header.inc +++ b/data/maps/SootopolisCity_House1/header.inc @@ -1,5 +1,5 @@ SootopolisCity_House1: @ 8483AB4 - .4byte SootopolisCity_House1_MapAttributes + .4byte SootopolisCity_House1_Layout .4byte SootopolisCity_House1_MapEvents .4byte SootopolisCity_House1_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_House1/map.bin b/data/maps/SootopolisCity_House1/map.bin deleted file mode 100644 index 43f11b194..000000000 --- a/data/maps/SootopolisCity_House1/map.bin +++ /dev/null @@ -1 +0,0 @@ -ððñððñð0ÍøùøøùøÕ2ÿ3ÿ3ÿ3ÿ3ÿ3ÿ3µ2ÿ3þ3Ý2ó7ô7Þ2þ3þ3ÿ3þ3Ý2û7ü7Þ2þ3þ3ÿ3þ3þ3þ3þ3þ3þ3þ3ÿ3þ3þ3 þ3þ3þ3 \ No newline at end of file diff --git a/data/maps/SootopolisCity_House2/border.bin b/data/maps/SootopolisCity_House2/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/SootopolisCity_House2/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc index 3cd04937a..24e7a778a 100644 --- a/data/maps/SootopolisCity_House2/header.inc +++ b/data/maps/SootopolisCity_House2/header.inc @@ -1,5 +1,5 @@ SootopolisCity_House2: @ 8483AD0 - .4byte SootopolisCity_House2_MapAttributes + .4byte SootopolisCity_House2_Layout .4byte SootopolisCity_House2_MapEvents .4byte SootopolisCity_House2_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_House2/map.bin b/data/maps/SootopolisCity_House2/map.bin deleted file mode 100644 index 632e1e36a..000000000 --- a/data/maps/SootopolisCity_House2/map.bin +++ /dev/null @@ -1 +0,0 @@ -ðÈÉððòðð”vwÍøúø”œ6Ø2Ù2Õ2ÿ3ÿ3ÿ3œ6ÿ3þ3þ3Ý2ó7ô7Þ2þ3ÿ3þ3þ3þ3û7ü7Þ2þ3ÿ3þ3þ3þ3þ3þ3þ3þ3ÿ3þ3þ3 þ3þ3þ3 \ No newline at end of file diff --git a/data/maps/SootopolisCity_House3/border.bin b/data/maps/SootopolisCity_House3/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/SootopolisCity_House3/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc index c3ee80da0..97ae23fb7 100644 --- a/data/maps/SootopolisCity_House3/header.inc +++ b/data/maps/SootopolisCity_House3/header.inc @@ -1,5 +1,5 @@ SootopolisCity_House3: @ 8483AEC - .4byte SootopolisCity_House3_MapAttributes + .4byte SootopolisCity_House3_Layout .4byte SootopolisCity_House3_MapEvents .4byte SootopolisCity_House3_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_House3/map.bin b/data/maps/SootopolisCity_House3/map.bin deleted file mode 100644 index 8bbd6c517..000000000 --- a/data/maps/SootopolisCity_House3/map.bin +++ /dev/null @@ -1 +0,0 @@ -ðððòòððð½»¼úúø’“Å6Ã2Ä2ÿ3ÿ3ÿ3š2›2ÿ3þ3þ3þ3þ3þ3þ3þ3Ý7Þ7Þ2þ3þ3þ3þ3þ3å7ß7þ3þ3þ3þ3þ3þ3ÿ3þ3þ3 þ3þ3þ3 \ No newline at end of file diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc index 9d610b9a1..d39499132 100644 --- a/data/maps/SootopolisCity_House4/header.inc +++ b/data/maps/SootopolisCity_House4/header.inc @@ -1,5 +1,5 @@ SootopolisCity_House4: @ 8483B08 - .4byte SootopolisCity_House4_MapAttributes + .4byte SootopolisCity_House1_Layout .4byte SootopolisCity_House4_MapEvents .4byte SootopolisCity_House4_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc index 29157d4df..d6de286cf 100644 --- a/data/maps/SootopolisCity_House5/header.inc +++ b/data/maps/SootopolisCity_House5/header.inc @@ -1,5 +1,5 @@ SootopolisCity_House5: @ 8483B24 - .4byte SootopolisCity_House5_MapAttributes + .4byte SootopolisCity_House2_Layout .4byte SootopolisCity_House5_MapEvents .4byte SootopolisCity_House5_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc index c05d23e64..36460f147 100644 --- a/data/maps/SootopolisCity_House6/header.inc +++ b/data/maps/SootopolisCity_House6/header.inc @@ -1,5 +1,5 @@ SootopolisCity_House6: @ 8483B40 - .4byte SootopolisCity_House6_MapAttributes + .4byte SootopolisCity_House3_Layout .4byte SootopolisCity_House6_MapEvents .4byte SootopolisCity_House6_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc index 3f02bdcc5..383ab24b5 100644 --- a/data/maps/SootopolisCity_House7/header.inc +++ b/data/maps/SootopolisCity_House7/header.inc @@ -1,5 +1,5 @@ SootopolisCity_House7: @ 8483B5C - .4byte SootopolisCity_House7_MapAttributes + .4byte SootopolisCity_House1_Layout .4byte SootopolisCity_House7_MapEvents .4byte SootopolisCity_House7_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/border.bin b/data/maps/SootopolisCity_LotadAndSeedotHouse/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/SootopolisCity_LotadAndSeedotHouse/border.bin and /dev/null differ diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc index 0ceade178..792b5ae31 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc @@ -1,5 +1,5 @@ SootopolisCity_LotadAndSeedotHouse: @ 8483B78 - .4byte SootopolisCity_LotadAndSeedotHouse_MapAttributes + .4byte SootopolisCity_LotadAndSeedotHouse_Layout .4byte SootopolisCity_LotadAndSeedotHouse_MapEvents .4byte SootopolisCity_LotadAndSeedotHouse_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.bin b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.bin deleted file mode 100644 index ffeea7269..000000000 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.bin +++ /dev/null @@ -1 +0,0 @@ -ÈÉXX®¯`øø`””Ø2Ù2ÿ3ÿ3ÿ3ÿ3œ6œ6ÿ3þ3þ3ó7ô7þ3þ3þ3ÿ3þ3Ý2û7ü7Þ2þ3þ3ÿ3þ3þ3þ3þ3þ3þ3þ3ÿ3þ3þ3 þ3þ3þ3 \ No newline at end of file diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc index 3b4aaa171..ac4ae5ea0 100644 --- a/data/maps/SootopolisCity_Mart/header.inc +++ b/data/maps/SootopolisCity_Mart/header.inc @@ -1,5 +1,5 @@ SootopolisCity_Mart: @ 8483A98 - .4byte SootopolisCity_Mart_MapAttributes + .4byte Mart_Layout .4byte SootopolisCity_Mart_MapEvents .4byte SootopolisCity_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/border.bin b/data/maps/SootopolisCity_MysteryEventsHouse_1F/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/SootopolisCity_MysteryEventsHouse_1F/border.bin and /dev/null differ diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc index 72e09b813..2e5ea1f84 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc @@ -1,5 +1,5 @@ SootopolisCity_MysteryEventsHouse_1F: @ 8483B94 - .4byte SootopolisCity_MysteryEventsHouse_1F_MapAttributes + .4byte SootopolisCity_MysteryEventsHouse_1F_Layout .4byte SootopolisCity_MysteryEventsHouse_1F_MapEvents .4byte SootopolisCity_MysteryEventsHouse_1F_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.bin b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.bin deleted file mode 100644 index a9b17a746..000000000 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -89:' @AB /6666-7$%655555555556555555655555565555555555655 555555 \ No newline at end of file diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/border.bin b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/border.bin and /dev/null differ diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc index d4497b3e9..c3ffec414 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc @@ -1,5 +1,5 @@ SootopolisCity_MysteryEventsHouse_B1F: @ 8483BB0 - .4byte SootopolisCity_MysteryEventsHouse_B1F_MapAttributes + .4byte SootopolisCity_MysteryEventsHouse_B1F_Layout .4byte SootopolisCity_MysteryEventsHouse_B1F_MapEvents .4byte SootopolisCity_MysteryEventsHouse_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.bin b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.bin deleted file mode 100644 index 558e1584e..000000000 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -  -        6666666666655555555555655 !!!!"555655())))*5556550111125555555555555#5555555555 \ No newline at end of file diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc index 28fdf23bd..83485cbf1 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ SootopolisCity_PokemonCenter_1F: @ 8483A60 - .4byte SootopolisCity_PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte SootopolisCity_PokemonCenter_1F_MapEvents .4byte SootopolisCity_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc index 97000d2b7..ba2bb5c0d 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ SootopolisCity_PokemonCenter_2F: @ 8483A7C - .4byte SootopolisCity_PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte SootopolisCity_PokemonCenter_2F_MapEvents .4byte SootopolisCity_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/SouthernIsland_Exterior/border.bin b/data/maps/SouthernIsland_Exterior/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/SouthernIsland_Exterior/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc index 700a6cf00..d0d35fea1 100644 --- a/data/maps/SouthernIsland_Exterior/header.inc +++ b/data/maps/SouthernIsland_Exterior/header.inc @@ -1,5 +1,5 @@ SouthernIsland_Exterior: @ 8485238 - .4byte SouthernIsland_Exterior_MapAttributes + .4byte SouthernIsland_Exterior_Layout .4byte SouthernIsland_Exterior_MapEvents .4byte SouthernIsland_Exterior_MapScripts .4byte 0x0 diff --git a/data/maps/SouthernIsland_Exterior/map.bin b/data/maps/SouthernIsland_Exterior/map.bin deleted file mode 100644 index 8c2c2df4a..000000000 --- a/data/maps/SouthernIsland_Exterior/map.bin +++ /dev/null @@ -1 +0,0 @@ -qssÆ4Æ4ÆÆ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ40uuuuqssÆ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4t}uuuqssÆ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4uquuuqssÆ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4uquuuqssÆ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ477Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4ut}uuqss4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ433Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ44uuquu‰ss04Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ44334Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4t}ut}uss{|‰Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ40004Æ4Æ4444444Æ4uquut}s{‰qsÆ4Æ4Æ4Æ4Æ4Æ4Æ4Æ40000440000004ut}uu€˜{‰sqs4Æ4Æ4Æ4Æ4Æ4Æ4Æ40000000Æ4Æ4Æ4000uuquup‰s{‰s044Æ4Æ4Æ4Æ4Æ4Æ400000Æ4Æ4Æ4Æ4400uuquups{‰s{À6Î4‰4Æ4Æ4Æ4Æ4Æ4Æ400044444t¯0Ï0zuquup{‰s{‰44p044Æ4Æ4Æ4Æ4Æ4Æ44tÀ6À6À6À6z000ut}upssq{|‰{||‰444444tz4444t¯0Ï0yzuqup’ssqqq{Î4Î4‰{À6À6À6|||}tyyyyz0000ut}p’s{|||‰44x‰444t‘‘‘z0000000t|}u€˜p’sqqqq{||‰xyyyz0000000000t}qt}pp’{||‰qqqqs0000000000t||||}t|}€˜ppš‰‰{||‰q{|||||¯0Ï0|||}t©©©©}€‰˜ppppppš‰‰{|©©©©©]^0^0_©©©}€‰‰‰‰˜pppppppppppš‰‰‰‰‰‰‰]^0^0_Ÿ‰‰‰˜ppppppppppppppppppppUV0V0V0…2^0^0_qpppppppppppppppppppppppp]^0^0^0^0^0^0_qppppppppppppppppppppppppSTTV3W3TTUqpppppppppppppppppppppppp[\\\\\\]qppppppppppppppppppppppppqqqqqqqqqpppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp \ No newline at end of file diff --git a/data/maps/SouthernIsland_Interior/border.bin b/data/maps/SouthernIsland_Interior/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/SouthernIsland_Interior/border.bin +++ /dev/null @@ -1 +0,0 @@ -ÔÕÜÝ \ No newline at end of file diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc index a7b9f14a0..1a080af1e 100644 --- a/data/maps/SouthernIsland_Interior/header.inc +++ b/data/maps/SouthernIsland_Interior/header.inc @@ -1,5 +1,5 @@ SouthernIsland_Interior: @ 8485254 - .4byte SouthernIsland_Interior_MapAttributes + .4byte SouthernIsland_Interior_Layout .4byte SouthernIsland_Interior_MapEvents .4byte SouthernIsland_Interior_MapScripts .4byte 0x0 diff --git a/data/maps/SouthernIsland_Interior/map.bin b/data/maps/SouthernIsland_Interior/map.bin deleted file mode 100644 index db1e4b153..000000000 --- a/data/maps/SouthernIsland_Interior/map.bin +++ /dev/null @@ -1 +0,0 @@ -ÜÝÔÕÜÝÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÜÝÔÕÜÔÕÜÝÔÕÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÔÕÜÝÔæåÔÕÜÝÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÜÝÔÕäÎÏæåÔÕÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÔÕäòÏÔ×ÎÏæåÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕäòÏÔÕÜÝÔ×ÎÏæåÜÝäåäåäåäòóçäòÏÔÕÜÝÔÕÜÝÔ×ÎÏÔÕ0000000ÔÕÎÏÔÕÜÝÔÕÜÝÔÕÜÝÔÕäç0000000æåÔÕÜÝÔÕÜÝÔÕÜÝÔÕÜÝ00000000000ÜÝÔÕÜÝÔÕÜÝÔÕÜÝÔÕ00È0É0Ê00È0É0Ê000ÔÕÜÝÔÕÜÝÔÕÜÝÔÕÜÝ00Ð0Ñ0Ú00Ø0Ñ0Ò000ÜÝÔÕÜÝÔÕÜÝÔÕÜÝÔÕ00Ð0Ò00Á60Ð0Ò000ÔÕÜÝÔÕÜÝÔÕÜÝÔÕÜÝ00Ð0Ò0000Ð0Ò000ÜÝÔÕÜÝÔÕÜÝÔÕÜÝÔÕ00Ð0Ñ0É0É0É0Ñ0Ò000ÔÕÜÝÔÕÜÝÔÕÜÝÔÕÜÝ00Ø0Ñ0Ñ0Ñ0Ñ0Ñ0Ú000ÜÝÔÕÜÝÔÕÜÝÔÕÜÝÔÕÎ1Ï10Ø0Ù0Ù0Ù0Ú00ÎÏÔÕÜÝÔÕÜÝÔÕÜÝÔÕäåÔ×0000000ÖÕäåÔÕÜÝÔÕÜÝÔÕäòÏ1ÎóòÏ1Î1Ï100Î1Ï1ÜÝÎÏæåÔÕÜÝÔÕäòÏ1ÔÕÔÕÔÕÔ×22ÖÕÔÕÔ×ÎÏæåÔÕäòÏ1ÔÕÜÝÜÝÜÝÜÝÐÒÜÝÜÝÜÝÔ×ÎÏæåÏ1ÔÕÜÝÖÕÔÕÔÕÔÕØÚÔÕÔÕÔÕÜÝÔ×ÎÏÕÜÝÖÕÜÝÜÝÜÝÜÝØÚÜÝÜÝÜÝÔÕÜÝÔ×ÝÖÕÜÝÖÕÔÕÔÕÔÕØÚÔÕÔÕÔÕÜÝÔÕÜÝÕÜÝÖÕÜÝÜÝÜÝÜÝØÚÜÝÜÝÜÝÔÕÜÝÔÕ \ No newline at end of file diff --git a/data/maps/TerraCave_End/border.bin b/data/maps/TerraCave_End/border.bin deleted file mode 100644 index f0eabd248..000000000 --- a/data/maps/TerraCave_End/border.bin +++ /dev/null @@ -1 +0,0 @@ -ññññ \ No newline at end of file diff --git a/data/maps/TerraCave_End/header.inc b/data/maps/TerraCave_End/header.inc index 419388afa..900f5930f 100644 --- a/data/maps/TerraCave_End/header.inc +++ b/data/maps/TerraCave_End/header.inc @@ -1,5 +1,5 @@ TerraCave_End: @ 8484A3C - .4byte TerraCave_End_MapAttributes + .4byte TerraCave_End_Layout .4byte TerraCave_End_MapEvents .4byte TerraCave_End_MapScripts .4byte 0x0 diff --git a/data/maps/TerraCave_End/map.bin b/data/maps/TerraCave_End/map.bin deleted file mode 100644 index 93121190d..000000000 --- a/data/maps/TerraCave_End/map.bin +++ /dev/null @@ -1,9 +0,0 @@ -ññññññññëùùùùùùùùìñññññññññññññññññ ëùùùìñññ -ñññññññññññëùùùùù õ2õ2õ2 -ñññ -ñññññññññññ ëùùùùùõ2õ2õ2ùùì -ñññññññññññ  õ2ö2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2ð -ñññññññññññ ôåæçéõ2õ2õ2õ2õ2õ2õ2ð -ñññññññññññééééñ õ2õ2õ2õ2õ2õ2õ2ð -ñññññññññññññññ ñ õ2õ2õ2õ2õ2õ2õ2ðùùùìññññññëùùùùëõ2õ2õ2õ2õ2õ2õ2 -ññññøùùùùìñ ëùùùùúùùùùùùìññðñ ò222222  "ðññðñ ò2222222222ðññðñ ò22222222   #øùìðñ ò222222  #       "ððñ ò22222 ##ððñ ò22222ððñ ò2222 ##ððñ ò2222efgððñ ò222 #esdrfgððñ ò222efsdd_drfgððñ ò222qdd__d_ddpððñ ò222qd_d____dpððñ ò2222es_d__d_d_pððñ ò2222qdd___d_ddpððñ ò2222#2#2bdd_d_d_dpððñ ò222222#2b_d_d_`a3a3#2ððñ ò2222222222#2a3a3a3a3a3#2    ððñ ò       "2222222222ððñ óóóóóóóóóóóóóóóóóóóóóóóóðñóóóóóóóóóóóóóóóóóóóóóóóóóó \ No newline at end of file diff --git a/data/maps/TerraCave_Entrance/border.bin b/data/maps/TerraCave_Entrance/border.bin deleted file mode 100644 index f0eabd248..000000000 --- a/data/maps/TerraCave_Entrance/border.bin +++ /dev/null @@ -1 +0,0 @@ -ññññ \ No newline at end of file diff --git a/data/maps/TerraCave_Entrance/header.inc b/data/maps/TerraCave_Entrance/header.inc index f0e4df143..02c5edb91 100644 --- a/data/maps/TerraCave_Entrance/header.inc +++ b/data/maps/TerraCave_Entrance/header.inc @@ -1,5 +1,5 @@ TerraCave_Entrance: @ 8484A20 - .4byte TerraCave_Entrance_MapAttributes + .4byte TerraCave_Entrance_Layout .4byte TerraCave_Entrance_MapEvents .4byte TerraCave_Entrance_MapScripts .4byte 0x0 diff --git a/data/maps/TerraCave_Entrance/map.bin b/data/maps/TerraCave_Entrance/map.bin deleted file mode 100644 index a8108c2ca..000000000 --- a/data/maps/TerraCave_Entrance/map.bin +++ /dev/null @@ -1,33 +0,0 @@ -ññññ ññññññëùþÿùìññññññ ñññëùùë3ì -ññññññ ñññ ëùùõ2õ2õ2 - -ññññññ ñëù õ2õ2õ2õ2õ2õ2 - -ñññññëñ ëùõ2õ2óõ2 - -ñññññ ëù õ2õ2õ2õ2 -ñ õ2 - -ññññë ëùõ2õ2õ2õ2 -ñ õ2 - -ññññ ë õ2õ2õ2õ2õ2õ2 -ñ õ2 - -ññëù ëõ2õ2óóóóñ õ2 - -ññ ëù õ2õ2óñëùùùõ2 - -ññ  ëùõ2õ2 -ññ õ2õ2õ2õ2õ2 - -ññ   õ2õ2õ2õ2 -ñëõ2õ2õ2õ2õ2 - -ññ   õ2õ2õ2õ2 -ëõ2õ2õ2õ2õ2õ2 -ùì   õ2õ2õ2õ2õ2õ2õ2õ2õ2ùì -   õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2 - õ2õ2õ2ð -   õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2ð - ôõ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2ôó ññõ2õ2õ2õ2õ2õ2õ2ôôôôôññ ñññôõ2öõ2õ2ôñññññññ ñññññôåæçôôññññññññ \ No newline at end of file diff --git a/data/maps/TradeCenter/border.bin b/data/maps/TradeCenter/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/TradeCenter/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index 757b3f0a4..55afa79f3 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -1,5 +1,5 @@ TradeCenter: @ 8484D4C - .4byte TradeCenter_MapAttributes + .4byte TradeCenter_Layout .4byte TradeCenter_MapEvents .4byte TradeCenter_MapScripts .4byte 0x0 diff --git a/data/maps/TradeCenter/map.bin b/data/maps/TradeCenter/map.bin deleted file mode 100644 index 7e592dbe6..000000000 --- a/data/maps/TradeCenter/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -017456742389?<=  >?<:;@AGDE((FGDBCHI2.2222222.2J2KP22 -2 2 2 22222SPQ2+22222+2R2SP2222222222SXY222#2$2%2&222Z2[,2-2 \ No newline at end of file diff --git a/data/maps/TrainerHill_1F/border.bin b/data/maps/TrainerHill_1F/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/TrainerHill_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/TrainerHill_1F/header.inc b/data/maps/TrainerHill_1F/header.inc index 7c6a4ea0e..e5fd3b576 100644 --- a/data/maps/TrainerHill_1F/header.inc +++ b/data/maps/TrainerHill_1F/header.inc @@ -1,5 +1,5 @@ TrainerHill_1F: @ 84857E8 - .4byte TrainerHill_1F_MapAttributes + .4byte TrainerHill_1F_Layout .4byte TrainerHill_1F_MapEvents .4byte TrainerHill_1F_MapScripts .4byte 0x0 diff --git a/data/maps/TrainerHill_1F/map.bin b/data/maps/TrainerHill_1F/map.bin deleted file mode 100644 index d72e84a5c..000000000 --- a/data/maps/TrainerHill_1F/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -'  2/(282929292/(8292929212;2;2;2 -12;2;2;212;2;2;2       12;2;2;212;2;2;292928292:2;2;2;212;2;2;2;2;2929292:2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;2 \ No newline at end of file diff --git a/data/maps/TrainerHill_2F/border.bin b/data/maps/TrainerHill_2F/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/TrainerHill_2F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/TrainerHill_2F/header.inc b/data/maps/TrainerHill_2F/header.inc index d9a6d6204..712c99cec 100644 --- a/data/maps/TrainerHill_2F/header.inc +++ b/data/maps/TrainerHill_2F/header.inc @@ -1,5 +1,5 @@ TrainerHill_2F: @ 8485804 - .4byte TrainerHill_2F_MapAttributes + .4byte TrainerHill_2F_Layout .4byte TrainerHill_2F_MapEvents .4byte TrainerHill_2F_MapScripts .4byte 0x0 diff --git a/data/maps/TrainerHill_2F/map.bin b/data/maps/TrainerHill_2F/map.bin deleted file mode 100644 index 8b78fd0b4..000000000 --- a/data/maps/TrainerHill_2F/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -'  2/(282929292/(8292929212;2;2;2 -12;2;2;212;2;2;2      12;2;2;212;2;2;292928292:2;2;2;212;2;2;2;2;2929292:2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;2 \ No newline at end of file diff --git a/data/maps/TrainerHill_3F/border.bin b/data/maps/TrainerHill_3F/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/TrainerHill_3F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/TrainerHill_3F/header.inc b/data/maps/TrainerHill_3F/header.inc index c88a11d6d..92bbd40a1 100644 --- a/data/maps/TrainerHill_3F/header.inc +++ b/data/maps/TrainerHill_3F/header.inc @@ -1,5 +1,5 @@ TrainerHill_3F: @ 8485820 - .4byte TrainerHill_3F_MapAttributes + .4byte TrainerHill_3F_Layout .4byte TrainerHill_3F_MapEvents .4byte TrainerHill_3F_MapScripts .4byte 0x0 diff --git a/data/maps/TrainerHill_3F/map.bin b/data/maps/TrainerHill_3F/map.bin deleted file mode 100644 index 5280752f4..000000000 --- a/data/maps/TrainerHill_3F/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -'  2/(282929292/(8292929212;2;2;2 -12;2;2;212;2;2;2      12;2;2;212;2;2;292928292:2;2;2;212;2;2;2;2;2929292:2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;2 \ No newline at end of file diff --git a/data/maps/TrainerHill_4F/border.bin b/data/maps/TrainerHill_4F/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/TrainerHill_4F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/TrainerHill_4F/header.inc b/data/maps/TrainerHill_4F/header.inc index 6122362b6..5de769778 100644 --- a/data/maps/TrainerHill_4F/header.inc +++ b/data/maps/TrainerHill_4F/header.inc @@ -1,5 +1,5 @@ TrainerHill_4F: @ 848583C - .4byte TrainerHill_4F_MapAttributes + .4byte TrainerHill_4F_Layout .4byte TrainerHill_4F_MapEvents .4byte TrainerHill_4F_MapScripts .4byte 0x0 diff --git a/data/maps/TrainerHill_4F/map.bin b/data/maps/TrainerHill_4F/map.bin deleted file mode 100644 index 3a285b7f8..000000000 --- a/data/maps/TrainerHill_4F/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -'  2/(282929292/(8292929212;2;2;2 -12;2;2;212;2;2;2      12;2;2;212;2;2;292928292:2;2;2;212;2;2;2;2;2929292:2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;2 \ No newline at end of file diff --git a/data/maps/TrainerHill_Elevator/header.inc b/data/maps/TrainerHill_Elevator/header.inc index 9d1227640..13912579d 100644 --- a/data/maps/TrainerHill_Elevator/header.inc +++ b/data/maps/TrainerHill_Elevator/header.inc @@ -1,5 +1,5 @@ TrainerHill_Elevator: @ 8485ADC - .4byte TrainerHill_Elevator_MapAttributes + .4byte BattleElevator_Layout .4byte TrainerHill_Elevator_MapEvents .4byte TrainerHill_Elevator_MapScripts .4byte 0x0 diff --git a/data/maps/TrainerHill_Entrance/border.bin b/data/maps/TrainerHill_Entrance/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/TrainerHill_Entrance/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/TrainerHill_Entrance/header.inc b/data/maps/TrainerHill_Entrance/header.inc index eae0676da..f37950d98 100644 --- a/data/maps/TrainerHill_Entrance/header.inc +++ b/data/maps/TrainerHill_Entrance/header.inc @@ -1,5 +1,5 @@ TrainerHill_Entrance: @ 84857CC - .4byte TrainerHill_Entrance_MapAttributes + .4byte TrainerHill_Entrance_Layout .4byte TrainerHill_Entrance_MapEvents .4byte TrainerHill_Entrance_MapScripts .4byte 0x0 diff --git a/data/maps/TrainerHill_Entrance/map.bin b/data/maps/TrainerHill_Entrance/map.bin deleted file mode 100644 index fc00c0a5f..000000000 --- a/data/maps/TrainerHill_Entrance/map.bin +++ /dev/null @@ -1,2 +0,0 @@ - !:;7<!'()BC3D)/(8335333/(O3N313M3L3/(K73J/(937393/(7373R73/&!!!ST"P373Q3*!!!#$%UV73)))+,-.   33I73H33 33533A3534 -393353353353@3130353353353353373031303130313031303130313031303130313631303130313031303130313031303130313037333313031303130313031303133331363   0313031303130313031303   03730313031303130313000313031303130313 \ No newline at end of file diff --git a/data/maps/TrainerHill_Roof/border.bin b/data/maps/TrainerHill_Roof/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/TrainerHill_Roof/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/TrainerHill_Roof/header.inc b/data/maps/TrainerHill_Roof/header.inc index 3754fc21a..3527f447f 100644 --- a/data/maps/TrainerHill_Roof/header.inc +++ b/data/maps/TrainerHill_Roof/header.inc @@ -1,5 +1,5 @@ TrainerHill_Roof: @ 8485858 - .4byte TrainerHill_Roof_MapAttributes + .4byte TrainerHill_Roof_Layout .4byte TrainerHill_Roof_MapEvents .4byte TrainerHill_Roof_MapScripts .4byte 0x0 diff --git a/data/maps/TrainerHill_Roof/map.bin b/data/maps/TrainerHill_Roof/map.bin deleted file mode 100644 index 815ec1067..000000000 --- a/data/maps/TrainerHill_Roof/map.bin +++ /dev/null @@ -1 +0,0 @@ -€€€€€€€XYajjZggd\]€€€€€€€€€€€€€€`ajjjZgggde€€€€€€€…………………hijjjZggglm…………………gggggg¿pqrijZglstu¿ggggggkkkkkkÅxyz^_bvw{|}ÅkkkkkkkkkkkkÅk3‚3fg[~ƒ„k3ÅkkkkkkÎkÎkkkÅk3k3k3n3oc†‡3k3k3k3ÅkkkÎkÎÏkÏkkkÅk3k3k3k3k3k3k3k3k3k3k3ÅkkkÏkÏkkkkkkÅk3k3k3k3k3k3k3k3k3k3k3ÅkkkkkkkkkkkkÆk3k3k3k3k3k3k3k3k3k3k3Ækkkkkk”•3k3¾3¾3¾3¾3¾3¾3¾3k3¨3©¦¦¦¦¦¦À—————ˆ“”¶ÇÇÇÇÇ·©ª¥®®®®®ÁŸŸŸŸŸ‘’“”•k¨©ª«¬­ŸŸŸŸŸÃŸŸŸŸŸ˜™š›œŽ°±²³´µŸŸŸŸŸÃŸ§§§Ÿ˜¸¹‹Œ– ¡¢¼½µŸ§§§ŸÃŸ¯¯¯Ÿ˜ÈÉʉ€žW¤ËÌ͵Ÿ¯¯¯ŸÃ \ No newline at end of file diff --git a/data/maps/Underwater1/border.bin b/data/maps/Underwater1/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/Underwater1/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc index 2c7de8477..d63ca8815 100644 --- a/data/maps/Underwater1/header.inc +++ b/data/maps/Underwater1/header.inc @@ -1,5 +1,5 @@ Underwater1: @ 8482A30 - .4byte Underwater1_MapAttributes + .4byte Underwater1_Layout .4byte Underwater1_MapEvents .4byte Underwater1_MapScripts .4byte Underwater1_MapConnections diff --git a/data/maps/Underwater1/map.bin b/data/maps/Underwater1/map.bin deleted file mode 100644 index 230e3dcd2..000000000 --- a/data/maps/Underwater1/map.bin +++ /dev/null @@ -1,17 +0,0 @@ -22„„„„„„„„„„„„„„„„„„„„„„2222€2©2©22©2©2222222222©2©2222©2©2…„„„„„22„„„„2222€2©222222©2©222©2©2©222222©2©2©2©22222‚22°222€2©2©2©2…# 22 -"##~22222222©2©222222©2©2©222222‚22222€2©2©2©2©2Ž#  "#####~2222222©2©2©2©2}####### 22 -||~©22Ž###~22©2©2©2©2©2©2Ž#  "22Ž######~©2©2Ž22Ž„„„„„„„„„22©2©2Ž22…22©2©2©2©2©2©2‚22222©2©2…222Ž†222©2©2©2©2©2‚222222©2©2Ž222Ž22222}|||| 22 -"2©2©2…222Ž22222Ž#  "22©2©2…©222Ž22222Ž222©2©2…„„„„„„„„„„†©2©22Ž22222Ž222©2©2©2©2©2©2©2222222©2©2©2©2Ž22222Ž#|~22©2222©2©2©22222©2©2©2©2©2Ž#~222©2Ž#||~22222©2©2©2©2©2©2©2©2©2©2Ž2©2©2©2Ž#|||||||||||~©2©2©2Ž#~©2©2©2…„22#~©2©2Ž©2©2©2©2‚22222©2©2Ž#~©2©2©2‚22222©22Ž#|||# 22 -"©22Ž#  "„„„„„„„„22Ž22222222Ž22Ž†22222222…22Ž†2222222222…„22Ž2222©2©2©2222222Ž©22Ž†2222©2©2©2©222222Ž†©22Ž2222222©2©2©22222…222©2©2Ž222222222©222222Ž22222©2©2Ž22222‰2‰222©2©22222Ž22222©2©2Ž222222‚222€2©2©2©2©2©222Ž# 22 -"©2©2}"22222222‚222€2©222©2©222Žy2y2Ž©2©2Ž22°2222222y2y2©2222©2©222Ž©2©2Ž22†©2©2Ž# 22 -""~2222222222©2222Ž©2©2Ž22°22€2©2©2Ž#  "222222222222}|"†2©2Ž2222€2©2©2Ž22222222222222Ž222Ž# 22 -|||"2222222222222222Ž222Ž#  "2222"~2222©22222}|"222Ž# 22 -""|~22222}|"22}|#  ""|||||"©2©2Ž©2©2Ž©2©2Ž©2©2…©2©2©2…„„„„„„„„„©2©2©2©2©2©2©2©2©22222…„22†©2©2©2©2©2©2©2©22222222…2222©2©2©2©2©2}||~22222222Ž2222©2©2©2©2}"22222222Ž# 22 -"†©2©2©2©2Ž"~2222©222Ž#  "22©2©2©2©2}""|~}"2222©2©2©2}""|||||2222©2©2©2Ž22°22©2©2©2…# 22 -"©2©2©2©2Ž#  "©2©2©2©2…22"~©2©2©2©2Ž2222"~©2©2©2Ž222222„„„„„„„"~©2©2Žz222 -"2222€2©2©22222…„„©2©2Ž©2y2y2Ž2222€2©2©22222222…„©2©2Ž#~©2©2Ž# 22 -"||||~222222Ž‰2‰2Ž2©2Ž22#  "#|~2222…„„„2222…2°222©2©2©2©2©2©2©2‚22222222Ž2222#|~©2©2©2©2©2‚22222222Ž# 22 -"||||||# 22 -"222Ž#  "#  "©222Ž©2©22Ž†©2©2}"22ˆ2©2©2Ž2222ˆ2‰2Ž2222 - "# 22 -"#  " \ No newline at end of file diff --git a/data/maps/Underwater2/border.bin b/data/maps/Underwater2/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/Underwater2/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc index 1f29f52f9..a2754c69e 100644 --- a/data/maps/Underwater2/header.inc +++ b/data/maps/Underwater2/header.inc @@ -1,5 +1,5 @@ Underwater2: @ 8482A4C - .4byte Underwater2_MapAttributes + .4byte Underwater2_Layout .4byte Underwater2_MapEvents .4byte Underwater2_MapScripts .4byte Underwater2_MapConnections diff --git a/data/maps/Underwater2/map.bin b/data/maps/Underwater2/map.bin deleted file mode 100644 index 0c6377c30..000000000 --- a/data/maps/Underwater2/map.bin +++ /dev/null @@ -1,35 +0,0 @@ -†©2Š222ˆ2Ž†‰2‰2…†222222©2‚22222Ž‚222€2©2©2©22222222©2‚22222Ž‚222€2©2©2©2©2222222©2©2z222x2Ž#~6y2y2©2©2}||||||||||||||##||||#2222222222222222222222222#       22222222222/# 222222222222222222 -    222222222222222222222#  22222222222222222222222# 22222222222222222222222222# 222222222222222222222222°2222222222222222222222222 -    22222222222222222222222222222222 -" #  222/2222°222 22222222222222°2222±2±2±2Ž "#/#   "# 22222 -"222222222222222222©2©2©2Ž##     " "2222222222222222222©2©2©2Ž/ "222222 -  2222222222©2©2©2Ž22222 -  22222222¨2¨2¨2Ž222222/  2222222222/2222222222222/#  22222# 222222222222222222222222 -"#22/2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222 -"2222222222222222222222222222222222222222222222222# 22222222222222222 -   2222222222222222222222222222222222222222 -   "#     22222222222222222222222222222222222 - " /#           22222222222222/2222222222 -"/ " #/#  22222222/222°2222222222 - " " "# /#/# 22222222°22222222222 - " "/ "#/#/# 2222222222222222222 -" "/ "#/## 2222222222 -"222222 -" " "#/#/# 22222# 2°22/2222222 "/ "### 22222#/222222222 -" "##22222222222222 " "#/# 2222222222222## 2222## 2 -"22222 -  "/2222/# "/222222 "##2222#22222222222#2222222/### 2222/2222222//622222/222222 - 22222222222/22222#222222/222222222222/222222#2222222222222//2222222222222 -"22222222222222222222//62222222/# 2222222/2222222/ "2222222/2222222 -"## 2222222/222222 -" "22222222222222/222222222/222°222 -"/ "# 222222222/22222222222222222//2222222 "222222222222//2222222 -"#/# 22222222222222efg2222222222/ "„„„„##   222222222222222222mno222222222222222†©2‰2‰2©2… #  222222222222222222222222222222222222222222 -" "†©2Š222ˆ2©2Ž /#  222222222222222222222222222222222222222 -"„†©2‚22222€2Ž##    22222222222222222222222222222222 -  " "6©2©2©2‚22222€2Ž/# 222222222222222222222222222222 -"/62©2©2©2z222x2©2Ž##  2222222222222222222222222 -  " "622}~©2y2y2©2} #   22222222222222222222 - "622Ž |||| ##   222222222222222 - "/ "622Ž/#  2222222 -     "622…„##       "/ "62222…„// "6222222Ž#"22222©2Ž|~22222Ž ||||   \ No newline at end of file diff --git a/data/maps/Underwater3/border.bin b/data/maps/Underwater3/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/Underwater3/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc index 108251489..8329304a8 100644 --- a/data/maps/Underwater3/header.inc +++ b/data/maps/Underwater3/header.inc @@ -1,5 +1,5 @@ Underwater3: @ 8482A68 - .4byte Underwater3_MapAttributes + .4byte Underwater3_Layout .4byte Underwater3_MapEvents .4byte Underwater3_MapScripts .4byte Underwater3_MapConnections diff --git a/data/maps/Underwater3/map.bin b/data/maps/Underwater3/map.bin deleted file mode 100644 index fc5c331a5..000000000 --- a/data/maps/Underwater3/map.bin +++ /dev/null @@ -1 +0,0 @@ -66666666666666666666666666666666666666666666666666666666666666&666666666666„.„„6666666666666©2©2©2©2Ž;2;266666666666666©2©2©2©2Ž;2;2;2;266666666666†©2‰2‰2©2…@2C2C2A26666666666©2Š222ˆ2©2Ž<2P2Q2:266666666666‚22222€2Ž<2T2R:266666666666‚22222€2Ž<2T2R:2666666666666©2z222x2©2Ž@2G2T2R2:266666666666@2A2©2©2y2y2©2}#@2G2P2\2R2B2A266666666666@2D2B2A2#######<2P2\2V2Z2Q2:266666666666?2P2Q2B2:2<2K2L2V2V2R2B2A266666666666?2W2]2Q2:23242T2V2V2R2S2:266666666666?2W2S2U2:2# ?2K2L2V2Z2Q2:266666666666?2W2S2U2:23242T2V2V2R2:26666666666?2Y2O2U2B2A2## ?2K2K2L2R2:26666666666I242W2U2S2:2#3242¸2L2R2:26666666666  ?2W2]2Q2:2## 42Ó2L2R2:26666666666?2Y2O2U2:2#3242L2R2:2666666666I242W2U2B2A2## 42T2R2:26666666666  ?2W2U2S2:2#42T2R2:2666666666?2W2]2Q2:242T2R20 66666666?2W2S2U2:2;242T2R2866666666?2Y2O2U2B2A242T2R28 "666666666   I242W2U2S2:2;2„„42T2R28 "666666666  ?2W2]2Q2:2@2C2A2†‰2‰2…###!a6`"  666666666?2W2S2U2:2?2S2:2†Š222ˆ2…###" "666666666?2W2S2U2B2A2?2S2:2‚22222€2Ž 66666666?2W2S2U2S2:2?2S2B2A2‚22222€2Ž "66666666?2W2S2U2S2:23242S2:2#~z222x2}# "66666666?2W2S2U2S2:2@2A2# ?2S2B2A2©2y2y2©2Ž "# "66666666?2W2S2]2Q2:2?2B2A2?2S2S2:2©2©2©2©2Ž##666666666?2W2P2Q2U2:2?2S2:2?2¸2S2:2#~©2©2©2Ž666666666?2W2T2R2U2:2?2S2:2?2S2S2:2   #~©2©2Ž&#"666666666@2A2?2W2T2R2U2:2?2S2B2A2?2S2S2:2#~©2…„„.„# "666666666<2:2?2W2T2R2U2:2@2D2P2Q2:2?2S2S2:2©2©2©2©2©2©2Ž#  666666666@2Ä2B2A2?2W2T2R2U2:2?2P2_2U2:2@2D2S2S2:2#~©2©2©2©2}##"666666666@2Ä2Ó2Ó2:2?2W2T2R2U2:2?2W2S2U2:2?2S2S22232#######666666666<2Ó2¸2Ó2B2A2?2W2T2R2U2:2;2?2W2S2U2:2?2S2S2:2" "666666666<2Ó2Ð2Ñ2S2:2;2?2W2T2R2U2B2A2?2W2S2U2:2;2?2S2S2:266666666I242T2Z2Q2:2@2G2W2T2R2U2S2:2?2W2S2U2B2A2@2D2S2S2:2#"66666666# ?2Y2L2R2B2A2?2S2W2T2R2]2Q2:2?2K2O2U2S2:2?2S2S2S2:2„„66666666I242T2Z2Q2:2?2P2_2T2Z2Q2U2:23242T2U2S2:2?2S2S22232†©2©2…6666666 6# ?2Y2L2R2:2?2W2S2T2V2R2U2:2  ?2T2U22232?2S2S2:2"  †©2‰2‰2©2…66666666I242T2R2:2?2W2P2\2V2R2U2:2;2?2T2U2:2 ?2S22232  ©2Š222ˆ2©2Ž66 66666# ?2T2R2B2A2?2W2T2V2V2R2U2B2A2?2T2U2:2@2D2S2:2"†‚22222€2Ž66666666?2T2Z2Q2:2?2W2T2V2V2R2U2S2:2?2T2U2:2?2S2S2:2  †©2‚22222€2Ž66666#?2Y2L2R2:2?2W2T2V2V2R2]2Q2:2?2T2U2:2@2D2S22232©2©2©2z222x2©2Ž66666#66I242T2R2B2A2>2?2T2Y2L2V2Z2Q2U2:2>2?2T2U2:2?2S2S2:2"  ©2©2©2©2y2y2©2}#666666666# ?2T2R2S2:2>2?2Y2O2T2V2V2R2U2:2>2>2@2D2T2U2:2@2D2S2S2:2  †‰2‰2©2©2©2©2©2Ž6666666?2T2Z2Q2:2>2?2S2W2Y2L2V2R2U2B2A2>2<2Ð2_2U2:2?2S2S22232  †Š222ˆ2©2©2©2}#666666#66#6?2T2V2R2:2>2?2S2Y2O2T2V2R2]2Q2B2C2D2T2M2K2:2?2S2S2:2" "‚22222€2©2}#666666666?2T2V2R2:2>2I242S2W2T2V2Z2Q2U2S2S2Ð2_2U22232?2S22232 "‚22222€2©2Ž66666#6666#?2Y2L2R2:2>2>2?2S2W2T2V2V2R2U2S2S2T2S2U2:2"?2S2:2"#6#~z222x2©2}|6666666#I242T2R2:2>2>2?2S2W2T2V2V2R2]2^2^2_2S2U2:2?2S2:2 """©2y2y2©2©2Ž6666#666#66# ?2T2R2:2# >2I242W2Y2L2V2Z2Q2S2S2S2M2K2:2?2S20" #~©2©2}|#666666666?2T2R20" >2>2?2Y2O2T2V2V2Z2Q2S2M2K2S2:2#!!"  #6©2©2Ž666666666##1T2R28 " >2>2I242W2Y2L2V2V2R2S2U2S22232 "#6#~}|666666669T2R28 ">2>2>2?2Y2O2T2V2V2R2M2K22232"   "Ž66666666#6##9T2R28# >2>2?2S2W2T2V2V2R2U2S2:2>2 "  #6##6666666669T2R28#>2>2I242W2T2V2V2R2U2S2:2" "  666666669T2R28>2>2>2?2W2Y2L2V2R2U2S2:2 " "666666#6669T2R28## >2>2?2Y2O2T2V2R2U22232 " "#6666666666##)) ## >2I242W2T2V2R2U2:2>2#666666666#  >2>2?2W2T2J2K2U2:2"#666666#6666# " "### >2?2W2T2R2S2U2:2 "  666666666# ">2?2W2T2R2S2U2:2 "#6#666666666 "##>2?2W2T2R2S2U2:2 " "#666#6666666#">2?2W2T2R2¸2U2:2666666666#>2?2W2T2R2S2U2:2666666666>2?2W2T2R2S2U2:2666666666>2?2W2T2R2S2U2:2666666666>2?2W2T2Z2Ñ2U2:26666666#66 ">2?2W2T2V2R2U2:2666666666>2?2W2T2V2R2U2:2#6666666666>2?2W2T2V2R2U2:2#6#6#6#6 \ No newline at end of file diff --git a/data/maps/Underwater4/border.bin b/data/maps/Underwater4/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/Underwater4/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc index 38885bcb7..f4f3e8c4b 100644 --- a/data/maps/Underwater4/header.inc +++ b/data/maps/Underwater4/header.inc @@ -1,5 +1,5 @@ Underwater4: @ 8482A84 - .4byte Underwater4_MapAttributes + .4byte Underwater4_Layout .4byte Underwater4_MapEvents .4byte Underwater4_MapScripts .4byte Underwater4_MapConnections diff --git a/data/maps/Underwater4/map.bin b/data/maps/Underwater4/map.bin deleted file mode 100644 index 23f987681..000000000 --- a/data/maps/Underwater4/map.bin +++ /dev/null @@ -1 +0,0 @@ -666666666  >2?2W2T2V2R2U2:2666666666>2?2W2T2V2R2U2:2666666666>2?2W2K2L2R2U2:2666666666# ?2K2O2T2R2U2:2666666666 3242W2T2R2U2:2666666666 "# ?2W2T2R2U2:2 66666666#?2W2T2R2U2:2#666666666 "?2W2T2R2U2B2A2 666 666666?2W2T2R2]2Q2B2C2C2C2A2 # #6666666666?2W2T2Z2Q2]2[2[2[2Q2B2C2C2C2A2 #   #6666666666#)aV2V2Z2[2[2[2Q2]2[2[2[2Q2:2;2;2;2  666666666 6 6aV2V2V2V2V2Z2[2[2[2Q2U2B2A2@2C2C2C2C2C2C2C2C2C28 666666666##))))))aV2V2R2]2Q2B2C2A2@2C2C2D2P2[2[2[2[2[2[2[2[28666666666 #)))a]2[2Q2B2C2C2C2C2D2P2[2[2_2P2[2[2[2[2[2[2`#666666 66666666 "#a[2]2[2[2[2[2[2[2_2P2[2[2\2V2V2V2V2`)"66666666666666##a[2[2[2[2[2[2[2[2\2V2V2`))))"66666666666666#aV2V2V2V2V2V2V2V2`)"66666666666d2V2V2V2V2V2`)"@2C2A2 6666 6666666666@2C2C2A2<2L2V2V2V2`" @2D2¸2B2C2A26666666 6666666<2Ó2¸2:2<2T2L2V2b28 " #<2P2[2[2Q2B2C2C2C2C2C2A26666666666666@2A2## 1Ó2:2@2D2T2T2J20 #1W2P2Q2]2[2[2[2[2[2Q2B2C2A2666666666666666@2D2B2A2" !""<2P2_2T2R28#aT2Z2[2[2[2[2[2Q2]2[2Q2B2C26666 66666666666<2P2Q2:2<2T2P2V2R28#aV2V2V2V2V2V2Z2[2[2]2[2`"666666666666666<2T2R2:2<2T2T2V2R28#)aV2V2V2V2`))))"666666666666666#1T2R2B2A2@2D2T2T2V2R28#))))"666666666666666#aZ2Q2B2C2A2efg@2C2D2P2_2T2V2R28  6666666666666666#aZ2[2Q2B2C2A2mn2o@2D2P2[2_2P2V2`)"# 6666666666666666#aQ2]2[2Q2B2C2C2C2A2;2;2;2;2;2<2P2_2P2[2`)" # "#6666666666666666#)aQ2]2[2[2[2Q2B2C2C2C2C2C2D2T2P2V2` "6666666666666666#))a[2Q2]2[2[2[2[2[2[2[2_2T2` "6666666666666666 #aZ2[2[2[2[2[2[2[2[2[2b2 6666666666666666 "##)aV2V2V2V2V2V2V2J2:2 " "666666666666666 d2V2V2V2V2V2J2U2:2 " "6666666666666666@2D2L2V2V2V2V2R2U2B2A2 " "6666666 666666666#<2P2_2L2V2V2V2R2]2Q2B2C2C2C2C2C2C2C2C2A2 6666666666666666#<2T2P2\2V2`)))a[2[2[2[2[2[2[2[2Q2:26666666666666666#@2D2T2`))"#))a[2[2[2[2`))"6666666666666666# @2C2C2D2P2`" #))))" "66666666666666666""# )))))" "#66666666666666666#"#" \ No newline at end of file diff --git a/data/maps/Underwater5/border.bin b/data/maps/Underwater5/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/Underwater5/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/Underwater5/header.inc b/data/maps/Underwater5/header.inc index f46d3d677..043a6997e 100644 --- a/data/maps/Underwater5/header.inc +++ b/data/maps/Underwater5/header.inc @@ -1,5 +1,5 @@ Underwater5: @ 8482AA0 - .4byte Underwater5_MapAttributes + .4byte Underwater5_Layout .4byte Underwater5_MapEvents .4byte Underwater5_MapScripts .4byte Underwater5_MapConnections diff --git a/data/maps/Underwater5/map.bin b/data/maps/Underwater5/map.bin deleted file mode 100644 index 902f0dbdc..000000000 --- a/data/maps/Underwater5/map.bin +++ /dev/null @@ -1 +0,0 @@ -„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„&„„„„„ „„„.„„„ ©2©2©2©2©2©2©2Ž #©2©2©2}#~©2Ž #©2©2©2Ž©2Ž†©2©2}#©2Ž "†©2©2}#†©2Ž†©2©2©2Ž†©2©2Ž†©2©2©2}#†©2©2©2Ž„„†©2©2©2}#©2©2©2©2Ž†©2©2©2©2©2}#†©2©2}"##†©2‰2‰2©2©2}#„†©2©2©2Ž©2Š222ˆ2©2…„†©2©2©2}"#„„†‚22222€2©2©2©2©2©2©2Ž#©2©2‚22222€2©2©2©2©2}"# """#„„©2©2©2z222x2©2©2©2}"# ""†©2©2…©2©2©2©2y2y2©2©2©2©2Ž ""†©2‰2‰2©2…############©2Š222ˆ2©2Ž ""&†‚22222€2Ž„„.„„„„„†©2‚22222€2Ž#©2©2©2©2©2©2©2©2©2©2©2z222x2©2Ž©2©2©2©2©2©2©2©2©2©2©2©2y2y2©2}"##""""""""""""""""#  # " " "  "############ \ No newline at end of file diff --git a/data/maps/Underwater6/border.bin b/data/maps/Underwater6/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/Underwater6/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/Underwater6/header.inc b/data/maps/Underwater6/header.inc index cf6ab9141..1be09d6a1 100644 --- a/data/maps/Underwater6/header.inc +++ b/data/maps/Underwater6/header.inc @@ -1,5 +1,5 @@ Underwater6: @ 8482ABC - .4byte Underwater6_MapAttributes + .4byte Underwater6_Layout .4byte Underwater6_MapEvents .4byte Underwater6_MapScripts .4byte Underwater6_MapConnections diff --git a/data/maps/Underwater6/map.bin b/data/maps/Underwater6/map.bin deleted file mode 100644 index 92bd56031..000000000 --- a/data/maps/Underwater6/map.bin +++ /dev/null @@ -1 +0,0 @@ -&/„„.©2©2©2Ž/©2©2©2Ž©2©2©2Ž©2©2©2…©2©2©2©2Ž/„†©2©2©2©2Ž†©2©2©2©2}##†©2©2©2©2©2Ž„†©2©2©2©2}##©2©2©2©2©2©2Ž©2©2©2©2©2©2Ž©2©2©2©2}##©2©2©2©2Ž/#~©2©2©2Ž©2©2©2Ž#~©2©2Ž#©2©2…„©2©2©2©2Ž©2©2©2©2Ž©2©2©2©2Ž©2©2©2©2…„„„©2©2©2©2©2©2©2©2Ž©2©2©2‰2‰2©2©2©2Ž#~©2Š222ˆ2©2©2Ž/###‚22222€2©2Ž‚22222€2©2…„„„©2z222x2©2©2©2©2©2©2Ž©2©2y2y2©2©2©2©2©2©2©2Ž©2©2©2©2©2©2©2©2©2©2©2Ž####"""##########"""""""""""""""                                # ##   †©2‰2‰2©2©2Ž ©2Š222ˆ2©2Ž ‚22222€2Ž ## ##‚22222€2Ž   #~z222x2©2Ž #~y2y2©2©2Ž#~©2©2©2Ž ~©2©2Ž ~©2Ž†©2Ž  #©2©2©2Ž   ©2©2©2Ž ©2}## &©2Ž .†©2Ž ©2©2©2©2©2©2©2Ž  #~©2©2©2©2©2©2Ž #~©2©2©2©2©2Ž#~©2©2©2©2Ž ####"""    #  ##  # #  # ######"" \ No newline at end of file diff --git a/data/maps/Underwater7/border.bin b/data/maps/Underwater7/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/Underwater7/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/Underwater7/header.inc b/data/maps/Underwater7/header.inc index 0a55ab00b..4ededa296 100644 --- a/data/maps/Underwater7/header.inc +++ b/data/maps/Underwater7/header.inc @@ -1,5 +1,5 @@ Underwater7: @ 8482AD8 - .4byte Underwater7_MapAttributes + .4byte Underwater7_Layout .4byte Underwater7_MapEvents .4byte Underwater7_MapScripts .4byte Underwater7_MapConnections diff --git a/data/maps/Underwater7/map.bin b/data/maps/Underwater7/map.bin deleted file mode 100644 index 660f585ae..000000000 --- a/data/maps/Underwater7/map.bin +++ /dev/null @@ -1 +0,0 @@ -9<?WTVVVVVVV9<?WTVVVVVVV„„„„„„9<?WTVVVVVVV„„„„9<?WTVVVVVVV„9<?WTVVVVVVV„„„„„„„„„„„9<?WTVVVVVVV„9<?WTVVVVVVV9<?WTVVVVVVV„„„„„„„„„„„„„†9<?WTVVVVVVV„„„„„&„„„„9<?WTVVVVVVV„„„„„„„.„„9<?WTVVVVVVV„„„„„„†©2©2©2©2©2©2©2©2©2©2Ž9<?WTVVVVVVV©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2Ž9<?WTVVVVVVV„†©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2Ž9<?WTVVVVVVV©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2Ž9<?WTVVVVVVV©2©2‰2‰2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2Ž††9<?WTVVVVVVV©2Š222ˆ2©2©2©2©2©2©2©2©2©2©2©2©2©2}#„„„„„„9<?WTVVVVVVV‚22222€2©2©2©2©2©2©2©2©2©2©2}"#©2©2‰2‰2©2©2Ž9<?WTVVVVVVV‚22222€2©2©2©2©2©2©2©2©2©2©2Ž©2Š222ˆ2©2Ž9<?WTVVVVVVV©2z222x2©2©2}#########‚22222€2Ž9<?WTVVVVVVV©2©2y2y2©2©2©2Ž†‚22222€2Ž9<?WTVVVVVVV#########©2z222x2©2Ž9<?WTVVVVVVV©2©2y2y2©2©2Ž9<?WTVVVVVVV #†©2©2©2©2©2©2Ž9<?WTVVVVVVV †©2©2©2©2©2©2Ž9<?WTVVVVVVV#†©2©2©2©2©2©2Ž9<?WTVVVVVVV†©2}~©2©2©2…„9<?WTVVVVVVV††©2…†©2©2©2©2©2…9<?WTVVVVVVV#†©2©2©2©2©2}~©2©2©2Ž9<?WTVVVVVVV "&†©2©2©2©2©2…†©2©2©2Ž9<?WTVVVVVVV#„„.„„„†©2©2©2©2©2©2©2©2©2©2Ž9<?WTVVVVVVV #©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2Ž9<?WTVVVVVVV©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2Ž9<?WTVVVVVVV   ##""""""""""""""""""9<?WTVVVVVVV 9<?WTVVVVVVV "# # 9<?WTVVVVVVV# #9<?WTVVVVVVV## # ##9<?WTVVVVVVV# ##9<?WTVVVVVVV9<?WTVVVVVVV \ No newline at end of file diff --git a/data/maps/Underwater_MarineCave/border.bin b/data/maps/Underwater_MarineCave/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/Underwater_MarineCave/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/Underwater_MarineCave/header.inc b/data/maps/Underwater_MarineCave/header.inc index 6dee9d77a..54bffb710 100644 --- a/data/maps/Underwater_MarineCave/header.inc +++ b/data/maps/Underwater_MarineCave/header.inc @@ -1,5 +1,5 @@ Underwater_MarineCave: @ 84849CC - .4byte Underwater_MarineCave_MapAttributes + .4byte Underwater_MarineCave_Layout .4byte Underwater_MarineCave_MapEvents .4byte Underwater_MarineCave_MapScripts .4byte 0x0 diff --git a/data/maps/Underwater_MarineCave/map.bin b/data/maps/Underwater_MarineCave/map.bin deleted file mode 100644 index 1904f4757..000000000 --- a/data/maps/Underwater_MarineCave/map.bin +++ /dev/null @@ -1 +0,0 @@ -(((((((2$(2"""""+,-""""" \ No newline at end of file diff --git a/data/maps/Underwater_Route134/border.bin b/data/maps/Underwater_Route134/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/Underwater_Route134/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc index c00017cec..f08f506a1 100644 --- a/data/maps/Underwater_Route134/header.inc +++ b/data/maps/Underwater_Route134/header.inc @@ -1,5 +1,5 @@ Underwater_Route134: @ 848464C - .4byte Underwater_Route134_MapAttributes + .4byte Underwater_Route134_Layout .4byte Underwater_Route134_MapEvents .4byte Underwater_Route134_MapScripts .4byte 0x0 diff --git a/data/maps/Underwater_Route134/map.bin b/data/maps/Underwater_Route134/map.bin deleted file mode 100644 index 77bdd37aa..000000000 --- a/data/maps/Underwater_Route134/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2### # (2(2$(2(2(2 -""""# +,-  " \ No newline at end of file diff --git a/data/maps/Underwater_SeafloorCavern/border.bin b/data/maps/Underwater_SeafloorCavern/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/Underwater_SeafloorCavern/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc index e10d30013..6415ac787 100644 --- a/data/maps/Underwater_SeafloorCavern/header.inc +++ b/data/maps/Underwater_SeafloorCavern/header.inc @@ -1,5 +1,5 @@ Underwater_SeafloorCavern: @ 8484198 - .4byte Underwater_SeafloorCavern_MapAttributes + .4byte Underwater_SeafloorCavern_Layout .4byte Underwater_SeafloorCavern_MapEvents .4byte Underwater_SeafloorCavern_MapScripts .4byte 0x0 diff --git a/data/maps/Underwater_SeafloorCavern/map.bin b/data/maps/Underwater_SeafloorCavern/map.bin deleted file mode 100644 index 4cacc495e..000000000 --- a/data/maps/Underwater_SeafloorCavern/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -äåæçà6á6â6ã6(2è2é2ê2ë2(2(2(2(2(2(2(2(2### (2(2$(2(2(2 -"""# +,-  " \ No newline at end of file diff --git a/data/maps/Underwater_SealedChamber/border.bin b/data/maps/Underwater_SealedChamber/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/Underwater_SealedChamber/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc index 54362aea4..a72666d12 100644 --- a/data/maps/Underwater_SealedChamber/header.inc +++ b/data/maps/Underwater_SealedChamber/header.inc @@ -1,5 +1,5 @@ Underwater_SealedChamber: @ 8484668 - .4byte Underwater_SealedChamber_MapAttributes + .4byte Underwater_SealedChamber_Layout .4byte Underwater_SealedChamber_MapEvents .4byte Underwater_SealedChamber_MapScripts .4byte 0x0 diff --git a/data/maps/Underwater_SealedChamber/map.bin b/data/maps/Underwater_SealedChamber/map.bin deleted file mode 100644 index 5ac0b4a73..000000000 --- a/data/maps/Underwater_SealedChamber/map.bin +++ /dev/null @@ -1 +0,0 @@ -efgmnoÀ2Ã2Ã2Á2À2Ä2Ð2Ñ2º2¼2Ð2Ü2Ò2º2¼2Ô2Ö2Ò2º2¼2Ô2Ö2Ò2º2¼2Ô2Ö2Ò2º2¾2¼2Ô2Ö2Ò2º2¾2¼2Ô2Ö2Ò2º2À2Ä2Ô2Ö2Ò2º2¾2¼2Ó2Ô2Ö2Ò2º2¾2¼2Ó2Ô2Ö2Ò2º2¾2¼2Ó2Ô2Ö2Ò2Â2Á2¼2Ó2Ô2Ö2Ò2Ó2º2¼2Ó2Ô2Ö2Ú2Ñ2º2¼2Ó2Ô2Ö2Ö2Ò2º2³2´2Ë2Ì2Ö2Ò2Â2Á2  ¼2Ó2Ô2Ö2Ò2Ó2º2#¼2Ó2Ô2Ö2Ú2Ñ2º2³2´2Ô2Ö2Ö2Ò2º2¾2¼2Ô2Ö2Ö2Ò2º2  ¼2Ô2Ö2Ö2Ò2º2¼2Ë2Ì2Ö2Ò2º2#³2´2Ô2Ö2Ò2Â2Á2  ¼2Ô2Ö2Ú2Ñ2º2¼2Ù2Ì2Ö2Ò2º2#É2´2Ô2Ö2Ò2Â2Á2  ¼2Ô2Ö2Ò2Ó2º2¼2Ô2Ö2Ú2Ñ2º2¼2Ù2Ì2Ö2Ò2º2¼2Ó2Ô2Ö2Ò2º2#É2´2Ô2Ö2Ò2º2  ¼2Ô2Ö2Ò2º2¼2Ô2Ê2Ë2º2¼2Ë2Ë2Ó2º2¼2Ó2Ó2Ó2º2¼2Ó2Ó2Ó2Â2Ã2Ã2Á2À2Ã2Ä2Ó2Ó2Ó2Ó2Ó2Ó2Â2Ã2Á2À2Ã2Ä2Ó2     Ó2Ó2º2¼2Ó2Ó2²2´2Ó2Â2Á2¼2Ó2Ó2º2¼2Ó2Ó2º2¼2Ó2Ó2º2¼2Ó2Ó2º2¼2Ó2Ó2º2p¼2Ó2Ó2º2¼2Ó2Ó2Â2Ã2Ã2C2C2C2Ã2Ã2Ä2Ó2Ó2º2³2´2Ó2Ó2Ó2Ó2S2S2S2Ó2Ó2Ó2²2³2³2# ¼2Ó2Ó2Ó2Ó2S2S2S2Ó2Ó2Ó2º2 "#            " \ No newline at end of file diff --git a/data/maps/Underwater_SootopolisCity/border.bin b/data/maps/Underwater_SootopolisCity/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/Underwater_SootopolisCity/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc index af57b3c8d..ef9ee1612 100644 --- a/data/maps/Underwater_SootopolisCity/header.inc +++ b/data/maps/Underwater_SootopolisCity/header.inc @@ -1,5 +1,5 @@ Underwater_SootopolisCity: @ 8483F4C - .4byte Underwater_SootopolisCity_MapAttributes + .4byte Underwater_SootopolisCity_Layout .4byte Underwater_SootopolisCity_MapEvents .4byte Underwater_SootopolisCity_MapScripts .4byte 0x0 diff --git a/data/maps/Underwater_SootopolisCity/map.bin b/data/maps/Underwater_SootopolisCity/map.bin deleted file mode 100644 index 71346ab72..000000000 --- a/data/maps/Underwater_SootopolisCity/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2### # (2(2(2$(2(2(2(2(2 -""""#  +,-    " \ No newline at end of file diff --git a/data/maps/UnionRoom/border.bin b/data/maps/UnionRoom/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/UnionRoom/border.bin and /dev/null differ diff --git a/data/maps/UnionRoom/header.inc b/data/maps/UnionRoom/header.inc index d0b38c071..b79ae81a2 100644 --- a/data/maps/UnionRoom/header.inc +++ b/data/maps/UnionRoom/header.inc @@ -1,5 +1,5 @@ UnionRoom: @ 8485120 - .4byte UnionRoom_MapAttributes + .4byte UnionRoom_Layout .4byte UnionRoom_MapEvents .4byte UnionRoom_MapScripts .4byte 0x0 diff --git a/data/maps/UnionRoom/map.bin b/data/maps/UnionRoom/map.bin deleted file mode 100644 index cb1b009c3..000000000 --- a/data/maps/UnionRoom/map.bin +++ /dev/null @@ -1,11 +0,0 @@ -(   # - - - - - - - - - -0222222222222222222222222222222222222222222222222222222222222222222222222222222222 2!2"2222222222222222222222222222222222222 222222222222222222 \ No newline at end of file diff --git a/data/maps/UnknownMap_08417FC4/border.bin b/data/maps/UnknownMap_08417FC4/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/UnknownMap_08417FC4/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/UnknownMap_08417FC4/map.bin b/data/maps/UnknownMap_08417FC4/map.bin deleted file mode 100644 index 17a14a8d5..000000000 --- a/data/maps/UnknownMap_08417FC4/map.bin +++ /dev/null @@ -1 +0,0 @@ -pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp…Ó0000000000000Ô0†ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp…0000000 0 0 000000Ô0†ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp…0000000 0 0 0 0 0 0 0 000Ô0†ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp…s00Æ000 0 0 0 0 0 0 0 0 0 000r†pppppppppppppppppppppppppppppppppppppppppppppppppppppppp…0000ÆÆÆ00 0 0 0 0 0 0 0 0 0 0 0000Ô0†ppppppppppppppppppppppppppppppr{{{{{{vppppppppppppppp…0000ÆÆÆÆ00 0 0 0 0 0 0 0 0 0 0 0 0000Ô0†ppppPQppppppppppppppppppppppr´qkllmq´vppppuvppppPQprs000ÆÆÆÆÆ000 0 0 0 0 0 0 0 0 0 0 01110utpPQXYpppppr{{{{{{{vpppppppu´qk´qquqq|uvpp}~pu{vXYrss000ÆÆ0000000 0 0 0 0 0 0 0 1 5 10uutXYpuvpu{{´qklllmq´vppppuv‚‰q{|||}qt„}~pppppzq|­}sss0000000000ÆÆ4Æ400 0 0 0 0 01110uuu~¯p}~pzqqqk¾klm¾mq´vppp}~p‚y‰qqqty„ppu{{vpp‚y„µfsss00000000000ÆÆÆ4Æ4Æ4Æ400 0 0 00000uuug·ppuvzqqqsq{|}quqq|ppPQpppp‚yyy„ppppzqq|puvppµfsss00000000000ÆÆ4Æ4Æ4Æ4Æ4Æ40 000000uuug·uv}~‚‰qq{‰qqqt}qt„ppXYpppuvppppppuv‚yy„p}~ppµfss{|||‰00000000Æ4Æ4Æ4Æ4Æ4Æ4Æ400t|||}uug·}~ppp‚y‰q{|||}qt„puv{vppp}~pppppp}~pppPQppppµfs{©©©‰s0000000004Æ4Æ4Æ4Æ4Æ4Æ400ut©©©}ug·ppppPQp‚y‘‘‘‘‘y„pp}~q|ppppppppppPQppppXYppuvµf{©©©‰ss0000000000Æ4Æ4Æ4Æ44400uut©©©}g·ppppXYppppppppuvppppy„ppppppppppXYpppppppp}~µn‘‘‘‰ss{|||‰0000004444t|||}uut‘‘‘o·puvppppppppppp}~ppppppppppppppppppppppppuvppµ1$1$1$1ˆs{©©©‰{||‰0000t||}t©©©}ur$1$1$1Ÿ1·p}~pppppuvppppppppppppuvpppppppppppppppp}~ppµ¥1¦11$1ˆ{©©©‰{©©‰{|22|}t©©}t©©©}r$1$1$1Ÿ1·pppppppp}~pppppppppppp}~u{vpppppppuvppppppppµž1ž11$1‘‘‘‰{©©‰{©©22©©}t©©}t‘‘‘’$1$1$1Ÿ1·ppppppppppppppppppppuvppzt„ppppppp}~ppppppppµž1ž11$1$1$1"10x‘‘‰{©©©22©©©}t‘‘z00 1$1$1$1Ž1§1·pppppppppppppppppppp}~pp‚„pppppppppppppppppp½¾£¥1¦11$1"10000x‘‘‘‘22‘‘‘‘z00000 1$1$1Ž1§1¤¿ppppppppppppppppppppppppppppppppppppppppppppppµž1ž11$1$1100000000000000000001$1$1Ž1§1ž1·pppppppppppppppppppppppppppppppppppppppppppppppµž1ž11$1$1!11000000000000000011$1$1Ž1§1ž1¤¿pppppppppppppppppppppppppppppppppppppppppppppppµž1ž1¥11$1$1!11100000000000111$1$1$1$1Ÿ1ž1ž1·ppppppppppppppppppppppppppppppppppppppppppppppppµž1ž1ž11$1$1$1$1"100000000011$1$1$1$1$1$1Ž1§1ž1ž1·pppppppppppppppppppppppppppppppppppppppppppppppp½¾£ž1¥1¦11$1$1$1111111111$1$1$1$1$1$1$1$1Ÿ1ž1¤¾¿pppppppppPQpppppppuvppppppppppppppppppppppppppppppµž1ž1ž11$1$1$1$1$1$1$1$1$1$1$1$1$1$1Ž1¦1¦1¦1¦1¦1§1ž1·ppppppppPQpXYppr{{{v}~ppu{{vpppppppppppppppppppppppp½£ž1ž1¥1¦11$1$1$1$1$1$1$1$1$1$1$1$1Ÿ1ž1ž1ž1¤¾¾¾¿ppppppppXYpppr{´qqq´vpuv´qq|pppppppppppppppppppppppppµž1ž1ž1ž1¥1¦1¦1¦1¦1¦1¦1¦1¦1¦1¦1¦1¦1§1ž1ž1¤¿ppppppppppppppu{{´qqqqqq´v}~qqt„pPQpppppppppppppppppppppp½¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¿ppppppppppuvppp‚‰qqqqqqqqq´vpyy„uvXYPQu{vpuvpppppppPQppppppppppppppppppppppppppppppppppppp}~pppp‚y‰qqqqqqty„pppp}~ppXY‚y„p}~pppppppXYu{{{vpppuvppppppppppppppppppppppPQpuvpu{{{vpp‚yyyyyy„PQpppppppppppppuvpPQpppuvppzqqq´{vp}~ppppppuvppppppppppppppXYp}~p‚‰qq´vpppppppppXYupppppppppppp}~pXYu{v}~uv‚yy‰qq´vpuvpppPQ}~pppppppPQppppr{{{vppp‚‰ty„ppppppppppp}pppppPQppppppppppzq|pp}~ppp‚yyy„p}~PQpXYppu{{vpuvXYppr{´qkm´vppp‚„pppppppppppppppppppXYpppppppppp‚y„pppppppppppppppXYuvppp‚‰q´v}~pu{{´klm{}q|pppppppppppppppppppppppppppppppppppppppppppppppppppppppp}~pppp‚yy„ppp‚‰qq{|}qqt„ppppppppppppppppppppppppppppppPQpppppppppppppppppppppppppppppppppppPQp‚yy‘‘‘yy„pppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppp \ No newline at end of file diff --git a/data/maps/UnknownMap_08428450/border.bin b/data/maps/UnknownMap_08428450/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/UnknownMap_08428450/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/UnknownMap_08428450/map.bin b/data/maps/UnknownMap_08428450/map.bin deleted file mode 100644 index ca93fa0e2..000000000 Binary files a/data/maps/UnknownMap_08428450/map.bin and /dev/null differ diff --git a/data/maps/UnknownMap_084294C4/border.bin b/data/maps/UnknownMap_084294C4/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/UnknownMap_084294C4/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/UnknownMap_084294C4/map.bin b/data/maps/UnknownMap_084294C4/map.bin deleted file mode 100644 index 37f05b971..000000000 Binary files a/data/maps/UnknownMap_084294C4/map.bin and /dev/null differ diff --git a/data/maps/UnknownMap_084294E8/border.bin b/data/maps/UnknownMap_084294E8/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/UnknownMap_084294E8/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/UnknownMap_084294E8/map.bin b/data/maps/UnknownMap_084294E8/map.bin deleted file mode 100644 index ca93fa0e2..000000000 Binary files a/data/maps/UnknownMap_084294E8/map.bin and /dev/null differ diff --git a/data/maps/UnknownMap_0843E6C0/border.bin b/data/maps/UnknownMap_0843E6C0/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/UnknownMap_0843E6C0/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/UnknownMap_0843E6C0/map.bin b/data/maps/UnknownMap_0843E6C0/map.bin deleted file mode 100644 index 22a47d94e..000000000 Binary files a/data/maps/UnknownMap_0843E6C0/map.bin and /dev/null differ diff --git a/data/maps/UnknownMap_0843E6E4/border.bin b/data/maps/UnknownMap_0843E6E4/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/UnknownMap_0843E6E4/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/UnknownMap_0843E6E4/map.bin b/data/maps/UnknownMap_0843E6E4/map.bin deleted file mode 100644 index 22a47d94e..000000000 Binary files a/data/maps/UnknownMap_0843E6E4/map.bin and /dev/null differ diff --git a/data/maps/UnknownMap_0843E708/border.bin b/data/maps/UnknownMap_0843E708/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/UnknownMap_0843E708/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/UnknownMap_0843E708/map.bin b/data/maps/UnknownMap_0843E708/map.bin deleted file mode 100644 index 22a47d94e..000000000 Binary files a/data/maps/UnknownMap_0843E708/map.bin and /dev/null differ diff --git a/data/maps/UnknownMap_0843E72C/border.bin b/data/maps/UnknownMap_0843E72C/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/UnknownMap_0843E72C/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/UnknownMap_0843E72C/map.bin b/data/maps/UnknownMap_0843E72C/map.bin deleted file mode 100644 index 22a47d94e..000000000 Binary files a/data/maps/UnknownMap_0843E72C/map.bin and /dev/null differ diff --git a/data/maps/UnknownMap_0843E750/border.bin b/data/maps/UnknownMap_0843E750/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/UnknownMap_0843E750/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/UnknownMap_0843E750/map.bin b/data/maps/UnknownMap_0843E750/map.bin deleted file mode 100644 index 22a47d94e..000000000 Binary files a/data/maps/UnknownMap_0843E750/map.bin and /dev/null differ diff --git a/data/maps/UnknownMap_0843E774/border.bin b/data/maps/UnknownMap_0843E774/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/UnknownMap_0843E774/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/UnknownMap_0843E774/map.bin b/data/maps/UnknownMap_0843E774/map.bin deleted file mode 100644 index 22a47d94e..000000000 Binary files a/data/maps/UnknownMap_0843E774/map.bin and /dev/null differ diff --git a/data/maps/UnknownMap_0843E798/border.bin b/data/maps/UnknownMap_0843E798/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/UnknownMap_0843E798/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/UnknownMap_0843E798/map.bin b/data/maps/UnknownMap_0843E798/map.bin deleted file mode 100644 index 22a47d94e..000000000 Binary files a/data/maps/UnknownMap_0843E798/map.bin and /dev/null differ diff --git a/data/maps/UnknownMap_0843E7BC/border.bin b/data/maps/UnknownMap_0843E7BC/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/UnknownMap_0843E7BC/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/UnknownMap_0843E7BC/map.bin b/data/maps/UnknownMap_0843E7BC/map.bin deleted file mode 100644 index 22a47d94e..000000000 Binary files a/data/maps/UnknownMap_0843E7BC/map.bin and /dev/null differ diff --git a/data/maps/UnknownMap_0843E7E0/border.bin b/data/maps/UnknownMap_0843E7E0/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/UnknownMap_0843E7E0/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/UnknownMap_0843E7E0/map.bin b/data/maps/UnknownMap_0843E7E0/map.bin deleted file mode 100644 index 22a47d94e..000000000 Binary files a/data/maps/UnknownMap_0843E7E0/map.bin and /dev/null differ diff --git a/data/maps/UnknownMap_0843E804/border.bin b/data/maps/UnknownMap_0843E804/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/UnknownMap_0843E804/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/UnknownMap_0843E804/map.bin b/data/maps/UnknownMap_0843E804/map.bin deleted file mode 100644 index 22a47d94e..000000000 Binary files a/data/maps/UnknownMap_0843E804/map.bin and /dev/null differ diff --git a/data/maps/UnknownMap_0843E828/border.bin b/data/maps/UnknownMap_0843E828/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/UnknownMap_0843E828/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/UnknownMap_0843E828/map.bin b/data/maps/UnknownMap_0843E828/map.bin deleted file mode 100644 index 22a47d94e..000000000 Binary files a/data/maps/UnknownMap_0843E828/map.bin and /dev/null differ diff --git a/data/maps/UnknownMap_0843E84C/border.bin b/data/maps/UnknownMap_0843E84C/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/UnknownMap_0843E84C/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/UnknownMap_0843E84C/map.bin b/data/maps/UnknownMap_0843E84C/map.bin deleted file mode 100644 index 22a47d94e..000000000 Binary files a/data/maps/UnknownMap_0843E84C/map.bin and /dev/null differ diff --git a/data/maps/UnknownMap_0843E870/border.bin b/data/maps/UnknownMap_0843E870/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/UnknownMap_0843E870/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/UnknownMap_0843E870/map.bin b/data/maps/UnknownMap_0843E870/map.bin deleted file mode 100644 index 22a47d94e..000000000 Binary files a/data/maps/UnknownMap_0843E870/map.bin and /dev/null differ diff --git a/data/maps/UnknownMap_0843E894/border.bin b/data/maps/UnknownMap_0843E894/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/UnknownMap_0843E894/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/UnknownMap_0843E894/map.bin b/data/maps/UnknownMap_0843E894/map.bin deleted file mode 100644 index 22a47d94e..000000000 Binary files a/data/maps/UnknownMap_0843E894/map.bin and /dev/null differ diff --git a/data/maps/UnknownMap_08447028/border.bin b/data/maps/UnknownMap_08447028/border.bin deleted file mode 100644 index 9e4b3fb7a..000000000 --- a/data/maps/UnknownMap_08447028/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/UnknownMap_08447028/map.bin b/data/maps/UnknownMap_08447028/map.bin deleted file mode 100644 index 028da0526..000000000 --- a/data/maps/UnknownMap_08447028/map.bin +++ /dev/null @@ -1,3 +0,0 @@ -22222222222222222222222222222222222222222222222222222222222222222222222222662222222222222222222222222222222222222222222222226666 ò ò ò ò662222222222222222222222222òòòòòò ò ò ò òòòò ò ò -ò2266662òòòòBBBBòò2222222222222222222222222666666BBBB66BBBB222222266666622222g2g2g2g2g2g2g2g22222222222202GG2NdedeOKLQ2$%&'22222g2g2g2g2g2g2g2g222222222222822222:$!&'2 !"#:VcccWcSTa2222222g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2H2222:Vccccccca22222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f222222222222:Vccccccca22222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2222ò ò ò -òIIIIB^_______Y222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2222BBBB222222222222222222222222222222222222222222222822CEED22()*G22 ò ò ò ò22222222222222222222222222228223522 %"#:2BBBB222222222222222222222222222282235222:2+,-222222222222222222222222222222822GG2222222:2$%&'222222222222222222222222222222822222r2222H2<<222222222222222222222222222222228222222222222222222222222222222222222222222222222222222282222q2222p222222222222222222222222222222222222222222228222222222222222222222222222222222222222222222222222222282h2h2h2h2k2222s22CIIIIIID2222222222222222222222222222222222282j2222k22222235222:22222222222222222222222282j2222k22222235222:22222222222222222222222282j2222k22222235222:22222222222222222222222282j2i22i2i22222235222:22222222222222222222222282222222222235222:22222222222222222222222282222222235222:222222222222222222222222 \ No newline at end of file diff --git a/data/maps/UnknownMap_0845A394/border.bin b/data/maps/UnknownMap_0845A394/border.bin deleted file mode 100644 index f1629c020..000000000 --- a/data/maps/UnknownMap_0845A394/border.bin +++ /dev/null @@ -1 +0,0 @@ -3333 \ No newline at end of file diff --git a/data/maps/UnknownMap_0845A394/map.bin b/data/maps/UnknownMap_0845A394/map.bin deleted file mode 100644 index fd294d9b6..000000000 Binary files a/data/maps/UnknownMap_0845A394/map.bin and /dev/null differ diff --git a/data/maps/UnknownMap_0845D470/border.bin b/data/maps/UnknownMap_0845D470/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/UnknownMap_0845D470/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/UnknownMap_0845D470/map.bin b/data/maps/UnknownMap_0845D470/map.bin deleted file mode 100644 index cd136de41..000000000 --- a/data/maps/UnknownMap_0845D470/map.bin +++ /dev/null @@ -1 +0,0 @@ -qqqqqqqqqqqt||}ut©|}€˜pppš{‰qs{‰$1â4$1$1$1$1â4$1$1uuqupppppppppppppqqqqqqqqt||}qqt}u€‰‰˜pppppš{‰{‰s$1$1$1$1$1$1$1$1t}ut}ppppppppppppp||||||||}qqqt|}t}pppppppppšsqs{‰$1$1$1â4$1t|}quu€˜pppppppppppppqqqqqt©©©|||}qt}€˜pppppppppPesq{‰{‰â4$1$1t}qt|}uppppppppppppppqqt||}qqqt©©©|}€˜ppppppppppXm{‰q{‰{|||}qt}t|}pppppppppppppp||}qt©|||}€‰‰‰‰˜ppuvpppppPQpš{‰q{©©Ÿ©©|}qu€‰˜pppppppppppppp©©©|}€‰‰‰‰˜uvpu{vp}~pppppXYppš{|©©©§0©©©©|}pppppppppppppppp€‰Z[‰˜ppppp}~pzq|pppppppppPQppš‰‰$1$1$1$1$1€‰Z[˜ppppPQpppppppppp˜pXYppppuvpppp‚y„pppppppuvXYppppp’$1$1$1$1$1pXYu{{{vXYppppppppppppppu{vp}~ppuvPQppppppPQ}~pppppppš‰‰‰‰‰˜puv‚y‰q|ppuvppppppppppppzq|ppppp}~XYppuvppXYpu{vppppppppppppp}~pp‚y„PQ}~ppppppppPQpp‚y„ppuvPQpppPQ}~pPQppzq|uvppppppppppuvppppppXYpu{{vpppppXYpppppPQ}~XYpuvXYpPQXYpp‚y„}~ppuvpppppu´|ppppppppu´qq´vpppppppppppXYppppp}~pppXYppppppppppp}~pppppzq|pppppppp‚yyyy„PQppppppppppppppppppppuvpppppppppppppppppuv‚y„pppppppuvppPQpXYu{pppppppppppppppppp}~u{vppppppppppppPQ}~pppppppppp}~ppXYpppzqppppppppppppppppppppzq´{vppppuvppuvXYpppppppu{vpppppPQppuv‚ypppppppppppppppppppp‚yyy„pppp}~uv}~pppppppu{´q|pppppXYpp}~pppppppppppppppppppppppppuvpppppp}~pppppppppzqqq|ppppppPQpppPQppppppppppppppppppppppp}~ppppppppppppppppp‚yyy„ppppppXYpppXYppppppppppppppppppppppppPQppuvpppppppu{vppppppppppppppppppppppppppppppppppppppppppppXYPQ}~ppppuvu´q|ppppppppppppppppppppppppppppppppppppppppppppppXYppu{{v}~‚yy„pppppppppppppppppppppppppppppppppppppppppppppppppp‚yy„ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppPQppppppppppppppppppppppppppppppppppppppppppppuvppppppPQppppXYppppppppppppppppppppppppppppppppppPQuvpppppp}~pppuvpXYppppppppuvppppppppppppppppppppppppppppppXY}~ppppppu{PQp}~pppu{vpppppz´vpuvpppppppppppppuvpppppppppuvppppppppppzqXYppppppzq|puvpp‚‰´v}~pppppppppppPQ}~pppppppuv}~ppppppppPQ‚y{{{{tppp‚y„p}~uvp‚y„pppppppu{{vppXYpuvpppppp}~pppPQpuvppXYppqqqq´{tppppuvp}~ppuvpppppppzqq´{vppp}~uvpppu{{vppXYp}~puvpppllllmq´{{{t}~pppuv}~ppu{{vp‚‰qqq´vpppp}~ppu´qq´{{vu{{{v}~pppqqqq¿llmqq´{tppp}~ppu{´qq|uv‚yyyy„ppppppPQ‚yyy‰qq´´qqt„pppppqqqqqqq¿mqqqutppppppzqqqt„}~ppppppppppppXYpppp‚y‰qqqt„ppppPQqqqqqqqq¿llmuu{tppuv‚yyy„ppppppppppppppppppppppp‚yyy„pppppXYqqqqqqqqqqq¿¿¿l¿tp}~ppppppppppppppppppppppppppppppppppppppppqqqqqqqqqqqqqqqqutpppppppppppppppppppppppppppppppppppppppppp \ No newline at end of file diff --git a/data/maps/UnknownMap_0845ECB4/border.bin b/data/maps/UnknownMap_0845ECB4/border.bin deleted file mode 100644 index f0eabd248..000000000 --- a/data/maps/UnknownMap_0845ECB4/border.bin +++ /dev/null @@ -1 +0,0 @@ -ññññ \ No newline at end of file diff --git a/data/maps/UnknownMap_0845ECB4/map.bin b/data/maps/UnknownMap_0845ECB4/map.bin deleted file mode 100644 index ec344933f..000000000 --- a/data/maps/UnknownMap_0845ECB4/map.bin +++ /dev/null @@ -1 +0,0 @@ -ëùùùùùùùùùùùùùìññññññññññññòëùùùùùùùùùùùìðññññññññññññòòõ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2ðøùùìñññññññññòôéõ2õ2õ2õ2õ2õ2õ2õ2õ2øùùìðñññññññññòññòõ2ö2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2ððñññññññññôéêôåæçéõ2õ2õ2õ2õ2õ2õ2ððñññññññññññòñññññòõ2õ2õ2õ2õ2õ2õ2ððñññññññññññôééêññòëùù2ùùìðøìñññññññññññññòññòòõ2õ2õ2õ2õ2ððñðñññññññññññññòññòòõ2õ2õ2õ2õ2ððñøìññññññññññññòññòòõ2õ2õ2õ2õ2ðøìñðññññññññññññòñëúòëù2ùìðñðñðññññññññññññòñòëúòõ2õ2õ2ððñðñøìññññññññññëúñòòëúõ2õ2õ2ðøìøìñðññññññññññòññòòòõ2õ2õ2õ2øìðñðñøìññññññëùùúñëúòòõ2õ2õ2õ2õ2ððñðññðññññññòññññòëúò2ðøìðññðñññññùúñëùùúòëú222øìððññðññññññññòñññòò222ðððññðñññññëùùúñëùúò22222ðððññðñññññòññññòññò22222ððøùìøùùùùùòññëùúññò2ððññðññññññòñëúññëùú222ðøùìøùùùùùìúñòññëú222øùìøùùùùùìðùùúññò  222øùùùùìñððñëùùùú 222   ðñðøñò 2222222 ðñøùñò2222222222ðñññëú 2222222    #øùùìò 222    #ðò2222 #  ðò2222     ðò2222 #    ðò2222 efg  ðò222 # esdrfg ðò222efsd_ddrfgðò222qdd_d__ddpðò222qd______dpðò22222es_d____d_pðò22222 qdd______dpðò22222222#2#2bdd_d_d_dpðóóó222222222#2b_d_d_`a3a3#2ðñññóé22222222#2a3a3a3a3a3#2222ðñññóééé2222222222222ôôôñññññññññóééé222222ééôññññññññññññññññóééééééóññññññ \ No newline at end of file diff --git a/data/maps/UnknownMap_08469200/border.bin b/data/maps/UnknownMap_08469200/border.bin deleted file mode 100644 index c07869a9f..000000000 --- a/data/maps/UnknownMap_08469200/border.bin +++ /dev/null @@ -1 +0,0 @@ -ÙÙÙÙ \ No newline at end of file diff --git a/data/maps/UnknownMap_08469200/map.bin b/data/maps/UnknownMap_08469200/map.bin deleted file mode 100644 index 67085fd37..000000000 --- a/data/maps/UnknownMap_08469200/map.bin +++ /dev/null @@ -1,12 +0,0 @@ -ÙÙÙÙÙÙÙÚÙÙÓáááâÚÙ2ÚÙ2Ù2ÙÙÙÙÙÓáá9áááááÔàÔàÔÙ2Ù2Ù2Ù2Ù2àááááááá9áÔÙ2Ù2Ù2Ù2Ù2ÙÙÙÙÓááâÙÙÚÙÓááâÓâÙ2Ù2Óáá9áâÓKLMÔàÔàÔàááááááááááááà9ááÔÙ2ÙÓááâÙÓáá9âÙÚÙ2Ù2Ù2ÚÙ2Ù2Ù2ÚÓáâ  -  ØÙ2àÔàááááÔÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2  - ÔØÙ2áâÙÙÓáâÙáâÓááâÙ2Ù2Ù2ÚÚ  - Ù2Ù2%7'ØÙ2Ù2àÔÙ2Ù2Ù2Ù2àáKLMÙ2Ù2Ù2Ù2  - ØàáÙÙÓáâÙÓá  - UÙÚÓáááááâÚÙ2Ù2-?/àÔÙ2Ù2àÔ@AAAB ZÔÙ2Ù2Ù2àáÔááâÙÙÓâÙ2#$_ÓâÚÙ2Ù2Ù2Ù2Ù2Ù2Ú Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2àáÔÙ2àáÔÙ2Ù2Ù2àÔÙ2Ù2Ù2Ù2Ù2 Ù2Ù2ØÙÓKLMâÙ2Ù2+,_ÚÓâÙ2Ù2ÓáD2E2âÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2ØÙ2Ù2Ù2ØÙ2Ù2Ù2Ù2Ø@AAAAAAABÙ2àÓâ @AAFÙ2G\ÚÚÙ2Ù2Ù2ÚÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2@AFÙ2Ù2GAAABàÔÙ2Ù2àááááD2áÔàááááááááÔÙ2Ù2âÙ%6'Ù2ÓábD2cáâÚÙ2Ù2Ù2ÚÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2ÓábD2E2cááááÔàááááÔÙ2Ù2Ù2Ù2àááááá9ááÔØÙ2Ù2ÙÙ->/Ù2ÚÙ2ÓD2áááâÙ2Ù2Ù2ÚÓáááááááâÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2àáááÔÙàááD2ááááááÔØàáÔAAAAABÚÙ2ÚÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2ÚÚÙ2Ù2ÓááááááááááááD2E2áááÔàÔÙÙÓD2áááááÔ  - ØàáÔàááááááâÓâÓáááááD2E2âÚÓáâÓáááááááááááD2E2ááÔØÙ2ØÙÙÚÙ2Ù2Ù2Ù2Ù2Ù2ØØÙ2Ù2ØÙ2Ù2Ù2ÓááááâÓâÙ2Ù2Ù2Ù2Ù2Ù2Ù2ÓâÚÓáâÙ2ÓáááááááááD2E2ÔÙ2ØàÔàááâ6Ù2Ù2Ù2Ù2Ù2Ù2Ø ØÙ2Ù2àáááâÙ2Óáááâ82Ù2ÓáááD2E2âÙ2ÚÚÓááâÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2àÔàÔàááá9ááÔÙ2Ù2Ù2àÔÙ2Ù2àáÔÙ2Ù2Ù2Ù2Ù2Ù2ÚÙ2ÓáâÙ2Ù2Ù2Ù2Ù2Ù2ÓâÚÚ@AFÙ2Ù2GAAAAAAAABàÔàáááÔØÙ2Ù2Ù2Ù2ØÙ2Ù2Ù2Ù2àáÔÙ2ÓááâÙ2ÚT  - BÙ2Ù2Ù2Ù2Ù2Ù2ÚÙ2ÚÚÙ2ÓbD2E2cáQR[RSáÔÙ2Ù2àáÔTA  - ØØÙ2Ù2Ù2Ù2ØÙ282Ù2Ù2Ù2Ù2àÙ2;Ù2Ù2Ù2Ù2Ú^#$Ù2Ù2Ù2ÓáD2E2âÙ2ÚÚÙ2ÚÙ2Ù2Ù2Ù2Ó á!2á"ÔàááÔÙ2Ø^Ù2#$ØØÙ2Ù2Ù2Ù2àáááÔ2Ù2Ù2Ù2Ú^+,Ù2Ù2Ù2ÚÓD2E2ááâÚÙ2ÚÙ2Ù2Ù2Ù2Ú()2)2)2*óÙ2Ù2Ù2àÔØ^Ù2+,ØàÔÙ2Ù2Ù2Ù2  - à  - ÓKLM^Ù2Ù2Ù2Ù2Ù2Ù2ÚÚÙ2Ù2Ù2Ù2Ù2ÚÓânÙ2Ù2oÚ0q0q0q02óÙ2Ù2Ù2Ù2ØØ^Ù2Ù2Ù2Ù2ØÙ2àD2E2áÔ Ù2Ú ^Ù2Ù2Ù2Ù2Ù2Ù2ÚÚÙ2Ù2Ù2Ù2Ù2ÚÚÓbD2E2cýq0€6q0€6q0ûáÔÙ2Ù2ØØ^Ù2Ù2Ù2Ù2àááD2E2ÔØ%7'Ù2Ú%7']AAABÙ2Ù2ÚÚÙ2Ù2ÓáD2âÚÚq0q0q0q0q0q0€6q0€6q0q0q0ûáÔØØ^Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2ØàááÔ-?/Ù2AABÚ-?/Ù2ÓáááD2E2âÚÙ2Ù2ÚÓD2áâÚq0q0q0q0q0q0q0q0q0q0q0q0q0q0ÎØØ]ABÙ2Ù2Ù2Ù2Ù2Ù2Ù2ØÙ2Ù2Ù2àáááÔáááâÓáááâÙ2Ù2Ù2Ù2Ù2Ù2ÚÙ2Ù2ÚÚÙ2Ù2Ù2Úq0q0q0q0q0q0q0q0q0q0q0q0q0q0ÎØàáááD2E2áKLMÔàááÔÙ2Ù2Ù2Ù2àÙÙÓáâÙ2ÓáKLMáD2E2áâÓáâÚÙ2Ù2Ù2Úq0q0t||||||||||‰ÎàáÔTBÙ2Ù2Ù2 ØÙ2Ù2Ù2àÔÙ2Ù2Ù2Ù2áKLÙ2Ù2ÚTYZBÙ2Ù2ÓáâÓáâÓD2E2Íty}’““““““““”sÖáÔØ^Ù2Ù2Ù2Ù2ØÙ2Ù2Ù2Ù2ØÙ2Ù2Ù2Ù2Ù2 Ù2Ù2Ú^Ù2Ù2Ù2ÚÓáâÙ2Ù2Úq0q0t}’“¢œ{y‰óØ^Ù2Ù2Ù2Ù2ØÙ2àÔÙ2Ù2Ù2Ù2%6'Ù2Ù2Ú^Ù2Ù2Ù2ÚÚk6l6l6m6Úq0q0u’¢¤“”sóØ^Ù2Ù2Ù2Ù2Ù2Ù2Ù2àÔ Ù2ØÙ2Ù2Ù2Ù2->/Ù2Ù2Ú^Ù2Ù2Ù2Ù2Ù2Ù2ÚÚ0123Úq0q0ušœsóØ]AABÙ2Ù2Ù2Ù2Ù2ØÙ2àÔÙ2Ù2AAAABÓâ]AAAABÓâÚ89:;Úq0q0uš˜™™™™ œsóà{|}~ÔÙ2Ù2Ù2Ù2ØÙ2Ù2ØÙ2Ù2Ù2Ù2ÓááâÓááááááâÓâABwÚq0q0ušœŠ‹‹‹‹ŒšœsóTPQRSØÙ2Ù2Ù2Ù2àáD2ÔÙ2Ù2àÔÙ2Ù2ÓâÙ2ÓáâÙ2Ù2Ù2ÓáááâÙ2Ù2Ù2Ù2Ù2Úq0q0ušœ¸¹º³»¼šœsó^XYZ[ØÙ2Ù2Ù2Ù2Ù2Ù2Ù2ØÙ2Ù2Ù2ØÙ2Ù2ÚÙ2Ù2ÚÙ2Ù2Ù2Ù2Ù2ÚÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Óýq0q0ušœÀÁÂÅÃÄšœsó^abvàáD2E2ÔÙ2Ù2Ù2àááÔàÔÓâÙ2Ù2ÚÓáKLMâÙ2Ù2Ù2Ù2Ù2ÓD2E2ýq0q0q0ušœÓ0È1É1ÊÍËÌ1Ô0šœsó^Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2àááÔÙ2Ù2Ù2ØÙ2ØâÙ2Ù2ÓâÚTYZBÙ2Ù2Ù2Ù2Óýq0q0q0q0q0q0ušœ000000010šœsó^Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2222à9áÔØÙ2ØÙ2Ù2Ù2ÚÙ2Ú^Ù2Ù2Ù2Ù2Óýq0q0q0q0q0q0t}šœ00000010šœsó]BÙ2Ù2@AFÙ2Ù2 222ØØÙ2ØÙ2ÓáâÓâ^Ù2Ù2Ù2Ù2Úq0tÞßD2E2yz’¢œ00000000šœsûááD2E2áÔNÙ2Ù2  - ØØÙ2ØÓâÙ2Ù2ÚÙ2^Ù2Ù2Ù2Ù2Ù2Ù2Ù2Úq0rÖ×0000šœ00000000šœ{yyyD2E2‰óNÙ2Ù2ØàÔØâÓááâÙ2]BÙ2Ù2Ù2Ù2Óáýq0ræç0000š¤““““““““¢¤”04000póNÙ2Ù2Ù2Ù2Ù2ØÙ2ØØÙ2ÚÙ2Ù2Óáááááááýtyyz0’““““¢œ00000póV@AAAAAABàÔØàÓâÙ2ÓýqtyÞßÞßyz0000šœ00000pûáááááááÔÙÙØàÔÚÙÙ2Úqqr0Ö×Ö×000000š¤“”000xyyyy‰qqqóÙÙØÙØÚÙÙ2Úqqr0æåÜÝ000000šœ00000000xÞ߉ûÔÙàÔØÚÙÙ2Úqqr000ÔÕ000000šœ000000000Ö×pqóÙÙØØÚÙÙ2Úqqr000æç000000š´µ¶·°±²³¤““”0000Î1Ï1ÜÝpqûÔÙØØÚÙÙ2Úqqr0000000Î1Ï100š¼½¾¿¸¹º»œ0000ÖÕÔÕpqqóÙØØÜÒÙ2ìíqr0000000Ö×00šÄÅÆÇÀÁÂÃœ0000ÜÝÜÝpqqóÙØØÙÚÙÙÜí¿iiij000ÜÝ’“¢¤“““”ÔÕÔÕpqqóÙØØÙÜÑÑÒÜìììí¿ij0ÔÕšœæåäçpëìÛÙØØÙÙÙÙÜÑÑÒÙÜìír0æçšî©i0i0i0i0¾0óÙÐÑÛÛÙÙÙÙÙÙÙÜÑÒÙÚ¿iijšqqqqëìÛÐØÙÙÙÑÑÑÒÙÙÙÙÙÚÙÜìíqršî¨¨¨¨¨©qëììÛÙÙØØÙÙÙÙÙÙÜÑÒÙÙÙÜÑÑÒÜíršqqqqqqqóÙÙÙÐÑÛØÙÙÙÙÙÙÙÙÚÙÙÙÙÙÙÚÙÚrš¥¦¦¦§î¨¨¨©qqqqëììÛÙÙÙØÙÙØÙÙÙÙÙÙÙÙÜÑÒÙÙÙÙÜÒÚrš¥¦­‘‘‘¯¦§qqqqqqqëÛÐÑÑÑÑÑÛÐÑÛÙÙÙÙÙÙÙÙÙÙÚÙÙÙÙÙÚÚrš¥­‘‘‘‘‘‘‘¯§qqqqqëìÛÙØÙÙÙÙÐÑÛÙÙÙÙÙÙÙÙÙÙÙÙÜÑÒÙÙÙÚÚ©¨¨¨ï¥­‘‘‘‘‘‘‘‘‘¯§î¨©qqëììÛÙÙÙØÐÑÑÑÛÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÚÙÙÙÚÚqqqq©¨¨ªªªªªªªªªªªªª©qqqqóÙÐÑÑÑÑÛØÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÜÑÒÙÚÜíqqqqqqqqqqqqqqqqqqqqqëììÛÙØÐÑÑÑÑÛÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÚÙÚÙÜìììììììììììììììììììììÛÙÐÑÑÛØÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÚÙÜÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÛÙÙÙØÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙ \ No newline at end of file diff --git a/data/maps/UnknownMap_084693AC/border.bin b/data/maps/UnknownMap_084693AC/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/UnknownMap_084693AC/border.bin and /dev/null differ diff --git a/data/maps/UnknownMap_084693AC/map.bin b/data/maps/UnknownMap_084693AC/map.bin deleted file mode 100644 index a179d8997..000000000 Binary files a/data/maps/UnknownMap_084693AC/map.bin and /dev/null differ diff --git a/data/maps/UnknownMap_08470BD8/border.bin b/data/maps/UnknownMap_08470BD8/border.bin deleted file mode 100644 index 4531975c7..000000000 Binary files a/data/maps/UnknownMap_08470BD8/border.bin and /dev/null differ diff --git a/data/maps/UnknownMap_08470BD8/map.bin b/data/maps/UnknownMap_08470BD8/map.bin deleted file mode 100644 index 0f7bbb958..000000000 Binary files a/data/maps/UnknownMap_08470BD8/map.bin and /dev/null differ diff --git a/data/maps/UnknownMap_08480DAC/border.bin b/data/maps/UnknownMap_08480DAC/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/UnknownMap_08480DAC/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/UnknownMap_08480DAC/map.bin b/data/maps/UnknownMap_08480DAC/map.bin deleted file mode 100644 index d1277f280..000000000 Binary files a/data/maps/UnknownMap_08480DAC/map.bin and /dev/null differ diff --git a/data/maps/UnknownMap_08480F54/border.bin b/data/maps/UnknownMap_08480F54/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/UnknownMap_08480F54/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/UnknownMap_08480F54/map.bin b/data/maps/UnknownMap_08480F54/map.bin deleted file mode 100644 index f0d9c299c..000000000 --- a/data/maps/UnknownMap_08480F54/map.bin +++ /dev/null @@ -1 +0,0 @@ -''''''''';<=''/////////CD2E//¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½289999:½2½2½2½2½2½2½2½2@AAAAB½2½2½2½2½2½2½2½2AAAAAA½2½2½2½2½2½2½2½2AAAAAA½2½2½2½2½2½2½2½2AAAAAA½2½2½2½2½2½2½2½2IMMMMJ½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2"2#2½2½2½2½2½2½2 \ No newline at end of file diff --git a/data/maps/UnknownMap_084810FC/border.bin b/data/maps/UnknownMap_084810FC/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/UnknownMap_084810FC/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/UnknownMap_084810FC/map.bin b/data/maps/UnknownMap_084810FC/map.bin deleted file mode 100644 index 908158cf4..000000000 --- a/data/maps/UnknownMap_084810FC/map.bin +++ /dev/null @@ -1 +0,0 @@ -'';<='''';<=''//CD2E////CL2E//5252525252525252525252525252424242424242424242424242424242424242424242424242424242424242424289999:4242424242424242@AAAAB4242424242424242AAAAAA4242424242424242AAAAAA4242424242424242AAAAAA4242424242424242IMMMMJ42424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242 \ No newline at end of file diff --git a/data/maps/UnknownMap_084812A4/border.bin b/data/maps/UnknownMap_084812A4/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/UnknownMap_084812A4/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/UnknownMap_084812A4/map.bin b/data/maps/UnknownMap_084812A4/map.bin deleted file mode 100644 index d033bc4d2..000000000 --- a/data/maps/UnknownMap_084812A4/map.bin +++ /dev/null @@ -1 +0,0 @@ -'';<=';<=';<='//CL2E/CD2E/CD2E/¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½289999:½2½2½2½2½2½2½2½2@AAAAA½2½2½2½2½2½2½2½2AAAAAA½2½2½2½2½2½2½2½2AAAAAA½2½2½2½2½2½2½2½2AAAAAA½2½2½2½2½2½2½2½2IMMMMJ½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2 \ No newline at end of file diff --git a/data/maps/UnknownMap_0848144C/border.bin b/data/maps/UnknownMap_0848144C/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/UnknownMap_0848144C/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/UnknownMap_0848144C/map.bin b/data/maps/UnknownMap_0848144C/map.bin deleted file mode 100644 index eeccae9ae..000000000 --- a/data/maps/UnknownMap_0848144C/map.bin +++ /dev/null @@ -1 +0,0 @@ -'';<=';<=';<='//CD2E/CL2E/CL2E/525252525252525265252525252626266642424242424242426262426264242424242424289999:4242424242424242@AAAAB4242424242424242AAAAAA4242424242424242AAAAAA4242424242424242AAAAAA4242424242424242IMMMMJ42424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242 \ No newline at end of file diff --git a/data/maps/UnknownMap_084815F4/border.bin b/data/maps/UnknownMap_084815F4/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/UnknownMap_084815F4/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/UnknownMap_084815F4/map.bin b/data/maps/UnknownMap_084815F4/map.bin deleted file mode 100644 index 8507a4932..000000000 --- a/data/maps/UnknownMap_084815F4/map.bin +++ /dev/null @@ -1 +0,0 @@ -'';<='''';<=''//CL2E////CD2E//¾2¾2¾2¾2¾2¾2¾2¾2¾26¾2¾2¾2¾2½2½2½2½2½2½2½2½26½2½2½2½2½2½2½2½28999999:½2½2½2½2½2½2@AAAAAAB½2½2½2½2½2½2AAAAAAAA½2½2½2½2½2½2AAAAAAAA½2½2½2½2½2½2AAAAAAAA½2½2½2½2½2½2AAAAAAAA½2½2½2½2½2½2AAAAAAAA½2½2½2½2½2½2IMMMMMMJ½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2 \ No newline at end of file diff --git a/data/maps/UnknownMap_08481B24/border.bin b/data/maps/UnknownMap_08481B24/border.bin deleted file mode 100644 index e9d1c658c..000000000 --- a/data/maps/UnknownMap_08481B24/border.bin +++ /dev/null @@ -1 +0,0 @@ -ÁÁÁÁ \ No newline at end of file diff --git a/data/maps/UnknownMap_08481B24/map.bin b/data/maps/UnknownMap_08481B24/map.bin deleted file mode 100644 index 2a47bca91..000000000 --- a/data/maps/UnknownMap_08481B24/map.bin +++ /dev/null @@ -1 +0,0 @@ -ÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁd2d2d2­6d2d2d2­6d2d2d2­6­6­6­6­6­6­6d2d2d2­6d2d2d2­6d24242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242''''''''''m2ž2n';<='''''''''//////////j2ž2k/CL2E/////////52525252525252525252525252525252525252424242424242424242424242424242424242424242424242424242424242424242424242424242[[[[[[[[[[[[[[[[[[[[[[[[[[[¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢ \ No newline at end of file diff --git a/data/maps/UnknownMap_08481DBC/border.bin b/data/maps/UnknownMap_08481DBC/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/UnknownMap_08481DBC/border.bin and /dev/null differ diff --git a/data/maps/UnknownMap_08481DBC/map.bin b/data/maps/UnknownMap_08481DBC/map.bin deleted file mode 100644 index 603f55c93..000000000 --- a/data/maps/UnknownMap_08481DBC/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -' -  +/6666-7$%655555555556555555655555565555555555655 555555 \ No newline at end of file diff --git a/data/maps/UnknownMap_25_29/border.bin b/data/maps/UnknownMap_25_29/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/UnknownMap_25_29/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc index 4fa500e7e..4c8edd31c 100644 --- a/data/maps/UnknownMap_25_29/header.inc +++ b/data/maps/UnknownMap_25_29/header.inc @@ -1,5 +1,5 @@ UnknownMap_25_29: @ 8484DBC - .4byte UnknownMap_25_29_MapAttributes + .4byte UnknownMap_25_29_Layout .4byte UnknownMap_25_29_MapEvents .4byte UnknownMap_25_29_MapScripts .4byte 0x0 diff --git a/data/maps/UnknownMap_25_29/map.bin b/data/maps/UnknownMap_25_29/map.bin deleted file mode 100644 index 5fc1e81ec..000000000 --- a/data/maps/UnknownMap_25_29/map.bin +++ /dev/null @@ -1 +0,0 @@ -  \ No newline at end of file diff --git a/data/maps/UnknownMap_25_30/border.bin b/data/maps/UnknownMap_25_30/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/UnknownMap_25_30/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc index 38600bb68..46465019e 100644 --- a/data/maps/UnknownMap_25_30/header.inc +++ b/data/maps/UnknownMap_25_30/header.inc @@ -1,5 +1,5 @@ UnknownMap_25_30: @ 8484DD8 - .4byte UnknownMap_25_30_MapAttributes + .4byte UnknownMap_25_30_Layout .4byte UnknownMap_25_30_MapEvents .4byte UnknownMap_25_30_MapScripts .4byte 0x0 diff --git a/data/maps/UnknownMap_25_30/map.bin b/data/maps/UnknownMap_25_30/map.bin deleted file mode 100644 index 5fc1e81ec..000000000 --- a/data/maps/UnknownMap_25_30/map.bin +++ /dev/null @@ -1 +0,0 @@ -  \ No newline at end of file diff --git a/data/maps/UnknownMap_25_31/border.bin b/data/maps/UnknownMap_25_31/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/UnknownMap_25_31/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc index f53d3055b..13e428cfd 100644 --- a/data/maps/UnknownMap_25_31/header.inc +++ b/data/maps/UnknownMap_25_31/header.inc @@ -1,5 +1,5 @@ UnknownMap_25_31: @ 8484DF4 - .4byte UnknownMap_25_31_MapAttributes + .4byte UnknownMap_25_31_Layout .4byte UnknownMap_25_31_MapEvents .4byte UnknownMap_25_31_MapScripts .4byte 0x0 diff --git a/data/maps/UnknownMap_25_31/map.bin b/data/maps/UnknownMap_25_31/map.bin deleted file mode 100644 index 5fc1e81ec..000000000 --- a/data/maps/UnknownMap_25_31/map.bin +++ /dev/null @@ -1 +0,0 @@ -  \ No newline at end of file diff --git a/data/maps/UnknownMap_25_32/border.bin b/data/maps/UnknownMap_25_32/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/UnknownMap_25_32/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc index 0e269a53c..8244c3802 100644 --- a/data/maps/UnknownMap_25_32/header.inc +++ b/data/maps/UnknownMap_25_32/header.inc @@ -1,5 +1,5 @@ UnknownMap_25_32: @ 8484E10 - .4byte UnknownMap_25_32_MapAttributes + .4byte UnknownMap_25_32_Layout .4byte UnknownMap_25_32_MapEvents .4byte UnknownMap_25_32_MapScripts .4byte 0x0 diff --git a/data/maps/UnknownMap_25_32/map.bin b/data/maps/UnknownMap_25_32/map.bin deleted file mode 100644 index 5fc1e81ec..000000000 --- a/data/maps/UnknownMap_25_32/map.bin +++ /dev/null @@ -1 +0,0 @@ -  \ No newline at end of file diff --git a/data/maps/UnknownMap_25_33/border.bin b/data/maps/UnknownMap_25_33/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/UnknownMap_25_33/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc index 6a8df64c6..b4da8dd48 100644 --- a/data/maps/UnknownMap_25_33/header.inc +++ b/data/maps/UnknownMap_25_33/header.inc @@ -1,5 +1,5 @@ UnknownMap_25_33: @ 8484E2C - .4byte UnknownMap_25_33_MapAttributes + .4byte UnknownMap_25_33_Layout .4byte UnknownMap_25_33_MapEvents .4byte UnknownMap_25_33_MapScripts .4byte 0x0 diff --git a/data/maps/UnknownMap_25_33/map.bin b/data/maps/UnknownMap_25_33/map.bin deleted file mode 100644 index 5fc1e81ec..000000000 --- a/data/maps/UnknownMap_25_33/map.bin +++ /dev/null @@ -1 +0,0 @@ -  \ No newline at end of file diff --git a/data/maps/UnknownMap_25_34/border.bin b/data/maps/UnknownMap_25_34/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/UnknownMap_25_34/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc index d37b7ceaa..bb1ce881c 100644 --- a/data/maps/UnknownMap_25_34/header.inc +++ b/data/maps/UnknownMap_25_34/header.inc @@ -1,5 +1,5 @@ UnknownMap_25_34: @ 8484E48 - .4byte UnknownMap_25_34_MapAttributes + .4byte UnknownMap_25_34_Layout .4byte UnknownMap_25_34_MapEvents .4byte UnknownMap_25_34_MapScripts .4byte 0x0 diff --git a/data/maps/UnknownMap_25_34/map.bin b/data/maps/UnknownMap_25_34/map.bin deleted file mode 100644 index 5fc1e81ec..000000000 --- a/data/maps/UnknownMap_25_34/map.bin +++ /dev/null @@ -1 +0,0 @@ -  \ No newline at end of file diff --git a/data/maps/VerdanturfTown/border.bin b/data/maps/VerdanturfTown/border.bin deleted file mode 100644 index 864ac15fa..000000000 Binary files a/data/maps/VerdanturfTown/border.bin and /dev/null differ diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc index 49be64155..047ba12ad 100644 --- a/data/maps/VerdanturfTown/header.inc +++ b/data/maps/VerdanturfTown/header.inc @@ -1,5 +1,5 @@ VerdanturfTown: @ 8482640 - .4byte VerdanturfTown_MapAttributes + .4byte VerdanturfTown_Layout .4byte VerdanturfTown_MapEvents .4byte VerdanturfTown_MapScripts .4byte VerdanturfTown_MapConnections diff --git a/data/maps/VerdanturfTown/map.bin b/data/maps/VerdanturfTown/map.bin deleted file mode 100644 index 8ed6ea56b..000000000 Binary files a/data/maps/VerdanturfTown/map.bin and /dev/null differ diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/border.bin b/data/maps/VerdanturfTown_BattleTentBattleRoom/border.bin deleted file mode 100644 index 9afd13cdc..000000000 Binary files a/data/maps/VerdanturfTown_BattleTentBattleRoom/border.bin and /dev/null differ diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc index fba5c3764..1eef21301 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_BattleTentBattleRoom: @ 8482E90 - .4byte VerdanturfTown_BattleTentBattleRoom_MapAttributes + .4byte VerdanturfTown_BattleTentBattleRoom_Layout .4byte VerdanturfTown_BattleTentBattleRoom_MapEvents .4byte VerdanturfTown_BattleTentBattleRoom_MapScripts .4byte 0x0 diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.bin b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.bin deleted file mode 100644 index c405aabfc..000000000 Binary files a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.bin and /dev/null differ diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc index 5d8bccc99..9b8f62260 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc +++ b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_BattleTentCorridor: @ 8482E74 - .4byte VerdanturfTown_BattleTentCorridor_MapAttributes + .4byte BattleTentCorridor_Layout .4byte VerdanturfTown_BattleTentCorridor_MapEvents .4byte VerdanturfTown_BattleTentCorridor_MapScripts .4byte 0x0 diff --git a/data/maps/VerdanturfTown_BattleTentLobby/header.inc b/data/maps/VerdanturfTown_BattleTentLobby/header.inc index 6b998c218..4d1e0ca9e 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/header.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_BattleTentLobby: @ 8482E58 - .4byte VerdanturfTown_BattleTentLobby_MapAttributes + .4byte BattleTentLobby_Layout .4byte VerdanturfTown_BattleTentLobby_MapEvents .4byte VerdanturfTown_BattleTentLobby_MapScripts .4byte 0x0 diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc index 6666d264d..51f3dadbd 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_FriendshipRatersHouse: @ 8482F1C - .4byte VerdanturfTown_FriendshipRatersHouse_MapAttributes + .4byte House2_Layout .4byte VerdanturfTown_FriendshipRatersHouse_MapEvents .4byte VerdanturfTown_FriendshipRatersHouse_MapScripts .4byte 0x0 diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc index a1e99f984..e6571b7f0 100644 --- a/data/maps/VerdanturfTown_House/header.inc +++ b/data/maps/VerdanturfTown_House/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_House: @ 8482F38 - .4byte VerdanturfTown_House_MapAttributes + .4byte House1_Layout .4byte VerdanturfTown_House_MapEvents .4byte VerdanturfTown_House_MapScripts .4byte 0x0 diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc index 3b5c3cce5..6f69b3aac 100644 --- a/data/maps/VerdanturfTown_Mart/header.inc +++ b/data/maps/VerdanturfTown_Mart/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_Mart: @ 8482EAC - .4byte VerdanturfTown_Mart_MapAttributes + .4byte Mart_Layout .4byte VerdanturfTown_Mart_MapEvents .4byte VerdanturfTown_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc index d6fc48171..b6c5177ce 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_PokemonCenter_1F: @ 8482EC8 - .4byte VerdanturfTown_PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte VerdanturfTown_PokemonCenter_1F_MapEvents .4byte VerdanturfTown_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc index fa99aeaa4..ee657d77b 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_PokemonCenter_2F: @ 8482EE4 - .4byte VerdanturfTown_PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte VerdanturfTown_PokemonCenter_2F_MapEvents .4byte VerdanturfTown_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/VerdanturfTown_WandasHouse/border.bin b/data/maps/VerdanturfTown_WandasHouse/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/VerdanturfTown_WandasHouse/border.bin and /dev/null differ diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc index a1e4e49aa..cb727234e 100644 --- a/data/maps/VerdanturfTown_WandasHouse/header.inc +++ b/data/maps/VerdanturfTown_WandasHouse/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_WandasHouse: @ 8482F00 - .4byte VerdanturfTown_WandasHouse_MapAttributes + .4byte VerdanturfTown_WandasHouse_Layout .4byte VerdanturfTown_WandasHouse_MapEvents .4byte VerdanturfTown_WandasHouse_MapScripts .4byte 0x0 diff --git a/data/maps/VerdanturfTown_WandasHouse/map.bin b/data/maps/VerdanturfTown_WandasHouse/map.bin deleted file mode 100644 index 95d14d3c4..000000000 Binary files a/data/maps/VerdanturfTown_WandasHouse/map.bin and /dev/null differ diff --git a/data/maps/VictoryRoad_1F/border.bin b/data/maps/VictoryRoad_1F/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/VictoryRoad_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc index 8bd8286b5..35ff7bd3b 100644 --- a/data/maps/VictoryRoad_1F/header.inc +++ b/data/maps/VictoryRoad_1F/header.inc @@ -1,5 +1,5 @@ VictoryRoad_1F: @ 8484374 - .4byte VictoryRoad_1F_MapAttributes + .4byte VictoryRoad_1F_Layout .4byte VictoryRoad_1F_MapEvents .4byte VictoryRoad_1F_MapScripts .4byte 0x0 diff --git a/data/maps/VictoryRoad_1F/map.bin b/data/maps/VictoryRoad_1F/map.bin deleted file mode 100644 index a78316ef9..000000000 --- a/data/maps/VictoryRoad_1F/map.bin +++ /dev/null @@ -1,10 +0,0 @@ -2222222222622222222222'222222222226222    XYZ #    -222         #222        #F222222222222BBBBBBBBBBBB2222BBBBBBBBBBBBBB2222BBBBBBBBBBBBBB#  # -222222      -BBBBBBBBBBBB  B B B"22222#BBBBBB»B»B¼B¼B½B½BBBB»B»B¼ò¼ò¼ò¼ò¼ò½B¼B B B B B"BBBBBBÃBÃBÄBÄBÅBÅBBBBÃBÃBÄòÄòÄòÄòÄòÅBÄBBBBBBBB22222BB2222222BB222222222222BB222222222222222222222222222BB22222222222222222222222BB222      -2222222222222222222222BB»B»B¼B¼ò¼ò¼ò½B¼B B B B"22222222222222222222222BBÃBÃBÄBÄòÄòÄòÅBÄBBBB22      -2222    -2222222222  B B B¼B»B¼ò¼ò¼ò¼ò¼B½B¼B B"22L6Q6M6222P6BBBÄBÃBÄòÄòÅòÅòÄBÅBÄBB2222222222222228#2222222222222222222228# -222222222222222222228222222222222222222      -2228222222222222222222  B B B"2228#   #22222222BBB»B»B¼ò¼ò¼ò¼B½B¼B B B B"22222222222222#22BBBÃBÃBÄòÄòÄòÄBÅBÄBBBB222222222222222 #B2222282222222222   ###B222228222222222#  B B#B#BB22222222222@QI22222222  ## #  B#BBBBBB22222'62222222822222222  B B B B B B#BBBBBBBB#    -2262222222822     #              ##   "#     XYZ   # #      #            ## "#               #   #  ##"#                      ##                            # \ No newline at end of file diff --git a/data/maps/VictoryRoad_B1F/border.bin b/data/maps/VictoryRoad_B1F/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/VictoryRoad_B1F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc index 620dbdc71..b9edeeb17 100644 --- a/data/maps/VictoryRoad_B1F/header.inc +++ b/data/maps/VictoryRoad_B1F/header.inc @@ -1,5 +1,5 @@ VictoryRoad_B1F: @ 8484390 - .4byte VictoryRoad_B1F_MapAttributes + .4byte VictoryRoad_B1F_Layout .4byte VictoryRoad_B1F_MapEvents .4byte VictoryRoad_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/VictoryRoad_B1F/map.bin b/data/maps/VictoryRoad_B1F/map.bin deleted file mode 100644 index c1ea2f657..000000000 --- a/data/maps/VictoryRoad_B1F/map.bin +++ /dev/null @@ -1,25 +0,0 @@ -BBBBBBBBB2222222BBBB2222222P22222222# -222BBBB2   -2282222222222  -222# -222BBBB222R2222   -2#222# -22 #BBBB2222222    -2# #22#2#BBBBB# -2   -22  B B B B¼B»B¼ò¼ò½B¼B B B B B -2fBBBf#"2222BBBBÄBÃBÄòÄòÅBÄBBBBB2BBBBB2222222222222BfBB#     -2#2222222#"#  "2222222222P2222222222#"2222222   -22228222#  -22222 ##       ##  -228222#   -22  B B#B #22R222 #B B B B¼B»B¼ò¼ò½B½BBBB222222622#    -22BBBBÄBÃBÄòÄòÅBÅBBBB2222222222222222222BBB22222222222222 #2222BBB22#       -2222222222#22BB #22#  -2222#  -2222#22BB22222#222#    #222BB22#22#  -22222BB22# -222# -222222# -2222222222222222222222222P222# -222222222222222222222282222222222222 #2222222222R222#                 ##              ##                                          ##                                            # \ No newline at end of file diff --git a/data/maps/VictoryRoad_B2F/border.bin b/data/maps/VictoryRoad_B2F/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/VictoryRoad_B2F/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc index ebafcfd49..b6c80a656 100644 --- a/data/maps/VictoryRoad_B2F/header.inc +++ b/data/maps/VictoryRoad_B2F/header.inc @@ -1,5 +1,5 @@ VictoryRoad_B2F: @ 84843AC - .4byte VictoryRoad_B2F_MapAttributes + .4byte VictoryRoad_B2F_Layout .4byte VictoryRoad_B2F_MapEvents .4byte VictoryRoad_B2F_MapScripts .4byte 0x0 diff --git a/data/maps/VictoryRoad_B2F/map.bin b/data/maps/VictoryRoad_B2F/map.bin deleted file mode 100644 index 24c4f646a..000000000 --- a/data/maps/VictoryRoad_B2F/map.bin +++ /dev/null @@ -1 +0,0 @@ -€‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰2{{{{{{{{{{{{{{{{{{{{{{’2222{{{{{{{{{{{{{{{{{{{{{{’22222222{{{{{{{{{{{{{{{{{{{{{{’222222222{{{{{TUUUV{{{{{{{{{{{{’22222222222W3W3W3y{’W3W3W3W3W3W3W3W3y{{{’222  "22222222222{’22222222W3W3y{’ #B22#B"222222222222{’222222222222{’222222222222222{’»³¼22222222222{’¹¹¹222222222»³¼¹¹¹222222222¹¹¹€‰222€Z[‰tuv‰‰‰‰222222222¹¹¹{’222XY{{{{{{{{’22222222222€tuv‰‰‰‰‰˜{š‰‰‰˜{PQ{{{{{{{š‰‰22222222{{{{{{{{{{{{{{{{XY{{{{{{{{{{x  #222222¤¤UUUUV{{{{{{{{{TUUUUUUUUUUV{{’  2#2222222#     "¤V{{{TUUUU¤         "D2D2D22222222#2 2 2  B B"D2D2D2     #  B B B B B B»B»B»B¼ò¼ò¼ò½B½B½BB222222222BB»B»B»B»B¼ò¼ò¼ò»B»B»B B B B B#BBBBBBBÃBÃBÃBÄòÄòÄòÅBÅBÅBB2222BBÃBÃBÃBÃBÄòÄòÄòÃBÃBÃBBBBBBBBBBB222NRRRO222BBBBBBBB22222222222222222222222222222222222222222222222222222222222222222262222222222222222222222222226#             ##              #6#               ##                  ##                                          ##                                            # \ No newline at end of file diff --git a/data/maps/_assets.inc b/data/maps/_assets.inc deleted file mode 100644 index c3c2a8d31..000000000 --- a/data/maps/_assets.inc +++ /dev/null @@ -1,7606 +0,0 @@ - .align 2 -PetalburgCity_MapBorder: @ 83DFE14 - .incbin "data/maps/PetalburgCity/border.bin" - - .align 2 -PetalburgCity_MapBlockdata: @ 83DFE1C - .incbin "data/maps/PetalburgCity/map.bin" - - .align 2 -PetalburgCity_MapAttributes: @ 83E0524 - .4byte 0x1e - .4byte 0x1e - .4byte PetalburgCity_MapBorder - .4byte PetalburgCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - - .align 2 -SlateportCity_MapBorder: @ 83E053C - .incbin "data/maps/SlateportCity/border.bin" - - .align 2 -SlateportCity_MapBlockdata: @ 83E0544 - .incbin "data/maps/SlateportCity/map.bin" - - .align 2 -SlateportCity_MapAttributes: @ 83E1804 - .4byte 0x28 - .4byte 0x3c - .4byte SlateportCity_MapBorder - .4byte SlateportCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Slateport - - .align 2 -MauvilleCity_MapBorder: @ 83E181C - .incbin "data/maps/MauvilleCity/border.bin" - - .align 2 -MauvilleCity_MapBlockdata: @ 83E1824 - .incbin "data/maps/MauvilleCity/map.bin" - - .align 2 -MauvilleCity_MapAttributes: @ 83E1E64 - .4byte 0x28 - .4byte 0x14 - .4byte MauvilleCity_MapBorder - .4byte MauvilleCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - - .align 2 -RustboroCity_MapBorder: @ 83E1E7C - .incbin "data/maps/RustboroCity/border.bin" - - .align 2 -RustboroCity_MapBlockdata: @ 83E1E84 - .incbin "data/maps/RustboroCity/map.bin" - - .align 2 -RustboroCity_MapAttributes: @ 83E3144 - .4byte 0x28 - .4byte 0x3c - .4byte RustboroCity_MapBorder - .4byte RustboroCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - - .align 2 -FortreeCity_MapBorder: @ 83E315C - .incbin "data/maps/FortreeCity/border.bin" - - .align 2 -FortreeCity_MapBlockdata: @ 83E3164 - .incbin "data/maps/FortreeCity/map.bin" - - .align 2 -FortreeCity_MapAttributes: @ 83E37A4 - .4byte 0x28 - .4byte 0x14 - .4byte FortreeCity_MapBorder - .4byte FortreeCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fortree - - .align 2 -LilycoveCity_MapBorder: @ 83E37BC - .incbin "data/maps/LilycoveCity/border.bin" - - .align 2 -LilycoveCity_MapBlockdata: @ 83E37C4 - .incbin "data/maps/LilycoveCity/map.bin" - - .align 2 -LilycoveCity_MapAttributes: @ 83E50C4 - .4byte 0x50 - .4byte 0x28 - .4byte LilycoveCity_MapBorder - .4byte LilycoveCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - - .align 2 -MossdeepCity_MapBorder: @ 83E50DC - .incbin "data/maps/MossdeepCity/border.bin" - - .align 2 -MossdeepCity_MapBlockdata: @ 83E50E4 - .incbin "data/maps/MossdeepCity/map.bin" - - .align 2 -MossdeepCity_MapAttributes: @ 83E69E4 - .4byte 0x50 - .4byte 0x28 - .4byte MossdeepCity_MapBorder - .4byte MossdeepCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - - .align 2 -SootopolisCity_MapBorder: @ 83E69FC - .incbin "data/maps/SootopolisCity/border.bin" - - .align 2 -SootopolisCity_MapBlockdata: @ 83E6A04 - .incbin "data/maps/SootopolisCity/map.bin" - - .align 2 -SootopolisCity_MapAttributes: @ 83E8624 - .4byte 0x3c - .4byte 0x3c - .4byte SootopolisCity_MapBorder - .4byte SootopolisCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Sootopolis - - .align 2 -EverGrandeCity_MapBorder: @ 83E863C - .incbin "data/maps/EverGrandeCity/border.bin" - - .align 2 -EverGrandeCity_MapBlockdata: @ 83E8644 - .incbin "data/maps/EverGrandeCity/map.bin" - - .align 2 -EverGrandeCity_MapAttributes: @ 83E9F44 - .4byte 0x28 - .4byte 0x50 - .4byte EverGrandeCity_MapBorder - .4byte EverGrandeCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_EverGrande - - .align 2 -LittlerootTown_MapBorder: @ 83E9F5C - .incbin "data/maps/LittlerootTown/border.bin" - - .align 2 -LittlerootTown_MapBlockdata: @ 83E9F64 - .incbin "data/maps/LittlerootTown/map.bin" - - .align 2 -LittlerootTown_MapAttributes: @ 83EA284 - .4byte 0x14 - .4byte 0x14 - .4byte LittlerootTown_MapBorder - .4byte LittlerootTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - - .align 2 -OldaleTown_MapBorder: @ 83EA29C - .incbin "data/maps/OldaleTown/border.bin" - - .align 2 -OldaleTown_MapBlockdata: @ 83EA2A4 - .incbin "data/maps/OldaleTown/map.bin" - - .align 2 -OldaleTown_MapAttributes: @ 83EA5C4 - .4byte 0x14 - .4byte 0x14 - .4byte OldaleTown_MapBorder - .4byte OldaleTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - - .align 2 -DewfordTown_MapBorder: @ 83EA5DC - .incbin "data/maps/DewfordTown/border.bin" - - .align 2 -DewfordTown_MapBlockdata: @ 83EA5E4 - .incbin "data/maps/DewfordTown/map.bin" - - .align 2 -DewfordTown_MapAttributes: @ 83EA904 - .4byte 0x14 - .4byte 0x14 - .4byte DewfordTown_MapBorder - .4byte DewfordTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - - .align 2 -LavaridgeTown_MapBorder: @ 83EA91C - .incbin "data/maps/LavaridgeTown/border.bin" - - .align 2 -LavaridgeTown_MapBlockdata: @ 83EA924 - .incbin "data/maps/LavaridgeTown/map.bin" - - .align 2 -LavaridgeTown_MapAttributes: @ 83EAC44 - .4byte 0x14 - .4byte 0x14 - .4byte LavaridgeTown_MapBorder - .4byte LavaridgeTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - - .align 2 -FallarborTown_MapBorder: @ 83EAC5C - .incbin "data/maps/FallarborTown/border.bin" - - .align 2 -FallarborTown_MapBlockdata: @ 83EAC64 - .incbin "data/maps/FallarborTown/map.bin" - - .align 2 -FallarborTown_MapAttributes: @ 83EAF84 - .4byte 0x14 - .4byte 0x14 - .4byte FallarborTown_MapBorder - .4byte FallarborTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - - .align 2 -VerdanturfTown_MapBorder: @ 83EAF9C - .incbin "data/maps/VerdanturfTown/border.bin" - - .align 2 -VerdanturfTown_MapBlockdata: @ 83EAFA4 - .incbin "data/maps/VerdanturfTown/map.bin" - - .align 2 -VerdanturfTown_MapAttributes: @ 83EB2C4 - .4byte 0x14 - .4byte 0x14 - .4byte VerdanturfTown_MapBorder - .4byte VerdanturfTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - - .align 2 -PacifidlogTown_MapBorder: @ 83EB2DC - .incbin "data/maps/PacifidlogTown/border.bin" - - .align 2 -PacifidlogTown_MapBlockdata: @ 83EB2E4 - .incbin "data/maps/PacifidlogTown/map.bin" - - .align 2 -PacifidlogTown_MapAttributes: @ 83EB924 - .4byte 0x14 - .4byte 0x28 - .4byte PacifidlogTown_MapBorder - .4byte PacifidlogTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -Route101_MapBorder: @ 83EB93C - .incbin "data/maps/Route101/border.bin" - - .align 2 -Route101_MapBlockdata: @ 83EB944 - .incbin "data/maps/Route101/map.bin" - - .align 2 -Route101_MapAttributes: @ 83EBC64 - .4byte 0x14 - .4byte 0x14 - .4byte Route101_MapBorder - .4byte Route101_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - - .align 2 -Route102_MapBorder: @ 83EBC7C - .incbin "data/maps/Route102/border.bin" - - .align 2 -Route102_MapBlockdata: @ 83EBC84 - .incbin "data/maps/Route102/map.bin" - - .align 2 -Route102_MapAttributes: @ 83EC454 - .4byte 0x32 - .4byte 0x14 - .4byte Route102_MapBorder - .4byte Route102_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - - .align 2 -Route103_MapBorder: @ 83EC46C - .incbin "data/maps/Route103/border.bin" - - .align 2 -Route103_MapBlockdata: @ 83EC474 - .incbin "data/maps/Route103/map.bin" - - .align 2 -Route103_MapAttributes: @ 83ED234 - .4byte 0x50 - .4byte 0x16 - .4byte Route103_MapBorder - .4byte Route103_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - - .align 2 -Route104_MapBorder: @ 83ED24C - .incbin "data/maps/Route104/border.bin" - - .align 2 -Route104_MapBlockdata: @ 83ED254 - .incbin "data/maps/Route104/map.bin" - - .align 2 -Route104_MapAttributes: @ 83EEB54 - .4byte 0x28 - .4byte 0x50 - .4byte Route104_MapBorder - .4byte Route104_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - - .align 2 -Route105_MapBorder: @ 83EEB6C - .incbin "data/maps/Route105/border.bin" - - .align 2 -Route105_MapBlockdata: @ 83EEB74 - .incbin "data/maps/Route105/map.bin" - - .align 2 -Route105_MapAttributes: @ 83F0474 - .4byte 0x28 - .4byte 0x50 - .4byte Route105_MapBorder - .4byte Route105_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - - .align 2 -Route106_MapBorder: @ 83F048C - .incbin "data/maps/Route106/border.bin" - - .align 2 -Route106_MapBlockdata: @ 83F0494 - .incbin "data/maps/Route106/map.bin" - - .align 2 -Route106_MapAttributes: @ 83F1114 - .4byte 0x50 - .4byte 0x14 - .4byte Route106_MapBorder - .4byte Route106_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - - .align 2 -Route107_MapBorder: @ 83F112C - .incbin "data/maps/Route107/border.bin" - - .align 2 -Route107_MapBlockdata: @ 83F1134 - .incbin "data/maps/Route107/map.bin" - - .align 2 -Route107_MapAttributes: @ 83F1A94 - .4byte 0x3c - .4byte 0x14 - .4byte Route107_MapBorder - .4byte Route107_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - - .align 2 -Route108_MapBorder: @ 83F1AAC - .incbin "data/maps/Route108/border.bin" - - .align 2 -Route108_MapBlockdata: @ 83F1AB4 - .incbin "data/maps/Route108/map.bin" - - .align 2 -Route108_MapAttributes: @ 83F2414 - .4byte 0x3c - .4byte 0x14 - .4byte Route108_MapBorder - .4byte Route108_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Slateport - - .align 2 -Route109_MapBorder: @ 83F242C - .incbin "data/maps/Route109/border.bin" - - .align 2 -Route109_MapBlockdata: @ 83F2434 - .incbin "data/maps/Route109/map.bin" - - .align 2 -Route109_MapAttributes: @ 83F37E4 - .4byte 0x28 - .4byte 0x3f - .4byte Route109_MapBorder - .4byte Route109_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Slateport - - .align 2 -Route110_MapBorder: @ 83F37FC - .incbin "data/maps/Route110/border.bin" - - .align 2 -Route110_MapBlockdata: @ 83F3804 - .incbin "data/maps/Route110/map.bin" - - .align 2 -Route110_MapAttributes: @ 83F5744 - .4byte 0x28 - .4byte 0x64 - .4byte Route110_MapBorder - .4byte Route110_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - - .align 2 -Route111_MapBorder: @ 83F575C - .incbin "data/maps/Route111/border.bin" - - .align 2 -Route111_MapBlockdata: @ 83F5764 - .incbin "data/maps/Route111/map.bin" - - .align 2 -Route111_MapAttributes: @ 83F8324 - .4byte 0x28 - .4byte 0x8c - .4byte Route111_MapBorder - .4byte Route111_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - - .align 2 -Route112_MapBorder: @ 83F833C - .incbin "data/maps/Route112/border.bin" - - .align 2 -Route112_MapBlockdata: @ 83F8344 - .incbin "data/maps/Route112/map.bin" - - .align 2 -Route112_MapAttributes: @ 83F9604 - .4byte 0x28 - .4byte 0x3c - .4byte Route112_MapBorder - .4byte Route112_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - - .align 2 -Route113_MapBorder: @ 83F961C - .incbin "data/maps/Route113/border.bin" - - .align 2 -Route113_MapBlockdata: @ 83F9624 - .incbin "data/maps/Route113/map.bin" - - .align 2 -Route113_MapAttributes: @ 83FA5C4 - .4byte 0x64 - .4byte 0x14 - .4byte Route113_MapBorder - .4byte Route113_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - - .align 2 -Route114_MapBorder: @ 83FA5DC - .incbin "data/maps/Route114/border.bin" - - .align 2 -Route114_MapBlockdata: @ 83FA5E4 - .incbin "data/maps/Route114/map.bin" - - .align 2 -Route114_MapAttributes: @ 83FBEE4 - .4byte 0x28 - .4byte 0x50 - .4byte Route114_MapBorder - .4byte Route114_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - - .align 2 -Route115_MapBorder: @ 83FBEFC - .incbin "data/maps/Route115/border.bin" - - .align 2 -Route115_MapBlockdata: @ 83FBF04 - .incbin "data/maps/Route115/map.bin" - - .align 2 -Route115_MapAttributes: @ 83FD804 - .4byte 0x28 - .4byte 0x50 - .4byte Route115_MapBorder - .4byte Route115_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - - .align 2 -Route116_MapBorder: @ 83FD81C - .incbin "data/maps/Route116/border.bin" - - .align 2 -Route116_MapBlockdata: @ 83FD824 - .incbin "data/maps/Route116/map.bin" - - .align 2 -Route116_MapAttributes: @ 83FE7C4 - .4byte 0x64 - .4byte 0x14 - .4byte Route116_MapBorder - .4byte Route116_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - - .align 2 -Route117_MapBorder: @ 83FE7DC - .incbin "data/maps/Route117/border.bin" - - .align 2 -Route117_MapBlockdata: @ 83FE7E4 - .incbin "data/maps/Route117/map.bin" - - .align 2 -Route117_MapAttributes: @ 83FF144 - .4byte 0x3c - .4byte 0x14 - .4byte Route117_MapBorder - .4byte Route117_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - - .align 2 -Route118_MapBorder: @ 83FF15C - .incbin "data/maps/Route118/border.bin" - - .align 2 -Route118_MapBlockdata: @ 83FF164 - .incbin "data/maps/Route118/map.bin" - - .align 2 -Route118_MapAttributes: @ 83FFDE4 - .4byte 0x50 - .4byte 0x14 - .4byte Route118_MapBorder - .4byte Route118_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - - .align 2 -Route119_MapBorder: @ 83FFDFC - .incbin "data/maps/Route119/border.bin" - - .align 2 -Route119_MapBlockdata: @ 83FFE04 - .incbin "data/maps/Route119/map.bin" - - .align 2 -Route119_MapAttributes: @ 84029C4 - .4byte 0x28 - .4byte 0x8c - .4byte Route119_MapBorder - .4byte Route119_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fortree - - .align 2 -Route120_MapBorder: @ 84029DC - .incbin "data/maps/Route120/border.bin" - - .align 2 -Route120_MapBlockdata: @ 84029E4 - .incbin "data/maps/Route120/map.bin" - - .align 2 -Route120_MapAttributes: @ 8404924 - .4byte 0x28 - .4byte 0x64 - .4byte Route120_MapBorder - .4byte Route120_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fortree - - .align 2 -Route121_MapBorder: @ 840493C - .incbin "data/maps/Route121/border.bin" - - .align 2 -Route121_MapBlockdata: @ 8404944 - .incbin "data/maps/Route121/map.bin" - - .align 2 -Route121_MapAttributes: @ 84055C4 - .4byte 0x50 - .4byte 0x14 - .4byte Route121_MapBorder - .4byte Route121_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - - .align 2 -Route122_MapBorder: @ 84055DC - .incbin "data/maps/Route122/border.bin" - - .align 2 -Route122_MapBlockdata: @ 84055E4 - .incbin "data/maps/Route122/map.bin" - - .align 2 -Route122_MapAttributes: @ 8406264 - .4byte 0x28 - .4byte 0x28 - .4byte Route122_MapBorder - .4byte Route122_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - - .align 2 -Route123_MapBorder: @ 840627C - .incbin "data/maps/Route123/border.bin" - - .align 2 -Route123_MapBlockdata: @ 8406284 - .incbin "data/maps/Route123/map.bin" - - .align 2 -Route123_MapAttributes: @ 8407864 - .4byte 0x8c - .4byte 0x14 - .4byte Route123_MapBorder - .4byte Route123_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - - .align 2 -Route124_MapBorder: @ 840787C - .incbin "data/maps/Route124/border.bin" - - .align 2 -Route124_MapBlockdata: @ 8407884 - .incbin "data/maps/Route124/map.bin" - - .align 2 -Route124_MapAttributes: @ 840AA84 - .4byte 0x50 - .4byte 0x50 - .4byte Route124_MapBorder - .4byte Route124_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - - .align 2 -Route125_MapBorder: @ 840AA9C - .incbin "data/maps/Route125/border.bin" - - .align 2 -Route125_MapBlockdata: @ 840AAA4 - .incbin "data/maps/Route125/map.bin" - - .align 2 -Route125_MapAttributes: @ 840C3A4 - .4byte 0x50 - .4byte 0x28 - .4byte Route125_MapBorder - .4byte Route125_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - - .align 2 -Route126_MapBorder: @ 840C3BC - .incbin "data/maps/Route126/border.bin" - - .align 2 -Route126_MapBlockdata: @ 840C3C4 - .incbin "data/maps/Route126/map.bin" - - .align 2 -Route126_MapAttributes: @ 840F5C4 - .4byte 0x50 - .4byte 0x50 - .4byte Route126_MapBorder - .4byte Route126_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - - .align 2 -Route127_MapBorder: @ 840F5DC - .incbin "data/maps/Route127/border.bin" - - .align 2 -Route127_MapBlockdata: @ 840F5E4 - .incbin "data/maps/Route127/map.bin" - - .align 2 -Route127_MapAttributes: @ 84127E4 - .4byte 0x50 - .4byte 0x50 - .4byte Route127_MapBorder - .4byte Route127_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - - .align 2 -Route128_MapBorder: @ 84127FC - .incbin "data/maps/Route128/border.bin" - - .align 2 -Route128_MapBlockdata: @ 8412804 - .incbin "data/maps/Route128/map.bin" - - .align 2 -Route128_MapAttributes: @ 8414D84 - .4byte 0x78 - .4byte 0x28 - .4byte Route128_MapBorder - .4byte Route128_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - - .align 2 -Route129_MapBorder: @ 8414D9C - .incbin "data/maps/Route129/border.bin" - - .align 2 -Route129_MapBlockdata: @ 8414DA4 - .incbin "data/maps/Route129/map.bin" - - .align 2 -Route129_MapAttributes: @ 84166A4 - .4byte 0x50 - .4byte 0x28 - .4byte Route129_MapBorder - .4byte Route129_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - - .align 2 -UnknownMapBorder_08417FC4: @ 84166BC - .incbin "data/maps/UnknownMap_08417FC4/border.bin" - - .align 2 -UnknownMapBlockdata_08417FC4: @ 84166C4 - .incbin "data/maps/UnknownMap_08417FC4/map.bin" - - .align 2 -UnknownMapAttributes_08417FC4: @ 8417FC4 - .4byte 0x50 - .4byte 0x28 - .4byte UnknownMapBorder_08417FC4 - .4byte UnknownMapBlockdata_08417FC4 - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -Route131_MapBorder: @ 8417FDC - .incbin "data/maps/Route131/border.bin" - - .align 2 -Route131_MapBlockdata: @ 8417FE4 - .incbin "data/maps/Route131/map.bin" - - .align 2 -Route131_MapAttributes: @ 84192A4 - .4byte 0x3c - .4byte 0x28 - .4byte Route131_MapBorder - .4byte Route131_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -Route132_MapBorder: @ 84192BC - .incbin "data/maps/Route132/border.bin" - - .align 2 -Route132_MapBlockdata: @ 84192C4 - .incbin "data/maps/Route132/map.bin" - - .align 2 -Route132_MapAttributes: @ 841ABC4 - .4byte 0x50 - .4byte 0x28 - .4byte Route132_MapBorder - .4byte Route132_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -Route133_MapBorder: @ 841ABDC - .incbin "data/maps/Route133/border.bin" - - .align 2 -Route133_MapBlockdata: @ 841ABE4 - .incbin "data/maps/Route133/map.bin" - - .align 2 -Route133_MapAttributes: @ 841C4E4 - .4byte 0x50 - .4byte 0x28 - .4byte Route133_MapBorder - .4byte Route133_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -Route134_MapBorder: @ 841C4FC - .incbin "data/maps/Route134/border.bin" - - .align 2 -Route134_MapBlockdata: @ 841C504 - .incbin "data/maps/Route134/map.bin" - - .align 2 -Route134_MapAttributes: @ 841DE04 - .4byte 0x50 - .4byte 0x28 - .4byte Route134_MapBorder - .4byte Route134_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -Underwater2_MapBorder: @ 841DE1C - .incbin "data/maps/Underwater2/border.bin" - - .align 2 -Underwater2_MapBlockdata: @ 841DE24 - .incbin "data/maps/Underwater2/map.bin" - - .align 2 -Underwater2_MapAttributes: @ 8421024 - .4byte 0x50 - .4byte 0x50 - .4byte Underwater2_MapBorder - .4byte Underwater2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - - .align 2 -Underwater3_MapBorder: @ 842103C - .incbin "data/maps/Underwater3/border.bin" - - .align 2 -Underwater3_MapBlockdata: @ 8421044 - .incbin "data/maps/Underwater3/map.bin" - - .align 2 -Underwater3_MapAttributes: @ 8424244 - .4byte 0x50 - .4byte 0x50 - .4byte Underwater3_MapBorder - .4byte Underwater3_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - - .align 2 -Underwater4_MapBorder: @ 842425C - .incbin "data/maps/Underwater4/border.bin" - - .align 2 -Underwater4_MapBlockdata: @ 8424264 - .incbin "data/maps/Underwater4/map.bin" - - .align 2 -Underwater4_MapAttributes: @ 84267E4 - .4byte 0x78 - .4byte 0x28 - .4byte Underwater4_MapBorder - .4byte Underwater4_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - - .align 2 -LittlerootTown_BrendansHouse_1F_MapBorder: @ 84267FC - .incbin "data/maps/LittlerootTown_BrendansHouse_1F/border.bin" - - .align 2 -LittlerootTown_BrendansHouse_1F_MapBlockdata: @ 8426804 - .incbin "data/maps/LittlerootTown_BrendansHouse_1F/map.bin" - - .align 2 -LittlerootTown_BrendansHouse_1F_MapAttributes: @ 84268CC - .4byte 0xb - .4byte 0x9 - .4byte LittlerootTown_BrendansHouse_1F_MapBorder - .4byte LittlerootTown_BrendansHouse_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BrendansMaysHouse - - .align 2 -LittlerootTown_BrendansHouse_2F_MapBorder: @ 84268E4 - .incbin "data/maps/LittlerootTown_BrendansHouse_2F/border.bin" - - .align 2 -LittlerootTown_BrendansHouse_2F_MapBlockdata: @ 84268EC - .incbin "data/maps/LittlerootTown_BrendansHouse_2F/map.bin" - - .align 2 -LittlerootTown_BrendansHouse_2F_MapAttributes: @ 842697C - .4byte 0x9 - .4byte 0x8 - .4byte LittlerootTown_BrendansHouse_2F_MapBorder - .4byte LittlerootTown_BrendansHouse_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BrendansMaysHouse - - .align 2 -LittlerootTown_MaysHouse_1F_MapBorder: @ 8426994 - .incbin "data/maps/LittlerootTown_MaysHouse_1F/border.bin" - - .align 2 -LittlerootTown_MaysHouse_1F_MapBlockdata: @ 842699C - .incbin "data/maps/LittlerootTown_MaysHouse_1F/map.bin" - - .align 2 -LittlerootTown_MaysHouse_1F_MapAttributes: @ 8426A64 - .4byte 0xb - .4byte 0x9 - .4byte LittlerootTown_MaysHouse_1F_MapBorder - .4byte LittlerootTown_MaysHouse_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BrendansMaysHouse - - .align 2 -LittlerootTown_MaysHouse_2F_MapBorder: @ 8426A7C - .incbin "data/maps/LittlerootTown_MaysHouse_2F/border.bin" - - .align 2 -LittlerootTown_MaysHouse_2F_MapBlockdata: @ 8426A84 - .incbin "data/maps/LittlerootTown_MaysHouse_2F/map.bin" - - .align 2 -LittlerootTown_MaysHouse_2F_MapAttributes: @ 8426B14 - .4byte 0x9 - .4byte 0x8 - .4byte LittlerootTown_MaysHouse_2F_MapBorder - .4byte LittlerootTown_MaysHouse_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BrendansMaysHouse - - .align 2 -LittlerootTown_ProfessorBirchsLab_MapBorder: @ 8426B2C - .incbin "data/maps/LittlerootTown_ProfessorBirchsLab/border.bin" - - .align 2 -LittlerootTown_ProfessorBirchsLab_MapBlockdata: @ 8426B34 - .incbin "data/maps/LittlerootTown_ProfessorBirchsLab/map.bin" - - .align 2 -LittlerootTown_ProfessorBirchsLab_MapAttributes: @ 8426C88 - .4byte 0xd - .4byte 0xd - .4byte LittlerootTown_ProfessorBirchsLab_MapBorder - .4byte LittlerootTown_ProfessorBirchsLab_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Lab - - .align 2 -OldaleTown_House1_MapBorder: @ 8426CA0 - .incbin "data/maps/OldaleTown_House1/border.bin" - - .align 2 -OldaleTown_House1_MapBlockdata: @ 8426CA8 - .incbin "data/maps/OldaleTown_House1/map.bin" - - .align 2 -FallarborTown_House1_MapAttributes: @ 8426D5C -LilycoveCity_House1_MapAttributes: @ 8426D5C -LilycoveCity_House4_MapAttributes: @ 8426D5C -MauvilleCity_House2_MapAttributes: @ 8426D5C -MossdeepCity_House2_MapAttributes: @ 8426D5C -OldaleTown_House1_MapAttributes: @ 8426D5C -PetalburgCity_House1_MapAttributes: @ 8426D5C -Route119_House_MapAttributes: @ 8426D5C -VerdanturfTown_House_MapAttributes: @ 8426D5C - .4byte 0xa - .4byte 0x9 - .4byte OldaleTown_House1_MapBorder - .4byte OldaleTown_House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -OldaleTown_House2_MapBorder: @ 8426D74 - .incbin "data/maps/OldaleTown_House2/border.bin" - - .align 2 -OldaleTown_House2_MapBlockdata: @ 8426D7C - .incbin "data/maps/OldaleTown_House2/map.bin" - - .align 2 -FallarborTown_House2_MapAttributes: @ 8426E2C -LilycoveCity_House3_MapAttributes: @ 8426E2C -LilycoveCity_MoveDeletersHouse_MapAttributes: @ 8426E2C -MauvilleCity_House1_MapAttributes: @ 8426E2C -MossdeepCity_House1_MapAttributes: @ 8426E2C -MossdeepCity_House3_MapAttributes: @ 8426E2C -OldaleTown_House2_MapAttributes: @ 8426E2C -PetalburgCity_WallysHouse_MapAttributes: @ 8426E2C -Route111_WinstrateFamilysHouse_MapAttributes: @ 8426E2C -Route123_BerryMastersHouse_MapAttributes: @ 8426E2C -SlateportCity_House2_MapAttributes: @ 8426E2C -VerdanturfTown_FriendshipRatersHouse_MapAttributes: @ 8426E2C - .4byte 0xb - .4byte 0x8 - .4byte OldaleTown_House2_MapBorder - .4byte OldaleTown_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -OldaleTown_PokemonCenter_1F_MapBorder: @ 8426E44 - .incbin "data/maps/OldaleTown_PokemonCenter_1F/border.bin" - - .align 2 -OldaleTown_PokemonCenter_1F_MapBlockdata: @ 8426E4C - .incbin "data/maps/OldaleTown_PokemonCenter_1F/map.bin" - - .align 2 -BattleFrontier_PokemonCenter_1F_MapAttributes: @ 8426F48 -DewfordTown_PokemonCenter_1F_MapAttributes: @ 8426F48 -EverGrandeCity_PokemonCenter_1F_MapAttributes: @ 8426F48 -FallarborTown_PokemonCenter_1F_MapAttributes: @ 8426F48 -FortreeCity_PokemonCenter_1F_MapAttributes: @ 8426F48 -LilycoveCity_PokemonCenter_1F_MapAttributes: @ 8426F48 -MauvilleCity_PokemonCenter_1F_MapAttributes: @ 8426F48 -MossdeepCity_PokemonCenter_1F_MapAttributes: @ 8426F48 -OldaleTown_PokemonCenter_1F_MapAttributes: @ 8426F48 -PacifidlogTown_PokemonCenter_1F_MapAttributes: @ 8426F48 -PetalburgCity_PokemonCenter_1F_MapAttributes: @ 8426F48 -RustboroCity_PokemonCenter_1F_MapAttributes: @ 8426F48 -SlateportCity_PokemonCenter_1F_MapAttributes: @ 8426F48 -SootopolisCity_PokemonCenter_1F_MapAttributes: @ 8426F48 -VerdanturfTown_PokemonCenter_1F_MapAttributes: @ 8426F48 - .4byte 0xe - .4byte 0x9 - .4byte OldaleTown_PokemonCenter_1F_MapBorder - .4byte OldaleTown_PokemonCenter_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonCenter - - .align 2 -OldaleTown_PokemonCenter_2F_MapBorder: @ 8426F60 - .incbin "data/maps/OldaleTown_PokemonCenter_2F/border.bin" - - .align 2 -OldaleTown_PokemonCenter_2F_MapBlockdata: @ 8426F68 - .incbin "data/maps/OldaleTown_PokemonCenter_2F/map.bin" - - .align 2 -BattleFrontier_PokemonCenter_2F_MapAttributes: @ 8427080 -DewfordTown_PokemonCenter_2F_MapAttributes: @ 8427080 -EverGrandeCity_PokemonCenter_2F_MapAttributes: @ 8427080 -EverGrandeCity_PokemonLeague_2F_MapAttributes: @ 8427080 -FallarborTown_PokemonCenter_2F_MapAttributes: @ 8427080 -FortreeCity_PokemonCenter_2F_MapAttributes: @ 8427080 -LavaridgeTown_PokemonCenter_2F_MapAttributes: @ 8427080 -LilycoveCity_PokemonCenter_2F_MapAttributes: @ 8427080 -MauvilleCity_PokemonCenter_2F_MapAttributes: @ 8427080 -MossdeepCity_PokemonCenter_2F_MapAttributes: @ 8427080 -OldaleTown_PokemonCenter_2F_MapAttributes: @ 8427080 -PacifidlogTown_PokemonCenter_2F_MapAttributes: @ 8427080 -PetalburgCity_PokemonCenter_2F_MapAttributes: @ 8427080 -RustboroCity_PokemonCenter_2F_MapAttributes: @ 8427080 -SlateportCity_PokemonCenter_2F_MapAttributes: @ 8427080 -SootopolisCity_PokemonCenter_2F_MapAttributes: @ 8427080 -VerdanturfTown_PokemonCenter_2F_MapAttributes: @ 8427080 - .4byte 0xe - .4byte 0xa - .4byte OldaleTown_PokemonCenter_2F_MapBorder - .4byte OldaleTown_PokemonCenter_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonCenter - - .align 2 -OldaleTown_Mart_MapBorder: @ 8427098 - .incbin "data/maps/OldaleTown_Mart/border.bin" - - .align 2 -OldaleTown_Mart_MapBlockdata: @ 84270A0 - .incbin "data/maps/OldaleTown_Mart/map.bin" - - .align 2 -BattleFrontier_Mart_MapAttributes: @ 8427150 -FallarborTown_Mart_MapAttributes: @ 8427150 -FortreeCity_Mart_MapAttributes: @ 8427150 -LavaridgeTown_Mart_MapAttributes: @ 8427150 -LilycoveCity_UnusedMart_MapAttributes: @ 8427150 -MauvilleCity_Mart_MapAttributes: @ 8427150 -MossdeepCity_Mart_MapAttributes: @ 8427150 -OldaleTown_Mart_MapAttributes: @ 8427150 -PetalburgCity_Mart_MapAttributes: @ 8427150 -RustboroCity_Mart_MapAttributes: @ 8427150 -SlateportCity_Mart_MapAttributes: @ 8427150 -SootopolisCity_Mart_MapAttributes: @ 8427150 -VerdanturfTown_Mart_MapAttributes: @ 8427150 - .4byte 0xb - .4byte 0x8 - .4byte OldaleTown_Mart_MapBorder - .4byte OldaleTown_Mart_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - - .align 2 -DewfordTown_House1_MapBorder: @ 8427168 - .incbin "data/maps/DewfordTown_House1/border.bin" - - .align 2 -DewfordTown_House1_MapBlockdata: @ 8427170 - .incbin "data/maps/DewfordTown_House1/map.bin" - - .align 2 -DewfordTown_House1_MapAttributes: @ 8427210 -LavaridgeTown_House_MapAttributes: @ 8427210 -Route111_OldLadysRestStop_MapAttributes: @ 8427210 - .4byte 0xa - .4byte 0x8 - .4byte DewfordTown_House1_MapBorder - .4byte DewfordTown_House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -DewfordTown_Gym_MapBorder: @ 8427228 - .incbin "data/maps/DewfordTown_Gym/border.bin" - - .align 2 -DewfordTown_Gym_MapBlockdata: @ 8427230 - .incbin "data/maps/DewfordTown_Gym/map.bin" - - .align 2 -DewfordTown_Gym_MapAttributes: @ 8427620 - .4byte 0x12 - .4byte 0x1c - .4byte DewfordTown_Gym_MapBorder - .4byte DewfordTown_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_DewfordGym - - .align 2 -DewfordTown_Hall_MapBorder: @ 8427638 - .incbin "data/maps/DewfordTown_Hall/border.bin" - - .align 2 -DewfordTown_Hall_MapBlockdata: @ 8427640 - .incbin "data/maps/DewfordTown_Hall/map.bin" - - .align 2 -DewfordTown_Hall_MapAttributes: @ 8427774 - .4byte 0x11 - .4byte 0x9 - .4byte DewfordTown_Hall_MapBorder - .4byte DewfordTown_Hall_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -DewfordTown_House2_MapBorder: @ 842778C - .incbin "data/maps/DewfordTown_House2/border.bin" - - .align 2 -DewfordTown_House2_MapBlockdata: @ 8427794 - .incbin "data/maps/DewfordTown_House2/map.bin" - - .align 2 -DewfordTown_House2_MapAttributes: @ 8427848 -Route113_GlassWorkshop_MapAttributes: @ 8427848 - .4byte 0xa - .4byte 0x9 - .4byte DewfordTown_House2_MapBorder - .4byte DewfordTown_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -LavaridgeTown_HerbShop_MapBorder: @ 8427860 - .incbin "data/maps/LavaridgeTown_HerbShop/border.bin" - - .align 2 -LavaridgeTown_HerbShop_MapBlockdata: @ 8427868 - .incbin "data/maps/LavaridgeTown_HerbShop/map.bin" - - .align 2 -LavaridgeTown_HerbShop_MapAttributes: @ 8427918 - .4byte 0xb - .4byte 0x8 - .4byte LavaridgeTown_HerbShop_MapBorder - .4byte LavaridgeTown_HerbShop_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - - .align 2 -LavaridgeTown_Gym_1F_MapBorder: @ 8427930 - .incbin "data/maps/LavaridgeTown_Gym_1F/border.bin" - - .align 2 -LavaridgeTown_Gym_1F_MapBlockdata: @ 8427938 - .incbin "data/maps/LavaridgeTown_Gym_1F/map.bin" - - .align 2 -LavaridgeTown_Gym_1F_MapAttributes: @ 8427BC0 - .4byte 0x11 - .4byte 0x13 - .4byte LavaridgeTown_Gym_1F_MapBorder - .4byte LavaridgeTown_Gym_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_LavaridgeGym - - .align 2 -LavaridgeTown_Gym_B1F_MapBorder: @ 8427BD8 - .incbin "data/maps/LavaridgeTown_Gym_B1F/border.bin" - - .align 2 -LavaridgeTown_Gym_B1F_MapBlockdata: @ 8427BE0 - .incbin "data/maps/LavaridgeTown_Gym_B1F/map.bin" - - .align 2 -LavaridgeTown_Gym_B1F_MapAttributes: @ 8427E68 - .4byte 0x11 - .4byte 0x13 - .4byte LavaridgeTown_Gym_B1F_MapBorder - .4byte LavaridgeTown_Gym_B1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_LavaridgeGym - - .align 2 -LavaridgeTown_PokemonCenter_1F_MapBorder: @ 8427E80 - .incbin "data/maps/LavaridgeTown_PokemonCenter_1F/border.bin" - - .align 2 -LavaridgeTown_PokemonCenter_1F_MapBlockdata: @ 8427E88 - .incbin "data/maps/LavaridgeTown_PokemonCenter_1F/map.bin" - - .align 2 -LavaridgeTown_PokemonCenter_1F_MapAttributes: @ 8427F84 - .4byte 0xe - .4byte 0x9 - .4byte LavaridgeTown_PokemonCenter_1F_MapBorder - .4byte LavaridgeTown_PokemonCenter_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonCenter - - .align 2 -FallarborTown_LeftoverRSContestLobby_MapBorder: @ 8427F9C - .incbin "data/maps/FallarborTown_LeftoverRSContestLobby/border.bin" - - .align 2 -FallarborTown_LeftoverRSContestLobby_MapBlockdata: @ 8427FA4 - .incbin "data/maps/FallarborTown_LeftoverRSContestLobby/map.bin" - - .align 2 -FallarborTown_LeftoverRSContestLobby_MapAttributes: @ 8428078 - .4byte 0xf - .4byte 0x7 - .4byte FallarborTown_LeftoverRSContestLobby_MapBorder - .4byte FallarborTown_LeftoverRSContestLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - - .align 2 -FallarborTown_LeftoverRSContestHall_MapBorder: @ 8428090 - .incbin "data/maps/FallarborTown_LeftoverRSContestHall/border.bin" - - .align 2 -FallarborTown_LeftoverRSContestHall_MapBlockdata: @ 8428098 - .incbin "data/maps/FallarborTown_LeftoverRSContestHall/map.bin" - - .align 2 -FallarborTown_LeftoverRSContestHall_MapAttributes: @ 842838C - .4byte 0x15 - .4byte 0x12 - .4byte FallarborTown_LeftoverRSContestHall_MapBorder - .4byte FallarborTown_LeftoverRSContestHall_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - - .align 2 -LilycoveCity_House2_MapBorder: @ 84283A4 - .incbin "data/maps/LilycoveCity_House2/border.bin" - - .align 2 -LilycoveCity_House2_MapBlockdata: @ 84283AC - .incbin "data/maps/LilycoveCity_House2/map.bin" - - .align 2 -LilycoveCity_House2_MapAttributes: @ 842842C - .4byte 0x8 - .4byte 0x8 - .4byte LilycoveCity_House2_MapBorder - .4byte LilycoveCity_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -UnknownMapBorder_08428450: @ 8428444 - .incbin "data/maps/UnknownMap_08428450/border.bin" - - .align 2 -UnknownMapBlockdata_08428450: @ 842844C - .incbin "data/maps/UnknownMap_08428450/map.bin" - - .align 2 -UnknownMapAttributes_08428450: @ 8428450 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_08428450 - .4byte UnknownMapBlockdata_08428450 - .4byte gTileset_Building - .4byte gTileset_Contest - - .align 2 -VerdanturfTown_WandasHouse_MapBorder: @ 8428468 - .incbin "data/maps/VerdanturfTown_WandasHouse/border.bin" - - .align 2 -VerdanturfTown_WandasHouse_MapBlockdata: @ 8428470 - .incbin "data/maps/VerdanturfTown_WandasHouse/map.bin" - - .align 2 -VerdanturfTown_WandasHouse_MapAttributes: @ 8428580 - .4byte 0x11 - .4byte 0x8 - .4byte VerdanturfTown_WandasHouse_MapBorder - .4byte VerdanturfTown_WandasHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -PacifidlogTown_House1_MapBorder: @ 8428598 - .incbin "data/maps/PacifidlogTown_House1/border.bin" - - .align 2 -PacifidlogTown_House1_MapBlockdata: @ 84285A0 - .incbin "data/maps/PacifidlogTown_House1/map.bin" - - .align 2 -PacifidlogTown_House1_MapAttributes: @ 8428654 -PacifidlogTown_House3_MapAttributes: @ 8428654 -PacifidlogTown_House5_MapAttributes: @ 8428654 - .4byte 0xa - .4byte 0x9 - .4byte PacifidlogTown_House1_MapBorder - .4byte PacifidlogTown_House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -PacifidlogTown_House2_MapBorder: @ 842866C - .incbin "data/maps/PacifidlogTown_House2/border.bin" - - .align 2 -PacifidlogTown_House2_MapBlockdata: @ 8428674 - .incbin "data/maps/PacifidlogTown_House2/map.bin" - - .align 2 -PacifidlogTown_House2_MapAttributes: @ 8428728 -PacifidlogTown_House4_MapAttributes: @ 8428728 - .4byte 0xa - .4byte 0x9 - .4byte PacifidlogTown_House2_MapBorder - .4byte PacifidlogTown_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -PetalburgCity_Gym_MapBorder: @ 8428740 - .incbin "data/maps/PetalburgCity_Gym/border.bin" - - .align 2 -PetalburgCity_Gym_MapBlockdata: @ 8428748 - .incbin "data/maps/PetalburgCity_Gym/map.bin" - - .align 2 -PetalburgCity_Gym_MapAttributes: @ 8428F28 - .4byte 0x9 - .4byte 0x70 - .4byte PetalburgCity_Gym_MapBorder - .4byte PetalburgCity_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PetalburgGym - - .align 2 -PetalburgCity_House2_MapBorder: @ 8428F40 - .incbin "data/maps/PetalburgCity_House2/border.bin" - - .align 2 -PetalburgCity_House2_MapBlockdata: @ 8428F48 - .incbin "data/maps/PetalburgCity_House2/map.bin" - - .align 2 -MossdeepCity_House4_MapAttributes: @ 8428FE8 -PetalburgCity_House2_MapAttributes: @ 8428FE8 -SlateportCity_House1_MapAttributes: @ 8428FE8 - .4byte 0xa - .4byte 0x8 - .4byte PetalburgCity_House2_MapBorder - .4byte PetalburgCity_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -SlateportCity_SternsShipyard_1F_MapBorder: @ 8429000 - .incbin "data/maps/SlateportCity_SternsShipyard_1F/border.bin" - - .align 2 -SlateportCity_SternsShipyard_1F_MapBlockdata: @ 8429008 - .incbin "data/maps/SlateportCity_SternsShipyard_1F/map.bin" - - .align 2 -SlateportCity_SternsShipyard_1F_MapAttributes: @ 8429280 - .4byte 0x15 - .4byte 0xf - .4byte SlateportCity_SternsShipyard_1F_MapBorder - .4byte SlateportCity_SternsShipyard_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -SlateportCity_SternsShipyard_2F_MapBorder: @ 8429298 - .incbin "data/maps/SlateportCity_SternsShipyard_2F/border.bin" - - .align 2 -SlateportCity_SternsShipyard_2F_MapBlockdata: @ 84292A0 - .incbin "data/maps/SlateportCity_SternsShipyard_2F/map.bin" - - .align 2 -SlateportCity_SternsShipyard_2F_MapAttributes: @ 84294A0 - .4byte 0x11 - .4byte 0xf - .4byte SlateportCity_SternsShipyard_2F_MapBorder - .4byte SlateportCity_SternsShipyard_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -UnknownMapBorder_084294C4: @ 84294B8 - .incbin "data/maps/UnknownMap_084294C4/border.bin" - - .align 2 -UnknownMapBlockdata_084294C4: @ 84294C0 - .incbin "data/maps/UnknownMap_084294C4/map.bin" - - .align 2 -UnknownMapAttributes_084294C4: @ 84294C4 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_084294C4 - .4byte UnknownMapBlockdata_084294C4 - .4byte gTileset_Building - .4byte gTileset_Contest - - .align 2 -UnknownMapBorder_084294E8: @ 84294DC - .incbin "data/maps/UnknownMap_084294E8/border.bin" - - .align 2 -UnknownMapBlockdata_084294E8: @ 84294E4 - .incbin "data/maps/UnknownMap_084294E8/map.bin" - - .align 2 -UnknownMapAttributes_084294E8: @ 84294E8 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_084294E8 - .4byte UnknownMapBlockdata_084294E8 - .4byte gTileset_Building - .4byte gTileset_Contest - - .align 2 -SlateportCity_PokemonFanClub_MapBorder: @ 8429500 - .incbin "data/maps/SlateportCity_PokemonFanClub/border.bin" - - .align 2 -SlateportCity_PokemonFanClub_MapBlockdata: @ 8429508 - .incbin "data/maps/SlateportCity_PokemonFanClub/map.bin" - - .align 2 -SlateportCity_PokemonFanClub_MapAttributes: @ 842963C - .4byte 0xe - .4byte 0xb - .4byte SlateportCity_PokemonFanClub_MapBorder - .4byte SlateportCity_PokemonFanClub_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonFanClub - - .align 2 -SlateportCity_OceanicMuseum_1F_MapBorder: @ 8429654 - .incbin "data/maps/SlateportCity_OceanicMuseum_1F/border.bin" - - .align 2 -SlateportCity_OceanicMuseum_1F_MapBlockdata: @ 842965C - .incbin "data/maps/SlateportCity_OceanicMuseum_1F/map.bin" - - .align 2 -SlateportCity_OceanicMuseum_1F_MapAttributes: @ 84297C4 - .4byte 0x14 - .4byte 0x9 - .4byte SlateportCity_OceanicMuseum_1F_MapBorder - .4byte SlateportCity_OceanicMuseum_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_OceanicMuseum - - .align 2 -SlateportCity_OceanicMuseum_2F_MapBorder: @ 84297DC - .incbin "data/maps/SlateportCity_OceanicMuseum_2F/border.bin" - - .align 2 -SlateportCity_OceanicMuseum_2F_MapBlockdata: @ 84297E4 - .incbin "data/maps/SlateportCity_OceanicMuseum_2F/map.bin" - - .align 2 -SlateportCity_OceanicMuseum_2F_MapAttributes: @ 842994C - .4byte 0x14 - .4byte 0x9 - .4byte SlateportCity_OceanicMuseum_2F_MapBorder - .4byte SlateportCity_OceanicMuseum_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_OceanicMuseum - - .align 2 -SlateportCity_Harbor_MapBorder: @ 8429964 - .incbin "data/maps/SlateportCity_Harbor/border.bin" - - .align 2 -SlateportCity_Harbor_MapBlockdata: @ 842996C - .incbin "data/maps/SlateportCity_Harbor/map.bin" - - .align 2 -LilycoveCity_Harbor_MapAttributes: @ 8429C3C -SlateportCity_Harbor_MapAttributes: @ 8429C3C - .4byte 0x18 - .4byte 0xf - .4byte SlateportCity_Harbor_MapBorder - .4byte SlateportCity_Harbor_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -MauvilleCity_Gym_MapBorder: @ 8429C54 - .incbin "data/maps/MauvilleCity_Gym/border.bin" - - .align 2 -MauvilleCity_Gym_MapBlockdata: @ 8429C5C - .incbin "data/maps/MauvilleCity_Gym/map.bin" - - .align 2 -MauvilleCity_Gym_MapAttributes: @ 8429E00 - .4byte 0xa - .4byte 0x15 - .4byte MauvilleCity_Gym_MapBorder - .4byte MauvilleCity_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MauvilleGym - - .align 2 -MauvilleCity_BikeShop_MapBorder: @ 8429E18 - .incbin "data/maps/MauvilleCity_BikeShop/border.bin" - - .align 2 -MauvilleCity_BikeShop_MapBlockdata: @ 8429E20 - .incbin "data/maps/MauvilleCity_BikeShop/map.bin" - - .align 2 -MauvilleCity_BikeShop_MapAttributes: @ 8429EF8 - .4byte 0xc - .4byte 0x9 - .4byte MauvilleCity_BikeShop_MapBorder - .4byte MauvilleCity_BikeShop_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BikeShop - - .align 2 -MauvilleCity_GameCorner_MapBorder: @ 8429F10 - .incbin "data/maps/MauvilleCity_GameCorner/border.bin" - - .align 2 -MauvilleCity_GameCorner_MapBlockdata: @ 8429F18 - .incbin "data/maps/MauvilleCity_GameCorner/map.bin" - - .align 2 -MauvilleCity_GameCorner_MapAttributes: @ 842A0FC - .4byte 0x16 - .4byte 0xb - .4byte MauvilleCity_GameCorner_MapBorder - .4byte MauvilleCity_GameCorner_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MauvilleGameCorner - - .align 2 -RustboroCity_DevonCorp_1F_MapBorder: @ 842A114 - .incbin "data/maps/RustboroCity_DevonCorp_1F/border.bin" - - .align 2 -RustboroCity_DevonCorp_1F_MapBlockdata: @ 842A11C - .incbin "data/maps/RustboroCity_DevonCorp_1F/map.bin" - - .align 2 -RustboroCity_DevonCorp_1F_MapAttributes: @ 842A274 - .4byte 0x13 - .4byte 0x9 - .4byte RustboroCity_DevonCorp_1F_MapBorder - .4byte RustboroCity_DevonCorp_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Facility - - .align 2 -RustboroCity_DevonCorp_2F_MapBorder: @ 842A28C - .incbin "data/maps/RustboroCity_DevonCorp_2F/border.bin" - - .align 2 -RustboroCity_DevonCorp_2F_MapBlockdata: @ 842A294 - .incbin "data/maps/RustboroCity_DevonCorp_2F/map.bin" - - .align 2 -RustboroCity_DevonCorp_2F_MapAttributes: @ 842A3EC - .4byte 0x13 - .4byte 0x9 - .4byte RustboroCity_DevonCorp_2F_MapBorder - .4byte RustboroCity_DevonCorp_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -RustboroCity_Gym_MapBorder: @ 842A404 - .incbin "data/maps/RustboroCity_Gym/border.bin" - - .align 2 -RustboroCity_Gym_MapBlockdata: @ 842A40C - .incbin "data/maps/RustboroCity_Gym/map.bin" - - .align 2 -RustboroCity_Gym_MapAttributes: @ 842A5C4 - .4byte 0xb - .4byte 0x14 - .4byte RustboroCity_Gym_MapBorder - .4byte RustboroCity_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_RustboroGym - - .align 2 -RustboroCity_PokemonSchool_MapBorder: @ 842A5DC - .incbin "data/maps/RustboroCity_PokemonSchool/border.bin" - - .align 2 -RustboroCity_PokemonSchool_MapBlockdata: @ 842A5E4 - .incbin "data/maps/RustboroCity_PokemonSchool/map.bin" - - .align 2 -RustboroCity_PokemonSchool_MapAttributes: @ 842A6EC - .4byte 0xc - .4byte 0xb - .4byte RustboroCity_PokemonSchool_MapBorder - .4byte RustboroCity_PokemonSchool_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonSchool - - .align 2 -RustboroCity_House2_MapBorder: @ 842A704 - .incbin "data/maps/RustboroCity_House2/border.bin" - - .align 2 -RustboroCity_House2_MapBlockdata: @ 842A70C - .incbin "data/maps/RustboroCity_House2/map.bin" - - .align 2 -RustboroCity_House2_MapAttributes: @ 842A7E4 -RustboroCity_House3_MapAttributes: @ 842A7E4 - .4byte 0xc - .4byte 0x9 - .4byte RustboroCity_House2_MapBorder - .4byte RustboroCity_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -RustboroCity_House1_MapBorder: @ 842A7FC - .incbin "data/maps/RustboroCity_House1/border.bin" - - .align 2 -RustboroCity_House1_MapBlockdata: @ 842A804 - .incbin "data/maps/RustboroCity_House1/map.bin" - - .align 2 -RustboroCity_House1_MapAttributes: @ 842A8D4 - .4byte 0xd - .4byte 0x8 - .4byte RustboroCity_House1_MapBorder - .4byte RustboroCity_House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -RustboroCity_CuttersHouse_MapBorder: @ 842A8EC - .incbin "data/maps/RustboroCity_CuttersHouse/border.bin" - - .align 2 -RustboroCity_CuttersHouse_MapBlockdata: @ 842A8F4 - .incbin "data/maps/RustboroCity_CuttersHouse/map.bin" - - .align 2 -RustboroCity_CuttersHouse_MapAttributes: @ 842A9BC - .4byte 0xb - .4byte 0x9 - .4byte RustboroCity_CuttersHouse_MapBorder - .4byte RustboroCity_CuttersHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -FortreeCity_House1_MapBorder: @ 842A9D4 - .incbin "data/maps/FortreeCity_House1/border.bin" - - .align 2 -FortreeCity_House1_MapBlockdata: @ 842A9DC - .incbin "data/maps/FortreeCity_House1/map.bin" - - .align 2 -FortreeCity_House1_MapAttributes: @ 842AA3C -FortreeCity_House3_MapAttributes: @ 842AA3C -FortreeCity_House5_MapAttributes: @ 842AA3C - .4byte 0x8 - .4byte 0x6 - .4byte FortreeCity_House1_MapBorder - .4byte FortreeCity_House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -FortreeCity_Gym_MapBorder: @ 842AA54 - .incbin "data/maps/FortreeCity_Gym/border.bin" - - .align 2 -FortreeCity_Gym_MapBlockdata: @ 842AA5C - .incbin "data/maps/FortreeCity_Gym/map.bin" - - .align 2 -FortreeCity_Gym_MapAttributes: @ 842AE44 - .4byte 0x14 - .4byte 0x19 - .4byte FortreeCity_Gym_MapBorder - .4byte FortreeCity_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_FortreeGym - - .align 2 -FortreeCity_House2_MapBorder: @ 842AE5C - .incbin "data/maps/FortreeCity_House2/border.bin" - - .align 2 -FortreeCity_House2_MapBlockdata: @ 842AE64 - .incbin "data/maps/FortreeCity_House2/map.bin" - - .align 2 -FortreeCity_House2_MapAttributes: @ 842AEC4 -FortreeCity_House4_MapAttributes: @ 842AEC4 - .4byte 0x8 - .4byte 0x6 - .4byte FortreeCity_House2_MapBorder - .4byte FortreeCity_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -Route104_MrBrineysHouse_MapBorder: @ 842AEDC - .incbin "data/maps/Route104_MrBrineysHouse/border.bin" - - .align 2 -Route104_MrBrineysHouse_MapBlockdata: @ 842AEE4 - .incbin "data/maps/Route104_MrBrineysHouse/map.bin" - - .align 2 -Route104_MrBrineysHouse_MapAttributes: @ 842AFBC - .4byte 0xc - .4byte 0x9 - .4byte Route104_MrBrineysHouse_MapBorder - .4byte Route104_MrBrineysHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -LilycoveCity_LilycoveMuseum_1F_MapBorder: @ 842AFD4 - .incbin "data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin" - - .align 2 -LilycoveCity_LilycoveMuseum_1F_MapBlockdata: @ 842AFDC - .incbin "data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin" - - .align 2 -LilycoveCity_LilycoveMuseum_1F_MapAttributes: @ 842B228 - .4byte 0x15 - .4byte 0xe - .4byte LilycoveCity_LilycoveMuseum_1F_MapBorder - .4byte LilycoveCity_LilycoveMuseum_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_LilycoveMuseum - - .align 2 -LilycoveCity_LilycoveMuseum_2F_MapBorder: @ 842B240 - .incbin "data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin" - - .align 2 -LilycoveCity_LilycoveMuseum_2F_MapBlockdata: @ 842B248 - .incbin "data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin" - - .align 2 -LilycoveCity_LilycoveMuseum_2F_MapAttributes: @ 842B484 - .4byte 0x16 - .4byte 0xd - .4byte LilycoveCity_LilycoveMuseum_2F_MapBorder - .4byte LilycoveCity_LilycoveMuseum_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_LilycoveMuseum - - .align 2 -LilycoveCity_ContestLobby_MapBorder: @ 842B49C - .incbin "data/maps/LilycoveCity_ContestLobby/border.bin" - - .align 2 -LilycoveCity_ContestLobby_MapBlockdata: @ 842B4A4 - .incbin "data/maps/LilycoveCity_ContestLobby/map.bin" - - .align 2 -LilycoveCity_ContestLobby_MapAttributes: @ 842B78C - .4byte 0x1f - .4byte 0xc - .4byte LilycoveCity_ContestLobby_MapBorder - .4byte LilycoveCity_ContestLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - - .align 2 -LilycoveCity_ContestHall_MapBorder: @ 842B7A4 - .incbin "data/maps/LilycoveCity_ContestHall/border.bin" - - .align 2 -LilycoveCity_ContestHall_MapBlockdata: @ 842B7AC - .incbin "data/maps/LilycoveCity_ContestHall/map.bin" - - .align 2 -LilycoveCity_ContestHall_MapAttributes: @ 842C4D4 - .4byte 0x33 - .4byte 0x21 - .4byte LilycoveCity_ContestHall_MapBorder - .4byte LilycoveCity_ContestHall_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - - .align 2 -LilycoveCity_PokemonTrainerFanClub_MapBorder: @ 842C4EC - .incbin "data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin" - - .align 2 -LilycoveCity_PokemonTrainerFanClub_MapBlockdata: @ 842C4F4 - .incbin "data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin" - - .align 2 -LilycoveCity_PokemonTrainerFanClub_MapAttributes: @ 842C644 - .4byte 0xc - .4byte 0xe - .4byte LilycoveCity_PokemonTrainerFanClub_MapBorder - .4byte LilycoveCity_PokemonTrainerFanClub_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -MossdeepCity_Gym_MapBorder: @ 842C65C - .incbin "data/maps/MossdeepCity_Gym/border.bin" - - .align 2 -MossdeepCity_Gym_MapBlockdata: @ 842C664 - .incbin "data/maps/MossdeepCity_Gym/map.bin" - - .align 2 -MossdeepCity_Gym_MapAttributes: @ 842CDB4 - .4byte 0x1a - .4byte 0x24 - .4byte MossdeepCity_Gym_MapBorder - .4byte MossdeepCity_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MossdeepGym - - .align 2 -SootopolisCity_Gym_1F_MapBorder: @ 842CDCC - .incbin "data/maps/SootopolisCity_Gym_1F/border.bin" - - .align 2 -SootopolisCity_Gym_1F_MapBlockdata: @ 842CDD4 - .incbin "data/maps/SootopolisCity_Gym_1F/map.bin" - - .align 2 -SootopolisCity_Gym_1F_MapAttributes: @ 842D148 - .4byte 0x11 - .4byte 0x1a - .4byte SootopolisCity_Gym_1F_MapBorder - .4byte SootopolisCity_Gym_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_SootopolisGym - - .align 2 -SootopolisCity_Gym_B1F_MapBorder: @ 842D160 - .incbin "data/maps/SootopolisCity_Gym_B1F/border.bin" - - .align 2 -SootopolisCity_Gym_B1F_MapBlockdata: @ 842D168 - .incbin "data/maps/SootopolisCity_Gym_B1F/map.bin" - - .align 2 -SootopolisCity_Gym_B1F_MapAttributes: @ 842D4DC - .4byte 0x11 - .4byte 0x1a - .4byte SootopolisCity_Gym_B1F_MapBorder - .4byte SootopolisCity_Gym_B1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_SootopolisGym - - .align 2 -EverGrandeCity_SidneysRoom_MapBorder: @ 842D4F4 - .incbin "data/maps/EverGrandeCity_SidneysRoom/border.bin" - - .align 2 -EverGrandeCity_SidneysRoom_MapBlockdata: @ 842D4FC - .incbin "data/maps/EverGrandeCity_SidneysRoom/map.bin" - - .align 2 -EverGrandeCity_SidneysRoom_MapAttributes: @ 842D668 - .4byte 0xd - .4byte 0xe - .4byte EverGrandeCity_SidneysRoom_MapBorder - .4byte EverGrandeCity_SidneysRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - - .align 2 -EverGrandeCity_PhoebesRoom_MapBorder: @ 842D680 - .incbin "data/maps/EverGrandeCity_PhoebesRoom/border.bin" - - .align 2 -EverGrandeCity_PhoebesRoom_MapBlockdata: @ 842D688 - .incbin "data/maps/EverGrandeCity_PhoebesRoom/map.bin" - - .align 2 -EverGrandeCity_PhoebesRoom_MapAttributes: @ 842D7F4 - .4byte 0xd - .4byte 0xe - .4byte EverGrandeCity_PhoebesRoom_MapBorder - .4byte EverGrandeCity_PhoebesRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - - .align 2 -EverGrandeCity_GlaciasRoom_MapBorder: @ 842D80C - .incbin "data/maps/EverGrandeCity_GlaciasRoom/border.bin" - - .align 2 -EverGrandeCity_GlaciasRoom_MapBlockdata: @ 842D814 - .incbin "data/maps/EverGrandeCity_GlaciasRoom/map.bin" - - .align 2 -EverGrandeCity_GlaciasRoom_MapAttributes: @ 842D980 - .4byte 0xd - .4byte 0xe - .4byte EverGrandeCity_GlaciasRoom_MapBorder - .4byte EverGrandeCity_GlaciasRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - - .align 2 -EverGrandeCity_DrakesRoom_MapBorder: @ 842D998 - .incbin "data/maps/EverGrandeCity_DrakesRoom/border.bin" - - .align 2 -EverGrandeCity_DrakesRoom_MapBlockdata: @ 842D9A0 - .incbin "data/maps/EverGrandeCity_DrakesRoom/map.bin" - - .align 2 -EverGrandeCity_DrakesRoom_MapAttributes: @ 842DB0C - .4byte 0xd - .4byte 0xe - .4byte EverGrandeCity_DrakesRoom_MapBorder - .4byte EverGrandeCity_DrakesRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - - .align 2 -EverGrandeCity_ChampionsRoom_MapBorder: @ 842DB24 - .incbin "data/maps/EverGrandeCity_ChampionsRoom/border.bin" - - .align 2 -EverGrandeCity_ChampionsRoom_MapBlockdata: @ 842DB2C - .incbin "data/maps/EverGrandeCity_ChampionsRoom/map.bin" - - .align 2 -EverGrandeCity_ChampionsRoom_MapAttributes: @ 842DC80 - .4byte 0xd - .4byte 0xd - .4byte EverGrandeCity_ChampionsRoom_MapBorder - .4byte EverGrandeCity_ChampionsRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - - .align 2 -EverGrandeCity_Hall1_MapBorder: @ 842DC98 - .incbin "data/maps/EverGrandeCity_Hall1/border.bin" - - .align 2 -EverGrandeCity_Hall1_MapBlockdata: @ 842DCA0 - .incbin "data/maps/EverGrandeCity_Hall1/map.bin" - - .align 2 -EverGrandeCity_Hall1_MapAttributes: @ 842DDC0 -EverGrandeCity_Hall2_MapAttributes: @ 842DDC0 -EverGrandeCity_Hall3_MapAttributes: @ 842DDC0 -EverGrandeCity_Hall5_MapAttributes: @ 842DDC0 - .4byte 0xb - .4byte 0xd - .4byte EverGrandeCity_Hall1_MapBorder - .4byte EverGrandeCity_Hall1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - - .align 2 -Route104_PrettyPetalFlowerShop_MapBorder: @ 842DDD8 - .incbin "data/maps/Route104_PrettyPetalFlowerShop/border.bin" - - .align 2 -Route104_PrettyPetalFlowerShop_MapBlockdata: @ 842DDE0 - .incbin "data/maps/Route104_PrettyPetalFlowerShop/map.bin" - - .align 2 -Route104_PrettyPetalFlowerShop_MapAttributes: @ 842DEF0 -Route104_PrototypePrettyPetalFlowerShop_MapAttributes: @ 842DEF0 - .4byte 0xf - .4byte 0x9 - .4byte Route104_PrettyPetalFlowerShop_MapBorder - .4byte Route104_PrettyPetalFlowerShop_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PrettyPetalFlowerShop - - .align 2 -Route112_CableCarStation_MapBorder: @ 842DF08 - .incbin "data/maps/Route112_CableCarStation/border.bin" - - .align 2 -Route112_CableCarStation_MapBlockdata: @ 842DF10 - .incbin "data/maps/Route112_CableCarStation/map.bin" - - .align 2 -MtChimney_CableCarStation_MapAttributes: @ 842E048 -Route112_CableCarStation_MapAttributes: @ 842E048 - .4byte 0xd - .4byte 0xc - .4byte Route112_CableCarStation_MapBorder - .4byte Route112_CableCarStation_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -Route114_FossilManiacsHouse_MapBorder: @ 842E060 - .incbin "data/maps/Route114_FossilManiacsHouse/border.bin" - - .align 2 -Route114_FossilManiacsHouse_MapBlockdata: @ 842E068 - .incbin "data/maps/Route114_FossilManiacsHouse/map.bin" - - .align 2 -Route114_FossilManiacsHouse_MapAttributes: @ 842E108 - .4byte 0xa - .4byte 0x8 - .4byte Route114_FossilManiacsHouse_MapBorder - .4byte Route114_FossilManiacsHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -Route114_FossilManiacsTunnel_MapBorder: @ 842E120 - .incbin "data/maps/Route114_FossilManiacsTunnel/border.bin" - - .align 2 -Route114_FossilManiacsTunnel_MapBlockdata: @ 842E128 - .incbin "data/maps/Route114_FossilManiacsTunnel/map.bin" - - .align 2 -Route114_FossilManiacsTunnel_MapAttributes: @ 842E3CC - .4byte 0xd - .4byte 0x1a - .4byte Route114_FossilManiacsTunnel_MapBorder - .4byte Route114_FossilManiacsTunnel_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - - .align 2 -Route114_LanettesHouse_MapBorder: @ 842E3E4 - .incbin "data/maps/Route114_LanettesHouse/border.bin" - - .align 2 -Route114_LanettesHouse_MapBlockdata: @ 842E3EC - .incbin "data/maps/Route114_LanettesHouse/map.bin" - - .align 2 -Route114_LanettesHouse_MapAttributes: @ 842E49C - .4byte 0xb - .4byte 0x8 - .4byte Route114_LanettesHouse_MapBorder - .4byte Route114_LanettesHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Lab - - .align 2 -Route116_TunnelersRestHouse_MapBorder: @ 842E4B4 - .incbin "data/maps/Route116_TunnelersRestHouse/border.bin" - - .align 2 -Route116_TunnelersRestHouse_MapBlockdata: @ 842E4BC - .incbin "data/maps/Route116_TunnelersRestHouse/map.bin" - - .align 2 -Route116_TunnelersRestHouse_MapAttributes: @ 842E570 - .4byte 0xa - .4byte 0x9 - .4byte Route116_TunnelersRestHouse_MapBorder - .4byte Route116_TunnelersRestHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -Route117_PokemonDayCare_MapBorder: @ 842E588 - .incbin "data/maps/Route117_PokemonDayCare/border.bin" - - .align 2 -Route117_PokemonDayCare_MapBlockdata: @ 842E590 - .incbin "data/maps/Route117_PokemonDayCare/map.bin" - - .align 2 -Route117_PokemonDayCare_MapAttributes: @ 842E668 - .4byte 0xc - .4byte 0x9 - .4byte Route117_PokemonDayCare_MapBorder - .4byte Route117_PokemonDayCare_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonDayCare - - .align 2 -Route121_SafariZoneEntrance_MapBorder: @ 842E680 - .incbin "data/maps/Route121_SafariZoneEntrance/border.bin" - - .align 2 -Route121_SafariZoneEntrance_MapBlockdata: @ 842E688 - .incbin "data/maps/Route121_SafariZoneEntrance/map.bin" - - .align 2 -Route121_SafariZoneEntrance_MapAttributes: @ 842E880 - .4byte 0x12 - .4byte 0xe - .4byte Route121_SafariZoneEntrance_MapBorder - .4byte Route121_SafariZoneEntrance_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - - .align 2 -MeteorFalls_1F_1R_MapBorder: @ 842E898 - .incbin "data/maps/MeteorFalls_1F_1R/border.bin" - - .align 2 -MeteorFalls_1F_1R_MapBlockdata: @ 842E8A0 - .incbin "data/maps/MeteorFalls_1F_1R/map.bin" - - .align 2 -MeteorFalls_1F_1R_MapAttributes: @ 842F278 - .4byte 0x1e - .4byte 0x2a - .4byte MeteorFalls_1F_1R_MapBorder - .4byte MeteorFalls_1F_1R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MeteorFalls - - .align 2 -MeteorFalls_1F_2R_MapBorder: @ 842F290 - .incbin "data/maps/MeteorFalls_1F_2R/border.bin" - - .align 2 -MeteorFalls_1F_2R_MapBlockdata: @ 842F298 - .incbin "data/maps/MeteorFalls_1F_2R/map.bin" - - .align 2 -MeteorFalls_1F_2R_MapAttributes: @ 842FA18 - .4byte 0x1e - .4byte 0x20 - .4byte MeteorFalls_1F_2R_MapBorder - .4byte MeteorFalls_1F_2R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MeteorFalls - - .align 2 -MeteorFalls_B1F_1R_MapBorder: @ 842FA30 - .incbin "data/maps/MeteorFalls_B1F_1R/border.bin" - - .align 2 -MeteorFalls_B1F_1R_MapBlockdata: @ 842FA38 - .incbin "data/maps/MeteorFalls_B1F_1R/map.bin" - - .align 2 -MeteorFalls_B1F_1R_MapAttributes: @ 84302D4 - .4byte 0x1d - .4byte 0x26 - .4byte MeteorFalls_B1F_1R_MapBorder - .4byte MeteorFalls_B1F_1R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MeteorFalls - - .align 2 -MeteorFalls_B1F_2R_MapBorder: @ 84302EC - .incbin "data/maps/MeteorFalls_B1F_2R/border.bin" - - .align 2 -MeteorFalls_B1F_2R_MapBlockdata: @ 84302F4 - .incbin "data/maps/MeteorFalls_B1F_2R/map.bin" - - .align 2 -MeteorFalls_B1F_2R_MapAttributes: @ 8430480 - .4byte 0xb - .4byte 0x12 - .4byte MeteorFalls_B1F_2R_MapBorder - .4byte MeteorFalls_B1F_2R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MeteorFalls - - .align 2 -RusturfTunnel_MapBorder: @ 8430498 - .incbin "data/maps/RusturfTunnel/border.bin" - - .align 2 -RusturfTunnel_MapBlockdata: @ 84304A0 - .incbin "data/maps/RusturfTunnel/map.bin" - - .align 2 -RusturfTunnel_MapAttributes: @ 8430B60 - .4byte 0x24 - .4byte 0x18 - .4byte RusturfTunnel_MapBorder - .4byte RusturfTunnel_MapBlockdata - .4byte gTileset_General - .4byte gTileset_RusturfTunnel - - .align 2 -Underwater_SootopolisCity_MapBorder: @ 8430B78 - .incbin "data/maps/Underwater_SootopolisCity/border.bin" - - .align 2 -Underwater_SootopolisCity_MapBlockdata: @ 8430B80 - .incbin "data/maps/Underwater_SootopolisCity/map.bin" - - .align 2 -Underwater_SootopolisCity_MapAttributes: @ 8430D10 - .4byte 0x14 - .4byte 0xa - .4byte Underwater_SootopolisCity_MapBorder - .4byte Underwater_SootopolisCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - - .align 2 -DesertRuins_MapBorder: @ 8430D28 - .incbin "data/maps/DesertRuins/border.bin" - - .align 2 -DesertRuins_MapBlockdata: @ 8430D30 - .incbin "data/maps/DesertRuins/map.bin" - - .align 2 -DesertRuins_MapAttributes: @ 8431194 - .4byte 0x11 - .4byte 0x21 - .4byte DesertRuins_MapBorder - .4byte DesertRuins_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -GraniteCave_1F_MapBorder: @ 84311AC - .incbin "data/maps/GraniteCave_1F/border.bin" - - .align 2 -GraniteCave_1F_MapBlockdata: @ 84311B4 - .incbin "data/maps/GraniteCave_1F/map.bin" - - .align 2 -GraniteCave_1F_MapAttributes: @ 84316A0 - .4byte 0x2a - .4byte 0xf - .4byte GraniteCave_1F_MapBorder - .4byte GraniteCave_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -GraniteCave_B1F_MapBorder: @ 84316B8 - .incbin "data/maps/GraniteCave_B1F/border.bin" - - .align 2 -GraniteCave_B1F_MapBlockdata: @ 84316C0 - .incbin "data/maps/GraniteCave_B1F/map.bin" - - .align 2 -GraniteCave_B1F_MapAttributes: @ 8431D40 - .4byte 0x20 - .4byte 0x1a - .4byte GraniteCave_B1F_MapBorder - .4byte GraniteCave_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -GraniteCave_B2F_MapBorder: @ 8431D58 - .incbin "data/maps/GraniteCave_B2F/border.bin" - - .align 2 -GraniteCave_B2F_MapBlockdata: @ 8431D60 - .incbin "data/maps/GraniteCave_B2F/map.bin" - - .align 2 -GraniteCave_B2F_MapAttributes: @ 84323E0 - .4byte 0x20 - .4byte 0x1a - .4byte GraniteCave_B2F_MapBorder - .4byte GraniteCave_B2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -PetalburgWoods_MapBorder: @ 84323F8 - .incbin "data/maps/PetalburgWoods/border.bin" - - .align 2 -PetalburgWoods_MapBlockdata: @ 8432400 - .incbin "data/maps/PetalburgWoods/map.bin" - - .align 2 -PetalburgWoods_MapAttributes: @ 8433480 - .4byte 0x30 - .4byte 0x2c - .4byte PetalburgWoods_MapBorder - .4byte PetalburgWoods_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - - .align 2 -MtChimney_MapBorder: @ 8433498 - .incbin "data/maps/MtChimney/border.bin" - - .align 2 -MtChimney_MapBlockdata: @ 84334A0 - .incbin "data/maps/MtChimney/map.bin" - - .align 2 -MtChimney_MapAttributes: @ 8434350 - .4byte 0x28 - .4byte 0x2f - .4byte MtChimney_MapBorder - .4byte MtChimney_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - - .align 2 -MtPyre_1F_MapBorder: @ 8434368 - .incbin "data/maps/MtPyre_1F/border.bin" - - .align 2 -MtPyre_1F_MapBlockdata: @ 8434370 - .incbin "data/maps/MtPyre_1F/map.bin" - - .align 2 -MtPyre_1F_MapAttributes: @ 84346B4 - .4byte 0x16 - .4byte 0x13 - .4byte MtPyre_1F_MapBorder - .4byte MtPyre_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -MtPyre_2F_MapBorder: @ 84346CC - .incbin "data/maps/MtPyre_2F/border.bin" - - .align 2 -MtPyre_2F_MapBlockdata: @ 84346D4 - .incbin "data/maps/MtPyre_2F/map.bin" - - .align 2 -MtPyre_2F_MapAttributes: @ 8434828 - .4byte 0xd - .4byte 0xd - .4byte MtPyre_2F_MapBorder - .4byte MtPyre_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -MtPyre_3F_MapBorder: @ 8434840 - .incbin "data/maps/MtPyre_3F/border.bin" - - .align 2 -MtPyre_3F_MapBlockdata: @ 8434848 - .incbin "data/maps/MtPyre_3F/map.bin" - - .align 2 -MtPyre_3F_MapAttributes: @ 843499C - .4byte 0xd - .4byte 0xd - .4byte MtPyre_3F_MapBorder - .4byte MtPyre_3F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -MtPyre_4F_MapBorder: @ 84349B4 - .incbin "data/maps/MtPyre_4F/border.bin" - - .align 2 -MtPyre_4F_MapBlockdata: @ 84349BC - .incbin "data/maps/MtPyre_4F/map.bin" - - .align 2 -MtPyre_4F_MapAttributes: @ 8434B10 - .4byte 0xd - .4byte 0xd - .4byte MtPyre_4F_MapBorder - .4byte MtPyre_4F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -MtPyre_5F_MapBorder: @ 8434B28 - .incbin "data/maps/MtPyre_5F/border.bin" - - .align 2 -MtPyre_5F_MapBlockdata: @ 8434B30 - .incbin "data/maps/MtPyre_5F/map.bin" - - .align 2 -MtPyre_5F_MapAttributes: @ 8434C84 - .4byte 0xd - .4byte 0xd - .4byte MtPyre_5F_MapBorder - .4byte MtPyre_5F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -MtPyre_6F_MapBorder: @ 8434C9C - .incbin "data/maps/MtPyre_6F/border.bin" - - .align 2 -MtPyre_6F_MapBlockdata: @ 8434CA4 - .incbin "data/maps/MtPyre_6F/map.bin" - - .align 2 -MtPyre_6F_MapAttributes: @ 8434DF8 - .4byte 0xd - .4byte 0xd - .4byte MtPyre_6F_MapBorder - .4byte MtPyre_6F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -AquaHideout_1F_MapBorder: @ 8434E10 - .incbin "data/maps/AquaHideout_1F/border.bin" - - .align 2 -AquaHideout_1F_MapBlockdata: @ 8434E18 - .incbin "data/maps/AquaHideout_1F/map.bin" - - .align 2 -AquaHideout_1F_MapAttributes: @ 84354A8 - .4byte 0x1c - .4byte 0x1e - .4byte AquaHideout_1F_MapBorder - .4byte AquaHideout_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -AquaHideout_B1F_MapBorder: @ 84354C0 - .incbin "data/maps/AquaHideout_B1F/border.bin" - - .align 2 -AquaHideout_B1F_MapBlockdata: @ 84354C8 - .incbin "data/maps/AquaHideout_B1F/map.bin" - - .align 2 -AquaHideout_B1F_MapAttributes: @ 8435E58 - .4byte 0x33 - .4byte 0x18 - .4byte AquaHideout_B1F_MapBorder - .4byte AquaHideout_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -AquaHideout_B2F_MapBorder: @ 8435E70 - .incbin "data/maps/AquaHideout_B2F/border.bin" - - .align 2 -AquaHideout_B2F_MapBlockdata: @ 8435E78 - .incbin "data/maps/AquaHideout_B2F/map.bin" - - .align 2 -AquaHideout_B2F_MapAttributes: @ 84364D8 - .4byte 0x22 - .4byte 0x18 - .4byte AquaHideout_B2F_MapBorder - .4byte AquaHideout_B2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -Underwater_SeafloorCavern_MapBorder: @ 84364F0 - .incbin "data/maps/Underwater_SeafloorCavern/border.bin" - - .align 2 -Underwater_SeafloorCavern_MapBlockdata: @ 84364F8 - .incbin "data/maps/Underwater_SeafloorCavern/map.bin" - - .align 2 -Underwater_SeafloorCavern_MapAttributes: @ 84365F4 - .4byte 0xe - .4byte 0x9 - .4byte Underwater_SeafloorCavern_MapBorder - .4byte Underwater_SeafloorCavern_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - - .align 2 -SeafloorCavern_Entrance_MapBorder: @ 843660C - .incbin "data/maps/SeafloorCavern_Entrance/border.bin" - - .align 2 -SeafloorCavern_Entrance_MapBlockdata: @ 8436614 - .incbin "data/maps/SeafloorCavern_Entrance/map.bin" - - .align 2 -SeafloorCavern_Entrance_MapAttributes: @ 8436934 - .4byte 0x14 - .4byte 0x14 - .4byte SeafloorCavern_Entrance_MapBorder - .4byte SeafloorCavern_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -SeafloorCavern_Room1_MapBorder: @ 843694C - .incbin "data/maps/SeafloorCavern_Room1/border.bin" - - .align 2 -SeafloorCavern_Room1_MapBlockdata: @ 8436954 - .incbin "data/maps/SeafloorCavern_Room1/map.bin" - - .align 2 -SeafloorCavern_Room1_MapAttributes: @ 8436C9C - .4byte 0x14 - .4byte 0x15 - .4byte SeafloorCavern_Room1_MapBorder - .4byte SeafloorCavern_Room1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -SeafloorCavern_Room2_MapBorder: @ 8436CB4 - .incbin "data/maps/SeafloorCavern_Room2/border.bin" - - .align 2 -SeafloorCavern_Room2_MapBlockdata: @ 8436CBC - .incbin "data/maps/SeafloorCavern_Room2/map.bin" - - .align 2 -SeafloorCavern_Room2_MapAttributes: @ 8436E6C - .4byte 0x12 - .4byte 0xc - .4byte SeafloorCavern_Room2_MapBorder - .4byte SeafloorCavern_Room2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -SeafloorCavern_Room3_MapBorder: @ 8436E84 - .incbin "data/maps/SeafloorCavern_Room3/border.bin" - - .align 2 -SeafloorCavern_Room3_MapBlockdata: @ 8436E8C - .incbin "data/maps/SeafloorCavern_Room3/map.bin" - - .align 2 -SeafloorCavern_Room3_MapAttributes: @ 84370AC - .4byte 0x10 - .4byte 0x11 - .4byte SeafloorCavern_Room3_MapBorder - .4byte SeafloorCavern_Room3_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -SeafloorCavern_Room4_MapBorder: @ 84370C4 - .incbin "data/maps/SeafloorCavern_Room4/border.bin" - - .align 2 -SeafloorCavern_Room4_MapBlockdata: @ 84370CC - .incbin "data/maps/SeafloorCavern_Room4/map.bin" - - .align 2 -SeafloorCavern_Room4_MapAttributes: @ 8437378 - .4byte 0x12 - .4byte 0x13 - .4byte SeafloorCavern_Room4_MapBorder - .4byte SeafloorCavern_Room4_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -SeafloorCavern_Room5_MapBorder: @ 8437390 - .incbin "data/maps/SeafloorCavern_Room5/border.bin" - - .align 2 -SeafloorCavern_Room5_MapBlockdata: @ 8437398 - .incbin "data/maps/SeafloorCavern_Room5/map.bin" - - .align 2 -SeafloorCavern_Room5_MapAttributes: @ 84376B8 - .4byte 0x14 - .4byte 0x14 - .4byte SeafloorCavern_Room5_MapBorder - .4byte SeafloorCavern_Room5_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -SeafloorCavern_Room6_MapBorder: @ 84376D0 - .incbin "data/maps/SeafloorCavern_Room6/border.bin" - - .align 2 -SeafloorCavern_Room6_MapBlockdata: @ 84376D8 - .incbin "data/maps/SeafloorCavern_Room6/map.bin" - - .align 2 -SeafloorCavern_Room6_MapAttributes: @ 8437B28 - .4byte 0x18 - .4byte 0x17 - .4byte SeafloorCavern_Room6_MapBorder - .4byte SeafloorCavern_Room6_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -SeafloorCavern_Room7_MapBorder: @ 8437B40 - .incbin "data/maps/SeafloorCavern_Room7/border.bin" - - .align 2 -SeafloorCavern_Room7_MapBlockdata: @ 8437B48 - .incbin "data/maps/SeafloorCavern_Room7/map.bin" - - .align 2 -SeafloorCavern_Room7_MapAttributes: @ 8437FC8 - .4byte 0x17 - .4byte 0x19 - .4byte SeafloorCavern_Room7_MapBorder - .4byte SeafloorCavern_Room7_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -SeafloorCavern_Room8_MapBorder: @ 8437FE0 - .incbin "data/maps/SeafloorCavern_Room8/border.bin" - - .align 2 -SeafloorCavern_Room8_MapBlockdata: @ 8437FE8 - .incbin "data/maps/SeafloorCavern_Room8/map.bin" - - .align 2 -SeafloorCavern_Room8_MapAttributes: @ 843811C - .4byte 0xb - .4byte 0xe - .4byte SeafloorCavern_Room8_MapBorder - .4byte SeafloorCavern_Room8_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -SeafloorCavern_Room9_MapBorder: @ 8438134 - .incbin "data/maps/SeafloorCavern_Room9/border.bin" - - .align 2 -SeafloorCavern_Room9_MapBlockdata: @ 843813C - .incbin "data/maps/SeafloorCavern_Room9/map.bin" - - .align 2 -SeafloorCavern_Room9_MapAttributes: @ 8438AF0 - .4byte 0x1b - .4byte 0x2e - .4byte SeafloorCavern_Room9_MapBorder - .4byte SeafloorCavern_Room9_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -CaveOfOrigin_Entrance_MapBorder: @ 8438B08 - .incbin "data/maps/CaveOfOrigin_Entrance/border.bin" - - .align 2 -CaveOfOrigin_Entrance_MapBlockdata: @ 8438B10 - .incbin "data/maps/CaveOfOrigin_Entrance/map.bin" - - .align 2 -CaveOfOrigin_Entrance_MapAttributes: @ 8438EEC - .4byte 0x13 - .4byte 0x1a - .4byte CaveOfOrigin_Entrance_MapBorder - .4byte CaveOfOrigin_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -CaveOfOrigin_1F_MapBorder: @ 8438F04 - .incbin "data/maps/CaveOfOrigin_1F/border.bin" - - .align 2 -CaveOfOrigin_1F_MapBlockdata: @ 8438F0C - .incbin "data/maps/CaveOfOrigin_1F/map.bin" - - .align 2 -CaveOfOrigin_1F_MapAttributes: @ 8439330 - .4byte 0x17 - .4byte 0x17 - .4byte CaveOfOrigin_1F_MapBorder - .4byte CaveOfOrigin_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -CaveOfOrigin_UnusedRubySapphireMap1_MapBorder: @ 8439348 - .incbin "data/maps/CaveOfOrigin_UnusedRubySapphireMap1/border.bin" - - .align 2 -CaveOfOrigin_UnusedRubySapphireMap1_MapBlockdata: @ 8439350 - .incbin "data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.bin" - - .align 2 -CaveOfOrigin_UnusedRubySapphireMap1_MapAttributes: @ 8439774 - .4byte 0x17 - .4byte 0x17 - .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapBorder - .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -CaveOfOrigin_UnusedRubySapphireMap2_MapBorder: @ 843978C - .incbin "data/maps/CaveOfOrigin_UnusedRubySapphireMap2/border.bin" - - .align 2 -CaveOfOrigin_UnusedRubySapphireMap2_MapBlockdata: @ 8439794 - .incbin "data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.bin" - - .align 2 -CaveOfOrigin_UnusedRubySapphireMap2_MapAttributes: @ 8439B08 - .4byte 0x15 - .4byte 0x15 - .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapBorder - .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -CaveOfOrigin_UnusedRubySapphireMap3_MapBorder: @ 8439B20 - .incbin "data/maps/CaveOfOrigin_UnusedRubySapphireMap3/border.bin" - - .align 2 -CaveOfOrigin_UnusedRubySapphireMap3_MapBlockdata: @ 8439B28 - .incbin "data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.bin" - - .align 2 -CaveOfOrigin_UnusedRubySapphireMap3_MapAttributes: @ 8439E48 - .4byte 0x13 - .4byte 0x15 - .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapBorder - .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -CaveOfOrigin_B1F_MapBorder: @ 8439E60 - .incbin "data/maps/CaveOfOrigin_B1F/border.bin" - - .align 2 -CaveOfOrigin_B1F_MapBlockdata: @ 8439E68 - .incbin "data/maps/CaveOfOrigin_B1F/map.bin" - - .align 2 -CaveOfOrigin_B1F_MapAttributes: @ 843A13C - .4byte 0x13 - .4byte 0x13 - .4byte CaveOfOrigin_B1F_MapBorder - .4byte CaveOfOrigin_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -VictoryRoad_1F_MapBorder: @ 843A154 - .incbin "data/maps/VictoryRoad_1F/border.bin" - - .align 2 -VictoryRoad_1F_MapBlockdata: @ 843A15C - .incbin "data/maps/VictoryRoad_1F/map.bin" - - .align 2 -VictoryRoad_1F_MapAttributes: @ 843B188 - .4byte 0x2e - .4byte 0x2d - .4byte VictoryRoad_1F_MapBorder - .4byte VictoryRoad_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -ShoalCave_LowTideEntranceRoom_MapBorder: @ 843B1A0 - .incbin "data/maps/ShoalCave_LowTideEntranceRoom/border.bin" - - .align 2 -ShoalCave_LowTideEntranceRoom_MapBlockdata: @ 843B1A8 - .incbin "data/maps/ShoalCave_LowTideEntranceRoom/map.bin" - - .align 2 -ShoalCave_LowTideEntranceRoom_MapAttributes: @ 843BB3C - .4byte 0x23 - .4byte 0x23 - .4byte ShoalCave_LowTideEntranceRoom_MapBorder - .4byte ShoalCave_LowTideEntranceRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -ShoalCave_LowTideInnerRoom_MapBorder: @ 843BB54 - .incbin "data/maps/ShoalCave_LowTideInnerRoom/border.bin" - - .align 2 -ShoalCave_LowTideInnerRoom_MapBlockdata: @ 843BB5C - .incbin "data/maps/ShoalCave_LowTideInnerRoom/map.bin" - - .align 2 -ShoalCave_LowTideInnerRoom_MapAttributes: @ 843C904 - .4byte 0x2e - .4byte 0x26 - .4byte ShoalCave_LowTideInnerRoom_MapBorder - .4byte ShoalCave_LowTideInnerRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -ShoalCave_LowTideStairsRoom_MapBorder: @ 843C91C - .incbin "data/maps/ShoalCave_LowTideStairsRoom/border.bin" - - .align 2 -ShoalCave_LowTideStairsRoom_MapBlockdata: @ 843C924 - .incbin "data/maps/ShoalCave_LowTideStairsRoom/map.bin" - - .align 2 -ShoalCave_LowTideStairsRoom_MapAttributes: @ 843CB9C - .4byte 0x15 - .4byte 0xf - .4byte ShoalCave_LowTideStairsRoom_MapBorder - .4byte ShoalCave_LowTideStairsRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -ShoalCave_LowTideLowerRoom_MapBorder: @ 843CBB4 - .incbin "data/maps/ShoalCave_LowTideLowerRoom/border.bin" - - .align 2 -ShoalCave_LowTideLowerRoom_MapBlockdata: @ 843CBBC - .incbin "data/maps/ShoalCave_LowTideLowerRoom/map.bin" - - .align 2 -ShoalCave_LowTideLowerRoom_MapAttributes: @ 843CF20 - .4byte 0x1f - .4byte 0xe - .4byte ShoalCave_LowTideLowerRoom_MapBorder - .4byte ShoalCave_LowTideLowerRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -ShoalCave_HighTideEntranceRoom_MapBorder: @ 843CF38 - .incbin "data/maps/ShoalCave_HighTideEntranceRoom/border.bin" - - .align 2 -ShoalCave_HighTideEntranceRoom_MapBlockdata: @ 843CF40 - .incbin "data/maps/ShoalCave_HighTideEntranceRoom/map.bin" - - .align 2 -ShoalCave_HighTideEntranceRoom_MapAttributes: @ 843D8D4 - .4byte 0x23 - .4byte 0x23 - .4byte ShoalCave_HighTideEntranceRoom_MapBorder - .4byte ShoalCave_HighTideEntranceRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -ShoalCave_HighTideInnerRoom_MapBorder: @ 843D8EC - .incbin "data/maps/ShoalCave_HighTideInnerRoom/border.bin" - - .align 2 -ShoalCave_HighTideInnerRoom_MapBlockdata: @ 843D8F4 - .incbin "data/maps/ShoalCave_HighTideInnerRoom/map.bin" - - .align 2 -ShoalCave_HighTideInnerRoom_MapAttributes: @ 843E69C - .4byte 0x2e - .4byte 0x26 - .4byte ShoalCave_HighTideInnerRoom_MapBorder - .4byte ShoalCave_HighTideInnerRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -UnknownMapBorder_0843E6C0: @ 843E6B4 - .incbin "data/maps/UnknownMap_0843E6C0/border.bin" - - .align 2 -UnknownMapBlockdata_0843E6C0: @ 843E6BC - .incbin "data/maps/UnknownMap_0843E6C0/map.bin" - - .align 2 -UnknownMapAttributes_0843E6C0: @ 843E6C0 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_0843E6C0 - .4byte UnknownMapBlockdata_0843E6C0 - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -UnknownMapBorder_0843E6E4: @ 843E6D8 - .incbin "data/maps/UnknownMap_0843E6E4/border.bin" - - .align 2 -UnknownMapBlockdata_0843E6E4: @ 843E6E0 - .incbin "data/maps/UnknownMap_0843E6E4/map.bin" - - .align 2 -UnknownMapAttributes_0843E6E4: @ 843E6E4 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_0843E6E4 - .4byte UnknownMapBlockdata_0843E6E4 - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -UnknownMapBorder_0843E708: @ 843E6FC - .incbin "data/maps/UnknownMap_0843E708/border.bin" - - .align 2 -UnknownMapBlockdata_0843E708: @ 843E704 - .incbin "data/maps/UnknownMap_0843E708/map.bin" - - .align 2 -UnknownMapAttributes_0843E708: @ 843E708 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_0843E708 - .4byte UnknownMapBlockdata_0843E708 - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -UnknownMapBorder_0843E72C: @ 843E720 - .incbin "data/maps/UnknownMap_0843E72C/border.bin" - - .align 2 -UnknownMapBlockdata_0843E72C: @ 843E728 - .incbin "data/maps/UnknownMap_0843E72C/map.bin" - - .align 2 -UnknownMapAttributes_0843E72C: @ 843E72C - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_0843E72C - .4byte UnknownMapBlockdata_0843E72C - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -UnknownMapBorder_0843E750: @ 843E744 - .incbin "data/maps/UnknownMap_0843E750/border.bin" - - .align 2 -UnknownMapBlockdata_0843E750: @ 843E74C - .incbin "data/maps/UnknownMap_0843E750/map.bin" - - .align 2 -UnknownMapAttributes_0843E750: @ 843E750 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_0843E750 - .4byte UnknownMapBlockdata_0843E750 - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -UnknownMapBorder_0843E774: @ 843E768 - .incbin "data/maps/UnknownMap_0843E774/border.bin" - - .align 2 -UnknownMapBlockdata_0843E774: @ 843E770 - .incbin "data/maps/UnknownMap_0843E774/map.bin" - - .align 2 -UnknownMapAttributes_0843E774: @ 843E774 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_0843E774 - .4byte UnknownMapBlockdata_0843E774 - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -UnknownMapBorder_0843E798: @ 843E78C - .incbin "data/maps/UnknownMap_0843E798/border.bin" - - .align 2 -UnknownMapBlockdata_0843E798: @ 843E794 - .incbin "data/maps/UnknownMap_0843E798/map.bin" - - .align 2 -UnknownMapAttributes_0843E798: @ 843E798 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_0843E798 - .4byte UnknownMapBlockdata_0843E798 - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -UnknownMapBorder_0843E7BC: @ 843E7B0 - .incbin "data/maps/UnknownMap_0843E7BC/border.bin" - - .align 2 -UnknownMapBlockdata_0843E7BC: @ 843E7B8 - .incbin "data/maps/UnknownMap_0843E7BC/map.bin" - - .align 2 -UnknownMapAttributes_0843E7BC: @ 843E7BC - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_0843E7BC - .4byte UnknownMapBlockdata_0843E7BC - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -UnknownMapBorder_0843E7E0: @ 843E7D4 - .incbin "data/maps/UnknownMap_0843E7E0/border.bin" - - .align 2 -UnknownMapBlockdata_0843E7E0: @ 843E7DC - .incbin "data/maps/UnknownMap_0843E7E0/map.bin" - - .align 2 -UnknownMapAttributes_0843E7E0: @ 843E7E0 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_0843E7E0 - .4byte UnknownMapBlockdata_0843E7E0 - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -UnknownMapBorder_0843E804: @ 843E7F8 - .incbin "data/maps/UnknownMap_0843E804/border.bin" - - .align 2 -UnknownMapBlockdata_0843E804: @ 843E800 - .incbin "data/maps/UnknownMap_0843E804/map.bin" - - .align 2 -UnknownMapAttributes_0843E804: @ 843E804 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_0843E804 - .4byte UnknownMapBlockdata_0843E804 - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -UnknownMapBorder_0843E828: @ 843E81C - .incbin "data/maps/UnknownMap_0843E828/border.bin" - - .align 2 -UnknownMapBlockdata_0843E828: @ 843E824 - .incbin "data/maps/UnknownMap_0843E828/map.bin" - - .align 2 -UnknownMapAttributes_0843E828: @ 843E828 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_0843E828 - .4byte UnknownMapBlockdata_0843E828 - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -UnknownMapBorder_0843E84C: @ 843E840 - .incbin "data/maps/UnknownMap_0843E84C/border.bin" - - .align 2 -UnknownMapBlockdata_0843E84C: @ 843E848 - .incbin "data/maps/UnknownMap_0843E84C/map.bin" - - .align 2 -UnknownMapAttributes_0843E84C: @ 843E84C - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_0843E84C - .4byte UnknownMapBlockdata_0843E84C - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -UnknownMapBorder_0843E870: @ 843E864 - .incbin "data/maps/UnknownMap_0843E870/border.bin" - - .align 2 -UnknownMapBlockdata_0843E870: @ 843E86C - .incbin "data/maps/UnknownMap_0843E870/map.bin" - - .align 2 -UnknownMapAttributes_0843E870: @ 843E870 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_0843E870 - .4byte UnknownMapBlockdata_0843E870 - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_0843E894: @ 843E888 - .incbin "data/maps/UnknownMap_0843E894/border.bin" - -UnknownMapBlockdata_0843E894: @ 843E890 - .incbin "data/maps/UnknownMap_0843E894/map.bin" - - .align 2 -UnknownMapAttributes_0843E894: @ 843E894 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_0843E894 - .4byte UnknownMapBlockdata_0843E894 - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -NewMauville_Entrance_MapBorder: @ 843E8AC - .incbin "data/maps/NewMauville_Entrance/border.bin" - - .align 2 -NewMauville_Entrance_MapBlockdata: @ 843E8B4 - .incbin "data/maps/NewMauville_Entrance/map.bin" - - .align 2 -NewMauville_Entrance_MapAttributes: @ 843E958 - .4byte 0x9 - .4byte 0x9 - .4byte NewMauville_Entrance_MapBorder - .4byte NewMauville_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -NewMauville_Inside_MapBorder: @ 843E970 - .incbin "data/maps/NewMauville_Inside/border.bin" - - .align 2 -NewMauville_Inside_MapBlockdata: @ 843E978 - .incbin "data/maps/NewMauville_Inside/map.bin" - - .align 2 -NewMauville_Inside_MapAttributes: @ 843F69C - .4byte 0x29 - .4byte 0x29 - .4byte NewMauville_Inside_MapBorder - .4byte NewMauville_Inside_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BikeShop - - .align 2 -AbandonedShip_Deck_MapBorder: @ 843F6B4 - .incbin "data/maps/AbandonedShip_Deck/border.bin" - - .align 2 -AbandonedShip_Deck_MapBlockdata: @ 843F6BC - .incbin "data/maps/AbandonedShip_Deck/map.bin" - - .align 2 -AbandonedShip_Deck_MapAttributes: @ 843FA84 - .4byte 0x17 - .4byte 0x15 - .4byte AbandonedShip_Deck_MapBorder - .4byte AbandonedShip_Deck_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -AbandonedShip_Corridors_1F_MapBorder: @ 843FA9C - .incbin "data/maps/AbandonedShip_Corridors_1F/border.bin" - - .align 2 -AbandonedShip_Corridors_1F_MapBlockdata: @ 843FAA4 - .incbin "data/maps/AbandonedShip_Corridors_1F/map.bin" - - .align 2 -AbandonedShip_Corridors_1F_MapAttributes: @ 843FC54 - .4byte 0x12 - .4byte 0xc - .4byte AbandonedShip_Corridors_1F_MapBorder - .4byte AbandonedShip_Corridors_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - - .align 2 -AbandonedShip_Rooms_1F_MapBorder: @ 843FC6C - .incbin "data/maps/AbandonedShip_Rooms_1F/border.bin" - - .align 2 -AbandonedShip_Rooms_1F_MapBlockdata: @ 843FC74 - .incbin "data/maps/AbandonedShip_Rooms_1F/map.bin" - - .align 2 -AbandonedShip_Rooms_1F_MapAttributes: @ 843FED8 - .4byte 0x12 - .4byte 0x11 - .4byte AbandonedShip_Rooms_1F_MapBorder - .4byte AbandonedShip_Rooms_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - - .align 2 -AbandonedShip_Corridors_B1F_MapBorder: @ 843FEF0 - .incbin "data/maps/AbandonedShip_Corridors_B1F/border.bin" - - .align 2 -AbandonedShip_Corridors_B1F_MapBlockdata: @ 843FEF8 - .incbin "data/maps/AbandonedShip_Corridors_B1F/map.bin" - - .align 2 -AbandonedShip_Corridors_B1F_MapAttributes: @ 843FFFC - .4byte 0xd - .4byte 0xa - .4byte AbandonedShip_Corridors_B1F_MapBorder - .4byte AbandonedShip_Corridors_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - - .align 2 -AbandonedShip_Rooms_B1F_MapBorder: @ 8440014 - .incbin "data/maps/AbandonedShip_Rooms_B1F/border.bin" - - .align 2 -AbandonedShip_Rooms_B1F_MapBlockdata: @ 844001C - .incbin "data/maps/AbandonedShip_Rooms_B1F/map.bin" - - .align 2 -AbandonedShip_Rooms_B1F_MapAttributes: @ 84401CC - .4byte 0x1b - .4byte 0x8 - .4byte AbandonedShip_Rooms_B1F_MapBorder - .4byte AbandonedShip_Rooms_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - - .align 2 -AbandonedShip_Rooms2_B1F_MapBorder: @ 84401E4 - .incbin "data/maps/AbandonedShip_Rooms2_B1F/border.bin" - - .align 2 -AbandonedShip_Rooms2_B1F_MapBlockdata: @ 84401EC - .incbin "data/maps/AbandonedShip_Rooms2_B1F/map.bin" - - .align 2 -AbandonedShip_Rooms2_B1F_MapAttributes: @ 844030C - .4byte 0x12 - .4byte 0x8 - .4byte AbandonedShip_Rooms2_B1F_MapBorder - .4byte AbandonedShip_Rooms2_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - - .align 2 -AbandonedShip_Underwater1_MapBorder: @ 8440324 - .incbin "data/maps/AbandonedShip_Underwater1/border.bin" - - .align 2 -AbandonedShip_Underwater1_MapBlockdata: @ 844032C - .incbin "data/maps/AbandonedShip_Underwater1/map.bin" - - .align 2 -AbandonedShip_Underwater1_MapAttributes: @ 84403AC - .4byte 0x8 - .4byte 0x8 - .4byte AbandonedShip_Underwater1_MapBorder - .4byte AbandonedShip_Underwater1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - - .align 2 -AbandonedShip_Room_B1F_MapBorder: @ 84403C4 - .incbin "data/maps/AbandonedShip_Room_B1F/border.bin" - - .align 2 -AbandonedShip_Room_B1F_MapBlockdata: @ 84403CC - .incbin "data/maps/AbandonedShip_Room_B1F/map.bin" - - .align 2 -AbandonedShip_Room_B1F_MapAttributes: @ 844045C - .4byte 0x9 - .4byte 0x8 - .4byte AbandonedShip_Room_B1F_MapBorder - .4byte AbandonedShip_Room_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - - .align 2 -AbandonedShip_Rooms2_1F_MapBorder: @ 8440474 - .incbin "data/maps/AbandonedShip_Rooms2_1F/border.bin" - - .align 2 -AbandonedShip_Rooms2_1F_MapBlockdata: @ 844047C - .incbin "data/maps/AbandonedShip_Rooms2_1F/map.bin" - - .align 2 -AbandonedShip_Rooms2_1F_MapAttributes: @ 84405B0 - .4byte 0x9 - .4byte 0x11 - .4byte AbandonedShip_Rooms2_1F_MapBorder - .4byte AbandonedShip_Rooms2_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - - .align 2 -AbandonedShip_CaptainsOffice_MapBorder: @ 84405C8 - .incbin "data/maps/AbandonedShip_CaptainsOffice/border.bin" - - .align 2 -AbandonedShip_CaptainsOffice_MapBlockdata: @ 84405D0 - .incbin "data/maps/AbandonedShip_CaptainsOffice/map.bin" - - .align 2 -AbandonedShip_CaptainsOffice_MapAttributes: @ 8440650 - .4byte 0x9 - .4byte 0x7 - .4byte AbandonedShip_CaptainsOffice_MapBorder - .4byte AbandonedShip_CaptainsOffice_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -AbandonedShip_Underwater2_MapBorder: @ 8440668 - .incbin "data/maps/AbandonedShip_Underwater2/border.bin" - - .align 2 -AbandonedShip_Underwater2_MapBlockdata: @ 8440670 - .incbin "data/maps/AbandonedShip_Underwater2/map.bin" - - .align 2 -AbandonedShip_Underwater2_MapAttributes: @ 8440798 - .4byte 0x15 - .4byte 0x7 - .4byte AbandonedShip_Underwater2_MapBorder - .4byte AbandonedShip_Underwater2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - - .align 2 -SecretBase_RedCave1_MapBorder: @ 84407B0 - .incbin "data/maps/SecretBase_RedCave1/border.bin" - - .align 2 -SecretBase_RedCave1_MapBlockdata: @ 84407B8 - .incbin "data/maps/SecretBase_RedCave1/map.bin" - - .align 2 -SecretBase_RedCave1_MapAttributes: @ 8440880 - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_RedCave1_MapBorder - .4byte SecretBase_RedCave1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseRedCave - - .align 2 -SecretBase_BrownCave1_MapBorder: @ 8440898 - .incbin "data/maps/SecretBase_BrownCave1/border.bin" - - .align 2 -SecretBase_BrownCave1_MapBlockdata: @ 84408A0 - .incbin "data/maps/SecretBase_BrownCave1/map.bin" - - .align 2 -SecretBase_BrownCave1_MapAttributes: @ 8440968 - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_BrownCave1_MapBorder - .4byte SecretBase_BrownCave1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBrownCave - - .align 2 -SecretBase_BlueCave1_MapBorder: @ 8440980 - .incbin "data/maps/SecretBase_BlueCave1/border.bin" - - .align 2 -SecretBase_BlueCave1_MapBlockdata: @ 8440988 - .incbin "data/maps/SecretBase_BlueCave1/map.bin" - - .align 2 -SecretBase_BlueCave1_MapAttributes: @ 8440A50 - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_BlueCave1_MapBorder - .4byte SecretBase_BlueCave1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBlueCave - - .align 2 -SecretBase_YellowCave1_MapBorder: @ 8440A68 - .incbin "data/maps/SecretBase_YellowCave1/border.bin" - - .align 2 -SecretBase_YellowCave1_MapBlockdata: @ 8440A70 - .incbin "data/maps/SecretBase_YellowCave1/map.bin" - - .align 2 -SecretBase_YellowCave1_MapAttributes: @ 8440B38 - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_YellowCave1_MapBorder - .4byte SecretBase_YellowCave1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseYellowCave - - .align 2 -SecretBase_Tree1_MapBorder: @ 8440B50 - .incbin "data/maps/SecretBase_Tree1/border.bin" - - .align 2 -SecretBase_Tree1_MapBlockdata: @ 8440B58 - .incbin "data/maps/SecretBase_Tree1/map.bin" - - .align 2 -SecretBase_Tree1_MapAttributes: @ 8440C20 - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_Tree1_MapBorder - .4byte SecretBase_Tree1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseTree - - .align 2 -SecretBase_Shrub1_MapBorder: @ 8440C38 - .incbin "data/maps/SecretBase_Shrub1/border.bin" - - .align 2 -SecretBase_Shrub1_MapBlockdata: @ 8440C40 - .incbin "data/maps/SecretBase_Shrub1/map.bin" - - .align 2 -SecretBase_Shrub1_MapAttributes: @ 8440D08 - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_Shrub1_MapBorder - .4byte SecretBase_Shrub1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseShrub - - .align 2 -SecretBase_RedCave2_MapBorder: @ 8440D20 - .incbin "data/maps/SecretBase_RedCave2/border.bin" - - .align 2 -SecretBase_RedCave2_MapBlockdata: @ 8440D28 - .incbin "data/maps/SecretBase_RedCave2/map.bin" - - .align 2 -SecretBase_RedCave2_MapAttributes: @ 8440E08 - .4byte 0x7 - .4byte 0x10 - .4byte SecretBase_RedCave2_MapBorder - .4byte SecretBase_RedCave2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseRedCave - - .align 2 -SecretBase_BrownCave2_MapBorder: @ 8440E20 - .incbin "data/maps/SecretBase_BrownCave2/border.bin" - - .align 2 -SecretBase_BrownCave2_MapBlockdata: @ 8440E28 - .incbin "data/maps/SecretBase_BrownCave2/map.bin" - - .align 2 -SecretBase_BrownCave2_MapAttributes: @ 8440F24 - .4byte 0xe - .4byte 0x9 - .4byte SecretBase_BrownCave2_MapBorder - .4byte SecretBase_BrownCave2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBrownCave - - .align 2 -SecretBase_BlueCave2_MapBorder: @ 8440F3C - .incbin "data/maps/SecretBase_BlueCave2/border.bin" - - .align 2 -SecretBase_BlueCave2_MapBlockdata: @ 8440F44 - .incbin "data/maps/SecretBase_BlueCave2/map.bin" - - .align 2 -SecretBase_BlueCave2_MapAttributes: @ 8441018 - .4byte 0xf - .4byte 0x7 - .4byte SecretBase_BlueCave2_MapBorder - .4byte SecretBase_BlueCave2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBlueCave - - .align 2 -SecretBase_YellowCave2_MapBorder: @ 8441030 - .incbin "data/maps/SecretBase_YellowCave2/border.bin" - - .align 2 -SecretBase_YellowCave2_MapBlockdata: @ 8441038 - .incbin "data/maps/SecretBase_YellowCave2/map.bin" - - .align 2 -SecretBase_YellowCave2_MapAttributes: @ 8441134 - .4byte 0xe - .4byte 0x9 - .4byte SecretBase_YellowCave2_MapBorder - .4byte SecretBase_YellowCave2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseYellowCave - - .align 2 -SecretBase_Tree2_MapBorder: @ 844114C - .incbin "data/maps/SecretBase_Tree2/border.bin" - - .align 2 -SecretBase_Tree2_MapBlockdata: @ 8441154 - .incbin "data/maps/SecretBase_Tree2/map.bin" - - .align 2 -SecretBase_Tree2_MapAttributes: @ 8441234 - .4byte 0x7 - .4byte 0x10 - .4byte SecretBase_Tree2_MapBorder - .4byte SecretBase_Tree2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseTree - - .align 2 -SecretBase_Shrub2_MapBorder: @ 844124C - .incbin "data/maps/SecretBase_Shrub2/border.bin" - - .align 2 -SecretBase_Shrub2_MapBlockdata: @ 8441254 - .incbin "data/maps/SecretBase_Shrub2/map.bin" - - .align 2 -SecretBase_Shrub2_MapAttributes: @ 8441328 - .4byte 0xf - .4byte 0x7 - .4byte SecretBase_Shrub2_MapBorder - .4byte SecretBase_Shrub2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseShrub - - .align 2 -SecretBase_RedCave3_MapBorder: @ 8441340 - .incbin "data/maps/SecretBase_RedCave3/border.bin" - - .align 2 -SecretBase_RedCave3_MapBlockdata: @ 8441348 - .incbin "data/maps/SecretBase_RedCave3/map.bin" - - .align 2 -SecretBase_RedCave3_MapAttributes: @ 8441438 - .4byte 0xf - .4byte 0x8 - .4byte SecretBase_RedCave3_MapBorder - .4byte SecretBase_RedCave3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseRedCave - - .align 2 -SecretBase_BrownCave3_MapBorder: @ 8441450 - .incbin "data/maps/SecretBase_BrownCave3/border.bin" - - .align 2 -SecretBase_BrownCave3_MapBlockdata: @ 8441458 - .incbin "data/maps/SecretBase_BrownCave3/map.bin" - - .align 2 -SecretBase_BrownCave3_MapAttributes: @ 84415A4 - .4byte 0xf - .4byte 0xb - .4byte SecretBase_BrownCave3_MapBorder - .4byte SecretBase_BrownCave3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBrownCave - - .align 2 -SecretBase_BlueCave3_MapBorder: @ 84415BC - .incbin "data/maps/SecretBase_BlueCave3/border.bin" - - .align 2 -SecretBase_BlueCave3_MapBlockdata: @ 84415C4 - .incbin "data/maps/SecretBase_BlueCave3/map.bin" - - .align 2 -SecretBase_BlueCave3_MapAttributes: @ 8441718 - .4byte 0xa - .4byte 0x11 - .4byte SecretBase_BlueCave3_MapBorder - .4byte SecretBase_BlueCave3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBlueCave - - .align 2 -SecretBase_YellowCave3_MapBorder: @ 8441730 - .incbin "data/maps/SecretBase_YellowCave3/border.bin" - - .align 2 -SecretBase_YellowCave3_MapBlockdata: @ 8441738 - .incbin "data/maps/SecretBase_YellowCave3/map.bin" - - .align 2 -SecretBase_YellowCave3_MapAttributes: @ 8441840 - .4byte 0xc - .4byte 0xb - .4byte SecretBase_YellowCave3_MapBorder - .4byte SecretBase_YellowCave3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseYellowCave - - .align 2 -SecretBase_Tree3_MapBorder: @ 8441858 - .incbin "data/maps/SecretBase_Tree3/border.bin" - - .align 2 -SecretBase_Tree3_MapBlockdata: @ 8441860 - .incbin "data/maps/SecretBase_Tree3/map.bin" - - .align 2 -SecretBase_Tree3_MapAttributes: @ 8441970 - .4byte 0x11 - .4byte 0x8 - .4byte SecretBase_Tree3_MapBorder - .4byte SecretBase_Tree3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseTree - - .align 2 -SecretBase_Shrub3_MapBorder: @ 8441988 - .incbin "data/maps/SecretBase_Shrub3/border.bin" - - .align 2 -SecretBase_Shrub3_MapBlockdata: @ 8441990 - .incbin "data/maps/SecretBase_Shrub3/map.bin" - - .align 2 -SecretBase_Shrub3_MapAttributes: @ 8441AB0 - .4byte 0xd - .4byte 0xb - .4byte SecretBase_Shrub3_MapBorder - .4byte SecretBase_Shrub3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseShrub - - .align 2 -SecretBase_RedCave4_MapBorder: @ 8441AC8 - .incbin "data/maps/SecretBase_RedCave4/border.bin" - - .align 2 -SecretBase_RedCave4_MapBlockdata: @ 8441AD0 - .incbin "data/maps/SecretBase_RedCave4/map.bin" - - .align 2 -SecretBase_RedCave4_MapAttributes: @ 8441BE0 - .4byte 0x9 - .4byte 0xf - .4byte SecretBase_RedCave4_MapBorder - .4byte SecretBase_RedCave4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseRedCave - - .align 2 -SecretBase_BrownCave4_MapBorder: @ 8441BF8 - .incbin "data/maps/SecretBase_BrownCave4/border.bin" - - .align 2 -SecretBase_BrownCave4_MapBlockdata: @ 8441C00 - .incbin "data/maps/SecretBase_BrownCave4/map.bin" - - .align 2 -SecretBase_BrownCave4_MapAttributes: @ 8441D50 - .4byte 0xe - .4byte 0xc - .4byte SecretBase_BrownCave4_MapBorder - .4byte SecretBase_BrownCave4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBrownCave - - .align 2 -SecretBase_BlueCave4_MapBorder: @ 8441D68 - .incbin "data/maps/SecretBase_BlueCave4/border.bin" - - .align 2 -SecretBase_BlueCave4_MapBlockdata: @ 8441D70 - .incbin "data/maps/SecretBase_BlueCave4/map.bin" - - .align 2 -SecretBase_BlueCave4_MapAttributes: @ 8441EA4 - .4byte 0x9 - .4byte 0x11 - .4byte SecretBase_BlueCave4_MapBorder - .4byte SecretBase_BlueCave4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBlueCave - - .align 2 -SecretBase_YellowCave4_MapBorder: @ 8441EBC - .incbin "data/maps/SecretBase_YellowCave4/border.bin" - - .align 2 -SecretBase_YellowCave4_MapBlockdata: @ 8441EC4 - .incbin "data/maps/SecretBase_YellowCave4/map.bin" - - .align 2 -SecretBase_YellowCave4_MapAttributes: @ 8442030 - .4byte 0xd - .4byte 0xe - .4byte SecretBase_YellowCave4_MapBorder - .4byte SecretBase_YellowCave4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseYellowCave - - .align 2 -SecretBase_Tree4_MapBorder: @ 8442048 - .incbin "data/maps/SecretBase_Tree4/border.bin" - - .align 2 -SecretBase_Tree4_MapBlockdata: @ 8442050 - .incbin "data/maps/SecretBase_Tree4/map.bin" - - .align 2 -SecretBase_Tree4_MapAttributes: @ 84421D8 - .4byte 0xe - .4byte 0xe - .4byte SecretBase_Tree4_MapBorder - .4byte SecretBase_Tree4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseTree - - .align 2 -SecretBase_Shrub4_MapBorder: @ 84421F0 - .incbin "data/maps/SecretBase_Shrub4/border.bin" - - .align 2 -SecretBase_Shrub4_MapBlockdata: @ 84421F8 - .incbin "data/maps/SecretBase_Shrub4/map.bin" - - .align 2 -SecretBase_Shrub4_MapAttributes: @ 844232C - .4byte 0xe - .4byte 0xb - .4byte SecretBase_Shrub4_MapBorder - .4byte SecretBase_Shrub4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseShrub - - .align 2 -SingleBattleColosseum_MapBorder: @ 8442344 - .incbin "data/maps/SingleBattleColosseum/border.bin" - - .align 2 -SingleBattleColosseum_MapBlockdata: @ 844234C - .incbin "data/maps/SingleBattleColosseum/map.bin" - - .align 2 -SingleBattleColosseum_MapAttributes: @ 8442448 - .4byte 0xe - .4byte 0x9 - .4byte SingleBattleColosseum_MapBorder - .4byte SingleBattleColosseum_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - - .align 2 -TradeCenter_MapBorder: @ 8442460 - .incbin "data/maps/TradeCenter/border.bin" - - .align 2 -TradeCenter_MapBlockdata: @ 8442468 - .incbin "data/maps/TradeCenter/map.bin" - - .align 2 -TradeCenter_MapAttributes: @ 8442540 - .4byte 0xc - .4byte 0x9 - .4byte TradeCenter_MapBorder - .4byte TradeCenter_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - - .align 2 -RecordCorner_MapBorder: @ 8442558 - .incbin "data/maps/RecordCorner/border.bin" - - .align 2 -RecordCorner_MapBlockdata: @ 8442560 - .incbin "data/maps/RecordCorner/map.bin" - - .align 2 -RecordCorner_MapAttributes: @ 84426F0 - .4byte 0x14 - .4byte 0xa - .4byte RecordCorner_MapBorder - .4byte RecordCorner_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - - .align 2 -DoubleBattleColosseum_MapBorder: @ 8442708 - .incbin "data/maps/DoubleBattleColosseum/border.bin" - - .align 2 -DoubleBattleColosseum_MapBlockdata: @ 8442710 - .incbin "data/maps/DoubleBattleColosseum/map.bin" - - .align 2 -DoubleBattleColosseum_MapAttributes: @ 844280C - .4byte 0xe - .4byte 0x9 - .4byte DoubleBattleColosseum_MapBorder - .4byte DoubleBattleColosseum_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - - .align 2 -LinkContestRoom1_MapBorder: @ 8442824 - .incbin "data/maps/LinkContestRoom1/border.bin" - - .align 2 -LinkContestRoom1_MapBlockdata: @ 844282C - .incbin "data/maps/LinkContestRoom1/map.bin" - - .align 2 -LinkContestRoom1_MapAttributes: @ 8442978 - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom1_MapBorder - .4byte LinkContestRoom1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - - .align 2 -UnknownMap_25_29_MapBorder: @ 8442990 - .incbin "data/maps/UnknownMap_25_29/border.bin" - - .align 2 -UnknownMap_25_29_MapBlockdata: @ 8442998 - .incbin "data/maps/UnknownMap_25_29/map.bin" - - .align 2 -UnknownMap_25_29_MapAttributes: @ 844299C - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_29_MapBorder - .4byte UnknownMap_25_29_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - - .align 2 -UnknownMap_25_30_MapBorder: @ 84429B4 - .incbin "data/maps/UnknownMap_25_30/border.bin" - - .align 2 -UnknownMap_25_30_MapBlockdata: @ 84429BC - .incbin "data/maps/UnknownMap_25_30/map.bin" - - .align 2 -UnknownMap_25_30_MapAttributes: @ 84429C0 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_30_MapBorder - .4byte UnknownMap_25_30_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - - .align 2 -UnknownMap_25_31_MapBorder: @ 84429D8 - .incbin "data/maps/UnknownMap_25_31/border.bin" - - .align 2 -UnknownMap_25_31_MapBlockdata: @ 84429E0 - .incbin "data/maps/UnknownMap_25_31/map.bin" - - .align 2 -UnknownMap_25_31_MapAttributes: @ 84429E4 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_31_MapBorder - .4byte UnknownMap_25_31_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - - .align 2 -UnknownMap_25_32_MapBorder: @ 84429FC - .incbin "data/maps/UnknownMap_25_32/border.bin" - - .align 2 -UnknownMap_25_32_MapBlockdata: @ 8442A04 - .incbin "data/maps/UnknownMap_25_32/map.bin" - - .align 2 -UnknownMap_25_32_MapAttributes: @ 8442A08 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_32_MapBorder - .4byte UnknownMap_25_32_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - - .align 2 -UnknownMap_25_33_MapBorder: @ 8442A20 - .incbin "data/maps/UnknownMap_25_33/border.bin" - - .align 2 -UnknownMap_25_33_MapBlockdata: @ 8442A28 - .incbin "data/maps/UnknownMap_25_33/map.bin" - - .align 2 -UnknownMap_25_33_MapAttributes: @ 8442A2C - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_33_MapBorder - .4byte UnknownMap_25_33_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - - .align 2 -UnknownMap_25_34_MapBorder: @ 8442A44 - .incbin "data/maps/UnknownMap_25_34/border.bin" - - .align 2 -UnknownMap_25_34_MapBlockdata: @ 8442A4C - .incbin "data/maps/UnknownMap_25_34/map.bin" - - .align 2 -UnknownMap_25_34_MapAttributes: @ 8442A50 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_34_MapBorder - .4byte UnknownMap_25_34_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - - .align 2 -LinkContestRoom2_MapBorder: @ 8442A68 - .incbin "data/maps/LinkContestRoom2/border.bin" - - .align 2 -LinkContestRoom2_MapBlockdata: @ 8442A70 - .incbin "data/maps/LinkContestRoom2/map.bin" - - .align 2 -LinkContestRoom2_MapAttributes: @ 8442BBC - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom2_MapBorder - .4byte LinkContestRoom2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - - .align 2 -LinkContestRoom3_MapBorder: @ 8442BD4 - .incbin "data/maps/LinkContestRoom3/border.bin" - - .align 2 -LinkContestRoom3_MapBlockdata: @ 8442BDC - .incbin "data/maps/LinkContestRoom3/map.bin" - - .align 2 -LinkContestRoom3_MapAttributes: @ 8442D28 - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom3_MapBorder - .4byte LinkContestRoom3_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - - .align 2 -LinkContestRoom4_MapBorder: @ 8442D40 - .incbin "data/maps/LinkContestRoom4/border.bin" - - .align 2 -LinkContestRoom4_MapBlockdata: @ 8442D48 - .incbin "data/maps/LinkContestRoom4/map.bin" - - .align 2 -LinkContestRoom4_MapAttributes: @ 8442E94 - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom4_MapBorder - .4byte LinkContestRoom4_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - - .align 2 -LinkContestRoom5_MapBorder: @ 8442EAC - .incbin "data/maps/LinkContestRoom5/border.bin" - - .align 2 -LinkContestRoom5_MapBlockdata: @ 8442EB4 - .incbin "data/maps/LinkContestRoom5/map.bin" - - .align 2 -LinkContestRoom5_MapAttributes: @ 8443000 - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom5_MapBorder - .4byte LinkContestRoom5_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - - .align 2 -LinkContestRoom6_MapBorder: @ 8443018 - .incbin "data/maps/LinkContestRoom6/border.bin" - - .align 2 -LinkContestRoom6_MapBlockdata: @ 8443020 - .incbin "data/maps/LinkContestRoom6/map.bin" - - .align 2 -LinkContestRoom6_MapAttributes: @ 844316C - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom6_MapBorder - .4byte LinkContestRoom6_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - - .align 2 -InsideOfTruck_MapBorder: @ 8443184 - .incbin "data/maps/InsideOfTruck/border.bin" - - .align 2 -InsideOfTruck_MapBlockdata: @ 844318C - .incbin "data/maps/InsideOfTruck/map.bin" - - .align 2 -InsideOfTruck_MapAttributes: @ 84431C0 - .4byte 0x5 - .4byte 0x5 - .4byte InsideOfTruck_MapBorder - .4byte InsideOfTruck_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideOfTruck - - .align 2 -SafariZone_Northwest_MapBorder: @ 84431D8 - .incbin "data/maps/SafariZone_Northwest/border.bin" - - .align 2 -SafariZone_Northwest_MapBlockdata: @ 84431E0 - .incbin "data/maps/SafariZone_Northwest/map.bin" - - .align 2 -SafariZone_Northwest_MapAttributes: @ 8443E60 - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_Northwest_MapBorder - .4byte SafariZone_Northwest_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - - .align 2 -SafariZone_North_MapBorder: @ 8443E78 - .incbin "data/maps/SafariZone_North/border.bin" - - .align 2 -SafariZone_North_MapBlockdata: @ 8443E80 - .incbin "data/maps/SafariZone_North/map.bin" - - .align 2 -SafariZone_North_MapAttributes: @ 8444B00 - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_North_MapBorder - .4byte SafariZone_North_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - - .align 2 -SafariZone_Southwest_MapBorder: @ 8444B18 - .incbin "data/maps/SafariZone_Southwest/border.bin" - - .align 2 -SafariZone_Southwest_MapBlockdata: @ 8444B20 - .incbin "data/maps/SafariZone_Southwest/map.bin" - - .align 2 -SafariZone_Southwest_MapAttributes: @ 84457A0 - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_Southwest_MapBorder - .4byte SafariZone_Southwest_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - - .align 2 -SafariZone_South_MapBorder: @ 84457B8 - .incbin "data/maps/SafariZone_South/border.bin" - - .align 2 -SafariZone_South_MapBlockdata: @ 84457C0 - .incbin "data/maps/SafariZone_South/map.bin" - - .align 2 -SafariZone_South_MapAttributes: @ 8446440 - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_South_MapBorder - .4byte SafariZone_South_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - - .align 2 -UnknownMapBorder_08447028: @ 8446458 - .incbin "data/maps/UnknownMap_08447028/border.bin" - - .align 2 -UnknownMapBlockdata_08447028: @ 8446460 - .incbin "data/maps/UnknownMap_08447028/map.bin" - - .align 2 -UnknownMapAttributes_08447028: @ 8447028 - .4byte 0x3A - .4byte 0x1A - .4byte UnknownMapBorder_08447028 - .4byte UnknownMapBlockdata_08447028 - .4byte gTileset_General - .4byte 0 - - .align 2 -Route109_SeashoreHouse_MapBorder: @ 8447040 - .incbin "data/maps/Route109_SeashoreHouse/border.bin" - - .align 2 -Route109_SeashoreHouse_MapBlockdata: @ 8447048 - .incbin "data/maps/Route109_SeashoreHouse/map.bin" - - .align 2 -Route109_SeashoreHouse_MapAttributes: @ 8447174 - .4byte 0xf - .4byte 0xa - .4byte Route109_SeashoreHouse_MapBorder - .4byte Route109_SeashoreHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_SeashoreHouse - - .align 2 -Route110_TrickHouseEntrance_MapBorder: @ 844718C - .incbin "data/maps/Route110_TrickHouseEntrance/border.bin" - - .align 2 -Route110_TrickHouseEntrance_MapBlockdata: @ 8447194 - .incbin "data/maps/Route110_TrickHouseEntrance/map.bin" - - .align 2 -Route110_TrickHouseEntrance_MapAttributes: @ 8447254 - .4byte 0xc - .4byte 0x8 - .4byte Route110_TrickHouseEntrance_MapBorder - .4byte Route110_TrickHouseEntrance_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -Route110_TrickHouseEnd_MapBorder: @ 844726C - .incbin "data/maps/Route110_TrickHouseEnd/border.bin" - - .align 2 -Route110_TrickHouseEnd_MapBlockdata: @ 8447274 - .incbin "data/maps/Route110_TrickHouseEnd/map.bin" - - .align 2 -Route110_TrickHouseEnd_MapAttributes: @ 8447334 - .4byte 0xc - .4byte 0x8 - .4byte Route110_TrickHouseEnd_MapBorder - .4byte Route110_TrickHouseEnd_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -Route110_TrickHouseCorridor_MapBorder: @ 844734C - .incbin "data/maps/Route110_TrickHouseCorridor/border.bin" - - .align 2 -Route110_TrickHouseCorridor_MapBlockdata: @ 8447354 - .incbin "data/maps/Route110_TrickHouseCorridor/map.bin" - - .align 2 -Route110_TrickHouseCorridor_MapAttributes: @ 8447624 - .4byte 0xf - .4byte 0x18 - .4byte Route110_TrickHouseCorridor_MapBorder - .4byte Route110_TrickHouseCorridor_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -Route110_TrickHousePuzzle1_MapBorder: @ 844763C - .incbin "data/maps/Route110_TrickHousePuzzle1/border.bin" - - .align 2 -Route110_TrickHousePuzzle1_MapBlockdata: @ 8447644 - .incbin "data/maps/Route110_TrickHousePuzzle1/map.bin" - - .align 2 -Route110_TrickHousePuzzle1_MapAttributes: @ 84478D8 - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle1_MapBorder - .4byte Route110_TrickHousePuzzle1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - - .align 2 -Route110_TrickHousePuzzle2_MapBorder: @ 84478F0 - .incbin "data/maps/Route110_TrickHousePuzzle2/border.bin" - - .align 2 -Route110_TrickHousePuzzle2_MapBlockdata: @ 84478F8 - .incbin "data/maps/Route110_TrickHousePuzzle2/map.bin" - - .align 2 -Route110_TrickHousePuzzle2_MapAttributes: @ 8447B8C - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle2_MapBorder - .4byte Route110_TrickHousePuzzle2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - - .align 2 -Route110_TrickHousePuzzle3_MapBorder: @ 8447BA4 - .incbin "data/maps/Route110_TrickHousePuzzle3/border.bin" - - .align 2 -Route110_TrickHousePuzzle3_MapBlockdata: @ 8447BAC - .incbin "data/maps/Route110_TrickHousePuzzle3/map.bin" - - .align 2 -Route110_TrickHousePuzzle3_MapAttributes: @ 8447E40 - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle3_MapBorder - .4byte Route110_TrickHousePuzzle3_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - - .align 2 -Route110_TrickHousePuzzle4_MapBorder: @ 8447E58 - .incbin "data/maps/Route110_TrickHousePuzzle4/border.bin" - - .align 2 -Route110_TrickHousePuzzle4_MapBlockdata: @ 8447E60 - .incbin "data/maps/Route110_TrickHousePuzzle4/map.bin" - - .align 2 -Route110_TrickHousePuzzle4_MapAttributes: @ 84480F4 - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle4_MapBorder - .4byte Route110_TrickHousePuzzle4_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - - .align 2 -Route110_TrickHousePuzzle5_MapBorder: @ 844810C - .incbin "data/maps/Route110_TrickHousePuzzle5/border.bin" - - .align 2 -Route110_TrickHousePuzzle5_MapBlockdata: @ 8448114 - .incbin "data/maps/Route110_TrickHousePuzzle5/map.bin" - - .align 2 -Route110_TrickHousePuzzle5_MapAttributes: @ 84483A8 - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle5_MapBorder - .4byte Route110_TrickHousePuzzle5_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - - .align 2 -Route110_TrickHousePuzzle6_MapBorder: @ 84483C0 - .incbin "data/maps/Route110_TrickHousePuzzle6/border.bin" - - .align 2 -Route110_TrickHousePuzzle6_MapBlockdata: @ 84483C8 - .incbin "data/maps/Route110_TrickHousePuzzle6/map.bin" - - .align 2 -Route110_TrickHousePuzzle6_MapAttributes: @ 844865C - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle6_MapBorder - .4byte Route110_TrickHousePuzzle6_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - - .align 2 -Route110_TrickHousePuzzle7_MapBorder: @ 8448674 - .incbin "data/maps/Route110_TrickHousePuzzle7/border.bin" - - .align 2 -Route110_TrickHousePuzzle7_MapBlockdata: @ 844867C - .incbin "data/maps/Route110_TrickHousePuzzle7/map.bin" - - .align 2 -Route110_TrickHousePuzzle7_MapAttributes: @ 8448910 - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle7_MapBorder - .4byte Route110_TrickHousePuzzle7_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - - .align 2 -Route110_TrickHousePuzzle8_MapBorder: @ 8448928 - .incbin "data/maps/Route110_TrickHousePuzzle8/border.bin" - - .align 2 -Route110_TrickHousePuzzle8_MapBlockdata: @ 8448930 - .incbin "data/maps/Route110_TrickHousePuzzle8/map.bin" - - .align 2 -Route110_TrickHousePuzzle8_MapAttributes: @ 8448BC4 - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle8_MapBorder - .4byte Route110_TrickHousePuzzle8_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - - .align 2 -FortreeCity_DecorationShop_MapBorder: @ 8448BDC - .incbin "data/maps/FortreeCity_DecorationShop/border.bin" - - .align 2 -FortreeCity_DecorationShop_MapBlockdata: @ 8448BE4 - .incbin "data/maps/FortreeCity_DecorationShop/map.bin" - - .align 2 -FortreeCity_DecorationShop_MapAttributes: @ 8448C44 - .4byte 0x8 - .4byte 0x6 - .4byte FortreeCity_DecorationShop_MapBorder - .4byte FortreeCity_DecorationShop_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -Route110_SeasideCyclingRoadEntrance1_MapBorder: @ 8448C5C - .incbin "data/maps/Route110_SeasideCyclingRoadEntrance1/border.bin" - - .align 2 -Route110_SeasideCyclingRoadEntrance1_MapBlockdata: @ 8448C64 - .incbin "data/maps/Route110_SeasideCyclingRoadEntrance1/map.bin" - - .align 2 -Route110_SeasideCyclingRoadEntrance1_MapAttributes: @ 8448D18 -Route110_SeasideCyclingRoadEntrance2_MapAttributes: @ 8448D18 - .4byte 0xf - .4byte 0x6 - .4byte Route110_SeasideCyclingRoadEntrance1_MapBorder - .4byte Route110_SeasideCyclingRoadEntrance1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - - .align 2 -LilycoveCity_DepartmentStore_1F_MapBorder: @ 8448D30 - .incbin "data/maps/LilycoveCity_DepartmentStore_1F/border.bin" - - .align 2 -LilycoveCity_DepartmentStore_1F_MapBlockdata: @ 8448D38 - .incbin "data/maps/LilycoveCity_DepartmentStore_1F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_1F_MapAttributes: @ 8448E58 - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_1F_MapBorder - .4byte LilycoveCity_DepartmentStore_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - - .align 2 -LilycoveCity_DepartmentStore_2F_MapBorder: @ 8448E70 - .incbin "data/maps/LilycoveCity_DepartmentStore_2F/border.bin" - - .align 2 -LilycoveCity_DepartmentStore_2F_MapBlockdata: @ 8448E78 - .incbin "data/maps/LilycoveCity_DepartmentStore_2F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_2F_MapAttributes: @ 8448F98 - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_2F_MapBorder - .4byte LilycoveCity_DepartmentStore_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - - .align 2 -LilycoveCity_DepartmentStore_3F_MapBorder: @ 8448FB0 - .incbin "data/maps/LilycoveCity_DepartmentStore_3F/border.bin" - - .align 2 -LilycoveCity_DepartmentStore_3F_MapBlockdata: @ 8448FB8 - .incbin "data/maps/LilycoveCity_DepartmentStore_3F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_3F_MapAttributes: @ 84490D8 - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_3F_MapBorder - .4byte LilycoveCity_DepartmentStore_3F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - - .align 2 -LilycoveCity_DepartmentStore_4F_MapBorder: @ 84490F0 - .incbin "data/maps/LilycoveCity_DepartmentStore_4F/border.bin" - - .align 2 -LilycoveCity_DepartmentStore_4F_MapBlockdata: @ 84490F8 - .incbin "data/maps/LilycoveCity_DepartmentStore_4F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_4F_MapAttributes: @ 8449218 - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_4F_MapBorder - .4byte LilycoveCity_DepartmentStore_4F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - - .align 2 -LilycoveCity_DepartmentStore_5F_MapBorder: @ 8449230 - .incbin "data/maps/LilycoveCity_DepartmentStore_5F/border.bin" - - .align 2 -LilycoveCity_DepartmentStore_5F_MapBlockdata: @ 8449238 - .incbin "data/maps/LilycoveCity_DepartmentStore_5F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_5F_MapAttributes: @ 8449358 - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_5F_MapBorder - .4byte LilycoveCity_DepartmentStore_5F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - - .align 2 -LilycoveCity_DepartmentStoreRooftop_MapBorder: @ 8449370 - .incbin "data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin" - - .align 2 -LilycoveCity_DepartmentStoreRooftop_MapBlockdata: @ 8449378 - .incbin "data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin" - - .align 2 -LilycoveCity_DepartmentStoreRooftop_MapAttributes: @ 8449528 - .4byte 0x12 - .4byte 0xc - .4byte LilycoveCity_DepartmentStoreRooftop_MapBorder - .4byte LilycoveCity_DepartmentStoreRooftop_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - - .align 2 -Route130_MapBorder: @ 8449540 - .incbin "data/maps/Route130/border.bin" - - .align 2 -Route130_MapBlockdata: @ 8449548 - .incbin "data/maps/Route130/map.bin" - - .align 2 -Route130_MapAttributes: @ 844AE48 - .4byte 0x50 - .4byte 0x28 - .4byte Route130_MapBorder - .4byte Route130_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -BattleFrontier_BattleTowerLobby_MapBorder: @ 844AE60 - .incbin "data/maps/BattleFrontier_BattleTowerLobby/border.bin" - - .align 2 -BattleFrontier_BattleTowerLobby_MapBlockdata: @ 844AE68 - .incbin "data/maps/BattleFrontier_BattleTowerLobby/map.bin" - - .align 2 -BattleFrontier_BattleTowerLobby_MapAttributes: @ 844B05C - .4byte 0x19 - .4byte 0xa - .4byte BattleFrontier_BattleTowerLobby_MapBorder - .4byte BattleFrontier_BattleTowerLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - - .align 2 -BattleFrontier_OutsideWest_MapBorder: @ 844B074 - .incbin "data/maps/BattleFrontier_OutsideWest/border.bin" - - .align 2 -BattleFrontier_OutsideWest_MapBlockdata: @ 844B07C - .incbin "data/maps/BattleFrontier_OutsideWest/map.bin" - - .align 2 -BattleFrontier_OutsideWest_MapAttributes: @ 844CFFC - .4byte 0x38 - .4byte 0x48 - .4byte BattleFrontier_OutsideWest_MapBorder - .4byte BattleFrontier_OutsideWest_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BattleFrontierOutsideWest - - .align 2 -BattleFrontier_BattleTowerElevator_MapBorder: @ 844D014 - .incbin "data/maps/BattleFrontier_BattleTowerElevator/border.bin" - - .align 2 -BattleFrontier_BattleTowerElevator_MapBlockdata: @ 844D01C - .incbin "data/maps/BattleFrontier_BattleTowerElevator/map.bin" - - .align 2 -BattleFrontier_BattleTowerElevator_MapAttributes: @ 844D064 -TrainerHill_Elevator_MapAttributes: @ 844D064 - .4byte 0x5 - .4byte 0x7 - .4byte BattleFrontier_BattleTowerElevator_MapBorder - .4byte BattleFrontier_BattleTowerElevator_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - - .align 2 -BattleFrontier_BattleTowerCorridor_MapBorder: @ 844D07C - .incbin "data/maps/BattleFrontier_BattleTowerCorridor/border.bin" - - .align 2 -BattleFrontier_BattleTowerCorridor_MapBlockdata: @ 844D084 - .incbin "data/maps/BattleFrontier_BattleTowerCorridor/map.bin" - - .align 2 -BattleFrontier_BattleTowerCorridor_MapAttributes: @ 844D130 - .4byte 0x11 - .4byte 0x5 - .4byte BattleFrontier_BattleTowerCorridor_MapBorder - .4byte BattleFrontier_BattleTowerCorridor_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - - .align 2 -BattleFrontier_BattleTowerBattleRoom_MapBorder: @ 844D148 - .incbin "data/maps/BattleFrontier_BattleTowerBattleRoom/border.bin" - - .align 2 -BattleFrontier_BattleTowerBattleRoom_MapBlockdata: @ 844D150 - .incbin "data/maps/BattleFrontier_BattleTowerBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleTowerBattleRoom2_MapAttributes: @ 844D204 -BattleFrontier_BattleTowerBattleRoom_MapAttributes: @ 844D204 - .4byte 0xa - .4byte 0x9 - .4byte BattleFrontier_BattleTowerBattleRoom_MapBorder - .4byte BattleFrontier_BattleTowerBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - - .align 2 -RustboroCity_DevonCorp_3F_MapBorder: @ 844D21C - .incbin "data/maps/RustboroCity_DevonCorp_3F/border.bin" - - .align 2 -RustboroCity_DevonCorp_3F_MapBlockdata: @ 844D224 - .incbin "data/maps/RustboroCity_DevonCorp_3F/map.bin" - - .align 2 -RustboroCity_DevonCorp_3F_MapAttributes: @ 844D37C - .4byte 0x13 - .4byte 0x9 - .4byte RustboroCity_DevonCorp_3F_MapBorder - .4byte RustboroCity_DevonCorp_3F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Facility - - .align 2 -EverGrandeCity_PokemonLeague_1F_MapBorder: @ 844D394 - .incbin "data/maps/EverGrandeCity_PokemonLeague_1F/border.bin" - - .align 2 -EverGrandeCity_PokemonLeague_1F_MapBlockdata: @ 844D39C - .incbin "data/maps/EverGrandeCity_PokemonLeague_1F/map.bin" - - .align 2 -EverGrandeCity_PokemonLeague_1F_MapAttributes: @ 844D564 - .4byte 0x13 - .4byte 0xc - .4byte EverGrandeCity_PokemonLeague_1F_MapBorder - .4byte EverGrandeCity_PokemonLeague_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonCenter - - .align 2 -Route119_WeatherInstitute_1F_MapBorder: @ 844D57C - .incbin "data/maps/Route119_WeatherInstitute_1F/border.bin" - - .align 2 -Route119_WeatherInstitute_1F_MapBlockdata: @ 844D584 - .incbin "data/maps/Route119_WeatherInstitute_1F/map.bin" - - .align 2 -Route119_WeatherInstitute_1F_MapAttributes: @ 844D78C - .4byte 0x14 - .4byte 0xd - .4byte Route119_WeatherInstitute_1F_MapBorder - .4byte Route119_WeatherInstitute_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Lab - - .align 2 -Route119_WeatherInstitute_2F_MapBorder: @ 844D7A4 - .incbin "data/maps/Route119_WeatherInstitute_2F/border.bin" - - .align 2 -Route119_WeatherInstitute_2F_MapBlockdata: @ 844D7AC - .incbin "data/maps/Route119_WeatherInstitute_2F/map.bin" - - .align 2 -Route119_WeatherInstitute_2F_MapAttributes: @ 844D964 - .4byte 0x14 - .4byte 0xb - .4byte Route119_WeatherInstitute_2F_MapBorder - .4byte Route119_WeatherInstitute_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Lab - - .align 2 -LilycoveCity_DepartmentStoreElevator_MapBorder: @ 844D97C - .incbin "data/maps/LilycoveCity_DepartmentStoreElevator/border.bin" - - .align 2 -LilycoveCity_DepartmentStoreElevator_MapBlockdata: @ 844D984 - .incbin "data/maps/LilycoveCity_DepartmentStoreElevator/map.bin" - - .align 2 -LilycoveCity_DepartmentStoreElevator_MapAttributes: @ 844D9C0 - .4byte 0x5 - .4byte 0x6 - .4byte LilycoveCity_DepartmentStoreElevator_MapBorder - .4byte LilycoveCity_DepartmentStoreElevator_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - - .align 2 -Underwater1_MapBorder: @ 844D9D8 - .incbin "data/maps/Underwater1/border.bin" - - .align 2 -Underwater1_MapBlockdata: @ 844D9E0 - .incbin "data/maps/Underwater1/map.bin" - - .align 2 -Underwater1_MapAttributes: @ 8450BE0 - .4byte 0x50 - .4byte 0x50 - .4byte Underwater1_MapBorder - .4byte Underwater1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - - .align 2 -MossdeepCity_SpaceCenter_1F_MapBorder: @ 8450BF8 - .incbin "data/maps/MossdeepCity_SpaceCenter_1F/border.bin" - - .align 2 -MossdeepCity_SpaceCenter_1F_MapBlockdata: @ 8450C00 - .incbin "data/maps/MossdeepCity_SpaceCenter_1F/map.bin" - - .align 2 -MossdeepCity_SpaceCenter_1F_MapAttributes: @ 8450D40 - .4byte 0x10 - .4byte 0xa - .4byte MossdeepCity_SpaceCenter_1F_MapBorder - .4byte MossdeepCity_SpaceCenter_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -MossdeepCity_SpaceCenter_2F_MapBorder: @ 8450D58 - .incbin "data/maps/MossdeepCity_SpaceCenter_2F/border.bin" - - .align 2 -MossdeepCity_SpaceCenter_2F_MapBlockdata: @ 8450D60 - .incbin "data/maps/MossdeepCity_SpaceCenter_2F/map.bin" - - .align 2 -MossdeepCity_SpaceCenter_2F_MapAttributes: @ 8450EA0 - .4byte 0x10 - .4byte 0xa - .4byte MossdeepCity_SpaceCenter_2F_MapBorder - .4byte MossdeepCity_SpaceCenter_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -SSTidalCorridor_MapBorder: @ 8450EB8 - .incbin "data/maps/SSTidalCorridor/border.bin" - - .align 2 -SSTidalCorridor_MapBlockdata: @ 8450EC0 - .incbin "data/maps/SSTidalCorridor/map.bin" - - .align 2 -SSTidalCorridor_MapAttributes: @ 8451094 - .4byte 0x12 - .4byte 0xd - .4byte SSTidalCorridor_MapBorder - .4byte SSTidalCorridor_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - - .align 2 -SSTidalLowerDeck_MapBorder: @ 84510AC - .incbin "data/maps/SSTidalLowerDeck/border.bin" - - .align 2 -SSTidalLowerDeck_MapBlockdata: @ 84510B4 - .incbin "data/maps/SSTidalLowerDeck/map.bin" - - .align 2 -SSTidalLowerDeck_MapAttributes: @ 8451270 - .4byte 0x11 - .4byte 0xd - .4byte SSTidalLowerDeck_MapBorder - .4byte SSTidalLowerDeck_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - - .align 2 -SSTidalRooms_MapBorder: @ 8451288 - .incbin "data/maps/SSTidalRooms/border.bin" - - .align 2 -SSTidalRooms_MapBlockdata: @ 8451290 - .incbin "data/maps/SSTidalRooms/map.bin" - - .align 2 -SSTidalRooms_MapAttributes: @ 84517A0 - .4byte 0x24 - .4byte 0x12 - .4byte SSTidalRooms_MapBorder - .4byte SSTidalRooms_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - - .align 2 -IslandCave_MapBorder: @ 84517B8 - .incbin "data/maps/IslandCave/border.bin" - - .align 2 -IslandCave_MapBlockdata: @ 84517C0 - .incbin "data/maps/IslandCave/map.bin" - - .align 2 -IslandCave_MapAttributes: @ 8451C24 - .4byte 0x11 - .4byte 0x21 - .4byte IslandCave_MapBorder - .4byte IslandCave_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -AncientTomb_MapBorder: @ 8451C3C - .incbin "data/maps/AncientTomb/border.bin" - - .align 2 -AncientTomb_MapBlockdata: @ 8451C44 - .incbin "data/maps/AncientTomb/map.bin" - - .align 2 -AncientTomb_MapAttributes: @ 84520A8 - .4byte 0x11 - .4byte 0x21 - .4byte AncientTomb_MapBorder - .4byte AncientTomb_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -Underwater_Route134_MapBorder: @ 84520C0 - .incbin "data/maps/Underwater_Route134/border.bin" - - .align 2 -Underwater_Route134_MapBlockdata: @ 84520C8 - .incbin "data/maps/Underwater_Route134/map.bin" - - .align 2 -Underwater_Route134_MapAttributes: @ 8452230 - .4byte 0x12 - .4byte 0xa - .4byte Underwater_Route134_MapBorder - .4byte Underwater_Route134_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - - .align 2 -Underwater_SealedChamber_MapBorder: @ 8452248 - .incbin "data/maps/Underwater_SealedChamber/border.bin" - - .align 2 -Underwater_SealedChamber_MapBlockdata: @ 8452250 - .incbin "data/maps/Underwater_SealedChamber/map.bin" - - .align 2 -Underwater_SealedChamber_MapAttributes: @ 8452A90 - .4byte 0x16 - .4byte 0x30 - .4byte Underwater_SealedChamber_MapBorder - .4byte Underwater_SealedChamber_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - - .align 2 -SealedChamber_OuterRoom_MapBorder: @ 8452AA8 - .incbin "data/maps/SealedChamber_OuterRoom/border.bin" - - .align 2 -SealedChamber_OuterRoom_MapBlockdata: @ 8452AB0 - .incbin "data/maps/SealedChamber_OuterRoom/map.bin" - - .align 2 -SealedChamber_OuterRoom_MapAttributes: @ 8452E78 - .4byte 0x15 - .4byte 0x17 - .4byte SealedChamber_OuterRoom_MapBorder - .4byte SealedChamber_OuterRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -VictoryRoad_B1F_MapBorder: @ 8452E90 - .incbin "data/maps/VictoryRoad_B1F/border.bin" - - .align 2 -VictoryRoad_B1F_MapBlockdata: @ 8452E98 - .incbin "data/maps/VictoryRoad_B1F/map.bin" - - .align 2 -VictoryRoad_B1F_MapAttributes: @ 84539BC - .4byte 0x2e - .4byte 0x1f - .4byte VictoryRoad_B1F_MapBorder - .4byte VictoryRoad_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -VictoryRoad_B2F_MapBorder: @ 84539D4 - .incbin "data/maps/VictoryRoad_B2F/border.bin" - - .align 2 -VictoryRoad_B2F_MapBlockdata: @ 84539DC - .incbin "data/maps/VictoryRoad_B2F/map.bin" - - .align 2 -VictoryRoad_B2F_MapAttributes: @ 8454500 - .4byte 0x2e - .4byte 0x1f - .4byte VictoryRoad_B2F_MapBorder - .4byte VictoryRoad_B2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -Route104_Prototype_MapBorder: @ 8454518 - .incbin "data/maps/Route104_Prototype/border.bin" - - .align 2 -Route104_Prototype_MapBlockdata: @ 8454520 - .incbin "data/maps/Route104_Prototype/map.bin" - - .align 2 -Route104_Prototype_MapAttributes: @ 8454524 - .4byte 0x1 - .4byte 0x1 - .4byte Route104_Prototype_MapBorder - .4byte Route104_Prototype_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - - .align 2 -GraniteCave_StevensRoom_MapBorder: @ 845453C - .incbin "data/maps/GraniteCave_StevensRoom/border.bin" - - .align 2 -GraniteCave_StevensRoom_MapBlockdata: @ 8454544 - .incbin "data/maps/GraniteCave_StevensRoom/map.bin" - - .align 2 -GraniteCave_StevensRoom_MapAttributes: @ 84546E8 - .4byte 0xf - .4byte 0xe - .4byte GraniteCave_StevensRoom_MapBorder - .4byte GraniteCave_StevensRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -AbandonedShip_HiddenFloorCorridors_MapBorder: @ 8454700 - .incbin "data/maps/AbandonedShip_HiddenFloorCorridors/border.bin" - - .align 2 -AbandonedShip_HiddenFloorCorridors_MapBlockdata: @ 8454708 - .incbin "data/maps/AbandonedShip_HiddenFloorCorridors/map.bin" - - .align 2 -AbandonedShip_HiddenFloorCorridors_MapAttributes: @ 8454828 - .4byte 0xd - .4byte 0xb - .4byte AbandonedShip_HiddenFloorCorridors_MapBorder - .4byte AbandonedShip_HiddenFloorCorridors_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - - .align 2 -SouthernIsland_Exterior_MapBorder: @ 8454840 - .incbin "data/maps/SouthernIsland_Exterior/border.bin" - - .align 2 -SouthernIsland_Exterior_MapBlockdata: @ 8454848 - .incbin "data/maps/SouthernIsland_Exterior/map.bin" - - .align 2 -SouthernIsland_Exterior_MapAttributes: @ 8455004 - .4byte 0x21 - .4byte 0x1e - .4byte SouthernIsland_Exterior_MapBorder - .4byte SouthernIsland_Exterior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - - .align 2 -SouthernIsland_Interior_MapBorder: @ 845501C - .incbin "data/maps/SouthernIsland_Interior/border.bin" - - .align 2 -SouthernIsland_Interior_MapBlockdata: @ 8455024 - .incbin "data/maps/SouthernIsland_Interior/map.bin" - - .align 2 -SouthernIsland_Interior_MapAttributes: @ 8455534 - .4byte 0x1b - .4byte 0x18 - .4byte SouthernIsland_Interior_MapBorder - .4byte SouthernIsland_Interior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - - .align 2 -JaggedPass_MapBorder: @ 845554C - .incbin "data/maps/JaggedPass/border.bin" - - .align 2 -JaggedPass_MapBlockdata: @ 8455554 - .incbin "data/maps/JaggedPass/map.bin" - - .align 2 -JaggedPass_MapAttributes: @ 845601C - .4byte 0x1e - .4byte 0x2e - .4byte JaggedPass_MapBorder - .4byte JaggedPass_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - - .align 2 -FieryPath_MapBorder: @ 8456034 - .incbin "data/maps/FieryPath/border.bin" - - .align 2 -FieryPath_MapBlockdata: @ 845603C - .incbin "data/maps/FieryPath/map.bin" - - .align 2 -FieryPath_MapAttributes: @ 8456AA0 - .4byte 0x23 - .4byte 0x26 - .4byte FieryPath_MapBorder - .4byte FieryPath_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - - .align 2 -RustboroCity_Flat2_1F_MapBorder: @ 8456AB8 - .incbin "data/maps/RustboroCity_Flat2_1F/border.bin" - - .align 2 -RustboroCity_Flat2_1F_MapBlockdata: @ 8456AC0 - .incbin "data/maps/RustboroCity_Flat2_1F/map.bin" - - .align 2 -RustboroCity_Flat2_1F_MapAttributes: @ 8456BBC - .4byte 0xe - .4byte 0x9 - .4byte RustboroCity_Flat2_1F_MapBorder - .4byte RustboroCity_Flat2_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -RustboroCity_Flat2_2F_MapBorder: @ 8456BD4 - .incbin "data/maps/RustboroCity_Flat2_2F/border.bin" - - .align 2 -RustboroCity_Flat2_2F_MapBlockdata: @ 8456BDC - .incbin "data/maps/RustboroCity_Flat2_2F/map.bin" - - .align 2 -RustboroCity_Flat2_2F_MapAttributes: @ 8456CD8 - .4byte 0xe - .4byte 0x9 - .4byte RustboroCity_Flat2_2F_MapBorder - .4byte RustboroCity_Flat2_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -RustboroCity_Flat2_3F_MapBorder: @ 8456CF0 - .incbin "data/maps/RustboroCity_Flat2_3F/border.bin" - - .align 2 -RustboroCity_Flat2_3F_MapBlockdata: @ 8456CF8 - .incbin "data/maps/RustboroCity_Flat2_3F/map.bin" - - .align 2 -RustboroCity_Flat2_3F_MapAttributes: @ 8456DF4 - .4byte 0xe - .4byte 0x9 - .4byte RustboroCity_Flat2_3F_MapBorder - .4byte RustboroCity_Flat2_3F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -SootopolisCity_LotadAndSeedotHouse_MapBorder: @ 8456E0C - .incbin "data/maps/SootopolisCity_LotadAndSeedotHouse/border.bin" - - .align 2 -SootopolisCity_LotadAndSeedotHouse_MapBlockdata: @ 8456E14 - .incbin "data/maps/SootopolisCity_LotadAndSeedotHouse/map.bin" - - .align 2 -SootopolisCity_LotadAndSeedotHouse_MapAttributes: @ 8456E84 - .4byte 0x8 - .4byte 0x7 - .4byte SootopolisCity_LotadAndSeedotHouse_MapBorder - .4byte SootopolisCity_LotadAndSeedotHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -EverGrandeCity_HallOfFame_MapBorder: @ 8456E9C - .incbin "data/maps/EverGrandeCity_HallOfFame/border.bin" - - .align 2 -EverGrandeCity_HallOfFame_MapBlockdata: @ 8456EA4 - .incbin "data/maps/EverGrandeCity_HallOfFame/map.bin" - - .align 2 -EverGrandeCity_HallOfFame_MapAttributes: @ 84570A4 - .4byte 0xf - .4byte 0x11 - .4byte EverGrandeCity_HallOfFame_MapBorder - .4byte EverGrandeCity_HallOfFame_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - - .align 2 -LilycoveCity_CoveLilyMotel_1F_MapBorder: @ 84570BC - .incbin "data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin" - - .align 2 -LilycoveCity_CoveLilyMotel_1F_MapBlockdata: @ 84570C4 - .incbin "data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin" - - .align 2 -LilycoveCity_CoveLilyMotel_1F_MapAttributes: @ 845719C - .4byte 0xc - .4byte 0x9 - .4byte LilycoveCity_CoveLilyMotel_1F_MapBorder - .4byte LilycoveCity_CoveLilyMotel_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -LilycoveCity_CoveLilyMotel_2F_MapBorder: @ 84571B4 - .incbin "data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin" - - .align 2 -LilycoveCity_CoveLilyMotel_2F_MapBlockdata: @ 84571BC - .incbin "data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin" - - .align 2 -LilycoveCity_CoveLilyMotel_2F_MapAttributes: @ 8457294 - .4byte 0xc - .4byte 0x9 - .4byte LilycoveCity_CoveLilyMotel_2F_MapBorder - .4byte LilycoveCity_CoveLilyMotel_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -Route124_DivingTreasureHuntersHouse_MapBorder: @ 84572AC - .incbin "data/maps/Route124_DivingTreasureHuntersHouse/border.bin" - - .align 2 -Route124_DivingTreasureHuntersHouse_MapBlockdata: @ 84572B4 - .incbin "data/maps/Route124_DivingTreasureHuntersHouse/map.bin" - - .align 2 -Route124_DivingTreasureHuntersHouse_MapAttributes: @ 8457368 - .4byte 0xa - .4byte 0x9 - .4byte Route124_DivingTreasureHuntersHouse_MapBorder - .4byte Route124_DivingTreasureHuntersHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -MtPyre_Exterior_MapBorder: @ 8457380 - .incbin "data/maps/MtPyre_Exterior/border.bin" - - .align 2 -MtPyre_Exterior_MapBlockdata: @ 8457388 - .incbin "data/maps/MtPyre_Exterior/map.bin" - - .align 2 -MtPyre_Exterior_MapAttributes: @ 84582AC - .4byte 0x26 - .4byte 0x33 - .4byte MtPyre_Exterior_MapBorder - .4byte MtPyre_Exterior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -MtPyre_Summit_MapBorder: @ 84582C4 - .incbin "data/maps/MtPyre_Summit/border.bin" - - .align 2 -MtPyre_Summit_MapBlockdata: @ 84582CC - .incbin "data/maps/MtPyre_Summit/map.bin" - - .align 2 -MtPyre_Summit_MapAttributes: @ 8459140 - .4byte 0x32 - .4byte 0x25 - .4byte MtPyre_Summit_MapBorder - .4byte MtPyre_Summit_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -SealedChamber_InnerRoom_MapBorder: @ 8459158 - .incbin "data/maps/SealedChamber_InnerRoom/border.bin" - - .align 2 -SealedChamber_InnerRoom_MapBlockdata: @ 8459160 - .incbin "data/maps/SealedChamber_InnerRoom/map.bin" - - .align 2 -SealedChamber_InnerRoom_MapAttributes: @ 8459528 - .4byte 0x15 - .4byte 0x17 - .4byte SealedChamber_InnerRoom_MapBorder - .4byte SealedChamber_InnerRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -MossdeepCity_GameCorner_1F_MapBorder: @ 8459540 - .incbin "data/maps/MossdeepCity_GameCorner_1F/border.bin" - - .align 2 -MossdeepCity_GameCorner_1F_MapBlockdata: @ 8459548 - .incbin "data/maps/MossdeepCity_GameCorner_1F/map.bin" - - .align 2 -MossdeepCity_GameCorner_1F_MapAttributes: @ 8459638 - .4byte 0xc - .4byte 0xa - .4byte MossdeepCity_GameCorner_1F_MapBorder - .4byte MossdeepCity_GameCorner_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MossdeepGameCorner - - .align 2 -MossdeepCity_GameCorner_B1F_MapBorder: @ 8459650 - .incbin "data/maps/MossdeepCity_GameCorner_B1F/border.bin" - - .align 2 -MossdeepCity_GameCorner_B1F_MapBlockdata: @ 8459658 - .incbin "data/maps/MossdeepCity_GameCorner_B1F/map.bin" - - .align 2 -MossdeepCity_GameCorner_B1F_MapAttributes: @ 8459730 - .4byte 0xc - .4byte 0x9 - .4byte MossdeepCity_GameCorner_B1F_MapBorder - .4byte MossdeepCity_GameCorner_B1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -SootopolisCity_House1_MapBorder: @ 8459748 - .incbin "data/maps/SootopolisCity_House1/border.bin" - - .align 2 -SootopolisCity_House1_MapBlockdata: @ 8459750 - .incbin "data/maps/SootopolisCity_House1/map.bin" - - .align 2 -SootopolisCity_House1_MapAttributes: @ 84597C0 -SootopolisCity_House4_MapAttributes: @ 84597C0 -SootopolisCity_House7_MapAttributes: @ 84597C0 - .4byte 0x8 - .4byte 0x7 - .4byte SootopolisCity_House1_MapBorder - .4byte SootopolisCity_House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -SootopolisCity_House2_MapBorder: @ 84597D8 - .incbin "data/maps/SootopolisCity_House2/border.bin" - - .align 2 -SootopolisCity_House2_MapBlockdata: @ 84597E0 - .incbin "data/maps/SootopolisCity_House2/map.bin" - - .align 2 -SootopolisCity_House2_MapAttributes: @ 8459850 -SootopolisCity_House5_MapAttributes: @ 8459850 - .4byte 0x8 - .4byte 0x7 - .4byte SootopolisCity_House2_MapBorder - .4byte SootopolisCity_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -SootopolisCity_House3_MapBorder: @ 8459868 - .incbin "data/maps/SootopolisCity_House3/border.bin" - - .align 2 -SootopolisCity_House3_MapBlockdata: @ 8459870 - .incbin "data/maps/SootopolisCity_House3/map.bin" - - .align 2 -SootopolisCity_House3_MapAttributes: @ 84598E0 -SootopolisCity_House6_MapAttributes: @ 84598E0 - .4byte 0x8 - .4byte 0x7 - .4byte SootopolisCity_House3_MapBorder - .4byte SootopolisCity_House3_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -AbandonedShip_HiddenFloorRooms_MapBorder: @ 84598F8 - .incbin "data/maps/AbandonedShip_HiddenFloorRooms/border.bin" - - .align 2 -AbandonedShip_HiddenFloorRooms_MapBlockdata: @ 8459900 - .incbin "data/maps/AbandonedShip_HiddenFloorRooms/map.bin" - - .align 2 -AbandonedShip_HiddenFloorRooms_MapAttributes: @ 8459E28 - .4byte 0x2c - .4byte 0xf - .4byte AbandonedShip_HiddenFloorRooms_MapBorder - .4byte AbandonedShip_HiddenFloorRooms_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - - .align 2 -ScorchedSlab_MapBorder: @ 8459E40 - .incbin "data/maps/ScorchedSlab/border.bin" - - .align 2 -ScorchedSlab_MapBlockdata: @ 8459E48 - .incbin "data/maps/ScorchedSlab/map.bin" - - .align 2 -ScorchedSlab_MapAttributes: @ 845A0A0 - .4byte 0xf - .4byte 0x14 - .4byte ScorchedSlab_MapBorder - .4byte ScorchedSlab_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -UnknownMapBorder_0845A394: @ 845A0B8 - .incbin "data/maps/UnknownMap_0845A394/border.bin" - - .align 2 -UnknownMapBlockdata_0845A394: @ 845A0C0 - .incbin "data/maps/UnknownMap_0845A394/map.bin" - - .align 2 -UnknownMapAttributes_0845A394: @ 845A394 - .4byte 0x13 - .4byte 0x13 - .4byte UnknownMapBorder_0845A394 - .4byte UnknownMapBlockdata_0845A394 - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -RustboroCity_Flat1_1F_MapBorder: @ 845A3AC - .incbin "data/maps/RustboroCity_Flat1_1F/border.bin" - - .align 2 -RustboroCity_Flat1_1F_MapBlockdata: @ 845A3B4 - .incbin "data/maps/RustboroCity_Flat1_1F/map.bin" - - .align 2 -RustboroCity_Flat1_1F_MapAttributes: @ 845A494 - .4byte 0xe - .4byte 0x8 - .4byte RustboroCity_Flat1_1F_MapBorder - .4byte RustboroCity_Flat1_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -RustboroCity_Flat1_2F_MapBorder: @ 845A4AC - .incbin "data/maps/RustboroCity_Flat1_2F/border.bin" - - .align 2 -RustboroCity_Flat1_2F_MapBlockdata: @ 845A4B4 - .incbin "data/maps/RustboroCity_Flat1_2F/map.bin" - - .align 2 -RustboroCity_Flat1_2F_MapAttributes: @ 845A594 - .4byte 0xe - .4byte 0x8 - .4byte RustboroCity_Flat1_2F_MapBorder - .4byte RustboroCity_Flat1_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -EverGrandeCity_Hall4_MapBorder: @ 845A5AC - .incbin "data/maps/EverGrandeCity_Hall4/border.bin" - - .align 2 -EverGrandeCity_Hall4_MapBlockdata: @ 845A5B4 - .incbin "data/maps/EverGrandeCity_Hall4/map.bin" - - .align 2 -EverGrandeCity_Hall4_MapAttributes: @ 845A8A0 - .4byte 0xb - .4byte 0x22 - .4byte EverGrandeCity_Hall4_MapBorder - .4byte EverGrandeCity_Hall4_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - - .align 2 -AquaHideout_UnusedRubyMap1_MapBorder: @ 845A8B8 - .incbin "data/maps/AquaHideout_UnusedRubyMap1/border.bin" - - .align 2 -AquaHideout_UnusedRubyMap1_MapBlockdata: @ 845A8C0 - .incbin "data/maps/AquaHideout_UnusedRubyMap1/map.bin" - - .align 2 -AquaHideout_UnusedRubyMap1_MapAttributes: @ 845AF50 - .4byte 0x1c - .4byte 0x1e - .4byte AquaHideout_UnusedRubyMap1_MapBorder - .4byte AquaHideout_UnusedRubyMap1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -AquaHideout_UnusedRubyMap2_MapBorder: @ 845AF68 - .incbin "data/maps/AquaHideout_UnusedRubyMap2/border.bin" - - .align 2 -AquaHideout_UnusedRubyMap2_MapBlockdata: @ 845AF70 - .incbin "data/maps/AquaHideout_UnusedRubyMap2/map.bin" - - .align 2 -AquaHideout_UnusedRubyMap2_MapAttributes: @ 845BB10 - .4byte 0x3e - .4byte 0x18 - .4byte AquaHideout_UnusedRubyMap2_MapBorder - .4byte AquaHideout_UnusedRubyMap2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -AquaHideout_UnusedRubyMap3_MapBorder: @ 845BB28 - .incbin "data/maps/AquaHideout_UnusedRubyMap3/border.bin" - - .align 2 -AquaHideout_UnusedRubyMap3_MapBlockdata: @ 845BB30 - .incbin "data/maps/AquaHideout_UnusedRubyMap3/map.bin" - - .align 2 -AquaHideout_UnusedRubyMap3_MapAttributes: @ 845C190 - .4byte 0x22 - .4byte 0x18 - .4byte AquaHideout_UnusedRubyMap3_MapBorder - .4byte AquaHideout_UnusedRubyMap3_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -UnknownMapBorder_0845D470: @ 845C1A8 - .incbin "data/maps/UnknownMap_0845D470/border.bin" - - .align 2 -UnknownMapBlockdata_0845D470: @ 845C1B0 - .incbin "data/maps/UnknownMap_0845D470/map.bin" - - .align 2 -UnknownMapAttributes_0845D470: @ 845D470 - .4byte 0x3C - .4byte 0x28 - .4byte UnknownMapBorder_0845D470 - .4byte UnknownMapBlockdata_0845D470 - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -SkyPillar_Entrance_MapBorder: @ 845D488 - .incbin "data/maps/SkyPillar_Entrance/border.bin" - - .align 2 -SkyPillar_Entrance_MapBlockdata: @ 845D490 - .incbin "data/maps/SkyPillar_Entrance/map.bin" - - .align 2 -SkyPillar_Entrance_MapAttributes: @ 845D718 - .4byte 0x12 - .4byte 0x12 - .4byte SkyPillar_Entrance_MapBorder - .4byte SkyPillar_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -SkyPillar_Outside_MapBorder: @ 845D730 - .incbin "data/maps/SkyPillar_Outside/border.bin" - - .align 2 -SkyPillar_Outside_MapBlockdata: @ 845D738 - .incbin "data/maps/SkyPillar_Outside/map.bin" - - .align 2 -SkyPillar_Outside_MapAttributes: @ 845DC40 - .4byte 0x1c - .4byte 0x17 - .4byte SkyPillar_Outside_MapBorder - .4byte SkyPillar_Outside_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -SkyPillar_1F_MapBorder: @ 845DC58 - .incbin "data/maps/SkyPillar_1F/border.bin" - - .align 2 -SkyPillar_1F_MapBlockdata: @ 845DC60 - .incbin "data/maps/SkyPillar_1F/map.bin" - - .align 2 -SkyPillar_1F_MapAttributes: @ 845DDE8 - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_1F_MapBorder - .4byte SkyPillar_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -SkyPillar_2F_MapBorder: @ 845DE00 - .incbin "data/maps/SkyPillar_2F/border.bin" - - .align 2 -SkyPillar_2F_MapBlockdata: @ 845DE08 - .incbin "data/maps/SkyPillar_2F/map.bin" - - .align 2 -SkyPillar_2F_MapAttributes: @ 845DF90 - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_2F_MapBorder - .4byte SkyPillar_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -SkyPillar_3F_MapBorder: @ 845DFA8 - .incbin "data/maps/SkyPillar_3F/border.bin" - - .align 2 -SkyPillar_3F_MapBlockdata: @ 845DFB0 - .incbin "data/maps/SkyPillar_3F/map.bin" - - .align 2 -SkyPillar_3F_MapAttributes: @ 845E138 - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_3F_MapBorder - .4byte SkyPillar_3F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -SkyPillar_4F_MapBorder: @ 845E150 - .incbin "data/maps/SkyPillar_4F/border.bin" - - .align 2 -SkyPillar_4F_MapBlockdata: @ 845E158 - .incbin "data/maps/SkyPillar_4F/map.bin" - - .align 2 -SkyPillar_4F_MapAttributes: @ 845E2E0 - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_4F_MapBorder - .4byte SkyPillar_4F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -UnknownMapBorder_0845ECB4: @ 845E2F8 - .incbin "data/maps/UnknownMap_0845ECB4/border.bin" - - .align 2 -UnknownMapBlockdata_0845ECB4: @ 845E300 - .incbin "data/maps/UnknownMap_0845ECB4/map.bin" - - .align 2 -UnknownMapAttributes_0845ECB4: @ 845ECB4 - .4byte 0x1B - .4byte 0x2E - .4byte UnknownMapBorder_0845ECB4 - .4byte UnknownMapBlockdata_0845ECB4 - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -MossdeepCity_StevensHouse_MapBorder: @ 845ECCC - .incbin "data/maps/MossdeepCity_StevensHouse/border.bin" - - .align 2 -MossdeepCity_StevensHouse_MapBlockdata: @ 845ECD4 - .incbin "data/maps/MossdeepCity_StevensHouse/map.bin" - - .align 2 -MossdeepCity_StevensHouse_MapAttributes: @ 845ED84 - .4byte 0xb - .4byte 0x8 - .4byte MossdeepCity_StevensHouse_MapBorder - .4byte MossdeepCity_StevensHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -ShoalCave_LowTideIceRoom_MapBorder: @ 845ED9C - .incbin "data/maps/ShoalCave_LowTideIceRoom/border.bin" - - .align 2 -ShoalCave_LowTideIceRoom_MapBlockdata: @ 845EDA4 - .incbin "data/maps/ShoalCave_LowTideIceRoom/map.bin" - - .align 2 -ShoalCave_LowTideIceRoom_MapAttributes: @ 845F254 - .4byte 0x14 - .4byte 0x1e - .4byte ShoalCave_LowTideIceRoom_MapBorder - .4byte ShoalCave_LowTideIceRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -SafariZone_RestHouse_MapBorder: @ 845F26C - .incbin "data/maps/SafariZone_RestHouse/border.bin" - - .align 2 -SafariZone_RestHouse_MapBlockdata: @ 845F274 - .incbin "data/maps/SafariZone_RestHouse/map.bin" - - .align 2 -SafariZone_RestHouse_MapAttributes: @ 845F328 - .4byte 0xa - .4byte 0x9 - .4byte SafariZone_RestHouse_MapBorder - .4byte SafariZone_RestHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -SkyPillar_5F_MapBorder: @ 845F340 - .incbin "data/maps/SkyPillar_5F/border.bin" - - .align 2 -SkyPillar_5F_MapBlockdata: @ 845F348 - .incbin "data/maps/SkyPillar_5F/map.bin" - - .align 2 -SkyPillar_5F_MapAttributes: @ 845F4D0 - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_5F_MapBorder - .4byte SkyPillar_5F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -SkyPillar_Top_MapBorder: @ 845F4E8 - .incbin "data/maps/SkyPillar_Top/border.bin" - - .align 2 -SkyPillar_Top_MapBlockdata: @ 845F4F0 - .incbin "data/maps/SkyPillar_Top/map.bin" - - .align 2 -SkyPillar_Top_MapAttributes: @ 845FA00 - .4byte 0x1b - .4byte 0x18 - .4byte SkyPillar_Top_MapBorder - .4byte SkyPillar_Top_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -BattleFrontier_BattleDomeLobby_MapBorder: @ 845FA18 - .incbin "data/maps/BattleFrontier_BattleDomeLobby/border.bin" - - .align 2 -BattleFrontier_BattleDomeLobby_MapBlockdata: @ 845FA20 - .incbin "data/maps/BattleFrontier_BattleDomeLobby/map.bin" - - .align 2 -BattleFrontier_BattleDomeLobby_MapAttributes: @ 845FD30 - .4byte 0x17 - .4byte 0x11 - .4byte BattleFrontier_BattleDomeLobby_MapBorder - .4byte BattleFrontier_BattleDomeLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleDome - - .align 2 -BattleFrontier_BattleDomeCorridor_MapBorder: @ 845FD48 - .incbin "data/maps/BattleFrontier_BattleDomeCorridor/border.bin" - - .align 2 -BattleFrontier_BattleDomeCorridor_MapBlockdata: @ 845FD50 - .incbin "data/maps/BattleFrontier_BattleDomeCorridor/map.bin" - - .align 2 -BattleFrontier_BattleDomeCorridor_MapAttributes: @ 845FFF0 - .4byte 0x30 - .4byte 0x7 - .4byte BattleFrontier_BattleDomeCorridor_MapBorder - .4byte BattleFrontier_BattleDomeCorridor_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleDome - - .align 2 -BattleFrontier_BattleDomePreBattleRoom_MapBorder: @ 8460008 - .incbin "data/maps/BattleFrontier_BattleDomePreBattleRoom/border.bin" - - .align 2 -BattleFrontier_BattleDomePreBattleRoom_MapBlockdata: @ 8460010 - .incbin "data/maps/BattleFrontier_BattleDomePreBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleDomePreBattleRoom_MapAttributes: @ 84600A0 - .4byte 0x9 - .4byte 0x8 - .4byte BattleFrontier_BattleDomePreBattleRoom_MapBorder - .4byte BattleFrontier_BattleDomePreBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleDome - - .align 2 -BattleFrontier_BattleDomeBattleRoom_MapBorder: @ 84600B8 - .incbin "data/maps/BattleFrontier_BattleDomeBattleRoom/border.bin" - - .align 2 -BattleFrontier_BattleDomeBattleRoom_MapBlockdata: @ 84600C0 - .incbin "data/maps/BattleFrontier_BattleDomeBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleDomeBattleRoom_MapAttributes: @ 8460250 - .4byte 0x14 - .4byte 0xa - .4byte BattleFrontier_BattleDomeBattleRoom_MapBorder - .4byte BattleFrontier_BattleDomeBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleDome - - .align 2 -MagmaHideout_1F_MapBorder: @ 8460268 - .incbin "data/maps/MagmaHideout_1F/border.bin" - - .align 2 -MagmaHideout_1F_MapBlockdata: @ 8460270 - .incbin "data/maps/MagmaHideout_1F/map.bin" - - .align 2 -MagmaHideout_1F_MapAttributes: @ 8460D6C - .4byte 0x25 - .4byte 0x26 - .4byte MagmaHideout_1F_MapBorder - .4byte MagmaHideout_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - - .align 2 -MagmaHideout_2F_1R_MapBorder: @ 8460D84 - .incbin "data/maps/MagmaHideout_2F_1R/border.bin" - - .align 2 -MagmaHideout_2F_1R_MapBlockdata: @ 8460D8C - .incbin "data/maps/MagmaHideout_2F_1R/map.bin" - - .align 2 -MagmaHideout_2F_1R_MapAttributes: @ 846179C - .4byte 0x21 - .4byte 0x27 - .4byte MagmaHideout_2F_1R_MapBorder - .4byte MagmaHideout_2F_1R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - - .align 2 -MagmaHideout_2F_2R_MapBorder: @ 84617B4 - .incbin "data/maps/MagmaHideout_2F_2R/border.bin" - - .align 2 -MagmaHideout_2F_2R_MapBlockdata: @ 84617BC - .incbin "data/maps/MagmaHideout_2F_2R/map.bin" - - .align 2 -MagmaHideout_2F_2R_MapAttributes: @ 8462274 - .4byte 0x31 - .4byte 0x1c - .4byte MagmaHideout_2F_2R_MapBorder - .4byte MagmaHideout_2F_2R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - - .align 2 -MagmaHideout_3F_1R_MapBorder: @ 846228C - .incbin "data/maps/MagmaHideout_3F_1R/border.bin" - - .align 2 -MagmaHideout_3F_1R_MapBlockdata: @ 8462294 - .incbin "data/maps/MagmaHideout_3F_1R/map.bin" - - .align 2 -MagmaHideout_3F_1R_MapAttributes: @ 84627D4 - .4byte 0x1c - .4byte 0x18 - .4byte MagmaHideout_3F_1R_MapBorder - .4byte MagmaHideout_3F_1R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - - .align 2 -MagmaHideout_3F_2R_MapBorder: @ 84627EC - .incbin "data/maps/MagmaHideout_3F_2R/border.bin" - - .align 2 -MagmaHideout_3F_2R_MapBlockdata: @ 84627F4 - .incbin "data/maps/MagmaHideout_3F_2R/map.bin" - - .align 2 -MagmaHideout_3F_2R_MapAttributes: @ 8462B24 - .4byte 0x18 - .4byte 0x11 - .4byte MagmaHideout_3F_2R_MapBorder - .4byte MagmaHideout_3F_2R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - - .align 2 -MagmaHideout_4F_MapBorder: @ 8462B3C - .incbin "data/maps/MagmaHideout_4F/border.bin" - - .align 2 -MagmaHideout_4F_MapBlockdata: @ 8462B44 - .incbin "data/maps/MagmaHideout_4F/map.bin" - - .align 2 -MagmaHideout_4F_MapAttributes: @ 846382C - .4byte 0x3b - .4byte 0x1c - .4byte MagmaHideout_4F_MapBorder - .4byte MagmaHideout_4F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - - .align 2 -BattleFrontier_BattlePalaceLobby_MapBorder: @ 8463844 - .incbin "data/maps/BattleFrontier_BattlePalaceLobby/border.bin" - - .align 2 -BattleFrontier_BattlePalaceLobby_MapBlockdata: @ 846384C - .incbin "data/maps/BattleFrontier_BattlePalaceLobby/map.bin" - - .align 2 -BattleFrontier_BattlePalaceLobby_MapAttributes: @ 8463AA4 - .4byte 0x19 - .4byte 0xc - .4byte BattleFrontier_BattlePalaceLobby_MapBorder - .4byte BattleFrontier_BattlePalaceLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePalace - - .align 2 -BattleFrontier_BattlePalaceCorridor_MapBorder: @ 8463ABC - .incbin "data/maps/BattleFrontier_BattlePalaceCorridor/border.bin" - - .align 2 -BattleFrontier_BattlePalaceCorridor_MapBlockdata: @ 8463AC4 - .incbin "data/maps/BattleFrontier_BattlePalaceCorridor/map.bin" - - .align 2 -BattleFrontier_BattlePalaceCorridor_MapAttributes: @ 8463CA0 - .4byte 0x11 - .4byte 0xe - .4byte BattleFrontier_BattlePalaceCorridor_MapBorder - .4byte BattleFrontier_BattlePalaceCorridor_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BattlePalace - - .align 2 -BattleFrontier_BattlePalaceBattleRoom_MapBorder: @ 8463CB8 - .incbin "data/maps/BattleFrontier_BattlePalaceBattleRoom/border.bin" - - .align 2 -BattleFrontier_BattlePalaceBattleRoom_MapBlockdata: @ 8463CC0 - .incbin "data/maps/BattleFrontier_BattlePalaceBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattlePalaceBattleRoom_MapAttributes: @ 8463DEC - .4byte 0xf - .4byte 0xa - .4byte BattleFrontier_BattlePalaceBattleRoom_MapBorder - .4byte BattleFrontier_BattlePalaceBattleRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BattlePalace - - .align 2 -BattleFrontier_OutsideEast_MapBorder: @ 8463E04 - .incbin "data/maps/BattleFrontier_OutsideEast/border.bin" - - .align 2 -BattleFrontier_OutsideEast_MapBlockdata: @ 8463E0C - .incbin "data/maps/BattleFrontier_OutsideEast/map.bin" - - .align 2 -BattleFrontier_OutsideEast_MapAttributes: @ 846668C - .4byte 0x48 - .4byte 0x48 - .4byte BattleFrontier_OutsideEast_MapBorder - .4byte BattleFrontier_OutsideEast_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BattleFrontierOutsideEast - - .align 2 -BattleFrontier_BattleFactoryLobby_MapBorder: @ 84666A4 - .incbin "data/maps/BattleFrontier_BattleFactoryLobby/border.bin" - - .align 2 -BattleFrontier_BattleFactoryLobby_MapBlockdata: @ 84666AC - .incbin "data/maps/BattleFrontier_BattleFactoryLobby/map.bin" - - .align 2 -BattleFrontier_BattleFactoryLobby_MapAttributes: @ 8466874 - .4byte 0x13 - .4byte 0xc - .4byte BattleFrontier_BattleFactoryLobby_MapBorder - .4byte BattleFrontier_BattleFactoryLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFactory - - .align 2 -BattleFrontier_BattleFactoryPreBattleRoom_MapBorder: @ 846688C - .incbin "data/maps/BattleFrontier_BattleFactoryPreBattleRoom/border.bin" - - .align 2 -BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata: @ 8466894 - .incbin "data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleFactoryPreBattleRoom_MapAttributes: @ 8466A70 - .4byte 0x11 - .4byte 0xe - .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapBorder - .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFactory - - .align 2 -BattleFrontier_BattleFactoryBattleRoom_MapBorder: @ 8466A88 - .incbin "data/maps/BattleFrontier_BattleFactoryBattleRoom/border.bin" - - .align 2 -BattleFrontier_BattleFactoryBattleRoom_MapBlockdata: @ 8466A90 - .incbin "data/maps/BattleFrontier_BattleFactoryBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleFactoryBattleRoom_MapAttributes: @ 8466BC8 - .4byte 0xd - .4byte 0xc - .4byte BattleFrontier_BattleFactoryBattleRoom_MapBorder - .4byte BattleFrontier_BattleFactoryBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFactory - - .align 2 -BattleFrontier_BattlePikeLobby_MapBorder: @ 8466BE0 - .incbin "data/maps/BattleFrontier_BattlePikeLobby/border.bin" - - .align 2 -BattleFrontier_BattlePikeLobby_MapBlockdata: @ 8466BE8 - .incbin "data/maps/BattleFrontier_BattlePikeLobby/map.bin" - - .align 2 -BattleFrontier_BattlePikeLobby_MapAttributes: @ 8466D08 - .4byte 0xb - .4byte 0xd - .4byte BattleFrontier_BattlePikeLobby_MapBorder - .4byte BattleFrontier_BattlePikeLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePike - - .align 2 -BattleFrontier_BattlePikeCorridor_MapBorder: @ 8466D20 - .incbin "data/maps/BattleFrontier_BattlePikeCorridor/border.bin" - - .align 2 -BattleFrontier_BattlePikeCorridor_MapBlockdata: @ 8466D28 - .incbin "data/maps/BattleFrontier_BattlePikeCorridor/map.bin" - - .align 2 -BattleFrontier_BattlePikeCorridor_MapAttributes: @ 8466E08 - .4byte 0xe - .4byte 0x8 - .4byte BattleFrontier_BattlePikeCorridor_MapBorder - .4byte BattleFrontier_BattlePikeCorridor_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePike - - .align 2 -BattleFrontier_BattlePikeThreePathRoom_MapBorder: @ 8466E20 - .incbin "data/maps/BattleFrontier_BattlePikeThreePathRoom/border.bin" - - .align 2 -BattleFrontier_BattlePikeThreePathRoom_MapBlockdata: @ 8466E28 - .incbin "data/maps/BattleFrontier_BattlePikeThreePathRoom/map.bin" - - .align 2 -BattleFrontier_BattlePikeThreePathRoom_MapAttributes: @ 8466F48 - .4byte 0xd - .4byte 0xb - .4byte BattleFrontier_BattlePikeThreePathRoom_MapBorder - .4byte BattleFrontier_BattlePikeThreePathRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePike - - .align 2 -BattleFrontier_BattlePikeRandomRoom1_MapBorder: @ 8466F60 - .incbin "data/maps/BattleFrontier_BattlePikeRandomRoom1/border.bin" - - .align 2 -BattleFrontier_BattlePikeRandomRoom1_MapBlockdata: @ 8466F68 - .incbin "data/maps/BattleFrontier_BattlePikeRandomRoom1/map.bin" - - .align 2 -BattleFrontier_BattlePikeRandomRoom1_MapAttributes: @ 8466FF8 - .4byte 0x9 - .4byte 0x8 - .4byte BattleFrontier_BattlePikeRandomRoom1_MapBorder - .4byte BattleFrontier_BattlePikeRandomRoom1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePike - - .align 2 -BattleFrontier_BattlePikeRandomRoom2_MapBorder: @ 8467010 - .incbin "data/maps/BattleFrontier_BattlePikeRandomRoom2/border.bin" - - .align 2 -BattleFrontier_BattlePikeRandomRoom2_MapBlockdata: @ 8467018 - .incbin "data/maps/BattleFrontier_BattlePikeRandomRoom2/map.bin" - - .align 2 -BattleFrontier_BattlePikeRandomRoom2_MapAttributes: @ 8467068 - .4byte 0x5 - .4byte 0x8 - .4byte BattleFrontier_BattlePikeRandomRoom2_MapBorder - .4byte BattleFrontier_BattlePikeRandomRoom2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePike - - .align 2 -BattleFrontier_BattleArenaLobby_MapBorder: @ 8467080 - .incbin "data/maps/BattleFrontier_BattleArenaLobby/border.bin" - - .align 2 -BattleFrontier_BattleArenaLobby_MapBlockdata: @ 8467088 - .incbin "data/maps/BattleFrontier_BattleArenaLobby/map.bin" - - .align 2 -BattleFrontier_BattleArenaLobby_MapAttributes: @ 8467228 - .4byte 0x10 - .4byte 0xd - .4byte BattleFrontier_BattleArenaLobby_MapBorder - .4byte BattleFrontier_BattleArenaLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleArena - - .align 2 -BattleFrontier_BattleArenaCorridor_MapBorder: @ 8467240 - .incbin "data/maps/BattleFrontier_BattleArenaCorridor/border.bin" - - .align 2 -BattleFrontier_BattleArenaCorridor_MapBlockdata: @ 8467248 - .incbin "data/maps/BattleFrontier_BattleArenaCorridor/map.bin" - - .align 2 -BattleFrontier_BattleArenaCorridor_MapAttributes: @ 8467440 - .4byte 0x12 - .4byte 0xe - .4byte BattleFrontier_BattleArenaCorridor_MapBorder - .4byte BattleFrontier_BattleArenaCorridor_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleArena - - .align 2 -BattleFrontier_BattleArenaBattleRoom_MapBorder: @ 8467458 - .incbin "data/maps/BattleFrontier_BattleArenaBattleRoom/border.bin" - - .align 2 -BattleFrontier_BattleArenaBattleRoom_MapBlockdata: @ 8467460 - .incbin "data/maps/BattleFrontier_BattleArenaBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleArenaBattleRoom_MapAttributes: @ 84675C0 - .4byte 0x10 - .4byte 0xb - .4byte BattleFrontier_BattleArenaBattleRoom_MapBorder - .4byte BattleFrontier_BattleArenaBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleArena - - .align 2 -UnknownMapBorder_08469200: @ 84675D8 - .incbin "data/maps/UnknownMap_08469200/border.bin" - - .align 2 -UnknownMapBlockdata_08469200: @ 84675E0 - .incbin "data/maps/UnknownMap_08469200/map.bin" - - .align 2 -UnknownMapAttributes_08469200: @ 8469200 - .4byte 0x3C - .4byte 0x3C - .4byte UnknownMapBorder_08469200 - .4byte UnknownMapBlockdata_08469200 - .4byte gTileset_General - .4byte gTileset_Sootopolis - - .align 2 -BattleFrontier_BattlePikeRandomRoom3_MapBorder: @ 8469218 - .incbin "data/maps/BattleFrontier_BattlePikeRandomRoom3/border.bin" - - .align 2 -BattleFrontier_BattlePikeRandomRoom3_MapBlockdata: @ 8469220 - .incbin "data/maps/BattleFrontier_BattlePikeRandomRoom3/map.bin" - - .align 2 -BattleFrontier_BattlePikeRandomRoom3_MapAttributes: @ 8469388 - .4byte 0x9 - .4byte 0x14 - .4byte BattleFrontier_BattlePikeRandomRoom3_MapBorder - .4byte BattleFrontier_BattlePikeRandomRoom3_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePike - - .align 2 -UnknownMapBorder_084693AC: @ 84693A0 - .incbin "data/maps/UnknownMap_084693AC/border.bin" - - .align 2 -UnknownMapBlockdata_084693AC: @ 84693A8 - .incbin "data/maps/UnknownMap_084693AC/map.bin" - - .align 2 -UnknownMapAttributes_084693AC: @ 84693AC - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_084693AC - .4byte UnknownMapBlockdata_084693AC - .4byte gTileset_Building - .4byte gTileset_BattlePike - - .align 2 -BattleFrontier_BattlePyramidLobby_MapBorder: @ 84693C4 - .incbin "data/maps/BattleFrontier_BattlePyramidLobby/border.bin" - - .align 2 -BattleFrontier_BattlePyramidLobby_MapBlockdata: @ 84693CC - .incbin "data/maps/BattleFrontier_BattlePyramidLobby/map.bin" - - .align 2 -BattleFrontier_BattlePyramidLobby_MapAttributes: @ 84695E8 - .4byte 0xf - .4byte 0x12 - .4byte BattleFrontier_BattlePyramidLobby_MapBorder - .4byte BattleFrontier_BattlePyramidLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattleFrontier_BattlePyramidEmptySquare_MapBorder: @ 8469600 - .incbin "data/maps/BattleFrontier_BattlePyramidEmptySquare/border.bin" - - .align 2 -BattleFrontier_BattlePyramidEmptySquare_MapBlockdata: @ 8469608 - .incbin "data/maps/BattleFrontier_BattlePyramidEmptySquare/map.bin" - - .align 2 -BattleFrontier_BattlePyramidEmptySquare_MapAttributes: @ 8469688 - .4byte 0x8 - .4byte 0x8 - .4byte BattleFrontier_BattlePyramidEmptySquare_MapBorder - .4byte BattleFrontier_BattlePyramidEmptySquare_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare01_MapBorder: @ 84696A0 - .incbin "data/maps/BattlePyramidSquare01/border.bin" - - .align 2 -BattlePyramidSquare01_MapBlockdata: @ 84696A8 - .incbin "data/maps/BattlePyramidSquare01/map.bin" - - .align 2 -BattlePyramidSquare01_MapAttributes: @ 8469728 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare01_MapBorder - .4byte BattlePyramidSquare01_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare02_MapBorder: @ 8469740 - .incbin "data/maps/BattlePyramidSquare02/border.bin" - - .align 2 -BattlePyramidSquare02_MapBlockdata: @ 8469748 - .incbin "data/maps/BattlePyramidSquare02/map.bin" - - .align 2 -BattlePyramidSquare02_MapAttributes: @ 84697C8 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare02_MapBorder - .4byte BattlePyramidSquare02_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare03_MapBorder: @ 84697E0 - .incbin "data/maps/BattlePyramidSquare03/border.bin" - - .align 2 -BattlePyramidSquare03_MapBlockdata: @ 84697E8 - .incbin "data/maps/BattlePyramidSquare03/map.bin" - - .align 2 -BattlePyramidSquare03_MapAttributes: @ 8469868 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare03_MapBorder - .4byte BattlePyramidSquare03_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare04_MapBorder: @ 8469880 - .incbin "data/maps/BattlePyramidSquare04/border.bin" - - .align 2 -BattlePyramidSquare04_MapBlockdata: @ 8469888 - .incbin "data/maps/BattlePyramidSquare04/map.bin" - - .align 2 -BattlePyramidSquare04_MapAttributes: @ 8469908 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare04_MapBorder - .4byte BattlePyramidSquare04_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare05_MapBorder: @ 8469920 - .incbin "data/maps/BattlePyramidSquare05/border.bin" - - .align 2 -BattlePyramidSquare05_MapBlockdata: @ 8469928 - .incbin "data/maps/BattlePyramidSquare05/map.bin" - - .align 2 -BattlePyramidSquare05_MapAttributes: @ 84699A8 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare05_MapBorder - .4byte BattlePyramidSquare05_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare06_MapBorder: @ 84699C0 - .incbin "data/maps/BattlePyramidSquare06/border.bin" - - .align 2 -BattlePyramidSquare06_MapBlockdata: @ 84699C8 - .incbin "data/maps/BattlePyramidSquare06/map.bin" - - .align 2 -BattlePyramidSquare06_MapAttributes: @ 8469A48 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare06_MapBorder - .4byte BattlePyramidSquare06_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare07_MapBorder: @ 8469A60 - .incbin "data/maps/BattlePyramidSquare07/border.bin" - - .align 2 -BattlePyramidSquare07_MapBlockdata: @ 8469A68 - .incbin "data/maps/BattlePyramidSquare07/map.bin" - - .align 2 -BattlePyramidSquare07_MapAttributes: @ 8469AE8 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare07_MapBorder - .4byte BattlePyramidSquare07_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare08_MapBorder: @ 8469B00 - .incbin "data/maps/BattlePyramidSquare08/border.bin" - - .align 2 -BattlePyramidSquare08_MapBlockdata: @ 8469B08 - .incbin "data/maps/BattlePyramidSquare08/map.bin" - - .align 2 -BattlePyramidSquare08_MapAttributes: @ 8469B88 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare08_MapBorder - .4byte BattlePyramidSquare08_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare09_MapBorder: @ 8469BA0 - .incbin "data/maps/BattlePyramidSquare09/border.bin" - - .align 2 -BattlePyramidSquare09_MapBlockdata: @ 8469BA8 - .incbin "data/maps/BattlePyramidSquare09/map.bin" - - .align 2 -BattlePyramidSquare09_MapAttributes: @ 8469C28 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare09_MapBorder - .4byte BattlePyramidSquare09_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare10_MapBorder: @ 8469C40 - .incbin "data/maps/BattlePyramidSquare10/border.bin" - - .align 2 -BattlePyramidSquare10_MapBlockdata: @ 8469C48 - .incbin "data/maps/BattlePyramidSquare10/map.bin" - - .align 2 -BattlePyramidSquare10_MapAttributes: @ 8469CC8 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare10_MapBorder - .4byte BattlePyramidSquare10_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare11_MapBorder: @ 8469CE0 - .incbin "data/maps/BattlePyramidSquare11/border.bin" - - .align 2 -BattlePyramidSquare11_MapBlockdata: @ 8469CE8 - .incbin "data/maps/BattlePyramidSquare11/map.bin" - - .align 2 -BattlePyramidSquare11_MapAttributes: @ 8469D68 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare11_MapBorder - .4byte BattlePyramidSquare11_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare12_MapBorder: @ 8469D80 - .incbin "data/maps/BattlePyramidSquare12/border.bin" - - .align 2 -BattlePyramidSquare12_MapBlockdata: @ 8469D88 - .incbin "data/maps/BattlePyramidSquare12/map.bin" - - .align 2 -BattlePyramidSquare12_MapAttributes: @ 8469E08 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare12_MapBorder - .4byte BattlePyramidSquare12_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare13_MapBorder: @ 8469E20 - .incbin "data/maps/BattlePyramidSquare13/border.bin" - - .align 2 -BattlePyramidSquare13_MapBlockdata: @ 8469E28 - .incbin "data/maps/BattlePyramidSquare13/map.bin" - - .align 2 -BattlePyramidSquare13_MapAttributes: @ 8469EA8 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare13_MapBorder - .4byte BattlePyramidSquare13_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare14_MapBorder: @ 8469EC0 - .incbin "data/maps/BattlePyramidSquare14/border.bin" - - .align 2 -BattlePyramidSquare14_MapBlockdata: @ 8469EC8 - .incbin "data/maps/BattlePyramidSquare14/map.bin" - - .align 2 -BattlePyramidSquare14_MapAttributes: @ 8469F48 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare14_MapBorder - .4byte BattlePyramidSquare14_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare15_MapBorder: @ 8469F60 - .incbin "data/maps/BattlePyramidSquare15/border.bin" - - .align 2 -BattlePyramidSquare15_MapBlockdata: @ 8469F68 - .incbin "data/maps/BattlePyramidSquare15/map.bin" - - .align 2 -BattlePyramidSquare15_MapAttributes: @ 8469FE8 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare15_MapBorder - .4byte BattlePyramidSquare15_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare16_MapBorder: @ 846A000 - .incbin "data/maps/BattlePyramidSquare16/border.bin" - - .align 2 -BattlePyramidSquare16_MapBlockdata: @ 846A008 - .incbin "data/maps/BattlePyramidSquare16/map.bin" - - .align 2 -BattlePyramidSquare16_MapAttributes: @ 846A088 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare16_MapBorder - .4byte BattlePyramidSquare16_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattleFrontier_BattlePyramidTop_MapBorder: @ 846A0A0 - .incbin "data/maps/BattleFrontier_BattlePyramidTop/border.bin" - - .align 2 -BattleFrontier_BattlePyramidTop_MapBlockdata: @ 846A0A8 - .incbin "data/maps/BattleFrontier_BattlePyramidTop/map.bin" - - .align 2 -BattleFrontier_BattlePyramidTop_MapAttributes: @ 846A6C4 - .4byte 0x22 - .4byte 0x17 - .4byte BattleFrontier_BattlePyramidTop_MapBorder - .4byte BattleFrontier_BattlePyramidTop_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -MagmaHideout_3F_3R_MapBorder: @ 846A6DC - .incbin "data/maps/MagmaHideout_3F_3R/border.bin" - - .align 2 -MagmaHideout_3F_3R_MapBlockdata: @ 846A6E4 - .incbin "data/maps/MagmaHideout_3F_3R/map.bin" - - .align 2 -MagmaHideout_3F_3R_MapAttributes: @ 846AD14 - .4byte 0x21 - .4byte 0x18 - .4byte MagmaHideout_3F_3R_MapBorder - .4byte MagmaHideout_3F_3R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - - .align 2 -MagmaHideout_2F_3R_MapBorder: @ 846AD2C - .incbin "data/maps/MagmaHideout_2F_3R/border.bin" - - .align 2 -MagmaHideout_2F_3R_MapBlockdata: @ 846AD34 - .incbin "data/maps/MagmaHideout_2F_3R/map.bin" - - .align 2 -MagmaHideout_2F_3R_MapAttributes: @ 846B61C - .4byte 0x3c - .4byte 0x13 - .4byte MagmaHideout_2F_3R_MapBorder - .4byte MagmaHideout_2F_3R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - - .align 2 -MirageTower_1F_MapBorder: @ 846B634 - .incbin "data/maps/MirageTower_1F/border.bin" - - .align 2 -MirageTower_1F_MapBlockdata: @ 846B63C - .incbin "data/maps/MirageTower_1F/map.bin" - - .align 2 -MirageTower_1F_MapAttributes: @ 846B908 - .4byte 0x15 - .4byte 0x11 - .4byte MirageTower_1F_MapBorder - .4byte MirageTower_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MirageTower - - .align 2 -MirageTower_2F_MapBorder: @ 846B920 - .incbin "data/maps/MirageTower_2F/border.bin" - - .align 2 -MirageTower_2F_MapBlockdata: @ 846B928 - .incbin "data/maps/MirageTower_2F/map.bin" - - .align 2 -MirageTower_2F_MapAttributes: @ 846BBF4 - .4byte 0x15 - .4byte 0x11 - .4byte MirageTower_2F_MapBorder - .4byte MirageTower_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MirageTower - - .align 2 -MirageTower_3F_MapBorder: @ 846BC0C - .incbin "data/maps/MirageTower_3F/border.bin" - - .align 2 -MirageTower_3F_MapBlockdata: @ 846BC14 - .incbin "data/maps/MirageTower_3F/map.bin" - - .align 2 -MirageTower_3F_MapAttributes: @ 846BEE0 - .4byte 0x15 - .4byte 0x11 - .4byte MirageTower_3F_MapBorder - .4byte MirageTower_3F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MirageTower - - .align 2 -FallarborTown_BattleTentLobby_MapBorder: @ 846BEF8 - .incbin "data/maps/FallarborTown_BattleTentLobby/border.bin" - - .align 2 -FallarborTown_BattleTentLobby_MapBlockdata: @ 846BF00 - .incbin "data/maps/FallarborTown_BattleTentLobby/map.bin" - - .align 2 -FallarborTown_BattleTentLobby_MapAttributes: @ 846C004 -SlateportCity_BattleTentLobby_MapAttributes: @ 846C004 -VerdanturfTown_BattleTentLobby_MapAttributes: @ 846C004 - .4byte 0xd - .4byte 0xa - .4byte FallarborTown_BattleTentLobby_MapBorder - .4byte FallarborTown_BattleTentLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleTent - - .align 2 -FallarborTown_BattleTentCorridor_MapBorder: @ 846C01C - .incbin "data/maps/FallarborTown_BattleTentCorridor/border.bin" - - .align 2 -FallarborTown_BattleTentCorridor_MapBlockdata: @ 846C024 - .incbin "data/maps/FallarborTown_BattleTentCorridor/map.bin" - - .align 2 -FallarborTown_BattleTentCorridor_MapAttributes: @ 846C074 -SlateportCity_BattleTentCorridor_MapAttributes: @ 846C074 -VerdanturfTown_BattleTentCorridor_MapAttributes: @ 846C074 - .4byte 0x5 - .4byte 0x8 - .4byte FallarborTown_BattleTentCorridor_MapBorder - .4byte FallarborTown_BattleTentCorridor_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleTent - - .align 2 -FallarborTown_BattleTentBattleRoom_MapBorder: @ 846C08C - .incbin "data/maps/FallarborTown_BattleTentBattleRoom/border.bin" - - .align 2 -FallarborTown_BattleTentBattleRoom_MapBlockdata: @ 846C094 - .incbin "data/maps/FallarborTown_BattleTentBattleRoom/map.bin" - - .align 2 -FallarborTown_BattleTentBattleRoom_MapAttributes: @ 846C148 -SlateportCity_BattleTentBattleRoom_MapAttributes: @ 846C148 - .4byte 0xa - .4byte 0x9 - .4byte FallarborTown_BattleTentBattleRoom_MapBorder - .4byte FallarborTown_BattleTentBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleTent - - .align 2 -VerdanturfTown_BattleTentBattleRoom_MapBorder: @ 846C160 - .incbin "data/maps/VerdanturfTown_BattleTentBattleRoom/border.bin" - - .align 2 -VerdanturfTown_BattleTentBattleRoom_MapBlockdata: @ 846C168 - .incbin "data/maps/VerdanturfTown_BattleTentBattleRoom/map.bin" - - .align 2 -VerdanturfTown_BattleTentBattleRoom_MapAttributes: @ 846C254 - .4byte 0xd - .4byte 0x9 - .4byte VerdanturfTown_BattleTentBattleRoom_MapBorder - .4byte VerdanturfTown_BattleTentBattleRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BattleTent - - .align 2 -MirageTower_4F_MapBorder: @ 846C26C - .incbin "data/maps/MirageTower_4F/border.bin" - - .align 2 -MirageTower_4F_MapBlockdata: @ 846C274 - .incbin "data/maps/MirageTower_4F/map.bin" - - .align 2 -MirageTower_4F_MapAttributes: @ 846C378 - .4byte 0xd - .4byte 0xa - .4byte MirageTower_4F_MapBorder - .4byte MirageTower_4F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MirageTower - - .align 2 -DesertUnderpass_MapBorder: @ 846C390 - .incbin "data/maps/DesertUnderpass/border.bin" - - .align 2 -DesertUnderpass_MapBlockdata: @ 846C398 - .incbin "data/maps/DesertUnderpass/map.bin" - - .align 2 -DesertUnderpass_MapAttributes: @ 846DC94 - .4byte 0x8b - .4byte 0x17 - .4byte DesertUnderpass_MapBorder - .4byte DesertUnderpass_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -BattleFrontier_BattleTowerMultiBattleRoom_MapBorder: @ 846DCAC - .incbin "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/border.bin" - - .align 2 -BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata: @ 846DCB4 - .incbin "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleTowerMultiBattleRoom_MapAttributes: @ 846DF2C - .4byte 0x15 - .4byte 0xf - .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapBorder - .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - - .align 2 -BattleFrontier_BattleTowerCorridor2_MapBorder: @ 846DF44 - .incbin "data/maps/BattleFrontier_BattleTowerCorridor2/border.bin" - - .align 2 -BattleFrontier_BattleTowerCorridor2_MapBlockdata: @ 846DF4C - .incbin "data/maps/BattleFrontier_BattleTowerCorridor2/map.bin" - - .align 2 -BattleFrontier_BattleTowerCorridor2_MapAttributes: @ 846DFF8 - .4byte 0x11 - .4byte 0x5 - .4byte BattleFrontier_BattleTowerCorridor2_MapBorder - .4byte BattleFrontier_BattleTowerCorridor2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - - .align 2 -UnknownMapBorder_08470BD8: @ 846E010 - .incbin "data/maps/UnknownMap_08470BD8/border.bin" - - .align 2 -UnknownMapBlockdata_08470BD8: @ 846E018 - .incbin "data/maps/UnknownMap_08470BD8/map.bin" - - .align 2 -UnknownMapAttributes_08470BD8: @ 8470BD8 - .4byte 0x28 - .4byte 0x8C - .4byte UnknownMapBorder_08470BD8 - .4byte UnknownMapBlockdata_08470BD8 - .4byte gTileset_General - .4byte gTileset_Mauville - - .align 2 -UnionRoom_MapBorder: @ 8470BF0 - .incbin "data/maps/UnionRoom/border.bin" - - .align 2 -UnionRoom_MapBlockdata: @ 8470BF8 - .incbin "data/maps/UnionRoom/map.bin" - - .align 2 -UnionRoom_MapAttributes: @ 8470D60 - .4byte 0xf - .4byte 0xc - .4byte UnionRoom_MapBorder - .4byte UnionRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_UnionRoom - - .align 2 -SafariZone_Northeast_MapBorder: @ 8470D78 - .incbin "data/maps/SafariZone_Northeast/border.bin" - - .align 2 -SafariZone_Northeast_MapBlockdata: @ 8470D80 - .incbin "data/maps/SafariZone_Northeast/map.bin" - - .align 2 -SafariZone_Northeast_MapAttributes: @ 8471A00 - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_Northeast_MapBorder - .4byte SafariZone_Northeast_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - - .align 2 -SafariZone_Southeast_MapBorder: @ 8471A18 - .incbin "data/maps/SafariZone_Southeast/border.bin" - - .align 2 -SafariZone_Southeast_MapBlockdata: @ 8471A20 - .incbin "data/maps/SafariZone_Southeast/map.bin" - - .align 2 -SafariZone_Southeast_MapAttributes: @ 84726A0 - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_Southeast_MapBorder - .4byte SafariZone_Southeast_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - - .align 2 -BattleFrontier_RankingHall_MapBorder: @ 84726B8 - .incbin "data/maps/BattleFrontier_RankingHall/border.bin" - - .align 2 -BattleFrontier_RankingHall_MapBlockdata: @ 84726C0 - .incbin "data/maps/BattleFrontier_RankingHall/map.bin" - - .align 2 -BattleFrontier_RankingHall_MapAttributes: @ 8472CF8 - .4byte 0x35 - .4byte 0xf - .4byte BattleFrontier_RankingHall_MapBorder - .4byte BattleFrontier_RankingHall_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontierRankingHall - - .align 2 -BattleFrontier_Lounge2_MapBorder: @ 8472D10 - .incbin "data/maps/BattleFrontier_Lounge2/border.bin" - - .align 2 -BattleFrontier_Lounge2_MapBlockdata: @ 8472D18 - .incbin "data/maps/BattleFrontier_Lounge2/map.bin" - - .align 2 -BattleFrontier_Lounge2_MapAttributes: @ 8472DE8 -BattleFrontier_Lounge5_MapAttributes: @ 8472DE8 - .4byte 0xd - .4byte 0x8 - .4byte BattleFrontier_Lounge2_MapBorder - .4byte BattleFrontier_Lounge2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - - .align 2 -BattleFrontier_BattlePointExchangeServiceCorner_MapBorder: @ 8472E00 - .incbin "data/maps/BattleFrontier_BattlePointExchangeServiceCorner/border.bin" - - .align 2 -BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata: @ 8472E08 - .incbin "data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.bin" - - .align 2 -BattleFrontier_BattlePointExchangeServiceCorner_MapAttributes: @ 8472F54 - .4byte 0xf - .4byte 0xb - .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapBorder - .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - - .align 2 -BattleFrontier_ReceptionGate_MapBorder: @ 8472F6C - .incbin "data/maps/BattleFrontier_ReceptionGate/border.bin" - - .align 2 -BattleFrontier_ReceptionGate_MapBlockdata: @ 8472F74 - .incbin "data/maps/BattleFrontier_ReceptionGate/map.bin" - - .align 2 -BattleFrontier_ReceptionGate_MapAttributes: @ 8473070 - .4byte 0x9 - .4byte 0xe - .4byte BattleFrontier_ReceptionGate_MapBorder - .4byte BattleFrontier_ReceptionGate_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BattleFrontier - - .align 2 -ArtisanCave_B1F_MapBorder: @ 8473088 - .incbin "data/maps/ArtisanCave_B1F/border.bin" - - .align 2 -ArtisanCave_B1F_MapBlockdata: @ 8473090 - .incbin "data/maps/ArtisanCave_B1F/map.bin" - - .align 2 -ArtisanCave_B1F_MapAttributes: @ 84743F8 - .4byte 0x2e - .4byte 0x36 - .4byte ArtisanCave_B1F_MapBorder - .4byte ArtisanCave_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -ArtisanCave_1F_MapBorder: @ 8474410 - .incbin "data/maps/ArtisanCave_1F/border.bin" - - .align 2 -ArtisanCave_1F_MapBlockdata: @ 8474418 - .incbin "data/maps/ArtisanCave_1F/map.bin" - - .align 2 -ArtisanCave_1F_MapAttributes: @ 84747B4 - .4byte 0x15 - .4byte 0x16 - .4byte ArtisanCave_1F_MapBorder - .4byte ArtisanCave_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -FarawayIsland_Entrance_MapBorder: @ 84747CC - .incbin "data/maps/FarawayIsland_Entrance/border.bin" - - .align 2 -FarawayIsland_Entrance_MapBlockdata: @ 84747D4 - .incbin "data/maps/FarawayIsland_Entrance/map.bin" - - .align 2 -FarawayIsland_Entrance_MapAttributes: @ 847540C - .4byte 0x22 - .4byte 0x2e - .4byte FarawayIsland_Entrance_MapBorder - .4byte FarawayIsland_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - - .align 2 -FarawayIsland_Interior_MapBorder: @ 8475424 - .incbin "data/maps/FarawayIsland_Interior/border.bin" - - .align 2 -FarawayIsland_Interior_MapBlockdata: @ 847542C - .incbin "data/maps/FarawayIsland_Interior/map.bin" - - .align 2 -FarawayIsland_Interior_MapAttributes: @ 8475A10 - .4byte 0x1d - .4byte 0x1a - .4byte FarawayIsland_Interior_MapBorder - .4byte FarawayIsland_Interior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fortree - - .align 2 -BirthIsland_Exterior_MapBorder: @ 8475A28 - .incbin "data/maps/BirthIsland_Exterior/border.bin" - - .align 2 -BirthIsland_Exterior_MapBlockdata: @ 8475A30 - .incbin "data/maps/BirthIsland_Exterior/map.bin" - - .align 2 -BirthIsland_Exterior_MapAttributes: @ 8476138 - .4byte 0x1e - .4byte 0x1e - .4byte BirthIsland_Exterior_MapBorder - .4byte BirthIsland_Exterior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - - .align 2 -BirthIsland_Harbor_MapBorder: @ 8476150 - .incbin "data/maps/BirthIsland_Harbor/border.bin" - - .align 2 -BirthIsland_Harbor_MapBlockdata: @ 8476158 - .incbin "data/maps/BirthIsland_Harbor/map.bin" - - .align 2 -BirthIsland_Harbor_MapAttributes: @ 8476314 -NavelRock_Harbor_MapAttributes: @ 8476314 - .4byte 0x11 - .4byte 0xd - .4byte BirthIsland_Harbor_MapBorder - .4byte BirthIsland_Harbor_MapBlockdata - .4byte gTileset_General - .4byte gTileset_IslandHarbor - - .align 2 -Underwater_MarineCave_MapBorder: @ 847632C - .incbin "data/maps/Underwater_MarineCave/border.bin" - - .align 2 -Underwater_MarineCave_MapBlockdata: @ 8476334 - .incbin "data/maps/Underwater_MarineCave/map.bin" - - .align 2 -Underwater_MarineCave_MapAttributes: @ 84764C4 - .4byte 0x14 - .4byte 0xa - .4byte Underwater_MarineCave_MapBorder - .4byte Underwater_MarineCave_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - - .align 2 -MarineCave_Entrance_MapBorder: @ 84764DC - .incbin "data/maps/MarineCave_Entrance/border.bin" - - .align 2 -MarineCave_Entrance_MapBlockdata: @ 84764E4 - .incbin "data/maps/MarineCave_Entrance/map.bin" - - .align 2 -MarineCave_Entrance_MapAttributes: @ 8476804 - .4byte 0x14 - .4byte 0x14 - .4byte MarineCave_Entrance_MapBorder - .4byte MarineCave_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -TerraCave_Entrance_MapBorder: @ 847681C - .incbin "data/maps/TerraCave_Entrance/border.bin" - - .align 2 -TerraCave_Entrance_MapBlockdata: @ 8476824 - .incbin "data/maps/TerraCave_Entrance/map.bin" - - .align 2 -TerraCave_Entrance_MapAttributes: @ 8476B44 - .4byte 0x14 - .4byte 0x14 - .4byte TerraCave_Entrance_MapBorder - .4byte TerraCave_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -TerraCave_End_MapBorder: @ 8476B5C - .incbin "data/maps/TerraCave_End/border.bin" - - .align 2 -TerraCave_End_MapBlockdata: @ 8476B64 - .incbin "data/maps/TerraCave_End/map.bin" - - .align 2 -TerraCave_End_MapAttributes: @ 84771B8 - .4byte 0x1b - .4byte 0x1e - .4byte TerraCave_End_MapBorder - .4byte TerraCave_End_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -Underwater6_MapBorder: @ 84771D0 - .incbin "data/maps/Underwater6/border.bin" - - .align 2 -Underwater6_MapBlockdata: @ 84771D8 - .incbin "data/maps/Underwater6/map.bin" - - .align 2 -Underwater6_MapAttributes: @ 8478AD8 - .4byte 0x28 - .4byte 0x50 - .4byte Underwater6_MapBorder - .4byte Underwater6_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - - .align 2 -Underwater7_MapBorder: @ 8478AF0 - .incbin "data/maps/Underwater7/border.bin" - - .align 2 -Underwater7_MapBlockdata: @ 8478AF8 - .incbin "data/maps/Underwater7/map.bin" - - .align 2 -Underwater7_MapAttributes: @ 847A3F8 - .4byte 0x50 - .4byte 0x28 - .4byte Underwater7_MapBorder - .4byte Underwater7_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - - .align 2 -Underwater5_MapBorder: @ 847A410 - .incbin "data/maps/Underwater5/border.bin" - - .align 2 -Underwater5_MapBlockdata: @ 847A418 - .incbin "data/maps/Underwater5/map.bin" - - .align 2 -Underwater5_MapAttributes: @ 847BD18 - .4byte 0x50 - .4byte 0x28 - .4byte Underwater5_MapBorder - .4byte Underwater5_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - - .align 2 -MarineCave_End_MapBorder: @ 847BD30 - .incbin "data/maps/MarineCave_End/border.bin" - - .align 2 -MarineCave_End_MapBlockdata: @ 847BD38 - .incbin "data/maps/MarineCave_End/map.bin" - - .align 2 -MarineCave_End_MapAttributes: @ 847C38C - .4byte 0x1b - .4byte 0x1e - .4byte MarineCave_End_MapBorder - .4byte MarineCave_End_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -TrainerHill_Entrance_MapBorder: @ 847C3A4 - .incbin "data/maps/TrainerHill_Entrance/border.bin" - - .align 2 -TrainerHill_Entrance_MapBlockdata: @ 847C3AC - .incbin "data/maps/TrainerHill_Entrance/map.bin" - - .align 2 -TrainerHill_Entrance_MapAttributes: @ 847C634 - .4byte 0x13 - .4byte 0x11 - .4byte TrainerHill_Entrance_MapBorder - .4byte TrainerHill_Entrance_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrainerHill - - .align 2 -TrainerHill_1F_MapBorder: @ 847C64C - .incbin "data/maps/TrainerHill_1F/border.bin" - - .align 2 -TrainerHill_1F_MapBlockdata: @ 847C654 - .incbin "data/maps/TrainerHill_1F/map.bin" - - .align 2 -TrainerHill_1F_MapAttributes: @ 847C8F4 - .4byte 0x10 - .4byte 0x15 - .4byte TrainerHill_1F_MapBorder - .4byte TrainerHill_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrainerHill - - .align 2 -TrainerHill_2F_MapBorder: @ 847C90C - .incbin "data/maps/TrainerHill_2F/border.bin" - - .align 2 -TrainerHill_2F_MapBlockdata: @ 847C914 - .incbin "data/maps/TrainerHill_2F/map.bin" - - .align 2 -TrainerHill_2F_MapAttributes: @ 847CBB4 - .4byte 0x10 - .4byte 0x15 - .4byte TrainerHill_2F_MapBorder - .4byte TrainerHill_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrainerHill - - .align 2 -TrainerHill_3F_MapBorder: @ 847CBCC - .incbin "data/maps/TrainerHill_3F/border.bin" - - .align 2 -TrainerHill_3F_MapBlockdata: @ 847CBD4 - .incbin "data/maps/TrainerHill_3F/map.bin" - - .align 2 -TrainerHill_3F_MapAttributes: @ 847CE74 - .4byte 0x10 - .4byte 0x15 - .4byte TrainerHill_3F_MapBorder - .4byte TrainerHill_3F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrainerHill - - .align 2 -TrainerHill_4F_MapBorder: @ 847CE8C - .incbin "data/maps/TrainerHill_4F/border.bin" - - .align 2 -TrainerHill_4F_MapBlockdata: @ 847CE94 - .incbin "data/maps/TrainerHill_4F/map.bin" - - .align 2 -TrainerHill_4F_MapAttributes: @ 847D134 - .4byte 0x10 - .4byte 0x15 - .4byte TrainerHill_4F_MapBorder - .4byte TrainerHill_4F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrainerHill - - .align 2 -TrainerHill_Roof_MapBorder: @ 847D14C - .incbin "data/maps/TrainerHill_Roof/border.bin" - - .align 2 -TrainerHill_Roof_MapBlockdata: @ 847D154 - .incbin "data/maps/TrainerHill_Roof/map.bin" - - .align 2 -TrainerHill_Roof_MapAttributes: @ 847D474 - .4byte 0x19 - .4byte 0x10 - .4byte TrainerHill_Roof_MapBorder - .4byte TrainerHill_Roof_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrainerHill - - .align 2 -AlteringCave_MapBorder: @ 847D48C - .incbin "data/maps/AlteringCave/border.bin" - - .align 2 -AlteringCave_MapBlockdata: @ 847D494 - .incbin "data/maps/AlteringCave/map.bin" - - .align 2 -AlteringCave_MapAttributes: @ 847DA94 - .4byte 0x20 - .4byte 0x18 - .4byte AlteringCave_MapBorder - .4byte AlteringCave_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -NavelRock_Exterior_MapBorder: @ 847DAAC - .incbin "data/maps/NavelRock_Exterior/border.bin" - - .align 2 -NavelRock_Exterior_MapBlockdata: @ 847DAB4 - .incbin "data/maps/NavelRock_Exterior/map.bin" - - .align 2 -NavelRock_Exterior_MapAttributes: @ 847DEA4 - .4byte 0x15 - .4byte 0x18 - .4byte NavelRock_Exterior_MapBorder - .4byte NavelRock_Exterior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - - .align 2 -NavelRock_Entrance_MapBorder: @ 847DEBC - .incbin "data/maps/NavelRock_Entrance/border.bin" - - .align 2 -NavelRock_Entrance_MapBlockdata: @ 847DEC4 - .incbin "data/maps/NavelRock_Entrance/map.bin" - - .align 2 -NavelRock_Entrance_MapAttributes: @ 847E404 - .4byte 0x15 - .4byte 0x20 - .4byte NavelRock_Entrance_MapBorder - .4byte NavelRock_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_NavelRock - - .align 2 -NavelRock_Top_MapBorder: @ 847E41C - .incbin "data/maps/NavelRock_Top/border.bin" - - .align 2 -NavelRock_Top_MapBlockdata: @ 847E424 - .incbin "data/maps/NavelRock_Top/map.bin" - - .align 2 -NavelRock_Top_MapAttributes: @ 847E99C - .4byte 0x19 - .4byte 0x1c - .4byte NavelRock_Top_MapBorder - .4byte NavelRock_Top_MapBlockdata - .4byte gTileset_General - .4byte gTileset_NavelRock - - .align 2 -NavelRock_Bottom_MapBorder: @ 847E9B4 - .incbin "data/maps/NavelRock_Bottom/border.bin" - - .align 2 -NavelRock_Bottom_MapBlockdata: @ 847E9BC - .incbin "data/maps/NavelRock_Bottom/map.bin" - - .align 2 -NavelRock_Bottom_MapAttributes: @ 847ED84 - .4byte 0x16 - .4byte 0x16 - .4byte NavelRock_Bottom_MapBorder - .4byte NavelRock_Bottom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_NavelRock - - .align 2 -NavelRock_Up1_MapBorder: @ 847ED9C - .incbin "data/maps/NavelRock_Up1/border.bin" - - .align 2 -NavelRock_Up1_MapBlockdata: @ 847EDA4 - .incbin "data/maps/NavelRock_Up1/map.bin" - - .align 2 -NavelRock_Down01_MapAttributes: @ 847EE34 -NavelRock_Down03_MapAttributes: @ 847EE34 -NavelRock_Down05_MapAttributes: @ 847EE34 -NavelRock_Down07_MapAttributes: @ 847EE34 -NavelRock_Down09_MapAttributes: @ 847EE34 -NavelRock_Down11_MapAttributes: @ 847EE34 -NavelRock_Up1_MapAttributes: @ 847EE34 -NavelRock_Up3_MapAttributes: @ 847EE34 - .4byte 0x9 - .4byte 0x8 - .4byte NavelRock_Up1_MapBorder - .4byte NavelRock_Up1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_NavelRock - - .align 2 -NavelRock_Up2_MapBorder: @ 847EE4C - .incbin "data/maps/NavelRock_Up2/border.bin" - - .align 2 -NavelRock_Up2_MapBlockdata: @ 847EE54 - .incbin "data/maps/NavelRock_Up2/map.bin" - - .align 2 -NavelRock_Down02_MapAttributes: @ 847EEE4 -NavelRock_Down04_MapAttributes: @ 847EEE4 -NavelRock_Down06_MapAttributes: @ 847EEE4 -NavelRock_Down08_MapAttributes: @ 847EEE4 -NavelRock_Down10_MapAttributes: @ 847EEE4 -NavelRock_Up2_MapAttributes: @ 847EEE4 -NavelRock_Up4_MapAttributes: @ 847EEE4 - .4byte 0x9 - .4byte 0x8 - .4byte NavelRock_Up2_MapBorder - .4byte NavelRock_Up2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_NavelRock - - .align 2 -NavelRock_B1F_MapBorder: @ 847EEFC - .incbin "data/maps/NavelRock_B1F/border.bin" - - .align 2 -NavelRock_B1F_MapBlockdata: @ 847EF04 - .incbin "data/maps/NavelRock_B1F/map.bin" - - .align 2 -NavelRock_B1F_MapAttributes: @ 847F100 - .4byte 0x17 - .4byte 0xb - .4byte NavelRock_B1F_MapBorder - .4byte NavelRock_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_NavelRock - - .align 2 -NavelRock_Fork_MapBorder: @ 847F118 - .incbin "data/maps/NavelRock_Fork/border.bin" - - .align 2 -NavelRock_Fork_MapBlockdata: @ 847F120 - .incbin "data/maps/NavelRock_Fork/map.bin" - - .align 2 -NavelRock_Fork_MapAttributes: @ 8480344 - .4byte 0x1b - .4byte 0x56 - .4byte NavelRock_Fork_MapBorder - .4byte NavelRock_Fork_MapBlockdata - .4byte gTileset_General - .4byte gTileset_NavelRock - - .align 2 -BattleFrontier_Lounge1_MapBorder: @ 848035C - .incbin "data/maps/BattleFrontier_Lounge1/border.bin" - - .align 2 -BattleFrontier_Lounge1_MapBlockdata: @ 8480364 - .incbin "data/maps/BattleFrontier_Lounge1/map.bin" - - .align 2 -BattleFrontier_Lounge1_MapAttributes: @ 8480418 -BattleFrontier_Lounge3_MapAttributes: @ 8480418 -BattleFrontier_Lounge4_MapAttributes: @ 8480418 -BattleFrontier_Lounge6_MapAttributes: @ 8480418 -BattleFrontier_Lounge7_MapAttributes: @ 8480418 -BattleFrontier_Lounge8_MapAttributes: @ 8480418 -BattleFrontier_Lounge9_MapAttributes: @ 8480418 - .4byte 0x9 - .4byte 0xa - .4byte BattleFrontier_Lounge1_MapBorder - .4byte BattleFrontier_Lounge1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - - .align 2 -BattleFrontier_ScottsHouse_MapBorder: @ 8480430 - .incbin "data/maps/BattleFrontier_ScottsHouse/border.bin" - - .align 2 -BattleFrontier_ScottsHouse_MapBlockdata: @ 8480438 - .incbin "data/maps/BattleFrontier_ScottsHouse/map.bin" - - .align 2 -BattleFrontier_ScottsHouse_MapAttributes: @ 8480498 - .4byte 0x6 - .4byte 0x8 - .4byte BattleFrontier_ScottsHouse_MapBorder - .4byte BattleFrontier_ScottsHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - - .align 2 -MeteorFalls_StevensCave_MapBorder: @ 84804B0 - .incbin "data/maps/MeteorFalls_StevensCave/border.bin" - - .align 2 -MeteorFalls_StevensCave_MapBlockdata: @ 84804B8 - .incbin "data/maps/MeteorFalls_StevensCave/map.bin" - - .align 2 -MeteorFalls_StevensCave_MapAttributes: @ 8480C38 - .4byte 0x1e - .4byte 0x20 - .4byte MeteorFalls_StevensCave_MapBorder - .4byte MeteorFalls_StevensCave_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MeteorFalls - - .align 2 -UnknownMapBorder_08480DAC: @ 8480C50 - .incbin "data/maps/UnknownMap_08480DAC/border.bin" - - .align 2 -UnknownMapBlockdata_08480DAC: @ 8480C58 - .incbin "data/maps/UnknownMap_08480DAC/map.bin" - - .align 2 -UnknownMapAttributes_08480DAC: @ 8480DAC - .4byte 0xD - .4byte 0xD - .4byte UnknownMapBorder_08480DAC - .4byte UnknownMapBlockdata_08480DAC - .4byte gTileset_Building - .4byte gTileset_Lab - - .align 2 -UnknownMapBorder_08480F54: @ 8480DC4 - .incbin "data/maps/UnknownMap_08480F54/border.bin" - - .align 2 -UnknownMapBlockdata_08480F54: @ 8480DCC - .incbin "data/maps/UnknownMap_08480F54/map.bin" - - .align 2 -UnknownMapAttributes_08480F54: @ 8480F54 - .4byte 0xE - .4byte 0xE - .4byte UnknownMapBorder_08480F54 - .4byte UnknownMapBlockdata_08480F54 - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -UnknownMapBorder_084810FC: @ 8480F6C - .incbin "data/maps/UnknownMap_084810FC/border.bin" - - .align 2 -UnknownMapBlockdata_084810FC: @ 8480F74 - .incbin "data/maps/UnknownMap_084810FC/map.bin" - - .align 2 -UnknownMapAttributes_084810FC: @ 84810FC - .4byte 0xE - .4byte 0xE - .4byte UnknownMapBorder_084810FC - .4byte UnknownMapBlockdata_084810FC - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -UnknownMapBorder_084812A4: @ 8480F6C - .incbin "data/maps/UnknownMap_084812A4/border.bin" - - .align 2 -UnknownMapBlockdata_084812A4: @ 8480F74 - .incbin "data/maps/UnknownMap_084812A4/map.bin" - - .align 2 -UnknownMapAttributes_084812A4: @ 84812A4 - .4byte 0xE - .4byte 0xE - .4byte UnknownMapBorder_084812A4 - .4byte UnknownMapBlockdata_084812A4 - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -UnknownMapBorder_0848144C: @ 848144C - .incbin "data/maps/UnknownMap_0848144C/border.bin" - - .align 2 -UnknownMapBlockdata_0848144C: @ 848144C - .incbin "data/maps/UnknownMap_0848144C/map.bin" - - .align 2 -UnknownMapAttributes_0848144C: @ 848144C - .4byte 0xE - .4byte 0xE - .4byte UnknownMapBorder_0848144C - .4byte UnknownMapBlockdata_0848144C - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -UnknownMapBorder_084815F4: @ 848144C - .incbin "data/maps/UnknownMap_084815F4/border.bin" - - .align 2 -UnknownMapBlockdata_084815F4: @ 848144C - .incbin "data/maps/UnknownMap_084815F4/map.bin" - - .align 2 -UnknownMapAttributes_084815F4: @ 84815F4 - .4byte 0xE - .4byte 0xE - .4byte UnknownMapBorder_084815F4 - .4byte UnknownMapBlockdata_084815F4 - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -UnknownMapBorder_08481B24: @ 848160C - .incbin "data/maps/UnknownMap_08481B24/border.bin" - - .align 2 -UnknownMapBlockdata_08481B24: @ 8481614 - .incbin "data/maps/UnknownMap_08481B24/map.bin" - - .align 2 -UnknownMapAttributes_08481B24: @ 8481B24 - .4byte 0x1B - .4byte 0x18 - .4byte UnknownMapBorder_08481B24 - .4byte UnknownMapBlockdata_08481B24 - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -SootopolisCity_MysteryEventsHouse_1F_MapBorder: @ 8481B3C - .incbin "data/maps/SootopolisCity_MysteryEventsHouse_1F/border.bin" - - .align 2 -SootopolisCity_MysteryEventsHouse_1F_MapBlockdata: @ 8481B44 - .incbin "data/maps/SootopolisCity_MysteryEventsHouse_1F/map.bin" - - .align 2 -SootopolisCity_MysteryEventsHouse_1F_MapAttributes: @ 8481BF4 - .4byte 0xb - .4byte 0x8 - .4byte SootopolisCity_MysteryEventsHouse_1F_MapBorder - .4byte SootopolisCity_MysteryEventsHouse_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MysteryEventsHouse - - .align 2 -SootopolisCity_MysteryEventsHouse_B1F_MapBorder: @ 8481C0C - .incbin "data/maps/SootopolisCity_MysteryEventsHouse_B1F/border.bin" - - .align 2 -SootopolisCity_MysteryEventsHouse_B1F_MapBlockdata: @ 8481C14 - .incbin "data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.bin" - - .align 2 -SootopolisCity_MysteryEventsHouse_B1F_MapAttributes: @ 8481CEC - .4byte 0xc - .4byte 0x9 - .4byte SootopolisCity_MysteryEventsHouse_B1F_MapBorder - .4byte SootopolisCity_MysteryEventsHouse_B1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MysteryEventsHouse - - .align 2 -UnknownMapBorder_08481DBC: @ 8481D04 - .incbin "data/maps/UnknownMap_08481DBC/border.bin" - - .align 2 -UnknownMapBlockdata_08481DBC: @ 8481D0C - .incbin "data/maps/UnknownMap_08481DBC/map.bin" - - .align 2 -UnknownMapAttributes_08481DBC: @ 8481DBC - .4byte 0xB - .4byte 0x8 - .4byte UnknownMapBorder_08481DBC - .4byte UnknownMapBlockdata_08481DBC - .4byte gTileset_Building - .4byte gTileset_MysteryEventsHouse diff --git a/data/maps/_groups.inc b/data/maps/_groups.inc deleted file mode 100644 index f7fc7be89..000000000 --- a/data/maps/_groups.inc +++ /dev/null @@ -1,623 +0,0 @@ -gMapGroup0: @ 8485D60 - .4byte PetalburgCity - .4byte SlateportCity - .4byte MauvilleCity - .4byte RustboroCity - .4byte FortreeCity - .4byte LilycoveCity - .4byte MossdeepCity - .4byte SootopolisCity - .4byte EverGrandeCity - .4byte LittlerootTown - .4byte OldaleTown - .4byte DewfordTown - .4byte LavaridgeTown - .4byte FallarborTown - .4byte VerdanturfTown - .4byte PacifidlogTown - .4byte Route101 - .4byte Route102 - .4byte Route103 - .4byte Route104 - .4byte Route105 - .4byte Route106 - .4byte Route107 - .4byte Route108 - .4byte Route109 - .4byte Route110 - .4byte Route111 - .4byte Route112 - .4byte Route113 - .4byte Route114 - .4byte Route115 - .4byte Route116 - .4byte Route117 - .4byte Route118 - .4byte Route119 - .4byte Route120 - .4byte Route121 - .4byte Route122 - .4byte Route123 - .4byte Route124 - .4byte Route125 - .4byte Route126 - .4byte Route127 - .4byte Route128 - .4byte Route129 - .4byte Route130 - .4byte Route131 - .4byte Route132 - .4byte Route133 - .4byte Route134 - .4byte Underwater1 - .4byte Underwater2 - .4byte Underwater3 - .4byte Underwater4 - .4byte Underwater5 - .4byte Underwater6 - .4byte Underwater7 - -gMapGroup1: @ 8485E44 - .4byte LittlerootTown_BrendansHouse_1F - .4byte LittlerootTown_BrendansHouse_2F - .4byte LittlerootTown_MaysHouse_1F - .4byte LittlerootTown_MaysHouse_2F - .4byte LittlerootTown_ProfessorBirchsLab - -gMapGroup2: @ 8485E58 - .4byte OldaleTown_House1 - .4byte OldaleTown_House2 - .4byte OldaleTown_PokemonCenter_1F - .4byte OldaleTown_PokemonCenter_2F - .4byte OldaleTown_Mart - -gMapGroup3: @ 8485E6C - .4byte DewfordTown_House1 - .4byte DewfordTown_PokemonCenter_1F - .4byte DewfordTown_PokemonCenter_2F - .4byte DewfordTown_Gym - .4byte DewfordTown_Hall - .4byte DewfordTown_House2 - -gMapGroup4: @ 8485E84 - .4byte LavaridgeTown_HerbShop - .4byte LavaridgeTown_Gym_1F - .4byte LavaridgeTown_Gym_B1F - .4byte LavaridgeTown_House - .4byte LavaridgeTown_Mart - .4byte LavaridgeTown_PokemonCenter_1F - .4byte LavaridgeTown_PokemonCenter_2F - -gMapGroup5: @ 8485EA0 - .4byte FallarborTown_Mart - .4byte FallarborTown_BattleTentLobby - .4byte FallarborTown_BattleTentCorridor - .4byte FallarborTown_BattleTentBattleRoom - .4byte FallarborTown_PokemonCenter_1F - .4byte FallarborTown_PokemonCenter_2F - .4byte FallarborTown_House1 - .4byte FallarborTown_House2 - -gMapGroup6: @ 8485EC0 - .4byte VerdanturfTown_BattleTentLobby - .4byte VerdanturfTown_BattleTentCorridor - .4byte VerdanturfTown_BattleTentBattleRoom - .4byte VerdanturfTown_Mart - .4byte VerdanturfTown_PokemonCenter_1F - .4byte VerdanturfTown_PokemonCenter_2F - .4byte VerdanturfTown_WandasHouse - .4byte VerdanturfTown_FriendshipRatersHouse - .4byte VerdanturfTown_House - -gMapGroup7: @ 8485EE4 - .4byte PacifidlogTown_PokemonCenter_1F - .4byte PacifidlogTown_PokemonCenter_2F - .4byte PacifidlogTown_House1 - .4byte PacifidlogTown_House2 - .4byte PacifidlogTown_House3 - .4byte PacifidlogTown_House4 - .4byte PacifidlogTown_House5 - -gMapGroup8: @ 8485F00 - .4byte PetalburgCity_WallysHouse - .4byte PetalburgCity_Gym - .4byte PetalburgCity_House1 - .4byte PetalburgCity_House2 - .4byte PetalburgCity_PokemonCenter_1F - .4byte PetalburgCity_PokemonCenter_2F - .4byte PetalburgCity_Mart - -gMapGroup9: @ 8485F1C - .4byte SlateportCity_SternsShipyard_1F - .4byte SlateportCity_SternsShipyard_2F - .4byte SlateportCity_BattleTentLobby - .4byte SlateportCity_BattleTentCorridor - .4byte SlateportCity_BattleTentBattleRoom - .4byte SlateportCity_House1 - .4byte SlateportCity_PokemonFanClub - .4byte SlateportCity_OceanicMuseum_1F - .4byte SlateportCity_OceanicMuseum_2F - .4byte SlateportCity_Harbor - .4byte SlateportCity_House2 - .4byte SlateportCity_PokemonCenter_1F - .4byte SlateportCity_PokemonCenter_2F - .4byte SlateportCity_Mart - -gMapGroup10: @ 8485F54 - .4byte MauvilleCity_Gym - .4byte MauvilleCity_BikeShop - .4byte MauvilleCity_House1 - .4byte MauvilleCity_GameCorner - .4byte MauvilleCity_House2 - .4byte MauvilleCity_PokemonCenter_1F - .4byte MauvilleCity_PokemonCenter_2F - .4byte MauvilleCity_Mart - -gMapGroup11: @ 8485F74 - .4byte RustboroCity_DevonCorp_1F - .4byte RustboroCity_DevonCorp_2F - .4byte RustboroCity_DevonCorp_3F - .4byte RustboroCity_Gym - .4byte RustboroCity_PokemonSchool - .4byte RustboroCity_PokemonCenter_1F - .4byte RustboroCity_PokemonCenter_2F - .4byte RustboroCity_Mart - .4byte RustboroCity_Flat1_1F - .4byte RustboroCity_Flat1_2F - .4byte RustboroCity_House1 - .4byte RustboroCity_CuttersHouse - .4byte RustboroCity_House2 - .4byte RustboroCity_Flat2_1F - .4byte RustboroCity_Flat2_2F - .4byte RustboroCity_Flat2_3F - .4byte RustboroCity_House3 - -gMapGroup12: @ 8485FB8 - .4byte FortreeCity_House1 - .4byte FortreeCity_Gym - .4byte FortreeCity_PokemonCenter_1F - .4byte FortreeCity_PokemonCenter_2F - .4byte FortreeCity_Mart - .4byte FortreeCity_House2 - .4byte FortreeCity_House3 - .4byte FortreeCity_House4 - .4byte FortreeCity_House5 - .4byte FortreeCity_DecorationShop - -gMapGroup13: @ 8485FE0 - .4byte LilycoveCity_CoveLilyMotel_1F - .4byte LilycoveCity_CoveLilyMotel_2F - .4byte LilycoveCity_LilycoveMuseum_1F - .4byte LilycoveCity_LilycoveMuseum_2F - .4byte LilycoveCity_ContestLobby - .4byte LilycoveCity_ContestHall - .4byte LilycoveCity_PokemonCenter_1F - .4byte LilycoveCity_PokemonCenter_2F - .4byte LilycoveCity_UnusedMart - .4byte LilycoveCity_PokemonTrainerFanClub - .4byte LilycoveCity_Harbor - .4byte LilycoveCity_MoveDeletersHouse - .4byte LilycoveCity_House1 - .4byte LilycoveCity_House2 - .4byte LilycoveCity_House3 - .4byte LilycoveCity_House4 - .4byte LilycoveCity_DepartmentStore_1F - .4byte LilycoveCity_DepartmentStore_2F - .4byte LilycoveCity_DepartmentStore_3F - .4byte LilycoveCity_DepartmentStore_4F - .4byte LilycoveCity_DepartmentStore_5F - .4byte LilycoveCity_DepartmentStoreRooftop - .4byte LilycoveCity_DepartmentStoreElevator - -gMapGroup14: @ 848603C - .4byte MossdeepCity_Gym - .4byte MossdeepCity_House1 - .4byte MossdeepCity_House2 - .4byte MossdeepCity_PokemonCenter_1F - .4byte MossdeepCity_PokemonCenter_2F - .4byte MossdeepCity_Mart - .4byte MossdeepCity_House3 - .4byte MossdeepCity_StevensHouse - .4byte MossdeepCity_House4 - .4byte MossdeepCity_SpaceCenter_1F - .4byte MossdeepCity_SpaceCenter_2F - .4byte MossdeepCity_GameCorner_1F - .4byte MossdeepCity_GameCorner_B1F - -gMapGroup15: @ 8486070 - .4byte SootopolisCity_Gym_1F - .4byte SootopolisCity_Gym_B1F - .4byte SootopolisCity_PokemonCenter_1F - .4byte SootopolisCity_PokemonCenter_2F - .4byte SootopolisCity_Mart - .4byte SootopolisCity_House1 - .4byte SootopolisCity_House2 - .4byte SootopolisCity_House3 - .4byte SootopolisCity_House4 - .4byte SootopolisCity_House5 - .4byte SootopolisCity_House6 - .4byte SootopolisCity_House7 - .4byte SootopolisCity_LotadAndSeedotHouse - .4byte SootopolisCity_MysteryEventsHouse_1F - .4byte SootopolisCity_MysteryEventsHouse_B1F - -gMapGroup16: @ 84860AC - .4byte EverGrandeCity_SidneysRoom - .4byte EverGrandeCity_PhoebesRoom - .4byte EverGrandeCity_GlaciasRoom - .4byte EverGrandeCity_DrakesRoom - .4byte EverGrandeCity_ChampionsRoom - .4byte EverGrandeCity_Hall1 - .4byte EverGrandeCity_Hall2 - .4byte EverGrandeCity_Hall3 - .4byte EverGrandeCity_Hall4 - .4byte EverGrandeCity_Hall5 - .4byte EverGrandeCity_PokemonLeague_1F - .4byte EverGrandeCity_HallOfFame - .4byte EverGrandeCity_PokemonCenter_1F - .4byte EverGrandeCity_PokemonCenter_2F - .4byte EverGrandeCity_PokemonLeague_2F - -gMapGroup17: @ 84860E8 - .4byte Route104_MrBrineysHouse - .4byte Route104_PrettyPetalFlowerShop - -gMapGroup18: @ 84860F0 - .4byte Route111_WinstrateFamilysHouse - .4byte Route111_OldLadysRestStop - -gMapGroup19: @ 84860F8 - .4byte Route112_CableCarStation - .4byte MtChimney_CableCarStation - -gMapGroup20: @ 8486100 - .4byte Route114_FossilManiacsHouse - .4byte Route114_FossilManiacsTunnel - .4byte Route114_LanettesHouse - -gMapGroup21: @ 848610C - .4byte Route116_TunnelersRestHouse - -gMapGroup22: @ 8486110 - .4byte Route117_PokemonDayCare - -gMapGroup23: @ 8486114 - .4byte Route121_SafariZoneEntrance - -gMapGroup24: @ 8486118 - .4byte MeteorFalls_1F_1R - .4byte MeteorFalls_1F_2R - .4byte MeteorFalls_B1F_1R - .4byte MeteorFalls_B1F_2R - .4byte RusturfTunnel - .4byte Underwater_SootopolisCity - .4byte DesertRuins - .4byte GraniteCave_1F - .4byte GraniteCave_B1F - .4byte GraniteCave_B2F - .4byte GraniteCave_StevensRoom - .4byte PetalburgWoods - .4byte MtChimney - .4byte JaggedPass - .4byte FieryPath - .4byte MtPyre_1F - .4byte MtPyre_2F - .4byte MtPyre_3F - .4byte MtPyre_4F - .4byte MtPyre_5F - .4byte MtPyre_6F - .4byte MtPyre_Exterior - .4byte MtPyre_Summit - .4byte AquaHideout_1F - .4byte AquaHideout_B1F - .4byte AquaHideout_B2F - .4byte Underwater_SeafloorCavern - .4byte SeafloorCavern_Entrance - .4byte SeafloorCavern_Room1 - .4byte SeafloorCavern_Room2 - .4byte SeafloorCavern_Room3 - .4byte SeafloorCavern_Room4 - .4byte SeafloorCavern_Room5 - .4byte SeafloorCavern_Room6 - .4byte SeafloorCavern_Room7 - .4byte SeafloorCavern_Room8 - .4byte SeafloorCavern_Room9 - .4byte CaveOfOrigin_Entrance - .4byte CaveOfOrigin_1F - .4byte CaveOfOrigin_UnusedRubySapphireMap1 - .4byte CaveOfOrigin_UnusedRubySapphireMap2 - .4byte CaveOfOrigin_UnusedRubySapphireMap3 - .4byte CaveOfOrigin_B1F - .4byte VictoryRoad_1F - .4byte VictoryRoad_B1F - .4byte VictoryRoad_B2F - .4byte ShoalCave_LowTideEntranceRoom - .4byte ShoalCave_LowTideInnerRoom - .4byte ShoalCave_LowTideStairsRoom - .4byte ShoalCave_LowTideLowerRoom - .4byte ShoalCave_HighTideEntranceRoom - .4byte ShoalCave_HighTideInnerRoom - .4byte NewMauville_Entrance - .4byte NewMauville_Inside - .4byte AbandonedShip_Deck - .4byte AbandonedShip_Corridors_1F - .4byte AbandonedShip_Rooms_1F - .4byte AbandonedShip_Corridors_B1F - .4byte AbandonedShip_Rooms_B1F - .4byte AbandonedShip_Rooms2_B1F - .4byte AbandonedShip_Underwater1 - .4byte AbandonedShip_Room_B1F - .4byte AbandonedShip_Rooms2_1F - .4byte AbandonedShip_CaptainsOffice - .4byte AbandonedShip_Underwater2 - .4byte AbandonedShip_HiddenFloorCorridors - .4byte AbandonedShip_HiddenFloorRooms - .4byte IslandCave - .4byte AncientTomb - .4byte Underwater_Route134 - .4byte Underwater_SealedChamber - .4byte SealedChamber_OuterRoom - .4byte SealedChamber_InnerRoom - .4byte ScorchedSlab - .4byte AquaHideout_UnusedRubyMap1 - .4byte AquaHideout_UnusedRubyMap2 - .4byte AquaHideout_UnusedRubyMap3 - .4byte SkyPillar_Entrance - .4byte SkyPillar_Outside - .4byte SkyPillar_1F - .4byte SkyPillar_2F - .4byte SkyPillar_3F - .4byte SkyPillar_4F - .4byte ShoalCave_LowTideIceRoom - .4byte SkyPillar_5F - .4byte SkyPillar_Top - .4byte MagmaHideout_1F - .4byte MagmaHideout_2F_1R - .4byte MagmaHideout_2F_2R - .4byte MagmaHideout_3F_1R - .4byte MagmaHideout_3F_2R - .4byte MagmaHideout_4F - .4byte MagmaHideout_3F_3R - .4byte MagmaHideout_2F_3R - .4byte MirageTower_1F - .4byte MirageTower_2F - .4byte MirageTower_3F - .4byte MirageTower_4F - .4byte DesertUnderpass - .4byte ArtisanCave_B1F - .4byte ArtisanCave_1F - .4byte Underwater_MarineCave - .4byte MarineCave_Entrance - .4byte MarineCave_End - .4byte TerraCave_Entrance - .4byte TerraCave_End - .4byte AlteringCave - .4byte MeteorFalls_StevensCave - -gMapGroup25: @ 84862C8 - .4byte SecretBase_RedCave1 - .4byte SecretBase_BrownCave1 - .4byte SecretBase_BlueCave1 - .4byte SecretBase_YellowCave1 - .4byte SecretBase_Tree1 - .4byte SecretBase_Shrub1 - .4byte SecretBase_RedCave2 - .4byte SecretBase_BrownCave2 - .4byte SecretBase_BlueCave2 - .4byte SecretBase_YellowCave2 - .4byte SecretBase_Tree2 - .4byte SecretBase_Shrub2 - .4byte SecretBase_RedCave3 - .4byte SecretBase_BrownCave3 - .4byte SecretBase_BlueCave3 - .4byte SecretBase_YellowCave3 - .4byte SecretBase_Tree3 - .4byte SecretBase_Shrub3 - .4byte SecretBase_RedCave4 - .4byte SecretBase_BrownCave4 - .4byte SecretBase_BlueCave4 - .4byte SecretBase_YellowCave4 - .4byte SecretBase_Tree4 - .4byte SecretBase_Shrub4 - .4byte SingleBattleColosseum - .4byte TradeCenter - .4byte RecordCorner - .4byte DoubleBattleColosseum - .4byte LinkContestRoom1 - .4byte UnknownMap_25_29 - .4byte UnknownMap_25_30 - .4byte UnknownMap_25_31 - .4byte UnknownMap_25_32 - .4byte UnknownMap_25_33 - .4byte UnknownMap_25_34 - .4byte LinkContestRoom2 - .4byte LinkContestRoom3 - .4byte LinkContestRoom4 - .4byte LinkContestRoom5 - .4byte LinkContestRoom6 - .4byte InsideOfTruck - .4byte SSTidalCorridor - .4byte SSTidalLowerDeck - .4byte SSTidalRooms - .4byte BattlePyramidSquare01 - .4byte BattlePyramidSquare02 - .4byte BattlePyramidSquare03 - .4byte BattlePyramidSquare04 - .4byte BattlePyramidSquare05 - .4byte BattlePyramidSquare06 - .4byte BattlePyramidSquare07 - .4byte BattlePyramidSquare08 - .4byte BattlePyramidSquare09 - .4byte BattlePyramidSquare10 - .4byte BattlePyramidSquare11 - .4byte BattlePyramidSquare12 - .4byte BattlePyramidSquare13 - .4byte BattlePyramidSquare14 - .4byte BattlePyramidSquare15 - .4byte BattlePyramidSquare16 - .4byte UnionRoom - -gMapGroup26: @ 84863BC - .4byte SafariZone_Northwest - .4byte SafariZone_North - .4byte SafariZone_Southwest - .4byte SafariZone_South - .4byte BattleFrontier_OutsideWest - .4byte BattleFrontier_BattleTowerLobby - .4byte BattleFrontier_BattleTowerElevator - .4byte BattleFrontier_BattleTowerCorridor - .4byte BattleFrontier_BattleTowerBattleRoom - .4byte SouthernIsland_Exterior - .4byte SouthernIsland_Interior - .4byte SafariZone_RestHouse - .4byte SafariZone_Northeast - .4byte SafariZone_Southeast - .4byte BattleFrontier_OutsideEast - .4byte BattleFrontier_BattleTowerMultiBattleRoom - .4byte BattleFrontier_BattleTowerCorridor2 - .4byte BattleFrontier_BattleTowerBattleRoom2 - .4byte BattleFrontier_BattleDomeLobby - .4byte BattleFrontier_BattleDomeCorridor - .4byte BattleFrontier_BattleDomePreBattleRoom - .4byte BattleFrontier_BattleDomeBattleRoom - .4byte BattleFrontier_BattlePalaceLobby - .4byte BattleFrontier_BattlePalaceCorridor - .4byte BattleFrontier_BattlePalaceBattleRoom - .4byte BattleFrontier_BattlePyramidLobby - .4byte BattleFrontier_BattlePyramidEmptySquare - .4byte BattleFrontier_BattlePyramidTop - .4byte BattleFrontier_BattleArenaLobby - .4byte BattleFrontier_BattleArenaCorridor - .4byte BattleFrontier_BattleArenaBattleRoom - .4byte BattleFrontier_BattleFactoryLobby - .4byte BattleFrontier_BattleFactoryPreBattleRoom - .4byte BattleFrontier_BattleFactoryBattleRoom - .4byte BattleFrontier_BattlePikeLobby - .4byte BattleFrontier_BattlePikeCorridor - .4byte BattleFrontier_BattlePikeThreePathRoom - .4byte BattleFrontier_BattlePikeRandomRoom1 - .4byte BattleFrontier_BattlePikeRandomRoom2 - .4byte BattleFrontier_BattlePikeRandomRoom3 - .4byte BattleFrontier_RankingHall - .4byte BattleFrontier_Lounge1 - .4byte BattleFrontier_BattlePointExchangeServiceCorner - .4byte BattleFrontier_Lounge2 - .4byte BattleFrontier_Lounge3 - .4byte BattleFrontier_Lounge4 - .4byte BattleFrontier_ScottsHouse - .4byte BattleFrontier_Lounge5 - .4byte BattleFrontier_Lounge6 - .4byte BattleFrontier_Lounge7 - .4byte BattleFrontier_ReceptionGate - .4byte BattleFrontier_Lounge8 - .4byte BattleFrontier_Lounge9 - .4byte BattleFrontier_PokemonCenter_1F - .4byte BattleFrontier_PokemonCenter_2F - .4byte BattleFrontier_Mart - .4byte FarawayIsland_Entrance - .4byte FarawayIsland_Interior - .4byte BirthIsland_Exterior - .4byte BirthIsland_Harbor - .4byte TrainerHill_Entrance - .4byte TrainerHill_1F - .4byte TrainerHill_2F - .4byte TrainerHill_3F - .4byte TrainerHill_4F - .4byte TrainerHill_Roof - .4byte NavelRock_Exterior - .4byte NavelRock_Harbor - .4byte NavelRock_Entrance - .4byte NavelRock_B1F - .4byte NavelRock_Fork - .4byte NavelRock_Up1 - .4byte NavelRock_Up2 - .4byte NavelRock_Up3 - .4byte NavelRock_Up4 - .4byte NavelRock_Top - .4byte NavelRock_Down01 - .4byte NavelRock_Down02 - .4byte NavelRock_Down03 - .4byte NavelRock_Down04 - .4byte NavelRock_Down05 - .4byte NavelRock_Down06 - .4byte NavelRock_Down07 - .4byte NavelRock_Down08 - .4byte NavelRock_Down09 - .4byte NavelRock_Down10 - .4byte NavelRock_Down11 - .4byte NavelRock_Bottom - .4byte TrainerHill_Elevator - -gMapGroup27: @ 8486520 - .4byte Route104_Prototype - .4byte Route104_PrototypePrettyPetalFlowerShop - -gMapGroup28: @ 8486528 - .4byte Route109_SeashoreHouse - -gMapGroup29: @ 848652C - .4byte Route110_TrickHouseEntrance - .4byte Route110_TrickHouseEnd - .4byte Route110_TrickHouseCorridor - .4byte Route110_TrickHousePuzzle1 - .4byte Route110_TrickHousePuzzle2 - .4byte Route110_TrickHousePuzzle3 - .4byte Route110_TrickHousePuzzle4 - .4byte Route110_TrickHousePuzzle5 - .4byte Route110_TrickHousePuzzle6 - .4byte Route110_TrickHousePuzzle7 - .4byte Route110_TrickHousePuzzle8 - .4byte Route110_SeasideCyclingRoadEntrance1 - .4byte Route110_SeasideCyclingRoadEntrance2 - -gMapGroup30: @ 8486560 - .4byte Route113_GlassWorkshop - -gMapGroup31: @ 8486564 - .4byte Route123_BerryMastersHouse - -gMapGroup32: @ 8486568 - .4byte Route119_WeatherInstitute_1F - .4byte Route119_WeatherInstitute_2F - .4byte Route119_House - -gMapGroup33: @ 8486574 - .4byte Route124_DivingTreasureHuntersHouse - - .align 2 -gMapGroups:: @ 8486578 - .4byte gMapGroup0 - .4byte gMapGroup1 - .4byte gMapGroup2 - .4byte gMapGroup3 - .4byte gMapGroup4 - .4byte gMapGroup5 - .4byte gMapGroup6 - .4byte gMapGroup7 - .4byte gMapGroup8 - .4byte gMapGroup9 - .4byte gMapGroup10 - .4byte gMapGroup11 - .4byte gMapGroup12 - .4byte gMapGroup13 - .4byte gMapGroup14 - .4byte gMapGroup15 - .4byte gMapGroup16 - .4byte gMapGroup17 - .4byte gMapGroup18 - .4byte gMapGroup19 - .4byte gMapGroup20 - .4byte gMapGroup21 - .4byte gMapGroup22 - .4byte gMapGroup23 - .4byte gMapGroup24 - .4byte gMapGroup25 - .4byte gMapGroup26 - .4byte gMapGroup27 - .4byte gMapGroup28 - .4byte gMapGroup29 - .4byte gMapGroup30 - .4byte gMapGroup31 - .4byte gMapGroup32 - .4byte gMapGroup33 - diff --git a/data/maps/attributes_table.inc b/data/maps/attributes_table.inc deleted file mode 100644 index ef25ba2b5..000000000 --- a/data/maps/attributes_table.inc +++ /dev/null @@ -1,444 +0,0 @@ - .align 2 -gMapAttributes:: @ 8481DD4 - .4byte PetalburgCity_MapAttributes - .4byte SlateportCity_MapAttributes - .4byte MauvilleCity_MapAttributes - .4byte RustboroCity_MapAttributes - .4byte FortreeCity_MapAttributes - .4byte LilycoveCity_MapAttributes - .4byte MossdeepCity_MapAttributes - .4byte SootopolisCity_MapAttributes - .4byte EverGrandeCity_MapAttributes - .4byte LittlerootTown_MapAttributes - .4byte OldaleTown_MapAttributes - .4byte DewfordTown_MapAttributes - .4byte LavaridgeTown_MapAttributes - .4byte FallarborTown_MapAttributes - .4byte VerdanturfTown_MapAttributes - .4byte PacifidlogTown_MapAttributes - .4byte Route101_MapAttributes - .4byte Route102_MapAttributes - .4byte Route103_MapAttributes - .4byte Route104_MapAttributes - .4byte Route105_MapAttributes - .4byte Route106_MapAttributes - .4byte Route107_MapAttributes - .4byte Route108_MapAttributes - .4byte Route109_MapAttributes - .4byte Route110_MapAttributes - .4byte Route111_MapAttributes - .4byte Route112_MapAttributes - .4byte Route113_MapAttributes - .4byte Route114_MapAttributes - .4byte Route115_MapAttributes - .4byte Route116_MapAttributes - .4byte Route117_MapAttributes - .4byte Route118_MapAttributes - .4byte Route119_MapAttributes - .4byte Route120_MapAttributes - .4byte Route121_MapAttributes - .4byte Route122_MapAttributes - .4byte Route123_MapAttributes - .4byte Route124_MapAttributes - .4byte Route125_MapAttributes - .4byte Route126_MapAttributes - .4byte Route127_MapAttributes - .4byte Route128_MapAttributes - .4byte Route129_MapAttributes - .4byte UnknownMapAttributes_08417FC4 - .4byte Route131_MapAttributes - .4byte Route132_MapAttributes - .4byte Route133_MapAttributes - .4byte Route134_MapAttributes - .4byte Underwater2_MapAttributes - .4byte Underwater3_MapAttributes - .4byte Underwater4_MapAttributes - .4byte LittlerootTown_BrendansHouse_1F_MapAttributes - .4byte LittlerootTown_BrendansHouse_2F_MapAttributes - .4byte LittlerootTown_MaysHouse_1F_MapAttributes - .4byte LittlerootTown_MaysHouse_2F_MapAttributes - .4byte LittlerootTown_ProfessorBirchsLab_MapAttributes - .4byte OldaleTown_House1_MapAttributes - .4byte OldaleTown_House2_MapAttributes - .4byte OldaleTown_PokemonCenter_1F_MapAttributes - .4byte OldaleTown_PokemonCenter_2F_MapAttributes - .4byte OldaleTown_Mart_MapAttributes - .4byte DewfordTown_House1_MapAttributes - .4byte DewfordTown_Gym_MapAttributes - .4byte DewfordTown_Hall_MapAttributes - .4byte DewfordTown_House2_MapAttributes - .4byte LavaridgeTown_HerbShop_MapAttributes - .4byte LavaridgeTown_Gym_1F_MapAttributes - .4byte LavaridgeTown_Gym_B1F_MapAttributes - .4byte LavaridgeTown_PokemonCenter_1F_MapAttributes - .4byte FallarborTown_LeftoverRSContestLobby_MapAttributes - .4byte FallarborTown_LeftoverRSContestHall_MapAttributes - .4byte LilycoveCity_House2_MapAttributes - .4byte UnknownMapAttributes_08428450 - .4byte VerdanturfTown_WandasHouse_MapAttributes - .4byte PacifidlogTown_House1_MapAttributes - .4byte PacifidlogTown_House2_MapAttributes - .4byte PetalburgCity_Gym_MapAttributes - .4byte MossdeepCity_House4_MapAttributes - .4byte SlateportCity_SternsShipyard_1F_MapAttributes - .4byte SlateportCity_SternsShipyard_2F_MapAttributes - .4byte UnknownMapAttributes_084294C4 - .4byte UnknownMapAttributes_084294E8 - .4byte SlateportCity_PokemonFanClub_MapAttributes - .4byte SlateportCity_OceanicMuseum_1F_MapAttributes - .4byte SlateportCity_OceanicMuseum_2F_MapAttributes - .4byte LilycoveCity_Harbor_MapAttributes - .4byte MauvilleCity_Gym_MapAttributes - .4byte MauvilleCity_BikeShop_MapAttributes - .4byte MauvilleCity_GameCorner_MapAttributes - .4byte RustboroCity_DevonCorp_1F_MapAttributes - .4byte RustboroCity_DevonCorp_2F_MapAttributes - .4byte RustboroCity_Gym_MapAttributes - .4byte RustboroCity_PokemonSchool_MapAttributes - .4byte RustboroCity_House2_MapAttributes - .4byte RustboroCity_House1_MapAttributes - .4byte RustboroCity_CuttersHouse_MapAttributes - .4byte FortreeCity_House1_MapAttributes - .4byte FortreeCity_Gym_MapAttributes - .4byte FortreeCity_House2_MapAttributes - .4byte Route104_MrBrineysHouse_MapAttributes - .4byte LilycoveCity_LilycoveMuseum_1F_MapAttributes - .4byte LilycoveCity_LilycoveMuseum_2F_MapAttributes - .4byte LilycoveCity_ContestLobby_MapAttributes - .4byte LilycoveCity_ContestHall_MapAttributes - .4byte LilycoveCity_PokemonTrainerFanClub_MapAttributes - .4byte MossdeepCity_Gym_MapAttributes - .4byte SootopolisCity_Gym_1F_MapAttributes - .4byte SootopolisCity_Gym_B1F_MapAttributes - .4byte EverGrandeCity_SidneysRoom_MapAttributes - .4byte EverGrandeCity_PhoebesRoom_MapAttributes - .4byte EverGrandeCity_GlaciasRoom_MapAttributes - .4byte EverGrandeCity_DrakesRoom_MapAttributes - .4byte EverGrandeCity_ChampionsRoom_MapAttributes - .4byte EverGrandeCity_Hall1_MapAttributes - .4byte Route104_PrettyPetalFlowerShop_MapAttributes - .4byte Route112_CableCarStation_MapAttributes - .4byte Route114_FossilManiacsHouse_MapAttributes - .4byte Route114_FossilManiacsTunnel_MapAttributes - .4byte Route114_LanettesHouse_MapAttributes - .4byte Route116_TunnelersRestHouse_MapAttributes - .4byte Route117_PokemonDayCare_MapAttributes - .4byte Route121_SafariZoneEntrance_MapAttributes - .4byte MeteorFalls_1F_1R_MapAttributes - .4byte MeteorFalls_1F_2R_MapAttributes - .4byte MeteorFalls_B1F_1R_MapAttributes - .4byte MeteorFalls_B1F_2R_MapAttributes - .4byte RusturfTunnel_MapAttributes - .4byte Underwater_SootopolisCity_MapAttributes - .4byte DesertRuins_MapAttributes - .4byte GraniteCave_1F_MapAttributes - .4byte GraniteCave_B1F_MapAttributes - .4byte GraniteCave_B2F_MapAttributes - .4byte PetalburgWoods_MapAttributes - .4byte MtChimney_MapAttributes - .4byte MtPyre_1F_MapAttributes - .4byte MtPyre_2F_MapAttributes - .4byte MtPyre_3F_MapAttributes - .4byte MtPyre_4F_MapAttributes - .4byte MtPyre_5F_MapAttributes - .4byte MtPyre_6F_MapAttributes - .4byte AquaHideout_1F_MapAttributes - .4byte AquaHideout_B1F_MapAttributes - .4byte AquaHideout_B2F_MapAttributes - .4byte Underwater_SeafloorCavern_MapAttributes - .4byte SeafloorCavern_Entrance_MapAttributes - .4byte SeafloorCavern_Room1_MapAttributes - .4byte SeafloorCavern_Room2_MapAttributes - .4byte SeafloorCavern_Room3_MapAttributes - .4byte SeafloorCavern_Room4_MapAttributes - .4byte SeafloorCavern_Room5_MapAttributes - .4byte SeafloorCavern_Room6_MapAttributes - .4byte SeafloorCavern_Room7_MapAttributes - .4byte SeafloorCavern_Room8_MapAttributes - .4byte SeafloorCavern_Room9_MapAttributes - .4byte CaveOfOrigin_Entrance_MapAttributes - .4byte CaveOfOrigin_1F_MapAttributes - .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapAttributes - .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapAttributes - .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapAttributes - .4byte CaveOfOrigin_B1F_MapAttributes - .4byte VictoryRoad_1F_MapAttributes - .4byte ShoalCave_LowTideEntranceRoom_MapAttributes - .4byte ShoalCave_LowTideInnerRoom_MapAttributes - .4byte ShoalCave_LowTideStairsRoom_MapAttributes - .4byte ShoalCave_LowTideLowerRoom_MapAttributes - .4byte ShoalCave_HighTideEntranceRoom_MapAttributes - .4byte ShoalCave_HighTideInnerRoom_MapAttributes - .4byte UnknownMapAttributes_0843E6C0 @ unused maps - .4byte UnknownMapAttributes_0843E6E4 - .4byte UnknownMapAttributes_0843E708 - .4byte UnknownMapAttributes_0843E72C - .4byte UnknownMapAttributes_0843E750 - .4byte UnknownMapAttributes_0843E774 - .4byte UnknownMapAttributes_0843E798 - .4byte UnknownMapAttributes_0843E7BC - .4byte UnknownMapAttributes_0843E7E0 - .4byte UnknownMapAttributes_0843E804 - .4byte UnknownMapAttributes_0843E828 - .4byte UnknownMapAttributes_0843E84C - .4byte UnknownMapAttributes_0843E870 - .4byte UnknownMapAttributes_0843E894 - .4byte NewMauville_Entrance_MapAttributes - .4byte NewMauville_Inside_MapAttributes - .4byte AbandonedShip_Deck_MapAttributes - .4byte AbandonedShip_Corridors_1F_MapAttributes - .4byte AbandonedShip_Rooms_1F_MapAttributes - .4byte AbandonedShip_Corridors_B1F_MapAttributes - .4byte AbandonedShip_Rooms_B1F_MapAttributes - .4byte AbandonedShip_Rooms2_B1F_MapAttributes - .4byte AbandonedShip_Underwater1_MapAttributes - .4byte AbandonedShip_Room_B1F_MapAttributes - .4byte AbandonedShip_Rooms2_1F_MapAttributes - .4byte AbandonedShip_CaptainsOffice_MapAttributes - .4byte AbandonedShip_Underwater2_MapAttributes - .4byte SecretBase_RedCave1_MapAttributes - .4byte SecretBase_BrownCave1_MapAttributes - .4byte SecretBase_BlueCave1_MapAttributes - .4byte SecretBase_YellowCave1_MapAttributes - .4byte SecretBase_Tree1_MapAttributes - .4byte SecretBase_Shrub1_MapAttributes - .4byte SecretBase_RedCave2_MapAttributes - .4byte SecretBase_BrownCave2_MapAttributes - .4byte SecretBase_BlueCave2_MapAttributes - .4byte SecretBase_YellowCave2_MapAttributes - .4byte SecretBase_Tree2_MapAttributes - .4byte SecretBase_Shrub2_MapAttributes - .4byte SecretBase_RedCave3_MapAttributes - .4byte SecretBase_BrownCave3_MapAttributes - .4byte SecretBase_BlueCave3_MapAttributes - .4byte SecretBase_YellowCave3_MapAttributes - .4byte SecretBase_Tree3_MapAttributes - .4byte SecretBase_Shrub3_MapAttributes - .4byte SecretBase_RedCave4_MapAttributes - .4byte SecretBase_BrownCave4_MapAttributes - .4byte SecretBase_BlueCave4_MapAttributes - .4byte SecretBase_YellowCave4_MapAttributes - .4byte SecretBase_Tree4_MapAttributes - .4byte SecretBase_Shrub4_MapAttributes - .4byte SingleBattleColosseum_MapAttributes - .4byte TradeCenter_MapAttributes - .4byte RecordCorner_MapAttributes - .4byte DoubleBattleColosseum_MapAttributes - .4byte LinkContestRoom1_MapAttributes - .4byte UnknownMap_25_29_MapAttributes - .4byte UnknownMap_25_30_MapAttributes - .4byte UnknownMap_25_31_MapAttributes - .4byte UnknownMap_25_32_MapAttributes - .4byte UnknownMap_25_33_MapAttributes - .4byte UnknownMap_25_34_MapAttributes - .4byte LinkContestRoom2_MapAttributes - .4byte LinkContestRoom3_MapAttributes - .4byte LinkContestRoom4_MapAttributes - .4byte LinkContestRoom5_MapAttributes - .4byte LinkContestRoom6_MapAttributes - .4byte InsideOfTruck_MapAttributes - .4byte SafariZone_Northwest_MapAttributes - .4byte SafariZone_North_MapAttributes - .4byte SafariZone_Southwest_MapAttributes - .4byte SafariZone_South_MapAttributes - .4byte UnknownMapAttributes_08447028 - .4byte Route109_SeashoreHouse_MapAttributes - .4byte Route110_TrickHouseEntrance_MapAttributes - .4byte Route110_TrickHouseEnd_MapAttributes - .4byte Route110_TrickHouseCorridor_MapAttributes - .4byte Route110_TrickHousePuzzle1_MapAttributes - .4byte Route110_TrickHousePuzzle2_MapAttributes - .4byte Route110_TrickHousePuzzle3_MapAttributes - .4byte Route110_TrickHousePuzzle4_MapAttributes - .4byte Route110_TrickHousePuzzle5_MapAttributes - .4byte Route110_TrickHousePuzzle6_MapAttributes - .4byte Route110_TrickHousePuzzle7_MapAttributes - .4byte Route110_TrickHousePuzzle8_MapAttributes - .4byte FortreeCity_DecorationShop_MapAttributes - .4byte Route110_SeasideCyclingRoadEntrance1_MapAttributes - .4byte LilycoveCity_DepartmentStore_1F_MapAttributes - .4byte LilycoveCity_DepartmentStore_2F_MapAttributes - .4byte LilycoveCity_DepartmentStore_3F_MapAttributes - .4byte LilycoveCity_DepartmentStore_4F_MapAttributes - .4byte LilycoveCity_DepartmentStore_5F_MapAttributes - .4byte LilycoveCity_DepartmentStoreRooftop_MapAttributes - .4byte Route130_MapAttributes - .4byte BattleFrontier_BattleTowerLobby_MapAttributes - .4byte BattleFrontier_OutsideWest_MapAttributes - .4byte BattleFrontier_BattleTowerElevator_MapAttributes - .4byte BattleFrontier_BattleTowerCorridor_MapAttributes - .4byte BattleFrontier_BattleTowerBattleRoom_MapAttributes - .4byte RustboroCity_DevonCorp_3F_MapAttributes - .4byte EverGrandeCity_PokemonLeague_1F_MapAttributes - .4byte Route119_WeatherInstitute_1F_MapAttributes - .4byte Route119_WeatherInstitute_2F_MapAttributes - .4byte LilycoveCity_DepartmentStoreElevator_MapAttributes - .4byte Underwater1_MapAttributes - .4byte MossdeepCity_SpaceCenter_1F_MapAttributes - .4byte MossdeepCity_SpaceCenter_2F_MapAttributes - .4byte SSTidalCorridor_MapAttributes - .4byte SSTidalLowerDeck_MapAttributes - .4byte SSTidalRooms_MapAttributes - .4byte IslandCave_MapAttributes - .4byte AncientTomb_MapAttributes - .4byte Underwater_Route134_MapAttributes - .4byte Underwater_SealedChamber_MapAttributes - .4byte SealedChamber_OuterRoom_MapAttributes - .4byte VictoryRoad_B1F_MapAttributes - .4byte VictoryRoad_B2F_MapAttributes - .4byte Route104_Prototype_MapAttributes - .4byte GraniteCave_StevensRoom_MapAttributes - .4byte AbandonedShip_HiddenFloorCorridors_MapAttributes - .4byte SouthernIsland_Exterior_MapAttributes - .4byte SouthernIsland_Interior_MapAttributes - .4byte JaggedPass_MapAttributes - .4byte FieryPath_MapAttributes - .4byte RustboroCity_Flat2_1F_MapAttributes - .4byte RustboroCity_Flat2_2F_MapAttributes - .4byte RustboroCity_Flat2_3F_MapAttributes - .4byte SootopolisCity_LotadAndSeedotHouse_MapAttributes - .4byte EverGrandeCity_HallOfFame_MapAttributes - .4byte LilycoveCity_CoveLilyMotel_1F_MapAttributes - .4byte LilycoveCity_CoveLilyMotel_2F_MapAttributes - .4byte Route124_DivingTreasureHuntersHouse_MapAttributes - .4byte MtPyre_Exterior_MapAttributes - .4byte MtPyre_Summit_MapAttributes - .4byte SealedChamber_InnerRoom_MapAttributes - .4byte MossdeepCity_GameCorner_1F_MapAttributes - .4byte MossdeepCity_GameCorner_B1F_MapAttributes - .4byte SootopolisCity_House1_MapAttributes - .4byte SootopolisCity_House2_MapAttributes - .4byte SootopolisCity_House3_MapAttributes - .4byte AbandonedShip_HiddenFloorRooms_MapAttributes - .4byte ScorchedSlab_MapAttributes - .4byte UnknownMapAttributes_0845A394 - .4byte RustboroCity_Flat1_1F_MapAttributes - .4byte RustboroCity_Flat1_2F_MapAttributes - .4byte EverGrandeCity_Hall4_MapAttributes - .4byte AquaHideout_UnusedRubyMap1_MapAttributes - .4byte AquaHideout_UnusedRubyMap2_MapAttributes - .4byte AquaHideout_UnusedRubyMap3_MapAttributes - .4byte UnknownMapAttributes_0845D470 - .4byte SkyPillar_Entrance_MapAttributes - .4byte SkyPillar_Outside_MapAttributes - .4byte SkyPillar_1F_MapAttributes - .4byte SkyPillar_2F_MapAttributes - .4byte SkyPillar_3F_MapAttributes - .4byte SkyPillar_4F_MapAttributes - .4byte UnknownMapAttributes_0845ECB4 - .4byte MossdeepCity_StevensHouse_MapAttributes - .4byte ShoalCave_LowTideIceRoom_MapAttributes - .4byte SafariZone_RestHouse_MapAttributes - .4byte SkyPillar_5F_MapAttributes - .4byte SkyPillar_Top_MapAttributes - .4byte BattleFrontier_BattleDomeLobby_MapAttributes - .4byte BattleFrontier_BattleDomeCorridor_MapAttributes - .4byte BattleFrontier_BattleDomePreBattleRoom_MapAttributes - .4byte BattleFrontier_BattleDomeBattleRoom_MapAttributes - .4byte MagmaHideout_1F_MapAttributes - .4byte MagmaHideout_2F_1R_MapAttributes - .4byte MagmaHideout_2F_2R_MapAttributes - .4byte MagmaHideout_3F_1R_MapAttributes - .4byte MagmaHideout_3F_2R_MapAttributes - .4byte MagmaHideout_4F_MapAttributes - .4byte BattleFrontier_BattlePalaceLobby_MapAttributes - .4byte BattleFrontier_BattlePalaceCorridor_MapAttributes - .4byte BattleFrontier_BattlePalaceBattleRoom_MapAttributes - .4byte BattleFrontier_OutsideEast_MapAttributes - .4byte BattleFrontier_BattleFactoryLobby_MapAttributes - .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapAttributes - .4byte BattleFrontier_BattleFactoryBattleRoom_MapAttributes - .4byte BattleFrontier_BattlePikeLobby_MapAttributes - .4byte BattleFrontier_BattlePikeCorridor_MapAttributes - .4byte BattleFrontier_BattlePikeThreePathRoom_MapAttributes - .4byte BattleFrontier_BattlePikeRandomRoom1_MapAttributes - .4byte BattleFrontier_BattlePikeRandomRoom2_MapAttributes - .4byte BattleFrontier_BattleArenaLobby_MapAttributes - .4byte BattleFrontier_BattleArenaCorridor_MapAttributes - .4byte BattleFrontier_BattleArenaBattleRoom_MapAttributes - .4byte UnknownMapAttributes_08469200 - .4byte BattleFrontier_BattlePikeRandomRoom3_MapAttributes - .4byte UnknownMapAttributes_084693AC - .4byte BattleFrontier_BattlePyramidLobby_MapAttributes - .4byte BattleFrontier_BattlePyramidEmptySquare_MapAttributes - .4byte BattlePyramidSquare01_MapAttributes - .4byte BattlePyramidSquare02_MapAttributes - .4byte BattlePyramidSquare03_MapAttributes - .4byte BattlePyramidSquare04_MapAttributes - .4byte BattlePyramidSquare05_MapAttributes - .4byte BattlePyramidSquare06_MapAttributes - .4byte BattlePyramidSquare07_MapAttributes - .4byte BattlePyramidSquare08_MapAttributes - .4byte BattlePyramidSquare09_MapAttributes - .4byte BattlePyramidSquare10_MapAttributes - .4byte BattlePyramidSquare11_MapAttributes - .4byte BattlePyramidSquare12_MapAttributes - .4byte BattlePyramidSquare13_MapAttributes - .4byte BattlePyramidSquare14_MapAttributes - .4byte BattlePyramidSquare15_MapAttributes - .4byte BattlePyramidSquare16_MapAttributes - .4byte BattleFrontier_BattlePyramidTop_MapAttributes - .4byte MagmaHideout_3F_3R_MapAttributes - .4byte MagmaHideout_2F_3R_MapAttributes - .4byte MirageTower_1F_MapAttributes - .4byte MirageTower_2F_MapAttributes - .4byte MirageTower_3F_MapAttributes - .4byte FallarborTown_BattleTentLobby_MapAttributes - .4byte FallarborTown_BattleTentCorridor_MapAttributes - .4byte FallarborTown_BattleTentBattleRoom_MapAttributes - .4byte VerdanturfTown_BattleTentBattleRoom_MapAttributes - .4byte MirageTower_4F_MapAttributes - .4byte DesertUnderpass_MapAttributes - .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapAttributes - .4byte BattleFrontier_BattleTowerCorridor2_MapAttributes - .4byte UnknownMapAttributes_08470BD8 - .4byte UnionRoom_MapAttributes - .4byte SafariZone_Northeast_MapAttributes - .4byte SafariZone_Southeast_MapAttributes - .4byte BattleFrontier_RankingHall_MapAttributes - .4byte BattleFrontier_Lounge2_MapAttributes - .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapAttributes - .4byte BattleFrontier_ReceptionGate_MapAttributes - .4byte ArtisanCave_B1F_MapAttributes - .4byte ArtisanCave_1F_MapAttributes - .4byte FarawayIsland_Entrance_MapAttributes - .4byte FarawayIsland_Interior_MapAttributes - .4byte BirthIsland_Exterior_MapAttributes - .4byte BirthIsland_Harbor_MapAttributes - .4byte Underwater_MarineCave_MapAttributes - .4byte MarineCave_Entrance_MapAttributes - .4byte TerraCave_Entrance_MapAttributes - .4byte TerraCave_End_MapAttributes - .4byte Underwater6_MapAttributes - .4byte Underwater7_MapAttributes - .4byte Underwater5_MapAttributes - .4byte MarineCave_End_MapAttributes - .4byte TrainerHill_Entrance_MapAttributes - .4byte TrainerHill_1F_MapAttributes - .4byte TrainerHill_2F_MapAttributes - .4byte TrainerHill_3F_MapAttributes - .4byte TrainerHill_4F_MapAttributes - .4byte TrainerHill_Roof_MapAttributes - .4byte AlteringCave_MapAttributes - .4byte NavelRock_Exterior_MapAttributes - .4byte NavelRock_Entrance_MapAttributes - .4byte NavelRock_Top_MapAttributes - .4byte NavelRock_Bottom_MapAttributes - .4byte NavelRock_Up1_MapAttributes - .4byte NavelRock_Up2_MapAttributes - .4byte NavelRock_B1F_MapAttributes - .4byte NavelRock_Fork_MapAttributes - .4byte BattleFrontier_Lounge1_MapAttributes - .4byte BattleFrontier_ScottsHouse_MapAttributes - .4byte MeteorFalls_StevensCave_MapAttributes - .4byte UnknownMapAttributes_08480DAC - .4byte UnknownMapAttributes_08480F54 - .4byte UnknownMapAttributes_084810FC - .4byte UnknownMapAttributes_084812A4 - .4byte UnknownMapAttributes_0848144C - .4byte UnknownMapAttributes_084815F4 - .4byte UnknownMapAttributes_08481B24 - .4byte SootopolisCity_MysteryEventsHouse_1F_MapAttributes - .4byte SootopolisCity_MysteryEventsHouse_B1F_MapAttributes - .4byte UnknownMapAttributes_08481DBC - diff --git a/data/maps/groups.inc b/data/maps/groups.inc new file mode 100644 index 000000000..f7fc7be89 --- /dev/null +++ b/data/maps/groups.inc @@ -0,0 +1,623 @@ +gMapGroup0: @ 8485D60 + .4byte PetalburgCity + .4byte SlateportCity + .4byte MauvilleCity + .4byte RustboroCity + .4byte FortreeCity + .4byte LilycoveCity + .4byte MossdeepCity + .4byte SootopolisCity + .4byte EverGrandeCity + .4byte LittlerootTown + .4byte OldaleTown + .4byte DewfordTown + .4byte LavaridgeTown + .4byte FallarborTown + .4byte VerdanturfTown + .4byte PacifidlogTown + .4byte Route101 + .4byte Route102 + .4byte Route103 + .4byte Route104 + .4byte Route105 + .4byte Route106 + .4byte Route107 + .4byte Route108 + .4byte Route109 + .4byte Route110 + .4byte Route111 + .4byte Route112 + .4byte Route113 + .4byte Route114 + .4byte Route115 + .4byte Route116 + .4byte Route117 + .4byte Route118 + .4byte Route119 + .4byte Route120 + .4byte Route121 + .4byte Route122 + .4byte Route123 + .4byte Route124 + .4byte Route125 + .4byte Route126 + .4byte Route127 + .4byte Route128 + .4byte Route129 + .4byte Route130 + .4byte Route131 + .4byte Route132 + .4byte Route133 + .4byte Route134 + .4byte Underwater1 + .4byte Underwater2 + .4byte Underwater3 + .4byte Underwater4 + .4byte Underwater5 + .4byte Underwater6 + .4byte Underwater7 + +gMapGroup1: @ 8485E44 + .4byte LittlerootTown_BrendansHouse_1F + .4byte LittlerootTown_BrendansHouse_2F + .4byte LittlerootTown_MaysHouse_1F + .4byte LittlerootTown_MaysHouse_2F + .4byte LittlerootTown_ProfessorBirchsLab + +gMapGroup2: @ 8485E58 + .4byte OldaleTown_House1 + .4byte OldaleTown_House2 + .4byte OldaleTown_PokemonCenter_1F + .4byte OldaleTown_PokemonCenter_2F + .4byte OldaleTown_Mart + +gMapGroup3: @ 8485E6C + .4byte DewfordTown_House1 + .4byte DewfordTown_PokemonCenter_1F + .4byte DewfordTown_PokemonCenter_2F + .4byte DewfordTown_Gym + .4byte DewfordTown_Hall + .4byte DewfordTown_House2 + +gMapGroup4: @ 8485E84 + .4byte LavaridgeTown_HerbShop + .4byte LavaridgeTown_Gym_1F + .4byte LavaridgeTown_Gym_B1F + .4byte LavaridgeTown_House + .4byte LavaridgeTown_Mart + .4byte LavaridgeTown_PokemonCenter_1F + .4byte LavaridgeTown_PokemonCenter_2F + +gMapGroup5: @ 8485EA0 + .4byte FallarborTown_Mart + .4byte FallarborTown_BattleTentLobby + .4byte FallarborTown_BattleTentCorridor + .4byte FallarborTown_BattleTentBattleRoom + .4byte FallarborTown_PokemonCenter_1F + .4byte FallarborTown_PokemonCenter_2F + .4byte FallarborTown_House1 + .4byte FallarborTown_House2 + +gMapGroup6: @ 8485EC0 + .4byte VerdanturfTown_BattleTentLobby + .4byte VerdanturfTown_BattleTentCorridor + .4byte VerdanturfTown_BattleTentBattleRoom + .4byte VerdanturfTown_Mart + .4byte VerdanturfTown_PokemonCenter_1F + .4byte VerdanturfTown_PokemonCenter_2F + .4byte VerdanturfTown_WandasHouse + .4byte VerdanturfTown_FriendshipRatersHouse + .4byte VerdanturfTown_House + +gMapGroup7: @ 8485EE4 + .4byte PacifidlogTown_PokemonCenter_1F + .4byte PacifidlogTown_PokemonCenter_2F + .4byte PacifidlogTown_House1 + .4byte PacifidlogTown_House2 + .4byte PacifidlogTown_House3 + .4byte PacifidlogTown_House4 + .4byte PacifidlogTown_House5 + +gMapGroup8: @ 8485F00 + .4byte PetalburgCity_WallysHouse + .4byte PetalburgCity_Gym + .4byte PetalburgCity_House1 + .4byte PetalburgCity_House2 + .4byte PetalburgCity_PokemonCenter_1F + .4byte PetalburgCity_PokemonCenter_2F + .4byte PetalburgCity_Mart + +gMapGroup9: @ 8485F1C + .4byte SlateportCity_SternsShipyard_1F + .4byte SlateportCity_SternsShipyard_2F + .4byte SlateportCity_BattleTentLobby + .4byte SlateportCity_BattleTentCorridor + .4byte SlateportCity_BattleTentBattleRoom + .4byte SlateportCity_House1 + .4byte SlateportCity_PokemonFanClub + .4byte SlateportCity_OceanicMuseum_1F + .4byte SlateportCity_OceanicMuseum_2F + .4byte SlateportCity_Harbor + .4byte SlateportCity_House2 + .4byte SlateportCity_PokemonCenter_1F + .4byte SlateportCity_PokemonCenter_2F + .4byte SlateportCity_Mart + +gMapGroup10: @ 8485F54 + .4byte MauvilleCity_Gym + .4byte MauvilleCity_BikeShop + .4byte MauvilleCity_House1 + .4byte MauvilleCity_GameCorner + .4byte MauvilleCity_House2 + .4byte MauvilleCity_PokemonCenter_1F + .4byte MauvilleCity_PokemonCenter_2F + .4byte MauvilleCity_Mart + +gMapGroup11: @ 8485F74 + .4byte RustboroCity_DevonCorp_1F + .4byte RustboroCity_DevonCorp_2F + .4byte RustboroCity_DevonCorp_3F + .4byte RustboroCity_Gym + .4byte RustboroCity_PokemonSchool + .4byte RustboroCity_PokemonCenter_1F + .4byte RustboroCity_PokemonCenter_2F + .4byte RustboroCity_Mart + .4byte RustboroCity_Flat1_1F + .4byte RustboroCity_Flat1_2F + .4byte RustboroCity_House1 + .4byte RustboroCity_CuttersHouse + .4byte RustboroCity_House2 + .4byte RustboroCity_Flat2_1F + .4byte RustboroCity_Flat2_2F + .4byte RustboroCity_Flat2_3F + .4byte RustboroCity_House3 + +gMapGroup12: @ 8485FB8 + .4byte FortreeCity_House1 + .4byte FortreeCity_Gym + .4byte FortreeCity_PokemonCenter_1F + .4byte FortreeCity_PokemonCenter_2F + .4byte FortreeCity_Mart + .4byte FortreeCity_House2 + .4byte FortreeCity_House3 + .4byte FortreeCity_House4 + .4byte FortreeCity_House5 + .4byte FortreeCity_DecorationShop + +gMapGroup13: @ 8485FE0 + .4byte LilycoveCity_CoveLilyMotel_1F + .4byte LilycoveCity_CoveLilyMotel_2F + .4byte LilycoveCity_LilycoveMuseum_1F + .4byte LilycoveCity_LilycoveMuseum_2F + .4byte LilycoveCity_ContestLobby + .4byte LilycoveCity_ContestHall + .4byte LilycoveCity_PokemonCenter_1F + .4byte LilycoveCity_PokemonCenter_2F + .4byte LilycoveCity_UnusedMart + .4byte LilycoveCity_PokemonTrainerFanClub + .4byte LilycoveCity_Harbor + .4byte LilycoveCity_MoveDeletersHouse + .4byte LilycoveCity_House1 + .4byte LilycoveCity_House2 + .4byte LilycoveCity_House3 + .4byte LilycoveCity_House4 + .4byte LilycoveCity_DepartmentStore_1F + .4byte LilycoveCity_DepartmentStore_2F + .4byte LilycoveCity_DepartmentStore_3F + .4byte LilycoveCity_DepartmentStore_4F + .4byte LilycoveCity_DepartmentStore_5F + .4byte LilycoveCity_DepartmentStoreRooftop + .4byte LilycoveCity_DepartmentStoreElevator + +gMapGroup14: @ 848603C + .4byte MossdeepCity_Gym + .4byte MossdeepCity_House1 + .4byte MossdeepCity_House2 + .4byte MossdeepCity_PokemonCenter_1F + .4byte MossdeepCity_PokemonCenter_2F + .4byte MossdeepCity_Mart + .4byte MossdeepCity_House3 + .4byte MossdeepCity_StevensHouse + .4byte MossdeepCity_House4 + .4byte MossdeepCity_SpaceCenter_1F + .4byte MossdeepCity_SpaceCenter_2F + .4byte MossdeepCity_GameCorner_1F + .4byte MossdeepCity_GameCorner_B1F + +gMapGroup15: @ 8486070 + .4byte SootopolisCity_Gym_1F + .4byte SootopolisCity_Gym_B1F + .4byte SootopolisCity_PokemonCenter_1F + .4byte SootopolisCity_PokemonCenter_2F + .4byte SootopolisCity_Mart + .4byte SootopolisCity_House1 + .4byte SootopolisCity_House2 + .4byte SootopolisCity_House3 + .4byte SootopolisCity_House4 + .4byte SootopolisCity_House5 + .4byte SootopolisCity_House6 + .4byte SootopolisCity_House7 + .4byte SootopolisCity_LotadAndSeedotHouse + .4byte SootopolisCity_MysteryEventsHouse_1F + .4byte SootopolisCity_MysteryEventsHouse_B1F + +gMapGroup16: @ 84860AC + .4byte EverGrandeCity_SidneysRoom + .4byte EverGrandeCity_PhoebesRoom + .4byte EverGrandeCity_GlaciasRoom + .4byte EverGrandeCity_DrakesRoom + .4byte EverGrandeCity_ChampionsRoom + .4byte EverGrandeCity_Hall1 + .4byte EverGrandeCity_Hall2 + .4byte EverGrandeCity_Hall3 + .4byte EverGrandeCity_Hall4 + .4byte EverGrandeCity_Hall5 + .4byte EverGrandeCity_PokemonLeague_1F + .4byte EverGrandeCity_HallOfFame + .4byte EverGrandeCity_PokemonCenter_1F + .4byte EverGrandeCity_PokemonCenter_2F + .4byte EverGrandeCity_PokemonLeague_2F + +gMapGroup17: @ 84860E8 + .4byte Route104_MrBrineysHouse + .4byte Route104_PrettyPetalFlowerShop + +gMapGroup18: @ 84860F0 + .4byte Route111_WinstrateFamilysHouse + .4byte Route111_OldLadysRestStop + +gMapGroup19: @ 84860F8 + .4byte Route112_CableCarStation + .4byte MtChimney_CableCarStation + +gMapGroup20: @ 8486100 + .4byte Route114_FossilManiacsHouse + .4byte Route114_FossilManiacsTunnel + .4byte Route114_LanettesHouse + +gMapGroup21: @ 848610C + .4byte Route116_TunnelersRestHouse + +gMapGroup22: @ 8486110 + .4byte Route117_PokemonDayCare + +gMapGroup23: @ 8486114 + .4byte Route121_SafariZoneEntrance + +gMapGroup24: @ 8486118 + .4byte MeteorFalls_1F_1R + .4byte MeteorFalls_1F_2R + .4byte MeteorFalls_B1F_1R + .4byte MeteorFalls_B1F_2R + .4byte RusturfTunnel + .4byte Underwater_SootopolisCity + .4byte DesertRuins + .4byte GraniteCave_1F + .4byte GraniteCave_B1F + .4byte GraniteCave_B2F + .4byte GraniteCave_StevensRoom + .4byte PetalburgWoods + .4byte MtChimney + .4byte JaggedPass + .4byte FieryPath + .4byte MtPyre_1F + .4byte MtPyre_2F + .4byte MtPyre_3F + .4byte MtPyre_4F + .4byte MtPyre_5F + .4byte MtPyre_6F + .4byte MtPyre_Exterior + .4byte MtPyre_Summit + .4byte AquaHideout_1F + .4byte AquaHideout_B1F + .4byte AquaHideout_B2F + .4byte Underwater_SeafloorCavern + .4byte SeafloorCavern_Entrance + .4byte SeafloorCavern_Room1 + .4byte SeafloorCavern_Room2 + .4byte SeafloorCavern_Room3 + .4byte SeafloorCavern_Room4 + .4byte SeafloorCavern_Room5 + .4byte SeafloorCavern_Room6 + .4byte SeafloorCavern_Room7 + .4byte SeafloorCavern_Room8 + .4byte SeafloorCavern_Room9 + .4byte CaveOfOrigin_Entrance + .4byte CaveOfOrigin_1F + .4byte CaveOfOrigin_UnusedRubySapphireMap1 + .4byte CaveOfOrigin_UnusedRubySapphireMap2 + .4byte CaveOfOrigin_UnusedRubySapphireMap3 + .4byte CaveOfOrigin_B1F + .4byte VictoryRoad_1F + .4byte VictoryRoad_B1F + .4byte VictoryRoad_B2F + .4byte ShoalCave_LowTideEntranceRoom + .4byte ShoalCave_LowTideInnerRoom + .4byte ShoalCave_LowTideStairsRoom + .4byte ShoalCave_LowTideLowerRoom + .4byte ShoalCave_HighTideEntranceRoom + .4byte ShoalCave_HighTideInnerRoom + .4byte NewMauville_Entrance + .4byte NewMauville_Inside + .4byte AbandonedShip_Deck + .4byte AbandonedShip_Corridors_1F + .4byte AbandonedShip_Rooms_1F + .4byte AbandonedShip_Corridors_B1F + .4byte AbandonedShip_Rooms_B1F + .4byte AbandonedShip_Rooms2_B1F + .4byte AbandonedShip_Underwater1 + .4byte AbandonedShip_Room_B1F + .4byte AbandonedShip_Rooms2_1F + .4byte AbandonedShip_CaptainsOffice + .4byte AbandonedShip_Underwater2 + .4byte AbandonedShip_HiddenFloorCorridors + .4byte AbandonedShip_HiddenFloorRooms + .4byte IslandCave + .4byte AncientTomb + .4byte Underwater_Route134 + .4byte Underwater_SealedChamber + .4byte SealedChamber_OuterRoom + .4byte SealedChamber_InnerRoom + .4byte ScorchedSlab + .4byte AquaHideout_UnusedRubyMap1 + .4byte AquaHideout_UnusedRubyMap2 + .4byte AquaHideout_UnusedRubyMap3 + .4byte SkyPillar_Entrance + .4byte SkyPillar_Outside + .4byte SkyPillar_1F + .4byte SkyPillar_2F + .4byte SkyPillar_3F + .4byte SkyPillar_4F + .4byte ShoalCave_LowTideIceRoom + .4byte SkyPillar_5F + .4byte SkyPillar_Top + .4byte MagmaHideout_1F + .4byte MagmaHideout_2F_1R + .4byte MagmaHideout_2F_2R + .4byte MagmaHideout_3F_1R + .4byte MagmaHideout_3F_2R + .4byte MagmaHideout_4F + .4byte MagmaHideout_3F_3R + .4byte MagmaHideout_2F_3R + .4byte MirageTower_1F + .4byte MirageTower_2F + .4byte MirageTower_3F + .4byte MirageTower_4F + .4byte DesertUnderpass + .4byte ArtisanCave_B1F + .4byte ArtisanCave_1F + .4byte Underwater_MarineCave + .4byte MarineCave_Entrance + .4byte MarineCave_End + .4byte TerraCave_Entrance + .4byte TerraCave_End + .4byte AlteringCave + .4byte MeteorFalls_StevensCave + +gMapGroup25: @ 84862C8 + .4byte SecretBase_RedCave1 + .4byte SecretBase_BrownCave1 + .4byte SecretBase_BlueCave1 + .4byte SecretBase_YellowCave1 + .4byte SecretBase_Tree1 + .4byte SecretBase_Shrub1 + .4byte SecretBase_RedCave2 + .4byte SecretBase_BrownCave2 + .4byte SecretBase_BlueCave2 + .4byte SecretBase_YellowCave2 + .4byte SecretBase_Tree2 + .4byte SecretBase_Shrub2 + .4byte SecretBase_RedCave3 + .4byte SecretBase_BrownCave3 + .4byte SecretBase_BlueCave3 + .4byte SecretBase_YellowCave3 + .4byte SecretBase_Tree3 + .4byte SecretBase_Shrub3 + .4byte SecretBase_RedCave4 + .4byte SecretBase_BrownCave4 + .4byte SecretBase_BlueCave4 + .4byte SecretBase_YellowCave4 + .4byte SecretBase_Tree4 + .4byte SecretBase_Shrub4 + .4byte SingleBattleColosseum + .4byte TradeCenter + .4byte RecordCorner + .4byte DoubleBattleColosseum + .4byte LinkContestRoom1 + .4byte UnknownMap_25_29 + .4byte UnknownMap_25_30 + .4byte UnknownMap_25_31 + .4byte UnknownMap_25_32 + .4byte UnknownMap_25_33 + .4byte UnknownMap_25_34 + .4byte LinkContestRoom2 + .4byte LinkContestRoom3 + .4byte LinkContestRoom4 + .4byte LinkContestRoom5 + .4byte LinkContestRoom6 + .4byte InsideOfTruck + .4byte SSTidalCorridor + .4byte SSTidalLowerDeck + .4byte SSTidalRooms + .4byte BattlePyramidSquare01 + .4byte BattlePyramidSquare02 + .4byte BattlePyramidSquare03 + .4byte BattlePyramidSquare04 + .4byte BattlePyramidSquare05 + .4byte BattlePyramidSquare06 + .4byte BattlePyramidSquare07 + .4byte BattlePyramidSquare08 + .4byte BattlePyramidSquare09 + .4byte BattlePyramidSquare10 + .4byte BattlePyramidSquare11 + .4byte BattlePyramidSquare12 + .4byte BattlePyramidSquare13 + .4byte BattlePyramidSquare14 + .4byte BattlePyramidSquare15 + .4byte BattlePyramidSquare16 + .4byte UnionRoom + +gMapGroup26: @ 84863BC + .4byte SafariZone_Northwest + .4byte SafariZone_North + .4byte SafariZone_Southwest + .4byte SafariZone_South + .4byte BattleFrontier_OutsideWest + .4byte BattleFrontier_BattleTowerLobby + .4byte BattleFrontier_BattleTowerElevator + .4byte BattleFrontier_BattleTowerCorridor + .4byte BattleFrontier_BattleTowerBattleRoom + .4byte SouthernIsland_Exterior + .4byte SouthernIsland_Interior + .4byte SafariZone_RestHouse + .4byte SafariZone_Northeast + .4byte SafariZone_Southeast + .4byte BattleFrontier_OutsideEast + .4byte BattleFrontier_BattleTowerMultiBattleRoom + .4byte BattleFrontier_BattleTowerCorridor2 + .4byte BattleFrontier_BattleTowerBattleRoom2 + .4byte BattleFrontier_BattleDomeLobby + .4byte BattleFrontier_BattleDomeCorridor + .4byte BattleFrontier_BattleDomePreBattleRoom + .4byte BattleFrontier_BattleDomeBattleRoom + .4byte BattleFrontier_BattlePalaceLobby + .4byte BattleFrontier_BattlePalaceCorridor + .4byte BattleFrontier_BattlePalaceBattleRoom + .4byte BattleFrontier_BattlePyramidLobby + .4byte BattleFrontier_BattlePyramidEmptySquare + .4byte BattleFrontier_BattlePyramidTop + .4byte BattleFrontier_BattleArenaLobby + .4byte BattleFrontier_BattleArenaCorridor + .4byte BattleFrontier_BattleArenaBattleRoom + .4byte BattleFrontier_BattleFactoryLobby + .4byte BattleFrontier_BattleFactoryPreBattleRoom + .4byte BattleFrontier_BattleFactoryBattleRoom + .4byte BattleFrontier_BattlePikeLobby + .4byte BattleFrontier_BattlePikeCorridor + .4byte BattleFrontier_BattlePikeThreePathRoom + .4byte BattleFrontier_BattlePikeRandomRoom1 + .4byte BattleFrontier_BattlePikeRandomRoom2 + .4byte BattleFrontier_BattlePikeRandomRoom3 + .4byte BattleFrontier_RankingHall + .4byte BattleFrontier_Lounge1 + .4byte BattleFrontier_BattlePointExchangeServiceCorner + .4byte BattleFrontier_Lounge2 + .4byte BattleFrontier_Lounge3 + .4byte BattleFrontier_Lounge4 + .4byte BattleFrontier_ScottsHouse + .4byte BattleFrontier_Lounge5 + .4byte BattleFrontier_Lounge6 + .4byte BattleFrontier_Lounge7 + .4byte BattleFrontier_ReceptionGate + .4byte BattleFrontier_Lounge8 + .4byte BattleFrontier_Lounge9 + .4byte BattleFrontier_PokemonCenter_1F + .4byte BattleFrontier_PokemonCenter_2F + .4byte BattleFrontier_Mart + .4byte FarawayIsland_Entrance + .4byte FarawayIsland_Interior + .4byte BirthIsland_Exterior + .4byte BirthIsland_Harbor + .4byte TrainerHill_Entrance + .4byte TrainerHill_1F + .4byte TrainerHill_2F + .4byte TrainerHill_3F + .4byte TrainerHill_4F + .4byte TrainerHill_Roof + .4byte NavelRock_Exterior + .4byte NavelRock_Harbor + .4byte NavelRock_Entrance + .4byte NavelRock_B1F + .4byte NavelRock_Fork + .4byte NavelRock_Up1 + .4byte NavelRock_Up2 + .4byte NavelRock_Up3 + .4byte NavelRock_Up4 + .4byte NavelRock_Top + .4byte NavelRock_Down01 + .4byte NavelRock_Down02 + .4byte NavelRock_Down03 + .4byte NavelRock_Down04 + .4byte NavelRock_Down05 + .4byte NavelRock_Down06 + .4byte NavelRock_Down07 + .4byte NavelRock_Down08 + .4byte NavelRock_Down09 + .4byte NavelRock_Down10 + .4byte NavelRock_Down11 + .4byte NavelRock_Bottom + .4byte TrainerHill_Elevator + +gMapGroup27: @ 8486520 + .4byte Route104_Prototype + .4byte Route104_PrototypePrettyPetalFlowerShop + +gMapGroup28: @ 8486528 + .4byte Route109_SeashoreHouse + +gMapGroup29: @ 848652C + .4byte Route110_TrickHouseEntrance + .4byte Route110_TrickHouseEnd + .4byte Route110_TrickHouseCorridor + .4byte Route110_TrickHousePuzzle1 + .4byte Route110_TrickHousePuzzle2 + .4byte Route110_TrickHousePuzzle3 + .4byte Route110_TrickHousePuzzle4 + .4byte Route110_TrickHousePuzzle5 + .4byte Route110_TrickHousePuzzle6 + .4byte Route110_TrickHousePuzzle7 + .4byte Route110_TrickHousePuzzle8 + .4byte Route110_SeasideCyclingRoadEntrance1 + .4byte Route110_SeasideCyclingRoadEntrance2 + +gMapGroup30: @ 8486560 + .4byte Route113_GlassWorkshop + +gMapGroup31: @ 8486564 + .4byte Route123_BerryMastersHouse + +gMapGroup32: @ 8486568 + .4byte Route119_WeatherInstitute_1F + .4byte Route119_WeatherInstitute_2F + .4byte Route119_House + +gMapGroup33: @ 8486574 + .4byte Route124_DivingTreasureHuntersHouse + + .align 2 +gMapGroups:: @ 8486578 + .4byte gMapGroup0 + .4byte gMapGroup1 + .4byte gMapGroup2 + .4byte gMapGroup3 + .4byte gMapGroup4 + .4byte gMapGroup5 + .4byte gMapGroup6 + .4byte gMapGroup7 + .4byte gMapGroup8 + .4byte gMapGroup9 + .4byte gMapGroup10 + .4byte gMapGroup11 + .4byte gMapGroup12 + .4byte gMapGroup13 + .4byte gMapGroup14 + .4byte gMapGroup15 + .4byte gMapGroup16 + .4byte gMapGroup17 + .4byte gMapGroup18 + .4byte gMapGroup19 + .4byte gMapGroup20 + .4byte gMapGroup21 + .4byte gMapGroup22 + .4byte gMapGroup23 + .4byte gMapGroup24 + .4byte gMapGroup25 + .4byte gMapGroup26 + .4byte gMapGroup27 + .4byte gMapGroup28 + .4byte gMapGroup29 + .4byte gMapGroup30 + .4byte gMapGroup31 + .4byte gMapGroup32 + .4byte gMapGroup33 + -- cgit v1.2.3 From 135a11e50eba1e12108e5c2025f534e3bd0cc722 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:41:41 -0500 Subject: Move events and scripts into map dirs --- data/event_scripts.s | 1036 +++++------ data/map_events.s | 1036 +++++------ data/maps/AbandonedShip_CaptainsOffice/events.inc | 11 + data/maps/AbandonedShip_CaptainsOffice/scripts.inc | 44 + data/maps/AbandonedShip_Corridors_1F/events.inc | 21 + data/maps/AbandonedShip_Corridors_1F/scripts.inc | 27 + data/maps/AbandonedShip_Corridors_B1F/events.inc | 20 + data/maps/AbandonedShip_Corridors_B1F/scripts.inc | 91 + data/maps/AbandonedShip_Deck/events.inc | 10 + data/maps/AbandonedShip_Deck/scripts.inc | 8 + .../AbandonedShip_HiddenFloorCorridors/events.inc | 17 + .../AbandonedShip_HiddenFloorCorridors/scripts.inc | 171 ++ .../maps/AbandonedShip_HiddenFloorRooms/events.inc | 32 + .../AbandonedShip_HiddenFloorRooms/scripts.inc | 148 ++ data/maps/AbandonedShip_Room_B1F/events.inc | 10 + data/maps/AbandonedShip_Room_B1F/scripts.inc | 3 + data/maps/AbandonedShip_Rooms2_1F/events.inc | 15 + data/maps/AbandonedShip_Rooms2_1F/scripts.inc | 158 ++ data/maps/AbandonedShip_Rooms2_B1F/events.inc | 13 + data/maps/AbandonedShip_Rooms2_B1F/scripts.inc | 13 + data/maps/AbandonedShip_Rooms_1F/events.inc | 17 + data/maps/AbandonedShip_Rooms_1F/scripts.inc | 81 + data/maps/AbandonedShip_Rooms_B1F/events.inc | 12 + data/maps/AbandonedShip_Rooms_B1F/scripts.inc | 18 + data/maps/AbandonedShip_Underwater1/events.inc | 7 + data/maps/AbandonedShip_Underwater1/scripts.inc | 8 + data/maps/AbandonedShip_Underwater2/events.inc | 6 + data/maps/AbandonedShip_Underwater2/scripts.inc | 8 + data/maps/AlteringCave/events.inc | 6 + data/maps/AlteringCave/scripts.inc | 8 + data/maps/AncientTomb/events.inc | 16 + data/maps/AncientTomb/scripts.inc | 98 ++ data/maps/AquaHideout_1F/events.inc | 13 + data/maps/AquaHideout_1F/scripts.inc | 122 ++ data/maps/AquaHideout_B1F/events.inc | 41 + data/maps/AquaHideout_B1F/scripts.inc | 171 ++ data/maps/AquaHideout_B2F/events.inc | 27 + data/maps/AquaHideout_B2F/scripts.inc | 160 ++ data/maps/AquaHideout_UnusedRubyMap1/events.inc | 3 + data/maps/AquaHideout_UnusedRubyMap1/scripts.inc | 3 + data/maps/AquaHideout_UnusedRubyMap2/events.inc | 3 + data/maps/AquaHideout_UnusedRubyMap2/scripts.inc | 3 + data/maps/AquaHideout_UnusedRubyMap3/events.inc | 3 + data/maps/AquaHideout_UnusedRubyMap3/scripts.inc | 3 + data/maps/ArtisanCave_1F/events.inc | 10 + data/maps/ArtisanCave_1F/scripts.inc | 3 + data/maps/ArtisanCave_B1F/events.inc | 16 + data/maps/ArtisanCave_B1F/scripts.inc | 8 + .../events.inc | 14 + .../scripts.inc | 712 ++++++++ .../BattleFrontier_BattleArenaCorridor/events.inc | 6 + .../BattleFrontier_BattleArenaCorridor/scripts.inc | 90 + .../BattleFrontier_BattleArenaLobby/events.inc | 17 + .../BattleFrontier_BattleArenaLobby/scripts.inc | 638 +++++++ .../BattleFrontier_BattleDomeBattleRoom/events.inc | 20 + .../scripts.inc | 1277 ++++++++++++++ .../BattleFrontier_BattleDomeCorridor/events.inc | 10 + .../BattleFrontier_BattleDomeCorridor/scripts.inc | 152 ++ .../maps/BattleFrontier_BattleDomeLobby/events.inc | 21 + .../BattleFrontier_BattleDomeLobby/scripts.inc | 777 +++++++++ .../events.inc | 10 + .../scripts.inc | 417 +++++ .../events.inc | 13 + .../scripts.inc | 384 +++++ .../BattleFrontier_BattleFactoryLobby/events.inc | 20 + .../BattleFrontier_BattleFactoryLobby/scripts.inc | 611 +++++++ .../events.inc | 6 + .../scripts.inc | 726 ++++++++ .../events.inc | 14 + .../scripts.inc | 650 +++++++ .../BattleFrontier_BattlePalaceCorridor/events.inc | 18 + .../scripts.inc | 160 ++ .../BattleFrontier_BattlePalaceLobby/events.inc | 21 + .../BattleFrontier_BattlePalaceLobby/scripts.inc | 729 ++++++++ .../BattleFrontier_BattlePikeCorridor/events.inc | 6 + .../BattleFrontier_BattlePikeCorridor/scripts.inc | 69 + .../maps/BattleFrontier_BattlePikeLobby/events.inc | 18 + .../BattleFrontier_BattlePikeLobby/scripts.inc | 497 ++++++ .../events.inc | 16 + .../scripts.inc | 895 ++++++++++ .../events.inc | 6 + .../scripts.inc | 43 + .../events.inc | 12 + .../scripts.inc | 50 + .../events.inc | 18 + .../scripts.inc | 393 +++++ .../events.inc | 19 + .../scripts.inc | 764 ++++++++ .../events.inc | 21 + .../scripts.inc | 784 +++++++++ .../BattleFrontier_BattlePyramidLobby/events.inc | 16 + .../BattleFrontier_BattlePyramidLobby/scripts.inc | 970 +++++++++++ .../BattleFrontier_BattlePyramidTop/events.inc | 10 + .../BattleFrontier_BattlePyramidTop/scripts.inc | 379 ++++ .../events.inc | 12 + .../scripts.inc | 651 +++++++ .../events.inc | 11 + .../scripts.inc | 540 ++++++ .../BattleFrontier_BattleTowerCorridor/events.inc | 6 + .../BattleFrontier_BattleTowerCorridor/scripts.inc | 59 + .../BattleFrontier_BattleTowerCorridor2/events.inc | 9 + .../scripts.inc | 172 ++ .../BattleFrontier_BattleTowerElevator/events.inc | 6 + .../BattleFrontier_BattleTowerElevator/scripts.inc | 91 + .../BattleFrontier_BattleTowerLobby/events.inc | 26 + .../BattleFrontier_BattleTowerLobby/scripts.inc | 1589 +++++++++++++++++ .../events.inc | 14 + .../scripts.inc | 1822 ++++++++++++++++++++ data/maps/BattleFrontier_Lounge1/events.inc | 11 + data/maps/BattleFrontier_Lounge1/scripts.inc | 269 +++ data/maps/BattleFrontier_Lounge2/events.inc | 14 + data/maps/BattleFrontier_Lounge2/scripts.inc | 373 ++++ data/maps/BattleFrontier_Lounge3/events.inc | 13 + data/maps/BattleFrontier_Lounge3/scripts.inc | 483 ++++++ data/maps/BattleFrontier_Lounge4/events.inc | 11 + data/maps/BattleFrontier_Lounge4/scripts.inc | 30 + data/maps/BattleFrontier_Lounge5/events.inc | 13 + data/maps/BattleFrontier_Lounge5/scripts.inc | 206 +++ data/maps/BattleFrontier_Lounge6/events.inc | 9 + data/maps/BattleFrontier_Lounge6/scripts.inc | 82 + data/maps/BattleFrontier_Lounge7/events.inc | 12 + data/maps/BattleFrontier_Lounge7/scripts.inc | 482 ++++++ data/maps/BattleFrontier_Lounge8/events.inc | 11 + data/maps/BattleFrontier_Lounge8/scripts.inc | 45 + data/maps/BattleFrontier_Lounge9/events.inc | 10 + data/maps/BattleFrontier_Lounge9/scripts.inc | 3 + data/maps/BattleFrontier_Mart/events.inc | 13 + data/maps/BattleFrontier_Mart/scripts.inc | 67 + data/maps/BattleFrontier_OutsideEast/events.inc | 57 + data/maps/BattleFrontier_OutsideEast/scripts.inc | 444 +++++ data/maps/BattleFrontier_OutsideWest/events.inc | 49 + data/maps/BattleFrontier_OutsideWest/scripts.inc | 526 ++++++ .../BattleFrontier_PokemonCenter_1F/events.inc | 15 + .../BattleFrontier_PokemonCenter_1F/scripts.inc | 59 + .../BattleFrontier_PokemonCenter_2F/events.inc | 14 + .../BattleFrontier_PokemonCenter_2F/scripts.inc | 19 + data/maps/BattleFrontier_RankingHall/events.inc | 26 + data/maps/BattleFrontier_RankingHall/scripts.inc | 135 ++ data/maps/BattleFrontier_ReceptionGate/events.inc | 14 + data/maps/BattleFrontier_ReceptionGate/scripts.inc | 505 ++++++ data/maps/BattleFrontier_ScottsHouse/events.inc | 10 + data/maps/BattleFrontier_ScottsHouse/scripts.inc | 406 +++++ data/maps/BattlePyramidSquare01/events.inc | 12 + data/maps/BattlePyramidSquare01/scripts.inc | 1 + data/maps/BattlePyramidSquare02/events.inc | 12 + data/maps/BattlePyramidSquare02/scripts.inc | 1 + data/maps/BattlePyramidSquare03/events.inc | 12 + data/maps/BattlePyramidSquare03/scripts.inc | 1 + data/maps/BattlePyramidSquare04/events.inc | 12 + data/maps/BattlePyramidSquare04/scripts.inc | 1 + data/maps/BattlePyramidSquare05/events.inc | 12 + data/maps/BattlePyramidSquare05/scripts.inc | 1 + data/maps/BattlePyramidSquare06/events.inc | 12 + data/maps/BattlePyramidSquare06/scripts.inc | 1 + data/maps/BattlePyramidSquare07/events.inc | 12 + data/maps/BattlePyramidSquare07/scripts.inc | 1 + data/maps/BattlePyramidSquare08/events.inc | 12 + data/maps/BattlePyramidSquare08/scripts.inc | 1 + data/maps/BattlePyramidSquare09/events.inc | 12 + data/maps/BattlePyramidSquare09/scripts.inc | 1 + data/maps/BattlePyramidSquare10/events.inc | 12 + data/maps/BattlePyramidSquare10/scripts.inc | 1 + data/maps/BattlePyramidSquare11/events.inc | 12 + data/maps/BattlePyramidSquare11/scripts.inc | 1 + data/maps/BattlePyramidSquare12/events.inc | 12 + data/maps/BattlePyramidSquare12/scripts.inc | 1 + data/maps/BattlePyramidSquare13/events.inc | 12 + data/maps/BattlePyramidSquare13/scripts.inc | 1 + data/maps/BattlePyramidSquare14/events.inc | 12 + data/maps/BattlePyramidSquare14/scripts.inc | 1 + data/maps/BattlePyramidSquare15/events.inc | 12 + data/maps/BattlePyramidSquare15/scripts.inc | 1 + data/maps/BattlePyramidSquare16/events.inc | 12 + data/maps/BattlePyramidSquare16/scripts.inc | 3 + data/maps/BirthIsland_Exterior/events.inc | 10 + data/maps/BirthIsland_Exterior/scripts.inc | 125 ++ data/maps/BirthIsland_Harbor/events.inc | 10 + data/maps/BirthIsland_Harbor/scripts.inc | 27 + data/maps/CaveOfOrigin_1F/events.inc | 7 + data/maps/CaveOfOrigin_1F/scripts.inc | 9 + data/maps/CaveOfOrigin_B1F/events.inc | 9 + data/maps/CaveOfOrigin_B1F/scripts.inc | 118 ++ data/maps/CaveOfOrigin_Entrance/events.inc | 7 + data/maps/CaveOfOrigin_Entrance/scripts.inc | 8 + .../CaveOfOrigin_UnusedRubySapphireMap1/events.inc | 7 + .../scripts.inc | 9 + .../CaveOfOrigin_UnusedRubySapphireMap2/events.inc | 7 + .../scripts.inc | 9 + .../CaveOfOrigin_UnusedRubySapphireMap3/events.inc | 7 + .../scripts.inc | 9 + data/maps/DesertRuins/events.inc | 16 + data/maps/DesertRuins/scripts.inc | 98 ++ data/maps/DesertUnderpass/events.inc | 9 + data/maps/DesertUnderpass/scripts.inc | 36 + data/maps/DewfordTown/events.inc | 24 + data/maps/DewfordTown/scripts.inc | 805 +++++++++ data/maps/DewfordTown_Gym/events.inc | 23 + data/maps/DewfordTown_Gym/scripts.inc | 491 ++++++ data/maps/DewfordTown_Hall/events.inc | 22 + data/maps/DewfordTown_Hall/scripts.inc | 453 +++++ data/maps/DewfordTown_House1/events.inc | 12 + data/maps/DewfordTown_House1/scripts.inc | 36 + data/maps/DewfordTown_House2/events.inc | 11 + data/maps/DewfordTown_House2/scripts.inc | 59 + data/maps/DewfordTown_PokemonCenter_1F/events.inc | 13 + data/maps/DewfordTown_PokemonCenter_1F/scripts.inc | 37 + data/maps/DewfordTown_PokemonCenter_2F/events.inc | 14 + data/maps/DewfordTown_PokemonCenter_2F/scripts.inc | 19 + data/maps/DoubleBattleColosseum/events.inc | 15 + data/maps/DoubleBattleColosseum/scripts.inc | 3 + data/maps/EverGrandeCity/events.inc | 29 + data/maps/EverGrandeCity/scripts.inc | 38 + data/maps/EverGrandeCity_ChampionsRoom/events.inc | 12 + data/maps/EverGrandeCity_ChampionsRoom/scripts.inc | 346 ++++ data/maps/EverGrandeCity_DrakesRoom/events.inc | 10 + data/maps/EverGrandeCity_DrakesRoom/scripts.inc | 94 + data/maps/EverGrandeCity_GlaciasRoom/events.inc | 10 + data/maps/EverGrandeCity_GlaciasRoom/scripts.inc | 86 + data/maps/EverGrandeCity_Hall1/events.inc | 9 + data/maps/EverGrandeCity_Hall1/scripts.inc | 12 + data/maps/EverGrandeCity_Hall2/events.inc | 9 + data/maps/EverGrandeCity_Hall2/scripts.inc | 12 + data/maps/EverGrandeCity_Hall3/events.inc | 9 + data/maps/EverGrandeCity_Hall3/scripts.inc | 12 + data/maps/EverGrandeCity_Hall4/events.inc | 7 + data/maps/EverGrandeCity_Hall4/scripts.inc | 12 + data/maps/EverGrandeCity_Hall5/events.inc | 9 + data/maps/EverGrandeCity_Hall5/scripts.inc | 12 + data/maps/EverGrandeCity_HallOfFame/events.inc | 9 + data/maps/EverGrandeCity_HallOfFame/scripts.inc | 99 ++ data/maps/EverGrandeCity_PhoebesRoom/events.inc | 10 + data/maps/EverGrandeCity_PhoebesRoom/scripts.inc | 87 + .../EverGrandeCity_PokemonCenter_1F/events.inc | 14 + .../EverGrandeCity_PokemonCenter_1F/scripts.inc | 104 ++ .../EverGrandeCity_PokemonCenter_2F/events.inc | 14 + .../EverGrandeCity_PokemonCenter_2F/scripts.inc | 20 + .../EverGrandeCity_PokemonLeague_1F/events.inc | 16 + .../EverGrandeCity_PokemonLeague_1F/scripts.inc | 142 ++ .../EverGrandeCity_PokemonLeague_2F/events.inc | 14 + .../EverGrandeCity_PokemonLeague_2F/scripts.inc | 19 + data/maps/EverGrandeCity_SidneysRoom/events.inc | 10 + data/maps/EverGrandeCity_SidneysRoom/scripts.inc | 91 + data/maps/FallarborTown/events.inc | 26 + data/maps/FallarborTown/scripts.inc | 96 ++ .../FallarborTown_BattleTentBattleRoom/events.inc | 8 + .../FallarborTown_BattleTentBattleRoom/scripts.inc | 268 +++ .../FallarborTown_BattleTentCorridor/events.inc | 6 + .../FallarborTown_BattleTentCorridor/scripts.inc | 64 + data/maps/FallarborTown_BattleTentLobby/events.inc | 17 + .../maps/FallarborTown_BattleTentLobby/scripts.inc | 402 +++++ data/maps/FallarborTown_House1/events.inc | 11 + data/maps/FallarborTown_House1/scripts.inc | 126 ++ data/maps/FallarborTown_House2/events.inc | 10 + data/maps/FallarborTown_House2/scripts.inc | 103 ++ data/maps/FallarborTown_Mart/events.inc | 14 + data/maps/FallarborTown_Mart/scripts.inc | 66 + .../maps/FallarborTown_PokemonCenter_1F/events.inc | 14 + .../FallarborTown_PokemonCenter_1F/scripts.inc | 111 ++ .../maps/FallarborTown_PokemonCenter_2F/events.inc | 14 + .../FallarborTown_PokemonCenter_2F/scripts.inc | 19 + data/maps/FarawayIsland_Entrance/events.inc | 19 + data/maps/FarawayIsland_Entrance/scripts.inc | 46 + data/maps/FarawayIsland_Interior/events.inc | 10 + data/maps/FarawayIsland_Interior/scripts.inc | 207 +++ data/maps/FieryPath/events.inc | 17 + data/maps/FieryPath/scripts.inc | 15 + data/maps/FortreeCity/events.inc | 31 + data/maps/FortreeCity/scripts.inc | 159 ++ data/maps/FortreeCity_DecorationShop/events.inc | 13 + data/maps/FortreeCity_DecorationShop/scripts.inc | 72 + data/maps/FortreeCity_Gym/events.inc | 21 + data/maps/FortreeCity_Gym/scripts.inc | 325 ++++ data/maps/FortreeCity_House1/events.inc | 12 + data/maps/FortreeCity_House1/scripts.inc | 102 ++ data/maps/FortreeCity_House2/events.inc | 11 + data/maps/FortreeCity_House2/scripts.inc | 84 + data/maps/FortreeCity_House3/events.inc | 11 + data/maps/FortreeCity_House3/scripts.inc | 29 + data/maps/FortreeCity_House4/events.inc | 12 + data/maps/FortreeCity_House4/scripts.inc | 99 ++ data/maps/FortreeCity_House5/events.inc | 12 + data/maps/FortreeCity_House5/scripts.inc | 35 + data/maps/FortreeCity_Mart/events.inc | 13 + data/maps/FortreeCity_Mart/scripts.inc | 57 + data/maps/FortreeCity_PokemonCenter_1F/events.inc | 14 + data/maps/FortreeCity_PokemonCenter_1F/scripts.inc | 55 + data/maps/FortreeCity_PokemonCenter_2F/events.inc | 14 + data/maps/FortreeCity_PokemonCenter_2F/scripts.inc | 19 + data/maps/GraniteCave_1F/events.inc | 13 + data/maps/GraniteCave_1F/scripts.inc | 40 + data/maps/GraniteCave_B1F/events.inc | 15 + data/maps/GraniteCave_B1F/scripts.inc | 11 + data/maps/GraniteCave_B2F/events.inc | 25 + data/maps/GraniteCave_B2F/scripts.inc | 3 + data/maps/GraniteCave_StevensRoom/events.inc | 9 + data/maps/GraniteCave_StevensRoom/scripts.inc | 124 ++ data/maps/InsideOfTruck/events.inc | 25 + data/maps/InsideOfTruck/scripts.inc | 60 + data/maps/IslandCave/events.inc | 16 + data/maps/IslandCave/scripts.inc | 129 ++ data/maps/JaggedPass/events.inc | 35 + data/maps/JaggedPass/scripts.inc | 279 +++ data/maps/LavaridgeTown/events.inc | 35 + data/maps/LavaridgeTown/scripts.inc | 425 +++++ data/maps/LavaridgeTown_Gym_1F/events.inc | 43 + data/maps/LavaridgeTown_Gym_1F/scripts.inc | 424 +++++ data/maps/LavaridgeTown_Gym_B1F/events.inc | 35 + data/maps/LavaridgeTown_Gym_B1F/scripts.inc | 59 + data/maps/LavaridgeTown_HerbShop/events.inc | 12 + data/maps/LavaridgeTown_HerbShop/scripts.inc | 68 + data/maps/LavaridgeTown_House/events.inc | 12 + data/maps/LavaridgeTown_House/scripts.inc | 26 + data/maps/LavaridgeTown_Mart/events.inc | 12 + data/maps/LavaridgeTown_Mart/scripts.inc | 47 + .../maps/LavaridgeTown_PokemonCenter_1F/events.inc | 15 + .../LavaridgeTown_PokemonCenter_1F/scripts.inc | 48 + .../maps/LavaridgeTown_PokemonCenter_2F/events.inc | 14 + .../LavaridgeTown_PokemonCenter_2F/scripts.inc | 19 + data/maps/LilycoveCity/events.inc | 58 + data/maps/LilycoveCity/scripts.inc | 787 +++++++++ data/maps/LilycoveCity_ContestHall/events.inc | 51 + data/maps/LilycoveCity_ContestHall/scripts.inc | 509 ++++++ data/maps/LilycoveCity_ContestLobby/events.inc | 50 + data/maps/LilycoveCity_ContestLobby/scripts.inc | 1121 ++++++++++++ data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc | 14 + .../maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc | 131 ++ data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc | 15 + .../maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc | 140 ++ .../events.inc | 10 + .../scripts.inc | 129 ++ .../LilycoveCity_DepartmentStoreRooftop/events.inc | 16 + .../scripts.inc | 238 +++ .../LilycoveCity_DepartmentStore_1F/events.inc | 20 + .../LilycoveCity_DepartmentStore_1F/scripts.inc | 193 +++ .../LilycoveCity_DepartmentStore_2F/events.inc | 15 + .../LilycoveCity_DepartmentStore_2F/scripts.inc | 80 + .../LilycoveCity_DepartmentStore_3F/events.inc | 15 + .../LilycoveCity_DepartmentStore_3F/scripts.inc | 75 + .../LilycoveCity_DepartmentStore_4F/events.inc | 15 + .../LilycoveCity_DepartmentStore_4F/scripts.inc | 72 + .../LilycoveCity_DepartmentStore_5F/events.inc | 17 + .../LilycoveCity_DepartmentStore_5F/scripts.inc | 170 ++ data/maps/LilycoveCity_Harbor/events.inc | 14 + data/maps/LilycoveCity_Harbor/scripts.inc | 630 +++++++ data/maps/LilycoveCity_House1/events.inc | 11 + data/maps/LilycoveCity_House1/scripts.inc | 26 + data/maps/LilycoveCity_House2/events.inc | 10 + data/maps/LilycoveCity_House2/scripts.inc | 32 + data/maps/LilycoveCity_House3/events.inc | 15 + data/maps/LilycoveCity_House3/scripts.inc | 169 ++ data/maps/LilycoveCity_House4/events.inc | 11 + data/maps/LilycoveCity_House4/scripts.inc | 21 + .../maps/LilycoveCity_LilycoveMuseum_1F/events.inc | 38 + .../LilycoveCity_LilycoveMuseum_1F/scripts.inc | 296 ++++ .../maps/LilycoveCity_LilycoveMuseum_2F/events.inc | 26 + .../LilycoveCity_LilycoveMuseum_2F/scripts.inc | 340 ++++ .../maps/LilycoveCity_MoveDeletersHouse/events.inc | 10 + .../LilycoveCity_MoveDeletersHouse/scripts.inc | 111 ++ data/maps/LilycoveCity_PokemonCenter_1F/events.inc | 15 + .../maps/LilycoveCity_PokemonCenter_1F/scripts.inc | 68 + data/maps/LilycoveCity_PokemonCenter_2F/events.inc | 14 + .../maps/LilycoveCity_PokemonCenter_2F/scripts.inc | 19 + .../LilycoveCity_PokemonTrainerFanClub/events.inc | 18 + .../LilycoveCity_PokemonTrainerFanClub/scripts.inc | 864 ++++++++++ data/maps/LilycoveCity_UnusedMart/events.inc | 7 + data/maps/LilycoveCity_UnusedMart/scripts.inc | 3 + data/maps/LinkContestRoom1/events.inc | 18 + data/maps/LinkContestRoom1/scripts.inc | 1 + data/maps/LinkContestRoom2/events.inc | 1 + data/maps/LinkContestRoom2/scripts.inc | 1 + data/maps/LinkContestRoom3/events.inc | 1 + data/maps/LinkContestRoom3/scripts.inc | 1 + data/maps/LinkContestRoom4/events.inc | 1 + data/maps/LinkContestRoom4/scripts.inc | 1 + data/maps/LinkContestRoom5/events.inc | 1 + data/maps/LinkContestRoom5/scripts.inc | 1 + data/maps/LinkContestRoom6/events.inc | 1 + data/maps/LinkContestRoom6/scripts.inc | 1 + data/maps/LittlerootTown/events.inc | 35 + data/maps/LittlerootTown/scripts.inc | 1040 +++++++++++ .../LittlerootTown_BrendansHouse_1F/events.inc | 23 + .../LittlerootTown_BrendansHouse_1F/scripts.inc | 451 +++++ .../LittlerootTown_BrendansHouse_2F/events.inc | 30 + .../LittlerootTown_BrendansHouse_2F/scripts.inc | 318 ++++ data/maps/LittlerootTown_MaysHouse_1F/events.inc | 23 + data/maps/LittlerootTown_MaysHouse_1F/scripts.inc | 423 +++++ data/maps/LittlerootTown_MaysHouse_2F/events.inc | 30 + data/maps/LittlerootTown_MaysHouse_2F/scripts.inc | 422 +++++ .../LittlerootTown_ProfessorBirchsLab/events.inc | 32 + .../LittlerootTown_ProfessorBirchsLab/scripts.inc | 1030 +++++++++++ data/maps/MagmaHideout_1F/events.inc | 17 + data/maps/MagmaHideout_1F/scripts.inc | 53 + data/maps/MagmaHideout_2F_1R/events.inc | 14 + data/maps/MagmaHideout_2F_1R/scripts.inc | 75 + data/maps/MagmaHideout_2F_2R/events.inc | 15 + data/maps/MagmaHideout_2F_2R/scripts.inc | 78 + data/maps/MagmaHideout_2F_3R/events.inc | 7 + data/maps/MagmaHideout_2F_3R/scripts.inc | 3 + data/maps/MagmaHideout_3F_1R/events.inc | 13 + data/maps/MagmaHideout_3F_1R/scripts.inc | 43 + data/maps/MagmaHideout_3F_2R/events.inc | 10 + data/maps/MagmaHideout_3F_2R/scripts.inc | 26 + data/maps/MagmaHideout_3F_3R/events.inc | 10 + data/maps/MagmaHideout_3F_3R/scripts.inc | 3 + data/maps/MagmaHideout_4F/events.inc | 17 + data/maps/MagmaHideout_4F/scripts.inc | 228 +++ data/maps/MarineCave_End/events.inc | 12 + data/maps/MarineCave_End/scripts.inc | 78 + data/maps/MarineCave_Entrance/events.inc | 6 + data/maps/MarineCave_Entrance/scripts.inc | 8 + data/maps/MauvilleCity/events.inc | 35 + data/maps/MauvilleCity/scripts.inc | 677 ++++++++ data/maps/MauvilleCity_BikeShop/events.inc | 15 + data/maps/MauvilleCity_BikeShop/scripts.inc | 329 ++++ data/maps/MauvilleCity_GameCorner/events.inc | 47 + data/maps/MauvilleCity_GameCorner/scripts.inc | 821 +++++++++ data/maps/MauvilleCity_Gym/events.inc | 26 + data/maps/MauvilleCity_Gym/scripts.inc | 442 +++++ data/maps/MauvilleCity_House1/events.inc | 10 + data/maps/MauvilleCity_House1/scripts.inc | 47 + data/maps/MauvilleCity_House2/events.inc | 10 + data/maps/MauvilleCity_House2/scripts.inc | 69 + data/maps/MauvilleCity_Mart/events.inc | 12 + data/maps/MauvilleCity_Mart/scripts.inc | 53 + data/maps/MauvilleCity_PokemonCenter_1F/events.inc | 15 + .../maps/MauvilleCity_PokemonCenter_1F/scripts.inc | 54 + data/maps/MauvilleCity_PokemonCenter_2F/events.inc | 15 + .../maps/MauvilleCity_PokemonCenter_2F/scripts.inc | 31 + data/maps/MeteorFalls_1F_1R/events.inc | 29 + data/maps/MeteorFalls_1F_1R/scripts.inc | 312 ++++ data/maps/MeteorFalls_1F_2R/events.inc | 17 + data/maps/MeteorFalls_1F_2R/scripts.inc | 195 +++ data/maps/MeteorFalls_B1F_1R/events.inc | 11 + data/maps/MeteorFalls_B1F_1R/scripts.inc | 3 + data/maps/MeteorFalls_B1F_2R/events.inc | 9 + data/maps/MeteorFalls_B1F_2R/scripts.inc | 3 + data/maps/MeteorFalls_StevensCave/events.inc | 9 + data/maps/MeteorFalls_StevensCave/scripts.inc | 58 + data/maps/MirageTower_1F/events.inc | 7 + data/maps/MirageTower_1F/scripts.inc | 10 + data/maps/MirageTower_2F/events.inc | 7 + data/maps/MirageTower_2F/scripts.inc | 11 + data/maps/MirageTower_3F/events.inc | 11 + data/maps/MirageTower_3F/scripts.inc | 11 + data/maps/MirageTower_4F/events.inc | 11 + data/maps/MirageTower_4F/scripts.inc | 79 + data/maps/MossdeepCity/events.inc | 56 + data/maps/MossdeepCity/scripts.inc | 436 +++++ data/maps/MossdeepCity_GameCorner_1F/events.inc | 17 + data/maps/MossdeepCity_GameCorner_1F/scripts.inc | 80 + data/maps/MossdeepCity_GameCorner_B1F/events.inc | 9 + data/maps/MossdeepCity_GameCorner_B1F/scripts.inc | 3 + data/maps/MossdeepCity_Gym/events.inc | 72 + data/maps/MossdeepCity_Gym/scripts.inc | 658 +++++++ data/maps/MossdeepCity_House1/events.inc | 11 + data/maps/MossdeepCity_House1/scripts.inc | 42 + data/maps/MossdeepCity_House2/events.inc | 12 + data/maps/MossdeepCity_House2/scripts.inc | 70 + data/maps/MossdeepCity_House3/events.inc | 10 + data/maps/MossdeepCity_House3/scripts.inc | 52 + data/maps/MossdeepCity_House4/events.inc | 12 + data/maps/MossdeepCity_House4/scripts.inc | 63 + data/maps/MossdeepCity_Mart/events.inc | 13 + data/maps/MossdeepCity_Mart/scripts.inc | 60 + data/maps/MossdeepCity_PokemonCenter_1F/events.inc | 13 + .../maps/MossdeepCity_PokemonCenter_1F/scripts.inc | 36 + data/maps/MossdeepCity_PokemonCenter_2F/events.inc | 15 + .../maps/MossdeepCity_PokemonCenter_2F/scripts.inc | 28 + data/maps/MossdeepCity_SpaceCenter_1F/events.inc | 21 + data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc | 439 +++++ data/maps/MossdeepCity_SpaceCenter_2F/events.inc | 17 + data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc | 524 ++++++ data/maps/MossdeepCity_StevensHouse/events.inc | 18 + data/maps/MossdeepCity_StevensHouse/scripts.inc | 219 +++ data/maps/MtChimney/events.inc | 45 + data/maps/MtChimney/scripts.inc | 869 ++++++++++ data/maps/MtChimney_CableCarStation/events.inc | 11 + data/maps/MtChimney_CableCarStation/scripts.inc | 98 ++ data/maps/MtPyre_1F/events.inc | 16 + data/maps/MtPyre_1F/scripts.inc | 49 + data/maps/MtPyre_2F/events.inc | 20 + data/maps/MtPyre_2F/scripts.inc | 135 ++ data/maps/MtPyre_3F/events.inc | 17 + data/maps/MtPyre_3F/scripts.inc | 103 ++ data/maps/MtPyre_4F/events.inc | 15 + data/maps/MtPyre_4F/scripts.inc | 20 + data/maps/MtPyre_5F/events.inc | 14 + data/maps/MtPyre_5F/scripts.inc | 23 + data/maps/MtPyre_6F/events.inc | 12 + data/maps/MtPyre_6F/scripts.inc | 73 + data/maps/MtPyre_Exterior/events.inc | 23 + data/maps/MtPyre_Exterior/scripts.inc | 28 + data/maps/MtPyre_Summit/events.inc | 30 + data/maps/MtPyre_Summit/scripts.inc | 640 +++++++ data/maps/NavelRock_B1F/events.inc | 7 + data/maps/NavelRock_B1F/scripts.inc | 3 + data/maps/NavelRock_Bottom/events.inc | 9 + data/maps/NavelRock_Bottom/scripts.inc | 88 + data/maps/NavelRock_Down01/events.inc | 7 + data/maps/NavelRock_Down01/scripts.inc | 3 + data/maps/NavelRock_Down02/events.inc | 7 + data/maps/NavelRock_Down02/scripts.inc | 3 + data/maps/NavelRock_Down03/events.inc | 7 + data/maps/NavelRock_Down03/scripts.inc | 3 + data/maps/NavelRock_Down04/events.inc | 7 + data/maps/NavelRock_Down04/scripts.inc | 3 + data/maps/NavelRock_Down05/events.inc | 7 + data/maps/NavelRock_Down05/scripts.inc | 3 + data/maps/NavelRock_Down06/events.inc | 7 + data/maps/NavelRock_Down06/scripts.inc | 3 + data/maps/NavelRock_Down07/events.inc | 7 + data/maps/NavelRock_Down07/scripts.inc | 3 + data/maps/NavelRock_Down08/events.inc | 7 + data/maps/NavelRock_Down08/scripts.inc | 3 + data/maps/NavelRock_Down09/events.inc | 7 + data/maps/NavelRock_Down09/scripts.inc | 3 + data/maps/NavelRock_Down10/events.inc | 7 + data/maps/NavelRock_Down10/scripts.inc | 3 + data/maps/NavelRock_Down11/events.inc | 7 + data/maps/NavelRock_Down11/scripts.inc | 3 + data/maps/NavelRock_Entrance/events.inc | 7 + data/maps/NavelRock_Entrance/scripts.inc | 3 + data/maps/NavelRock_Exterior/events.inc | 7 + data/maps/NavelRock_Exterior/scripts.inc | 8 + data/maps/NavelRock_Fork/events.inc | 8 + data/maps/NavelRock_Fork/scripts.inc | 3 + data/maps/NavelRock_Harbor/events.inc | 10 + data/maps/NavelRock_Harbor/scripts.inc | 27 + data/maps/NavelRock_Top/events.inc | 15 + data/maps/NavelRock_Top/scripts.inc | 127 ++ data/maps/NavelRock_Up1/events.inc | 7 + data/maps/NavelRock_Up1/scripts.inc | 3 + data/maps/NavelRock_Up2/events.inc | 7 + data/maps/NavelRock_Up2/scripts.inc | 3 + data/maps/NavelRock_Up3/events.inc | 7 + data/maps/NavelRock_Up3/scripts.inc | 3 + data/maps/NavelRock_Up4/events.inc | 7 + data/maps/NavelRock_Up4/scripts.inc | 3 + data/maps/NewMauville_Entrance/events.inc | 10 + data/maps/NewMauville_Entrance/scripts.inc | 61 + data/maps/NewMauville_Inside/events.inc | 38 + data/maps/NewMauville_Inside/scripts.inc | 282 +++ data/maps/OldaleTown/events.inc | 28 + data/maps/OldaleTown/scripts.inc | 408 +++++ data/maps/OldaleTown_House1/events.inc | 10 + data/maps/OldaleTown_House1/scripts.inc | 15 + data/maps/OldaleTown_House2/events.inc | 11 + data/maps/OldaleTown_House2/scripts.inc | 20 + data/maps/OldaleTown_Mart/events.inc | 12 + data/maps/OldaleTown_Mart/scripts.inc | 73 + data/maps/OldaleTown_PokemonCenter_1F/events.inc | 14 + data/maps/OldaleTown_PokemonCenter_1F/scripts.inc | 63 + data/maps/OldaleTown_PokemonCenter_2F/events.inc | 14 + data/maps/OldaleTown_PokemonCenter_2F/scripts.inc | 19 + data/maps/PacifidlogTown/events.inc | 21 + data/maps/PacifidlogTown/scripts.inc | 54 + data/maps/PacifidlogTown_House1/events.inc | 11 + data/maps/PacifidlogTown_House1/scripts.inc | 25 + data/maps/PacifidlogTown_House2/events.inc | 12 + data/maps/PacifidlogTown_House2/scripts.inc | 156 ++ data/maps/PacifidlogTown_House3/events.inc | 11 + data/maps/PacifidlogTown_House3/scripts.inc | 93 + data/maps/PacifidlogTown_House4/events.inc | 12 + data/maps/PacifidlogTown_House4/scripts.inc | 55 + data/maps/PacifidlogTown_House5/events.inc | 11 + data/maps/PacifidlogTown_House5/scripts.inc | 37 + .../PacifidlogTown_PokemonCenter_1F/events.inc | 15 + .../PacifidlogTown_PokemonCenter_1F/scripts.inc | 48 + .../PacifidlogTown_PokemonCenter_2F/events.inc | 14 + .../PacifidlogTown_PokemonCenter_2F/scripts.inc | 19 + data/maps/PetalburgCity/events.inc | 42 + data/maps/PetalburgCity/scripts.inc | 771 +++++++++ data/maps/PetalburgCity_Gym/events.inc | 72 + data/maps/PetalburgCity_Gym/scripts.inc | 1703 ++++++++++++++++++ data/maps/PetalburgCity_House1/events.inc | 11 + data/maps/PetalburgCity_House1/scripts.inc | 28 + data/maps/PetalburgCity_House2/events.inc | 11 + data/maps/PetalburgCity_House2/scripts.inc | 24 + data/maps/PetalburgCity_Mart/events.inc | 13 + data/maps/PetalburgCity_Mart/scripts.inc | 87 + .../maps/PetalburgCity_PokemonCenter_1F/events.inc | 15 + .../PetalburgCity_PokemonCenter_1F/scripts.inc | 98 ++ .../maps/PetalburgCity_PokemonCenter_2F/events.inc | 14 + .../PetalburgCity_PokemonCenter_2F/scripts.inc | 19 + data/maps/PetalburgCity_WallysHouse/events.inc | 11 + data/maps/PetalburgCity_WallysHouse/scripts.inc | 139 ++ data/maps/PetalburgWoods/events.inc | 38 + data/maps/PetalburgWoods/scripts.inc | 486 ++++++ data/maps/RecordCorner/events.inc | 18 + data/maps/RecordCorner/scripts.inc | 3 + data/maps/Route101/events.inc | 25 + data/maps/Route101/scripts.inc | 301 ++++ data/maps/Route102/events.inc | 18 + data/maps/Route102/scripts.inc | 119 ++ data/maps/Route103/events.inc | 31 + data/maps/Route103/scripts.inc | 368 ++++ data/maps/Route104/events.inc | 64 + data/maps/Route104/scripts.inc | 1227 +++++++++++++ data/maps/Route104_MrBrineysHouse/events.inc | 11 + data/maps/Route104_MrBrineysHouse/scripts.inc | 166 ++ .../maps/Route104_PrettyPetalFlowerShop/events.inc | 12 + .../Route104_PrettyPetalFlowerShop/scripts.inc | 110 ++ data/maps/Route104_Prototype/events.inc | 3 + data/maps/Route104_Prototype/scripts.inc | 3 + .../events.inc | 3 + .../scripts.inc | 3 + data/maps/Route105/events.inc | 20 + data/maps/Route105/scripts.inc | 107 ++ data/maps/Route106/events.inc | 19 + data/maps/Route106/scripts.inc | 52 + data/maps/Route107/events.inc | 12 + data/maps/Route107/scripts.inc | 58 + data/maps/Route108/events.inc | 18 + data/maps/Route108/scripts.inc | 53 + data/maps/Route109/events.inc | 42 + data/maps/Route109/scripts.inc | 573 ++++++ data/maps/Route109_SeashoreHouse/events.inc | 13 + data/maps/Route109_SeashoreHouse/scripts.inc | 196 +++ data/maps/Route110/events.inc | 79 + data/maps/Route110/scripts.inc | 1030 +++++++++++ .../events.inc | 16 + .../scripts.inc | 50 + .../events.inc | 16 + .../scripts.inc | 69 + data/maps/Route110_TrickHouseCorridor/events.inc | 9 + data/maps/Route110_TrickHouseCorridor/scripts.inc | 8 + data/maps/Route110_TrickHouseEnd/events.inc | 16 + data/maps/Route110_TrickHouseEnd/scripts.inc | 369 ++++ data/maps/Route110_TrickHouseEntrance/events.inc | 20 + data/maps/Route110_TrickHouseEntrance/scripts.inc | 901 ++++++++++ data/maps/Route110_TrickHousePuzzle1/events.inc | 28 + data/maps/Route110_TrickHousePuzzle1/scripts.inc | 79 + data/maps/Route110_TrickHousePuzzle2/events.inc | 24 + data/maps/Route110_TrickHousePuzzle2/scripts.inc | 146 ++ data/maps/Route110_TrickHousePuzzle3/events.inc | 26 + data/maps/Route110_TrickHousePuzzle3/scripts.inc | 360 ++++ data/maps/Route110_TrickHousePuzzle4/events.inc | 27 + data/maps/Route110_TrickHousePuzzle4/scripts.inc | 71 + data/maps/Route110_TrickHousePuzzle5/events.inc | 42 + data/maps/Route110_TrickHousePuzzle5/scripts.inc | 1091 ++++++++++++ data/maps/Route110_TrickHousePuzzle6/events.inc | 17 + data/maps/Route110_TrickHousePuzzle6/scripts.inc | 87 + data/maps/Route110_TrickHousePuzzle7/events.inc | 38 + data/maps/Route110_TrickHousePuzzle7/scripts.inc | 411 +++++ data/maps/Route110_TrickHousePuzzle8/events.inc | 17 + data/maps/Route110_TrickHousePuzzle8/scripts.inc | 72 + data/maps/Route111/events.inc | 114 ++ data/maps/Route111/scripts.inc | 756 ++++++++ data/maps/Route111_OldLadysRestStop/events.inc | 10 + data/maps/Route111_OldLadysRestStop/scripts.inc | 54 + .../maps/Route111_WinstrateFamilysHouse/events.inc | 13 + .../Route111_WinstrateFamilysHouse/scripts.inc | 105 ++ data/maps/Route112/events.inc | 32 + data/maps/Route112/scripts.inc | 146 ++ data/maps/Route112_CableCarStation/events.inc | 11 + data/maps/Route112_CableCarStation/scripts.inc | 99 ++ data/maps/Route113/events.inc | 57 + data/maps/Route113/scripts.inc | 176 ++ data/maps/Route113_GlassWorkshop/events.inc | 11 + data/maps/Route113_GlassWorkshop/scripts.inc | 397 +++++ data/maps/Route114/events.inc | 53 + data/maps/Route114/scripts.inc | 219 +++ data/maps/Route114_FossilManiacsHouse/events.inc | 17 + data/maps/Route114_FossilManiacsHouse/scripts.inc | 56 + data/maps/Route114_FossilManiacsTunnel/events.inc | 15 + data/maps/Route114_FossilManiacsTunnel/scripts.inc | 96 ++ data/maps/Route114_LanettesHouse/events.inc | 15 + data/maps/Route114_LanettesHouse/scripts.inc | 108 ++ data/maps/Route115/events.inc | 49 + data/maps/Route115/scripts.inc | 162 ++ data/maps/Route116/events.inc | 56 + data/maps/Route116/scripts.inc | 511 ++++++ data/maps/Route116_TunnelersRestHouse/events.inc | 12 + data/maps/Route116_TunnelersRestHouse/scripts.inc | 63 + data/maps/Route117/events.inc | 38 + data/maps/Route117/scripts.inc | 232 +++ data/maps/Route117_PokemonDayCare/events.inc | 10 + data/maps/Route117_PokemonDayCare/scripts.inc | 8 + data/maps/Route118/events.inc | 46 + data/maps/Route118/scripts.inc | 318 ++++ data/maps/Route119/events.inc | 99 ++ data/maps/Route119/scripts.inc | 637 +++++++ data/maps/Route119_House/events.inc | 16 + data/maps/Route119_House/scripts.inc | 27 + data/maps/Route119_WeatherInstitute_1F/events.inc | 21 + data/maps/Route119_WeatherInstitute_1F/scripts.inc | 139 ++ data/maps/Route119_WeatherInstitute_2F/events.inc | 16 + data/maps/Route119_WeatherInstitute_2F/scripts.inc | 339 ++++ data/maps/Route120/events.inc | 90 + data/maps/Route120/scripts.inc | 466 +++++ data/maps/Route121/events.inc | 55 + data/maps/Route121/scripts.inc | 200 +++ data/maps/Route121_SafariZoneEntrance/events.inc | 20 + data/maps/Route121_SafariZoneEntrance/scripts.inc | 142 ++ data/maps/Route122/events.inc | 6 + data/maps/Route122/scripts.inc | 3 + data/maps/Route123/events.inc | 88 + data/maps/Route123/scripts.inc | 213 +++ data/maps/Route123_BerryMastersHouse/events.inc | 11 + data/maps/Route123_BerryMastersHouse/scripts.inc | 153 ++ data/maps/Route124/events.inc | 23 + data/maps/Route124/scripts.inc | 117 ++ .../Route124_DivingTreasureHuntersHouse/events.inc | 12 + .../scripts.inc | 349 ++++ data/maps/Route125/events.inc | 24 + data/maps/Route125/scripts.inc | 93 + data/maps/Route126/events.inc | 14 + data/maps/Route126/scripts.inc | 69 + data/maps/Route127/events.inc | 23 + data/maps/Route127/scripts.inc | 88 + data/maps/Route128/events.inc | 20 + data/maps/Route128/scripts.inc | 311 ++++ data/maps/Route129/events.inc | 10 + data/maps/Route129/scripts.inc | 58 + data/maps/Route130/events.inc | 9 + data/maps/Route130/scripts.inc | 52 + data/maps/Route131/events.inc | 16 + data/maps/Route131/scripts.inc | 59 + data/maps/Route132/events.inc | 15 + data/maps/Route132/scripts.inc | 43 + data/maps/Route133/events.inc | 15 + data/maps/Route133/scripts.inc | 38 + data/maps/Route134/events.inc | 16 + data/maps/Route134/scripts.inc | 53 + data/maps/RustboroCity/events.inc | 70 + data/maps/RustboroCity/scripts.inc | 1310 ++++++++++++++ data/maps/RustboroCity_CuttersHouse/events.inc | 11 + data/maps/RustboroCity_CuttersHouse/scripts.inc | 53 + data/maps/RustboroCity_DevonCorp_1F/events.inc | 17 + data/maps/RustboroCity_DevonCorp_1F/scripts.inc | 153 ++ data/maps/RustboroCity_DevonCorp_2F/events.inc | 15 + data/maps/RustboroCity_DevonCorp_2F/scripts.inc | 407 +++++ data/maps/RustboroCity_DevonCorp_3F/events.inc | 15 + data/maps/RustboroCity_DevonCorp_3F/scripts.inc | 311 ++++ data/maps/RustboroCity_Flat1_1F/events.inc | 12 + data/maps/RustboroCity_Flat1_1F/scripts.inc | 18 + data/maps/RustboroCity_Flat1_2F/events.inc | 16 + data/maps/RustboroCity_Flat1_2F/scripts.inc | 184 ++ data/maps/RustboroCity_Flat2_1F/events.inc | 12 + data/maps/RustboroCity_Flat2_1F/scripts.inc | 24 + data/maps/RustboroCity_Flat2_2F/events.inc | 11 + data/maps/RustboroCity_Flat2_2F/scripts.inc | 39 + data/maps/RustboroCity_Flat2_3F/events.inc | 10 + data/maps/RustboroCity_Flat2_3F/scripts.inc | 19 + data/maps/RustboroCity_Gym/events.inc | 18 + data/maps/RustboroCity_Gym/scripts.inc | 291 ++++ data/maps/RustboroCity_House1/events.inc | 11 + data/maps/RustboroCity_House1/scripts.inc | 85 + data/maps/RustboroCity_House2/events.inc | 11 + data/maps/RustboroCity_House2/scripts.inc | 21 + data/maps/RustboroCity_House3/events.inc | 12 + data/maps/RustboroCity_House3/scripts.inc | 36 + data/maps/RustboroCity_Mart/events.inc | 13 + data/maps/RustboroCity_Mart/scripts.inc | 89 + data/maps/RustboroCity_PokemonCenter_1F/events.inc | 14 + .../maps/RustboroCity_PokemonCenter_1F/scripts.inc | 47 + data/maps/RustboroCity_PokemonCenter_2F/events.inc | 14 + .../maps/RustboroCity_PokemonCenter_2F/scripts.inc | 19 + data/maps/RustboroCity_PokemonSchool/events.inc | 23 + data/maps/RustboroCity_PokemonSchool/scripts.inc | 359 ++++ data/maps/RusturfTunnel/events.inc | 27 + data/maps/RusturfTunnel/scripts.inc | 539 ++++++ data/maps/SSTidalCorridor/events.inc | 35 + data/maps/SSTidalCorridor/scripts.inc | 356 ++++ data/maps/SSTidalLowerDeck/events.inc | 13 + data/maps/SSTidalLowerDeck/scripts.inc | 39 + data/maps/SSTidalRooms/events.inc | 31 + data/maps/SSTidalRooms/scripts.inc | 177 ++ data/maps/SafariZone_North/events.inc | 14 + data/maps/SafariZone_North/scripts.inc | 11 + data/maps/SafariZone_Northeast/events.inc | 18 + data/maps/SafariZone_Northeast/scripts.inc | 3 + data/maps/SafariZone_Northwest/events.inc | 7 + data/maps/SafariZone_Northwest/scripts.inc | 7 + data/maps/SafariZone_RestHouse/events.inc | 12 + data/maps/SafariZone_RestHouse/scripts.inc | 15 + data/maps/SafariZone_South/events.inc | 14 + data/maps/SafariZone_South/scripts.inc | 154 ++ data/maps/SafariZone_Southeast/events.inc | 14 + data/maps/SafariZone_Southeast/scripts.inc | 3 + data/maps/SafariZone_Southwest/events.inc | 13 + data/maps/SafariZone_Southwest/scripts.inc | 11 + data/maps/ScorchedSlab/events.inc | 9 + data/maps/ScorchedSlab/scripts.inc | 8 + data/maps/SeafloorCavern_Entrance/events.inc | 10 + data/maps/SeafloorCavern_Entrance/scripts.inc | 93 + data/maps/SeafloorCavern_Room1/events.inc | 15 + data/maps/SeafloorCavern_Room1/scripts.inc | 36 + data/maps/SeafloorCavern_Room2/events.inc | 19 + data/maps/SeafloorCavern_Room2/scripts.inc | 3 + data/maps/SeafloorCavern_Room3/events.inc | 19 + data/maps/SeafloorCavern_Room3/scripts.inc | 58 + data/maps/SeafloorCavern_Room4/events.inc | 13 + data/maps/SeafloorCavern_Room4/scripts.inc | 36 + data/maps/SeafloorCavern_Room5/events.inc | 16 + data/maps/SeafloorCavern_Room5/scripts.inc | 3 + data/maps/SeafloorCavern_Room6/events.inc | 8 + data/maps/SeafloorCavern_Room6/scripts.inc | 3 + data/maps/SeafloorCavern_Room7/events.inc | 7 + data/maps/SeafloorCavern_Room7/scripts.inc | 3 + data/maps/SeafloorCavern_Room8/events.inc | 21 + data/maps/SeafloorCavern_Room8/scripts.inc | 3 + data/maps/SeafloorCavern_Room9/events.inc | 18 + data/maps/SeafloorCavern_Room9/scripts.inc | 323 ++++ data/maps/SealedChamber_InnerRoom/events.inc | 17 + data/maps/SealedChamber_InnerRoom/scripts.inc | 89 + data/maps/SealedChamber_OuterRoom/events.inc | 37 + data/maps/SealedChamber_OuterRoom/scripts.inc | 132 ++ data/maps/SecretBase_BlueCave1/events.inc | 23 + data/maps/SecretBase_BlueCave1/scripts.inc | 1 + data/maps/SecretBase_BlueCave2/events.inc | 23 + data/maps/SecretBase_BlueCave2/scripts.inc | 1 + data/maps/SecretBase_BlueCave3/events.inc | 23 + data/maps/SecretBase_BlueCave3/scripts.inc | 1 + data/maps/SecretBase_BlueCave4/events.inc | 23 + data/maps/SecretBase_BlueCave4/scripts.inc | 1 + data/maps/SecretBase_BrownCave1/events.inc | 23 + data/maps/SecretBase_BrownCave1/scripts.inc | 1 + data/maps/SecretBase_BrownCave2/events.inc | 23 + data/maps/SecretBase_BrownCave2/scripts.inc | 1 + data/maps/SecretBase_BrownCave3/events.inc | 23 + data/maps/SecretBase_BrownCave3/scripts.inc | 1 + data/maps/SecretBase_BrownCave4/events.inc | 23 + data/maps/SecretBase_BrownCave4/scripts.inc | 1 + data/maps/SecretBase_RedCave1/events.inc | 23 + data/maps/SecretBase_RedCave1/scripts.inc | 1 + data/maps/SecretBase_RedCave2/events.inc | 23 + data/maps/SecretBase_RedCave2/scripts.inc | 1 + data/maps/SecretBase_RedCave3/events.inc | 23 + data/maps/SecretBase_RedCave3/scripts.inc | 1 + data/maps/SecretBase_RedCave4/events.inc | 23 + data/maps/SecretBase_RedCave4/scripts.inc | 1 + data/maps/SecretBase_Shrub1/events.inc | 23 + data/maps/SecretBase_Shrub1/scripts.inc | 1 + data/maps/SecretBase_Shrub2/events.inc | 23 + data/maps/SecretBase_Shrub2/scripts.inc | 1 + data/maps/SecretBase_Shrub3/events.inc | 23 + data/maps/SecretBase_Shrub3/scripts.inc | 1 + data/maps/SecretBase_Shrub4/events.inc | 23 + data/maps/SecretBase_Shrub4/scripts.inc | 1 + data/maps/SecretBase_Tree1/events.inc | 23 + data/maps/SecretBase_Tree1/scripts.inc | 1 + data/maps/SecretBase_Tree2/events.inc | 23 + data/maps/SecretBase_Tree2/scripts.inc | 1 + data/maps/SecretBase_Tree3/events.inc | 23 + data/maps/SecretBase_Tree3/scripts.inc | 1 + data/maps/SecretBase_Tree4/events.inc | 23 + data/maps/SecretBase_Tree4/scripts.inc | 1 + data/maps/SecretBase_YellowCave1/events.inc | 23 + data/maps/SecretBase_YellowCave1/scripts.inc | 1 + data/maps/SecretBase_YellowCave2/events.inc | 23 + data/maps/SecretBase_YellowCave2/scripts.inc | 1 + data/maps/SecretBase_YellowCave3/events.inc | 23 + data/maps/SecretBase_YellowCave3/scripts.inc | 1 + data/maps/SecretBase_YellowCave4/events.inc | 23 + data/maps/SecretBase_YellowCave4/scripts.inc | 24 + .../maps/ShoalCave_HighTideEntranceRoom/events.inc | 3 + .../ShoalCave_HighTideEntranceRoom/scripts.inc | 3 + data/maps/ShoalCave_HighTideInnerRoom/events.inc | 3 + data/maps/ShoalCave_HighTideInnerRoom/scripts.inc | 3 + data/maps/ShoalCave_LowTideEntranceRoom/events.inc | 13 + .../maps/ShoalCave_LowTideEntranceRoom/scripts.inc | 103 ++ data/maps/ShoalCave_LowTideIceRoom/events.inc | 10 + data/maps/ShoalCave_LowTideIceRoom/scripts.inc | 3 + data/maps/ShoalCave_LowTideInnerRoom/events.inc | 24 + data/maps/ShoalCave_LowTideInnerRoom/scripts.inc | 158 ++ data/maps/ShoalCave_LowTideLowerRoom/events.inc | 16 + data/maps/ShoalCave_LowTideLowerRoom/scripts.inc | 63 + data/maps/ShoalCave_LowTideStairsRoom/events.inc | 13 + data/maps/ShoalCave_LowTideStairsRoom/scripts.inc | 35 + data/maps/SingleBattleColosseum/events.inc | 14 + data/maps/SingleBattleColosseum/scripts.inc | 3 + data/maps/SkyPillar_1F/events.inc | 8 + data/maps/SkyPillar_1F/scripts.inc | 13 + data/maps/SkyPillar_2F/events.inc | 7 + data/maps/SkyPillar_2F/scripts.inc | 21 + data/maps/SkyPillar_3F/events.inc | 8 + data/maps/SkyPillar_3F/scripts.inc | 13 + data/maps/SkyPillar_4F/events.inc | 8 + data/maps/SkyPillar_4F/scripts.inc | 21 + data/maps/SkyPillar_5F/events.inc | 7 + data/maps/SkyPillar_5F/scripts.inc | 13 + data/maps/SkyPillar_Entrance/events.inc | 7 + data/maps/SkyPillar_Entrance/scripts.inc | 8 + data/maps/SkyPillar_Outside/events.inc | 10 + data/maps/SkyPillar_Outside/scripts.inc | 174 ++ data/maps/SkyPillar_Top/events.inc | 13 + data/maps/SkyPillar_Top/scripts.inc | 189 ++ data/maps/SlateportCity/events.inc | 71 + data/maps/SlateportCity/scripts.inc | 1383 +++++++++++++++ .../SlateportCity_BattleTentBattleRoom/events.inc | 8 + .../SlateportCity_BattleTentBattleRoom/scripts.inc | 115 ++ .../SlateportCity_BattleTentCorridor/events.inc | 6 + .../SlateportCity_BattleTentCorridor/scripts.inc | 280 +++ data/maps/SlateportCity_BattleTentLobby/events.inc | 17 + .../maps/SlateportCity_BattleTentLobby/scripts.inc | 357 ++++ data/maps/SlateportCity_Harbor/events.inc | 25 + data/maps/SlateportCity_Harbor/scripts.inc | 567 ++++++ data/maps/SlateportCity_House1/events.inc | 10 + data/maps/SlateportCity_House1/scripts.inc | 121 ++ data/maps/SlateportCity_House2/events.inc | 11 + data/maps/SlateportCity_House2/scripts.inc | 23 + data/maps/SlateportCity_Mart/events.inc | 12 + data/maps/SlateportCity_Mart/scripts.inc | 47 + .../maps/SlateportCity_OceanicMuseum_1F/events.inc | 43 + .../SlateportCity_OceanicMuseum_1F/scripts.inc | 395 +++++ .../maps/SlateportCity_OceanicMuseum_2F/events.inc | 38 + .../SlateportCity_OceanicMuseum_2F/scripts.inc | 441 +++++ .../maps/SlateportCity_PokemonCenter_1F/events.inc | 13 + .../SlateportCity_PokemonCenter_1F/scripts.inc | 40 + .../maps/SlateportCity_PokemonCenter_2F/events.inc | 14 + .../SlateportCity_PokemonCenter_2F/scripts.inc | 19 + data/maps/SlateportCity_PokemonFanClub/events.inc | 18 + data/maps/SlateportCity_PokemonFanClub/scripts.inc | 428 +++++ .../SlateportCity_SternsShipyard_1F/events.inc | 14 + .../SlateportCity_SternsShipyard_1F/scripts.inc | 145 ++ .../SlateportCity_SternsShipyard_2F/events.inc | 11 + .../SlateportCity_SternsShipyard_2F/scripts.inc | 22 + data/maps/SootopolisCity/events.inc | 46 + data/maps/SootopolisCity/scripts.inc | 1784 +++++++++++++++++++ data/maps/SootopolisCity_Gym_1F/events.inc | 16 + data/maps/SootopolisCity_Gym_1F/scripts.inc | 329 ++++ data/maps/SootopolisCity_Gym_B1F/events.inc | 18 + data/maps/SootopolisCity_Gym_B1F/scripts.inc | 183 ++ data/maps/SootopolisCity_House1/events.inc | 11 + data/maps/SootopolisCity_House1/scripts.inc | 45 + data/maps/SootopolisCity_House2/events.inc | 10 + data/maps/SootopolisCity_House2/scripts.inc | 36 + data/maps/SootopolisCity_House3/events.inc | 11 + data/maps/SootopolisCity_House3/scripts.inc | 43 + data/maps/SootopolisCity_House4/events.inc | 12 + data/maps/SootopolisCity_House4/scripts.inc | 39 + data/maps/SootopolisCity_House5/events.inc | 11 + data/maps/SootopolisCity_House5/scripts.inc | 20 + data/maps/SootopolisCity_House6/events.inc | 10 + data/maps/SootopolisCity_House6/scripts.inc | 56 + data/maps/SootopolisCity_House7/events.inc | 11 + data/maps/SootopolisCity_House7/scripts.inc | 26 + .../SootopolisCity_LotadAndSeedotHouse/events.inc | 15 + .../SootopolisCity_LotadAndSeedotHouse/scripts.inc | 210 +++ data/maps/SootopolisCity_Mart/events.inc | 12 + data/maps/SootopolisCity_Mart/scripts.inc | 80 + .../events.inc | 11 + .../scripts.inc | 241 +++ .../events.inc | 9 + .../scripts.inc | 78 + .../SootopolisCity_PokemonCenter_1F/events.inc | 14 + .../SootopolisCity_PokemonCenter_1F/scripts.inc | 74 + .../SootopolisCity_PokemonCenter_2F/events.inc | 14 + .../SootopolisCity_PokemonCenter_2F/scripts.inc | 19 + data/maps/SouthernIsland_Exterior/events.inc | 14 + data/maps/SouthernIsland_Exterior/scripts.inc | 55 + data/maps/SouthernIsland_Interior/events.inc | 14 + data/maps/SouthernIsland_Interior/scripts.inc | 167 ++ data/maps/TerraCave_End/events.inc | 12 + data/maps/TerraCave_End/scripts.inc | 78 + data/maps/TerraCave_Entrance/events.inc | 7 + data/maps/TerraCave_Entrance/scripts.inc | 8 + data/maps/TradeCenter/events.inc | 14 + data/maps/TradeCenter/scripts.inc | 3 + data/maps/TrainerHill_1F/events.inc | 7 + data/maps/TrainerHill_1F/scripts.inc | 6 + data/maps/TrainerHill_2F/events.inc | 7 + data/maps/TrainerHill_2F/scripts.inc | 6 + data/maps/TrainerHill_3F/events.inc | 7 + data/maps/TrainerHill_3F/scripts.inc | 5 + data/maps/TrainerHill_4F/events.inc | 7 + data/maps/TrainerHill_4F/scripts.inc | 5 + data/maps/TrainerHill_Elevator/events.inc | 10 + data/maps/TrainerHill_Elevator/scripts.inc | 87 + data/maps/TrainerHill_Entrance/events.inc | 21 + data/maps/TrainerHill_Entrance/scripts.inc | 476 +++++ data/maps/TrainerHill_Roof/events.inc | 10 + data/maps/TrainerHill_Roof/scripts.inc | 70 + data/maps/Underwater1/events.inc | 12 + data/maps/Underwater1/scripts.inc | 3 + data/maps/Underwater2/events.inc | 16 + data/maps/Underwater2/scripts.inc | 3 + data/maps/Underwater3/events.inc | 13 + data/maps/Underwater3/scripts.inc | 8 + data/maps/Underwater4/events.inc | 10 + data/maps/Underwater4/scripts.inc | 3 + data/maps/Underwater5/events.inc | 7 + data/maps/Underwater5/scripts.inc | 8 + data/maps/Underwater6/events.inc | 7 + data/maps/Underwater6/scripts.inc | 8 + data/maps/Underwater7/events.inc | 7 + data/maps/Underwater7/scripts.inc | 8 + data/maps/Underwater_MarineCave/events.inc | 6 + data/maps/Underwater_MarineCave/scripts.inc | 13 + data/maps/Underwater_Route134/events.inc | 6 + data/maps/Underwater_Route134/scripts.inc | 8 + data/maps/Underwater_SeafloorCavern/events.inc | 12 + data/maps/Underwater_SeafloorCavern/scripts.inc | 52 + data/maps/Underwater_SealedChamber/events.inc | 9 + data/maps/Underwater_SealedChamber/scripts.inc | 28 + data/maps/Underwater_SootopolisCity/events.inc | 7 + data/maps/Underwater_SootopolisCity/scripts.inc | 8 + data/maps/UnionRoom/events.inc | 18 + data/maps/UnionRoom/scripts.inc | 107 ++ data/maps/UnknownMap_25_29/events.inc | 1 + data/maps/UnknownMap_25_29/scripts.inc | 1 + data/maps/UnknownMap_25_30/events.inc | 1 + data/maps/UnknownMap_25_30/scripts.inc | 1 + data/maps/UnknownMap_25_31/events.inc | 1 + data/maps/UnknownMap_25_31/scripts.inc | 1 + data/maps/UnknownMap_25_32/events.inc | 1 + data/maps/UnknownMap_25_32/scripts.inc | 1 + data/maps/UnknownMap_25_33/events.inc | 1 + data/maps/UnknownMap_25_33/scripts.inc | 1 + data/maps/UnknownMap_25_34/events.inc | 3 + data/maps/UnknownMap_25_34/scripts.inc | 458 +++++ data/maps/VerdanturfTown/events.inc | 28 + data/maps/VerdanturfTown/scripts.inc | 127 ++ .../VerdanturfTown_BattleTentBattleRoom/events.inc | 8 + .../scripts.inc | 200 +++ .../VerdanturfTown_BattleTentCorridor/events.inc | 6 + .../VerdanturfTown_BattleTentCorridor/scripts.inc | 69 + .../maps/VerdanturfTown_BattleTentLobby/events.inc | 18 + .../VerdanturfTown_BattleTentLobby/scripts.inc | 439 +++++ .../events.inc | 11 + .../scripts.inc | 104 ++ data/maps/VerdanturfTown_House/events.inc | 11 + data/maps/VerdanturfTown_House/scripts.inc | 25 + data/maps/VerdanturfTown_Mart/events.inc | 13 + data/maps/VerdanturfTown_Mart/scripts.inc | 60 + .../VerdanturfTown_PokemonCenter_1F/events.inc | 14 + .../VerdanturfTown_PokemonCenter_1F/scripts.inc | 42 + .../VerdanturfTown_PokemonCenter_2F/events.inc | 14 + .../VerdanturfTown_PokemonCenter_2F/scripts.inc | 19 + data/maps/VerdanturfTown_WandasHouse/events.inc | 14 + data/maps/VerdanturfTown_WandasHouse/scripts.inc | 176 ++ data/maps/VictoryRoad_1F/events.inc | 28 + data/maps/VictoryRoad_1F/scripts.inc | 220 +++ data/maps/VictoryRoad_B1F/events.inc | 35 + data/maps/VictoryRoad_B1F/scripts.inc | 91 + data/maps/VictoryRoad_B2F/events.inc | 22 + data/maps/VictoryRoad_B2F/scripts.inc | 108 ++ data/maps/events/AbandonedShip_CaptainsOffice.inc | 11 - data/maps/events/AbandonedShip_Corridors_1F.inc | 21 - data/maps/events/AbandonedShip_Corridors_B1F.inc | 20 - data/maps/events/AbandonedShip_Deck.inc | 10 - .../events/AbandonedShip_HiddenFloorCorridors.inc | 17 - .../maps/events/AbandonedShip_HiddenFloorRooms.inc | 32 - data/maps/events/AbandonedShip_Room_B1F.inc | 10 - data/maps/events/AbandonedShip_Rooms2_1F.inc | 15 - data/maps/events/AbandonedShip_Rooms2_B1F.inc | 13 - data/maps/events/AbandonedShip_Rooms_1F.inc | 17 - data/maps/events/AbandonedShip_Rooms_B1F.inc | 12 - data/maps/events/AbandonedShip_Underwater1.inc | 7 - data/maps/events/AbandonedShip_Underwater2.inc | 6 - data/maps/events/AlteringCave.inc | 6 - data/maps/events/AncientTomb.inc | 16 - data/maps/events/AquaHideout_1F.inc | 13 - data/maps/events/AquaHideout_B1F.inc | 41 - data/maps/events/AquaHideout_B2F.inc | 27 - data/maps/events/AquaHideout_UnusedRubyMap1.inc | 3 - data/maps/events/AquaHideout_UnusedRubyMap2.inc | 3 - data/maps/events/AquaHideout_UnusedRubyMap3.inc | 3 - data/maps/events/ArtisanCave_1F.inc | 10 - data/maps/events/ArtisanCave_B1F.inc | 16 - .../BattleFrontier_BattleArenaBattleRoom.inc | 14 - .../events/BattleFrontier_BattleArenaCorridor.inc | 6 - .../events/BattleFrontier_BattleArenaLobby.inc | 17 - .../events/BattleFrontier_BattleDomeBattleRoom.inc | 20 - .../events/BattleFrontier_BattleDomeCorridor.inc | 10 - .../maps/events/BattleFrontier_BattleDomeLobby.inc | 21 - .../BattleFrontier_BattleDomePreBattleRoom.inc | 10 - .../BattleFrontier_BattleFactoryBattleRoom.inc | 13 - .../events/BattleFrontier_BattleFactoryLobby.inc | 20 - .../BattleFrontier_BattleFactoryPreBattleRoom.inc | 6 - .../BattleFrontier_BattlePalaceBattleRoom.inc | 14 - .../events/BattleFrontier_BattlePalaceCorridor.inc | 18 - .../events/BattleFrontier_BattlePalaceLobby.inc | 21 - .../events/BattleFrontier_BattlePikeCorridor.inc | 6 - .../maps/events/BattleFrontier_BattlePikeLobby.inc | 18 - .../BattleFrontier_BattlePikeRandomRoom1.inc | 16 - .../BattleFrontier_BattlePikeRandomRoom2.inc | 6 - .../BattleFrontier_BattlePikeRandomRoom3.inc | 12 - .../BattleFrontier_BattlePikeThreePathRoom.inc | 18 - ...leFrontier_BattlePointExchangeServiceCorner.inc | 19 - .../BattleFrontier_BattlePyramidEmptySquare.inc | 21 - .../events/BattleFrontier_BattlePyramidLobby.inc | 16 - .../events/BattleFrontier_BattlePyramidTop.inc | 10 - .../BattleFrontier_BattleTowerBattleRoom.inc | 12 - .../BattleFrontier_BattleTowerBattleRoom2.inc | 11 - .../events/BattleFrontier_BattleTowerCorridor.inc | 6 - .../events/BattleFrontier_BattleTowerCorridor2.inc | 9 - .../events/BattleFrontier_BattleTowerElevator.inc | 6 - .../events/BattleFrontier_BattleTowerLobby.inc | 26 - .../BattleFrontier_BattleTowerMultiBattleRoom.inc | 14 - data/maps/events/BattleFrontier_Lounge1.inc | 11 - data/maps/events/BattleFrontier_Lounge2.inc | 14 - data/maps/events/BattleFrontier_Lounge3.inc | 13 - data/maps/events/BattleFrontier_Lounge4.inc | 11 - data/maps/events/BattleFrontier_Lounge5.inc | 13 - data/maps/events/BattleFrontier_Lounge6.inc | 9 - data/maps/events/BattleFrontier_Lounge7.inc | 12 - data/maps/events/BattleFrontier_Lounge8.inc | 11 - data/maps/events/BattleFrontier_Lounge9.inc | 10 - data/maps/events/BattleFrontier_Mart.inc | 13 - data/maps/events/BattleFrontier_OutsideEast.inc | 57 - data/maps/events/BattleFrontier_OutsideWest.inc | 49 - .../events/BattleFrontier_PokemonCenter_1F.inc | 15 - .../events/BattleFrontier_PokemonCenter_2F.inc | 14 - data/maps/events/BattleFrontier_RankingHall.inc | 26 - data/maps/events/BattleFrontier_ReceptionGate.inc | 14 - data/maps/events/BattleFrontier_ScottsHouse.inc | 10 - data/maps/events/BattlePyramidSquare01.inc | 12 - data/maps/events/BattlePyramidSquare02.inc | 12 - data/maps/events/BattlePyramidSquare03.inc | 12 - data/maps/events/BattlePyramidSquare04.inc | 12 - data/maps/events/BattlePyramidSquare05.inc | 12 - data/maps/events/BattlePyramidSquare06.inc | 12 - data/maps/events/BattlePyramidSquare07.inc | 12 - data/maps/events/BattlePyramidSquare08.inc | 12 - data/maps/events/BattlePyramidSquare09.inc | 12 - data/maps/events/BattlePyramidSquare10.inc | 12 - data/maps/events/BattlePyramidSquare11.inc | 12 - data/maps/events/BattlePyramidSquare12.inc | 12 - data/maps/events/BattlePyramidSquare13.inc | 12 - data/maps/events/BattlePyramidSquare14.inc | 12 - data/maps/events/BattlePyramidSquare15.inc | 12 - data/maps/events/BattlePyramidSquare16.inc | 12 - data/maps/events/BirthIsland_Exterior.inc | 10 - data/maps/events/BirthIsland_Harbor.inc | 10 - data/maps/events/CaveOfOrigin_1F.inc | 7 - data/maps/events/CaveOfOrigin_B1F.inc | 9 - data/maps/events/CaveOfOrigin_Entrance.inc | 7 - .../events/CaveOfOrigin_UnusedRubySapphireMap1.inc | 7 - .../events/CaveOfOrigin_UnusedRubySapphireMap2.inc | 7 - .../events/CaveOfOrigin_UnusedRubySapphireMap3.inc | 7 - data/maps/events/DesertRuins.inc | 16 - data/maps/events/DesertUnderpass.inc | 9 - data/maps/events/DewfordTown.inc | 24 - data/maps/events/DewfordTown_Gym.inc | 23 - data/maps/events/DewfordTown_Hall.inc | 22 - data/maps/events/DewfordTown_House1.inc | 12 - data/maps/events/DewfordTown_House2.inc | 11 - data/maps/events/DewfordTown_PokemonCenter_1F.inc | 13 - data/maps/events/DewfordTown_PokemonCenter_2F.inc | 14 - data/maps/events/DoubleBattleColosseum.inc | 15 - data/maps/events/EverGrandeCity.inc | 29 - data/maps/events/EverGrandeCity_ChampionsRoom.inc | 12 - data/maps/events/EverGrandeCity_DrakesRoom.inc | 10 - data/maps/events/EverGrandeCity_GlaciasRoom.inc | 10 - data/maps/events/EverGrandeCity_Hall1.inc | 9 - data/maps/events/EverGrandeCity_Hall2.inc | 9 - data/maps/events/EverGrandeCity_Hall3.inc | 9 - data/maps/events/EverGrandeCity_Hall4.inc | 7 - data/maps/events/EverGrandeCity_Hall5.inc | 9 - data/maps/events/EverGrandeCity_HallOfFame.inc | 9 - data/maps/events/EverGrandeCity_PhoebesRoom.inc | 10 - .../events/EverGrandeCity_PokemonCenter_1F.inc | 14 - .../events/EverGrandeCity_PokemonCenter_2F.inc | 14 - .../events/EverGrandeCity_PokemonLeague_1F.inc | 16 - .../events/EverGrandeCity_PokemonLeague_2F.inc | 14 - data/maps/events/EverGrandeCity_SidneysRoom.inc | 10 - data/maps/events/FallarborTown.inc | 26 - .../events/FallarborTown_BattleTentBattleRoom.inc | 8 - .../events/FallarborTown_BattleTentCorridor.inc | 6 - data/maps/events/FallarborTown_BattleTentLobby.inc | 17 - data/maps/events/FallarborTown_House1.inc | 11 - data/maps/events/FallarborTown_House2.inc | 10 - data/maps/events/FallarborTown_Mart.inc | 14 - .../maps/events/FallarborTown_PokemonCenter_1F.inc | 14 - .../maps/events/FallarborTown_PokemonCenter_2F.inc | 14 - data/maps/events/FarawayIsland_Entrance.inc | 19 - data/maps/events/FarawayIsland_Interior.inc | 10 - data/maps/events/FieryPath.inc | 17 - data/maps/events/FortreeCity.inc | 31 - data/maps/events/FortreeCity_DecorationShop.inc | 13 - data/maps/events/FortreeCity_Gym.inc | 21 - data/maps/events/FortreeCity_House1.inc | 12 - data/maps/events/FortreeCity_House2.inc | 11 - data/maps/events/FortreeCity_House3.inc | 11 - data/maps/events/FortreeCity_House4.inc | 12 - data/maps/events/FortreeCity_House5.inc | 12 - data/maps/events/FortreeCity_Mart.inc | 13 - data/maps/events/FortreeCity_PokemonCenter_1F.inc | 14 - data/maps/events/FortreeCity_PokemonCenter_2F.inc | 14 - data/maps/events/GraniteCave_1F.inc | 13 - data/maps/events/GraniteCave_B1F.inc | 15 - data/maps/events/GraniteCave_B2F.inc | 25 - data/maps/events/GraniteCave_StevensRoom.inc | 9 - data/maps/events/InsideOfTruck.inc | 25 - data/maps/events/IslandCave.inc | 16 - data/maps/events/JaggedPass.inc | 35 - data/maps/events/LavaridgeTown.inc | 35 - data/maps/events/LavaridgeTown_Gym_1F.inc | 43 - data/maps/events/LavaridgeTown_Gym_B1F.inc | 35 - data/maps/events/LavaridgeTown_HerbShop.inc | 12 - data/maps/events/LavaridgeTown_House.inc | 12 - data/maps/events/LavaridgeTown_Mart.inc | 12 - .../maps/events/LavaridgeTown_PokemonCenter_1F.inc | 15 - .../maps/events/LavaridgeTown_PokemonCenter_2F.inc | 14 - data/maps/events/LilycoveCity.inc | 58 - data/maps/events/LilycoveCity_ContestHall.inc | 51 - data/maps/events/LilycoveCity_ContestLobby.inc | 50 - data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc | 14 - data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc | 15 - .../LilycoveCity_DepartmentStoreElevator.inc | 10 - .../events/LilycoveCity_DepartmentStoreRooftop.inc | 16 - .../events/LilycoveCity_DepartmentStore_1F.inc | 20 - .../events/LilycoveCity_DepartmentStore_2F.inc | 15 - .../events/LilycoveCity_DepartmentStore_3F.inc | 15 - .../events/LilycoveCity_DepartmentStore_4F.inc | 15 - .../events/LilycoveCity_DepartmentStore_5F.inc | 17 - data/maps/events/LilycoveCity_Harbor.inc | 14 - data/maps/events/LilycoveCity_House1.inc | 11 - data/maps/events/LilycoveCity_House2.inc | 10 - data/maps/events/LilycoveCity_House3.inc | 15 - data/maps/events/LilycoveCity_House4.inc | 11 - .../maps/events/LilycoveCity_LilycoveMuseum_1F.inc | 38 - .../maps/events/LilycoveCity_LilycoveMuseum_2F.inc | 26 - .../maps/events/LilycoveCity_MoveDeletersHouse.inc | 10 - data/maps/events/LilycoveCity_PokemonCenter_1F.inc | 15 - data/maps/events/LilycoveCity_PokemonCenter_2F.inc | 14 - .../events/LilycoveCity_PokemonTrainerFanClub.inc | 18 - data/maps/events/LilycoveCity_UnusedMart.inc | 7 - data/maps/events/LinkContestRoom1.inc | 18 - data/maps/events/LinkContestRoom2.inc | 1 - data/maps/events/LinkContestRoom3.inc | 1 - data/maps/events/LinkContestRoom4.inc | 1 - data/maps/events/LinkContestRoom5.inc | 1 - data/maps/events/LinkContestRoom6.inc | 1 - data/maps/events/LittlerootTown.inc | 35 - .../events/LittlerootTown_BrendansHouse_1F.inc | 23 - .../events/LittlerootTown_BrendansHouse_2F.inc | 30 - data/maps/events/LittlerootTown_MaysHouse_1F.inc | 23 - data/maps/events/LittlerootTown_MaysHouse_2F.inc | 30 - .../events/LittlerootTown_ProfessorBirchsLab.inc | 32 - data/maps/events/MagmaHideout_1F.inc | 17 - data/maps/events/MagmaHideout_2F_1R.inc | 14 - data/maps/events/MagmaHideout_2F_2R.inc | 15 - data/maps/events/MagmaHideout_2F_3R.inc | 7 - data/maps/events/MagmaHideout_3F_1R.inc | 13 - data/maps/events/MagmaHideout_3F_2R.inc | 10 - data/maps/events/MagmaHideout_3F_3R.inc | 10 - data/maps/events/MagmaHideout_4F.inc | 17 - data/maps/events/MarineCave_End.inc | 12 - data/maps/events/MarineCave_Entrance.inc | 6 - data/maps/events/MauvilleCity.inc | 35 - data/maps/events/MauvilleCity_BikeShop.inc | 15 - data/maps/events/MauvilleCity_GameCorner.inc | 47 - data/maps/events/MauvilleCity_Gym.inc | 26 - data/maps/events/MauvilleCity_House1.inc | 10 - data/maps/events/MauvilleCity_House2.inc | 10 - data/maps/events/MauvilleCity_Mart.inc | 12 - data/maps/events/MauvilleCity_PokemonCenter_1F.inc | 15 - data/maps/events/MauvilleCity_PokemonCenter_2F.inc | 15 - data/maps/events/MeteorFalls_1F_1R.inc | 29 - data/maps/events/MeteorFalls_1F_2R.inc | 17 - data/maps/events/MeteorFalls_B1F_1R.inc | 11 - data/maps/events/MeteorFalls_B1F_2R.inc | 9 - data/maps/events/MeteorFalls_StevensCave.inc | 9 - data/maps/events/MirageTower_1F.inc | 7 - data/maps/events/MirageTower_2F.inc | 7 - data/maps/events/MirageTower_3F.inc | 11 - data/maps/events/MirageTower_4F.inc | 11 - data/maps/events/MossdeepCity.inc | 56 - data/maps/events/MossdeepCity_GameCorner_1F.inc | 17 - data/maps/events/MossdeepCity_GameCorner_B1F.inc | 9 - data/maps/events/MossdeepCity_Gym.inc | 72 - data/maps/events/MossdeepCity_House1.inc | 11 - data/maps/events/MossdeepCity_House2.inc | 12 - data/maps/events/MossdeepCity_House3.inc | 10 - data/maps/events/MossdeepCity_House4.inc | 12 - data/maps/events/MossdeepCity_Mart.inc | 13 - data/maps/events/MossdeepCity_PokemonCenter_1F.inc | 13 - data/maps/events/MossdeepCity_PokemonCenter_2F.inc | 15 - data/maps/events/MossdeepCity_SpaceCenter_1F.inc | 21 - data/maps/events/MossdeepCity_SpaceCenter_2F.inc | 17 - data/maps/events/MossdeepCity_StevensHouse.inc | 18 - data/maps/events/MtChimney.inc | 45 - data/maps/events/MtChimney_CableCarStation.inc | 11 - data/maps/events/MtPyre_1F.inc | 16 - data/maps/events/MtPyre_2F.inc | 20 - data/maps/events/MtPyre_3F.inc | 17 - data/maps/events/MtPyre_4F.inc | 15 - data/maps/events/MtPyre_5F.inc | 14 - data/maps/events/MtPyre_6F.inc | 12 - data/maps/events/MtPyre_Exterior.inc | 23 - data/maps/events/MtPyre_Summit.inc | 30 - data/maps/events/NavelRock_B1F.inc | 7 - data/maps/events/NavelRock_Bottom.inc | 9 - data/maps/events/NavelRock_Down01.inc | 7 - data/maps/events/NavelRock_Down02.inc | 7 - data/maps/events/NavelRock_Down03.inc | 7 - data/maps/events/NavelRock_Down04.inc | 7 - data/maps/events/NavelRock_Down05.inc | 7 - data/maps/events/NavelRock_Down06.inc | 7 - data/maps/events/NavelRock_Down07.inc | 7 - data/maps/events/NavelRock_Down08.inc | 7 - data/maps/events/NavelRock_Down09.inc | 7 - data/maps/events/NavelRock_Down10.inc | 7 - data/maps/events/NavelRock_Down11.inc | 7 - data/maps/events/NavelRock_Entrance.inc | 7 - data/maps/events/NavelRock_Exterior.inc | 7 - data/maps/events/NavelRock_Fork.inc | 8 - data/maps/events/NavelRock_Harbor.inc | 10 - data/maps/events/NavelRock_Top.inc | 15 - data/maps/events/NavelRock_Up1.inc | 7 - data/maps/events/NavelRock_Up2.inc | 7 - data/maps/events/NavelRock_Up3.inc | 7 - data/maps/events/NavelRock_Up4.inc | 7 - data/maps/events/NewMauville_Entrance.inc | 10 - data/maps/events/NewMauville_Inside.inc | 38 - data/maps/events/OldaleTown.inc | 28 - data/maps/events/OldaleTown_House1.inc | 10 - data/maps/events/OldaleTown_House2.inc | 11 - data/maps/events/OldaleTown_Mart.inc | 12 - data/maps/events/OldaleTown_PokemonCenter_1F.inc | 14 - data/maps/events/OldaleTown_PokemonCenter_2F.inc | 14 - data/maps/events/PacifidlogTown.inc | 21 - data/maps/events/PacifidlogTown_House1.inc | 11 - data/maps/events/PacifidlogTown_House2.inc | 12 - data/maps/events/PacifidlogTown_House3.inc | 11 - data/maps/events/PacifidlogTown_House4.inc | 12 - data/maps/events/PacifidlogTown_House5.inc | 11 - .../events/PacifidlogTown_PokemonCenter_1F.inc | 15 - .../events/PacifidlogTown_PokemonCenter_2F.inc | 14 - data/maps/events/PetalburgCity.inc | 42 - data/maps/events/PetalburgCity_Gym.inc | 72 - data/maps/events/PetalburgCity_House1.inc | 11 - data/maps/events/PetalburgCity_House2.inc | 11 - data/maps/events/PetalburgCity_Mart.inc | 13 - .../maps/events/PetalburgCity_PokemonCenter_1F.inc | 15 - .../maps/events/PetalburgCity_PokemonCenter_2F.inc | 14 - data/maps/events/PetalburgCity_WallysHouse.inc | 11 - data/maps/events/PetalburgWoods.inc | 38 - data/maps/events/RecordCorner.inc | 18 - data/maps/events/Route101.inc | 25 - data/maps/events/Route102.inc | 18 - data/maps/events/Route103.inc | 31 - data/maps/events/Route104.inc | 64 - data/maps/events/Route104_MrBrineysHouse.inc | 11 - .../maps/events/Route104_PrettyPetalFlowerShop.inc | 12 - data/maps/events/Route104_Prototype.inc | 3 - .../Route104_PrototypePrettyPetalFlowerShop.inc | 3 - data/maps/events/Route105.inc | 20 - data/maps/events/Route106.inc | 19 - data/maps/events/Route107.inc | 12 - data/maps/events/Route108.inc | 18 - data/maps/events/Route109.inc | 42 - data/maps/events/Route109_SeashoreHouse.inc | 13 - data/maps/events/Route110.inc | 79 - .../Route110_SeasideCyclingRoadEntrance1.inc | 16 - .../Route110_SeasideCyclingRoadEntrance2.inc | 16 - data/maps/events/Route110_TrickHouseCorridor.inc | 9 - data/maps/events/Route110_TrickHouseEnd.inc | 16 - data/maps/events/Route110_TrickHouseEntrance.inc | 20 - data/maps/events/Route110_TrickHousePuzzle1.inc | 28 - data/maps/events/Route110_TrickHousePuzzle2.inc | 24 - data/maps/events/Route110_TrickHousePuzzle3.inc | 26 - data/maps/events/Route110_TrickHousePuzzle4.inc | 27 - data/maps/events/Route110_TrickHousePuzzle5.inc | 42 - data/maps/events/Route110_TrickHousePuzzle6.inc | 17 - data/maps/events/Route110_TrickHousePuzzle7.inc | 38 - data/maps/events/Route110_TrickHousePuzzle8.inc | 17 - data/maps/events/Route111.inc | 114 -- data/maps/events/Route111_OldLadysRestStop.inc | 10 - .../maps/events/Route111_WinstrateFamilysHouse.inc | 13 - data/maps/events/Route112.inc | 32 - data/maps/events/Route112_CableCarStation.inc | 11 - data/maps/events/Route113.inc | 57 - data/maps/events/Route113_GlassWorkshop.inc | 11 - data/maps/events/Route114.inc | 53 - data/maps/events/Route114_FossilManiacsHouse.inc | 17 - data/maps/events/Route114_FossilManiacsTunnel.inc | 15 - data/maps/events/Route114_LanettesHouse.inc | 15 - data/maps/events/Route115.inc | 49 - data/maps/events/Route116.inc | 56 - data/maps/events/Route116_TunnelersRestHouse.inc | 12 - data/maps/events/Route117.inc | 38 - data/maps/events/Route117_PokemonDayCare.inc | 10 - data/maps/events/Route118.inc | 46 - data/maps/events/Route119.inc | 99 -- data/maps/events/Route119_House.inc | 16 - data/maps/events/Route119_WeatherInstitute_1F.inc | 21 - data/maps/events/Route119_WeatherInstitute_2F.inc | 16 - data/maps/events/Route120.inc | 90 - data/maps/events/Route121.inc | 55 - data/maps/events/Route121_SafariZoneEntrance.inc | 20 - data/maps/events/Route122.inc | 6 - data/maps/events/Route123.inc | 88 - data/maps/events/Route123_BerryMastersHouse.inc | 11 - data/maps/events/Route124.inc | 23 - .../events/Route124_DivingTreasureHuntersHouse.inc | 12 - data/maps/events/Route125.inc | 24 - data/maps/events/Route126.inc | 14 - data/maps/events/Route127.inc | 23 - data/maps/events/Route128.inc | 20 - data/maps/events/Route129.inc | 10 - data/maps/events/Route130.inc | 9 - data/maps/events/Route131.inc | 16 - data/maps/events/Route132.inc | 15 - data/maps/events/Route133.inc | 15 - data/maps/events/Route134.inc | 16 - data/maps/events/RustboroCity.inc | 70 - data/maps/events/RustboroCity_CuttersHouse.inc | 11 - data/maps/events/RustboroCity_DevonCorp_1F.inc | 17 - data/maps/events/RustboroCity_DevonCorp_2F.inc | 15 - data/maps/events/RustboroCity_DevonCorp_3F.inc | 15 - data/maps/events/RustboroCity_Flat1_1F.inc | 12 - data/maps/events/RustboroCity_Flat1_2F.inc | 16 - data/maps/events/RustboroCity_Flat2_1F.inc | 12 - data/maps/events/RustboroCity_Flat2_2F.inc | 11 - data/maps/events/RustboroCity_Flat2_3F.inc | 10 - data/maps/events/RustboroCity_Gym.inc | 18 - data/maps/events/RustboroCity_House1.inc | 11 - data/maps/events/RustboroCity_House2.inc | 11 - data/maps/events/RustboroCity_House3.inc | 12 - data/maps/events/RustboroCity_Mart.inc | 13 - data/maps/events/RustboroCity_PokemonCenter_1F.inc | 14 - data/maps/events/RustboroCity_PokemonCenter_2F.inc | 14 - data/maps/events/RustboroCity_PokemonSchool.inc | 23 - data/maps/events/RusturfTunnel.inc | 27 - data/maps/events/SSTidalCorridor.inc | 35 - data/maps/events/SSTidalLowerDeck.inc | 13 - data/maps/events/SSTidalRooms.inc | 31 - data/maps/events/SafariZone_North.inc | 14 - data/maps/events/SafariZone_Northeast.inc | 18 - data/maps/events/SafariZone_Northwest.inc | 7 - data/maps/events/SafariZone_RestHouse.inc | 12 - data/maps/events/SafariZone_South.inc | 14 - data/maps/events/SafariZone_Southeast.inc | 14 - data/maps/events/SafariZone_Southwest.inc | 13 - data/maps/events/ScorchedSlab.inc | 9 - data/maps/events/SeafloorCavern_Entrance.inc | 10 - data/maps/events/SeafloorCavern_Room1.inc | 15 - data/maps/events/SeafloorCavern_Room2.inc | 19 - data/maps/events/SeafloorCavern_Room3.inc | 19 - data/maps/events/SeafloorCavern_Room4.inc | 13 - data/maps/events/SeafloorCavern_Room5.inc | 16 - data/maps/events/SeafloorCavern_Room6.inc | 8 - data/maps/events/SeafloorCavern_Room7.inc | 7 - data/maps/events/SeafloorCavern_Room8.inc | 21 - data/maps/events/SeafloorCavern_Room9.inc | 18 - data/maps/events/SealedChamber_InnerRoom.inc | 17 - data/maps/events/SealedChamber_OuterRoom.inc | 37 - data/maps/events/SecretBase_BlueCave1.inc | 23 - data/maps/events/SecretBase_BlueCave2.inc | 23 - data/maps/events/SecretBase_BlueCave3.inc | 23 - data/maps/events/SecretBase_BlueCave4.inc | 23 - data/maps/events/SecretBase_BrownCave1.inc | 23 - data/maps/events/SecretBase_BrownCave2.inc | 23 - data/maps/events/SecretBase_BrownCave3.inc | 23 - data/maps/events/SecretBase_BrownCave4.inc | 23 - data/maps/events/SecretBase_RedCave1.inc | 23 - data/maps/events/SecretBase_RedCave2.inc | 23 - data/maps/events/SecretBase_RedCave3.inc | 23 - data/maps/events/SecretBase_RedCave4.inc | 23 - data/maps/events/SecretBase_Shrub1.inc | 23 - data/maps/events/SecretBase_Shrub2.inc | 23 - data/maps/events/SecretBase_Shrub3.inc | 23 - data/maps/events/SecretBase_Shrub4.inc | 23 - data/maps/events/SecretBase_Tree1.inc | 23 - data/maps/events/SecretBase_Tree2.inc | 23 - data/maps/events/SecretBase_Tree3.inc | 23 - data/maps/events/SecretBase_Tree4.inc | 23 - data/maps/events/SecretBase_YellowCave1.inc | 23 - data/maps/events/SecretBase_YellowCave2.inc | 23 - data/maps/events/SecretBase_YellowCave3.inc | 23 - data/maps/events/SecretBase_YellowCave4.inc | 23 - .../maps/events/ShoalCave_HighTideEntranceRoom.inc | 3 - data/maps/events/ShoalCave_HighTideInnerRoom.inc | 3 - data/maps/events/ShoalCave_LowTideEntranceRoom.inc | 13 - data/maps/events/ShoalCave_LowTideIceRoom.inc | 10 - data/maps/events/ShoalCave_LowTideInnerRoom.inc | 24 - data/maps/events/ShoalCave_LowTideLowerRoom.inc | 16 - data/maps/events/ShoalCave_LowTideStairsRoom.inc | 13 - data/maps/events/SingleBattleColosseum.inc | 14 - data/maps/events/SkyPillar_1F.inc | 8 - data/maps/events/SkyPillar_2F.inc | 7 - data/maps/events/SkyPillar_3F.inc | 8 - data/maps/events/SkyPillar_4F.inc | 8 - data/maps/events/SkyPillar_5F.inc | 7 - data/maps/events/SkyPillar_Entrance.inc | 7 - data/maps/events/SkyPillar_Outside.inc | 10 - data/maps/events/SkyPillar_Top.inc | 13 - data/maps/events/SlateportCity.inc | 71 - .../events/SlateportCity_BattleTentBattleRoom.inc | 8 - .../events/SlateportCity_BattleTentCorridor.inc | 6 - data/maps/events/SlateportCity_BattleTentLobby.inc | 17 - data/maps/events/SlateportCity_Harbor.inc | 25 - data/maps/events/SlateportCity_House1.inc | 10 - data/maps/events/SlateportCity_House2.inc | 11 - data/maps/events/SlateportCity_Mart.inc | 12 - .../maps/events/SlateportCity_OceanicMuseum_1F.inc | 43 - .../maps/events/SlateportCity_OceanicMuseum_2F.inc | 38 - .../maps/events/SlateportCity_PokemonCenter_1F.inc | 13 - .../maps/events/SlateportCity_PokemonCenter_2F.inc | 14 - data/maps/events/SlateportCity_PokemonFanClub.inc | 18 - .../events/SlateportCity_SternsShipyard_1F.inc | 14 - .../events/SlateportCity_SternsShipyard_2F.inc | 11 - data/maps/events/SootopolisCity.inc | 46 - data/maps/events/SootopolisCity_Gym_1F.inc | 16 - data/maps/events/SootopolisCity_Gym_B1F.inc | 18 - data/maps/events/SootopolisCity_House1.inc | 11 - data/maps/events/SootopolisCity_House2.inc | 10 - data/maps/events/SootopolisCity_House3.inc | 11 - data/maps/events/SootopolisCity_House4.inc | 12 - data/maps/events/SootopolisCity_House5.inc | 11 - data/maps/events/SootopolisCity_House6.inc | 10 - data/maps/events/SootopolisCity_House7.inc | 11 - .../events/SootopolisCity_LotadAndSeedotHouse.inc | 15 - data/maps/events/SootopolisCity_Mart.inc | 12 - .../SootopolisCity_MysteryEventsHouse_1F.inc | 11 - .../SootopolisCity_MysteryEventsHouse_B1F.inc | 9 - .../events/SootopolisCity_PokemonCenter_1F.inc | 14 - .../events/SootopolisCity_PokemonCenter_2F.inc | 14 - data/maps/events/SouthernIsland_Exterior.inc | 14 - data/maps/events/SouthernIsland_Interior.inc | 14 - data/maps/events/TerraCave_End.inc | 12 - data/maps/events/TerraCave_Entrance.inc | 7 - data/maps/events/TradeCenter.inc | 14 - data/maps/events/TrainerHill_1F.inc | 7 - data/maps/events/TrainerHill_2F.inc | 7 - data/maps/events/TrainerHill_3F.inc | 7 - data/maps/events/TrainerHill_4F.inc | 7 - data/maps/events/TrainerHill_Elevator.inc | 10 - data/maps/events/TrainerHill_Entrance.inc | 21 - data/maps/events/TrainerHill_Roof.inc | 10 - data/maps/events/Underwater1.inc | 12 - data/maps/events/Underwater2.inc | 16 - data/maps/events/Underwater3.inc | 13 - data/maps/events/Underwater4.inc | 10 - data/maps/events/Underwater5.inc | 7 - data/maps/events/Underwater6.inc | 7 - data/maps/events/Underwater7.inc | 7 - data/maps/events/Underwater_MarineCave.inc | 6 - data/maps/events/Underwater_Route134.inc | 6 - data/maps/events/Underwater_SeafloorCavern.inc | 12 - data/maps/events/Underwater_SealedChamber.inc | 9 - data/maps/events/Underwater_SootopolisCity.inc | 7 - data/maps/events/UnionRoom.inc | 18 - data/maps/events/UnknownMap_25_29.inc | 1 - data/maps/events/UnknownMap_25_30.inc | 1 - data/maps/events/UnknownMap_25_31.inc | 1 - data/maps/events/UnknownMap_25_32.inc | 1 - data/maps/events/UnknownMap_25_33.inc | 1 - data/maps/events/UnknownMap_25_34.inc | 3 - data/maps/events/VerdanturfTown.inc | 28 - .../events/VerdanturfTown_BattleTentBattleRoom.inc | 8 - .../events/VerdanturfTown_BattleTentCorridor.inc | 6 - .../maps/events/VerdanturfTown_BattleTentLobby.inc | 18 - .../VerdanturfTown_FriendshipRatersHouse.inc | 11 - data/maps/events/VerdanturfTown_House.inc | 11 - data/maps/events/VerdanturfTown_Mart.inc | 13 - .../events/VerdanturfTown_PokemonCenter_1F.inc | 14 - .../events/VerdanturfTown_PokemonCenter_2F.inc | 14 - data/maps/events/VerdanturfTown_WandasHouse.inc | 14 - data/maps/events/VictoryRoad_1F.inc | 28 - data/maps/events/VictoryRoad_B1F.inc | 35 - data/maps/events/VictoryRoad_B2F.inc | 22 - data/scripts/maps/AbandonedShip_CaptainsOffice.inc | 44 - data/scripts/maps/AbandonedShip_Corridors_1F.inc | 27 - data/scripts/maps/AbandonedShip_Corridors_B1F.inc | 91 - data/scripts/maps/AbandonedShip_Deck.inc | 8 - .../maps/AbandonedShip_HiddenFloorCorridors.inc | 171 -- .../maps/AbandonedShip_HiddenFloorRooms.inc | 148 -- data/scripts/maps/AbandonedShip_Room_B1F.inc | 3 - data/scripts/maps/AbandonedShip_Rooms2_1F.inc | 158 -- data/scripts/maps/AbandonedShip_Rooms2_B1F.inc | 13 - data/scripts/maps/AbandonedShip_Rooms_1F.inc | 81 - data/scripts/maps/AbandonedShip_Rooms_B1F.inc | 18 - data/scripts/maps/AbandonedShip_Underwater1.inc | 8 - data/scripts/maps/AbandonedShip_Underwater2.inc | 8 - data/scripts/maps/AlteringCave.inc | 8 - data/scripts/maps/AncientTomb.inc | 98 -- data/scripts/maps/AquaHideout_1F.inc | 122 -- data/scripts/maps/AquaHideout_B1F.inc | 171 -- data/scripts/maps/AquaHideout_B2F.inc | 160 -- data/scripts/maps/AquaHideout_UnusedRubyMap1.inc | 3 - data/scripts/maps/AquaHideout_UnusedRubyMap2.inc | 3 - data/scripts/maps/AquaHideout_UnusedRubyMap3.inc | 3 - data/scripts/maps/ArtisanCave_1F.inc | 3 - data/scripts/maps/ArtisanCave_B1F.inc | 8 - .../maps/BattleFrontier_BattleArenaBattleRoom.inc | 712 -------- .../maps/BattleFrontier_BattleArenaCorridor.inc | 90 - .../maps/BattleFrontier_BattleArenaLobby.inc | 638 ------- .../maps/BattleFrontier_BattleDomeBattleRoom.inc | 1277 -------------- .../maps/BattleFrontier_BattleDomeCorridor.inc | 152 -- .../maps/BattleFrontier_BattleDomeLobby.inc | 777 --------- .../BattleFrontier_BattleDomePreBattleRoom.inc | 417 ----- .../BattleFrontier_BattleFactoryBattleRoom.inc | 384 ----- .../maps/BattleFrontier_BattleFactoryLobby.inc | 611 ------- .../BattleFrontier_BattleFactoryPreBattleRoom.inc | 726 -------- .../maps/BattleFrontier_BattlePalaceBattleRoom.inc | 650 ------- .../maps/BattleFrontier_BattlePalaceCorridor.inc | 160 -- .../maps/BattleFrontier_BattlePalaceLobby.inc | 729 -------- .../maps/BattleFrontier_BattlePikeCorridor.inc | 69 - .../maps/BattleFrontier_BattlePikeLobby.inc | 497 ------ .../maps/BattleFrontier_BattlePikeRandomRoom1.inc | 895 ---------- .../maps/BattleFrontier_BattlePikeRandomRoom2.inc | 43 - .../maps/BattleFrontier_BattlePikeRandomRoom3.inc | 50 - .../BattleFrontier_BattlePikeThreePathRoom.inc | 393 ----- ...leFrontier_BattlePointExchangeServiceCorner.inc | 764 -------- .../BattleFrontier_BattlePyramidEmptySquare.inc | 784 --------- .../maps/BattleFrontier_BattlePyramidLobby.inc | 970 ----------- .../maps/BattleFrontier_BattlePyramidTop.inc | 379 ---- .../maps/BattleFrontier_BattleTowerBattleRoom.inc | 651 ------- .../maps/BattleFrontier_BattleTowerBattleRoom2.inc | 540 ------ .../maps/BattleFrontier_BattleTowerCorridor.inc | 59 - .../maps/BattleFrontier_BattleTowerCorridor2.inc | 172 -- .../maps/BattleFrontier_BattleTowerElevator.inc | 91 - .../maps/BattleFrontier_BattleTowerLobby.inc | 1589 ----------------- .../BattleFrontier_BattleTowerMultiBattleRoom.inc | 1822 -------------------- data/scripts/maps/BattleFrontier_Lounge1.inc | 269 --- data/scripts/maps/BattleFrontier_Lounge2.inc | 373 ---- data/scripts/maps/BattleFrontier_Lounge3.inc | 483 ------ data/scripts/maps/BattleFrontier_Lounge4.inc | 30 - data/scripts/maps/BattleFrontier_Lounge5.inc | 206 --- data/scripts/maps/BattleFrontier_Lounge6.inc | 82 - data/scripts/maps/BattleFrontier_Lounge7.inc | 482 ------ data/scripts/maps/BattleFrontier_Lounge8.inc | 45 - data/scripts/maps/BattleFrontier_Lounge9.inc | 3 - data/scripts/maps/BattleFrontier_Mart.inc | 67 - data/scripts/maps/BattleFrontier_OutsideEast.inc | 444 ----- data/scripts/maps/BattleFrontier_OutsideWest.inc | 526 ------ .../maps/BattleFrontier_PokemonCenter_1F.inc | 59 - .../maps/BattleFrontier_PokemonCenter_2F.inc | 19 - data/scripts/maps/BattleFrontier_RankingHall.inc | 135 -- data/scripts/maps/BattleFrontier_ReceptionGate.inc | 505 ------ data/scripts/maps/BattleFrontier_ScottsHouse.inc | 406 ----- data/scripts/maps/BattlePyramidSquare01.inc | 1 - data/scripts/maps/BattlePyramidSquare02.inc | 1 - data/scripts/maps/BattlePyramidSquare03.inc | 1 - data/scripts/maps/BattlePyramidSquare04.inc | 1 - data/scripts/maps/BattlePyramidSquare05.inc | 1 - data/scripts/maps/BattlePyramidSquare06.inc | 1 - data/scripts/maps/BattlePyramidSquare07.inc | 1 - data/scripts/maps/BattlePyramidSquare08.inc | 1 - data/scripts/maps/BattlePyramidSquare09.inc | 1 - data/scripts/maps/BattlePyramidSquare10.inc | 1 - data/scripts/maps/BattlePyramidSquare11.inc | 1 - data/scripts/maps/BattlePyramidSquare12.inc | 1 - data/scripts/maps/BattlePyramidSquare13.inc | 1 - data/scripts/maps/BattlePyramidSquare14.inc | 1 - data/scripts/maps/BattlePyramidSquare15.inc | 1 - data/scripts/maps/BattlePyramidSquare16.inc | 3 - data/scripts/maps/BirthIsland_Exterior.inc | 125 -- data/scripts/maps/BirthIsland_Harbor.inc | 27 - data/scripts/maps/CaveOfOrigin_1F.inc | 9 - data/scripts/maps/CaveOfOrigin_B1F.inc | 118 -- data/scripts/maps/CaveOfOrigin_Entrance.inc | 8 - .../maps/CaveOfOrigin_UnusedRubySapphireMap1.inc | 9 - .../maps/CaveOfOrigin_UnusedRubySapphireMap2.inc | 9 - .../maps/CaveOfOrigin_UnusedRubySapphireMap3.inc | 9 - data/scripts/maps/DesertRuins.inc | 98 -- data/scripts/maps/DesertUnderpass.inc | 36 - data/scripts/maps/DewfordTown.inc | 805 --------- data/scripts/maps/DewfordTown_Gym.inc | 491 ------ data/scripts/maps/DewfordTown_Hall.inc | 453 ----- data/scripts/maps/DewfordTown_House1.inc | 36 - data/scripts/maps/DewfordTown_House2.inc | 59 - data/scripts/maps/DewfordTown_PokemonCenter_1F.inc | 37 - data/scripts/maps/DewfordTown_PokemonCenter_2F.inc | 19 - data/scripts/maps/DoubleBattleColosseum.inc | 3 - data/scripts/maps/EverGrandeCity.inc | 38 - data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 346 ---- data/scripts/maps/EverGrandeCity_DrakesRoom.inc | 94 - data/scripts/maps/EverGrandeCity_GlaciasRoom.inc | 86 - data/scripts/maps/EverGrandeCity_Hall1.inc | 12 - data/scripts/maps/EverGrandeCity_Hall2.inc | 12 - data/scripts/maps/EverGrandeCity_Hall3.inc | 12 - data/scripts/maps/EverGrandeCity_Hall4.inc | 12 - data/scripts/maps/EverGrandeCity_Hall5.inc | 12 - data/scripts/maps/EverGrandeCity_HallOfFame.inc | 99 -- data/scripts/maps/EverGrandeCity_PhoebesRoom.inc | 87 - .../maps/EverGrandeCity_PokemonCenter_1F.inc | 104 -- .../maps/EverGrandeCity_PokemonCenter_2F.inc | 20 - .../maps/EverGrandeCity_PokemonLeague_1F.inc | 142 -- .../maps/EverGrandeCity_PokemonLeague_2F.inc | 19 - data/scripts/maps/EverGrandeCity_SidneysRoom.inc | 91 - data/scripts/maps/FallarborTown.inc | 96 -- .../maps/FallarborTown_BattleTentBattleRoom.inc | 268 --- .../maps/FallarborTown_BattleTentCorridor.inc | 64 - .../scripts/maps/FallarborTown_BattleTentLobby.inc | 402 ----- data/scripts/maps/FallarborTown_House1.inc | 126 -- data/scripts/maps/FallarborTown_House2.inc | 103 -- data/scripts/maps/FallarborTown_Mart.inc | 66 - .../maps/FallarborTown_PokemonCenter_1F.inc | 111 -- .../maps/FallarborTown_PokemonCenter_2F.inc | 19 - data/scripts/maps/FarawayIsland_Entrance.inc | 46 - data/scripts/maps/FarawayIsland_Interior.inc | 207 --- data/scripts/maps/FieryPath.inc | 15 - data/scripts/maps/FortreeCity.inc | 159 -- data/scripts/maps/FortreeCity_DecorationShop.inc | 72 - data/scripts/maps/FortreeCity_Gym.inc | 325 ---- data/scripts/maps/FortreeCity_House1.inc | 102 -- data/scripts/maps/FortreeCity_House2.inc | 84 - data/scripts/maps/FortreeCity_House3.inc | 29 - data/scripts/maps/FortreeCity_House4.inc | 99 -- data/scripts/maps/FortreeCity_House5.inc | 35 - data/scripts/maps/FortreeCity_Mart.inc | 57 - data/scripts/maps/FortreeCity_PokemonCenter_1F.inc | 55 - data/scripts/maps/FortreeCity_PokemonCenter_2F.inc | 19 - data/scripts/maps/GraniteCave_1F.inc | 40 - data/scripts/maps/GraniteCave_B1F.inc | 11 - data/scripts/maps/GraniteCave_B2F.inc | 3 - data/scripts/maps/GraniteCave_StevensRoom.inc | 124 -- data/scripts/maps/InsideOfTruck.inc | 60 - data/scripts/maps/IslandCave.inc | 129 -- data/scripts/maps/JaggedPass.inc | 279 --- data/scripts/maps/LavaridgeTown.inc | 425 ----- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 424 ----- data/scripts/maps/LavaridgeTown_Gym_B1F.inc | 59 - data/scripts/maps/LavaridgeTown_HerbShop.inc | 68 - data/scripts/maps/LavaridgeTown_House.inc | 26 - data/scripts/maps/LavaridgeTown_Mart.inc | 47 - .../maps/LavaridgeTown_PokemonCenter_1F.inc | 48 - .../maps/LavaridgeTown_PokemonCenter_2F.inc | 19 - data/scripts/maps/LilycoveCity.inc | 787 --------- data/scripts/maps/LilycoveCity_ContestHall.inc | 509 ------ data/scripts/maps/LilycoveCity_ContestLobby.inc | 1121 ------------ .../scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc | 131 -- .../scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc | 140 -- .../maps/LilycoveCity_DepartmentStoreElevator.inc | 129 -- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 238 --- .../maps/LilycoveCity_DepartmentStore_1F.inc | 193 --- .../maps/LilycoveCity_DepartmentStore_2F.inc | 80 - .../maps/LilycoveCity_DepartmentStore_3F.inc | 75 - .../maps/LilycoveCity_DepartmentStore_4F.inc | 72 - .../maps/LilycoveCity_DepartmentStore_5F.inc | 170 -- data/scripts/maps/LilycoveCity_Harbor.inc | 630 ------- data/scripts/maps/LilycoveCity_House1.inc | 26 - data/scripts/maps/LilycoveCity_House2.inc | 32 - data/scripts/maps/LilycoveCity_House3.inc | 169 -- data/scripts/maps/LilycoveCity_House4.inc | 21 - .../maps/LilycoveCity_LilycoveMuseum_1F.inc | 296 ---- .../maps/LilycoveCity_LilycoveMuseum_2F.inc | 340 ---- .../maps/LilycoveCity_MoveDeletersHouse.inc | 111 -- .../scripts/maps/LilycoveCity_PokemonCenter_1F.inc | 68 - .../scripts/maps/LilycoveCity_PokemonCenter_2F.inc | 19 - .../maps/LilycoveCity_PokemonTrainerFanClub.inc | 864 ---------- data/scripts/maps/LilycoveCity_UnusedMart.inc | 3 - data/scripts/maps/LinkContestRoom1.inc | 1 - data/scripts/maps/LinkContestRoom2.inc | 1 - data/scripts/maps/LinkContestRoom3.inc | 1 - data/scripts/maps/LinkContestRoom4.inc | 1 - data/scripts/maps/LinkContestRoom5.inc | 1 - data/scripts/maps/LinkContestRoom6.inc | 1 - data/scripts/maps/LittlerootTown.inc | 1040 ----------- .../maps/LittlerootTown_BrendansHouse_1F.inc | 451 ----- .../maps/LittlerootTown_BrendansHouse_2F.inc | 318 ---- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 423 ----- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 422 ----- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 1030 ----------- data/scripts/maps/MagmaHideout_1F.inc | 53 - data/scripts/maps/MagmaHideout_2F_1R.inc | 75 - data/scripts/maps/MagmaHideout_2F_2R.inc | 78 - data/scripts/maps/MagmaHideout_2F_3R.inc | 3 - data/scripts/maps/MagmaHideout_3F_1R.inc | 43 - data/scripts/maps/MagmaHideout_3F_2R.inc | 26 - data/scripts/maps/MagmaHideout_3F_3R.inc | 3 - data/scripts/maps/MagmaHideout_4F.inc | 228 --- data/scripts/maps/MarineCave_End.inc | 78 - data/scripts/maps/MarineCave_Entrance.inc | 8 - data/scripts/maps/MauvilleCity.inc | 677 -------- data/scripts/maps/MauvilleCity_BikeShop.inc | 329 ---- data/scripts/maps/MauvilleCity_GameCorner.inc | 821 --------- data/scripts/maps/MauvilleCity_Gym.inc | 442 ----- data/scripts/maps/MauvilleCity_House1.inc | 47 - data/scripts/maps/MauvilleCity_House2.inc | 69 - data/scripts/maps/MauvilleCity_Mart.inc | 53 - .../scripts/maps/MauvilleCity_PokemonCenter_1F.inc | 54 - .../scripts/maps/MauvilleCity_PokemonCenter_2F.inc | 31 - data/scripts/maps/MeteorFalls_1F_1R.inc | 312 ---- data/scripts/maps/MeteorFalls_1F_2R.inc | 195 --- data/scripts/maps/MeteorFalls_B1F_1R.inc | 3 - data/scripts/maps/MeteorFalls_B1F_2R.inc | 3 - data/scripts/maps/MeteorFalls_StevensCave.inc | 58 - data/scripts/maps/MirageTower_1F.inc | 10 - data/scripts/maps/MirageTower_2F.inc | 11 - data/scripts/maps/MirageTower_3F.inc | 11 - data/scripts/maps/MirageTower_4F.inc | 79 - data/scripts/maps/MossdeepCity.inc | 436 ----- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 80 - data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 3 - data/scripts/maps/MossdeepCity_Gym.inc | 658 ------- data/scripts/maps/MossdeepCity_House1.inc | 42 - data/scripts/maps/MossdeepCity_House2.inc | 70 - data/scripts/maps/MossdeepCity_House3.inc | 52 - data/scripts/maps/MossdeepCity_House4.inc | 63 - data/scripts/maps/MossdeepCity_Mart.inc | 60 - .../scripts/maps/MossdeepCity_PokemonCenter_1F.inc | 36 - .../scripts/maps/MossdeepCity_PokemonCenter_2F.inc | 28 - data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc | 439 ----- data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc | 524 ------ data/scripts/maps/MossdeepCity_StevensHouse.inc | 219 --- data/scripts/maps/MtChimney.inc | 869 ---------- data/scripts/maps/MtChimney_CableCarStation.inc | 98 -- data/scripts/maps/MtPyre_1F.inc | 49 - data/scripts/maps/MtPyre_2F.inc | 135 -- data/scripts/maps/MtPyre_3F.inc | 103 -- data/scripts/maps/MtPyre_4F.inc | 20 - data/scripts/maps/MtPyre_5F.inc | 23 - data/scripts/maps/MtPyre_6F.inc | 73 - data/scripts/maps/MtPyre_Exterior.inc | 28 - data/scripts/maps/MtPyre_Summit.inc | 640 ------- data/scripts/maps/NavelRock_B1F.inc | 3 - data/scripts/maps/NavelRock_Bottom.inc | 88 - data/scripts/maps/NavelRock_Down01.inc | 3 - data/scripts/maps/NavelRock_Down02.inc | 3 - data/scripts/maps/NavelRock_Down03.inc | 3 - data/scripts/maps/NavelRock_Down04.inc | 3 - data/scripts/maps/NavelRock_Down05.inc | 3 - data/scripts/maps/NavelRock_Down06.inc | 3 - data/scripts/maps/NavelRock_Down07.inc | 3 - data/scripts/maps/NavelRock_Down08.inc | 3 - data/scripts/maps/NavelRock_Down09.inc | 3 - data/scripts/maps/NavelRock_Down10.inc | 3 - data/scripts/maps/NavelRock_Down11.inc | 3 - data/scripts/maps/NavelRock_Entrance.inc | 3 - data/scripts/maps/NavelRock_Exterior.inc | 8 - data/scripts/maps/NavelRock_Fork.inc | 3 - data/scripts/maps/NavelRock_Harbor.inc | 27 - data/scripts/maps/NavelRock_Top.inc | 127 -- data/scripts/maps/NavelRock_Up1.inc | 3 - data/scripts/maps/NavelRock_Up2.inc | 3 - data/scripts/maps/NavelRock_Up3.inc | 3 - data/scripts/maps/NavelRock_Up4.inc | 3 - data/scripts/maps/NewMauville_Entrance.inc | 61 - data/scripts/maps/NewMauville_Inside.inc | 282 --- data/scripts/maps/OldaleTown.inc | 408 ----- data/scripts/maps/OldaleTown_House1.inc | 15 - data/scripts/maps/OldaleTown_House2.inc | 20 - data/scripts/maps/OldaleTown_Mart.inc | 73 - data/scripts/maps/OldaleTown_PokemonCenter_1F.inc | 63 - data/scripts/maps/OldaleTown_PokemonCenter_2F.inc | 19 - data/scripts/maps/PacifidlogTown.inc | 54 - data/scripts/maps/PacifidlogTown_House1.inc | 25 - data/scripts/maps/PacifidlogTown_House2.inc | 156 -- data/scripts/maps/PacifidlogTown_House3.inc | 93 - data/scripts/maps/PacifidlogTown_House4.inc | 55 - data/scripts/maps/PacifidlogTown_House5.inc | 37 - .../maps/PacifidlogTown_PokemonCenter_1F.inc | 48 - .../maps/PacifidlogTown_PokemonCenter_2F.inc | 19 - data/scripts/maps/PetalburgCity.inc | 771 --------- data/scripts/maps/PetalburgCity_Gym.inc | 1703 ------------------ data/scripts/maps/PetalburgCity_House1.inc | 28 - data/scripts/maps/PetalburgCity_House2.inc | 24 - data/scripts/maps/PetalburgCity_Mart.inc | 87 - .../maps/PetalburgCity_PokemonCenter_1F.inc | 98 -- .../maps/PetalburgCity_PokemonCenter_2F.inc | 19 - data/scripts/maps/PetalburgCity_WallysHouse.inc | 139 -- data/scripts/maps/PetalburgWoods.inc | 486 ------ data/scripts/maps/RecordCorner.inc | 3 - data/scripts/maps/Route101.inc | 301 ---- data/scripts/maps/Route102.inc | 119 -- data/scripts/maps/Route103.inc | 368 ---- data/scripts/maps/Route104.inc | 1227 ------------- data/scripts/maps/Route104_MrBrineysHouse.inc | 166 -- .../maps/Route104_PrettyPetalFlowerShop.inc | 110 -- data/scripts/maps/Route104_Prototype.inc | 3 - .../Route104_PrototypePrettyPetalFlowerShop.inc | 3 - data/scripts/maps/Route105.inc | 107 -- data/scripts/maps/Route106.inc | 52 - data/scripts/maps/Route107.inc | 58 - data/scripts/maps/Route108.inc | 53 - data/scripts/maps/Route109.inc | 573 ------ data/scripts/maps/Route109_SeashoreHouse.inc | 196 --- data/scripts/maps/Route110.inc | 1030 ----------- .../maps/Route110_SeasideCyclingRoadEntrance1.inc | 50 - .../maps/Route110_SeasideCyclingRoadEntrance2.inc | 69 - data/scripts/maps/Route110_TrickHouseCorridor.inc | 8 - data/scripts/maps/Route110_TrickHouseEnd.inc | 369 ---- data/scripts/maps/Route110_TrickHouseEntrance.inc | 901 ---------- data/scripts/maps/Route110_TrickHousePuzzle1.inc | 79 - data/scripts/maps/Route110_TrickHousePuzzle2.inc | 146 -- data/scripts/maps/Route110_TrickHousePuzzle3.inc | 360 ---- data/scripts/maps/Route110_TrickHousePuzzle4.inc | 71 - data/scripts/maps/Route110_TrickHousePuzzle5.inc | 1091 ------------ data/scripts/maps/Route110_TrickHousePuzzle6.inc | 87 - data/scripts/maps/Route110_TrickHousePuzzle7.inc | 411 ----- data/scripts/maps/Route110_TrickHousePuzzle8.inc | 72 - data/scripts/maps/Route111.inc | 756 -------- data/scripts/maps/Route111_OldLadysRestStop.inc | 54 - .../maps/Route111_WinstrateFamilysHouse.inc | 105 -- data/scripts/maps/Route112.inc | 146 -- data/scripts/maps/Route112_CableCarStation.inc | 99 -- data/scripts/maps/Route113.inc | 176 -- data/scripts/maps/Route113_GlassWorkshop.inc | 397 ----- data/scripts/maps/Route114.inc | 219 --- data/scripts/maps/Route114_FossilManiacsHouse.inc | 56 - data/scripts/maps/Route114_FossilManiacsTunnel.inc | 96 -- data/scripts/maps/Route114_LanettesHouse.inc | 108 -- data/scripts/maps/Route115.inc | 162 -- data/scripts/maps/Route116.inc | 511 ------ data/scripts/maps/Route116_TunnelersRestHouse.inc | 63 - data/scripts/maps/Route117.inc | 232 --- data/scripts/maps/Route117_PokemonDayCare.inc | 8 - data/scripts/maps/Route118.inc | 318 ---- data/scripts/maps/Route119.inc | 637 ------- data/scripts/maps/Route119_House.inc | 27 - data/scripts/maps/Route119_WeatherInstitute_1F.inc | 139 -- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 339 ---- data/scripts/maps/Route120.inc | 466 ----- data/scripts/maps/Route121.inc | 200 --- data/scripts/maps/Route121_SafariZoneEntrance.inc | 142 -- data/scripts/maps/Route122.inc | 3 - data/scripts/maps/Route123.inc | 213 --- data/scripts/maps/Route123_BerryMastersHouse.inc | 153 -- data/scripts/maps/Route124.inc | 117 -- .../maps/Route124_DivingTreasureHuntersHouse.inc | 349 ---- data/scripts/maps/Route125.inc | 93 - data/scripts/maps/Route126.inc | 69 - data/scripts/maps/Route127.inc | 88 - data/scripts/maps/Route128.inc | 311 ---- data/scripts/maps/Route129.inc | 58 - data/scripts/maps/Route130.inc | 52 - data/scripts/maps/Route131.inc | 59 - data/scripts/maps/Route132.inc | 43 - data/scripts/maps/Route133.inc | 38 - data/scripts/maps/Route134.inc | 53 - data/scripts/maps/RustboroCity.inc | 1310 -------------- data/scripts/maps/RustboroCity_CuttersHouse.inc | 53 - data/scripts/maps/RustboroCity_DevonCorp_1F.inc | 153 -- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 407 ----- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 311 ---- data/scripts/maps/RustboroCity_Flat1_1F.inc | 18 - data/scripts/maps/RustboroCity_Flat1_2F.inc | 184 -- data/scripts/maps/RustboroCity_Flat2_1F.inc | 24 - data/scripts/maps/RustboroCity_Flat2_2F.inc | 39 - data/scripts/maps/RustboroCity_Flat2_3F.inc | 19 - data/scripts/maps/RustboroCity_Gym.inc | 291 ---- data/scripts/maps/RustboroCity_House1.inc | 85 - data/scripts/maps/RustboroCity_House2.inc | 21 - data/scripts/maps/RustboroCity_House3.inc | 36 - data/scripts/maps/RustboroCity_Mart.inc | 89 - .../scripts/maps/RustboroCity_PokemonCenter_1F.inc | 47 - .../scripts/maps/RustboroCity_PokemonCenter_2F.inc | 19 - data/scripts/maps/RustboroCity_PokemonSchool.inc | 359 ---- data/scripts/maps/RusturfTunnel.inc | 539 ------ data/scripts/maps/SSTidalCorridor.inc | 356 ---- data/scripts/maps/SSTidalLowerDeck.inc | 39 - data/scripts/maps/SSTidalRooms.inc | 177 -- data/scripts/maps/SafariZone_North.inc | 11 - data/scripts/maps/SafariZone_Northeast.inc | 3 - data/scripts/maps/SafariZone_Northwest.inc | 7 - data/scripts/maps/SafariZone_RestHouse.inc | 15 - data/scripts/maps/SafariZone_South.inc | 154 -- data/scripts/maps/SafariZone_Southeast.inc | 3 - data/scripts/maps/SafariZone_Southwest.inc | 11 - data/scripts/maps/ScorchedSlab.inc | 8 - data/scripts/maps/SeafloorCavern_Entrance.inc | 93 - data/scripts/maps/SeafloorCavern_Room1.inc | 36 - data/scripts/maps/SeafloorCavern_Room2.inc | 3 - data/scripts/maps/SeafloorCavern_Room3.inc | 58 - data/scripts/maps/SeafloorCavern_Room4.inc | 36 - data/scripts/maps/SeafloorCavern_Room5.inc | 3 - data/scripts/maps/SeafloorCavern_Room6.inc | 3 - data/scripts/maps/SeafloorCavern_Room7.inc | 3 - data/scripts/maps/SeafloorCavern_Room8.inc | 3 - data/scripts/maps/SeafloorCavern_Room9.inc | 323 ---- data/scripts/maps/SealedChamber_InnerRoom.inc | 89 - data/scripts/maps/SealedChamber_OuterRoom.inc | 132 -- data/scripts/maps/SecretBase_BlueCave1.inc | 1 - data/scripts/maps/SecretBase_BlueCave2.inc | 1 - data/scripts/maps/SecretBase_BlueCave3.inc | 1 - data/scripts/maps/SecretBase_BlueCave4.inc | 1 - data/scripts/maps/SecretBase_BrownCave1.inc | 1 - data/scripts/maps/SecretBase_BrownCave2.inc | 1 - data/scripts/maps/SecretBase_BrownCave3.inc | 1 - data/scripts/maps/SecretBase_BrownCave4.inc | 1 - data/scripts/maps/SecretBase_RedCave1.inc | 1 - data/scripts/maps/SecretBase_RedCave2.inc | 1 - data/scripts/maps/SecretBase_RedCave3.inc | 1 - data/scripts/maps/SecretBase_RedCave4.inc | 1 - data/scripts/maps/SecretBase_Shrub1.inc | 1 - data/scripts/maps/SecretBase_Shrub2.inc | 1 - data/scripts/maps/SecretBase_Shrub3.inc | 1 - data/scripts/maps/SecretBase_Shrub4.inc | 1 - data/scripts/maps/SecretBase_Tree1.inc | 1 - data/scripts/maps/SecretBase_Tree2.inc | 1 - data/scripts/maps/SecretBase_Tree3.inc | 1 - data/scripts/maps/SecretBase_Tree4.inc | 1 - data/scripts/maps/SecretBase_YellowCave1.inc | 1 - data/scripts/maps/SecretBase_YellowCave2.inc | 1 - data/scripts/maps/SecretBase_YellowCave3.inc | 1 - data/scripts/maps/SecretBase_YellowCave4.inc | 24 - .../maps/ShoalCave_HighTideEntranceRoom.inc | 3 - data/scripts/maps/ShoalCave_HighTideInnerRoom.inc | 3 - .../scripts/maps/ShoalCave_LowTideEntranceRoom.inc | 103 -- data/scripts/maps/ShoalCave_LowTideIceRoom.inc | 3 - data/scripts/maps/ShoalCave_LowTideInnerRoom.inc | 158 -- data/scripts/maps/ShoalCave_LowTideLowerRoom.inc | 63 - data/scripts/maps/ShoalCave_LowTideStairsRoom.inc | 35 - data/scripts/maps/SingleBattleColosseum.inc | 3 - data/scripts/maps/SkyPillar_1F.inc | 13 - data/scripts/maps/SkyPillar_2F.inc | 21 - data/scripts/maps/SkyPillar_3F.inc | 13 - data/scripts/maps/SkyPillar_4F.inc | 21 - data/scripts/maps/SkyPillar_5F.inc | 13 - data/scripts/maps/SkyPillar_Entrance.inc | 8 - data/scripts/maps/SkyPillar_Outside.inc | 174 -- data/scripts/maps/SkyPillar_Top.inc | 189 -- data/scripts/maps/SlateportCity.inc | 1383 --------------- .../maps/SlateportCity_BattleTentBattleRoom.inc | 115 -- .../maps/SlateportCity_BattleTentCorridor.inc | 280 --- .../scripts/maps/SlateportCity_BattleTentLobby.inc | 357 ---- data/scripts/maps/SlateportCity_Harbor.inc | 567 ------ data/scripts/maps/SlateportCity_House1.inc | 121 -- data/scripts/maps/SlateportCity_House2.inc | 23 - data/scripts/maps/SlateportCity_Mart.inc | 47 - .../maps/SlateportCity_OceanicMuseum_1F.inc | 395 ----- .../maps/SlateportCity_OceanicMuseum_2F.inc | 441 ----- .../maps/SlateportCity_PokemonCenter_1F.inc | 40 - .../maps/SlateportCity_PokemonCenter_2F.inc | 19 - data/scripts/maps/SlateportCity_PokemonFanClub.inc | 428 ----- .../maps/SlateportCity_SternsShipyard_1F.inc | 145 -- .../maps/SlateportCity_SternsShipyard_2F.inc | 22 - data/scripts/maps/SootopolisCity.inc | 1784 ------------------- data/scripts/maps/SootopolisCity_Gym_1F.inc | 329 ---- data/scripts/maps/SootopolisCity_Gym_B1F.inc | 183 -- data/scripts/maps/SootopolisCity_House1.inc | 45 - data/scripts/maps/SootopolisCity_House2.inc | 36 - data/scripts/maps/SootopolisCity_House3.inc | 43 - data/scripts/maps/SootopolisCity_House4.inc | 39 - data/scripts/maps/SootopolisCity_House5.inc | 20 - data/scripts/maps/SootopolisCity_House6.inc | 56 - data/scripts/maps/SootopolisCity_House7.inc | 26 - .../maps/SootopolisCity_LotadAndSeedotHouse.inc | 210 --- data/scripts/maps/SootopolisCity_Mart.inc | 80 - .../maps/SootopolisCity_MysteryEventsHouse_1F.inc | 241 --- .../maps/SootopolisCity_MysteryEventsHouse_B1F.inc | 78 - .../maps/SootopolisCity_PokemonCenter_1F.inc | 74 - .../maps/SootopolisCity_PokemonCenter_2F.inc | 19 - data/scripts/maps/SouthernIsland_Exterior.inc | 55 - data/scripts/maps/SouthernIsland_Interior.inc | 167 -- data/scripts/maps/TerraCave_End.inc | 78 - data/scripts/maps/TerraCave_Entrance.inc | 8 - data/scripts/maps/TradeCenter.inc | 3 - data/scripts/maps/TrainerHill_1F.inc | 6 - data/scripts/maps/TrainerHill_2F.inc | 6 - data/scripts/maps/TrainerHill_3F.inc | 5 - data/scripts/maps/TrainerHill_4F.inc | 5 - data/scripts/maps/TrainerHill_Elevator.inc | 87 - data/scripts/maps/TrainerHill_Entrance.inc | 476 ----- data/scripts/maps/TrainerHill_Roof.inc | 70 - data/scripts/maps/Underwater1.inc | 3 - data/scripts/maps/Underwater2.inc | 3 - data/scripts/maps/Underwater3.inc | 8 - data/scripts/maps/Underwater4.inc | 3 - data/scripts/maps/Underwater5.inc | 8 - data/scripts/maps/Underwater6.inc | 8 - data/scripts/maps/Underwater7.inc | 8 - data/scripts/maps/Underwater_MarineCave.inc | 13 - data/scripts/maps/Underwater_Route134.inc | 8 - data/scripts/maps/Underwater_SeafloorCavern.inc | 52 - data/scripts/maps/Underwater_SealedChamber.inc | 28 - data/scripts/maps/Underwater_SootopolisCity.inc | 8 - data/scripts/maps/UnionRoom.inc | 107 -- data/scripts/maps/UnknownMap_25_29.inc | 1 - data/scripts/maps/UnknownMap_25_30.inc | 1 - data/scripts/maps/UnknownMap_25_31.inc | 1 - data/scripts/maps/UnknownMap_25_32.inc | 1 - data/scripts/maps/UnknownMap_25_33.inc | 1 - data/scripts/maps/UnknownMap_25_34.inc | 458 ----- data/scripts/maps/VerdanturfTown.inc | 127 -- .../maps/VerdanturfTown_BattleTentBattleRoom.inc | 200 --- .../maps/VerdanturfTown_BattleTentCorridor.inc | 69 - .../maps/VerdanturfTown_BattleTentLobby.inc | 439 ----- .../maps/VerdanturfTown_FriendshipRatersHouse.inc | 104 -- data/scripts/maps/VerdanturfTown_House.inc | 25 - data/scripts/maps/VerdanturfTown_Mart.inc | 60 - .../maps/VerdanturfTown_PokemonCenter_1F.inc | 42 - .../maps/VerdanturfTown_PokemonCenter_2F.inc | 19 - data/scripts/maps/VerdanturfTown_WandasHouse.inc | 176 -- data/scripts/maps/VictoryRoad_1F.inc | 220 --- data/scripts/maps/VictoryRoad_B1F.inc | 91 - data/scripts/maps/VictoryRoad_B2F.inc | 108 -- 2074 files changed, 96590 insertions(+), 96590 deletions(-) create mode 100644 data/maps/AbandonedShip_CaptainsOffice/events.inc create mode 100644 data/maps/AbandonedShip_CaptainsOffice/scripts.inc create mode 100644 data/maps/AbandonedShip_Corridors_1F/events.inc create mode 100644 data/maps/AbandonedShip_Corridors_1F/scripts.inc create mode 100644 data/maps/AbandonedShip_Corridors_B1F/events.inc create mode 100644 data/maps/AbandonedShip_Corridors_B1F/scripts.inc create mode 100644 data/maps/AbandonedShip_Deck/events.inc create mode 100644 data/maps/AbandonedShip_Deck/scripts.inc create mode 100644 data/maps/AbandonedShip_HiddenFloorCorridors/events.inc create mode 100644 data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc create mode 100644 data/maps/AbandonedShip_HiddenFloorRooms/events.inc create mode 100644 data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc create mode 100644 data/maps/AbandonedShip_Room_B1F/events.inc create mode 100644 data/maps/AbandonedShip_Room_B1F/scripts.inc create mode 100644 data/maps/AbandonedShip_Rooms2_1F/events.inc create mode 100644 data/maps/AbandonedShip_Rooms2_1F/scripts.inc create mode 100644 data/maps/AbandonedShip_Rooms2_B1F/events.inc create mode 100644 data/maps/AbandonedShip_Rooms2_B1F/scripts.inc create mode 100644 data/maps/AbandonedShip_Rooms_1F/events.inc create mode 100644 data/maps/AbandonedShip_Rooms_1F/scripts.inc create mode 100644 data/maps/AbandonedShip_Rooms_B1F/events.inc create mode 100644 data/maps/AbandonedShip_Rooms_B1F/scripts.inc create mode 100644 data/maps/AbandonedShip_Underwater1/events.inc create mode 100644 data/maps/AbandonedShip_Underwater1/scripts.inc create mode 100644 data/maps/AbandonedShip_Underwater2/events.inc create mode 100644 data/maps/AbandonedShip_Underwater2/scripts.inc create mode 100644 data/maps/AlteringCave/events.inc create mode 100644 data/maps/AlteringCave/scripts.inc create mode 100644 data/maps/AncientTomb/events.inc create mode 100644 data/maps/AncientTomb/scripts.inc create mode 100644 data/maps/AquaHideout_1F/events.inc create mode 100644 data/maps/AquaHideout_1F/scripts.inc create mode 100644 data/maps/AquaHideout_B1F/events.inc create mode 100644 data/maps/AquaHideout_B1F/scripts.inc create mode 100644 data/maps/AquaHideout_B2F/events.inc create mode 100644 data/maps/AquaHideout_B2F/scripts.inc create mode 100644 data/maps/AquaHideout_UnusedRubyMap1/events.inc create mode 100644 data/maps/AquaHideout_UnusedRubyMap1/scripts.inc create mode 100644 data/maps/AquaHideout_UnusedRubyMap2/events.inc create mode 100644 data/maps/AquaHideout_UnusedRubyMap2/scripts.inc create mode 100644 data/maps/AquaHideout_UnusedRubyMap3/events.inc create mode 100644 data/maps/AquaHideout_UnusedRubyMap3/scripts.inc create mode 100644 data/maps/ArtisanCave_1F/events.inc create mode 100644 data/maps/ArtisanCave_1F/scripts.inc create mode 100644 data/maps/ArtisanCave_B1F/events.inc create mode 100644 data/maps/ArtisanCave_B1F/scripts.inc create mode 100644 data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc create mode 100644 data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc create mode 100644 data/maps/BattleFrontier_BattleArenaCorridor/events.inc create mode 100644 data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc create mode 100644 data/maps/BattleFrontier_BattleArenaLobby/events.inc create mode 100644 data/maps/BattleFrontier_BattleArenaLobby/scripts.inc create mode 100644 data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc create mode 100644 data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc create mode 100644 data/maps/BattleFrontier_BattleDomeCorridor/events.inc create mode 100644 data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc create mode 100644 data/maps/BattleFrontier_BattleDomeLobby/events.inc create mode 100644 data/maps/BattleFrontier_BattleDomeLobby/scripts.inc create mode 100644 data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc create mode 100644 data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc create mode 100644 data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc create mode 100644 data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc create mode 100644 data/maps/BattleFrontier_BattleFactoryLobby/events.inc create mode 100644 data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc create mode 100644 data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc create mode 100644 data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc create mode 100644 data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc create mode 100644 data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc create mode 100644 data/maps/BattleFrontier_BattlePalaceCorridor/events.inc create mode 100644 data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc create mode 100644 data/maps/BattleFrontier_BattlePalaceLobby/events.inc create mode 100644 data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc create mode 100644 data/maps/BattleFrontier_BattlePikeCorridor/events.inc create mode 100644 data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc create mode 100644 data/maps/BattleFrontier_BattlePikeLobby/events.inc create mode 100644 data/maps/BattleFrontier_BattlePikeLobby/scripts.inc create mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc create mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc create mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc create mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc create mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc create mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc create mode 100644 data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc create mode 100644 data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc create mode 100644 data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc create mode 100644 data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc create mode 100644 data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc create mode 100644 data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc create mode 100644 data/maps/BattleFrontier_BattlePyramidLobby/events.inc create mode 100644 data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc create mode 100644 data/maps/BattleFrontier_BattlePyramidTop/events.inc create mode 100644 data/maps/BattleFrontier_BattlePyramidTop/scripts.inc create mode 100644 data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc create mode 100644 data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc create mode 100644 data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc create mode 100644 data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc create mode 100644 data/maps/BattleFrontier_BattleTowerCorridor/events.inc create mode 100644 data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc create mode 100644 data/maps/BattleFrontier_BattleTowerCorridor2/events.inc create mode 100644 data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc create mode 100644 data/maps/BattleFrontier_BattleTowerElevator/events.inc create mode 100644 data/maps/BattleFrontier_BattleTowerElevator/scripts.inc create mode 100644 data/maps/BattleFrontier_BattleTowerLobby/events.inc create mode 100644 data/maps/BattleFrontier_BattleTowerLobby/scripts.inc create mode 100644 data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc create mode 100644 data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc create mode 100644 data/maps/BattleFrontier_Lounge1/events.inc create mode 100644 data/maps/BattleFrontier_Lounge1/scripts.inc create mode 100644 data/maps/BattleFrontier_Lounge2/events.inc create mode 100644 data/maps/BattleFrontier_Lounge2/scripts.inc create mode 100644 data/maps/BattleFrontier_Lounge3/events.inc create mode 100644 data/maps/BattleFrontier_Lounge3/scripts.inc create mode 100644 data/maps/BattleFrontier_Lounge4/events.inc create mode 100644 data/maps/BattleFrontier_Lounge4/scripts.inc create mode 100644 data/maps/BattleFrontier_Lounge5/events.inc create mode 100644 data/maps/BattleFrontier_Lounge5/scripts.inc create mode 100644 data/maps/BattleFrontier_Lounge6/events.inc create mode 100644 data/maps/BattleFrontier_Lounge6/scripts.inc create mode 100644 data/maps/BattleFrontier_Lounge7/events.inc create mode 100644 data/maps/BattleFrontier_Lounge7/scripts.inc create mode 100644 data/maps/BattleFrontier_Lounge8/events.inc create mode 100644 data/maps/BattleFrontier_Lounge8/scripts.inc create mode 100644 data/maps/BattleFrontier_Lounge9/events.inc create mode 100644 data/maps/BattleFrontier_Lounge9/scripts.inc create mode 100644 data/maps/BattleFrontier_Mart/events.inc create mode 100644 data/maps/BattleFrontier_Mart/scripts.inc create mode 100644 data/maps/BattleFrontier_OutsideEast/events.inc create mode 100644 data/maps/BattleFrontier_OutsideEast/scripts.inc create mode 100644 data/maps/BattleFrontier_OutsideWest/events.inc create mode 100644 data/maps/BattleFrontier_OutsideWest/scripts.inc create mode 100644 data/maps/BattleFrontier_PokemonCenter_1F/events.inc create mode 100644 data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/BattleFrontier_PokemonCenter_2F/events.inc create mode 100644 data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/BattleFrontier_RankingHall/events.inc create mode 100644 data/maps/BattleFrontier_RankingHall/scripts.inc create mode 100644 data/maps/BattleFrontier_ReceptionGate/events.inc create mode 100644 data/maps/BattleFrontier_ReceptionGate/scripts.inc create mode 100644 data/maps/BattleFrontier_ScottsHouse/events.inc create mode 100644 data/maps/BattleFrontier_ScottsHouse/scripts.inc create mode 100644 data/maps/BattlePyramidSquare01/events.inc create mode 100644 data/maps/BattlePyramidSquare01/scripts.inc create mode 100644 data/maps/BattlePyramidSquare02/events.inc create mode 100644 data/maps/BattlePyramidSquare02/scripts.inc create mode 100644 data/maps/BattlePyramidSquare03/events.inc create mode 100644 data/maps/BattlePyramidSquare03/scripts.inc create mode 100644 data/maps/BattlePyramidSquare04/events.inc create mode 100644 data/maps/BattlePyramidSquare04/scripts.inc create mode 100644 data/maps/BattlePyramidSquare05/events.inc create mode 100644 data/maps/BattlePyramidSquare05/scripts.inc create mode 100644 data/maps/BattlePyramidSquare06/events.inc create mode 100644 data/maps/BattlePyramidSquare06/scripts.inc create mode 100644 data/maps/BattlePyramidSquare07/events.inc create mode 100644 data/maps/BattlePyramidSquare07/scripts.inc create mode 100644 data/maps/BattlePyramidSquare08/events.inc create mode 100644 data/maps/BattlePyramidSquare08/scripts.inc create mode 100644 data/maps/BattlePyramidSquare09/events.inc create mode 100644 data/maps/BattlePyramidSquare09/scripts.inc create mode 100644 data/maps/BattlePyramidSquare10/events.inc create mode 100644 data/maps/BattlePyramidSquare10/scripts.inc create mode 100644 data/maps/BattlePyramidSquare11/events.inc create mode 100644 data/maps/BattlePyramidSquare11/scripts.inc create mode 100644 data/maps/BattlePyramidSquare12/events.inc create mode 100644 data/maps/BattlePyramidSquare12/scripts.inc create mode 100644 data/maps/BattlePyramidSquare13/events.inc create mode 100644 data/maps/BattlePyramidSquare13/scripts.inc create mode 100644 data/maps/BattlePyramidSquare14/events.inc create mode 100644 data/maps/BattlePyramidSquare14/scripts.inc create mode 100644 data/maps/BattlePyramidSquare15/events.inc create mode 100644 data/maps/BattlePyramidSquare15/scripts.inc create mode 100644 data/maps/BattlePyramidSquare16/events.inc create mode 100644 data/maps/BattlePyramidSquare16/scripts.inc create mode 100644 data/maps/BirthIsland_Exterior/events.inc create mode 100644 data/maps/BirthIsland_Exterior/scripts.inc create mode 100644 data/maps/BirthIsland_Harbor/events.inc create mode 100644 data/maps/BirthIsland_Harbor/scripts.inc create mode 100644 data/maps/CaveOfOrigin_1F/events.inc create mode 100644 data/maps/CaveOfOrigin_1F/scripts.inc create mode 100644 data/maps/CaveOfOrigin_B1F/events.inc create mode 100644 data/maps/CaveOfOrigin_B1F/scripts.inc create mode 100644 data/maps/CaveOfOrigin_Entrance/events.inc create mode 100644 data/maps/CaveOfOrigin_Entrance/scripts.inc create mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc create mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc create mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc create mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc create mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc create mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc create mode 100644 data/maps/DesertRuins/events.inc create mode 100644 data/maps/DesertRuins/scripts.inc create mode 100644 data/maps/DesertUnderpass/events.inc create mode 100644 data/maps/DesertUnderpass/scripts.inc create mode 100644 data/maps/DewfordTown/events.inc create mode 100644 data/maps/DewfordTown/scripts.inc create mode 100644 data/maps/DewfordTown_Gym/events.inc create mode 100644 data/maps/DewfordTown_Gym/scripts.inc create mode 100644 data/maps/DewfordTown_Hall/events.inc create mode 100644 data/maps/DewfordTown_Hall/scripts.inc create mode 100644 data/maps/DewfordTown_House1/events.inc create mode 100644 data/maps/DewfordTown_House1/scripts.inc create mode 100644 data/maps/DewfordTown_House2/events.inc create mode 100644 data/maps/DewfordTown_House2/scripts.inc create mode 100644 data/maps/DewfordTown_PokemonCenter_1F/events.inc create mode 100644 data/maps/DewfordTown_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/DewfordTown_PokemonCenter_2F/events.inc create mode 100644 data/maps/DewfordTown_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/DoubleBattleColosseum/events.inc create mode 100644 data/maps/DoubleBattleColosseum/scripts.inc create mode 100644 data/maps/EverGrandeCity/events.inc create mode 100644 data/maps/EverGrandeCity/scripts.inc create mode 100644 data/maps/EverGrandeCity_ChampionsRoom/events.inc create mode 100644 data/maps/EverGrandeCity_ChampionsRoom/scripts.inc create mode 100644 data/maps/EverGrandeCity_DrakesRoom/events.inc create mode 100644 data/maps/EverGrandeCity_DrakesRoom/scripts.inc create mode 100644 data/maps/EverGrandeCity_GlaciasRoom/events.inc create mode 100644 data/maps/EverGrandeCity_GlaciasRoom/scripts.inc create mode 100644 data/maps/EverGrandeCity_Hall1/events.inc create mode 100644 data/maps/EverGrandeCity_Hall1/scripts.inc create mode 100644 data/maps/EverGrandeCity_Hall2/events.inc create mode 100644 data/maps/EverGrandeCity_Hall2/scripts.inc create mode 100644 data/maps/EverGrandeCity_Hall3/events.inc create mode 100644 data/maps/EverGrandeCity_Hall3/scripts.inc create mode 100644 data/maps/EverGrandeCity_Hall4/events.inc create mode 100644 data/maps/EverGrandeCity_Hall4/scripts.inc create mode 100644 data/maps/EverGrandeCity_Hall5/events.inc create mode 100644 data/maps/EverGrandeCity_Hall5/scripts.inc create mode 100644 data/maps/EverGrandeCity_HallOfFame/events.inc create mode 100644 data/maps/EverGrandeCity_HallOfFame/scripts.inc create mode 100644 data/maps/EverGrandeCity_PhoebesRoom/events.inc create mode 100644 data/maps/EverGrandeCity_PhoebesRoom/scripts.inc create mode 100644 data/maps/EverGrandeCity_PokemonCenter_1F/events.inc create mode 100644 data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/EverGrandeCity_PokemonCenter_2F/events.inc create mode 100644 data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/EverGrandeCity_PokemonLeague_1F/events.inc create mode 100644 data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc create mode 100644 data/maps/EverGrandeCity_PokemonLeague_2F/events.inc create mode 100644 data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc create mode 100644 data/maps/EverGrandeCity_SidneysRoom/events.inc create mode 100644 data/maps/EverGrandeCity_SidneysRoom/scripts.inc create mode 100644 data/maps/FallarborTown/events.inc create mode 100644 data/maps/FallarborTown/scripts.inc create mode 100644 data/maps/FallarborTown_BattleTentBattleRoom/events.inc create mode 100644 data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc create mode 100644 data/maps/FallarborTown_BattleTentCorridor/events.inc create mode 100644 data/maps/FallarborTown_BattleTentCorridor/scripts.inc create mode 100644 data/maps/FallarborTown_BattleTentLobby/events.inc create mode 100644 data/maps/FallarborTown_BattleTentLobby/scripts.inc create mode 100644 data/maps/FallarborTown_House1/events.inc create mode 100644 data/maps/FallarborTown_House1/scripts.inc create mode 100644 data/maps/FallarborTown_House2/events.inc create mode 100644 data/maps/FallarborTown_House2/scripts.inc create mode 100644 data/maps/FallarborTown_Mart/events.inc create mode 100644 data/maps/FallarborTown_Mart/scripts.inc create mode 100644 data/maps/FallarborTown_PokemonCenter_1F/events.inc create mode 100644 data/maps/FallarborTown_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/FallarborTown_PokemonCenter_2F/events.inc create mode 100644 data/maps/FallarborTown_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/FarawayIsland_Entrance/events.inc create mode 100644 data/maps/FarawayIsland_Entrance/scripts.inc create mode 100644 data/maps/FarawayIsland_Interior/events.inc create mode 100644 data/maps/FarawayIsland_Interior/scripts.inc create mode 100644 data/maps/FieryPath/events.inc create mode 100644 data/maps/FieryPath/scripts.inc create mode 100644 data/maps/FortreeCity/events.inc create mode 100644 data/maps/FortreeCity/scripts.inc create mode 100644 data/maps/FortreeCity_DecorationShop/events.inc create mode 100644 data/maps/FortreeCity_DecorationShop/scripts.inc create mode 100644 data/maps/FortreeCity_Gym/events.inc create mode 100644 data/maps/FortreeCity_Gym/scripts.inc create mode 100644 data/maps/FortreeCity_House1/events.inc create mode 100644 data/maps/FortreeCity_House1/scripts.inc create mode 100644 data/maps/FortreeCity_House2/events.inc create mode 100644 data/maps/FortreeCity_House2/scripts.inc create mode 100644 data/maps/FortreeCity_House3/events.inc create mode 100644 data/maps/FortreeCity_House3/scripts.inc create mode 100644 data/maps/FortreeCity_House4/events.inc create mode 100644 data/maps/FortreeCity_House4/scripts.inc create mode 100644 data/maps/FortreeCity_House5/events.inc create mode 100644 data/maps/FortreeCity_House5/scripts.inc create mode 100644 data/maps/FortreeCity_Mart/events.inc create mode 100644 data/maps/FortreeCity_Mart/scripts.inc create mode 100644 data/maps/FortreeCity_PokemonCenter_1F/events.inc create mode 100644 data/maps/FortreeCity_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/FortreeCity_PokemonCenter_2F/events.inc create mode 100644 data/maps/FortreeCity_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/GraniteCave_1F/events.inc create mode 100644 data/maps/GraniteCave_1F/scripts.inc create mode 100644 data/maps/GraniteCave_B1F/events.inc create mode 100644 data/maps/GraniteCave_B1F/scripts.inc create mode 100644 data/maps/GraniteCave_B2F/events.inc create mode 100644 data/maps/GraniteCave_B2F/scripts.inc create mode 100644 data/maps/GraniteCave_StevensRoom/events.inc create mode 100644 data/maps/GraniteCave_StevensRoom/scripts.inc create mode 100644 data/maps/InsideOfTruck/events.inc create mode 100644 data/maps/InsideOfTruck/scripts.inc create mode 100644 data/maps/IslandCave/events.inc create mode 100644 data/maps/IslandCave/scripts.inc create mode 100644 data/maps/JaggedPass/events.inc create mode 100644 data/maps/JaggedPass/scripts.inc create mode 100644 data/maps/LavaridgeTown/events.inc create mode 100644 data/maps/LavaridgeTown/scripts.inc create mode 100644 data/maps/LavaridgeTown_Gym_1F/events.inc create mode 100644 data/maps/LavaridgeTown_Gym_1F/scripts.inc create mode 100644 data/maps/LavaridgeTown_Gym_B1F/events.inc create mode 100644 data/maps/LavaridgeTown_Gym_B1F/scripts.inc create mode 100644 data/maps/LavaridgeTown_HerbShop/events.inc create mode 100644 data/maps/LavaridgeTown_HerbShop/scripts.inc create mode 100644 data/maps/LavaridgeTown_House/events.inc create mode 100644 data/maps/LavaridgeTown_House/scripts.inc create mode 100644 data/maps/LavaridgeTown_Mart/events.inc create mode 100644 data/maps/LavaridgeTown_Mart/scripts.inc create mode 100644 data/maps/LavaridgeTown_PokemonCenter_1F/events.inc create mode 100644 data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/LavaridgeTown_PokemonCenter_2F/events.inc create mode 100644 data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/LilycoveCity/events.inc create mode 100644 data/maps/LilycoveCity/scripts.inc create mode 100644 data/maps/LilycoveCity_ContestHall/events.inc create mode 100644 data/maps/LilycoveCity_ContestHall/scripts.inc create mode 100644 data/maps/LilycoveCity_ContestLobby/events.inc create mode 100644 data/maps/LilycoveCity_ContestLobby/scripts.inc create mode 100644 data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc create mode 100644 data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc create mode 100644 data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc create mode 100644 data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc create mode 100644 data/maps/LilycoveCity_DepartmentStoreElevator/events.inc create mode 100644 data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc create mode 100644 data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc create mode 100644 data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc create mode 100644 data/maps/LilycoveCity_DepartmentStore_1F/events.inc create mode 100644 data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc create mode 100644 data/maps/LilycoveCity_DepartmentStore_2F/events.inc create mode 100644 data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc create mode 100644 data/maps/LilycoveCity_DepartmentStore_3F/events.inc create mode 100644 data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc create mode 100644 data/maps/LilycoveCity_DepartmentStore_4F/events.inc create mode 100644 data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc create mode 100644 data/maps/LilycoveCity_DepartmentStore_5F/events.inc create mode 100644 data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc create mode 100644 data/maps/LilycoveCity_Harbor/events.inc create mode 100644 data/maps/LilycoveCity_Harbor/scripts.inc create mode 100644 data/maps/LilycoveCity_House1/events.inc create mode 100644 data/maps/LilycoveCity_House1/scripts.inc create mode 100644 data/maps/LilycoveCity_House2/events.inc create mode 100644 data/maps/LilycoveCity_House2/scripts.inc create mode 100644 data/maps/LilycoveCity_House3/events.inc create mode 100644 data/maps/LilycoveCity_House3/scripts.inc create mode 100644 data/maps/LilycoveCity_House4/events.inc create mode 100644 data/maps/LilycoveCity_House4/scripts.inc create mode 100644 data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc create mode 100644 data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc create mode 100644 data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc create mode 100644 data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc create mode 100644 data/maps/LilycoveCity_MoveDeletersHouse/events.inc create mode 100644 data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc create mode 100644 data/maps/LilycoveCity_PokemonCenter_1F/events.inc create mode 100644 data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/LilycoveCity_PokemonCenter_2F/events.inc create mode 100644 data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc create mode 100644 data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc create mode 100644 data/maps/LilycoveCity_UnusedMart/events.inc create mode 100644 data/maps/LilycoveCity_UnusedMart/scripts.inc create mode 100644 data/maps/LinkContestRoom1/events.inc create mode 100644 data/maps/LinkContestRoom1/scripts.inc create mode 100644 data/maps/LinkContestRoom2/events.inc create mode 100644 data/maps/LinkContestRoom2/scripts.inc create mode 100644 data/maps/LinkContestRoom3/events.inc create mode 100644 data/maps/LinkContestRoom3/scripts.inc create mode 100644 data/maps/LinkContestRoom4/events.inc create mode 100644 data/maps/LinkContestRoom4/scripts.inc create mode 100644 data/maps/LinkContestRoom5/events.inc create mode 100644 data/maps/LinkContestRoom5/scripts.inc create mode 100644 data/maps/LinkContestRoom6/events.inc create mode 100644 data/maps/LinkContestRoom6/scripts.inc create mode 100644 data/maps/LittlerootTown/events.inc create mode 100644 data/maps/LittlerootTown/scripts.inc create mode 100644 data/maps/LittlerootTown_BrendansHouse_1F/events.inc create mode 100644 data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc create mode 100644 data/maps/LittlerootTown_BrendansHouse_2F/events.inc create mode 100644 data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc create mode 100644 data/maps/LittlerootTown_MaysHouse_1F/events.inc create mode 100644 data/maps/LittlerootTown_MaysHouse_1F/scripts.inc create mode 100644 data/maps/LittlerootTown_MaysHouse_2F/events.inc create mode 100644 data/maps/LittlerootTown_MaysHouse_2F/scripts.inc create mode 100644 data/maps/LittlerootTown_ProfessorBirchsLab/events.inc create mode 100644 data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc create mode 100644 data/maps/MagmaHideout_1F/events.inc create mode 100644 data/maps/MagmaHideout_1F/scripts.inc create mode 100644 data/maps/MagmaHideout_2F_1R/events.inc create mode 100644 data/maps/MagmaHideout_2F_1R/scripts.inc create mode 100644 data/maps/MagmaHideout_2F_2R/events.inc create mode 100644 data/maps/MagmaHideout_2F_2R/scripts.inc create mode 100644 data/maps/MagmaHideout_2F_3R/events.inc create mode 100644 data/maps/MagmaHideout_2F_3R/scripts.inc create mode 100644 data/maps/MagmaHideout_3F_1R/events.inc create mode 100644 data/maps/MagmaHideout_3F_1R/scripts.inc create mode 100644 data/maps/MagmaHideout_3F_2R/events.inc create mode 100644 data/maps/MagmaHideout_3F_2R/scripts.inc create mode 100644 data/maps/MagmaHideout_3F_3R/events.inc create mode 100644 data/maps/MagmaHideout_3F_3R/scripts.inc create mode 100644 data/maps/MagmaHideout_4F/events.inc create mode 100644 data/maps/MagmaHideout_4F/scripts.inc create mode 100644 data/maps/MarineCave_End/events.inc create mode 100644 data/maps/MarineCave_End/scripts.inc create mode 100644 data/maps/MarineCave_Entrance/events.inc create mode 100644 data/maps/MarineCave_Entrance/scripts.inc create mode 100644 data/maps/MauvilleCity/events.inc create mode 100644 data/maps/MauvilleCity/scripts.inc create mode 100644 data/maps/MauvilleCity_BikeShop/events.inc create mode 100644 data/maps/MauvilleCity_BikeShop/scripts.inc create mode 100644 data/maps/MauvilleCity_GameCorner/events.inc create mode 100644 data/maps/MauvilleCity_GameCorner/scripts.inc create mode 100644 data/maps/MauvilleCity_Gym/events.inc create mode 100644 data/maps/MauvilleCity_Gym/scripts.inc create mode 100644 data/maps/MauvilleCity_House1/events.inc create mode 100644 data/maps/MauvilleCity_House1/scripts.inc create mode 100644 data/maps/MauvilleCity_House2/events.inc create mode 100644 data/maps/MauvilleCity_House2/scripts.inc create mode 100644 data/maps/MauvilleCity_Mart/events.inc create mode 100644 data/maps/MauvilleCity_Mart/scripts.inc create mode 100644 data/maps/MauvilleCity_PokemonCenter_1F/events.inc create mode 100644 data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/MauvilleCity_PokemonCenter_2F/events.inc create mode 100644 data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/MeteorFalls_1F_1R/events.inc create mode 100644 data/maps/MeteorFalls_1F_1R/scripts.inc create mode 100644 data/maps/MeteorFalls_1F_2R/events.inc create mode 100644 data/maps/MeteorFalls_1F_2R/scripts.inc create mode 100644 data/maps/MeteorFalls_B1F_1R/events.inc create mode 100644 data/maps/MeteorFalls_B1F_1R/scripts.inc create mode 100644 data/maps/MeteorFalls_B1F_2R/events.inc create mode 100644 data/maps/MeteorFalls_B1F_2R/scripts.inc create mode 100644 data/maps/MeteorFalls_StevensCave/events.inc create mode 100644 data/maps/MeteorFalls_StevensCave/scripts.inc create mode 100644 data/maps/MirageTower_1F/events.inc create mode 100644 data/maps/MirageTower_1F/scripts.inc create mode 100644 data/maps/MirageTower_2F/events.inc create mode 100644 data/maps/MirageTower_2F/scripts.inc create mode 100644 data/maps/MirageTower_3F/events.inc create mode 100644 data/maps/MirageTower_3F/scripts.inc create mode 100644 data/maps/MirageTower_4F/events.inc create mode 100644 data/maps/MirageTower_4F/scripts.inc create mode 100644 data/maps/MossdeepCity/events.inc create mode 100644 data/maps/MossdeepCity/scripts.inc create mode 100644 data/maps/MossdeepCity_GameCorner_1F/events.inc create mode 100644 data/maps/MossdeepCity_GameCorner_1F/scripts.inc create mode 100644 data/maps/MossdeepCity_GameCorner_B1F/events.inc create mode 100644 data/maps/MossdeepCity_GameCorner_B1F/scripts.inc create mode 100644 data/maps/MossdeepCity_Gym/events.inc create mode 100644 data/maps/MossdeepCity_Gym/scripts.inc create mode 100644 data/maps/MossdeepCity_House1/events.inc create mode 100644 data/maps/MossdeepCity_House1/scripts.inc create mode 100644 data/maps/MossdeepCity_House2/events.inc create mode 100644 data/maps/MossdeepCity_House2/scripts.inc create mode 100644 data/maps/MossdeepCity_House3/events.inc create mode 100644 data/maps/MossdeepCity_House3/scripts.inc create mode 100644 data/maps/MossdeepCity_House4/events.inc create mode 100644 data/maps/MossdeepCity_House4/scripts.inc create mode 100644 data/maps/MossdeepCity_Mart/events.inc create mode 100644 data/maps/MossdeepCity_Mart/scripts.inc create mode 100644 data/maps/MossdeepCity_PokemonCenter_1F/events.inc create mode 100644 data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/MossdeepCity_PokemonCenter_2F/events.inc create mode 100644 data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/MossdeepCity_SpaceCenter_1F/events.inc create mode 100644 data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc create mode 100644 data/maps/MossdeepCity_SpaceCenter_2F/events.inc create mode 100644 data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc create mode 100644 data/maps/MossdeepCity_StevensHouse/events.inc create mode 100644 data/maps/MossdeepCity_StevensHouse/scripts.inc create mode 100644 data/maps/MtChimney/events.inc create mode 100644 data/maps/MtChimney/scripts.inc create mode 100644 data/maps/MtChimney_CableCarStation/events.inc create mode 100644 data/maps/MtChimney_CableCarStation/scripts.inc create mode 100644 data/maps/MtPyre_1F/events.inc create mode 100644 data/maps/MtPyre_1F/scripts.inc create mode 100644 data/maps/MtPyre_2F/events.inc create mode 100644 data/maps/MtPyre_2F/scripts.inc create mode 100644 data/maps/MtPyre_3F/events.inc create mode 100644 data/maps/MtPyre_3F/scripts.inc create mode 100644 data/maps/MtPyre_4F/events.inc create mode 100644 data/maps/MtPyre_4F/scripts.inc create mode 100644 data/maps/MtPyre_5F/events.inc create mode 100644 data/maps/MtPyre_5F/scripts.inc create mode 100644 data/maps/MtPyre_6F/events.inc create mode 100644 data/maps/MtPyre_6F/scripts.inc create mode 100644 data/maps/MtPyre_Exterior/events.inc create mode 100644 data/maps/MtPyre_Exterior/scripts.inc create mode 100644 data/maps/MtPyre_Summit/events.inc create mode 100644 data/maps/MtPyre_Summit/scripts.inc create mode 100644 data/maps/NavelRock_B1F/events.inc create mode 100644 data/maps/NavelRock_B1F/scripts.inc create mode 100644 data/maps/NavelRock_Bottom/events.inc create mode 100644 data/maps/NavelRock_Bottom/scripts.inc create mode 100644 data/maps/NavelRock_Down01/events.inc create mode 100644 data/maps/NavelRock_Down01/scripts.inc create mode 100644 data/maps/NavelRock_Down02/events.inc create mode 100644 data/maps/NavelRock_Down02/scripts.inc create mode 100644 data/maps/NavelRock_Down03/events.inc create mode 100644 data/maps/NavelRock_Down03/scripts.inc create mode 100644 data/maps/NavelRock_Down04/events.inc create mode 100644 data/maps/NavelRock_Down04/scripts.inc create mode 100644 data/maps/NavelRock_Down05/events.inc create mode 100644 data/maps/NavelRock_Down05/scripts.inc create mode 100644 data/maps/NavelRock_Down06/events.inc create mode 100644 data/maps/NavelRock_Down06/scripts.inc create mode 100644 data/maps/NavelRock_Down07/events.inc create mode 100644 data/maps/NavelRock_Down07/scripts.inc create mode 100644 data/maps/NavelRock_Down08/events.inc create mode 100644 data/maps/NavelRock_Down08/scripts.inc create mode 100644 data/maps/NavelRock_Down09/events.inc create mode 100644 data/maps/NavelRock_Down09/scripts.inc create mode 100644 data/maps/NavelRock_Down10/events.inc create mode 100644 data/maps/NavelRock_Down10/scripts.inc create mode 100644 data/maps/NavelRock_Down11/events.inc create mode 100644 data/maps/NavelRock_Down11/scripts.inc create mode 100644 data/maps/NavelRock_Entrance/events.inc create mode 100644 data/maps/NavelRock_Entrance/scripts.inc create mode 100644 data/maps/NavelRock_Exterior/events.inc create mode 100644 data/maps/NavelRock_Exterior/scripts.inc create mode 100644 data/maps/NavelRock_Fork/events.inc create mode 100644 data/maps/NavelRock_Fork/scripts.inc create mode 100644 data/maps/NavelRock_Harbor/events.inc create mode 100644 data/maps/NavelRock_Harbor/scripts.inc create mode 100644 data/maps/NavelRock_Top/events.inc create mode 100644 data/maps/NavelRock_Top/scripts.inc create mode 100644 data/maps/NavelRock_Up1/events.inc create mode 100644 data/maps/NavelRock_Up1/scripts.inc create mode 100644 data/maps/NavelRock_Up2/events.inc create mode 100644 data/maps/NavelRock_Up2/scripts.inc create mode 100644 data/maps/NavelRock_Up3/events.inc create mode 100644 data/maps/NavelRock_Up3/scripts.inc create mode 100644 data/maps/NavelRock_Up4/events.inc create mode 100644 data/maps/NavelRock_Up4/scripts.inc create mode 100644 data/maps/NewMauville_Entrance/events.inc create mode 100644 data/maps/NewMauville_Entrance/scripts.inc create mode 100644 data/maps/NewMauville_Inside/events.inc create mode 100644 data/maps/NewMauville_Inside/scripts.inc create mode 100644 data/maps/OldaleTown/events.inc create mode 100644 data/maps/OldaleTown/scripts.inc create mode 100644 data/maps/OldaleTown_House1/events.inc create mode 100644 data/maps/OldaleTown_House1/scripts.inc create mode 100644 data/maps/OldaleTown_House2/events.inc create mode 100644 data/maps/OldaleTown_House2/scripts.inc create mode 100644 data/maps/OldaleTown_Mart/events.inc create mode 100644 data/maps/OldaleTown_Mart/scripts.inc create mode 100644 data/maps/OldaleTown_PokemonCenter_1F/events.inc create mode 100644 data/maps/OldaleTown_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/OldaleTown_PokemonCenter_2F/events.inc create mode 100644 data/maps/OldaleTown_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/PacifidlogTown/events.inc create mode 100644 data/maps/PacifidlogTown/scripts.inc create mode 100644 data/maps/PacifidlogTown_House1/events.inc create mode 100644 data/maps/PacifidlogTown_House1/scripts.inc create mode 100644 data/maps/PacifidlogTown_House2/events.inc create mode 100644 data/maps/PacifidlogTown_House2/scripts.inc create mode 100644 data/maps/PacifidlogTown_House3/events.inc create mode 100644 data/maps/PacifidlogTown_House3/scripts.inc create mode 100644 data/maps/PacifidlogTown_House4/events.inc create mode 100644 data/maps/PacifidlogTown_House4/scripts.inc create mode 100644 data/maps/PacifidlogTown_House5/events.inc create mode 100644 data/maps/PacifidlogTown_House5/scripts.inc create mode 100644 data/maps/PacifidlogTown_PokemonCenter_1F/events.inc create mode 100644 data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/PacifidlogTown_PokemonCenter_2F/events.inc create mode 100644 data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/PetalburgCity/events.inc create mode 100644 data/maps/PetalburgCity/scripts.inc create mode 100644 data/maps/PetalburgCity_Gym/events.inc create mode 100644 data/maps/PetalburgCity_Gym/scripts.inc create mode 100644 data/maps/PetalburgCity_House1/events.inc create mode 100644 data/maps/PetalburgCity_House1/scripts.inc create mode 100644 data/maps/PetalburgCity_House2/events.inc create mode 100644 data/maps/PetalburgCity_House2/scripts.inc create mode 100644 data/maps/PetalburgCity_Mart/events.inc create mode 100644 data/maps/PetalburgCity_Mart/scripts.inc create mode 100644 data/maps/PetalburgCity_PokemonCenter_1F/events.inc create mode 100644 data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/PetalburgCity_PokemonCenter_2F/events.inc create mode 100644 data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/PetalburgCity_WallysHouse/events.inc create mode 100644 data/maps/PetalburgCity_WallysHouse/scripts.inc create mode 100644 data/maps/PetalburgWoods/events.inc create mode 100644 data/maps/PetalburgWoods/scripts.inc create mode 100644 data/maps/RecordCorner/events.inc create mode 100644 data/maps/RecordCorner/scripts.inc create mode 100644 data/maps/Route101/events.inc create mode 100644 data/maps/Route101/scripts.inc create mode 100644 data/maps/Route102/events.inc create mode 100644 data/maps/Route102/scripts.inc create mode 100644 data/maps/Route103/events.inc create mode 100644 data/maps/Route103/scripts.inc create mode 100644 data/maps/Route104/events.inc create mode 100644 data/maps/Route104/scripts.inc create mode 100644 data/maps/Route104_MrBrineysHouse/events.inc create mode 100644 data/maps/Route104_MrBrineysHouse/scripts.inc create mode 100644 data/maps/Route104_PrettyPetalFlowerShop/events.inc create mode 100644 data/maps/Route104_PrettyPetalFlowerShop/scripts.inc create mode 100644 data/maps/Route104_Prototype/events.inc create mode 100644 data/maps/Route104_Prototype/scripts.inc create mode 100644 data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc create mode 100644 data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc create mode 100644 data/maps/Route105/events.inc create mode 100644 data/maps/Route105/scripts.inc create mode 100644 data/maps/Route106/events.inc create mode 100644 data/maps/Route106/scripts.inc create mode 100644 data/maps/Route107/events.inc create mode 100644 data/maps/Route107/scripts.inc create mode 100644 data/maps/Route108/events.inc create mode 100644 data/maps/Route108/scripts.inc create mode 100644 data/maps/Route109/events.inc create mode 100644 data/maps/Route109/scripts.inc create mode 100644 data/maps/Route109_SeashoreHouse/events.inc create mode 100644 data/maps/Route109_SeashoreHouse/scripts.inc create mode 100644 data/maps/Route110/events.inc create mode 100644 data/maps/Route110/scripts.inc create mode 100644 data/maps/Route110_SeasideCyclingRoadEntrance1/events.inc create mode 100644 data/maps/Route110_SeasideCyclingRoadEntrance1/scripts.inc create mode 100644 data/maps/Route110_SeasideCyclingRoadEntrance2/events.inc create mode 100644 data/maps/Route110_SeasideCyclingRoadEntrance2/scripts.inc create mode 100644 data/maps/Route110_TrickHouseCorridor/events.inc create mode 100644 data/maps/Route110_TrickHouseCorridor/scripts.inc create mode 100644 data/maps/Route110_TrickHouseEnd/events.inc create mode 100644 data/maps/Route110_TrickHouseEnd/scripts.inc create mode 100644 data/maps/Route110_TrickHouseEntrance/events.inc create mode 100644 data/maps/Route110_TrickHouseEntrance/scripts.inc create mode 100644 data/maps/Route110_TrickHousePuzzle1/events.inc create mode 100644 data/maps/Route110_TrickHousePuzzle1/scripts.inc create mode 100644 data/maps/Route110_TrickHousePuzzle2/events.inc create mode 100644 data/maps/Route110_TrickHousePuzzle2/scripts.inc create mode 100644 data/maps/Route110_TrickHousePuzzle3/events.inc create mode 100644 data/maps/Route110_TrickHousePuzzle3/scripts.inc create mode 100644 data/maps/Route110_TrickHousePuzzle4/events.inc create mode 100644 data/maps/Route110_TrickHousePuzzle4/scripts.inc create mode 100644 data/maps/Route110_TrickHousePuzzle5/events.inc create mode 100644 data/maps/Route110_TrickHousePuzzle5/scripts.inc create mode 100644 data/maps/Route110_TrickHousePuzzle6/events.inc create mode 100644 data/maps/Route110_TrickHousePuzzle6/scripts.inc create mode 100644 data/maps/Route110_TrickHousePuzzle7/events.inc create mode 100644 data/maps/Route110_TrickHousePuzzle7/scripts.inc create mode 100644 data/maps/Route110_TrickHousePuzzle8/events.inc create mode 100644 data/maps/Route110_TrickHousePuzzle8/scripts.inc create mode 100644 data/maps/Route111/events.inc create mode 100644 data/maps/Route111/scripts.inc create mode 100644 data/maps/Route111_OldLadysRestStop/events.inc create mode 100644 data/maps/Route111_OldLadysRestStop/scripts.inc create mode 100644 data/maps/Route111_WinstrateFamilysHouse/events.inc create mode 100644 data/maps/Route111_WinstrateFamilysHouse/scripts.inc create mode 100644 data/maps/Route112/events.inc create mode 100644 data/maps/Route112/scripts.inc create mode 100644 data/maps/Route112_CableCarStation/events.inc create mode 100644 data/maps/Route112_CableCarStation/scripts.inc create mode 100644 data/maps/Route113/events.inc create mode 100644 data/maps/Route113/scripts.inc create mode 100644 data/maps/Route113_GlassWorkshop/events.inc create mode 100644 data/maps/Route113_GlassWorkshop/scripts.inc create mode 100644 data/maps/Route114/events.inc create mode 100644 data/maps/Route114/scripts.inc create mode 100644 data/maps/Route114_FossilManiacsHouse/events.inc create mode 100644 data/maps/Route114_FossilManiacsHouse/scripts.inc create mode 100644 data/maps/Route114_FossilManiacsTunnel/events.inc create mode 100644 data/maps/Route114_FossilManiacsTunnel/scripts.inc create mode 100644 data/maps/Route114_LanettesHouse/events.inc create mode 100644 data/maps/Route114_LanettesHouse/scripts.inc create mode 100644 data/maps/Route115/events.inc create mode 100644 data/maps/Route115/scripts.inc create mode 100644 data/maps/Route116/events.inc create mode 100644 data/maps/Route116/scripts.inc create mode 100644 data/maps/Route116_TunnelersRestHouse/events.inc create mode 100644 data/maps/Route116_TunnelersRestHouse/scripts.inc create mode 100644 data/maps/Route117/events.inc create mode 100644 data/maps/Route117/scripts.inc create mode 100644 data/maps/Route117_PokemonDayCare/events.inc create mode 100644 data/maps/Route117_PokemonDayCare/scripts.inc create mode 100644 data/maps/Route118/events.inc create mode 100644 data/maps/Route118/scripts.inc create mode 100644 data/maps/Route119/events.inc create mode 100644 data/maps/Route119/scripts.inc create mode 100644 data/maps/Route119_House/events.inc create mode 100644 data/maps/Route119_House/scripts.inc create mode 100644 data/maps/Route119_WeatherInstitute_1F/events.inc create mode 100644 data/maps/Route119_WeatherInstitute_1F/scripts.inc create mode 100644 data/maps/Route119_WeatherInstitute_2F/events.inc create mode 100644 data/maps/Route119_WeatherInstitute_2F/scripts.inc create mode 100644 data/maps/Route120/events.inc create mode 100644 data/maps/Route120/scripts.inc create mode 100644 data/maps/Route121/events.inc create mode 100644 data/maps/Route121/scripts.inc create mode 100644 data/maps/Route121_SafariZoneEntrance/events.inc create mode 100644 data/maps/Route121_SafariZoneEntrance/scripts.inc create mode 100644 data/maps/Route122/events.inc create mode 100644 data/maps/Route122/scripts.inc create mode 100644 data/maps/Route123/events.inc create mode 100644 data/maps/Route123/scripts.inc create mode 100644 data/maps/Route123_BerryMastersHouse/events.inc create mode 100644 data/maps/Route123_BerryMastersHouse/scripts.inc create mode 100644 data/maps/Route124/events.inc create mode 100644 data/maps/Route124/scripts.inc create mode 100644 data/maps/Route124_DivingTreasureHuntersHouse/events.inc create mode 100644 data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc create mode 100644 data/maps/Route125/events.inc create mode 100644 data/maps/Route125/scripts.inc create mode 100644 data/maps/Route126/events.inc create mode 100644 data/maps/Route126/scripts.inc create mode 100644 data/maps/Route127/events.inc create mode 100644 data/maps/Route127/scripts.inc create mode 100644 data/maps/Route128/events.inc create mode 100644 data/maps/Route128/scripts.inc create mode 100644 data/maps/Route129/events.inc create mode 100644 data/maps/Route129/scripts.inc create mode 100644 data/maps/Route130/events.inc create mode 100644 data/maps/Route130/scripts.inc create mode 100644 data/maps/Route131/events.inc create mode 100644 data/maps/Route131/scripts.inc create mode 100644 data/maps/Route132/events.inc create mode 100644 data/maps/Route132/scripts.inc create mode 100644 data/maps/Route133/events.inc create mode 100644 data/maps/Route133/scripts.inc create mode 100644 data/maps/Route134/events.inc create mode 100644 data/maps/Route134/scripts.inc create mode 100644 data/maps/RustboroCity/events.inc create mode 100644 data/maps/RustboroCity/scripts.inc create mode 100644 data/maps/RustboroCity_CuttersHouse/events.inc create mode 100644 data/maps/RustboroCity_CuttersHouse/scripts.inc create mode 100644 data/maps/RustboroCity_DevonCorp_1F/events.inc create mode 100644 data/maps/RustboroCity_DevonCorp_1F/scripts.inc create mode 100644 data/maps/RustboroCity_DevonCorp_2F/events.inc create mode 100644 data/maps/RustboroCity_DevonCorp_2F/scripts.inc create mode 100644 data/maps/RustboroCity_DevonCorp_3F/events.inc create mode 100644 data/maps/RustboroCity_DevonCorp_3F/scripts.inc create mode 100644 data/maps/RustboroCity_Flat1_1F/events.inc create mode 100644 data/maps/RustboroCity_Flat1_1F/scripts.inc create mode 100644 data/maps/RustboroCity_Flat1_2F/events.inc create mode 100644 data/maps/RustboroCity_Flat1_2F/scripts.inc create mode 100644 data/maps/RustboroCity_Flat2_1F/events.inc create mode 100644 data/maps/RustboroCity_Flat2_1F/scripts.inc create mode 100644 data/maps/RustboroCity_Flat2_2F/events.inc create mode 100644 data/maps/RustboroCity_Flat2_2F/scripts.inc create mode 100644 data/maps/RustboroCity_Flat2_3F/events.inc create mode 100644 data/maps/RustboroCity_Flat2_3F/scripts.inc create mode 100644 data/maps/RustboroCity_Gym/events.inc create mode 100644 data/maps/RustboroCity_Gym/scripts.inc create mode 100644 data/maps/RustboroCity_House1/events.inc create mode 100644 data/maps/RustboroCity_House1/scripts.inc create mode 100644 data/maps/RustboroCity_House2/events.inc create mode 100644 data/maps/RustboroCity_House2/scripts.inc create mode 100644 data/maps/RustboroCity_House3/events.inc create mode 100644 data/maps/RustboroCity_House3/scripts.inc create mode 100644 data/maps/RustboroCity_Mart/events.inc create mode 100644 data/maps/RustboroCity_Mart/scripts.inc create mode 100644 data/maps/RustboroCity_PokemonCenter_1F/events.inc create mode 100644 data/maps/RustboroCity_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/RustboroCity_PokemonCenter_2F/events.inc create mode 100644 data/maps/RustboroCity_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/RustboroCity_PokemonSchool/events.inc create mode 100644 data/maps/RustboroCity_PokemonSchool/scripts.inc create mode 100644 data/maps/RusturfTunnel/events.inc create mode 100644 data/maps/RusturfTunnel/scripts.inc create mode 100644 data/maps/SSTidalCorridor/events.inc create mode 100644 data/maps/SSTidalCorridor/scripts.inc create mode 100644 data/maps/SSTidalLowerDeck/events.inc create mode 100644 data/maps/SSTidalLowerDeck/scripts.inc create mode 100644 data/maps/SSTidalRooms/events.inc create mode 100644 data/maps/SSTidalRooms/scripts.inc create mode 100644 data/maps/SafariZone_North/events.inc create mode 100644 data/maps/SafariZone_North/scripts.inc create mode 100644 data/maps/SafariZone_Northeast/events.inc create mode 100644 data/maps/SafariZone_Northeast/scripts.inc create mode 100644 data/maps/SafariZone_Northwest/events.inc create mode 100644 data/maps/SafariZone_Northwest/scripts.inc create mode 100644 data/maps/SafariZone_RestHouse/events.inc create mode 100644 data/maps/SafariZone_RestHouse/scripts.inc create mode 100644 data/maps/SafariZone_South/events.inc create mode 100644 data/maps/SafariZone_South/scripts.inc create mode 100644 data/maps/SafariZone_Southeast/events.inc create mode 100644 data/maps/SafariZone_Southeast/scripts.inc create mode 100644 data/maps/SafariZone_Southwest/events.inc create mode 100644 data/maps/SafariZone_Southwest/scripts.inc create mode 100644 data/maps/ScorchedSlab/events.inc create mode 100644 data/maps/ScorchedSlab/scripts.inc create mode 100644 data/maps/SeafloorCavern_Entrance/events.inc create mode 100644 data/maps/SeafloorCavern_Entrance/scripts.inc create mode 100644 data/maps/SeafloorCavern_Room1/events.inc create mode 100644 data/maps/SeafloorCavern_Room1/scripts.inc create mode 100644 data/maps/SeafloorCavern_Room2/events.inc create mode 100644 data/maps/SeafloorCavern_Room2/scripts.inc create mode 100644 data/maps/SeafloorCavern_Room3/events.inc create mode 100644 data/maps/SeafloorCavern_Room3/scripts.inc create mode 100644 data/maps/SeafloorCavern_Room4/events.inc create mode 100644 data/maps/SeafloorCavern_Room4/scripts.inc create mode 100644 data/maps/SeafloorCavern_Room5/events.inc create mode 100644 data/maps/SeafloorCavern_Room5/scripts.inc create mode 100644 data/maps/SeafloorCavern_Room6/events.inc create mode 100644 data/maps/SeafloorCavern_Room6/scripts.inc create mode 100644 data/maps/SeafloorCavern_Room7/events.inc create mode 100644 data/maps/SeafloorCavern_Room7/scripts.inc create mode 100644 data/maps/SeafloorCavern_Room8/events.inc create mode 100644 data/maps/SeafloorCavern_Room8/scripts.inc create mode 100644 data/maps/SeafloorCavern_Room9/events.inc create mode 100644 data/maps/SeafloorCavern_Room9/scripts.inc create mode 100644 data/maps/SealedChamber_InnerRoom/events.inc create mode 100644 data/maps/SealedChamber_InnerRoom/scripts.inc create mode 100644 data/maps/SealedChamber_OuterRoom/events.inc create mode 100644 data/maps/SealedChamber_OuterRoom/scripts.inc create mode 100644 data/maps/SecretBase_BlueCave1/events.inc create mode 100644 data/maps/SecretBase_BlueCave1/scripts.inc create mode 100644 data/maps/SecretBase_BlueCave2/events.inc create mode 100644 data/maps/SecretBase_BlueCave2/scripts.inc create mode 100644 data/maps/SecretBase_BlueCave3/events.inc create mode 100644 data/maps/SecretBase_BlueCave3/scripts.inc create mode 100644 data/maps/SecretBase_BlueCave4/events.inc create mode 100644 data/maps/SecretBase_BlueCave4/scripts.inc create mode 100644 data/maps/SecretBase_BrownCave1/events.inc create mode 100644 data/maps/SecretBase_BrownCave1/scripts.inc create mode 100644 data/maps/SecretBase_BrownCave2/events.inc create mode 100644 data/maps/SecretBase_BrownCave2/scripts.inc create mode 100644 data/maps/SecretBase_BrownCave3/events.inc create mode 100644 data/maps/SecretBase_BrownCave3/scripts.inc create mode 100644 data/maps/SecretBase_BrownCave4/events.inc create mode 100644 data/maps/SecretBase_BrownCave4/scripts.inc create mode 100644 data/maps/SecretBase_RedCave1/events.inc create mode 100644 data/maps/SecretBase_RedCave1/scripts.inc create mode 100644 data/maps/SecretBase_RedCave2/events.inc create mode 100644 data/maps/SecretBase_RedCave2/scripts.inc create mode 100644 data/maps/SecretBase_RedCave3/events.inc create mode 100644 data/maps/SecretBase_RedCave3/scripts.inc create mode 100644 data/maps/SecretBase_RedCave4/events.inc create mode 100644 data/maps/SecretBase_RedCave4/scripts.inc create mode 100644 data/maps/SecretBase_Shrub1/events.inc create mode 100644 data/maps/SecretBase_Shrub1/scripts.inc create mode 100644 data/maps/SecretBase_Shrub2/events.inc create mode 100644 data/maps/SecretBase_Shrub2/scripts.inc create mode 100644 data/maps/SecretBase_Shrub3/events.inc create mode 100644 data/maps/SecretBase_Shrub3/scripts.inc create mode 100644 data/maps/SecretBase_Shrub4/events.inc create mode 100644 data/maps/SecretBase_Shrub4/scripts.inc create mode 100644 data/maps/SecretBase_Tree1/events.inc create mode 100644 data/maps/SecretBase_Tree1/scripts.inc create mode 100644 data/maps/SecretBase_Tree2/events.inc create mode 100644 data/maps/SecretBase_Tree2/scripts.inc create mode 100644 data/maps/SecretBase_Tree3/events.inc create mode 100644 data/maps/SecretBase_Tree3/scripts.inc create mode 100644 data/maps/SecretBase_Tree4/events.inc create mode 100644 data/maps/SecretBase_Tree4/scripts.inc create mode 100644 data/maps/SecretBase_YellowCave1/events.inc create mode 100644 data/maps/SecretBase_YellowCave1/scripts.inc create mode 100644 data/maps/SecretBase_YellowCave2/events.inc create mode 100644 data/maps/SecretBase_YellowCave2/scripts.inc create mode 100644 data/maps/SecretBase_YellowCave3/events.inc create mode 100644 data/maps/SecretBase_YellowCave3/scripts.inc create mode 100644 data/maps/SecretBase_YellowCave4/events.inc create mode 100644 data/maps/SecretBase_YellowCave4/scripts.inc create mode 100644 data/maps/ShoalCave_HighTideEntranceRoom/events.inc create mode 100644 data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc create mode 100644 data/maps/ShoalCave_HighTideInnerRoom/events.inc create mode 100644 data/maps/ShoalCave_HighTideInnerRoom/scripts.inc create mode 100644 data/maps/ShoalCave_LowTideEntranceRoom/events.inc create mode 100644 data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc create mode 100644 data/maps/ShoalCave_LowTideIceRoom/events.inc create mode 100644 data/maps/ShoalCave_LowTideIceRoom/scripts.inc create mode 100644 data/maps/ShoalCave_LowTideInnerRoom/events.inc create mode 100644 data/maps/ShoalCave_LowTideInnerRoom/scripts.inc create mode 100644 data/maps/ShoalCave_LowTideLowerRoom/events.inc create mode 100644 data/maps/ShoalCave_LowTideLowerRoom/scripts.inc create mode 100644 data/maps/ShoalCave_LowTideStairsRoom/events.inc create mode 100644 data/maps/ShoalCave_LowTideStairsRoom/scripts.inc create mode 100644 data/maps/SingleBattleColosseum/events.inc create mode 100644 data/maps/SingleBattleColosseum/scripts.inc create mode 100644 data/maps/SkyPillar_1F/events.inc create mode 100644 data/maps/SkyPillar_1F/scripts.inc create mode 100644 data/maps/SkyPillar_2F/events.inc create mode 100644 data/maps/SkyPillar_2F/scripts.inc create mode 100644 data/maps/SkyPillar_3F/events.inc create mode 100644 data/maps/SkyPillar_3F/scripts.inc create mode 100644 data/maps/SkyPillar_4F/events.inc create mode 100644 data/maps/SkyPillar_4F/scripts.inc create mode 100644 data/maps/SkyPillar_5F/events.inc create mode 100644 data/maps/SkyPillar_5F/scripts.inc create mode 100644 data/maps/SkyPillar_Entrance/events.inc create mode 100644 data/maps/SkyPillar_Entrance/scripts.inc create mode 100644 data/maps/SkyPillar_Outside/events.inc create mode 100644 data/maps/SkyPillar_Outside/scripts.inc create mode 100644 data/maps/SkyPillar_Top/events.inc create mode 100644 data/maps/SkyPillar_Top/scripts.inc create mode 100644 data/maps/SlateportCity/events.inc create mode 100644 data/maps/SlateportCity/scripts.inc create mode 100644 data/maps/SlateportCity_BattleTentBattleRoom/events.inc create mode 100644 data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc create mode 100644 data/maps/SlateportCity_BattleTentCorridor/events.inc create mode 100644 data/maps/SlateportCity_BattleTentCorridor/scripts.inc create mode 100644 data/maps/SlateportCity_BattleTentLobby/events.inc create mode 100644 data/maps/SlateportCity_BattleTentLobby/scripts.inc create mode 100644 data/maps/SlateportCity_Harbor/events.inc create mode 100644 data/maps/SlateportCity_Harbor/scripts.inc create mode 100644 data/maps/SlateportCity_House1/events.inc create mode 100644 data/maps/SlateportCity_House1/scripts.inc create mode 100644 data/maps/SlateportCity_House2/events.inc create mode 100644 data/maps/SlateportCity_House2/scripts.inc create mode 100644 data/maps/SlateportCity_Mart/events.inc create mode 100644 data/maps/SlateportCity_Mart/scripts.inc create mode 100644 data/maps/SlateportCity_OceanicMuseum_1F/events.inc create mode 100644 data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc create mode 100644 data/maps/SlateportCity_OceanicMuseum_2F/events.inc create mode 100644 data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc create mode 100644 data/maps/SlateportCity_PokemonCenter_1F/events.inc create mode 100644 data/maps/SlateportCity_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/SlateportCity_PokemonCenter_2F/events.inc create mode 100644 data/maps/SlateportCity_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/SlateportCity_PokemonFanClub/events.inc create mode 100644 data/maps/SlateportCity_PokemonFanClub/scripts.inc create mode 100644 data/maps/SlateportCity_SternsShipyard_1F/events.inc create mode 100644 data/maps/SlateportCity_SternsShipyard_1F/scripts.inc create mode 100644 data/maps/SlateportCity_SternsShipyard_2F/events.inc create mode 100644 data/maps/SlateportCity_SternsShipyard_2F/scripts.inc create mode 100644 data/maps/SootopolisCity/events.inc create mode 100644 data/maps/SootopolisCity/scripts.inc create mode 100644 data/maps/SootopolisCity_Gym_1F/events.inc create mode 100644 data/maps/SootopolisCity_Gym_1F/scripts.inc create mode 100644 data/maps/SootopolisCity_Gym_B1F/events.inc create mode 100644 data/maps/SootopolisCity_Gym_B1F/scripts.inc create mode 100644 data/maps/SootopolisCity_House1/events.inc create mode 100644 data/maps/SootopolisCity_House1/scripts.inc create mode 100644 data/maps/SootopolisCity_House2/events.inc create mode 100644 data/maps/SootopolisCity_House2/scripts.inc create mode 100644 data/maps/SootopolisCity_House3/events.inc create mode 100644 data/maps/SootopolisCity_House3/scripts.inc create mode 100644 data/maps/SootopolisCity_House4/events.inc create mode 100644 data/maps/SootopolisCity_House4/scripts.inc create mode 100644 data/maps/SootopolisCity_House5/events.inc create mode 100644 data/maps/SootopolisCity_House5/scripts.inc create mode 100644 data/maps/SootopolisCity_House6/events.inc create mode 100644 data/maps/SootopolisCity_House6/scripts.inc create mode 100644 data/maps/SootopolisCity_House7/events.inc create mode 100644 data/maps/SootopolisCity_House7/scripts.inc create mode 100644 data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc create mode 100644 data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc create mode 100644 data/maps/SootopolisCity_Mart/events.inc create mode 100644 data/maps/SootopolisCity_Mart/scripts.inc create mode 100644 data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc create mode 100644 data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc create mode 100644 data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc create mode 100644 data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc create mode 100644 data/maps/SootopolisCity_PokemonCenter_1F/events.inc create mode 100644 data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/SootopolisCity_PokemonCenter_2F/events.inc create mode 100644 data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/SouthernIsland_Exterior/events.inc create mode 100644 data/maps/SouthernIsland_Exterior/scripts.inc create mode 100644 data/maps/SouthernIsland_Interior/events.inc create mode 100644 data/maps/SouthernIsland_Interior/scripts.inc create mode 100644 data/maps/TerraCave_End/events.inc create mode 100644 data/maps/TerraCave_End/scripts.inc create mode 100644 data/maps/TerraCave_Entrance/events.inc create mode 100644 data/maps/TerraCave_Entrance/scripts.inc create mode 100644 data/maps/TradeCenter/events.inc create mode 100644 data/maps/TradeCenter/scripts.inc create mode 100644 data/maps/TrainerHill_1F/events.inc create mode 100644 data/maps/TrainerHill_1F/scripts.inc create mode 100644 data/maps/TrainerHill_2F/events.inc create mode 100644 data/maps/TrainerHill_2F/scripts.inc create mode 100644 data/maps/TrainerHill_3F/events.inc create mode 100644 data/maps/TrainerHill_3F/scripts.inc create mode 100644 data/maps/TrainerHill_4F/events.inc create mode 100644 data/maps/TrainerHill_4F/scripts.inc create mode 100644 data/maps/TrainerHill_Elevator/events.inc create mode 100644 data/maps/TrainerHill_Elevator/scripts.inc create mode 100644 data/maps/TrainerHill_Entrance/events.inc create mode 100644 data/maps/TrainerHill_Entrance/scripts.inc create mode 100644 data/maps/TrainerHill_Roof/events.inc create mode 100644 data/maps/TrainerHill_Roof/scripts.inc create mode 100644 data/maps/Underwater1/events.inc create mode 100644 data/maps/Underwater1/scripts.inc create mode 100644 data/maps/Underwater2/events.inc create mode 100644 data/maps/Underwater2/scripts.inc create mode 100644 data/maps/Underwater3/events.inc create mode 100644 data/maps/Underwater3/scripts.inc create mode 100644 data/maps/Underwater4/events.inc create mode 100644 data/maps/Underwater4/scripts.inc create mode 100644 data/maps/Underwater5/events.inc create mode 100644 data/maps/Underwater5/scripts.inc create mode 100644 data/maps/Underwater6/events.inc create mode 100644 data/maps/Underwater6/scripts.inc create mode 100644 data/maps/Underwater7/events.inc create mode 100644 data/maps/Underwater7/scripts.inc create mode 100644 data/maps/Underwater_MarineCave/events.inc create mode 100644 data/maps/Underwater_MarineCave/scripts.inc create mode 100644 data/maps/Underwater_Route134/events.inc create mode 100644 data/maps/Underwater_Route134/scripts.inc create mode 100644 data/maps/Underwater_SeafloorCavern/events.inc create mode 100644 data/maps/Underwater_SeafloorCavern/scripts.inc create mode 100644 data/maps/Underwater_SealedChamber/events.inc create mode 100644 data/maps/Underwater_SealedChamber/scripts.inc create mode 100644 data/maps/Underwater_SootopolisCity/events.inc create mode 100644 data/maps/Underwater_SootopolisCity/scripts.inc create mode 100644 data/maps/UnionRoom/events.inc create mode 100644 data/maps/UnionRoom/scripts.inc create mode 100644 data/maps/UnknownMap_25_29/events.inc create mode 100644 data/maps/UnknownMap_25_29/scripts.inc create mode 100644 data/maps/UnknownMap_25_30/events.inc create mode 100644 data/maps/UnknownMap_25_30/scripts.inc create mode 100644 data/maps/UnknownMap_25_31/events.inc create mode 100644 data/maps/UnknownMap_25_31/scripts.inc create mode 100644 data/maps/UnknownMap_25_32/events.inc create mode 100644 data/maps/UnknownMap_25_32/scripts.inc create mode 100644 data/maps/UnknownMap_25_33/events.inc create mode 100644 data/maps/UnknownMap_25_33/scripts.inc create mode 100644 data/maps/UnknownMap_25_34/events.inc create mode 100644 data/maps/UnknownMap_25_34/scripts.inc create mode 100644 data/maps/VerdanturfTown/events.inc create mode 100644 data/maps/VerdanturfTown/scripts.inc create mode 100644 data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc create mode 100644 data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc create mode 100644 data/maps/VerdanturfTown_BattleTentCorridor/events.inc create mode 100644 data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc create mode 100644 data/maps/VerdanturfTown_BattleTentLobby/events.inc create mode 100644 data/maps/VerdanturfTown_BattleTentLobby/scripts.inc create mode 100644 data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc create mode 100644 data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc create mode 100644 data/maps/VerdanturfTown_House/events.inc create mode 100644 data/maps/VerdanturfTown_House/scripts.inc create mode 100644 data/maps/VerdanturfTown_Mart/events.inc create mode 100644 data/maps/VerdanturfTown_Mart/scripts.inc create mode 100644 data/maps/VerdanturfTown_PokemonCenter_1F/events.inc create mode 100644 data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/VerdanturfTown_PokemonCenter_2F/events.inc create mode 100644 data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/VerdanturfTown_WandasHouse/events.inc create mode 100644 data/maps/VerdanturfTown_WandasHouse/scripts.inc create mode 100644 data/maps/VictoryRoad_1F/events.inc create mode 100644 data/maps/VictoryRoad_1F/scripts.inc create mode 100644 data/maps/VictoryRoad_B1F/events.inc create mode 100644 data/maps/VictoryRoad_B1F/scripts.inc create mode 100644 data/maps/VictoryRoad_B2F/events.inc create mode 100644 data/maps/VictoryRoad_B2F/scripts.inc delete mode 100644 data/maps/events/AbandonedShip_CaptainsOffice.inc delete mode 100644 data/maps/events/AbandonedShip_Corridors_1F.inc delete mode 100644 data/maps/events/AbandonedShip_Corridors_B1F.inc delete mode 100644 data/maps/events/AbandonedShip_Deck.inc delete mode 100644 data/maps/events/AbandonedShip_HiddenFloorCorridors.inc delete mode 100644 data/maps/events/AbandonedShip_HiddenFloorRooms.inc delete mode 100644 data/maps/events/AbandonedShip_Room_B1F.inc delete mode 100644 data/maps/events/AbandonedShip_Rooms2_1F.inc delete mode 100644 data/maps/events/AbandonedShip_Rooms2_B1F.inc delete mode 100644 data/maps/events/AbandonedShip_Rooms_1F.inc delete mode 100644 data/maps/events/AbandonedShip_Rooms_B1F.inc delete mode 100644 data/maps/events/AbandonedShip_Underwater1.inc delete mode 100644 data/maps/events/AbandonedShip_Underwater2.inc delete mode 100644 data/maps/events/AlteringCave.inc delete mode 100644 data/maps/events/AncientTomb.inc delete mode 100644 data/maps/events/AquaHideout_1F.inc delete mode 100644 data/maps/events/AquaHideout_B1F.inc delete mode 100644 data/maps/events/AquaHideout_B2F.inc delete mode 100644 data/maps/events/AquaHideout_UnusedRubyMap1.inc delete mode 100644 data/maps/events/AquaHideout_UnusedRubyMap2.inc delete mode 100644 data/maps/events/AquaHideout_UnusedRubyMap3.inc delete mode 100644 data/maps/events/ArtisanCave_1F.inc delete mode 100644 data/maps/events/ArtisanCave_B1F.inc delete mode 100644 data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc delete mode 100644 data/maps/events/BattleFrontier_BattleArenaCorridor.inc delete mode 100644 data/maps/events/BattleFrontier_BattleArenaLobby.inc delete mode 100644 data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc delete mode 100644 data/maps/events/BattleFrontier_BattleDomeCorridor.inc delete mode 100644 data/maps/events/BattleFrontier_BattleDomeLobby.inc delete mode 100644 data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc delete mode 100644 data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc delete mode 100644 data/maps/events/BattleFrontier_BattleFactoryLobby.inc delete mode 100644 data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc delete mode 100644 data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc delete mode 100644 data/maps/events/BattleFrontier_BattlePalaceCorridor.inc delete mode 100644 data/maps/events/BattleFrontier_BattlePalaceLobby.inc delete mode 100644 data/maps/events/BattleFrontier_BattlePikeCorridor.inc delete mode 100644 data/maps/events/BattleFrontier_BattlePikeLobby.inc delete mode 100644 data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc delete mode 100644 data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc delete mode 100644 data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc delete mode 100644 data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc delete mode 100644 data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc delete mode 100644 data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc delete mode 100644 data/maps/events/BattleFrontier_BattlePyramidLobby.inc delete mode 100644 data/maps/events/BattleFrontier_BattlePyramidTop.inc delete mode 100644 data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc delete mode 100644 data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc delete mode 100644 data/maps/events/BattleFrontier_BattleTowerCorridor.inc delete mode 100644 data/maps/events/BattleFrontier_BattleTowerCorridor2.inc delete mode 100644 data/maps/events/BattleFrontier_BattleTowerElevator.inc delete mode 100644 data/maps/events/BattleFrontier_BattleTowerLobby.inc delete mode 100644 data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc delete mode 100644 data/maps/events/BattleFrontier_Lounge1.inc delete mode 100644 data/maps/events/BattleFrontier_Lounge2.inc delete mode 100644 data/maps/events/BattleFrontier_Lounge3.inc delete mode 100644 data/maps/events/BattleFrontier_Lounge4.inc delete mode 100644 data/maps/events/BattleFrontier_Lounge5.inc delete mode 100644 data/maps/events/BattleFrontier_Lounge6.inc delete mode 100644 data/maps/events/BattleFrontier_Lounge7.inc delete mode 100644 data/maps/events/BattleFrontier_Lounge8.inc delete mode 100644 data/maps/events/BattleFrontier_Lounge9.inc delete mode 100644 data/maps/events/BattleFrontier_Mart.inc delete mode 100644 data/maps/events/BattleFrontier_OutsideEast.inc delete mode 100644 data/maps/events/BattleFrontier_OutsideWest.inc delete mode 100644 data/maps/events/BattleFrontier_PokemonCenter_1F.inc delete mode 100644 data/maps/events/BattleFrontier_PokemonCenter_2F.inc delete mode 100644 data/maps/events/BattleFrontier_RankingHall.inc delete mode 100644 data/maps/events/BattleFrontier_ReceptionGate.inc delete mode 100644 data/maps/events/BattleFrontier_ScottsHouse.inc delete mode 100644 data/maps/events/BattlePyramidSquare01.inc delete mode 100644 data/maps/events/BattlePyramidSquare02.inc delete mode 100644 data/maps/events/BattlePyramidSquare03.inc delete mode 100644 data/maps/events/BattlePyramidSquare04.inc delete mode 100644 data/maps/events/BattlePyramidSquare05.inc delete mode 100644 data/maps/events/BattlePyramidSquare06.inc delete mode 100644 data/maps/events/BattlePyramidSquare07.inc delete mode 100644 data/maps/events/BattlePyramidSquare08.inc delete mode 100644 data/maps/events/BattlePyramidSquare09.inc delete mode 100644 data/maps/events/BattlePyramidSquare10.inc delete mode 100644 data/maps/events/BattlePyramidSquare11.inc delete mode 100644 data/maps/events/BattlePyramidSquare12.inc delete mode 100644 data/maps/events/BattlePyramidSquare13.inc delete mode 100644 data/maps/events/BattlePyramidSquare14.inc delete mode 100644 data/maps/events/BattlePyramidSquare15.inc delete mode 100644 data/maps/events/BattlePyramidSquare16.inc delete mode 100644 data/maps/events/BirthIsland_Exterior.inc delete mode 100644 data/maps/events/BirthIsland_Harbor.inc delete mode 100644 data/maps/events/CaveOfOrigin_1F.inc delete mode 100644 data/maps/events/CaveOfOrigin_B1F.inc delete mode 100644 data/maps/events/CaveOfOrigin_Entrance.inc delete mode 100644 data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc delete mode 100644 data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc delete mode 100644 data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc delete mode 100644 data/maps/events/DesertRuins.inc delete mode 100644 data/maps/events/DesertUnderpass.inc delete mode 100644 data/maps/events/DewfordTown.inc delete mode 100644 data/maps/events/DewfordTown_Gym.inc delete mode 100644 data/maps/events/DewfordTown_Hall.inc delete mode 100644 data/maps/events/DewfordTown_House1.inc delete mode 100644 data/maps/events/DewfordTown_House2.inc delete mode 100644 data/maps/events/DewfordTown_PokemonCenter_1F.inc delete mode 100644 data/maps/events/DewfordTown_PokemonCenter_2F.inc delete mode 100644 data/maps/events/DoubleBattleColosseum.inc delete mode 100644 data/maps/events/EverGrandeCity.inc delete mode 100644 data/maps/events/EverGrandeCity_ChampionsRoom.inc delete mode 100644 data/maps/events/EverGrandeCity_DrakesRoom.inc delete mode 100644 data/maps/events/EverGrandeCity_GlaciasRoom.inc delete mode 100644 data/maps/events/EverGrandeCity_Hall1.inc delete mode 100644 data/maps/events/EverGrandeCity_Hall2.inc delete mode 100644 data/maps/events/EverGrandeCity_Hall3.inc delete mode 100644 data/maps/events/EverGrandeCity_Hall4.inc delete mode 100644 data/maps/events/EverGrandeCity_Hall5.inc delete mode 100644 data/maps/events/EverGrandeCity_HallOfFame.inc delete mode 100644 data/maps/events/EverGrandeCity_PhoebesRoom.inc delete mode 100644 data/maps/events/EverGrandeCity_PokemonCenter_1F.inc delete mode 100644 data/maps/events/EverGrandeCity_PokemonCenter_2F.inc delete mode 100644 data/maps/events/EverGrandeCity_PokemonLeague_1F.inc delete mode 100644 data/maps/events/EverGrandeCity_PokemonLeague_2F.inc delete mode 100644 data/maps/events/EverGrandeCity_SidneysRoom.inc delete mode 100644 data/maps/events/FallarborTown.inc delete mode 100644 data/maps/events/FallarborTown_BattleTentBattleRoom.inc delete mode 100644 data/maps/events/FallarborTown_BattleTentCorridor.inc delete mode 100644 data/maps/events/FallarborTown_BattleTentLobby.inc delete mode 100644 data/maps/events/FallarborTown_House1.inc delete mode 100644 data/maps/events/FallarborTown_House2.inc delete mode 100644 data/maps/events/FallarborTown_Mart.inc delete mode 100644 data/maps/events/FallarborTown_PokemonCenter_1F.inc delete mode 100644 data/maps/events/FallarborTown_PokemonCenter_2F.inc delete mode 100644 data/maps/events/FarawayIsland_Entrance.inc delete mode 100644 data/maps/events/FarawayIsland_Interior.inc delete mode 100644 data/maps/events/FieryPath.inc delete mode 100644 data/maps/events/FortreeCity.inc delete mode 100644 data/maps/events/FortreeCity_DecorationShop.inc delete mode 100644 data/maps/events/FortreeCity_Gym.inc delete mode 100644 data/maps/events/FortreeCity_House1.inc delete mode 100644 data/maps/events/FortreeCity_House2.inc delete mode 100644 data/maps/events/FortreeCity_House3.inc delete mode 100644 data/maps/events/FortreeCity_House4.inc delete mode 100644 data/maps/events/FortreeCity_House5.inc delete mode 100644 data/maps/events/FortreeCity_Mart.inc delete mode 100644 data/maps/events/FortreeCity_PokemonCenter_1F.inc delete mode 100644 data/maps/events/FortreeCity_PokemonCenter_2F.inc delete mode 100644 data/maps/events/GraniteCave_1F.inc delete mode 100644 data/maps/events/GraniteCave_B1F.inc delete mode 100644 data/maps/events/GraniteCave_B2F.inc delete mode 100644 data/maps/events/GraniteCave_StevensRoom.inc delete mode 100644 data/maps/events/InsideOfTruck.inc delete mode 100644 data/maps/events/IslandCave.inc delete mode 100644 data/maps/events/JaggedPass.inc delete mode 100644 data/maps/events/LavaridgeTown.inc delete mode 100644 data/maps/events/LavaridgeTown_Gym_1F.inc delete mode 100644 data/maps/events/LavaridgeTown_Gym_B1F.inc delete mode 100644 data/maps/events/LavaridgeTown_HerbShop.inc delete mode 100644 data/maps/events/LavaridgeTown_House.inc delete mode 100644 data/maps/events/LavaridgeTown_Mart.inc delete mode 100644 data/maps/events/LavaridgeTown_PokemonCenter_1F.inc delete mode 100644 data/maps/events/LavaridgeTown_PokemonCenter_2F.inc delete mode 100644 data/maps/events/LilycoveCity.inc delete mode 100644 data/maps/events/LilycoveCity_ContestHall.inc delete mode 100644 data/maps/events/LilycoveCity_ContestLobby.inc delete mode 100644 data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc delete mode 100644 data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc delete mode 100644 data/maps/events/LilycoveCity_DepartmentStoreElevator.inc delete mode 100644 data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc delete mode 100644 data/maps/events/LilycoveCity_DepartmentStore_1F.inc delete mode 100644 data/maps/events/LilycoveCity_DepartmentStore_2F.inc delete mode 100644 data/maps/events/LilycoveCity_DepartmentStore_3F.inc delete mode 100644 data/maps/events/LilycoveCity_DepartmentStore_4F.inc delete mode 100644 data/maps/events/LilycoveCity_DepartmentStore_5F.inc delete mode 100644 data/maps/events/LilycoveCity_Harbor.inc delete mode 100644 data/maps/events/LilycoveCity_House1.inc delete mode 100644 data/maps/events/LilycoveCity_House2.inc delete mode 100644 data/maps/events/LilycoveCity_House3.inc delete mode 100644 data/maps/events/LilycoveCity_House4.inc delete mode 100644 data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc delete mode 100644 data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc delete mode 100644 data/maps/events/LilycoveCity_MoveDeletersHouse.inc delete mode 100644 data/maps/events/LilycoveCity_PokemonCenter_1F.inc delete mode 100644 data/maps/events/LilycoveCity_PokemonCenter_2F.inc delete mode 100644 data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc delete mode 100644 data/maps/events/LilycoveCity_UnusedMart.inc delete mode 100644 data/maps/events/LinkContestRoom1.inc delete mode 100644 data/maps/events/LinkContestRoom2.inc delete mode 100644 data/maps/events/LinkContestRoom3.inc delete mode 100644 data/maps/events/LinkContestRoom4.inc delete mode 100644 data/maps/events/LinkContestRoom5.inc delete mode 100644 data/maps/events/LinkContestRoom6.inc delete mode 100644 data/maps/events/LittlerootTown.inc delete mode 100644 data/maps/events/LittlerootTown_BrendansHouse_1F.inc delete mode 100644 data/maps/events/LittlerootTown_BrendansHouse_2F.inc delete mode 100644 data/maps/events/LittlerootTown_MaysHouse_1F.inc delete mode 100644 data/maps/events/LittlerootTown_MaysHouse_2F.inc delete mode 100644 data/maps/events/LittlerootTown_ProfessorBirchsLab.inc delete mode 100644 data/maps/events/MagmaHideout_1F.inc delete mode 100644 data/maps/events/MagmaHideout_2F_1R.inc delete mode 100644 data/maps/events/MagmaHideout_2F_2R.inc delete mode 100644 data/maps/events/MagmaHideout_2F_3R.inc delete mode 100644 data/maps/events/MagmaHideout_3F_1R.inc delete mode 100644 data/maps/events/MagmaHideout_3F_2R.inc delete mode 100644 data/maps/events/MagmaHideout_3F_3R.inc delete mode 100644 data/maps/events/MagmaHideout_4F.inc delete mode 100644 data/maps/events/MarineCave_End.inc delete mode 100644 data/maps/events/MarineCave_Entrance.inc delete mode 100644 data/maps/events/MauvilleCity.inc delete mode 100644 data/maps/events/MauvilleCity_BikeShop.inc delete mode 100644 data/maps/events/MauvilleCity_GameCorner.inc delete mode 100644 data/maps/events/MauvilleCity_Gym.inc delete mode 100644 data/maps/events/MauvilleCity_House1.inc delete mode 100644 data/maps/events/MauvilleCity_House2.inc delete mode 100644 data/maps/events/MauvilleCity_Mart.inc delete mode 100644 data/maps/events/MauvilleCity_PokemonCenter_1F.inc delete mode 100644 data/maps/events/MauvilleCity_PokemonCenter_2F.inc delete mode 100644 data/maps/events/MeteorFalls_1F_1R.inc delete mode 100644 data/maps/events/MeteorFalls_1F_2R.inc delete mode 100644 data/maps/events/MeteorFalls_B1F_1R.inc delete mode 100644 data/maps/events/MeteorFalls_B1F_2R.inc delete mode 100644 data/maps/events/MeteorFalls_StevensCave.inc delete mode 100644 data/maps/events/MirageTower_1F.inc delete mode 100644 data/maps/events/MirageTower_2F.inc delete mode 100644 data/maps/events/MirageTower_3F.inc delete mode 100644 data/maps/events/MirageTower_4F.inc delete mode 100644 data/maps/events/MossdeepCity.inc delete mode 100644 data/maps/events/MossdeepCity_GameCorner_1F.inc delete mode 100644 data/maps/events/MossdeepCity_GameCorner_B1F.inc delete mode 100644 data/maps/events/MossdeepCity_Gym.inc delete mode 100644 data/maps/events/MossdeepCity_House1.inc delete mode 100644 data/maps/events/MossdeepCity_House2.inc delete mode 100644 data/maps/events/MossdeepCity_House3.inc delete mode 100644 data/maps/events/MossdeepCity_House4.inc delete mode 100644 data/maps/events/MossdeepCity_Mart.inc delete mode 100644 data/maps/events/MossdeepCity_PokemonCenter_1F.inc delete mode 100644 data/maps/events/MossdeepCity_PokemonCenter_2F.inc delete mode 100644 data/maps/events/MossdeepCity_SpaceCenter_1F.inc delete mode 100644 data/maps/events/MossdeepCity_SpaceCenter_2F.inc delete mode 100644 data/maps/events/MossdeepCity_StevensHouse.inc delete mode 100644 data/maps/events/MtChimney.inc delete mode 100644 data/maps/events/MtChimney_CableCarStation.inc delete mode 100644 data/maps/events/MtPyre_1F.inc delete mode 100644 data/maps/events/MtPyre_2F.inc delete mode 100644 data/maps/events/MtPyre_3F.inc delete mode 100644 data/maps/events/MtPyre_4F.inc delete mode 100644 data/maps/events/MtPyre_5F.inc delete mode 100644 data/maps/events/MtPyre_6F.inc delete mode 100644 data/maps/events/MtPyre_Exterior.inc delete mode 100644 data/maps/events/MtPyre_Summit.inc delete mode 100644 data/maps/events/NavelRock_B1F.inc delete mode 100644 data/maps/events/NavelRock_Bottom.inc delete mode 100644 data/maps/events/NavelRock_Down01.inc delete mode 100644 data/maps/events/NavelRock_Down02.inc delete mode 100644 data/maps/events/NavelRock_Down03.inc delete mode 100644 data/maps/events/NavelRock_Down04.inc delete mode 100644 data/maps/events/NavelRock_Down05.inc delete mode 100644 data/maps/events/NavelRock_Down06.inc delete mode 100644 data/maps/events/NavelRock_Down07.inc delete mode 100644 data/maps/events/NavelRock_Down08.inc delete mode 100644 data/maps/events/NavelRock_Down09.inc delete mode 100644 data/maps/events/NavelRock_Down10.inc delete mode 100644 data/maps/events/NavelRock_Down11.inc delete mode 100644 data/maps/events/NavelRock_Entrance.inc delete mode 100644 data/maps/events/NavelRock_Exterior.inc delete mode 100644 data/maps/events/NavelRock_Fork.inc delete mode 100644 data/maps/events/NavelRock_Harbor.inc delete mode 100644 data/maps/events/NavelRock_Top.inc delete mode 100644 data/maps/events/NavelRock_Up1.inc delete mode 100644 data/maps/events/NavelRock_Up2.inc delete mode 100644 data/maps/events/NavelRock_Up3.inc delete mode 100644 data/maps/events/NavelRock_Up4.inc delete mode 100644 data/maps/events/NewMauville_Entrance.inc delete mode 100644 data/maps/events/NewMauville_Inside.inc delete mode 100644 data/maps/events/OldaleTown.inc delete mode 100644 data/maps/events/OldaleTown_House1.inc delete mode 100644 data/maps/events/OldaleTown_House2.inc delete mode 100644 data/maps/events/OldaleTown_Mart.inc delete mode 100644 data/maps/events/OldaleTown_PokemonCenter_1F.inc delete mode 100644 data/maps/events/OldaleTown_PokemonCenter_2F.inc delete mode 100644 data/maps/events/PacifidlogTown.inc delete mode 100644 data/maps/events/PacifidlogTown_House1.inc delete mode 100644 data/maps/events/PacifidlogTown_House2.inc delete mode 100644 data/maps/events/PacifidlogTown_House3.inc delete mode 100644 data/maps/events/PacifidlogTown_House4.inc delete mode 100644 data/maps/events/PacifidlogTown_House5.inc delete mode 100644 data/maps/events/PacifidlogTown_PokemonCenter_1F.inc delete mode 100644 data/maps/events/PacifidlogTown_PokemonCenter_2F.inc delete mode 100644 data/maps/events/PetalburgCity.inc delete mode 100644 data/maps/events/PetalburgCity_Gym.inc delete mode 100644 data/maps/events/PetalburgCity_House1.inc delete mode 100644 data/maps/events/PetalburgCity_House2.inc delete mode 100644 data/maps/events/PetalburgCity_Mart.inc delete mode 100644 data/maps/events/PetalburgCity_PokemonCenter_1F.inc delete mode 100644 data/maps/events/PetalburgCity_PokemonCenter_2F.inc delete mode 100644 data/maps/events/PetalburgCity_WallysHouse.inc delete mode 100644 data/maps/events/PetalburgWoods.inc delete mode 100644 data/maps/events/RecordCorner.inc delete mode 100644 data/maps/events/Route101.inc delete mode 100644 data/maps/events/Route102.inc delete mode 100644 data/maps/events/Route103.inc delete mode 100644 data/maps/events/Route104.inc delete mode 100644 data/maps/events/Route104_MrBrineysHouse.inc delete mode 100644 data/maps/events/Route104_PrettyPetalFlowerShop.inc delete mode 100644 data/maps/events/Route104_Prototype.inc delete mode 100644 data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc delete mode 100644 data/maps/events/Route105.inc delete mode 100644 data/maps/events/Route106.inc delete mode 100644 data/maps/events/Route107.inc delete mode 100644 data/maps/events/Route108.inc delete mode 100644 data/maps/events/Route109.inc delete mode 100644 data/maps/events/Route109_SeashoreHouse.inc delete mode 100644 data/maps/events/Route110.inc delete mode 100644 data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc delete mode 100644 data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc delete mode 100644 data/maps/events/Route110_TrickHouseCorridor.inc delete mode 100644 data/maps/events/Route110_TrickHouseEnd.inc delete mode 100644 data/maps/events/Route110_TrickHouseEntrance.inc delete mode 100644 data/maps/events/Route110_TrickHousePuzzle1.inc delete mode 100644 data/maps/events/Route110_TrickHousePuzzle2.inc delete mode 100644 data/maps/events/Route110_TrickHousePuzzle3.inc delete mode 100644 data/maps/events/Route110_TrickHousePuzzle4.inc delete mode 100644 data/maps/events/Route110_TrickHousePuzzle5.inc delete mode 100644 data/maps/events/Route110_TrickHousePuzzle6.inc delete mode 100644 data/maps/events/Route110_TrickHousePuzzle7.inc delete mode 100644 data/maps/events/Route110_TrickHousePuzzle8.inc delete mode 100644 data/maps/events/Route111.inc delete mode 100644 data/maps/events/Route111_OldLadysRestStop.inc delete mode 100644 data/maps/events/Route111_WinstrateFamilysHouse.inc delete mode 100644 data/maps/events/Route112.inc delete mode 100644 data/maps/events/Route112_CableCarStation.inc delete mode 100644 data/maps/events/Route113.inc delete mode 100644 data/maps/events/Route113_GlassWorkshop.inc delete mode 100644 data/maps/events/Route114.inc delete mode 100644 data/maps/events/Route114_FossilManiacsHouse.inc delete mode 100644 data/maps/events/Route114_FossilManiacsTunnel.inc delete mode 100644 data/maps/events/Route114_LanettesHouse.inc delete mode 100644 data/maps/events/Route115.inc delete mode 100644 data/maps/events/Route116.inc delete mode 100644 data/maps/events/Route116_TunnelersRestHouse.inc delete mode 100644 data/maps/events/Route117.inc delete mode 100644 data/maps/events/Route117_PokemonDayCare.inc delete mode 100644 data/maps/events/Route118.inc delete mode 100644 data/maps/events/Route119.inc delete mode 100644 data/maps/events/Route119_House.inc delete mode 100644 data/maps/events/Route119_WeatherInstitute_1F.inc delete mode 100644 data/maps/events/Route119_WeatherInstitute_2F.inc delete mode 100644 data/maps/events/Route120.inc delete mode 100644 data/maps/events/Route121.inc delete mode 100644 data/maps/events/Route121_SafariZoneEntrance.inc delete mode 100644 data/maps/events/Route122.inc delete mode 100644 data/maps/events/Route123.inc delete mode 100644 data/maps/events/Route123_BerryMastersHouse.inc delete mode 100644 data/maps/events/Route124.inc delete mode 100644 data/maps/events/Route124_DivingTreasureHuntersHouse.inc delete mode 100644 data/maps/events/Route125.inc delete mode 100644 data/maps/events/Route126.inc delete mode 100644 data/maps/events/Route127.inc delete mode 100644 data/maps/events/Route128.inc delete mode 100644 data/maps/events/Route129.inc delete mode 100644 data/maps/events/Route130.inc delete mode 100644 data/maps/events/Route131.inc delete mode 100644 data/maps/events/Route132.inc delete mode 100644 data/maps/events/Route133.inc delete mode 100644 data/maps/events/Route134.inc delete mode 100644 data/maps/events/RustboroCity.inc delete mode 100644 data/maps/events/RustboroCity_CuttersHouse.inc delete mode 100644 data/maps/events/RustboroCity_DevonCorp_1F.inc delete mode 100644 data/maps/events/RustboroCity_DevonCorp_2F.inc delete mode 100644 data/maps/events/RustboroCity_DevonCorp_3F.inc delete mode 100644 data/maps/events/RustboroCity_Flat1_1F.inc delete mode 100644 data/maps/events/RustboroCity_Flat1_2F.inc delete mode 100644 data/maps/events/RustboroCity_Flat2_1F.inc delete mode 100644 data/maps/events/RustboroCity_Flat2_2F.inc delete mode 100644 data/maps/events/RustboroCity_Flat2_3F.inc delete mode 100644 data/maps/events/RustboroCity_Gym.inc delete mode 100644 data/maps/events/RustboroCity_House1.inc delete mode 100644 data/maps/events/RustboroCity_House2.inc delete mode 100644 data/maps/events/RustboroCity_House3.inc delete mode 100644 data/maps/events/RustboroCity_Mart.inc delete mode 100644 data/maps/events/RustboroCity_PokemonCenter_1F.inc delete mode 100644 data/maps/events/RustboroCity_PokemonCenter_2F.inc delete mode 100644 data/maps/events/RustboroCity_PokemonSchool.inc delete mode 100644 data/maps/events/RusturfTunnel.inc delete mode 100644 data/maps/events/SSTidalCorridor.inc delete mode 100644 data/maps/events/SSTidalLowerDeck.inc delete mode 100644 data/maps/events/SSTidalRooms.inc delete mode 100644 data/maps/events/SafariZone_North.inc delete mode 100644 data/maps/events/SafariZone_Northeast.inc delete mode 100644 data/maps/events/SafariZone_Northwest.inc delete mode 100644 data/maps/events/SafariZone_RestHouse.inc delete mode 100644 data/maps/events/SafariZone_South.inc delete mode 100644 data/maps/events/SafariZone_Southeast.inc delete mode 100644 data/maps/events/SafariZone_Southwest.inc delete mode 100644 data/maps/events/ScorchedSlab.inc delete mode 100644 data/maps/events/SeafloorCavern_Entrance.inc delete mode 100644 data/maps/events/SeafloorCavern_Room1.inc delete mode 100644 data/maps/events/SeafloorCavern_Room2.inc delete mode 100644 data/maps/events/SeafloorCavern_Room3.inc delete mode 100644 data/maps/events/SeafloorCavern_Room4.inc delete mode 100644 data/maps/events/SeafloorCavern_Room5.inc delete mode 100644 data/maps/events/SeafloorCavern_Room6.inc delete mode 100644 data/maps/events/SeafloorCavern_Room7.inc delete mode 100644 data/maps/events/SeafloorCavern_Room8.inc delete mode 100644 data/maps/events/SeafloorCavern_Room9.inc delete mode 100644 data/maps/events/SealedChamber_InnerRoom.inc delete mode 100644 data/maps/events/SealedChamber_OuterRoom.inc delete mode 100644 data/maps/events/SecretBase_BlueCave1.inc delete mode 100644 data/maps/events/SecretBase_BlueCave2.inc delete mode 100644 data/maps/events/SecretBase_BlueCave3.inc delete mode 100644 data/maps/events/SecretBase_BlueCave4.inc delete mode 100644 data/maps/events/SecretBase_BrownCave1.inc delete mode 100644 data/maps/events/SecretBase_BrownCave2.inc delete mode 100644 data/maps/events/SecretBase_BrownCave3.inc delete mode 100644 data/maps/events/SecretBase_BrownCave4.inc delete mode 100644 data/maps/events/SecretBase_RedCave1.inc delete mode 100644 data/maps/events/SecretBase_RedCave2.inc delete mode 100644 data/maps/events/SecretBase_RedCave3.inc delete mode 100644 data/maps/events/SecretBase_RedCave4.inc delete mode 100644 data/maps/events/SecretBase_Shrub1.inc delete mode 100644 data/maps/events/SecretBase_Shrub2.inc delete mode 100644 data/maps/events/SecretBase_Shrub3.inc delete mode 100644 data/maps/events/SecretBase_Shrub4.inc delete mode 100644 data/maps/events/SecretBase_Tree1.inc delete mode 100644 data/maps/events/SecretBase_Tree2.inc delete mode 100644 data/maps/events/SecretBase_Tree3.inc delete mode 100644 data/maps/events/SecretBase_Tree4.inc delete mode 100644 data/maps/events/SecretBase_YellowCave1.inc delete mode 100644 data/maps/events/SecretBase_YellowCave2.inc delete mode 100644 data/maps/events/SecretBase_YellowCave3.inc delete mode 100644 data/maps/events/SecretBase_YellowCave4.inc delete mode 100644 data/maps/events/ShoalCave_HighTideEntranceRoom.inc delete mode 100644 data/maps/events/ShoalCave_HighTideInnerRoom.inc delete mode 100644 data/maps/events/ShoalCave_LowTideEntranceRoom.inc delete mode 100644 data/maps/events/ShoalCave_LowTideIceRoom.inc delete mode 100644 data/maps/events/ShoalCave_LowTideInnerRoom.inc delete mode 100644 data/maps/events/ShoalCave_LowTideLowerRoom.inc delete mode 100644 data/maps/events/ShoalCave_LowTideStairsRoom.inc delete mode 100644 data/maps/events/SingleBattleColosseum.inc delete mode 100644 data/maps/events/SkyPillar_1F.inc delete mode 100644 data/maps/events/SkyPillar_2F.inc delete mode 100644 data/maps/events/SkyPillar_3F.inc delete mode 100644 data/maps/events/SkyPillar_4F.inc delete mode 100644 data/maps/events/SkyPillar_5F.inc delete mode 100644 data/maps/events/SkyPillar_Entrance.inc delete mode 100644 data/maps/events/SkyPillar_Outside.inc delete mode 100644 data/maps/events/SkyPillar_Top.inc delete mode 100644 data/maps/events/SlateportCity.inc delete mode 100644 data/maps/events/SlateportCity_BattleTentBattleRoom.inc delete mode 100644 data/maps/events/SlateportCity_BattleTentCorridor.inc delete mode 100644 data/maps/events/SlateportCity_BattleTentLobby.inc delete mode 100644 data/maps/events/SlateportCity_Harbor.inc delete mode 100644 data/maps/events/SlateportCity_House1.inc delete mode 100644 data/maps/events/SlateportCity_House2.inc delete mode 100644 data/maps/events/SlateportCity_Mart.inc delete mode 100644 data/maps/events/SlateportCity_OceanicMuseum_1F.inc delete mode 100644 data/maps/events/SlateportCity_OceanicMuseum_2F.inc delete mode 100644 data/maps/events/SlateportCity_PokemonCenter_1F.inc delete mode 100644 data/maps/events/SlateportCity_PokemonCenter_2F.inc delete mode 100644 data/maps/events/SlateportCity_PokemonFanClub.inc delete mode 100644 data/maps/events/SlateportCity_SternsShipyard_1F.inc delete mode 100644 data/maps/events/SlateportCity_SternsShipyard_2F.inc delete mode 100644 data/maps/events/SootopolisCity.inc delete mode 100644 data/maps/events/SootopolisCity_Gym_1F.inc delete mode 100644 data/maps/events/SootopolisCity_Gym_B1F.inc delete mode 100644 data/maps/events/SootopolisCity_House1.inc delete mode 100644 data/maps/events/SootopolisCity_House2.inc delete mode 100644 data/maps/events/SootopolisCity_House3.inc delete mode 100644 data/maps/events/SootopolisCity_House4.inc delete mode 100644 data/maps/events/SootopolisCity_House5.inc delete mode 100644 data/maps/events/SootopolisCity_House6.inc delete mode 100644 data/maps/events/SootopolisCity_House7.inc delete mode 100644 data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc delete mode 100644 data/maps/events/SootopolisCity_Mart.inc delete mode 100644 data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc delete mode 100644 data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc delete mode 100644 data/maps/events/SootopolisCity_PokemonCenter_1F.inc delete mode 100644 data/maps/events/SootopolisCity_PokemonCenter_2F.inc delete mode 100644 data/maps/events/SouthernIsland_Exterior.inc delete mode 100644 data/maps/events/SouthernIsland_Interior.inc delete mode 100644 data/maps/events/TerraCave_End.inc delete mode 100644 data/maps/events/TerraCave_Entrance.inc delete mode 100644 data/maps/events/TradeCenter.inc delete mode 100644 data/maps/events/TrainerHill_1F.inc delete mode 100644 data/maps/events/TrainerHill_2F.inc delete mode 100644 data/maps/events/TrainerHill_3F.inc delete mode 100644 data/maps/events/TrainerHill_4F.inc delete mode 100644 data/maps/events/TrainerHill_Elevator.inc delete mode 100644 data/maps/events/TrainerHill_Entrance.inc delete mode 100644 data/maps/events/TrainerHill_Roof.inc delete mode 100644 data/maps/events/Underwater1.inc delete mode 100644 data/maps/events/Underwater2.inc delete mode 100644 data/maps/events/Underwater3.inc delete mode 100644 data/maps/events/Underwater4.inc delete mode 100644 data/maps/events/Underwater5.inc delete mode 100644 data/maps/events/Underwater6.inc delete mode 100644 data/maps/events/Underwater7.inc delete mode 100644 data/maps/events/Underwater_MarineCave.inc delete mode 100644 data/maps/events/Underwater_Route134.inc delete mode 100644 data/maps/events/Underwater_SeafloorCavern.inc delete mode 100644 data/maps/events/Underwater_SealedChamber.inc delete mode 100644 data/maps/events/Underwater_SootopolisCity.inc delete mode 100644 data/maps/events/UnionRoom.inc delete mode 100644 data/maps/events/UnknownMap_25_29.inc delete mode 100644 data/maps/events/UnknownMap_25_30.inc delete mode 100644 data/maps/events/UnknownMap_25_31.inc delete mode 100644 data/maps/events/UnknownMap_25_32.inc delete mode 100644 data/maps/events/UnknownMap_25_33.inc delete mode 100644 data/maps/events/UnknownMap_25_34.inc delete mode 100644 data/maps/events/VerdanturfTown.inc delete mode 100644 data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc delete mode 100644 data/maps/events/VerdanturfTown_BattleTentCorridor.inc delete mode 100644 data/maps/events/VerdanturfTown_BattleTentLobby.inc delete mode 100644 data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc delete mode 100644 data/maps/events/VerdanturfTown_House.inc delete mode 100644 data/maps/events/VerdanturfTown_Mart.inc delete mode 100644 data/maps/events/VerdanturfTown_PokemonCenter_1F.inc delete mode 100644 data/maps/events/VerdanturfTown_PokemonCenter_2F.inc delete mode 100644 data/maps/events/VerdanturfTown_WandasHouse.inc delete mode 100644 data/maps/events/VictoryRoad_1F.inc delete mode 100644 data/maps/events/VictoryRoad_B1F.inc delete mode 100644 data/maps/events/VictoryRoad_B2F.inc delete mode 100644 data/scripts/maps/AbandonedShip_CaptainsOffice.inc delete mode 100644 data/scripts/maps/AbandonedShip_Corridors_1F.inc delete mode 100644 data/scripts/maps/AbandonedShip_Corridors_B1F.inc delete mode 100644 data/scripts/maps/AbandonedShip_Deck.inc delete mode 100644 data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc delete mode 100644 data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc delete mode 100644 data/scripts/maps/AbandonedShip_Room_B1F.inc delete mode 100644 data/scripts/maps/AbandonedShip_Rooms2_1F.inc delete mode 100644 data/scripts/maps/AbandonedShip_Rooms2_B1F.inc delete mode 100644 data/scripts/maps/AbandonedShip_Rooms_1F.inc delete mode 100644 data/scripts/maps/AbandonedShip_Rooms_B1F.inc delete mode 100644 data/scripts/maps/AbandonedShip_Underwater1.inc delete mode 100644 data/scripts/maps/AbandonedShip_Underwater2.inc delete mode 100644 data/scripts/maps/AlteringCave.inc delete mode 100644 data/scripts/maps/AncientTomb.inc delete mode 100644 data/scripts/maps/AquaHideout_1F.inc delete mode 100644 data/scripts/maps/AquaHideout_B1F.inc delete mode 100644 data/scripts/maps/AquaHideout_B2F.inc delete mode 100644 data/scripts/maps/AquaHideout_UnusedRubyMap1.inc delete mode 100644 data/scripts/maps/AquaHideout_UnusedRubyMap2.inc delete mode 100644 data/scripts/maps/AquaHideout_UnusedRubyMap3.inc delete mode 100644 data/scripts/maps/ArtisanCave_1F.inc delete mode 100644 data/scripts/maps/ArtisanCave_B1F.inc delete mode 100644 data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc delete mode 100644 data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc delete mode 100644 data/scripts/maps/BattleFrontier_BattleArenaLobby.inc delete mode 100644 data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc delete mode 100644 data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc delete mode 100644 data/scripts/maps/BattleFrontier_BattleDomeLobby.inc delete mode 100644 data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc delete mode 100644 data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc delete mode 100644 data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc delete mode 100644 data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc delete mode 100644 data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc delete mode 100644 data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc delete mode 100644 data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc delete mode 100644 data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc delete mode 100644 data/scripts/maps/BattleFrontier_BattlePikeLobby.inc delete mode 100644 data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc delete mode 100644 data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc delete mode 100644 data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc delete mode 100644 data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc delete mode 100644 data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc delete mode 100644 data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc delete mode 100644 data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc delete mode 100644 data/scripts/maps/BattleFrontier_BattlePyramidTop.inc delete mode 100644 data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc delete mode 100644 data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc delete mode 100644 data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc delete mode 100644 data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc delete mode 100644 data/scripts/maps/BattleFrontier_BattleTowerElevator.inc delete mode 100644 data/scripts/maps/BattleFrontier_BattleTowerLobby.inc delete mode 100644 data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc delete mode 100644 data/scripts/maps/BattleFrontier_Lounge1.inc delete mode 100644 data/scripts/maps/BattleFrontier_Lounge2.inc delete mode 100644 data/scripts/maps/BattleFrontier_Lounge3.inc delete mode 100644 data/scripts/maps/BattleFrontier_Lounge4.inc delete mode 100644 data/scripts/maps/BattleFrontier_Lounge5.inc delete mode 100644 data/scripts/maps/BattleFrontier_Lounge6.inc delete mode 100644 data/scripts/maps/BattleFrontier_Lounge7.inc delete mode 100644 data/scripts/maps/BattleFrontier_Lounge8.inc delete mode 100644 data/scripts/maps/BattleFrontier_Lounge9.inc delete mode 100644 data/scripts/maps/BattleFrontier_Mart.inc delete mode 100644 data/scripts/maps/BattleFrontier_OutsideEast.inc delete mode 100644 data/scripts/maps/BattleFrontier_OutsideWest.inc delete mode 100644 data/scripts/maps/BattleFrontier_PokemonCenter_1F.inc delete mode 100644 data/scripts/maps/BattleFrontier_PokemonCenter_2F.inc delete mode 100644 data/scripts/maps/BattleFrontier_RankingHall.inc delete mode 100644 data/scripts/maps/BattleFrontier_ReceptionGate.inc delete mode 100644 data/scripts/maps/BattleFrontier_ScottsHouse.inc delete mode 100644 data/scripts/maps/BattlePyramidSquare01.inc delete mode 100644 data/scripts/maps/BattlePyramidSquare02.inc delete mode 100644 data/scripts/maps/BattlePyramidSquare03.inc delete mode 100644 data/scripts/maps/BattlePyramidSquare04.inc delete mode 100644 data/scripts/maps/BattlePyramidSquare05.inc delete mode 100644 data/scripts/maps/BattlePyramidSquare06.inc delete mode 100644 data/scripts/maps/BattlePyramidSquare07.inc delete mode 100644 data/scripts/maps/BattlePyramidSquare08.inc delete mode 100644 data/scripts/maps/BattlePyramidSquare09.inc delete mode 100644 data/scripts/maps/BattlePyramidSquare10.inc delete mode 100644 data/scripts/maps/BattlePyramidSquare11.inc delete mode 100644 data/scripts/maps/BattlePyramidSquare12.inc delete mode 100644 data/scripts/maps/BattlePyramidSquare13.inc delete mode 100644 data/scripts/maps/BattlePyramidSquare14.inc delete mode 100644 data/scripts/maps/BattlePyramidSquare15.inc delete mode 100644 data/scripts/maps/BattlePyramidSquare16.inc delete mode 100644 data/scripts/maps/BirthIsland_Exterior.inc delete mode 100644 data/scripts/maps/BirthIsland_Harbor.inc delete mode 100644 data/scripts/maps/CaveOfOrigin_1F.inc delete mode 100644 data/scripts/maps/CaveOfOrigin_B1F.inc delete mode 100644 data/scripts/maps/CaveOfOrigin_Entrance.inc delete mode 100644 data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap1.inc delete mode 100644 data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap2.inc delete mode 100644 data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap3.inc delete mode 100644 data/scripts/maps/DesertRuins.inc delete mode 100644 data/scripts/maps/DesertUnderpass.inc delete mode 100644 data/scripts/maps/DewfordTown.inc delete mode 100644 data/scripts/maps/DewfordTown_Gym.inc delete mode 100644 data/scripts/maps/DewfordTown_Hall.inc delete mode 100644 data/scripts/maps/DewfordTown_House1.inc delete mode 100644 data/scripts/maps/DewfordTown_House2.inc delete mode 100644 data/scripts/maps/DewfordTown_PokemonCenter_1F.inc delete mode 100644 data/scripts/maps/DewfordTown_PokemonCenter_2F.inc delete mode 100644 data/scripts/maps/DoubleBattleColosseum.inc delete mode 100644 data/scripts/maps/EverGrandeCity.inc delete mode 100644 data/scripts/maps/EverGrandeCity_ChampionsRoom.inc delete mode 100644 data/scripts/maps/EverGrandeCity_DrakesRoom.inc delete mode 100644 data/scripts/maps/EverGrandeCity_GlaciasRoom.inc delete mode 100644 data/scripts/maps/EverGrandeCity_Hall1.inc delete mode 100644 data/scripts/maps/EverGrandeCity_Hall2.inc delete mode 100644 data/scripts/maps/EverGrandeCity_Hall3.inc delete mode 100644 data/scripts/maps/EverGrandeCity_Hall4.inc delete mode 100644 data/scripts/maps/EverGrandeCity_Hall5.inc delete mode 100644 data/scripts/maps/EverGrandeCity_HallOfFame.inc delete mode 100644 data/scripts/maps/EverGrandeCity_PhoebesRoom.inc delete mode 100644 data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc delete mode 100644 data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc delete mode 100644 data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc delete mode 100644 data/scripts/maps/EverGrandeCity_PokemonLeague_2F.inc delete mode 100644 data/scripts/maps/EverGrandeCity_SidneysRoom.inc delete mode 100644 data/scripts/maps/FallarborTown.inc delete mode 100644 data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc delete mode 100644 data/scripts/maps/FallarborTown_BattleTentCorridor.inc delete mode 100644 data/scripts/maps/FallarborTown_BattleTentLobby.inc delete mode 100644 data/scripts/maps/FallarborTown_House1.inc delete mode 100644 data/scripts/maps/FallarborTown_House2.inc delete mode 100644 data/scripts/maps/FallarborTown_Mart.inc delete mode 100644 data/scripts/maps/FallarborTown_PokemonCenter_1F.inc delete mode 100644 data/scripts/maps/FallarborTown_PokemonCenter_2F.inc delete mode 100644 data/scripts/maps/FarawayIsland_Entrance.inc delete mode 100644 data/scripts/maps/FarawayIsland_Interior.inc delete mode 100644 data/scripts/maps/FieryPath.inc delete mode 100644 data/scripts/maps/FortreeCity.inc delete mode 100644 data/scripts/maps/FortreeCity_DecorationShop.inc delete mode 100644 data/scripts/maps/FortreeCity_Gym.inc delete mode 100644 data/scripts/maps/FortreeCity_House1.inc delete mode 100644 data/scripts/maps/FortreeCity_House2.inc delete mode 100644 data/scripts/maps/FortreeCity_House3.inc delete mode 100644 data/scripts/maps/FortreeCity_House4.inc delete mode 100644 data/scripts/maps/FortreeCity_House5.inc delete mode 100644 data/scripts/maps/FortreeCity_Mart.inc delete mode 100644 data/scripts/maps/FortreeCity_PokemonCenter_1F.inc delete mode 100644 data/scripts/maps/FortreeCity_PokemonCenter_2F.inc delete mode 100644 data/scripts/maps/GraniteCave_1F.inc delete mode 100644 data/scripts/maps/GraniteCave_B1F.inc delete mode 100644 data/scripts/maps/GraniteCave_B2F.inc delete mode 100644 data/scripts/maps/GraniteCave_StevensRoom.inc delete mode 100644 data/scripts/maps/InsideOfTruck.inc delete mode 100644 data/scripts/maps/IslandCave.inc delete mode 100644 data/scripts/maps/JaggedPass.inc delete mode 100644 data/scripts/maps/LavaridgeTown.inc delete mode 100644 data/scripts/maps/LavaridgeTown_Gym_1F.inc delete mode 100644 data/scripts/maps/LavaridgeTown_Gym_B1F.inc delete mode 100644 data/scripts/maps/LavaridgeTown_HerbShop.inc delete mode 100644 data/scripts/maps/LavaridgeTown_House.inc delete mode 100644 data/scripts/maps/LavaridgeTown_Mart.inc delete mode 100644 data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc delete mode 100644 data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc delete mode 100644 data/scripts/maps/LilycoveCity.inc delete mode 100644 data/scripts/maps/LilycoveCity_ContestHall.inc delete mode 100644 data/scripts/maps/LilycoveCity_ContestLobby.inc delete mode 100644 data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc delete mode 100644 data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc delete mode 100644 data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc delete mode 100644 data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc delete mode 100644 data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc delete mode 100644 data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc delete mode 100644 data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc delete mode 100644 data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc delete mode 100644 data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc delete mode 100644 data/scripts/maps/LilycoveCity_Harbor.inc delete mode 100644 data/scripts/maps/LilycoveCity_House1.inc delete mode 100644 data/scripts/maps/LilycoveCity_House2.inc delete mode 100644 data/scripts/maps/LilycoveCity_House3.inc delete mode 100644 data/scripts/maps/LilycoveCity_House4.inc delete mode 100644 data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc delete mode 100644 data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc delete mode 100644 data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc delete mode 100644 data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc delete mode 100644 data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc delete mode 100644 data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc delete mode 100644 data/scripts/maps/LilycoveCity_UnusedMart.inc delete mode 100644 data/scripts/maps/LinkContestRoom1.inc delete mode 100644 data/scripts/maps/LinkContestRoom2.inc delete mode 100644 data/scripts/maps/LinkContestRoom3.inc delete mode 100644 data/scripts/maps/LinkContestRoom4.inc delete mode 100644 data/scripts/maps/LinkContestRoom5.inc delete mode 100644 data/scripts/maps/LinkContestRoom6.inc delete mode 100644 data/scripts/maps/LittlerootTown.inc delete mode 100644 data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc delete mode 100644 data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc delete mode 100644 data/scripts/maps/LittlerootTown_MaysHouse_1F.inc delete mode 100644 data/scripts/maps/LittlerootTown_MaysHouse_2F.inc delete mode 100644 data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc delete mode 100644 data/scripts/maps/MagmaHideout_1F.inc delete mode 100644 data/scripts/maps/MagmaHideout_2F_1R.inc delete mode 100644 data/scripts/maps/MagmaHideout_2F_2R.inc delete mode 100644 data/scripts/maps/MagmaHideout_2F_3R.inc delete mode 100644 data/scripts/maps/MagmaHideout_3F_1R.inc delete mode 100644 data/scripts/maps/MagmaHideout_3F_2R.inc delete mode 100644 data/scripts/maps/MagmaHideout_3F_3R.inc delete mode 100644 data/scripts/maps/MagmaHideout_4F.inc delete mode 100644 data/scripts/maps/MarineCave_End.inc delete mode 100644 data/scripts/maps/MarineCave_Entrance.inc delete mode 100644 data/scripts/maps/MauvilleCity.inc delete mode 100644 data/scripts/maps/MauvilleCity_BikeShop.inc delete mode 100644 data/scripts/maps/MauvilleCity_GameCorner.inc delete mode 100644 data/scripts/maps/MauvilleCity_Gym.inc delete mode 100644 data/scripts/maps/MauvilleCity_House1.inc delete mode 100644 data/scripts/maps/MauvilleCity_House2.inc delete mode 100644 data/scripts/maps/MauvilleCity_Mart.inc delete mode 100644 data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc delete mode 100644 data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc delete mode 100644 data/scripts/maps/MeteorFalls_1F_1R.inc delete mode 100644 data/scripts/maps/MeteorFalls_1F_2R.inc delete mode 100644 data/scripts/maps/MeteorFalls_B1F_1R.inc delete mode 100644 data/scripts/maps/MeteorFalls_B1F_2R.inc delete mode 100644 data/scripts/maps/MeteorFalls_StevensCave.inc delete mode 100644 data/scripts/maps/MirageTower_1F.inc delete mode 100644 data/scripts/maps/MirageTower_2F.inc delete mode 100644 data/scripts/maps/MirageTower_3F.inc delete mode 100644 data/scripts/maps/MirageTower_4F.inc delete mode 100644 data/scripts/maps/MossdeepCity.inc delete mode 100644 data/scripts/maps/MossdeepCity_GameCorner_1F.inc delete mode 100644 data/scripts/maps/MossdeepCity_GameCorner_B1F.inc delete mode 100644 data/scripts/maps/MossdeepCity_Gym.inc delete mode 100644 data/scripts/maps/MossdeepCity_House1.inc delete mode 100644 data/scripts/maps/MossdeepCity_House2.inc delete mode 100644 data/scripts/maps/MossdeepCity_House3.inc delete mode 100644 data/scripts/maps/MossdeepCity_House4.inc delete mode 100644 data/scripts/maps/MossdeepCity_Mart.inc delete mode 100644 data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc delete mode 100644 data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc delete mode 100644 data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc delete mode 100644 data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc delete mode 100644 data/scripts/maps/MossdeepCity_StevensHouse.inc delete mode 100644 data/scripts/maps/MtChimney.inc delete mode 100644 data/scripts/maps/MtChimney_CableCarStation.inc delete mode 100644 data/scripts/maps/MtPyre_1F.inc delete mode 100644 data/scripts/maps/MtPyre_2F.inc delete mode 100644 data/scripts/maps/MtPyre_3F.inc delete mode 100644 data/scripts/maps/MtPyre_4F.inc delete mode 100644 data/scripts/maps/MtPyre_5F.inc delete mode 100644 data/scripts/maps/MtPyre_6F.inc delete mode 100644 data/scripts/maps/MtPyre_Exterior.inc delete mode 100644 data/scripts/maps/MtPyre_Summit.inc delete mode 100644 data/scripts/maps/NavelRock_B1F.inc delete mode 100644 data/scripts/maps/NavelRock_Bottom.inc delete mode 100644 data/scripts/maps/NavelRock_Down01.inc delete mode 100644 data/scripts/maps/NavelRock_Down02.inc delete mode 100644 data/scripts/maps/NavelRock_Down03.inc delete mode 100644 data/scripts/maps/NavelRock_Down04.inc delete mode 100644 data/scripts/maps/NavelRock_Down05.inc delete mode 100644 data/scripts/maps/NavelRock_Down06.inc delete mode 100644 data/scripts/maps/NavelRock_Down07.inc delete mode 100644 data/scripts/maps/NavelRock_Down08.inc delete mode 100644 data/scripts/maps/NavelRock_Down09.inc delete mode 100644 data/scripts/maps/NavelRock_Down10.inc delete mode 100644 data/scripts/maps/NavelRock_Down11.inc delete mode 100644 data/scripts/maps/NavelRock_Entrance.inc delete mode 100644 data/scripts/maps/NavelRock_Exterior.inc delete mode 100644 data/scripts/maps/NavelRock_Fork.inc delete mode 100644 data/scripts/maps/NavelRock_Harbor.inc delete mode 100644 data/scripts/maps/NavelRock_Top.inc delete mode 100644 data/scripts/maps/NavelRock_Up1.inc delete mode 100644 data/scripts/maps/NavelRock_Up2.inc delete mode 100644 data/scripts/maps/NavelRock_Up3.inc delete mode 100644 data/scripts/maps/NavelRock_Up4.inc delete mode 100644 data/scripts/maps/NewMauville_Entrance.inc delete mode 100644 data/scripts/maps/NewMauville_Inside.inc delete mode 100644 data/scripts/maps/OldaleTown.inc delete mode 100644 data/scripts/maps/OldaleTown_House1.inc delete mode 100644 data/scripts/maps/OldaleTown_House2.inc delete mode 100644 data/scripts/maps/OldaleTown_Mart.inc delete mode 100644 data/scripts/maps/OldaleTown_PokemonCenter_1F.inc delete mode 100644 data/scripts/maps/OldaleTown_PokemonCenter_2F.inc delete mode 100644 data/scripts/maps/PacifidlogTown.inc delete mode 100644 data/scripts/maps/PacifidlogTown_House1.inc delete mode 100644 data/scripts/maps/PacifidlogTown_House2.inc delete mode 100644 data/scripts/maps/PacifidlogTown_House3.inc delete mode 100644 data/scripts/maps/PacifidlogTown_House4.inc delete mode 100644 data/scripts/maps/PacifidlogTown_House5.inc delete mode 100644 data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc delete mode 100644 data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc delete mode 100644 data/scripts/maps/PetalburgCity.inc delete mode 100644 data/scripts/maps/PetalburgCity_Gym.inc delete mode 100644 data/scripts/maps/PetalburgCity_House1.inc delete mode 100644 data/scripts/maps/PetalburgCity_House2.inc delete mode 100644 data/scripts/maps/PetalburgCity_Mart.inc delete mode 100644 data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc delete mode 100644 data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc delete mode 100644 data/scripts/maps/PetalburgCity_WallysHouse.inc delete mode 100644 data/scripts/maps/PetalburgWoods.inc delete mode 100644 data/scripts/maps/RecordCorner.inc delete mode 100644 data/scripts/maps/Route101.inc delete mode 100644 data/scripts/maps/Route102.inc delete mode 100644 data/scripts/maps/Route103.inc delete mode 100644 data/scripts/maps/Route104.inc delete mode 100644 data/scripts/maps/Route104_MrBrineysHouse.inc delete mode 100644 data/scripts/maps/Route104_PrettyPetalFlowerShop.inc delete mode 100644 data/scripts/maps/Route104_Prototype.inc delete mode 100644 data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc delete mode 100644 data/scripts/maps/Route105.inc delete mode 100644 data/scripts/maps/Route106.inc delete mode 100644 data/scripts/maps/Route107.inc delete mode 100644 data/scripts/maps/Route108.inc delete mode 100644 data/scripts/maps/Route109.inc delete mode 100644 data/scripts/maps/Route109_SeashoreHouse.inc delete mode 100644 data/scripts/maps/Route110.inc delete mode 100644 data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc delete mode 100644 data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc delete mode 100644 data/scripts/maps/Route110_TrickHouseCorridor.inc delete mode 100644 data/scripts/maps/Route110_TrickHouseEnd.inc delete mode 100644 data/scripts/maps/Route110_TrickHouseEntrance.inc delete mode 100644 data/scripts/maps/Route110_TrickHousePuzzle1.inc delete mode 100644 data/scripts/maps/Route110_TrickHousePuzzle2.inc delete mode 100644 data/scripts/maps/Route110_TrickHousePuzzle3.inc delete mode 100644 data/scripts/maps/Route110_TrickHousePuzzle4.inc delete mode 100644 data/scripts/maps/Route110_TrickHousePuzzle5.inc delete mode 100644 data/scripts/maps/Route110_TrickHousePuzzle6.inc delete mode 100644 data/scripts/maps/Route110_TrickHousePuzzle7.inc delete mode 100644 data/scripts/maps/Route110_TrickHousePuzzle8.inc delete mode 100644 data/scripts/maps/Route111.inc delete mode 100644 data/scripts/maps/Route111_OldLadysRestStop.inc delete mode 100644 data/scripts/maps/Route111_WinstrateFamilysHouse.inc delete mode 100644 data/scripts/maps/Route112.inc delete mode 100644 data/scripts/maps/Route112_CableCarStation.inc delete mode 100644 data/scripts/maps/Route113.inc delete mode 100644 data/scripts/maps/Route113_GlassWorkshop.inc delete mode 100644 data/scripts/maps/Route114.inc delete mode 100644 data/scripts/maps/Route114_FossilManiacsHouse.inc delete mode 100644 data/scripts/maps/Route114_FossilManiacsTunnel.inc delete mode 100644 data/scripts/maps/Route114_LanettesHouse.inc delete mode 100644 data/scripts/maps/Route115.inc delete mode 100644 data/scripts/maps/Route116.inc delete mode 100644 data/scripts/maps/Route116_TunnelersRestHouse.inc delete mode 100644 data/scripts/maps/Route117.inc delete mode 100644 data/scripts/maps/Route117_PokemonDayCare.inc delete mode 100644 data/scripts/maps/Route118.inc delete mode 100644 data/scripts/maps/Route119.inc delete mode 100644 data/scripts/maps/Route119_House.inc delete mode 100644 data/scripts/maps/Route119_WeatherInstitute_1F.inc delete mode 100644 data/scripts/maps/Route119_WeatherInstitute_2F.inc delete mode 100644 data/scripts/maps/Route120.inc delete mode 100644 data/scripts/maps/Route121.inc delete mode 100644 data/scripts/maps/Route121_SafariZoneEntrance.inc delete mode 100644 data/scripts/maps/Route122.inc delete mode 100644 data/scripts/maps/Route123.inc delete mode 100644 data/scripts/maps/Route123_BerryMastersHouse.inc delete mode 100644 data/scripts/maps/Route124.inc delete mode 100644 data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc delete mode 100644 data/scripts/maps/Route125.inc delete mode 100644 data/scripts/maps/Route126.inc delete mode 100644 data/scripts/maps/Route127.inc delete mode 100644 data/scripts/maps/Route128.inc delete mode 100644 data/scripts/maps/Route129.inc delete mode 100644 data/scripts/maps/Route130.inc delete mode 100644 data/scripts/maps/Route131.inc delete mode 100644 data/scripts/maps/Route132.inc delete mode 100644 data/scripts/maps/Route133.inc delete mode 100644 data/scripts/maps/Route134.inc delete mode 100644 data/scripts/maps/RustboroCity.inc delete mode 100644 data/scripts/maps/RustboroCity_CuttersHouse.inc delete mode 100644 data/scripts/maps/RustboroCity_DevonCorp_1F.inc delete mode 100644 data/scripts/maps/RustboroCity_DevonCorp_2F.inc delete mode 100644 data/scripts/maps/RustboroCity_DevonCorp_3F.inc delete mode 100644 data/scripts/maps/RustboroCity_Flat1_1F.inc delete mode 100644 data/scripts/maps/RustboroCity_Flat1_2F.inc delete mode 100644 data/scripts/maps/RustboroCity_Flat2_1F.inc delete mode 100644 data/scripts/maps/RustboroCity_Flat2_2F.inc delete mode 100644 data/scripts/maps/RustboroCity_Flat2_3F.inc delete mode 100644 data/scripts/maps/RustboroCity_Gym.inc delete mode 100644 data/scripts/maps/RustboroCity_House1.inc delete mode 100644 data/scripts/maps/RustboroCity_House2.inc delete mode 100644 data/scripts/maps/RustboroCity_House3.inc delete mode 100644 data/scripts/maps/RustboroCity_Mart.inc delete mode 100644 data/scripts/maps/RustboroCity_PokemonCenter_1F.inc delete mode 100644 data/scripts/maps/RustboroCity_PokemonCenter_2F.inc delete mode 100644 data/scripts/maps/RustboroCity_PokemonSchool.inc delete mode 100644 data/scripts/maps/RusturfTunnel.inc delete mode 100644 data/scripts/maps/SSTidalCorridor.inc delete mode 100644 data/scripts/maps/SSTidalLowerDeck.inc delete mode 100644 data/scripts/maps/SSTidalRooms.inc delete mode 100644 data/scripts/maps/SafariZone_North.inc delete mode 100644 data/scripts/maps/SafariZone_Northeast.inc delete mode 100644 data/scripts/maps/SafariZone_Northwest.inc delete mode 100644 data/scripts/maps/SafariZone_RestHouse.inc delete mode 100644 data/scripts/maps/SafariZone_South.inc delete mode 100644 data/scripts/maps/SafariZone_Southeast.inc delete mode 100644 data/scripts/maps/SafariZone_Southwest.inc delete mode 100644 data/scripts/maps/ScorchedSlab.inc delete mode 100644 data/scripts/maps/SeafloorCavern_Entrance.inc delete mode 100644 data/scripts/maps/SeafloorCavern_Room1.inc delete mode 100644 data/scripts/maps/SeafloorCavern_Room2.inc delete mode 100644 data/scripts/maps/SeafloorCavern_Room3.inc delete mode 100644 data/scripts/maps/SeafloorCavern_Room4.inc delete mode 100644 data/scripts/maps/SeafloorCavern_Room5.inc delete mode 100644 data/scripts/maps/SeafloorCavern_Room6.inc delete mode 100644 data/scripts/maps/SeafloorCavern_Room7.inc delete mode 100644 data/scripts/maps/SeafloorCavern_Room8.inc delete mode 100644 data/scripts/maps/SeafloorCavern_Room9.inc delete mode 100644 data/scripts/maps/SealedChamber_InnerRoom.inc delete mode 100644 data/scripts/maps/SealedChamber_OuterRoom.inc delete mode 100644 data/scripts/maps/SecretBase_BlueCave1.inc delete mode 100644 data/scripts/maps/SecretBase_BlueCave2.inc delete mode 100644 data/scripts/maps/SecretBase_BlueCave3.inc delete mode 100644 data/scripts/maps/SecretBase_BlueCave4.inc delete mode 100644 data/scripts/maps/SecretBase_BrownCave1.inc delete mode 100644 data/scripts/maps/SecretBase_BrownCave2.inc delete mode 100644 data/scripts/maps/SecretBase_BrownCave3.inc delete mode 100644 data/scripts/maps/SecretBase_BrownCave4.inc delete mode 100644 data/scripts/maps/SecretBase_RedCave1.inc delete mode 100644 data/scripts/maps/SecretBase_RedCave2.inc delete mode 100644 data/scripts/maps/SecretBase_RedCave3.inc delete mode 100644 data/scripts/maps/SecretBase_RedCave4.inc delete mode 100644 data/scripts/maps/SecretBase_Shrub1.inc delete mode 100644 data/scripts/maps/SecretBase_Shrub2.inc delete mode 100644 data/scripts/maps/SecretBase_Shrub3.inc delete mode 100644 data/scripts/maps/SecretBase_Shrub4.inc delete mode 100644 data/scripts/maps/SecretBase_Tree1.inc delete mode 100644 data/scripts/maps/SecretBase_Tree2.inc delete mode 100644 data/scripts/maps/SecretBase_Tree3.inc delete mode 100644 data/scripts/maps/SecretBase_Tree4.inc delete mode 100644 data/scripts/maps/SecretBase_YellowCave1.inc delete mode 100644 data/scripts/maps/SecretBase_YellowCave2.inc delete mode 100644 data/scripts/maps/SecretBase_YellowCave3.inc delete mode 100644 data/scripts/maps/SecretBase_YellowCave4.inc delete mode 100644 data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc delete mode 100644 data/scripts/maps/ShoalCave_HighTideInnerRoom.inc delete mode 100644 data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc delete mode 100644 data/scripts/maps/ShoalCave_LowTideIceRoom.inc delete mode 100644 data/scripts/maps/ShoalCave_LowTideInnerRoom.inc delete mode 100644 data/scripts/maps/ShoalCave_LowTideLowerRoom.inc delete mode 100644 data/scripts/maps/ShoalCave_LowTideStairsRoom.inc delete mode 100644 data/scripts/maps/SingleBattleColosseum.inc delete mode 100644 data/scripts/maps/SkyPillar_1F.inc delete mode 100644 data/scripts/maps/SkyPillar_2F.inc delete mode 100644 data/scripts/maps/SkyPillar_3F.inc delete mode 100644 data/scripts/maps/SkyPillar_4F.inc delete mode 100644 data/scripts/maps/SkyPillar_5F.inc delete mode 100644 data/scripts/maps/SkyPillar_Entrance.inc delete mode 100644 data/scripts/maps/SkyPillar_Outside.inc delete mode 100644 data/scripts/maps/SkyPillar_Top.inc delete mode 100644 data/scripts/maps/SlateportCity.inc delete mode 100644 data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc delete mode 100644 data/scripts/maps/SlateportCity_BattleTentCorridor.inc delete mode 100644 data/scripts/maps/SlateportCity_BattleTentLobby.inc delete mode 100644 data/scripts/maps/SlateportCity_Harbor.inc delete mode 100644 data/scripts/maps/SlateportCity_House1.inc delete mode 100644 data/scripts/maps/SlateportCity_House2.inc delete mode 100644 data/scripts/maps/SlateportCity_Mart.inc delete mode 100644 data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc delete mode 100644 data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc delete mode 100644 data/scripts/maps/SlateportCity_PokemonCenter_1F.inc delete mode 100644 data/scripts/maps/SlateportCity_PokemonCenter_2F.inc delete mode 100644 data/scripts/maps/SlateportCity_PokemonFanClub.inc delete mode 100644 data/scripts/maps/SlateportCity_SternsShipyard_1F.inc delete mode 100644 data/scripts/maps/SlateportCity_SternsShipyard_2F.inc delete mode 100644 data/scripts/maps/SootopolisCity.inc delete mode 100644 data/scripts/maps/SootopolisCity_Gym_1F.inc delete mode 100644 data/scripts/maps/SootopolisCity_Gym_B1F.inc delete mode 100644 data/scripts/maps/SootopolisCity_House1.inc delete mode 100644 data/scripts/maps/SootopolisCity_House2.inc delete mode 100644 data/scripts/maps/SootopolisCity_House3.inc delete mode 100644 data/scripts/maps/SootopolisCity_House4.inc delete mode 100644 data/scripts/maps/SootopolisCity_House5.inc delete mode 100644 data/scripts/maps/SootopolisCity_House6.inc delete mode 100644 data/scripts/maps/SootopolisCity_House7.inc delete mode 100644 data/scripts/maps/SootopolisCity_LotadAndSeedotHouse.inc delete mode 100644 data/scripts/maps/SootopolisCity_Mart.inc delete mode 100644 data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc delete mode 100644 data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc delete mode 100644 data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc delete mode 100644 data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc delete mode 100644 data/scripts/maps/SouthernIsland_Exterior.inc delete mode 100644 data/scripts/maps/SouthernIsland_Interior.inc delete mode 100644 data/scripts/maps/TerraCave_End.inc delete mode 100644 data/scripts/maps/TerraCave_Entrance.inc delete mode 100644 data/scripts/maps/TradeCenter.inc delete mode 100644 data/scripts/maps/TrainerHill_1F.inc delete mode 100644 data/scripts/maps/TrainerHill_2F.inc delete mode 100644 data/scripts/maps/TrainerHill_3F.inc delete mode 100644 data/scripts/maps/TrainerHill_4F.inc delete mode 100644 data/scripts/maps/TrainerHill_Elevator.inc delete mode 100644 data/scripts/maps/TrainerHill_Entrance.inc delete mode 100644 data/scripts/maps/TrainerHill_Roof.inc delete mode 100644 data/scripts/maps/Underwater1.inc delete mode 100644 data/scripts/maps/Underwater2.inc delete mode 100644 data/scripts/maps/Underwater3.inc delete mode 100644 data/scripts/maps/Underwater4.inc delete mode 100644 data/scripts/maps/Underwater5.inc delete mode 100644 data/scripts/maps/Underwater6.inc delete mode 100644 data/scripts/maps/Underwater7.inc delete mode 100644 data/scripts/maps/Underwater_MarineCave.inc delete mode 100644 data/scripts/maps/Underwater_Route134.inc delete mode 100644 data/scripts/maps/Underwater_SeafloorCavern.inc delete mode 100644 data/scripts/maps/Underwater_SealedChamber.inc delete mode 100644 data/scripts/maps/Underwater_SootopolisCity.inc delete mode 100644 data/scripts/maps/UnionRoom.inc delete mode 100644 data/scripts/maps/UnknownMap_25_29.inc delete mode 100644 data/scripts/maps/UnknownMap_25_30.inc delete mode 100644 data/scripts/maps/UnknownMap_25_31.inc delete mode 100644 data/scripts/maps/UnknownMap_25_32.inc delete mode 100644 data/scripts/maps/UnknownMap_25_33.inc delete mode 100644 data/scripts/maps/UnknownMap_25_34.inc delete mode 100644 data/scripts/maps/VerdanturfTown.inc delete mode 100644 data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc delete mode 100644 data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc delete mode 100644 data/scripts/maps/VerdanturfTown_BattleTentLobby.inc delete mode 100644 data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc delete mode 100644 data/scripts/maps/VerdanturfTown_House.inc delete mode 100644 data/scripts/maps/VerdanturfTown_Mart.inc delete mode 100644 data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc delete mode 100644 data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc delete mode 100644 data/scripts/maps/VerdanturfTown_WandasHouse.inc delete mode 100644 data/scripts/maps/VictoryRoad_1F.inc delete mode 100644 data/scripts/maps/VictoryRoad_B1F.inc delete mode 100644 data/scripts/maps/VictoryRoad_B2F.inc diff --git a/data/event_scripts.s b/data/event_scripts.s index e18dec836..4ad0ad60d 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 31b4b00d2..aca9978e4 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/AbandonedShip_CaptainsOffice/events.inc b/data/maps/AbandonedShip_CaptainsOffice/events.inc new file mode 100644 index 000000000..e7e48568c --- /dev/null +++ b/data/maps/AbandonedShip_CaptainsOffice/events.inc @@ -0,0 +1,11 @@ +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 + +AbandonedShip_CaptainsOffice_MapWarps: @ 8536A8C + 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/AbandonedShip_CaptainsOffice/scripts.inc b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc new file mode 100644 index 000000000..5b3941dd2 --- /dev/null +++ b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc @@ -0,0 +1,44 @@ +AbandonedShip_CaptainsOffice_MapScripts:: @ 82387E1 + .byte 0 + +AbandonedShip_CaptainsOffice_EventScript_2387E2:: @ 82387E2 + lock + faceplayer + checkflag FLAG_0x126 + goto_eq AbandonedShip_CaptainsOffice_EventScript_23881A + checkitem ITEM_SCANNER, 1 + compare VAR_RESULT, 1 + goto_eq AbandonedShip_CaptainsOffice_EventScript_238810 + checkflag FLAG_0x436 + goto_eq AbandonedShip_CaptainsOffice_EventScript_23881A + msgbox AbandonedShip_CaptainsOffice_Text_238824, 4 + release + end + +AbandonedShip_CaptainsOffice_EventScript_238810:: @ 8238810 + msgbox AbandonedShip_CaptainsOffice_Text_23889D, 4 + release + end + +AbandonedShip_CaptainsOffice_EventScript_23881A:: @ 823881A + msgbox AbandonedShip_CaptainsOffice_Text_238918, 4 + release + end + +AbandonedShip_CaptainsOffice_Text_238824: @ 8238824 + .string "I’m investigating this ship on behalf\n" + .string "of CAPT. STERN.\p" + .string "He also asked me to find a SCANNER,\n" + .string "but I haven’t had any success…$" + +AbandonedShip_CaptainsOffice_Text_23889D: @ 823889D + .string "Oh! That’s a SCANNER!\p" + .string "Listen, can I get you to deliver that\n" + .string "to CAPT. STERN?\p" + .string "I want to investigate this ship a\n" + .string "little more.$" + +AbandonedShip_CaptainsOffice_Text_238918: @ 8238918 + .string "This ship is called S.S. CACTUS.\n" + .string "It seems to be from an earlier era.$" + diff --git a/data/maps/AbandonedShip_Corridors_1F/events.inc b/data/maps/AbandonedShip_Corridors_1F/events.inc new file mode 100644 index 000000000..f0e276032 --- /dev/null +++ b/data/maps/AbandonedShip_Corridors_1F/events.inc @@ -0,0 +1,21 @@ +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 + +AbandonedShip_Corridors_1F_MapWarps: @ 85366F0 + 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/AbandonedShip_Corridors_1F/scripts.inc b/data/maps/AbandonedShip_Corridors_1F/scripts.inc new file mode 100644 index 000000000..39c7861a1 --- /dev/null +++ b/data/maps/AbandonedShip_Corridors_1F/scripts.inc @@ -0,0 +1,27 @@ +AbandonedShip_Corridors_1F_MapScripts:: @ 82379A4 + .byte 0 + +AbandonedShip_Corridors_1F_EventScript_2379A5:: @ 82379A5 + msgbox AbandonedShip_Corridors_1F_Text_237A60, 2 + end + +AbandonedShip_Corridors_1F_EventScript_2379AE:: @ 82379AE + trainerbattle 0, TRAINER_CHARLIE, 0, AbandonedShip_Corridors_1F_Text_2379C5, AbandonedShip_Corridors_1F_Text_237A01 + msgbox AbandonedShip_Corridors_1F_Text_237A1B, 6 + end + +AbandonedShip_Corridors_1F_Text_2379C5: @ 82379C5 + .string "What’s so funny about having my inner\n" + .string "tube aboard the ship?$" + +AbandonedShip_Corridors_1F_Text_237A01: @ 8237A01 + .string "Whoa, you overwhelmed me!$" + +AbandonedShip_Corridors_1F_Text_237A1B: @ 8237A1B + .string "It’s not easy throwing POKé BALLS\n" + .string "while hanging on to an inner tube!$" + +AbandonedShip_Corridors_1F_Text_237A60: @ 8237A60 + .string "Isn’t it fun here?\n" + .string "I get excited just being here!$" + diff --git a/data/maps/AbandonedShip_Corridors_B1F/events.inc b/data/maps/AbandonedShip_Corridors_B1F/events.inc new file mode 100644 index 000000000..d1ee69499 --- /dev/null +++ b/data/maps/AbandonedShip_Corridors_B1F/events.inc @@ -0,0 +1,20 @@ +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 + +AbandonedShip_Corridors_B1F_MapWarps: @ 8536838 + 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 + +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_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc new file mode 100644 index 000000000..f19dfe322 --- /dev/null +++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc @@ -0,0 +1,91 @@ +AbandonedShip_Corridors_B1F_MapScripts:: @ 8237D84 + map_script 5, AbandonedShip_Corridors_B1F_MapScript1_237D8F + map_script 1, AbandonedShip_Corridors_B1F_MapScript1_237D98 + .byte 0 + +AbandonedShip_Corridors_B1F_MapScript1_237D8F: @ 8237D8F + setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4 + end + +AbandonedShip_Corridors_B1F_MapScript1_237D98: @ 8237D98 + checkflag FLAG_0x0EF + call_if 0, AbandonedShip_Corridors_B1F_EventScript_237DAB + checkflag FLAG_0x0EF + call_if 1, AbandonedShip_Corridors_B1F_EventScript_237DB5 + end + +AbandonedShip_Corridors_B1F_EventScript_237DAB:: @ 8237DAB + setmetatile 11, 4, 563, 1 + return + +AbandonedShip_Corridors_B1F_EventScript_237DB5:: @ 8237DB5 + setmetatile 11, 4, 555, 1 + return + +AbandonedShip_Corridors_B1F_EventScript_237DBF:: @ 8237DBF + msgbox AbandonedShip_Corridors_B1F_Text_237F03, 2 + end + +AbandonedShip_Corridors_B1F_EventScript_237DC8:: @ 8237DC8 + lockall + checkflag FLAG_0x0EF + goto_eq AbandonedShip_Corridors_B1F_EventScript_237E09 + checkitem ITEM_STORAGE_KEY, 1 + compare VAR_RESULT, 0 + goto_eq AbandonedShip_Corridors_B1F_EventScript_237DFF + msgbox AbandonedShip_Corridors_B1F_Text_237F4B, 4 + playse SE_PIN + takeitem ITEM_STORAGE_KEY, 1 + setflag FLAG_0x0EF + call AbandonedShip_Corridors_B1F_EventScript_237DB5 + special DrawWholeMapView + releaseall + end + +AbandonedShip_Corridors_B1F_EventScript_237DFF:: @ 8237DFF + msgbox AbandonedShip_Corridors_B1F_Text_237F15, 4 + releaseall + end + +AbandonedShip_Corridors_B1F_EventScript_237E09:: @ 8237E09 + msgbox AbandonedShip_Corridors_B1F_Text_237FA5, 4 + releaseall + end + +AbandonedShip_Corridors_B1F_EventScript_237E13:: @ 8237E13 + trainerbattle 0, TRAINER_DUNCAN, 0, AbandonedShip_Corridors_B1F_Text_237E2A, AbandonedShip_Corridors_B1F_Text_237E80 + msgbox AbandonedShip_Corridors_B1F_Text_237E92, 6 + end + +AbandonedShip_Corridors_B1F_Text_237E2A: @ 8237E2A + .string "When we go out to sea, we SAILORS\n" + .string "always bring our POKéMON.\l" + .string "How about a quick battle?$" + +AbandonedShip_Corridors_B1F_Text_237E80: @ 8237E80 + .string "Whoops, I’m sunk!$" + +AbandonedShip_Corridors_B1F_Text_237E92: @ 8237E92 + .string "The ship’s bottom has sunk into the\n" + .string "depths.\p" + .string "If a POKéMON knew how to go underwater,\n" + .string "we might make some progress…$" + +AbandonedShip_Corridors_B1F_Text_237F03: @ 8237F03 + .string "Yay!\n" + .string "It’s a ship!$" + +AbandonedShip_Corridors_B1F_Text_237F15: @ 8237F15 + .string "The door is locked.\p" + .string "“STORAGE†is painted on the door.$" + +AbandonedShip_Corridors_B1F_Text_237F4B: @ 8237F4B + .string "{PLAYER} inserted and turned the\n" + .string "STORAGE KEY.\p" + .string "The inserted KEY stuck fast,\n" + .string "but the door opened.$" + +AbandonedShip_Corridors_B1F_Text_237FA5: @ 8237FA5 +AbandonedShip_HiddenFloorCorridors_Text_237FA5: @ 8237FA5 + .string "The door is open.$" + diff --git a/data/maps/AbandonedShip_Deck/events.inc b/data/maps/AbandonedShip_Deck/events.inc new file mode 100644 index 000000000..289f917af --- /dev/null +++ b/data/maps/AbandonedShip_Deck/events.inc @@ -0,0 +1,10 @@ +AbandonedShip_Deck_MapWarps: @ 8536684 + 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/AbandonedShip_Deck/scripts.inc b/data/maps/AbandonedShip_Deck/scripts.inc new file mode 100644 index 000000000..1f0c0e2f2 --- /dev/null +++ b/data/maps/AbandonedShip_Deck/scripts.inc @@ -0,0 +1,8 @@ +AbandonedShip_Deck_MapScripts:: @ 823799A + map_script 3, AbandonedShip_Deck_MapScript1_2379A0 + .byte 0 + +AbandonedShip_Deck_MapScript1_2379A0: @ 82379A0 + setflag FLAG_LANDMARK_ABANDONED_SHIP + end + diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc new file mode 100644 index 000000000..fd5cb4ac8 --- /dev/null +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc @@ -0,0 +1,17 @@ +AbandonedShip_HiddenFloorCorridors_MapWarps: @ 8536ACC + 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 + 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 + +AbandonedShip_HiddenFloorCorridors_MapEvents:: @ 8536B2C + map_events 0x0, AbandonedShip_HiddenFloorCorridors_MapWarps, 0x0, AbandonedShip_HiddenFloorCorridors_MapBGEvents + diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc new file mode 100644 index 000000000..2cd278f91 --- /dev/null +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc @@ -0,0 +1,171 @@ +AbandonedShip_HiddenFloorCorridors_MapScripts:: @ 823896C + map_script 5, AbandonedShip_HiddenFloorCorridors_MapScript1_238977 + map_script 1, AbandonedShip_HiddenFloorCorridors_MapScript1_238980 + .byte 0 + +AbandonedShip_HiddenFloorCorridors_MapScript1_238977: @ 8238977 + setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4 + end + +AbandonedShip_HiddenFloorCorridors_MapScript1_238980: @ 8238980 + checkflag FLAG_0x0F0 + call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_2389F1 + checkflag FLAG_0x0F1 + call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_2389FB + checkflag FLAG_0x0F2 + call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A05 + checkflag FLAG_0x0F3 + call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A0F + checkflag FLAG_0x0F0 + call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389C9 + checkflag FLAG_0x0F1 + call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389D3 + checkflag FLAG_0x0F2 + call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389DD + checkflag FLAG_0x0F3 + call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389E7 + end + +AbandonedShip_HiddenFloorCorridors_EventScript_2389C9:: @ 82389C9 + setmetatile 3, 8, 555, 1 + return + +AbandonedShip_HiddenFloorCorridors_EventScript_2389D3:: @ 82389D3 + setmetatile 6, 8, 555, 1 + return + +AbandonedShip_HiddenFloorCorridors_EventScript_2389DD:: @ 82389DD + setmetatile 3, 3, 538, 0 + return + +AbandonedShip_HiddenFloorCorridors_EventScript_2389E7:: @ 82389E7 + setmetatile 9, 3, 538, 0 + return + +AbandonedShip_HiddenFloorCorridors_EventScript_2389F1:: @ 82389F1 + setmetatile 3, 8, 563, 1 + return + +AbandonedShip_HiddenFloorCorridors_EventScript_2389FB:: @ 82389FB + setmetatile 6, 8, 563, 1 + return + +AbandonedShip_HiddenFloorCorridors_EventScript_238A05:: @ 8238A05 + setmetatile 3, 3, 564, 0 + return + +AbandonedShip_HiddenFloorCorridors_EventScript_238A0F:: @ 8238A0F + setmetatile 9, 3, 564, 0 + return + +AbandonedShip_HiddenFloorCorridors_EventScript_238A19:: @ 8238A19 + lockall + checkflag FLAG_0x0F0 + goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D + checkitem ITEM_ROOM_1_KEY, 1 + compare VAR_RESULT, 0 + goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AF5 + msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4 + playse SE_PIN + takeitem ITEM_ROOM_1_KEY, 1 + setflag FLAG_0x0F0 + call AbandonedShip_HiddenFloorCorridors_EventScript_2389C9 + special DrawWholeMapView + releaseall + end + +AbandonedShip_HiddenFloorCorridors_EventScript_238A50:: @ 8238A50 + lockall + checkflag FLAG_0x0F1 + goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D + checkitem ITEM_ROOM_2_KEY, 1 + compare VAR_RESULT, 0 + goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AFF + msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4 + playse SE_PIN + takeitem ITEM_ROOM_2_KEY, 1 + setflag FLAG_0x0F1 + call AbandonedShip_HiddenFloorCorridors_EventScript_2389D3 + special DrawWholeMapView + releaseall + end + +AbandonedShip_HiddenFloorCorridors_EventScript_238A87:: @ 8238A87 + lockall + checkflag FLAG_0x0F2 + goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D + checkitem ITEM_ROOM_4_KEY, 1 + compare VAR_RESULT, 0 + goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B09 + msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4 + playse SE_PIN + takeitem ITEM_ROOM_4_KEY, 1 + setflag FLAG_0x0F2 + call AbandonedShip_HiddenFloorCorridors_EventScript_2389DD + special DrawWholeMapView + releaseall + end + +AbandonedShip_HiddenFloorCorridors_EventScript_238ABE:: @ 8238ABE + lockall + checkflag FLAG_0x0F3 + goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D + checkitem ITEM_ROOM_6_KEY, 1 + compare VAR_RESULT, 0 + goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B13 + msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4 + playse SE_PIN + takeitem ITEM_ROOM_6_KEY, 1 + setflag FLAG_0x0F3 + call AbandonedShip_HiddenFloorCorridors_EventScript_2389E7 + special DrawWholeMapView + releaseall + end + +AbandonedShip_HiddenFloorCorridors_EventScript_238AF5:: @ 8238AF5 + msgbox AbandonedShip_HiddenFloorCorridors_Text_238B27, 4 + releaseall + end + +AbandonedShip_HiddenFloorCorridors_EventScript_238AFF:: @ 8238AFF + msgbox AbandonedShip_HiddenFloorCorridors_Text_238B5B, 4 + releaseall + end + +AbandonedShip_HiddenFloorCorridors_EventScript_238B09:: @ 8238B09 + msgbox AbandonedShip_HiddenFloorCorridors_Text_238B8F, 4 + releaseall + end + +AbandonedShip_HiddenFloorCorridors_EventScript_238B13:: @ 8238B13 + msgbox AbandonedShip_HiddenFloorCorridors_Text_238BC3, 4 + releaseall + end + +AbandonedShip_HiddenFloorCorridors_EventScript_238B1D:: @ 8238B1D + msgbox AbandonedShip_HiddenFloorCorridors_Text_237FA5, 4 + releaseall + end + +AbandonedShip_HiddenFloorCorridors_Text_238B27: @ 8238B27 + .string "The door is locked.\p" + .string "“RM. 1†is painted on the door.$" + +AbandonedShip_HiddenFloorCorridors_Text_238B5B: @ 8238B5B + .string "The door is locked.\p" + .string "“RM. 2†is painted on the door.$" + +AbandonedShip_HiddenFloorCorridors_Text_238B8F: @ 8238B8F + .string "The door is locked.\p" + .string "“RM. 4†is painted on the door.$" + +AbandonedShip_HiddenFloorCorridors_Text_238BC3: @ 8238BC3 + .string "The door is locked.\p" + .string "“RM. 6†is painted on the door.$" + +AbandonedShip_HiddenFloorCorridors_Text_238BF7: @ 8238BF7 + .string "{PLAYER} inserted and turned the\n" + .string "KEY.\p" + .string "The inserted KEY stuck fast,\n" + .string "but the door opened.$" + diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc new file mode 100644 index 000000000..e352635a5 --- /dev/null +++ b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc @@ -0,0 +1,32 @@ +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 + +AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0 + 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 + 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 + +AbandonedShip_HiddenFloorRooms_MapEvents:: @ 8536C60 + map_events AbandonedShip_HiddenFloorRooms_EventObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents + diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc new file mode 100644 index 000000000..701b79fbf --- /dev/null +++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc @@ -0,0 +1,148 @@ +AbandonedShip_HiddenFloorRooms_MapScripts:: @ 8238C49 + map_script 2, AbandonedShip_HiddenFloorRooms_MapScript2_238C4F + .byte 0 + +AbandonedShip_HiddenFloorRooms_MapScript2_238C4F: @ 8238C4F + map_script_2 VAR_TEMP_1, 0, AbandonedShip_HiddenFloorRooms_EventScript_238C59 + .2byte 0 + +AbandonedShip_HiddenFloorRooms_EventScript_238C59:: @ 8238C59 + setvar VAR_TEMP_1, 1 + getplayerxy VAR_TEMP_2, VAR_TEMP_3 + setvar VAR_TEMP_4, 1 + compare VAR_TEMP_2, 21 + call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238CD1 + compare VAR_TEMP_2, 36 + call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238CD7 + compare VAR_TEMP_3, 2 + call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238CDD + switch VAR_TEMP_4 + case 1, AbandonedShip_HiddenFloorRooms_EventScript_238CE3 + case 2, AbandonedShip_HiddenFloorRooms_EventScript_238D0C + case 3, AbandonedShip_HiddenFloorRooms_EventScript_238D0D + case 4, AbandonedShip_HiddenFloorRooms_EventScript_238D33 + case 5, AbandonedShip_HiddenFloorRooms_EventScript_238D6B + case 6, AbandonedShip_HiddenFloorRooms_EventScript_238DB2 + end + +AbandonedShip_HiddenFloorRooms_EventScript_238CD1:: @ 8238CD1 + addvar VAR_TEMP_4, 1 + return + +AbandonedShip_HiddenFloorRooms_EventScript_238CD7:: @ 8238CD7 + addvar VAR_TEMP_4, 2 + return + +AbandonedShip_HiddenFloorRooms_EventScript_238CDD:: @ 8238CDD + addvar VAR_TEMP_4, 3 + return + +AbandonedShip_HiddenFloorRooms_EventScript_238CE3:: @ 8238CE3 + delay 20 + setfieldeffectargument 0, 10 + setfieldeffectargument 1, 10 + setfieldeffectargument 2, 0 + dofieldeffect 54 + specialvar VAR_RESULT, sub_81392F8 + compare VAR_RESULT, 0 + call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DD3 + waitfieldeffect 54 + delay 10 + end + +AbandonedShip_HiddenFloorRooms_EventScript_238D0C:: @ 8238D0C + end + +AbandonedShip_HiddenFloorRooms_EventScript_238D0D:: @ 8238D0D + specialvar VAR_RESULT, sub_81392AC + compare VAR_RESULT, 1 + goto_eq AbandonedShip_HiddenFloorRooms_EventScript_238D32 + delay 20 + compare VAR_RESULT, 0 + call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DB3 + waitfieldeffect 54 + delay 10 + end + +AbandonedShip_HiddenFloorRooms_EventScript_238D32:: @ 8238D32 + end + +AbandonedShip_HiddenFloorRooms_EventScript_238D33:: @ 8238D33 + delay 20 + setfieldeffectargument 0, 8 + setfieldeffectargument 1, 5 + setfieldeffectargument 2, 0 + dofieldeffect 54 + setfieldeffectargument 0, 11 + setfieldeffectargument 1, 3 + setfieldeffectargument 2, 0 + dofieldeffect 54 + specialvar VAR_RESULT, sub_8139320 + compare VAR_RESULT, 0 + call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DE3 + waitfieldeffect 54 + delay 10 + end + +AbandonedShip_HiddenFloorRooms_EventScript_238D6B:: @ 8238D6B + delay 20 + setfieldeffectargument 0, 16 + setfieldeffectargument 1, 3 + setfieldeffectargument 2, 0 + dofieldeffect 54 + setfieldeffectargument 0, 25 + setfieldeffectargument 1, 2 + setfieldeffectargument 2, 0 + dofieldeffect 54 + setfieldeffectargument 0, 24 + setfieldeffectargument 1, 6 + setfieldeffectargument 2, 0 + dofieldeffect 54 + specialvar VAR_RESULT, sub_81392D4 + compare VAR_RESULT, 0 + call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DC3 + waitfieldeffect 54 + delay 10 + end + +AbandonedShip_HiddenFloorRooms_EventScript_238DB2:: @ 8238DB2 + end + +AbandonedShip_HiddenFloorRooms_EventScript_238DB3:: @ 8238DB3 + setfieldeffectargument 0, 42 + setfieldeffectargument 1, 10 + setfieldeffectargument 2, 0 + dofieldeffect 54 + return + +AbandonedShip_HiddenFloorRooms_EventScript_238DC3:: @ 8238DC3 + setfieldeffectargument 0, 20 + setfieldeffectargument 1, 5 + setfieldeffectargument 2, 0 + dofieldeffect 54 + return + +AbandonedShip_HiddenFloorRooms_EventScript_238DD3:: @ 8238DD3 + setfieldeffectargument 0, 1 + setfieldeffectargument 1, 12 + setfieldeffectargument 2, 0 + dofieldeffect 54 + return + +AbandonedShip_HiddenFloorRooms_EventScript_238DE3:: @ 8238DE3 + setfieldeffectargument 0, 1 + setfieldeffectargument 1, 2 + setfieldeffectargument 2, 0 + dofieldeffect 54 + return + +AbandonedShip_HiddenFloorRooms_EventScript_238DF3:: @ 8238DF3 + lockall + msgbox AbandonedShip_HiddenFloorRooms_Text_238DFE, 4 + releaseall + end + +AbandonedShip_HiddenFloorRooms_Text_238DFE: @ 8238DFE + .string "It’s bright and shiny!\n" + .string "But it’s just trash…$" + diff --git a/data/maps/AbandonedShip_Room_B1F/events.inc b/data/maps/AbandonedShip_Room_B1F/events.inc new file mode 100644 index 000000000..1f1cab59a --- /dev/null +++ b/data/maps/AbandonedShip_Room_B1F/events.inc @@ -0,0 +1,10 @@ +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 + +AbandonedShip_Room_B1F_MapWarps: @ 8536994 + 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/AbandonedShip_Room_B1F/scripts.inc b/data/maps/AbandonedShip_Room_B1F/scripts.inc new file mode 100644 index 000000000..5dd7a2bad --- /dev/null +++ b/data/maps/AbandonedShip_Room_B1F/scripts.inc @@ -0,0 +1,3 @@ +AbandonedShip_Room_B1F_MapScripts:: @ 82380A5 + .byte 0 + diff --git a/data/maps/AbandonedShip_Rooms2_1F/events.inc b/data/maps/AbandonedShip_Rooms2_1F/events.inc new file mode 100644 index 000000000..7dfb4d059 --- /dev/null +++ b/data/maps/AbandonedShip_Rooms2_1F/events.inc @@ -0,0 +1,15 @@ +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 + +AbandonedShip_Rooms2_1F_MapWarps: @ 8536A30 + 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/AbandonedShip_Rooms2_1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc new file mode 100644 index 000000000..2ffe3afc7 --- /dev/null +++ b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc @@ -0,0 +1,158 @@ +AbandonedShip_Rooms2_1F_MapScripts:: @ 82380A6 + .byte 0 + +AbandonedShip_Rooms2_1F_EventScript_2380A7:: @ 82380A7 + trainerbattle 6, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_23819D, AbandonedShip_Rooms2_1F_Text_2381DA, AbandonedShip_Rooms2_1F_Text_238257, AbandonedShip_Rooms2_1F_EventScript_2380D7 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq AbandonedShip_Rooms2_1F_EventScript_2380F0 + msgbox AbandonedShip_Rooms2_1F_Text_23820F, 4 + release + end + +AbandonedShip_Rooms2_1F_EventScript_2380D7:: @ 82380D7 + msgbox AbandonedShip_Rooms2_1F_Text_2383BB, 4 + setvar VAR_0x8004, 642 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 642 + callstd 8 + release + end + +AbandonedShip_Rooms2_1F_EventScript_2380F0:: @ 82380F0 + trainerbattle 7, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_2383FF, AbandonedShip_Rooms2_1F_Text_238473, AbandonedShip_Rooms2_1F_Text_238509 + msgbox AbandonedShip_Rooms2_1F_Text_238491, 6 + end + +AbandonedShip_Rooms2_1F_EventScript_23810B:: @ 823810B + trainerbattle 6, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_2382A4, AbandonedShip_Rooms2_1F_Text_2382F4, AbandonedShip_Rooms2_1F_Text_23836F, AbandonedShip_Rooms2_1F_EventScript_23813B + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq AbandonedShip_Rooms2_1F_EventScript_238154 + msgbox AbandonedShip_Rooms2_1F_Text_23830A, 4 + release + end + +AbandonedShip_Rooms2_1F_EventScript_23813B:: @ 823813B + msgbox AbandonedShip_Rooms2_1F_Text_2383BB, 4 + setvar VAR_0x8004, 642 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 642 + callstd 8 + release + end + +AbandonedShip_Rooms2_1F_EventScript_238154:: @ 8238154 + trainerbattle 7, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_238556, AbandonedShip_Rooms2_1F_Text_2385F2, AbandonedShip_Rooms2_1F_Text_238668 + msgbox AbandonedShip_Rooms2_1F_Text_23860B, 6 + end + +AbandonedShip_Rooms2_1F_EventScript_23816F:: @ 823816F + trainerbattle 0, TRAINER_JANI, 0, AbandonedShip_Rooms2_1F_Text_2386B4, AbandonedShip_Rooms2_1F_Text_2386E8 + msgbox AbandonedShip_Rooms2_1F_Text_238708, 6 + end + +AbandonedShip_Rooms2_1F_EventScript_238186:: @ 8238186 + trainerbattle 0, TRAINER_GARRISON, 0, AbandonedShip_Rooms2_1F_Text_23873F, AbandonedShip_Rooms2_1F_Text_238779 + msgbox AbandonedShip_Rooms2_1F_Text_2387A9, 6 + end + +AbandonedShip_Rooms2_1F_Text_23819D: @ 823819D + .string "DAN: While searching for treasures,\n" + .string "we discovered a TRAINER!$" + +AbandonedShip_Rooms2_1F_Text_2381DA: @ 82381DA + .string "DAN: We couldn’t win even though\n" + .string "we worked together…$" + +AbandonedShip_Rooms2_1F_Text_23820F: @ 823820F + .string "DAN: We can’t find any treasures…\n" + .string "I wonder if someone got them already?$" + +AbandonedShip_Rooms2_1F_Text_238257: @ 8238257 + .string "DAN: You don’t even have two POKéMON.\n" + .string "You can’t expect to beat us like that.$" + +AbandonedShip_Rooms2_1F_Text_2382A4: @ 82382A4 + .string "KIRA: Oh?\n" + .string "We were searching for treasures.\l" + .string "But we discovered a TRAINER instead!$" + +AbandonedShip_Rooms2_1F_Text_2382F4: @ 82382F4 + .string "KIRA: Ooh, so strong!$" + +AbandonedShip_Rooms2_1F_Text_23830A: @ 823830A + .string "KIRA: Where could the treasures be?\p" + .string "I’ve already decided what I’m buying\n" + .string "when we find the treasures!$" + +AbandonedShip_Rooms2_1F_Text_23836F: @ 823836F + .string "KIRA: Oh, you don’t have two POKéMON?\n" + .string "We’ll have to battle some other time!$" + +AbandonedShip_Rooms2_1F_Text_2383BB: @ 82383BB + .string "KIRA: Oh, you make me so angry!\n" + .string "I’m going to register you for that!$" + +AbandonedShip_Rooms2_1F_Text_2383FF: @ 82383FF + .string "DAN: We’ve been searching for\n" + .string "treasures all this time.\p" + .string "Our POKéMON have grown stronger, too.\n" + .string "Let us show you, okay?$" + +AbandonedShip_Rooms2_1F_Text_238473: @ 8238473 + .string "DAN: You’re strong, as usual!$" + +AbandonedShip_Rooms2_1F_Text_238491: @ 8238491 + .string "DAN: We can’t find any treasures,\n" + .string "we lose at POKéMON…\p" + .string "I want to go home… But if I say that,\n" + .string "she gets all angry with me…$" + +AbandonedShip_Rooms2_1F_Text_238509: @ 8238509 + .string "DAN: You don’t even have two POKéMON.\n" + .string "You can’t expect to beat us like that.$" + +AbandonedShip_Rooms2_1F_Text_238556: @ 8238556 + .string "KIRA: Oh? We meet again!\p" + .string "Just like us, you still haven’t given up\n" + .string "searching for treasures, have you?\p" + .string "Want to make it so the loser has\n" + .string "to give up searching?$" + +AbandonedShip_Rooms2_1F_Text_2385F2: @ 82385F2 + .string "KIRA: Oh, we lost again…$" + +AbandonedShip_Rooms2_1F_Text_23860B: @ 823860B + .string "KIRA: We’re not leaving until we raise\n" + .string "our POKéMON some more and we find\l" + .string "the treasures here!$" + +AbandonedShip_Rooms2_1F_Text_238668: @ 8238668 + .string "KIRA: Oh, you don’t have two POKéMON?\n" + .string "We’ll have to battle some other time!$" + +AbandonedShip_Rooms2_1F_Text_2386B4: @ 82386B4 + .string "I’m not good at swimming,\n" + .string "but I am good at battles!$" + +AbandonedShip_Rooms2_1F_Text_2386E8: @ 82386E8 + .string "Oops.\n" + .string "That didn’t go very well.$" + +AbandonedShip_Rooms2_1F_Text_238708: @ 8238708 + .string "Walking around barefoot in this ship\n" + .string "is kind of gross.$" + +AbandonedShip_Rooms2_1F_Text_23873F: @ 823873F + .string "Strength and compassion…\n" + .string "Those are a TRAINER’s treasures!$" + +AbandonedShip_Rooms2_1F_Text_238779: @ 8238779 + .string "Ah, there is something about you\n" + .string "that sparkles.$" + +AbandonedShip_Rooms2_1F_Text_2387A9: @ 82387A9 + .string "In a cabin somewhere on board,\n" + .string "I saw something sparkle.$" + diff --git a/data/maps/AbandonedShip_Rooms2_B1F/events.inc b/data/maps/AbandonedShip_Rooms2_B1F/events.inc new file mode 100644 index 000000000..40e4600af --- /dev/null +++ b/data/maps/AbandonedShip_Rooms2_B1F/events.inc @@ -0,0 +1,13 @@ +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 + +AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924 + 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/AbandonedShip_Rooms2_B1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc new file mode 100644 index 000000000..00b3d0fb9 --- /dev/null +++ b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc @@ -0,0 +1,13 @@ +AbandonedShip_Rooms2_B1F_MapScripts:: @ 8238024 + .byte 0 + +AbandonedShip_Rooms2_B1F_EventScript_238025:: @ 8238025 + msgbox AbandonedShip_Rooms2_B1F_Text_23802E, 2 + end + +AbandonedShip_Rooms2_B1F_Text_23802E: @ 823802E + .string "This is a perfect place to go exploring!\n" + .string "It’s exciting here!\p" + .string "I bet there’re amazing treasures on\n" + .string "board.$" + diff --git a/data/maps/AbandonedShip_Rooms_1F/events.inc b/data/maps/AbandonedShip_Rooms_1F/events.inc new file mode 100644 index 000000000..072892b0a --- /dev/null +++ b/data/maps/AbandonedShip_Rooms_1F/events.inc @@ -0,0 +1,17 @@ +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 + +AbandonedShip_Rooms_1F_MapWarps: @ 85367C4 + 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/AbandonedShip_Rooms_1F/scripts.inc b/data/maps/AbandonedShip_Rooms_1F/scripts.inc new file mode 100644 index 000000000..2a6bc36b6 --- /dev/null +++ b/data/maps/AbandonedShip_Rooms_1F/scripts.inc @@ -0,0 +1,81 @@ +AbandonedShip_Rooms_1F_MapScripts:: @ 8237A92 + .byte 0 + +AbandonedShip_Rooms_1F_EventScript_237A93:: @ 8237A93 + msgbox AbandonedShip_Rooms_1F_Text_237B15, 2 + end + +AbandonedShip_Rooms_1F_EventScript_237A9C:: @ 8237A9C + trainerbattle 0, TRAINER_DEMETRIUS, 0, AbandonedShip_Rooms_1F_Text_237D0C, AbandonedShip_Rooms_1F_Text_237D2A + msgbox AbandonedShip_Rooms_1F_Text_237D41, 6 + end + +AbandonedShip_Rooms_1F_EventScript_237AB3:: @ 8237AB3 + trainerbattle 2, TRAINER_THALIA_1, 0, AbandonedShip_Rooms_1F_Text_237B76, AbandonedShip_Rooms_1F_Text_237BB8, AbandonedShip_Rooms_1F_EventScript_237ADF + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq AbandonedShip_Rooms_1F_EventScript_237AFE + msgbox AbandonedShip_Rooms_1F_Text_237BDB, 4 + release + end + +AbandonedShip_Rooms_1F_EventScript_237ADF:: @ 8237ADF + special sub_80B4808 + waitmovement 0 + msgbox AbandonedShip_Rooms_1F_Text_237C2A, 4 + setvar VAR_0x8004, 144 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 144 + callstd 8 + release + end + +AbandonedShip_Rooms_1F_EventScript_237AFE:: @ 8237AFE + trainerbattle 5, TRAINER_THALIA_1, 0, AbandonedShip_Rooms_1F_Text_237C69, AbandonedShip_Rooms_1F_Text_237CB2 + msgbox AbandonedShip_Rooms_1F_Text_237CC9, 6 + end + +AbandonedShip_Rooms_1F_Text_237B15: @ 8237B15 + .string "Ships of this sort are rare, so I’m\n" + .string "taking a look around.\p" + .string "Hmhm…\n" + .string "There appear to be other cabins…$" + +AbandonedShip_Rooms_1F_Text_237B76: @ 8237B76 + .string "What on earth would compel you to\n" + .string "come here? You must be curious!$" + +AbandonedShip_Rooms_1F_Text_237BB8: @ 8237BB8 + .string "Not just curious, but also strong…$" + +AbandonedShip_Rooms_1F_Text_237BDB: @ 8237BDB + .string "The man next door…\p" + .string "He says he’s just sightseeing,\n" + .string "but I don’t know about that.$" + +AbandonedShip_Rooms_1F_Text_237C2A: @ 8237C2A + .string "You’re such a tough TRAINER!\n" + .string "Let me register you as a memento!$" + +AbandonedShip_Rooms_1F_Text_237C69: @ 8237C69 + .string "What on earth would compel you to\n" + .string "come back? You must really be curious!$" + +AbandonedShip_Rooms_1F_Text_237CB2: @ 8237CB2 + .string "Aren’t you too strong?$" + +AbandonedShip_Rooms_1F_Text_237CC9: @ 8237CC9 + .string "I’m sure that man’s up to something!\n" + .string "He just acts so suspiciously!$" + +AbandonedShip_Rooms_1F_Text_237D0C: @ 8237D0C + .string "Waaah!\n" + .string "I’ve been found! …Huh?$" + +AbandonedShip_Rooms_1F_Text_237D2A: @ 8237D2A + .string "Oh, you’re not my mom.$" + +AbandonedShip_Rooms_1F_Text_237D41: @ 8237D41 + .string "I’m in trouble with my mom, so I ran.\n" + .string "Keep it a secret where I am!$" + diff --git a/data/maps/AbandonedShip_Rooms_B1F/events.inc b/data/maps/AbandonedShip_Rooms_B1F/events.inc new file mode 100644 index 000000000..50bc7c0ee --- /dev/null +++ b/data/maps/AbandonedShip_Rooms_B1F/events.inc @@ -0,0 +1,12 @@ +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 + +AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8 + 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/AbandonedShip_Rooms_B1F/scripts.inc b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc new file mode 100644 index 000000000..d4a5c9233 --- /dev/null +++ b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc @@ -0,0 +1,18 @@ +AbandonedShip_Rooms_B1F_MapScripts:: @ 8237FB7 + map_script 5, AbandonedShip_Rooms_B1F_MapScript1_237FBD + .byte 0 + +AbandonedShip_Rooms_B1F_MapScript1_237FBD: @ 8237FBD + setdivewarp MAP_ABANDONED_SHIP_UNDERWATER2, 255, 17, 4 + end + +AbandonedShip_Rooms_B1F_EventScript_237FC6:: @ 8237FC6 + msgbox AbandonedShip_Rooms_B1F_Text_237FCF, 2 + end + +AbandonedShip_Rooms_B1F_Text_237FCF: @ 8237FCF + .string "Urrrrppp…\p" + .string "I’m getting queasy just being aboard\n" + .string "this ship…\p" + .string "It’s not even moving, but…$" + diff --git a/data/maps/AbandonedShip_Underwater1/events.inc b/data/maps/AbandonedShip_Underwater1/events.inc new file mode 100644 index 000000000..5c9af3c10 --- /dev/null +++ b/data/maps/AbandonedShip_Underwater1/events.inc @@ -0,0 +1,7 @@ +AbandonedShip_Underwater1_MapWarps: @ 8536958 + 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/AbandonedShip_Underwater1/scripts.inc b/data/maps/AbandonedShip_Underwater1/scripts.inc new file mode 100644 index 000000000..7e39b1939 --- /dev/null +++ b/data/maps/AbandonedShip_Underwater1/scripts.inc @@ -0,0 +1,8 @@ +AbandonedShip_Underwater1_MapScripts:: @ 8238096 + map_script 5, AbandonedShip_Underwater1_MapScript1_23809C + .byte 0 + +AbandonedShip_Underwater1_MapScript1_23809C: @ 823809C + setdivewarp MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS, 255, 0, 10 + end + diff --git a/data/maps/AbandonedShip_Underwater2/events.inc b/data/maps/AbandonedShip_Underwater2/events.inc new file mode 100644 index 000000000..f06c21b2a --- /dev/null +++ b/data/maps/AbandonedShip_Underwater2/events.inc @@ -0,0 +1,6 @@ +AbandonedShip_Underwater2_MapWarps: @ 8536AB0 + 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/AbandonedShip_Underwater2/scripts.inc b/data/maps/AbandonedShip_Underwater2/scripts.inc new file mode 100644 index 000000000..17f52c691 --- /dev/null +++ b/data/maps/AbandonedShip_Underwater2/scripts.inc @@ -0,0 +1,8 @@ +AbandonedShip_Underwater2_MapScripts:: @ 823895D + map_script 5, AbandonedShip_Underwater2_MapScript1_238963 + .byte 0 + +AbandonedShip_Underwater2_MapScript1_238963: @ 8238963 + setdivewarp MAP_ABANDONED_SHIP_ROOMS_B1F, 255, 13, 7 + end + diff --git a/data/maps/AlteringCave/events.inc b/data/maps/AlteringCave/events.inc new file mode 100644 index 000000000..898038715 --- /dev/null +++ b/data/maps/AlteringCave/events.inc @@ -0,0 +1,6 @@ +AlteringCave_MapWarps: @ 8537894 + warp_def 18, 22, 0, 0, MAP_ROUTE103 + +AlteringCave_MapEvents:: @ 853789C + map_events 0x0, AlteringCave_MapWarps, 0x0, 0x0 + diff --git a/data/maps/AlteringCave/scripts.inc b/data/maps/AlteringCave/scripts.inc new file mode 100644 index 000000000..a9faddc36 --- /dev/null +++ b/data/maps/AlteringCave/scripts.inc @@ -0,0 +1,8 @@ +AlteringCave_MapScripts:: @ 823B177 + map_script 3, AlteringCave_MapScript1_23B17D + .byte 0 + +AlteringCave_MapScript1_23B17D: @ 823B17D + setflag FLAG_LANDMARK_ALTERING_CAVE + end + diff --git a/data/maps/AncientTomb/events.inc b/data/maps/AncientTomb/events.inc new file mode 100644 index 000000000..4950be4ac --- /dev/null +++ b/data/maps/AncientTomb/events.inc @@ -0,0 +1,16 @@ +AncientTomb_EventObjects: @ 8536CDC + 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 + 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 + bg_event 7, 20, 0, 0, 0, AncientTomb_EventScript_239050 + bg_event 9, 20, 0, 0, 0, AncientTomb_EventScript_239050 + +AncientTomb_MapEvents:: @ 8536D30 + map_events AncientTomb_EventObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents + diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc new file mode 100644 index 000000000..3cd0b9eff --- /dev/null +++ b/data/maps/AncientTomb/scripts.inc @@ -0,0 +1,98 @@ +AncientTomb_MapScripts:: @ 8238FB3 + map_script 5, AncientTomb_MapScript1_238FC3 + map_script 1, AncientTomb_MapScript1_238FF2 + map_script 3, AncientTomb_MapScript1_238FE1 + .byte 0 + +AncientTomb_MapScript1_238FC3: @ 8238FC3 + checkflag FLAG_SYS_CTRL_OBJ_DELETE + call_if 1, AncientTomb_EventScript_238FCD + end + +AncientTomb_EventScript_238FCD:: @ 8238FCD + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 7 + goto_if 5, AncientTomb_EventScript_27374E + removeobject VAR_LAST_TALKED + return + +AncientTomb_MapScript1_238FE1: @ 8238FE1 + setflag FLAG_LANDMARK_ANCIENT_TOMB + checkflag FLAG_0x1BD + call_if 0, AncientTomb_EventScript_238FEE + end + +AncientTomb_EventScript_238FEE:: @ 8238FEE + clearflag FLAG_0x3A9 + return + +AncientTomb_MapScript1_238FF2: @ 8238FF2 + checkflag FLAG_SYS_BRAILLE_FLY + call_if 0, AncientTomb_EventScript_238FFC + end + +AncientTomb_EventScript_238FFC:: @ 8238FFC + setmetatile 7, 19, 553, 1 + setmetatile 8, 19, 553, 1 + setmetatile 9, 19, 553, 1 + setmetatile 7, 20, 565, 1 + setmetatile 8, 20, 565, 1 + setmetatile 9, 20, 565, 1 + return + +AncientTomb_EventScript_239033:: @ 8239033 + lockall + checkflag FLAG_SYS_BRAILLE_FLY + goto_eq AncientTomb_EventScript_239046 + braillemessage AncientTomb_Braille_2A6D06 + waitbuttonpress + hidebox2 + releaseall + end + +AncientTomb_EventScript_239046:: @ 8239046 + msgbox gUnknown_0827304E, 4 + releaseall + end + +AncientTomb_EventScript_239050:: @ 8239050 + lockall + braillemessage AncientTomb_Braille_2A6D06 + waitbuttonpress + hidebox2 + releaseall + end + +AncientTomb_EventScript_23905A:: @ 823905A + lock + faceplayer + waitse + playmoncry SPECIES_REGISTEEL, 2 + delay 40 + waitmoncry + setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE + setflag FLAG_SYS_CTRL_OBJ_DELETE + special StartRegiBattle + waitstate + clearflag FLAG_SYS_CTRL_OBJ_DELETE + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 1 + goto_eq AncientTomb_EventScript_2390A1 + compare VAR_RESULT, 4 + goto_eq AncientTomb_EventScript_2390AA + compare VAR_RESULT, 5 + goto_eq AncientTomb_EventScript_2390AA + setflag FLAG_0x1BD + release + end + +AncientTomb_EventScript_2390A1:: @ 82390A1 + setflag FLAG_0x1BD + goto AncientTomb_EventScript_27376D + end + +AncientTomb_EventScript_2390AA:: @ 82390AA + setvar VAR_0x8004, 403 + goto AncientTomb_EventScript_273776 + end + diff --git a/data/maps/AquaHideout_1F/events.inc b/data/maps/AquaHideout_1F/events.inc new file mode 100644 index 000000000..7d0befd16 --- /dev/null +++ b/data/maps/AquaHideout_1F/events.inc @@ -0,0 +1,13 @@ +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 + +AquaHideout_1F_MapWarps: @ 853534C + 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/AquaHideout_1F/scripts.inc b/data/maps/AquaHideout_1F/scripts.inc new file mode 100644 index 000000000..9172c3927 --- /dev/null +++ b/data/maps/AquaHideout_1F/scripts.inc @@ -0,0 +1,122 @@ +AquaHideout_1F_MapScripts:: @ 8233493 + .byte 0 + +AquaHideout_1F_EventScript_233494:: @ 8233494 + lock + faceplayer + checkflag FLAG_0x06F + goto_eq AquaHideout_1F_EventScript_2334BC + checkflag FLAG_0x0D4 + goto_eq AquaHideout_1F_EventScript_2334B2 + msgbox AquaHideout_1F_Text_23351D, 4 + release + end + +AquaHideout_1F_EventScript_2334B2:: @ 82334B2 + msgbox AquaHideout_1F_Text_2335E3, 4 + release + end + +AquaHideout_1F_EventScript_2334BC:: @ 82334BC + msgbox AquaHideout_1F_Text_23367D, 4 + release + end + +AquaHideout_1F_EventScript_2334C6:: @ 82334C6 + lock + faceplayer + checkflag FLAG_0x06F + goto_eq AquaHideout_1F_EventScript_2334EE + checkflag FLAG_0x0D4 + goto_eq AquaHideout_1F_EventScript_2334E4 + msgbox AquaHideout_1F_Text_233739, 4 + release + end + +AquaHideout_1F_EventScript_2334E4:: @ 82334E4 + msgbox AquaHideout_1F_Text_2337FA, 4 + release + end + +AquaHideout_1F_EventScript_2334EE:: @ 82334EE + msgbox AquaHideout_1F_Text_233884, 4 + release + end + +AquaHideout_1F_EventScript_2334F8:: @ 82334F8 + trainerbattle 2, TRAINER_GRUNT_1, 0, AquaHideout_1F_Text_23393D, AquaHideout_1F_Text_233964, AquaHideout_1F_EventScript_233513 + msgbox AquaHideout_1F_Text_233977, 6 + end + +AquaHideout_1F_EventScript_233513:: @ 8233513 + msgbox AquaHideout_1F_Text_233977, 4 + release + end + +AquaHideout_1F_Text_23351D: @ 823351D + .string "What? What? What do you want with \n" + .string "TEAM AQUA?\p" + .string "Our BOSS isn’t here! He’s gone off to\n" + .string "snatch something important!\p" + .string "… …\n" + .string "Where did he go?\p" + .string "Wahaha! Do you really think I’d tell\n" + .string "you something that crucial?$" + +AquaHideout_1F_Text_2335E3: @ 82335E3 + .string "What? What?\n" + .string "Are you a TEAM MAGMA grunt?\p" + .string "I hear that TEAM MAGMA is trying to\n" + .string "awaken an awesome POKéMON at their\l" + .string "HIDEOUT.\p" + .string "But where might their HIDEOUT be?$" + +AquaHideout_1F_Text_23367D: @ 823367D + .string "What? What? What do you want with \n" + .string "TEAM AQUA?\p" + .string "Our BOSS isn’t here!\n" + .string "He’s gone off to jack a submarine!\p" + .string "… …\n" + .string "Where did he go?\p" + .string "Wahaha! Do you really think I’d tell\n" + .string "you something that crucial?$" + +AquaHideout_1F_Text_233739: @ 8233739 + .string "What? What? What do you want with \n" + .string "TEAM AQUA?\p" + .string "Our BOSS isn’t here! He’s on his way to\n" + .string "MT. PYRE on ROUTE 122!\p" + .string "… …\n" + .string "Why did he go?\p" + .string "Wahaha! Do you really think I’d tell\n" + .string "you something that crucial?$" + +AquaHideout_1F_Text_2337FA: @ 82337FA + .string "What? What?\n" + .string "Are you a TEAM MAGMA grunt?\p" + .string "I hear that TEAM MAGMA is after\n" + .string "an awesome POKéMON at MT. CHIMNEY.\p" + .string "But what is that POKéMON like?$" + +AquaHideout_1F_Text_233884: @ 8233884 + .string "What? What? What do you want with\n" + .string "TEAM AQUA?\p" + .string "Our BOSS isn’t here!\n" + .string "He’s on his way to SLATEPORT CITY!\p" + .string "… …\n" + .string "Why did he go?\p" + .string "Wahaha! Do you really think I’d tell\n" + .string "you something that crucial?$" + +AquaHideout_1F_Text_23393D: @ 823393D + .string "Ayiyiyi!\n" + .string "Suspicious character spotted!$" + +AquaHideout_1F_Text_233964: @ 8233964 + .string "Grrrrr…\n" + .string "I lost it!$" + +AquaHideout_1F_Text_233977: @ 8233977 + .string "I took the loss for the TEAM,\n" + .string "but I did my job…$" + diff --git a/data/maps/AquaHideout_B1F/events.inc b/data/maps/AquaHideout_B1F/events.inc new file mode 100644 index 000000000..31108fa9c --- /dev/null +++ b/data/maps/AquaHideout_B1F/events.inc @@ -0,0 +1,41 @@ +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 + +AquaHideout_B1F_MapWarps: @ 8535450 + 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/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc new file mode 100644 index 000000000..cf59bdacc --- /dev/null +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -0,0 +1,171 @@ +AquaHideout_B1F_MapScripts:: @ 82339A7 + map_script 5, AquaHideout_B1F_MapScript1_2339B2 + map_script 3, AquaHideout_B1F_MapScript1_2339D0 + .byte 0 + +AquaHideout_B1F_MapScript1_2339B2: @ 82339B2 + checkflag FLAG_SYS_CTRL_OBJ_DELETE + call_if 1, AquaHideout_B1F_EventScript_2339BC + end + +AquaHideout_B1F_EventScript_2339BC:: @ 82339BC + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 7 + goto_if 5, AquaHideout_B1F_EventScript_27374E + removeobject VAR_LAST_TALKED + return + +AquaHideout_B1F_MapScript1_2339D0: @ 82339D0 + checkflag FLAG_0x1C4 + call_if 0, AquaHideout_B1F_EventScript_2339E3 + checkflag FLAG_0x1C5 + call_if 0, AquaHideout_B1F_EventScript_2339E7 + end + +AquaHideout_B1F_EventScript_2339E3:: @ 82339E3 + clearflag FLAG_0x3D1 + return + +AquaHideout_B1F_EventScript_2339E7:: @ 82339E7 + clearflag FLAG_0x3D2 + return + +AquaHideout_B1F_EventScript_2339EB:: @ 82339EB + lock + faceplayer + setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE + waitse + playmoncry SPECIES_ELECTRODE, 2 + delay 40 + waitmoncry + setflag FLAG_SYS_CTRL_OBJ_DELETE + dowildbattle + clearflag FLAG_SYS_CTRL_OBJ_DELETE + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 1 + goto_eq AquaHideout_B1F_EventScript_233A2F + compare VAR_RESULT, 4 + goto_eq AquaHideout_B1F_EventScript_233A2F + compare VAR_RESULT, 5 + goto_eq AquaHideout_B1F_EventScript_233A2F + setflag FLAG_0x1C4 + release + end + +AquaHideout_B1F_EventScript_233A2F:: @ 8233A2F + setflag FLAG_0x1C4 + goto AquaHideout_B1F_EventScript_27376D + end + +AquaHideout_B1F_EventScript_233A38:: @ 8233A38 + lock + faceplayer + setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE + waitse + playmoncry SPECIES_ELECTRODE, 2 + delay 40 + waitmoncry + setflag FLAG_SYS_CTRL_OBJ_DELETE + dowildbattle + clearflag FLAG_SYS_CTRL_OBJ_DELETE + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 1 + goto_eq AquaHideout_B1F_EventScript_233A7C + compare VAR_RESULT, 4 + goto_eq AquaHideout_B1F_EventScript_233A7C + compare VAR_RESULT, 5 + goto_eq AquaHideout_B1F_EventScript_233A7C + setflag FLAG_0x1C5 + release + end + +AquaHideout_B1F_EventScript_233A7C:: @ 8233A7C + setflag FLAG_0x1C5 + goto AquaHideout_B1F_EventScript_27376D + end + +AquaHideout_B1F_EventScript_233A85:: @ 8233A85 + trainerbattle 2, TRAINER_GRUNT_2, 0, AquaHideout_B1F_Text_233B03, AquaHideout_B1F_Text_233B4A, AquaHideout_B1F_EventScript_233AA0 + msgbox AquaHideout_B1F_Text_233B5E, 6 + end + +AquaHideout_B1F_EventScript_233AA0:: @ 8233AA0 + special sub_80B4808 + waitmovement 0 + msgbox AquaHideout_B1F_Text_233B5E, 4 + release + end + +AquaHideout_B1F_EventScript_233AB0:: @ 8233AB0 + trainerbattle 2, TRAINER_GRUNT_3, 0, AquaHideout_B1F_Text_233BC5, AquaHideout_B1F_Text_233C27, AquaHideout_B1F_EventScript_233ACB + msgbox AquaHideout_B1F_Text_233C41, 6 + end + +AquaHideout_B1F_EventScript_233ACB:: @ 8233ACB + msgbox AquaHideout_B1F_Text_233C41, 4 + release + end + +AquaHideout_B1F_EventScript_233AD5:: @ 8233AD5 + trainerbattle 0, TRAINER_GRUNT_21, 0, AquaHideout_B1F_Text_233C89, AquaHideout_B1F_Text_233CCA + msgbox AquaHideout_B1F_Text_233CDC, 6 + end + +AquaHideout_B1F_EventScript_233AEC:: @ 8233AEC + trainerbattle 0, TRAINER_GRUNT_25, 0, AquaHideout_B1F_Text_233D1B, AquaHideout_B1F_Text_233D6E + msgbox AquaHideout_B1F_Text_233D84, 6 + end + +AquaHideout_B1F_Text_233B03: @ 8233B03 + .string "If you want to know the secret about\n" + .string "our HIDEOUT, you have me to beat!$" + +AquaHideout_B1F_Text_233B4A: @ 8233B4A + .string "I can’t win at all…$" + +AquaHideout_B1F_Text_233B5E: @ 8233B5E + .string "Our HIDEOUT’s secret?\p" + .string "Well, let’s just say…\n" + .string "There’s a submarine at the far end!\p" + .string "But, by now…\n" + .string "Kekekeke…$" + +AquaHideout_B1F_Text_233BC5: @ 8233BC5 + .string "Fuel supply loaded A-OK!\n" + .string "In-cruise snacks loaded A-OK!\p" + .string "Nothing left to do but KO a pesky\n" + .string "meddler!$" + +AquaHideout_B1F_Text_233C27: @ 8233C27 + .string "I took a serious licking!$" + +AquaHideout_B1F_Text_233C41: @ 8233C41 + .string "Humph!\n" + .string "This was supposed to happen!\p" + .string "My mission was to just hold you up!$" + +AquaHideout_B1F_Text_233C89: @ 8233C89 + .string "Yawn… Keeping watch over the\n" + .string "HIDEOUT bores me. I’ll take you on.$" + +AquaHideout_B1F_Text_233CCA: @ 8233CCA + .string "Yawn…\n" + .string "Oh, I lost…$" + +AquaHideout_B1F_Text_233CDC: @ 8233CDC + .string "If you scurry too much, other TEAM\n" + .string "AQUA members might get you.$" + +AquaHideout_B1F_Text_233D1B: @ 8233D1B + .string "Hey!\n" + .string "You there!\p" + .string "Which do you think is cooler?\n" + .string "TEAM AQUA’s uniform or TEAM MAGMA’s?$" + +AquaHideout_B1F_Text_233D6E: @ 8233D6E + .string "I lost in a cool way…$" + +AquaHideout_B1F_Text_233D84: @ 8233D84 + .string "If you have a cool uniform, you look\n" + .string "good even in a loss, don’t you think?$" + diff --git a/data/maps/AquaHideout_B2F/events.inc b/data/maps/AquaHideout_B2F/events.inc new file mode 100644 index 000000000..eca22f5f7 --- /dev/null +++ b/data/maps/AquaHideout_B2F/events.inc @@ -0,0 +1,27 @@ +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 + +AquaHideout_B2F_MapWarps: @ 85355BC + 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 + coord_event 28, 16, 3, 0, VAR_TEMP_1, 0, 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/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc new file mode 100644 index 000000000..fd3868512 --- /dev/null +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -0,0 +1,160 @@ +AquaHideout_B2F_MapScripts:: @ 8233DCF + map_script 3, AquaHideout_B2F_MapScript1_233DD5 + .byte 0 + +AquaHideout_B2F_MapScript1_233DD5: @ 8233DD5 + checkflag FLAG_0x070 + call_if 1, AquaHideout_B2F_EventScript_233DDF + end + +AquaHideout_B2F_EventScript_233DDF:: @ 8233DDF + setvar VAR_TEMP_1, 1 + return + +AquaHideout_B2F_EventScript_233DE5:: @ 8233DE5 + lockall + setvar VAR_0x8008, 1 + playse SE_PIN + applymovement VAR_0x8008, AquaHideout_B2F_Movement_272598 + waitmovement 0 + applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E + waitmovement 0 + setvar VAR_TEMP_1, 1 + releaseall + end + +AquaHideout_B2F_EventScript_233E09:: @ 8233E09 + trainerbattle 2, TRAINER_MATT, 0, AquaHideout_B2F_Text_233EDD, AquaHideout_B2F_Text_233F8D, AquaHideout_B2F_EventScript_233E25 + msgbox AquaHideout_B2F_Text_233FF2, 4 + release + end + +AquaHideout_B2F_EventScript_233E25:: @ 8233E25 + setvar VAR_0x8008, 1 + setvar VAR_0x8009, 4 + applymovement VAR_0x8008, AquaHideout_B2F_Movement_2725A4 + waitmovement 0 + delay 20 + applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E + waitmovement 0 + msgbox AquaHideout_B2F_Text_233FA6, 4 + closemessage + applymovement VAR_0x8008, AquaHideout_B2F_Movement_2725A4 + applymovement VAR_0x8009, AquaHideout_B2F_Movement_233E80 + waitmovement 0 + removeobject VAR_0x8009 + delay 20 + applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E + waitmovement 0 + msgbox AquaHideout_B2F_Text_233FF2, 4 + setflag FLAG_0x070 + setflag FLAG_0x354 + release + end + +AquaHideout_B2F_Movement_233E80: @ 8233E80 + walk_left + walk_left + walk_left + walk_left + step_end + +AquaHideout_B2F_Movement_233E85: @ 8233E85 + walk_right + walk_right + walk_right + walk_right + step_end + +AquaHideout_B2F_EventScript_233E8A:: @ 8233E8A + trainerbattle 2, TRAINER_GRUNT_4, 0, AquaHideout_B2F_Text_2340B4, AquaHideout_B2F_Text_2340F0, AquaHideout_B2F_EventScript_233EA5 + msgbox AquaHideout_B2F_Text_234112, 6 + end + +AquaHideout_B2F_EventScript_233EA5:: @ 8233EA5 + msgbox AquaHideout_B2F_Text_234112, 4 + release + end + +AquaHideout_B2F_EventScript_233EAF:: @ 8233EAF + trainerbattle 0, TRAINER_GRUNT_22, 0, AquaHideout_B2F_Text_23412D, AquaHideout_B2F_Text_2341CE + msgbox AquaHideout_B2F_Text_2341FE, 6 + end + +AquaHideout_B2F_EventScript_233EC6:: @ 8233EC6 + trainerbattle 0, TRAINER_GRUNT_26, 0, AquaHideout_B2F_Text_23426F, AquaHideout_B2F_Text_2342CC + msgbox AquaHideout_B2F_Text_2342FF, 6 + end + +AquaHideout_B2F_Text_233EDD: @ 8233EDD + .string "Hehehe…\p" + .string "Got here already, did you?\n" + .string "We underestimated you!\p" + .string "But this is it!\p" + .string "I’m a cut above the GRUNTS you’ve seen\n" + .string "so far.\p" + .string "I’m not stalling for time.\n" + .string "I’m going to pulverize you!$" + +AquaHideout_B2F_Text_233F8D: @ 8233F8D + .string "Hehehe…\n" + .string "So, I lost, too…$" + +AquaHideout_B2F_Text_233FA6: @ 8233FA6 + .string "Hehehe!\p" + .string "While I was toying with you, our BOSS\n" + .string "got through his preparations!$" + +AquaHideout_B2F_Text_233FF2: @ 8233FF2 + .string "Hehehe!\p" + .string "Our BOSS has already gone on his way to\n" + .string "some cave under the sea!\p" + .string "If you’re going to give chase, you’d\n" + .string "better search the big, wide sea beyond\l" + .string "LILYCOVE.\p" + .string "But will you find it then?\n" + .string "Hehehe!$" + +AquaHideout_B2F_Text_2340B4: @ 82340B4 + .string "Wahahah, I grew weary of waiting!\n" + .string "You owe me a battle, too!$" + +AquaHideout_B2F_Text_2340F0: @ 82340F0 + .string "Tired of waiting…\n" + .string "Lost and dazed…$" + +AquaHideout_B2F_Text_234112: @ 8234112 + .string "BOSS…\n" + .string "Is this good enough?$" + +AquaHideout_B2F_Text_23412D: @ 823412D + .string "Warp panels, the HIDEOUT’s pride\n" + .string "and joy!\p" + .string "You’re clueless about where you are,\n" + .string "aren’t you?\p" + .string "Fluster and tire out the enemy, then\n" + .string "lower the boom! That’s our plan!$" + +AquaHideout_B2F_Text_2341CE: @ 82341CE + .string "What’s wrong with you?\n" + .string "You’re not tired at all!$" + +AquaHideout_B2F_Text_2341FE: @ 82341FE + .string "That reminds me… I can’t remember\n" + .string "where I put the MASTER BALL.\p" + .string "If I fail to guard it, our BOSS will\n" + .string "chew me out…$" + +AquaHideout_B2F_Text_23426F: @ 823426F + .string "When I joined TEAM AQUA, the first\n" + .string "thing I had to learn was how these\l" + .string "warp panels connected.$" + +AquaHideout_B2F_Text_2342CC: @ 82342CC + .string "I was too occupied thinking about\n" + .string "the warp panels…$" + +AquaHideout_B2F_Text_2342FF: @ 82342FF + .string "I’ll have to learn about how I can\n" + .string "battle more effectively…$" + diff --git a/data/maps/AquaHideout_UnusedRubyMap1/events.inc b/data/maps/AquaHideout_UnusedRubyMap1/events.inc new file mode 100644 index 000000000..45663b68f --- /dev/null +++ b/data/maps/AquaHideout_UnusedRubyMap1/events.inc @@ -0,0 +1,3 @@ +AquaHideout_UnusedRubyMap1_MapEvents:: @ 8536FBC + map_events 0x0, 0x0, 0x0, 0x0 + diff --git a/data/maps/AquaHideout_UnusedRubyMap1/scripts.inc b/data/maps/AquaHideout_UnusedRubyMap1/scripts.inc new file mode 100644 index 000000000..73cde82a9 --- /dev/null +++ b/data/maps/AquaHideout_UnusedRubyMap1/scripts.inc @@ -0,0 +1,3 @@ +AquaHideout_UnusedRubyMap1_MapScripts:: @ 823929B + .byte 0 + diff --git a/data/maps/AquaHideout_UnusedRubyMap2/events.inc b/data/maps/AquaHideout_UnusedRubyMap2/events.inc new file mode 100644 index 000000000..6f53de284 --- /dev/null +++ b/data/maps/AquaHideout_UnusedRubyMap2/events.inc @@ -0,0 +1,3 @@ +AquaHideout_UnusedRubyMap2_MapEvents:: @ 8536FD0 + map_events 0x0, 0x0, 0x0, 0x0 + diff --git a/data/maps/AquaHideout_UnusedRubyMap2/scripts.inc b/data/maps/AquaHideout_UnusedRubyMap2/scripts.inc new file mode 100644 index 000000000..28901497a --- /dev/null +++ b/data/maps/AquaHideout_UnusedRubyMap2/scripts.inc @@ -0,0 +1,3 @@ +AquaHideout_UnusedRubyMap2_MapScripts:: @ 823929C + .byte 0 + diff --git a/data/maps/AquaHideout_UnusedRubyMap3/events.inc b/data/maps/AquaHideout_UnusedRubyMap3/events.inc new file mode 100644 index 000000000..8a23a3786 --- /dev/null +++ b/data/maps/AquaHideout_UnusedRubyMap3/events.inc @@ -0,0 +1,3 @@ +AquaHideout_UnusedRubyMap3_MapEvents:: @ 8536FE4 + map_events 0x0, 0x0, 0x0, 0x0 + diff --git a/data/maps/AquaHideout_UnusedRubyMap3/scripts.inc b/data/maps/AquaHideout_UnusedRubyMap3/scripts.inc new file mode 100644 index 000000000..de0e6d7dd --- /dev/null +++ b/data/maps/AquaHideout_UnusedRubyMap3/scripts.inc @@ -0,0 +1,3 @@ +AquaHideout_UnusedRubyMap3_MapScripts:: @ 823929D + .byte 0 + diff --git a/data/maps/ArtisanCave_1F/events.inc b/data/maps/ArtisanCave_1F/events.inc new file mode 100644 index 000000000..edd7429a3 --- /dev/null +++ b/data/maps/ArtisanCave_1F/events.inc @@ -0,0 +1,10 @@ +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 + +ArtisanCave_1F_MapWarps: @ 853778C + 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/ArtisanCave_1F/scripts.inc b/data/maps/ArtisanCave_1F/scripts.inc new file mode 100644 index 000000000..18090ff68 --- /dev/null +++ b/data/maps/ArtisanCave_1F/scripts.inc @@ -0,0 +1,3 @@ +ArtisanCave_1F_MapScripts:: @ 823AFB7 + .byte 0 + diff --git a/data/maps/ArtisanCave_B1F/events.inc b/data/maps/ArtisanCave_B1F/events.inc new file mode 100644 index 000000000..a0b96c316 --- /dev/null +++ b/data/maps/ArtisanCave_B1F/events.inc @@ -0,0 +1,16 @@ +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 + +ArtisanCave_B1F_MapWarps: @ 8537720 + 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 + 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 + +ArtisanCave_B1F_MapEvents:: @ 8537760 + map_events ArtisanCave_B1F_EventObjects, ArtisanCave_B1F_MapWarps, 0x0, ArtisanCave_B1F_MapBGEvents + diff --git a/data/maps/ArtisanCave_B1F/scripts.inc b/data/maps/ArtisanCave_B1F/scripts.inc new file mode 100644 index 000000000..059343a56 --- /dev/null +++ b/data/maps/ArtisanCave_B1F/scripts.inc @@ -0,0 +1,8 @@ +ArtisanCave_B1F_MapScripts:: @ 823AFAD + map_script 3, ArtisanCave_B1F_MapScript1_23AFB3 + .byte 0 + +ArtisanCave_B1F_MapScript1_23AFB3: @ 823AFB3 + setflag FLAG_0x8DF + end + diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc new file mode 100644 index 000000000..ce6eeb952 --- /dev/null +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc @@ -0,0 +1,14 @@ +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 + +BattleFrontier_BattleArenaBattleRoom_MapEvents:: @ 853C9C4 + map_events BattleFrontier_BattleArenaBattleRoom_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc new file mode 100644 index 000000000..076eeab6e --- /dev/null +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc @@ -0,0 +1,712 @@ +BattleFrontier_BattleArenaBattleRoom_MapScripts:: @ 8257487 + map_script 3, BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0 + map_script 2, BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2 + map_script 4, BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C + map_script 5, BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C + .byte 0 + +BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C: @ 825749C + special sub_8139980 + end + +BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0: @ 82574A0 + setvar VAR_0x8004, 5 + special sub_81A1780 + call BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE + end + +BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE:: @ 82574AE + checkplayergender + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC + return + +BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6:: @ 82574C6 + setvar VAR_OBJ_GFX_ID_1, 100 + return + +BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC:: @ 82574CC + setvar VAR_OBJ_GFX_ID_1, 105 + return + +BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2: @ 82574D2 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC + .2byte 0 + +BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC:: @ 82574DC + lockall + showobjectat 8, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM + applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE2 + waitmovement 0 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25752E + applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257C08 + applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BEB + setvar VAR_TEMP_2, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 6 + setvar VAR_0x8006, 1 + special sub_81A1780 + goto BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 + +BattleFrontier_BattleArenaBattleRoom_EventScript_25752E:: @ 825752E + setvar VAR_0x8004, 3 + special sub_8161F74 + addobject 7 + applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BEF + waitmovement 0 + applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 + playse SE_W187 + waitse + waitmovement 0 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C3D, 4 + closemessage + applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE5 + waitmovement 0 + applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 + playse SE_W187 + waitse + waitmovement 0 + setvar VAR_0x8004, 6 + special sub_81A5238 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C68, 4 + closemessage + applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF2 + waitmovement 0 + applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 + playse SE_W187 + waitse + waitmovement 0 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C93, 4 + closemessage + applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE5 + applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF2 + waitmovement 0 + setvar VAR_0x8004, 5 + special sub_8195960 + msgbox 0x2021fc4, 4 + waitmessage + call BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C + switch VAR_RESULT + case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257630 + +BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB:: @ 82575DB + applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 + applymovement 1, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 + applymovement 2, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 + applymovement 3, BattleFrontier_BattleArenaBattleRoom_Movement_257C05 + applymovement 4, BattleFrontier_BattleArenaBattleRoom_Movement_257C05 + playse SE_W173 + waitse + waitmovement 0 + setvar VAR_0x8004, 6 + special sub_81A5238 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CCE, 4 + +BattleFrontier_BattleArenaBattleRoom_EventScript_257615:: @ 8257615 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 4 + special sub_81A1780 + warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8 + waitstate + +BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630 + call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special sub_81A1780 + addvar VAR_RESULT, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + copyvar VAR_0x8006, VAR_RESULT + special sub_81A1780 + switch VAR_RESULT + case 7, BattleFrontier_BattleArenaBattleRoom_EventScript_257852 + applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE7 + applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BFA + waitmovement 0 + removeobject 7 + applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257C08 + applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BEB + waitmovement 0 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CE9, 4 + special LoadPlayerParty + special SavePlayerParty + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 3 + special sub_81A1780 + playfanfare MUS_ME_ASA + waitfanfare + special HealPlayerParty + +BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0:: @ 82576B0 + setvar VAR_0x8004, 9 + special sub_81A1780 + copyvar VAR_TEMP_F, VAR_RESULT + compare VAR_RESULT, 0 + goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special sub_81A1780 + compare VAR_RESULT, 1 + call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257870 + compare VAR_RESULT, 2 + call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257877 + compare VAR_RESULT, 3 + call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25787E + compare VAR_RESULT, 4 + call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257885 + compare VAR_RESULT, 5 + call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25788C + compare VAR_RESULT, 6 + call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257893 + call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257768 + multichoice 19, 4, 103, 1 + switch VAR_RESULT + case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_25783A + case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25779E + case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA + case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_257808 + case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 + +BattleFrontier_BattleArenaBattleRoom_EventScript_257768:: @ 8257768 + multichoice 20, 6, 104, 1 + switch VAR_RESULT + case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_25783A + case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA + case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_257808 + case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 + +BattleFrontier_BattleArenaBattleRoom_EventScript_25779E:: @ 825779E + message BattleFrontier_BattleArenaBattleRoom_Text_257F04 + waitmessage + multichoicedefault 20, 8, 94, 1, 0 + switch VAR_RESULT + case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 + case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_2577D0 + case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 + +BattleFrontier_BattleArenaBattleRoom_EventScript_2577D0:: @ 82577D0 + call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8B4 + goto BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 + +BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA:: @ 82577DA + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257E6B, 5 + switch VAR_RESULT + case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 + case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25789A + case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 + +BattleFrontier_BattleArenaBattleRoom_EventScript_257808:: @ 8257808 + message BattleFrontier_BattleArenaBattleRoom_Text_257E9E + waitmessage + multichoicedefault 20, 8, 94, 1, 0 + switch VAR_RESULT + case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 + case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_257615 + case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 + +BattleFrontier_BattleArenaBattleRoom_EventScript_25783A:: @ 825783A + closemessage + applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BED + applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257BED + waitmovement 0 + goto BattleFrontier_BattleArenaBattleRoom_EventScript_25752E + waitstate + +BattleFrontier_BattleArenaBattleRoom_EventScript_257852:: @ 8257852 + delay 60 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 3 + special sub_81A1780 + warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8 + waitstate + +BattleFrontier_BattleArenaBattleRoom_EventScript_257870:: @ 8257870 + message BattleFrontier_BattleArenaBattleRoom_Text_257D17 + waitmessage + return + +BattleFrontier_BattleArenaBattleRoom_EventScript_257877:: @ 8257877 + message BattleFrontier_BattleArenaBattleRoom_Text_257D50 + waitmessage + return + +BattleFrontier_BattleArenaBattleRoom_EventScript_25787E:: @ 825787E + message BattleFrontier_BattleArenaBattleRoom_Text_257D88 + waitmessage + return + +BattleFrontier_BattleArenaBattleRoom_EventScript_257885:: @ 8257885 + message BattleFrontier_BattleArenaBattleRoom_Text_257DC1 + waitmessage + return + +BattleFrontier_BattleArenaBattleRoom_EventScript_25788C:: @ 825788C + message BattleFrontier_BattleArenaBattleRoom_Text_257DF9 + waitmessage + return + +BattleFrontier_BattleArenaBattleRoom_EventScript_257893:: @ 8257893 + message BattleFrontier_BattleArenaBattleRoom_Text_257E31 + waitmessage + return + +BattleFrontier_BattleArenaBattleRoom_EventScript_25789A:: @ 825789A + message BattleFrontier_BattleArenaBattleRoom_Text_257EDB + waitmessage + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 2 + special sub_81A5238 + playse SE_SAVE + waitse + fadescreen 1 + setvar VAR_0x8004, 4 + special sub_81A1780 + end + +BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC:: @ 82578BC + compare VAR_TEMP_2, 1 + goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257F45, 4 + setvar VAR_TEMP_2, 1 + +BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4:: @ 82578D4 + message BattleFrontier_BattleArenaBattleRoom_Text_257FBB + waitmessage + call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25792B + multichoice 19, 4, 103, 1 + switch VAR_RESULT + case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_257961 + case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25779E + case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA + case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_257808 + case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4 + +BattleFrontier_BattleArenaBattleRoom_EventScript_25792B:: @ 825792B + multichoice 20, 6, 104, 1 + switch VAR_RESULT + case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_257961 + case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA + case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_257808 + case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4 + +BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961 + call BattleFrontier_BattleArenaBattleRoom_EventScript_242170 + applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BED + applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257BED + waitmovement 0 + applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 + playse SE_W187 + waitse + waitmovement 0 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C3D, 4 + closemessage + applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE4 + waitmovement 0 + applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 + playse SE_W187 + waitse + waitmovement 0 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257FED, 4 + closemessage + addobject 7 + applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF4 + waitmovement 0 + applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF2 + waitmovement 0 + switch VAR_TEMP_F + case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5 + case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F + case 4, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 7 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F + msgbox BattleFrontier_BattleArenaBattleRoom_Text_25801C, 4 + closemessage + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 7 + special sub_81A1780 + applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30 + waitmovement 0 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_25804E, 4 + closemessage + applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C3A + waitmovement 0 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_258068, 4 + +BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F:: @ 8257A3F + msgbox BattleFrontier_BattleArenaBattleRoom_Text_25810D, 4 + call BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C + goto BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB + +BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C + call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9 + setvar VAR_0x8004, 12 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257852 + applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1 + waitmovement 0 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_25813F, 4 + playfanfare MUS_ME_SYMBOLGET + message BattleFrontier_BattleArenaBattleRoom_Text_25819C + waitmessage + waitfanfare + setvar VAR_0x8004, 13 + special sub_81A1780 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_2581CF, 4 + goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852 + +BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5:: @ 8257AA5 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 7 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_258213, 4 + closemessage + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 7 + special sub_81A1780 + applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30 + waitmovement 0 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582A2, 4 + closemessage + applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C3A + waitmovement 0 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582BB, 4 + +BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8:: @ 8257AF8 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582F9, 4 + call BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257B15 + goto BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB + +BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15 + call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9 + setvar VAR_0x8004, 12 + special sub_81A1780 + compare VAR_RESULT, 2 + goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257852 + applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1 + waitmovement 0 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_258323, 4 + playfanfare MUS_ME_SYMBOLGET + message BattleFrontier_BattleArenaBattleRoom_Text_25835B + waitmessage + waitfanfare + setvar VAR_0x8004, 13 + special sub_81A1780 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_258383, 4 + goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852 + +BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E:: @ 8257B5E + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C93, 4 + call BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C + return + +BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C:: @ 8257B6C +FallarborTown_BattleTentBattleRoom_EventScript_257B6C:: @ 8257B6C + closemessage + setvar VAR_TEMP_2, 0 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 6 + setvar VAR_0x8006, 0 + special sub_81A1780 + special HealPlayerParty + setvar VAR_0x8004, 5 + setvar VAR_0x8005, 0 + special sub_8163AC4 + waitstate + setvar VAR_0x8004, 18 + special sub_81A1780 + special HealPlayerParty + setvar VAR_0x8004, 21 + special sub_81A1780 + return + +BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9:: @ 8257BA9 + applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 + applymovement 1, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 + applymovement 2, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 + applymovement 3, BattleFrontier_BattleArenaBattleRoom_Movement_257C05 + applymovement 4, BattleFrontier_BattleArenaBattleRoom_Movement_257C05 + playse SE_BAN + waitse + waitmovement 0 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CB3, 4 + closemessage + call BattleFrontier_BattleArenaBattleRoom_EventScript_241EBA + return + +BattleFrontier_BattleArenaBattleRoom_Movement_257BE2: @ 8257BE2 + walk_right + walk_right + +BattleFrontier_BattleArenaBattleRoom_Movement_257BE4: @ 8257BE4 + walk_right + +BattleFrontier_BattleArenaBattleRoom_Movement_257BE5: @ 8257BE5 + walk_right + step_end + +BattleFrontier_BattleArenaBattleRoom_Movement_257BE7: @ 8257BE7 + walk_left + walk_left + walk_in_place_fastest_right + step_end + +BattleFrontier_BattleArenaBattleRoom_Movement_257BEB: @ 8257BEB + walk_in_place_fastest_up + step_end + +BattleFrontier_BattleArenaBattleRoom_Movement_257BED: @ 8257BED + walk_in_place_fastest_right + step_end + +BattleFrontier_BattleArenaBattleRoom_Movement_257BEF: @ 8257BEF + walk_left + walk_left + +BattleFrontier_BattleArenaBattleRoom_Movement_257BF1: @ 8257BF1 + walk_left + +BattleFrontier_BattleArenaBattleRoom_Movement_257BF2: @ 8257BF2 + walk_left + step_end + +BattleFrontier_BattleArenaBattleRoom_Movement_257BF4: @ 8257BF4 + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + step_end + +BattleFrontier_BattleArenaBattleRoom_Movement_257BFA: @ 8257BFA + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + step_end + +BattleFrontier_BattleArenaBattleRoom_Movement_257C02: @ 8257C02 + disable_jump_landing_ground_effect + jump_in_place_down + step_end + +BattleFrontier_BattleArenaBattleRoom_Movement_257C05: @ 8257C05 + disable_jump_landing_ground_effect + jump_in_place_up + step_end + +BattleFrontier_BattleArenaBattleRoom_Movement_257C08: @ 8257C08 + walk_in_place_fastest_down + step_end + +BattleFrontier_BattleArenaBattleRoom_Movement_257C0A: @ 8257C0A + walk_in_place_fastest_right + step_end + +BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C: @ 8257C0C + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleArenaBattleRoom_EventScript_257C16 + .2byte 0 + +BattleFrontier_BattleArenaBattleRoom_EventScript_257C16:: @ 8257C16 + hideobjectat 8, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM + removeobject 7 + call BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC + applymovement 255, BattleFrontier_BattleArenaBattleRoom_Movement_24C773 + setvar VAR_TEMP_1, 1 + end + +BattleFrontier_BattleArenaBattleRoom_Movement_257C30: @ 8257C30 + 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 + walk_down + walk_in_place_fastest_left + step_end + +BattleFrontier_BattleArenaBattleRoom_Text_257C3D: @ 8257C3D + .string "REFEREE: TRAINER {PLAYER}!\n" + .string "Step forward, please!$" + +BattleFrontier_BattleArenaBattleRoom_Text_257C68: @ 8257C68 + .string "REFEREE: TRAINER {STR_VAR_1}!\n" + .string "Step forward, please!$" + +BattleFrontier_BattleArenaBattleRoom_Text_257C93: @ 8257C93 +FallarborTown_BattleTentBattleRoom_Text_257C93: @ 8257C93 + .string "REFEREE: Set KO Tourney!\n" + .string "Begin!$" + +BattleFrontier_BattleArenaBattleRoom_Text_257CB3: @ 8257CB3 +FallarborTown_BattleTentBattleRoom_Text_257CB3: @ 8257CB3 + .string "REFEREE: The winner is {PLAYER}!$" + +BattleFrontier_BattleArenaBattleRoom_Text_257CCE: @ 8257CCE +FallarborTown_BattleTentBattleRoom_Text_257CCE: @ 8257CCE + .string "REFEREE: The winner is {STR_VAR_1}!$" + +BattleFrontier_BattleArenaBattleRoom_Text_257CE9: @ 8257CE9 +FallarborTown_BattleTentBattleRoom_Text_257CE9: @ 8257CE9 + .string "Your POKéMON will be restored to\n" + .string "full health.$" + +BattleFrontier_BattleArenaBattleRoom_Text_257D17: @ 8257D17 +FallarborTown_BattleTentBattleRoom_Text_257D17: @ 8257D17 + .string "Next up, your second opponent!\n" + .string "Are you ready to move on?$" + +BattleFrontier_BattleArenaBattleRoom_Text_257D50: @ 8257D50 +FallarborTown_BattleTentBattleRoom_Text_257D50: @ 8257D50 + .string "Next up, your third opponent!\n" + .string "Are you ready to move on?$" + +BattleFrontier_BattleArenaBattleRoom_Text_257D88: @ 8257D88 + .string "Next up, your fourth opponent!\n" + .string "Are you ready to move on?$" + +BattleFrontier_BattleArenaBattleRoom_Text_257DC1: @ 8257DC1 + .string "Next up, your fifth opponent!\n" + .string "Are you ready to move on?$" + +BattleFrontier_BattleArenaBattleRoom_Text_257DF9: @ 8257DF9 + .string "Next up, your sixth opponent!\n" + .string "Are you ready to move on?$" + +BattleFrontier_BattleArenaBattleRoom_Text_257E31: @ 8257E31 + .string "Next up, your seventh opponent!\n" + .string "Are you ready to move on?$" + +BattleFrontier_BattleArenaBattleRoom_Text_257E6B: @ 8257E6B +FallarborTown_BattleTentBattleRoom_Text_257E6B: @ 8257E6B + .string "Would you like to save the game and\n" + .string "shut down now?$" + +BattleFrontier_BattleArenaBattleRoom_Text_257E9E: @ 8257E9E +FallarborTown_BattleTentBattleRoom_Text_257E9E: @ 8257E9E + .string "Would you like to retire from your\n" + .string "Set KO Tourney challenge?$" + +BattleFrontier_BattleArenaBattleRoom_Text_257EDB: @ 8257EDB +FallarborTown_BattleTentBattleRoom_Text_257EDB: @ 8257EDB + .string "I am saving your game data.\n" + .string "Please wait.$" + +BattleFrontier_BattleArenaBattleRoom_Text_257F04: @ 8257F04 + .string "Would you like to record your last\n" + .string "battle on your FRONTIER PASS?$" + +BattleFrontier_BattleArenaBattleRoom_Text_257F45: @ 8257F45 + .string "My dear challenger!\p" + .string "Your skill level is truly astounding!\p" + .string "We now would like you to face our\n" + .string "leader, the ARENA TYCOON!$" + +BattleFrontier_BattleArenaBattleRoom_Text_257FBB: @ 8257FBB + .string "A battle with the ARENA TYCOON!\n" + .string "Are you prepared?$" + +BattleFrontier_BattleArenaBattleRoom_Text_257FED: @ 8257FED + .string "REFEREE: The ARENA TYCOON!\n" + .string "Make way for GRETA!$" + +BattleFrontier_BattleArenaBattleRoom_Text_25801C: @ 825801C + .string "GRETA: Hey!\n" + .string "Howdy!\p" + .string "…Wait, are you the challenger?$" + +BattleFrontier_BattleArenaBattleRoom_Text_25804E: @ 825804E + .string "Is that right? Hmm…\n" + .string "Hmhm…$" + +BattleFrontier_BattleArenaBattleRoom_Text_258068: @ 8258068 + .string "I don’t know how to say it, but…\n" + .string "To put it bluntly, you look pretty weak.\l" + .string "Are you sure you’re up for me?\p" + .string "Hmm…\p" + .string "Well, all right!\n" + .string "We’ll take things easy to start with!$" + +BattleFrontier_BattleArenaBattleRoom_Text_25810D: @ 825810D + .string "Okay! Let’s see you ignite my passion\n" + .string "for battle!$" + +BattleFrontier_BattleArenaBattleRoom_Text_25813F: @ 825813F + .string "GRETA: Ow, wait a second!\n" + .string "You are tough after all!\p" + .string "I like you!\n" + .string "Let’s see your FRONTIER PASS.$" + +BattleFrontier_BattleArenaBattleRoom_Text_25819C: @ 825819C + .string "The Guts Symbol was embossed on\n" + .string "the FRONTIER PASS!$" + +BattleFrontier_BattleArenaBattleRoom_Text_2581CF: @ 82581CF + .string "Hmm…\p" + .string "It’s going to be fun the next time!\n" + .string "I’m looking forward to it!$" + +BattleFrontier_BattleArenaBattleRoom_Text_258213: @ 8258213 + .string "GRETA: Hey! Howdy!\n" + .string "You finally won your way up to me!\p" + .string "I was getting worried waiting for you!\n" + .string "I was really looking forward to seeing\l" + .string "you again!$" + +BattleFrontier_BattleArenaBattleRoom_Text_2582A2: @ 82582A2 + .string "… … …\n" + .string "So, are you ready?$" + +BattleFrontier_BattleArenaBattleRoom_Text_2582BB: @ 82582BB + .string "I won’t allow a halfhearted effort!\n" + .string "Be ready for a thrashing!$" + +BattleFrontier_BattleArenaBattleRoom_Text_2582F9: @ 82582F9 + .string "Come on, REFEREE!\n" + .string "Let’s get this started!$" + +BattleFrontier_BattleArenaBattleRoom_Text_258323: @ 8258323 + .string "GRETA: Gaaah! Blown away!\n" + .string "Let’s see your FRONTIER PASS!$" + +BattleFrontier_BattleArenaBattleRoom_Text_25835B: @ 825835B + .string "The Guts Symbol took on\n" + .string "a golden shine!$" + +BattleFrontier_BattleArenaBattleRoom_Text_258383: @ 8258383 + .string "Arrrgh!\n" + .string "This is so infuriating!\p" + .string "If we ever battle again, I won’t lose!\n" + .string "Don’t you forget it! Bye-bye!$" diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/events.inc b/data/maps/BattleFrontier_BattleArenaCorridor/events.inc new file mode 100644 index 000000000..03a2cb14d --- /dev/null +++ b/data/maps/BattleFrontier_BattleArenaCorridor/events.inc @@ -0,0 +1,6 @@ +BattleFrontier_BattleArenaCorridor_EventObjects: @ 853C8C0 + 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/BattleFrontier_BattleArenaCorridor/scripts.inc b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc new file mode 100644 index 000000000..a353379c2 --- /dev/null +++ b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc @@ -0,0 +1,90 @@ +BattleFrontier_BattleArenaCorridor_MapScripts:: @ 82573B9 + map_script 2, BattleFrontier_BattleArenaCorridor_MapScript2_2573BF + .byte 0 + +BattleFrontier_BattleArenaCorridor_MapScript2_2573BF: @ 82573BF + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaCorridor_EventScript_2573C9 + .2byte 0 + +BattleFrontier_BattleArenaCorridor_EventScript_2573C9:: @ 82573C9 + delay 16 + setvar VAR_TEMP_0, 1 + applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_25742F + applymovement 255, BattleFrontier_BattleArenaCorridor_Movement_257417 + waitmovement 0 + applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_257444 + waitmovement 0 + msgbox BattleFrontier_BattleArenaCorridor_Text_257449, 3 + applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_257446 + waitmovement 0 + applymovement 255, BattleFrontier_BattleArenaCorridor_Movement_25742C + waitmovement 0 + setvar VAR_0x8006, 0 + warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM, 255, 7, 5 + waitstate + end + +BattleFrontier_BattleArenaCorridor_Movement_257417: @ 8257417 + 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 + walk_right + set_invisible + step_end + +BattleFrontier_BattleArenaCorridor_Movement_25742F: @ 825742F + 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 + walk_in_place_fastest_left + step_end + +BattleFrontier_BattleArenaCorridor_Movement_257446: @ 8257446 + walk_up + walk_in_place_fastest_down + step_end + +BattleFrontier_BattleArenaCorridor_Text_257449: @ 8257449 + .string "Your battles shall be waged in\n" + .string "the next room. Please step in!$" + diff --git a/data/maps/BattleFrontier_BattleArenaLobby/events.inc b/data/maps/BattleFrontier_BattleArenaLobby/events.inc new file mode 100644 index 000000000..d0343228b --- /dev/null +++ b/data/maps/BattleFrontier_BattleArenaLobby/events.inc @@ -0,0 +1,17 @@ +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 + +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 + +BattleFrontier_BattleArenaLobby_MapEvents:: @ 853C8AC + map_events BattleFrontier_BattleArenaLobby_EventObjects, BattleFrontier_BattleArenaLobby_MapWarps, 0x0, BattleFrontier_BattleArenaLobby_MapBGEvents + diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc new file mode 100644 index 000000000..a376bfe22 --- /dev/null +++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc @@ -0,0 +1,638 @@ +BattleFrontier_BattleArenaLobby_MapScripts:: @ 8255C36 + map_script 2, BattleFrontier_BattleArenaLobby_MapScript2_255C55 + map_script 4, BattleFrontier_BattleArenaLobby_MapScript2_255C41 + .byte 0 + +BattleFrontier_BattleArenaLobby_MapScript2_255C41: @ 8255C41 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleArenaLobby_EventScript_255C4B + .2byte 0 + +BattleFrontier_BattleArenaLobby_EventScript_255C4B:: @ 8255C4B + setvar VAR_TEMP_1, 1 + turnobject 255, 2 + end + +BattleFrontier_BattleArenaLobby_MapScript2_255C55: @ 8255C55 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaLobby_EventScript_255C7F + map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattleArenaLobby_EventScript_255C88 + map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattleArenaLobby_EventScript_255DC0 + map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattleArenaLobby_EventScript_255CCF + map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattleArenaLobby_EventScript_255D2B + .2byte 0 + +BattleFrontier_BattleArenaLobby_EventScript_255C7F:: @ 8255C7F + setvar VAR_0x8004, 0 + special sub_81A1780 + end + +BattleFrontier_BattleArenaLobby_EventScript_255C88:: @ 8255C88 + lockall + msgbox BattleFrontier_BattleArenaLobby_Text_256811, 4 + closemessage + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 0 + special sub_81A5238 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + setvar VAR_0x8006, 0 + special sub_81A5238 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_TEMP_0, 255 + releaseall + end + +BattleFrontier_BattleArenaLobby_EventScript_255CCF:: @ 8255CCF + lockall + setvar VAR_0x8004, 10 + special sub_81A1780 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleArenaLobby_EventScript_255CF0 + msgbox BattleFrontier_BattleArenaLobby_Text_2568E7, 4 + goto BattleFrontier_BattleArenaLobby_EventScript_255CF8 + +BattleFrontier_BattleArenaLobby_EventScript_255CF0:: @ 8255CF0 + msgbox BattleFrontier_BattleArenaLobby_Text_2572D9, 4 + +BattleFrontier_BattleArenaLobby_EventScript_255CF8:: @ 8255CF8 + msgbox BattleFrontier_BattleArenaLobby_Text_257353, 4 + setvar VAR_0x8004, 11 + special sub_81A1780 + msgbox BattleFrontier_BattleArenaLobby_Text_241520, 9 + message BattleFrontier_BattleArenaLobby_Text_256931 + waitmessage + call BattleFrontier_BattleArenaLobby_EventScript_255D59 + msgbox BattleFrontier_BattleArenaLobby_Text_256A74, 4 + closemessage + setvar VAR_TEMP_0, 255 + releaseall + end + +BattleFrontier_BattleArenaLobby_EventScript_255D2B:: @ 8255D2B + lockall + message BattleFrontier_BattleArenaLobby_Text_256A2C + waitmessage + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + setvar VAR_0x8006, 0 + special sub_81A5238 + call BattleFrontier_BattleArenaLobby_EventScript_255D59 + msgbox BattleFrontier_BattleArenaLobby_Text_256A74, 4 + closemessage + setvar VAR_TEMP_0, 255 + releaseall + end + +BattleFrontier_BattleArenaLobby_EventScript_255D59:: @ 8255D59 + setvar VAR_0x8004, 8 + special sub_81A1780 + special LoadPlayerParty + special HealPlayerParty + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 0 + special sub_81A5238 + playse SE_SAVE + waitse + call BattleFrontier_BattleArenaLobby_EventScript_23E8E0 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleArenaLobby_EventScript_255DBF + message BattleFrontier_BattleArenaLobby_Text_256B19 + waitmessage + multichoicedefault 20, 8, 94, 1, 0 + switch VAR_RESULT + case 1, BattleFrontier_BattleArenaLobby_EventScript_255DBF + case 0, BattleFrontier_BattleArenaLobby_EventScript_255DBA + case 127, BattleFrontier_BattleArenaLobby_EventScript_255DBF + +BattleFrontier_BattleArenaLobby_EventScript_255DBA:: @ 8255DBA + call BattleFrontier_BattleArenaLobby_EventScript_23E8B4 + +BattleFrontier_BattleArenaLobby_EventScript_255DBF:: @ 8255DBF + return + +BattleFrontier_BattleArenaLobby_EventScript_255DC0:: @ 8255DC0 + lockall + message BattleFrontier_BattleArenaLobby_Text_256AA1 + waitmessage + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 1 + special sub_81A5238 + playse SE_SAVE + waitse + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_TEMP_0, 255 + goto BattleFrontier_BattleArenaLobby_EventScript_255F54 + +BattleFrontier_BattleArenaLobby_EventScript_255DF4:: @ 8255DF4 + lock + faceplayer + setvar VAR_FRONTIER_FACILITY, 3 + setvar VAR_0x40CE, 0 + special SavePlayerParty + msgbox BattleFrontier_BattleArenaLobby_Text_256166, 4 + +BattleFrontier_BattleArenaLobby_EventScript_255E0B:: @ 8255E0B + message BattleFrontier_BattleArenaLobby_Text_2561EA + waitmessage + multichoice 17, 6, 23, 0 + switch VAR_RESULT + case 0, BattleFrontier_BattleArenaLobby_EventScript_255E47 + case 1, BattleFrontier_BattleArenaLobby_EventScript_255F9F + case 2, BattleFrontier_BattleArenaLobby_EventScript_255FFB + case 127, BattleFrontier_BattleArenaLobby_EventScript_255FFB + +BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47 + message BattleFrontier_BattleArenaLobby_Text_256513 + waitmessage + multichoice 17, 6, 24, 0 + switch VAR_RESULT + case 2, BattleFrontier_BattleArenaLobby_EventScript_255FFB + case 127, BattleFrontier_BattleArenaLobby_EventScript_255FFB + setvar VAR_0x8004, 15 + special sub_81A1780 + compare VAR_0x8004, 1 + goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FAC + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + copyvar VAR_0x8006, VAR_RESULT + special sub_81A1780 + msgbox BattleFrontier_BattleArenaLobby_Text_256573, 4 + fadescreen 1 + call BattleFrontier_BattleArenaLobby_EventScript_23F2B7 + copyvar VAR_0x8004, VAR_RESULT + setvar VAR_0x8005, 3 + special sub_80F9490 + waitstate + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FF8 + msgbox BattleFrontier_BattleArenaLobby_Text_2564CE, 5 + switch VAR_RESULT + case 0, BattleFrontier_BattleArenaLobby_EventScript_255FF8 + case 1, BattleFrontier_BattleArenaLobby_EventScript_255EE8 + case 127, BattleFrontier_BattleArenaLobby_EventScript_255FF8 + +BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8 + setvar VAR_TEMP_0, 0 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 4 + special sub_81A1780 + setvar VAR_0x8004, 0 + special sub_81A5238 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + setvar VAR_0x8006, 1 + special sub_81A5238 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 1 + special sub_81A1780 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 0 + special sub_81A1780 + special LoadPlayerParty + closemessage + delay 2 + call BattleFrontier_BattleArenaLobby_EventScript_27134F + setvar VAR_TEMP_0, 255 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FE1 + +BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54 + special SavePlayerParty + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 3 + special sub_81A1780 + msgbox BattleFrontier_BattleArenaLobby_Text_2567E6, 4 + closemessage + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + special sub_81A1780 + compare VAR_RESULT, 0 + call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256005 + compare VAR_RESULT, 1 + call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256050 + warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR, 255, 9, 13 + setvar VAR_TEMP_0, 0 + waitstate + end + +BattleFrontier_BattleArenaLobby_EventScript_255F9F:: @ 8255F9F + msgbox BattleFrontier_BattleArenaLobby_Text_25624C, 4 + goto BattleFrontier_BattleArenaLobby_EventScript_255E0B + +BattleFrontier_BattleArenaLobby_EventScript_255FAC:: @ 8255FAC + switch VAR_RESULT + case 0, BattleFrontier_BattleArenaLobby_EventScript_255FC7 + case 1, BattleFrontier_BattleArenaLobby_EventScript_255FD4 + +BattleFrontier_BattleArenaLobby_EventScript_255FC7:: @ 8255FC7 + msgbox BattleFrontier_BattleArenaLobby_Text_2566A8, 4 + goto BattleFrontier_BattleArenaLobby_EventScript_256003 + +BattleFrontier_BattleArenaLobby_EventScript_255FD4:: @ 8255FD4 + msgbox BattleFrontier_BattleArenaLobby_Text_2565A5, 4 + goto BattleFrontier_BattleArenaLobby_EventScript_256003 + +BattleFrontier_BattleArenaLobby_EventScript_255FE1:: @ 8255FE1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 0 + special sub_81A1780 + goto BattleFrontier_BattleArenaLobby_EventScript_255FFB + +BattleFrontier_BattleArenaLobby_EventScript_255FF8:: @ 8255FF8 + special LoadPlayerParty + +BattleFrontier_BattleArenaLobby_EventScript_255FFB:: @ 8255FFB + msgbox BattleFrontier_BattleArenaLobby_Text_25621F, 4 + +BattleFrontier_BattleArenaLobby_EventScript_256003:: @ 8256003 + release + end + +BattleFrontier_BattleArenaLobby_EventScript_256005:: @ 8256005 + applymovement 1, BattleFrontier_BattleArenaLobby_Movement_256034 + applymovement 255, BattleFrontier_BattleArenaLobby_Movement_256041 + waitmovement 0 + opendoor 2, 2 + waitdooranim + applymovement 1, BattleFrontier_BattleArenaLobby_Movement_25603E + applymovement 255, BattleFrontier_BattleArenaLobby_Movement_25604C + waitmovement 0 + closedoor 2, 2 + waitdooranim + return + +BattleFrontier_BattleArenaLobby_Movement_256034: @ 8256034 + 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 + walk_up + set_invisible + step_end + +BattleFrontier_BattleArenaLobby_Movement_256041: @ 8256041 + 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 + walk_up + walk_up + set_invisible + step_end + +BattleFrontier_BattleArenaLobby_EventScript_256050:: @ 8256050 + applymovement 1, BattleFrontier_BattleArenaLobby_Movement_25607F + applymovement 255, BattleFrontier_BattleArenaLobby_Movement_256088 + waitmovement 0 + opendoor 11, 2 + waitdooranim + applymovement 1, BattleFrontier_BattleArenaLobby_Movement_25603E + applymovement 255, BattleFrontier_BattleArenaLobby_Movement_25604C + waitmovement 0 + closedoor 11, 2 + waitdooranim + return + +BattleFrontier_BattleArenaLobby_Movement_25607F: @ 825607F + walk_up + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_up + step_end + +BattleFrontier_BattleArenaLobby_Movement_256088: @ 8256088 + 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 + lockall + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 3 + special sub_81A1780 + waitbuttonpress + special RemoveRecordsWindow + releaseall + end + +BattleFrontier_BattleArenaLobby_EventScript_2560A6:: @ 82560A6 + msgbox BattleFrontier_BattleArenaLobby_Text_256B5C, 2 + end + +BattleFrontier_BattleArenaLobby_EventScript_2560AF:: @ 82560AF + msgbox BattleFrontier_BattleArenaLobby_Text_256BCB, 2 + end + +BattleFrontier_BattleArenaLobby_EventScript_2560B8:: @ 82560B8 + msgbox BattleFrontier_BattleArenaLobby_Text_256C19, 2 + end + +BattleFrontier_BattleArenaLobby_EventScript_2560C1:: @ 82560C1 + msgbox BattleFrontier_BattleArenaLobby_Text_256C9A, 2 + end + +BattleFrontier_BattleArenaLobby_EventScript_2560CA:: @ 82560CA + lockall + msgbox BattleFrontier_BattleArenaLobby_Text_256DB8, 4 + goto BattleFrontier_BattleArenaLobby_EventScript_2560D9 + end + +BattleFrontier_BattleArenaLobby_EventScript_2560D9:: @ 82560D9 + message BattleFrontier_BattleArenaLobby_Text_256DDF + waitmessage + multichoice 17, 2, 96, 0 + switch VAR_RESULT + case 0, BattleFrontier_BattleArenaLobby_EventScript_25612C + case 1, BattleFrontier_BattleArenaLobby_EventScript_25613A + case 2, BattleFrontier_BattleArenaLobby_EventScript_256148 + case 3, BattleFrontier_BattleArenaLobby_EventScript_256156 + case 4, BattleFrontier_BattleArenaLobby_EventScript_256164 + case 127, BattleFrontier_BattleArenaLobby_EventScript_256164 + end + +BattleFrontier_BattleArenaLobby_EventScript_25612C:: @ 825612C + msgbox BattleFrontier_BattleArenaLobby_Text_256E02, 4 + goto BattleFrontier_BattleArenaLobby_EventScript_2560D9 + end + +BattleFrontier_BattleArenaLobby_EventScript_25613A:: @ 825613A + msgbox BattleFrontier_BattleArenaLobby_Text_256F43, 4 + goto BattleFrontier_BattleArenaLobby_EventScript_2560D9 + end + +BattleFrontier_BattleArenaLobby_EventScript_256148:: @ 8256148 + msgbox BattleFrontier_BattleArenaLobby_Text_256FF2, 4 + goto BattleFrontier_BattleArenaLobby_EventScript_2560D9 + end + +BattleFrontier_BattleArenaLobby_EventScript_256156:: @ 8256156 + msgbox BattleFrontier_BattleArenaLobby_Text_257202, 4 + goto BattleFrontier_BattleArenaLobby_EventScript_2560D9 + end + +BattleFrontier_BattleArenaLobby_EventScript_256164:: @ 8256164 + releaseall + end + +BattleFrontier_BattleArenaLobby_Text_256166: @ 8256166 + .string "Where the battling spirit of TRAINERS\n" + .string "is put to the test!\p" + .string "I welcome you to the BATTLE ARENA!\p" + .string "I am your guide to the Set KO Tourney!$" + +BattleFrontier_BattleArenaLobby_Text_2561EA: @ 82561EA + .string "Now, do you wish to take\n" + .string "the BATTLE ARENA challenge?$" + +BattleFrontier_BattleArenaLobby_Text_25621F: @ 825621F + .string "We await your challenge on\n" + .string "another occasion!$" + +BattleFrontier_BattleArenaLobby_Text_25624C: @ 825624C + .string "In the BATTLE ARENA, we undertake\n" + .string "the Set KO Tourney.\p" + .string "All participants enter with a team of\n" + .string "three POKéMON.\p" + .string "The three POKéMON must be lined up in\n" + .string "the order in which they are to appear.\p" + .string "During battle, the POKéMON will appear\n" + .string "one at a time in the preset order.\p" + .string "Once a POKéMON enters battle, it must\n" + .string "remain out until the match is decided.\p" + .string "If a match remains undecided in\n" + .string "three turns, it goes to judging.\p" + .string "If you wish to interrupt your challenge,\n" + .string "please save the game.\p" + .string "If you don’t save, you will not be able\n" + .string "to continue with your challenge.\p" + .string "If you pull off the feat of beating\n" + .string "seven TRAINERS in succession,\l" + .string "we will present you with Battle Points.$" + +BattleFrontier_BattleArenaLobby_Text_2564CE: @ 82564CE + .string "Before showing you to the BATTLE\n" + .string "ARENA, you must save. Is that okay?$" + +BattleFrontier_BattleArenaLobby_Text_256513: @ 8256513 + .string "The BATTLE ARENA offers two levels\n" + .string "of challenge, Level 50 and Open Level.\l" + .string "Which is your choice?$" + +BattleFrontier_BattleArenaLobby_Text_256573: @ 8256573 + .string "Very well, now select your\n" + .string "three POKéMON, please.$" + +BattleFrontier_BattleArenaLobby_Text_2565A5: @ 82565A5 + .string "My dear challenger!\p" + .string "You do not have the three POKéMON\n" + .string "required for entry.\p" + .string "To qualify, you must bring three\n" + .string "different kinds of POKéMON.\p" + .string "They also must not hold the same\n" + .string "kinds of items.\p" + .string "EGGS{STR_VAR_1} ineligible.\p" + .string "When you have made your preparations,\n" + .string "please do return.$" + +BattleFrontier_BattleArenaLobby_Text_2566A8: @ 82566A8 + .string "My dear challenger!\p" + .string "You do not have the three POKéMON\n" + .string "required for entry.\p" + .string "To qualify, you must bring three\n" + .string "different kinds of POKéMON.\p" + .string "The three different POKéMON\n" + .string "must all be Level 50 or lower.\p" + .string "They also must not hold the same\n" + .string "kinds of items.\p" + .string "EGGS{STR_VAR_1} ineligible.\p" + .string "When you have made your preparations,\n" + .string "please do return.$" + +BattleFrontier_BattleArenaLobby_Text_2567E6: @ 82567E6 + .string "I shall now guide you to\n" + .string "the BATTLE ARENA.$" + +BattleFrontier_BattleArenaLobby_Text_256811: @ 8256811 + .string "My dear challenger!\p" + .string "You did not save the game before\n" + .string "shutting down, did you?\p" + .string "It is unfortunate, but that has\n" + .string "resulted in your disqualification\l" + .string "from your challenge.\p" + .string "You may, of course, start with a fresh\n" + .string "challenge.$" + +BattleFrontier_BattleArenaLobby_Text_2568E7: @ 82568E7 + .string "We congratulate you for your splendid\n" + .string "string of wins over seven TRAINERS!$" + +BattleFrontier_BattleArenaLobby_Text_256931: @ 8256931 + .string "Your achievement will be recorded.\n" + .string "Please wait while I save the game.$" + +BattleFrontier_BattleArenaLobby_Text_256977: @ 8256977 + .string "In commemoration of your 7-win streak,\n" + .string "we present you with this prize.$" + +BattleFrontier_BattleArenaLobby_Text_2569BE: @ 82569BE + .string "{PLAYER} received the prize\n" + .string "{STR_VAR_1}.$" + +BattleFrontier_BattleArenaLobby_Text_2569D8: @ 82569D8 + .string "Oh?\n" + .string "Your BAG seems to be full.\p" + .string "I urge you to clear space and\n" + .string "return for your prize.$" + +BattleFrontier_BattleArenaLobby_Text_256A2C: @ 8256A2C + .string "Thank you so much for participating!\p" + .string "Please wait while I save the game.$" + +BattleFrontier_BattleArenaLobby_Text_256A74: @ 8256A74 + .string "We await your challenge on\n" + .string "another occasion!$" + +BattleFrontier_BattleArenaLobby_Text_256AA1: @ 8256AA1 + .string "We have been looking forward to\n" + .string "your arrival.\p" + .string "Before I show you to the BATTLE\n" + .string "ARENA, I must save the game.\l" + .string "Please wait.$" + +BattleFrontier_BattleArenaLobby_Text_256B19: @ 8256B19 + .string "Shall I record your last BATTLE ARENA\n" + .string "match on your FRONTIER PASS?$" + +BattleFrontier_BattleArenaLobby_Text_256B5C: @ 8256B5C + .string "I lost on the REFEREE’s decision…\p" + .string "I don’t think it was a good idea to only\n" + .string "use defensive moves and not attack…$" + +BattleFrontier_BattleArenaLobby_Text_256BCB: @ 8256BCB + .string "I won in judging!\p" + .string "Landing hits consistently on\n" + .string "the opponent’s POKéMON worked!$" + +BattleFrontier_BattleArenaLobby_Text_256C19: @ 8256C19 + .string "Our match was declared a draw.\p" + .string "When we ran out of time, both my\n" + .string "POKéMON and the opponent’s had about\l" + .string "the same amount of HP left.$" + +BattleFrontier_BattleArenaLobby_Text_256C9A: @ 8256C9A + .string "In the BATTLE ARENA, the order of\n" + .string "POKéMON is totally important.\p" + .string "For example, if your first POKéMON\n" + .string "has certain type disadvantages,\l" + .string "try making your second POKéMON one\l" + .string "with moves that are super effective\l" + .string "against the first one.\p" + .string "I think that will be a good way of\n" + .string "making an effective team.$" + +BattleFrontier_BattleArenaLobby_Text_256DB8: @ 8256DB8 +FallarborTown_BattleTentLobby_Text_256DB8: @ 8256DB8 + .string "The Set KO Tourney’s rules are listed.$" + +BattleFrontier_BattleArenaLobby_Text_256DDF: @ 8256DDF +FallarborTown_BattleTentLobby_Text_256DDF: @ 8256DDF + .string "Which heading do you want to read?$" + +BattleFrontier_BattleArenaLobby_Text_256E02: @ 8256E02 +FallarborTown_BattleTentLobby_Text_256E02: @ 8256E02 + .string "The Set KO Tourney has special rules,\n" + .string "unlike standard battles.\p" + .string "First, one battle lasts only\n" + .string "three turns.\p" + .string "If the outcome is not decided after\n" + .string "three turns, it goes to judging.\p" + .string "The REFEREE will choose the winner\n" + .string "based on how the POKéMON battled.\p" + .string "Also, a POKéMON cannot be switched out\n" + .string "until its battle’s outcome is decided.$" + +BattleFrontier_BattleArenaLobby_Text_256F43: @ 8256F43 +FallarborTown_BattleTentLobby_Text_256F43: @ 8256F43 + .string "The first judging factor is “Mind.â€\n" + .string "This factor evaluates how aggressive\l" + .string "the battlers were.\p" + .string "The judging is based on how often\n" + .string "the TRAINERS ordered the use of\l" + .string "offensive moves.$" + +BattleFrontier_BattleArenaLobby_Text_256FF2: @ 8256FF2 +FallarborTown_BattleTentLobby_Text_256FF2: @ 8256FF2 + .string "The second judging factor is “Skill.â€\n" + .string "This factor evaluates how effectively\l" + .string "POKéMON moves were used.\p" + .string "If a move worked successfully,\n" + .string "the Skill rating goes up.\p" + .string "If a move failed, the Skill rating\n" + .string "is lowered.\p" + .string "If it was an offensive move, the Skill\n" + .string "rating goes up if the move was “super\l" + .string "effective†and goes down if it was\l" + .string "“not very effective.â€\p" + .string "The Skill rating will not go up for\n" + .string "moves such as PROTECT and DETECT.\p" + .string "If the opponent used PROTECT or\n" + .string "DETECT, and your POKéMON failed to\l" + .string "hit with a move, its Skill rating will not\l" + .string "go down.$" + +BattleFrontier_BattleArenaLobby_Text_257202: @ 8257202 +FallarborTown_BattleTentLobby_Text_257202: @ 8257202 + .string "The third judging factor is “Body.â€\n" + .string "This factor is based on how much HP\l" + .string "remained at the end of a battle.\p" + .string "The rating takes into account how much\n" + .string "HP a POKéMON had at the start of\l" + .string "battle, and what remained at the end.$" + +BattleFrontier_BattleArenaLobby_Text_2572D9: @ 82572D9 + .string "A victory snatched from the ARENA\n" + .string "TYCOON, and a seven-TRAINER sweep!\p" + .string "We congratulate you on your most\n" + .string "splendid challenge!$" + +BattleFrontier_BattleArenaLobby_Text_257353: @ 8257353 + .string "My dear challenger, in recognition of\n" + .string "your indefatigable spirit, please\l" + .string "accept these Battle Point(s).$" diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc new file mode 100644 index 000000000..2500a826b --- /dev/null +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc @@ -0,0 +1,20 @@ +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 + +BattleFrontier_BattleDomeBattleRoom_MapEvents:: @ 853C32C + map_events BattleFrontier_BattleDomeBattleRoom_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc new file mode 100644 index 000000000..e853afda0 --- /dev/null +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -0,0 +1,1277 @@ +BattleFrontier_BattleDomeBattleRoom_MapScripts:: @ 824BC9C + map_script 3, BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1 + map_script 2, BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00 + map_script 4, BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481 + map_script 5, BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0 + .byte 0 + +BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1 + setvar VAR_0x8004, 10 + special sub_818E9AC + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special sub_81A1780 + copyvar VAR_TEMP_F, VAR_RESULT + compare VAR_RESULT, 0 + call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C919 + call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC + end + +BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC:: @ 824BCDC +BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC:: @ 824BCDC + checkplayergender + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4:: @ 824BCF4 + setvar VAR_OBJ_GFX_ID_1, 100 + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA:: @ 824BCFA + setvar VAR_OBJ_GFX_ID_1, 105 + return + +BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00: @ 824BD00 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A + .2byte 0 + +BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A:: @ 824BD0A + lockall + call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD + compare VAR_RESULT, 0 + call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C938 + applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4 + waitmovement 0 + call BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C970, 4 + closemessage + 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 + goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD5A + +BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E:: @ 824BD4E + applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C775 + goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BD61 + +BattleFrontier_BattleDomeBattleRoom_EventScript_24BD5A:: @ 824BD5A + applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C77F + +BattleFrontier_BattleDomeBattleRoom_EventScript_24BD61:: @ 824BD61 + playse SE_W227B + call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E + waitmovement 0 + compare VAR_TEMP_F, 3 + goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82 + compare VAR_TEMP_E, 0 + goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB + +BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82 + setvar VAR_0x8004, 4 + special sub_818E9AC + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C990, 4 + closemessage + applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C77B + applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C789 + waitmovement 0 + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 0 + special sub_8161F74 + msgbox 0x2021fc4, 4 + closemessage + setvar VAR_0x8004, 5 + special sub_818E9AC + call BattleFrontier_BattleDomeBattleRoom_EventScript_24C440 + setvar VAR_TEMP_2, 0 + switch VAR_RESULT + case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0 + case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F + case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F + setvar VAR_TEMP_2, 1 + +BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7:: @ 824BDF7 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA86, 4 + closemessage + playse SE_W227B + call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E + delay 60 + applymovement 9, BattleFrontier_BattleDomeBattleRoom_Movement_24C964 + waitmovement 0 + applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_24C969 + waitmovement 0 + delay 180 + applymovement 9, BattleFrontier_BattleDomeBattleRoom_Movement_24C96B + waitmovement 0 + compare VAR_TEMP_2, 2 + goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F + setvar VAR_0x8004, 19 + special sub_818E9AC + switch VAR_RESULT + case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0 + +BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F + applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4 + waitmovement 0 + setvar VAR_0x8004, 4 + special sub_818E9AC + compare VAR_TEMP_2, 0 + call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1 + compare VAR_TEMP_2, 1 + call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEC5 + compare VAR_TEMP_2, 2 + call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BED9 + playse SE_W227B + call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E + delay 60 + +BattleFrontier_BattleDomeBattleRoom_EventScript_24BE8D:: @ 824BE8D + setvar VAR_0x8004, 12 + setvar VAR_0x8005, 2 + special sub_818E9AC + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A:: @ 824BE9A + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 4 + special sub_81A1780 + goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5 +@ goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5 + +BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1:: @ 824BEB1 + setvar VAR_0x8004, 20 + setvar VAR_0x8005, 1 + special sub_81A1780 + message BattleFrontier_BattleDomeBattleRoom_Text_24C9E1 + waitmessage + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24BEC5:: @ 824BEC5 + setvar VAR_0x8004, 20 + setvar VAR_0x8005, 0 + special sub_81A1780 + message BattleFrontier_BattleDomeBattleRoom_Text_24CB34 + waitmessage + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24BED9:: @ 824BED9 + message BattleFrontier_BattleDomeBattleRoom_Text_24D6BE + waitmessage + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0 + applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4 + waitmovement 0 + compare VAR_TEMP_2, 0 + call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3 + compare VAR_TEMP_2, 1 + call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BFCC + playse SE_W227B + call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E + delay 60 + setvar VAR_0x8004, 3 + special sub_818E9AC + setvar VAR_0x8004, 12 + setvar VAR_0x8005, 1 + special sub_818E9AC + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special sub_81A1780 + addvar VAR_RESULT, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + copyvar VAR_0x8006, VAR_RESULT + special sub_81A1780 + switch VAR_RESULT + case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 + setvar VAR_0x8006, 1 + warp MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 3 + waitstate + +BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62:: @ 824BF62 + applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C77D + waitmovement 0 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + special sub_81A1780 + switch VAR_RESULT + case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF96 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA04, 4 + goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF9E + +BattleFrontier_BattleDomeBattleRoom_EventScript_24BF96:: @ 824BF96 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA44, 4 + +BattleFrontier_BattleDomeBattleRoom_EventScript_24BF9E:: @ 824BF9E + special sub_8175280 + playse SE_W227B + call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E + delay 60 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 3 + special sub_81A1780 + goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5 + +BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3:: @ 824BFC3 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C9BE, 4 + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24BFCC:: @ 824BFCC + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CB9D, 4 + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5:: @ 824BFD5 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 6 + special sub_818E9AC + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C023 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 7 + special sub_818E9AC + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C076 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + special sub_818E9AC + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C16A + goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C9 + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C023:: @ 824C023 + call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD + switch VAR_RESULT + case 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24C05A + case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C061 + case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C068 + case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C06F + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C05A:: @ 824C05A + message BattleFrontier_BattleDomeBattleRoom_Text_24CC06 + waitmessage + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C061:: @ 824C061 + message BattleFrontier_BattleDomeBattleRoom_Text_24CC1C + waitmessage + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C068:: @ 824C068 + message BattleFrontier_BattleDomeBattleRoom_Text_24CC2E + waitmessage + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C06F:: @ 824C06F + message BattleFrontier_BattleDomeBattleRoom_Text_24CC5B + waitmessage + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C076:: @ 824C076 + call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD + switch VAR_RESULT + case 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24C0AD + case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C0B4 + case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C0BB + case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C2 + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C0AD:: @ 824C0AD + message BattleFrontier_BattleDomeBattleRoom_Text_24CC99 + waitmessage + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C0B4:: @ 824C0B4 + message BattleFrontier_BattleDomeBattleRoom_Text_24CCC5 + waitmessage + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C0BB:: @ 824C0BB + message BattleFrontier_BattleDomeBattleRoom_Text_24CCFD + waitmessage + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C2:: @ 824C0C2 + message BattleFrontier_BattleDomeBattleRoom_Text_24CD33 + waitmessage + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C9:: @ 824C0C9 + compare VAR_TEMP_F, 3 + goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C105 + switch VAR_TEMP_E + case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C158 + case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C161 + case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C158 + case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24C161 + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C105:: @ 824C105 + call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD + switch VAR_RESULT + case 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24C13C + case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C143 + case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C14A + case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C151 + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C13C:: @ 824C13C + message BattleFrontier_BattleDomeBattleRoom_Text_24CD72 + waitmessage + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C143:: @ 824C143 + message BattleFrontier_BattleDomeBattleRoom_Text_24CD8C + waitmessage + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C14A:: @ 824C14A + message BattleFrontier_BattleDomeBattleRoom_Text_24CDB3 + waitmessage + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C151:: @ 824C151 + message BattleFrontier_BattleDomeBattleRoom_Text_24CDDE + waitmessage + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C158:: @ 824C158 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CEBE, 4 + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C161:: @ 824C161 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D232, 4 + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C16A:: @ 824C16A + call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD + switch VAR_RESULT + case 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1A1 + case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1A8 + case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1AF + case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1B6 + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C1A1:: @ 824C1A1 + message BattleFrontier_BattleDomeBattleRoom_Text_24CE10 + waitmessage + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C1A8:: @ 824C1A8 + message BattleFrontier_BattleDomeBattleRoom_Text_24CE33 + waitmessage + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C1AF:: @ 824C1AF + message BattleFrontier_BattleDomeBattleRoom_Text_24CE57 + waitmessage + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C1B6:: @ 824C1B6 + message BattleFrontier_BattleDomeBattleRoom_Text_24CE94 + waitmessage + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD:: @ 824C1BD + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special sub_81A1780 + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB:: @ 824C1CB + switch VAR_TEMP_E + case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1FC + case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C209 + case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1FC + case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24C209 + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C1FC:: @ 824C1FC + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CEDE, 4 + goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C211 + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C209:: @ 824C209 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D26C, 4 + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C211:: @ 824C211 + closemessage + applymovement 2, BattleFrontier_BattleDomeBattleRoom_Movement_24C94B + applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_24C7F9 + applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C78E + playse SE_W227B + call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E + waitse + playse SE_W227B + call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E + waitse + playse SE_W227B + call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E + waitse + playse SE_W227B + call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E + waitse + playse SE_W227B + call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E + waitse + waitmovement 0 + message BattleFrontier_BattleDomeBattleRoom_Text_24CF7A + waitmessage + playse SE_W227B + call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E + waitse + switch VAR_TEMP_E + case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C346 + case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9 + case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 7 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CFAE, 4 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 7 + special sub_81A1780 + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0D9, 4 + call BattleFrontier_BattleDomeBattleRoom_EventScript_24C400 + switch VAR_RESULT + case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420 + case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420 + case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C436 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, 4 + setvar VAR_0x8004, 12 + setvar VAR_0x8005, 1 + special sub_818E9AC + setvar VAR_0x8004, 12 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 + closemessage + applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B + waitmovement 0 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D172, 4 + playfanfare MUS_ME_SYMBOLGET + message BattleFrontier_BattleDomeBattleRoom_Text_24D1AA + waitmessage + waitfanfare + setvar VAR_0x8004, 13 + special sub_81A1780 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D1E0, 4 + goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C346:: @ 824C346 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 7 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D319, 4 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 7 + special sub_81A1780 + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D43E, 4 + call BattleFrontier_BattleDomeBattleRoom_EventScript_24C400 + switch VAR_RESULT + case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420 + case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420 + case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C436 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, 4 + setvar VAR_0x8004, 12 + setvar VAR_0x8005, 1 + special sub_818E9AC + setvar VAR_0x8004, 12 + special sub_81A1780 + compare VAR_RESULT, 2 + goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 + closemessage + applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B + waitmovement 0 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D47F, 4 + playfanfare MUS_ME_SYMBOLGET + message BattleFrontier_BattleDomeBattleRoom_Text_24D522 + waitmessage + waitfanfare + setvar VAR_0x8004, 13 + special sub_81A1780 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D54D, 4 + goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C400:: @ 824C400 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D677, 4 + closemessage + applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C787 + applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C829 + waitmovement 0 + call BattleFrontier_BattleDomeBattleRoom_EventScript_24C440 + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C420:: @ 824C420 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D127, 4 + playse SE_W227B + call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E + waitse + goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BE8D + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C436:: @ 824C436 + setvar VAR_TEMP_2, 2 + goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7 + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 6 + setvar VAR_0x8006, 0 + special sub_81A1780 + special HealPlayerParty + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 0 + setvar VAR_TEMP_9, 1 + special sub_8163AC4 + waitstate + setvar VAR_TEMP_9, 0 + setvar VAR_0x8004, 17 + special sub_818E9AC + special HealPlayerParty + setvar VAR_0x8004, 16 + special sub_818E9AC + return + +BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481: @ 824C481 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B + .2byte 0 + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B:: @ 824C48B + hideobjectat 13, MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM + call BattleFrontier_BattleDomeBattleRoom_EventScript_24C502 + call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC + setvar VAR_TEMP_1, 1 + applymovement 255, BattleFrontier_BattleDomeBattleRoom_Movement_24C773 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special sub_81A1780 + compare VAR_RESULT, 3 + goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF + setvar VAR_0x8004, 9 + special sub_81A1780 + copyvar VAR_TEMP_E, VAR_RESULT + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF + call BattleFrontier_BattleDomeBattleRoom_EventScript_242170 + setobjectxyperm 15, 13, 9 + removeobject 15 + addobject 15 + applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C78B + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF:: @ 824C4EF + end + +BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0: @ 824C4F0 + compare VAR_TEMP_9, 1 + call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC + end + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC:: @ 824C4FC + call BattleFrontier_BattleDomeBattleRoom_EventScript_24C502 + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C502:: @ 824C502 + compare VAR_TEMP_F, 0 + call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F + compare VAR_TEMP_F, 1 + call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C530 + compare VAR_TEMP_F, 2 + call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C594 + compare VAR_TEMP_F, 3 + call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C652 + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F:: @ 824C52F + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C530:: @ 824C530 + createvobject 46, 1, 3, 0, 3, 1 + createvobject 22, 4, 6, 0, 3, 1 + createvobject 5, 6, 8, 0, 3, 1 + createvobject 12, 9, 11, 0, 3, 1 + createvobject 46, 11, 13, 0, 3, 1 + createvobject 66, 13, 15, 0, 3, 1 + createvobject 45, 19, 7, 1, 3, 1 + createvobject 34, 22, 11, 1, 3, 1 + createvobject 11, 25, 15, 1, 3, 1 + createvobject 35, 26, 2, 2, 3, 1 + createvobject 38, 29, 5, 1, 3, 1 + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C594:: @ 824C594 + createvobject 46, 1, 3, 0, 3, 1 + createvobject 22, 4, 6, 0, 3, 1 + createvobject 5, 6, 8, 0, 3, 1 + createvobject 20, 7, 9, 0, 3, 1 + createvobject 12, 9, 11, 0, 3, 1 + createvobject 47, 10, 12, 0, 3, 1 + createvobject 46, 11, 13, 0, 3, 1 + createvobject 66, 13, 15, 0, 3, 1 + createvobject 48, 15, 2, 1, 3, 1 + createvobject 5, 16, 3, 1, 3, 1 + createvobject 20, 17, 4, 1, 3, 1 + createvobject 45, 19, 7, 1, 3, 1 + createvobject 22, 20, 9, 1, 3, 1 + createvobject 34, 22, 11, 1, 3, 1 + createvobject 46, 23, 13, 1, 3, 1 + createvobject 11, 25, 15, 1, 3, 1 + createvobject 35, 26, 2, 2, 3, 1 + createvobject 40, 28, 5, 2, 3, 1 + createvobject 38, 29, 5, 1, 3, 1 + createvobject 83, 30, 6, 2, 3, 1 + createvobject 34, 31, 8, 2, 3, 1 + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C652:: @ 824C652 + createvobject 5, 0, 2, 0, 3, 1 + createvobject 46, 1, 3, 0, 3, 1 + createvobject 45, 2, 15, 0, 3, 1 + createvobject 66, 3, 5, 0, 3, 1 + createvobject 22, 4, 6, 0, 3, 1 + createvobject 46, 5, 7, 0, 3, 1 + createvobject 5, 6, 8, 0, 3, 1 + createvobject 20, 7, 9, 0, 3, 1 + createvobject 24, 8, 10, 0, 3, 1 + createvobject 12, 9, 11, 0, 3, 1 + createvobject 47, 10, 12, 0, 3, 1 + createvobject 46, 11, 13, 0, 3, 1 + createvobject 45, 12, 14, 0, 3, 1 + createvobject 66, 13, 15, 2, 3, 1 + createvobject 55, 14, 12, 2, 3, 1 + createvobject 48, 15, 2, 1, 3, 1 + createvobject 5, 16, 3, 1, 3, 1 + createvobject 20, 17, 4, 1, 3, 1 + createvobject 24, 18, 6, 1, 3, 1 + createvobject 45, 19, 7, 1, 3, 1 + createvobject 22, 20, 9, 1, 3, 1 + createvobject 23, 21, 10, 1, 3, 1 + createvobject 34, 22, 11, 1, 3, 1 + createvobject 46, 23, 13, 1, 3, 1 + createvobject 48, 24, 14, 1, 3, 1 + createvobject 11, 25, 15, 1, 3, 1 + createvobject 35, 26, 2, 2, 3, 1 + createvobject 17, 27, 3, 2, 3, 1 + createvobject 40, 28, 5, 2, 3, 1 + createvobject 38, 29, 5, 1, 3, 1 + createvobject 83, 30, 6, 2, 3, 1 + createvobject 34, 31, 8, 2, 3, 1 + return + +BattleFrontier_BattleArenaBattleRoom_Movement_24C773: @ 824C773 +BattleFrontier_BattleDomeBattleRoom_Movement_24C773: @ 824C773 + set_invisible + step_end + +BattleFrontier_BattleDomeBattleRoom_Movement_24C775: @ 824C775 + set_visible + delay_16 + walk_up + walk_up + walk_up + walk_right + +BattleFrontier_BattleDomeBattleRoom_Movement_24C77B: @ 824C77B + walk_right + step_end + +BattleFrontier_BattleDomeBattleRoom_Movement_24C77D: @ 824C77D + walk_up + step_end + +BattleFrontier_BattleDomeBattleRoom_Movement_24C77F: @ 824C77F + set_visible + delay_16 + walk_up + walk_up + walk_up + walk_right + walk_right + step_end + +BattleFrontier_BattleDomeBattleRoom_Movement_24C787: @ 824C787 + walk_right + step_end + +BattleFrontier_BattleDomeBattleRoom_Movement_24C789: @ 824C789 + walk_left + step_end + +BattleFrontier_BattleDomeBattleRoom_Movement_24C78B: @ 824C78B + face_up + set_invisible + step_end + +BattleFrontier_BattleDomeBattleRoom_Movement_24C78E: @ 824C78E + 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 + 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 + walk_left + step_end + +BattleFrontier_BattleDomeBattleRoom_Movement_24C82B: @ 824C82B + walk_left + walk_left + step_end + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E:: @ 824C82E + turnvobject 0, 4 + turnvobject 2, 4 + turnvobject 4, 4 + turnvobject 6, 4 + turnvobject 8, 4 + turnvobject 10, 3 + turnvobject 12, 3 + turnvobject 14, 3 + turnvobject 16, 3 + turnvobject 18, 3 + turnvobject 20, 4 + turnvobject 22, 4 + turnvobject 24, 4 + turnvobject 26, 4 + turnvobject 28, 4 + turnvobject 30, 4 + delay 20 + turnvobject 0, 1 + turnvobject 2, 1 + turnvobject 4, 1 + turnvobject 6, 1 + turnvobject 8, 1 + turnvobject 10, 1 + turnvobject 12, 1 + turnvobject 14, 1 + turnvobject 16, 1 + turnvobject 18, 1 + turnvobject 20, 1 + turnvobject 22, 1 + turnvobject 24, 1 + turnvobject 26, 1 + turnvobject 28, 1 + turnvobject 30, 1 + delay 20 + turnvobject 1, 4 + turnvobject 3, 4 + turnvobject 5, 4 + turnvobject 7, 4 + turnvobject 9, 4 + turnvobject 11, 3 + turnvobject 13, 3 + turnvobject 15, 3 + turnvobject 17, 3 + turnvobject 19, 3 + turnvobject 21, 4 + turnvobject 23, 4 + turnvobject 25, 4 + turnvobject 27, 3 + turnvobject 31, 3 + delay 20 + turnvobject 1, 1 + turnvobject 3, 1 + turnvobject 5, 1 + turnvobject 7, 1 + turnvobject 9, 1 + turnvobject 11, 1 + turnvobject 13, 1 + turnvobject 15, 1 + turnvobject 17, 1 + turnvobject 19, 1 + turnvobject 21, 1 + turnvobject 23, 1 + turnvobject 25, 1 + turnvobject 27, 1 + turnvobject 31, 1 + delay 20 + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5:: @ 824C8F5 +BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5:: @ 824C8F5 + copyvar VAR_RESULT, VAR_0x40CE + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F + warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 5, 11 + waitstate + end + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F:: @ 824C90F + warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 17, 11 + waitstate + end + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C919:: @ 824C919 + random 2 + copyvar VAR_TEMP_D, VAR_RESULT + compare VAR_TEMP_D, 0 + goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E + setobjectxyperm 6, 2, 0 + setobjectmovementtype 6, 10 + return + +BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938 + compare VAR_TEMP_D, 0 + goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E + applymovement 6, BattleFrontier_BattleDomeBattleRoom_Movement_24C95E + return + +BattleFrontier_BattleDomeBattleRoom_Movement_24C94B: @ 824C94B + 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 + walk_down + walk_down + walk_right + walk_right + walk_in_place_fastest_down + step_end + +BattleFrontier_BattleDomeBattleRoom_Movement_24C964: @ 824C964 + walk_right + walk_right + walk_right + walk_right + step_end + +BattleFrontier_BattleDomeBattleRoom_Movement_24C969: @ 824C969 + walk_in_place_fastest_left + step_end + +BattleFrontier_BattleDomeBattleRoom_Movement_24C96B: @ 824C96B + walk_left + walk_left + walk_left + walk_left + step_end + +BattleFrontier_BattleDomeBattleRoom_Text_24C970: @ 824C970 + .string "{PLAYER} has entered the BATTLE DOME!$" + +BattleFrontier_BattleDomeBattleRoom_Text_24C990: @ 824C990 + .string "{STR_VAR_1}\n" + .string "match!\p" + .string "{PLAYER} versus {STR_VAR_2}!\p" + .string "Let the battle begin!$" + +BattleFrontier_BattleDomeBattleRoom_Text_24C9BE: @ 824C9BE + .string "{PLAYER} is the winner!\n" + .string "Congratulations!$" + +BattleFrontier_BattleDomeBattleRoom_Text_24C9E1: @ 824C9E1 + .string "{STR_VAR_2} is the winner!\n" + .string "Congratulations!$" + +BattleFrontier_BattleDomeBattleRoom_Text_24CA04: @ 824CA04 + .string "{PLAYER} is the Level 50\n" + .string "Battle Tournament Champion!\p" + .string "Congratulations!$" + +BattleFrontier_BattleDomeBattleRoom_Text_24CA44: @ 824CA44 + .string "{PLAYER} is the Open Level\n" + .string "Battle Tournament Champion!\p" + .string "Congratulations!$" + +BattleFrontier_BattleDomeBattleRoom_Text_24CA86: @ 824CA86 + .string "What an unbelievable finish!\n" + .string "We have a double knockout!\p" + .string "In this event, the Battle Tournament\n" + .string "rules call for a REFEREE’S decision.\p" + .string "Please wait while the judging\n" + .string "is under way.$" + +BattleFrontier_BattleDomeBattleRoom_Text_24CB34: @ 824CB34 + .string "The REFEREES have reached\n" + .string "a decision!\p" + .string "The winner is…\n" + .string "Oh, my goodness!\l" + .string "The winner is {STR_VAR_1}!\l" + .string "Congratulations!$" + +BattleFrontier_BattleDomeBattleRoom_Text_24CB9D: @ 824CB9D + .string "The REFEREES have reached\n" + .string "a decision!\p" + .string "The winner is…\n" + .string "Oh, my goodness!\l" + .string "The winner is {PLAYER}!\l" + .string "Congratulations!$" + +BattleFrontier_BattleDomeBattleRoom_Text_24CC06: @ 824CC06 + .string "The bright new hope!\p" + .string "$" + +BattleFrontier_BattleDomeBattleRoom_Text_24CC1C: @ 824CC1C + .string "The rising star!\p" + .string "$" + +BattleFrontier_BattleDomeBattleRoom_Text_24CC2E: @ 824CC2E + .string "Will this TRAINER race to\n" + .string "the championship?\p" + .string "$" + +BattleFrontier_BattleDomeBattleRoom_Text_24CC5B: @ 824CC5B + .string "Can the feat of a championship\n" + .string "on the first try be achieved?\p" + .string "$" + +BattleFrontier_BattleDomeBattleRoom_Text_24CC99: @ 824CC99 + .string "Can the loss of the last match\n" + .string "be avenged?\p" + .string "$" + +BattleFrontier_BattleDomeBattleRoom_Text_24CCC5: @ 824CCC5 + .string "The TRAINER is on fire for\n" + .string "the first championship try!\p" + .string "$" + +BattleFrontier_BattleDomeBattleRoom_Text_24CCFD: @ 824CCFD + .string "A win here means this TRAINER\n" + .string "advances to the final!\p" + .string "$" + +BattleFrontier_BattleDomeBattleRoom_Text_24CD33: @ 824CD33 + .string "Will the long-held dream of\n" + .string "a championship finally come true?\p" + .string "$" + +BattleFrontier_BattleDomeBattleRoom_Text_24CD72: @ 824CD72 + .string "The invincible champion!\p" + .string "$" + +BattleFrontier_BattleDomeBattleRoom_Text_24CD8C: @ 824CD8C + .string "Can anyone hope to beat this\n" + .string "TRAINER?\p" + .string "$" + +BattleFrontier_BattleDomeBattleRoom_Text_24CDB3: @ 824CDB3 + .string "Do battles exist solely for\n" + .string "this TRAINER?\p" + .string "$" + +BattleFrontier_BattleDomeBattleRoom_Text_24CDDE: @ 824CDDE + .string "The current champion aiming to\n" + .string "retain the title!\p" + .string "$" + +BattleFrontier_BattleDomeBattleRoom_Text_24CE10: @ 824CE10 + .string "The former champion has returned!\p" + .string "$" + +BattleFrontier_BattleDomeBattleRoom_Text_24CE33: @ 824CE33 + .string "The former toughness has returned!\p" + .string "$" + +BattleFrontier_BattleDomeBattleRoom_Text_24CE57: @ 824CE57 + .string "Will this TRAINER do as expected\n" + .string "and advance to the finals?\p" + .string "$" + +BattleFrontier_BattleDomeBattleRoom_Text_24CE94: @ 824CE94 + .string "Will the former champ regain\n" + .string "lost glory?\p" + .string "$" + +BattleFrontier_BattleDomeBattleRoom_Text_24CEBE: @ 824CEBE + .string "Feel the glow of a true master!$" + +BattleFrontier_BattleDomeBattleRoom_Text_24CEDE: @ 824CEDE + .string "And now… The TRAINER standing in\n" + .string "{PLAYER}’s record-setting path…\p" + .string "Yes! The one and only!\n" + .string "The BATTLE DOME COMMISSIONER!\l" + .string "Our very own DOME ACE!\l" + .string "Make way for TUCKER!$" + +BattleFrontier_BattleDomeBattleRoom_Text_24CF7A: @ 824CF7A + .string "Spectators: TUCKER! TUCKER!\n" + .string "TUCKER! TUCKER! TUCKER!$" + +BattleFrontier_BattleDomeBattleRoom_Text_24CFAE: @ 824CFAE + .string "TUCKER: Ahahah!\p" + .string "Do you hear it? This crowd!\n" + .string "They’re all itching to see our match!\p" + .string "Ahahah!\p" + .string "I bet you’re twitching all over from\n" + .string "the tension of getting to battle me!\p" + .string "But don’t you worry about a thing!\p" + .string "I’m the no. 1 star of the BATTLE DOME!\n" + .string "I, TUCKER the DOME ACE, will bathe you\l" + .string "in my brilliant glow!$" + +BattleFrontier_BattleDomeBattleRoom_Text_24D0D9: @ 824D0D9 + .string "Your strategy!\n" + .string "Let’s see it!$" + +BattleFrontier_BattleDomeBattleRoom_Text_24D0F6: @ 824D0F6 + .string "Unbelievable! It’s incredible!\n" + .string "The victor is {PLAYER}!$" + +BattleFrontier_BattleDomeBattleRoom_Text_24D127: @ 824D127 + .string "The winner is TUCKER!\n" + .string "The DOME ACE has prevailed!\p" + .string "Congratulations, TUCKER!$" + +BattleFrontier_BattleDomeBattleRoom_Text_24D172: @ 824D172 + .string "TUCKER: Rules are rules!\n" + .string "Let me see your FRONTIER PASS.$" + +BattleFrontier_BattleDomeBattleRoom_Text_24D1AA: @ 824D1AA + .string "The Tactics Symbol was embossed on\n" + .string "the FRONTIER PASS!$" + +BattleFrontier_BattleDomeBattleRoom_Text_24D1E0: @ 824D1E0 + .string "… … … … … …\p" + .string "I sorely underestimated you. I won’t\n" + .string "make the same mistake next time…$" + +BattleFrontier_BattleDomeBattleRoom_Text_24D232: @ 824D232 + .string "Can the win streak be stretched?\n" + .string "The confidence is there!$" + +BattleFrontier_BattleDomeBattleRoom_Text_24D26C: @ 824D26C + .string "Ladies and gentlemen!\n" + .string "Boys, girls, and POKéMON!\p" + .string "Finally!\n" + .string "Finally, the legend has returned!\p" + .string "Yes, the name of that legend!\n" + .string "Our very own DOME ACE!\l" + .string "It’s none other than TUCKER!$" + +BattleFrontier_BattleDomeBattleRoom_Text_24D319: @ 824D319 + .string "TUCKER: Ah…\n" + .string "The pummeling roar of the crowd…\l" + .string "Their furnace-like heat of excitement…\l" + .string "This is a wonderful place…\p" + .string "To the crowd, I am the DOME ACE…\n" + .string "I represent their hopes and dreams…\l" + .string "I must never fade from their sight…\p" + .string "I must burn!\n" + .string "Brighter and more brilliant!\l" + .string "I must light all that gather here!$" + +BattleFrontier_BattleDomeBattleRoom_Text_24D43E: @ 824D43E + .string "I will unleash all the power that\n" + .string "I possess! Right here and now!$" + +BattleFrontier_BattleDomeBattleRoom_Text_24D47F: @ 824D47F + .string "TUCKER: You’re genuinely fantastic!\p" + .string "Never before! I haven’t ever lost in the\n" + .string "times I’ve had to unleash my power.\p" + .string "Yes, quite fantastic!\n" + .string "Your FRONTIER PASS, please?$" + +BattleFrontier_BattleDomeBattleRoom_Text_24D522: @ 824D522 + .string "The Tactics Symbol took on\n" + .string "a golden shine!$" + +BattleFrontier_BattleDomeBattleRoom_Text_24D54D: @ 824D54D + .string "You’re strong, but above all,\n" + .string "you have a unique charm!\p" + .string "In you, I see a definite potential for\n" + .string "a superstar like me.\p" + .string "I will very much look forward to\n" + .string "our next encounter!$" + +BattleFrontier_BattleDomeBattleRoom_Text_24D5F5: @ 824D5F5 + .string "{PLAYER} is the Level 50\n" + .string "Battle Tournament Champion!\p" + .string "Congratulations!$" + +BattleFrontier_BattleDomeBattleRoom_Text_24D635: @ 824D635 + .string "{PLAYER} is the Open Level\n" + .string "Battle Tournament Champion!\p" + .string "Congratulations!$" + +BattleFrontier_BattleDomeBattleRoom_Text_24D677: @ 824D677 + .string "The final match!\p" + .string "{PLAYER} versus the DOME ACE, TUCKER!\p" + .string "Let the battle begin!$" + +BattleFrontier_BattleDomeBattleRoom_Text_24D6BE: @ 824D6BE + .string "The REFEREES have reached\n" + .string "a decision!\p" + .string "The winner is…\n" + .string "Oh, my goodness!\l" + .string "The winner is our very own DOME ACE!\l" + .string "It’s TUCKER!\p" + .string "Congratulations! And thank you!\n" + .string "Let’s hear it for the DOME ACE, TUCKER!$" diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/events.inc b/data/maps/BattleFrontier_BattleDomeCorridor/events.inc new file mode 100644 index 000000000..8a8d5448e --- /dev/null +++ b/data/maps/BattleFrontier_BattleDomeCorridor/events.inc @@ -0,0 +1,10 @@ +BattleFrontier_BattleDomeCorridor_EventObjects: @ 853C14C + 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 + 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/BattleFrontier_BattleDomeCorridor/scripts.inc b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc new file mode 100644 index 000000000..989ebe2f3 --- /dev/null +++ b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc @@ -0,0 +1,152 @@ +BattleFrontier_BattleDomeCorridor_MapScripts:: @ 824B0FE + map_script 2, BattleFrontier_BattleDomeCorridor_MapScript2_24B104 + .byte 0 + +BattleFrontier_BattleDomeCorridor_MapScript2_24B104: @ 824B104 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeCorridor_EventScript_24B10E + .2byte 0 + +BattleFrontier_BattleDomeCorridor_EventScript_24B10E:: @ 824B10E + delay 16 + setvar VAR_TEMP_0, 1 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + special sub_81A1780 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleDomeCorridor_EventScript_24B161 + applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1B2 + applymovement 255, BattleFrontier_BattleDomeCorridor_Movement_24B1A1 + waitmovement 0 + opendoor 13, 3 + waitdooranim + applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1BE + applymovement 255, BattleFrontier_BattleDomeCorridor_Movement_24B1AE + waitmovement 0 + closedoor 13, 3 + waitdooranim + goto BattleFrontier_BattleDomeCorridor_EventScript_24B18F + +BattleFrontier_BattleDomeCorridor_EventScript_24B161:: @ 824B161 + applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1D6 + applymovement 255, BattleFrontier_BattleDomeCorridor_Movement_24B1C1 + waitmovement 0 + opendoor 37, 3 + waitdooranim + applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1E6 + applymovement 255, BattleFrontier_BattleDomeCorridor_Movement_24B1D2 + waitmovement 0 + closedoor 37, 3 + waitdooranim + +BattleFrontier_BattleDomeCorridor_EventScript_24B18F:: @ 824B18F + waitmovement 0 + setvar VAR_0x8006, 0 + warp MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 7 + waitstate + end + +BattleFrontier_BattleDomeCorridor_Movement_24B1A1: @ 824B1A1 + 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 + walk_up + walk_up + set_invisible + step_end + +BattleFrontier_BattleDomeCorridor_Movement_24B1B2: @ 824B1B2 + 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 + walk_up + set_invisible + step_end + +BattleFrontier_BattleDomeCorridor_Movement_24B1C1: @ 824B1C1 + 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 + walk_up + walk_up + set_invisible + step_end + +BattleFrontier_BattleDomeCorridor_Movement_24B1D6: @ 824B1D6 + 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 + walk_up + set_invisible + step_end + +BattleFrontier_BattleDomeCorridor_Movement_24B1E9: @ 824B1E9 + 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/maps/BattleFrontier_BattleDomeLobby/events.inc b/data/maps/BattleFrontier_BattleDomeLobby/events.inc new file mode 100644 index 000000000..9c6eb2649 --- /dev/null +++ b/data/maps/BattleFrontier_BattleDomeLobby/events.inc @@ -0,0 +1,21 @@ +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 + +BattleFrontier_BattleDomeLobby_MapWarps: @ 853C0F8 + 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 + 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 + +BattleFrontier_BattleDomeLobby_MapEvents:: @ 853C138 + map_events BattleFrontier_BattleDomeLobby_EventObjects, BattleFrontier_BattleDomeLobby_MapWarps, 0x0, BattleFrontier_BattleDomeLobby_MapBGEvents + diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc new file mode 100644 index 000000000..1e50357bc --- /dev/null +++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc @@ -0,0 +1,777 @@ +BattleFrontier_BattleDomeLobby_MapScripts:: @ 82497E2 + map_script 5, BattleFrontier_BattleDomeLobby_MapScript1_2497F2 + map_script 2, BattleFrontier_BattleDomeLobby_MapScript2_24980F + map_script 4, BattleFrontier_BattleDomeLobby_MapScript2_2497FB + .byte 0 + +BattleFrontier_BattleDomeLobby_MapScript1_2497F2: @ 82497F2 + setvar VAR_0x8004, 21 + special sub_818E9AC + end + +BattleFrontier_BattleDomeLobby_MapScript2_2497FB: @ 82497FB +BattleFrontier_BattlePyramidLobby_MapScript2_2497FB: @ 82497FB + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomeLobby_EventScript_249805 + .2byte 0 + +BattleFrontier_BattleDomeLobby_EventScript_249805:: @ 8249805 + setvar VAR_TEMP_1, 1 + turnobject 255, 2 + end + +BattleFrontier_BattleDomeLobby_MapScript2_24980F: @ 824980F + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeLobby_EventScript_249839 + map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattleDomeLobby_EventScript_249842 + map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattleDomeLobby_EventScript_2499F9 + map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattleDomeLobby_EventScript_24989B + map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattleDomeLobby_EventScript_249940 + .2byte 0 + +BattleFrontier_BattleDomeLobby_EventScript_249839:: @ 8249839 + setvar VAR_0x8004, 0 + special sub_81A1780 + end + +BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842 + lockall + msgbox BattleFrontier_BattleDomeLobby_Text_24A45F, 4 + closemessage + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 0 + special sub_818E9AC + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 0 + special sub_818E9AC + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 6 + setvar VAR_0x8006, 1 + special sub_818E9AC + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_TEMP_0, 255 + releaseall + end + +BattleFrontier_BattleDomeLobby_EventScript_24989B:: @ 824989B + call BattleFrontier_BattleDomeLobby_EventScript_241EBA + lockall + setvar VAR_0x8004, 10 + special sub_81A1780 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleDomeLobby_EventScript_2498C1 + msgbox BattleFrontier_BattleDomeLobby_Text_24A4E9, 4 + goto BattleFrontier_BattleDomeLobby_EventScript_2498C9 + +BattleFrontier_BattleDomeLobby_EventScript_2498C1:: @ 82498C1 + msgbox BattleFrontier_BattleDomeLobby_Text_24AD67, 4 + +BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9 + msgbox BattleFrontier_BattleDomeLobby_Text_24ADB1, 4 + setvar VAR_0x8004, 11 + special sub_81A1780 + msgbox BattleFrontier_BattleDomeLobby_Text_241520, 9 + message BattleFrontier_BattleDomeLobby_Text_24A5D6 + waitmessage + special LoadPlayerParty + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 3 + special sub_81A1780 + setvar VAR_0x8004, 8 + special sub_81A1780 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 6 + setvar VAR_0x8006, 1 + special sub_818E9AC + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 7 + setvar VAR_0x8006, 1 + special sub_818E9AC + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 1 + special sub_818E9AC + special LoadPlayerParty + special HealPlayerParty + goto BattleFrontier_BattleDomeLobby_EventScript_249991 + +BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940 + lockall + msgbox BattleFrontier_BattleDomeLobby_Text_24A5BF, 4 + message BattleFrontier_BattleDomeLobby_Text_24A5D6 + waitmessage + special LoadPlayerParty + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 3 + special sub_81A1780 + setvar VAR_0x8004, 8 + special sub_81A1780 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 0 + special sub_818E9AC + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 6 + setvar VAR_0x8006, 1 + special sub_818E9AC + special LoadPlayerParty + special HealPlayerParty + +BattleFrontier_BattleDomeLobby_EventScript_249991:: @ 8249991 + setvar VAR_0x8004, 13 + setvar VAR_0x8005, 0 + special sub_818E9AC + playse SE_SAVE + waitse + call BattleFrontier_BattleDomeLobby_EventScript_23E8E0 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleDomeLobby_EventScript_2499E9 + message BattleFrontier_BattleDomeLobby_Text_24AE17 + waitmessage + multichoicedefault 20, 8, 94, 1, 0 + switch VAR_RESULT + case 1, BattleFrontier_BattleDomeLobby_EventScript_2499E9 + case 0, BattleFrontier_BattleDomeLobby_EventScript_2499E4 + case 127, BattleFrontier_BattleDomeLobby_EventScript_2499E9 + +BattleFrontier_BattleDomeLobby_EventScript_2499E4:: @ 82499E4 + call BattleFrontier_BattleDomeLobby_EventScript_23E8B4 + +BattleFrontier_BattleDomeLobby_EventScript_2499E9:: @ 82499E9 + msgbox BattleFrontier_BattleDomeLobby_Text_249F74, 4 + closemessage + setvar VAR_TEMP_0, 255 + releaseall + end + +BattleFrontier_BattleDomeLobby_EventScript_2499F9:: @ 82499F9 + lockall + msgbox BattleFrontier_BattleDomeLobby_Text_24A5FE, 4 + message BattleFrontier_BattleDomeLobby_Text_24A61A + waitmessage + setvar VAR_0x8004, 13 + setvar VAR_0x8005, 1 + special sub_818E9AC + playse SE_SAVE + waitse + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_TEMP_0, 255 + goto BattleFrontier_BattleDomeLobby_EventScript_249BC2 + +BattleFrontier_BattleDomeLobby_EventScript_249A35:: @ 8249A35 + lock + faceplayer + setvar VAR_FRONTIER_FACILITY, 1 + setvar VAR_0x40CE, 0 + goto BattleFrontier_BattleDomeLobby_EventScript_249A59 + end + +BattleFrontier_BattleDomeLobby_EventScript_249A47:: @ 8249A47 + lock + faceplayer + setvar VAR_FRONTIER_FACILITY, 1 + setvar VAR_0x40CE, 1 + goto BattleFrontier_BattleDomeLobby_EventScript_249A59 + end + +BattleFrontier_BattleDomeLobby_EventScript_249A59:: @ 8249A59 + special SavePlayerParty + compare VAR_0x40CE, 0 + call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CFD + compare VAR_0x40CE, 1 + call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D06 + +BattleFrontier_BattleDomeLobby_EventScript_249A72:: @ 8249A72 + compare VAR_0x40CE, 0 + call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D0F + compare VAR_0x40CE, 1 + call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D15 + waitmessage + multichoice 17, 6, 23, 0 + switch VAR_RESULT + case 0, BattleFrontier_BattleDomeLobby_EventScript_249ABF + case 1, BattleFrontier_BattleDomeLobby_EventScript_249BFA + case 2, BattleFrontier_BattleDomeLobby_EventScript_249C64 + case 127, BattleFrontier_BattleDomeLobby_EventScript_249C64 + +BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF + message BattleFrontier_BattleDomeLobby_Text_24A210 + waitmessage + multichoice 17, 6, 24, 0 + switch VAR_RESULT + case 2, BattleFrontier_BattleDomeLobby_EventScript_249C64 + case 127, BattleFrontier_BattleDomeLobby_EventScript_249C64 + setvar VAR_0x8004, 15 + special sub_81A1780 + compare VAR_0x8004, 1 + goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C15 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + copyvar VAR_0x8006, VAR_RESULT + special sub_81A1780 + msgbox BattleFrontier_BattleDomeLobby_Text_24A26E, 4 + fadescreen 1 + call BattleFrontier_BattleDomeLobby_EventScript_23F2B7 + copyvar VAR_0x8004, VAR_RESULT + setvar VAR_0x8005, 3 + special sub_80F9490 + waitstate + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C61 + msgbox BattleFrontier_BattleDomeLobby_Text_24A1C6, 5 + switch VAR_RESULT + case 0, BattleFrontier_BattleDomeLobby_EventScript_249C61 + case 1, BattleFrontier_BattleDomeLobby_EventScript_249B60 + case 127, BattleFrontier_BattleDomeLobby_EventScript_249C61 + +BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60 + setvar VAR_TEMP_0, 0 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 4 + special sub_81A1780 + setvar VAR_0x8004, 0 + special sub_818E9AC + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 1 + special sub_81A1780 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 0 + special sub_81A1780 + special LoadPlayerParty + closemessage + delay 2 + call BattleFrontier_BattleDomeLobby_EventScript_27134F + setvar VAR_TEMP_0, 255 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A + setvar VAR_0x8004, 22 + special sub_818E9AC + +BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2 + special SavePlayerParty + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 3 + special sub_81A1780 + setvar VAR_0x8004, 15 + special sub_818E9AC + msgbox BattleFrontier_BattleDomeLobby_Text_24A437, 4 + closemessage + call BattleFrontier_BattleDomeLobby_EventScript_249C6E + special HealPlayerParty + warp MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR, 255, 23, 6 + setvar VAR_TEMP_0, 0 + waitstate + end + +BattleFrontier_BattleDomeLobby_EventScript_249BFA:: @ 8249BFA + compare VAR_0x40CE, 0 + call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D1B + compare VAR_0x40CE, 1 + call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D24 + goto BattleFrontier_BattleDomeLobby_EventScript_249A72 + +BattleFrontier_BattleDomeLobby_EventScript_249C15:: @ 8249C15 + switch VAR_RESULT + case 0, BattleFrontier_BattleDomeLobby_EventScript_249C30 + case 1, BattleFrontier_BattleDomeLobby_EventScript_249C3D + +BattleFrontier_BattleDomeLobby_EventScript_249C30:: @ 8249C30 + msgbox BattleFrontier_BattleDomeLobby_Text_24A353, 4 + goto BattleFrontier_BattleDomeLobby_EventScript_249C6C + +BattleFrontier_BattleDomeLobby_EventScript_249C3D:: @ 8249C3D + msgbox BattleFrontier_BattleDomeLobby_Text_24A2AB, 4 + goto BattleFrontier_BattleDomeLobby_EventScript_249C6C + +BattleFrontier_BattleDomeLobby_EventScript_249C4A:: @ 8249C4A + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 0 + special sub_81A1780 + goto BattleFrontier_BattleDomeLobby_EventScript_249C64 + +BattleFrontier_BattleDomeLobby_EventScript_249C61:: @ 8249C61 + special LoadPlayerParty + +BattleFrontier_BattleDomeLobby_EventScript_249C64:: @ 8249C64 + msgbox BattleFrontier_BattleDomeLobby_Text_249F74, 4 + +BattleFrontier_BattleDomeLobby_EventScript_249C6C:: @ 8249C6C + release + end + +BattleFrontier_BattleDomeLobby_EventScript_249C6E:: @ 8249C6E + compare VAR_0x40CE, 0 + call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CDD + compare VAR_0x40CE, 1 + call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CE5 + applymovement 255, BattleFrontier_BattleDomeLobby_Movement_249D45 + waitmovement 0 + compare VAR_0x40CE, 0 + call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D2D + compare VAR_0x40CE, 1 + call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D33 + waitdooranim + compare VAR_0x40CE, 0 + call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CED + compare VAR_0x40CE, 1 + call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CF5 + applymovement 255, BattleFrontier_BattleDomeLobby_Movement_249D4E + waitmovement 0 + compare VAR_0x40CE, 0 + call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D39 + compare VAR_0x40CE, 1 + call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D3F + waitdooranim + return + +BattleFrontier_BattleDomeLobby_EventScript_249CDD:: @ 8249CDD + applymovement 1, BattleFrontier_BattleDomeLobby_Movement_249D45 + return + +BattleFrontier_BattleDomeLobby_EventScript_249CE5:: @ 8249CE5 + applymovement 6, BattleFrontier_BattleDomeLobby_Movement_249D45 + return + +BattleFrontier_BattleDomeLobby_EventScript_249CED:: @ 8249CED + applymovement 1, BattleFrontier_BattleDomeLobby_Movement_249D4B + return + +BattleFrontier_BattleDomeLobby_EventScript_249CF5:: @ 8249CF5 + applymovement 6, BattleFrontier_BattleDomeLobby_Movement_249D4B + return + +BattleFrontier_BattleDomeLobby_EventScript_249CFD:: @ 8249CFD + msgbox BattleFrontier_BattleDomeLobby_Text_249EB7, 4 + return + +BattleFrontier_BattleDomeLobby_EventScript_249D06:: @ 8249D06 + msgbox BattleFrontier_BattleDomeLobby_Text_24A664, 4 + return + +BattleFrontier_BattleDomeLobby_EventScript_249D0F:: @ 8249D0F + message BattleFrontier_BattleDomeLobby_Text_249F3A + return + +BattleFrontier_BattleDomeLobby_EventScript_249D15:: @ 8249D15 + message BattleFrontier_BattleDomeLobby_Text_24A6E7 + return + +BattleFrontier_BattleDomeLobby_EventScript_249D1B:: @ 8249D1B + msgbox BattleFrontier_BattleDomeLobby_Text_249F8E, 4 + return + +BattleFrontier_BattleDomeLobby_EventScript_249D24:: @ 8249D24 + msgbox BattleFrontier_BattleDomeLobby_Text_24A721, 4 + return + +BattleFrontier_BattleDomeLobby_EventScript_249D2D:: @ 8249D2D + opendoor 5, 4 + return + +BattleFrontier_BattleDomeLobby_EventScript_249D33:: @ 8249D33 + opendoor 17, 4 + return + +BattleFrontier_BattleDomeLobby_EventScript_249D39:: @ 8249D39 + closedoor 5, 4 + return + +BattleFrontier_BattleDomeLobby_EventScript_249D3F:: @ 8249D3F + closedoor 17, 4 + return + +BattleFrontier_BattleDomeLobby_Movement_249D45: @ 8249D45 + walk_up + walk_up + walk_up + walk_up + walk_up + step_end + +BattleFrontier_BattleDomeLobby_Movement_249D4B: @ 8249D4B + walk_up + set_invisible + step_end + +BattleFrontier_BattleDomeLobby_Movement_249D4E: @ 8249D4E + walk_up + walk_up + set_invisible + step_end + +BattleFrontier_BattleDomeLobby_EventScript_249D52:: @ 8249D52 + lockall + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 0 + special sub_81A1780 + waitbuttonpress + special RemoveRecordsWindow + releaseall + end + +BattleFrontier_BattleDomeLobby_EventScript_249D6B:: @ 8249D6B + lockall + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 1 + special sub_81A1780 + waitbuttonpress + special RemoveRecordsWindow + releaseall + end + +BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 9 + special sub_818E9AC + compare VAR_RESULT, 0 + call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DC9 + compare VAR_RESULT, 1 + call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DD2 + compare VAR_RESULT, 2 + call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DDB + compare VAR_RESULT, 3 + call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DE4 + fadescreen 1 + setvar VAR_0x8004, 8 + special sub_818E9AC + waitstate + end + +BattleFrontier_BattleDomeLobby_EventScript_249DC9:: @ 8249DC9 + msgbox BattleFrontier_BattleDomeLobby_Text_24A966, 3 + return + +BattleFrontier_BattleDomeLobby_EventScript_249DD2:: @ 8249DD2 + msgbox BattleFrontier_BattleDomeLobby_Text_24A9A9, 3 + return + +BattleFrontier_BattleDomeLobby_EventScript_249DDB:: @ 8249DDB + msgbox BattleFrontier_BattleDomeLobby_Text_24A9EC, 3 + return + +BattleFrontier_BattleDomeLobby_EventScript_249DE4:: @ 8249DE4 + msgbox BattleFrontier_BattleDomeLobby_Text_24AA31, 3 + return + +BattleFrontier_BattleDomeLobby_EventScript_249DED:: @ 8249DED + setvar VAR_0x8004, 20 + special sub_818E9AC + msgbox BattleFrontier_BattleDomeLobby_Text_24AA76, 2 + end + +BattleFrontier_BattleDomeLobby_EventScript_249DFE:: @ 8249DFE + msgbox BattleFrontier_BattleDomeLobby_Text_24AB94, 2 + end + +BattleFrontier_BattleDomeLobby_EventScript_249E07:: @ 8249E07 + msgbox BattleFrontier_BattleDomeLobby_Text_24AC76, 2 + end + +BattleFrontier_BattleDomeLobby_EventScript_249E10:: @ 8249E10 + msgbox BattleFrontier_BattleDomeLobby_Text_24ACD3, 2 + end + +BattleFrontier_OutsideWest_EventScript_249E19:: @ 8249E19 + msgbox BattleFrontier_OutsideWest_Text_24AB06, 2 + end + +BattleFrontier_OutsideWest_EventScript_249E22:: @ 8249E22 + loadword 0, BattleFrontier_OutsideWest_Text_24AB44 + callstd 2 + end + +BattleFrontier_OutsideWest_EventScript_249E2B:: @ 8249E2B + loadword 0, BattleFrontier_OutsideWest_Text_24AB75 + callstd 2 + end + +BattleFrontier_BattleDomeLobby_EventScript_249E34:: @ 8249E34 + lockall + msgbox BattleFrontier_BattleDomeLobby_Text_24AE63, 4 + goto BattleFrontier_BattleDomeLobby_EventScript_249E43 + end + +BattleFrontier_BattleDomeLobby_EventScript_249E43:: @ 8249E43 + message BattleFrontier_BattleDomeLobby_Text_24AE8B + waitmessage + multichoice 17, 4, 98, 0 + switch VAR_RESULT + case 0, BattleFrontier_BattleDomeLobby_EventScript_249E8B + case 1, BattleFrontier_BattleDomeLobby_EventScript_249E99 + case 2, BattleFrontier_BattleDomeLobby_EventScript_249EA7 + case 3, BattleFrontier_BattleDomeLobby_EventScript_249EB5 + case 127, BattleFrontier_BattleDomeLobby_EventScript_249EB5 + end + +BattleFrontier_BattleDomeLobby_EventScript_249E8B:: @ 8249E8B + msgbox BattleFrontier_BattleDomeLobby_Text_24AEAE, 4 + goto BattleFrontier_BattleDomeLobby_EventScript_249E43 + end + +BattleFrontier_BattleDomeLobby_EventScript_249E99:: @ 8249E99 + msgbox BattleFrontier_BattleDomeLobby_Text_24AF4C, 4 + goto BattleFrontier_BattleDomeLobby_EventScript_249E43 + end + +BattleFrontier_BattleDomeLobby_EventScript_249EA7:: @ 8249EA7 + msgbox BattleFrontier_BattleDomeLobby_Text_24B073, 4 + goto BattleFrontier_BattleDomeLobby_EventScript_249E43 + end + +BattleFrontier_BattleDomeLobby_EventScript_249EB5:: @ 8249EB5 + releaseall + end + +BattleFrontier_BattleDomeLobby_Text_249EB7: @ 8249EB7 + .string "Where the strategies of TRAINERS\n" + .string "are put to the test!\p" + .string "Welcome to the BATTLE DOME!\p" + .string "I am your guide to the SINGLE BATTLE\n" + .string "Tournament.$" + +BattleFrontier_BattleDomeLobby_Text_249F3A: @ 8249F3A + .string "Would you like to challenge\n" + .string "the SINGLE BATTLE Tournament?$" + +BattleFrontier_BattleDomeLobby_Text_249F74: @ 8249F74 + .string "We hope to see you again.$" + +BattleFrontier_BattleDomeLobby_Text_249F8E: @ 8249F8E + .string "The SINGLE BATTLE Tournament\n" + .string "is exactly as the name suggests--\l" + .string "a tournament of SINGLE BATTLES.\p" + .string "All participating TRAINERS must\n" + .string "enter three POKéMON each.\p" + .string "In each battle, one of the three\n" + .string "POKéMON must be held in reserve.\p" + .string "The other two POKéMON can battle\n" + .string "one at a time.\p" + .string "Choose the two battling POKéMON after\n" + .string "examining the opponent’s trio.\p" + .string "You win the tournament by defeating\n" + .string "four TRAINERS.\p" + .string "Battle Points are awarded to\n" + .string "the tournament winner.\p" + .string "If you want to interrupt your\n" + .string "tournament, please save the game.\p" + .string "If you don’t save before interrupting,\n" + .string "you will be disqualified.$" + +BattleFrontier_BattleDomeLobby_Text_24A1C6: @ 824A1C6 + .string "Before I show you to the BATTLE DOME,\n" + .string "I must save the data. Is that okay?$" + +BattleFrontier_BattleDomeLobby_Text_24A210: @ 824A210 + .string "The tournament offers two levels\n" + .string "of challenge, Level 50 and Open Level.\l" + .string "Which is your choice?$" + +BattleFrontier_BattleDomeLobby_Text_24A26E: @ 824A26E + .string "Now select the three POKéMON that\n" + .string "you wish to enter, please.$" + +BattleFrontier_BattleDomeLobby_Text_24A2AB: @ 824A2AB + .string "Excuse me!\p" + .string "You don’t have three eligible POKéMON.\p" + .string "Also, the POKéMON must be holding\n" + .string "different kinds of items.\p" + .string "EGGS{STR_VAR_1} ineligible.\p" + .string "Please come see me when you are ready.$" + +BattleFrontier_BattleDomeLobby_Text_24A353: @ 824A353 + .string "Excuse me!\p" + .string "You don’t have three eligible POKéMON.\p" + .string "You must have three different POKéMON\n" + .string "of Level 50 or less to enter.\p" + .string "They also must be holding different\n" + .string "kinds of items.\p" + .string "EGGS{STR_VAR_1} ineligible.\p" + .string "Please come see me when you are ready.$" + +BattleFrontier_BattleDomeLobby_Text_24A437: @ 824A437 + .string "I will now show you to\n" + .string "the BATTLE DOME.$" + +BattleFrontier_BattleDomeLobby_Text_24A45F: @ 824A45F + .string "Excuse me!\p" + .string "You didn’t save before you quit your\n" + .string "challenge last time.\p" + .string "Because of that, your challenge so far\n" + .string "has been disqualified. Sorry!$" + +BattleFrontier_BattleDomeLobby_Text_24A4E9: @ 824A4E9 + .string "Congratulations for winning\n" + .string "your Battle Tournament!$" + +BattleFrontier_BattleDomeLobby_Text_24A51D: @ 824A51D + .string "Here is your prize for your Battle\n" + .string "Tournament victory.$" + +VerdanturfTown_BattleTentLobby_Text_24A554: @ 824A554 + .string "{PLAYER} received the prize\n" + .string "{STR_VAR_1}.$" + +VerdanturfTown_BattleTentLobby_Text_24A56E: @ 824A56E + .string "Oh, your BAG appears to be full.\p" + .string "Please make room in your BAG, then come\n" + .string "see me.$" + +BattleFrontier_BattleDomeLobby_Text_24A5BF: @ 824A5BF + .string "Thank you for playing!$" + +BattleFrontier_BattleDomeLobby_Text_24A5D6: @ 824A5D6 + .string "Your record will be saved.\n" + .string "Please wait.$" + +BattleFrontier_BattleDomeLobby_Text_24A5FE: @ 824A5FE + .string "We’ve been waiting for you!$" + +BattleFrontier_BattleDomeLobby_Text_24A61A: @ 824A61A + .string "Before I show you to the BATTLE DOME,\n" + .string "I must save the data. Is that okay?$" + +BattleFrontier_BattleDomeLobby_Text_24A664: @ 824A664 + .string "Where the strategies of TRAINERS\n" + .string "are put to the test!\p" + .string "Welcome to the BATTLE DOME!\p" + .string "I am your guide to the DOUBLE BATTLE\n" + .string "Tournament.$" + +BattleFrontier_BattleDomeLobby_Text_24A6E7: @ 824A6E7 + .string "Would you like to challenge\n" + .string "the DOUBLE BATTLE Tournament?$" + +BattleFrontier_BattleDomeLobby_Text_24A721: @ 824A721 + .string "The DOUBLE BATTLE Tournament\n" + .string "is exactly as the name suggests--\l" + .string "a tournament of DOUBLE BATTLES.\p" + .string "All participating TRAINERS must\n" + .string "enter three POKéMON each.\p" + .string "In each battle, one of the three\n" + .string "POKéMON must be held in reserve.\p" + .string "The remaining two POKéMON must take\n" + .string "part in a DOUBLE BATTLE.\p" + .string "Choose the two battling POKéMON after\n" + .string "examining the opponent’s trio.\p" + .string "You win the tournament by defeating\n" + .string "four TRAINERS.\p" + .string "Battle Points are awarded to\n" + .string "the tournament winner.\p" + .string "If you want to interrupt your\n" + .string "tournament, please save the game.\p" + .string "If you don’t save before interrupting,\n" + .string "you will be disqualified.$" + +BattleFrontier_BattleDomeLobby_Text_24A966: @ 824A966 + .string "They’re the results of the last\n" + .string "Level 50 SINGLE BATTLE Tournament.$" + +BattleFrontier_BattleDomeLobby_Text_24A9A9: @ 824A9A9 + .string "They’re the results of the last\n" + .string "Level 50 DOUBLE BATTLE Tournament.$" + +BattleFrontier_BattleDomeLobby_Text_24A9EC: @ 824A9EC + .string "They’re the results of the last\n" + .string "Open Level SINGLE BATTLE Tournament.$" + +BattleFrontier_BattleDomeLobby_Text_24AA31: @ 824AA31 + .string "They’re the results of the last\n" + .string "Open Level DOUBLE BATTLE Tournament.$" + +BattleFrontier_BattleDomeLobby_Text_24AA76: @ 824AA76 + .string "Did you see it?\n" + .string "The last Battle Tournament?\p" + .string "The winner, {STR_VAR_1}, was seriously\n" + .string "tough.\p" + .string "You should check out the results\n" + .string "on the monitor beside the PC.$" + +BattleFrontier_OutsideWest_Text_24AB06: @ 824AB06 + .string "The BATTLE FRONTIER…\n" + .string "I’ve long dreamed about a place like it.$" + +BattleFrontier_OutsideWest_Text_24AB44: @ 824AB44 + .string "The BATTLE DOME\n" + .string "Become the Unbeatable Superstar!$" + +BattleFrontier_OutsideWest_Text_24AB75: @ 824AB75 + .string "The ??????\n" + .string "Under Construction!$" + +BattleFrontier_BattleDomeLobby_Text_24AB94: @ 824AB94 + .string "When a TRAINER chains tournament\n" + .string "wins at the BATTLE DOME, he or she\l" + .string "gains a reputation as a star.\p" + .string "Tough TRAINERS are drawn by that\n" + .string "reputation to the BATTLE DOME.\p" + .string "A true superstar is a TRAINER who\n" + .string "can keep winning tournaments.$" + +BattleFrontier_BattleDomeLobby_Text_24AC76: @ 824AC76 + .string "I ran into one of the tournament\n" + .string "favorites in the very first round.\p" + .string "Of course I got trashed…$" + +BattleFrontier_BattleDomeLobby_Text_24ACD3: @ 824ACD3 + .string "I would’ve won if I’d kept this POKéMON\n" + .string "held in reserve.\p" + .string "You need to check your opponent’s\n" + .string "POKéMON carefully before choosing\l" + .string "your battling POKéMON.$" + +BattleFrontier_BattleDomeLobby_Text_24AD67: @ 824AD67 + .string "Congratulations!\p" + .string "You defeated the DOME ACE and won\n" + .string "the Battle Tournament!$" + +BattleFrontier_BattleDomeLobby_Text_24ADB1: @ 824ADB1 + .string "In recognition of your strategy--\n" + .string "a thing of beauty it was, too--\l" + .string "we award you these Battle Point(s)!$" + +BattleFrontier_BattleDomeLobby_Text_24AE17: @ 824AE17 + .string "Would you like to record your\n" + .string "last BATTLE DOME match on your\l" + .string "FRONTIER PASS?$" + +BattleFrontier_BattleDomeLobby_Text_24AE63: @ 824AE63 + .string "The Battle Tournament rules\n" + .string "are listed.$" + +BattleFrontier_BattleDomeLobby_Text_24AE8B: @ 824AE8B + .string "Which heading do you want to read?$" + +BattleFrontier_BattleDomeLobby_Text_24AEAE: @ 824AEAE + .string "The tournament matchups are drawn up\n" + .string "based on the toughness of POKéMON\l" + .string "held by TRAINERS.\p" + .string "The matchups avoid having tough\n" + .string "TRAINERS face each other right away.$" + +BattleFrontier_BattleDomeLobby_Text_24AF4C: @ 824AF4C + .string "The tournament chart, or as we call it,\n" + .string "the “Tree,†is available for viewing\l" + .string "in the Waiting Room from any guide.\p" + .string "The Tournament Tree will provide\n" + .string "several kinds of data.\p" + .string "The data on view includes the previous\n" + .string "tournament’s results, the POKéMON held\l" + .string "by TRAINERS, and the battle styles of\l" + .string "TRAINERS.$" + +BattleFrontier_BattleDomeLobby_Text_24B073: @ 824B073 + .string "If battling POKéMON faint at the same\n" + .string "time--a double KO--in a tournament\l" + .string "match, the REFEREES will review\l" + .string "the match and declare the winner.$" diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc new file mode 100644 index 000000000..7f2133ac5 --- /dev/null +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc @@ -0,0 +1,10 @@ +BattleFrontier_BattleDomePreBattleRoom_EventObjects: @ 853C188 + 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 + 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/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc new file mode 100644 index 000000000..024162cee --- /dev/null +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc @@ -0,0 +1,417 @@ +BattleFrontier_BattleDomePreBattleRoom_MapScripts:: @ 824B1F9 + map_script 2, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218 + map_script 4, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204 + .byte 0 + +BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204: @ 824B204 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B20E + .2byte 0 + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B20E:: @ 824B20E + setvar VAR_TEMP_1, 1 + turnobject 255, 2 + end + +BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222 + .2byte 0 + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222:: @ 824B222 + compare VAR_0x8006, 1 + goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 6 + setvar VAR_0x8006, 1 + special sub_81A1780 + setvar VAR_TEMP_0, 1 + applymovement 255, BattleFrontier_BattleDomePreBattleRoom_Movement_24B652 + waitmovement 0 + lockall + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F:: @ 824B24F + call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B4FB + waitmessage + switch VAR_RESULT + call BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8E0 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B2C1 + multichoice 16, 0, 73, 1 + switch VAR_RESULT + case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD + case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5 + case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D + case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B30D + case 4, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B349 + case 5, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377 + case 127, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B2C1:: @ 824B2C1 + multichoice 16, 2, 107, 1 + switch VAR_RESULT + case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD + case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5 + case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D + case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B349 + case 4, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377 + case 127, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B30D:: @ 824B30D + message BattleFrontier_BattleDomePreBattleRoom_Text_24BAF7 + waitmessage + multichoicedefault 20, 8, 94, 1, 0 + switch VAR_RESULT + case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F + case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B33F + case 127, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B33F:: @ 824B33F + call BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8B4 + goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B349:: @ 824B349 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA69, 5 + switch VAR_RESULT + case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F + case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB + case 127, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377:: @ 824B377 + message BattleFrontier_BattleDomePreBattleRoom_Text_24BA93 + waitmessage + multichoicedefault 20, 8, 94, 1, 0 + switch VAR_RESULT + case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F + case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3A9 + case 127, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3A9:: @ 824B3A9 + setvar VAR_0x8004, 12 + setvar VAR_0x8005, 9 + special sub_818E9AC + goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB + message BattleFrontier_BattleDomePreBattleRoom_Text_24BAD3 + waitmessage + setvar VAR_0x8004, 13 + setvar VAR_0x8005, 2 + special sub_818E9AC + playse SE_SAVE + waitse + fadescreen 1 + setvar VAR_0x8004, 4 + special sub_81A1780 + end + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD:: @ 824B3DD + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5, 4 + fadescreen 1 + setvar VAR_0x8004, 6 + special sub_818E9AC + waitstate + goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5:: @ 824B3F5 + call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A + fadescreen 1 + setvar VAR_0x8004, 7 + special sub_818E9AC + waitstate + goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A:: @ 824B40A + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special sub_81A1780 + switch VAR_RESULT + case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B449 + case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B452 + case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B45B + case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B464 + return + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B449:: @ 824B449 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9D9, 4 + return + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B452:: @ 824B452 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9FD, 4 + return + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B45B:: @ 824B45B + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA21, 4 + return + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B464:: @ 824B464 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA46, 4 + return + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D + message BattleFrontier_BattleDomePreBattleRoom_Text_24B70C + waitmessage + waitbuttonpress + fadescreen 1 + call BattleFrontier_BattleDomePreBattleRoom_EventScript_23F2B7 + copyvar VAR_0x8004, VAR_RESULT + setvar VAR_0x8005, 2 + special sub_80F9490 + waitstate + setvar VAR_0x8004, 21 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 8 + special sub_818E9AC + setvar VAR_0x8004, 18 + special sub_818E9AC + setvar VAR_0x8004, 9 + special sub_818E9AC + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B748, 4 + closemessage + applymovement 1, BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F + waitmovement 0 + applymovement 255, BattleFrontier_BattleDomePreBattleRoom_Movement_24B657 + waitmovement 0 + opendoor 5, 1 + waitdooranim + applymovement 255, BattleFrontier_BattleDomePreBattleRoom_Movement_24B659 + waitmovement 0 + closedoor 5, 1 + waitdooranim + warp MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM, 255, 9, 5 + setvar VAR_TEMP_0, 0 + waitstate + end + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B4FB:: @ 824B4FB + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special sub_81A1780 + switch VAR_RESULT + case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B53A + case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B540 + case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B546 + case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B54C + return + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B53A:: @ 824B53A + message BattleFrontier_BattleDomePreBattleRoom_Text_24B65C + return + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B540:: @ 824B540 + message BattleFrontier_BattleDomePreBattleRoom_Text_24B689 + return + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B546:: @ 824B546 + message BattleFrontier_BattleDomePreBattleRoom_Text_24B6B6 + return + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B54C:: @ 824B54C + setvar VAR_0x8004, 9 + special sub_81A1780 + switch VAR_RESULT + case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B + case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0 + case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B + case 4, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0 + message BattleFrontier_BattleDomePreBattleRoom_Text_24B6E3 + return + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B:: @ 824B58B + checkflag FLAG_0x001 + goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BB2E, 4 + setflag FLAG_0x001 + return + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0:: @ 824B5A0 + checkflag FLAG_0x001 + goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BBAC, 4 + setflag FLAG_0x001 + return + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5:: @ 824B5B5 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BC2A, 4 + return + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE:: @ 824B5BE + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BC63, 4 + return + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7 + setvar VAR_TEMP_0, 1 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B760, 4 + special LoadPlayerParty + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 3 + special sub_81A1780 + playfanfare MUS_ME_ASA + waitfanfare + special HealPlayerParty + call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600 + fadescreen 1 + setvar VAR_0x8004, 11 + special sub_818E9AC + waitstate + goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600:: @ 824B600 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special sub_81A1780 + switch VAR_RESULT + case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B634 + case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B63D + case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B646 + return + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B634:: @ 824B634 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B7A3, 4 + return + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B63D:: @ 824B63D + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B7F1, 4 + return + +BattleFrontier_BattleDomePreBattleRoom_EventScript_24B646:: @ 824B646 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B83F, 4 + return + +BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F: @ 824B64F + walk_right + face_left + step_end + +BattleFrontier_BattleDomePreBattleRoom_Movement_24B652: @ 824B652 + walk_up + walk_up + walk_up + walk_up + step_end + +BattleFrontier_BattleDomePreBattleRoom_Movement_24B657: @ 824B657 + walk_up + step_end + +BattleFrontier_BattleDomePreBattleRoom_Movement_24B659: @ 824B659 + walk_up + set_invisible + step_end + +BattleFrontier_BattleDomePreBattleRoom_Text_24B65C: @ 824B65C + .string "Your 1st-round match is next.\n" + .string "Are you ready?$" + +BattleFrontier_BattleDomePreBattleRoom_Text_24B689: @ 824B689 + .string "Your 2nd-round match is next.\n" + .string "Are you ready?$" + +BattleFrontier_BattleDomePreBattleRoom_Text_24B6B6: @ 824B6B6 + .string "Your semifinal match is next.\n" + .string "Are you ready?$" + +BattleFrontier_BattleDomePreBattleRoom_Text_24B6E3: @ 824B6E3 + .string "Your final match is next.\n" + .string "Are you ready?$" + +BattleFrontier_BattleDomePreBattleRoom_Text_24B70C: @ 824B70C + .string "Please choose the two POKéMON\n" + .string "that are to appear in battle.$" + +BattleFrontier_BattleDomePreBattleRoom_Text_24B748: @ 824B748 + .string "Right this way, please.$" + +BattleFrontier_BattleDomePreBattleRoom_Text_24B760: @ 824B760 + .string "Thank you for competing!\p" + .string "I’ll restore your POKéMON to\n" + .string "full health.$" + +BattleFrontier_BattleDomePreBattleRoom_Text_24B7A3: @ 824B7A3 + .string "All 1st-round matches have been\n" + .string "completed.\p" + .string "These are the teams that advanced!$" + +BattleFrontier_BattleDomePreBattleRoom_Text_24B7F1: @ 824B7F1 + .string "All 2nd-round matches have been\n" + .string "completed.\p" + .string "These are the teams that advanced!$" + +BattleFrontier_BattleDomePreBattleRoom_Text_24B83F: @ 824B83F + .string "All semifinal matches have been\n" + .string "completed.\p" + .string "These are the teams that advanced!$" + +BattleFrontier_BattleDomePreBattleRoom_Text_24B88D: @ 824B88D + .string "Congratulations for getting through\n" + .string "the 1st round.\p" + .string "The 2nd round is next.\n" + .string "Are you ready?$" + +BattleFrontier_BattleDomePreBattleRoom_Text_24B8E6: @ 824B8E6 + .string "Congratulations for advancing\n" + .string "to the semifinals.\p" + .string "The best four teams meet in this round.\n" + .string "Are you ready?$" + +BattleFrontier_BattleDomePreBattleRoom_Text_24B94E: @ 824B94E + .string "Congratulations for advancing\n" + .string "to the final match.\p" + .string "You’re one win from the championship.\n" + .string "Are you ready?$" + +BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5: @ 824B9B5 + .string "{PLAYER}’s next opponent\n" + .string "is this TRAINER.$" + +BattleFrontier_BattleDomePreBattleRoom_Text_24B9D9: @ 824B9D9 + .string "The tournament is in the 1st round.$" + +BattleFrontier_BattleDomePreBattleRoom_Text_24B9FD: @ 824B9FD + .string "The tournament is in the 2nd round.$" + +BattleFrontier_BattleDomePreBattleRoom_Text_24BA21: @ 824BA21 + .string "The tournament is in the semifinals.$" + +BattleFrontier_BattleDomePreBattleRoom_Text_24BA46: @ 824BA46 + .string "The tournament is up to the final.$" + +BattleFrontier_BattleDomePreBattleRoom_Text_24BA69: @ 824BA69 + .string "Would you like to save and\n" + .string "quit the game?$" + +BattleFrontier_BattleDomePreBattleRoom_Text_24BA93: @ 824BA93 + .string "Would you like to retire from your\n" + .string "Battle Tournament challenge?$" + +BattleFrontier_BattleDomePreBattleRoom_Text_24BAD3: @ 824BAD3 + .string "I am saving your data.\n" + .string "Please wait.$" + +BattleFrontier_BattleDomePreBattleRoom_Text_24BAF7: @ 824BAF7 + .string "Should I record your last match\n" + .string "on your FRONTIER PASS?$" + +BattleFrontier_BattleDomePreBattleRoom_Text_24BB2E: @ 824BB2E + .string "Congratulations for advancing\n" + .string "to the final match.\p" + .string "For the final match, you will challenge\n" + .string "the DOME ACE TUCKER.\p" + .string "Are you ready?$" + +BattleFrontier_BattleDomePreBattleRoom_Text_24BBAC: @ 824BBAC + .string "Congratulations for advancing\n" + .string "to the final match.\p" + .string "For the final match, you will challenge\n" + .string "the DOME ACE TUCKER.\p" + .string "Are you ready?$" + +BattleFrontier_BattleDomePreBattleRoom_Text_24BC2A: @ 824BC2A + .string "Your final battle against TUCKER is\n" + .string "next. Are you ready?$" + +BattleFrontier_BattleDomePreBattleRoom_Text_24BC63: @ 824BC63 + .string "Your final battle against TUCKER is\n" + .string "next. Are you ready?$" + diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc new file mode 100644 index 000000000..2ea1fbd41 --- /dev/null +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc @@ -0,0 +1,13 @@ +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 + +BattleFrontier_BattleFactoryBattleRoom_MapEvents:: @ 853CB9C + map_events BattleFrontier_BattleFactoryBattleRoom_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc new file mode 100644 index 000000000..5b6a674fb --- /dev/null +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -0,0 +1,384 @@ +BattleFrontier_BattleFactoryBattleRoom_MapScripts:: @ 825ADAB + map_script 3, BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB + map_script 4, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00 + map_script 2, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31 + .byte 0 + +BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB + setvar VAR_0x8004, 5 + special sub_81A1780 + checkplayergender + compare VAR_RESULT, 0 + call_if 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25 + compare VAR_RESULT, 1 + call_if 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B + setvar VAR_0x8004, 9 + special sub_81A1780 + copyvar VAR_TEMP_F, VAR_RESULT + compare VAR_RESULT, 0 + goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25ADF3 + end + +BattleFrontier_BattleFactoryBattleRoom_EventScript_25ADF3:: @ 825ADF3 + call BattleFrontier_BattleFactoryBattleRoom_EventScript_242170 + setobjectxyperm 2, 7, 9 + end + +BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00: @ 825AE00 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE0A + .2byte 0 + +BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE0A:: @ 825AE0A + setvar VAR_TEMP_1, 1 + hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM + compare VAR_TEMP_F, 0 + goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24 + hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM + +BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24:: @ 825AE24 + end + +BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25:: @ 825AE25 + setvar VAR_OBJ_GFX_ID_F, 100 + return + +BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B:: @ 825AE2B + setvar VAR_OBJ_GFX_ID_F, 105 + return + +BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31: @ 825AE31 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67 + .2byte 0 + +BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B:: @ 825AE3B + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1E2, 4 + closemessage + applymovement 2, BattleFrontier_BattleFactoryBattleRoom_Movement_25B18B + applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B + applymovement 255, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B + waitmovement 0 + call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4 + goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7 + end + +BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67:: @ 825AE67 + compare VAR_TEMP_F, 0 + goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B + applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B + applymovement 255, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B + waitmovement 0 + call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4 + setvar VAR_0x8004, 11 + special sub_81A5E74 + removeobject 2 + setobjectxyperm 2, 7, 1 + addobject 2 + applymovement 2, BattleFrontier_BattleFactoryBattleRoom_Movement_25B184 + waitmovement 0 + +BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7 + compare VAR_TEMP_F, 0 + goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C + setvar VAR_0x8004, 5 + special sub_8195960 + lockall + msgbox 0x2021fc4, 4 + waitmessage + closemessage + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 6 + setvar VAR_0x8006, 0 + special sub_81A1780 + special HealPlayerParty + setvar VAR_0x8004, 6 + setvar VAR_0x8005, 0 + special sub_8163AC4 + waitstate + switch VAR_RESULT + case 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF0F + +BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8:: @ 825AEF8 +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25AEF8:: @ 825AEF8 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 4 + special sub_81A1780 + goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190 +@ goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B190 + +BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF0F:: @ 825AF0F + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 3 + special sub_81A5E74 + compare VAR_RESULT, 9999 + goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E + addvar VAR_RESULT, 1 + setorcopyvar VAR_0x8006, VAR_RESULT + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + special sub_81A5E74 + +BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E:: @ 825AF3E + call BattleFrontier_BattleFactoryBattleRoom_EventScript_241EBA + +BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43:: @ 825AF43 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special sub_81A1780 + addvar VAR_RESULT, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + copyvar VAR_0x8006, VAR_RESULT + special sub_81A1780 + switch VAR_RESULT + case 7, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85 + setvar VAR_0x8006, 1 + warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 8 + waitstate + +BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85:: @ 825AF85 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 3 + special sub_81A1780 + goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190 + +BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C:: @ 825AF9C + switch VAR_TEMP_F + case 2, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051 + case 3, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF + case 4, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 7 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB, 4 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 7 + special sub_81A1780 + +BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF:: @ 825AFEF + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1, 4 + call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C + goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8 + +BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C + setvar VAR_0x8004, 12 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B42D, 4 + closemessage + applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B182 + waitmovement 0 + playfanfare MUS_ME_SYMBOLGET + message BattleFrontier_BattleFactoryBattleRoom_Text_25B460 + waitmessage + waitfanfare + setvar VAR_0x8004, 13 + special sub_81A1780 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B498, 4 + goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 + +BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051:: @ 825B051 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 7 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B517, 4 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 7 + special sub_81A1780 + +BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E:: @ 825B07E + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF, 4 + call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B + goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8 + +BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B + setvar VAR_0x8004, 12 + special sub_81A1780 + compare VAR_RESULT, 2 + goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5E7, 4 + waitmessage + applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B182 + waitmovement 0 + playfanfare MUS_ME_SYMBOLGET + message BattleFrontier_BattleFactoryBattleRoom_Text_25B640 + waitmessage + waitfanfare + setvar VAR_0x8004, 13 + special sub_81A1780 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B66D, 4 + goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 + +BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0:: @ 825B0E0 + closemessage + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 6 + setvar VAR_0x8006, 0 + special sub_81A1780 + special HealPlayerParty + setvar VAR_0x8004, 6 + setvar VAR_0x8005, 0 + special sub_8163AC4 + waitstate + return + +BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105:: @ 825B105 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 3 + special sub_81A5E74 + compare VAR_RESULT, 9999 + goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E + addvar VAR_RESULT, 1 + setorcopyvar VAR_0x8006, VAR_RESULT + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + special sub_81A5E74 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + special sub_81A5E74 + compare VAR_RESULT, 9999 + goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43 + addvar VAR_RESULT, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + copyvar VAR_0x8006, VAR_RESULT + special sub_81A5E74 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special sub_81A1780 + addvar VAR_RESULT, 1 + goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85 + end + +BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B: @ 825B17B + walk_up + walk_up + walk_up + walk_up + walk_up + face_right + step_end + +BattleFrontier_BattleFactoryBattleRoom_Movement_25B182: @ 825B182 + walk_right + step_end + +BattleFrontier_BattleFactoryBattleRoom_Movement_25B184: @ 825B184 + walk_down + walk_down + walk_down + walk_down + walk_down + face_left + step_end + +BattleFrontier_BattleFactoryBattleRoom_Movement_25B18B: @ 825B18B + walk_up + walk_up + walk_up + face_left + step_end + +BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190:: @ 825B190 +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B190:: @ 825B190 + copyvar VAR_RESULT, VAR_0x40CE + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA + warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 4, 8 + waitstate + end + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA:: @ 825B1AA + warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 14, 8 + waitstate + end + +BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4:: @ 825B1B4 + applymovement 1, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8 + applymovement 3, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8 + applymovement 4, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8 + applymovement 5, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4 + applymovement 6, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4 + applymovement 7, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4 + waitmovement 0 + return + +BattleFrontier_BattleFactoryBattleRoom_Text_25B1E2: @ 825B1E2 + .string "Hey, hey!\n" + .string "Get a move on!$" + +BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB: @ 825B1FB + .string "Hey, my name’s NOLAND!\n" + .string "I’m basically in charge of this place,\l" + .string "which is why I’m the FACTORY HEAD!\p" + .string "I had a look at your Battle Swap data.\p" + .string "You seem to have the right idea,\n" + .string "but you’re still square in your head!\p" + .string "Listen up, okay? Knowledge isn’t only\n" + .string "about reading books or doing desk work.\p" + .string "Just doing that sort of thing…\n" + .string "It may as well be useless!\p" + .string "You have to experience things with\n" + .string "your heart and your body, understand?\p" + .string "I’ll take you on under the same\n" + .string "conditions as you.\p" + .string "I’ll be using rental POKéMON, too!$" + +BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1: @ 825B3F1 + .string "Shake out every last bit of your\n" + .string "knowledge and bring it on!$" + +BattleFrontier_BattleFactoryBattleRoom_Text_25B42D: @ 825B42D + .string "NOLAND: Smart going!\n" + .string "Let’s see your FRONTIER PASS.$" + +BattleFrontier_BattleFactoryBattleRoom_Text_25B460: @ 825B460 + .string "The Knowledge Symbol was embossed\n" + .string "on the FRONTIER PASS!$" + +BattleFrontier_BattleFactoryBattleRoom_Text_25B498: @ 825B498 + .string "Heh…\n" + .string "You’re a pretty bright spark…\p" + .string "Next time, I’ll come after you hard.\n" + .string "No holds barred, understand?\p" + .string "You keep up your studies!$" + +BattleFrontier_BattleFactoryBattleRoom_Text_25B517: @ 825B517 + .string "NOLAND: Hey, hey! How’s it going?\n" + .string "You keeping up with your studies?\p" + .string "…Oh?\p" + .string "You’ve taken on a harder look than\n" + .string "the last time I saw you.\p" + .string "Now, this should be fun!\n" + .string "I’m getting excited, hey!$" + +BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF: @ 825B5CF + .string "All right!\n" + .string "Bring it on!$" + +BattleFrontier_BattleFactoryBattleRoom_Text_25B5E7: @ 825B5E7 + .string "NOLAND: What the…\n" + .string "You’re getting out of my league!\p" + .string "Sheesh!\n" + .string "Let’s see that FRONTIER PASS!$" + +BattleFrontier_BattleFactoryBattleRoom_Text_25B640: @ 825B640 + .string "The Knowledge Symbol took on\n" + .string "a golden shine!$" + +BattleFrontier_BattleFactoryBattleRoom_Text_25B66D: @ 825B66D + .string "Pfft, man!\p" + .string "That’s absolutely the last time\n" + .string "I lose to you!\p" + .string "We have to do this again, hey?$" + diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/events.inc b/data/maps/BattleFrontier_BattleFactoryLobby/events.inc new file mode 100644 index 000000000..13de4c539 --- /dev/null +++ b/data/maps/BattleFrontier_BattleFactoryLobby/events.inc @@ -0,0 +1,20 @@ +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 + +BattleFrontier_BattleFactoryLobby_MapWarps: @ 853CA68 + 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 + bg_event 11, 7, 0, 1, 0, BattleFrontier_BattleFactoryLobby_EventScript_2587FA + bg_event 9, 4, 0, 0, 0, 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_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc new file mode 100644 index 000000000..ec2483390 --- /dev/null +++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc @@ -0,0 +1,611 @@ +BattleFrontier_BattleFactoryLobby_MapScripts:: @ 82583E8 + map_script 2, BattleFrontier_BattleFactoryLobby_MapScript2_258407 + map_script 4, BattleFrontier_BattleFactoryLobby_MapScript2_2583F3 + .byte 0 + +BattleFrontier_BattleFactoryLobby_MapScript2_2583F3: @ 82583F3 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleFactoryLobby_EventScript_2583FD + .2byte 0 + +BattleFrontier_BattleFactoryLobby_EventScript_2583FD:: @ 82583FD + setvar VAR_TEMP_1, 1 + turnobject 255, 2 + end + +BattleFrontier_BattleFactoryLobby_MapScript2_258407: @ 8258407 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258431 + map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattleFactoryLobby_EventScript_25843A + map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattleFactoryLobby_EventScript_258592 + map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattleFactoryLobby_EventScript_25849B + map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattleFactoryLobby_EventScript_258506 + .2byte 0 + +BattleFrontier_BattleFactoryLobby_EventScript_258431:: @ 8258431 + setvar VAR_0x8004, 0 + special sub_81A1780 + end + +BattleFrontier_BattleFactoryLobby_EventScript_25843A:: @ 825843A + lockall + msgbox BattleFrontier_BattleFactoryLobby_Text_258ECA, 4 + closemessage + setvar VAR_0x8004, 8 + special sub_81A5E74 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 0 + special sub_81A5E74 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 0 + special sub_81A5E74 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + setvar VAR_0x8006, 0 + special sub_81A5E74 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_TEMP_0, 255 + releaseall + end + +BattleFrontier_BattleFactoryLobby_EventScript_25849B:: @ 825849B + lockall + setvar VAR_0x8004, 10 + special sub_81A1780 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleFactoryLobby_EventScript_2584BD + msgbox BattleFrontier_BattleFactoryLobby_Text_258D93, 4 + waitmessage + goto BattleFrontier_BattleFactoryLobby_EventScript_2584C6 + +BattleFrontier_BattleFactoryLobby_EventScript_2584BD:: @ 82584BD + msgbox BattleFrontier_BattleFactoryLobby_Text_25926A, 4 + waitmessage + +BattleFrontier_BattleFactoryLobby_EventScript_2584C6:: @ 82584C6 + msgbox BattleFrontier_BattleFactoryLobby_Text_2592BD, 4 + setvar VAR_0x8004, 11 + special sub_81A1780 + msgbox BattleFrontier_BattleFactoryLobby_Text_241520, 9 + message BattleFrontier_BattleFactoryLobby_Text_259323 + waitmessage + setvar VAR_0x8004, 8 + special sub_81A1780 + special LoadPlayerParty + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 0 + special sub_81A5E74 + playse SE_SAVE + waitse + goto BattleFrontier_BattleFactoryLobby_EventScript_25853B + end + +BattleFrontier_BattleFactoryLobby_EventScript_258506:: @ 8258506 + lockall + message BattleFrontier_BattleFactoryLobby_Text_258CC7 + waitmessage + setvar VAR_0x8004, 8 + special sub_81A1780 + special LoadPlayerParty + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + setvar VAR_0x8006, 0 + special sub_81A5E74 + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 0 + special sub_81A5E74 + playse SE_SAVE + waitse + +BattleFrontier_BattleFactoryLobby_EventScript_25853B:: @ 825853B + call BattleFrontier_BattleFactoryLobby_EventScript_23E8E0 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleFactoryLobby_EventScript_258582 + message BattleFrontier_BattleFactoryLobby_Text_259388 + waitmessage + multichoicedefault 20, 8, 94, 1, 0 + switch VAR_RESULT + case 1, BattleFrontier_BattleFactoryLobby_EventScript_258582 + case 0, BattleFrontier_BattleFactoryLobby_EventScript_25857D + case 127, BattleFrontier_BattleFactoryLobby_EventScript_258582 + +BattleFrontier_BattleFactoryLobby_EventScript_25857D:: @ 825857D + call BattleFrontier_BattleFactoryLobby_EventScript_23E8B4 + +BattleFrontier_BattleFactoryLobby_EventScript_258582:: @ 8258582 + msgbox BattleFrontier_BattleFactoryLobby_Text_258BC5, 4 + closemessage + setvar VAR_TEMP_0, 255 + releaseall + end + +BattleFrontier_BattleFactoryLobby_EventScript_258592:: @ 8258592 + lockall + message BattleFrontier_BattleFactoryLobby_Text_258E77 + waitmessage + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 1 + special sub_81A5E74 + playse SE_SAVE + waitse + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_TEMP_0, 255 + setvar VAR_0x8006, 2 + goto BattleFrontier_BattleFactoryLobby_EventScript_25871A + +BattleFrontier_BattleFactoryLobby_EventScript_2585CB:: @ 82585CB + lock + faceplayer + setvar VAR_FRONTIER_FACILITY, 4 + setvar VAR_0x40CE, 0 + goto BattleFrontier_BattleFactoryLobby_EventScript_2585ED + end + +BattleFrontier_BattleFactoryLobby_EventScript_2585DD:: @ 82585DD + setvar VAR_FRONTIER_FACILITY, 4 + setvar VAR_0x40CE, 1 + goto BattleFrontier_BattleFactoryLobby_EventScript_2585ED + end + +BattleFrontier_BattleFactoryLobby_EventScript_2585ED:: @ 82585ED + special SavePlayerParty + compare VAR_0x40CE, 0 + call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587B1 + compare VAR_0x40CE, 1 + call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587BA + +BattleFrontier_BattleFactoryLobby_EventScript_258606:: @ 8258606 + compare VAR_0x40CE, 0 + call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587C3 + compare VAR_0x40CE, 1 + call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587C9 + waitmessage + multichoice 17, 6, 23, 0 + switch VAR_RESULT + case 0, BattleFrontier_BattleFactoryLobby_EventScript_258653 + case 1, BattleFrontier_BattleFactoryLobby_EventScript_258768 + case 2, BattleFrontier_BattleFactoryLobby_EventScript_25879D + case 127, BattleFrontier_BattleFactoryLobby_EventScript_25879D + +BattleFrontier_BattleFactoryLobby_EventScript_258653:: @ 8258653 + message BattleFrontier_BattleFactoryLobby_Text_258BE9 + waitmessage + multichoice 17, 6, 24, 0 + switch VAR_RESULT + case 2, BattleFrontier_BattleFactoryLobby_EventScript_25879D + case 127, BattleFrontier_BattleFactoryLobby_EventScript_25879D + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + copyvar VAR_0x8006, VAR_RESULT + special sub_81A1780 + msgbox BattleFrontier_BattleFactoryLobby_Text_258C27, 5 + switch VAR_RESULT + case 0, BattleFrontier_BattleFactoryLobby_EventScript_25879A + case 1, BattleFrontier_BattleFactoryLobby_EventScript_2586B9 + case 127, BattleFrontier_BattleFactoryLobby_EventScript_25879A + +BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9 + setvar VAR_TEMP_0, 0 + setvar VAR_0x8004, 0 + special sub_81A5E74 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 1 + special sub_81A1780 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + setvar VAR_0x8006, 1 + special sub_81A5E74 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 0 + special sub_81A1780 + closemessage + delay 2 + call BattleFrontier_BattleFactoryLobby_EventScript_27134F + setvar VAR_TEMP_0, 255 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattleFactoryLobby_EventScript_258783 + setvar VAR_0x8006, 0 + +BattleFrontier_BattleFactoryLobby_EventScript_25871A:: @ 825871A + special SavePlayerParty + msgbox BattleFrontier_BattleFactoryLobby_Text_258CB1, 4 + closemessage + compare VAR_0x40CE, 0 + call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_25875C + compare VAR_0x40CE, 1 + call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_258762 + applymovement VAR_LAST_TALKED, BattleFrontier_BattleFactoryLobby_Movement_2587A7 + applymovement 255, BattleFrontier_BattleFactoryLobby_Movement_2587AC + waitmovement 0 + warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 13 + setvar VAR_TEMP_0, 0 + waitstate + end + +BattleFrontier_BattleFactoryLobby_EventScript_25875C:: @ 825875C + setvar VAR_LAST_TALKED, 1 + return + +BattleFrontier_BattleFactoryLobby_EventScript_258762:: @ 8258762 + setvar VAR_LAST_TALKED, 6 + return + +BattleFrontier_BattleFactoryLobby_EventScript_258768:: @ 8258768 + compare VAR_0x40CE, 0 + call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587CF + compare VAR_0x40CE, 1 + call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587D8 + goto BattleFrontier_BattleFactoryLobby_EventScript_258606 + +BattleFrontier_BattleFactoryLobby_EventScript_258783:: @ 8258783 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 0 + special sub_81A1780 + goto BattleFrontier_BattleFactoryLobby_EventScript_25879D + +BattleFrontier_BattleFactoryLobby_EventScript_25879A:: @ 825879A + special LoadPlayerParty + +BattleFrontier_BattleFactoryLobby_EventScript_25879D:: @ 825879D + msgbox BattleFrontier_BattleFactoryLobby_Text_258BC5, 4 + release + end + +BattleFrontier_BattleFactoryLobby_Movement_2587A7: @ 82587A7 + walk_up + walk_up + walk_up + set_invisible + step_end + +BattleFrontier_BattleFactoryLobby_Movement_2587AC: @ 82587AC + walk_up + walk_up + walk_up + walk_up + step_end + +BattleFrontier_BattleFactoryLobby_EventScript_2587B1:: @ 82587B1 + msgbox BattleFrontier_BattleFactoryLobby_Text_2588EE, 4 + return + +BattleFrontier_BattleFactoryLobby_EventScript_2587BA:: @ 82587BA + msgbox BattleFrontier_BattleFactoryLobby_Text_258F93, 4 + return + +BattleFrontier_BattleFactoryLobby_EventScript_2587C3:: @ 82587C3 + message BattleFrontier_BattleFactoryLobby_Text_25897A + return + +BattleFrontier_BattleFactoryLobby_EventScript_2587C9:: @ 82587C9 + message BattleFrontier_BattleFactoryLobby_Text_25901F + return + +BattleFrontier_BattleFactoryLobby_EventScript_2587CF:: @ 82587CF + msgbox BattleFrontier_BattleFactoryLobby_Text_2589B3, 4 + return + +BattleFrontier_BattleFactoryLobby_EventScript_2587D8:: @ 82587D8 + msgbox BattleFrontier_BattleFactoryLobby_Text_259058, 4 + return + +BattleFrontier_BattleFactoryLobby_EventScript_2587E1:: @ 82587E1 + lockall + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 4 + setvar VAR_0x8006, 0 + special sub_81A1780 + waitbuttonpress + special RemoveRecordsWindow + releaseall + end + +BattleFrontier_BattleFactoryLobby_EventScript_2587FA:: @ 82587FA + lockall + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 4 + setvar VAR_0x8006, 1 + special sub_81A1780 + waitbuttonpress + special RemoveRecordsWindow + releaseall + end + +BattleFrontier_BattleFactoryLobby_EventScript_258813:: @ 8258813 + msgbox BattleFrontier_BattleFactoryLobby_Text_2593D7, 2 + end + +BattleFrontier_BattleFactoryLobby_EventScript_25881C:: @ 825881C + msgbox BattleFrontier_BattleFactoryLobby_Text_2594E5, 2 + end + +BattleFrontier_BattleFactoryLobby_EventScript_258825:: @ 8258825 + lock + msgbox BattleFrontier_BattleFactoryLobby_Text_259547, 4 + release + end + +BattleFrontier_BattleFactoryLobby_EventScript_258830:: @ 8258830 + msgbox BattleFrontier_BattleFactoryLobby_Text_2595C4, 2 + end + +BattleFrontier_BattleFactoryLobby_EventScript_258839:: @ 8258839 + lockall + msgbox BattleFrontier_BattleFactoryLobby_Text_259721, 4 + goto BattleFrontier_BattleFactoryLobby_EventScript_258848 + end + +BattleFrontier_BattleFactoryLobby_EventScript_258848:: @ 8258848 + message BattleFrontier_BattleFactoryLobby_Text_259743 + waitmessage + multichoice 17, 0, 99, 0 + switch VAR_RESULT + case 0, BattleFrontier_BattleFactoryLobby_EventScript_2588A6 + case 1, BattleFrontier_BattleFactoryLobby_EventScript_2588B4 + case 2, BattleFrontier_BattleFactoryLobby_EventScript_2588C2 + case 3, BattleFrontier_BattleFactoryLobby_EventScript_2588D0 + case 4, BattleFrontier_BattleFactoryLobby_EventScript_2588DE + case 5, BattleFrontier_BattleFactoryLobby_EventScript_2588EC + case 127, BattleFrontier_BattleFactoryLobby_EventScript_2588EC + end + +BattleFrontier_BattleFactoryLobby_EventScript_2588A6:: @ 82588A6 + msgbox BattleFrontier_BattleFactoryLobby_Text_259766, 4 + goto BattleFrontier_BattleFactoryLobby_EventScript_258848 + end + +BattleFrontier_BattleFactoryLobby_EventScript_2588B4:: @ 82588B4 + msgbox BattleFrontier_BattleFactoryLobby_Text_2597FB, 4 + goto BattleFrontier_BattleFactoryLobby_EventScript_258848 + end + +BattleFrontier_BattleFactoryLobby_EventScript_2588C2:: @ 82588C2 + msgbox BattleFrontier_BattleFactoryLobby_Text_25987E, 4 + goto BattleFrontier_BattleFactoryLobby_EventScript_258848 + end + +BattleFrontier_BattleFactoryLobby_EventScript_2588D0:: @ 82588D0 + msgbox BattleFrontier_BattleFactoryLobby_Text_259920, 4 + goto BattleFrontier_BattleFactoryLobby_EventScript_258848 + end + +BattleFrontier_BattleFactoryLobby_EventScript_2588DE:: @ 82588DE + msgbox BattleFrontier_BattleFactoryLobby_Text_259A5E, 4 + goto BattleFrontier_BattleFactoryLobby_EventScript_258848 + end + +BattleFrontier_BattleFactoryLobby_EventScript_2588EC:: @ 82588EC + releaseall + end + +BattleFrontier_BattleFactoryLobby_Text_2588EE: @ 82588EE + .string "Where the intelligence of TRAINERS\n" + .string "is put to the test!\p" + .string "Welcome to the BATTLE FACTORY!\p" + .string "I am your guide to the Battle Swap\n" + .string "Single Tournament.$" + +BattleFrontier_BattleFactoryLobby_Text_25897A: @ 825897A + .string "Would you like to take the Battle\n" + .string "Swap Single challenge?$" + +BattleFrontier_BattleFactoryLobby_Text_2589B3: @ 82589B3 + .string "The Battle Swap Single Tournament\n" + .string "is a SINGLE BATTLE competition using\l" + .string "only rental POKéMON.\p" + .string "First, you will be loaned three\n" + .string "POKéMON specifically for this event.\p" + .string "Using the supplied rental POKéMON,\n" + .string "you must conduct a SINGLE BATTLE.\p" + .string "If you win, you are permitted to trade\n" + .string "one of your rental POKéMON.\p" + .string "Repeat this cycle of battling and\n" + .string "trading--if you win seven times in\l" + .string "a row, you will earn Battle Points.\p" + .string "If you want to interrupt your\n" + .string "challenge, please save the game.\p" + .string "If you don’t save, you will be\n" + .string "disqualified from your challenge.$" + +BattleFrontier_BattleFactoryLobby_Text_258BC5: @ 8258BC5 + .string "We look forward to your next visit.$" + +BattleFrontier_BattleFactoryLobby_Text_258BE9: @ 8258BE9 + .string "Which level do you wish to challenge?\n" + .string "Level 50 or Open Level?$" + +BattleFrontier_BattleFactoryLobby_Text_258C27: @ 8258C27 + .string "Before you begin your challenge,\n" + .string "I need to save the game. Is that okay?$" + +BattleFrontier_BattleFactoryLobby_Text_258C6F: @ 8258C6F + .string "Okay, I will hold your POKéMON for\n" + .string "safekeeping while you compete.$" + +BattleFrontier_BattleFactoryLobby_Text_258CB1: @ 8258CB1 + .string "Please step this way.$" + +BattleFrontier_BattleFactoryLobby_Text_258CC7: @ 8258CC7 + .string "Thank you for participating!\p" + .string "I will return your POKéMON in exchange\n" + .string "for our rental POKéMON.\p" + .string "I must also save the event results.\n" + .string "Please wait.$" + +BattleFrontier_BattleFactoryLobby_Text_258D54: @ 8258D54 + .string "I will return your POKéMON in exchange\n" + .string "for our rental POKéMON.$" + +BattleFrontier_BattleFactoryLobby_Text_258D93: @ 8258D93 + .string "Congratulations! You’ve won seven\n" + .string "straight Battle Swap matches!$" + +BattleFrontier_BattleFactoryLobby_Text_258DD3: @ 8258DD3 + .string "In recognition of your 7-win streak,\n" + .string "we award you these Battle Point(s).$" + +BattleFrontier_BattleFactoryLobby_Text_258E1C: @ 8258E1C + .string "Oh, oh, oh!\p" + .string "Your Battle Points are maxed.\p" + .string "Please come back after using\n" + .string "some Battle Points.$" + +BattleFrontier_BattleFactoryLobby_Text_258E77: @ 8258E77 + .string "We’ve been waiting for you!\p" + .string "Before we resume your challenge,\n" + .string "I must save the game.$" + +BattleFrontier_BattleFactoryLobby_Text_258ECA: @ 8258ECA + .string "I’m sorry to say this, but you didn’t\n" + .string "save before you quit playing last time.\p" + .string "As a result, you have been disqualified\n" + .string "from your challenge.$" + +BattleFrontier_BattleFactoryLobby_Text_258F55: @ 8258F55 + .string "We’ll return your personal POKéMON.$" + +BattleFrontier_BattleFactoryLobby_Text_258F79: @ 8258F79 + .string "{PLAYER} received the prize\n" + .string "{STR_VAR_1}.$" + +BattleFrontier_BattleFactoryLobby_Text_258F93: @ 8258F93 + .string "Where the intelligence of TRAINERS\n" + .string "is put to the test!\p" + .string "Welcome to the BATTLE FACTORY!\p" + .string "I am your guide to the Battle Swap\n" + .string "Double Tournament.$" + +BattleFrontier_BattleFactoryLobby_Text_25901F: @ 825901F + .string "Would you like to take the Battle\n" + .string "Swap Double challenge?$" + +BattleFrontier_BattleFactoryLobby_Text_259058: @ 8259058 + .string "The Battle Swap Double Tournament\n" + .string "is a DOUBLE BATTLE competition using\l" + .string "only rental POKéMON.\p" + .string "First, you will be loaned three\n" + .string "POKéMON specifically for this event.\p" + .string "Using the supplied rental POKéMON,\n" + .string "you must conduct a DOUBLE BATTLE.\p" + .string "If you win, you are permitted to trade\n" + .string "one of your rental POKéMON.\p" + .string "Repeat this cycle of battling and\n" + .string "trading--if you win seven times in\l" + .string "a row, you will earn Battle Points.\p" + .string "If you want to interrupt your\n" + .string "challenge, please save the game.\p" + .string "If you don’t save before interrupting,\n" + .string "you will be disqualified.$" + +BattleFrontier_BattleFactoryLobby_Text_25926A: @ 825926A + .string "Congratulations for defeating\n" + .string "the FACTORY HEAD and winning\l" + .string "seven matches in a row!$" + +BattleFrontier_BattleFactoryLobby_Text_2592BD: @ 82592BD + .string "In recognition of your wealth of\n" + .string "knowledge and keen intelligence,\l" + .string "we award you these Battle Point(s).$" + +BattleFrontier_BattleFactoryLobby_Text_259323: @ 8259323 + .string "Let me exchange your POKéMON\n" + .string "for our rental POKéMON.\p" + .string "I need to save the battle data,\n" + .string "so please wait.$" + +BattleFrontier_BattleFactoryLobby_Text_259388: @ 8259388 + .string "Would you like to record your last\n" + .string "BATTLE FACTORY match on your\l" + .string "FRONTIER PASS?$" + +BattleFrontier_BattleFactoryLobby_Text_2593D7: @ 82593D7 + .string "Hi!\n" + .string "You, there!\p" + .string "Are you thinking that the events here\n" + .string "are easy since you don’t need to have\l" + .string "a raised team of POKéMON?\p" + .string "I wouldn’t be too sure about winning\n" + .string "that easily.\p" + .string "If you don’t have thorough knowledge\n" + .string "about POKéMON and their moves,\l" + .string "it will be tough to keep winning.$" + +BattleFrontier_BattleFactoryLobby_Text_2594E5: @ 82594E5 + .string "I swapped for a weak POKéMON…\n" + .string "I thought it was a good kind to have…\p" + .string "They wiped the floor with us…$" + +BattleFrontier_BattleFactoryLobby_Text_259547: @ 8259547 + .string "Things haven’t been going my way\n" + .string "at all.\p" + .string "You need to check your opponent’s\n" + .string "POKéMON during battle to see if\l" + .string "they’re any good.$" + +BattleFrontier_BattleFactoryLobby_Text_2595C4: @ 82595C4 + .string "You know how the staff here give you\n" + .string "a few hints about your next opponent?\p" + .string "Well, I’m a full-grown man, but I have\n" + .string "trouble figuring out their hints.$" + +BattleFrontier_BattleFactoryLobby_Text_259658: @ 8259658 + .string "Like, I’m really tough, but I get bored\n" + .string "really easily, so I just kept swapping\l" + .string "and battling over and over.\p" + .string "So anyway, when I kept entering\n" + .string "Battle Swap events, I noticed they\l" + .string "varied the rental POKéMON.$" + +BattleFrontier_BattleFactoryLobby_Text_259721: @ 8259721 +SlateportCity_BattleTentLobby_Text_259721: @ 8259721 + .string "The Battle Swap rules are listed.$" + +BattleFrontier_BattleFactoryLobby_Text_259743: @ 8259743 +SlateportCity_BattleTentLobby_Text_259743: @ 8259743 + .string "Which heading do you want to read?$" + +BattleFrontier_BattleFactoryLobby_Text_259766: @ 8259766 + .string "In a Battle Swap event, you may use\n" + .string "only three POKéMON.\p" + .string "Whether you are renting or swapping,\n" + .string "your team may not have two or more\l" + .string "of the same POKéMON.$" + +BattleFrontier_BattleFactoryLobby_Text_2597FB: @ 82597FB + .string "You may swap POKéMON only with\n" + .string "the TRAINER you have just defeated.\p" + .string "You may swap for only those POKéMON\n" + .string "used by the beaten TRAINER.$" + +BattleFrontier_BattleFactoryLobby_Text_25987E: @ 825987E + .string "After every battle you win, you may\n" + .string "swap for one of your defeated\l" + .string "opponent’s POKéMON.\p" + .string "You will not be able to swap POKéMON\n" + .string "with the seventh TRAINER in the event.$" + +BattleFrontier_BattleFactoryLobby_Text_259920: @ 8259920 + .string "There are two key points to be aware\n" + .string "of when swapping POKéMON.\p" + .string "First, when swapping, you can’t check\n" + .string "the stats of the POKéMON you are\l" + .string "about to receive.\p" + .string "Second, the POKéMON on your team\n" + .string "are lined up in sequence, depending on\l" + .string "the order in which you rented them.\p" + .string "This sequence remains unchanged\n" + .string "even when swaps are made.$" + +BattleFrontier_BattleFactoryLobby_Text_259A5E: @ 8259A5E + .string "In the Open Level, the rental POKéMON\n" + .string "and the opposing TRAINERS’ POKéMON\l" + .string "are all Level 100.$" diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc new file mode 100644 index 000000000..b8ffbfc6d --- /dev/null +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc @@ -0,0 +1,6 @@ +BattleFrontier_BattleFactoryPreBattleRoom_EventObjects: @ 853CAB0 + 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/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc new file mode 100644 index 000000000..e05c49885 --- /dev/null +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc @@ -0,0 +1,726 @@ +BattleFrontier_BattleFactoryPreBattleRoom_MapScripts:: @ 8259ABA + map_script 2, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF + map_script 4, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5 + .byte 0 + +BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5: @ 8259AC5 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259ACF + .2byte 0 + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259ACF:: @ 8259ACF + setvar VAR_TEMP_1, 1 + compare VAR_0x8006, 1 + goto_if 5, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA + setobjectxy 1, 8, 7 + turnobject 1, 1 + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA:: @ 8259AEA + turnobject 255, 2 + end + +BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF: @ 8259AEF + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AF9 + .2byte 0 + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AF9:: @ 8259AF9 + compare VAR_0x8006, 1 + goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5 + setvar VAR_TEMP_0, 1 + applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1AC + applymovement 255, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A + waitmovement 0 + compare VAR_0x8006, 2 + goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69 + setvar VAR_0x8004, 13 + special sub_81A5E74 + setvar VAR_0x8004, 12 + special sub_81A5E74 + setvar VAR_0x8004, 14 + special sub_81A5E74 + setorcopyvar VAR_0x8005, VAR_RESULT + setvar VAR_0x8004, 15 + special sub_81A5E74 + setorcopyvar VAR_0x8006, VAR_RESULT + call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93 + call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A1C8, 4 + fadescreen 1 + setvar VAR_0x8004, 8 + special sub_81A5E74 + setvar VAR_0x8004, 6 + special sub_81A5E74 + waitstate + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74:: @ 8259B74 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB96, 4 + closemessage + call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23F2B7 + compare VAR_RESULT, 0 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A17C + compare VAR_RESULT, 1 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B + waitmovement 0 + warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM, 255, 6, 11 + waitstate + end + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5 + setvar VAR_0x8004, 9 + special sub_81A5E74 + setvar VAR_0x8004, 16 + special sub_81A5E74 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A22D, 4 + playfanfare MUS_ME_ASA + waitfanfare + special HealPlayerParty + setvar VAR_0x8004, 9 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26 + playse 263 + waitse + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC15, 4 + closemessage + applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1BF + waitmovement 0 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC58, 4 + closemessage + applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1C3 + waitmovement 0 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC89, 4 + closemessage + delay 16 + goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9 + end + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13:: @ 8259C13 + setvar VAR_0x8004, 9 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_if 5, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9 + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26:: @ 8259C26 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special sub_81A1780 + compare VAR_RESULT, 1 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E1D + compare VAR_RESULT, 2 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E24 + compare VAR_RESULT, 3 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E2B + compare VAR_RESULT, 4 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E32 + compare VAR_RESULT, 5 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E39 + compare VAR_RESULT, 6 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E40 + call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CC6 + multichoice 19, 4, 103, 1 + switch VAR_RESULT + case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98 + case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CFC + case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38 + case 3, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66 + case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CC6:: @ 8259CC6 + multichoice 20, 6, 104, 1 + switch VAR_RESULT + case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98 + case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38 + case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66 + case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CFC:: @ 8259CFC + message BattleFrontier_BattleFactoryPreBattleRoom_Text_25ABD2 + waitmessage + multichoicedefault 20, 8, 94, 1, 0 + switch VAR_RESULT + case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 + case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D2E + case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D2E:: @ 8259D2E + call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8B4 + goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38:: @ 8259D38 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A350, 5 + switch VAR_RESULT + case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 + case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47 + case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66:: @ 8259D66 + message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A37A + waitmessage + multichoicedefault 20, 8, 94, 1, 0 + switch VAR_RESULT + case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 + case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25AEF8 + case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98:: @ 8259D98 + setvar VAR_0x8004, 12 + special sub_81A5E74 + setvar VAR_0x8004, 14 + special sub_81A5E74 + setorcopyvar VAR_0x8005, VAR_RESULT + setvar VAR_0x8004, 15 + special sub_81A5E74 + setorcopyvar VAR_0x8006, VAR_RESULT + call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93 + call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB2E, 5 + switch VAR_RESULT + case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 + case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2 + case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2:: @ 8259DF2 + fadescreen 1 + setvar VAR_0x8004, 7 + special sub_81A5E74 + waitstate + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 + setvar VAR_0x8004, 8 + special sub_81A5E74 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB6C, 4 + goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E1D:: @ 8259E1D + message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A263 + waitmessage + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E24:: @ 8259E24 + message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A289 + waitmessage + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E2B:: @ 8259E2B + message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A2AF + waitmessage + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E32:: @ 8259E32 + message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A2D5 + waitmessage + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E39:: @ 8259E39 + message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A2FB + waitmessage + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E40:: @ 8259E40 + message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A321 + waitmessage + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47:: @ 8259E47 + message BattleFrontier_BattleFactoryPreBattleRoom_Text_25ABAE + waitmessage + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 2 + special sub_81A5E74 + playse SE_SAVE + waitse + fadescreen 1 + setvar VAR_0x8004, 4 + special sub_81A1780 + end + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69 + special SavePlayerParty + setvar VAR_0x8004, 10 + setvar VAR_0x8005, 0 + special sub_81A5E74 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 6 + setvar VAR_0x8006, 1 + special sub_81A1780 + special CalculatePlayerPartyCount + goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93:: @ 8259E93 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3B4, 4 + compare VAR_0x8005, 0 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62 + compare VAR_0x8005, 1 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F6B + compare VAR_0x8005, 2 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F74 + compare VAR_0x8005, 3 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F7D + compare VAR_0x8005, 4 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F86 + compare VAR_0x8005, 5 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F8F + compare VAR_0x8005, 6 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F98 + compare VAR_0x8005, 7 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FA1 + compare VAR_0x8005, 8 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FAA + compare VAR_0x8005, 10 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FB3 + compare VAR_0x8005, 11 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FBC + compare VAR_0x8005, 12 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FC5 + compare VAR_0x8005, 13 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FCE + compare VAR_0x8005, 14 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FD7 + compare VAR_0x8005, 15 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE0 + compare VAR_0x8005, 16 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE9 + compare VAR_0x8005, 17 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FF2 + compare VAR_0x8005, 18 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62:: @ 8259F62 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3F8, 4 + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F6B:: @ 8259F6B + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A597, 4 + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F74:: @ 8259F74 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A66B, 4 + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F7D:: @ 8259F7D + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A5DF, 4 + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F86:: @ 8259F86 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A625, 4 + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F8F:: @ 8259F8F + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A73B, 4 + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F98:: @ 8259F98 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6F8, 4 + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FA1:: @ 8259FA1 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A77F, 4 + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FAA:: @ 8259FAA + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A84E, 4 + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FB3:: @ 8259FB3 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A43E, 4 + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FBC:: @ 8259FBC + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A482, 4 + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FC5:: @ 8259FC5 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A50F, 4 + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FCE:: @ 8259FCE + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A4C7, 4 + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FD7:: @ 8259FD7 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6B1, 4 + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE0:: @ 8259FE0 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A554, 4 + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE9:: @ 8259FE9 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A7C4, 4 + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FF2:: @ 8259FF2 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A80A, 4 + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB:: @ 8259FFB + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A893, 4 + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004:: @ 825A004 + compare VAR_0x8006, 0 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A068 + compare VAR_0x8006, 1 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A071 + compare VAR_0x8006, 2 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A07A + compare VAR_0x8006, 3 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A083 + compare VAR_0x8006, 4 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A08C + compare VAR_0x8006, 5 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A095 + compare VAR_0x8006, 6 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A09E + compare VAR_0x8006, 7 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0A7 + compare VAR_0x8006, 8 + call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B0 + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A068:: @ 825A068 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AAE6, 4 + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A071:: @ 825A071 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A9CE, 4 + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A07A:: @ 825A07A + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A8D9, 4 + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A083:: @ 825A083 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A912, 4 + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A08C:: @ 825A08C + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A94C, 4 + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A095:: @ 825A095 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AA16, 4 + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A09E:: @ 825A09E + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AAA7, 4 + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0A7:: @ 825A0A7 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A98C, 4 + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B0:: @ 825A0B0 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AA5A, 4 + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9:: @ 825A0B9 + message BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD20 + waitmessage + call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A110 + multichoice 19, 4, 103, 1 + switch VAR_RESULT + case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146 + case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CFC + case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38 + case 3, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66 + case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9 + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A110:: @ 825A110 + multichoice 20, 6, 104, 1 + switch VAR_RESULT + case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146 + case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38 + case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66 + case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9 + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146:: @ 825A146 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD61, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB2E, 5 + switch VAR_RESULT + case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 + case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2 + case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A17C:: @ 825A17C + applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B3 + applymovement 255, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A0 + return + +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B:: @ 825A18B + applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B9 + applymovement 255, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A6 + return + +BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A: @ 825A19A + walk_up + walk_up + walk_up + walk_up + walk_up + step_end + +BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A0: @ 825A1A0 + walk_up + walk_left + walk_left + walk_up + walk_up + step_end + +BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A6: @ 825A1A6 + walk_up + walk_right + walk_right + walk_up + walk_up + step_end + +BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1AC: @ 825A1AC + walk_up + walk_up + walk_up + walk_up + walk_up + face_down + step_end + +BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B3: @ 825A1B3 + walk_left + walk_left + walk_up + walk_up + set_invisible + step_end + +BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B9: @ 825A1B9 + walk_right + walk_right + walk_up + walk_up + set_invisible + step_end + +BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1BF: @ 825A1BF + walk_left + walk_left + walk_left + step_end + +BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1C3: @ 825A1C3 + walk_right + walk_right + walk_right + face_down + step_end + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A1C8: @ 825A1C8 +SlateportCity_BattleTentCorridor_Text_25A1C8: @ 825A1C8 + .string "First, we will hold your POKéMON for\n" + .string "safekeeping.\p" + .string "You may then choose from our\n" + .string "selection of POKéMON.$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A22D: @ 825A22D +SlateportCity_BattleTentCorridor_Text_25A22D: @ 825A22D + .string "Thank you for competing!\n" + .string "Let us restore your POKéMON!$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A263: @ 825A263 +SlateportCity_BattleTentCorridor_Text_25A263: @ 825A263 + .string "The 2nd match is next!\n" + .string "Are you ready?$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A289: @ 825A289 +SlateportCity_BattleTentCorridor_Text_25A289: @ 825A289 + .string "The 3rd match is next!\n" + .string "Are you ready?$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A2AF: @ 825A2AF + .string "The 4th match is next!\n" + .string "Are you ready?$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A2D5: @ 825A2D5 + .string "The 5th match is next!\n" + .string "Are you ready?$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A2FB: @ 825A2FB + .string "The 6th match is next!\n" + .string "Are you ready?$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A321: @ 825A321 + .string "Finally, the 7th match is next!\n" + .string "Are you ready?$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A350: @ 825A350 +SlateportCity_BattleTentCorridor_Text_25A350: @ 825A350 + .string "Would you like to save and quit\n" + .string "the game?$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A37A: @ 825A37A +SlateportCity_BattleTentCorridor_Text_25A37A: @ 825A37A + .string "Would you like to retire from your\n" + .string "Battle Swap challenge?$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3B4: @ 825A3B4 + .string "I’ve conducted a little investigation\n" + .string "about your upcoming opponent.$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3F8: @ 825A3F8 + .string "The TRAINER is apparently skilled\n" + .string "in the handling of the NORMAL type.$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A43E: @ 825A43E + .string "The TRAINER is apparently skilled\n" + .string "in the handling of the FIRE type.$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A482: @ 825A482 + .string "The TRAINER is apparently skilled\n" + .string "in the handling of the WATER type.$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A4C7: @ 825A4C7 + .string "The TRAINER is apparently skilled\n" + .string "in the handling of the ELECTRIC type.$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A50F: @ 825A50F + .string "The TRAINER is apparently skilled\n" + .string "in the handling of the GRASS type.$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A554: @ 825A554 + .string "The TRAINER is apparently skilled\n" + .string "in the handling of the ICE type.$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A597: @ 825A597 + .string "The TRAINER is apparently skilled\n" + .string "in the handling of the FIGHTING type.$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A5DF: @ 825A5DF + .string "The TRAINER is apparently skilled\n" + .string "in the handling of the POISON type.$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A625: @ 825A625 + .string "The TRAINER is apparently skilled\n" + .string "in the handling of the GROUND type.$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A66B: @ 825A66B + .string "The TRAINER is apparently skilled\n" + .string "in the handling of the FLYING type.$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6B1: @ 825A6B1 + .string "The TRAINER is apparently skilled\n" + .string "in the handling of the PSYCHIC type.$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6F8: @ 825A6F8 + .string "The TRAINER is apparently skilled\n" + .string "in the handling of the BUG type.$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A73B: @ 825A73B + .string "The TRAINER is apparently skilled\n" + .string "in the handling of the ROCK type.$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A77F: @ 825A77F + .string "The TRAINER is apparently skilled\n" + .string "in the handling of the GHOST type.$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A7C4: @ 825A7C4 + .string "The TRAINER is apparently skilled\n" + .string "in the handling of the DRAGON type.$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A80A: @ 825A80A + .string "The TRAINER is apparently skilled\n" + .string "in the handling of the DARK type.$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A84E: @ 825A84E + .string "The TRAINER is apparently skilled\n" + .string "in the handling of the STEEL type.$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A893: @ 825A893 + .string "The TRAINER appears to have no clear\n" + .string "favorites when it comes to type.$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A8D9: @ 825A8D9 + .string "The favorite battle style appears to\n" + .string "be slow and steady.$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A912: @ 825A912 + .string "The favorite battle style appears to\n" + .string "be one of endurance.$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A94C: @ 825A94C + .string "The favorite battle style appears to\n" + .string "be high risk, high return.$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A98C: @ 825A98C + .string "The favorite battle style appears to\n" + .string "depend on the battle’s flow.$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25A9CE: @ 825A9CE + .string "The favorite battle style appears to\n" + .string "be one based on total preparation.$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25AA16: @ 825AA16 + .string "The favorite battle style appears\n" + .string "to be weakening the foe to start.$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25AA5A: @ 825AA5A + .string "The favorite battle style appears to\n" + .string "be flexibly adaptable to the situation.$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25AAA7: @ 825AAA7 + .string "The favorite battle style appears to\n" + .string "be impossible to predict.$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25AAE6: @ 825AAE6 + .string "The favorite battle style appears to\n" + .string "be free-spirited and unrestrained.$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB2E: @ 825AB2E +SlateportCity_BattleTentCorridor_Text_25AB2E: @ 825AB2E + .string "Before starting the battle, would you\n" + .string "like to swap a POKéMON?$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB6C: @ 825AB6C +SlateportCity_BattleTentCorridor_Text_25AB6C: @ 825AB6C + .string "Thank you!\n" + .string "Your POKéMON swap is complete.$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB96: @ 825AB96 +SlateportCity_BattleTentCorridor_Text_25AB96: @ 825AB96 + .string "Right this way, please!$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25ABAE: @ 825ABAE +SlateportCity_BattleTentCorridor_Text_25ABAE: @ 825ABAE + .string "I am saving your data.\n" + .string "Please wait.$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25ABD2: @ 825ABD2 + .string "Would you like to record your latest\n" + .string "battle on your FRONTIER PASS?$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC15: @ 825AC15 + .string "Excuse me! Excuse me, please!\n" + .string "May I get you to wait a few moments?$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC58: @ 825AC58 + .string "…Uh-huh? What?! …Whoa!\n" + .string "Understood, sir! Will do!$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC89: @ 825AC89 + .string "Oh, my…\n" + .string "Sorry to keep you waiting!\p" + .string "I have a message from this facility’s\n" + .string "boss, the FACTORY HEAD.\p" + .string "He says, “We’re going to do it!\n" + .string "Come here right now!â€$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD20: @ 825AD20 + .string "The FACTORY HEAD is demanding you.\n" + .string "Are you prepared to face him?$" + +BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD61: @ 825AD61 + .string "I’m terribly sorry, but I can’t tell you\n" + .string "anything about the FACTORY HEAD.$" diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc new file mode 100644 index 000000000..bc1d5a525 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc @@ -0,0 +1,14 @@ +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 + +BattleFrontier_BattlePalaceBattleRoom_MapWarps: @ 853C574 + 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/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc new file mode 100644 index 000000000..2ae154927 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -0,0 +1,650 @@ +BattleFrontier_BattlePalaceBattleRoom_MapScripts:: @ 824F815 + map_script 3, BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825 + map_script 2, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861 + map_script 4, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34 + .byte 0 + +BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825: @ 824F825 + setvar VAR_0x8004, 5 + special sub_81A1780 + call BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833 + end + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833:: @ 824F833 + checkplayergender + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856 + return + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B:: @ 824F84B + setvar VAR_OBJ_GFX_ID_1, 100 + setvar VAR_OBJ_GFX_ID_0, 100 + return + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856:: @ 824F856 + setvar VAR_OBJ_GFX_ID_1, 105 + setvar VAR_OBJ_GFX_ID_0, 105 + return + +BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861: @ 824F861 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B + .2byte 0 + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B:: @ 824F86B + showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5 + applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE9B + waitmovement 0 + applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC + setvar VAR_TEMP_2, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 6 + setvar VAR_0x8006, 1 + special sub_81A1780 + goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5:: @ 824F8B5 + applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE92 + waitmovement 0 + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF:: @ 824F8BF + setvar VAR_0x8004, 3 + special sub_8161F74 + addobject 2 + applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA1 + waitmovement 0 + setvar VAR_0x8004, 5 + special sub_8195960 + msgbox 0x2021fc4, 4 + waitmessage + call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7 + switch VAR_RESULT + case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911 + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA:: @ 824F8FA + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 4 + special sub_81A1780 + goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911 + call BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special sub_81A1780 + addvar VAR_RESULT, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + copyvar VAR_0x8006, VAR_RESULT + special sub_81A1780 + switch VAR_RESULT + case 7, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 + applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA7 + waitmovement 0 + removeobject 2 + applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99 + applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC + waitmovement 0 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_24FF00, 4 + special LoadPlayerParty + special SavePlayerParty + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 3 + special sub_81A1780 + playfanfare MUS_ME_ASA + waitfanfare + special HealPlayerParty + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A:: @ 824F98A + setvar VAR_0x8004, 9 + special sub_81A1780 + copyvar VAR_TEMP_F, VAR_RESULT + compare VAR_RESULT, 0 + goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special sub_81A1780 + compare VAR_RESULT, 1 + call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE66 + compare VAR_RESULT, 2 + call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE6D + compare VAR_RESULT, 3 + call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE74 + compare VAR_RESULT, 4 + call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE7B + compare VAR_RESULT, 5 + call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE82 + compare VAR_RESULT, 6 + call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE89 + call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA42 + multichoice 19, 4, 103, 1 + switch VAR_RESULT + case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB14 + case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA78 + case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4 + case 3, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2 + case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA42:: @ 824FA42 + multichoice 20, 6, 104, 1 + switch VAR_RESULT + case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB14 + case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4 + case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2 + case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA78:: @ 824FA78 + message BattleFrontier_BattlePalaceBattleRoom_Text_25009E + waitmessage + multichoicedefault 20, 8, 94, 1, 0 + switch VAR_RESULT + case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A + case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAAA + case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAAA:: @ 824FAAA + call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8B4 + goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4:: @ 824FAB4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250030, 5 + switch VAR_RESULT + case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A + case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F + case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2:: @ 824FAE2 + message BattleFrontier_BattlePalaceBattleRoom_Text_25005A + waitmessage + multichoicedefault 20, 8, 94, 1, 0 + switch VAR_RESULT + case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A + case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA + case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB14:: @ 824FB14 + applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97 + applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97 + closemessage + goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28:: @ 824FB28 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 3 + special sub_81A1780 + goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F + message BattleFrontier_BattlePalaceBattleRoom_Text_25007E + waitmessage + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 2 + special sub_8195960 + playse SE_SAVE + waitse + fadescreen 1 + setvar VAR_0x8004, 4 + special sub_81A1780 + end + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61:: @ 824FB61 + compare VAR_TEMP_2, 1 + goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2500DD, 4 + setvar VAR_TEMP_2, 1 + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79:: @ 824FB79 + message BattleFrontier_BattlePalaceBattleRoom_Text_25014A + waitmessage + call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FBD0 + multichoice 19, 4, 103, 1 + switch VAR_RESULT + case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06 + case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA78 + case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4 + case 3, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2 + case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79 + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24FBD0:: @ 824FBD0 + multichoice 20, 6, 104, 1 + switch VAR_RESULT + case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06 + case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4 + case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2 + case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79 + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06:: @ 824FC06 + call BattleFrontier_BattlePalaceBattleRoom_EventScript_242170 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25017C, 4 + closemessage + applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97 + applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97 + setobjectxyperm 2, 15, 1 + addobject 2 + hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM + setobjectxy 2, 13, 1 + setobjectxyperm 2, 13, 1 + applymovement 4, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEDF + applymovement 5, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEE7 + applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEF2 + waitmovement 0 + switch VAR_TEMP_F + case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A + case 3, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA + case 4, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 7 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2501C1, 4 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 7 + special sub_81A1780 + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA:: @ 824FCAA + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502C4, 4 + call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7 + goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7 + setvar VAR_0x8004, 6 + special sub_8195960 + setvar VAR_0x8004, 12 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502FF, 4 + applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99 + applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25036D, 4 + playfanfare MUS_ME_SYMBOLGET + message BattleFrontier_BattlePalaceBattleRoom_Text_2503DC + waitmessage + waitfanfare + setvar VAR_0x8004, 13 + special sub_81A1780 + applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6 + waitmovement 0 + applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 + applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 + waitmovement 0 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250412, 4 + goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A:: @ 824FD3A + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 7 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250485, 4 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 7 + special sub_81A1780 + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67:: @ 824FD67 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250572, 4 + call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84 + goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84 + setvar VAR_0x8004, 6 + special sub_8195960 + setvar VAR_0x8004, 12 + special sub_81A1780 + compare VAR_RESULT, 2 + goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25057E, 4 + applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99 + applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250629, 4 + playfanfare MUS_ME_SYMBOLGET + message BattleFrontier_BattlePalaceBattleRoom_Text_250699 + waitmessage + waitfanfare + setvar VAR_0x8004, 13 + special sub_81A1780 + applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6 + waitmovement 0 + applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 + applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 + waitmovement 0 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2506C4, 4 + goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7:: @ 824FDF7 +VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7:: @ 824FDF7 + closemessage + setvar VAR_TEMP_2, 0 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 6 + setvar VAR_0x8006, 0 + special sub_81A1780 + special HealPlayerParty + setvar VAR_0x8004, 4 + setvar VAR_0x8005, 0 + special sub_8163AC4 + waitstate + setvar VAR_0x8004, 18 + special sub_81A1780 + special HealPlayerParty + setvar VAR_0x8004, 21 + special sub_81A1780 + return + +BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34: @ 824FE34 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE3E + .2byte 0 + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE3E:: @ 824FE3E + 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 + removeobject 2 + applymovement 4, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90 + applymovement 5, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90 + end + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE66:: @ 824FE66 + message BattleFrontier_BattlePalaceBattleRoom_Text_24FF28 + waitmessage + return + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE6D:: @ 824FE6D + message BattleFrontier_BattlePalaceBattleRoom_Text_24FF54 + waitmessage + return + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE74:: @ 824FE74 + message BattleFrontier_BattlePalaceBattleRoom_Text_24FF80 + waitmessage + return + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE7B:: @ 824FE7B + message BattleFrontier_BattlePalaceBattleRoom_Text_24FFAC + waitmessage + return + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE82:: @ 824FE82 + message BattleFrontier_BattlePalaceBattleRoom_Text_24FFD8 + waitmessage + return + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE89:: @ 824FE89 + message BattleFrontier_BattlePalaceBattleRoom_Text_250004 + waitmessage + return + +BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90: @ 824FE90 + set_invisible + step_end + +BattleFrontier_BattlePalaceBattleRoom_Movement_24FE92: @ 824FE92 + set_visible + walk_up + walk_up + walk_up + walk_up + +BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97: @ 824FE97 + face_right + step_end + +BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99: @ 824FE99 + face_up + step_end + +BattleFrontier_BattlePalaceBattleRoom_Movement_24FE9B: @ 824FE9B + set_visible + walk_up + walk_up + walk_up + walk_up + step_end + +BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA1: @ 824FEA1 + walk_down + walk_down + walk_down + walk_down + face_left + step_end + +BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA7: @ 824FEA7 + walk_up + walk_up + walk_up + walk_up + step_end + +BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC: @ 824FEAC + face_down + step_end + +BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAE: @ 824FEAE + set_visible + walk_slow_down + walk_slow_down + face_left + step_end + +BattleFrontier_BattlePalaceBattleRoom_Movement_24FEB3: @ 824FEB3 + set_visible + walk_slow_down + step_end + +BattleFrontier_BattlePalaceBattleRoom_Movement_24FEB6: @ 824FEB6 + walk_slow_down + walk_slow_down + walk_slow_down + face_left + step_end + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB:: @ 824FEBB + copyvar VAR_RESULT, VAR_0x40CE + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5 + warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 5, 7 + waitstate + end + +BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5:: @ 824FED5 + warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 19, 7 + waitstate + end + +BattleFrontier_BattlePalaceBattleRoom_Movement_24FEDF: @ 824FEDF + delay_16 + delay_16 + set_visible + walk_down + walk_right + walk_down + walk_in_place_fastest_left + step_end + +BattleFrontier_BattlePalaceBattleRoom_Movement_24FEE7: @ 824FEE7 + 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 + 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 +VerdanturfTown_BattleTentBattleRoom_Text_24FF00: @ 824FF00 + .string "Excellent…\n" + .string "Let me restore your POKéMON.$" + +BattleFrontier_BattlePalaceBattleRoom_Text_24FF28: @ 824FF28 +VerdanturfTown_BattleTentBattleRoom_Text_24FF28: @ 824FF28 + .string "The 2nd opponent is next.\n" + .string "Are you prepared?$" + +BattleFrontier_BattlePalaceBattleRoom_Text_24FF54: @ 824FF54 +VerdanturfTown_BattleTentBattleRoom_Text_24FF54: @ 824FF54 + .string "The 3rd opponent is next.\n" + .string "Are you prepared?$" + +BattleFrontier_BattlePalaceBattleRoom_Text_24FF80: @ 824FF80 + .string "The 4th opponent is next.\n" + .string "Are you prepared?$" + +BattleFrontier_BattlePalaceBattleRoom_Text_24FFAC: @ 824FFAC + .string "The 5th opponent is next.\n" + .string "Are you prepared?$" + +BattleFrontier_BattlePalaceBattleRoom_Text_24FFD8: @ 824FFD8 + .string "The 6th opponent is next.\n" + .string "Are you prepared?$" + +BattleFrontier_BattlePalaceBattleRoom_Text_250004: @ 8250004 + .string "The 7th opponent is next.\n" + .string "Are you prepared?$" + +BattleFrontier_BattlePalaceBattleRoom_Text_250030: @ 8250030 +VerdanturfTown_BattleTentBattleRoom_Text_250030: @ 8250030 + .string "Would you like to save and quit\n" + .string "the game?$" + +BattleFrontier_BattlePalaceBattleRoom_Text_25005A: @ 825005A +VerdanturfTown_BattleTentBattleRoom_Text_25005A: @ 825005A + .string "Do you wish to quit your challenge?$" + +BattleFrontier_BattlePalaceBattleRoom_Text_25007E: @ 825007E +VerdanturfTown_BattleTentBattleRoom_Text_25007E: @ 825007E + .string "Saving the data.\n" + .string "Have patience…$" + +BattleFrontier_BattlePalaceBattleRoom_Text_25009E: @ 825009E + .string "Do you wish to record your latest\n" + .string "match on your FRONTIER PASS?$" + +BattleFrontier_BattlePalaceBattleRoom_Text_2500DD: @ 82500DD + .string "And now…\p" + .string "By winning consistently, you have\n" + .string "earned the privilege of challenging\l" + .string "our master, the PALACE MAVEN…$" + +BattleFrontier_BattlePalaceBattleRoom_Text_25014A: @ 825014A + .string "I shall send for the PALACE MAVEN.\n" + .string "Are you ready?$" + +BattleFrontier_BattlePalaceBattleRoom_Text_25017C: @ 825017C + .string "Let great fanfare announce the arrival\n" + .string "of the PALACE MAVEN, SPENSER!$" + +BattleFrontier_BattlePalaceBattleRoom_Text_2501C1: @ 82501C1 + .string "SPENSER: My physical being is with\n" + .string "POKéMON always!\p" + .string "My heart beats as one with\n" + .string "POKéMON always!\p" + .string "Young one of a TRAINER!\n" + .string "Do you believe in your POKéMON?\p" + .string "Can you believe them through\n" + .string "and through?\p" + .string "If your bonds of trust are frail,\n" + .string "you will never beat my brethren!$" + +BattleFrontier_BattlePalaceBattleRoom_Text_2502C4: @ 82502C4 + .string "The bond you share with your POKéMON!\n" + .string "Prove it to me here!$" + +BattleFrontier_BattlePalaceBattleRoom_Text_2502FF: @ 82502FF + .string "SPENSER: Gwahahah!\p" + .string "Hah, you never fell for my bluster!\n" + .string "Sorry for trying that stunt!\p" + .string "Here!\n" + .string "Bring me the thing!$" + +BattleFrontier_BattlePalaceBattleRoom_Text_25036D: @ 825036D + .string "My, my, if only you could maintain that\n" + .string "facade of distinguished authority…\p" + .string "Here!\n" + .string "Let’s see your FRONTIER PASS!$" + +BattleFrontier_BattlePalaceBattleRoom_Text_2503DC: @ 82503DC + .string "The Spirits Symbol was embossed on\n" + .string "the FRONTIER PASS!$" + +BattleFrontier_BattlePalaceBattleRoom_Text_250412: @ 8250412 + .string "SPENSER: Your POKéMON’s eyes are \n" + .string "truly clear and unclouded.\p" + .string "I will eagerly await the next\n" + .string "opportunity to see you.$" + +BattleFrontier_BattlePalaceBattleRoom_Text_250485: @ 8250485 + .string "SPENSER: Gwahahah!\n" + .string "You’ve battled your way up again?\p" + .string "You must have developed a truly\n" + .string "formidable bond with your POKéMON.\p" + .string "So be it!\p" + .string "This time, I won’t bluster or hold back.\n" + .string "This time, there’s no fooling around.\p" + .string "Ready now?\n" + .string "Prepare to lose!$" + +BattleFrontier_BattlePalaceBattleRoom_Text_250572: @ 8250572 + .string "… … …Kaaah!$" + +BattleFrontier_BattlePalaceBattleRoom_Text_25057E: @ 825057E + .string "SPENSER: Well, that was some display!\n" + .string "Even fully unleashed, my brethren\l" + .string "could not overpower you.\p" + .string "Your team spirit is truly admirable!\p" + .string "Here!\n" + .string "Bring me that thing, will you?$" + +BattleFrontier_BattlePalaceBattleRoom_Text_250629: @ 8250629 + .string "My, my, if only you could maintain\n" + .string "a certain level of decorum…\p" + .string "Gaaah, here!\n" + .string "Hurry with that FRONTIER PASS, you!$" + +BattleFrontier_BattlePalaceBattleRoom_Text_250699: @ 8250699 + .string "The Spirits Symbol took on\n" + .string "a golden shine!$" + +BattleFrontier_BattlePalaceBattleRoom_Text_2506C4: @ 82506C4 + .string "SPENSER: Gwahahah!\p" + .string "Come see me time and again!\n" + .string "My brethren and I will be waiting!$" diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc new file mode 100644 index 000000000..f6baf26f6 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc @@ -0,0 +1,18 @@ +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 + +BattleFrontier_BattlePalaceCorridor_MapWarps: @ 853C4C8 + 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/BattleFrontier_BattlePalaceCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc new file mode 100644 index 000000000..c8142a207 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc @@ -0,0 +1,160 @@ +BattleFrontier_BattlePalaceCorridor_MapScripts:: @ 824F4A3 + map_script 2, BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9 + .byte 0 + +BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9: @ 824F4A9 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3 + .2byte 0 + +BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3 + delay 16 + applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5B8 + applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5B8 + waitmovement 0 + lockall + setvar VAR_0x8004, 3 + special sub_8195960 + compare VAR_RESULT, 0 + call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F58B + compare VAR_RESULT, 1 + call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F594 + compare VAR_RESULT, 2 + call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F59D + compare VAR_RESULT, 3 + call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F5A6 + compare VAR_RESULT, 4 + call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F5AF + closemessage + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + special sub_81A1780 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F553 + applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5BD + applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5C4 + waitmovement 0 + opendoor 6, 3 + waitdooranim + applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5DA + applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5D9 + waitmovement 0 + closedoor 6, 3 + waitdooranim + goto BattleFrontier_BattlePalaceCorridor_EventScript_24F581 + +BattleFrontier_BattlePalaceCorridor_EventScript_24F553:: @ 824F553 + applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5CB + applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5D2 + waitmovement 0 + opendoor 10, 3 + waitdooranim + applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5DA + applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5D9 + waitmovement 0 + closedoor 10, 3 + waitdooranim + +BattleFrontier_BattlePalaceCorridor_EventScript_24F581:: @ 824F581 + warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM, 255, 7, 4 + waitstate + end + +BattleFrontier_BattlePalaceCorridor_EventScript_24F58B:: @ 824F58B + msgbox BattleFrontier_BattlePalaceCorridor_Text_24F5DD, 4 + return + +BattleFrontier_BattlePalaceCorridor_EventScript_24F594:: @ 824F594 + msgbox BattleFrontier_BattlePalaceCorridor_Text_24F65B, 4 + return + +BattleFrontier_BattlePalaceCorridor_EventScript_24F59D:: @ 824F59D + msgbox BattleFrontier_BattlePalaceCorridor_Text_24F718, 4 + return + +BattleFrontier_BattlePalaceCorridor_EventScript_24F5A6:: @ 824F5A6 + msgbox BattleFrontier_BattlePalaceCorridor_Text_24F78C, 4 + return + +BattleFrontier_BattlePalaceCorridor_EventScript_24F5AF:: @ 824F5AF + msgbox BattleFrontier_BattlePalaceCorridor_Text_24F7D4, 4 + return + +BattleFrontier_BattlePalaceCorridor_Movement_24F5B8: @ 824F5B8 + walk_up + walk_up + walk_up + walk_up + step_end + +BattleFrontier_BattlePalaceCorridor_Movement_24F5BD: @ 824F5BD + walk_up + walk_up + walk_left + walk_left + walk_up + walk_up + step_end + +BattleFrontier_BattlePalaceCorridor_Movement_24F5C4: @ 824F5C4 + walk_up + walk_up + walk_up + walk_left + walk_left + walk_up + step_end + +BattleFrontier_BattlePalaceCorridor_Movement_24F5CB: @ 824F5CB + walk_up + walk_right + walk_right + walk_up + walk_up + walk_up + step_end + +BattleFrontier_BattlePalaceCorridor_Movement_24F5D2: @ 824F5D2 + walk_up + walk_up + walk_right + walk_right + walk_up + walk_up + step_end + +BattleFrontier_BattlePalaceCorridor_Movement_24F5D9: @ 824F5D9 + walk_up + +BattleFrontier_BattlePalaceCorridor_Movement_24F5DA: @ 824F5DA + walk_up + set_invisible + step_end + +BattleFrontier_BattlePalaceCorridor_Text_24F5DD: @ 824F5DD + .string "People and POKéMON, they are but\n" + .string "the same…\p" + .string "Their individual nature makes them\n" + .string "good at certain things, and not good\l" + .string "at others.$" + +BattleFrontier_BattlePalaceCorridor_Text_24F65B: @ 824F65B + .string "Rather than trying to make a POKéMON\n" + .string "do what it dislikes, try to let it do\l" + .string "what it likes and is good at doing.\p" + .string "Put yourself in the POKéMON’s position\n" + .string "and consider what moves it would like.$" + +BattleFrontier_BattlePalaceCorridor_Text_24F718: @ 824F718 + .string "A POKéMON’s nature is a remarkable\n" + .string "thing…\p" + .string "Some POKéMON behave in a completely\n" + .string "different way when they are cornered.$" + +BattleFrontier_BattlePalaceCorridor_Text_24F78C: @ 824F78C + .string "Are you beginning to understand how\n" + .string "a POKéMON’s nature makes it behave?$" + +BattleFrontier_BattlePalaceCorridor_Text_24F7D4: @ 824F7D4 + .string "Ah… I see a strong, heartfelt bond\n" + .string "between you and your POKéMON…$" + diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/events.inc b/data/maps/BattleFrontier_BattlePalaceLobby/events.inc new file mode 100644 index 000000000..56da378cb --- /dev/null +++ b/data/maps/BattleFrontier_BattlePalaceLobby/events.inc @@ -0,0 +1,21 @@ +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 + +BattleFrontier_BattlePalaceLobby_MapWarps: @ 853C3D0 + 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 + bg_event 16, 7, 0, 1, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC69 + bg_event 10, 4, 0, 0, 0, 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_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc new file mode 100644 index 000000000..91c1abd0f --- /dev/null +++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc @@ -0,0 +1,729 @@ +BattleFrontier_BattlePalaceLobby_MapScripts:: @ 824D77E + map_script 2, BattleFrontier_BattlePalaceLobby_MapScript2_24D79D + map_script 4, BattleFrontier_BattlePalaceLobby_MapScript2_24D789 + .byte 0 + +BattleFrontier_BattlePalaceLobby_MapScript2_24D789: @ 824D789 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D793 + .2byte 0 + +BattleFrontier_BattlePalaceLobby_EventScript_24D793:: @ 824D793 + setvar VAR_TEMP_1, 1 + turnobject 255, 2 + end + +BattleFrontier_BattlePalaceLobby_MapScript2_24D79D: @ 824D79D + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D7C7 + map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattlePalaceLobby_EventScript_24D7D0 + map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattlePalaceLobby_EventScript_24D908 + map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattlePalaceLobby_EventScript_24D817 + map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattlePalaceLobby_EventScript_24D873 + .2byte 0 + +BattleFrontier_BattlePalaceLobby_EventScript_24D7C7:: @ 824D7C7 + setvar VAR_0x8004, 0 + special sub_81A1780 + end + +BattleFrontier_BattlePalaceLobby_EventScript_24D7D0:: @ 824D7D0 + lockall + msgbox BattleFrontier_BattlePalaceLobby_Text_24E636, 4 + closemessage + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 0 + special sub_8195960 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + setvar VAR_0x8006, 0 + special sub_8195960 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_TEMP_0, 255 + releaseall + end + +BattleFrontier_BattlePalaceLobby_EventScript_24D817:: @ 824D817 + lockall + setvar VAR_0x8004, 10 + special sub_81A1780 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24D838 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E497, 4 + goto BattleFrontier_BattlePalaceLobby_EventScript_24D840 + +BattleFrontier_BattlePalaceLobby_EventScript_24D838:: @ 824D838 + msgbox BattleFrontier_BattlePalaceLobby_Text_24EE81, 4 + +BattleFrontier_BattlePalaceLobby_EventScript_24D840:: @ 824D840 + msgbox BattleFrontier_BattlePalaceLobby_Text_24EEB9, 4 + setvar VAR_0x8004, 11 + special sub_81A1780 + msgbox BattleFrontier_BattlePalaceLobby_Text_241520, 9 + message BattleFrontier_BattlePalaceLobby_Text_24E4F7 + waitmessage + call BattleFrontier_BattlePalaceLobby_EventScript_24D8A1 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, 4 + closemessage + setvar VAR_TEMP_0, 255 + releaseall + end + +BattleFrontier_BattlePalaceLobby_EventScript_24D873:: @ 824D873 + lockall + message BattleFrontier_BattlePalaceLobby_Text_24E41E + waitmessage + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + setvar VAR_0x8006, 0 + special sub_8195960 + call BattleFrontier_BattlePalaceLobby_EventScript_24D8A1 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, 4 + closemessage + setvar VAR_TEMP_0, 255 + releaseall + end + +BattleFrontier_BattlePalaceLobby_EventScript_24D8A1:: @ 824D8A1 + setvar VAR_0x8004, 8 + special sub_81A1780 + special LoadPlayerParty + special HealPlayerParty + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 0 + special sub_8195960 + playse SE_SAVE + waitse + call BattleFrontier_BattlePalaceLobby_EventScript_23E8E0 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24D907 + message BattleFrontier_BattlePalaceLobby_Text_24EF16 + waitmessage + multichoicedefault 20, 8, 94, 1, 0 + switch VAR_RESULT + case 1, BattleFrontier_BattlePalaceLobby_EventScript_24D907 + case 0, BattleFrontier_BattlePalaceLobby_EventScript_24D902 + case 127, BattleFrontier_BattlePalaceLobby_EventScript_24D907 + +BattleFrontier_BattlePalaceLobby_EventScript_24D902:: @ 824D902 + call BattleFrontier_BattlePalaceLobby_EventScript_23E8B4 + +BattleFrontier_BattlePalaceLobby_EventScript_24D907:: @ 824D907 + return + +BattleFrontier_BattlePalaceLobby_EventScript_24D908:: @ 824D908 + lockall + msgbox BattleFrontier_BattlePalaceLobby_Text_24E5D8, 4 + message BattleFrontier_BattlePalaceLobby_Text_24E5F6 + waitmessage + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 1 + special sub_8195960 + playse SE_SAVE + waitse + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_TEMP_0, 255 + goto BattleFrontier_BattlePalaceLobby_EventScript_24DAF3 + +BattleFrontier_BattlePalaceLobby_EventScript_24D944:: @ 824D944 + lock + faceplayer + setvar VAR_FRONTIER_FACILITY, 2 + setvar VAR_0x40CE, 0 + goto BattleFrontier_BattlePalaceLobby_EventScript_24D968 + end + +BattleFrontier_BattlePalaceLobby_EventScript_24D956:: @ 824D956 + lock + faceplayer + setvar VAR_FRONTIER_FACILITY, 2 + setvar VAR_0x40CE, 1 + goto BattleFrontier_BattlePalaceLobby_EventScript_24D968 + end + +BattleFrontier_BattlePalaceLobby_EventScript_24D968:: @ 824D968 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 0 + special sub_8195960 + compare VAR_RESULT, 0 + goto_if 5, BattleFrontier_BattlePalaceLobby_EventScript_24D817 + special SavePlayerParty + compare VAR_0x40CE, 0 + call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB9E + compare VAR_0x40CE, 1 + call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBA7 + +BattleFrontier_BattlePalaceLobby_EventScript_24D999:: @ 824D999 + compare VAR_0x40CE, 0 + call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBB0 + compare VAR_0x40CE, 1 + call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBB6 + waitmessage + multichoice 17, 6, 23, 0 + switch VAR_RESULT + case 0, BattleFrontier_BattlePalaceLobby_EventScript_24D9E6 + case 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB20 + case 2, BattleFrontier_BattlePalaceLobby_EventScript_24DB94 + case 127, BattleFrontier_BattlePalaceLobby_EventScript_24DB94 + +BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6 + message BattleFrontier_BattlePalaceLobby_Text_24E119 + waitmessage + multichoice 17, 6, 24, 0 + switch VAR_RESULT + case 2, BattleFrontier_BattlePalaceLobby_EventScript_24DB94 + case 127, BattleFrontier_BattlePalaceLobby_EventScript_24DB94 + setvar VAR_0x8004, 15 + special sub_81A1780 + compare VAR_0x8004, 1 + goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB45 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + copyvar VAR_0x8006, VAR_RESULT + special sub_81A1780 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E399, 4 + fadescreen 1 + call BattleFrontier_BattlePalaceLobby_EventScript_23F2B7 + copyvar VAR_0x8004, VAR_RESULT + setvar VAR_0x8005, 3 + special sub_80F9490 + waitstate + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB91 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E3C8, 5 + switch VAR_RESULT + case 0, BattleFrontier_BattlePalaceLobby_EventScript_24DB91 + case 1, BattleFrontier_BattlePalaceLobby_EventScript_24DA87 + case 127, BattleFrontier_BattlePalaceLobby_EventScript_24DB91 + +BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87 + setvar VAR_TEMP_0, 0 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 4 + special sub_81A1780 + setvar VAR_0x8004, 0 + special sub_8195960 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + setvar VAR_0x8006, 1 + special sub_8195960 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 1 + special sub_81A1780 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 0 + special sub_81A1780 + special LoadPlayerParty + closemessage + delay 2 + call BattleFrontier_BattlePalaceLobby_EventScript_27134F + setvar VAR_TEMP_0, 255 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB7A + +BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3 + special SavePlayerParty + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 3 + special sub_81A1780 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E408, 4 + closemessage + call BattleFrontier_BattlePalaceLobby_EventScript_24DBBC + warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR, 255, 8, 13 + setvar VAR_TEMP_0, 0 + waitstate + end + +BattleFrontier_BattlePalaceLobby_EventScript_24DB20:: @ 824DB20 + compare VAR_0x40CE, 1 + goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB38 + msgbox BattleFrontier_BattlePalaceLobby_Text_24DE17, 4 + goto BattleFrontier_BattlePalaceLobby_EventScript_24D999 + +BattleFrontier_BattlePalaceLobby_EventScript_24DB38:: @ 824DB38 + msgbox BattleFrontier_BattlePalaceLobby_Text_24EBC2, 4 + goto BattleFrontier_BattlePalaceLobby_EventScript_24D999 + +BattleFrontier_BattlePalaceLobby_EventScript_24DB45:: @ 824DB45 + switch VAR_RESULT + case 0, BattleFrontier_BattlePalaceLobby_EventScript_24DB60 + case 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB6D + +BattleFrontier_BattlePalaceLobby_EventScript_24DB60:: @ 824DB60 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E173, 4 + goto BattleFrontier_BattlePalaceLobby_EventScript_24DB9C + +BattleFrontier_BattlePalaceLobby_EventScript_24DB6D:: @ 824DB6D + msgbox BattleFrontier_BattlePalaceLobby_Text_24E29E, 4 + goto BattleFrontier_BattlePalaceLobby_EventScript_24DB9C + +BattleFrontier_BattlePalaceLobby_EventScript_24DB7A:: @ 824DB7A + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 0 + special sub_81A1780 + goto BattleFrontier_BattlePalaceLobby_EventScript_24DB94 + +BattleFrontier_BattlePalaceLobby_EventScript_24DB91:: @ 824DB91 + special LoadPlayerParty + +BattleFrontier_BattlePalaceLobby_EventScript_24DB94:: @ 824DB94 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, 4 + +BattleFrontier_BattlePalaceLobby_EventScript_24DB9C:: @ 824DB9C + release + end + +BattleFrontier_BattlePalaceLobby_EventScript_24DB9E:: @ 824DB9E + msgbox BattleFrontier_BattlePalaceLobby_Text_24DD5B, 4 + return + +BattleFrontier_BattlePalaceLobby_EventScript_24DBA7:: @ 824DBA7 + msgbox BattleFrontier_BattlePalaceLobby_Text_24EB06, 4 + return + +BattleFrontier_BattlePalaceLobby_EventScript_24DBB0:: @ 824DBB0 + message BattleFrontier_BattlePalaceLobby_Text_24DDE1 + return + +BattleFrontier_BattlePalaceLobby_EventScript_24DBB6:: @ 824DBB6 + message BattleFrontier_BattlePalaceLobby_Text_24EB8C + return + +BattleFrontier_BattlePalaceLobby_EventScript_24DBBC:: @ 824DBBC + compare VAR_0x40CE, 0 + call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC23 + compare VAR_0x40CE, 1 + call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC29 + applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC47 + applymovement 255, BattleFrontier_BattlePalaceLobby_Movement_24DC47 + waitmovement 0 + compare VAR_0x40CE, 0 + call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC2F + compare VAR_0x40CE, 1 + call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC35 + waitdooranim + applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC49 + applymovement 255, BattleFrontier_BattlePalaceLobby_Movement_24DC4C + waitmovement 0 + compare VAR_0x40CE, 0 + call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC3B + compare VAR_0x40CE, 1 + call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC41 + waitdooranim + return + +BattleFrontier_BattlePalaceLobby_EventScript_24DC23:: @ 824DC23 + setvar VAR_LAST_TALKED, 1 + return + +BattleFrontier_BattlePalaceLobby_EventScript_24DC29:: @ 824DC29 + setvar VAR_LAST_TALKED, 6 + return + +BattleFrontier_BattlePalaceLobby_EventScript_24DC2F:: @ 824DC2F + opendoor 5, 4 + return + +BattleFrontier_BattlePalaceLobby_EventScript_24DC35:: @ 824DC35 + opendoor 19, 4 + return + +BattleFrontier_BattlePalaceLobby_EventScript_24DC3B:: @ 824DC3B + closedoor 5, 4 + return + +BattleFrontier_BattlePalaceLobby_EventScript_24DC41:: @ 824DC41 + closedoor 19, 4 + return + +BattleFrontier_BattlePalaceLobby_Movement_24DC47: @ 824DC47 + walk_up + step_end + +BattleFrontier_BattlePalaceLobby_Movement_24DC49: @ 824DC49 + walk_up + set_invisible + step_end + +BattleFrontier_BattlePalaceLobby_Movement_24DC4C: @ 824DC4C + walk_up + walk_up + set_invisible + step_end + +BattleFrontier_BattlePalaceLobby_EventScript_24DC50:: @ 824DC50 + lockall + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 2 + setvar VAR_0x8006, 0 + special sub_81A1780 + waitbuttonpress + special RemoveRecordsWindow + releaseall + end + +BattleFrontier_BattlePalaceLobby_EventScript_24DC69:: @ 824DC69 + lockall + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 2 + setvar VAR_0x8006, 1 + special sub_81A1780 + waitbuttonpress + special RemoveRecordsWindow + releaseall + end + +BattleFrontier_BattlePalaceLobby_EventScript_24DC82:: @ 824DC82 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E6E3, 2 + end + +BattleFrontier_BattlePalaceLobby_EventScript_24DC8B:: @ 824DC8B + msgbox BattleFrontier_BattlePalaceLobby_Text_24E851, 2 + end + +BattleFrontier_BattlePalaceLobby_EventScript_24DC94:: @ 824DC94 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E992, 2 + end + +BattleFrontier_BattlePalaceLobby_EventScript_24DC9D:: @ 824DC9D + msgbox BattleFrontier_BattlePalaceLobby_Text_24EA4B, 2 + end + +BattleFrontier_BattlePalaceLobby_EventScript_24DCA6:: @ 824DCA6 + lockall + msgbox BattleFrontier_BattlePalaceLobby_Text_24EF66, 4 + goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5 + end + +BattleFrontier_BattlePalaceLobby_EventScript_24DCB5:: @ 824DCB5 + message BattleFrontier_BattlePalaceLobby_Text_24EF88 + waitmessage + multichoice 16, 0, 100, 0 + switch VAR_RESULT + case 0, BattleFrontier_BattlePalaceLobby_EventScript_24DD13 + case 1, BattleFrontier_BattlePalaceLobby_EventScript_24DD21 + case 2, BattleFrontier_BattlePalaceLobby_EventScript_24DD2F + case 3, BattleFrontier_BattlePalaceLobby_EventScript_24DD3D + case 4, BattleFrontier_BattlePalaceLobby_EventScript_24DD4B + case 5, BattleFrontier_BattlePalaceLobby_EventScript_24DD59 + case 127, BattleFrontier_BattlePalaceLobby_EventScript_24DD59 + end + +BattleFrontier_BattlePalaceLobby_EventScript_24DD13:: @ 824DD13 + msgbox BattleFrontier_BattlePalaceLobby_Text_24EFAB, 4 + goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5 + end + +BattleFrontier_BattlePalaceLobby_EventScript_24DD21:: @ 824DD21 + msgbox BattleFrontier_BattlePalaceLobby_Text_24F049, 4 + goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5 + end + +BattleFrontier_BattlePalaceLobby_EventScript_24DD2F:: @ 824DD2F + msgbox BattleFrontier_BattlePalaceLobby_Text_24F190, 4 + goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5 + end + +BattleFrontier_BattlePalaceLobby_EventScript_24DD3D:: @ 824DD3D + msgbox BattleFrontier_BattlePalaceLobby_Text_24F2E8, 4 + goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5 + end + +BattleFrontier_BattlePalaceLobby_EventScript_24DD4B:: @ 824DD4B + msgbox BattleFrontier_BattlePalaceLobby_Text_24F3F4, 4 + goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5 + end + +BattleFrontier_BattlePalaceLobby_EventScript_24DD59:: @ 824DD59 + releaseall + end + +BattleFrontier_BattlePalaceLobby_Text_24DD5B: @ 824DD5B + .string "Where the hearts of TRAINERS\n" + .string "are put to the test.\p" + .string "I welcome you to the BATTLE PALACE.\p" + .string "I accept challenges to the SINGLE\n" + .string "BATTLE HALLS.$" + +BattleFrontier_BattlePalaceLobby_Text_24DDE1: @ 824DDE1 + .string "Do you wish to take\n" + .string "the SINGLE BATTLE HALL challenge?$" + +BattleFrontier_BattlePalaceLobby_Text_24DE17: @ 824DE17 + .string "In the BATTLE PALACE, there are\n" + .string "several auditoriums for SINGLE BATTLES\l" + .string "that are named SINGLE BATTLE HALLS.\p" + .string "The SINGLE BATTLES are conducted in\n" + .string "the usual way, except with one crucial\l" + .string "rule that must be obeyed.\p" + .string "TRAINERS are permitted only to switch\n" + .string "their POKéMON in and out.\p" + .string "TRAINERS are otherwise forbidden to\n" + .string "command their POKéMON.\p" + .string "The POKéMON are to behave according\n" + .string "to their nature and battle on their own.\p" + .string "You must put your trust in your\n" + .string "POKéMON and watch over them.\p" + .string "If you achieve the honor of beating\n" + .string "seven TRAINERS in succession,\l" + .string "we will present you with Battle Points.\p" + .string "If you want to interrupt your\n" + .string "challenge, you must save the game.\p" + .string "If you don’t save before interrupting,\n" + .string "you will be disqualified.$" + +BattleFrontier_BattlePalaceLobby_Text_24E0D8: @ 824E0D8 + .string "When you have fortified your heart\n" + .string "and POKéMON, you must return.$" + +BattleFrontier_BattlePalaceLobby_Text_24E119: @ 824E119 + .string "There are two BATTLE HALLS,\n" + .string "Level 50 and Open Level.\l" + .string "Which is your choice of a challenge?$" + +BattleFrontier_BattlePalaceLobby_Text_24E173: @ 824E173 + .string "Sigh…\p" + .string "You do not have the three POKéMON\n" + .string "required for the challenge.\p" + .string "To enter, you must provide three\n" + .string "different kinds of POKéMON.\p" + .string "These POKéMON must all be of\n" + .string "Level 50 or lower.\p" + .string "They also must not be holding\n" + .string "the same kinds of items.\p" + .string "EGGS{STR_VAR_1} ineligible.\p" + .string "Come back when you have made\n" + .string "your preparations.$" + +BattleFrontier_BattlePalaceLobby_Text_24E29E: @ 824E29E + .string "Sigh…\p" + .string "You do not have the three POKéMON\n" + .string "required for the challenge.\p" + .string "To enter, you must provide three\n" + .string "different kinds of POKéMON.\p" + .string "They also must not be holding\n" + .string "the same kinds of items.\p" + .string "EGGS{STR_VAR_1} ineligible.\p" + .string "Come back when you have made\n" + .string "your preparations.$" + +BattleFrontier_BattlePalaceLobby_Text_24E399: @ 824E399 + .string "Good. Now, you must select your\n" + .string "three POKéMON.$" + +BattleFrontier_BattlePalaceLobby_Text_24E3C8: @ 824E3C8 + .string "I must save before I show you to\n" + .string "the BATTLE HALL. Is that okay?$" + +BattleFrontier_BattlePalaceLobby_Text_24E408: @ 824E408 + .string "Good.\n" + .string "Now, follow me.$" + +BattleFrontier_BattlePalaceLobby_Text_24E41E: @ 824E41E + .string "I feel privileged for having seen\n" + .string "your POKéMON’s exploits.\p" + .string "The results will be recorded.\n" + .string "I must ask you to briefly wait.$" + +BattleFrontier_BattlePalaceLobby_Text_24E497: @ 824E497 + .string "To achieve a 7-win streak…\p" + .string "The bonds that bind your heart with\n" + .string "your POKéMON seem firm and true.$" + +BattleFrontier_BattlePalaceLobby_Text_24E4F7: @ 824E4F7 + .string "Your feat will be recorded.\n" + .string "I must ask you to briefly wait.$" + +BattleFrontier_BattlePalaceLobby_Text_24E533: @ 824E5333 + .string "For the feat of your 7-win streak,\n" + .string "we present you with Battle Point(s).$" + +VerdanturfTown_BattleTentLobby_Text_24E57B: @ 824E57B + .string "You seem to have no space for\n" + .string "our prize.\p" + .string "You should return when you have\n" + .string "organized your BAG.$" + +BattleFrontier_BattlePalaceLobby_Text_24E5D8: @ 824E5D8 +VerdanturfTown_BattleTentLobby_Text_24E5D8: @ 824E5D8 + .string "We have been waiting for you…$" + +BattleFrontier_BattlePalaceLobby_Text_24E5F6: @ 824E5F6 +VerdanturfTown_BattleTentLobby_Text_24E5F6: @ 824E5F6 + .string "I must save before I show you to\n" + .string "the BATTLE HALL. Is that okay?$" + +BattleFrontier_BattlePalaceLobby_Text_24E636: @ 824E636 +VerdanturfTown_BattleTentLobby_Text_24E636: @ 824E636 + .string "Sigh…\p" + .string "You failed to save before you ended\n" + .string "your challenge the last time.\p" + .string "As a result, your challenge has been\n" + .string "disqualified. It is most unfortunate.$" + +BattleFrontier_BattlePalaceLobby_Text_24E6C9: @ 824E6C9 + .string "{PLAYER} received the prize\n" + .string "{STR_VAR_1}.$" + +BattleFrontier_BattlePalaceLobby_Text_24E6E3: @ 824E6E3 + .string "For a hardy fellow like me,\n" + .string "hardy POKéMON are the best.\p" + .string "Offense is the best defense!\n" + .string "A relentless attack is the ultimate!\p" + .string "But that’s not what I wanted to chat\n" + .string "about.\p" + .string "Every so often a really cute lady\n" + .string "swings by here.\p" + .string "She says that she can tell what\n" + .string "POKéMON are thinking.\p" + .string "I don’t know about that part,\n" + .string "but she is really cute.\p" + .string "Huh?\n" + .string "Why are you looking at me like that?$" + +BattleFrontier_BattlePalaceLobby_Text_24E851: @ 824E851 + .string "Hmm…\p" + .string "It appears that the nature of POKéMON\n" + .string "and the moves that they have been\l" + .string "taught are the keys to battle here.\p" + .string "To be more precise, it’s how well\n" + .string "the moves match the nature of\l" + .string "the POKéMON.\p" + .string "If your POKéMON is in trouble and\n" + .string "unable to live up to its potential,\l" + .string "you may need to examine how well\l" + .string "its moves match its nature.$" + +BattleFrontier_BattlePalaceLobby_Text_24E992: @ 824E992 + .string "My POKéMON is usually very docile.\p" + .string "But when it’s in a BATTLE HALL,\n" + .string "it sometimes seems to become\l" + .string "transformed into something wicked!\p" + .string "It becomes totally intimidating.\n" + .string "It’s shocking, even.$" + +BattleFrontier_BattlePalaceLobby_Text_24EA4B: @ 824EA4B + .string "I wonder what sort of nature a POKéMON\n" + .string "would have if it favored enfeebling its\l" + .string "opponents and chipping away slowly.\p" + .string "I’d be surprised if it was a LAX nature.\p" + .string "But, nah, that can’t be right.$" + +BattleFrontier_BattlePalaceLobby_Text_24EB06: @ 824EB06 + .string "Where the hearts of TRAINERS\n" + .string "are put to the test.\p" + .string "I welcome you to the BATTLE PALACE.\p" + .string "I accept challenges to the DOUBLE\n" + .string "BATTLE HALLS.$" + +BattleFrontier_BattlePalaceLobby_Text_24EB8C: @ 824EB8C + .string "Do you wish to take\n" + .string "the DOUBLE BATTLE HALL challenge?$" + +BattleFrontier_BattlePalaceLobby_Text_24EBC2: @ 824EBC2 + .string "In the BATTLE PALACE, there are\n" + .string "several auditoriums for DOUBLE BATTLES\l" + .string "that are named DOUBLE BATTLE HALLS.\p" + .string "The DOUBLE BATTLES are conducted in\n" + .string "the usual way, except with one crucial\l" + .string "rule that must be obeyed.\p" + .string "TRAINERS are permitted only to switch\n" + .string "their POKéMON in and out.\p" + .string "TRAINERS are otherwise forbidden to\n" + .string "command their POKéMON.\p" + .string "The POKéMON are to behave according\n" + .string "to their nature and battle on their own.\p" + .string "You must put your trust in your\n" + .string "POKéMON and watch over them.\p" + .string "If you achieve the honor of beating\n" + .string "seven TRAINERS in succession,\l" + .string "we will present you with Battle Points.\p" + .string "If you want to interrupt your\n" + .string "challenge, please save the game.\p" + .string "If you don’t save before interrupting,\n" + .string "you will be disqualified.$" + +BattleFrontier_BattlePalaceLobby_Text_24EE81: @ 824EE81 + .string "To defeat the PALACE MAVEN\n" + .string "and seven TRAINERS in a row…$" + +BattleFrontier_BattlePalaceLobby_Text_24EEB9: @ 824EEB9 + .string "In honor of the bond you share with\n" + .string "your POKéMON, we present you with\l" + .string "these Battle Point(s).$" + +BattleFrontier_BattlePalaceLobby_Text_24EF16: @ 824EF16 + .string "Would you like to record your latest\n" + .string "BATTLE PALACE match on your\l" + .string "FRONTIER PASS?$" + +BattleFrontier_BattlePalaceLobby_Text_24EF66: @ 824EF66 + .string "The BATTLE HALL rules are listed.$" + +BattleFrontier_BattlePalaceLobby_Text_24EF88: @ 824EF88 +VerdanturfTown_BattleTentLobby_Text_24EF88: @ 824EF88 + .string "Which heading do you want to read?$" + +BattleFrontier_BattlePalaceLobby_Text_24EFAB: @ 824EFAB +VerdanturfTown_BattleTentLobby_Text_24EFAB: @ 824EFAB + .string "Here, POKéMON are required to think\n" + .string "and battle by themselves.\p" + .string "Unlike in the wild, POKéMON that live\n" + .string "with people behave differently\l" + .string "depending on their nature.$" + +BattleFrontier_BattlePalaceLobby_Text_24F049: @ 824F049 +VerdanturfTown_BattleTentLobby_Text_24F049: @ 824F049 + .string "Depending on its nature, a POKéMON\n" + .string "may prefer to attack no matter what.\p" + .string "Another POKéMON may prefer to protect\n" + .string "itself from any harm.\p" + .string "Yet another may enjoy vexing or\n" + .string "confounding its foes.\p" + .string "Due to its nature, a POKéMON\n" + .string "will have favorite moves that it is good\l" + .string "at using.\p" + .string "It may also dislike certain moves that\n" + .string "it has trouble using.$" + +BattleFrontier_BattlePalaceLobby_Text_24F190: @ 824F190 +VerdanturfTown_BattleTentLobby_Text_24F190: @ 824F190 + .string "There are offensive moves that inflict\n" + .string "direct damage on the foe.\p" + .string "There are defensive moves that are\n" + .string "used to prepare for enemy attacks or\l" + .string "used to heal HP and so on.\p" + .string "There are also other somewhat-odd\n" + .string "moves that may enfeeble the foes with\l" + .string "stat problems including poison and \l" + .string "paralysis.\p" + .string "POKéMON will consider using moves in\n" + .string "these three categories.$" + +BattleFrontier_BattlePalaceLobby_Text_24F2E8: @ 824F2E8 +VerdanturfTown_BattleTentLobby_Text_24F2E8: @ 824F2E8 + .string "When not under command by its TRAINER,\n" + .string "a POKéMON may be unable to effectively\l" + .string "use certain moves.\p" + .string "A POKéMON is not good at using any\n" + .string "move that it dislikes.\p" + .string "If a POKéMON only knows moves that\n" + .string "do not match its nature, it will often\l" + .string "be unable to live up to its potential.$" + +BattleFrontier_BattlePalaceLobby_Text_24F3F4: @ 824F3F4 +VerdanturfTown_BattleTentLobby_Text_24F3F4: @ 824F3F4 + .string "Depending on its nature, a POKéMON may\n" + .string "start using moves that don’t match its\l" + .string "nature when it is in trouble.\p" + .string "If a POKéMON begins behaving oddly\n" + .string "in a pinch, watch it carefully.$" + diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/events.inc b/data/maps/BattleFrontier_BattlePikeCorridor/events.inc new file mode 100644 index 000000000..67ceaaae6 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeCorridor/events.inc @@ -0,0 +1,6 @@ +BattleFrontier_BattlePikeCorridor_EventObjects: @ 853CC54 + 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/BattleFrontier_BattlePikeCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc new file mode 100644 index 000000000..23ad26692 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc @@ -0,0 +1,69 @@ +BattleFrontier_BattlePikeCorridor_MapScripts:: @ 825C771 + map_script 2, BattleFrontier_BattlePikeCorridor_MapScript2_25C77C + map_script 4, BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7 + .byte 0 + +BattleFrontier_BattlePikeCorridor_MapScript2_25C77C: @ 825C77C + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeCorridor_EventScript_25C786 + .2byte 0 + +BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786 + delay 16 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + setvar VAR_0x8006, 1 + special sub_81A1780 + setvar VAR_0x8004, 20 + special sub_81A703C + setvar VAR_0x8004, 24 + setvar VAR_0x8005, 1 + special sub_81A703C + applymovement 255, BattleFrontier_BattlePikeCorridor_Movement_25C80B + applymovement 1, BattleFrontier_BattlePikeCorridor_Movement_25C812 + waitmovement 0 + lockall + msgbox BattleFrontier_BattlePikeCorridor_Text_25C817, 4 + closemessage + releaseall + applymovement 255, BattleFrontier_BattlePikeCorridor_Movement_25C80E + waitmovement 0 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 99 + special sub_81A1780 + call BattleFrontier_BattlePikeCorridor_EventScript_25BB49 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10 + waitstate + end + +BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7: @ 825C7F7 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePikeCorridor_EventScript_25C801 + .2byte 0 + +BattleFrontier_BattlePikeCorridor_EventScript_25C801:: @ 825C801 + setvar VAR_TEMP_1, 1 + turnobject 255, 2 + end + +BattleFrontier_BattlePikeCorridor_Movement_25C80B: @ 825C80B + walk_up + walk_up + step_end + +BattleFrontier_BattlePikeCorridor_Movement_25C80E: @ 825C80E + walk_up + walk_up + set_invisible + step_end + +BattleFrontier_BattlePikeCorridor_Movement_25C812: @ 825C812 + walk_up + walk_up + walk_left + face_down + step_end + +BattleFrontier_BattlePikeCorridor_Text_25C817: @ 825C817 + .string "Your Battle Choice challenge\n" + .string "has now begun…$" + diff --git a/data/maps/BattleFrontier_BattlePikeLobby/events.inc b/data/maps/BattleFrontier_BattlePikeLobby/events.inc new file mode 100644 index 000000000..45d3da103 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeLobby/events.inc @@ -0,0 +1,18 @@ +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 + +BattleFrontier_BattlePikeLobby_MapWarps: @ 853CC10 + 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 + bg_event 1, 3, 0, 0, 0, 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_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc new file mode 100644 index 000000000..5323c4a6b --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -0,0 +1,497 @@ +BattleFrontier_BattlePikeLobby_MapScripts:: @ 825B6C6 + map_script 2, BattleFrontier_BattlePikeLobby_MapScript2_25B6D1 + map_script 4, BattleFrontier_BattlePikeLobby_MapScript2_25B6F3 + .byte 0 + +BattleFrontier_BattlePikeLobby_MapScript2_25B6D1: @ 825B6D1 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B707 + map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattlePikeLobby_EventScript_25B710 + map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattlePikeLobby_EventScript_25B762 + map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattlePikeLobby_EventScript_25B806 + .2byte 0 + +BattleFrontier_BattlePikeLobby_MapScript2_25B6F3: @ 825B6F3 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePikeLobby_EventScript_25B6FD + .2byte 0 + +BattleFrontier_BattlePikeLobby_EventScript_25B6FD:: @ 825B6FD + setvar VAR_TEMP_1, 1 + turnobject 255, 2 + end + +BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707 + setvar VAR_0x8004, 0 + special sub_81A1780 + end + +BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710 + special HealPlayerParty + setvar VAR_0x8004, 27 + special sub_81A703C + lockall + msgbox BattleFrontier_BattlePikeLobby_Text_25C2E0, 4 + closemessage + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 0 + special sub_81A703C + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 4 + setvar VAR_0x8006, 0 + special sub_81A703C + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_TEMP_0, 255 + releaseall + end + +BattleFrontier_BattlePikeLobby_EventScript_25B762:: @ 825B762 + lockall + setvar VAR_0x8004, 10 + special sub_81A1780 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattlePikeLobby_EventScript_25B784 + msgbox BattleFrontier_BattlePikeLobby_Text_25C18A, 4 + waitmessage + goto BattleFrontier_BattlePikeLobby_EventScript_25B78D + +BattleFrontier_BattlePikeLobby_EventScript_25B784:: @ 825B784 + msgbox BattleFrontier_BattlePikeLobby_Text_25C383, 4 + waitmessage + +BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D + msgbox BattleFrontier_BattlePikeLobby_Text_25C3D9, 4 + setvar VAR_0x8004, 11 + special sub_81A1780 + msgbox BattleFrontier_BattlePikeLobby_Text_241520, 9 + setvar VAR_0x8004, 8 + special sub_81A1780 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 3 + special sub_81A703C + addvar VAR_RESULT, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + copyvar VAR_0x8006, VAR_RESULT + special sub_81A703C + special LoadPlayerParty + special HealPlayerParty + setvar VAR_0x8004, 27 + special sub_81A703C + message BattleFrontier_BattlePikeLobby_Text_25C1DF + waitmessage + setvar VAR_0x8004, 8 + setvar VAR_0x8005, 0 + special sub_81A703C + playse SE_SAVE + waitse + msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, 4 + closemessage + setvar VAR_TEMP_0, 255 + releaseall + end + +BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806 + lockall + message BattleFrontier_BattlePikeLobby_Text_25C146 + waitmessage + setvar VAR_0x8004, 8 + special sub_81A1780 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 4 + setvar VAR_0x8006, 0 + special sub_81A703C + special LoadPlayerParty + special HealPlayerParty + setvar VAR_0x8004, 27 + special sub_81A703C + setvar VAR_0x8004, 8 + setvar VAR_0x8005, 0 + special sub_81A703C + playse SE_SAVE + waitse + msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, 4 + closemessage + setvar VAR_TEMP_0, 255 + releaseall + end + +BattleFrontier_BattlePikeLobby_EventScript_25B868:: @ 825B868 + lock + faceplayer + setvar VAR_FRONTIER_FACILITY, 5 + setvar VAR_0x40CE, 0 + special SavePlayerParty + msgbox BattleFrontier_BattlePikeLobby_Text_25BB52, 4 + +BattleFrontier_BattlePikeLobby_EventScript_25B87F:: @ 825B87F + message BattleFrontier_BattlePikeLobby_Text_25BBC1 + waitmessage + multichoice 17, 6, 23, 0 + switch VAR_RESULT + case 0, BattleFrontier_BattlePikeLobby_EventScript_25B8BB + case 1, BattleFrontier_BattlePikeLobby_EventScript_25BA1A + case 2, BattleFrontier_BattlePikeLobby_EventScript_25BA76 + case 127, BattleFrontier_BattlePikeLobby_EventScript_25BA76 + +BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB + message BattleFrontier_BattlePikeLobby_Text_25BE35 + waitmessage + multichoice 17, 6, 24, 0 + switch VAR_RESULT + case 2, BattleFrontier_BattlePikeLobby_EventScript_25BA76 + case 127, BattleFrontier_BattlePikeLobby_EventScript_25BA76 + setvar VAR_0x8004, 15 + special sub_81A1780 + compare VAR_0x8004, 1 + goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA27 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + copyvar VAR_0x8006, VAR_RESULT + special sub_81A1780 + msgbox BattleFrontier_BattlePikeLobby_Text_25C094, 4 + fadescreen 1 + call BattleFrontier_BattlePikeLobby_EventScript_23F2B7 + copyvar VAR_0x8004, VAR_RESULT + setvar VAR_0x8005, 3 + special sub_80F9490 + waitstate + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA73 + msgbox BattleFrontier_BattlePikeLobby_Text_25C0D8, 5 + switch VAR_RESULT + case 0, BattleFrontier_BattlePikeLobby_EventScript_25BA73 + case 1, BattleFrontier_BattlePikeLobby_EventScript_25B95C + case 127, BattleFrontier_BattlePikeLobby_EventScript_25BA73 + +BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C + setvar VAR_TEMP_0, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 4 + special sub_81A1780 + setvar VAR_0x8004, 28 + special sub_81A703C + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 1 + special sub_81A1780 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 4 + setvar VAR_0x8006, 1 + special sub_81A703C + setvar VAR_0x8004, 26 + special sub_81A703C + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 0 + special sub_81A1780 + special LoadPlayerParty + closemessage + delay 2 + call BattleFrontier_BattlePikeLobby_EventScript_27134F + setvar VAR_TEMP_0, 255 + setvar VAR_0x8004, 26 + special sub_81A703C + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA5C + special SavePlayerParty + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 3 + special sub_81A1780 + msgbox BattleFrontier_BattlePikeLobby_Text_25C130, 4 + closemessage + setvar VAR_0x8004, 5 + special sub_81A1780 + call BattleFrontier_BattlePikeLobby_EventScript_25BA94 + special HealPlayerParty + call BattleFrontier_BattlePikeLobby_EventScript_25BB49 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR, 255, 6, 7 + setvar VAR_TEMP_0, 0 + waitstate + end + +BattleFrontier_BattlePikeLobby_EventScript_25BA1A:: @ 825BA1A + msgbox BattleFrontier_BattlePikeLobby_Text_25BBF5, 4 + goto BattleFrontier_BattlePikeLobby_EventScript_25B87F + +BattleFrontier_BattlePikeLobby_EventScript_25BA27:: @ 825BA27 + switch VAR_RESULT + case 0, BattleFrontier_BattlePikeLobby_EventScript_25BA42 + case 1, BattleFrontier_BattlePikeLobby_EventScript_25BA4F + +BattleFrontier_BattlePikeLobby_EventScript_25BA42:: @ 825BA42 + msgbox BattleFrontier_BattlePikeLobby_Text_25BE8C, 4 + goto BattleFrontier_BattlePikeLobby_EventScript_25BA7E + +BattleFrontier_BattlePikeLobby_EventScript_25BA4F:: @ 825BA4F + msgbox BattleFrontier_BattlePikeLobby_Text_25BF9A, 4 + goto BattleFrontier_BattlePikeLobby_EventScript_25BA7E + +BattleFrontier_BattlePikeLobby_EventScript_25BA5C:: @ 825BA5C + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 0 + special sub_81A1780 + goto BattleFrontier_BattlePikeLobby_EventScript_25BA76 + +BattleFrontier_BattlePikeLobby_EventScript_25BA73:: @ 825BA73 + special LoadPlayerParty + +BattleFrontier_BattlePikeLobby_EventScript_25BA76:: @ 825BA76 + msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, 4 + +BattleFrontier_BattlePikeLobby_EventScript_25BA7E:: @ 825BA7E + release + end + +BattleFrontier_BattlePikeLobby_EventScript_25BA80:: @ 825BA80 + lockall + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 5 + special sub_81A1780 + waitbuttonpress + special RemoveRecordsWindow + releaseall + end + +BattleFrontier_BattlePikeLobby_EventScript_25BA94:: @ 825BA94 + applymovement 1, BattleFrontier_BattlePikeLobby_Movement_25BAA7 + applymovement 255, BattleFrontier_BattlePikeLobby_Movement_25BAA6 + waitmovement 0 + return + +BattleFrontier_BattlePikeLobby_Movement_25BAA6: @ 825BAA6 + walk_up + +BattleFrontier_BattlePikeLobby_Movement_25BAA7: @ 825BAA7 + walk_up + walk_up + set_invisible + step_end + +BattleFrontier_BattlePikeLobby_EventScript_25BAAB:: @ 825BAAB + msgbox BattleFrontier_BattlePikeLobby_Text_25C422, 2 + end + +BattleFrontier_BattlePikeLobby_EventScript_25BAB4:: @ 825BAB4 + msgbox BattleFrontier_BattlePikeLobby_Text_25C4A5, 2 + end + +BattleFrontier_BattlePikeLobby_EventScript_25BABD:: @ 825BABD + msgbox BattleFrontier_BattlePikeLobby_Text_25C4FD, 2 + end + +BattleFrontier_BattlePikeLobby_EventScript_25BAC6:: @ 825BAC6 + lockall + msgbox BattleFrontier_BattlePikeLobby_Text_25C5FB, 4 + goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5 + end + +BattleFrontier_BattlePikeLobby_EventScript_25BAD5:: @ 825BAD5 + message BattleFrontier_BattlePikeLobby_Text_25C621 + waitmessage + multichoice 16, 4, 102, 0 + switch VAR_RESULT + case 0, BattleFrontier_BattlePikeLobby_EventScript_25BB1D + case 1, BattleFrontier_BattlePikeLobby_EventScript_25BB2B + case 2, BattleFrontier_BattlePikeLobby_EventScript_25BB39 + case 3, BattleFrontier_BattlePikeLobby_EventScript_25BB47 + case 127, BattleFrontier_BattlePikeLobby_EventScript_25BB47 + end + +BattleFrontier_BattlePikeLobby_EventScript_25BB1D:: @ 825BB1D + msgbox BattleFrontier_BattlePikeLobby_Text_25C644, 4 + goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5 + end + +BattleFrontier_BattlePikeLobby_EventScript_25BB2B:: @ 825BB2B + msgbox BattleFrontier_BattlePikeLobby_Text_25C68A, 4 + goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5 + end + +BattleFrontier_BattlePikeLobby_EventScript_25BB39:: @ 825BB39 + msgbox BattleFrontier_BattlePikeLobby_Text_25C6EB, 4 + goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5 + end + +BattleFrontier_BattlePikeLobby_EventScript_25BB47:: @ 825BB47 + releaseall + end + +BattleFrontier_BattlePikeCorridor_EventScript_25BB49:: @ 825BB49 +BattleFrontier_BattlePikeLobby_EventScript_25BB49:: @ 825BB49 +BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49:: @ 825BB49 +BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49:: @ 825BB49 + playse 267 + special sub_813B880 + waitstate + waitse + return + +BattleFrontier_BattlePikeLobby_Text_25BB52: @ 825BB52 + .string "Where the luck of TRAINERS\n" + .string "is put to the test…\p" + .string "Welcome to the BATTLE PIKE…\p" + .string "I am your guide to the BATTLE PIKE…$" + +BattleFrontier_BattlePikeLobby_Text_25BBC1: @ 825BBC1 + .string "Would you like to take the Battle\n" + .string "Choice challenge?$" + +BattleFrontier_BattlePikeLobby_Text_25BBF5: @ 825BBF5 + .string "Here we conduct an event we call\n" + .string "the Battle Choice.\p" + .string "The Battle Choice rules are very\n" + .string "simple…\p" + .string "Choose one of three paths and make\n" + .string "your way to the goal room at the end\l" + .string "of the BATTLE PIKE. It’s that simple.\p" + .string "However, what happens on the chosen\n" + .string "path depends entirely on the luck\l" + .string "of the challenger…\p" + .string "If you reach the goal, you will be\n" + .string "rewarded with Battle Points.\p" + .string "If you want to interrupt your\n" + .string "challenge, please have a word with\l" + .string "our staff in the big rooms on the way.\p" + .string "If you don’t save before interrupting,\n" + .string "you will be disqualified.$" + +BattleFrontier_BattlePikeLobby_Text_25BE02: @ 825BE02 + .string "We look forward to seeing you\n" + .string "on another occasion…$" + +BattleFrontier_BattlePikeLobby_Text_25BE35: @ 825BE35 + .string "You have the choice of two courses,\n" + .string "Level 50 and Open Level.\l" + .string "Which will you challenge?$" + +BattleFrontier_BattlePikeLobby_Text_25BE8C: @ 825BE8C + .string "I beg your pardon, but…\p" + .string "You do not have three eligible\n" + .string "POKéMON for the Battle Choice event.\p" + .string "You must have three different POKéMON\n" + .string "of Level 50 or less to enter.\p" + .string "They also must be holding different\n" + .string "kinds of items.\p" + .string "EGGS{STR_VAR_1} ineligible.\p" + .string "Please come see me when\n" + .string "you are ready…$" + +BattleFrontier_BattlePikeLobby_Text_25BF9A: @ 825BF9A + .string "I beg your pardon, but…\p" + .string "You do not have three eligible\n" + .string "POKéMON for the Battle Choice event.\p" + .string "You must have three different\n" + .string "POKéMON to enter.\p" + .string "They also must be holding different\n" + .string "kinds of items.\p" + .string "EGGS{STR_VAR_1} ineligible.\p" + .string "Please come see me when\n" + .string "you are ready…$" + +BattleFrontier_BattlePikeLobby_Text_25C094: @ 825C094 + .string "Please choose the three POKéMON\n" + .string "you wish to enter in the challenge…$" + +BattleFrontier_BattlePikeLobby_Text_25C0D8: @ 825C0D8 + .string "Before starting your Battle Choice\n" + .string "challenge, I must save the game.\l" + .string "Is that acceptable?$" + +BattleFrontier_BattlePikeLobby_Text_25C130: @ 825C130 + .string "Please step this way…$" + +BattleFrontier_BattlePikeLobby_Text_25C146: @ 825C146 + .string "Your challenge has ended…\p" + .string "I shall record your results.\n" + .string "Please wait…$" + +BattleFrontier_BattlePikeLobby_Text_25C18A: @ 825C18A + .string "You have completed the challenge…\p" + .string "I must say… You seem to possess luck\n" + .string "in abundance…$" + +BattleFrontier_BattlePikeLobby_Text_25C1DF: @ 825C1DF + .string "I shall record your results.\n" + .string "Please wait…$" + +BattleFrontier_BattlePikeLobby_Text_25C209: @ 825C209 + .string "To commemorate your completion of\n" + .string "the Battle Choice challenge, we award\l" + .string "you these Battle Point(s)…$" + +BattleFrontier_BattlePikeLobby_Text_25C26C: @ 825C26C + .string "You appear to have reached the limit\n" + .string "for Battle Points…\pPlease exchange some Battle Points\n" + .string "for prizes, then return…$" + +BattleFrontier_BattlePikeLobby_Text_25C2E0: @ 825C2E0 + .string "I beg your pardon, but…\p" + .string "You failed to save before you quit\n" + .string "your challenge the last time.\p" + .string "Because of that, your challenge so far\n" + .string "has been disqualified. I am sorry…$" + +BattleFrontier_BattlePikeLobby_Text_25C383: @ 825C383 + .string "Congratulations…\p" + .string "You have snatched victory from the\n" + .string "PIKE QUEEN and cleared the event…$" + +BattleFrontier_BattlePikeLobby_Text_25C3D9: @ 825C3D9 + .string "In recognition of your amazing luck,\n" + .string "we award you these Battle Point(s)…$" + +BattleFrontier_BattlePikeLobby_Text_25C422: @ 825C422 + .string "Arrgh! I blew my chance!\n" + .string "I was one room away from the goal!\p" + .string "In this place, you’d better watch out\n" + .string "for poison, freezing, and so on.$" + +BattleFrontier_BattlePikeLobby_Text_25C4A5: @ 825C4A5 + .string "I’ve completed the challenge 10 times\n" + .string "now, but I’ve never had to battle\l" + .string "a TRAINER once.$" + +BattleFrontier_BattlePikeLobby_Text_25C4FD: @ 825C4FD + .string "Listen! Listen!\p" + .string "Don’t you think that the special\n" + .string "abilities of POKéMON will be useful\l" + .string "here?$" + +BattleFrontier_BattlePikeLobby_Text_25C558: @ 825C558 + .string "What is this weird place?\n" + .string "I can’t figure it out at all!\p" + .string "I’ve taken the challenge a bunch\n" + .string "of times, but all I ever do is run into\l" + .string "TRAINERS whichever path I choose.$" + +BattleFrontier_BattlePikeLobby_Text_25C5FB: @ 825C5FB + .string "The Battle Choice’s rules are listed.$" + +BattleFrontier_BattlePikeLobby_Text_25C621: @ 825C621 + .string "Which heading do you want to read?$" + +BattleFrontier_BattlePikeLobby_Text_25C644: @ 825C644 + .string "The BAG and POKéNAV may not be used\n" + .string "during a Battle Choice challenge.$" + +BattleFrontier_BattlePikeLobby_Text_25C68A: @ 825C68A + .string "During a Battle Choice challenge,\n" + .string "any BERRY or HERB held by POKéMON\l" + .string "will be effective only once.$" + +BattleFrontier_BattlePikeLobby_Text_25C6EB: @ 825C6EB + .string "During a Battle Choice challenge,\n" + .string "the sequence of POKéMON cannot be\l" + .string "changed.\p" + .string "The sequence must be set before\n" + .string "starting your challenge.$" + diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc new file mode 100644 index 000000000..80c1fc3bf --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc @@ -0,0 +1,16 @@ +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 + +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 + +BattleFrontier_BattlePikeRandomRoom1_MapEvents:: @ 853CDF4 + map_events BattleFrontier_BattlePikeRandomRoom1_EventObjects, 0x0, BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents, 0x0 + diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc new file mode 100644 index 000000000..509806531 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc @@ -0,0 +1,895 @@ +BattleFrontier_BattlePikeRandomRoom1_MapScripts:: @ 825D152 + map_script 5, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C423E + map_script 3, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25 + map_script 2, BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167 + map_script 4, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE + .byte 0 + +BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167: @ 825D167 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D171 + .2byte 0 + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D171:: @ 825D171 + setvar VAR_TEMP_0, 1 + setvar VAR_0x8004, 5 + special sub_81A703C + switch VAR_RESULT + case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6 + case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D50E + case 3, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D605 + case 6, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D231 + case 7, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E + case 8, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2BF + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6:: @ 825D1C6 + lockall + delay 16 + applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795 + waitmovement 0 + setvar VAR_0x8004, 21 + setvar VAR_0x8005, 0 + special sub_81A703C + msgbox 0x2021fc4, 4 + waitmessage + closemessage + releaseall + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 0 + special sub_8163AC4 + waitstate + switch VAR_RESULT + case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D226 + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A:: @ 825D20A + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 4 + special sub_81A1780 + warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 + waitstate + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D226:: @ 825D226 + applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798 + waitmovement 0 + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D231:: @ 825D231 + lockall + delay 16 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDFE, 4 + waitmessage + closemessage + applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795 + waitmovement 0 + setvar VAR_0x8004, 21 + setvar VAR_0x8005, 0 + special sub_81A703C + msgbox 0x2021fc4, 4 + waitmessage + closemessage + releaseall + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 0 + special sub_8163AC4 + waitstate + switch VAR_RESULT + case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D285 + goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D285:: @ 825D285 + applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798 + waitmovement 0 + applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B6 + waitmovement 0 + lock + faceplayer + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE3F, 4 + playfanfare MUS_ME_ASA + waitfanfare + special HealPlayerParty + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE94, 4 + closemessage + release + applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798 + waitmovement 0 + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2BF:: @ 825D2BF + delay 22 + lockall + applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DF + waitmovement 0 + setvar VAR_0x8004, 23 + special sub_81A703C + switch VAR_RESULT + case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4DC + case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4EA + case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4FC + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E311, 4 + closemessage + special SpawnScriptEventObject + applymovement 127, BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0 + applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E2 + waitmovement 0 + playse 267 + call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8E7 + delay 4 + call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8A4 + delay 4 + call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D96D + delay 4 + waitse + delay 60 + playse 268 + delay 65 + call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8A4 + showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 + delay 4 + call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8E7 + delay 4 + call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D92A + waitse + applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E7 + waitmovement 0 + setvar VAR_0x8004, 22 + special sub_81A703C + switch VAR_RESULT + case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416 + case 3, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD + case 4, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 7 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DED2, 4 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 7 + special sub_81A1780 + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD:: @ 825D3BD + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DF71, 4 + call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA + goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA + setvar VAR_0x8004, 12 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2, 4 + waitmessage + playfanfare MUS_ME_SYMBOLGET + message BattleFrontier_BattlePikeRandomRoom1_Text_25DFD0 + waitmessage + waitfanfare + setvar VAR_0x8004, 13 + special sub_81A1780 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E003, 4 + closemessage + goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416:: @ 825D416 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 7 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E02C, 4 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 7 + special sub_81A1780 + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443:: @ 825D443 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8, 4 + call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460 + goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460 + setvar VAR_0x8004, 12 + special sub_81A1780 + compare VAR_RESULT, 2 + goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0F6, 4 + waitmessage + playfanfare MUS_ME_SYMBOLGET + message BattleFrontier_BattlePikeRandomRoom1_Text_25E118 + waitmessage + waitfanfare + setvar VAR_0x8004, 13 + special sub_81A1780 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E140, 4 + closemessage + goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D:: @ 825D49D + applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7EA + waitmovement 0 + applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC + waitmovement 0 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + special sub_81A703C + addvar VAR_RESULT, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + copyvar VAR_0x8006, VAR_RESULT + special sub_81A703C + call BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144 + waitstate + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4DC:: @ 825D4DC + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E15D, 4 + goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4EA:: @ 825D4EA + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E1DD, 4 + playfanfare MUS_ME_ASA + waitfanfare + goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4FC:: @ 825D4FC + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E238, 4 + playfanfare MUS_ME_ASA + waitfanfare + goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D50E:: @ 825D50E + lockall + delay 16 + applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795 + waitmovement 0 + message BattleFrontier_BattlePikeRandomRoom1_Text_25D9B6 + waitmessage + playfanfare MUS_ME_ASA + waitfanfare + special HealPlayerParty + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA13, 4 + closemessage + applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798 + waitmovement 0 + releaseall + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E + lockall + delay 16 + applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C1 + applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C3 + waitmovement 0 + applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C5 + applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C5 + waitmovement 0 + applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C8 + applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CA + waitmovement 0 + applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BB + waitmovement 0 + setvar VAR_0x8004, 21 + setvar VAR_0x8005, 0 + special sub_81A703C + msgbox 0x2021fc4, 4 + closemessage + delay 16 + applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD + waitmovement 0 + setvar VAR_0x8004, 21 + setvar VAR_0x8005, 1 + special sub_81A703C + msgbox 0x2021fc4, 4 + closemessage + setvar VAR_0x8004, 9 + setvar VAR_0x8005, 0 + special sub_8163AC4 + waitstate + switch VAR_RESULT + case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D5DC + goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D5DC:: @ 825D5DC + applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD + waitmovement 0 + applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CC + waitmovement 0 + applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7D4 + waitmovement 0 + applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BF + waitmovement 0 + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D605:: @ 825D605 + lockall + message BattleFrontier_BattlePikeRandomRoom1_Text_25DBD1 + applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7AA + waitmovement 0 + setvar VAR_0x8004, 12 + special sub_81A703C + copyvar VAR_0x8004, VAR_RESULT + compare VAR_0x8004, 0 + call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643 + compare VAR_0x8004, 1 + call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD3F, 4 + closemessage + releaseall + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DBE4, 4 + closemessage + waitse + playmoncry SPECIES_KIRLIA, 0 + waitmoncry + setvar VAR_0x8004, 11 + special sub_81A703C + compare VAR_RESULT, 2 + call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751 + compare VAR_RESULT, 1 + call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D758 + compare VAR_RESULT, 3 + call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D75F + compare VAR_RESULT, 4 + call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766 + setvar VAR_0x8004, 15 + special sub_81A703C + waitstate + applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2 + waitmovement 0 + applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B1 + waitmovement 0 + waitse + playmoncry SPECIES_KIRLIA, 0 + waitmoncry + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF, 4 + waitse + playmoncry SPECIES_KIRLIA, 0 + waitmoncry + closemessage + applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B3 + applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A4 + waitmovement 0 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCCF, 4 + return + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5:: @ 825D6D5 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DC01, 4 + closemessage + waitse + playmoncry SPECIES_DUSCLOPS, 0 + waitmoncry + setvar VAR_0x8004, 11 + special sub_81A703C + compare VAR_RESULT, 0 + call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D + compare VAR_RESULT, 1 + call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774 + setvar VAR_0x8004, 15 + special sub_81A703C + waitstate + applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2 + waitmovement 0 + applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B1 + waitmovement 0 + waitse + playmoncry SPECIES_DUSCLOPS, 0 + waitmoncry + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF, 4 + waitse + playmoncry SPECIES_DUSCLOPS, 0 + waitmoncry + closemessage + applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B3 + applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A4 + waitmovement 0 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD06, 4 + return + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751:: @ 825D751 + message BattleFrontier_BattlePikeRandomRoom1_Text_25DC20 + waitmessage + return + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D758:: @ 825D758 + message BattleFrontier_BattlePikeRandomRoom1_Text_25DC63 + waitmessage + return + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D75F:: @ 825D75F + message BattleFrontier_BattlePikeRandomRoom1_Text_25DC49 + waitmessage + return + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766:: @ 825D766 + message BattleFrontier_BattlePikeRandomRoom1_Text_25DC33 + waitmessage + return + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D:: @ 825D76D + message BattleFrontier_BattlePikeRandomRoom1_Text_25DC97 + waitmessage + return + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774:: @ 825D774 + message BattleFrontier_BattlePikeRandomRoom1_Text_25DC7C + waitmessage + return + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B:: @ 825D77B + closemessage + applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC + waitmovement 0 + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 0 + special sub_8163AC4 + waitstate + return + +BattleFrontier_BattlePikeRandomRoom1_Movement_25D795: @ 825D795 + walk_down + walk_down + step_end + +BattleFrontier_BattlePikeRandomRoom1_Movement_25D798: @ 825D798 + walk_up + walk_up + walk_up + set_invisible + walk_up + step_end + +BattleFrontier_BattlePikeRandomRoom1_Movement_25D79E: @ 825D79E + walk_up + set_invisible + walk_up + step_end + +BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2: @ 825D7A2 + walk_down + step_end + +BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A4: @ 825D7A4 + walk_down + face_left + delay_16 + delay_16 + face_down + step_end + +BattleFrontier_BattlePikeRandomRoom1_Movement_25D7AA: @ 825D7AA + walk_fast_down + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_left + face_down + step_end + +BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B1: @ 825D7B1 + face_up + step_end + +BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B3: @ 825D7B3 + walk_left + +BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B4: @ 825D7B4 + face_right + step_end + +BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B6: @ 825D7B6 + walk_down + walk_down + walk_right + face_down + step_end + +BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BB: @ 825D7BB + face_left + step_end + +BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD: @ 825D7BD + face_right + step_end + +BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BF: @ 825D7BF + face_up + step_end + +BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C1: @ 825D7C1 + walk_right + step_end + +BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C3: @ 825D7C3 + walk_left + step_end + +BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C5: @ 825D7C5 + walk_down + walk_down + step_end + +BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C8: @ 825D7C8 + face_right + step_end + +BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CA: @ 825D7CA + face_left + step_end + +BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CC: @ 825D7CC + walk_up + walk_up + walk_up + walk_right + walk_up + set_invisible + walk_up + step_end + +BattleFrontier_BattlePikeRandomRoom1_Movement_25D7D4: @ 825D7D4 + walk_up + walk_up + walk_up + walk_left + walk_up + set_invisible + walk_up + step_end + +BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC: @ 825D7DC + walk_up + walk_up + step_end + +BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DF: @ 825D7DF + walk_down + walk_down + step_end + +BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E2: @ 825D7E2 + walk_up + walk_up + walk_up + set_invisible + step_end + +BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E7: @ 825D7E7 + set_visible + walk_down + step_end + +BattleFrontier_BattlePikeRandomRoom1_Movement_25D7EA: @ 825D7EA + walk_left + face_right + step_end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED:: @ 825D7ED + setvar VAR_0x8004, 5 + special sub_81A703C + switch VAR_RESULT + case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B + case 3, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D831 + case 4, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B:: @ 825D81B + lock + faceplayer + setvar VAR_0x8004, 14 + special sub_81A703C + msgbox 0x2021fc4, 4 + waitmessage + closemessage + release + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D831:: @ 825D831 + lock + faceplayer + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDA3, 4 + closemessage + release + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E:: @ 825D83E + setvar VAR_0x8004, 13 + special sub_81A703C + compare VAR_RESULT, 2 + call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881 + compare VAR_RESULT, 1 + call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875 + playfanfare MUS_ME_ASA + waitfanfare + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DABE, 4 + closemessage + release + applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D79E + waitmovement 0 + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875:: @ 825D875 + lock + faceplayer + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA51, 4 + closemessage + return + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881:: @ 825D881 + lock + faceplayer + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E32E, 4 + closemessage + return + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D:: @ 825D88D + lock + faceplayer + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDE6, 4 + closemessage + release + applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B4 + waitmovement 0 + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8A4:: @ 825D8A4 + setmetatile 4, 1, 554, 1 + setmetatile 3, 2, 561, 1 + setmetatile 4, 2, 562, 1 + setmetatile 5, 2, 563, 1 + setmetatile 3, 3, 569, 1 + setmetatile 4, 3, 570, 0 + setmetatile 5, 3, 571, 1 + special DrawWholeMapView + return + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8E7:: @ 825D8E7 + setmetatile 4, 1, 522, 1 + setmetatile 3, 2, 529, 1 + setmetatile 4, 2, 530, 1 + setmetatile 5, 2, 531, 1 + setmetatile 3, 3, 537, 1 + setmetatile 4, 3, 538, 0 + setmetatile 5, 3, 539, 1 + special DrawWholeMapView + return + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D92A:: @ 825D92A + setmetatile 4, 1, 683, 1 + setmetatile 3, 2, 690, 1 + setmetatile 4, 2, 691, 1 + setmetatile 5, 2, 692, 1 + setmetatile 3, 3, 698, 1 + setmetatile 4, 3, 699, 0 + setmetatile 5, 3, 700, 1 + special DrawWholeMapView + return + +BattleFrontier_BattlePikeRandomRoom1_EventScript_25D96D:: @ 825D96D + setmetatile 4, 1, 586, 1 + setmetatile 3, 2, 593, 1 + setmetatile 4, 2, 594, 1 + setmetatile 5, 2, 595, 1 + setmetatile 3, 3, 601, 1 + setmetatile 4, 3, 602, 0 + setmetatile 5, 3, 603, 1 + special DrawWholeMapView + return + +BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0: @ 825D9B0 + walk_up + walk_up + step_end + +BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B3: @ 825D9B3 + walk_down + walk_down + step_end + +BattleFrontier_BattlePikeRandomRoom1_Text_25D9B6: @ 825D9B6 + .string "Welcome…\n" + .string "You must be commended for your luck…\p" + .string "Your POKéMON shall be restored\n" + .string "to full health…$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25DA13: @ 825DA13 + .string "I urge you to enjoy the rest of your\n" + .string "Battle Choice challenge…$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25DA51: @ 825DA51 + .string "Ah, you’re a lucky one.\n" + .string "I’m in somewhat-good spirits now.\p" + .string "I will restore one of your POKéMON\n" + .string "to full health.$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25DABE: @ 825DABE + .string "The best of luck to you.\n" + .string "Farewell.$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25DAE1: @ 825DAE1 + .string "Excuse me…\p" + .string "Would you care for a battle?\n" + .string "I’ll restore your POKéMON if you win.$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25DB2F: @ 825DB2F + .string "Very well…\n" + .string "Now, shall we?$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25DB49: @ 825DB49 + .string "I see…\n" + .string "How unsporting of you…$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25DB67: @ 825DB67 + .string "Magnificent…\p" + .string "As promised, I shall restore your\n" + .string "POKéMON to full health.$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25DBAE: @ 825DBAE + .string "The best of luck to you.\n" + .string "Farewell.$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25DBD1: @ 825DBD1 + .string "Oh, my!\p" + .string "Watch out!$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25DBE4: @ 825DBE4 + .string "Now, now!\n" + .string "KIRLIA, stop that!$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25DC01: @ 825DC01 + .string "Now, now!\n" + .string "DUSCLOPS, stop that!$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25DC20: @ 825DC20 + .string "KIRLIA used TOXIC!$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25DC33: @ 825DC33 + .string "KIRLIA used HYPNOSIS!$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25DC49: @ 825DC49 + .string "KIRLIA used THUNDER WAVE!$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25DC63: @ 825DC63 + .string "KIRLIA used WILL-O-WISP!$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25DC7C: @ 825DC7C + .string "DUSCLOPS used WILL-O-WISP!$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25DC97: @ 825DC97 + .string "DUSCLOPS used ICE BEAM!$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF: @ 825DCAF + .string "Look here!\n" + .string "That’s quite enough!$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25DCCF: @ 825DCCF + .string "I must apologize to you…\p" + .string "My KIRLIA has a TIMID nature…$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25DD06: @ 825DD06 + .string "I must apologize to you…\p" + .string "My DUSCLOPS has a TIMID nature…$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25DD3F: @ 825DD3F + .string "It attacks without warning if it is\n" + .string "startled by another person…\p" + .string "Are you and your POKéMON all right?$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25DDA3: @ 825DDA3 + .string "I do apologize for what happened…\n" + .string "I do hope your POKéMON are fine.$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25DDE6: @ 825DDE6 + .string "… … … … … …\n" + .string "… … … … … …$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25DDFE: @ 825DDFE + .string "Welcome…\p" + .string "Here, we will have you battle\n" + .string "a somewhat-tough TRAINER…$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25DE3F: @ 825DE3F + .string "How wonderful…\p" + .string "To honor your victory, your POKéMON\n" + .string "shall be restored to full health…$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25DE94: @ 825DE94 + .string "I urge you to enjoy the rest of your\n" + .string "Battle Choice challenge…$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25DED2: @ 825DED2 + .string "I am LUCY…\n" + .string "I am the law here…\l" + .string "For I am the PIKE QUEEN…\p" + .string "You already know it, but to advance,\n" + .string "you must defeat me…\p" + .string "…I’m not one for idle chatter.\n" + .string "Hurry. Come on…$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25DF71: @ 825DF71 + .string "Your luck…\n" + .string "I hope you didn’t use it all up here…$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2: @ 825DFA2 + .string "LUCY: … … … … … …\n" + .string "Show me your FRONTIER PASS…$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25DFD0: @ 825DFD0 + .string "The Luck Symbol was embossed on\n" + .string "the FRONTIER PASS!$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25E003: @ 825E003 + .string "…That’s all there is…\n" + .string "Disappear already…$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25E02C: @ 825E02C + .string "LUCY: …You again…\p" + .string "… … … … … …\p" + .string "…I’ve trampled flowers and braved\n" + .string "storms to get to where I am…\p" + .string "I don’t feel any compulsion to keep\n" + .string "losing to the same opponent…\p" + .string "… … … … … …\n" + .string "Fine… I’ll do it…$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8: @ 825E0E8 + .string "Now!\n" + .string "Come on!$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25E0F6: @ 825E0F6 + .string "LUCY: … … … … … …\p" + .string "…FRONTIER PASS…$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25E118: @ 825E118 + .string "The Luck Symbol took on\n" + .string "a golden shine!$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25E140: @ 825E140 + .string "…You, I won’t forget…\n" + .string "…Ever…$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25E15D: @ 825E15D + .string "I welcome you…\p" + .string "Giggle…\n" + .string "You seem to be bereft of luck…\p" + .string "If only you hadn’t chosen this room,\n" + .string "your POKéMON could have been healed…$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25E1DD: @ 825E1DD + .string "I welcome you…\p" + .string "Since you have chosen this room, I will\n" + .string "restore one POKéMON to full health…$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25E238: @ 825E238 + .string "I welcome you…\p" + .string "Since you have chosen this room, I will\n" + .string "restore two POKéMON to full health…$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25E293: @ 825E293 + .string "I welcome you…\p" + .string "Giggle…\n" + .string "You should thank your lucky stars…\p" + .string "Since you have chosen this room,\n" + .string "all your POKéMON will be restored…$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25E311: @ 825E311 + .string "I shall go fetch our master…$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25E32E: @ 825E32E + .string "Ah, you’re a lucky one!\n" + .string "I’m in good spirits now.\p" + .string "I will restore two of your POKéMON\n" + .string "to full health!$" + diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc new file mode 100644 index 000000000..9cff20517 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc @@ -0,0 +1,6 @@ +BattleFrontier_BattlePikeRandomRoom2_EventObjects: @ 853CE08 + 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/BattleFrontier_BattlePikeRandomRoom2/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc new file mode 100644 index 000000000..4f0d4632b --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc @@ -0,0 +1,43 @@ +BattleFrontier_BattlePikeRandomRoom2_MapScripts:: @ 825E392 + map_script 2, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D + map_script 4, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE + .byte 0 + +BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D: @ 825E39D + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7 + .2byte 0 + +BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7:: @ 825E3A7 + delay 16 + applymovement 1, BattleFrontier_BattlePikeRandomRoom2_Movement_25E3DB + waitmovement 0 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 3 + special sub_81A1780 + lockall + msgbox BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2, 4 + closemessage + releaseall + warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 + waitstate + end + +BattleFrontier_BattlePikeRandomRoom2_Movement_25E3DB: @ 825E3DB + walk_down + walk_down + step_end + +BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE: @ 825E3DE + map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3E8 + .2byte 0 + +BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3E8:: @ 825E3E8 + setvar VAR_TEMP_4, 1 + turnobject 255, 2 + end + +BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2: @ 825E3F2 + .string "Congratulations…\n" + .string "Now, this way, please…$" + diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc new file mode 100644 index 000000000..20e6cb085 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc @@ -0,0 +1,12 @@ +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 + +BattleFrontier_BattlePikeRandomRoom3_MapEvents:: @ 853CEA4 + map_events 0x0, 0x0, BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents, 0x0 + diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc new file mode 100644 index 000000000..9256764e8 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc @@ -0,0 +1,50 @@ +BattleFrontier_BattlePikeRandomRoom3_MapScripts:: @ 825E41A + map_script 5, BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A + map_script 2, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A + map_script 4, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466 + .byte 0 + +BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A: @ 825E42A + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_25E43C + map_script_2 VAR_TEMP_1, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_25E44A + .2byte 0 + +BattleFrontier_BattlePikeRandomRoom3_EventScript_25E43C:: @ 825E43C + setvar VAR_TEMP_0, 1 + setvar VAR_0x8004, 6 + special sub_81A703C + end + +BattleFrontier_BattlePikeRandomRoom3_EventScript_25E44A:: @ 825E44A + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 4 + special sub_81A1780 + warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 + waitstate + end + +BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466: @ 825E466 + map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_25E470 + .2byte 0 + +BattleFrontier_BattlePikeRandomRoom3_EventScript_25E470:: @ 825E470 + setvar VAR_TEMP_4, 1 + turnobject 255, 2 + end + +BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A: @ 825E47A + call BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4271 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 5 + special sub_81A1780 + compare VAR_RESULT, 2 + goto_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3 + compare VAR_RESULT, 3 + goto_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3 + end + +BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3:: @ 825E4A3 + setvar VAR_TEMP_1, 1 + end + diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc new file mode 100644 index 000000000..7a23ba892 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc @@ -0,0 +1,18 @@ +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 + +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 + +BattleFrontier_BattlePikeThreePathRoom_MapEvents:: @ 853CD40 + map_events BattleFrontier_BattlePikeThreePathRoom_EventObjects, 0x0, BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents, 0x0 + diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc new file mode 100644 index 000000000..a4725036b --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc @@ -0,0 +1,393 @@ +BattleFrontier_BattlePikeThreePathRoom_MapScripts:: @ 825C843 + map_script 5, BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E + map_script 2, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853 + map_script 4, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D + .byte 0 + +BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853: @ 825C853 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891 + map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C89A + map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4 + map_script_2 VAR_TEMP_5, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78 + map_script_2 VAR_TEMP_5, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97 + .2byte 0 + +BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D: @ 825C87D + map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887 + .2byte 0 + +BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887:: @ 825C887 + setvar VAR_TEMP_4, 1 + turnobject 255, 2 + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891:: @ 825C891 + setvar VAR_0x8004, 0 + special sub_81A1780 + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_25C89A:: @ 825C89A + warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 + waitstate + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4 + lockall + message BattleFrontier_BattlePikeThreePathRoom_Text_25CD75 + waitmessage + setvar VAR_0x8004, 8 + setvar VAR_0x8005, 1 + special sub_81A703C + playse SE_SAVE + waitse + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_TEMP_0, 255 + special SavePlayerParty + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 3 + special sub_81A1780 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CDDA, 4 + closemessage + releaseall + setvar VAR_0x8004, 5 + special sub_81A1780 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 99 + special sub_81A1780 + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908:: @ 825C908 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special sub_81A1780 + switch VAR_RESULT + case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C968 + case 3, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C978 + case 5, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C988 + case 7, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C998 + case 9, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9A8 + case 11, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9B8 + case 13, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9C8 + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_25C968:: @ 825C968 + lock + faceplayer + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CBDD, 4 + goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_25C978:: @ 825C978 + lock + faceplayer + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC00, 4 + goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_25C988:: @ 825C988 + lock + faceplayer + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC23, 4 + goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_25C998:: @ 825C998 + lock + faceplayer + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC46, 4 + goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9A8:: @ 825C9A8 + lock + faceplayer + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC69, 4 + goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9B8:: @ 825C9B8 + lock + faceplayer + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC8C, 4 + goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9C8:: @ 825C9C8 + lock + faceplayer + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCB0, 4 + goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8:: @ 825C9D8 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCD4, 5 + switch VAR_RESULT + case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A + case 127, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A + release + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD + setvar VAR_0x8004, 6 + special sub_81A1780 + message BattleFrontier_BattlePikeThreePathRoom_Text_25CE08 + waitmessage + special LoadPlayerParty + setvar VAR_0x8004, 8 + setvar VAR_0x8005, 2 + special sub_81A703C + playse SE_SAVE + waitse + fadescreen 1 + setvar VAR_0x8004, 4 + special sub_81A1780 + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A:: @ 825CA2A + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCFB, 5 + switch VAR_RESULT + case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD + case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A + case 127, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A + release + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A:: @ 825CA5A + message BattleFrontier_BattlePikeThreePathRoom_Text_25CD3C + waitmessage + multichoicedefault 20, 8, 94, 1, 0 + switch VAR_RESULT + case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222 + release + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78:: @ 825CA78 + setvar VAR_0x8004, 17 + special sub_81A703C + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91 + setvar VAR_TEMP_5, 255 + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91:: @ 825CA91 + setvar VAR_TEMP_5, 1 + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97:: @ 825CA97 + applymovement 2, BattleFrontier_BattlePikeThreePathRoom_Movement_25CBCE + waitmovement 0 + lockall + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D094, 4 + releaseall + applymovement 2, BattleFrontier_BattlePikeThreePathRoom_Movement_25CBD5 + waitmovement 0 + setvar VAR_TEMP_5, 255 + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB:: @ 825CABB + setvar VAR_0x8004, 19 + special sub_81A703C + compare VAR_RESULT, 4 + goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2 + lock + faceplayer + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CE69, 5 + switch VAR_RESULT + case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB0A + case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00 + case 127, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00 + release + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00:: @ 825CB00 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CEBB, 4 + release + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB0A:: @ 825CB0A + setvar VAR_0x8004, 18 + special sub_81A703C + switch VAR_RESULT + case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB39 + case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB46 + case 2, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB53 + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB39:: @ 825CB39 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CF64, 4 + goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60 + +BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB46:: @ 825CB46 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CF23, 4 + goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60 + +BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB53:: @ 825CB53 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CEE3, 4 + goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60 + +BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60:: @ 825CB60 + setvar VAR_0x8004, 19 + special sub_81A703C + switch VAR_RESULT + case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB9A + case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBA4 + case 2, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBAE + case 3, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBB8 + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB9A:: @ 825CB9A + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D054, 4 + release + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBA4:: @ 825CBA4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D017, 4 + release + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBAE:: @ 825CBAE + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CFA3, 4 + release + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBB8:: @ 825CBB8 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CFE5, 4 + release + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2:: @ 825CBC2 + lock + faceplayer + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D125, 4 + release + end + +BattleFrontier_BattlePikeThreePathRoom_Movement_25CBCE: @ 825CBCE + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + step_end + +BattleFrontier_BattlePikeThreePathRoom_Movement_25CBD5: @ 825CBD5 + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + face_down + step_end + +BattleFrontier_BattlePikeThreePathRoom_Text_25CBDD: @ 825CBDD + .string "You are currently in\n" + .string "the 1st room…$" + +BattleFrontier_BattlePikeThreePathRoom_Text_25CC00: @ 825CC00 + .string "You are currently in\n" + .string "the 3rd room…$" + +BattleFrontier_BattlePikeThreePathRoom_Text_25CC23: @ 825CC23 + .string "You are currently in\n" + .string "the 5th room…$" + +BattleFrontier_BattlePikeThreePathRoom_Text_25CC46: @ 825CC46 + .string "You are currently in\n" + .string "the 7th room…$" + +BattleFrontier_BattlePikeThreePathRoom_Text_25CC69: @ 825CC69 + .string "You are currently in\n" + .string "the 9th room…$" + +BattleFrontier_BattlePikeThreePathRoom_Text_25CC8C: @ 825CC8C + .string "You are currently in\n" + .string "the 11th room…$" + +BattleFrontier_BattlePikeThreePathRoom_Text_25CCB0: @ 825CCB0 + .string "You are currently in\n" + .string "the 13th room…$" + +BattleFrontier_BattlePikeThreePathRoom_Text_25CCD4: @ 825CCD4 + .string "Will you continue with\n" + .string "your challenge?$" + +BattleFrontier_BattlePikeThreePathRoom_Text_25CCFB: @ 825CCFB + .string "Would you like to save your challenge\n" + .string "and quit the game for now?$" + +BattleFrontier_BattlePikeThreePathRoom_Text_25CD3C: @ 825CD3C + .string "Do you wish to retire from your\n" + .string "Battle Choice challenge?$" + +BattleFrontier_BattlePikeThreePathRoom_Text_25CD75: @ 825CD75 + .string "We’ve been awaiting your return…\p" + .string "Before resuming your Battle Choice\n" + .string "challenge, let me save the game…$" + +BattleFrontier_BattlePikeThreePathRoom_Text_25CDDA: @ 825CDDA + .string "Please do enjoy your Battle Choice\n" + .string "challenge…$" + +BattleFrontier_BattlePikeThreePathRoom_Text_25CE08: @ 825CE08 + .string "I am saving your data…\n" + .string "A little time, please…$" + +BattleFrontier_BattlePikeRandomRoom1_Text_25CE36: @ 825CE36 +BattleFrontier_BattlePikeRandomRoom3_Text_25CE36: @ 825CE36 +BattleFrontier_BattlePikeThreePathRoom_Text_25CE36: @ 825CE36 + .string "The path is blocked!\n" + .string "And there is no turning back…$" + +BattleFrontier_BattlePikeThreePathRoom_Text_25CE69: @ 825CE69 + .string "I beg your pardon, but…\p" + .string "Are you perhaps finding it difficult\n" + .string "to choose your path?$" + +BattleFrontier_BattlePikeThreePathRoom_Text_25CEBB: @ 825CEBB + .string "I see…\n" + .string "I apologize for my impertinence…$" + +BattleFrontier_BattlePikeThreePathRoom_Text_25CEE3: @ 825CEE3 + .string "Ah, let me see… There is something\n" + .string "about the path on the right…$" + +BattleFrontier_BattlePikeThreePathRoom_Text_25CF23: @ 825CF23 + .string "Ah, let me see… There is something\n" + .string "about the path in the center…$" + +BattleFrontier_BattlePikeThreePathRoom_Text_25CF64: @ 825CF64 + .string "Ah, let me see… There is something\n" + .string "about the path on the left…$" + +BattleFrontier_BattlePikeThreePathRoom_Text_25CFA3: @ 825CFA3 + .string "It seems to have the distinct aroma\n" + .string "of POKéMON wafting around it…$" + +BattleFrontier_BattlePikeThreePathRoom_Text_25CFE5: @ 825CFE5 + .string "Is it… A TRAINER?\n" + .string "I sense the presence of people…$" + +BattleFrontier_BattlePikeThreePathRoom_Text_25D017: @ 825D017 + .string "I seem to have heard something…\n" + .string "It may have been whispering…$" + +BattleFrontier_BattlePikeThreePathRoom_Text_25D054: @ 825D054 + .string "For some odd reason, I felt a wave\n" + .string "of nostalgia coming from it…$" + +BattleFrontier_BattlePikeThreePathRoom_Text_25D094: @ 825D094 + .string "I am sorry to say…\p" + .string "A terrifying event, yes, a horrible one,\n" + .string "is about to befall you…\p" + .string "I urge you to pay the utmost care\n" + .string "and prepare for the worst…$" + +BattleFrontier_BattlePikeThreePathRoom_Text_25D125: @ 825D125 + .string "From every path I sense a dreadful\n" + .string "presence…$" diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc new file mode 100644 index 000000000..7a8c584ac --- /dev/null +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc @@ -0,0 +1,19 @@ +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 + +BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: @ 853D0F0 + 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/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc new file mode 100644 index 000000000..5bb6a87e0 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc @@ -0,0 +1,764 @@ +BattleFrontier_BattlePointExchangeServiceCorner_MapScripts:: @ 825F070 + .byte 0 + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F071:: @ 825F071 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F7FA, 4 + special sub_813A958 + return + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D:: @ 825F07D + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF12, 4 + special sub_813A988 + release + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A:: @ 825F08A + specialvar VAR_TEMP_1, sub_813AA04 + compare VAR_TEMP_1, VAR_0x8008 + goto_if 4, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0C9 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE86, 4 + compare VAR_TEMP_2, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + compare VAR_TEMP_2, 1 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E + compare VAR_TEMP_2, 2 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0C9:: @ 825F0C9 + compare VAR_TEMP_2, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5 + compare VAR_TEMP_2, 1 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5:: @ 825F0E5 + checkdecorspace VAR_0x8009 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D + copyvar VAR_0x8004, VAR_0x8008 + special sub_813A9A4 + givedecoration VAR_0x8009 + special sub_813A8FC + playse SE_REGI + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE45, 4 + compare VAR_TEMP_2, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D:: @ 825F11D + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEB9, 4 + special sub_813A988 + release + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A:: @ 825F12A + checkitemspace VAR_0x8009, 1 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F166 + copyvar VAR_0x8004, VAR_0x8008 + special sub_813A9A4 + giveitem VAR_0x8009, 1 + special sub_813A8FC + playse SE_REGI + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE72, 4 + compare VAR_TEMP_2, 2 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F166:: @ 825F166 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEE3, 4 + special sub_813A988 + release + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173:: @ 825F173 + lock + faceplayer + setvar VAR_TEMP_2, 0 + call BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F071 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185:: @ 825F185 + setvar VAR_0x8004, 3 + special sub_813AA18 + special sub_813A128 + waitstate + special sub_813AA44 + switch VAR_RESULT + case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E + case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241 + case 2, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F264 + case 3, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F287 + case 4, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2AA + case 5, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2CD + case 6, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2F0 + case 7, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F313 + case 8, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F336 + case 9, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F359 + case 10, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D + case 127, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E:: @ 825F21E + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8B6, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + setvar VAR_0x8008, 16 + setvar VAR_0x8009, 75 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241:: @ 825F241 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8E6, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + setvar VAR_0x8008, 32 + setvar VAR_0x8009, 103 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F264:: @ 825F264 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F917, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + setvar VAR_0x8008, 32 + setvar VAR_0x8009, 87 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F287:: @ 825F287 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F949, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + setvar VAR_0x8008, 48 + setvar VAR_0x8009, 79 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2AA:: @ 825F2AA + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F979, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + setvar VAR_0x8008, 48 + setvar VAR_0x8009, 84 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2CD:: @ 825F2CD + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9A9, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + setvar VAR_0x8008, 48 + setvar VAR_0x8009, 85 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2F0:: @ 825F2F0 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9DB, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + setvar VAR_0x8008, 48 + setvar VAR_0x8009, 86 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F313:: @ 825F313 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA0A, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + setvar VAR_0x8008, 80 + setvar VAR_0x8009, 80 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F336:: @ 825F336 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA3D, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + setvar VAR_0x8008, 80 + setvar VAR_0x8009, 81 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F359:: @ 825F359 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA70, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + setvar VAR_0x8008, 80 + setvar VAR_0x8009, 82 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C:: @ 825F37C + lock + faceplayer + setvar VAR_TEMP_2, 1 + call BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F071 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E:: @ 825F38E + setvar VAR_0x8004, 4 + special sub_813AA18 + special sub_813A128 + waitstate + special sub_813AA44 + switch VAR_RESULT + case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0 + case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413 + case 2, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F436 + case 3, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F459 + case 4, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F47C + case 5, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D + case 127, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0:: @ 825F3F0 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAA2, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E + setvar VAR_0x8008, 128 + setvar VAR_0x8009, 113 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413:: @ 825F413 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAD2, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E + setvar VAR_0x8008, 128 + setvar VAR_0x8009, 111 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F436:: @ 825F436 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB03, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E + setvar VAR_0x8008, 256 + setvar VAR_0x8009, 114 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F459:: @ 825F459 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB35, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E + setvar VAR_0x8008, 256 + setvar VAR_0x8009, 115 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F47C:: @ 825F47C + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB68, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E + setvar VAR_0x8008, 256 + setvar VAR_0x8009, 116 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F:: @ 825F49F + lock + faceplayer + setvar VAR_TEMP_2, 2 + call BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F071 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1:: @ 825F4B1 + setvar VAR_0x8004, 5 + special sub_813AA18 + special sub_813A128 + waitstate + special sub_813AA44 + switch VAR_RESULT + case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E + case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541 + case 2, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F564 + case 3, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F587 + case 4, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5AA + case 5, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5CD + case 6, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D + case 127, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E:: @ 825F51E + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB9B, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 + setvar VAR_0x8008, 1 + setvar VAR_0x8009, 64 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541:: @ 825F541 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBC7, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 + setvar VAR_0x8008, 1 + setvar VAR_0x8009, 67 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F564:: @ 825F564 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBF3, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 + setvar VAR_0x8008, 1 + setvar VAR_0x8009, 65 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F587:: @ 825F587 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC1C, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 + setvar VAR_0x8008, 1 + setvar VAR_0x8009, 70 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5AA:: @ 825F5AA + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC45, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 + setvar VAR_0x8008, 1 + setvar VAR_0x8009, 66 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5CD:: @ 825F5CD + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC70, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 + setvar VAR_0x8008, 1 + setvar VAR_0x8009, 63 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0:: @ 825F5F0 + lock + faceplayer + setvar VAR_TEMP_2, 3 + call BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F071 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602:: @ 825F602 + setvar VAR_0x8004, 6 + special sub_813AA18 + special sub_813A128 + waitstate + special sub_813AA44 + switch VAR_RESULT + case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690 + case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3 + case 2, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6D6 + case 3, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6F9 + case 4, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F71C + case 5, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F73F + case 6, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F762 + case 7, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F785 + case 8, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7A8 + case 9, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D + case 127, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690:: @ 825F690 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE17, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 + setvar VAR_0x8008, 48 + setvar VAR_0x8009, 200 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3:: @ 825F6B3 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCCB, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 + setvar VAR_0x8008, 48 + setvar VAR_0x8009, 180 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6D6:: @ 825F6D6 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCFA, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 + setvar VAR_0x8008, 48 + setvar VAR_0x8009, 183 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6F9:: @ 825F6F9 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD29, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 + setvar VAR_0x8008, 48 + setvar VAR_0x8009, 185 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F71C:: @ 825F71C + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC9A, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 + setvar VAR_0x8008, 64 + setvar VAR_0x8009, 179 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F73F:: @ 825F73F + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD59, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 + setvar VAR_0x8008, 64 + setvar VAR_0x8009, 186 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F762:: @ 825F762 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD89, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 + setvar VAR_0x8008, 64 + setvar VAR_0x8009, 187 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F785:: @ 825F785 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDB9, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 + setvar VAR_0x8008, 64 + setvar VAR_0x8009, 196 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7A8:: @ 825F7A8 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDE8, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 + setvar VAR_0x8008, 64 + setvar VAR_0x8009, 198 + goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB:: @ 825F7CB + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_260099, 2 + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4:: @ 825F7D4 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_26002E, 2 + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD:: @ 825F7DD + lock + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FFD0, 4 + release + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8:: @ 825F7E8 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF5D, 2 + end + +BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1:: @ 825F7F1 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_26012D, 2 + end + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25F7FA: @ 825F7FA + .string "Hello, this is the EXCHANGE SERVICE\n" + .string "CORNER.\p" + .string "We exchange the Battle Points you\n" + .string "have collected for lovely prizes.\p" + .string "Please choose a prize from this list.$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25F890: @ 825F890 + .string "Please choose a prize from this list.$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8B6: @ 825F8B6 + .string "You’ve chosen the KISS POSTER.\n" + .string "Is that correct?$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8E6: @ 825F8E6 + .string "You’ve chosen the KISS CUSHION.\n" + .string "Is that correct?$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25F917: @ 825F917 + .string "You’ve chosen the SMOOCHUM DOLL.\n" + .string "Is that correct?$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25F949: @ 825F949 + .string "You’ve chosen the TOGEPI DOLL.\n" + .string "Is that correct?$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25F979: @ 825F979 + .string "You’ve chosen the MEOWTH DOLL.\n" + .string "Is that correct?$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9A9: @ 825F9A9 + .string "You’ve chosen the CLEFAIRY DOLL.\n" + .string "Is that correct?$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9DB: @ 825F9DB + .string "You’ve chosen the DITTO DOLL.\n" + .string "Is that correct?$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA0A: @ 825FA0A + .string "You’ve chosen the CYNDAQUIL DOLL.\n" + .string "Is that correct?$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA3D: @ 825FA3D + .string "You’ve chosen the CHIKORITA DOLL.\n" + .string "Is that correct?$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA70: @ 825FA70 + .string "You’ve chosen the TOTODILE DOLL.\n" + .string "Is that correct?$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAA2: @ 825FAA2 + .string "You’ve chosen the LAPRAS DOLL.\n" + .string "Is that correct?$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAD2: @ 825FAD2 + .string "You’ve chosen the SNORLAX DOLL.\n" + .string "Is that correct?$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB03: @ 825FB03 + .string "You’ve chosen the VENUSAUR DOLL.\n" + .string "Is that correct?$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB35: @ 825FB35 + .string "You’ve chosen the CHARIZARD DOLL.\n" + .string "Is that correct?$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB68: @ 825FB68 + .string "You’ve chosen the BLASTOISE DOLL.\n" + .string "Is that correct?$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB9B: @ 825FB9B + .string "You’ve chosen the PROTEIN.\n" + .string "Is that correct?$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBC7: @ 825FBC7 + .string "You’ve chosen the CALCIUM.\n" + .string "Is that correct?$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBF3: @ 825FBF3 + .string "You’ve chosen the IRON.\n" + .string "Is that correct?$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC1C: @ 825FC1C + .string "You’ve chosen the ZINC.\n" + .string "Is that correct?$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC45: @ 825FC45 + .string "You’ve chosen the CARBOS.\n" + .string "Is that correct?$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC70: @ 825FC70 + .string "You’ve chosen the HP UP.\n" + .string "Is that correct?$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC9A: @ 825FC9A + .string "You’ve chosen the BRIGHTPOWDER.\n" + .string "Is that correct?$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCCB: @ 825FCCB + .string "You’ve chosen the WHITE HERB.\n" + .string "Is that correct?$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCFA: @ 825FCFA + .string "You’ve chosen the QUICK CLAW.\n" + .string "Is that correct?$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD29: @ 825FD29 + .string "You’ve chosen the MENTAL HERB.\n" + .string "Is that correct?$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD59: @ 825FD59 + .string "You’ve chosen the CHOICE BAND.\n" + .string "Is that correct?$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD89: @ 825FD89 + .string "You’ve chosen the KING’S ROCK.\n" + .string "Is that correct?$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDB9: @ 825FDB9 + .string "You’ve chosen the FOCUS BAND.\n" + .string "Is that correct?$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDE8: @ 825FDE8 + .string "You’ve chosen the SCOPE LENS.\n" + .string "Is that correct?$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE17: @ 825FE17 + .string "You’ve chosen the LEFTOVERS.\n" + .string "Is that correct?$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE45: @ 825FE45 + .string "Thank you!\n" + .string "We’ll send it to your PC at home.$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE72: @ 825FE72 + .string "Here is your prize!$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE86: @ 825FE86 + .string "I’m so sorry…\n" + .string "You don’t have enough Battle Points…$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEB9: @ 825FEB9 + .string "I’m so sorry…\n" + .string "Your PC appears to be full…$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEE3: @ 825FEE3 + .string "I’m so sorry…\n" + .string "You don’t have space to hold it…$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF12: @ 825FF12 + .string "Thank you very much.\p" + .string "Please visit us when you have\n" + .string "saved up Battle Points.$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF5D: @ 825FF5D + .string "Oh, they’re so nice!\n" + .string "I wish I had them!\l" + .string "Cute cushions!\l" + .string "Big plush DOLLS!\l" + .string "Little plush DOLLS!\l" + .string "I wish I had them all!$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_25FFD0: @ 825FFD0 + .string "Leave it to your mommy!\p" + .string "If it’s anything you want, I’ll go\n" + .string "through anything to get it, honey!$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_26002E: @ 826002E + .string "If I can get hold of the items here,\n" + .string "my POKéMON will get tougher.\p" + .string "You bet they will!\n" + .string "No question about it!$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_260099: @ 8260099 + .string "Hah?\n" + .string "What are you gawking at?\p" + .string "I don’t like you staring at my plush\n" + .string "doll like that.\p" + .string "If you want it, go get one yourself!\n" + .string "Isn’t that right, SMOOCHUM?$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_26012D: @ 826012D + .string "Did you know?\p" + .string "If you stretch your record at any of\n" + .string "the BATTLE facilities, they start\l" + .string "giving you more and more Battle Points.$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_2601AA:: @ 82601AA + .string "A large poster with a SMOOCHUM print.$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_2601D0:: @ 82601D0 + .string "A SMOOCHUM cushion.\n" + .string "Place it on a mat or a desk.$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_260201:: @ 8260201 + .string "A SMOOCHUM DOLL.\n" + .string "Place it on a mat or a desk.$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_26022F:: @ 826022F + .string "A TOGEPI DOLL.\n" + .string "Place it on a mat or a desk.$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_26025B:: @ 826025B + .string "A MEOWTH DOLL.\n" + .string "Place it on a mat or a desk.$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_260287:: @ 8260287 + .string "A CLEFAIRY DOLL.\n" + .string "Place it on a mat or a desk.$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_2602B5:: @ 82602B5 + .string "A DITTO DOLL.\n" + .string "Place it on a mat or a desk.$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_2602E0:: @ 82602E0 + .string "A CYNDAQUIL DOLL.\n" + .string "Place it on a mat or a desk.$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_26030F:: @ 826030F + .string "A CHIKORITA DOLL.\n" + .string "Place it on a mat or a desk.$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_26033E:: @ 826033E + .string "A TOTODILE DOLL.\n" + .string "Place it on a mat or a desk.$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C:: @ 826036C + .string "A large DOLL.\n" + .string "Place it on a mat or a desk.$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_260397:: @ 8260397 + .string "Raises the stat ATTACK of one\n" + .string "POKéMON.$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_2603BE:: @ 82603BE + .string "Raises the stat SP. ATK of one\n" + .string "POKéMON.$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_2603E6:: @ 82603E6 + .string "Raises the stat DEFENSE of one\n" + .string "POKéMON.$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_26040E:: @ 826040E + .string "Raises the stat SP. DEF of one\n" + .string "POKéMON.$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_260436:: @ 8260436 + .string "Raises the stat SPEED of one\n" + .string "POKéMON.$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_26045C:: @ 826045C + .string "Raises the HP of one POKéMON.$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_26047A:: @ 826047A + .string "A hold item that gradually restores\n" + .string "HP in battle.$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_2604AC:: @ 82604AC + .string "A hold item that restores any\n" + .string "lowered stat.$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_2604D8:: @ 82604D8 + .string "A hold item that occasionally allows\n" + .string "the first strike.$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_26050F:: @ 826050F + .string "A hold item that snaps POKéMON out\n" + .string "of infatuation.$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_260542:: @ 8260542 + .string "A hold item that casts a glare to\n" + .string "reduce accuracy.$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_260575:: @ 8260575 + .string "Raises a move’s power, but permits\n" + .string "only that move.$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_2605A8:: @ 82605A8 + .string "A hold item that may cause flinching\n" + .string "when the foe is hit.$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_2605E2:: @ 82605E2 + .string "A hold item that occasionally\n" + .string "prevents fainting.$" + +BattleFrontier_BattlePointExchangeServiceCorner_Text_260613:: @ 8260613 + .string "A hold item that raises the\n" + .string "critical-hit rate.$" diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc new file mode 100644 index 000000000..f7d22a5ed --- /dev/null +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc @@ -0,0 +1,21 @@ +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 + +BattleFrontier_BattlePyramidEmptySquare_MapEvents:: @ 853C7AC + map_events BattleFrontier_BattlePyramidEmptySquare_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc new file mode 100644 index 000000000..eacee4cf3 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc @@ -0,0 +1,784 @@ +BattleFrontier_BattlePyramidEmptySquare_MapScripts:: @ 8252A33 + map_script 5, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2 + map_script 2, BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43 + map_script 3, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA + .byte 0 + +BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43: @ 8252A43 + map_script_2 VAR_TEMP_D, 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D + map_script_2 VAR_TEMP_E, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98 + map_script_2 VAR_TEMP_F, 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A8F + .2byte 0 + +BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D:: @ 8252A5D + lockall + setvar VAR_0x8004, 13 + setvar VAR_0x8005, 4 + setvar VAR_0x8006, 1 + setvar VAR_0x8007, 55 + setvar VAR_RESULT, 0 + +BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77:: @ 8252A77 + special sub_81A8E7C + delay 2 + compare VAR_RESULT, 2 + goto_if 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77 + setvar VAR_TEMP_D, 0 + releaseall + end + +BattleFrontier_BattlePyramidEmptySquare_EventScript_252A8F:: @ 8252A8F + special ShowMapNamePopup + setvar VAR_TEMP_F, 0 + end + +BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98:: @ 8252A98 + playbgm MUS_PYRAMID, 0 + setvar VAR_TEMP_E, 1 + end + +BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2 + setvar VAR_0x8004, 15 + special sub_81A8E7C + setvar VAR_0x8004, 0 + special sub_81A1780 + switch VAR_TEMP_0 + case 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D + case 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66 + case 2, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 5 + special sub_81A1780 + compare VAR_RESULT, 4 + goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 + compare VAR_RESULT, 5 + goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 + compare VAR_RESULT, 2 + goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 + compare VAR_RESULT, 3 + goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 + compare VAR_RESULT, 9 + goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 + setvar VAR_0x8004, 14 + setvar VAR_0x8005, 8 + special sub_81A1780 + setvar VAR_TEMP_D, 1 + +BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39:: @ 8252B39 + setvar VAR_0x8004, 17 + special sub_81A8E7C + end + +BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42:: @ 8252B42 +BattleFrontier_BattlePyramidTop_EventScript_252B42:: @ 8252B42 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 4 + special sub_81A1780 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 7 + setvar VAR_0x8006, 255 + special sub_81A8E7C + +BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66:: @ 8252B66 +BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66 + setvar VAR_0x8004, 13 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 0 + special sub_81A8E7C + setvar VAR_0x8004, 14 + special sub_81A8E7C + special HealPlayerParty + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13 + waitstate + end + +BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 1 + special sub_81A8E7C + special SavePlayerParty + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_0x8004, 9 + special sub_81A8E7C + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 3 + special sub_81A1780 + setvar VAR_TEMP_F, 1 + end + +BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA: @ 8252BCA + call BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5 + setvar VAR_TEMP_F, 1 + end + +BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5:: @ 8252BD5 + setvar VAR_0x8004, 13 + setvar VAR_0x8005, 32 + setvar VAR_0x8006, 0 + special sub_81A8E7C + return + +BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8 + call BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special sub_81A1780 + addvar VAR_RESULT, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + copyvar VAR_0x8006, VAR_RESULT + special sub_81A1780 + compare VAR_RESULT, 7 + goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45 + setvar VAR_0x8004, 6 + special sub_81A8E7C + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_RESULT, 0 + warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1 + waitstate + end + +BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45 + warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP, 255, 17, 17 + waitstate + end + +BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F:: @ 8252C4F + trainerbattle 9, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D + setvar VAR_0x8004, 10 + special sub_81A8E7C + waitmessage + waitbuttonpress + closemessage + releaseall + end + +BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A:: @ 8252C6A + setvar VAR_0x8004, 7 + special sub_81A8E7C + callstd 1 + compare VAR_0x8007, 0 + goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87 + setvar VAR_0x8004, 8 + special sub_81A8E7C + +BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87:: @ 8252C87 + end + +BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88:: @ 8252C88 + goto BattleFrontier_BattlePyramidTop_EventScript_252B42 + +BattleFrontier_BattlePyramidEmptySquare_Text_252C8D: @ 8252C8D + .string "This is a sample message.$" + +gText_BattlePyramidConfirmRest:: @ 8252CA7 + .string "Your BATTLE PYRAMID quest will be\n" + .string "saved so that you may quit for now.\l" + .string "Is that okay?$" + +gText_BattlePyramidConfirmRetire:: @ 8252CFB + .string "Are you sure you want to quit your\n" + .string "PYRAMID quest?$" + +BattleFrontier_BattlePyramidEmptySquare_Text_252D2D:: @ 8252D2D + .string "This floor’s exit is in\n" + .string "that direction: {UP_ARROW}$" + +BattleFrontier_BattlePyramidEmptySquare_Text_252D57:: @ 8252D57 + .string "This floor’s exit is in\n" + .string "that direction: {LEFT_ARROW}$" + +BattleFrontier_BattlePyramidEmptySquare_Text_252D81:: @ 8252D81 + .string "This floor’s exit is in\n" + .string "that direction: {RIGHT_ARROW}$" + +BattleFrontier_BattlePyramidEmptySquare_Text_252DAB:: @ 8252DAB + .string "This floor’s exit is in\n" + .string "that direction: {DOWN_ARROW}$" + +BattleFrontier_BattlePyramidEmptySquare_Text_252DD5:: @ 8252DD5 + .string "The exit on this floor is in\n" + .string "the {UP_ARROW} direction.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_252E03:: @ 8252E03 + .string "The exit on this floor is in\n" + .string "the {LEFT_ARROW} direction.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_252E31:: @ 8252E31 + .string "The exit on this floor is in\n" + .string "the {RIGHT_ARROW} direction.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_252E5F:: @ 8252E5F + .string "The exit on this floor is in\n" + .string "the {DOWN_ARROW} direction.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_252E8D:: @ 8252E8D + .string "The exit is over\n" + .string "that {UP_ARROW} way.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_252EAA:: @ 8252EAA + .string "The exit is over\n" + .string "that {LEFT_ARROW} way.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_252EC7:: @ 8252EC7 + .string "The exit is over\n" + .string "that {RIGHT_ARROW} way.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_252EE4:: @ 8252EE4 + .string "The exit is over\n" + .string "that {DOWN_ARROW} way.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_252F01:: @ 8252F01 + .string "On this floor, the exit is somewhere\n" + .string "in the {UP_ARROW} direction.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_252F3A:: @ 8252F3A + .string "On this floor, the exit is somewhere\n" + .string "in the {LEFT_ARROW} direction.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_252F73:: @ 8252F73 + .string "On this floor, the exit is somewhere\n" + .string "in the {RIGHT_ARROW} direction.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_252FAC:: @ 8252FAC + .string "On this floor, the exit is somewhere\n" + .string "in the {DOWN_ARROW} direction.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_252FE5:: @ 8252FE5 + .string "The exit?\n" + .string "It’s that {UP_ARROW} way.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253000:: @ 8253000 + .string "The exit?\n" + .string "It’s that {LEFT_ARROW} way.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_25301B:: @ 825301B + .string "The exit?\n" + .string "It’s that {RIGHT_ARROW} way.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253036:: @ 8253036 + .string "The exit?\n" + .string "It’s that {DOWN_ARROW} way.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253051:: @ 8253051 + .string "The exit happens to be in\n" + .string "the {UP_ARROW} direction.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_25307C:: @ 825307C + .string "The exit happens to be in\n" + .string "the {LEFT_ARROW} direction.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_2530A7:: @ 82530A7 + .string "The exit happens to be in\n" + .string "the {RIGHT_ARROW} direction.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_2530D2:: @ 82530D2 + .string "The exit happens to be in\n" + .string "the {DOWN_ARROW} direction.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_2530FD:: @ 82530FD + .string "Are you looking for items?\p" + .string "There are eight items left to\n" + .string "be found.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253140:: @ 8253140 + .string "Are you looking for items?\p" + .string "There are seven items left to\n" + .string "be found.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253183:: @ 8253183 + .string "Are you looking for items?\p" + .string "There are six items left to\n" + .string "be found.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_2531C4:: @ 82531C4 + .string "Are you looking for items?\p" + .string "There are five items left to\n" + .string "be found.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253206:: @ 8253206 + .string "Are you looking for items?\p" + .string "There are four items left to\n" + .string "be found.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253248:: @ 8253248 + .string "Are you looking for items?\p" + .string "There are three items left to\n" + .string "be found.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_25328B:: @ 825328B + .string "Are you looking for items?\p" + .string "There are two items left to\n" + .string "be found.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_2532CC:: @ 82532CC + .string "Are you looking for items?\p" + .string "There is one item left to\n" + .string "be found.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_25330B:: @ 825330B + .string "Are you looking for items?\p" + .string "There isn’t anything left to\n" + .string "be found!$" + +BattleFrontier_BattlePyramidEmptySquare_Text_25334D:: @ 825334D + .string "Because you won, I’ll tell you\n" + .string "a little secret!\p" + .string "There are eight items\n" + .string "lying around here.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_2533A6:: @ 82533A6 + .string "Because you won, I’ll tell you\n" + .string "a little secret!\p" + .string "There are seven items left\n" + .string "lying around here.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253404:: @ 8253404 + .string "Because you won, I’ll tell you\n" + .string "a little secret!\p" + .string "There are six items left\n" + .string "lying around here.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253460:: @ 8253460 + .string "Because you won, I’ll tell you\n" + .string "a little secret!\p" + .string "There are five items left\n" + .string "lying around here.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_2534BD:: @ 82534BD + .string "Because you won, I’ll tell you\n" + .string "a little secret!\p" + .string "There are four items left\n" + .string "lying around here.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_25351A:: @ 825351A + .string "Because you won, I’ll tell you\n" + .string "a little secret!\p" + .string "There are three items left\n" + .string "lying around here.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253578:: @ 8253578 + .string "Because you won, I’ll tell you\n" + .string "a little secret!\p" + .string "There are two items left\n" + .string "lying around here.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_2535D4:: @ 82535D4 + .string "Because you won, I’ll tell you\n" + .string "a little secret!\p" + .string "There is just one item\n" + .string "lying around here.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_25362E:: @ 825362E + .string "Because you won, I’ll tell you\n" + .string "a little secret!\p" + .string "There isn’t anything left\n" + .string "lying around here.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_25368B:: @ 825368B + .string "How’s your stock of items holding up?\p" + .string "I reckon there are eight items left\n" + .string "waiting to be found on this floor.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_2536F8:: @ 82536F8 + .string "How’s your stock of items holding up?\p" + .string "I reckon there are seven items left\n" + .string "waiting to be found on this floor.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253765:: @ 8253765 + .string "How’s your stock of items holding up?\p" + .string "I reckon there are six items left\n" + .string "waiting to be found on this floor.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_2537D0:: @ 82537D0 + .string "How’s your stock of items holding up?\p" + .string "I reckon there are five items left\n" + .string "waiting to be found on this floor.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_25383C:: @ 825383C + .string "How’s your stock of items holding up?\p" + .string "I reckon there are four items left\n" + .string "waiting to be found on this floor.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_2538A8:: @ 82538A8 + .string "How’s your stock of items holding up?\p" + .string "I reckon there are three items left\n" + .string "waiting to be found on this floor.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253915:: @ 8253915 + .string "How’s your stock of items holding up?\p" + .string "I reckon there are two items left\n" + .string "waiting to be found on this floor.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253980:: @ 8253980 + .string "How’s your stock of items holding up?\p" + .string "I reckon there’s but one item left\n" + .string "waiting to be found on this floor.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_2539EC:: @ 82539EC + .string "How’s your stock of items holding up?\p" + .string "I reckon there are no more items\n" + .string "waiting to be found on this floor.\l" + .string "You take care now!$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253A69:: @ 8253A69 + .string "You’re strong, so you’ve earned\n" + .string "a hint!\p" + .string "There appear to be eight more\n" + .string "items on the ground.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253AC4:: @ 8253AC4 + .string "You’re strong, so you’ve earned\n" + .string "a hint!\p" + .string "There appear to be seven more\n" + .string "items on the ground.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253B1F:: @ 8253B1F + .string "You’re strong, so you’ve earned\n" + .string "a hint!\p" + .string "There appear to be six more\n" + .string "items on the ground.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253B78:: @ 8253B78 + .string "You’re strong, so you’ve earned\n" + .string "a hint!\p" + .string "There appear to be five more\n" + .string "items on the ground.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253BD2:: @ 8253BD2 + .string "You’re strong, so you’ve earned\n" + .string "a hint!\p" + .string "There appear to be four more\n" + .string "items on the ground.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253C2C:: @ 8253C2C + .string "You’re strong, so you’ve earned\n" + .string "a hint!\p" + .string "There appear to be three more\n" + .string "items on the ground.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253C87:: @ 8253C87 + .string "You’re strong, so you’ve earned\n" + .string "a hint!\p" + .string "There appear to be two more\n" + .string "items on the ground.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253CE0:: @ 8253CE0 + .string "You’re strong, so you’ve earned\n" + .string "a hint!\p" + .string "There appears to be only one more\n" + .string "item on the ground.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253D3E:: @ 8253D3E + .string "You’re strong, so you’ve earned\n" + .string "a hint!\p" + .string "There appear to be no more\n" + .string "items on the ground.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253D96:: @ 8253D96 + .string "On this floor of the PYRAMID,\n" + .string "I hear there are eight items…$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253DD2:: @ 8253DD2 + .string "On this floor of the PYRAMID,\n" + .string "I hear there are seven items…$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253E0E:: @ 8253E0E + .string "On this floor of the PYRAMID,\n" + .string "I hear there are six items…$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253E48:: @ 8253E48 + .string "On this floor of the PYRAMID,\n" + .string "I hear there are five items…$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253E83:: @ 8253E83 + .string "On this floor of the PYRAMID,\n" + .string "I hear there are four items…$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253EBE:: @ 8253EBE + .string "On this floor of the PYRAMID,\n" + .string "I hear there are three items…$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253EFA:: @ 8253EFA + .string "On this floor of the PYRAMID,\n" + .string "I hear there are two items…$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253F34:: @ 8253F34 + .string "On this floor of the PYRAMID,\n" + .string "I hear there is one item…$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253F6C:: @ 8253F6C + .string "On this floor of the PYRAMID,\n" + .string "I hear there are no items…$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253FA5:: @ 8253FA5 + .string "Have you collected any items?\p" + .string "I believe there are eight more\n" + .string "items on this floor.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_253FF7:: @ 8253FF7 + .string "Have you collected any items?\p" + .string "I believe there are seven more\n" + .string "items on this floor.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_254049:: @ 8254049 + .string "Have you collected any items?\p" + .string "I believe there are six more\n" + .string "items on this floor.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_254099:: @ 8254099 + .string "Have you collected any items?\p" + .string "I believe there are five more\n" + .string "items on this floor.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_2540EA:: @ 82540EA + .string "Have you collected any items?\p" + .string "I believe there are four more\n" + .string "items on this floor.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_25413B:: @ 825413B + .string "Have you collected any items?\p" + .string "I believe there are three more\n" + .string "items on this floor.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_25418D:: @ 825418D + .string "Have you collected any items?\p" + .string "I believe there are two more\n" + .string "items on this floor.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_2541DD:: @ 82541DD + .string "Have you collected any items?\p" + .string "I believe there is one more\n" + .string "item on this floor.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_25422B:: @ 825422B + .string "Have you collected any items?\p" + .string "I believe there are no more\n" + .string "items on this floor.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_25427A:: @ 825427A + .string "You were really awesome!\p" + .string "But there are still seven tough\n" + .string "TRAINERS other than me!$" + +BattleFrontier_BattlePyramidEmptySquare_Text_2542CB:: @ 82542CB + .string "You were really awesome!\p" + .string "But there are still six tough\n" + .string "TRAINERS other than me!$" + +BattleFrontier_BattlePyramidEmptySquare_Text_25431A:: @ 825431A + .string "You were really awesome!\p" + .string "But there are still five tough\n" + .string "TRAINERS other than me!$" + +BattleFrontier_BattlePyramidEmptySquare_Text_25436A:: @ 825436A + .string "You were really awesome!\p" + .string "But there are still four tough\n" + .string "TRAINERS other than me!$" + +BattleFrontier_BattlePyramidEmptySquare_Text_2543BA:: @ 82543BA + .string "You were really awesome!\p" + .string "But there are still three tough\n" + .string "TRAINERS other than me!$" + +BattleFrontier_BattlePyramidEmptySquare_Text_25440B:: @ 825440B + .string "You were really awesome!\p" + .string "But there are still two tough\n" + .string "TRAINERS other than me!$" + +BattleFrontier_BattlePyramidEmptySquare_Text_25445A:: @ 825445A + .string "You were really awesome!\p" + .string "But there’s still one tough\n" + .string "TRAINER other than me!$" + +BattleFrontier_BattlePyramidEmptySquare_Text_2544A6:: @ 82544A6 + .string "You were really awesome!\p" + .string "There’s no one left that\n" + .string "can beat you!$" + +BattleFrontier_BattlePyramidEmptySquare_Text_2544E6:: @ 82544E6 + .string "This is so upsetting!\p" + .string "But there are seven TRAINERS left!\n" + .string "Someone will humble you!$" + +BattleFrontier_BattlePyramidEmptySquare_Text_254538:: @ 8254538 + .string "This is so upsetting!\p" + .string "But there are six TRAINERS left!\n" + .string "Someone will humble you!$" + +BattleFrontier_BattlePyramidEmptySquare_Text_254588:: @ 8254588 + .string "This is so upsetting!\p" + .string "But there are five TRAINERS left!\n" + .string "Someone will humble you!$" + +BattleFrontier_BattlePyramidEmptySquare_Text_2545D9:: @ 82545D9 + .string "This is so upsetting!\p" + .string "But there are four TRAINERS left!\n" + .string "Someone will humble you!$" + +BattleFrontier_BattlePyramidEmptySquare_Text_25462A:: @ 825462A + .string "This is so upsetting!\p" + .string "But there are three TRAINERS left!\n" + .string "Someone will humble you!$" + +BattleFrontier_BattlePyramidEmptySquare_Text_25467C:: @ 825467C + .string "This is so upsetting!\p" + .string "But there are two TRAINERS left!\n" + .string "Someone will humble you!$" + +BattleFrontier_BattlePyramidEmptySquare_Text_2546CC:: @ 82546CC + .string "This is so upsetting!\p" + .string "But there’s one TRAINER left!\n" + .string "I’m sure you will be humbled!$" + +BattleFrontier_BattlePyramidEmptySquare_Text_25471E:: @ 825471E + .string "This is so upsetting!\p" + .string "But there are no more TRAINERS\n" + .string "who can engage you!$" + +BattleFrontier_BattlePyramidEmptySquare_Text_254767:: @ 8254767 + .string "That’s pretty impressive!\p" + .string "But there are seven more TRAINERS\n" + .string "on this floor. Can you beat them all?$" + +BattleFrontier_BattlePyramidEmptySquare_Text_2547C9:: @ 82547C9 + .string "That’s pretty impressive!\p" + .string "But there are six more TRAINERS\n" + .string "on this floor. Can you beat them all?$" + +BattleFrontier_BattlePyramidEmptySquare_Text_254829:: @ 8254829 + .string "That’s pretty impressive!\p" + .string "But there are five more TRAINERS\n" + .string "on this floor. Can you beat them all?$" + +BattleFrontier_BattlePyramidEmptySquare_Text_25488A:: @ 825488A + .string "That’s pretty impressive!\p" + .string "But there are four more TRAINERS\n" + .string "on this floor. Can you beat them all?$" + +BattleFrontier_BattlePyramidEmptySquare_Text_2548EB:: @ 82548EB + .string "That’s pretty impressive!\p" + .string "But there are three more TRAINERS\n" + .string "on this floor. Can you beat them all?$" + +BattleFrontier_BattlePyramidEmptySquare_Text_25494D:: @ 825494D + .string "That’s pretty impressive!\p" + .string "But there are two more TRAINERS\n" + .string "on this floor. Can you beat them both?$" + +BattleFrontier_BattlePyramidEmptySquare_Text_2549AE:: @ 82549AE + .string "That’s pretty impressive!\p" + .string "But there’s still one more TRAINER\n" + .string "on this floor. Can you prevail?$" + +BattleFrontier_BattlePyramidEmptySquare_Text_254A0B:: @ 8254A0B + .string "That’s pretty impressive!\p" + .string "You’ve gone through all the TRAINERS\n" + .string "on this floor.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_254A59:: @ 8254A59 + .string "Maybe you could sweep through\n" + .string "the seven TRAINERS left on this floor.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_254A9E:: @ 8254A9E + .string "Maybe you could sweep through\n" + .string "the six TRAINERS left on this floor.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_254AE1:: @ 8254AE1 + .string "Maybe you could sweep through\n" + .string "the five TRAINERS left on this floor.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_254B25:: @ 8254B25 + .string "Maybe you could sweep through\n" + .string "the four TRAINERS left on this floor.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_254B69:: @ 8254B69 + .string "Maybe you could sweep through\n" + .string "the three TRAINERS left on this floor.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_254BAE:: @ 8254BAE + .string "Maybe you could sweep through\n" + .string "the two TRAINERS left on this floor.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_254BF1:: @ 8254BF1 + .string "Maybe you could complete your sweep\n" + .string "with the one TRAINER left on this floor.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_254C3E:: @ 8254C3E + .string "There isn’t a single person left who\n" + .string "can defeat you now…$" + +BattleFrontier_BattlePyramidEmptySquare_Text_254C77:: @ 8254C77 + .string "You may have what it takes to beat\n" + .string "the seven expert TRAINERS who remain.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_254CC0:: @ 8254CC0 + .string "You may have what it takes to beat\n" + .string "the six expert TRAINERS who remain.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_254D07:: @ 8254D07 + .string "You may have what it takes to beat\n" + .string "the five expert TRAINERS who remain.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_254D4F:: @ 8254D4F + .string "You may have what it takes to beat\n" + .string "the four expert TRAINERS who remain.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_254D97:: @ 8254D97 + .string "You may have what it takes to beat\n" + .string "the three expert TRAINERS who remain.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_254DE0:: @ 8254DE0 + .string "You may have what it takes to beat\n" + .string "the two expert TRAINERS who remain.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_254E27:: @ 8254E27 + .string "You may have what it takes to beat\n" + .string "the one expert TRAINER who remains.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_254E6E:: @ 8254E6E + .string "Your skills are beyond reproach.\p" + .string "There are no more TRAINERS here\n" + .string "who have any chance of beating you.$" + +BattleFrontier_BattlePyramidEmptySquare_Text_254ED3:: @ 8254ED3 + .string "Can you keep winning against\n" + .string "the seven remaining TRAINERS?$" + +BattleFrontier_BattlePyramidEmptySquare_Text_254F0E:: @ 8254F0E + .string "Can you keep winning against\n" + .string "the six remaining TRAINERS?$" + +BattleFrontier_BattlePyramidEmptySquare_Text_254F47:: @ 8254F47 + .string "Can you keep winning against\n" + .string "the five remaining TRAINERS?$" + +BattleFrontier_BattlePyramidEmptySquare_Text_254F81:: @ 8254F81 + .string "Can you keep winning against\n" + .string "the four remaining TRAINERS?$" + +BattleFrontier_BattlePyramidEmptySquare_Text_254FBB:: @ 8254FBB + .string "Can you keep winning against\n" + .string "the three remaining TRAINERS?$" + +BattleFrontier_BattlePyramidEmptySquare_Text_254FF6:: @ 8254FF6 + .string "Can you keep winning against\n" + .string "the two remaining TRAINERS?$" + +BattleFrontier_BattlePyramidEmptySquare_Text_25502F:: @ 825502F + .string "Can you keep winning against\n" + .string "the last remaining TRAINER?$" + +BattleFrontier_BattlePyramidEmptySquare_Text_255068:: @ 8255068 + .string "There aren’t any TRAINERS left that\n" + .string "can take you on now…$" + diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc new file mode 100644 index 000000000..28b5f5c61 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc @@ -0,0 +1,16 @@ +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 + +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 + +BattleFrontier_BattlePyramidLobby_MapEvents:: @ 853C618 + map_events BattleFrontier_BattlePyramidLobby_EventObjects, BattleFrontier_BattlePyramidLobby_MapWarps, 0x0, BattleFrontier_BattlePyramidLobby_MapBGEvents + diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc new file mode 100644 index 000000000..07b9fee47 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -0,0 +1,970 @@ +BattleFrontier_BattlePyramidLobby_MapScripts:: @ 8250716 + map_script 2, BattleFrontier_BattlePyramidLobby_MapScript2_250735 + map_script 4, BattleFrontier_BattlePyramidLobby_MapScript2_2497FB + .byte 0 + +BattleFrontier_BattlePyramidLobby_MapScript2_250721: @ 8250721 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePyramidLobby_EventScript_25072B + .2byte 0 + +BattleFrontier_BattlePyramidLobby_EventScript_25072B: @ 825072B + setvar VAR_TEMP_1, 1 + turnobject 255, 2 + end + +BattleFrontier_BattlePyramidLobby_MapScript2_250735: @ 8250735 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePyramidLobby_EventScript_25075F + map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattlePyramidLobby_EventScript_250768 + map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattlePyramidLobby_EventScript_2508AC + map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattlePyramidLobby_EventScript_2507B1 + map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattlePyramidLobby_EventScript_250852 + .2byte 0 + +BattleFrontier_BattlePyramidLobby_EventScript_25075F:: @ 825075F + setvar VAR_0x8004, 0 + special sub_81A1780 + end + +BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768 + lockall + message BattleFrontier_BattlePyramidLobby_Text_2516D6 + waitmessage + playse SE_EXPMAX + waitse + closemessage + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 0 + special sub_81A8E7C + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + setvar VAR_0x8006, 0 + special sub_81A8E7C + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_TEMP_0, 255 + releaseall + end + +BattleFrontier_BattlePyramidLobby_EventScript_2507B1:: @ 82507B1 + lockall + setvar VAR_0x8004, 10 + special sub_81A1780 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattlePyramidLobby_EventScript_2507D2 + msgbox BattleFrontier_BattlePyramidLobby_Text_2517B5, 4 + goto BattleFrontier_BattlePyramidLobby_EventScript_2507DA + +BattleFrontier_BattlePyramidLobby_EventScript_2507D2:: @ 82507D2 + msgbox BattleFrontier_BattlePyramidLobby_Text_2525F4, 4 + +BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA + special sub_81B95E0 + compare VAR_RESULT, 1 + call_if 1, BattleFrontier_BattlePyramidLobby_EventScript_250DDB + clearflag FLAG_SPECIAL_FLAG_0x4004 + setvar VAR_0x8004, 8 + special sub_81A1780 + special LoadPlayerParty + setvar VAR_0x8004, 14 + special sub_81A8E7C + special HealPlayerParty + message BattleFrontier_BattlePyramidLobby_Text_2519F8 + waitmessage + playse SE_EXPMAX + waitse + msgbox BattleFrontier_BattlePyramidLobby_Text_252662, 4 + setvar VAR_0x8004, 11 + special sub_81A1780 + msgbox BattleFrontier_BattlePyramidLobby_Text_241520, 9 + message BattleFrontier_BattlePyramidLobby_Text_251A77 + waitmessage + setvar VAR_0x8004, 4 + special sub_81A8E7C + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 0 + special sub_81A8E7C + playse SE_SAVE + waitse + msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, 4 + closemessage + setvar VAR_TEMP_0, 255 + releaseall + end + +BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852 + setvar VAR_0x8004, 8 + special sub_81A1780 + special LoadPlayerParty + setvar VAR_0x8004, 14 + special sub_81A8E7C + special HealPlayerParty + lockall + message BattleFrontier_BattlePyramidLobby_Text_251B5A + waitmessage + playse SE_EXPMAX + waitse + message BattleFrontier_BattlePyramidLobby_Text_251A77 + waitmessage + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + setvar VAR_0x8006, 0 + special sub_81A8E7C + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 0 + special sub_81A8E7C + playse SE_SAVE + waitse + msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, 4 + closemessage + setvar VAR_TEMP_0, 255 + releaseall + end + +BattleFrontier_BattlePyramidLobby_EventScript_2508AC:: @ 82508AC + goto BattleFrontier_BattlePyramidLobby_EventScript_250A21 + +BattleFrontier_BattlePyramidLobby_EventScript_2508B1:: @ 82508B1 + lock + faceplayer + setvar VAR_FRONTIER_FACILITY, 6 + setvar VAR_0x40CE, 0 + special SavePlayerParty + msgbox BattleFrontier_BattlePyramidLobby_Text_250F31, 4 + +BattleFrontier_BattlePyramidLobby_EventScript_2508C8:: @ 82508C8 + message BattleFrontier_BattlePyramidLobby_Text_250FA7 + waitmessage + multichoice 17, 6, 23, 0 + switch VAR_RESULT + case 0, BattleFrontier_BattlePyramidLobby_EventScript_250904 + case 1, BattleFrontier_BattlePyramidLobby_EventScript_250A68 + case 2, BattleFrontier_BattlePyramidLobby_EventScript_250AC4 + case 127, BattleFrontier_BattlePyramidLobby_EventScript_250AC4 + +BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904 + message BattleFrontier_BattlePyramidLobby_Text_251248 + waitmessage + multichoice 17, 6, 24, 0 + switch VAR_RESULT + case 2, BattleFrontier_BattlePyramidLobby_EventScript_250AC4 + case 127, BattleFrontier_BattlePyramidLobby_EventScript_250AC4 + setvar VAR_0x8004, 15 + special sub_81A1780 + compare VAR_0x8004, 1 + goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250A75 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + copyvar VAR_0x8006, VAR_RESULT + special sub_81A1780 + msgbox BattleFrontier_BattlePyramidLobby_Text_251297, 4 + fadescreen 1 + call BattleFrontier_BattlePyramidLobby_EventScript_23F2B7 + copyvar VAR_0x8004, VAR_RESULT + setvar VAR_0x8005, 3 + special sub_80F9490 + waitstate + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250AC1 + msgbox BattleFrontier_BattlePyramidLobby_Text_2514E6, 5 + switch VAR_RESULT + case 0, BattleFrontier_BattlePyramidLobby_EventScript_250AC1 + case 1, BattleFrontier_BattlePyramidLobby_EventScript_2509A5 + case 127, BattleFrontier_BattlePyramidLobby_EventScript_250AC1 + +BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5 + setvar VAR_TEMP_0, 0 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 4 + special sub_81A1780 + setvar VAR_0x8004, 0 + special sub_81A8E7C + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + setvar VAR_0x8006, 1 + special sub_81A8E7C + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 1 + special sub_81A1780 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_0x8004, 6 + special sub_81A8E7C + setvar VAR_0x8004, 9 + special sub_81A8E7C + special LoadPlayerParty + closemessage + delay 2 + call BattleFrontier_BattlePyramidLobby_EventScript_27134F + setvar VAR_TEMP_0, 255 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250AAA + +BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21 + special SavePlayerParty + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 3 + special sub_81A1780 + msgbox BattleFrontier_BattlePyramidLobby_Text_251531, 4 + closemessage + call BattleFrontier_BattlePyramidLobby_EventScript_250D56 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_RESULT, 0 + special HealPlayerParty + warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1 + setvar VAR_TEMP_0, 0 + waitstate + end + +BattleFrontier_BattlePyramidLobby_EventScript_250A68:: @ 8250A68 + msgbox BattleFrontier_BattlePyramidLobby_Text_25100C, 4 + goto BattleFrontier_BattlePyramidLobby_EventScript_2508C8 + +BattleFrontier_BattlePyramidLobby_EventScript_250A75:: @ 8250A75 + switch VAR_RESULT + case 0, BattleFrontier_BattlePyramidLobby_EventScript_250A90 + case 1, BattleFrontier_BattlePyramidLobby_EventScript_250A9D + +BattleFrontier_BattlePyramidLobby_EventScript_250A90:: @ 8250A90 + msgbox BattleFrontier_BattlePyramidLobby_Text_2513C1, 4 + goto BattleFrontier_BattlePyramidLobby_EventScript_250ACC + +BattleFrontier_BattlePyramidLobby_EventScript_250A9D:: @ 8250A9D + msgbox BattleFrontier_BattlePyramidLobby_Text_2512E2, 4 + goto BattleFrontier_BattlePyramidLobby_EventScript_250ACC + +BattleFrontier_BattlePyramidLobby_EventScript_250AAA:: @ 8250AAA + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 0 + special sub_81A1780 + goto BattleFrontier_BattlePyramidLobby_EventScript_250AC4 + +BattleFrontier_BattlePyramidLobby_EventScript_250AC1:: @ 8250AC1 + special LoadPlayerParty + +BattleFrontier_BattlePyramidLobby_EventScript_250AC4:: @ 8250AC4 + msgbox BattleFrontier_BattlePyramidLobby_Text_250FE5, 4 + +BattleFrontier_BattlePyramidLobby_EventScript_250ACC:: @ 8250ACC + release + end + +BattleFrontier_BattlePyramidLobby_EventScript_250ACE:: @ 8250ACE + lockall + applymovement 2, BattleFrontier_BattlePyramidLobby_Movement_27259E + waitmovement 0 + msgbox BattleFrontier_BattlePyramidLobby_Text_251C3B, 4 + call BattleFrontier_BattlePyramidLobby_EventScript_250AF0 + msgbox BattleFrontier_BattlePyramidLobby_Text_252461, 4 + releaseall + end + +BattleFrontier_BattlePyramidLobby_EventScript_250AF0:: @ 8250AF0 + multichoice 17, 6, 24, 0 + switch VAR_RESULT + case 0, BattleFrontier_BattlePyramidLobby_EventScript_250B28 + case 1, BattleFrontier_BattlePyramidLobby_EventScript_250B66 + case 2, BattleFrontier_BattlePyramidLobby_EventScript_250B27 + case 127, BattleFrontier_BattlePyramidLobby_EventScript_250B27 + return + +BattleFrontier_BattlePyramidLobby_EventScript_250B27:: @ 8250B27 + return + +BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28 + msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, 4 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 5 + special sub_81A8E7C + compare VAR_RESULT, 0 + goto_if 5, BattleFrontier_BattlePyramidLobby_EventScript_250B53 + setvar VAR_RESULT, 0 + goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4 + return + +BattleFrontier_BattlePyramidLobby_EventScript_250B53:: @ 8250B53 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 3 + special sub_81A8E7C + goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4 + return + +BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66 + msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, 4 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 6 + special sub_81A8E7C + compare VAR_RESULT, 0 + goto_if 5, BattleFrontier_BattlePyramidLobby_EventScript_250B91 + setvar VAR_RESULT, 0 + goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4 + return + +BattleFrontier_BattlePyramidLobby_EventScript_250B91:: @ 8250B91 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 4 + special sub_81A8E7C + goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4 + return + +BattleFrontier_BattlePyramidLobby_EventScript_250BA4:: @ 8250BA4 + copyvar VAR_0x8004, VAR_RESULT + special sub_813B968 + switch VAR_RESULT + case 0, BattleFrontier_BattlePyramidLobby_EventScript_250C8E + case 1, BattleFrontier_BattlePyramidLobby_EventScript_250C97 + case 2, BattleFrontier_BattlePyramidLobby_EventScript_250CA0 + case 3, BattleFrontier_BattlePyramidLobby_EventScript_250CA9 + case 4, BattleFrontier_BattlePyramidLobby_EventScript_250CB2 + case 5, BattleFrontier_BattlePyramidLobby_EventScript_250CBB + case 6, BattleFrontier_BattlePyramidLobby_EventScript_250CC4 + case 7, BattleFrontier_BattlePyramidLobby_EventScript_250CCD + case 8, BattleFrontier_BattlePyramidLobby_EventScript_250CD6 + case 9, BattleFrontier_BattlePyramidLobby_EventScript_250CDF + case 10, BattleFrontier_BattlePyramidLobby_EventScript_250CE8 + case 11, BattleFrontier_BattlePyramidLobby_EventScript_250CF1 + case 12, BattleFrontier_BattlePyramidLobby_EventScript_250CFA + case 13, BattleFrontier_BattlePyramidLobby_EventScript_250D03 + case 14, BattleFrontier_BattlePyramidLobby_EventScript_250D0C + case 15, BattleFrontier_BattlePyramidLobby_EventScript_250D15 + case 16, BattleFrontier_BattlePyramidLobby_EventScript_250D1E + case 17, BattleFrontier_BattlePyramidLobby_EventScript_250D27 + case 18, BattleFrontier_BattlePyramidLobby_EventScript_250D30 + case 19, BattleFrontier_BattlePyramidLobby_EventScript_250D39 + return + +BattleFrontier_BattlePyramidLobby_EventScript_250C8E:: @ 8250C8E + msgbox BattleFrontier_BattlePyramidLobby_Text_251CB3, 4 + return + +BattleFrontier_BattlePyramidLobby_EventScript_250C97:: @ 8250C97 + msgbox BattleFrontier_BattlePyramidLobby_Text_251D07, 4 + return + +BattleFrontier_BattlePyramidLobby_EventScript_250CA0:: @ 8250CA0 + msgbox BattleFrontier_BattlePyramidLobby_Text_251D54, 4 + return + +BattleFrontier_BattlePyramidLobby_EventScript_250CA9:: @ 8250CA9 + msgbox BattleFrontier_BattlePyramidLobby_Text_251D9C, 4 + return + +BattleFrontier_BattlePyramidLobby_EventScript_250CB2:: @ 8250CB2 + msgbox BattleFrontier_BattlePyramidLobby_Text_251E3D, 4 + return + +BattleFrontier_BattlePyramidLobby_EventScript_250CBB:: @ 8250CBB + msgbox BattleFrontier_BattlePyramidLobby_Text_251EA1, 4 + return + +BattleFrontier_BattlePyramidLobby_EventScript_250CC4:: @ 8250CC4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251F17, 4 + return + +BattleFrontier_BattlePyramidLobby_EventScript_250CCD:: @ 8250CCD + msgbox BattleFrontier_BattlePyramidLobby_Text_251F6E, 4 + return + +BattleFrontier_BattlePyramidLobby_EventScript_250CD6:: @ 8250CD6 + msgbox BattleFrontier_BattlePyramidLobby_Text_251FC7, 4 + return + +BattleFrontier_BattlePyramidLobby_EventScript_250CDF:: @ 8250CDF + msgbox BattleFrontier_BattlePyramidLobby_Text_25201B, 4 + return + +BattleFrontier_BattlePyramidLobby_EventScript_250CE8:: @ 8250CE8 + msgbox BattleFrontier_BattlePyramidLobby_Text_252068, 4 + return + +BattleFrontier_BattlePyramidLobby_EventScript_250CF1:: @ 8250CF1 + msgbox BattleFrontier_BattlePyramidLobby_Text_2520BA, 4 + return + +BattleFrontier_BattlePyramidLobby_EventScript_250CFA:: @ 8250CFA + msgbox BattleFrontier_BattlePyramidLobby_Text_252158, 4 + return + +BattleFrontier_BattlePyramidLobby_EventScript_250D03:: @ 8250D03 + msgbox BattleFrontier_BattlePyramidLobby_Text_2521B4, 4 + return + +BattleFrontier_BattlePyramidLobby_EventScript_250D0C:: @ 8250D0C + msgbox BattleFrontier_BattlePyramidLobby_Text_252206, 4 + return + +BattleFrontier_BattlePyramidLobby_EventScript_250D15:: @ 8250D15 + msgbox BattleFrontier_BattlePyramidLobby_Text_25225A, 4 + return + +BattleFrontier_BattlePyramidLobby_EventScript_250D1E:: @ 8250D1E + msgbox BattleFrontier_BattlePyramidLobby_Text_2522AE, 4 + return + +BattleFrontier_BattlePyramidLobby_EventScript_250D27:: @ 8250D27 + msgbox BattleFrontier_BattlePyramidLobby_Text_25230B, 4 + return + +BattleFrontier_BattlePyramidLobby_EventScript_250D30:: @ 8250D30 + msgbox BattleFrontier_BattlePyramidLobby_Text_252364, 4 + return + +BattleFrontier_BattlePyramidLobby_EventScript_250D39:: @ 8250D39 + msgbox BattleFrontier_BattlePyramidLobby_Text_252403, 4 + return + +BattleFrontier_BattlePyramidLobby_EventScript_250D42:: @ 8250D42 + lockall + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 6 + special sub_81A1780 + waitbuttonpress + special RemoveRecordsWindow + releaseall + end + +BattleFrontier_BattlePyramidLobby_EventScript_250D56:: @ 8250D56 + applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_250DC4 + applymovement 255, BattleFrontier_BattlePyramidLobby_Movement_250DCD + waitmovement 0 + msgbox BattleFrontier_BattlePyramidLobby_Text_251569, 4 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + special sub_81A8E7C + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250D94 + msgbox BattleFrontier_BattlePyramidLobby_Text_2515AD, 4 + goto BattleFrontier_BattlePyramidLobby_EventScript_250D9C + +BattleFrontier_BattlePyramidLobby_EventScript_250D94:: @ 8250D94 + msgbox BattleFrontier_BattlePyramidLobby_Text_2515F4, 4 + +BattleFrontier_BattlePyramidLobby_EventScript_250D9C:: @ 8250D9C + message BattleFrontier_BattlePyramidLobby_Text_25161E + waitmessage + playse SE_EXPMAX + waitse + msgbox BattleFrontier_BattlePyramidLobby_Text_251647, 4 + closemessage + applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_250DD5 + waitmovement 0 + applymovement 255, BattleFrontier_BattlePyramidLobby_Movement_250DD8 + waitmovement 0 + return + +BattleFrontier_BattlePyramidLobby_Movement_250DC4: @ 8250DC4 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + face_down + step_end + +BattleFrontier_BattlePyramidLobby_Movement_250DCD: @ 8250DCD + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + step_end + +BattleFrontier_BattlePyramidLobby_Movement_250DD5: @ 8250DD5 + walk_right + face_left + step_end + +BattleFrontier_BattlePyramidLobby_Movement_250DD8: @ 8250DD8 + walk_up + walk_up + step_end + +BattleFrontier_BattlePyramidLobby_EventScript_250DDB:: @ 8250DDB + msgbox BattleFrontier_BattlePyramidLobby_Text_2517FC, 4 + setflag FLAG_SPECIAL_FLAG_0x4004 + special sub_81C6A94 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250E00 + message BattleFrontier_BattlePyramidLobby_Text_2518C6 + waitmessage + goto BattleFrontier_BattlePyramidLobby_EventScript_250E09 + end + +BattleFrontier_BattlePyramidLobby_EventScript_250E00:: @ 8250E00 + msgbox BattleFrontier_BattlePyramidLobby_Text_251881, 4 + return + +BattleFrontier_BattlePyramidLobby_EventScript_250E09:: @ 8250E09 + multichoice 17, 6, 83, 0 + switch VAR_RESULT + case 0, BattleFrontier_BattlePyramidLobby_EventScript_250E40 + case 1, BattleFrontier_BattlePyramidLobby_EventScript_250E50 + case 2, BattleFrontier_BattlePyramidLobby_EventScript_250E60 + case 127, BattleFrontier_BattlePyramidLobby_EventScript_250E60 + end + +BattleFrontier_BattlePyramidLobby_EventScript_250E40:: @ 8250E40 + special sub_81C4F24 + waitstate + message BattleFrontier_BattlePyramidLobby_Text_25197E + waitmessage + goto BattleFrontier_BattlePyramidLobby_EventScript_250E09 + end + +BattleFrontier_BattlePyramidLobby_EventScript_250E50:: @ 8250E50 + special sub_81B9620 + waitstate + message BattleFrontier_BattlePyramidLobby_Text_25197E + waitmessage + goto BattleFrontier_BattlePyramidLobby_EventScript_250E09 + end + +BattleFrontier_BattlePyramidLobby_EventScript_250E60:: @ 8250E60 + special sub_81B95E0 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250E6F + return + +BattleFrontier_BattlePyramidLobby_EventScript_250E6F:: @ 8250E6F + msgbox BattleFrontier_BattlePyramidLobby_Text_25194F, 4 + message BattleFrontier_BattlePyramidLobby_Text_25197E + waitmessage + goto BattleFrontier_BattlePyramidLobby_EventScript_250E09 + end + +BattleFrontier_BattlePyramidLobby_EventScript_250E83:: @ 8250E83 + msgbox BattleFrontier_BattlePyramidLobby_Text_2524DA, 2 + end + +BattleFrontier_BattlePyramidLobby_EventScript_250E8C:: @ 8250E8C + msgbox BattleFrontier_BattlePyramidLobby_Text_252595, 2 + end + +BattleFrontier_BattlePyramidLobby_EventScript_250E95:: @ 8250E95 + lockall + msgbox BattleFrontier_BattlePyramidLobby_Text_2526B6, 4 + goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4 + end + +BattleFrontier_BattlePyramidLobby_EventScript_250EA4:: @ 8250EA4 + message BattleFrontier_BattlePyramidLobby_Text_2526D9 + waitmessage + multichoice 15, 2, 101, 0 + switch VAR_RESULT + case 0, BattleFrontier_BattlePyramidLobby_EventScript_250EF7 + case 1, BattleFrontier_BattlePyramidLobby_EventScript_250F05 + case 2, BattleFrontier_BattlePyramidLobby_EventScript_250F13 + case 3, BattleFrontier_BattlePyramidLobby_EventScript_250F21 + case 4, BattleFrontier_BattlePyramidLobby_EventScript_250F2F + case 127, BattleFrontier_BattlePyramidLobby_EventScript_250F2F + end + +BattleFrontier_BattlePyramidLobby_EventScript_250EF7:: @ 8250EF7 + msgbox BattleFrontier_BattlePyramidLobby_Text_2526FC, 4 + goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4 + end + +BattleFrontier_BattlePyramidLobby_EventScript_250F05:: @ 8250F05 + msgbox BattleFrontier_BattlePyramidLobby_Text_2527A9, 4 + goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4 + end + +BattleFrontier_BattlePyramidLobby_EventScript_250F13:: @ 8250F13 + msgbox BattleFrontier_BattlePyramidLobby_Text_25285A, 4 + goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4 + end + +BattleFrontier_BattlePyramidLobby_EventScript_250F21:: @ 8250F21 + msgbox BattleFrontier_BattlePyramidLobby_Text_252924, 4 + goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4 + end + +BattleFrontier_BattlePyramidLobby_EventScript_250F2F:: @ 8250F2F + releaseall + end + +BattleFrontier_BattlePyramidLobby_Text_250F31: @ 8250F31 + .string "Where the courage of TRAINERS\n" + .string "is put to the test!\p" + .string "Welcome to the BATTLE PYRAMID!\p" + .string "I am your guide to\n" + .string "the Battle Quest.$" + +BattleFrontier_BattlePyramidLobby_Text_250FA7: @ 8250FA7 + .string "Have you the courage to embark on\n" + .string "the Battle Quest challenge?$" + +BattleFrontier_BattlePyramidLobby_Text_250FE5: @ 8250FE5 + .string "We await your challenge in the future!$" + +BattleFrontier_BattlePyramidLobby_Text_25100C: @ 825100C + .string "The Battle Quest is a battling\n" + .string "event in which you must explore\l" + .string "the PYRAMID and try to reach the top.\p" + .string "In the PYRAMID are seven floors of\n" + .string "mazes, all of them filled with not only\l" + .string "skilled TRAINERS but also wild POKéMON.\p" + .string "You must enter with three POKéMON,\n" + .string "none of them holding an item.\p" + .string "On your ascent, you will be provided\n" + .string "with a BATTLE BAG for items.\p" + .string "If you fail in your challenge, any item\n" + .string "placed in the BATTLE BAG disappears.\p" + .string "If you want to interrupt your\n" + .string "challenge, you must select “RESTâ€\l" + .string "and save the game.\p" + .string "If you don’t save before interrupting,\n" + .string "you will be disqualified.$" + +BattleFrontier_BattlePyramidLobby_Text_251248: @ 8251248 + .string "The PYRAMID offers two courses,\n" + .string "Level 50 and Open Level.\l" + .string "Which will you enter?$" + +BattleFrontier_BattlePyramidLobby_Text_251297: @ 8251297 + .string "Very good. Now, please select the three\n" + .string "POKéMON you wish to accompany you.$" + +BattleFrontier_BattlePyramidLobby_Text_2512E2: @ 82512E2 + .string "A slight problem, adventurer!\p" + .string "You seem to not have the three\n" + .string "POKéMON qualified for the challenge.\p" + .string "Please also remember to take all\n" + .string "items from your POKéMON.\p" + .string "EGGS{STR_VAR_1} ineligible.\p" + .string "When you are ready, please have\n" + .string "a word with me.$" + +BattleFrontier_BattlePyramidLobby_Text_2513C1: @ 82513C1 + .string "A slight problem, adventurer!\p" + .string "You seem to not have the three\n" + .string "POKéMON qualified for the challenge.\p" + .string "The three POKéMON must be different\n" + .string "and each no higher than Level 50.\p" + .string "Please also remember to take all\n" + .string "items from your POKéMON.\p" + .string "EGGS{STR_VAR_1} ineligible.\p" + .string "When you are ready, please have\n" + .string "a word with me.$" + +BattleFrontier_BattlePyramidLobby_Text_2514E6: @ 82514E6 + .string "Before you enter the BATTLE PYRAMID,\n" + .string "the game must be saved. Is that okay?$" + +BattleFrontier_BattlePyramidLobby_Text_251531: @ 8251531 + .string "Very good. I will now show you into\n" + .string "the BATTLE PYRAMID.$" + +BattleFrontier_BattlePyramidLobby_Text_251569: @ 8251569 + .string "We will hold your BAG for safekeeping,\n" + .string "{PLAYER}, while you are exploring.$" + +BattleFrontier_BattlePyramidLobby_Text_2515AD: @ 82515AD + .string "In exchange, please take this BATTLE\n" + .string "BAG, the one you used previously.$" + +BattleFrontier_BattlePyramidLobby_Text_2515F4: @ 82515F4 + .string "In exchange, please take this\n" + .string "BATTLE BAG.$" + +BattleFrontier_BattlePyramidLobby_Text_25161E: @ 825161E + .string "{PLAYER} exchanged the BAG for\n" + .string "the BATTLE BAG.$" + +BattleFrontier_BattlePyramidLobby_Text_251647: @ 8251647 + .string "When you step on this floor panel,\n" + .string "you will be transported to a higher\l" + .string "floor in the PYRAMID.\p" + .string "I hope for your sake that your\n" + .string "quest goes safely!$" + +BattleFrontier_BattlePyramidLobby_Text_2516D6: @ 82516D6 + .string "A major problem, explorer!\p" + .string "You did not save before ending\n" + .string "your challenge the last time.\p" + .string "Consequently, your challenge has\n" + .string "been disqualified, I’m sorry to say.\p" + .string "Here is the BAG we’ve been holding\n" + .string "for you.\p" + .string "{PLAYER} got the BAG back.$" + +BattleFrontier_BattlePyramidLobby_Text_2517B5: @ 82517B5 + .string "Excellent to see you back!\p" + .string "You’ve conquered the PYRAMID!\n" + .string "How splendid!$" + +BattleFrontier_BattlePyramidLobby_Text_2517FC: @ 82517FC + .string "Ah, a slight problem.\p" + .string "At least one POKéMON is holding\n" + .string "an item.\p" + .string "I’m sorry to say, items obtained in\n" + .string "the PYRAMID cannot be taken away.$" + +BattleFrontier_BattlePyramidLobby_Text_251881: @ 8251881 + .string "All items held by your POKéMON will be\n" + .string "moved to your BATTLE BAG, {PLAYER}.$" + +BattleFrontier_BattlePyramidLobby_Text_2518C6: @ 82518C6 + .string "The BATTLE BAG cannot hold all your\n" + .string "items, I’m sorry to say.\p" + .string "Please pick the items you’ll keep in the\n" + .string "BATTLE BAG, and with your POKéMON.$" + +BattleFrontier_BattlePyramidLobby_Text_25194F: @ 825194F + .string "At least one POKéMON is still\n" + .string "holding an item.$" + +BattleFrontier_BattlePyramidLobby_Text_25197E: @ 825197E + .string "Please pick the items you’ll keep in the\n" + .string "BATTLE BAG, and with your POKéMON.$" + +BattleFrontier_BattlePyramidLobby_Text_2519CA: @ 82519CA + .string "{PLAYER} returned everything that\n" + .string "the POKéMON held.$" + +BattleFrontier_BattlePyramidLobby_Text_2519F8: @ 82519F8 + .string "The BATTLE BAG you used will be kept\n" + .string "in readiness for your next challenge.\p" + .string "{PLAYER} turned the BATTLE BAG over\n" + .string "for the BAG’s return.$" + +BattleFrontier_BattlePyramidLobby_Text_251A77: @ 8251A77 + .string "I must record your results.\n" + .string "Please wait.$" + +BattleFrontier_BattlePyramidLobby_Text_251AA0: @ 8251AA0 + .string "As a memento for conquering\n" + .string "the BATTLE PYRAMID, please take this.$" + +BattleFrontier_BattlePyramidLobby_Text_251AE2: @ 8251AE2 + .string "{PLAYER} received the prize\n" + .string "{STR_VAR_1}.$" + +BattleFrontier_BattlePyramidLobby_Text_251AFC: @ 8251AFC + .string "…Ah…\n" + .string "Your BAG appears to be filled.\p" + .string "Please return after you’ve organized\n" + .string "your BAG’s contents.$" + +BattleFrontier_BattlePyramidLobby_Text_251B5A: @ 8251B5A + .string "How disappointing for you…\p" + .string "Here is the BAG we’ve been holding\n" + .string "for you.\p" + .string "{PLAYER} got the BAG back.$" + +BattleFrontier_BattlePyramidLobby_Text_251BB6: @ 8251BB6 + .string "We look forward to your\n" + .string "next challenge!$" + +BattleFrontier_BattlePyramidLobby_Text_251BDE: @ 8251BDE + .string "We have been looking forward to\n" + .string "your arrival!\p" + .string "Here is your prize for conquering\n" + .string "the PYRAMID.$" + +BattleFrontier_BattlePyramidLobby_Text_251C3B: @ 8251C3B + .string "Welcome…\p" + .string "I shall be pleased to tell you what\n" + .string "misfortunes await in the PYRAMID…$" + +BattleFrontier_BattlePyramidLobby_Text_251C8A: @ 8251C8A + .string "… … … … … …\n" + .string "… … … … … …\p" + .string "… … … … … …\n" + .string "Aah!$" + +BattleFrontier_BattlePyramidLobby_Text_251CB3: @ 8251CB3 + .string "I see a shower of sparks…\p" + .string "…And in it, I see your POKéMON\n" + .string "struggling with paralysis…$" + +BattleFrontier_BattlePyramidLobby_Text_251D07: @ 8251D07 + .string "I see poison…\p" + .string "…And, I see your POKéMON suffering\n" + .string "from the effects of poison…$" + +BattleFrontier_BattlePyramidLobby_Text_251D54: @ 8251D54 + .string "I see bright red flames…\p" + .string "…And, I see your POKéMON suffering\n" + .string "from burns…$" + +BattleFrontier_BattlePyramidLobby_Text_251D9C: @ 8251D9C + .string "I sense the tremendous pressure of\n" + .string "unrequited anger…\p" + .string "It is a curse…\p" + .string "…And, I see your POKéMON drained of\n" + .string "Power Points and having no recourse\l" + .string "but to use STRUGGLE…$" + +BattleFrontier_BattlePyramidLobby_Text_251E3D: @ 8251E3D + .string "I see POKéMON loftily airborne…\p" + .string "…And, I see your POKéMON frustrated\n" + .string "by powerless GROUND-type moves…$" + +BattleFrontier_BattlePyramidLobby_Text_251EA1: @ 8251EA1 + .string "I sense terrific energy rising from\n" + .string "the ground below…\p" + .string "…And, I see your POKéMON unable to\n" + .string "escape the power’s clutches…$" + +BattleFrontier_BattlePyramidLobby_Text_251F17: @ 8251F17 + .string "I see ICE-type POKéMON…\p" + .string "…And, I see your POKéMON fighting\n" + .string "the freezing effects of ice…$" + +BattleFrontier_BattlePyramidLobby_Text_251F6E: @ 8251F6E + .string "I see a flurry of moves that imperil\n" + .string "the user…\p" + .string "…And, I see your POKéMON falling\n" + .string "to them…$" + +BattleFrontier_BattlePyramidLobby_Text_251FC7: @ 8251FC7 + .string "I see PSYCHIC-type POKéMON…\p" + .string "…And, I see your POKéMON in torment\n" + .string "from PSYCHIC moves…$" + +BattleFrontier_BattlePyramidLobby_Text_25201B: @ 825201B + .string "I see ROCK-type POKéMON…\p" + .string "…And, I see your POKéMON suffering\n" + .string "from ROCK moves…$" + +BattleFrontier_BattlePyramidLobby_Text_252068: @ 8252068 + .string "I see FIGHTING-type POKéMON…\p" + .string "…And, I see your POKéMON pummeled\n" + .string "by FIGHTING moves…$" + +BattleFrontier_BattlePyramidLobby_Text_2520BA: @ 82520BA + .string "RAIN DANCE… SUNNY DAY…\n" + .string "SANDSTORM… HAIL…\p" + .string "I see POKéMON that become stronger\n" + .string "with the weather…\p" + .string "…And, I see your POKéMON confounded\n" + .string "by different types of moves…$" + +BattleFrontier_BattlePyramidLobby_Text_252158: @ 8252158 + .string "I see BUG-type POKéMON…\p" + .string "…And, I see your POKéMON suffering\n" + .string "from different kinds of attacks…$" + +BattleFrontier_BattlePyramidLobby_Text_2521B4: @ 82521B4 + .string "I see DARK-type POKéMON…\p" + .string "…And, I see your POKéMON suffering\n" + .string "from DARK-type moves…$" + +BattleFrontier_BattlePyramidLobby_Text_252206: @ 8252206 + .string "I see WATER-type POKéMON…\p" + .string "…And, I see your POKéMON suffering\n" + .string "from WATER-type moves…$" + +BattleFrontier_BattlePyramidLobby_Text_25225A: @ 825225A + .string "I see GHOST-type POKéMON…\p" + .string "…And, I see your POKéMON suffering\n" + .string "from GHOST-type moves…$" + +BattleFrontier_BattlePyramidLobby_Text_2522AE: @ 82522AE + .string "I see STEEL-type POKéMON…\p" + .string "…And, I see your POKéMON suffering\n" + .string "from enormously powerful moves…$" + +BattleFrontier_BattlePyramidLobby_Text_25230B: @ 825230B + .string "I see flying POKéMON…\p" + .string "…And, I see your POKéMON suffering\n" + .string "from enormously powerful moves…$" + +BattleFrontier_BattlePyramidLobby_Text_252364: @ 8252364 + .string "I see those that have evolved from\n" + .string "the power of stones…\p" + .string "I also sense fire, water,\n" + .string "and electricity…\p" + .string "…And, I see your POKéMON suffering\n" + .string "from those three powers…$" + +BattleFrontier_BattlePyramidLobby_Text_252403: @ 8252403 + .string "I see NORMAL-type POKéMON…\p" + .string "…And, I see your POKéMON suffering\n" + .string "from enormously powerful moves…$" + +BattleFrontier_BattlePyramidLobby_Text_252461: @ 8252461 + .string "Whether you believe my fortunes\n" + .string "or not, the choice is yours…\p" + .string "The future can be changed anytime…\n" + .string "I wish you safe passage…$" + +BattleFrontier_BattlePyramidLobby_Text_2524DA: @ 82524DA + .string "Did you know?\p" + .string "If you run fast, TRAINERS may notice\n" + .string "and come after you for a battle.\p" + .string "So, if you want to avoid TRAINERS,\n" + .string "don’t catch their eyes, but sneak\l" + .string "cautiously and quietly past them.$" + +BattleFrontier_BattlePyramidLobby_Text_252595: @ 8252595 + .string "Awaaaaaaarrrrgh!\p" + .string "I had a whole lot of items, but I lost\n" + .string "them all when I lost!\p" + .string "Awaaaaaaarrrrgh!$" + +BattleFrontier_BattlePyramidLobby_Text_2525F4: @ 82525F4 + .string "Welcome back!\n" + .string "You’ve done the unthinkable!\p" + .string "You’ve defeated the PYRAMID KING\n" + .string "and conquered the BATTLE PYRAMID!$" + +BattleFrontier_BattlePyramidLobby_Text_252662: @ 8252662 + .string "Young explorer!\n" + .string "In commendation of your courage,\l" + .string "we give you these Battle Point(s)!$" + +BattleFrontier_BattlePyramidLobby_Text_2526B6: @ 82526B6 + .string "The Battle Quest rules are listed.$" + +BattleFrontier_BattlePyramidLobby_Text_2526D9: @ 82526D9 + .string "Which heading do you want to read?$" + +BattleFrontier_BattlePyramidLobby_Text_2526FC: @ 82526FC + .string "When the PYRAMID is conquered,\n" + .string "the wild POKéMON that appear in it\l" + .string "are replaced by different kinds.\p" + .string "Explore, observe, and learn what kinds\n" + .string "of wild POKéMON you may encounter.$" + +BattleFrontier_BattlePyramidLobby_Text_2527A9: @ 82527A9 + .string "TRAINERS are lying in wait for you\n" + .string "inside the PYRAMID.\p" + .string "On each floor, there are up to\n" + .string "eight TRAINERS.\p" + .string "When you defeat a TRAINER, you will\n" + .string "get a helpful hint for your adventure.$" + +BattleFrontier_BattlePyramidLobby_Text_25285A: @ 825285A + .string "The mazes in the PYRAMID rearrange\n" + .string "themselves every time you enter it.\p" + .string "The mazes are poorly lit.\n" + .string "You must advance with caution.\p" + .string "The light grows brighter whenever you\n" + .string "defeat a wild POKéMON or a TRAINER.$" + +BattleFrontier_BattlePyramidLobby_Text_252924: @ 8252924 + .string "The BATTLE BAG serves as your BAG\n" + .string "while in the PYRAMID.\p" + .string "There are two separate BATTLE BAGS--\n" + .string "one each for the Level 50 and\l" + .string "Open Level adventures.\p" + .string "They each can hold up to 99 pieces\n" + .string "of ten kinds of items.\p" + .string "The contents of the BATTLE BAG are\n" + .string "lost if you fail in your quest.$" + diff --git a/data/maps/BattleFrontier_BattlePyramidTop/events.inc b/data/maps/BattleFrontier_BattlePyramidTop/events.inc new file mode 100644 index 000000000..f724f4f9f --- /dev/null +++ b/data/maps/BattleFrontier_BattlePyramidTop/events.inc @@ -0,0 +1,10 @@ +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 + +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_EventObjects, 0x0, BattleFrontier_BattlePyramidTop_MapCoordEvents, 0x0 + diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc new file mode 100644 index 000000000..886b3fe01 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc @@ -0,0 +1,379 @@ +BattleFrontier_BattlePyramidTop_MapScripts:: @ 82550A1 + map_script 5, BattleFrontier_BattlePyramidTop_MapScript1_2550F4 + map_script 2, BattleFrontier_BattlePyramidTop_MapScript2_25516E + map_script 3, BattleFrontier_BattlePyramidTop_MapScript1_2550B6 + map_script 4, BattleFrontier_BattlePyramidTop_MapScript2_2550CE + .byte 0 + +BattleFrontier_BattlePyramidTop_MapScript1_2550B6: @ 82550B6 + setvar VAR_0x8004, 13 + setvar VAR_0x8005, 200 + setvar VAR_0x8006, 0 + special sub_81A8E7C + setvar VAR_TEMP_F, 1 + end + +BattleFrontier_BattlePyramidTop_MapScript2_2550CE: @ 82550CE + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePyramidTop_EventScript_2550D8 + .2byte 0 + +BattleFrontier_BattlePyramidTop_EventScript_2550D8:: @ 82550D8 + setvar VAR_TEMP_1, 1 + turnobject 255, 2 + compare VAR_TEMP_C, 0 + goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_2550F3 + setobjectxyperm 2, 0, 0 + +BattleFrontier_BattlePyramidTop_EventScript_2550F3:: @ 82550F3 + end + +BattleFrontier_BattlePyramidTop_MapScript1_2550F4: @ 82550F4 + setvar VAR_0x8004, 9 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattlePyramidTop_EventScript_25510C + call BattleFrontier_BattlePyramidTop_EventScript_242170 + +BattleFrontier_BattlePyramidTop_EventScript_25510C:: @ 825510C + copyvar VAR_TEMP_C, VAR_RESULT + setvar VAR_0x8004, 0 + special sub_81A1780 + switch VAR_TEMP_0 + case 0, BattleFrontier_BattlePyramidTop_EventScript_255193 + case 1, BattleFrontier_BattlePyramidTop_EventScript_252B66 + case 2, BattleFrontier_BattlePyramidTop_EventScript_255193 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 5 + special sub_81A1780 + compare VAR_RESULT, 2 + goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 + compare VAR_RESULT, 3 + goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 + compare VAR_RESULT, 9 + goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 + end + +BattleFrontier_BattlePyramidTop_MapScript2_25516E: @ 825516E + map_script_2 VAR_TEMP_E, 0, BattleFrontier_BattlePyramidTop_EventScript_255180 + map_script_2 VAR_TEMP_F, 1, BattleFrontier_BattlePyramidTop_EventScript_25518A + .2byte 0 + +BattleFrontier_BattlePyramidTop_EventScript_255180:: @ 8255180 + playbgm MUS_PYRAMID_TOP, 0 + setvar VAR_TEMP_E, 1 + end + +BattleFrontier_BattlePyramidTop_EventScript_25518A:: @ 825518A + special ShowMapNamePopup + setvar VAR_TEMP_F, 0 + end + +BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193 + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 1 + special sub_81A8E7C + special SavePlayerParty + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_0x8004, 9 + special sub_81A8E7C + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 3 + special sub_81A1780 + setvar VAR_TEMP_F, 1 + end + +BattleFrontier_BattlePyramidTop_EventScript_2551D0:: @ 82551D0 + lock + faceplayer + compare VAR_TEMP_D, 0 + goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255236 + compare VAR_TEMP_C, 0 + goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255240 + msgbox BattleFrontier_BattlePyramidTop_Text_255410, 4 + closemessage + applymovement 1, BattleFrontier_BattlePyramidTop_Movement_2553FD + waitmovement 0 + applymovement 255, BattleFrontier_BattlePyramidTop_Movement_255403 + waitmovement 0 + applymovement 1, BattleFrontier_BattlePyramidTop_Movement_255400 + waitmovement 0 + message BattleFrontier_BattlePyramidTop_Text_2554E8 + waitmessage + playfanfare MUS_ME_POINTGET + waitfanfare + closemessage + +BattleFrontier_BattlePyramidTop_EventScript_25521A:: @ 825521A + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 3 + special sub_81A1780 + warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13 + waitstate + end + +BattleFrontier_BattlePyramidTop_EventScript_255236:: @ 8255236 + msgbox BattleFrontier_BattlePyramidTop_Text_255BFE, 4 + closemessage + end + +BattleFrontier_BattlePyramidTop_EventScript_255240:: @ 8255240 + msgbox BattleFrontier_BattlePyramidTop_Text_25551F, 4 + applymovement 1, BattleFrontier_BattlePyramidTop_Movement_2553FD + setvar VAR_TEMP_D, 1 + closemessage + end + +BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256 + lockall + switch VAR_TEMP_C + case 2, BattleFrontier_BattlePyramidTop_EventScript_255335 + case 3, BattleFrontier_BattlePyramidTop_EventScript_2552D0 + case 4, BattleFrontier_BattlePyramidTop_EventScript_255388 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 7 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_2552D0 + special SpawnScriptEventObject + applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C + waitmovement 0 + msgbox BattleFrontier_BattlePyramidTop_Text_255669, 4 + closemessage + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 7 + special sub_81A1780 + applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A + waitmovement 0 + msgbox BattleFrontier_BattlePyramidTop_Text_25573E, 4 + goto BattleFrontier_BattlePyramidTop_EventScript_2552DA + end + +BattleFrontier_BattlePyramidTop_EventScript_2552D0:: @ 82552D0 + applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A + waitmovement 0 + +BattleFrontier_BattlePyramidTop_EventScript_2552DA:: @ 82552DA + msgbox BattleFrontier_BattlePyramidTop_Text_255846, 4 + call BattleFrontier_BattlePyramidTop_EventScript_2553ED + playbgm MUS_PYRAMID_TOP, 0 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattlePyramidTop_EventScript_2552FB + goto BattleFrontier_BattlePyramidTop_EventScript_252B42 + +BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB + setvar VAR_0x8004, 12 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_25521A + msgbox BattleFrontier_BattlePyramidTop_Text_255873, 4 + playfanfare MUS_ME_SYMBOLGET + message BattleFrontier_BattlePyramidTop_Text_2558E9 + waitmessage + waitfanfare + setvar VAR_0x8004, 13 + special sub_81A1780 + msgbox BattleFrontier_BattlePyramidTop_Text_25591D, 4 + goto BattleFrontier_BattlePyramidTop_EventScript_25521A + +BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 7 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255388 + special SpawnScriptEventObject + applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C + waitmovement 0 + msgbox BattleFrontier_BattlePyramidTop_Text_255951, 4 + closemessage + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 7 + special sub_81A1780 + applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A + waitmovement 0 + msgbox BattleFrontier_BattlePyramidTop_Text_255A6D, 4 + goto BattleFrontier_BattlePyramidTop_EventScript_255392 + end + +BattleFrontier_BattlePyramidTop_EventScript_255388:: @ 8255388 + applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A + waitmovement 0 + +BattleFrontier_BattlePyramidTop_EventScript_255392:: @ 8255392 + msgbox BattleFrontier_BattlePyramidTop_Text_255AA1, 4 + call BattleFrontier_BattlePyramidTop_EventScript_2553ED + playbgm MUS_PYRAMID_TOP, 0 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattlePyramidTop_EventScript_2553B3 + goto BattleFrontier_BattlePyramidTop_EventScript_252B42 + +BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3 + setvar VAR_0x8004, 12 + special sub_81A1780 + compare VAR_RESULT, 2 + goto_eq BattleFrontier_BattlePyramidTop_EventScript_25521A + msgbox BattleFrontier_BattlePyramidTop_Text_255ACD, 4 + playfanfare MUS_ME_SYMBOLGET + message BattleFrontier_BattlePyramidTop_Text_255B59 + waitmessage + waitfanfare + setvar VAR_0x8004, 13 + special sub_81A1780 + msgbox BattleFrontier_BattlePyramidTop_Text_255B82, 4 + goto BattleFrontier_BattlePyramidTop_EventScript_25521A + +BattleFrontier_BattlePyramidTop_EventScript_2553ED:: @ 82553ED + closemessage + setvar VAR_0x8004, 10 + setvar VAR_0x8005, 0 + special sub_8163AC4 + waitstate + return + +BattleFrontier_BattlePyramidTop_Movement_2553FD: @ 82553FD + walk_right + walk_in_place_fastest_left + step_end + +BattleFrontier_BattlePyramidTop_Movement_255400: @ 8255400 + walk_left + walk_in_place_fastest_up + step_end + +BattleFrontier_BattlePyramidTop_Movement_255403: @ 8255403 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_down + step_end + +BattleFrontier_BattlePyramidTop_Movement_25540A: @ 825540A + walk_fast_down + step_end + +BattleFrontier_BattlePyramidTop_Movement_25540C: @ 825540C + walk_slow_up + walk_slow_up + delay_16 + step_end + +BattleFrontier_BattlePyramidTop_Text_255410: @ 8255410 + .string "It is a delight to see you here!\n" + .string "You have reached the summit of\l" + .string "the BATTLE PYRAMID!\p" + .string "Above here is the PYRAMID’s\n" + .string "lookout point.\p" + .string "It is a place open only to those\n" + .string "who have conquered the PYRAMID.\p" + .string "Now, please!\n" + .string "Up you go!$" + +BattleFrontier_BattlePyramidTop_Text_2554E8: @ 82554E8 + .string "The PYRAMID’s new conqueror!\n" + .string "Let the name {PLAYER} be known!$" + +BattleFrontier_BattlePyramidTop_Text_25551F: @ 825551F + .string "It is a delight to see you here!\p" + .string "Unfortunately, you were second by\n" + .string "a mere fraction of time!\p" + .string "Our chief has already conquered\n" + .string "the PYRAMID ahead of you.\p" + .string "However, my young explorer…\n" + .string "You are a TRAINER!\p" + .string "Assert your power and take the glory\n" + .string "of the pinnacle from our chief!\p" + .string "Now, please! When you are ready,\n" + .string "take one more step of courage!$" + +BattleFrontier_BattlePyramidTop_Text_255669: @ 8255669 + .string "Young adventurer…\p" + .string "Wouldn’t you agree that explorations\n" + .string "are the grandest of adventures?\p" + .string "Your own wits!\p" + .string "Your own strength!\p" + .string "Your own POKéMON!\p" + .string "And, above all, only your own courage\n" + .string "to lead you through unknown worlds…$" + +BattleFrontier_BattlePyramidTop_Text_25573E: @ 825573E + .string "Aah, yes, indeed this life is grand!\n" + .string "Grand, it is! Eh?\p" + .string "I’m BRANDON!\p" + .string "I’m the PYRAMID KING, which means\n" + .string "I’m in charge here.\p" + .string "Most people call me the chief!\p" + .string "You coming here means you have\n" + .string "that much confidence in yourself,\l" + .string "am I right?\p" + .string "Hahahah!\n" + .string "This should be exciting!$" + +BattleFrontier_BattlePyramidTop_Text_255846: @ 8255846 + .string "Now, then!\n" + .string "Bring your courage to our battle!$" + +BattleFrontier_BattlePyramidTop_Text_255873: @ 8255873 + .string "BRANDON: Hahahah! Grand it was!\n" + .string "Grand, yes, indeed!\p" + .string "Well done! You’ve earned recognition!\n" + .string "Your FRONTIER PASS, please!$" + +BattleFrontier_BattlePyramidTop_Text_2558E9: @ 82558E9 + .string "The Brave Symbol was embossed on\n" + .string "the FRONTIER PASS!$" + +BattleFrontier_BattlePyramidTop_Text_25591D: @ 825591D + .string "Young explorer!\n" + .string "I look forward to our next meeting!$" + +BattleFrontier_BattlePyramidTop_Text_255951: @ 8255951 + .string "BRANDON: …You’ve finally returned,\n" + .string "young explorer…\p" + .string "Your love of adventure seems to come\n" + .string "deep from within your heart…\p" + .string "Yes… You are exactly as I was in\n" + .string "my own youth…\p" + .string "… … …Ah…\p" + .string "The passionate!\p" + .string "The dangerous!\p" + .string "The desperate!\p" + .string "Those days of death-defying,\n" + .string "life-affirming adventures are back…$" + +BattleFrontier_BattlePyramidTop_Text_255A6D: @ 8255A6D + .string "Now, then!\p" + .string "I sense my own courage is off\n" + .string "the meter!$" + +BattleFrontier_BattlePyramidTop_Text_255AA1: @ 8255AA1 + .string "Everything you have!\n" + .string "I’m braced for it all!$" + +BattleFrontier_BattlePyramidTop_Text_255ACD: @ 8255ACD + .string "BRANDON: Hahahah!\n" + .string "Remarkable!\l" + .string "Yes, it’s grand, indeed!\p" + .string "Young explorer!\p" + .string "You’ve bested me through and through!\n" + .string "Here! I want you to have this!$" + +BattleFrontier_BattlePyramidTop_Text_255B59: @ 8255B59 + .string "The Brave Symbol took on\n" + .string "a golden shine!$" + +BattleFrontier_BattlePyramidTop_Text_255B82: @ 8255B82 + .string "Ah, yes! It just goes to show that\n" + .string "I have much to learn still!\p" + .string "May our paths cross again!\n" + .string "Farewell for now, young explorer!$" + +BattleFrontier_BattlePyramidTop_Text_255BFE: @ 8255BFE + .string "Now, when you are ready, take courage\n" + .string "and step forward.$" + diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc new file mode 100644 index 000000000..0bc8d0434 --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc @@ -0,0 +1,12 @@ +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 + +BattleFrontier_BattleTowerBattleRoom_MapWarps: @ 853B818 + 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/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc new file mode 100644 index 000000000..f684e215d --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -0,0 +1,651 @@ +BattleFrontier_BattleTowerBattleRoom_MapScripts:: @ 8241B40 + map_script 2, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62 + map_script 4, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B + .byte 0 + +BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B: @ 8241B4B + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241B55 + .2byte 0 + +BattleFrontier_BattleTowerBattleRoom_EventScript_241B55:: @ 8241B55 + setvar VAR_TEMP_1, 1 + applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_242198 + end + +BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62: @ 8241B62 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C + .2byte 0 + +BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C + setvar VAR_TEMP_0, 1 + applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_242179 + waitmovement 0 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3 + applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D + waitmovement 0 + applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_24217E + waitmovement 0 + setvar VAR_TEMP_2, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 6 + setvar VAR_0x8006, 1 + special sub_81A1780 + goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F + +BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3:: @ 8241BC3 + setvar VAR_0x8004, 3 + special sub_8161F74 + addobject 1 + applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_242182 + waitmovement 0 + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 0 + special sub_8161F74 + msgbox 0x2021fc4, 4 + waitmessage + call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E + switch VAR_RESULT + case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F + +BattleFrontier_BattleTowerBattleRoom_EventScript_241C03:: @ 8241C03 +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03:: @ 8241C03 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 4 + special sub_81A1780 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + special sub_8161F74 + setvar VAR_0x8004, 3 + special sub_813BF7C + goto BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8 + +BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F + call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA + setvar VAR_0x8004, 4 + special sub_8161F74 + switch VAR_RESULT + case 7, BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 + applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_242188 + waitmovement 0 + removeobject 1 + setvar VAR_0x8004, 9 + special sub_81A1780 + compare VAR_RESULT, 0 + call_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3 + applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D + waitmovement 0 + applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_24217E + waitmovement 0 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_242217, 4 + playfanfare MUS_ME_ASA + waitfanfare + special HealPlayerParty + +BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F:: @ 8241C8F + setvar VAR_0x8004, 9 + special sub_81A1780 + copyvar VAR_TEMP_F, VAR_RESULT + compare VAR_RESULT, 0 + goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special sub_81A1780 + call BattleFrontier_BattleTowerBattleRoom_EventScript_241E44 + call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241D0A + multichoice 19, 4, 103, 1 + switch VAR_RESULT + case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC + case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D40 + case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C + case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA + case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F + +BattleFrontier_BattleTowerBattleRoom_EventScript_241D0A:: @ 8241D0A + multichoice 20, 6, 104, 1 + switch VAR_RESULT + case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC + case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C + case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA + case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F + +BattleFrontier_BattleTowerBattleRoom_EventScript_241D40:: @ 8241D40 + message BattleFrontier_BattleTowerBattleRoom_Text_2423A3 + waitmessage + multichoicedefault 20, 8, 94, 1, 0 + switch VAR_RESULT + case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F + case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241D72 + case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F + +BattleFrontier_BattleTowerBattleRoom_EventScript_241D72:: @ 8241D72 + call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8B4 + goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F + +BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C:: @ 8241D7C + msgbox BattleFrontier_BattleTowerBattleRoom_Text_2423FC, 5 + switch VAR_RESULT + case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F + case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241E22 + case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F + +BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA:: @ 8241DAA + message BattleFrontier_BattleTowerBattleRoom_Text_24244C + waitmessage + multichoicedefault 20, 8, 94, 1, 0 + switch VAR_RESULT + case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F + case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_24220E + case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F + +BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC:: @ 8241DDC + closemessage + applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_242180 + waitmovement 0 + applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_242192 + waitmovement 0 + goto BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3 + +BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6:: @ 8241DF6 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 3 + special sub_81A1780 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + special sub_8161F74 + setvar VAR_0x8004, 3 + special sub_813BF7C + goto BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8 + +BattleFrontier_BattleTowerBattleRoom_EventScript_241E22:: @ 8241E22 + message BattleFrontier_BattleTowerBattleRoom_Text_242426 + waitmessage + setvar VAR_0x8004, 6 + setvar VAR_0x8005, 2 + special sub_8161F74 + playse SE_SAVE + waitse + fadescreen 1 + setvar VAR_0x8004, 4 + special sub_81A1780 + end + +BattleFrontier_BattleTowerBattleRoom_EventScript_241E44:: @ 8241E44 + copyvar VAR_TEMP_F, VAR_RESULT + switch VAR_TEMP_F + case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241E90 + case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241E97 + case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_241E9E + case 4, BattleFrontier_BattleTowerBattleRoom_EventScript_241EA5 + case 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241EAC + case 6, BattleFrontier_BattleTowerBattleRoom_EventScript_241EB3 + +BattleFrontier_BattleTowerBattleRoom_EventScript_241E90:: @ 8241E90 + message BattleFrontier_BattleTowerBattleRoom_Text_242277 + waitmessage + return + +BattleFrontier_BattleTowerBattleRoom_EventScript_241E97:: @ 8241E97 + message BattleFrontier_BattleTowerBattleRoom_Text_2422A9 + waitmessage + return + +BattleFrontier_BattleTowerBattleRoom_EventScript_241E9E:: @ 8241E9E + message BattleFrontier_BattleTowerBattleRoom_Text_2422DB + waitmessage + return + +BattleFrontier_BattleTowerBattleRoom_EventScript_241EA5:: @ 8241EA5 + message BattleFrontier_BattleTowerBattleRoom_Text_24230D + waitmessage + return + +BattleFrontier_BattleTowerBattleRoom_EventScript_241EAC:: @ 8241EAC + message BattleFrontier_BattleTowerBattleRoom_Text_24233F + waitmessage + return + +BattleFrontier_BattleTowerBattleRoom_EventScript_241EB3:: @ 8241EB3 + message BattleFrontier_BattleTowerBattleRoom_Text_242371 + waitmessage + return + +BattleFrontier_BattleArenaBattleRoom_EventScript_241EBA:: @ 8241EBA +BattleFrontier_BattleDomeLobby_EventScript_241EBA:: @ 8241EBA +BattleFrontier_BattleFactoryBattleRoom_EventScript_241EBA:: @ 8241EBA +BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA:: @ 8241EBA +BattleFrontier_BattleTowerBattleRoom2_EventScript_241EBA:: @ 8241EBA +BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA:: @ 8241EBA + setvar VAR_0x8004, 17 + special sub_81A1780 + return + +BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3 + applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_24219A + waitmovement 0 + applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2725B6 + waitmovement 0 + playse SE_PIN + applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_272598 + waitmovement 0 + applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_27259A + waitmovement 0 + applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2421A6 + applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_2421AB + waitmovement 0 + applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2421A1 + waitmovement 0 + return + +BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A:: @ 8241F0A + compare VAR_TEMP_2, 1 + goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F22 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_2424C2, 4 + setvar VAR_TEMP_2, 1 + +BattleFrontier_BattleTowerBattleRoom_EventScript_241F22:: @ 8241F22 + message BattleFrontier_BattleTowerBattleRoom_Text_242542 + waitmessage + call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F79 + multichoice 19, 4, 103, 1 + switch VAR_RESULT + case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF + case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D40 + case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C + case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA + case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241F22 + +BattleFrontier_BattleTowerBattleRoom_EventScript_241F79:: @ 8241F79 + multichoice 20, 6, 104, 1 + switch VAR_RESULT + case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF + case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C + case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA + case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241F22 + +BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF + call BattleFrontier_BattleTowerBattleRoom_EventScript_242170 + closemessage + applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_242180 + waitmovement 0 + applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_242192 + waitmovement 0 + addobject 1 + applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_2421B2 + waitmovement 0 + switch VAR_TEMP_F + case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_242085 + case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_242029 + case 4, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 7 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_242029 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_242579, 4 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 7 + special sub_81A1780 + +BattleFrontier_BattleTowerBattleRoom_EventScript_242029:: @ 8242029 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_24268C, 4 + call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_242046 + goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03 + +BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046 + call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA + setvar VAR_0x8004, 12 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_2426B4, 4 + playfanfare MUS_ME_SYMBOLGET + message BattleFrontier_BattleTowerBattleRoom_Text_24270E + waitmessage + waitfanfare + setvar VAR_0x8004, 13 + special sub_81A1780 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_242744, 4 + goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 + +BattleFrontier_BattleTowerBattleRoom_EventScript_242085:: @ 8242085 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 7 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_2427F9, 4 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 7 + special sub_81A1780 + +BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2:: @ 82420B2 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428E0, 4 + call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF + goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03 + +BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF + call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA + setvar VAR_0x8004, 12 + special sub_81A1780 + compare VAR_RESULT, 2 + goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428F7, 4 + playfanfare MUS_ME_SYMBOLGET + message BattleFrontier_BattleTowerBattleRoom_Text_242932 + waitmessage + waitfanfare + setvar VAR_0x8004, 13 + special sub_81A1780 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_24295D, 4 + goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 + +BattleFrontier_BattleTowerBattleRoom2_EventScript_24210E:: @ 824210E +BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E + closemessage + setvar VAR_TEMP_2, 0 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 6 + setvar VAR_0x8006, 0 + special sub_81A1780 + special HealPlayerParty + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 0 + special sub_8163AC4 + waitstate + copyvar VAR_0x8004, VAR_0x40CE + compare VAR_0x8004, 3 + goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_24215A + setvar VAR_0x8004, 18 + special sub_81A1780 + special HealPlayerParty + setvar VAR_0x8004, 21 + special sub_81A1780 + +BattleFrontier_BattleTowerBattleRoom_EventScript_24215A:: @ 824215A + setvar VAR_0x8004, 15 + special sub_8161F74 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 5 + special sub_81A1780 + return + +BattleFrontier_BattleArenaBattleRoom_EventScript_242170:: @ 8242170 +BattleFrontier_BattleDomeBattleRoom_EventScript_242170:: @ 8242170 +BattleFrontier_BattleFactoryBattleRoom_EventScript_242170:: @ 8242170 +BattleFrontier_BattlePalaceBattleRoom_EventScript_242170:: @ 8242170 +BattleFrontier_BattlePyramidTop_EventScript_242170:: @ 8242170 +BattleFrontier_BattleTowerBattleRoom_EventScript_242170:: @ 8242170 + setvar VAR_0x8004, 22 + special sub_81A1780 + return + +BattleFrontier_BattleTowerBattleRoom_Movement_242179: @ 8242179 + walk_up + walk_up + walk_up + face_right + step_end + +BattleFrontier_BattleTowerBattleRoom_Movement_24217E: @ 824217E + face_down + step_end + +BattleFrontier_BattleTowerBattleRoom_Movement_242180: @ 8242180 + face_right + step_end + +BattleFrontier_BattleTowerBattleRoom_Movement_242182: @ 8242182 + walk_down + walk_down + walk_down + walk_down + face_left + step_end + +BattleFrontier_BattleTowerBattleRoom_Movement_242188: @ 8242188 + walk_up + walk_up + walk_up + walk_up + step_end + +BattleFrontier_BattleTowerBattleRoom_Movement_24218D: @ 824218D + walk_right + walk_right + walk_right + walk_up + step_end + +BattleFrontier_BattleTowerBattleRoom_Movement_242192: @ 8242192 + walk_down + walk_left + walk_left + walk_left + face_right + step_end + +BattleFrontier_BattleTowerBattleRoom_Movement_242198: @ 8242198 + set_invisible + step_end + +BattleFrontier_BattleTowerBattleRoom_Movement_24219A: @ 824219A + set_visible + delay_16 + walk_up + walk_left + walk_left + delay_8 + step_end + +BattleFrontier_BattleTowerBattleRoom_Movement_2421A1: @ 82421A1 + walk_right + walk_right + walk_down + set_invisible + step_end + +BattleFrontier_BattleTowerBattleRoom_Movement_2421A6: @ 82421A6 + delay_16 + delay_16 + delay_16 + delay_16 + step_end + +BattleFrontier_BattleTowerBattleRoom_Movement_2421AB: @ 82421AB + face_right + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_right + step_end + +BattleFrontier_BattleTowerBattleRoom_Movement_2421B2: @ 82421B2 + walk_slow_down + walk_slow_down + walk_slow_down + walk_slow_down + face_left + step_end + +BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8:: @ 82421B8 +BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8:: @ 82421B8 + copyvar VAR_RESULT, VAR_0x40CE + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421E8 + compare VAR_RESULT, 2 + goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421F2 + compare VAR_RESULT, 3 + goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 6, 6 + waitstate + end + +BattleFrontier_BattleTowerBattleRoom_EventScript_2421E8:: @ 82421E8 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 10, 6 + waitstate + end + +BattleFrontier_BattleTowerBattleRoom_EventScript_2421F2:: @ 82421F2 + 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 MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 18, 6 + waitstate + end + +BattleFrontier_BattleTowerBattleRoom_EventScript_24220E:: @ 824220E + setflag FLAG_0x077 + goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03 + end + +BattleFrontier_BattleTowerBattleRoom2_Text_242217: @ 8242217 +BattleFrontier_BattleTowerBattleRoom_Text_242217: @ 8242217 + .string "We will restore your POKéMON to\n" + .string "full health.$" + +BattleFrontier_BattleTowerBattleRoom_Text_242244: @ 8242244 + .string "You will be facing opponent no. {STR_VAR_1}.\n" + .string "Are you ready?$" + +BattleFrontier_BattleTowerBattleRoom_Text_242277: @ 8242277 + .string "You will be facing opponent no. 2.\n" + .string "Are you ready?$" + +BattleFrontier_BattleTowerBattleRoom_Text_2422A9: @ 82422A9 + .string "You will be facing opponent no. 3.\n" + .string "Are you ready?$" + +BattleFrontier_BattleTowerBattleRoom_Text_2422DB: @ 82422DB + .string "You will be facing opponent no. 4.\n" + .string "Are you ready?$" + +BattleFrontier_BattleTowerBattleRoom_Text_24230D: @ 824230D + .string "You will be facing opponent no. 5.\n" + .string "Are you ready?$" + +BattleFrontier_BattleTowerBattleRoom_Text_24233F: @ 824233F + .string "You will be facing opponent no. 6.\n" + .string "Are you ready?$" + +BattleFrontier_BattleTowerBattleRoom_Text_242371: @ 8242371 + .string "You will be facing opponent no. 7.\n" + .string "Are you ready?$" + +BattleFrontier_BattleTowerBattleRoom2_Text_2423A3: @ 82423A3 +BattleFrontier_BattleTowerBattleRoom_Text_2423A3: @ 82423A3 + .string "Record your battle on your\n" + .string "FRONTIER PASS?$" + +BattleFrontier_BattleTowerLobby_Text_2423CD: @ 82423CD + .string "{PLAYER}’s battle was recorded\n" + .string "on the FRONTIER PASS.$" + +BattleFrontier_BattleTowerBattleRoom2_Text_2423FC: @ 82423FC +BattleFrontier_BattleTowerBattleRoom_Text_2423FC: @ 82423FC + .string "Would you like to save and\n" + .string "quit the game?$" + +BattleFrontier_BattleTowerBattleRoom2_Text_242426: @ 8242426 +BattleFrontier_BattleTowerBattleRoom_Text_242426: @ 8242426 + .string "Saving your battle data.\n" + .string "Please wait.$" + +BattleFrontier_BattleTowerBattleRoom2_Text_24244C: @ 824244C +BattleFrontier_BattleTowerBattleRoom_Text_24244C: @ 824244C + .string "Would you like to cancel your BATTLE\n" + .string "ROOM challenge?$" + +gText_BattleRecordCouldntBeSaved:: @ 8242481 + .string "There was an error of some sort.\n" + .string "Your record could not be saved.$" + +BattleFrontier_BattleTowerBattleRoom_Text_2424C2: @ 82424C2 + .string "Excuse me, but…\p" + .string "Our leader, the SALON MAIDEN, is on\n" + .string "her way here in hopes of battling you.\p" + .string "She should be arriving very shortly.$" + +BattleFrontier_BattleTowerBattleRoom_Text_242542: @ 8242542 + .string "You will be facing the SALON MAIDEN.\n" + .string "Are you prepared?$" + +BattleFrontier_BattleTowerBattleRoom_Text_242579: @ 8242579 + .string "Greetings…\n" + .string "My name is ANABEL.\p" + .string "I am the SALON MAIDEN, and I am in\n" + .string "charge of running the BATTLE TOWER…\p" + .string "I have heard several rumors\n" + .string "about you…\p" + .string "In all honesty, what I have heard does\n" + .string "not seem attractive in any way…\p" + .string "The reason I’ve come to see you…\n" + .string "Well, there is but one reason…$" + +BattleFrontier_BattleTowerBattleRoom_Text_24268C: @ 824268C + .string "Let me see your talent in\n" + .string "its entirety…$" + +BattleFrontier_BattleTowerBattleRoom_Text_2426B4: @ 82426B4 + .string "ANABEL: Fufufu, nicely done…\p" + .string "Your FRONTIER PASS, please…\n" + .string "Your talent shall be recognized.$" + +BattleFrontier_BattleTowerBattleRoom_Text_24270E: @ 824270E + .string "The Ability Symbol was embossed on\n" + .string "the FRONTIER PASS!$" + +BattleFrontier_BattleTowerBattleRoom_Text_242744: @ 8242744 + .string "… … … … … …\p" + .string "You have confidence in your POKéMON\n" + .string "battling talent, don’t you?\p" + .string "I urge you to keep battling and\n" + .string "keep on winning.\p" + .string "I will be waiting for you.\n" + .string "Until the next time we meet…$" + +BattleFrontier_BattleTowerBattleRoom_Text_2427F9: @ 82427F9 + .string "ANABEL: You really did come back to\n" + .string "see me…\p" + .string "… … … … … …\p" + .string "You’ve won straight matches to see me…\n" + .string "I won’t have to hold back against you…\p" + .string "It’s been too long now…\p" + .string "Too long since I’ve been able to battle\n" + .string "without thinking about anything…$" + +BattleFrontier_BattleTowerBattleRoom_Text_2428E0: @ 82428E0 + .string "Let’s begin, shall we?$" + +BattleFrontier_BattleTowerBattleRoom_Text_2428F7: @ 82428F7 + .string "ANABEL: Fufu, congratulations…\n" + .string "Your FRONTIER PASS, please…$" + +BattleFrontier_BattleTowerBattleRoom_Text_242932: @ 8242932 + .string "The Ability Symbol took on\n" + .string "a golden shine!$" + +BattleFrontier_BattleTowerBattleRoom_Text_24295D: @ 824295D + .string "That was fun…\p" + .string "I have never had a POKéMON battle\n" + .string "so enjoyable before…\p" + .string "I wish I could battle with you again…$" + diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc new file mode 100644 index 000000000..f97d8ad0c --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc @@ -0,0 +1,11 @@ +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 + +BattleFrontier_BattleTowerBattleRoom2_MapEvents:: @ 853C054 + map_events BattleFrontier_BattleTowerBattleRoom2_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc new file mode 100644 index 000000000..d1b07451c --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc @@ -0,0 +1,540 @@ +BattleFrontier_BattleTowerBattleRoom2_MapScripts:: @ 8248EE8 + map_script 3, BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8 + map_script 4, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33 + map_script 2, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43 + .byte 0 + +BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8: @ 8248EF8 + compare VAR_0x40CE, 2 + call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F + compare VAR_0x40CE, 3 + call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F + end + +BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F + setvar VAR_0x8004, 14 + special sub_8161F74 + checkplayergender + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29 + setvar VAR_OBJ_GFX_ID_F, 0 + return + +BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29:: @ 8248F29 + setvar VAR_OBJ_GFX_ID_F, 89 + return + +BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F:: @ 8248F2F + special sub_813A76C + return + +BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33: @ 8248F33 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D + .2byte 0 + +BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D:: @ 8248F3D + hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2 + end + +BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43: @ 8248F43 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D + .2byte 0 + +BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D + setvar VAR_TEMP_0, 1 + applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249518 + applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_24951E + waitmovement 0 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4 + applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E + applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E + waitmovement 0 + applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249524 + applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524 + waitmovement 0 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 6 + setvar VAR_0x8006, 1 + special sub_81A1780 + goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 + +BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4 + setvar VAR_0x8004, 3 + special sub_8161F74 + addobject 1 + addobject 4 + applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249528 + applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_24952E + waitmovement 0 + compare VAR_0x40CE, 3 + goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249026 + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 0 + special sub_8161F74 + delay 15 + applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545 + waitmovement 0 + msgbox 0x2021fc4, 4 + waitmessage + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 1 + special sub_8161F74 + applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545 + waitmovement 0 + msgbox 0x2021fc4, 4 + waitmessage + goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249069 + +BattleFrontier_BattleTowerBattleRoom2_EventScript_249026:: @ 8249026 + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 0 + special sub_8161F74 + delay 15 + applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545 + waitmovement 0 + messageautoscroll 0x2021fc4 + waitmessage + delay 48 + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 1 + special sub_8161F74 + applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545 + waitmovement 0 + messageautoscroll 0x2021fc4 + waitmessage + delay 48 + +BattleFrontier_BattleTowerBattleRoom2_EventScript_249069:: @ 8249069 + call BattleFrontier_BattleTowerBattleRoom2_EventScript_24210E + switch VAR_RESULT + case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA + +BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E:: @ 824907E + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 4 + special sub_81A1780 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + special sub_8161F74 + setvar VAR_0x8004, 3 + special sub_813BF7C + goto BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8 + +BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA:: @ 82490AA + call BattleFrontier_BattleTowerBattleRoom2_EventScript_241EBA + setvar VAR_0x8004, 4 + special sub_8161F74 + switch VAR_RESULT + case 7, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF + applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249534 + applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249539 + waitmovement 0 + removeobject 1 + removeobject 4 + applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E + applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E + waitmovement 0 + applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249524 + applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524 + waitmovement 0 + compare VAR_0x40CE, 3 + goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249118 + msgbox BattleFrontier_BattleTowerBattleRoom2_Text_242217, 4 + goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249121 + +BattleFrontier_BattleTowerBattleRoom2_EventScript_249118:: @ 8249118 + messageautoscroll BattleFrontier_BattleTowerBattleRoom2_Text_242217 + waitmessage + delay 48 + +BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121 + special LoadPlayerParty + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 2 + special sub_81A1780 + compare VAR_0x40CE, 3 + call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249514 + playfanfare MUS_ME_ASA + waitfanfare + special HealPlayerParty + +BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special sub_81A1780 + call BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD + compare VAR_0x40CE, 3 + goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249283 + call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1 + multichoice 19, 4, 103, 1 + switch VAR_RESULT + case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249283 + case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2491E7 + case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249223 + case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_249251 + case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 + +BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1:: @ 82491B1 + multichoice 20, 6, 104, 1 + switch VAR_RESULT + case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249283 + case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249223 + case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249251 + case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 + +BattleFrontier_BattleTowerBattleRoom2_EventScript_2491E7:: @ 82491E7 + message BattleFrontier_BattleTowerBattleRoom2_Text_2423A3 + waitmessage + multichoicedefault 20, 8, 94, 1, 0 + switch VAR_RESULT + case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 + case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249219 + case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 + +BattleFrontier_BattleTowerBattleRoom2_EventScript_249219:: @ 8249219 + call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8B4 + goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 + +BattleFrontier_BattleTowerBattleRoom2_EventScript_249223:: @ 8249223 + msgbox BattleFrontier_BattleTowerBattleRoom2_Text_2423FC, 5 + switch VAR_RESULT + case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 + case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB + case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 + +BattleFrontier_BattleTowerBattleRoom2_EventScript_249251:: @ 8249251 + message BattleFrontier_BattleTowerBattleRoom2_Text_24244C + waitmessage + multichoicedefault 20, 8, 94, 1, 0 + switch VAR_RESULT + case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 + case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E + case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 + +BattleFrontier_BattleTowerBattleRoom2_EventScript_249283:: @ 8249283 + closemessage + clearflag FLAG_0x002 + applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249526 + applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249526 + waitmovement 0 + applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_249541 + applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_249541 + waitmovement 0 + goto BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4 + end + +BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF:: @ 82492AF + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 3 + special sub_81A1780 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + special sub_8161F74 + setvar VAR_0x8004, 3 + special sub_813BF7C + goto BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8 + +BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB + message BattleFrontier_BattleTowerBattleRoom2_Text_242426 + waitmessage + setvar VAR_0x8004, 6 + setvar VAR_0x8005, 2 + special sub_8161F74 + playse SE_SAVE + waitse + fadescreen 1 + setvar VAR_0x8004, 4 + special sub_81A1780 + end + +BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD:: @ 82492FD + compare VAR_0x40CE, 3 + goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E + copyvar VAR_TEMP_F, VAR_RESULT + switch VAR_TEMP_F + case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249354 + case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_24935B + case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_249362 + case 4, BattleFrontier_BattleTowerBattleRoom2_EventScript_249369 + case 5, BattleFrontier_BattleTowerBattleRoom2_EventScript_249370 + case 6, BattleFrontier_BattleTowerBattleRoom2_EventScript_249377 + +BattleFrontier_BattleTowerBattleRoom2_EventScript_249354:: @ 8249354 + message BattleFrontier_BattleTowerBattleRoom2_Text_249547 + waitmessage + return + +BattleFrontier_BattleTowerBattleRoom2_EventScript_24935B:: @ 824935B + message BattleFrontier_BattleTowerBattleRoom2_Text_249578 + waitmessage + return + +BattleFrontier_BattleTowerBattleRoom2_EventScript_249362:: @ 8249362 + message BattleFrontier_BattleTowerBattleRoom2_Text_2495A9 + waitmessage + return + +BattleFrontier_BattleTowerBattleRoom2_EventScript_249369:: @ 8249369 + message BattleFrontier_BattleTowerBattleRoom2_Text_2495DA + waitmessage + return + +BattleFrontier_BattleTowerBattleRoom2_EventScript_249370:: @ 8249370 + message BattleFrontier_BattleTowerBattleRoom2_Text_24960B + waitmessage + return + +BattleFrontier_BattleTowerBattleRoom2_EventScript_249377:: @ 8249377 + message BattleFrontier_BattleTowerBattleRoom2_Text_24963C + waitmessage + return + +BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E:: @ 824937E + copyvar VAR_TEMP_F, VAR_RESULT + switch VAR_TEMP_F + case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493CA + case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493D6 + case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493E2 + case 4, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493EE + case 5, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493FA + case 6, BattleFrontier_BattleTowerBattleRoom2_EventScript_249406 + +BattleFrontier_BattleTowerBattleRoom2_EventScript_2493CA:: @ 82493CA + message BattleFrontier_BattleTowerBattleRoom2_Text_249547 + waitmessage + goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417 + end + +BattleFrontier_BattleTowerBattleRoom2_EventScript_2493D6:: @ 82493D6 + message BattleFrontier_BattleTowerBattleRoom2_Text_249578 + waitmessage + goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417 + end + +BattleFrontier_BattleTowerBattleRoom2_EventScript_2493E2:: @ 82493E2 + message BattleFrontier_BattleTowerBattleRoom2_Text_2495A9 + waitmessage + goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417 + end + +BattleFrontier_BattleTowerBattleRoom2_EventScript_2493EE:: @ 82493EE + message BattleFrontier_BattleTowerBattleRoom2_Text_2495DA + waitmessage + goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417 + end + +BattleFrontier_BattleTowerBattleRoom2_EventScript_2493FA:: @ 82493FA + message BattleFrontier_BattleTowerBattleRoom2_Text_24960B + waitmessage + goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417 + end + +BattleFrontier_BattleTowerBattleRoom2_EventScript_249406:: @ 8249406 + message BattleFrontier_BattleTowerBattleRoom2_Text_24963C + waitmessage + goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417 + end + +BattleFrontier_BattleTowerBattleRoom2_EventScript_249412:: @ 8249412 + waitmessage + delay 48 + return + +BattleFrontier_BattleTowerBattleRoom2_EventScript_249417:: @ 8249417 + checkflag FLAG_0x002 + goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249457 + multichoice 19, 6, 105, 1 + switch VAR_RESULT + case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249483 + case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8 + case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD + case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD + end + +BattleFrontier_BattleTowerBattleRoom2_EventScript_249457:: @ 8249457 + multichoice 20, 8, 106, 1 + switch VAR_RESULT + case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249483 + case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD + case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD + end + +BattleFrontier_BattleTowerBattleRoom2_EventScript_249483:: @ 8249483 + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 0 + message gText_LinkStandby3 + waitmessage + special sub_813B568 + waitstate + compare VAR_RESULT, 0 + goto_if 5, BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E + goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249412 + end + +BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8:: @ 82494A8 + message BattleFrontier_BattleTowerBattleRoom2_Text_2423A3 + waitmessage + multichoicedefault 20, 8, 94, 1, 0 + switch VAR_RESULT + case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 + case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 + call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8B4 + setflag FLAG_0x002 + goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 + end + +BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD:: @ 82494DD + message BattleFrontier_BattleTowerBattleRoom2_Text_24244C + waitmessage + multichoicedefault 20, 8, 94, 1, 0 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA + goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 + end + +BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA:: @ 82494FA + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 0 + message gText_LinkStandby3 + waitmessage + special sub_813B568 + waitstate + goto BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E + end + +BattleFrontier_BattleTowerBattleRoom2_EventScript_249514:: @ 8249514 + special sub_813B534 + return + +BattleFrontier_BattleTowerBattleRoom2_Movement_249518: @ 8249518 + walk_up + walk_up + walk_up + walk_up + face_right + step_end + +BattleFrontier_BattleTowerBattleRoom2_Movement_24951E: @ 824951E + walk_left + walk_up + walk_up + walk_up + face_right + step_end + +BattleFrontier_BattleTowerBattleRoom2_Movement_249524: @ 8249524 + face_left + step_end + +BattleFrontier_BattleTowerBattleRoom2_Movement_249526: @ 8249526 + walk_in_place_fastest_right + step_end + +BattleFrontier_BattleTowerBattleRoom2_Movement_249528: @ 8249528 + walk_down + walk_down + walk_down + walk_down + face_left + step_end + +BattleFrontier_BattleTowerBattleRoom2_Movement_24952E: @ 824952E + walk_right + walk_down + walk_down + walk_down + face_left + step_end + +BattleFrontier_BattleTowerBattleRoom2_Movement_249534: @ 8249534 + walk_up + walk_up + walk_up + set_invisible + step_end + +BattleFrontier_BattleTowerBattleRoom2_Movement_249539: @ 8249539 + walk_up + walk_up + walk_up + walk_up + step_end + +BattleFrontier_BattleTowerBattleRoom2_Movement_24953E: @ 824953E + walk_right + walk_right + step_end + +BattleFrontier_BattleTowerBattleRoom2_Movement_249541: @ 8249541 + walk_left + walk_left + walk_in_place_fastest_right + step_end + +BattleFrontier_BattleTowerBattleRoom2_Movement_249545: @ 8249545 + walk_in_place_left + step_end + +BattleFrontier_BattleTowerBattleRoom2_Text_249547: @ 8249547 + .string "The 2nd set of opponents is next.\n" + .string "Are you ready?$" + +BattleFrontier_BattleTowerBattleRoom2_Text_249578: @ 8249578 + .string "The 3rd set of opponents is next.\n" + .string "Are you ready?$" + +BattleFrontier_BattleTowerBattleRoom2_Text_2495A9: @ 82495A9 + .string "The 4th set of opponents is next.\n" + .string "Are you ready?$" + +BattleFrontier_BattleTowerBattleRoom2_Text_2495DA: @ 82495DA + .string "The 5th set of opponents is next.\n" + .string "Are you ready?$" + +BattleFrontier_BattleTowerBattleRoom2_Text_24960B: @ 824960B + .string "The 6th set of opponents is next.\n" + .string "Are you ready?$" + +BattleFrontier_BattleTowerBattleRoom2_Text_24963C: @ 824963C + .string "The 7th set of opponents is next.\n" + .string "Are you ready?$" + +BattleFrontier_BattleTowerBattleRoom2_Text_24966D: @ 824966D + .string "The 2nd set of opponents is next.\n" + .string "Do your best!$" + +BattleFrontier_BattleTowerBattleRoom2_Text_24969D: @ 824969D + .string "The 3rd set of opponents is next.\n" + .string "Do your best!$" + +BattleFrontier_BattleTowerBattleRoom2_Text_2496CD: @ 82496CD + .string "The 4th set of opponents is next.\n" + .string "Do your best!$" + +BattleFrontier_BattleTowerBattleRoom2_Text_2496FD: @ 82496FD + .string "The 5th set of opponents is next.\n" + .string "Do your best!$" + +BattleFrontier_BattleTowerBattleRoom2_Text_24972D: @ 824972D + .string "The 6th set of opponents is next.\n" + .string "Do your best!$" + +BattleFrontier_BattleTowerBattleRoom2_Text_24975D: @ 824975D + .string "The 7th set of opponents is next.\n" + .string "Do your best!$" + +gText_LinkStandby3:: @ 824978D + .string "Link standby…$" + +gText_YourPartnerHasRetired:: @ 824979B + .string "Your partner has retired.\p" + .string "Your BATTLE ROOM challenge\n" + .string "will be canceled.$" diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/events.inc b/data/maps/BattleFrontier_BattleTowerCorridor/events.inc new file mode 100644 index 000000000..23f3377f3 --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerCorridor/events.inc @@ -0,0 +1,6 @@ +BattleFrontier_BattleTowerCorridor_EventObjects: @ 853B7A4 + 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/BattleFrontier_BattleTowerCorridor/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc new file mode 100644 index 000000000..9ff6bbc59 --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc @@ -0,0 +1,59 @@ +BattleFrontier_BattleTowerCorridor_MapScripts:: @ 8241AAA + map_script 1, BattleFrontier_BattleTowerCorridor_MapScript1_241AB5 + map_script 2, BattleFrontier_BattleTowerCorridor_MapScript2_241AE6 + .byte 0 + +BattleFrontier_BattleTowerCorridor_MapScript1_241AB5: @ 8241AB5 + compare VAR_0x8006, 1 + goto_eq BattleFrontier_BattleTowerCorridor_EventScript_241AD3 + setmetatile 12, 0, 519, 0 + setmetatile 12, 1, 527, 0 + end + +BattleFrontier_BattleTowerCorridor_EventScript_241AD3:: @ 8241AD3 + setmetatile 15, 0, 519, 0 + setmetatile 15, 1, 527, 0 + end + +BattleFrontier_BattleTowerCorridor_MapScript2_241AE6: @ 8241AE6 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerCorridor_EventScript_241AF0 + .2byte 0 + +BattleFrontier_BattleTowerCorridor_EventScript_241AF0:: @ 8241AF0 + setvar VAR_TEMP_0, 1 + compare VAR_0x8006, 1 + goto_eq BattleFrontier_BattleTowerCorridor_EventScript_241B16 + applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_241B3A + applymovement 255, BattleFrontier_BattleTowerCorridor_Movement_241B39 + waitmovement 0 + goto BattleFrontier_BattleTowerCorridor_EventScript_241B27 + +BattleFrontier_BattleTowerCorridor_EventScript_241B16:: @ 8241B16 + applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_241B37 + applymovement 255, BattleFrontier_BattleTowerCorridor_Movement_241B36 + waitmovement 0 + +BattleFrontier_BattleTowerCorridor_EventScript_241B27:: @ 8241B27 + setvar VAR_TEMP_0, 0 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 + waitstate + end + +BattleFrontier_BattleTowerCorridor_Movement_241B36: @ 8241B36 + walk_right + +BattleFrontier_BattleTowerCorridor_Movement_241B37: @ 8241B37 + walk_right + walk_right + +BattleFrontier_BattleTowerCorridor_Movement_241B39: @ 8241B39 + walk_right + +BattleFrontier_BattleTowerCorridor_Movement_241B3A: @ 8241B3A + walk_right + walk_right + walk_right + walk_up + set_invisible + step_end + diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc new file mode 100644 index 000000000..9dce5da52 --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc @@ -0,0 +1,9 @@ +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 + +BattleFrontier_BattleTowerCorridor2_MapEvents:: @ 853BFB0 + map_events BattleFrontier_BattleTowerCorridor2_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc new file mode 100644 index 000000000..36cf93ada --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc @@ -0,0 +1,172 @@ +BattleFrontier_BattleTowerCorridor2_MapScripts:: @ 8248D4A + map_script 3, BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A + map_script 4, BattleFrontier_BattleTowerCorridor2_MapScript2_248D95 + map_script 2, BattleFrontier_BattleTowerCorridor2_MapScript2_248DB2 + .byte 0 + +BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A: @ 8248D5A + compare VAR_0x40CE, 2 + call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248D71 + compare VAR_0x40CE, 3 + call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248D91 + end + +BattleFrontier_BattleTowerCorridor2_EventScript_248D71:: @ 8248D71 + setvar VAR_0x8004, 14 + special sub_8161F74 + checkplayergender + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D8B + setvar VAR_OBJ_GFX_ID_F, 0 + return + +BattleFrontier_BattleTowerCorridor2_EventScript_248D8B:: @ 8248D8B + setvar VAR_OBJ_GFX_ID_F, 89 + return + +BattleFrontier_BattleTowerCorridor2_EventScript_248D91:: @ 8248D91 + special sub_813A76C + return + +BattleFrontier_BattleTowerCorridor2_MapScript2_248D95: @ 8248D95 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerCorridor2_EventScript_248D9F + .2byte 0 + +BattleFrontier_BattleTowerCorridor2_EventScript_248D9F:: @ 8248D9F + 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 + +BattleFrontier_BattleTowerCorridor2_MapScript2_248DB2: @ 8248DB2 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerCorridor2_EventScript_248DBC + .2byte 0 + +BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC + lockall + setflag FLAG_SPECIAL_FLAG_0x4002 + setvar VAR_0x8004, 14 + setvar VAR_0x8005, 1 + opendoor 1, 1 + waitdooranim + clearflag FLAG_SPECIAL_FLAG_0x4002 + 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 + setflag FLAG_SPECIAL_FLAG_0x4002 + setvar VAR_0x8004, 14 + setvar VAR_0x8005, 1 + closedoor 1, 1 + waitdooranim + clearflag FLAG_SPECIAL_FLAG_0x4002 + applymovement 1, BattleFrontier_BattleTowerCorridor2_Movement_248EBC + applymovement 4, BattleFrontier_BattleTowerCorridor2_Movement_248EC4 + applymovement 3, BattleFrontier_BattleTowerCorridor2_Movement_248ECC + applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_248ED5 + waitmovement 0 + delay 40 + applymovement 3, BattleFrontier_BattleTowerCorridor2_Movement_2725A6 + applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_2725A6 + waitmovement 0 + opendoor 7, 1 + waitdooranim + applymovement 3, BattleFrontier_BattleTowerCorridor2_Movement_248EE3 + applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_248EE3 + applymovement 1, BattleFrontier_BattleTowerCorridor2_Movement_248EDE + applymovement 4, BattleFrontier_BattleTowerCorridor2_Movement_248EDE + waitmovement 0 + closedoor 7, 1 + waitdooranim + delay 30 + setvar VAR_TEMP_1, 1 + call BattleFrontier_BattleTowerCorridor2_EventScript_248E71 + releaseall + end + +BattleFrontier_BattleTowerCorridor2_EventScript_248E71:: @ 8248E71 + compare VAR_0x40CE, 0 + call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248E9E + compare VAR_0x40CE, 1 + call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248E9E + compare VAR_0x40CE, 2 + call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248EA8 + compare VAR_0x40CE, 3 + call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248EB2 + return + +BattleFrontier_BattleTowerCorridor2_EventScript_248E9E:: @ 8248E9E + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 + waitstate + return + +BattleFrontier_BattleTowerCorridor2_EventScript_248EA8:: @ 8248EA8 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2, 255, 4, 5 + waitstate + return + +BattleFrontier_BattleTowerCorridor2_EventScript_248EB2:: @ 8248EB2 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2, 255, 4, 5 + waitstate + return + +BattleFrontier_BattleTowerCorridor2_Movement_248EBC: @ 8248EBC + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + step_end + +BattleFrontier_BattleTowerCorridor2_Movement_248EC4: @ 8248EC4 + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + step_end + +BattleFrontier_BattleTowerCorridor2_Movement_248ECC: @ 8248ECC + 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 + 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 + delay_16 + walk_up + walk_up + set_invisible + step_end + +BattleFrontier_BattleTowerCorridor2_Movement_248EE3: @ 8248EE3 + walk_up + set_invisible + step_end + +BattleFrontier_BattleTowerCorridor2_Movement_248EE6: @ 8248EE6 + walk_down + step_end + diff --git a/data/maps/BattleFrontier_BattleTowerElevator/events.inc b/data/maps/BattleFrontier_BattleTowerElevator/events.inc new file mode 100644 index 000000000..321fc90e3 --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerElevator/events.inc @@ -0,0 +1,6 @@ +BattleFrontier_BattleTowerElevator_EventObjects: @ 853B778 + 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/BattleFrontier_BattleTowerElevator/scripts.inc b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc new file mode 100644 index 000000000..248c1f9ca --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc @@ -0,0 +1,91 @@ +BattleFrontier_BattleTowerElevator_MapScripts:: @ 82419DB + map_script 2, BattleFrontier_BattleTowerElevator_MapScript2_2419E6 + map_script 4, BattleFrontier_BattleTowerElevator_MapScript2_241A96 + .byte 0 + +BattleFrontier_BattleTowerElevator_MapScript2_2419E6: @ 82419E6 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerElevator_EventScript_2419F0 + .2byte 0 + +BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0 + setvar VAR_TEMP_0, 1 + applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A86 + applymovement 255, BattleFrontier_BattleTowerElevator_Movement_241A8A + waitmovement 0 + special sub_813A080 + waitse + special sub_8139A78 + waitstate + delay 48 + applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A8E + applymovement 255, BattleFrontier_BattleTowerElevator_Movement_241A92 + waitmovement 0 + call BattleFrontier_BattleTowerElevator_EventScript_241A28 + end + +BattleFrontier_BattleTowerElevator_EventScript_241A28:: @ 8241A28 + compare VAR_0x40CE, 0 + call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A55 + compare VAR_0x40CE, 1 + call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A55 + compare VAR_0x40CE, 2 + call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A5F + compare VAR_0x40CE, 3 + call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A72 + return + +BattleFrontier_BattleTowerElevator_EventScript_241A55:: @ 8241A55 + 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 MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2, 255, 7, 2 + waitstate + return + +BattleFrontier_BattleTowerElevator_EventScript_241A72:: @ 8241A72 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2, 255, 7, 2 + waitstate + return + +BattleFrontier_BattleTowerElevator_EventScript_241A7C:: @ 8241A7C + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 1 + waitstate + return + +BattleFrontier_BattleTowerElevator_Movement_241A86: @ 8241A86 + walk_up + walk_right + face_down + step_end + +BattleFrontier_BattleTowerElevator_Movement_241A8A: @ 8241A8A + walk_up + walk_up + face_down + step_end + +BattleFrontier_BattleTowerElevator_Movement_241A8E: @ 8241A8E + walk_down + walk_down + set_invisible + step_end + +BattleFrontier_BattleTowerElevator_Movement_241A92: @ 8241A92 + walk_right + walk_down + walk_down + step_end + +BattleFrontier_BattleTowerElevator_MapScript2_241A96: @ 8241A96 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerElevator_EventScript_241AA0 + .2byte 0 + +BattleFrontier_BattleTowerElevator_EventScript_241AA0:: @ 8241AA0 + setvar VAR_TEMP_1, 1 + turnobject 255, 2 + end + diff --git a/data/maps/BattleFrontier_BattleTowerLobby/events.inc b/data/maps/BattleFrontier_BattleTowerLobby/events.inc new file mode 100644 index 000000000..86e159b63 --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerLobby/events.inc @@ -0,0 +1,26 @@ +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 + +BattleFrontier_BattleTowerLobby_MapWarps: @ 853B710 + 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 + 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 + +BattleFrontier_BattleTowerLobby_MapEvents:: @ 853B764 + map_events BattleFrontier_BattleTowerLobby_EventObjects, BattleFrontier_BattleTowerLobby_MapWarps, 0x0, BattleFrontier_BattleTowerLobby_MapBGEvents + diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc new file mode 100644 index 000000000..478d61656 --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -0,0 +1,1589 @@ +BattleFrontier_BattleTowerLobby_MapScripts:: @ 823E67B + map_script 5, BattleFrontier_BattleTowerLobby_MapScript1_23E690 + map_script 3, BattleFrontier_BattleTowerLobby_MapScript1_23E694 + map_script 2, BattleFrontier_BattleTowerLobby_MapScript2_23E6DD + map_script 4, BattleFrontier_BattleTowerLobby_MapScript2_23E6C9 + .byte 0 + +BattleFrontier_BattleTowerLobby_MapScript1_23E690: @ 823E690 + special sub_81653CC + end + +BattleFrontier_BattleTowerLobby_MapScript1_23E694: @ 823E694 + call BattleFrontier_BattleTowerLobby_EventScript_28CC84 + setvar VAR_0x8004, 10 + special sub_81A085C + compare VAR_0x8004, 0 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E6B5 + checkflag FLAG_0x934 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E6C1 + +BattleFrontier_BattleTowerLobby_EventScript_23E6B5:: @ 823E6B5 + clearflag FLAG_0x2BD + setvar VAR_0x8004, 23 + special sub_81A085C + +BattleFrontier_BattleTowerLobby_EventScript_23E6C0:: @ 823E6C0 + end + +BattleFrontier_BattleTowerLobby_EventScript_23E6C1:: @ 823E6C1 + setflag FLAG_0x2BD + goto BattleFrontier_BattleTowerLobby_EventScript_23E6C0 + +BattleFrontier_BattleTowerLobby_MapScript2_23E6C9: @ 823E6C9 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerLobby_EventScript_23E6D3 + .2byte 0 + +BattleFrontier_BattleTowerLobby_EventScript_23E6D3:: @ 823E6D3 + setvar VAR_TEMP_1, 1 + turnobject 255, 2 + end + +BattleFrontier_BattleTowerLobby_MapScript2_23E6DD: @ 823E6DD + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E707 + map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattleTowerLobby_EventScript_23E710 + map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattleTowerLobby_EventScript_23E8EE + map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattleTowerLobby_EventScript_23E758 + map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattleTowerLobby_EventScript_23E7F2 + .2byte 0 + +BattleFrontier_BattleTowerLobby_EventScript_23E707:: @ 823E707 + setvar VAR_0x8004, 0 + special sub_81A1780 + end + +BattleFrontier_BattleTowerLobby_EventScript_23E710:: @ 823E710 + lock + faceplayer + msgbox BattleFrontier_BattleTowerLobby_Text_23F583, 4 + closemessage + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 0 + special sub_8161F74 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + setvar VAR_0x8006, 0 + special sub_8161F74 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_TEMP_0, 255 + release + end + +BattleFrontier_BattleTowerLobby_EventScript_23E758:: @ 823E758 + lock + faceplayer + setvar VAR_0x8004, 10 + special sub_81A1780 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E778 + message BattleFrontier_BattleTowerLobby_Text_23F60D + waitmessage + goto BattleFrontier_BattleTowerLobby_EventScript_23E780 + +BattleFrontier_BattleTowerLobby_EventScript_23E778:: @ 823E778 + msgbox BattleFrontier_BattleTowerLobby_Text_241486, 4 + +BattleFrontier_BattleTowerLobby_EventScript_23E780:: @ 823E780 + setvar VAR_0x8004, 5 + special sub_8161F74 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E7A5 + message BattleFrontier_BattleTowerLobby_Text_23F844 + waitmessage + playfanfare MUS_FANFA4 + waitfanfare + msgbox BattleFrontier_BattleTowerLobby_Text_23F89F, 4 + +BattleFrontier_BattleTowerLobby_EventScript_23E7A5:: @ 823E7A5 + msgbox BattleFrontier_BattleTowerLobby_Text_2414D4, 4 + setvar VAR_0x8004, 11 + special sub_81A1780 + msgbox BattleFrontier_BattleTowerLobby_Text_241520, 9 + call BattleFrontier_BattleTowerLobby_EventScript_23E84D + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + special sub_8161F74 + compare VAR_RESULT, 49 + goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E7E2 + msgbox BattleFrontier_BattleTowerLobby_Text_23F79D, 4 + +BattleFrontier_BattleTowerLobby_EventScript_23E7E2:: @ 823E7E2 + msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, 4 + closemessage + setvar VAR_TEMP_0, 255 + release + end + +BattleFrontier_BattleTowerLobby_EventScript_23E7F2:: @ 823E7F2 + compare VAR_0x40CE, 2 + goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E81E + checkflag FLAG_0x152 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E81E + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + special sub_8161F74 + compare VAR_RESULT, 0 + goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E830 + +BattleFrontier_BattleTowerLobby_EventScript_23E81E:: @ 823E81E + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + setvar VAR_0x8006, 0 + special sub_8161F74 + +BattleFrontier_BattleTowerLobby_EventScript_23E830:: @ 823E830 + lock + faceplayer + message BattleFrontier_BattleTowerLobby_Text_23F6F7 + waitmessage + call BattleFrontier_BattleTowerLobby_EventScript_23E84D + msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, 4 + closemessage + setvar VAR_TEMP_0, 255 + release + end + +BattleFrontier_BattleTowerLobby_EventScript_23E84D:: @ 823E84D + message BattleFrontier_BattleTowerLobby_Text_23F70F + waitmessage + setvar VAR_0x8004, 8 + special sub_81A1780 + special LoadPlayerParty + special HealPlayerParty + setvar VAR_0x8004, 6 + setvar VAR_0x8005, 0 + special sub_8161F74 + playse SE_SAVE + waitse + call BattleFrontier_BattleTowerLobby_EventScript_23E8E0 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E8DF + message BattleFrontier_BattleTowerLobby_Text_23FE3C + waitmessage + multichoicedefault 20, 8, 94, 1, 0 + switch VAR_RESULT + case 1, BattleFrontier_BattleTowerLobby_EventScript_23E8DF + case 0, BattleFrontier_BattleTowerLobby_EventScript_23E8B4 + case 127, BattleFrontier_BattleTowerLobby_EventScript_23E8DF + +BattleFrontier_BattleArenaBattleRoom_EventScript_23E8B4:: @ 823E8B4 +BattleFrontier_BattleArenaLobby_EventScript_23E8B4:: @ 823E8B4 +BattleFrontier_BattleDomeLobby_EventScript_23E8B4:: @ 823E8B4 +BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8B4:: @ 823E8B4 +BattleFrontier_BattleFactoryLobby_EventScript_23E8B4:: @ 823E8B4 +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8B4:: @ 823E8B4 +BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8B4:: @ 823E8B4 +BattleFrontier_BattlePalaceLobby_EventScript_23E8B4:: @ 823E8B4 +BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8B4:: @ 823E8B4 +BattleFrontier_BattleTowerBattleRoom_EventScript_23E8B4:: @ 823E8B4 +BattleFrontier_BattleTowerLobby_EventScript_23E8B4:: @ 823E8B4 + setvar VAR_0x8004, 19 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E8D7 + playse SE_SAVE + msgbox BattleFrontier_BattleTowerLobby_Text_2423CD, 4 + goto BattleFrontier_BattleTowerLobby_EventScript_23E8DF + +BattleFrontier_BattleTowerLobby_EventScript_23E8D7:: @ 823E8D7 + msgbox gText_BattleRecordCouldntBeSaved, 4 + +BattleFrontier_BattleTowerLobby_EventScript_23E8DF:: @ 823E8DF + return + +BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0:: @ 823E8E0 +BattleFrontier_BattleArenaLobby_EventScript_23E8E0:: @ 823E8E0 +BattleFrontier_BattleDomeLobby_EventScript_23E8E0:: @ 823E8E0 +BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8E0:: @ 823E8E0 +BattleFrontier_BattleFactoryLobby_EventScript_23E8E0:: @ 823E8E0 +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0:: @ 823E8E0 +BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0:: @ 823E8E0 +BattleFrontier_BattlePalaceLobby_EventScript_23E8E0:: @ 823E8E0 +BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0:: @ 823E8E0 +BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0:: @ 823E8E0 +BattleFrontier_BattleTowerLobby_EventScript_23E8E0:: @ 823E8E0 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 6 + special sub_81A1780 + return + +BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE + lock + faceplayer + compare VAR_0x40CE, 0 + call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23E930 + message BattleFrontier_BattleTowerLobby_Text_23F737 + waitmessage + message BattleFrontier_BattleTowerLobby_Text_23F754 + waitmessage + setvar VAR_0x8004, 6 + setvar VAR_0x8005, 1 + special sub_8161F74 + playse SE_SAVE + waitse + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 0 + special sub_81A1780 + goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 + end + +BattleFrontier_BattleTowerLobby_EventScript_23E930:: @ 823E930 + setvar VAR_0x40BC, 1 + return + +BattleFrontier_BattleTowerLobby_EventScript_23E936:: @ 823E936 + lock + faceplayer + setvar VAR_FRONTIER_FACILITY, 0 + special SavePlayerParty + msgbox BattleFrontier_BattleTowerLobby_Text_240537, 4 + +BattleFrontier_BattleTowerLobby_EventScript_23E948:: @ 823E948 + message BattleFrontier_BattleTowerLobby_Text_2405B3 + waitmessage + multichoice 17, 6, 23, 0 + switch VAR_RESULT + case 0, BattleFrontier_BattleTowerLobby_EventScript_23E984 + case 1, BattleFrontier_BattleTowerLobby_EventScript_23EA91 + case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + +BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984 + setvar VAR_0x40CE, 0 + message BattleFrontier_BattleTowerLobby_Text_23FD3B + waitmessage + multichoice 17, 6, 24, 0 + switch VAR_RESULT + case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + setvar VAR_0x8004, 15 + special sub_81A1780 + compare VAR_0x8004, 1 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + copyvar VAR_0x8006, VAR_RESULT + special sub_81A1780 + msgbox BattleFrontier_BattleTowerLobby_Text_2407A6, 4 + fadescreen 1 + call BattleFrontier_BattleTowerLobby_EventScript_23F2B7 + copyvar VAR_0x8004, VAR_RESULT + setvar VAR_0x8005, 3 + special sub_80F9490 + waitstate + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5 + switch VAR_RESULT + case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + case 1, BattleFrontier_BattleTowerLobby_EventScript_23EA2A + case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + +BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 4 + special sub_81A1780 + setvar VAR_TEMP_0, 0 + setvar VAR_0x8004, 0 + special sub_8161F74 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + setvar VAR_0x8006, 1 + special sub_8161F74 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 0 + special sub_81A1780 + special LoadPlayerParty + closemessage + delay 2 + call BattleFrontier_BattleTowerLobby_EventScript_27134F + setvar VAR_TEMP_0, 255 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 + incrementgamestat 30 + setvar VAR_0x40BC, 1 + goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 + end + +BattleFrontier_BattleTowerLobby_EventScript_23EA91:: @ 823EA91 + msgbox BattleFrontier_BattleTowerLobby_Text_2405EC, 4 + goto BattleFrontier_BattleTowerLobby_EventScript_23E948 + end + +BattleFrontier_BattleTowerLobby_EventScript_23EA9F:: @ 823EA9F + lock + faceplayer + setvar VAR_FRONTIER_FACILITY, 0 + special SavePlayerParty + msgbox BattleFrontier_BattleTowerLobby_Text_2407E2, 4 + +BattleFrontier_BattleTowerLobby_EventScript_23EAB1:: @ 823EAB1 + message BattleFrontier_BattleTowerLobby_Text_24085E + waitmessage + multichoice 17, 6, 23, 0 + switch VAR_RESULT + case 0, BattleFrontier_BattleTowerLobby_EventScript_23EAED + case 1, BattleFrontier_BattleTowerLobby_EventScript_23EBFA + case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + +BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED + setvar VAR_0x40CE, 1 + message BattleFrontier_BattleTowerLobby_Text_23FD3B + waitmessage + multichoice 17, 6, 24, 0 + switch VAR_RESULT + case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + setvar VAR_0x8004, 15 + special sub_81A1780 + compare VAR_0x8004, 1 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + copyvar VAR_0x8006, VAR_RESULT + special sub_81A1780 + msgbox BattleFrontier_BattleTowerLobby_Text_240A50, 4 + fadescreen 1 + call BattleFrontier_BattleTowerLobby_EventScript_23F2B7 + copyvar VAR_0x8004, VAR_RESULT + setvar VAR_0x8005, 4 + special sub_80F9490 + waitstate + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5 + switch VAR_RESULT + case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + case 1, BattleFrontier_BattleTowerLobby_EventScript_23EB93 + case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + +BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 4 + special sub_81A1780 + setvar VAR_TEMP_0, 0 + setvar VAR_0x8004, 0 + special sub_8161F74 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + setvar VAR_0x8006, 1 + special sub_8161F74 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 0 + special sub_81A1780 + special LoadPlayerParty + closemessage + delay 2 + call BattleFrontier_BattleTowerLobby_EventScript_27134F + setvar VAR_TEMP_0, 255 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 + incrementgamestat 30 + setvar VAR_0x40BC, 0 + goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 + end + +BattleFrontier_BattleTowerLobby_EventScript_23EBFA:: @ 823EBFA + msgbox BattleFrontier_BattleTowerLobby_Text_240897, 4 + goto BattleFrontier_BattleTowerLobby_EventScript_23EAB1 + end + +BattleFrontier_BattleTowerLobby_EventScript_23EC08:: @ 823EC08 + lock + faceplayer + setvar VAR_FRONTIER_FACILITY, 0 + clearflag FLAG_0x152 + special SavePlayerParty + msgbox BattleFrontier_BattleTowerLobby_Text_240A8B, 4 + +BattleFrontier_BattleTowerLobby_EventScript_23EC1D:: @ 823EC1D + message BattleFrontier_BattleTowerLobby_Text_240B06 + waitmessage + multichoice 17, 6, 23, 0 + switch VAR_RESULT + case 0, BattleFrontier_BattleTowerLobby_EventScript_23EC59 + case 1, BattleFrontier_BattleTowerLobby_EventScript_23ED66 + case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + +BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59 + setvar VAR_0x40CE, 2 + message BattleFrontier_BattleTowerLobby_Text_23FD3B + waitmessage + multichoice 17, 6, 24, 0 + switch VAR_RESULT + case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + setvar VAR_0x8004, 15 + special sub_81A1780 + compare VAR_0x8004, 1 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + copyvar VAR_0x8006, VAR_RESULT + special sub_81A1780 + msgbox BattleFrontier_BattleTowerLobby_Text_240DDB, 4 + fadescreen 1 + call BattleFrontier_BattleTowerLobby_EventScript_23F2B7 + copyvar VAR_0x8004, VAR_RESULT + setvar VAR_0x8005, 2 + special sub_80F9490 + waitstate + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5 + switch VAR_RESULT + case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + case 1, BattleFrontier_BattleTowerLobby_EventScript_23ECFF + case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + +BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 4 + special sub_81A1780 + setvar VAR_TEMP_0, 0 + setvar VAR_0x8004, 0 + special sub_8161F74 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + setvar VAR_0x8006, 1 + special sub_8161F74 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 0 + special sub_81A1780 + special LoadPlayerParty + closemessage + delay 2 + call BattleFrontier_BattleTowerLobby_EventScript_27134F + setvar VAR_TEMP_0, 255 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 + incrementgamestat 30 + setvar VAR_0x40BC, 0 + goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 + end + +BattleFrontier_BattleTowerLobby_EventScript_23ED66:: @ 823ED66 + msgbox BattleFrontier_BattleTowerLobby_Text_240B3E, 4 + goto BattleFrontier_BattleTowerLobby_EventScript_23EC1D + end + +BattleFrontier_BattleTowerLobby_EventScript_23ED74:: @ 823ED74 + lock + faceplayer + setvar VAR_FRONTIER_FACILITY, 0 + special SavePlayerParty + msgbox BattleFrontier_BattleTowerLobby_Text_240E15, 4 + +BattleFrontier_BattleTowerLobby_EventScript_23ED86:: @ 823ED86 + message BattleFrontier_BattleTowerLobby_Text_240E95 + waitmessage + multichoice 17, 6, 23, 0 + switch VAR_RESULT + case 0, BattleFrontier_BattleTowerLobby_EventScript_23EDC2 + case 1, BattleFrontier_BattleTowerLobby_EventScript_23F3DA + case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + +BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2 + setvar VAR_0x40CE, 3 + message BattleFrontier_BattleTowerLobby_Text_23FD3B + waitmessage + multichoice 17, 6, 24, 0 + switch VAR_RESULT + case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + setvar VAR_0x8004, 15 + special sub_81A1780 + compare VAR_0x8004, 1 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + copyvar VAR_0x8006, VAR_RESULT + special sub_81A1780 + msgbox BattleFrontier_BattleTowerLobby_Text_24115E, 4 + fadescreen 1 + call BattleFrontier_BattleTowerLobby_EventScript_23F2B7 + copyvar VAR_0x8004, VAR_RESULT + setvar VAR_0x8005, 2 + special sub_80F9490 + waitstate + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5 + switch VAR_RESULT + case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + case 1, BattleFrontier_BattleTowerLobby_EventScript_23EE68 + case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + +BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 4 + special sub_81A1780 + setvar VAR_TEMP_0, 0 + setvar VAR_0x8004, 0 + special sub_8161F74 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + setvar VAR_0x8006, 1 + special sub_8161F74 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 0 + special sub_81A1780 + special LoadPlayerParty + closemessage + delay 2 + setvar VAR_0x8004, 6 + setvar VAR_0x8005, 0 + special sub_8161F74 + call BattleFrontier_BattleTowerLobby_EventScript_27134F + setvar VAR_TEMP_0, 255 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 + incrementgamestat 30 + specialvar VAR_RESULT, sub_80093CC + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3E8 + goto BattleFrontier_BattleTowerLobby_EventScript_23F2C5 + end + +BattleFrontier_BattleTowerLobby_EventScript_23EEE7:: @ 823EEE7 + lock + faceplayer + message BattleFrontier_BattleTowerLobby_Text_23F8CD + waitmessage + multichoice 16, 4, 109, 0 + switch VAR_RESULT + case 0, BattleFrontier_BattleTowerLobby_EventScript_23EF32 + case 1, BattleFrontier_BattleTowerLobby_EventScript_23EF4C + case 2, BattleFrontier_BattleTowerLobby_EventScript_23EF66 + case 3, BattleFrontier_BattleTowerLobby_EventScript_23EF80 + case 127, BattleFrontier_BattleTowerLobby_EventScript_23EF80 + release + end + +BattleFrontier_BattleTowerLobby_EventScript_23EF32:: @ 823EF32 + msgbox BattleFrontier_BattleTowerLobby_Text_23F969, 4 + setvar VAR_0x8004, 1 + call BattleFrontier_BattleTowerLobby_EventScript_271E7C + lock + faceplayer + goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A + end + +BattleFrontier_BattleTowerLobby_EventScript_23EF4C:: @ 823EF4C + msgbox BattleFrontier_BattleTowerLobby_Text_23F9AA, 4 + setvar VAR_0x8004, 2 + call BattleFrontier_BattleTowerLobby_EventScript_271E7C + lock + faceplayer + goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A + end + +BattleFrontier_BattleTowerLobby_EventScript_23EF66:: @ 823EF66 + msgbox BattleFrontier_BattleTowerLobby_Text_23F9D4, 4 + setvar VAR_0x8004, 3 + call BattleFrontier_BattleTowerLobby_EventScript_271E7C + lock + faceplayer + goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A + end + +BattleFrontier_BattleTowerLobby_EventScript_23EF80:: @ 823EF80 + msgbox BattleFrontier_BattleTowerLobby_Text_23FA0F, 4 + release + end + +BattleFrontier_BattleTowerLobby_EventScript_23EF8A:: @ 823EF8A + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23EFA1 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23EFAB + end + +BattleFrontier_BattleTowerLobby_EventScript_23EFA1:: @ 823EFA1 + msgbox BattleFrontier_BattleTowerLobby_Text_23FA4F, 4 + release + end + +BattleFrontier_BattleTowerLobby_EventScript_23EFAB:: @ 823EFAB + msgbox BattleFrontier_BattleTowerLobby_Text_23FA83, 4 + release + end + +BattleFrontier_BattleTowerLobby_EventScript_23EFB5:: @ 823EFB5 + msgbox BattleFrontier_BattleTowerLobby_Text_23FAC0, 2 + end + +BattleFrontier_BattleTowerLobby_EventScript_23EFBE:: @ 823EFBE + msgbox BattleFrontier_BattleTowerLobby_Text_23FB26, 2 + end + +BattleFrontier_BattleTowerLobby_EventScript_23EFC7:: @ 823EFC7 + lockall + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 0 + special sub_81A1780 + waitbuttonpress + special RemoveRecordsWindow + releaseall + end + +BattleFrontier_BattleTowerLobby_EventScript_23EFE0:: @ 823EFE0 + lockall + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 1 + special sub_81A1780 + waitbuttonpress + special RemoveRecordsWindow + releaseall + end + +BattleFrontier_BattleTowerLobby_EventScript_23EFF9:: @ 823EFF9 + lockall + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 2 + special sub_81A1780 + waitbuttonpress + special RemoveRecordsWindow + releaseall + end + +BattleFrontier_BattleTowerLobby_EventScript_23F012:: @ 823F012 + lockall + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 3 + special sub_81A1780 + waitbuttonpress + special RemoveRecordsWindow + releaseall + end + +BattleFrontier_BattleTowerLobby_EventScript_23F02B:: @ 823F02B + switch VAR_RESULT + case 0, BattleFrontier_BattleTowerLobby_EventScript_23F046 + case 1, BattleFrontier_BattleTowerLobby_EventScript_23F08B + +BattleFrontier_BattleTowerLobby_EventScript_23F046:: @ 823F046 + switch VAR_0x40CE + case 0, BattleFrontier_BattleTowerLobby_EventScript_23F06F + case 1, BattleFrontier_BattleTowerLobby_EventScript_23F07D + msgbox BattleFrontier_BattleTowerLobby_Text_24038B, 4 + goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 + end + +BattleFrontier_BattleTowerLobby_EventScript_23F06F:: @ 823F06F + msgbox BattleFrontier_BattleTowerLobby_Text_240027, 4 + goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 + end + +BattleFrontier_BattleTowerLobby_EventScript_23F07D:: @ 823F07D + msgbox BattleFrontier_BattleTowerLobby_Text_2401DB, 4 + goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 + end + +BattleFrontier_BattleTowerLobby_EventScript_23F08B:: @ 823F08B + switch VAR_0x40CE + case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0B4 + case 1, BattleFrontier_BattleTowerLobby_EventScript_23F0C2 + msgbox BattleFrontier_BattleTowerLobby_Text_24046B, 4 + goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 + end + +BattleFrontier_BattleTowerLobby_EventScript_23F0B4:: @ 823F0B4 + msgbox BattleFrontier_BattleTowerLobby_Text_24010B, 4 + goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 + end + +BattleFrontier_BattleTowerLobby_EventScript_23F0C2:: @ 823F0C2 + msgbox BattleFrontier_BattleTowerLobby_Text_2402BD, 4 + goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 + end + +BattleFrontier_BattleTowerLobby_EventScript_23F0D0:: @ 823F0D0 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + special sub_81A1780 + goto BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + end + +BattleFrontier_BattleTowerLobby_EventScript_23F0E3:: @ 823F0E3 + special LoadPlayerParty + +BattleFrontier_BattleTowerLobby_EventScript_23F0E6:: @ 823F0E6 + special CloseLink + msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, 4 + +BattleFrontier_BattleTowerLobby_EventScript_23F0F1:: @ 823F0F1 + release + end + +BattleFrontier_BattleTowerLobby_EventScript_23F0F3:: @ 823F0F3 + special SavePlayerParty + setvar VAR_0x8004, 3 + call BattleFrontier_BattleTowerLobby_EventScript_23F272 + special sub_81A1780 + setvar VAR_RESULT, 0 + +BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108 + setvar VAR_0x8004, 12 + special sub_8161F74 + delay 1 + compare VAR_RESULT, 6 + goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23F108 + call BattleFrontier_BattleTowerLobby_EventScript_23F135 + clearflag FLAG_0x077 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6 + setvar VAR_TEMP_0, 0 + waitstate + end + +BattleFrontier_BattleTowerLobby_EventScript_23F135:: @ 823F135 + call BattleFrontier_BattleTowerLobby_EventScript_23F1A7 + compare VAR_0x40CE, 3 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F152 + msgbox BattleFrontier_BattleTowerLobby_Text_23FE11, 4 + goto BattleFrontier_BattleTowerLobby_EventScript_23F15B + +BattleFrontier_BattleTowerLobby_EventScript_23F152:: @ 823F152 + messageautoscroll BattleFrontier_BattleTowerLobby_Text_23FE11 + waitmessage + delay 48 + +BattleFrontier_BattleTowerLobby_EventScript_23F15B:: @ 823F15B + closemessage + call BattleFrontier_BattleTowerLobby_EventScript_23F1E8 + call BattleFrontier_BattleTowerLobby_EventScript_23F22D + applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerLobby_Movement_23F195 + applymovement 255, BattleFrontier_BattleTowerLobby_Movement_23F195 + waitmovement 0 + opendoor VAR_0x8004, 1 + waitdooranim + applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerLobby_Movement_23F199 + applymovement 255, BattleFrontier_BattleTowerLobby_Movement_23F19C + waitmovement 0 + closedoor VAR_0x8004, 1 + waitdooranim + return + +BattleFrontier_BattleTowerLobby_Movement_23F195: @ 823F195 + walk_up + walk_up + walk_up + step_end + +BattleFrontier_BattleTowerLobby_Movement_23F199: @ 823F199 + walk_up + set_invisible + step_end + +BattleFrontier_BattleTowerLobby_Movement_23F19C: @ 823F19C + walk_up + walk_up + set_invisible + step_end + +BattleFrontier_BattleTowerLobby_Movement_23F1A0: @ 823F1A0 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + set_invisible + step_end + +BattleFrontier_BattleTowerLobby_EventScript_23F1A7:: @ 823F1A7 + compare VAR_0x40CE, 0 + call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1D4 + compare VAR_0x40CE, 1 + call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1D9 + compare VAR_0x40CE, 2 + call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1DE + compare VAR_0x40CE, 3 + call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1E3 + return + +BattleFrontier_BattleTowerLobby_EventScript_23F1D4:: @ 823F1D4 + bufferstdstring 0, 19 + return + +BattleFrontier_BattleTowerLobby_EventScript_23F1D9:: @ 823F1D9 + bufferstdstring 0, 20 + return + +BattleFrontier_BattleTowerLobby_EventScript_23F1DE:: @ 823F1DE + bufferstdstring 0, 21 + return + +BattleFrontier_BattleTowerLobby_EventScript_23F1E3:: @ 823F1E3 + bufferstdstring 0, 22 + return + +BattleFrontier_BattleTowerLobby_EventScript_23F1E8:: @ 823F1E8 + compare VAR_0x40CE, 0 + call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F215 + compare VAR_0x40CE, 1 + call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F21B + compare VAR_0x40CE, 2 + call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F221 + compare VAR_0x40CE, 3 + call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F227 + return + +BattleFrontier_BattleTowerLobby_EventScript_23F215:: @ 823F215 + setvar VAR_LAST_TALKED, 1 + return + +BattleFrontier_BattleTowerLobby_EventScript_23F21B:: @ 823F21B + setvar VAR_LAST_TALKED, 7 + return + +BattleFrontier_BattleTowerLobby_EventScript_23F221:: @ 823F221 + setvar VAR_LAST_TALKED, 8 + return + +BattleFrontier_BattleTowerLobby_EventScript_23F227:: @ 823F227 + setvar VAR_LAST_TALKED, 9 + return + +BattleFrontier_BattleTowerLobby_EventScript_23F22D:: @ 823F22D + compare VAR_0x40CE, 0 + call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F25A + compare VAR_0x40CE, 1 + call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F260 + compare VAR_0x40CE, 2 + call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F266 + compare VAR_0x40CE, 3 + call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F26C + return + +BattleFrontier_BattleTowerLobby_EventScript_23F25A:: @ 823F25A + setvar VAR_0x8004, 6 + return + +BattleFrontier_BattleTowerLobby_EventScript_23F260:: @ 823F260 + setvar VAR_0x8004, 10 + return + +BattleFrontier_BattleTowerLobby_EventScript_23F266:: @ 823F266 + setvar VAR_0x8004, 14 + return + +BattleFrontier_BattleTowerLobby_EventScript_23F26C:: @ 823F26C + setvar VAR_0x8004, 18 + return + +BattleFrontier_BattleTowerLobby_EventScript_23F272:: @ 823F272 + compare VAR_0x40CE, 0 + call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F29F + compare VAR_0x40CE, 1 + call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2A5 + compare VAR_0x40CE, 2 + call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2AB + compare VAR_0x40CE, 3 + call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2B1 + return + +BattleFrontier_BattleTowerLobby_EventScript_23F29F:: @ 823F29F + setvar VAR_0x8005, 3 + return + +BattleFrontier_BattleTowerLobby_EventScript_23F2A5:: @ 823F2A5 + setvar VAR_0x8005, 4 + return + +BattleFrontier_BattleTowerLobby_EventScript_23F2AB:: @ 823F2AB + setvar VAR_0x8005, 2 + return + +BattleFrontier_BattleTowerLobby_EventScript_23F2B1:: @ 823F2B1 + setvar VAR_0x8005, 2 + return + +BattleFrontier_BattleArenaLobby_EventScript_23F2B7:: @ 823F2B7 +BattleFrontier_BattleDomeLobby_EventScript_23F2B7:: @ 823F2B7 +BattleFrontier_BattleDomePreBattleRoom_EventScript_23F2B7:: @ 823F2B7 +BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23F2B7:: @ 823F2B7 +BattleFrontier_BattlePalaceLobby_EventScript_23F2B7:: @ 823F2B7 +BattleFrontier_BattlePikeLobby_EventScript_23F2B7:: @ 823F2B7 +BattleFrontier_BattlePyramidLobby_EventScript_23F2B7:: @ 823F2B7 +BattleFrontier_BattleTowerLobby_EventScript_23F2B7:: @ 823F2B7 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + special sub_81A1780 + return + +BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5 + setvar VAR_0x8004, 9 + message OldaleTown_PokemonCenter_2F_Text_278091 + waitmessage + setvar VAR_0x8005, 0 + special sub_80B2DA4 + waitstate + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3AF + compare VAR_RESULT, 2 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_2772D2 + compare VAR_RESULT, 3 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F327 + compare VAR_RESULT, 4 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F351 + compare VAR_RESULT, 5 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + compare VAR_RESULT, 6 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_2772C5 + compare VAR_RESULT, 11 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F366 + end + +BattleFrontier_BattleTowerLobby_EventScript_23F327:: @ 823F327 + special CloseLink + compare VAR_0x8005, 3 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F33F + msgbox BattleFrontier_BattleTowerLobby_Text_278255, 4 + release + end + +BattleFrontier_BattleTowerLobby_EventScript_23F33F:: @ 823F33F + msgbox BattleFrontier_BattleTowerLobby_Text_2412E8, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2413DE, 4 + release + end + +BattleFrontier_BattleTowerLobby_EventScript_23F351:: @ 823F351 + msgbox BattleFrontier_BattleTowerLobby_Text_241240, 4 + special CloseLink + msgbox BattleFrontier_BattleTowerLobby_Text_2782A8, 4 + release + end + +BattleFrontier_BattleTowerLobby_EventScript_23F366:: @ 823F366 + special CloseLink + compare VAR_0x8005, 0 + call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F394 + compare VAR_0x8005, 1 + call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F39D + compare VAR_0x8005, 2 + call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F3A6 + msgbox BattleFrontier_BattleTowerLobby_Text_2413DE, 4 + release + end + +BattleFrontier_BattleTowerLobby_EventScript_23F394:: @ 823F394 + msgbox BattleFrontier_BattleTowerLobby_Text_2412E8, 4 + return + +BattleFrontier_BattleTowerLobby_EventScript_23F39D:: @ 823F39D + msgbox BattleFrontier_BattleTowerLobby_Text_241285, 4 + return + +BattleFrontier_BattleTowerLobby_EventScript_23F3A6:: @ 823F3A6 + msgbox BattleFrontier_BattleTowerLobby_Text_2412B3, 4 + return + +BattleFrontier_BattleTowerLobby_EventScript_23F3AF:: @ 823F3AF + incrementgamestat 30 + setvar VAR_0x40BC, 0 + message BattleFrontier_BattleTowerLobby_Text_24144D + waitmessage + setvar VAR_0x8004, 6 + setvar VAR_0x8005, 1 + special sub_8161F74 + special sub_80A08CC + waitstate + playse SE_SAVE + waitse + special sub_80B3BC4 + goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 + end + +BattleFrontier_BattleTowerLobby_EventScript_23F3DA:: @ 823F3DA + msgbox BattleFrontier_BattleTowerLobby_Text_240ED2, 4 + goto BattleFrontier_BattleTowerLobby_EventScript_23ED86 + end + +BattleFrontier_BattleTowerLobby_EventScript_23F3E8:: @ 823F3E8 + setvar VAR_0x8004, 20 + goto BattleFrontier_BattleTowerLobby_EventScript_23F3F3 + end + +BattleFrontier_BattleTowerLobby_EventScript_23F3F3:: @ 823F3F3 + message BattleFrontier_BattleTowerLobby_Text_2792CD + waitmessage + multichoice 16, 6, 81, 0 + switch VAR_RESULT + case 0, BattleFrontier_BattleTowerLobby_EventScript_23F463 + case 1, BattleFrontier_BattleTowerLobby_EventScript_23F430 + case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + end + +BattleFrontier_BattleTowerLobby_EventScript_23F430:: @ 823F430 + call BattleFrontier_BattleTowerLobby_EventScript_277B30 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F496 + compare VAR_RESULT, 5 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3F3 + compare VAR_RESULT, 8 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F430 + compare VAR_RESULT, 11 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F366 + release + return + +BattleFrontier_BattleTowerLobby_EventScript_23F463:: @ 823F463 + call BattleFrontier_BattleTowerLobby_EventScript_277B35 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F496 + compare VAR_RESULT, 5 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3F3 + compare VAR_RESULT, 8 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F463 + compare VAR_RESULT, 11 + goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F366 + release + return + +BattleFrontier_BattleTowerLobby_EventScript_23F496:: @ 823F496 + incrementgamestat 30 + setvar VAR_0x40BC, 0 + message BattleFrontier_BattleTowerLobby_Text_24144D + waitmessage + setvar VAR_0x8004, 6 + setvar VAR_0x8005, 1 + special sub_8161F74 + special sub_80A08CC + waitstate + playse SE_SAVE + waitse + goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 + end + +BattleFrontier_BattleTowerLobby_EventScript_23F4BE:: @ 823F4BE + lockall + msgbox BattleFrontier_BattleTowerLobby_Text_241540, 4 + goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD + end + +BattleFrontier_BattleTowerLobby_EventScript_23F4CD:: @ 823F4CD + message BattleFrontier_BattleTowerLobby_Text_241563 + waitmessage + multichoice 17, 2, 97, 0 + switch VAR_RESULT + case 0, BattleFrontier_BattleTowerLobby_EventScript_23F520 + case 1, BattleFrontier_BattleTowerLobby_EventScript_23F52E + case 2, BattleFrontier_BattleTowerLobby_EventScript_23F53C + case 3, BattleFrontier_BattleTowerLobby_EventScript_23F54A + case 4, BattleFrontier_BattleTowerLobby_EventScript_23F558 + case 127, BattleFrontier_BattleTowerLobby_EventScript_23F558 + end + +BattleFrontier_BattleTowerLobby_EventScript_23F520:: @ 823F520 + msgbox BattleFrontier_BattleTowerLobby_Text_241586, 4 + goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD + end + +BattleFrontier_BattleTowerLobby_EventScript_23F52E:: @ 823F52E + msgbox BattleFrontier_BattleTowerLobby_Text_241693, 4 + goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD + end + +BattleFrontier_BattleTowerLobby_EventScript_23F53C:: @ 823F53C + msgbox BattleFrontier_BattleTowerLobby_Text_241777, 4 + goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD + end + +BattleFrontier_BattleTowerLobby_EventScript_23F54A:: @ 823F54A + msgbox BattleFrontier_BattleTowerLobby_Text_24187E, 4 + goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD + end + +BattleFrontier_BattleTowerLobby_EventScript_23F558:: @ 823F558 + releaseall + end + +BattleFrontier_BattleTowerLobby_EventScript_23F55A: @ 823F55A + .string "I’ll direct you to your BATTLE ROOM now.$" + +BattleFrontier_BattleTowerLobby_Text_23F583: @ 823F583 + .string "Excuse me!\p" + .string "You didn’t save before you quit your\n" + .string "challenge last time.\p" + .string "Because of that, your challenge so far\n" + .string "has been disqualified. Sorry!$" + +BattleFrontier_BattleTowerLobby_Text_23F60D: @ 823F60D + .string "Congratulations!\n" + .string "You’ve beaten all seven TRAINERS!\p" + .string "$" + +BattleFrontier_BattleTowerLobby_Text_23F641: @ 823F641 + .string "For beating seven TRAINERS in a row,\n" + .string "you have earned this fabulous prize!\p" + .string "$" + +SlateportCity_BattleTentLobby_Text_23F68C: @ 823F68C + .string "{PLAYER} received the prize\n" + .string "{STR_VAR_1}.$" + +SlateportCity_BattleTentLobby_Text_23F6A6: @ 823F6A6 + .string "Oh, your BAG appears to be full.\p" + .string "Please make room in your BAG, then come\n" + .string "see me.$" + +BattleFrontier_BattleTowerLobby_Text_23F6F7: @ 823F6F7 + .string "Thank you for playing!\p" + .string "$" + +BattleFrontier_BattleTowerLobby_Text_23F70F: @ 823F70F + .string "Your record will be saved.\n" + .string "Please wait.$" + +BattleFrontier_BattleTowerLobby_Text_23F737: @ 823F737 + .string "We’ve been waiting for you!\p" + .string "$" + +BattleFrontier_BattleTowerLobby_Text_23F754: @ 823F754 + .string "Before entering a BATTLE ROOM, your\n" + .string "progress will be saved. Please wait.$" + +BattleFrontier_BattleTowerLobby_Text_23F79D: @ 823F79D + .string "You’re finally about to face the\n" + .string "50th TRAINER.\p" + .string "From here on, every time you beat seven\n" + .string "TRAINERS in a row, your POKéMON will\l" + .string "receive a commemorative RIBBON.\p" + .string "Good luck!$" + +BattleFrontier_BattleTowerLobby_Text_23F844: @ 823F844 + .string "Here are some RIBBONS for beating\n" + .string "seven tough TRAINERS in a row.\p" + .string "{PLAYER} received some RIBBONS!$" + +BattleFrontier_BattleTowerLobby_Text_23F89F: @ 823F89F + .string "{PLAYER} put the RIBBONS on\n" + .string "the challenger POKéMON.$" + +BattleFrontier_BattleTowerLobby_Text_23F8CD: @ 823F8CD + .string "Excuse me, do you have a moment?\p" + .string "Can you describe your feelings when\n" + .string "you’re about to begin a BATTLE TOWER\l" + .string "match, or when you’ve either won or\l" + .string "lost a match?$" + +BattleFrontier_BattleTowerLobby_Text_23F969: @ 823F969 + .string "Okay, what are your feelings when\n" + .string "you’re about to begin a match?$" + +BattleFrontier_BattleTowerLobby_Text_23F9AA: @ 823F9AA + .string "What do you feel when you’ve won\n" + .string "a match?$" + +BattleFrontier_BattleTowerLobby_Text_23F9D4: @ 823F9D4 + .string "Can I hear about your feelings when\n" + .string "you have lost a match?$" + +BattleFrontier_BattleTowerLobby_Text_23FA0F: @ 823FA0F + .string "Oh, so you don’t think much about it?\n" + .string "You’re one cool customer.$" + +BattleFrontier_BattleTowerLobby_Text_23FA4F: @ 823FA4F + .string "Hunh? You changed your mind?\n" + .string "I guess you’re fickle.$" + +BattleFrontier_BattleTowerLobby_Text_23FA83: @ 823FA83 + .string "Okay, so that’s how you feel?\n" + .string "That’s quite original.\p" + .string "Thanks!$" + +BattleFrontier_BattleTowerLobby_Text_23FAC0: @ 823FAC0 + .string "The number of matches you win in a row\n" + .string "is recorded.\p" + .string "I’d better not get beaten in\n" + .string "an embarrassing way!$" + +BattleFrontier_BattleTowerLobby_Text_23FB26: @ 823FB26 + .string "Once you’ve entered the BATTLE TOWER,\n" + .string "you can’t leave until you either lose\l" + .string "or you beat seven TRAINERS in a row.\p" + .string "You’d best be certain that you’re up\n" + .string "to the challenge.$" + +BattleFrontier_BattleTowerLobby_Text_23FBCE: @ 823FBCE + .string "Welcome to the BATTLE TOWER\n" + .string "DOUBLE BATTLE CORNER!\p" + .string "Unfortunately, the BATTLE ROOMS\n" + .string "are still under construction.\p" + .string "Please come back when the work\n" + .string "is completed.$" + +BattleFrontier_BattleTowerLobby_Text_23FC6B: @ 823FC6B + .string "Welcome to the BATTLE TOWER\n" + .string "MULTI BATTLE CORNER!\p" + .string "Unfortunately, the BATTLE ROOMS\n" + .string "are still under construction.\p" + .string "Please come back when the work\n" + .string "is completed.$" + +BattleFrontier_BattleTowerLobby_Text_23FD07: @ 823FD07 + .string "We look forward to seeing you on\n" + .string "another challenge!$" + +BattleFrontier_BattleTowerLobby_Text_23FD3B: @ 823FD3B + .string "The BATTLE ROOM offers two levels\n" + .string "of challenge, Level 50 and Open Level.\l" + .string "Which is your choice?$" + +BattleFrontier_BattleTowerLobby_Text_23FD9A: @ 823FD9A + .string "Please select the POKéMON you wish\n" + .string "to enter.$" + +BattleFrontier_BattleTowerLobby_Text_23FDC7: @ 823FDC7 + .string "Before entering a BATTLE ROOM, your\n" + .string "progress must be saved. Is that okay?$" + +BattleFrontier_BattleTowerLobby_Text_23FE11: @ 823FE11 + .string "I will now show you to the\n" + .string "{STR_VAR_1} BATTLE ROOM.$" + +BattleFrontier_BattleTowerLobby_Text_23FE3C: @ 823FE3C + .string "Shall I record your last BATTLE TOWER\n" + .string "match on your FRONTIER PASS?$" + +BattleFrontier_BattleTowerLobby_Text_23FE7F: @ 823FE7F + .string "Excuse me!\p" + .string "You don’t have {STR_VAR_2} eligible POKéMON.\p" + .string "You must have {STR_VAR_2} different POKéMON\n" + .string "of Level 50 or less to enter.\p" + .string "They also must be holding different\n" + .string "kinds of items.\p" + .string "EGGS{STR_VAR_1} ineligible.\p" + .string "Please come see me when you are ready.$" + +BattleFrontier_BattleTowerLobby_Text_23FF5D: @ 823FF5D + .string "Excuse me!\p" + .string "You don’t have {STR_VAR_2} eligible POKéMON.\p" + .string "You must have {STR_VAR_2} different POKéMON\n" + .string "to enter.\p" + .string "They also must be holding different\n" + .string "kinds of items.\p" + .string "EGGS{STR_VAR_1} ineligible.\p" + .string "Please come see me when you are ready.$" + +BattleFrontier_BattleTowerLobby_Text_240027: @ 8240027 + .string "Excuse me!\p" + .string "You don’t have three eligible POKéMON.\p" + .string "You must have three different POKéMON\n" + .string "of Level 50 or less to enter.\p" + .string "They also must be holding different\n" + .string "kinds of items.\p" + .string "EGGS{STR_VAR_1} ineligible.\p" + .string "Please come see me when you are ready.$" + +BattleFrontier_BattleTowerLobby_Text_24010B: @ 824010B + .string "Excuse me!\p" + .string "You don’t have three eligible POKéMON.\p" + .string "You must have three different POKéMON\n" + .string "to enter.\p" + .string "They also must be holding different\n" + .string "kinds of items.\p" + .string "EGGS{STR_VAR_1} ineligible.\p" + .string "Please come see me when you are ready.$" + +BattleFrontier_BattleTowerLobby_Text_2401DB: @ 82401DB + .string "Excuse me!\p" + .string "You don’t have four eligible POKéMON.\p" + .string "You must have four different POKéMON\n" + .string "of Level 50 or less to enter.\p" + .string "They also must be holding different\n" + .string "kinds of items.\p" + .string "EGGS{STR_VAR_1} ineligible.\p" + .string "Please come see me when you are ready.$" + +BattleFrontier_BattleTowerLobby_Text_2402BD: @ 82402BD + .string "Excuse me!\p" + .string "You don’t have four eligible POKéMON.\p" + .string "You must have four different POKéMON\n" + .string "to enter.\p" + .string "They also must be holding different\n" + .string "kinds of items.\p" + .string "EGGS{STR_VAR_1} ineligible.\p" + .string "Please come see me when you are ready.$" + +BattleFrontier_BattleTowerLobby_Text_24038B: @ 824038B + .string "Excuse me!\p" + .string "You don’t have two eligible POKéMON.\p" + .string "You must have two different POKéMON\n" + .string "of Level 50 or less to enter.\p" + .string "They also must be holding different\n" + .string "kinds of items.\p" + .string "EGGS{STR_VAR_1} ineligible.\p" + .string "Please come see me when you are ready.$" + +BattleFrontier_BattleTowerLobby_Text_24046B: @ 824046B + .string "Excuse me!\p" + .string "You don’t have two eligible POKéMON.\p" + .string "You must have two different POKéMON\n" + .string "to enter.\p" + .string "They also must be holding different\n" + .string "kinds of items.\p" + .string "EGGS{STR_VAR_1} ineligible.\p" + .string "Please come see me when you are ready.$" + +BattleFrontier_BattleTowerLobby_Text_240537: @ 8240537 + .string "Where the talents of TRAINERS\n" + .string "are put to the test!\p" + .string "Welcome to the BATTLE TOWER!\p" + .string "I am your guide to the SINGLE\n" + .string "BATTLE ROOMS.$" + +BattleFrontier_BattleTowerLobby_Text_2405B3: @ 82405B3 + .string "Would you like to take the SINGLE\n" + .string "BATTLE ROOM challenge?$" + +BattleFrontier_BattleTowerLobby_Text_2405EC: @ 82405EC + .string "The BATTLE TOWER’s SINGLE BATTLE\n" + .string "ROOMS are facilities for conducting\l" + .string "SINGLE BATTLES with three POKéMON.\p" + .string "There are many SINGLE BATTLE ROOMS\n" + .string "in the BATTLE TOWER for team battles.\p" + .string "In each of the SINGLE BATTLE ROOMS,\n" + .string "seven TRAINERS await your challenge.\p" + .string "If you manage to defeat all seven,\n" + .string "you will earn Battle Points.\p" + .string "If you want to interrupt your\n" + .string "challenge, please save the game.\p" + .string "If you don’t save before interrupting,\n" + .string "you will be disqualified.$" + +BattleFrontier_BattleTowerLobby_Text_2407A6: @ 82407A6 + .string "Now please select the three POKéMON\n" + .string "that are to be entered.$" + +BattleFrontier_BattleTowerLobby_Text_2407E2: @ 82407E2 + .string "Where the talents of TRAINERS\n" + .string "are put to the test!\p" + .string "Welcome to the BATTLE TOWER!\p" + .string "I am your guide to the DOUBLE\n" + .string "BATTLE ROOMS.$" + +BattleFrontier_BattleTowerLobby_Text_24085E: @ 824085E + .string "Would you like to take the DOUBLE\n" + .string "BATTLE ROOM challenge?$" + +BattleFrontier_BattleTowerLobby_Text_240897: @ 8240897 + .string "The BATTLE TOWER’s DOUBLE BATTLE\n" + .string "ROOMS are facilities for conducting\l" + .string "DOUBLE BATTLES with four POKéMON.\p" + .string "There are many DOUBLE BATTLE ROOMS\n" + .string "in the BATTLE TOWER for team battles.\p" + .string "In each of the DOUBLE BATTLE ROOMS,\n" + .string "seven TRAINERS await your challenge.\p" + .string "If you manage to defeat all seven,\n" + .string "you will earn Battle Points.\p" + .string "If you want to interrupt your\n" + .string "challenge, please save the game.\p" + .string "If you don’t save before interrupting,\n" + .string "you will be disqualified.$" + +BattleFrontier_BattleTowerLobby_Text_240A50: @ 8240A50 + .string "Now please select the four POKéMON\n" + .string "that are to be entered.$" + +BattleFrontier_BattleTowerLobby_Text_240A8B: @ 8240A8B + .string "Where the talents of TRAINERS\n" + .string "are put to the test!\p" + .string "Welcome to the BATTLE TOWER!\p" + .string "I am your guide to the MULTI\n" + .string "BATTLE ROOMS.$" + +BattleFrontier_BattleTowerLobby_Text_240B06: @ 8240B06 + .string "Would you like to take the MULTI\n" + .string "BATTLE ROOM challenge?$" + +BattleFrontier_BattleTowerLobby_Text_240B3E: @ 8240B3E + .string "The BATTLE TOWER’s MULTI BATTLE\n" + .string "ROOMS are facilities for conducting\l" + .string "MULTI BATTLES.\p" + .string "For MULTI BATTLES, you must partner\n" + .string "with a TRAINER in the TOWER and enter\l" + .string "with two POKéMON each.\p" + .string "Inside the TOWER is a room named\n" + .string "the BATTLE SALON where you may meet\l" + .string "other TRAINERS.\p" + .string "There, you must find a TRAINER to act\n" + .string "as your partner in MULTI BATTLES.\p" + .string "Once you have partnered up, you will\n" + .string "be shown to a MULTI BATTLE ROOM.\p" + .string "In the MULTI BATTLE ROOM, seven\n" + .string "tag teams await your challenge.\p" + .string "If you manage to defeat all seven\n" + .string "teams, you will earn Battle Points.\p" + .string "If you want to interrupt your\n" + .string "challenge, please save the game.\p" + .string "If you don’t save before interrupting,\n" + .string "you will be disqualified.$" + +BattleFrontier_BattleTowerLobby_Text_240DDB: @ 8240DDB + .string "Now please select the two POKéMON\n" + .string "that are to be entered.$" + +BattleFrontier_BattleTowerLobby_Text_240E15: @ 8240E15 + .string "Where the talents of TRAINERS\n" + .string "are put to the test!\p" + .string "Welcome to the BATTLE TOWER!\p" + .string "I am your guide to the LINK MULTI\n" + .string "BATTLE ROOMS.$" + +BattleFrontier_BattleTowerLobby_Text_240E95: @ 8240E95 + .string "Would you like to take the LINK MULTI\n" + .string "BATTLE ROOM challenge?$" + +BattleFrontier_BattleTowerLobby_Text_240ED2: @ 8240ED2 + .string "The BATTLE TOWER’s MULTI BATTLE\n" + .string "ROOMS are facilities for conducting\l" + .string "MULTI BATTLES with a friend.\p" + .string "You must link with your friend using\n" + .string "Wireless Adapters or a Game Boy\l" + .string "Advance Game Link cable.\p" + .string "You must partner with your friend and\n" + .string "enter two different kinds of POKéMON.\p" + .string "There are many MULTI BATTLE ROOMS\n" + .string "in the BATTLE TOWER for team battles.\p" + .string "In a MULTI BATTLE ROOM, seven\n" + .string "tag teams await you and your friend\l" + .string "to make a tag-team challenge.\p" + .string "If you manage to defeat all seven\n" + .string "teams, you will earn Battle Points.\p" + .string "Please beware that unlike other ROOMS,\n" + .string "you may not interrupt your challenge.\p" + .string "Once you start, you must battle seven\n" + .string "MULTI BATTLES in a row nonstop.$" + +BattleFrontier_BattleTowerLobby_Text_24115E: @ 824115E + .string "Now please select the two POKéMON\n" + .string "that are to be entered.$" + +BattleFrontier_BattleTowerLobby_Text_241198: @ 8241198 + .string "You have chosen the same kind of\n" + .string "POKéMON as your friend.\p" + .string "Please choose two POKéMON different\n" + .string "from your friend’s, match the level\l" + .string "you wish to enter, and register again.$" + +BattleFrontier_BattleTowerLobby_Text_241240: @ 8241240 + .string "The LINK MULTI BATTLE ROOM challenge\n" + .string "is only for two linked players.$" + +BattleFrontier_BattleTowerLobby_Text_241285: @ 8241285 + .string "Your friend has also selected\n" + .string "the POKéMON {STR_VAR_1}.$" + +BattleFrontier_BattleTowerLobby_Text_2412B3: @ 82412B3 + .string "Your friend has also selected the\n" + .string "POKéMON {STR_VAR_1} and {STR_VAR_2}.$" + +BattleFrontier_BattleTowerLobby_Text_2412E8: @ 82412E8 + .string "Your friend has chosen a different\n" + .string "battle level.$" + +BattleFrontier_BattleTowerLobby_Text_241319: @ 8241319 + .string "Your friend has chosen a different\n" + .string "battle level.\p" + .string "Your friend has also selected\n" + .string "the POKéMON {STR_VAR_1}.$" + +BattleFrontier_BattleTowerLobby_Text_241378: @ 8241378 + .string "Your friend has chosen a different\n" + .string "battle level.\p" + .string "Your friend has also selected the\n" + .string "POKéMON {STR_VAR_1} and {STR_VAR_2}.$" + +BattleFrontier_BattleTowerLobby_Text_2413DE: @ 82413DE + .string "Please choose two POKéMON different\n" + .string "from your friend’s, match the level\l" + .string "you wish to enter, and register again.$" + +BattleFrontier_BattleTowerLobby_Text_24144D: @ 824144D + .string "I will save the game before\n" + .string "showing you in. Please wait.$" + +BattleFrontier_BattleTowerLobby_Text_241486: @ 8241486 + .string "Congratulations!\n" + .string "You have defeated the SALON MAIDEN\l" + .string "and swept seven TRAINERS!$" + +BattleFrontier_BattleTowerLobby_Text_2414D4: @ 82414D4 + .string "In recognition of your infinite talent,\n" + .string "we award you these Battle Point(s).$" + +BattleFrontier_BattleArenaLobby_Text_241520: @ 8241520 +BattleFrontier_BattleDomeLobby_Text_241520: @ 8241520 +BattleFrontier_BattleFactoryLobby_Text_241520: @ 8241520 +BattleFrontier_BattlePalaceLobby_Text_241520: @ 8241520 +BattleFrontier_BattlePikeLobby_Text_241520: @ 8241520 +BattleFrontier_BattlePyramidLobby_Text_241520: @ 8241520 +BattleFrontier_BattleTowerLobby_Text_241520: @ 8241520 + .string "{PLAYER} obtained {STR_VAR_1} Battle Point(s).$" + +BattleFrontier_BattleTowerLobby_Text_241540: @ 8241540 + .string "The BATTLE TOWER rules are listed.$" + +BattleFrontier_BattleTowerLobby_Text_241563: @ 8241563 + .string "Which heading do you want to read?$" + +BattleFrontier_BattleTowerLobby_Text_241586: @ 8241586 + .string "The BATTLE TOWER is a facility where\n" + .string "four types of battles are waged--\l" + .string "SINGLE BATTLE, DOUBLE BATTLE, MULTI\l" + .string "BATTLE, and LINK MULTI BATTLE.\p" + .string "For each of these types, there are\n" + .string "separate BATTLE ROOMS.\p" + .string "Please speak with a guide offering\n" + .string "the type of battle you wish to enter.$" + +BattleFrontier_BattleTowerLobby_Text_241693: @ 8241693 + .string "Depending on the BATTLE ROOM you are\n" + .string "entering, you will be required to take\l" + .string "a certain number of POKéMON.\p" + .string "The SINGLE BATTLE mode requires\n" + .string "three POKéMON.\p" + .string "The DOUBLE BATTLE mode requires four,\n" + .string "and the MULTI modes both require two.$" + +BattleFrontier_BattleTowerLobby_Text_241777: @ 8241777 + .string "The BATTLE SALON is where you must\n" + .string "find a partner to form a tag team for\l" + .string "the MULTI BATTLE ROOM challenge.\p" + .string "Choose the best partner for you by\n" + .string "examining other TRAINERS’\l" + .string "POKéMON and their moves.\p" + .string "You may choose a new tag partner\n" + .string "after winning seven straight matches.$" + +BattleFrontier_BattleTowerLobby_Text_24187E: @ 824187E + .string "The LINK MULTI BATTLE Mode is for two\n" + .string "friends to mount a challenge together.\p" + .string "You and your friend must be linked with\n" + .string "Wireless Adapters or a GBA Game Link\l" + .string "cable.\p" + .string "You must choose two POKéMON at\n" + .string "the registration counter.\p" + .string "These POKéMON must be different\n" + .string "from those of your friend.\p" + .string "You may not interrupt this challenge\n" + .string "in the middle, unlike other modes.$" diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc new file mode 100644 index 000000000..0c730f37d --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc @@ -0,0 +1,14 @@ +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 + +BattleFrontier_BattleTowerMultiBattleRoom_MapEvents:: @ 853BF3C + map_events BattleFrontier_BattleTowerMultiBattleRoom_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc new file mode 100644 index 000000000..a2f003b85 --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -0,0 +1,1822 @@ +BattleFrontier_BattleTowerMultiBattleRoom_MapScripts:: @ 8243D92 + map_script 5, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7 + map_script 3, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0 + map_script 4, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14 + map_script 2, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23 + .byte 0 + +BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7 + setvar VAR_0x8004, 17 + special sub_81A8E7C + end + +BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0 + checkflag FLAG_0x152 + goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA + clearflag FLAG_0x2C7 + clearflag FLAG_0x2C8 + clearflag FLAG_0x2C9 + clearflag FLAG_0x2CA + clearflag FLAG_0x2CB + clearflag FLAG_0x2CC + setflag FLAG_0x360 + setflag FLAG_0x361 + setvar VAR_0x8004, 10 + special sub_8161F74 + end + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA:: @ 8243DDA + setvar VAR_OBJ_GFX_ID_0, 7 + setvar VAR_OBJ_GFX_ID_1, 7 + setvar VAR_OBJ_GFX_ID_2, 7 + setvar VAR_OBJ_GFX_ID_3, 7 + setvar VAR_OBJ_GFX_ID_4, 7 + setvar VAR_OBJ_GFX_ID_5, 7 + setvar VAR_OBJ_GFX_ID_6, 7 + setvar VAR_OBJ_GFX_ID_7, 7 + setvar VAR_TEMP_1, 1 + setvar VAR_TEMP_3, 1 + setobjectxyperm 1, 10, 2 + end + +BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14: @ 8243E14 + map_script_2 VAR_TEMP_3, 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E1E + .2byte 0 + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E1E:: @ 8243E1E + turnobject 255, 2 + end + +BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23: @ 8243E23 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41 + map_script_2 VAR_TEMP_3, 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E35 + .2byte 0 + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E35:: @ 8243E35 + lockall + setvar VAR_TEMP_3, 0 + goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5 + end + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41 + lockall + applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E75 + waitmovement 0 + applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77 + waitmovement 0 + moveobjectoffscreen 1 + applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6 + waitmovement 0 + msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, 4 + special HealPlayerParty + setvar VAR_TEMP_1, 1 + releaseall + end + +BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E75: @ 8243E75 + walk_down + step_end + +BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77: @ 8243E77 + walk_left + walk_in_place_fastest_down + step_end + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A:: @ 8243E7A + lock + faceplayer + message BattleFrontier_BattleTowerMultiBattleRoom_Text_244094 + waitmessage + multichoicedefault 20, 8, 94, 1, 0 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D + msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_24410C, 4 + release + end + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D:: @ 8243E9D + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 6 + setvar VAR_0x8006, 1 + special sub_81A1780 + goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03 + end + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5:: @ 8243EB5 + msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244149, 4 + closemessage + applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6 + waitmovement 0 + opendoor 10, 1 + waitdooranim + call BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EE4 + closedoor 10, 1 + waitdooranim + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6 + waitstate + releaseall + end + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EE4:: @ 8243EE4 + applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26 + applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1A + waitmovement 0 + return + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EF6: @ 8243EF6 + applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26 + applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1E + waitmovement 0 + return + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F08: @ 8243F08 + applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26 + applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F22 + waitmovement 0 + return + +BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1A: @ 8243F1A + walk_up + walk_up + set_invisible + step_end + +BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1E: @ 8243F1E + walk_right + walk_up + set_invisible + step_end + +BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F22: @ 8243F22 + walk_left + walk_up + set_invisible + step_end + +BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26: @ 8243F26 + walk_up + set_invisible + step_end + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29:: @ 8243F29 + lock + faceplayer + setvar VAR_TEMP_2, 0 + goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 + end + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36 + checkflag FLAG_0x152 + goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3 + setvar VAR_0x8004, 11 + setvar VAR_0x8005, 0 + special sub_8161F74 + waitmessage + waitbuttonpress + setvar VAR_0x8004, 11 + setvar VAR_0x8005, 1 + special sub_8161F74 + waitmessage + waitbuttonpress + setvar VAR_0x8004, 11 + setvar VAR_0x8005, 2 + special sub_8161F74 + waitmessage + multichoicedefault 20, 8, 94, 1, 0 + switch VAR_RESULT + case 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3 + case 127, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3 + setvar VAR_0x8004, 11 + setvar VAR_0x8005, 3 + special sub_8161F74 + waitmessage + waitbuttonpress + closemessage + compare VAR_FACING, 1 + call_if 5, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FD4 + compare VAR_FACING, 1 + call_if 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF + removeobject VAR_LAST_TALKED + setflag FLAG_0x152 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 3 + waitstate + release + end + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3:: @ 8243FC3 + setvar VAR_0x8004, 11 + setvar VAR_0x8005, 4 + special sub_8161F74 + waitmessage + waitbuttonpress + release + end + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FD4:: @ 8243FD4 + applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243FEA + waitmovement 0 + return + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF:: @ 8243FDF + applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243FF2 + waitmovement 0 + return + +BattleFrontier_BattleTowerMultiBattleRoom_Movement_243FEA: @ 8243FEA + 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 + 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 + lock + faceplayer + setvar VAR_TEMP_2, 1 + goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 + end + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008:: @ 8244008 + lock + faceplayer + setvar VAR_TEMP_2, 2 + goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 + end + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015:: @ 8244015 + lock + faceplayer + setvar VAR_TEMP_2, 3 + goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 + end + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022:: @ 8244022 + lock + faceplayer + setvar VAR_TEMP_2, 4 + goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 + end + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F:: @ 824402F + lock + faceplayer + setvar VAR_TEMP_2, 5 + goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 + end + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C:: @ 824403C + lock + faceplayer + setvar VAR_TEMP_2, 6 + goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 + end + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049:: @ 8244049 + lock + faceplayer + setvar VAR_TEMP_2, 7 + goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 + end + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244056: @ 8244056 + .string "Please find a partner from out of\n" + .string "the TRAINERS gathered here.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244094: @ 8244094 + .string "{PLAYER}, you have not found a partner\n" + .string "for your tag team.\p" + .string "Would you like to quit looking and\n" + .string "return to the reception counter?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24410C: @ 824410C + .string "Then, please find a partner from\n" + .string "the TRAINERS gathered here.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244149:: @ 8244149 + .string "Thank you for choosing a partner.\p" + .string "I will now show you to your\n" + .string "MULTI BATTLE ROOM.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24419A:: @ 824419A + .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n" + .string "You can call me {STR_VAR_3}!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2441CA:: @ 82441CA + .string "On {STR_VAR_1}’s advice, I brought\n" + .string "one {STR_VAR_3} with {STR_VAR_2} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2441F7:: @ 82441F7 + .string "one {STR_VAR_2} with {STR_VAR_1}.\p" + .string "Please, let me join you as a tag team.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24422E:: @ 824422E + .string "Thank you!\n" + .string "I’ll go register right now.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244255:: @ 8244255 + .string "I really wanted to form a tag team\n" + .string "with you, {PLAYER}…$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244286:: @ 8244286 + .string "I am {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n" + .string "My name is {STR_VAR_3}.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2442B2:: @ 82442B2 + .string "I got advice from {STR_VAR_1} and chose\n" + .string "one {STR_VAR_3} with {STR_VAR_2} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2442E4:: @ 82442E4 + .string "one {STR_VAR_2} with {STR_VAR_1}.\p" + .string "Please, let’s form a tag team!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244313:: @ 8244313 + .string "Thank you very much!\n" + .string "I’ll be done with registration quickly!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244350:: @ 8244350 + .string "{PLAYER}, I was hoping that I could\n" + .string "partner up with you…$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244383:: @ 8244383 + .string "Um, my name’s {STR_VAR_3}, and I’m\n" + .string "{STR_VAR_1}’s no. {STR_VAR_2} apprentice.\p" + .string "Snivel…\p" + .string "I’m sorry!\n" + .string "This tension is making me cry…$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2443E7:: @ 82443E7 + .string "{STR_VAR_3} advised me, so I have\n" + .string "one {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244413:: @ 8244413 + .string "one {STR_VAR_2} with {STR_VAR_1}.\p" + .string "Snivel…\n" + .string "Please, please team up with me!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24444B:: @ 824444B + .string "Oh, really? You will?\n" + .string "Awesome! Wicked! Awoooh!\p" + .string "Oh… I’m sorry…\n" + .string "I’m so happy, I’m crying…\p" + .string "I’ll go register right away.\n" + .string "Please don’t go away!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2444D6:: @ 82444D6 + .string "Oh, b-but…\n" + .string "Sob… Waaaaah!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2444EF:: @ 82444EF + .string "Hi, there! I’m {STR_VAR_3}!\n" + .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24451E:: @ 824451E + .string "{STR_VAR_3} recommended my crew.\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244549:: @ 8244549 + .string "one {STR_VAR_2} with {STR_VAR_1},\n" + .string "that’s what I have! Cool, huh?\p" + .string "So come on!\n" + .string "Let’s form a tag team!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24459B:: @ 824459B + .string "Yay! Great!\n" + .string "Okay, I’ll go register, okay?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2445C5:: @ 82445C5 + .string "Aww, why?\n" + .string "I wanted to team up, {PLAYER}!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2445E8:: @ 82445E8 + .string "I’m {STR_VAR_3}, the no. {STR_VAR_2} apprentice\n" + .string "of the famous {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244618:: @ 8244618 + .string "I looked to {STR_VAR_3} for advice.\n" + .string "One {STR_VAR_1}-using {STR_VAR_2}$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244643:: @ 8244643 + .string "and one {STR_VAR_2} with {STR_VAR_1},\n" + .string "that’s my pair.\p" + .string "Please, will you join me in\n" + .string "a tag team?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24468F:: @ 824468F + .string "Thank you!\n" + .string "I’ll register right away!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2446B4:: @ 82446B4 + .string "{PLAYER}, I had been hoping to join\n" + .string "you in a tag team…$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2446E5:: @ 82446E5 + .string "Um… I’m sincerely happy that you\n" + .string "would take the time to talk to me.\p" + .string "I’m {STR_VAR_3}.\n" + .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice…$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24474D:: @ 824474D + .string "{STR_VAR_3} gave me advice.\n" + .string "I’m very grateful for it.\p" + .string "I have a team of one {STR_VAR_2}\n" + .string "with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24479E:: @ 824479E + .string "one {STR_VAR_2} with {STR_VAR_1}.\n" + .string "I know I’m asking a lot…\p" + .string "I don’t think you’ll be willing to,\n" + .string "but may I join you as a partner?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24480C:: @ 824480C + .string "Really? I can’t believe it!\n" + .string "I can’t believe you’ll let me join you!\l" + .string "I… I won’t let you down!\p" + .string "Um… If it’s really okay, I’ll go register\n" + .string "right this instant!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2448A7:: @ 82448A7 + .string "Oh…\n" + .string "I didn’t think I was good enough…$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2448CD:: @ 82448CD + .string "Hi, I’m {STR_VAR_3}.\n" + .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2448F5:: @ 82448F5 + .string "{STR_VAR_3} told me that it would be\n" + .string "good to make this team:\l" + .string "one {STR_VAR_1}-using {STR_VAR_2}$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244939:: @ 8244939 + .string "and one {STR_VAR_2} that knows how\n" + .string "to use {STR_VAR_1}.\p" + .string "Not bad, huh?\n" + .string "Want me to team up with you?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244989:: @ 8244989 + .string "Okay, glad to join you!\n" + .string "I hope you won’t mess things up for me!\l" + .string "I’ll do my registration now.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2449E6:: @ 82449E6 + .string "Huh? Why did you turn me down?\n" + .string "You’re no judge of character!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244A23:: @ 8244A23 + .string "I’m {STR_VAR_3} and I’m a TRIATHLETE.\n" + .string "I’m busy every day what with jogging,\l" + .string "training, and rapping.\p" + .string "I also happen to be {STR_VAR_1}’s\n" + .string "no. {STR_VAR_2} apprentice.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244AA9:: @ 8244AA9 + .string "This is what {STR_VAR_3} recommended.\n" + .string "One {STR_VAR_1}-using {STR_VAR_2}$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244AD6:: @ 8244AD6 + .string "and one {STR_VAR_1}-using\n" + .string "{STR_VAR_2}.\p" + .string "I put a lot of effort into raising\n" + .string "them, even though I’m busy.\p" + .string "Let’s form a tag team\n" + .string "and give it a go!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244B52:: @ 8244B52 + .string "Thanks, that’s the spirit!\n" + .string "Hang tight while I go register, okay?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244B93:: @ 8244B93 + .string "I took time from my busy schedule\n" + .string "to be here! Give me a break!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244BD2:: @ 8244BD2 + .string "Hi!\n" + .string "How’s it going?\p" + .string "I’m {STR_VAR_3}, {STR_VAR_1}’s\n" + .string "no. {STR_VAR_2} apprentice. Glad to meet you!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244C18:: @ 8244C18 + .string "Listen, listen! You have to hear about\n" + .string "the POKéMON {STR_VAR_3} recommended.\l" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244C6E:: @ 8244C6E + .string "one {STR_VAR_2} with {STR_VAR_1}.\n" + .string "Of course I raised them superbly!\p" + .string "So, want to team up?\n" + .string "I’m sure it’ll be a great combo!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244CD6:: @ 8244CD6 + .string "Yay, I think this will be fun!\n" + .string "I’ll go register!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244D07:: @ 8244D07 + .string "Oh, you’re mean!\n" + .string "I come recommended, you know.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244D36:: @ 8244D36 + .string "Please let me introduce myself.\n" + .string "I am {STR_VAR_3}.\p" + .string "I serve as {STR_VAR_1}’s\n" + .string "no. {STR_VAR_2} apprentice.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244D82:: @ 8244D82 + .string "I sought the sage advice of\n" + .string "{STR_VAR_3} and raised my team\l" + .string "of one {STR_VAR_2} with {STR_VAR_1}$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244DC6:: @ 8244DC6 + .string "and one {STR_VAR_2} with {STR_VAR_1}.\p" + .string "Please agree to a tag team with me!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244DFE:: @ 8244DFE + .string "Oh… I’m delighted!\n" + .string "I promise to give you my best!\p" + .string "Of course I will register us!\n" + .string "Please wait!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244E5B:: @ 8244E5B + .string "I had been hoping to join you,\n" + .string "{PLAYER}…$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244E7E:: @ 8244E7E + .string "Eek! You spoke to me!\n" + .string "I… I’m overjoyed!\p" + .string "I’m {STR_VAR_3}! I’m {STR_VAR_1}’s\n" + .string "no. {STR_VAR_2} apprentice!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244ECA:: @ 8244ECA + .string "On {STR_VAR_3}’s advice, I trained\n" + .string "one {STR_VAR_1}-using {STR_VAR_2}$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244EF4:: @ 8244EF4 + .string "and one {STR_VAR_1}-using\n" + .string "{STR_VAR_2}.\p" + .string "Please, can you grant me my wish?\n" + .string "I want to be your tag-team partner!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244F4F:: @ 8244F4F + .string "Eek! I… I feel giddy!\n" + .string "Thank you so much!\l" + .string "I’ll go register us right away!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244F98:: @ 8244F98 + .string "Waaah! Don’t you feel any pity?\n" + .string "But that makes you cooler…$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_244FD3:: @ 8244FD3 + .string "Yeehaw! I’m {STR_VAR_1}’s\n" + .string "no. {STR_VAR_2} apprentice!\p" + .string "{STR_VAR_3}’s my name, hello, hello!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245013:: @ 8245013 + .string "My mentor {STR_VAR_3} recommended\n" + .string "one {STR_VAR_1}-master {STR_VAR_2}$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24503D:: @ 824503D + .string "and one {STR_VAR_1}-master\n" + .string "{STR_VAR_2}.\p" + .string "Good stuff, huh?\n" + .string "You’ll partner with me, won’t you?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245087:: @ 8245087 + .string "Okay, excellent!\n" + .string "I’ll get the registration done quickly!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2450C0:: @ 82450C0 + .string "Gwaaah!\n" + .string "You’re a calculating one, {PLAYER}!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2450E6:: @ 82450E6 + .string "Hey! There’s big trouble! This is\n" + .string "the BATTLE TOWER’s last day!\p" + .string "… … … … … …\n" + .string "I’m only joking!\p" + .string "People call me {STR_VAR_3} and I do, too!\n" + .string "I’m {STR_VAR_1}’s 1,000th apprentice!\l" + .string "Actually, I’m no. {STR_VAR_2}!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245196:: @ 8245196 + .string "{STR_VAR_3} gave me some advice.\n" + .string "{STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2451BD:: @ 82451BD + .string "{STR_VAR_2} with {STR_VAR_1}.\n" + .string "I’ve got ten of each kind!\l" + .string "Actually, just one of each!\p" + .string "How about it?\n" + .string "Want to try tag battles with me?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24522F:: @ 824522F + .string "Yippee!\n" + .string "I’ll give you a POKéMON as my thanks!\p" + .string "Just joking! But I will really go do\n" + .string "the registration, okay?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24529A:: @ 824529A + .string "Oh, that’s so cold! I’ll have to wreck\n" + .string "the BATTLE TOWER for that!\p" + .string "Of course I won’t!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2452EF:: @ 82452EF + .string "Hey, there, I’m rockin’ and a-rollin’!\n" + .string "POKéMON, I be controllin’!\p" + .string "I’m {STR_VAR_3} the rappin’ SAILOR.\n" + .string "Don’t be mistakin’ me for no wailer!\p" + .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n" + .string "Me, you shouldn’t be quick to dismiss!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2453B4:: @ 82453B4 + .string "With the advice of {STR_VAR_3} I did\n" + .string "abide, put together my team of pride!\l" + .string "One {STR_VAR_1}-using {STR_VAR_2}$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245406:: @ 8245406 + .string "and one {STR_VAR_1}-using\n" + .string "{STR_VAR_2}!\p" + .string "Our meeting we should commemorate,\n" + .string "with a tag-team victory to celebrate!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245464:: @ 8245464 + .string "Hey, hey, I like your style!\n" + .string "Our registration, I will go file!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2454A3:: @ 82454A3 + .string "Oh, hey, {PLAYER}, now that’s cold!\n" + .string "If I may be so bold!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2454D6:: @ 82454D6 + .string "Yippee-yahoo!\n" + .string "Oh, don’t run! I was just having fun!\p" + .string "Howdy! I’m {STR_VAR_3}!\n" + .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245535:: @ 8245535 + .string "{STR_VAR_3} told me what to do.\n" + .string "So one {STR_VAR_1}-using {STR_VAR_2}$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24555F:: @ 824555F + .string "and one {STR_VAR_1}-using\n" + .string "{STR_VAR_2}, I did choose.\p" + .string "So, what do you say?\n" + .string "Come on, make my day!\p" + .string "Please, I’m begging you!\n" + .string "Let me join you, don’t leave me blue!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2455EC:: @ 82455EC + .string "Yeahah! Luck is with me!\n" + .string "It sure makes me happy!\p" + .string "Before we go join the fray,\n" + .string "I’ll go register right away!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245656:: @ 8245656 + .string "You’re turning me down?\n" + .string "{PLAYER}, you’re making me frown!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24568A:: @ 824568A + .string "Cough!\p" + .string "Oh, sorry, I have a cold.\n" + .string "My POKéMON are fine, though.\p" + .string "My name’s {STR_VAR_3}, {STR_VAR_1}’s\n" + .string "no. {STR_VAR_2} apprentice. Cough!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2456F5:: @ 82456F5 + .string "I took {STR_VAR_3}’s advice to heart\n" + .string "and put together my team of\l" + .string "one {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245740:: @ 8245740 + .string "one {STR_VAR_2} with {STR_VAR_1}.\p" + .string "I trained them every day,\n" + .string "even in wind and rain.\p" + .string "That’s why I have this cold,\n" + .string "I think.\p" + .string "That’s what I’m about.\n" + .string "Want to be my tag partner?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2457D9:: @ 82457D9 + .string "Thanks, I appreciate this!\n" + .string "Cough, cough!\l" + .string "Hang on while I go register.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24581F:: @ 824581F + .string "Oh, you won’t?\n" + .string "{PLAYER}, I think we’d make a good pair.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245851:: @ 8245851 + .string "Oh, hello!\n" + .string "This is nerve-racking.\p" + .string "I’m {STR_VAR_3}.\n" + .string "I’m the no. {STR_VAR_2} apprentice of {STR_VAR_1}.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24589C:: @ 824589C + .string "{STR_VAR_3} said this team’ll be good--\n" + .string "one {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2458CE:: @ 82458CE + .string "one {STR_VAR_2} with {STR_VAR_1}.\p" + .string "I’m feeling self-conscious about this,\n" + .string "but will you let me join you?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245923:: @ 8245923 + .string "Oh, gee, thank you!\n" + .string "I feel bashful, but I’ll do my best!\p" + .string "I’ll go get the registration done.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24597F:: @ 824597F + .string "Oh, please don’t say no!\n" + .string "I feel self-conscious enough already…$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2459BE:: @ 82459BE + .string "I am {STR_VAR_3}, and that’s no lie.\n" + .string "I am {STR_VAR_1}’s no. {STR_VAR_2} apprentice.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2459F7:: @ 82459F7 + .string "{STR_VAR_3} recommended my team.\p" + .string "Since the advice sounded sincere,\n" + .string "I decided to bring with me\l" + .string "my {STR_VAR_1}-using {STR_VAR_2} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245A5F:: @ 8245A5F + .string "my {STR_VAR_1}-using {STR_VAR_2}.\p" + .string "If possible, I would like you to accept\n" + .string "me as your tag-team partner.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245AB4:: @ 8245AB4 + .string "You really will accept me?\n" + .string "It would be too terrible otherwise.\p" + .string "But since you’ve agreed, this is fine.\n" + .string "I shall go register the both of us.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245B3E:: @ 8245B3E + .string "Hm? Now why would you refuse?\n" + .string "Is this your idea of a joke?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245B79:: @ 8245B79 + .string "I’m {STR_VAR_1}, and I’m a LASS!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245B91:: @ 8245B91 + .string "What I have are one {STR_VAR_2}\n" + .string "that uses {STR_VAR_1} and one$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245BBD:: @ 8245BBD + .string "{STR_VAR_2} that uses {STR_VAR_1}.\n" + .string "Those are what I have with me.\p" + .string "Will you be my partner?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245C05:: @ 8245C05 + .string "Thank you!\n" + .string "I’ll go do the registration!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245C2D:: @ 8245C2D + .string "You don’t want to be my partner?\n" + .string "You’ll regret it later!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245C66:: @ 8245C66 + .string "Hello!\p" + .string "I’m YOUNGSTER {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245C7F:: @ 8245C7F + .string "Want to know what I have?\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245CAC:: @ 8245CAC + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "You’ll be my tag-team partner,\n" + .string "won’t you?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245CE6:: @ 8245CE6 + .string "Yay!\n" + .string "I’ll go and register, okay?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245D07:: @ 8245D07 + .string "Aww! If you’d form a tag team with\n" + .string "my POKéMON, we’d be unstoppable!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245D4B:: @ 8245D4B + .string "Yahoo!\n" + .string "I’m HIKER {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245D60:: @ 8245D60 + .string "Know what I have with me?\n" + .string "My {STR_VAR_1}-using {STR_VAR_2} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245D8D:: @ 8245D8D + .string "my {STR_VAR_1}-using {STR_VAR_2}!\p" + .string "Sounds good, eh?\n" + .string "Want to form a tag team?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245DC7:: @ 8245DC7 + .string "Yahoo!\n" + .string "I’ll go do the registering, then.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245DF0:: @ 8245DF0 + .string "I would’ve liked to battle with you\n" + .string "at my side.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245E20:: @ 8245E20 + .string "Hello!\n" + .string "I’m {STR_VAR_1}, and I’m a BEAUTY!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245E41:: @ 8245E41 + .string "Do you know what I’ve been raising?\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245E78:: @ 8245E78 + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "What do you think?\n" + .string "Want to make a tag team together?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245EBD:: @ 8245EBD + .string "Wonderful!\n" + .string "I’ll get the registration done now!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245EEC:: @ 8245EEC + .string "How disappointing!\p" + .string "We two together--we would’ve been\n" + .string "the best!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245F2B:: @ 8245F2B + .string "Yo!\p" + .string "You know who I am?\n" + .string "I’m {STR_VAR_1} the FISHERMAN!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245F58:: @ 8245F58 + .string "I’ve got with me a team of one\n" + .string "{STR_VAR_1}-using {STR_VAR_2} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245F87:: @ 8245F87 + .string "one {STR_VAR_1}-using {STR_VAR_2}.\p" + .string "So, how about it?\n" + .string "Will you battle at my side?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_245FC6:: @ 8245FC6 + .string "Good, good!\n" + .string "Leave it up to me!\p" + .string "I’ll go and register us now.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246002:: @ 8246002 + .string "We matched up perfectly, too…$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246020:: @ 8246020 + .string "Glad to make your acquaintance.\n" + .string "I am {STR_VAR_1}, a LADY.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246051:: @ 8246051 + .string "I am accompanied by a team of\n" + .string "one {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246082:: @ 8246082 + .string "one {STR_VAR_2} with {STR_VAR_1}.\p" + .string "I hope I meet your approval.\n" + .string "For I wish to have you as my partner.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2460D5:: @ 82460D5 + .string "I thank you sincerely.\n" + .string "I shall handle the registration.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24610D:: @ 824610D + .string "I’m sure that you will regret not\n" + .string "having me as your partner.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24614A:: @ 824614A + .string "I’m TRIATHLETE {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24615D:: @ 824615D + .string "What I have…\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24617D:: @ 824617D + .string "one {STR_VAR_2} with {STR_VAR_1}!\n" + .string "That’s my pair!\p" + .string "Please?\n" + .string "Will you form a tag team with me?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2461C7:: @ 82461C7 + .string "Gee, thanks!\n" + .string "I’ll go register at the counter.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2461F5:: @ 82461F5 + .string "We two together, we would’ve been\n" + .string "tough for certain!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24622A:: @ 824622A + .string "Hiya!\n" + .string "I’m BUG CATCHER {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246244:: @ 8246244 + .string "Check out what I have!\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24626E:: @ 824626E + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "So, listen!\n" + .string "Do you want to form a tag team?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2462AA:: @ 82462AA + .string "Gotcha!\p" + .string "I’ll go do the registration stuff\n" + .string "at the counter.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2462E4:: @ 82462E4 + .string "Aww, my POKéMON are awesome.\n" + .string "I hope you won’t regret this!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24631F:: @ 824631F + .string "Good day!\n" + .string "I’m SCHOOL KID {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24633C:: @ 824633C + .string "What I’ve been raising are one\n" + .string "{STR_VAR_2} that uses {STR_VAR_1}$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24636B:: @ 824636B + .string "and one {STR_VAR_2} that uses\n" + .string "{STR_VAR_1}.\p" + .string "Not too bad, don’t you think?\n" + .string "Would you care to form a tag team?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2463C5:: @ 82463C5 + .string "Thank you very much!\n" + .string "I’ll get done with the registration.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2463FF:: @ 82463FF + .string "That’s too bad…\p" + .string "I was hoping that I could learn\n" + .string "from you as your partner…$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246449:: @ 8246449 + .string "Yo! Let me tell you who I am!\n" + .string "I’m RICH BOY {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246478:: @ 8246478 + .string "Guess what I got!\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D:: @ 824649D + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "I’m willing to offer you the chance\n" + .string "to be in a tag team with me.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2464EE:: @ 82464EE + .string "Smart move!\p" + .string "I’ll finish up the registration\n" + .string "process quick!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246529:: @ 8246529 + .string "You’d turn me of all people down?\n" + .string "You’ll regret that decision for sure!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246571:: @ 8246571 + .string "Hiyah!\n" + .string "I am BLACK BELT {STR_VAR_1}.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24658C:: @ 824658C + .string "As my companions, I have\n" + .string "one {STR_VAR_2} using {STR_VAR_1}$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2465B5:: @ 82465B5 + .string "and one {STR_VAR_2} using\n" + .string "{STR_VAR_1}.\p" + .string "Please, grant me my wish!\n" + .string "Allow me to be your tag partner!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246605:: @ 8246605 + .string "Hiyah!\n" + .string "I will go register forthwith!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24662A:: @ 824662A + .string "I see… I hope for an opportunity\n" + .string "the next time we meet…$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246662:: @ 8246662 + .string "Hi, there!\n" + .string "I’m {STR_VAR_1}, and I’m a TUBER!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246686:: @ 8246686 + .string "I’ll tell you what I have.\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2466B4:: @ 82466B4 + .string "one {STR_VAR_2} with {STR_VAR_1}!\n" + .string "May I please be on your tag team?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2466E6:: @ 82466E6 + .string "Thank you!\n" + .string "I’ll go register us now!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24670A:: @ 824670A + .string "If we’d become partners, we could\n" + .string "have been so strong!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246741:: @ 8246741 + .string "Greetings…\n" + .string "I am HEX MANIAC {STR_VAR_1}…$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246760:: @ 8246760 + .string "I bear with me one {STR_VAR_1}-using\n" + .string "{STR_VAR_2} together with one$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246791:: @ 8246791 + .string "{STR_VAR_1}-using {STR_VAR_2}…\p" + .string "I beseech you…\n" + .string "Join me in a tag team…$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2467C4:: @ 82467C4 + .string "I thank you…\n" + .string "I shall register us…$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2467E6:: @ 82467E6 + .string "I so longed to join you…$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2467FF:: @ 82467FF + .string "How do you do? I’m {STR_VAR_1},\n" + .string "and I’m a POKéMON BREEDER!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246831:: @ 8246831 + .string "I’m raising a couple good ones!\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246864:: @ 8246864 + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "How about it?\n" + .string "Feel like making a tag team with me?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2468A7:: @ 82468A7 + .string "Thank you kindly!\p" + .string "I’ll go take care of the registration\n" + .string "stuff, so you wait right here!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2468FE:: @ 82468FE + .string "I was looking forward to being\n" + .string "your partner…$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24692B:: @ 824692B + .string "Well, hello!\n" + .string "I’m TRIATHLETE {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24694B:: @ 824694B + .string "Want to know what I run with?\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24697C:: @ 824697C + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "Well?\n" + .string "Want to be in a tag team with me?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2469B4:: @ 82469B4 + .string "Good going!\p" + .string "I’ll be quick and get the registration\n" + .string "all done!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2469F1:: @ 82469F1 + .string "You and me, we would’ve been tops.\n" + .string "It’s too bad…$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246A22:: @ 8246A22 + .string "Hey, there! My name’s {STR_VAR_1}!\n" + .string "I’m a TRIATHLETE!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246A4E:: @ 8246A4E + .string "I go on runs with my durable team--\n" + .string "one {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246A85:: @ 8246A85 + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "Not too shabby, huh?\n" + .string "We should be in a tag team together!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246ACF:: @ 8246ACF + .string "All right!\n" + .string "I’ll go register in a flash!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246AF7:: @ 8246AF7 + .string "I really wanted to battle as your\n" + .string "tag-team partner…$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246B2B:: @ 8246B2B + .string "I’m BATTLE GIRL {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246B3F:: @ 8246B3F + .string "I’ve been toughening up one\n" + .string "{STR_VAR_1}-using {STR_VAR_2} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246B6B:: @ 8246B6B + .string "one {STR_VAR_1}-using {STR_VAR_2}!\p" + .string "Do you like that combo?\n" + .string "How about you and me join up?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246BB2:: @ 8246BB2 + .string "Why, thanks!\p" + .string "I’ll get the registration done\n" + .string "right now!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246BE9:: @ 8246BE9 + .string "With you, I thought we could form\n" + .string "the ultimate tag team…$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246C22:: @ 8246C22 + .string "I’m TRIATHLETE {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246C35:: @ 8246C35 + .string "I’ve been running with one {STR_VAR_2}\n" + .string "that knows how to use {STR_VAR_1}$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246C6C:: @ 8246C6C + .string "and one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "We could be in a tag team.\n" + .string "Wouldn’t that be great?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246CB3:: @ 8246CB3 + .string "Thank you!\p" + .string "I’ll go register us, and that’s\n" + .string "right now!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246CE9:: @ 8246CE9 + .string "Aww, that’s too bad. We would’ve been\n" + .string "the toughest tag team around!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246D2D:: @ 8246D2D + .string "Me?\n" + .string "I’m TUBER {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246D3F:: @ 8246D3F + .string "What do I have with me?\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246D6A:: @ 8246D6A + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "Hey?\n" + .string "You’ll team up with me, right?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246D9E:: @ 8246D9E + .string "Okay!\p" + .string "I’ll go register!\n" + .string "Let’s be excellent together!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246DD3:: @ 8246DD3 + .string "My POKéMON are tough for sure…\n" + .string "It’s too bad you don’t want to team up.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246E1A:: @ 8246E1A + .string "Yay-hey!\n" + .string "Call me GUITARIST {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246E39:: @ 8246E39 + .string "Check out my entourage!\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246E64:: @ 8246E64 + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "Yay-hey! Pretty wild, huh?\n" + .string "We’ll have to do a duet in a tag team!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246EB6:: @ 8246EB6 + .string "Yay-hey! Right on!\n" + .string "I’ll do that registration stuff now!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246EEE:: @ 8246EEE + .string "My POKéMON rock hard!\n" + .string "You’ll be sorry, I tell you!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246F21:: @ 8246F21 + .string "Pleased to meet you.\n" + .string "I am {STR_VAR_1}, a GENTLEMAN.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246F4C:: @ 8246F4C + .string "I am accompanied by my trusted\n" + .string "{STR_VAR_1}-using {STR_VAR_2} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246F7B:: @ 8246F7B + .string "one {STR_VAR_1}-using {STR_VAR_2}.\p" + .string "May I ask you to join me in a tag-team\n" + .string "partnership arrangement?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_246FCC:: @ 8246FCC + .string "Ah, I thank you for your trust.\n" + .string "I shall be done with the registration.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247013:: @ 8247013 + .string "That is most unfortunate…\p" + .string "I shall look forward to the next\n" + .string "opportunity…$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24705B:: @ 824705B + .string "Hello, I’m {STR_VAR_1},\n" + .string "and I’m a POKéFAN.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24707D:: @ 824707D + .string "I have with me now one {STR_VAR_2}\n" + .string "that knows the move {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2470B2:: @ 82470B2 + .string "one {STR_VAR_2} with {STR_VAR_1}.\p" + .string "Do you like what you see?\n" + .string "Why don’t you be my tag partner?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2470FD:: @ 82470FD + .string "Thank you!\n" + .string "I’ll look after the registration!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24712A:: @ 824712A + .string "My POKéMON are top grade…\n" + .string "It’s too bad you can’t appreciate that.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24716C:: @ 824716C + .string "Hm!\n" + .string "I am {STR_VAR_1}, and an EXPERT am I!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24718D:: @ 824718D + .string "The POKéMON that I’ve toughened up are\n" + .string "one {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2471C7:: @ 82471C7 + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "What say you to a tag team with me?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2471FB:: @ 82471FB + .string "Hm!\n" + .string "I shall register us right away!\l" + .string "Let us both do our best!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247238:: @ 8247238 + .string "I will hope that your choice is\n" + .string "indeed correct…$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247268:: @ 8247268 + .string "Hello, hello.\n" + .string "I’m {STR_VAR_1}, and I’m an EXPERT.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247291:: @ 8247291 + .string "I’ve raised my POKéMON thoroughly.\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2472C7:: @ 82472C7 + .string "one {STR_VAR_2} with {STR_VAR_1}--\n" + .string "they’re what I have.\p" + .string "Wouldn’t you like to team up with me?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247313:: @ 8247313 + .string "Good, good.\n" + .string "I’ll see to the registration right away.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247348:: @ 8247348 + .string "Perhaps we can form a team the next\n" + .string "time we meet.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24737A:: @ 824737A + .string "I’m DRAGON TAMER {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24738F:: @ 824738F + .string "The team I’ve been toughening up is\n" + .string "one {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2473C6:: @ 82473C6 + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "How about it?\n" + .string "Want to be my partner?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2473FB:: @ 82473FB + .string "Okay, I’ll give it my best!\n" + .string "I’ll go register now, all right?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247438:: @ 8247438 + .string "You’re not going to find many tougher\n" + .string "partners than me!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247470:: @ 8247470 + .string "I’m BIRD KEEPER {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247484:: @ 8247484 + .string "What POKéMON do I have?\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2474AF:: @ 82474AF + .string "one {STR_VAR_2} with {STR_VAR_1}.\p" + .string "Don’t you think we’d make a decent\n" + .string "tag team?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2474EC:: @ 82474EC + .string "Great, thanks!\n" + .string "I’ll look after the registration!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24751D:: @ 824751D + .string "My POKéMON and I are strong.\n" + .string "What a letdown.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24754A:: @ 824754A + .string "I’m NINJA BOY {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24755C:: @ 824755C + .string "My POKéMON team consists of one\n" + .string "{STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24758B:: @ 824758B + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "Let’s be in a tag team together!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2475BC:: @ 82475BC + .string "Yay!\n" + .string "Let me go register!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2475D5:: @ 82475D5 + .string "You’ll regret not having my tough\n" + .string "POKéMON on your side!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24760D:: @ 824760D + .string "Hello!\n" + .string "I’m PARASOL LADY {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247629:: @ 8247629 + .string "Escorting me now are my {STR_VAR_2}\n" + .string "that uses {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247655:: @ 8247655 + .string "one {STR_VAR_2} that uses\n" + .string "{STR_VAR_1}.\p" + .string "Aren’t they nice?\n" + .string "Care to join us in a tag team?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24769B:: @ 824769B + .string "Thanks a bunch!\p" + .string "I’ll go register at the counter.\n" + .string "Let’s not disappoint each other!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2476ED:: @ 82476ED + .string "My POKéMON are tremendously strong.\n" + .string "How disappointing…$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247724:: @ 8247724 + .string "Hello.\n" + .string "I’m {STR_VAR_1}, and I’m a BUG MANIAC!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247749:: @ 8247749 + .string "I have found my POKéMON, yes.\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24777A:: @ 824777A + .string "one {STR_VAR_2} with {STR_VAR_1}--\n" + .string "they are what I found.\p" + .string "Could I interest you in forming\n" + .string "a tag team?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2477CE:: @ 82477CE + .string "Okay!\n" + .string "Understood!\p" + .string "I won’t be long with the registration!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247807:: @ 8247807 + .string "With the POKéMON I found, we wouldn’t\n" + .string "have lost…$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247838:: @ 8247838 + .string "Ahoy, there!\n" + .string "I’m SAILOR {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247854:: @ 8247854 + .string "Let me show you my pride and joy!\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247889:: @ 8247889 + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "Of course you’re not going to turn\n" + .string "me down. We will team up, right?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2478DD:: @ 82478DD + .string "I didn’t expect any less!\n" + .string "I’ll go register now.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24790D:: @ 824790D + .string "We would’ve stormed through\n" + .string "the opposition! Too bad!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247942:: @ 8247942 + .string "Hi, I’m {STR_VAR_1}.\n" + .string "I’m a COLLECTOR.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24795F:: @ 824795F + .string "The jewels in my collection are\n" + .string "my {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247991:: @ 8247991 + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "Swell, huh?\n" + .string "We should be in a team together.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2479CE:: @ 82479CE + .string "Oh, yeah!\p" + .string "Well, let’s not waste any time.\n" + .string "I’ll go register the two of us.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247A18:: @ 8247A18 + .string "Well, that’s upsetting.\n" + .string "You don’t appreciate my POKéMON.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247A51:: @ 8247A51 + .string "Howdy, I’m {STR_VAR_1}.\n" + .string "I’m a POKéMON RANGER.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247A76:: @ 8247A76 + .string "Keeping me company are one\n" + .string "{STR_VAR_1}-using {STR_VAR_2} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247AA1:: @ 8247AA1 + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "Don’t you think we’d make an impressive\n" + .string "tag team?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247AE3:: @ 8247AE3 + .string "That’s super!\n" + .string "I’ll deal with the registration now.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247B16:: @ 8247B16 + .string "Next time, choose my POKéMON,\n" + .string "will you?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247B3E:: @ 8247B3E + .string "My name’s {STR_VAR_1}.\n" + .string "I’m a POKéMON RANGER!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247B62:: @ 8247B62 + .string "Let me tell you about my team. I have\n" + .string "one {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247B9B:: @ 8247B9B + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "How would you like to form a tag team\n" + .string "with my little posse?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247BE7:: @ 8247BE7 + .string "We’ll be at our best!\n" + .string "I’ll get the registration done quick!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247C23:: @ 8247C23 + .string "I hope you’ll choose my POKéMON\n" + .string "next time.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247C4E:: @ 8247C4E + .string "Pleased to meet you. I’m {STR_VAR_1}.\n" + .string "I consider myself an AROMA LADY.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247C8C:: @ 8247C8C + .string "I travel with one {STR_VAR_2}\n" + .string "that uses {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247CB2:: @ 8247CB2 + .string "one {STR_VAR_2} that uses\n" + .string "{STR_VAR_1}.\p" + .string "I hope they strike your fancy.\n" + .string "Would you care to be my partner?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247D07:: @ 8247D07 + .string "I’m honored by your acceptance.\n" + .string "I will go register right this instant.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247D4E:: @ 8247D4E + .string "It would be wonderful if we could form\n" + .string "a tag team the next time we meet.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247D97:: @ 8247D97 + .string "Want to know who I am?\n" + .string "I’m {STR_VAR_1}, the RUIN MANIAC!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247DC7:: @ 8247DC7 + .string "The POKéMON that I have with me are\n" + .string "one {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247DFE:: @ 8247DFE + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "Intriguing, eh?\n" + .string "How about you and I partner up?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247E3E:: @ 8247E3E + .string "That’s a sound decision!\n" + .string "I’ll go do the registration paperwork.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247E7E:: @ 8247E7E + .string "Hmm…\n" + .string "I think my POKéMON are tough…$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247EA1:: @ 8247EA1 + .string "I’m COOLTRAINER {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247EB5:: @ 8247EB5 + .string "The POKéMON I have right now are one\n" + .string "{STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247EE9:: @ 8247EE9 + .string "one {STR_VAR_2} with {STR_VAR_1}.\n" + .string "Cool, huh?\p" + .string "Don’t you think it’d be pretty cool\n" + .string "if we made a tag team?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247F3F:: @ 8247F3F + .string "Cool!\n" + .string "I’ll go do the registration in a flash!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247F6D:: @ 8247F6D + .string "I thought that we’d make just\n" + .string "the greatest team ever.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247FA3:: @ 8247FA3 + .string "I’m COOLTRAINER {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247FB7:: @ 8247FB7 + .string "The team I’ve been raising has one\n" + .string "{STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_247FE9:: @ 8247FE9 + .string "one {STR_VAR_2} with {STR_VAR_1}.\p" + .string "Does that sound okay?\n" + .string "How about we become tag partners?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248031:: @ 8248031 + .string "Sounds A-OK!\n" + .string "I’d better do the registration.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24805E:: @ 824805E + .string "I was thinking how we would be\n" + .string "one tough team…$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24808D:: @ 824808D + .string "Heyo!\n" + .string "I’m {STR_VAR_1}, the POKéMANIAC!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2480AB:: @ 82480AB + .string "What does a guy like me have?\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2480DC:: @ 82480DC + .string "one {STR_VAR_2} with {STR_VAR_1},\n" + .string "that’s what!\p" + .string "Let’s do it!\n" + .string "We’ll stomp around as a tag team!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248128:: @ 8248128 + .string "Good call!\n" + .string "I’ll register the both of us!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248151:: @ 8248151 + .string "My POKéMON are brutal!\n" + .string "It’s not my fault if you regret this!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24818E:: @ 824818E + .string "Yo, there!\n" + .string "I’m KINDLER {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2481A9:: @ 82481A9 + .string "You know what my training cooked up?\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2481E1:: @ 82481E1 + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "Well, what do you say?\n" + .string "Want to form a tag team?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248221:: @ 8248221 + .string "All right!\n" + .string "I’ll get on with the registration.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24824F:: @ 824824F + .string "Promise you’ll partner up with me\n" + .string "the next time we run into each other.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248297:: @ 8248297 + .string "I’m {STR_VAR_1}, and I’m a CAMPER!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2482B1:: @ 82482B1 + .string "I’ve been raising one {STR_VAR_1}-\n" + .string "using {STR_VAR_2} and one$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2482DC:: @ 82482DC + .string "{STR_VAR_1}-using {STR_VAR_2}.\p" + .string "Do you think it’d be fun to team up?\n" + .string "I bet it would be!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248321:: @ 8248321 + .string "Yeah!\n" + .string "Off I go to register!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24833D:: @ 824833D + .string "Next time, okay?\n" + .string "I want to be on your team.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248369:: @ 8248369 + .string "Hello!\n" + .string "I’m {STR_VAR_1}, and I’m a PICNICKER!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24838D:: @ 824838D + .string "The POKéMON I’ve been taking are\n" + .string "one {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2483C1:: @ 82483C1 + .string "one {STR_VAR_2} with {STR_VAR_1}.\p" + .string "Are you interested in joining me\n" + .string "on a tag team?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248401:: @ 8248401 + .string "Why, thank you!\n" + .string "I will do the registration now.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248431:: @ 8248431 + .string "It would be nice if I could join you\n" + .string "some other time.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248467:: @ 8248467 + .string "I’m PSYCHIC {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248477:: @ 8248477 + .string "The twosome I’ve been raising are\n" + .string "one {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2484AC:: @ 82484AC + .string "one {STR_VAR_2} with {STR_VAR_1}.\p" + .string "Would you like to form a tag team\n" + .string "with me?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2484E7:: @ 82484E7 + .string "Sure thing!\n" + .string "I’ll take care of the registration!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248517:: @ 8248517 + .string "If we meet again, that’s when I’d like\n" + .string "to team up with you.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248553:: @ 8248553 + .string "I’m {STR_VAR_1}.\n" + .string "I’m a PSYCHIC.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24856A:: @ 824856A + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24857D:: @ 824857D + .string "one {STR_VAR_2} with {STR_VAR_1}--\n" + .string "they’re my disciples.\p" + .string "Doesn’t the idea of forming a tag-team\n" + .string "partnership intrigue you?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2485E5:: @ 82485E5 + .string "Thank you.\n" + .string "I’ll go deal with the registration.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248614:: @ 8248614 + .string "I hope there will be another chance\n" + .string "to forge an alliance.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24864E:: @ 824864E + .string "I’m SCHOOL KID {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248661:: @ 8248661 + .string "One {STR_VAR_1}-using {STR_VAR_2}$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248671:: @ 8248671 + .string "and one {STR_VAR_1}-using\n" + .string "{STR_VAR_2} are my POKéMON pair.\p" + .string "May I please be your partner on\n" + .string "a tag team?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2486C6:: @ 82486C6 + .string "Ooh, thank you!\n" + .string "I’ll register at the counter right away!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2486FF:: @ 82486FF + .string "Please?\n" + .string "May I join you the next time?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248725:: @ 8248725 + .string "Hiya! The name’s {STR_VAR_1}!\n" + .string "I’m a POKéMON BREEDER!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248751:: @ 8248751 + .string "The POKéMON I’ve raised are one\n" + .string "{STR_VAR_1}-using {STR_VAR_2} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248781:: @ 8248781 + .string "one {STR_VAR_1}-using {STR_VAR_2}.\p" + .string "Sound interesting?\n" + .string "How about we form a tag team, then?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2487C9:: @ 82487C9 + .string "All righty!\n" + .string "You leave the registration to me!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2487F7:: @ 82487F7 + .string "You have to team up with me next time,\n" + .string "all right?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248829:: @ 8248829 + .string "I’m {STR_VAR_1}, and I’m proud to say\n" + .string "that I am a POKéFAN.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24885B:: @ 824885B + .string "The darling POKéMON I’ve raised are\n" + .string "one {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248892:: @ 8248892 + .string "one {STR_VAR_2} with {STR_VAR_1}.\p" + .string "Aren’t they just the cutest?\n" + .string "We ought to make a team!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2488D8:: @ 82488D8 + .string "Thank you, dear!\n" + .string "I’ll be on my way to register!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248908:: @ 8248908 + .string "My darling POKéMON are the best,\n" + .string "I’ll have you know. How annoying!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24894B:: @ 824894B + .string "Hi, I’m SWIMMER {STR_VAR_1}.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24895F:: @ 824895F + .string "One {STR_VAR_1}-using {STR_VAR_2}$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_24896F:: @ 824896F + .string "and one {STR_VAR_1}-using\n" + .string "{STR_VAR_2} are what I’ve trained.\p" + .string "You and me, let’s make a tag team.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2489BD:: @ 82489BD + .string "That’s cool!\n" + .string "I’ll register the two of us.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_2489E7:: @ 82489E7 + .string "If we meet again, you owe me\n" + .string "a tag team!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248A10:: @ 8248A10 + .string "What’s happening?\n" + .string "I’m {STR_VAR_1}, and I’m a TRIATHLETE.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248A40:: @ 8248A40 + .string "I got a couple decent POKéMON.\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248A72:: @ 8248A72 + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "It’d be neat if we made a tag team\n" + .string "together, so how about it?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248AC0:: @ 8248AC0 + .string "Right on!\n" + .string "You wait while I register, okay?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248AEB:: @ 8248AEB + .string "I expect you’ll let me join you\n" + .string "next time, how’s that?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248B22:: @ 8248B22 + .string "I’m the TRIATHLETE {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248B39:: @ 8248B39 + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248B4C:: @ 8248B4C + .string "another {STR_VAR_2} that knows how\n" + .string "to use {STR_VAR_1}. That’s my pair.\p" + .string "What do you think?\n" + .string "We’d make a good team, I’d say.$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248BB4:: @ 8248BB4 + .string "I like that answer!\n" + .string "I’ll get done with registration fast!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248BEE:: @ 8248BEE + .string "You’ll give me another chance to form\n" + .string "a partnership, won’t you?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248C2E:: @ 8248C2E + .string "Hi, there! Hello!\n" + .string "I’m {STR_VAR_1}, and I’m a SWIMMER!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248C5B:: @ 8248C5B + .string "Check out what I’ve been raising!\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248C90:: @ 8248C90 + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "Sweet, huh?\n" + .string "It’d be sweet to form a team, too!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248CCF:: @ 8248CCF + .string "Much obliged!\n" + .string "I’ll get this registration thing done!$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_248D04:: @ 8248D04 + .string "If we meet again, you have to team up\n" + .string "with me. You’ll do that, right?$" + diff --git a/data/maps/BattleFrontier_Lounge1/events.inc b/data/maps/BattleFrontier_Lounge1/events.inc new file mode 100644 index 000000000..b6c6ecdd0 --- /dev/null +++ b/data/maps/BattleFrontier_Lounge1/events.inc @@ -0,0 +1,11 @@ +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 + +BattleFrontier_Lounge1_MapWarps: @ 853CFFC + 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/BattleFrontier_Lounge1/scripts.inc b/data/maps/BattleFrontier_Lounge1/scripts.inc new file mode 100644 index 000000000..ba8ca0cb6 --- /dev/null +++ b/data/maps/BattleFrontier_Lounge1/scripts.inc @@ -0,0 +1,269 @@ +BattleFrontier_Lounge1_MapScripts:: @ 825E774 + .byte 0 + +BattleFrontier_Lounge1_EventScript_25E775:: @ 825E775 + lock + faceplayer + checkflag FLAG_0x153 + call_if 0, BattleFrontier_Lounge1_EventScript_25E7AD + checkflag FLAG_0x153 + call_if 1, BattleFrontier_Lounge1_EventScript_25E7B6 + setflag FLAG_0x153 + goto BattleFrontier_Lounge1_EventScript_25E792 + end + +BattleFrontier_Lounge1_EventScript_25E792:: @ 825E792 + special sub_81B94B0 + waitstate + compare VAR_0x8004, 255 + goto_if 5, BattleFrontier_Lounge1_EventScript_25E7BF + compare VAR_0x8004, 255 + goto_eq BattleFrontier_Lounge1_EventScript_25E943 + end + +BattleFrontier_Lounge1_EventScript_25E7AD:: @ 825E7AD + msgbox BattleFrontier_Lounge1_Text_25E95F, 4 + return + +BattleFrontier_Lounge1_EventScript_25E7B6:: @ 825E7B6 + msgbox BattleFrontier_Lounge1_Text_25EEF6, 4 + return + +BattleFrontier_Lounge1_EventScript_25E7BF:: @ 825E7BF + specialvar VAR_RESULT, ScriptGetPartyMonSpecies + compare VAR_RESULT, 412 + goto_eq BattleFrontier_Lounge1_EventScript_25E7FF + special sub_8139D98 + compare VAR_0x8005, 90 + goto_if 3, BattleFrontier_Lounge1_EventScript_25E87F + compare VAR_0x8005, 120 + goto_if 3, BattleFrontier_Lounge1_EventScript_25E88D + compare VAR_0x8005, 150 + goto_if 3, BattleFrontier_Lounge1_EventScript_25E89B + compare VAR_0x8005, 151 + goto_if 4, BattleFrontier_Lounge1_EventScript_25E8A9 + end + +BattleFrontier_Lounge1_EventScript_25E7FF:: @ 825E7FF + msgbox BattleFrontier_Lounge1_Text_25EF5E, 4 + goto BattleFrontier_Lounge1_EventScript_25E792 + end + +BattleFrontier_Lounge1_EventScript_25E80D:: @ 825E80D + compare VAR_0x8006, 0 + goto_eq BattleFrontier_Lounge1_EventScript_25E8B7 + compare VAR_0x8006, 1 + goto_eq BattleFrontier_Lounge1_EventScript_25E8C5 + compare VAR_0x8006, 2 + goto_eq BattleFrontier_Lounge1_EventScript_25E8D3 + compare VAR_0x8006, 3 + goto_eq BattleFrontier_Lounge1_EventScript_25E8E1 + compare VAR_0x8006, 4 + goto_eq BattleFrontier_Lounge1_EventScript_25E8EF + compare VAR_0x8006, 5 + goto_eq BattleFrontier_Lounge1_EventScript_25E8FD + end + +BattleFrontier_Lounge1_EventScript_25E850:: @ 825E850 + compare VAR_0x8007, 15 + goto_if 3, BattleFrontier_Lounge1_EventScript_25E90B + compare VAR_0x8007, 25 + goto_if 3, BattleFrontier_Lounge1_EventScript_25E919 + compare VAR_0x8007, 30 + goto_if 3, BattleFrontier_Lounge1_EventScript_25E927 + compare VAR_0x8007, 31 + goto_if 4, BattleFrontier_Lounge1_EventScript_25E935 + end + +BattleFrontier_Lounge1_EventScript_25E87D:: @ 825E87D + release + end + +BattleFrontier_Lounge1_EventScript_25E87F:: @ 825E87F + msgbox BattleFrontier_Lounge1_Text_25EA92, 4 + goto BattleFrontier_Lounge1_EventScript_25E80D + end + +BattleFrontier_Lounge1_EventScript_25E88D:: @ 825E88D + msgbox BattleFrontier_Lounge1_Text_25EAD9, 4 + goto BattleFrontier_Lounge1_EventScript_25E80D + end + +BattleFrontier_Lounge1_EventScript_25E89B:: @ 825E89B + msgbox BattleFrontier_Lounge1_Text_25EB2A, 4 + goto BattleFrontier_Lounge1_EventScript_25E80D + end + +BattleFrontier_Lounge1_EventScript_25E8A9:: @ 825E8A9 + msgbox BattleFrontier_Lounge1_Text_25EB6F, 4 + goto BattleFrontier_Lounge1_EventScript_25E80D + end + +BattleFrontier_Lounge1_EventScript_25E8B7:: @ 825E8B7 + msgbox BattleFrontier_Lounge1_Text_25EBBB, 4 + goto BattleFrontier_Lounge1_EventScript_25E850 + end + +BattleFrontier_Lounge1_EventScript_25E8C5:: @ 825E8C5 + msgbox BattleFrontier_Lounge1_Text_25EBF8, 4 + goto BattleFrontier_Lounge1_EventScript_25E850 + end + +BattleFrontier_Lounge1_EventScript_25E8D3:: @ 825E8D3 + msgbox BattleFrontier_Lounge1_Text_25EC39, 4 + goto BattleFrontier_Lounge1_EventScript_25E850 + end + +BattleFrontier_Lounge1_EventScript_25E8E1:: @ 825E8E1 + msgbox BattleFrontier_Lounge1_Text_25ED0E, 4 + goto BattleFrontier_Lounge1_EventScript_25E850 + end + +BattleFrontier_Lounge1_EventScript_25E8EF:: @ 825E8EF + msgbox BattleFrontier_Lounge1_Text_25EC7B, 4 + goto BattleFrontier_Lounge1_EventScript_25E850 + end + +BattleFrontier_Lounge1_EventScript_25E8FD:: @ 825E8FD + msgbox BattleFrontier_Lounge1_Text_25ECC4, 4 + goto BattleFrontier_Lounge1_EventScript_25E850 + end + +BattleFrontier_Lounge1_EventScript_25E90B:: @ 825E90B + msgbox BattleFrontier_Lounge1_Text_25ED4E, 4 + goto BattleFrontier_Lounge1_EventScript_25E87D + end + +BattleFrontier_Lounge1_EventScript_25E919:: @ 825E919 + msgbox BattleFrontier_Lounge1_Text_25ED87, 4 + goto BattleFrontier_Lounge1_EventScript_25E87D + end + +BattleFrontier_Lounge1_EventScript_25E927:: @ 825E927 + msgbox BattleFrontier_Lounge1_Text_25EDC1, 4 + goto BattleFrontier_Lounge1_EventScript_25E87D + end + +BattleFrontier_Lounge1_EventScript_25E935:: @ 825E935 + msgbox BattleFrontier_Lounge1_Text_25EDF6, 4 + goto BattleFrontier_Lounge1_EventScript_25E87D + end + +BattleFrontier_Lounge1_EventScript_25E943:: @ 825E943 + msgbox BattleFrontier_Lounge1_Text_25EE37, 4 + release + end + +BattleFrontier_Lounge1_EventScript_25E94D:: @ 825E94D + msgbox BattleFrontier_Lounge1_Text_25EFDD, 2 + end + +BattleFrontier_Lounge1_EventScript_25E956:: @ 825E956 + msgbox BattleFrontier_Lounge1_Text_25F020, 2 + end + +BattleFrontier_Lounge1_Text_25E95F: @ 825E95F + .string "For 70 years I have raised POKéMON!\n" + .string "I am the man they revere as\l" + .string "the legendary top POKéMON BREEDER!\p" + .string "If you ever become as seasoned as me,\n" + .string "you’ll see the abilities of POKéMON\l" + .string "at a glance.\p" + .string "You’re a TRAINER. Doesn’t it interest\n" + .string "you to know your own POKéMON’s\l" + .string "abilities?\p" + .string "Here!\n" + .string "Let’s have a look at your POKéMON!$" + +BattleFrontier_Lounge1_Text_25EA92: @ 825EA92 + .string "…Hmm…\p" + .string "This one, overall, I would describe\n" + .string "as being of average ability.$" + +BattleFrontier_Lounge1_Text_25EAD9: @ 825EAD9 + .string "…Hmm…\p" + .string "This one, overall, I would describe as\n" + .string "having better-than-average ability.$" + +BattleFrontier_Lounge1_Text_25EB2A: @ 825EB2A + .string "…Hmm…\p" + .string "This one, overall, I would say is\n" + .string "quite impressive in ability!$" + +BattleFrontier_Lounge1_Text_25EB6F: @ 825EB6F + .string "…Hmm…\p" + .string "This one, overall, I would say is\n" + .string "wonderfully outstanding in ability!$" + +BattleFrontier_Lounge1_Text_25EBBB: @ 825EBBB + .string "Incidentally, the best aspect of it,\n" + .string "I would say, is its HP…$" + +BattleFrontier_Lounge1_Text_25EBF8: @ 825EBF8 + .string "Incidentally, the best aspect of it,\n" + .string "I would say, is its ATTACK…$" + +BattleFrontier_Lounge1_Text_25EC39: @ 825EC39 + .string "Incidentally, the best aspect of it,\n" + .string "I would say, is its DEFENSE…$" + +BattleFrontier_Lounge1_Text_25EC7B: @ 825EC7B + .string "Incidentally, the best aspect of it,\n" + .string "I would say, is its SPECIAL ATTACK…$" + +BattleFrontier_Lounge1_Text_25ECC4: @ 825ECC4 + .string "Incidentally, the best aspect of it,\n" + .string "I would say, is its SPECIAL DEFENSE…$" + +BattleFrontier_Lounge1_Text_25ED0E: @ 825ED0E + .string "Incidentally, the best aspect of it,\n" + .string "I would say, is its SPEED…$" + +BattleFrontier_Lounge1_Text_25ED4E: @ 825ED4E + .string "That stat is relatively good.\n" + .string "…Hm… That’s how I call it.$" + +BattleFrontier_Lounge1_Text_25ED87: @ 825ED87 + .string "That stat is quite impressive.\n" + .string "…Hm… That’s how I call it.$" + +BattleFrontier_Lounge1_Text_25EDC1: @ 825EDC1 + .string "That stat is outstanding!\n" + .string "…Hm… That’s how I call it.$" + +BattleFrontier_Lounge1_Text_25EDF6: @ 825EDF6 + .string "It’s flawless! A thing of perfection!\n" + .string "…Hm… That’s how I call it.$" + +BattleFrontier_Lounge1_Text_25EE37: @ 825EE37 + .string "What?\n" + .string "You have no time for my advice?\p" + .string "You should always be eager to learn\n" + .string "from the experiences of your elders!$" + +BattleFrontier_Lounge1_Text_25EEA6: @ 825EEA6 + .string "Yes, what is it now?\p" + .string "I have business that needs tending!\n" + .string "Save it for next time!$" + +BattleFrontier_Lounge1_Text_25EEF6: @ 825EEF6 + .string "Ah, youngster! Do your POKéMON’s\n" + .string "abilities intrigue you?\p" + .string "Here, here!\n" + .string "Let’s have a look at your POKéMON!$" + +BattleFrontier_Lounge1_Text_25EF5E: @ 825EF5E + .string "An expert I am, but even I can’t tell\n" + .string "anything about an unhatched POKéMON!\p" + .string "Show me a POKéMON!\n" + .string "A POKéMON is what I need to see!$" + +BattleFrontier_Lounge1_Text_25EFDD: @ 825EFDD + .string "He said my POKéMON is outstanding!\n" + .string "I’m glad I raised it carefully!$" + +BattleFrontier_Lounge1_Text_25F020: @ 825F020 + .string "He said my POKéMON is outstanding!\n" + .string "But I didn’t do anything special\l" + .string "raising it…$" + diff --git a/data/maps/BattleFrontier_Lounge2/events.inc b/data/maps/BattleFrontier_Lounge2/events.inc new file mode 100644 index 000000000..0616573bd --- /dev/null +++ b/data/maps/BattleFrontier_Lounge2/events.inc @@ -0,0 +1,14 @@ +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 + +BattleFrontier_Lounge2_MapWarps: @ 853D194 + 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/BattleFrontier_Lounge2/scripts.inc b/data/maps/BattleFrontier_Lounge2/scripts.inc new file mode 100644 index 000000000..bbb298b5b --- /dev/null +++ b/data/maps/BattleFrontier_Lounge2/scripts.inc @@ -0,0 +1,373 @@ +BattleFrontier_Lounge2_MapScripts:: @ 8260642 + .byte 0 + +BattleFrontier_Lounge2_EventScript_260643:: @ 8260643 + lock + faceplayer + checkflag FLAG_0x154 + goto_eq BattleFrontier_Lounge2_EventScript_26065F + setflag FLAG_0x154 + msgbox BattleFrontier_Lounge2_Text_260766, 4 + goto BattleFrontier_Lounge2_EventScript_26066D + end + +BattleFrontier_Lounge2_EventScript_26065F:: @ 826065F + msgbox BattleFrontier_Lounge2_Text_260857, 4 + goto BattleFrontier_Lounge2_EventScript_26066D + end + +BattleFrontier_Lounge2_EventScript_26066D:: @ 826066D + compare VAR_FRONTIER_MANIAC_FACILITY, 0 + call_if 1, BattleFrontier_Lounge2_EventScript_26070A + compare VAR_FRONTIER_MANIAC_FACILITY, 1 + call_if 1, BattleFrontier_Lounge2_EventScript_26070F + compare VAR_FRONTIER_MANIAC_FACILITY, 2 + call_if 1, BattleFrontier_Lounge2_EventScript_260714 + compare VAR_FRONTIER_MANIAC_FACILITY, 3 + call_if 1, BattleFrontier_Lounge2_EventScript_260719 + compare VAR_FRONTIER_MANIAC_FACILITY, 4 + call_if 1, BattleFrontier_Lounge2_EventScript_26071E + compare VAR_FRONTIER_MANIAC_FACILITY, 5 + call_if 1, BattleFrontier_Lounge2_EventScript_260723 + compare VAR_FRONTIER_MANIAC_FACILITY, 6 + call_if 1, BattleFrontier_Lounge2_EventScript_260728 + compare VAR_FRONTIER_MANIAC_FACILITY, 7 + call_if 1, BattleFrontier_Lounge2_EventScript_26072D + compare VAR_FRONTIER_MANIAC_FACILITY, 8 + call_if 1, BattleFrontier_Lounge2_EventScript_260732 + compare VAR_FRONTIER_MANIAC_FACILITY, 9 + call_if 1, BattleFrontier_Lounge2_EventScript_260737 + compare VAR_FRONTIER_MANIAC_FACILITY, 3 + call_if 3, BattleFrontier_Lounge2_EventScript_2606F8 + compare VAR_FRONTIER_MANIAC_FACILITY, 4 + call_if 4, BattleFrontier_Lounge2_EventScript_260701 + special sub_8139F20 + waitmessage + waitbuttonpress + release + end + +BattleFrontier_Lounge2_EventScript_2606F8:: @ 82606F8 + msgbox BattleFrontier_Lounge2_Text_260933, 4 + return + +BattleFrontier_Lounge2_EventScript_260701:: @ 8260701 + msgbox BattleFrontier_Lounge2_Text_2608F2, 4 + return + +BattleFrontier_Lounge2_EventScript_26070A:: @ 826070A + bufferstdstring 0, 19 + return + +BattleFrontier_Lounge2_EventScript_26070F:: @ 826070F + bufferstdstring 0, 20 + return + +BattleFrontier_Lounge2_EventScript_260714:: @ 8260714 + bufferstdstring 0, 21 + return + +BattleFrontier_Lounge2_EventScript_260719:: @ 8260719 + bufferstdstring 0, 22 + return + +BattleFrontier_Lounge2_EventScript_26071E:: @ 826071E + bufferstdstring 0, 24 + return + +BattleFrontier_Lounge2_EventScript_260723:: @ 8260723 + bufferstdstring 0, 25 + return + +BattleFrontier_Lounge2_EventScript_260728:: @ 8260728 + bufferstdstring 0, 26 + return + +BattleFrontier_Lounge2_EventScript_26072D:: @ 826072D + bufferstdstring 0, 27 + return + +BattleFrontier_Lounge2_EventScript_260732:: @ 8260732 + bufferstdstring 0, 28 + return + +BattleFrontier_Lounge2_EventScript_260737:: @ 8260737 + bufferstdstring 0, 29 + return + +BattleFrontier_Lounge2_EventScript_26073C:: @ 826073C + lock + msgbox BattleFrontier_Lounge2_Text_261C9C, 4 + release + end + +BattleFrontier_Lounge2_EventScript_260747:: @ 8260747 + lock + msgbox BattleFrontier_Lounge2_Text_261CDC, 4 + release + end + +BattleFrontier_Lounge2_EventScript_260752:: @ 8260752 + lock + msgbox BattleFrontier_Lounge2_Text_261D1D, 4 + release + end + +BattleFrontier_Lounge2_EventScript_26075D:: @ 826075D + msgbox BattleFrontier_Lounge2_Text_261D5C, 2 + end + +BattleFrontier_Lounge2_Text_260766:: @ 8260766 + .string "Howdy! When it comes to news about\n" + .string "the BATTLE FRONTIER, I’m no. 1.\p" + .string "You can think of me as\n" + .string "the FRONTIER MANIAC.\p" + .string "Just checking, but you are a TRAINER,\n" + .string "isn’t that right?\p" + .string "I’ll happily share the hottest news\n" + .string "I gathered about the BATTLE FRONTIER.$" + +BattleFrontier_Lounge2_Text_260857:: @ 8260857 + .string "Howdy! Did you swing by to grill me\n" + .string "about the latest word? Oh, all right!$" + +BattleFrontier_Lounge2_Text_2608A1:: @ 82608A1 + .string "Well? Well? Well?\p" + .string "I’m sure my information’s been\n" + .string "seriously useful to you, right?$" + +BattleFrontier_Lounge2_Text_2608F2:: @ 82608F2 + .string "Let’s see now…\p" + .string "It sounds like the {STR_VAR_1}\n" + .string "is the hottest place going.$" + +BattleFrontier_Lounge2_Text_260933:: @ 8260933 + .string "Let’s see now…\p" + .string "It sounds like BATTLE TOWER\n" + .string "{STR_VAR_1} is the hottest.$" + +BattleFrontier_Lounge2_Text_260971:: @ 8260971 + .string "Bet you didn’t know this!\p" + .string "One of those top TRAINERS that SCOTT\n" + .string "calls the FRONTIER BRAINS is there.\p" + .string "It’s this mysterious TRAINER called\n" + .string "the SALON MAIDEN that runs the place.$" + +BattleFrontier_Lounge2_Text_260A1E:: @ 8260A1E + .string "Have you battled the SALON MAIDEN?\p" + .string "When she’s measuring up her opponent,\n" + .string "she apparently uses these POKéMON:\p" + .string "A PSYCHIC-type PSI POKéMON,\n" + .string "a FIRE-type VOLCANO POKéMON,\l" + .string "and a NORMAL-type SLEEPING POKéMON.$" + +BattleFrontier_Lounge2_Text_260AE7:: @ 8260AE7 + .string "Have you battled the SALON MAIDEN\n" + .string "when she’s serious?\p" + .string "When she’s battling flat out,\n" + .string "she apparently uses these POKéMON:\p" + .string "A DRAGON & PSYCHIC EON POKéMON,\n" + .string "an ELECTRIC-type THUNDER POKéMON,\l" + .string "and a NORMAL-type SLEEPING POKéMON.$" + +BattleFrontier_Lounge2_Text_260BC4:: @ 8260BC4 + .string "Bet you didn’t know this!\p" + .string "One of those top TRAINERS that SCOTT\n" + .string "calls the FRONTIER BRAINS is there.\p" + .string "It’s this flamboyant TRAINER called\n" + .string "the DOME ACE that runs the place.$" + +BattleFrontier_Lounge2_Text_260C6D:: @ 8260C6D + .string "Have you battled the DOME ACE?\p" + .string "When he’s treating the opponent\n" + .string "lightly, he uses these three POKéMON:\p" + .string "A DRAGON & FLYING DRAGON POKéMON,\n" + .string "a WATER & GROUND MUD FISH POKéMON,\l" + .string "and a FIRE & FLYING FLAME POKéMON.$" + +BattleFrontier_Lounge2_Text_260D3A:: @ 8260D3A + .string "Have you battled the DOME ACE\n" + .string "when he’s serious?\p" + .string "When he’s demonstrating his strategy,\n" + .string "he uses these three POKéMON:\p" + .string "A DRAGON & FLYING EON POKéMON,\n" + .string "a WATER & GROUND MUD FISH POKéMON,\l" + .string "and a STEEL- & PSYCHIC-type IRON LEG\l" + .string "POKéMON.$" + +BattleFrontier_Lounge2_Text_260E1E:: @ 8260E1E + .string "Bet you didn’t know this!\p" + .string "One of those top TRAINERS that SCOTT\n" + .string "calls the FRONTIER BRAINS is there.\p" + .string "It’s this freaky TRAINER called\n" + .string "the FACTORY HEAD that runs the place.$" + +BattleFrontier_Lounge2_Text_260EC7:: @ 8260EC7 + .string "Have you battled the FACTORY HEAD\n" + .string "already?\p" + .string "Let me think… When he goes to battle,\n" + .string "he just gets three rental POKéMON.\p" + .string "He battles under pretty much the same\n" + .string "conditions as you.$" + +BattleFrontier_Lounge2_Text_260F74:: @ 8260F74 + .string "Have you battled the FACTORY HEAD\n" + .string "when he’s serious?\p" + .string "When he goes seriously to battle,\n" + .string "he still gets three rental POKéMON.\p" + .string "He battles under virtually the same\n" + .string "conditions as you.$" + +BattleFrontier_Lounge2_Text_261026:: @ 8261026 + .string "Bet you didn’t know this!\p" + .string "One of those top TRAINERS that SCOTT\n" + .string "calls the FRONTIER BRAINS is there.\p" + .string "It’s this scary TRAINER called\n" + .string "the PIKE QUEEN that runs the place.$" + +BattleFrontier_Lounge2_Text_2610CC:: @ 82610CC + .string "Have you battled the PIKE QUEEN\n" + .string "before?\p" + .string "When she’s in a good mood, they say\n" + .string "she uses these three POKéMON:\p" + .string "A POISON-type FANG SNAKE POKéMON,\n" + .string "a BUG & ROCK MOLD POKéMON,\l" + .string "and a WATER-type TENDER POKéMON.$" + +BattleFrontier_Lounge2_Text_261194:: @ 8261194 + .string "Have you battled the PIKE QUEEN\n" + .string "when she’s serious?\p" + .string "When she’s seriously annoyed, they say\n" + .string "she uses these three POKéMON:\p" + .string "A POISON-type FANG SNAKE POKéMON,\n" + .string "a STEEL & GROUND IRON SNAKE POKéMON,\l" + .string "and a WATER- & FLYING-type ATROCIOUS\l" + .string "POKéMON.$" + +BattleFrontier_Lounge2_Text_261282:: @ 8261282 + .string "Bet you didn’t know this!\p" + .string "One of those top TRAINERS that SCOTT\n" + .string "calls the FRONTIER BRAINS is there.\p" + .string "It’s this cute TRAINER called\n" + .string "the ARENA TYCOON that runs the place.$" + +BattleFrontier_Lounge2_Text_261329:: @ 8261329 + .string "Have you battled the ARENA TYCOON\n" + .string "before?\p" + .string "When she’s assessing the foe’s ability,\n" + .string "she supposedly uses these POKéMON:\p" + .string "A BUG & FIGHTING SINGLE HORN POKéMON,\n" + .string "a DARK-type MOONLIGHT POKéMON,\l" + .string "and a BUG & GHOST SHED POKéMON.$" + +BattleFrontier_Lounge2_Text_261403:: @ 8261403 + .string "Have you battled the ARENA TYCOON\n" + .string "when she’s serious?\p" + .string "When she battles for keeps,\n" + .string "she supposedly uses these POKéMON:\p" + .string "A DARK-type MOONLIGHT POKéMON,\n" + .string "a GHOST & POISON SHADOW POKéMON\l" + .string "and a GRASS- & FIGHTING-type\l" + .string "MUSHROOM POKéMON.$" + +BattleFrontier_Lounge2_Text_2614E6:: @ 82614E6 + .string "Bet you didn’t know this!\p" + .string "One of those top TRAINERS that SCOTT\n" + .string "calls the FRONTIER BRAINS is there.\p" + .string "It’s this sinister TRAINER called\n" + .string "the PALACE MAVEN that runs the place.$" + +BattleFrontier_Lounge2_Text_261591:: @ 8261591 + .string "Have you battled the PALACE MAVEN\n" + .string "before?\p" + .string "When he’s testing the opponent’s\n" + .string "spirit, he’s said to use these POKéMON:\p" + .string "A POISON & FLYING-type BAT POKéMON,\n" + .string "a NORMAL-type LAZY POKéMON, and a\l" + .string "WATER- & ICE-type TRANSPORT POKéMON.$" + +BattleFrontier_Lounge2_Text_26166F:: @ 826166F + .string "Have you battled the PALACE MAVEN\n" + .string "when he’s serious?\p" + .string "When he throws his entire might into\n" + .string "battle, he’s said to use these POKéMON:\p" + .string "A FIRE-type LEGENDARY POKéMON,\n" + .string "a NORMAL-type LAZY POKéMON,\l" + .string "and a WATER-type AURORA POKéMON.$" + +BattleFrontier_Lounge2_Text_26174D:: @ 826174D + .string "Bet you didn’t know this!\p" + .string "One of those top TRAINERS that SCOTT\n" + .string "calls the FRONTIER BRAINS is there.\p" + .string "It’s this fiery-hot TRAINER called\n" + .string "the PYRAMID KING that runs the place.$" + +BattleFrontier_Lounge2_Text_2617F9:: @ 82617F9 + .string "Have you battled the PYRAMID KING\n" + .string "before?\p" + .string "When he’s checking the foe’s power,\n" + .string "he apparently uses these POKéMON:\p" + .string "A ROCK-type ROCK PEAK POKéMON,\n" + .string "an ICE-type ICEBERG POKéMON,\l" + .string "and a STEEL-type IRON POKéMON.$" + +BattleFrontier_Lounge2_Text_2618C4:: @ 82618C4 + .string "Have you battled the PYRAMID KING\n" + .string "when he’s serious?\p" + .string "When he’s pumped with hot power,\n" + .string "he apparently uses these POKéMON:\p" + .string "An ICE & FLYING FREEZE POKéMON, an\n" + .string "ELECTRIC & FLYING ELECTRIC POKéMON,\l" + .string "and a FIRE- & FLYING-type FLAME\l" + .string "POKéMON.$" + +BattleFrontier_Lounge2_Text_2619AC:: @ 82619AC + .string "Sure, there are several places where\n" + .string "you can enter DOUBLE BATTLES.\p" + .string "But the DOUBLE BATTLE ROOMS of\n" + .string "the BATTLE TOWER are, like, basic!\p" + .string "They’re where you should learn about\n" + .string "how DOUBLE BATTLES are played here\l" + .string "in the BATTLE FRONTIER.$" + +BattleFrontier_Lounge2_Text_261A91:: @ 8261A91 + .string "Watch yourself in the battles here.\p" + .string "I hear there are TRAINERS that have\n" + .string "strategies they developed just for\l" + .string "DOUBLE BATTLES.$" + +BattleFrontier_Lounge2_Text_261B0C:: @ 8261B0C + .string "Once you’re confident and comfortable\n" + .string "with DOUBLE BATTLES here, you should\l" + .string "think about challenging other places\l" + .string "offering DOUBLE BATTLES.$" + +BattleFrontier_Lounge2_Text_261B95:: @ 8261B95 + .string "All sorts of TRAINERS gather in\n" + .string "the BATTLE SALON.\p" + .string "Just think--you may run into your\n" + .string "friends or followers!\l" + .string "You should look carefully!$" + +BattleFrontier_Lounge2_Text_261C1A:: @ 8261C1A + .string "If you’re with a friend, head for the\n" + .string "LINK MULTI BATTLE ROOM.\p" + .string "If you play with a strong friend,\n" + .string "you can expect to see tough foes!$" + +BattleFrontier_Lounge2_Text_261C9C:: @ 8261C9C + .string "What amazing news-gathering power!\n" + .string "My mentor’s like none other!$" + +BattleFrontier_Lounge2_Text_261CDC:: @ 8261CDC + .string "What amazing powers of observation!\n" + .string "My mentor’s like none other!$" + +BattleFrontier_Lounge2_Text_261D1D:: @ 8261D1D + .string "What amazing power of persuasion!\n" + .string "My mentor’s like none other!$" + +BattleFrontier_Lounge2_Text_261D5C:: @ 8261D5C + .string "…What is this place?\n" + .string "It’s scaring me…$" + diff --git a/data/maps/BattleFrontier_Lounge3/events.inc b/data/maps/BattleFrontier_Lounge3/events.inc new file mode 100644 index 000000000..dbaa20fe1 --- /dev/null +++ b/data/maps/BattleFrontier_Lounge3/events.inc @@ -0,0 +1,13 @@ +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 + +BattleFrontier_Lounge3_MapWarps: @ 853D230 + 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/BattleFrontier_Lounge3/scripts.inc b/data/maps/BattleFrontier_Lounge3/scripts.inc new file mode 100644 index 000000000..2638541b2 --- /dev/null +++ b/data/maps/BattleFrontier_Lounge3/scripts.inc @@ -0,0 +1,483 @@ +BattleFrontier_Lounge3_MapScripts:: @ 8261D82 + .byte 0 + +BattleFrontier_Lounge3_EventScript_261D83:: @ 8261D83 + lock + faceplayer + checkflag FLAG_0x157 + goto_eq BattleFrontier_Lounge3_EventScript_261EF9 + call BattleFrontier_Lounge3_EventScript_261EA0 + compare VAR_0x8004, 2 + goto_if 3, BattleFrontier_Lounge3_EventScript_261EEB + setflag FLAG_0x157 + msgbox BattleFrontier_Lounge3_Text_262061, 4 + goto BattleFrontier_Lounge3_EventScript_261DAF + end + +BattleFrontier_Lounge3_EventScript_261DAF:: @ 8261DAF + special sub_813A820 + waitmessage + waitbuttonpress + msgbox BattleFrontier_Lounge3_Text_262A60, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_Lounge3_EventScript_261FA5 + msgbox BattleFrontier_Lounge3_Text_262ABD, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_Lounge3_EventScript_261FA5 + message BattleFrontier_Lounge3_Text_262B42 + waitmessage + special sub_813A958 + goto BattleFrontier_Lounge3_EventScript_261DE9 + end + +BattleFrontier_Lounge3_EventScript_261DE9:: @ 8261DE9 + multichoice 20, 4, 87, 0 + copyvar VAR_FRONTIER_GAMBLER_AMOUNT_BET, VAR_RESULT + switch VAR_RESULT + case 0, BattleFrontier_Lounge3_EventScript_261E30 + case 1, BattleFrontier_Lounge3_EventScript_261E3B + case 2, BattleFrontier_Lounge3_EventScript_261E46 + case 3, BattleFrontier_Lounge3_EventScript_261FAF + case 127, BattleFrontier_Lounge3_EventScript_261FAF + end + +BattleFrontier_Lounge3_EventScript_261E30:: @ 8261E30 + setvar VAR_0x8008, 5 + goto BattleFrontier_Lounge3_EventScript_261E51 + end + +BattleFrontier_Lounge3_EventScript_261E3B:: @ 8261E3B + setvar VAR_0x8008, 10 + goto BattleFrontier_Lounge3_EventScript_261E51 + end + +BattleFrontier_Lounge3_EventScript_261E46:: @ 8261E46 + setvar VAR_0x8008, 15 + goto BattleFrontier_Lounge3_EventScript_261E51 + end + +BattleFrontier_Lounge3_EventScript_261E51:: @ 8261E51 + specialvar VAR_TEMP_1, sub_813AA04 + compare VAR_TEMP_1, VAR_0x8008 + goto_if 4, BattleFrontier_Lounge3_EventScript_261E75 + msgbox BattleFrontier_Lounge3_Text_262B6E, 4 + message BattleFrontier_Lounge3_Text_262B42 + waitmessage + goto BattleFrontier_Lounge3_EventScript_261DE9 + end + +BattleFrontier_Lounge3_EventScript_261E75:: @ 8261E75 + copyvar VAR_0x8004, VAR_0x8008 + special sub_813A9A4 + setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1 + special sub_813A8FC + playse SE_REGI + msgbox BattleFrontier_Lounge3_Text_262BE0, 4 + goto BattleFrontier_Lounge3_EventScript_261E96 + end + +BattleFrontier_Lounge3_EventScript_261E96:: @ 8261E96 + special sub_813A854 + waitmessage + waitbuttonpress + special sub_813A988 + release + end + +BattleFrontier_Lounge3_EventScript_261EA0:: @ 8261EA0 + setvar VAR_0x8004, 0 + checkflag FLAG_SYS_TOWER_SILVER + call_if 1, BattleFrontier_Lounge3_EventScript_261EE5 + checkflag FLAG_SYS_DOME_SILVER + call_if 1, BattleFrontier_Lounge3_EventScript_261EE5 + checkflag FLAG_SYS_PALACE_SILVER + call_if 1, BattleFrontier_Lounge3_EventScript_261EE5 + checkflag FLAG_SYS_ARENA_SILVER + call_if 1, BattleFrontier_Lounge3_EventScript_261EE5 + checkflag FLAG_SYS_FACTORY_SILVER + call_if 1, BattleFrontier_Lounge3_EventScript_261EE5 + checkflag FLAG_SYS_PIKE_SILVER + call_if 1, BattleFrontier_Lounge3_EventScript_261EE5 + checkflag FLAG_SYS_PYRAMID_SILVER + call_if 1, BattleFrontier_Lounge3_EventScript_261EE5 + return + +BattleFrontier_Lounge3_EventScript_261EE5:: @ 8261EE5 + addvar VAR_0x8004, 1 + return + +BattleFrontier_Lounge3_EventScript_261EEB:: @ 8261EEB + msgbox BattleFrontier_Lounge3_Text_261FFE, 4 + goto BattleFrontier_Lounge3_EventScript_261FF1 + end + +BattleFrontier_Lounge3_EventScript_261EF9:: @ 8261EF9 + msgbox BattleFrontier_Lounge3_Text_26346B, 4 + compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1 + goto_if 4, BattleFrontier_Lounge3_EventScript_261F12 + goto BattleFrontier_Lounge3_EventScript_261DAF + end + +BattleFrontier_Lounge3_EventScript_261F12:: @ 8261F12 + compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1 + goto_eq BattleFrontier_Lounge3_EventScript_261F9E + compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 2 + goto_eq BattleFrontier_Lounge3_EventScript_261F2E + goto BattleFrontier_Lounge3_EventScript_261F71 + end + +BattleFrontier_Lounge3_EventScript_261F2E:: @ 8261F2E + msgbox BattleFrontier_Lounge3_Text_263334, 4 + compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 0 + call_if 1, BattleFrontier_Lounge3_EventScript_261F80 + compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 1 + call_if 1, BattleFrontier_Lounge3_EventScript_261F8A + compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 2 + call_if 1, BattleFrontier_Lounge3_EventScript_261F94 + msgbox BattleFrontier_Lounge3_Text_2633D4, 9 + special sub_813A9D0 + msgbox BattleFrontier_Lounge3_Text_2633F2, 4 + setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 0 + release + end + +BattleFrontier_Lounge3_EventScript_261F71:: @ 8261F71 + msgbox BattleFrontier_Lounge3_Text_263298, 4 + setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 0 + release + end + +BattleFrontier_Lounge3_EventScript_261F80:: @ 8261F80 + buffernumberstring 0, 10 + setvar VAR_0x8004, 10 + return + +BattleFrontier_Lounge3_EventScript_261F8A:: @ 8261F8A + buffernumberstring 0, 20 + setvar VAR_0x8004, 20 + return + +BattleFrontier_Lounge3_EventScript_261F94:: @ 8261F94 + buffernumberstring 0, 30 + setvar VAR_0x8004, 30 + return + +BattleFrontier_Lounge3_EventScript_261F9E:: @ 8261F9E + special sub_813A854 + waitmessage + waitbuttonpress + release + end + +BattleFrontier_Lounge3_EventScript_261FA5:: @ 8261FA5 + msgbox BattleFrontier_Lounge3_Text_26342D, 4 + release + end + +BattleFrontier_Lounge3_EventScript_261FAF:: @ 8261FAF + special sub_813A988 + goto BattleFrontier_Lounge3_EventScript_261FA5 + end + +BattleFrontier_Lounge3_EventScript_261FB8:: @ 8261FB8 + msgbox BattleFrontier_Lounge3_Text_263545, 2 + end + +BattleFrontier_Lounge3_EventScript_261FC1:: @ 8261FC1 + lock + faceplayer + msgbox BattleFrontier_Lounge3_Text_26346F, 4 + goto BattleFrontier_Lounge3_EventScript_261FF1 + end + +BattleFrontier_Lounge3_EventScript_261FD1:: @ 8261FD1 + lock + faceplayer + msgbox BattleFrontier_Lounge3_Text_26351D, 4 + goto BattleFrontier_Lounge3_EventScript_261FF1 + end + +BattleFrontier_Lounge3_EventScript_261FE1:: @ 8261FE1 + lock + faceplayer + msgbox BattleFrontier_Lounge3_Text_2634C9, 4 + goto BattleFrontier_Lounge3_EventScript_261FF1 + end + +BattleFrontier_Lounge3_EventScript_261FF1:: @ 8261FF1 + closemessage + applymovement VAR_LAST_TALKED, BattleFrontier_Lounge3_Movement_2725A2 + waitmovement 0 + release + end + +BattleFrontier_Lounge3_Text_261FFE:: @ 8261FFE + .string "…What’s that you want?\p" + .string "Can’t you see we’re kind of busy here?\n" + .string "Can’t your business wait till later?$" + +BattleFrontier_Lounge3_Text_262061:: @ 8262061 + .string "…Huh?\n" + .string "You look to me like a tough TRAINER.\p" + .string "Heheh…\n" + .string "Listen, I have this proposition.\p" + .string "We have a little group going here,\n" + .string "and we play a little game with what\l" + .string "goes on in the BATTLE FRONTIER.\p" + .string "The rules are really simple.\p" + .string "First, we pick one of the facilities\n" + .string "in the BATTLE FRONTIER.\p" + .string "Then, we each pick a different TRAINER\n" + .string "who’s taking that facility’s challenge,\l" + .string "and bet with our Battle Points.\p" + .string "The guy who bet on the TRAINER with\n" + .string "the best record takes all the Battle\l" + .string "Points in the pool.\p" + .string "Sounds simple, huh?\n" + .string "So, anyway…$" + +BattleFrontier_Lounge3_Text_262261:: @ 8262261 + .string "What I’m looking for is a TRAINER who’s\n" + .string "going to be challenging the BATTLE\l" + .string "TOWER’s SINGLE BATTLE ROOMS.\p" + .string "But so far, I haven’t seen a TRAINER\n" + .string "that has that winning quality.$" + +BattleFrontier_Lounge3_Text_26230D:: @ 826230D + .string "What I’m looking for is a TRAINER who’s\n" + .string "going to be challenging the BATTLE\l" + .string "TOWER’s DOUBLE BATTLE ROOMS.\p" + .string "But so far, I haven’t seen a TRAINER\n" + .string "that has that winning quality.$" + +BattleFrontier_Lounge3_Text_2623B9:: @ 82623B9 + .string "What I’m looking for is a TRAINER who’s\n" + .string "going to be challenging the BATTLE\l" + .string "TOWER’s MULTI BATTLE ROOMS.\p" + .string "But so far, I haven’t seen a TRAINER\n" + .string "that has that winning quality.$" + +BattleFrontier_Lounge3_Text_262464:: @ 8262464 + .string "What I’m looking for is a TRAINER who’s\n" + .string "going to be entering the BATTLE\l" + .string "DOME’s SINGLE BATTLE Tourney.\p" + .string "But so far, I haven’t seen a TRAINER\n" + .string "that has that winning quality.$" + +BattleFrontier_Lounge3_Text_26250E:: @ 826250E + .string "What I’m looking for is a TRAINER who’s\n" + .string "going to be entering the BATTLE\l" + .string "DOME’s DOUBLE BATTLE Tourney.\p" + .string "But so far, I haven’t seen a TRAINER\n" + .string "that has that winning quality.$" + +BattleFrontier_Lounge3_Text_2625B8:: @ 82625B8 + .string "What I’m looking for is a TRAINER who’s\n" + .string "going to be entering the BATTLE\l" + .string "FACTORY’s Battle Swap Single Tourney.\p" + .string "But so far, I haven’t seen a TRAINER\n" + .string "that has that winning quality.$" + +BattleFrontier_Lounge3_Text_26266A:: @ 826266A + .string "What I’m looking for is a TRAINER who’s\n" + .string "going to be entering the BATTLE\l" + .string "FACTORY’s Battle Swap Double Tourney.\p" + .string "But so far, I haven’t seen a TRAINER\n" + .string "that has that winning quality.$" + +BattleFrontier_Lounge3_Text_26271C:: @ 826271C + .string "What I’m looking for is a TRAINER who’s\n" + .string "going to be challenging the BATTLE\l" + .string "PALACE’s SINGLE BATTLE HALLS.\p" + .string "But so far, I haven’t seen a TRAINER\n" + .string "that has that winning quality.$" + +BattleFrontier_Lounge3_Text_2627C9:: @ 82627C9 + .string "What I’m looking for is a TRAINER who’s\n" + .string "going to be challenging the BATTLE\l" + .string "PALACE’s DOUBLE BATTLE HALLS.\p" + .string "But so far, I haven’t seen a TRAINER\n" + .string "that has that winning quality.$" + +BattleFrontier_Lounge3_Text_262876:: @ 8262876 + .string "What I’m looking for is a TRAINER who’s\n" + .string "going to be entering the BATTLE\l" + .string "ARENA’s Set KO Tourney.\p" + .string "But so far, I haven’t seen a TRAINER\n" + .string "that has that winning quality.$" + +BattleFrontier_Lounge3_Text_26291A:: @ 826291A + .string "What I’m looking for is a TRAINER who’s\n" + .string "going to be entering the BATTLE PIKE’s\l" + .string "Battle Choice.\p" + .string "But so far, I haven’t seen a TRAINER\n" + .string "that has that winning quality.$" + +BattleFrontier_Lounge3_Text_2629BC:: @ 82629BC + .string "What I’m looking for is a TRAINER who’s\n" + .string "going to be entering the BATTLE\l" + .string "PYRAMID’s Battle Quest.\p" + .string "But so far, I haven’t seen a TRAINER\n" + .string "that has that winning quality.$" + +BattleFrontier_Lounge3_Text_262A60:: @ 8262A60 + .string "I’ll see to it that you benefit, too.\n" + .string "So how about it?\l" + .string "How about entering that event for me?$" + +BattleFrontier_Lounge3_Text_262ABD:: @ 8262ABD + .string "All right, that’s perfect.\n" + .string "So, uh… How about spotting me some\l" + .string "of your Battle Points?\p" + .string "Trust me, I’ll show you my gratitude\n" + .string "afterward.$" + +BattleFrontier_Lounge3_Text_262B42:: @ 8262B42 + .string "Great, great!\n" + .string "So, how much can you spot me?$" + +BattleFrontier_Lounge3_Text_262B6E:: @ 8262B6E + .string "Oh, no, no, no!\n" + .string "You don’t have enough Battle Points!\p" + .string "I wish you wouldn’t monkey around and\n" + .string "waste everyone’s time!$" + +BattleFrontier_Lounge3_Text_262BE0:: @ 8262BE0 + .string "Heheh! Thanks much!\n" + .string "So, off you go!$" + +BattleFrontier_Lounge3_Text_262C04:: @ 8262C04 + .string "Get to the BATTLE TOWER’s\n" + .string "SINGLE BATTLE ROOMS pronto!\p" + .string "It’s a must-win situation!\n" + .string "Don’t blow your chance!\l" + .string "Both of our futures depend on you!$" + +BattleFrontier_Lounge3_Text_262C90:: @ 8262C90 + .string "Get to the BATTLE TOWER’s\n" + .string "DOUBLE BATTLE ROOMS pronto!\p" + .string "It’s a must-win situation!\n" + .string "Don’t blow your chance!\l" + .string "Both of our futures depend on you!$" + +BattleFrontier_Lounge3_Text_262D1C:: @ 8262D1C + .string "Get to the BATTLE TOWER’s\n" + .string "MULTI BATTLE ROOMS pronto!\p" + .string "It’s a must-win situation!\n" + .string "Don’t blow your chance!\l" + .string "Both of our futures depend on you!$" + +BattleFrontier_Lounge3_Text_262DA7:: @ 8262DA7 + .string "Get to the BATTLE DOME’s\n" + .string "SINGLE BATTLE Tourney pronto!\p" + .string "It’s a must-win situation!\n" + .string "Don’t blow your chance!\l" + .string "Both of our futures depend on you!$" + +BattleFrontier_Lounge3_Text_262E34:: @ 8262E34 + .string "Get to the BATTLE DOME’s\n" + .string "DOUBLE BATTLE Tourney pronto!\p" + .string "It’s a must-win situation!\n" + .string "Don’t blow your chance!\l" + .string "Both of our futures depend on you!$" + +BattleFrontier_Lounge3_Text_262EC1:: @ 8262EC1 + .string "Get to the BATTLE FACTORY’s\n" + .string "Battle Swap Single Tourney pronto!\p" + .string "It’s a must-win situation!\n" + .string "Don’t blow your chance!\l" + .string "Both of our futures depend on you!$" + +BattleFrontier_Lounge3_Text_262F56:: @ 8262F56 + .string "Get to the BATTLE FACTORY’s\n" + .string "Battle Swap Double Tourney pronto!\p" + .string "It’s a must-win situation!\n" + .string "Don’t blow your chance!\l" + .string "Both of our futures depend on you!$" + +BattleFrontier_Lounge3_Text_262FEB:: @ 8262FEB + .string "Get to the BATTLE PALACE’s\n" + .string "SINGLE BATTLE HALLS pronto!\p" + .string "It’s a must-win situation!\n" + .string "Don’t blow your chance!\l" + .string "Both of our futures depend on you!$" + +BattleFrontier_Lounge3_Text_263078:: @ 8263078 + .string "Get to the BATTLE PALACE’s\n" + .string "DOUBLE BATTLE HALLS pronto!\p" + .string "It’s a must-win situation!\n" + .string "Don’t blow your chance!\l" + .string "Both of our futures depend on you!$" + +BattleFrontier_Lounge3_Text_263105:: @ 8263105 + .string "Get to the BATTLE ARENA’s\n" + .string "Set KO Tourney pronto!\p" + .string "It’s a must-win situation!\n" + .string "Don’t blow your chance!\l" + .string "Both of our futures depend on you!$" + +BattleFrontier_Lounge3_Text_26318C:: @ 826318C + .string "Get to the BATTLE PIKE’s\n" + .string "Battle Choice pronto!\p" + .string "It’s a must-win situation!\n" + .string "Don’t blow your chance!\l" + .string "Both of our futures depend on you!$" + +BattleFrontier_Lounge3_Text_263211:: @ 8263211 + .string "Get to the BATTLE PYRAMID’s\n" + .string "Battle Quest pronto!\p" + .string "It’s a must-win situation!\n" + .string "Don’t blow your chance!\l" + .string "Both of our futures depend on you!$" + +BattleFrontier_Lounge3_Text_263298:: @ 8263298 + .string "Oh, it’s you…\n" + .string "Nice try…\p" + .string "I hate to break it to you, but I can’t\n" + .string "return your Battle Points…\p" + .string "I guess we’ll have to let it motivate\n" + .string "us to try harder next time!$" + +BattleFrontier_Lounge3_Text_263334:: @ 8263334 + .string "Oh, yes!\n" + .string "Hello there, champ!\p" + .string "I knew you could!\n" + .string "I knew you would!\l" + .string "We’re both big winners!\p" + .string "I’ll return your Battle Points and,\n" + .string "of course, a little extra from me!$" + +BattleFrontier_Lounge3_Text_2633D4:: @ 82633D4 + .string "{PLAYER} obtained\n" + .string "{STR_VAR_1} Battle Points.$" + +BattleFrontier_Lounge3_Text_2633F2:: @ 82633F2 + .string "If you’re up for another challenge,\n" + .string "please do think of me!$" + +BattleFrontier_Lounge3_Text_26342D:: @ 826342D + .string "Not interested?! You shouldn’t be\n" + .string "so afraid to take a chance!$" + +BattleFrontier_Lounge3_Text_26346B:: @ 826346B + .string "Oh…$" + +BattleFrontier_Lounge3_Text_26346F:: @ 826346F + .string "I backed the wrong TRAINER again!\p" + .string "Maybe I should be battling normally\n" + .string "like everyone else…$" + +BattleFrontier_Lounge3_Text_2634C9:: @ 82634C9 + .string "That TRAINER…\p" + .string "He’s good, but he gets rattled too\n" + .string "easily to survive the BATTLE DOME…$" + +BattleFrontier_Lounge3_Text_26351D:: @ 826351D + .string "Giggle!\n" + .string "I know a winner when I see one!$" + +BattleFrontier_Lounge3_Text_263545:: @ 8263545 + .string "Those TRAINERS…\n" + .string "What are they doing?\l" + .string "They should be taking challenges.$" + diff --git a/data/maps/BattleFrontier_Lounge4/events.inc b/data/maps/BattleFrontier_Lounge4/events.inc new file mode 100644 index 000000000..613adfae2 --- /dev/null +++ b/data/maps/BattleFrontier_Lounge4/events.inc @@ -0,0 +1,11 @@ +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 + +BattleFrontier_Lounge4_MapWarps: @ 853D294 + 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/BattleFrontier_Lounge4/scripts.inc b/data/maps/BattleFrontier_Lounge4/scripts.inc new file mode 100644 index 000000000..1108ceee7 --- /dev/null +++ b/data/maps/BattleFrontier_Lounge4/scripts.inc @@ -0,0 +1,30 @@ +BattleFrontier_Lounge4_MapScripts:: @ 826358C + .byte 0 + +BattleFrontier_Lounge4_EventScript_26358D:: @ 826358D + msgbox BattleFrontier_Lounge4_Text_2635A8, 2 + end + +BattleFrontier_Lounge4_EventScript_263596:: @ 8263596 + msgbox BattleFrontier_Lounge4_Text_2635EC, 2 + end + +BattleFrontier_Lounge4_EventScript_26359F:: @ 826359F + msgbox BattleFrontier_Lounge4_Text_263625, 2 + end + +BattleFrontier_Lounge4_Text_2635A8: @ 82635A8 + .string "I wonder if they’ll be airing interviews\n" + .string "with tough TRAINERS today?$" + +BattleFrontier_Lounge4_Text_2635EC: @ 82635EC + .string "If I opened a restaurant here,\n" + .string "it’d make money for sure.$" + +BattleFrontier_Lounge4_Text_263625: @ 8263625 + .string "Whew…\p" + .string "I need to take a breather after\n" + .string "some intense battles…\p" + .string "But even now, I never take a break\n" + .string "from plotting strategy and combos.$" + diff --git a/data/maps/BattleFrontier_Lounge5/events.inc b/data/maps/BattleFrontier_Lounge5/events.inc new file mode 100644 index 000000000..0224ae0a9 --- /dev/null +++ b/data/maps/BattleFrontier_Lounge5/events.inc @@ -0,0 +1,13 @@ +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 + +BattleFrontier_Lounge5_MapWarps: @ 853D34C + 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/BattleFrontier_Lounge5/scripts.inc b/data/maps/BattleFrontier_Lounge5/scripts.inc new file mode 100644 index 000000000..bb1feceec --- /dev/null +++ b/data/maps/BattleFrontier_Lounge5/scripts.inc @@ -0,0 +1,206 @@ +BattleFrontier_Lounge5_MapScripts:: @ 82645C5 + .byte 0 + +BattleFrontier_Lounge5_EventScript_2645C6:: @ 82645C6 + lock + faceplayer + msgbox BattleFrontier_Lounge5_Text_264632, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_Lounge5_EventScript_26460D + special sub_81B94B0 + waitstate + lock + faceplayer + compare VAR_0x8004, 255 + goto_eq BattleFrontier_Lounge5_EventScript_26460D + specialvar VAR_RESULT, ScriptGetPartyMonSpecies + compare VAR_RESULT, 412 + goto_eq BattleFrontier_Lounge5_EventScript_264603 + special sub_813A7B8 + waitmessage + waitbuttonpress + release + end + +BattleFrontier_Lounge5_EventScript_264603:: @ 8264603 + msgbox BattleFrontier_Lounge5_Text_264EEE, 4 + release + end + +BattleFrontier_Lounge5_EventScript_26460D:: @ 826460D + msgbox BattleFrontier_Lounge5_Text_26467F, 4 + release + end + +BattleFrontier_Lounge5_EventScript_264617:: @ 8264617 + msgbox BattleFrontier_Lounge5_Text_264F22, 2 + end + +BattleFrontier_Lounge5_EventScript_264620:: @ 8264620 + msgbox BattleFrontier_Lounge5_Text_264F64, 2 + end + +BattleFrontier_Lounge5_EventScript_264629:: @ 8264629 + msgbox BattleFrontier_Lounge5_Text_264FAB, 2 + end + +BattleFrontier_Lounge5_Text_264632:: @ 8264632 + .string "Ehehe!\n" + .string "I can tell what POKéMON are thinking!\p" + .string "Please!\n" + .string "Can I see your POKéMON?$" + +BattleFrontier_Lounge5_Text_26467F:: @ 826467F + .string "Boo!\n" + .string "Cheapie!$" + +BattleFrontier_Lounge5_Text_26468D:: @ 826468D + .string "Hmhm…\p" + .string "This one says it likes to battle!\n" + .string "It will battle even if it has a lot\l" + .string "of ouchies!$" + +BattleFrontier_Lounge5_Text_2646E5:: @ 82646E5 + .string "Hmhm…\p" + .string "This one says it likes to be sneaky!\n" + .string "But if it gets enough ouchies,\l" + .string "it will hit back!$" + +BattleFrontier_Lounge5_Text_264741:: @ 8264741 + .string "Hmhm…\p" + .string "This one says it likes to battle!\n" + .string "But if it gets enough ouchies,\l" + .string "it will worry about itself!$" + +BattleFrontier_Lounge5_Text_2647A4:: @ 82647A4 + .string "Hmhm…\p" + .string "This one says it likes to battle!\n" + .string "It will battle even if it has a lot\l" + .string "of ouchies!$" + +BattleFrontier_Lounge5_Text_2647FC:: @ 82647FC + .string "Hmhm…\p" + .string "This one says it looks after itself!\n" + .string "But if it gets enough ouchies,\l" + .string "it will hit back!$" + +BattleFrontier_Lounge5_Text_264858:: @ 8264858 + .string "Hmhm…\p" + .string "This one says it likes to be sneaky!\n" + .string "But if it gets enough ouchies,\l" + .string "it will worry about itself!$" + +BattleFrontier_Lounge5_Text_2648BE:: @ 82648BE + .string "Hmhm…\p" + .string "This one says it likes to battle!\n" + .string "It will battle even if it has a lot\l" + .string "of ouchies!$" + +BattleFrontier_Lounge5_Text_264916:: @ 8264916 + .string "Hmhm…\p" + .string "This one says it likes to be sneaky!\n" + .string "But if it gets enough ouchies,\l" + .string "it will hit back!$" + +BattleFrontier_Lounge5_Text_264972:: @ 8264972 + .string "Hmhm…\p" + .string "This one says it likes to battle!\n" + .string "But if it gets enough ouchies,\l" + .string "it will worry about itself!$" + +BattleFrontier_Lounge5_Text_2649D5:: @ 82649D5 + .string "Hmhm…\p" + .string "This one says it likes to be sneaky!\n" + .string "It says it likes to be sneaky even\l" + .string "if it has a lot of ouchies!$" + +BattleFrontier_Lounge5_Text_264A3F:: @ 8264A3F + .string "Hmhm…\p" + .string "This one says it likes to battle!\n" + .string "But if it gets enough ouchies,\l" + .string "it will turn sneaky!$" + +BattleFrontier_Lounge5_Text_264A9B:: @ 8264A9B + .string "Hmhm…\p" + .string "This one says it likes to battle!\n" + .string "It will battle even if it has a lot\l" + .string "of ouchies!$" + +BattleFrontier_Lounge5_Text_264AF3:: @ 8264AF3 + .string "Hmhm…\p" + .string "This one says it likes to be sneaky!\n" + .string "It says it likes to be sneaky even\l" + .string "if it has a lot of ouchies!$" + +BattleFrontier_Lounge5_Text_264B5D:: @ 8264B5D + .string "Hmhm…\p" + .string "This one says it likes to be sneaky!\n" + .string "But if it gets enough ouchies,\l" + .string "it will worry about itself!$" + +BattleFrontier_Lounge5_Text_264BC3:: @ 8264BC3 + .string "Hmhm…\p" + .string "This one says it looks after itself!\n" + .string "It says it worries about itself whether\l" + .string "or not it has a lot of ouchies!$" + +BattleFrontier_Lounge5_Text_264C36:: @ 8264C36 + .string "Hmhm…\p" + .string "This one says it looks after itself!\n" + .string "But if it gets enough ouchies,\l" + .string "it will turn sneaky!$" + +BattleFrontier_Lounge5_Text_264C95:: @ 8264C95 + .string "Hmhm…\p" + .string "This one says it looks after itself!\n" + .string "It says it worries about itself even\l" + .string "if it has a lot of ouchies!$" + +BattleFrontier_Lounge5_Text_264D01:: @ 8264D01 + .string "Hmhm…\p" + .string "This one says it likes to be sneaky!\n" + .string "It says it likes to be sneaky even\l" + .string "if it has a lot of ouchies!$" + +BattleFrontier_Lounge5_Text_264D6B:: @ 8264D6B + .string "Hmhm…\p" + .string "This one says it looks after itself!\n" + .string "It says it worries about itself even\l" + .string "if it has a lot of ouchies!$" + +BattleFrontier_Lounge5_Text_264DD7:: @ 8264DD7 + .string "Hmhm…\p" + .string "This one says it looks after itself!\n" + .string "But if it gets enough ouchies,\l" + .string "it will hit back!$" + +BattleFrontier_Lounge5_Text_264E33:: @ 8264E33 + .string "Hmhm…\p" + .string "This one says it likes to battle!\n" + .string "But if it gets enough ouchies,\l" + .string "it will turn sneaky!$" + +BattleFrontier_Lounge5_Text_264E8F:: @ 8264E8F + .string "Hmhm…\p" + .string "This one says it looks after itself!\n" + .string "But if it gets enough ouchies,\l" + .string "it will turn sneaky!$" + +BattleFrontier_Lounge5_Text_264EEE:: @ 8264EEE + .string "That’s silly! An EGG is asleep!\n" + .string "I can’t talk to it!$" + +BattleFrontier_Lounge5_Text_264F22:: @ 8264F22 + .string "How charming!\n" + .string "That little lady claims she can\l" + .string "understand POKéMON!$" + +BattleFrontier_Lounge5_Text_264F64:: @ 8264F64 + .string "I have this feeling that the little girl\n" + .string "is saying something profound.$" + +BattleFrontier_Lounge5_Text_264FAB:: @ 8264FAB + .string "I know something!\p" + .string "That little girl plays at the red house\n" + .string "a lot!$" + diff --git a/data/maps/BattleFrontier_Lounge6/events.inc b/data/maps/BattleFrontier_Lounge6/events.inc new file mode 100644 index 000000000..092be452b --- /dev/null +++ b/data/maps/BattleFrontier_Lounge6/events.inc @@ -0,0 +1,9 @@ +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 + +BattleFrontier_Lounge6_MapWarps: @ 853D388 + 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/BattleFrontier_Lounge6/scripts.inc b/data/maps/BattleFrontier_Lounge6/scripts.inc new file mode 100644 index 000000000..c779e7c76 --- /dev/null +++ b/data/maps/BattleFrontier_Lounge6/scripts.inc @@ -0,0 +1,82 @@ +BattleFrontier_Lounge6_MapScripts:: @ 8264FEC + .byte 0 + +BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED + lock + faceplayer + checkflag FLAG_0x09C + goto_eq BattleFrontier_Lounge6_EventScript_265083 + setvar VAR_0x8008, 3 + copyvar VAR_0x8004, VAR_0x8008 + specialvar VAR_RESULT, sub_807E73C + copyvar VAR_0x8009, VAR_RESULT + msgbox BattleFrontier_Lounge6_Text_26508D, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_Lounge6_EventScript_26506B + special sub_81B94B0 + waitstate + copyvar VAR_0x800A, VAR_0x8004 + compare VAR_0x8004, 255 + goto_eq BattleFrontier_Lounge6_EventScript_26506B + copyvar VAR_0x8005, VAR_0x800A + specialvar VAR_RESULT, sub_807E9D4 + copyvar VAR_0x800B, VAR_RESULT + compare VAR_RESULT, VAR_0x8009 + goto_if 5, BattleFrontier_Lounge6_EventScript_265075 + copyvar VAR_0x8004, VAR_0x8008 + copyvar VAR_0x8005, VAR_0x800A + special sub_807EA10 + special sub_807F0E4 + waitstate + msgbox BattleFrontier_Lounge6_Text_265128, 4 + setflag FLAG_0x09C + release + end + +BattleFrontier_Lounge6_EventScript_26506B:: @ 826506B + msgbox BattleFrontier_Lounge6_Text_2651CB, 4 + release + end + +BattleFrontier_Lounge6_EventScript_265075:: @ 8265075 + bufferspeciesname 0, VAR_0x8009 + msgbox BattleFrontier_Lounge6_Text_26518D, 4 + release + end + +BattleFrontier_Lounge6_EventScript_265083:: @ 8265083 + msgbox BattleFrontier_Lounge6_Text_26520E, 4 + release + end + +BattleFrontier_Lounge6_Text_26508D: @ 826508D + .string "My POKéMON is a {STR_VAR_2}.\n" + .string "Do you know it?\l" + .string "It’s quite cute and rather nice.\p" + .string "This little one, I could trade with\n" + .string "pride!\p" + .string "Would you like to trade me a {STR_VAR_1}\n" + .string "for my {STR_VAR_2}?$" + +BattleFrontier_Lounge6_Text_265128: @ 8265128 + .string "Oh, it’s adorable!\n" + .string "Thank you!\l" + .string "I promise I’ll be good to it!\p" + .string "Oh! I hope you’ll be good to\n" + .string "my {STR_VAR_2}, too!$" + +BattleFrontier_Lounge6_Text_26518D: @ 826518D + .string "Oh, I’m sorry!\n" + .string "I don’t intend to trade for anything\l" + .string "but a {STR_VAR_1}.$" + +BattleFrontier_Lounge6_Text_2651CB: @ 82651CB + .string "Oh, you won’t?\n" + .string "Well, that’s fine, too.\l" + .string "Please come visit us again.$" + +BattleFrontier_Lounge6_Text_26520E: @ 826520E + .string "Giggle!\n" + .string "A SKITTY is so much cuter than I had\l" + .string "imagined. I’m delighted!$" + diff --git a/data/maps/BattleFrontier_Lounge7/events.inc b/data/maps/BattleFrontier_Lounge7/events.inc new file mode 100644 index 000000000..c5490d6c9 --- /dev/null +++ b/data/maps/BattleFrontier_Lounge7/events.inc @@ -0,0 +1,12 @@ +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 + +BattleFrontier_Lounge7_MapWarps: @ 853D404 + 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/BattleFrontier_Lounge7/scripts.inc b/data/maps/BattleFrontier_Lounge7/scripts.inc new file mode 100644 index 000000000..0b810d4f7 --- /dev/null +++ b/data/maps/BattleFrontier_Lounge7/scripts.inc @@ -0,0 +1,482 @@ +BattleFrontier_Lounge7_MapScripts:: @ 8265254 + .byte 0 + +BattleFrontier_Lounge7_EventScript_265255:: @ 8265255 + lock + faceplayer + setvar VAR_TEMP_C, 9 + checkflag FLAG_0x15A + goto_eq BattleFrontier_Lounge7_EventScript_265276 + msgbox BattleFrontier_Lounge7_Text_2656ED, 4 + setflag FLAG_0x15A + goto BattleFrontier_Lounge7_EventScript_265284 + end + +BattleFrontier_Lounge7_EventScript_265276:: @ 8265276 + msgbox BattleFrontier_Lounge7_Text_2658AB, 4 + goto BattleFrontier_Lounge7_EventScript_265284 + end + +BattleFrontier_Lounge7_EventScript_265284:: @ 8265284 + message BattleFrontier_Lounge7_Text_2658EF + waitmessage + special sub_813A958 + setvar VAR_TEMP_E, 0 + setvar VAR_0x8004, 9 + setvar VAR_0x8006, 0 + special sub_813A128 + waitstate + copyvar VAR_TEMP_D, VAR_RESULT + switch VAR_RESULT + case 0, BattleFrontier_Lounge7_EventScript_2653D7 + case 1, BattleFrontier_Lounge7_EventScript_2653E2 + case 2, BattleFrontier_Lounge7_EventScript_2653ED + case 3, BattleFrontier_Lounge7_EventScript_2653F8 + case 4, BattleFrontier_Lounge7_EventScript_265403 + case 5, BattleFrontier_Lounge7_EventScript_26540E + case 6, BattleFrontier_Lounge7_EventScript_265419 + case 7, BattleFrontier_Lounge7_EventScript_265424 + case 8, BattleFrontier_Lounge7_EventScript_26542F + case 9, BattleFrontier_Lounge7_EventScript_26543A + case 10, BattleFrontier_Lounge7_EventScript_265635 + case 127, BattleFrontier_Lounge7_EventScript_265635 + end + +BattleFrontier_Lounge7_EventScript_26532F:: @ 826532F + message BattleFrontier_Lounge7_Text_2658EF + waitmessage + setvar VAR_TEMP_E, 0 + setvar VAR_0x8004, 9 + setvar VAR_0x8006, 1 + special sub_813A128 + waitstate + copyvar VAR_TEMP_D, VAR_RESULT + switch VAR_RESULT + case 0, BattleFrontier_Lounge7_EventScript_2653D7 + case 1, BattleFrontier_Lounge7_EventScript_2653E2 + case 2, BattleFrontier_Lounge7_EventScript_2653ED + case 3, BattleFrontier_Lounge7_EventScript_2653F8 + case 4, BattleFrontier_Lounge7_EventScript_265403 + case 5, BattleFrontier_Lounge7_EventScript_26540E + case 6, BattleFrontier_Lounge7_EventScript_265419 + case 7, BattleFrontier_Lounge7_EventScript_265424 + case 8, BattleFrontier_Lounge7_EventScript_26542F + case 9, BattleFrontier_Lounge7_EventScript_26543A + case 10, BattleFrontier_Lounge7_EventScript_265635 + case 127, BattleFrontier_Lounge7_EventScript_265635 + end + +BattleFrontier_Lounge7_EventScript_2653D7:: @ 82653D7 + setvar VAR_0x8008, 16 + goto BattleFrontier_Lounge7_EventScript_26564F + end + +BattleFrontier_Lounge7_EventScript_2653E2:: @ 82653E2 + setvar VAR_0x8008, 24 + goto BattleFrontier_Lounge7_EventScript_26564F + end + +BattleFrontier_Lounge7_EventScript_2653ED:: @ 82653ED + setvar VAR_0x8008, 24 + goto BattleFrontier_Lounge7_EventScript_26564F + end + +BattleFrontier_Lounge7_EventScript_2653F8:: @ 82653F8 + setvar VAR_0x8008, 24 + goto BattleFrontier_Lounge7_EventScript_26564F + end + +BattleFrontier_Lounge7_EventScript_265403:: @ 8265403 + setvar VAR_0x8008, 48 + goto BattleFrontier_Lounge7_EventScript_26564F + end + +BattleFrontier_Lounge7_EventScript_26540E:: @ 826540E + setvar VAR_0x8008, 48 + goto BattleFrontier_Lounge7_EventScript_26564F + end + +BattleFrontier_Lounge7_EventScript_265419:: @ 8265419 + setvar VAR_0x8008, 48 + goto BattleFrontier_Lounge7_EventScript_26564F + end + +BattleFrontier_Lounge7_EventScript_265424:: @ 8265424 + setvar VAR_0x8008, 48 + goto BattleFrontier_Lounge7_EventScript_26564F + end + +BattleFrontier_Lounge7_EventScript_26542F:: @ 826542F + setvar VAR_0x8008, 48 + goto BattleFrontier_Lounge7_EventScript_26564F + end + +BattleFrontier_Lounge7_EventScript_26543A:: @ 826543A + setvar VAR_0x8008, 48 + goto BattleFrontier_Lounge7_EventScript_26564F + end + +BattleFrontier_Lounge7_EventScript_265445:: @ 8265445 + lock + faceplayer + setvar VAR_TEMP_C, 10 + checkflag FLAG_0x15B + goto_eq BattleFrontier_Lounge7_EventScript_265466 + msgbox BattleFrontier_Lounge7_Text_265A6C, 4 + setflag FLAG_0x15B + goto BattleFrontier_Lounge7_EventScript_265474 + end + +BattleFrontier_Lounge7_EventScript_265466:: @ 8265466 + msgbox BattleFrontier_Lounge7_Text_265C2C, 4 + goto BattleFrontier_Lounge7_EventScript_265474 + end + +BattleFrontier_Lounge7_EventScript_265474:: @ 8265474 + message BattleFrontier_Lounge7_Text_2658EF + waitmessage + special sub_813A958 + setvar VAR_TEMP_E, 1 + setvar VAR_0x8004, 10 + setvar VAR_0x8006, 0 + special sub_813A128 + waitstate + copyvar VAR_TEMP_D, VAR_RESULT + switch VAR_RESULT + case 0, BattleFrontier_Lounge7_EventScript_2655C7 + case 1, BattleFrontier_Lounge7_EventScript_2655D2 + case 2, BattleFrontier_Lounge7_EventScript_2655DD + case 3, BattleFrontier_Lounge7_EventScript_2655E8 + case 4, BattleFrontier_Lounge7_EventScript_2655F3 + case 5, BattleFrontier_Lounge7_EventScript_2655FE + case 6, BattleFrontier_Lounge7_EventScript_265609 + case 7, BattleFrontier_Lounge7_EventScript_265614 + case 8, BattleFrontier_Lounge7_EventScript_26561F + case 9, BattleFrontier_Lounge7_EventScript_26562A + case 10, BattleFrontier_Lounge7_EventScript_265635 + case 127, BattleFrontier_Lounge7_EventScript_265635 + end + +BattleFrontier_Lounge7_EventScript_26551F:: @ 826551F + message BattleFrontier_Lounge7_Text_2658EF + waitmessage + setvar VAR_TEMP_E, 1 + setvar VAR_0x8004, 10 + setvar VAR_0x8006, 1 + special sub_813A128 + waitstate + copyvar VAR_TEMP_D, VAR_RESULT + switch VAR_RESULT + case 0, BattleFrontier_Lounge7_EventScript_2655C7 + case 1, BattleFrontier_Lounge7_EventScript_2655D2 + case 2, BattleFrontier_Lounge7_EventScript_2655DD + case 3, BattleFrontier_Lounge7_EventScript_2655E8 + case 4, BattleFrontier_Lounge7_EventScript_2655F3 + case 5, BattleFrontier_Lounge7_EventScript_2655FE + case 6, BattleFrontier_Lounge7_EventScript_265609 + case 7, BattleFrontier_Lounge7_EventScript_265614 + case 8, BattleFrontier_Lounge7_EventScript_26561F + case 9, BattleFrontier_Lounge7_EventScript_26562A + case 10, BattleFrontier_Lounge7_EventScript_265635 + case 127, BattleFrontier_Lounge7_EventScript_265635 + end + +BattleFrontier_Lounge7_EventScript_2655C7:: @ 82655C7 + setvar VAR_0x8008, 16 + goto BattleFrontier_Lounge7_EventScript_26564F + end + +BattleFrontier_Lounge7_EventScript_2655D2:: @ 82655D2 + setvar VAR_0x8008, 24 + goto BattleFrontier_Lounge7_EventScript_26564F + end + +BattleFrontier_Lounge7_EventScript_2655DD:: @ 82655DD + setvar VAR_0x8008, 24 + goto BattleFrontier_Lounge7_EventScript_26564F + end + +BattleFrontier_Lounge7_EventScript_2655E8:: @ 82655E8 + setvar VAR_0x8008, 24 + goto BattleFrontier_Lounge7_EventScript_26564F + end + +BattleFrontier_Lounge7_EventScript_2655F3:: @ 82655F3 + setvar VAR_0x8008, 24 + goto BattleFrontier_Lounge7_EventScript_26564F + end + +BattleFrontier_Lounge7_EventScript_2655FE:: @ 82655FE + setvar VAR_0x8008, 48 + goto BattleFrontier_Lounge7_EventScript_26564F + end + +BattleFrontier_Lounge7_EventScript_265609:: @ 8265609 + setvar VAR_0x8008, 48 + goto BattleFrontier_Lounge7_EventScript_26564F + end + +BattleFrontier_Lounge7_EventScript_265614:: @ 8265614 + setvar VAR_0x8008, 48 + goto BattleFrontier_Lounge7_EventScript_26564F + end + +BattleFrontier_Lounge7_EventScript_26561F:: @ 826561F + setvar VAR_0x8008, 48 + goto BattleFrontier_Lounge7_EventScript_26564F + end + +BattleFrontier_Lounge7_EventScript_26562A:: @ 826562A + setvar VAR_0x8008, 48 + goto BattleFrontier_Lounge7_EventScript_26564F + end + +BattleFrontier_Lounge7_EventScript_265635:: @ 8265635 + special sub_813ADB8 + special sub_813A988 + msgbox BattleFrontier_Lounge7_Text_265A0E, 4 + release + end + +BattleFrontier_Lounge7_EventScript_265645:: @ 8265645 + msgbox BattleFrontier_Lounge7_Text_265A0E, 4 + release + end + +BattleFrontier_Lounge7_EventScript_26564F:: @ 826564F + copyvar VAR_0x8004, VAR_TEMP_D + copyvar VAR_0x8005, VAR_TEMP_E + special sub_813AC7C + buffernumberstring 1, VAR_0x8008 + copyvar VAR_0x8004, VAR_TEMP_C + msgbox BattleFrontier_Lounge7_Text_265921, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_Lounge7_EventScript_2656CA + specialvar VAR_TEMP_1, sub_813AA04 + compare VAR_TEMP_1, VAR_0x8008 + goto_if 4, BattleFrontier_Lounge7_EventScript_265696 + msgbox BattleFrontier_Lounge7_Text_265997, 4 + goto BattleFrontier_Lounge7_EventScript_2656CA + end + +BattleFrontier_Lounge7_EventScript_265696:: @ 8265696 + msgbox BattleFrontier_Lounge7_Text_26595A, 4 + special sub_813AEB4 + fadescreen 1 + special sub_813A988 + special sub_813ADB8 + special sub_81B892C + waitstate + compare VAR_RESULT, 0 + goto_eq BattleFrontier_Lounge7_EventScript_265645 + msgbox BattleFrontier_Lounge7_Text_2659C7, 4 + copyvar VAR_0x8004, VAR_0x8008 + special sub_813A9A4 + release + end + +BattleFrontier_Lounge7_EventScript_2656CA:: @ 82656CA + compare VAR_TEMP_E, 0 + goto_eq BattleFrontier_Lounge7_EventScript_26532F + goto BattleFrontier_Lounge7_EventScript_26551F + end + +BattleFrontier_Lounge7_EventScript_2656DB:: @ 82656DB + msgbox BattleFrontier_Lounge7_Text_265C6F, 2 + end + +BattleFrontier_Lounge7_EventScript_2656E4:: @ 82656E4 + msgbox BattleFrontier_Lounge7_Text_265D17, 2 + end + +BattleFrontier_Lounge7_Text_2656ED: @ 82656ED + .string "Buhahaha!\p" + .string "You couldn’t tell it from looking now,\n" + .string "but I used to be one tough TRAINER.\p" + .string "I had a reputation as the toughest\n" + .string "BEAUTY around, I tell you!\p" + .string "… … … … … …\p" + .string "What is it now?\n" + .string "You don’t believe me.\p" + .string "I’m not like that blowhard woman over\n" + .string "there. I’m actually talented!\p" + .string "Let me prove it to you.\n" + .string "I can teach your POKéMON special and\l" + .string "yet cute moves.\p" + .string "But my lessons don’t come free.\n" + .string "How about paying for the moves I teach\l" + .string "with a wee bit of Battle Points?$" + +BattleFrontier_Lounge7_Text_2658AB: @ 82658AB + .string "Buhahaha!\p" + .string "Are you back to learn special and\n" + .string "yet cute POKéMON moves?$" + +BattleFrontier_Lounge7_Text_2658EF: @ 82658EF + .string "Fine, fine, look here!\n" + .string "Which move should I teach?$" + +BattleFrontier_Lounge7_Text_265921: @ 8265921 + .string "The move {STR_VAR_1}, is it?\n" + .string "That will be {STR_VAR_2} Battle Points, okay?$" + +BattleFrontier_Lounge7_Text_26595A: @ 826595A + .string "Fine, fine, now pick the POKéMON\n" + .string "I should teach the move to.$" + +BattleFrontier_Lounge7_Text_265997: @ 8265997 + .string "What the…\n" + .string "You haven’t got enough Battle Points!$" + +BattleFrontier_Lounge7_Text_2659C7: @ 82659C7 + .string "Do you see how skilled I am now?\n" + .string "I’ll take your Battle Points, thanks!$" + +BattleFrontier_Lounge7_Text_265A0E: @ 8265A0E + .string "What’s that?\n" + .string "You don’t want to…\p" + .string "If you want to see how skilled I am,\n" + .string "you come see me anytime!$" + +BattleFrontier_Lounge7_Text_265A6C: @ 8265A6C + .string "Ihihihi!\p" + .string "I know it’s hard to see now, but I used\n" + .string "to be one fantastic TRAINER.\p" + .string "I had a reputation as the most\n" + .string "invincible SWIMMER around, I tell you!\p" + .string "… … … … … …\p" + .string "What’s wrong?\n" + .string "You don’t believe me.\p" + .string "I’m not like that buffoonish woman over\n" + .string "there. I’m actually experienced!\p" + .string "I can prove it to you.\n" + .string "I can teach your POKéMON hard and\l" + .string "yet pretty moves.\p" + .string "But my lessons don’t come free.\n" + .string "How about paying for the moves I teach\l" + .string "with a wee bit of Battle Points?$" + +BattleFrontier_Lounge7_Text_265C2C: @ 8265C2C + .string "Ihihihi!\p" + .string "Have you come to learn hard and\n" + .string "yet pretty POKéMON moves?$" + +BattleFrontier_Lounge7_Text_265C6F: @ 8265C6F + .string "Those ladies, the way they bad-mouth\n" + .string "each other, you probably think that\l" + .string "they don’t get along.\p" + .string "But if that were true, they wouldn’t\n" + .string "stay out here together, would they?$" + +BattleFrontier_Lounge7_Text_265D17: @ 8265D17 + .string "When I was just a wee YOUNGSTER,\n" + .string "those ladies were strong and beautiful.\p" + .string "They were idols among us TRAINERS.\p" + .string "Even now, age hasn’t dulled their\n" + .string "abilities.\p" + .string "In fact, their POKéMON moves have\n" + .string "grown even more polished.\p" + .string "But… For some reason, I can’t help\n" + .string "but feel this…\p" + .string "Time is so cruel…$" + +BattleFrontier_Lounge7_Text_265E30:: @ 8265E30 + .string "Recovers up to\n" + .string "half the user’s\n" + .string "maximum HP.$" + +BattleFrontier_Lounge7_Text_265E5B:: @ 8265E5B + .string "Inflicts damage\n" + .string "identical to the\n" + .string "user’s level.$" + +BattleFrontier_Lounge7_Text_265E8A:: @ 8265E8A + .string "Recovers half the\n" + .string "damage inflicted\n" + .string "on a sleeping foe.$" + +BattleFrontier_Lounge7_Text_265EC0:: @ 8265EC0 + .string "A strong punch\n" + .string "thrown with\n" + .string "incredible power.$" + +BattleFrontier_Lounge7_Text_265EED:: @ 8265EED + .string "An extremely\n" + .string "powerful kick with\n" + .string "intense force.$" + +BattleFrontier_Lounge7_Text_265F1C:: @ 8265F1C + .string "A full-body slam\n" + .string "that may cause\n" + .string "paralysis.$" + +BattleFrontier_Lounge7_Text_265F47:: @ 8265F47 + .string "Large boulders\n" + .string "are hurled. May\n" + .string "cause flinching.$" + +BattleFrontier_Lounge7_Text_265F77:: @ 8265F77 + .string "Retaliates any\n" + .string "physical hit with\n" + .string "double the power.$" + +BattleFrontier_Lounge7_Text_265FAA:: @ 8265FAA + .string "A weak jolt of\n" + .string "electricity that\n" + .string "paralyzes the foe.$" + +BattleFrontier_Lounge7_Text_265FDD:: @ 8265FDD + .string "A fighting dance\n" + .string "that sharply\n" + .string "raises ATTACK.$" + +BattleFrontier_Lounge7_Text_26600A:: @ 826600A + .string "Curls up to con-\n" + .string "ceal weak spots\n" + .string "and raise DEFENSE.$" + +BattleFrontier_Lounge7_Text_26603E:: @ 826603E + .string "A loud attack\n" + .string "that can be used\n" + .string "only while asleep.$" + +BattleFrontier_Lounge7_Text_266070:: @ 8266070 + .string "Hurls mud in the\n" + .string "foe’s face to re-\n" + .string "duce its accuracy.$" + +BattleFrontier_Lounge7_Text_2660A6:: @ 82660A6 + .string "Sprays star-\n" + .string "shaped rays\n" + .string "that never miss.$" + +BattleFrontier_Lounge7_Text_2660D0:: @ 82660D0 + .string "A chilling attack\n" + .string "that lowers the\n" + .string "foe’s SPEED.$" + +BattleFrontier_Lounge7_Text_2660FF:: @ 82660FF + .string "Endures any at-\n" + .string "tack for 1 turn,\n" + .string "leaving 1HP.$" + +BattleFrontier_Lounge7_Text_26612D:: @ 826612D + .string "Copies the foe’s\n" + .string "effect(s) and\n" + .string "gives to the user.$" + +BattleFrontier_Lounge7_Text_26615F:: @ 826615F + .string "An icy punch\n" + .string "that may\n" + .string "freeze the foe.$" + +BattleFrontier_Lounge7_Text_266185:: @ 8266185 + .string "An electrified\n" + .string "punch that may\n" + .string "paralyze the foe.$" + +BattleFrontier_Lounge7_Text_2661B5:: @ 82661B5 + .string "A fiery punch\n" + .string "that may burn\n" + .string "the foe.$" + diff --git a/data/maps/BattleFrontier_Lounge8/events.inc b/data/maps/BattleFrontier_Lounge8/events.inc new file mode 100644 index 000000000..116cc007f --- /dev/null +++ b/data/maps/BattleFrontier_Lounge8/events.inc @@ -0,0 +1,11 @@ +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 + +BattleFrontier_Lounge8_MapWarps: @ 853D504 + 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/BattleFrontier_Lounge8/scripts.inc b/data/maps/BattleFrontier_Lounge8/scripts.inc new file mode 100644 index 000000000..35f83baff --- /dev/null +++ b/data/maps/BattleFrontier_Lounge8/scripts.inc @@ -0,0 +1,45 @@ +BattleFrontier_Lounge8_MapScripts:: @ 82676C9 + .byte 0 + +BattleFrontier_Lounge8_EventScript_2676CA:: @ 82676CA + msgbox BattleFrontier_Lounge8_Text_2676E5, 2 + end + +BattleFrontier_Lounge8_EventScript_2676D3:: @ 82676D3 + msgbox BattleFrontier_Lounge8_Text_26779C, 2 + end + +BattleFrontier_Lounge8_EventScript_2676DC:: @ 82676DC + msgbox BattleFrontier_Lounge8_Text_26782C, 2 + end + +BattleFrontier_Lounge8_Text_2676E5: @ 82676E5 + .string "What a TRAINER needs…\p" + .string "Knowledge…\n" + .string "Strategy…\l" + .string "Luck…\l" + .string "Guts…\l" + .string "Spirit…\l" + .string "Bravery…\l" + .string "And ability…\p" + .string "Well, I’m all set in every way!\n" + .string "I’ll be unstoppable at every building!\p" + .string "Huh? POKéMON?\n" + .string "What’s that?$" + +BattleFrontier_Lounge8_Text_26779C: @ 826779C + .string "Do you know about the FRONTIER\n" + .string "BRAINS?\p" + .string "That’s what SCOTT calls the seven\n" + .string "special TRAINERS that run the seven\l" + .string "facilities in the BATTLE FRONTIER.$" + +BattleFrontier_Lounge8_Text_26782C: @ 826782C + .string "At the BATTLE TOWER, an older girl\n" + .string "told me that I have a lot of talent\l" + .string "for battling!\p" + .string "I like POKéMON CONTESTS more!\p" + .string "But I’m no good at CONTESTS!\p" + .string "I guess having talent and liking\n" + .string "something aren’t the same.$" + diff --git a/data/maps/BattleFrontier_Lounge9/events.inc b/data/maps/BattleFrontier_Lounge9/events.inc new file mode 100644 index 000000000..6500ab66a --- /dev/null +++ b/data/maps/BattleFrontier_Lounge9/events.inc @@ -0,0 +1,10 @@ +BattleFrontier_Lounge9_EventObjects: @ 853D520 + 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 + 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/BattleFrontier_Lounge9/scripts.inc b/data/maps/BattleFrontier_Lounge9/scripts.inc new file mode 100644 index 000000000..cba75ee77 --- /dev/null +++ b/data/maps/BattleFrontier_Lounge9/scripts.inc @@ -0,0 +1,3 @@ +BattleFrontier_Lounge9_MapScripts:: @ 82678F8 + .byte 0 + diff --git a/data/maps/BattleFrontier_Mart/events.inc b/data/maps/BattleFrontier_Mart/events.inc new file mode 100644 index 000000000..669945b99 --- /dev/null +++ b/data/maps/BattleFrontier_Mart/events.inc @@ -0,0 +1,13 @@ +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 + +BattleFrontier_Mart_MapWarps: @ 853D6EC + 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/BattleFrontier_Mart/scripts.inc b/data/maps/BattleFrontier_Mart/scripts.inc new file mode 100644 index 000000000..0b7f5b767 --- /dev/null +++ b/data/maps/BattleFrontier_Mart/scripts.inc @@ -0,0 +1,67 @@ +BattleFrontier_Mart_MapScripts:: @ 8267ACB + .byte 0 + +BattleFrontier_Mart_EventScript_267ACC:: @ 8267ACC + lock + faceplayer + message gUnknown_08272A21 + waitmessage + pokemart BattleFrontier_Mart_Pokemart_267AE4 + msgbox gUnknown_08272A3F, 4 + release + end + + .align 2 +BattleFrontier_Mart_Pokemart_267AE4: @ 8267AE4 + .2byte ITEM_ULTRA_BALL + .2byte ITEM_HYPER_POTION + .2byte ITEM_MAX_POTION + .2byte ITEM_FULL_RESTORE + .2byte ITEM_FULL_HEAL + .2byte ITEM_REVIVE + .2byte ITEM_MAX_REPEL + .2byte ITEM_PROTEIN + .2byte ITEM_CALCIUM + .2byte ITEM_IRON + .2byte ITEM_ZINC + .2byte ITEM_CARBOS + .2byte ITEM_HP_UP + .2byte ITEM_NONE + release + end + +BattleFrontier_Mart_EventScript_267B02:: @ 8267B02 + msgbox BattleFrontier_Mart_Text_267B29, 2 + end + +BattleFrontier_Mart_EventScript_267B0B:: @ 8267B0B + lock + applymovement 2, BattleFrontier_Mart_Movement_2725B0 + waitmovement 0 + msgbox BattleFrontier_Mart_Text_267B8F, 4 + release + end + +BattleFrontier_Mart_EventScript_267B20:: @ 8267B20 + msgbox BattleFrontier_Mart_Text_267C01, 2 + end + +BattleFrontier_Mart_Text_267B29: @ 8267B29 + .string "We came here to chaperon our\n" + .string "grandson.\p" + .string "But since we’re here, we thought\n" + .string "we should get some souvenirs.$" + +BattleFrontier_Mart_Text_267B8F: @ 8267B8F + .string "Dear, what do you think of this?\n" + .string "Wouldn’t this make a nice gift?\p" + .string "It’s…PRO…TE…IN?\n" + .string "It sounds delicious, doesn’t it?$" + +BattleFrontier_Mart_Text_267C01: @ 8267C01 + .string "A lot of the BATTLE FRONTIER’s\n" + .string "facilities don’t allow the use of items\l" + .string "during battles.\p" + .string "That rule makes things tougher than\n" + .string "they already are!$" + diff --git a/data/maps/BattleFrontier_OutsideEast/events.inc b/data/maps/BattleFrontier_OutsideEast/events.inc new file mode 100644 index 000000000..37fa6e7bd --- /dev/null +++ b/data/maps/BattleFrontier_OutsideEast/events.inc @@ -0,0 +1,57 @@ +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 + +BattleFrontier_OutsideEast_MapWarps: @ 853BD80 + 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 + 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 + +BattleFrontier_OutsideEast_MapEvents:: @ 853BE50 + map_events BattleFrontier_OutsideEast_EventObjects, BattleFrontier_OutsideEast_MapWarps, 0x0, BattleFrontier_OutsideEast_MapBGEvents + diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc new file mode 100644 index 000000000..dff56322a --- /dev/null +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -0,0 +1,444 @@ +BattleFrontier_OutsideEast_MapScripts:: @ 8242C04 + map_script 5, BattleFrontier_OutsideEast_MapScript1_242C0F + map_script 3, BattleFrontier_OutsideEast_MapScript1_242C2D + .byte 0 + +BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F + checkflag FLAG_SYS_CTRL_OBJ_DELETE + call_if 1, BattleFrontier_OutsideEast_EventScript_242C19 + end + +BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19 + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 7 + goto_if 5, BattleFrontier_OutsideEast_EventScript_27374E + removeobject VAR_LAST_TALKED + return + +BattleFrontier_OutsideEast_MapScript1_242C2D: @ 8242C2D + setvar VAR_0x40BC, 0 + setflag FLAG_0x396 + checkflag FLAG_0x1C6 + call_if 0, BattleFrontier_OutsideEast_EventScript_242C3F + end + +BattleFrontier_OutsideEast_EventScript_242C3F:: @ 8242C3F + clearflag FLAG_0x34A + return + +BattleFrontier_OutsideEast_EventScript_242C43:: @ 8242C43 + msgbox BattleFrontier_OutsideEast_Text_242E11, 3 + end + +BattleFrontier_OutsideEast_EventScript_242C4C:: @ 8242C4C + msgbox BattleFrontier_OutsideEast_Text_242E58, 3 + end + +BattleFrontier_OutsideEast_EventScript_242C55:: @ 8242C55 + msgbox BattleFrontier_OutsideEast_Text_242E96, 3 + end + +BattleFrontier_OutsideEast_EventScript_242C5E:: @ 8242C5E + msgbox BattleFrontier_OutsideEast_Text_242ECF, 3 + end + +BattleFrontier_OutsideEast_EventScript_242C67:: @ 8242C67 + msgbox BattleFrontier_OutsideEast_Text_242F8C, 2 + end + +BattleFrontier_OutsideEast_EventScript_242C70:: @ 8242C70 + msgbox BattleFrontier_OutsideEast_Text_242FDC, 2 + end + +BattleFrontier_OutsideEast_EventScript_242C79:: @ 8242C79 + msgbox BattleFrontier_OutsideEast_Text_24308C, 2 + end + +BattleFrontier_OutsideEast_EventScript_242C82:: @ 8242C82 + msgbox BattleFrontier_OutsideEast_Text_243106, 2 + end + +BattleFrontier_OutsideEast_EventScript_242C8B:: @ 8242C8B + msgbox BattleFrontier_OutsideEast_Text_2431A5, 2 + end + +BattleFrontier_OutsideEast_EventScript_242C94:: @ 8242C94 + lock + msgbox BattleFrontier_OutsideEast_Text_2432DD, 4 + release + end + +BattleFrontier_OutsideEast_EventScript_242C9F:: @ 8242C9F + lock + faceplayer + waitse + playmoncry SPECIES_ZIGZAGOON, 0 + msgbox BattleFrontier_OutsideEast_Text_24334B, 4 + waitmoncry + release + end + +BattleFrontier_OutsideEast_EventScript_242CB2:: @ 8242CB2 + msgbox BattleFrontier_OutsideEast_Text_243363, 2 + end + +BattleFrontier_OutsideEast_EventScript_242CBB:: @ 8242CBB + msgbox BattleFrontier_OutsideEast_Text_243425, 2 + end + +BattleFrontier_OutsideEast_EventScript_242CC4:: @ 8242CC4 + msgbox BattleFrontier_OutsideEast_Text_2434A0, 2 + end + +BattleFrontier_OutsideEast_EventScript_242CCD:: @ 8242CCD + msgbox BattleFrontier_OutsideEast_Text_243504, 2 + end + +BattleFrontier_OutsideEast_EventScript_242CD6:: @ 8242CD6 + lock + msgbox BattleFrontier_OutsideEast_Text_243529, 4 + release + end + +BattleFrontier_OutsideEast_EventScript_242CE1:: @ 8242CE1 + msgbox BattleFrontier_OutsideEast_Text_243230, 2 + end + +BattleFrontier_OutsideEast_EventScript_242CEA:: @ 8242CEA + lock + faceplayer + waitse + playse 269 + applymovement 14, BattleFrontier_OutsideEast_Movement_242D69 + waitmovement 0 + release + end + +BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC + lock + faceplayer + special sub_80FAFF8 + waitstate + waitse + playse 269 + applymovement 14, BattleFrontier_OutsideEast_Movement_242D69 + waitmovement 0 + msgbox gUnknown_082731BD, 4 + closemessage + waitse + playmoncry SPECIES_SUDOWOODO, 2 + delay 40 + waitmoncry + setvar VAR_LAST_TALKED, 14 + setwildbattle SPECIES_SUDOWOODO, 40, ITEM_NONE + setflag FLAG_SYS_CTRL_OBJ_DELETE + dowildbattle + clearflag FLAG_SYS_CTRL_OBJ_DELETE + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_OutsideEast_EventScript_242D60 + compare VAR_RESULT, 4 + goto_eq BattleFrontier_OutsideEast_EventScript_242D60 + compare VAR_RESULT, 5 + goto_eq BattleFrontier_OutsideEast_EventScript_242D60 + setflag FLAG_0x1C6 + release + end + +BattleFrontier_OutsideEast_EventScript_242D60:: @ 8242D60 + setflag FLAG_0x1C6 + goto IslandCave_EventScript_27376D + end + +BattleFrontier_OutsideEast_Movement_242D69: @ 8242D69 + 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 + msgbox BattleFrontier_OutsideEast_Text_243598, 2 + end + +BattleFrontier_OutsideEast_EventScript_242D82:: @ 8242D82 + msgbox BattleFrontier_OutsideEast_Text_243668, 2 + end + +BattleFrontier_OutsideEast_EventScript_242D8B:: @ 8242D8B + msgbox BattleFrontier_OutsideEast_Text_2436F2, 2 + end + +BattleFrontier_OutsideEast_EventScript_242D94:: @ 8242D94 + msgbox BattleFrontier_OutsideEast_Text_243809, 2 + end + +BattleFrontier_OutsideEast_EventScript_242D9D:: @ 8242D9D + msgbox BattleFrontier_OutsideEast_Text_243895, 2 + end + +BattleFrontier_OutsideEast_EventScript_242DA6:: @ 8242DA6 + msgbox BattleFrontier_OutsideEast_Text_243943, 2 + end + +BattleFrontier_OutsideEast_EventScript_242DAF:: @ 8242DAF + msgbox BattleFrontier_OutsideEast_Text_2439A0, 2 + end + +BattleFrontier_OutsideEast_EventScript_242DB8:: @ 8242DB8 + lock + msgbox BattleFrontier_OutsideEast_Text_243A2B, 4 + release + end + +BattleFrontier_OutsideEast_EventScript_242DC3:: @ 8242DC3 + lock + msgbox BattleFrontier_OutsideEast_Text_243A53, 4 + release + end + +BattleFrontier_OutsideEast_EventScript_242DCE:: @ 8242DCE + msgbox BattleFrontier_OutsideEast_Text_242F0D, 3 + end + +BattleFrontier_OutsideEast_EventScript_242DD7:: @ 8242DD7 + msgbox BattleFrontier_OutsideEast_Text_242F4A, 3 + end + +BattleFrontier_OutsideEast_EventScript_242DE0:: @ 8242DE0 + msgbox BattleFrontier_OutsideEast_Text_243B68, 2 + end + +BattleFrontier_OutsideEast_EventScript_242DE9:: @ 8242DE9 + lock + faceplayer + checkflag FLAG_0x1C6 + goto_eq BattleFrontier_OutsideEast_EventScript_242DFE + msgbox BattleFrontier_OutsideEast_Text_243C2C, 4 + release + end + +BattleFrontier_OutsideEast_EventScript_242DFE:: @ 8242DFE + msgbox BattleFrontier_OutsideEast_Text_243CA3, 4 + release + end + +BattleFrontier_OutsideEast_EventScript_242E08:: @ 8242E08 + msgbox BattleFrontier_OutsideEast_Text_243D0B, 2 + end + +BattleFrontier_OutsideEast_Text_242E11: @ 8242E11 + .string "This is the BATTLE TOWER!\n" + .string "Keep the win streak as the toughest\l" + .string "TRAINER!$" + +BattleFrontier_OutsideEast_Text_242E58: @ 8242E58 + .string "This is the BATTLE PALACE!\n" + .string "Keep your eyes on POKéMON battles!$" + +BattleFrontier_OutsideEast_Text_242E96: @ 8242E96 + .string "This is the BATTLE ARENA!\n" + .string "Let the toughest teams gather!$" + +BattleFrontier_OutsideEast_Text_242ECF: @ 8242ECF + .string "This is the BATTLE PYRAMID!\n" + .string "Advance through the Battle Quest!$" + +BattleFrontier_OutsideEast_Text_242F0D: @ 8242F0D + .string "BATTLE FRONTIER RANKING HALL\n" + .string "Set your sights on new records!$" + +BattleFrontier_OutsideEast_Text_242F4A: @ 8242F4A + .string "BATTLE POINT EXCHANGE SERVICE CORNER\n" + .string "Exchange your Battle Points!$" + +BattleFrontier_OutsideEast_Text_242F8C: @ 8242F8C + .string "Wow!\n" + .string "It’s huge!\p" + .string "The BATTLE TOWER feels special.\n" + .string "It’s different from the others.$" + +BattleFrontier_OutsideEast_Text_242FDC: @ 8242FDC + .string "My grand ambition is to conquer both\n" + .string "the BATTLE FRONTIER and the POKéMON\l" + .string "LEAGUE.\p" + .string "And if my dream comes true…\p" + .string "I… I’m going to ask MIMI next door\n" + .string "if she will be friends with me!$" + +BattleFrontier_OutsideEast_Text_24308C: @ 824308C + .string "The BATTLE PYRAMID’s too harsh!\n" + .string "I just can’t make it to the top!\p" + .string "Since I’m out of options, maybe I can\n" + .string "climb the outside…$" + +BattleFrontier_OutsideEast_Text_243106: @ 8243106 + .string "I thrive in darkness…\n" + .string "Yes… What is worthy of me?\l" + .string "None other than the BATTLE PYRAMID…\p" + .string "What say you to wandering in darkness\n" + .string "and in utter and total desperation?$" + +BattleFrontier_OutsideEast_Text_2431A5: @ 82431A5 + .string "I didn’t sleep for a week, but then\n" + .string "I put together the ultimate team!\p" + .string "I can’t see myself losing, no joke.\n" + .string "We’re storming the BATTLE ARENA!$" + +BattleFrontier_OutsideEast_Text_243230: @ 8243230 + .string "Did SCOTT bring you here, too?\n" + .string "What is it with that guy?\p" + .string "It sounds like he really does know\n" + .string "how to spot talented TRAINERS, but…\p" + .string "I’ve never seen him battling in person\n" + .string "ever.$" + +BattleFrontier_OutsideEast_Text_2432DD: @ 82432DD + .string "ZIGG!\n" + .string "I believe in you, little buddy!\p" + .string "I’ll make my little ZIGG any favorite\n" + .string "tasty treats you like if you win!$" + +BattleFrontier_OutsideEast_Text_24334B: @ 824334B + .string "ZIGZAGOON looks vacant…$" + +BattleFrontier_OutsideEast_Text_243363: @ 8243363 + .string "People call me a busybody,\n" + .string "but I can’t help it.\p" + .string "Your hat’s on crooked!\n" + .string "Oh, no, trash on the ground!\l" + .string "Oops, it’s almost dinnertime!\p" + .string "I don’t know if I can stand to just\n" + .string "watch at the BATTLE PALACE…$" + +BattleFrontier_OutsideEast_Text_243425: @ 8243425 + .string "I may not look that impressive now,\n" + .string "but I once beat a GYM LEADER.\p" + .string "Who knows, maybe I should give it\n" + .string "another shot at glory.$" + +BattleFrontier_OutsideEast_Text_2434A0: @ 82434A0 + .string "I’m fast on my BIKE, and that goes for\n" + .string "the way I battle, too.\p" + .string "I win matches in the blink of\n" + .string "an eye!$" + +BattleFrontier_OutsideEast_Text_243504: @ 8243504 + .string "I’m better than my daddy\n" + .string "at POKéMON.$" + +BattleFrontier_OutsideEast_Text_243529: @ 8243529 + .string "Go on, my baby sweetie!\n" + .string "Go rack up some wins for Daddy!\p" + .string "You’re just like your mother,\n" + .string "so you’ll be dominating!$" + +BattleFrontier_OutsideEast_Text_243598: @ 8243598 + .string "It wasn’t easy getting here,\n" + .string "but I’d heard about this knockout\l" + .string "pretty girl at the BATTLE ARENA.\p" + .string "Instead of her, do you know what\n" + .string "I found?\p" + .string "A whole teeming mob of sweaty,\n" + .string "stinky, and primitive martial artists!$" + +BattleFrontier_OutsideEast_Text_243668: @ 8243668 + .string "I sometimes see this really important-\n" + .string "looking old man going in there.\p" + .string "He has these really awesome POKéMON.\n" + .string "He seems really nice, though.$" + +BattleFrontier_OutsideEast_Text_2436F2: @ 82436F2 + .string "Do you know it?\n" + .string "The legend of the BATTLE PYRAMID?\p" + .string "When there comes a confident TRAINER\n" + .string "reaching for the golden pinnacle,\l" + .string "there shall appear a man among men.\p" + .string "Don’t know that legend?\n" + .string "Well, of course not!\l" + .string "I just made it up!\p" + .string "What’s it supposed to mean?\n" + .string "That, my friend, I can’t say!$" + +BattleFrontier_OutsideEast_Text_243809: @ 8243809 + .string "Man! Oh man!\n" + .string "I’ve never lost once before!\p" + .string "But I got wiped out with no saving\n" + .string "grace at all!\p" + .string "And then I’m told I don’t have any\n" + .string "talent?! Man!$" + +BattleFrontier_OutsideEast_Text_243895: @ 8243895 + .string "This guy ran into a horribly tough\n" + .string "TRAINER while he was on the BATTLE\l" + .string "TOWER challenge.\p" + .string "Now look at him…\p" + .string "You need to be cautious if you ever\n" + .string "decide to go to the BATTLE TOWER.$" + +BattleFrontier_OutsideEast_Text_243943: @ 8243943 + .string "Yes!\n" + .string "I’ve finally got enough Battle Points!\p" + .string "I guess I’ll trade for another giant\n" + .string "plush DOLL!$" + +BattleFrontier_OutsideEast_Text_2439A0: @ 82439A0 + .string "Oh, yeah, okay!\n" + .string "So this is the RANKING HALL!\p" + .string "I’d like to go down in history as\n" + .string "a super champ and have my name\l" + .string "recorded here for posterity.$" + +BattleFrontier_OutsideEast_Text_243A2B: @ 8243A2B + .string "With you by my side, I can do anything.$" + +BattleFrontier_OutsideEast_Text_243A53: @ 8243A53 + .string "Ooh, darling, you are so wonderful!\p" + .string "Ooh, I just can’t wait anymore!\p" + .string "Let’s go to a MULTI BATTLE ROOM\n" + .string "right this instant!\p" + .string "If we get together in the BATTLE SALON,\n" + .string "the power of our love will overcome\l" + .string "everyone we meet.\p" + .string "Why, before us, darling, everything\n" + .string "will topple like dominoes!$" + +BattleFrontier_OutsideEast_Text_243B68: @ 8243B68 + .string "The BATTLE FRONTIER isn’t exclusively\n" + .string "for tough TRAINERS.\p" + .string "Many people with special abilities\n" + .string "have been invited, it seems.\p" + .string "That man SCOTT…\p" + .string "He may have built this place to serve\n" + .string "a bigger objective…$" + +BattleFrontier_OutsideEast_Text_243C2C: @ 8243C2C + .string "Excuse me, young one.\n" + .string "Have you good eyesight?\p" + .string "There is an odd tree past here, and to\n" + .string "my tired eyes it seems to wiggle.$" + +BattleFrontier_OutsideEast_Text_243CA3: @ 8243CA3 + .string "Excuse me, young one.\n" + .string "Have you a good memory?\p" + .string "I have this feeling there once was\n" + .string "an odd tree past here.$" + +BattleFrontier_OutsideEast_Text_243D0B: @ 8243D0B + .string "I…\n" + .string "I saw it!\p" + .string "There was a sticky sort of a POKéMON\n" + .string "with a long tail up ahead!\p" + .string "It was hiding under a boulder, and\n" + .string "it kept staring at me!$" diff --git a/data/maps/BattleFrontier_OutsideWest/events.inc b/data/maps/BattleFrontier_OutsideWest/events.inc new file mode 100644 index 000000000..643e26e2e --- /dev/null +++ b/data/maps/BattleFrontier_OutsideWest/events.inc @@ -0,0 +1,49 @@ +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 + +BattleFrontier_OutsideWest_MapWarps: @ 853B590 + 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 + 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 + +BattleFrontier_OutsideWest_MapEvents:: @ 853B624 + map_events BattleFrontier_OutsideWest_EventObjects, BattleFrontier_OutsideWest_MapWarps, 0x0, BattleFrontier_OutsideWest_MapBGEvents + diff --git a/data/maps/BattleFrontier_OutsideWest/scripts.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc new file mode 100644 index 000000000..bd9d508dd --- /dev/null +++ b/data/maps/BattleFrontier_OutsideWest/scripts.inc @@ -0,0 +1,526 @@ +BattleFrontier_OutsideWest_MapScripts:: @ 823D3E1 + map_script 3, BattleFrontier_OutsideWest_MapScript1_23D3E7 + .byte 0 + +BattleFrontier_OutsideWest_MapScript1_23D3E7: @ 823D3E7 + setvar VAR_0x40BC, 0 + setflag FLAG_0x396 + end + +BattleFrontier_OutsideWest_EventScript_23D3F0:: @ 823D3F0 + lock + faceplayer + msgbox BattleFrontier_OutsideWest_Text_23D808, 4 + checkitem ITEM_SS_TICKET, 1 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_OutsideWest_EventScript_23D44E + message BattleFrontier_OutsideWest_Text_23D89D + waitmessage + goto BattleFrontier_OutsideWest_EventScript_23D416 + end + +BattleFrontier_OutsideWest_EventScript_23D416:: @ 823D416 + multichoicedefault 18, 6, 53, 2, 0 + switch VAR_RESULT + case 0, BattleFrontier_OutsideWest_EventScript_23D458 + case 1, BattleFrontier_OutsideWest_EventScript_23D483 + case 2, BattleFrontier_OutsideWest_EventScript_23D4D8 + case 127, BattleFrontier_OutsideWest_EventScript_23D4D8 + end + +BattleFrontier_OutsideWest_EventScript_23D44E:: @ 823D44E + msgbox BattleFrontier_OutsideWest_Text_23D842, 4 + release + end + +BattleFrontier_OutsideWest_EventScript_23D458:: @ 823D458 + msgbox BattleFrontier_OutsideWest_Text_23D8F2, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_OutsideWest_EventScript_23D4AE + msgbox BattleFrontier_OutsideWest_Text_23D94B, 4 + call BattleFrontier_OutsideWest_EventScript_23D4BA + warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 + waitstate + release + end + +BattleFrontier_OutsideWest_EventScript_23D483:: @ 823D483 + msgbox BattleFrontier_OutsideWest_Text_23D90E, 5 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_OutsideWest_EventScript_23D4AE + msgbox BattleFrontier_OutsideWest_Text_23D94B, 4 + call BattleFrontier_OutsideWest_EventScript_23D4BA + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 + waitstate + release + end + +BattleFrontier_OutsideWest_EventScript_23D4AE:: @ 823D4AE + message BattleFrontier_OutsideWest_Text_23D97A + waitmessage + goto BattleFrontier_OutsideWest_EventScript_23D416 + end + +BattleFrontier_OutsideWest_EventScript_23D4BA:: @ 823D4BA + closemessage + applymovement VAR_LAST_TALKED, BattleFrontier_OutsideWest_Movement_2725AA + waitmovement 0 + delay 30 + hideobjectat 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST + setvar VAR_0x8004, 2 + call BattleFrontier_OutsideWest_EventScript_272250 + return + +BattleFrontier_OutsideWest_EventScript_23D4D8:: @ 823D4D8 + msgbox BattleFrontier_OutsideWest_Text_23D929, 4 + release + end + +BattleFrontier_OutsideWest_EventScript_23D4E2:: @ 823D4E2 + msgbox BattleFrontier_OutsideWest_Text_23D6F7, 3 + end + +BattleFrontier_OutsideWest_EventScript_23D4EB:: @ 823D4EB + msgbox BattleFrontier_OutsideWest_Text_23D737, 3 + end + +BattleFrontier_OutsideWest_EventScript_23D4F4:: @ 823D4F4 + msgbox BattleFrontier_OutsideWest_Text_23D772, 3 + end + +BattleFrontier_OutsideWest_EventScript_23D4FD:: @ 823D4FD + msgbox BattleFrontier_OutsideWest_Text_23D7A6, 2 + end + +BattleFrontier_OutsideWest_EventScript_23D506:: @ 823D4FD + msgbox BattleFrontier_OutsideWest_Text_23D9DD, 2 + end + +BattleFrontier_OutsideWest_EventScript_23D50F:: @ 823D50F + msgbox BattleFrontier_OutsideWest_Text_23D99C, 2 + end + +BattleFrontier_OutsideWest_EventScript_23D518:: @ 823D518 + lock + faceplayer + message BattleFrontier_OutsideWest_Text_23DA60 + waitmessage + applymovement 18, BattleFrontier_OutsideWest_Movement_2725A0 + waitmovement 0 + waitbuttonpress + release + end + +BattleFrontier_OutsideWest_EventScript_23D52D:: @ 823D52D + msgbox BattleFrontier_OutsideWest_Text_23DABF, 2 + end + +BattleFrontier_OutsideWest_EventScript_23D536:: @ 823D536 + lock + goto BattleFrontier_OutsideWest_EventScript_23D544 + end + +BattleFrontier_OutsideWest_EventScript_23D53D:: @ 823D53D + lock + goto BattleFrontier_OutsideWest_EventScript_23D544 + end + +BattleFrontier_OutsideWest_EventScript_23D544:: @ 823D544 + applymovement 9, BattleFrontier_OutsideWest_Movement_2725A8 + waitmovement 0 + msgbox BattleFrontier_OutsideWest_Text_23DB7D, 4 + applymovement 10, BattleFrontier_OutsideWest_Movement_2725A4 + waitmovement 0 + msgbox BattleFrontier_OutsideWest_Text_23DBCE, 4 + closemessage + delay 25 + applymovement 9, BattleFrontier_OutsideWest_Movement_2725A6 + applymovement 10, BattleFrontier_OutsideWest_Movement_2725A6 + waitmovement 0 + release + end + +BattleFrontier_OutsideWest_EventScript_23D57F:: @ 823D57F + lock + faceplayer + delay 20 + compare VAR_FACING, 2 + call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA + compare VAR_FACING, 1 + call_if 1, BattleFrontier_OutsideWest_EventScript_23D5C5 + compare VAR_FACING, 3 + call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA + compare VAR_FACING, 4 + call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA + msgbox BattleFrontier_OutsideWest_Text_23DC36, 4 + release + end + +BattleFrontier_OutsideWest_EventScript_23D5BA:: @ 823D5BA + applymovement 14, BattleFrontier_OutsideWest_Movement_2725A6 + waitmovement 0 + return + +BattleFrontier_OutsideWest_EventScript_23D5C5:: @ 823D5C5 + return + +BattleFrontier_OutsideWest_EventScript_23D5C6:: @ 823D5C6 + lock + faceplayer + message BattleFrontier_OutsideWest_Text_23DCB0 + waitmessage + compare VAR_FACING, 2 + call_if 1, BattleFrontier_OutsideWest_EventScript_23D5FD + compare VAR_FACING, 1 + call_if 1, BattleFrontier_OutsideWest_EventScript_23D608 + compare VAR_FACING, 3 + call_if 1, BattleFrontier_OutsideWest_EventScript_23D613 + compare VAR_FACING, 4 + call_if 1, BattleFrontier_OutsideWest_EventScript_23D61E + waitbuttonpress + release + end + +BattleFrontier_OutsideWest_EventScript_23D5FD:: @ 823D5FD + applymovement 12, BattleFrontier_OutsideWest_Movement_23D629 + waitmovement 0 + return + +BattleFrontier_OutsideWest_EventScript_23D608:: @ 823D608 + applymovement 12, BattleFrontier_OutsideWest_Movement_23D62C + waitmovement 0 + return + +BattleFrontier_OutsideWest_EventScript_23D613:: @ 823D613 + applymovement 12, BattleFrontier_OutsideWest_Movement_23D62F + waitmovement 0 + return + +BattleFrontier_OutsideWest_EventScript_23D61E:: @ 823D61E + applymovement 12, BattleFrontier_OutsideWest_Movement_23D632 + waitmovement 0 + return + +BattleFrontier_OutsideWest_Movement_23D629: @ 823D629 + walk_in_place_fastest_down + walk_in_place_fastest_down + step_end + +BattleFrontier_OutsideWest_Movement_23D62C: @ 823D62C + walk_in_place_fastest_up + walk_in_place_fastest_up + step_end + +BattleFrontier_OutsideWest_Movement_23D62F: @ 823D62F + walk_in_place_fastest_right + walk_in_place_fastest_right + step_end + +BattleFrontier_OutsideWest_Movement_23D632: @ 823D632 + walk_in_place_fastest_left + walk_in_place_fastest_left + step_end + +BattleFrontier_OutsideWest_EventScript_23D635:: @ 823D635 + lock + faceplayer + msgbox BattleFrontier_OutsideWest_Text_23DD3B, 4 + random 2 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_OutsideWest_EventScript_23D653 + goto BattleFrontier_OutsideWest_EventScript_23D65D + end + +BattleFrontier_OutsideWest_EventScript_23D653:: @ 823D653 + msgbox BattleFrontier_OutsideWest_Text_23DD7A, 4 + release + end + +BattleFrontier_OutsideWest_EventScript_23D65D:: @ 823D65D + msgbox BattleFrontier_OutsideWest_Text_23DDAD, 4 + release + end + +BattleFrontier_OutsideWest_EventScript_23D667:: @ 823D667 + msgbox BattleFrontier_OutsideWest_Text_23DE15, 2 + end + +BattleFrontier_OutsideWest_EventScript_23D670:: @ 823D670 + msgbox BattleFrontier_OutsideWest_Text_23DF7D, 2 + end + +BattleFrontier_OutsideWest_EventScript_23D679:: @ 823D679 + msgbox BattleFrontier_OutsideWest_Text_23DEFD, 2 + end + +BattleFrontier_OutsideWest_EventScript_23D682:: @ 823D682 + msgbox BattleFrontier_OutsideWest_Text_23DEB4, 2 + end + +BattleFrontier_OutsideWest_EventScript_23D68B:: @ 823D68B + msgbox BattleFrontier_OutsideWest_Text_23DFBF, 2 + end + +BattleFrontier_OutsideWest_EventScript_23D694:: @ 823D694 + msgbox BattleFrontier_OutsideWest_Text_23E01E, 2 + end + +BattleFrontier_OutsideWest_EventScript_23D69D:: @ 823D69D + msgbox BattleFrontier_OutsideWest_Text_23E09F, 2 + end + +BattleFrontier_OutsideWest_EventScript_23D6A6:: @ 823D6A6 + msgbox BattleFrontier_OutsideWest_Text_23E102, 2 + end + +BattleFrontier_OutsideWest_EventScript_23D6AF:: @ 823D6AF + msgbox BattleFrontier_OutsideWest_Text_23E154, 2 + end + +BattleFrontier_OutsideWest_EventScript_23D6B8:: @ 823D6B8 + lock + msgbox BattleFrontier_OutsideWest_Text_23E273, 4 + release + end + +BattleFrontier_OutsideWest_EventScript_23D6C3:: @ 823D6C3 + lock + msgbox BattleFrontier_OutsideWest_Text_23E2E9, 4 + release + end + +BattleFrontier_OutsideWest_EventScript_23D6CE:: @ 823D6CE + msgbox BattleFrontier_OutsideWest_Text_23E37E, 2 + end + +BattleFrontier_OutsideWest_EventScript_23D6D7:: @ 823D6D7 + lock + faceplayer + msgbox BattleFrontier_OutsideWest_Text_23E410, 4 + closemessage + applymovement 23, BattleFrontier_OutsideWest_Movement_2725A2 + waitmovement 0 + release + end + +BattleFrontier_OutsideWest_EventScript_23D6EE:: @ 823D6EE + msgbox BattleFrontier_OutsideWest_Text_23E5A5, 2 + end + +BattleFrontier_OutsideWest_Text_23D6F7: @ 823D6F7 + .string "This is the BATTLE DOME!\n" + .string "Your path to the invincible superstar!$" + +BattleFrontier_OutsideWest_Text_23D737: @ 823D737 + .string "This is the BATTLE FACTORY!\n" + .string "Seek out the toughest POKéMON!$" + +BattleFrontier_OutsideWest_Text_23D772: @ 823D772 + .string "This is the BATTLE PIKE!\n" + .string "Choose one of three paths!$" + +BattleFrontier_OutsideWest_Text_23D7A6: @ 823D7A6 + .string "This is the BATTLE TOWER.\p" + .string "TRAINERS bring their best-raised\n" + .string "POKéMON for elimination-style matches.$" + +BattleFrontier_OutsideWest_Text_23D808: @ 823D808 + .string "Hello, are you here for the ferry?\n" + .string "May I see your TICKET?$" + +BattleFrontier_OutsideWest_Text_23D842: @ 823D842 + .string "{PLAYER} doesn’t have the TICKET…\p" + .string "I’m terribly sorry.\p" + .string "You must have a TICKET to board\n" + .string "the ferry.$" + +BattleFrontier_OutsideWest_Text_23D89D: @ 823D89D + .string "{PLAYER} flashed the TICKET.\p" + .string "Perfect! That’s all you need!\p" + .string "And where would you like to go?$" + +BattleFrontier_OutsideWest_Text_23D8F2: @ 823D8F2 + .string "SLATEPORT CITY it is, then!$" + +BattleFrontier_OutsideWest_Text_23D90E: @ 823D90E + .string "LILYCOVE CITY it is, then!$" + +BattleFrontier_OutsideWest_Text_23D929: @ 823D929 + .string "Please sail with us another time!$" + +BattleFrontier_OutsideWest_Text_23D94B: @ 823D94B + .string "Please board the ferry and wait for\n" + .string "departure.$" + +BattleFrontier_OutsideWest_Text_23D97A: @ 823D97A + .string "Then, where would you like to go?$" + +BattleFrontier_OutsideWest_Text_23D99C: @ 823D99C + .string "I’m the best out of all my friends.\n" + .string "But here…\l" + .string "I’ve been useless!$" + +BattleFrontier_OutsideWest_Text_23D9DD: @ 823D9DD + .string "I want to go to the BATTLE TOWER,\n" + .string "but I can’t find it even though I have\l" + .string "a map of the BATTLE FRONTIER.\p" + .string "This place is just too big!$" + +BattleFrontier_OutsideWest_Text_23DA60: @ 823DA60 + .string "I wanted to take a challenge as soon\n" + .string "as I arrived here.\p" + .string "But on the way, I got seasick…\n" + .string "Urrrrp…$" + +BattleFrontier_OutsideWest_Text_23DABF: @ 823DABF + .string "It’s not as if just anyone can come\n" + .string "here, you know?\p" + .string "Only those TRAINERS who’ve been\n" + .string "recognized as tough are brought here.\p" + .string "That’s why many TRAINERS don’t even\n" + .string "know about the BATTLE FRONTIER.$" + +BattleFrontier_OutsideWest_Text_23DB7D: @ 823DB7D + .string "Hey, bro…\p" + .string "Are you sure we can make challenges\n" + .string "even if we don’t have any POKéMON?$" + +BattleFrontier_OutsideWest_Text_23DBCE: @ 823DBCE + .string "Uh…\n" + .string "I’m sure it’ll be okay.\p" + .string "I think…\p" + .string "But remember that big scary guy?\n" + .string "He said, “I’ll lend you POKéMON!â€$" + +BattleFrontier_OutsideWest_Text_23DC36: @ 823DC36 + .string "That’s the BATTLE FACTORY.\n" + .string "You can rent strong POKéMON there.\p" + .string "But it makes me wonder.\n" + .string "Who’s raising those rental POKéMON?$" + +BattleFrontier_OutsideWest_Text_23DCB0: @ 823DCB0 + .string "I’m scared of going into the BATTLE\n" + .string "PIKE because of SEVIPER…\p" + .string "B-but I came all the way here, so I will\n" + .string "try to conquer everything!\l" + .string "…Shudder…$" + +BattleFrontier_OutsideWest_Text_23DD3B: @ 823DD3B + .string "Let’s play rock, paper, scissors!\n" + .string "One, two, three!\p" + .string "… … … … … …$" + +BattleFrontier_OutsideWest_Text_23DD7A: @ 823DD7A + .string "Yay! I won!\n" + .string "I will take the BATTLE PIKE challenge!$" + +BattleFrontier_OutsideWest_Text_23DDAD: @ 823DDAD + .string "Oh, no…\n" + .string "I lost.\p" + .string "I guess I’m not very lucky today.\n" + .string "I’ll put off my BATTLE PIKE challenge\l" + .string "until tomorrow.$" + +BattleFrontier_OutsideWest_Text_23DE15: @ 823DE15 + .string "I believe I’m the only person here who,\n" + .string "for some unknown reason, would choose\l" + .string "fishing over battling.\p" + .string "Huh? You can’t catch anything here?\n" + .string "That’s disappointing…$" + +BattleFrontier_OutsideWest_Text_23DEB4: @ 823DEB4 + .string "Today, I’m going to keep battling, no\n" + .string "matter what, until I get a Symbol.$" + +BattleFrontier_OutsideWest_Text_23DEFD: @ 823DEFD + .string "Oh? You’re off to challenge\n" + .string "the BATTLE DOME?\p" + .string "I’ll wish you the best of luck.\n" + .string "Let us both win our way up and meet\l" + .string "in challenges.$" + +BattleFrontier_OutsideWest_Text_23DF7D: @ 823DF7D + .string "Grandpa, over here!\n" + .string "The BATTLE DOME is here!\l" + .string "Go get ’em, Grandpa!$" + +BattleFrontier_OutsideWest_Text_23DFBF: @ 823DFBF + .string "Ah, so this here is the BATTLE DOME?\n" + .string "I won’t let GENTLEMEN beat me!\p" + .string "But where is the entrance?$" + +BattleFrontier_OutsideWest_Text_23E01E: @ 823E01E + .string "There used to be nothing here not all\n" + .string "that long ago.\p" + .string "But, now look at this place! Amazing!\n" + .string "I’ll bring my mother out to see this.$" + +BattleFrontier_OutsideWest_Text_23E09F: @ 823E09F + .string "I’ve finally arrived at the BATTLE\n" + .string "FRONTIER!\p" + .string "I’m sure to grab attention with\n" + .string "my looks and ability!$" + +BattleFrontier_OutsideWest_Text_23E102: @ 823E102 + .string "Munch, munch…\p" + .string "It looks like this square’s filled with\n" + .string "tough people.\p" + .string "Munch, munch…$" + +BattleFrontier_OutsideWest_Text_23E154: @ 823E154 + .string "Crunch, munch…\p" + .string "A while back, I met this older girl\n" + .string "at the BATTLE PIKE.\p" + .string "She had these eyes that were scary\n" + .string "in a real ornery way.\p" + .string "Crunch, munch…\p" + .string "She got all furious: “Will you quit\n" + .string "eating!†Then she whaled on me.\p" + .string "It was a hair-raising kind of\n" + .string "scary experience, sure enough.\p" + .string "Crunch, munch…$" + +BattleFrontier_OutsideWest_Text_23E273: @ 823E273 + .string "Huh? Will you listen to yourself?\n" + .string "That’s nothing!\p" + .string "Why, the last time I cheered for him,\n" + .string "our eyes met and sparks flew!$" + +BattleFrontier_OutsideWest_Text_23E2E9: @ 823E2E9 + .string "Whaaaaaat?!\n" + .string "Pfft!\p" + .string "That only happened because\n" + .string "I happened to be sitting next to you!\p" + .string "The DOME ACE only looked our way\n" + .string "because my cheering was so loud!$" + +BattleFrontier_OutsideWest_Text_23E37E: @ 823E37E + .string "Oh, shush!\n" + .string "Keep that racket down!\p" + .string "You fair-weather fans should stick\n" + .string "to cheering for some GYM LEADER!\p" + .string "The DOME ACE is mine!\n" + .string "The only idol for me!$" + +BattleFrontier_OutsideWest_Text_23E410: @ 823E410 + .string "Those people squabbling over there…\p" + .string "It’s hard to believe, but they once\n" + .string "were TRAINERS, and good ones, too.\p" + .string "They used to be incredibly tough,\n" + .string "and they were famous, too.\p" + .string "But they were obliterated by this\n" + .string "certain TRAINER at a tournament.\p" + .string "They were so thoroughly whipped,\n" + .string "they became smitten by the TRAINER.\p" + .string "Now they’re just fans of the TRAINER.\n" + .string "They go cheer for their idol at the\l" + .string "BATTLE DOME every day now.$" + +BattleFrontier_OutsideWest_Text_23E5A5: @ 823E5A5 + .string "I heard a rumor that someone saw\n" + .string "a POKéMON with an unusually long tail\l" + .string "somewhere in the BATTLE FRONTIER.\p" + .string "It must be adorable. I’m sure of it…\p" + .string "Oh, challenges can wait. I feel driven\n" + .string "to find the delightful creature!$" + diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/events.inc b/data/maps/BattleFrontier_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..ba07ed15c --- /dev/null +++ b/data/maps/BattleFrontier_PokemonCenter_1F/events.inc @@ -0,0 +1,15 @@ +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 + +BattleFrontier_PokemonCenter_1F_MapWarps: @ 853D5D4 + 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/BattleFrontier_PokemonCenter_1F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..23818d64c --- /dev/null +++ b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc @@ -0,0 +1,59 @@ +BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9 + map_script 3, BattleFrontier_PokemonCenter_1F_MapScript1_267904 + map_script 5, BattleFrontier_PokemonCenter_1F_MapScript1_277C30 + .byte 0 + +BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904 + setrespawn 22 + end + +BattleFrontier_PokemonCenter_1F_EventScript_267908:: @ 8267908 + setvar VAR_0x800B, 1 + call BattleFrontier_PokemonCenter_1F_EventScript_27191E + waitmessage + waitbuttonpress + release + end + +BattleFrontier_PokemonCenter_1F_EventScript_267916:: @ 8267916 + msgbox BattleFrontier_PokemonCenter_1F_Text_267944, 2 + end + +BattleFrontier_PokemonCenter_1F_EventScript_26791F:: @ 826791F + msgbox BattleFrontier_PokemonCenter_1F_Text_2679EB, 2 + end + +BattleFrontier_PokemonCenter_1F_EventScript_267928:: @ 8267928 + msgbox BattleFrontier_PokemonCenter_1F_Text_267A4B, 2 + end + +BattleFrontier_PokemonCenter_1F_EventScript_267931:: @ 8267931 + lock + faceplayer + waitse + playmoncry SPECIES_SKITTY, 0 + msgbox BattleFrontier_PokemonCenter_1F_Text_267A90, 4 + waitmoncry + release + end + +BattleFrontier_PokemonCenter_1F_Text_267944: @ 8267944 + .string "There was someone here using a \n" + .string "POKéMON I’ve never seen before.\p" + .string "I never learned about it at\n" + .string "TRAINER’S SCHOOL at least.\p" + .string "I wonder where you can catch POKéMON\n" + .string "like that.$" + +BattleFrontier_PokemonCenter_1F_Text_2679EB: @ 82679EB + .string "Okay! Next stop, the BATTLE ARENA!\n" + .string "I’d better get the right POKéMON from\l" + .string "the PC Storage System.$" + +BattleFrontier_PokemonCenter_1F_Text_267A4B: @ 8267A4B + .string "Giggle… I’m going to go through every\n" + .string "challenge with just this baby!$" + +BattleFrontier_PokemonCenter_1F_Text_267A90: @ 8267A90 + .string "SKITTY: Mya myaaah!$" + diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/events.inc b/data/maps/BattleFrontier_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..bb5bb6119 --- /dev/null +++ b/data/maps/BattleFrontier_PokemonCenter_2F/events.inc @@ -0,0 +1,14 @@ +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 + +BattleFrontier_PokemonCenter_2F_MapWarps: @ 853D660 + 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/BattleFrontier_PokemonCenter_2F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..7d3c3a2f1 --- /dev/null +++ b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc @@ -0,0 +1,19 @@ +BattleFrontier_PokemonCenter_2F_MapScripts:: @ 8267AA4 + map_script 2, BattleFrontier_PokemonCenter_2F_MapScript2_276C3B + map_script 4, BattleFrontier_PokemonCenter_2F_MapScript2_276B6C + map_script 1, BattleFrontier_PokemonCenter_2F_MapScript1_276BBE + map_script 3, BattleFrontier_PokemonCenter_2F_MapScript1_276ACF + .byte 0 + +BattleFrontier_PokemonCenter_2F_EventScript_267AB9:: @ 8267AB9 + call OldaleTown_PokemonCenter_2F_EventScript_276EB7 + end + +BattleFrontier_PokemonCenter_2F_EventScript_267ABF:: @ 8267ABF + call OldaleTown_PokemonCenter_2F_EventScript_2770B2 + end + +BattleFrontier_PokemonCenter_2F_EventScript_267AC5:: @ 8267AC5 + call OldaleTown_PokemonCenter_2F_EventScript_2771DB + end + diff --git a/data/maps/BattleFrontier_RankingHall/events.inc b/data/maps/BattleFrontier_RankingHall/events.inc new file mode 100644 index 000000000..239c372c6 --- /dev/null +++ b/data/maps/BattleFrontier_RankingHall/events.inc @@ -0,0 +1,26 @@ +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 + +BattleFrontier_RankingHall_MapWarps: @ 853CF00 + 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 + 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 + +BattleFrontier_RankingHall_MapEvents:: @ 853CFA0 + map_events BattleFrontier_RankingHall_EventObjects, BattleFrontier_RankingHall_MapWarps, 0x0, BattleFrontier_RankingHall_MapBGEvents + diff --git a/data/maps/BattleFrontier_RankingHall/scripts.inc b/data/maps/BattleFrontier_RankingHall/scripts.inc new file mode 100644 index 000000000..e469024e9 --- /dev/null +++ b/data/maps/BattleFrontier_RankingHall/scripts.inc @@ -0,0 +1,135 @@ +BattleFrontier_RankingHall_MapScripts:: @ 825E4A9 + .byte 0 + +BattleFrontier_RankingHall_EventScript_25E4AA:: @ 825E4AA + lockall + setvar VAR_0x8005, 0 + goto BattleFrontier_RankingHall_EventScript_25E522 + end + +BattleFrontier_RankingHall_EventScript_25E4B6:: @ 825E4B6 + lockall + setvar VAR_0x8005, 1 + goto BattleFrontier_RankingHall_EventScript_25E522 + end + +BattleFrontier_RankingHall_EventScript_25E4C2:: @ 825E4C2 + lockall + setvar VAR_0x8005, 2 + goto BattleFrontier_RankingHall_EventScript_25E522 + end + +BattleFrontier_RankingHall_EventScript_25E4CE:: @ 825E4CE + lockall + setvar VAR_0x8005, 9 + goto BattleFrontier_RankingHall_EventScript_25E522 + end + +BattleFrontier_RankingHall_EventScript_25E4DA:: @ 825E4DA + lockall + setvar VAR_0x8005, 5 + goto BattleFrontier_RankingHall_EventScript_25E522 + end + +BattleFrontier_RankingHall_EventScript_25E4E6:: @ 825E4E6 + lockall + setvar VAR_0x8005, 4 + goto BattleFrontier_RankingHall_EventScript_25E522 + end + +BattleFrontier_RankingHall_EventScript_25E4F2:: @ 825E4F2 + lockall + setvar VAR_0x8005, 6 + goto BattleFrontier_RankingHall_EventScript_25E522 + end + +BattleFrontier_RankingHall_EventScript_25E4FE:: @ 825E4FE + lockall + setvar VAR_0x8005, 3 + goto BattleFrontier_RankingHall_EventScript_25E522 + end + +BattleFrontier_RankingHall_EventScript_25E50A:: @ 825E50A + lockall + setvar VAR_0x8005, 7 + goto BattleFrontier_RankingHall_EventScript_25E522 + end + +BattleFrontier_RankingHall_EventScript_25E516:: @ 825E516 + lockall + setvar VAR_0x8005, 8 + goto BattleFrontier_RankingHall_EventScript_25E522 + end + +BattleFrontier_RankingHall_EventScript_25E522:: @ 825E522 + special sub_81A4AA0 + waitbuttonpress + special sub_81A4AE8 + waitbuttonpress + special RemoveRecordsWindow + releaseall + end + +BattleFrontier_RankingHall_EventScript_25E52F:: @ 825E52F + msgbox BattleFrontier_RankingHall_Text_25E57C, 2 + end + +BattleFrontier_RankingHall_EventScript_25E538:: @ 825E538 + msgbox BattleFrontier_RankingHall_Text_25E5F9, 3 + end + +BattleFrontier_RankingHall_EventScript_25E541:: @ 825E541 + msgbox BattleFrontier_RankingHall_Text_25E62E, 3 + end + +BattleFrontier_RankingHall_EventScript_25E54A:: @ 825E54A + lock + faceplayer + msgbox BattleFrontier_RankingHall_Text_25E666, 5 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_RankingHall_EventScript_25E569 + msgbox BattleFrontier_RankingHall_Text_25E6B6, 4 + release + end + +BattleFrontier_RankingHall_EventScript_25E569:: @ 825E569 + msgbox BattleFrontier_RankingHall_Text_25E685, 4 + release + end + +BattleFrontier_RankingHall_EventScript_25E573:: @ 825E573 + msgbox BattleFrontier_RankingHall_Text_25E715, 2 + end + +BattleFrontier_RankingHall_Text_25E57C: @ 825E57C + .string "This is the RANKING HALL.\p" + .string "This is where we recognize the immortal\n" + .string "TRAINERS who left great records in\l" + .string "BATTLE FRONTIER events.$" + +BattleFrontier_RankingHall_Text_25E5F9: @ 825E5F9 + .string "BATTLE DOME, BATTLE PIKE,\n" + .string "and BATTLE FACTORY Records$" + +BattleFrontier_RankingHall_Text_25E62E: @ 825E62E + .string "BATTLE PALACE, BATTLE ARENA,\n" + .string "and BATTLE PYRAMID Records$" + +BattleFrontier_RankingHall_Text_25E666: @ 825E666 + .string "Hi, is your name on this list?$" + +BattleFrontier_RankingHall_Text_25E685: @ 825E685 + .string "Wow, that’s super!\n" + .string "I’ll have to try harder, too!$" + +BattleFrontier_RankingHall_Text_25E6B6: @ 825E6B6 + .string "Oh, is that right?\p" + .string "If you saw your friend’s name up here,\n" + .string "I bet it would make you work harder!$" + +BattleFrontier_RankingHall_Text_25E715: @ 825E715 + .string "Hmm…\n" + .string "My name’s not up there…\p" + .string "Well, it’s only natural since I haven’t\n" + .string "taken any challenges yet.$" + diff --git a/data/maps/BattleFrontier_ReceptionGate/events.inc b/data/maps/BattleFrontier_ReceptionGate/events.inc new file mode 100644 index 000000000..34db359fc --- /dev/null +++ b/data/maps/BattleFrontier_ReceptionGate/events.inc @@ -0,0 +1,14 @@ +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 + +BattleFrontier_ReceptionGate_MapWarps: @ 853D498 + 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/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc new file mode 100644 index 000000000..ec38c3e9d --- /dev/null +++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc @@ -0,0 +1,505 @@ +BattleFrontier_ReceptionGate_MapScripts:: @ 82661DA + map_script 2, BattleFrontier_ReceptionGate_MapScript2_2661E9 + map_script 3, BattleFrontier_ReceptionGate_MapScript1_2661E5 + .byte 0 + +BattleFrontier_ReceptionGate_MapScript1_2661E5: @ 82661E5 + setflag FLAG_LANDMARK_BATTLE_FRONTIER + end + +BattleFrontier_ReceptionGate_MapScript2_2661E9: @ 82661E9 + map_script_2 VAR_0x40D0, 0, BattleFrontier_ReceptionGate_EventScript_2661F3 + .2byte 0 + +BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3 + lockall + setvar VAR_0x40D0, 1 + playse SE_PIN + applymovement 1, BattleFrontier_ReceptionGate_Movement_272598 + waitmovement 0 + applymovement 1, BattleFrontier_ReceptionGate_Movement_27259A + waitmovement 0 + msgbox BattleFrontier_ReceptionGate_Text_266580, 4 + closemessage + applymovement 255, BattleFrontier_ReceptionGate_Movement_2662D2 + waitmovement 0 + goto BattleFrontier_ReceptionGate_EventScript_266229 + end + +BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229 + msgbox BattleFrontier_ReceptionGate_Text_2665B2, 4 + msgbox BattleFrontier_ReceptionGate_Text_2665F7, 4 + playfanfare MUS_FANFA4 + message BattleFrontier_ReceptionGate_Text_266676 + waitfanfare + waitmessage + msgbox BattleFrontier_ReceptionGate_Text_266695, 4 + setflag FLAG_SYS_FRONTIER_PASS + msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4 + msgbox BattleFrontier_ReceptionGate_Text_266703, 4 + closemessage + applymovement 1, BattleFrontier_ReceptionGate_Movement_2725A6 + applymovement 2, BattleFrontier_ReceptionGate_Movement_2725A6 + applymovement 255, BattleFrontier_ReceptionGate_Movement_2725A6 + waitmovement 0 + playse SE_PIN + applymovement 1, BattleFrontier_ReceptionGate_Movement_272598 + applymovement 2, BattleFrontier_ReceptionGate_Movement_272598 + applymovement 255, BattleFrontier_ReceptionGate_Movement_272598 + waitmovement 0 + msgbox BattleFrontier_ReceptionGate_Text_266733, 4 + closemessage + applymovement 1, BattleFrontier_ReceptionGate_Movement_2662F0 + applymovement 2, BattleFrontier_ReceptionGate_Movement_2662F6 + applymovement 255, BattleFrontier_ReceptionGate_Movement_2662D7 + applymovement 4, BattleFrontier_ReceptionGate_Movement_2662E0 + waitmovement 0 + msgbox BattleFrontier_ReceptionGate_Text_266764, 4 + closemessage + applymovement 4, BattleFrontier_ReceptionGate_Movement_2662E8 + waitmovement 0 + removeobject 4 + releaseall + end + +BattleFrontier_ReceptionGate_Movement_2662D2: @ 82662D2 + walk_up + walk_up + walk_left + walk_left + step_end + +BattleFrontier_ReceptionGate_Movement_2662D7: @ 82662D7 + delay_16 + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_right + step_end + +BattleFrontier_ReceptionGate_Movement_2662DD: @ 82662DD + walk_down + walk_down + step_end + +BattleFrontier_ReceptionGate_Movement_2662E0: @ 82662E0 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_left + step_end + +BattleFrontier_ReceptionGate_Movement_2662E8: @ 82662E8 + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + step_end + +BattleFrontier_ReceptionGate_Movement_2662F0: @ 82662F0 + delay_16 + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_right + step_end + +BattleFrontier_ReceptionGate_Movement_2662F6: @ 82662F6 + delay_16 + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_left + step_end + +BattleFrontier_ReceptionGate_EventScript_2662FC:: @ 82662FC + lock + faceplayer + msgbox BattleFrontier_ReceptionGate_Text_2665B2, 4 + msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4 + release + end + +BattleFrontier_ReceptionGate_EventScript_266310:: @ 8266310 + lock + faceplayer + msgbox BattleFrontier_ReceptionGate_Text_266857, 4 + goto BattleFrontier_ReceptionGate_EventScript_266320 + end + +BattleFrontier_ReceptionGate_EventScript_266320:: @ 8266320 + message BattleFrontier_ReceptionGate_Text_26689D + waitmessage + setvar VAR_0x8004, 8 + special sub_813A128 + waitstate + switch VAR_RESULT + case 0, BattleFrontier_ReceptionGate_EventScript_2663AE + case 1, BattleFrontier_ReceptionGate_EventScript_2663BC + case 2, BattleFrontier_ReceptionGate_EventScript_2663CA + case 3, BattleFrontier_ReceptionGate_EventScript_2663D8 + case 4, BattleFrontier_ReceptionGate_EventScript_2663E6 + case 5, BattleFrontier_ReceptionGate_EventScript_2663F4 + case 6, BattleFrontier_ReceptionGate_EventScript_266402 + case 7, BattleFrontier_ReceptionGate_EventScript_266410 + case 8, BattleFrontier_ReceptionGate_EventScript_26641E + case 9, BattleFrontier_ReceptionGate_EventScript_26642C + case 127, BattleFrontier_ReceptionGate_EventScript_26642C + end + +BattleFrontier_ReceptionGate_EventScript_2663AE:: @ 82663AE + msgbox BattleFrontier_ReceptionGate_Text_2668C2, 4 + goto BattleFrontier_ReceptionGate_EventScript_266320 + end + +BattleFrontier_ReceptionGate_EventScript_2663BC:: @ 82663BC + msgbox BattleFrontier_ReceptionGate_Text_26696F, 4 + goto BattleFrontier_ReceptionGate_EventScript_266320 + end + +BattleFrontier_ReceptionGate_EventScript_2663CA:: @ 82663CA + msgbox BattleFrontier_ReceptionGate_Text_266A34, 4 + goto BattleFrontier_ReceptionGate_EventScript_266320 + end + +BattleFrontier_ReceptionGate_EventScript_2663D8:: @ 82663D8 + msgbox BattleFrontier_ReceptionGate_Text_266AC2, 4 + goto BattleFrontier_ReceptionGate_EventScript_266320 + end + +BattleFrontier_ReceptionGate_EventScript_2663E6:: @ 82663E6 + msgbox BattleFrontier_ReceptionGate_Text_266B5D, 4 + goto BattleFrontier_ReceptionGate_EventScript_266320 + end + +BattleFrontier_ReceptionGate_EventScript_2663F4:: @ 82663F4 + msgbox BattleFrontier_ReceptionGate_Text_266C24, 4 + goto BattleFrontier_ReceptionGate_EventScript_266320 + end + +BattleFrontier_ReceptionGate_EventScript_266402:: @ 8266402 + msgbox BattleFrontier_ReceptionGate_Text_266CBB, 4 + goto BattleFrontier_ReceptionGate_EventScript_266320 + end + +BattleFrontier_ReceptionGate_EventScript_266410:: @ 8266410 + msgbox BattleFrontier_ReceptionGate_Text_266D1C, 4 + goto BattleFrontier_ReceptionGate_EventScript_266320 + end + +BattleFrontier_ReceptionGate_EventScript_26641E:: @ 826641E + msgbox BattleFrontier_ReceptionGate_Text_266DCB, 4 + goto BattleFrontier_ReceptionGate_EventScript_266320 + end + +BattleFrontier_ReceptionGate_EventScript_26642C:: @ 826642C + msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4 + release + end + +BattleFrontier_ReceptionGate_EventScript_266436:: @ 8266436 + lock + faceplayer + msgbox BattleFrontier_ReceptionGate_Text_266E66, 4 + goto BattleFrontier_ReceptionGate_EventScript_266446 + end + +BattleFrontier_ReceptionGate_EventScript_266446:: @ 8266446 + message BattleFrontier_ReceptionGate_Text_266EE0 + waitmessage + multichoice 15, 0, 95, 0 + switch VAR_RESULT + case 0, BattleFrontier_ReceptionGate_EventScript_2664A4 + case 1, BattleFrontier_ReceptionGate_EventScript_2664B2 + case 2, BattleFrontier_ReceptionGate_EventScript_2664C0 + case 3, BattleFrontier_ReceptionGate_EventScript_2664CE + case 4, BattleFrontier_ReceptionGate_EventScript_2664DC + case 5, BattleFrontier_ReceptionGate_EventScript_2664EA + case 127, BattleFrontier_ReceptionGate_EventScript_2664EA + end + +BattleFrontier_ReceptionGate_EventScript_2664A4:: @ 82664A4 + msgbox BattleFrontier_ReceptionGate_Text_266F04, 4 + goto BattleFrontier_ReceptionGate_EventScript_266446 + end + +BattleFrontier_ReceptionGate_EventScript_2664B2:: @ 82664B2 + msgbox BattleFrontier_ReceptionGate_Text_266F69, 4 + goto BattleFrontier_ReceptionGate_EventScript_266446 + end + +BattleFrontier_ReceptionGate_EventScript_2664C0:: @ 82664C0 + msgbox BattleFrontier_ReceptionGate_Text_267080, 4 + goto BattleFrontier_ReceptionGate_EventScript_266446 + end + +BattleFrontier_ReceptionGate_EventScript_2664CE:: @ 82664CE + msgbox BattleFrontier_ReceptionGate_Text_26716A, 4 + goto BattleFrontier_ReceptionGate_EventScript_266446 + end + +BattleFrontier_ReceptionGate_EventScript_2664DC:: @ 82664DC + msgbox BattleFrontier_ReceptionGate_Text_267298, 4 + goto BattleFrontier_ReceptionGate_EventScript_266446 + end + +BattleFrontier_ReceptionGate_EventScript_2664EA:: @ 82664EA + msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4 + release + end + +BattleFrontier_ReceptionGate_EventScript_2664F4:: @ 82664F4 + lock + faceplayer + msgbox BattleFrontier_ReceptionGate_Text_267357, 4 + goto BattleFrontier_ReceptionGate_EventScript_266504 + end + +BattleFrontier_ReceptionGate_EventScript_266504:: @ 8266504 + message BattleFrontier_ReceptionGate_Text_26737C + waitmessage + multichoice 16, 4, 11, 0 + switch VAR_RESULT + case 0, BattleFrontier_ReceptionGate_EventScript_26654C + case 1, BattleFrontier_ReceptionGate_EventScript_26655A + case 2, BattleFrontier_ReceptionGate_EventScript_266568 + case 3, BattleFrontier_ReceptionGate_EventScript_266576 + case 127, BattleFrontier_ReceptionGate_EventScript_266576 + end + +BattleFrontier_ReceptionGate_EventScript_26654C:: @ 826654C + msgbox BattleFrontier_ReceptionGate_Text_2673A1, 4 + goto BattleFrontier_ReceptionGate_EventScript_266504 + end + +BattleFrontier_ReceptionGate_EventScript_26655A:: @ 826655A + msgbox BattleFrontier_ReceptionGate_Text_2674F3, 4 + goto BattleFrontier_ReceptionGate_EventScript_266504 + end + +BattleFrontier_ReceptionGate_EventScript_266568:: @ 8266568 + msgbox BattleFrontier_ReceptionGate_Text_26761C, 4 + goto BattleFrontier_ReceptionGate_EventScript_266504 + end + +BattleFrontier_ReceptionGate_EventScript_266576:: @ 8266576 + msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4 + release + end + +BattleFrontier_ReceptionGate_Text_266580: @ 8266580 + .string "Is it your first time here?\n" + .string "Please step this way!$" + +BattleFrontier_ReceptionGate_Text_2665B2: @ 82665B2 + .string "The front lines of POKéMON battling!\n" + .string "Welcome to the BATTLE FRONTIER!$" + +BattleFrontier_ReceptionGate_Text_2665F7: @ 82665F7 + .string "For a first-time visitor, we issue\n" + .string "the FRONTIER PASS.\p" + .string "It’s for use at all the facilities\n" + .string "in the BATTLE FRONTIER.\p" + .string "Here you are!$" + +BattleFrontier_ReceptionGate_Text_266676: @ 8266676 + .string "{PLAYER} obtained\n" + .string "the FRONTIER PASS.$" + +BattleFrontier_ReceptionGate_Text_266695: @ 8266695 + .string "{PLAYER} placed the TRAINER CARD\n" + .string "in the FRONTIER PASS.$" + +BattleFrontier_ReceptionGate_Text_2666C6: @ 82666C6 + .string "We hope you enjoy all that the BATTLE\n" + .string "FRONTIER has to offer!$" + +BattleFrontier_ReceptionGate_Text_266703: @ 8266703 + .string "???: Well, if it isn’t {PLAYER}{KUN}!\n" + .string "You came out here!$" + +BattleFrontier_ReceptionGate_Text_266733: @ 8266733 + .string "GUIDE: Oh! MR. SCOTT, sir!\n" + .string "Good day to you, sir!$" + +BattleFrontier_ReceptionGate_Text_266764: @ 8266764 + .string "SCOTT: It’s great to see you here,\n" + .string "it really is!\p" + .string "I hope you’ll take your time and\n" + .string "explore everywhere.\p" + .string "Naturally, I hope you’ll also experience\n" + .string "the pure essence of battling.\p" + .string "I also have my quarters here, so feel\n" + .string "free to visit if you have time.$" + +BattleFrontier_ReceptionGate_Text_266857: @ 8266857 + .string "I’m your guide to the various facilities\n" + .string "here in the BATTLE FRONTIER.$" + +BattleFrontier_ReceptionGate_Text_26689D: @ 826689D + .string "Which would you like to learn about?$" + +BattleFrontier_ReceptionGate_Text_2668C2: @ 82668C2 + .string "It is the gigantic tower considered\n" + .string "to be the BATTLE FRONTIER’s symbol.\p" + .string "There are four kinds of BATTLE ROOMS\n" + .string "in the tower for SINGLE, DOUBLE, MULTI,\l" + .string "and LINK MULTI BATTLES.$" + +BattleFrontier_ReceptionGate_Text_26696F: @ 826696F + .string "The BATTLE DOME is the large building\n" + .string "shaped like a huge egg.\p" + .string "Events named Battle Tourneys are held\n" + .string "in this facility.\p" + .string "The Battle Tourneys are offered in\n" + .string "two courses--for SINGLE and DOUBLE\l" + .string "BATTLES.$" + +BattleFrontier_ReceptionGate_Text_266A34: @ 8266A34 + .string "The BATTLE PALACE is the red building\n" + .string "on the right of the BATTLE FRONTIER.\p" + .string "There are two kinds of BATTLE HALLS\n" + .string "for SINGLE and DOUBLE BATTLES.$" + +BattleFrontier_ReceptionGate_Text_266AC2: @ 8266AC2 + .string "The BATTLE ARENA is the dojo-like\n" + .string "building at the center-right of\l" + .string "the BATTLE FRONTIER.\p" + .string "An event called the Set KO Tourney\n" + .string "takes place at the BATTLE ARENA.$" + +BattleFrontier_ReceptionGate_Text_266B5D: @ 8266B5D + .string "The BATTLE FACTORY is the large\n" + .string "building that is the closest to us.\p" + .string "An event called the Battle Swap\n" + .string "is conducted there.\p" + .string "The Battle Swap event is offered in\n" + .string "two courses for SINGLE and DOUBLE\l" + .string "BATTLES.$" + +BattleFrontier_ReceptionGate_Text_266C24: @ 8266C24 + .string "The BATTLE PIKE is the building shaped\n" + .string "like a POKéMON at the center-left of\l" + .string "the BATTLE FRONTIER.\p" + .string "An event called the Battle Choice\n" + .string "is conducted there.$" + +BattleFrontier_ReceptionGate_Text_266CBB: @ 8266CBB + .string "The BATTLE PYRAMID is the enormous\n" + .string "pyramid.\p" + .string "An event called the Battle Quest\n" + .string "is conducted there.$" + +BattleFrontier_ReceptionGate_Text_266D1C: @ 8266D1C + .string "The RANKING HALL is located near\n" + .string "the BATTLE TOWER.\p" + .string "There, you may see the most fantastic\n" + .string "records left by the TRAINERS that\l" + .string "took on the many challenges of\l" + .string "the BATTLE FRONTIER.$" + +BattleFrontier_ReceptionGate_Text_266DCB: @ 8266DCB + .string "The EXCHANGE SERVICE CORNER is near\n" + .string "the BATTLE TOWER.\p" + .string "The Battle Points you have earned in\n" + .string "the BATTLE FRONTIER may be exchanged\l" + .string "for fabulous prizes there.$" + +BattleFrontier_ReceptionGate_Text_266E66: @ 8266E66 + .string "I’m your guide to the basic rules that\n" + .string "are common to all the challenges\l" + .string "offered by the facilities in the BATTLE\l" + .string "FRONTIER.$" + +BattleFrontier_ReceptionGate_Text_266EE0: @ 8266EE0 + .string "What would you like to learn about?$" + +BattleFrontier_ReceptionGate_Text_266F04: @ 8266F04 + .string "All the challenges at the BATTLE\n" + .string "FRONTIER’s facilities come in\l" + .string "two courses--Level 50 and Open Level.$" + +BattleFrontier_ReceptionGate_Text_266F69: @ 8266F69 + .string "The Level 50 course is open to POKéMON\n" + .string "up to and including Level 50.\p" + .string "Please keep in mind, however, that\n" + .string "no TRAINER you face will have any\l" + .string "POKéMON below Level 50.\p" + .string "This course is the entry level for\n" + .string "battles at the BATTLE FRONTIER.\p" + .string "To begin, we hope you will challenge\n" + .string "this course.$" + +BattleFrontier_ReceptionGate_Text_267080: @ 8267080 + .string "The Open Level course places no limit\n" + .string "on the levels of POKéMON entering\l" + .string "challenges.\p" + .string "The levels of your opponents will\n" + .string "be adjusted to match the levels of\l" + .string "your POKéMON.\p" + .string "However, no TRAINER you face will\n" + .string "have any POKéMON below Level 60.$" + +BattleFrontier_ReceptionGate_Text_26716A: @ 826716A + .string "Virtually any kind of POKéMON may take\n" + .string "on the challenges at all facilities.\p" + .string "EGGS and certain kinds of POKéMON,\n" + .string "however, are not permitted.\p" + .string "The numbers of POKéMON required for\n" + .string "challenges will depend on the facility.\p" + .string "At all facilities, however, two or more\n" + .string "of the same kind of POKéMON are not\l" + .string "permitted.$" + +BattleFrontier_ReceptionGate_Text_267298: @ 8267298 + .string "When entering a challenge at a BATTLE\n" + .string "FRONTIER facility, POKéMON may not\l" + .string "be holding the same kind of item.\p" + .string "Please make sure that all POKéMON\n" + .string "entering a challenge are holding\l" + .string "different items.$" + +BattleFrontier_ReceptionGate_Text_267357: @ 8267357 + .string "I’m your guide to the FRONTIER PASS.$" + +BattleFrontier_ReceptionGate_Text_26737C: @ 826737C + .string "Which would you like to learn about?$" + +BattleFrontier_ReceptionGate_Text_2673A1: @ 82673A1 + .string "There are seven facilities at\n" + .string "the BATTLE FRONTIER.\p" + .string "TRAINERS who gain recognition for\n" + .string "their abilities may be rewarded with\l" + .string "symbols from each of the facilities.\p" + .string "To earn a symbol, TRAINERS may need\n" + .string "to defeat other TRAINERS in a row,\l" + .string "and may need to win events repeatedly.\p" + .string "It’s certainly not easy to win symbols.\n" + .string "I wish you the best of luck!$" + +BattleFrontier_ReceptionGate_Text_2674F3: @ 82674F3 + .string "It is possible to record one battle\n" + .string "on your FRONTIER PASS.\p" + .string "You may record a battle you had with\n" + .string "a friend or friends.\p" + .string "Or you may record a battle conducted\n" + .string "at the BATTLE FRONTIER excluding\l" + .string "matches at the BATTLE PIKE or\l" + .string "the BATTLE PYRAMID.\p" + .string "You may choose to record your match\n" + .string "at the end of a battle.$" + +BattleFrontier_ReceptionGate_Text_26761C: @ 826761C + .string "Battle Points are rewards given to\n" + .string "TRAINERS who battled outstandingly\l" + .string "at the BATTLE FRONTIER.\p" + .string "You may trade in your Battle Points\n" + .string "for prizes at the EXCHANGE SERVICE\l" + .string "CORNER.$" + diff --git a/data/maps/BattleFrontier_ScottsHouse/events.inc b/data/maps/BattleFrontier_ScottsHouse/events.inc new file mode 100644 index 000000000..6e3de083c --- /dev/null +++ b/data/maps/BattleFrontier_ScottsHouse/events.inc @@ -0,0 +1,10 @@ +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 + +BattleFrontier_ScottsHouse_MapWarps: @ 853D2C8 + 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/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc new file mode 100644 index 000000000..5be72b9b5 --- /dev/null +++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc @@ -0,0 +1,406 @@ +BattleFrontier_ScottsHouse_MapScripts:: @ 82636A7 + .byte 0 + +BattleFrontier_ScottsHouse_EventScript_2636A8:: @ 82636A8 + lock + faceplayer + checkflag FLAG_0x004 + goto_eq BattleFrontier_ScottsHouse_EventScript_2637DA + checkflag FLAG_0x003 + goto_eq BattleFrontier_ScottsHouse_EventScript_2638AA + checkflag FLAG_0x002 + goto_eq BattleFrontier_ScottsHouse_EventScript_263939 + goto BattleFrontier_ScottsHouse_EventScript_2636CB + end + +BattleFrontier_ScottsHouse_EventScript_2636CB:: @ 82636CB + checkflag FLAG_0x1D1 + goto_if 0, BattleFrontier_ScottsHouse_EventScript_263943 + checkflag FLAG_0x05C + goto_if 0, BattleFrontier_ScottsHouse_EventScript_263704 + checkflag FLAG_0x1D2 + goto_if 0, BattleFrontier_ScottsHouse_EventScript_26376A + goto BattleFrontier_ScottsHouse_EventScript_2636EC + end + +BattleFrontier_ScottsHouse_EventScript_2636EC:: @ 82636EC + checkflag FLAG_0x0ED + goto_if 0, BattleFrontier_ScottsHouse_EventScript_26381B + checkflag FLAG_0x0EE + goto_if 0, BattleFrontier_ScottsHouse_EventScript_2638B4 + goto BattleFrontier_ScottsHouse_EventScript_2637E4 + end + +BattleFrontier_ScottsHouse_EventScript_263704:: @ 8263704 + checkflag FLAG_SYS_TOWER_SILVER + goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC + checkflag FLAG_SYS_DOME_SILVER + goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC + checkflag FLAG_SYS_PALACE_SILVER + goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC + checkflag FLAG_SYS_ARENA_SILVER + goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC + checkflag FLAG_SYS_FACTORY_SILVER + goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC + checkflag FLAG_SYS_PIKE_SILVER + goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC + checkflag FLAG_SYS_PYRAMID_SILVER + goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC + msgbox BattleFrontier_ScottsHouse_Text_2640BC, 4 + giveitem_std ITEM_LANSAT_BERRY + compare VAR_RESULT, 0 + goto_eq BattleFrontier_ScottsHouse_EventScript_2637D0 + setflag FLAG_0x05C + setflag FLAG_0x004 + release + end + +BattleFrontier_ScottsHouse_EventScript_26376A:: @ 826376A + checkflag FLAG_SYS_TOWER_GOLD + goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC + checkflag FLAG_SYS_DOME_GOLD + goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC + checkflag FLAG_SYS_PALACE_GOLD + goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC + checkflag FLAG_SYS_ARENA_GOLD + goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC + checkflag FLAG_SYS_FACTORY_GOLD + goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC + checkflag FLAG_SYS_PIKE_GOLD + goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC + checkflag FLAG_SYS_PYRAMID_GOLD + goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC + msgbox BattleFrontier_ScottsHouse_Text_264216, 4 + giveitem_std ITEM_STARF_BERRY + compare VAR_RESULT, 0 + goto_eq BattleFrontier_ScottsHouse_EventScript_2637D0 + setflag FLAG_0x1D2 + setflag FLAG_0x004 + release + end + +BattleFrontier_ScottsHouse_EventScript_2637D0:: @ 82637D0 + msgbox BattleFrontier_ScottsHouse_Text_2643EB, 4 + release + end + +BattleFrontier_ScottsHouse_EventScript_2637DA:: @ 82637DA + msgbox BattleFrontier_ScottsHouse_Text_264373, 4 + release + end + +BattleFrontier_ScottsHouse_EventScript_2637E4:: @ 82637E4 + random 3 + compare VAR_RESULT, 1 + goto_eq BattleFrontier_ScottsHouse_EventScript_263807 + compare VAR_RESULT, 2 + goto_eq BattleFrontier_ScottsHouse_EventScript_263811 + msgbox BattleFrontier_ScottsHouse_Text_263DDD, 4 + release + end + +BattleFrontier_ScottsHouse_EventScript_263807:: @ 8263807 + msgbox BattleFrontier_ScottsHouse_Text_263F12, 4 + release + end + +BattleFrontier_ScottsHouse_EventScript_263811:: @ 8263811 + msgbox BattleFrontier_ScottsHouse_Text_263FFE, 4 + release + end + +BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B + setvar VAR_0x40CE, 0 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + special sub_8161F74 + compare VAR_RESULT, 50 + goto_if 4, BattleFrontier_ScottsHouse_EventScript_26387A + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 1 + special sub_81A1780 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + special sub_8161F74 + compare VAR_RESULT, 50 + goto_if 4, BattleFrontier_ScottsHouse_EventScript_26387A + goto BattleFrontier_ScottsHouse_EventScript_2637E4 + end + +BattleFrontier_ScottsHouse_EventScript_26387A:: @ 826387A + msgbox BattleFrontier_ScottsHouse_Text_264412, 4 + givedecoration_std 42 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_ScottsHouse_EventScript_2638A0 + setflag FLAG_0x0ED + setflag FLAG_0x003 + goto BattleFrontier_ScottsHouse_EventScript_2638AA + end + +BattleFrontier_ScottsHouse_EventScript_2638A0:: @ 82638A0 + msgbox BattleFrontier_ScottsHouse_Text_264583, 4 + release + end + +BattleFrontier_ScottsHouse_EventScript_2638AA:: @ 82638AA + msgbox BattleFrontier_ScottsHouse_Text_264546, 4 + release + end + +BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4 + setvar VAR_0x40CE, 0 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + special sub_8161F74 + compare VAR_RESULT, 100 + goto_if 4, BattleFrontier_ScottsHouse_EventScript_263913 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 1 + special sub_81A1780 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + special sub_8161F74 + compare VAR_RESULT, 100 + goto_if 4, BattleFrontier_ScottsHouse_EventScript_263913 + goto BattleFrontier_ScottsHouse_EventScript_2637E4 + end + +BattleFrontier_ScottsHouse_EventScript_263913:: @ 8263913 + msgbox BattleFrontier_ScottsHouse_Text_26449F, 4 + givedecoration_std 43 + compare VAR_RESULT, 0 + goto_eq BattleFrontier_ScottsHouse_EventScript_2638A0 + setflag FLAG_0x0EE + setflag FLAG_0x003 + goto BattleFrontier_ScottsHouse_EventScript_2638AA + end + +BattleFrontier_ScottsHouse_EventScript_263939:: @ 8263939 + msgbox BattleFrontier_ScottsHouse_Text_263DB8, 4 + release + end + +BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943 + msgbox BattleFrontier_ScottsHouse_Text_263A3F, 4 + closemessage + delay 30 + compare VAR_FACING, 2 + call_if 1, BattleFrontier_ScottsHouse_EventScript_263A13 + compare VAR_FACING, 1 + call_if 1, BattleFrontier_ScottsHouse_EventScript_263A1E + compare VAR_FACING, 4 + call_if 1, BattleFrontier_ScottsHouse_EventScript_263A29 + compare VAR_FACING, 3 + call_if 1, BattleFrontier_ScottsHouse_EventScript_263A34 + msgbox BattleFrontier_ScottsHouse_Text_263B29, 4 + applymovement 1, BattleFrontier_ScottsHouse_Movement_27259E + waitmovement 0 + msgbox BattleFrontier_ScottsHouse_Text_263BD4, 4 + compare VAR_0x40D1, 13 + goto_eq BattleFrontier_ScottsHouse_EventScript_2639BC + compare VAR_0x40D1, 9 + goto_if 4, BattleFrontier_ScottsHouse_EventScript_2639CB + compare VAR_0x40D1, 6 + goto_if 4, BattleFrontier_ScottsHouse_EventScript_2639DA + goto BattleFrontier_ScottsHouse_EventScript_2639E9 + end + +BattleFrontier_ScottsHouse_EventScript_2639BC:: @ 82639BC + buffernumberstring 0, 4 + setvar VAR_0x8004, 4 + goto BattleFrontier_ScottsHouse_EventScript_2639F8 + end + +BattleFrontier_ScottsHouse_EventScript_2639CB:: @ 82639CB + buffernumberstring 0, 3 + setvar VAR_0x8004, 3 + goto BattleFrontier_ScottsHouse_EventScript_2639F8 + end + +BattleFrontier_ScottsHouse_EventScript_2639DA:: @ 82639DA + buffernumberstring 0, 2 + setvar VAR_0x8004, 2 + goto BattleFrontier_ScottsHouse_EventScript_2639F8 + end + +BattleFrontier_ScottsHouse_EventScript_2639E9:: @ 82639E9 + buffernumberstring 0, 1 + setvar VAR_0x8004, 1 + goto BattleFrontier_ScottsHouse_EventScript_2639F8 + end + +BattleFrontier_ScottsHouse_EventScript_2639F8:: @ 82639F8 + special sub_813A9D0 + msgbox BattleFrontier_ScottsHouse_Text_263CB0, 9 + msgbox BattleFrontier_ScottsHouse_Text_263CD0, 4 + setflag FLAG_0x1D1 + setflag FLAG_0x002 + release + end + +BattleFrontier_ScottsHouse_EventScript_263A13:: @ 8263A13 + applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A6 + waitmovement 0 + return + +BattleFrontier_ScottsHouse_EventScript_263A1E:: @ 8263A1E + applymovement 1, BattleFrontier_ScottsHouse_Movement_2725AA + waitmovement 0 + return + +BattleFrontier_ScottsHouse_EventScript_263A29:: @ 8263A29 + applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A8 + waitmovement 0 + return + +BattleFrontier_ScottsHouse_EventScript_263A34:: @ 8263A34 + applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A4 + waitmovement 0 + return + +BattleFrontier_ScottsHouse_Text_263A3F: @ 8263A3F + .string "SCOTT: Well, hello and welcome!\n" + .string "Heheh… Sorry about the cramped space.\p" + .string "Anyway, {PLAYER}{KUN}, let me formally\n" + .string "welcome you to the BATTLE FRONTIER.\p" + .string "This is my dream come true.\n" + .string "It took me years and years, but I’ve\l" + .string "finally given shape to my dream.$" + +BattleFrontier_ScottsHouse_Text_263B29: @ 8263B29 + .string "On reflection, it was a terribly long\n" + .string "journey…\p" + .string "I left home alone on a quest to find\n" + .string "strong TRAINERS.\p" + .string "No one can imagine how much effort\n" + .string "or time it took to make this real.$" + +BattleFrontier_ScottsHouse_Text_263BD4: @ 8263BD4 + .string "But that’s all in the past.\n" + .string "No point dwelling on that!\p" + .string "All I want for you is to enjoy battling\n" + .string "to your heart’s content here.\p" + .string "{PLAYER}{KUN}, I want you to have this\n" + .string "as a memento for all the time our\l" + .string "paths crossed on our journeys.$" + +BattleFrontier_ScottsHouse_Text_263CB0: @ 8263CB0 + .string "{PLAYER} obtained\n" + .string "{STR_VAR_1} Battle Point(s).$" + +BattleFrontier_ScottsHouse_Text_263CD0: @ 8263CD0 + .string "SCOTT: You can check your Battle\n" + .string "Points on your FRONTIER PASS.\p" + .string "The more success you have here at\n" + .string "the BATTLE FRONTIER, the more Battle\l" + .string "Points you will collect.\p" + .string "Use your Battle Points the way you\n" + .string "see fit, like trading them for items.$" + +BattleFrontier_ScottsHouse_Text_263DB8: @ 8263DB8 + .string "I’m expecting great things from you!$" + +BattleFrontier_ScottsHouse_Text_263DDD: @ 8263DDD + .string "SCOTT: Every TRAINER is an individual.\n" + .string "They all lead lives of their own.\p" + .string "But when they’re in a battle,\n" + .string "it doesn’t matter who they are.\p" + .string "They’re all the same!\p" + .string "I love the purity of battle,\n" + .string "where everyone is equal.\p" + .string "That’s why I go everywhere seeking\n" + .string "TRAINERS who are serious about\l" + .string "battling, and invite them here.$" + +BattleFrontier_ScottsHouse_Text_263F12: @ 8263F12 + .string "SCOTT: Have you met any of\n" + .string "the FRONTIER BRAINS?\p" + .string "Better yet, have you obtained any\n" + .string "symbols from them?\p" + .string "I handpicked the FRONTIER BRAINS\n" + .string "as the toughest TRAINERS anywhere.\p" + .string "But I’m sure that seeing how tough\n" + .string "you are will startle even them!$" + +BattleFrontier_ScottsHouse_Text_263FFE: @ 8263FFE + .string "SCOTT: You don’t just train for battle,\n" + .string "right?\p" + .string "I think I remember you working on\n" + .string "a POKéDEX as well.\p" + .string "Well, guess what?\p" + .string "You may run into wild POKéMON in\n" + .string "the BATTLE FRONTIER somewhere…\l" + .string "Fufufu!$" + +BattleFrontier_ScottsHouse_Text_2640BC: @ 82640BC + .string "SCOTT: Are you enjoying things in\n" + .string "the BATTLE FRONTIER?\p" + .string "…Wait a second…\n" + .string "Oh!\p" + .string "Your FRONTIER PASS!\n" + .string "You’ve collected the full set\l" + .string "of silver symbols!\p" + .string "That’s more than impressive!\n" + .string "You are tough, just as I suspected!\p" + .string "Normally, I wouldn’t do something\n" + .string "like this, but this is a special time!\p" + .string "I want you to have this.\n" + .string "I’m sure you can put it to proper use.$" + +BattleFrontier_ScottsHouse_Text_264216: @ 8264216 + .string "SCOTT: I hope you’re enjoying\n" + .string "everything in the BATTLE FRONTIER.\p" + .string "…Wait a second…\n" + .string "Oh, my disbelieving eyes!\p" + .string "Your FRONTIER PASS!\n" + .string "You’ve gathered up the full set\l" + .string "of gold symbols!\p" + .string "That’s more than stupendous!\n" + .string "You’re incredible, just as I suspected!\p" + .string "… … … … … …\p" + .string "{PLAYER}, you’ve got to accept this!\p" + .string "I think you will be able to\n" + .string "appreciate the value of my gift!$" + +BattleFrontier_ScottsHouse_Text_264373: @ 8264373 + .string "I must say I have the gift of knowing\n" + .string "a good TRAINER when I see one.\p" + .string "I’m so glad I had the foresight to\n" + .string "bring you here!$" + +BattleFrontier_ScottsHouse_Text_2643EB: @ 82643EB + .string "Your BERRY POCKET seems to\n" + .string "be stuffed.$" + +BattleFrontier_ScottsHouse_Text_264412: @ 8264412 + .string "SCOTT: Oh, I heard about you!\n" + .string "How you ruled the BATTLE TOWER!\l" + .string "You beat over 50 TRAINERS in a row?\p" + .string "That’s fantastic!\n" + .string "I want you to have this!$" + +BattleFrontier_ScottsHouse_Text_26449F: @ 826449F + .string "SCOTT: Oh, my! I heard about you!\n" + .string "How you overwhelmed the BATTLE TOWER!\l" + .string "You beat over 100 TRAINERS in a row?\p" + .string "That’s ridiculously spectacular!\n" + .string "You’ve got to have this!$" + +BattleFrontier_ScottsHouse_Text_264546: @ 8264546 + .string "I’ll be expecting to hear even greater\n" + .string "things about you now!$" + +BattleFrontier_ScottsHouse_Text_264583: @ 8264583 + .string "Oops, well, if you have too much\n" + .string "stuff, come back for this later.$" + diff --git a/data/maps/BattlePyramidSquare01/events.inc b/data/maps/BattlePyramidSquare01/events.inc new file mode 100644 index 000000000..677499152 --- /dev/null +++ b/data/maps/BattlePyramidSquare01/events.inc @@ -0,0 +1,12 @@ +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 + +BattlePyramidSquare01_MapEvents:: @ 853A508 + map_events BattlePyramidSquare01_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/BattlePyramidSquare01/scripts.inc b/data/maps/BattlePyramidSquare01/scripts.inc new file mode 100644 index 000000000..c51e49ba7 --- /dev/null +++ b/data/maps/BattlePyramidSquare01/scripts.inc @@ -0,0 +1 @@ +BattlePyramidSquare01_MapScripts:: @ 823D1A5 diff --git a/data/maps/BattlePyramidSquare02/events.inc b/data/maps/BattlePyramidSquare02/events.inc new file mode 100644 index 000000000..1133979ee --- /dev/null +++ b/data/maps/BattlePyramidSquare02/events.inc @@ -0,0 +1,12 @@ +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 + +BattlePyramidSquare02_MapEvents:: @ 853A5C4 + map_events BattlePyramidSquare02_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/BattlePyramidSquare02/scripts.inc b/data/maps/BattlePyramidSquare02/scripts.inc new file mode 100644 index 000000000..a694b03bf --- /dev/null +++ b/data/maps/BattlePyramidSquare02/scripts.inc @@ -0,0 +1 @@ +BattlePyramidSquare02_MapScripts:: @ 823D1A5 diff --git a/data/maps/BattlePyramidSquare03/events.inc b/data/maps/BattlePyramidSquare03/events.inc new file mode 100644 index 000000000..95fdb77bc --- /dev/null +++ b/data/maps/BattlePyramidSquare03/events.inc @@ -0,0 +1,12 @@ +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 + +BattlePyramidSquare03_MapEvents:: @ 853A680 + map_events BattlePyramidSquare03_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/BattlePyramidSquare03/scripts.inc b/data/maps/BattlePyramidSquare03/scripts.inc new file mode 100644 index 000000000..229dd5a28 --- /dev/null +++ b/data/maps/BattlePyramidSquare03/scripts.inc @@ -0,0 +1 @@ +BattlePyramidSquare03_MapScripts:: @ 823D1A5 diff --git a/data/maps/BattlePyramidSquare04/events.inc b/data/maps/BattlePyramidSquare04/events.inc new file mode 100644 index 000000000..3b19c7f09 --- /dev/null +++ b/data/maps/BattlePyramidSquare04/events.inc @@ -0,0 +1,12 @@ +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 + +BattlePyramidSquare04_MapEvents:: @ 853A73C + map_events BattlePyramidSquare04_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/BattlePyramidSquare04/scripts.inc b/data/maps/BattlePyramidSquare04/scripts.inc new file mode 100644 index 000000000..a231965b5 --- /dev/null +++ b/data/maps/BattlePyramidSquare04/scripts.inc @@ -0,0 +1 @@ +BattlePyramidSquare04_MapScripts:: @ 823D1A5 diff --git a/data/maps/BattlePyramidSquare05/events.inc b/data/maps/BattlePyramidSquare05/events.inc new file mode 100644 index 000000000..17f6aab60 --- /dev/null +++ b/data/maps/BattlePyramidSquare05/events.inc @@ -0,0 +1,12 @@ +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 + +BattlePyramidSquare05_MapEvents:: @ 853A7F8 + map_events BattlePyramidSquare05_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/BattlePyramidSquare05/scripts.inc b/data/maps/BattlePyramidSquare05/scripts.inc new file mode 100644 index 000000000..e4670f78c --- /dev/null +++ b/data/maps/BattlePyramidSquare05/scripts.inc @@ -0,0 +1 @@ +BattlePyramidSquare05_MapScripts:: @ 823D1A5 diff --git a/data/maps/BattlePyramidSquare06/events.inc b/data/maps/BattlePyramidSquare06/events.inc new file mode 100644 index 000000000..6ae39b52f --- /dev/null +++ b/data/maps/BattlePyramidSquare06/events.inc @@ -0,0 +1,12 @@ +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 + +BattlePyramidSquare06_MapEvents:: @ 853A8B4 + map_events BattlePyramidSquare06_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/BattlePyramidSquare06/scripts.inc b/data/maps/BattlePyramidSquare06/scripts.inc new file mode 100644 index 000000000..6c0d38e41 --- /dev/null +++ b/data/maps/BattlePyramidSquare06/scripts.inc @@ -0,0 +1 @@ +BattlePyramidSquare06_MapScripts:: @ 823D1A5 diff --git a/data/maps/BattlePyramidSquare07/events.inc b/data/maps/BattlePyramidSquare07/events.inc new file mode 100644 index 000000000..788c5e40c --- /dev/null +++ b/data/maps/BattlePyramidSquare07/events.inc @@ -0,0 +1,12 @@ +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 + +BattlePyramidSquare07_MapEvents:: @ 853A970 + map_events BattlePyramidSquare07_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/BattlePyramidSquare07/scripts.inc b/data/maps/BattlePyramidSquare07/scripts.inc new file mode 100644 index 000000000..8603a6916 --- /dev/null +++ b/data/maps/BattlePyramidSquare07/scripts.inc @@ -0,0 +1 @@ +BattlePyramidSquare07_MapScripts:: @ 823D1A5 diff --git a/data/maps/BattlePyramidSquare08/events.inc b/data/maps/BattlePyramidSquare08/events.inc new file mode 100644 index 000000000..780fab9ed --- /dev/null +++ b/data/maps/BattlePyramidSquare08/events.inc @@ -0,0 +1,12 @@ +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 + +BattlePyramidSquare08_MapEvents:: @ 853AA2C + map_events BattlePyramidSquare08_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/BattlePyramidSquare08/scripts.inc b/data/maps/BattlePyramidSquare08/scripts.inc new file mode 100644 index 000000000..68a055f0e --- /dev/null +++ b/data/maps/BattlePyramidSquare08/scripts.inc @@ -0,0 +1 @@ +BattlePyramidSquare08_MapScripts:: @ 823D1A5 diff --git a/data/maps/BattlePyramidSquare09/events.inc b/data/maps/BattlePyramidSquare09/events.inc new file mode 100644 index 000000000..569059af5 --- /dev/null +++ b/data/maps/BattlePyramidSquare09/events.inc @@ -0,0 +1,12 @@ +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 + +BattlePyramidSquare09_MapEvents:: @ 853AAE8 + map_events BattlePyramidSquare09_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/BattlePyramidSquare09/scripts.inc b/data/maps/BattlePyramidSquare09/scripts.inc new file mode 100644 index 000000000..e93734988 --- /dev/null +++ b/data/maps/BattlePyramidSquare09/scripts.inc @@ -0,0 +1 @@ +BattlePyramidSquare09_MapScripts:: @ 823D1A5 diff --git a/data/maps/BattlePyramidSquare10/events.inc b/data/maps/BattlePyramidSquare10/events.inc new file mode 100644 index 000000000..ae3c4f88e --- /dev/null +++ b/data/maps/BattlePyramidSquare10/events.inc @@ -0,0 +1,12 @@ +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 + +BattlePyramidSquare10_MapEvents:: @ 853ABA4 + map_events BattlePyramidSquare10_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/BattlePyramidSquare10/scripts.inc b/data/maps/BattlePyramidSquare10/scripts.inc new file mode 100644 index 000000000..412e608e7 --- /dev/null +++ b/data/maps/BattlePyramidSquare10/scripts.inc @@ -0,0 +1 @@ +BattlePyramidSquare10_MapScripts:: @ 823D1A5 diff --git a/data/maps/BattlePyramidSquare11/events.inc b/data/maps/BattlePyramidSquare11/events.inc new file mode 100644 index 000000000..0389ee141 --- /dev/null +++ b/data/maps/BattlePyramidSquare11/events.inc @@ -0,0 +1,12 @@ +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 + +BattlePyramidSquare11_MapEvents:: @ 853AC60 + map_events BattlePyramidSquare11_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/BattlePyramidSquare11/scripts.inc b/data/maps/BattlePyramidSquare11/scripts.inc new file mode 100644 index 000000000..3b82fb925 --- /dev/null +++ b/data/maps/BattlePyramidSquare11/scripts.inc @@ -0,0 +1 @@ +BattlePyramidSquare11_MapScripts:: @ 823D1A5 diff --git a/data/maps/BattlePyramidSquare12/events.inc b/data/maps/BattlePyramidSquare12/events.inc new file mode 100644 index 000000000..db27c6c64 --- /dev/null +++ b/data/maps/BattlePyramidSquare12/events.inc @@ -0,0 +1,12 @@ +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 + +BattlePyramidSquare12_MapEvents:: @ 853AD1C + map_events BattlePyramidSquare12_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/BattlePyramidSquare12/scripts.inc b/data/maps/BattlePyramidSquare12/scripts.inc new file mode 100644 index 000000000..87a38213b --- /dev/null +++ b/data/maps/BattlePyramidSquare12/scripts.inc @@ -0,0 +1 @@ +BattlePyramidSquare12_MapScripts:: @ 823D1A5 diff --git a/data/maps/BattlePyramidSquare13/events.inc b/data/maps/BattlePyramidSquare13/events.inc new file mode 100644 index 000000000..12ac8ffe7 --- /dev/null +++ b/data/maps/BattlePyramidSquare13/events.inc @@ -0,0 +1,12 @@ +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 + +BattlePyramidSquare13_MapEvents:: @ 853ADD8 + map_events BattlePyramidSquare13_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/BattlePyramidSquare13/scripts.inc b/data/maps/BattlePyramidSquare13/scripts.inc new file mode 100644 index 000000000..188109305 --- /dev/null +++ b/data/maps/BattlePyramidSquare13/scripts.inc @@ -0,0 +1 @@ +BattlePyramidSquare13_MapScripts:: @ 823D1A5 diff --git a/data/maps/BattlePyramidSquare14/events.inc b/data/maps/BattlePyramidSquare14/events.inc new file mode 100644 index 000000000..c63fabee3 --- /dev/null +++ b/data/maps/BattlePyramidSquare14/events.inc @@ -0,0 +1,12 @@ +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 + +BattlePyramidSquare14_MapEvents:: @ 853AE94 + map_events BattlePyramidSquare14_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/BattlePyramidSquare14/scripts.inc b/data/maps/BattlePyramidSquare14/scripts.inc new file mode 100644 index 000000000..5ae39cb8a --- /dev/null +++ b/data/maps/BattlePyramidSquare14/scripts.inc @@ -0,0 +1 @@ +BattlePyramidSquare14_MapScripts:: @ 823D1A5 diff --git a/data/maps/BattlePyramidSquare15/events.inc b/data/maps/BattlePyramidSquare15/events.inc new file mode 100644 index 000000000..f2332f18b --- /dev/null +++ b/data/maps/BattlePyramidSquare15/events.inc @@ -0,0 +1,12 @@ +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 + +BattlePyramidSquare15_MapEvents:: @ 853AF50 + map_events BattlePyramidSquare15_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/BattlePyramidSquare15/scripts.inc b/data/maps/BattlePyramidSquare15/scripts.inc new file mode 100644 index 000000000..f1b7782d7 --- /dev/null +++ b/data/maps/BattlePyramidSquare15/scripts.inc @@ -0,0 +1 @@ +BattlePyramidSquare15_MapScripts:: @ 823D1A5 diff --git a/data/maps/BattlePyramidSquare16/events.inc b/data/maps/BattlePyramidSquare16/events.inc new file mode 100644 index 000000000..38d398b5b --- /dev/null +++ b/data/maps/BattlePyramidSquare16/events.inc @@ -0,0 +1,12 @@ +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 + +BattlePyramidSquare16_MapEvents:: @ 853B00C + map_events BattlePyramidSquare16_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/BattlePyramidSquare16/scripts.inc b/data/maps/BattlePyramidSquare16/scripts.inc new file mode 100644 index 000000000..9308930d1 --- /dev/null +++ b/data/maps/BattlePyramidSquare16/scripts.inc @@ -0,0 +1,3 @@ +BattlePyramidSquare16_MapScripts:: @ 823D1A5 + .byte 0 + diff --git a/data/maps/BirthIsland_Exterior/events.inc b/data/maps/BirthIsland_Exterior/events.inc new file mode 100644 index 000000000..86f4d43cb --- /dev/null +++ b/data/maps/BirthIsland_Exterior/events.inc @@ -0,0 +1,10 @@ +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 + +BirthIsland_Exterior_MapWarps: @ 853D80C + 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/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc new file mode 100644 index 000000000..b2427e95d --- /dev/null +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -0,0 +1,125 @@ +BirthIsland_Exterior_MapScripts:: @ 8267F15 + map_script 3, BirthIsland_Exterior_MapScript1_267F29 + map_script 5, BirthIsland_Exterior_MapScript1_267F65 + map_script 7, BirthIsland_Exterior_MapScript1_267F25 + .byte 0 + +BirthIsland_Exterior_MapScript1_267F25: @ 8267F25 + special sub_813B1D0 + end + +BirthIsland_Exterior_MapScript1_267F29: @ 8267F29 + setflag FLAG_0x8D3 + setvar VAR_OBJ_GFX_ID_0, 100 + setvar VAR_0x4034, 0 + setvar VAR_0x4035, 0 + checkflag FLAG_0x1AD + call_if 1, BirthIsland_Exterior_EventScript_267F4E + checkflag FLAG_0x1AD + call_if 0, BirthIsland_Exterior_EventScript_267F55 + end + +BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E + setflag FLAG_0x2FB + setflag FLAG_0x2FC + return + +BirthIsland_Exterior_EventScript_267F55:: @ 8267F55 + checkflag FLAG_0x1AC + goto_eq BirthIsland_Exterior_EventScript_27374E + clearflag FLAG_0x2FC + clearflag FLAG_0x8D4 + return + +BirthIsland_Exterior_MapScript1_267F65: @ 8267F65 + checkflag FLAG_SYS_CTRL_OBJ_DELETE + call_if 1, BirthIsland_Exterior_EventScript_267F6F + end + +BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 7 + goto_if 5, BirthIsland_Exterior_EventScript_27374E + removeobject 2 + return + +BirthIsland_Exterior_EventScript_267F83:: @ 8267F83 + lock + faceplayer + special sub_813AFC8 + waitstate + switch VAR_RESULT + case 0, BirthIsland_Exterior_EventScript_267FBB + case 1, BirthIsland_Exterior_EventScript_267FBD + case 2, BirthIsland_Exterior_EventScript_267FC1 + case 3, BirthIsland_Exterior_EventScript_267FBF + end + +BirthIsland_Exterior_EventScript_267FBB:: @ 8267FBB + release + end + +BirthIsland_Exterior_EventScript_267FBD:: @ 8267FBD + release + end + +BirthIsland_Exterior_EventScript_267FBF:: @ 8267FBF + release + end + +BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1 + waitse + setfieldeffectargument 0, 1 + setfieldeffectargument 1, 58 + setfieldeffectargument 2, 26 + dofieldeffect 65 + playbgm MUS_RG_DEOEYE, 0 + waitfieldeffect 65 + addobject 2 + applymovement 2, BirthIsland_Exterior_Movement_268054 + waitmovement 0 + waitse + playmoncry SPECIES_DEOXYS, 2 + delay 40 + waitmoncry + setvar VAR_LAST_TALKED, 2 + setvar VAR_0x8004, 410 + setvar VAR_0x8005, 30 + setvar VAR_0x8006, 0 + special CreateObedientEnemyMon + setflag FLAG_SYS_CTRL_OBJ_DELETE + special BattleSetup_StartLegendaryBattle + waitstate + clearflag FLAG_SYS_CTRL_OBJ_DELETE + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 1 + goto_eq BirthIsland_Exterior_EventScript_26803B + compare VAR_RESULT, 4 + goto_eq BirthIsland_Exterior_EventScript_268049 + compare VAR_RESULT, 5 + goto_eq BirthIsland_Exterior_EventScript_268049 + setflag FLAG_0x1AD + release + end + +BirthIsland_Exterior_EventScript_26803B:: @ 826803B + setflag FLAG_0x1AC + setvar VAR_0x8004, 410 + goto BirthIsland_Exterior_EventScript_273776 + end + +BirthIsland_Exterior_EventScript_268049:: @ 8268049 + setvar VAR_0x8004, 410 + goto BirthIsland_Exterior_EventScript_273776 + end + +BirthIsland_Exterior_Movement_268054: @ 8268054 + 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/maps/BirthIsland_Harbor/events.inc b/data/maps/BirthIsland_Harbor/events.inc new file mode 100644 index 000000000..f5c38358d --- /dev/null +++ b/data/maps/BirthIsland_Harbor/events.inc @@ -0,0 +1,10 @@ +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 + +BirthIsland_Harbor_MapWarps: @ 853D858 + 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/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc new file mode 100644 index 000000000..fe939172d --- /dev/null +++ b/data/maps/BirthIsland_Harbor/scripts.inc @@ -0,0 +1,27 @@ +BirthIsland_Harbor_MapScripts:: @ 826805C + .byte 0 + +BirthIsland_Harbor_EventScript_26805D:: @ 826805D + lock + faceplayer + msgbox BirthIsland_Harbor_Text_2C6B90, 5 + compare VAR_RESULT, 0 + goto_eq BirthIsland_Harbor_EventScript_2680A2 + msgbox BirthIsland_Harbor_Text_2A6A5D, 4 + closemessage + applymovement VAR_LAST_TALKED, BirthIsland_Harbor_Movement_2725AA + waitmovement 0 + delay 30 + hideobjectat 1, MAP_BIRTH_ISLAND_HARBOR + setvar VAR_0x8004, 2 + call BirthIsland_Harbor_EventScript_272250 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 + waitstate + release + end + +BirthIsland_Harbor_EventScript_2680A2:: @ 82680A2 + msgbox BirthIsland_Harbor_Text_2A6A82, 4 + release + end + diff --git a/data/maps/CaveOfOrigin_1F/events.inc b/data/maps/CaveOfOrigin_1F/events.inc new file mode 100644 index 000000000..bdc629846 --- /dev/null +++ b/data/maps/CaveOfOrigin_1F/events.inc @@ -0,0 +1,7 @@ +CaveOfOrigin_1F_MapWarps: @ 8535D40 + 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/CaveOfOrigin_1F/scripts.inc b/data/maps/CaveOfOrigin_1F/scripts.inc new file mode 100644 index 000000000..42c78d4b7 --- /dev/null +++ b/data/maps/CaveOfOrigin_1F/scripts.inc @@ -0,0 +1,9 @@ +CaveOfOrigin_1F_MapScripts:: @ 8235768 + map_script 3, CaveOfOrigin_1F_MapScript1_23576E + .byte 0 + +CaveOfOrigin_1F_MapScript1_23576E: @ 823576E + checkflag FLAG_0x071 + call_if 1, CaveOfOrigin_1F_EventScript_2722C1 + end + diff --git a/data/maps/CaveOfOrigin_B1F/events.inc b/data/maps/CaveOfOrigin_B1F/events.inc new file mode 100644 index 000000000..72a2c6210 --- /dev/null +++ b/data/maps/CaveOfOrigin_B1F/events.inc @@ -0,0 +1,9 @@ +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 + +CaveOfOrigin_B1F_MapWarps: @ 8535DE8 + 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/CaveOfOrigin_B1F/scripts.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc new file mode 100644 index 000000000..5ac3ec64a --- /dev/null +++ b/data/maps/CaveOfOrigin_B1F/scripts.inc @@ -0,0 +1,118 @@ +CaveOfOrigin_B1F_MapScripts:: @ 82357A8 + .byte 0 + +CaveOfOrigin_B1F_EventScript_2357A9:: @ 82357A9 + lock + faceplayer + msgbox CaveOfOrigin_B1F_Text_23586E, 4 + closemessage + applymovement 1, CaveOfOrigin_B1F_Movement_2725A6 + waitmovement 0 + delay 60 + playse SE_PIN + applymovement 1, CaveOfOrigin_B1F_Movement_272598 + waitmovement 0 + applymovement 1, CaveOfOrigin_B1F_Movement_27259A + waitmovement 0 + delay 30 + applymovement 1, CaveOfOrigin_B1F_Movement_27259E + waitmovement 0 + message CaveOfOrigin_B1F_Text_235ACE + waitmessage + goto CaveOfOrigin_B1F_EventScript_2357F0 + +CaveOfOrigin_B1F_EventScript_2357F0:: @ 82357F0 + multichoice 0, 0, 110, 0 + switch VAR_RESULT + case 0, CaveOfOrigin_B1F_EventScript_23582C + case 1, CaveOfOrigin_B1F_EventScript_235837 + case 2, CaveOfOrigin_B1F_EventScript_23584D + case 3, CaveOfOrigin_B1F_EventScript_235842 + goto CaveOfOrigin_B1F_EventScript_235842 + end + +CaveOfOrigin_B1F_EventScript_23582C:: @ 823582C + message CaveOfOrigin_B1F_Text_235B23 + waitmessage + goto CaveOfOrigin_B1F_EventScript_2357F0 + +CaveOfOrigin_B1F_EventScript_235837:: @ 8235837 + message CaveOfOrigin_B1F_Text_235BBF + waitmessage + goto CaveOfOrigin_B1F_EventScript_2357F0 + +CaveOfOrigin_B1F_EventScript_235842:: @ 8235842 + message CaveOfOrigin_B1F_Text_235C99 + waitmessage + goto CaveOfOrigin_B1F_EventScript_2357F0 + +CaveOfOrigin_B1F_EventScript_23584D:: @ 823584D + msgbox CaveOfOrigin_B1F_Text_235CEE, 4 + closemessage + playse SE_KAIDAN + fadescreenspeed 1, 4 + setflag FLAG_0x137 + setvar VAR_0x405E, 3 + removeobject 1 + clearflag FLAG_0x357 + fadescreen 0 + release + end + +CaveOfOrigin_B1F_Text_23586E: @ 823586E + .string "Ah, so you are {PLAYER}{KUN}?\n" + .string "I’ve heard tales of your exploits.\p" + .string "My name is WALLACE.\p" + .string "I was once the GYM LEADER of\n" + .string "SOOTOPOLIS, but something came up.\p" + .string "So now, I’ve entrusted my mentor JUAN\n" + .string "with the GYM’s operation.\p" + .string "… … … … … …\n" + .string "… … … … … …\p" + .string "GROUDON and KYOGRE, the two POKéMON\n" + .string "wreaking havoc here, are considered\l" + .string "to be super-ancient POKéMON.\p" + .string "But there aren’t just two super-\n" + .string "ancient POKéMON.\p" + .string "There is one more somewhere.\p" + .string "Somewhere, there is a super-\n" + .string "ancient POKéMON named RAYQUAZA.\p" + .string "It’s said that it was RAYQUAZA that\n" + .string "becalmed the two combatants in\l" + .string "the distant past.\p" + .string "But even I have no clue as to\n" + .string "RAYQUAZA’s whereabouts…$" + +CaveOfOrigin_B1F_Text_235ACE: @ 8235ACE + .string "WALLACE: {PLAYER}{KUN}, do you perhaps\n" + .string "know where RAYQUAZA is now?\p" + .string "If you do, please tell me.$" + +CaveOfOrigin_B1F_Text_235B23: @ 8235B23 + .string "WALLACE: The CAVE OF ORIGIN?\p" + .string "But that’s right here!\n" + .string "I need you to do better than that!\p" + .string "Please, I need you to think about\n" + .string "where RAYQUAZA might be right now.$" + +CaveOfOrigin_B1F_Text_235BBF: @ 8235BBF + .string "WALLACE: MT. PYRE?\p" + .string "But when I met the old lady there\n" + .string "earlier, she made no mention of it.\p" + .string "I very much doubt that the old lady\n" + .string "would try to hide something from me…\p" + .string "{PLAYER}{KUN}, could you think about this\n" + .string "more carefully for me?$" + +CaveOfOrigin_B1F_Text_235C99: @ 8235C99 + .string "WALLACE: Huh? You don’t remember?\n" + .string "Hmm… That’s a problem…\p" + .string "Can’t you remember somehow?$" + +CaveOfOrigin_B1F_Text_235CEE: @ 8235CEE + .string "WALLACE: The SKY PILLAR?\p" + .string "That’s it!\n" + .string "It must be the SKY PILLAR!\p" + .string "{PLAYER}{KUN}, there’s not a moment to lose!\n" + .string "We’ll head to the SKY PILLAR right away!$" + diff --git a/data/maps/CaveOfOrigin_Entrance/events.inc b/data/maps/CaveOfOrigin_Entrance/events.inc new file mode 100644 index 000000000..5a5ad59f7 --- /dev/null +++ b/data/maps/CaveOfOrigin_Entrance/events.inc @@ -0,0 +1,7 @@ +CaveOfOrigin_Entrance_MapWarps: @ 8535D1C + 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/CaveOfOrigin_Entrance/scripts.inc b/data/maps/CaveOfOrigin_Entrance/scripts.inc new file mode 100644 index 000000000..1a771ae82 --- /dev/null +++ b/data/maps/CaveOfOrigin_Entrance/scripts.inc @@ -0,0 +1,8 @@ +CaveOfOrigin_Entrance_MapScripts:: @ 8235759 + map_script 5, CaveOfOrigin_Entrance_MapScript1_23575F + .byte 0 + +CaveOfOrigin_Entrance_MapScript1_23575F: @ 823575F + setescapewarp MAP_SOOTOPOLIS_CITY, 255, 31, 17 + end + diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc new file mode 100644 index 000000000..c9eeaff22 --- /dev/null +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc @@ -0,0 +1,7 @@ +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 + +CaveOfOrigin_UnusedRubySapphireMap1_MapEvents:: @ 8535D74 + map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap1_MapWarps, 0x0, 0x0 + diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc new file mode 100644 index 000000000..4b4240833 --- /dev/null +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc @@ -0,0 +1,9 @@ +CaveOfOrigin_UnusedRubySapphireMap1_MapScripts:: @ 8235778 + map_script 3, CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E + .byte 0 + +CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E: @ 823577E + checkflag FLAG_0x071 + call_if 1, CaveOfOrigin_UnusedRubySapphireMap1_EventScript_2722C1 + end + diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc new file mode 100644 index 000000000..c8e9bbeeb --- /dev/null +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc @@ -0,0 +1,7 @@ +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 + +CaveOfOrigin_UnusedRubySapphireMap2_MapEvents:: @ 8535D98 + map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap2_MapWarps, 0x0, 0x0 + diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc new file mode 100644 index 000000000..d73ff8231 --- /dev/null +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc @@ -0,0 +1,9 @@ +CaveOfOrigin_UnusedRubySapphireMap2_MapScripts:: @ 8235788 + map_script 3, CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E + .byte 0 + +CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E: @ 823578E + checkflag FLAG_0x071 + call_if 1, CaveOfOrigin_UnusedRubySapphireMap2_EventScript_2722C1 + end + diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc new file mode 100644 index 000000000..953eef558 --- /dev/null +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc @@ -0,0 +1,7 @@ +CaveOfOrigin_UnusedRubySapphireMap3_MapWarps: @ 8535DAC + 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/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc new file mode 100644 index 000000000..7f4fb2ff1 --- /dev/null +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc @@ -0,0 +1,9 @@ +CaveOfOrigin_UnusedRubySapphireMap3_MapScripts:: @ 8235798 + map_script 3, CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E + .byte 0 + +CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E: @ 823579E + checkflag FLAG_0x071 + call_if 1, CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1 + end + diff --git a/data/maps/DesertRuins/events.inc b/data/maps/DesertRuins/events.inc new file mode 100644 index 000000000..b7ccd35b0 --- /dev/null +++ b/data/maps/DesertRuins/events.inc @@ -0,0 +1,16 @@ +DesertRuins_EventObjects: @ 8534354 + 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 + 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 + bg_event 7, 20, 0, 0, 0, DesertRuins_EventScript_22D9F8 + bg_event 9, 20, 0, 0, 0, DesertRuins_EventScript_22D9F8 + +DesertRuins_MapEvents:: @ 85343A8 + map_events DesertRuins_EventObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents + diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc new file mode 100644 index 000000000..9137902f2 --- /dev/null +++ b/data/maps/DesertRuins/scripts.inc @@ -0,0 +1,98 @@ +DesertRuins_MapScripts:: @ 822D95B + map_script 5, DesertRuins_MapScript1_22D96B + map_script 1, DesertRuins_MapScript1_22D989 + map_script 3, DesertRuins_MapScript1_22D9CA + .byte 0 + +DesertRuins_MapScript1_22D96B: @ 822D96B + checkflag FLAG_SYS_CTRL_OBJ_DELETE + call_if 1, DesertRuins_EventScript_22D975 + end + +DesertRuins_EventScript_22D975:: @ 822D975 + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 7 + goto_if 5, DesertRuins_EventScript_27374E + removeobject VAR_LAST_TALKED + return + +DesertRuins_MapScript1_22D989: @ 822D989 + checkflag FLAG_SYS_BRAILLE_STRENGTH + call_if 0, DesertRuins_EventScript_22D993 + end + +DesertRuins_EventScript_22D993:: @ 822D993 + setmetatile 7, 19, 553, 1 + setmetatile 8, 19, 553, 1 + setmetatile 9, 19, 553, 1 + setmetatile 7, 20, 565, 1 + setmetatile 8, 20, 565, 1 + setmetatile 9, 20, 565, 1 + return + +DesertRuins_MapScript1_22D9CA: @ 822D9CA + setflag FLAG_LANDMARK_DESERT_RUINS + checkflag FLAG_0x1BB + call_if 0, DesertRuins_EventScript_22D9D7 + end + +DesertRuins_EventScript_22D9D7:: @ 822D9D7 + clearflag FLAG_0x3A7 + return + +DesertRuins_EventScript_22D9DB:: @ 822D9DB + lockall + checkflag FLAG_SYS_BRAILLE_STRENGTH + goto_eq DesertRuins_EventScript_22D9EE + braillemessage DesertRuins_Braille_2A6CA0 + waitbuttonpress + hidebox2 + releaseall + end + +DesertRuins_EventScript_22D9EE:: @ 822D9EE + msgbox gUnknown_0827304E, 4 + releaseall + end + +DesertRuins_EventScript_22D9F8:: @ 822D9F8 + lockall + braillemessage DesertRuins_Braille_2A6CA0 + waitbuttonpress + hidebox2 + releaseall + end + +DesertRuins_EventScript_22DA02:: @ 822DA02 + lock + faceplayer + waitse + playmoncry SPECIES_REGIROCK, 2 + delay 40 + waitmoncry + setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE + setflag FLAG_SYS_CTRL_OBJ_DELETE + special StartRegiBattle + waitstate + clearflag FLAG_SYS_CTRL_OBJ_DELETE + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 1 + goto_eq DesertRuins_EventScript_22DA49 + compare VAR_RESULT, 4 + goto_eq DesertRuins_EventScript_22DA52 + compare VAR_RESULT, 5 + goto_eq DesertRuins_EventScript_22DA52 + setflag FLAG_0x1BB + release + end + +DesertRuins_EventScript_22DA49:: @ 822DA49 + setflag FLAG_0x1BB + goto DesertRuins_EventScript_27376D + end + +DesertRuins_EventScript_22DA52:: @ 822DA52 + setvar VAR_0x8004, 401 + goto DesertRuins_EventScript_273776 + end + diff --git a/data/maps/DesertUnderpass/events.inc b/data/maps/DesertUnderpass/events.inc new file mode 100644 index 000000000..05fb939a0 --- /dev/null +++ b/data/maps/DesertUnderpass/events.inc @@ -0,0 +1,9 @@ +DesertUnderpass_EventObjects: @ 85376D4 + 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 + +DesertUnderpass_MapEvents:: @ 85376F4 + map_events DesertUnderpass_EventObjects, DesertUnderpass_MapWarps, 0x0, 0x0 + diff --git a/data/maps/DesertUnderpass/scripts.inc b/data/maps/DesertUnderpass/scripts.inc new file mode 100644 index 000000000..486bd2577 --- /dev/null +++ b/data/maps/DesertUnderpass/scripts.inc @@ -0,0 +1,36 @@ +DesertUnderpass_MapScripts:: @ 823AF37 + map_script 3, DesertUnderpass_MapScript1_23AF3D + .byte 0 + +DesertUnderpass_MapScript1_23AF3D: @ 823AF3D + setflag FLAG_LANDMARK_DESERT_UNDERPASS + end + +DesertUnderpass_EventScript_23AF41:: @ 823AF41 + lock + faceplayer + checkflag FLAG_0x14F + goto_eq DesertUnderpass_EventScript_23AF57 + checkflag FLAG_0x150 + goto_eq DesertUnderpass_EventScript_23AF68 + release + end + +DesertUnderpass_EventScript_23AF57:: @ 823AF57 + giveitem_std ITEM_CLAW_FOSSIL + removeobject 1 + release + end + +DesertUnderpass_EventScript_23AF68:: @ 823AF68 + giveitem_std ITEM_ROOT_FOSSIL + removeobject 1 + release + end + +DesertUnderpass_Text_23AF79:: @ 823AF79 + .string "{PLAYER} found the ROOT FOSSIL.$" + +DesertUnderpass_Text_23AF93:: @ 823AF93 + .string "{PLAYER} found the CLAW FOSSIL.$" + diff --git a/data/maps/DewfordTown/events.inc b/data/maps/DewfordTown/events.inc new file mode 100644 index 000000000..c96b4c95e --- /dev/null +++ b/data/maps/DewfordTown/events.inc @@ -0,0 +1,24 @@ +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 + +DewfordTown_MapWarps: @ 85279DC + 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 + 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 + +DewfordTown_MapEvents:: @ 8527A40 + map_events DewfordTown_EventObjects, DewfordTown_MapWarps, 0x0, DewfordTown_MapBGEvents + diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc new file mode 100644 index 000000000..157c1f4d5 --- /dev/null +++ b/data/maps/DewfordTown/scripts.inc @@ -0,0 +1,805 @@ +DewfordTown_MapScripts:: @ 81E9507 + map_script 3, DewfordTown_MapScript1_1E950D + .byte 0 + +DewfordTown_MapScript1_1E950D: @ 81E950D + setflag FLAG_VISITED_DEWFORD_TOWN + end + +DewfordTown_EventScript_1E9511:: @ 81E9511 + lock + faceplayer + checkflag FLAG_0x0BD + goto_if 0, DewfordTown_EventScript_1E9585 + message DewfordTown_Text_1E9C8A + waitmessage + multichoicedefault 21, 6, 0, 2, 0 + switch VAR_RESULT + case 0, DewfordTown_EventScript_1E955A + case 1, DewfordTown_EventScript_1E956A + case 2, DewfordTown_EventScript_1E957A + case 127, DewfordTown_EventScript_1E957A + end + +DewfordTown_EventScript_1E955A:: @ 81E955A + msgbox DewfordTown_Text_1E9CE5, 4 + closemessage + goto DewfordTown_EventScript_1E9660 + release + end + +DewfordTown_EventScript_1E956A:: @ 81E956A + msgbox DewfordTown_Text_1E9D3A, 4 + closemessage + goto DewfordTown_EventScript_1E96E7 + release + end + +DewfordTown_EventScript_1E957A:: @ 81E957A + msgbox DewfordTown_Text_1E9D8F, 4 + closemessage + release + end + +DewfordTown_EventScript_1E9585:: @ 81E9585 + msgbox DewfordTown_Text_1E9B24, 5 + compare VAR_RESULT, 1 + goto_eq DewfordTown_EventScript_1E95A2 + msgbox DewfordTown_Text_1E9BD9, 4 + release + end + +DewfordTown_EventScript_1E95A2:: @ 81E95A2 + msgbox DewfordTown_Text_1E9B7F, 4 + closemessage + goto DewfordTown_EventScript_1E9660 + end + +DewfordTown_EventScript_1E95B1:: @ 81E95B1 + msgbox DewfordTown_Text_1E99A8, 2 + end + +DewfordTown_EventScript_1E95BA:: @ 81E95BA + msgbox DewfordTown_Text_1E9A0F, 3 + end + +DewfordTown_EventScript_1E95C3:: @ 81E95C3 + msgbox DewfordTown_Text_1E9A3D, 3 + end + +DewfordTown_EventScript_1E95CC:: @ 81E95CC + msgbox DewfordTown_Text_1E9A7F, 3 + end + +DewfordTown_EventScript_1E95D5:: @ 81E95D5 + lock + faceplayer + checkflag FLAG_0x101 + goto_eq DewfordTown_EventScript_1E962A + msgbox DewfordTown_Text_1E9DD1, 5 + compare VAR_RESULT, 1 + goto_eq DewfordTown_EventScript_1E95FF + compare VAR_RESULT, 0 + goto_eq DewfordTown_EventScript_1E9620 + end + +DewfordTown_EventScript_1E95FF:: @ 81E95FF + msgbox DewfordTown_Text_1E9E14, 4 + giveitem_std ITEM_OLD_ROD + setflag FLAG_0x101 + msgbox DewfordTown_Text_1E9E65, 4 + release + end + +DewfordTown_EventScript_1E9620:: @ 81E9620 + msgbox DewfordTown_Text_1E9F92, 4 + release + end + +DewfordTown_EventScript_1E962A:: @ 81E962A + message DewfordTown_Text_1E9FB8 + waitmessage + multichoice 20, 8, 50, 1 + compare VAR_RESULT, 0 + goto_eq DewfordTown_EventScript_1E964C + compare VAR_RESULT, 1 + goto_eq DewfordTown_EventScript_1E9656 + end + +DewfordTown_EventScript_1E964C:: @ 81E964C + msgbox DewfordTown_Text_1E9FD0, 4 + release + end + +DewfordTown_EventScript_1E9656:: @ 81E9656 + msgbox DewfordTown_Text_1EA004, 4 + release + end + +DewfordTown_EventScript_1E9660:: @ 81E9660 + call DewfordTown_EventScript_271E95 + 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, MAP_DEWFORD_TOWN + call DewfordTown_EventScript_2720A0 + applymovement 4, DewfordTown_Movement_1E97A2 + applymovement 255, DewfordTown_Movement_1E97A2 + waitmovement 0 + showobjectat 255, MAP_ROUTE104 + call DewfordTown_EventScript_2720A8 + applymovement 255, DewfordTown_Movement_1E9914 + waitmovement 0 + showobjectat 255, MAP_ROUTE104 + clearflag FLAG_0x2E3 + clearflag FLAG_0x371 + clearflag FLAG_0x2E6 + setflag FLAG_0x2E7 + hideobjectat 4, MAP_DEWFORD_TOWN + setvar VAR_0x408E, 2 + resetobjectpriority 255, MAP_DEWFORD_TOWN + warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 + copyvar VAR_0x4096, VAR_0x8008 + waitstate + release + end + +DewfordTown_EventScript_1E96E7:: @ 81E96E7 + call DewfordTown_EventScript_271E95 + 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, 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, MAP_ROUTE109 + applymovement 255, DewfordTown_Movement_1E9918 + waitmovement 0 + setobjectxyperm 2, 21, 26 + addobject 2 + 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, 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, MAP_DEWFORD_TOWN + resetobjectpriority 2, MAP_ROUTE109 + moveobjectoffscreen 2 + release + end + +DewfordTown_EventScript_1E9790:: @ 81E9790 + msgbox DewfordTown_Text_1EEC1D, 4 + return + +DewfordTown_EventScript_1E9799:: @ 81E9799 + msgbox DewfordTown_Text_1EEDA7, 4 + return + +DewfordTown_Movement_1E97A2: @ 81E97A2 + 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 + 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 + walk_right + walk_up + step_end + +DewfordTown_Movement_1E9914: @ 81E9914 + walk_up + walk_up + walk_up + step_end + +DewfordTown_Movement_1E9918: @ 81E9918 + walk_up + walk_up + walk_up + walk_in_place_fastest_down + step_end + +DewfordTown_Movement_1E991D: @ 81E991D + walk_up + step_end + +DewfordTown_Movement_1E991F: @ 81E991F + walk_up + walk_up + step_end + +DewfordTown_EventScript_1E9922:: @ 81E9922 + lock + faceplayer + call DewfordTown_EventScript_271E8B + msgbox DewfordTown_Text_1EA136, 5 + compare VAR_RESULT, 1 + goto_eq DewfordTown_EventScript_1E9948 + compare VAR_RESULT, 0 + goto_eq DewfordTown_EventScript_1E9952 + end + +DewfordTown_EventScript_1E9948:: @ 81E9948 + msgbox DewfordTown_Text_1EA491, 4 + release + end + +DewfordTown_EventScript_1E9952:: @ 81E9952 + msgbox DewfordTown_Text_1EA242, 4 + setvar VAR_0x8004, 9 + call DewfordTown_EventScript_271E7C + lock + faceplayer + compare VAR_RESULT, 1 + goto_eq DewfordTown_EventScript_1E997D + compare VAR_RESULT, 0 + goto_eq DewfordTown_EventScript_1E9994 + end + +DewfordTown_EventScript_1E997D:: @ 81E997D + incrementgamestat 2 + compare VAR_0x8004, 0 + goto_eq DewfordTown_EventScript_1E999E + msgbox DewfordTown_Text_1EA2AA, 4 + release + end + +DewfordTown_EventScript_1E9994:: @ 81E9994 + msgbox DewfordTown_Text_1EA443, 4 + release + end + +DewfordTown_EventScript_1E999E:: @ 81E999E + msgbox DewfordTown_Text_1EA3FE, 4 + release + end + +DewfordTown_Text_1E99A8: @ 81E99A8 + .string "DEWFORD is a tiny island community.\n" + .string "If something gets trendy here,\l" + .string "everyone picks up on it right away.$" + +DewfordTown_Text_1E9A0F: @ 81E9A0F + .string "DEWFORD TOWN\n" + .string "“A tiny island in the blue sea.â€$" + +DewfordTown_Text_1E9A3D: @ 81E9A3D + .string "DEWFORD TOWN POKéMON GYM\n" + .string "LEADER: BRAWLY\l" + .string "“A big wave in fighting!â€$" + +DewfordTown_Text_1E9A7F: @ 81E9A7F + .string "DEWFORD HALL\n" + .string "“Everyone’s information exchange!â€$" + +Route104_Text_1E9AAF: @ 81E9AAF + .string "MR. BRINEY: Ahoy!\n" + .string "We’ve hit land in DEWFORD.\p" + .string "I suppose you’re off to deliver that\n" + .string "LETTER to, who was it now, STEVEN!$" + +DewfordTown_Text_1E9B24: @ 81E9B24 + .string "MR. BRINEY: Have you delivered your\n" + .string "LETTER?\p" + .string "Or were you meaning to sail back to\n" + .string "PETALBURG?$" + +DewfordTown_Text_1E9B7F: @ 81E9B7F + .string "MR. BRINEY: PETALBURG it is, then!\p" + .string "Anchors aweigh!\n" + .string "PEEKO, we’re setting sail, my darling!$" + +DewfordTown_Text_1E9BD9: @ 81E9BD9 + .string "MR. BRINEY: Then you go on and deliver\n" + .string "the LETTER. I’ll be waiting.$" + +Route104_Text_1E9C1D: @ 81E9C1D +Route109_Text_1E9C1D: @ 81E9C1D + .string "MR. BRINEY: Ahoy!\n" + .string "We’ve hit land in DEWFORD!\p" + .string "You just go on and tell me whenever\n" + .string "you want to set sail again!$" + +DewfordTown_Text_1E9C8A: @ 81E9C8A + .string "MR. BRINEY: Ahoy!\n" + .string "For you, I’ll go out to sea anytime!\p" + .string "Now, my friend, where are we bound?$" + +DewfordTown_Text_1E9CE5: @ 81E9CE5 + .string "MR. BRINEY: PETALBURG, is it?\p" + .string "Anchors aweigh!\n" + .string "PEEKO, we’re setting sail, my darling!$" + +DewfordTown_Text_1E9D3A: @ 81E9D3A + .string "MR. BRINEY: SLATEPORT, is it?\p" + .string "Anchors aweigh!\n" + .string "PEEKO, we’re setting sail, my darling!$" + +DewfordTown_Text_1E9D8F: @ 81E9D8F + .string "MR. BRINEY: You just tell me whenever\n" + .string "you need to set sail again!$" + +DewfordTown_Text_1E9DD1: @ 81E9DD1 + .string "This is a renowned fishing spot.\n" + .string "Are you getting the itch to fish?$" + +DewfordTown_Text_1E9E14: @ 81E9E14 + .string "I hear you, and I like what\n" + .string "you’re saying!\p" + .string "I’ll give you one of my fishing RODS.$" + +DewfordTown_Text_1E9E65: @ 81E9E65 + .string "And, as an added bonus, I’ll even throw\n" + .string "in a little fishing advice!\p" + .string "First, you want to face the water,\n" + .string "then use the ROD.\p" + .string "Focus your mind…\n" + .string "If you get a bite, pull on the ROD.\p" + .string "Sometimes you can snag something\n" + .string "immediately, but with bigger catches,\l" + .string "you need to time the pulls on your ROD\l" + .string "to haul them in.$" + +DewfordTown_Text_1E9F92: @ 81E9F92 + .string "Oh, is that so?\n" + .string "That’s too bad, then.$" + +DewfordTown_Text_1E9FB8: @ 81E9FB8 + .string "Yo!\n" + .string "How’s your fishing?$" + +DewfordTown_Text_1E9FD0: @ 81E9FD0 + .string "Is that right! That’s great!\n" + .string "Haul in some big ones!$" + +DewfordTown_Text_1EA004: @ 81EA004 + .string "Oh, hey, don’t get down on yourself!\n" + .string "I’ll give you a little fishing advice.\p" + .string "First, you want to face the water,\n" + .string "then use the ROD.\p" + .string "Focus your mind…\n" + .string "If you get a bite, pull the ROD.\p" + .string "Sometimes you can snag something\n" + .string "immediately, but with bigger catches,\l" + .string "you need to time the pulls on your ROD\l" + .string "to haul them in.$" + +DewfordTown_Text_1EA136: @ 81EA136 + .string "I like what’s hip, happening, and trendy.\n" + .string "I’m always checking it out.\p" + .string "Listen, have you heard about this new\n" + .string "“{STR_VAR_1}â€?\p" + .string "That’s right!\n" + .string "Of course you know!\p" + .string "I mean, sheesh,\n" + .string "“{STR_VAR_1}â€â€¦\l" + .string "It’s the hottest thing in cool!\p" + .string "Wherever you’re from,\n" + .string "“{STR_VAR_1}â€\l" + .string "is the biggest happening thing, right?$" + +DewfordTown_Text_1EA242: @ 81EA242 + .string "Hunh?\n" + .string "It’s not the hip and happening thing?\p" + .string "Well, hey, you have to tell me,\n" + .string "what’s new and what’s “inâ€?$" + +DewfordTown_Text_1EA2AA: @ 81EA2AA + .string "Hunh?\n" + .string "“{STR_VAR_2}â€?\p" + .string "… …\p" + .string "…Uh… Yeah! That’s right!\n" + .string "Yeah, I knew that! Knew it all along!\p" + .string "Of course I know about that!\n" + .string "“{STR_VAR_2},†right?\p" + .string "Yeah, that’s it, it’s there!\n" + .string "Isn’t “{STR_VAR_2}â€\l" + .string "the coolest, or what?\p" + .string "It’s the hippest thing in hip.\n" + .string "You think I’d not know about it?\p" + .string "“{STR_VAR_1}â€â€¦\n" + .string "It’s, like, so five minutes ago.\p" + .string "Now, “{STR_VAR_2}†is\n" + .string "what’s vital and in tune with the times!$" + +DewfordTown_Text_1EA3FE: @ 81EA3FE + .string "Hmm…\n" + .string "“{STR_VAR_2},†huh?\p" + .string "But personally, I think\n" + .string "“{STR_VAR_1}â€\l" + .string "is what’s real in cool.$" + +DewfordTown_Text_1EA443: @ 81EA443 + .string "Well, if you hear of any happening new\n" + .string "trends, come share them with me, okay?$" + +DewfordTown_Text_1EA491: @ 81EA491 + .string "Yeah, absolutely right!\p" + .string "“{STR_VAR_1}†is the\n" + .string "definition of “in†right now.$" diff --git a/data/maps/DewfordTown_Gym/events.inc b/data/maps/DewfordTown_Gym/events.inc new file mode 100644 index 000000000..11f5d5a92 --- /dev/null +++ b/data/maps/DewfordTown_Gym/events.inc @@ -0,0 +1,23 @@ +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 + +DewfordTown_Gym_MapWarps: @ 852DBF4 + 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 + 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 + +DewfordTown_Gym_MapEvents:: @ 852DC34 + map_events DewfordTown_Gym_EventObjects, DewfordTown_Gym_MapWarps, 0x0, DewfordTown_Gym_MapBGEvents + diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc new file mode 100644 index 000000000..6acd67792 --- /dev/null +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -0,0 +1,491 @@ +DewfordTown_Gym_MapScripts:: @ 81FC63C + map_script 3, DewfordTown_Gym_MapScript1_1FC642 + .byte 0 + +DewfordTown_Gym_MapScript1_1FC642: @ 81FC642 + call DewfordTown_Gym_EventScript_1FC648 + end + +DewfordTown_Gym_EventScript_1FC648:: @ 81FC648 + checktrainerflag TRAINER_BRAWLY_1 + goto_eq DewfordTown_Gym_EventScript_1FC6A2 + call DewfordTown_Gym_EventScript_1FC768 + copyvar VAR_0x8001, VAR_0x8000 + compare VAR_0x8000, 0 + goto_eq DewfordTown_Gym_EventScript_1FC6BE + compare VAR_0x8000, 1 + goto_eq DewfordTown_Gym_EventScript_1FC6BA + compare VAR_0x8000, 2 + goto_eq DewfordTown_Gym_EventScript_1FC6B6 + compare VAR_0x8000, 3 + goto_eq DewfordTown_Gym_EventScript_1FC6B2 + compare VAR_0x8000, 4 + goto_eq DewfordTown_Gym_EventScript_1FC6AE + compare VAR_0x8000, 5 + goto_eq DewfordTown_Gym_EventScript_1FC6AA + goto DewfordTown_Gym_EventScript_1FC6A6 + +DewfordTown_Gym_EventScript_1FC6A2:: @ 81FC6A2 + setflashradius 0 + return + +DewfordTown_Gym_EventScript_1FC6A6:: @ 81FC6A6 + setflashradius 1 + return + +DewfordTown_Gym_EventScript_1FC6AA:: @ 81FC6AA + setflashradius 2 + return + +DewfordTown_Gym_EventScript_1FC6AE:: @ 81FC6AE + setflashradius 3 + return + +DewfordTown_Gym_EventScript_1FC6B2:: @ 81FC6B2 + setflashradius 4 + return + +DewfordTown_Gym_EventScript_1FC6B6:: @ 81FC6B6 + setflashradius 5 + return + +DewfordTown_Gym_EventScript_1FC6BA:: @ 81FC6BA + setflashradius 6 + return + +DewfordTown_Gym_EventScript_1FC6BE:: @ 81FC6BE + setflashradius 7 + return + +DewfordTown_Gym_EventScript_1FC6C2:: @ 81FC6C2 + call DewfordTown_Gym_EventScript_1FC768 + nop1 + compare VAR_0x8000, VAR_0x8001 + goto_eq DewfordTown_Gym_EventScript_1FC71A + copyvar VAR_0x8001, VAR_0x8000 + compare VAR_0x8000, 1 + goto_eq DewfordTown_Gym_EventScript_1FC71B + compare VAR_0x8000, 2 + goto_eq DewfordTown_Gym_EventScript_1FC726 + compare VAR_0x8000, 3 + goto_eq DewfordTown_Gym_EventScript_1FC731 + compare VAR_0x8000, 4 + goto_eq DewfordTown_Gym_EventScript_1FC73C + compare VAR_0x8000, 5 + goto_eq DewfordTown_Gym_EventScript_1FC747 + compare VAR_0x8000, 6 + goto_eq DewfordTown_Gym_EventScript_1FC752 + +DewfordTown_Gym_EventScript_1FC71A:: @ 81FC71A + return + +DewfordTown_Gym_EventScript_1FC71B:: @ 81FC71B + playse SE_MU_PACHI + animateflash 6 + call DewfordTown_Gym_EventScript_1FC648 + return + +DewfordTown_Gym_EventScript_1FC726:: @ 81FC726 + playse SE_MU_PACHI + animateflash 5 + call DewfordTown_Gym_EventScript_1FC648 + return + +DewfordTown_Gym_EventScript_1FC731:: @ 81FC731 + playse SE_MU_PACHI + animateflash 4 + call DewfordTown_Gym_EventScript_1FC648 + return + +DewfordTown_Gym_EventScript_1FC73C:: @ 81FC73C + playse SE_MU_PACHI + animateflash 3 + call DewfordTown_Gym_EventScript_1FC648 + return + +DewfordTown_Gym_EventScript_1FC747:: @ 81FC747 + playse SE_MU_PACHI + animateflash 2 + call DewfordTown_Gym_EventScript_1FC648 + return + +DewfordTown_Gym_EventScript_1FC752:: @ 81FC752 + playse SE_MU_PACHI + animateflash 1 + call DewfordTown_Gym_EventScript_1FC648 + return + +DewfordTown_Gym_EventScript_1FC75D:: @ 81FC75D + playse SE_MU_PACHI + animateflash 0 + call DewfordTown_Gym_EventScript_1FC648 + return + +DewfordTown_Gym_EventScript_1FC768:: @ 81FC768 + setvar VAR_0x8000, 0 + checktrainerflag TRAINER_TAKAO + goto_if 0, DewfordTown_Gym_EventScript_1FC77B + addvar VAR_0x8000, 1 + +DewfordTown_Gym_EventScript_1FC77B:: @ 81FC77B + checktrainerflag TRAINER_JOCELYN + goto_if 0, DewfordTown_Gym_EventScript_1FC789 + addvar VAR_0x8000, 1 + +DewfordTown_Gym_EventScript_1FC789:: @ 81FC789 + checktrainerflag TRAINER_LAURA + goto_if 0, DewfordTown_Gym_EventScript_1FC797 + addvar VAR_0x8000, 1 + +DewfordTown_Gym_EventScript_1FC797:: @ 81FC797 + checktrainerflag TRAINER_BRENDEN + goto_if 0, DewfordTown_Gym_EventScript_1FC7A5 + addvar VAR_0x8000, 1 + +DewfordTown_Gym_EventScript_1FC7A5:: @ 81FC7A5 + checktrainerflag TRAINER_CRISTIAN + goto_if 0, DewfordTown_Gym_EventScript_1FC7B3 + addvar VAR_0x8000, 1 + +DewfordTown_Gym_EventScript_1FC7B3:: @ 81FC7B3 + checktrainerflag TRAINER_LILITH + goto_if 0, DewfordTown_Gym_EventScript_1FC7C1 + addvar VAR_0x8000, 1 + +DewfordTown_Gym_EventScript_1FC7C1:: @ 81FC7C1 + return + +DewfordTown_Gym_EventScript_1FC7C2:: @ 81FC7C2 + trainerbattle 1, TRAINER_BRAWLY_1, 0, DewfordTown_Gym_Text_1FCF44, DewfordTown_Gym_Text_1FD008, DewfordTown_Gym_EventScript_1FC7F7 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq DewfordTown_Gym_EventScript_1FC89C + checkflag FLAG_0x0A6 + goto_if 0, DewfordTown_Gym_EventScript_1FC878 + msgbox DewfordTown_Gym_Text_1FD20D, 4 + release + end + +DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 + call DewfordTown_Gym_EventScript_1FC75D + message DewfordTown_Gym_Text_1FD07D + waitmessage + call DewfordTown_Gym_EventScript_27207E + msgbox DewfordTown_Gym_Text_1FD0A8, 4 + setflag FLAG_0x4F1 + setflag FLAG_BADGE02_GET + addvar VAR_0x4085, 1 + compare VAR_0x4085, 6 + call_if 1, DewfordTown_Gym_EventScript_271E84 + setvar VAR_0x8008, 2 + call DewfordTown_Gym_EventScript_271F43 + call DewfordTown_Gym_EventScript_1FC855 + closemessage + delay 30 + playfanfare MUS_ME_TORE_EYE + msgbox DewfordTown_Gym_Text_1FD1E0, 4 + waitfanfare + closemessage + delay 30 + setflag FLAG_0x1D4 + setvar VAR_0x40F4, 0 + setflag FLAG_0x080 + release + end + +DewfordTown_Gym_EventScript_1FC855:: @ 81FC855 + giveitem_std ITEM_TM08 + compare VAR_RESULT, 0 + goto_eq DewfordTown_Gym_EventScript_27205E + msgbox DewfordTown_Gym_Text_1FD181, 4 + setflag FLAG_0x0A6 + return + +DewfordTown_Gym_EventScript_1FC878:: @ 81FC878 + giveitem_std ITEM_TM08 + compare VAR_RESULT, 0 + goto_eq DewfordTown_Gym_EventScript_272054 + msgbox DewfordTown_Gym_Text_1FD181, 4 + setflag FLAG_0x0A6 + release + end + +DewfordTown_Gym_EventScript_1FC89C:: @ 81FC89C + trainerbattle 7, TRAINER_BRAWLY_1, 0, DewfordTown_Gym_Text_1FD2C4, DewfordTown_Gym_Text_1FD367, DewfordTown_Gym_Text_1FD3DE + msgbox DewfordTown_Gym_Text_1FD37B, 6 + end + +DewfordTown_Gym_EventScript_1FC8B7:: @ 81FC8B7 + trainerbattle 2, TRAINER_TAKAO, 0, DewfordTown_Gym_Text_1FCB9F, DewfordTown_Gym_Text_1FCBB8, DewfordTown_Gym_EventScript_1FC8D2 + msgbox DewfordTown_Gym_Text_1FCBCA, 6 + end + +DewfordTown_Gym_EventScript_1FC8D2:: @ 81FC8D2 + call DewfordTown_Gym_EventScript_1FC6C2 + release + end + +DewfordTown_Gym_EventScript_1FC8D9:: @ 81FC8D9 + trainerbattle 2, TRAINER_JOCELYN, 0, DewfordTown_Gym_Text_1FCC0A, DewfordTown_Gym_Text_1FCC45, DewfordTown_Gym_EventScript_1FC8F4 + msgbox DewfordTown_Gym_Text_1FCC6B, 6 + end + +DewfordTown_Gym_EventScript_1FC8F4:: @ 81FC8F4 + call DewfordTown_Gym_EventScript_1FC6C2 + release + end + +DewfordTown_Gym_EventScript_1FC8FB:: @ 81FC8FB + trainerbattle 2, TRAINER_LAURA, 0, DewfordTown_Gym_Text_1FCD01, DewfordTown_Gym_Text_1FCD3C, DewfordTown_Gym_EventScript_1FC916 + msgbox DewfordTown_Gym_Text_1FCD4F, 6 + end + +DewfordTown_Gym_EventScript_1FC916:: @ 81FC916 + call DewfordTown_Gym_EventScript_1FC6C2 + release + end + +DewfordTown_Gym_EventScript_1FC91D:: @ 81FC91D + trainerbattle 2, TRAINER_BRENDEN, 0, DewfordTown_Gym_Text_1FCE48, DewfordTown_Gym_Text_1FCE75, DewfordTown_Gym_EventScript_1FC938 + msgbox DewfordTown_Gym_Text_1FCEAB, 6 + end + +DewfordTown_Gym_EventScript_1FC938:: @ 81FC938 + call DewfordTown_Gym_EventScript_1FC6C2 + release + end + +DewfordTown_Gym_EventScript_1FC93F:: @ 81FC93F + trainerbattle 2, TRAINER_CRISTIAN, 0, DewfordTown_Gym_Text_1FCEDC, DewfordTown_Gym_Text_1FCF0A, DewfordTown_Gym_EventScript_1FC95A + msgbox DewfordTown_Gym_Text_1FCF26, 6 + end + +DewfordTown_Gym_EventScript_1FC95A:: @ 81FC95A + call DewfordTown_Gym_EventScript_1FC6C2 + release + end + +DewfordTown_Gym_EventScript_1FC961:: @ 81FC961 + trainerbattle 2, TRAINER_LILITH, 0, DewfordTown_Gym_Text_1FCDB8, DewfordTown_Gym_Text_1FCDE5, DewfordTown_Gym_EventScript_1FC97C + msgbox DewfordTown_Gym_Text_1FCE08, 6 + end + +DewfordTown_Gym_EventScript_1FC97C:: @ 81FC97C + call DewfordTown_Gym_EventScript_1FC6C2 + release + end + +DewfordTown_Gym_EventScript_1FC983:: @ 81FC983 + lock + faceplayer + checkflag FLAG_0x4F1 + goto_eq DewfordTown_Gym_EventScript_1FC998 + msgbox DewfordTown_Gym_Text_1FC9D6, 4 + release + end + +DewfordTown_Gym_EventScript_1FC998:: @ 81FC998 + msgbox DewfordTown_Gym_Text_1FCB5C, 4 + release + end + +DewfordTown_Gym_EventScript_1FC9A2:: @ 81FC9A2 + lockall + checkflag FLAG_BADGE02_GET + goto_eq DewfordTown_Gym_EventScript_1FC9C2 + goto DewfordTown_Gym_EventScript_1FC9CC + end + +DewfordTown_Gym_EventScript_1FC9B2:: @ 81FC9B2 + lockall + checkflag FLAG_BADGE02_GET + goto_eq DewfordTown_Gym_EventScript_1FC9C2 + goto DewfordTown_Gym_EventScript_1FC9CC + end + +DewfordTown_Gym_EventScript_1FC9C2:: @ 81FC9C2 + msgbox DewfordTown_Gym_Text_1FD28B, 4 + releaseall + end + +DewfordTown_Gym_EventScript_1FC9CC:: @ 81FC9CC + msgbox DewfordTown_Gym_Text_1FD272, 4 + releaseall + end + +DewfordTown_Gym_Text_1FC9D6: @ 81FC9D6 + .string "Hey, how’s it going, CHAMPION-\n" + .string "bound {PLAYER}?\p" + .string "DEWFORD’s GYM LEADER BRAWLY commands\n" + .string "FIGHTING-type POKéMON.\p" + .string "Going against him with NORMAL-type\n" + .string "POKéMON is asking for trouble.\p" + .string "FIGHTING POKéMON will lay a serious\n" + .string "smack down on NORMAL POKéMON,\l" + .string "so be careful!\p" + .string "What’s worse, the GYM is as dark as\n" + .string "the ocean floor.\p" + .string "But it will get brighter after defeating\n" + .string "the TRAINERS in your way.\p" + .string "Hey, okay, go for it!$" + +DewfordTown_Gym_Text_1FCB5C: @ 81FCB5C + .string "Whoah! It’s turned too bright in here!\p" + .string "Your future is bright, too!$" + +DewfordTown_Gym_Text_1FCB9F: @ 81FCB9F + .string "Might is right!\n" + .string "Come on!$" + +DewfordTown_Gym_Text_1FCBB8: @ 81FCBB8 + .string "Not enough power…$" + +DewfordTown_Gym_Text_1FCBCA: @ 81FCBCA + .string "Your skill overcame my strength!\n" + .string "Your technique is commendable!$" + +DewfordTown_Gym_Text_1FCC0A: @ 81FCC0A + .string "There’s no need for BRAWLY to be\n" + .string "involved!\p" + .string "I’ll crush you!$" + +DewfordTown_Gym_Text_1FCC45: @ 81FCC45 + .string "But… How?\n" + .string "How could I lose so easily?$" + +DewfordTown_Gym_Text_1FCC6B: @ 81FCC6B + .string "I’m not going to waste this loss.\n" + .string "I’ll use it to motivate me to train!\p" + .string "One day I’ll become a GYM LEADER…\p" + .string "No, I’ll become the POKéMON LEAGUE\n" + .string "CHAMPION!$" + +DewfordTown_Gym_Text_1FCD01: @ 81FCD01 + .string "Don’t you dare brush me off!\n" + .string "It’s not my fault if you cry!$" + +DewfordTown_Gym_Text_1FCD3C: @ 81FCD3C + .string "Waaaaaaah!\n" + .string "I lost!$" + +DewfordTown_Gym_Text_1FCD4F: @ 81FCD4F + .string "I battle in the dark to make my heart\n" + .string "stronger.\p" + .string "But because it’s so dark, I can never\n" + .string "see BRAWLY’s face…$" + +DewfordTown_Gym_Text_1FCDB8: @ 81FCDB8 + .string "Ufufu…\n" + .string "Are you stumbling around in the dark?$" + +DewfordTown_Gym_Text_1FCDE5: @ 81FCDE5 + .string "Oh, you…\n" + .string "I don’t want to know you!$" + +DewfordTown_Gym_Text_1FCE08: @ 81FCE08 + .string "You deserve to stay lost and end up\n" + .string "back at the entrance again!$" + +DewfordTown_Gym_Text_1FCE48: @ 81FCE48 + .string "I’ll show you the gumption of\n" + .string "a sailing man!$" + +DewfordTown_Gym_Text_1FCE75: @ 81FCE75 + .string "How’d this happen?\n" + .string "It’s not like me to lose this way!$" + +DewfordTown_Gym_Text_1FCEAB: @ 81FCEAB + .string "Oh, aye! You’re worthy of seeing\n" + .string "our GYM LEADER.$" + +DewfordTown_Gym_Text_1FCEDC: @ 81FCEDC + .string "If you mean to pass, it has to be\n" + .string "through me!$" + +DewfordTown_Gym_Text_1FCF0A: @ 81FCF0A + .string "Grrrrr!\n" + .string "Vastly overpowered!$" + +DewfordTown_Gym_Text_1FCF26: @ 81FCF26 + .string "You win!\n" + .string "Go after that BADGE!$" + +DewfordTown_Gym_Text_1FCF44: @ 81FCF44 + .string "I’m BRAWLY!\n" + .string "DEWFORD’s GYM LEADER!\p" + .string "I’ve been churned in the rough waves\n" + .string "of these parts, and I’ve grown tough\l" + .string "in the pitch-black cave!\p" + .string "So you wanted to challenge me?\n" + .string "Let me see what you’re made of!$" + +DewfordTown_Gym_Text_1FD008: @ 81FD008 + .string "Whoah, wow! You made a much bigger\n" + .string "splash than I expected!\p" + .string "You swamped me!\p" + .string "Okay, you’ve got me.\n" + .string "Take this GYM BADGE!$" + +DewfordTown_Gym_Text_1FD07D: @ 81FD07D + .string "{PLAYER} received the KNUCKLE BADGE\n" + .string "from BRAWLY.$" + +DewfordTown_Gym_Text_1FD0A8: @ 81FD0A8 + .string "The KNUCKLE BADGE makes all POKéMON\n" + .string "up to Level 30, even those you get in\l" + .string "trades, obey without question.\p" + .string "And, you’ll be able to use the HM move\n" + .string "FLASH outside of battle.\p" + .string "If you’d like, use this TECHNICAL\n" + .string "MACHINE, too.$" + +DewfordTown_Gym_Text_1FD181: @ 81FD181 + .string "That TM08 contains BULK UP.\p" + .string "It’s a move that raises both ATTACK\n" + .string "and DEFENSE stats.\p" + .string "… … … … … …$" + +DewfordTown_Gym_Text_1FD1E0: @ 81FD1E0 + .string "Registered GYM LEADER BRAWLY\n" + .string "in the POKéNAV.$" + +DewfordTown_Gym_Text_1FD20D: @ 81FD20D + .string "I can see your talent becoming a giant\n" + .string "wave to cause a storm of astonishment\l" + .string "among TRAINERS one day!$" + +DewfordTown_Gym_Text_1FD272: @ 81FD272 + .string "DEWFORD TOWN POKéMON GYM$" + +DewfordTown_Gym_Text_1FD28B: @ 81FD28B + .string "DEWFORD TOWN POKéMON GYM\p" + .string "BRAWLY’S CERTIFIED TRAINERS:\n" + .string "{PLAYER}$" + +DewfordTown_Gym_Text_1FD2C4: @ 81FD2C4 + .string "BRAWLY: A wave may draw back, but it\n" + .string "always returns to the shore.\p" + .string "A giant wave of a talent like you…\n" + .string "I knew you would return!\p" + .string "Show me how much higher\n" + .string "you’ve gone!$" + +DewfordTown_Gym_Text_1FD367: @ 81FD367 + .string "Wow!\n" + .string "Swamped again!$" + +DewfordTown_Gym_Text_1FD37B: @ 81FD37B + .string "BRAWLY: Battling is vast and it’s deep.\n" + .string "You can’t see the bottom.\l" + .string "It’s just like the sea of HOENN!$" + +DewfordTown_Gym_Text_1FD3DE: @ 81FD3DE + .string "BRAWLY: A wave may draw back, but it\n" + .string "always returns to the shore.\p" + .string "A giant wave of a talent like you…\n" + .string "I knew you would return!\p" + .string "Oh? You only have one POKéMON\n" + .string "that can battle.\p" + .string "I’m sorry, but I’d like you to come back\n" + .string "with at least two POKéMON.$" + diff --git a/data/maps/DewfordTown_Hall/events.inc b/data/maps/DewfordTown_Hall/events.inc new file mode 100644 index 000000000..e12a02a3c --- /dev/null +++ b/data/maps/DewfordTown_Hall/events.inc @@ -0,0 +1,22 @@ +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 + +DewfordTown_Hall_MapWarps: @ 852DD20 + 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 + bg_event 7, 1, 3, 0, 0, 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/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc new file mode 100644 index 000000000..37122a640 --- /dev/null +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -0,0 +1,453 @@ +DewfordTown_Hall_MapScripts:: @ 81FD4CF + .byte 0 + +DewfordTown_Hall_EventScript_1FD4D0:: @ 81FD4D0 + lock + faceplayer + call DewfordTown_Hall_EventScript_271E8B + special TrendyPhraseIsOld + compare VAR_RESULT, 1 + goto_eq DewfordTown_Hall_EventScript_1FD4EF + msgbox DewfordTown_Hall_Text_1FD818, 4 + release + end + +DewfordTown_Hall_EventScript_1FD4EF:: @ 81FD4EF + msgbox DewfordTown_Hall_Text_1FD877, 4 + release + end + +DewfordTown_Hall_EventScript_1FD4F9:: @ 81FD4F9 + lock + faceplayer + call DewfordTown_Hall_EventScript_271E8B + msgbox DewfordTown_Hall_Text_1FD8ED, 4 + release + end + +DewfordTown_Hall_EventScript_1FD50A:: @ 81FD50A + lock + faceplayer + call DewfordTown_Hall_EventScript_271E8B + special sub_811EF6C + msgbox DewfordTown_Hall_Text_1FD948, 5 + compare VAR_RESULT, 1 + goto_eq DewfordTown_Hall_EventScript_1FD533 + compare VAR_RESULT, 0 + goto_eq DewfordTown_Hall_EventScript_1FD53D + end + +DewfordTown_Hall_EventScript_1FD533:: @ 81FD533 + msgbox DewfordTown_Hall_Text_1FD9B3, 4 + release + end + +DewfordTown_Hall_EventScript_1FD53D:: @ 81FD53D + msgbox DewfordTown_Hall_Text_1FDA06, 4 + release + end + +DewfordTown_Hall_EventScript_1FD547:: @ 81FD547 + lock + faceplayer + call DewfordTown_Hall_EventScript_271E8B + msgbox DewfordTown_Hall_Text_1FDA5C, 4 + closemessage + applymovement 4, DewfordTown_Hall_Movement_2725A6 + waitmovement 0 + release + end + +DewfordTown_Hall_EventScript_1FD563:: @ 81FD563 + lock + faceplayer + call DewfordTown_Hall_EventScript_271E8B + msgbox DewfordTown_Hall_Text_1FDA99, 4 + closemessage + applymovement 5, DewfordTown_Hall_Movement_2725A6 + waitmovement 0 + release + end + +DewfordTown_Hall_EventScript_1FD57F:: @ 81FD57F + lock + faceplayer + call DewfordTown_Hall_EventScript_271E8B + msgbox DewfordTown_Hall_Text_1FDAC4, 4 + release + end + +DewfordTown_Hall_EventScript_1FD590:: @ 81FD590 + lockall + call DewfordTown_Hall_EventScript_271E8B + msgbox DewfordTown_Hall_Text_1FDB89, 4 + releaseall + end + +DewfordTown_Hall_EventScript_1FD5A0:: @ 81FD5A0 + lockall + call DewfordTown_Hall_EventScript_271E8B + special GetDewfordHallPaintingNameIndex + switch VAR_RESULT + case 0, DewfordTown_Hall_EventScript_1FD607 + case 4, DewfordTown_Hall_EventScript_1FD607 + case 1, DewfordTown_Hall_EventScript_1FD611 + case 5, DewfordTown_Hall_EventScript_1FD607 + case 2, DewfordTown_Hall_EventScript_1FD61B + case 6, DewfordTown_Hall_EventScript_1FD61B + case 3, DewfordTown_Hall_EventScript_1FD625 + case 7, DewfordTown_Hall_EventScript_1FD61B + end + +DewfordTown_Hall_EventScript_1FD607:: @ 81FD607 + msgbox DewfordTown_Hall_Text_1FDC05, 4 + releaseall + end + +DewfordTown_Hall_EventScript_1FD611:: @ 81FD611 + msgbox DewfordTown_Hall_Text_1FDC21, 4 + releaseall + end + +DewfordTown_Hall_EventScript_1FD61B:: @ 81FD61B + msgbox DewfordTown_Hall_Text_1FDC3C, 4 + releaseall + end + +DewfordTown_Hall_EventScript_1FD625:: @ 81FD625 + msgbox DewfordTown_Hall_Text_1FDC57, 4 + releaseall + end + +DewfordTown_Hall_EventScript_1FD62F:: @ 81FD62F + lockall + setvar VAR_0x8008, 0 + goto DewfordTown_Hall_EventScript_1FD647 + end + +DewfordTown_Hall_EventScript_1FD63B:: @ 81FD63B + lockall + setvar VAR_0x8008, 1 + goto DewfordTown_Hall_EventScript_1FD647 + end + +DewfordTown_Hall_EventScript_1FD647:: @ 81FD647 + call DewfordTown_Hall_EventScript_271E8B + special GetDewfordHallPaintingNameIndex + switch VAR_RESULT + case 0, DewfordTown_Hall_EventScript_1FD6AD + case 1, DewfordTown_Hall_EventScript_1FD6AD + case 2, DewfordTown_Hall_EventScript_1FD6C9 + case 3, DewfordTown_Hall_EventScript_1FD6C9 + case 4, DewfordTown_Hall_EventScript_1FD6E5 + case 5, DewfordTown_Hall_EventScript_1FD6E5 + case 6, DewfordTown_Hall_EventScript_1FD701 + case 7, DewfordTown_Hall_EventScript_1FD71D + end + +DewfordTown_Hall_EventScript_1FD6AD:: @ 81FD6AD + call DewfordTown_Hall_EventScript_1FD73A + msgbox DewfordTown_Hall_Text_1FDC76, 4 + call DewfordTown_Hall_EventScript_1FD772 + msgbox DewfordTown_Hall_Text_1FDCE2, 4 + releaseall + end + +DewfordTown_Hall_EventScript_1FD6C9:: @ 81FD6C9 + call DewfordTown_Hall_EventScript_1FD73A + msgbox DewfordTown_Hall_Text_1FDD95, 4 + call DewfordTown_Hall_EventScript_1FD772 + msgbox DewfordTown_Hall_Text_1FDE0E, 4 + releaseall + end + +DewfordTown_Hall_EventScript_1FD6E5:: @ 81FD6E5 + call DewfordTown_Hall_EventScript_1FD73A + msgbox DewfordTown_Hall_Text_1FDE77, 4 + call DewfordTown_Hall_EventScript_1FD772 + msgbox DewfordTown_Hall_Text_1FDED8, 4 + releaseall + end + +DewfordTown_Hall_EventScript_1FD701:: @ 81FD701 + call DewfordTown_Hall_EventScript_1FD73A + msgbox DewfordTown_Hall_Text_1FDF72, 4 + call DewfordTown_Hall_EventScript_1FD772 + msgbox DewfordTown_Hall_Text_1FDFF1, 4 + releaseall + end + +DewfordTown_Hall_EventScript_1FD71D:: @ 81FD71D + call DewfordTown_Hall_EventScript_1FD73A + msgbox DewfordTown_Hall_Text_1FE09A, 4 + call DewfordTown_Hall_EventScript_1FD772 + msgbox DewfordTown_Hall_Text_1FE0F2, 4 + releaseall + end + +DewfordTown_Hall_EventScript_1FD739:: @ 81FD739 + return + +DewfordTown_Hall_EventScript_1FD73A:: @ 81FD73A + applymovement 8, DewfordTown_Hall_Movement_1FD7D6 + waitmovement 0 + compare VAR_0x8008, 0 + goto_eq DewfordTown_Hall_EventScript_1FD75B + compare VAR_0x8008, 1 + goto_eq DewfordTown_Hall_EventScript_1FD771 + end + +DewfordTown_Hall_EventScript_1FD75B:: @ 81FD75B + compare VAR_FACING, 4 + goto_eq DewfordTown_Hall_EventScript_1FD739 + applymovement 255, DewfordTown_Hall_Movement_2725A8 + waitmovement 0 + return + +DewfordTown_Hall_EventScript_1FD771:: @ 81FD771 + return + +DewfordTown_Hall_EventScript_1FD772:: @ 81FD772 + applymovement 7, DewfordTown_Hall_Movement_1FD7D8 + waitmovement 0 + compare VAR_0x8008, 0 + goto_eq DewfordTown_Hall_EventScript_1FD793 + compare VAR_0x8008, 1 + goto_eq DewfordTown_Hall_EventScript_1FD7C0 + end + +DewfordTown_Hall_EventScript_1FD793:: @ 81FD793 + compare VAR_FACING, 2 + call_if 1, DewfordTown_Hall_EventScript_1FD7AA + compare VAR_FACING, 1 + call_if 1, DewfordTown_Hall_EventScript_1FD7B5 + return + +DewfordTown_Hall_EventScript_1FD7AA:: @ 81FD7AA + applymovement 255, DewfordTown_Hall_Movement_2725A6 + waitmovement 0 + return + +DewfordTown_Hall_EventScript_1FD7B5:: @ 81FD7B5 + applymovement 255, DewfordTown_Hall_Movement_2725AA + waitmovement 0 + return + +DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0 + compare VAR_FACING, 3 + goto_eq DewfordTown_Hall_EventScript_1FD739 + applymovement 255, DewfordTown_Hall_Movement_2725A4 + waitmovement 0 + return + +DewfordTown_Hall_Movement_1FD7D6: @ 81FD7D6 + walk_in_place_left + step_end + +DewfordTown_Hall_Movement_1FD7D8: @ 81FD7D8 + walk_in_place_right + step_end + +DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA + lock + faceplayer + call DewfordTown_Hall_EventScript_271E8B + checkflag FLAG_0x0E6 + goto_eq DewfordTown_Hall_EventScript_1FD80E + msgbox DewfordTown_Hall_Text_1FE142, 4 + giveitem_std ITEM_TM36 + compare VAR_RESULT, 0 + goto_eq DewfordTown_Hall_EventScript_272054 + setflag FLAG_0x0E6 + release + end + +DewfordTown_Hall_EventScript_1FD80E:: @ 81FD80E + msgbox DewfordTown_Hall_Text_1FE1ED, 4 + release + end + +DewfordTown_Hall_Text_1FD818: @ 81FD818 + .string "What’s in vogue? Why, it has to be\n" + .string "“{STR_VAR_1}â€!\p" + .string "I can’t imagine what life would be like\n" + .string "without “{STR_VAR_1}â€!$" + +DewfordTown_Hall_Text_1FD877: @ 81FD877 + .string "What’s in vogue? Why, it has to be\n" + .string "“{STR_VAR_1}â€!\p" + .string "But I’m getting kind of bored with it.\p" + .string "I should look for the next big thing.$" + +DewfordTown_Hall_Text_1FD8ED: @ 81FD8ED + .string "I’m teaching my POKéMON about\n" + .string "“{STR_VAR_1},â€\l" + .string "but it’s not going well.\p" + .string "It’s a bit too much, I think.$" + +DewfordTown_Hall_Text_1FD948: @ 81FD948 + .string "I’m studying up on the hip and trendy\n" + .string "“{STR_VAR_1}†now.\p" + .string "Is it true that there’s a deep link\n" + .string "between “{STR_VAR_1}â€\l" + .string "and “{STR_VAR_2}â€?$" + +DewfordTown_Hall_Text_1FD9B3: @ 81FD9B3 + .string "Oh!\n" + .string "So, my hunch was right!\p" + .string "I’m one step closer to being hip and\n" + .string "happening, yowza!$" + +DewfordTown_Hall_Text_1FDA06: @ 81FDA06 + .string "What?!\n" + .string "Is that so?!\p" + .string "It’s not easy for an older fellow like\n" + .string "me to keep up with trends!$" + +DewfordTown_Hall_Text_1FDA5C: @ 81FDA5C + .string "This whole business about\n" + .string "“{STR_VAR_1}â€â€¦\l" + .string "Isn’t there a TV show on it?$" + +DewfordTown_Hall_Text_1FDA99: @ 81FDA99 + .string "Across the sea…\p" + .string "Is “{STR_VAR_1}â€\n" + .string "even more popular?$" + +DewfordTown_Hall_Text_1FDAC4: @ 81FDAC4 + .string "I collect official\n" + .string "“{STR_VAR_1}â€\l" + .string "licensed merchandise.\p" + .string "I have official\n" + .string "“{STR_VAR_1}†DOLLS…\p" + .string "Official “{STR_VAR_1}â€\n" + .string "brand clothing…\p" + .string "And officially licensed\n" + .string "“{STR_VAR_1}â€\l" + .string "picture books.\p" + .string "Heheh, I own!\n" + .string "I’m not sharing anything with you!$" + +DewfordTown_Hall_Text_1FDB89: @ 81FDB89 + .string "IDENTIFYING GOOD\n" + .string "“{STR_VAR_1}†&\l" + .string "BAD “{STR_VAR_1}â€â€¦\p" + .string "THE LINK BETWEEN\n" + .string "“{STR_VAR_1}†AND\l" + .string "POKéMON…\p" + .string "USEFUL\n" + .string "“{STR_VAR_1}â€â€¦\p" + .string "It’s neatly jammed with books about\n" + .string "“{STR_VAR_1}.â€$" + +DewfordTown_Hall_Text_1FDC05: @ 81FDC05 + .string "“{STR_VAR_1}’S\n" + .string "SCREAM†is the title.$" + +DewfordTown_Hall_Text_1FDC21: @ 81FDC21 + .string "“{STR_VAR_1}’S\n" + .string "SMILE†is the title.$" + +DewfordTown_Hall_Text_1FDC3C: @ 81FDC3C + .string "It’s titled “THE LAST\n" + .string "{STR_VAR_1}â€.$" + +DewfordTown_Hall_Text_1FDC57: @ 81FDC57 + .string "It’s titled “THE BIRTH OF\n" + .string "{STR_VAR_1}â€.$" + +DewfordTown_Hall_Text_1FDC76: @ 81FDC76 + .string "I saw “{STR_VAR_1}â€!\n" + .string "Cool, huh?\p" + .string "It’s, like, the coolest thing going!\p" + .string "It was awesome!\n" + .string "It was the real thing, oh yeah!$" + +DewfordTown_Hall_Text_1FDCE2: @ 81FDCE2 + .string "Oh, no, no, no.\p" + .string "That alleged\n" + .string "“{STR_VAR_1}â€\l" + .string "you claim to have seen--it’s not.\p" + .string "The authentic article is much…\n" + .string "How should I say it?\l" + .string "Sharper, yet more mellow!\p" + .string "Ah, no matter. It’s astonishing!$" + +DewfordTown_Hall_Text_1FDD95: @ 81FDD95 + .string "Hey, listen, I composed a theme song\n" + .string "for “{STR_VAR_1}.â€\p" + .string "“{STR_VAR_1}â€\n" + .string "is really popular right now.\p" + .string "Okay, listen!\n" + .string "… …\p" + .string "Oh!\n" + .string "{STR_VAR_1}!\p" + .string "Wonderful\n" + .string "{STR_VAR_1}!$" + +DewfordTown_Hall_Text_1FDE0E: @ 81FDE0E + .string "… …\p" + .string "I dare say, chap, it would pay for you\n" + .string "to work on your singing before you\l" + .string "trifle yourself with\l" + .string "“{STR_VAR_1}.â€$" + +DewfordTown_Hall_Text_1FDE77: @ 81FDE77 + .string "Anyway, as I was saying earlier, we\n" + .string "should get together and organize a\l" + .string "“{STR_VAR_1}†party\l" + .string "on the island.$" + +DewfordTown_Hall_Text_1FDED8: @ 81FDED8 + .string "Oh, a smashing good idea!\p" + .string "It will settle once and for all\n" + .string "who is the best at\l" + .string "“{STR_VAR_1}.â€\l" + .string "Brilliant, indeed!\p" + .string "Starting today, our lives will revolve\n" + .string "around “{STR_VAR_1}â€!$" + +DewfordTown_Hall_Text_1FDF72: @ 81FDF72 + .string "I was thinking, though…\p" + .string "Wouldn’t you agree that\n" + .string "“{STR_VAR_1}†has\l" + .string "grown from being something trendy to\l" + .string "being a part of our daily lives?$" + +DewfordTown_Hall_Text_1FDFF1: @ 81FDFF1 + .string "Beg pardon?\n" + .string "That much, what?\p" + .string "However, it’s true that\n" + .string "“{STR_VAR_1}â€\l" + .string "weighs heavily on your mind, whether\l" + .string "you’re awake or asleep.\p" + .string "Absolutely, you’re the\n" + .string "“{STR_VAR_1}â€\l" + .string "PROFESSOR, old sport!$" + +DewfordTown_Hall_Text_1FE09A: @ 81FE09A + .string "If you and me team up as a combo,\n" + .string "we’ll be invincible when it comes to all\l" + .string "things “{STR_VAR_1}â€!$" + +DewfordTown_Hall_Text_1FE0F2: @ 81FE0F2 + .string "Spot on, my friend!\p" + .string "We shall be the\n" + .string "“{STR_VAR_1}†DUO!\p" + .string "Isn’t that a ripe image?\n" + .string "Hahahah!$" + +DewfordTown_Hall_Text_1FE142: @ 81FE142 + .string "For me, SLUDGE BOMB is at the peak\n" + .string "of popularity. It’s the one.\p" + .string "Hunh? You’re telling me that you don’t\n" + .string "know about SLUDGE BOMB?\p" + .string "That’s outright pitiful.\n" + .string "I’ll give you one.$" + +DewfordTown_Hall_Text_1FE1ED: @ 81FE1ED + .string "I love SLUDGE BOMB.\p" + .string "But POKéMON with the move\n" + .string "“{STR_VAR_1}â€\l" + .string "are in, too.$" + diff --git a/data/maps/DewfordTown_House1/events.inc b/data/maps/DewfordTown_House1/events.inc new file mode 100644 index 000000000..849bb0244 --- /dev/null +++ b/data/maps/DewfordTown_House1/events.inc @@ -0,0 +1,12 @@ +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 + +DewfordTown_House1_MapWarps: @ 852DA10 + 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/DewfordTown_House1/scripts.inc b/data/maps/DewfordTown_House1/scripts.inc new file mode 100644 index 000000000..59c490d81 --- /dev/null +++ b/data/maps/DewfordTown_House1/scripts.inc @@ -0,0 +1,36 @@ +DewfordTown_House1_MapScripts:: @ 81FC3CD + .byte 0 + +DewfordTown_House1_EventScript_1FC3CE:: @ 81FC3CE + msgbox DewfordTown_House1_Text_1FC3F3, 2 + end + +DewfordTown_House1_EventScript_1FC3D7:: @ 81FC3D7 + msgbox DewfordTown_House1_Text_1FC45B, 2 + end + +DewfordTown_House1_EventScript_1FC3E0:: @ 81FC3E0 + lock + faceplayer + waitse + playmoncry SPECIES_ZIGZAGOON, 0 + msgbox DewfordTown_House1_Text_1FC510, 4 + waitmoncry + release + end + +DewfordTown_House1_Text_1FC3F3: @ 81FC3F3 + .string "There’s a lot to be said for living on\n" + .string "a small island like this in harmony with\l" + .string "POKéMON and the family.$" + +DewfordTown_House1_Text_1FC45B: @ 81FC45B + .string "I left the major port of SLATEPORT\n" + .string "CITY when I married my husband here.\p" + .string "Life goes by slowly on this little\n" + .string "island. But being surrounded by the\l" + .string "beautiful sea--that’s happiness, too.$" + +DewfordTown_House1_Text_1FC510: @ 81FC510 + .string "ZIGZAGOON: Guguuh!$" + diff --git a/data/maps/DewfordTown_House2/events.inc b/data/maps/DewfordTown_House2/events.inc new file mode 100644 index 000000000..8aec9176b --- /dev/null +++ b/data/maps/DewfordTown_House2/events.inc @@ -0,0 +1,11 @@ +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 + +DewfordTown_House2_MapWarps: @ 852DD8C + 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/DewfordTown_House2/scripts.inc b/data/maps/DewfordTown_House2/scripts.inc new file mode 100644 index 000000000..1805164af --- /dev/null +++ b/data/maps/DewfordTown_House2/scripts.inc @@ -0,0 +1,59 @@ +DewfordTown_House2_MapScripts:: @ 81FE22D + .byte 0 + +DewfordTown_House2_EventScript_1FE22E:: @ 81FE22E + lock + faceplayer + checkflag FLAG_0x121 + goto_eq DewfordTown_House2_EventScript_1FE267 + msgbox DewfordTown_House2_Text_1FE27A, 4 + giveitem_std ITEM_SILK_SCARF + compare VAR_RESULT, 0 + goto_eq DewfordTown_House2_EventScript_1FE25D + setflag FLAG_0x121 + release + end + +DewfordTown_House2_EventScript_1FE25D:: @ 81FE25D + msgbox DewfordTown_House2_Text_1FE356, 4 + release + end + +DewfordTown_House2_EventScript_1FE267:: @ 81FE267 + msgbox DewfordTown_House2_Text_1FE3D1, 4 + release + end + +DewfordTown_House2_EventScript_1FE271:: @ 81FE271 + msgbox DewfordTown_House2_Text_1FE444, 2 + end + +DewfordTown_House2_Text_1FE27A: @ 81FE27A + .string "Gorge your eyes on this!\p" + .string "It’s a SILK SCARF. It’s right at the\n" + .string "cutting edge of fashion, yeah!\p" + .string "Oh, I can see your eyes twinkling!\n" + .string "You appreciate my dazzling style!\p" + .string "Oh, you’re a delight!\n" + .string "Here you go. I want you to have it!$" + +DewfordTown_House2_Text_1FE356: @ 81FE356 + .string "Oh, you don’t have room?\p" + .string "Now, listen tight, this SCARF is a must-\n" + .string "have! Why, I would sell all my items\l" + .string "in order to get it!$" + +DewfordTown_House2_Text_1FE3D1: @ 81FE3D1 + .string "The SILK SCARF raises the power of\n" + .string "NORMAL-type moves.\p" + .string "It’s a marvelous SCARF that will go\n" + .string "with almost all POKéMON!$" + +DewfordTown_House2_Text_1FE444: @ 81FE444 + .string "Wow, you bothered to cross the sea\n" + .string "to visit DEWFORD?\p" + .string "Did you maybe come here because you\n" + .string "heard about BRAWLY?\p" + .string "He’s so cool…\n" + .string "Everyone idolizes him.$" + diff --git a/data/maps/DewfordTown_PokemonCenter_1F/events.inc b/data/maps/DewfordTown_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..aad05249c --- /dev/null +++ b/data/maps/DewfordTown_PokemonCenter_1F/events.inc @@ -0,0 +1,13 @@ +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 + +DewfordTown_PokemonCenter_1F_MapWarps: @ 852DA7C + 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/DewfordTown_PokemonCenter_1F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..15a1c81b9 --- /dev/null +++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc @@ -0,0 +1,37 @@ +DewfordTown_PokemonCenter_1F_MapScripts:: @ 81FC523 + map_script 3, DewfordTown_PokemonCenter_1F_MapScript1_1FC52E + map_script 5, DewfordTown_PokemonCenter_1F_MapScript1_277C30 + .byte 0 + +DewfordTown_PokemonCenter_1F_MapScript1_1FC52E: @ 81FC52E + setrespawn 15 + call DewfordTown_PokemonCenter_1F_EventScript_2718DE + end + +DewfordTown_PokemonCenter_1F_EventScript_1FC537:: @ 81FC537 + setvar VAR_0x800B, 1 + call DewfordTown_PokemonCenter_1F_EventScript_27191E + waitmessage + waitbuttonpress + release + end + +DewfordTown_PokemonCenter_1F_EventScript_1FC545:: @ 81FC545 + msgbox DewfordTown_PokemonCenter_1F_Text_1FC557, 2 + end + +DewfordTown_PokemonCenter_1F_EventScript_1FC54E:: @ 81FC54E + msgbox DewfordTown_PokemonCenter_1F_Text_1FC5AE, 2 + end + +DewfordTown_PokemonCenter_1F_Text_1FC557: @ 81FC557 + .string "There’s a stone cavern at the edge\n" + .string "of town.\p" + .string "I’ve heard you can find rare stones\n" + .string "there.$" + +DewfordTown_PokemonCenter_1F_Text_1FC5AE: @ 81FC5AE + .string "Even if a POKéMON faints and can’t\n" + .string "battle, it can still use a move learned\l" + .string "from a HIDDEN MACHINE (HM).$" + diff --git a/data/maps/DewfordTown_PokemonCenter_2F/events.inc b/data/maps/DewfordTown_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..9c739974b --- /dev/null +++ b/data/maps/DewfordTown_PokemonCenter_2F/events.inc @@ -0,0 +1,14 @@ +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 + +DewfordTown_PokemonCenter_2F_MapWarps: @ 852DB08 + 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/DewfordTown_PokemonCenter_2F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..f2a30ecd2 --- /dev/null +++ b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc @@ -0,0 +1,19 @@ +DewfordTown_PokemonCenter_2F_MapScripts:: @ 81FC615 + map_script 2, DewfordTown_PokemonCenter_2F_MapScript2_276C3B + map_script 4, DewfordTown_PokemonCenter_2F_MapScript2_276B6C + map_script 1, DewfordTown_PokemonCenter_2F_MapScript1_276BBE + map_script 3, DewfordTown_PokemonCenter_2F_MapScript1_276ACF + .byte 0 + +DewfordTown_PokemonCenter_2F_EventScript_1FC62A:: @ 81FC62A + call OldaleTown_PokemonCenter_2F_EventScript_276EB7 + end + +DewfordTown_PokemonCenter_2F_EventScript_1FC630:: @ 81FC630 + call OldaleTown_PokemonCenter_2F_EventScript_2770B2 + end + +DewfordTown_PokemonCenter_2F_EventScript_1FC636:: @ 81FC636 + call OldaleTown_PokemonCenter_2F_EventScript_2771DB + end + diff --git a/data/maps/DoubleBattleColosseum/events.inc b/data/maps/DoubleBattleColosseum/events.inc new file mode 100644 index 000000000..f28e9e3e1 --- /dev/null +++ b/data/maps/DoubleBattleColosseum/events.inc @@ -0,0 +1,15 @@ +DoubleBattleColosseum_MapWarps: @ 8539E88 + 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 + 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 + +DoubleBattleColosseum_MapEvents:: @ 8539EE8 + map_events 0x0, DoubleBattleColosseum_MapWarps, DoubleBattleColosseum_MapCoordEvents, 0x0 + diff --git a/data/maps/DoubleBattleColosseum/scripts.inc b/data/maps/DoubleBattleColosseum/scripts.inc new file mode 100644 index 000000000..ac64377ae --- /dev/null +++ b/data/maps/DoubleBattleColosseum/scripts.inc @@ -0,0 +1,3 @@ +DoubleBattleColosseum_MapScripts:: @ 823B780 + .byte 0 + diff --git a/data/maps/EverGrandeCity/events.inc b/data/maps/EverGrandeCity/events.inc new file mode 100644 index 000000000..b8ca9eea4 --- /dev/null +++ b/data/maps/EverGrandeCity/events.inc @@ -0,0 +1,29 @@ +EverGrandeCity_MapWarps: @ 8527588 + 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 + 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 + +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 + +EverGrandeCity_MapEvents:: @ 8527694 + map_events 0x0, EverGrandeCity_MapWarps, EverGrandeCity_MapCoordEvents, EverGrandeCity_MapBGEvents + diff --git a/data/maps/EverGrandeCity/scripts.inc b/data/maps/EverGrandeCity/scripts.inc new file mode 100644 index 000000000..178621217 --- /dev/null +++ b/data/maps/EverGrandeCity/scripts.inc @@ -0,0 +1,38 @@ +EverGrandeCity_MapScripts:: @ 81E7D1B + map_script 3, EverGrandeCity_MapScript1_1E7D21 + .byte 0 + +EverGrandeCity_MapScript1_1E7D21: @ 81E7D21 + checkflag FLAG_SYS_WEATHER_CTRL + call_if 1, EverGrandeCity_EventScript_27207A + end + +EverGrandeCity_EventScript_1E7D2B:: @ 81E7D2B + msgbox EverGrandeCity_Text_1E7D4F, 3 + end + +EverGrandeCity_EventScript_1E7D34:: @ 81E7D34 + msgbox EverGrandeCity_Text_1E7D89, 3 + end + +EverGrandeCity_EventScript_1E7D3D:: @ 81E7D3D + msgbox EverGrandeCity_Text_1E7D65, 3 + end + +EverGrandeCity_EventScript_1E7D46:: @ 81E7D46 + setflag FLAG_VISITED_EVER_GRANDE_CITY + setvar VAR_TEMP_1, 1 + end + +EverGrandeCity_Text_1E7D4F: @ 81E7D4F + .string "ENTERING VICTORY ROAD$" + +EverGrandeCity_Text_1E7D65: @ 81E7D65 + .string "ENTERING POKéMON LEAGUE\n" + .string "CENTER GATE$" + +EverGrandeCity_Text_1E7D89: @ 81E7D89 + .string "EVER GRANDE CITY\p" + .string "“The paradise of flowers, the sea,\n" + .string "and POKéMON.â€$" + diff --git a/data/maps/EverGrandeCity_ChampionsRoom/events.inc b/data/maps/EverGrandeCity_ChampionsRoom/events.inc new file mode 100644 index 000000000..6226fe527 --- /dev/null +++ b/data/maps/EverGrandeCity_ChampionsRoom/events.inc @@ -0,0 +1,12 @@ +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 + +EverGrandeCity_ChampionsRoom_MapWarps: @ 8533748 + 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/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc new file mode 100644 index 000000000..3e68f4fed --- /dev/null +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -0,0 +1,346 @@ +EverGrandeCity_ChampionsRoom_MapScripts:: @ 82289EF + map_script 3, EverGrandeCity_ChampionsRoom_MapScript1_2289FF + map_script 4, EverGrandeCity_ChampionsRoom_MapScript2_228A05 + map_script 2, EverGrandeCity_ChampionsRoom_MapScript2_228A14 + .byte 0 + +EverGrandeCity_ChampionsRoom_MapScript1_2289FF: @ 82289FF + call EverGrandeCity_ChampionsRoom_EventScript_271ED7 + end + +EverGrandeCity_ChampionsRoom_MapScript2_228A05: @ 8228A05 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_228A0F + .2byte 0 + +EverGrandeCity_ChampionsRoom_EventScript_228A0F:: @ 8228A0F + turnobject 255, 2 + end + +EverGrandeCity_ChampionsRoom_MapScript2_228A14: @ 8228A14 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_228A1E + .2byte 0 + +EverGrandeCity_ChampionsRoom_EventScript_228A1E:: @ 8228A1E + lockall + applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725C1 + waitmovement 0 + delay 40 + applymovement 255, EverGrandeCity_ChampionsRoom_Movement_228A42 + waitmovement 0 + setvar VAR_TEMP_1, 1 + goto EverGrandeCity_ChampionsRoom_EventScript_228A45 + releaseall + end + +EverGrandeCity_ChampionsRoom_Movement_228A42: @ 8228A42 + walk_up + walk_up + step_end + +EverGrandeCity_ChampionsRoom_EventScript_228A45:: @ 8228A45 + playbgm MUS_DAIGO, 0 + msgbox EverGrandeCity_ChampionsRoom_Text_228C4C, 4 + trainerbattle 3, TRAINER_WALLACE, 0, EverGrandeCity_ChampionsRoom_Text_228EAC + goto EverGrandeCity_ChampionsRoom_EventScript_228A61 + end + +EverGrandeCity_ChampionsRoom_EventScript_228A61:: @ 8228A61 + playse SE_DOOR + setmetatile 6, 1, 838, 0 + setmetatile 6, 2, 839, 0 + special DrawWholeMapView + msgbox EverGrandeCity_ChampionsRoom_Text_228F66, 4 + closemessage + playse SE_DOOR + checkplayergender + compare VAR_RESULT, 0 + call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228ABC + compare VAR_RESULT, 1 + call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228AC1 + addobject 2 + call EverGrandeCity_ChampionsRoom_EventScript_228BFD + checkplayergender + compare VAR_RESULT, 0 + goto_eq EverGrandeCity_ChampionsRoom_EventScript_228AC6 + compare VAR_RESULT, 1 + goto_eq EverGrandeCity_ChampionsRoom_EventScript_228AFB + end + +EverGrandeCity_ChampionsRoom_EventScript_228ABC:: @ 8228ABC + playbgm MUS_GIRL_SUP, 0 + return + +EverGrandeCity_ChampionsRoom_EventScript_228AC1:: @ 8228AC1 + playbgm MUS_BOY_SUP, 0 + return + +EverGrandeCity_ChampionsRoom_EventScript_228AC6:: @ 8228AC6 + msgbox EverGrandeCity_ChampionsRoom_Text_2290CA, 4 + delay 40 + playse SE_PIN + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_272598 + waitmovement 0 + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_27259A + waitmovement 0 + call EverGrandeCity_ChampionsRoom_EventScript_228C12 + msgbox EverGrandeCity_ChampionsRoom_Text_22910B, 4 + goto EverGrandeCity_ChampionsRoom_EventScript_228B30 + end + +EverGrandeCity_ChampionsRoom_EventScript_228AFB:: @ 8228AFB + msgbox EverGrandeCity_ChampionsRoom_Text_229152, 4 + delay 40 + playse SE_PIN + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_272598 + waitmovement 0 + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_27259A + waitmovement 0 + call EverGrandeCity_ChampionsRoom_EventScript_228C12 + msgbox EverGrandeCity_ChampionsRoom_Text_2291A2, 4 + goto EverGrandeCity_ChampionsRoom_EventScript_228B30 + end + +EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 + closemessage + addobject 3 + applymovement 3, EverGrandeCity_ChampionsRoom_Movement_228C43 + waitmovement 0 + applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725A8 + waitmovement 0 + msgbox EverGrandeCity_ChampionsRoom_Text_2291E6, 4 + call EverGrandeCity_ChampionsRoom_EventScript_272184 + msgbox EverGrandeCity_ChampionsRoom_Text_22934D, 4 + applymovement 1, EverGrandeCity_ChampionsRoom_Movement_2725A6 + waitmovement 0 + delay 20 + applymovement 1, EverGrandeCity_ChampionsRoom_Movement_2725AA + waitmovement 0 + msgbox EverGrandeCity_ChampionsRoom_Text_229399, 4 + closemessage + delay 30 + applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3B + applymovement 255, EverGrandeCity_ChampionsRoom_Movement_228C1D + applymovement 3, EverGrandeCity_ChampionsRoom_Movement_2725A6 + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C38 + waitmovement 0 + delay 20 + applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725AA + waitmovement 0 + msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, 4 + checkplayergender + compare VAR_RESULT, 0 + call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228BEB + compare VAR_RESULT, 1 + call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228BF4 + closemessage + applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3F + applymovement 255, EverGrandeCity_ChampionsRoom_Movement_228C20 + waitmovement 0 + setflag FLAG_0x30D + warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16 + waitstate + releaseall + end + +EverGrandeCity_ChampionsRoom_EventScript_228BEB:: @ 8228BEB + msgbox EverGrandeCity_ChampionsRoom_Text_229479, 4 + return + +EverGrandeCity_ChampionsRoom_EventScript_228BF4:: @ 8228BF4 + msgbox EverGrandeCity_ChampionsRoom_Text_2294F5, 4 + return + +EverGrandeCity_ChampionsRoom_EventScript_228BFD:: @ 8228BFD + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C26 + waitmovement 0 + applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725A4 + waitmovement 0 + return + +EverGrandeCity_ChampionsRoom_EventScript_228C12:: @ 8228C12 + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C2F + waitmovement 0 + return + +EverGrandeCity_ChampionsRoom_Movement_228C1D: @ 8228C1D + walk_up + walk_up + step_end + +EverGrandeCity_ChampionsRoom_Movement_228C20: @ 8228C20 + walk_up + delay_16 + walk_up + delay_8 + set_invisible + step_end + +EverGrandeCity_ChampionsRoom_Movement_228C26: @ 8228C26 + 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 + 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 + walk_right + walk_up + step_end + +EverGrandeCity_ChampionsRoom_Movement_228C3B: @ 8228C3B + walk_up + walk_up + walk_in_place_fastest_down + step_end + +EverGrandeCity_ChampionsRoom_Movement_228C3F: @ 8228C3F + walk_up + delay_8 + set_invisible + step_end + +EverGrandeCity_ChampionsRoom_Movement_228C43: @ 8228C43 + 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 + .string "WALLACE: Welcome, {PLAYER}{KUN}.\p" + .string "That incident in SOOTOPOLIS CITY…\n" + .string "That was superb work, putting an end\l" + .string "to that crisis all by yourself.\p" + .string "Oops!\p" + .string "It wouldn’t be fair to say that you\n" + .string "alone ended the crisis.\p" + .string "You overcame that difficult situation\n" + .string "by working as one with your POKéMON.\p" + .string "We TRAINERS raise POKéMON by giving\n" + .string "them items and by teaching them new\l" + .string "techniques for battle.\p" + .string "But we ourselves also learn many\n" + .string "things from POKéMON.\p" + .string "And this is where your achievements\n" + .string "are put to the test against what\l" + .string "others like you have achieved.\p" + .string "Now!\p" + .string "Who can most elegantly dance with\n" + .string "their POKéMON in HOENN?\p" + .string "Show me right here and now!$" + +EverGrandeCity_ChampionsRoom_Text_228EAC: @ 8228EAC + .string "I, the CHAMPION, fall in defeat…\p" + .string "That was wonderful work.\n" + .string "You were elegant, infuriatingly so.\l" + .string "And yet it was utterly glorious!\p" + .string "Kudos to you, {PLAYER}{KUN}!\p" + .string "You are a truly noble POKéMON\n" + .string "TRAINER!$" + +EverGrandeCity_ChampionsRoom_Text_228F66: @ 8228F66 + .string "WALLACE: The POKéMON you sent into\n" + .string "battle…\p" + .string "At times they danced like a spring\n" + .string "breeze, and at times they struck\l" + .string "like lightning.\p" + .string "It was with light, yet surefooted,\n" + .string "elegance that you led your POKéMON.\p" + .string "Even I felt bedazzled by your\n" + .string "masterful performance!\p" + .string "You now stand at the glorious peak\n" + .string "of the POKéMON LEAGUE.\p" + .string "I now proclaim you to be the new\n" + .string "HOENN region…$" + +EverGrandeCity_ChampionsRoom_Text_2290CA: @ 82290CA + .string "MAY: {PLAYER}{KUN}!\p" + .string "Here’s some advice before you challenge\n" + .string "the CHAMPION…$" + +EverGrandeCity_ChampionsRoom_Text_22910B: @ 822910B + .string "MAY: Huh?\n" + .string "What, what, what?\p" + .string "{PLAYER}{KUN}…\n" + .string "Could it be that…\l" + .string "It’s already over?$" + +EverGrandeCity_ChampionsRoom_Text_229152: @ 8229152 + .string "BRENDAN: {PLAYER}!\p" + .string "How would you like some advice before\n" + .string "you challenge the CHAMPION?…$" + +EverGrandeCity_ChampionsRoom_Text_2291A2: @ 82291A2 + .string "BRENDAN: {PLAYER}…\p" + .string "Are you trying to tell me…\n" + .string "You’ve beaten the CHAMPION?$" + +EverGrandeCity_ChampionsRoom_Text_2291E6: @ 82291E6 + .string "PROF. BIRCH: See?\n" + .string "What did I tell you, {RIVAL}?\p" + .string "Didn’t I tell you that you don’t need\n" + .string "to worry about {PLAYER}{KUN}?\p" + .string "… … … … … … … …\n" + .string "{PLAYER}{KUN}, you’ve finally done it.\p" + .string "When I heard that you defeated your\n" + .string "own father at the PETALBURG GYM,\l" + .string "I thought perhaps you had a chance…\p" + .string "But to think you’ve actually become\n" + .string "the CHAMPION!\p" + .string "Ah, yes!\p" + .string "What became of your POKéDEX?\n" + .string "Here, let me see.$" + +EverGrandeCity_ChampionsRoom_Text_22934D: @ 822934D + .string "PROF. BIRCH: Anyways,\n" + .string "congratulations!\p" + .string "Now, go proudly into the final room!$" + +EverGrandeCity_ChampionsRoom_Text_229399: @ 8229399 + .string "WALLACE: {PLAYER}{KUN}…\p" + .string "No, let me rephrase that properly.\p" + .string "The new CHAMPION!\p" + .string "Come with me.$" + +EverGrandeCity_ChampionsRoom_Text_2293EB: @ 82293EB + .string "WALLACE: I’m sorry, but…\p" + .string "From here on, only those TRAINERS who\n" + .string "have become CHAMPIONS may enter.\p" + .string "You’ll have to wait outside with\n" + .string "PROF. BIRCH.$" + +EverGrandeCity_ChampionsRoom_Text_229479: @ 8229479 + .string "MAY: Groan…\p" + .string "… … … … … … … …\n" + .string "… … … … … … … …\p" + .string "I’m just joking! That’s okay!\n" + .string "That’s the rule!\p" + .string "{PLAYER}{KUN}!\n" + .string "Honestly, congratulations!$" + +EverGrandeCity_ChampionsRoom_Text_2294F5: @ 82294F5 + .string "BRENDAN: Whaaaat?! … … … … …\n" + .string "… … … … … … … …\p" + .string "It can’t be helped if that’s the rule.\p" + .string "{PLAYER}, way to go!\n" + .string "Congratulations!$" + diff --git a/data/maps/EverGrandeCity_DrakesRoom/events.inc b/data/maps/EverGrandeCity_DrakesRoom/events.inc new file mode 100644 index 000000000..56eda4374 --- /dev/null +++ b/data/maps/EverGrandeCity_DrakesRoom/events.inc @@ -0,0 +1,10 @@ +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 + +EverGrandeCity_DrakesRoom_MapEvents:: @ 85336EC + map_events EverGrandeCity_DrakesRoom_EventObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0 + diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc new file mode 100644 index 000000000..4c90417af --- /dev/null +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -0,0 +1,94 @@ +EverGrandeCity_DrakesRoom_MapScripts:: @ 822869C + map_script 2, EverGrandeCity_DrakesRoom_MapScript2_2286BB + map_script 1, EverGrandeCity_DrakesRoom_MapScript1_2286D2 + map_script 4, EverGrandeCity_DrakesRoom_MapScript2_227F3E + .byte 0 + +EverGrandeCity_DrakesRoom_MapScript2_2286AC: @ 82286AC + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_DrakesRoom_EventScript_2286B6 + .2byte 0 + +EverGrandeCity_DrakesRoom_EventScript_2286B6:: @ 82286B6 + turnobject 255, 2 + end + +EverGrandeCity_DrakesRoom_MapScript2_2286BB: @ 82286BB + map_script_2 VAR_0x409C, 3, EverGrandeCity_DrakesRoom_EventScript_2286C5 + .2byte 0 + +EverGrandeCity_DrakesRoom_EventScript_2286C5:: @ 82286C5 + lockall + call EverGrandeCity_DrakesRoom_EventScript_272475 + setvar VAR_0x409C, 4 + releaseall + end + +EverGrandeCity_DrakesRoom_MapScript1_2286D2: @ 82286D2 + checkflag FLAG_0x4FE + call_if 1, EverGrandeCity_DrakesRoom_EventScript_2286E7 + compare VAR_0x409C, 4 + call_if 1, EverGrandeCity_DrakesRoom_EventScript_2286ED + end + +EverGrandeCity_DrakesRoom_EventScript_2286E7:: @ 82286E7 + call EverGrandeCity_DrakesRoom_EventScript_2724BC + return + +EverGrandeCity_DrakesRoom_EventScript_2286ED:: @ 82286ED + call EverGrandeCity_DrakesRoom_EventScript_27255F + return + +EverGrandeCity_DrakesRoom_EventScript_2286F3:: @ 82286F3 + lock + faceplayer + checkflag FLAG_0x4FE + goto_eq EverGrandeCity_DrakesRoom_EventScript_22871A + playbgm MUS_SITENNOU, 0 + msgbox EverGrandeCity_DrakesRoom_Text_22873E, 4 + trainerbattle 3, TRAINER_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_228895 + goto EverGrandeCity_DrakesRoom_EventScript_228724 + end + +EverGrandeCity_DrakesRoom_EventScript_22871A:: @ 822871A + msgbox EverGrandeCity_DrakesRoom_Text_2288B0, 4 + release + end + +EverGrandeCity_DrakesRoom_EventScript_228724:: @ 8228724 + setvar VAR_0x8004, 0 + special sub_813BF7C + setflag FLAG_0x4FE + call EverGrandeCity_DrakesRoom_EventScript_2723F8 + msgbox EverGrandeCity_DrakesRoom_Text_2288B0, 4 + release + end + +EverGrandeCity_DrakesRoom_Text_22873E: @ 822873E + .string "I am the last of the POKéMON LEAGUE\n" + .string "ELITE FOUR, DRAKE the DRAGON master!\p" + .string "In their natural state, POKéMON are\n" + .string "wild living things. They are free.\p" + .string "At times, they hinder us.\n" + .string "At times, they help us.\p" + .string "For us to battle with POKéMON as\n" + .string "partners, do you know what it takes?\p" + .string "Do you know what is needed?\p" + .string "If you don’t, then you will never\n" + .string "prevail over me!$" + +EverGrandeCity_DrakesRoom_Text_228895: @ 8228895 + .string "Superb, it should be said.$" + +EverGrandeCity_DrakesRoom_Text_2288B0: @ 82288B0 + .string "You deserve every credit for coming\n" + .string "this far as a TRAINER of POKéMON.\p" + .string "You do seem to know what is needed.\p" + .string "Yes, what a TRAINER needs is a\n" + .string "virtuous heart.\p" + .string "POKéMON touch the good hearts of\n" + .string "TRAINERS and learn good from wrong.\p" + .string "They touch the good hearts of\n" + .string "TRAINERS and grow strong.\p" + .string "Go! Go onwards!\n" + .string "The CHAMPION is waiting!$" + diff --git a/data/maps/EverGrandeCity_GlaciasRoom/events.inc b/data/maps/EverGrandeCity_GlaciasRoom/events.inc new file mode 100644 index 000000000..c8d85fd98 --- /dev/null +++ b/data/maps/EverGrandeCity_GlaciasRoom/events.inc @@ -0,0 +1,10 @@ +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 + +EverGrandeCity_GlaciasRoom_MapEvents:: @ 85336B0 + map_events EverGrandeCity_GlaciasRoom_EventObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0 + diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc new file mode 100644 index 000000000..f1d846f03 --- /dev/null +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -0,0 +1,86 @@ +EverGrandeCity_GlaciasRoom_MapScripts:: @ 8228412 + map_script 2, EverGrandeCity_GlaciasRoom_MapScript2_228431 + map_script 1, EverGrandeCity_GlaciasRoom_MapScript1_228448 + map_script 4, EverGrandeCity_GlaciasRoom_MapScript2_228422 + .byte 0 + +EverGrandeCity_GlaciasRoom_MapScript2_228422: @ 8228422 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_GlaciasRoom_EventScript_22842C + .2byte 0 + +EverGrandeCity_GlaciasRoom_EventScript_22842C:: @ 822842C + turnobject 255, 2 + end + +EverGrandeCity_GlaciasRoom_MapScript2_228431: @ 8228431 + map_script_2 VAR_0x409C, 2, EverGrandeCity_GlaciasRoom_EventScript_22843B + .2byte 0 + +EverGrandeCity_GlaciasRoom_EventScript_22843B:: @ 822843B + lockall + call EverGrandeCity_GlaciasRoom_EventScript_272475 + setvar VAR_0x409C, 3 + releaseall + end + +EverGrandeCity_GlaciasRoom_MapScript1_228448: @ 8228448 + checkflag FLAG_0x4FD + call_if 1, EverGrandeCity_GlaciasRoom_EventScript_22845D + compare VAR_0x409C, 3 + call_if 1, EverGrandeCity_GlaciasRoom_EventScript_228463 + end + +EverGrandeCity_GlaciasRoom_EventScript_22845D:: @ 822845D + call EverGrandeCity_GlaciasRoom_EventScript_2724BC + return + +EverGrandeCity_GlaciasRoom_EventScript_228463:: @ 8228463 + call EverGrandeCity_GlaciasRoom_EventScript_27255F + return + +EverGrandeCity_GlaciasRoom_EventScript_228469:: @ 8228469 + lock + faceplayer + checkflag FLAG_0x4FD + goto_eq EverGrandeCity_GlaciasRoom_EventScript_228490 + playbgm MUS_SITENNOU, 0 + msgbox EverGrandeCity_GlaciasRoom_Text_2284AC, 4 + trainerbattle 3, TRAINER_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_2285B4 + goto EverGrandeCity_GlaciasRoom_EventScript_22849A + end + +EverGrandeCity_GlaciasRoom_EventScript_228490:: @ 8228490 + msgbox EverGrandeCity_GlaciasRoom_Text_228640, 4 + release + end + +EverGrandeCity_GlaciasRoom_EventScript_22849A:: @ 822849A + setflag FLAG_0x4FD + call EverGrandeCity_GlaciasRoom_EventScript_2723F8 + msgbox EverGrandeCity_GlaciasRoom_Text_228640, 4 + release + end + +EverGrandeCity_GlaciasRoom_Text_2284AC: @ 82284AC + .string "Welcome, my name is GLACIA\n" + .string "of the ELITE FOUR.\p" + .string "I’ve traveled from afar to HOENN\n" + .string "so that I may hone my ice skills.\p" + .string "But all I have seen are challenges by\n" + .string "weak TRAINERS and their POKéMON.\p" + .string "What about you?\p" + .string "It would please me to no end if I could\n" + .string "go all out against you!$" + +EverGrandeCity_GlaciasRoom_Text_2285B4: @ 82285B4 + .string "You and your POKéMON…\n" + .string "How hot your spirits burn!\p" + .string "The all-consuming heat overwhelms.\p" + .string "It’s no surprise that my icy skills\n" + .string "failed to harm you.$" + +EverGrandeCity_GlaciasRoom_Text_228640: @ 8228640 + .string "Advance to the next room.\p" + .string "And there, confirm the truly fearsome\n" + .string "side of the POKéMON LEAGUE.$" + diff --git a/data/maps/EverGrandeCity_Hall1/events.inc b/data/maps/EverGrandeCity_Hall1/events.inc new file mode 100644 index 000000000..3351b42e0 --- /dev/null +++ b/data/maps/EverGrandeCity_Hall1/events.inc @@ -0,0 +1,9 @@ +EverGrandeCity_Hall1_MapWarps: @ 853376C + 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/EverGrandeCity_Hall1/scripts.inc b/data/maps/EverGrandeCity_Hall1/scripts.inc new file mode 100644 index 000000000..960918662 --- /dev/null +++ b/data/maps/EverGrandeCity_Hall1/scripts.inc @@ -0,0 +1,12 @@ +EverGrandeCity_Hall1_MapScripts:: @ 8229569 + map_script 4, EverGrandeCity_Hall1_MapScript2_22956F + .byte 0 + +EverGrandeCity_Hall1_MapScript2_22956F: @ 822956F + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall1_EventScript_229579 + .2byte 0 + +EverGrandeCity_Hall1_EventScript_229579:: @ 8229579 + turnobject 255, 2 + end + diff --git a/data/maps/EverGrandeCity_Hall2/events.inc b/data/maps/EverGrandeCity_Hall2/events.inc new file mode 100644 index 000000000..e3eacab10 --- /dev/null +++ b/data/maps/EverGrandeCity_Hall2/events.inc @@ -0,0 +1,9 @@ +EverGrandeCity_Hall2_MapWarps: @ 85337A0 + 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/EverGrandeCity_Hall2/scripts.inc b/data/maps/EverGrandeCity_Hall2/scripts.inc new file mode 100644 index 000000000..1d76e3695 --- /dev/null +++ b/data/maps/EverGrandeCity_Hall2/scripts.inc @@ -0,0 +1,12 @@ +EverGrandeCity_Hall2_MapScripts:: @ 822957E + map_script 4, EverGrandeCity_Hall2_MapScript2_229584 + .byte 0 + +EverGrandeCity_Hall2_MapScript2_229584: @ 8229584 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall2_EventScript_22958E + .2byte 0 + +EverGrandeCity_Hall2_EventScript_22958E:: @ 822958E + turnobject 255, 2 + end + diff --git a/data/maps/EverGrandeCity_Hall3/events.inc b/data/maps/EverGrandeCity_Hall3/events.inc new file mode 100644 index 000000000..e44182b4f --- /dev/null +++ b/data/maps/EverGrandeCity_Hall3/events.inc @@ -0,0 +1,9 @@ +EverGrandeCity_Hall3_MapWarps: @ 85337D4 + 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/EverGrandeCity_Hall3/scripts.inc b/data/maps/EverGrandeCity_Hall3/scripts.inc new file mode 100644 index 000000000..a100487f5 --- /dev/null +++ b/data/maps/EverGrandeCity_Hall3/scripts.inc @@ -0,0 +1,12 @@ +EverGrandeCity_Hall3_MapScripts:: @ 8229593 + map_script 4, EverGrandeCity_Hall3_MapScript2_229599 + .byte 0 + +EverGrandeCity_Hall3_MapScript2_229599: @ 8229599 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall3_EventScript_2295A3 + .2byte 0 + +EverGrandeCity_Hall3_EventScript_2295A3:: @ 82295A3 + turnobject 255, 2 + end + diff --git a/data/maps/EverGrandeCity_Hall4/events.inc b/data/maps/EverGrandeCity_Hall4/events.inc new file mode 100644 index 000000000..b2d011234 --- /dev/null +++ b/data/maps/EverGrandeCity_Hall4/events.inc @@ -0,0 +1,7 @@ +EverGrandeCity_Hall4_MapWarps: @ 8533808 + 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/EverGrandeCity_Hall4/scripts.inc b/data/maps/EverGrandeCity_Hall4/scripts.inc new file mode 100644 index 000000000..a7c730594 --- /dev/null +++ b/data/maps/EverGrandeCity_Hall4/scripts.inc @@ -0,0 +1,12 @@ +EverGrandeCity_Hall4_MapScripts:: @ 82295A8 + map_script 4, EverGrandeCity_Hall4_MapScript2_2295AE + .byte 0 + +EverGrandeCity_Hall4_MapScript2_2295AE: @ 82295AE + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall4_EventScript_2295B8 + .2byte 0 + +EverGrandeCity_Hall4_EventScript_2295B8:: @ 82295B8 + turnobject 255, 2 + end + diff --git a/data/maps/EverGrandeCity_Hall5/events.inc b/data/maps/EverGrandeCity_Hall5/events.inc new file mode 100644 index 000000000..687920b71 --- /dev/null +++ b/data/maps/EverGrandeCity_Hall5/events.inc @@ -0,0 +1,9 @@ +EverGrandeCity_Hall5_MapWarps: @ 853382C + 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/EverGrandeCity_Hall5/scripts.inc b/data/maps/EverGrandeCity_Hall5/scripts.inc new file mode 100644 index 000000000..9ca9991e4 --- /dev/null +++ b/data/maps/EverGrandeCity_Hall5/scripts.inc @@ -0,0 +1,12 @@ +EverGrandeCity_Hall5_MapScripts:: @ 82295BD + map_script 4, EverGrandeCity_Hall5_MapScript2_2295C3 + .byte 0 + +EverGrandeCity_Hall5_MapScript2_2295C3: @ 82295C3 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall5_EventScript_2295CD + .2byte 0 + +EverGrandeCity_Hall5_EventScript_2295CD:: @ 82295CD + turnobject 255, 2 + end + diff --git a/data/maps/EverGrandeCity_HallOfFame/events.inc b/data/maps/EverGrandeCity_HallOfFame/events.inc new file mode 100644 index 000000000..50fc7fbdc --- /dev/null +++ b/data/maps/EverGrandeCity_HallOfFame/events.inc @@ -0,0 +1,9 @@ +EverGrandeCity_HallOfFame_EventObjects: @ 85338FC + 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 + +EverGrandeCity_HallOfFame_MapEvents:: @ 853391C + map_events EverGrandeCity_HallOfFame_EventObjects, EverGrandeCity_HallOfFame_MapWarps, 0x0, 0x0 + diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc new file mode 100644 index 000000000..60f0dd1ad --- /dev/null +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -0,0 +1,99 @@ +EverGrandeCity_HallOfFame_MapScripts:: @ 822982C + map_script 2, EverGrandeCity_HallOfFame_MapScript2_229846 + map_script 4, EverGrandeCity_HallOfFame_MapScript2_229837 + .byte 0 + +EverGrandeCity_HallOfFame_MapScript2_229837: @ 8229837 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_229841 + .2byte 0 + +EverGrandeCity_HallOfFame_EventScript_229841:: @ 8229841 + turnobject 255, 2 + end + +EverGrandeCity_HallOfFame_MapScript2_229846: @ 8229846 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_229850 + .2byte 0 + +EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 + lockall + applymovement 1, EverGrandeCity_HallOfFame_Movement_229901 + applymovement 255, EverGrandeCity_HallOfFame_Movement_229901 + waitmovement 0 + applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8 + applymovement 255, EverGrandeCity_HallOfFame_Movement_2725A4 + waitmovement 0 + msgbox EverGrandeCity_HallOfFame_Text_22990E, 4 + closemessage + applymovement 1, EverGrandeCity_HallOfFame_Movement_229908 + applymovement 255, EverGrandeCity_HallOfFame_Movement_229908 + waitmovement 0 + delay 20 + applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8 + applymovement 255, EverGrandeCity_HallOfFame_Movement_2725A4 + waitmovement 0 + msgbox EverGrandeCity_HallOfFame_Text_2299A3, 4 + closemessage + applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A6 + applymovement 255, EverGrandeCity_HallOfFame_Movement_2725A6 + waitmovement 0 + delay 20 + dofieldeffect 62 + waitfieldeffect 62 + delay 40 + setvar VAR_TEMP_1, 1 + call EverGrandeCity_HallOfFame_EventScript_2717C1 + checkplayergender + compare VAR_RESULT, 0 + goto_eq EverGrandeCity_HallOfFame_EventScript_2298E9 + compare VAR_RESULT, 1 + goto_eq EverGrandeCity_HallOfFame_EventScript_2298F5 + end + +EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9 + setrespawn 1 + fadescreenspeed 1, 24 + special GameClear + waitstate + releaseall + end + +EverGrandeCity_HallOfFame_EventScript_2298F5:: @ 82298F5 + setrespawn 2 + fadescreenspeed 1, 24 + special GameClear + waitstate + releaseall + end + +EverGrandeCity_HallOfFame_Movement_229901: @ 8229901 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + step_end + +EverGrandeCity_HallOfFame_Movement_229908: @ 8229908 + walk_up + walk_up + walk_up + walk_up + walk_up + step_end + +EverGrandeCity_HallOfFame_Text_22990E: @ 822990E + .string "WALLACE: This room…\p" + .string "This is where we keep records of\n" + .string "POKéMON that prevailed through\l" + .string "harsh battles.\p" + .string "It is here that the LEAGUE CHAMPIONS\n" + .string "are honored.$" + +EverGrandeCity_HallOfFame_Text_2299A3: @ 82299A3 + .string "WALLACE: Come on, let’s record your\n" + .string "name as a TRAINER who triumphed over\l" + .string "the POKéMON LEAGUE, and the names of\l" + .string "the partners who battled with you.$" + diff --git a/data/maps/EverGrandeCity_PhoebesRoom/events.inc b/data/maps/EverGrandeCity_PhoebesRoom/events.inc new file mode 100644 index 000000000..c9b5ef7fd --- /dev/null +++ b/data/maps/EverGrandeCity_PhoebesRoom/events.inc @@ -0,0 +1,10 @@ +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 + +EverGrandeCity_PhoebesRoom_MapEvents:: @ 8533674 + map_events EverGrandeCity_PhoebesRoom_EventObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0 + diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc new file mode 100644 index 000000000..679e4f663 --- /dev/null +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -0,0 +1,87 @@ +EverGrandeCity_PhoebesRoom_MapScripts:: @ 8228174 + map_script 1, EverGrandeCity_PhoebesRoom_MapScript1_2281AA + map_script 4, EverGrandeCity_PhoebesRoom_MapScript2_228184 + map_script 2, EverGrandeCity_PhoebesRoom_MapScript2_228193 + .byte 0 + +EverGrandeCity_PhoebesRoom_MapScript2_228184: @ 8228184 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_PhoebesRoom_EventScript_22818E + .2byte 0 + +EverGrandeCity_PhoebesRoom_EventScript_22818E:: @ 822818E + turnobject 255, 2 + end + +EverGrandeCity_PhoebesRoom_MapScript2_228193: @ 8228193 + map_script_2 VAR_0x409C, 1, EverGrandeCity_PhoebesRoom_EventScript_22819D + .2byte 0 + +EverGrandeCity_PhoebesRoom_EventScript_22819D:: @ 822819D + lockall + call EverGrandeCity_PhoebesRoom_EventScript_272475 + setvar VAR_0x409C, 2 + releaseall + end + +EverGrandeCity_PhoebesRoom_MapScript1_2281AA: @ 82281AA + checkflag FLAG_0x4FC + call_if 1, EverGrandeCity_PhoebesRoom_EventScript_2281BF + compare VAR_0x409C, 2 + call_if 1, EverGrandeCity_PhoebesRoom_EventScript_2281C5 + end + +EverGrandeCity_PhoebesRoom_EventScript_2281BF:: @ 82281BF + call EverGrandeCity_PhoebesRoom_EventScript_2724BC + return + +EverGrandeCity_PhoebesRoom_EventScript_2281C5:: @ 82281C5 + call EverGrandeCity_PhoebesRoom_EventScript_27255F + return + +EverGrandeCity_PhoebesRoom_EventScript_2281CB:: @ 82281CB + lock + faceplayer + checkflag FLAG_0x4FC + goto_eq EverGrandeCity_PhoebesRoom_EventScript_2281F2 + playbgm MUS_SITENNOU, 0 + msgbox EverGrandeCity_PhoebesRoom_Text_22820E, 4 + trainerbattle 3, TRAINER_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_228325 + goto EverGrandeCity_PhoebesRoom_EventScript_2281FC + end + +EverGrandeCity_PhoebesRoom_EventScript_2281F2:: @ 82281F2 + msgbox EverGrandeCity_PhoebesRoom_Text_228343, 4 + release + end + +EverGrandeCity_PhoebesRoom_EventScript_2281FC:: @ 82281FC + setflag FLAG_0x4FC + call EverGrandeCity_PhoebesRoom_EventScript_2723F8 + msgbox EverGrandeCity_PhoebesRoom_Text_228343, 4 + release + end + +EverGrandeCity_PhoebesRoom_Text_22820E: @ 822820E + .string "Ahahaha!\p" + .string "I’m PHOEBE of the ELITE FOUR.\n" + .string "I did my training on MT. PYRE.\p" + .string "While I trained, I gained the ability\n" + .string "to commune with GHOST-type POKéMON.\p" + .string "Yes, the bond I developed with POKéMON\n" + .string "is extremely tight.\p" + .string "So, come on, just try and see if you can\n" + .string "even inflict damage on my POKéMON!$" + +EverGrandeCity_PhoebesRoom_Text_228325: @ 8228325 + .string "Oh, darn.\n" + .string "I’ve gone and lost.$" + +EverGrandeCity_PhoebesRoom_Text_228343: @ 8228343 + .string "There’s a definite bond between you\n" + .string "and your POKéMON, too.\p" + .string "I didn’t recognize it, so it’s only\n" + .string "natural that I lost.\p" + .string "Yup, I’d like to see how far your bond\n" + .string "will carry you.\p" + .string "Go ahead, move on to the next room.$" + diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..1f7e26046 --- /dev/null +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc @@ -0,0 +1,14 @@ +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 + +EverGrandeCity_PokemonCenter_1F_MapWarps: @ 8533990 + 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/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..ed6e6a497 --- /dev/null +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -0,0 +1,104 @@ +EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34 + map_script 3, EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F + map_script 5, EverGrandeCity_PokemonCenter_1F_MapScript1_277C30 + .byte 0 + +EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F + setrespawn 11 + checkflag FLAG_0x1CF + call_if 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A4C + end + +EverGrandeCity_PokemonCenter_1F_EventScript_229A4C:: @ 8229A4C + checkflag FLAG_BADGE06_GET + goto_if 0, EverGrandeCity_PokemonCenter_1F_EventScript_27374E + clearflag FLAG_0x319 + return + +EverGrandeCity_PokemonCenter_1F_EventScript_229A59:: @ 8229A59 + setvar VAR_0x800B, 1 + call EverGrandeCity_PokemonCenter_1F_EventScript_27191E + waitmessage + waitbuttonpress + release + end + +EverGrandeCity_PokemonCenter_1F_EventScript_229A67:: @ 8229A67 + msgbox EverGrandeCity_PokemonCenter_1F_Text_229ADA, 2 + end + +EverGrandeCity_PokemonCenter_1F_EventScript_229A70:: @ 8229A70 + msgbox EverGrandeCity_PokemonCenter_1F_Text_229B62, 2 + end + +EverGrandeCity_PokemonCenter_1F_EventScript_229A79:: @ 8229A79 + lock + faceplayer + msgbox EverGrandeCity_PokemonCenter_1F_Text_229BF1, 4 + closemessage + compare VAR_FACING, 2 + call_if 1, EverGrandeCity_PokemonCenter_1F_EventScript_229AB6 + compare VAR_FACING, 4 + call_if 1, EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 + compare VAR_FACING, 3 + call_if 1, EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 + addvar VAR_0x40D1, 1 + setflag FLAG_0x1CF + playse SE_KAIDAN + waitse + removeobject 4 + release + end + +EverGrandeCity_PokemonCenter_1F_EventScript_229AB6:: @ 8229AB6 + applymovement 4, EverGrandeCity_PokemonCenter_1F_Movement_229ACC + waitmovement 0 + return + +EverGrandeCity_PokemonCenter_1F_EventScript_229AC1:: @ 8229AC1 + applymovement 4, EverGrandeCity_PokemonCenter_1F_Movement_229AD3 + waitmovement 0 + return + +EverGrandeCity_PokemonCenter_1F_Movement_229ACC: @ 8229ACC + walk_left + walk_down + walk_down + walk_left + walk_down + walk_down + step_end + +EverGrandeCity_PokemonCenter_1F_Movement_229AD3: @ 8229AD3 + walk_down + walk_down + walk_left + walk_left + walk_down + walk_down + step_end + +EverGrandeCity_PokemonCenter_1F_Text_229ADA: @ 8229ADA + .string "The POKéMON LEAGUE is only a short\n" + .string "distance after the VICTORY ROAD.\p" + .string "If you’ve come this far, what choice\n" + .string "do you have but to keep going?$" + +EverGrandeCity_PokemonCenter_1F_Text_229B62: @ 8229B62 + .string "The long and harrowing VICTORY ROAD…\p" + .string "It’s like reliving the path one has\n" + .string "traveled in life…\p" + .string "Believe in your POKéMON and give it\n" + .string "your very best!$" + +EverGrandeCity_PokemonCenter_1F_Text_229BF1: @ 8229BF1 + .string "SCOTT: {PLAYER}{KUN}, you’ve clawed your\n" + .string "way up to face the POKéMON LEAGUE!\p" + .string "I’m happy for you!\n" + .string "You made my cheering worthwhile!\p" + .string "{PLAYER}{KUN}, if you were to become\n" + .string "the POKéMON LEAGUE CHAMPION…\p" + .string "I’ll get in touch with you then.\p" + .string "Okay, {PLAYER}{KUN}.\n" + .string "Go for greatness!$" + diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..98671f414 --- /dev/null +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc @@ -0,0 +1,14 @@ +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 + +EverGrandeCity_PokemonCenter_2F_MapWarps: @ 8533A1C + 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/EverGrandeCity_PokemonCenter_2F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..09d382b2b --- /dev/null +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc @@ -0,0 +1,20 @@ +EverGrandeCity_PokemonCenter_2F_MapScripts:: @ 8229CE0 + map_script 2, EverGrandeCity_PokemonCenter_2F_MapScript2_276C3B + map_script 4, EverGrandeCity_PokemonCenter_2F_MapScript2_276B6C + map_script 1, EverGrandeCity_PokemonCenter_2F_MapScript1_276BBE + map_script 3, EverGrandeCity_PokemonCenter_2F_MapScript1_276ACF + .byte 0 + +EverGrandeCity_PokemonCenter_2F_EventScript_229CF5:: @ 8229CF5 + call OldaleTown_PokemonCenter_2F_EventScript_276EB7 + end + +EverGrandeCity_PokemonCenter_2F_EventScript_229CFB:: @ 8229CFB + call OldaleTown_PokemonCenter_2F_EventScript_2770B2 + end + +EverGrandeCity_PokemonCenter_2F_EventScript_229D01:: @ 8229D01 + call OldaleTown_PokemonCenter_2F_EventScript_2771DB + end + + diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc new file mode 100644 index 000000000..536dbf934 --- /dev/null +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc @@ -0,0 +1,16 @@ +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 + +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 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/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc new file mode 100644 index 000000000..f1a6ce17f --- /dev/null +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc @@ -0,0 +1,142 @@ +EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2 + map_script 3, EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD + map_script 5, EverGrandeCity_PokemonLeague_1F_MapScript1_277C30 + .byte 0 + +EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD: @ 82295DD + setrespawn 20 + setflag FLAG_LANDMARK_POKEMON_LEAGUE + checkflag FLAG_0x107 + call_if 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295ED + end + +EverGrandeCity_PokemonLeague_1F_EventScript_2295ED:: @ 82295ED + setobjectxyperm 3, 9, 2 + setobjectxyperm 4, 10, 2 + return + +EverGrandeCity_PokemonLeague_1F_EventScript_2295FC:: @ 82295FC + setvar VAR_0x800B, 1 + call EverGrandeCity_PokemonLeague_1F_EventScript_27191E + waitmessage + waitbuttonpress + release + end + +EverGrandeCity_PokemonLeague_1F_EventScript_22960A:: @ 822960A + lock + faceplayer + message gUnknown_08272A21 + waitmessage + pokemart EverGrandeCity_PokemonLeague_1F_Pokemart_229624 + msgbox gUnknown_08272A3F, 4 + release + end + + .align 2 +EverGrandeCity_PokemonLeague_1F_Pokemart_229624: @ 8229624 + .2byte ITEM_ULTRA_BALL + .2byte ITEM_HYPER_POTION + .2byte ITEM_MAX_POTION + .2byte ITEM_FULL_RESTORE + .2byte ITEM_FULL_HEAL + .2byte ITEM_REVIVE + .2byte ITEM_MAX_REPEL + .2byte ITEM_NONE + release + end + +EverGrandeCity_PokemonLeague_1F_EventScript_229636:: @ 8229636 + lockall + checkflag FLAG_0x107 + goto_eq EverGrandeCity_PokemonLeague_1F_EventScript_2296BB + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_0, 11 + call_if 4, EverGrandeCity_PokemonLeague_1F_EventScript_229698 + compare VAR_TEMP_0, 8 + call_if 3, EverGrandeCity_PokemonLeague_1F_EventScript_2296A3 + message EverGrandeCity_PokemonLeague_1F_Text_2296E8 + waitmessage + delay 120 + checkflag FLAG_BADGE06_GET + goto_if 0, EverGrandeCity_PokemonLeague_1F_EventScript_2296AE + closemessage + applymovement 3, EverGrandeCity_PokemonLeague_1F_Movement_2296E2 + applymovement 4, EverGrandeCity_PokemonLeague_1F_Movement_2296E5 + waitmovement 0 + delay 10 + playfanfare MUS_ME_BACHI + message EverGrandeCity_PokemonLeague_1F_Text_2297EF + waitmessage + waitfanfare + closemessage + moveobjectoffscreen 3 + moveobjectoffscreen 4 + setflag FLAG_0x107 + releaseall + end + +EverGrandeCity_PokemonLeague_1F_EventScript_229698:: @ 8229698 + applymovement 255, EverGrandeCity_PokemonLeague_1F_Movement_2296DA + waitmovement 0 + return + +EverGrandeCity_PokemonLeague_1F_EventScript_2296A3:: @ 82296A3 + applymovement 255, EverGrandeCity_PokemonLeague_1F_Movement_2296DE + waitmovement 0 + return + +EverGrandeCity_PokemonLeague_1F_EventScript_2296AE:: @ 82296AE + playse SE_HAZURE + msgbox EverGrandeCity_PokemonLeague_1F_Text_229787, 4 + releaseall + end + +EverGrandeCity_PokemonLeague_1F_EventScript_2296BB:: @ 82296BB + applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_1F_Movement_27259E + waitmovement 0 + msgbox EverGrandeCity_PokemonLeague_1F_Text_2297EF, 4 + closemessage + applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_1F_Movement_2725A2 + waitmovement 0 + releaseall + end + +EverGrandeCity_PokemonLeague_1F_Movement_2296DA: @ 82296DA + walk_down + walk_left + walk_in_place_fastest_up + step_end + +EverGrandeCity_PokemonLeague_1F_Movement_2296DE: @ 82296DE + walk_down + walk_right + walk_in_place_fastest_up + step_end + +EverGrandeCity_PokemonLeague_1F_Movement_2296E2: @ 82296E2 + walk_left + walk_in_place_fastest_down + step_end + +EverGrandeCity_PokemonLeague_1F_Movement_2296E5: @ 82296E5 + walk_right + walk_in_place_fastest_down + step_end + +EverGrandeCity_PokemonLeague_1F_Text_2296E8: @ 82296E8 + .string "Beyond this point, only those TRAINERS\n" + .string "who have collected all the GYM BADGES\l" + .string "are permitted to enter.\p" + .string "TRAINER, let us confirm that you have\n" + .string "all the GYM BADGES.$" + +EverGrandeCity_PokemonLeague_1F_Text_229787: @ 8229787 + .string "You haven’t obtained all the BADGES.\p" + .string "If you’re bound for the POKéMON\n" + .string "LEAGUE, you must return with them.$" + +EverGrandeCity_PokemonLeague_1F_Text_2297EF: @ 82297EF + .string "TRAINER! Believe in yourself and your\n" + .string "POKéMON, and go forth!$" + diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc new file mode 100644 index 000000000..a09e8ed31 --- /dev/null +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc @@ -0,0 +1,14 @@ +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 + +EverGrandeCity_PokemonLeague_2F_MapWarps: @ 8533AA8 + 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/EverGrandeCity_PokemonLeague_2F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc new file mode 100644 index 000000000..d3a77a051 --- /dev/null +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc @@ -0,0 +1,19 @@ +EverGrandeCity_PokemonLeague_2F_MapScripts:: @ 8229D07 + map_script 2, EverGrandeCity_PokemonLeague_2F_MapScript2_276C3B + map_script 4, EverGrandeCity_PokemonLeague_2F_MapScript2_276B6C + map_script 1, EverGrandeCity_PokemonLeague_2F_MapScript1_276BBE + map_script 3, EverGrandeCity_PokemonLeague_2F_MapScript1_276ACF + .byte 0 + +EverGrandeCity_PokemonLeague_2F_EventScript_229D1C:: @ 8229D1C + call OldaleTown_PokemonCenter_2F_EventScript_276EB7 + end + +EverGrandeCity_PokemonLeague_2F_EventScript_229D22:: @ 8229D22 + call OldaleTown_PokemonCenter_2F_EventScript_2770B2 + end + +EverGrandeCity_PokemonLeague_2F_EventScript_229D28:: @ 8229D28 + call OldaleTown_PokemonCenter_2F_EventScript_2771DB + end + diff --git a/data/maps/EverGrandeCity_SidneysRoom/events.inc b/data/maps/EverGrandeCity_SidneysRoom/events.inc new file mode 100644 index 000000000..1823af7cd --- /dev/null +++ b/data/maps/EverGrandeCity_SidneysRoom/events.inc @@ -0,0 +1,10 @@ +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 + +EverGrandeCity_SidneysRoom_MapEvents:: @ 8533638 + map_events EverGrandeCity_SidneysRoom_EventObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0 + diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc new file mode 100644 index 000000000..b2db55e36 --- /dev/null +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -0,0 +1,91 @@ +EverGrandeCity_SidneysRoom_MapScripts:: @ 8227F01 + map_script 1, EverGrandeCity_SidneysRoom_MapScript1_227F1D + map_script 4, EverGrandeCity_SidneysRoom_MapScript2_227F3E + map_script 3, EverGrandeCity_SidneysRoom_MapScript1_227F16 + map_script 2, EverGrandeCity_SidneysRoom_MapScript2_227F4D + .byte 0 + +EverGrandeCity_SidneysRoom_MapScript1_227F16: @ 8227F16 + setflag FLAG_0x1CF + setflag FLAG_0x319 + end + +EverGrandeCity_SidneysRoom_MapScript1_227F1D: @ 8227F1D + checkflag FLAG_0x4FB + call_if 1, EverGrandeCity_SidneysRoom_EventScript_227F32 + compare VAR_0x409C, 1 + call_if 1, EverGrandeCity_SidneysRoom_EventScript_227F38 + end + +EverGrandeCity_SidneysRoom_EventScript_227F32:: @ 8227F32 + call EverGrandeCity_SidneysRoom_EventScript_2724BC + return + +EverGrandeCity_SidneysRoom_EventScript_227F38:: @ 8227F38 + call EverGrandeCity_SidneysRoom_EventScript_27255F + return + +EverGrandeCity_DrakesRoom_MapScript2_227F3E: @ 8227F3E +EverGrandeCity_SidneysRoom_MapScript2_227F3E: @ 8227F3E + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_SidneysRoom_EventScript_227F48 + .2byte 0 + +EverGrandeCity_SidneysRoom_EventScript_227F48:: @ 8227F48 + turnobject 255, 2 + end + +EverGrandeCity_SidneysRoom_MapScript2_227F4D: @ 8227F4D + map_script_2 VAR_0x409C, 0, EverGrandeCity_SidneysRoom_EventScript_227F57 + .2byte 0 + +EverGrandeCity_SidneysRoom_EventScript_227F57:: @ 8227F57 + lockall + call EverGrandeCity_SidneysRoom_EventScript_272475 + setvar VAR_0x409C, 1 + releaseall + end + +EverGrandeCity_SidneysRoom_EventScript_227F64:: @ 8227F64 + lock + faceplayer + checkflag FLAG_0x4FB + goto_eq EverGrandeCity_SidneysRoom_EventScript_227F8B + playbgm MUS_SITENNOU, 0 + msgbox EverGrandeCity_SidneysRoom_Text_227FA7, 4 + trainerbattle 3, TRAINER_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_2280A2 + goto EverGrandeCity_SidneysRoom_EventScript_227F95 + end + +EverGrandeCity_SidneysRoom_EventScript_227F8B:: @ 8227F8B + msgbox EverGrandeCity_SidneysRoom_Text_2280EC, 4 + release + end + +EverGrandeCity_SidneysRoom_EventScript_227F95:: @ 8227F95 + setflag FLAG_0x4FB + call EverGrandeCity_SidneysRoom_EventScript_2723F8 + msgbox EverGrandeCity_SidneysRoom_Text_2280EC, 4 + release + end + +EverGrandeCity_SidneysRoom_Text_227FA7: @ 8227FA7 + .string "Welcome, challenger!\n" + .string "I’m SIDNEY of the ELITE FOUR.\p" + .string "I like that look you’re giving me.\n" + .string "I guess you’ll give me a good match.\l" + .string "That’s good! Looking real good!\p" + .string "All right! You and me, let’s enjoy\n" + .string "a battle that can only be staged\l" + .string "here in the POKéMON LEAGUE!$" + +EverGrandeCity_SidneysRoom_Text_2280A2: @ 82280A2 + .string "Well, how do you like that? I lost!\n" + .string "Eh, it was fun, so it doesn’t matter.$" + +EverGrandeCity_SidneysRoom_Text_2280EC: @ 82280EC + .string "Well, listen to what this loser has\n" + .string "to say.\p" + .string "You’ve got what it takes to go far.\n" + .string "Now, go on to the next room and enjoy\l" + .string "your next battle!$" + diff --git a/data/maps/FallarborTown/events.inc b/data/maps/FallarborTown/events.inc new file mode 100644 index 000000000..91a98cc28 --- /dev/null +++ b/data/maps/FallarborTown/events.inc @@ -0,0 +1,26 @@ +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 + +FallarborTown_MapWarps: @ 8527C40 + 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 + 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 + +FallarborTown_MapEvents:: @ 8527CC8 + map_events FallarborTown_EventObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents + diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc new file mode 100644 index 000000000..21cea72e1 --- /dev/null +++ b/data/maps/FallarborTown/scripts.inc @@ -0,0 +1,96 @@ +FallarborTown_MapScripts:: @ 81EB1FA + map_script 3, FallarborTown_MapScript1_1EB200 + .byte 0 + +FallarborTown_MapScript1_1EB200: @ 81EB200 + setflag FLAG_VISITED_FALLARBOR_TOWN + setvar VAR_0x4086, 0 + clearflag FLAG_0x10E + end + +FallarborTown_EventScript_1EB20C:: @ 81EB20C + lock + faceplayer + checkflag FLAG_0x08B + goto_eq FallarborTown_EventScript_1EB221 + msgbox FallarborTown_Text_1EB26B, 4 + release + end + +FallarborTown_EventScript_1EB221:: @ 81EB221 + msgbox FallarborTown_Text_1EB2DE, 4 + release + end + +FallarborTown_EventScript_1EB22B:: @ 81EB22B + msgbox FallarborTown_Text_1EB35F, 2 + end + +FallarborTown_EventScript_1EB234:: @ 81EB234 + msgbox FallarborTown_Text_1EB3CA, 2 + end + +FallarborTown_EventScript_1EB23D:: @ 81EB23D + lock + faceplayer + waitse + playmoncry SPECIES_AZURILL, 0 + msgbox FallarborTown_Text_1EB3B5, 4 + waitmoncry + release + end + +FallarborTown_EventScript_1EB250:: @ 81EB250 + msgbox FallarborTown_Text_1EB4C2, 3 + end + +FallarborTown_EventScript_1EB259:: @ 81EB259 + msgbox FallarborTown_Text_1EB4FE, 3 + end + +FallarborTown_EventScript_1EB262:: @ 81EB262 + msgbox FallarborTown_Text_1EB534, 3 + end + +FallarborTown_Text_1EB26B: @ 81EB26B + .string "Something’s happening,\n" + .string "and I don’t like it!\p" + .string "I’ve seen shady characters wandering\n" + .string "in and out of PROF. COZMO’s home…$" + +FallarborTown_Text_1EB2DE: @ 81EB2DE + .string "This region’s been known for meteors\n" + .string "since the olden days.\p" + .string "They say METEOR FALLS was gouged out\n" + .string "by a falling meteorite long ago.$" + +FallarborTown_Text_1EB35F: @ 81EB35F + .string "See! Take a look!\n" + .string "This is my precious AZURILL!\p" + .string "It’s slick and smooth and plushy, too!$" + +FallarborTown_Text_1EB3B5: @ 81EB3B5 + .string "AZURILL: Rooreelooo.$" + +FallarborTown_Text_1EB3CA: @ 81EB3CA + .string "Have you already challenged FLANNERY,\n" + .string "the LEADER of LAVARIDGE GYM?\p" + .string "The girl’s grandfather was famous.\n" + .string "He was one of the ELITE FOUR in the\l" + .string "POKéMON LEAGUE at one point.\p" + .string "It wouldn’t surprise me to see FLANNERY\n" + .string "become a great TRAINER in her own\l" + .string "right.$" + +FallarborTown_Text_1EB4C2: @ 81EB4C2 + .string "BATTLE TENT FALLARBOR SITE\n" + .string "“May the Greatest Teams Gather!â€$" + +FallarborTown_Text_1EB4FE: @ 81EB4FE + .string "FALLARBOR TOWN\n" + .string "“A farm community with small gardens.â€$" + +FallarborTown_Text_1EB534: @ 81EB534 + .string "MOVE TUTOR’S HOUSE\n" + .string "“New moves taught to POKéMON.â€$" + diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/events.inc b/data/maps/FallarborTown_BattleTentBattleRoom/events.inc new file mode 100644 index 000000000..c4e35ebbb --- /dev/null +++ b/data/maps/FallarborTown_BattleTentBattleRoom/events.inc @@ -0,0 +1,8 @@ +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 + +FallarborTown_BattleTentBattleRoom_MapEvents:: @ 852E48C + map_events FallarborTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc new file mode 100644 index 000000000..e373ff5ad --- /dev/null +++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc @@ -0,0 +1,268 @@ +FallarborTown_BattleTentBattleRoom_MapScripts:: @ 8200899 + map_script 3, FallarborTown_BattleTentBattleRoom_MapScript1_2008A9 + map_script 2, FallarborTown_BattleTentBattleRoom_MapScript2_2008DD + map_script 4, FallarborTown_BattleTentBattleRoom_MapScript2_200BB0 + .byte 0 + +FallarborTown_BattleTentBattleRoom_MapScript1_2008A9: @ 82008A9 + call FallarborTown_BattleTentBattleRoom_EventScript_2008AF + end + +FallarborTown_BattleTentBattleRoom_EventScript_2008AF:: @ 82008AF + checkplayergender + compare VAR_RESULT, 0 + goto_eq FallarborTown_BattleTentBattleRoom_EventScript_2008C7 + compare VAR_RESULT, 1 + goto_eq FallarborTown_BattleTentBattleRoom_EventScript_2008D2 + return + +FallarborTown_BattleTentBattleRoom_EventScript_2008C7:: @ 82008C7 + setvar VAR_OBJ_GFX_ID_1, 100 + setvar VAR_OBJ_GFX_ID_0, 100 + return + +FallarborTown_BattleTentBattleRoom_EventScript_2008D2:: @ 82008D2 + setvar VAR_OBJ_GFX_ID_1, 105 + setvar VAR_OBJ_GFX_ID_0, 105 + return + +FallarborTown_BattleTentBattleRoom_MapScript2_2008DD: @ 82008DD + map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentBattleRoom_EventScript_2008E7 + .2byte 0 + +FallarborTown_BattleTentBattleRoom_EventScript_2008E7:: @ 82008E7 + lockall + showobjectat 1, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM + applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B8D + waitmovement 0 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_if 5, FallarborTown_BattleTentBattleRoom_EventScript_200B73 + +FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F + setvar VAR_0x8004, 3 + special sub_8161F74 + addobject 3 + applymovement 3, FallarborTown_BattleTentBattleRoom_Movement_200B96 + waitmovement 0 + applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BA3 + playse SE_W187 + waitse + waitmovement 0 + msgbox FallarborTown_BattleTentBattleRoom_Text_257C93, 4 + setvar VAR_0x8004, 4 + special sub_81B99B4 + msgbox 0x2021fc4, 4 + waitmessage + call FallarborTown_BattleTentBattleRoom_EventScript_257B6C + switch VAR_RESULT + case 1, FallarborTown_BattleTentBattleRoom_EventScript_20099C + applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BA3 + playse SE_W173 + waitse + waitmovement 0 + setvar VAR_0x8004, 6 + special sub_81B9B80 + msgbox FallarborTown_BattleTentBattleRoom_Text_257CCE, 4 + +FallarborTown_BattleTentBattleRoom_EventScript_20097E:: @ 820097E + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 4 + special sub_81A1780 + special LoadPlayerParty + warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 + waitstate + +FallarborTown_BattleTentBattleRoom_EventScript_20099C:: @ 820099C + applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BA3 + playse SE_BAN + waitse + waitmovement 0 + msgbox FallarborTown_BattleTentBattleRoom_Text_257CB3, 4 + closemessage + +FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special sub_81A1780 + addvar VAR_RESULT, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + copyvar VAR_0x8006, VAR_RESULT + special sub_81A1780 + switch VAR_RESULT + case 3, FallarborTown_BattleTentBattleRoom_EventScript_200AF3 + applymovement 3, FallarborTown_BattleTentBattleRoom_Movement_200B9E + waitmovement 0 + removeobject 3 + applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BA6 + waitmovement 0 + applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B94 + waitmovement 0 + msgbox FallarborTown_BattleTentBattleRoom_Text_257CE9, 4 + special LoadPlayerParty + special SavePlayerParty + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 3 + special sub_81A1780 + playfanfare MUS_ME_ASA + waitfanfare + special HealPlayerParty + +FallarborTown_BattleTentBattleRoom_EventScript_200A2A:: @ 8200A2A + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special sub_81A1780 + compare VAR_RESULT, 1 + call_if 1, FallarborTown_BattleTentBattleRoom_EventScript_200B43 + compare VAR_RESULT, 2 + call_if 1, FallarborTown_BattleTentBattleRoom_EventScript_200B4A + multichoice 20, 6, 104, 1 + switch VAR_RESULT + case 0, FallarborTown_BattleTentBattleRoom_EventScript_200AD8 + case 1, FallarborTown_BattleTentBattleRoom_EventScript_200A78 + case 2, FallarborTown_BattleTentBattleRoom_EventScript_200AA6 + +FallarborTown_BattleTentBattleRoom_EventScript_200A78:: @ 8200A78 + msgbox FallarborTown_BattleTentBattleRoom_Text_257E6B, 5 + switch VAR_RESULT + case 0, FallarborTown_BattleTentBattleRoom_EventScript_200A2A + case 1, FallarborTown_BattleTentBattleRoom_EventScript_200B51 + case 127, FallarborTown_BattleTentBattleRoom_EventScript_200A2A + +FallarborTown_BattleTentBattleRoom_EventScript_200AA6:: @ 8200AA6 + message FallarborTown_BattleTentBattleRoom_Text_257E9E + waitmessage + multichoicedefault 20, 8, 94, 1, 0 + switch VAR_RESULT + case 1, FallarborTown_BattleTentBattleRoom_EventScript_200A2A + case 0, FallarborTown_BattleTentBattleRoom_EventScript_20097E + case 127, FallarborTown_BattleTentBattleRoom_EventScript_200A2A + +FallarborTown_BattleTentBattleRoom_EventScript_200AD8:: @ 8200AD8 + closemessage + applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BAB + waitmovement 0 + applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B92 + waitmovement 0 + goto FallarborTown_BattleTentBattleRoom_EventScript_20090F + waitstate + +FallarborTown_BattleTentBattleRoom_EventScript_200AF3:: @ 8200AF3 + delay 60 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 3 + special sub_81A1780 + special LoadPlayerParty + warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 + waitstate + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + special sub_81A5238 + compare VAR_RESULT, 9999 + goto_eq FallarborTown_BattleTentBattleRoom_EventScript_2009B3 + addvar VAR_RESULT, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + copyvar VAR_0x8006, VAR_RESULT + special sub_81A5238 + +FallarborTown_BattleTentBattleRoom_EventScript_200B43:: @ 8200B43 + message FallarborTown_BattleTentBattleRoom_Text_257D17 + waitmessage + return + +FallarborTown_BattleTentBattleRoom_EventScript_200B4A:: @ 8200B4A + message FallarborTown_BattleTentBattleRoom_Text_257D50 + waitmessage + return + +FallarborTown_BattleTentBattleRoom_EventScript_200B51:: @ 8200B51 + message FallarborTown_BattleTentBattleRoom_Text_257EDB + waitmessage + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 2 + special sub_81B9B80 + playse SE_SAVE + waitse + fadescreen 1 + setvar VAR_0x8004, 4 + special sub_81A1780 + end + +FallarborTown_BattleTentBattleRoom_EventScript_200B73:: @ 8200B73 + applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BA6 + waitmovement 0 + applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B94 + waitmovement 0 + goto FallarborTown_BattleTentBattleRoom_EventScript_200A2A + end + +FallarborTown_BattleTentBattleRoom_Movement_200B8D: @ 8200B8D + walk_up + walk_up + walk_up + walk_in_place_fastest_right + step_end + +FallarborTown_BattleTentBattleRoom_Movement_200B92: @ 8200B92 + walk_in_place_fastest_right + step_end + +FallarborTown_BattleTentBattleRoom_Movement_200B94: @ 8200B94 + walk_in_place_fastest_left + step_end + +FallarborTown_BattleTentBattleRoom_Movement_200B96: @ 8200B96 + walk_down + walk_down + walk_down + walk_down + walk_in_place_fastest_left + step_end + +FallarborTown_BattleTentBattleRoom_Movement_200B9C: @ 8200B9C + walk_left + step_end + +FallarborTown_BattleTentBattleRoom_Movement_200B9E: @ 8200B9E + walk_up + walk_up + walk_up + walk_up + step_end + +FallarborTown_BattleTentBattleRoom_Movement_200BA3: @ 8200BA3 + disable_jump_landing_ground_effect + jump_in_place_down + step_end + +FallarborTown_BattleTentBattleRoom_Movement_200BA6: @ 8200BA6 + walk_down + walk_down + walk_down + walk_in_place_fastest_right + step_end + +FallarborTown_BattleTentBattleRoom_Movement_200BAB: @ 8200BAB + walk_up + walk_up + walk_up + walk_in_place_fastest_down + step_end + +FallarborTown_BattleTentBattleRoom_MapScript2_200BB0: @ 8200BB0 + map_script_2 VAR_TEMP_1, 0, FallarborTown_BattleTentBattleRoom_EventScript_200BBA + .2byte 0 + +FallarborTown_BattleTentBattleRoom_EventScript_200BBA:: @ 8200BBA + 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/maps/FallarborTown_BattleTentCorridor/events.inc b/data/maps/FallarborTown_BattleTentCorridor/events.inc new file mode 100644 index 000000000..471ca66a3 --- /dev/null +++ b/data/maps/FallarborTown_BattleTentCorridor/events.inc @@ -0,0 +1,6 @@ +FallarborTown_BattleTentCorridor_EventObjects: @ 852E418 + 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/FallarborTown_BattleTentCorridor/scripts.inc b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc new file mode 100644 index 000000000..f1a144a14 --- /dev/null +++ b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc @@ -0,0 +1,64 @@ +FallarborTown_BattleTentCorridor_MapScripts:: @ 82006A7 + map_script 2, FallarborTown_BattleTentCorridor_MapScript2_2006AD + .byte 0 + +FallarborTown_BattleTentCorridor_MapScript2_2006AD: @ 82006AD + map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentCorridor_EventScript_2006B7 + .2byte 0 + +FallarborTown_BattleTentCorridor_EventScript_2006B7:: @ 82006B7 + lockall + setvar VAR_TEMP_0, 1 + applymovement 1, FallarborTown_BattleTentCorridor_Movement_2006FB + applymovement 255, FallarborTown_BattleTentCorridor_Movement_2006FB + waitmovement 0 + opendoor 2, 1 + waitdooranim + applymovement 1, FallarborTown_BattleTentCorridor_Movement_200701 + applymovement 255, FallarborTown_BattleTentCorridor_Movement_200700 + waitmovement 0 + closedoor 2, 1 + waitdooranim + setvar VAR_0x8006, 0 + warp MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM, 255, 4, 4 + waitstate + releaseall + end + +FallarborTown_BattleTentCorridor_Movement_2006FB: @ 82006FB + walk_up + walk_up + walk_up + walk_up + step_end + +FallarborTown_BattleTentCorridor_Movement_200700: @ 8200700 + walk_up + +FallarborTown_BattleTentCorridor_Movement_200701: @ 8200701 + walk_up + set_invisible + step_end + +FallarborTown_BattleTentCorridor_Text_200704: @ 8200704 + .string "We do all right in the preliminary round,\n" + .string "but we can never win the appeals…\p" + .string "Maybe it means I have to watch what\n" + .string "other contestants are doing…$" + +FallarborTown_BattleTentCorridor_Text_200791: @ 8200791 + .string "See!\n" + .string "My POKéMON won all these RIBBONS!\p" + .string "Have your POKéMON earned any RIBBONS?\n" + .string "You can check them on your POKéNAV.$" + +FallarborTown_BattleTentCorridor_Text_200802: @ 8200802 + .string "I can’t beat GYM LEADERS…\p" + .string "I can’t win any CONTESTS…\p" + .string "I’ve been here, there, and everywhere,\n" + .string "and it’s all for naught…$" + +FallarborTown_BattleTentCorridor_Text_200876: @ 8200876 + .string "POKéMON CONTESTS\n" + .string "SUPER RANK STAGE!$" + diff --git a/data/maps/FallarborTown_BattleTentLobby/events.inc b/data/maps/FallarborTown_BattleTentLobby/events.inc new file mode 100644 index 000000000..570287ae3 --- /dev/null +++ b/data/maps/FallarborTown_BattleTentLobby/events.inc @@ -0,0 +1,17 @@ +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 + +FallarborTown_BattleTentLobby_MapWarps: @ 852E3E8 + 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 + +FallarborTown_BattleTentLobby_MapEvents:: @ 852E404 + map_events FallarborTown_BattleTentLobby_EventObjects, FallarborTown_BattleTentLobby_MapWarps, 0x0, FallarborTown_BattleTentLobby_MapBGEvents + diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc new file mode 100644 index 000000000..00efa5394 --- /dev/null +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -0,0 +1,402 @@ +FallarborTown_BattleTentLobby_MapScripts:: @ 81FFE66 + map_script 2, FallarborTown_BattleTentLobby_MapScript2_1FFE85 + map_script 4, FallarborTown_BattleTentLobby_MapScript2_1FFE71 + .byte 0 + +FallarborTown_BattleTentLobby_MapScript2_1FFE71: @ 81FFE71 + map_script_2 VAR_TEMP_1, 0, FallarborTown_BattleTentLobby_EventScript_1FFE7B + .2byte 0 + +FallarborTown_BattleTentLobby_EventScript_1FFE7B:: @ 81FFE7B + setvar VAR_TEMP_1, 1 + turnobject 255, 2 + end + +FallarborTown_BattleTentLobby_MapScript2_1FFE85: @ 81FFE85 + map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentLobby_EventScript_1FFEAF + map_script_2 VAR_TEMP_0, 1, FallarborTown_BattleTentLobby_EventScript_1FFEB8 + map_script_2 VAR_TEMP_0, 2, FallarborTown_BattleTentLobby_EventScript_1FFFCD + map_script_2 VAR_TEMP_0, 3, FallarborTown_BattleTentLobby_EventScript_1FFEED + map_script_2 VAR_TEMP_0, 4, FallarborTown_BattleTentLobby_EventScript_1FFF93 + .2byte 0 + +FallarborTown_BattleTentLobby_EventScript_1FFEAF:: @ 81FFEAF + setvar VAR_0x8004, 0 + special sub_81A1780 + end + +FallarborTown_BattleTentLobby_EventScript_1FFEB8:: @ 81FFEB8 + lockall + msgbox FallarborTown_BattleTentLobby_Text_2C4DED, 4 + closemessage + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_TEMP_0, 255 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 0 + special sub_81A1780 + releaseall + end + +FallarborTown_BattleTentLobby_EventScript_1FFEED:: @ 81FFEED + lockall + msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, 4 + message FallarborTown_BattleTentLobby_Text_2C4EFF + waitmessage + setvar VAR_0x8004, 4 + special sub_81B9B80 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 0 + special sub_81B9B80 + playse SE_SAVE + waitse + +FallarborTown_BattleTentLobby_EventScript_1FFF27:: @ 81FFF27 + msgbox FallarborTown_BattleTentLobby_Text_2C4F22, 4 + setvar VAR_0x8004, 5 + special sub_81B9B80 + switch VAR_RESULT + case 0, FallarborTown_BattleTentLobby_EventScript_1FFF73 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 0 + special sub_81A1780 + message FallarborTown_BattleTentLobby_Text_2C4F69 + waitmessage + playfanfare MUS_FANFA4 + waitfanfare + msgbox FallarborTown_BattleTentLobby_Text_2C501F, 4 + closemessage + setvar VAR_TEMP_0, 255 + releaseall + end + +FallarborTown_BattleTentLobby_EventScript_1FFF73:: @ 81FFF73 + msgbox FallarborTown_BattleTentLobby_Text_2C4F83, 4 + waitmessage + closemessage + setvar VAR_TEMP_0, 255 + releaseall + end + +FallarborTown_BattleTentLobby_EventScript_1FFF84:: @ 81FFF84 + lockall + msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, 4 + goto FallarborTown_BattleTentLobby_EventScript_1FFF27 + end + +FallarborTown_BattleTentLobby_EventScript_1FFF93:: @ 81FFF93 + lockall + message FallarborTown_BattleTentLobby_Text_2C4FD7 + waitmessage + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 0 + special sub_81B9B80 + playse SE_SAVE + waitse + msgbox FallarborTown_BattleTentLobby_Text_2C501F, 4 + closemessage + setvar VAR_TEMP_0, 255 + releaseall + end + +FallarborTown_BattleTentLobby_EventScript_1FFFCD:: @ 81FFFCD + lockall + message FallarborTown_BattleTentLobby_Text_2C504C + waitmessage + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 1 + special sub_81B9B80 + playse SE_SAVE + waitse + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_TEMP_0, 255 + goto FallarborTown_BattleTentLobby_EventScript_20013C + +FallarborTown_BattleTentLobby_EventScript_200001:: @ 8200001 + lock + faceplayer + setvar VAR_0x8004, 1 + special sub_81B9B80 + compare VAR_RESULT, 0 + goto_if 5, FallarborTown_BattleTentLobby_EventScript_1FFF84 + special SavePlayerParty + msgbox FallarborTown_BattleTentLobby_Text_2C47EB, 4 + +FallarborTown_BattleTentLobby_EventScript_200021:: @ 8200021 + message FallarborTown_BattleTentLobby_Text_2C4843 + waitmessage + multichoice 17, 6, 23, 0 + switch VAR_RESULT + case 0, FallarborTown_BattleTentLobby_EventScript_20005D + case 1, FallarborTown_BattleTentLobby_EventScript_200169 + case 2, FallarborTown_BattleTentLobby_EventScript_2001C5 + case 127, FallarborTown_BattleTentLobby_EventScript_2001C5 + +FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D + setvar VAR_FRONTIER_FACILITY, 3 + setvar VAR_0x40CE, 0 + setvar VAR_RESULT, 2 + setvar VAR_0x8004, 15 + special sub_81A1780 + compare VAR_0x8004, 1 + goto_eq FallarborTown_BattleTentLobby_EventScript_200176 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 2 + special sub_81A1780 + msgbox FallarborTown_BattleTentLobby_Text_2C4BC8, 4 + fadescreen 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + special sub_80F9490 + waitstate + compare VAR_RESULT, 0 + goto_eq FallarborTown_BattleTentLobby_EventScript_2001C2 + msgbox FallarborTown_BattleTentLobby_Text_2C4B35, 5 + switch VAR_RESULT + case 0, FallarborTown_BattleTentLobby_EventScript_2001C2 + case 1, FallarborTown_BattleTentLobby_EventScript_2000E2 + case 127, FallarborTown_BattleTentLobby_EventScript_2001C2 + +FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2 + setvar VAR_TEMP_0, 0 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 4 + special sub_81A1780 + setvar VAR_0x8004, 0 + special sub_81B9B80 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 1 + special sub_81A1780 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 0 + special sub_81A1780 + special LoadPlayerParty + closemessage + delay 2 + call FallarborTown_BattleTentLobby_EventScript_27134F + setvar VAR_TEMP_0, 255 + compare VAR_RESULT, 0 + goto_eq FallarborTown_BattleTentLobby_EventScript_2001AB + +FallarborTown_BattleTentLobby_EventScript_20013C:: @ 820013C + special SavePlayerParty + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 3 + special sub_81A1780 + msgbox FallarborTown_BattleTentLobby_Text_2C4DC3, 4 + closemessage + call FallarborTown_BattleTentLobby_EventScript_2001CF + warp MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7 + setvar VAR_TEMP_0, 0 + waitstate + end + +FallarborTown_BattleTentLobby_EventScript_200169:: @ 8200169 + msgbox FallarborTown_BattleTentLobby_Text_2C48AC, 4 + goto FallarborTown_BattleTentLobby_EventScript_200021 + +FallarborTown_BattleTentLobby_EventScript_200176:: @ 8200176 + switch VAR_RESULT + case 0, FallarborTown_BattleTentLobby_EventScript_200191 + case 1, FallarborTown_BattleTentLobby_EventScript_20019E + +FallarborTown_BattleTentLobby_EventScript_200191:: @ 8200191 + msgbox FallarborTown_BattleTentLobby_Text_2C4BFA, 4 + goto FallarborTown_BattleTentLobby_EventScript_2001CD + +FallarborTown_BattleTentLobby_EventScript_20019E:: @ 820019E + msgbox FallarborTown_BattleTentLobby_Text_2C4CC0, 4 + goto FallarborTown_BattleTentLobby_EventScript_2001CD + +FallarborTown_BattleTentLobby_EventScript_2001AB:: @ 82001AB + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 0 + special sub_81A1780 + goto FallarborTown_BattleTentLobby_EventScript_2001C5 + +FallarborTown_BattleTentLobby_EventScript_2001C2:: @ 82001C2 + special LoadPlayerParty + +FallarborTown_BattleTentLobby_EventScript_2001C5:: @ 82001C5 + msgbox FallarborTown_BattleTentLobby_Text_2C487F, 4 + +FallarborTown_BattleTentLobby_EventScript_2001CD:: @ 82001CD + release + end + +FallarborTown_BattleTentLobby_EventScript_2001CF:: @ 82001CF + applymovement 1, FallarborTown_BattleTentLobby_Movement_2001FE + applymovement 255, FallarborTown_BattleTentLobby_Movement_200205 + waitmovement 0 + opendoor 6, 1 + waitdooranim + applymovement 1, FallarborTown_BattleTentLobby_Movement_200202 + applymovement 255, FallarborTown_BattleTentLobby_Movement_200209 + waitmovement 0 + closedoor 6, 1 + waitdooranim + return + +FallarborTown_BattleTentLobby_Movement_2001FE: @ 82001FE + walk_up + walk_up + walk_up + step_end + +FallarborTown_BattleTentLobby_Movement_200202: @ 8200202 + walk_up + set_invisible + step_end + +FallarborTown_BattleTentLobby_Movement_200205: @ 8200205 + walk_up + walk_up + walk_up + step_end + +FallarborTown_BattleTentLobby_Movement_200209: @ 8200209 + walk_up + walk_up + set_invisible + step_end + +FallarborTown_BattleTentLobby_EventScript_20020D:: @ 820020D + msgbox FallarborTown_BattleTentLobby_Text_20045A, 2 + end + +FallarborTown_BattleTentLobby_EventScript_200216:: @ 8200216 + msgbox FallarborTown_BattleTentLobby_Text_200304, 2 + end + +FallarborTown_BattleTentLobby_EventScript_20021F:: @ 820021F + msgbox FallarborTown_BattleTentLobby_Text_200382, 2 + end + +FallarborTown_BattleTentLobby_EventScript_200228:: @ 8200228 + lock + faceplayer + checkflag FLAG_0x1CD + goto_eq FallarborTown_BattleTentLobby_EventScript_200245 + msgbox FallarborTown_BattleTentLobby_Text_200501, 4 + addvar VAR_0x40D1, 1 + setflag FLAG_0x1CD + release + end + +FallarborTown_BattleTentLobby_EventScript_200245:: @ 8200245 + msgbox FallarborTown_BattleTentLobby_Text_200653, 4 + release + end + +FallarborTown_BattleTentLobby_EventScript_20024F:: @ 820024F + lockall + msgbox FallarborTown_BattleTentLobby_Text_256DB8, 4 + goto FallarborTown_BattleTentLobby_EventScript_20025E + end + +FallarborTown_BattleTentLobby_EventScript_20025E:: @ 820025E + message FallarborTown_BattleTentLobby_Text_256DDF + waitmessage + multichoice 17, 0, 112, 0 + switch VAR_RESULT + case 0, FallarborTown_BattleTentLobby_EventScript_2002BC + case 1, FallarborTown_BattleTentLobby_EventScript_2002CA + case 2, FallarborTown_BattleTentLobby_EventScript_2002D8 + case 3, FallarborTown_BattleTentLobby_EventScript_2002E6 + case 4, FallarborTown_BattleTentLobby_EventScript_2002F4 + case 5, FallarborTown_BattleTentLobby_EventScript_200302 + case 127, FallarborTown_BattleTentLobby_EventScript_200302 + end + +FallarborTown_BattleTentLobby_EventScript_2002BC:: @ 82002BC + msgbox FallarborTown_BattleTentLobby_Text_2C67CD, 4 + goto FallarborTown_BattleTentLobby_EventScript_20025E + end + +FallarborTown_BattleTentLobby_EventScript_2002CA:: @ 82002CA + msgbox FallarborTown_BattleTentLobby_Text_256E02, 4 + goto FallarborTown_BattleTentLobby_EventScript_20025E + end + +FallarborTown_BattleTentLobby_EventScript_2002D8:: @ 82002D8 + msgbox FallarborTown_BattleTentLobby_Text_256F43, 4 + goto FallarborTown_BattleTentLobby_EventScript_20025E + end + +FallarborTown_BattleTentLobby_EventScript_2002E6:: @ 82002E6 + msgbox FallarborTown_BattleTentLobby_Text_256FF2, 4 + goto FallarborTown_BattleTentLobby_EventScript_20025E + end + +FallarborTown_BattleTentLobby_EventScript_2002F4:: @ 82002F4 + msgbox FallarborTown_BattleTentLobby_Text_257202, 4 + goto FallarborTown_BattleTentLobby_EventScript_20025E + end + +FallarborTown_BattleTentLobby_EventScript_200302:: @ 8200302 + releaseall + end + +FallarborTown_BattleTentLobby_Text_200304: @ 8200304 + .string "Fufufufufu.\p" + .string "I’m going to make everyone think\n" + .string "I’m just a kid and let them play down.\p" + .string "Then, I’ll shock them and grab\n" + .string "the title!$" + +FallarborTown_BattleTentLobby_Text_200382: @ 8200382 + .string "You know how BATTLE TENTS offer\n" + .string "different events in different towns?\p" + .string "My favorite is definitely the BATTLE\n" + .string "TENT in FALLARBOR TOWN.\p" + .string "I think it’s fantastic how TRAINERS\n" + .string "try to win with all their faith in\l" + .string "their POKéMON.$" + +FallarborTown_BattleTentLobby_Text_20045A: @ 820045A + .string "I heard something about some tent,\n" + .string "so I came to camp out.\p" + .string "I didn’t know that tents these days\n" + .string "are so luxurious!\p" + .string "Since I’m here, I may as well try\n" + .string "my hand at battling!$" + +FallarborTown_BattleTentLobby_Text_200501: @ 8200501 + .string "SCOTT: Hi, {PLAYER}{KUN}!\n" + .string "So you came out to this BATTLE TENT!\p" + .string "The people in these parts tend to be\n" + .string "easygoing and laid-back.\p" + .string "But, you see, what I’m looking for are\n" + .string "people with…\p" + .string "How should I say this?\p" + .string "Someone bursting with the desire\n" + .string "and the drive to win.\p" + .string "If there were a TRAINER like that,\n" + .string "I’d immediately…\p" + .string "Whoops! Never mind!\n" + .string "Keep working at it!$" + +FallarborTown_BattleTentLobby_Text_200653: @ 8200653 + .string "SCOTT: Instead of wasting your\n" + .string "time with the likes of me, why not\l" + .string "make a challenge?$" + diff --git a/data/maps/FallarborTown_House1/events.inc b/data/maps/FallarborTown_House1/events.inc new file mode 100644 index 000000000..5c2323b74 --- /dev/null +++ b/data/maps/FallarborTown_House1/events.inc @@ -0,0 +1,11 @@ +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 + +FallarborTown_House1_MapWarps: @ 852E5E8 + 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/FallarborTown_House1/scripts.inc b/data/maps/FallarborTown_House1/scripts.inc new file mode 100644 index 000000000..47459f8d5 --- /dev/null +++ b/data/maps/FallarborTown_House1/scripts.inc @@ -0,0 +1,126 @@ +FallarborTown_House1_MapScripts:: @ 8200F12 + .byte 0 + +FallarborTown_House1_EventScript_200F13:: @ 8200F13 + lock + faceplayer + checkflag FLAG_0x0E5 + goto_eq FallarborTown_House1_EventScript_200FB2 + checkitem ITEM_METEORITE, 1 + compare VAR_RESULT, 1 + goto_eq FallarborTown_House1_EventScript_200F38 + msgbox FallarborTown_House1_Text_200FEE, 4 + release + end + +FallarborTown_House1_EventScript_200F38:: @ 8200F38 + checkflag FLAG_0x002 + call_if 0, FallarborTown_House1_EventScript_200F8B + checkflag FLAG_0x002 + call_if 1, FallarborTown_House1_EventScript_200F9C + compare VAR_RESULT, 0 + goto_eq FallarborTown_House1_EventScript_200FA5 + msgbox FallarborTown_House1_Text_201159, 4 + giveitem_std ITEM_TM27 + compare VAR_RESULT, 0 + goto_eq FallarborTown_House1_EventScript_272054 + setvar VAR_0x8004, 280 + call FallarborTown_House1_EventScript_2723E4 + setflag FLAG_0x0E5 + msgbox FallarborTown_House1_Text_2011A5, 4 + release + end + +FallarborTown_House1_EventScript_200F8B:: @ 8200F8B + msgbox FallarborTown_House1_Text_200FEE, 4 + msgbox FallarborTown_House1_Text_2010A2, 5 + return + +FallarborTown_House1_EventScript_200F9C:: @ 8200F9C + msgbox FallarborTown_House1_Text_201249, 5 + return + +FallarborTown_House1_EventScript_200FA5:: @ 8200FA5 + setflag FLAG_0x002 + msgbox FallarborTown_House1_Text_201212, 4 + release + end + +FallarborTown_House1_EventScript_200FB2:: @ 8200FB2 + msgbox FallarborTown_House1_Text_2011A5, 4 + release + end + +FallarborTown_House1_EventScript_200FBC:: @ 8200FBC + lock + faceplayer + checkflag FLAG_0x0E5 + goto_eq FallarborTown_House1_EventScript_200FE4 + checkflag FLAG_0x08B + goto_eq FallarborTown_House1_EventScript_200FDA + msgbox FallarborTown_House1_Text_2012BC, 4 + release + end + +FallarborTown_House1_EventScript_200FDA:: @ 8200FDA + msgbox FallarborTown_House1_Text_201310, 4 + release + end + +FallarborTown_House1_EventScript_200FE4:: @ 8200FE4 + msgbox FallarborTown_House1_Text_20134B, 4 + release + end + +FallarborTown_House1_Text_200FEE: @ 8200FEE + .string "PROF. COZMO: Oh…\n" + .string "I never should have let myself be\l" + .string "conned into telling TEAM MAGMA where\l" + .string "you can find METEORITES…\p" + .string "That METEORITE from METEOR FALLS…\n" + .string "It’s never going to be mine now…$" + +FallarborTown_House1_Text_2010A2: @ 82010A2 + .string "Oh!\n" + .string "Hah?\p" + .string "That item…\p" + .string "Could it be?\p" + .string "Is it the METEORITE that TEAM MAGMA\n" + .string "took from METEOR FALLS?\p" + .string "Please, may I have it?\p" + .string "I’m not asking for it for free.\n" + .string "How about in exchange for this TM?$" + +FallarborTown_House1_Text_201159: @ 8201159 + .string "PROF. COZMO: This TM, it represents\n" + .string "my feeling of gratitude.\l" + .string "Please use it!$" + +FallarborTown_House1_Text_2011A5: @ 82011A5 + .string "PROF. COZMO: Oh, I can’t believe it.\n" + .string "This is really, really great!\p" + .string "This is really going to help my research!$" + +FallarborTown_House1_Text_201212: @ 8201212 + .string "PROF. COZMO: Oh, but…\n" + .string "I’m crushed with disappointment…$" + +FallarborTown_House1_Text_201249: @ 8201249 + .string "PROF. COZMO: Please, may I have that\n" + .string "METEORITE?\p" + .string "I’m not asking for it for free.\n" + .string "How about in exchange for this TM?$" + +FallarborTown_House1_Text_2012BC: @ 82012BC + .string "PROF. COZMO went off to METEOR FALLS\n" + .string "on ROUTE 114 with some people from\l" + .string "TEAM MAGMA.$" + +FallarborTown_House1_Text_201310: @ 8201310 + .string "Poor PROF. COZMO…\n" + .string "He’s so depressed… I feel sorry for him.$" + +FallarborTown_House1_Text_20134B: @ 820134B + .string "Look at PROF. COZMO…\n" + .string "He’s so happy! I think it’s cute.$" + diff --git a/data/maps/FallarborTown_House2/events.inc b/data/maps/FallarborTown_House2/events.inc new file mode 100644 index 000000000..342e2e60b --- /dev/null +++ b/data/maps/FallarborTown_House2/events.inc @@ -0,0 +1,10 @@ +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 + +FallarborTown_House2_MapWarps: @ 852E624 + 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/FallarborTown_House2/scripts.inc b/data/maps/FallarborTown_House2/scripts.inc new file mode 100644 index 000000000..b78756e0a --- /dev/null +++ b/data/maps/FallarborTown_House2/scripts.inc @@ -0,0 +1,103 @@ +FallarborTown_House2_MapScripts:: @ 8201382 + .byte 0 + +FallarborTown_House2_EventScript_201383:: @ 8201383 + lockall + applymovement 1, FallarborTown_House2_Movement_27259E + waitmovement 0 + checkflag FLAG_0x001 + goto_eq FallarborTown_House2_EventScript_2013A8 + msgbox FallarborTown_House2_Text_20145C, 4 + setflag FLAG_0x001 + goto FallarborTown_House2_EventScript_2013A8 + end + +FallarborTown_House2_EventScript_2013A8:: @ 82013A8 + checkitem ITEM_HEART_SCALE, 1 + compare VAR_RESULT, 0 + goto_eq FallarborTown_House2_EventScript_201452 + msgbox FallarborTown_House2_Text_201541, 5 + switch VAR_RESULT + case 0, FallarborTown_House2_EventScript_201452 + goto FallarborTown_House2_EventScript_2013D6 + end + +FallarborTown_House2_EventScript_2013D6:: @ 82013D6 + msgbox FallarborTown_House2_Text_2015A5, 4 + special sub_81B951C + waitstate + compare VAR_0x8004, 255 + goto_eq FallarborTown_House2_EventScript_201452 + special sub_81B98DC + compare VAR_RESULT, 1 + goto_eq FallarborTown_House2_EventScript_201444 + compare VAR_0x8005, 0 + goto_eq FallarborTown_House2_EventScript_201436 + goto FallarborTown_House2_EventScript_20140C + end + +FallarborTown_House2_EventScript_20140C:: @ 820140C + msgbox FallarborTown_House2_Text_2015C3, 4 + special sub_8160638 + waitstate + compare VAR_0x8004, 0 + goto_eq FallarborTown_House2_EventScript_2013D6 + msgbox FallarborTown_House2_Text_201627, 4 + takeitem ITEM_HEART_SCALE, 1 + goto FallarborTown_House2_EventScript_201452 + end + +FallarborTown_House2_EventScript_201436:: @ 8201436 + msgbox FallarborTown_House2_Text_2015DE, 4 + goto FallarborTown_House2_EventScript_2013D6 + end + +FallarborTown_House2_EventScript_201444:: @ 8201444 + msgbox FallarborTown_House2_Text_201697, 4 + goto FallarborTown_House2_EventScript_2013D6 + end + +FallarborTown_House2_EventScript_201452:: @ 8201452 + msgbox FallarborTown_House2_Text_201653, 4 + releaseall + end + +FallarborTown_House2_Text_20145C: @ 820145C + .string "I’m the MOVE TUTOR.\p" + .string "I know all the moves that POKéMON\n" + .string "learn--every one of them--and I can\l" + .string "teach POKéMON those moves.\p" + .string "I can teach a move to a POKéMON\n" + .string "of yours if you’d like.\p" + .string "I’ll do it for a HEART SCALE.\n" + .string "I’m collecting those now.$" + +FallarborTown_House2_Text_201541: @ 8201541 + .string "Oh! That’s it! That’s an honest to\n" + .string "goodness HEART SCALE!\p" + .string "Let me guess, you want me to teach\n" + .string "a move?$" + +FallarborTown_House2_Text_2015A5: @ 82015A5 + .string "Which POKéMON needs tutoring?$" + +FallarborTown_House2_Text_2015C3: @ 82015C3 + .string "Which move should I teach?$" + +FallarborTown_House2_Text_2015DE: @ 82015DE + .string "Sorry…\p" + .string "It doesn’t appear as if I have any move\n" + .string "I can teach that POKéMON.$" + +FallarborTown_House2_Text_201627: @ 8201627 + .string "{PLAYER} handed over one HEART SCALE\n" + .string "in exchange.$" + +FallarborTown_House2_Text_201653: @ 8201653 + .string "If your POKéMON need to learn a move,\n" + .string "come back with a HEART SCALE.$" + +FallarborTown_House2_Text_201697: @ 8201697 + .string "Hunh? There isn’t a single move that\n" + .string "I can teach an EGG.$" + diff --git a/data/maps/FallarborTown_Mart/events.inc b/data/maps/FallarborTown_Mart/events.inc new file mode 100644 index 000000000..6d7188c6a --- /dev/null +++ b/data/maps/FallarborTown_Mart/events.inc @@ -0,0 +1,14 @@ +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 + +FallarborTown_Mart_MapWarps: @ 852E34C + 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/FallarborTown_Mart/scripts.inc b/data/maps/FallarborTown_Mart/scripts.inc new file mode 100644 index 000000000..dbaf33f4e --- /dev/null +++ b/data/maps/FallarborTown_Mart/scripts.inc @@ -0,0 +1,66 @@ +FallarborTown_Mart_MapScripts:: @ 81FFCBE + .byte 0 + +FallarborTown_Mart_EventScript_1FFCBF:: @ 81FFCBF + lock + faceplayer + message gUnknown_08272A21 + waitmessage + pokemart FallarborTown_Mart_Pokemart_1FFCD8 + msgbox gUnknown_08272A3F, 4 + release + end + + .align 2 +FallarborTown_Mart_Pokemart_1FFCD8: @ 81FFCD8 + .2byte ITEM_GREAT_BALL + .2byte ITEM_SUPER_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_SUPER_REPEL + .2byte ITEM_X_SPECIAL + .2byte ITEM_X_SPEED + .2byte ITEM_X_ATTACK + .2byte ITEM_X_DEFEND + .2byte ITEM_DIRE_HIT + .2byte ITEM_GUARD_SPEC + .2byte ITEM_NONE + release + end + +FallarborTown_Mart_EventScript_1FFCF4:: @ 81FFCF4 + msgbox FallarborTown_Mart_Text_1FFD19, 2 + end + +FallarborTown_Mart_EventScript_1FFCFD:: @ 81FFCFD + msgbox FallarborTown_Mart_Text_1FFE09, 2 + end + +FallarborTown_Mart_EventScript_1FFD06:: @ 81FFD06 + lock + faceplayer + waitse + playmoncry SPECIES_SKITTY, 0 + msgbox FallarborTown_Mart_Text_1FFDFA, 4 + waitmoncry + release + end + +FallarborTown_Mart_Text_1FFD19: @ 81FFD19 + .string "I’m having a hard time deciding if I\n" + .string "should make my SKITTY evolve or not.\p" + .string "I only have to use this MOON STONE,\n" + .string "but it’s so hard to decide…\p" + .string "If I make it evolve, it will become\n" + .string "much stronger.\p" + .string "But it will look so different, too.$" + +FallarborTown_Mart_Text_1FFDFA: @ 81FFDFA + .string "SKITTY: Miyao?$" + +FallarborTown_Mart_Text_1FFE09: @ 81FFE09 + .string "This NUGGET I found here…\n" + .string "I suppose I’ll have to sell it, seeing\l" + .string "as how it has no other use.$" + diff --git a/data/maps/FallarborTown_PokemonCenter_1F/events.inc b/data/maps/FallarborTown_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..368190914 --- /dev/null +++ b/data/maps/FallarborTown_PokemonCenter_1F/events.inc @@ -0,0 +1,14 @@ +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 + +FallarborTown_PokemonCenter_1F_MapWarps: @ 852E500 + 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/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..15f5d2b9e --- /dev/null +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -0,0 +1,111 @@ +FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD + map_script 3, FallarborTown_PokemonCenter_1F_MapScript1_200BD8 + map_script 5, FallarborTown_PokemonCenter_1F_MapScript1_277C30 + .byte 0 + +FallarborTown_PokemonCenter_1F_MapScript1_200BD8: @ 8200BD8 + setrespawn 17 + call FallarborTown_PokemonCenter_1F_EventScript_2718DE + end + +FallarborTown_PokemonCenter_1F_EventScript_200BE1:: @ 8200BE1 + setvar VAR_0x800B, 1 + call FallarborTown_PokemonCenter_1F_EventScript_27191E + waitmessage + waitbuttonpress + release + end + +FallarborTown_PokemonCenter_1F_EventScript_200BEF:: @ 8200BEF + msgbox FallarborTown_PokemonCenter_1F_Text_200E22, 2 + end + +FallarborTown_PokemonCenter_1F_EventScript_200BF8:: @ 8200BF8 + msgbox FallarborTown_PokemonCenter_1F_Text_200E8B, 2 + end + +FallarborTown_PokemonCenter_1F_EventScript_200C01:: @ 8200C01 + lock + faceplayer + msgbox FallarborTown_PokemonCenter_1F_Text_200C6B, 4 + closemessage + switch VAR_FACING + case 2, FallarborTown_PokemonCenter_1F_EventScript_200C28 + case 3, FallarborTown_PokemonCenter_1F_EventScript_200C38 + end + +FallarborTown_PokemonCenter_1F_EventScript_200C28:: @ 8200C28 + applymovement 4, FallarborTown_PokemonCenter_1F_Movement_200C53 + waitmovement 0 + goto FallarborTown_PokemonCenter_1F_EventScript_200C48 + end + +FallarborTown_PokemonCenter_1F_EventScript_200C38:: @ 8200C38 + applymovement 4, FallarborTown_PokemonCenter_1F_Movement_200C60 + waitmovement 0 + goto FallarborTown_PokemonCenter_1F_EventScript_200C48 + end + +FallarborTown_PokemonCenter_1F_EventScript_200C48:: @ 8200C48 + playse SE_JIDO_DOA + removeobject 4 + clearflag FLAG_0x366 + release + end + +FallarborTown_PokemonCenter_1F_Movement_200C53: @ 8200C53 + 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 + 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 + .string "Oh, hello.\n" + .string "You are?\p" + .string "Okay, your name’s {PLAYER}{KUN}.\n" + .string "I can see that you’re a TRAINER.\p" + .string "So that means you use the POKéMON\n" + .string "Storage System I developed.\p" + .string "How I arrived at that conclusion is\n" + .string "a simple deductive process.\p" + .string "You spoke to me because you wanted\n" + .string "to access something on this PC.\p" + .string "Oh, I’m sorry. I’m LANETTE.\p" + .string "Honestly, I’m glad to meet you--it’s\n" + .string "great you’re using the Storage System.\p" + .string "If you could, please visit me at home.\n" + .string "My house is on ROUTE 114.$" + +FallarborTown_PokemonCenter_1F_Text_200E22: @ 8200E22 + .string "I wonder what POKéMON looked like\n" + .string "long, long ago?\p" + .string "Maybe the FOSSIL MANIAC at the edge\n" + .string "of town will know.$" + +FallarborTown_PokemonCenter_1F_Text_200E8B: @ 8200E8B + .string "In the fields of FALLARBOR, we plant\n" + .string "seedlings of hardy trees that thrive\l" + .string "even in volcanic ash.$" + diff --git a/data/maps/FallarborTown_PokemonCenter_2F/events.inc b/data/maps/FallarborTown_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..9162a2822 --- /dev/null +++ b/data/maps/FallarborTown_PokemonCenter_2F/events.inc @@ -0,0 +1,14 @@ +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 + +FallarborTown_PokemonCenter_2F_MapWarps: @ 852E58C + 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/FallarborTown_PokemonCenter_2F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..93482e860 --- /dev/null +++ b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc @@ -0,0 +1,19 @@ +FallarborTown_PokemonCenter_2F_MapScripts:: @ 8200EEB + map_script 2, FallarborTown_PokemonCenter_2F_MapScript2_276C3B + map_script 4, FallarborTown_PokemonCenter_2F_MapScript2_276B6C + map_script 1, FallarborTown_PokemonCenter_2F_MapScript1_276BBE + map_script 3, FallarborTown_PokemonCenter_2F_MapScript1_276ACF + .byte 0 + +FallarborTown_PokemonCenter_2F_EventScript_200F00:: @ 8200F00 + call OldaleTown_PokemonCenter_2F_EventScript_276EB7 + end + +FallarborTown_PokemonCenter_2F_EventScript_200F06:: @ 8200F06 + call OldaleTown_PokemonCenter_2F_EventScript_2770B2 + end + +FallarborTown_PokemonCenter_2F_EventScript_200F0C:: @ 8200F0C + call OldaleTown_PokemonCenter_2F_EventScript_2771DB + end + diff --git a/data/maps/FarawayIsland_Entrance/events.inc b/data/maps/FarawayIsland_Entrance/events.inc new file mode 100644 index 000000000..8af15533b --- /dev/null +++ b/data/maps/FarawayIsland_Entrance/events.inc @@ -0,0 +1,19 @@ +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 + +FarawayIsland_Entrance_MapWarps: @ 853D740 + 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 + 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 + +FarawayIsland_Entrance_MapBGEvents: @ 853D780 + bg_event 3, 32, 0, 1, 0, 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/FarawayIsland_Entrance/scripts.inc b/data/maps/FarawayIsland_Entrance/scripts.inc new file mode 100644 index 000000000..08331b33b --- /dev/null +++ b/data/maps/FarawayIsland_Entrance/scripts.inc @@ -0,0 +1,46 @@ +FarawayIsland_Entrance_MapScripts:: @ 8267C8E + map_script 3, FarawayIsland_Entrance_MapScript1_267C94 + .byte 0 + +FarawayIsland_Entrance_MapScript1_267C94: @ 8267C94 + setflag FLAG_0x8D8 + end + +FarawayIsland_Entrance_EventScript_267C98:: @ 8267C98 + setweather 1 + doweather + end + +FarawayIsland_Entrance_EventScript_267C9D:: @ 8267C9D + setweather 0 + doweather + end + +FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2 + lock + faceplayer + msgbox FarawayIsland_Entrance_Text_2C6B42, 5 + compare VAR_RESULT, 0 + goto_eq FarawayIsland_Entrance_EventScript_267CE7 + msgbox FarawayIsland_Entrance_Text_2A6A5D, 4 + closemessage + applymovement VAR_LAST_TALKED, FarawayIsland_Entrance_Movement_2725AA + waitmovement 0 + delay 30 + hideobjectat 1, MAP_FARAWAY_ISLAND_ENTRANCE + setvar VAR_0x8004, 2 + call FarawayIsland_Entrance_EventScript_272250 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 + waitstate + release + end + +FarawayIsland_Entrance_EventScript_267CE7:: @ 8267CE7 + msgbox FarawayIsland_Entrance_Text_2A6A82, 4 + release + end + +FarawayIsland_Entrance_EventScript_267CF1:: @ 8267CF1 + msgbox FarawayIsland_Entrance_Text_2C6D5A, 3 + end + diff --git a/data/maps/FarawayIsland_Interior/events.inc b/data/maps/FarawayIsland_Interior/events.inc new file mode 100644 index 000000000..c2cd25b40 --- /dev/null +++ b/data/maps/FarawayIsland_Interior/events.inc @@ -0,0 +1,10 @@ +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 + +FarawayIsland_Interior_MapWarps: @ 853D7B8 + 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/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc new file mode 100644 index 000000000..e7d67431d --- /dev/null +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -0,0 +1,207 @@ +FarawayIsland_Interior_MapScripts:: @ 8267CFA + map_script 5, FarawayIsland_Interior_MapScript1_267D54 + map_script 3, FarawayIsland_Interior_MapScript1_267D72 + map_script 2, FarawayIsland_Interior_MapScript2_267D98 + map_script 7, FarawayIsland_Interior_MapScript1_267D0F + .byte 0 + +FarawayIsland_Interior_MapScript1_267D0F: @ 8267D0F + checkflag FLAG_SYS_CTRL_OBJ_DELETE + call_if 1, FarawayIsland_Interior_EventScript_267D19 + end + +FarawayIsland_Interior_EventScript_267D19:: @ 8267D19 + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 1 + goto_eq FarawayIsland_Interior_EventScript_267D4B + compare VAR_RESULT, 4 + goto_eq FarawayIsland_Interior_EventScript_267D4B + compare VAR_RESULT, 5 + goto_eq FarawayIsland_Interior_EventScript_267D4B + compare VAR_RESULT, 10 + goto_eq FarawayIsland_Interior_EventScript_267D4B + return + +FarawayIsland_Interior_EventScript_267D4B:: @ 8267D4B + setvar VAR_0x8004, 1 + special sub_81D4A90 + return + +FarawayIsland_Interior_MapScript1_267D54: @ 8267D54 + checkflag FLAG_SYS_CTRL_OBJ_DELETE + call_if 1, FarawayIsland_Interior_EventScript_267D5E + end + +FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 7 + goto_if 5, FarawayIsland_Interior_EventScript_27374E + removeobject VAR_LAST_TALKED + return + +FarawayIsland_Interior_MapScript1_267D72: @ 8267D72 + setvar VAR_0x403A, 0 + setvar VAR_TEMP_1, 1 + checkflag FLAG_0x1CA + call_if 0, FarawayIsland_Interior_EventScript_267D86 + end + +FarawayIsland_Interior_EventScript_267D86:: @ 8267D86 + checkflag FLAG_0x1C7 + goto_eq FarawayIsland_Interior_EventScript_27374E + clearflag FLAG_0x2CE + setvar VAR_TEMP_1, 0 + return + +FarawayIsland_Interior_MapScript2_267D98: @ 8267D98 + map_script_2 VAR_TEMP_1, 0, FarawayIsland_Interior_EventScript_267DA2 + .2byte 0 + +FarawayIsland_Interior_EventScript_267DA2:: @ 8267DA2 + lockall + playse SE_PIN + applymovement 1, FarawayIsland_Interior_Movement_272598 + waitmovement 0 + applymovement 1, FarawayIsland_Interior_Movement_27259A + waitmovement 0 + applymovement 1, FarawayIsland_Interior_Movement_267DCE + waitmovement 0 + moveobjectoffscreen 1 + setvar VAR_TEMP_1, 1 + releaseall + end + +FarawayIsland_Interior_Movement_267DCE: @ 8267DCE + walk_up + walk_up + walk_up + walk_in_place_fastest_down + set_invisible + step_end + +FarawayIsland_Interior_Movement_267DD4: @ 8267DD4 + set_visible + step_end + +FarawayIsland_Interior_Movement_267DD6: @ 8267DD6 + 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 + 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 + 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 + 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 + lock + faceplayer + applymovement 1, FarawayIsland_Interior_Movement_267DD4 + waitmovement 0 + setvar VAR_0x8004, 0 + special sub_81D4A90 + message FarawayIsland_Interior_Text_2C6DFF + waitse + playmoncry SPECIES_MEW, 2 + compare VAR_FACING, 2 + call_if 1, FarawayIsland_Interior_EventScript_267EAF + compare VAR_FACING, 1 + call_if 1, FarawayIsland_Interior_EventScript_267EBA + compare VAR_FACING, 3 + call_if 1, FarawayIsland_Interior_EventScript_267EC5 + compare VAR_FACING, 4 + call_if 1, FarawayIsland_Interior_EventScript_267ED0 + special sub_81D4BEC + delay 40 + waitmoncry + setvar VAR_0x8004, 151 + setvar VAR_0x8005, 30 + setvar VAR_0x8006, 0 + special CreateObedientEnemyMon + setflag FLAG_SYS_CTRL_OBJ_DELETE + special BattleSetup_StartLegendaryBattle + waitstate + clearflag FLAG_SYS_CTRL_OBJ_DELETE + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 1 + goto_eq FarawayIsland_Interior_EventScript_267E96 + compare VAR_RESULT, 4 + goto_eq FarawayIsland_Interior_EventScript_267EA4 + compare VAR_RESULT, 5 + goto_eq FarawayIsland_Interior_EventScript_267EA4 + compare VAR_RESULT, 10 + goto_eq FarawayIsland_Interior_EventScript_267EA4 + setflag FLAG_0x1CA + release + end + +FarawayIsland_Interior_EventScript_267E96:: @ 8267E96 + setflag FLAG_0x1C7 + setvar VAR_0x8004, 151 + goto FarawayIsland_Interior_EventScript_273776 + end + +FarawayIsland_Interior_EventScript_267EA4:: @ 8267EA4 + setvar VAR_0x8004, 151 + goto FarawayIsland_Interior_EventScript_273776 + end + +FarawayIsland_Interior_EventScript_267EAF:: @ 8267EAF + applymovement 1, FarawayIsland_Interior_Movement_267DD6 + waitmovement 0 + return + +FarawayIsland_Interior_EventScript_267EBA:: @ 8267EBA + applymovement 1, FarawayIsland_Interior_Movement_267DDD + waitmovement 0 + return + +FarawayIsland_Interior_EventScript_267EC5:: @ 8267EC5 + applymovement 1, FarawayIsland_Interior_Movement_267DE4 + waitmovement 0 + return + +FarawayIsland_Interior_EventScript_267ED0:: @ 8267ED0 + applymovement 1, FarawayIsland_Interior_Movement_267DEB + waitmovement 0 + return + +FarawayIsland_Interior_EventScript_267EDB:: @ 8267EDB + lockall + fadescreenswapbuffers 1 + setflag FLAG_0x2CE + removeobject 1 + fadescreenswapbuffers 0 + msgbox FarawayIsland_Interior_Text_267EF1, 4 + closemessage + releaseall + end + +FarawayIsland_Interior_Text_267EF1: @ 8267EF1 + .string "The feeling of being watched faded…$" diff --git a/data/maps/FieryPath/events.inc b/data/maps/FieryPath/events.inc new file mode 100644 index 000000000..37fecaf5e --- /dev/null +++ b/data/maps/FieryPath/events.inc @@ -0,0 +1,17 @@ +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 + +FieryPath_MapWarps: @ 8534D40 + 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/FieryPath/scripts.inc b/data/maps/FieryPath/scripts.inc new file mode 100644 index 000000000..a040a5327 --- /dev/null +++ b/data/maps/FieryPath/scripts.inc @@ -0,0 +1,15 @@ +FieryPath_MapScripts:: @ 8230F24 + map_script 3, FieryPath_MapScript1_230F2A + .byte 0 + +FieryPath_MapScript1_230F2A: @ 8230F2A + checkflag FLAG_LANDMARK_FIERY_PATH + call_if 0, FieryPath_EventScript_230F37 + setflag FLAG_LANDMARK_FIERY_PATH + end + +FieryPath_EventScript_230F37:: @ 8230F37 + setflag FLAG_0x2FE + clearflag FLAG_0x2FF + return + diff --git a/data/maps/FortreeCity/events.inc b/data/maps/FortreeCity/events.inc new file mode 100644 index 000000000..c943e230d --- /dev/null +++ b/data/maps/FortreeCity/events.inc @@ -0,0 +1,31 @@ +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 + +FortreeCity_MapWarps: @ 8526C44 + 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 + 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 + +FortreeCity_MapEvents:: @ 8526CD4 + map_events FortreeCity_EventObjects, FortreeCity_MapWarps, 0x0, FortreeCity_MapBGEvents + diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc new file mode 100644 index 000000000..4a28a180b --- /dev/null +++ b/data/maps/FortreeCity/scripts.inc @@ -0,0 +1,159 @@ +FortreeCity_MapScripts:: @ 81E25A4 + map_script 3, FortreeCity_MapScript1_1E25AF + map_script 5, FortreeCity_MapScript1_1E25B3 + .byte 0 + +FortreeCity_MapScript1_1E25AF: @ 81E25AF + setflag FLAG_VISITED_FORTREE_CITY + end + +FortreeCity_MapScript1_1E25B3: @ 81E25B3 + setstepcallback 2 + end + +FortreeCity_EventScript_1E25B6:: @ 81E25B6 + msgbox FortreeCity_Text_1E2676, 2 + end + +FortreeCity_EventScript_1E25BF:: @ 81E25BF + lock + faceplayer + checkflag FLAG_0x127 + goto_eq FortreeCity_EventScript_1E25D4 + msgbox FortreeCity_Text_1E2738, 4 + release + end + +FortreeCity_EventScript_1E25D4:: @ 81E25D4 + msgbox FortreeCity_Text_1E27B6, 4 + release + end + +FortreeCity_EventScript_1E25DE:: @ 81E25DE + msgbox FortreeCity_Text_1E27FE, 2 + end + +FortreeCity_EventScript_1E25E7:: @ 81E25E7 + msgbox FortreeCity_Text_1E2880, 2 + end + +FortreeCity_EventScript_1E25F0:: @ 81E25F0 + msgbox FortreeCity_Text_1E292E, 2 + end + +FortreeCity_EventScript_1E25F9:: @ 81E25F9 + msgbox FortreeCity_Text_1E299D, 2 + end + +FortreeCity_EventScript_1E2602:: @ 81E2602 + msgbox FortreeCity_Text_1E2AAC, 3 + end + +FortreeCity_EventScript_1E260B:: @ 81E260B + msgbox FortreeCity_Text_1E2AE6, 3 + end + +FortreeCity_EventScript_1E2614:: @ 81E2614 + lock + faceplayer + checkitem ITEM_DEVON_SCOPE, 1 + compare VAR_RESULT, 1 + goto_eq FortreeCity_EventScript_1E2630 + msgbox FortreeCity_Text_1E29E5, 4 + release + end + +FortreeCity_EventScript_1E2630:: @ 81E2630 + msgbox FortreeCity_Text_1E2A08, 5 + compare VAR_RESULT, 1 + goto_eq FortreeCity_EventScript_1E2645 + release + end + +FortreeCity_EventScript_1E2645:: @ 81E2645 + msgbox FortreeCity_Text_1E2A48, 4 + closemessage + applymovement VAR_LAST_TALKED, FortreeCity_Movement_2723C7 + waitmovement 0 + waitse + playmoncry SPECIES_KECLEON, 2 + delay 40 + waitmoncry + applymovement VAR_LAST_TALKED, FortreeCity_Movement_1E2674 + waitmovement 0 + removeobject VAR_LAST_TALKED + setflag FLAG_0x127 + release + end + +FortreeCity_Movement_1E2674: @ 81E2674 + walk_right + step_end + +FortreeCity_Text_1E2676: @ 81E2676 + .string "No one believes me, but I saw this\n" + .string "gigantic POKéMON in the sky.\p" + .string "It seemed to squirm as it flew toward\n" + .string "ROUTE 131.\p" + .string "By the way… Sniff…\n" + .string "Um… You, uh…smell singed.\p" + .string "Were you at a volcano or something?$" + +FortreeCity_Text_1E2738: @ 81E2738 + .string "I want to go to the POKéMON GYM,\n" + .string "but something’s blocking the way.\p" + .string "After all the bother I went through\n" + .string "training on ROUTE 120…$" + +FortreeCity_Text_1E27B6: @ 81E27B6 + .string "I’ve got my pride-and-joy POKéMON\n" + .string "with me. This time, I’ll beat WINONA.$" + +FortreeCity_Text_1E27FE: @ 81E27FE + .string "The ground absorbs rainwater, and\n" + .string "trees grow by drinking that water…\p" + .string "Our FORTREE CITY exists because\n" + .string "there’s both water and soil.$" + +FortreeCity_Text_1E2880: @ 81E2880 + .string "The CITY consists of homes built on\n" + .string "trees.\p" + .string "Perhaps because of that lifestyle,\n" + .string "everyone is healthy and lively.\p" + .string "Why, even myself--I feel as if I’ve\n" + .string "grown thirty years younger.$" + +FortreeCity_Text_1E292E: @ 81E292E + .string "Living on top of trees is okay.\p" + .string "But sometimes BUG POKéMON come in\n" + .string "through windows.\l" + .string "It can be really startling.$" + +FortreeCity_Text_1E299D: @ 81E299D + .string "There are POKéMON that evolve when\n" + .string "you trade them! That’s what I heard.$" + +FortreeCity_Text_1E29E5: @ 81E29E5 + .string "Something unseeable is in the way.$" + +FortreeCity_Text_1E2A08: @ 81E2A08 + .string "Something unseeable is in the way.\p" + .string "Want to use the DEVON SCOPE?$" + +FortreeCity_Text_1E2A48: @ 81E2A48 + .string "{PLAYER} used the DEVON SCOPE.\p" + .string "An invisible POKéMON became completely\n" + .string "visible!\p" + .string "The startled POKéMON fled!$" + +FortreeCity_Text_1E2AAC: @ 81E2AAC + .string "FORTREE CITY\n" + .string "“The treetop city that frolics with\l" + .string "nature.â€$" + +FortreeCity_Text_1E2AE6: @ 81E2AE6 + .string "FORTREE CITY POKéMON GYM\n" + .string "LEADER: WINONA\p" + .string "“The bird user taking flight into\n" + .string "the world.â€$" + diff --git a/data/maps/FortreeCity_DecorationShop/events.inc b/data/maps/FortreeCity_DecorationShop/events.inc new file mode 100644 index 000000000..fe85e94d6 --- /dev/null +++ b/data/maps/FortreeCity_DecorationShop/events.inc @@ -0,0 +1,13 @@ +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 + +FortreeCity_DecorationShop_MapWarps: @ 8531110 + 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/FortreeCity_DecorationShop/scripts.inc b/data/maps/FortreeCity_DecorationShop/scripts.inc new file mode 100644 index 000000000..2229ab702 --- /dev/null +++ b/data/maps/FortreeCity_DecorationShop/scripts.inc @@ -0,0 +1,72 @@ +FortreeCity_DecorationShop_MapScripts:: @ 821800D + .byte 0 + +FortreeCity_DecorationShop_EventScript_21800E:: @ 821800E + msgbox FortreeCity_DecorationShop_Text_218078, 2 + end + +FortreeCity_DecorationShop_EventScript_218017:: @ 8218017 + msgbox FortreeCity_DecorationShop_Text_2180ED, 2 + end + +FortreeCity_DecorationShop_EventScript_218020:: @ 8218020 + lock + faceplayer + message gUnknown_08272A21 + waitmessage + pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_218038 + msgbox gUnknown_08272A3F, 4 + release + end + + .align 2 +FortreeCity_DecorationShop_PokemartDecor_218038: @ 8218038 + .2byte 1 + .2byte 2 + .2byte 3 + .2byte 4 + .2byte 5 + .2byte 7 + .2byte 8 + .2byte 9 + .2byte 0 + release + end + +FortreeCity_DecorationShop_EventScript_21804C:: @ 821804C + lock + faceplayer + message gUnknown_08272A21 + waitmessage + pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_218064 + msgbox gUnknown_08272A3F, 4 + release + end + + .align 2 +FortreeCity_DecorationShop_PokemartDecor_218064: @ 8218064 + .2byte 10 + .2byte 11 + .2byte 12 + .2byte 15 + .2byte 14 + .2byte 16 + .2byte 17 + .2byte 18 + .2byte 0 + release + end + +FortreeCity_DecorationShop_Text_218078: @ 8218078 + .string "Merchandise you buy here is sent to\n" + .string "your own PC.\p" + .string "That’s fantastic! I wish they could\n" + .string "also deliver me home like that.$" + +FortreeCity_DecorationShop_Text_2180ED: @ 82180ED + .string "I’m buying a pretty desk and I’m\n" + .string "putting my cute DOLLS on it.\p" + .string "If I don’t, when I decorate my\n" + .string "SECRET BASE, my DOLLS will get\l" + .string "dirty or poked with splinters.$" + diff --git a/data/maps/FortreeCity_Gym/events.inc b/data/maps/FortreeCity_Gym/events.inc new file mode 100644 index 000000000..234c10b0c --- /dev/null +++ b/data/maps/FortreeCity_Gym/events.inc @@ -0,0 +1,21 @@ +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 + +FortreeCity_Gym_MapWarps: @ 8530D58 + 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 + bg_event 17, 21, 0, 1, 0, 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/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc new file mode 100644 index 000000000..1b1100cf3 --- /dev/null +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -0,0 +1,325 @@ +FortreeCity_Gym_MapScripts:: @ 82165AB + map_script 3, FortreeCity_Gym_MapScript1_2165B6 + map_script 4, FortreeCity_Gym_MapScript2_2165BA + .byte 0 + +FortreeCity_Gym_MapScript1_2165B6: @ 82165B6 + special RotatingGate_InitPuzzle + end + +FortreeCity_Gym_MapScript2_2165BA: @ 82165BA + map_script_2 VAR_TEMP_0, 16384, FortreeCity_Gym_EventScript_2165C4 + .2byte 0 + +FortreeCity_Gym_EventScript_2165C4:: @ 82165C4 + special RotatingGate_InitPuzzleAndGraphics + end + +FortreeCity_Gym_EventScript_2165C8:: @ 82165C8 + trainerbattle 1, TRAINER_WINONA_1, 0, FortreeCity_Gym_Text_216D75, FortreeCity_Gym_Text_216E60, FortreeCity_Gym_EventScript_2165FD + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq FortreeCity_Gym_EventScript_21668D + checkflag FLAG_0x0AA + goto_if 0, FortreeCity_Gym_EventScript_216646 + msgbox FortreeCity_Gym_Text_217071, 4 + release + end + +FortreeCity_Gym_EventScript_2165FD:: @ 82165FD + message FortreeCity_Gym_Text_216EEC + waitmessage + call FortreeCity_Gym_EventScript_27207E + msgbox FortreeCity_Gym_Text_216F17, 4 + setflag FLAG_0x4F5 + setflag FLAG_BADGE06_GET + setvar VAR_0x8008, 6 + call FortreeCity_Gym_EventScript_271F43 + call FortreeCity_Gym_EventScript_21666A + closemessage + delay 30 + playfanfare MUS_ME_TORE_EYE + msgbox FortreeCity_Gym_Text_217044, 4 + waitfanfare + closemessage + delay 30 + setflag FLAG_0x1D7 + setvar VAR_0x40F3, 0 + setflag FLAG_0x08A + release + end + +FortreeCity_Gym_EventScript_216646:: @ 8216646 + giveitem_std ITEM_TM40 + compare VAR_RESULT, 0 + goto_eq FortreeCity_Gym_EventScript_272054 + msgbox FortreeCity_Gym_Text_216FEC, 4 + setflag FLAG_0x0AA + release + end + +FortreeCity_Gym_EventScript_21666A:: @ 821666A + giveitem_std ITEM_TM40 + compare VAR_RESULT, 0 + goto_eq FortreeCity_Gym_EventScript_27205E + msgbox FortreeCity_Gym_Text_216FEC, 4 + setflag FLAG_0x0AA + return + +FortreeCity_Gym_EventScript_21668D:: @ 821668D + trainerbattle 7, TRAINER_WINONA_1, 0, FortreeCity_Gym_Text_217100, FortreeCity_Gym_Text_2171E6, FortreeCity_Gym_Text_217292 + msgbox FortreeCity_Gym_Text_21720B, 6 + end + +FortreeCity_Gym_EventScript_2166A8:: @ 82166A8 + trainerbattle 0, TRAINER_JARED, 0, FortreeCity_Gym_Text_2168A2, FortreeCity_Gym_Text_2168D3 + msgbox FortreeCity_Gym_Text_2168E7, 6 + end + +FortreeCity_Gym_EventScript_2166BF:: @ 82166BF + trainerbattle 0, TRAINER_EDWARDO, 0, FortreeCity_Gym_Text_21695A, FortreeCity_Gym_Text_2169C7 + msgbox FortreeCity_Gym_Text_2169F1, 6 + end + +FortreeCity_Gym_EventScript_2166D6:: @ 82166D6 + trainerbattle 0, TRAINER_FLINT, 0, FortreeCity_Gym_Text_216A66, FortreeCity_Gym_Text_216AC4 + msgbox FortreeCity_Gym_Text_216AD7, 6 + end + +FortreeCity_Gym_EventScript_2166ED:: @ 82166ED + trainerbattle 0, TRAINER_ASHLEY, 0, FortreeCity_Gym_Text_216B1A, FortreeCity_Gym_Text_216B51 + msgbox FortreeCity_Gym_Text_216B5F, 6 + end + +FortreeCity_Gym_EventScript_216704:: @ 8216704 + trainerbattle 0, TRAINER_HUMBERTO, 0, FortreeCity_Gym_Text_216B9E, FortreeCity_Gym_Text_216C18 + msgbox FortreeCity_Gym_Text_216C32, 6 + end + +FortreeCity_Gym_EventScript_21671B:: @ 821671B + trainerbattle 0, TRAINER_DARIUS, 0, FortreeCity_Gym_Text_216C96, FortreeCity_Gym_Text_216CF2 + msgbox FortreeCity_Gym_Text_216D0F, 6 + end + +FortreeCity_Gym_EventScript_216732:: @ 8216732 + lock + faceplayer + checkflag FLAG_0x4F5 + goto_eq FortreeCity_Gym_EventScript_216747 + msgbox FortreeCity_Gym_Text_216785, 4 + release + end + +FortreeCity_Gym_EventScript_216747:: @ 8216747 + msgbox FortreeCity_Gym_Text_21687D, 4 + release + end + +FortreeCity_Gym_EventScript_216751:: @ 8216751 + lockall + checkflag FLAG_BADGE06_GET + goto_eq FortreeCity_Gym_EventScript_216771 + goto FortreeCity_Gym_EventScript_21677B + end + +FortreeCity_Gym_EventScript_216761:: @ 8216761 + lockall + checkflag FLAG_BADGE06_GET + goto_eq FortreeCity_Gym_EventScript_216771 + goto FortreeCity_Gym_EventScript_21677B + end + +FortreeCity_Gym_EventScript_216771:: @ 8216771 + msgbox FortreeCity_Gym_Text_2170C7, 4 + releaseall + end + +FortreeCity_Gym_EventScript_21677B:: @ 821677B + msgbox FortreeCity_Gym_Text_2170AE, 4 + releaseall + end + +FortreeCity_Gym_Text_216785: @ 8216785 + .string "Yo, how’s it going, CHAMPION-\n" + .string "bound {PLAYER}?\p" + .string "FORTREE GYM LEADER WINONA is\n" + .string "a master of FLYING-type POKéMON.\p" + .string "She’s waiting at the back of this GYM,\n" + .string "behind the rotating doors.\p" + .string "She’s waiting for new challengers\n" + .string "who are trying to take wing!\p" + .string "Okay, go for it!$" + +FortreeCity_Gym_Text_21687D: @ 821687D + .string "You did it!\n" + .string "You’ve achieved liftoff!$" + +FortreeCity_Gym_Text_2168A2: @ 82168A2 + .string "Behold the elegant battle style of\n" + .string "BIRD POKéMON!$" + +FortreeCity_Gym_Text_2168D3: @ 82168D3 + .string "You…\n" + .string "You’re strong…$" + +FortreeCity_Gym_Text_2168E7: @ 82168E7 + .string "A TRAINER has to be smart to keep\n" + .string "up with unexpected turns of events.\p" + .string "Do you have the smarts to get to\n" + .string "our LEADER?$" + +FortreeCity_Gym_Text_21695A: @ 821695A + .string "The lovers of BIRD POKéMON aspire\n" + .string "to join this GYM.\p" + .string "As a member of the FORTREE GYM,\n" + .string "I’m not allowed to lose!$" + +FortreeCity_Gym_Text_2169C7: @ 82169C7 + .string "It was too much of a load for me\n" + .string "to bear…$" + +FortreeCity_Gym_Text_2169F1: @ 82169F1 + .string "The world is huge, and there are\n" + .string "countless tough TRAINERS.\p" + .string "I’m going to keep training and make\n" + .string "myself even stronger.$" + +FortreeCity_Gym_Text_216A66: @ 8216A66 + .string "There’s no need for WINONA, our GYM\n" + .string "LEADER, to deal with you!\p" + .string "I’m plenty good enough for you!$" + +FortreeCity_Gym_Text_216AC4: @ 8216AC4 + .string "WINONA, I…\n" + .string "I lost!$" + +FortreeCity_Gym_Text_216AD7: @ 8216AD7 + .string "WINONA is cute and she’s strong.\n" + .string "She’s the ultimate LEADER!\p" + .string "Blush…$" + +FortreeCity_Gym_Text_216B1A: @ 8216B1A + .string "WINONA taught me personally!\n" + .string "You can’t beat me easily!$" + +FortreeCity_Gym_Text_216B51: @ 8216B51 + .string "I was beaten…$" + +FortreeCity_Gym_Text_216B5F: @ 8216B5F + .string "Thanks to WINONA, the people of\n" + .string "FORTREE can live without fear.$" + +FortreeCity_Gym_Text_216B9E: @ 8216B9E + .string "When WINONA takes to battle, her face\n" + .string "shines with beautiful determination…\p" + .string "I’m not letting you witness that\n" + .string "lovely sight!$" + +FortreeCity_Gym_Text_216C18: @ 8216C18 + .string "Urk!\n" + .string "I couldn’t stop you.$" + +FortreeCity_Gym_Text_216C32: @ 8216C32 + .string "You’d better watch it!\n" + .string "Don’t get distracted staring at WINONA\l" + .string "or you’ll go crashing down in a heap!$" + +FortreeCity_Gym_Text_216C96: @ 8216C96 + .string "You’d better know that there are all\n" + .string "sorts of FLYING-type POKéMON.\p" + .string "You do know that, right?$" + +FortreeCity_Gym_Text_216CF2: @ 8216CF2 + .string "You seem to know your stuff!$" + +FortreeCity_Gym_Text_216D0F: @ 8216D0F + .string "Sure, you beat me all right.\n" + .string "But you’d better watch it! Our LEADER\l" + .string "WINONA’s POKéMON are all business.$" + +FortreeCity_Gym_Text_216D75: @ 8216D75 + .string "I am WINONA. I am the LEADER of\n" + .string "the FORTREE POKéMON GYM.\p" + .string "I have become one with BIRD POKéMON\n" + .string "and have soared the skies…\p" + .string "However grueling the battle, we have\n" + .string "triumphed with grace…\p" + .string "Witness the elegant choreography\n" + .string "of BIRD POKéMON and I!$" + +FortreeCity_Gym_Text_216E60: @ 8216E60 + .string "Never before have I seen a TRAINER\n" + .string "command POKéMON with more grace\l" + .string "than I…\p" + .string "In recognition of your prowess,\n" + .string "I present to you this GYM BADGE.$" + +FortreeCity_Gym_Text_216EEC: @ 8216EEC + .string "{PLAYER} received the FEATHER BADGE\n" + .string "from WINONA.$" + +FortreeCity_Gym_Text_216F17: @ 8216F17 + .string "With the FEATHER BADGE, all POKéMON up\n" + .string "to LV 70, even those received through\l" + .string "trades, will obey your every command.\p" + .string "You will also be able to use\n" + .string "the HM move FLY outside of battle.\p" + .string "And this…\n" + .string "This is a gift from me.$" + +FortreeCity_Gym_Text_216FEC: @ 8216FEC + .string "TM40 contains AERIAL ACE.\p" + .string "Its speed…\n" + .string "No POKéMON should be able to avoid it.\p" + .string "… … … … … …$" + +FortreeCity_Gym_Text_217044: @ 8217044 + .string "Registered GYM LEADER WINONA\n" + .string "in the POKéNAV.$" + +FortreeCity_Gym_Text_217071: @ 8217071 + .string "Though I fell to you, I will remain\n" + .string "devoted to BIRD POKéMON.$" + +FortreeCity_Gym_Text_2170AE: @ 82170AE + .string "FORTREE CITY POKéMON GYM$" + +FortreeCity_Gym_Text_2170C7: @ 82170C7 + .string "FORTREE CITY POKéMON GYM\p" + .string "WINONA’S CERTIFIED TRAINERS:\n" + .string "{PLAYER}$" + +FortreeCity_Gym_Text_217100: @ 8217100 + .string "WINONA: We humans can never escape\n" + .string "gravity’s pull on the ground.\p" + .string "But by striving for excellence,\n" + .string "we have the power to soar!\p" + .string "You have scaled the pinnacle as\n" + .string "the reigning CHAMPION.\p" + .string "Please, allow me to see your power\n" + .string "at full flight!$" + +FortreeCity_Gym_Text_2171E6: @ 82171E6 + .string "I failed to reach your height again…$" + +FortreeCity_Gym_Text_21720B: @ 821720B + .string "WINONA: Even though I have lost,\n" + .string "the wings of my heart remain unbroken.\p" + .string "I can rise and soar again and\n" + .string "yet again.\p" + .string "I am convinced of it!$" + +FortreeCity_Gym_Text_217292: @ 8217292 + .string "WINONA: We humans can never escape\n" + .string "gravity’s pull on the ground.\p" + .string "But by striving for excellence,\n" + .string "we have the power to soar!\p" + .string "You have scaled the pinnacle as\n" + .string "the reigning CHAMPION.\p" + .string "Please, allow me to see your power\n" + .string "at full flight!\p" + .string "Oh, no… Do you have but one\n" + .string "POKéMON with you?\p" + .string "Please return with two POKéMON\n" + .string "at the very least.$" + diff --git a/data/maps/FortreeCity_House1/events.inc b/data/maps/FortreeCity_House1/events.inc new file mode 100644 index 000000000..99d34626c --- /dev/null +++ b/data/maps/FortreeCity_House1/events.inc @@ -0,0 +1,12 @@ +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 + +FortreeCity_House1_MapWarps: @ 8530C74 + 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/FortreeCity_House1/scripts.inc b/data/maps/FortreeCity_House1/scripts.inc new file mode 100644 index 000000000..7e45bf87a --- /dev/null +++ b/data/maps/FortreeCity_House1/scripts.inc @@ -0,0 +1,102 @@ +FortreeCity_House1_MapScripts:: @ 82162BA + .byte 0 + +FortreeCity_House1_EventScript_2162BB:: @ 82162BB + lock + faceplayer + checkflag FLAG_0x09B + goto_eq FortreeCity_House1_EventScript_216355 + setvar VAR_0x8008, 1 + copyvar VAR_0x8004, VAR_0x8008 + specialvar VAR_RESULT, sub_807E73C + copyvar VAR_0x8009, VAR_RESULT + msgbox FortreeCity_House1_Text_21637B, 5 + compare VAR_RESULT, 0 + goto_eq FortreeCity_House1_EventScript_21633D + special sub_81B94B0 + waitstate + copyvar VAR_0x800A, VAR_0x8004 + compare VAR_0x8004, 255 + goto_eq FortreeCity_House1_EventScript_21633D + copyvar VAR_0x8005, VAR_0x800A + specialvar VAR_RESULT, sub_807E9D4 + copyvar VAR_0x800B, VAR_RESULT + compare VAR_RESULT, VAR_0x8009 + goto_if 5, FortreeCity_House1_EventScript_216347 + copyvar VAR_0x8004, VAR_0x8008 + copyvar VAR_0x8005, VAR_0x800A + special sub_807EA10 + special sub_807F0E4 + waitstate + bufferspeciesname 0, VAR_0x8009 + msgbox FortreeCity_House1_Text_216440, 4 + setflag FLAG_0x09B + release + end + +FortreeCity_House1_EventScript_21633D:: @ 821633D + msgbox FortreeCity_House1_Text_21649F, 4 + release + end + +FortreeCity_House1_EventScript_216347:: @ 8216347 + bufferspeciesname 0, VAR_0x8009 + msgbox FortreeCity_House1_Text_216474, 4 + release + end + +FortreeCity_House1_EventScript_216355:: @ 8216355 + msgbox FortreeCity_House1_Text_2164DB, 4 + release + end + +FortreeCity_House1_EventScript_21635F:: @ 821635F + msgbox FortreeCity_House1_Text_21653B, 2 + end + +FortreeCity_House1_EventScript_216368:: @ 8216368 + lock + faceplayer + waitse + playmoncry SPECIES_ZIGZAGOON, 0 + msgbox FortreeCity_House1_Text_216597, 4 + waitmoncry + release + end + +FortreeCity_House1_Text_21637B: @ 821637B + .string "Wrooooaaar! I need it!\n" + .string "I have to get me a {STR_VAR_1}!\l" + .string "I’ll do anything for it!\p" + .string "…Uh… Did you hear that?\n" + .string "My shout from the bottom of my heart?\p" + .string "Having heard that, you will trade\n" + .string "your {STR_VAR_1} for my {STR_VAR_2},\l" + .string "won’t you?$" + +FortreeCity_House1_Text_216440: @ 8216440 + .string "Oh, yeah, right on!\p" + .string "{STR_VAR_1}, welcome!\n" + .string "{STR_VAR_2}, you take care!$" + +FortreeCity_House1_Text_216474: @ 8216474 + .string "Uh, no, I don’t think so.\n" + .string "That isn’t a {STR_VAR_1}.$" + +FortreeCity_House1_Text_21649F: @ 821649F + .string "No? You won’t trade me?\n" + .string "Even after I bared my heart to you?$" + +FortreeCity_House1_Text_2164DB: @ 82164DB + .string "I’m going to make VOLBEAT super\n" + .string "strong from this moment on!\p" + .string "I hope you do the same with PLUSLE!$" + +FortreeCity_House1_Text_21653B: @ 821653B + .string "Trading POKéMON with others…\p" + .string "It’s as if you’re trading your own\n" + .string "memories with other people.$" + +FortreeCity_House1_Text_216597: @ 8216597 + .string "ZIGZAGOON: Gumomoh?$" + diff --git a/data/maps/FortreeCity_House2/events.inc b/data/maps/FortreeCity_House2/events.inc new file mode 100644 index 000000000..2d78b2774 --- /dev/null +++ b/data/maps/FortreeCity_House2/events.inc @@ -0,0 +1,11 @@ +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 + +FortreeCity_House2_MapWarps: @ 8530F60 + 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/FortreeCity_House2/scripts.inc b/data/maps/FortreeCity_House2/scripts.inc new file mode 100644 index 000000000..8f75b20d9 --- /dev/null +++ b/data/maps/FortreeCity_House2/scripts.inc @@ -0,0 +1,84 @@ +FortreeCity_House2_MapScripts:: @ 82177CA + .byte 0 + +FortreeCity_House2_EventScript_2177CB:: @ 82177CB + lock + faceplayer + checkflag FLAG_0x108 + goto_eq FortreeCity_House2_EventScript_21786E + checkflag FLAG_0x076 + call_if 0, FortreeCity_House2_EventScript_217862 + msgbox FortreeCity_House2_Text_2178D6, 4 + multichoice 21, 8, 54, 1 + switch VAR_RESULT + case 1, FortreeCity_House2_EventScript_217878 + msgbox FortreeCity_House2_Text_21796A, 4 + multichoice 21, 8, 54, 1 + switch VAR_RESULT + case 1, FortreeCity_House2_EventScript_217878 + msgbox FortreeCity_House2_Text_2179C9, 4 + multichoice 21, 8, 54, 1 + switch VAR_RESULT + case 0, FortreeCity_House2_EventScript_217878 + msgbox FortreeCity_House2_Text_217A28, 4 + giveitem_std ITEM_TM10 + compare VAR_RESULT, 0 + goto_eq FortreeCity_House2_EventScript_272054 + setflag FLAG_0x108 + msgbox FortreeCity_House2_Text_217A91, 4 + release + end + +FortreeCity_House2_EventScript_217862:: @ 8217862 + msgbox FortreeCity_House2_Text_217882, 4 + setflag FLAG_0x076 + return + +FortreeCity_House2_EventScript_21786E:: @ 821786E + msgbox FortreeCity_House2_Text_217A91, 4 + release + end + +FortreeCity_House2_EventScript_217878:: @ 8217878 + msgbox FortreeCity_House2_Text_217AC7, 4 + release + end + +FortreeCity_House2_Text_217882: @ 8217882 + .string "People… POKéMON…\p" + .string "Their hidden powers are aroused by\n" + .string "living in natural environments…$" + +FortreeCity_House2_Text_2178D6: @ 82178D6 + .string "Let this old woman see if your hidden\n" + .string "power has awoken…\p" + .string "I hold a coin in my hand.\p" + .string "Now, tell me, have I palmed it in\n" + .string "the right hand? Or in the left?$" + +FortreeCity_House2_Text_21796A: @ 821796A + .string "Oh! Yes, correct!\p" + .string "We shall try again.\p" + .string "In which hand have I palmed the coin?\n" + .string "The right or left?$" + +FortreeCity_House2_Text_2179C9: @ 82179C9 + .string "Oh! Yes, correct!\p" + .string "We shall try again.\p" + .string "In which hand have I palmed the coin?\n" + .string "The right or left?$" + +FortreeCity_House2_Text_217A28: @ 8217A28 + .string "Oh! Splendid!\n" + .string "Your hidden power has awoken!\p" + .string "Here, take this and awaken the hidden\n" + .string "power of your POKéMON.$" + +FortreeCity_House2_Text_217A91: @ 8217A91 + .string "HIDDEN POWER is a move that changes\n" + .string "with the POKéMON.$" + +FortreeCity_House2_Text_217AC7: @ 8217AC7 + .string "No, too bad.\n" + .string "You guessed wrong.$" + diff --git a/data/maps/FortreeCity_House3/events.inc b/data/maps/FortreeCity_House3/events.inc new file mode 100644 index 000000000..54ac6ed6a --- /dev/null +++ b/data/maps/FortreeCity_House3/events.inc @@ -0,0 +1,11 @@ +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 + +FortreeCity_House3_MapWarps: @ 8530FB4 + 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/FortreeCity_House3/scripts.inc b/data/maps/FortreeCity_House3/scripts.inc new file mode 100644 index 000000000..92b963811 --- /dev/null +++ b/data/maps/FortreeCity_House3/scripts.inc @@ -0,0 +1,29 @@ +FortreeCity_House3_MapScripts:: @ 8217AE7 + .byte 0 + +FortreeCity_House3_EventScript_217AE8:: @ 8217AE8 + msgbox FortreeCity_House3_Text_217AFA, 2 + end + +FortreeCity_House3_EventScript_217AF1:: @ 8217AF1 + msgbox FortreeCity_House3_Text_217C22, 2 + end + +FortreeCity_House3_Text_217AFA: @ 8217AFA + .string "While speaking about POKéDEXES,\n" + .string "I remembered something.\p" + .string "I met this TRAINER, STEVEN, when\n" + .string "I was searching for rare stones.\p" + .string "Hoo, boy, he had some amazing POKéMON\n" + .string "with him.\p" + .string "They weren’t just rare, they were\n" + .string "trained to terrifying extremes!\p" + .string "He might even be stronger than the\n" + .string "GYM LEADER in this town…$" + +FortreeCity_House3_Text_217C22: @ 8217C22 + .string "What’s that thing you have there?\p" + .string "… … … … … …\p" + .string "Oh, it’s called a POKéDEX?\n" + .string "It’s really awesome!$" + diff --git a/data/maps/FortreeCity_House4/events.inc b/data/maps/FortreeCity_House4/events.inc new file mode 100644 index 000000000..1bddf3416 --- /dev/null +++ b/data/maps/FortreeCity_House4/events.inc @@ -0,0 +1,12 @@ +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 + +FortreeCity_House4_MapWarps: @ 8531020 + 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/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc new file mode 100644 index 000000000..27ead9ec2 --- /dev/null +++ b/data/maps/FortreeCity_House4/scripts.inc @@ -0,0 +1,99 @@ +FortreeCity_House4_MapScripts:: @ 8217C80 + .byte 0 + +FortreeCity_House4_EventScript_217C81:: @ 8217C81 + msgbox FortreeCity_House4_Text_217D33, 2 + end + +FortreeCity_House4_EventScript_217C8A:: @ 8217C8A + lockall + checkflag FLAG_0x0DF + goto_eq FortreeCity_House4_EventScript_217D06 + checkflag FLAG_0x0E0 + goto_eq FortreeCity_House4_EventScript_217CD8 + checkflag FLAG_0x0DE + goto_eq FortreeCity_House4_EventScript_217CC4 + msgbox FortreeCity_House4_Text_217DB9, 4 + closemessage + setflag FLAG_0x0DE + clearflag FLAG_0x3A6 + applymovement 3, FortreeCity_House4_Movement_217D1A + waitmovement 0 + removeobject 3 + releaseall + end + +FortreeCity_House4_EventScript_217CC4:: @ 8217CC4 + applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E + waitmovement 0 + msgbox FortreeCity_House4_Text_217DD2, 4 + releaseall + end + +FortreeCity_House4_EventScript_217CD8:: @ 8217CD8 + applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E + waitmovement 0 + msgbox FortreeCity_House4_Text_217E05, 4 + giveitem_std ITEM_MENTAL_HERB + compare VAR_RESULT, 0 + goto_eq FortreeCity_House4_EventScript_272054 + setflag FLAG_0x0DF + releaseall + end + +FortreeCity_House4_EventScript_217D06:: @ 8217D06 + applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E + waitmovement 0 + msgbox FortreeCity_House4_Text_217EA8, 4 + releaseall + end + +FortreeCity_House4_Movement_217D1A: @ 8217D1A + walk_fast_down + walk_fast_down + walk_fast_right + walk_in_place_fastest_down + delay_8 + step_end + +FortreeCity_House4_EventScript_217D20:: @ 8217D20 + lock + faceplayer + waitse + playmoncry SPECIES_WINGULL, 0 + msgbox FortreeCity_House4_Text_217EE0, 4 + waitmoncry + release + end + +FortreeCity_House4_Text_217D33: @ 8217D33 + .string "By being together with POKéMON,\n" + .string "people make more and more friends.\p" + .string "And that brings the world closer\n" + .string "together. I think it’s wonderful!$" + +FortreeCity_House4_Text_217DB9: @ 8217DB9 + .string "There!\n" + .string "Go, BIRD POKéMON!$" + +FortreeCity_House4_Text_217DD2: @ 8217DD2 + .string "Heheh, I asked my WINGULL to run\n" + .string "an errand for me.$" + +FortreeCity_House4_Text_217E05: @ 8217E05 + .string "Good!\n" + .string "Welcome back, WINGULL!\p" + .string "Huh? What is this?\n" + .string "What is it holding?\p" + .string "A MENTAL HERB?\n" + .string "It must have picked it up somewhere.\p" + .string "But I’m not a TRAINER, so you can\n" + .string "have it.$" + +FortreeCity_House4_Text_217EA8: @ 8217EA8 + .string "Thanks to my WINGULL, I have friends\n" + .string "who live far away.$" + +FortreeCity_House4_Text_217EE0: @ 8217EE0 + .string "WINGULL: Pihyoh!$" + diff --git a/data/maps/FortreeCity_House5/events.inc b/data/maps/FortreeCity_House5/events.inc new file mode 100644 index 000000000..d6c03578e --- /dev/null +++ b/data/maps/FortreeCity_House5/events.inc @@ -0,0 +1,12 @@ +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 + +FortreeCity_House5_MapWarps: @ 853108C + 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/FortreeCity_House5/scripts.inc b/data/maps/FortreeCity_House5/scripts.inc new file mode 100644 index 000000000..d4f1f2b02 --- /dev/null +++ b/data/maps/FortreeCity_House5/scripts.inc @@ -0,0 +1,35 @@ +FortreeCity_House5_MapScripts:: @ 8217EF1 + .byte 0 + +FortreeCity_House5_EventScript_217EF2:: @ 8217EF2 + msgbox FortreeCity_House5_Text_217F17, 2 + end + +FortreeCity_House5_EventScript_217EFB:: @ 8217EFB + msgbox FortreeCity_House5_Text_217F80, 2 + end + +FortreeCity_House5_EventScript_217F04:: @ 8217F04 + lock + faceplayer + waitse + playmoncry SPECIES_ZIGZAGOON, 0 + msgbox FortreeCity_House5_Text_217FFB, 4 + waitmoncry + release + end + +FortreeCity_House5_Text_217F17: @ 8217F17 + .string "The tree houses of FORTREE are great!\p" + .string "I think it’s the number one town for\n" + .string "living together with POKéMON.$" + +FortreeCity_House5_Text_217F80: @ 8217F80 + .string "POKéMON and people have adapted to\n" + .string "nature for survival.\p" + .string "There’s no need to make nature\n" + .string "conform to the way we want to live.$" + +FortreeCity_House5_Text_217FFB: @ 8217FFB + .string "ZIGZAGOON: Bufuu!$" + diff --git a/data/maps/FortreeCity_Mart/events.inc b/data/maps/FortreeCity_Mart/events.inc new file mode 100644 index 000000000..115b04ccd --- /dev/null +++ b/data/maps/FortreeCity_Mart/events.inc @@ -0,0 +1,13 @@ +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 + +FortreeCity_Mart_MapWarps: @ 8530F0C + 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/FortreeCity_Mart/scripts.inc b/data/maps/FortreeCity_Mart/scripts.inc new file mode 100644 index 000000000..050fc8f4c --- /dev/null +++ b/data/maps/FortreeCity_Mart/scripts.inc @@ -0,0 +1,57 @@ +FortreeCity_Mart_MapScripts:: @ 8217665 + .byte 0 + +FortreeCity_Mart_EventScript_217666:: @ 8217666 + lock + faceplayer + message gUnknown_08272A21 + waitmessage + pokemart FortreeCity_Mart_Pokemart_217680 + msgbox gUnknown_08272A3F, 4 + release + end + + .align 2 +FortreeCity_Mart_Pokemart_217680: @ 8217680 + .2byte ITEM_GREAT_BALL + .2byte ITEM_ULTRA_BALL + .2byte ITEM_SUPER_POTION + .2byte ITEM_HYPER_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_AWAKENING + .2byte ITEM_REVIVE + .2byte ITEM_SUPER_REPEL + .2byte ITEM_WOOD_MAIL + .2byte ITEM_NONE + release + end + +FortreeCity_Mart_EventScript_217698:: @ 8217698 + msgbox FortreeCity_Mart_Text_2176B3, 2 + end + +FortreeCity_Mart_EventScript_2176A1:: @ 82176A1 + msgbox FortreeCity_Mart_Text_217715, 2 + end + +FortreeCity_Mart_EventScript_2176AA:: @ 82176AA + msgbox FortreeCity_Mart_Text_21778E, 2 + end + +FortreeCity_Mart_Text_2176B3: @ 82176B3 + .string "SUPER REPEL lasts a long time,\n" + .string "and it gets the job done.\p" + .string "It’s much better than an ordinary\n" + .string "REPEL.$" + +FortreeCity_Mart_Text_217715: @ 8217715 + .string "I always stock up on more items than\n" + .string "I’m sure I’ll need.\p" + .string "You never know what might happen.\n" + .string "Better to be safe than sorry!$" + +FortreeCity_Mart_Text_21778E: @ 821778E + .string "A RARE CANDY makes a POKéMON grow\n" + .string "immediately by one level.$" + diff --git a/data/maps/FortreeCity_PokemonCenter_1F/events.inc b/data/maps/FortreeCity_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..4b681b5cb --- /dev/null +++ b/data/maps/FortreeCity_PokemonCenter_1F/events.inc @@ -0,0 +1,14 @@ +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 + +FortreeCity_PokemonCenter_1F_MapWarps: @ 8530DF4 + 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/FortreeCity_PokemonCenter_1F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..e119a0f29 --- /dev/null +++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc @@ -0,0 +1,55 @@ +FortreeCity_PokemonCenter_1F_MapScripts:: @ 82173D8 + map_script 3, FortreeCity_PokemonCenter_1F_MapScript1_2173E3 + map_script 5, FortreeCity_PokemonCenter_1F_MapScript1_277C30 + .byte 0 + +FortreeCity_PokemonCenter_1F_MapScript1_2173E3: @ 82173E3 + setrespawn 7 + end + +FortreeCity_PokemonCenter_1F_EventScript_2173E7:: @ 82173E7 + setvar VAR_0x800B, 1 + call FortreeCity_PokemonCenter_1F_EventScript_27191E + waitmessage + waitbuttonpress + release + end + +FortreeCity_PokemonCenter_1F_EventScript_2173F5:: @ 82173F5 + msgbox FortreeCity_PokemonCenter_1F_Text_217410, 2 + end + +FortreeCity_PokemonCenter_1F_EventScript_2173FE:: @ 82173FE + msgbox FortreeCity_PokemonCenter_1F_Text_21746D, 2 + end + +FortreeCity_PokemonCenter_1F_EventScript_217407:: @ 8217407 + msgbox FortreeCity_PokemonCenter_1F_Text_21751F, 2 + end + +FortreeCity_PokemonCenter_1F_Text_217410: @ 8217410 + .string "Listen, kid, are you working\n" + .string "on a POKéDEX?\p" + .string "Hmm… Go to the SAFARI ZONE.\n" + .string "That’s my suggestion.$" + +FortreeCity_PokemonCenter_1F_Text_21746D: @ 821746D + .string "Have you done anything at\n" + .string "the RECORD CORNER?\p" + .string "It’s pretty neat. It mixes and matches\n" + .string "the records of TRAINERS.\p" + .string "I don’t know quite how it works,\n" + .string "but it’s cool. It’s exciting, even!$" + +FortreeCity_PokemonCenter_1F_Text_21751F: @ 821751F + .string "Oh, wow, you have a POKéNAV!\n" + .string "And it’s just like mine!\p" + .string "Do you know about POKéNAV’s\n" + .string "MATCH CALL system?\p" + .string "Access it, and you can chat with\n" + .string "registered TRAINERS anytime.\p" + .string "It also shows you which TRAINERS\n" + .string "want a rematch with you.\p" + .string "It’s really nifty! Those DEVON guys\n" + .string "sure know what they’re doing!$" + diff --git a/data/maps/FortreeCity_PokemonCenter_2F/events.inc b/data/maps/FortreeCity_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..7a7f666b2 --- /dev/null +++ b/data/maps/FortreeCity_PokemonCenter_2F/events.inc @@ -0,0 +1,14 @@ +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 + +FortreeCity_PokemonCenter_2F_MapWarps: @ 8530E80 + 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/FortreeCity_PokemonCenter_2F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..f631aa3c6 --- /dev/null +++ b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc @@ -0,0 +1,19 @@ +FortreeCity_PokemonCenter_2F_MapScripts:: @ 821763E + map_script 2, FortreeCity_PokemonCenter_2F_MapScript2_276C3B + map_script 4, FortreeCity_PokemonCenter_2F_MapScript2_276B6C + map_script 1, FortreeCity_PokemonCenter_2F_MapScript1_276BBE + map_script 3, FortreeCity_PokemonCenter_2F_MapScript1_276ACF + .byte 0 + +FortreeCity_PokemonCenter_2F_EventScript_217653:: @ 8217653 + call OldaleTown_PokemonCenter_2F_EventScript_276EB7 + end + +FortreeCity_PokemonCenter_2F_EventScript_217659:: @ 8217659 + call OldaleTown_PokemonCenter_2F_EventScript_2770B2 + end + +FortreeCity_PokemonCenter_2F_EventScript_21765F:: @ 821765F + call OldaleTown_PokemonCenter_2F_EventScript_2771DB + end + diff --git a/data/maps/GraniteCave_1F/events.inc b/data/maps/GraniteCave_1F/events.inc new file mode 100644 index 000000000..83368e186 --- /dev/null +++ b/data/maps/GraniteCave_1F/events.inc @@ -0,0 +1,13 @@ +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 + +GraniteCave_1F_MapWarps: @ 85343EC + 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/GraniteCave_1F/scripts.inc b/data/maps/GraniteCave_1F/scripts.inc new file mode 100644 index 000000000..f3d303c0f --- /dev/null +++ b/data/maps/GraniteCave_1F/scripts.inc @@ -0,0 +1,40 @@ +GraniteCave_1F_MapScripts:: @ 822DA5D + .byte 0 + +GraniteCave_1F_EventScript_22DA5E:: @ 822DA5E + lock + faceplayer + checkflag FLAG_0x06D + goto_eq GraniteCave_1F_EventScript_22DA8A + msgbox GraniteCave_1F_Text_22DA94, 4 + giveitem_std ITEM_HM05 + setflag FLAG_0x06D + msgbox GraniteCave_1F_Text_22DBB7, 4 + release + end + +GraniteCave_1F_EventScript_22DA8A:: @ 822DA8A + msgbox GraniteCave_1F_Text_22DBB7, 4 + release + end + +GraniteCave_1F_Text_22DA94: @ 822DA94 + .string "Hey, you.\n" + .string "It gets awfully dark ahead.\l" + .string "It’ll be tough trying to explore.\p" + .string "That guy who came by earlier…\n" + .string "STEVEN, I think it was.\p" + .string "He knew how to use FLASH, so he ought\n" + .string "to be all right, but…\p" + .string "Well, for us HIKERS, helping out those\n" + .string "that we meet is our motto.\p" + .string "Here you go, I’ll pass this on to you.$" + +GraniteCave_1F_Text_22DBB7: @ 822DBB7 + .string "Teach that hidden move FLASH to\n" + .string "a POKéMON and use it.\p" + .string "It lights up even the inky darkness\n" + .string "of caves.\p" + .string "But, to use it, you need the GYM BADGE\n" + .string "from DEWFORD’s POKéMON GYM.$" + diff --git a/data/maps/GraniteCave_B1F/events.inc b/data/maps/GraniteCave_B1F/events.inc new file mode 100644 index 000000000..90b0f498e --- /dev/null +++ b/data/maps/GraniteCave_B1F/events.inc @@ -0,0 +1,15 @@ +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 + +GraniteCave_B1F_MapWarps: @ 8534438 + 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/GraniteCave_B1F/scripts.inc b/data/maps/GraniteCave_B1F/scripts.inc new file mode 100644 index 000000000..360b10a08 --- /dev/null +++ b/data/maps/GraniteCave_B1F/scripts.inc @@ -0,0 +1,11 @@ +GraniteCave_B1F_MapScripts:: @ 822DC5E + map_script 2, GraniteCave_B1F_MapScript2_2A8327 + map_script 3, GraniteCave_B1F_MapScript1_2A8331 + map_script 5, GraniteCave_B1F_MapScript1_22DC6E + .byte 0 + +GraniteCave_B1F_MapScript1_22DC6E: @ 822DC6E + setstepcallback 7 + setholewarp MAP_GRANITE_CAVE_B2F, 255, 0, 0 + end + diff --git a/data/maps/GraniteCave_B2F/events.inc b/data/maps/GraniteCave_B2F/events.inc new file mode 100644 index 000000000..d7ce41812 --- /dev/null +++ b/data/maps/GraniteCave_B2F/events.inc @@ -0,0 +1,25 @@ +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 + +GraniteCave_B2F_MapWarps: @ 853455C + 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 + bg_event 15, 11, 3, 7, 0, ITEM_EVERSTONE, 49, 0 + +GraniteCave_B2F_MapEvents:: @ 853459C + map_events GraniteCave_B2F_EventObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents + diff --git a/data/maps/GraniteCave_B2F/scripts.inc b/data/maps/GraniteCave_B2F/scripts.inc new file mode 100644 index 000000000..d8cacbe38 --- /dev/null +++ b/data/maps/GraniteCave_B2F/scripts.inc @@ -0,0 +1,3 @@ +GraniteCave_B2F_MapScripts:: @ 822DC79 + .byte 0 + diff --git a/data/maps/GraniteCave_StevensRoom/events.inc b/data/maps/GraniteCave_StevensRoom/events.inc new file mode 100644 index 000000000..49e808cda --- /dev/null +++ b/data/maps/GraniteCave_StevensRoom/events.inc @@ -0,0 +1,9 @@ +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 + +GraniteCave_StevensRoom_MapWarps: @ 85345C8 + 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/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc new file mode 100644 index 000000000..b057a0548 --- /dev/null +++ b/data/maps/GraniteCave_StevensRoom/scripts.inc @@ -0,0 +1,124 @@ +GraniteCave_StevensRoom_MapScripts:: @ 822DC7A + .byte 0 + +GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B + lock + faceplayer + msgbox GraniteCave_StevensRoom_Text_22DD5A, 4 + setvar VAR_0x8004, 274 + call GraniteCave_StevensRoom_EventScript_2723E4 + setflag FLAG_0x0BD + msgbox GraniteCave_StevensRoom_Text_22DDBD, 4 + giveitem_std ITEM_TM47 + compare VAR_RESULT, 0 + call_if 1, GraniteCave_StevensRoom_EventScript_22DD3C + msgbox GraniteCave_StevensRoom_Text_22DE6B, 4 + closemessage + delay 30 + playfanfare MUS_ME_TORE_EYE + msgbox GraniteCave_StevensRoom_Text_22DF6A, 4 + waitfanfare + closemessage + delay 30 + setflag FLAG_0x131 + msgbox GraniteCave_StevensRoom_Text_22DF8C, 4 + closemessage + compare VAR_FACING, 2 + call_if 1, GraniteCave_StevensRoom_EventScript_22DD0D + compare VAR_FACING, 1 + call_if 1, GraniteCave_StevensRoom_EventScript_22DD2A + compare VAR_FACING, 3 + call_if 1, GraniteCave_StevensRoom_EventScript_22DD18 + compare VAR_FACING, 4 + call_if 1, GraniteCave_StevensRoom_EventScript_22DD18 + playse SE_KAIDAN + removeobject 1 + release + end + +GraniteCave_StevensRoom_EventScript_22DD0D:: @ 822DD0D + applymovement 1, GraniteCave_StevensRoom_Movement_22DD45 + waitmovement 0 + return + +GraniteCave_StevensRoom_EventScript_22DD18:: @ 822DD18 + applymovement 255, GraniteCave_StevensRoom_Movement_22DD4C + applymovement 1, GraniteCave_StevensRoom_Movement_22DD45 + waitmovement 0 + return + +GraniteCave_StevensRoom_EventScript_22DD2A:: @ 822DD2A + applymovement 255, GraniteCave_StevensRoom_Movement_22DD4C + applymovement 1, GraniteCave_StevensRoom_Movement_22DD51 + waitmovement 0 + return + +GraniteCave_StevensRoom_EventScript_22DD3C:: @ 822DD3C + msgbox GraniteCave_StevensRoom_Text_22DFAA, 4 + return + +GraniteCave_StevensRoom_Movement_22DD45: @ 822DD45 + walk_up + walk_up + walk_up + walk_up + walk_up + delay_8 + step_end + +GraniteCave_StevensRoom_Movement_22DD4C: @ 822DD4C + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_up + step_end + +GraniteCave_StevensRoom_Movement_22DD51: @ 822DD51 + walk_left + walk_up + walk_up + walk_up + walk_right + walk_up + walk_up + delay_8 + step_end + +GraniteCave_StevensRoom_Text_22DD5A: @ 822DD5A + .string "My name is STEVEN.\p" + .string "I’m interested in rare stones,\n" + .string "so I travel here and there.\p" + .string "Oh?\n" + .string "A LETTER for me?$" + +GraniteCave_StevensRoom_Text_22DDBD: @ 822DDBD + .string "STEVEN: Okay, thank you.\p" + .string "You went through all this trouble to\n" + .string "deliver that. I need to thank you.\p" + .string "Let me see…\n" + .string "I’ll give you this TM.\p" + .string "It contains my favorite move,\n" + .string "STEEL WING.$" + +GraniteCave_StevensRoom_Text_22DE6B: @ 822DE6B + .string "STEVEN: Your POKéMON appear quite\n" + .string "capable.\p" + .string "If you keep training, you could even\n" + .string "become the CHAMPION of the POKéMON\l" + .string "LEAGUE one day. That’s what I think.\p" + .string "I know, since we’ve gotten to know each\n" + .string "other, let’s register one another in\l" + .string "our POKéNAVS.\p" + .string "… … … … … …$" + +GraniteCave_StevensRoom_Text_22DF6A: @ 822DF6A + .string "Registered STEVEN\n" + .string "in the POKéNAV.$" + +GraniteCave_StevensRoom_Text_22DF8C: @ 822DF8C + .string "Now, I’ve got to hurry along.$" + +GraniteCave_StevensRoom_Text_22DFAA: @ 822DFAA + .string "Oh, your BAG is full…\n" + .string "That’s too bad, then.$" + diff --git a/data/maps/InsideOfTruck/events.inc b/data/maps/InsideOfTruck/events.inc new file mode 100644 index 000000000..5dafdf1fd --- /dev/null +++ b/data/maps/InsideOfTruck/events.inc @@ -0,0 +1,25 @@ +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 + +InsideOfTruck_MapWarps: @ 853A0C0 + 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 + 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 + +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 + +InsideOfTruck_MapEvents:: @ 853A144 + map_events InsideOfTruck_EventObjects, InsideOfTruck_MapWarps, InsideOfTruck_MapCoordEvents, InsideOfTruck_MapBGEvents + diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc new file mode 100644 index 000000000..963dd196d --- /dev/null +++ b/data/maps/InsideOfTruck/scripts.inc @@ -0,0 +1,60 @@ +InsideOfTruck_MapScripts:: @ 823BEDA + map_script 1, InsideOfTruck_MapScript1_23BEE5 + map_script 5, InsideOfTruck_MapScript1_23BF01 + .byte 0 + +InsideOfTruck_MapScript1_23BEE5: @ 823BEE5 + setmetatile 4, 1, 520, 0 + setmetatile 4, 2, 528, 0 + setmetatile 4, 3, 536, 0 + end + +InsideOfTruck_MapScript1_23BF01: @ 823BF01 + setstepcallback 5 + end + +InsideOfTruck_EventScript_23BF04:: @ 823BF04 + lockall + setflag FLAG_SPECIAL_FLAG_0x4000 + checkplayergender + compare VAR_RESULT, 0 + goto_eq InsideOfTruck_EventScript_23BF20 + compare VAR_RESULT, 1 + goto_eq InsideOfTruck_EventScript_23BF46 + end + +InsideOfTruck_EventScript_23BF20:: @ 823BF20 + setrespawn 1 + setvar VAR_0x4092, 1 + setflag FLAG_0x2F7 + setflag FLAG_0x2FA + setflag FLAG_0x310 + setflag FLAG_0x2DF + setflag FLAG_0x331 + setvar VAR_0x408C, 1 + setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10 + releaseall + end + +InsideOfTruck_EventScript_23BF46:: @ 823BF46 + setrespawn 2 + setvar VAR_0x4092, 2 + setflag FLAG_0x2F6 + setflag FLAG_0x2F9 + setflag FLAG_0x311 + setflag FLAG_0x2E0 + setflag FLAG_0x332 + setvar VAR_0x4082, 1 + setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10 + releaseall + end + +InsideOfTruck_EventScript_23BF6C:: @ 823BF6C + msgbox InsideOfTruck_Text_23BF75, 3 + end + +InsideOfTruck_Text_23BF75: @ 823BF75 + .string "The box is printed with a POKéMON logo.\p" + .string "It’s a POKéMON brand moving and\n" + .string "delivery service.$" + diff --git a/data/maps/IslandCave/events.inc b/data/maps/IslandCave/events.inc new file mode 100644 index 000000000..d7807a725 --- /dev/null +++ b/data/maps/IslandCave/events.inc @@ -0,0 +1,16 @@ +IslandCave_EventObjects: @ 8536C74 + 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 + 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 + bg_event 7, 20, 0, 0, 0, IslandCave_EventScript_238F1D + bg_event 9, 20, 0, 0, 0, IslandCave_EventScript_238F1D + +IslandCave_MapEvents:: @ 8536CC8 + map_events IslandCave_EventObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents + diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc new file mode 100644 index 000000000..a96d13902 --- /dev/null +++ b/data/maps/IslandCave/scripts.inc @@ -0,0 +1,129 @@ +IslandCave_MapScripts:: @ 8238E2A + map_script 5, IslandCave_MapScript1_238E3A + map_script 1, IslandCave_MapScript1_238E58 + map_script 3, IslandCave_MapScript1_238E99 + .byte 0 + +IslandCave_MapScript1_238E3A: @ 8238E3A + checkflag FLAG_SYS_CTRL_OBJ_DELETE + call_if 1, IslandCave_EventScript_238E44 + end + +IslandCave_EventScript_238E44:: @ 8238E44 + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 7 + goto_if 5, IslandCave_EventScript_27374E + removeobject VAR_LAST_TALKED + return + +IslandCave_MapScript1_238E58: @ 8238E58 + checkflag FLAG_SYS_BRAILLE_WAIT + call_if 0, IslandCave_EventScript_238E62 + end + +IslandCave_EventScript_238E62:: @ 8238E62 + setmetatile 7, 19, 553, 1 + setmetatile 8, 19, 553, 1 + setmetatile 9, 19, 553, 1 + setmetatile 7, 20, 565, 1 + setmetatile 8, 20, 565, 1 + setmetatile 9, 20, 565, 1 + return + +IslandCave_MapScript1_238E99: @ 8238E99 + setflag FLAG_LANDMARK_ISLAND_CAVE + call IslandCave_EventScript_238F45 + checkflag FLAG_0x1BC + call_if 0, IslandCave_EventScript_238EAB + end + +IslandCave_EventScript_238EAB:: @ 8238EAB + clearflag FLAG_0x3A8 + return + +IslandCave_EventScript_238EAF:: @ 8238EAF + setmetatile 7, 19, 554, 1 + setmetatile 8, 19, 555, 1 + setmetatile 9, 19, 556, 1 + setmetatile 7, 20, 562, 1 + setmetatile 8, 20, 563, 0 + setmetatile 9, 20, 564, 1 + special DrawWholeMapView + playse SE_BAN + setflag FLAG_SYS_BRAILLE_WAIT + end + +IslandCave_EventScript_238EEF:: @ 8238EEF + lockall + checkflag FLAG_0x003 + call_if 1, IslandCave_EventScript_238F45 + checkflag FLAG_SYS_BRAILLE_WAIT + goto_eq IslandCave_EventScript_238F13 + braillemessage IslandCave_Braille_2A6CD4 + setflag FLAG_0x002 + special ShouldDoBrailleRegicePuzzle + goto IslandCave_EventScript_238F41 + end + +IslandCave_EventScript_238F13:: @ 8238F13 + msgbox gUnknown_0827304E, 4 + releaseall + end + +IslandCave_EventScript_238F1D:: @ 8238F1D + lockall + checkflag FLAG_0x003 + call_if 1, IslandCave_EventScript_238F45 + braillemessage IslandCave_Braille_2A6CD4 + checkflag FLAG_SYS_BRAILLE_WAIT + goto_eq IslandCave_EventScript_238F41 + setflag FLAG_0x002 + special ShouldDoBrailleRegicePuzzle + goto IslandCave_EventScript_238F41 + end + +IslandCave_EventScript_238F41:: @ 8238F41 + waitbuttonpress + hidebox2 + releaseall + end + +IslandCave_EventScript_238F45:: @ 8238F45 + setvar VAR_0x403B, 0 + setvar VAR_0x403C, 0 + setvar VAR_0x403D, 0 + clearflag FLAG_0x003 + return + +IslandCave_EventScript_238F58:: @ 8238F58 + lock + faceplayer + waitse + playmoncry SPECIES_REGICE, 2 + delay 40 + waitmoncry + setwildbattle SPECIES_REGICE, 40, ITEM_NONE + setflag FLAG_SYS_CTRL_OBJ_DELETE + special StartRegiBattle + waitstate + clearflag FLAG_SYS_CTRL_OBJ_DELETE + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 1 + goto_eq IslandCave_EventScript_238F9F + compare VAR_RESULT, 4 + goto_eq IslandCave_EventScript_238FA8 + compare VAR_RESULT, 5 + goto_eq IslandCave_EventScript_238FA8 + setflag FLAG_0x1BC + release + end + +IslandCave_EventScript_238F9F:: @ 8238F9F + setflag FLAG_0x1BC + goto IslandCave_EventScript_27376D + end + +IslandCave_EventScript_238FA8:: @ 8238FA8 + setvar VAR_0x8004, 402 + goto IslandCave_EventScript_273776 + end diff --git a/data/maps/JaggedPass/events.inc b/data/maps/JaggedPass/events.inc new file mode 100644 index 000000000..fe193cd97 --- /dev/null +++ b/data/maps/JaggedPass/events.inc @@ -0,0 +1,35 @@ +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 + +JaggedPass_MapWarps: @ 8534B8C + 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 + 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 + +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 + +JaggedPass_MapEvents:: @ 8534C6C + map_events JaggedPass_EventObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents + diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc new file mode 100644 index 000000000..15ac1bae6 --- /dev/null +++ b/data/maps/JaggedPass/scripts.inc @@ -0,0 +1,279 @@ +JaggedPass_MapScripts:: @ 8230656 + map_script 5, JaggedPass_MapScript1_230666 + map_script 3, JaggedPass_MapScript1_23068B + map_script 1, JaggedPass_MapScript1_23069C + .byte 0 + +JaggedPass_MapScript1_230666: @ 8230666 + setstepcallback 1 + compare VAR_0x40C8, 0 + call_if 1, JaggedPass_EventScript_230674 + end + +JaggedPass_EventScript_230674:: @ 8230674 + checkitem ITEM_MAGMA_EMBLEM, 1 + compare VAR_RESULT, 1 + goto_eq JaggedPass_EventScript_230685 + return + +JaggedPass_EventScript_230685:: @ 8230685 + setvar VAR_0x40C8, 1 + return + +JaggedPass_MapScript1_23068B: @ 823068B + compare VAR_0x40BD, 1 + call_if 1, JaggedPass_EventScript_230697 + end + +JaggedPass_EventScript_230697:: @ 8230697 + setweather 7 + doweather + return + +JaggedPass_MapScript1_23069C: @ 823069C + compare VAR_0x40C8, 1 + goto_if 3, JaggedPass_EventScript_2306A8 + end + +JaggedPass_EventScript_2306A8:: @ 82306A8 + setmetatile 16, 17, 628, 1 + setmetatile 16, 18, 628, 1 + end + +JaggedPass_EventScript_2306BB:: @ 82306BB + lockall + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 8 + setvar VAR_0x8007, 5 + special sub_8139560 + waitstate + msgbox JaggedPass_Text_230DBA, 4 + closemessage + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 16 + setvar VAR_0x8007, 3 + special sub_8139560 + waitstate + playse SE_KOUKA_M + setmetatile 16, 17, 598, 1 + setmetatile 16, 18, 606, 0 + special DrawWholeMapView + delay 30 + setvar VAR_0x40C8, 2 + waitse + releaseall + end + +JaggedPass_EventScript_230718:: @ 8230718 + lockall + checkflag FLAG_0x139 + goto_eq JaggedPass_EventScript_230766 + waitse + playse SE_PIN + applymovement 5, JaggedPass_Movement_272598 + waitmovement 0 + applymovement 5, JaggedPass_Movement_27259A + waitmovement 0 + applymovement 5, JaggedPass_Movement_27259E + waitmovement 0 + msgbox JaggedPass_Text_230CCB, 4 + closemessage + trainerbattle 3, TRAINER_GRUNT_30, 0, JaggedPass_Text_230D2D + setflag FLAG_0x139 + applymovement 5, JaggedPass_Movement_2725A2 + waitmovement 0 + releaseall + end + +JaggedPass_EventScript_230766:: @ 8230766 + applymovement 5, JaggedPass_Movement_27259E + waitmovement 0 + msgbox JaggedPass_Text_230D65, 4 + closemessage + applymovement 5, JaggedPass_Movement_2725A2 + waitmovement 0 + releaseall + end + +JaggedPass_EventScript_230785:: @ 8230785 + trainerbattle 0, TRAINER_ERIC, 0, JaggedPass_Text_230888, JaggedPass_Text_2308FF + msgbox JaggedPass_Text_230916, 6 + end + +JaggedPass_EventScript_23079C:: @ 823079C + trainerbattle 2, TRAINER_DIANA_1, 0, JaggedPass_Text_230974, JaggedPass_Text_2309B5, JaggedPass_EventScript_2307C8 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq JaggedPass_EventScript_2307E4 + msgbox JaggedPass_Text_2309D8, 4 + release + end + +JaggedPass_EventScript_2307C8:: @ 82307C8 + special sub_80B4808 + msgbox JaggedPass_Text_230A2C, 4 + setvar VAR_0x8004, 474 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 474 + callstd 8 + release + end + +JaggedPass_EventScript_2307E4:: @ 82307E4 + trainerbattle 5, TRAINER_DIANA_1, 0, JaggedPass_Text_230A76, JaggedPass_Text_230AAA + msgbox JaggedPass_Text_230AD7, 6 + end + +JaggedPass_EventScript_2307FB:: @ 82307FB + trainerbattle 2, TRAINER_ETHAN_1, 0, JaggedPass_Text_230B10, JaggedPass_Text_230B50, JaggedPass_EventScript_230827 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq JaggedPass_EventScript_230843 + msgbox JaggedPass_Text_230B93, 4 + release + end + +JaggedPass_EventScript_230827:: @ 8230827 + special sub_80B4808 + msgbox JaggedPass_Text_230BC6, 4 + setvar VAR_0x8004, 216 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 216 + callstd 8 + release + end + +JaggedPass_EventScript_230843:: @ 8230843 + trainerbattle 5, TRAINER_ETHAN_1, 0, JaggedPass_Text_230C28, JaggedPass_Text_230C60 + msgbox JaggedPass_Text_230C94, 6 + end + +JaggedPass_EventScript_23085A:: @ 823085A + trainerbattle 0, TRAINER_JULIO, 0, JaggedPass_Text_230DF7, JaggedPass_Text_230E38 + msgbox JaggedPass_Text_230E57, 6 + end + +JaggedPass_EventScript_230871:: @ 8230871 + trainerbattle 0, TRAINER_AUTUMN, 0, JaggedPass_Text_230E8E, JaggedPass_Text_230ECD + msgbox JaggedPass_Text_230EE3, 6 + end + +JaggedPass_Text_230888: @ 8230888 + .string "MT. CHIMNEY’s JAGGED PASS…\p" + .string "Now this is what I’ve always wanted\n" + .string "in a mountain.\p" + .string "This jagged bumpiness…\n" + .string "It rocks my soul!$" + +JaggedPass_Text_2308FF: @ 82308FF + .string "Losing left me bitter!$" + +JaggedPass_Text_230916: @ 8230916 + .string "Yes, I did lose at POKéMON…\p" + .string "But, when it comes to the love of\n" + .string "the mountains, I have you beat!$" + +JaggedPass_Text_230974: @ 8230974 + .string "This place isn’t your casual hike.\n" + .string "It’s not suited for a picnic.$" + +JaggedPass_Text_2309B5: @ 82309B5 + .string "Ohhh, no!\n" + .string "The ground is too bumpy…$" + +JaggedPass_Text_2309D8: @ 82309D8 + .string "Did you know?\p" + .string "Some people cleverly ride their\n" + .string "bicycles up this horribly bumpy pass.$" + +JaggedPass_Text_230A2C: @ 8230A2C + .string "Will you ever be back in this area?\n" + .string "If you do return, I’d like a rematch.$" + +JaggedPass_Text_230A76: @ 8230A76 + .string "Picnics are fun wherever you go.\n" + .string "Just like POKéMON!$" + +JaggedPass_Text_230AAA: @ 8230AAA + .string "I only lost because the ground is\n" + .string "too bumpy!$" + +JaggedPass_Text_230AD7: @ 8230AD7 + .string "I’ll forget about losing and just\n" + .string "enjoy this bumpy hike.$" + +JaggedPass_Text_230B10: @ 8230B10 + .string "JAGGED PASS is hard to walk on.\n" + .string "It’s a good place for training.$" + +JaggedPass_Text_230B50: @ 8230B50 + .string "It was all over while we were still\n" + .string "trying to find a good footing…$" + +JaggedPass_Text_230B93: @ 8230B93 + .string "If I had an ACRO BIKE, I’d be able to\n" + .string "jump ledges.$" + +JaggedPass_Text_230BC6: @ 8230BC6 + .string "When I get more used to this bumpiness,\n" + .string "I’ll be sure to win!\p" + .string "Can you register me in your POKéNAV?$" + +JaggedPass_Text_230C28: @ 8230C28 + .string "I got used to this bumpiness.\n" + .string "I sing while I climb now.$" + +JaggedPass_Text_230C60: @ 8230C60 + .string "It’s still not easy to battle on this\n" + .string "bumpy ground…$" + +JaggedPass_Text_230C94: @ 8230C94 + .string "I should get an ACRO BIKE from RYDEL\n" + .string "in MAUVILLE CITY…$" + +JaggedPass_Text_230CCB: @ 8230CCB + .string "Wah!\n" + .string "What are you doing here?\p" + .string "What am I doing in a place like this?\p" + .string "What business is it of yours?$" + +JaggedPass_Text_230D2D: @ 8230D2D + .string "Urrrgh…\p" + .string "I should’ve ducked into our HIDEOUT\n" + .string "right away…$" + +JaggedPass_Text_230D65: @ 8230D65 + .string "Okay, oh-kay!\n" + .string "I admit it--you’re strong!\p" + .string "Don’t worry about me.\n" + .string "Go wherever you want!$" + +JaggedPass_Text_230DBA: @ 8230DBA + .string "Oh! This boulder is shaking in response\n" + .string "to the MAGMA EMBLEM!$" + +JaggedPass_Text_230DF7: @ 8230DF7 + .string "Aiyeeh! It’s awfully scary to shoot\n" + .string "down the mountain in one go!$" + +JaggedPass_Text_230E38: @ 8230E38 + .string "I feel like I’m falling apart…$" + +JaggedPass_Text_230E57: @ 8230E57 + .string "My bicycle bounced around so much,\n" + .string "my rear end’s sore…$" + +JaggedPass_Text_230E8E: @ 8230E8E + .string "I climb this hill every day.\n" + .string "I have confidence in my strength!$" + +JaggedPass_Text_230ECD: @ 8230ECD + .string "Hmm…\n" + .string "What went wrong?$" + +JaggedPass_Text_230EE3: @ 8230EE3 + .string "What is that odd rock protrusion\n" + .string "a little up the hill from here?$" + diff --git a/data/maps/LavaridgeTown/events.inc b/data/maps/LavaridgeTown/events.inc new file mode 100644 index 000000000..cf32b8377 --- /dev/null +++ b/data/maps/LavaridgeTown/events.inc @@ -0,0 +1,35 @@ +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 + +LavaridgeTown_MapWarps: @ 8527B2C + 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 + +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 + +LavaridgeTown_MapEvents:: @ 8527BCC + map_events LavaridgeTown_EventObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents + diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc new file mode 100644 index 000000000..5670d9b6e --- /dev/null +++ b/data/maps/LavaridgeTown/scripts.inc @@ -0,0 +1,425 @@ +LavaridgeTown_MapScripts:: @ 81EA4D3 + map_script 3, LavaridgeTown_MapScript1_1EA4DE + map_script 2, LavaridgeTown_MapScript2_1EA547 + .byte 0 + +LavaridgeTown_MapScript1_1EA4DE: @ 81EA4DE + setflag FLAG_VISITED_LAVARIDGE_TOWN + checkflag FLAG_0x06C + call_if 1, LavaridgeTown_EventScript_1EA514 + checkflag FLAG_0x08B + call_if 1, LavaridgeTown_EventScript_1EA53F + call LavaridgeTown_EventScript_271ED7 + call LavaridgeTown_EventScript_271EFB + compare VAR_0x4053, 1 + call_if 1, LavaridgeTown_EventScript_1EA518 + compare VAR_0x4053, 1 + call_if 1, LavaridgeTown_EventScript_1EA543 + end + +LavaridgeTown_EventScript_1EA514:: @ 81EA514 + clearflag FLAG_0x06C + return + +LavaridgeTown_EventScript_1EA518:: @ 81EA518 + getplayerxy VAR_0x8004, VAR_0x8005 + compare VAR_0x8004, 9 + goto_eq LavaridgeTown_EventScript_1EA529 + return + +LavaridgeTown_EventScript_1EA529:: @ 81EA529 + setobjectxyperm 8, 11, 9 + setobjectxyperm 7, 9, 8 + setobjectmovementtype 7, 7 + clearflag FLAG_0x3A1 + return + +LavaridgeTown_EventScript_1EA53F:: @ 81EA53F + clearflag FLAG_0x36D + return + +LavaridgeTown_EventScript_1EA543:: @ 81EA543 + setflag FLAG_SPECIAL_FLAG_0x4000 + return + +LavaridgeTown_MapScript2_1EA547: @ 81EA547 + map_script_2 VAR_0x4053, 1, LavaridgeTown_EventScript_1EA551 + .2byte 0 + +LavaridgeTown_EventScript_1EA551:: @ 81EA551 + lockall + getplayerxy VAR_0x8008, VAR_0x8009 + compare VAR_0x8008, 9 + call_if 1, LavaridgeTown_EventScript_1EA63A + compare VAR_0x8008, 9 + call_if 5, LavaridgeTown_EventScript_1EA65C + delay 20 + checkplayergender + compare VAR_RESULT, 0 + call_if 1, LavaridgeTown_EventScript_1EA630 + compare VAR_RESULT, 1 + call_if 1, LavaridgeTown_EventScript_1EA635 + compare VAR_0x8008, 9 + call_if 1, LavaridgeTown_EventScript_1EA6A1 + compare VAR_0x8008, 9 + call_if 5, LavaridgeTown_EventScript_1EA6AC + checkplayergender + compare VAR_RESULT, 0 + goto_eq LavaridgeTown_EventScript_1EA5B5 + compare VAR_RESULT, 1 + goto_eq LavaridgeTown_EventScript_1EA5DA + end + +LavaridgeTown_EventScript_1EA5B5:: @ 81EA5B5 + msgbox LavaridgeTown_Text_1EA7C0, 4 + giveitem_std ITEM_GO_GOGGLES + setflag FLAG_0x0DD + msgbox LavaridgeTown_Text_1EA897, 4 + goto LavaridgeTown_EventScript_1EA5FF + end + +LavaridgeTown_EventScript_1EA5DA:: @ 81EA5DA + msgbox LavaridgeTown_Text_1EA9A2, 4 + giveitem_std ITEM_GO_GOGGLES + setflag FLAG_0x0DD + msgbox LavaridgeTown_Text_1EAA2E, 4 + goto LavaridgeTown_EventScript_1EA5FF + end + +LavaridgeTown_EventScript_1EA5FF:: @ 81EA5FF + closemessage + removeobject 8 + addobject 7 + delay 30 + compare VAR_0x8008, 9 + call_if 1, LavaridgeTown_EventScript_1EA6B7 + compare VAR_0x8008, 9 + call_if 5, LavaridgeTown_EventScript_1EA6C9 + removeobject 7 + setvar VAR_0x4053, 2 + clearflag FLAG_SPECIAL_FLAG_0x4000 + savebgm MUS_DUMMY + fadedefaultbgm + releaseall + end + +LavaridgeTown_EventScript_1EA630:: @ 81EA630 + playbgm MUS_GIRL_SUP, 1 + return + +LavaridgeTown_EventScript_1EA635:: @ 81EA635 + playbgm MUS_BOY_SUP, 1 + return + +LavaridgeTown_EventScript_1EA63A:: @ 81EA63A + applymovement 8, LavaridgeTown_Movement_2725A6 + waitmovement 0 + playse SE_PIN + applymovement 8, LavaridgeTown_Movement_272598 + waitmovement 0 + applymovement 8, LavaridgeTown_Movement_27259A + waitmovement 0 + return + +LavaridgeTown_EventScript_1EA65C:: @ 81EA65C + opendoor 12, 15 + waitdooranim + addobject 8 + applymovement 8, LavaridgeTown_Movement_1EA6F8 + waitmovement 0 + closedoor 12, 15 + waitdooranim + applymovement 8, LavaridgeTown_Movement_2725A4 + waitmovement 0 + playse SE_PIN + applymovement 8, LavaridgeTown_Movement_272598 + waitmovement 0 + applymovement 8, LavaridgeTown_Movement_27259A + waitmovement 0 + applymovement 255, LavaridgeTown_Movement_2725A8 + waitmovement 0 + return + +LavaridgeTown_EventScript_1EA6A1:: @ 81EA6A1 + applymovement 8, LavaridgeTown_Movement_1EA6F4 + waitmovement 0 + return + +LavaridgeTown_EventScript_1EA6AC:: @ 81EA6AC + applymovement 8, LavaridgeTown_Movement_1EA6ED + waitmovement 0 + return + +LavaridgeTown_EventScript_1EA6B7:: @ 81EA6B7 + applymovement 255, LavaridgeTown_Movement_1EA6DF + applymovement 7, LavaridgeTown_Movement_1EA6E3 + waitmovement 0 + return + +LavaridgeTown_EventScript_1EA6C9:: @ 81EA6C9 + applymovement 7, LavaridgeTown_Movement_1EA6D4 + waitmovement 0 + return + +LavaridgeTown_Movement_1EA6D4: @ 81EA6D4 + 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 + delay_16 + delay_8 + walk_in_place_fastest_right + step_end + +LavaridgeTown_Movement_1EA6E3: @ 81EA6E3 + 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 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + step_end + +LavaridgeTown_Movement_1EA6F4: @ 81EA6F4 + walk_left + walk_left + walk_up + step_end + +LavaridgeTown_Movement_1EA6F8: @ 81EA6F8 + walk_down + step_end + +LavaridgeTown_EventScript_1EA6FA:: @ 81EA6FA + specialvar VAR_RESULT, GetPlayerFacingDirection + compare VAR_RESULT, 1 + goto_eq LavaridgeTown_EventScript_1EA70B + end + +LavaridgeTown_EventScript_1EA70B:: @ 81EA70B + incrementgamestat 49 + end + +LavaridgeTown_EventScript_1EA70E:: @ 81EA70E + msgbox LavaridgeTown_Text_1EAE03, 2 + end + +LavaridgeTown_EventScript_1EA717:: @ 81EA717 + msgbox LavaridgeTown_Text_1EAEE1, 3 + end + +LavaridgeTown_EventScript_1EA720:: @ 81EA720 + msgbox LavaridgeTown_Text_1EAF9B, 2 + end + +LavaridgeTown_EventScript_1EA729:: @ 81EA729 + msgbox LavaridgeTown_Text_1EB003, 2 + end + +LavaridgeTown_EventScript_1EA732:: @ 81EA732 + msgbox LavaridgeTown_Text_1EB092, 2 + end + +LavaridgeTown_EventScript_1EA73B:: @ 81EA73B + msgbox LavaridgeTown_Text_1EAF4E, 2 + end + +LavaridgeTown_EventScript_1EA744:: @ 81EA744 + lock + faceplayer + checkflag FLAG_0x10A + goto_eq LavaridgeTown_EventScript_1EA787 + msgbox LavaridgeTown_Text_1EAB80, 5 + compare VAR_RESULT, 0 + goto_eq LavaridgeTown_EventScript_1EA79B + getpartysize + compare VAR_RESULT, 6 + goto_eq LavaridgeTown_EventScript_1EA791 + msgbox LavaridgeTown_Text_1EACC0, 4 + setflag FLAG_0x10A + playfanfare MUS_FANFA4 + message LavaridgeTown_Text_1EACF4 + waitfanfare + giveegg SPECIES_WYNAUT + release + end + +LavaridgeTown_EventScript_1EA787:: @ 81EA787 + msgbox LavaridgeTown_Text_1EAD9E, 4 + release + end + +LavaridgeTown_EventScript_1EA791:: @ 81EA791 + msgbox LavaridgeTown_Text_1EAD09, 4 + release + end + +LavaridgeTown_EventScript_1EA79B:: @ 81EA79B + msgbox LavaridgeTown_Text_1EAD44, 4 + release + end + +LavaridgeTown_EventScript_1EA7A5:: @ 81EA7A5 + msgbox LavaridgeTown_Text_1EB12B, 3 + end + +LavaridgeTown_EventScript_1EA7AE:: @ 81EA7AE + msgbox LavaridgeTown_Text_1EB178, 3 + end + +LavaridgeTown_EventScript_1EA7B7:: @ 81EA7B7 + msgbox LavaridgeTown_Text_1EB1CB, 3 + end + +LavaridgeTown_Text_1EA7C0: @ 81EA7C0 + .string "MAY: {PLAYER}{KUN}! Long time no see!\p" + .string "Oh? While I visited the hot springs,\n" + .string "you got the LAVARIDGE GYM BADGE.\p" + .string "You must have collected\n" + .string "good POKéMON…\l" + .string "No, I believe you raised some.\p" + .string "I guess it would be okay for you to\n" + .string "have this.$" + +LavaridgeTown_Text_1EA897: @ 81EA897 + .string "MAY: With those GO-GOGGLES, you’ll\n" + .string "have no trouble getting through the\l" + .string "desert near ROUTE 111.\p" + .string "But, wow, {PLAYER}{KUN}…\n" + .string "Challenging GYMS…\p" + .string "You’re trying hard because you don’t\n" + .string "want to lose to me, I bet!\p" + .string "{PLAYER}{KUN}, I think I should challenge\n" + .string "your dad in PETALBURG GYM.\p" + .string "See you again!$" + +LavaridgeTown_Text_1EA9A2: @ 81EA9A2 + .string "BRENDAN: {PLAYER}, hey, it’s been a while.\n" + .string "How’s it going?\p" + .string "Hmm…\n" + .string "That’s a decent collection of BADGES.\p" + .string "All right, then.\n" + .string "You may as well have this.$" + +LavaridgeTown_Text_1EAA2E: @ 81EAA2E + .string "BRENDAN: Keep those with you if you’re\n" + .string "planning on going into that desert near\l" + .string "ROUTE 111.\p" + .string "There should be some POKéMON that\n" + .string "are exclusively desert-dwellers.\l" + .string "You might look around for those.\p" + .string "As for me…\n" + .string "I’m considering challenging NORMAN,\l" + .string "the GYM LEADER of PETALBURG.\p" + .string "Unlike you, {PLAYER}, your dad looks like\n" + .string "he really is tough.\p" + .string "See you around!$" + +LavaridgeTown_Text_1EAB80: @ 81EAB80 + .string "I have here an EGG.\p" + .string "I’d hoped to hatch it by covering it in\n" + .string "hot sand by the hot springs.\l" + .string "But that doesn’t seem to be enough…\p" + .string "I’ve heard it would be best if it were\n" + .string "kept together with POKéMON and\l" + .string "carried about.\p" + .string "You are a TRAINER, yes?\n" + .string "And your POKéMON radiate vitality.\p" + .string "So, what say you?\n" + .string "Will you take this EGG to hatch?$" + +LavaridgeTown_Text_1EACC0: @ 81EACC0 + .string "Good! I hope you’ll walk plenty with\n" + .string "this here EGG!$" + +LavaridgeTown_Text_1EACF4: @ 81EACF4 + .string "{PLAYER} received the EGG.$" + +LavaridgeTown_Text_1EAD09: @ 81EAD09 + .string "Oh? You’ve too many POKéMON.\n" + .string "There’s no room for this EGG…$" + +LavaridgeTown_Text_1EAD44: @ 81EAD44 + .string "As you wish, then…\p" + .string "If you have a change of heart about\n" + .string "hatching this EGG, I will be here.$" + +LavaridgeTown_Text_1EAD9E: @ 81EAD9E + .string "Every so often, an EGG will be found at\n" + .string "the POKéMON DAY CARE.\p" + .string "Or at least that’s how the rumor goes.$" + +LavaridgeTown_Text_1EAE03: @ 81EAE03 + .string "We draw as much hot water as we need,\n" + .string "and yet the hot springs never run dry.\p" + .string "Isn’t it magical?\p" + .string "These hot springs appear near active\n" + .string "volcanoes. Veins of water under the\l" + .string "ground are heated by magma to well up\l" + .string "as hot springs.$" + +LavaridgeTown_Text_1EAEE1: @ 81EAEE1 + .string "Being buried in this hot sand is…\n" + .string "Sigh…\p" + .string "So warm and heavenly…\p" + .string "Eh? Gyaah! Ouch!\p" + .string "A POKéMON nipped my backside!$" + +LavaridgeTown_Text_1EAF4E: @ 81EAF4E + .string "Oh, you like hot springs, do you?\p" + .string "That’s surprising for one as young\n" + .string "as you.$" + +LavaridgeTown_Text_1EAF9B: @ 81EAF9B + .string "I bathe in the hot springs every day.\p" + .string "I want to become a beautiful and strong\n" + .string "GYM LEADER like FLANNERY.$" + +LavaridgeTown_Text_1EB003: @ 81EB003 + .string "If people put POKéMON in hot springs,\n" + .string "it might be seriously strange.\p" + .string "Why, it might be an electric bath, or\n" + .string "a bubble bath, or even a lava bath…$" + +LavaridgeTown_Text_1EB092: @ 81EB092 + .string "They’re claiming that these hot springs\n" + .string "are good for calming nervous tension,\l" + .string "relieving aching muscles, solving\l" + .string "romantic problems, and attracting\l" + .string "money…$" + +LavaridgeTown_Text_1EB12B: @ 81EB12B + .string "LAVARIDGE TOWN\p" + .string "“POKéMON CENTER HOT SPRINGS\n" + .string "An excellent place for relaxing!â€$" + +LavaridgeTown_Text_1EB178: @ 81EB178 + .string "LAVARIDGE TOWN POKéMON GYM\n" + .string "LEADER: FLANNERY\l" + .string "“One with a fiery passion that burns!â€$" + +LavaridgeTown_Text_1EB1CB: @ 81EB1CB + .string "POKéMON HERB SHOP\n" + .string "“Bitter taste--better cure!â€$" + diff --git a/data/maps/LavaridgeTown_Gym_1F/events.inc b/data/maps/LavaridgeTown_Gym_1F/events.inc new file mode 100644 index 000000000..cc35053f0 --- /dev/null +++ b/data/maps/LavaridgeTown_Gym_1F/events.inc @@ -0,0 +1,43 @@ +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 + +LavaridgeTown_Gym_1F_MapWarps: @ 852DEAC + 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 + bg_event 16, 15, 0, 1, 0, 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/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc new file mode 100644 index 000000000..1d317d43b --- /dev/null +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -0,0 +1,424 @@ +LavaridgeTown_Gym_1F_MapScripts:: @ 81FE6F4 + map_script 3, LavaridgeTown_Gym_1F_MapScript1_1FE6FA + .byte 0 + +LavaridgeTown_Gym_1F_MapScript1_1FE6FA: @ 81FE6FA + call LavaridgeTown_Gym_1F_EventScript_1FE705 + call LavaridgeTown_Gym_1F_EventScript_1FE757 + end + +LavaridgeTown_Gym_1F_EventScript_1FE705:: @ 81FE705 + setvar VAR_TEMP_B, 0 + setvar VAR_TEMP_C, 0 + setvar VAR_TEMP_D, 0 + setvar VAR_TEMP_E, 0 + setvar VAR_TEMP_F, 0 + checktrainerflag TRAINER_COLE + goto_eq LavaridgeTown_Gym_1F_EventScript_1FE72C + setvar VAR_TEMP_B, 1 + +LavaridgeTown_Gym_1F_EventScript_1FE72C:: @ 81FE72C + checktrainerflag TRAINER_GERALD + goto_eq LavaridgeTown_Gym_1F_EventScript_1FE73A + setvar VAR_TEMP_C, 1 + +LavaridgeTown_Gym_1F_EventScript_1FE73A:: @ 81FE73A + checktrainerflag TRAINER_AXLE + goto_eq LavaridgeTown_Gym_1F_EventScript_1FE748 + setvar VAR_TEMP_D, 1 + +LavaridgeTown_Gym_1F_EventScript_1FE748:: @ 81FE748 + checktrainerflag TRAINER_DANIELLE + goto_eq LavaridgeTown_Gym_1F_EventScript_1FE756 + setvar VAR_TEMP_E, 1 + +LavaridgeTown_Gym_1F_EventScript_1FE756:: @ 81FE756 + return + +LavaridgeTown_Gym_1F_EventScript_1FE757:: @ 81FE757 + checktrainerflag TRAINER_COLE + goto_eq LavaridgeTown_Gym_1F_EventScript_1FE764 + setobjectmovementtype 2, 63 + +LavaridgeTown_Gym_1F_EventScript_1FE764:: @ 81FE764 + checktrainerflag TRAINER_GERALD + goto_eq LavaridgeTown_Gym_1F_EventScript_1FE771 + setobjectmovementtype 3, 63 + +LavaridgeTown_Gym_1F_EventScript_1FE771:: @ 81FE771 + checktrainerflag TRAINER_AXLE + goto_eq LavaridgeTown_Gym_1F_EventScript_1FE77E + setobjectmovementtype 4, 63 + +LavaridgeTown_Gym_1F_EventScript_1FE77E:: @ 81FE77E + checktrainerflag TRAINER_DANIELLE + goto_eq LavaridgeTown_Gym_1F_EventScript_1FE78B + setobjectmovementtype 5, 63 + +LavaridgeTown_Gym_1F_EventScript_1FE78B:: @ 81FE78B + return + +LavaridgeTown_Gym_1F_EventScript_1FE78C:: @ 81FE78C + trainerbattle 1, TRAINER_FLANNERY_1, 0, LavaridgeTown_Gym_1F_Text_1FF0DC, LavaridgeTown_Gym_1F_Text_1FF233, LavaridgeTown_Gym_1F_EventScript_1FE7C1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq LavaridgeTown_Gym_1F_EventScript_1FE864 + checkflag FLAG_0x0A8 + goto_if 0, LavaridgeTown_Gym_1F_EventScript_1FE81D + msgbox LavaridgeTown_Gym_1F_Text_1FF546, 4 + release + end + +LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 + message LavaridgeTown_Gym_1F_Text_1FF32F + waitmessage + call LavaridgeTown_Gym_1F_EventScript_27207E + msgbox LavaridgeTown_Gym_1F_Text_1FF359, 4 + setflag FLAG_0x06C + setflag FLAG_0x4F3 + setflag FLAG_BADGE04_GET + addvar VAR_0x4085, 1 + compare VAR_0x4085, 6 + call_if 1, LavaridgeTown_Gym_1F_EventScript_271E84 + setvar VAR_0x8008, 4 + call LavaridgeTown_Gym_1F_EventScript_271F43 + setflag FLAG_0x326 + setvar VAR_0x4053, 1 + call LavaridgeTown_Gym_1F_EventScript_1FE841 + closemessage + delay 30 + playfanfare MUS_ME_TORE_EYE + msgbox LavaridgeTown_Gym_1F_Text_1FF517, 4 + waitfanfare + closemessage + delay 30 + setflag FLAG_0x1D6 + release + end + +LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D + giveitem_std ITEM_TM50 + compare VAR_RESULT, 0 + goto_eq LavaridgeTown_Gym_1F_EventScript_272054 + msgbox LavaridgeTown_Gym_1F_Text_1FF45C, 4 + setflag FLAG_0x0A8 + release + end + +LavaridgeTown_Gym_1F_EventScript_1FE841:: @ 81FE841 + giveitem_std ITEM_TM50 + compare VAR_RESULT, 0 + goto_eq LavaridgeTown_Gym_1F_EventScript_27205E + msgbox LavaridgeTown_Gym_1F_Text_1FF45C, 4 + setflag FLAG_0x0A8 + return + +LavaridgeTown_Gym_1F_EventScript_1FE864:: @ 81FE864 + trainerbattle 7, TRAINER_FLANNERY_1, 0, LavaridgeTown_Gym_1F_Text_1FF601, LavaridgeTown_Gym_1F_Text_1FF69F, LavaridgeTown_Gym_1F_Text_1FF75E + msgbox LavaridgeTown_Gym_1F_Text_1FF6BF, 6 + end + +LavaridgeTown_Gym_1F_EventScript_1FE87F:: @ 81FE87F + trainerbattle 2, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_1FEADE, LavaridgeTown_Gym_1F_Text_1FEAFB, LavaridgeTown_Gym_1F_EventScript_1FE89A + msgbox LavaridgeTown_Gym_1F_Text_1FEB1C, 6 + end + +LavaridgeTown_Gym_1F_EventScript_1FE89A:: @ 81FE89A +LavaridgeTown_Gym_B1F_EventScript_1FE89A:: @ 81FE89A + call LavaridgeTown_Gym_1F_EventScript_1FE705 + release + special ShouldTryGetTrainerScript + compare VAR_RESULT, 1 + goto_eq EventScript_GotoTrainerScript + end + +LavaridgeTown_Gym_1F_EventScript_1FE8AF:: @ 81FE8AF + trainerbattle 2, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_1FEB7B, LavaridgeTown_Gym_1F_Text_1FEBC0, LavaridgeTown_Gym_1F_EventScript_1FE89A + msgbox LavaridgeTown_Gym_1F_Text_1FEBE1, 6 + end + +LavaridgeTown_Gym_B1F_EventScript_1FE8CA:: @ 81FE8CA + trainerbattle 2, TRAINER_KEEGAN, 2, LavaridgeTown_Gym_B1F_Text_1FEC31, LavaridgeTown_Gym_B1F_Text_1FECE3, LavaridgeTown_Gym_B1F_EventScript_1FE89A + msgbox LavaridgeTown_Gym_B1F_Text_1FED02, 6 + end + +LavaridgeTown_Gym_1F_EventScript_1FE8E5:: @ 81FE8E5 + trainerbattle 2, TRAINER_DANIELLE, 5, LavaridgeTown_Gym_1F_Text_1FEE22, LavaridgeTown_Gym_1F_Text_1FEE42, LavaridgeTown_Gym_1F_EventScript_1FE89A + msgbox LavaridgeTown_Gym_1F_Text_1FEE5D, 6 + end + +LavaridgeTown_Gym_1F_EventScript_1FE900:: @ 81FE900 + trainerbattle 2, TRAINER_GERALD, 3, LavaridgeTown_Gym_1F_Text_1FED72, LavaridgeTown_Gym_1F_Text_1FED9E, LavaridgeTown_Gym_1F_EventScript_1FE89A + msgbox LavaridgeTown_Gym_1F_Text_1FEDBB, 6 + end + +LavaridgeTown_Gym_B1F_EventScript_1FE91B:: @ 81FE91B + trainerbattle 2, TRAINER_JACE, 1, LavaridgeTown_Gym_B1F_Text_1FEE9D, LavaridgeTown_Gym_B1F_Text_1FEED5, LavaridgeTown_Gym_B1F_EventScript_1FE89A + msgbox LavaridgeTown_Gym_B1F_Text_1FEF07, 6 + end + +LavaridgeTown_Gym_B1F_EventScript_1FE936:: @ 81FE936 + trainerbattle 2, TRAINER_JEFF, 3, LavaridgeTown_Gym_B1F_Text_1FEF60, LavaridgeTown_Gym_B1F_Text_1FEFA7, LavaridgeTown_Gym_B1F_EventScript_1FE89A + msgbox LavaridgeTown_Gym_B1F_Text_1FEFC2, 6 + end + +LavaridgeTown_Gym_B1F_EventScript_1FE951:: @ 81FE951 + trainerbattle 2, TRAINER_ELI, 4, LavaridgeTown_Gym_B1F_Text_1FF025, LavaridgeTown_Gym_B1F_Text_1FF05F, LavaridgeTown_Gym_B1F_EventScript_1FE89A + msgbox LavaridgeTown_Gym_B1F_Text_1FF09A, 6 + end + +LavaridgeTown_Gym_1F_EventScript_1FE96C:: @ 81FE96C + lock + faceplayer + checkflag FLAG_0x4F3 + goto_eq LavaridgeTown_Gym_1F_EventScript_1FE981 + msgbox LavaridgeTown_Gym_1F_Text_1FE9BF, 4 + release + end + +LavaridgeTown_Gym_1F_EventScript_1FE981:: @ 81FE981 + msgbox LavaridgeTown_Gym_1F_Text_1FEAB8, 4 + release + end + +LavaridgeTown_Gym_1F_EventScript_1FE98B:: @ 81FE98B + lockall + checkflag FLAG_BADGE04_GET + goto_eq LavaridgeTown_Gym_1F_EventScript_1FE9AB + goto LavaridgeTown_Gym_1F_EventScript_1FE9B5 + end + +LavaridgeTown_Gym_1F_EventScript_1FE99B:: @ 81FE99B + lockall + checkflag FLAG_BADGE04_GET + goto_eq LavaridgeTown_Gym_1F_EventScript_1FE9AB + goto LavaridgeTown_Gym_1F_EventScript_1FE9B5 + end + +LavaridgeTown_Gym_1F_EventScript_1FE9AB:: @ 81FE9AB + msgbox LavaridgeTown_Gym_1F_Text_1FF5C4, 4 + releaseall + end + +LavaridgeTown_Gym_1F_EventScript_1FE9B5:: @ 81FE9B5 + msgbox LavaridgeTown_Gym_1F_Text_1FF5A9, 4 + releaseall + end + +LavaridgeTown_Gym_1F_Text_1FE9BF: @ 81FE9BF + .string "Hey, how’s it going, CHAMPION-\n" + .string "bound {PLAYER}?\p" + .string "LAVARIDGE’s GYM LEADER FLANNERY\n" + .string "uses FIRE-type POKéMON.\p" + .string "Her passion for POKéMON burns stronger\n" + .string "and hotter than a volcano.\p" + .string "Don’t get too close to her--you’ll burn!\n" + .string "Hose her down with water and then\l" + .string "go for it!$" + +LavaridgeTown_Gym_1F_Text_1FEAB8: @ 81FEAB8 + .string "Yow! That was a scorching-hot battle!$" + +LavaridgeTown_Gym_1F_Text_1FEADE: @ 81FEADE + .string "Owowowowow!\n" + .string "Yikes, it’s hot!$" + +LavaridgeTown_Gym_1F_Text_1FEAFB: @ 81FEAFB + .string "I’m blinded by sweat in my eyes…$" + +LavaridgeTown_Gym_1F_Text_1FEB1C: @ 81FEB1C + .string "Being buried in hot sand promotes\n" + .string "circulation.\p" + .string "It’s effective for healing pain in\n" + .string "your joints.$" + +LavaridgeTown_Gym_1F_Text_1FEB7B: @ 81FEB7B + .string "I’m trying to relieve my stress.\n" + .string "Don’t come along and stress me out!$" + +LavaridgeTown_Gym_1F_Text_1FEBC0: @ 81FEBC0 + .string "I hope FLANNERY flames you good!$" + +LavaridgeTown_Gym_1F_Text_1FEBE1: @ 81FEBE1 + .string "Haaah… Whew…\p" + .string "If you spend too much time buried in\n" + .string "hot sand, it tuckers you out…$" + +LavaridgeTown_Gym_B1F_Text_1FEC31: @ 81FEC31 + .string "You must be getting tired by now.\n" + .string "You’d like to rest in the hot sand,\l" + .string "wouldn’t you?\p" + .string "But you should know that maintaining\n" + .string "your willpower is an important ability\l" + .string "for all TRAINERS.$" + +LavaridgeTown_Gym_B1F_Text_1FECE3: @ 81FECE3 + .string "Play with fire, and be burned…$" + +LavaridgeTown_Gym_B1F_Text_1FED02: @ 81FED02 + .string "Your skill is real…\n" + .string "But our LEADER FLANNERY is strong.\p" + .string "If you don’t watch yourself, you’ll be\n" + .string "burned seriously.$" + +LavaridgeTown_Gym_1F_Text_1FED72: @ 81FED72 + .string "Can your POKéMON withstand\n" + .string "392-degree heat?$" + +LavaridgeTown_Gym_1F_Text_1FED9E: @ 81FED9E + .string "It didn’t burn hotly enough…$" + +LavaridgeTown_Gym_1F_Text_1FEDBB: @ 81FEDBB + .string "The temperature of magma is\n" + .string "392 degrees.\p" + .string "Your POKéMON beat me, so they should\n" + .string "easily survive in magma.$" + +LavaridgeTown_Gym_1F_Text_1FEE22: @ 81FEE22 + .string "Um…\n" + .string "Okay, I’ll battle with you.$" + +LavaridgeTown_Gym_1F_Text_1FEE42: @ 81FEE42 + .string "Oh, but you’re too strong.$" + +LavaridgeTown_Gym_1F_Text_1FEE5D: @ 81FEE5D + .string "I’m going to be a pretty and strong\n" + .string "TRAINER just like FLANNERY.$" + +LavaridgeTown_Gym_B1F_Text_1FEE9D: @ 81FEE9D + .string "Come on, get with it!\n" + .string "Let’s go before my feelings cool!$" + +LavaridgeTown_Gym_B1F_Text_1FEED5: @ 81FEED5 + .string "It’s so hot, and yet my heart is\n" + .string "clutched by ice…$" + +LavaridgeTown_Gym_B1F_Text_1FEF07: @ 81FEF07 + .string "The way the battling spirit burns\n" + .string "within you, you may stand a chance\l" + .string "against our LEADER.$" + +LavaridgeTown_Gym_B1F_Text_1FEF60: @ 81FEF60 + .string "See how the flames blaze wildly?\n" + .string "They flare in anticipation of my win!$" + +LavaridgeTown_Gym_B1F_Text_1FEFA7: @ 81FEFA7 + .string "Something didn’t go right.$" + +LavaridgeTown_Gym_B1F_Text_1FEFC2: @ 81FEFC2 + .string "Well, so what? I say so what?\n" + .string "I can walk on hot coals barefoot!\p" + .string "…Don’t even think about trying it!$" + +LavaridgeTown_Gym_B1F_Text_1FF025: @ 81FF025 + .string "As much as I love mountains,\n" + .string "I especially love volcanoes.$" + +LavaridgeTown_Gym_B1F_Text_1FF05F: @ 81FF05F + .string "Well, it seems to me I lost without\n" + .string "ever being in control.$" + +LavaridgeTown_Gym_B1F_Text_1FF09A: @ 81FF09A + .string "I stay here because I became a fan\n" + .string "of FLANNERY’s power.\p" + .string "Hehehehe.$" + +LavaridgeTown_Gym_1F_Text_1FF0DC: @ 81FF0DC + .string "Welcome… No, wait.\p" + .string "Puny TRAINER, how good to see you’ve\n" + .string "made it here!\p" + .string "I have been entrusted with the…\n" + .string "No, wait.\p" + .string "I am FLANNERY, and I’m the GYM\n" + .string "LEADER here!\p" + .string "Uh…\n" + .string "Dare not underestimate me, though\l" + .string "I have been LEADER only a short time!\p" + .string "With skills inherited from my grand-\n" + .string "father, I shall, uh…demonstrate the\l" + .string "hot moves we have honed on this land!$" + +LavaridgeTown_Gym_1F_Text_1FF233: @ 81FF233 + .string "Oh…\n" + .string "I guess I was trying too hard…\p" + .string "I… I’ve only recently become\n" + .string "a GYM LEADER.\p" + .string "I tried too hard to be someone\n" + .string "I’m not.\p" + .string "I have to do things my natural way. If\n" + .string "I don’t, my POKéMON will be confused.\p" + .string "Thanks for teaching me that.\n" + .string "For that, you deserve this.$" + +LavaridgeTown_Gym_1F_Text_1FF32F: @ 81FF32F + .string "{PLAYER} received the HEAT BADGE\n" + .string "from FLANNERY.$" + +LavaridgeTown_Gym_1F_Text_1FF359: @ 81FF359 + .string "If you have a HEAT BADGE, all POKéMON\n" + .string "up to Level 50, even those you get in\l" + .string "trades from other people, will obey\l" + .string "you completely.\p" + .string "And, it lets POKéMON use the HM move\n" + .string "STRENGTH outside of battle.\p" + .string "This is a token of my appreciation.\n" + .string "Don’t be shy about taking it!$" + +LavaridgeTown_Gym_1F_Text_1FF45C: @ 81FF45C + .string "That TM50 contains OVERHEAT.\p" + .string "That move inflicts serious damage on\n" + .string "the opponent.\p" + .string "But it also sharply cuts the SP. ATK\n" + .string "of the POKéMON using it. It might not\l" + .string "be suitable for longer battles.$" + +LavaridgeTown_Gym_1F_Text_1FF517: @ 81FF517 + .string "Registered GYM LEADER FLANNERY\n" + .string "in the POKéNAV.$" + +LavaridgeTown_Gym_1F_Text_1FF546: @ 81FF546 + .string "Your power reminds me of someone…\p" + .string "Oh! I know! You battle like NORMAN,\n" + .string "the GYM LEADER of PETALBURG.$" + +LavaridgeTown_Gym_1F_Text_1FF5A9: @ 81FF5A9 + .string "LAVARIDGE TOWN POKéMON GYM$" + +LavaridgeTown_Gym_1F_Text_1FF5C4: @ 81FF5C4 + .string "LAVARIDGE TOWN POKéMON GYM\p" + .string "FLANNERY’S CERTIFIED TRAINERS:\n" + .string "{PLAYER}$" + +LavaridgeTown_Gym_1F_Text_1FF601: @ 81FF601 + .string "FLANNERY: Losing a battle isn’t going\n" + .string "to deflate me.\p" + .string "I love POKéMON.\n" + .string "I love to battle.\l" + .string "And… I love this GYM!\p" + .string "Let’s exchange superhot moves\n" + .string "in another battle!$" + +LavaridgeTown_Gym_1F_Text_1FF69F: @ 81FF69F + .string "Whew!\n" + .string "On the verge of eruption!$" + +LavaridgeTown_Gym_1F_Text_1FF6BF: @ 81FF6BF + .string "FLANNERY: I lost the match,\n" + .string "but I’m completely satisfied.\p" + .string "It’s not often I get to enjoy a battle\n" + .string "this heated.\p" + .string "Let’s have another one like this\n" + .string "again sometime!$" + +LavaridgeTown_Gym_1F_Text_1FF75E: @ 81FF75E + .string "FLANNERY: Losing a battle isn’t going\n" + .string "to deflate me.\p" + .string "I love POKéMON.\n" + .string "I love to battle.\l" + .string "And… I love this GYM!\p" + .string "Let’s exchange superhot moves\n" + .string "in another battle!\p" + .string "Oh, wait. Do you only have one POKéMON\n" + .string "that can battle?\p" + .string "I hate to say this, but when you come\n" + .string "see me, bring at least two POKéMON.$" diff --git a/data/maps/LavaridgeTown_Gym_B1F/events.inc b/data/maps/LavaridgeTown_Gym_B1F/events.inc new file mode 100644 index 000000000..eabf8e51d --- /dev/null +++ b/data/maps/LavaridgeTown_Gym_B1F/events.inc @@ -0,0 +1,35 @@ +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 + +LavaridgeTown_Gym_B1F_MapWarps: @ 852E008 + 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/LavaridgeTown_Gym_B1F/scripts.inc b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc new file mode 100644 index 000000000..ad2be83ea --- /dev/null +++ b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc @@ -0,0 +1,59 @@ +LavaridgeTown_Gym_B1F_MapScripts:: @ 81FF87E + map_script 3, LavaridgeTown_Gym_B1F_MapScript1_1FF884 + .byte 0 + +LavaridgeTown_Gym_B1F_MapScript1_1FF884: @ 81FF884 + call LavaridgeTown_Gym_B1F_EventScript_1FF88F + call LavaridgeTown_Gym_B1F_EventScript_1FF8DC + end + +LavaridgeTown_Gym_B1F_EventScript_1FF88F:: @ 81FF88F + setvar VAR_TEMP_7, 0 + setvar VAR_TEMP_8, 0 + setvar VAR_TEMP_9, 0 + setvar VAR_TEMP_A, 0 + checktrainerflag TRAINER_KEEGAN + goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF8B1 + setvar VAR_TEMP_7, 1 + +LavaridgeTown_Gym_B1F_EventScript_1FF8B1:: @ 81FF8B1 + checktrainerflag TRAINER_JACE + goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF8BF + setvar VAR_TEMP_8, 1 + +LavaridgeTown_Gym_B1F_EventScript_1FF8BF:: @ 81FF8BF + checktrainerflag TRAINER_JEFF + goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF8CD + setvar VAR_TEMP_9, 1 + +LavaridgeTown_Gym_B1F_EventScript_1FF8CD:: @ 81FF8CD + checktrainerflag TRAINER_ELI + goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF8DB + setvar VAR_TEMP_A, 1 + +LavaridgeTown_Gym_B1F_EventScript_1FF8DB:: @ 81FF8DB + return + +LavaridgeTown_Gym_B1F_EventScript_1FF8DC:: @ 81FF8DC + checktrainerflag TRAINER_KEEGAN + goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF8E9 + setobjectmovementtype 2, 63 + +LavaridgeTown_Gym_B1F_EventScript_1FF8E9:: @ 81FF8E9 + checktrainerflag TRAINER_JACE + goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF8F6 + setobjectmovementtype 1, 63 + +LavaridgeTown_Gym_B1F_EventScript_1FF8F6:: @ 81FF8F6 + checktrainerflag TRAINER_JEFF + goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF903 + setobjectmovementtype 3, 63 + +LavaridgeTown_Gym_B1F_EventScript_1FF903:: @ 81FF903 + checktrainerflag TRAINER_ELI + goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF910 + setobjectmovementtype 4, 63 + +LavaridgeTown_Gym_B1F_EventScript_1FF910:: @ 81FF910 + return + diff --git a/data/maps/LavaridgeTown_HerbShop/events.inc b/data/maps/LavaridgeTown_HerbShop/events.inc new file mode 100644 index 000000000..dd5ffdbe9 --- /dev/null +++ b/data/maps/LavaridgeTown_HerbShop/events.inc @@ -0,0 +1,12 @@ +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 + +LavaridgeTown_HerbShop_MapWarps: @ 852DDF8 + 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/LavaridgeTown_HerbShop/scripts.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc new file mode 100644 index 000000000..6af8132e4 --- /dev/null +++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc @@ -0,0 +1,68 @@ +LavaridgeTown_HerbShop_MapScripts:: @ 81FE4D6 + .byte 0 + +LavaridgeTown_HerbShop_EventScript_1FE4D7:: @ 81FE4D7 + lock + faceplayer + message LavaridgeTown_HerbShop_Text_1FE53E + waitmessage + pokemart LavaridgeTown_HerbShop_Pokemart_1FE4F0 + msgbox gUnknown_08272A3F, 4 + release + end + + .align 2 +LavaridgeTown_HerbShop_Pokemart_1FE4F0: @ 81FE4F0 + .2byte ITEM_ENERGY_POWDER + .2byte ITEM_ENERGY_ROOT + .2byte ITEM_HEAL_POWDER + .2byte ITEM_REVIVAL_HERB + .2byte ITEM_NONE + release + end + +LavaridgeTown_HerbShop_EventScript_1FE4FC:: @ 81FE4FC + msgbox LavaridgeTown_HerbShop_Text_1FE685, 2 + end + +LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505 + lock + faceplayer + checkflag FLAG_0x0FE + goto_eq LavaridgeTown_HerbShop_EventScript_1FE534 + msgbox LavaridgeTown_HerbShop_Text_1FE584, 4 + giveitem_std ITEM_CHARCOAL + compare VAR_RESULT, 0 + goto_eq LavaridgeTown_HerbShop_EventScript_272054 + setflag FLAG_0x0FE + release + end + +LavaridgeTown_HerbShop_EventScript_1FE534:: @ 81FE534 + msgbox LavaridgeTown_HerbShop_Text_1FE5EB, 4 + release + end + +LavaridgeTown_HerbShop_Text_1FE53E: @ 81FE53E + .string "Welcome to the HERB SHOP, home of\n" + .string "effective and inexpensive medicine!$" + +LavaridgeTown_HerbShop_Text_1FE584: @ 81FE584 + .string "You’ve come to look at herbal medicine\n" + .string "in LAVARIDGE?\p" + .string "That’s rather commendable.\p" + .string "I like you! Take this!$" + +LavaridgeTown_HerbShop_Text_1FE5EB: @ 81FE5EB + .string "That CHARCOAL I gave you, it’s used\n" + .string "for making herbal medicine.\p" + .string "It also does wonders when held by\n" + .string "a POKéMON.\p" + .string "It intensifies the power of FIRE-type\n" + .string "moves.$" + +LavaridgeTown_HerbShop_Text_1FE685: @ 81FE685 + .string "Herbal medicine works impressively well.\n" + .string "But your POKéMON will dislike you for it.\l" + .string "It must be horribly bitter!$" + diff --git a/data/maps/LavaridgeTown_House/events.inc b/data/maps/LavaridgeTown_House/events.inc new file mode 100644 index 000000000..17809fc45 --- /dev/null +++ b/data/maps/LavaridgeTown_House/events.inc @@ -0,0 +1,12 @@ +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 + +LavaridgeTown_House_MapWarps: @ 852E124 + 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/LavaridgeTown_House/scripts.inc b/data/maps/LavaridgeTown_House/scripts.inc new file mode 100644 index 000000000..14d112de9 --- /dev/null +++ b/data/maps/LavaridgeTown_House/scripts.inc @@ -0,0 +1,26 @@ +LavaridgeTown_House_MapScripts:: @ 81FF911 + .byte 0 + +LavaridgeTown_House_EventScript_1FF912:: @ 81FF912 + msgbox LavaridgeTown_House_Text_1FF92E, 2 + end + +LavaridgeTown_House_EventScript_1FF91B:: @ 81FF91B + lock + faceplayer + waitse + playmoncry SPECIES_ZIGZAGOON, 0 + msgbox LavaridgeTown_House_Text_1FF9BB, 4 + waitmoncry + release + end + +LavaridgeTown_House_Text_1FF92E: @ 81FF92E + .string "My wife’s warming an EGG in the hot\n" + .string "springs. This is what she told me.\p" + .string "She left two POKéMON with the DAY CARE.\n" + .string "And they discovered that EGG!$" + +LavaridgeTown_House_Text_1FF9BB: @ 81FF9BB + .string "ZIGZAGOON: Pshoo!$" + diff --git a/data/maps/LavaridgeTown_Mart/events.inc b/data/maps/LavaridgeTown_Mart/events.inc new file mode 100644 index 000000000..0206eefd7 --- /dev/null +++ b/data/maps/LavaridgeTown_Mart/events.inc @@ -0,0 +1,12 @@ +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 + +LavaridgeTown_Mart_MapWarps: @ 852E190 + 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/LavaridgeTown_Mart/scripts.inc b/data/maps/LavaridgeTown_Mart/scripts.inc new file mode 100644 index 000000000..2c5681983 --- /dev/null +++ b/data/maps/LavaridgeTown_Mart/scripts.inc @@ -0,0 +1,47 @@ +LavaridgeTown_Mart_MapScripts:: @ 81FF9CD + .byte 0 + +LavaridgeTown_Mart_EventScript_1FF9CE:: @ 81FF9CE + lock + faceplayer + message gUnknown_08272A21 + waitmessage + pokemart LavaridgeTown_Mart_Pokemart_1FF9E8 + msgbox gUnknown_08272A3F, 4 + release + end + + .align 2 +LavaridgeTown_Mart_Pokemart_1FF9E8: @ 81FF9E8 + .2byte ITEM_GREAT_BALL + .2byte ITEM_SUPER_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_AWAKENING + .2byte ITEM_BURN_HEAL + .2byte ITEM_REVIVE + .2byte ITEM_SUPER_REPEL + .2byte ITEM_X_SPEED + .2byte ITEM_NONE + release + end + +LavaridgeTown_Mart_EventScript_1FF9FE:: @ 81FF9FE + msgbox LavaridgeTown_Mart_Text_1FFA10, 2 + end + +LavaridgeTown_Mart_EventScript_1FFA07:: @ 81FFA07 + msgbox LavaridgeTown_Mart_Text_1FFA83, 2 + end + +LavaridgeTown_Mart_Text_1FFA10: @ 81FFA10 + .string "Use X SPEED to add to a POKéMON’s\n" + .string "SPEED in battle.\p" + .string "That will help it get in the first\n" + .string "strike--a decided advantage!$" + +LavaridgeTown_Mart_Text_1FFA83: @ 81FFA83 + .string "On MT. CHIMNEY’s peak, there’s a local\n" + .string "specialty that you can buy only there.\p" + .string "Give it to a POKéMON--it will be elated.$" + diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..767f01713 --- /dev/null +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc @@ -0,0 +1,15 @@ +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 + +LavaridgeTown_PokemonCenter_1F_MapWarps: @ 852E214 + 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/LavaridgeTown_PokemonCenter_1F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..24f19b1d0 --- /dev/null +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc @@ -0,0 +1,48 @@ +LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 81FFAFA + map_script 3, LavaridgeTown_PokemonCenter_1F_MapScript1_1FFB05 + map_script 5, LavaridgeTown_PokemonCenter_1F_MapScript1_277C30 + .byte 0 + +LavaridgeTown_PokemonCenter_1F_MapScript1_1FFB05: @ 81FFB05 + setrespawn 16 + call LavaridgeTown_PokemonCenter_1F_EventScript_2718DE + end + +LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E:: @ 81FFB0E + setvar VAR_0x800B, 1 + call LavaridgeTown_PokemonCenter_1F_EventScript_27191E + waitmessage + waitbuttonpress + release + end + +LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C:: @ 81FFB1C + msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFBAD, 2 + end + +LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25:: @ 81FFB25 + msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFB37, 2 + end + +LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E:: @ 81FFB2E + msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFC21, 2 + end + +LavaridgeTown_PokemonCenter_1F_Text_1FFB37: @ 81FFB37 + .string "I think POKéMON get closer to their\n" + .string "TRAINERS if they spend time together.\p" + .string "The longer the better.\n" + .string "That’s what I think.$" + +LavaridgeTown_PokemonCenter_1F_Text_1FFBAD: @ 81FFBAD + .string "It’s sort of magical how just sitting\n" + .string "in a hot-spring pool can invigorate.\p" + .string "I wish I could let my POKéMON\n" + .string "soak, too.$" + +LavaridgeTown_PokemonCenter_1F_Text_1FFC21: @ 81FFC21 + .string "Hohoho! Hey, kid, you can reach\n" + .string "the hot springs from here.\p" + .string "If POKéMON are getting rest, so too\n" + .string "should their TRAINERS.$" + diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..3191e7533 --- /dev/null +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc @@ -0,0 +1,14 @@ +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 + +LavaridgeTown_PokemonCenter_2F_MapWarps: @ 852E2A8 + 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/LavaridgeTown_PokemonCenter_2F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..b1491f621 --- /dev/null +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc @@ -0,0 +1,19 @@ +LavaridgeTown_PokemonCenter_2F_MapScripts:: @ 81FFC97 + map_script 2, LavaridgeTown_PokemonCenter_2F_MapScript2_276C3B + map_script 4, LavaridgeTown_PokemonCenter_2F_MapScript2_276B6C + map_script 1, LavaridgeTown_PokemonCenter_2F_MapScript1_276BBE + map_script 3, LavaridgeTown_PokemonCenter_2F_MapScript1_276ACF + .byte 0 + +LavaridgeTown_PokemonCenter_2F_EventScript_1FFCAC:: @ 81FFCAC + call OldaleTown_PokemonCenter_2F_EventScript_276EB7 + end + +LavaridgeTown_PokemonCenter_2F_EventScript_1FFCB2:: @ 81FFCB2 + call OldaleTown_PokemonCenter_2F_EventScript_2770B2 + end + +LavaridgeTown_PokemonCenter_2F_EventScript_1FFCB8:: @ 81FFCB8 + call OldaleTown_PokemonCenter_2F_EventScript_2771DB + end + diff --git a/data/maps/LilycoveCity/events.inc b/data/maps/LilycoveCity/events.inc new file mode 100644 index 000000000..343249c2d --- /dev/null +++ b/data/maps/LilycoveCity/events.inc @@ -0,0 +1,58 @@ +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 + +LilycoveCity_MapWarps: @ 8526EF8 + 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 + 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 + +LilycoveCity_MapEvents:: @ 8527004 + map_events LilycoveCity_EventObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents + diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc new file mode 100644 index 000000000..87a129620 --- /dev/null +++ b/data/maps/LilycoveCity/scripts.inc @@ -0,0 +1,787 @@ +LilycoveCity_MapScripts:: @ 81E2B3C + map_script 3, LilycoveCity_MapScript1_1E2B47 + map_script 1, LilycoveCity_MapScript1_1E2B61 + .byte 0 + +LilycoveCity_MapScript1_1E2B47: @ 81E2B47 + setflag FLAG_VISITED_LILYCOVE_CITY + setvar VAR_0x4086, 0 + setflag FLAG_0x322 + checkflag FLAG_SYS_WEATHER_CTRL + call_if 1, LilycoveCity_EventScript_27207A + call LilycoveCity_EventScript_271ED7 + end + +LilycoveCity_MapScript1_1E2B61: @ 81E2B61 + checkflag FLAG_0x070 + call_if 0, LilycoveCity_EventScript_1E2B6B + end + +LilycoveCity_EventScript_1E2B6B:: @ 81E2B6B + setmetatile 76, 12, 656, 1 + setmetatile 77, 12, 657, 1 + setmetatile 76, 13, 672, 1 + setmetatile 77, 13, 673, 1 + setmetatile 76, 14, 664, 1 + setmetatile 77, 14, 665, 1 + setmetatile 76, 15, 672, 1 + setmetatile 77, 15, 673, 1 + setmetatile 77, 16, 664, 1 + setmetatile 78, 16, 665, 1 + setmetatile 77, 17, 672, 1 + setmetatile 78, 17, 673, 1 + return + +LilycoveCity_EventScript_1E2BD8:: @ 81E2BD8 + lock + faceplayer + dodailyevents + checkflag FLAG_0x92F + goto_eq LilycoveCity_EventScript_1E2C18 + msgbox LilycoveCity_Text_2A7244, 4 + random 10 + addvar VAR_RESULT, 133 + giveitem_std VAR_RESULT + compare VAR_RESULT, 0 + goto_eq LilycoveCity_EventScript_272054 + setflag FLAG_0x92F + msgbox LilycoveCity_Text_2A72E3, 4 + release + end + +LilycoveCity_EventScript_1E2C18:: @ 81E2C18 + msgbox LilycoveCity_Text_2A7321, 4 + release + end + +LilycoveCity_EventScript_1E2C22:: @ 81E2C22 + msgbox LilycoveCity_Text_1E3D9E, 2 + end + +LilycoveCity_EventScript_1E2C2B:: @ 81E2C2B + lock + faceplayer + checkflag FLAG_BADGE07_GET + goto_eq LilycoveCity_EventScript_1E2C40 + msgbox LilycoveCity_Text_1E3E3C, 4 + release + end + +LilycoveCity_EventScript_1E2C40:: @ 81E2C40 + msgbox LilycoveCity_Text_1E3E7D, 4 + release + end + +LilycoveCity_EventScript_1E2C4A:: @ 81E2C4A + msgbox LilycoveCity_Text_1E3F05, 2 + end + +LilycoveCity_EventScript_1E2C53:: @ 81E2C53 + lock + faceplayer + checkflag FLAG_0x070 + goto_eq LilycoveCity_EventScript_1E2C68 + msgbox LilycoveCity_Text_1E3FAB, 4 + release + end + +LilycoveCity_EventScript_1E2C68:: @ 81E2C68 + msgbox LilycoveCity_Text_1E4020, 4 + release + end + +LilycoveCity_EventScript_1E2C72:: @ 81E2C72 + lock + faceplayer + checkflag FLAG_0x070 + goto_eq LilycoveCity_EventScript_1E2C87 + msgbox LilycoveCity_Text_1E40AD, 4 + release + end + +LilycoveCity_EventScript_1E2C87:: @ 81E2C87 + msgbox LilycoveCity_Text_1E4145, 4 + release + end + +LilycoveCity_EventScript_1E2C91:: @ 81E2C91 + msgbox LilycoveCity_Text_1E417B, 2 + end + +LilycoveCity_EventScript_1E2C9A:: @ 81E2C9A + msgbox LilycoveCity_Text_1E420B, 3 + end + +LilycoveCity_EventScript_1E2CA3:: @ 81E2CA3 + msgbox LilycoveCity_Text_1E4283, 3 + end + +LilycoveCity_EventScript_1E2CAC:: @ 81E2CAC + lock + faceplayer + checkflag FLAG_BADGE07_GET + goto_eq LilycoveCity_EventScript_1E2CC1 + msgbox LilycoveCity_Text_1E42FC, 4 + release + end + +LilycoveCity_EventScript_1E2CC1:: @ 81E2CC1 + msgbox LilycoveCity_Text_1E43FF, 4 + release + end + +LilycoveCity_EventScript_1E2CCB:: @ 81E2CCB + msgbox LilycoveCity_Text_1E48A5, 2 + end + +LilycoveCity_EventScript_1E2CD4:: @ 81E2CD4 + msgbox LilycoveCity_Text_1E4902, 2 + end + +LilycoveCity_EventScript_1E2CDD:: @ 81E2CDD + lockall + msgbox LilycoveCity_Text_1E494D, 2 + applymovement 20, LilycoveCity_Movement_2725A2 + end + +LilycoveCity_EventScript_1E2CEE:: @ 81E2CEE + lockall + msgbox LilycoveCity_Text_1E49F4, 2 + applymovement 19, LilycoveCity_Movement_2725A2 + end + +LilycoveCity_EventScript_1E2CFF:: @ 81E2CFF + msgbox LilycoveCity_Text_1E448B, 3 + end + +LilycoveCity_EventScript_1E2D08:: @ 81E2D08 + msgbox LilycoveCity_Text_1E44C3, 3 + end + +LilycoveCity_EventScript_1E2D11:: @ 81E2D11 + msgbox LilycoveCity_Text_1E44FC, 3 + end + +LilycoveCity_EventScript_1E2D1A:: @ 81E2D1A + lockall + specialvar VAR_0x8004, sub_80F8940 + switch VAR_0x8004 + case 0, LilycoveCity_EventScript_1E2D3A + msgbox LilycoveCity_Text_1E4571, 4 + releaseall + end + +LilycoveCity_EventScript_1E2D3A:: @ 81E2D3A + msgbox LilycoveCity_Text_1E4534, 4 + releaseall + end + +LilycoveCity_EventScript_1E2D44:: @ 81E2D44 + lockall + checkflag FLAG_SYS_GAME_CLEAR + goto_eq LilycoveCity_EventScript_1E2D58 + msgbox LilycoveCity_Text_1E45A7, 4 + releaseall + end + +LilycoveCity_EventScript_1E2D58:: @ 81E2D58 + msgbox LilycoveCity_Text_1E4624, 4 + releaseall + end + +LilycoveCity_EventScript_1E2D62:: @ 81E2D62 + msgbox LilycoveCity_Text_1E466E, 3 + end + +LilycoveCity_EventScript_1E2D6B:: @ 81E2D6B + msgbox LilycoveCity_Text_1E46BE, 3 + end + +LilycoveCity_EventScript_1E2D74:: @ 81E2D74 + msgbox LilycoveCity_Text_1E473D, 3 + end + +LilycoveCity_EventScript_1E2D7D:: @ 81E2D7D + lockall + checkflag FLAG_0x0DA + goto_eq LilycoveCity_EventScript_1E2DB0 + msgbox LilycoveCity_Text_1E3D1F, 4 + applymovement VAR_LAST_TALKED, LilycoveCity_Movement_27259E + waitmovement 0 + msgbox LilycoveCity_Text_1E3D4A, 4 + applymovement VAR_LAST_TALKED, LilycoveCity_Movement_2725A2 + waitmovement 0 + setflag FLAG_0x0DA + releaseall + end + +LilycoveCity_EventScript_1E2DB0:: @ 81E2DB0 + msgbox LilycoveCity_Text_1E3D1F, 4 + releaseall + end + +LilycoveCity_EventScript_1E2DBA:: @ 81E2DBA + msgbox LilycoveCity_Text_1E3B2C, 2 + end + +LilycoveCity_EventScript_1E2DC3:: @ 81E2DC3 + msgbox LilycoveCity_Text_1E3B95, 2 + end + +LilycoveCity_EventScript_1E2DCC:: @ 81E2DCC + msgbox LilycoveCity_Text_1E3C46, 2 + end + +LilycoveCity_EventScript_1E2DD5:: @ 81E2DD5 + msgbox LilycoveCity_Text_1E3CBE, 2 + end + +LilycoveCity_EventScript_1E2DDE:: @ 81E2DDE + lock + faceplayer + checkplayergender + compare VAR_RESULT, 0 + goto_eq LilycoveCity_EventScript_1E2DF8 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_EventScript_1E2E6B + end + +LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8 + playbgm MUS_GIRL_SUP, 1 + checkflag FLAG_0x11E + call_if 1, LilycoveCity_EventScript_1E2E48 + checkflag FLAG_0x11E + call_if 0, LilycoveCity_EventScript_1E2E51 + compare VAR_RESULT, 0 + goto_eq LilycoveCity_EventScript_1E2E5A + msgbox LilycoveCity_Text_1E3234, 4 + switch VAR_FIRST_POKE + case 0, LilycoveCity_EventScript_1E2EDE + case 1, LilycoveCity_EventScript_1E2EEE + case 2, LilycoveCity_EventScript_1E2EFE + end + +LilycoveCity_EventScript_1E2E48:: @ 81E2E48 + msgbox LilycoveCity_Text_1E31F5, 5 + return + +LilycoveCity_EventScript_1E2E51:: @ 81E2E51 + msgbox LilycoveCity_Text_1E3061, 5 + return + +LilycoveCity_EventScript_1E2E5A:: @ 81E2E5A + setflag FLAG_0x11E + msgbox LilycoveCity_Text_1E318D, 4 + savebgm MUS_DUMMY + fadedefaultbgm + release + end + +LilycoveCity_EventScript_1E2E6B:: @ 81E2E6B + playbgm MUS_BOY_SUP, 1 + checkflag FLAG_0x11E + call_if 1, LilycoveCity_EventScript_1E2EBB + checkflag FLAG_0x11E + call_if 0, LilycoveCity_EventScript_1E2EC4 + compare VAR_RESULT, 0 + goto_eq LilycoveCity_EventScript_1E2ECD + msgbox LilycoveCity_Text_1E373C, 4 + switch VAR_FIRST_POKE + case 0, LilycoveCity_EventScript_1E2F0E + case 1, LilycoveCity_EventScript_1E2F1E + case 2, LilycoveCity_EventScript_1E2F2E + end + +LilycoveCity_EventScript_1E2EBB:: @ 81E2EBB + msgbox LilycoveCity_Text_1E36FA, 5 + return + +LilycoveCity_EventScript_1E2EC4:: @ 81E2EC4 + msgbox LilycoveCity_Text_1E3608, 5 + return + +LilycoveCity_EventScript_1E2ECD:: @ 81E2ECD + setflag FLAG_0x11E + msgbox LilycoveCity_Text_1E36BF, 4 + savebgm MUS_DUMMY + fadedefaultbgm + release + end + +LilycoveCity_EventScript_1E2EDE:: @ 81E2EDE + trainerbattle 3, TRAINER_MAY_12, 0, LilycoveCity_Text_1E3275 + goto LilycoveCity_EventScript_1E2F3E + end + +LilycoveCity_EventScript_1E2EEE:: @ 81E2EEE + trainerbattle 3, TRAINER_MAY_13, 0, LilycoveCity_Text_1E3275 + goto LilycoveCity_EventScript_1E2F3E + end + +LilycoveCity_EventScript_1E2EFE:: @ 81E2EFE + trainerbattle 3, TRAINER_MAY_11, 0, LilycoveCity_Text_1E3275 + goto LilycoveCity_EventScript_1E2F3E + end + +LilycoveCity_EventScript_1E2F0E:: @ 81E2F0E + trainerbattle 3, TRAINER_BRENDAN_14, 0, LilycoveCity_Text_1E3777 + goto LilycoveCity_EventScript_1E2FAA + end + +LilycoveCity_EventScript_1E2F1E:: @ 81E2F1E + trainerbattle 3, TRAINER_BRENDAN_15, 0, LilycoveCity_Text_1E3777 + goto LilycoveCity_EventScript_1E2FAA + end + +LilycoveCity_EventScript_1E2F2E:: @ 81E2F2E + trainerbattle 3, TRAINER_BRENDAN_13, 0, LilycoveCity_Text_1E3777 + goto LilycoveCity_EventScript_1E2FAA + end + +LilycoveCity_EventScript_1E2F3E:: @ 81E2F3E + msgbox LilycoveCity_Text_1E32FB, 4 + setvar VAR_RESULT, 0 + checkflag FLAG_BADGE06_GET + call_if 1, LilycoveCity_EventScript_1E2F76 + compare VAR_RESULT, 0 + call_if 1, LilycoveCity_EventScript_1E2F86 + compare VAR_RESULT, 1 + call_if 1, LilycoveCity_EventScript_1E2F8F + clearflag FLAG_0x2D2 + clearflag FLAG_0x351 + goto LilycoveCity_EventScript_1E3006 + end + +LilycoveCity_EventScript_1E2F76:: @ 81E2F76 + checkflag FLAG_BADGE08_GET + goto_eq LilycoveCity_EventScript_1E2F80 + return + +LilycoveCity_EventScript_1E2F80:: @ 81E2F80 + setvar VAR_RESULT, 1 + return + +LilycoveCity_EventScript_1E2F86:: @ 81E2F86 + msgbox LilycoveCity_Text_1E3398, 4 + return + +LilycoveCity_EventScript_1E2F8F:: @ 81E2F8F + checkflag FLAG_SYS_GAME_CLEAR + goto_eq LilycoveCity_EventScript_1E2FA1 + msgbox LilycoveCity_Text_1E346D, 4 + return + +LilycoveCity_EventScript_1E2FA1:: @ 81E2FA1 + msgbox LilycoveCity_Text_1E353A, 4 + return + +LilycoveCity_EventScript_1E2FAA:: @ 81E2FAA + msgbox LilycoveCity_Text_1E37D7, 4 + setvar VAR_RESULT, 0 + checkflag FLAG_BADGE06_GET + call_if 1, LilycoveCity_EventScript_1E2F76 + compare VAR_RESULT, 0 + call_if 1, LilycoveCity_EventScript_1E2FE2 + compare VAR_RESULT, 1 + call_if 1, LilycoveCity_EventScript_1E2FEB + clearflag FLAG_0x2F8 + clearflag FLAG_0x32F + goto LilycoveCity_EventScript_1E3006 + end + +LilycoveCity_EventScript_1E2FE2:: @ 81E2FE2 + msgbox LilycoveCity_Text_1E3876, 4 + return + +LilycoveCity_EventScript_1E2FEB:: @ 81E2FEB + checkflag FLAG_SYS_GAME_CLEAR + goto_eq LilycoveCity_EventScript_1E2FFD + msgbox LilycoveCity_Text_1E390C, 4 + return + +LilycoveCity_EventScript_1E2FFD:: @ 81E2FFD + msgbox LilycoveCity_Text_1E39E3, 4 + return + +LilycoveCity_EventScript_1E3006:: @ 81E3006 + closemessage + applymovement VAR_LAST_TALKED, LilycoveCity_Movement_2725AA + waitmovement 0 + delay 50 + setfieldeffectargument 0, 1 + dofieldeffect 30 + delay 15 + removeobject VAR_LAST_TALKED + waitfieldeffect 30 + savebgm MUS_DUMMY + fadedefaultbgm + setflag FLAG_0x124 + release + end + +LilycoveCity_EventScript_1E302D:: @ 81E302D + lock + faceplayer + msgbox LilycoveCity_Text_1E4774, 5 + compare VAR_RESULT, 1 + call_if 1, LilycoveCity_EventScript_1E304F + compare VAR_RESULT, 0 + call_if 1, LilycoveCity_EventScript_1E3058 + release + end + +LilycoveCity_EventScript_1E304F:: @ 81E304F + msgbox LilycoveCity_Text_1E47A1, 4 + return + +LilycoveCity_EventScript_1E3058:: @ 81E3058 + msgbox LilycoveCity_Text_1E4824, 4 + return + +LilycoveCity_Text_1E3061: @ 81E3061 + .string "MAY: Oh, hey?\n" + .string "{PLAYER}{KUN}, are you shopping, too?\p" + .string "I bought a whole bunch of DOLLS and\n" + .string "POSTERS.\p" + .string "Of course, I’ve also caught a lot of\n" + .string "POKéMON, and I’m raising them\l" + .string "properly, too.\p" + .string "Actually, I’m more worried if you’re\n" + .string "raising POKéMON properly, {PLAYER}{KUN}.\p" + .string "I’ll battle with you, so you can show\n" + .string "me your POKéMON, {PLAYER}{KUN}.$" + +LilycoveCity_Text_1E318D: @ 81E318D + .string "MAY: Oh, why? {PLAYER}{KUN}, haven’t you\n" + .string "been raising your POKéMON?\p" + .string "That’s not a very good showing as a\n" + .string "TRAINER…$" + +LilycoveCity_Text_1E31F5: @ 81E31F5 + .string "MAY: Come on, battle with me, so I can\n" + .string "check out your POKéMON!$" + +LilycoveCity_Text_1E3234: @ 81E3234 + .string "MAY: The POKéMON I raised won’t be\n" + .string "beaten by your POKéMON, {PLAYER}{KUN}!$" + +LilycoveCity_Text_1E3275: @ 81E3275 + .string "… … … … … … … …\p" + .string "I remember the battle I had with you,\n" + .string "{PLAYER}{KUN}, on ROUTE 103.\p" + .string "That battle helped you become this\n" + .string "strong, {PLAYER}{KUN}, didn’t it?$" + +LilycoveCity_Text_1E32FB: @ 81E32FB + .string "MAY: I’m thinking of going back to\n" + .string "LITTLEROOT soon.\p" + .string "I’ve caught a decent group of POKéMON,\n" + .string "and my POKéDEX is coming along, so\l" + .string "I’m going home to show my dad.$" + +LilycoveCity_Text_1E3398: @ 81E3398 + .string "{PLAYER}{KUN}, what are you going to do?\p" + .string "Collect all the GYM BADGES and take\n" + .string "the POKéMON LEAGUE challenge?\p" + .string "Well, while you’re collecting BADGES,\n" + .string "{PLAYER}{KUN}, I’m going to work on my\l" + .string "POKéDEX. I’ll complete it before you!\p" + .string "See you!$" + +LilycoveCity_Text_1E346D: @ 81E346D + .string "{PLAYER}{KUN}, what are you going to do?\p" + .string "Are you taking the POKéMON LEAGUE\n" + .string "challenge?\p" + .string "Or, are you going to complete your\n" + .string "POKéDEX?\p" + .string "I might’ve lost to you in battling,\n" + .string "but I’ll finish my POKéDEX before you!\p" + .string "See you!$" + +LilycoveCity_Text_1E353A: @ 81E353A + .string "{PLAYER}{KUN}, what are you going to do?\p" + .string "Are you taking the BATTLE FRONTIER\n" + .string "challenge?\p" + .string "Or, are you going to complete your\n" + .string "POKéDEX?\p" + .string "I might’ve lost to you in battling,\n" + .string "but I’ll finish my POKéDEX before you!\p" + .string "See you!$" + +LilycoveCity_Text_1E3608: @ 81E3608 + .string "BRENDAN: Oh, hey, it’s {PLAYER}.\p" + .string "I’m running an errand for my dad.\n" + .string "No, I’m not buying any DOLLS.\p" + .string "Anyways, it’s been a while.\p" + .string "Want to have a battle to see who’s been\n" + .string "raising POKéMON better?$" + +LilycoveCity_Text_1E36BF: @ 81E36BF + .string "BRENDAN: Oh, what’s the matter?\n" + .string "Don’t have the confidence?$" + +LilycoveCity_Text_1E36FA: @ 81E36FA + .string "BRENDAN: Want to battle to see who’s\n" + .string "been raising POKéMON better?$" + +LilycoveCity_Text_1E373C: @ 81E373C + .string "BRENDAN: Aww, but you know I’m not\n" + .string "going to lose to no {PLAYER}.$" + +LilycoveCity_Text_1E3777: @ 81E3777 + .string "Humph…\n" + .string "You’ve done a lot of raising.\p" + .string "That stings a bit--I had a head start\n" + .string "on you as a TRAINER…$" + +LilycoveCity_Text_1E37D7: @ 81E37D7 + .string "BRENDAN: I…\n" + .string "I plan on going home to LITTLEROOT.\p" + .string "You know I’m helping out my dad on his\n" + .string "POKéDEX. It’s coming together pretty\l" + .string "decently, so I should go show him.$" + +LilycoveCity_Text_1E3876: @ 81E3876 + .string "{PLAYER}, what are you going to do?\p" + .string "Collect all the GYM BADGES and take\n" + .string "the POKéMON LEAGUE challenge?\p" + .string "Maybe I’ll do that, too…\p" + .string "Well, anyway, hang in there!$" + +LilycoveCity_Text_1E390C: @ 81E390C + .string "{PLAYER}, what are you going to do?\p" + .string "Since you’re that strong, are you\n" + .string "taking the POKéMON LEAGUE challenge?\p" + .string "Heh, even me--if I trained my POKéMON\n" + .string "a bit more, I should be stronger than\l" + .string "you, {PLAYER}.\p" + .string "Well, anyway, hang in there!$" + +LilycoveCity_Text_1E39E3: @ 81E39E3 + .string "{PLAYER}, what are you going to do?\p" + .string "Are you taking the BATTLE FRONTIER\n" + .string "challenge?\p" + .string "Or, are you going to complete your\n" + .string "POKéDEX?\p" + .string "Since you’re that strong, you should\n" + .string "consider the BATTLE FRONTIER.\p" + .string "Heh, if I train my POKéMON a bit more,\n" + .string "I’ll get stronger than you, {PLAYER}.\p" + .string "Maybe I should go to the BATTLE\n" + .string "FRONTIER.\p" + .string "Well, anyway, hang in there!$" + +LilycoveCity_Text_1E3B2C: @ 81E3B2C + .string "Fufufu…\p" + .string "We moved more loot into our secret\n" + .string "HIDEOUT today…\p" + .string "Wh-who are you?!\n" + .string "I was just talking to myself!$" + +LilycoveCity_Text_1E3B95: @ 81E3B95 + .string "I’m just a GRUNT, so I don’t know what\n" + .string "the BOSS is thinking…\p" + .string "But being on TEAM AQUA, I know I’ll get\n" + .string "the chance to do big things!\p" + .string "Wh-who are you?!\n" + .string "I was just talking to myself!$" + +LilycoveCity_Text_1E3C46: @ 81E3C46 + .string "Hey, you!\p" + .string "Don’t go near the cave in the cove!\p" + .string "Why? You don’t need a reason why!\n" + .string "I’m an adult, so you just listen to me!$" + +LilycoveCity_Text_1E3CBE: @ 81E3CBE + .string "If this whole wide world becomes ours,\n" + .string "TEAM AQUA’s, it will be a happier\l" + .string "place for POKéMON, too.$" + +LilycoveCity_Text_1E3D1F: @ 81E3D1F + .string "There! WAILMER!\n" + .string "Leap out of the water now!$" + +LilycoveCity_Text_1E3D4A: @ 81E3D4A + .string "Hunh? What do you want?\p" + .string "You’re messing up our training,\n" + .string "so can you, like, get lost?$" + +LilycoveCity_Text_1E3D9E: @ 81E3D9E + .string "There’s a POKéMON CONTEST HALL\n" + .string "right in this here town. \p" + .string "That means well-raised POKéMON will\n" + .string "come from all over the country.\p" + .string "My heart swells with excitement!$" + +LilycoveCity_Text_1E3E3C: @ 81E3E3C + .string "Have you seen that strange cave in\n" + .string "the cove at the edge of town?$" + +LilycoveCity_Text_1E3E7D: @ 81E3E7D + .string "I’m going to teach my POKéMON some new\n" + .string "moves for entering a CONTEST.\p" + .string "So, I’m going to see the MOVE DELETER\n" + .string "and make it forget HM moves.$" + +LilycoveCity_Text_1E3F05: @ 81E3F05 + .string "I came from KANTO.\p" + .string "The HOENN region is beautiful with\n" + .string "all its water and verdant nature.\p" + .string "Hunh? Wait a second…\p" + .string "Could there be rare POKéMON that live\n" + .string "only in this area?$" + +LilycoveCity_Text_1E3FAB: @ 81E3FAB + .string "TEAM AQUA’s been training their\n" + .string "WAILMER in the cove.\p" + .string "We SAILORS can’t get our boats out\n" + .string "to sea with them in the way!$" + +LilycoveCity_Text_1E4020: @ 81E4020 + .string "Ahoy, did you know?\p" + .string "Someone punted TEAM AQUA out of\n" + .string "the way for us!\p" + .string "That got the WAILMER out of the cove,\n" + .string "so we can get our boats out again.$" + +LilycoveCity_Text_1E40AD: @ 81E40AD + .string "I was taking a relaxing snooze at the\n" + .string "seaside inn to the sound of waves…\p" + .string "When someone stole my POKéMON!\p" + .string "Who’s the abductor?\n" + .string "TEAM AQUA? Is it TEAM AQUA?$" + +LilycoveCity_Text_1E4145: @ 81E4145 + .string "My missing POKéMON…\n" + .string "It came back without me noticing!$" + +LilycoveCity_Text_1E417B: @ 81E417B + .string "I’m an ART DEALER.\p" + .string "I am a buyer and seller of fine art,\n" + .string "especially paintings.\p" + .string "I’ve heard that the MUSEUM here has\n" + .string "magnificent works on exhibit…$" + +LilycoveCity_Text_1E420B: @ 81E420B + .string "Even as we grow old and wrinkled,\n" + .string "the sea remains forever young with\l" + .string "the vivid brilliance of life…\p" + .string "Fwohoho fwohohohoho…$" + +LilycoveCity_Text_1E4283: @ 81E4283 + .string "It was sixty years ago that my husband\n" + .string "proposed to me here.\l" + .string "The sea remains as beautiful as ever.\p" + .string "Mufufufu mufufufufufu…$" + +LilycoveCity_Text_1E42FC: @ 81E42FC + .string "Hm, you know of the peculiar cavern\n" + .string "in this cove?\p" + .string "That had been a natural formation,\n" + .string "but then that TEAM AQUA lot came\l" + .string "along and made their renovations.\p" + .string "They call themselves\n" + .string "the “nature-loving TEAM AQUAâ€!\p" + .string "But what they do and what they say\n" + .string "don’t match at all!$" + +LilycoveCity_Text_1E43FF: @ 81E43FF + .string "That cave in the cove…\p" + .string "I didn’t notice it right away,\n" + .string "but it’s completely empty now.\p" + .string "That TEAM AQUA lot, they must\n" + .string "have gone away for good.$" + +LilycoveCity_Text_1E448B: @ 81E448B + .string "LILYCOVE CITY\p" + .string "“Where the land ends and the\n" + .string "sea begins.â€$" + +LilycoveCity_Text_1E44C3: @ 81E44C3 + .string "POKéMON CONTEST HALL\n" + .string "“The gathering place for TRAINERS!â€$" + +LilycoveCity_Text_1E44FC: @ 81E44FC + .string "COVE LILY MOTEL\p" + .string "“Remember us as COVE LILY of\n" + .string "LILYCOVE.â€$" + +LilycoveCity_Text_1E4534: @ 81E4534 + .string "LILYCOVE MUSEUM\p" + .string "“POKéMON Masterpiece Collection\n" + .string "on exhibit!â€$" + +LilycoveCity_Text_1E4571: @ 81E4571 + .string "LILYCOVE MUSEUM\p" + .string "“{PLAYER}’s POKéMON Collection\n" + .string "on exhibit!â€$" + +LilycoveCity_Text_1E45A7: @ 81E45A7 + .string "LILYCOVE CITY HARBOR\p" + .string "“The ferry S.S. TIDAL is under\n" + .string "construction in SLATEPORT CITY.\p" + .string "“Service is scheduled to begin\n" + .string "shortly.â€$" + +LilycoveCity_Text_1E4624: @ 81E4624 + .string "LILYCOVE CITY HARBOR\p" + .string "“Enjoy a delightful cruise on\n" + .string "the ferry S.S. TIDAL.â€$" + +LilycoveCity_Text_1E466E: @ 81E466E + .string "POKéMON TRAINER FAN CLUB\p" + .string "The names of TRAINERS are scribbled\n" + .string "all over the sign…$" + +LilycoveCity_Text_1E46BE: @ 81E46BE + .string "LILYCOVE DEPARTMENT STORE\p" + .string "“Overflowing with great merchandise\n" + .string "and excitement!\p" + .string "“A great place to find that something\n" + .string "you need!â€$" + +LilycoveCity_Text_1E473D: @ 81E473D + .string "MOVE DELETER’S HOUSE\p" + .string "“Unwanted POKéMON moves deleted.â€$" + +LilycoveCity_Text_1E4774: @ 81E4774 + .string "Do you know about the machine\n" + .string "BERRY BLENDER?$" + +LilycoveCity_Text_1E47A1: @ 81E47A1 + .string "People have to work together to get it\n" + .string "to spin faster.\p" + .string "The faster you can make it spin, the\n" + .string "better {POKEBLOCK}S you can get, I’ve heard.$" + +LilycoveCity_Text_1E4824: @ 81E4824 + .string "It’s used for making a kind of candy\n" + .string "called a {POKEBLOCK}.\p" + .string "If you give a good {POKEBLOCK} to a POKéMON,\n" + .string "its condition will improve by a lot.$" + +LilycoveCity_Text_1E48A5: @ 81E48A5 + .string "I heard there’s a tower somewhere out\n" + .string "on the sea routes.\p" + .string "It’s called the SKY PILLAR, I hear.$" + +LilycoveCity_Text_1E4902: @ 81E4902 + .string "I saw this tall tower somewhere\n" + .string "around ROUTE 131.\p" + .string "Could that possibly be…?$" + +LilycoveCity_Text_1E494D: @ 81E494D + .string "We just arrived here on our\n" + .string "honeymoon vacation.\p" + .string "We happened to see a DRAGON-type\n" + .string "POKéMON flying way up in the sky.\p" + .string "Do cool POKéMON like that live in\n" + .string "the HOENN region?$" + +LilycoveCity_Text_1E49F4: @ 81E49F4 + .string "On our honeymoon, we vowed to see as\n" + .string "many rare POKéMON as we can.\p" + .string "So we were delighted to see a rare\n" + .string "POKéMON as soon as we arrived.\p" + .string "I mean, we are totally happy!$" + diff --git a/data/maps/LilycoveCity_ContestHall/events.inc b/data/maps/LilycoveCity_ContestHall/events.inc new file mode 100644 index 000000000..dd5655beb --- /dev/null +++ b/data/maps/LilycoveCity_ContestHall/events.inc @@ -0,0 +1,51 @@ +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 + +LilycoveCity_ContestHall_MapWarps: @ 8531B50 + 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 + 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 + +LilycoveCity_ContestHall_MapEvents:: @ 8531BB8 + map_events LilycoveCity_ContestHall_EventObjects, LilycoveCity_ContestHall_MapWarps, 0x0, LilycoveCity_ContestHall_MapBGEvents + diff --git a/data/maps/LilycoveCity_ContestHall/scripts.inc b/data/maps/LilycoveCity_ContestHall/scripts.inc new file mode 100644 index 000000000..3f02a404c --- /dev/null +++ b/data/maps/LilycoveCity_ContestHall/scripts.inc @@ -0,0 +1,509 @@ +LilycoveCity_ContestHall_MapScripts:: @ 821B484 + .byte 0 + +LilycoveCity_ContestHall_EventScript_21B485:: @ 821B485 + msgbox LilycoveCity_ContestHall_Text_21B74E, 2 + end + +LilycoveCity_ContestHall_EventScript_21B48E:: @ 821B48E + msgbox LilycoveCity_ContestHall_Text_21B7D7, 2 + end + +LilycoveCity_ContestHall_EventScript_21B497:: @ 821B497 + msgbox LilycoveCity_ContestHall_Text_21B899, 2 + end + +LilycoveCity_ContestHall_EventScript_21B4A0:: @ 821B4A0 + msgbox LilycoveCity_ContestHall_Text_21B911, 2 + end + +LilycoveCity_ContestHall_EventScript_21B4A9:: @ 821B4A9 + lock + faceplayer + msgbox LilycoveCity_ContestHall_Text_21B977, 4 + closemessage + applymovement 4, LilycoveCity_ContestHall_Movement_2725A2 + waitmovement 0 + release + end + +LilycoveCity_ContestHall_EventScript_21B4C0:: @ 821B4C0 + lock + faceplayer + msgbox LilycoveCity_ContestHall_Text_21B9DC, 4 + closemessage + applymovement 5, LilycoveCity_ContestHall_Movement_2725A2 + waitmovement 0 + release + end + +LilycoveCity_ContestHall_EventScript_21B4D7:: @ 821B4D7 + lock + faceplayer + msgbox LilycoveCity_ContestHall_Text_21BA44, 4 + closemessage + applymovement 6, LilycoveCity_ContestHall_Movement_2725A2 + waitmovement 0 + release + end + +LilycoveCity_ContestHall_EventScript_21B4EE:: @ 821B4EE + lock + faceplayer + msgbox LilycoveCity_ContestHall_Text_21BAD5, 4 + closemessage + applymovement 7, LilycoveCity_ContestHall_Movement_2725A2 + waitmovement 0 + release + end + +LilycoveCity_ContestHall_EventScript_21B505:: @ 821B505 + lock + faceplayer + msgbox LilycoveCity_ContestHall_Text_21BB84, 4 + closemessage + applymovement 8, LilycoveCity_ContestHall_Movement_2725A2 + waitmovement 0 + release + end + +LilycoveCity_ContestHall_EventScript_21B51C:: @ 821B51C + lock + faceplayer + msgbox LilycoveCity_ContestHall_Text_21BBDD, 4 + closemessage + applymovement 9, LilycoveCity_ContestHall_Movement_2725A2 + waitmovement 0 + release + end + +LilycoveCity_ContestHall_EventScript_21B533:: @ 821B533 + msgbox LilycoveCity_ContestHall_Text_21BC65, 3 + end + +LilycoveCity_ContestHall_EventScript_21B53C:: @ 821B53C + lock + faceplayer + msgbox LilycoveCity_ContestHall_Text_21BC89, 4 + closemessage + applymovement 12, LilycoveCity_ContestHall_Movement_2725A2 + waitmovement 0 + release + end + +LilycoveCity_ContestHall_EventScript_21B553:: @ 821B553 + lock + faceplayer + msgbox LilycoveCity_ContestHall_Text_21BD30, 4 + closemessage + applymovement 22, LilycoveCity_ContestHall_Movement_2725A2 + waitmovement 0 + release + end + +LilycoveCity_ContestHall_EventScript_21B56A:: @ 821B56A + lock + faceplayer + msgbox LilycoveCity_ContestHall_Text_21BD70, 4 + closemessage + applymovement 11, LilycoveCity_ContestHall_Movement_2725A2 + waitmovement 0 + release + end + +LilycoveCity_ContestHall_EventScript_21B581:: @ 821B581 + lock + faceplayer + msgbox LilycoveCity_ContestHall_Text_21BDDD, 4 + closemessage + applymovement 13, LilycoveCity_ContestHall_Movement_2725A2 + waitmovement 0 + release + end + +LilycoveCity_ContestHall_EventScript_21B598:: @ 821B598 + lock + faceplayer + msgbox LilycoveCity_ContestHall_Text_21BE16, 4 + closemessage + applymovement 14, LilycoveCity_ContestHall_Movement_2725A2 + waitmovement 0 + release + end + +LilycoveCity_ContestHall_EventScript_21B5AF:: @ 821B5AF + lock + faceplayer + msgbox LilycoveCity_ContestHall_Text_21BE77, 4 + closemessage + applymovement 15, LilycoveCity_ContestHall_Movement_2725A2 + waitmovement 0 + release + end + +LilycoveCity_ContestHall_EventScript_21B5C6:: @ 821B5C6 + lock + faceplayer + msgbox LilycoveCity_ContestHall_Text_21BEDE, 4 + closemessage + applymovement 16, LilycoveCity_ContestHall_Movement_2725A2 + waitmovement 0 + release + end + +LilycoveCity_ContestHall_EventScript_21B5DD:: @ 821B5DD + lock + faceplayer + msgbox LilycoveCity_ContestHall_Text_21BF6E, 4 + closemessage + applymovement 17, LilycoveCity_ContestHall_Movement_2725A2 + waitmovement 0 + release + end + +LilycoveCity_ContestHall_EventScript_21B5F4:: @ 821B5F4 + lock + faceplayer + msgbox LilycoveCity_ContestHall_Text_21BFE3, 4 + closemessage + applymovement 18, LilycoveCity_ContestHall_Movement_2725A2 + waitmovement 0 + release + end + +LilycoveCity_ContestHall_EventScript_21B60B:: @ 821B60B + lock + faceplayer + msgbox LilycoveCity_ContestHall_Text_21C07F, 4 + closemessage + applymovement 19, LilycoveCity_ContestHall_Movement_2725A2 + waitmovement 0 + release + end + +LilycoveCity_ContestHall_EventScript_21B622:: @ 821B622 + lock + faceplayer + msgbox LilycoveCity_ContestHall_Text_21C0D8, 4 + closemessage + applymovement 21, LilycoveCity_ContestHall_Movement_2725A2 + waitmovement 0 + release + end + +LilycoveCity_ContestHall_EventScript_21B639:: @ 821B639 + lock + faceplayer + msgbox LilycoveCity_ContestHall_Text_21C137, 4 + closemessage + applymovement 20, LilycoveCity_ContestHall_Movement_2725A2 + waitmovement 0 + release + end + +LilycoveCity_ContestHall_EventScript_21B650:: @ 821B650 + lock + faceplayer + msgbox LilycoveCity_ContestHall_Text_21C1A4, 4 + closemessage + applymovement 23, LilycoveCity_ContestHall_Movement_2725A2 + waitmovement 0 + release + end + +LilycoveCity_ContestHall_EventScript_21B667:: @ 821B667 + lock + faceplayer + msgbox LilycoveCity_ContestHall_Text_21C215, 4 + closemessage + applymovement 24, LilycoveCity_ContestHall_Movement_2725A2 + waitmovement 0 + release + end + +LilycoveCity_ContestHall_EventScript_21B67E:: @ 821B67E + lock + faceplayer + msgbox LilycoveCity_ContestHall_Text_21C27F, 4 + closemessage + applymovement 25, LilycoveCity_ContestHall_Movement_2725A2 + waitmovement 0 + release + end + +LilycoveCity_ContestHall_EventScript_21B695:: @ 821B695 + lock + faceplayer + msgbox LilycoveCity_ContestHall_Text_21C2BB, 4 + closemessage + applymovement 26, LilycoveCity_ContestHall_Movement_2725A2 + waitmovement 0 + release + end + +LilycoveCity_ContestHall_EventScript_21B6AC:: @ 821B6AC + lock + faceplayer + msgbox LilycoveCity_ContestHall_Text_21C307, 4 + closemessage + applymovement 27, LilycoveCity_ContestHall_Movement_2725A2 + waitmovement 0 + release + end + +LilycoveCity_ContestHall_EventScript_21B6C3:: @ 821B6C3 + lock + faceplayer + msgbox LilycoveCity_ContestHall_Text_21C365, 4 + closemessage + applymovement 28, LilycoveCity_ContestHall_Movement_2725A2 + waitmovement 0 + release + end + +LilycoveCity_ContestHall_EventScript_21B6DA:: @ 821B6DA + lockall + applymovement 29, LilycoveCity_ContestHall_Movement_27259E + waitmovement 0 + msgbox LilycoveCity_ContestHall_Text_21C3F4, 4 + closemessage + applymovement 29, LilycoveCity_ContestHall_Movement_2725A2 + waitmovement 0 + delay 25 + msgbox LilycoveCity_ContestHall_Text_21C411, 4 + releaseall + end + +LilycoveCity_ContestHall_EventScript_21B705:: @ 821B705 + lock + faceplayer + msgbox LilycoveCity_ContestHall_Text_21C4B1, 4 + closemessage + applymovement 31, LilycoveCity_ContestHall_Movement_2725A2 + waitmovement 0 + release + end + +LilycoveCity_ContestHall_EventScript_21B71C:: @ 821B71C + lock + faceplayer + msgbox LilycoveCity_ContestHall_Text_21C445, 4 + closemessage + applymovement 30, LilycoveCity_ContestHall_Movement_2725A2 + waitmovement 0 + release + end + +LilycoveCity_ContestHall_EventScript_21B733:: @ 821B733 + msgbox LilycoveCity_ContestHall_Text_21C512, 3 + end + +LilycoveCity_ContestHall_EventScript_21B73C:: @ 821B73C + msgbox LilycoveCity_ContestHall_Text_21C548, 3 + end + +LilycoveCity_ContestHall_EventScript_21B745:: @ 821B745 + msgbox LilycoveCity_ContestHall_Text_21C57B, 3 + end + +LilycoveCity_ContestHall_Text_21B74E: @ 821B74E + .string "This POKéMON won the BEAUTY CONTEST\n" + .string "here before.\p" + .string "Well, guess what? Today, I made it\n" + .string "win a SMARTNESS CONTEST!\p" + .string "My abilities scare even me…$" + +LilycoveCity_ContestHall_Text_21B7D7: @ 821B7D7 + .string "I’ve entered a bunch of CONTESTS,\n" + .string "so I’m seeing how things work.\p" + .string "If you’re in a COOLNESS CONTEST,\n" + .string "cool moves go over as appeals.\p" + .string "But smart moves and cute moves\n" + .string "don’t go over well, for instance.$" + +LilycoveCity_ContestHall_Text_21B899: @ 821B899 + .string "That young man who won earlier had\n" + .string "a whole bunch of different {POKEBLOCK}S.\p" + .string "Can you win if you had that many\n" + .string "of those things?$" + +LilycoveCity_ContestHall_Text_21B911: @ 821B911 + .string "Whoa, isn’t this place humongous!\p" + .string "The tension in the air… It’s not\n" + .string "like a CONTEST hall in the sticks.$" + +LilycoveCity_ContestHall_Text_21B977: @ 821B977 + .string "MC: Okay, SMART POKéMON and their\n" + .string "TRAINERS, are you ready?!\p" + .string "Give it your best showing!\n" + .string "Let’s appeal!$" + +LilycoveCity_ContestHall_Text_21B9DC: @ 821B9DC + .string "JUDGE: Are you enjoying this CONTEST?\p" + .string "Come back with three friends, and\n" + .string "all of you may enter a CONTEST!$" + +LilycoveCity_ContestHall_Text_21BA44: @ 821BA44 + .string "Ayayayay…\n" + .string "I entered the wrong CONTEST.\p" + .string "I entered this tough POKéMON in\n" + .string "the SMARTNESS CONTEST…\p" + .string "Come on, wow them with a smart-looking\n" + .string "ROCK SMASH.$" + +LilycoveCity_ContestHall_Text_21BAD5: @ 821BAD5 + .string "I’ve spent many a year, and all my\n" + .string "wisdom besides, raising this POKéMON\l" + .string "to be smart.\p" + .string "It won’t be easily bested by some\n" + .string "young pup’s POKéMON.\p" + .string "My dear wife, are you seeing this?$" + +LilycoveCity_ContestHall_Text_21BB84: @ 821BB84 + .string "There it is!\p" + .string "If my POKéMON pulls a smart move next,\n" + .string "the audience’s excitement will peak!$" + +LilycoveCity_ContestHall_Text_21BBDD: @ 821BBDD + .string "Oh, dear, no!\p" + .string "My darling ZUBAT’s LEECH LIFE is so\n" + .string "cute I kept using it over and over!\p" + .string "But these mean people don’t appreciate\n" + .string "it at all!$" + +LilycoveCity_ContestHall_Text_21BC65: @ 821BC65 + .string "Kiyaaah! You’re beautiful, Grandpa!$" + +LilycoveCity_ContestHall_Text_21BC89: @ 821BC89 + .string "Even when TRAINERS enter the same\n" + .string "kind of POKéMON, they all seem to use\l" + .string "different moves for appeals.\p" + .string "It’s just like the way people have\n" + .string "different styles for battling.$" + +LilycoveCity_ContestHall_Text_21BD30: @ 821BD30 + .string "I think the POKéMON look smarter\n" + .string "than their TRAINERS. By a lot.$" + +LilycoveCity_ContestHall_Text_21BD70: @ 821BD70 + .string "When all’s said and done, I still love\n" + .string "SMARTNESS CONTESTS.\p" + .string "That intellectual green color…\n" + .string "It’s so… So… Cool.$" + +LilycoveCity_ContestHall_Text_21BDDD: @ 821BDDD + .string "MC: Are you entering the BEAUTY\n" + .string "CONTEST, too? Good luck!$" + +LilycoveCity_ContestHall_Text_21BE16: @ 821BE16 + .string "JUDGE: Ah, every POKéMON here is\n" + .string "a model of pristine beauty!\p" + .string "Why, I almost forgot to score them!$" + +LilycoveCity_ContestHall_Text_21BE77: @ 821BE77 + .string "A POKéMON this beautiful…\n" + .string "There isn’t another one like it.\p" + .string "Everyone’s eyes will be glued to\n" + .string "my beauty.$" + +LilycoveCity_ContestHall_Text_21BEDE: @ 821BEDE + .string "Waaaah!\p" + .string "I brushed and groomed my POKéMON\n" + .string "carefully for this CONTEST…\p" + .string "But I overdid it…\n" + .string "My POKéMON’s coat turned all scraggly…\p" + .string "What should I do?$" + +LilycoveCity_ContestHall_Text_21BF6E: @ 821BF6E + .string "This AURORA BEAM is so dazzling,\n" + .string "the JUDGE won’t be able to see it.\p" + .string "Uh, wait a second…\n" + .string "That’ll be meaningless, then!$" + +LilycoveCity_ContestHall_Text_21BFE3: @ 821BFE3 + .string "This pretty POKéMON looks just like\n" + .string "me when I was younger.\p" + .string "Right when I said that, my husband\n" + .string "spewed the coffee he was drinking.\p" + .string "Did I say something funny?$" + +LilycoveCity_ContestHall_Text_21C07F: @ 821C07F + .string "You know, if I win at a BEAUTY\n" + .string "CONTEST, sure it makes me\l" + .string "happy. More than usual, anyway.$" + +LilycoveCity_ContestHall_Text_21C0D8: @ 821C0D8 + .string "Wahahahah!\p" + .string "Will you take a gander at all those\n" + .string "pretty POKéMON!\l" + .string "I just love this sort of glitz!$" + +LilycoveCity_ContestHall_Text_21C137: @ 821C137 + .string "You can’t always win on just beauty\n" + .string "alone.\p" + .string "You have to groom your POKéMON so\n" + .string "it’s nice and glossy like mine.$" + +LilycoveCity_ContestHall_Text_21C1A4: @ 821C1A4 + .string "MC: Uh-oh! Hello!\n" + .string "We’re in the middle of a CONTEST!\p" + .string "Please enter at our registration\n" + .string "counter and come out, okay?$" + +LilycoveCity_ContestHall_Text_21C215: @ 821C215 + .string "JUDGE: Oh, such charming and cute\n" + .string "appeals!\p" + .string "Oh, my goodness! What a perfectly\n" + .string "adorable WATER SPORT appeal!$" + +LilycoveCity_ContestHall_Text_21C27F: @ 821C27F + .string "Oh, no… My sweet AZURILL was\n" + .string "distracted by another POKéMON.$" + +LilycoveCity_ContestHall_Text_21C2BB: @ 821C2BB + .string "My POKéMON has never won in a battle,\n" + .string "but put it in a CONTEST and look out!$" + +LilycoveCity_ContestHall_Text_21C307: @ 821C307 + .string "My POKéMON’s PETAL DANCE is a marvel\n" + .string "of elegance.\p" + .string "I won’t let anyone disturb its\n" + .string "performance.$" + +LilycoveCity_ContestHall_Text_21C365: @ 821C365 + .string "Everyone’s POKéMON are very cute.\p" + .string "However, if my POKéMON were to make\n" + .string "a cute appeal…\p" + .string "I’m sure that it would be so much \n" + .string "cuter than the others.$" + +LilycoveCity_ContestHall_Text_21C3F4: @ 821C3F4 + .string "My child is in this CONTEST.$" + +LilycoveCity_ContestHall_Text_21C411: @ 821C411 + .string "Come on, dear. Go for it!\n" + .string "Your POKéMON is the best!$" + +LilycoveCity_ContestHall_Text_21C445: @ 821C445 + .string "I think that girl over there is\n" + .string "the cutest of the lot.\p" + .string "What’s that? They’re judging\n" + .string "POKéMON by their looks?$" + +LilycoveCity_ContestHall_Text_21C4B1: @ 821C4B1 + .string "Ohh, seeing all these cute POKéMON,\n" + .string "they make we want to get my own!\p" + .string "I’m going to go catch some!$" + +LilycoveCity_ContestHall_Text_21C512: @ 821C512 + .string "BEAUTY CONTEST STAGE\n" + .string "BE ALLURED BY BEAUTIFUL POKéMON!$" + +LilycoveCity_ContestHall_Text_21C548: @ 821C548 + .string "CUTENESS CONTEST STAGE\n" + .string "BE CHARMED BY CUTE POKéMON!$" + +LilycoveCity_ContestHall_Text_21C57B: @ 821C57B + .string "SMARTNESS CONTEST STAGE\n" + .string "BE IMPRESSED BY SMART POKéMON!$" + diff --git a/data/maps/LilycoveCity_ContestLobby/events.inc b/data/maps/LilycoveCity_ContestLobby/events.inc new file mode 100644 index 000000000..d7c31c837 --- /dev/null +++ b/data/maps/LilycoveCity_ContestLobby/events.inc @@ -0,0 +1,50 @@ +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 + +LilycoveCity_ContestLobby_MapWarps: @ 853178C + 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 + 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 + +LilycoveCity_ContestLobby_MapEvents:: @ 853183C + map_events LilycoveCity_ContestLobby_EventObjects, LilycoveCity_ContestLobby_MapWarps, 0x0, LilycoveCity_ContestLobby_MapBGEvents + diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc new file mode 100644 index 000000000..a4609ab54 --- /dev/null +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -0,0 +1,1121 @@ +LilycoveCity_ContestLobby_MapScripts:: @ 821A211 + map_script 3, LilycoveCity_ContestLobby_MapScript1_21A21C + map_script 2, LilycoveCity_ContestLobby_MapScript2_21A243 + .byte 0 + +LilycoveCity_ContestLobby_MapScript1_21A21C: @ 821A21C + call LilycoveCity_ContestLobby_EventScript_28CB2B + call LilycoveCity_ContestLobby_EventScript_21A227 + end + +LilycoveCity_ContestLobby_EventScript_21A227:: @ 821A227 + getpricereduction 4 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_ContestLobby_EventScript_21A23C + clearflag FLAG_0x369 + setflag FLAG_0x340 + return + +LilycoveCity_ContestLobby_EventScript_21A23C:: @ 821A23C + setflag FLAG_0x369 + clearflag FLAG_0x340 + return + +LilycoveCity_ContestLobby_MapScript2_21A243: @ 821A243 + map_script_2 VAR_0x4099, 1, LilycoveCity_ContestLobby_EventScript_21A255 + map_script_2 VAR_0x4099, 2, LilycoveCity_ContestLobby_EventScript_21A427 + .2byte 0 + +LilycoveCity_ContestLobby_EventScript_21A255:: @ 821A255 + checkflag FLAG_0x307 + goto_eq LilycoveCity_ContestLobby_EventScript_21A264 + setvar VAR_0x4099, 0 + end + +LilycoveCity_ContestLobby_EventScript_21A264:: @ 821A264 + lockall + addobject 4 + applymovement 4, LilycoveCity_ContestLobby_Movement_21A407 + waitmovement 4 + applymovement 255, LilycoveCity_ContestLobby_Movement_21A418 + waitmovement 0 + msgbox LilycoveCity_ContestLobby_Text_21ADB9, 4 + lockall + fadescreen 1 + drawcontestwinner 0 + lockall + msgbox LilycoveCity_ContestLobby_Text_21AE78, 5 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_ContestLobby_EventScript_21A2AA + compare VAR_RESULT, 0 + goto_eq LilycoveCity_ContestLobby_EventScript_21A2E4 + releaseall + end + +LilycoveCity_ContestLobby_EventScript_21A2AA:: @ 821A2AA + msgbox LilycoveCity_ContestLobby_Text_21AF63, 4 + closemessage + special sub_80F88DC + setvar VAR_0x4099, 0 + specialvar VAR_RESULT, sub_80F8C7C + compare VAR_RESULT, 1 + call_if 1, LilycoveCity_ContestLobby_EventScript_21A314 + applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F + waitmovement 0 + removeobject 4 + call LilycoveCity_ContestLobby_EventScript_21A360 + call LilycoveCity_ContestLobby_EventScript_21A3B6 + releaseall + end + +LilycoveCity_ContestLobby_EventScript_21A2E4:: @ 821A2E4 + msgbox LilycoveCity_ContestLobby_Text_21B0BC, 5 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_ContestLobby_EventScript_21A2AA + msgbox LilycoveCity_ContestLobby_Text_21B132, 4 + closemessage + applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F + waitmovement 0 + setvar VAR_0x4099, 0 + removeobject 4 + releaseall + end + +LilycoveCity_ContestLobby_EventScript_21A314:: @ 821A314 + incrementgamestat 42 + special sub_80F8390 + applymovement 4, LilycoveCity_ContestLobby_Movement_21A41A + waitmovement 0 + playse SE_PIN + applymovement 4, LilycoveCity_ContestLobby_Movement_272598 + waitmovement 0 + applymovement 4, LilycoveCity_ContestLobby_Movement_21A41E + waitmovement 0 + msgbox LilycoveCity_ContestLobby_Text_21B030, 4 + playfanfare MUS_FANFA4 + msgbox LilycoveCity_ContestLobby_Text_21B07E, 4 + waitfanfare + msgbox LilycoveCity_ContestLobby_Text_21B094, 4 + msgbox LilycoveCity_ContestLobby_Text_21B0AD, 4 + closemessage + return + +LilycoveCity_ContestLobby_EventScript_21A360:: @ 821A360 + specialvar VAR_0x8004, sub_80F8940 + switch VAR_0x8004 + case 1, LilycoveCity_ContestLobby_EventScript_21A3A2 + case 2, LilycoveCity_ContestLobby_EventScript_21A3A6 + case 3, LilycoveCity_ContestLobby_EventScript_21A3AA + case 4, LilycoveCity_ContestLobby_EventScript_21A3AE + case 5, LilycoveCity_ContestLobby_EventScript_21A3B2 + return + +LilycoveCity_ContestLobby_EventScript_21A3A2:: @ 821A3A2 + clearflag FLAG_0x308 + return + +LilycoveCity_ContestLobby_EventScript_21A3A6:: @ 821A3A6 + clearflag FLAG_0x309 + return + +LilycoveCity_ContestLobby_EventScript_21A3AA:: @ 821A3AA + clearflag FLAG_0x30A + return + +LilycoveCity_ContestLobby_EventScript_21A3AE:: @ 821A3AE + clearflag FLAG_0x30B + return + +LilycoveCity_ContestLobby_EventScript_21A3B2:: @ 821A3B2 + clearflag FLAG_0x30C + return + +LilycoveCity_ContestLobby_EventScript_21A3B6:: @ 821A3B6 + switch VAR_CONTEST_CATEGORY + case 0, LilycoveCity_ContestLobby_EventScript_21A3F3 + case 1, LilycoveCity_ContestLobby_EventScript_21A3F7 + case 2, LilycoveCity_ContestLobby_EventScript_21A3FB + case 3, LilycoveCity_ContestLobby_EventScript_21A3FF + case 4, LilycoveCity_ContestLobby_EventScript_21A403 + return + +LilycoveCity_ContestLobby_EventScript_21A3F3:: @ 821A3F3 + setflag FLAG_0x0A0 + return + +LilycoveCity_ContestLobby_EventScript_21A3F7:: @ 821A3F7 + setflag FLAG_0x0A1 + return + +LilycoveCity_ContestLobby_EventScript_21A3FB:: @ 821A3FB + setflag FLAG_0x0A2 + return + +LilycoveCity_ContestLobby_EventScript_21A3FF:: @ 821A3FF + setflag FLAG_0x0A3 + return + +LilycoveCity_ContestLobby_EventScript_21A403:: @ 821A403 + setflag FLAG_0x0A4 + return + +LilycoveCity_ContestLobby_Movement_21A407: @ 821A407 + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + step_end + +LilycoveCity_ContestLobby_Movement_21A40F: @ 821A40F + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + step_end + +LilycoveCity_ContestLobby_Movement_21A418: @ 821A418 + walk_in_place_fastest_left + step_end + +LilycoveCity_ContestLobby_Movement_21A41A: @ 821A41A + walk_down + walk_down + walk_down + step_end + +LilycoveCity_ContestLobby_Movement_21A41E: @ 821A41E + 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 + checkflag FLAG_0x307 + goto_eq LilycoveCity_ContestLobby_EventScript_21A436 + setvar VAR_0x4099, 0 + end + +LilycoveCity_ContestLobby_EventScript_21A436:: @ 821A436 + lockall + addobject 11 + applymovement 11, LilycoveCity_ContestLobby_Movement_21A533 + waitmovement 11 + applymovement 255, LilycoveCity_ContestLobby_Movement_21A545 + waitmovement 0 + msgbox LilycoveCity_ContestLobby_Text_21ADB9, 4 + lockall + fadescreen 1 + drawcontestwinner 0 + msgbox LilycoveCity_ContestLobby_Text_21AE78, 5 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_ContestLobby_EventScript_21A47A + compare VAR_RESULT, 0 + goto_eq LilycoveCity_ContestLobby_EventScript_21A4B4 + end + +LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A + msgbox LilycoveCity_ContestLobby_Text_21AF63, 4 + closemessage + special sub_80F88DC + setvar VAR_0x4099, 0 + specialvar VAR_RESULT, sub_80F8C7C + compare VAR_RESULT, 1 + call_if 1, LilycoveCity_ContestLobby_EventScript_21A4E4 + applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C + waitmovement 0 + removeobject 11 + call LilycoveCity_ContestLobby_EventScript_21A360 + call LilycoveCity_ContestLobby_EventScript_21A3B6 + releaseall + end + +LilycoveCity_ContestLobby_EventScript_21A4B4:: @ 821A4B4 + msgbox LilycoveCity_ContestLobby_Text_21B0BC, 5 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_ContestLobby_EventScript_21A47A + msgbox LilycoveCity_ContestLobby_Text_21B132, 4 + closemessage + applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C + waitmovement 0 + setvar VAR_0x4099, 0 + removeobject 11 + releaseall + end + +LilycoveCity_ContestLobby_EventScript_21A4E4:: @ 821A4E4 + incrementgamestat 42 + setflag FLAG_SYS_RIBBON_GET + special sub_80F8390 + applymovement 11, LilycoveCity_ContestLobby_Movement_21A547 + waitmovement 0 + playse SE_PIN + applymovement 11, LilycoveCity_ContestLobby_Movement_272598 + waitmovement 0 + applymovement 11, LilycoveCity_ContestLobby_Movement_21A54B + waitmovement 0 + msgbox LilycoveCity_ContestLobby_Text_21B030, 4 + playfanfare MUS_FANFA4 + msgbox LilycoveCity_ContestLobby_Text_21B07E, 4 + waitfanfare + msgbox LilycoveCity_ContestLobby_Text_21B094, 4 + msgbox LilycoveCity_ContestLobby_Text_21B0AD, 4 + closemessage + return + +LilycoveCity_ContestLobby_Movement_21A533: @ 821A533 + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + step_end + +LilycoveCity_ContestLobby_Movement_21A53C: @ 821A53C + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + step_end + +LilycoveCity_ContestLobby_Movement_21A545: @ 821A545 + walk_in_place_fastest_right + step_end + +LilycoveCity_ContestLobby_Movement_21A547: @ 821A547 + walk_down + walk_down + walk_down + step_end + +LilycoveCity_ContestLobby_Movement_21A54B: @ 821A54B + 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 + special sub_80F9154 + specialvar VAR_RESULT, sub_80F8D24 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_ContestLobby_EventScript_21A5CF + call LilycoveCity_ContestLobby_EventScript_279CC5 + call LilycoveCity_ContestLobby_EventScript_21A670 + special sub_80F87D8 + call LilycoveCity_ContestLobby_EventScript_23BEB6 + call LilycoveCity_ContestLobby_EventScript_21A585 + call LilycoveCity_ContestLobby_EventScript_21A5EF + waitstate + end + +LilycoveCity_ContestLobby_EventScript_21A585:: @ 821A585 + switch VAR_CONTEST_RANK + case 0, LilycoveCity_ContestLobby_EventScript_21A5B7 + case 1, LilycoveCity_ContestLobby_EventScript_21A5BD + case 2, LilycoveCity_ContestLobby_EventScript_21A5C3 + case 3, LilycoveCity_ContestLobby_EventScript_21A5C9 + return + +LilycoveCity_ContestLobby_EventScript_21A5B7:: @ 821A5B7 + setvar VAR_0x4088, 1 + return + +LilycoveCity_ContestLobby_EventScript_21A5BD:: @ 821A5BD + setvar VAR_0x4088, 2 + return + +LilycoveCity_ContestLobby_EventScript_21A5C3:: @ 821A5C3 + setvar VAR_0x4088, 3 + return + +LilycoveCity_ContestLobby_EventScript_21A5C9:: @ 821A5C9 + setvar VAR_0x4088, 4 + return + +LilycoveCity_ContestLobby_EventScript_21A5CF:: @ 821A5CF + setflag FLAG_0x307 + copyvar VAR_0x4094, 0x1 + giveitem ITEM_CONTEST_PASS, 1 + setvar VAR_0x800B, 8 + setvar VAR_CONTEST_RANK, 3 + setvar VAR_0x4099, 1 + setflag FLAG_SYS_RIBBON_GET + end + +LilycoveCity_ContestLobby_EventScript_21A5EF:: @ 821A5EF + setflag FLAG_0x155 + switch VAR_CONTEST_CATEGORY + case 0, LilycoveCity_ContestLobby_EventScript_21A62F + case 1, LilycoveCity_ContestLobby_EventScript_21A63C + case 2, LilycoveCity_ContestLobby_EventScript_21A649 + case 3, LilycoveCity_ContestLobby_EventScript_21A656 + case 4, LilycoveCity_ContestLobby_EventScript_21A663 + return + +LilycoveCity_ContestLobby_EventScript_21A62F:: @ 821A62F + setwarp MAP_LINK_CONTEST_ROOM4, 255, 7, 5 + special sub_80AFC60 + waitstate + return + +LilycoveCity_ContestLobby_EventScript_21A63C:: @ 821A63C + setwarp MAP_LINK_CONTEST_ROOM2, 255, 7, 5 + special sub_80AFC60 + waitstate + return + +LilycoveCity_ContestLobby_EventScript_21A649:: @ 821A649 + setwarp MAP_LINK_CONTEST_ROOM6, 255, 7, 5 + special sub_80AFC60 + waitstate + return + +LilycoveCity_ContestLobby_EventScript_21A656:: @ 821A656 + setwarp MAP_LINK_CONTEST_ROOM5, 255, 7, 5 + special sub_80AFC60 + waitstate + return + +LilycoveCity_ContestLobby_EventScript_21A663:: @ 821A663 + setwarp MAP_LINK_CONTEST_ROOM3, 255, 7, 5 + special sub_80AFC60 + waitstate + return + +LilycoveCity_ContestLobby_EventScript_21A670:: @ 821A670 + lockall + applymovement 1, LilycoveCity_ContestLobby_Movement_21A6F5 + waitmovement 0 + playse SE_HASHI + setmetatile 12, 2, 545, 1 + setmetatile 12, 3, 609, 1 + special DrawWholeMapView + applymovement 1, LilycoveCity_ContestLobby_Movement_21A6F9 + waitmovement 0 + playse SE_HASHI + setmetatile 12, 2, 721, 1 + setmetatile 12, 3, 729, 1 + special DrawWholeMapView + delay 20 + applymovement 1, LilycoveCity_ContestLobby_Movement_21A706 + waitmovement 0 + applymovement 255, LilycoveCity_ContestLobby_Movement_21A6F2 + waitmovement 0 + msgbox LilycoveCity_ContestLobby_Text_27B653, 4 + closemessage + applymovement 1, LilycoveCity_ContestLobby_Movement_21A6FD + applymovement 255, LilycoveCity_ContestLobby_Movement_21A6E8 + waitmovement 0 + releaseall + return + +LilycoveCity_ContestLobby_Movement_21A6E8: @ 821A6E8 + 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 + walk_in_place_fastest_left + walk_left + step_end + +LilycoveCity_ContestLobby_Movement_21A6F5: @ 821A6F5 + walk_left + walk_left + walk_in_place_fastest_down + step_end + +LilycoveCity_ContestLobby_Movement_21A6F9: @ 821A6F9 + walk_down + walk_down + walk_in_place_fastest_up + step_end + +LilycoveCity_ContestLobby_Movement_21A6FD: @ 821A6FD + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + delay_8 + set_invisible + step_end + +LilycoveCity_ContestLobby_Movement_21A706: @ 821A706 + walk_in_place_fastest_right + step_end + +LilycoveCity_ContestLobby_EventScript_21A708:: @ 821A708 + msgbox LilycoveCity_ContestLobby_Text_21B1B1, 2 + end + +LilycoveCity_ContestLobby_EventScript_21A711:: @ 821A711 + msgbox LilycoveCity_ContestLobby_Text_21B24D, 2 + end + +LilycoveCity_ContestLobby_EventScript_21A71A:: @ 821A71A + msgbox LilycoveCity_ContestLobby_Text_21B2BA, 2 + end + +LilycoveCity_ContestLobby_EventScript_21A723:: @ 821A723 + msgbox LilycoveCity_ContestLobby_Text_21B334, 2 + end + +LilycoveCity_ContestLobby_EventScript_21A72C:: @ 821A72C + msgbox LilycoveCity_ContestLobby_Text_21B392, 2 + end + +LilycoveCity_ContestLobby_EventScript_21A735:: @ 821A735 + msgbox LilycoveCity_ContestLobby_Text_21B3FC, 2 + end + +LilycoveCity_ContestLobby_EventScript_21A73E:: @ 821A73E + lockall + fadescreen 1 + drawcontestwinner 1 + releaseall + end + +LilycoveCity_ContestLobby_EventScript_21A745:: @ 821A745 + lockall + fadescreen 1 + drawcontestwinner 2 + releaseall + end + +LilycoveCity_ContestLobby_EventScript_21A74C:: @ 821A74C + lockall + fadescreen 1 + drawcontestwinner 3 + releaseall + end + +LilycoveCity_ContestLobby_EventScript_21A753:: @ 821A753 + lockall + fadescreen 1 + drawcontestwinner 4 + releaseall + end + +LilycoveCity_ContestLobby_EventScript_21A75A:: @ 821A75A + lockall + fadescreen 1 + drawcontestwinner 5 + releaseall + end + +LilycoveCity_ContestLobby_EventScript_21A761:: @ 821A761 + lockall + fadescreen 1 + drawcontestwinner 6 + releaseall + end + +LilycoveCity_ContestLobby_EventScript_21A768:: @ 821A768 + msgbox LilycoveCity_ContestLobby_Text_2931AA, 2 + end + +LilycoveCity_ContestLobby_EventScript_21A771:: @ 821A771 + msgbox LilycoveCity_ContestLobby_Text_2931C6, 2 + end + +LilycoveCity_ContestLobby_EventScript_21A77A:: @ 821A77A + lockall + special ShowBerryBlenderRecordWindow + waitbuttonpress + special RemoveRecordsWindow + releaseall + end + +LilycoveCity_ContestLobby_EventScript_21A784:: @ 821A784 + lockall + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 7 + special sub_81A1780 + waitbuttonpress + special RemoveRecordsWindow + releaseall + end + +LilycoveCity_ContestLobby_EventScript_21A798:: @ 821A798 + lock + faceplayer + msgbox LilycoveCity_ContestLobby_Text_2C427C, 4 + goto LilycoveCity_ContestLobby_EventScript_21A7F9 + end + +LilycoveCity_ContestLobby_EventScript_21A7A8:: @ 821A7A8 + lock + msgbox LilycoveCity_ContestLobby_Text_2C464B, 4 + release + end + +LilycoveCity_ContestLobby_EventScript_21A7B3:: @ 821A7B3 + lock + msgbox LilycoveCity_ContestLobby_Text_2C465A, 4 + release + end + +LilycoveCity_ContestLobby_EventScript_21A7BE:: @ 821A7BE + lock + msgbox LilycoveCity_ContestLobby_Text_2C4669, 4 + release + end + +LilycoveCity_ContestLobby_EventScript_21A7C9:: @ 821A7C9 + lock + faceplayer + msgbox LilycoveCity_ContestLobby_Text_2C4679, 4 + goto LilycoveCity_ContestLobby_EventScript_21A7F9 + end + +LilycoveCity_ContestLobby_EventScript_21A7D9:: @ 821A7D9 + lock + faceplayer + msgbox LilycoveCity_ContestLobby_Text_2C46B1, 4 + goto LilycoveCity_ContestLobby_EventScript_21A7F9 + end + +LilycoveCity_ContestLobby_EventScript_21A7E9:: @ 821A7E9 + lock + faceplayer + msgbox LilycoveCity_ContestLobby_Text_2C4763, 4 + goto LilycoveCity_ContestLobby_EventScript_21A7F9 + end + +LilycoveCity_ContestLobby_EventScript_21A7F9:: @ 821A7F9 + closemessage + applymovement VAR_LAST_TALKED, LilycoveCity_ContestLobby_Movement_2725A2 + waitmovement 0 + release + end + +LilycoveCity_ContestLobby_EventScript_21A806:: @ 821A806 + special sub_80F9154 + lock + faceplayer + msgbox LilycoveCity_ContestLobby_Text_27C063, 4 + goto LilycoveCity_ContestLobby_EventScript_21A819 + end + +LilycoveCity_ContestLobby_EventScript_21A819:: @ 821A819 + message LilycoveCity_ContestLobby_Text_27C0F6 + waitmessage + multichoice 0, 0, 2, 0 + switch VAR_RESULT + case 0, LilycoveCity_ContestLobby_EventScript_21A856 + case 1, LilycoveCity_ContestLobby_EventScript_21A90D + case 2, LilycoveCity_ContestLobby_EventScript_21A97F + case 127, LilycoveCity_ContestLobby_EventScript_21A97F + end + +LilycoveCity_ContestLobby_EventScript_21A856:: @ 821A856 + msgbox LilycoveCity_ContestLobby_Text_27BD17, 5 + compare VAR_RESULT, 0 + goto_eq LilycoveCity_ContestLobby_EventScript_21A97F + call LilycoveCity_ContestLobby_EventScript_27134F + compare VAR_RESULT, 0 + goto_eq LilycoveCity_ContestLobby_EventScript_21A97F + message LilycoveCity_ContestLobby_Text_27C8FD + waitmessage + specialvar VAR_TEMP_D, sub_80093CC + multichoice 0, 0, 85, 0 + switch VAR_RESULT + case 0, LilycoveCity_ContestLobby_EventScript_21A8BB + case 1, LilycoveCity_ContestLobby_EventScript_21A8C6 + case 2, LilycoveCity_ContestLobby_EventScript_21A97F + case 127, LilycoveCity_ContestLobby_EventScript_21A97F + end + +LilycoveCity_ContestLobby_EventScript_21A8BB:: @ 821A8BB + setvar VAR_TEMP_C, 0 + goto LilycoveCity_ContestLobby_EventScript_21A8DC + end + +LilycoveCity_ContestLobby_EventScript_21A8C6:: @ 821A8C6 + setvar VAR_TEMP_C, 1 + compare VAR_TEMP_D, 1 + goto_eq LilycoveCity_ContestLobby_EventScript_21AAFC + goto LilycoveCity_ContestLobby_EventScript_21A8DC + end + +LilycoveCity_ContestLobby_EventScript_21A8DC:: @ 821A8DC + message LilycoveCity_ContestLobby_Text_27C119 + waitmessage + multichoice 0, 0, 4, 0 + switch VAR_RESULT + case 5, LilycoveCity_ContestLobby_EventScript_21A97F + case 127, LilycoveCity_ContestLobby_EventScript_21A97F + copyvar VAR_CONTEST_CATEGORY, VAR_RESULT + goto LilycoveCity_ContestLobby_EventScript_21A98C + end + +LilycoveCity_ContestLobby_EventScript_21A90D:: @ 821A90D + message LilycoveCity_ContestLobby_Text_27C0DA + waitmessage + multichoice 0, 0, 84, 0 + switch VAR_RESULT + case 0, LilycoveCity_ContestLobby_EventScript_21A955 + case 1, LilycoveCity_ContestLobby_EventScript_21A963 + case 2, LilycoveCity_ContestLobby_EventScript_21A971 + case 3, LilycoveCity_ContestLobby_EventScript_21A819 + case 127, LilycoveCity_ContestLobby_EventScript_21A819 + end + +LilycoveCity_ContestLobby_EventScript_21A955:: @ 821A955 + msgbox LilycoveCity_ContestLobby_Text_27C340, 4 + goto LilycoveCity_ContestLobby_EventScript_21A90D + end + +LilycoveCity_ContestLobby_EventScript_21A963:: @ 821A963 + msgbox LilycoveCity_ContestLobby_Text_27C5B1, 4 + goto LilycoveCity_ContestLobby_EventScript_21A90D + end + +LilycoveCity_ContestLobby_EventScript_21A971:: @ 821A971 + msgbox LilycoveCity_ContestLobby_Text_27C742, 4 + goto LilycoveCity_ContestLobby_EventScript_21A90D + end + +LilycoveCity_ContestLobby_EventScript_21A97F:: @ 821A97F + special CloseLink + msgbox LilycoveCity_ContestLobby_Text_27BD4F, 4 + release + end + +LilycoveCity_ContestLobby_EventScript_21A98C:: @ 821A98C + msgbox LilycoveCity_ContestLobby_Text_27C1C3, 4 + setvar VAR_CONTEST_RANK, 0 + choosecontestmon + compare VAR_0x8004, 255 + goto_eq LilycoveCity_ContestLobby_EventScript_21A97F + special sub_80F7F30 + compare VAR_RESULT, 0 + goto_eq LilycoveCity_ContestLobby_EventScript_21A9E0 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_ContestLobby_EventScript_21AA0A + compare VAR_RESULT, 2 + goto_eq LilycoveCity_ContestLobby_EventScript_21AA0A + compare VAR_RESULT, 3 + goto_eq LilycoveCity_ContestLobby_EventScript_21A9EE + compare VAR_RESULT, 4 + goto_eq LilycoveCity_ContestLobby_EventScript_21A9FC + end + +LilycoveCity_ContestLobby_EventScript_21A9E0:: @ 821A9E0 + msgbox LilycoveCity_ContestLobby_Text_27B471, 4 + goto LilycoveCity_ContestLobby_EventScript_21A98C + end + +LilycoveCity_ContestLobby_EventScript_21A9EE:: @ 821A9EE + msgbox LilycoveCity_ContestLobby_Text_27C186, 4 + goto LilycoveCity_ContestLobby_EventScript_21A98C + end + +LilycoveCity_ContestLobby_EventScript_21A9FC:: @ 821A9FC + msgbox LilycoveCity_ContestLobby_Text_27C140, 4 + goto LilycoveCity_ContestLobby_EventScript_21A98C + end + +LilycoveCity_ContestLobby_EventScript_21AA0A:: @ 821AA0A + copyvar VAR_0x8008, VAR_0x8004 + goto LilycoveCity_ContestLobby_EventScript_21AA15 + end + +LilycoveCity_ContestLobby_EventScript_21AA15:: @ 821AA15 + compare VAR_TEMP_D, 1 + goto_eq LilycoveCity_ContestLobby_EventScript_21AB4B + compare VAR_TEMP_D, 2 + goto_if 4, LilycoveCity_ContestLobby_EventScript_21A97F + message LilycoveCity_ContestLobby_Text_27BF85 + waitmessage + copyvar VAR_0x8004, VAR_RESULT + compare VAR_TEMP_C, 0 + call_if 1, LilycoveCity_ContestLobby_EventScript_21AABB + compare VAR_TEMP_C, 1 + call_if 1, LilycoveCity_ContestLobby_EventScript_21AAC0 + compare VAR_TEMP_C, 2 + goto_if 4, LilycoveCity_ContestLobby_EventScript_21A97F + compare VAR_RESULT, 4 + goto_eq LilycoveCity_ContestLobby_EventScript_21AAD3 + compare VAR_RESULT, 3 + goto_eq LilycoveCity_ContestLobby_EventScript_21AAD3 + compare VAR_RESULT, 5 + goto_eq LilycoveCity_ContestLobby_EventScript_21A97F + compare VAR_RESULT, 6 + goto_eq LilycoveCity_ContestLobby_EventScript_21AAEF + compare VAR_RESULT, 10 + goto_eq LilycoveCity_ContestLobby_EventScript_21AAE1 + message3 LilycoveCity_ContestLobby_Text_27BEEC + contestlinktransfer + switch VAR_0x8004 + case 0, LilycoveCity_ContestLobby_EventScript_21AB17 + case 1, LilycoveCity_ContestLobby_EventScript_21AAC5 + case 2, LilycoveCity_ContestLobby_EventScript_21AB09 + end + +LilycoveCity_ContestLobby_EventScript_21AABB:: @ 821AABB + special sub_80B3028 + waitstate + return + +LilycoveCity_ContestLobby_EventScript_21AAC0:: @ 821AAC0 + special sub_80B3000 + waitstate + return + +LilycoveCity_ContestLobby_EventScript_21AAC5:: @ 821AAC5 + msgbox LilycoveCity_ContestLobby_Text_27BF0E, 4 + goto LilycoveCity_ContestLobby_EventScript_21A97F + end + +LilycoveCity_ContestLobby_EventScript_21AAD3:: @ 821AAD3 + msgbox LilycoveCity_ContestLobby_Text_27BF4B, 4 + goto LilycoveCity_ContestLobby_EventScript_21A97F + end + +LilycoveCity_ContestLobby_EventScript_21AAE1:: @ 821AAE1 + msgbox LilycoveCity_ContestLobby_Text_27C254, 4 + goto LilycoveCity_ContestLobby_EventScript_21A97F + end + +LilycoveCity_ContestLobby_EventScript_21AAEF:: @ 821AAEF + special CloseLink + msgbox LilycoveCity_ContestLobby_Text_27821C, 4 + release + end + +LilycoveCity_ContestLobby_EventScript_21AAFC:: @ 821AAFC + special CloseLink + msgbox LilycoveCity_ContestLobby_Text_27C879, 4 + release + end + +LilycoveCity_ContestLobby_EventScript_21AB09:: @ 821AB09 + msgbox LilycoveCity_ContestLobby_Text_27BEFA, 4 + goto LilycoveCity_ContestLobby_EventScript_21A97F + end + +LilycoveCity_ContestLobby_EventScript_21AB17:: @ 821AB17 + special sub_80F84B0 + addvar VAR_0x8004, 1 + buffernumberstring 1, VAR_0x8004 + messageautoscroll LilycoveCity_ContestLobby_Text_27BFF8 + waitmessage + subvar VAR_0x8004, 1 + call LilycoveCity_ContestLobby_EventScript_21AC49 + setvar VAR_0x4086, 1 + special sub_80F8AFC + setvar VAR_0x4088, 5 + setvar VAR_CONTEST_RANK, 3 + call LilycoveCity_ContestLobby_EventScript_21A5EF + end + +LilycoveCity_ContestLobby_EventScript_21AB4B:: @ 821AB4B + compare VAR_CONTEST_CATEGORY, 0 + call_if 1, LilycoveCity_ContestLobby_EventScript_21AB88 + compare VAR_CONTEST_CATEGORY, 1 + call_if 1, LilycoveCity_ContestLobby_EventScript_21AB8E + compare VAR_CONTEST_CATEGORY, 2 + call_if 1, LilycoveCity_ContestLobby_EventScript_21AB94 + compare VAR_CONTEST_CATEGORY, 3 + call_if 1, LilycoveCity_ContestLobby_EventScript_21AB9A + compare VAR_CONTEST_CATEGORY, 4 + call_if 1, LilycoveCity_ContestLobby_EventScript_21ABA0 + goto LilycoveCity_ContestLobby_EventScript_21ABA6 + end + +LilycoveCity_ContestLobby_EventScript_21AB88:: @ 821AB88 + setvar VAR_0x8004, 15 + return + +LilycoveCity_ContestLobby_EventScript_21AB8E:: @ 821AB8E + setvar VAR_0x8004, 16 + return + +LilycoveCity_ContestLobby_EventScript_21AB94:: @ 821AB94 + setvar VAR_0x8004, 17 + return + +LilycoveCity_ContestLobby_EventScript_21AB9A:: @ 821AB9A + setvar VAR_0x8004, 18 + return + +LilycoveCity_ContestLobby_EventScript_21ABA0:: @ 821ABA0 + setvar VAR_0x8004, 19 + return + +LilycoveCity_ContestLobby_EventScript_21ABA6:: @ 821ABA6 + message LilycoveCity_ContestLobby_Text_27C1EA + waitmessage + multichoice 16, 6, 81, 0 + switch VAR_RESULT + case 0, LilycoveCity_ContestLobby_EventScript_21AC0B + case 1, LilycoveCity_ContestLobby_EventScript_21ABE3 + case 2, LilycoveCity_ContestLobby_EventScript_21A97F + case 127, LilycoveCity_ContestLobby_EventScript_21A97F + end + +LilycoveCity_ContestLobby_EventScript_21ABE3:: @ 821ABE3 + call LilycoveCity_ContestLobby_EventScript_21AC33 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_ContestLobby_EventScript_21AC3D + compare VAR_RESULT, 5 + goto_eq LilycoveCity_ContestLobby_EventScript_21ABA6 + compare VAR_RESULT, 8 + goto_eq LilycoveCity_ContestLobby_EventScript_21ABE3 + release + end + +LilycoveCity_ContestLobby_EventScript_21AC0B:: @ 821AC0B + call LilycoveCity_ContestLobby_EventScript_21AC38 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_ContestLobby_EventScript_21AC3D + compare VAR_RESULT, 5 + goto_eq LilycoveCity_ContestLobby_EventScript_21ABA6 + compare VAR_RESULT, 8 + goto_eq LilycoveCity_ContestLobby_EventScript_21AC0B + release + end + +LilycoveCity_ContestLobby_EventScript_21AC33:: @ 821AC33 + special BerryBlenderLinkBecomeLeader + waitstate + return + +LilycoveCity_ContestLobby_EventScript_21AC38:: @ 821AC38 + special BerryBlenderLinkJoinGroup + waitstate + return + +LilycoveCity_ContestLobby_EventScript_21AC3D:: @ 821AC3D + message3 LilycoveCity_ContestLobby_Text_27BEEC + contestlinktransfer + goto LilycoveCity_ContestLobby_EventScript_21AB17 + end + +LilycoveCity_ContestLobby_EventScript_21AC49:: @ 821AC49 + messageautoscroll LilycoveCity_ContestLobby_Text_27C043 + waitmessage + delay 20 + closemessage + applymovement 2, LilycoveCity_ContestLobby_Movement_21ACDD + waitmovement 0 + playse SE_HASHI + setmetatile 17, 2, 545, 1 + setmetatile 17, 3, 609, 1 + special DrawWholeMapView + applymovement 2, LilycoveCity_ContestLobby_Movement_21ACE1 + waitmovement 0 + playse SE_HASHI + setmetatile 17, 2, 721, 1 + setmetatile 17, 3, 729, 1 + special DrawWholeMapView + delay 20 + applymovement 2, LilycoveCity_ContestLobby_Movement_21ACEF + waitmovement 0 + applymovement 255, LilycoveCity_ContestLobby_Movement_21ACDB + waitmovement 0 + messageautoscroll LilycoveCity_ContestLobby_Text_27B653 + waitmessage + delay 20 + closemessage + call LilycoveCity_ContestLobby_EventScript_27AD92 + applymovement 2, LilycoveCity_ContestLobby_Movement_21ACE5 + applymovement 255, LilycoveCity_ContestLobby_Movement_21ACD0 + waitmovement 0 + release + return + +LilycoveCity_ContestLobby_Movement_21ACD0: @ 821ACD0 + 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 + walk_right + step_end + +LilycoveCity_ContestLobby_Movement_21ACDD: @ 821ACDD + walk_right + walk_right + walk_in_place_fastest_down + step_end + +LilycoveCity_ContestLobby_Movement_21ACE1: @ 821ACE1 + walk_down + walk_down + walk_in_place_fastest_up + step_end + +LilycoveCity_ContestLobby_Movement_21ACE5: @ 821ACE5 + 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 + walk_in_place_fastest_left + step_end + +LilycoveCity_ContestLobby_EventScript_21ACF1:: @ 821ACF1 + lock + faceplayer + checkflag FLAG_0x05F + goto_eq LilycoveCity_ContestLobby_EventScript_21AD06 + msgbox LilycoveCity_ContestLobby_Text_21AD10, 4 + release + end + +LilycoveCity_ContestLobby_EventScript_21AD06:: @ 821AD06 + msgbox LilycoveCity_ContestLobby_Text_21AD55, 4 + release + end + +LilycoveCity_ContestLobby_Text_21AD10: @ 821AD10 + .string "Yippee!\p" + .string "The lady at the reception counter\n" + .string "gave me a case for {POKEBLOCK}S!$" + +LilycoveCity_ContestLobby_Text_21AD55: @ 821AD55 + .string "Make {POKEBLOCK}S and put them in there.\p" + .string "When you make a {POKEBLOCK}, everyone\n" + .string "has to put in a different BERRY.$" + +LilycoveCity_ContestLobby_Text_21ADB9: @ 821ADB9 + .string "Congratulations!\p" + .string "I did a painting of your POKéMON to\n" + .string "commemorate its victory…\p" + .string "Well, your POKéMON’s appeals were\n" + .string "so fantastic, it spurred me into\l" + .string "painting better than I usually do.\l" + .string "Look, see?$" + +LilycoveCity_ContestLobby_Text_21AE78: @ 821AE78 + .string "What do you think? I’m confident in\n" + .string "what I’ve done, but do you like it?\p" + .string "A work of this caliber, it wouldn’t look\n" + .string "out of place in an art museum.\p" + .string "Huh? An art museum really is looking\n" + .string "for paintings?\p" + .string "Do you think I should take this there?$" + +LilycoveCity_ContestLobby_Text_21AF63: @ 821AF63 + .string "What, really? Then, sure, I will take\n" + .string "this painting there right now.\p" + .string "I’ll give it a proper title, too.\p" + .string "I hope they’ll like it and consider\n" + .string "exhibiting this.\p" + .string "Please check if they did accept this.\n" + .string "Thank you!$" + +LilycoveCity_ContestLobby_Text_21B030: @ 821B030 + .string "Oh, that’s right!\p" + .string "As a memento of me painting your\n" + .string "POKéMON, please take this.$" + +LilycoveCity_ContestLobby_Text_21B07E: @ 821B07E + .string "{PLAYER} received a RIBBON.$" + +LilycoveCity_ContestLobby_Text_21B094: @ 821B094 + .string "{PLAYER} put the RIBBON on\n" + .string "{STR_VAR_1}.$" + +LilycoveCity_ContestLobby_Text_21B0AD: @ 821B0AD + .string "Okay, see you!$" + +LilycoveCity_ContestLobby_Text_21B0BC: @ 821B0BC + .string "Oh… Then, I guess I’ll just take\n" + .string "this home with me…\p" + .string "But, you know, I would like to take\n" + .string "this to the art museum… Okay?$" + +LilycoveCity_ContestLobby_Text_21B132: @ 821B132 + .string "Oh, fine, that’s the way it is.\n" + .string "I will hang this in my own house.\p" + .string "I’ll just have to try harder next time.\n" + .string "Well, be seeing you.$" + +LilycoveCity_ContestLobby_Text_21B1B1: @ 821B1B1 + .string "Hoo, boy… Master Rank CONTESTS,\n" + .string "here I come.\p" + .string "The world will know that my dearest\n" + .string "POKéMON is the cutest being in all\l" + .string "existence. The time has come!\l" + .string "Uheheheh.$" + +LilycoveCity_ContestLobby_Text_21B24D: @ 821B24D + .string "You can see a whole variety of\n" + .string "POKéMON here.\p" + .string "That’s why I make this place a regular\n" + .string "part of my daily stroll.$" + +LilycoveCity_ContestLobby_Text_21B2BA: @ 821B2BA + .string "Wow, coming out to a CONTEST is\n" + .string "a feast for these eyes!\p" + .string "Would you look at all the POKéMON\n" + .string "that just scream to be painted?$" + +LilycoveCity_ContestLobby_Text_21B334: @ 821B334 + .string "The TOUGHNESS CONTEST is like\n" + .string "extreme, man!\p" + .string "Those muscular appeals…\n" + .string "Cascading sweat… I swoon!$" + +LilycoveCity_ContestLobby_Text_21B392: @ 821B392 + .string "Day in and day out, I lavished my care\n" + .string "on this POKéMON.\p" + .string "Its condition is peaking.\n" + .string "Today, victory is mine!$" + +LilycoveCity_ContestLobby_Text_21B3FC: @ 821B3FC + .string "I made {POKEBLOCK}S with Mom, Dad, and\n" + .string "Big Sister. They turned out great!\p" + .string "I bet you can make smoother, better\n" + .string "{POKEBLOCK}S if you have more people.$" + diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc new file mode 100644 index 000000000..7ccbc4aec --- /dev/null +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc @@ -0,0 +1,14 @@ +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 + +LilycoveCity_CoveLilyMotel_1F_MapWarps: @ 853114C + 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 + +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_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc new file mode 100644 index 000000000..3468299a9 --- /dev/null +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc @@ -0,0 +1,131 @@ +LilycoveCity_CoveLilyMotel_1F_MapScripts:: @ 8218188 + .byte 0 + +LilycoveCity_CoveLilyMotel_1F_EventScript_218189:: @ 8218189 + lockall + checkflag FLAG_SYS_GAME_CLEAR + goto_eq LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA + checkflag FLAG_BADGE07_GET + goto_eq LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_218264, 4 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E + waitmovement 0 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_21831E, 4 + closemessage + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2 + waitmovement 0 + releaseall + end + +LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3:: @ 82181C3 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_2183C3, 4 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E + waitmovement 0 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_218470, 4 + closemessage + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2 + waitmovement 0 + releaseall + end + +LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA:: @ 82181EA + msgbox LilycoveCity_CoveLilyMotel_1F_Text_218544, 4 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E + waitmovement 0 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_2185F4, 4 + closemessage + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2 + waitmovement 0 + releaseall + end + +LilycoveCity_CoveLilyMotel_1F_EventScript_218211:: @ 8218211 + lockall + playse SE_PIN + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_272598 + waitmovement 0 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259A + waitmovement 0 + applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_2725AA + waitmovement 0 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_21839B, 4 + closemessage + applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_218259 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_21825E + waitmovement 0 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_218260 + waitmovement 0 + release + end + +LilycoveCity_CoveLilyMotel_1F_Movement_218259: @ 8218259 + face_right + lock_facing_direction + walk_left + unlock_facing_direction + step_end + +LilycoveCity_CoveLilyMotel_1F_Movement_21825E: @ 821825E + walk_up + step_end + +LilycoveCity_CoveLilyMotel_1F_Movement_218260: @ 8218260 + face_down + walk_down + face_up + step_end + +LilycoveCity_CoveLilyMotel_1F_Text_218264: @ 8218264 + .string "Hm, so they doubled the guests by\n" + .string "using POKéMON as attractions?\p" + .string "Hm, well, maybe I should make a cute\n" + .string "POKéMON our inn’s mascot.\p" + .string "I wonder if that will attract more\n" + .string "guests to stay with us?$" + +LilycoveCity_CoveLilyMotel_1F_Text_21831E: @ 821831E + .string "Oh, sorry, sorry!\n" + .string "I was too involved in watching TV!\p" + .string "Since that TEAM AQUA came to town,\n" + .string "the tourists have been staying away.$" + +LilycoveCity_CoveLilyMotel_1F_Text_21839B: @ 821839B + .string "Hey, down in front!\n" + .string "I can’t see the TV!$" + +LilycoveCity_CoveLilyMotel_1F_Text_2183C3: @ 82183C3 + .string "Amazing! You’re telling me a POKéMON\n" + .string "found someone’s lost item?\p" + .string "That’s something. If we had some smart\n" + .string "POKéMON like that…\p" + .string "We could recover anything that our\n" + .string "guests mislaid…$" + +LilycoveCity_CoveLilyMotel_1F_Text_218470: @ 8218470 + .string "Oh, sorry, sorry!\n" + .string "I was too involved in watching TV!\p" + .string "I heard that someone busted\n" + .string "the TEAM AQUA HIDEOUT.\p" + .string "Thanks to that, we just booked\n" + .string "a reservation from a big group.\p" + .string "It was a company called… Uh…\n" + .string "GAME something…$" + +LilycoveCity_CoveLilyMotel_1F_Text_218544: @ 8218544 + .string "Amazing! A house-sitting POKéMON\n" + .string "caught a burglar?\p" + .string "That’s something. If we had a tough\n" + .string "POKéMON as a security guard…\p" + .string "We would be able to provide our guests\n" + .string "with greater safety.$" + +LilycoveCity_CoveLilyMotel_1F_Text_2185F4: @ 82185F4 + .string "Oh, sorry, sorry!\n" + .string "I was too involved in watching TV.\p" + .string "Oh, yes. A big group of guests arrived\n" + .string "a little while ago.\p" + .string "They booked in as GAME FREAK,\n" + .string "so I guess they must make games.\p" + .string "Uh-oh, I’d better get working on\n" + .string "their dinner!$" + diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc new file mode 100644 index 000000000..631eba91b --- /dev/null +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc @@ -0,0 +1,15 @@ +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 + +LilycoveCity_CoveLilyMotel_2F_MapWarps: @ 8531230 + 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/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc new file mode 100644 index 000000000..90769b550 --- /dev/null +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc @@ -0,0 +1,140 @@ +LilycoveCity_CoveLilyMotel_2F_MapScripts:: @ 82186D2 + .byte 0 + +LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3:: @ 82186D3 + lock + faceplayer + checkflag FLAG_0x002 + call_if 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186F9 + checkflag FLAG_0x002 + call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_21870F + specialvar VAR_RESULT, sub_80C08E4 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_CoveLilyMotel_2F_EventScript_218702 + release + end + +LilycoveCity_CoveLilyMotel_2F_EventScript_2186F9:: @ 82186F9 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_218774, 4 + return + +LilycoveCity_CoveLilyMotel_2F_EventScript_218702:: @ 8218702 + setflag FLAG_0x002 + playfanfare MUS_FANFA4 + waitfanfare + goto LilycoveCity_CoveLilyMotel_2F_EventScript_21870F + end + +LilycoveCity_CoveLilyMotel_2F_EventScript_21870F:: @ 821870F + message LilycoveCity_CoveLilyMotel_2F_Text_21881C + waitmessage + call LilycoveCity_CoveLilyMotel_2F_EventScript_27207E + special Special_ShowDiploma + waitstate + release + end + +LilycoveCity_CoveLilyMotel_2F_EventScript_218720:: @ 8218720 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_2188D6, 2 + end + +LilycoveCity_CoveLilyMotel_2F_EventScript_218729:: @ 8218729 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_21892B, 2 + end + +LilycoveCity_CoveLilyMotel_2F_EventScript_218732:: @ 8218732 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_21896C, 2 + end + +LilycoveCity_CoveLilyMotel_2F_EventScript_21873B:: @ 821873B + msgbox LilycoveCity_CoveLilyMotel_2F_Text_218A21, 2 + end + +LilycoveCity_CoveLilyMotel_2F_EventScript_218744:: @ 8218744 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_218A5B, 2 + end + +LilycoveCity_CoveLilyMotel_2F_EventScript_21874D:: @ 821874D + lock + faceplayer + checkflag FLAG_0x1CE + goto_eq LilycoveCity_CoveLilyMotel_2F_EventScript_21876A + msgbox LilycoveCity_CoveLilyMotel_2F_Text_218ACF, 4 + addvar VAR_0x40D1, 1 + setflag FLAG_0x1CE + release + end + +LilycoveCity_CoveLilyMotel_2F_EventScript_21876A:: @ 821876A + msgbox LilycoveCity_CoveLilyMotel_2F_Text_218C33, 4 + release + end + +LilycoveCity_CoveLilyMotel_2F_Text_218774: @ 8218774 + .string "I’m the GAME DESIGNER.\p" + .string "Oh, is that right?\n" + .string "You’re working on a POKéDEX?\p" + .string "It’s tough trying to complete it,\n" + .string "but don’t give up.\p" + .string "If you do complete it, please come\n" + .string "show me.$" + +LilycoveCity_CoveLilyMotel_2F_Text_21881C: @ 821881C + .string "Wow! That’s awesome!\n" + .string "Yep, it’s totally awesome!\p" + .string "This POKéDEX is completely filled!\n" + .string "You really must love POKéMON!\p" + .string "I’m so impressed!\p" + .string "Let me give you something in\n" + .string "recognition of your feat!$" + +LilycoveCity_CoveLilyMotel_2F_Text_2188D6: @ 82188D6 + .string "Me? You’re talking to me?\n" + .string "I’m the PROGRAMMER.\p" + .string "I wonder what the SLOTS are\n" + .string "like here.$" + +LilycoveCity_CoveLilyMotel_2F_Text_21892B: @ 821892B + .string "I’m the GRAPHIC ARTIST! Aren’t the\n" + .string "POKéMON of HOENN interesting?$" + +LilycoveCity_CoveLilyMotel_2F_Text_21896C: @ 821896C + .string "The girl TUBERS, they’re cute, hey?\n" + .string "To battle against a cute TUBER…\p" + .string "Whoop, it’s so awesome!\p" + .string "And the TWINS! Aren’t they cute?\n" + .string "A 2-on-2 battle with TWINS…\p" + .string "Whoop, it’s unbearably fun!$" + +LilycoveCity_CoveLilyMotel_2F_Text_218A21: @ 8218A21 + .string "The sea breeze tickles my heart.\n" + .string "It feels wonderful here!$" + +LilycoveCity_CoveLilyMotel_2F_Text_218A5B: @ 8218A5B + .string "You never know when and where\n" + .string "people will challenge you.\p" + .string "That’s why I never leave home without\n" + .string "my GAME BOY ADVANCE.$" + +LilycoveCity_CoveLilyMotel_2F_Text_218ACF: @ 8218ACF + .string "SCOTT: … … … … …\n" + .string "… … … … … Zzz…\p" + .string "… … … … … Huh?!\n" + .string "Oh, sorry, sorry! I was snoozing!\p" + .string "I came to check out this POKéMON\n" + .string "CONTEST thing.\p" + .string "I have to admit, it does look quite\n" + .string "entertaining, but…\p" + .string "Consider me a purist--I prefer\n" + .string "battles and tough TRAINERS.\p" + .string "But that’s just me.\p" + .string "{PLAYER}{KUN}, I hope you’ll enjoy everything\n" + .string "like the GYMS, CONTESTS, BATTLE TENT,\l" + .string "the whole works!$" + +LilycoveCity_CoveLilyMotel_2F_Text_218C33: @ 8218C33 + .string "SCOTT: I think it does take strategy\n" + .string "to win a CONTEST.\p" + .string "Devising CONTEST strategies is one way\n" + .string "of becoming a better TRAINER, I’d say.$" + diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc new file mode 100644 index 000000000..bdeda0bd9 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc @@ -0,0 +1,10 @@ +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 + +LilycoveCity_DepartmentStoreElevator_MapWarps: @ 85324C8 + 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/LilycoveCity_DepartmentStoreElevator/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc new file mode 100644 index 000000000..234751910 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc @@ -0,0 +1,129 @@ +LilycoveCity_DepartmentStoreElevator_MapScripts:: @ 8220623 + .byte 0 + +LilycoveCity_DepartmentStoreElevator_EventScript_220624:: @ 8220624 + lock + faceplayer + setvar VAR_0x8004, 0 + checkflag FLAG_0x002 + call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_2207FC + copyvar VAR_0x8005, VAR_DEPT_STORE_FLOOR + special sub_8139B60 + message gUnknown_08272C1D + waitmessage + setvar VAR_0x8004, 0 + specialvar VAR_RESULT, sub_81399F4 + switch VAR_RESULT + case 0, LilycoveCity_DepartmentStoreElevator_EventScript_220689 + case 1, LilycoveCity_DepartmentStoreElevator_EventScript_220695 + case 2, LilycoveCity_DepartmentStoreElevator_EventScript_2206A1 + case 3, LilycoveCity_DepartmentStoreElevator_EventScript_2206AD + case 4, LilycoveCity_DepartmentStoreElevator_EventScript_2206B9 + end + +LilycoveCity_DepartmentStoreElevator_EventScript_220689:: @ 8220689 + multichoicedefault 0, 0, 57, 0, 0 + goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5 + end + +LilycoveCity_DepartmentStoreElevator_EventScript_220695:: @ 8220695 + multichoicedefault 0, 0, 57, 1, 0 + goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5 + end + +LilycoveCity_DepartmentStoreElevator_EventScript_2206A1:: @ 82206A1 + multichoicedefault 0, 0, 57, 2, 0 + goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5 + end + +LilycoveCity_DepartmentStoreElevator_EventScript_2206AD:: @ 82206AD + multichoicedefault 0, 0, 57, 3, 0 + goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5 + end + +LilycoveCity_DepartmentStoreElevator_EventScript_2206B9:: @ 82206B9 + multichoicedefault 0, 0, 57, 4, 0 + goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5 + end + +LilycoveCity_DepartmentStoreElevator_EventScript_2206C5:: @ 82206C5 + switch VAR_RESULT + case 0, LilycoveCity_DepartmentStoreElevator_EventScript_2207B8 + case 1, LilycoveCity_DepartmentStoreElevator_EventScript_220790 + case 2, LilycoveCity_DepartmentStoreElevator_EventScript_220768 + case 3, LilycoveCity_DepartmentStoreElevator_EventScript_220740 + case 4, LilycoveCity_DepartmentStoreElevator_EventScript_220718 + case 5, LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 + case 127, LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 + end + +LilycoveCity_DepartmentStoreElevator_EventScript_220718:: @ 8220718 + setvar VAR_0x8006, 4 + 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 + setvar VAR_DEPT_STORE_FLOOR, 4 + goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 + end + +LilycoveCity_DepartmentStoreElevator_EventScript_220740:: @ 8220740 + setvar VAR_0x8006, 5 + 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 + setvar VAR_DEPT_STORE_FLOOR, 5 + goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 + end + +LilycoveCity_DepartmentStoreElevator_EventScript_220768:: @ 8220768 + setvar VAR_0x8006, 6 + 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 + setvar VAR_DEPT_STORE_FLOOR, 6 + goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 + end + +LilycoveCity_DepartmentStoreElevator_EventScript_220790:: @ 8220790 + setvar VAR_0x8006, 7 + 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 + setvar VAR_DEPT_STORE_FLOOR, 7 + goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 + end + +LilycoveCity_DepartmentStoreElevator_EventScript_2207B8:: @ 82207B8 + setvar VAR_0x8006, 8 + 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 + setvar VAR_DEPT_STORE_FLOOR, 8 + goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 + end + +LilycoveCity_DepartmentStoreElevator_EventScript_2207E0:: @ 82207E0 + special sub_8139C10 + release + end + +LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5 + special sub_8139C10 + closemessage + applymovement VAR_LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_2725AA + waitmovement 0 + waitse + special sub_8139A78 + waitstate + setflag FLAG_0x002 + return + +LilycoveCity_DepartmentStoreElevator_EventScript_2207FC:: @ 82207FC + special sub_8139994 + return + diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc new file mode 100644 index 000000000..aca7598ec --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc @@ -0,0 +1,16 @@ +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 + +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 + +LilycoveCity_DepartmentStoreRooftop_MapEvents:: @ 853249C + map_events LilycoveCity_DepartmentStoreRooftop_EventObjects, LilycoveCity_DepartmentStoreRooftop_MapWarps, 0x0, LilycoveCity_DepartmentStoreRooftop_MapBGEvents + diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc new file mode 100644 index 000000000..da97bbf81 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -0,0 +1,238 @@ +LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 8220207 + map_script 3, LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D + .byte 0 + +LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D: @ 822020D + getpricereduction 3 + compare VAR_RESULT, 1 + call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220227 + compare VAR_RESULT, 0 + call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_22022B + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_220227:: @ 8220227 + clearflag FLAG_0x3C2 + return + +LilycoveCity_DepartmentStoreRooftop_EventScript_22022B:: @ 822022B + setflag FLAG_0x3C2 + return + +LilycoveCity_DepartmentStoreRooftop_EventScript_22022F:: @ 822022F + lock + faceplayer + message gUnknown_08272A21 + waitmessage + pokemartdecoration LilycoveCity_DepartmentStoreRooftop_PokemartDecor_220248 + msgbox gUnknown_08272A3F, 4 + release + end + + .align 2 +LilycoveCity_DepartmentStoreRooftop_PokemartDecor_220248: @ 8220248 + .2byte 39 + .2byte 35 + .2byte 36 + .2byte 37 + .2byte 40 + .2byte 33 + .2byte 41 + .2byte 38 + .2byte 34 + .2byte 45 + .2byte 46 + .2byte 47 + .2byte 117 + .2byte 112 + .2byte 0 + release + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_220268:: @ 8220268 + lock + faceplayer + getpricereduction 3 + compare VAR_RESULT, 1 + call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220282 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_220463, 4 + release + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_220282:: @ 8220282 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2204C9, 4 + release + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_22028C:: @ 822028C + msgbox LilycoveCity_DepartmentStoreRooftop_Text_220552, 2 + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_220295:: @ 8220295 + lockall + message LilycoveCity_DepartmentStoreRooftop_Text_22056D + waitmessage + showmoneybox 0, 0, 0 + goto LilycoveCity_DepartmentStoreRooftop_EventScript_2202A6 + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_2202A6:: @ 82202A6 + multichoice 16, 0, 42, 0 + copyvar VAR_TEMP_1, VAR_RESULT + switch VAR_TEMP_1 + case 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2202E4 + case 1, LilycoveCity_DepartmentStoreRooftop_EventScript_2202EF + case 2, LilycoveCity_DepartmentStoreRooftop_EventScript_2202FA + msgbox LilycoveCity_DepartmentStoreRooftop_Text_220603, 4 + goto LilycoveCity_DepartmentStoreRooftop_EventScript_22045E + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_2202E4:: @ 82202E4 + setvar VAR_TEMP_0, 26 + goto LilycoveCity_DepartmentStoreRooftop_EventScript_22032F + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_2202EF:: @ 82202EF + setvar VAR_TEMP_0, 27 + goto LilycoveCity_DepartmentStoreRooftop_EventScript_22032F + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_2202FA:: @ 82202FA + setvar VAR_TEMP_0, 28 + goto LilycoveCity_DepartmentStoreRooftop_EventScript_22032F + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_220305:: @ 8220305 + checkmoney 0xc8, 0 + return + +LilycoveCity_DepartmentStoreRooftop_EventScript_22030C:: @ 822030C + checkmoney 0x12c, 0 + return + +LilycoveCity_DepartmentStoreRooftop_EventScript_220313:: @ 8220313 + checkmoney 0x15e, 0 + return + +LilycoveCity_DepartmentStoreRooftop_EventScript_22031A:: @ 822031A + takemoney 0xc8, 0 + return + +LilycoveCity_DepartmentStoreRooftop_EventScript_220321:: @ 8220321 + takemoney 0x12c, 0 + return + +LilycoveCity_DepartmentStoreRooftop_EventScript_220328:: @ 8220328 + takemoney 0x15e, 0 + return + +LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F + compare VAR_TEMP_1, 0 + call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220305 + compare VAR_TEMP_1, 1 + call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_22030C + compare VAR_TEMP_1, 2 + call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220313 + compare VAR_RESULT, 0 + goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220442 + checkitemspace VAR_TEMP_0, 1 + compare VAR_RESULT, 0 + goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 + compare VAR_TEMP_1, 0 + call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_22031A + compare VAR_TEMP_1, 1 + call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220321 + compare VAR_TEMP_1, 2 + call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220328 + updatemoneybox 0, 0 + nop + bufferitemname 0, VAR_TEMP_0 + playse SE_JIHANKI + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205A1, 4 + giveitem VAR_TEMP_0, 1 + bufferitemname 1, VAR_TEMP_0 + bufferstdstring 2, 14 + msgbox gUnknown_08272A9A, 4 + random 64 + compare VAR_RESULT, 0 + goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_220436 + checkitemspace VAR_TEMP_0, 1 + compare VAR_RESULT, 0 + goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 + playse SE_JIHANKI + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, 4 + giveitem VAR_TEMP_0, 1 + bufferitemname 1, VAR_TEMP_0 + bufferstdstring 2, 14 + msgbox gUnknown_08272A9A, 4 + random 64 + compare VAR_RESULT, 0 + goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_220436 + checkitemspace VAR_TEMP_0, 1 + compare VAR_RESULT, 0 + goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 + playse SE_JIHANKI + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, 4 + giveitem VAR_TEMP_0, 1 + bufferitemname 1, VAR_TEMP_0 + bufferstdstring 2, 14 + msgbox gUnknown_08272A9A, 4 + goto LilycoveCity_DepartmentStoreRooftop_EventScript_220436 + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_220436:: @ 8220436 + message LilycoveCity_DepartmentStoreRooftop_Text_22056D + waitmessage + goto LilycoveCity_DepartmentStoreRooftop_EventScript_2202A6 + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_220442:: @ 8220442 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205F1, 4 + goto LilycoveCity_DepartmentStoreRooftop_EventScript_22045E + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_220450:: @ 8220450 + msgbox gUnknown_08272A89, 4 + goto LilycoveCity_DepartmentStoreRooftop_EventScript_22045E + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_22045E:: @ 822045E + hidemoneybox + nop + nop + releaseall + end + +LilycoveCity_DepartmentStoreRooftop_Text_220463: @ 8220463 + .string "Don’t they have set dates for their\n" + .string "clear-out sales?\p" + .string "I watch TV, but they never show any\n" + .string "commercials.$" + +LilycoveCity_DepartmentStoreRooftop_Text_2204C9: @ 82204C9 + .string "Yes! I’ve been waiting a long time for\n" + .string "this clear-out sale.\p" + .string "They have items that you can only get\n" + .string "here. I’m going to load up, that I am!$" + +LilycoveCity_DepartmentStoreRooftop_Text_220552: @ 8220552 + .string "Ohh… I’m bone-dry thirsty!$" + +LilycoveCity_DepartmentStoreRooftop_Text_22056D: @ 822056D + .string "It’s a VENDING MACHINE.\n" + .string "Which drink would you like?$" + +LilycoveCity_DepartmentStoreRooftop_Text_2205A1: @ 82205A1 + .string "Clang!\p" + .string "A can of {STR_VAR_1} dropped down.$" + +LilycoveCity_DepartmentStoreRooftop_Text_2205C2: @ 82205C2 + .string "Clang!\p" + .string "Score! An extra can of {STR_VAR_1}\n" + .string "dropped down!$" + +LilycoveCity_DepartmentStoreRooftop_Text_2205F1: @ 82205F1 + .string "Not enough money…$" + +LilycoveCity_DepartmentStoreRooftop_Text_220603: @ 8220603 + .string "Decided against buying a drink.$" + diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc new file mode 100644 index 000000000..17a6db615 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc @@ -0,0 +1,20 @@ +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 + +LilycoveCity_DepartmentStore_1F_MapWarps: @ 853211C + 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 + +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_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc new file mode 100644 index 000000000..8de2d5d6f --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc @@ -0,0 +1,193 @@ +LilycoveCity_DepartmentStore_1F_MapScripts:: @ 821F692 + .byte 0 + +LilycoveCity_DepartmentStore_1F_EventScript_21F693:: @ 821F693 + msgbox LilycoveCity_DepartmentStore_1F_Text_21F866, 2 + end + +LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C + lock + faceplayer + dodailyevents + compare VAR_POKELOT_PRIZE, 0 + goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_21F7F7 + checkflag FLAG_0x92A + goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F78D + msgbox LilycoveCity_DepartmentStore_1F_Text_2A6390, 5 + compare VAR_RESULT, 0 + goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F797 + setflag FLAG_0x92A + message LilycoveCity_DepartmentStore_1F_Text_2A64C8 + waitmessage + special RetrieveLotteryNumber + copyvar VAR_0x8008, VAR_RESULT + special sub_81397C4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A650B, 4 + applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_2725A8 + waitmovement 0 + playse SE_PC_ON + special DoLotteryCornerComputerEffect + special PickLotteryCornerTicket + delay 220 + special EndLotteryCornerComputerEffect + delay 10 + applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_27259E + waitmovement 0 + compare VAR_0x8004, 0 + goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7A1 + incrementgamestat 46 + compare VAR_0x8006, 0 + call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F77B + compare VAR_0x8006, 1 + call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F784 + bufferitemname 0, VAR_0x8005 + compare VAR_0x8004, 1 + call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F7B9 + compare VAR_0x8004, 2 + call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F7C2 + compare VAR_0x8004, 3 + call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F7CB + compare VAR_0x8004, 4 + call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F7D4 + giveitem_std VAR_0x8005 + compare VAR_RESULT, 0 + goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7DD + special sub_80EE2CC + goto LilycoveCity_DepartmentStore_1F_EventScript_21F7AF + end + +LilycoveCity_DepartmentStore_1F_EventScript_21F77B:: @ 821F77B + msgbox LilycoveCity_DepartmentStore_1F_Text_2A6592, 4 + return + +LilycoveCity_DepartmentStore_1F_EventScript_21F784:: @ 821F784 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A65E6, 4 + return + +LilycoveCity_DepartmentStore_1F_EventScript_21F78D:: @ 821F78D + msgbox LilycoveCity_DepartmentStore_1F_Text_2A6496, 4 + release + end + +LilycoveCity_DepartmentStore_1F_EventScript_21F797:: @ 821F797 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A64B1, 4 + release + end + +LilycoveCity_DepartmentStore_1F_EventScript_21F7A1:: @ 821F7A1 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A663C, 4 + goto LilycoveCity_DepartmentStore_1F_EventScript_21F7AF + end + +LilycoveCity_DepartmentStore_1F_EventScript_21F7AF:: @ 821F7AF + msgbox LilycoveCity_DepartmentStore_1F_Text_2A6831, 4 + release + end + +LilycoveCity_DepartmentStore_1F_EventScript_21F7B9:: @ 821F7B9 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A6664, 4 + return + +LilycoveCity_DepartmentStore_1F_EventScript_21F7C2:: @ 821F7C2 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A66A7, 4 + return + +LilycoveCity_DepartmentStore_1F_EventScript_21F7CB:: @ 821F7CB + msgbox LilycoveCity_DepartmentStore_1F_Text_2A66ED, 4 + return + +LilycoveCity_DepartmentStore_1F_EventScript_21F7D4:: @ 821F7D4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A6731, 4 + return + +LilycoveCity_DepartmentStore_1F_EventScript_21F7DD:: @ 821F7DD + copyvar VAR_0x404D, VAR_0x8004 + copyvar VAR_POKELOT_PRIZE, VAR_0x8005 + goto LilycoveCity_DepartmentStore_1F_EventScript_21F7ED + end + +LilycoveCity_DepartmentStore_1F_EventScript_21F7ED:: @ 821F7ED + msgbox LilycoveCity_DepartmentStore_1F_Text_2A678C, 4 + release + end + +LilycoveCity_DepartmentStore_1F_EventScript_21F7F7:: @ 821F7F7 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A67E1, 4 + giveitem_std VAR_POKELOT_PRIZE + compare VAR_RESULT, 0 + goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7ED + copyvar VAR_0x8004, VAR_0x404D + copyvar VAR_0x8005, VAR_POKELOT_PRIZE + special sub_80EE2CC + setvar VAR_POKELOT_PRIZE, 0 + setvar VAR_0x404D, 0 + release + end + +LilycoveCity_DepartmentStore_1F_EventScript_21F82F:: @ 821F82F + msgbox LilycoveCity_DepartmentStore_1F_Text_21F88C, 2 + end + +LilycoveCity_DepartmentStore_1F_EventScript_21F838:: @ 821F838 + msgbox LilycoveCity_DepartmentStore_1F_Text_21F8F5, 2 + end + +LilycoveCity_DepartmentStore_1F_EventScript_21F841:: @ 821F841 + msgbox LilycoveCity_DepartmentStore_1F_Text_21F92B, 2 + end + +LilycoveCity_DepartmentStore_1F_EventScript_21F84A:: @ 821F84A + lock + faceplayer + waitse + playmoncry SPECIES_AZUMARILL, 0 + msgbox LilycoveCity_DepartmentStore_1F_Text_21F974, 4 + waitmoncry + release + end + +LilycoveCity_DepartmentStore_1F_EventScript_21F85D:: @ 821F85D + msgbox LilycoveCity_DepartmentStore_1F_Text_21F98A, 3 + end + +LilycoveCity_DepartmentStore_1F_Text_21F866: @ 821F866 + .string "Welcome to LILYCOVE DEPARTMENT STORE.$" + +LilycoveCity_DepartmentStore_1F_Text_21F88C: @ 821F88C + .string "Whenever I come to the DEPARTMENT\n" + .string "STORE, I always end up buying all sorts\l" + .string "of things because it’s so fun.$" + +LilycoveCity_DepartmentStore_1F_Text_21F8F5: @ 821F8F5 + .string "Today, my mom is going to buy me some\n" + .string "nice furniture.$" + +LilycoveCity_DepartmentStore_1F_Text_21F92B: @ 821F92B + .string "I’m buying something for my AZUMARILL\n" + .string "as a reward for winning a CONTEST.$" + +LilycoveCity_DepartmentStore_1F_Text_21F974: @ 821F974 + .string "AZUMARILL: Maririroo!$" + +LilycoveCity_DepartmentStore_1F_Text_21F98A: @ 821F98A + .string "1F: SERVICE COUNTER\n" + .string " LOTTERY CORNER\p" + .string "2F: TRAINER’S ZONE\p" + .string "3F: BATTLE COLLECTION\p" + .string "4F: TM CORNER\p" + .string "5F: POKé DOLL FLOOR\p" + .string "ROOFTOP: ROOFTOP PLAZA$" + +LilycoveCity_DepartmentStore_1F_Text_21FA13: @ 821FA13 + .string "Wireless Communication is a\n" + .string "lot of fun, isn’t it?\p" + .string "I think it lets you do things that\n" + .string "weren’t possible before.\p" + .string "For instance, you can now trade\n" + .string "with people you couldn’t before.\p" + .string "I think it’s going to be exciting!$" + +LilycoveCity_DepartmentStore_1F_Text_21FAE5: @ 821FAE5 + .string "I want to spread the word about how\n" + .string "fun Wireless Communication can be.$" + diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/events.inc b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc new file mode 100644 index 000000000..1747ece5a --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc @@ -0,0 +1,15 @@ +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 + +LilycoveCity_DepartmentStore_2F_MapWarps: @ 85321D4 + 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/LilycoveCity_DepartmentStore_2F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc new file mode 100644 index 000000000..8bc6d8b29 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc @@ -0,0 +1,80 @@ +LilycoveCity_DepartmentStore_2F_MapScripts:: @ 821FB2C + .byte 0 + +LilycoveCity_DepartmentStore_2F_EventScript_21FB2D:: @ 821FB2D + msgbox LilycoveCity_DepartmentStore_2F_Text_21FBAC, 2 + end + +LilycoveCity_DepartmentStore_2F_EventScript_21FB36:: @ 821FB36 + msgbox LilycoveCity_DepartmentStore_2F_Text_21FBDF, 2 + end + +LilycoveCity_DepartmentStore_2F_EventScript_21FB3F:: @ 821FB3F + msgbox LilycoveCity_DepartmentStore_2F_Text_21FC23, 2 + end + +LilycoveCity_DepartmentStore_2F_EventScript_21FB48:: @ 821FB48 + lock + faceplayer + message gUnknown_08272A21 + waitmessage + pokemart LilycoveCity_DepartmentStore_2F_Pokemart_21FB60 + msgbox gUnknown_08272A3F, 4 + release + end + + .align 2 +LilycoveCity_DepartmentStore_2F_Pokemart_21FB60: @ 821FB60 + .2byte ITEM_POKE_BALL + .2byte ITEM_GREAT_BALL + .2byte ITEM_ULTRA_BALL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_FULL_HEAL + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_BURN_HEAL + .2byte ITEM_ICE_HEAL + .2byte ITEM_AWAKENING + .2byte ITEM_FLUFFY_TAIL + .2byte ITEM_NONE + release + end + +LilycoveCity_DepartmentStore_2F_EventScript_21FB7A:: @ 821FB7A + lock + faceplayer + message gUnknown_08272A21 + waitmessage + pokemart LilycoveCity_DepartmentStore_2F_Pokemart_21FB94 + msgbox gUnknown_08272A3F, 4 + release + end + + .align 2 +LilycoveCity_DepartmentStore_2F_Pokemart_21FB94: @ 821FB94 + .2byte ITEM_POTION + .2byte ITEM_SUPER_POTION + .2byte ITEM_HYPER_POTION + .2byte ITEM_MAX_POTION + .2byte ITEM_REVIVE + .2byte ITEM_REPEL + .2byte ITEM_SUPER_REPEL + .2byte ITEM_MAX_REPEL + .2byte ITEM_WAVE_MAIL + .2byte ITEM_MECH_MAIL + .2byte ITEM_NONE + release + end + +LilycoveCity_DepartmentStore_2F_Text_21FBAC: @ 821FBAC + .string "Learn to use items properly.\n" + .string "That’s basic, really.$" + +LilycoveCity_DepartmentStore_2F_Text_21FBDF: @ 821FBDF + .string "My husband is waiting at home.\n" + .string "What would make a good gift for him?$" + +LilycoveCity_DepartmentStore_2F_Text_21FC23: @ 821FC23 + .string "I’m leaving on a long journey soon.\n" + .string "I need to stock up on items.$" + diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/events.inc b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc new file mode 100644 index 000000000..93ef37b4b --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc @@ -0,0 +1,15 @@ +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 + +LilycoveCity_DepartmentStore_3F_MapWarps: @ 8532278 + 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/LilycoveCity_DepartmentStore_3F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc new file mode 100644 index 000000000..1d980f83e --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc @@ -0,0 +1,75 @@ +LilycoveCity_DepartmentStore_3F_MapScripts:: @ 821FC64 + .byte 0 + +LilycoveCity_DepartmentStore_3F_EventScript_21FC65:: @ 821FC65 + lock + faceplayer + message gUnknown_08272A21 + waitmessage + pokemart LilycoveCity_DepartmentStore_3F_Pokemart_21FC7C + msgbox gUnknown_08272A3F, 4 + release + end + +LilycoveCity_DepartmentStore_3F_Pokemart_21FC7C: @ 821FC7C + .2byte ITEM_PROTEIN + .2byte ITEM_CALCIUM + .2byte ITEM_IRON + .2byte ITEM_ZINC + .2byte ITEM_CARBOS + .2byte ITEM_HP_UP + .2byte ITEM_NONE + release + end + +LilycoveCity_DepartmentStore_3F_EventScript_21FC8C:: @ 821FC8C + lock + faceplayer + message gUnknown_08272A21 + waitmessage + pokemart LilycoveCity_DepartmentStore_3F_Pokemart_21FCA4 + msgbox gUnknown_08272A3F, 4 + release + end + + .align 2 +LilycoveCity_DepartmentStore_3F_Pokemart_21FCA4: @ 821FCA4 + .2byte ITEM_X_SPEED + .2byte ITEM_X_SPECIAL + .2byte ITEM_X_ATTACK + .2byte ITEM_X_DEFEND + .2byte ITEM_DIRE_HIT + .2byte ITEM_GUARD_SPEC + .2byte ITEM_X_ACCURACY + .2byte ITEM_NONE + release + end + +LilycoveCity_DepartmentStore_3F_EventScript_21FCB6:: @ 821FCB6 + msgbox LilycoveCity_DepartmentStore_3F_Text_21FCD1, 2 + end + +LilycoveCity_DepartmentStore_3F_EventScript_21FCBF:: @ 821FCBF + msgbox LilycoveCity_DepartmentStore_3F_Text_21FD3B, 2 + end + +LilycoveCity_DepartmentStore_3F_EventScript_21FCC8:: @ 821FCC8 + msgbox LilycoveCity_DepartmentStore_3F_Text_21FDB4, 2 + end + +LilycoveCity_DepartmentStore_3F_Text_21FCD1: @ 821FCD1 + .string "For quickly toughening up POKéMON,\n" + .string "items are the best.\p" + .string "PROTEIN boosts ATTACK,\n" + .string "and CALCIUM raises SP. ATK.$" + +LilycoveCity_DepartmentStore_3F_Text_21FD3B: @ 821FD3B + .string "I want my POKéMON to have more\n" + .string "endurance.\p" + .string "I’m trying to decide whether to raise\n" + .string "DEFENSE with IRON, or SP. DEF with ZINC.$" + +LilycoveCity_DepartmentStore_3F_Text_21FDB4: @ 821FDB4 + .string "I gave a CARBOS to my POKéMON,\n" + .string "and its SPEED went up.$" + diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/events.inc b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc new file mode 100644 index 000000000..5e6d0d94a --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc @@ -0,0 +1,15 @@ +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 + +LilycoveCity_DepartmentStore_4F_MapWarps: @ 853231C + 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/LilycoveCity_DepartmentStore_4F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc new file mode 100644 index 000000000..b162c4740 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc @@ -0,0 +1,72 @@ +LilycoveCity_DepartmentStore_4F_MapScripts:: @ 821FDEA + .byte 0 + +LilycoveCity_DepartmentStore_4F_EventScript_21FDEB:: @ 821FDEB + msgbox LilycoveCity_DepartmentStore_4F_Text_21FE50, 2 + end + +LilycoveCity_DepartmentStore_4F_EventScript_21FDF4:: @ 821FDF4 + msgbox LilycoveCity_DepartmentStore_4F_Text_21FEC7, 2 + end + +LilycoveCity_DepartmentStore_4F_EventScript_21FDFD:: @ 821FDFD + msgbox LilycoveCity_DepartmentStore_4F_Text_21FF2D, 2 + end + +LilycoveCity_DepartmentStore_4F_EventScript_21FE06:: @ 821FE06 + lock + faceplayer + message gUnknown_08272A21 + waitmessage + pokemart LilycoveCity_DepartmentStore_4F_Pokemart_21FE20 + msgbox gUnknown_08272A3F, 4 + release + end + + .align 2 +LilycoveCity_DepartmentStore_4F_Pokemart_21FE20: @ 821FE20 + .2byte ITEM_TM38 + .2byte ITEM_TM25 + .2byte ITEM_TM14 + .2byte ITEM_TM15 + .2byte ITEM_NONE + release + end + +LilycoveCity_DepartmentStore_4F_EventScript_21FE2C:: @ 821FE2C + lock + faceplayer + message gUnknown_08272A21 + waitmessage + pokemart LilycoveCity_DepartmentStore_4F_Pokemart_21FE44 + msgbox gUnknown_08272A3F, 4 + release + end + + .align 2 +LilycoveCity_DepartmentStore_4F_Pokemart_21FE44: @ 821FE44 + .2byte ITEM_TM17 + .2byte ITEM_TM20 + .2byte ITEM_TM33 + .2byte ITEM_TM16 + .2byte ITEM_NONE + release + end + +LilycoveCity_DepartmentStore_4F_Text_21FE50: @ 821FE50 + .string "Hmm…\p" + .string "An attacking move…\n" + .string "Or a defensive move…\p" + .string "It’s no easy matter to decide which TM\n" + .string "moves should be taught to POKéMON…$" + +LilycoveCity_DepartmentStore_4F_Text_21FEC7: @ 821FEC7 + .string "There are so many different kinds of\n" + .string "TM moves.\p" + .string "A catalog I read said there are fifty\n" + .string "different kinds.$" + +LilycoveCity_DepartmentStore_4F_Text_21FF2D: @ 821FF2D + .string "I’d like to get all the different TMs,\n" + .string "but a POKéMON learns only four moves.$" + diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/events.inc b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc new file mode 100644 index 000000000..f2b9b130a --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc @@ -0,0 +1,17 @@ +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 + +LilycoveCity_DepartmentStore_5F_MapWarps: @ 85323F0 + 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/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc new file mode 100644 index 000000000..d5f5e49ad --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc @@ -0,0 +1,170 @@ +LilycoveCity_DepartmentStore_5F_MapScripts:: @ 821FF7A + map_script 4, LilycoveCity_DepartmentStore_5F_MapScript2_21FF80 + .byte 0 + +LilycoveCity_DepartmentStore_5F_MapScript2_21FF80: @ 821FF80 + map_script_2 VAR_0x405E, 1, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A + map_script_2 VAR_0x405E, 2, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A + map_script_2 VAR_0x405E, 3, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A + .2byte 0 + +LilycoveCity_DepartmentStore_5F_EventScript_21FF9A:: @ 821FF9A + setobjectxy 7, 16, 2 + turnobject 7, 2 + end + +LilycoveCity_DepartmentStore_5F_EventScript_21FFA6:: @ 821FFA6 + lock + faceplayer + message gUnknown_08272A21 + waitmessage + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_21FFC0 + msgbox gUnknown_08272A3F, 4 + release + end + + .align 2 +LilycoveCity_DepartmentStore_5F_Pokemart_21FFC0: @ 821FFC0 + .2byte ITEM_X_DEFEND + .2byte ITEM_X_SPEED + .2byte ITEM_X_ACCURACY + .2byte ITEM_SUPER_REPEL + .2byte 91 + .2byte 92 + .2byte ITEM_SUN_STONE + .2byte ITEM_MOON_STONE + .2byte ITEM_FIRE_STONE + .2byte ITEM_THUNDER_STONE + .2byte ITEM_WATER_STONE + .2byte ITEM_LEAF_STONE + .2byte ITEM_NONE + release + end + +LilycoveCity_DepartmentStore_5F_EventScript_21FFDC:: @ 821FFDC + lock + faceplayer + message gUnknown_08272A21 + waitmessage + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_21FFF4 + msgbox gUnknown_08272A3F, 4 + release + end + + .align 2 +LilycoveCity_DepartmentStore_5F_Pokemart_21FFF4: @ 821FFF4 + .2byte 101 + .2byte 102 + .2byte ITEM_BIG_MUSHROOM + .2byte 105 + .2byte ITEM_PEARL + .2byte ITEM_BIG_PEARL + .2byte ITEM_STARDUST + .2byte ITEM_STAR_PIECE + .2byte ITEM_NUGGET + .2byte ITEM_NONE + release + end + +LilycoveCity_DepartmentStore_5F_EventScript_22000A:: @ 822000A + lock + faceplayer + message gUnknown_08272A21 + waitmessage + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_220024 + msgbox gUnknown_08272A3F, 4 + release + end + + .align 2 +LilycoveCity_DepartmentStore_5F_Pokemart_220024: @ 8220024 + .2byte ITEM_CARBOS + .2byte ITEM_CALCIUM + .2byte ITEM_RARE_CANDY + .2byte ITEM_PP_UP + .2byte ITEM_ZINC + .2byte ITEM_PP_MAX + .2byte 72 + .2byte ITEM_GUARD_SPEC + .2byte ITEM_DIRE_HIT + .2byte ITEM_NONE + release + end + +LilycoveCity_DepartmentStore_5F_EventScript_22003A:: @ 822003A + lock + faceplayer + message gUnknown_08272A21 + waitmessage + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_220054 + msgbox gUnknown_08272A3F, 4 + release + end + + .align 2 +LilycoveCity_DepartmentStore_5F_Pokemart_220054: @ 8220054 + .2byte 59 + .2byte 60 + .2byte 61 + .2byte 62 + .2byte ITEM_HP_UP + .2byte ITEM_PROTEIN + .2byte ITEM_IRON + .2byte ITEM_RED_SHARD + .2byte ITEM_BLUE_SHARD + .2byte ITEM_YELLOW_SHARD + .2byte ITEM_NONE + release + end + +LilycoveCity_DepartmentStore_5F_EventScript_22006C:: @ 822006C + msgbox LilycoveCity_DepartmentStore_5F_Text_2200C5, 2 + end + +LilycoveCity_DepartmentStore_5F_EventScript_220075:: @ 8220075 + lockall + applymovement 7, LilycoveCity_DepartmentStore_5F_Movement_27259E + waitmovement 0 + compare VAR_0x405E, 0 + goto_eq LilycoveCity_DepartmentStore_5F_EventScript_22009C + compare VAR_0x405E, 4 + goto_if 4, LilycoveCity_DepartmentStore_5F_EventScript_22009C + goto LilycoveCity_DepartmentStore_5F_EventScript_2200A7 + end + +LilycoveCity_DepartmentStore_5F_EventScript_22009C:: @ 822009C + msgbox LilycoveCity_DepartmentStore_5F_Text_22016B, 4 + closemessage + releaseall + end + +LilycoveCity_DepartmentStore_5F_EventScript_2200A7:: @ 82200A7 + msgbox LilycoveCity_DepartmentStore_5F_Text_2201C4, 4 + closemessage + applymovement 7, LilycoveCity_DepartmentStore_5F_Movement_2725A6 + waitmovement 0 + releaseall + end + +LilycoveCity_DepartmentStore_5F_EventScript_2200BC:: @ 82200BC + msgbox LilycoveCity_DepartmentStore_5F_Text_220122, 2 + end + +LilycoveCity_DepartmentStore_5F_Text_2200C5: @ 82200C5 + .string "This place is full of cute DOLLS.\p" + .string "I should buy some for me, instead of\n" + .string "just for my children.$" + +LilycoveCity_DepartmentStore_5F_Text_220122: @ 8220122 + .string "I’m not big enough to raise POKéMON,\n" + .string "so I’m getting a cute DOLL instead.$" + +LilycoveCity_DepartmentStore_5F_Text_22016B: @ 822016B + .string "They sell many cute MATS here.\p" + .string "I wonder which one I should get?\n" + .string "Maybe I’ll buy them all…$" + +LilycoveCity_DepartmentStore_5F_Text_2201C4: @ 82201C4 + .string "I think they closed the rooftop\n" + .string "because the weather is wild today.$" + diff --git a/data/maps/LilycoveCity_Harbor/events.inc b/data/maps/LilycoveCity_Harbor/events.inc new file mode 100644 index 000000000..73d21e9ce --- /dev/null +++ b/data/maps/LilycoveCity_Harbor/events.inc @@ -0,0 +1,14 @@ +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 + +LilycoveCity_Harbor_MapWarps: @ 8531E94 + 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/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc new file mode 100644 index 000000000..1dfd9c29a --- /dev/null +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -0,0 +1,630 @@ +LilycoveCity_Harbor_MapScripts:: @ 821E000 + map_script 3, LilycoveCity_Harbor_MapScript1_21E006 + .byte 0 + +LilycoveCity_Harbor_MapScript1_21E006: @ 821E006 + setescapewarp MAP_LILYCOVE_CITY, 255, 12, 33 + end + +LilycoveCity_Harbor_EventScript_21E00F:: @ 821E00F + lock + faceplayer + checkflag FLAG_SYS_GAME_CLEAR + goto_if 0, LilycoveCity_Harbor_EventScript_21E54D + call LilycoveCity_Harbor_EventScript_21E194 + call LilycoveCity_Harbor_EventScript_21E1C6 + call LilycoveCity_Harbor_EventScript_21E1F8 + call LilycoveCity_Harbor_EventScript_21E22A + call LilycoveCity_Harbor_EventScript_21E25C + call LilycoveCity_Harbor_EventScript_21E2A6 + compare VAR_TEMP_C, 2 + goto_eq LilycoveCity_Harbor_EventScript_21E350 + compare VAR_TEMP_B, 1 + goto_eq LilycoveCity_Harbor_EventScript_21E2F0 + compare VAR_TEMP_B, 2 + goto_eq LilycoveCity_Harbor_EventScript_21E320 + compare VAR_TEMP_B, 4 + goto_eq LilycoveCity_Harbor_EventScript_21E350 + compare VAR_TEMP_B, 8 + goto_eq LilycoveCity_Harbor_EventScript_21E41D + compare VAR_TEMP_B, 0 + goto_if 5, LilycoveCity_Harbor_EventScript_21E44D + goto LilycoveCity_Harbor_EventScript_21E080 + end + +LilycoveCity_Harbor_EventScript_21E080:: @ 821E080 + compare VAR_TEMP_A, 0 + goto_eq LilycoveCity_Harbor_EventScript_21E557 + msgbox LilycoveCity_Harbor_Text_21E758, 4 + message LilycoveCity_Harbor_Text_21E7ED + waitmessage + goto LilycoveCity_Harbor_EventScript_21E09F + end + +LilycoveCity_Harbor_EventScript_21E09F:: @ 821E09F + setvar VAR_0x8004, 0 + special sub_80E2548 + waitstate + special sub_80E2878 + switch VAR_RESULT + case 0, LilycoveCity_Harbor_EventScript_21E149 + case 1, LilycoveCity_Harbor_EventScript_21E171 + case 2, LilycoveCity_Harbor_EventScript_21E109 + case 3, LilycoveCity_Harbor_EventScript_21E119 + case 4, LilycoveCity_Harbor_EventScript_21E129 + case 5, LilycoveCity_Harbor_EventScript_21E139 + case 6, LilycoveCity_Harbor_EventScript_21E626 + case 127, LilycoveCity_Harbor_EventScript_21E626 + end + +LilycoveCity_Harbor_EventScript_21E109:: @ 821E109 + call LilycoveCity_Harbor_EventScript_21E5CC + warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22 + waitstate + release + end + +LilycoveCity_Harbor_EventScript_21E119:: @ 821E119 + call LilycoveCity_Harbor_EventScript_21E5CC + warp MAP_NAVEL_ROCK_HARBOR, 255, 8, 4 + waitstate + release + end + +LilycoveCity_Harbor_EventScript_21E129:: @ 821E129 + call LilycoveCity_Harbor_EventScript_21E5CC + warp MAP_BIRTH_ISLAND_HARBOR, 255, 8, 4 + waitstate + release + end + +LilycoveCity_Harbor_EventScript_21E139:: @ 821E139 + call LilycoveCity_Harbor_EventScript_21E5CC + warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38 + waitstate + release + end + +LilycoveCity_Harbor_EventScript_21E149:: @ 821E149 + msgbox LilycoveCity_Harbor_Text_21E864, 5 + compare VAR_RESULT, 0 + goto_eq LilycoveCity_Harbor_EventScript_21E5C0 + setvar VAR_PORTHOLE, 5 + call LilycoveCity_Harbor_EventScript_21E5CC + warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 + waitstate + release + end + +LilycoveCity_Harbor_EventScript_21E171:: @ 821E171 + msgbox LilycoveCity_Harbor_Text_21E880, 5 + compare VAR_RESULT, 0 + goto_eq LilycoveCity_Harbor_EventScript_21E5C0 + call LilycoveCity_Harbor_EventScript_21E5CC + warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 + waitstate + release + end + +LilycoveCity_Harbor_EventScript_21E194:: @ 821E194 + setvar VAR_TEMP_E, 0 + checkflag FLAG_SYS_HAS_EON_TICKET + goto_if 0, LilycoveCity_Harbor_EventScript_27374E + checkitem ITEM_EON_TICKET, 1 + compare VAR_RESULT, 0 + goto_eq LilycoveCity_Harbor_EventScript_27374E + setvar VAR_TEMP_E, 1 + checkflag FLAG_0x1AE + goto_eq LilycoveCity_Harbor_EventScript_27374E + setvar VAR_TEMP_E, 2 + return + +LilycoveCity_Harbor_EventScript_21E1C6:: @ 821E1C6 + setvar VAR_TEMP_D, 0 + checkflag FLAG_0x8D5 + goto_if 0, LilycoveCity_Harbor_EventScript_27374E + checkitem ITEM_AURORA_TICKET, 1 + compare VAR_RESULT, 0 + goto_eq LilycoveCity_Harbor_EventScript_27374E + setvar VAR_TEMP_D, 1 + checkflag FLAG_0x1AF + goto_eq LilycoveCity_Harbor_EventScript_27374E + setvar VAR_TEMP_D, 2 + return + +LilycoveCity_Harbor_EventScript_21E1F8:: @ 821E1F8 + setvar VAR_TEMP_C, 0 + checkflag FLAG_0x8D6 + goto_if 0, LilycoveCity_Harbor_EventScript_27374E + checkitem ITEM_OLD_SEA_MAP, 1 + compare VAR_RESULT, 0 + goto_eq LilycoveCity_Harbor_EventScript_27374E + setvar VAR_TEMP_C, 1 + checkflag FLAG_0x1B0 + goto_eq LilycoveCity_Harbor_EventScript_27374E + setvar VAR_TEMP_C, 2 + return + +LilycoveCity_Harbor_EventScript_21E22A:: @ 821E22A + setvar VAR_TEMP_9, 0 + checkflag FLAG_0x8E0 + goto_if 0, LilycoveCity_Harbor_EventScript_27374E + checkitem ITEM_MYSTIC_TICKET, 1 + compare VAR_RESULT, 0 + goto_eq LilycoveCity_Harbor_EventScript_27374E + setvar VAR_TEMP_9, 1 + checkflag FLAG_0x1DB + goto_eq LilycoveCity_Harbor_EventScript_27374E + setvar VAR_TEMP_9, 2 + return + +LilycoveCity_Harbor_EventScript_21E25C:: @ 821E25C + setvar VAR_TEMP_B, 0 + compare VAR_TEMP_E, 2 + call_if 1, LilycoveCity_Harbor_EventScript_21E28E + compare VAR_TEMP_D, 2 + call_if 1, LilycoveCity_Harbor_EventScript_21E294 + compare VAR_TEMP_C, 2 + call_if 1, LilycoveCity_Harbor_EventScript_21E29A + compare VAR_TEMP_9, 2 + call_if 1, LilycoveCity_Harbor_EventScript_21E2A0 + return + +LilycoveCity_Harbor_EventScript_21E28E:: @ 821E28E + addvar VAR_TEMP_B, 1 + return + +LilycoveCity_Harbor_EventScript_21E294:: @ 821E294 + addvar VAR_TEMP_B, 2 + return + +LilycoveCity_Harbor_EventScript_21E29A:: @ 821E29A + addvar VAR_TEMP_B, 4 + return + +LilycoveCity_Harbor_EventScript_21E2A0:: @ 821E2A0 + addvar VAR_TEMP_B, 8 + return + +LilycoveCity_Harbor_EventScript_21E2A6:: @ 821E2A6 + setvar VAR_TEMP_A, 0 + compare VAR_TEMP_E, 1 + call_if 1, LilycoveCity_Harbor_EventScript_21E2D8 + compare VAR_TEMP_D, 1 + call_if 1, LilycoveCity_Harbor_EventScript_21E2DE + compare VAR_TEMP_C, 1 + call_if 1, LilycoveCity_Harbor_EventScript_21E2E4 + compare VAR_TEMP_9, 1 + call_if 1, LilycoveCity_Harbor_EventScript_21E2EA + return + +LilycoveCity_Harbor_EventScript_21E2D8:: @ 821E2D8 + addvar VAR_TEMP_A, 1 + return + +LilycoveCity_Harbor_EventScript_21E2DE:: @ 821E2DE + addvar VAR_TEMP_A, 2 + return + +LilycoveCity_Harbor_EventScript_21E2E4:: @ 821E2E4 + addvar VAR_TEMP_A, 4 + return + +LilycoveCity_Harbor_EventScript_21E2EA:: @ 821E2EA + addvar VAR_TEMP_A, 8 + return + +LilycoveCity_Harbor_EventScript_21E2F0:: @ 821E2F0 + setflag FLAG_0x1AE + msgbox LilycoveCity_Harbor_Text_2A68D2, 4 + closemessage + call LilycoveCity_Harbor_EventScript_21E4EE + msgbox LilycoveCity_Harbor_Text_2A68FC, 4 + goto LilycoveCity_Harbor_EventScript_21E30F + end + +LilycoveCity_Harbor_EventScript_21E30F:: @ 821E30F + closemessage + call LilycoveCity_Harbor_EventScript_21E514 + warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22 + waitstate + release + end + +LilycoveCity_Harbor_EventScript_21E320:: @ 821E320 + setflag FLAG_0x1AF + msgbox LilycoveCity_Harbor_Text_2A68D2, 4 + closemessage + call LilycoveCity_Harbor_EventScript_21E4EE + msgbox LilycoveCity_Harbor_Text_2C6A71, 4 + goto LilycoveCity_Harbor_EventScript_21E33F + end + +LilycoveCity_Harbor_EventScript_21E33F:: @ 821E33F + closemessage + call LilycoveCity_Harbor_EventScript_21E514 + warp MAP_BIRTH_ISLAND_HARBOR, 255, 8, 4 + waitstate + release + end + +LilycoveCity_Harbor_EventScript_21E350:: @ 821E350 + setflag FLAG_0x1B0 + msgbox LilycoveCity_Harbor_Text_2A6848, 4 + closemessage + call LilycoveCity_Harbor_EventScript_21E4EE + msgbox LilycoveCity_Harbor_Text_2C68A5, 4 + closemessage + applymovement 4, LilycoveCity_Harbor_Movement_2725A6 + waitmovement 0 + playse SE_PIN + applymovement 4, LilycoveCity_Harbor_Movement_272598 + waitmovement 0 + applymovement 4, LilycoveCity_Harbor_Movement_27259A + waitmovement 0 + compare VAR_FACING, 2 + call_if 1, LilycoveCity_Harbor_EventScript_21E656 + compare VAR_FACING, 4 + call_if 1, LilycoveCity_Harbor_EventScript_21E661 + addobject 5 + compare VAR_FACING, 2 + call_if 1, LilycoveCity_Harbor_EventScript_21E675 + compare VAR_FACING, 4 + call_if 1, LilycoveCity_Harbor_EventScript_21E680 + msgbox LilycoveCity_Harbor_Text_2C6951, 4 + compare VAR_FACING, 2 + call_if 1, LilycoveCity_Harbor_EventScript_21E68B + compare VAR_FACING, 4 + call_if 1, LilycoveCity_Harbor_EventScript_21E696 + msgbox LilycoveCity_Harbor_Text_2C69AA, 4 + closemessage + compare VAR_FACING, 2 + call_if 1, LilycoveCity_Harbor_EventScript_21E6A1 + compare VAR_FACING, 4 + call_if 1, LilycoveCity_Harbor_EventScript_21E6BA + setvar VAR_0x8004, 2 + call LilycoveCity_Harbor_EventScript_2721E2 + warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38 + waitstate + release + end + +LilycoveCity_Harbor_EventScript_21E40C:: @ 821E40C + closemessage + call LilycoveCity_Harbor_EventScript_21E514 + warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38 + waitstate + release + end + +LilycoveCity_Harbor_EventScript_21E41D:: @ 821E41D + setflag FLAG_0x1DB + msgbox LilycoveCity_Harbor_Text_2A68D2, 4 + closemessage + call LilycoveCity_Harbor_EventScript_21E4EE + msgbox LilycoveCity_Harbor_Text_2C6A71, 4 + goto LilycoveCity_Harbor_EventScript_21E43C + end + +LilycoveCity_Harbor_EventScript_21E43C:: @ 821E43C + closemessage + call LilycoveCity_Harbor_EventScript_21E514 + warp MAP_NAVEL_ROCK_HARBOR, 255, 8, 4 + waitstate + release + end + +LilycoveCity_Harbor_EventScript_21E44D:: @ 821E44D + msgbox LilycoveCity_Harbor_Text_2A68D2, 4 + closemessage + call LilycoveCity_Harbor_EventScript_21E4EE + message LilycoveCity_Harbor_Text_2C6BD4 + waitmessage + setvar VAR_0x8004, 1 + special sub_80E2548 + waitstate + special sub_80E2878 + switch VAR_RESULT + case 2, LilycoveCity_Harbor_EventScript_21E30F + case 3, LilycoveCity_Harbor_EventScript_21E43C + case 4, LilycoveCity_Harbor_EventScript_21E33F + case 5, LilycoveCity_Harbor_EventScript_21E40C + case 6, LilycoveCity_Harbor_EventScript_21E4B6 + case 127, LilycoveCity_Harbor_EventScript_21E4B6 + release + end + +LilycoveCity_Harbor_EventScript_21E4B6:: @ 821E4B6 + msgbox LilycoveCity_Harbor_Text_2A6A82, 4 + closemessage + applymovement 4, LilycoveCity_Harbor_Movement_2725A6 + waitmovement 0 + delay 30 + removeobject 4 + delay 30 + applymovement 1, LilycoveCity_Harbor_Movement_2725AA + waitmovement 0 + showobjectat 1, MAP_LILYCOVE_CITY_HARBOR + delay 30 + msgbox LilycoveCity_Harbor_Text_21E842, 4 + release + end + +LilycoveCity_Harbor_EventScript_21E4EE:: @ 821E4EE + applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_2725A6 + waitmovement 0 + delay 30 + hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR + delay 60 + addobject 4 + delay 30 + applymovement 4, LilycoveCity_Harbor_Movement_27259E + waitmovement 0 + return + +LilycoveCity_Harbor_EventScript_21E514:: @ 821E514 + applymovement 4, LilycoveCity_Harbor_Movement_2725A6 + waitmovement 0 + delay 30 + removeobject 4 + 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, MAP_PETALBURG_CITY + setvar VAR_0x8004, 2 + call LilycoveCity_Harbor_EventScript_2721E2 + return + +LilycoveCity_Harbor_EventScript_21E54D:: @ 821E54D + msgbox LilycoveCity_Harbor_Text_21E6F1, 4 + release + end + +LilycoveCity_Harbor_EventScript_21E557:: @ 821E557 + msgbox LilycoveCity_Harbor_Text_21E758, 4 + message LilycoveCity_Harbor_Text_21E7ED + waitmessage + goto LilycoveCity_Harbor_EventScript_21E09F + end + +LilycoveCity_Harbor_EventScript_21E56B:: @ 821E56B + msgbox LilycoveCity_Harbor_Text_21E792, 4 + release + end + +LilycoveCity_Harbor_EventScript_21E575:: @ 821E575 + msgbox LilycoveCity_Harbor_Text_21E864, 5 + compare VAR_RESULT, 0 + goto_eq LilycoveCity_Harbor_EventScript_21E5C0 + setvar VAR_PORTHOLE, 5 + call LilycoveCity_Harbor_EventScript_21E5CC + warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 + waitstate + release + end + +LilycoveCity_Harbor_EventScript_21E59D:: @ 821E59D + msgbox LilycoveCity_Harbor_Text_21E880, 5 + compare VAR_RESULT, 0 + goto_eq LilycoveCity_Harbor_EventScript_21E5C0 + call LilycoveCity_Harbor_EventScript_21E5CC + warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 + waitstate + release + end + +LilycoveCity_Harbor_EventScript_21E5C0:: @ 821E5C0 + message LilycoveCity_Harbor_Text_21E8CC + waitmessage + goto LilycoveCity_Harbor_EventScript_21E09F + end + +LilycoveCity_Harbor_EventScript_21E5CC:: @ 821E5CC + msgbox LilycoveCity_Harbor_Text_21E89D, 4 + closemessage + applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_2725A6 + waitmovement 0 + delay 30 + 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, MAP_PETALBURG_CITY + setvar VAR_0x8004, 2 + call LilycoveCity_Harbor_EventScript_2721E2 + return + +LilycoveCity_Harbor_EventScript_21E610:: @ 821E610 + applymovement 255, LilycoveCity_Harbor_Movement_21E630 + waitmovement 0 + return + +LilycoveCity_Harbor_EventScript_21E61B:: @ 821E61B + applymovement 255, LilycoveCity_Harbor_Movement_21E633 + waitmovement 0 + return + +LilycoveCity_Harbor_EventScript_21E626:: @ 821E626 + msgbox LilycoveCity_Harbor_Text_21E842, 4 + release + end + +LilycoveCity_Harbor_Movement_21E630: @ 821E630 + walk_right + walk_in_place_fastest_up + step_end + +LilycoveCity_Harbor_Movement_21E633: @ 821E633 + walk_up + step_end + +LilycoveCity_Harbor_Movement_21E635: @ 821E635 + walk_up + step_end + +LilycoveCity_Harbor_EventScript_21E637:: @ 821E637 + lock + faceplayer + checkflag FLAG_SYS_GAME_CLEAR + goto_eq LilycoveCity_Harbor_EventScript_21E64C + msgbox LilycoveCity_Harbor_Text_21E8EE, 4 + release + end + +LilycoveCity_Harbor_EventScript_21E64C:: @ 821E64C + msgbox LilycoveCity_Harbor_Text_21E976, 4 + release + end + +LilycoveCity_Harbor_EventScript_21E656:: @ 821E656 + applymovement 4, LilycoveCity_Harbor_Movement_21E66C + waitmovement 0 + return + +LilycoveCity_Harbor_EventScript_21E661:: @ 821E661 + applymovement 4, LilycoveCity_Harbor_Movement_21E671 + waitmovement 0 + return + +LilycoveCity_Harbor_Movement_21E66C: @ 821E66C + walk_in_place_fastest_right + lock_facing_direction + walk_left + unlock_facing_direction + step_end + +LilycoveCity_Harbor_Movement_21E671: @ 821E671 + lock_facing_direction + walk_down + unlock_facing_direction + step_end + +LilycoveCity_Harbor_EventScript_21E675:: @ 821E675 + applymovement 5, LilycoveCity_Harbor_Movement_2725A4 + waitmovement 0 + return + +LilycoveCity_Harbor_EventScript_21E680:: @ 821E680 + applymovement 5, LilycoveCity_Harbor_Movement_2725AA + waitmovement 0 + return + +LilycoveCity_Harbor_EventScript_21E68B:: @ 821E68B + applymovement 5, LilycoveCity_Harbor_Movement_2725AA + waitmovement 0 + return + +LilycoveCity_Harbor_EventScript_21E696:: @ 821E696 + applymovement 5, LilycoveCity_Harbor_Movement_2725A4 + waitmovement 0 + return + +LilycoveCity_Harbor_EventScript_21E6A1:: @ 821E6A1 + applymovement 5, LilycoveCity_Harbor_Movement_21E6D3 + applymovement 255, LilycoveCity_Harbor_Movement_21E6D7 + applymovement 4, LilycoveCity_Harbor_Movement_21E6DC + waitmovement 0 + return + +LilycoveCity_Harbor_EventScript_21E6BA:: @ 821E6BA + applymovement 5, LilycoveCity_Harbor_Movement_21E6D3 + applymovement 255, LilycoveCity_Harbor_Movement_21E6E4 + applymovement 4, LilycoveCity_Harbor_Movement_21E6EA + waitmovement 0 + return + +LilycoveCity_Harbor_Movement_21E6D3: @ 821E6D3 + walk_in_place_fastest_up + delay_8 + set_invisible + step_end + +LilycoveCity_Harbor_Movement_21E6D7: @ 821E6D7 + delay_16 + walk_up + delay_16 + set_invisible + step_end + +LilycoveCity_Harbor_Movement_21E6DC: @ 821E6DC + delay_16 + delay_16 + delay_16 + walk_right + walk_in_place_fastest_up + delay_16 + set_invisible + step_end + +LilycoveCity_Harbor_Movement_21E6E4: @ 821E6E4 + delay_16 + walk_right + walk_in_place_fastest_up + delay_16 + set_invisible + step_end + +LilycoveCity_Harbor_Movement_21E6EA: @ 821E6EA + delay_16 + delay_16 + delay_16 + walk_up + delay_16 + set_invisible + step_end + +LilycoveCity_Harbor_Text_21E6F1: @ 821E6F1 + .string "I beg your pardon?\n" + .string "You’re looking for a ship?\p" + .string "I’m sorry, the ferry service isn’t\n" + .string "available at present…$" + +LilycoveCity_Harbor_Text_21E758: @ 821E758 + .string "Hello, are you here for the ferry?\n" + .string "May I see your TICKET?$" + + +LilycoveCity_Harbor_Text_21E792: @ 821E792 + .string "{PLAYER} doesn’t have the TICKET…\p" + .string "I’m terribly sorry.\p" + .string "You must have a TICKET to board\n" + .string "the ferry.$" + +LilycoveCity_Harbor_Text_21E7ED: @ 821E7ED + .string "{PLAYER} flashed the TICKET.\p" + .string "Perfect! That’s all you need!\p" + .string "And where would you like to go?$" + +LilycoveCity_Harbor_Text_21E842: @ 821E842 + .string "Please sail with us another time!$" + +LilycoveCity_Harbor_Text_21E864: @ 821E864 + .string "SLATEPORT CITY it is, then!$" + +LilycoveCity_Harbor_Text_21E880: @ 821E880 + .string "BATTLE FRONTIER it is, then!$" + +LilycoveCity_Harbor_Text_21E89D: @ 821E89D + .string "Please board the ferry and wait for\n" + .string "departure.$" + +LilycoveCity_Harbor_Text_21E8CC: @ 821E8CC + .string "Then, where would you like to go?$" + +LilycoveCity_Harbor_Text_21E8EE: @ 821E8EE + .string "Until they finish making the ferry,\n" + .string "we sailors have nothing to do…\p" + .string "I wish they’d get a move on, the folks\n" + .string "at the SHIPYARD in SLATEPORT.$" + +LilycoveCity_Harbor_Text_21E976: @ 821E976 + .string "The ferry S.S. TIDAL is finally in\n" + .string "operation.\p" + .string "The folks at the SHIPYARD in SLATEPORT\n" + .string "must’ve worked extra hard.\p" + .string "Well, it’s my turn to get busy now!$" + diff --git a/data/maps/LilycoveCity_House1/events.inc b/data/maps/LilycoveCity_House1/events.inc new file mode 100644 index 000000000..d268037ba --- /dev/null +++ b/data/maps/LilycoveCity_House1/events.inc @@ -0,0 +1,11 @@ +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 + +LilycoveCity_House1_MapWarps: @ 8531F24 + 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/LilycoveCity_House1/scripts.inc b/data/maps/LilycoveCity_House1/scripts.inc new file mode 100644 index 000000000..59418e667 --- /dev/null +++ b/data/maps/LilycoveCity_House1/scripts.inc @@ -0,0 +1,26 @@ +LilycoveCity_House1_MapScripts:: @ 821ECCD + .byte 0 + +LilycoveCity_House1_EventScript_21ECCE:: @ 821ECCE + msgbox LilycoveCity_House1_Text_21ECEA, 2 + end + +LilycoveCity_House1_EventScript_21ECD7:: @ 821ECD7 + lock + faceplayer + waitse + playmoncry SPECIES_KECLEON, 0 + msgbox LilycoveCity_House1_Text_21ED63, 4 + waitmoncry + release + end + +LilycoveCity_House1_Text_21ECEA: @ 821ECEA + .string "POKéMON are partners to people.\n" + .string "They aren’t our tools.\p" + .string "Unfortunately, there are some people\n" + .string "who fail to understand that…$" + +LilycoveCity_House1_Text_21ED63: @ 821ED63 + .string "KECLEON: Ruroro?$" + diff --git a/data/maps/LilycoveCity_House2/events.inc b/data/maps/LilycoveCity_House2/events.inc new file mode 100644 index 000000000..7e5276102 --- /dev/null +++ b/data/maps/LilycoveCity_House2/events.inc @@ -0,0 +1,10 @@ +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 + +LilycoveCity_House2_MapWarps: @ 8531F60 + 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/LilycoveCity_House2/scripts.inc b/data/maps/LilycoveCity_House2/scripts.inc new file mode 100644 index 000000000..486df9be0 --- /dev/null +++ b/data/maps/LilycoveCity_House2/scripts.inc @@ -0,0 +1,32 @@ +LilycoveCity_House2_MapScripts:: @ 821ED74 + .byte 0 + +LilycoveCity_House2_EventScript_21ED75:: @ 821ED75 + lock + faceplayer + checkflag FLAG_0x0EA + goto_eq LilycoveCity_House2_EventScript_21EDAC + msgbox LilycoveCity_House2_Text_21EDB6, 4 + giveitem_std ITEM_TM44 + compare VAR_RESULT, 0 + goto_eq LilycoveCity_House2_EventScript_272054 + setflag FLAG_0x0EA + msgbox LilycoveCity_House2_Text_21EDF9, 4 + release + end + +LilycoveCity_House2_EventScript_21EDAC:: @ 821EDAC + msgbox LilycoveCity_House2_Text_21EDF9, 4 + release + end + +LilycoveCity_House2_Text_21EDB6: @ 821EDB6 + .string "Huh? What? What’s that?\p" + .string "I’m not near awake yet…\n" + .string "You can have this…$" + +LilycoveCity_House2_Text_21EDF9: @ 821EDF9 + .string "Yawn…\p" + .string "Sleep is essential for good health…\n" + .string "Sleep and regain health…$" + diff --git a/data/maps/LilycoveCity_House3/events.inc b/data/maps/LilycoveCity_House3/events.inc new file mode 100644 index 000000000..4f582bdef --- /dev/null +++ b/data/maps/LilycoveCity_House3/events.inc @@ -0,0 +1,15 @@ +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 + +LilycoveCity_House3_MapWarps: @ 8532014 + 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/LilycoveCity_House3/scripts.inc b/data/maps/LilycoveCity_House3/scripts.inc new file mode 100644 index 000000000..38210196e --- /dev/null +++ b/data/maps/LilycoveCity_House3/scripts.inc @@ -0,0 +1,169 @@ +LilycoveCity_House3_MapScripts:: @ 821EE3C + map_script 3, LilycoveCity_House3_MapScript1_21EE42 + .byte 0 + +LilycoveCity_House3_MapScript1_21EE42: @ 821EE42 + random 4 + copyvar VAR_TEMP_1, VAR_RESULT + end + +LilycoveCity_House3_EventScript_21EE4B:: @ 821EE4B + lock + faceplayer + msgbox LilycoveCity_House3_Text_21EF99, 5 + compare VAR_RESULT, 0 + goto_eq LilycoveCity_House3_EventScript_21EE75 + msgbox LilycoveCity_House3_Text_21F0F8, 4 + closemessage + applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 + waitmovement 0 + release + end + +LilycoveCity_House3_EventScript_21EE75:: @ 821EE75 + msgbox LilycoveCity_House3_Text_21F0A9, 4 + closemessage + applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 + waitmovement 0 + release + end + +LilycoveCity_House3_EventScript_21EE8A:: @ 821EE8A + lock + faceplayer + msgbox LilycoveCity_House3_Text_21F430, 4 + closemessage + applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 + waitmovement 0 + release + end + +LilycoveCity_House3_EventScript_21EEA1:: @ 821EEA1 + lock + faceplayer + switch VAR_TEMP_1 + case 0, LilycoveCity_House3_EventScript_21EF71 + case 1, LilycoveCity_House3_EventScript_21EF7B + case 2, LilycoveCity_House3_EventScript_21EF85 + case 3, LilycoveCity_House3_EventScript_21EF8F + end + +LilycoveCity_House3_EventScript_21EED5:: @ 821EED5 + lock + faceplayer + switch VAR_TEMP_1 + case 0, LilycoveCity_House3_EventScript_21EF71 + case 1, LilycoveCity_House3_EventScript_21EF7B + case 2, LilycoveCity_House3_EventScript_21EF85 + case 3, LilycoveCity_House3_EventScript_21EF8F + end + +LilycoveCity_House3_EventScript_21EF09:: @ 821EF09 + lock + faceplayer + switch VAR_TEMP_1 + case 0, LilycoveCity_House3_EventScript_21EF71 + case 1, LilycoveCity_House3_EventScript_21EF7B + case 2, LilycoveCity_House3_EventScript_21EF85 + case 3, LilycoveCity_House3_EventScript_21EF8F + end + +LilycoveCity_House3_EventScript_21EF3D:: @ 821EF3D + lock + faceplayer + switch VAR_TEMP_1 + case 0, LilycoveCity_House3_EventScript_21EF71 + case 1, LilycoveCity_House3_EventScript_21EF7B + case 2, LilycoveCity_House3_EventScript_21EF85 + case 3, LilycoveCity_House3_EventScript_21EF8F + end + +LilycoveCity_House3_EventScript_21EF71:: @ 821EF71 + msgbox LilycoveCity_House3_Text_21F4A7, 4 + release + end + +LilycoveCity_House3_EventScript_21EF7B:: @ 821EF7B + msgbox LilycoveCity_House3_Text_21F4E0, 4 + release + end + +LilycoveCity_House3_EventScript_21EF85:: @ 821EF85 + msgbox LilycoveCity_House3_Text_21F523, 4 + release + end + +LilycoveCity_House3_EventScript_21EF8F:: @ 821EF8F + msgbox LilycoveCity_House3_Text_21F55A, 4 + release + end + +LilycoveCity_House3_Text_21EF99: @ 821EF99 + .string "Oh, my, my! Are you traveling alone?\n" + .string "But you’re so young! Good for you!\p" + .string "I’m sure my kids could learn a thing\n" + .string "or two from you!\p" + .string "Me? I’m a master of {POKEBLOCK}S.\p" + .string "If I get serious just a little, why,\n" + .string "I can concoct great {POKEBLOCK}S.\p" + .string "Would you like to learn from me,\n" + .string "a master of {POKEBLOCK}S?$" + +LilycoveCity_House3_Text_21F0A9: @ 821F0A9 + .string "Oh? Are you sure?\p" + .string "You shouldn’t always try to do\n" + .string "everything by yourself, dear!$" + +LilycoveCity_House3_Text_21F0F8: @ 821F0F8 + .string "Oh, good! You’re a smart soul!\n" + .string "This is a bit long, so listen up!\p" + .string "Are you ready?\p" + .string "If you look at {POKEBLOCK}S, you should see\n" + .string "that they are rated on how they feel.\p" + .string "The lower the feel rating,\n" + .string "the better it is. Don’t forget this!\p" + .string "A good {POKEBLOCK} has a low feel\n" + .string "rating and a high level.\p" + .string "A POKéMON can eat more good\n" + .string "{POKEBLOCK}S than ordinary ones, too.\p" + .string "And this is important.\p" + .string "If you want to make smooth {POKEBLOCK}S,\n" + .string "use different kinds of BERRIES.\p" + .string "Don’t be stingy--the kinds of BERRIES\n" + .string "affect the smoothness of {POKEBLOCK}S.\p" + .string "And another thing.\p" + .string "The more people blending BERRIES,\n" + .string "the smoother the {POKEBLOCK}S.\p" + .string "That’s why you should talk to other\n" + .string "people and make {POKEBLOCK}S together.\p" + .string "That’s about all you need to know to\n" + .string "make good {POKEBLOCK}S.\p" + .string "If everyone had POKéMON they love,\n" + .string "smooth {POKEBLOCK}S, and a loving family,\l" + .string "the world would be a happier place.\p" + .string "Don’t give up, dear!$" + +LilycoveCity_House3_Text_21F430: @ 821F430 + .string "When my wife gave birth to quadruplets,\n" + .string "you bet I was shocked.\p" + .string "But, now, seeing them play together,\n" + .string "it makes me happy.$" + +LilycoveCity_House3_Text_21F4A7: @ 821F4A7 + .string "We’re having MULTI BATTLES, but I know\n" + .string "I’m going to win.$" + +LilycoveCity_House3_Text_21F4E0: @ 821F4E0 + .string "We like mixing stuff at\n" + .string "the RECORD CORNER.\p" + .string "But what gets mixed up?$" + +LilycoveCity_House3_Text_21F523: @ 821F523 + .string "We’re going to make super {POKEBLOCK}S\n" + .string "with a BERRY BLENDER!$" + +LilycoveCity_House3_Text_21F55A: @ 821F55A + .string "I want to brag about how tough my\n" + .string "POKéMON is, so we’re going to enter\l" + .string "a CONTEST together.$" + diff --git a/data/maps/LilycoveCity_House4/events.inc b/data/maps/LilycoveCity_House4/events.inc new file mode 100644 index 000000000..e85c296d3 --- /dev/null +++ b/data/maps/LilycoveCity_House4/events.inc @@ -0,0 +1,11 @@ +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 + +LilycoveCity_House4_MapWarps: @ 8532068 + 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/LilycoveCity_House4/scripts.inc b/data/maps/LilycoveCity_House4/scripts.inc new file mode 100644 index 000000000..8bfdb2d48 --- /dev/null +++ b/data/maps/LilycoveCity_House4/scripts.inc @@ -0,0 +1,21 @@ +LilycoveCity_House4_MapScripts:: @ 821F5B4 + .byte 0 + +LilycoveCity_House4_EventScript_21F5B5:: @ 821F5B5 + msgbox LilycoveCity_House4_Text_21F5C7, 2 + end + +LilycoveCity_House4_EventScript_21F5BE:: @ 821F5BE + msgbox LilycoveCity_House4_Text_21F62B, 2 + end + +LilycoveCity_House4_Text_21F5C7: @ 821F5C7 + .string "This planet’s biggest mysteries are\n" + .string "at the bottom of the sea.\p" + .string "Somebody said that, but I don’t know…$" + +LilycoveCity_House4_Text_21F62B: @ 821F62B + .string "There’s a deep underwater trench\n" + .string "between MOSSDEEP and SOOTOPOLIS.\p" + .string "That’s what someone told me, anyway.$" + diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc new file mode 100644 index 000000000..47b39c6ee --- /dev/null +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc @@ -0,0 +1,38 @@ +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 + +LilycoveCity_LilycoveMuseum_1F_MapWarps: @ 853133C + 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 + 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 + +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_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc new file mode 100644 index 000000000..c2f3be7d6 --- /dev/null +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc @@ -0,0 +1,296 @@ +LilycoveCity_LilycoveMuseum_1F_MapScripts:: @ 8218CB8 + .byte 0 + +LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9:: @ 8218CB9 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_218E4B, 3 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2:: @ 8218CC2 + lockall + applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_27259E + message LilycoveCity_LilycoveMuseum_1F_Text_218EBC + waitmessage + multichoice 20, 8, 16, 1 + compare VAR_RESULT, 0 + goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218CEC + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_218CEC:: @ 8218CEC + msgbox LilycoveCity_LilycoveMuseum_1F_Text_218F5C, 2 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5:: @ 8218CF5 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_218F98, 5 + compare VAR_RESULT, 0 + goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218D14 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218D1E + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_218D14:: @ 8218D14 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_218FF8, 3 + releaseall + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_218D1E:: @ 8218D1E + msgbox LilycoveCity_LilycoveMuseum_1F_Text_219035, 3 + applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_218D99 + waitmovement 0 + removeobject 2 + switch VAR_FACING + case 2, LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A + case 3, LilycoveCity_LilycoveMuseum_1F_EventScript_218D6F + case 4, LilycoveCity_LilycoveMuseum_1F_EventScript_218D84 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A:: @ 8218D5A + lockall + applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_218DA1 + waitmovement 0 + warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 + waitstate + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_218D6F:: @ 8218D6F + lockall + applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_218D9B + waitmovement 0 + warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 + waitstate + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_218D84:: @ 8218D84 + lockall + applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_218D9E + waitmovement 0 + warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 + waitstate + end + +LilycoveCity_LilycoveMuseum_1F_Movement_218D99: @ 8218D99 + walk_up + step_end + +LilycoveCity_LilycoveMuseum_1F_Movement_218D9B: @ 8218D9B + walk_left + walk_up + step_end + +LilycoveCity_LilycoveMuseum_1F_Movement_218D9E: @ 8218D9E + walk_right + walk_up + step_end + +LilycoveCity_LilycoveMuseum_1F_Movement_218DA1: @ 8218DA1 + walk_up + walk_up + step_end + +LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4:: @ 8218DA4 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_219080, 3 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD:: @ 8218DAD + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2190BF, 3 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6:: @ 8218DB6 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2190F9, 3 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF:: @ 8218DBF + msgbox LilycoveCity_LilycoveMuseum_1F_Text_219142, 3 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_218DC8:: @ 8218DC8 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2191A2, 3 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1:: @ 8218DD1 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_21920D, 3 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_218DDA:: @ 8218DDA +LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA:: @ 8218DDA + msgbox LilycoveCity_LilycoveMuseum_1F_Text_219260, 3 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_218DE3:: @ 8218DE3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2192AA, 3 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC:: @ 8218DEC + msgbox LilycoveCity_LilycoveMuseum_1F_Text_219311, 3 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5:: @ 8218DF5 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2193B4, 2 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE:: @ 8218DFE + msgbox LilycoveCity_LilycoveMuseum_1F_Text_21941A, 2 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_218E07:: @ 8218E07 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2194BA, 3 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_218E10:: @ 8218E10 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2194E1, 3 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_218E19:: @ 8218E19 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_219515, 2 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_218E22:: @ 8218E22 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_21959B, 2 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B:: @ 8218E2B + lock + faceplayer + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2195FF, 4 + closemessage + applymovement 8, LilycoveCity_LilycoveMuseum_1F_Movement_2725A2 + waitmovement 0 + release + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_218E42:: @ 8218E42 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_21967A, 2 + end + +LilycoveCity_LilycoveMuseum_1F_Text_218E4B: @ 8218E4B + .string "Welcome to LILYCOVE MUSEUM.\p" + .string "Please take the time to enjoy our\n" + .string "collection of fantastic artwork\l" + .string "featuring POKéMON.$" + +LilycoveCity_LilycoveMuseum_1F_Text_218EBC: @ 8218EBC + .string "I’m the CURATOR of this MUSEUM of\n" + .string "fine arts.\p" + .string "It’s heartening to see someone so\n" + .string "young as you in our MUSEUM.\p" + .string "Have you viewed our collection of\n" + .string "paintings already?$" + +LilycoveCity_LilycoveMuseum_1F_Text_218F5C: @ 8218F5C + .string "Ah, then let me not disturb you.\n" + .string "Please, do take your time.$" + +LilycoveCity_LilycoveMuseum_1F_Text_218F98: @ 8218F98 + .string "Oh? I do believe that you seem to\n" + .string "be a POKéMON TRAINER.\p" + .string "Have you an interest in paintings,\n" + .string "too?$" + +LilycoveCity_LilycoveMuseum_1F_Text_218FF8: @ 8218FF8 + .string "I see…\p" + .string "I’m honored that you would visit\n" + .string "us in spite of that.$" + +LilycoveCity_LilycoveMuseum_1F_Text_219035: @ 8219035 + .string "Ah, excellent!\n" + .string "You do like paintings!\p" + .string "Then, may I ask you to come with me?$" + +LilycoveCity_LilycoveMuseum_1F_Text_219080: @ 8219080 + .string "It’s a very old painting.\n" + .string "The paint is peeling here and there.$" + +LilycoveCity_LilycoveMuseum_1F_Text_2190BF: @ 82190BF + .string "It’s an odd landscape with bizarre\n" + .string "and fantastic scenery.$" + +LilycoveCity_LilycoveMuseum_1F_Text_2190F9: @ 82190F9 + .string "It’s a painting of a beautiful, smiling\n" + .string "woman with a POKéMON on her lap.$" + +LilycoveCity_LilycoveMuseum_1F_Text_219142: @ 8219142 + .string "It’s a painting of a legendary POKéMON\n" + .string "from long ago.\p" + .string "The artist painted this from\n" + .string "imagination.$" + +LilycoveCity_LilycoveMuseum_1F_Text_2191A2: @ 82191A2 + .string "It’s a painting of GRASS POKéMON\n" + .string "swaying in a breeze.\p" + .string "They appear to be enjoying the wind’s\n" + .string "gentle caress.$" + +LilycoveCity_LilycoveMuseum_1F_Text_21920D: @ 821920D + .string "It’s a delicious-looking painting\n" + .string "of BERRIES.\p" + .string "This painting could make you hungry!$" + +LilycoveCity_LilycoveMuseum_1F_Text_219260: @ 8219260 + .string "It’s a replica of a famous sculpture.\p" + .string "It depicts an ancient BIRD POKéMON.$" + +LilycoveCity_LilycoveMuseum_1F_Text_2192AA: @ 82192AA + .string "It’s a big POKé BALL carved from\n" + .string "a black stone.\p" + .string "It was apparently used in festivals\n" + .string "in the olden days.$" + +LilycoveCity_LilycoveMuseum_1F_Text_219311: @ 8219311 + .string "It’s a huge stone tablet inscribed\n" + .string "with POKéMON and dense text in the\l" + .string "small characters of an ancient,\l" + .string "unreadable language.$" + +LilycoveCity_LilycoveMuseum_1F_Text_21938C: @ 821938C + .string "Hmmm…\n" + .string "What works of great magnificence…$" + +LilycoveCity_LilycoveMuseum_1F_Text_2193B4: @ 82193B4 + .string "Battling with POKéMON is fun,\n" + .string "I’ll grant you that.\p" + .string "But one mustn’t forget our love for\n" + .string "the fine arts.$" + +LilycoveCity_LilycoveMuseum_1F_Text_21941A: @ 821941A + .string "This ART MUSEUM… Well, you could\n" + .string "see many fantastic paintings.\p" + .string "And the CURATOR is a wonderful person.\p" + .string "Among artists like myself, this MUSEUM\n" + .string "is an inspiration.$" + +LilycoveCity_LilycoveMuseum_1F_Text_2194BA: @ 82194BA + .string "This lady is pretty!\n" + .string "She’s like Mommy!$" + +LilycoveCity_LilycoveMuseum_1F_Text_2194E1: @ 82194E1 + .string "This POKéMON is adorable!\n" + .string "Just like our little boy!$" + +LilycoveCity_LilycoveMuseum_1F_Text_219515: @ 8219515 + .string "I’d heard that this ART MUSEUM got\n" + .string "in some new paintings.\p" + .string "So, naturally I hurried over.\p" + .string "Are the new paintings up on\n" + .string "the second floor?$" + +LilycoveCity_LilycoveMuseum_1F_Text_21959B: @ 821959B + .string "Lately, the CURATOR has been\n" + .string "unusually cheerful.\p" + .string "I bet something good happened for him.\n" + .string "Definitely.$" + +LilycoveCity_LilycoveMuseum_1F_Text_2195FF: @ 82195FF + .string "I aim to see many great paintings\n" + .string "here and learn from them.\p" + .string "I have this dream of one day having\n" + .string "my artwork exhibited here.$" + +LilycoveCity_LilycoveMuseum_1F_Text_21967A: @ 821967A + .string "The ART MUSEUM has become a favorite\n" + .string "tourist destination.\p" + .string "It’s great for LILYCOVE…\n" + .string "No, great for the HOENN region!\p" + .string "This is what I’ve heard--a lone TRAINER\n" + .string "procured all the paintings upstairs.$" + diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc new file mode 100644 index 000000000..ba1e74e65 --- /dev/null +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc @@ -0,0 +1,26 @@ +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 + +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 + +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/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc new file mode 100644 index 000000000..6b4f0f3da --- /dev/null +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -0,0 +1,340 @@ +LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 821973A + map_script 1, LilycoveCity_LilycoveMuseum_2F_MapScript1_219745 + map_script 2, LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE + .byte 0 + +LilycoveCity_LilycoveMuseum_2F_MapScript1_219745: @ 8219745 + checkflag FLAG_0x0A0 + goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_21978B + goto LilycoveCity_LilycoveMuseum_2F_EventScript_219754 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_219754:: @ 8219754 + checkflag FLAG_0x0A1 + goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2197A3 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_219763 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_219763:: @ 8219763 + checkflag FLAG_0x0A2 + goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2197BB + goto LilycoveCity_LilycoveMuseum_2F_EventScript_219772 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_219772:: @ 8219772 + checkflag FLAG_0x0A3 + goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2197D3 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_219781 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_219781:: @ 8219781 + checkflag FLAG_0x0A4 + goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2197EB + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_21978B:: @ 821978B + setmetatile 10, 6, 606, 1 + setmetatile 11, 6, 607, 1 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_219754 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_2197A3:: @ 82197A3 + setmetatile 18, 6, 604, 1 + setmetatile 19, 6, 605, 1 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_219763 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_2197BB:: @ 82197BB + setmetatile 14, 10, 608, 1 + setmetatile 15, 10, 609, 1 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_219772 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_2197D3:: @ 82197D3 + setmetatile 6, 10, 602, 1 + setmetatile 7, 10, 603, 1 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_219781 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_2197EB:: @ 82197EB + setmetatile 2, 6, 610, 1 + setmetatile 3, 6, 611, 1 + end + +LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE: @ 82197FE + map_script_2 VAR_0x4094, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219808 + .2byte 0 + +LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808 + lockall + applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E + applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_219861 + waitmovement 0 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_2199EB, 3 + applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_219863 + waitmovement 0 + applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_219863 + waitmovement 0 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219A0D, 3 + applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E + waitmovement 0 + applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_219861 + waitmovement 0 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219BC4, 3 + copyvar VAR_0x4094, 0x1 + releaseall + end + +LilycoveCity_LilycoveMuseum_2F_Movement_219861: @ 8219861 + walk_in_place_fastest_left + step_end + +LilycoveCity_LilycoveMuseum_2F_Movement_219863: @ 8219863 + face_up + delay_16 + step_end + +LilycoveCity_LilycoveMuseum_2F_EventScript_219866:: @ 8219866 + lockall + checkflag FLAG_0x0EC + goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_219921 + specialvar VAR_0x8004, sub_80F8940 + switch VAR_0x8004 + case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA + case 2, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA + case 3, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA + case 4, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA + case 5, LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219CF3, 2 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA:: @ 82198BA + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219D42, 2 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3:: @ 82198C3 + applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E + waitmovement 0 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DD4, 4 + applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_219863 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DE6, 4 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA + applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EC5, 4 + givedecoration_std 44 + compare VAR_RESULT, 0 + goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_219911 + setflag FLAG_0x0EC + closemessage + releaseall + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_219911:: @ 8219911 + call LilycoveCity_LilycoveMuseum_2F_EventScript_272071 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EED, 4 + closemessage + releaseall + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_219921:: @ 8219921 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219F1B, 2 + releaseall + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_21992B:: @ 821992B + lockall + checkflag FLAG_0x0A2 + goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199C1 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FA0, 3 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_21993E:: @ 821993E + lockall + checkflag FLAG_0x0A4 + goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199DD + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FD3, 3 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_219951:: @ 8219951 + lockall + checkflag FLAG_0x0A0 + goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199A5 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A03B, 3 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_219964:: @ 8219964 + lockall + checkflag FLAG_0x0A1 + goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199B3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A008, 3 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_219977:: @ 8219977 + lockall + checkflag FLAG_0x0A3 + goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199CF + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A06D, 3 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_21998A:: @ 821998A + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0BD, 2 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_219993:: @ 8219993 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A132, 2 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_21999C:: @ 821999C + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A1A8, 2 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_2199A5:: @ 82199A5 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3 + fadescreen 1 + drawcontestwinner 9 + releaseall + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_2199B3:: @ 82199B3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3 + fadescreen 1 + drawcontestwinner 10 + releaseall + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_2199C1:: @ 82199C1 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3 + fadescreen 1 + drawcontestwinner 11 + releaseall + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_2199CF:: @ 82199CF + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3 + fadescreen 1 + drawcontestwinner 12 + releaseall + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_2199DD:: @ 82199DD + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3 + fadescreen 1 + drawcontestwinner 13 + releaseall + end + +LilycoveCity_LilycoveMuseum_2F_Text_2199EB: @ 82199EB + .string "This is our special exhibit hall.$" + +LilycoveCity_LilycoveMuseum_2F_Text_219A0D: @ 8219A0D + .string "As you can plainly see, there is not\n" + .string "a single painting on exhibit.\p" + .string "Here, I don’t wish to exhibit works of\n" + .string "so-called classical art.\p" + .string "Such classical works you can see on\n" + .string "our ground floor.\p" + .string "I wish to exhibit work that is far\n" + .string "different from the classics.\p" + .string "Art, after all, is not restricted to old,\n" + .string "famous works!\p" + .string "This exhibit hall, I wish to fill it with…\p" + .string "Modern and vibrant artworks of\n" + .string "POKéMON seemingly ready to spring\l" + .string "forth into glorious life!$" + +LilycoveCity_LilycoveMuseum_2F_Text_219BC4: @ 8219BC4 + .string "I beg your pardon. I didn’t intend\n" + .string "to monopolize the conversation.\p" + .string "Now, as you are young, and yet\n" + .string "obviously well traveled…\p" + .string "You must encounter lively POKéMON\n" + .string "and works of art depicting them.\p" + .string "If you were to come across such\n" + .string "a painting, may we ask you to obtain\l" + .string "the artist’s permission to exhibit\l" + .string "it here?$" + +LilycoveCity_LilycoveMuseum_2F_Text_219CF3: @ 8219CF3 + .string "I wish to fill this exhibit hall with\n" + .string "modern and vibrant paintings of\l" + .string "POKéMON.$" + +LilycoveCity_LilycoveMuseum_2F_Text_219D42: @ 8219D42 + .string "Thanks to you, we’ve added a new\n" + .string "painting to our collection!\p" + .string "I’ve heard it depicts your POKéMON.\n" + .string "Truly magnificent!\p" + .string "Thank you so very, very much!$" + +LilycoveCity_LilycoveMuseum_2F_Text_219DD4: @ 8219DD4 + .string "Ah! It’s you!\n" + .string "{PLAYER}!$" + +LilycoveCity_LilycoveMuseum_2F_Text_219DE6: @ 8219DE6 + .string "Isn’t this marvelous?\n" + .string "This collection of paintings!\p" + .string "Each one of them flawless!\n" + .string "None better than another!\p" + .string "These paintings have attracted\n" + .string "more guests to our ART MUSEUM.\p" + .string "Sincerely, I thank you, {PLAYER}.\n" + .string "This is my dream come true!$" + +LilycoveCity_LilycoveMuseum_2F_Text_219EC5: @ 8219EC5 + .string "This is merely a token of my gratitude.$" + +LilycoveCity_LilycoveMuseum_2F_Text_219EED: @ 8219EED + .string "I will keep this for you until we\n" + .string "meet again.$" + +LilycoveCity_LilycoveMuseum_2F_Text_219F1B: @ 8219F1B + .string "Ah, so good to see you, {PLAYER}!\p" + .string "It’s an honor to have you visit us\n" + .string "on your busy journeys.\p" + .string "Please, relax and do enjoy your\n" + .string "visit with us.$" + +LilycoveCity_LilycoveMuseum_2F_Text_219FA0: @ 8219FA0 + .string "It’s a picture frame with pink-colored\n" + .string "adornments.$" + +LilycoveCity_LilycoveMuseum_2F_Text_219FD3: @ 8219FD3 + .string "It’s a picture frame with\n" + .string "yellow-colored adornments.$" + +LilycoveCity_LilycoveMuseum_2F_Text_21A008: @ 821A008 + .string "It’s a picture frame with\n" + .string "blue-colored adornments.$" + +LilycoveCity_LilycoveMuseum_2F_Text_21A03B: @ 821A03B + .string "It’s a picture frame with\n" + .string "red-colored adornments.$" + +LilycoveCity_LilycoveMuseum_2F_Text_21A06D: @ 821A06D + .string "It’s a picture frame with\n" + .string "green-colored adornments.$" + +LilycoveCity_LilycoveMuseum_2F_Text_21A0A1: @ 821A0A1 + .string "It’s a painting of POKéMON.$" + +LilycoveCity_LilycoveMuseum_2F_Text_21A0BD: @ 821A0BD + .string "I’ve been away awhile, so the new\n" + .string "paintings up here surprised me.\p" + .string "I wish someone would paint my POKéMON\n" + .string "this pretty.$" + +LilycoveCity_LilycoveMuseum_2F_Text_21A132: @ 821A132 + .string "Well… So this is where they show\n" + .string "the topical POKéMON paintings.\p" + .string "I see, these new paintings are indeed\n" + .string "rather amusing.$" + +LilycoveCity_LilycoveMuseum_2F_Text_21A1A8: @ 821A1A8 + .string "Wow, is that right?\n" + .string "These paintings are of your POKéMON.\p" + .string "Isn’t that just the ultimate joy for\n" + .string "a TRAINER?$" + diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/events.inc b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc new file mode 100644 index 000000000..784b388ae --- /dev/null +++ b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc @@ -0,0 +1,10 @@ +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 + +LilycoveCity_MoveDeletersHouse_MapWarps: @ 8531ED0 + 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/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc new file mode 100644 index 000000000..19471d2e1 --- /dev/null +++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc @@ -0,0 +1,111 @@ +LilycoveCity_MoveDeletersHouse_MapScripts:: @ 821EA0A + .byte 0 + +LilycoveCity_MoveDeletersHouse_EventScript_21EA0B:: @ 821EA0B + lockall + applymovement 1, LilycoveCity_MoveDeletersHouse_Movement_27259E + waitmovement 0 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EAFD, 5 + switch VAR_RESULT + case 1, LilycoveCity_MoveDeletersHouse_EventScript_21EA3B + case 0, LilycoveCity_MoveDeletersHouse_EventScript_21EAE6 + releaseall + end + +LilycoveCity_MoveDeletersHouse_EventScript_21EA3B:: @ 821EA3B + msgbox LilycoveCity_MoveDeletersHouse_Text_21EB65, 4 + special sub_81B94B0 + waitstate + compare VAR_0x8004, 255 + goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EAE6 + special sub_81B98DC + compare VAR_RESULT, 1 + goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EADC + special sub_81B96D0 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EACF + msgbox LilycoveCity_MoveDeletersHouse_Text_21EB89, 4 + fadescreen 1 + special sub_81B968C + fadescreen 0 + compare VAR_0x8005, 4 + goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EA3B + special sub_81B9718 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EBDA, 5 + switch VAR_RESULT + case 1, LilycoveCity_MoveDeletersHouse_EventScript_21EAB0 + case 0, LilycoveCity_MoveDeletersHouse_EventScript_21EAE6 + releaseall + end + +LilycoveCity_MoveDeletersHouse_EventScript_21EAB0:: @ 821EAB0 + special sub_81B9918 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EAF0 + special sub_81B9770 + playfanfare MUS_ME_WASURE + waitfanfare + msgbox LilycoveCity_MoveDeletersHouse_Text_21EC06, 4 + releaseall + end + +LilycoveCity_MoveDeletersHouse_EventScript_21EACF:: @ 821EACF + special sub_81B9718 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EBA9, 4 + releaseall + end + +LilycoveCity_MoveDeletersHouse_EventScript_21EADC:: @ 821EADC + msgbox LilycoveCity_MoveDeletersHouse_Text_21EC78, 4 + releaseall + end + +LilycoveCity_MoveDeletersHouse_EventScript_21EAE6:: @ 821EAE6 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EC3F, 4 + releaseall + end + +LilycoveCity_MoveDeletersHouse_EventScript_21EAF0:: @ 821EAF0 + special sub_81B9718 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EC9C, 4 + releaseall + end + +LilycoveCity_MoveDeletersHouse_Text_21EAFD: @ 821EAFD + .string "Uh…\n" + .string "Oh, yes, I’m the MOVE DELETER.\p" + .string "I can make POKéMON forget their moves.\p" + .string "Would you like me to do that?$" + +LilycoveCity_MoveDeletersHouse_Text_21EB65: @ 821EB65 + .string "Which POKéMON should forget a move?$" + +LilycoveCity_MoveDeletersHouse_Text_21EB89: @ 821EB89 + .string "Which move should be forgotten?$" + +LilycoveCity_MoveDeletersHouse_Text_21EBA9: @ 821EBA9 + .string "{STR_VAR_1} knows only one move\n" + .string "so it can’t be forgotten…$" + +LilycoveCity_MoveDeletersHouse_Text_21EBDA: @ 821EBDA + .string "Hm! {STR_VAR_1}’s {STR_VAR_2}?\n" + .string "That move should be forgotten?$" + +LilycoveCity_MoveDeletersHouse_Text_21EC06: @ 821EC06 + .string "It worked to perfection!\p" + .string "{STR_VAR_1} has forgotten\n" + .string "{STR_VAR_2} completely.$" + +LilycoveCity_MoveDeletersHouse_Text_21EC3F: @ 821EC3F + .string "Come again if there are moves that\n" + .string "need to be forgotten.$" + +LilycoveCity_MoveDeletersHouse_Text_21EC78: @ 821EC78 + .string "What?\n" + .string "No EGG should know any moves.$" + +LilycoveCity_MoveDeletersHouse_Text_21EC9C: @ 821EC9C + .string "Hm!\p" + .string "Your {STR_VAR_1} doesn’t seem willing\n" + .string "to forget SURF.$" + diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/events.inc b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..dce57df3d --- /dev/null +++ b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc @@ -0,0 +1,15 @@ +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 + +LilycoveCity_PokemonCenter_1F_MapWarps: @ 8531C44 + 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/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..b6ca09906 --- /dev/null +++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc @@ -0,0 +1,68 @@ +LilycoveCity_PokemonCenter_1F_MapScripts:: @ 821C5B2 + map_script 3, LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD + map_script 5, LilycoveCity_PokemonCenter_1F_MapScript1_277C30 + .byte 0 + +LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD: @ 821C5BD + setrespawn 8 + goto LilycoveCity_PokemonCenter_1F_EventScript_21C5C6 + end + +LilycoveCity_PokemonCenter_1F_EventScript_21C5C6:: @ 821C5C6 + special sub_818D9C0 + compare VAR_RESULT, 0 + goto_eq LilycoveCity_PokemonCenter_1F_EventScript_21C5E0 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_PokemonCenter_1F_EventScript_21C5E4 + end + +LilycoveCity_PokemonCenter_1F_EventScript_21C5E0:: @ 821C5E0 + setflag FLAG_0x3E1 + end + +LilycoveCity_PokemonCenter_1F_EventScript_21C5E4:: @ 821C5E4 + clearflag FLAG_0x3E1 + end + +LilycoveCity_PokemonCenter_1F_EventScript_21C5E8:: @ 821C5E8 + setvar VAR_0x800B, 1 + call LilycoveCity_PokemonCenter_1F_EventScript_27191E + waitmessage + waitbuttonpress + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_21C5F6:: @ 821C5F6 + msgbox LilycoveCity_PokemonCenter_1F_Text_21C61E, 2 + end + +LilycoveCity_PokemonCenter_1F_EventScript_21C5FF:: @ 821C5FF + lock + faceplayer + checkflag FLAG_BADGE07_GET + goto_eq LilycoveCity_PokemonCenter_1F_EventScript_21C614 + msgbox LilycoveCity_PokemonCenter_1F_Text_21C69D, 4 + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_21C614:: @ 821C614 + msgbox LilycoveCity_PokemonCenter_1F_Text_21C6F6, 4 + release + end + +LilycoveCity_PokemonCenter_1F_Text_21C61E: @ 821C61E + .string "I wonder how many kinds of POKéMON\n" + .string "there are in the world.\p" + .string "It’d be great to cross seas and\n" + .string "trade POKéMON with people far away.$" + +LilycoveCity_PokemonCenter_1F_Text_21C69D: @ 821C69D + .string "I’ve been hearing about some rotten\n" + .string "scoundrels who steal POKéMON and rip\l" + .string "off METEORITES.$" + +LilycoveCity_PokemonCenter_1F_Text_21C6F6: @ 821C6F6 + .string "Those rotten scoundrels who steal\n" + .string "POKéMON and rip off METEORITES…\p" + .string "I haven’t seen them around recently.$" + diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/events.inc b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..ec8e4cf6e --- /dev/null +++ b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc @@ -0,0 +1,14 @@ +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 + +LilycoveCity_PokemonCenter_2F_MapWarps: @ 8531CD0 + 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/LilycoveCity_PokemonCenter_2F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..f4a25f137 --- /dev/null +++ b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc @@ -0,0 +1,19 @@ +LilycoveCity_PokemonCenter_2F_MapScripts:: @ 821C75D + map_script 2, LilycoveCity_PokemonCenter_2F_MapScript2_276C3B + map_script 4, LilycoveCity_PokemonCenter_2F_MapScript2_276B6C + map_script 1, LilycoveCity_PokemonCenter_2F_MapScript1_276BBE + map_script 3, LilycoveCity_PokemonCenter_2F_MapScript1_276ACF + .byte 0 + +LilycoveCity_PokemonCenter_2F_EventScript_21C772:: @ 821C772 + call OldaleTown_PokemonCenter_2F_EventScript_276EB7 + end + +LilycoveCity_PokemonCenter_2F_EventScript_21C778:: @ 821C778 + call OldaleTown_PokemonCenter_2F_EventScript_2770B2 + end + +LilycoveCity_PokemonCenter_2F_EventScript_21C77E:: @ 821C77E + call OldaleTown_PokemonCenter_2F_EventScript_2771DB + end + diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc new file mode 100644 index 000000000..228e56e4d --- /dev/null +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc @@ -0,0 +1,18 @@ +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 + +LilycoveCity_PokemonTrainerFanClub_MapWarps: @ 8531DF8 + 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/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc new file mode 100644 index 000000000..74146fc7e --- /dev/null +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -0,0 +1,864 @@ +LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 821C785 + map_script 2, LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790 + map_script 3, LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D + .byte 0 + +LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790 + map_script_2 VAR_0x4095, 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A + .2byte 0 + +LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A + lockall + applymovement 1, LilycoveCity_PokemonTrainerFanClub_Movement_2725AA + waitmovement 0 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF00, 4 + applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD + applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5 + waitmovement 0 + applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_2725A8 + waitmovement 0 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF12, 4 + applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C804 + waitmovement 0 + applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_2725A4 + waitmovement 0 + applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C807 + waitmovement 0 + setvar VAR_0x4095, 2 + releaseall + end + +LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5: @ 821C7F5 + delay_8 + walk_in_place_fastest_down + walk_down + walk_down + walk_down + walk_left + walk_left + step_end + +LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD: @ 821C7FD + 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 + walk_down + walk_in_place_fastest_right + step_end + +LilycoveCity_PokemonTrainerFanClub_Movement_21C807: @ 821C807 + 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 + call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA + compare VAR_0x4095, 1 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F8 + compare VAR_0x4095, 2 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C829 + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21C829:: @ 821C829 + special sub_813BCE8 + call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5 + setvar VAR_0x8004, 8 + specialvar VAR_RESULT, sub_813BD60 + compare VAR_RESULT, 0 + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B8 + setvar VAR_0x8004, 9 + specialvar VAR_RESULT, sub_813BD60 + compare VAR_RESULT, 0 + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C0 + setvar VAR_0x8004, 10 + specialvar VAR_RESULT, sub_813BD60 + compare VAR_RESULT, 0 + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C8 + setvar VAR_0x8004, 11 + specialvar VAR_RESULT, sub_813BD60 + compare VAR_RESULT, 0 + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D0 + setvar VAR_0x8004, 12 + specialvar VAR_RESULT, sub_813BD60 + compare VAR_RESULT, 0 + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D8 + setvar VAR_0x8004, 13 + specialvar VAR_RESULT, sub_813BD60 + compare VAR_RESULT, 0 + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E0 + setvar VAR_0x8004, 14 + specialvar VAR_RESULT, sub_813BD60 + compare VAR_RESULT, 0 + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E8 + setvar VAR_0x8004, 15 + specialvar VAR_RESULT, sub_813BD60 + compare VAR_RESULT, 0 + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F0 + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA:: @ 821C8DA + specialvar VAR_RESULT, sub_80EE7C0 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1 + clearflag FLAG_0x2DA + clearflag FLAG_0x0D2 + return + +LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1:: @ 821C8F1 + setflag FLAG_0x2DA + return + +LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5:: @ 821C8F5 + setvar VAR_0x8005, 8 + setvar VAR_0x8004, 8 + specialvar VAR_RESULT, sub_813BD60 + compare VAR_RESULT, 0 + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE + setvar VAR_0x8004, 9 + specialvar VAR_RESULT, sub_813BD60 + compare VAR_RESULT, 0 + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE + setvar VAR_0x8004, 10 + specialvar VAR_RESULT, sub_813BD60 + compare VAR_RESULT, 0 + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE + setvar VAR_0x8004, 11 + specialvar VAR_RESULT, sub_813BD60 + compare VAR_RESULT, 0 + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE + setvar VAR_0x8004, 12 + specialvar VAR_RESULT, sub_813BD60 + compare VAR_RESULT, 0 + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE + setvar VAR_0x8004, 13 + specialvar VAR_RESULT, sub_813BD60 + compare VAR_RESULT, 0 + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE + setvar VAR_0x8004, 14 + specialvar VAR_RESULT, sub_813BD60 + compare VAR_RESULT, 0 + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE + setvar VAR_0x8004, 15 + specialvar VAR_RESULT, sub_813BD60 + compare VAR_RESULT, 0 + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE + compare VAR_0x8005, 5 + goto_if 4, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B4 + return + +LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE:: @ 821C9AE + subvar VAR_0x8005, 1 + return + +LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B4:: @ 821C9B4 + special sub_80EE72C + return + +LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B8:: @ 821C9B8 + setobjectxyperm 1, 7, 5 + return + +LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C0:: @ 821C9C0 + setobjectxyperm 3, 3, 4 + return + +LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C8:: @ 821C9C8 + setobjectxyperm 4, 7, 2 + return + +LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D0:: @ 821C9D0 + setobjectxyperm 5, 5, 5 + return + +LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D8:: @ 821C9D8 + setobjectxyperm 6, 5, 2 + return + +LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E0:: @ 821C9E0 + setobjectxyperm 2, 8, 4 + return + +LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E8:: @ 821C9E8 + setobjectxyperm 7, 3, 3 + return + +LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F0:: @ 821C9F0 + setobjectxyperm 8, 8, 3 + return + +LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F8:: @ 821C9F8 + call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5 + call LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C0 + call LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D0 + call LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D8 + call LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E8 + call LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F0 + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17:: @ 821CA17 + lock + faceplayer + setvar VAR_0x8004, 13 + special sub_813BDB4 + compare VAR_0x4095, 0 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA84 + specialvar VAR_RESULT, sub_813BD60 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56 + specialvar VAR_RESULT, sub_813BCA8 + compare VAR_RESULT, 7 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA7A + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D12A, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56:: @ 821CA56 + specialvar VAR_RESULT, sub_813BCA8 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA70 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D094, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CA70:: @ 821CA70 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D0BB, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CA7A:: @ 821CA7A + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D1B5, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CA84:: @ 821CA84 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D20C, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E:: @ 821CA8E + lock + faceplayer + setvar VAR_0x8004, 8 + special sub_813BDB4 + compare VAR_0x4095, 0 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAFB + specialvar VAR_RESULT, sub_813BD60 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD + specialvar VAR_RESULT, sub_813BCA8 + compare VAR_RESULT, 7 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAF1 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D347, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD:: @ 821CACD + specialvar VAR_RESULT, sub_813BCA8 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAE7 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2A6, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CAE7:: @ 821CAE7 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2CE, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CAF1:: @ 821CAF1 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D377, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CAFB:: @ 821CAFB + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D3EE, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05:: @ 821CB05 + lock + faceplayer + setvar VAR_0x8004, 9 + special sub_813BDB4 + compare VAR_0x4095, 0 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB72 + specialvar VAR_RESULT, sub_813BD60 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44 + specialvar VAR_RESULT, sub_813BCA8 + compare VAR_RESULT, 7 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB68 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D52E, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44:: @ 821CB44 + specialvar VAR_RESULT, sub_813BCA8 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB5E + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D438, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CB5E:: @ 821CB5E + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D4A3, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CB68:: @ 821CB68 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D5DC, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CB72:: @ 821CB72 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D69C, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C:: @ 821CB7C + lock + faceplayer + setvar VAR_0x8004, 10 + special sub_813BDB4 + compare VAR_0x4095, 0 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBE9 + specialvar VAR_RESULT, sub_813BD60 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB + specialvar VAR_RESULT, sub_813BCA8 + compare VAR_RESULT, 7 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBDF + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D822, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB:: @ 821CBBB + specialvar VAR_RESULT, sub_813BCA8 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBD5 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D751, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CBD5:: @ 821CBD5 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D79B, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CBDF:: @ 821CBDF + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D857, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CBE9:: @ 821CBE9 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D8C4, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3:: @ 821CBF3 + lock + faceplayer + setvar VAR_0x8004, 11 + special sub_813BDB4 + specialvar VAR_RESULT, sub_813BD60 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27 + specialvar VAR_RESULT, sub_813BCA8 + compare VAR_RESULT, 7 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC4B + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D9D1, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27:: @ 821CC27 + specialvar VAR_RESULT, sub_813BCA8 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC41 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D921, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CC41:: @ 821CC41 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D96A, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CC4B:: @ 821CC4B + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA0D, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55:: @ 821CC55 + lock + faceplayer + setvar VAR_0x8004, 12 + special sub_813BDB4 + specialvar VAR_RESULT, sub_813BD60 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89 + specialvar VAR_RESULT, sub_813BCA8 + compare VAR_RESULT, 7 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCAD + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DB69, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89:: @ 821CC89 + specialvar VAR_RESULT, sub_813BCA8 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCA3 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA73, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CCA3:: @ 821CCA3 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DAF5, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CCAD:: @ 821CCAD + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DBFB, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7:: @ 821CCB7 + lock + faceplayer + setvar VAR_0x8004, 14 + special sub_813BDB4 + specialvar VAR_RESULT, sub_813BD60 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB + specialvar VAR_RESULT, sub_813BCA8 + compare VAR_RESULT, 7 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD0F + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DD36, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB:: @ 821CCEB + specialvar VAR_RESULT, sub_813BCA8 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD05 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DC68, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CD05:: @ 821CD05 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DCD6, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CD0F:: @ 821CD0F + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DDCE, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19 + lock + faceplayer + setvar VAR_0x8004, 15 + special sub_813BDB4 + specialvar VAR_RESULT, sub_813BD60 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D + specialvar VAR_RESULT, sub_813BCA8 + compare VAR_RESULT, 7 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DEFF, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D:: @ 821CD4D + specialvar VAR_RESULT, sub_813BCA8 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE72, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67:: @ 821CD67 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE83, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71:: @ 821CD71 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DF51, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B:: @ 821CD7B + lock + faceplayer + checkflag FLAG_0x0D2 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED + checkflag FLAG_0x0D2 + goto_if 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90 + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90 + setvar VAR_0x8005, 11 + special InterviewBefore + compare VAR_RESULT, 1 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF + copyvar VAR_0x800A, VAR_0x8006 + setvar VAR_0x8004, 8 + special sub_813BDB4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281BCB, 4 + setvar VAR_0x8004, 14 + copyvar VAR_0x8005, VAR_0x800A + call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C + lock + faceplayer + compare VAR_RESULT, 1 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0 + compare VAR_RESULT, 0 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0:: @ 821CDE0 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C06, 4 + goto LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE + setvar VAR_0x8004, 8 + special sub_813BDB4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C3D, 5 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 + compare VAR_RESULT, 0 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15 + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15 + setvar VAR_0x8004, 8 + special sub_813BDB4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C65, 4 + setvar VAR_0x8004, 14 + copyvar VAR_0x8005, VAR_0x800A + call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C + lock + faceplayer + compare VAR_RESULT, 1 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0 + compare VAR_RESULT, 0 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D + setvar VAR_0x8004, 8 + special sub_813BDB4 + message LilycoveCity_PokemonTrainerFanClub_Text_281C95 + waitmessage + setvar VAR_0x8004, 2 + special sub_813A128 + waitstate + setvar VAR_0x8004, 8 + switch VAR_RESULT + case 11, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F + case 127, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F + setvar VAR_0x8004, 8 + special sub_813BDB4 + copyvar VAR_0x8006, VAR_0x800A + copyvar VAR_0x8005, VAR_RESULT + special PutFanClubSpecialOnTheAir + goto LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8 + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F + setvar VAR_0x8004, 8 + special sub_813BDB4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CCD, 5 + compare VAR_RESULT, 1 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 + compare VAR_RESULT, 0 + goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6:: @ 821CEC6 + setvar VAR_0x8004, 8 + special sub_813BDB4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CF5, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8 + setvar VAR_0x8004, 8 + special sub_813BDB4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281D40, 4 + setflag FLAG_0x0D2 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED:: @ 821CEED + setvar VAR_0x8004, 8 + special sub_813BDB4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281DB4, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF:: @ 821CEFF + end + +LilycoveCity_PokemonTrainerFanClub_Text_21CF00: @ 821CF00 + .string "Oh, wow!\n" + .string "It’s {PLAYER}!$" + +LilycoveCity_PokemonTrainerFanClub_Text_21CF12: @ 821CF12 + .string "I’ve heard the news!\n" + .string "You’re really strong, aren’t you?\p" + .string "We always argue about who is the\n" + .string "strongest of all TRAINERS here.\p" + .string "So when I heard about you, I decided\n" + .string "to be your fan!\p" + .string "I hope you’ll keep on battling other\n" + .string "tough TRAINERS.\p" + .string "That way, we’ll be able to see more\n" + .string "of your hot, hot battles.\p" + .string "That will make the others here see\n" + .string "exactly how great you are.\p" + .string "Remember, I’m cheering for you,\n" + .string "{PLAYER}!$" + +LilycoveCity_PokemonTrainerFanClub_Text_21D094: @ 821D094 + .string "Yo, {PLAYER}!\n" + .string "You’re the one we want to win!$" + +LilycoveCity_PokemonTrainerFanClub_Text_21D0BB: @ 821D0BB + .string "The others, they don’t know that\n" + .string "you’re the best of the best!\p" + .string "Isn’t that right, {PLAYER}?\n" + .string "Show them you’ve got guts!$" + +LilycoveCity_PokemonTrainerFanClub_Text_21D12A: @ 821D12A + .string "I hate to say this, but the TRAINER\n" + .string "everybody’s talking about is\l" + .string "{STR_VAR_1}, no question about it!\p" + .string "That TRAINER’s power…\n" + .string "It’s out of the ordinary.$" + +LilycoveCity_PokemonTrainerFanClub_Text_21D1B5: @ 821D1B5 + .string "Darn it… I’ve been telling people\n" + .string "that {STR_VAR_1} is the best now…\p" + .string "But no one wants to listen…$" + +LilycoveCity_PokemonTrainerFanClub_Text_21D20C: @ 821D20C + .string "I’ve been hearing things about\n" + .string "a tough new TRAINER.\p" + .string "This TRAINER’s supposed to be beating\n" + .string "GYM LEADERS, even.\p" + .string "Do you know anything about this\n" + .string "new TRAINER?$" + +LilycoveCity_PokemonTrainerFanClub_Text_21D2A6: @ 821D2A6 + .string "Oh!\n" + .string "{PLAYER}!\p" + .string "Go for it!\n" + .string "I’m pulling for you!$" + +LilycoveCity_PokemonTrainerFanClub_Text_21D2CE: @ 821D2CE + .string "Sigh…\n" + .string "BRAWLY…\p" + .string "Oh, no! Wait!\n" + .string "That’s not right! No, no, no!\p" + .string "I’m your fan through and through!\p" + .string "So make me proud!\n" + .string "Go for it!$" + +LilycoveCity_PokemonTrainerFanClub_Text_21D347: @ 821D347 + .string "I can’t help it, I can only get to\n" + .string "like BRAWLY…$" + +LilycoveCity_PokemonTrainerFanClub_Text_21D377: @ 821D377 + .string "Nobody understands the charm of\n" + .string "BRAWLY…\p" + .string "I don’t care!\p" + .string "Even if I’m the only one, I’m going\n" + .string "to keep cheering for BRAWLY!$" + +LilycoveCity_PokemonTrainerFanClub_Text_21D3EE: @ 821D3EE + .string "Whatever anyone says, my favorite\n" + .string "TRAINER is DEWFORD’s GYM LEADER\l" + .string "BRAWLY!$" + +LilycoveCity_PokemonTrainerFanClub_Text_21D438: @ 821D438 + .string "You’ve surpassed your own father in\n" + .string "every regard!\p" + .string "I’m telling you, so there’s no question\n" + .string "about it at all!$" + +LilycoveCity_PokemonTrainerFanClub_Text_21D4A3: @ 821D4A3 + .string "Even when things turned bleak,\n" + .string "your father never gave up.\p" + .string "This I know to be true.\p" + .string "You never give up even if you lose!\n" + .string "So keep on battling!$" + +LilycoveCity_PokemonTrainerFanClub_Text_21D52E: @ 821D52E + .string "NORMAN battled with more power,\n" + .string "charisma, and showmanship than you.\p" + .string "Even though people may say that\n" + .string "you’re strong…\p" + .string "You’ve still got a long way to go\n" + .string "compared to your father.$" + +LilycoveCity_PokemonTrainerFanClub_Text_21D5DC: @ 821D5DC + .string "You’re beginning to get the same\n" + .string "air of awe NORMAN exudes.\p" + .string "But there’s something conclusively\n" + .string "different between you and NORMAN.\p" + .string "I can’t tell you what that is.\n" + .string "You’ll have to find it yourself.$" + +LilycoveCity_PokemonTrainerFanClub_Text_21D69C: @ 821D69C + .string "Everyone here, we’re all huge fans\n" + .string "of POKéMON battles.\p" + .string "We discuss who we consider to be\n" + .string "the strongest of all TRAINERS.\p" + .string "If you were to become famous,\n" + .string "we might even become your fans!$" + +LilycoveCity_PokemonTrainerFanClub_Text_21D751: @ 821D751 + .string "Oh, woweee! It’s {PLAYER}!\n" + .string "For real, too!\p" + .string "Please, shake my hand, shake my hand!$" + +LilycoveCity_PokemonTrainerFanClub_Text_21D79B: @ 821D79B + .string "I’ll always cheer for you, {PLAYER}!\n" + .string "Always, always!\p" + .string "I don’t want to see you lose ever,\n" + .string "{PLAYER}.\p" + .string "Because I know you’re really,\n" + .string "really strong, {PLAYER}!$" + +LilycoveCity_PokemonTrainerFanClub_Text_21D822: @ 821D822 + .string "{STR_VAR_1} is really cool…\p" + .string "Everyone thinks so, right, right?$" + +LilycoveCity_PokemonTrainerFanClub_Text_21D857: @ 821D857 + .string "{STR_VAR_1} really is cool, don’t\n" + .string "you think so?\p" + .string "Even if it’s just me, I’m going to keep\n" + .string "cheering my favorite TRAINER.$" + +LilycoveCity_PokemonTrainerFanClub_Text_21D8C4: @ 821D8C4 + .string "My favorite TRAINER is…\p" + .string "Cool…\p" + .string "Strong…\p" + .string "And really nice…\p" + .string "I wish there was a TRAINER like that…$" + +LilycoveCity_PokemonTrainerFanClub_Text_21D921: @ 821D921 + .string "Whoa! It’s {PLAYER}!\n" + .string "Wicked!\p" + .string "When I grow up, I want to be strong\n" + .string "like you, {PLAYER}!$" + +LilycoveCity_PokemonTrainerFanClub_Text_21D96A: @ 821D96A + .string "Even if I’m the only one…\p" + .string "You’ll always be the only one\n" + .string "I cheer for, {PLAYER}!\p" + .string "Because I believe in you, {PLAYER}!$" + +LilycoveCity_PokemonTrainerFanClub_Text_21D9D1: @ 821D9D1 + .string "{STR_VAR_1} is so wickedly cool…\n" + .string "I want to shake hands with my hero.$" + +LilycoveCity_PokemonTrainerFanClub_Text_21DA0D: @ 821DA0D + .string "Even if I’m the only one…\p" + .string "I’m never going to stop being\n" + .string "{STR_VAR_1}’s fan!\p" + .string "Because I’ve heard, {STR_VAR_1}\n" + .string "never loses!$" + +LilycoveCity_PokemonTrainerFanClub_Text_21DA73: @ 821DA73 + .string "{PLAYER}!\n" + .string "You are amazing after all!\p" + .string "Ever since I set eyes on you,\n" + .string "I knew that you were great.\p" + .string "It looks like my eyes didn’t deceive me.$" + +LilycoveCity_PokemonTrainerFanClub_Text_21DAF5: @ 821DAF5 + .string "Who cares about the others.\n" + .string "I’m in your corner!\p" + .string "You don’t need to worry. Just get\n" + .string "out there and battle like always.$" + +LilycoveCity_PokemonTrainerFanClub_Text_21DB69: @ 821DB69 + .string "You’re a pretty decent TRAINER,\n" + .string "I think.\p" + .string "But I also think that {STR_VAR_1}\n" + .string "is number one right now.\p" + .string "That’s just my opinion.\n" + .string "Don’t worry about it too much.$" + +LilycoveCity_PokemonTrainerFanClub_Text_21DBFB: @ 821DBFB + .string "Wow, you really are strong.\n" + .string "Maybe even stronger than {STR_VAR_1}.\p" + .string "But {STR_VAR_1} needs me.\p" + .string "If I don’t cheer for {STR_VAR_1},\n" + .string "who will?$" + +LilycoveCity_PokemonTrainerFanClub_Text_21DC68: @ 821DC68 + .string "You’ve changed my mind!\n" + .string "You are strong, aren’t you?\p" + .string "I’d like you to tell me how you managed\n" + .string "to get so strong!$" + +LilycoveCity_PokemonTrainerFanClub_Text_21DCD6: @ 821DCD6 + .string "The tougher the situation, the more\n" + .string "attractively you battle.\p" + .string "I can’t wait for your next battle!$" + +LilycoveCity_PokemonTrainerFanClub_Text_21DD36: @ 821DD36 + .string "Among the recently hot TRAINERS,\n" + .string "{STR_VAR_1} is the standout.\p" + .string "That toughness, it’s simply not normal.\p" + .string "You’re doing okay, but you’re not in\n" + .string "the same class as {STR_VAR_1}.$" + +LilycoveCity_PokemonTrainerFanClub_Text_21DDCE: @ 821DDCE + .string "You are really popular…\p" + .string "You’re strong, and you’re caring to\n" + .string "POKéMON. No one can knock you.\p" + .string "But, you know, I believe in {STR_VAR_1}.\p" + .string "{STR_VAR_1} is definitely stronger!\n" + .string "I’m positive!$" + +LilycoveCity_PokemonTrainerFanClub_Text_21DE72: @ 821DE72 + .string "You…\p" + .string "Impressive!$" + +LilycoveCity_PokemonTrainerFanClub_Text_21DE83: @ 821DE83 + .string "Your true worth, it is fine if only\n" + .string "I recognized it.\p" + .string "The others I doubt will understand\n" + .string "the hidden power that beats within.$" + +LilycoveCity_PokemonTrainerFanClub_Text_21DEFF: @ 821DEFF + .string "Yes, I see strength in your eyes.\p" + .string "But!\p" + .string "You still haven’t realized your\n" + .string "potential.$" + +LilycoveCity_PokemonTrainerFanClub_Text_21DF51: @ 821DF51 + .string "It is true that you are tremendously\n" + .string "powerful.\p" + .string "But!\n" + .string "I can tell…\p" + .string "That strength cannot be considered\n" + .string "true strength yet!\p" + .string "True strength is…!\n" + .string "… …\p" + .string "Actually, I have no idea, either.$" + diff --git a/data/maps/LilycoveCity_UnusedMart/events.inc b/data/maps/LilycoveCity_UnusedMart/events.inc new file mode 100644 index 000000000..0481a1c0b --- /dev/null +++ b/data/maps/LilycoveCity_UnusedMart/events.inc @@ -0,0 +1,7 @@ +LilycoveCity_UnusedMart_MapWarps: @ 8531CFC + 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/LilycoveCity_UnusedMart/scripts.inc b/data/maps/LilycoveCity_UnusedMart/scripts.inc new file mode 100644 index 000000000..fa0405f68 --- /dev/null +++ b/data/maps/LilycoveCity_UnusedMart/scripts.inc @@ -0,0 +1,3 @@ +LilycoveCity_UnusedMart_MapScripts:: @ 821C784 + .byte 0 + diff --git a/data/maps/LinkContestRoom1/events.inc b/data/maps/LinkContestRoom1/events.inc new file mode 100644 index 000000000..c1bdfe3fb --- /dev/null +++ b/data/maps/LinkContestRoom1/events.inc @@ -0,0 +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 + +LinkContestRoom1_MapEvents:: @ 853A064 diff --git a/data/maps/LinkContestRoom1/scripts.inc b/data/maps/LinkContestRoom1/scripts.inc new file mode 100644 index 000000000..5276adcd8 --- /dev/null +++ b/data/maps/LinkContestRoom1/scripts.inc @@ -0,0 +1 @@ +LinkContestRoom1_MapScripts:: @ 823B781 diff --git a/data/maps/LinkContestRoom2/events.inc b/data/maps/LinkContestRoom2/events.inc new file mode 100644 index 000000000..89cb251d5 --- /dev/null +++ b/data/maps/LinkContestRoom2/events.inc @@ -0,0 +1 @@ +LinkContestRoom2_MapEvents:: @ 853A064 diff --git a/data/maps/LinkContestRoom2/scripts.inc b/data/maps/LinkContestRoom2/scripts.inc new file mode 100644 index 000000000..ff85310f7 --- /dev/null +++ b/data/maps/LinkContestRoom2/scripts.inc @@ -0,0 +1 @@ +LinkContestRoom2_MapScripts:: @ 823B781 diff --git a/data/maps/LinkContestRoom3/events.inc b/data/maps/LinkContestRoom3/events.inc new file mode 100644 index 000000000..1e1b194c6 --- /dev/null +++ b/data/maps/LinkContestRoom3/events.inc @@ -0,0 +1 @@ +LinkContestRoom3_MapEvents:: @ 853A064 diff --git a/data/maps/LinkContestRoom3/scripts.inc b/data/maps/LinkContestRoom3/scripts.inc new file mode 100644 index 000000000..c3a5c95fb --- /dev/null +++ b/data/maps/LinkContestRoom3/scripts.inc @@ -0,0 +1 @@ +LinkContestRoom3_MapScripts:: @ 823B781 diff --git a/data/maps/LinkContestRoom4/events.inc b/data/maps/LinkContestRoom4/events.inc new file mode 100644 index 000000000..56e608f20 --- /dev/null +++ b/data/maps/LinkContestRoom4/events.inc @@ -0,0 +1 @@ +LinkContestRoom4_MapEvents:: @ 853A064 diff --git a/data/maps/LinkContestRoom4/scripts.inc b/data/maps/LinkContestRoom4/scripts.inc new file mode 100644 index 000000000..9a544e6f3 --- /dev/null +++ b/data/maps/LinkContestRoom4/scripts.inc @@ -0,0 +1 @@ +LinkContestRoom4_MapScripts:: @ 823B781 diff --git a/data/maps/LinkContestRoom5/events.inc b/data/maps/LinkContestRoom5/events.inc new file mode 100644 index 000000000..90644518e --- /dev/null +++ b/data/maps/LinkContestRoom5/events.inc @@ -0,0 +1 @@ +LinkContestRoom5_MapEvents:: @ 853A064 diff --git a/data/maps/LinkContestRoom5/scripts.inc b/data/maps/LinkContestRoom5/scripts.inc new file mode 100644 index 000000000..f7ea72996 --- /dev/null +++ b/data/maps/LinkContestRoom5/scripts.inc @@ -0,0 +1 @@ +LinkContestRoom5_MapScripts:: @ 823B781 diff --git a/data/maps/LinkContestRoom6/events.inc b/data/maps/LinkContestRoom6/events.inc new file mode 100644 index 000000000..802987a1d --- /dev/null +++ b/data/maps/LinkContestRoom6/events.inc @@ -0,0 +1 @@ +LinkContestRoom6_MapEvents:: @ 853A064 diff --git a/data/maps/LinkContestRoom6/scripts.inc b/data/maps/LinkContestRoom6/scripts.inc new file mode 100644 index 000000000..bea65ea48 --- /dev/null +++ b/data/maps/LinkContestRoom6/scripts.inc @@ -0,0 +1 @@ +LinkContestRoom6_MapScripts:: @ 823B781 diff --git a/data/maps/LittlerootTown/events.inc b/data/maps/LittlerootTown/events.inc new file mode 100644 index 000000000..23b8cc3e5 --- /dev/null +++ b/data/maps/LittlerootTown/events.inc @@ -0,0 +1,35 @@ +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 + +LittlerootTown_MapWarps: @ 8527768 + 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 + 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 + +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 + +LittlerootTown_MapEvents:: @ 8527840 + map_events LittlerootTown_EventObjects, LittlerootTown_MapWarps, LittlerootTown_MapCoordEvents, LittlerootTown_MapBGEvents + diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc new file mode 100644 index 000000000..eb78368af --- /dev/null +++ b/data/maps/LittlerootTown/scripts.inc @@ -0,0 +1,1040 @@ +LittlerootTown_MapScripts:: @ 81E7DCB + map_script 3, LittlerootTown_MapScript1_1E7DDB + map_script 2, LittlerootTown_MapScript2_1E7EC1 + map_script 4, LittlerootTown_MapScript2_1E7FE2 + .byte 0 + +LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB + setflag FLAG_VISITED_LITTLEROOT_TOWN + call LittlerootTown_EventScript_271ED7 + compare VAR_0x4092, 2 + call_if 1, LittlerootTown_EventScript_1E7E67 + checkflag FLAG_0x052 + call_if 0, LittlerootTown_EventScript_1E7E6F + compare VAR_0x4050, 3 + call_if 1, LittlerootTown_EventScript_1E7E92 + compare VAR_0x4082, 4 + call_if 1, LittlerootTown_EventScript_1E7E5C + compare VAR_0x408C, 4 + call_if 1, LittlerootTown_EventScript_1E7E5C + compare VAR_0x40C7, 1 + call_if 1, LittlerootTown_EventScript_1E7E53 + compare VAR_0x408D, 3 + call_if 1, LittlerootTown_EventScript_1E7E4F + compare VAR_0x40D3, 1 + call_if 1, LittlerootTown_EventScript_1E7E4B + compare VAR_0x40D3, 2 + call_if 1, LittlerootTown_EventScript_1E7E45 + end + +LittlerootTown_EventScript_1E7E45:: @ 81E7E45 + setvar VAR_0x40D3, 3 + return + +LittlerootTown_EventScript_1E7E4B:: @ 81E7E4B + setflag FLAG_SPECIAL_FLAG_0x4000 + return + +LittlerootTown_EventScript_1E7E4F:: @ 81E7E4F + setflag FLAG_0x12D + return + +LittlerootTown_EventScript_1E7E53:: @ 81E7E53 + setvar VAR_0x40C7, 2 + setflag FLAG_0x3D3 + return + +LittlerootTown_EventScript_1E7E5C:: @ 81E7E5C + setvar VAR_0x4082, 5 + setvar VAR_0x408C, 5 + return + +LittlerootTown_EventScript_1E7E67:: @ 81E7E67 + setobjectxyperm 4, 14, 8 + return + +LittlerootTown_EventScript_1E7E6F:: @ 81E7E6F + compare VAR_0x4050, 0 + goto_eq LittlerootTown_EventScript_1E7E86 + setobjectxyperm 1, 10, 1 + setobjectmovementtype 1, 7 + return + +LittlerootTown_EventScript_1E7E86:: @ 81E7E86 + setobjectxyperm 1, 7, 2 + setobjectmovementtype 1, 8 + return + +LittlerootTown_EventScript_1E7E92:: @ 81E7E92 + clearflag FLAG_0x2F0 + setobjectmovementtype 4, 8 + checkplayergender + compare VAR_RESULT, 0 + call_if 1, LittlerootTown_EventScript_1E7EB1 + compare VAR_RESULT, 1 + call_if 1, LittlerootTown_EventScript_1E7EB9 + return + +LittlerootTown_EventScript_1E7EB1:: @ 81E7EB1 + setobjectxyperm 4, 5, 9 + return + +LittlerootTown_EventScript_1E7EB9:: @ 81E7EB9 + setobjectxyperm 4, 14, 9 + return + +LittlerootTown_MapScript2_1E7EC1: @ 81E7EC1 + map_script_2 VAR_0x4092, 1, LittlerootTown_EventScript_1E7EDB + map_script_2 VAR_0x4092, 2, LittlerootTown_EventScript_1E7EF9 + map_script_2 VAR_0x40D3, 1, LittlerootTown_EventScript_1E7FB1 + .2byte 0 + +LittlerootTown_EventScript_1E7EDB:: @ 81E7EDB + lockall + setvar VAR_0x8004, 5 + setvar VAR_0x8005, 8 + call LittlerootTown_EventScript_1E7F17 + setflag FLAG_0x2F9 + warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8 + waitstate + releaseall + end + +LittlerootTown_EventScript_1E7EF9:: @ 81E7EF9 + lockall + setvar VAR_0x8004, 14 + setvar VAR_0x8005, 8 + call LittlerootTown_EventScript_1E7F17 + setflag FLAG_0x2FA + warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8 + waitstate + releaseall + end + +LittlerootTown_EventScript_1E7F17:: @ 81E7F17 + delay 15 + playse SE_DANSA + applymovement 255, LittlerootTown_Movement_1E7FAC + waitmovement 0 + opendoor VAR_0x8004, VAR_0x8005 + waitdooranim + addobject 4 + applymovement 4, LittlerootTown_Movement_1E7F98 + waitmovement 0 + closedoor VAR_0x8004, VAR_0x8005 + waitdooranim + delay 10 + applymovement 4, LittlerootTown_Movement_1E7F9A + waitmovement 0 + msgbox LittlerootTown_Text_1E86BC, 4 + closemessage + applymovement 4, LittlerootTown_Movement_1E7F9D + applymovement 255, LittlerootTown_Movement_1E7FA4 + waitmovement 0 + opendoor VAR_0x8004, VAR_0x8005 + waitdooranim + applymovement 4, LittlerootTown_Movement_1E7FA1 + applymovement 255, LittlerootTown_Movement_1E7FA9 + waitmovement 0 + setflag FLAG_0x2F0 + setvar VAR_0x4092, 3 + hideobjectat 255, MAP_PETALBURG_CITY + closedoor VAR_0x8004, VAR_0x8005 + waitdooranim + clearflag FLAG_0x364 + clearflag FLAG_SPECIAL_FLAG_0x4000 + return + +LittlerootTown_Movement_1E7F98: @ 81E7F98 + walk_down + step_end + +LittlerootTown_Movement_1E7F9A: @ 81E7F9A + walk_down + walk_in_place_fastest_left + step_end + +LittlerootTown_Movement_1E7F9D: @ 81E7F9D + delay_16 + delay_8 + walk_up + step_end + +LittlerootTown_Movement_1E7FA1: @ 81E7FA1 + walk_up + set_invisible + step_end + +LittlerootTown_Movement_1E7FA4: @ 81E7FA4 + delay_16 + delay_8 + walk_right + walk_in_place_fastest_up + step_end + +LittlerootTown_Movement_1E7FA9: @ 81E7FA9 + walk_up + walk_up + step_end + +LittlerootTown_Movement_1E7FAC: @ 81E7FAC + jump_right + delay_16 + delay_16 + delay_16 + step_end + +LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1 + lockall + playse SE_PIN + applymovement 8, LittlerootTown_Movement_272598 + waitmovement 0 + delay 80 + msgbox LittlerootTown_Text_1E8DA2, 4 + closemessage + clearflag FLAG_0x31A + clearflag FLAG_0x31B + delay 20 + clearflag FLAG_SPECIAL_FLAG_0x4000 + warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 + waitstate + releaseall + end + +LittlerootTown_MapScript2_1E7FE2: @ 81E7FE2 + map_script_2 VAR_0x40D3, 1, LittlerootTown_EventScript_1E7FEC + .2byte 0 + +LittlerootTown_EventScript_1E7FEC:: @ 81E7FEC + addobject 8 + addobject 7 + checkplayergender + compare VAR_RESULT, 0 + goto_eq LittlerootTown_EventScript_1E8004 + goto LittlerootTown_EventScript_1E8013 + end + +LittlerootTown_EventScript_1E8004:: @ 81E8004 + setobjectxy 7, 6, 10 + setobjectxy 8, 5, 10 + end + +LittlerootTown_EventScript_1E8013:: @ 81E8013 + setobjectxy 7, 13, 10 + setobjectxy 8, 14, 10 + end + +LittlerootTown_EventScript_1E8022:: @ 81E8022 + msgbox LittlerootTown_Text_1E8ACF, 2 + end + +LittlerootTown_EventScript_1E802B:: @ 81E802B + msgbox LittlerootTown_Text_1E8B25, 2 + end + +LittlerootTown_EventScript_1E8034:: @ 81E8034 + lock + faceplayer + checkflag FLAG_0x074 + goto_eq LittlerootTown_EventScript_1E8087 + checkflag FLAG_0x052 + goto_eq LittlerootTown_EventScript_1E807A + compare VAR_0x4050, 0 + goto_if 5, LittlerootTown_EventScript_1E805D + msgbox LittlerootTown_Text_1E8BB8, 4 + release + end + +LittlerootTown_EventScript_1E805D:: @ 81E805D + special GetPlayerBigGuyGirlString + msgbox LittlerootTown_Text_1E8C3A, 4 + closemessage + applymovement 1, LittlerootTown_Movement_2725A2 + waitmovement 0 + setvar VAR_0x4050, 2 + release + end + +LittlerootTown_EventScript_1E807A:: @ 81E807A + special GetPlayerBigGuyGirlString + msgbox LittlerootTown_Text_1E8CE3, 4 + release + end + +LittlerootTown_EventScript_1E8087:: @ 81E8087 + msgbox LittlerootTown_Text_1E8D07, 4 + release + end + +LittlerootTown_EventScript_1E8091:: @ 81E8091 + lockall + applymovement 1, LittlerootTown_Movement_1E80D1 + waitmovement 0 + call LittlerootTown_EventScript_1E80AD + applymovement 1, LittlerootTown_Movement_1E80E1 + waitmovement 0 + releaseall + end + +LittlerootTown_EventScript_1E80AD:: @ 81E80AD + msgbox LittlerootTown_Text_1E8BB8, 4 + closemessage + applymovement 1, LittlerootTown_Movement_1E80DF + applymovement 255, LittlerootTown_Movement_1E80EB + waitmovement 0 + msgbox LittlerootTown_Text_1E8C07, 4 + closemessage + return + +LittlerootTown_Movement_1E80D1: @ 81E80D1 + 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 + walk_down + step_end + +LittlerootTown_Movement_1E80E1: @ 81E80E1 + 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 + lock_facing_direction + walk_down + unlock_facing_direction + step_end + +LittlerootTown_EventScript_1E80EF:: @ 81E80EF + lockall + applymovement 1, LittlerootTown_Movement_1E810B + waitmovement 0 + call LittlerootTown_EventScript_1E80AD + applymovement 1, LittlerootTown_Movement_1E8118 + waitmovement 0 + releaseall + end + +LittlerootTown_Movement_1E810B: @ 81E810B + 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 + walk_left + walk_down + walk_left + walk_left + walk_left + walk_in_place_fastest_down + step_end + +LittlerootTown_EventScript_1E811F:: @ 81E811F + lockall + applymovement 1, LittlerootTown_Movement_2725A8 + waitmovement 0 + applymovement 255, LittlerootTown_Movement_2725A4 + waitmovement 0 + special GetPlayerBigGuyGirlString + msgbox LittlerootTown_Text_1E8C3A, 4 + closemessage + applymovement 1, LittlerootTown_Movement_2725A2 + waitmovement 0 + setvar VAR_0x4050, 2 + releaseall + end + +LittlerootTown_EventScript_1E8151:: @ 81E8151 + msgbox LittlerootTown_Text_1E8D32, 3 + end + +LittlerootTown_EventScript_1E815A:: @ 81E815A + msgbox LittlerootTown_Text_1E8D69, 3 + end + +LittlerootTown_EventScript_1E8163:: @ 81E8163 + lockall + checkplayergender + compare VAR_RESULT, 0 + call_if 1, LittlerootTown_EventScript_1E817D + compare VAR_RESULT, 1 + call_if 1, LittlerootTown_EventScript_1E8186 + releaseall + end + +LittlerootTown_EventScript_1E817D:: @ 81E817D + msgbox LittlerootTown_Text_1E8D83, 4 + return + +LittlerootTown_EventScript_1E8186:: @ 81E8186 + msgbox LittlerootTown_Text_1E8D8E, 4 + return + +LittlerootTown_EventScript_1E818F:: @ 81E818F + lockall + checkplayergender + compare VAR_RESULT, 0 + call_if 1, LittlerootTown_EventScript_1E81A9 + compare VAR_RESULT, 1 + call_if 1, LittlerootTown_EventScript_1E81B2 + releaseall + end + +LittlerootTown_EventScript_1E81A9:: @ 81E81A9 + msgbox LittlerootTown_Text_1E8D8E, 4 + return + +LittlerootTown_EventScript_1E81B2:: @ 81E81B2 + msgbox LittlerootTown_Text_1E8D83, 4 + return + +LittlerootTown_EventScript_1E81BB:: @ 81E81BB + lockall + setvar VAR_0x8008, 0 + setobjectxy 4, 10, 9 + goto LittlerootTown_EventScript_1E8211 + end + +LittlerootTown_EventScript_1E81CE:: @ 81E81CE + lockall + setvar VAR_0x8008, 1 + setobjectxy 4, 11, 9 + goto LittlerootTown_EventScript_1E8211 + end + +LittlerootTown_EventScript_1E81E1:: @ 81E81E1 + lockall + setvar VAR_0x8008, 2 + goto LittlerootTown_EventScript_1E8211 + end + +LittlerootTown_EventScript_1E81ED:: @ 81E81ED + lockall + setvar VAR_0x8008, 3 + goto LittlerootTown_EventScript_1E8211 + end + +LittlerootTown_EventScript_1E81F9:: @ 81E81F9 + lockall + setvar VAR_0x8008, 4 + goto LittlerootTown_EventScript_1E8211 + end + +LittlerootTown_EventScript_1E8205:: @ 81E8205 + lockall + setvar VAR_0x8008, 5 + goto LittlerootTown_EventScript_1E8211 + end + +LittlerootTown_EventScript_1E8211:: @ 81E8211 + checkplayergender + compare VAR_RESULT, 0 + call_if 1, LittlerootTown_EventScript_1E8297 + compare VAR_RESULT, 1 + call_if 1, LittlerootTown_EventScript_1E82A2 + checkplayergender + compare VAR_RESULT, 0 + call_if 1, LittlerootTown_EventScript_1E8281 + compare VAR_RESULT, 1 + call_if 1, LittlerootTown_EventScript_1E828C + msgbox LittlerootTown_Text_1E87E1, 4 + closemessage + checkplayergender + compare VAR_RESULT, 0 + call_if 1, LittlerootTown_EventScript_1E82AD + compare VAR_RESULT, 1 + call_if 1, LittlerootTown_EventScript_1E82F0 + call LittlerootTown_EventScript_1E8693 + checkplayergender + compare VAR_RESULT, 0 + call_if 1, LittlerootTown_EventScript_1E8405 + compare VAR_RESULT, 1 + call_if 1, LittlerootTown_EventScript_1E8448 + goto LittlerootTown_EventScript_1E8686 + end + +LittlerootTown_EventScript_1E8281:: @ 81E8281 + setvar VAR_0x8009, 5 + setvar VAR_0x800A, 8 + return + +LittlerootTown_EventScript_1E828C:: @ 81E828C + setvar VAR_0x8009, 14 + setvar VAR_0x800A, 8 + return + +LittlerootTown_EventScript_1E8297:: @ 81E8297 + applymovement 4, LittlerootTown_Movement_2725A8 + waitmovement 0 + return + +LittlerootTown_EventScript_1E82A2:: @ 81E82A2 + applymovement 4, LittlerootTown_Movement_2725A4 + waitmovement 0 + return + +LittlerootTown_EventScript_1E82AD:: @ 81E82AD + compare VAR_0x8008, 0 + call_if 1, LittlerootTown_EventScript_1E8333 + compare VAR_0x8008, 1 + call_if 1, LittlerootTown_EventScript_1E8348 + compare VAR_0x8008, 2 + call_if 1, LittlerootTown_EventScript_1E835D + compare VAR_0x8008, 3 + call_if 1, LittlerootTown_EventScript_1E8372 + compare VAR_0x8008, 4 + call_if 1, LittlerootTown_EventScript_1E8387 + compare VAR_0x8008, 5 + call_if 1, LittlerootTown_EventScript_1E839C + return + +LittlerootTown_EventScript_1E82F0:: @ 81E82F0 + compare VAR_0x8008, 0 + call_if 1, LittlerootTown_EventScript_1E8333 + compare VAR_0x8008, 1 + call_if 1, LittlerootTown_EventScript_1E8348 + compare VAR_0x8008, 2 + call_if 1, LittlerootTown_EventScript_1E83B1 + compare VAR_0x8008, 3 + call_if 1, LittlerootTown_EventScript_1E83C6 + compare VAR_0x8008, 4 + call_if 1, LittlerootTown_EventScript_1E83DB + compare VAR_0x8008, 5 + call_if 1, LittlerootTown_EventScript_1E83F0 + return + +LittlerootTown_EventScript_1E8333:: @ 81E8333 + applymovement 255, LittlerootTown_Movement_2725AA + waitmovement 0 + applymovement 4, LittlerootTown_Movement_1E85D1 + waitmovement 0 + return + +LittlerootTown_EventScript_1E8348:: @ 81E8348 + applymovement 255, LittlerootTown_Movement_2725AA + waitmovement 0 + applymovement 4, LittlerootTown_Movement_1E85D8 + waitmovement 0 + return + +LittlerootTown_EventScript_1E835D:: @ 81E835D + applymovement 255, LittlerootTown_Movement_2725A4 + waitmovement 0 + applymovement 4, LittlerootTown_Movement_1E85DF + waitmovement 0 + return + +LittlerootTown_EventScript_1E8372:: @ 81E8372 + applymovement 255, LittlerootTown_Movement_2725A4 + waitmovement 0 + applymovement 4, LittlerootTown_Movement_1E85E4 + waitmovement 0 + return + +LittlerootTown_EventScript_1E8387:: @ 81E8387 + applymovement 255, LittlerootTown_Movement_2725A4 + waitmovement 0 + applymovement 4, LittlerootTown_Movement_1E85EA + waitmovement 0 + return + +LittlerootTown_EventScript_1E839C:: @ 81E839C + applymovement 255, LittlerootTown_Movement_2725A4 + waitmovement 0 + applymovement 4, LittlerootTown_Movement_1E85ED + waitmovement 0 + return + +LittlerootTown_EventScript_1E83B1:: @ 81E83B1 + applymovement 255, LittlerootTown_Movement_2725A8 + waitmovement 0 + applymovement 4, LittlerootTown_Movement_1E85F1 + waitmovement 0 + return + +LittlerootTown_EventScript_1E83C6:: @ 81E83C6 + applymovement 255, LittlerootTown_Movement_2725A8 + waitmovement 0 + applymovement 4, LittlerootTown_Movement_1E85F5 + waitmovement 0 + return + +LittlerootTown_EventScript_1E83DB:: @ 81E83DB + applymovement 255, LittlerootTown_Movement_2725A8 + waitmovement 0 + applymovement 4, LittlerootTown_Movement_1E85F8 + waitmovement 0 + return + +LittlerootTown_EventScript_1E83F0:: @ 81E83F0 + applymovement 255, LittlerootTown_Movement_2725A8 + waitmovement 0 + applymovement 4, LittlerootTown_Movement_1E85FE + waitmovement 0 + return + +LittlerootTown_EventScript_1E8405:: @ 81E8405 + compare VAR_0x8008, 0 + call_if 1, LittlerootTown_EventScript_1E848B + compare VAR_0x8008, 1 + call_if 1, LittlerootTown_EventScript_1E8496 + compare VAR_0x8008, 2 + call_if 1, LittlerootTown_EventScript_1E84A1 + compare VAR_0x8008, 3 + call_if 1, LittlerootTown_EventScript_1E84C7 + compare VAR_0x8008, 4 + call_if 1, LittlerootTown_EventScript_1E84ED + compare VAR_0x8008, 5 + call_if 1, LittlerootTown_EventScript_1E8513 + return + +LittlerootTown_EventScript_1E8448:: @ 81E8448 + compare VAR_0x8008, 0 + call_if 1, LittlerootTown_EventScript_1E848B + compare VAR_0x8008, 1 + call_if 1, LittlerootTown_EventScript_1E8496 + compare VAR_0x8008, 2 + call_if 1, LittlerootTown_EventScript_1E8539 + compare VAR_0x8008, 3 + call_if 1, LittlerootTown_EventScript_1E855F + compare VAR_0x8008, 4 + call_if 1, LittlerootTown_EventScript_1E8585 + compare VAR_0x8008, 5 + call_if 1, LittlerootTown_EventScript_1E85AB + return + +LittlerootTown_EventScript_1E848B:: @ 81E848B + applymovement 4, LittlerootTown_Movement_1E8603 + waitmovement 0 + return + +LittlerootTown_EventScript_1E8496:: @ 81E8496 + applymovement 4, LittlerootTown_Movement_1E8609 + waitmovement 0 + return + +LittlerootTown_EventScript_1E84A1:: @ 81E84A1 + applymovement 4, LittlerootTown_Movement_1E860F + waitmovement 0 + opendoor VAR_0x8009, VAR_0x800A + waitdooranim + applymovement 4, LittlerootTown_Movement_1E863B + waitmovement 0 + hideobjectat 4, MAP_LITTLEROOT_TOWN + closedoor VAR_0x8009, VAR_0x800A + waitdooranim + return + +LittlerootTown_EventScript_1E84C7:: @ 81E84C7 + applymovement 4, LittlerootTown_Movement_1E8615 + waitmovement 0 + opendoor VAR_0x8009, VAR_0x800A + waitdooranim + applymovement 4, LittlerootTown_Movement_1E863B + waitmovement 0 + hideobjectat 4, MAP_LITTLEROOT_TOWN + closedoor VAR_0x8009, VAR_0x800A + waitdooranim + return + +LittlerootTown_EventScript_1E84ED:: @ 81E84ED + applymovement 4, LittlerootTown_Movement_1E861C + waitmovement 0 + opendoor VAR_0x8009, VAR_0x800A + waitdooranim + applymovement 4, LittlerootTown_Movement_1E863B + waitmovement 0 + hideobjectat 4, MAP_LITTLEROOT_TOWN + closedoor VAR_0x8009, VAR_0x800A + waitdooranim + return + +LittlerootTown_EventScript_1E8513:: @ 81E8513 + applymovement 4, LittlerootTown_Movement_1E8620 + waitmovement 0 + opendoor VAR_0x8009, VAR_0x800A + waitdooranim + applymovement 4, LittlerootTown_Movement_1E863B + waitmovement 0 + hideobjectat 4, MAP_LITTLEROOT_TOWN + closedoor VAR_0x8009, VAR_0x800A + waitdooranim + return + +LittlerootTown_EventScript_1E8539:: @ 81E8539 + applymovement 4, LittlerootTown_Movement_1E8625 + waitmovement 0 + opendoor VAR_0x8009, VAR_0x800A + waitdooranim + applymovement 4, LittlerootTown_Movement_1E863B + waitmovement 0 + hideobjectat 4, MAP_LITTLEROOT_TOWN + closedoor VAR_0x8009, VAR_0x800A + waitdooranim + return + +LittlerootTown_EventScript_1E855F:: @ 81E855F + applymovement 4, LittlerootTown_Movement_1E862A + waitmovement 0 + opendoor VAR_0x8009, VAR_0x800A + waitdooranim + applymovement 4, LittlerootTown_Movement_1E863B + waitmovement 0 + hideobjectat 4, MAP_LITTLEROOT_TOWN + closedoor VAR_0x8009, VAR_0x800A + waitdooranim + return + +LittlerootTown_EventScript_1E8585:: @ 81E8585 + applymovement 4, LittlerootTown_Movement_1E862E + waitmovement 0 + opendoor VAR_0x8009, VAR_0x800A + waitdooranim + applymovement 4, LittlerootTown_Movement_1E863B + waitmovement 0 + hideobjectat 4, MAP_LITTLEROOT_TOWN + closedoor VAR_0x8009, VAR_0x800A + waitdooranim + return + +LittlerootTown_EventScript_1E85AB:: @ 81E85AB + applymovement 4, LittlerootTown_Movement_1E8635 + waitmovement 0 + opendoor VAR_0x8009, VAR_0x800A + waitdooranim + applymovement 4, LittlerootTown_Movement_1E863B + waitmovement 0 + hideobjectat 4, MAP_LITTLEROOT_TOWN + closedoor VAR_0x8009, VAR_0x800A + waitdooranim + return + +LittlerootTown_Movement_1E85D1: @ 81E85D1 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + step_end + +LittlerootTown_Movement_1E85D8: @ 81E85D8 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + step_end + +LittlerootTown_Movement_1E85DF: @ 81E85DF + walk_right + walk_right + walk_right + walk_right + step_end + +LittlerootTown_Movement_1E85E4: @ 81E85E4 + walk_right + walk_right + walk_right + walk_right + walk_right + step_end + +LittlerootTown_Movement_1E85EA: @ 81E85EA + walk_right + walk_right + step_end + +LittlerootTown_Movement_1E85ED: @ 81E85ED + walk_right + walk_right + walk_right + step_end + +LittlerootTown_Movement_1E85F1: @ 81E85F1 + walk_left + walk_left + walk_left + step_end + +LittlerootTown_Movement_1E85F5: @ 81E85F5 + walk_left + walk_left + step_end + +LittlerootTown_Movement_1E85F8: @ 81E85F8 + walk_left + walk_left + walk_left + walk_left + walk_left + step_end + +LittlerootTown_Movement_1E85FE: @ 81E85FE + walk_left + walk_left + walk_left + walk_left + step_end + +LittlerootTown_Movement_1E8603: @ 81E8603 + walk_down + walk_down + walk_down + walk_down + walk_down + step_end + +LittlerootTown_Movement_1E8609: @ 81E8609 + walk_down + walk_down + walk_down + walk_down + walk_down + step_end + +LittlerootTown_Movement_1E860F: @ 81E860F + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up + step_end + +LittlerootTown_Movement_1E8615: @ 81E8615 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up + step_end + +LittlerootTown_Movement_1E861C: @ 81E861C + walk_left + walk_left + walk_in_place_fastest_up + step_end + +LittlerootTown_Movement_1E8620: @ 81E8620 + walk_left + walk_left + walk_left + walk_in_place_fastest_up + step_end + +LittlerootTown_Movement_1E8625: @ 81E8625 + walk_right + walk_right + walk_right + walk_in_place_fastest_up + step_end + +LittlerootTown_Movement_1E862A: @ 81E862A + walk_right + walk_right + walk_in_place_fastest_up + step_end + +LittlerootTown_Movement_1E862E: @ 81E862E + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up + step_end + +LittlerootTown_Movement_1E8635: @ 81E8635 + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up + step_end + +LittlerootTown_Movement_1E863B: @ 81E863B + walk_up + step_end + +LittlerootTown_EventScript_1E863D:: @ 81E863D + lock + faceplayer + checkplayergender + compare VAR_RESULT, 0 + call_if 1, LittlerootTown_EventScript_1E8281 + compare VAR_RESULT, 1 + call_if 1, LittlerootTown_EventScript_1E828C + call LittlerootTown_EventScript_1E8693 + applymovement 4, LittlerootTown_Movement_2725A6 + waitmovement 0 + opendoor VAR_0x8009, VAR_0x800A + waitdooranim + applymovement 4, LittlerootTown_Movement_1E863B + waitmovement 0 + hideobjectat 4, MAP_LITTLEROOT_TOWN + closedoor VAR_0x8009, VAR_0x800A + waitdooranim + goto LittlerootTown_EventScript_1E8686 + end + +LittlerootTown_EventScript_1E8686:: @ 81E8686 + removeobject 4 + setflag FLAG_SYS_B_DASH + setvar VAR_0x4050, 4 + release + end + +LittlerootTown_EventScript_1E8693:: @ 81E8693 + msgbox LittlerootTown_Text_1E87F0, 4 + playfanfare MUS_FANFA4 + message LittlerootTown_Text_1E8925 + waitfanfare + setflag FLAG_0x112 + msgbox LittlerootTown_Text_1E894F, 4 + msgbox LittlerootTown_Text_1E8A03, 4 + closemessage + delay 30 + return + +LittlerootTown_Text_1E86BC: @ 81E86BC + .string "MOM: {PLAYER}, we’re here, honey!\p" + .string "It must be tiring riding with our things\n" + .string "in the moving truck.\p" + .string "Well, this is LITTLEROOT TOWN.\p" + .string "How do you like it?\n" + .string "This is our new home!\p" + .string "It has a quaint feel, but it seems to be\n" + .string "an easy place to live, don’t you think?\p" + .string "And, you get your own room, {PLAYER}!\n" + .string "Let’s go inside.$" + +LittlerootTown_Text_1E87E1: @ 81E87E1 + .string "MOM: Wait, {PLAYER}!$" + +LittlerootTown_Text_1E87F0: @ 81E87F0 + .string "MOM: {PLAYER}! {PLAYER}! Did you\n" + .string "introduce yourself to PROF. BIRCH?\p" + .string "Oh! What an adorable POKéMON!\n" + .string "You got it from PROF. BIRCH. How nice!\p" + .string "You’re your father’s child, all right.\n" + .string "You look good together with POKéMON!\p" + .string "Here, honey! If you’re going out on an\n" + .string "adventure, wear these RUNNING SHOES.\p" + .string "They’ll put a zip in your step!$" + +LittlerootTown_Text_1E8925: @ 81E8925 + .string "{PLAYER} switched shoes with the\n" + .string "RUNNING SHOES.$" + +LittlerootTown_Text_1E894F: @ 81E894F + .string "MOM: {PLAYER}, those shoes came with\n" + .string "instructions.\p" + .string "“Press the B Button while wearing these\n" + .string "RUNNING SHOES to run extra-fast!\p" + .string "“Slip on these RUNNING SHOES and race\n" + .string "in the great outdoors!â€$" + +LittlerootTown_Text_1E8A03: @ 81E8A03 + .string "… … … … … … … …\n" + .string "… … … … … … … …\p" + .string "To think that you have your very own\n" + .string "POKéMON now…\l" + .string "Your father will be overjoyed.\p" + .string "…But please be careful.\n" + .string "If anything happens, you can come home.\p" + .string "Go on, go get them, honey!$" + +LittlerootTown_Text_1E8ACF: @ 81E8ACF + .string "If you use a PC, you can store items\n" + .string "and POKéMON.\p" + .string "The power of science is staggering!$" + +LittlerootTown_Text_1E8B25: @ 81E8B25 + .string "PROF. BIRCH spends days in his LAB\n" + .string "studying, then he’ll suddenly go out in\l" + .string "the wild to do more research…\p" + .string "When does PROF. BIRCH spend time\n" + .string "at home?$" + +LittlerootTown_Text_1E8BB8: @ 81E8BB8 + .string "Um, um, um!\p" + .string "If you go outside and go in the grass,\n" + .string "wild POKéMON will jump out!$" + +LittlerootTown_Text_1E8C07: @ 81E8C07 + .string "It’s dangerous if you don’t have\n" + .string "your own POKéMON.$" + +LittlerootTown_Text_1E8C3A: @ 81E8C3A + .string "Um, hi!\p" + .string "There are scary POKéMON outside!\n" + .string "I can hear their cries!\p" + .string "I want to go see what’s going on,\n" + .string "but I don’t have any POKéMON…\p" + .string "Can you go see what’s happening\n" + .string "for me?$" + +LittlerootTown_Text_1E8CE3: @ 81E8CE3 + .string "You saved PROF. BIRCH!\n" + .string "I’m so glad!$" + +LittlerootTown_Text_1E8D07: @ 81E8D07 + .string "Are you going to catch POKéMON?\n" + .string "Good luck!$" + +LittlerootTown_Text_1E8D32: @ 81E8D32 + .string "LITTLEROOT TOWN\n" + .string "“A town that can’t be shaded any hue.â€$" + +LittlerootTown_Text_1E8D69: @ 81E8D69 + .string "PROF. BIRCH’S POKéMON LAB$" + +LittlerootTown_Text_1E8D83: @ 81E8D83 + .string "{PLAYER}’s HOUSE$" + +LittlerootTown_Text_1E8D8E: @ 81E8D8E + .string "PROF. BIRCH’S HOUSE$" + +LittlerootTown_Text_1E8DA2: @ 81E8DA2 + .string "PROF. BIRCH: Well, well, {PLAYER}{KUN}!\n" + .string "That was good work out there!\p" + .string "I knew there was something special\n" + .string "about you when I first saw you,\l" + .string "but I never expected this.\p" + .string "Oh, yes. Do you still have the POKéDEX\n" + .string "I gave you?\p" + .string "I have something to show you.\n" + .string "Let’s go to my LAB.$" + diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc new file mode 100644 index 000000000..cd08fbad8 --- /dev/null +++ b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc @@ -0,0 +1,23 @@ +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 + +LittlerootTown_BrendansHouse_1F_MapWarps: @ 852D134 + 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 + 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 + +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_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc new file mode 100644 index 000000000..4c904b001 --- /dev/null +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -0,0 +1,451 @@ +LittlerootTown_BrendansHouse_1F_MapScripts:: @ 81F7755 + map_script 1, LittlerootTown_BrendansHouse_1F_MapScript1_1F7765 + map_script 3, LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4 + map_script 2, LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA + .byte 0 + +LittlerootTown_BrendansHouse_1F_MapScript1_1F7765: @ 81F7765 + compare VAR_0x4092, 6 + call_if 0, LittlerootTown_BrendansHouse_1F_EventScript_1F777A + checkflag FLAG_0x112 + call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F778D + end + +LittlerootTown_BrendansHouse_1F_EventScript_1F777A:: @ 81F777A + setmetatile 5, 4, 624, 1 + setmetatile 5, 2, 616, 1 + return + +LittlerootTown_BrendansHouse_1F_EventScript_1F778D:: @ 81F778D + checkplayergender + compare VAR_RESULT, 0 + goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F779A + return + +LittlerootTown_BrendansHouse_1F_EventScript_1F779A:: @ 81F779A + setmetatile 3, 7, 659, 1 + return + +LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4: @ 81F77A4 + compare VAR_0x4092, 3 + call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F77DE + compare VAR_0x4092, 5 + call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F77C6 + compare VAR_0x4092, 6 + call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F77D2 + end + +LittlerootTown_BrendansHouse_1F_EventScript_1F77C6:: @ 81F77C6 + setobjectxyperm 1, 8, 4 + setobjectmovementtype 1, 7 + return + +LittlerootTown_BrendansHouse_1F_EventScript_1F77D2:: @ 81F77D2 + setobjectxyperm 1, 4, 5 + setobjectmovementtype 1, 7 + return + +LittlerootTown_BrendansHouse_1F_EventScript_1F77DE:: @ 81F77DE + setobjectxyperm 1, 9, 8 + setobjectmovementtype 1, 7 + return + +LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA: @ 81F77EA + map_script_2 VAR_0x4092, 3, LittlerootTown_BrendansHouse_1F_EventScript_1F783C + map_script_2 VAR_0x4092, 5, LittlerootTown_BrendansHouse_1F_EventScript_1F7814 + map_script_2 VAR_0x4092, 6, LittlerootTown_BrendansHouse_1F_EventScript_1F784D + map_script_2 VAR_0x4082, 1, LittlerootTown_BrendansHouse_1F_EventScript_1F785E + map_script_2 VAR_0x4082, 3, LittlerootTown_BrendansHouse_1F_EventScript_292AF2 + .2byte 0 + +LittlerootTown_BrendansHouse_1F_EventScript_1F7814:: @ 81F7814 + lockall + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B67, 4 + closemessage + applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1F783A + applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_1F783A + waitmovement 0 + warp MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 255, 7, 1 + waitstate + releaseall + end + +LittlerootTown_BrendansHouse_1F_Movement_1F783A: @ 81F783A + walk_up + step_end + +LittlerootTown_BrendansHouse_1F_EventScript_1F783C:: @ 81F783C + lockall + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 0 + goto LittlerootTown_BrendansHouse_1F_EventScript_292704 + end + +LittlerootTown_BrendansHouse_1F_EventScript_1F784D:: @ 81F784D + lockall + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 1 + goto LittlerootTown_BrendansHouse_1F_EventScript_29286D + end + +LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E + lockall + playse SE_PIN + applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_272598 + waitmovement 0 + applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_27259A + waitmovement 0 + applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1F789C + waitmovement 0 + special GetRivalSonDaughterString + msgbox LittlerootTown_BrendansHouse_1F_Text_1F8BC5, 4 + setflag FLAG_0x057 + setvar VAR_0x4082, 2 + releaseall + end + +LittlerootTown_BrendansHouse_1F_Movement_1F789C: @ 81F789C + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + step_end + +LittlerootTown_BrendansHouse_1F_EventScript_1F78A3:: @ 81F78A3 + lockall + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 0 + applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + waitmovement 0 + goto LittlerootTown_BrendansHouse_1F_EventScript_292765 + end + +LittlerootTown_BrendansHouse_1F_EventScript_1F78BE:: @ 81F78BE + lockall + setvar VAR_0x8008, 0 + goto LittlerootTown_BrendansHouse_1F_EventScript_1F78E2 + end + +LittlerootTown_BrendansHouse_1F_EventScript_1F78CA:: @ 81F78CA + lockall + setvar VAR_0x8008, 1 + goto LittlerootTown_BrendansHouse_1F_EventScript_1F78E2 + end + +LittlerootTown_BrendansHouse_1F_EventScript_1F78D6:: @ 81F78D6 + lockall + setvar VAR_0x8008, 2 + goto LittlerootTown_BrendansHouse_1F_EventScript_1F78E2 + end + +LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 + playse SE_KAIDAN + delay 10 + addobject 7 + delay 30 + playse SE_PIN + applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_272598 + waitmovement 0 + applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_27259A + waitmovement 0 + compare VAR_0x8008, 1 + call_if 5, LittlerootTown_BrendansHouse_1F_EventScript_1F7981 + playbgm MUS_BOY_SUP, 1 + compare VAR_0x8008, 0 + call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F798C + compare VAR_0x8008, 1 + call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F7997 + compare VAR_0x8008, 2 + call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79A2 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F90B4, 4 + closemessage + compare VAR_0x8008, 0 + call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79C1 + compare VAR_0x8008, 1 + call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79D3 + compare VAR_0x8008, 2 + call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79E5 + playse SE_KAIDAN + removeobject 7 + setflag FLAG_0x2E9 + setflag FLAG_0x331 + clearflag FLAG_0x2F8 + delay 30 + setvar VAR_0x408D, 3 + setvar VAR_0x4050, 1 + savebgm MUS_DUMMY + fadedefaultbgm + releaseall + end + +LittlerootTown_BrendansHouse_1F_EventScript_1F7981:: @ 81F7981 + applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725AA + waitmovement 0 + return + +LittlerootTown_BrendansHouse_1F_EventScript_1F798C:: @ 81F798C + applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F79AD + waitmovement 0 + return + +LittlerootTown_BrendansHouse_1F_EventScript_1F7997:: @ 81F7997 + applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F79B5 + waitmovement 0 + return + +LittlerootTown_BrendansHouse_1F_EventScript_1F79A2:: @ 81F79A2 + applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F79B9 + waitmovement 0 + return + +LittlerootTown_BrendansHouse_1F_Movement_1F79AD: @ 81F79AD + 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 + walk_up + walk_up + walk_up + step_end + +LittlerootTown_BrendansHouse_1F_Movement_1F79B9: @ 81F79B9 + 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 + applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1F79F7 + applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F7A06 + waitmovement 0 + return + +LittlerootTown_BrendansHouse_1F_EventScript_1F79D3:: @ 81F79D3 + applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1F79FB + applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F7A0C + waitmovement 0 + return + +LittlerootTown_BrendansHouse_1F_EventScript_1F79E5:: @ 81F79E5 + applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1F7A02 + applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F7A16 + waitmovement 0 + return + +LittlerootTown_BrendansHouse_1F_Movement_1F79F7: @ 81F79F7 + delay_16 + delay_8 + walk_in_place_fastest_right + step_end + +LittlerootTown_BrendansHouse_1F_Movement_1F79FB: @ 81F79FB + 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 + delay_16 + delay_8 + walk_in_place_fastest_left + step_end + +LittlerootTown_BrendansHouse_1F_Movement_1F7A06: @ 81F7A06 + walk_in_place_fastest_right + walk_right + walk_in_place_fastest_up + walk_up + walk_up + step_end + +LittlerootTown_BrendansHouse_1F_Movement_1F7A0C: @ 81F7A0C + 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 + walk_in_place_fastest_left + walk_left + walk_in_place_fastest_up + walk_up + walk_up + step_end + +LittlerootTown_BrendansHouse_1F_Text_1F7A1C: @ 81F7A1C + .string "MOM: See, {PLAYER}?\n" + .string "Isn’t it nice in here, too?$" + +LittlerootTown_BrendansHouse_1F_Text_1F7A46: @ 81F7A46 + .string "The mover’s POKéMON do all the work\n" + .string "of moving us in and cleaning up after.\l" + .string "This is so convenient!\p" + .string "{PLAYER}, your room is upstairs.\n" + .string "Go check it out, dear!\p" + .string "DAD bought you a new clock to mark\n" + .string "our move here.\l" + .string "Don’t forget to set it!$" + +LittlerootTown_BrendansHouse_1F_Text_1F7B24: @ 81F7B24 + .string "MOM: Well, {PLAYER}?\p" + .string "Aren’t you interested in seeing your\n" + .string "very own room?$" + +LittlerootTown_BrendansHouse_1F_Text_1F7B67: @ 81F7B67 +LittlerootTown_MaysHouse_1F_Text_1F7B67: @ 81F7B67 + .string "MOM: {PLAYER}.\p" + .string "Go set the clock in your room, honey.$" + +LittlerootTown_BrendansHouse_1F_Text_1F7B96: @ 81F7B96 + .string "MOM: Oh! {PLAYER}, {PLAYER}!\n" + .string "Quick! Come quickly!$" + +LittlerootTown_BrendansHouse_1F_Text_1F7BBC: @ 81F7BBC +LittlerootTown_MaysHouse_1F_Text_1F7BBC: @ 81F7BBC + .string "MOM: Look! It’s PETALBURG GYM!\n" + .string "Maybe DAD will be on!$" + +LittlerootTown_BrendansHouse_1F_Text_1F7BF1: @ 81F7BF1 +LittlerootTown_MaysHouse_1F_Text_1F7BF1: @ 81F7BF1 + .string "MOM: Oh… It’s over.\p" + .string "I think DAD was on, but we missed him.\n" + .string "Too bad.$" + +LittlerootTown_BrendansHouse_1F_Text_1F7C35: @ 81F7C35 +LittlerootTown_MaysHouse_1F_Text_1F7C35: @ 81F7C35 + .string "Oh, yes.\n" + .string "One of DAD’s friends lives in town.\p" + .string "PROF. BIRCH is his name.\p" + .string "He lives right next door, so you should\n" + .string "go over and introduce yourself.$" + +LittlerootTown_BrendansHouse_1F_Text_1F7CC3: @ 81F7CC3 + .string "MOM: See you, honey!$" + +LittlerootTown_BrendansHouse_1F_Text_1F7CD8: @ 81F7CD8 + .string "MOM: Did you introduce yourself to\n" + .string "PROF. BIRCH?$" + +LittlerootTown_BrendansHouse_1F_Text_1F7D08: @ 81F7D08 + .string "MOM: How are you doing, {PLAYER}?\n" + .string "You look a little tired.\p" + .string "I think you should rest a bit.$" + +LittlerootTown_BrendansHouse_1F_Text_1F7D5C: @ 81F7D5C + .string "MOM: Take care, honey!$" + +LittlerootTown_BrendansHouse_1F_Text_1F7D73: @ 81F7D73 + .string "MOM: Oh? Did DAD give you that BADGE?\p" + .string "Then here’s something from your MOM!$" + +LittlerootTown_BrendansHouse_1F_Text_1F7DBE: @ 81F7DBE + .string "Don’t push yourself too hard, dear.\n" + .string "You can always come home.\p" + .string "Go for it, honey!$" + +LittlerootTown_BrendansHouse_1F_Text_1F7E0E: @ 81F7E0E + .string "MOM: What is that, honey? A POKéNAV?\n" + .string "Someone from DEVON gave it to you?\p" + .string "Well, honey, how about registering\n" + .string "your mom?\p" + .string "… … …$" + +LittlerootTown_BrendansHouse_1F_Text_1F7E89: @ 81F7E89 + .string "Registered MOM\n" + .string "in the POKéNAV.$" + +LittlerootTown_BrendansHouse_1F_Text_1F7EA8: @ 81F7EA8 + .string "Fugiiiiih!$" + +LittlerootTown_BrendansHouse_1F_Text_1F7EB3: @ 81F7EB3 + .string "Huggoh, uggo uggo…$" + +LittlerootTown_BrendansHouse_1F_Text_1F7EC6: @ 81F7EC6 + .string "INTERVIEWER: …We brought you this\n" + .string "report from in front of PETALBURG GYM.$" + +LittlerootTown_BrendansHouse_1F_Text_1F7F0F: @ 81F7F0F + .string "There is a movie on TV.\p" + .string "Two men are dancing on a big piano\n" + .string "keyboard.\p" + .string "Better get going!$" + +LittlerootTown_BrendansHouse_1F_Text_1F7F66: @ 81F7F66 + .string "It’s the instruction booklet for the\n" + .string "RUNNING SHOES.\p" + .string "“Press the B Button to run while\n" + .string "wearing your RUNNING SHOES.\p" + .string "“Lace up your RUNNING SHOES and hit\n" + .string "the road running!â€$" + +LittlerootTown_BrendansHouse_1F_Text_1F800E: @ 81F800E + .string "DAD: Hm?\p" + .string "Hey, it’s {PLAYER}!\p" + .string "It’s been a while since I saw you,\n" + .string "but you look…stronger, somehow.\p" + .string "That’s the impression I get.\n" + .string "But your old man hasn’t given up yet!\p" + .string "Oh, yes, I have something for you.\n" + .string "This came to you from someone named\l" + .string "MR. BRINEY.$" + +LittlerootTown_BrendansHouse_1F_Text_1F80FE: @ 81F80FE + .string "DAD: Hm, a TICKET for a ferry?\p" + .string "If I recall, there are ferry ports in\n" + .string "SLATEPORT and LILYCOVE.$" + +LittlerootTown_BrendansHouse_1F_Text_1F815B: @ 81F815B + .string "I’d better get back to PETALBURG GYM.\p" + .string "MOM, thanks for looking after the house\n" + .string "while I’m away.$" + +LittlerootTown_BrendansHouse_1F_Text_1F81B9: @ 81F81B9 + .string "MOM: That DAD of yours…\p" + .string "He comes home for the first time in a\n" + .string "while, but all he talks about is POKéMON.\p" + .string "He should relax and stay a little longer.$" + +LittlerootTown_BrendansHouse_1F_Text_1F824B: @ 81F824B + .string "MOM: Is that a breaking news story?$" + +LittlerootTown_BrendansHouse_1F_Text_1F826F: @ 81F826F + .string "We bring you this emergency\n" + .string "news flash!\p" + .string "In various HOENN locales, there have\n" + .string "been reports of a BZZT…colored\l" + .string "POKéMON in flight.\p" + .string "The identity of this POKéMON is\n" + .string "currently unknown.\p" + .string "We now return you to the regular\n" + .string "movie program.$" + +LittlerootTown_BrendansHouse_1F_Text_1F8351: @ 81F8351 + .string "MOM: {PLAYER}, did you catch that?\p" + .string "What color did the announcer say\n" + .string "that POKéMON was?$" + +LittlerootTown_BrendansHouse_1F_Text_1F83A1: @ 81F83A1 + .string "MOM: Well, isn’t that something!\n" + .string "There are still unknown POKéMON.$" diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc new file mode 100644 index 000000000..a6649c9b6 --- /dev/null +++ b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc @@ -0,0 +1,30 @@ +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 + +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 + +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_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc new file mode 100644 index 000000000..429c933fc --- /dev/null +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -0,0 +1,318 @@ +LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81F83E3 + map_script 3, LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE + map_script 4, LittlerootTown_BrendansHouse_2F_MapScript2_1F846A + .byte 0 + +LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE + compare VAR_0x408D, 2 + call_if 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8457 + compare VAR_0x408D, 3 + call_if 4, LittlerootTown_BrendansHouse_2F_EventScript_1F841A + compare VAR_0x4092, 4 + call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_2926FE + call LittlerootTown_BrendansHouse_2F_EventScript_275CE1 + setvar VAR_0x4089, 0 + end + +LittlerootTown_BrendansHouse_2F_EventScript_1F841A:: @ 81F841A + checkflag FLAG_0x124 + goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8433 + compare VAR_0x4084, 2 + goto_if 4, LittlerootTown_BrendansHouse_2F_EventScript_1F8456 + goto LittlerootTown_BrendansHouse_2F_EventScript_1F8433 + +LittlerootTown_BrendansHouse_2F_EventScript_1F8433:: @ 81F8433 + checkplayergender + compare VAR_RESULT, 0 + goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8456 + compare VAR_0x40D3, 2 + goto_if 4, LittlerootTown_BrendansHouse_2F_EventScript_1F9309 + setobjectxyperm 1, 0, 2 + setobjectmovementtype 1, 7 + return + +LittlerootTown_BrendansHouse_2F_EventScript_1F8456:: @ 81F8456 + return + +LittlerootTown_BrendansHouse_2F_EventScript_1F8457:: @ 81F8457 + checkplayergender + compare VAR_RESULT, 1 + goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8464 + return + +LittlerootTown_BrendansHouse_2F_EventScript_1F8464:: @ 81F8464 + setvar VAR_0x408D, 2 + return + +LittlerootTown_BrendansHouse_2F_MapScript2_1F846A: @ 81F846A + map_script_2 VAR_0x4089, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8474 + .2byte 0 + +LittlerootTown_BrendansHouse_2F_EventScript_1F8474:: @ 81F8474 + checkplayergender + compare VAR_RESULT, 0 + goto_eq EventScript_275D0C + end + +LittlerootTown_BrendansHouse_2F_EventScript_1F8481:: @ 81F8481 + lockall + compare VAR_0x408D, 2 + goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8497 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F9991, 4 + releaseall + end + +LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 + delay 10 + addobject 1 + applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85BC + waitmovement 0 + playse SE_PIN + applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_272598 + waitmovement 0 + applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_27259A + waitmovement 0 + delay 10 + playbgm MUS_BOY_SUP, 1 + compare VAR_FACING, 2 + call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8507 + compare VAR_FACING, 1 + call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8536 + compare VAR_FACING, 3 + call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8565 + compare VAR_FACING, 4 + call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8594 + setvar VAR_0x408D, 3 + setflag FLAG_0x331 + clearflag FLAG_0x2F8 + setvar VAR_0x4050, 1 + savebgm MUS_DUMMY + fadedefaultbgm + releaseall + end + +LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507 + applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85C0 + waitmovement 0 + applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8 + waitmovement 0 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, 4 + closemessage + applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1F85CF + applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85C6 + waitmovement 0 + return + +LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536 + applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85D7 + waitmovement 0 + applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8 + waitmovement 0 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, 4 + closemessage + applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1F85E2 + applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85DB + waitmovement 0 + return + +LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565 + applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85E8 + waitmovement 0 + applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8 + waitmovement 0 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, 4 + closemessage + applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1F85F6 + applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85ED + waitmovement 0 + return + +LittlerootTown_BrendansHouse_2F_EventScript_1F8594:: @ 81F8594 + applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85FD + waitmovement 0 + applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A6 + waitmovement 0 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, 4 + closemessage + applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F8604 + waitmovement 0 + return + +LittlerootTown_BrendansHouse_2F_Movement_1F85BC: @ 81F85BC + walk_down + walk_down + walk_in_place_fastest_left + step_end + +LittlerootTown_BrendansHouse_2F_Movement_1F85C0: @ 81F85C0 + walk_left + walk_left + walk_down + walk_down + walk_left + step_end + +LittlerootTown_BrendansHouse_2F_Movement_1F85C6: @ 81F85C6 + 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 + 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 + walk_left + walk_left + walk_left + step_end + +LittlerootTown_BrendansHouse_2F_Movement_1F85DB: @ 81F85DB + walk_up + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up + step_end + +LittlerootTown_BrendansHouse_2F_Movement_1F85E2: @ 81F85E2 + delay_16 + walk_in_place_fastest_up + delay_16 + delay_16 + walk_in_place_fastest_left + step_end + +LittlerootTown_BrendansHouse_2F_Movement_1F85E8: @ 81F85E8 + walk_left + walk_left + walk_down + walk_in_place_fastest_left + step_end + +LittlerootTown_BrendansHouse_2F_Movement_1F85ED: @ 81F85ED + 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 + 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 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_down + step_end + +LittlerootTown_BrendansHouse_2F_Movement_1F8604: @ 81F8604 + walk_up + walk_left + walk_left + walk_in_place_fastest_up + step_end + +LittlerootTown_BrendansHouse_2F_Movement_1F8609: @ 81F8609 + delay_16 + delay_16 + walk_in_place_fastest_left + step_end + +gUnknown_081F860D:: @ 81F860D + lockall + checkplayergender + compare VAR_RESULT, 0 + goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8626 + compare VAR_RESULT, 1 + goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F864C + end + +LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626 + setvar VAR_0x8004, 1 + special DoPCTurnOnEffect + playse SE_PC_ON + msgbox gUnknown_08272D87, 4 + special BedroomPC + waitstate + releaseall + end + +LittlerootTown_BrendansHouse_2F_EventScript_1F863F:: @ 81F863F + setvar VAR_0x8004, 1 + playse SE_PC_OFF + special DoPCTurnOffEffect + releaseall + end + +LittlerootTown_BrendansHouse_2F_EventScript_1F864C:: @ 81F864C + msgbox gUnknown_08272CD5, 4 + releaseall + end + +LittlerootTown_BrendansHouse_2F_EventScript_1F8656:: @ 81F8656 +LittlerootTown_MaysHouse_2F_EventScript_1F8656:: @ 81F8656 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F877F, 3 + end + +LittlerootTown_BrendansHouse_2F_EventScript_1F865F:: @ 81F865F +LittlerootTown_MaysHouse_2F_EventScript_1F865F:: @ 81F865F + msgbox LittlerootTown_BrendansHouse_2F_Text_1F884F, 3 + end + +LittlerootTown_BrendansHouse_2F_Text_1F8668: @ 81F8668 + .string "The clock is stopped…\p" + .string "Better set it and start it!$" + +LittlerootTown_BrendansHouse_2F_Text_1F869A: @ 81F869A + .string "MOM: {PLAYER}, how do you like your\n" + .string "new room?\p" + .string "Good! Everything’s put away neatly!\p" + .string "They finished moving everything in\n" + .string "downstairs, too.\p" + .string "POKéMON movers are so convenient!\p" + .string "Oh, you should make sure that\n" + .string "everything’s all there on your desk.$" + +LittlerootTown_BrendansHouse_2F_Text_1F877F: @ 81F877F + .string "{PLAYER} flipped open the notebook.\p" + .string "ADVENTURE RULE NO. 1\n" + .string "Open the MENU with START.\p" + .string "ADVENTURE RULE NO. 2\n" + .string "Record your progress with SAVE.\p" + .string "The remaining pages are blank…$" + +LittlerootTown_BrendansHouse_2F_Text_1F8820: @ 81F8820 + .string "{PLAYER} took a closer look at the\n" + .string "HOENN region map.$" + +LittlerootTown_BrendansHouse_2F_Text_1F884F: @ 81F884F + .string "It’s a Nintendo GameCube.\p" + .string "A Game Boy Advance is connected to\n" + .string "serve as the Controller.$" diff --git a/data/maps/LittlerootTown_MaysHouse_1F/events.inc b/data/maps/LittlerootTown_MaysHouse_1F/events.inc new file mode 100644 index 000000000..6822c20e8 --- /dev/null +++ b/data/maps/LittlerootTown_MaysHouse_1F/events.inc @@ -0,0 +1,23 @@ +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 + +LittlerootTown_MaysHouse_1F_MapWarps: @ 852D414 + 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 + 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 + +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_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc new file mode 100644 index 000000000..99d47f938 --- /dev/null +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -0,0 +1,423 @@ +LittlerootTown_MaysHouse_1F_MapScripts:: @ 81F88A5 + map_script 1, LittlerootTown_MaysHouse_1F_MapScript1_1F88B5 + map_script 3, LittlerootTown_MaysHouse_1F_MapScript1_1F88F4 + map_script 2, LittlerootTown_MaysHouse_1F_MapScript2_1F893A + .byte 0 + +LittlerootTown_MaysHouse_1F_MapScript1_1F88B5: @ 81F88B5 + compare VAR_0x4092, 6 + call_if 0, LittlerootTown_MaysHouse_1F_EventScript_1F88CA + checkflag FLAG_0x112 + call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F88DD + end + +LittlerootTown_MaysHouse_1F_EventScript_1F88CA:: @ 81F88CA + setmetatile 5, 4, 624, 1 + setmetatile 5, 2, 616, 1 + return + +LittlerootTown_MaysHouse_1F_EventScript_1F88DD:: @ 81F88DD + checkplayergender + compare VAR_RESULT, 1 + goto_eq LittlerootTown_MaysHouse_1F_EventScript_1F88EA + return + +LittlerootTown_MaysHouse_1F_EventScript_1F88EA:: @ 81F88EA + setmetatile 6, 7, 659, 1 + return + +LittlerootTown_MaysHouse_1F_MapScript1_1F88F4: @ 81F88F4 + compare VAR_0x4092, 3 + call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F892E + compare VAR_0x4092, 5 + call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8916 + compare VAR_0x4092, 6 + call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8922 + end + +LittlerootTown_MaysHouse_1F_EventScript_1F8916:: @ 81F8916 + setobjectxyperm 1, 2, 4 + setobjectmovementtype 1, 7 + return + +LittlerootTown_MaysHouse_1F_EventScript_1F8922:: @ 81F8922 + setobjectxyperm 1, 6, 5 + setobjectmovementtype 1, 7 + return + +LittlerootTown_MaysHouse_1F_EventScript_1F892E:: @ 81F892E + setobjectxyperm 1, 1, 8 + setobjectmovementtype 1, 7 + return + +LittlerootTown_MaysHouse_1F_MapScript2_1F893A: @ 81F893A + map_script_2 VAR_0x4092, 3, LittlerootTown_MaysHouse_1F_EventScript_1F898C + map_script_2 VAR_0x4092, 5, LittlerootTown_MaysHouse_1F_EventScript_1F8964 + map_script_2 VAR_0x4092, 6, LittlerootTown_MaysHouse_1F_EventScript_1F899D + map_script_2 VAR_0x408C, 1, LittlerootTown_MaysHouse_1F_EventScript_1F89AE + map_script_2 VAR_0x4082, 3, LittlerootTown_MaysHouse_1F_EventScript_292AF2 + .2byte 0 + +LittlerootTown_MaysHouse_1F_EventScript_1F8964:: @ 81F8964 + lockall + msgbox LittlerootTown_MaysHouse_1F_Text_1F7B67, 4 + closemessage + applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1F898A + applymovement 1, LittlerootTown_MaysHouse_1F_Movement_1F898A + waitmovement 0 + warp MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F, 255, 1, 1 + waitstate + releaseall + end + +LittlerootTown_MaysHouse_1F_Movement_1F898A: @ 81F898A + walk_up + step_end + +LittlerootTown_MaysHouse_1F_EventScript_1F898C:: @ 81F898C + lockall + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + goto LittlerootTown_MaysHouse_1F_EventScript_292704 + end + +LittlerootTown_MaysHouse_1F_EventScript_1F899D:: @ 81F899D + lockall + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + goto LittlerootTown_MaysHouse_1F_EventScript_2928DC + end + +LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE + lockall + playse SE_PIN + applymovement 4, LittlerootTown_MaysHouse_1F_Movement_272598 + waitmovement 0 + applymovement 4, LittlerootTown_MaysHouse_1F_Movement_27259A + waitmovement 0 + applymovement 255, LittlerootTown_MaysHouse_1F_Movement_2725A8 + applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1F89EC + waitmovement 0 + special GetRivalSonDaughterString + msgbox LittlerootTown_MaysHouse_1F_Text_1F8BC5, 4 + setflag FLAG_0x057 + setvar VAR_0x408C, 2 + releaseall + end + +LittlerootTown_MaysHouse_1F_Movement_1F89EC: @ 81F89EC + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + step_end + +LittlerootTown_BrendansHouse_1F_EventScript_1F89F3:: @ 81F89F3 +LittlerootTown_MaysHouse_1F_EventScript_1F89F3:: @ 81F89F3 + lock + faceplayer + checkflag FLAG_0x082 + goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A33 + checkflag FLAG_SYS_POKEMON_GET + goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A29 + compare VAR_0x408D, 3 + goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F + special GetRivalSonDaughterString + msgbox LittlerootTown_BrendansHouse_1F_Text_1F8CA5, 4 + release + end + +LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F:: @ 81F8A1F + msgbox LittlerootTown_BrendansHouse_1F_Text_1F8D37, 4 + release + end + +LittlerootTown_BrendansHouse_1F_EventScript_1F8A29:: @ 81F8A29 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F8D93, 4 + release + end + +LittlerootTown_BrendansHouse_1F_EventScript_1F8A33:: @ 81F8A33 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F8E01, 4 + release + end + +LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D:: @ 81F8A3D +LittlerootTown_MaysHouse_1F_EventScript_1F8A3D:: @ 81F8A3D + lock + faceplayer + special GetPlayerBigGuyGirlString + msgbox LittlerootTown_BrendansHouse_1F_Text_1F9262, 4 + release + end + +LittlerootTown_MaysHouse_1F_EventScript_1F8A4C:: @ 81F8A4C + lockall + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + applymovement VAR_0x8004, LittlerootTown_MaysHouse_1F_Movement_2725A8 + waitmovement 0 + goto LittlerootTown_MaysHouse_1F_EventScript_292765 + end + +LittlerootTown_MaysHouse_1F_EventScript_1F8A67:: @ 81F8A67 + lockall + setvar VAR_0x8008, 0 + goto LittlerootTown_MaysHouse_1F_EventScript_1F8A8B + end + +LittlerootTown_MaysHouse_1F_EventScript_1F8A73:: @ 81F8A73 + lockall + setvar VAR_0x8008, 1 + goto LittlerootTown_MaysHouse_1F_EventScript_1F8A8B + end + +LittlerootTown_MaysHouse_1F_EventScript_1F8A7F:: @ 81F8A7F + lockall + setvar VAR_0x8008, 2 + goto LittlerootTown_MaysHouse_1F_EventScript_1F8A8B + end + +LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B + playse SE_KAIDAN + delay 10 + addobject 7 + delay 30 + playse SE_PIN + applymovement 7, LittlerootTown_MaysHouse_1F_Movement_272598 + waitmovement 0 + applymovement 7, LittlerootTown_MaysHouse_1F_Movement_27259A + waitmovement 0 + compare VAR_0x8008, 1 + call_if 5, LittlerootTown_MaysHouse_1F_EventScript_1F8B2A + playbgm MUS_GIRL_SUP, 1 + compare VAR_0x8008, 0 + call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B35 + compare VAR_0x8008, 1 + call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B40 + compare VAR_0x8008, 2 + call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B4B + msgbox LittlerootTown_MaysHouse_1F_Text_1F8EC6, 4 + closemessage + compare VAR_0x8008, 0 + call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B6A + compare VAR_0x8008, 1 + call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B7C + compare VAR_0x8008, 2 + call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B8E + playse SE_KAIDAN + removeobject 7 + setflag FLAG_0x2EA + setflag FLAG_0x332 + clearflag FLAG_0x2D2 + delay 30 + setvar VAR_0x408D, 3 + setvar VAR_0x4050, 1 + savebgm MUS_DUMMY + fadedefaultbgm + releaseall + end + +LittlerootTown_MaysHouse_1F_EventScript_1F8B2A:: @ 81F8B2A + applymovement 255, LittlerootTown_MaysHouse_1F_Movement_2725AA + waitmovement 0 + return + +LittlerootTown_MaysHouse_1F_EventScript_1F8B35:: @ 81F8B35 + applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8B56 + waitmovement 0 + return + +LittlerootTown_MaysHouse_1F_EventScript_1F8B40:: @ 81F8B40 + applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8B5E + waitmovement 0 + return + +LittlerootTown_MaysHouse_1F_EventScript_1F8B4B:: @ 81F8B4B + applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8B62 + waitmovement 0 + return + +LittlerootTown_MaysHouse_1F_Movement_1F8B56: @ 81F8B56 + 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 + walk_up + walk_up + walk_up + step_end + +LittlerootTown_MaysHouse_1F_Movement_1F8B62: @ 81F8B62 + 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 + applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1F8BA0 + applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8BAF + waitmovement 0 + return + +LittlerootTown_MaysHouse_1F_EventScript_1F8B7C:: @ 81F8B7C + applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1F8BA4 + applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8BB5 + waitmovement 0 + return + +LittlerootTown_MaysHouse_1F_EventScript_1F8B8E:: @ 81F8B8E + applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1F8BAB + applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8BBF + waitmovement 0 + return + +LittlerootTown_MaysHouse_1F_Movement_1F8BA0: @ 81F8BA0 + delay_16 + delay_8 + walk_in_place_fastest_right + step_end + +LittlerootTown_MaysHouse_1F_Movement_1F8BA4: @ 81F8BA4 + 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 + delay_16 + delay_8 + walk_in_place_fastest_left + step_end + +LittlerootTown_MaysHouse_1F_Movement_1F8BAF: @ 81F8BAF + walk_in_place_fastest_right + walk_right + walk_in_place_fastest_up + walk_up + walk_up + step_end + +LittlerootTown_MaysHouse_1F_Movement_1F8BB5: @ 81F8BB5 + 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 + walk_in_place_fastest_left + walk_left + walk_in_place_fastest_up + walk_up + walk_up + step_end + +LittlerootTown_BrendansHouse_1F_Text_1F8BC5: @ 81F8BC5 +LittlerootTown_MaysHouse_1F_Text_1F8BC5: @ 81F8BC5 + .string "Oh, hello. And you are?\p" + .string "… … … … … … … … …\n" + .string "… … … … … … … … …\p" + .string "Oh, you’re {PLAYER}{KUN}, our new next-door\n" + .string "neighbor! Hi!\p" + .string "We have a {STR_VAR_1} about the same\n" + .string "age as you.\p" + .string "Our {STR_VAR_1} was excited about making\n" + .string "a new friend.\p" + .string "Our {STR_VAR_1} is upstairs, I think.$" + +LittlerootTown_BrendansHouse_1F_Text_1F8CA5: @ 81F8CA5 + .string "Like child, like father.\p" + .string "My husband is as wild about POKéMON\n" + .string "as our child.\p" + .string "If he’s not at his LAB, he’s likely\n" + .string "scrabbling about in grassy places.$" + +LittlerootTown_BrendansHouse_1F_Text_1F8D37: @ 81F8D37 + .string "That {RIVAL}!\p" + .string "I guess our child is too busy with\n" + .string "POKéMON to notice that you came\l" + .string "to visit, {PLAYER}{KUN}.$" + +LittlerootTown_BrendansHouse_1F_Text_1F8D93: @ 81F8D93 + .string "Oh, {RIVAL} went out to ROUTE 103\n" + .string "just a little while ago.\p" + .string "Like father, like child.\n" + .string "{RIVAL} can’t stay quietly at home.$" + +LittlerootTown_BrendansHouse_1F_Text_1F8E01: @ 81F8E01 + .string "I think it’s wonderful for people to\n" + .string "travel with POKéMON.\p" + .string "But you should go home every so often\n" + .string "to let your mother know you’re okay.\p" + .string "She might not say it, but I’m sure she\n" + .string "worries about you, {PLAYER}{KUN}.$" + +LittlerootTown_MaysHouse_1F_Text_1F8EC6: @ 81F8EC6 + .string "Huh?\n" + .string "Who… Who are you?\p" + .string "… … … … … … … …\n" + .string "… … … … … … … …\p" + .string "Oh, you’re {PLAYER}{KUN}.\n" + .string "So your move was today.\p" + .string "Um… I’m MAY.\n" + .string "Glad to meet you!\p" + .string "I…\n" + .string "I have this dream of becoming friends\l" + .string "with POKéMON all over the world.\p" + .string "I… I heard about you, {PLAYER}{KUN}, from\n" + .string "my dad, PROF. BIRCH.\p" + .string "I was hoping that you would be nice,\n" + .string "{PLAYER}{KUN}, and that we could be friends.\p" + .string "Oh, this is silly, isn’t it?\n" + .string "I… I’ve just met you, {PLAYER}{KUN}.\p" + .string "Eheheh…\p" + .string "Oh, no! I forgot!\p" + .string "I was supposed to go help Dad catch\n" + .string "some wild POKéMON!\p" + .string "{PLAYER}{KUN}, I’ll catch you later!$" + +LittlerootTown_BrendansHouse_1F_Text_1F90B4: @ 81F90B4 + .string "Hey!\n" + .string "You…\p" + .string "Who are you?\p" + .string "Oh, you’re {PLAYER}, aren’t you?\n" + .string "Moved in next door, right?\p" + .string "I didn’t know that you’re a girl.\p" + .string "Dad, PROF. BIRCH, said that our new\n" + .string "next-door neighbor is a GYM LEADER’s\l" + .string "kid, so I assumed you’d be a guy.\p" + .string "My name’s BRENDAN.\n" + .string "So, hi, neighbor!\p" + .string "Huh? Hey, {PLAYER}, don’t you have\n" + .string "a POKéMON?\p" + .string "Do you want me to go catch you one?\p" + .string "Aw, darn, I forgot…\p" + .string "I’m supposed to go help my dad catch\n" + .string "some wild POKéMON.\p" + .string "Some other time, okay?$" + +LittlerootTown_BrendansHouse_1F_Text_1F9262: @ 81F9262 + .string "Hi, neighbor!\p" + .string "Do you already have your\n" + .string "own POKéMON?$" diff --git a/data/maps/LittlerootTown_MaysHouse_2F/events.inc b/data/maps/LittlerootTown_MaysHouse_2F/events.inc new file mode 100644 index 000000000..a5f1dd43c --- /dev/null +++ b/data/maps/LittlerootTown_MaysHouse_2F/events.inc @@ -0,0 +1,30 @@ +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 + +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 + +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_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc new file mode 100644 index 000000000..5501f5ad5 --- /dev/null +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -0,0 +1,422 @@ +LittlerootTown_MaysHouse_2F_MapScripts:: @ 81F9296 + map_script 3, LittlerootTown_MaysHouse_2F_MapScript1_1F92A1 + map_script 4, LittlerootTown_MaysHouse_2F_MapScript2_1F931D + .byte 0 + +LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1 + compare VAR_0x408D, 2 + call_if 0, LittlerootTown_MaysHouse_2F_EventScript_1F930A + compare VAR_0x408D, 3 + call_if 4, LittlerootTown_MaysHouse_2F_EventScript_1F92CD + compare VAR_0x4092, 4 + call_if 1, LittlerootTown_MaysHouse_2F_EventScript_2926FE + call LittlerootTown_MaysHouse_2F_EventScript_275CE1 + setvar VAR_0x4089, 0 + end + +LittlerootTown_MaysHouse_2F_EventScript_1F92CD:: @ 81F92CD + checkflag FLAG_0x124 + goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F92E6 + compare VAR_0x4084, 2 + goto_if 4, LittlerootTown_MaysHouse_2F_EventScript_1F9309 + goto LittlerootTown_MaysHouse_2F_EventScript_1F92E6 + +LittlerootTown_MaysHouse_2F_EventScript_1F92E6:: @ 81F92E6 + checkplayergender + compare VAR_RESULT, 1 + goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F9309 + compare VAR_0x40D3, 2 + goto_if 4, LittlerootTown_MaysHouse_2F_EventScript_1F9309 + setobjectxyperm 1, 8, 2 + setobjectmovementtype 1, 7 + return + +LittlerootTown_BrendansHouse_2F_EventScript_1F9309:: @ 81F9309 +LittlerootTown_MaysHouse_2F_EventScript_1F9309:: @ 81F9309 + return + +LittlerootTown_MaysHouse_2F_EventScript_1F930A:: @ 81F930A + checkplayergender + compare VAR_RESULT, 0 + goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F9317 + return + +LittlerootTown_MaysHouse_2F_EventScript_1F9317:: @ 81F9317 + setvar VAR_0x408D, 2 + return + +LittlerootTown_MaysHouse_2F_MapScript2_1F931D: @ 81F931D + map_script_2 VAR_0x4089, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9327 + .2byte 0 + +LittlerootTown_MaysHouse_2F_EventScript_1F9327:: @ 81F9327 + checkplayergender + compare VAR_RESULT, 1 + goto_eq EventScript_275D0C + end + +LittlerootTown_MaysHouse_2F_EventScript_1F9334:: @ 81F9334 + lockall + compare VAR_0x408D, 2 + goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F934A + msgbox LittlerootTown_MaysHouse_2F_Text_1F9991, 4 + releaseall + end + +LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A + delay 10 + addobject 1 + applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F946F + waitmovement 0 + playse SE_PIN + applymovement 1, LittlerootTown_MaysHouse_2F_Movement_272598 + waitmovement 0 + applymovement 1, LittlerootTown_MaysHouse_2F_Movement_27259A + waitmovement 0 + delay 10 + playbgm MUS_GIRL_SUP, 1 + compare VAR_FACING, 2 + call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F93BA + compare VAR_FACING, 1 + call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F93E9 + compare VAR_FACING, 3 + call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F9418 + compare VAR_FACING, 4 + call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F9440 + setvar VAR_0x408D, 3 + setflag FLAG_0x332 + clearflag FLAG_0x2D2 + setvar VAR_0x4050, 1 + savebgm MUS_DUMMY + fadedefaultbgm + releaseall + end + +LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA + applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F9473 + waitmovement 0 + applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A4 + waitmovement 0 + msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, 4 + closemessage + applymovement 255, LittlerootTown_MaysHouse_2F_Movement_1F9483 + applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F9479 + waitmovement 0 + return + +LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9 + applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F948B + waitmovement 0 + applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A4 + waitmovement 0 + msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, 4 + closemessage + applymovement 255, LittlerootTown_MaysHouse_2F_Movement_1F9497 + applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F948F + waitmovement 0 + return + +LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418 + applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F949D + waitmovement 0 + applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A6 + waitmovement 0 + msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, 4 + closemessage + applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94A4 + waitmovement 0 + return + +LittlerootTown_MaysHouse_2F_EventScript_1F9440:: @ 81F9440 + applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94AD + waitmovement 0 + applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A4 + waitmovement 0 + msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, 4 + closemessage + applymovement 255, LittlerootTown_MaysHouse_2F_Movement_1F94BB + applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94B2 + waitmovement 0 + return + +LittlerootTown_MaysHouse_2F_Movement_1F946F: @ 81F946F + walk_down + walk_down + walk_in_place_fastest_right + step_end + +LittlerootTown_MaysHouse_2F_Movement_1F9473: @ 81F9473 + walk_right + walk_right + walk_down + walk_down + walk_right + step_end + +LittlerootTown_MaysHouse_2F_Movement_1F9479: @ 81F9479 + 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 + 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 + walk_right + walk_right + walk_right + step_end + +LittlerootTown_MaysHouse_2F_Movement_1F948F: @ 81F948F + 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 + delay_16 + walk_in_place_fastest_up + delay_16 + delay_16 + walk_in_place_fastest_right + step_end + +LittlerootTown_MaysHouse_2F_Movement_1F949D: @ 81F949D + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_down + step_end + +LittlerootTown_MaysHouse_2F_Movement_1F94A4: @ 81F94A4 + walk_up + walk_right + walk_right + walk_in_place_fastest_up + step_end + +LittlerootTown_MaysHouse_2F_Movement_1F94A9: @ 81F94A9 + delay_16 + delay_16 + walk_in_place_fastest_right + step_end + +LittlerootTown_MaysHouse_2F_Movement_1F94AD: @ 81F94AD + walk_right + walk_right + walk_down + walk_in_place_fastest_right + step_end + +LittlerootTown_MaysHouse_2F_Movement_1F94B2: @ 81F94B2 + 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 + delay_16 + walk_in_place_fastest_up + delay_16 + delay_16 + walk_in_place_fastest_right + step_end + +LittlerootTown_BrendansHouse_2F_EventScript_1F94C1:: @ 81F94C1 +LittlerootTown_MaysHouse_2F_EventScript_1F94C1:: @ 81F94C1 + lockall + checkflag FLAG_0x124 + goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94F7 + checkplayergender + compare VAR_RESULT, 0 + goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94E3 + compare VAR_RESULT, 1 + goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94ED + end + +LittlerootTown_BrendansHouse_2F_EventScript_1F94E3:: @ 81F94E3 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F978A, 4 + releaseall + end + +LittlerootTown_BrendansHouse_2F_EventScript_1F94ED:: @ 81F94ED + msgbox LittlerootTown_BrendansHouse_2F_Text_1F9962, 4 + releaseall + end + +LittlerootTown_BrendansHouse_2F_EventScript_1F94F7:: @ 81F94F7 + applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_27259E + waitmovement 0 + checkplayergender + compare VAR_RESULT, 0 + call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F951D + compare VAR_RESULT, 1 + call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F952F + setflag FLAG_0x125 + releaseall + end + +LittlerootTown_BrendansHouse_2F_EventScript_1F951D:: @ 81F951D + checkflag FLAG_0x125 + goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F9541 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F99C9, 4 + return + +LittlerootTown_BrendansHouse_2F_EventScript_1F952F:: @ 81F952F + checkflag FLAG_0x125 + goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F954A + msgbox LittlerootTown_BrendansHouse_2F_Text_1F9B0D, 4 + return + +LittlerootTown_BrendansHouse_2F_EventScript_1F9541:: @ 81F9541 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F9A9E, 4 + return + +LittlerootTown_BrendansHouse_2F_EventScript_1F954A:: @ 81F954A + msgbox LittlerootTown_BrendansHouse_2F_Text_1F9BE7, 4 + return + +gUnknown_081F9553:: @ 81F9553 + lockall + checkplayergender + compare VAR_RESULT, 0 + goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F956C + compare VAR_RESULT, 1 + goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F9576 + end + +LittlerootTown_MaysHouse_2F_EventScript_1F956C:: @ 81F956C + msgbox gUnknown_08272CD5, 4 + releaseall + end + +LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576 + setvar VAR_0x8004, 2 + special DoPCTurnOnEffect + playse SE_PC_ON + msgbox gUnknown_08272D87, 4 + special BedroomPC + waitstate + releaseall + end + +LittlerootTown_MaysHouse_2F_EventScript_1F958F:: @ 81F958F + setvar VAR_0x8004, 2 + playse SE_PC_OFF + special DoPCTurnOffEffect + releaseall + end + +LittlerootTown_MaysHouse_2F_Text_1F959C: @ 81F959C + .string "Huh?\n" + .string "Who… Who are you?\p" + .string "… … … … … … … …\n" + .string "… … … … … … … …\p" + .string "Oh, you’re {PLAYER}{KUN}.\n" + .string "So your move was today.\p" + .string "Um… I’m MAY.\n" + .string "Glad to meet you!\p" + .string "I…\n" + .string "I have this dream of becoming friends\l" + .string "with POKéMON all over the world.\p" + .string "I… I heard about you, {PLAYER}{KUN}, from\n" + .string "my dad, PROF. BIRCH.\p" + .string "I was hoping that you would be nice,\n" + .string "{PLAYER}{KUN}, and that we could be friends.\p" + .string "Oh, this is silly, isn’t it?\n" + .string "I… I’ve just met you, {PLAYER}{KUN}.\p" + .string "Eheheh…\p" + .string "Oh, no! I forgot!\p" + .string "I was supposed to go help Dad catch\n" + .string "some wild POKéMON!\p" + .string "{PLAYER}{KUN}, I’ll catch you later!$" + +LittlerootTown_BrendansHouse_2F_Text_1F978A: @ 81F978A + .string "POKéMON fully restored!\n" + .string "Items ready, and…$" + +LittlerootTown_BrendansHouse_2F_Text_1F97B4: @ 81F97B4 + .string "Hey!\n" + .string "You…\p" + .string "Who are you?\p" + .string "Oh, you’re {PLAYER}, aren’t you?\n" + .string "Moved in next door, right?\p" + .string "I didn’t know that you’re a girl.\p" + .string "Dad, PROF. BIRCH, said that our new\n" + .string "next-door neighbor is a GYM LEADER’s\l" + .string "kid, so I assumed you’d be a guy.\p" + .string "My name’s BRENDAN.\n" + .string "So, hi, neighbor!\p" + .string "Huh? Hey, {PLAYER}, don’t you have\n" + .string "a POKéMON?\p" + .string "Do you want me to go catch you one?\p" + .string "Aw, darn, I forgot…\p" + .string "I’m supposed to go help my dad catch\n" + .string "some wild POKéMON.\p" + .string "Some other time, okay?$" + +LittlerootTown_BrendansHouse_2F_Text_1F9962: @ 81F9962 + .string "POKéMON fully restored…\n" + .string "Items all packed, and…$" + +LittlerootTown_BrendansHouse_2F_Text_1F9991: @ 81F9991 +LittlerootTown_MaysHouse_2F_Text_1F9991: @ 81F9991 + .string "It’s {RIVAL}’s POKé BALL!\p" + .string "Better leave it right where it is.$" + +LittlerootTown_BrendansHouse_2F_Text_1F99C9: @ 81F99C9 + .string "MAY: {PLAYER}{KUN}!\p" + .string "I was just checking my POKéDEX.\p" + .string "There’s still a lot of POKéMON that\n" + .string "I’ve seen but haven’t caught.\p" + .string "And there are many others that\n" + .string "I think will evolve.\p" + .string "I wonder where I should go catch\n" + .string "some POKéMON next?$" + +LittlerootTown_BrendansHouse_2F_Text_1F9A9E: @ 81F9A9E + .string "MAY: I wonder where I should go catch\n" + .string "some POKéMON next?\p" + .string "Wouldn’t it be funny if we ran into each\n" + .string "other, {PLAYER}{KUN}?$" + +LittlerootTown_BrendansHouse_2F_Text_1F9B0D: @ 81F9B0D + .string "BRENDAN: Hey, it’s {PLAYER}.\p" + .string "I was just checking out my POKéDEX.\p" + .string "There are still many POKéMON that\n" + .string "I need to catch, I know, but this\l" + .string "is looking pretty good.\p" + .string "Checking this POKéDEX out gives me\n" + .string "the urge to hit the road again.$" + +LittlerootTown_BrendansHouse_2F_Text_1F9BE7: @ 81F9BE7 + .string "BRENDAN: I’m having a hard time deciding\n" + .string "where I should catch POKéMON next.\p" + .string "Hey, {PLAYER}, if I see you while I’m out\n" + .string "catching POKéMON, I can pitch you a\l" + .string "battle if you’d like.$" diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc new file mode 100644 index 000000000..a4596ce5c --- /dev/null +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc @@ -0,0 +1,32 @@ +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 + +LittlerootTown_ProfessorBirchsLab_MapWarps: @ 852D6DC + 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 + 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 + +LittlerootTown_ProfessorBirchsLab_MapEvents:: @ 852D7A0 + map_events LittlerootTown_ProfessorBirchsLab_EventObjects, LittlerootTown_ProfessorBirchsLab_MapWarps, 0x0, LittlerootTown_ProfessorBirchsLab_MapBGEvents + diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc new file mode 100644 index 000000000..75b83b6a1 --- /dev/null +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -0,0 +1,1030 @@ +LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 81F9C91 + map_script 3, LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1 + map_script 4, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06 + map_script 2, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9DB9 + .byte 0 + +LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1 + call LittlerootTown_ProfessorBirchsLab_EventScript_271ED7 + call LittlerootTown_ProfessorBirchsLab_EventScript_2720AD + compare VAR_0x40D3, 6 + goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7 + compare VAR_0x40D3, 4 + goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3 + compare VAR_0x40D3, 3 + goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD:: @ 81F9CCD + specialvar VAR_RESULT, sub_80C08E4 + compare VAR_RESULT, 1 + goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9 + setobjectmovementtype 3, 3 + setobjectxyperm 3, 5, 10 + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9:: @ 81F9CE9 + setvar VAR_0x40D3, 4 + goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3 + +LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3:: @ 81F9CF3 + setmaplayoutindex 432 + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7:: @ 81F9CF7 + setmaplayoutindex 432 + setobjectmovementtype 3, 3 + setobjectxyperm 3, 5, 10 + end + +LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06: @ 81F9D06 + map_script_2 VAR_0x4084, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40 + map_script_2 VAR_0x40D3, 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45 + map_script_2 VAR_0x40D3, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45 + map_script_2 VAR_0x40D3, 3, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D71 + map_script_2 VAR_0x40D3, 6, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D71 + map_script_2 VAR_0x40D3, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75 + map_script_2 VAR_0x40D3, 5, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75 + .2byte 0 + +LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40:: @ 81F9D40 + turnobject 255, 2 + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45:: @ 81F9D45 + turnobject 255, 2 + addobject 2 + addobject 3 + turnobject 3, 2 + setobjectxy 3, 5, 5 + turnobject 2, 1 + setobjectxy 2, 6, 4 + turnobject 1, 4 + setobjectxy 1, 10, 10 + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1F9D71:: @ 81F9D71 + addobject 3 + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75:: @ 81F9D75 + addobject 4 + addobject 5 + addobject 6 + addobject 3 + turnobject 4, 1 + setobjectxy 4, 8, 4 + turnobject 5, 1 + setobjectxy 5, 9, 4 + turnobject 6, 1 + setobjectxy 6, 10, 4 + turnobject 2, 1 + setobjectxy 2, 6, 4 + turnobject 3, 4 + setobjectxy 3, 5, 5 + end + +LittlerootTown_ProfessorBirchsLab_MapScript2_1F9DB9: @ 81F9DB9 + map_script_2 VAR_0x4084, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB + map_script_2 VAR_0x4084, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67 + map_script_2 VAR_0x40D3, 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80 + map_script_2 VAR_0x40D3, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62 + .2byte 0 + +LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB:: @ 81F9DDB + lockall + bufferleadmonspeciesname 0 + message LittlerootTown_ProfessorBirchsLab_Text_1FA74D + waitmessage + playfanfare MUS_FANFA4 + waitfanfare + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8B1, 5 + compare VAR_RESULT, 1 + goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07 + compare VAR_RESULT, 0 + goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17 + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07:: @ 81F9E07 + setvar VAR_0x8004, 0 + call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD + goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17 + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17:: @ 81F9E17 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8F6, 5 + compare VAR_RESULT, 1 + goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36 + compare VAR_RESULT, 0 + goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48 + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36:: @ 81F9E36 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA9D5, 4 + clearflag FLAG_0x3DF + setvar VAR_0x4084, 3 + releaseall + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48:: @ 81F9E48 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA35, 5 + compare VAR_RESULT, 1 + goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36 + compare VAR_RESULT, 0 + goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48 + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67:: @ 81F9E67 + lockall + applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_1F9E78 + waitmovement 0 + goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8 + end + +LittlerootTown_ProfessorBirchsLab_Movement_1F9E78: @ 81F9E78 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + step_end + +LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 + lockall + delay 30 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB16D, 4 + closemessage + applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_1F9F46 + waitmovement 0 + delay 20 + playse SE_TK_KASYA + delay 10 + playse SE_TK_KASYA + delay 10 + playse SE_TK_KASYA + delay 10 + playse SE_TK_KASYA + delay 20 + applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 + applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_2725A4 + waitmovement 0 + checkplayergender + compare VAR_RESULT, 0 + call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F32 + compare VAR_RESULT, 1 + call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F3C + playse SE_PC_ON + waitse + delay 20 + applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_1F9F58 + waitmovement 0 + applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_2725A6 + applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_2725A6 + waitmovement 0 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB419, 4 + playfanfare MUS_FANFA4 + message LittlerootTown_ProfessorBirchsLab_Text_1FB436 + waitmessage + waitfanfare + setflag FLAG_SYS_NATIONAL_DEX + special EnableNationalPokedex + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB466, 4 + closemessage + setflag FLAG_0x31B + setflag FLAG_0x31A + setvar VAR_0x40D3, 2 + setvar VAR_0x40F5, 0 + setflag FLAG_0x072 + releaseall + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1F9F32:: @ 81F9F32 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB30F, 4 + closemessage + return + +LittlerootTown_ProfessorBirchsLab_EventScript_1F9F3C:: @ 81F9F3C + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB38E, 4 + closemessage + return + +LittlerootTown_ProfessorBirchsLab_Movement_1F9F46: @ 81F9F46 + 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 + 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 + lockall + applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C + waitmovement 0 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB5F9, 4 + setvar VAR_0x40D3, 5 + releaseall + end + +LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C: @ 81F9F7C + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + step_end + +LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84:: @ 81F9F84 + lock + faceplayer + compare VAR_0x4084, 3 + goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1 + checkflag FLAG_0x058 + goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA4E2, 4 + setflag FLAG_0x058 + release + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7:: @ 81F9FA7 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA641, 4 + release + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1:: @ 81F9FB1 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA6CE, 4 + release + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB:: @ 81F9FBB + release + compare VAR_0x40D3, 6 + goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 + applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 + waitmovement 0 + drawmonpic SPECIES_CYNDAQUIL, 10, 3 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, 5 + compare VAR_RESULT, 0 + goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 + goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF:: @ 81F9FEF + release + compare VAR_0x40D3, 6 + goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 + applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 + waitmovement 0 + drawmonpic SPECIES_TOTODILE, 10, 3 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, 5 + compare VAR_RESULT, 0 + goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 + goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA023:: @ 81FA023 + release + compare VAR_0x40D3, 6 + goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 + applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 + waitmovement 0 + drawmonpic SPECIES_CHIKORITA, 10, 3 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, 5 + compare VAR_RESULT, 0 + goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 + goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA057:: @ 81FA057 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBAF8, 4 + releaseall + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA061:: @ 81FA061 + erasemonpic + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB959, 4 + releaseall + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C:: @ 81FA06C + bufferspeciesname 0, SPECIES_CYNDAQUIL + setvar VAR_TEMP_1, 155 + givemon SPECIES_CYNDAQUIL, 5, ITEM_NONE, 0x0, 0x0, 0 + compare VAR_RESULT, 0 + goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1 + compare VAR_RESULT, 1 + goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC + erasemonpic + goto LittlerootTown_ProfessorBirchsLab_EventScript_273811 + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1 + call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F + removeobject 4 + msgbox gUnknown_08273374, 5 + compare VAR_RESULT, 0 + goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD + call LittlerootTown_ProfessorBirchsLab_EventScript_27378B + call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD + goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC:: @ 81FA0CC + call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F + removeobject 4 + msgbox gUnknown_08273374, 5 + compare VAR_RESULT, 0 + goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2 + call LittlerootTown_ProfessorBirchsLab_EventScript_273797 + goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2 + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2:: @ 81FA0F2 + call LittlerootTown_ProfessorBirchsLab_EventScript_2737A0 + goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD:: @ 81FA0FD + erasemonpic + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, 4 + setvar VAR_0x40D3, 6 + releaseall + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D:: @ 81FA10D + bufferspeciesname 0, SPECIES_TOTODILE + setvar VAR_TEMP_1, 158 + givemon SPECIES_TOTODILE, 5, ITEM_NONE, 0x0, 0x0, 0 + compare VAR_RESULT, 0 + goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA142 + compare VAR_RESULT, 1 + goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D + erasemonpic + goto LittlerootTown_ProfessorBirchsLab_EventScript_273811 + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142 + call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F + removeobject 5 + msgbox gUnknown_08273374, 5 + compare VAR_RESULT, 0 + goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E + call LittlerootTown_ProfessorBirchsLab_EventScript_27378B + call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD + goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D:: @ 81FA16D + call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F + removeobject 5 + msgbox gUnknown_08273374, 5 + compare VAR_RESULT, 0 + goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA193 + call LittlerootTown_ProfessorBirchsLab_EventScript_273797 + goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA193 + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA193:: @ 81FA193 + call LittlerootTown_ProfessorBirchsLab_EventScript_2737A0 + goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E:: @ 81FA19E + erasemonpic + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, 4 + setvar VAR_0x40D3, 6 + releaseall + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE:: @ 81FA1AE + bufferspeciesname 0, SPECIES_CHIKORITA + setvar VAR_TEMP_1, 152 + givemon SPECIES_CHIKORITA, 5, ITEM_NONE, 0x0, 0x0, 0 + compare VAR_RESULT, 0 + goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3 + compare VAR_RESULT, 1 + goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E + erasemonpic + goto LittlerootTown_ProfessorBirchsLab_EventScript_273811 + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3 + call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F + removeobject 6 + msgbox gUnknown_08273374, 5 + compare VAR_RESULT, 0 + goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F + call LittlerootTown_ProfessorBirchsLab_EventScript_27378B + call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD + goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E:: @ 81FA20E + call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F + removeobject 6 + msgbox gUnknown_08273374, 5 + compare VAR_RESULT, 0 + goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA234 + call LittlerootTown_ProfessorBirchsLab_EventScript_273797 + goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA234 + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA234:: @ 81FA234 + call LittlerootTown_ProfessorBirchsLab_EventScript_2737A0 + goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F:: @ 81FA23F + erasemonpic + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, 4 + setvar VAR_0x40D3, 6 + releaseall + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F:: @ 81FA24F + playfanfare MUS_FANFA4 + message LittlerootTown_ProfessorBirchsLab_Text_1FB9D7 + waitmessage + waitfanfare + return + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A:: @ 81FA25A + lock + faceplayer + compare VAR_0x40D3, 5 + goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA28A + compare VAR_0x40D3, 2 + goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA294 + checkflag FLAG_HAS_MATCH_CALL + goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E + checkflag FLAG_0x119 + goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2 + goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA28A:: @ 81FA28A + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB787, 4 + release + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA294:: @ 81FA294 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB466, 4 + release + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E:: @ 81FA29E + checkflag FLAG_0x380 + goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_272141 + compare VAR_0x40D3, 3 + goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_272141 + compare VAR_0x40D3, 6 + goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_272141 + compare VAR_0x4084, 5 + goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA74, 4 + release + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2:: @ 81FA2D2 +Route101_EventScript_1FA2D2:: @ 81FA2D2 + msgbox Route101_Text_2B5F52, 4 + closemessage + delay 30 + playfanfare MUS_ME_TORE_EYE + msgbox Route101_Text_2B603A, 4 + waitfanfare + closemessage + delay 30 + setflag FLAG_0x119 + setvar VAR_0x40DA, 2 + release + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAB22, 4 + call LittlerootTown_ProfessorBirchsLab_EventScript_1FA3AC + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAC4B, 4 + closemessage + applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0 + waitmovement 0 + applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 + waitmovement 0 + checkplayergender + compare VAR_RESULT, 0 + call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA352 + compare VAR_RESULT, 1 + call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F + setvar VAR_0x4084, 5 + setflag FLAG_0x074 + setvar VAR_0x4051, 1 + setvar VAR_0x408D, 4 + setvar VAR_0x4050, 3 + releaseall + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA352:: @ 81FA352 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FADD7, 4 + giveitem_std ITEM_POKE_BALL, 5 + compare VAR_RESULT, 0 + call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3CE + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAE40, 4 + setvar VAR_RESULT, 0 + return + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F:: @ 81FA37F + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF3F, 4 + giveitem_std ITEM_POKE_BALL, 5 + compare VAR_RESULT, 0 + call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF8E, 4 + setvar VAR_RESULT, 1 + return + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA3AC:: @ 81FA3AC + playfanfare MUS_FANFA4 + message LittlerootTown_ProfessorBirchsLab_Text_1FAC32 + waitfanfare + setflag FLAG_SYS_POKEDEX_GET + special sub_81AFDA0 + setflag FLAG_0x8E4 + setvar VAR_0x40CD, 1 + return + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4:: @ 81FA3C4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAD6F, 4 + release + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA3CE:: @ 81FA3CE + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAEF3, 4 + return + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7:: @ 81FA3D7 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB05D, 4 + return + +LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0: @ 81FA3E0 + walk_down + walk_in_place_fastest_left + step_end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3:: @ 81FA3E3 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB0A2, 3 + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC:: @ 81FA3EC + lock + faceplayer + compare VAR_0x40D3, 5 + goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A + compare VAR_0x40D3, 6 + goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA465 + compare VAR_0x40D3, 2 + goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA490 + checkplayergender + compare VAR_RESULT, 0 + call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA428 + compare VAR_RESULT, 1 + call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA431 + release + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA428:: @ 81FA428 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF08, 4 + return + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA431:: @ 81FA431 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB073, 4 + return + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A:: @ 81FA43A + checkplayergender + compare VAR_RESULT, 0 + call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA453 + compare VAR_RESULT, 1 + call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C + release + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA453:: @ 81FA453 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBB68, 4 + return + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C:: @ 81FA45C + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBC2D, 4 + return + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA465:: @ 81FA465 + checkplayergender + compare VAR_RESULT, 0 + call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA47E + compare VAR_RESULT, 1 + call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA487 + release + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA47E:: @ 81FA47E + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBC8D, 4 + return + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA487:: @ 81FA487 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBCD2, 4 + return + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA490:: @ 81FA490 + checkplayergender + compare VAR_RESULT, 0 + call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4A9 + compare VAR_RESULT, 1 + call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4B2 + release + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA4A9:: @ 81FA4A9 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB528, 4 + return + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA4B2:: @ 81FA4B2 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB58A, 4 + return + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB:: @ 81FA4BB + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB0E7, 3 + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4:: @ 81FA4C4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB124, 3 + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD:: @ 81FA4CD + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB148, 3 + end + +LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6:: @ 81FA4D6 + lockall + pokenavcall LittlerootTown_ProfessorBirchsLab_Text_1FBD1A + waitmessage + clearflag FLAG_0x072 + releaseall + end + +LittlerootTown_ProfessorBirchsLab_Text_1FA4E2: @ 81FA4E2 + .string "Hunh? PROF. BIRCH?\p" + .string "The PROF’s away on fieldwork.\n" + .string "Ergo, he isn’t here.\p" + .string "Oh, let me explain what fieldwork is.\p" + .string "It is to study things in the natural\n" + .string "environment, like fields and mountains,\l" + .string "instead of a laboratory.\p" + .string "The PROF isn’t one for doing desk work.\n" + .string "He’s the type of person who would\l" + .string "rather go outside and experience\l" + .string "things than read about them here.$" + +LittlerootTown_ProfessorBirchsLab_Text_1FA641: @ 81FA641 + .string "The PROF isn’t one for doing desk work.\n" + .string "He’s the type of person who would\l" + .string "rather go outside and experience\l" + .string "things than read about them here.$" + +LittlerootTown_ProfessorBirchsLab_Text_1FA6CE: @ 81FA6CE + .string "PROF. BIRCH is studying the habitats\n" + .string "and distribution of POKéMON.\p" + .string "The PROF enjoys {RIVAL}’s help, too.\n" + .string "There’s a lot of love there.$" + +LittlerootTown_ProfessorBirchsLab_Text_1FA74D: @ 81FA74D + .string "PROF. BIRCH: So, {PLAYER}{KUN}.\p" + .string "I’ve heard so much about you from\n" + .string "your father.\p" + .string "I’ve heard that you don’t have your\n" + .string "own POKéMON yet.\p" + .string "But the way you battled earlier,\n" + .string "you pulled it off with aplomb!\p" + .string "I guess you have your father’s blood\n" + .string "in your veins after all!\p" + .string "Oh, yes. As thanks for rescuing me,\n" + .string "I’d like you to have the POKéMON you\l" + .string "used earlier.\p" + .string "{PLAYER} received the {STR_VAR_1}!$" + +LittlerootTown_ProfessorBirchsLab_Text_1FA8B1: @ 81FA8B1 + .string "PROF. BIRCH: While you’re at it, why not\n" + .string "give a nickname to that {STR_VAR_1}?$" + +LittlerootTown_ProfessorBirchsLab_Text_1FA8F6: @ 81FA8F6 + .string "PROF. BIRCH: If you work at POKéMON\n" + .string "and gain experience, I think you’ll make\l" + .string "an extremely good TRAINER.\p" + .string "My kid, {RIVAL}, is also studying\n" + .string "POKéMON while helping me out.\p" + .string "{PLAYER}{KUN}, don’t you think it might be\n" + .string "a good idea to go see {RIVAL}?$" + +LittlerootTown_ProfessorBirchsLab_Text_1FA9D5: @ 81FA9D5 + .string "PROF. BIRCH: Great!\n" + .string "{RIVAL} should be happy, too.\p" + .string "Get {RIVAL} to teach you what it\n" + .string "means to be a TRAINER.$" + +LittlerootTown_ProfessorBirchsLab_Text_1FAA35: @ 81FAA35 + .string "PROF. BIRCH: Oh, don’t be that way.\n" + .string "You should go meet my kid.$" + +LittlerootTown_ProfessorBirchsLab_Text_1FAA74: @ 81FAA74 + .string "PROF. BIRCH: {RIVAL}?\n" + .string "Gone home, I think.\p" + .string "Or maybe that kid’s scrabbling around\n" + .string "in tall grass again somewhere…\p" + .string "If you or your POKéMON get tired,\n" + .string "you should get some rest at home.$" + +LittlerootTown_ProfessorBirchsLab_Text_1FAB22: @ 81FAB22 + .string "PROF. BIRCH: Oh, hi, {PLAYER}{KUN}!\p" + .string "I heard you beat {RIVAL} on\n" + .string "your first try. That’s excellent!\p" + .string "{RIVAL}’s been helping with my research\n" + .string "for a long time.\p" + .string "{RIVAL} has an extensive history as\n" + .string "a TRAINER already.\p" + .string "Here, {PLAYER}{KUN}, I ordered this for my\n" + .string "research, but I think you should have\l" + .string "this POKéDEX.$" + +LittlerootTown_ProfessorBirchsLab_Text_1FAC32: @ 81FAC32 + .string "{PLAYER} received the POKéDEX!$" + +LittlerootTown_ProfessorBirchsLab_Text_1FAC4B: @ 81FAC4B + .string "PROF. BIRCH: The POKéDEX is a high-tech\n" + .string "tool that automatically makes a record\l" + .string "of any POKéMON you meet or catch.\p" + .string "My kid, {RIVAL}, goes everywhere\n" + .string "with it.\p" + .string "Whenever my kid catches a rare POKéMON\n" + .string "and records its data in the POKéDEX,\l" + .string "why, {RIVAL} looks for me while I’m out\l" + .string "doing fieldwork, and shows me.$" + +LittlerootTown_ProfessorBirchsLab_Text_1FAD6F: @ 81FAD6F + .string "PROF. BIRCH: Countless POKéMON\n" + .string "await you!\p" + .string "Argh, I’m getting the itch to get out\n" + .string "and do fieldwork again!$" + +LittlerootTown_ProfessorBirchsLab_Text_1FADD7: @ 81FADD7 + .string "MAY: Oh, wow, {PLAYER}{KUN}!\n" + .string "You got a POKéDEX, too!\p" + .string "That’s great! Just like me!\n" + .string "I’ve got something for you, too!$" + +LittlerootTown_ProfessorBirchsLab_Text_1FAE40: @ 81FAE40 + .string "MAY: It’s fun if you can get a lot of\n" + .string "POKéMON!\p" + .string "I’m going to look all over the place\n" + .string "because I want different POKéMON.\p" + .string "If I find any cute POKéMON, I’ll catch\n" + .string "them with POKé BALLS!$" + +LittlerootTown_ProfessorBirchsLab_Text_1FAEF3: @ 81FAEF3 + .string "Oh? Your BAG’s full.$" + +LittlerootTown_ProfessorBirchsLab_Text_1FAF08: @ 81FAF08 + .string "MAY: I wonder where I should go look\n" + .string "for POKéMON next?$" + +LittlerootTown_ProfessorBirchsLab_Text_1FAF3F: @ 81FAF3F + .string "BRENDAN: Huh…\n" + .string "So you got a POKéDEX, too.\p" + .string "Well then, here.\n" + .string "I’ll give you these.$" + +LittlerootTown_ProfessorBirchsLab_Text_1FAF8E: @ 81FAF8E + .string "BRENDAN: You know it’s more fun to\n" + .string "have a whole bunch of POKéMON.\p" + .string "I’m going to explore all over the place\n" + .string "to find different POKéMON.\p" + .string "If I find any cool POKéMON, you bet\n" + .string "I’ll try to get them with POKé BALLS.$" + +LittlerootTown_ProfessorBirchsLab_Text_1FB05D: @ 81FB05D + .string "Hey, your BAG’s full.$" + +LittlerootTown_ProfessorBirchsLab_Text_1FB073: @ 81FB073 + .string "BRENDAN: Where should I look for\n" + .string "POKéMON next…$" + +LittlerootTown_ProfessorBirchsLab_Text_1FB0A2: @ 81FB0A2 + .string "It’s a serious-looking machine.\n" + .string "The PROF must use this for research.$" + +LittlerootTown_ProfessorBirchsLab_Text_1FB0E7: @ 81FB0E7 + .string "It’s a PC used for research.\n" + .string "Better not mess around with it.$" + +LittlerootTown_ProfessorBirchsLab_Text_1FB124: @ 81FB124 + .string "It’s crammed with books on POKéMON.$" + +LittlerootTown_ProfessorBirchsLab_Text_1FB148: @ 81FB148 + .string "It’s a book that’s too hard to read.$" + +LittlerootTown_ProfessorBirchsLab_Text_1FB16D: @ 81FB16D + .string "PROF. BIRCH: Now…\p" + .string "{PLAYER}{KUN} and {RIVAL}, I’ve had the two\n" + .string "of you help me study POKéMON.\p" + .string "Thanks to your help, new facts\n" + .string "are coming to light.\p" + .string "It appears that in the HOENN region,\n" + .string "there are also POKéMON from other\l" + .string "regions.\p" + .string "It goes to show how rich and varied\n" + .string "the natural environments of HOENN\l" + .string "happen to be.\p" + .string "That’s why I think it’s necessary for\n" + .string "me to upgrade your POKéDEX to\l" + .string "the NATIONAL Mode.\p" + .string "Here, let me see your POKéDEX units.$" + +LittlerootTown_ProfessorBirchsLab_Text_1FB30F: @ 81FB30F + .string "MAY: Eheheh!\p" + .string "It’s so cool that even my POKéDEX\n" + .string "is getting updated!\p" + .string "It’s because you went out and caught\n" + .string "so many POKéMON, {PLAYER}{KUN}!$" + +LittlerootTown_ProfessorBirchsLab_Text_1FB38E: @ 81FB38E + .string "BRENDAN: I went out all over HOENN\n" + .string "and checked out POKéMON.\p" + .string "You can thank me for getting\n" + .string "the NATIONAL Mode POKéDEX.\p" + .string "Yep, you’re lucky, {PLAYER}!$" + +LittlerootTown_ProfessorBirchsLab_Text_1FB419: @ 81FB419 + .string "PROF. BIRCH: Okay, all done!$" + +LittlerootTown_ProfessorBirchsLab_Text_1FB436: @ 81FB436 + .string "{PLAYER}’s POKéDEX was upgraded\n" + .string "to the NATIONAL Mode!$" + +LittlerootTown_ProfessorBirchsLab_Text_1FB466: @ 81FB466 + .string "PROF. BIRCH: But listen.\n" + .string "You’ve become the CHAMPION,\l" + .string "but your POKéMON journey isn’t over.\p" + .string "There is no end to the road\n" + .string "that is POKéMON.\p" + .string "Somewhere, there is a grassy patch\n" + .string "that’s waiting for you!$" + +LittlerootTown_ProfessorBirchsLab_Text_1FB528: @ 81FB528 + .string "MAY: I think I’ll take a short break\n" + .string "from fieldwork.\p" + .string "I think I’ll help the PROF here for\n" + .string "a while.$" + +LittlerootTown_ProfessorBirchsLab_Text_1FB58A: @ 81FB58A + .string "BRENDAN: For the time being,\n" + .string "I’m taking a break from fieldwork.\p" + .string "I’ll be helping out the PROF here\n" + .string "for a while.$" + +LittlerootTown_ProfessorBirchsLab_Text_1FB5F9: @ 81FB5F9 + .string "PROF. BIRCH: Oh, {PLAYER}{KUN}!\n" + .string "Let’s have a look at your POKéDEX.\p" + .string "… … … … … …\n" + .string "… … … … … …\p" + .string "Yes, there’s no doubt about it.\p" + .string "You really have completed the HOENN\n" + .string "region’s POKéDEX.\p" + .string "That’s more than just impressive.\p" + .string "I have a gift for you.\p" + .string "Consider it my show of appreciation\n" + .string "for the fantastic work you’ve done.\p" + .string "My gift is a rare POKéMON only found\n" + .string "in another region!\p" + .string "You can have any one of these\n" + .string "three POKéMON!$" + +LittlerootTown_ProfessorBirchsLab_Text_1FB787: @ 81FB787 + .string "PROF. BIRCH: These are rare POKéMON\n" + .string "only found in another region!\p" + .string "You can have any one of these\n" + .string "three POKéMON!$" + +LittlerootTown_ProfessorBirchsLab_Text_1FB7F6: @ 81FB7F6 + .string "PROF. BIRCH: The FIRE POKéMON\n" + .string "CYNDAQUIL caught your eye!\p" + .string "You’re as sharp as ever!\p" + .string "So the CYNDAQUIL is your choice?$" + +LittlerootTown_ProfessorBirchsLab_Text_1FB869: @ 81FB869 + .string "PROF. BIRCH: The WATER POKéMON\n" + .string "TOTODILE is your choice!\p" + .string "You know how to pick a good one.\p" + .string "So, you’ll take the TOTODILE?$" + +LittlerootTown_ProfessorBirchsLab_Text_1FB8E0: @ 81FB8E0 + .string "PROF. BIRCH: The GRASS POKéMON\n" + .string "CHIKORITA is your choice!\p" + .string "You sure know what you’re doing.\p" + .string "So, you’ll take the CHIKORITA?$" + +LittlerootTown_ProfessorBirchsLab_Text_1FB959: @ 81FB959 + .string "PROF. BIRCH: Take your time before\n" + .string "you decide.\p" + .string "They’re all invaluable POKéMON.$" + +LittlerootTown_ProfessorBirchsLab_Text_1FB9A8: @ 81FB9A8 + .string "PROF. BIRCH: I see!\n" + .string "You picked a fine POKéMON!$" + +LittlerootTown_ProfessorBirchsLab_Text_1FB9D7: @ 81FB9D7 + .string "{PLAYER} received the {STR_VAR_1}\n" + .string "from PROF. BIRCH!$" + +LittlerootTown_ProfessorBirchsLab_Text_1FB9FC: @ 81FB9FC + .string "Want to give a nickname to\n" + .string "the {STR_VAR_1} you received?$" + +LittlerootTown_ProfessorBirchsLab_Text_1FBA2C: @ 81FBA2C + .string "PROF. BIRCH: Listen, {PLAYER}{KUN}.\n" + .string "You’ve completed the HOENN POKéDEX,\l" + .string "but your POKéMON journey isn’t over.\p" + .string "There is no end to the road\n" + .string "that is POKéMON.\p" + .string "Somewhere, there is a grassy patch\n" + .string "that’s waiting for you!$" + +LittlerootTown_ProfessorBirchsLab_Text_1FBAF8: @ 81FBAF8 + .string "You received the promised POKéMON.\n" + .string "Better leave the others alone.$" + +LittlerootTown_ProfessorBirchsLab_Text_1FBB3A: @ 81FBB3A + .string "Oh, you don’t have any room for\n" + .string "this POKéMON.$" + +LittlerootTown_ProfessorBirchsLab_Text_1FBB68: @ 81FBB68 + .string "MAY: {PLAYER}{KUN}, after this…\n" + .string "What are you going to do?\p" + .string "Are you going to keep battling\n" + .string "and sharpening your skills?\p" + .string "Or are you going to try filling\n" + .string "the NATIONAL POKéDEX?\p" + .string "I’m staying here to help the PROF.$" + +LittlerootTown_ProfessorBirchsLab_Text_1FBC2D: @ 81FBC2D + .string "BRENDAN: Rather than collecting\n" + .string "POKéMON, I prefer slowly and \l" + .string "steadily raising the one I chose.$" + +LittlerootTown_ProfessorBirchsLab_Text_1FBC8D: @ 81FBC8D + .string "MAY: Oh, hi, {PLAYER}{KUN}!\n" + .string "Have you gone to that place,\l" + .string "the BATTLE FRONTIER?$" + +LittlerootTown_ProfessorBirchsLab_Text_1FBCD2: @ 81FBCD2 + .string "BRENDAN: Hey, {PLAYER}!\n" + .string "Have you gone out to that place,\l" + .string "the BATTLE FRONTIER?$" + +LittlerootTown_ProfessorBirchsLab_Text_1FBD1A: @ 81FBD1A + .string "… … … … … …\n" + .string "… … … … … Beep!\p" + .string "SCOTT: Hi, hi, {PLAYER}!\n" + .string "It’s me, SCOTT.\p" + .string "I’m aboard the S.S. TIDAL now.\n" + .string "It feels great to be on the sea!\p" + .string "By the way…\p" + .string "There’s this place that I’d like to\n" + .string "invite you to for a visit.\p" + .string "If you’re interested, board a ferry\n" + .string "at either SLATEPORT or LILYCOVE.\p" + .string "I’ll fill you in on the details when\n" + .string "we meet. I’ll be waiting!\p" + .string "… … … … … …\n" + .string "… … … … … Click!$" diff --git a/data/maps/MagmaHideout_1F/events.inc b/data/maps/MagmaHideout_1F/events.inc new file mode 100644 index 000000000..1274e2373 --- /dev/null +++ b/data/maps/MagmaHideout_1F/events.inc @@ -0,0 +1,17 @@ +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 + +MagmaHideout_1F_MapWarps: @ 853725C + 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/MagmaHideout_1F/scripts.inc b/data/maps/MagmaHideout_1F/scripts.inc new file mode 100644 index 000000000..0e133a890 --- /dev/null +++ b/data/maps/MagmaHideout_1F/scripts.inc @@ -0,0 +1,53 @@ +MagmaHideout_1F_MapScripts:: @ 8239880 + map_script 3, MagmaHideout_1F_MapScript1_239886 + .byte 0 + +MagmaHideout_1F_MapScript1_239886: @ 8239886 + setvar VAR_0x40BD, 0 + end + +MagmaHideout_1F_EventScript_23988C:: @ 823988C + trainerbattle 0, TRAINER_GRUNT_38, 0, MagmaHideout_1F_Text_2398BA, MagmaHideout_1F_Text_239964 + msgbox MagmaHideout_1F_Text_2399B1, 6 + end + +MagmaHideout_1F_EventScript_2398A3:: @ 82398A3 + trainerbattle 0, TRAINER_GRUNT_39, 0, MagmaHideout_1F_Text_2399F5, MagmaHideout_1F_Text_239ABA + msgbox MagmaHideout_1F_Text_239ACD, 6 + end + +MagmaHideout_1F_Text_2398BA: @ 82398BA + .string "When TEAM MAGMA has roll call, we get\n" + .string "important guarding assignments in\l" + .string "the order that we line up.\p" + .string "That’s why I’m stuck off in this corner.\n" + .string "I’m always late to roll call!$" + +MagmaHideout_1F_Text_239964: @ 8239964 + .string "I’m always late for training sessions,\n" + .string "too!\p" + .string "I hate to say it, but I’m wimpy…$" + +MagmaHideout_1F_Text_2399B1: @ 82399B1 + .string "Okay, I’ll try to put a little more\n" + .string "effort into things from now on…$" + +MagmaHideout_1F_Text_2399F5: @ 82399F5 + .string "Our leader told us to dig into\n" + .string "MT. CHIMNEY, so we dug and dug.\p" + .string "And in the course of digging, we came\n" + .string "across something that blew our minds!\p" + .string "What did we find?\p" + .string "Fuhahaha!\n" + .string "I’ll tell you if you beat me!$" + +MagmaHideout_1F_Text_239ABA: @ 8239ABA + .string "Arrgh!\n" + .string "Taken down!$" + +MagmaHideout_1F_Text_239ACD: @ 8239ACD + .string "I won’t tell you after all.\n" + .string "You’ll find out when you get there!\p" + .string "It’d be better if you saved surprises\n" + .string "to the end, don’t you think?$" + diff --git a/data/maps/MagmaHideout_2F_1R/events.inc b/data/maps/MagmaHideout_2F_1R/events.inc new file mode 100644 index 000000000..32f835efc --- /dev/null +++ b/data/maps/MagmaHideout_2F_1R/events.inc @@ -0,0 +1,14 @@ +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 + +MagmaHideout_2F_1R_MapWarps: @ 85372F0 + 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/MagmaHideout_2F_1R/scripts.inc b/data/maps/MagmaHideout_2F_1R/scripts.inc new file mode 100644 index 000000000..33252bb57 --- /dev/null +++ b/data/maps/MagmaHideout_2F_1R/scripts.inc @@ -0,0 +1,75 @@ +MagmaHideout_2F_1R_MapScripts:: @ 8239B50 + .byte 0 + +MagmaHideout_2F_1R_EventScript_239B51:: @ 8239B51 + trainerbattle 0, TRAINER_GRUNT_51, 0, MagmaHideout_2F_1R_Text_239BAD, MagmaHideout_2F_1R_Text_239C4B + msgbox MagmaHideout_2F_1R_Text_239C74, 6 + end + +MagmaHideout_2F_1R_EventScript_239B68:: @ 8239B68 + trainerbattle 0, TRAINER_GRUNT_40, 0, MagmaHideout_2F_1R_Text_239CAB, MagmaHideout_2F_1R_Text_239D09 + msgbox MagmaHideout_2F_1R_Text_239D1D, 6 + end + +MagmaHideout_2F_1R_EventScript_239B7F:: @ 8239B7F + trainerbattle 0, TRAINER_GRUNT_41, 0, MagmaHideout_2F_1R_Text_239D62, MagmaHideout_2F_1R_Text_239D75 + msgbox MagmaHideout_2F_1R_Text_239D7D, 6 + end + +MagmaHideout_2F_1R_EventScript_239B96:: @ 8239B96 + trainerbattle 0, TRAINER_GRUNT_42, 0, MagmaHideout_2F_1R_Text_239DC5, MagmaHideout_2F_1R_Text_239DDA + msgbox MagmaHideout_2F_1R_Text_239DE2, 6 + end + +MagmaHideout_2F_1R_Text_239BAD: @ 8239BAD + .string "What, what, what?\p" + .string "Only TEAM MAGMA members are supposed\n" + .string "to be in here!\p" + .string "But you’re not dressed in TEAM MAGMA’s\n" + .string "uniform…\p" + .string "You rouse my suspicion!\n" + .string "Battle with me!$" + +MagmaHideout_2F_1R_Text_239C4B: @ 8239C4B + .string "Aiyiyi…\n" + .string "My pride as a TEAM MAGMA member…$" + +MagmaHideout_2F_1R_Text_239C74: @ 8239C74 + .string "If you suffer from chills, you should\n" + .string "join TEAM MAGMA.$" + +MagmaHideout_2F_1R_Text_239CAB: @ 8239CAB + .string "Hold it right there!\p" + .string "You don’t really expect me to keep\n" + .string "my trap shut and let you waltz by me?$" + +MagmaHideout_2F_1R_Text_239D09: @ 8239D09 + .string "Ooh wow!\n" + .string "I concede!$" + +MagmaHideout_2F_1R_Text_239D1D: @ 8239D1D + .string "Maybe it would’ve been better if I did\n" + .string "just let you go unchallenged…$" + +MagmaHideout_2F_1R_Text_239D62: @ 8239D62 + .string "Ahah!\n" + .string "An intruder!$" + +MagmaHideout_2F_1R_Text_239D75: @ 8239D75 + .string "Graaah!$" + +MagmaHideout_2F_1R_Text_239D7D: @ 8239D7D + .string "I’ve already lost.\p" + .string "Do I really need to keep running\n" + .string "around in a circle?$" + +MagmaHideout_2F_1R_Text_239DC5: @ 8239DC5 + .string "Oh, oh!\n" + .string "An intruder!$" + +MagmaHideout_2F_1R_Text_239DDA: @ 8239DDA + .string "Mutter…$" + +MagmaHideout_2F_1R_Text_239DE2: @ 8239DE2 + .string "Actually, I’m no expert at battling…$" + diff --git a/data/maps/MagmaHideout_2F_2R/events.inc b/data/maps/MagmaHideout_2F_2R/events.inc new file mode 100644 index 000000000..5567bf9cf --- /dev/null +++ b/data/maps/MagmaHideout_2F_2R/events.inc @@ -0,0 +1,15 @@ +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 + +MagmaHideout_2F_2R_MapWarps: @ 85373AC + 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/MagmaHideout_2F_2R/scripts.inc b/data/maps/MagmaHideout_2F_2R/scripts.inc new file mode 100644 index 000000000..8b1e51f16 --- /dev/null +++ b/data/maps/MagmaHideout_2F_2R/scripts.inc @@ -0,0 +1,78 @@ +MagmaHideout_2F_2R_MapScripts:: @ 8239E07 + .byte 0 + +MagmaHideout_2F_2R_EventScript_239E08:: @ 8239E08 + trainerbattle 0, TRAINER_GRUNT_52, 0, MagmaHideout_2F_2R_Text_239E64, MagmaHideout_2F_2R_Text_239EA5 + msgbox MagmaHideout_2F_2R_Text_239EBB, 6 + end + +MagmaHideout_2F_2R_EventScript_239E1F:: @ 8239E1F + trainerbattle 0, TRAINER_GRUNT_43, 0, MagmaHideout_2F_2R_Text_239F31, MagmaHideout_2F_2R_Text_239F71 + msgbox MagmaHideout_2F_2R_Text_239FA1, 6 + end + +MagmaHideout_2F_2R_EventScript_239E36:: @ 8239E36 + trainerbattle 0, TRAINER_GRUNT_44, 0, MagmaHideout_2F_2R_Text_239FDE, MagmaHideout_2F_2R_Text_23A050 + msgbox MagmaHideout_2F_2R_Text_23A07D, 6 + end + +MagmaHideout_2F_2R_EventScript_239E4D:: @ 8239E4D + trainerbattle 0, TRAINER_GRUNT_45, 0, MagmaHideout_2F_2R_Text_23A0E4, MagmaHideout_2F_2R_Text_23A14C + msgbox MagmaHideout_2F_2R_Text_23A16F, 6 + end + +MagmaHideout_2F_2R_Text_239E64: @ 8239E64 + .string "I don’t have a bone to pick with you.\n" + .string "I’m just following orders!$" + +MagmaHideout_2F_2R_Text_239EA5: @ 8239EA5 + .string "I may have lost, but…$" + +MagmaHideout_2F_2R_Text_239EBB: @ 8239EBB + .string "We dug up something beyond belief!\n" + .string "And, we got the BLUE ORB!\p" + .string "All that’s left is for our leader to…\n" + .string "Fufufu… Fwahahaha!$" + +MagmaHideout_2F_2R_Text_239F31: @ 8239F31 + .string "I can’t stand heat. Maybe I should’ve\n" + .string "joined TEAM AQUA instead…$" + +MagmaHideout_2F_2R_Text_239F71: @ 8239F71 + .string "Yeah, I really may not be right for\n" + .string "TEAM MAGMA…$" + +MagmaHideout_2F_2R_Text_239FA1: @ 8239FA1 + .string "Don’t you get lonely for the sea\n" + .string "being in a place like this?$" + +MagmaHideout_2F_2R_Text_239FDE: @ 8239FDE + .string "You can hear tremors here sometimes.\p" + .string "Could it be the volcano rattling?\n" + .string "Or is it GROU…\p" + .string "Whoops!\n" + .string "No, no, never mind!$" + +MagmaHideout_2F_2R_Text_23A050: @ 823A050 + .string "You’re a fiery battler.\n" + .string "Just like a volcano!$" + +MagmaHideout_2F_2R_Text_23A07D: @ 823A07D + .string "You just happened to win this time,\n" + .string "but that doesn’t matter.\p" + .string "TEAM MAGMA’s goal is about to be\n" + .string "reached!$" + +MagmaHideout_2F_2R_Text_23A0E4: @ 823A0E4 + .string "One of our guys was freaking out that\n" + .string "he lost his MAGMA EMBLEM…\p" + .string "Wait a minute!\n" + .string "Was it you who found it?$" + +MagmaHideout_2F_2R_Text_23A14C: @ 823A14C + .string "I’m having trouble believing this…$" + +MagmaHideout_2F_2R_Text_23A16F: @ 823A16F + .string "I’m getting this feeling that our plan\n" + .string "is going to end in failure…$" + diff --git a/data/maps/MagmaHideout_2F_3R/events.inc b/data/maps/MagmaHideout_2F_3R/events.inc new file mode 100644 index 000000000..ca379a0c7 --- /dev/null +++ b/data/maps/MagmaHideout_2F_3R/events.inc @@ -0,0 +1,7 @@ +MagmaHideout_2F_3R_MapWarps: @ 85375B0 + 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/MagmaHideout_2F_3R/scripts.inc b/data/maps/MagmaHideout_2F_3R/scripts.inc new file mode 100644 index 000000000..cbcb3fd52 --- /dev/null +++ b/data/maps/MagmaHideout_2F_3R/scripts.inc @@ -0,0 +1,3 @@ +MagmaHideout_2F_3R_MapScripts:: @ 823AD00 + .byte 0 + diff --git a/data/maps/MagmaHideout_3F_1R/events.inc b/data/maps/MagmaHideout_3F_1R/events.inc new file mode 100644 index 000000000..b2f157f57 --- /dev/null +++ b/data/maps/MagmaHideout_3F_1R/events.inc @@ -0,0 +1,13 @@ +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 + +MagmaHideout_3F_1R_MapWarps: @ 8537418 + 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/MagmaHideout_3F_1R/scripts.inc b/data/maps/MagmaHideout_3F_1R/scripts.inc new file mode 100644 index 000000000..068e71492 --- /dev/null +++ b/data/maps/MagmaHideout_3F_1R/scripts.inc @@ -0,0 +1,43 @@ +MagmaHideout_3F_1R_MapScripts:: @ 823A1B2 + .byte 0 + +MagmaHideout_3F_1R_EventScript_23A1B3:: @ 823A1B3 + trainerbattle 0, TRAINER_GRUNT_46, 0, MagmaHideout_3F_1R_Text_23A1E1, MagmaHideout_3F_1R_Text_23A229 + msgbox MagmaHideout_3F_1R_Text_23A246, 6 + end + +MagmaHideout_3F_1R_EventScript_23A1CA:: @ 823A1CA + trainerbattle 0, TRAINER_GRUNT_53, 0, MagmaHideout_3F_1R_Text_23A293, MagmaHideout_3F_1R_Text_23A353 + msgbox MagmaHideout_3F_1R_Text_23A37C, 6 + end + +MagmaHideout_3F_1R_Text_23A1E1: @ 823A1E1 + .string "What did I do to deserve this guard\n" + .string "posting?\p" + .string "My left ear is burning up!$" + +MagmaHideout_3F_1R_Text_23A229: @ 823A229 + .string "I’m getting heat exhaustion…$" + +MagmaHideout_3F_1R_Text_23A246: @ 823A246 + .string "Do you think it’s odd that we’re wearing\n" + .string "hoods in this magma-filled volcano?$" + +MagmaHideout_3F_1R_Text_23A293: @ 823A293 + .string "We joined so we can help our leader\n" + .string "achieve his fantastic vision.\p" + .string "I don’t care if you’re with TEAM AQUA\n" + .string "or if you’re just some kid passing by.\p" + .string "No one interferes with us and gets\n" + .string "away with it!$" + +MagmaHideout_3F_1R_Text_23A353: @ 823A353 + .string "Oh, no!\n" + .string "You’re not to be trusted at all!$" + +MagmaHideout_3F_1R_Text_23A37C: @ 823A37C + .string "Listen to me.\n" + .string "TEAM MAGMA is right!\p" + .string "Don’t listen to TEAM AQUA.\n" + .string "Don’t believe their lies!$" + diff --git a/data/maps/MagmaHideout_3F_2R/events.inc b/data/maps/MagmaHideout_3F_2R/events.inc new file mode 100644 index 000000000..27ea129c3 --- /dev/null +++ b/data/maps/MagmaHideout_3F_2R/events.inc @@ -0,0 +1,10 @@ +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 + +MagmaHideout_3F_2R_MapWarps: @ 8537474 + 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/MagmaHideout_3F_2R/scripts.inc b/data/maps/MagmaHideout_3F_2R/scripts.inc new file mode 100644 index 000000000..15d0c26ea --- /dev/null +++ b/data/maps/MagmaHideout_3F_2R/scripts.inc @@ -0,0 +1,26 @@ +MagmaHideout_3F_2R_MapScripts:: @ 823A3D4 + .byte 0 + +MagmaHideout_3F_2R_EventScript_23A3D5:: @ 823A3D5 + trainerbattle 0, TRAINER_GRUNT_47, 0, MagmaHideout_3F_2R_Text_23A3EC, MagmaHideout_3F_2R_Text_23A4BB + msgbox MagmaHideout_3F_2R_Text_23A4EF, 6 + end + +MagmaHideout_3F_2R_Text_23A3EC: @ 823A3EC + .string "I understand everything our leader\n" + .string "says. But you know what?\p" + .string "Doing stuff like digging up a super-\n" + .string "ancient POKéMON and ripping off\l" + .string "someone’s METEORITE…\p" + .string "I think we’re going a little too far.\n" + .string "What do you think?$" + +MagmaHideout_3F_2R_Text_23A4BB: @ 823A4BB + .string "Yeah, I think we are doing something\n" + .string "wrong somehow.$" + +MagmaHideout_3F_2R_Text_23A4EF: @ 823A4EF + .string "You know, losing to you cleared my mind.\p" + .string "The next time I see our leader,\n" + .string "I’m going to ask him about what we do.$" + diff --git a/data/maps/MagmaHideout_3F_3R/events.inc b/data/maps/MagmaHideout_3F_3R/events.inc new file mode 100644 index 000000000..3f96b5652 --- /dev/null +++ b/data/maps/MagmaHideout_3F_3R/events.inc @@ -0,0 +1,10 @@ +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 + +MagmaHideout_3F_3R_MapWarps: @ 853758C + 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/MagmaHideout_3F_3R/scripts.inc b/data/maps/MagmaHideout_3F_3R/scripts.inc new file mode 100644 index 000000000..e85cff9a3 --- /dev/null +++ b/data/maps/MagmaHideout_3F_3R/scripts.inc @@ -0,0 +1,3 @@ +MagmaHideout_3F_3R_MapScripts:: @ 823ACFF + .byte 0 + diff --git a/data/maps/MagmaHideout_4F/events.inc b/data/maps/MagmaHideout_4F/events.inc new file mode 100644 index 000000000..1865c3b84 --- /dev/null +++ b/data/maps/MagmaHideout_4F/events.inc @@ -0,0 +1,17 @@ +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 + +MagmaHideout_4F_MapWarps: @ 8537550 + 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/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc new file mode 100644 index 000000000..0cc0fea56 --- /dev/null +++ b/data/maps/MagmaHideout_4F/scripts.inc @@ -0,0 +1,228 @@ +MagmaHideout_4F_MapScripts:: @ 823A55F + .byte 0 + +MagmaHideout_4F_EventScript_23A560:: @ 823A560 + lockall + playbgm MUS_MGM0, 0 + msgbox MagmaHideout_4F_Text_23A9F4, 4 + closemessage + delay 20 + setvar VAR_RESULT, 1 + playse SE_W197 + setfieldeffectargument 0, 18 + setfieldeffectargument 1, 42 + setfieldeffectargument 2, 0 + dofieldeffect 54 + waitfieldeffect 54 + setvar VAR_RESULT, 1 + playfanfare MUS_ME_TAMA + playse SE_TAMA + special sub_80B0534 + applymovement 255, MagmaHideout_4F_Movement_2725A6 + waitmovement 0 + delay 150 + removeobject 7 + addobject 1 + waitstate + delay 60 + applymovement 1, MagmaHideout_4F_Movement_23A672 + waitmovement 0 + special sub_80B058C + waitstate + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 8 + setvar VAR_0x8007, 5 + special sub_8139560 + waitstate + applymovement 1, MagmaHideout_4F_Movement_23A67D + waitmovement 0 + removeobject 1 + delay 4 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + setvar VAR_0x8006, 8 + setvar VAR_0x8007, 5 + special sub_8139560 + waitstate + delay 30 + applymovement 6, MagmaHideout_4F_Movement_23A680 + waitmovement 0 + msgbox MagmaHideout_4F_Text_23AADA, 4 + closemessage + applymovement 255, MagmaHideout_4F_Movement_2725A8 + waitmovement 0 + delay 30 + applymovement 6, MagmaHideout_4F_Movement_27259E + waitmovement 0 + msgbox MagmaHideout_4F_Text_23AB33, 4 + closemessage + trainerbattle 3, TRAINER_MAXIE_1, 0, MagmaHideout_4F_Text_23ABB5 + msgbox MagmaHideout_4F_Text_23ABE2, 4 + closemessage + clearflag FLAG_0x348 + clearflag FLAG_0x343 + setvar VAR_0x4058, 1 + setflag FLAG_0x06F + setvar VAR_0x40A0, 1 + fadescreen 1 + removeobject 6 + removeobject 2 + removeobject 3 + removeobject 4 + removeobject 5 + setflag FLAG_0x359 + fadescreen 0 + releaseall + end + +MagmaHideout_4F_Movement_23A672: @ 823A672 + 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 + slide_up + slide_up + step_end + +MagmaHideout_4F_Movement_23A680: @ 823A680 + 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 + trainerbattle 0, TRAINER_GRUNT_48, 0, MagmaHideout_4F_Text_23A6E8, MagmaHideout_4F_Text_23A775 + msgbox MagmaHideout_4F_Text_23A7B5, 6 + end + +MagmaHideout_4F_EventScript_23A6A3:: @ 823A6A3 + trainerbattle 0, TRAINER_GRUNT_49, 0, MagmaHideout_4F_Text_23A7DA, MagmaHideout_4F_Text_23A81B + msgbox MagmaHideout_4F_Text_23A841, 6 + end + +MagmaHideout_4F_EventScript_23A6BA:: @ 823A6BA + trainerbattle 0, TRAINER_GRUNT_50, 0, MagmaHideout_4F_Text_23A86D, MagmaHideout_4F_Text_23A8A7 + msgbox MagmaHideout_4F_Text_23A8C6, 6 + end + +MagmaHideout_4F_EventScript_23A6D1:: @ 823A6D1 + trainerbattle 0, TRAINER_TABITHA_3, 0, MagmaHideout_4F_Text_23A8E1, MagmaHideout_4F_Text_23A994 + msgbox MagmaHideout_4F_Text_23A9AC, 6 + end + +MagmaHideout_4F_Text_23A6E8: @ 823A6E8 + .string "I want to see GROUDON, too, but they\n" + .string "won’t let me see even its tail…\p" + .string "It’s got me feeling really frustrated.\p" + .string "Oh, no!\n" + .string "I blabbed about GROUDON!$" + +MagmaHideout_4F_Text_23A775: @ 823A775 + .string "I guess it’s impossible to win if one\n" + .string "doesn’t have a calm mind…$" + +MagmaHideout_4F_Text_23A7B5: @ 823A7B5 + .string "I wonder if GROUDON even has a tail?$" + +MagmaHideout_4F_Text_23A7DA: @ 823A7DA + .string "Fuhahaha!\n" + .string "Soon! Very soon!\l" + .string "Our grand objective will be achieved!$" + +MagmaHideout_4F_Text_23A81B: @ 823A81B + .string "Grrr…\n" + .string "I’ve come so far, but now this?$" + +MagmaHideout_4F_Text_23A841: @ 823A841 + .string "MAXIE, sir!\n" + .string "An intruder is headed your way!$" + +MagmaHideout_4F_Text_23A86D: @ 823A86D + .string "You’re not finished yet!\n" + .string "You’re not getting by me easily!$" + +MagmaHideout_4F_Text_23A8A7: @ 823A8A7 + .string "Was I that easy to knock down?$" + +MagmaHideout_4F_Text_23A8C6: @ 823A8C6 + .string "C-come on, one more match…$" + +MagmaHideout_4F_Text_23A8E1: @ 823A8E1 + .string "Hehehe!\n" + .string "You made it this far, so I’ll tell you!\p" + .string "That’s right!\n" + .string "Up ahead, GROUDON is sleeping!\p" + .string "MAXIE went to GROUDON just seconds\n" + .string "ago!\p" + .string "It’s going to awaken real soon!\n" + .string "Hehe! Hehehe!$" + +MagmaHideout_4F_Text_23A994: @ 823A994 + .string "Taken down again…\n" + .string "Hehe…$" + +MagmaHideout_4F_Text_23A9AC: @ 823A9AC + .string "…And while you wasted time with me,\n" + .string "MAXIE should have awakened GROUDON…$" + +MagmaHideout_4F_Text_23A9F4: @ 823A9F4 + .string "MAXIE: GROUDON…\p" + .string "Nothing could awaken you from your\n" + .string "sleep bathed in magma…\p" + .string "This BLUE ORB is what you sought.\n" + .string "Wasn’t it?\p" + .string "I have brought you the BLUE ORB.\n" + .string "Let its shine awaken you!\p" + .string "And show me…\n" + .string "Show me the full extent of your power!$" + +MagmaHideout_4F_Text_23AADA: @ 823AADA + .string "MAXIE: GROUDON!\n" + .string "What’s wrong?\p" + .string "Wasn’t the BLUE ORB the key?\p" + .string "GROUDON!\n" + .string "Where have you gone…$" + +MagmaHideout_4F_Text_23AB33: @ 823AB33 + .string "MAXIE: Oh, so it was you?\p" + .string "I’ve seen you poking around uninvited\n" + .string "here and there…\p" + .string "I get it now!\n" + .string "You must have pulled a cheap stunt!$" + +MagmaHideout_4F_Text_23ABB5: @ 823ABB5 + .string "What makes you so adept at handling\n" + .string "POKéMON?$" + +MagmaHideout_4F_Text_23ABE2: @ 823ABE2 + .string "MAXIE: There has to be some reason\n" + .string "why GROUDON fled…\p" + .string "That’s what you’re trying to say,\n" + .string "aren’t you?\p" + .string "… … … … … …\n" + .string "… … … … … …\p" + .string "Humph…\n" + .string "You think I didn’t know that?\p" + .string "With GROUDON gone, there is no longer\n" + .string "any need for this blasted volcano.\p" + .string "I am going after GROUDON, so this\n" + .string "is where we part!$" + diff --git a/data/maps/MarineCave_End/events.inc b/data/maps/MarineCave_End/events.inc new file mode 100644 index 000000000..14903539b --- /dev/null +++ b/data/maps/MarineCave_End/events.inc @@ -0,0 +1,12 @@ +MarineCave_End_EventObjects: @ 85377E8 + 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 + +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_EventObjects, MarineCave_End_MapWarps, MarineCave_End_MapCoordEvents, 0x0 + diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc new file mode 100644 index 000000000..9c821e14f --- /dev/null +++ b/data/maps/MarineCave_End/scripts.inc @@ -0,0 +1,78 @@ +MarineCave_End_MapScripts:: @ 823AFDF + map_script 5, MarineCave_End_MapScript1_23AFEA + map_script 3, MarineCave_End_MapScript1_23B008 + .byte 0 + +MarineCave_End_MapScript1_23AFEA: @ 823AFEA + checkflag FLAG_SYS_CTRL_OBJ_DELETE + call_if 1, MarineCave_End_EventScript_23AFF4 + end + +MarineCave_End_EventScript_23AFF4:: @ 823AFF4 + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 7 + goto_if 5, MarineCave_End_EventScript_27374E + removeobject 1 + return + +MarineCave_End_MapScript1_23B008: @ 823B008 + checkflag FLAG_0x1BE + call_if 0, MarineCave_End_EventScript_23B012 + end + +MarineCave_End_EventScript_23B012:: @ 823B012 + clearflag FLAG_0x30E + setvar VAR_TEMP_1, 1 + return + +MarineCave_End_EventScript_23B01B:: @ 823B01B + lockall + applymovement 255, MarineCave_End_Movement_2725B2 + waitmovement 0 + applymovement 1, MarineCave_End_Movement_23B09D + waitmovement 0 + waitse + playmoncry SPECIES_KYOGRE, 2 + delay 40 + waitmoncry + setvar VAR_LAST_TALKED, 1 + setwildbattle SPECIES_KYOGRE, 70, ITEM_NONE + setflag FLAG_SYS_CTRL_OBJ_DELETE + special BattleSetup_StartLegendaryBattle + waitstate + clearflag FLAG_SYS_CTRL_OBJ_DELETE + setvar VAR_TEMP_1, 0 + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 1 + goto_eq MarineCave_End_EventScript_23B084 + compare VAR_RESULT, 4 + goto_eq MarineCave_End_EventScript_23B092 + compare VAR_RESULT, 5 + goto_eq MarineCave_End_EventScript_23B092 + setvar VAR_0x4039, 1 + setflag FLAG_0x1BE + releaseall + end + +MarineCave_End_EventScript_23B084:: @ 823B084 + setvar VAR_0x4039, 1 + setflag FLAG_0x1BE + goto MarineCave_End_EventScript_27376D + end + +MarineCave_End_EventScript_23B092:: @ 823B092 + setvar VAR_0x8004, 404 + goto MarineCave_End_EventScript_273776 + end + +MarineCave_End_Movement_23B09D: @ 823B09D + 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/maps/MarineCave_Entrance/events.inc b/data/maps/MarineCave_Entrance/events.inc new file mode 100644 index 000000000..4db3e1ddc --- /dev/null +++ b/data/maps/MarineCave_Entrance/events.inc @@ -0,0 +1,6 @@ +MarineCave_Entrance_MapWarps: @ 85377CC + 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/MarineCave_Entrance/scripts.inc b/data/maps/MarineCave_Entrance/scripts.inc new file mode 100644 index 000000000..24b288050 --- /dev/null +++ b/data/maps/MarineCave_Entrance/scripts.inc @@ -0,0 +1,8 @@ +MarineCave_Entrance_MapScripts:: @ 823AFD0 + map_script 5, MarineCave_Entrance_MapScript1_23AFD6 + .byte 0 + +MarineCave_Entrance_MapScript1_23AFD6: @ 823AFD6 + setdivewarp MAP_UNDERWATER_MARINE_CAVE, 255, 9, 6 + end + diff --git a/data/maps/MauvilleCity/events.inc b/data/maps/MauvilleCity/events.inc new file mode 100644 index 000000000..c8318005c --- /dev/null +++ b/data/maps/MauvilleCity/events.inc @@ -0,0 +1,35 @@ +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 + +MauvilleCity_MapWarps: @ 8526734 + 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 + 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 + +MauvilleCity_MapEvents:: @ 85267CC + map_events MauvilleCity_EventObjects, MauvilleCity_MapWarps, 0x0, MauvilleCity_MapBGEvents + diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc new file mode 100644 index 000000000..abb527d7f --- /dev/null +++ b/data/maps/MauvilleCity/scripts.inc @@ -0,0 +1,677 @@ +MauvilleCity_MapScripts:: @ 81DF385 + map_script 3, MauvilleCity_MapScript1_1DF38B + .byte 0 + +MauvilleCity_MapScript1_1DF38B: @ 81DF38B + setflag FLAG_VISITED_MAUVILLE_CITY + clearflag FLAG_0x09D + clearflag FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION + setflag FLAG_SYS_TV_START + clearflag FLAG_0x063 + setvar VAR_0x4093, 0 + checkflag FLAG_GOT_TM24_FROM_WATTSON + call_if 1, MauvilleCity_EventScript_1DF3A9 + end + +MauvilleCity_EventScript_1DF3A9:: @ 81DF3A9 + clearflag FLAG_SPRITEVIS_MAUVILLE_GYM_WATTSON + setflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON + setflag FLAG_WATTSON_REMATCH_AVAILABLE + return + +MauvilleCity_EventScript_1DF3B3:: @ 81DF3B3 + msgbox MauvilleCity_Text_1E0301, 2 + end + +MauvilleCity_EventScript_1DF3BC:: @ 81DF3BC + msgbox MauvilleCity_Text_1E037C, 2 + end + +MauvilleCity_EventScript_1DF3C5:: @ 81DF3C5 + msgbox MauvilleCity_Text_1E03FB, 2 + end + +MauvilleCity_EventScript_1DF3CE:: @ 81DF3CE + msgbox MauvilleCity_Text_1E044A, 2 + end + +MauvilleCity_EventScript_1DF3D7:: @ 81DF3D7 + msgbox MauvilleCity_Text_1E0485, 3 + end + +MauvilleCity_EventScript_1DF3E0:: @ 81DF3E0 + msgbox MauvilleCity_Text_1E04B7, 3 + end + +MauvilleCity_EventScript_1DF3E9:: @ 81DF3E9 + msgbox MauvilleCity_Text_1E0504, 3 + end + +MauvilleCity_EventScript_1DF3F2:: @ 81DF3F2 + msgbox MauvilleCity_Text_1E053C, 3 + end + +MauvilleCity_EventScript_1DF3FB:: @ 81DF3FB + lock + faceplayer + checkflag FLAG_0x062 + goto_eq MauvilleCity_EventScript_1DF413 + msgbox MauvilleCity_Text_1E056A, 4 + setflag FLAG_0x062 + release + end + +MauvilleCity_EventScript_1DF413:: @ 81DF413 + msgbox MauvilleCity_Text_1E0699, 4 + release + end + +MauvilleCity_EventScript_1DF41D:: @ 81DF41D + lock + faceplayer + checkflag FLAG_0x11C + goto_eq MauvilleCity_EventScript_1DF43D + msgbox MauvilleCity_Text_1DF7DC, 4 + closemessage + applymovement 7, MauvilleCity_Movement_2725A2 + waitmovement 0 + release + end + +MauvilleCity_EventScript_1DF43D:: @ 81DF43D + msgbox MauvilleCity_Text_1DFAA5, 4 + closemessage + applymovement 7, MauvilleCity_Movement_2725A2 + waitmovement 0 + release + end + +MauvilleCity_EventScript_1DF452:: @ 81DF452 + lockall + checkflag FLAG_0x11C + goto_eq MauvilleCity_EventScript_1DF690 + applymovement 6, MauvilleCity_Movement_2725A8 + waitmovement 0 + msgbox MauvilleCity_Text_1DF845, 4 + msgbox MauvilleCity_Text_1DF8B9, 4 + msgbox MauvilleCity_Text_1DF963, 4 + applymovement 6, MauvilleCity_Movement_27259E + waitmovement 0 + playse SE_PIN + applymovement 6, MauvilleCity_Movement_272598 + waitmovement 0 + applymovement 6, MauvilleCity_Movement_27259A + waitmovement 0 + msgbox MauvilleCity_Text_1DF9B2, 5 + goto MauvilleCity_EventScript_1DF4AD + end + +MauvilleCity_EventScript_1DF4AD:: @ 81DF4AD + compare VAR_RESULT, 1 + call_if 1, MauvilleCity_EventScript_1DF63A + compare VAR_RESULT, 0 + goto_eq MauvilleCity_EventScript_1DF683 + closemessage + switch VAR_FACING + case 2, MauvilleCity_EventScript_1DF4E0 + case 4, MauvilleCity_EventScript_1DF53D + end + +MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0 + applymovement 255, MauvilleCity_Movement_1DF6DF + applymovement 6, MauvilleCity_Movement_1DF6A8 + applymovement 7, MauvilleCity_Movement_1DF6E2 + waitmovement 0 + applymovement 6, MauvilleCity_Movement_2725A8 + waitmovement 0 + delay 30 + applymovement 255, MauvilleCity_Movement_1DF6EE + applymovement 7, MauvilleCity_Movement_1DF6F3 + waitmovement 0 + msgbox MauvilleCity_Text_1DFD34, 4 + closemessage + applymovement 255, MauvilleCity_Movement_1DF6CC + applymovement 7, MauvilleCity_Movement_1DF6FA + applymovement 6, MauvilleCity_Movement_1DF6B4 + waitmovement 0 + goto MauvilleCity_EventScript_1DF593 + end + +MauvilleCity_EventScript_1DF53D:: @ 81DF53D + applymovement 255, MauvilleCity_Movement_1DF6DC + applymovement 6, MauvilleCity_Movement_1DF6AE + applymovement 7, MauvilleCity_Movement_1DF6E8 + waitmovement 0 + applymovement 6, MauvilleCity_Movement_2725A8 + waitmovement 0 + delay 30 + applymovement 7, MauvilleCity_Movement_1DF6F7 + waitmovement 0 + msgbox MauvilleCity_Text_1DFD34, 4 + closemessage + applymovement 255, MauvilleCity_Movement_1DF6D0 + applymovement 7, MauvilleCity_Movement_1DF703 + applymovement 6, MauvilleCity_Movement_1DF6C0 + waitmovement 0 + goto MauvilleCity_EventScript_1DF593 + end + +MauvilleCity_EventScript_1DF593:: @ 81DF593 + removeobject 6 + removeobject 7 + clearflag FLAG_0x326 + clearflag FLAG_0x329 + setflag FLAG_0x0BE + setvar VAR_0x40F2, 0 + setflag FLAG_0x088 + compare VAR_FACING, 2 + call_if 1, MauvilleCity_EventScript_1DF5F3 + compare VAR_FACING, 4 + call_if 1, MauvilleCity_EventScript_1DF601 + applymovement 255, MauvilleCity_Movement_2725AA + waitmovement 0 + msgbox MauvilleCity_Text_1DFED5, 4 + closemessage + addvar VAR_0x40D1, 1 + compare VAR_FACING, 2 + call_if 1, MauvilleCity_EventScript_1DF616 + compare VAR_FACING, 4 + call_if 1, MauvilleCity_EventScript_1DF628 + removeobject 11 + releaseall + end + +MauvilleCity_EventScript_1DF5F3:: @ 81DF5F3 + addobject 11 + applymovement 11, MauvilleCity_Movement_1DF70D + waitmovement 0 + return + +MauvilleCity_EventScript_1DF601:: @ 81DF601 + setobjectxyperm 11, 12, 13 + addobject 11 + applymovement 11, MauvilleCity_Movement_1DF719 + waitmovement 0 + return + +MauvilleCity_EventScript_1DF616:: @ 81DF616 + applymovement 255, MauvilleCity_Movement_1DF6D5 + applymovement 11, MauvilleCity_Movement_1DF725 + waitmovement 0 + return + +MauvilleCity_EventScript_1DF628:: @ 81DF628 + applymovement 255, MauvilleCity_Movement_1DF6D8 + applymovement 11, MauvilleCity_Movement_1DF72F + waitmovement 0 + return + +MauvilleCity_EventScript_1DF63A:: @ 81DF63A + msgbox MauvilleCity_Text_1DFB6D, 4 + trainerbattle 3, TRAINER_WALLY_2, 0, MauvilleCity_Text_1DFB96 + applymovement 6, MauvilleCity_Movement_2725A8 + waitmovement 0 + msgbox MauvilleCity_Text_1DFBC3, 4 + applymovement 6, MauvilleCity_Movement_27259E + waitmovement 0 + msgbox MauvilleCity_Text_1DFBED, 4 + applymovement 6, MauvilleCity_Movement_2725A8 + waitmovement 0 + msgbox MauvilleCity_Text_1DFC8A, 4 + return + +MauvilleCity_EventScript_1DF683:: @ 81DF683 + setflag FLAG_0x11C + msgbox MauvilleCity_Text_1DFA4A, 4 + release + end + +MauvilleCity_EventScript_1DF690:: @ 81DF690 + applymovement 6, MauvilleCity_Movement_27259E + waitmovement 0 + msgbox MauvilleCity_Text_1DFB42, 5 + goto MauvilleCity_EventScript_1DF4AD + end + +MauvilleCity_Movement_1DF6A8: @ 81DF6A8 + walk_left + walk_left + walk_down + walk_down + walk_left + step_end + +MauvilleCity_Movement_1DF6AE: @ 81DF6AE + walk_down + walk_down + walk_left + walk_left + walk_left + step_end + +MauvilleCity_Movement_1DF6B4: @ 81DF6B4 + 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 + 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 + delay_16 + delay_8 + walk_in_place_fastest_left + step_end + +MauvilleCity_Movement_1DF6D0: @ 81DF6D0 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_left + step_end + +MauvilleCity_Movement_1DF6D5: @ 81DF6D5 + delay_16 + walk_in_place_fastest_left + step_end + +MauvilleCity_Movement_1DF6D8: @ 81DF6D8 + delay_16 + delay_16 + walk_in_place_fastest_left + step_end + +MauvilleCity_Movement_1DF6DC: @ 81DF6DC + delay_16 + walk_in_place_fastest_down + step_end + +MauvilleCity_Movement_1DF6DF: @ 81DF6DF + delay_16 + walk_in_place_fastest_left + step_end + +MauvilleCity_Movement_1DF6E2: @ 81DF6E2 + walk_left + walk_left + walk_left + walk_down + walk_down + step_end + +MauvilleCity_Movement_1DF6E8: @ 81DF6E8 + walk_left + walk_down + walk_down + walk_left + walk_left + step_end + +MauvilleCity_Movement_1DF6EE: @ 81DF6EE + delay_16 + delay_8 + delay_4 + walk_in_place_fastest_down + step_end + +MauvilleCity_Movement_1DF6F3: @ 81DF6F3 + walk_right + walk_right + walk_in_place_fastest_up + step_end + +MauvilleCity_Movement_1DF6F7: @ 81DF6F7 + walk_right + walk_up + step_end + +MauvilleCity_Movement_1DF6FA: @ 81DF6FA + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + step_end + +MauvilleCity_Movement_1DF703: @ 81DF703 + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + step_end + +MauvilleCity_Movement_1DF70D: @ 81DF70D + 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 + 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 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + step_end + +MauvilleCity_Movement_1DF72F: @ 81DF72F + 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 + lock + faceplayer + checkflag FLAG_GOT_TM24_FROM_WATTSON + goto_eq MauvilleCity_EventScript_1DF7B0 + compare VAR_0x40BA, 2 + goto_eq MauvilleCity_EventScript_1DF784 + checkflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON + goto_eq MauvilleCity_EventScript_1DF77A + msgbox MauvilleCity_Text_1DFFE4, 4 + giveitem_std ITEM_BASEMENT_KEY + setflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON + msgbox MauvilleCity_Text_1E0154, 4 + release + end + +MauvilleCity_EventScript_1DF77A:: @ 81DF77A + msgbox MauvilleCity_Text_1E0154, 4 + release + end + +MauvilleCity_EventScript_1DF784:: @ 81DF784 + msgbox MauvilleCity_Text_1E020E, 4 + giveitem_std ITEM_TM24 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_EventScript_272054 + setflag FLAG_GOT_TM24_FROM_WATTSON + msgbox MauvilleCity_Text_1E02AA, 4 + release + end + +MauvilleCity_EventScript_1DF7B0:: @ 81DF7B0 + msgbox MauvilleCity_Text_1E02AA, 4 + release + end + +MauvilleCity_EventScript_1DF7BA:: @ 81DF7BA + lockall + pokenavcall MauvilleCity_Text_1DFDFB + waitmessage + delay 30 + playfanfare MUS_ME_TORE_EYE + msgbox MauvilleCity_Text_1DFEB4, 4 + waitfanfare + closemessage + delay 30 + setflag FLAG_0x0D6 + clearflag FLAG_0x088 + releaseall + end + +MauvilleCity_Text_1DF7DC: @ 81DF7DC + .string "UNCLE: It’s because of POKéMON that\n" + .string "this boy’s got more pep, I suppose…\l" + .string "But he’s become a bit too peppy…$" + +MauvilleCity_Text_1DF845: @ 81DF845 + .string "WALLY: Aww, UNCLE, please?\p" + .string "I want to challenge this GYM and see\n" + .string "how much better I’ve become.\p" + .string "Please? May I, please?$" + +MauvilleCity_Text_1DF8B9: @ 81DF8B9 + .string "UNCLE: Now hold on, WALLY.\p" + .string "Since you started living with POKéMON,\n" + .string "you have grown quite a lot stronger.\p" + .string "But don’t you think you’re pushing it\n" + .string "to suddenly challenge a GYM?$" + +MauvilleCity_Text_1DF963: @ 81DF963 + .string "WALLY: I’m not pushing it.\p" + .string "If I combine forces with RALTS,\n" + .string "we can beat anyone!$" + +MauvilleCity_Text_1DF9B2: @ 81DF9B2 + .string "WALLY: Oh! Hi, {PLAYER}!\p" + .string "I’ve gotten a lot stronger since\n" + .string "we met.\p" + .string "{PLAYER}, I want you and my UNCLE to\n" + .string "understand that.\p" + .string "{PLAYER}, please, will you have\n" + .string "a battle with me?$" + +MauvilleCity_Text_1DFA4A: @ 81DFA4A + .string "WALLY: Oh… If you won’t battle me,\n" + .string "{PLAYER}, my UNCLE won’t know that I’ve\l" + .string "become really strong.$" + +MauvilleCity_Text_1DFAA5: @ 81DFAA5 + .string "UNCLE: {PLAYER}{KUN}, was it?\n" + .string "On WALLY’s behalf, can I ask you to\l" + .string "battle with him just this once?\p" + .string "I don’t think he’s going to listen to\n" + .string "any reason the way he is now.$" + +MauvilleCity_Text_1DFB42: @ 81DFB42 + .string "WALLY: {PLAYER}, please!\n" + .string "Battle with me, please.$" + +MauvilleCity_Text_1DFB6D: @ 81DFB6D + .string "WALLY: {PLAYER}, thank you.\p" + .string "Okay… Here I come!$" + +MauvilleCity_Text_1DFB96: @ 81DFB96 + .string "WALLY: … … … … … … …\p" + .string "… … … … … … … …\p" + .string "I lost…$" + +MauvilleCity_Text_1DFBC3: @ 81DFBC3 + .string "WALLY: UNCLE…\n" + .string "I’ll go back to VERDANTURF…$" + +MauvilleCity_Text_1DFBED: @ 81DFBED + .string "{PLAYER}, thank you.\n" + .string "Being a TRAINER is tough, isn’t it?\p" + .string "It’s not enough just to have POKéMON\n" + .string "and make them battle. That isn’t what\l" + .string "being a real TRAINER is about.$" + +MauvilleCity_Text_1DFC8A: @ 81DFC8A + .string "UNCLE: WALLY, there’s no need to be so\n" + .string "down on yourself.\p" + .string "Why, what’s keeping you from becoming\n" + .string "stronger and stronger?\p" + .string "Come on, let’s go home.\n" + .string "Everyone’s waiting for you.$" + +MauvilleCity_Text_1DFD34: @ 81DFD34 + .string "UNCLE: {PLAYER}{KUN}, it just dawned on me\n" + .string "that you must be the TRAINER who kept\l" + .string "an eye out for WALLY when he caught\l" + .string "his POKéMON.\p" + .string "Why don’t you visit us in VERDANTURF\n" + .string "sometime?\l" + .string "I’m sure WALLY would enjoy it.$" + + +MauvilleCity_Text_1DFDFB: @ 81DFDFB + .string "… … … … … …\n" + .string "… … … … … Beep!\p" + .string "WALLY: Oh, hello, {PLAYER}!\p" + .string "I just wanted to tell you that\n" + .string "my uncle bought me a POKéNAV!\p" + .string "Now I can get in touch with you\n" + .string "anytime, {PLAYER}!\p" + .string "… … … … … …\n" + .string "… … … … … Click!$" + +MauvilleCity_Text_1DFEB4: @ 81DFEB4 + .string "Registered WALLY\n" + .string "in the POKéNAV.$" + +MauvilleCity_Text_1DFED5: @ 81DFED5 + .string "SCOTT: Hehe…\n" + .string "I was watching that match!\p" + .string "You’re friends with that boy WALLY,\n" + .string "aren’t you?\p" + .string "But you didn’t hold anything back\n" + .string "and beat him impressively.\p" + .string "Yeah! That’s what a real POKéMON\n" + .string "battle is all about!\p" + .string "I idolize TRAINERS like that!\p" + .string "… … … … … …\n" + .string "I’ll be cheering for you!$" + +MauvilleCity_Text_1DFFE4: @ 81DFFE4 + .string "WATTSON: Oh, {PLAYER}{KUN}!\n" + .string "You look like you have a lot of zip!\l" + .string "That’s a good thing, wahahahaha!\p" + .string "Fine! I’ve decided!\n" + .string "I need a favor, {PLAYER}{KUN}!\p" + .string "MAUVILLE CITY has an underground\n" + .string "sector called NEW MAUVILLE.\p" + .string "{PLAYER}{KUN}, I’d like you to go there and\n" + .string "switch off the GENERATOR.\p" + .string "The GENERATOR has been running a bit\n" + .string "haywire. It’s getting unsafe.\p" + .string "Here, this is the KEY to get into\n" + .string "NEW MAUVILLE.$" + +MauvilleCity_Text_1E0154: @ 81E0154 + .string "WATTSON: Don’t you worry about it.\n" + .string "It won’t be a challenge to you.\p" + .string "The entrance to NEW MAUVILLE is just\n" + .string "a short SURF away from ROUTE 110.\p" + .string "That’s it, then, you have my trust!\n" + .string "Wahahahaha!$" + +MauvilleCity_Text_1E020E: @ 81E020E + .string "WATTSON: Wahahahaha!\p" + .string "I knew it, {PLAYER}{KUN}! I knew I’d made\n" + .string "the right choice asking you!\p" + .string "This is my thanks--a TM containing\n" + .string "THUNDERBOLT!\p" + .string "Go on, you’ve earned it!$" + +MauvilleCity_Text_1E02AA: @ 81E02AA + .string "WATTSON: Wahahahaha!\p" + .string "It pleases me to no end to see\n" + .string "the young step up and take charge!$" + +MauvilleCity_Text_1E0301: @ 81E0301 + .string "You know, it’s cool to have POKéMON\n" + .string "battles and stuff…\p" + .string "But if your POKéMON gets hurt,\n" + .string "you have to nurse it back to health.$" + +MauvilleCity_Text_1E037C: @ 81E037C + .string "The roads of this town stretch north\n" + .string "and south, and east and west.\p" + .string "Because of that, we get all sorts of\n" + .string "people coming through.$" + +MauvilleCity_Text_1E03FB: @ 81E03FB + .string "Have you been to RYDEL’S CYCLES yet?\p" + .string "RYDEL, the owner, is a very generous\n" + .string "man.$" + +MauvilleCity_Text_1E044A: @ 81E044A + .string "Even if you’re riding a BIKE,\n" + .string "wild POKéMON could jump you.$" + +MauvilleCity_Text_1E0485: @ 81E0485 + .string "MAUVILLE CITY\n" + .string "“The bright and shiny city of fun!â€$" + +MauvilleCity_Text_1E04B7: @ 81E04B7 + .string "MAUVILLE CITY POKéMON GYM\n" + .string "LEADER: WATTSON\l" + .string "“The cheerfully electrifying man!â€$" + +MauvilleCity_Text_1E0504: @ 81E0504 + .string "“Ride in gravel and shake up your\n" + .string "soul!â€\l" + .string "RYDEL’S CYCLES$" + +MauvilleCity_Text_1E053C: @ 81E053C + .string "“The play spot for all!â€\n" + .string "MAUVILLE GAME CORNER$" + +MauvilleCity_Text_1E056A: @ 81E056A + .string "Hi, do you check out TV at all?\p" + .string "They’ve added a bunch of cool new\n" + .string "shows recently.\p" + .string "TV is so cool. I’ve seen my friends on\n" + .string "TV just out of the blue.\p" + .string "And, sometimes, they even put you on TV\n" + .string "without telling you.\p" + .string "I wish I would be on TV sometime.\p" + .string "That’s why I think you should check\n" + .string "out TVs whenever you can.$" + +MauvilleCity_Text_1E0699: @ 81E0699 + .string "Hi, have you been checking out TVs?$" diff --git a/data/maps/MauvilleCity_BikeShop/events.inc b/data/maps/MauvilleCity_BikeShop/events.inc new file mode 100644 index 000000000..b4c0d19df --- /dev/null +++ b/data/maps/MauvilleCity_BikeShop/events.inc @@ -0,0 +1,15 @@ +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 + +MauvilleCity_BikeShop_MapWarps: @ 852FEB0 + 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 + bg_event 11, 1, 0, 0, 0, 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_BikeShop/scripts.inc b/data/maps/MauvilleCity_BikeShop/scripts.inc new file mode 100644 index 000000000..0231e5bde --- /dev/null +++ b/data/maps/MauvilleCity_BikeShop/scripts.inc @@ -0,0 +1,329 @@ +MauvilleCity_BikeShop_MapScripts:: @ 820EBBB + .byte 0 + +MauvilleCity_BikeShop_EventScript_20EBBC:: @ 820EBBC + lock + faceplayer + checkflag FLAG_0x05A + goto_eq MauvilleCity_BikeShop_EventScript_20EC94 + checkflag FLAG_0x059 + goto_eq MauvilleCity_BikeShop_EventScript_20EBF7 + msgbox MauvilleCity_BikeShop_Text_20EE22, 4 + msgbox MauvilleCity_BikeShop_Text_20EE99, 5 + compare VAR_RESULT, 1 + goto_eq MauvilleCity_BikeShop_EventScript_20EC4A + compare VAR_RESULT, 0 + goto_eq MauvilleCity_BikeShop_EventScript_20EC3D + end + +MauvilleCity_BikeShop_EventScript_20EBF7:: @ 820EBF7 + msgbox MauvilleCity_BikeShop_Text_20EE99, 5 + compare VAR_RESULT, 1 + goto_eq MauvilleCity_BikeShop_EventScript_20EC4A + compare VAR_RESULT, 0 + goto_eq MauvilleCity_BikeShop_EventScript_20EC3D + end + +MauvilleCity_BikeShop_EventScript_20EC16:: @ 820EC16 + message MauvilleCity_BikeShop_Text_20EF32 + waitmessage + multichoice 21, 8, 12, 1 + switch VAR_RESULT + case 0, MauvilleCity_BikeShop_EventScript_20EC53 + case 1, MauvilleCity_BikeShop_EventScript_20EC6D + end + +MauvilleCity_BikeShop_EventScript_20EC3D:: @ 820EC3D + setflag FLAG_0x059 + msgbox MauvilleCity_BikeShop_Text_20EEE8, 4 + release + end + +MauvilleCity_BikeShop_EventScript_20EC4A:: @ 820EC4A + setflag FLAG_0x05A + goto MauvilleCity_BikeShop_EventScript_20EC16 + end + +MauvilleCity_BikeShop_EventScript_20EC53:: @ 820EC53 + msgbox MauvilleCity_BikeShop_Text_20F18D, 4 + giveitem_std ITEM_MACH_BIKE + goto MauvilleCity_BikeShop_EventScript_20EC87 + end + +MauvilleCity_BikeShop_EventScript_20EC6D:: @ 820EC6D + msgbox MauvilleCity_BikeShop_Text_20F1A5, 4 + giveitem_std ITEM_ACRO_BIKE + goto MauvilleCity_BikeShop_EventScript_20EC87 + end + +MauvilleCity_BikeShop_EventScript_20EC87:: @ 820EC87 + msgbox MauvilleCity_BikeShop_Text_20F1BD, 4 + special SwapRegisteredBike + release + end + +MauvilleCity_BikeShop_EventScript_20EC94:: @ 820EC94 + msgbox MauvilleCity_BikeShop_Text_20F1FB, 5 + compare VAR_RESULT, 1 + goto_eq MauvilleCity_BikeShop_EventScript_20ECB3 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_BikeShop_EventScript_20ECE5 + end + +MauvilleCity_BikeShop_EventScript_20ECB3:: @ 820ECB3 + msgbox MauvilleCity_BikeShop_Text_20F22F, 4 + checkitem ITEM_ACRO_BIKE, 1 + compare VAR_RESULT, 1 + goto_eq MauvilleCity_BikeShop_EventScript_20ECEF + checkitem ITEM_MACH_BIKE, 1 + compare VAR_RESULT, 1 + goto_eq MauvilleCity_BikeShop_EventScript_20ED10 + msgbox MauvilleCity_BikeShop_Text_20F2F3, 4 + release + end + +MauvilleCity_BikeShop_EventScript_20ECE5:: @ 820ECE5 + msgbox MauvilleCity_BikeShop_Text_20F2C4, 4 + release + end + +MauvilleCity_BikeShop_EventScript_20ECEF:: @ 820ECEF + incrementgamestat 4 + msgbox MauvilleCity_BikeShop_Text_20F294, 4 + takeitem ITEM_ACRO_BIKE, 1 + giveitem_std ITEM_MACH_BIKE + goto MauvilleCity_BikeShop_EventScript_20EC87 + end + +MauvilleCity_BikeShop_EventScript_20ED10:: @ 820ED10 + incrementgamestat 4 + msgbox MauvilleCity_BikeShop_Text_20F263, 4 + takeitem ITEM_MACH_BIKE, 1 + giveitem_std ITEM_ACRO_BIKE + goto MauvilleCity_BikeShop_EventScript_20EC87 + end + +MauvilleCity_BikeShop_EventScript_20ED31:: @ 820ED31 + msgbox MauvilleCity_BikeShop_Text_20F3C3, 2 + end + +MauvilleCity_BikeShop_EventScript_20ED3A:: @ 820ED3A + message MauvilleCity_BikeShop_Text_20F445 + waitmessage + goto MauvilleCity_BikeShop_EventScript_20ED46 + end + +MauvilleCity_BikeShop_EventScript_20ED46:: @ 820ED46 + multichoice 0, 0, 43, 0 + switch VAR_RESULT + case 0, MauvilleCity_BikeShop_EventScript_20ED88 + case 1, MauvilleCity_BikeShop_EventScript_20ED94 + case 2, MauvilleCity_BikeShop_EventScript_20EDA0 + case 3, MauvilleCity_BikeShop_EventScript_20EDAC + case 127, MauvilleCity_BikeShop_EventScript_20EDAC + end + +MauvilleCity_BikeShop_EventScript_20ED88:: @ 820ED88 + message MauvilleCity_BikeShop_Text_20F487 + waitmessage + goto MauvilleCity_BikeShop_EventScript_20ED46 + end + +MauvilleCity_BikeShop_EventScript_20ED94:: @ 820ED94 + message MauvilleCity_BikeShop_Text_20F550 + waitmessage + goto MauvilleCity_BikeShop_EventScript_20ED46 + end + +MauvilleCity_BikeShop_EventScript_20EDA0:: @ 820EDA0 + message MauvilleCity_BikeShop_Text_20F61A + waitmessage + goto MauvilleCity_BikeShop_EventScript_20ED46 + end + +MauvilleCity_BikeShop_EventScript_20EDAC:: @ 820EDAC + release + end + +MauvilleCity_BikeShop_EventScript_20EDAE:: @ 820EDAE + message MauvilleCity_BikeShop_Text_20F6ED + waitmessage + goto MauvilleCity_BikeShop_EventScript_20EDBA + end + +MauvilleCity_BikeShop_EventScript_20EDBA:: @ 820EDBA + multichoice 0, 0, 44, 0 + switch VAR_RESULT + case 0, MauvilleCity_BikeShop_EventScript_20EDFC + case 1, MauvilleCity_BikeShop_EventScript_20EE08 + case 2, MauvilleCity_BikeShop_EventScript_20EE14 + case 3, MauvilleCity_BikeShop_EventScript_20EE20 + case 127, MauvilleCity_BikeShop_EventScript_20EE20 + end + +MauvilleCity_BikeShop_EventScript_20EDFC:: @ 820EDFC + message MauvilleCity_BikeShop_Text_20F72F + waitmessage + goto MauvilleCity_BikeShop_EventScript_20EDBA + end + +MauvilleCity_BikeShop_EventScript_20EE08:: @ 820EE08 + message MauvilleCity_BikeShop_Text_20F7F5 + waitmessage + goto MauvilleCity_BikeShop_EventScript_20EDBA + end + +MauvilleCity_BikeShop_EventScript_20EE14:: @ 820EE14 + message MauvilleCity_BikeShop_Text_20F898 + waitmessage + goto MauvilleCity_BikeShop_EventScript_20EDBA + end + +MauvilleCity_BikeShop_EventScript_20EE20:: @ 820EE20 + release + end + +MauvilleCity_BikeShop_Text_20EE22: @ 820EE22 + .string "Well, well, what have we here?\n" + .string "A most energetic customer!\p" + .string "Me? You may call me RYDEL.\n" + .string "I’m the owner of this cycle shop.$" + +MauvilleCity_BikeShop_Text_20EE99: @ 820EE99 + .string "RYDEL: Your RUNNING SHOES…\n" + .string "They’re awfully filthy.\p" + .string "Did you come from far away?$" + +MauvilleCity_BikeShop_Text_20EEE8: @ 820EEE8 + .string "RYDEL: Is that right?\p" + .string "Then, I guess you have no need for\n" + .string "any of my BIKES.$" + +MauvilleCity_BikeShop_Text_20EF32: @ 820EF32 + .string "RYDEL: Hm, hm… … … … …\p" + .string "You’re saying that you came all this\n" + .string "way from LITTLEROOT?\p" + .string "My goodness!\n" + .string "That’s ridiculously far!\p" + .string "If you had one of my BIKES, you could\n" + .string "go anywhere easily while feeling the\l" + .string "gentle caress of the wind!\p" + .string "I’ll tell you what!\n" + .string "I’ll give you a BIKE!\p" + .string "Oh, wait a second!\p" + .string "I forgot to tell you that there are\n" + .string "two kinds of BIKES!\p" + .string "They are the MACH BIKE and\n" + .string "the ACRO BIKE!\p" + .string "The MACH BIKE is for cyclists who want\n" + .string "to feel the wind with their bodies!\p" + .string "And an ACRO BIKE is for those who\n" + .string "prefer technical rides!\p" + .string "I’m a real sweetheart, so you can\n" + .string "have whichever one you like!\p" + .string "Which one will you choose?$" + +MauvilleCity_BikeShop_Text_20F18D: @ 820F18D + .string "{PLAYER} chose the MACH BIKE.$" + +MauvilleCity_BikeShop_Text_20F1A5: @ 820F1A5 + .string "{PLAYER} chose the ACRO BIKE.$" + +MauvilleCity_BikeShop_Text_20F1BD: @ 820F1BD + .string "RYDEL: If you get the urge to switch\n" + .string "BIKES, just come see me!$" + +MauvilleCity_BikeShop_Text_20F1FB: @ 820F1FB + .string "RYDEL: Oh? Were you thinking about\n" + .string "switching BIKES?$" + +MauvilleCity_BikeShop_Text_20F22F: @ 820F22F + .string "RYDEL: Okay, no problem!\n" + .string "I’ll switch BIKES for you!$" + +MauvilleCity_BikeShop_Text_20F263: @ 820F263 + .string "{PLAYER} got the MACH BIKE exchanged\n" + .string "for an ACRO BIKE.$" + +MauvilleCity_BikeShop_Text_20F294: @ 820F294 + .string "{PLAYER} got the ACRO BIKE exchanged\n" + .string "for a MACH BIKE.$" + +MauvilleCity_BikeShop_Text_20F2C4: @ 820F2C4 + .string "RYDEL: Good, good!\n" + .string "I’m happy that you like it!$" + +MauvilleCity_BikeShop_Text_20F2F3: @ 820F2F3 + .string "Oh? What happened to that BIKE\n" + .string "I gave you?\p" + .string "Oh, I get it, you stored it using your PC.\p" + .string "Well, take it out of PC storage,\n" + .string "and I’ll be happy to exchange it!\p" + .string "May the wind always be at your back\n" + .string "on your adventure!$" + +MauvilleCity_BikeShop_Text_20F3C3: @ 820F3C3 + .string "I’m learning about BIKES while\n" + .string "I work here.\p" + .string "If you need advice on how to ride your\n" + .string "BIKE, there’re a couple handbooks in\l" + .string "the back.$" + +MauvilleCity_BikeShop_Text_20F445: @ 820F445 + .string "It’s a handbook on the MACH BIKE.\p" + .string "Which page do you want to read?$" + +MauvilleCity_BikeShop_Text_20F487: @ 820F487 + .string "A BIKE moves in the direction that\n" + .string "the + Control Pad is pressed.\p" + .string "It will speed up once it gets rolling.\p" + .string "To stop, release the + Control Pad.\n" + .string "The BIKE will slow to a stop.\p" + .string "Want to read a different page?$" + +MauvilleCity_BikeShop_Text_20F550: @ 820F550 + .string "A MACH BIKE is speedy, but it can’t\n" + .string "stop very quickly.\p" + .string "It gets a little tricky to get around\n" + .string "a corner.\p" + .string "Release the + Control Pad a little\n" + .string "before the corner and slow down.\p" + .string "Want to read a different page?$" + +MauvilleCity_BikeShop_Text_20F61A: @ 820F61A + .string "There are small sandy slopes\n" + .string "throughout the HOENN region.\p" + .string "The loose, crumbly sand makes it\n" + .string "impossible to climb normally.\p" + .string "But if you have a MACH BIKE, you can\n" + .string "zip up a sandy slope.\p" + .string "Want to read a different page?$" + +MauvilleCity_BikeShop_Text_20F6ED: @ 820F6ED + .string "It’s a handbook on the ACRO BIKE.\p" + .string "Which page do you want to read?$" + +MauvilleCity_BikeShop_Text_20F72F: @ 820F72F + .string "Press the B Button while riding,\n" + .string "and the front wheel lifts up.\p" + .string "You can zip around with the front\n" + .string "wheel up using the + Control Pad.\p" + .string "This technique is called a wheelie.\p" + .string "Want to read a different page?$" + +MauvilleCity_BikeShop_Text_20F7F5: @ 820F7F5 + .string "Keeping the B Button pressed,\n" + .string "your BIKE can hop on the spot.\p" + .string "This technique is called a bunny hop.\p" + .string "You can ride while hopping, too.\p" + .string "Want to read a different page?$" + +MauvilleCity_BikeShop_Text_20F898: @ 820F898 + .string "Press the B Button and the + Control\n" + .string "Pad at the same time to jump.\p" + .string "Press the + Control Pad to the side\n" + .string "to jump sideways.\p" + .string "Press it backwards to make the BIKE\n" + .string "change directions while jumping.\p" + .string "Want to read a different page?$" + diff --git a/data/maps/MauvilleCity_GameCorner/events.inc b/data/maps/MauvilleCity_GameCorner/events.inc new file mode 100644 index 000000000..a956f16d8 --- /dev/null +++ b/data/maps/MauvilleCity_GameCorner/events.inc @@ -0,0 +1,47 @@ +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 + +MauvilleCity_GameCorner_MapWarps: @ 8530048 + 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 + 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 + +MauvilleCity_GameCorner_MapEvents:: @ 8530178 + map_events MauvilleCity_GameCorner_EventObjects, MauvilleCity_GameCorner_MapWarps, 0x0, MauvilleCity_GameCorner_MapBGEvents + diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc new file mode 100644 index 000000000..400a24c24 --- /dev/null +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -0,0 +1,821 @@ +MauvilleCity_GameCorner_MapScripts:: @ 820FBB8 + .byte 0 + +MauvilleCity_GameCorner_EventScript_20FBB9:: @ 820FBB9 + lock + faceplayer + msgbox MauvilleCity_GameCorner_Text_210460, 4 + checkitem ITEM_COIN_CASE, 1 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_GameCorner_EventScript_20FCB7 + message MauvilleCity_GameCorner_Text_2104DF + waitmessage + showmoneybox 0, 0, 0 + showcoinsbox 1, 6 + goto MauvilleCity_GameCorner_EventScript_20FBE5 + +MauvilleCity_GameCorner_EventScript_20FBE5:: @ 820FBE5 + multichoicedefault 15, 0, 49, 0, 0 + switch VAR_RESULT + case 0, MauvilleCity_GameCorner_EventScript_20FC33 + case 1, MauvilleCity_GameCorner_EventScript_20FC75 + goto MauvilleCity_GameCorner_EventScript_20FCD1 + end + +MauvilleCity_GameCorner_EventScript_20FC0C:: @ 820FC0C + multichoicedefault 15, 0, 49, 1, 0 + switch VAR_RESULT + case 0, MauvilleCity_GameCorner_EventScript_20FC33 + case 1, MauvilleCity_GameCorner_EventScript_20FC75 + goto MauvilleCity_GameCorner_EventScript_20FCD1 + end + +MauvilleCity_GameCorner_EventScript_20FC33:: @ 820FC33 + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 9950 + goto_if 4, MauvilleCity_GameCorner_EventScript_20FCE1 + checkmoney 0x3e8, 0 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_GameCorner_EventScript_20FCC1 + givecoins 50 + takemoney 0x3e8, 0 + updatemoneybox 0, 0 + nop + updatecoinsbox 1, 6 + playse SE_REGI + msgbox MauvilleCity_GameCorner_Text_210529, 4 + hidemoneybox + nop + nop + hidecoinsbox 0, 5 + release + end + +MauvilleCity_GameCorner_EventScript_20FC75:: @ 820FC75 + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 9500 + goto_if 4, MauvilleCity_GameCorner_EventScript_20FCE1 + checkmoney 0x2710, 0 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_GameCorner_EventScript_20FCC1 + givecoins 500 + takemoney 0x2710, 0 + updatemoneybox 0, 0 + nop + updatecoinsbox 1, 6 + playse SE_REGI + msgbox MauvilleCity_GameCorner_Text_210529, 4 + hidemoneybox + nop + nop + hidecoinsbox 0, 5 + release + end + +MauvilleCity_GameCorner_EventScript_20FCB7:: @ 820FCB7 + msgbox MauvilleCity_GameCorner_Text_21047E, 4 + release + end + +MauvilleCity_GameCorner_EventScript_20FCC1:: @ 820FCC1 + msgbox MauvilleCity_GameCorner_Text_210553, 4 + hidemoneybox + nop + nop + hidecoinsbox 0, 5 + release + end + +MauvilleCity_GameCorner_EventScript_20FCD1:: @ 820FCD1 + msgbox MauvilleCity_GameCorner_Text_21059A, 4 + hidemoneybox + nop + nop + hidecoinsbox 0, 5 + release + end + +MauvilleCity_GameCorner_EventScript_20FCE1:: @ 820FCE1 + msgbox MauvilleCity_GameCorner_Text_21057E, 4 + hidemoneybox + nop + nop + hidecoinsbox 0, 5 + release + end + +MauvilleCity_GameCorner_EventScript_20FCF1:: @ 820FCF1 + lock + faceplayer + msgbox MauvilleCity_GameCorner_Text_2105D7, 4 + checkitem ITEM_COIN_CASE, 1 + compare VAR_RESULT, 1 + goto_eq MauvilleCity_GameCorner_EventScript_20FD0D + release + end + +MauvilleCity_GameCorner_EventScript_20FD0D:: @ 820FD0D + message MauvilleCity_GameCorner_Text_21060D + waitmessage + setvar VAR_TEMP_1, 0 + showcoinsbox 1, 1 + goto MauvilleCity_GameCorner_EventScript_20FD2B + +MauvilleCity_GameCorner_EventScript_20FD20:: @ 820FD20 + message MauvilleCity_GameCorner_Text_21060D + waitmessage + goto MauvilleCity_GameCorner_EventScript_20FD2B + +MauvilleCity_GameCorner_EventScript_20FD2B:: @ 820FD2B + multichoice 12, 0, 48, 0 + switch VAR_RESULT + case 0, MauvilleCity_GameCorner_EventScript_20FD67 + case 1, MauvilleCity_GameCorner_EventScript_20FD75 + case 2, MauvilleCity_GameCorner_EventScript_20FD83 + case 3, MauvilleCity_GameCorner_EventScript_20FE92 + goto MauvilleCity_GameCorner_EventScript_20FE92 + end + +MauvilleCity_GameCorner_EventScript_20FD67:: @ 820FD67 + setvar VAR_TEMP_1, 1 + bufferdecorationname 0, 88 + goto MauvilleCity_GameCorner_EventScript_20FD91 + +MauvilleCity_GameCorner_EventScript_20FD75:: @ 820FD75 + setvar VAR_TEMP_1, 2 + bufferdecorationname 0, 89 + goto MauvilleCity_GameCorner_EventScript_20FD91 + +MauvilleCity_GameCorner_EventScript_20FD83:: @ 820FD83 + setvar VAR_TEMP_1, 3 + bufferdecorationname 0, 90 + goto MauvilleCity_GameCorner_EventScript_20FD91 + +MauvilleCity_GameCorner_EventScript_20FD91:: @ 820FD91 + msgbox MauvilleCity_GameCorner_Text_210705, 5 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_GameCorner_EventScript_20FE92 + switch VAR_TEMP_1 + case 1, MauvilleCity_GameCorner_EventScript_20FDCB + case 2, MauvilleCity_GameCorner_EventScript_20FE05 + case 3, MauvilleCity_GameCorner_EventScript_20FE3F + end + +MauvilleCity_GameCorner_EventScript_20FDCB:: @ 820FDCB + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 1000 + goto_if 0, MauvilleCity_GameCorner_EventScript_20FE79 + bufferdecorationname 1, 88 + checkdecorspace 88 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_GameCorner_EventScript_20FE87 + takecoins 1000 + givedecoration 88 + updatecoinsbox 1, 1 + playse SE_REGI + msgbox MauvilleCity_GameCorner_Text_210646, 4 + goto MauvilleCity_GameCorner_EventScript_20FD20 + end + +MauvilleCity_GameCorner_EventScript_20FE05:: @ 820FE05 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 1000 + goto_if 0, MauvilleCity_GameCorner_EventScript_20FE79 + bufferdecorationname 1, 89 + checkdecorspace 89 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_GameCorner_EventScript_20FE87 + takecoins 1000 + givedecoration 89 + updatecoinsbox 1, 1 + playse SE_REGI + msgbox MauvilleCity_GameCorner_Text_210646, 4 + goto MauvilleCity_GameCorner_EventScript_20FD20 + end + +MauvilleCity_GameCorner_EventScript_20FE3F:: @ 820FE3F + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 1000 + goto_if 0, MauvilleCity_GameCorner_EventScript_20FE79 + bufferdecorationname 1, 90 + checkdecorspace 90 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_GameCorner_EventScript_20FE87 + takecoins 1000 + givedecoration 90 + updatecoinsbox 1, 1 + playse SE_REGI + msgbox MauvilleCity_GameCorner_Text_210646, 4 + goto MauvilleCity_GameCorner_EventScript_20FD20 + end + +MauvilleCity_GameCorner_EventScript_20FE79:: @ 820FE79 + msgbox MauvilleCity_GameCorner_Text_210673, 4 + goto MauvilleCity_GameCorner_EventScript_20FD20 + end + +MauvilleCity_GameCorner_EventScript_20FE87:: @ 820FE87 + call MauvilleCity_GameCorner_EventScript_272071 + goto MauvilleCity_GameCorner_EventScript_20FD20 + end + +MauvilleCity_GameCorner_EventScript_20FE92:: @ 820FE92 + msgbox MauvilleCity_GameCorner_Text_2106BF, 4 + hidecoinsbox 0, 0 + release + end + +MauvilleCity_GameCorner_EventScript_20FE9F:: @ 820FE9F + lock + faceplayer + msgbox MauvilleCity_GameCorner_Text_2105D7, 4 + checkitem ITEM_COIN_CASE, 1 + compare VAR_RESULT, 1 + goto_eq MauvilleCity_GameCorner_EventScript_20FEBB + release + end + +MauvilleCity_GameCorner_EventScript_20FEBB:: @ 820FEBB + message MauvilleCity_GameCorner_Text_21060D + waitmessage + setvar VAR_TEMP_1, 0 + showcoinsbox 1, 1 + goto MauvilleCity_GameCorner_EventScript_20FED9 + +MauvilleCity_GameCorner_EventScript_20FECE:: @ 820FECE + message MauvilleCity_GameCorner_Text_21060D + waitmessage + goto MauvilleCity_GameCorner_EventScript_20FED9 + +MauvilleCity_GameCorner_EventScript_20FED9:: @ 820FED9 + multichoice 12, 0, 55, 0 + switch VAR_RESULT + case 0, MauvilleCity_GameCorner_EventScript_20FF2B + case 1, MauvilleCity_GameCorner_EventScript_20FF3E + case 2, MauvilleCity_GameCorner_EventScript_20FF51 + case 3, MauvilleCity_GameCorner_EventScript_20FF64 + case 4, MauvilleCity_GameCorner_EventScript_20FF77 + case 5, MauvilleCity_GameCorner_EventScript_210118 + goto MauvilleCity_GameCorner_EventScript_210118 + end + +MauvilleCity_GameCorner_EventScript_20FF2B:: @ 820FF2B + setvar VAR_TEMP_1, 1 + bufferitemname 0, ITEM_TM32 + setvar VAR_0x8004, 320 + goto MauvilleCity_GameCorner_EventScript_20FF8A + +MauvilleCity_GameCorner_EventScript_20FF3E:: @ 820FF3E + setvar VAR_TEMP_1, 2 + bufferitemname 0, ITEM_TM29 + setvar VAR_0x8004, 317 + goto MauvilleCity_GameCorner_EventScript_20FF8A + +MauvilleCity_GameCorner_EventScript_20FF51:: @ 820FF51 + setvar VAR_TEMP_1, 3 + bufferitemname 0, ITEM_TM35 + setvar VAR_0x8004, 323 + goto MauvilleCity_GameCorner_EventScript_20FF8A + +MauvilleCity_GameCorner_EventScript_20FF64:: @ 820FF64 + setvar VAR_TEMP_1, 4 + bufferitemname 0, ITEM_TM24 + setvar VAR_0x8004, 312 + goto MauvilleCity_GameCorner_EventScript_20FF8A + +MauvilleCity_GameCorner_EventScript_20FF77:: @ 820FF77 + setvar VAR_TEMP_1, 5 + bufferitemname 0, ITEM_TM13 + setvar VAR_0x8004, 301 + goto MauvilleCity_GameCorner_EventScript_20FF8A + +MauvilleCity_GameCorner_EventScript_20FF8A:: @ 820FF8A + special sub_81398C0 + msgbox MauvilleCity_GameCorner_Text_210629, 5 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_GameCorner_EventScript_210118 + switch VAR_TEMP_1 + case 1, MauvilleCity_GameCorner_EventScript_20FFDD + case 2, MauvilleCity_GameCorner_EventScript_210017 + case 3, MauvilleCity_GameCorner_EventScript_210051 + case 4, MauvilleCity_GameCorner_EventScript_21008B + case 5, MauvilleCity_GameCorner_EventScript_2100C5 + end + +MauvilleCity_GameCorner_EventScript_20FFDD:: @ 820FFDD + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 1500 + goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF + checkitemspace ITEM_TM32, 1 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_GameCorner_EventScript_21010D + takecoins 1500 + giveitem ITEM_TM32, 1 + updatecoinsbox 1, 1 + playse SE_REGI + msgbox MauvilleCity_GameCorner_Text_21071B, 4 + goto MauvilleCity_GameCorner_EventScript_20FECE + end + +MauvilleCity_GameCorner_EventScript_210017:: @ 8210017 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 3500 + goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF + checkitemspace ITEM_TM29, 1 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_GameCorner_EventScript_21010D + takecoins 3500 + giveitem ITEM_TM29, 1 + updatecoinsbox 1, 1 + playse SE_REGI + msgbox MauvilleCity_GameCorner_Text_21071B, 4 + goto MauvilleCity_GameCorner_EventScript_20FECE + end + +MauvilleCity_GameCorner_EventScript_210051:: @ 8210051 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 4000 + goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF + checkitemspace ITEM_TM35, 1 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_GameCorner_EventScript_21010D + takecoins 4000 + giveitem ITEM_TM35, 1 + updatecoinsbox 1, 1 + playse SE_REGI + msgbox MauvilleCity_GameCorner_Text_21071B, 4 + goto MauvilleCity_GameCorner_EventScript_20FECE + end + +MauvilleCity_GameCorner_EventScript_21008B:: @ 821008B + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 4000 + goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF + checkitemspace ITEM_TM24, 1 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_GameCorner_EventScript_21010D + takecoins 4000 + giveitem ITEM_TM24, 1 + updatecoinsbox 1, 1 + playse SE_REGI + msgbox MauvilleCity_GameCorner_Text_21071B, 4 + goto MauvilleCity_GameCorner_EventScript_20FECE + end + +MauvilleCity_GameCorner_EventScript_2100C5:: @ 82100C5 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 4000 + goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF + checkitemspace ITEM_TM13, 1 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_GameCorner_EventScript_21010D + takecoins 4000 + giveitem ITEM_TM13, 1 + updatecoinsbox 1, 1 + playse SE_REGI + msgbox MauvilleCity_GameCorner_Text_21071B, 4 + goto MauvilleCity_GameCorner_EventScript_20FECE + end + +MauvilleCity_GameCorner_EventScript_2100FF:: @ 82100FF + msgbox MauvilleCity_GameCorner_Text_210673, 4 + goto MauvilleCity_GameCorner_EventScript_20FECE + end + +MauvilleCity_GameCorner_EventScript_21010D:: @ 821010D + call MauvilleCity_GameCorner_EventScript_27205E + goto MauvilleCity_GameCorner_EventScript_20FECE + end + +MauvilleCity_GameCorner_EventScript_210118:: @ 8210118 + msgbox MauvilleCity_GameCorner_Text_2106BF, 4 + hidecoinsbox 0, 0 + release + end + +MauvilleCity_GameCorner_EventScript_210125:: @ 8210125 + msgbox MauvilleCity_GameCorner_Text_2109D3, 2 + end + +MauvilleCity_GameCorner_EventScript_21012E:: @ 821012E + msgbox MauvilleCity_GameCorner_Text_210A05, 2 + end + +MauvilleCity_GameCorner_EventScript_210137:: @ 8210137 + lock + faceplayer + checkflag FLAG_0x0E2 + goto_eq MauvilleCity_GameCorner_EventScript_210213 + msgbox MauvilleCity_GameCorner_Text_210750, 5 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_GameCorner_EventScript_210209 + switch VAR_FIRST_POKE + case 0, MauvilleCity_GameCorner_EventScript_21017C + case 1, MauvilleCity_GameCorner_EventScript_2101A6 + case 2, MauvilleCity_GameCorner_EventScript_2101D0 + end + +MauvilleCity_GameCorner_EventScript_21017C:: @ 821017C + bufferdecorationname 1, 88 + checkdecorspace 88 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_GameCorner_EventScript_2101FA + msgbox MauvilleCity_GameCorner_Text_21079C, 4 + givedecoration_std 88 + setflag FLAG_0x0E2 + goto MauvilleCity_GameCorner_EventScript_210213 + end + +MauvilleCity_GameCorner_EventScript_2101A6:: @ 82101A6 + bufferdecorationname 1, 89 + checkdecorspace 89 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_GameCorner_EventScript_2101FA + msgbox MauvilleCity_GameCorner_Text_21079C, 4 + givedecoration_std 89 + setflag FLAG_0x0E2 + goto MauvilleCity_GameCorner_EventScript_210213 + end + +MauvilleCity_GameCorner_EventScript_2101D0:: @ 82101D0 + bufferdecorationname 1, 90 + checkdecorspace 90 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_GameCorner_EventScript_2101FA + msgbox MauvilleCity_GameCorner_Text_21079C, 4 + givedecoration_std 90 + setflag FLAG_0x0E2 + goto MauvilleCity_GameCorner_EventScript_210213 + end + +MauvilleCity_GameCorner_EventScript_2101FA:: @ 82101FA + call MauvilleCity_GameCorner_EventScript_272071 + msgbox MauvilleCity_GameCorner_Text_2107A9, 4 + release + end + +MauvilleCity_GameCorner_EventScript_210209:: @ 8210209 + msgbox MauvilleCity_GameCorner_Text_2107CE, 4 + release + end + +MauvilleCity_GameCorner_EventScript_210213:: @ 8210213 + msgbox MauvilleCity_GameCorner_Text_2107FB, 4 + release + end + +MauvilleCity_GameCorner_EventScript_21021D:: @ 821021D + lock + faceplayer + checkitem ITEM_COIN_CASE, 1 + compare VAR_RESULT, 1 + goto_eq MauvilleCity_GameCorner_EventScript_21023D + msgbox MauvilleCity_GameCorner_Text_210830, 4 + goto MauvilleCity_GameCorner_EventScript_2102A9 + end + +MauvilleCity_GameCorner_EventScript_21023D:: @ 821023D + checkflag FLAG_0x0E1 + goto_eq MauvilleCity_GameCorner_EventScript_21026B + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 1 + goto_if 4, MauvilleCity_GameCorner_EventScript_21026B + setflag FLAG_0x0E1 + givecoins 20 + msgbox MauvilleCity_GameCorner_Text_2108A0, 4 + playse SE_REGI + goto MauvilleCity_GameCorner_EventScript_21026B + end + +MauvilleCity_GameCorner_EventScript_21026B:: @ 821026B + msgbox MauvilleCity_GameCorner_Text_2108EF, 4 + goto MauvilleCity_GameCorner_EventScript_2102A9 + end + +MauvilleCity_GameCorner_EventScript_210279:: @ 8210279 + lock + faceplayer + msgbox MauvilleCity_GameCorner_Text_210932, 4 + goto MauvilleCity_GameCorner_EventScript_2102A9 + end + +MauvilleCity_GameCorner_EventScript_210289:: @ 8210289 + lock + faceplayer + msgbox MauvilleCity_GameCorner_Text_21098E, 4 + goto MauvilleCity_GameCorner_EventScript_2102A9 + end + +MauvilleCity_GameCorner_EventScript_210299:: @ 8210299 + lock + faceplayer + msgbox MauvilleCity_GameCorner_Text_210A51, 4 + goto MauvilleCity_GameCorner_EventScript_2102A9 + end + +MauvilleCity_GameCorner_EventScript_2102A9:: @ 82102A9 + closemessage + applymovement VAR_LAST_TALKED, MauvilleCity_GameCorner_Movement_2725A2 + waitmovement 0 + release + end + +MauvilleCity_GameCorner_EventScript_2102B6:: @ 82102B6 + lock + faceplayer + msgbox MauvilleCity_GameCorner_Text_210A82, 4 + goto MauvilleCity_GameCorner_EventScript_2102A9 + end + +MauvilleCity_GameCorner_EventScript_2102C6:: @ 82102C6 + lock + faceplayer + msgbox MauvilleCity_GameCorner_Text_210B04, 4 + goto MauvilleCity_GameCorner_EventScript_2102A9 + end + +MauvilleCity_GameCorner_EventScript_2102D6:: @ 82102D6 + lockall + checkitem ITEM_COIN_CASE, 1 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_GameCorner_EventScript_210456 + setvar VAR_0x8004, 0 + specialvar VAR_RESULT, sub_8139248 + playslotmachine VAR_RESULT + releaseall + end + +MauvilleCity_GameCorner_EventScript_2102F6:: @ 82102F6 + lockall + checkitem ITEM_COIN_CASE, 1 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_GameCorner_EventScript_210456 + setvar VAR_0x8004, 1 + specialvar VAR_RESULT, sub_8139248 + playslotmachine VAR_RESULT + releaseall + end + +MauvilleCity_GameCorner_EventScript_210316:: @ 8210316 + lockall + checkitem ITEM_COIN_CASE, 1 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_GameCorner_EventScript_210456 + setvar VAR_0x8004, 2 + specialvar VAR_RESULT, sub_8139248 + playslotmachine VAR_RESULT + releaseall + end + +MauvilleCity_GameCorner_EventScript_210336:: @ 8210336 + lockall + checkitem ITEM_COIN_CASE, 1 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_GameCorner_EventScript_210456 + setvar VAR_0x8004, 3 + specialvar VAR_RESULT, sub_8139248 + playslotmachine VAR_RESULT + releaseall + end + +MauvilleCity_GameCorner_EventScript_210356:: @ 8210356 + lockall + checkitem ITEM_COIN_CASE, 1 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_GameCorner_EventScript_210456 + setvar VAR_0x8004, 4 + specialvar VAR_RESULT, sub_8139248 + playslotmachine VAR_RESULT + releaseall + end + +MauvilleCity_GameCorner_EventScript_210376:: @ 8210376 + lockall + checkitem ITEM_COIN_CASE, 1 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_GameCorner_EventScript_210456 + setvar VAR_0x8004, 5 + specialvar VAR_RESULT, sub_8139248 + playslotmachine VAR_RESULT + releaseall + end + +MauvilleCity_GameCorner_EventScript_210396:: @ 8210396 + lockall + checkitem ITEM_COIN_CASE, 1 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_GameCorner_EventScript_210456 + setvar VAR_0x8004, 6 + specialvar VAR_RESULT, sub_8139248 + playslotmachine VAR_RESULT + releaseall + end + +MauvilleCity_GameCorner_EventScript_2103B6:: @ 82103B6 + lockall + checkitem ITEM_COIN_CASE, 1 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_GameCorner_EventScript_210456 + setvar VAR_0x8004, 7 + specialvar VAR_RESULT, sub_8139248 + playslotmachine VAR_RESULT + releaseall + end + +MauvilleCity_GameCorner_EventScript_2103D6:: @ 82103D6 + lockall + checkitem ITEM_COIN_CASE, 1 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_GameCorner_EventScript_210456 + setvar VAR_0x8004, 8 + specialvar VAR_RESULT, sub_8139248 + playslotmachine VAR_RESULT + releaseall + end + +MauvilleCity_GameCorner_EventScript_2103F6:: @ 82103F6 + lockall + checkitem ITEM_COIN_CASE, 1 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_GameCorner_EventScript_210456 + setvar VAR_0x8004, 9 + specialvar VAR_RESULT, sub_8139248 + playslotmachine VAR_RESULT + releaseall + end + +MauvilleCity_GameCorner_EventScript_210416:: @ 8210416 + lockall + checkitem ITEM_COIN_CASE, 1 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_GameCorner_EventScript_210456 + setvar VAR_0x8004, 10 + specialvar VAR_RESULT, sub_8139248 + playslotmachine VAR_RESULT + releaseall + end + +MauvilleCity_GameCorner_EventScript_210436:: @ 8210436 + lockall + checkitem ITEM_COIN_CASE, 1 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_GameCorner_EventScript_210456 + setvar VAR_0x8004, 11 + specialvar VAR_RESULT, sub_8139248 + playslotmachine VAR_RESULT + releaseall + end + +MauvilleCity_GameCorner_EventScript_210456:: @ 8210456 + msgbox MauvilleCity_GameCorner_Text_210C2E, 4 + releaseall + end + +MauvilleCity_GameCorner_Text_210460: @ 8210460 + .string "This is MAUVILLE GAME CORNER.$" + +MauvilleCity_GameCorner_Text_21047E: @ 821047E + .string "Okay, you wanted some COINS for\n" + .string "the games?\p" + .string "But you don’t have a COIN CASE for\n" + .string "stowing the COINS.$" + +MauvilleCity_GameCorner_Text_2104DF: @ 82104DF + .string "Were you looking for COINS?\p" + .string "It’s Â¥1000 for 50 COINS.\n" + .string "Would you like some?$" + +MauvilleCity_GameCorner_Text_210529: @ 8210529 + .string "Thank you very much!\n" + .string "Here are your COINS!$" + +MauvilleCity_GameCorner_Text_210553: @ 8210553 + .string "Um… You don’t appear to have\n" + .string "enough money…$" + +MauvilleCity_GameCorner_Text_21057E: @ 821057E + .string "Oh?\n" + .string "Your COIN CASE is full.$" + +MauvilleCity_GameCorner_Text_21059A: @ 821059A + .string "Oh… You don’t need COINS, then?\n" + .string "Good luck on your adventure!$" + +MauvilleCity_GameCorner_Text_2105D7: @ 82105D7 + .string "Welcome.\p" + .string "You can exchange your COINS for\n" + .string "prizes here.$" + +MauvilleCity_GameCorner_Text_21060D: @ 821060D + .string "Which prize would you like?$" + +MauvilleCity_GameCorner_Text_210629: @ 8210629 + .string "So your choice is\n" + .string "the {STR_VAR_1} {STR_VAR_2}?$" + +MauvilleCity_GameCorner_Text_210646: @ 8210646 + .string "Thank you!\n" + .string "We’ll send it to your PC at home.$" + +MauvilleCity_GameCorner_Text_210673: @ 8210673 + .string "You don’t have enough COINS.$" + +MauvilleCity_GameCorner_Text_210690: @ 8210690 + .string "There isn’t any room available for\n" + .string "placing {STR_VAR_1}.$" + +MauvilleCity_GameCorner_Text_2106BF: @ 82106BF + .string "Oh, is that so? \n" + .string "You need to save some COINS before\l" + .string "coming back here.$" + +MauvilleCity_GameCorner_Text_210705: @ 8210705 + .string "So your choice is {STR_VAR_1}?$" + +MauvilleCity_GameCorner_Text_21071B: @ 821071B + .string "Here you go!$" + +MauvilleCity_GameCorner_Text_210728: @ 8210728 + .string "Oh, you can’t carry any more than that.$" + +MauvilleCity_GameCorner_Text_210750: @ 8210750 + .string "I made a mistake and got two of\n" + .string "the same DOLLS.\p" + .string "Would you like one of them?$" + +MauvilleCity_GameCorner_Text_21079C: @ 821079C + .string "Here you go!$" + +MauvilleCity_GameCorner_Text_2107A9: @ 82107A9 + .string "Huh?\n" + .string "You want it, but not right now?$" + +MauvilleCity_GameCorner_Text_2107CE: @ 82107CE + .string "Oh, don’t be so negative!\n" + .string "You can have this!$" + +MauvilleCity_GameCorner_Text_2107FB: @ 82107FB + .string "There’s a prize I want, but I can’t win\n" + .string "the jackpot.$" + +MauvilleCity_GameCorner_Text_210830: @ 8210830 + .string "Hey, kid, if you want to play here,\n" + .string "you need a COIN CASE.\p" + .string "I think the young lady next door\n" + .string "had one. Go see her!$" + +MauvilleCity_GameCorner_Text_2108A0: @ 82108A0 + .string "My luck can only last so long.\n" + .string "This is too much for me.\l" + .string "Here, take some COINS!$" + +MauvilleCity_GameCorner_Text_2108EF: @ 82108EF + .string "MAUVILLE has something for\n" + .string "everyone.\p" + .string "For me, it’s the GAME CORNER.$" + +MauvilleCity_GameCorner_Text_210932: @ 8210932 + .string "The ROULETTE tables have different\n" + .string "rates.\p" + .string "Check your COINS if you’re going to\n" + .string "pick a table.$" + +MauvilleCity_GameCorner_Text_21098E: @ 821098E + .string "It’s easy to lose track of time in here. \n" + .string "I should get back to work.$" + +MauvilleCity_GameCorner_Text_2109D3: @ 82109D3 + .string "COINS are needed to play here\n" + .string "in the GAME CORNER.$" + +MauvilleCity_GameCorner_Text_210A05: @ 8210A05 + .string "This ROULETTE thing…\n" + .string "It’s rather demanding.\p" + .string "Win or lose, it’s only by luck.$" + +MauvilleCity_GameCorner_Text_210A51: @ 8210A51 + .string "Up to three COINS can be used to play\n" + .string "the SLOTS.$" + +MauvilleCity_GameCorner_Text_210A82: @ 8210A82 + .string "It’s very difficult to make it stop\n" + .string "right on “7.â€\p" + .string "If it stops on “7†during the REEL TIME\n" + .string "bonus game, you’ll receive extra COINS.$" + +MauvilleCity_GameCorner_Text_210B04: @ 8210B04 + .string "Here’s some information for you\n" + .string "about the SLOTS.\p" + .string "The more lightning bolts you stock,\n" + .string "the more REEL TIME chances you get.\p" + .string "In a game with the maximum five\n" + .string "REEL TIME chances…\p" + .string "It is possible to receive four regular\n" + .string "bonuses, then a big bonus.\p" + .string "That would total 660 COINS, but it’s\n" + .string "very difficult to get.$" + +MauvilleCity_GameCorner_Text_210C2E: @ 8210C2E + .string "You can’t play if you don’t have\n" + .string "a COIN CASE.$" + diff --git a/data/maps/MauvilleCity_Gym/events.inc b/data/maps/MauvilleCity_Gym/events.inc new file mode 100644 index 000000000..08c8db444 --- /dev/null +++ b/data/maps/MauvilleCity_Gym/events.inc @@ -0,0 +1,26 @@ +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 + +MauvilleCity_Gym_MapWarps: @ 852FE04 + 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 + 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 + +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 + +MauvilleCity_Gym_MapEvents:: @ 852FE6C + map_events MauvilleCity_Gym_EventObjects, MauvilleCity_Gym_MapWarps, MauvilleCity_Gym_MapCoordEvents, MauvilleCity_Gym_MapBGEvents + diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc new file mode 100644 index 000000000..049833db0 --- /dev/null +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -0,0 +1,442 @@ +MauvilleCity_Gym_MapScripts:: @ 820DD6E + map_script 1, MauvilleCity_Gym_MapScript1_20DD74 + .byte 0 + +MauvilleCity_Gym_MapScript1_20DD74: @ 820DD74 + checkflag FLAG_0x4F2 + goto_eq MauvilleCity_Gym_EventScript_20DEE7 + switch VAR_0x4093 + case 0, MauvilleCity_Gym_EventScript_20DDBA + case 1, MauvilleCity_Gym_EventScript_20DEAF + case 2, MauvilleCity_Gym_EventScript_20DEBD + case 3, MauvilleCity_Gym_EventScript_20DECB + case 4, MauvilleCity_Gym_EventScript_20DED9 + end + +MauvilleCity_Gym_EventScript_20DDBA:: @ 820DDBA + checkflag FLAG_0x063 + goto_eq MauvilleCity_Gym_EventScript_20DDC4 + end + +MauvilleCity_Gym_EventScript_20DDC4:: @ 820DDC4 + setmetatile 3, 11, 577, 1 + setmetatile 3, 12, 585, 1 + setmetatile 3, 13, 592, 1 + setmetatile 4, 10, 546, 0 + setmetatile 5, 10, 547, 0 + setmetatile 4, 11, 554, 1 + setmetatile 5, 11, 555, 1 + setmetatile 7, 10, 546, 0 + setmetatile 8, 10, 547, 0 + setmetatile 7, 11, 554, 1 + setmetatile 8, 11, 555, 1 + setmetatile 4, 13, 560, 0 + setmetatile 5, 13, 561, 0 + setmetatile 4, 14, 568, 0 + setmetatile 5, 14, 569, 0 + setmetatile 1, 10, 560, 0 + setmetatile 2, 10, 561, 0 + setmetatile 1, 11, 568, 0 + setmetatile 2, 11, 569, 0 + setmetatile 6, 8, 578, 1 + setmetatile 6, 9, 538, 0 + setmetatile 6, 10, 593, 0 + setmetatile 4, 6, 560, 0 + setmetatile 5, 6, 561, 0 + setmetatile 4, 7, 568, 0 + setmetatile 5, 7, 569, 0 + end + +MauvilleCity_Gym_EventScript_20DEAF:: @ 820DEAF + setvar VAR_0x8004, 0 + special MauvilleGymSpecial1 + goto MauvilleCity_Gym_EventScript_20DDBA + end + +MauvilleCity_Gym_EventScript_20DEBD:: @ 820DEBD + setvar VAR_0x8004, 1 + special MauvilleGymSpecial1 + goto MauvilleCity_Gym_EventScript_20DDBA + end + +MauvilleCity_Gym_EventScript_20DECB:: @ 820DECB + setvar VAR_0x8004, 2 + special MauvilleGymSpecial1 + goto MauvilleCity_Gym_EventScript_20DDBA + end + +MauvilleCity_Gym_EventScript_20DED9:: @ 820DED9 + setvar VAR_0x8004, 3 + special MauvilleGymSpecial1 + goto MauvilleCity_Gym_EventScript_20DDBA + end + +MauvilleCity_Gym_EventScript_20DEE7:: @ 820DEE7 + special MauvilleGymSpecial3 + end + +MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB + trainerbattle 1, TRAINER_WATTSON_1, 0, MauvilleCity_Gym_Text_20E602, MauvilleCity_Gym_Text_20E734, MauvilleCity_Gym_EventScript_20DF2B + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq MauvilleCity_Gym_EventScript_20DFDE + checkflag FLAG_0x0A7 + goto_if 0, MauvilleCity_Gym_EventScript_20DF8D + compare VAR_0x40BA, 2 + goto_eq MauvilleCity_Gym_EventScript_20DFD4 + msgbox MauvilleCity_Gym_Text_20E8E3, 4 + release + end + +MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B + message MauvilleCity_Gym_Text_20E77F + waitmessage + call MauvilleCity_Gym_EventScript_27207E + msgbox MauvilleCity_Gym_Text_20E7AA, 4 + setvar VAR_0x40D2, 3 + clearflag FLAG_0x2FE + setflag FLAG_0x4F2 + setflag FLAG_BADGE03_GET + addvar VAR_0x4085, 1 + compare VAR_0x4085, 6 + call_if 1, MauvilleCity_Gym_EventScript_271E84 + setvar VAR_0x8008, 3 + call MauvilleCity_Gym_EventScript_271F43 + special MauvilleGymSpecial3 + special DrawWholeMapView + playse SE_KI_GASYAN + call MauvilleCity_Gym_EventScript_20DFB1 + closemessage + delay 30 + playfanfare MUS_ME_TORE_EYE + msgbox MauvilleCity_Gym_Text_20E8B5, 4 + waitfanfare + closemessage + delay 30 + setflag FLAG_0x1D5 + release + end + +MauvilleCity_Gym_EventScript_20DF8D:: @ 820DF8D + giveitem_std ITEM_TM34 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_Gym_EventScript_272054 + msgbox MauvilleCity_Gym_Text_20E844, 4 + setflag FLAG_0x0A7 + release + end + +MauvilleCity_Gym_EventScript_20DFB1:: @ 820DFB1 + giveitem_std ITEM_TM34 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_Gym_EventScript_27205E + msgbox MauvilleCity_Gym_Text_20E844, 4 + setflag FLAG_0x0A7 + return + +MauvilleCity_Gym_EventScript_20DFD4:: @ 820DFD4 + msgbox MauvilleCity_Gym_Text_20E925, 4 + release + end + +MauvilleCity_Gym_EventScript_20DFDE:: @ 820DFDE + trainerbattle 7, TRAINER_WATTSON_1, 0, MauvilleCity_Gym_Text_20E9A7, MauvilleCity_Gym_Text_20EA42, MauvilleCity_Gym_Text_20EAFD + msgbox MauvilleCity_Gym_Text_20EA5E, 6 + end + +MauvilleCity_Gym_EventScript_20DFF9:: @ 820DFF9 + lockall + checkflag FLAG_0x4F2 + goto_eq MauvilleCity_Gym_EventScript_20E0AD + compare VAR_0x4093, 1 + goto_eq MauvilleCity_Gym_EventScript_20E0AD + setvar VAR_0x4093, 1 + setvar VAR_0x8004, 0 + goto MauvilleCity_Gym_EventScript_20E08D + end + +MauvilleCity_Gym_EventScript_20E01E:: @ 820E01E + lockall + checkflag FLAG_0x4F2 + goto_eq MauvilleCity_Gym_EventScript_20E0AD + compare VAR_0x4093, 2 + goto_eq MauvilleCity_Gym_EventScript_20E0AD + setvar VAR_0x4093, 2 + setvar VAR_0x8004, 1 + goto MauvilleCity_Gym_EventScript_20E08D + end + +MauvilleCity_Gym_EventScript_20E043:: @ 820E043 + lockall + checkflag FLAG_0x4F2 + goto_eq MauvilleCity_Gym_EventScript_20E0AD + compare VAR_0x4093, 3 + goto_eq MauvilleCity_Gym_EventScript_20E0AD + setvar VAR_0x4093, 3 + setvar VAR_0x8004, 2 + goto MauvilleCity_Gym_EventScript_20E08D + end + +MauvilleCity_Gym_EventScript_20E068:: @ 820E068 + lockall + checkflag FLAG_0x4F2 + goto_eq MauvilleCity_Gym_EventScript_20E0AD + compare VAR_0x4093, 4 + goto_eq MauvilleCity_Gym_EventScript_20E0AD + setvar VAR_0x4093, 4 + setvar VAR_0x8004, 3 + goto MauvilleCity_Gym_EventScript_20E08D + end + +MauvilleCity_Gym_EventScript_20E08D:: @ 820E08D + special MauvilleGymSpecial2 + special MauvilleGymSpecial1 + special DrawWholeMapView + playse SE_KI_GASYAN + checkflag FLAG_0x063 + goto_eq MauvilleCity_Gym_EventScript_20E0B4 + checkflag FLAG_0x063 + goto_if 0, MauvilleCity_Gym_EventScript_20E0AF + releaseall + end + +MauvilleCity_Gym_EventScript_20E0AD:: @ 820E0AD + releaseall + end + +MauvilleCity_Gym_EventScript_20E0AF:: @ 820E0AF + setflag FLAG_0x063 + releaseall + end + +MauvilleCity_Gym_EventScript_20E0B4:: @ 820E0B4 + clearflag FLAG_0x063 + releaseall + end + +MauvilleCity_Gym_EventScript_20E0B9:: @ 820E0B9 + trainerbattle 0, TRAINER_KIRK, 0, MauvilleCity_Gym_Text_20E2BC, MauvilleCity_Gym_Text_20E2FC + msgbox MauvilleCity_Gym_Text_20E336, 6 + end + +MauvilleCity_Gym_EventScript_20E0D0:: @ 820E0D0 + trainerbattle 0, TRAINER_SHAWN, 0, MauvilleCity_Gym_Text_20E369, MauvilleCity_Gym_Text_20E3A7 + msgbox MauvilleCity_Gym_Text_20E3C1, 6 + end + +MauvilleCity_Gym_EventScript_20E0E7:: @ 820E0E7 + trainerbattle 0, TRAINER_BEN, 0, MauvilleCity_Gym_Text_20E443, MauvilleCity_Gym_Text_20E469 + msgbox MauvilleCity_Gym_Text_20E47E, 6 + end + +MauvilleCity_Gym_EventScript_20E0FE:: @ 820E0FE + trainerbattle 0, TRAINER_VIVIAN, 0, MauvilleCity_Gym_Text_20E4BB, MauvilleCity_Gym_Text_20E4F4 + msgbox MauvilleCity_Gym_Text_20E50F, 6 + end + +MauvilleCity_Gym_EventScript_20E115:: @ 820E115 + trainerbattle 0, TRAINER_ANGELO, 0, MauvilleCity_Gym_Text_20E593, MauvilleCity_Gym_Text_20E5A8 + msgbox MauvilleCity_Gym_Text_20E5C2, 6 + end + +MauvilleCity_Gym_EventScript_20E12C:: @ 820E12C + lock + faceplayer + checkflag FLAG_0x4F2 + goto_eq MauvilleCity_Gym_EventScript_20E141 + msgbox MauvilleCity_Gym_Text_20E17F, 4 + release + end + +MauvilleCity_Gym_EventScript_20E141:: @ 820E141 + msgbox MauvilleCity_Gym_Text_20E283, 4 + release + end + +MauvilleCity_Gym_EventScript_20E14B:: @ 820E14B + lockall + checkflag FLAG_BADGE03_GET + goto_eq MauvilleCity_Gym_EventScript_20E16B + goto MauvilleCity_Gym_EventScript_20E175 + end + +MauvilleCity_Gym_EventScript_20E15B:: @ 820E15B + lockall + checkflag FLAG_BADGE03_GET + goto_eq MauvilleCity_Gym_EventScript_20E16B + goto MauvilleCity_Gym_EventScript_20E175 + end + +MauvilleCity_Gym_EventScript_20E16B:: @ 820E16B + msgbox MauvilleCity_Gym_Text_20E96C, 4 + releaseall + end + +MauvilleCity_Gym_EventScript_20E175:: @ 820E175 + msgbox MauvilleCity_Gym_Text_20E952, 4 + releaseall + end + +MauvilleCity_Gym_Text_20E17F: @ 820E17F + .string "Hey, how’s it going, CHAMPION-\n" + .string "bound {PLAYER}?\p" + .string "WATTSON, the LEADER of MAUVILLE\n" + .string "GYM, uses ELECTRIC-type POKéMON.\p" + .string "If you challenge him with WATER-type\n" + .string "POKéMON, he’ll zap them! Bzzt!\p" + .string "And, he’s put in switch-controlled\n" + .string "doors all over his GYM! Eccentric!\p" + .string "Hey, go for it!$" + +MauvilleCity_Gym_Text_20E283: @ 820E283 + .string "Whoa, you’re electrifying!\n" + .string "You’ve powered the door open!$" + +MauvilleCity_Gym_Text_20E2BC: @ 820E2BC + .string "My electric soul, it’ll shatter your\n" + .string "dreams whole, whoa-yeahah!$" + +MauvilleCity_Gym_Text_20E2FC: @ 820E2FC + .string "That was plugged in, amped up,\n" + .string "over-driven electric, man!$" + +MauvilleCity_Gym_Text_20E336: @ 820E336 + .string "POKéMON and rock, it’s all about heart,\n" + .string "whoa-yeah!$" + +MauvilleCity_Gym_Text_20E369: @ 820E369 + .string "I trained under WATTSON!\n" + .string "There ain’t no way I’ll lose easily!$" + +MauvilleCity_Gym_Text_20E3A7: @ 820E3A7 + .string "Unplugged and turned off…$" + +MauvilleCity_Gym_Text_20E3C1: @ 820E3C1 + .string "WATTSON, our GYM LEADER, has been\n" + .string "around for a long, long time.\p" + .string "He was battling even before your\n" + .string "daddy was born, that tough coot.$" + +MauvilleCity_Gym_Text_20E443: @ 820E443 + .string "This GYM’s got puzzles!\n" + .string "Isn’t it fun?$" + +MauvilleCity_Gym_Text_20E469: @ 820E469 + .string "It’s no fun to lose…$" + +MauvilleCity_Gym_Text_20E47E: @ 820E47E + .string "WATTSON says he likes setting up\n" + .string "little traps with switches.$" + +MauvilleCity_Gym_Text_20E4BB: @ 820E4BB + .string "With my charm and my POKéMON’s moves,\n" + .string "you’ll be shocked!$" + +MauvilleCity_Gym_Text_20E4F4: @ 820E4F4 + .string "I’m shocked by your power!$" + +MauvilleCity_Gym_Text_20E50F: @ 820E50F + .string "I’ve heard that MAUVILLE was founded\n" + .string "by WATTSON.\p" + .string "He was a TRAINER long before we\n" + .string "became TRAINERS.\l" + .string "He must know all sorts of things!$" + +MauvilleCity_Gym_Text_20E593: @ 820E593 + .string "I love shiny things!$" + +MauvilleCity_Gym_Text_20E5A8: @ 820E5A8 + .string "Oh…\n" + .string "My eyes are frazzled…$" + +MauvilleCity_Gym_Text_20E5C2: @ 820E5C2 + .string "MAUVILLE GYM’s WATTSON has a shiny\n" + .string "forehead. It makes me happy!$" + +MauvilleCity_Gym_Text_20E602: @ 820E602 + .string "I’ve given up on my plans to convert\n" + .string "the city, I have.\p" + .string "And so, I put my time into making\n" + .string "door traps in my GYM.\p" + .string "Oh? Now, what are you doing here?\p" + .string "What’s that? You say you’ve gotten\n" + .string "past all my rigged doors?\p" + .string "Wahahahah!\n" + .string "Now, that is amusing!\p" + .string "Then, I, WATTSON, the LEADER of\n" + .string "MAUVILLE GYM, shall electrify you!$" + +MauvilleCity_Gym_Text_20E734: @ 820E734 + .string "Wahahahah!\n" + .string "Fine, I lost!\p" + .string "You ended up giving me a thrill!\n" + .string "Take this BADGE!$" + +MauvilleCity_Gym_Text_20E77F: @ 820E77F + .string "{PLAYER} received the DYNAMO BADGE\n" + .string "from WATTSON.$" + +MauvilleCity_Gym_Text_20E7AA: @ 820E7AA + .string "With the DYNAMO BADGE, POKéMON can\n" + .string "use ROCK SMASH out of battle.\p" + .string "And, it will make your POKéMON a little\n" + .string "bit faster, too.\p" + .string "Hmm…\n" + .string "You should take this, too!$" + +MauvilleCity_Gym_Text_20E844: @ 820E844 + .string "That TM34 there contains SHOCK WAVE.\p" + .string "It’s a trustworthy move that never\n" + .string "misses! You can count on it!\p" + .string "… … … … … …$" + +MauvilleCity_Gym_Text_20E8B5: @ 820E8B5 + .string "Registered GYM LEADER WATTSON\n" + .string "in the POKéNAV.$" + +MauvilleCity_Gym_Text_20E8E3: @ 820E8E3 + .string "I swell with optimism, seeing a promising\n" + .string "young TRAINER like you!$" + +MauvilleCity_Gym_Text_20E925: @ 820E925 + .string "Wahahahah!\n" + .string "Go forth and endeavor, youngster!$" + +MauvilleCity_Gym_Text_20E952: @ 820E952 + .string "MAUVILLE CITY POKéMON GYM$" + +MauvilleCity_Gym_Text_20E96C: @ 820E96C + .string "MAUVILLE CITY POKéMON GYM\p" + .string "WATTSON’S CERTIFIED TRAINERS:\n" + .string "{PLAYER}$" + +MauvilleCity_Gym_Text_20E9A7: @ 820E9A7 + .string "WATTSON: Ah-ha! Here at last!\n" + .string "I know what you want.\l" + .string "You want to battle my POKéMON!\p" + .string "Wahahahaha!\p" + .string "I’ll make sparks fly from you!\n" + .string "Don’t say I didn’t warn you!$" + +MauvilleCity_Gym_Text_20EA42: @ 820EA42 + .string "Oof…\n" + .string "Our batteries ran dry…$" + +MauvilleCity_Gym_Text_20EA5E: @ 820EA5E + .string "WATTSON: We’ll have to recharge our\n" + .string "batteries again.\p" + .string "When we’re fully charged up, we’ll\n" + .string "gladly accept your challenge.\p" + .string "So, come back again sometime,\n" + .string "won’t you?$" + +MauvilleCity_Gym_Text_20EAFD: @ 820EAFD + .string "WATTSON: Ah-ha! Here at last!\n" + .string "I know what you want.\l" + .string "You want to battle my POKéMON!\p" + .string "Wahahahaha!\p" + .string "Oops! Wait!\n" + .string "You’ve only one POKéMON with you!\p" + .string "Come see me with two or more\n" + .string "POKéMON, all right?$" + diff --git a/data/maps/MauvilleCity_House1/events.inc b/data/maps/MauvilleCity_House1/events.inc new file mode 100644 index 000000000..2590e33b9 --- /dev/null +++ b/data/maps/MauvilleCity_House1/events.inc @@ -0,0 +1,10 @@ +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 + +MauvilleCity_House1_MapWarps: @ 852FF04 + 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/MauvilleCity_House1/scripts.inc b/data/maps/MauvilleCity_House1/scripts.inc new file mode 100644 index 000000000..b36e116db --- /dev/null +++ b/data/maps/MauvilleCity_House1/scripts.inc @@ -0,0 +1,47 @@ +MauvilleCity_House1_MapScripts:: @ 820F975 + .byte 0 + +MauvilleCity_House1_EventScript_20F976:: @ 820F976 + lock + faceplayer + checkflag FLAG_0x06B + goto_eq MauvilleCity_House1_EventScript_20F9A5 + msgbox MauvilleCity_House1_Text_20F9AF, 4 + giveitem_std ITEM_HM06 + setflag FLAG_0x06B + setflag FLAG_0x34B + msgbox MauvilleCity_House1_Text_20FAA9, 4 + release + end + +MauvilleCity_House1_EventScript_20F9A5:: @ 820F9A5 + msgbox MauvilleCity_House1_Text_20FB67, 4 + release + end + +MauvilleCity_House1_Text_20F9AF: @ 820F9AF + .string "Woohoo!\p" + .string "I hear people call me the ROCK SMASH\n" + .string "GUY, but I find that sort of degrading.\p" + .string "I think I deserve a bit more respect,\n" + .string "like maybe the ROCK SMASH DUDE.\p" + .string "Woohoo!\p" + .string "Anyways, your POKéMON look pretty\n" + .string "strong.\p" + .string "I like that!\n" + .string "Here, take this HIDDEN MACHINE!$" + +MauvilleCity_House1_Text_20FAA9: @ 820FAA9 + .string "That HM contains ROCK SMASH.\p" + .string "If you come across large boulders\n" + .string "that block your path…\p" + .string "Well, use that HM move and smash\n" + .string "them right out of your way!\p" + .string "Yes, sir! Smash rocks aside, I say!\n" + .string "Woohoo!$" + +MauvilleCity_House1_Text_20FB67: @ 820FB67 + .string "Oh, yes, if you smash a rock, a POKéMON\n" + .string "could come flying out of hiding.\p" + .string "Woohoo!$" + diff --git a/data/maps/MauvilleCity_House2/events.inc b/data/maps/MauvilleCity_House2/events.inc new file mode 100644 index 000000000..f8e04f5ea --- /dev/null +++ b/data/maps/MauvilleCity_House2/events.inc @@ -0,0 +1,10 @@ +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 + +MauvilleCity_House2_MapWarps: @ 85301A4 + 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/MauvilleCity_House2/scripts.inc b/data/maps/MauvilleCity_House2/scripts.inc new file mode 100644 index 000000000..7a1a1cad1 --- /dev/null +++ b/data/maps/MauvilleCity_House2/scripts.inc @@ -0,0 +1,69 @@ +MauvilleCity_House2_MapScripts:: @ 8210C5C + .byte 0 + +MauvilleCity_House2_EventScript_210C5D:: @ 8210C5D + lock + faceplayer + checkflag FLAG_0x102 + goto_eq MauvilleCity_House2_EventScript_210CDA + msgbox MauvilleCity_House2_Text_210CEE, 4 + checkitem ITEM_HARBOR_MAIL, 1 + compare VAR_RESULT, 1 + goto_eq MauvilleCity_House2_EventScript_210C82 + release + end + +MauvilleCity_House2_EventScript_210C82:: @ 8210C82 + playse SE_PIN + applymovement VAR_LAST_TALKED, MauvilleCity_House2_Movement_272598 + waitmovement 0 + applymovement VAR_LAST_TALKED, MauvilleCity_House2_Movement_27259A + waitmovement 0 + msgbox MauvilleCity_House2_Text_210D76, 5 + compare VAR_RESULT, 1 + goto_eq MauvilleCity_House2_EventScript_210CB8 + compare VAR_RESULT, 0 + goto_eq MauvilleCity_House2_EventScript_210CE4 + end + +MauvilleCity_House2_EventScript_210CB8:: @ 8210CB8 + msgbox MauvilleCity_House2_Text_210DB3, 4 + takeitem ITEM_HARBOR_MAIL, 1 + giveitem_std ITEM_COIN_CASE + setflag FLAG_0x102 + goto MauvilleCity_House2_EventScript_210CDA + end + +MauvilleCity_House2_EventScript_210CDA:: @ 8210CDA + msgbox MauvilleCity_House2_Text_210DE7, 4 + release + end + +MauvilleCity_House2_EventScript_210CE4:: @ 8210CE4 + msgbox MauvilleCity_House2_Text_210E16, 4 + release + end + +MauvilleCity_House2_Text_210CEE: @ 8210CEE + .string "If I had a BIKE, it’d be easy to cycle to\n" + .string "SLATEPORT for some shopping.\p" + .string "I’d be able to buy HARBOR MAIL at the\n" + .string "POKéMON MART in SLATEPORT…$" + +MauvilleCity_House2_Text_210D76: @ 8210D76 + .string "Oh! You have HARBOR MAIL?\n" + .string "Will you trade it for a COIN CASE?$" + +MauvilleCity_House2_Text_210DB3: @ 8210DB3 + .string "Oh, I’m so happy!\n" + .string "Okay, I’ll trade you a COIN CASE!$" + +MauvilleCity_House2_Text_210DE7: @ 8210DE7 + .string "That COIN CASE can be used\n" + .string "at the GAME CORNER.$" + +MauvilleCity_House2_Text_210E16: @ 8210E16 + .string "Oh, that’s disappointing.\p" + .string "A COIN CASE is needed for the\n" + .string "GAME CORNER.$" + diff --git a/data/maps/MauvilleCity_Mart/events.inc b/data/maps/MauvilleCity_Mart/events.inc new file mode 100644 index 000000000..f67840783 --- /dev/null +++ b/data/maps/MauvilleCity_Mart/events.inc @@ -0,0 +1,12 @@ +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 + +MauvilleCity_Mart_MapWarps: @ 8530358 + 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/MauvilleCity_Mart/scripts.inc b/data/maps/MauvilleCity_Mart/scripts.inc new file mode 100644 index 000000000..56ee9497f --- /dev/null +++ b/data/maps/MauvilleCity_Mart/scripts.inc @@ -0,0 +1,53 @@ +MauvilleCity_Mart_MapScripts:: @ 82110E5 + .byte 0 + +MauvilleCity_Mart_EventScript_2110E6:: @ 82110E6 + lock + faceplayer + message gUnknown_08272A21 + waitmessage + pokemart MauvilleCity_Mart_Pokemart_211100 + msgbox gUnknown_08272A3F, 4 + release + end + + .align 2 +MauvilleCity_Mart_Pokemart_211100: @ 8211100 + .2byte ITEM_POKE_BALL + .2byte ITEM_GREAT_BALL + .2byte ITEM_SUPER_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_AWAKENING + .2byte ITEM_X_SPEED + .2byte ITEM_X_ATTACK + .2byte ITEM_X_DEFEND + .2byte ITEM_GUARD_SPEC + .2byte ITEM_DIRE_HIT + .2byte ITEM_X_ACCURACY + .2byte ITEM_NONE + release + end + +MauvilleCity_Mart_EventScript_21111C:: @ 821111C + msgbox MauvilleCity_Mart_Text_21112E, 2 + end + +MauvilleCity_Mart_EventScript_211125:: @ 8211125 + msgbox MauvilleCity_Mart_Text_2111D8, 2 + end + +MauvilleCity_Mart_Text_21112E: @ 821112E + .string "There are items that temporarily\n" + .string "elevate the stats of POKéMON.\p" + .string "The ones I know you use in battle\n" + .string "are X ATTACK and X DEFEND…\p" + .string "I do believe that there are others\n" + .string "like them.$" + +MauvilleCity_Mart_Text_2111D8: @ 82111D8 + .string "Use a certain move, or use an item\n" + .string "instead…\p" + .string "The TRAINER’s decisions determine how\n" + .string "battles turn out, I think.$" + diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/events.inc b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..adab7d3e4 --- /dev/null +++ b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc @@ -0,0 +1,15 @@ +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 + +MauvilleCity_PokemonCenter_1F_MapWarps: @ 8530240 + 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/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..fb76a5fc7 --- /dev/null +++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc @@ -0,0 +1,54 @@ +MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8210E5B + map_script 3, MauvilleCity_PokemonCenter_1F_MapScript1_210E66 + map_script 5, MauvilleCity_PokemonCenter_1F_MapScript1_277C30 + .byte 0 + +MauvilleCity_PokemonCenter_1F_MapScript1_210E66: @ 8210E66 + setrespawn 5 + call MauvilleCity_PokemonCenter_1F_EventScript_2718DE + goto MauvilleCity_PokemonCenter_1F_EventScript_210E74 + end + +MauvilleCity_PokemonCenter_1F_EventScript_210E74:: @ 8210E74 + special ScrSpecial_SetMauvilleOldManEventObjGfx + end + +MauvilleCity_PokemonCenter_1F_EventScript_210E78:: @ 8210E78 + setvar VAR_0x800B, 1 + call MauvilleCity_PokemonCenter_1F_EventScript_27191E + waitmessage + waitbuttonpress + release + end + +MauvilleCity_PokemonCenter_1F_EventScript_210E86:: @ 8210E86 + msgbox MauvilleCity_PokemonCenter_1F_Text_210EA1, 2 + end + +MauvilleCity_PokemonCenter_1F_EventScript_210E8F:: @ 8210E8F + msgbox MauvilleCity_PokemonCenter_1F_Text_210F06, 2 + end + +MauvilleCity_PokemonCenter_1F_EventScript_210E98:: @ 8210E98 + msgbox MauvilleCity_PokemonCenter_1F_Text_210F8A, 2 + end + +MauvilleCity_PokemonCenter_1F_Text_210EA1: @ 8210EA1 + .string "That man over there, he says weird\n" + .string "things!\p" + .string "He’s funny in a weird way.\n" + .string "I doubt I’ll forget about him!$" + +MauvilleCity_PokemonCenter_1F_Text_210F06: @ 8210F06 + .string "When I accessed the RECORD CORNER,\n" + .string "the data for what’s hot in DEWFORD\l" + .string "got updated.\p" + .string "Now that bit of data is the same\n" + .string "as my friend’s!$" + +MauvilleCity_PokemonCenter_1F_Text_210F8A: @ 8210F8A + .string "A RECORD CORNER opened upstairs in\n" + .string "the POKéMON CENTER.\p" + .string "I don’t know what it’s about, but it\n" + .string "sounds fun. I’ll go check it out!$" + diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/events.inc b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..c3a0c4990 --- /dev/null +++ b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc @@ -0,0 +1,15 @@ +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 + +MauvilleCity_PokemonCenter_2F_MapWarps: @ 85302E4 + 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/MauvilleCity_PokemonCenter_2F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..c430b4440 --- /dev/null +++ b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc @@ -0,0 +1,31 @@ +MauvilleCity_PokemonCenter_2F_MapScripts:: @ 8211008 + map_script 2, MauvilleCity_PokemonCenter_2F_MapScript2_276C3B + map_script 4, MauvilleCity_PokemonCenter_2F_MapScript2_276B6C + map_script 1, MauvilleCity_PokemonCenter_2F_MapScript1_276BBE + map_script 3, MauvilleCity_PokemonCenter_2F_MapScript1_276ACF + .byte 0 + +MauvilleCity_PokemonCenter_2F_EventScript_21101D:: @ 821101D + call OldaleTown_PokemonCenter_2F_EventScript_276EB7 + end + +MauvilleCity_PokemonCenter_2F_EventScript_211023:: @ 8211023 + call OldaleTown_PokemonCenter_2F_EventScript_2770B2 + end + +MauvilleCity_PokemonCenter_2F_EventScript_211029:: @ 8211029 + call OldaleTown_PokemonCenter_2F_EventScript_2771DB + end + +MauvilleCity_PokemonCenter_2F_EventScript_21102F:: @ 821102F + msgbox MauvilleCity_PokemonCenter_2F_Text_211038, 2 + end + +MauvilleCity_PokemonCenter_2F_Text_211038: @ 8211038 + .string "Did you know that you can link battle\n" + .string "at the COLOSSEUM here?\p" + .string "They put up your record on the wall\n" + .string "for everyone to see.\p" + .string "It’s embarrassing if you lose more\n" + .string "often than you win…$" + diff --git a/data/maps/MeteorFalls_1F_1R/events.inc b/data/maps/MeteorFalls_1F_1R/events.inc new file mode 100644 index 000000000..977559950 --- /dev/null +++ b/data/maps/MeteorFalls_1F_1R/events.inc @@ -0,0 +1,29 @@ +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 + +MeteorFalls_1F_1R_MapWarps: @ 8534064 + 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 + +MeteorFalls_1F_1R_MapBGEvents: @ 85340A4 + bg_event 9, 58, 0, 0, 0, 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_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc new file mode 100644 index 000000000..b786dc961 --- /dev/null +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -0,0 +1,312 @@ +MeteorFalls_1F_1R_MapScripts:: @ 822BD2A + map_script 1, MeteorFalls_1F_1R_MapScript1_22BD30 + .byte 0 + +MeteorFalls_1F_1R_MapScript1_22BD30: @ 822BD30 + checkflag FLAG_SYS_GAME_CLEAR + call_if 1, MeteorFalls_1F_1R_EventScript_22BD3A + end + +MeteorFalls_1F_1R_EventScript_22BD3A:: @ 822BD3A + setmetatile 4, 1, 582, 1 + setmetatile 3, 2, 589, 1 + setmetatile 4, 2, 590, 0 + setmetatile 5, 2, 591, 1 + return + +MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F + lockall + playbgm MUS_MGM0, 0 + applymovement 255, MeteorFalls_1F_1R_Movement_2725B0 + waitmovement 0 + delay 30 + applymovement 5, MeteorFalls_1F_1R_Movement_2725B4 + waitmovement 0 + msgbox MeteorFalls_1F_1R_Text_22BF47, 4 + closemessage + applymovement 5, MeteorFalls_1F_1R_Movement_2725A6 + applymovement 6, MeteorFalls_1F_1R_Movement_2725A6 + waitmovement 0 + playse SE_PIN + applymovement 5, MeteorFalls_1F_1R_Movement_272598 + waitmovement 0 + applymovement 5, MeteorFalls_1F_1R_Movement_27259A + waitmovement 0 + msgbox MeteorFalls_1F_1R_Text_22BF84, 4 + closemessage + applymovement 5, MeteorFalls_1F_1R_Movement_22BEC0 + waitmovement 0 + msgbox MeteorFalls_1F_1R_Text_22BFE4, 4 + closemessage + applymovement 255, MeteorFalls_1F_1R_Movement_2725A4 + applymovement 5, MeteorFalls_1F_1R_Movement_2725A4 + applymovement 6, MeteorFalls_1F_1R_Movement_2725A4 + waitmovement 0 + addobject 7 + addobject 8 + addobject 9 + playbgm MUS_AQA_0, 0 + applymovement 7, MeteorFalls_1F_1R_Movement_22BED9 + applymovement 8, MeteorFalls_1F_1R_Movement_22BEE0 + applymovement 9, MeteorFalls_1F_1R_Movement_22BEE8 + waitmovement 0 + applymovement 5, MeteorFalls_1F_1R_Movement_2725A4 + applymovement 6, MeteorFalls_1F_1R_Movement_2725A4 + waitmovement 0 + msgbox MeteorFalls_1F_1R_Text_22C04E, 4 + closemessage + applymovement 255, MeteorFalls_1F_1R_Movement_22BF1D + applymovement 5, MeteorFalls_1F_1R_Movement_22BEC4 + applymovement 6, MeteorFalls_1F_1R_Movement_22BECE + waitmovement 0 + removeobject 5 + removeobject 6 + applymovement 7, MeteorFalls_1F_1R_Movement_22BEF8 + waitmovement 0 + msgbox MeteorFalls_1F_1R_Text_22C11C, 4 + closemessage + applymovement 8, MeteorFalls_1F_1R_Movement_22BF08 + applymovement 9, MeteorFalls_1F_1R_Movement_22BF18 + waitmovement 0 + msgbox MeteorFalls_1F_1R_Text_22C268, 4 + applymovement 7, MeteorFalls_1F_1R_Movement_2725AA + waitmovement 0 + msgbox MeteorFalls_1F_1R_Text_22C292, 4 + applymovement 7, MeteorFalls_1F_1R_Movement_2725A4 + waitmovement 0 + msgbox MeteorFalls_1F_1R_Text_22C2FC, 4 + closemessage + applymovement 7, MeteorFalls_1F_1R_Movement_22BEF0 + applymovement 8, MeteorFalls_1F_1R_Movement_22BEFE + applymovement 9, MeteorFalls_1F_1R_Movement_22BF0D + waitmovement 0 + fadedefaultbgm + removeobject 7 + removeobject 8 + removeobject 9 + setflag FLAG_0x333 + setflag FLAG_0x0CF + setflag FLAG_0x2FF + setvar VAR_0x40BF, 1 + releaseall + end + +MeteorFalls_1F_1R_Movement_22BEC0: @ 822BEC0 + walk_right + walk_right + walk_in_place_fastest_up + step_end + +MeteorFalls_1F_1R_Movement_22BEC4: @ 822BEC4 + 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 + 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 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + step_end + +MeteorFalls_1F_1R_Movement_22BEE0: @ 822BEE0 + delay_16 + delay_16 + walk_right + walk_right + walk_right + walk_right + walk_right + step_end + +MeteorFalls_1F_1R_Movement_22BEE8: @ 822BEE8 + delay_16 + delay_16 + walk_right + walk_right + walk_right + walk_right + walk_right + step_end + +MeteorFalls_1F_1R_Movement_22BEF0: @ 822BEF0 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + step_end + +MeteorFalls_1F_1R_Movement_22BEF8: @ 822BEF8 + walk_right + walk_right + walk_up + walk_up + walk_in_place_fastest_left + step_end + +MeteorFalls_1F_1R_Movement_22BEFE: @ 822BEFE + 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 + walk_right + walk_right + walk_right + walk_in_place_fastest_up + step_end + +MeteorFalls_1F_1R_Movement_22BF0D: @ 822BF0D + 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 + walk_right + walk_right + walk_right + walk_in_place_fastest_up + step_end + +MeteorFalls_1F_1R_Movement_22BF1D: @ 822BF1D + 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 + lock + faceplayer + checkflag FLAG_0x0F4 + goto_eq MeteorFalls_1F_1R_EventScript_22BF3D + setflag FLAG_0x0F4 + msgbox MeteorFalls_1F_1R_Text_22C342, 4 + release + end + +MeteorFalls_1F_1R_EventScript_22BF3D:: @ 822BF3D + msgbox MeteorFalls_1F_1R_Text_22C47D, 4 + release + end + +MeteorFalls_1F_1R_Text_22BF47: @ 822BF47 + .string "Hehehe!\p" + .string "With this METEORITE, that thing in\n" + .string "MT. CHIMNEY will…$" + +MeteorFalls_1F_1R_Text_22BF84: @ 822BF84 + .string "Heh?\p" + .string "I don’t know who you are, but if you get\n" + .string "in the way of TEAM MAGMA, don’t\l" + .string "expect any mercy!$" + +MeteorFalls_1F_1R_Text_22BFE4: @ 822BFE4 + .string "Hold it right there, TEAM MAGMA!\p" + .string "You’re badly mistaken if you think you\n" + .string "can have your way with the world!$" + +MeteorFalls_1F_1R_Text_22C04E: @ 822C04E + .string "Hehehe!\n" + .string "Even TEAM AQUA joins us!\p" + .string "But it’s too much trouble to deal with\n" + .string "you all…\p" + .string "Heh, it doesn’t matter!\p" + .string "We’ve got the METEORITE, so off to\n" + .string "MT. CHIMNEY we go!\p" + .string "Hehehe! Be seeing you, you TEAM\n" + .string "AQUA dingbats!$" + +MeteorFalls_1F_1R_Text_22C11C: @ 822C11C + .string "ARCHIE: Didn’t I see you before?\n" + .string "At SLATEPORT’s MUSEUM?\p" + .string "Ah, so your name is {PLAYER}.\p" + .string "At the time, I thought you were one\n" + .string "of TEAM MAGMA’s goons.\p" + .string "Humph…\n" + .string "You’re one odd kid.\p" + .string "TEAM MAGMA is a dangerous group of\n" + .string "total fanatics.\p" + .string "They engage in destruction, claiming\n" + .string "to expand the land mass.\p" + .string "They are the rivals to us,\n" + .string "the sea-loving TEAM AQUA!$" + +MeteorFalls_1F_1R_Text_22C268: @ 822C268 + .string "BOSS, we should give chase to\n" + .string "TEAM MAGMA…$" + +MeteorFalls_1F_1R_Text_22C292: @ 822C292 + .string "ARCHIE: Yes, yes, we must!\n" + .string "We’ve got to hurry.\p" + .string "There’s no telling what TEAM MAGMA\n" + .string "will do at MT. CHIMNEY!$" + +MeteorFalls_1F_1R_Text_22C2FC: @ 822C2FC + .string "ARCHIE: {PLAYER}, you should keep\n" + .string "an eye out for TEAM MAGMA, too.\p" + .string "Farewell!$" + +MeteorFalls_1F_1R_Text_22C342: @ 822C342 + .string "I… I’m COZMO…\n" + .string "I’m a PROFESSOR…\p" + .string "TEAM MAGMA asked me to guide them\n" + .string "to METEOR FALLS…\p" + .string "But they tricked me.\n" + .string "They even took my METEORITE away…\p" + .string "And then another similar bunch,\n" + .string "TEAM AQUA showed up.\p" + .string "After that…\n" + .string "I don’t understand any of it.\p" + .string "But that TEAM MAGMA…\p" + .string "What are they going to do with that\n" + .string "METEORITE at MT. CHIMNEY?$" + +MeteorFalls_1F_1R_Text_22C47D: @ 822C47D + .string "PROF. COZMO: But that TEAM MAGMA…\p" + .string "What are they going to do with that\n" + .string "METEORITE at MT. CHIMNEY?$" + diff --git a/data/maps/MeteorFalls_1F_2R/events.inc b/data/maps/MeteorFalls_1F_2R/events.inc new file mode 100644 index 000000000..0436851c5 --- /dev/null +++ b/data/maps/MeteorFalls_1F_2R/events.inc @@ -0,0 +1,17 @@ +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 + +MeteorFalls_1F_2R_MapWarps: @ 853410C + 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 + +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/MeteorFalls_1F_2R/scripts.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc new file mode 100644 index 000000000..4f4ab7c6b --- /dev/null +++ b/data/maps/MeteorFalls_1F_2R/scripts.inc @@ -0,0 +1,195 @@ +MeteorFalls_1F_2R_MapScripts:: @ 822C4DD + .byte 0 + +MeteorFalls_1F_2R_EventScript_22C4DE:: @ 822C4DE + trainerbattle 2, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_22C608, MeteorFalls_1F_2R_Text_22C678, MeteorFalls_1F_2R_EventScript_22C50A + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq MeteorFalls_1F_2R_EventScript_22C529 + msgbox MeteorFalls_1F_2R_Text_22C6A3, 4 + release + end + +MeteorFalls_1F_2R_EventScript_22C50A:: @ 822C50A + special sub_80B4808 + waitmovement 0 + msgbox MeteorFalls_1F_2R_Text_22C6F6, 4 + setvar VAR_0x8004, 392 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 392 + callstd 8 + release + end + +MeteorFalls_1F_2R_EventScript_22C529:: @ 822C529 + trainerbattle 5, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_22C73F, MeteorFalls_1F_2R_Text_22C7AD + msgbox MeteorFalls_1F_2R_Text_22C7D8, 6 + end + +MeteorFalls_1F_2R_EventScript_22C540:: @ 822C540 + trainerbattle 6, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22C843, MeteorFalls_1F_2R_Text_22C89C, MeteorFalls_1F_2R_Text_22C92B, MeteorFalls_1F_2R_EventScript_22C570 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq MeteorFalls_1F_2R_EventScript_22C589 + msgbox MeteorFalls_1F_2R_Text_22C8C1, 4 + release + end + +MeteorFalls_1F_2R_EventScript_22C570:: @ 822C570 + msgbox MeteorFalls_1F_2R_Text_22C99C, 4 + setvar VAR_0x8004, 681 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 681 + callstd 8 + release + end + +MeteorFalls_1F_2R_EventScript_22C589:: @ 822C589 + trainerbattle 7, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22CB47, MeteorFalls_1F_2R_Text_22CBA0, MeteorFalls_1F_2R_Text_22CC27 + msgbox MeteorFalls_1F_2R_Text_22CBC5, 6 + end + +MeteorFalls_1F_2R_EventScript_22C5A4:: @ 822C5A4 + trainerbattle 6, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22C9E6, MeteorFalls_1F_2R_Text_22CA44, MeteorFalls_1F_2R_Text_22CACD, MeteorFalls_1F_2R_EventScript_22C5D4 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq MeteorFalls_1F_2R_EventScript_22C5ED + msgbox MeteorFalls_1F_2R_Text_22CA70, 4 + release + end + +MeteorFalls_1F_2R_EventScript_22C5D4:: @ 822C5D4 + msgbox MeteorFalls_1F_2R_Text_22C99C, 4 + setvar VAR_0x8004, 681 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 681 + callstd 8 + release + end + +MeteorFalls_1F_2R_EventScript_22C5ED:: @ 822C5ED + trainerbattle 7, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22CC98, MeteorFalls_1F_2R_Text_22CD08, MeteorFalls_1F_2R_Text_22CDAB + msgbox MeteorFalls_1F_2R_Text_22CD34, 6 + end + +MeteorFalls_1F_2R_Text_22C608: @ 822C608 + .string "This is where we DRAGON users do our\n" + .string "training.\p" + .string "The CHAMPION even visits.\n" + .string "Now do you see how special it is here?$" + +MeteorFalls_1F_2R_Text_22C678: @ 822C678 + .string "Urgh!\n" + .string "I didn’t expect you to be so strong!$" + +MeteorFalls_1F_2R_Text_22C6A3: @ 822C6A3 + .string "The road ahead remains long and harsh.\p" + .string "When will my POKéMON and I become\n" + .string "the best?$" + +MeteorFalls_1F_2R_Text_22C6F6: @ 822C6F6 + .string "I want to know more about your power.\n" + .string "Let me register you in my POKéNAV.$" + +MeteorFalls_1F_2R_Text_22C73F: @ 822C73F + .string "Since we met, we have trained hard\n" + .string "with our sights on number one.\p" + .string "Help us see how much stronger we’ve\n" + .string "become!$" + +MeteorFalls_1F_2R_Text_22C7AD: @ 822C7AD + .string "Urgh!\n" + .string "I didn’t expect you to be so strong!$" + +MeteorFalls_1F_2R_Text_22C7D8: @ 822C7D8 + .string "You’ve obviously kept up your\n" + .string "POKéMON training.\p" + .string "So long as you remain strong, I, too,\n" + .string "can become stronger!$" + +MeteorFalls_1F_2R_Text_22C843: @ 822C843 + .string "JOHN: We’ve always battled POKéMON\n" + .string "together as a twosome.\l" + .string "We’ve confidence in ourselves.$" + +MeteorFalls_1F_2R_Text_22C89C: @ 822C89C + .string "JOHN: Oh, my.\n" + .string "We’ve lost, dear wife.$" + +MeteorFalls_1F_2R_Text_22C8C1: @ 822C8C1 + .string "JOHN: We’ve been married for\n" + .string "fifty years.\p" + .string "Come to think of it, I’ve yet to beat\n" + .string "my dear wife in a battle.$" + +MeteorFalls_1F_2R_Text_22C92B: @ 822C92B + .string "JOHN: Well, well, what a young TRAINER!\p" + .string "Will you battle with us? If so, you’ll\n" + .string "have to return with more POKéMON.$" + +MeteorFalls_1F_2R_Text_22C99C: @ 822C99C + .string "JOHN: Young TRAINER, if the chance\n" + .string "arises, will you battle with us again?$" + +MeteorFalls_1F_2R_Text_22C9E6: @ 822C9E6 + .string "JAY: We’ve been married for\n" + .string "fifty years.\p" + .string "The bond we share as a couple could\n" + .string "never be broken.$" + +MeteorFalls_1F_2R_Text_22CA44: @ 822CA44 + .string "JAY: Oh, dear.\n" + .string "We’ve lost, my dear husband.$" + +MeteorFalls_1F_2R_Text_22CA70: @ 822CA70 + .string "JAY: Fifty years of marriage…\p" + .string "If we ever argued, we always settled\n" + .string "it with a POKéMON battle…$" + +MeteorFalls_1F_2R_Text_22CACD: @ 822CACD + .string "JAY: Well, well, aren’t you a young\n" + .string "TRAINER?\p" + .string "If you’d care to battle with us, you’ll\n" + .string "have to come back with more POKéMON.$" + +MeteorFalls_1F_2R_Text_22CB47: @ 822CB47 + .string "JOHN: We’ve always battled POKéMON\n" + .string "together as a twosome.\l" + .string "We’ve confidence in ourselves.$" + +MeteorFalls_1F_2R_Text_22CBA0: @ 822CBA0 + .string "JOHN: Oh, my.\n" + .string "We’ve lost, dear wife.$" + +MeteorFalls_1F_2R_Text_22CBC5: @ 822CBC5 + .string "JOHN: Married for fifty years…\p" + .string "On reflection, the dear wife and I,\n" + .string "we battled day in and day out…$" + +MeteorFalls_1F_2R_Text_22CC27: @ 822CC27 + .string "JOHN: Well, well, what a young TRAINER!\p" + .string "Will you battle with us? If so, you’ll\n" + .string "have to return with more POKéMON.$" + +MeteorFalls_1F_2R_Text_22CC98: @ 822CC98 + .string "JAY: We’ve been married for\n" + .string "fifty years.\p" + .string "We’ve supported each other all that\n" + .string "time. We’ve made ourselves strong.$" + +MeteorFalls_1F_2R_Text_22CD08: @ 822CD08 + .string "JAY: Oh, dear.\n" + .string "We’ve lost, my dear husband.$" + +MeteorFalls_1F_2R_Text_22CD34: @ 822CD34 + .string "JAY: Fifty years of marriage…\n" + .string "Many things have happened.\p" + .string "I hope that we will continue to make\n" + .string "happy memories together.$" + +MeteorFalls_1F_2R_Text_22CDAB: @ 822CDAB + .string "JAY: Well, well, aren’t you a young\n" + .string "TRAINER?\p" + .string "If you’d care to battle with us, you’ll\n" + .string "have to come back with more POKéMON.$" + diff --git a/data/maps/MeteorFalls_B1F_1R/events.inc b/data/maps/MeteorFalls_B1F_1R/events.inc new file mode 100644 index 000000000..039f316d9 --- /dev/null +++ b/data/maps/MeteorFalls_B1F_1R/events.inc @@ -0,0 +1,11 @@ +MeteorFalls_B1F_1R_MapWarps: @ 853414C + 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/MeteorFalls_B1F_1R/scripts.inc b/data/maps/MeteorFalls_B1F_1R/scripts.inc new file mode 100644 index 000000000..551e68180 --- /dev/null +++ b/data/maps/MeteorFalls_B1F_1R/scripts.inc @@ -0,0 +1,3 @@ +MeteorFalls_B1F_1R_MapScripts:: @ 822CE25 + .byte 0 + diff --git a/data/maps/MeteorFalls_B1F_2R/events.inc b/data/maps/MeteorFalls_B1F_2R/events.inc new file mode 100644 index 000000000..8e2c9e1c4 --- /dev/null +++ b/data/maps/MeteorFalls_B1F_2R/events.inc @@ -0,0 +1,9 @@ +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 + +MeteorFalls_B1F_2R_MapWarps: @ 85341A8 + 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/MeteorFalls_B1F_2R/scripts.inc b/data/maps/MeteorFalls_B1F_2R/scripts.inc new file mode 100644 index 000000000..775b5787c --- /dev/null +++ b/data/maps/MeteorFalls_B1F_2R/scripts.inc @@ -0,0 +1,3 @@ +MeteorFalls_B1F_2R_MapScripts:: @ 822CE26 + .byte 0 + diff --git a/data/maps/MeteorFalls_StevensCave/events.inc b/data/maps/MeteorFalls_StevensCave/events.inc new file mode 100644 index 000000000..ff920f86d --- /dev/null +++ b/data/maps/MeteorFalls_StevensCave/events.inc @@ -0,0 +1,9 @@ +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 + +MeteorFalls_StevensCave_MapWarps: @ 85378C8 + 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/MeteorFalls_StevensCave/scripts.inc b/data/maps/MeteorFalls_StevensCave/scripts.inc new file mode 100644 index 000000000..5226ddb4a --- /dev/null +++ b/data/maps/MeteorFalls_StevensCave/scripts.inc @@ -0,0 +1,58 @@ +MeteorFalls_StevensCave_MapScripts:: @ 823B181 + .byte 0 + +MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182 + lock + checkflag FLAG_0x4F8 + goto_eq MeteorFalls_StevensCave_EventScript_23B1CD + waitse + playse SE_PIN + applymovement 1, MeteorFalls_StevensCave_Movement_272598 + waitmovement 0 + applymovement 1, MeteorFalls_StevensCave_Movement_27259A + waitmovement 0 + applymovement 1, MeteorFalls_StevensCave_Movement_27259E + waitmovement 0 + msgbox MeteorFalls_StevensCave_Text_23B1E1, 4 + trainerbattle 3, TRAINER_STEVEN, 0, MeteorFalls_StevensCave_Text_23B32D + msgbox MeteorFalls_StevensCave_Text_23B358, 4 + setflag FLAG_0x4F8 + release + end + +MeteorFalls_StevensCave_EventScript_23B1CD:: @ 823B1CD + applymovement 1, MeteorFalls_StevensCave_Movement_27259E + waitmovement 0 + msgbox MeteorFalls_StevensCave_Text_23B358, 4 + release + end + +MeteorFalls_StevensCave_Text_23B1E1: @ 823B1E1 + .string "STEVEN: Oh, wow, {PLAYER}{KUN}.\n" + .string "I’m amazed you knew where to find me.\p" + .string "Do you, uh…maybe think of me as\n" + .string "just a rock maniac?\p" + .string "No, that can’t be right.\p" + .string "We battled alongside each other at\n" + .string "the SOOTOPOLIS SPACE CENTER.\p" + .string "You should have a very good idea\n" + .string "about how good I am.\p" + .string "Okay, {PLAYER}{KUN}, if you’re going to mount\n" + .string "a serious challenge, expect the worst!$" + +MeteorFalls_StevensCave_Text_23B32D: @ 823B32D + .string "You…\n" + .string "I had no idea you’d become so strong…$" + +MeteorFalls_StevensCave_Text_23B358: @ 823B358 + .string "STEVEN: Come to think of it, ever since\n" + .string "our paths first crossed in GRANITE\l" + .string "CAVE in DEWFORD, I had this feeling.\p" + .string "I thought that you would eventually\n" + .string "become the CHAMPION.\p" + .string "My predictions usually come true.\p" + .string "And where will you go from here?\p" + .string "… … … … … …\n" + .string "… … … … … …\p" + .string "Fufufu, even I couldn’t tell you that.$" + diff --git a/data/maps/MirageTower_1F/events.inc b/data/maps/MirageTower_1F/events.inc new file mode 100644 index 000000000..f35ce6d2a --- /dev/null +++ b/data/maps/MirageTower_1F/events.inc @@ -0,0 +1,7 @@ +MirageTower_1F_MapWarps: @ 85375D4 + 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/MirageTower_1F/scripts.inc b/data/maps/MirageTower_1F/scripts.inc new file mode 100644 index 000000000..d7d9619b5 --- /dev/null +++ b/data/maps/MirageTower_1F/scripts.inc @@ -0,0 +1,10 @@ +MirageTower_1F_MapScripts:: @ 823AD01 + map_script 3, MirageTower_1F_MapScript1_23AD07 + .byte 0 + +MirageTower_1F_MapScript1_23AD07: @ 823AD07 + setflag FLAG_0x8DC + setflag FLAG_0x09D + setflag FLAG_LANDMARK_MIRAGE_TOWER + end + diff --git a/data/maps/MirageTower_2F/events.inc b/data/maps/MirageTower_2F/events.inc new file mode 100644 index 000000000..fdbafbe06 --- /dev/null +++ b/data/maps/MirageTower_2F/events.inc @@ -0,0 +1,7 @@ +MirageTower_2F_MapWarps: @ 85375F8 + 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/MirageTower_2F/scripts.inc b/data/maps/MirageTower_2F/scripts.inc new file mode 100644 index 000000000..79f3cce2a --- /dev/null +++ b/data/maps/MirageTower_2F/scripts.inc @@ -0,0 +1,11 @@ +MirageTower_2F_MapScripts:: @ 823AD11 + map_script 2, MirageTower_2F_MapScript2_2A8327 + map_script 3, MirageTower_2F_MapScript1_2A8331 + map_script 5, MirageTower_2F_MapScript1_23AD21 + .byte 0 + +MirageTower_2F_MapScript1_23AD21: @ 823AD21 + setstepcallback 7 + setholewarp MAP_MIRAGE_TOWER_1F, 255, 0, 0 + end + diff --git a/data/maps/MirageTower_3F/events.inc b/data/maps/MirageTower_3F/events.inc new file mode 100644 index 000000000..e12b4873d --- /dev/null +++ b/data/maps/MirageTower_3F/events.inc @@ -0,0 +1,11 @@ +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 + +MirageTower_3F_MapWarps: @ 853764C + 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/MirageTower_3F/scripts.inc b/data/maps/MirageTower_3F/scripts.inc new file mode 100644 index 000000000..1ec82de55 --- /dev/null +++ b/data/maps/MirageTower_3F/scripts.inc @@ -0,0 +1,11 @@ +MirageTower_3F_MapScripts:: @ 823AD2C + map_script 2, MirageTower_3F_MapScript2_2A8327 + map_script 3, MirageTower_3F_MapScript1_2A8331 + map_script 5, MirageTower_3F_MapScript1_23AD3C + .byte 0 + +MirageTower_3F_MapScript1_23AD3C: @ 823AD3C + setstepcallback 7 + setholewarp MAP_MIRAGE_TOWER_2F, 255, 0, 0 + end + diff --git a/data/maps/MirageTower_4F/events.inc b/data/maps/MirageTower_4F/events.inc new file mode 100644 index 000000000..7b215a83a --- /dev/null +++ b/data/maps/MirageTower_4F/events.inc @@ -0,0 +1,11 @@ +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 + +MirageTower_4F_MapWarps: @ 85376B8 + 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/MirageTower_4F/scripts.inc b/data/maps/MirageTower_4F/scripts.inc new file mode 100644 index 000000000..1e079c5d7 --- /dev/null +++ b/data/maps/MirageTower_4F/scripts.inc @@ -0,0 +1,79 @@ +MirageTower_4F_MapScripts:: @ 823AD47 + .byte 0 + +MirageTower_4F_EventScript_23AD48:: @ 823AD48 + lock + faceplayer + msgbox MirageTower_4F_Text_23ADF9, 5 + compare VAR_RESULT, 0 + goto_eq MirageTower_4F_EventScript_23AD7F + giveitem_std ITEM_ROOT_FOSSIL + closemessage + setflag FLAG_0x3C3 + setflag FLAG_0x3C4 + removeobject 1 + delay 30 + setflag FLAG_0x14F + goto MirageTower_4F_EventScript_23ADCA + end + +MirageTower_4F_EventScript_23AD7F:: @ 823AD7F + msgbox MirageTower_4F_Text_23AE79, 4 + release + end + +MirageTower_4F_EventScript_23AD89:: @ 823AD89 + lock + faceplayer + msgbox MirageTower_4F_Text_23AE98, 5 + compare VAR_RESULT, 0 + goto_eq MirageTower_4F_EventScript_23ADC0 + giveitem_std ITEM_CLAW_FOSSIL + closemessage + setflag FLAG_0x3C4 + setflag FLAG_0x3C3 + removeobject 2 + delay 30 + setflag FLAG_0x150 + goto MirageTower_4F_EventScript_23ADCA + end + +MirageTower_4F_EventScript_23ADC0:: @ 823ADC0 + msgbox MirageTower_4F_Text_23AF18, 4 + release + end + +MirageTower_4F_EventScript_23ADCA:: @ 823ADCA + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 32 + setvar VAR_0x8007, 2 + special sub_8139560 + waitstate + special sub_81BE994 + waitstate + setvar VAR_0x40CB, 1 + clearflag FLAG_LANDMARK_MIRAGE_TOWER + warp MAP_ROUTE111, 255, 19, 59 + waitstate + release + end + +MirageTower_4F_Text_23ADF9: @ 823ADF9 + .string "You found the ROOT FOSSIL.\p" + .string "If this FOSSIL is taken, the ground\n" + .string "around it will likely crumble away…\p" + .string "Take the ROOT FOSSIL anyway?$" + +MirageTower_4F_Text_23AE79: @ 823AE79 + .string "{PLAYER} left the ROOT FOSSIL alone.$" + +MirageTower_4F_Text_23AE98: @ 823AE98 + .string "You found the CLAW FOSSIL.\p" + .string "If this FOSSIL is taken, the ground\n" + .string "around it will likely crumble away…\p" + .string "Take the CLAW FOSSIL anyway?$" + +MirageTower_4F_Text_23AF18: @ 823AF18 + .string "{PLAYER} left the CLAW FOSSIL alone.$" + diff --git a/data/maps/MossdeepCity/events.inc b/data/maps/MossdeepCity/events.inc new file mode 100644 index 000000000..d288400b5 --- /dev/null +++ b/data/maps/MossdeepCity/events.inc @@ -0,0 +1,56 @@ +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 + +MossdeepCity_MapWarps: @ 85271B0 + 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 + 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 + +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 + +MossdeepCity_MapEvents:: @ 8527300 + map_events MossdeepCity_EventObjects, MossdeepCity_MapWarps, MossdeepCity_MapCoordEvents, MossdeepCity_MapBGEvents + diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc new file mode 100644 index 000000000..8cce8efeb --- /dev/null +++ b/data/maps/MossdeepCity/scripts.inc @@ -0,0 +1,436 @@ +MossdeepCity_MapScripts:: @ 81E4A96 + map_script 3, MossdeepCity_MapScript1_1E4A9C + .byte 0 + +MossdeepCity_MapScript1_1E4A9C: @ 81E4A9C + clearflag FLAG_0x064 + clearflag FLAG_0x065 + clearflag FLAG_0x066 + clearflag FLAG_0x067 + checkflag FLAG_SYS_WEATHER_CTRL + call_if 1, MossdeepCity_EventScript_27207A + end + +MossdeepCity_EventScript_1E4AB2:: @ 81E4AB2 + lock + faceplayer + checkflag FLAG_0x07B + goto_eq MossdeepCity_EventScript_1E4AC7 + msgbox MossdeepCity_Text_1E4E90, 4 + release + end + +MossdeepCity_EventScript_1E4AC7:: @ 81E4AC7 + msgbox MossdeepCity_Text_1E4F15, 4 + release + end + +MossdeepCity_EventScript_1E4AD1:: @ 81E4AD1 + lock + faceplayer + checkflag FLAG_0x07B + goto_eq MossdeepCity_EventScript_1E4AE6 + msgbox MossdeepCity_Text_1E4F50, 4 + release + end + +MossdeepCity_EventScript_1E4AE6:: @ 81E4AE6 + msgbox MossdeepCity_Text_1E5051, 4 + release + end + +MossdeepCity_EventScript_1E4AF0:: @ 81E4AF0 + msgbox MossdeepCity_Text_1E4E22, 2 + end + +MossdeepCity_EventScript_1E4AF9:: @ 81E4AF9 + msgbox MossdeepCity_Text_1E5135, 2 + end + +MossdeepCity_EventScript_1E4B02:: @ 81E4B02 + msgbox MossdeepCity_Text_1E50D9, 2 + end + +MossdeepCity_EventScript_1E4B0B:: @ 81E4B0B + msgbox MossdeepCity_Text_1E529D, 2 + end + +MossdeepCity_EventScript_1E4B14:: @ 81E4B14 + msgbox MossdeepCity_Text_1E5396, 3 + end + +MossdeepCity_EventScript_1E4B1D:: @ 81E4B1D + msgbox MossdeepCity_Text_1E53A9, 3 + end + +MossdeepCity_EventScript_1E4B26:: @ 81E4B26 + msgbox MossdeepCity_Text_1E53F2, 3 + end + +MossdeepCity_EventScript_1E4B2F:: @ 81E4B2F + msgbox MossdeepCity_Text_1E541F, 3 + end + +MossdeepCity_EventScript_1E4B38:: @ 81E4B38 + setflag FLAG_VISITED_MOSSDEEP_CITY + setvar VAR_TEMP_1, 1 + end + +MossdeepCity_EventScript_1E4B41:: @ 81E4B41 + lockall + applymovement 14, MossdeepCity_Movement_1E4BAD + waitmovement 0 + applymovement 10, MossdeepCity_Movement_1E4BB7 + applymovement 11, MossdeepCity_Movement_1E4BB7 + applymovement 12, MossdeepCity_Movement_1E4BB7 + applymovement 13, MossdeepCity_Movement_1E4BB7 + waitmovement 0 + applymovement 14, MossdeepCity_Movement_1E4BBC + applymovement 10, MossdeepCity_Movement_1E4BCA + applymovement 11, MossdeepCity_Movement_1E4BDD + applymovement 12, MossdeepCity_Movement_1E4BEF + applymovement 13, MossdeepCity_Movement_1E4C00 + waitmovement 0 + removeobject 14 + removeobject 10 + removeobject 11 + removeobject 12 + removeobject 13 + delay 30 + setvar VAR_0x405D, 2 + setflag FLAG_0x337 + releaseall + end + +MossdeepCity_Movement_1E4BAD: @ 81E4BAD + delay_16 + face_right + delay_16 + delay_16 + delay_16 + delay_16 + face_left + delay_16 + delay_16 + step_end + +MossdeepCity_Movement_1E4BB7: @ 81E4BB7 + face_right + delay_16 + delay_16 + delay_16 + step_end + +MossdeepCity_Movement_1E4BBC: @ 81E4BBC + 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 + 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 + 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 + 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 + 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 + lock + faceplayer + msgbox MossdeepCity_Text_1E5213, 4 + applymovement VAR_LAST_TALKED, MossdeepCity_Movement_2725A2 + waitmovement 0 + release + end + +MossdeepCity_EventScript_1E4C26:: @ 81E4C26 + lock + faceplayer + checkflag FLAG_0x114 + goto_eq MossdeepCity_EventScript_1E4C68 + msgbox MossdeepCity_Text_1E4CED, 5 + compare VAR_RESULT, 0 + goto_eq MossdeepCity_EventScript_1E4C72 + msgbox MossdeepCity_Text_1E4D5B, 4 + giveitem_std ITEM_KINGS_ROCK + compare VAR_RESULT, 0 + goto_eq MossdeepCity_EventScript_272054 + setflag FLAG_0x114 + release + end + +MossdeepCity_EventScript_1E4C68:: @ 81E4C68 + msgbox MossdeepCity_Text_1E4DB3, 4 + release + end + +MossdeepCity_EventScript_1E4C72:: @ 81E4C72 + msgbox MossdeepCity_Text_1E4DD7, 4 + release + end + +MossdeepCity_EventScript_1E4C7C:: @ 81E4C7C + msgbox MossdeepCity_Text_1E5581, 2 + end + +MossdeepCity_EventScript_1E4C85:: @ 81E4C85 + lock + faceplayer + msgbox MossdeepCity_Text_1E5453, 4 + closemessage + compare VAR_FACING, 2 + call_if 1, MossdeepCity_EventScript_1E4CB0 + compare VAR_FACING, 4 + call_if 1, MossdeepCity_EventScript_1E4CC2 + addvar VAR_0x40D1, 1 + removeobject 16 + release + end + +MossdeepCity_EventScript_1E4CB0:: @ 81E4CB0 + applymovement 255, MossdeepCity_Movement_1E4CD4 + applymovement 16, MossdeepCity_Movement_1E4CD8 + waitmovement 0 + return + +MossdeepCity_EventScript_1E4CC2:: @ 81E4CC2 + applymovement 255, MossdeepCity_Movement_1E4CD4 + applymovement 16, MossdeepCity_Movement_1E4CE2 + waitmovement 0 + return + +MossdeepCity_Movement_1E4CD4: @ 81E4CD4 + delay_16 + delay_16 + walk_in_place_fastest_left + step_end + +MossdeepCity_Movement_1E4CD8: @ 81E4CD8 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + step_end + +MossdeepCity_Movement_1E4CE2: @ 81E4CE2 + 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 + .string "I got this from STEVEN, but I don’t\n" + .string "know what it’s good for.\p" + .string "I think it’s called KING’S ROCK.\n" + .string "Do you want it?$" + +MossdeepCity_Text_1E4D5B: @ 81E4D5B + .string "Why would you want it?\n" + .string "You’re weird.\p" + .string "You can keep it, but keep it a secret\n" + .string "from STEVEN.$" + +MossdeepCity_Text_1E4DB3: @ 81E4DB3 + .string "STEVEN’s house is right over there!$" + +MossdeepCity_Text_1E4DD7: @ 81E4DD7 + .string "Yeah, you think so, too! What are you\n" + .string "supposed to do with some weird rock?$" + +MossdeepCity_Text_1E4E22: @ 81E4E22 + .string "Around MOSSDEEP, you can see wild\n" + .string "WAILMER.\p" + .string "It’s called, uh…\n" + .string "What was it now…\p" + .string "WAI, WAI, WAI…\p" + .string "WAILMER watching!$" + +MossdeepCity_Text_1E4E90: @ 81E4E90 + .string "The island’s SPACE CENTER has been\n" + .string "launching huge rockets.\p" + .string "There’s been some kind of an uproar\n" + .string "over a letter they received recently.$" + +MossdeepCity_Text_1E4F15: @ 81E4F15 + .string "The island’s SPACE CENTER has been\n" + .string "launching huge rockets.$" + +MossdeepCity_Text_1E4F50: @ 81E4F50 + .string "I heard from a SAILOR buddy that\n" + .string "TEAM AQUA set up shop in LILYCOVE.\p" + .string "I also heard that someone came along\n" + .string "and wiped the floor with them!\p" + .string "But MOSSDEEP here’s been targeted\n" + .string "by that TEAM MAGMA.\p" + .string "If you want to know what they’re up to,\n" + .string "go visit the SPACE CENTER.$" + +MossdeepCity_Text_1E5051: @ 81E5051 + .string "I’m a SAILOR, so the sea’s obviously\n" + .string "more important to me.\p" + .string "But you know? When I get back on land\n" + .string "after a long voyage, I do feel relief!$" + +MossdeepCity_Text_1E50D9: @ 81E50D9 + .string "Wouldn’t it be nice?\p" + .string "If the whole world was covered in\n" + .string "plants and flowers like this island?$" + +MossdeepCity_Text_1E5135: @ 81E5135 + .string "All life needs the sea to live, even\n" + .string "though it makes its home on the land.\p" + .string "Life, having run its course, becomes\n" + .string "soil and returns to the land.\p" + .string "And the sea is always connected to\n" + .string "the land.\p" + .string "Yes, like the very shoreline here.$" + +MossdeepCity_Text_1E5213: @ 81E5213 + .string "A voyage on a ship is fine.\p" + .string "But crossing the sea with POKéMON\n" + .string "using SURF…\p" + .string "Now that’s an exhilarating trip!\n" + .string "Wouldn’t you agree, youngster?$" + +MossdeepCity_Text_1E529D: @ 81E529D + .string "This rock has a special meaning to\n" + .string "the people at the SPACE CENTER.\p" + .string "They put it here as their wish for\n" + .string "their rockets to fly safely.\p" + .string "When you make a wish, what do you use?\n" + .string "Do you wish upon a star?\p" + .string "I use a wish tag to make it happen.\n" + .string "That’s what I do.$" + +MossdeepCity_Text_1E5396: @ 81E5396 + .string "It’s a white rock.$" + +MossdeepCity_Text_1E53A9: @ 81E53A9 + .string "MOSSDEEP CITY POKéMON GYM\n" + .string "LEADERS: LIZA & TATE\p" + .string "“The mystic combination!â€$" + +MossdeepCity_Text_1E53F2: @ 81E53F2 + .string "MOSSDEEP CITY\n" + .string "“Our slogan: Cherish POKéMON!â€$" + +MossdeepCity_Text_1E541F: @ 81E541F + .string "MOSSDEEP SPACE CENTER\n" + .string "“The closest place to space.â€$" + +MossdeepCity_Text_1E5453: @ 81E5453 + .string "SCOTT: {PLAYER}{KUN}, feeling good?\n" + .string "I’m doing great!\p" + .string "I’d heard MOSSDEEP’s GYM LEADER is\n" + .string "pretty strong, so I decided to come\l" + .string "take a look-see for myself.\p" + .string "But there’s something wrong about\n" + .string "this town.\p" + .string "People are going on about a warning\n" + .string "letter and the SPACE CENTER…\p" + .string "I don’t think it concerns me in any\n" + .string "way, though.$" + +MossdeepCity_Text_1E5581: @ 81E5581 + .string "Ahh… It feels great letting the waves\n" + .string "wash over my feet…\p" + .string "Speaking of the waves, you know that\n" + .string "island city SOOTOPOLIS?\p" + .string "I think the GYM there had a new\n" + .string "LEADER come in.\p" + .string "People tell me the new LEADER once\n" + .string "mentored WALLACE.$" + diff --git a/data/maps/MossdeepCity_GameCorner_1F/events.inc b/data/maps/MossdeepCity_GameCorner_1F/events.inc new file mode 100644 index 000000000..42face3c4 --- /dev/null +++ b/data/maps/MossdeepCity_GameCorner_1F/events.inc @@ -0,0 +1,17 @@ +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 + +MossdeepCity_GameCorner_1F_MapWarps: @ 8532F70 + 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 + bg_event 0, 1, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_277E9D + bg_event 1, 1, 0, 0, 0, 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_GameCorner_1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc new file mode 100644 index 000000000..ff5c14206 --- /dev/null +++ b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc @@ -0,0 +1,80 @@ +MossdeepCity_GameCorner_1F_MapScripts:: @ 8224B27 + map_script 2, MossdeepCity_GameCorner_1F_MapScript2_224B41 + map_script 4, MossdeepCity_GameCorner_1F_MapScript2_224B37 + map_script 1, MossdeepCity_GameCorner_1F_MapScript1_276BBE + .byte 0 + +MossdeepCity_GameCorner_1F_MapScript2_224B37: @ 8224B37 + map_script_2 VAR_0x4087, 8, MossdeepCity_GameCorner_1F_EventScript_276BAE + .2byte 0 + +MossdeepCity_GameCorner_1F_MapScript2_224B41: @ 8224B41 + map_script_2 VAR_0x4087, 8, MossdeepCity_GameCorner_1F_EventScript_276C9D + .2byte 0 + +MossdeepCity_GameCorner_1F_EventScript_224B4B:: @ 8224B4B + lock + faceplayer + goto MossdeepCity_GameCorner_1F_EventScript_277C34 + release + end + +MossdeepCity_GameCorner_1F_EventScript_224B54:: @ 8224B54 + lock + faceplayer + goto MossdeepCity_GameCorner_1F_EventScript_277C91 + release + end + +MossdeepCity_GameCorner_1F_EventScript_224B5D:: @ 8224B5D + msgbox MossdeepCity_GameCorner_1F_Text_224BFD, 3 + end + +MossdeepCity_GameCorner_1F_Text_224B66: @ 8224B66 + .string "When I was young, I traveled the world\n" + .string "as a POKéMON TRAINER.\p" + .string "Now that I’ve become an old buzzard,\n" + .string "my only amusement is watching young\l" + .string "TRAINERS battle.$" + +MossdeepCity_GameCorner_1F_Text_224BFD: @ 8224BFD + .string "The door appears to be locked.$" + +MossdeepCity_GameCorner_1F_Text_224C1C: @ 8224C1C + .string "A TRAINER named {STR_VAR_1} is\n" + .string "visiting my home.\p" + .string "Would you like to challenge\n" + .string "{STR_VAR_1}?$" + +MossdeepCity_GameCorner_1F_Text_224C64: @ 8224C64 + .string "You won’t battle? I’m disappointed\n" + .string "that I can’t see you battle…$" + +MossdeepCity_GameCorner_1F_Text_224CA4: @ 8224CA4 + .string "Oh, good, good!\p" + .string "But my house isn’t all that sturdy.\p" + .string "Could I ask you to keep it down to\n" + .string "a 3-on-3 match?$" + +MossdeepCity_GameCorner_1F_Text_224D0B: @ 8224D0B + .string "Before you two battle, you should\n" + .string "save your progress.$" + +MossdeepCity_GameCorner_1F_Text_224D41: @ 8224D41 + .string "I hope to see a good match!$" + +MossdeepCity_GameCorner_1F_Text_224D5D: @ 8224D5D + .string "So, it became a standoff.\p" + .string "It was a brilliant match in which\n" + .string "neither side conceded a step!$" + +MossdeepCity_GameCorner_1F_Text_224DB7: @ 8224DB7 + .string "That was superlative!\p" + .string "Why, it was like seeing myself in\n" + .string "my youth again!$" + +MossdeepCity_GameCorner_1F_Text_224DFF: @ 8224DFF + .string "Ah, too bad for you!\p" + .string "But it was a good match.\n" + .string "I hope you can win next time.$" + diff --git a/data/maps/MossdeepCity_GameCorner_B1F/events.inc b/data/maps/MossdeepCity_GameCorner_B1F/events.inc new file mode 100644 index 000000000..7146d30b8 --- /dev/null +++ b/data/maps/MossdeepCity_GameCorner_B1F/events.inc @@ -0,0 +1,9 @@ +MossdeepCity_GameCorner_B1F_EventObjects: @ 8532FC0 + 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 + +MossdeepCity_GameCorner_B1F_MapEvents:: @ 8532FE0 + map_events MossdeepCity_GameCorner_B1F_EventObjects, MossdeepCity_GameCorner_B1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc new file mode 100644 index 000000000..695be3c6e --- /dev/null +++ b/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc @@ -0,0 +1,3 @@ +MossdeepCity_GameCorner_B1F_MapScripts:: @ 8224E4B + .byte 0 + diff --git a/data/maps/MossdeepCity_Gym/events.inc b/data/maps/MossdeepCity_Gym/events.inc new file mode 100644 index 000000000..e383463af --- /dev/null +++ b/data/maps/MossdeepCity_Gym/events.inc @@ -0,0 +1,72 @@ +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 + +MossdeepCity_Gym_MapWarps: @ 853284C + 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 + 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 + +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 + +MossdeepCity_Gym_MapEvents:: @ 8532964 + map_events MossdeepCity_Gym_EventObjects, MossdeepCity_Gym_MapWarps, MossdeepCity_Gym_MapCoordEvents, MossdeepCity_Gym_MapBGEvents + diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc new file mode 100644 index 000000000..f38fd606d --- /dev/null +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -0,0 +1,658 @@ +MossdeepCity_Gym_MapScripts:: @ 8220800 + map_script 1, MossdeepCity_Gym_MapScript1_220806 + .byte 0 + +MossdeepCity_Gym_MapScript1_220806: @ 8220806 + checkflag FLAG_0x064 + goto_eq MossdeepCity_Gym_EventScript_22083D + goto MossdeepCity_Gym_EventScript_220815 + end + +MossdeepCity_Gym_EventScript_220815:: @ 8220815 + checkflag FLAG_0x065 + goto_eq MossdeepCity_Gym_EventScript_220855 + goto MossdeepCity_Gym_EventScript_220824 + end + +MossdeepCity_Gym_EventScript_220824:: @ 8220824 + checkflag FLAG_0x066 + goto_eq MossdeepCity_Gym_EventScript_22086D + goto MossdeepCity_Gym_EventScript_220833 + end + +MossdeepCity_Gym_EventScript_220833:: @ 8220833 + checkflag FLAG_0x067 + goto_eq MossdeepCity_Gym_EventScript_220885 + end + +MossdeepCity_Gym_EventScript_22083D:: @ 822083D + setmetatile 5, 5, 516, 0 + setmetatile 2, 7, 569, 1 + goto MossdeepCity_Gym_EventScript_220815 + end + +MossdeepCity_Gym_EventScript_220855:: @ 8220855 + setmetatile 8, 14, 516, 0 + setmetatile 8, 10, 569, 1 + goto MossdeepCity_Gym_EventScript_220824 + end + +MossdeepCity_Gym_EventScript_22086D:: @ 822086D + setmetatile 15, 17, 524, 0 + setmetatile 17, 15, 569, 1 + goto MossdeepCity_Gym_EventScript_220833 + end + +MossdeepCity_Gym_EventScript_220885:: @ 8220885 + setmetatile 1, 23, 525, 0 + setmetatile 5, 24, 569, 1 + end + +MossdeepCity_Gym_EventScript_220898:: @ 8220898 + trainerbattle 8, TRAINER_TATE_AND_LIZA_1, 0, MossdeepCity_Gym_Text_221783, MossdeepCity_Gym_Text_2218EC, MossdeepCity_Gym_Text_221BCE, MossdeepCity_Gym_EventScript_2208D1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq MossdeepCity_Gym_EventScript_22097E + checkflag FLAG_0x0AB + goto_if 0, MossdeepCity_Gym_EventScript_220937 + msgbox MossdeepCity_Gym_Text_221B1D, 4 + release + end + +MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 + message MossdeepCity_Gym_Text_22196A + waitmessage + call MossdeepCity_Gym_EventScript_27207E + msgbox MossdeepCity_Gym_Text_221999, 4 + setflag FLAG_0x4F6 + setflag FLAG_BADGE07_GET + setflag FLAG_0x39C + clearflag FLAG_0x365 + clearflag FLAG_0x393 + setvar VAR_0x8008, 7 + call MossdeepCity_Gym_EventScript_271F43 + clearflag FLAG_0x389 + clearflag FLAG_0x337 + clearflag FLAG_0x2F4 + clearflag FLAG_0x35E + clearflag FLAG_0x35F + setvar VAR_0x405D, 1 + setflag FLAG_0x2F1 + setvar VAR_0x409F, 1 + call MossdeepCity_Gym_EventScript_22095B + closemessage + delay 30 + playfanfare MUS_ME_TORE_EYE + msgbox MossdeepCity_Gym_Text_221AEA, 4 + waitfanfare + closemessage + delay 30 + setflag FLAG_0x1D8 + release + end + +MossdeepCity_Gym_EventScript_220937:: @ 8220937 + giveitem_std ITEM_TM04 + compare VAR_RESULT, 0 + goto_eq MossdeepCity_Gym_EventScript_272054 + msgbox MossdeepCity_Gym_Text_221A40, 4 + setflag FLAG_0x0AB + release + end + +MossdeepCity_Gym_EventScript_22095B:: @ 822095B + giveitem_std ITEM_TM04 + compare VAR_RESULT, 0 + goto_eq MossdeepCity_Gym_EventScript_27205E + msgbox MossdeepCity_Gym_Text_221A40, 4 + setflag FLAG_0x0AB + return + +MossdeepCity_Gym_EventScript_22097E:: @ 822097E + trainerbattle 7, TRAINER_TATE_AND_LIZA_1, 0, MossdeepCity_Gym_Text_221D0B, MossdeepCity_Gym_Text_221E05, MossdeepCity_Gym_Text_221EB8 + msgbox MossdeepCity_Gym_Text_221E45, 6 + end + +MossdeepCity_Gym_EventScript_220999:: @ 8220999 + lockall + checkflag FLAG_0x064 + goto_eq MossdeepCity_Gym_EventScript_2209D0 + setflag FLAG_0x064 + applymovement 255, MossdeepCity_Gym_Movement_220C30 + waitmovement 0 + setmetatile 5, 5, 516, 0 + setmetatile 2, 7, 569, 1 + goto MossdeepCity_Gym_EventScript_2209C8 + end + +MossdeepCity_Gym_EventScript_2209C8:: @ 82209C8 + special DrawWholeMapView + playse SE_TK_KASYA + releaseall + end + +MossdeepCity_Gym_EventScript_2209D0:: @ 82209D0 + clearflag FLAG_0x064 + applymovement 255, MossdeepCity_Gym_Movement_220C30 + waitmovement 0 + setmetatile 5, 5, 524, 0 + setmetatile 2, 7, 568, 1 + goto MossdeepCity_Gym_EventScript_2209C8 + end + +MossdeepCity_Gym_EventScript_2209F5:: @ 82209F5 + lockall + checkflag FLAG_0x065 + goto_eq MossdeepCity_Gym_EventScript_220A24 + setflag FLAG_0x065 + applymovement 255, MossdeepCity_Gym_Movement_220C30 + waitmovement 0 + setmetatile 8, 14, 516, 0 + setmetatile 8, 10, 569, 1 + goto MossdeepCity_Gym_EventScript_2209C8 + end + +MossdeepCity_Gym_EventScript_220A24:: @ 8220A24 + clearflag FLAG_0x065 + applymovement 255, MossdeepCity_Gym_Movement_220C30 + waitmovement 0 + setmetatile 8, 14, 517, 0 + setmetatile 8, 10, 568, 1 + goto MossdeepCity_Gym_EventScript_2209C8 + end + +MossdeepCity_Gym_EventScript_220A49:: @ 8220A49 + lockall + checkflag FLAG_0x066 + goto_eq MossdeepCity_Gym_EventScript_220A78 + setflag FLAG_0x066 + applymovement 255, MossdeepCity_Gym_Movement_220C30 + waitmovement 0 + setmetatile 15, 17, 524, 0 + setmetatile 17, 15, 569, 1 + goto MossdeepCity_Gym_EventScript_2209C8 + end + +MossdeepCity_Gym_EventScript_220A78:: @ 8220A78 + clearflag FLAG_0x066 + applymovement 255, MossdeepCity_Gym_Movement_220C30 + waitmovement 0 + setmetatile 15, 17, 516, 0 + setmetatile 17, 15, 568, 1 + goto MossdeepCity_Gym_EventScript_2209C8 + end + +MossdeepCity_Gym_EventScript_220A9D:: @ 8220A9D + lockall + checkflag FLAG_0x067 + goto_eq MossdeepCity_Gym_EventScript_220ACC + setflag FLAG_0x067 + applymovement 255, MossdeepCity_Gym_Movement_220C30 + waitmovement 0 + setmetatile 1, 23, 525, 0 + setmetatile 5, 24, 569, 1 + goto MossdeepCity_Gym_EventScript_2209C8 + end + +MossdeepCity_Gym_EventScript_220ACC:: @ 8220ACC + clearflag FLAG_0x067 + applymovement 255, MossdeepCity_Gym_Movement_220C30 + waitmovement 0 + setmetatile 1, 23, 516, 0 + setmetatile 5, 24, 568, 1 + goto MossdeepCity_Gym_EventScript_2209C8 + end + +MossdeepCity_Gym_EventScript_220AF1:: @ 8220AF1 + lockall + warp7 MAP_MOSSDEEP_CITY_GYM, 255, 7, 30 + waitstate + releaseall + end + +MossdeepCity_Gym_EventScript_220AFD:: @ 8220AFD + trainerbattle 0, TRAINER_PRESTON, 0, MossdeepCity_Gym_Text_220E5C, MossdeepCity_Gym_Text_220EAC + msgbox MossdeepCity_Gym_Text_220ED3, 6 + end + +MossdeepCity_Gym_EventScript_220B14:: @ 8220B14 + trainerbattle 0, TRAINER_VIRGIL, 0, MossdeepCity_Gym_Text_220F02, MossdeepCity_Gym_Text_220F1A + msgbox MossdeepCity_Gym_Text_220F3A, 6 + end + +MossdeepCity_Gym_EventScript_220B2B:: @ 8220B2B + trainerbattle 0, TRAINER_BLAKE, 0, MossdeepCity_Gym_Text_220FB0, MossdeepCity_Gym_Text_221024 + msgbox MossdeepCity_Gym_Text_221055, 6 + end + +MossdeepCity_Gym_EventScript_220B42:: @ 8220B42 + trainerbattle 0, TRAINER_HANNAH, 0, MossdeepCity_Gym_Text_2210EE, MossdeepCity_Gym_Text_221152 + msgbox MossdeepCity_Gym_Text_22116A, 6 + end + +MossdeepCity_Gym_EventScript_220B59:: @ 8220B59 + trainerbattle 0, TRAINER_SAMANTHA, 0, MossdeepCity_Gym_Text_2211E2, MossdeepCity_Gym_Text_221230 + msgbox MossdeepCity_Gym_Text_22123D, 6 + end + +MossdeepCity_Gym_EventScript_220B70:: @ 8220B70 + trainerbattle 0, TRAINER_MAURA, 0, MossdeepCity_Gym_Text_2212A6, MossdeepCity_Gym_Text_221309 + msgbox MossdeepCity_Gym_Text_22132E, 6 + end + +MossdeepCity_Gym_EventScript_220B87:: @ 8220B87 + trainerbattle 0, TRAINER_SYLVIA, 0, MossdeepCity_Gym_Text_2213C2, MossdeepCity_Gym_Text_2213F4 + msgbox MossdeepCity_Gym_Text_221412, 6 + end + +MossdeepCity_Gym_EventScript_220B9E:: @ 8220B9E + trainerbattle 0, TRAINER_NATE, 0, MossdeepCity_Gym_Text_221460, MossdeepCity_Gym_Text_2214A7 + msgbox MossdeepCity_Gym_Text_2214D3, 6 + end + +MossdeepCity_Gym_EventScript_220BB5:: @ 8220BB5 + trainerbattle 0, TRAINER_MACEY, 0, MossdeepCity_Gym_Text_22161B, MossdeepCity_Gym_Text_221658 + msgbox MossdeepCity_Gym_Text_221680, 6 + end + +MossdeepCity_Gym_EventScript_220BCC:: @ 8220BCC + trainerbattle 0, TRAINER_CLIFFORD, 0, MossdeepCity_Gym_Text_22157C, MossdeepCity_Gym_Text_2215B8 + msgbox MossdeepCity_Gym_Text_2215E2, 6 + end + +MossdeepCity_Gym_EventScript_220BE3:: @ 8220BE3 + trainerbattle 0, TRAINER_NICHOLAS, 0, MossdeepCity_Gym_Text_2216EE, MossdeepCity_Gym_Text_22172D + msgbox MossdeepCity_Gym_Text_22173A, 6 + end + +MossdeepCity_Gym_EventScript_220BFA:: @ 8220BFA + trainerbattle 0, TRAINER_KATHLEEN, 0, MossdeepCity_Gym_Text_221507, MossdeepCity_Gym_Text_22153B + msgbox MossdeepCity_Gym_Text_221545, 6 + end + +MossdeepCity_Gym_EventScript_220C11:: @ 8220C11 + lock + faceplayer + checkflag FLAG_0x4F6 + goto_eq MossdeepCity_Gym_EventScript_220C26 + msgbox MossdeepCity_Gym_Text_220CD5, 4 + release + end + +MossdeepCity_Gym_EventScript_220C26:: @ 8220C26 + msgbox MossdeepCity_Gym_Text_220E2A, 4 + release + end + +MossdeepCity_Gym_Movement_220C30: @ 8220C30 + delay_16 + delay_16 + step_end + +MossdeepCity_Gym_EventScript_220C33:: @ 8220C33 + lockall + checkflag FLAG_BADGE07_GET + goto_eq MossdeepCity_Gym_EventScript_220C53 + goto MossdeepCity_Gym_EventScript_220C5D + end + +MossdeepCity_Gym_EventScript_220C43:: @ 8220C43 + lockall + checkflag FLAG_BADGE07_GET + goto_eq MossdeepCity_Gym_EventScript_220C53 + goto MossdeepCity_Gym_EventScript_220C5D + end + +MossdeepCity_Gym_EventScript_220C53:: @ 8220C53 + msgbox MossdeepCity_Gym_Text_221CCA, 4 + releaseall + end + +MossdeepCity_Gym_EventScript_220C5D:: @ 8220C5D + msgbox MossdeepCity_Gym_Text_221CB0, 4 + releaseall + end + +MossdeepCity_Gym_EventScript_220C67:: @ 8220C67 + playse SE_MU_PACHI + waitse + playse SE_TU_SAA + mossdeepgym3 0 + mossdeepgym1 0 + waitmovement 0 + mossdeepgym2 + waitmovement 0 + mossdeepgym4 + end + +MossdeepCity_Gym_EventScript_220C7D:: @ 8220C7D + playse SE_MU_PACHI + waitse + playse SE_TU_SAA + mossdeepgym3 0 + mossdeepgym1 1 + waitmovement 0 + mossdeepgym2 + waitmovement 0 + mossdeepgym4 + end + +MossdeepCity_Gym_EventScript_220C93:: @ 8220C93 + playse SE_MU_PACHI + waitse + playse SE_TU_SAA + mossdeepgym3 0 + mossdeepgym1 2 + waitmovement 0 + mossdeepgym2 + waitmovement 0 + mossdeepgym4 + end + +MossdeepCity_Gym_EventScript_220CA9:: @ 8220CA9 + playse SE_MU_PACHI + waitse + playse SE_TU_SAA + mossdeepgym3 0 + mossdeepgym1 3 + waitmovement 0 + mossdeepgym2 + waitmovement 0 + mossdeepgym4 + end + +MossdeepCity_Gym_EventScript_220CBF:: @ 8220CBF + playse SE_MU_PACHI + waitse + playse SE_TU_SAA + mossdeepgym3 0 + mossdeepgym1 4 + waitmovement 0 + mossdeepgym2 + waitmovement 0 + mossdeepgym4 + end + +MossdeepCity_Gym_Text_220CD5: @ 8220CD5 + .string "Yo, how’s it going, CHAMPION-bound\n" + .string "{PLAYER}?\p" + .string "The GYM LEADERS here use\n" + .string "PSYCHIC-type POKéMON.\p" + .string "If you go up against them with\n" + .string "FIGHTING- or POISON-type POKéMON,\l" + .string "they’ll inflict horrible damage!\p" + .string "Plus, they’ll come at you with\n" + .string "outstanding combination attacks.\p" + .string "If you want to win, you’ll need to show\n" + .string "them how tight you are with your\l" + .string "POKéMON. Go for it!$" + +MossdeepCity_Gym_Text_220E2A: @ 8220E2A + .string "Wow, you’re astounding!\n" + .string "You’re one great TRAINER!$" + +MossdeepCity_Gym_Text_220E5C: @ 8220E5C + .string "Battles hinge on the strength of your\n" + .string "spirit! The weak-spirited will never win!$" + +MossdeepCity_Gym_Text_220EAC: @ 8220EAC + .string "I lost!\n" + .string "I must temper my spirit again!$" + +MossdeepCity_Gym_Text_220ED3: @ 8220ED3 + .string "The indecisive lose.\n" + .string "That’s my warning to you.$" + +MossdeepCity_Gym_Text_220F02: @ 8220F02 + .string "Let me see your talent!$" + +MossdeepCity_Gym_Text_220F1A: @ 8220F1A + .string "You possess spectacular talent!$" + +MossdeepCity_Gym_Text_220F3A: @ 8220F3A + .string "If there are prodigies in the world,\n" + .string "then our GYM LEADERS are them!\p" + .string "However, you may be even more talented\n" + .string "than them…$" + +MossdeepCity_Gym_Text_220FB0: @ 8220FB0 + .string "Fufufufu… Watch me levitate a POKé\n" + .string "BALL telekinetically!\p" + .string "Wrooooooooaaaar!\n" + .string "… … … … … … …\p" + .string "Sometimes, I’m out of sync…$" + +MossdeepCity_Gym_Text_221024: @ 8221024 + .string "My POKéMON battling skills are out\n" + .string "of sync, too!$" + +MossdeepCity_Gym_Text_221055: @ 8221055 + .string "A POKé BALL was too heavy to lift\n" + .string "psychically. But this dust bunny…\p" + .string "Whoooooooooooooooh!\n" + .string "… … … … … …\p" + .string "No, I’m not cheating!\n" + .string "I didn’t blow on it! Honestly!$" + +MossdeepCity_Gym_Text_2210EE: @ 82210EE + .string "When you lose to me, don’t be too hard\n" + .string "on yourself.\p" + .string "It’s not that you’re weak--I’m just\n" + .string "too strong!$" + +MossdeepCity_Gym_Text_221152: @ 8221152 + .string "You’re just too strong!$" + +MossdeepCity_Gym_Text_22116A: @ 822116A + .string "I’m not going to get down on myself for\n" + .string "losing. I just need to train harder.\p" + .string "Positive thinking--that’s my strong\n" + .string "point!$" + +MossdeepCity_Gym_Text_2211E2: @ 82211E2 + .string "I see it…\n" + .string "I see your future…\p" + .string "If you can beat me, I will tell you\n" + .string "your future!$" + +MossdeepCity_Gym_Text_221230: @ 8221230 + .string "I surrender!$" + +MossdeepCity_Gym_Text_22123D: @ 822123D + .string "You will wage a terrifically intense\n" + .string "battle with our GYM LEADERS…\p" + .string "The result…\n" + .string "You won’t hear it from me!$" + +MossdeepCity_Gym_Text_2212A6: @ 82212A6 + .string "The roads you have traveled…\n" + .string "What you have experienced…\p" + .string "Come at me with everything you’ve\n" + .string "learned!$" + +MossdeepCity_Gym_Text_221309: @ 8221309 + .string "You’ve traveled a path of greatness!$" + +MossdeepCity_Gym_Text_22132E: @ 822132E + .string "A bright future awaits those who have\n" + .string "worked diligently.\p" + .string "For those who lazed idly, there is\n" + .string "only despair at the end.\p" + .string "What goes around comes around…$" + +MossdeepCity_Gym_Text_2213C2: @ 82213C2 + .string "Even at the risk of life, I will win\n" + .string "this battle!$" + +MossdeepCity_Gym_Text_2213F4: @ 82213F4 + .string "What you do…\n" + .string "It horrifies me…$" + +MossdeepCity_Gym_Text_221412: @ 8221412 + .string "How dare you beat me…\p" + .string "It won’t be my fault if something\n" + .string "horrible befalls you…$" + +MossdeepCity_Gym_Text_221460: @ 8221460 + .string "Hohoho.\p" + .string "You need me to show you how tenacious\n" + .string "the PSYCHIC type can be.$" + +MossdeepCity_Gym_Text_2214A7: @ 82214A7 + .string "Oh! My, my!\n" + .string "Your battle style is fantastic!$" + +MossdeepCity_Gym_Text_2214D3: @ 82214D3 + .string "I… I don’t let defeat rattle m-me,\n" + .string "however b-badly.$" + +MossdeepCity_Gym_Text_221507: @ 8221507 + .string "Let me show you a perfectly awful,\n" + .string "horrifying time!$" + +MossdeepCity_Gym_Text_22153B: @ 822153B + .string "N-nooooo!$" + +MossdeepCity_Gym_Text_221545: @ 8221545 + .string "Your vitality is contagious!\n" + .string "Get away from me quickly!$" + +MossdeepCity_Gym_Text_22157C: @ 822157C + .string "I may be past my prime, but I suggest\n" + .string "you not patronize me.$" + +MossdeepCity_Gym_Text_2215B8: @ 82215B8 + .string "Ah, you overflow with the power\n" + .string "of youth!$" + +MossdeepCity_Gym_Text_2215E2: @ 82215E2 + .string "It seems that I could not overcome\n" + .string "your youthful energy.$" + +MossdeepCity_Gym_Text_22161B: @ 822161B + .string "You’re not getting through to the end!\n" + .string "Not if I can help it!$" + +MossdeepCity_Gym_Text_221658: @ 8221658 + .string "How could you be so ludicrously\n" + .string "strong?$" + +MossdeepCity_Gym_Text_221680: @ 8221680 + .string "Humph! You may be strong, but you’re\n" + .string "not suitable for the PSYCHIC type!\p" + .string "The way you battle is somehow brutal!$" + +MossdeepCity_Gym_Text_2216EE: @ 82216EE + .string "Wroooar! Have a taste of my super\n" + .string "POKéMON hard-battling power!$" + +MossdeepCity_Gym_Text_22172D: @ 822172D + .string "Oh!\n" + .string "Done in!$" + +MossdeepCity_Gym_Text_22173A: @ 822173A + .string "All right! I think I’ll develop a special\n" + .string "invincible POKéMON power next.$" + +MossdeepCity_Gym_Text_221783: @ 8221783 + .string "TATE: Hehehe… Were you surprised?\p" + .string "LIZA: Fufufu… Were you surprised?\p" + .string "TATE: That there are two GYM LEADERS?\n" + .string "LIZA: That there are two GYM LEADERS?\p" + .string "TATE: We’re twins!\n" + .string "LIZA: We’re twins!\p" + .string "TATE: We don’t need to talk because…\n" + .string "LIZA: We can each determine what…\p" + .string "TATE: The other is thinking…\n" + .string "LIZA: All in our minds!\p" + .string "TATE: This combination of ours…\n" + .string "LIZA: Can you beat it?$" + +MossdeepCity_Gym_Text_2218EC: @ 82218EC + .string "TATE: What?! Our combination…\n" + .string "LIZA: Was shattered!\p" + .string "TATE: It can’t be helped. You’ve won…\n" + .string "LIZA: So, in recognition, take this.$" + +MossdeepCity_Gym_Text_22196A: @ 822196A + .string "{PLAYER} received the MIND BADGE\n" + .string "from TATE and LIZA.$" + +MossdeepCity_Gym_Text_221999: @ 8221999 + .string "TATE: The MIND BADGE enhances the\n" + .string "SP. ATK and SP. DEF of POKéMON.\p" + .string "LIZA: It also lets you use the HM move\n" + .string "DIVE outside of battle.\p" + .string "TATE: You should also take this, too.$" + +MossdeepCity_Gym_Text_221A40: @ 8221A40 + .string "TATE: That TM04 contains…\n" + .string "LIZA: CALM MIND!\p" + .string "TATE: It raises SP. ATK and…\n" + .string "LIZA: It raises SP. DEF!\p" + .string "TATE: It’s a move that’s perfect…\n" + .string "LIZA: For PSYCHIC POKéMON!\p" + .string "… … … … … …$" + +MossdeepCity_Gym_Text_221AEA: @ 8221AEA + .string "Registered GYM LEADERS TATE & LIZA\n" + .string "in the POKéNAV.$" + +MossdeepCity_Gym_Text_221B1D: @ 8221B1D + .string "TATE: Looks like the bond between you\n" + .string "and your POKéMON is far stronger than\l" + .string "the bond that we share as twins.\p" + .string "LIZA: You will become even stronger!\n" + .string "We’ve battled you, so we know.$" + +MossdeepCity_Gym_Text_221BCE: @ 8221BCE + .string "TATE: Hehehe… Were you surprised?\p" + .string "LIZA: That there are two GYM LEADERS?\p" + .string "TATE: Oops, you have only one…\n" + .string "LIZA: POKéMON that can battle.\p" + .string "TATE: We can’t battle that way!\p" + .string "LIZA: If you want to challenge us,\n" + .string "bring some more POKéMON.$" + +MossdeepCity_Gym_Text_221CB0: @ 8221CB0 + .string "MOSSDEEP CITY POKéMON GYM$" + +MossdeepCity_Gym_Text_221CCA: @ 8221CCA + .string "MOSSDEEP CITY POKéMON GYM\p" + .string "LIZA AND TATE’S CERTIFIED TRAINERS:\n" + .string "{PLAYER}$" + +MossdeepCity_Gym_Text_221D0B: @ 8221D0B + .string "TATE: POKéMON…\n" + .string "LIZA: POKéMON…\p" + .string "TATE: By changing the party’s mix…\n" + .string "LIZA: The battle style changes.\p" + .string "TATE: But me…\n" + .string "LIZA: But me…\p" + .string "TATE: I’ll always be with LIZA!\n" + .string "LIZA: I’ll always be with TATE!\p" + .string "TATE: Our combination…\n" + .string "LIZA: We’ll show you again and again!$" + +MossdeepCity_Gym_Text_221E05: @ 8221E05 + .string "TATE: You and your POKéMON…\n" + .string "LIZA: It’s as if you were siblings!$" + +MossdeepCity_Gym_Text_221E45: @ 8221E45 + .string "TATE: You can knock us down,\n" + .string "but we’ll never stay down!\p" + .string "LIZA: Because the two of us,\n" + .string "we always support each other!$" + +MossdeepCity_Gym_Text_221EB8: @ 8221EB8 + .string "TATE: You’re back again…\n" + .string "LIZA: You’re back again…\p" + .string "TATE: To give us a rematch.\n" + .string "LIZA: To give us a rematch.\p" + .string "TATE: But…\n" + .string "LIZA: For our match…\p" + .string "TATE: You brought just one POKéMON!\n" + .string "LIZA: You brought just one POKéMON!\p" + .string "TATE: We need you to bring at least…\n" + .string "LIZA: Two POKéMON when you come back.$" + diff --git a/data/maps/MossdeepCity_House1/events.inc b/data/maps/MossdeepCity_House1/events.inc new file mode 100644 index 000000000..a7832fb09 --- /dev/null +++ b/data/maps/MossdeepCity_House1/events.inc @@ -0,0 +1,11 @@ +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 + +MossdeepCity_House1_MapWarps: @ 85329A8 + 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/MossdeepCity_House1/scripts.inc b/data/maps/MossdeepCity_House1/scripts.inc new file mode 100644 index 000000000..b08d296c7 --- /dev/null +++ b/data/maps/MossdeepCity_House1/scripts.inc @@ -0,0 +1,42 @@ +MossdeepCity_House1_MapScripts:: @ 8221FD5 + .byte 0 + +MossdeepCity_House1_EventScript_221FD6:: @ 8221FD6 + lock + faceplayer + bufferleadmonspeciesname 0 + msgbox MossdeepCity_House1_Text_22200F, 4 + specialvar VAR_RESULT, GetPokeblockNameByMonNature + compare VAR_RESULT, 0 + goto_eq MossdeepCity_House1_EventScript_221FFC + msgbox MossdeepCity_House1_Text_22201D, 4 + release + end + +MossdeepCity_House1_EventScript_221FFC:: @ 8221FFC + msgbox MossdeepCity_House1_Text_222068, 4 + release + end + +MossdeepCity_House1_EventScript_222006:: @ 8222006 + msgbox MossdeepCity_House1_Text_222099, 2 + end + +MossdeepCity_House1_Text_22200F: @ 822200F + .string "Hmm!\n" + .string "Your {STR_VAR_1}…$" + +MossdeepCity_House1_Text_22201D: @ 822201D + .string "It likes {STR_VAR_1}S,\n" + .string "doesn’t it?\p" + .string "No, I’m positive of it! It definitely\n" + .string "likes {STR_VAR_1}S!$" + +MossdeepCity_House1_Text_222068: @ 8222068 + .string "It doesn’t appear to like or dislike\n" + .string "any {POKEBLOCK}S.$" + +MossdeepCity_House1_Text_222099: @ 8222099 + .string "My husband can tell what kind of\n" + .string "{POKEBLOCK}S a POKéMON likes at a glance.$" + diff --git a/data/maps/MossdeepCity_House2/events.inc b/data/maps/MossdeepCity_House2/events.inc new file mode 100644 index 000000000..86ba58946 --- /dev/null +++ b/data/maps/MossdeepCity_House2/events.inc @@ -0,0 +1,12 @@ +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 + +MossdeepCity_House2_MapWarps: @ 8532A14 + 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/MossdeepCity_House2/scripts.inc b/data/maps/MossdeepCity_House2/scripts.inc new file mode 100644 index 000000000..c61f74d99 --- /dev/null +++ b/data/maps/MossdeepCity_House2/scripts.inc @@ -0,0 +1,70 @@ +MossdeepCity_House2_MapScripts:: @ 82220DE + .byte 0 + +MossdeepCity_House2_EventScript_2220DF:: @ 82220DF + msgbox MossdeepCity_House2_Text_222146, 2 + end + +MossdeepCity_House2_EventScript_2220E8:: @ 82220E8 + msgbox MossdeepCity_House2_Text_2221A6, 2 + end + +MossdeepCity_House2_EventScript_2220F1:: @ 82220F1 + lock + faceplayer + waitse + playmoncry SPECIES_WINGULL, 0 + msgbox MossdeepCity_House2_Text_22222E, 4 + waitmoncry + closemessage + setflag FLAG_0x0E0 + clearflag FLAG_0x3A5 + compare VAR_FACING, 2 + call_if 1, MossdeepCity_House2_EventScript_222124 + compare VAR_FACING, 3 + call_if 1, MossdeepCity_House2_EventScript_22212F + removeobject 3 + release + end + +MossdeepCity_House2_EventScript_222124:: @ 8222124 + applymovement 3, MossdeepCity_House2_Movement_22213A + waitmovement 0 + return + +MossdeepCity_House2_EventScript_22212F:: @ 822212F + applymovement 3, MossdeepCity_House2_Movement_222141 + waitmovement 0 + return + +MossdeepCity_House2_Movement_22213A: @ 822213A + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_down + delay_8 + step_end + +MossdeepCity_House2_Movement_222141: @ 8222141 + walk_fast_down + walk_fast_down + walk_fast_down + delay_8 + step_end + +MossdeepCity_House2_Text_222146: @ 8222146 + .string "My little sister exchanges MAIL with\n" + .string "her boyfriend in FORTREE.\p" + .string "I don’t envy her one bit at all.$" + +MossdeepCity_House2_Text_2221A6: @ 82221A6 + .string "Even though I can’t see my friend in\n" + .string "FORTREE, my POKéMON carries MAIL\l" + .string "back and forth for us.\p" + .string "I’m not lonesome, even though we’re\n" + .string "apart.$" + +MossdeepCity_House2_Text_22222E: @ 822222E + .string "WINGULL: Pihyoh!$" + diff --git a/data/maps/MossdeepCity_House3/events.inc b/data/maps/MossdeepCity_House3/events.inc new file mode 100644 index 000000000..e40e79e10 --- /dev/null +++ b/data/maps/MossdeepCity_House3/events.inc @@ -0,0 +1,10 @@ +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 + +MossdeepCity_House3_MapWarps: @ 8532BEC + 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/MossdeepCity_House3/scripts.inc b/data/maps/MossdeepCity_House3/scripts.inc new file mode 100644 index 000000000..dfdbfa956 --- /dev/null +++ b/data/maps/MossdeepCity_House3/scripts.inc @@ -0,0 +1,52 @@ +MossdeepCity_House3_MapScripts:: @ 82225C2 + .byte 0 + +MossdeepCity_House3_EventScript_2225C3:: @ 82225C3 + lock + faceplayer + checkflag FLAG_0x098 + goto_eq MossdeepCity_House3_EventScript_222602 + msgbox MossdeepCity_House3_Text_222616, 5 + compare VAR_RESULT, 0 + goto_eq MossdeepCity_House3_EventScript_22260C + msgbox MossdeepCity_House3_Text_2226B6, 4 + giveitem_std ITEM_SUPER_ROD + setflag FLAG_0x098 + msgbox MossdeepCity_House3_Text_2226F0, 4 + release + end + +MossdeepCity_House3_EventScript_222602:: @ 8222602 + msgbox MossdeepCity_House3_Text_222751, 4 + release + end + +MossdeepCity_House3_EventScript_22260C:: @ 822260C + msgbox MossdeepCity_House3_Text_222733, 4 + release + end + +MossdeepCity_House3_Text_222616: @ 8222616 + .string "Hey there, TRAINER!\n" + .string "A SUPER ROD really is super!\p" + .string "Say all you want, but this baby can\n" + .string "catch POKéMON off the seafloor!\p" + .string "What do you think?\n" + .string "You want it, don’t you?$" + +MossdeepCity_House3_Text_2226B6: @ 82226B6 + .string "You bet, you bet!\n" + .string "After all, a SUPER ROD is really super!$" + +MossdeepCity_House3_Text_2226F0: @ 82226F0 + .string "If there’s any water, try dropping in\n" + .string "your ROD and see what bites!$" + +MossdeepCity_House3_Text_222733: @ 8222733 + .string "Hunh?\n" + .string "Don’t you like to fish?$" + +MossdeepCity_House3_Text_222751: @ 8222751 + .string "Go after the seafloor POKéMON with\n" + .string "your SUPER ROD.$" + diff --git a/data/maps/MossdeepCity_House4/events.inc b/data/maps/MossdeepCity_House4/events.inc new file mode 100644 index 000000000..96d8fe7d8 --- /dev/null +++ b/data/maps/MossdeepCity_House4/events.inc @@ -0,0 +1,12 @@ +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 + +MossdeepCity_House4_MapWarps: @ 8532CF4 + 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/MossdeepCity_House4/scripts.inc b/data/maps/MossdeepCity_House4/scripts.inc new file mode 100644 index 000000000..cb3cc0d16 --- /dev/null +++ b/data/maps/MossdeepCity_House4/scripts.inc @@ -0,0 +1,63 @@ +MossdeepCity_House4_MapScripts:: @ 8222DD7 + .byte 0 + +MossdeepCity_House4_EventScript_222DD8:: @ 8222DD8 + lock + faceplayer + checkflag FLAG_SYS_GAME_CLEAR + goto_eq MossdeepCity_House4_EventScript_222DED + msgbox MossdeepCity_House4_Text_222E31, 4 + release + end + +MossdeepCity_House4_EventScript_222DED:: @ 8222DED + msgbox MossdeepCity_House4_Text_222E73, 4 + release + end + +MossdeepCity_House4_EventScript_222DF7:: @ 8222DF7 + lock + faceplayer + special sub_80E8BC8 + compare VAR_RESULT, 0 + goto_eq MossdeepCity_House4_EventScript_222E14 + special GetSecretBaseNearbyMapName + msgbox MossdeepCity_House4_Text_222ECC, 4 + release + end + +MossdeepCity_House4_EventScript_222E14:: @ 8222E14 + msgbox MossdeepCity_House4_Text_222EF7, 4 + release + end + +MossdeepCity_House4_EventScript_222E1E:: @ 8222E1E + lock + faceplayer + waitse + playmoncry SPECIES_SKITTY, 0 + msgbox MossdeepCity_House4_Text_222F31, 4 + waitmoncry + release + end + +MossdeepCity_House4_Text_222E31: @ 8222E31 + .string "My little brother says he likes to go\n" + .string "find people’s SECRET BASES.$" + +MossdeepCity_House4_Text_222E73: @ 8222E73 + .string "My little brother says he likes to\n" + .string "visit people’s SECRET BASES and have\l" + .string "POKéMON battles.$" + +MossdeepCity_House4_Text_222ECC: @ 8222ECC + .string "Was it you who made a SECRET BASE\n" + .string "near {STR_VAR_1}?$" + +MossdeepCity_House4_Text_222EF7: @ 8222EF7 + .string "You should make a SECRET BASE\n" + .string "somewhere. I’ll go find it!$" + +MossdeepCity_House4_Text_222F31: @ 8222F31 + .string "SKITTY: Miyaan?$" + diff --git a/data/maps/MossdeepCity_Mart/events.inc b/data/maps/MossdeepCity_Mart/events.inc new file mode 100644 index 000000000..d8314e6e5 --- /dev/null +++ b/data/maps/MossdeepCity_Mart/events.inc @@ -0,0 +1,13 @@ +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 + +MossdeepCity_Mart_MapWarps: @ 8532BB0 + 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/MossdeepCity_Mart/scripts.inc b/data/maps/MossdeepCity_Mart/scripts.inc new file mode 100644 index 000000000..ed7ecd035 --- /dev/null +++ b/data/maps/MossdeepCity_Mart/scripts.inc @@ -0,0 +1,60 @@ +MossdeepCity_Mart_MapScripts:: @ 82223C7 + .byte 0 + +MossdeepCity_Mart_EventScript_2223C8:: @ 82223C8 + lock + faceplayer + message gUnknown_08272A21 + waitmessage + pokemart MossdeepCity_Mart_Pokemart_2223E0 + msgbox gUnknown_08272A3F, 4 + release + end + + .align 2 +MossdeepCity_Mart_Pokemart_2223E0: @ 82223E0 + .2byte ITEM_ULTRA_BALL + .2byte ITEM_NET_BALL + .2byte ITEM_DIVE_BALL + .2byte ITEM_HYPER_POTION + .2byte ITEM_FULL_HEAL + .2byte ITEM_REVIVE + .2byte ITEM_MAX_REPEL + .2byte ITEM_X_ATTACK + .2byte ITEM_X_DEFEND + .2byte ITEM_NONE + release + end + +MossdeepCity_Mart_EventScript_2223F6:: @ 82223F6 + msgbox MossdeepCity_Mart_Text_222411, 2 + end + +MossdeepCity_Mart_EventScript_2223FF:: @ 82223FF + msgbox MossdeepCity_Mart_Text_2224A0, 2 + end + +MossdeepCity_Mart_EventScript_222408:: @ 8222408 + msgbox MossdeepCity_Mart_Text_2224FA, 2 + end + +MossdeepCity_Mart_Text_222411: @ 8222411 + .string "REVIVE is fantastic!\p" + .string "Give it to a fainted POKéMON,\n" + .string "and the POKéMON will arise.\p" + .string "But be careful, REVIVE doesn’t restore\n" + .string "the used-up PP of moves.$" + +MossdeepCity_Mart_Text_2224A0: @ 82224A0 + .string "MAX REPEL keeps all weak POKéMON away.\p" + .string "Out of all the REPEL sprays, it lasts\n" + .string "the longest.$" + +MossdeepCity_Mart_Text_2224FA: @ 82224FA + .string "The NET and DIVE BALLS are rare POKé\n" + .string "BALLS that are only made in MOSSDEEP.\p" + .string "A NET BALL is effective against\n" + .string "BUG-type and WATER-type POKéMON.\p" + .string "A DIVE BALL works best on POKéMON\n" + .string "at the bottom of the sea.$" + diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/events.inc b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..7e56185b2 --- /dev/null +++ b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc @@ -0,0 +1,13 @@ +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 + +MossdeepCity_PokemonCenter_1F_MapWarps: @ 8532A80 + 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/MossdeepCity_PokemonCenter_1F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..7fd2e61a0 --- /dev/null +++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc @@ -0,0 +1,36 @@ +MossdeepCity_PokemonCenter_1F_MapScripts:: @ 822223F + map_script 3, MossdeepCity_PokemonCenter_1F_MapScript1_22224A + map_script 5, MossdeepCity_PokemonCenter_1F_MapScript1_277C30 + .byte 0 + +MossdeepCity_PokemonCenter_1F_MapScript1_22224A: @ 822224A + setrespawn 9 + end + +MossdeepCity_PokemonCenter_1F_EventScript_22224E:: @ 822224E + setvar VAR_0x800B, 1 + call MossdeepCity_PokemonCenter_1F_EventScript_27191E + waitmessage + waitbuttonpress + release + end + +MossdeepCity_PokemonCenter_1F_EventScript_22225C:: @ 822225C + msgbox MossdeepCity_PokemonCenter_1F_Text_22226E, 2 + end + +MossdeepCity_PokemonCenter_1F_EventScript_222265:: @ 8222265 + msgbox MossdeepCity_PokemonCenter_1F_Text_2222D9, 2 + end + +MossdeepCity_PokemonCenter_1F_Text_22226E: @ 822226E + .string "The GYM LEADERS in this town are\n" + .string "a formidable duo.\p" + .string "Their combination attacks are, like,\n" + .string "excellent and wow!$" + +MossdeepCity_PokemonCenter_1F_Text_2222D9: @ 82222D9 + .string "Depending on the special abilities of\n" + .string "POKéMON, some moves might change\l" + .string "or not work at all.$" + diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..c5d5af15a --- /dev/null +++ b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc @@ -0,0 +1,15 @@ +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 + +MossdeepCity_PokemonCenter_2F_MapWarps: @ 8532B24 + 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/MossdeepCity_PokemonCenter_2F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..142bce560 --- /dev/null +++ b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc @@ -0,0 +1,28 @@ +MossdeepCity_PokemonCenter_2F_MapScripts:: @ 8222334 + map_script 2, MossdeepCity_PokemonCenter_2F_MapScript2_276C3B + map_script 4, MossdeepCity_PokemonCenter_2F_MapScript2_276B6C + map_script 1, MossdeepCity_PokemonCenter_2F_MapScript1_276BBE + map_script 3, MossdeepCity_PokemonCenter_2F_MapScript1_276ACF + .byte 0 + +MossdeepCity_PokemonCenter_2F_EventScript_222349:: @ 8222349 + call OldaleTown_PokemonCenter_2F_EventScript_276EB7 + end + +MossdeepCity_PokemonCenter_2F_EventScript_22234F:: @ 822234F + call OldaleTown_PokemonCenter_2F_EventScript_2770B2 + end + +MossdeepCity_PokemonCenter_2F_EventScript_222355:: @ 8222355 + call OldaleTown_PokemonCenter_2F_EventScript_2771DB + end + +MossdeepCity_PokemonCenter_2F_EventScript_22235B:: @ 822235B + msgbox MossdeepCity_PokemonCenter_2F_Text_222364, 2 + end + +MossdeepCity_PokemonCenter_2F_Text_222364: @ 8222364 + .string "If I win a whole lot of link battles\n" + .string "and show everyone how good I am,\l" + .string "I might get a fan following!$" + diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc new file mode 100644 index 000000000..fa5a8f3bb --- /dev/null +++ b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc @@ -0,0 +1,21 @@ +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 + +MossdeepCity_SpaceCenter_1F_MapWarps: @ 8532E20 + 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/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc new file mode 100644 index 000000000..2edf6d251 --- /dev/null +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -0,0 +1,439 @@ +MossdeepCity_SpaceCenter_1F_MapScripts:: @ 8222F41 + map_script 1, MossdeepCity_SpaceCenter_1F_MapScript1_222FC2 + map_script 3, MossdeepCity_SpaceCenter_1F_MapScript1_222F4C + .byte 0 + +MossdeepCity_SpaceCenter_1F_MapScript1_222F4C: @ 8222F4C + compare VAR_0x405D, 2 + goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222F58 + end + +MossdeepCity_SpaceCenter_1F_EventScript_222F58:: @ 8222F58 + setobjectxyperm 3, 1, 9 + setobjectmovementtype 3, 10 + setobjectxyperm 5, 0, 8 + setobjectmovementtype 5, 10 + setobjectxyperm 4, 1, 6 + setobjectmovementtype 4, 10 + setobjectxyperm 1, 3, 4 + setobjectmovementtype 1, 10 + setobjectmovementtype 2, 10 + compare VAR_0x409E, 1 + goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222FAA + compare VAR_0x409E, 2 + goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222FB2 + compare VAR_0x409E, 3 + goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222FBA + end + +MossdeepCity_SpaceCenter_1F_EventScript_222FAA:: @ 8222FAA + setobjectxyperm 9, 12, 2 + end + +MossdeepCity_SpaceCenter_1F_EventScript_222FB2:: @ 8222FB2 + setobjectxyperm 9, 13, 3 + end + +MossdeepCity_SpaceCenter_1F_EventScript_222FBA:: @ 8222FBA + setobjectxyperm 9, 14, 2 + end + +MossdeepCity_SpaceCenter_1F_MapScript1_222FC2: @ 8222FC2 + compare VAR_0x405D, 2 + goto_if 3, MossdeepCity_SpaceCenter_1F_EventScript_222FCE + end + +MossdeepCity_SpaceCenter_1F_EventScript_222FCE:: @ 8222FCE + setmetatile 2, 5, 996, 1 + return + +MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8 + lock + faceplayer + compare VAR_0x405D, 2 + goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223024 + dodailyevents + specialvar VAR_RESULT, GetWeekCount + buffernumberstring 0, VAR_RESULT + compare VAR_RESULT, 0 + call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_223012 + compare VAR_RESULT, 1 + call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_22301B + closemessage + applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 + waitmovement 0 + release + end + +MossdeepCity_SpaceCenter_1F_EventScript_223012:: @ 8223012 + msgbox MossdeepCity_SpaceCenter_1F_Text_2232A7, 4 + return + +MossdeepCity_SpaceCenter_1F_EventScript_22301B:: @ 822301B + msgbox MossdeepCity_SpaceCenter_1F_Text_2232C8, 4 + return + +MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024 + dodailyevents + specialvar VAR_RESULT, GetWeekCount + buffernumberstring 0, VAR_RESULT + compare VAR_RESULT, 0 + call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_223051 + compare VAR_RESULT, 1 + call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_22305A + closemessage + applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 + waitmovement 0 + release + end + +MossdeepCity_SpaceCenter_1F_EventScript_223051:: @ 8223051 + msgbox MossdeepCity_SpaceCenter_1F_Text_223305, 4 + return + +MossdeepCity_SpaceCenter_1F_EventScript_22305A:: @ 822305A + msgbox MossdeepCity_SpaceCenter_1F_Text_22335E, 4 + return + +MossdeepCity_SpaceCenter_1F_EventScript_223063:: @ 8223063 + lock + faceplayer + compare VAR_0x405D, 2 + goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22307A + msgbox MossdeepCity_SpaceCenter_1F_Text_2233D3, 4 + release + end + +MossdeepCity_SpaceCenter_1F_EventScript_22307A:: @ 822307A + msgbox MossdeepCity_SpaceCenter_1F_Text_2234B7, 4 + applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 + waitmovement 0 + release + end + +MossdeepCity_SpaceCenter_1F_EventScript_22308E:: @ 822308E + lock + faceplayer + compare VAR_0x405D, 2 + goto_eq MossdeepCity_SpaceCenter_1F_EventScript_2230DA + checkflag FLAG_0x0C0 + goto_eq MossdeepCity_SpaceCenter_1F_EventScript_2230D0 + msgbox MossdeepCity_SpaceCenter_1F_Text_223540, 4 + giveitem_std ITEM_SUN_STONE + compare VAR_RESULT, 0 + goto_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 + setflag FLAG_0x0C0 + msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, 4 + release + end + +MossdeepCity_SpaceCenter_1F_EventScript_2230D0:: @ 82230D0 + msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, 4 + release + end + +MossdeepCity_SpaceCenter_1F_EventScript_2230DA:: @ 82230DA + checkflag FLAG_0x0C0 + goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223119 + msgbox MossdeepCity_SpaceCenter_1F_Text_2235F0, 4 + giveitem_std ITEM_SUN_STONE + compare VAR_RESULT, 0 + goto_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 + setflag FLAG_0x0C0 + msgbox MossdeepCity_SpaceCenter_1F_Text_223664, 4 + applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 + waitmovement 0 + release + end + +MossdeepCity_SpaceCenter_1F_EventScript_223119:: @ 8223119 + msgbox MossdeepCity_SpaceCenter_1F_Text_223664, 4 + applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 + waitmovement 0 + release + end + +MossdeepCity_SpaceCenter_1F_EventScript_22312D:: @ 822312D + lock + faceplayer + checkflag FLAG_SYS_GAME_CLEAR + goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223154 + compare VAR_0x405D, 2 + goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22315E + compare VAR_0x405D, 2 + goto_if 0, MossdeepCity_SpaceCenter_1F_EventScript_223154 + goto MossdeepCity_SpaceCenter_1F_EventScript_22315E + end + +MossdeepCity_SpaceCenter_1F_EventScript_223154:: @ 8223154 + msgbox MossdeepCity_SpaceCenter_1F_Text_2236A6, 4 + release + end + +MossdeepCity_SpaceCenter_1F_EventScript_22315E:: @ 822315E + msgbox MossdeepCity_SpaceCenter_1F_Text_2236E8, 4 + release + end + +MossdeepCity_SpaceCenter_1F_EventScript_223168:: @ 8223168 + lock + faceplayer + checkflag FLAG_SYS_GAME_CLEAR + goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22318F + compare VAR_0x405D, 2 + goto_eq MossdeepCity_SpaceCenter_1F_EventScript_2231A4 + compare VAR_0x405D, 2 + goto_if 0, MossdeepCity_SpaceCenter_1F_EventScript_22318F + goto MossdeepCity_SpaceCenter_1F_EventScript_2231A4 + end + +MossdeepCity_SpaceCenter_1F_EventScript_22318F:: @ 822318F + msgbox MossdeepCity_SpaceCenter_1F_Text_22375B, 4 + closemessage + applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 + waitmovement 0 + release + end + +MossdeepCity_SpaceCenter_1F_EventScript_2231A4:: @ 82231A4 + msgbox MossdeepCity_SpaceCenter_1F_Text_2237B5, 4 + closemessage + applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 + waitmovement 0 + release + end + +MossdeepCity_SpaceCenter_1F_EventScript_2231B9:: @ 82231B9 + lock + faceplayer + msgbox MossdeepCity_SpaceCenter_1F_Text_223849, 4 + applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 + waitmovement 0 + release + end + +MossdeepCity_SpaceCenter_1F_EventScript_2231CF:: @ 82231CF + lockall + msgbox MossdeepCity_SpaceCenter_1F_Text_223C2C, 4 + releaseall + end + +MossdeepCity_SpaceCenter_1F_EventScript_2231DA:: @ 82231DA + trainerbattle 0, TRAINER_GRUNT_32, 0, MossdeepCity_SpaceCenter_1F_Text_22396C, MossdeepCity_SpaceCenter_1F_Text_223999 + msgbox MossdeepCity_SpaceCenter_1F_Text_2239AA, 6 + end + +MossdeepCity_SpaceCenter_1F_EventScript_2231F1:: @ 82231F1 + trainerbattle 0, TRAINER_GRUNT_16, 0, MossdeepCity_SpaceCenter_1F_Text_2239E6, MossdeepCity_SpaceCenter_1F_Text_223A21 + msgbox MossdeepCity_SpaceCenter_1F_Text_223A4B, 6 + end + +MossdeepCity_SpaceCenter_1F_EventScript_223208:: @ 8223208 + trainerbattle 0, TRAINER_GRUNT_33, 0, MossdeepCity_SpaceCenter_1F_Text_223A8A, MossdeepCity_SpaceCenter_1F_Text_223AFA + msgbox MossdeepCity_SpaceCenter_1F_Text_223B37, 6 + end + +MossdeepCity_SpaceCenter_1F_EventScript_22321F:: @ 822321F + lock + faceplayer + checkflag FLAG_0x0BF + goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22326E + msgbox MossdeepCity_SpaceCenter_1F_Text_223B90, 4 + trainerbattle 3, TRAINER_GRUNT_23, 0, MossdeepCity_SpaceCenter_1F_Text_223BC2 + setflag FLAG_0x0BF + moveobjectoffscreen 9 + switch VAR_FACING + case 3, MossdeepCity_SpaceCenter_1F_EventScript_223278 + case 3, MossdeepCity_SpaceCenter_1F_EventScript_223289 + applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_2232A2 + waitmovement 0 + setvar VAR_0x409E, 2 + release + end + +MossdeepCity_SpaceCenter_1F_EventScript_22326E:: @ 822326E + msgbox MossdeepCity_SpaceCenter_1F_Text_223BD3, 4 + release + end + +MossdeepCity_SpaceCenter_1F_EventScript_223278:: @ 8223278 + applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_22329A + waitmovement 0 + setvar VAR_0x409E, 1 + release + end + +MossdeepCity_SpaceCenter_1F_EventScript_223289:: @ 8223289 + applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_22329E + waitmovement 0 + setvar VAR_0x409E, 3 + release + end + +MossdeepCity_SpaceCenter_1F_Movement_22329A: @ 822329A + lock_facing_direction + walk_left + unlock_facing_direction + step_end + +MossdeepCity_SpaceCenter_1F_Movement_22329E: @ 822329E + lock_facing_direction + walk_right + unlock_facing_direction + step_end + +MossdeepCity_SpaceCenter_1F_Movement_2232A2: @ 82232A2 + face_left + lock_facing_direction + walk_right + unlock_facing_direction + step_end + +MossdeepCity_SpaceCenter_1F_Text_2232A7: @ 82232A7 + .string "The rocket’s launch is imminent!$" + +MossdeepCity_SpaceCenter_1F_Text_2232C8: @ 82232C8 + .string "The rocket launched safely!\n" + .string "That’s successful launch no. {STR_VAR_1}!$" + +MossdeepCity_SpaceCenter_1F_Text_223305: @ 8223305 + .string "I know that things are a little\n" + .string "haywire right now, but…\p" + .string "The rocket’s launch is imminent!$" + +MossdeepCity_SpaceCenter_1F_Text_22335E: @ 822335E + .string "I know that things are a little\n" + .string "haywire right now, but…\p" + .string "The rocket launched safely!\n" + .string "That’s successful launch no. {STR_VAR_1}!$" + +MossdeepCity_SpaceCenter_1F_Text_2233D3: @ 82233D3 + .string "A rocket launch demands perfection.\n" + .string "Not even a 1% margin of error is allowed.\p" + .string "Even if it’s 99% okay, the whole thing\n" + .string "is useless if 1% happens to be no good.\p" + .string "Despite that, we never stop trying.\n" + .string "Why? It’s a dream that never ends.$" + +MossdeepCity_SpaceCenter_1F_Text_2234B7: @ 82234B7 + .string "Those MAGMA thugs have their sights\n" + .string "set on our SPACE CENTER.\p" + .string "But we can’t allow anything that minor\n" + .string "to interfere with our rocket launch!$" + +MossdeepCity_SpaceCenter_1F_Text_223540: @ 8223540 + .string "I was taking a stroll down the beach\n" + .string "when I found this.\p" + .string "It’s not anything I need, so you can\n" + .string "have it.$" + +MossdeepCity_SpaceCenter_1F_Text_2235A6: @ 82235A6 + .string "The HOENN region has been famous for \n" + .string "its meteor showers for a long time.$" + +MossdeepCity_SpaceCenter_1F_Text_2235F0: @ 82235F0 + .string "TEAM MAGMA can’t be allowed to steal\n" + .string "the rocket fuel.\p" + .string "Oh, by the way, you can have this stone\n" + .string "I found on the beach.$" + +MossdeepCity_SpaceCenter_1F_Text_223664: @ 8223664 + .string "With TEAM MAGMA around, I guess\n" + .string "strolls on the beach aren’t safe.$" + +MossdeepCity_SpaceCenter_1F_Text_2236A6: @ 82236A6 + .string "Some people claim that POKéMON came\n" + .string "from space. Could it be true?$" + +MossdeepCity_SpaceCenter_1F_Text_2236E8: @ 82236E8 + .string "TEAM AQUA should take care of\n" + .string "TEAM MAGMA!\p" + .string "But if they did that, TEAM AQUA will\n" + .string "become bold and brazen, won’t they?$" + +MossdeepCity_SpaceCenter_1F_Text_22375B: @ 822375B + .string "A giant chunk of metal bursts through\n" + .string "the skies and flies into space…\p" + .string "It boggles my mind!$" + +MossdeepCity_SpaceCenter_1F_Text_2237B5: @ 82237B5 + .string "A giant chunk of metal bursts through\n" + .string "the skies and flies into space…\p" + .string "But TEAM MAGMA wants to spoil\n" + .string "that dream of mine!\p" + .string "I’m not having any of that!$" + +MossdeepCity_SpaceCenter_1F_Text_223849: @ 8223849 + .string "STEVEN: {PLAYER}{KUN}, have you read that\n" + .string "proclamation already?\p" + .string "TEAM MAGMA is coming after the rocket\n" + .string "fuel on this island.\p" + .string "I don’t know what they’d need it for,\n" + .string "but they can’t be allowed to take it.\p" + .string "I’ll keep an eye on things for\n" + .string "a while longer.\p" + .string "In the meantime, why don’t you go\n" + .string "check out the town?$" + +MossdeepCity_SpaceCenter_1F_Text_22396C: @ 822396C + .string "As promised, we’ve come for\n" + .string "the rocket fuel!$" + +MossdeepCity_SpaceCenter_1F_Text_223999: @ 8223999 + .string "Ran out of fuel…$" + +MossdeepCity_SpaceCenter_1F_Text_2239AA: @ 82239AA + .string "Don’t think you’re on a roll just\n" + .string "because you’ve beaten me!$" + +MossdeepCity_SpaceCenter_1F_Text_2239E6: @ 82239E6 + .string "We gave you fair warning!\n" + .string "There’s nothing sneaky about us!$" + +MossdeepCity_SpaceCenter_1F_Text_223A21: @ 8223A21 + .string "Grrr…\n" + .string "We should’ve used sneaky treachery…$" + +MossdeepCity_SpaceCenter_1F_Text_223A4B: @ 8223A4B + .string "Okay, I get it already! The next time,\n" + .string "we’ll come unannounced.$" + +MossdeepCity_SpaceCenter_1F_Text_223A8A: @ 8223A8A + .string "The rocket fuel the SPACE CENTER has\n" + .string "in storage--that’s what we’re after.\p" + .string "We mean to take every last bit of it!$" + +MossdeepCity_SpaceCenter_1F_Text_223AFA: @ 8223AFA + .string "Please, can you spare some fuel?\n" + .string "Even a chintzy cup will do!$" + +MossdeepCity_SpaceCenter_1F_Text_223B37: @ 8223B37 + .string "What are we going to do with\n" + .string "the rocket fuel?\p" + .string "How would I know?\n" + .string "Ask our leader upstairs!$" + +MossdeepCity_SpaceCenter_1F_Text_223B90: @ 8223B90 + .string "Our leader said no one, but no one,\n" + .string "gets past me!$" + +MossdeepCity_SpaceCenter_1F_Text_223BC2: @ 8223BC2 + .string "Ack! Ack! Aaack!$" + +MossdeepCity_SpaceCenter_1F_Text_223BD3: @ 8223BD3 + .string "Please, tell our leader that\n" + .string "I never abandoned my post.\l" + .string "That I stayed to the bitter end…$" + +MossdeepCity_SpaceCenter_1F_Text_223C2C: @ 8223C2C + .string "This is…\n" + .string "An intent-to-steal notice?\p" + .string "“To the staff of the SPACE CENTER:\n" + .string "How are you? We are doing fine.\p" + .string "“We will soon visit you to take your\n" + .string "rocket fuel.\p" + .string "“Please don’t try to stop us.\n" + .string "We will take the fuel no matter what.\p" + .string "“Let there be more land!\n" + .string " TEAM MAGMAâ€$" + diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc new file mode 100644 index 000000000..bf143934e --- /dev/null +++ b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc @@ -0,0 +1,17 @@ +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 + +MossdeepCity_SpaceCenter_2F_MapWarps: @ 8532F24 + 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/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc new file mode 100644 index 000000000..0052f09aa --- /dev/null +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -0,0 +1,524 @@ +MossdeepCity_SpaceCenter_2F_MapScripts:: @ 8223D58 + map_script 3, MossdeepCity_SpaceCenter_2F_MapScript1_223D63 + map_script 2, MossdeepCity_SpaceCenter_2F_MapScript2_223DB5 + .byte 0 + +MossdeepCity_SpaceCenter_2F_MapScript1_223D63: @ 8223D63 + compare VAR_0x405D, 2 + call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_223D7A + compare VAR_0x409F, 2 + call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_223D9F + end + +MossdeepCity_SpaceCenter_2F_EventScript_223D7A:: @ 8223D7A + clearflag FLAG_0x0CD + setobjectxyperm 3, 5, 3 + setobjectmovementtype 3, 10 + setobjectxyperm 1, 3, 2 + setobjectmovementtype 1, 10 + setobjectxyperm 2, 1, 3 + setobjectmovementtype 2, 10 + return + +MossdeepCity_SpaceCenter_2F_EventScript_223D9F:: @ 8223D9F + setobjectxyperm 5, 11, 2 + setobjectxyperm 7, 15, 2 + setobjectxyperm 6, 13, 4 + return + +MossdeepCity_SpaceCenter_2F_MapScript2_223DB5: @ 8223DB5 + map_script_2 VAR_0x409F, 1, MossdeepCity_SpaceCenter_2F_EventScript_223DBF + .2byte 0 + +MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF + playse SE_PIN + applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_272598 + waitmovement 0 + applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_27259A + waitmovement 0 + msgbox MossdeepCity_SpaceCenter_2F_Text_2243A4, 5 + compare VAR_RESULT, 1 + goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223E09 + msgbox MossdeepCity_SpaceCenter_2F_Text_2243FE, 4 + closemessage + applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_223E07 + waitmovement 0 + warp MAP_MOSSDEEP_CITY_SPACE_CENTER_1F, 255, 13, 1 + waitstate + releaseall + end + +MossdeepCity_SpaceCenter_2F_Movement_223E07: @ 8223E07 + walk_up + step_end + +MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09 + msgbox MossdeepCity_SpaceCenter_2F_Text_22442D, 4 + trainerbattle 3, TRAINER_GRUNT_34, 0, MossdeepCity_SpaceCenter_2F_Text_224461 + applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_223E85 + waitmovement 0 + applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_2725A4 + waitmovement 0 + msgbox MossdeepCity_SpaceCenter_2F_Text_22446E, 4 + trainerbattle 3, TRAINER_GRUNT_35, 0, MossdeepCity_SpaceCenter_2F_Text_224499 + applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_223E81 + waitmovement 0 + applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_2725A8 + waitmovement 0 + msgbox MossdeepCity_SpaceCenter_2F_Text_2244AB, 4 + trainerbattle 3, TRAINER_GRUNT_36, 0, MossdeepCity_SpaceCenter_2F_Text_2244F1 + applymovement 7, MossdeepCity_SpaceCenter_2F_Movement_223E89 + waitmovement 0 + setvar VAR_0x409F, 2 + moveobjectoffscreen 5 + moveobjectoffscreen 7 + moveobjectoffscreen 6 + releaseall + end + +MossdeepCity_SpaceCenter_2F_Movement_223E81: @ 8223E81 + lock_facing_direction + walk_left + unlock_facing_direction + step_end + +MossdeepCity_SpaceCenter_2F_Movement_223E85: @ 8223E85 + lock_facing_direction + walk_down + unlock_facing_direction + step_end + +MossdeepCity_SpaceCenter_2F_Movement_223E89: @ 8223E89 + lock_facing_direction + walk_right + unlock_facing_direction + step_end + +MossdeepCity_SpaceCenter_2F_EventScript_223E8D:: @ 8223E8D + lock + faceplayer + checkflag FLAG_SYS_GAME_CLEAR + goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EB4 + compare VAR_0x405D, 2 + goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EBE + compare VAR_0x405D, 2 + goto_if 0, MossdeepCity_SpaceCenter_2F_EventScript_223EB4 + goto MossdeepCity_SpaceCenter_2F_EventScript_223EBE + end + +MossdeepCity_SpaceCenter_2F_EventScript_223EB4:: @ 8223EB4 + msgbox MossdeepCity_SpaceCenter_2F_Text_2241A1, 4 + release + end + +MossdeepCity_SpaceCenter_2F_EventScript_223EBE:: @ 8223EBE + msgbox MossdeepCity_SpaceCenter_2F_Text_22420C, 4 + release + end + +MossdeepCity_SpaceCenter_2F_EventScript_223EC8:: @ 8223EC8 + lock + faceplayer + checkflag FLAG_SYS_GAME_CLEAR + goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EEF + compare VAR_0x405D, 2 + goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EF9 + compare VAR_0x405D, 2 + goto_if 0, MossdeepCity_SpaceCenter_2F_EventScript_223EEF + goto MossdeepCity_SpaceCenter_2F_EventScript_223EF9 + end + +MossdeepCity_SpaceCenter_2F_EventScript_223EEF:: @ 8223EEF + msgbox MossdeepCity_SpaceCenter_2F_Text_224253, 4 + release + end + +MossdeepCity_SpaceCenter_2F_EventScript_223EF9:: @ 8223EF9 + msgbox MossdeepCity_SpaceCenter_2F_Text_2242C5, 4 + release + end + +MossdeepCity_SpaceCenter_2F_EventScript_223F03:: @ 8223F03 + lock + faceplayer + checkflag FLAG_SYS_GAME_CLEAR + goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223F2A + compare VAR_0x405D, 2 + goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223F34 + compare VAR_0x405D, 2 + goto_if 0, MossdeepCity_SpaceCenter_2F_EventScript_223F2A + goto MossdeepCity_SpaceCenter_2F_EventScript_223F34 + end + +MossdeepCity_SpaceCenter_2F_EventScript_223F2A:: @ 8223F2A + msgbox MossdeepCity_SpaceCenter_2F_Text_224342, 4 + release + end + +MossdeepCity_SpaceCenter_2F_EventScript_223F34:: @ 8223F34 + msgbox MossdeepCity_SpaceCenter_2F_Text_224376, 4 + release + end + +MossdeepCity_SpaceCenter_2F_EventScript_223F3E:: @ 8223F3E + msgbox MossdeepCity_SpaceCenter_2F_Text_22452C, 2 + end + +MossdeepCity_SpaceCenter_2F_EventScript_223F47:: @ 8223F47 + msgbox MossdeepCity_SpaceCenter_2F_Text_224570, 2 + end + +MossdeepCity_SpaceCenter_2F_EventScript_223F50:: @ 8223F50 + msgbox MossdeepCity_SpaceCenter_2F_Text_2245AF, 2 + end + +MossdeepCity_SpaceCenter_2F_EventScript_223F59:: @ 8223F59 + lock + faceplayer + msgbox MossdeepCity_SpaceCenter_2F_Text_2245D9, 4 + applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725A2 + waitmovement 0 + release + end + +MossdeepCity_SpaceCenter_2F_EventScript_223F6F:: @ 8223F6F + lockall + msgbox MossdeepCity_SpaceCenter_2F_Text_22467B, 4 + releaseall + end + +MossdeepCity_SpaceCenter_2F_EventScript_223F7A:: @ 8223F7A + lockall + checkflag FLAG_0x0CD + goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223FDA + setflag FLAG_0x0CD + msgbox MossdeepCity_SpaceCenter_2F_Text_2246B2, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_2246F0, 4 + closemessage + delay 30 + playse SE_KOUKA_L + switch VAR_FACING + case 1, MossdeepCity_SpaceCenter_2F_EventScript_223FBA + applymovement 4, MossdeepCity_SpaceCenter_2F_Movement_223FC6 + waitmovement 0 + releaseall + end + +MossdeepCity_SpaceCenter_2F_EventScript_223FBA:: @ 8223FBA + applymovement 4, MossdeepCity_SpaceCenter_2F_Movement_223FCF + waitmovement 0 + releaseall + end + +MossdeepCity_SpaceCenter_2F_Movement_223FC6: @ 8223FC6 + 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 + 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 + applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_27259E + waitmovement 0 + msgbox MossdeepCity_SpaceCenter_2F_Text_2247FF, 5 + compare VAR_RESULT, 1 + goto_eq MossdeepCity_SpaceCenter_2F_EventScript_22400C + msgbox MossdeepCity_SpaceCenter_2F_Text_224854, 4 + closemessage + applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725AA + waitmovement 0 + releaseall + end + +MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C + applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725AA + waitmovement 0 + special SavePlayerParty + fadescreen 1 + special sub_80F9438 + waitstate + compare VAR_RESULT, 0 + goto_if 5, MossdeepCity_SpaceCenter_2F_EventScript_224032 + special LoadPlayerParty + goto MossdeepCity_SpaceCenter_2F_EventScript_223FDA + +MossdeepCity_SpaceCenter_2F_EventScript_224032:: @ 8224032 + special sub_80F94E8 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 4 + special sub_81A1780 + setvar VAR_0x8004, 8 + setvar VAR_0x8005, 0 + special sub_8163AC4 + waitstate + setvar VAR_0x8004, 6 + special sub_81A1780 + special LoadPlayerParty + switch VAR_RESULT + case 1, MossdeepCity_SpaceCenter_2F_EventScript_224071 + fadescreen 1 + special sp0C8_whiteout_maybe + waitstate + +MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 + msgbox MossdeepCity_SpaceCenter_2F_Text_2248C2, 4 + closemessage + delay 20 + applymovement 9, MossdeepCity_SpaceCenter_2F_Movement_2725A4 + applymovement 8, MossdeepCity_SpaceCenter_2F_Movement_2725AA + waitmovement 0 + delay 60 + applymovement 9, MossdeepCity_SpaceCenter_2F_Movement_2725A6 + applymovement 8, MossdeepCity_SpaceCenter_2F_Movement_2725A8 + waitmovement 0 + delay 20 + msgbox MossdeepCity_SpaceCenter_2F_Text_2249DC, 4 + closemessage + setvar VAR_0x405D, 3 + fadedefaultbgm + fadescreen 1 + setvar VAR_0x409F, 3 + setflag FLAG_0x2F4 + setflag FLAG_0x35E + setflag FLAG_0x337 + removeobject 5 + removeobject 7 + removeobject 6 + removeobject 8 + removeobject 9 + setobjectxy 3, 5, 6 + turnobject 3, 1 + setobjectxy 2, 11, 8 + turnobject 2, 2 + setobjectxy 1, 6, 2 + turnobject 1, 2 + call MossdeepCity_SpaceCenter_2F_EventScript_224131 + fadescreen 0 + msgbox MossdeepCity_SpaceCenter_2F_Text_224A4A, 4 + closemessage + fadescreen 1 + setflag FLAG_0x075 + setflag FLAG_0x3C7 + removeobject 4 + setflag FLAG_0x2E1 + clearflag FLAG_0x3C7 + setvar VAR_0x40C6, 1 + setflag FLAG_0x314 + removeobject 3 + setobjectxyperm 3, 5, 6 + setobjectmovementtype 3, 2 + addobject 3 + fadescreen 0 + end + +MossdeepCity_SpaceCenter_2F_EventScript_224131:: @ 8224131 + switch VAR_FACING + case 1, MossdeepCity_SpaceCenter_2F_EventScript_22414D + case 3, MossdeepCity_SpaceCenter_2F_EventScript_224152 + return + +MossdeepCity_SpaceCenter_2F_EventScript_22414D:: @ 822414D + turnobject 4, 2 + return + +MossdeepCity_SpaceCenter_2F_EventScript_224152:: @ 8224152 + turnobject 4, 4 + return + +MossdeepCity_SpaceCenter_2F_EventScript_224157:: @ 8224157 + trainerbattle 10, TRAINER_MAXIE_3, 0, MossdeepCity_SpaceCenter_2F_Text_22487C, MossdeepCity_SpaceCenter_2F_Text_22487C + end + +MossdeepCity_SpaceCenter_2F_EventScript_224166:: @ 8224166 + trainerbattle 11, TRAINER_TABITHA_1, 0, MossdeepCity_SpaceCenter_Text_2248AD, MossdeepCity_SpaceCenter_Text_2248AD + end + +MossdeepCity_SpaceCenter_2F_EventScript_224175:: @ 8224175 + lockall + checkplayergender + compare VAR_RESULT, 0 + call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_224193 + compare VAR_RESULT, 1 + call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_22419A + closemessage + clearflag FLAG_0x075 + releaseall + end + +MossdeepCity_SpaceCenter_2F_EventScript_224193:: @ 8224193 + pokenavcall MossdeepCity_SpaceCenter_2F_Text_2B38C1 + waitmessage + return + +MossdeepCity_SpaceCenter_2F_EventScript_22419A:: @ 822419A + pokenavcall MossdeepCity_SpaceCenter_2F_Text_2B39C6 + waitmessage + return + +MossdeepCity_SpaceCenter_2F_Text_2241A1: @ 82241A1 + .string "MOSSDEEP has mainly sunny weather,\n" + .string "and its winds are stable.\p" + .string "It’s an ideal location for launching\n" + .string "rockets.$" + +MossdeepCity_SpaceCenter_2F_Text_22420C: @ 822420C + .string "Why would TEAM MAGMA want to steal\n" + .string "our rocket fuel in the first place?$" + +MossdeepCity_SpaceCenter_2F_Text_224253: @ 8224253 + .string "If only I was a little younger, I would\n" + .string "have liked being an astronaut…\p" + .string "No… It’s not too late!\n" + .string "I can and will try!$" + +MossdeepCity_SpaceCenter_2F_Text_2242C5: @ 82242C5 + .string "If TEAM MAGMA takes the rocket fuel,\n" + .string "I won’t be able to go to space!\p" + .string "They can’t be allowed to get away\n" + .string "with such an outrage!$" + +MossdeepCity_SpaceCenter_2F_Text_224342: @ 8224342 + .string "I wish ordinary people could go into\n" + .string "space one day…$" + +MossdeepCity_SpaceCenter_2F_Text_224376: @ 8224376 + .string "TEAM MAGMA…\n" + .string "Do they want to go to space, too?$" + +MossdeepCity_SpaceCenter_2F_Text_2243A4: @ 82243A4 + .string "What’s wrong with you?\p" + .string "You’re outnumbered three to one,\n" + .string "but you still want to take us on?$" + +MossdeepCity_SpaceCenter_2F_Text_2243FE: @ 82243FE + .string "Good answer!\n" + .string "That’s what a smart person’ll do!$" + +MossdeepCity_SpaceCenter_2F_Text_22442D: @ 822442D + .string "A reckless go-getter, are you?\n" + .string "Okay, I’ll go first!$" + +MossdeepCity_SpaceCenter_2F_Text_224461: @ 8224461 + .string "I lost!\n" + .string "But!$" + +MossdeepCity_SpaceCenter_2F_Text_22446E: @ 822446E + .string "It’s too soon to be relieved!\n" + .string "I’m up next!$" + +MossdeepCity_SpaceCenter_2F_Text_224499: @ 8224499 + .string "I lost, too!\n" + .string "But!$" + +MossdeepCity_SpaceCenter_2F_Text_2244AB: @ 82244AB + .string "I bet you want to take a break.\n" + .string "But I’m not about to let you do that!$" + +MossdeepCity_SpaceCenter_2F_Text_2244F1: @ 82244F1 + .string "We should’ve taken a break…\n" + .string "That’s what we should’ve done…$" + +MossdeepCity_SpaceCenter_2F_Text_22452C: @ 822452C + .string "Three of us here, and look at the sorry\n" + .string "mess we got ourselves into.$" + +MossdeepCity_SpaceCenter_2F_Text_224570: @ 8224570 + .string "We three losing like this…\n" + .string "We look worse than usual by triple!$" + +MossdeepCity_SpaceCenter_2F_Text_2245AF: @ 82245AF + .string "Are we being useful to our leader\n" + .string "at all?$" + +MossdeepCity_SpaceCenter_2F_Text_2245D9: @ 82245D9 + .string "Hehehe!\p" + .string "We come all the way here to get some\n" + .string "fuel, and we’re interfered with again!\p" + .string "If you’re going to mess with us too,\n" + .string "we’ll take care of you at the same time!$" + +MossdeepCity_SpaceCenter_2F_Text_22467B: @ 822467B + .string "MAXIE: Clear out of the way!\n" + .string "Don’t you dare interfere!$" + +MossdeepCity_SpaceCenter_2F_Text_2246B2: @ 82246B2 + .string "STEVEN: TEAM MAGMA…\p" + .string "What’s the point of stealing rocket\n" + .string "fuel?$" + +MossdeepCity_SpaceCenter_2F_Text_2246F0: @ 82246F0 + .string "MAXIE: Fufufu… Since you’re so\n" + .string "curious, you deserve an explanation.\p" + .string "We’re going to jettison the entire\n" + .string "load into MT. CHIMNEY!\p" + .string "With GROUDON gone, we have no need\n" + .string "for that slag heap of a mountain!\p" + .string "So we’ll use the fuel’s power to make\n" + .string "the volcano erupt!\p" + .string "It will be savage!$" + +MossdeepCity_SpaceCenter_2F_Text_2247FF: @ 82247FF + .string "STEVEN: {PLAYER}{KUN}!\n" + .string "You’re going to help me?\p" + .string "Let’s go into battle together!\n" + .string "Are you ready?$" + +MossdeepCity_SpaceCenter_2F_Text_224854: @ 8224854 + .string "STEVEN: Then, hurry!\n" + .string "Get ready quickly!$" + +MossdeepCity_SpaceCenter_2F_Text_22487C: @ 822487C + .string "All I want…\n" + .string "I just want to expand the land mass…$" + +MossdeepCity_SpaceCenter_Text_2248AD: @ 82248AD + .string "I’m with our leader…$" + +MossdeepCity_SpaceCenter_2F_Text_2248C2: @ 82248C2 + .string "MAXIE: We failed to make the volcano\n" + .string "erupt…\p" + .string "We failed to control GROUDON after\n" + .string "we had awoken it…\p" + .string "Is our goal to expand the land\n" + .string "misguided?\p" + .string "… … … … … …\n" + .string "… … … … … …\p" + .string "If…\n" + .string "If we, TEAM MAGMA, are wrong…\l" + .string "… … … … … …\p" + .string "Then might TEAM AQUA’s goal to expand\n" + .string "the sea also be equally misguided?$" + +MossdeepCity_SpaceCenter_2F_Text_2249DC: @ 82249DC + .string "MAXIE: All right…\n" + .string "We will give up on the fuel…\p" + .string "There appear to be more important\n" + .string "matters that I must examine…$" + +MossdeepCity_SpaceCenter_2F_Text_224A4A: @ 8224A4A + .string "STEVEN: Whew, that was too tense.\n" + .string "{PLAYER}{KUN}, thank you.\p" + .string "I have something to give you as\n" + .string "thanks for your support.\p" + .string "Please come see me at home\n" + .string "after this.\p" + .string "Oh, yes, I don’t live in RUSTBORO CITY.\n" + .string "I live right here on this island.$" + diff --git a/data/maps/MossdeepCity_StevensHouse/events.inc b/data/maps/MossdeepCity_StevensHouse/events.inc new file mode 100644 index 000000000..0ee8e7d15 --- /dev/null +++ b/data/maps/MossdeepCity_StevensHouse/events.inc @@ -0,0 +1,18 @@ +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 + +MossdeepCity_StevensHouse_MapWarps: @ 8532C58 + 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 + 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 + +MossdeepCity_StevensHouse_MapEvents:: @ 8532C98 + map_events MossdeepCity_StevensHouse_EventObjects, MossdeepCity_StevensHouse_MapWarps, 0x0, MossdeepCity_StevensHouse_MapBGEvents + diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc new file mode 100644 index 000000000..14d0cd5c7 --- /dev/null +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -0,0 +1,219 @@ +MossdeepCity_StevensHouse_MapScripts:: @ 8222784 + map_script 1, MossdeepCity_StevensHouse_MapScript1_222794 + map_script 3, MossdeepCity_StevensHouse_MapScript1_2227A8 + map_script 2, MossdeepCity_StevensHouse_MapScript2_2227C0 + .byte 0 + +MossdeepCity_StevensHouse_MapScript1_222794: @ 8222794 + checkflag FLAG_SYS_GAME_CLEAR + call_if 0, MossdeepCity_StevensHouse_EventScript_22279E + end + +MossdeepCity_StevensHouse_EventScript_22279E:: @ 822279E + setmetatile 6, 4, 753, 1 + return + +MossdeepCity_StevensHouse_MapScript1_2227A8: @ 82227A8 + compare VAR_0x40C6, 2 + call_if 1, MossdeepCity_StevensHouse_EventScript_2227B4 + end + +MossdeepCity_StevensHouse_EventScript_2227B4:: @ 82227B4 + setobjectxyperm 1, 6, 5 + setobjectmovementtype 1, 7 + return + +MossdeepCity_StevensHouse_MapScript2_2227C0: @ 82227C0 + map_script_2 VAR_0x40C6, 1, MossdeepCity_StevensHouse_EventScript_2227CA + .2byte 0 + +MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA + lockall + applymovement 1, MossdeepCity_StevensHouse_Movement_2725A4 + waitmovement 0 + playse SE_PIN + applymovement 1, MossdeepCity_StevensHouse_Movement_272598 + waitmovement 0 + applymovement 1, MossdeepCity_StevensHouse_Movement_27259A + waitmovement 0 + applymovement 1, MossdeepCity_StevensHouse_Movement_222833 + waitmovement 0 + msgbox MossdeepCity_StevensHouse_Text_222936, 4 + giveitem_std ITEM_HM08 + setflag FLAG_0x07B + setflag FLAG_0x12E + msgbox MossdeepCity_StevensHouse_Text_222A0E, 4 + closemessage + delay 20 + applymovement 1, MossdeepCity_StevensHouse_Movement_22283B + waitmovement 0 + setflag FLAG_0x314 + setflag FLAG_0x3AD + setvar VAR_0x40C6, 2 + releaseall + end + +MossdeepCity_StevensHouse_Movement_222833: @ 8222833 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_down + step_end + +MossdeepCity_StevensHouse_Movement_22283B: @ 822283B + walk_up + walk_right + walk_right + walk_right + walk_in_place_fastest_up + step_end + +MossdeepCity_StevensHouse_EventScript_222841:: @ 8222841 + lockall + msgbox MossdeepCity_StevensHouse_Text_222B9E, 5 + compare VAR_RESULT, 0 + goto_eq MossdeepCity_StevensHouse_EventScript_22285B + goto MossdeepCity_StevensHouse_EventScript_222865 + end + +MossdeepCity_StevensHouse_EventScript_22285B:: @ 822285B + msgbox MossdeepCity_StevensHouse_Text_222C2A, 4 + releaseall + end + +MossdeepCity_StevensHouse_EventScript_222865:: @ 8222865 + setvar VAR_TEMP_1, 398 + givemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 + compare VAR_RESULT, 0 + goto_eq MossdeepCity_StevensHouse_EventScript_222895 + compare VAR_RESULT, 1 + goto_eq MossdeepCity_StevensHouse_EventScript_2228BD + goto MossdeepCity_StevensHouse_EventScript_273811 + end + +MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895 + call MossdeepCity_StevensHouse_EventScript_2228EB + msgbox gUnknown_08273374, 5 + compare VAR_RESULT, 0 + goto_eq MossdeepCity_StevensHouse_EventScript_222901 + call MossdeepCity_StevensHouse_EventScript_27378B + call MossdeepCity_StevensHouse_EventScript_2723DD + goto MossdeepCity_StevensHouse_EventScript_222901 + end + +MossdeepCity_StevensHouse_EventScript_2228BD:: @ 82228BD + call MossdeepCity_StevensHouse_EventScript_2228EB + msgbox gUnknown_08273374, 5 + compare VAR_RESULT, 0 + goto_eq MossdeepCity_StevensHouse_EventScript_2228E0 + call MossdeepCity_StevensHouse_EventScript_273797 + goto MossdeepCity_StevensHouse_EventScript_2228E0 + end + +MossdeepCity_StevensHouse_EventScript_2228E0:: @ 82228E0 + call MossdeepCity_StevensHouse_EventScript_2737A0 + goto MossdeepCity_StevensHouse_EventScript_222901 + end + +MossdeepCity_StevensHouse_EventScript_2228EB:: @ 82228EB + bufferspeciesname 1, SPECIES_BELDUM + removeobject 2 + playfanfare MUS_FANFA4 + message MossdeepCity_StevensHouse_Text_222BED + waitmessage + waitfanfare + bufferspeciesname 0, SPECIES_BELDUM + return + +MossdeepCity_StevensHouse_EventScript_222901:: @ 8222901 + setflag FLAG_0x3C8 + setflag FLAG_0x12A + releaseall + end + +MossdeepCity_StevensHouse_EventScript_222909:: @ 8222909 + msgbox MossdeepCity_StevensHouse_Text_222D97, 3 + end + +MossdeepCity_StevensHouse_EventScript_222912:: @ 8222912 + msgbox MossdeepCity_StevensHouse_Text_222B11, 2 + end + +MossdeepCity_StevensHouse_EventScript_22291B:: @ 822291B + lockall + msgbox MossdeepCity_StevensHouse_Text_222C4E, 4 + releaseall + end + +MossdeepCity_StevensHouse_EventScript_222926:: @ 8222926 + giveitem_std ITEM_HM08, 1, 1 + setflag FLAG_0x07B + end + +MossdeepCity_StevensHouse_Text_222936: @ 8222936 + .string "STEVEN: {PLAYER}{KUN}…\p" + .string "As you can see, there’s not much here,\n" + .string "but this is my home.\p" + .string "Thank you for all that you’ve done.\p" + .string "This is my token of appreciation.\n" + .string "It’s the HIDDEN MACHINE DIVE.\p" + .string "No need to be shy--you’ve earned\n" + .string "this HM.$" + +MossdeepCity_StevensHouse_Text_222A0E: @ 8222A0E + .string "STEVEN: While you’re using SURF, you\n" + .string "should notice dark patches of water.\p" + .string "Use DIVE if you come to deep water\n" + .string "like it. You’ll drop to the seafloor.\p" + .string "When you want to come back up, use\n" + .string "DIVE again.\p" + .string "In some places, it won’t be possible\n" + .string "for you to surface, though.$" + +MossdeepCity_StevensHouse_Text_222B11: @ 8222B11 + .string "STEVEN: Apparently, there’s an\n" + .string "underwater cavern between\l" + .string "MOSSDEEP and SOOTOPOLIS.\p" + .string "You know, the one that CAPT. STERN\n" + .string "found in his submarine.$" + +MossdeepCity_StevensHouse_Text_222B9E: @ 8222B9E + .string "{PLAYER} checked the POKé BALL.\p" + .string "It contained the POKéMON\n" + .string "BELDUM.\p" + .string "Take the POKé BALL?$" + +MossdeepCity_StevensHouse_Text_222BED: @ 8222BED + .string "{PLAYER} obtained a BELDUM.$" + +MossdeepCity_StevensHouse_Text_222C03: @ 8222C03 + .string "There is no space for another POKéMON.$" + +MossdeepCity_StevensHouse_Text_222C2A: @ 8222C2A + .string "{PLAYER} left the POKé BALL where\n" + .string "it was.$" + +MossdeepCity_StevensHouse_Text_222C4E: @ 8222C4E + .string "It’s a letter.\p" + .string "… … … … … …\p" + .string "To {PLAYER}{KUN}…\p" + .string "I’ve decided to do a little soul-\n" + .string "searching and train on the road.\p" + .string "I don’t plan to return home for some\n" + .string "time.\p" + .string "I have a favor to ask of you.\p" + .string "I want you to take the POKé BALL on\n" + .string "the desk.\p" + .string "Inside it is a BELDUM, my favorite\n" + .string "POKéMON.\p" + .string "I’m counting on you.\p" + .string "May our paths cross someday.\p" + .string "STEVEN STONE$" + +MossdeepCity_StevensHouse_Text_222D97: @ 8222D97 + .string "It’s a collection of rare rocks and\n" + .string "stones assembled by STEVEN.$" + diff --git a/data/maps/MtChimney/events.inc b/data/maps/MtChimney/events.inc new file mode 100644 index 000000000..bb7e1a913 --- /dev/null +++ b/data/maps/MtChimney/events.inc @@ -0,0 +1,45 @@ +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 + +MtChimney_MapWarps: @ 8534A98 + 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 + bg_event 24, 37, 3, 0, 0, MtChimney_EventScript_22F141 + +MtChimney_MapEvents:: @ 8534AD0 + map_events MtChimney_EventObjects, MtChimney_MapWarps, 0x0, MtChimney_MapBGEvents + diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc new file mode 100644 index 000000000..28135bb1e --- /dev/null +++ b/data/maps/MtChimney/scripts.inc @@ -0,0 +1,869 @@ +MtChimney_MapScripts:: @ 822EDC1 + map_script 5, MtChimney_MapScript1_22EDD2 + map_script 3, MtChimney_MapScript1_22EDCC + .byte 0 + +MtChimney_MapScript1_22EDCC: @ 822EDCC + setvar VAR_0x40BD, 1 + end + +MtChimney_MapScript1_22EDD2: @ 822EDD2 + setstepcallback 1 + end + +MtChimney_EventScript_22EDD5:: @ 822EDD5 + lock + faceplayer + checkflag FLAG_0x0DB + call_if 0, MtChimney_EventScript_22EDF9 + checkflag FLAG_0x0DB + call_if 1, MtChimney_EventScript_22EE02 + closemessage + applymovement 1, MtChimney_Movement_2725A2 + waitmovement 0 + setflag FLAG_0x0DB + release + end + +MtChimney_EventScript_22EDF9:: @ 822EDF9 + msgbox MtChimney_Text_22FAD2, 4 + return + +MtChimney_EventScript_22EE02:: @ 822EE02 + msgbox MtChimney_Text_22FBC7, 4 + return + +MtChimney_EventScript_22EE0B:: @ 822EE0B + lockall + playbgm MUS_MGM0, 0 + msgbox MtChimney_Text_22F26A, 4 + applymovement 2, MtChimney_Movement_27259E + waitmovement 0 + playse SE_PIN + applymovement 2, MtChimney_Movement_272598 + waitmovement 0 + applymovement 2, MtChimney_Movement_27259A + waitmovement 0 + msgbox MtChimney_Text_22F32E, 4 + trainerbattle 3, TRAINER_MAXIE_2, 0, MtChimney_Text_22F5CF + msgbox MtChimney_Text_22F5F7, 4 + closemessage + delay 30 + fadescreen 1 + removeobject 2 + removeobject 29 + removeobject 3 + removeobject 22 + setflag FLAG_0x39F + fadescreen 0 + setobjectxyperm 1, 10, 12 + addobject 1 + compare VAR_FACING, 4 + call_if 1, MtChimney_EventScript_22EEC7 + compare VAR_FACING, 2 + call_if 1, MtChimney_EventScript_22EED2 + applymovement 255, MtChimney_Movement_2725A4 + waitmovement 0 + msgbox MtChimney_Text_22FC3D, 4 + closemessage + compare VAR_FACING, 4 + call_if 1, MtChimney_EventScript_22EEDD + compare VAR_FACING, 2 + call_if 1, MtChimney_EventScript_22EEE8 + removeobject 1 + setflag FLAG_0x39E + setflag FLAG_0x08B + clearflag FLAG_0x3A0 + setflag FLAG_0x3AE + clearflag FLAG_0x3E2 + releaseall + end + +MtChimney_EventScript_22EEC7:: @ 822EEC7 + applymovement 1, MtChimney_Movement_22EF83 + waitmovement 0 + return + +MtChimney_EventScript_22EED2:: @ 822EED2 + applymovement 1, MtChimney_Movement_22EF94 + waitmovement 0 + return + +MtChimney_EventScript_22EEDD:: @ 822EEDD + applymovement 1, MtChimney_Movement_22EF8B + waitmovement 0 + return + +MtChimney_EventScript_22EEE8:: @ 822EEE8 + applymovement 1, MtChimney_Movement_22EF9C + waitmovement 0 + return + +MtChimney_EventScript_22EEF3:: @ 822EEF3 + lock + faceplayer + showmoneybox 0, 0, 0 + msgbox MtChimney_Text_22FE04, 5 + compare VAR_RESULT, 0 + goto_eq MtChimney_EventScript_22EF69 + checkmoney 0xc8, 0 + compare VAR_RESULT, 0 + goto_eq MtChimney_EventScript_22EF76 + msgbox MtChimney_Text_22FE4D, 4 + checkitemspace ITEM_LAVA_COOKIE, 1 + compare VAR_RESULT, 1 + call_if 1, MtChimney_EventScript_22EF5E + giveitem_std ITEM_LAVA_COOKIE + compare VAR_RESULT, 0 + goto_eq MtChimney_EventScript_22EF51 + hidemoneybox + nop + nop + release + end + +MtChimney_EventScript_22EF51:: @ 822EF51 + msgbox gUnknown_08272AD0, 4 + hidemoneybox + nop + nop + release + end + +MtChimney_EventScript_22EF5E:: @ 822EF5E + takemoney 0xc8, 0 + updatemoneybox 0, 0 + nop + return + +MtChimney_EventScript_22EF69:: @ 822EF69 + msgbox MtChimney_Text_22FE9B, 4 + hidemoneybox + nop + nop + release + end + +MtChimney_EventScript_22EF76:: @ 822EF76 + msgbox MtChimney_Text_22FE5E, 4 + hidemoneybox + nop + nop + release + end + +MtChimney_Movement_22EF83: @ 822EF83 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + step_end + +MtChimney_Movement_22EF8B: @ 822EF8B + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + step_end + +MtChimney_Movement_22EF94: @ 822EF94 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + step_end + +MtChimney_Movement_22EF9C: @ 822EF9C + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + step_end + +MtChimney_Movement_22EFA6: @ 822EFA6 + 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 + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_down + step_end + +MtChimney_Movement_22EFC1: @ 822EFC1 + 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 + 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 + 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 + 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 + 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 + delay_16 + walk_down + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_down + step_end + +MtChimney_Movement_22F01D: @ 822F01D + 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 + walk_down + step_end + +MtChimney_Movement_22F02D: @ 822F02D + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + step_end + +MtChimney_Movement_22F035: @ 822F035 + 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 + 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 + lock_facing_direction + walk_fast_left + unlock_facing_direction + face_right + step_end + +MtChimney_Movement_22F04F: @ 822F04F + walk_left + walk_in_place_fastest_right + delay_16 + step_end + +MtChimney_EventScript_22F053:: @ 822F053 + msgbox MtChimney_Text_22FD1F, 3 + end + +MtChimney_EventScript_22F05C:: @ 822F05C + msgbox MtChimney_Text_22FD5B, 3 + end + +MtChimney_EventScript_22F065:: @ 822F065 + msgbox MtChimney_Text_22FDA1, 3 + end + +MtChimney_EventScript_22F06E:: @ 822F06E + trainerbattle 0, TRAINER_TABITHA_2, 0, MtChimney_Text_22F6AA, MtChimney_Text_22F72C + msgbox MtChimney_Text_22F76D, 6 + end + +MtChimney_EventScript_22F085:: @ 822F085 + trainerbattle 0, TRAINER_GRUNT_31, 0, MtChimney_Text_22F7A2, MtChimney_Text_22F83A + msgbox MtChimney_Text_22F859, 6 + end + +MtChimney_EventScript_22F09C:: @ 822F09C + msgbox MtChimney_Text_22F978, 3 + end + +MtChimney_EventScript_22F0A5:: @ 822F0A5 + msgbox MtChimney_Text_22F9B2, 3 + end + +MtChimney_EventScript_22F0AE:: @ 822F0AE + msgbox MtChimney_Text_22F9D1, 3 + end + +MtChimney_EventScript_22F0B7:: @ 822F0B7 + msgbox MtChimney_Text_22FA2F, 3 + end + +MtChimney_EventScript_22F0C0:: @ 822F0C0 + msgbox MtChimney_Text_22FA8B, 3 + end + +MtChimney_EventScript_22F0C9:: @ 822F0C9 + msgbox MtChimney_Text_22FAA5, 3 + end + +MtChimney_EventScript_22F0D2:: @ 822F0D2 + msgbox MtChimney_Text_22FACB, 3 + end + +MtChimney_EventScript_22F0DB:: @ 822F0DB + msgbox MtChimney_Text_22FDFC, 3 + end + +MtChimney_EventScript_22F0E4:: @ 822F0E4 + lockall + checkflag FLAG_0x08B + goto_if 0, MtChimney_EventScript_22F137 + checkflag FLAG_0x073 + goto_eq MtChimney_EventScript_22F12D + msgbox MtChimney_Text_22FF12, 5 + compare VAR_RESULT, 0 + goto_eq MtChimney_EventScript_22F123 + msgbox MtChimney_Text_22FF66, 4 + giveitem_std ITEM_METEORITE + setflag FLAG_0x073 + releaseall + end + +MtChimney_EventScript_22F123:: @ 822F123 + msgbox MtChimney_Text_22FF9C, 4 + releaseall + end + +MtChimney_EventScript_22F12D:: @ 822F12D + msgbox MtChimney_Text_22FFC0, 4 + releaseall + end + +MtChimney_EventScript_22F137:: @ 822F137 + msgbox MtChimney_Text_22FEAA, 4 + releaseall + end + +MtChimney_EventScript_22F141:: @ 822F141 + msgbox MtChimney_Text_22FFFA, 3 + end + +MtChimney_EventScript_22F14A:: @ 822F14A + trainerbattle 2, TRAINER_SHELBY_1, 0, MtChimney_Text_23001D, MtChimney_Text_230076, MtChimney_EventScript_22F176 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq MtChimney_EventScript_22F195 + msgbox MtChimney_Text_2300A2, 4 + release + end + +MtChimney_EventScript_22F176:: @ 822F176 + special sub_80B4808 + waitmovement 0 + msgbox MtChimney_Text_2300E3, 4 + setvar VAR_0x8004, 313 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 313 + callstd 8 + release + end + +MtChimney_EventScript_22F195:: @ 822F195 + trainerbattle 5, TRAINER_SHELBY_1, 0, MtChimney_Text_230153, MtChimney_Text_2301BB + msgbox MtChimney_Text_2301E7, 6 + end + +MtChimney_EventScript_22F1AC:: @ 822F1AC + trainerbattle 0, TRAINER_MELISSA, 0, MtChimney_Text_23022A, MtChimney_Text_23026D + msgbox MtChimney_Text_230292, 6 + end + +MtChimney_EventScript_22F1C3:: @ 822F1C3 + trainerbattle 0, TRAINER_SHEILA, 0, MtChimney_Text_2302BD, MtChimney_Text_230304 + msgbox MtChimney_Text_23033A, 6 + end + +MtChimney_EventScript_22F1DA:: @ 822F1DA + trainerbattle 0, TRAINER_SHIRLEY, 0, MtChimney_Text_2303DF, MtChimney_Text_230436 + msgbox MtChimney_Text_230463, 6 + end + +MtChimney_EventScript_22F1F1:: @ 822F1F1 + trainerbattle 0, TRAINER_GRUNT_24, 0, MtChimney_Text_22F8B6, MtChimney_Text_22F921 + msgbox MtChimney_Text_22F93A, 6 + end + +MtChimney_EventScript_22F208:: @ 822F208 + trainerbattle 2, TRAINER_SAWYER_1, 0, MtChimney_Text_2304B3, MtChimney_Text_2304F7, MtChimney_EventScript_22F234 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq MtChimney_EventScript_22F253 + msgbox MtChimney_Text_230519, 4 + release + end + +MtChimney_EventScript_22F234:: @ 822F234 + special sub_80B4808 + waitmovement 0 + msgbox MtChimney_Text_230557, 4 + setvar VAR_0x8004, 1 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 1 + callstd 8 + release + end + +MtChimney_EventScript_22F253:: @ 822F253 + trainerbattle 5, TRAINER_SAWYER_1, 0, MtChimney_Text_23059C, MtChimney_Text_2305E3 + msgbox MtChimney_Text_230614, 6 + end + +MtChimney_Text_22F26A: @ 822F26A + .string "The power contained in the METEORITE…\p" + .string "By amplifying its power with this\n" + .string "machine, MT. CHIMNEY’s volcanic\l" + .string "activity will instantly intensify…\p" + .string "Its energy will grow deep inside\n" + .string "the crater and…\l" + .string "Fufufu…$" + +MtChimney_Text_22F32E: @ 822F32E + .string "MAXIE: Hm?\n" + .string "Who are you?\p" + .string "… … … … … …\n" + .string "… … … … … …\p" + .string "I’d heard ARCHIE bemoaning a child\n" + .string "who’s been meddling in TEAM AQUA’s\l" + .string "affairs.\p" + .string "It must be you he meant.\p" + .string "Humph! So you’re thinking of\n" + .string "interfering with us, TEAM MAGMA?\p" + .string "Now you listen.\n" + .string "Long ago, living things used the\l" + .string "land to live and grow.\p" + .string "That is why land is all important!\n" + .string "It is the cradle of all!\p" + .string "That is why TEAM MAGMA is dedicated\n" + .string "to the expansion of the land mass.\p" + .string "It is for further advancement of\n" + .string "humankind and POKéMON!\p" + .string "And for that, we need the power of\n" + .string "what sleeps within this mountain…\p" + .string "Oh! There was no need for you to\n" + .string "learn that much.\p" + .string "But, no matter!\n" + .string "I’ll teach you the consequences of\l" + .string "meddling in our grand design!$" + +MtChimney_Text_22F5CF: @ 822F5CF + .string "What?!\p" + .string "I, MAXIE, was caught off guard?!$" + +MtChimney_Text_22F5F7: @ 822F5F7 + .string "MAXIE: But, enough.\n" + .string "I will back off this time.\p" + .string "But don’t think that this is the last\n" + .string "you’ve seen of TEAM MAGMA.\p" + .string "Fufufu…\p" + .string "Even without the METEORITE, if we\n" + .string "obtain that ORB… Fufufu…$" + +MtChimney_Text_22F6AA: @ 822F6AA + .string "Hehehe!\p" + .string "So you’ve come all the way here!\p" + .string "But you’re too late!\n" + .string "I’ve already delivered the METEORITE\l" + .string "from METEOR FALLS to the BOSS!$" + +MtChimney_Text_22F72C: @ 822F72C + .string "Hehehe…\p" + .string "Even though I’ve lost, if our leader\n" + .string "awakens that thing…$" + +MtChimney_Text_22F76D: @ 822F76D + .string "BOSS, hurry!\n" + .string "Give it the METEORITE’s energy!\p" + .string "Hehehe…$" + +MtChimney_Text_22F7A2: @ 822F7A2 + .string "We of TEAM MAGMA are working hard for\n" + .string "everyone’s sake.\p" + .string "Like, if that thing’s power made more\n" + .string "land, there’d be more places to live.\p" + .string "Everyone’d be happy!$" + +MtChimney_Text_22F83A: @ 822F83A + .string "Hunh?\n" + .string "What do you mean I lost?$" + +MtChimney_Text_22F859: @ 822F859 + .string "Our BOSS says, “It will make everyone\n" + .string "happy.â€\p" + .string "But why does everyone keep getting\n" + .string "in our way?$" + +MtChimney_Text_22F8B6: @ 822F8B6 + .string "If there were more land, I’d be able\n" + .string "to get a big house of my own!\p" + .string "I’m going to build it on hardened lava!$" + +MtChimney_Text_22F921: @ 822F921 + .string "My dream of a big house…$" + +MtChimney_Text_22F93A: @ 822F93A + .string "A kid like you, you ought to be\n" + .string "splashing about in the waves!$" + +MtChimney_Text_22F978: @ 822F978 + .string "That annoying TEAM AQUA…\n" + .string "They always mess with our plans!$" + +MtChimney_Text_22F9B2: @ 822F9B2 + .string "METEORITES pack amazing power!$" + +MtChimney_Text_22F9D1: @ 822F9D1 + .string "You’d better not mess with us!\p" + .string "We’re trying to awaken that thing\n" + .string "for the benefit of everyone!$" + +MtChimney_Text_22FA2F: @ 822FA2F + .string "We’re TEAM MAGMA!\p" + .string "They’re TEAM AQUA!\p" + .string "It totally annoys me that they’d\n" + .string "use a name like ours!$" + +MtChimney_Text_22FA8B: @ 822FA8B + .string "Yeah!\n" + .string "Douse them in fire!$" + +MtChimney_Text_22FAA5: @ 822FAA5 + .string "We’re going to keep making more land!$" + +MtChimney_Text_22FACB: @ 822FACB + .string "Bufoh!$" + +MtChimney_Text_22FAD2: @ 822FAD2 + .string "ARCHIE: Grr, {PLAYER}!\n" + .string "I should’ve guessed you’d show up!\p" + .string "See for yourself what the fanatics\n" + .string "of TEAM MAGMA are up to!\p" + .string "They’re trying to inject the stolen\n" + .string "METEORITE’s power into the volcano!\p" + .string "Doing something like that will cause\n" + .string "the volcano’s eruption!$" + +MtChimney_Text_22FBC7: @ 822FBC7 + .string "ARCHIE: Grrr…\p" + .string "I want to stop that MAXIE,\n" + .string "but I can’t!\p" + .string "Not when I have my hands full battling\n" + .string "three opponents at once!$" + +MtChimney_Text_22FC3D: @ 822FC3D + .string "ARCHIE: {PLAYER}!\n" + .string "Thank you!\p" + .string "With your help, we thwarted TEAM\n" + .string "MAGMA’s destructive plan!\p" + .string "But… You…\n" + .string "Whose side are you on?\p" + .string "Ah, it doesn’t matter.\p" + .string "We will remain vigilant and keep up\n" + .string "our pursuit of TEAM MAGMA.\p" + .string "{PLAYER}, we shall meet again!$" + +MtChimney_Text_22FD1F: @ 822FD1F + .string "Darn… TEAM MAGMA outnumbers us!\n" + .string "We can’t keep up with them!$" + +MtChimney_Text_22FD5B: @ 822FD5B + .string "If they expand the land, there’ll be\n" + .string "less habitats for WATER POKéMON!$" + +MtChimney_Text_22FDA1: @ 822FDA1 + .string "We’re TEAM AQUA!\p" + .string "They’re TEAM MAGMA!\p" + .string "It burns me up that they’d use such\n" + .string "a confusing name!$" + +MtChimney_Text_22FDFC: @ 822FDFC + .string "Bushaa!$" + +MtChimney_Text_22FE04: @ 822FE04 + .string "LAVA COOKIES are MT. CHIMNEY’s local\n" + .string "specialty.\p" + .string "Try one. It’s just Â¥200.$" + +MtChimney_Text_22FE4D: @ 822FE4D + .string "Thank you, dear!$" + +MtChimney_Text_22FE5E: @ 822FE5E + .string "Oh, dear. You can’t buy a thing if\n" + .string "you’ve not got the money.$" + +MtChimney_Text_22FE9B: @ 822FE9B + .string "Oh, fine then.$" + +MtChimney_Text_22FEAA: @ 822FEAA + .string "A METEORITE is fitted on a mysterious\n" + .string "machine…\p" + .string "The machine seems to be storing\n" + .string "energy in the METEORITE.$" + +MtChimney_Text_22FF12: @ 822FF12 + .string "A METEORITE is fitted on a mysterious\n" + .string "machine…\p" + .string "Do you want to remove the METEORITE?$" + +MtChimney_Text_22FF66: @ 822FF66 + .string "{PLAYER} removed the METEORITE from\n" + .string "the mysterious machine.$" + +MtChimney_Text_22FF9C: @ 822FF9C + .string "{PLAYER} left the METEORITE where\n" + .string "it was.$" + +MtChimney_Text_22FFC0: @ 822FFC0 + .string "This mysterious machine…\n" + .string "It makes no response whatsoever.$" + +MtChimney_Text_22FFFA: @ 822FFFA + .string "{0x7A} JAGGED PATH\n" + .string "LAVARIDGE TOWN AHEAD$" + +MtChimney_Text_23001D: @ 823001D + .string "I’ve been to the hot springs and\n" + .string "refreshed my tired bones.\l" + .string "Right now I’m feeling strong!$" + +MtChimney_Text_230076: @ 8230076 + .string "Oh, my goodness.\n" + .string "Now, aren’t you something!$" + +MtChimney_Text_2300A2: @ 82300A2 + .string "Well, well, I’ve lost. I can’t call\n" + .string "myself an EXPERT now, can I?$" + +MtChimney_Text_2300E3: @ 82300E3 + .string "Thank you, child. It was fun, as if\n" + .string "I were battling my own grandchild.\p" + .string "Please, come see me again for\n" + .string "a rematch.$" + +MtChimney_Text_230153: @ 8230153 + .string "If you can mesh your heart with those\n" + .string "of your POKéMON, why, you should be\l" + .string "able to achieve great things.$" + +MtChimney_Text_2301BB: @ 82301BB + .string "Oh, my goodness.\n" + .string "Now, aren’t you something!$" + +MtChimney_Text_2301E7: @ 82301E7 + .string "Perhaps your heart has become one\n" + .string "with the hearts of your POKéMON.$" + +MtChimney_Text_23022A: @ 823022A + .string "I’ve got the fire in me, baby.\n" + .string "I can’t stand it! I have to battle!$" + +MtChimney_Text_23026D: @ 823026D + .string "Ooh, that was a scorching-hot match!$" + +MtChimney_Text_230292: @ 8230292 + .string "The heat of MT. CHIMNEY warms\n" + .string "me up, baby!$" + +MtChimney_Text_2302BD: @ 82302BD + .string "I’ve finally made it to MT. CHIMNEY.\n" + .string "I want to make my POKéMON battle!$" + +MtChimney_Text_230304: @ 8230304 + .string "The way you battle…\n" + .string "It’s like a MT. CHIMNEY eruption!$" + +MtChimney_Text_23033A: @ 823033A + .string "Like I said, I’ve finally made it to\n" + .string "MT. CHIMNEY. It would be a shame if\l" + .string "I only do a little sightseeing…\p" + .string "I want to get in some battles and buy\n" + .string "COOKIES as souvenirs.$" + +MtChimney_Text_2303DF: @ 82303DF + .string "Since I bathed in the hot springs,\n" + .string "I’ve been feeling great!\l" + .string "I’m sure I’m going to win!$" + +MtChimney_Text_230436: @ 8230436 + .string "Yowch!\n" + .string "I’m getting a chill out of the water.$" + +MtChimney_Text_230463: @ 8230463 + .string "I’ll have to take another dip in the\n" + .string "hot springs. Want to join me?\p" + .string "Just joking!$" + +MtChimney_Text_2304B3: @ 82304B3 + .string "This is one fine mountain! Plenty of\n" + .string "hot people around for company!$" + +MtChimney_Text_2304F7: @ 82304F7 + .string "Oh, you’re a real firebrand, too!$" + +MtChimney_Text_230519: @ 8230519 + .string "I think I need a dip in LAVARIDGE\n" + .string "HOT SPRING with the locals!$" + +MtChimney_Text_230557: @ 8230557 + .string "I like little fireballs like you.\n" + .string "Let me register you in my POKéNAV.$" + +MtChimney_Text_23059C: @ 823059C + .string "I’m happily surrounded by hot people\n" + .string "around these parts. I won’t lose!$" + +MtChimney_Text_2305E3: @ 82305E3 + .string "Gosh, you’re still the same\n" + .string "firebrand as before!$" + +MtChimney_Text_230614: @ 8230614 + .string "Actually, it really is hot here.\n" + .string "I’m overdressed for these parts.$" + diff --git a/data/maps/MtChimney_CableCarStation/events.inc b/data/maps/MtChimney_CableCarStation/events.inc new file mode 100644 index 000000000..19385b3d5 --- /dev/null +++ b/data/maps/MtChimney_CableCarStation/events.inc @@ -0,0 +1,11 @@ +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 + +MtChimney_CableCarStation_MapWarps: @ 8533CD8 + 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/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc new file mode 100644 index 000000000..b6c2118db --- /dev/null +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -0,0 +1,98 @@ +MtChimney_CableCarStation_MapScripts:: @ 822ABFA + map_script 3, MtChimney_CableCarStation_MapScript1_22AC05 + map_script 2, MtChimney_CableCarStation_MapScript2_22AC1D + .byte 0 + +MtChimney_CableCarStation_MapScript1_22AC05: @ 822AC05 + compare VAR_0x40A3, 1 + call_if 1, MtChimney_CableCarStation_EventScript_22AC11 + end + +MtChimney_CableCarStation_EventScript_22AC11:: @ 822AC11 + setobjectxyperm 1, 5, 4 + setobjectmovementtype 1, 10 + return + +MtChimney_CableCarStation_MapScript2_22AC1D: @ 822AC1D + map_script_2 VAR_0x40A3, 1, MtChimney_CableCarStation_EventScript_22AC27 + .2byte 0 + +MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27 + lockall + applymovement 255, MtChimney_CableCarStation_Movement_22ACB4 + applymovement 1, MtChimney_CableCarStation_Movement_22ACAA + waitmovement 0 + setvar VAR_0x40A3, 0 + setobjectxyperm 1, 6, 7 + setobjectmovementtype 1, 8 + releaseall + end + +MtChimney_CableCarStation_EventScript_22AC4B:: @ 822AC4B + lock + faceplayer + msgbox MtChimney_CableCarStation_Text_22ACB9, 5 + compare VAR_RESULT, 1 + goto_eq MtChimney_CableCarStation_EventScript_22AC6C + compare VAR_RESULT, 0 + goto_eq MtChimney_CableCarStation_EventScript_22AC9B + end + +MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C + msgbox MtChimney_CableCarStation_Text_22ACF8, 4 + closemessage + applymovement 1, MtChimney_CableCarStation_Movement_22ACA5 + applymovement 255, MtChimney_CableCarStation_Movement_22ACAF + waitmovement 0 + setvar VAR_0x8004, 1 + setvar VAR_0x40A3, 2 + incrementgamestat 48 + special CableCarWarp + special sub_814FC9C + waitstate + release + end + +MtChimney_CableCarStation_EventScript_22AC9B:: @ 822AC9B + msgbox MtChimney_CableCarStation_Text_22AD0E, 4 + release + end + +MtChimney_CableCarStation_Movement_22ACA5: @ 822ACA5 + walk_up + walk_up + walk_left + walk_in_place_fastest_right + step_end + +MtChimney_CableCarStation_Movement_22ACAA: @ 822ACAA + delay_16 + walk_right + walk_down + walk_down + step_end + +MtChimney_CableCarStation_Movement_22ACAF: @ 822ACAF + walk_up + walk_up + walk_up + delay_16 + step_end + +MtChimney_CableCarStation_Movement_22ACB4: @ 822ACB4 + walk_down + walk_down + walk_down + delay_16 + step_end + +MtChimney_CableCarStation_Text_22ACB9: @ 822ACB9 + .string "The CABLE CAR is ready to go down.\n" + .string "Would you like to be on it?$" + +MtChimney_CableCarStation_Text_22ACF8: @ 822ACF8 + .string "Please step this way.$" + +MtChimney_CableCarStation_Text_22AD0E: @ 822AD0E + .string "Please ride with us another time.$" + diff --git a/data/maps/MtPyre_1F/events.inc b/data/maps/MtPyre_1F/events.inc new file mode 100644 index 000000000..80bf46c2e --- /dev/null +++ b/data/maps/MtPyre_1F/events.inc @@ -0,0 +1,16 @@ +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 + +MtPyre_1F_MapWarps: @ 8534DAC + 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/MtPyre_1F/scripts.inc b/data/maps/MtPyre_1F/scripts.inc new file mode 100644 index 000000000..51c8a88fb --- /dev/null +++ b/data/maps/MtPyre_1F/scripts.inc @@ -0,0 +1,49 @@ +MtPyre_1F_MapScripts:: @ 8230F3E + .byte 0 + +MtPyre_1F_EventScript_230F3F:: @ 8230F3F + lock + faceplayer + checkflag FLAG_0x11A + goto_eq MtPyre_1F_EventScript_230F6E + msgbox MtPyre_1F_Text_230F8A, 4 + giveitem_std ITEM_CLEANSE_TAG + compare VAR_RESULT, 0 + goto_eq MtPyre_1F_EventScript_272054 + setflag FLAG_0x11A + release + end + +MtPyre_1F_EventScript_230F6E:: @ 8230F6E + msgbox MtPyre_1F_Text_231005, 4 + release + end + +MtPyre_1F_EventScript_230F78:: @ 8230F78 + msgbox MtPyre_1F_Text_23104F, 2 + end + +MtPyre_1F_EventScript_230F81:: @ 8230F81 + msgbox MtPyre_1F_Text_2310BA, 2 + end + +MtPyre_1F_Text_230F8A: @ 8230F8A + .string "All sorts of beings wander the slopes\n" + .string "of MT. PYRE…\p" + .string "There is no telling what may happen.\n" + .string "Take this. It’s for your own good.$" + +MtPyre_1F_Text_231005: @ 8231005 + .string "Have a POKéMON hold that\n" + .string "CLEANSE TAG.\p" + .string "It will help ward off wild POKéMON.$" + +MtPyre_1F_Text_23104F: @ 823104F + .string "Did you come to pay your respect\n" + .string "to the spirits of departed POKéMON?\p" + .string "You must care for your POKéMON a lot.$" + +MtPyre_1F_Text_2310BA: @ 82310BA + .string "This is the final resting place of my\n" + .string "ZIGZAGOON. I cherished it…$" + diff --git a/data/maps/MtPyre_2F/events.inc b/data/maps/MtPyre_2F/events.inc new file mode 100644 index 000000000..d5b24c06f --- /dev/null +++ b/data/maps/MtPyre_2F/events.inc @@ -0,0 +1,20 @@ +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 + +MtPyre_2F_MapWarps: @ 8534EB0 + 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/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc new file mode 100644 index 000000000..de8520954 --- /dev/null +++ b/data/maps/MtPyre_2F/scripts.inc @@ -0,0 +1,135 @@ +MtPyre_2F_MapScripts:: @ 82310FB + map_script 2, MtPyre_2F_MapScript2_2A8327 + map_script 3, MtPyre_2F_MapScript1_2A8331 + map_script 5, MtPyre_2F_MapScript1_23110B + .byte 0 + +MtPyre_2F_MapScript1_23110B: @ 823110B + setstepcallback 7 + setholewarp MAP_MT_PYRE_1F, 255, 0, 0 + end + +MtPyre_2F_EventScript_231116:: @ 8231116 + msgbox MtPyre_2F_Text_2311A3, 2 + end + +MtPyre_2F_EventScript_23111F:: @ 823111F + msgbox MtPyre_2F_Text_2311E6, 2 + end + +MtPyre_2F_EventScript_231128:: @ 8231128 + trainerbattle 0, TRAINER_MARK, 0, MtPyre_2F_Text_231258, MtPyre_2F_Text_2312A2 + msgbox MtPyre_2F_Text_2312CB, 6 + end + +MtPyre_2F_EventScript_23113F:: @ 823113F + trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_23130F, MtPyre_2F_Text_2313A1, MtPyre_2F_Text_231414 + msgbox MtPyre_2F_Text_2313B1, 6 + end + +MtPyre_2F_EventScript_23115A:: @ 823115A + trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_231492, MtPyre_2F_Text_231534, MtPyre_2F_Text_231582 + msgbox MtPyre_2F_Text_23154D, 6 + end + +MtPyre_2F_EventScript_231175:: @ 8231175 + trainerbattle 0, TRAINER_LEAH, 0, MtPyre_2F_Text_231604, MtPyre_2F_Text_231645 + msgbox MtPyre_2F_Text_23165A, 6 + end + +MtPyre_2F_EventScript_23118C:: @ 823118C + trainerbattle 0, TRAINER_ZANDER, 0, MtPyre_2F_Text_2316C7, MtPyre_2F_Text_2316E1 + msgbox MtPyre_2F_Text_2316FB, 6 + end + +MtPyre_2F_Text_2311A3: @ 82311A3 + .string "Memories of my darling SKITTY…\n" + .string "My eyes overflow thinking about it.$" + +MtPyre_2F_Text_2311E6: @ 82311E6 + .string "Ooch, ouch… There are holes in the\n" + .string "ground here and there.\p" + .string "I didn’t notice and took a tumble from\n" + .string "the floor above.$" + +MtPyre_2F_Text_231258: @ 8231258 + .string "Hey! Are you searching for POKéMON?\n" + .string "You came along after me! You’re rude!$" + +MtPyre_2F_Text_2312A2: @ 82312A2 + .string "Ayieeeeh!\n" + .string "I’m sorry, forgive me, please!$" + +MtPyre_2F_Text_2312CB: @ 82312CB + .string "People don’t come here often, so\n" + .string "I thought there’d be rare POKéMON.$" + +MtPyre_2F_Text_23130F: @ 823130F + .string "LUKE: We’re here on a dare.\p" + .string "Heheh, if I show her how cool I am,\n" + .string "she’ll fall for me. I know it!\p" + .string "I know! I’ll cream you and show her\n" + .string "how cool I am!$" + +MtPyre_2F_Text_2313A1: @ 82313A1 + .string "LUKE: Whoopsie!$" + +MtPyre_2F_Text_2313B1: @ 82313B1 + .string "LUKE: Well, we lost but that’s okay!\n" + .string "I’m right here by your side.\l" + .string "We’ll make it through this dare!$" + +MtPyre_2F_Text_231414: @ 8231414 + .string "LUKE: If you want to take me on,\n" + .string "bring some more POKéMON.\p" + .string "If you don’t, I won’t be able to show\n" + .string "off to my girl how cool I am!$" + +MtPyre_2F_Text_231492: @ 8231492 + .string "DEZ: I came here on a dare with my\n" + .string "boyfriend.\p" + .string "It’s really scary, but I’m with my\n" + .string "boyfriend. It’s okay.\p" + .string "I know! I’ll get my boyfriend to look\n" + .string "cool by beating you!$" + +MtPyre_2F_Text_231534: @ 8231534 + .string "DEZ: Waaaah! I’m scared!$" + +MtPyre_2F_Text_23154D: @ 823154D + .string "DEZ: We’re lovey-dovey, so we don’t\n" + .string "care if we lose!$" + +MtPyre_2F_Text_231582: @ 8231582 + .string "DEZ: If you want to challenge us, you\n" + .string "should bring at least two POKéMON.\p" + .string "My boyfriend’s strong.\n" + .string "Just one POKéMON won’t do at all.$" + +MtPyre_2F_Text_231604: @ 8231604 + .string "You are an unfamiliar sight…\n" + .string "Depart before anything befalls you!$" + +MtPyre_2F_Text_231645: @ 8231645 + .string "Hmm…\n" + .string "You’re durable.$" + +MtPyre_2F_Text_23165A: @ 823165A + .string "Our family has been TRAINERS here\n" + .string "since my great-grandmother’s time…\p" + .string "It is my duty to protect this\n" + .string "mountain…$" + +MtPyre_2F_Text_2316C7: @ 82316C7 + .string "Kiyaaaaah!\n" + .string "I’m terrified!$" + +MtPyre_2F_Text_2316E1: @ 82316E1 + .string "Nooooooo!\n" + .string "I lost my wits!$" + +MtPyre_2F_Text_2316FB: @ 82316FB + .string "I get freaked out every time I see\n" + .string "anything move…\p" + .string "I shouldn’t have come here to train…$" + diff --git a/data/maps/MtPyre_3F/events.inc b/data/maps/MtPyre_3F/events.inc new file mode 100644 index 000000000..bf0d1af77 --- /dev/null +++ b/data/maps/MtPyre_3F/events.inc @@ -0,0 +1,17 @@ +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 + +MtPyre_3F_MapWarps: @ 8534F4C + 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/MtPyre_3F/scripts.inc b/data/maps/MtPyre_3F/scripts.inc new file mode 100644 index 000000000..ec5373509 --- /dev/null +++ b/data/maps/MtPyre_3F/scripts.inc @@ -0,0 +1,103 @@ +MtPyre_3F_MapScripts:: @ 8231752 + .byte 0 + +MtPyre_3F_EventScript_231753:: @ 8231753 + trainerbattle 0, TRAINER_WILLIAM, 0, MtPyre_3F_Text_2317E3, MtPyre_3F_Text_231853 + msgbox MtPyre_3F_Text_231869, 6 + end + +MtPyre_3F_EventScript_23176A:: @ 823176A + trainerbattle 0, TRAINER_KAYLA, 0, MtPyre_3F_Text_2318A1, MtPyre_3F_Text_2318DD + msgbox MtPyre_3F_Text_2318F2, 6 + end + +MtPyre_3F_EventScript_231781:: @ 8231781 + trainerbattle 2, TRAINER_GABRIELLE_1, 0, MtPyre_3F_Text_231952, MtPyre_3F_Text_23196A, MtPyre_3F_EventScript_2317AD + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq MtPyre_3F_EventScript_2317CC + msgbox MtPyre_3F_Text_23199B, 4 + release + end + +MtPyre_3F_EventScript_2317AD:: @ 82317AD + special sub_80B4808 + waitmovement 0 + msgbox MtPyre_3F_Text_231A49, 4 + setvar VAR_0x8004, 9 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 9 + callstd 8 + release + end + +MtPyre_3F_EventScript_2317CC:: @ 82317CC + trainerbattle 5, TRAINER_GABRIELLE_1, 0, MtPyre_3F_Text_231AAB, MtPyre_3F_Text_231AE6 + msgbox MtPyre_3F_Text_231B0D, 6 + end + +MtPyre_3F_Text_2317E3: @ 82317E3 + .string "The rich atmosphere of the mountain\n" + .string "has elevated my psychic power!\p" + .string "A mere child like you…\n" + .string "You dream of winning?$" + +MtPyre_3F_Text_231853: @ 8231853 + .string "I drown in self-pity…$" + +MtPyre_3F_Text_231869: @ 8231869 + .string "My psychic powers have surely\n" + .string "grown several times, but…$" + +MtPyre_3F_Text_2318A1: @ 82318A1 + .string "Ahahahaha!\p" + .string "This is no place for children, least\n" + .string "of all you!$" + +MtPyre_3F_Text_2318DD: @ 82318DD + .string "I lost that cleanly…$" + +MtPyre_3F_Text_2318F2: @ 82318F2 + .string "This means my training is still not\n" + .string "enough…\p" + .string "I’ve got to keep working toward the\n" + .string "summit…\p" + .string "Go, me!$" + +MtPyre_3F_Text_231952: @ 8231952 + .string "Why have you come here?$" + +MtPyre_3F_Text_23196A: @ 823196A + .string "That was amazing!\n" + .string "You’re a very special TRAINER.$" + +MtPyre_3F_Text_23199B: @ 823199B + .string "POKéMON no longer of this world.\n" + .string "POKéMON that are with you now.\p" + .string "And the POKéMON that you will meet\n" + .string "in the future…\p" + .string "They are all to be equally cherished.\n" + .string "Please remember that.$" + +MtPyre_3F_Text_231A49: @ 8231A49 + .string "I would like to see your POKéMON\n" + .string "when they grow up some more…\p" + .string "Please, I need to see your POKéNAV.$" + +MtPyre_3F_Text_231AAB: @ 8231AAB + .string "Oh, it’s you…\p" + .string "Have you come to show me your grown\n" + .string "POKéMON?$" + +MtPyre_3F_Text_231AE6: @ 8231AE6 + .string "How amazing!\n" + .string "You are a special person.$" + +MtPyre_3F_Text_231B0D: @ 8231B0D + .string "POKéMON no longer of this world.\n" + .string "POKéMON that are with you now.\p" + .string "And the POKéMON that you will meet\n" + .string "in the future…\p" + .string "They are all to be equally cherished.\n" + .string "I see that you’ve remembered that.$" + diff --git a/data/maps/MtPyre_4F/events.inc b/data/maps/MtPyre_4F/events.inc new file mode 100644 index 000000000..e39075d8b --- /dev/null +++ b/data/maps/MtPyre_4F/events.inc @@ -0,0 +1,15 @@ +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 + +MtPyre_4F_MapWarps: @ 8534FC0 + 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/MtPyre_4F/scripts.inc b/data/maps/MtPyre_4F/scripts.inc new file mode 100644 index 000000000..0573e0f11 --- /dev/null +++ b/data/maps/MtPyre_4F/scripts.inc @@ -0,0 +1,20 @@ +MtPyre_4F_MapScripts:: @ 8231BC8 + .byte 0 + +MtPyre_5F_EventScript_231BC9:: @ 8231BC9 + trainerbattle 0, TRAINER_ATSUSHI, 0, MtPyre_5F_Text_231BE0, MtPyre_5F_Text_231C08 + msgbox MtPyre_5F_Text_231C24, 6 + end + +MtPyre_5F_Text_231BE0: @ 8231BE0 + .string "Teacher…\n" + .string "Please watch over my progress!$" + +MtPyre_5F_Text_231C08: @ 8231C08 + .string "Teacher…\n" + .string "Please forgive me!$" + +MtPyre_5F_Text_231C24: @ 8231C24 + .string "Until I improve, my teacher, who rests\n" + .string "here, will never find true peace…$" + diff --git a/data/maps/MtPyre_5F/events.inc b/data/maps/MtPyre_5F/events.inc new file mode 100644 index 000000000..03a9b773f --- /dev/null +++ b/data/maps/MtPyre_5F/events.inc @@ -0,0 +1,14 @@ +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 + +MtPyre_5F_MapWarps: @ 8535034 + 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/MtPyre_5F/scripts.inc b/data/maps/MtPyre_5F/scripts.inc new file mode 100644 index 000000000..4678ac7e0 --- /dev/null +++ b/data/maps/MtPyre_5F/scripts.inc @@ -0,0 +1,23 @@ +MtPyre_5F_MapScripts:: @ 8231C6D + .byte 0 + +MtPyre_4F_EventScript_231C6E:: @ 8231C6E + trainerbattle 0, TRAINER_TASHA, 0, MtPyre_4F_Text_231C85, MtPyre_4F_Text_231CDB + msgbox MtPyre_4F_Text_231CEE, 6 + end + +MtPyre_4F_Text_231C85: @ 8231C85 + .string "I love all things horrifying…\n" + .string "It’s like a disease…\p" + .string "When I’m here…\n" + .string "I shiver with fear…$" + +MtPyre_4F_Text_231CDB: @ 8231CDB + .string "Losing, I dislike…$" + +MtPyre_4F_Text_231CEE: @ 8231CEE + .string "I want to see dreadful things…\n" + .string "I can’t leave…\p" + .string "Stay…\n" + .string "Won’t you stay with me?$" + diff --git a/data/maps/MtPyre_6F/events.inc b/data/maps/MtPyre_6F/events.inc new file mode 100644 index 000000000..1f00209b2 --- /dev/null +++ b/data/maps/MtPyre_6F/events.inc @@ -0,0 +1,12 @@ +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 + +MtPyre_6F_MapWarps: @ 85350B8 + 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/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc new file mode 100644 index 000000000..8d5d912c2 --- /dev/null +++ b/data/maps/MtPyre_6F/scripts.inc @@ -0,0 +1,73 @@ +MtPyre_6F_MapScripts:: @ 8231D3A + .byte 0 + +MtPyre_6F_EventScript_231D3B:: @ 8231D3B + trainerbattle 2, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_231DB4, MtPyre_6F_Text_231DE2, MtPyre_6F_EventScript_231D67 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq MtPyre_6F_EventScript_231D86 + msgbox MtPyre_6F_Text_231DFC, 4 + release + end + +MtPyre_6F_EventScript_231D67:: @ 8231D67 + special sub_80B4808 + waitmovement 0 + msgbox MtPyre_6F_Text_231E43, 4 + setvar VAR_0x8004, 108 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 108 + callstd 8 + release + end + +MtPyre_6F_EventScript_231D86:: @ 8231D86 + trainerbattle 5, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_231EB3, MtPyre_6F_Text_231ECB + msgbox MtPyre_6F_Text_231EE1, 6 + end + +MtPyre_6F_EventScript_231D9D:: @ 8231D9D + trainerbattle 0, TRAINER_CEDRIC, 0, MtPyre_6F_Text_231F11, MtPyre_6F_Text_231F4A + msgbox MtPyre_6F_Text_231F5C, 6 + end + +MtPyre_6F_Text_231DB4: @ 8231DB4 + .string "When I’m here…\n" + .string "A curious power flows into me…$" + +MtPyre_6F_Text_231DE2: @ 8231DE2 + .string "The power is ebbing away…$" + +MtPyre_6F_Text_231DFC: @ 8231DFC + .string "Perhaps the power is from the spirits\n" + .string "of POKéMON in fitful sleep here…$" + +MtPyre_6F_Text_231E43: @ 8231E43 + .string "Fufufu… I lost the match, but…\n" + .string "I have this little ability…\p" + .string "Without ever laying my hands on\n" + .string "your POKéNAV… Hiyah!$" + +MtPyre_6F_Text_231EB3: @ 8231EB3 + .string "Behind you…\n" + .string "What is it…$" + +MtPyre_6F_Text_231ECB: @ 8231ECB + .string "Something faded away…$" + +MtPyre_6F_Text_231EE1: @ 8231EE1 + .string "The POKéMON at rest here…\n" + .string "Sometimes, they play…$" + +MtPyre_6F_Text_231F11: @ 8231F11 + .string "Have you lost your bearings?\n" + .string "Have no fear for I am here!$" + +MtPyre_6F_Text_231F4A: @ 8231F4A + .string "Weren’t you lost?$" + +MtPyre_6F_Text_231F5C: @ 8231F5C + .string "I had this feeling that a lost TRAINER\n" + .string "would be panicked and easy to beat.\p" + .string "It’s dirty and I won’t try it again…$" + diff --git a/data/maps/MtPyre_Exterior/events.inc b/data/maps/MtPyre_Exterior/events.inc new file mode 100644 index 000000000..badd884f9 --- /dev/null +++ b/data/maps/MtPyre_Exterior/events.inc @@ -0,0 +1,23 @@ +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 + +MtPyre_Exterior_MapWarps: @ 853510C + 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 + 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 + +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 + +MtPyre_Exterior_MapEvents:: @ 853518C + map_events MtPyre_Exterior_EventObjects, MtPyre_Exterior_MapWarps, MtPyre_Exterior_MapCoordEvents, MtPyre_Exterior_MapBGEvents + diff --git a/data/maps/MtPyre_Exterior/scripts.inc b/data/maps/MtPyre_Exterior/scripts.inc new file mode 100644 index 000000000..8f757ebb4 --- /dev/null +++ b/data/maps/MtPyre_Exterior/scripts.inc @@ -0,0 +1,28 @@ +MtPyre_Exterior_MapScripts:: @ 8231FCC + map_script 3, MtPyre_Exterior_MapScript1_231FD2 + .byte 0 + +MtPyre_Exterior_MapScript1_231FD2: @ 8231FD2 + call MtPyre_Exterior_EventScript_231FD8 + end + +MtPyre_Exterior_EventScript_231FD8:: @ 8231FD8 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_1, 12 + goto_if 0, MtPyre_Exterior_EventScript_231FE9 + return + +MtPyre_Exterior_EventScript_231FE9:: @ 8231FE9 + setweather 6 + return + +MtPyre_Exterior_EventScript_231FED:: @ 8231FED + setweather 6 + doweather + end + +MtPyre_Exterior_EventScript_231FF2:: @ 8231FF2 + setweather 2 + doweather + end + diff --git a/data/maps/MtPyre_Summit/events.inc b/data/maps/MtPyre_Summit/events.inc new file mode 100644 index 000000000..2df3aaafd --- /dev/null +++ b/data/maps/MtPyre_Summit/events.inc @@ -0,0 +1,30 @@ +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 + +MtPyre_Summit_MapWarps: @ 8535260 + 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 + 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 + +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 + +MtPyre_Summit_MapEvents:: @ 85352F0 + map_events MtPyre_Summit_EventObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents + diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc new file mode 100644 index 000000000..fe39e9d48 --- /dev/null +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -0,0 +1,640 @@ +MtPyre_Summit_MapScripts:: @ 8231FF7 + map_script 3, MtPyre_Summit_MapScript1_231FFD + .byte 0 + +MtPyre_Summit_MapScript1_231FFD: @ 8231FFD + compare VAR_0x40B9, 2 + call_if 1, MtPyre_Summit_EventScript_232009 + end + +MtPyre_Summit_EventScript_232009:: @ 8232009 + setobjectxyperm 8, 23, 6 + setobjectxyperm 2, 22, 6 + end + +MtPyre_Summit_EventScript_232018:: @ 8232018 + lockall + setvar VAR_0x8008, 0 + goto MtPyre_Summit_EventScript_23203C + end + +MtPyre_Summit_EventScript_232024:: @ 8232024 + lockall + setvar VAR_0x8008, 1 + goto MtPyre_Summit_EventScript_23203C + end + +MtPyre_Summit_EventScript_232030:: @ 8232030 + lockall + setvar VAR_0x8008, 2 + goto MtPyre_Summit_EventScript_23203C + end + +MtPyre_Summit_EventScript_23203C:: @ 823203C + playbgm MUS_AQA_0, 0 + applymovement 255, MtPyre_Summit_Movement_2725B2 + waitmovement 0 + applymovement 2, MtPyre_Summit_Movement_2725AA + waitmovement 0 + delay 50 + compare VAR_0x8008, 0 + call_if 1, MtPyre_Summit_EventScript_2320E0 + compare VAR_0x8008, 1 + call_if 1, MtPyre_Summit_EventScript_2320EB + compare VAR_0x8008, 2 + call_if 1, MtPyre_Summit_EventScript_2320EC + msgbox MtPyre_Summit_Text_23281A, 4 + closemessage + fadescreen 1 + removeobject 2 + removeobject 4 + removeobject 5 + removeobject 6 + removeobject 7 + setflag FLAG_0x394 + setflag FLAG_0x395 + fadedefaultbgm + fadescreen 0 + delay 20 + setvar VAR_0x40B9, 1 + compare VAR_0x8008, 0 + call_if 1, MtPyre_Summit_EventScript_2320F7 + compare VAR_0x8008, 1 + call_if 1, MtPyre_Summit_EventScript_23210C + compare VAR_0x8008, 2 + call_if 1, MtPyre_Summit_EventScript_232117 + msgbox MtPyre_Summit_Text_23290E, 4 + giveitem_std ITEM_MAGMA_EMBLEM + setflag FLAG_0x0D4 + setflag FLAG_0x34F + releaseall + end + +MtPyre_Summit_EventScript_2320E0:: @ 82320E0 + applymovement 2, MtPyre_Summit_Movement_232136 + waitmovement 0 + return + +MtPyre_Summit_EventScript_2320EB:: @ 82320EB + return + +MtPyre_Summit_EventScript_2320EC:: @ 82320EC + applymovement 2, MtPyre_Summit_Movement_232139 + waitmovement 0 + return + +MtPyre_Summit_EventScript_2320F7:: @ 82320F7 + applymovement 3, MtPyre_Summit_Movement_23212C + waitmovement 0 + applymovement 255, MtPyre_Summit_Movement_2725A8 + waitmovement 0 + return + +MtPyre_Summit_EventScript_23210C:: @ 823210C + applymovement 3, MtPyre_Summit_Movement_232130 + waitmovement 0 + return + +MtPyre_Summit_EventScript_232117:: @ 8232117 + applymovement 3, MtPyre_Summit_Movement_232132 + waitmovement 0 + applymovement 255, MtPyre_Summit_Movement_2725A4 + waitmovement 0 + return + +MtPyre_Summit_Movement_23212C: @ 823212C + walk_down + walk_down + walk_in_place_fastest_left + step_end + +MtPyre_Summit_Movement_232130: @ 8232130 + walk_down + step_end + +MtPyre_Summit_Movement_232132: @ 8232132 + walk_down + walk_down + walk_in_place_fastest_right + step_end + +MtPyre_Summit_Movement_232136: @ 8232136 + walk_left + walk_in_place_fastest_down + step_end + +MtPyre_Summit_Movement_232139: @ 8232139 + walk_right + walk_in_place_fastest_down + step_end + +MtPyre_Summit_EventScript_23213C:: @ 823213C + lock + faceplayer + checkflag FLAG_0x09E + goto_eq MtPyre_Summit_EventScript_232167 + msgbox MtPyre_Summit_Text_232E0C, 5 + compare VAR_RESULT, 1 + call_if 1, MtPyre_Summit_EventScript_232187 + compare VAR_RESULT, 0 + call_if 1, MtPyre_Summit_EventScript_232190 + release + end + +MtPyre_Summit_EventScript_232167:: @ 8232167 + msgbox MtPyre_Summit_Text_2331A6, 5 + compare VAR_RESULT, 1 + call_if 1, MtPyre_Summit_EventScript_232199 + compare VAR_RESULT, 0 + call_if 1, MtPyre_Summit_EventScript_232190 + release + end + +MtPyre_Summit_EventScript_232187:: @ 8232187 + msgbox MtPyre_Summit_Text_232F27, 4 + return + +MtPyre_Summit_EventScript_232190:: @ 8232190 + msgbox MtPyre_Summit_Text_233162, 4 + return + +MtPyre_Summit_EventScript_232199:: @ 8232199 + msgbox MtPyre_Summit_Text_23325D, 4 + return + +MtPyre_Summit_EventScript_2321A2:: @ 82321A2 + lock + faceplayer + checkflag FLAG_0x103 + goto_eq MtPyre_Summit_EventScript_2321E2 + compare VAR_0x40B9, 3 + call_if 4, MtPyre_Summit_EventScript_2321CB + checkflag FLAG_0x081 + goto_eq MtPyre_Summit_EventScript_2321D8 + msgbox MtPyre_Summit_Text_232AD8, 4 + release + end + +MtPyre_Summit_EventScript_2321CB:: @ 82321CB + msgbox MtPyre_Summit_Text_232CA6, 4 + setflag FLAG_0x103 + release + end + +MtPyre_Summit_EventScript_2321D8:: @ 82321D8 + msgbox MtPyre_Summit_Text_232B4F, 4 + release + end + +MtPyre_Summit_EventScript_2321E2:: @ 82321E2 + msgbox MtPyre_Summit_Text_232D1E, 4 + release + end + +MtPyre_Summit_EventScript_2321EC:: @ 82321EC + lockall + setvar VAR_0x8008, 0 + goto MtPyre_Summit_EventScript_232210 + end + +MtPyre_Summit_EventScript_2321F8:: @ 82321F8 + lockall + setvar VAR_0x8008, 1 + goto MtPyre_Summit_EventScript_232210 + end + +MtPyre_Summit_EventScript_232204:: @ 8232204 + lockall + setvar VAR_0x8008, 2 + goto MtPyre_Summit_EventScript_232210 + end + +MtPyre_Summit_EventScript_232210:: @ 8232210 + applymovement 255, MtPyre_Summit_Movement_2725A6 + waitmovement 0 + delay 60 + compare VAR_0x8008, 0 + call_if 1, MtPyre_Summit_EventScript_2322C4 + compare VAR_0x8008, 1 + call_if 1, MtPyre_Summit_EventScript_2322DD + compare VAR_0x8008, 2 + call_if 1, MtPyre_Summit_EventScript_2322F6 + playse SE_PIN + applymovement 8, MtPyre_Summit_Movement_272598 + waitmovement 0 + applymovement 8, MtPyre_Summit_Movement_27259A + waitmovement 0 + delay 30 + compare VAR_0x8008, 0 + call_if 1, MtPyre_Summit_EventScript_23230F + compare VAR_0x8008, 1 + call_if 1, MtPyre_Summit_EventScript_232328 + compare VAR_0x8008, 2 + call_if 1, MtPyre_Summit_EventScript_232341 + msgbox MtPyre_Summit_Text_233183, 4 + closemessage + compare VAR_0x8008, 0 + call_if 1, MtPyre_Summit_EventScript_23235A + compare VAR_0x8008, 1 + call_if 1, MtPyre_Summit_EventScript_232376 + compare VAR_0x8008, 2 + call_if 1, MtPyre_Summit_EventScript_232392 + delay 30 + applymovement 2, MtPyre_Summit_Movement_2323B6 + applymovement 8, MtPyre_Summit_Movement_2323BD + waitmovement 0 + removeobject 2 + removeobject 8 + setvar VAR_0x40B9, 3 + releaseall + end + +MtPyre_Summit_EventScript_2322C4:: @ 82322C4 + applymovement 255, MtPyre_Summit_Movement_2323C4 + applymovement 2, MtPyre_Summit_Movement_2323B6 + applymovement 8, MtPyre_Summit_Movement_2323BD + waitmovement 0 + return + +MtPyre_Summit_EventScript_2322DD:: @ 82322DD + applymovement 255, MtPyre_Summit_Movement_2323CB + applymovement 2, MtPyre_Summit_Movement_2323B6 + applymovement 8, MtPyre_Summit_Movement_2323BD + waitmovement 0 + return + +MtPyre_Summit_EventScript_2322F6:: @ 82322F6 + applymovement 255, MtPyre_Summit_Movement_2323D2 + applymovement 2, MtPyre_Summit_Movement_2323B6 + applymovement 8, MtPyre_Summit_Movement_2323BD + waitmovement 0 + return + +MtPyre_Summit_EventScript_23230F:: @ 823230F + applymovement 255, MtPyre_Summit_Movement_2323AE + applymovement 2, MtPyre_Summit_Movement_2323E7 + applymovement 8, MtPyre_Summit_Movement_2323D8 + waitmovement 0 + return + +MtPyre_Summit_EventScript_232328:: @ 8232328 + applymovement 255, MtPyre_Summit_Movement_2323B2 + applymovement 2, MtPyre_Summit_Movement_2323E7 + applymovement 8, MtPyre_Summit_Movement_2323DD + waitmovement 0 + return + +MtPyre_Summit_EventScript_232341:: @ 8232341 + applymovement 255, MtPyre_Summit_Movement_2323B2 + applymovement 2, MtPyre_Summit_Movement_2323E7 + applymovement 8, MtPyre_Summit_Movement_2323E2 + waitmovement 0 + return + +MtPyre_Summit_EventScript_23235A:: @ 823235A + applymovement 255, MtPyre_Summit_Movement_2323EA + applymovement 8, MtPyre_Summit_Movement_2323ED + waitmovement 0 + applymovement 2, MtPyre_Summit_Movement_2725A8 + waitmovement 0 + return + +MtPyre_Summit_EventScript_232376:: @ 8232376 + applymovement 255, MtPyre_Summit_Movement_2323EA + applymovement 8, MtPyre_Summit_Movement_2323F3 + waitmovement 0 + applymovement 2, MtPyre_Summit_Movement_2725A8 + waitmovement 0 + return + +MtPyre_Summit_EventScript_232392:: @ 8232392 + applymovement 255, MtPyre_Summit_Movement_2323EA + applymovement 8, MtPyre_Summit_Movement_2323F8 + waitmovement 0 + applymovement 2, MtPyre_Summit_Movement_2725A8 + waitmovement 0 + return + +MtPyre_Summit_Movement_2323AE: @ 82323AE + delay_16 + delay_16 + walk_in_place_fastest_right + step_end + +MtPyre_Summit_Movement_2323B2: @ 82323B2 + delay_16 + delay_16 + walk_in_place_fastest_left + step_end + +MtPyre_Summit_Movement_2323B6: @ 82323B6 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + step_end + +MtPyre_Summit_Movement_2323BD: @ 82323BD + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + step_end + +MtPyre_Summit_Movement_2323C4: @ 82323C4 + 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 + 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 + delay_16 + delay_8 + walk_in_place_fastest_left + delay_16 + walk_in_place_fastest_down + step_end + +MtPyre_Summit_Movement_2323D8: @ 82323D8 + walk_up + walk_up + walk_up + walk_left + step_end + +MtPyre_Summit_Movement_2323DD: @ 82323DD + walk_up + walk_up + walk_up + walk_in_place_fastest_right + step_end + +MtPyre_Summit_Movement_2323E2: @ 82323E2 + walk_up + walk_up + walk_up + walk_in_place_fastest_right + step_end + +MtPyre_Summit_Movement_2323E7: @ 82323E7 + delay_16 + walk_in_place_fastest_up + step_end + +MtPyre_Summit_Movement_2323EA: @ 82323EA + delay_16 + walk_in_place_fastest_down + step_end + +MtPyre_Summit_Movement_2323ED: @ 82323ED + walk_down + walk_right + walk_down + walk_down + walk_in_place_fastest_left + step_end + +MtPyre_Summit_Movement_2323F3: @ 82323F3 + walk_down + walk_down + walk_down + walk_in_place_fastest_left + step_end + +MtPyre_Summit_Movement_2323F8: @ 82323F8 + walk_down + walk_down + walk_down + walk_in_place_fastest_left + step_end + +MtPyre_Summit_EventScript_2323FD:: @ 82323FD + trainerbattle 0, TRAINER_GRUNT_17, 0, MtPyre_Summit_Text_232459, MtPyre_Summit_Text_2324A0 + msgbox MtPyre_Summit_Text_2324E0, 6 + end + +MtPyre_Summit_EventScript_232414:: @ 8232414 + trainerbattle 0, TRAINER_GRUNT_18, 0, MtPyre_Summit_Text_232513, MtPyre_Summit_Text_2325B0 + msgbox MtPyre_Summit_Text_2325E4, 6 + end + +MtPyre_Summit_EventScript_23242B:: @ 823242B + trainerbattle 0, TRAINER_GRUNT_19, 0, MtPyre_Summit_Text_23261D, MtPyre_Summit_Text_232678 + msgbox MtPyre_Summit_Text_2326B3, 6 + end + +MtPyre_Summit_EventScript_232442:: @ 8232442 + trainerbattle 0, TRAINER_GRUNT_29, 0, MtPyre_Summit_Text_23271B, MtPyre_Summit_Text_23279A + msgbox MtPyre_Summit_Text_2327D8, 6 + end + +MtPyre_Summit_Text_232459: @ 8232459 + .string "No! Those TEAM MAGMA goons got\n" + .string "here ahead of us!\p" + .string "We can’t fall behind!$" + +MtPyre_Summit_Text_2324A0: @ 82324A0 + .string "I thought you were one of the MAGMAS\n" + .string "who happened to come back…$" + +MtPyre_Summit_Text_2324E0: @ 82324E0 + .string "Yeah, so you are strong…\n" + .string "But there’re a lot of us!$" + +MtPyre_Summit_Text_232513: @ 8232513 + .string "Hah!\n" + .string "Too bad for you!\p" + .string "If you came earlier, you only would’ve\n" + .string "had to battle the wimpy TEAM MAGMA.\p" + .string "But since you arrived now, you have\n" + .string "to take on us toughies!$" + +MtPyre_Summit_Text_2325B0: @ 82325B0 + .string "Urgh… I should’ve let you take on\n" + .string "TEAM MAGMA first…$" + +MtPyre_Summit_Text_2325E4: @ 82325E4 + .string "You don’t know anything!\n" + .string "So why are you messing with us?$" + +MtPyre_Summit_Text_23261D: @ 823261D + .string "You…\n" + .string "We saw you at MT. CHIMNEY.\p" + .string "You don’t belong to either TEAM,\n" + .string "so why would you be here?$" + +MtPyre_Summit_Text_232678: @ 8232678 + .string "If you’re going to mess with anyone,\n" + .string "let it be TEAM MAGMA…$" + +MtPyre_Summit_Text_2326B3: @ 82326B3 + .string "Heh, it doesn’t matter!\n" + .string "We bought ourselves some time!\p" + .string "The BOSS should have snatched what\n" + .string "he was after!$" + +MtPyre_Summit_Text_23271B: @ 823271B + .string "Oh, I know!\n" + .string "You tried to join TEAM MAGMA,\l" + .string "but they wouldn’t have you!\p" + .string "Well, don’t think that we’ll let you\n" + .string "join our TEAM AQUA!$" + +MtPyre_Summit_Text_23279A: @ 823279A + .string "If you want to join TEAM AQUA that\n" + .string "badly, we can consider it…$" + +MtPyre_Summit_Text_2327D8: @ 82327D8 + .string "We have a great combination going\n" + .string "with us members and our leader.$" + +MtPyre_Summit_Text_23281A: @ 823281A + .string "ARCHIE: TEAM MAGMA’s MAXIE got ahead\n" + .string "of us, but we also got what we wanted.\p" + .string "The RED ORB preserved at MT. PYRE…\n" + .string "I, ARCHIE, now have it in my possession!\p" + .string "Fufufu… Now we can bring our ultimate\n" + .string "objective to fruition!\p" + .string "Okay, TEAM!\n" + .string "We’re pulling out!$" + +MtPyre_Summit_Text_23290E: @ 823290E + .string "Oh, no…\n" + .string "This cannot happen…\p" + .string "Not only the BLUE ORB, but even\n" + .string "the RED ORB has been taken…\p" + .string "The BLUE ORB and RED ORB must never\n" + .string "be separated. They belong together.\p" + .string "What are those men trying to do with\n" + .string "the two ORBS?\p" + .string "… … … … … …\n" + .string "… … … … … …\p" + .string "Oh, yes. Was it TEAM MAGMA who came\n" + .string "and took the BLUE ORB first?\p" + .string "Well, in their haste, they left this\n" + .string "behind.\p" + .string "I couldn’t imagine what exactly it\n" + .string "could be.\p" + .string "I would like you to have it.\n" + .string "Perhaps it will be useful in some way.$" + +MtPyre_Summit_Text_232AD8: @ 8232AD8 + .string "The BLUE ORB and RED ORB taken by\n" + .string "those sinister men…\p" + .string "They must never be apart…\n" + .string "I fear something terrible will happen…$" + +MtPyre_Summit_Text_232B4F: @ 8232B4F + .string "Oh, my goodness…\p" + .string "You say that both GROUDON and KYOGRE\n" + .string "have been awakened?\p" + .string "It is said that the BLUE ORB and\n" + .string "the RED ORB quelled the rage of\l" + .string "the two POKéMON…\p" + .string "It is also said that the true owner\n" + .string "of the ORBS still exists.\p" + .string "However, no one knows who, or what\n" + .string "exactly, the ORBS belong to.\p" + .string "It could be a human, or perhaps\n" + .string "a POKéMON, but no one knows.$" + +MtPyre_Summit_Text_232CA6: @ 8232CA6 + .string "The two men who took the ORBS came\n" + .string "back to return them on their own.\p" + .string "Those men…\n" + .string "Perhaps they are not so evil after all…$" + +MtPyre_Summit_Text_232D1E: @ 8232D1E + .string "The embodiments of the land, sea,\n" + .string "and the sky…\p" + .string "That is said to be the identities of\n" + .string "the super-ancient POKéMON…\p" + .string "In the same way that we humans and\n" + .string "POKéMON have life, our world, too,\l" + .string "is alive…\p" + .string "The super-ancient POKéMON have\n" + .string "taught us that…$" + +MtPyre_Summit_Text_232E0C: @ 8232E0C + .string "MT. PYRE is where we calm the spirits\n" + .string "of POKéMON that have passed on…\p" + .string "This is a high place where one can\n" + .string "see all of HOENN…\p" + .string "The disembodied spirits of POKéMON\n" + .string "must find solace here…\p" + .string "Is it coincidence that you are here…\p" + .string "Will you hear out my tale? A tale long\n" + .string "told in the HOENN region?$" + +MtPyre_Summit_Text_232F27: @ 8232F27 + .string "It happened long, long ago…\p" + .string "The world was wracked by a ferocious\n" + .string "clash between the POKéMON of the land\l" + .string "and the POKéMON of the sea…\p" + .string "The POKéMON of the land raised\n" + .string "mountains and created continents…\p" + .string "The POKéMON of the sea raised huge\n" + .string "waves and carved out oceans…\p" + .string "Their fierce duel raged without end.\p" + .string "The world was engulfed in massive\n" + .string "infernos and vicious storms.\p" + .string "The BLUE ORB and the RED ORB brought\n" + .string "an end to the calamity.\p" + .string "Light poured from the two ORBS and\n" + .string "becalmed the enraged adversaries.\p" + .string "The pair, made docile, dove deep into\n" + .string "the sea where eventually they\l" + .string "disappeared…$" + +MtPyre_Summit_Text_233162: @ 8233162 + .string "I see…\n" + .string "Well, that, too, is fine…$" + +MtPyre_Summit_Text_233183: @ 8233183 + .string "MAXIE: {PLAYER}…\p" + .string "… … … … … …\n" + .string "… … … … … …$" + +MtPyre_Summit_Text_2331A6: @ 82331A6 + .string "It is my role to pass on the legends\n" + .string "of HOENN to future generations.\p" + .string "And the crisis that just ended in\n" + .string "SOOTOPOLIS rewrote a legend…\p" + .string "Have you the time to hear the new\n" + .string "legend of HOENN?$" + +MtPyre_Summit_Text_23325D: @ 823325D + .string "It happened long, long ago…\p" + .string "The world was wracked by a ferocious\n" + .string "clash between the POKéMON of the land\l" + .string "and the POKéMON of the sea…\p" + .string "The POKéMON of the land raised\n" + .string "mountains and created continents…\p" + .string "The POKéMON of the sea raised huge\n" + .string "waves and carved out oceans…\p" + .string "Their fierce duel raged without end.\p" + .string "The world was engulfed in massive\n" + .string "fires and vicious storms.\p" + .string "It was then that the POKéMON of\n" + .string "the sky descended from a storm.\p" + .string "The POKéMON, shining a vivid green,\n" + .string "becalmed the two enraged POKéMON.\p" + .string "Then, its duty done, the green POKéMON\n" + .string "flew off into the wild blue yonder…$" + diff --git a/data/maps/NavelRock_B1F/events.inc b/data/maps/NavelRock_B1F/events.inc new file mode 100644 index 000000000..e83d221dd --- /dev/null +++ b/data/maps/NavelRock_B1F/events.inc @@ -0,0 +1,7 @@ +NavelRock_B1F_MapWarps: @ 853DA94 + 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/NavelRock_B1F/scripts.inc b/data/maps/NavelRock_B1F/scripts.inc new file mode 100644 index 000000000..a8906f24d --- /dev/null +++ b/data/maps/NavelRock_B1F/scripts.inc @@ -0,0 +1,3 @@ +NavelRock_B1F_MapScripts:: @ 826910D + .byte 0 + diff --git a/data/maps/NavelRock_Bottom/events.inc b/data/maps/NavelRock_Bottom/events.inc new file mode 100644 index 000000000..fec170ae9 --- /dev/null +++ b/data/maps/NavelRock_Bottom/events.inc @@ -0,0 +1,9 @@ +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 + +NavelRock_Bottom_MapWarps: @ 853DD68 + 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/NavelRock_Bottom/scripts.inc b/data/maps/NavelRock_Bottom/scripts.inc new file mode 100644 index 000000000..cce93e624 --- /dev/null +++ b/data/maps/NavelRock_Bottom/scripts.inc @@ -0,0 +1,88 @@ +NavelRock_Bottom_MapScripts:: @ 8269255 + map_script 3, NavelRock_Bottom_MapScript1_269260 + map_script 5, NavelRock_Bottom_MapScript1_269284 + .byte 0 + +NavelRock_Bottom_MapScript1_269260: @ 8269260 + checkflag FLAG_0x091 + call_if 1, NavelRock_Bottom_EventScript_269273 + checkflag FLAG_0x091 + call_if 0, NavelRock_Bottom_EventScript_269277 + end + +NavelRock_Bottom_EventScript_269273:: @ 8269273 + setflag FLAG_0x320 + return + +NavelRock_Bottom_EventScript_269277:: @ 8269277 + checkflag FLAG_0x1DD + goto_eq NavelRock_Bottom_EventScript_27374E + clearflag FLAG_0x320 + return + +NavelRock_Bottom_MapScript1_269284: @ 8269284 + checkflag FLAG_SYS_CTRL_OBJ_DELETE + call_if 1, NavelRock_Bottom_EventScript_26928E + end + +NavelRock_Bottom_EventScript_26928E:: @ 826928E + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 7 + goto_if 5, NavelRock_Bottom_EventScript_27374E + removeobject 1 + return + +NavelRock_Bottom_EventScript_2692A2:: @ 82692A2 + lock + faceplayer + waitse + delay 20 + playse SE_T_AME_E + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 4 + setvar VAR_0x8007, 2 + special sub_8139560 + delay 30 + playse SE_T_AME_E + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 4 + setvar VAR_0x8007, 2 + special sub_8139560 + delay 30 + delay 50 + waitse + playmoncry SPECIES_LUGIA, 2 + waitmoncry + delay 20 + setvar VAR_0x8004, 249 + setvar VAR_0x8005, 70 + setvar VAR_0x8006, 0 + special CreateObedientEnemyMon + setflag FLAG_SYS_CTRL_OBJ_DELETE + special BattleSetup_StartLegendaryBattle + waitstate + clearflag FLAG_SYS_CTRL_OBJ_DELETE + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 1 + goto_eq NavelRock_Bottom_EventScript_269336 + compare VAR_RESULT, 4 + goto_eq NavelRock_Bottom_EventScript_269344 + compare VAR_RESULT, 5 + goto_eq NavelRock_Bottom_EventScript_269344 + setflag FLAG_0x091 + release + end + +NavelRock_Bottom_EventScript_269336:: @ 8269336 + setflag FLAG_0x1DD + setvar VAR_0x8004, 249 + goto NavelRock_Bottom_EventScript_273776 + end + +NavelRock_Bottom_EventScript_269344:: @ 8269344 + setvar VAR_0x8004, 249 + goto NavelRock_Bottom_EventScript_273776 + end + diff --git a/data/maps/NavelRock_Down01/events.inc b/data/maps/NavelRock_Down01/events.inc new file mode 100644 index 000000000..3a6045215 --- /dev/null +++ b/data/maps/NavelRock_Down01/events.inc @@ -0,0 +1,7 @@ +NavelRock_Down01_MapWarps: @ 853DBC4 + 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/NavelRock_Down01/scripts.inc b/data/maps/NavelRock_Down01/scripts.inc new file mode 100644 index 000000000..9677167eb --- /dev/null +++ b/data/maps/NavelRock_Down01/scripts.inc @@ -0,0 +1,3 @@ +NavelRock_Down01_MapScripts:: @ 826924A + .byte 0 + diff --git a/data/maps/NavelRock_Down02/events.inc b/data/maps/NavelRock_Down02/events.inc new file mode 100644 index 000000000..7441539c9 --- /dev/null +++ b/data/maps/NavelRock_Down02/events.inc @@ -0,0 +1,7 @@ +NavelRock_Down02_MapWarps: @ 853DBE8 + 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/NavelRock_Down02/scripts.inc b/data/maps/NavelRock_Down02/scripts.inc new file mode 100644 index 000000000..946530a4a --- /dev/null +++ b/data/maps/NavelRock_Down02/scripts.inc @@ -0,0 +1,3 @@ +NavelRock_Down02_MapScripts:: @ 826924B + .byte 0 + diff --git a/data/maps/NavelRock_Down03/events.inc b/data/maps/NavelRock_Down03/events.inc new file mode 100644 index 000000000..20dabdfaf --- /dev/null +++ b/data/maps/NavelRock_Down03/events.inc @@ -0,0 +1,7 @@ +NavelRock_Down03_MapWarps: @ 853DC0C + 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/NavelRock_Down03/scripts.inc b/data/maps/NavelRock_Down03/scripts.inc new file mode 100644 index 000000000..2a2a702c1 --- /dev/null +++ b/data/maps/NavelRock_Down03/scripts.inc @@ -0,0 +1,3 @@ +NavelRock_Down03_MapScripts:: @ 826924C + .byte 0 + diff --git a/data/maps/NavelRock_Down04/events.inc b/data/maps/NavelRock_Down04/events.inc new file mode 100644 index 000000000..e50f6fe23 --- /dev/null +++ b/data/maps/NavelRock_Down04/events.inc @@ -0,0 +1,7 @@ +NavelRock_Down04_MapWarps: @ 853DC30 + 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/NavelRock_Down04/scripts.inc b/data/maps/NavelRock_Down04/scripts.inc new file mode 100644 index 000000000..acf5aa456 --- /dev/null +++ b/data/maps/NavelRock_Down04/scripts.inc @@ -0,0 +1,3 @@ +NavelRock_Down04_MapScripts:: @ 826924D + .byte 0 + diff --git a/data/maps/NavelRock_Down05/events.inc b/data/maps/NavelRock_Down05/events.inc new file mode 100644 index 000000000..500d38e9b --- /dev/null +++ b/data/maps/NavelRock_Down05/events.inc @@ -0,0 +1,7 @@ +NavelRock_Down05_MapWarps: @ 853DC54 + 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/NavelRock_Down05/scripts.inc b/data/maps/NavelRock_Down05/scripts.inc new file mode 100644 index 000000000..22a0c2059 --- /dev/null +++ b/data/maps/NavelRock_Down05/scripts.inc @@ -0,0 +1,3 @@ +NavelRock_Down05_MapScripts:: @ 826924E + .byte 0 + diff --git a/data/maps/NavelRock_Down06/events.inc b/data/maps/NavelRock_Down06/events.inc new file mode 100644 index 000000000..077367747 --- /dev/null +++ b/data/maps/NavelRock_Down06/events.inc @@ -0,0 +1,7 @@ +NavelRock_Down06_MapWarps: @ 853DC78 + 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/NavelRock_Down06/scripts.inc b/data/maps/NavelRock_Down06/scripts.inc new file mode 100644 index 000000000..9acfe1e6a --- /dev/null +++ b/data/maps/NavelRock_Down06/scripts.inc @@ -0,0 +1,3 @@ +NavelRock_Down06_MapScripts:: @ 826924F + .byte 0 + diff --git a/data/maps/NavelRock_Down07/events.inc b/data/maps/NavelRock_Down07/events.inc new file mode 100644 index 000000000..83f7ce9a6 --- /dev/null +++ b/data/maps/NavelRock_Down07/events.inc @@ -0,0 +1,7 @@ +NavelRock_Down07_MapWarps: @ 853DC9C + 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/NavelRock_Down07/scripts.inc b/data/maps/NavelRock_Down07/scripts.inc new file mode 100644 index 000000000..6c08fcc85 --- /dev/null +++ b/data/maps/NavelRock_Down07/scripts.inc @@ -0,0 +1,3 @@ +NavelRock_Down07_MapScripts:: @ 8269250 + .byte 0 + diff --git a/data/maps/NavelRock_Down08/events.inc b/data/maps/NavelRock_Down08/events.inc new file mode 100644 index 000000000..38bef10e8 --- /dev/null +++ b/data/maps/NavelRock_Down08/events.inc @@ -0,0 +1,7 @@ +NavelRock_Down08_MapWarps: @ 853DCC0 + 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/NavelRock_Down08/scripts.inc b/data/maps/NavelRock_Down08/scripts.inc new file mode 100644 index 000000000..5a40a72a5 --- /dev/null +++ b/data/maps/NavelRock_Down08/scripts.inc @@ -0,0 +1,3 @@ +NavelRock_Down08_MapScripts:: @ 8269251 + .byte 0 + diff --git a/data/maps/NavelRock_Down09/events.inc b/data/maps/NavelRock_Down09/events.inc new file mode 100644 index 000000000..e3843e759 --- /dev/null +++ b/data/maps/NavelRock_Down09/events.inc @@ -0,0 +1,7 @@ +NavelRock_Down09_MapWarps: @ 853DCE4 + 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/NavelRock_Down09/scripts.inc b/data/maps/NavelRock_Down09/scripts.inc new file mode 100644 index 000000000..80bbbc0e5 --- /dev/null +++ b/data/maps/NavelRock_Down09/scripts.inc @@ -0,0 +1,3 @@ +NavelRock_Down09_MapScripts:: @ 8269252 + .byte 0 + diff --git a/data/maps/NavelRock_Down10/events.inc b/data/maps/NavelRock_Down10/events.inc new file mode 100644 index 000000000..805e399b4 --- /dev/null +++ b/data/maps/NavelRock_Down10/events.inc @@ -0,0 +1,7 @@ +NavelRock_Down10_MapWarps: @ 853DD08 + 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/NavelRock_Down10/scripts.inc b/data/maps/NavelRock_Down10/scripts.inc new file mode 100644 index 000000000..2b27edeb5 --- /dev/null +++ b/data/maps/NavelRock_Down10/scripts.inc @@ -0,0 +1,3 @@ +NavelRock_Down10_MapScripts:: @ 8269253 + .byte 0 + diff --git a/data/maps/NavelRock_Down11/events.inc b/data/maps/NavelRock_Down11/events.inc new file mode 100644 index 000000000..505a6ed6d --- /dev/null +++ b/data/maps/NavelRock_Down11/events.inc @@ -0,0 +1,7 @@ +NavelRock_Down11_MapWarps: @ 853DD2C + 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/NavelRock_Down11/scripts.inc b/data/maps/NavelRock_Down11/scripts.inc new file mode 100644 index 000000000..91c6fa36a --- /dev/null +++ b/data/maps/NavelRock_Down11/scripts.inc @@ -0,0 +1,3 @@ +NavelRock_Down11_MapScripts:: @ 8269254 + .byte 0 + diff --git a/data/maps/NavelRock_Entrance/events.inc b/data/maps/NavelRock_Entrance/events.inc new file mode 100644 index 000000000..ee45485a7 --- /dev/null +++ b/data/maps/NavelRock_Entrance/events.inc @@ -0,0 +1,7 @@ +NavelRock_Entrance_MapWarps: @ 853DA70 + 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/NavelRock_Entrance/scripts.inc b/data/maps/NavelRock_Entrance/scripts.inc new file mode 100644 index 000000000..9c25f5054 --- /dev/null +++ b/data/maps/NavelRock_Entrance/scripts.inc @@ -0,0 +1,3 @@ +NavelRock_Entrance_MapScripts:: @ 826910C + .byte 0 + diff --git a/data/maps/NavelRock_Exterior/events.inc b/data/maps/NavelRock_Exterior/events.inc new file mode 100644 index 000000000..66bbf376f --- /dev/null +++ b/data/maps/NavelRock_Exterior/events.inc @@ -0,0 +1,7 @@ +NavelRock_Exterior_MapWarps: @ 853DA00 + 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/NavelRock_Exterior/scripts.inc b/data/maps/NavelRock_Exterior/scripts.inc new file mode 100644 index 000000000..daa3fc964 --- /dev/null +++ b/data/maps/NavelRock_Exterior/scripts.inc @@ -0,0 +1,8 @@ +NavelRock_Exterior_MapScripts:: @ 82690B2 + map_script 3, NavelRock_Exterior_MapScript1_2690B8 + .byte 0 + +NavelRock_Exterior_MapScript1_2690B8: @ 82690B8 + setflag FLAG_0x8E1 + end + diff --git a/data/maps/NavelRock_Fork/events.inc b/data/maps/NavelRock_Fork/events.inc new file mode 100644 index 000000000..869dc0f08 --- /dev/null +++ b/data/maps/NavelRock_Fork/events.inc @@ -0,0 +1,8 @@ +NavelRock_Fork_MapWarps: @ 853DAB8 + 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/NavelRock_Fork/scripts.inc b/data/maps/NavelRock_Fork/scripts.inc new file mode 100644 index 000000000..4269feeac --- /dev/null +++ b/data/maps/NavelRock_Fork/scripts.inc @@ -0,0 +1,3 @@ +NavelRock_Fork_MapScripts:: @ 826910E + .byte 0 + diff --git a/data/maps/NavelRock_Harbor/events.inc b/data/maps/NavelRock_Harbor/events.inc new file mode 100644 index 000000000..2ffdc5fa1 --- /dev/null +++ b/data/maps/NavelRock_Harbor/events.inc @@ -0,0 +1,10 @@ +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 + +NavelRock_Harbor_MapWarps: @ 853DA54 + 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/NavelRock_Harbor/scripts.inc b/data/maps/NavelRock_Harbor/scripts.inc new file mode 100644 index 000000000..7f5a9e4c7 --- /dev/null +++ b/data/maps/NavelRock_Harbor/scripts.inc @@ -0,0 +1,27 @@ +NavelRock_Harbor_MapScripts:: @ 82690BC + .byte 0 + +NavelRock_Harbor_EventScript_2690BD:: @ 82690BD + lock + faceplayer + msgbox NavelRock_Harbor_Text_2C6CE6, 5 + compare VAR_RESULT, 0 + goto_eq NavelRock_Harbor_EventScript_269102 + msgbox NavelRock_Harbor_Text_2A6A5D, 4 + closemessage + applymovement VAR_LAST_TALKED, NavelRock_Harbor_Movement_2725AA + waitmovement 0 + delay 30 + hideobjectat 1, MAP_NAVEL_ROCK_HARBOR + setvar VAR_0x8004, 2 + call NavelRock_Harbor_EventScript_272250 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 + waitstate + release + end + +NavelRock_Harbor_EventScript_269102:: @ 8269102 + msgbox NavelRock_Harbor_Text_2A6A82, 4 + release + end + diff --git a/data/maps/NavelRock_Top/events.inc b/data/maps/NavelRock_Top/events.inc new file mode 100644 index 000000000..dc7c1e7df --- /dev/null +++ b/data/maps/NavelRock_Top/events.inc @@ -0,0 +1,15 @@ +NavelRock_Top_EventObjects: @ 853DB74 + 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 + +NavelRock_Top_MapCoordEvents: @ 853DB94 + coord_event 12, 10, 3, 0, VAR_TEMP_1, 0, 0, NavelRock_Top_EventScript_26916F + +NavelRock_Top_MapBGEvents: @ 853DBA4 + bg_event 12, 9, 3, 7, 0, ITEM_SACRED_ASH, 109, 0 + +NavelRock_Top_MapEvents:: @ 853DBB0 + map_events NavelRock_Top_EventObjects, NavelRock_Top_MapWarps, NavelRock_Top_MapCoordEvents, NavelRock_Top_MapBGEvents + diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc new file mode 100644 index 000000000..67ddbc373 --- /dev/null +++ b/data/maps/NavelRock_Top/scripts.inc @@ -0,0 +1,127 @@ +NavelRock_Top_MapScripts:: @ 8269113 + map_script 3, NavelRock_Top_MapScript1_26911E + map_script 5, NavelRock_Top_MapScript1_269151 + .byte 0 + +NavelRock_Top_MapScript1_26911E: @ 826911E + checkflag FLAG_0x092 + call_if 1, NavelRock_Top_EventScript_269131 + checkflag FLAG_0x092 + call_if 0, NavelRock_Top_EventScript_26913A + end + +NavelRock_Top_EventScript_269131:: @ 8269131 + setvar VAR_TEMP_1, 1 + setflag FLAG_0x321 + return + +NavelRock_Top_EventScript_26913A:: @ 826913A + setvar VAR_TEMP_1, 1 + checkflag FLAG_0x1DC + goto_eq NavelRock_Top_EventScript_27374E + setvar VAR_TEMP_1, 0 + clearflag FLAG_0x321 + return + +NavelRock_Top_MapScript1_269151: @ 8269151 + checkflag FLAG_SYS_CTRL_OBJ_DELETE + call_if 1, NavelRock_Top_EventScript_26915B + end + +NavelRock_Top_EventScript_26915B:: @ 826915B + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 7 + goto_if 5, NavelRock_Top_EventScript_27374E + removeobject 1 + return + +NavelRock_Top_EventScript_26916F:: @ 826916F + lockall + setvar VAR_TEMP_1, 1 + special SpawnScriptEventObject + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 35 + special sub_813B80C + applymovement 1, NavelRock_Top_Movement_269243 + applymovement 127, NavelRock_Top_Movement_269230 + waitmovement 0 + delay 50 + setweather 0 + doweather + waitse + playmoncry SPECIES_HO_OH, 2 + delay 30 + waitmoncry + delay 60 + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 35 + special sub_813B80C + applymovement 127, NavelRock_Top_Movement_269234 + applymovement 1, NavelRock_Top_Movement_26923A + waitmovement 0 + special RemoveScriptEventObject + setvar VAR_0x8004, 250 + setvar VAR_0x8005, 70 + setvar VAR_0x8006, 0 + special CreateObedientEnemyMon + setflag FLAG_SYS_CTRL_OBJ_DELETE + special BattleSetup_StartLegendaryBattle + waitstate + clearflag FLAG_SYS_CTRL_OBJ_DELETE + setvar VAR_LAST_TALKED, 1 + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 1 + goto_eq NavelRock_Top_EventScript_269217 + compare VAR_RESULT, 4 + goto_eq NavelRock_Top_EventScript_269225 + compare VAR_RESULT, 5 + goto_eq NavelRock_Top_EventScript_269225 + setflag FLAG_0x092 + releaseall + end + +NavelRock_Top_EventScript_269217:: @ 8269217 + setflag FLAG_0x1DC + setvar VAR_0x8004, 250 + goto NavelRock_Top_EventScript_273776 + end + +NavelRock_Top_EventScript_269225:: @ 8269225 + setvar VAR_0x8004, 250 + goto NavelRock_Top_EventScript_273776 + end + +NavelRock_Top_Movement_269230: @ 8269230 + walk_up + walk_up + walk_up + step_end + +NavelRock_Top_Movement_269234: @ 8269234 + delay_16 + delay_16 + walk_down + walk_down + walk_down + step_end + +NavelRock_Top_Movement_26923A: @ 826923A + 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 + 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/maps/NavelRock_Up1/events.inc b/data/maps/NavelRock_Up1/events.inc new file mode 100644 index 000000000..fd0741a6a --- /dev/null +++ b/data/maps/NavelRock_Up1/events.inc @@ -0,0 +1,7 @@ +NavelRock_Up1_MapWarps: @ 853DAE4 + 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/NavelRock_Up1/scripts.inc b/data/maps/NavelRock_Up1/scripts.inc new file mode 100644 index 000000000..c85af5f0c --- /dev/null +++ b/data/maps/NavelRock_Up1/scripts.inc @@ -0,0 +1,3 @@ +NavelRock_Up1_MapScripts:: @ 826910F + .byte 0 + diff --git a/data/maps/NavelRock_Up2/events.inc b/data/maps/NavelRock_Up2/events.inc new file mode 100644 index 000000000..bd142b997 --- /dev/null +++ b/data/maps/NavelRock_Up2/events.inc @@ -0,0 +1,7 @@ +NavelRock_Up2_MapWarps: @ 853DB08 + 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/NavelRock_Up2/scripts.inc b/data/maps/NavelRock_Up2/scripts.inc new file mode 100644 index 000000000..27ae52190 --- /dev/null +++ b/data/maps/NavelRock_Up2/scripts.inc @@ -0,0 +1,3 @@ +NavelRock_Up2_MapScripts:: @ 8269110 + .byte 0 + diff --git a/data/maps/NavelRock_Up3/events.inc b/data/maps/NavelRock_Up3/events.inc new file mode 100644 index 000000000..9491e5dac --- /dev/null +++ b/data/maps/NavelRock_Up3/events.inc @@ -0,0 +1,7 @@ +NavelRock_Up3_MapWarps: @ 853DB2C + 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/NavelRock_Up3/scripts.inc b/data/maps/NavelRock_Up3/scripts.inc new file mode 100644 index 000000000..a9c3e2a3c --- /dev/null +++ b/data/maps/NavelRock_Up3/scripts.inc @@ -0,0 +1,3 @@ +NavelRock_Up3_MapScripts:: @ 8269111 + .byte 0 + diff --git a/data/maps/NavelRock_Up4/events.inc b/data/maps/NavelRock_Up4/events.inc new file mode 100644 index 000000000..3d81f1523 --- /dev/null +++ b/data/maps/NavelRock_Up4/events.inc @@ -0,0 +1,7 @@ +NavelRock_Up4_MapWarps: @ 853DB50 + 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/NavelRock_Up4/scripts.inc b/data/maps/NavelRock_Up4/scripts.inc new file mode 100644 index 000000000..c6beead6d --- /dev/null +++ b/data/maps/NavelRock_Up4/scripts.inc @@ -0,0 +1,3 @@ +NavelRock_Up4_MapScripts:: @ 8269112 + .byte 0 + diff --git a/data/maps/NewMauville_Entrance/events.inc b/data/maps/NewMauville_Entrance/events.inc new file mode 100644 index 000000000..29f46af20 --- /dev/null +++ b/data/maps/NewMauville_Entrance/events.inc @@ -0,0 +1,10 @@ +NewMauville_Entrance_MapWarps: @ 8536474 + 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 + +NewMauville_Entrance_MapEvents:: @ 8536494 + map_events 0x0, NewMauville_Entrance_MapWarps, NewMauville_Entrance_MapCoordEvents, 0x0 + diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc new file mode 100644 index 000000000..727b77985 --- /dev/null +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -0,0 +1,61 @@ +NewMauville_Entrance_MapScripts:: @ 82372AD + map_script 1, NewMauville_Entrance_MapScript1_2372B8 + map_script 3, NewMauville_Entrance_MapScript1_2372FB + .byte 0 + +NewMauville_Entrance_MapScript1_2372B8: @ 82372B8 + compare VAR_0x40BA, 0 + call_if 1, NewMauville_Entrance_EventScript_2372C4 + end + +NewMauville_Entrance_EventScript_2372C4:: @ 82372C4 + setmetatile 3, 0, 788, 1 + setmetatile 4, 0, 789, 1 + setmetatile 5, 0, 790, 1 + setmetatile 3, 1, 796, 1 + setmetatile 4, 1, 797, 1 + setmetatile 5, 1, 798, 1 + return + +NewMauville_Entrance_MapScript1_2372FB: @ 82372FB + setflag FLAG_LANDMARK_NEW_MAUVILLE + end + +NewMauville_Entrance_EventScript_2372FF:: @ 82372FF + lockall + applymovement 255, NewMauville_Entrance_Movement_2725A6 + waitmovement 0 + msgbox NewMauville_Entrance_Text_237382, 4 + checkitem ITEM_BASEMENT_KEY, 1 + compare VAR_RESULT, 0 + goto_eq NewMauville_Entrance_EventScript_237380 + msgbox NewMauville_Entrance_Text_237396, 5 + compare VAR_RESULT, 0 + goto_eq NewMauville_Entrance_EventScript_237380 + msgbox NewMauville_Entrance_Text_2373AC, 4 + setmetatile 3, 0, 707, 0 + setmetatile 4, 0, 708, 0 + setmetatile 5, 0, 709, 0 + setmetatile 3, 1, 715, 1 + setmetatile 4, 1, 716, 0 + setmetatile 5, 1, 717, 1 + special DrawWholeMapView + playse SE_BAN + setvar VAR_0x40BA, 1 + releaseall + end + +NewMauville_Entrance_EventScript_237380:: @ 8237380 + releaseall + end + +NewMauville_Entrance_Text_237382: @ 8237382 + .string "The door is locked.$" + +NewMauville_Entrance_Text_237396: @ 8237396 + .string "Use the BASEMENT KEY?$" + +NewMauville_Entrance_Text_2373AC: @ 82373AC + .string "{PLAYER} used the BASEMENT KEY.\p" + .string "The door opened!$" + diff --git a/data/maps/NewMauville_Inside/events.inc b/data/maps/NewMauville_Inside/events.inc new file mode 100644 index 000000000..794f1965c --- /dev/null +++ b/data/maps/NewMauville_Inside/events.inc @@ -0,0 +1,38 @@ +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 + +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 + +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 + +NewMauville_Inside_MapEvents:: @ 8536670 + map_events NewMauville_Inside_EventObjects, NewMauville_Inside_MapWarps, NewMauville_Inside_MapCoordEvents, NewMauville_Inside_MapBGEvents + diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc new file mode 100644 index 000000000..81b21287d --- /dev/null +++ b/data/maps/NewMauville_Inside/scripts.inc @@ -0,0 +1,282 @@ +NewMauville_Inside_MapScripts:: @ 82373D7 + map_script 5, NewMauville_Inside_MapScript1_2373E7 + map_script 3, NewMauville_Inside_MapScript1_23741B + map_script 1, NewMauville_Inside_MapScript1_23744D + .byte 0 + +NewMauville_Inside_MapScript1_2373E7: @ 82373E7 + compare VAR_TEMP_1, 1 + call_if 1, NewMauville_Inside_EventScript_237489 + compare VAR_TEMP_2, 1 + call_if 1, NewMauville_Inside_EventScript_2375D7 + checkflag FLAG_SYS_CTRL_OBJ_DELETE + call_if 1, NewMauville_Inside_EventScript_237407 + end + +NewMauville_Inside_EventScript_237407:: @ 8237407 + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 7 + goto_if 5, NewMauville_Inside_EventScript_27374E + removeobject VAR_LAST_TALKED + return + +NewMauville_Inside_MapScript1_23741B: @ 823741B + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + checkflag FLAG_0x1C1 + call_if 0, NewMauville_Inside_EventScript_237441 + checkflag FLAG_0x1C2 + call_if 0, NewMauville_Inside_EventScript_237445 + checkflag FLAG_0x1C3 + call_if 0, NewMauville_Inside_EventScript_237449 + end + +NewMauville_Inside_EventScript_237441:: @ 8237441 + clearflag FLAG_0x3CE + return + +NewMauville_Inside_EventScript_237445:: @ 8237445 + clearflag FLAG_0x3CF + return + +NewMauville_Inside_EventScript_237449:: @ 8237449 + clearflag FLAG_0x3D0 + return + +NewMauville_Inside_MapScript1_23744D: @ 823744D + compare VAR_0x40BA, 2 + call_if 1, NewMauville_Inside_EventScript_23773A + end + +NewMauville_Inside_EventScript_237459:: @ 8237459 + lockall + setvar VAR_TEMP_1, 1 + setvar VAR_TEMP_2, 0 + playse SE_PIN + call NewMauville_Inside_EventScript_237489 + special DrawWholeMapView + releaseall + end + +NewMauville_Inside_EventScript_237471:: @ 8237471 + lockall + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 1 + playse SE_PIN + call NewMauville_Inside_EventScript_2375D7 + special DrawWholeMapView + releaseall + end + +NewMauville_Inside_EventScript_237489:: @ 8237489 + setmetatile 23, 34, 617, 1 + setmetatile 23, 35, 625, 1 + setmetatile 23, 36, 621, 0 + setmetatile 23, 37, 641, 0 + setmetatile 10, 16, 617, 1 + setmetatile 10, 17, 625, 1 + setmetatile 10, 18, 621, 0 + setmetatile 10, 19, 641, 0 + setmetatile 10, 0, 617, 1 + setmetatile 10, 1, 625, 1 + setmetatile 10, 2, 621, 0 + setmetatile 10, 3, 641, 0 + setmetatile 37, 33, 694, 1 + setmetatile 37, 34, 702, 1 + setmetatile 37, 35, 710, 1 + setmetatile 37, 36, 718, 1 + setmetatile 28, 22, 694, 1 + setmetatile 28, 23, 702, 1 + setmetatile 28, 24, 710, 1 + setmetatile 28, 25, 718, 1 + setmetatile 10, 24, 694, 1 + setmetatile 10, 25, 702, 1 + setmetatile 10, 26, 710, 1 + setmetatile 10, 27, 718, 1 + setmetatile 21, 2, 694, 1 + setmetatile 21, 3, 702, 1 + setmetatile 21, 4, 710, 1 + setmetatile 21, 5, 718, 1 + setmetatile 6, 11, 591, 0 + setmetatile 13, 10, 591, 0 + setmetatile 16, 22, 591, 0 + setmetatile 4, 26, 591, 0 + setmetatile 30, 38, 591, 0 + setmetatile 2, 11, 558, 0 + setmetatile 17, 10, 558, 0 + setmetatile 25, 18, 558, 0 + setmetatile 18, 36, 558, 0 + return + +NewMauville_Inside_EventScript_2375D7:: @ 82375D7 + setmetatile 23, 34, 695, 1 + setmetatile 23, 35, 703, 1 + setmetatile 23, 36, 711, 1 + setmetatile 23, 37, 719, 1 + setmetatile 10, 16, 695, 1 + setmetatile 10, 17, 703, 1 + setmetatile 10, 18, 711, 1 + setmetatile 10, 19, 719, 1 + setmetatile 10, 0, 695, 1 + setmetatile 10, 1, 703, 1 + setmetatile 10, 2, 711, 1 + setmetatile 10, 3, 719, 1 + setmetatile 37, 33, 617, 1 + setmetatile 37, 34, 625, 1 + setmetatile 37, 35, 621, 0 + setmetatile 37, 36, 641, 0 + setmetatile 28, 22, 617, 1 + setmetatile 28, 23, 625, 1 + setmetatile 28, 24, 621, 0 + setmetatile 28, 25, 641, 0 + setmetatile 10, 24, 617, 1 + setmetatile 10, 25, 625, 1 + setmetatile 10, 26, 621, 0 + setmetatile 10, 27, 641, 0 + setmetatile 21, 2, 617, 1 + setmetatile 21, 3, 625, 1 + setmetatile 21, 4, 621, 0 + setmetatile 21, 5, 641, 0 + setmetatile 2, 11, 591, 0 + setmetatile 17, 10, 591, 0 + setmetatile 25, 18, 591, 0 + setmetatile 18, 36, 591, 0 + setmetatile 6, 11, 566, 0 + setmetatile 13, 10, 566, 0 + setmetatile 16, 22, 566, 0 + setmetatile 4, 26, 566, 0 + setmetatile 30, 38, 566, 0 + return + +NewMauville_Inside_EventScript_237725:: @ 8237725 + lockall + msgbox NewMauville_Inside_Text_237932, 4 + call NewMauville_Inside_EventScript_23773A + setvar VAR_0x40BA, 2 + releaseall + end + +NewMauville_Inside_EventScript_23773A:: @ 823773A + setmetatile 33, 6, 591, 0 + setmetatile 32, 2, 752, 1 + setmetatile 33, 2, 753, 1 + setmetatile 34, 2, 754, 1 + setmetatile 35, 2, 755, 1 + setmetatile 32, 3, 756, 1 + setmetatile 33, 3, 757, 1 + setmetatile 34, 3, 758, 1 + setmetatile 35, 3, 759, 1 + special DrawWholeMapView + return + +NewMauville_Inside_EventScript_23778F:: @ 823778F + lockall + compare VAR_0x40BA, 2 + goto_eq NewMauville_Inside_EventScript_2377A5 + msgbox NewMauville_Inside_Text_237896, 4 + releaseall + end + +NewMauville_Inside_EventScript_2377A5:: @ 82377A5 + msgbox NewMauville_Inside_Text_237916, 4 + releaseall + end + +NewMauville_Inside_EventScript_2377AF:: @ 82377AF + lock + faceplayer + setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE + waitse + playmoncry SPECIES_VOLTORB, 2 + delay 40 + waitmoncry + setflag FLAG_SYS_CTRL_OBJ_DELETE + dowildbattle + clearflag FLAG_SYS_CTRL_OBJ_DELETE + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 1 + goto_eq NewMauville_Inside_EventScript_2377F3 + compare VAR_RESULT, 4 + goto_eq NewMauville_Inside_EventScript_2377F3 + compare VAR_RESULT, 5 + goto_eq NewMauville_Inside_EventScript_2377F3 + setflag FLAG_0x1C1 + release + end + +NewMauville_Inside_EventScript_2377F3:: @ 82377F3 + setflag FLAG_0x1C1 + goto NewMauville_Inside_EventScript_27376D + end + +NewMauville_Inside_EventScript_2377FC:: @ 82377FC + lock + faceplayer + setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE + waitse + playmoncry SPECIES_VOLTORB, 2 + delay 40 + waitmoncry + setflag FLAG_SYS_CTRL_OBJ_DELETE + dowildbattle + clearflag FLAG_SYS_CTRL_OBJ_DELETE + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 1 + goto_eq NewMauville_Inside_EventScript_237840 + compare VAR_RESULT, 4 + goto_eq NewMauville_Inside_EventScript_237840 + compare VAR_RESULT, 5 + goto_eq NewMauville_Inside_EventScript_237840 + setflag FLAG_0x1C2 + release + end + +NewMauville_Inside_EventScript_237840:: @ 8237840 + setflag FLAG_0x1C2 + goto NewMauville_Inside_EventScript_27376D + end + +NewMauville_Inside_EventScript_237849:: @ 8237849 + lock + faceplayer + setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE + waitse + playmoncry SPECIES_VOLTORB, 2 + delay 40 + waitmoncry + setflag FLAG_SYS_CTRL_OBJ_DELETE + dowildbattle + clearflag FLAG_SYS_CTRL_OBJ_DELETE + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 1 + goto_eq NewMauville_Inside_EventScript_23788D + compare VAR_RESULT, 4 + goto_eq NewMauville_Inside_EventScript_23788D + compare VAR_RESULT, 5 + goto_eq NewMauville_Inside_EventScript_23788D + setflag FLAG_0x1C3 + release + end + +NewMauville_Inside_EventScript_23788D:: @ 823788D + setflag FLAG_0x1C3 + goto NewMauville_Inside_EventScript_27376D + end + +NewMauville_Inside_Text_237896: @ 8237896 + .string "The generator is radiating heat that\n" + .string "can be felt even at a distance.\p" + .string "It looks like it should be turned off\n" + .string "as soon as possible.$" + +NewMauville_Inside_Text_237916: @ 8237916 + .string "The generator quieted down.$" + +NewMauville_Inside_Text_237932: @ 8237932 + .string "{PLAYER} stepped on the switch.\p" + .string "Click…\p" + .string "… … … … … … … …\n" + .string "… … … … … … … …\p" + .string "The generator appears to have\n" + .string "stopped…$" + diff --git a/data/maps/OldaleTown/events.inc b/data/maps/OldaleTown/events.inc new file mode 100644 index 000000000..b7bc6ab08 --- /dev/null +++ b/data/maps/OldaleTown/events.inc @@ -0,0 +1,28 @@ +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 + +OldaleTown_MapWarps: @ 85278B4 + 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 + 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 + +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 + +OldaleTown_MapEvents:: @ 8527950 + map_events OldaleTown_EventObjects, OldaleTown_MapWarps, OldaleTown_MapCoordEvents, OldaleTown_MapBGEvents + diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc new file mode 100644 index 000000000..32bca3703 --- /dev/null +++ b/data/maps/OldaleTown/scripts.inc @@ -0,0 +1,408 @@ +OldaleTown_MapScripts:: @ 81E8EA2 + map_script 3, OldaleTown_MapScript1_1E8EA8 + .byte 0 + +OldaleTown_MapScript1_1E8EA8: @ 81E8EA8 + call OldaleTown_EventScript_271ED7 + setflag FLAG_VISITED_OLDALE_TOWN + checkflag FLAG_0x074 + call_if 0, OldaleTown_EventScript_1E8ED2 + checkflag FLAG_0x084 + call_if 0, OldaleTown_EventScript_1E8EDE + checkflag FLAG_0x074 + call_if 1, OldaleTown_EventScript_1E8ECC + end + +OldaleTown_EventScript_1E8ECC:: @ 81E8ECC + setvar VAR_0x4051, 1 + return + +OldaleTown_EventScript_1E8ED2:: @ 81E8ED2 + setobjectxyperm 3, 1, 11 + setobjectmovementtype 3, 9 + return + +OldaleTown_EventScript_1E8EDE:: @ 81E8EDE + setobjectxyperm 2, 13, 14 + setobjectmovementtype 2, 8 + return + +OldaleTown_EventScript_1E8EEA:: @ 81E8EEA + msgbox OldaleTown_Text_1E94DA, 3 + end + +OldaleTown_EventScript_1E8EF3:: @ 81E8EF3 + msgbox OldaleTown_Text_1E918E, 2 + end + +OldaleTown_EventScript_1E8EFC:: @ 81E8EFC + lock + faceplayer + checkflag FLAG_0x084 + goto_eq OldaleTown_EventScript_1E8FB9 + checkflag FLAG_0x001 + goto_eq OldaleTown_EventScript_1E8FB9 + setflag FLAG_0x001 + playbgm MUS_TSURETEK, 0 + msgbox OldaleTown_Text_1E91C0, 4 + closemessage + switch VAR_FACING + case 1, OldaleTown_EventScript_1E8F47 + case 2, OldaleTown_EventScript_1E8F5E + case 4, OldaleTown_EventScript_1E8F75 + end + +OldaleTown_EventScript_1E8F47:: @ 81E8F47 + applymovement 2, OldaleTown_Movement_1E8FD7 + applymovement 255, OldaleTown_Movement_1E9001 + waitmovement 0 + goto OldaleTown_EventScript_1E8F8C + end + +OldaleTown_EventScript_1E8F5E:: @ 81E8F5E + applymovement 2, OldaleTown_Movement_1E8FE2 + applymovement 255, OldaleTown_Movement_1E900B + waitmovement 0 + goto OldaleTown_EventScript_1E8F8C + end + +OldaleTown_EventScript_1E8F75:: @ 81E8F75 + applymovement 255, OldaleTown_Movement_1E8FF9 + applymovement 2, OldaleTown_Movement_1E8FCE + waitmovement 0 + goto OldaleTown_EventScript_1E8F8C + end + +OldaleTown_EventScript_1E8F8C:: @ 81E8F8C + msgbox OldaleTown_Text_1E91FD, 4 + giveitem_std ITEM_POTION + compare VAR_RESULT, 0 + goto_eq OldaleTown_EventScript_1E8FC3 + msgbox OldaleTown_Text_1E92AF, 4 + setflag FLAG_0x084 + fadedefaultbgm + release + end + +OldaleTown_EventScript_1E8FB9:: @ 81E8FB9 + msgbox OldaleTown_Text_1E92AF, 4 + release + end + +OldaleTown_EventScript_1E8FC3:: @ 81E8FC3 + msgbox gUnknown_08272AD0, 4 + fadedefaultbgm + release + end + +OldaleTown_Movement_1E8FCE: @ 81E8FCE + 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 + 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 + 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 + 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 + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + step_end + +OldaleTown_Movement_1E9001: @ 81E9001 + delay_16 + delay_16 + delay_16 + delay_16 + walk_up + walk_up + walk_up + walk_up + walk_up + step_end + +OldaleTown_Movement_1E900B: @ 81E900B + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + step_end + +OldaleTown_Movement_1E9013: @ 81E9013 + 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 + lock + faceplayer + checkflag FLAG_0x074 + goto_eq OldaleTown_EventScript_1E9066 + msgbox OldaleTown_Text_1E939A, 4 + closemessage + applymovement 3, OldaleTown_Movement_2725A2 + waitmovement 0 + release + end + +OldaleTown_EventScript_1E903F:: @ 81E903F + lockall + applymovement 255, OldaleTown_Movement_1E9182 + applymovement 3, OldaleTown_Movement_1E9185 + waitmovement 0 + msgbox OldaleTown_Text_1E9313, 4 + closemessage + applymovement 3, OldaleTown_Movement_1E918B + waitmovement 0 + releaseall + end + +OldaleTown_EventScript_1E9066:: @ 81E9066 + msgbox OldaleTown_Text_1E93F8, 4 + release + end + +OldaleTown_EventScript_1E9070:: @ 81E9070 + lockall + applymovement 4, OldaleTown_Movement_27259E + waitmovement 0 + setvar VAR_0x8009, 0 + goto OldaleTown_EventScript_1E90E6 + end + +OldaleTown_EventScript_1E9086:: @ 81E9086 + lockall + applymovement 4, OldaleTown_Movement_1E9170 + waitmovement 0 + applymovement 255, OldaleTown_Movement_2725A8 + waitmovement 0 + setvar VAR_0x8009, 1 + goto OldaleTown_EventScript_1E90E6 + end + +OldaleTown_EventScript_1E90A6:: @ 81E90A6 + lockall + applymovement 4, OldaleTown_Movement_1E9173 + waitmovement 0 + applymovement 255, OldaleTown_Movement_2725A8 + waitmovement 0 + setvar VAR_0x8009, 1 + goto OldaleTown_EventScript_1E90E6 + end + +OldaleTown_EventScript_1E90C6:: @ 81E90C6 + lockall + applymovement 4, OldaleTown_Movement_1E9175 + waitmovement 0 + applymovement 255, OldaleTown_Movement_2725A8 + waitmovement 0 + setvar VAR_0x8009, 1 + goto OldaleTown_EventScript_1E90E6 + end + +OldaleTown_EventScript_1E90E6:: @ 81E90E6 + checkplayergender + compare VAR_RESULT, 0 + goto_eq OldaleTown_EventScript_1E90FE + compare VAR_RESULT, 1 + goto_eq OldaleTown_EventScript_1E910C + end + +OldaleTown_EventScript_1E90FE:: @ 81E90FE + msgbox OldaleTown_Text_1E9462, 4 + goto OldaleTown_EventScript_1E911A + end + +OldaleTown_EventScript_1E910C:: @ 81E910C + msgbox OldaleTown_Text_1E948A, 4 + goto OldaleTown_EventScript_1E911A + end + +OldaleTown_EventScript_1E911A:: @ 81E911A + closemessage + compare VAR_0x8009, 0 + call_if 1, OldaleTown_EventScript_1E9148 + compare VAR_0x8009, 1 + call_if 1, OldaleTown_EventScript_1E915E + applymovement 4, OldaleTown_Movement_1E9177 + waitmovement 0 + removeobject 4 + setvar VAR_0x40C7, 2 + setflag FLAG_0x3D3 + releaseall + end + +OldaleTown_EventScript_1E9148:: @ 81E9148 + compare VAR_FACING, 1 + goto_if 5, OldaleTown_EventScript_1E915E + applymovement 4, OldaleTown_Movement_1E9177 + waitmovement 0 + return + +OldaleTown_EventScript_1E915E:: @ 81E915E + applymovement 255, OldaleTown_Movement_1E917E + applymovement 4, OldaleTown_Movement_1E9177 + waitmovement 0 + return + +OldaleTown_Movement_1E9170: @ 81E9170 + walk_left + walk_left + step_end + +OldaleTown_Movement_1E9173: @ 81E9173 + walk_left + step_end + +OldaleTown_Movement_1E9175: @ 81E9175 + face_left + step_end + +OldaleTown_Movement_1E9177: @ 81E9177 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + step_end + +OldaleTown_Movement_1E917E: @ 81E917E + delay_8 + delay_4 + walk_in_place_fastest_down + step_end + +OldaleTown_Movement_1E9182: @ 81E9182 + delay_8 + walk_right + step_end + +OldaleTown_Movement_1E9185: @ 81E9185 + walk_fast_up + walk_in_place_fastest_left + lock_facing_direction + walk_right + unlock_facing_direction + step_end + +OldaleTown_Movement_1E918B: @ 81E918B + walk_down + walk_left + step_end + +OldaleTown_Text_1E918E: @ 81E918E + .string "I want to take a rest, so I’m saving my\n" + .string "progress.$" + +OldaleTown_Text_1E91C0: @ 81E91C0 + .string "Hi!\n" + .string "I work at a POKéMON MART.\p" + .string "Can I get you to come with me?$" + +OldaleTown_Text_1E91FD: @ 81E91FD + .string "This is a POKéMON MART.\n" + .string "Just look for our blue roof.\p" + .string "We sell a variety of goods including\n" + .string "POKé BALLS for catching POKéMON.\p" + .string "Here, I’d like you to have this as\n" + .string "a promotional item.$" + +OldaleTown_Text_1E92AF: @ 81E92AF + .string "A POTION can be used anytime, so it’s\n" + .string "even more useful than a POKéMON CENTER\l" + .string "in certain situations.$" + +OldaleTown_Text_1E9313: @ 81E9313 + .string "Aaaaah! Wait!\n" + .string "Please don’t come in here.\p" + .string "I just discovered the footprints of\n" + .string "a rare POKéMON!\p" + .string "Wait until I finish sketching\n" + .string "them, okay?$" + +OldaleTown_Text_1E939A: @ 81E939A + .string "I just discovered the footprints of\n" + .string "a rare POKéMON!\p" + .string "Wait until I finish sketching\n" + .string "them, okay?$" + +OldaleTown_Text_1E93F8: @ 81E93F8 + .string "I finished sketching the footprints of\n" + .string "a rare POKéMON.\p" + .string "But it turns out they were only my\n" + .string "own footprints…$" + +OldaleTown_Text_1E9462: @ 81E9462 + .string "MAY: {PLAYER}{KUN}!\n" + .string "Over here!\l" + .string "Let’s hurry home!$" + +OldaleTown_Text_1E948A: @ 81E948A + .string "BRENDAN: I’m heading back to my dad’s\n" + .string "LAB now.\l" + .string "{PLAYER}, you should hustle back, too.$" + +OldaleTown_Text_1E94DA: @ 81E94DA + .string "OLDALE TOWN\n" + .string "“Where things start off scarce.â€$" + diff --git a/data/maps/OldaleTown_House1/events.inc b/data/maps/OldaleTown_House1/events.inc new file mode 100644 index 000000000..cf853c8ac --- /dev/null +++ b/data/maps/OldaleTown_House1/events.inc @@ -0,0 +1,10 @@ +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 + +OldaleTown_House1_MapWarps: @ 852D7CC + 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/OldaleTown_House1/scripts.inc b/data/maps/OldaleTown_House1/scripts.inc new file mode 100644 index 000000000..6a36ff57e --- /dev/null +++ b/data/maps/OldaleTown_House1/scripts.inc @@ -0,0 +1,15 @@ +OldaleTown_House1_MapScripts:: @ 81FBE85 + .byte 0 + +OldaleTown_House1_EventScript_1FBE86:: @ 81FBE86 + msgbox OldaleTown_House1_Text_1FBE8F, 2 + end + +OldaleTown_House1_Text_1FBE8F: @ 81FBE8F + .string "When a POKéMON battle starts, the one\n" + .string "at the left of the list goes out first.\p" + .string "So, when you get more POKéMON in your\n" + .string "party, try switching around the order\l" + .string "of your POKéMON.\p" + .string "It could give you an advantage.$" + diff --git a/data/maps/OldaleTown_House2/events.inc b/data/maps/OldaleTown_House2/events.inc new file mode 100644 index 000000000..2feeb8949 --- /dev/null +++ b/data/maps/OldaleTown_House2/events.inc @@ -0,0 +1,11 @@ +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 + +OldaleTown_House2_MapWarps: @ 852D820 + 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/OldaleTown_House2/scripts.inc b/data/maps/OldaleTown_House2/scripts.inc new file mode 100644 index 000000000..55941705c --- /dev/null +++ b/data/maps/OldaleTown_House2/scripts.inc @@ -0,0 +1,20 @@ +OldaleTown_House2_MapScripts:: @ 81FBF5A + .byte 0 + +OldaleTown_House2_EventScript_1FBF5B:: @ 81FBF5B + msgbox OldaleTown_House2_Text_1FBF6D, 2 + end + +OldaleTown_House2_EventScript_1FBF64:: @ 81FBF64 + msgbox OldaleTown_House2_Text_1FBFB0, 2 + end + +OldaleTown_House2_Text_1FBF6D: @ 81FBF6D + .string "When POKéMON battle, they eventually\n" + .string "level up and become stronger.$" + +OldaleTown_House2_Text_1FBFB0: @ 81FBFB0 + .string "If the POKéMON with you become\n" + .string "stronger, you’ll be able to go farther\l" + .string "away from here.$" + diff --git a/data/maps/OldaleTown_Mart/events.inc b/data/maps/OldaleTown_Mart/events.inc new file mode 100644 index 000000000..f850fa482 --- /dev/null +++ b/data/maps/OldaleTown_Mart/events.inc @@ -0,0 +1,12 @@ +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 + +OldaleTown_Mart_MapWarps: @ 852D9A4 + 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/OldaleTown_Mart/scripts.inc b/data/maps/OldaleTown_Mart/scripts.inc new file mode 100644 index 000000000..de8893712 --- /dev/null +++ b/data/maps/OldaleTown_Mart/scripts.inc @@ -0,0 +1,73 @@ +OldaleTown_Mart_MapScripts:: @ 81FC23F + .byte 0 + +OldaleTown_Mart_EventScript_1FC240:: @ 81FC240 + lock + faceplayer + message gUnknown_08272A21 + waitmessage + checkflag FLAG_0x074 + goto_eq OldaleTown_Mart_EventScript_1FC26C + pokemart OldaleTown_Mart_Pokemart_1FC260 + msgbox gUnknown_08272A3F, 4 + release + end + +OldaleTown_Mart_Pokemart_1FC260: @ 81FC260 + .2byte ITEM_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_AWAKENING + .2byte ITEM_NONE + release + end + +OldaleTown_Mart_EventScript_1FC26C:: @ 81FC26C + pokemart OldaleTown_Mart_Pokemart_1FC27C + msgbox gUnknown_08272A3F, 4 + release + end + + .align 2 +OldaleTown_Mart_Pokemart_1FC27C: @ 81FC27C + .2byte ITEM_POKE_BALL + .2byte ITEM_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_AWAKENING + .2byte ITEM_NONE + release + end + +OldaleTown_Mart_EventScript_1FC28A:: @ 81FC28A + lock + faceplayer + checkflag FLAG_0x074 + goto_eq OldaleTown_Mart_EventScript_1FC29F + msgbox OldaleTown_Mart_Text_1FC2B2, 4 + release + end + +OldaleTown_Mart_EventScript_1FC29F:: @ 81FC29F + msgbox OldaleTown_Mart_Text_1FC2F3, 4 + release + end + +OldaleTown_Mart_EventScript_1FC2A9:: @ 81FC2A9 + msgbox OldaleTown_Mart_Text_1FC338, 2 + end + +OldaleTown_Mart_Text_1FC2B2: @ 81FC2B2 + .string "The clerk says they’re all sold out.\n" + .string "I can’t buy any POKé BALLS.$" + +OldaleTown_Mart_Text_1FC2F3: @ 81FC2F3 + .string "I’m going to buy a bunch of POKé BALLS\n" + .string "and catch a bunch of POKéMON!$" + +OldaleTown_Mart_Text_1FC338: @ 81FC338 + .string "If a POKéMON gets hurt and loses its HP\n" + .string "and faints, it won’t be able to battle.\p" + .string "To prevent your POKéMON from fainting,\n" + .string "restore its HP with a POTION.$" + diff --git a/data/maps/OldaleTown_PokemonCenter_1F/events.inc b/data/maps/OldaleTown_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..bb102baab --- /dev/null +++ b/data/maps/OldaleTown_PokemonCenter_1F/events.inc @@ -0,0 +1,14 @@ +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 + +OldaleTown_PokemonCenter_1F_MapWarps: @ 852D8A4 + 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/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..ece540e70 --- /dev/null +++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc @@ -0,0 +1,63 @@ +OldaleTown_PokemonCenter_1F_MapScripts:: @ 81FC006 + map_script 3, OldaleTown_PokemonCenter_1F_MapScript1_1FC011 + map_script 5, OldaleTown_PokemonCenter_1F_MapScript1_277C30 + .byte 0 + +OldaleTown_PokemonCenter_1F_MapScript1_1FC011: @ 81FC011 + setrespawn 14 + call OldaleTown_PokemonCenter_1F_EventScript_2718DE + end + +OldaleTown_PokemonCenter_1F_EventScript_1FC01A:: @ 81FC01A + setvar VAR_0x800B, 1 + call OldaleTown_PokemonCenter_1F_EventScript_27191E + waitmessage + waitbuttonpress + release + end + +OldaleTown_PokemonCenter_1F_EventScript_1FC028:: @ 81FC028 + msgbox OldaleTown_PokemonCenter_1F_Text_1FC059, 2 + end + +OldaleTown_PokemonCenter_1F_EventScript_1FC031:: @ 81FC031 + msgbox OldaleTown_PokemonCenter_1F_Text_1FC0CD, 2 + end + +OldaleTown_PokemonCenter_1F_EventScript_1FC03A:: @ 81FC03A + lock + faceplayer + checkflag FLAG_SYS_POKEDEX_GET + goto_eq OldaleTown_PokemonCenter_1F_EventScript_1FC04F + msgbox OldaleTown_PokemonCenter_1F_Text_1FC148, 4 + release + end + +OldaleTown_PokemonCenter_1F_EventScript_1FC04F:: @ 81FC04F + msgbox OldaleTown_PokemonCenter_1F_Text_1FC1B9, 4 + release + end + +OldaleTown_PokemonCenter_1F_Text_1FC059: @ 81FC059 + .string "That PC in the corner there is\n" + .string "for any POKéMON TRAINER to use.\p" + .string "Naturally, that means you’re welcome\n" + .string "to use it, too.$" + +OldaleTown_PokemonCenter_1F_Text_1FC0CD: @ 81FC0CD + .string "POKéMON CENTERS are great!\p" + .string "You can use their services as much\n" + .string "as you like, and it’s all for free.\l" + .string "You never have to worry!$" + +OldaleTown_PokemonCenter_1F_Text_1FC148: @ 81FC148 + .string "The POKéMON WIRELESS CLUB on\n" + .string "the second floor was built recently.\p" + .string "But they say they’re still making\n" + .string "adjustments.$" + +OldaleTown_PokemonCenter_1F_Text_1FC1B9: @ 81FC1B9 + .string "The POKéMON WIRELESS CLUB on\n" + .string "the second floor was built recently.\p" + .string "I traded POKéMON right away.$" + diff --git a/data/maps/OldaleTown_PokemonCenter_2F/events.inc b/data/maps/OldaleTown_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..b25b155ea --- /dev/null +++ b/data/maps/OldaleTown_PokemonCenter_2F/events.inc @@ -0,0 +1,14 @@ +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 + +OldaleTown_PokemonCenter_2F_MapWarps: @ 852D930 + 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/OldaleTown_PokemonCenter_2F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..788157beb --- /dev/null +++ b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc @@ -0,0 +1,19 @@ +OldaleTown_PokemonCenter_2F_MapScripts:: @ 81FC218 + map_script 2, OldaleTown_PokemonCenter_2F_MapScript2_276C3B + map_script 4, OldaleTown_PokemonCenter_2F_MapScript2_276B6C + map_script 1, OldaleTown_PokemonCenter_2F_MapScript1_276BBE + map_script 3, OldaleTown_PokemonCenter_2F_MapScript1_276ACF + .byte 0 + +OldaleTown_PokemonCenter_2F_EventScript_1FC22D:: @ 81FC22D + call OldaleTown_PokemonCenter_2F_EventScript_276EB7 + end + +OldaleTown_PokemonCenter_2F_EventScript_1FC233:: @ 81FC233 + call OldaleTown_PokemonCenter_2F_EventScript_2770B2 + end + +OldaleTown_PokemonCenter_2F_EventScript_1FC239:: @ 81FC239 + call OldaleTown_PokemonCenter_2F_EventScript_2771DB + end + diff --git a/data/maps/PacifidlogTown/events.inc b/data/maps/PacifidlogTown/events.inc new file mode 100644 index 000000000..41d54e9fc --- /dev/null +++ b/data/maps/PacifidlogTown/events.inc @@ -0,0 +1,21 @@ +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 + +PacifidlogTown_MapWarps: @ 8527E30 + 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 + bg_event 7, 16, 0, 0, 0, PacifidlogTown_EventScript_1EBADE + bg_event 10, 15, 0, 1, 0, PacifidlogTown_EventScript_271E73 + +PacifidlogTown_MapEvents:: @ 8527E84 + map_events PacifidlogTown_EventObjects, PacifidlogTown_MapWarps, 0x0, PacifidlogTown_MapBGEvents + diff --git a/data/maps/PacifidlogTown/scripts.inc b/data/maps/PacifidlogTown/scripts.inc new file mode 100644 index 000000000..1f4f0e872 --- /dev/null +++ b/data/maps/PacifidlogTown/scripts.inc @@ -0,0 +1,54 @@ +PacifidlogTown_MapScripts:: @ 81EBAB1 + map_script 3, PacifidlogTown_MapScript1_1EBABC + map_script 5, PacifidlogTown_MapScript1_1EBAC0 + .byte 0 + +PacifidlogTown_MapScript1_1EBABC: @ 81EBABC + setflag FLAG_VISITED_PACIFIDLOG_TOWN + end + +PacifidlogTown_MapScript1_1EBAC0: @ 81EBAC0 + setstepcallback 3 + end + +PacifidlogTown_EventScript_1EBAC3:: @ 81EBAC3 + msgbox PacifidlogTown_Text_1EBB6C, 2 + end + +PacifidlogTown_EventScript_1EBACC:: @ 81EBACC + msgbox PacifidlogTown_Text_1EBAE7, 2 + end + +PacifidlogTown_EventScript_1EBAD5:: @ 81EBAD5 + msgbox PacifidlogTown_Text_1EBBAC, 2 + end + +PacifidlogTown_EventScript_1EBADE:: @ 81EBADE + msgbox PacifidlogTown_Text_1EBC7A, 3 + end + +PacifidlogTown_Text_1EBAE7: @ 81EBAE7 + .string "The sea between PACIFIDLOG and\n" + .string "SLATEPORT has a fast-running tide.\p" + .string "If you decide to SURF, you could end\n" + .string "up swept away somewhere else.$" + +PacifidlogTown_Text_1EBB6C: @ 81EBB6C + .string "See, isn’t it neat?\n" + .string "These houses are on water!\p" + .string "I was born here!$" + +PacifidlogTown_Text_1EBBAC: @ 81EBBAC + .string "The SKY PILLAR?\p" + .string "…Oh, you must mean that tall, tall\n" + .string "tower a little further out.\p" + .string "If you asked me, I wouldn’t climb it.\n" + .string "It’s too scary to get up that high.\p" + .string "Life at sea level in PACIFIDLOG,\n" + .string "that suits me fine.$" + +PacifidlogTown_Text_1EBC7A: @ 81EBC7A + .string "PACIFIDLOG TOWN\p" + .string "“Where the morning sun smiles upon\n" + .string "the waters.â€$" + diff --git a/data/maps/PacifidlogTown_House1/events.inc b/data/maps/PacifidlogTown_House1/events.inc new file mode 100644 index 000000000..77ca4c832 --- /dev/null +++ b/data/maps/PacifidlogTown_House1/events.inc @@ -0,0 +1,11 @@ +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 + +PacifidlogTown_House1_MapWarps: @ 852EBD0 + 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/PacifidlogTown_House1/scripts.inc b/data/maps/PacifidlogTown_House1/scripts.inc new file mode 100644 index 000000000..b4fe4c979 --- /dev/null +++ b/data/maps/PacifidlogTown_House1/scripts.inc @@ -0,0 +1,25 @@ +PacifidlogTown_House1_MapScripts:: @ 820365C + .byte 0 + +PacifidlogTown_House1_EventScript_20365D:: @ 820365D + msgbox PacifidlogTown_House1_Text_20366F, 2 + end + +PacifidlogTown_House1_EventScript_203666:: @ 8203666 + msgbox PacifidlogTown_House1_Text_20373A, 2 + end + +PacifidlogTown_House1_Text_20366F: @ 820366F + .string "In the HOENN region, there are three\n" + .string "POKéMON that represent the power of\l" + .string "rock, ice, and steel.\p" + .string "Each of them is said to hide away deep\n" + .string "inside caves.\p" + .string "That’s the story I heard when I was\n" + .string "just a little kid.$" + +PacifidlogTown_House1_Text_20373A: @ 820373A + .string "“Six dots open three doors.â€\p" + .string "Grandpa used to say that, but I don’t\n" + .string "know what he meant.$" + diff --git a/data/maps/PacifidlogTown_House2/events.inc b/data/maps/PacifidlogTown_House2/events.inc new file mode 100644 index 000000000..450533014 --- /dev/null +++ b/data/maps/PacifidlogTown_House2/events.inc @@ -0,0 +1,12 @@ +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 + +PacifidlogTown_House2_MapWarps: @ 852EC3C + 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/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc new file mode 100644 index 000000000..0e87677e6 --- /dev/null +++ b/data/maps/PacifidlogTown_House2/scripts.inc @@ -0,0 +1,156 @@ +PacifidlogTown_House2_MapScripts:: @ 8203791 + .byte 0 + +PacifidlogTown_House2_EventScript_203792:: @ 8203792 + lock + faceplayer + dodailyevents + call PacifidlogTown_House2_EventScript_2037DE + checkflag FLAG_0x12B + goto_eq PacifidlogTown_House2_EventScript_20387E + checkflag FLAG_0x12C + call_if 1, PacifidlogTown_House2_EventScript_2037F8 + checkflag FLAG_0x12C + call_if 0, PacifidlogTown_House2_EventScript_203801 + setflag FLAG_0x12C + specialvar VAR_RESULT, GetLeadMonFriendshipScore + compare VAR_RESULT, 4 + goto_if 4, PacifidlogTown_House2_EventScript_203816 + specialvar VAR_RESULT, GetLeadMonFriendshipScore + compare VAR_RESULT, 2 + goto_if 4, PacifidlogTown_House2_EventScript_203845 + goto PacifidlogTown_House2_EventScript_20384F + end + +PacifidlogTown_House2_EventScript_2037DE:: @ 82037DE + checkflag FLAG_0x12B + goto_if 0, PacifidlogTown_House2_EventScript_27374E + specialvar VAR_RESULT, sub_813970C + compare VAR_RESULT, 0 + call_if 1, PacifidlogTown_House2_EventScript_203812 + return + +PacifidlogTown_House2_EventScript_2037F8:: @ 82037F8 + msgbox PacifidlogTown_House2_Text_20395B, 4 + return + +PacifidlogTown_House2_EventScript_203801:: @ 8203801 + msgbox PacifidlogTown_House2_Text_2038C7, 4 + msgbox PacifidlogTown_House2_Text_20395B, 4 + return + +PacifidlogTown_House2_EventScript_203812:: @ 8203812 + clearflag FLAG_0x12B + return + +PacifidlogTown_House2_EventScript_203816:: @ 8203816 + msgbox PacifidlogTown_House2_Text_20396D, 4 + giveitem_std ITEM_TM27 + compare VAR_RESULT, 0 + goto_eq PacifidlogTown_House2_EventScript_272054 + setflag FLAG_0x12B + special sub_8139754 + msgbox PacifidlogTown_House2_Text_203A85, 4 + release + end + +PacifidlogTown_House2_EventScript_203845:: @ 8203845 + msgbox PacifidlogTown_House2_Text_2039CE, 4 + release + end + +PacifidlogTown_House2_EventScript_20384F:: @ 820384F + msgbox PacifidlogTown_House2_Text_203A2F, 4 + giveitem_std ITEM_TM21 + compare VAR_RESULT, 0 + goto_eq PacifidlogTown_House2_EventScript_272054 + setflag FLAG_0x12B + special sub_8139754 + msgbox PacifidlogTown_House2_Text_203A85, 4 + release + end + +PacifidlogTown_House2_EventScript_20387E:: @ 820387E + specialvar VAR_RESULT, sub_813970C + buffernumberstring 0, VAR_RESULT + msgbox PacifidlogTown_House2_Text_203AF4, 4 + release + end + +PacifidlogTown_House2_EventScript_203891:: @ 8203891 + lock + faceplayer + waitse + playmoncry SPECIES_AZURILL, 0 + msgbox PacifidlogTown_House2_Text_203B8D, 4 + waitmoncry + msgbox PacifidlogTown_House2_Text_203B9D, 4 + release + end + +PacifidlogTown_House2_EventScript_2038AC:: @ 82038AC + lock + faceplayer + waitse + playmoncry SPECIES_AZURILL, 2 + msgbox PacifidlogTown_House2_Text_203BCE, 4 + waitmoncry + msgbox PacifidlogTown_House2_Text_203BDF, 4 + release + end + +PacifidlogTown_House2_Text_2038C7: @ 82038C7 + .string "Er-hem!\p" + .string "I am the POKéMON FAN CLUB’s most\n" + .string "important person, the CHAIRMAN’s\l" + .string "younger brother.\p" + .string "I’m here enjoying my vacation with\n" + .string "POKéMON, yes, indeed.$" + +PacifidlogTown_House2_Text_20395B: @ 820395B + .string "Ah!\n" + .string "Your POKéMON…$" + +PacifidlogTown_House2_Text_20396D: @ 820396D + .string "It clearly likes you very much.\p" + .string "A POKéMON that adoring and adorable\n" + .string "deserves a TM like this, no?$" + +PacifidlogTown_House2_Text_2039CE: @ 82039CE + .string "Hmm…\n" + .string "It’s not bad, but it’s also not good.\p" + .string "You, as the TRAINER, need to put in\n" + .string "some more effort.$" + +PacifidlogTown_House2_Text_203A2F: @ 8203A2F + .string "It has a vicious look to it.\p" + .string "A frightening POKéMON like that\n" + .string "deserves a TM like this.$" + +PacifidlogTown_House2_Text_203A85: @ 8203A85 + .string "If a POKéMON likes you a lot, RETURN’s\n" + .string "power is enhanced.\p" + .string "If it doesn’t like you, FRUSTRATION’s\n" + .string "power goes up.$" + +PacifidlogTown_House2_Text_203AF4: @ 8203AF4 + .string "Oh, yes. In about {STR_VAR_1} or so days,\n" + .string "I should be getting a good TM or two.\p" + .string "You should come see me then.\n" + .string "I’ll give you a TM that’s suitable for\l" + .string "your POKéMON.$" + +PacifidlogTown_House2_Text_203B8D: @ 8203B8D + .string "AZURILL: Rurii.$" + +PacifidlogTown_House2_Text_203B9D: @ 8203B9D + .string "It appears to be very friendly with the\n" + .string "TRAINER.$" + +PacifidlogTown_House2_Text_203BCE: @ 8203BCE + .string "AZURILL: Rururi!$" + +PacifidlogTown_House2_Text_203BDF: @ 8203BDF + .string "It doesn’t appear to like the TRAINER\n" + .string "very much.$" + diff --git a/data/maps/PacifidlogTown_House3/events.inc b/data/maps/PacifidlogTown_House3/events.inc new file mode 100644 index 000000000..635ba86a7 --- /dev/null +++ b/data/maps/PacifidlogTown_House3/events.inc @@ -0,0 +1,11 @@ +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 + +PacifidlogTown_House3_MapWarps: @ 852EC90 + 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/PacifidlogTown_House3/scripts.inc b/data/maps/PacifidlogTown_House3/scripts.inc new file mode 100644 index 000000000..98977b766 --- /dev/null +++ b/data/maps/PacifidlogTown_House3/scripts.inc @@ -0,0 +1,93 @@ +PacifidlogTown_House3_MapScripts:: @ 8203C10 + .byte 0 + +PacifidlogTown_House3_EventScript_203C11:: @ 8203C11 + lock + faceplayer + checkflag FLAG_0x09A + goto_eq PacifidlogTown_House3_EventScript_203CAB + setvar VAR_0x8008, 2 + copyvar VAR_0x8004, VAR_0x8008 + specialvar VAR_RESULT, sub_807E73C + copyvar VAR_0x8009, VAR_RESULT + msgbox PacifidlogTown_House3_Text_203CBE, 5 + compare VAR_RESULT, 0 + goto_eq PacifidlogTown_House3_EventScript_203C93 + special sub_81B94B0 + waitstate + copyvar VAR_0x800A, VAR_0x8004 + compare VAR_0x8004, 255 + goto_eq PacifidlogTown_House3_EventScript_203C93 + copyvar VAR_0x8005, VAR_0x800A + specialvar VAR_RESULT, sub_807E9D4 + copyvar VAR_0x800B, VAR_RESULT + compare VAR_RESULT, VAR_0x8009 + goto_if 5, PacifidlogTown_House3_EventScript_203C9D + copyvar VAR_0x8004, VAR_0x8008 + copyvar VAR_0x8005, VAR_0x800A + special sub_807EA10 + special sub_807F0E4 + waitstate + bufferspeciesname 0, VAR_0x8009 + msgbox PacifidlogTown_House3_Text_203D87, 4 + setflag FLAG_0x09A + release + end + +PacifidlogTown_House3_EventScript_203C93:: @ 8203C93 + msgbox PacifidlogTown_House3_Text_203E12, 4 + release + end + +PacifidlogTown_House3_EventScript_203C9D:: @ 8203C9D + bufferspeciesname 0, VAR_0x8009 + msgbox PacifidlogTown_House3_Text_203DDE, 4 + release + end + +PacifidlogTown_House3_EventScript_203CAB:: @ 8203CAB + msgbox PacifidlogTown_House3_Text_203E7F, 4 + release + end + +PacifidlogTown_House3_EventScript_203CB5:: @ 8203CB5 + msgbox PacifidlogTown_House3_Text_203EF1, 2 + end + +PacifidlogTown_House3_Text_203CBE: @ 8203CBE + .string "Check out this {STR_VAR_2}!\p" + .string "It’s the {STR_VAR_2} that I caught\n" + .string "yesterday to celebrate my birthday!\p" + .string "Oh, I can see that you want it!\n" + .string "After all, it’s priceless!\p" + .string "I’ll tell you what. I might be willing\n" + .string "to trade it for a {STR_VAR_1}.$" + +PacifidlogTown_House3_Text_203D87: @ 8203D87 + .string "Oh, so this is a {STR_VAR_1}?\p" + .string "It’s sort of like a {STR_VAR_2},\n" + .string "and yet it’s subtly different.\p" + .string "Thank you!$" + +PacifidlogTown_House3_Text_203DDE: @ 8203DDE + .string "No, no, no! I won’t accept any\n" + .string "less than a real {STR_VAR_1}!$" + +PacifidlogTown_House3_Text_203E12: @ 8203E12 + .string "Oh, so you’re not going to go through\n" + .string "with this?\p" + .string "That’s cool. I’m not desperate to make\n" + .string "a trade or anything.$" + +PacifidlogTown_House3_Text_203E7F: @ 8203E7F + .string "I know I could go looking for one\n" + .string "on my own, but…\p" + .string "But I really wanted to get a BAGON\n" + .string "that another TRAINER caught…$" + +PacifidlogTown_House3_Text_203EF1: @ 8203EF1 + .string "Is that a POKéDEX?\p" + .string "Did you get to meet a lot of different\n" + .string "POKéMON?\p" + .string "I wish I was like you.$" + diff --git a/data/maps/PacifidlogTown_House4/events.inc b/data/maps/PacifidlogTown_House4/events.inc new file mode 100644 index 000000000..e5f8dd4f1 --- /dev/null +++ b/data/maps/PacifidlogTown_House4/events.inc @@ -0,0 +1,12 @@ +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 + +PacifidlogTown_House4_MapWarps: @ 852ECFC + 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/PacifidlogTown_House4/scripts.inc b/data/maps/PacifidlogTown_House4/scripts.inc new file mode 100644 index 000000000..a3e9cf0a4 --- /dev/null +++ b/data/maps/PacifidlogTown_House4/scripts.inc @@ -0,0 +1,55 @@ +PacifidlogTown_House4_MapScripts:: @ 8203F4B + .byte 0 + +PacifidlogTown_House4_EventScript_203F4C:: @ 8203F4C + msgbox PacifidlogTown_House4_Text_204017, 2 + end + +PacifidlogTown_House4_EventScript_203F55:: @ 8203F55 + msgbox PacifidlogTown_House4_Text_203F93, 2 + end + +PacifidlogTown_House4_EventScript_203F5E:: @ 8203F5E + lock + faceplayer + msgbox PacifidlogTown_House4_Text_204035, 5 + compare VAR_RESULT, 1 + goto_eq PacifidlogTown_House4_EventScript_203F7F + compare VAR_RESULT, 0 + goto_eq PacifidlogTown_House4_EventScript_203F89 + end + +PacifidlogTown_House4_EventScript_203F7F:: @ 8203F7F + msgbox PacifidlogTown_House4_Text_20404E, 4 + release + end + +PacifidlogTown_House4_EventScript_203F89:: @ 8203F89 + msgbox PacifidlogTown_House4_Text_204084, 4 + release + end + +PacifidlogTown_House4_Text_203F93: @ 8203F93 + .string "People were saying they saw a POKéMON\n" + .string "flying high above HOENN.\p" + .string "Is it flying around all the time?\n" + .string "Doesn’t it need to rest somewhere?$" + +PacifidlogTown_House4_Text_204017: @ 8204017 + .string "A sky POKéMON!\n" + .string "A sky POKéMON!$" + +PacifidlogTown_House4_Text_204035: @ 8204035 + .string "Where did you come from?$" + +PacifidlogTown_House4_Text_20404E: @ 820404E + .string "Yes?\n" + .string "YES TOWN?\p" + .string "I’ve never heard of a place like that.$" + +PacifidlogTown_House4_Text_204084: @ 8204084 + .string "No? That doesn’t make any sense.\n" + .string "You have to come from somewhere.\p" + .string "Oh! Wait! You’re not going to say you\n" + .string "were born at the bottom of the sea?$" + diff --git a/data/maps/PacifidlogTown_House5/events.inc b/data/maps/PacifidlogTown_House5/events.inc new file mode 100644 index 000000000..febb80ad6 --- /dev/null +++ b/data/maps/PacifidlogTown_House5/events.inc @@ -0,0 +1,11 @@ +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 + +PacifidlogTown_House5_MapWarps: @ 852ED50 + 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/PacifidlogTown_House5/scripts.inc b/data/maps/PacifidlogTown_House5/scripts.inc new file mode 100644 index 000000000..ec97a639e --- /dev/null +++ b/data/maps/PacifidlogTown_House5/scripts.inc @@ -0,0 +1,37 @@ +PacifidlogTown_House5_MapScripts:: @ 8204110 + .byte 0 + +PacifidlogTown_House5_EventScript_204111:: @ 8204111 + lock + faceplayer + specialvar VAR_RESULT, IsMirageIslandPresent + compare VAR_RESULT, 1 + goto_eq PacifidlogTown_House5_EventScript_20412D + msgbox PacifidlogTown_House5_Text_204140, 4 + release + end + +PacifidlogTown_House5_EventScript_20412D:: @ 820412D + msgbox PacifidlogTown_House5_Text_204161, 4 + release + end + +PacifidlogTown_House5_EventScript_204137:: @ 8204137 + msgbox PacifidlogTown_House5_Text_20418B, 2 + end + +PacifidlogTown_House5_Text_204140: @ 8204140 + .string "I can’t see MIRAGE ISLAND today…$" + +PacifidlogTown_House5_Text_204161: @ 8204161 + .string "Oh! Oh my!\n" + .string "I can see MIRAGE ISLAND today!$" + +PacifidlogTown_House5_Text_20418B: @ 820418B + .string "MIRAGE ISLAND…\p" + .string "It must become visible and invisible\n" + .string "depending on the weather conditions\l" + .string "that make mirages appear.\p" + .string "Or is it really appearing and\n" + .string "disappearing?$" + diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..66b8caa67 --- /dev/null +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc @@ -0,0 +1,15 @@ +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 + +PacifidlogTown_PokemonCenter_1F_MapWarps: @ 852EAE8 + 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/PacifidlogTown_PokemonCenter_1F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..fd34cd2aa --- /dev/null +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc @@ -0,0 +1,48 @@ +PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 82034A7 + map_script 3, PacifidlogTown_PokemonCenter_1F_MapScript1_2034B2 + map_script 5, PacifidlogTown_PokemonCenter_1F_MapScript1_277C30 + .byte 0 + +PacifidlogTown_PokemonCenter_1F_MapScript1_2034B2: @ 82034B2 + setrespawn 19 + end + +PacifidlogTown_PokemonCenter_1F_EventScript_2034B6:: @ 82034B6 + setvar VAR_0x800B, 1 + call PacifidlogTown_PokemonCenter_1F_EventScript_27191E + waitmessage + waitbuttonpress + release + end + +PacifidlogTown_PokemonCenter_1F_EventScript_2034C4:: @ 82034C4 + msgbox PacifidlogTown_PokemonCenter_1F_Text_2034DF, 2 + end + +PacifidlogTown_PokemonCenter_1F_EventScript_2034CD:: @ 82034CD + msgbox PacifidlogTown_PokemonCenter_1F_Text_20350F, 2 + end + +PacifidlogTown_PokemonCenter_1F_EventScript_2034D6:: @ 82034D6 + msgbox PacifidlogTown_PokemonCenter_1F_Text_20356F, 2 + end + +PacifidlogTown_PokemonCenter_1F_Text_2034DF: @ 82034DF + .string "What color is your TRAINER CARD?\n" + .string "Mine’s copper!$" + +PacifidlogTown_PokemonCenter_1F_Text_20350F: @ 820350F + .string "PACIFIDLOG TOWN floats on top of\n" + .string "a colony of CORSOLA.\p" + .string "If I told you that, would you believe\n" + .string "me?$" + +PacifidlogTown_PokemonCenter_1F_Text_20356F: @ 820356F + .string "The ancestors of the people in\n" + .string "PACIFIDLOG were said to have been\l" + .string "born on boats and then lived and died \l" + .string "aboard them.\p" + .string "I understand that they lived that way\n" + .string "because they were searching for\l" + .string "something.$" + diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..1aa279980 --- /dev/null +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc @@ -0,0 +1,14 @@ +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 + +PacifidlogTown_PokemonCenter_2F_MapWarps: @ 852EB74 + 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/PacifidlogTown_PokemonCenter_2F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..0199c2215 --- /dev/null +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc @@ -0,0 +1,19 @@ +PacifidlogTown_PokemonCenter_2F_MapScripts:: @ 8203635 + map_script 2, PacifidlogTown_PokemonCenter_2F_MapScript2_276C3B + map_script 4, PacifidlogTown_PokemonCenter_2F_MapScript2_276B6C + map_script 1, PacifidlogTown_PokemonCenter_2F_MapScript1_276BBE + map_script 3, PacifidlogTown_PokemonCenter_2F_MapScript1_276ACF + .byte 0 + +PacifidlogTown_PokemonCenter_2F_EventScript_20364A:: @ 820364A + call OldaleTown_PokemonCenter_2F_EventScript_276EB7 + end + +PacifidlogTown_PokemonCenter_2F_EventScript_203650:: @ 8203650 + call OldaleTown_PokemonCenter_2F_EventScript_2770B2 + end + +PacifidlogTown_PokemonCenter_2F_EventScript_203656:: @ 8203656 + call OldaleTown_PokemonCenter_2F_EventScript_2771DB + end + diff --git a/data/maps/PetalburgCity/events.inc b/data/maps/PetalburgCity/events.inc new file mode 100644 index 000000000..29fe0e02e --- /dev/null +++ b/data/maps/PetalburgCity/events.inc @@ -0,0 +1,42 @@ +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 + +PetalburgCity_MapWarps: @ 85260A8 + 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 + 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 + +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 + +PetalburgCity_MapEvents:: @ 85261B8 + map_events PetalburgCity_EventObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents + diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc new file mode 100644 index 000000000..67a9f83f3 --- /dev/null +++ b/data/maps/PetalburgCity/scripts.inc @@ -0,0 +1,771 @@ +PetalburgCity_MapScript1_1DC2D7: @ 81DC2D7 + setflag FLAG_VISITED_PETALBURG_CITY + compare VAR_0x4057, 0 + call_if 1, PetalburgCity_EventScript_1DC307 + compare VAR_0x4057, 2 + call_if 1, PetalburgCity_EventScript_1DC30F + compare VAR_0x4057, 4 + call_if 1, PetalburgCity_EventScript_1DC30F + compare VAR_0x4085, 8 + call_if 1, PetalburgCity_EventScript_1DC316 + end + +PetalburgCity_EventScript_1DC307:: @ 81DC307 + setobjectxyperm 8, 5, 11 + return + +PetalburgCity_EventScript_1DC30F:: @ 81DC30F + setflag FLAG_SPECIAL_FLAG_0x4000 + savebgm MUS_TSURETEK + return + +PetalburgCity_EventScript_1DC316:: @ 81DC316 + setvar VAR_0x4085, 7 + return + +PetalburgCity_MapScript2_1DC31C: @ 81DC31C + map_script_2 VAR_0x4057, 2, PetalburgCity_EventScript_1DC32E + map_script_2 VAR_0x4057, 4, PetalburgCity_EventScript_1DC390 + .2byte 0 + +PetalburgCity_EventScript_1DC32E:: @ 81DC32E + lockall + special SavePlayerParty + special PutZigzagoonInPlayerParty + applymovement 2, PetalburgCity_Movement_1DC451 + applymovement 255, PetalburgCity_Movement_1DC430 + waitmovement 0 + msgbox PetalburgCity_Text_1EC1F8, 4 + special StartWallyTutorialBattle + waitstate + msgbox PetalburgCity_Text_1EC271, 4 + applymovement 2, PetalburgCity_Movement_2725A4, MAP_PETALBURG_CITY + waitmovement 2, MAP_PETALBURG_CITY + msgbox PetalburgCity_Text_1EC297, 4 + closemessage + clearflag FLAG_SPECIAL_FLAG_0x4000 + setvar VAR_0x4057, 3 + fadedefaultbgm + clearflag FLAG_SPECIAL_FLAG_0x4001 + special LoadPlayerParty + setvar VAR_0x4085, 1 + warp MAP_PETALBURG_CITY_GYM, 255, 4, 108 + waitstate + releaseall + end + +PetalburgCity_EventScript_1DC390:: @ 81DC390 + lockall + setflag FLAG_SPECIAL_FLAG_0x4000 + applymovement 5, PetalburgCity_Movement_1DC41B + applymovement 255, PetalburgCity_Movement_1DC406 + waitmovement 0 + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 5 + opendoor VAR_0x8004, VAR_0x8005 + waitdooranim + applymovement 5, PetalburgCity_Movement_1DC42D + applymovement 255, PetalburgCity_Movement_1DC418 + waitmovement 0 + setflag FLAG_0x33E + hideobjectat 255, MAP_PETALBURG_CITY + closedoor VAR_0x8004, VAR_0x8005 + waitdooranim + clearflag FLAG_SPECIAL_FLAG_0x4000 + fadedefaultbgm + clearflag FLAG_SPECIAL_FLAG_0x4001 + warp MAP_PETALBURG_CITY_WALLYS_HOUSE, 255, 2, 4 + waitstate + releaseall + end + +PetalburgCity_EventScript_1DC3E6:: @ 81DC3E6 + lock + faceplayer + msgbox PetalburgCity_Text_1DC985, 4 + closemessage + applymovement 3, PetalburgCity_Movement_2725A2 + waitmovement 0 + release + end + +PetalburgCity_EventScript_1DC3FD:: @ 81DC3FD + msgbox PetalburgCity_Text_1DC837, 2 + end + +PetalburgCity_Movement_1DC406: @ 81DC406 + 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 + walk_up + walk_up + step_end + +PetalburgCity_Movement_1DC41B: @ 81DC41B + 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 + walk_up + set_invisible + step_end + +PetalburgCity_Movement_1DC430: @ 81DC430 + 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 + 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 + msgbox PetalburgCity_Text_1DCAAA, 3 + end + +PetalburgCity_EventScript_1DC47F:: @ 81DC47F + msgbox PetalburgCity_Text_1DCAF1, 3 + end + +PetalburgCity_EventScript_1DC488:: @ 81DC488 + msgbox PetalburgCity_Text_1DCA30, 2 + end + +PetalburgCity_EventScript_1DC491:: @ 81DC491 + msgbox PetalburgCity_Text_1DCB23, 3 + end + +PetalburgCity_EventScript_1DC49A:: @ 81DC49A + lockall + setvar VAR_0x8008, 0 + goto PetalburgCity_EventScript_1DC4CA + end + +PetalburgCity_EventScript_1DC4A6:: @ 81DC4A6 + lockall + setvar VAR_0x8008, 1 + goto PetalburgCity_EventScript_1DC4CA + end + +PetalburgCity_EventScript_1DC4B2:: @ 81DC4B2 + lockall + setvar VAR_0x8008, 2 + goto PetalburgCity_EventScript_1DC4CA + end + +PetalburgCity_EventScript_1DC4BE:: @ 81DC4BE + lockall + setvar VAR_0x8008, 3 + goto PetalburgCity_EventScript_1DC4CA + end + +PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA + applymovement 8, PetalburgCity_Movement_27259E + waitmovement 0 + playbgm MUS_TSURETEK, 0 + playse SE_PIN + applymovement 8, PetalburgCity_Movement_272598 + waitmovement 0 + applymovement 8, PetalburgCity_Movement_27259A + waitmovement 0 + compare VAR_0x8008, 0 + call_if 1, PetalburgCity_EventScript_1DC57F + compare VAR_0x8008, 1 + call_if 1, PetalburgCity_EventScript_1DC594 + compare VAR_0x8008, 2 + call_if 1, PetalburgCity_EventScript_1DC59F + compare VAR_0x8008, 3 + call_if 1, PetalburgCity_EventScript_1DC5B4 + msgbox PetalburgCity_Text_1DC881, 4 + closemessage + compare VAR_0x8008, 0 + call_if 1, PetalburgCity_EventScript_1DC5C9 + compare VAR_0x8008, 1 + call_if 1, PetalburgCity_EventScript_1DC5DB + compare VAR_0x8008, 2 + call_if 1, PetalburgCity_EventScript_1DC5ED + compare VAR_0x8008, 3 + call_if 1, PetalburgCity_EventScript_1DC5FF + msgbox PetalburgCity_Text_1DC91B, 4 + applymovement 8, PetalburgCity_Movement_2725A8 + applymovement 255, PetalburgCity_Movement_2725A8 + waitmovement 0 + msgbox PetalburgCity_Text_1DC93E, 4 + closemessage + applymovement 8, PetalburgCity_Movement_1DC658 + waitmovement 0 + fadedefaultbgm + releaseall + end + +PetalburgCity_EventScript_1DC57F:: @ 81DC57F + applymovement 8, PetalburgCity_Movement_1DC615 + waitmovement 0 + applymovement 255, PetalburgCity_Movement_2725AA + waitmovement 0 + return + +PetalburgCity_EventScript_1DC594:: @ 81DC594 + applymovement 8, PetalburgCity_Movement_1DC61A + waitmovement 0 + return + +PetalburgCity_EventScript_1DC59F:: @ 81DC59F + applymovement 8, PetalburgCity_Movement_1DC61D + waitmovement 0 + applymovement 255, PetalburgCity_Movement_2725A6 + waitmovement 0 + return + +PetalburgCity_EventScript_1DC5B4:: @ 81DC5B4 + applymovement 8, PetalburgCity_Movement_1DC622 + waitmovement 0 + applymovement 255, PetalburgCity_Movement_2725A6 + waitmovement 0 + return + +PetalburgCity_EventScript_1DC5C9:: @ 81DC5C9 + applymovement 8, PetalburgCity_Movement_1DC628 + applymovement 255, PetalburgCity_Movement_1DC665 + waitmovement 0 + return + +PetalburgCity_EventScript_1DC5DB:: @ 81DC5DB + applymovement 8, PetalburgCity_Movement_1DC633 + applymovement 255, PetalburgCity_Movement_1DC66F + waitmovement 0 + return + +PetalburgCity_EventScript_1DC5ED:: @ 81DC5ED + applymovement 8, PetalburgCity_Movement_1DC641 + applymovement 255, PetalburgCity_Movement_1DC67C + waitmovement 0 + return + +PetalburgCity_EventScript_1DC5FF:: @ 81DC5FF + applymovement 8, PetalburgCity_Movement_1DC64C + applymovement 255, PetalburgCity_Movement_1DC686 + waitmovement 0 + return + +PetalburgCity_Movement_1DC611:: @ 81DC611 + delay_16 + delay_16 + delay_16 + step_end + +PetalburgCity_Movement_1DC615: @ 81DC615 + walk_right + walk_right + walk_right + walk_in_place_fastest_up + step_end + +PetalburgCity_Movement_1DC61A: @ 81DC61A + walk_right + walk_right + step_end + +PetalburgCity_Movement_1DC61D: @ 81DC61D + walk_right + walk_right + walk_right + walk_in_place_fastest_down + step_end + +PetalburgCity_Movement_1DC622: @ 81DC622 + walk_down + walk_right + walk_right + walk_right + walk_in_place_fastest_down + step_end + +PetalburgCity_Movement_1DC628: @ 81DC628 + 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 + 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 + 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 + 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 + 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 + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + step_end + +PetalburgCity_Movement_1DC66F: @ 81DC66F + 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 + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + step_end + +PetalburgCity_Movement_1DC686: @ 81DC686 + 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 + lockall + addobject 9 + setvar VAR_0x8008, 0 + setobjectxy 9, 13, 10 + goto PetalburgCity_EventScript_1DC6E9 + end + +PetalburgCity_EventScript_1DC6A7:: @ 81DC6A7 + lockall + addobject 9 + setvar VAR_0x8008, 1 + setobjectxy 9, 13, 11 + goto PetalburgCity_EventScript_1DC6E9 + end + +PetalburgCity_EventScript_1DC6BD:: @ 81DC6BD + lockall + addobject 9 + setvar VAR_0x8008, 2 + setobjectxy 9, 13, 12 + goto PetalburgCity_EventScript_1DC6E9 + end + +PetalburgCity_EventScript_1DC6D3:: @ 81DC6D3 + lockall + addobject 9 + setvar VAR_0x8008, 3 + setobjectxy 9, 13, 13 + goto PetalburgCity_EventScript_1DC6E9 + end + +PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9 + applymovement 9, PetalburgCity_Movement_1DC7D6 + waitmovement 0 + playse SE_PIN + applymovement 9, PetalburgCity_Movement_272598 + waitmovement 0 + applymovement 9, PetalburgCity_Movement_27259A + waitmovement 0 + applymovement 9, PetalburgCity_Movement_1DC7DB + waitmovement 0 + applymovement 255, PetalburgCity_Movement_2725A8 + waitmovement 0 + setvar VAR_0x40D1, 1 + msgbox PetalburgCity_Text_1DCB31, 4 + closemessage + applymovement 9, PetalburgCity_Movement_2725A8 + waitmovement 0 + delay 30 + msgbox PetalburgCity_Text_1DCB82, 4 + closemessage + applymovement 9, PetalburgCity_Movement_2725A4 + waitmovement 0 + delay 30 + msgbox PetalburgCity_Text_1DCC09, 4 + closemessage + compare VAR_0x8008, 0 + call_if 1, PetalburgCity_EventScript_1DC78E + compare VAR_0x8008, 1 + call_if 1, PetalburgCity_EventScript_1DC7A0 + compare VAR_0x8008, 2 + call_if 1, PetalburgCity_EventScript_1DC7B2 + compare VAR_0x8008, 3 + call_if 1, PetalburgCity_EventScript_1DC7C4 + setvar VAR_0x40C9, 1 + removeobject 9 + releaseall + end + +PetalburgCity_EventScript_1DC78E:: @ 81DC78E + applymovement 255, PetalburgCity_Movement_1DC7EE + applymovement 9, PetalburgCity_Movement_1DC7E0 + waitmovement 0 + return + +PetalburgCity_EventScript_1DC7A0:: @ 81DC7A0 + applymovement 255, PetalburgCity_Movement_1DC802 + applymovement 9, PetalburgCity_Movement_1DC7F5 + waitmovement 0 + return + +PetalburgCity_EventScript_1DC7B2:: @ 81DC7B2 + applymovement 255, PetalburgCity_Movement_1DC815 + applymovement 9, PetalburgCity_Movement_1DC808 + waitmovement 0 + return + +PetalburgCity_EventScript_1DC7C4:: @ 81DC7C4 + applymovement 255, PetalburgCity_Movement_1DC828 + applymovement 9, PetalburgCity_Movement_1DC81B + waitmovement 0 + return + +PetalburgCity_Movement_1DC7D6: @ 81DC7D6 + walk_left + walk_left + walk_left + walk_left + step_end + +PetalburgCity_Movement_1DC7DB: @ 81DC7DB + walk_left + walk_left + walk_left + walk_left + step_end + +PetalburgCity_Movement_1DC7E0: @ 81DC7E0 + 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 + delay_16 + walk_in_place_fastest_down + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_left + step_end + +PetalburgCity_Movement_1DC7F5: @ 81DC7F5 + 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 + delay_16 + walk_in_place_fastest_down + delay_16 + delay_8 + walk_in_place_fastest_left + step_end + +PetalburgCity_Movement_1DC808: @ 81DC808 + 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 + delay_16 + walk_in_place_fastest_down + delay_16 + delay_8 + walk_in_place_fastest_left + step_end + +PetalburgCity_Movement_1DC81B: @ 81DC81B + 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 + delay_16 + walk_in_place_fastest_up + delay_16 + delay_8 + walk_in_place_fastest_left + step_end + +PetalburgCity_EventScript_1DC82E:: @ 81DC82E + msgbox PetalburgCity_Text_1DC881, 2 + end + +PetalburgCity_Text_1DC837: @ 81DC837 + .string "Where has our WALLY gone?\p" + .string "We have to leave for VERDANTURF TOWN\n" + .string "very soon…$" + +PetalburgCity_Text_1DC881: @ 81DC881 + .string "Hiya! Are you maybe…\n" + .string "A rookie TRAINER?\p" + .string "Do you know what POKéMON TRAINERS\n" + .string "do when they reach a new town?\p" + .string "They first check what kind of GYM\n" + .string "is in the town.$" + +PetalburgCity_Text_1DC91B: @ 81DC91B + .string "See? This is PETALBURG CITY’s GYM.$" + +PetalburgCity_Text_1DC93E: @ 81DC93E + .string "This is the GYM’s sign. Look for it\n" + .string "whenever you’re looking for a GYM.$" + +PetalburgCity_Text_1DC985: @ 81DC985 + .string "My face is reflected in the water.\p" + .string "It’s a shining grin full of hope…\p" + .string "Or it could be a look of somber silence\n" + .string "struggling with fear…\p" + .string "What do you see reflected in your face?$" + +PetalburgCity_Text_1DCA30: @ 81DCA30 + .string "Let’s say you have six POKéMON.\n" + .string "If you catch another one…\p" + .string "It is automatically sent to a STORAGE\n" + .string "BOX over a PC connection.$" + +PetalburgCity_Text_1DCAAA: @ 81DCAAA + .string "PETALBURG CITY POKéMON GYM\n" + .string "LEADER: NORMAN\l" + .string "“A man in pursuit of power!â€$" + +PetalburgCity_Text_1DCAF1: @ 81DCAF1 + .string "PETALBURG CITY\n" + .string "“Where people mingle with nature.â€$" + +PetalburgCity_Text_1DCB23: @ 81DCB23 + .string "WALLY’S HOUSE$" + +PetalburgCity_Text_1DCB31: @ 81DCB31 + .string "Excuse me!\p" + .string "Let me guess, from the way you’re\n" + .string "dressed, are you a POKéMON TRAINER?$" + +PetalburgCity_Text_1DCB82: @ 81DCB82 + .string "… … … … … …\p" + .string "Well, maybe not.\n" + .string "Your clothes aren’t all that dirty.\p" + .string "You’re either a rookie TRAINER,\n" + .string "or maybe you’re just an ordinary kid.$" + +PetalburgCity_Text_1DCC09: @ 81DCC09 + .string "I’m roaming the land in search of\n" + .string "talented TRAINERS.\p" + .string "I’m sorry to have taken your time.$" diff --git a/data/maps/PetalburgCity_Gym/events.inc b/data/maps/PetalburgCity_Gym/events.inc new file mode 100644 index 000000000..2df386d2c --- /dev/null +++ b/data/maps/PetalburgCity_Gym/events.inc @@ -0,0 +1,72 @@ +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 + +PetalburgCity_Gym_MapWarps: @ 852EED0 + 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 + 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 + +PetalburgCity_Gym_MapEvents:: @ 852F0A8 + map_events PetalburgCity_Gym_EventObjects, PetalburgCity_Gym_MapWarps, 0x0, PetalburgCity_Gym_MapBGEvents + diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc new file mode 100644 index 000000000..e95e434b5 --- /dev/null +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -0,0 +1,1703 @@ +PetalburgCity_Gym_MapScripts:: @ 8204889 + map_script 1, PetalburgCity_Gym_MapScript1_20489E + map_script 3, PetalburgCity_Gym_MapScript1_20492D + map_script 4, PetalburgCity_Gym_MapScript2_20498B + map_script 2, PetalburgCity_Gym_MapScript2_20499A + .byte 0 + +PetalburgCity_Gym_MapScript1_20489E: @ 820489E + compare VAR_0x4085, 6 + goto_eq PetalburgCity_Gym_EventScript_2048B5 + compare VAR_0x4085, 7 + call_if 4, PetalburgCity_Gym_EventScript_2048FF + end + +PetalburgCity_Gym_EventScript_2048B5:: @ 82048B5 + setvar VAR_0x8005, 1 + call PetalburgCity_Gym_EventScript_20555E + checktrainerflag TRAINER_RANDALL + call_if 1, PetalburgCity_Gym_EventScript_20557F + checktrainerflag TRAINER_MARY + call_if 1, PetalburgCity_Gym_EventScript_2055A0 + checktrainerflag TRAINER_PARKER + call_if 1, PetalburgCity_Gym_EventScript_2055C1 + checktrainerflag TRAINER_ALEXIA + call_if 1, PetalburgCity_Gym_EventScript_2055E2 + checktrainerflag TRAINER_GEORGE + call_if 1, PetalburgCity_Gym_EventScript_205603 + checktrainerflag TRAINER_JODY + call_if 1, PetalburgCity_Gym_EventScript_205624 + checktrainerflag TRAINER_BERKE + call_if 1, PetalburgCity_Gym_EventScript_205645 + end + +PetalburgCity_Gym_EventScript_2048FF:: @ 82048FF + setvar VAR_0x8005, 1 + call PetalburgCity_Gym_EventScript_20555E + call PetalburgCity_Gym_EventScript_20557F + call PetalburgCity_Gym_EventScript_2055A0 + call PetalburgCity_Gym_EventScript_2055C1 + call PetalburgCity_Gym_EventScript_2055E2 + call PetalburgCity_Gym_EventScript_205603 + call PetalburgCity_Gym_EventScript_205624 + call PetalburgCity_Gym_EventScript_205645 + return + +PetalburgCity_Gym_MapScript1_20492D: @ 820492D + compare VAR_0x4085, 1 + call_if 1, PetalburgCity_Gym_EventScript_20494D + compare VAR_0x4085, 6 + call_if 0, PetalburgCity_Gym_EventScript_204955 + checkflag FLAG_SYS_GAME_CLEAR + call_if 1, PetalburgCity_Gym_EventScript_20495D + end + +PetalburgCity_Gym_EventScript_20494D:: @ 820494D + setobjectxyperm 10, 5, 108 + return + +PetalburgCity_Gym_EventScript_204955:: @ 8204955 + setobjectxyperm 1, 4, 107 + return + +PetalburgCity_Gym_EventScript_20495D:: @ 820495D + setorcopyvar 0x8015, 269 + specialvar VAR_RESULT, IsTrainerReadyForRematch + compare VAR_RESULT, 1 + goto_eq PetalburgCity_Gym_EventScript_204985 + compare VAR_0x4085, 8 + goto_eq PetalburgCity_Gym_EventScript_204985 + setobjectxyperm 1, 4, 107 + return + +PetalburgCity_Gym_EventScript_204985:: @ 8204985 + setvar VAR_0x4085, 8 + end + +PetalburgCity_Gym_MapScript2_20498B: @ 820498B + map_script_2 VAR_0x4085, 1, PetalburgCity_Gym_EventScript_204995 + .2byte 0 + +PetalburgCity_Gym_EventScript_204995:: @ 8204995 + turnobject 255, 2 + end + +PetalburgCity_Gym_MapScript2_20499A: @ 820499A + map_script_2 VAR_0x4085, 1, PetalburgCity_Gym_EventScript_2049A4 + .2byte 0 + +PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4 + lockall + msgbox PetalburgCity_Gym_Text_205B32, 4 + msgbox PetalburgCity_Gym_Text_205B4C, 4 + closemessage + applymovement 255, PetalburgCity_Gym_Movement_2725AA + applymovement 10, PetalburgCity_Gym_Movement_2049EC + waitmovement 0 + playse SE_KAIDAN + removeobject 10 + setflag FLAG_0x2D6 + delay 30 + applymovement 255, PetalburgCity_Gym_Movement_2725A6 + waitmovement 0 + msgbox PetalburgCity_Gym_Text_205C40, 4 + setvar VAR_0x4085, 2 + releaseall + end + +PetalburgCity_Gym_Movement_2049EC: @ 82049EC + walk_down + walk_down + walk_down + delay_16 + step_end + +PetalburgCity_Gym_EventScript_2049F1:: @ 82049F1 + lock + faceplayer + switch VAR_0x4085 + case 2, PetalburgCity_Gym_EventScript_204D4A + case 3, PetalburgCity_Gym_EventScript_204D54 + case 4, PetalburgCity_Gym_EventScript_204D5E + case 5, PetalburgCity_Gym_EventScript_204D68 + case 6, PetalburgCity_Gym_EventScript_204E3B + case 7, PetalburgCity_Gym_EventScript_204D80 + case 8, PetalburgCity_Gym_EventScript_204DB3 + msgbox PetalburgCity_Gym_Text_2057A2, 4 + closemessage + switch VAR_FACING + case 1, PetalburgCity_Gym_EventScript_204A80 + case 2, PetalburgCity_Gym_EventScript_204A8B + case 3, PetalburgCity_Gym_EventScript_204A96 + case 4, PetalburgCity_Gym_EventScript_204AA1 + end + +PetalburgCity_Gym_EventScript_204A80:: @ 8204A80 + setvar VAR_0x8008, 0 + goto PetalburgCity_Gym_EventScript_204AAC + end + +PetalburgCity_Gym_EventScript_204A8B:: @ 8204A8B + setvar VAR_0x8008, 1 + goto PetalburgCity_Gym_EventScript_204AAC + end + +PetalburgCity_Gym_EventScript_204A96:: @ 8204A96 + setvar VAR_0x8008, 2 + goto PetalburgCity_Gym_EventScript_204AAC + end + +PetalburgCity_Gym_EventScript_204AA1:: @ 8204AA1 + setvar VAR_0x8008, 3 + goto PetalburgCity_Gym_EventScript_204AAC + end + +PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC + addobject 10 + playse SE_DOOR + compare VAR_0x8008, 0 + call_if 1, PetalburgCity_Gym_EventScript_204C31 + compare VAR_0x8008, 1 + call_if 1, PetalburgCity_Gym_EventScript_204C43 + compare VAR_0x8008, 2 + call_if 1, PetalburgCity_Gym_EventScript_204C5F + compare VAR_0x8008, 3 + call_if 1, PetalburgCity_Gym_EventScript_204C5F + msgbox PetalburgCity_Gym_Text_2058B1, 4 + msgbox PetalburgCity_Gym_Text_2058DB, 4 + msgbox PetalburgCity_Gym_Text_205910, 4 + msgbox PetalburgCity_Gym_Text_2059D8, 4 + compare VAR_0x8008, 0 + call_if 1, PetalburgCity_Gym_EventScript_204CC7 + compare VAR_0x8008, 1 + call_if 1, PetalburgCity_Gym_EventScript_204CD2 + compare VAR_0x8008, 2 + call_if 1, PetalburgCity_Gym_EventScript_204CE4 + compare VAR_0x8008, 3 + call_if 1, PetalburgCity_Gym_EventScript_204CF6 + msgbox PetalburgCity_Gym_Text_2059E8, 4 + compare VAR_0x8008, 0 + call_if 1, PetalburgCity_Gym_EventScript_204D08 + compare VAR_0x8008, 1 + call_if 1, PetalburgCity_Gym_EventScript_204D13 + compare VAR_0x8008, 2 + call_if 1, PetalburgCity_Gym_EventScript_204D1E + compare VAR_0x8008, 3 + call_if 1, PetalburgCity_Gym_EventScript_204D29 + msgbox PetalburgCity_Gym_Text_205A46, 4 + msgbox PetalburgCity_Gym_Text_205A89, 4 + msgbox PetalburgCity_Gym_Text_205AF4, 4 + compare VAR_0x8008, 0 + call_if 1, PetalburgCity_Gym_EventScript_204D72 + compare VAR_0x8008, 1 + call_if 1, PetalburgCity_Gym_EventScript_204D73 + compare VAR_0x8008, 2 + call_if 1, PetalburgCity_Gym_EventScript_204D7E + compare VAR_0x8008, 3 + call_if 1, PetalburgCity_Gym_EventScript_204D7F + compare VAR_0x8008, 0 + call_if 1, PetalburgCity_Gym_EventScript_204D34 + compare VAR_0x8008, 1 + call_if 1, PetalburgCity_Gym_EventScript_204D3F + compare VAR_0x8008, 2 + call_if 1, PetalburgCity_Gym_EventScript_204D34 + compare VAR_0x8008, 3 + call_if 1, PetalburgCity_Gym_EventScript_204D34 + msgbox PetalburgCity_Gym_Text_205B0F, 4 + closemessage + setflag FLAG_SPECIAL_FLAG_0x4001 + playbgm MUS_TSURETEK, 0 + compare VAR_0x8008, 0 + call_if 1, PetalburgCity_Gym_EventScript_204C78 + compare VAR_0x8008, 1 + call_if 1, PetalburgCity_Gym_EventScript_204C91 + compare VAR_0x8008, 2 + call_if 1, PetalburgCity_Gym_EventScript_204CA3 + compare VAR_0x8008, 3 + call_if 1, PetalburgCity_Gym_EventScript_204CB5 + removeobject 10 + setflag FLAG_0x2D8 + setvar VAR_0x4085, 1 + setvar VAR_0x4057, 2 + clearflag FLAG_0x2D6 + clearflag FLAG_0x362 + setflag FLAG_0x379 + special InitBirchState + warp MAP_PETALBURG_CITY, 255, 15, 8 + waitstate + release + end + +PetalburgCity_Gym_EventScript_204C31:: @ 8204C31 + applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 10, PetalburgCity_Gym_Movement_2050EB + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_204C43:: @ 8204C43 + applymovement 10, PetalburgCity_Gym_Movement_2050E1 + waitmovement 0 + applymovement 1, PetalburgCity_Gym_Movement_2725A8 + applymovement 255, PetalburgCity_Gym_Movement_2725A8 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_204C5F:: @ 8204C5F + applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 255, PetalburgCity_Gym_Movement_2725AA + applymovement 10, PetalburgCity_Gym_Movement_2050EB + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_204C78:: @ 8204C78 + applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 10, PetalburgCity_Gym_Movement_205102 + applymovement 255, PetalburgCity_Gym_Movement_205111 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_204C91:: @ 8204C91 + applymovement 10, PetalburgCity_Gym_Movement_2050F2 + applymovement 255, PetalburgCity_Gym_Movement_205109 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_204CA3:: @ 8204CA3 + applymovement 10, PetalburgCity_Gym_Movement_205102 + applymovement 255, PetalburgCity_Gym_Movement_20511B + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_204CB5:: @ 8204CB5 + applymovement 10, PetalburgCity_Gym_Movement_2050FA + applymovement 255, PetalburgCity_Gym_Movement_205123 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_204CC7:: @ 8204CC7 + applymovement 1, PetalburgCity_Gym_Movement_2725A6 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_204CD2:: @ 8204CD2 + applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 255, PetalburgCity_Gym_Movement_2725A6 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_204CE4:: @ 8204CE4 + applymovement 1, PetalburgCity_Gym_Movement_2725A8 + applymovement 255, PetalburgCity_Gym_Movement_2725A4 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_204CF6:: @ 8204CF6 + applymovement 1, PetalburgCity_Gym_Movement_2725A4 + applymovement 255, PetalburgCity_Gym_Movement_2725A8 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_204D08:: @ 8204D08 + applymovement 1, PetalburgCity_Gym_Movement_2725AA + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_204D13:: @ 8204D13 + applymovement 1, PetalburgCity_Gym_Movement_2725A8 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_204D1E:: @ 8204D1E + applymovement 1, PetalburgCity_Gym_Movement_2725AA + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_204D29:: @ 8204D29 + applymovement 1, PetalburgCity_Gym_Movement_2725AA + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_204D34:: @ 8204D34 + applymovement 10, PetalburgCity_Gym_Movement_27259E + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_204D3F:: @ 8204D3F + applymovement 10, PetalburgCity_Gym_Movement_2725AA + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_204D4A:: @ 8204D4A + msgbox PetalburgCity_Gym_Text_205DB4, 4 + release + end + +PetalburgCity_Gym_EventScript_204D54:: @ 8204D54 + msgbox PetalburgCity_Gym_Text_205EAE, 4 + release + end + +PetalburgCity_Gym_EventScript_204D5E:: @ 8204D5E + msgbox PetalburgCity_Gym_Text_205F87, 4 + release + end + +PetalburgCity_Gym_EventScript_204D68:: @ 8204D68 + msgbox PetalburgCity_Gym_Text_205F87, 4 + release + end + +PetalburgCity_Gym_EventScript_204D72:: @ 8204D72 + return + +PetalburgCity_Gym_EventScript_204D73:: @ 8204D73 + applymovement 1, PetalburgCity_Gym_Movement_2725AA + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_204D7E:: @ 8204D7E + return + +PetalburgCity_Gym_EventScript_204D7F:: @ 8204D7F + return + +PetalburgCity_Gym_EventScript_204D80:: @ 8204D80 + call PetalburgCity_Gym_EventScript_204DCE + compare VAR_RESULT, 1 + goto_eq PetalburgCity_Gym_EventScript_204E1D + checkflag FLAG_0x0A9 + goto_if 0, PetalburgCity_Gym_EventScript_204DAC + checkflag FLAG_SYS_GAME_CLEAR + goto_eq PetalburgCity_Gym_EventScript_20512D + msgbox PetalburgCity_Gym_Text_206417, 4 + release + end + +PetalburgCity_Gym_EventScript_204DAC:: @ 8204DAC + call PetalburgCity_Gym_EventScript_204ED2 + release + end + +PetalburgCity_Gym_EventScript_204DB3:: @ 8204DB3 + trainerbattle 7, TRAINER_NORMAN_1, 0, PetalburgCity_Gym_Text_2074A2, PetalburgCity_Gym_Text_2075CE, PetalburgCity_Gym_Text_20764A + msgbox PetalburgCity_Gym_Text_2075F7, 6 + end + +PetalburgCity_Gym_EventScript_204DCE:: @ 8204DCE + specialvar VAR_RESULT, IsEnigmaBerryValid + compare VAR_RESULT, 0 + goto_eq PetalburgCity_Gym_EventScript_204E17 + checkitem ITEM_ENIGMA_BERRY, 1 + compare VAR_RESULT, 1 + goto_eq PetalburgCity_Gym_EventScript_204E17 + checkpcitem ITEM_ENIGMA_BERRY, 1 + compare VAR_RESULT, 1 + goto_eq PetalburgCity_Gym_EventScript_204E17 + compare VAR_ENIGMA_BERRY_AVAILABLE, 0 + goto_eq PetalburgCity_Gym_EventScript_204E17 + msgbox PetalburgCity_Gym_Text_2A6D3D, 4 + setvar VAR_RESULT, 1 + return + +PetalburgCity_Gym_EventScript_204E17:: @ 8204E17 + setvar VAR_RESULT, 0 + return + +PetalburgCity_Gym_EventScript_204E1D:: @ 8204E1D + giveitem_std ITEM_ENIGMA_BERRY + compare VAR_RESULT, 0 + goto_eq PetalburgCity_Gym_EventScript_272054 + setvar VAR_ENIGMA_BERRY_AVAILABLE, 0 + release + end + +PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B + msgbox PetalburgCity_Gym_Text_205FE5, 4 + trainerbattle 3, TRAINER_NORMAN_1, 0, PetalburgCity_Gym_Text_206107 + message PetalburgCity_Gym_Text_206162 + waitmessage + call PetalburgCity_Gym_EventScript_27207E + msgbox PetalburgCity_Gym_Text_20618A, 4 + setflag FLAG_0x4F4 + setvar VAR_0x4085, 7 + setflag FLAG_BADGE05_GET + special sub_813B9A0 + call PetalburgCity_Gym_EventScript_2721F8 + setflag FLAG_SPRITEVIS_MAUVILLE_GYM_WATTSON + clearflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON + setvar VAR_0x8008, 5 + call PetalburgCity_Gym_EventScript_271F43 + clearflag FLAG_0x3AC + call PetalburgCity_Gym_EventScript_2048FF + special DrawWholeMapView + call PetalburgCity_Gym_EventScript_204ED2 + delay 30 + msgbox PetalburgCity_Gym_Text_2062FB, 4 + closemessage + delay 40 + playse SE_DOOR + delay 10 + addobject 11 + switch VAR_FACING + case 2, PetalburgCity_Gym_EventScript_204EF5 + case 3, PetalburgCity_Gym_EventScript_204F09 + case 4, PetalburgCity_Gym_EventScript_204EFF + end + +PetalburgCity_Gym_EventScript_204ED2:: @ 8204ED2 + giveitem_std ITEM_TM42 + compare VAR_RESULT, 0 + goto_eq PetalburgCity_Gym_EventScript_27205E + setflag FLAG_0x0A9 + msgbox PetalburgCity_Gym_Text_206254, 4 + return + +PetalburgCity_Gym_EventScript_204EF5:: @ 8204EF5 + setvar VAR_0x8008, 1 + goto PetalburgCity_Gym_EventScript_204F13 + +PetalburgCity_Gym_EventScript_204EFF:: @ 8204EFF + setvar VAR_0x8008, 2 + goto PetalburgCity_Gym_EventScript_204F13 + +PetalburgCity_Gym_EventScript_204F09:: @ 8204F09 + setvar VAR_0x8008, 3 + goto PetalburgCity_Gym_EventScript_204F13 + +PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 + applymovement 11, PetalburgCity_Gym_Movement_2050BB + waitmovement 0 + playse SE_PIN + applymovement 11, PetalburgCity_Gym_Movement_272598 + waitmovement 0 + applymovement 11, PetalburgCity_Gym_Movement_27259A + waitmovement 0 + delay 10 + compare VAR_0x8008, 1 + call_if 1, PetalburgCity_Gym_EventScript_204FED + compare VAR_0x8008, 2 + call_if 1, PetalburgCity_Gym_EventScript_205009 + compare VAR_0x8008, 3 + call_if 1, PetalburgCity_Gym_EventScript_205025 + msgbox PetalburgCity_Gym_Text_206377, 4 + closemessage + delay 20 + compare VAR_0x8008, 1 + call_if 1, PetalburgCity_Gym_EventScript_204FCC + compare VAR_0x8008, 2 + call_if 1, PetalburgCity_Gym_EventScript_204FD7 + compare VAR_0x8008, 3 + call_if 1, PetalburgCity_Gym_EventScript_204FE2 + msgbox PetalburgCity_Gym_Text_2063CA, 4 + closemessage + setflag FLAG_SPECIAL_FLAG_0x4001 + playbgm MUS_TSURETEK, 0 + compare VAR_0x8008, 1 + call_if 1, PetalburgCity_Gym_EventScript_205041 + compare VAR_0x8008, 2 + call_if 1, PetalburgCity_Gym_EventScript_20505A + compare VAR_0x8008, 3 + call_if 1, PetalburgCity_Gym_EventScript_20506C + removeobject 11 + setvar VAR_0x4057, 4 + clearflag FLAG_0x33E + warp MAP_PETALBURG_CITY, 255, 15, 8 + waitstate + release + end + +PetalburgCity_Gym_EventScript_204FCC:: @ 8204FCC + applymovement 11, PetalburgCity_Gym_Movement_2725A6 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_204FD7:: @ 8204FD7 + applymovement 11, PetalburgCity_Gym_Movement_2725A8 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_204FE2:: @ 8204FE2 + applymovement 11, PetalburgCity_Gym_Movement_2725A4 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_204FED:: @ 8204FED + applymovement 11, PetalburgCity_Gym_Movement_2050C3 + waitmovement 0 + applymovement 255, PetalburgCity_Gym_Movement_2725A4 + applymovement 1, PetalburgCity_Gym_Movement_2725A4 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_205009:: @ 8205009 + applymovement 11, PetalburgCity_Gym_Movement_2050CA + waitmovement 0 + applymovement 255, PetalburgCity_Gym_Movement_2725AA + applymovement 1, PetalburgCity_Gym_Movement_2725AA + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_205025:: @ 8205025 + applymovement 11, PetalburgCity_Gym_Movement_2050D0 + waitmovement 0 + applymovement 255, PetalburgCity_Gym_Movement_2725AA + applymovement 1, PetalburgCity_Gym_Movement_2725AA + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_205041:: @ 8205041 + applymovement 11, PetalburgCity_Gym_Movement_20507E + applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 255, PetalburgCity_Gym_Movement_2050A1 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_20505A:: @ 820505A + applymovement 11, PetalburgCity_Gym_Movement_205089 + applymovement 255, PetalburgCity_Gym_Movement_2050A9 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_20506C:: @ 820506C + applymovement 11, PetalburgCity_Gym_Movement_205094 + applymovement 255, PetalburgCity_Gym_Movement_2050B1 + waitmovement 0 + return + +PetalburgCity_Gym_Movement_20507E: @ 820507E + 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 + 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 + 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 + delay_16 + walk_down + walk_down + walk_left + walk_left + walk_down + walk_down + step_end + +PetalburgCity_Gym_Movement_2050A9: @ 82050A9 + delay_16 + walk_down + walk_down + walk_left + walk_down + walk_down + walk_down + step_end + +PetalburgCity_Gym_Movement_2050B1: @ 82050B1 + 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 + 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 + walk_right + walk_right + walk_up + walk_up + walk_up + walk_in_place_fastest_right + step_end + +PetalburgCity_Gym_Movement_2050CA: @ 82050CA + walk_right + walk_right + walk_up + walk_up + walk_up + step_end + +PetalburgCity_Gym_Movement_2050D0: @ 82050D0 + walk_right + walk_right + walk_up + walk_up + walk_right + walk_right + walk_up + step_end + +PetalburgCity_Gym_Movement_2050D8: @ 82050D8 + 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 + 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 + delay_16 + walk_up + delay_16 + delay_8 + walk_up + walk_up + step_end + +PetalburgCity_Gym_Movement_2050F2: @ 82050F2 + 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 + 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 + walk_down + walk_down + walk_down + walk_in_place_fastest_up + delay_16 + walk_in_place_down + step_end + +PetalburgCity_Gym_Movement_205109: @ 8205109 + delay_16 + delay_16 + delay_16 + walk_down + walk_down + walk_down + delay_8 + step_end + +PetalburgCity_Gym_Movement_205111: @ 8205111 + 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 + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_down + delay_8 + step_end + +PetalburgCity_Gym_Movement_205123: @ 8205123 + 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 + msgbox PetalburgCity_Gym_Text_2064C3, 4 + release + end + +PetalburgCity_Gym_EventScript_205137:: @ 8205137 + lockall + compare VAR_0x4085, 6 + goto_if 0, PetalburgCity_Gym_EventScript_20517D + setvar VAR_0x8008, 7 + setvar VAR_0x8009, 85 + msgbox PetalburgCity_Gym_Text_20721E, 5 + compare VAR_RESULT, 1 + goto_eq PetalburgCity_Gym_EventScript_20516C + compare VAR_RESULT, 0 + goto_eq PetalburgCity_Gym_EventScript_20517B + end + +PetalburgCity_Gym_EventScript_20516C:: @ 820516C + closemessage + delay 30 + warpdoor MAP_PETALBURG_CITY_GYM, 255, 32776, 32777 + waitstate + releaseall + end + +PetalburgCity_Gym_EventScript_20517B:: @ 820517B + releaseall + end + +PetalburgCity_Gym_EventScript_20517D:: @ 820517D + msgbox PetalburgCity_Gym_Text_2071F4, 4 + releaseall + end + +PetalburgCity_Gym_EventScript_205187:: @ 8205187 + lockall + compare VAR_0x4085, 6 + goto_if 0, PetalburgCity_Gym_EventScript_20517D + setvar VAR_0x8008, 1 + setvar VAR_0x8009, 98 + msgbox PetalburgCity_Gym_Text_207280, 5 + compare VAR_RESULT, 1 + goto_eq PetalburgCity_Gym_EventScript_20516C + compare VAR_RESULT, 0 + goto_eq PetalburgCity_Gym_EventScript_20517B + end + +PetalburgCity_Gym_EventScript_2051BC:: @ 82051BC + lockall + checktrainerflag TRAINER_RANDALL + goto_if 0, PetalburgCity_Gym_EventScript_20517D + setvar VAR_0x8008, 7 + setvar VAR_0x8009, 46 + msgbox PetalburgCity_Gym_Text_2072BB, 5 + compare VAR_RESULT, 1 + goto_eq PetalburgCity_Gym_EventScript_20516C + compare VAR_RESULT, 0 + goto_eq PetalburgCity_Gym_EventScript_20517B + end + +PetalburgCity_Gym_EventScript_2051EF:: @ 82051EF + lockall + checktrainerflag TRAINER_RANDALL + goto_if 0, PetalburgCity_Gym_EventScript_20517D + setvar VAR_0x8008, 1 + setvar VAR_0x8009, 59 + msgbox PetalburgCity_Gym_Text_2072F7, 5 + compare VAR_RESULT, 1 + goto_eq PetalburgCity_Gym_EventScript_20516C + compare VAR_RESULT, 0 + goto_eq PetalburgCity_Gym_EventScript_20517B + end + +PetalburgCity_Gym_EventScript_205222:: @ 8205222 + lockall + checktrainerflag TRAINER_MARY + goto_if 0, PetalburgCity_Gym_EventScript_20517D + setvar VAR_0x8008, 7 + setvar VAR_0x8009, 59 + msgbox PetalburgCity_Gym_Text_2072F7, 5 + compare VAR_RESULT, 1 + goto_eq PetalburgCity_Gym_EventScript_20516C + compare VAR_RESULT, 0 + goto_eq PetalburgCity_Gym_EventScript_20517B + end + +PetalburgCity_Gym_EventScript_205255:: @ 8205255 + lockall + checktrainerflag TRAINER_MARY + goto_if 0, PetalburgCity_Gym_EventScript_20517D + setvar VAR_0x8008, 1 + setvar VAR_0x8009, 72 + msgbox PetalburgCity_Gym_Text_207331, 5 + compare VAR_RESULT, 1 + goto_eq PetalburgCity_Gym_EventScript_20516C + compare VAR_RESULT, 0 + goto_eq PetalburgCity_Gym_EventScript_20517B + end + +PetalburgCity_Gym_EventScript_205288:: @ 8205288 + lockall + checktrainerflag TRAINER_PARKER + goto_if 0, PetalburgCity_Gym_EventScript_20517D + setvar VAR_0x8008, 1 + setvar VAR_0x8009, 20 + msgbox PetalburgCity_Gym_Text_20736C, 5 + compare VAR_RESULT, 1 + goto_eq PetalburgCity_Gym_EventScript_20516C + compare VAR_RESULT, 0 + goto_eq PetalburgCity_Gym_EventScript_20517B + end + +PetalburgCity_Gym_EventScript_2052BB:: @ 82052BB + lockall + checktrainerflag TRAINER_ALEXIA + goto_if 0, PetalburgCity_Gym_EventScript_20517D + setvar VAR_0x8008, 7 + setvar VAR_0x8009, 20 + msgbox PetalburgCity_Gym_Text_20736C, 5 + compare VAR_RESULT, 1 + goto_eq PetalburgCity_Gym_EventScript_20516C + compare VAR_RESULT, 0 + goto_eq PetalburgCity_Gym_EventScript_20517B + end + +PetalburgCity_Gym_EventScript_2052EE:: @ 82052EE + lockall + checktrainerflag TRAINER_ALEXIA + goto_if 0, PetalburgCity_Gym_EventScript_20517D + setvar VAR_0x8008, 1 + setvar VAR_0x8009, 33 + msgbox PetalburgCity_Gym_Text_2073A7, 5 + compare VAR_RESULT, 1 + goto_eq PetalburgCity_Gym_EventScript_20516C + compare VAR_RESULT, 0 + goto_eq PetalburgCity_Gym_EventScript_20517B + end + +PetalburgCity_Gym_EventScript_205321:: @ 8205321 + lockall + checktrainerflag TRAINER_GEORGE + goto_if 0, PetalburgCity_Gym_EventScript_20517D + setvar VAR_0x8008, 7 + setvar VAR_0x8009, 33 + msgbox PetalburgCity_Gym_Text_2073A7, 5 + compare VAR_RESULT, 1 + goto_eq PetalburgCity_Gym_EventScript_20516C + compare VAR_RESULT, 0 + goto_eq PetalburgCity_Gym_EventScript_20517B + end + +PetalburgCity_Gym_EventScript_205354:: @ 8205354 + lockall + checktrainerflag TRAINER_JODY + goto_if 0, PetalburgCity_Gym_EventScript_20517D + setvar VAR_0x8008, 1 + setvar VAR_0x8009, 7 + msgbox PetalburgCity_Gym_Text_2073E4, 5 + compare VAR_RESULT, 1 + goto_eq PetalburgCity_Gym_EventScript_20516C + compare VAR_RESULT, 0 + goto_eq PetalburgCity_Gym_EventScript_20517B + end + +PetalburgCity_Gym_EventScript_205387:: @ 8205387 + lockall + checktrainerflag TRAINER_BERKE + goto_if 0, PetalburgCity_Gym_EventScript_20517D + setvar VAR_0x8008, 7 + setvar VAR_0x8009, 7 + msgbox PetalburgCity_Gym_Text_2073E4, 5 + compare VAR_RESULT, 1 + goto_eq PetalburgCity_Gym_EventScript_20516C + compare VAR_RESULT, 0 + goto_eq PetalburgCity_Gym_EventScript_20517B + end + +PetalburgCity_Gym_EventScript_2053BA:: @ 82053BA + trainerbattle 2, TRAINER_RANDALL, 0, PetalburgCity_Gym_Text_20674F, PetalburgCity_Gym_Text_2067B9, PetalburgCity_Gym_EventScript_2053DE + checkflag FLAG_0x4F4 + goto_eq PetalburgCity_Gym_EventScript_2053ED + msgbox PetalburgCity_Gym_Text_2067D8, 6 + end + +PetalburgCity_Gym_EventScript_2053DE:: @ 82053DE + setvar VAR_0x8005, 0 + call PetalburgCity_Gym_EventScript_20557F + special DrawWholeMapView + release + end + +PetalburgCity_Gym_EventScript_2053ED:: @ 82053ED + msgbox PetalburgCity_Gym_Text_20685E, 2 + end + +PetalburgCity_Gym_EventScript_2053F6:: @ 82053F6 + trainerbattle 2, TRAINER_PARKER, 0, PetalburgCity_Gym_Text_2068FD, PetalburgCity_Gym_Text_20694F, PetalburgCity_Gym_EventScript_20541A + checkflag FLAG_0x4F4 + goto_eq PetalburgCity_Gym_EventScript_205429 + msgbox PetalburgCity_Gym_Text_206996, 6 + end + +PetalburgCity_Gym_EventScript_20541A:: @ 820541A + setvar VAR_0x8005, 0 + call PetalburgCity_Gym_EventScript_2055C1 + special DrawWholeMapView + release + end + +PetalburgCity_Gym_EventScript_205429:: @ 8205429 + msgbox PetalburgCity_Gym_Text_2069D9, 2 + end + +PetalburgCity_Gym_EventScript_205432:: @ 8205432 + trainerbattle 2, TRAINER_GEORGE, 0, PetalburgCity_Gym_Text_206A1B, PetalburgCity_Gym_Text_206AB8, PetalburgCity_Gym_EventScript_205456 + checkflag FLAG_0x4F4 + goto_eq PetalburgCity_Gym_EventScript_205465 + msgbox PetalburgCity_Gym_Text_206AE9, 6 + end + +PetalburgCity_Gym_EventScript_205456:: @ 8205456 + setvar VAR_0x8005, 0 + call PetalburgCity_Gym_EventScript_205603 + special DrawWholeMapView + release + end + +PetalburgCity_Gym_EventScript_205465:: @ 8205465 + msgbox PetalburgCity_Gym_Text_206BB1, 2 + end + +PetalburgCity_Gym_EventScript_20546E:: @ 820546E + trainerbattle 2, TRAINER_BERKE, 0, PetalburgCity_Gym_Text_206BF4, PetalburgCity_Gym_Text_206C7D, PetalburgCity_Gym_EventScript_205492 + checkflag FLAG_0x4F4 + goto_eq PetalburgCity_Gym_EventScript_2054A1 + msgbox PetalburgCity_Gym_Text_206C9F, 6 + end + +PetalburgCity_Gym_EventScript_205492:: @ 8205492 + setvar VAR_0x8005, 0 + call PetalburgCity_Gym_EventScript_205645 + special DrawWholeMapView + release + end + +PetalburgCity_Gym_EventScript_2054A1:: @ 82054A1 + msgbox PetalburgCity_Gym_Text_206D56, 2 + end + +PetalburgCity_Gym_EventScript_2054AA:: @ 82054AA + trainerbattle 2, TRAINER_MARY, 0, PetalburgCity_Gym_Text_206DB2, PetalburgCity_Gym_Text_206E0D, PetalburgCity_Gym_EventScript_2054CE + checkflag FLAG_0x4F4 + goto_eq PetalburgCity_Gym_EventScript_2054DD + msgbox PetalburgCity_Gym_Text_206E26, 6 + end + +PetalburgCity_Gym_EventScript_2054CE:: @ 82054CE + setvar VAR_0x8005, 0 + call PetalburgCity_Gym_EventScript_2055A0 + special DrawWholeMapView + release + end + +PetalburgCity_Gym_EventScript_2054DD:: @ 82054DD + msgbox PetalburgCity_Gym_Text_206ED8, 2 + end + +PetalburgCity_Gym_EventScript_2054E6:: @ 82054E6 + trainerbattle 2, TRAINER_ALEXIA, 0, PetalburgCity_Gym_Text_206F44, PetalburgCity_Gym_Text_206F82, PetalburgCity_Gym_EventScript_20550A + checkflag FLAG_0x4F4 + goto_eq PetalburgCity_Gym_EventScript_205519 + msgbox PetalburgCity_Gym_Text_206F9F, 6 + end + +PetalburgCity_Gym_EventScript_20550A:: @ 820550A + setvar VAR_0x8005, 0 + call PetalburgCity_Gym_EventScript_2055E2 + special DrawWholeMapView + release + end + +PetalburgCity_Gym_EventScript_205519:: @ 8205519 + msgbox PetalburgCity_Gym_Text_207069, 2 + end + +PetalburgCity_Gym_EventScript_205522:: @ 8205522 + trainerbattle 2, TRAINER_JODY, 0, PetalburgCity_Gym_Text_207088, PetalburgCity_Gym_Text_2070E6, PetalburgCity_Gym_EventScript_205546 + checkflag FLAG_0x4F4 + goto_eq PetalburgCity_Gym_EventScript_205555 + msgbox PetalburgCity_Gym_Text_2070FB, 6 + end + +PetalburgCity_Gym_EventScript_205546:: @ 8205546 + setvar VAR_0x8005, 0 + call PetalburgCity_Gym_EventScript_205624 + special DrawWholeMapView + release + end + +PetalburgCity_Gym_EventScript_205555:: @ 8205555 + msgbox PetalburgCity_Gym_Text_207170, 2 + end + +PetalburgCity_Gym_EventScript_20555E:: @ 820555E + setvar VAR_0x8004, 1 + compare VAR_0x8005, 0 + call_if 1, PetalburgCity_Gym_EventScript_205746 + compare VAR_0x8005, 1 + call_if 1, PetalburgCity_Gym_EventScript_20574B + call PetalburgCity_Gym_EventScript_205666 + return + +PetalburgCity_Gym_EventScript_20557F:: @ 820557F + setvar VAR_0x8004, 2 + compare VAR_0x8005, 0 + call_if 1, PetalburgCity_Gym_EventScript_205746 + compare VAR_0x8005, 1 + call_if 1, PetalburgCity_Gym_EventScript_20574B + call PetalburgCity_Gym_EventScript_20568B + return + +PetalburgCity_Gym_EventScript_2055A0:: @ 82055A0 + setvar VAR_0x8004, 3 + compare VAR_0x8005, 0 + call_if 1, PetalburgCity_Gym_EventScript_205746 + compare VAR_0x8005, 1 + call_if 1, PetalburgCity_Gym_EventScript_20574B + call PetalburgCity_Gym_EventScript_2056B0 + return + +PetalburgCity_Gym_EventScript_2055C1:: @ 82055C1 + setvar VAR_0x8004, 4 + compare VAR_0x8005, 0 + call_if 1, PetalburgCity_Gym_EventScript_205746 + compare VAR_0x8005, 1 + call_if 1, PetalburgCity_Gym_EventScript_20574B + call PetalburgCity_Gym_EventScript_2056D5 + return + +PetalburgCity_Gym_EventScript_2055E2:: @ 82055E2 + setvar VAR_0x8004, 5 + compare VAR_0x8005, 0 + call_if 1, PetalburgCity_Gym_EventScript_205746 + compare VAR_0x8005, 1 + call_if 1, PetalburgCity_Gym_EventScript_20574B + call PetalburgCity_Gym_EventScript_2056E8 + return + +PetalburgCity_Gym_EventScript_205603:: @ 8205603 + setvar VAR_0x8004, 6 + compare VAR_0x8005, 0 + call_if 1, PetalburgCity_Gym_EventScript_205746 + compare VAR_0x8005, 1 + call_if 1, PetalburgCity_Gym_EventScript_20574B + call PetalburgCity_Gym_EventScript_20570D + return + +PetalburgCity_Gym_EventScript_205624:: @ 8205624 + setvar VAR_0x8004, 7 + compare VAR_0x8005, 0 + call_if 1, PetalburgCity_Gym_EventScript_205746 + compare VAR_0x8005, 1 + call_if 1, PetalburgCity_Gym_EventScript_20574B + call PetalburgCity_Gym_EventScript_205720 + return + +PetalburgCity_Gym_EventScript_205645:: @ 8205645 + setvar VAR_0x8004, 8 + compare VAR_0x8005, 0 + call_if 1, PetalburgCity_Gym_EventScript_205746 + compare VAR_0x8005, 1 + call_if 1, PetalburgCity_Gym_EventScript_20574B + call PetalburgCity_Gym_EventScript_205733 + return + +PetalburgCity_Gym_EventScript_205666:: @ 8205666 + setmetatile 6, 85, 528, 0 + setmetatile 7, 85, 529, 0 + setmetatile 1, 98, 528, 0 + setmetatile 2, 98, 529, 0 + return + +PetalburgCity_Gym_EventScript_20568B:: @ 820568B + setmetatile 6, 46, 528, 0 + setmetatile 7, 46, 529, 0 + setmetatile 1, 59, 528, 0 + setmetatile 2, 59, 529, 0 + return + +PetalburgCity_Gym_EventScript_2056B0:: @ 82056B0 + setmetatile 6, 59, 528, 0 + setmetatile 7, 59, 529, 0 + setmetatile 1, 72, 528, 0 + setmetatile 2, 72, 529, 0 + return + +PetalburgCity_Gym_EventScript_2056D5:: @ 82056D5 + setmetatile 1, 20, 528, 0 + setmetatile 2, 20, 529, 0 + return + +PetalburgCity_Gym_EventScript_2056E8:: @ 82056E8 + setmetatile 6, 20, 528, 0 + setmetatile 7, 20, 529, 0 + setmetatile 1, 33, 528, 0 + setmetatile 2, 33, 529, 0 + return + +PetalburgCity_Gym_EventScript_20570D:: @ 820570D + setmetatile 6, 33, 528, 0 + setmetatile 7, 33, 529, 0 + return + +PetalburgCity_Gym_EventScript_205720:: @ 8205720 + setmetatile 1, 7, 528, 0 + setmetatile 2, 7, 529, 0 + return + +PetalburgCity_Gym_EventScript_205733:: @ 8205733 + setmetatile 6, 7, 528, 0 + setmetatile 7, 7, 529, 0 + return + +PetalburgCity_Gym_EventScript_205746:: @ 8205746 + special PetalburgGymSpecial1 + waitstate + return + +PetalburgCity_Gym_EventScript_20574B:: @ 820574B + special PetalburgGymSpecial2 + return + +PetalburgCity_Gym_EventScript_20574F:: @ 820574F + lock + faceplayer + checkflag FLAG_0x4F4 + goto_eq PetalburgCity_Gym_EventScript_205764 + msgbox PetalburgCity_Gym_Text_206542, 4 + release + end + +PetalburgCity_Gym_EventScript_205764:: @ 8205764 + msgbox PetalburgCity_Gym_Text_2066F3, 4 + release + end + +PetalburgCity_Gym_EventScript_20576E:: @ 820576E + lockall + checkflag FLAG_BADGE05_GET + goto_eq PetalburgCity_Gym_EventScript_20578E + goto PetalburgCity_Gym_EventScript_205798 + end + +PetalburgCity_Gym_EventScript_20577E:: @ 820577E + lockall + checkflag FLAG_BADGE05_GET + goto_eq PetalburgCity_Gym_EventScript_20578E + goto PetalburgCity_Gym_EventScript_205798 + end + +PetalburgCity_Gym_EventScript_20578E:: @ 820578E + msgbox PetalburgCity_Gym_Text_207467, 4 + releaseall + end + +PetalburgCity_Gym_EventScript_205798:: @ 8205798 + msgbox PetalburgCity_Gym_Text_20744C, 4 + releaseall + end + +PetalburgCity_Gym_Text_2057A2: @ 82057A2 + .string "DAD: Hm?\p" + .string "Well, if it isn’t {PLAYER}!\n" + .string "So you’re all finished moving in?\p" + .string "I’m surprised that you managed to\n" + .string "get here by yourself.\p" + .string "Oh, I see.\n" + .string "You’re with your POKéMON.\p" + .string "Hm… Then I guess you’re going to\n" + .string "become a TRAINER like me, {PLAYER}.\p" + .string "That’s great news!\n" + .string "I’ll be looking forward to it!$" + +PetalburgCity_Gym_Text_2058B1: @ 82058B1 + .string "Um… I…\n" + .string "I’d like to get a POKéMON, please…$" + +PetalburgCity_Gym_Text_2058DB: @ 82058DB + .string "DAD: Hm? You’re… Uh… Oh, right.\n" + .string "You’re WALLY, right?$" + +PetalburgCity_Gym_Text_205910: @ 8205910 + .string "WALLY: I’m going to go stay with my\n" + .string "relatives in VERDANTURF TOWN.\p" + .string "I thought I would be lonely by myself,\n" + .string "so I wanted to take a POKéMON along.\p" + .string "But I’ve never caught a POKéMON before.\n" + .string "I don’t know how…$" + +PetalburgCity_Gym_Text_2059D8: @ 82059D8 + .string "DAD: Hm. I see.$" + +PetalburgCity_Gym_Text_2059E8: @ 82059E8 + .string "DAD: {PLAYER}, you heard that,\n" + .string "right?\p" + .string "Go with WALLY and make sure that he\n" + .string "safely catches a POKéMON.$" + +PetalburgCity_Gym_Text_205A46: @ 8205A46 + .string "WALLY, here, I’ll loan you my POKéMON.\p" + .string "WALLY received a ZIGZAGOON!$" + +PetalburgCity_Gym_Text_205A89: @ 8205A89 + .string "WALLY: Oh, wow!\n" + .string "A POKéMON!\p" + .string "DAD: Hm. I’ll give you a POKé BALL, too.\n" + .string "Go for it!\p" + .string "WALLY received a POKé BALL!$" + +PetalburgCity_Gym_Text_205AF4: @ 8205AF4 + .string "WALLY: Oh, wow!\n" + .string "Thank you!$" + +PetalburgCity_Gym_Text_205B0F: @ 8205B0F + .string "{PLAYER}… Would you really come\n" + .string "with me?$" + +PetalburgCity_Gym_Text_205B32: @ 8205B32 + .string "DAD: So, did it work out?$" + +PetalburgCity_Gym_Text_205B4C: @ 8205B4C + .string "WALLY: Thank you, yes, it did.\n" + .string "Here’s your POKéMON back.\p" + .string "{PLAYER}, thank you for coming along\n" + .string "with me.\p" + .string "You two are why I was able to catch\n" + .string "my POKéMON.\p" + .string "I promise I’ll take really good\n" + .string "care of it.\p" + .string "Oh! My mom’s waiting for me,\n" + .string "so I have to go!\p" + .string "Bye, {PLAYER}!$" + +PetalburgCity_Gym_Text_205C40: @ 8205C40 + .string "DAD: Now…\p" + .string "{PLAYER}, if you want to become a\n" + .string "strong TRAINER, here’s my advice.\p" + .string "Head for RUSTBORO CITY beyond this\n" + .string "town.\p" + .string "There, you should challenge\n" + .string "the GYM LEADER, ROXANNE.\p" + .string "After her, go on to other POKéMON\n" + .string "GYMS and defeat their LEADERS.\p" + .string "Collect BADGES from them,\n" + .string "understood?\p" + .string "Of course, I’m a GYM LEADER, too.\n" + .string "We’ll battle one day, {PLAYER}.\p" + .string "But that’s only after you become\n" + .string "stronger.$" + +PetalburgCity_Gym_Text_205DB4: @ 8205DB4 + .string "DAD: Hm? Aren’t you going to the\n" + .string "POKéMON GYM in RUSTBORO CITY?\p" + .string "There’s no challenge for me to\n" + .string "battle a greenhorn TRAINER.\p" + .string "{PLAYER}, I want you to challenge me\n" + .string "when you become a lot stronger.\p" + .string "I’ll battle you, {PLAYER}, when you\n" + .string "can show me four GYM BADGES, okay?$" + +PetalburgCity_Gym_Text_205EAE: @ 8205EAE + .string "DAD: I see… So, you’ve beaten\n" + .string "the GYM LEADER in RUSTBORO CITY.\p" + .string "But there are many more TRAINERS\n" + .string "who are stronger than you, {PLAYER}.\p" + .string "Across the sea in DEWFORD TOWN is a\n" + .string "GYM LEADER named BRAWLY.\p" + .string "You should go challenge him.$" + +PetalburgCity_Gym_Text_205F87: @ 8205F87 + .string "DAD: Hm… {PLAYER}, you have gotten\n" + .string "stronger.\p" + .string "I can tell by the number of BADGES\n" + .string "that you’ve earned.$" + +PetalburgCity_Gym_Text_205FE5: @ 8205FE5 + .string "DAD: Hm…\n" + .string "So, you did get four GYM BADGES.\p" + .string "Fine, as I promised, we will have\n" + .string "a POKéMON battle.\p" + .string "{PLAYER}…\p" + .string "I’m so happy that I can have\n" + .string "a real battle with my own child.\p" + .string "But, a battle is a battle!\p" + .string "I will do everything in my power as\n" + .string "a GYM LEADER to win.\p" + .string "{PLAYER}, you’d better give it your\n" + .string "best shot, too!$" + +PetalburgCity_Gym_Text_206107: @ 8206107 + .string "…\p" + .string "I… I can’t…\p" + .string "I can’t believe it. {PLAYER}…\p" + .string "I lost to {PLAYER}?\p" + .string "But, rules are rules!\n" + .string "Here, take this.$" + +PetalburgCity_Gym_Text_206162: @ 8206162 + .string "{PLAYER} received the BALANCE BADGE\n" + .string "from DAD!$" + +PetalburgCity_Gym_Text_20618A: @ 820618A + .string "DAD: With that BADGE, the DEFENSE\n" + .string "of all your POKéMON will increase.\p" + .string "POKéMON that know the HM move SURF\n" + .string "will be able to travel over water.\p" + .string "This is my gift to you. {PLAYER}, I’m\n" + .string "sure you can use it correctly.$" + +PetalburgCity_Gym_Text_206254: @ 8206254 + .string "DAD: TM42 contains FACADE.\p" + .string "It doubles the power of moves if\n" + .string "the POKéMON is poisoned, paralyzed,\l" + .string "or burned.\p" + .string "It might be able to turn a bad\n" + .string "situation into an advantage.$" + +PetalburgCity_Gym_Text_2062FB: @ 82062FB + .string "DAD: As the GYM LEADER, I can’t\n" + .string "express how upset I am…\p" + .string "But as a father, it makes me both\n" + .string "happy and a little sad. It’s odd…$" + +PetalburgCity_Gym_Text_206377: @ 8206377 + .string "Ah, there you are, {PLAYER}{KUN}!\p" + .string "Please come with me.\n" + .string "I have something I want you to have.$" + +PetalburgCity_Gym_Text_2063CA: @ 82063CA + .string "NORMAN, you don’t mind, do you?\p" + .string "Let me borrow your {PLAYER}{KUN} for\n" + .string "a minute or two.$" + +PetalburgCity_Gym_Text_206417: @ 8206417 + .string "DAD: {PLAYER}, you should go visit\n" + .string "your mother every so often.\p" + .string "I’m going to stay here and redouble\n" + .string "my training.\p" + .string "It would bother me as a TRAINER to\n" + .string "not avenge my loss to you, {PLAYER}!$" + +PetalburgCity_Gym_Text_2064C3: @ 82064C3 + .string "DAD: {PLAYER}, how are things going?\p" + .string "The world of POKéMON is deep.\p" + .string "I honestly think that no amount of\n" + .string "training would ever be enough.$" + +PetalburgCity_Gym_Text_206542: @ 8206542 + .string "Hey, how’s it going, CHAMPION-\n" + .string "bound {PLAYER}?\p" + .string "The doors in this GYM open when you\n" + .string "beat the awaiting TRAINERS.\p" + .string "Whoops! The doors in this room are\n" + .string "already open, so don’t attack me!\p" + .string "The TRAINERS of PETALBURG GYM\n" + .string "use all kinds of items.\p" + .string "The door at the left leads to\n" + .string "the SPEED ROOM.\p" + .string "The door at the right leads to\n" + .string "the ACCURACY ROOM.\p" + .string "The room’s name will be on\n" + .string "the door, so choose carefully.\p" + .string "Once you’ve chosen the door…\n" + .string "Well, hey, go for it!$" + +PetalburgCity_Gym_Text_2066F3: @ 82066F3 + .string "{PLAYER}! Whoa! You’ve overcome even\n" + .string "your own father!\p" + .string "Like, whoa!\n" + .string "What a stunning turn of events!$" + +PetalburgCity_Gym_Text_20674F: @ 820674F + .string "The ability to attack before the\n" + .string "opponent…\p" + .string "Just that alone puts me at a great\n" + .string "advantage, don’t you agree?$" + +PetalburgCity_Gym_Text_2067B9: @ 82067B9 + .string "That was a magnificent battle!$" + +PetalburgCity_Gym_Text_2067D8: @ 82067D8 + .string "Go on to the next room where a new\n" + .string "challenge awaits you.\p" + .string "At the left is the CONFUSION ROOM.\p" + .string "The right door leads to the DEFENSE\n" + .string "ROOM.$" + +PetalburgCity_Gym_Text_20685E: @ 820685E + .string "Whomever you beat, and whomever you\n" + .string "may lose to, you never shirk from\l" + .string "training yourself and your POKéMON.\p" + .string "That’s what I think being a\n" + .string "GYM LEADER is all about.$" + +PetalburgCity_Gym_Text_2068FD: @ 82068FD + .string "This is the CONFUSION ROOM.\p" + .string "Let me see how well bonded you are\n" + .string "with your POKéMON!$" + +PetalburgCity_Gym_Text_20694F: @ 820694F + .string "I couldn’t confuse your team enough…\n" + .string "You share a strong bond together.$" + +PetalburgCity_Gym_Text_206996: @ 8206996 + .string "The next room is the STRENGTH ROOM.\n" + .string "Can you withstand brute force?$" + +PetalburgCity_Gym_Text_2069D9: @ 82069D9 + .string "After you beat our LEADER, the\n" + .string "training has become a lot tougher.$" + +PetalburgCity_Gym_Text_206A1B: @ 8206A1B + .string "Just when you think you’re going to\n" + .string "win, your opponent restores HP…\p" + .string "Can you just imagine how awful that\n" + .string "must feel?\p" + .string "I’ll show you exactly how awful it\n" + .string "feels!$" + +PetalburgCity_Gym_Text_206AB8: @ 8206AB8 + .string "I couldn’t restore HP enough…\n" + .string "What ATTACK power…$" + +PetalburgCity_Gym_Text_206AE9: @ 8206AE9 + .string "I should have expected no less from\n" + .string "our LEADER’s kid.\p" + .string "No, wait! A TRAINER’s abilities are\n" + .string "earned only through effort.\p" + .string "I lost because my own efforts\n" + .string "weren’t enough.\p" + .string "Go on! The ONE-HIT KO ROOM is next.$" + +PetalburgCity_Gym_Text_206BB1: @ 8206BB1 + .string "I’m going to keep training at GYMS.\n" + .string "One day, I’ll become a LEADER.$" + +PetalburgCity_Gym_Text_206BF4: @ 8206BF4 + .string "I’m not going to take it easy just\n" + .string "because you’re our LEADER’s kid.\p" + .string "I’ll show you how horrid it is for\n" + .string "a POKéMON to take a critical hit!$" + +PetalburgCity_Gym_Text_206C7D: @ 8206C7D + .string "Your power…\n" + .string "You’re the real deal.$" + +PetalburgCity_Gym_Text_206C9F: @ 8206C9F + .string "Your father really is strong.\n" + .string "He’s a TRAINER worth my respect.\p" + .string "And, I sense the same glow coming\n" + .string "from you as your father.\p" + .string "I hope that you’ll stage a terrific\n" + .string "battle with your father!$" + +PetalburgCity_Gym_Text_206D56: @ 8206D56 + .string "Since your dad became the LEADER,\n" + .string "the TRAINERS of PETALBURG CITY have\l" + .string "become a lot tougher.$" + +PetalburgCity_Gym_Text_206DB2: @ 8206DB2 + .string "Giggle…\n" + .string "This is the ACCURACY ROOM.\p" + .string "It’s pretty nasty when every attack\n" + .string "lands without fail.$" + +PetalburgCity_Gym_Text_206E0D: @ 8206E0D + .string "You were a cut above me…$" + +PetalburgCity_Gym_Text_206E26: @ 8206E26 + .string "There are some even stronger\n" + .string "TRAINERS waiting for you.\p" + .string "The left is the DEFENSE ROOM, and\n" + .string "the right is the RECOVERY ROOM.\p" + .string "Your POKéMON’s ATTACK power will be\n" + .string "on trial either way.$" + +PetalburgCity_Gym_Text_206ED8: @ 8206ED8 + .string "Do you know what we’re trying to\n" + .string "achieve as TRAINERS?\p" + .string "We’re striving to become soul mates\n" + .string "with our POKéMON.$" + +PetalburgCity_Gym_Text_206F44: @ 8206F44 + .string "The higher the DEFENSE, the more\n" + .string "reckless I can be in attack.$" + +PetalburgCity_Gym_Text_206F82: @ 8206F82 + .string "Our defenses weren’t enough…$" + +PetalburgCity_Gym_Text_206F9F: @ 8206F9F + .string "I think you’ve taught me a valuable\n" + .string "lesson here.\p" + .string "Now, go on! The left door goes to\n" + .string "the STRENGTH ROOM.\p" + .string "The right door opens to\n" + .string "the ONE-HIT KO ROOM.\p" + .string "Both of them have TRAINERS who are\n" + .string "skilled at offense.$" + +PetalburgCity_Gym_Text_207069: @ 8207069 + .string "Hi! Have you tried using SURF?$" + +PetalburgCity_Gym_Text_207088: @ 8207088 + .string "Our GYM LEADER told us to go all out\n" + .string "and beat you.\p" + .string "Even if you happen to be the\n" + .string "LEADER’s kid!$" + +PetalburgCity_Gym_Text_2070E6: @ 82070E6 + .string "But… I went all out!$" + +PetalburgCity_Gym_Text_2070FB: @ 82070FB + .string "The way you use your POKéMON…\n" + .string "It’s like your father’s style.\p" + .string "Go on through! The GYM LEADER, your\n" + .string "father, is waiting!$" + +PetalburgCity_Gym_Text_207170: @ 8207170 + .string "Sure, it’s fine to make your POKéMON\n" + .string "stronger.\p" + .string "But what decides the winner?\p" + .string "Why, it’s the feelings TRAINERS have\n" + .string "for their POKéMON.$" + +PetalburgCity_Gym_Text_2071F4: @ 82071F4 + .string "This door appears to be locked\n" + .string "right now…$" + +PetalburgCity_Gym_Text_20721E: @ 820721E + .string "“SPEED ROOM,†the sign says.\p" + .string "Do you want to go through?$" + +PetalburgCity_Gym_Text_207256: @ 8207256 + .string "This door appears to be locked\n" + .string "right now…$" + +PetalburgCity_Gym_Text_207280: @ 8207280 + .string "“ACCURACY ROOM,†the sign says.\p" + .string "Do you want to go through?$" + +PetalburgCity_Gym_Text_2072BB: @ 82072BB + .string "“CONFUSION ROOM,†the sign says.\p" + .string "Do you want to go through?$" + +PetalburgCity_Gym_Text_2072F7: @ 82072F7 + .string "“DEFENSE ROOM,†the sign says.\p" + .string "Do you want to go through?$" + +PetalburgCity_Gym_Text_207331: @ 8207331 + .string "“RECOVERY ROOM,†the sign says.\p" + .string "Do you want to go through?$" + +PetalburgCity_Gym_Text_20736C: @ 820736C + .string "“STRENGTH ROOM,†the sign says.\p" + .string "Do you want to go through?$" + +PetalburgCity_Gym_Text_2073A7: @ 82073A7 + .string "“ONE-HIT KO ROOM,†the sign says.\p" + .string "Do you want to go through?$" + +PetalburgCity_Gym_Text_2073E4: @ 82073E4 + .string "“GYM LEADER’S ROOM\p" + .string "“See for yourself what POKéMON await\n" + .string "you!†the sign says.\p" + .string "Do you want to go through?$" + +PetalburgCity_Gym_Text_20744C: @ 820744C + .string "PETALBURG CITY POKéMON GYM$" + +PetalburgCity_Gym_Text_207467: @ 8207467 + .string "PETALBURG CITY POKéMON GYM\p" + .string "NORMAN’S CERTIFIED TRAINERS:\n" + .string "{PLAYER}$" + +PetalburgCity_Gym_Text_2074A2: @ 82074A2 + .string "DAD: {PLAYER}…\n" + .string "I had a feeling that you would come.\p" + .string "I would never refuse to accept\n" + .string "a challenge from you.\p" + .string "You do understand, don’t you?\p" + .string "Inside a GYM, it doesn’t matter that\n" + .string "we are a parent and child.\p" + .string "…No, because we are parent and child,\n" + .string "we owe it to each other to do the best\l" + .string "we can. Isn’t that right, {PLAYER}?$" + +PetalburgCity_Gym_Text_2075CE: @ 82075CE + .string "Uh… Haha…\n" + .string "Maybe that was going too hard…$" + +PetalburgCity_Gym_Text_2075F7: @ 82075F7 + .string "DAD: {PLAYER}…\n" + .string "What is your dream?\p" + .string "My dream…\n" + .string "Hahaha…\l" + .string "It has already come true, actually.$" + +PetalburgCity_Gym_Text_20764A: @ 820764A + .string "DAD: {PLAYER}…\n" + .string "I had a feeling that you would come.\p" + .string "I would never refuse to accept\n" + .string "a challenge from you.\p" + .string "You do understand, don’t you?\p" + .string "Inside a GYM, it doesn’t matter that\n" + .string "we are a parent and child.\p" + .string "Hm? Wait a second, {PLAYER}.\p" + .string "Do you only have one POKéMON that is\n" + .string "capable of battle?\p" + .string "Sorry, but you’ll have to come back\n" + .string "with at least two POKéMON.$" + diff --git a/data/maps/PetalburgCity_House1/events.inc b/data/maps/PetalburgCity_House1/events.inc new file mode 100644 index 000000000..dcd3b071f --- /dev/null +++ b/data/maps/PetalburgCity_House1/events.inc @@ -0,0 +1,11 @@ +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 + +PetalburgCity_House1_MapWarps: @ 852F0EC + 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/PetalburgCity_House1/scripts.inc b/data/maps/PetalburgCity_House1/scripts.inc new file mode 100644 index 000000000..f727ec8a1 --- /dev/null +++ b/data/maps/PetalburgCity_House1/scripts.inc @@ -0,0 +1,28 @@ +PetalburgCity_House1_MapScripts:: @ 8207799 + .byte 0 + +PetalburgCity_House1_EventScript_20779A:: @ 820779A + msgbox PetalburgCity_House1_Text_2077AC, 2 + end + +PetalburgCity_House1_EventScript_2077A3:: @ 82077A3 + msgbox PetalburgCity_House1_Text_2077FB, 2 + end + +PetalburgCity_House1_Text_2077AC: @ 82077AC + .string "Traveling is wonderful!\p" + .string "When I was young, I roamed the seas\n" + .string "and the mountains!$" + +PetalburgCity_House1_Text_2077FB: @ 82077FB + .string "Sigh…\p" + .string "I wish I could go on an adventure\n" + .string "with some POKéMON…\p" + .string "Crawl through some damp grass…\n" + .string "Climb rocky, rugged mountains…\p" + .string "Cross the raging seas…\n" + .string "Wander about in dark caves…\p" + .string "And, sometimes, even get a little\n" + .string "homesick…\p" + .string "It must be fabulous to travel!$" + diff --git a/data/maps/PetalburgCity_House2/events.inc b/data/maps/PetalburgCity_House2/events.inc new file mode 100644 index 000000000..7d1a863cb --- /dev/null +++ b/data/maps/PetalburgCity_House2/events.inc @@ -0,0 +1,11 @@ +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 + +PetalburgCity_House2_MapWarps: @ 852F140 + 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/PetalburgCity_House2/scripts.inc b/data/maps/PetalburgCity_House2/scripts.inc new file mode 100644 index 000000000..44987b3d6 --- /dev/null +++ b/data/maps/PetalburgCity_House2/scripts.inc @@ -0,0 +1,24 @@ +PetalburgCity_House2_MapScripts:: @ 82078F2 + .byte 0 + +PetalburgCity_House2_EventScript_2078F3:: @ 82078F3 + msgbox PetalburgCity_House2_Text_207905, 2 + end + +PetalburgCity_House2_EventScript_2078FC:: @ 82078FC + msgbox PetalburgCity_House2_Text_207969, 2 + end + +PetalburgCity_House2_Text_207905: @ 8207905 + .string "NORMAN became our town’s new\n" + .string "GYM LEADER.\p" + .string "I think he called his family over from\n" + .string "somewhere far away.$" + +PetalburgCity_House2_Text_207969: @ 8207969 + .string "I battled NORMAN once, but, whew,\n" + .string "he was way too strong.\p" + .string "How would I put it?\p" + .string "I just got the feeling that he\n" + .string "lives for POKéMON.$" + diff --git a/data/maps/PetalburgCity_Mart/events.inc b/data/maps/PetalburgCity_Mart/events.inc new file mode 100644 index 000000000..3dc327c6a --- /dev/null +++ b/data/maps/PetalburgCity_Mart/events.inc @@ -0,0 +1,13 @@ +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 + +PetalburgCity_Mart_MapWarps: @ 852F2F4 + 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/PetalburgCity_Mart/scripts.inc b/data/maps/PetalburgCity_Mart/scripts.inc new file mode 100644 index 000000000..665ad3bae --- /dev/null +++ b/data/maps/PetalburgCity_Mart/scripts.inc @@ -0,0 +1,87 @@ +PetalburgCity_Mart_MapScripts:: @ 8207D68 + .byte 0 + +PetalburgCity_Mart_EventScript_207D69:: @ 8207D69 + lock + faceplayer + message gUnknown_08272A21 + waitmessage + checkflag FLAG_0x128 + goto_eq PetalburgCity_Mart_EventScript_207DA6 + pokemart PetalburgCity_Mart_Pokemart_207D8C + msgbox gUnknown_08272A3F, 4 + release + end + + .align 2 +PetalburgCity_Mart_Pokemart_207D8C: @ 8207D8C + .2byte ITEM_POKE_BALL + .2byte ITEM_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_AWAKENING + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_REPEL + .2byte ITEM_X_SPEED + .2byte ITEM_X_ATTACK + .2byte ITEM_X_DEFEND + .2byte ITEM_ORANGE_MAIL + .2byte ITEM_NONE + release + end + +PetalburgCity_Mart_EventScript_207DA6:: @ 8207DA6 + pokemart PetalburgCity_Mart_Pokemart_207DB8 + msgbox gUnknown_08272A3F, 4 + release + end + + .align 2 +PetalburgCity_Mart_Pokemart_207DB8: @ 8207DB8 + .2byte ITEM_POKE_BALL + .2byte ITEM_GREAT_BALL + .2byte ITEM_POTION + .2byte ITEM_SUPER_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_AWAKENING + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_REPEL + .2byte ITEM_X_SPEED + .2byte ITEM_X_ATTACK + .2byte ITEM_X_DEFEND + .2byte ITEM_ORANGE_MAIL + .2byte ITEM_NONE + release + end + +PetalburgCity_Mart_EventScript_207DD6:: @ 8207DD6 + msgbox PetalburgCity_Mart_Text_207DF1, 2 + end + +PetalburgCity_Mart_EventScript_207DDF:: @ 8207DDF + msgbox PetalburgCity_Mart_Text_207E60, 2 + end + +PetalburgCity_Mart_EventScript_207DE8:: @ 8207DE8 + msgbox PetalburgCity_Mart_Text_207EB0, 2 + end + +PetalburgCity_Mart_Text_207DF1: @ 8207DF1 + .string "Even if a POKéMON is weak now,\n" + .string "it will grow stronger.\p" + .string "The most important thing is love!\n" + .string "Love for your POKéMON!$" + +PetalburgCity_Mart_Text_207E60: @ 8207E60 + .string "Do you use REPEL?\n" + .string "It keeps POKéMON away, so it’s\l" + .string "useful when you’re in a hurry.$" + +PetalburgCity_Mart_Text_207EB0: @ 8207EB0 + .string "Do you have any ANTIDOTES with\n" + .string "you?\p" + .string "If you walk around with a poisoned\n" + .string "POKéMON, it will lose HP until it faints.\l" + .string "Take some ANTIDOTES with you.$" + diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/events.inc b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..e7a4ec6e6 --- /dev/null +++ b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc @@ -0,0 +1,15 @@ +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 + +PetalburgCity_PokemonCenter_1F_MapWarps: @ 852F1DC + 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/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..f4a31854e --- /dev/null +++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc @@ -0,0 +1,98 @@ +PetalburgCity_PokemonCenter_1F_MapScripts:: @ 82079E8 + map_script 3, PetalburgCity_PokemonCenter_1F_MapScript1_2079F3 + map_script 5, PetalburgCity_PokemonCenter_1F_MapScript1_277C30 + .byte 0 + +PetalburgCity_PokemonCenter_1F_MapScript1_2079F3: @ 82079F3 + setrespawn 3 + call PetalburgCity_PokemonCenter_1F_EventScript_2718DE + end + +PetalburgCity_PokemonCenter_1F_EventScript_2079FC:: @ 82079FC + setvar VAR_0x800B, 1 + call PetalburgCity_PokemonCenter_1F_EventScript_27191E + waitmessage + waitbuttonpress + release + end + +PetalburgCity_PokemonCenter_1F_EventScript_207A0A:: @ 8207A0A + msgbox PetalburgCity_PokemonCenter_1F_Text_207A76, 2 + end + +PetalburgCity_PokemonCenter_1F_EventScript_207A13:: @ 8207A13 + msgbox PetalburgCity_PokemonCenter_1F_Text_207AD6, 2 + end + +PetalburgCity_PokemonCenter_1F_EventScript_207A1C:: @ 8207A1C + lock + faceplayer + msgbox PetalburgCity_PokemonCenter_1F_Text_207B09, 4 + specialvar VAR_RESULT, IsStarterInParty + compare VAR_RESULT, 1 + goto_eq PetalburgCity_PokemonCenter_1F_EventScript_207A38 + release + end + +PetalburgCity_PokemonCenter_1F_EventScript_207A38:: @ 8207A38 + compare VAR_FIRST_POKE, 0 + call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A5B + compare VAR_FIRST_POKE, 1 + call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A64 + compare VAR_FIRST_POKE, 2 + call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A6D + release + end + +PetalburgCity_PokemonCenter_1F_EventScript_207A5B:: @ 8207A5B + msgbox PetalburgCity_PokemonCenter_1F_Text_207BB0, 4 + return + +PetalburgCity_PokemonCenter_1F_EventScript_207A64:: @ 8207A64 + msgbox PetalburgCity_PokemonCenter_1F_Text_207C35, 4 + return + +PetalburgCity_PokemonCenter_1F_EventScript_207A6D:: @ 8207A6D + msgbox PetalburgCity_PokemonCenter_1F_Text_207CB7, 4 + return + +PetalburgCity_PokemonCenter_1F_Text_207A76: @ 8207A76 + .string "That PC-based POKéMON Storage\n" + .string "System…\p" + .string "Whoever made it must be some kind\n" + .string "of a scientific wizard!$" + +PetalburgCity_PokemonCenter_1F_Text_207AD6: @ 8207AD6 + .string "When my POKéMON ate an\n" + .string "ORAN BERRY, it regained HP!$" + +PetalburgCity_PokemonCenter_1F_Text_207B09: @ 8207B09 + .string "There are many types of POKéMON.\p" + .string "All types have their strengths and\n" + .string "weaknesses against other types.\p" + .string "Depending on the types of POKéMON,\n" + .string "a battle could be easy or hard.$" + +PetalburgCity_PokemonCenter_1F_Text_207BB0: @ 8207BB0 + .string "For example, your TREECKO\n" + .string "is a GRASS type.\p" + .string "It’s strong against the WATER and\n" + .string "GROUND types.\p" + .string "But, it’s weak against FIRE-type\n" + .string "POKéMON.$" + +PetalburgCity_PokemonCenter_1F_Text_207C35: @ 8207C35 + .string "For example, your TORCHIC\n" + .string "is a FIRE type.\p" + .string "It’s strong against the GRASS and\n" + .string "BUG types.\p" + .string "But, it’s weak against WATER-type\n" + .string "POKéMON.$" + +PetalburgCity_PokemonCenter_1F_Text_207CB7: @ 8207CB7 + .string "For example, your MUDKIP\n" + .string "is a WATER type.\p" + .string "It’s strong against the FIRE type.\p" + .string "But, it’s weak against GRASS-type\n" + .string "and ELECTRIC-type POKéMON.$" + diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/events.inc b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..7d2ff52f4 --- /dev/null +++ b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc @@ -0,0 +1,14 @@ +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 + +PetalburgCity_PokemonCenter_2F_MapWarps: @ 852F268 + 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/PetalburgCity_PokemonCenter_2F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..38d01972a --- /dev/null +++ b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc @@ -0,0 +1,19 @@ +PetalburgCity_PokemonCenter_2F_MapScripts:: @ 8207D41 + map_script 2, PetalburgCity_PokemonCenter_2F_MapScript2_276C3B + map_script 4, PetalburgCity_PokemonCenter_2F_MapScript2_276B6C + map_script 1, PetalburgCity_PokemonCenter_2F_MapScript1_276BBE + map_script 3, PetalburgCity_PokemonCenter_2F_MapScript1_276ACF + .byte 0 + +PetalburgCity_PokemonCenter_2F_EventScript_207D56:: @ 8207D56 + call OldaleTown_PokemonCenter_2F_EventScript_276EB7 + end + +PetalburgCity_PokemonCenter_2F_EventScript_207D5C:: @ 8207D5C + call OldaleTown_PokemonCenter_2F_EventScript_2770B2 + end + +PetalburgCity_PokemonCenter_2F_EventScript_207D62:: @ 8207D62 + call OldaleTown_PokemonCenter_2F_EventScript_2771DB + end + diff --git a/data/maps/PetalburgCity_WallysHouse/events.inc b/data/maps/PetalburgCity_WallysHouse/events.inc new file mode 100644 index 000000000..563d61579 --- /dev/null +++ b/data/maps/PetalburgCity_WallysHouse/events.inc @@ -0,0 +1,11 @@ +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 + +PetalburgCity_WallysHouse_MapWarps: @ 852EDA4 + 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/PetalburgCity_WallysHouse/scripts.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc new file mode 100644 index 000000000..e64bd57b1 --- /dev/null +++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc @@ -0,0 +1,139 @@ +PetalburgCity_WallysHouse_MapScripts:: @ 8204229 + map_script 2, PetalburgCity_WallysHouse_MapScript2_204247 + map_script 4, PetalburgCity_WallysHouse_MapScript2_204234 + .byte 0 + +PetalburgCity_WallysHouse_MapScript2_204234: @ 8204234 + map_script_2 VAR_0x4057, 4, PetalburgCity_WallysHouse_EventScript_20423E + .2byte 0 + +PetalburgCity_WallysHouse_EventScript_20423E:: @ 820423E + turnobject 255, 4 + turnobject 1, 3 + end + +PetalburgCity_WallysHouse_MapScript2_204247: @ 8204247 + map_script_2 VAR_0x4057, 4, PetalburgCity_WallysHouse_EventScript_204251 + .2byte 0 + +PetalburgCity_WallysHouse_EventScript_204251:: @ 8204251 + lockall + msgbox PetalburgCity_WallysHouse_Text_20446E, 4 + giveitem_std ITEM_HM03 + setflag FLAG_0x07A + msgbox PetalburgCity_WallysHouse_Text_20461A, 4 + setvar VAR_0x4057, 5 + releaseall + end + +PetalburgCity_WallysHouse_EventScript_204278:: @ 8204278 + lock + faceplayer + checkflag FLAG_0x07E + goto_eq PetalburgCity_WallysHouse_EventScript_2042AC + checkflag FLAG_0x07A + goto_eq PetalburgCity_WallysHouse_EventScript_2042A2 + checkflag FLAG_0x087 + goto_eq PetalburgCity_WallysHouse_EventScript_2042B6 + msgbox PetalburgCity_WallysHouse_Text_2042DF, 4 + setflag FLAG_0x087 + release + end + +PetalburgCity_WallysHouse_EventScript_2042A2:: @ 82042A2 + msgbox PetalburgCity_WallysHouse_Text_204661, 4 + release + end + +PetalburgCity_WallysHouse_EventScript_2042AC:: @ 82042AC + msgbox PetalburgCity_WallysHouse_Text_204698, 4 + release + end + +PetalburgCity_WallysHouse_EventScript_2042B6:: @ 82042B6 + msgbox PetalburgCity_WallysHouse_Text_20444D, 4 + release + end + +PetalburgCity_WallysHouse_EventScript_2042C0:: @ 82042C0 + lock + faceplayer + checkflag FLAG_0x07A + goto_eq PetalburgCity_WallysHouse_EventScript_2042D5 + msgbox PetalburgCity_WallysHouse_Text_204732, 4 + release + end + +PetalburgCity_WallysHouse_EventScript_2042D5:: @ 82042D5 + msgbox PetalburgCity_WallysHouse_Text_2047A7, 4 + release + end + +PetalburgCity_WallysHouse_Text_2042DF: @ 82042DF + .string "You’re…\n" + .string "Ah, you must be {PLAYER}{KUN}, right?\p" + .string "Thank you for playing with WALLY a\n" + .string "little while ago.\p" + .string "He’s been frail and sickly ever\n" + .string "since he was a baby.\p" + .string "We’ve sent him to stay with my relatives\n" + .string "in VERDANTURF TOWN for a while.\p" + .string "The air is a lot cleaner there\n" + .string "than it is here.\p" + .string "What’s that? Where’s WALLY?\n" + .string "He’s already left, our WALLY.\p" + .string "I wonder where he could have\n" + .string "gotten by now?$" + +PetalburgCity_WallysHouse_Text_20444D: @ 820444D + .string "I wonder how our WALLY is doing?$" + +PetalburgCity_WallysHouse_Text_20446E: @ 820446E + .string "{PLAYER}{KUN}! Please excuse us for\n" + .string "dragging you here this way.\p" + .string "But our WALLY’s become very healthy\n" + .string "since he went to VERDANTURF TOWN.\p" + .string "We owe it all to you!\p" + .string "When WALLY left town, you helped\n" + .string "him catch a POKéMON, right?\p" + .string "I think that made WALLY really\n" + .string "happy.\p" + .string "Actually, not just WALLY.\n" + .string "It made me, his father, happy too.\p" + .string "Happy that he’s gained such a great\n" + .string "friend as you.\p" + .string "This isn’t a bribe or anything, but\n" + .string "I’d really like you to have this.$" + +PetalburgCity_WallysHouse_Text_20461A: @ 820461A + .string "If your POKéMON can SURF, you’ll be\n" + .string "able to go to all sorts of places.$" + +PetalburgCity_WallysHouse_Text_204661: @ 8204661 + .string "WALLY’s coming home soon.\n" + .string "I’m looking forward to that.$" + +PetalburgCity_WallysHouse_Text_204698: @ 8204698 + .string "Oh? You met WALLY in\n" + .string "EVER GRANDE CITY?\p" + .string "Oh, {PLAYER}{KUN}, don’t be silly.\p" + .string "He may have gotten healthy, but he\n" + .string "can’t go somewhere far away like\l" + .string "that all by himself.$" + +PetalburgCity_WallysHouse_Text_204732: @ 8204732 + .string "WALLY was really happy when he told\n" + .string "us that he caught a POKéMON.\p" + .string "It’s been ages since I’ve seen him\n" + .string "smile like that.$" + +PetalburgCity_WallysHouse_Text_2047A7: @ 82047A7 + .string "I want you to keep this a secret\n" + .string "from my husband…\p" + .string "But our WALLY left VERDANTURF TOWN\n" + .string "without telling anyone.\p" + .string "You know, WALLY is frail, but\n" + .string "he’s surprisingly strong-willed.\p" + .string "I’m sure that he’ll come back safe\n" + .string "and sound one day!$" + diff --git a/data/maps/PetalburgWoods/events.inc b/data/maps/PetalburgWoods/events.inc new file mode 100644 index 000000000..da904f8ef --- /dev/null +++ b/data/maps/PetalburgWoods/events.inc @@ -0,0 +1,38 @@ +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 + +PetalburgWoods_MapWarps: @ 853471C + 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 + coord_event 27, 23, 3, 0, VAR_0x4098, 0, 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 + +PetalburgWoods_MapEvents:: @ 85347B4 + map_events PetalburgWoods_EventObjects, PetalburgWoods_MapWarps, PetalburgWoods_MapCoordEvents, PetalburgWoods_MapBGEvents + diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc new file mode 100644 index 000000000..7c9a1ae49 --- /dev/null +++ b/data/maps/PetalburgWoods/scripts.inc @@ -0,0 +1,486 @@ +PetalburgWoods_MapScripts:: @ 822DFD6 + .byte 0 + +PetalburgWoods_EventScript_22DFD7:: @ 822DFD7 + lockall + call PetalburgWoods_EventScript_22E124 + applymovement 4, PetalburgWoods_Movement_22E1CB + waitmovement 0 + msgbox PetalburgWoods_Text_22E34F, 4 + closemessage + playbgm MUS_AQA_0, 0 + applymovement 3, PetalburgWoods_Movement_22E209 + waitmovement 0 + msgbox PetalburgWoods_Text_22E3AA, 4 + closemessage + applymovement 3, PetalburgWoods_Movement_22E1F6 + waitmovement 0 + applymovement 4, PetalburgWoods_Movement_2725A6 + waitmovement 0 + msgbox PetalburgWoods_Text_22E428, 4 + closemessage + applymovement 4, PetalburgWoods_Movement_22E1E4 + waitmovement 0 + msgbox PetalburgWoods_Text_22E457, 4 + closemessage + applymovement 3, PetalburgWoods_Movement_22E20E + waitmovement 0 + msgbox PetalburgWoods_Text_22E4A5, 4 + trainerbattle 3, TRAINER_GRUNT_8, 0, PetalburgWoods_Text_22E542 + applymovement 3, PetalburgWoods_Movement_22E1F9 + waitmovement 0 + call PetalburgWoods_EventScript_22E138 + applymovement 255, PetalburgWoods_Movement_22E1E0 + applymovement 4, PetalburgWoods_Movement_22E1C2 + waitmovement 0 + goto PetalburgWoods_EventScript_22E1A7 + end + +PetalburgWoods_EventScript_22E079:: @ 822E079 + lockall + call PetalburgWoods_EventScript_22E124 + applymovement 4, PetalburgWoods_Movement_22E1D0 + waitmovement 0 + applymovement 255, PetalburgWoods_Movement_2725A4 + waitmovement 0 + msgbox PetalburgWoods_Text_22E34F, 4 + closemessage + playbgm MUS_AQA_0, 0 + applymovement 3, PetalburgWoods_Movement_22E209 + waitmovement 0 + msgbox PetalburgWoods_Text_22E3AA, 4 + closemessage + applymovement 3, PetalburgWoods_Movement_22E205 + waitmovement 0 + applymovement 4, PetalburgWoods_Movement_2725A6 + waitmovement 0 + msgbox PetalburgWoods_Text_22E428, 4 + closemessage + applymovement 4, PetalburgWoods_Movement_22E1EA + waitmovement 0 + msgbox PetalburgWoods_Text_22E457, 4 + applymovement 255, PetalburgWoods_Movement_2725A6 + waitmovement 0 + msgbox PetalburgWoods_Text_22E4A5, 4 + trainerbattle 3, TRAINER_GRUNT_8, 0, PetalburgWoods_Text_22E542 + applymovement 3, PetalburgWoods_Movement_22E1F9 + waitmovement 0 + call PetalburgWoods_EventScript_22E138 + applymovement 255, PetalburgWoods_Movement_22E1E0 + applymovement 4, PetalburgWoods_Movement_22E1D7 + waitmovement 0 + goto PetalburgWoods_EventScript_22E1A7 + end + +PetalburgWoods_EventScript_22E124:: @ 822E124 + applymovement 4, PetalburgWoods_Movement_22E1B1 + waitmovement 0 + msgbox PetalburgWoods_Text_22E332, 4 + closemessage + return + +PetalburgWoods_EventScript_22E138:: @ 822E138 + msgbox PetalburgWoods_Text_22E563, 4 + closemessage + applymovement 3, PetalburgWoods_Movement_22E1FD + waitmovement 0 + removeobject 3 + applymovement 255, PetalburgWoods_Movement_2725AA + waitmovement 0 + msgbox PetalburgWoods_Text_22E63D, 4 + giveitem_std ITEM_GREAT_BALL + compare VAR_RESULT, 0 + goto_eq PetalburgWoods_EventScript_22E17D + goto PetalburgWoods_EventScript_22E18B + end + +PetalburgWoods_EventScript_22E17D:: @ 822E17D + msgbox PetalburgWoods_Text_22E741, 4 + goto PetalburgWoods_EventScript_22E18B + end + +PetalburgWoods_EventScript_22E18B:: @ 822E18B + msgbox PetalburgWoods_Text_22E6C7, 4 + applymovement 4, PetalburgWoods_Movement_22E1EE + waitmovement 0 + msgbox PetalburgWoods_Text_22E712, 4 + closemessage + return + +PetalburgWoods_EventScript_22E1A7:: @ 822E1A7 + removeobject 4 + setvar VAR_0x4098, 1 + releaseall + end + +PetalburgWoods_Movement_22E1B1: @ 822E1B1 + 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 + 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 + delay_16 + face_player + walk_down + walk_down + step_end + +PetalburgWoods_Movement_22E1D0: @ 822E1D0 + delay_16 + face_player + walk_down + walk_down + walk_down + walk_in_place_fastest_right + step_end + +PetalburgWoods_Movement_22E1D7: @ 822E1D7 + 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 + delay_16 + delay_16 + walk_in_place_fastest_up + step_end + +PetalburgWoods_Movement_22E1E4: @ 822E1E4 + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_in_place_fastest_up + step_end + +PetalburgWoods_Movement_22E1EA: @ 822E1EA + walk_fast_down + walk_fast_right + walk_in_place_fastest_up + step_end + +PetalburgWoods_Movement_22E1EE: @ 822E1EE + walk_in_place_fastest_down + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + face_up + step_end + +PetalburgWoods_Movement_22E1F6: @ 822E1F6 + walk_fast_down + walk_fast_down + step_end + +PetalburgWoods_Movement_22E1F9: @ 822E1F9 + lock_facing_direction + walk_up + unlock_facing_direction + step_end + +PetalburgWoods_Movement_22E1FD: @ 822E1FD + 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 + walk_fast_down + walk_fast_down + walk_fast_down + step_end + +PetalburgWoods_Movement_22E209: @ 822E209 + walk_down + walk_down + delay_16 + delay_16 + step_end + +PetalburgWoods_Movement_22E20E: @ 822E20E + walk_down + step_end + +PetalburgWoods_EventScript_22E210:: @ 822E210 + msgbox PetalburgWoods_Text_22EA0C, 2 + end + +PetalburgWoods_EventScript_22E219:: @ 822E219 + msgbox PetalburgWoods_Text_22EA8B, 2 + end + +PetalburgWoods_EventScript_22E222:: @ 822E222 + lock + faceplayer + checkflag FLAG_0x129 + goto_eq PetalburgWoods_EventScript_22E251 + msgbox PetalburgWoods_Text_22EAFE, 4 + giveitem_std ITEM_MIRACLE_SEED + compare VAR_RESULT, 0 + goto_eq PetalburgWoods_EventScript_272054 + setflag FLAG_0x129 + release + end + +PetalburgWoods_EventScript_22E251:: @ 822E251 + msgbox PetalburgWoods_Text_22EB63, 4 + release + end + +PetalburgWoods_EventScript_22E25B:: @ 822E25B + msgbox PetalburgWoods_Text_22EC10, 3 + end + +PetalburgWoods_EventScript_22E264:: @ 822E264 + msgbox PetalburgWoods_Text_22ED07, 3 + end + +PetalburgWoods_EventScript_22E26D:: @ 822E26D + trainerbattle 0, TRAINER_LYLE, 0, PetalburgWoods_Text_22E77D, PetalburgWoods_Text_22E7C1 + msgbox PetalburgWoods_Text_22E7EF, 6 + end + +PetalburgWoods_EventScript_22E284:: @ 822E284 + trainerbattle 2, TRAINER_JAMES_1, 0, PetalburgWoods_Text_22E827, PetalburgWoods_Text_22E86B, PetalburgWoods_EventScript_22E2C5 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq PetalburgWoods_EventScript_22E31B + setvar VAR_0x8004, 621 + specialvar VAR_RESULT, sub_813B4E0 + compare VAR_RESULT, 0 + goto_eq PetalburgWoods_EventScript_22E2EF + msgbox PetalburgWoods_Text_22E889, 4 + release + end + +PetalburgWoods_EventScript_22E2C5:: @ 822E2C5 + special sub_80B4808 + waitmovement 0 + checkflag FLAG_HAS_MATCH_CALL + goto_eq PetalburgWoods_EventScript_22E2D6 + release + end + +PetalburgWoods_EventScript_22E2D6:: @ 822E2D6 + msgbox PetalburgWoods_Text_22E8C3, 4 + setvar VAR_0x8004, 621 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 621 + callstd 8 + release + end + +PetalburgWoods_EventScript_22E2EF:: @ 822E2EF + checkflag FLAG_HAS_MATCH_CALL + goto_eq PetalburgWoods_EventScript_22E302 + msgbox PetalburgWoods_Text_22E889, 4 + release + end + +PetalburgWoods_EventScript_22E302:: @ 822E302 + msgbox PetalburgWoods_Text_22E914, 4 + setvar VAR_0x8004, 621 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 621 + callstd 8 + release + end + +PetalburgWoods_EventScript_22E31B:: @ 822E31B + trainerbattle 5, TRAINER_JAMES_1, 0, PetalburgWoods_Text_22E966, PetalburgWoods_Text_22E998 + msgbox PetalburgWoods_Text_22E9B6, 6 + end + +PetalburgWoods_Text_22E332: @ 822E332 + .string "Hmmm…\n" + .string "Not a one to be found…$" + +PetalburgWoods_Text_22E34F: @ 822E34F + .string "Hello, have you seen any POKéMON\n" + .string "called SHROOMISH around here?\p" + .string "I really love that POKéMON.$" + +PetalburgWoods_Text_22E3AA: @ 822E3AA + .string "I was going to ambush you, but you\n" + .string "had to dawdle in PETALBURG WOODS\l" + .string "forever, didn’t you?\p" + .string "I got sick of waiting, so here I am!$" + +PetalburgWoods_Text_22E428: @ 822E428 + .string "You! DEVON RESEARCHER!\p" + .string "Hand over those papers!$" + +PetalburgWoods_Text_22E457: @ 822E457 + .string "Aiyeeeh!\p" + .string "You’re a POKéMON TRAINER, aren’t you?\n" + .string "You’ve got to help me, please!$" + +PetalburgWoods_Text_22E4A5: @ 822E4A5 + .string "Hunh? What do you think you’re doing?\n" + .string "What, you’re going to protect him?\p" + .string "No one who crosses TEAM AQUA\n" + .string "gets any mercy, not even a kid!\p" + .string "Come on and battle me!$" + +PetalburgWoods_Text_22E542: @ 822E542 + .string "You’re kidding me! You’re tough!$" + +PetalburgWoods_Text_22E563: @ 822E563 + .string "Grrr… You’ve got some nerve\n" + .string "meddling with TEAM AQUA!\l" + .string "Come on and battle me again!\p" + .string "I wish I could say that, but I’m out of\n" + .string "POKéMON…\p" + .string "And, hey, we of TEAM AQUA are also\n" + .string "after something in RUSTBORO.\p" + .string "I’ll let you go today!$" + +PetalburgWoods_Text_22E63D: @ 822E63D + .string "Whew…\n" + .string "That was awfully close!\p" + .string "Thanks to you, he didn’t rob me of\n" + .string "these important papers.\p" + .string "I know, I’ll give you a GREAT BALL as\n" + .string "my thanks!$" + +PetalburgWoods_Text_22E6C7: @ 822E6C7 + .string "Didn’t that TEAM AQUA thug say\n" + .string "they were after something in\l" + .string "RUSTBORO, too?$" + +PetalburgWoods_Text_22E712: @ 822E712 + .string "Uh-oh! It’s a crisis!\n" + .string "I can’t be wasting time!$" + +PetalburgWoods_Text_22E741: @ 822E741 + .string "You’re loaded with items.\n" + .string "I can’t give you this GREAT BALL.$" + +PetalburgWoods_Text_22E77D: @ 822E77D + .string "I caught a whole bunch of POKéMON!\p" + .string "Go, go, go!\n" + .string "My BUG POKéMON team!$" + +PetalburgWoods_Text_22E7C1: @ 822E7C1 + .string "I have all these POKéMON,\n" + .string "but I couldn’t win…$" + +PetalburgWoods_Text_22E7EF: @ 822E7EF + .string "I caught a bunch of POKéMON.\n" + .string "Now I’m out of POKé BALLS.$" + +PetalburgWoods_Text_22E827: @ 822E827 + .string "If you take BUG POKéMON to school,\n" + .string "you get to be instantly popular!$" + +PetalburgWoods_Text_22E86B: @ 822E86B + .string "I can’t be popular if I lose.$" + +PetalburgWoods_Text_22E889: @ 822E889 + .string "If you have a big BUG POKéMON,\n" + .string "people respect you for it.$" + +PetalburgWoods_Text_22E8C3: @ 822E8C3 + .string "I want a rematch when my BUG\n" + .string "POKéMON grow up!\p" + .string "I’m registering you in my POKéNAV!$" + +PetalburgWoods_Text_22E914: @ 822E914 + .string "I want a rematch when my BUG \n" + .string "POKéMON grow up!\p" + .string "I’m registering you in my POKéNAV!$" + +PetalburgWoods_Text_22E966: @ 822E966 + .string "My BUG POKéMON have grown.\n" + .string "I’ll be popular again.$" + +PetalburgWoods_Text_22E998: @ 822E998 + .string "I can’t be popular if I lose.$" + +PetalburgWoods_Text_22E9B6: @ 822E9B6 + .string "You get to be popular if you have\n" + .string "strong POKéMON, right?\l" + .string "So, I’ve been training hard.$" + +PetalburgWoods_Text_22EA0C: @ 822EA0C + .string "Yo, there!\n" + .string "Your POKéMON doing okay?\p" + .string "If your POKéMON are weak and you want\n" + .string "to avoid battles, you should stay out\l" + .string "of tall grass.$" + +PetalburgWoods_Text_22EA8B: @ 822EA8B + .string "Sometimes, there are things on the\n" + .string "ground even if you can’t see them.\p" + .string "That’s why I always check where I’m\n" + .string "walking.$" + +PetalburgWoods_Text_22EAFE: @ 822EAFE + .string "Oh, neat!\n" + .string "That’s the BADGE from RUSTBORO GYM!\p" + .string "You must be a TRAINER.\n" + .string "You should try using this item.$" + +PetalburgWoods_Text_22EB63: @ 822EB63 + .string "It’s a MIRACLE SEED.\n" + .string "If a POKéMON holds that item, its\l" + .string "GRASS-type moves become stronger.\p" + .string "Besides MIRACLE SEED, I think there are\n" + .string "other convenient items for POKéMON\l" + .string "to hold.$" + +PetalburgWoods_Text_22EC10: @ 822EC10 + .string "TRAINER TIPS\p" + .string "Any POKéMON that appears even once\n" + .string "in a battle is awarded EXP Points.\p" + .string "To raise a weak POKéMON, put it at the\n" + .string "left of the team list.\p" + .string "As soon as a battle starts, switch it\n" + .string "out. It will earn EXP Points without\l" + .string "being exposed to any harm.$" + +PetalburgWoods_Text_22ED07: @ 822ED07 + .string "TRAINER TIPS\p" + .string "In addition to Hit Points (HP), POKéMON\n" + .string "have Power Points (PP) that are used to\l" + .string "make moves during battle.\p" + .string "If a POKéMON runs out of PP, it must be\n" + .string "taken to a POKéMON CENTER.$" + diff --git a/data/maps/RecordCorner/events.inc b/data/maps/RecordCorner/events.inc new file mode 100644 index 000000000..7970c14ba --- /dev/null +++ b/data/maps/RecordCorner/events.inc @@ -0,0 +1,18 @@ +RecordCorner_EventObjects: @ 8539DFC + 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 + 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 + 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 + +RecordCorner_MapEvents:: @ 8539E74 + map_events RecordCorner_EventObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0 + diff --git a/data/maps/RecordCorner/scripts.inc b/data/maps/RecordCorner/scripts.inc new file mode 100644 index 000000000..4f342b860 --- /dev/null +++ b/data/maps/RecordCorner/scripts.inc @@ -0,0 +1,3 @@ +RecordCorner_MapScripts:: @ 823B77F + .byte 0 + diff --git a/data/maps/Route101/events.inc b/data/maps/Route101/events.inc new file mode 100644 index 000000000..82b674f9e --- /dev/null +++ b/data/maps/Route101/events.inc @@ -0,0 +1,25 @@ +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 + +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 + +Route101_MapBGEvents: @ 8527FB8 + bg_event 5, 9, 0, 0, 0, Route101_EventScript_1EBE0D + +Route101_MapEvents:: @ 8527FC4 + map_events Route101_EventObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents + diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc new file mode 100644 index 000000000..9593ae59e --- /dev/null +++ b/data/maps/Route101/scripts.inc @@ -0,0 +1,301 @@ +Route101_MapScripts:: @ 81EBCBA + map_script 3, Route101_MapScript1_1EBCC5 + map_script 2, Route101_MapScript2_1EBCCB + .byte 0 + +Route101_MapScript1_1EBCC5: @ 81EBCC5 + call Route101_EventScript_2720AD + end + +Route101_MapScript2_1EBCCB: @ 81EBCCB + map_script_2 VAR_0x4060, 0, Route101_EventScript_1EBCD5 + .2byte 0 + +Route101_EventScript_1EBCD5:: @ 81EBCD5 + setflag FLAG_SPECIAL_FLAG_0x4000 + setvar VAR_0x4060, 1 + end + +Route101_EventScript_1EBCDE:: @ 81EBCDE + lockall + playbgm MUS_EVENT0, 1 + msgbox Route101_Text_1EBE8F, 4 + closemessage + setobjectxy 2, 0, 15 + setobjectxy 4, 0, 16 + applymovement 255, Route101_Movement_1EBDC2 + applymovement 2, Route101_Movement_1EBDE7 + applymovement 4, Route101_Movement_1EBDB5 + waitmovement 0 + applymovement 4, Route101_Movement_1EBD96 + applymovement 2, Route101_Movement_1EBDC8 + waitmovement 0 + applymovement 2, Route101_Movement_2725A8 + waitmovement 0 + applymovement 4, Route101_Movement_1EBDBD + applymovement 2, Route101_Movement_1EBDEF + waitmovement 0 + msgbox Route101_Text_1EBE9A, 4 + closemessage + setvar VAR_0x4060, 2 + releaseall + end + +Route101_EventScript_1EBD4E:: @ 81EBD4E + lockall + msgbox Route101_Text_1EBEDF, 4 + closemessage + applymovement 255, Route101_Movement_1EBD90 + waitmovement 0 + releaseall + end + +Route101_EventScript_1EBD64:: @ 81EBD64 + lockall + msgbox Route101_Text_1EBEDF, 4 + closemessage + applymovement 255, Route101_Movement_1EBD92 + waitmovement 0 + releaseall + end + +Route101_EventScript_1EBD7A:: @ 81EBD7A + lockall + msgbox Route101_Text_1EBEDF, 4 + closemessage + applymovement 255, Route101_Movement_1EBD94 + waitmovement 0 + releaseall + end + +Route101_Movement_1EBD90: @ 81EBD90 + walk_up + step_end + +Route101_Movement_1EBD92: @ 81EBD92 + walk_right + step_end + +Route101_Movement_1EBD94: @ 81EBD94 + walk_down + step_end + +Route101_Movement_1EBD96: @ 81EBD96 + 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 + 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 + 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 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_in_place_fastest_left + step_end + +Route101_Movement_1EBDC8: @ 81EBDC8 + 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 + 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 + 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 + walk_up + walk_up + step_end + +Route101_Movement_1EBDF7: @ 81EBDF7 + walk_up + walk_left + walk_up + step_end + +Route101_EventScript_1EBDFB:: @ 81EBDFB + msgbox Route101_Text_1EBFDD, 2 + end + +Route101_EventScript_1EBE04:: @ 81EBE04 + msgbox Route101_Text_1EC04A, 2 + end + +Route101_EventScript_1EBE0D:: @ 81EBE0D + msgbox Route101_Text_1EC0C8, 3 + end + +Route101_EventScript_1EBE16:: @ 81EBE16 + lock + faceplayer + setflag FLAG_SYS_POKEMON_GET + setflag FLAG_0x052 + fadescreen 1 + removeobject 4 + setobjectxy 255, 6, 13 + applymovement 255, Route101_Movement_2725A4 + waitmovement 0 + special ChooseStarter + waitstate + applymovement 2, Route101_Movement_1EBE8D + waitmovement 0 + msgbox Route101_Text_1EBF12, 4 + special HealPlayerParty + setflag FLAG_0x2D0 + clearflag FLAG_0x2D1 + setflag FLAG_0x2BC + setvar VAR_0x4084, 2 + setvar VAR_0x4060, 3 + clearflag FLAG_SPECIAL_FLAG_0x4000 + checkplayergender + compare VAR_RESULT, 0 + call_if 1, Route101_EventScript_1EBE85 + compare VAR_RESULT, 1 + call_if 1, Route101_EventScript_1EBE89 + warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 + waitstate + release + end + +Route101_EventScript_1EBE85:: @ 81EBE85 + setflag FLAG_0x2D2 + return + +Route101_EventScript_1EBE89:: @ 81EBE89 + setflag FLAG_0x2F8 + return + +Route101_Movement_1EBE8D: @ 81EBE8D + walk_right + step_end + +Route101_Text_1EBE8F: @ 81EBE8F + .string "H-help me!$" + +Route101_Text_1EBE9A: @ 81EBE9A + .string "Hello! You over there!\n" + .string "Please! Help!\p" + .string "In my BAG!\n" + .string "There’s a POKé BALL!$" + +Route101_Text_1EBEDF: @ 81EBEDF + .string "Wh-Where are you going?!\n" + .string "Don’t leave me like this!$" + +Route101_Text_1EBF12: @ 81EBF12 + .string "PROF. BIRCH: Whew…\p" + .string "I was in the tall grass studying wild\n" + .string "POKéMON when I was jumped.\p" + .string "You saved me.\n" + .string "Thanks a lot!\p" + .string "Oh?\p" + .string "Hi, you’re {PLAYER}{KUN}!\p" + .string "This is not the place to chat, so come\n" + .string "by my POKéMON LAB later, okay?$" + +Route101_Text_1EBFDD: @ 81EBFDD + .string "If POKéMON get tired, take them to\n" + .string "a POKéMON CENTER.\p" + .string "There’s a POKéMON CENTER in OLDALE\n" + .string "TOWN right close by.$" + +Route101_Text_1EC04A: @ 81EC04A + .string "Wild POKéMON will jump out at you in\n" + .string "tall grass.\p" + .string "If you want to catch POKéMON, you have\n" + .string "to go into the tall grass and search.$" + +Route101_Text_1EC0C8: @ 81EC0C8 + .string "ROUTE 101\n" + .string "{0x79} OLDALE TOWN$" + diff --git a/data/maps/Route102/events.inc b/data/maps/Route102/events.inc new file mode 100644 index 000000000..fc30a195c --- /dev/null +++ b/data/maps/Route102/events.inc @@ -0,0 +1,18 @@ +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 + +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_EventObjects, 0x0, 0x0, Route102_MapBGEvents + diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc new file mode 100644 index 000000000..cd817df35 --- /dev/null +++ b/data/maps/Route102/scripts.inc @@ -0,0 +1,119 @@ +Route102_MapScripts:: @ 81EC0E0 + .byte 0 + +Route102_EventScript_1EC0E1:: @ 81EC0E1 + msgbox Route102_Text_1EC2C0, 2 + end + +Route102_EventScript_1EC0EA:: @ 81EC0EA + msgbox Route102_Text_1EC35B, 3 + end + +Route102_EventScript_1EC0F3:: @ 81EC0F3 + msgbox Route102_Text_1EC373, 3 + end + +Route102_EventScript_1EC0FC:: @ 81EC0FC + msgbox Route102_Text_1EC32E, 2 + end + +Route102_EventScript_1EC105:: @ 81EC105 + trainerbattle 2, TRAINER_CALVIN_1, 0, Route102_Text_294513, Route102_Text_29457C, Route102_EventScript_1EC146 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route102_EventScript_1EC19C + setvar VAR_0x8004, 318 + specialvar VAR_RESULT, sub_813B4E0 + compare VAR_RESULT, 0 + goto_eq Route102_EventScript_1EC170 + msgbox Route102_Text_2945AC, 4 + release + end + +Route102_EventScript_1EC146:: @ 81EC146 + special sub_80B4808 + waitmovement 0 + checkflag FLAG_HAS_MATCH_CALL + goto_eq Route102_EventScript_1EC157 + release + end + +Route102_EventScript_1EC157:: @ 81EC157 + msgbox Route102_Text_294668, 4 + setvar VAR_0x8004, 318 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 318 + callstd 8 + release + end + +Route102_EventScript_1EC170:: @ 81EC170 + checkflag FLAG_HAS_MATCH_CALL + goto_eq Route102_EventScript_1EC183 + msgbox Route102_Text_2945AC, 4 + release + end + +Route102_EventScript_1EC183:: @ 81EC183 + msgbox Route102_Text_2945EB, 4 + setvar VAR_0x8004, 318 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 318 + callstd 8 + release + end + +Route102_EventScript_1EC19C:: @ 81EC19C + trainerbattle 5, TRAINER_CALVIN_1, 0, Route102_Text_2946AE, Route102_Text_29470C + msgbox Route102_Text_29473C, 6 + end + +Route102_EventScript_1EC1B3:: @ 81EC1B3 + trainerbattle 0, TRAINER_RICK, 0, Route102_Text_29480C, Route102_Text_294847 + msgbox Route102_Text_294859, 6 + end + +Route102_EventScript_1EC1CA:: @ 81EC1CA + trainerbattle 0, TRAINER_TIANA, 0, Route102_Text_29489E, Route102_Text_2948F3 + msgbox Route102_Text_294916, 6 + end + +Route102_EventScript_1EC1E1:: @ 81EC1E1 + trainerbattle 0, TRAINER_ALLEN, 0, Route102_Text_294775, Route102_Text_2947AA + msgbox Route102_Text_2947DB, 6 + end + +PetalburgCity_Text_1EC1F8: @ 81EC1F8 + .string "WALLY: {PLAYER}…\n" + .string "POKéMON hide in tall grass like this,\l" + .string "don’t they?\p" + .string "Please watch me and see if I can\n" + .string "catch one properly.\p" + .string "…Whoa!$" + +PetalburgCity_Text_1EC271: @ 81EC271 + .string "WALLY: I did it… It’s my…\n" + .string "My POKéMON!$" + +PetalburgCity_Text_1EC297: @ 81EC297 + .string "{PLAYER}, thank you!\n" + .string "Let’s go back to the GYM!$" + +Route102_Text_1EC2C0: @ 81EC2C0 + .string "I’m…not very tall, so I sink right\n" + .string "into tall grass.\p" + .string "The grass goes up my nose and…\n" + .string "Fwafwafwafwafwa…\p" + .string "Fwatchoo!$" + +Route102_Text_1EC32E: @ 81EC32E + .string "I’m going to catch a whole bunch of\n" + .string "POKéMON!$" + +Route102_Text_1EC35B: @ 81EC35B + .string "ROUTE 102\n" + .string "{0x7C} OLDALE TOWN$" + +Route102_Text_1EC373: @ 81EC373 + .string "ROUTE 102\n" + .string "{0x7B} PETALBURG CITY$" diff --git a/data/maps/Route103/events.inc b/data/maps/Route103/events.inc new file mode 100644 index 000000000..e4bf74177 --- /dev/null +++ b/data/maps/Route103/events.inc @@ -0,0 +1,31 @@ +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 + +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 + +Route103_MapEvents:: @ 85282D0 + map_events Route103_EventObjects, Route103_MapWarps, 0x0, Route103_MapBGEvents + diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc new file mode 100644 index 000000000..8bf597902 --- /dev/null +++ b/data/maps/Route103/scripts.inc @@ -0,0 +1,368 @@ +Route103_MapScripts:: @ 81EC38E + map_script 3, Route103_MapScript1_1EC399 + map_script 1, Route103_MapScript1_1EC3A4 + .byte 0 + +Route103_MapScript1_1EC399: @ 81EC399 + call Route103_EventScript_271ED7 + call Route103_EventScript_2720AD + end + +Route103_MapScript1_1EC3A4: @ 81EC3A4 + checkflag FLAG_SYS_GAME_CLEAR + call_if 1, Route103_EventScript_1EC3AE + end + +Route103_EventScript_1EC3AE:: @ 81EC3AE + setmetatile 45, 5, 159, 1 + setmetatile 45, 6, 167, 0 + return + +Route103_EventScript_1EC3C1:: @ 81EC3C1 + lockall + checkplayergender + compare VAR_RESULT, 0 + goto_eq Route103_EventScript_1EC3DA + compare VAR_RESULT, 1 + goto_eq Route103_EventScript_1EC434 + end + +Route103_EventScript_1EC3DA:: @ 81EC3DA + msgbox Route103_Text_1EC7A6, 4 + closemessage + playbgm MUS_GIRL_SUP, 1 + applymovement 2, Route103_Movement_27259E + waitmovement 0 + applymovement 2, Route103_Movement_272598 + waitmovement 0 + applymovement 2, Route103_Movement_27259A + waitmovement 0 + msgbox Route103_Text_1EC7DE, 4 + switch VAR_FIRST_POKE + case 0, Route103_EventScript_1EC48E + case 1, Route103_EventScript_1EC49E + case 2, Route103_EventScript_1EC4AE + end + +Route103_EventScript_1EC434:: @ 81EC434 + msgbox Route103_Text_1EC989, 4 + closemessage + playbgm MUS_BOY_SUP, 1 + applymovement 2, Route103_Movement_27259E + waitmovement 0 + applymovement 2, Route103_Movement_272598 + waitmovement 0 + applymovement 2, Route103_Movement_27259A + waitmovement 0 + msgbox Route103_Text_1EC9CE, 4 + switch VAR_FIRST_POKE + case 0, Route103_EventScript_1EC4BE + case 1, Route103_EventScript_1EC4CE + case 2, Route103_EventScript_1EC4DE + end + +Route103_EventScript_1EC48E:: @ 81EC48E + trainerbattle 3, TRAINER_MAY_4, 0, Route103_Text_1EC881 + goto Route103_EventScript_1EC4EE + end + +Route103_EventScript_1EC49E:: @ 81EC49E + trainerbattle 3, TRAINER_MAY_7, 0, Route103_Text_1EC881 + goto Route103_EventScript_1EC4EE + end + +Route103_EventScript_1EC4AE:: @ 81EC4AE + trainerbattle 3, TRAINER_MAY_1, 0, Route103_Text_1EC881 + goto Route103_EventScript_1EC4EE + end + +Route103_EventScript_1EC4BE:: @ 81EC4BE + trainerbattle 3, TRAINER_BRENDAN_4, 0, Route103_Text_1ECA59 + goto Route103_EventScript_1EC4FC + end + +Route103_EventScript_1EC4CE:: @ 81EC4CE + trainerbattle 3, TRAINER_BRENDAN_7, 0, Route103_Text_1ECA59 + goto Route103_EventScript_1EC4FC + end + +Route103_EventScript_1EC4DE:: @ 81EC4DE + trainerbattle 3, TRAINER_BRENDAN_1, 0, Route103_Text_1ECA59 + goto Route103_EventScript_1EC4FC + end + +Route103_EventScript_1EC4EE:: @ 81EC4EE + msgbox Route103_Text_1EC8AE, 4 + goto Route103_EventScript_1EC50A + end + +Route103_EventScript_1EC4FC:: @ 81EC4FC + msgbox Route103_Text_1ECA79, 4 + goto Route103_EventScript_1EC50A + end + +Route103_EventScript_1EC50A:: @ 81EC50A + closemessage + switch VAR_FACING + case 1, Route103_EventScript_1EC585 + case 2, Route103_EventScript_1EC53D + case 3, Route103_EventScript_1EC561 + case 4, Route103_EventScript_1EC561 + end + +Route103_EventScript_1EC53D:: @ 81EC53D + applymovement 255, Route103_Movement_1EC5C8 + applymovement 2, Route103_Movement_1EC5BE + waitmovement 0 + playse SE_DANSA + applymovement 2, Route103_Movement_1EC5C1 + waitmovement 0 + goto Route103_EventScript_1EC5A2 + end + +Route103_EventScript_1EC561:: @ 81EC561 + applymovement 255, Route103_Movement_1EC5D6 + applymovement 2, Route103_Movement_1EC5CE + waitmovement 0 + playse SE_DANSA + applymovement 2, Route103_Movement_1EC5D0 + waitmovement 0 + goto Route103_EventScript_1EC5A2 + end + +Route103_EventScript_1EC585:: @ 81EC585 + applymovement 2, Route103_Movement_1EC5CE + waitmovement 0 + playse SE_DANSA + applymovement 2, Route103_Movement_1EC5D0 + waitmovement 0 + goto Route103_EventScript_1EC5A2 + end + +Route103_EventScript_1EC5A2:: @ 81EC5A2 + removeobject 2 + setvar VAR_0x4084, 4 + clearflag FLAG_0x379 + setflag FLAG_0x082 + setvar VAR_0x40C7, 1 + clearflag FLAG_0x3D3 + savebgm MUS_DUMMY + fadedefaultbgm + releaseall + end + +Route103_Movement_1EC5BE: @ 81EC5BE + walk_left + walk_down + step_end + +Route103_Movement_1EC5C1: @ 81EC5C1 + jump_2_down + delay_16 + walk_down + walk_down + walk_down + walk_down + step_end + +Route103_Movement_1EC5C8: @ 81EC5C8 + delay_16 + delay_4 + walk_in_place_fastest_left + delay_16 + walk_in_place_fastest_down + step_end + +Route103_Movement_1EC5CE: @ 81EC5CE + walk_down + step_end + +Route103_Movement_1EC5D0: @ 81EC5D0 + jump_2_down + delay_16 + walk_down + walk_down + walk_down + step_end + +Route103_Movement_1EC5D6: @ 81EC5D6 + delay_16 + walk_in_place_fastest_down + step_end + +Route103_EventScript_1EC5D9:: @ 81EC5D9 + msgbox Route103_Text_1ECB73, 2 + end + +Route103_EventScript_1EC5E2:: @ 81EC5E2 + msgbox Route103_Text_1ECBB5, 2 + end + +Route103_EventScript_1EC5EB:: @ 81EC5EB + msgbox Route103_Text_1ECC1A, 3 + end + +Route103_EventScript_1EC5F4:: @ 81EC5F4 + trainerbattle 0, TRAINER_DAISY, 0, Route103_Text_29495A, Route103_Text_29498F + msgbox Route103_Text_2949B4, 6 + end + +Route103_EventScript_1EC60B:: @ 81EC60B + trainerbattle 6, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_2949F9, Route103_Text_294A3D, Route103_Text_294AAE, Route103_EventScript_1EC63A + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route103_EventScript_1EC653 + msgbox Route103_Text_294A52, 6 + end + +Route103_EventScript_1EC63A:: @ 81EC63A + msgbox Route103_Text_294B8A, 4 + setvar VAR_0x8004, 481 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 481 + callstd 8 + release + end + +Route103_EventScript_1EC653:: @ 81EC653 + trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294C29, Route103_Text_294C6D, Route103_Text_294CEF + msgbox Route103_Text_294C93, 6 + end + +Route103_EventScript_1EC66E:: @ 81EC66E + trainerbattle 6, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294AFD, Route103_Text_294B22, Route103_Text_294BD0, Route103_EventScript_1EC69D + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route103_EventScript_1EC6B6 + msgbox Route103_Text_294B40, 6 + end + +Route103_EventScript_1EC69D:: @ 81EC69D + msgbox Route103_Text_294B8A, 4 + setvar VAR_0x8004, 481 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 481 + callstd 8 + release + end + +Route103_EventScript_1EC6B6:: @ 81EC6B6 + trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294D3E, Route103_Text_294D63, Route103_Text_294DDB + msgbox Route103_Text_294D89, 6 + end + +Route103_EventScript_1EC6D1:: @ 81EC6D1 + trainerbattle 0, TRAINER_ANDREW, 0, Route103_Text_294E34, Route103_Text_294E92 + msgbox Route103_Text_294EBB, 6 + end + +Route103_EventScript_1EC6E8:: @ 81EC6E8 + trainerbattle 2, TRAINER_MIGUEL_1, 0, Route103_Text_294EDF, Route103_Text_294F21, Route103_EventScript_1EC714 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route103_EventScript_1EC733 + msgbox Route103_Text_294F42, 4 + release + end + +Route103_EventScript_1EC714:: @ 81EC714 + special sub_80B4808 + waitmovement 0 + msgbox Route103_Text_294F7E, 4 + setvar VAR_0x8004, 293 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 293 + callstd 8 + release + end + +Route103_EventScript_1EC733:: @ 81EC733 + trainerbattle 5, TRAINER_MIGUEL_1, 0, Route103_Text_294FC3, Route103_Text_295006 + msgbox Route103_Text_29501E, 6 + end + +Route103_EventScript_1EC74A:: @ 81EC74A + trainerbattle 0, TRAINER_MARCOS, 0, Route103_Text_295206, Route103_Text_29522B + msgbox Route103_Text_295246, 6 + end + +Route103_EventScript_1EC761:: @ 81EC761 + trainerbattle 0, TRAINER_RHETT, 0, Route103_Text_295199, Route103_Text_2951C6 + msgbox Route103_Text_2951DE, 6 + end + +Route103_EventScript_1EC778:: @ 81EC778 + trainerbattle 0, TRAINER_PETE, 0, Route103_Text_295063, Route103_Text_295093 + msgbox Route103_Text_2950AA, 6 + end + +Route103_EventScript_1EC78F:: @ 81EC78F + trainerbattle 0, TRAINER_ISABELLE, 0, Route103_Text_295116, Route103_Text_295146 + msgbox Route103_Text_29514D, 6 + end + +Route103_Text_1EC7A6: @ 81EC7A6 + .string "MAY: Let’s see… The POKéMON found\n" + .string "on ROUTE 103 include…$" + +Route103_Text_1EC7DE: @ 81EC7DE + .string "Oh, hi, {PLAYER}{KUN}!\p" + .string "…Oh, I see, my dad gave you\n" + .string "a POKéMON as a gift.\p" + .string "Since we’re here, let’s have a quick\n" + .string "battle!\p" + .string "I’ll give you a taste of what being\n" + .string "a TRAINER is like.$" + +Route103_Text_1EC881: @ 81EC881 + .string "Wow! That’s great!\n" + .string "{PLAYER}{KUN}, you’re pretty good!$" + +Route103_Text_1EC8AE: @ 81EC8AE + .string "MAY: I think I know why my dad has\n" + .string "an eye out for you now.\p" + .string "I mean, you just got that POKéMON,\n" + .string "but it already likes you.\p" + .string "You might be able to befriend any\n" + .string "kind of POKéMON easily.\p" + .string "Well, it’s time to head back to\n" + .string "the LAB.$" + +Route103_Text_1EC989: @ 81EC989 + .string "BRENDAN: Okay, so it’s this one and\n" + .string "that one that live on ROUTE 103…$" + +Route103_Text_1EC9CE: @ 81EC9CE + .string "Hey, it’s {PLAYER}!\p" + .string "…Oh, yeah, Dad gave you a POKéMON.\p" + .string "Since we’re here, how about a little\n" + .string "battle?\p" + .string "I’ll teach you what being a TRAINER’s\n" + .string "about!$" + +Route103_Text_1ECA59: @ 81ECA59 + .string "Huh, {PLAYER}, you’re not too shabby.$" + +Route103_Text_1ECA79: @ 81ECA79 + .string "BRENDAN: I think I get it.\n" + .string "I think I know why my dad has his eye\l" + .string "out for you now.\p" + .string "Look, your POKéMON already likes you,\n" + .string "even though you just got it.\p" + .string "{PLAYER}, I get the feeling that you\n" + .string "could befriend any POKéMON with ease.\p" + .string "We should head back to the LAB.$" + +Route103_Text_1ECB73: @ 81ECB73 + .string "My POKéMON is staggeringly tired…\n" + .string "I should have brought a POTION…$" + +Route103_Text_1ECBB5: @ 81ECBB5 + .string "If you cross the sea from here,\n" + .string "it’ll be a shortcut to OLDALE TOWN.\p" + .string "Fufufu, that’s useful, isn’t it?$" + +Route103_Text_1ECC1A: @ 81ECC1A + .string "ROUTE 103\n" + .string "{0x7A} OLDALE TOWN$" + diff --git a/data/maps/Route104/events.inc b/data/maps/Route104/events.inc new file mode 100644 index 000000000..315b5614e --- /dev/null +++ b/data/maps/Route104/events.inc @@ -0,0 +1,64 @@ +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 + +Route104_MapWarps: @ 8528614 + 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 + +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 + +Route104_MapEvents:: @ 85286DC + map_events Route104_EventObjects, Route104_MapWarps, Route104_MapCoordEvents, Route104_MapBGEvents + diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc new file mode 100644 index 000000000..83cfe5d92 --- /dev/null +++ b/data/maps/Route104/scripts.inc @@ -0,0 +1,1227 @@ +Route104_MapScripts:: @ 81ECC32 + map_script 2, Route104_MapScript2_1ECC3D + map_script 3, Route104_MapScript1_1ECC4E + .byte 0 + +Route104_MapScript2_1ECC3D: @ 81ECC3D + map_script_2 VAR_0x408E, 1, Route104_EventScript_1ECC47 + .2byte 0 + +Route104_EventScript_1ECC47:: @ 81ECC47 + lockall + goto Route104_EventScript_1ED099 + end + +Route104_MapScript1_1ECC4E: @ 81ECC4E + call Route104_EventScript_271ED7 + call Route104_EventScript_1ECC78 + call Route104_EventScript_1ECC5E + end + +Route104_EventScript_1ECC5E:: @ 81ECC5E + checkflag FLAG_0x07F + goto_if 0, Route104_EventScript_1ECC74 + checkflag FLAG_BADGE03_GET + goto_if 0, Route104_EventScript_1ECC74 + clearflag FLAG_0x38A + return + +Route104_EventScript_1ECC74:: @ 81ECC74 + setflag FLAG_0x38A + return + +Route104_EventScript_1ECC78:: @ 81ECC78 + compare VAR_0x408E, 1 + goto_if 4, Route104_EventScript_1ECC9D + checkflag FLAG_0x120 + goto_eq Route104_EventScript_1ECC9D + checkflag FLAG_0x07C + goto_if 0, Route104_EventScript_1ECC9D + setobjectxyperm 34, 17, 52 + return + +Route104_EventScript_1ECC9D:: @ 81ECC9D + return + +Route104_EventScript_1ECC9E:: @ 81ECC9E + lockall + setvar VAR_0x8008, 1 + applymovement 34, Route104_Movement_27259E + waitmovement 0 + goto Route104_EventScript_1ECD33 + +Route104_EventScript_1ECCB3:: @ 81ECCB3 + lockall + setflag FLAG_0x32E + setvar VAR_0x405A, 8 + setvar VAR_0x4063, 2 + applymovement 255, Route104_Movement_2725A6 + waitmovement 0 + delay 10 + addobject 34 + clearflag FLAG_0x2CF + applymovement 255, Route104_Movement_1ECF86 + waitmovement 0 + applymovement 34, Route104_Movement_1ECF8A + waitmovement 0 + delay 20 + setvar VAR_0x8008, 0 + call Route104_EventScript_1E0DD1 + playse SE_PIN + applymovement 34, Route104_Movement_272598 + waitmovement 0 + applymovement 34, Route104_Movement_27259A + waitmovement 0 + goto Route104_EventScript_1ECD33 + +Route104_EventScript_1ECD11:: @ 81ECD11 + checkplayergender + compare VAR_RESULT, 0 + goto_eq Route104_EventScript_1ECD29 + compare VAR_RESULT, 1 + goto_eq Route104_EventScript_1ECD2E + return + +Route104_EventScript_1ECD29:: @ 81ECD29 + playbgm MUS_GIRL_SUP, 1 + return + +Route104_EventScript_1ECD2E:: @ 81ECD2E + playbgm MUS_BOY_SUP, 1 + return + +Route104_EventScript_1ECD33:: @ 81ECD33 + checkplayergender + compare VAR_RESULT, 0 + goto_eq Route104_EventScript_1ECD4B + compare VAR_RESULT, 1 + goto_eq Route104_EventScript_1ECE6F + end + +Route104_EventScript_1ECD4B:: @ 81ECD4B + checkflag FLAG_0x07D + goto_eq Route104_EventScript_1ECE1C + checkflag FLAG_0x07C + goto_eq Route104_EventScript_1ECDD0 + setflag FLAG_0x07C + msgbox Route104_Text_1EDBFF, 4 + closemessage + delay 30 + playfanfare MUS_ME_TORE_EYE + msgbox Route104_Text_1EDC8F, 4 + waitfanfare + closemessage + delay 30 + setflag FLAG_0x0FD + applymovement 255, Route104_Movement_1ECDCD + applymovement 34, Route104_Movement_1ECDC8 + msgbox Route104_Text_1EDCB1, 4 + closemessage + waitmovement 0 + applymovement 34, Route104_Movement_1ECDCA + waitmovement 0 + moveobjectoffscreen 34 + msgbox Route104_Text_1EDCED, 5 + compare VAR_RESULT, 1 + goto_eq Route104_EventScript_1ECDED + msgbox Route104_Text_1EDD2A, 4 + call Route104_EventScript_1ECE31 + releaseall + end + +Route104_Movement_1ECDC8: @ 81ECDC8 + walk_slow_left + step_end + +Route104_Movement_1ECDCA: @ 81ECDCA + walk_down + face_right + step_end + +Route104_Movement_1ECDCD: @ 81ECDCD + delay_4 + walk_in_place_fastest_left + step_end + +Route104_EventScript_1ECDD0:: @ 81ECDD0 + msgbox Route104_Text_1EDD9F, 5 + compare VAR_RESULT, 1 + goto_eq Route104_EventScript_1ECDED + msgbox Route104_Text_1EDD2A, 4 + releaseall + end + +Route104_EventScript_1ECDED:: @ 81ECDED + msgbox Route104_Text_1EDDDB, 4 + switch VAR_FIRST_POKE + case 0, Route104_EventScript_1ECE36 + case 1, Route104_EventScript_1ECE49 + case 2, Route104_EventScript_1ECE5C + end + +Route104_EventScript_1ECE1C:: @ 81ECE1C + msgbox Route104_Text_1EDE3E, 4 + compare VAR_0x8008, 0 + call_if 1, Route104_EventScript_1ECE31 + releaseall + end + +Route104_EventScript_1ECE31:: @ 81ECE31 + savebgm MUS_DUMMY + fadedefaultbgm + return + +Route104_EventScript_1ECE36:: @ 81ECE36 + trainerbattle 3, TRAINER_MAY_14, 0, Route104_Text_1EDE18 + setflag FLAG_0x07D + goto Route104_EventScript_1ECE1C + end + +Route104_EventScript_1ECE49:: @ 81ECE49 + trainerbattle 3, TRAINER_MAY_15, 0, Route104_Text_1EDE18 + setflag FLAG_0x07D + goto Route104_EventScript_1ECE1C + end + +Route104_EventScript_1ECE5C:: @ 81ECE5C + trainerbattle 3, TRAINER_MAY_10, 0, Route104_Text_1EDE18 + setflag FLAG_0x07D + goto Route104_EventScript_1ECE1C + end + +Route104_EventScript_1ECE6F:: @ 81ECE6F + checkflag FLAG_0x07D + goto_eq Route104_EventScript_1ECF38 + checkflag FLAG_0x07C + goto_eq Route104_EventScript_1ECEEC + setflag FLAG_0x07C + msgbox Route104_Text_1EDF04, 4 + closemessage + delay 30 + playfanfare MUS_ME_TORE_EYE + msgbox Route104_Text_1EDFA0, 4 + waitfanfare + closemessage + delay 30 + setflag FLAG_0x0FD + applymovement 255, Route104_Movement_1ECDCD + applymovement 34, Route104_Movement_1ECDC8 + msgbox Route104_Text_1EDFC6, 4 + closemessage + waitmovement 0 + applymovement 34, Route104_Movement_1ECDCA + waitmovement 0 + moveobjectoffscreen 34 + msgbox Route104_Text_1EE009, 5 + compare VAR_RESULT, 1 + goto_eq Route104_EventScript_1ECF09 + msgbox Route104_Text_1EE04D, 4 + call Route104_EventScript_1ECE31 + releaseall + end + +Route104_EventScript_1ECEEC:: @ 81ECEEC + msgbox Route104_Text_1EE094, 5 + compare VAR_RESULT, 1 + goto_eq Route104_EventScript_1ECF09 + msgbox Route104_Text_1EE04D, 4 + releaseall + end + +Route104_EventScript_1ECF09:: @ 81ECF09 + msgbox Route104_Text_1EE0C7, 4 + switch VAR_FIRST_POKE + case 0, Route104_EventScript_1ECF4D + case 1, Route104_EventScript_1ECF60 + case 2, Route104_EventScript_1ECF73 + end + +Route104_EventScript_1ECF38:: @ 81ECF38 + msgbox Route104_Text_1EE120, 4 + compare VAR_0x8008, 0 + call_if 1, Route104_EventScript_1ECE31 + releaseall + end + +Route104_EventScript_1ECF4D:: @ 81ECF4D + trainerbattle 3, TRAINER_BRENDAN_10, 0, Route104_Text_1EE107 + setflag FLAG_0x07D + goto Route104_EventScript_1ECF38 + end + +Route104_EventScript_1ECF60:: @ 81ECF60 + trainerbattle 3, TRAINER_BRENDAN_12, 0, Route104_Text_1EE107 + setflag FLAG_0x07D + goto Route104_EventScript_1ECF38 + end + +Route104_EventScript_1ECF73:: @ 81ECF73 + trainerbattle 3, TRAINER_BRENDAN_11, 0, Route104_Text_1EE107 + setflag FLAG_0x07D + goto Route104_EventScript_1ECF38 + end + +Route104_Movement_1ECF86: @ 81ECF86 + lock_facing_direction + walk_down + unlock_facing_direction + step_end + +Route104_Movement_1ECF8A: @ 81ECF8A + walk_down + step_end + +Route104_EventScript_1ECF8C:: @ 81ECF8C + lock + faceplayer + checkflag FLAG_0x0F6 + goto_eq Route104_EventScript_1ECFC3 + msgbox Route104_Text_2A6D86, 4 + giveitem_std ITEM_CHESTO_BERRY + compare VAR_RESULT, 0 + goto_eq Route104_EventScript_272054 + setflag FLAG_0x0F6 + msgbox Route104_Text_2A6E32, 4 + release + end + +Route104_EventScript_1ECFC3:: @ 81ECFC3 + msgbox Route104_Text_2A6E32, 4 + release + end + +Route104_EventScript_1ECFCD:: @ 81ECFCD + lock + faceplayer + checkflag FLAG_0x117 + goto_eq Route104_EventScript_1ECFFC + msgbox Route104_Text_1ED96A, 4 + giveitem_std ITEM_WHITE_HERB + compare VAR_RESULT, 0 + goto_eq Route104_EventScript_272054 + setflag FLAG_0x117 + release + end + +Route104_EventScript_1ECFFC:: @ 81ECFFC + msgbox Route104_Text_1EDA0F, 4 + release + end + +Route104_EventScript_1ED006:: @ 81ED006 + msgbox Route104_Text_1ED5EC, 2 + end + +Route104_EventScript_1ED00F:: @ 81ED00F + msgbox Route104_Text_1ED662, 3 + end + +Route104_EventScript_1ED018:: @ 81ED018 + msgbox Route104_Text_1EDA8C, 3 + end + +Route104_EventScript_1ED021:: @ 81ED021 + msgbox Route104_Text_1EDAA1, 3 + end + +Route104_EventScript_1ED02A:: @ 81ED02A + msgbox Route104_Text_1EDABC, 3 + end + +Route104_EventScript_1ED033:: @ 81ED033 + msgbox Route104_Text_1EDAD6, 3 + end + +Route104_EventScript_1ED03C:: @ 81ED03C + msgbox Route104_Text_1EDAEF, 3 + end + +Route104_EventScript_1ED045:: @ 81ED045 + msgbox Route104_Text_1ED6A2, 2 + end + +Route104_EventScript_1ED04E:: @ 81ED04E + msgbox Route104_Text_1ED735, 2 + end + +Route104_EventScript_1ED057:: @ 81ED057 + lock + faceplayer + checkflag FLAG_0x106 + goto_eq Route104_EventScript_1ED086 + msgbox Route104_Text_1ED838, 4 + giveitem_std ITEM_TM09 + compare VAR_RESULT, 0 + goto_eq Route104_EventScript_272054 + setflag FLAG_0x106 + release + end + +Route104_EventScript_1ED086:: @ 81ED086 + msgbox Route104_Text_1ED8E7, 4 + release + end + +Route104_EventScript_1ED090:: @ 81ED090 + msgbox Route104_Text_1ED7A2, 2 + end + +Route104_EventScript_1ED099:: @ 81ED099 + 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, MAP_ROUTE104 + call Route104_EventScript_2720A0 + checkflag FLAG_0x132 + goto_eq Route104_EventScript_1ED0D9 + checkflag FLAG_0x132 + goto_if 0, Route104_EventScript_1ED0EF + end + +Route104_EventScript_1ED0D9:: @ 81ED0D9 + applymovement 7, Route104_Movement_1ED28C + applymovement 255, Route104_Movement_1ED28C + waitmovement 0 + goto Route104_EventScript_1ED139 + +Route104_EventScript_1ED0EF:: @ 81ED0EF + applymovement 7, Route104_Movement_1ED1C8 + applymovement 255, Route104_Movement_1ED1C8 + waitmovement 0 + pokenavcall Route104_Text_1EE336 + waitmessage + delay 30 + playfanfare MUS_ME_TORE_EYE + msgbox Route104_Text_1EE463, 4 + waitfanfare + closemessage + delay 30 + setflag FLAG_0x132 + applymovement 255, Route104_Movement_1ED22A + applymovement 7, Route104_Movement_1ED22A, MAP_ROUTE104 + waitmovement 7, MAP_ROUTE104 + waitmovement 0 + goto Route104_EventScript_1ED139 + +Route104_EventScript_1ED139:: @ 81ED139 + delay 50 + applymovement 255, Route104_Movement_1ED353 + waitmovement 0 + call Route104_EventScript_2720A8 + showobjectat 255, MAP_DEWFORD_TOWN + applymovement 255, Route104_Movement_1ED355 + waitmovement 0 + setobjectxyperm 2, 12, 8 + addobject 2 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 + clearflag FLAG_0x2E4 + applymovement 2, Route104_Movement_1ED35C + waitmovement 0 + addobject 4 + clearflag FLAG_0x2E7 + call Route104_EventScript_2720A8 + setflag FLAG_0x2E6 + hideobjectat 7, MAP_ROUTE104 + copyvar VAR_0x4096, VAR_0x8008 + resetobjectpriority 255, MAP_ROUTE104 + resetobjectpriority 2, MAP_DEWFORD_TOWN + moveobjectoffscreen 2 + setvar VAR_0x408E, 0 + checkflag FLAG_0x0BD + goto_if 0, Route104_EventScript_1ED1B4 + checkflag FLAG_0x0BD + goto_eq Route104_EventScript_1ED1BE + end + +Route104_EventScript_1ED1B4:: @ 81ED1B4 + msgbox Route104_Text_1E9AAF, 4 + releaseall + end + +Route104_EventScript_1ED1BE:: @ 81ED1BE + msgbox Route104_Text_1E9C1D, 4 + releaseall + end + +Route104_Movement_1ED1C8: @ 81ED1C8 + 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 + 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 + 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 + walk_left + walk_down + walk_down + step_end + +Route104_Movement_1ED353: @ 81ED353 + walk_down + step_end + +Route104_Movement_1ED355: @ 81ED355 + walk_down + walk_left + walk_in_place_fastest_right + step_end + +Route104_Movement_1ED359: @ 81ED359 + walk_down + walk_down + step_end + +Route104_Movement_1ED35C: @ 81ED35C + walk_down + walk_in_place_fastest_left + step_end + +Route104_EventScript_1ED35F:: @ 81ED35F + trainerbattle 0, TRAINER_IVAN, 0, Route104_Text_2954BD, Route104_Text_295509 + msgbox Route104_Text_29554E, 6 + end + +Route104_EventScript_1ED376:: @ 81ED376 + trainerbattle 0, TRAINER_BILLY, 0, Route104_Text_29558A, Route104_Text_2955B4 + msgbox Route104_Text_2955E8, 6 + end + +Route104_EventScript_1ED38D:: @ 81ED38D + trainerbattle 2, TRAINER_HALEY_1, 0, Route104_Text_29563A, Route104_Text_29566F, Route104_EventScript_1ED3CE + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route104_EventScript_1ED424 + setvar VAR_0x8004, 604 + specialvar VAR_RESULT, sub_813B4E0 + compare VAR_RESULT, 0 + goto_eq Route104_EventScript_1ED3F8 + msgbox Route104_Text_295689, 4 + release + end + +Route104_EventScript_1ED3CE:: @ 81ED3CE + special sub_80B4808 + waitmovement 0 + checkflag FLAG_HAS_MATCH_CALL + goto_eq Route104_EventScript_1ED3DF + release + end + +Route104_EventScript_1ED3DF:: @ 81ED3DF + msgbox Route104_Text_29576B, 4 + setvar VAR_0x8004, 604 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 604 + callstd 8 + release + end + +Route104_EventScript_1ED3F8:: @ 81ED3F8 + checkflag FLAG_HAS_MATCH_CALL + goto_eq Route104_EventScript_1ED40B + msgbox Route104_Text_295689, 4 + release + end + +Route104_EventScript_1ED40B:: @ 81ED40B + msgbox Route104_Text_2956FF, 4 + setvar VAR_0x8004, 604 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 604 + callstd 8 + release + end + +Route104_EventScript_1ED424:: @ 81ED424 + trainerbattle 5, TRAINER_HALEY_1, 0, Route104_Text_2957D7, Route104_Text_2957F0 + msgbox Route104_Text_29580C, 6 + end + +Route104_EventScript_1ED43B:: @ 81ED43B + trainerbattle 2, TRAINER_WINSTON_1, 0, Route104_Text_295870, Route104_Text_2958AD, Route104_EventScript_1ED47C + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route104_EventScript_1ED4D2 + setvar VAR_0x8004, 136 + specialvar VAR_RESULT, sub_813B4E0 + compare VAR_RESULT, 0 + goto_eq Route104_EventScript_1ED4A6 + msgbox Route104_Text_2958C1, 4 + release + end + +Route104_EventScript_1ED47C:: @ 81ED47C + special sub_80B4808 + waitmovement 0 + checkflag FLAG_HAS_MATCH_CALL + goto_eq Route104_EventScript_1ED48D + release + end + +Route104_EventScript_1ED48D:: @ 81ED48D + msgbox Route104_Text_29595A, 4 + setvar VAR_0x8004, 136 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 136 + callstd 8 + release + end + +Route104_EventScript_1ED4A6:: @ 81ED4A6 + checkflag FLAG_HAS_MATCH_CALL + goto_eq Route104_EventScript_1ED4B9 + msgbox Route104_Text_2958C1, 4 + release + end + +Route104_EventScript_1ED4B9:: @ 81ED4B9 + msgbox Route104_Text_2958F8, 4 + setvar VAR_0x8004, 136 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 136 + callstd 8 + release + end + +Route104_EventScript_1ED4D2:: @ 81ED4D2 + trainerbattle 5, TRAINER_WINSTON_1, 0, Route104_Text_2959BC, Route104_Text_2959FC + msgbox Route104_Text_295A1E, 6 + end + +Route104_EventScript_1ED4E9:: @ 81ED4E9 + trainerbattle 2, TRAINER_CINDY_1, 0, Route104_Text_295A7E, Route104_Text_295ABB, Route104_EventScript_1ED52A + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route104_EventScript_1ED580 + setvar VAR_0x8004, 114 + specialvar VAR_RESULT, sub_813B4E0 + compare VAR_RESULT, 0 + goto_eq Route104_EventScript_1ED554 + msgbox Route104_Text_295AC3, 4 + release + end + +Route104_EventScript_1ED52A:: @ 81ED52A + special sub_80B4808 + waitmovement 0 + checkflag FLAG_HAS_MATCH_CALL + goto_eq Route104_EventScript_1ED53B + release + end + +Route104_EventScript_1ED53B:: @ 81ED53B + msgbox Route104_Text_295B60, 4 + setvar VAR_0x8004, 114 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 114 + callstd 8 + release + end + +Route104_EventScript_1ED554:: @ 81ED554 + checkflag FLAG_HAS_MATCH_CALL + goto_eq Route104_EventScript_1ED567 + msgbox Route104_Text_295AC3, 4 + release + end + +Route104_EventScript_1ED567:: @ 81ED567 + msgbox Route104_Text_295B01, 4 + setvar VAR_0x8004, 114 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 114 + callstd 8 + release + end + +Route104_EventScript_1ED580:: @ 81ED580 + trainerbattle 5, TRAINER_CINDY_1, 0, Route104_Text_295BC8, Route104_Text_295BFA + msgbox Route104_Text_295C1F, 6 + end + +Route104_EventScript_1ED597:: @ 81ED597 + trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_2952BB, Route104_Text_2952E6, Route104_Text_295330 + special GetPlayerBigGuyGirlString + msgbox Route104_Text_2952FE, 4 + release + end + +Route104_EventScript_1ED5B6:: @ 81ED5B6 + trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_2953AF, Route104_Text_2953E1, Route104_Text_295449 + special GetPlayerBigGuyGirlString + msgbox Route104_Text_29540D, 4 + release + end + +Route104_EventScript_1ED5D5:: @ 81ED5D5 + trainerbattle 0, TRAINER_DARIAN, 0, Route104_Text_295C5D, Route104_Text_295CC9 + msgbox Route104_Text_295CD3, 6 + end + +Route104_Text_1ED5EC: @ 81ED5EC + .string "That seaside cottage is where\n" + .string "MR. BRINEY lives.\p" + .string "He was once a mighty sailor who never\n" + .string "feared the sea, however stormy.$" + +Route104_Text_1ED662: @ 81ED662 + .string "The sea, huh?\p" + .string "I wonder what it’s like at the bottom\n" + .string "of the sea?$" + +Route104_Text_1ED6A2: @ 81ED6A2 + .string "If you’re going to throw a POKé BALL,\n" + .string "weaken the wild POKéMON first.\p" + .string "It will be easier to catch if it’s been\n" + .string "poisoned, burned, or lulled to sleep.$" + +Route104_Text_1ED735: @ 81ED735 + .string "You’re a thief if you try to steal\n" + .string "someone else’s POKéMON.\p" + .string "You should throw POKé BALLS only at\n" + .string "wild POKéMON.$" + +Route104_Text_1ED7A2: @ 81ED7A2 + .string "Oh, no, I’m not a TRAINER.\p" + .string "But that’s right, if TRAINERS lock eyes,\n" + .string "it’s a challenge to battle.\p" + .string "If you don’t want to battle, stay out\n" + .string "of their sight.$" + +Route104_Text_1ED838: @ 81ED838 + .string "I like filling my mouth with seeds,\n" + .string "then spitting them out fast!\p" + .string "You can have this, so you try it out!\p" + .string "Use it on a POKéMON, and it will learn\n" + .string "a move for firing seeds rapidly.$" + +Route104_Text_1ED8E7: @ 81ED8E7 + .string "A word of advice!\p" + .string "A TM, TECHNICAL MACHINE, is good only\n" + .string "for one-time use.\p" + .string "Once you use it, it’s gone.\n" + .string "Think twice before using it!$" + +Route104_Text_1ED96A: @ 81ED96A + .string "This FLOWER SHOP started selling\n" + .string "saplings recently.\p" + .string "It made me so happy, I went overboard\n" + .string "shopping.\p" + .string "I don’t need this WHITE HERB anymore.\n" + .string "Would you take it, please?$" + +Route104_Text_1EDA0F: @ 81EDA0F + .string "This FLOWER SHOP started selling\n" + .string "saplings recently.\p" + .string "It made me so happy, I went overboard\n" + .string "shopping. Where should I put them?$" + +Route104_Text_1EDA8C: @ 81EDA8C + .string "MR. BRINEY’S COTTAGE$" + +Route104_Text_1EDAA1: @ 81EDAA1 + .string "ROUTE 1O4\n" + .string "{0x7C} PETALBURG CITY$" + +Route104_Text_1EDABC: @ 81EDABC + .string "ROUTE 1O4\n" + .string "{0x79} RUSTBORO CITY$" + +Route104_Text_1EDAD6: @ 81EDAD6 + .string "PRETTY PETAL FLOWER SHOP$" + +Route104_Text_1EDAEF: @ 81EDAEF + .string "TRAINER TIPS\p" + .string "In the HOENN region there are pairs\n" + .string "of TRAINERS who challenge others\l" + .string "for 2-on-2 POKéMON battles called\l" + .string "DOUBLE BATTLES.\p" + .string "In a DOUBLE BATTLE, the TRAINER must\n" + .string "send out two POKéMON, the one at the\l" + .string "left of the list and the top one.\l" + .string "Watch how POKéMON are lined up.$" + +Route104_Text_1EDBFF: @ 81EDBFF + .string "MAY: Oh, hi, {PLAYER}{KUN}!\p" + .string "DEVON upgraded your POKéNAV with\n" + .string "the MATCH CALL system, huh?\p" + .string "We should register each other so we\n" + .string "can get in contact anytime.$" + +Route104_Text_1EDC8F: @ 81EDC8F + .string "{PLAYER} registered MAY\n" + .string "in the POKéNAV.$" + +Route104_Text_1EDCB1: @ 81EDCB1 + .string "MAY: Oh, by the way, {PLAYER}{KUN},\n" + .string "how’s your POKéDEX coming along?$" + +Route104_Text_1EDCED: @ 81EDCED + .string "Mine’s looking pretty decent.\n" + .string "So…\l" + .string "How about a little battle?$" + +Route104_Text_1EDD2A: @ 81EDD2A + .string "MAY: Oh, what’s the matter?\p" + .string "Haven’t you caught or raised your\n" + .string "POKéMON very much?\p" + .string "That’s not very good for a TRAINER!$" + +Route104_Text_1EDD9F: @ 81EDD9F + .string "MAY: So, what do you think?\n" + .string "How about a little battle here?$" + +Route104_Text_1EDDDB: @ 81EDDDB + .string "MAY: You just became a TRAINER,\n" + .string "{PLAYER}{KUN}. I’m not going to lose!$" + +Route104_Text_1EDE18: @ 81EDE18 + .string "Yikes!\n" + .string "You’re better than I expected!$" + +Route104_Text_1EDE3E: @ 81EDE3E + .string "MAY: I can tell you’ve gotten pretty\n" + .string "good with the way you handle POKéMON.\p" + .string "But instead of only making them\n" + .string "battle, you should be like MR. BRINEY.\p" + .string "It’s important to become friends with\n" + .string "POKéMON, too.$" + +Route104_Text_1EDF04: @ 81EDF04 + .string "BRENDAN: Oh, hey, {PLAYER}!\p" + .string "Cool, you had DEVON install the MATCH\n" + .string "CALL system on your POKéNAV!\p" + .string "Let’s register each other in our\n" + .string "POKéNAVS so we can keep in touch.$" + +Route104_Text_1EDFA0: @ 81EDFA0 + .string "{PLAYER} registered BRENDAN\n" + .string "in the POKéNAV.$" + +Route104_Text_1EDFC6: @ 81EDFC6 + .string "BRENDAN: {PLAYER}, how’s your POKéDEX?\n" + .string "Have you filled in any pages yet?$" + +Route104_Text_1EE009: @ 81EE009 + .string "Me, I’m doing great!\p" + .string "Want to check out how good I am with\n" + .string "a battle?$" + +Route104_Text_1EE04D: @ 81EE04D + .string "BRENDAN: What’s the matter? Don’t have\n" + .string "any confidence in your POKéMON?$" + +Route104_Text_1EE094: @ 81EE094 + .string "BRENDAN: What’s up?\n" + .string "Want to have a battle with me?$" + +Route104_Text_1EE0C7: @ 81EE0C7 + .string "BRENDAN: I know you just became\n" + .string "a TRAINER, but I won’t go easy!$" + +Route104_Text_1EE107: @ 81EE107 + .string "Hmm…\n" + .string "You’re pretty good.$" + +Route104_Text_1EE120: @ 81EE120 + .string "BRENDAN: You’ve gotten pretty decent\n" + .string "at handling POKéMON.\p" + .string "But, you know, you shouldn’t just be\n" + .string "making POKéMON battle.\p" + .string "Like MR. BRINEY, it’s important to\n" + .string "become friends with your POKéMON.$" + diff --git a/data/maps/Route104_MrBrineysHouse/events.inc b/data/maps/Route104_MrBrineysHouse/events.inc new file mode 100644 index 000000000..9eccc2286 --- /dev/null +++ b/data/maps/Route104_MrBrineysHouse/events.inc @@ -0,0 +1,11 @@ +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 + +Route104_MrBrineysHouse_MapWarps: @ 8533B04 + 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/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc new file mode 100644 index 000000000..1721fa4a0 --- /dev/null +++ b/data/maps/Route104_MrBrineysHouse/scripts.inc @@ -0,0 +1,166 @@ +Route104_MrBrineysHouse_MapScripts:: @ 8229D2E + map_script 3, Route104_MrBrineysHouse_MapScript1_229D34 + .byte 0 + +Route104_MrBrineysHouse_MapScript1_229D34: @ 8229D34 + setflag FLAG_LANDMARK_MR_BRINEY_HOUSE + compare VAR_0x4090, 1 + call_if 1, Route104_MrBrineysHouse_EventScript_229D50 + checkflag FLAG_0x0BC + call_if 1, Route104_MrBrineysHouse_EventScript_229D4C + end + +Route104_MrBrineysHouse_EventScript_229D4C:: @ 8229D4C + setflag FLAG_0x32E + return + +Route104_MrBrineysHouse_EventScript_229D50:: @ 8229D50 + setobjectxyperm 1, 9, 3 + setobjectmovementtype 1, 50 + setobjectxyperm 2, 9, 6 + setobjectmovementtype 2, 51 + return + +Route104_MrBrineysHouse_EventScript_229D67:: @ 8229D67 + lock + faceplayer + checkflag FLAG_0x093 + call_if 0, Route104_MrBrineysHouse_EventScript_229D8A + checkflag FLAG_0x0BD + goto_if 0, Route104_MrBrineysHouse_EventScript_229DE1 + checkflag FLAG_0x095 + goto_if 0, Route104_MrBrineysHouse_EventScript_229DFA + goto Route104_MrBrineysHouse_EventScript_229DAE + end + +Route104_MrBrineysHouse_EventScript_229D8A:: @ 8229D8A + setflag FLAG_0x093 + msgbox Route104_MrBrineysHouse_Text_229E70, 4 + msgbox Route104_MrBrineysHouse_Text_229E9B, 5 + compare VAR_RESULT, 0 + goto_eq Route104_MrBrineysHouse_EventScript_229E13 + goto Route104_MrBrineysHouse_EventScript_229E27 + end + +Route104_MrBrineysHouse_EventScript_229DAE:: @ 8229DAE + message Route104_MrBrineysHouse_Text_22A268 + waitmessage + multichoicedefault 20, 8, 14, 1, 0 + switch VAR_RESULT + case 0, Route104_MrBrineysHouse_EventScript_229E27 + case 1, Route104_MrBrineysHouse_EventScript_229E1D + case 127, Route104_MrBrineysHouse_EventScript_229E1D + end + +Route104_MrBrineysHouse_EventScript_229DE1:: @ 8229DE1 + msgbox Route104_MrBrineysHouse_Text_22A0AD, 5 + compare VAR_RESULT, 0 + goto_eq Route104_MrBrineysHouse_EventScript_229E13 + goto Route104_MrBrineysHouse_EventScript_229E27 + end + +Route104_MrBrineysHouse_EventScript_229DFA:: @ 8229DFA + msgbox Route104_MrBrineysHouse_Text_22A18F, 5 + compare VAR_RESULT, 0 + goto_eq Route104_MrBrineysHouse_EventScript_229E13 + goto Route104_MrBrineysHouse_EventScript_229E27 + end + +Route104_MrBrineysHouse_EventScript_229E13:: @ 8229E13 + msgbox Route104_MrBrineysHouse_Text_22A041, 4 + release + end + +Route104_MrBrineysHouse_EventScript_229E1D:: @ 8229E1D + msgbox Route104_MrBrineysHouse_Text_22A2C3, 4 + release + end + +Route104_MrBrineysHouse_EventScript_229E27:: @ 8229E27 + msgbox Route104_MrBrineysHouse_Text_229FE9, 4 + call Route104_MrBrineysHouse_EventScript_271E95 + setvar VAR_0x408E, 1 + clearflag FLAG_0x2E2 + setflag FLAG_0x2E3 + setflag FLAG_0x371 + setvar VAR_0x405A, 8 + setvar VAR_0x4063, 2 + setflag FLAG_0x32E + setflag FLAG_0x2CF + warp MAP_ROUTE104, 255, 13, 51 + waitstate + releaseall + end + +Route104_MrBrineysHouse_EventScript_229E5D:: @ 8229E5D + lock + faceplayer + waitse + playmoncry SPECIES_WINGULL, 0 + msgbox Route104_MrBrineysHouse_Text_22A337, 4 + waitmoncry + release + end + +Route104_MrBrineysHouse_Text_229E70: @ 8229E70 + .string "MR. BRINEY: Hold on, lass!\n" + .string "Wait up, PEEKO!$" + +Route104_MrBrineysHouse_Text_229E9B: @ 8229E9B + .string "Hm? You’re {PLAYER}{KUN}!\n" + .string "You saved my darling PEEKO!\l" + .string "We owe so much to you!\p" + .string "What’s that?\n" + .string "You want to sail with me?\p" + .string "Hmhm…\p" + .string "You have a LETTER bound for DEWFORD\n" + .string "and a package for SLATEPORT, then?\p" + .string "Quite the busy life you must lead!\p" + .string "But, certainly, what you’re asking is\n" + .string "no problem at all.\p" + .string "You’ve come to the right man!\n" + .string "We’ll set sail for DEWFORD.$" + +Route104_MrBrineysHouse_Text_229FE9: @ 8229FE9 + .string "MR. BRINEY: DEWFORD it is, then!\p" + .string "Anchors aweigh!\n" + .string "PEEKO, we’re setting sail, my darling!$" + +Route104_MrBrineysHouse_Text_22A041: @ 822A041 + .string "MR. BRINEY: Is that so?\n" + .string "Your deliveries can wait?\p" + .string "You just go on and tell me whenever\n" + .string "you want to set sail!$" + +Route104_MrBrineysHouse_Text_22A0AD: @ 822A0AD + .string "MR. BRINEY: Ahoy!\n" + .string "I know exactly what you want to say!\p" + .string "You’re to deliver a LETTER to DEWFORD\n" + .string "and a package to SLATEPORT.\p" + .string "What you need me to do is no problem\n" + .string "at all--I’m the man for the job!\p" + .string "First, we’ll set sail for DEWFORD.$" + +Route104_MrBrineysHouse_Text_22A18F: @ 822A18F + .string "MR. BRINEY: Ahoy!\n" + .string "I know exactly what you want to say!\p" + .string "You’re to deliver a package to\n" + .string "CAPT. STERN in SLATEPORT.\p" + .string "What you need me to do is no problem\n" + .string "at all--I’m the man for the job!\p" + .string "First, we’ll set sail for DEWFORD.$" + +Route104_MrBrineysHouse_Text_22A268: @ 822A268 + .string "MR. BRINEY: Ahoy!\n" + .string "For you, I’ll go out to sea anytime!\p" + .string "Now, my friend, where are we bound?$" + +Route104_MrBrineysHouse_Text_22A2C3: @ 822A2C3 + .string "MR. BRINEY: Is that so?\n" + .string "Well, PEEKO owes her life to you.\p" + .string "You just go on and tell me whenever\n" + .string "you want to set sail!$" + +Route104_MrBrineysHouse_Text_22A337: @ 822A337 + .string "PEEKO: Pii piihyoro!$" + diff --git a/data/maps/Route104_PrettyPetalFlowerShop/events.inc b/data/maps/Route104_PrettyPetalFlowerShop/events.inc new file mode 100644 index 000000000..025daad04 --- /dev/null +++ b/data/maps/Route104_PrettyPetalFlowerShop/events.inc @@ -0,0 +1,12 @@ +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 + +Route104_PrettyPetalFlowerShop_MapWarps: @ 8533B70 + 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/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc new file mode 100644 index 000000000..5142a1282 --- /dev/null +++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc @@ -0,0 +1,110 @@ +Route104_PrettyPetalFlowerShop_MapScripts:: @ 822A34C + map_script 3, Route104_PrettyPetalFlowerShop_MapScript1_22A352 + .byte 0 + +Route104_PrettyPetalFlowerShop_MapScript1_22A352: @ 822A352 + setflag FLAG_LANDMARK_FLOWER_SHOP + checkflag FLAG_0x07F + goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_22A36B + checkflag FLAG_BADGE03_GET + goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_22A36B + setflag FLAG_0x001 + end + +Route104_PrettyPetalFlowerShop_EventScript_22A36B:: @ 822A36B + setobjectxyperm 1, 4, 6 + end + +Route104_PrettyPetalFlowerShop_EventScript_22A373:: @ 822A373 + lock + faceplayer + checkflag FLAG_0x001 + goto_eq Route104_PrettyPetalFlowerShop_EventScript_22A3E4 + msgbox Route104_PrettyPetalFlowerShop_Text_2A7686, 4 + checkflag FLAG_0x07F + goto_eq Route104_PrettyPetalFlowerShop_EventScript_22A3B2 + setflag FLAG_0x07F + msgbox Route104_PrettyPetalFlowerShop_Text_2A7706, 5 + compare VAR_RESULT, 1 + call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3D2 + compare VAR_RESULT, 0 + call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3DB + release + end + +Route104_PrettyPetalFlowerShop_EventScript_22A3B2:: @ 822A3B2 + msgbox Route104_PrettyPetalFlowerShop_Text_2A76D9, 5 + compare VAR_RESULT, 1 + call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3D2 + compare VAR_RESULT, 0 + call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3DB + release + end + +Route104_PrettyPetalFlowerShop_EventScript_22A3D2:: @ 822A3D2 + msgbox Route104_PrettyPetalFlowerShop_Text_2A775B, 4 + return + +Route104_PrettyPetalFlowerShop_EventScript_22A3DB:: @ 822A3DB + msgbox Route104_PrettyPetalFlowerShop_Text_2A78DF, 4 + return + +Route104_PrettyPetalFlowerShop_EventScript_22A3E4:: @ 822A3E4 + message gUnknown_08272A52 + waitmessage + pokemartdecoration2 Route104_PrettyPetalFlowerShop_Pokemart_22A3FC + msgbox gUnknown_08272A3F, 4 + release + end + + .align 2 +Route104_PrettyPetalFlowerShop_Pokemart_22A3FC: @ 822A3FC + .2byte ITEM_FULL_RESTORE + .2byte ITEM_MAX_POTION + .2byte ITEM_HYPER_POTION + .2byte ITEM_SUPER_POTION + .2byte ITEM_FULL_HEAL + .2byte ITEM_REVIVE + .2byte ITEM_NONE + release + end + +Route104_PrettyPetalFlowerShop_EventScript_22A40C:: @ 822A40C + lock + faceplayer + checkflag FLAG_0x05E + goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_22A421 + msgbox Route104_PrettyPetalFlowerShop_Text_2A79A6, 4 + release + end + +Route104_PrettyPetalFlowerShop_EventScript_22A421:: @ 822A421 + msgbox Route104_PrettyPetalFlowerShop_Text_2A7916, 4 + giveitem_std ITEM_WAILMER_PAIL + msgbox Route104_PrettyPetalFlowerShop_Text_2A79A6, 4 + setflag FLAG_0x05E + release + end + +Route104_PrettyPetalFlowerShop_EventScript_22A442:: @ 822A442 + lock + faceplayer + dodailyevents + checkflag FLAG_0x930 + goto_eq Route104_PrettyPetalFlowerShop_EventScript_22A482 + msgbox Route104_PrettyPetalFlowerShop_Text_2A7A98, 4 + random 8 + addvar VAR_RESULT, 133 + giveitem_std VAR_RESULT + compare VAR_RESULT, 0 + goto_eq Route104_PrettyPetalFlowerShop_EventScript_272054 + setflag FLAG_0x930 + msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, 4 + release + end + +Route104_PrettyPetalFlowerShop_EventScript_22A482:: @ 822A482 + msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, 4 + release + end + diff --git a/data/maps/Route104_Prototype/events.inc b/data/maps/Route104_Prototype/events.inc new file mode 100644 index 000000000..08976e5a8 --- /dev/null +++ b/data/maps/Route104_Prototype/events.inc @@ -0,0 +1,3 @@ +Route104_Prototype_MapEvents:: @ 853DDC0 + map_events 0x0, 0x0, 0x0, 0x0 + diff --git a/data/maps/Route104_Prototype/scripts.inc b/data/maps/Route104_Prototype/scripts.inc new file mode 100644 index 000000000..d8274fffc --- /dev/null +++ b/data/maps/Route104_Prototype/scripts.inc @@ -0,0 +1,3 @@ +Route104_Prototype_MapScripts:: @ 82693F2 + .byte 0 + diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc new file mode 100644 index 000000000..e66b3c841 --- /dev/null +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc @@ -0,0 +1,3 @@ +Route104_PrototypePrettyPetalFlowerShop_MapEvents:: @ 853DDD4 + map_events 0x0, 0x0, 0x0, 0x0 + diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc new file mode 100644 index 000000000..bacbad7e9 --- /dev/null +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc @@ -0,0 +1,3 @@ +Route104_PrototypePrettyPetalFlowerShop_MapScripts:: @ 82693F3 + .byte 0 + diff --git a/data/maps/Route105/events.inc b/data/maps/Route105/events.inc new file mode 100644 index 000000000..bbe9cf73b --- /dev/null +++ b/data/maps/Route105/events.inc @@ -0,0 +1,20 @@ +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 + +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 + +Route105_MapEvents:: @ 85287D0 + map_events Route105_EventObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents + diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc new file mode 100644 index 000000000..3cb6d9ae6 --- /dev/null +++ b/data/maps/Route105/scripts.inc @@ -0,0 +1,107 @@ +Route105_MapScripts:: @ 81EE1DB + map_script 1, Route105_MapScript1_1EE1EB + map_script 3, Route105_MapScript1_1EE21E + map_script 2, Route105_MapScript2_1EE240 + .byte 0 + +Route105_MapScript1_1EE1EB: @ 81EE1EB + checkflag FLAG_0x0E4 + call_if 0, Route105_EventScript_1EE20B + compare VAR_0x4037, 9 + call_if 1, Route105_EventScript_2739AB + compare VAR_0x4037, 10 + call_if 1, Route105_EventScript_273A18 + end + +Route105_EventScript_1EE20B:: @ 81EE20B + setmetatile 9, 19, 124, 1 + setmetatile 9, 20, 145, 1 + return + +Route105_MapScript1_1EE21E: @ 81EE21E + compare VAR_0x4039, 1 + call_if 1, Route105_EventScript_273D13 + compare VAR_0x4037, 9 + call_if 1, Route105_EventScript_273D17 + compare VAR_0x4037, 10 + call_if 1, Route105_EventScript_273D17 + end + +Route105_MapScript2_1EE240: @ 81EE240 + map_script_2 VAR_0x4039, 1, gUnknown_08273D1F + .2byte 0 + +Route105_EventScript_1EE24A:: @ 81EE24A + trainerbattle 0, TRAINER_FOSTER, 0, Route105_Text_295D0F, Route105_Text_295D62 + msgbox Route105_Text_295DAB, 6 + end + +Route105_EventScript_1EE261:: @ 81EE261 + trainerbattle 0, TRAINER_LUIS, 0, Route105_Text_295DF5, Route105_Text_295E66 + msgbox Route105_Text_295E72, 6 + end + +Route105_EventScript_1EE278:: @ 81EE278 + trainerbattle 0, TRAINER_DOMINIK, 0, Route105_Text_295EB7, Route105_Text_295EEA + msgbox Route105_Text_295F08, 6 + end + +Route105_EventScript_1EE28F:: @ 81EE28F + trainerbattle 0, TRAINER_BEVERLY, 0, Route105_Text_295F5C, Route105_Text_295FA0 + msgbox Route105_Text_295FAE, 6 + end + +Route105_EventScript_1EE2A6:: @ 81EE2A6 + trainerbattle 0, TRAINER_IMANI, 0, Route105_Text_296025, Route105_Text_296059 + msgbox Route105_Text_296076, 6 + end + +Route105_EventScript_1EE2BD:: @ 81EE2BD + trainerbattle 0, TRAINER_JOSUE, 0, Route105_Text_29626F, Route105_Text_2962CB + msgbox Route105_Text_2962EC, 6 + end + +Route105_EventScript_1EE2D4:: @ 81EE2D4 + trainerbattle 2, TRAINER_ANDRES_1, 0, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route105_EventScript_1EE31F + msgbox Route105_Text_2960FA, 4 + release + end + +Route105_EventScript_1EE300:: @ 81EE300 + special sub_80B4808 + waitmovement 0 + msgbox Route105_Text_296159, 4 + setvar VAR_0x8004, 737 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 737 + callstd 8 + release + end + +Route105_EventScript_1EE31F:: @ 81EE31F + trainerbattle 5, TRAINER_ANDRES_1, 0, Route105_Text_29619E, Route105_Text_2961DD + msgbox Route105_Text_2961FE, 6 + end + +Route104_Text_1EE336: @ 81EE336 + .string "… … … … … …\n" + .string "… … … … … Beep!\p" + .string "DAD: Oh, {PLAYER}?\p" + .string "… … … … … …\n" + .string "Where are you now?\l" + .string "It sounds windy wherever you are.\p" + .string "I just heard from DEVON’s MR. STONE\n" + .string "about your POKéNAV, so I decided\l" + .string "to give you a call.\p" + .string "It sounds like you’re doing fine,\n" + .string "so that’s fine with me.\p" + .string "You take care now.\p" + .string "… … … … … …\n" + .string "… … … … … Click!$" + +Route104_Text_1EE463: @ 81EE463 + .string "Registered DAD NORMAN\n" + .string "in the POKéNAV.$" diff --git a/data/maps/Route106/events.inc b/data/maps/Route106/events.inc new file mode 100644 index 000000000..8fdbaad5f --- /dev/null +++ b/data/maps/Route106/events.inc @@ -0,0 +1,19 @@ +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 + +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 + +Route106_MapEvents:: @ 8528894 + map_events Route106_EventObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents + diff --git a/data/maps/Route106/scripts.inc b/data/maps/Route106/scripts.inc new file mode 100644 index 000000000..fdfff0587 --- /dev/null +++ b/data/maps/Route106/scripts.inc @@ -0,0 +1,52 @@ +Route106_MapScripts:: @ 81EE489 + .byte 0 + +Route106_EventScript_1EE48A:: @ 81EE48A + msgbox Route106_Text_1EE53A, 3 + end + +Route106_EventScript_1EE493:: @ 81EE493 + trainerbattle 0, TRAINER_DOUGLAS, 0, Route106_Text_2965BB, Route106_Text_2965FD + msgbox Route106_Text_296608, 6 + end + +Route106_EventScript_1EE4AA:: @ 81EE4AA + trainerbattle 0, TRAINER_KYLA, 0, Route106_Text_296628, Route106_Text_296674 + msgbox Route106_Text_29669E, 6 + end + +Route106_EventScript_1EE4C1:: @ 81EE4C1 + trainerbattle 2, TRAINER_ELLIOT_1, 0, Route106_Text_296327, Route106_Text_29635C, Route106_EventScript_1EE4ED + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route106_EventScript_1EE50C + msgbox Route106_Text_29638C, 4 + release + end + +Route106_EventScript_1EE4ED:: @ 81EE4ED + special sub_80B4808 + waitmovement 0 + msgbox Route106_Text_2963E3, 4 + setvar VAR_0x8004, 339 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 339 + callstd 8 + release + end + +Route106_EventScript_1EE50C:: @ 81EE50C + trainerbattle 5, TRAINER_ELLIOT_1, 0, Route106_Text_29642E, Route106_Text_296477 + msgbox Route106_Text_296493, 6 + end + +Route106_EventScript_1EE523:: @ 81EE523 + trainerbattle 0, TRAINER_NED, 0, Route106_Text_2964D4, Route106_Text_296553 + msgbox Route106_Text_296588, 6 + end + +Route106_Text_1EE53A: @ 81EE53A + .string "TRAINER TIPS\p" + .string "Advice on catching POKéMON with a ROD:\n" + .string "Press the A Button if you get a bite.$" + diff --git a/data/maps/Route107/events.inc b/data/maps/Route107/events.inc new file mode 100644 index 000000000..f748e2ff9 --- /dev/null +++ b/data/maps/Route107/events.inc @@ -0,0 +1,12 @@ +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 + +Route107_MapEvents:: @ 8528950 + map_events Route107_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/Route107/scripts.inc b/data/maps/Route107/scripts.inc new file mode 100644 index 000000000..2c8364592 --- /dev/null +++ b/data/maps/Route107/scripts.inc @@ -0,0 +1,58 @@ +Route107_MapScripts:: @ 81EE594 + .byte 0 + +Route107_EventScript_1EE595:: @ 81EE595 + trainerbattle 0, TRAINER_DARRIN, 0, Route107_Text_2966E5, Route107_Text_29672F + msgbox Route107_Text_29675B, 6 + end + +Route107_EventScript_1EE5AC:: @ 81EE5AC + trainerbattle 2, TRAINER_TONY_1, 0, Route107_Text_2967AD, Route107_Text_2967D8, Route107_EventScript_1EE5D8 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route107_EventScript_1EE5F7 + msgbox Route107_Text_2967FF, 4 + release + end + +Route107_EventScript_1EE5D8:: @ 81EE5D8 + special sub_80B4808 + waitmovement 0 + msgbox Route107_Text_29685A, 4 + setvar VAR_0x8004, 155 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 155 + callstd 8 + release + end + +Route107_EventScript_1EE5F7:: @ 81EE5F7 + trainerbattle 5, TRAINER_TONY_1, 0, Route107_Text_296897, Route107_Text_2968D5 + msgbox Route107_Text_296923, 6 + end + +Route107_EventScript_1EE60E:: @ 81EE60E + trainerbattle 0, TRAINER_DENISE, 0, Route107_Text_296974, Route107_Text_29699E + msgbox Route107_Text_2969AB, 6 + end + +Route107_EventScript_1EE625:: @ 81EE625 + trainerbattle 0, TRAINER_BETH, 0, Route107_Text_2969E4, Route107_Text_296A17 + msgbox Route107_Text_296A35, 6 + end + +Route107_EventScript_1EE63C:: @ 81EE63C + trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_296A77, Route107_Text_296AA7, Route107_Text_296B1E + msgbox Route107_Text_296ADC, 6 + end + +Route107_EventScript_1EE657:: @ 81EE657 + trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_296B57, Route107_Text_296BB3, Route107_Text_296C34 + msgbox Route107_Text_296BE1, 6 + end + +Route107_EventScript_1EE672:: @ 81EE672 + trainerbattle 0, TRAINER_CAMRON, 0, Route107_Text_296C6F, Route107_Text_296CAD + msgbox Route107_Text_296CC0, 6 + end + diff --git a/data/maps/Route108/events.inc b/data/maps/Route108/events.inc new file mode 100644 index 000000000..0a0b448c4 --- /dev/null +++ b/data/maps/Route108/events.inc @@ -0,0 +1,18 @@ +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 + +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 + +Route108_MapEvents:: @ 8528A20 + map_events Route108_EventObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents + diff --git a/data/maps/Route108/scripts.inc b/data/maps/Route108/scripts.inc new file mode 100644 index 000000000..25657c5a4 --- /dev/null +++ b/data/maps/Route108/scripts.inc @@ -0,0 +1,53 @@ +Route108_MapScripts:: @ 81EE689 + .byte 0 + +Route108_EventScript_1EE68A:: @ 81EE68A + trainerbattle 0, TRAINER_JEROME, 0, Route108_Text_296D10, Route108_Text_296D3C + msgbox Route108_Text_296D6E, 6 + end + +Route108_EventScript_1EE6A1:: @ 81EE6A1 + trainerbattle 0, TRAINER_MATTHEW, 0, Route108_Text_296DAF, Route108_Text_296DEA + msgbox Route108_Text_296E03, 6 + end + +Route108_EventScript_1EE6B8:: @ 81EE6B8 + trainerbattle 0, TRAINER_TARA, 0, Route108_Text_296E33, Route108_Text_296E71 + msgbox Route108_Text_296E7A, 6 + end + +Route108_EventScript_1EE6CF:: @ 81EE6CF + trainerbattle 0, TRAINER_MISSY, 0, Route108_Text_296EC7, Route108_Text_296EFC + msgbox Route108_Text_296F2A, 6 + end + +Route108_EventScript_1EE6E6:: @ 81EE6E6 + trainerbattle 0, TRAINER_CAROLINA, 0, Route108_Text_297094, Route108_Text_2970D7 + msgbox Route108_Text_2970F0, 6 + end + +Route108_EventScript_1EE6FD:: @ 81EE6FD + trainerbattle 2, TRAINER_CORY_1, 0, Route108_Text_296F5D, Route108_Text_296F93, Route108_EventScript_1EE729 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route108_EventScript_1EE748 + msgbox Route108_Text_296FB0, 4 + release + end + +Route108_EventScript_1EE729:: @ 81EE729 + special sub_80B4808 + waitmovement 0 + msgbox Route108_Text_296FD8, 4 + setvar VAR_0x8004, 740 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 740 + callstd 8 + release + end + +Route108_EventScript_1EE748:: @ 81EE748 + trainerbattle 5, TRAINER_CORY_1, 0, Route108_Text_297011, Route108_Text_297036 + msgbox Route108_Text_297059, 6 + end + diff --git a/data/maps/Route109/events.inc b/data/maps/Route109/events.inc new file mode 100644 index 000000000..1d847897d --- /dev/null +++ b/data/maps/Route109/events.inc @@ -0,0 +1,42 @@ +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 + +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 + +Route109_MapEvents:: @ 8528CDC + map_events Route109_EventObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents + diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc new file mode 100644 index 000000000..84f7b7c34 --- /dev/null +++ b/data/maps/Route109/scripts.inc @@ -0,0 +1,573 @@ +Route109_MapScripts:: @ 81EE75F + .byte 0 + +Route109_EventScript_1EE760:: @ 81EE760 + call Route109_EventScript_271E95 + setobjectpriority 2, MAP_ROUTE109, 0 + setobjectpriority 255, MAP_ROUTE109, 0 + applymovement 2, Route109_Movement_1EE90B + waitmovement 0 + removeobject 2 + switch VAR_FACING + case 1, Route109_EventScript_1EE7A5 + case 3, Route109_EventScript_1EE7C5 + case 4, Route109_EventScript_1EE7B5 + end + +Route109_EventScript_1EE7A5:: @ 81EE7A5 + applymovement 255, Route109_Movement_1EE8FD + waitmovement 0 + goto Route109_EventScript_1EE7D5 + end + +Route109_EventScript_1EE7B5:: @ 81EE7B5 + applymovement 255, Route109_Movement_1EE905 + waitmovement 0 + goto Route109_EventScript_1EE7D5 + end + +Route109_EventScript_1EE7C5:: @ 81EE7C5 + applymovement 255, Route109_Movement_1EE908 + waitmovement 0 + goto Route109_EventScript_1EE7D5 + end + +Route109_EventScript_1EE7D5:: @ 81EE7D5 + 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, MAP_DEWFORD_TOWN + applymovement 255, Route109_Movement_1EE900 + waitmovement 0 + addobject 4 + clearflag FLAG_0x2E7 + setobjectxyperm 2, 12, 8 + addobject 2 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 + applymovement 2, Route109_Movement_1EE90D + waitmovement 0 + clearflag FLAG_0x2E4 + setflag FLAG_0x2E8 + hideobjectat 1, MAP_ROUTE109 + msgbox Route109_Text_1E9C1D, 4 + closemessage + copyvar VAR_0x4096, VAR_0x8008 + resetobjectpriority 255, MAP_ROUTE109 + resetobjectpriority 2, MAP_DEWFORD_TOWN + moveobjectoffscreen 2 + release + end + +Route109_Movement_1EE84F: @ 81EE84F + 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 + walk_down + walk_down + step_end + +Route109_Movement_1EE900: @ 81EE900 + walk_down + walk_down + walk_left + walk_in_place_fastest_right + step_end + +Route109_Movement_1EE905: @ 81EE905 + walk_right + walk_down + step_end + +Route109_Movement_1EE908: @ 81EE908 + walk_left + walk_down + step_end + +Route109_Movement_1EE90B: @ 81EE90B + walk_down + step_end + +Route109_Movement_1EE90D: @ 81EE90D + walk_down + walk_in_place_fastest_left + step_end + +Route109_EventScript_1EE910:: @ 81EE910 + lock + faceplayer + checkflag FLAG_0x095 + goto_if 0, Route109_EventScript_1EE921 + goto Route109_EventScript_1EE93F + end + +Route109_EventScript_1EE921:: @ 81EE921 + message Route109_Text_1EEC96 + msgbox Route109_Text_1EEC96, 5 + compare VAR_RESULT, 0 + goto_eq Route109_EventScript_1EE981 + goto Route109_EventScript_1EE972 + end + +Route109_EventScript_1EE93F:: @ 81EE93F + message Route109_Text_1EEE17 + waitmessage + multichoicedefault 21, 8, 14, 1, 0 + switch VAR_RESULT + case 0, Route109_EventScript_1EE972 + case 1, Route109_EventScript_1EE98B + case 127, Route109_EventScript_1EE98B + end + +Route109_EventScript_1EE972:: @ 81EE972 + msgbox Route109_Text_1EED06, 4 + closemessage + goto Route109_EventScript_1EE760 + end + +Route109_EventScript_1EE981:: @ 81EE981 + msgbox Route109_Text_1EED5E, 4 + release + end + +Route109_EventScript_1EE98B:: @ 81EE98B + msgbox Route109_Text_1EEE72, 4 + release + end + +Route109_EventScript_1EE995:: @ 81EE995 + msgbox Route109_Text_1EEEB4, 2 + end + +Route109_EventScript_1EE99E:: @ 81EE99E + lock + faceplayer + msgbox Route109_Text_1EEFB0, 4 + closemessage + applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 + waitmovement 0 + release + end + +Route109_EventScript_1EE9B5:: @ 81EE9B5 + lock + faceplayer + special GetPlayerBigGuyGirlString + checkflag FLAG_0x118 + goto_eq Route109_EventScript_1EE9F2 + msgbox Route109_Text_1EEFDE, 4 + giveitem_std ITEM_SOFT_SAND + compare VAR_RESULT, 0 + goto_eq Route109_EventScript_272054 + closemessage + applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 + waitmovement 0 + setflag FLAG_0x118 + release + end + +Route109_EventScript_1EE9F2:: @ 81EE9F2 + msgbox Route109_Text_1EEFF1, 4 + applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 + waitmovement 0 + release + end + +Route109_EventScript_1EEA06:: @ 81EEA06 + msgbox Route109_Text_1EEF08, 2 + end + +Route109_EventScript_1EEA0F:: @ 81EEA0F + msgbox Route109_Text_1EF080, 2 + end + +Route109_EventScript_1EEA18:: @ 81EEA18 + lock + faceplayer + waitse + playmoncry SPECIES_ZIGZAGOON, 0 + msgbox Route109_Text_1EF173, 4 + waitmoncry + release + end + +Route109_EventScript_1EEA2B:: @ 81EEA2B + msgbox Route109_Text_1EF185, 3 + end + +Route109_EventScript_1EEA34:: @ 81EEA34 + msgbox Route109_Text_1EF1D5, 3 + end + +Route109_EventScript_1EEA3D:: @ 81EEA3D + trainerbattle 0, TRAINER_DAVID, 0, Route109_Text_297140, Route109_Text_29717D + msgbox Route109_Text_297191, 6 + end + +Route109_EventScript_1EEA54:: @ 81EEA54 + trainerbattle 0, TRAINER_ALICE, 0, Route109_Text_2971D1, Route109_Text_2971FD + msgbox Route109_Text_29720F, 6 + end + +Route109_EventScript_1EEA6B:: @ 81EEA6B + trainerbattle 0, TRAINER_HUEY, 0, Route109_Text_297235, Route109_Text_29727B + msgbox Route109_Text_29728C, 6 + end + +Route109_EventScript_1EEA82:: @ 81EEA82 + trainerbattle 0, TRAINER_EDMOND, 0, Route109_Text_2972B3, Route109_Text_2972CE + msgbox Route109_Text_2972ED, 6 + end + +Route109_EventScript_1EEA99:: @ 81EEA99 + trainerbattle 2, TRAINER_RICKY_1, 0, Route109_Text_29733B, Route109_Text_297379, Route109_EventScript_1EEAC5 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route109_EventScript_1EEAE4 + msgbox Route109_Text_297380, 4 + release + end + +Route109_EventScript_1EEAC5:: @ 81EEAC5 + special sub_80B4808 + waitmovement 0 + msgbox Route109_Text_2973C1, 4 + setvar VAR_0x8004, 64 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 64 + callstd 8 + release + end + +Route109_EventScript_1EEAE4:: @ 81EEAE4 + trainerbattle 5, TRAINER_RICKY_1, 0, Route109_Text_2973FF, Route109_Text_297437 + msgbox Route109_Text_297458, 6 + end + +Route109_EventScript_1EEAFB:: @ 81EEAFB + trainerbattle 2, TRAINER_LOLA_1, 0, Route109_Text_29749C, Route109_Text_2974CF, Route109_EventScript_1EEB27 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route109_EventScript_1EEB46 + msgbox Route109_Text_2974D6, 4 + release + end + +Route109_EventScript_1EEB27:: @ 81EEB27 + special sub_80B4808 + waitmovement 0 + msgbox Route109_Text_297520, 4 + setvar VAR_0x8004, 57 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 57 + callstd 8 + release + end + +Route109_EventScript_1EEB46:: @ 81EEB46 + trainerbattle 5, TRAINER_LOLA_1, 0, Route109_Text_297538, Route109_Text_297576 + msgbox Route109_Text_29757D, 6 + end + +Route109_EventScript_1EEB5D:: @ 81EEB5D + trainerbattle 0, TRAINER_AUSTINA, 0, Route109_Text_2975C0, Route109_Text_297601 + msgbox Route109_Text_29762A, 6 + end + +Route109_EventScript_1EEB74:: @ 81EEB74 + trainerbattle 0, TRAINER_GWEN, 0, Route109_Text_297667, Route109_Text_297691 + msgbox Route109_Text_2976A4, 6 + end + +Route109_EventScript_1EEB8B:: @ 81EEB8B + trainerbattle 0, TRAINER_CARTER, 0, Route109_Text_2976C5, Route109_Text_2976FC + msgbox Route109_Text_297715, 6 + end + +Route109_EventScript_1EEBA2:: @ 81EEBA2 + trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_297754, Route109_Text_2977B0, Route109_Text_29781D + msgbox Route109_Text_2977C7, 6 + end + +Route109_EventScript_1EEBBD:: @ 81EEBBD + trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_297872, Route109_Text_2978BD, Route109_Text_29792E + msgbox Route109_Text_2978F1, 6 + end + +Route109_EventScript_1EEBD8:: @ 81EEBD8 + trainerbattle 0, TRAINER_CHANDLER, 0, Route109_Text_29798A, Route109_Text_2979AE + msgbox Route109_Text_2979BF, 6 + end + +Route109_EventScript_1EEBEF:: @ 81EEBEF + trainerbattle 0, TRAINER_HAILEY, 0, Route109_Text_2979EC, Route109_Text_297A15 + msgbox Route109_Text_297A40, 6 + end + +Route109_EventScript_1EEC06:: @ 81EEC06 + trainerbattle 0, TRAINER_ELIJAH, 0, Route109_Text_297A82, Route109_Text_297AC7 + msgbox Route109_Text_297AE5, 6 + end + +DewfordTown_Text_1EEC1D: @ 81EEC1D + .string "MR. BRINEY: Ahoy!\n" + .string "We’ve made land in SLATEPORT!\p" + .string "I suppose you’re going to visit CAPT.\n" + .string "STERN and deliver the DEVON GOODS?$" + +Route109_Text_1EEC96: @ 81EEC96 + .string "MR. BRINEY: I thought you’re supposed\n" + .string "to deliver the DEVON GOODS.\p" + .string "Would you like to sail back to\n" + .string "DEWFORD, then?$" + +Route109_Text_1EED06: @ 81EED06 + .string "MR. BRINEY: DEWFORD it is, then!\p" + .string "Anchors aweigh!\n" + .string "PEEKO, we’re setting sail, my darling!$" + +Route109_Text_1EED5E: @ 81EED5E + .string "MR. BRINEY: Then you go on and deliver\n" + .string "the DEVON GOODS. I’ll be waiting.$" + +DewfordTown_Text_1EEDA7: @ 81EEDA7 + .string "MR. BRINEY: Ahoy! We’ve made land in\n" + .string "SLATEPORT!\p" + .string "You just go on and tell me whenever\n" + .string "you want to set sail again!$" + +Route109_Text_1EEE17: @ 81EEE17 + .string "MR. BRINEY: Ahoy!\n" + .string "For you, I’ll go out to sea anytime!\p" + .string "Now, my friend, where are we bound?$" + +Route109_Text_1EEE72: @ 81EEE72 + .string "MR. BRINEY: You just tell me whenever\n" + .string "you need to set sail again!$" + +Route109_Text_1EEEB4: @ 81EEEB4 + .string "Yo, TRAINERS!\n" + .string "Whether you’re hot to trot,\l" + .string "or cool cat not,\l" + .string "chill at my papa’s spot!$" + +Route109_Text_1EEF08: @ 81EEF08 + .string "Little kids can dart around so quickly…\p" + .string "You don’t dare take your eyes off them\n" + .string "for an instant. It’s very taxing.\p" + .string "Mine are with my POKéMON, so they\n" + .string "should be okay, but…$" + +Route109_Text_1EEFB0: @ 81EEFB0 + .string "Our sand castle’s taking a long time\n" + .string "to make.$" + +Route109_Text_1EEFDE: @ 81EEFDE + .string "You can have this!$" + +Route109_Text_1EEFF1: @ 81EEFF1 + .string "We’re going to get all the sand from\n" + .string "the beach and make a big castle!\p" + .string "And then we’re going to be a king and\n" + .string "queen.\p" + .string "We’ll let you be a servant.$" + +Route109_Text_1EF080: @ 81EF080 + .string "The water around these parts is clean.\p" + .string "But, I get my ZIGZAGOON to pick up\n" + .string "litter from the shoreline at times.\p" + .string "Dirty water becomes rain and joins our\n" + .string "rivers, which we drink from…\p" + .string "If we pollute the sea, it all comes\n" + .string "back to haunt us eventually.$" + +Route109_Text_1EF173: @ 81EF173 + .string "ZIGZAGOON: Guguu?$" + +Route109_Text_1EF185: @ 81EF185 + .string "SEASHORE HOUSE\p" + .string "“May hot battles rage on hot sands!\n" + .string "The place for hot TRAINERS!â€$" + +Route109_Text_1EF1D5: @ 81EF1D5 + .string "TRAINER TIPS\p" + .string "POKéMON at the same level may not\n" + .string "always have identical stats.\p" + .string "POKéMON raised by TRAINERS are said\n" + .string "to grow stronger than wild POKéMON.$" diff --git a/data/maps/Route109_SeashoreHouse/events.inc b/data/maps/Route109_SeashoreHouse/events.inc new file mode 100644 index 000000000..140b92a21 --- /dev/null +++ b/data/maps/Route109_SeashoreHouse/events.inc @@ -0,0 +1,13 @@ +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 + +Route109_SeashoreHouse_MapWarps: @ 853DE48 + 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/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc new file mode 100644 index 000000000..e70f91ca8 --- /dev/null +++ b/data/maps/Route109_SeashoreHouse/scripts.inc @@ -0,0 +1,196 @@ +Route109_SeashoreHouse_MapScripts:: @ 82693F4 + map_script 3, Route109_SeashoreHouse_MapScript1_2693FA + .byte 0 + +Route109_SeashoreHouse_MapScript1_2693FA: @ 82693FA + setflag FLAG_LANDMARK_SEASHORE_HOUSE + end + +Route109_SeashoreHouse_EventScript_2693FE:: @ 82693FE + lock + faceplayer + checkflag FLAG_0x08C + goto_eq Route109_SeashoreHouse_EventScript_269460 + checkflag FLAG_0x08D + goto_eq Route109_SeashoreHouse_EventScript_269432 + checkflag FLAG_0x002 + goto_eq Route109_SeashoreHouse_EventScript_269428 + msgbox Route109_SeashoreHouse_Text_269555, 4 + setflag FLAG_0x002 + release + end + +Route109_SeashoreHouse_EventScript_269428:: @ 8269428 + msgbox Route109_SeashoreHouse_Text_269635, 4 + release + end + +Route109_SeashoreHouse_EventScript_269432:: @ 8269432 + msgbox Route109_SeashoreHouse_Text_269685, 4 + giveitem_std ITEM_SODA_POP, 6 + compare VAR_RESULT, 0 + goto_eq Route109_SeashoreHouse_EventScript_269456 + setflag FLAG_0x08C + release + end + +Route109_SeashoreHouse_EventScript_269456:: @ 8269456 + msgbox Route109_SeashoreHouse_Text_26973A, 4 + release + end + +Route109_SeashoreHouse_EventScript_269460:: @ 8269460 + showmoneybox 0, 0, 0 + msgbox Route109_SeashoreHouse_Text_26977E, 5 + compare VAR_RESULT, 1 + goto_eq Route109_SeashoreHouse_EventScript_269484 + msgbox Route109_SeashoreHouse_Text_2697EF, 4 + hidemoneybox + nop + nop + release + end + +Route109_SeashoreHouse_EventScript_269484:: @ 8269484 + checkmoney 0x12c, 0 + compare VAR_RESULT, 0 + goto_eq Route109_SeashoreHouse_EventScript_2694C8 + checkitemspace ITEM_SODA_POP, 1 + compare VAR_RESULT, 0 + goto_eq Route109_SeashoreHouse_EventScript_2694D5 + msgbox Route109_SeashoreHouse_Text_2697C8, 4 + takemoney 0x12c, 0 + updatemoneybox 0, 0 + nop + giveitem_std ITEM_SODA_POP + hidemoneybox + nop + nop + release + end + +Route109_SeashoreHouse_EventScript_2694C8:: @ 82694C8 + msgbox Route109_SeashoreHouse_Text_2697D5, 4 + hidemoneybox + nop + nop + release + end + +Route109_SeashoreHouse_EventScript_2694D5:: @ 82694D5 + msgbox gUnknown_08272AD0, 4 + hidemoneybox + nop + nop + release + end + +Route109_SeashoreHouse_EventScript_2694E2:: @ 82694E2 + trainerbattle 2, TRAINER_DWAYNE, 0, Route109_SeashoreHouse_Text_269803, Route109_SeashoreHouse_Text_269867, Route109_SeashoreHouse_EventScript_269533 + msgbox Route109_SeashoreHouse_Text_26989D, 6 + end + +Route109_SeashoreHouse_EventScript_2694FD:: @ 82694FD + trainerbattle 2, TRAINER_JOHANNA, 0, Route109_SeashoreHouse_Text_2698E3, Route109_SeashoreHouse_Text_269947, Route109_SeashoreHouse_EventScript_269533 + msgbox Route109_SeashoreHouse_Text_269953, 6 + end + +Route109_SeashoreHouse_EventScript_269518:: @ 8269518 + trainerbattle 2, TRAINER_SIMON, 0, Route109_SeashoreHouse_Text_269986, Route109_SeashoreHouse_Text_2699C5, Route109_SeashoreHouse_EventScript_269533 + msgbox Route109_SeashoreHouse_Text_2699DF, 6 + end + +Route109_SeashoreHouse_EventScript_269533:: @ 8269533 + checktrainerflag TRAINER_DWAYNE + goto_if 0, Route109_SeashoreHouse_EventScript_269553 + checktrainerflag TRAINER_JOHANNA + goto_if 0, Route109_SeashoreHouse_EventScript_269553 + checktrainerflag TRAINER_SIMON + goto_if 0, Route109_SeashoreHouse_EventScript_269553 + setflag FLAG_0x08D + release + end + +Route109_SeashoreHouse_EventScript_269553:: @ 8269553 + release + end + +Route109_SeashoreHouse_Text_269555: @ 8269555 + .string "I’m the owner of the SEASHORE HOUSE.\n" + .string "But you can call me MR. SEA!\p" + .string "What I love above all is to see hot\n" + .string "POKéMON battles.\p" + .string "Let me see that your heart burns hot!\p" + .string "If you can defeat all the TRAINERS\n" + .string "here, I’ll reward your efforts.$" + +Route109_SeashoreHouse_Text_269635: @ 8269635 + .string "Show me some hot matches!\p" + .string "I run this SEASHORE HOUSE just for\n" + .string "that reason alone!$" + +Route109_SeashoreHouse_Text_269685: @ 8269685 + .string "You’re scorching hot!\n" + .string "Those battles blazed!\l" + .string "I’m more than just satisfied!\p" + .string "As thanks for showing me your hot\n" + .string "streak, I want you to take these.\p" + .string "It’s half a dozen bottles of SODA POP!$" + +Route109_SeashoreHouse_Text_26973A: @ 826973A + .string "Oh, but hey, your BAG’s jammed full.\n" + .string "I’ll hang on to these for you.$" + +Route109_SeashoreHouse_Text_26977E: @ 826977E + .string "Want to buy some SODA POP?\n" + .string "POKéMON love it!\p" + .string "Just Â¥300 a bottle!\n" + .string "Buy some!$" + +Route109_SeashoreHouse_Text_2697C8: @ 82697C8 + .string "Here you go!$" + +Route109_SeashoreHouse_Text_2697D5: @ 82697D5 + .string "You don’t have the money.$" + +Route109_SeashoreHouse_Text_2697EF: @ 82697EF + .string "No?\n" + .string "That’s too bad.$" + +Route109_SeashoreHouse_Text_269803: @ 8269803 + .string "If you’re looking for a battle in the\n" + .string "SEASHORE HOUSE, you’ll find no\l" + .string "hotter TRAINER than me, matey!$" + +Route109_SeashoreHouse_Text_269867: @ 8269867 + .string "That was a hot battle!\n" + .string "I can accept that loss, matey!$" + +Route109_SeashoreHouse_Text_26989D: @ 826989D + .string "Whenever I’m in SLATEPORT, I enjoy\n" + .string "hot battles and ice-cold SODA POP!$" + +Route109_SeashoreHouse_Text_2698E3: @ 82698E3 + .string "Boring battles aren’t worth the effort.\p" + .string "Fiery hot battles are what toughen up\n" + .string "TRAINERS and POKéMON!$" + +Route109_SeashoreHouse_Text_269947: @ 8269947 + .string "That’s hot!$" + +Route109_SeashoreHouse_Text_269953: @ 8269953 + .string "Whew, I’m all thirsty.\n" + .string "Maybe I’ll have a SODA POP.$" + +Route109_SeashoreHouse_Text_269986: @ 8269986 + .string "I’m going to show you how great\n" + .string "my POKéMON are, but don’t cry!$" + +Route109_SeashoreHouse_Text_2699C5: @ 82699C5 + .string "…I lost, but I won’t cry…$" + +Route109_SeashoreHouse_Text_2699DF: @ 82699DF + .string "If one of my POKéMON knew the move\n" + .string "for carrying me across water on its\l" + .string "back, I could get rid of this inner tube.$" + diff --git a/data/maps/Route110/events.inc b/data/maps/Route110/events.inc new file mode 100644 index 000000000..c982ededf --- /dev/null +++ b/data/maps/Route110/events.inc @@ -0,0 +1,79 @@ +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 + +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 + +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 + +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 + +Route110_MapEvents:: @ 85291DC + map_events Route110_EventObjects, Route110_MapWarps, Route110_MapCoordEvents, Route110_MapBGEvents + diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc new file mode 100644 index 000000000..40d6a2e69 --- /dev/null +++ b/data/maps/Route110/scripts.inc @@ -0,0 +1,1030 @@ +Route110_MapScripts:: @ 81EF269 + map_script 5, Route110_MapScript1_1EF279 + map_script 3, Route110_MapScript1_1EF27D + map_script 2, Route110_MapScript2_1EF297 + .byte 0 + +Route110_MapScript1_1EF279: @ 81EF279 + special UpdateCyclingRoadState + end + +Route110_MapScript1_1EF27D: @ 81EF27D + call Route110_EventScript_271ED7 + call Route110_EventScript_271EFB + compare VAR_0x40A9, 1 + call_if 1, Route110_EventScript_1EF293 + end + +Route110_EventScript_1EF293:: @ 81EF293 + savebgm MUS_CYCLING + return + +Route110_MapScript2_1EF297: @ 81EF297 + map_script_2 VAR_0x40A9, 1, Route110_EventScript_1EF2A1 + .2byte 0 + +Route110_EventScript_1EF2A1:: @ 81EF2A1 + special Special_BeginCyclingRoadChallenge + setvar VAR_0x40A9, 2 + return + +Route110_EventScript_1EF2AA:: @ 81EF2AA + lock + faceplayer + msgbox Route110_Text_1EFB5D, 4 + applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 + waitmovement 0 + release + end + +Route110_EventScript_1EF2C0:: @ 81EF2C0 + lock + faceplayer + msgbox Route110_Text_1EFB93, 4 + applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 + waitmovement 0 + release + end + +Route110_EventScript_1EF2D6:: @ 81EF2D6 + lock + faceplayer + msgbox Route110_Text_1EFBCA, 4 + applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 + waitmovement 0 + release + end + +Route110_EventScript_1EF2EC:: @ 81EF2EC + lock + faceplayer + msgbox Route110_Text_1EFC0D, 4 + applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 + waitmovement 0 + release + end + +Route110_EventScript_1EF302:: @ 81EF302 + msgbox Route110_Text_1EFFC3, 2 + end + +Route110_EventScript_1EF30B:: @ 81EF30B + msgbox Route110_Text_1F0006, 2 + end + +Route110_EventScript_1EF314:: @ 81EF314 + msgbox Route110_Text_1F006A, 2 + end + +Route110_EventScript_1EF31D:: @ 81EF31D + msgbox Route110_Text_1F0261, 2 + end + +Route110_EventScript_1EF326:: @ 81EF326 + msgbox Route110_Text_1F02CA, 2 + end + +Route110_EventScript_1EF32F:: @ 81EF32F + msgbox Route110_Text_1F030E, 2 + end + +Route110_EventScript_1EF338:: @ 81EF338 + msgbox Route110_Text_1F0390, 2 + end + +Route110_EventScript_1EF341:: @ 81EF341 + msgbox Route110_Text_1F0812, 3 + end + +Route110_EventScript_1EF34A:: @ 81EF34A + msgbox Route110_Text_1F082D, 3 + end + +Route110_EventScript_1EF353:: @ 81EF353 + msgbox Route110_Text_1F0842, 3 + end + +Route110_EventScript_1EF35C:: @ 81EF35C + msgbox Route110_Text_1F08CD, 3 + end + +Route110_EventScript_1EF365:: @ 81EF365 + msgbox Route110_Text_1F08E3, 3 + end + +Route110_EventScript_1EF36E:: @ 81EF36E + msgbox Route110_Text_1F08F3, 3 + end + +Route110_EventScript_1EF377:: @ 81EF377 + msgbox Route110_Text_1F090D, 3 + end + +Route110_EventScript_1EF380:: @ 81EF380 + msgbox Route110_Text_1F0992, 3 + end + +Route110_EventScript_1EF389:: @ 81EF389 + msgbox Route110_Text_1F09DB, 3 + end + +Route110_EventScript_1EF392:: @ 81EF392 + lockall + specialvar VAR_RESULT, GetRecordedCyclingRoadResults + compare VAR_RESULT, 0 + goto_eq Route110_EventScript_1EF3AD + msgbox Route110_Text_1F0A1E, 4 + releaseall + end + +Route110_EventScript_1EF3AD:: @ 81EF3AD + msgbox Route110_Text_1F0A5E, 4 + releaseall + end + +Route110_EventScript_1EF3B7:: @ 81EF3B7 + lock + faceplayer + specialvar VAR_RESULT, GetPlayerAvatarBike + compare VAR_RESULT, 1 + goto_eq Route110_EventScript_1EF3E8 + compare VAR_0x40A9, 0 + goto_eq Route110_EventScript_1EF3DE + msgbox Route110_Text_1F06FB, 4 + release + end + +Route110_EventScript_1EF3DE:: @ 81EF3DE + msgbox Route110_Text_1F0661, 4 + release + end + +Route110_EventScript_1EF3E8:: @ 81EF3E8 + msgbox Route110_Text_1F0755, 4 + release + end + +Route110_EventScript_1EF3F2:: @ 81EF3F2 + trainerbattle 0, TRAINER_EDWARD, 0, Route110_Text_29802B, Route110_Text_298064 + msgbox Route110_Text_29808A, 6 + end + +Route110_EventScript_1EF409:: @ 81EF409 + trainerbattle 0, TRAINER_JACLYN, 0, Route110_Text_2980B9, Route110_Text_2980E5 + msgbox Route110_Text_2980F8, 6 + end + +Route110_EventScript_1EF420:: @ 81EF420 + trainerbattle 2, TRAINER_EDWIN_1, 0, Route110_Text_29815E, Route110_Text_29818F, Route110_EventScript_1EF44C + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route110_EventScript_1EF46B + msgbox Route110_Text_2981B3, 4 + release + end + +Route110_EventScript_1EF44C:: @ 81EF44C + special sub_80B4808 + waitmovement 0 + msgbox Route110_Text_298201, 4 + setvar VAR_0x8004, 512 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 512 + callstd 8 + release + end + +Route110_EventScript_1EF46B:: @ 81EF46B + trainerbattle 5, TRAINER_EDWIN_1, 0, Route110_Text_298232, Route110_Text_298288 + msgbox Route110_Text_2982A2, 6 + end + +Route110_EventScript_1EF482:: @ 81EF482 + trainerbattle 0, TRAINER_DALE, 0, Route110_Text_2982CC, Route110_Text_2982F5 + msgbox Route110_Text_298303, 6 + end + +Route110_EventScript_1EF499:: @ 81EF499 + trainerbattle 0, TRAINER_JACOB, 0, Route110_Text_297B3F, Route110_Text_297B77 + msgbox Route110_Text_297B8F, 6 + end + +Route110_EventScript_1EF4B0:: @ 81EF4B0 + trainerbattle 0, TRAINER_ANTHONY, 0, Route110_Text_297BE7, Route110_Text_297C0F + msgbox Route110_Text_297C1F, 6 + end + +Route110_EventScript_1EF4C7:: @ 81EF4C7 + trainerbattle 2, TRAINER_BENJAMIN_1, 0, Route110_Text_297C63, Route110_Text_297C8A, Route110_EventScript_1EF4F3 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route110_EventScript_1EF512 + msgbox Route110_Text_297CB4, 4 + release + end + +Route110_EventScript_1EF4F3:: @ 81EF4F3 + special sub_80B4808 + waitmovement 0 + msgbox Route110_Text_297CFE, 4 + setvar VAR_0x8004, 353 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 353 + callstd 8 + release + end + +Route110_EventScript_1EF512:: @ 81EF512 + trainerbattle 5, TRAINER_BENJAMIN_1, 0, Route110_Text_297D4B, Route110_Text_297D8E + msgbox Route110_Text_297DB0, 6 + end + +Route110_EventScript_1EF529:: @ 81EF529 + trainerbattle 0, TRAINER_JASMINE, 0, Route110_Text_297F93, Route110_Text_297FD0 + msgbox Route110_Text_297FF1, 6 + end + +Route110_EventScript_1EF540:: @ 81EF540 + trainerbattle 2, TRAINER_ABIGAIL_1, 0, Route110_Text_297DFA, Route110_Text_297E69, Route110_EventScript_1EF56C + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route110_EventScript_1EF58B + msgbox Route110_Text_297E88, 4 + release + end + +Route110_EventScript_1EF56C:: @ 81EF56C + special sub_80B4808 + waitmovement 0 + msgbox Route110_Text_297ECD, 4 + setvar VAR_0x8004, 358 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 358 + callstd 8 + release + end + +Route110_EventScript_1EF58B:: @ 81EF58B + trainerbattle 5, TRAINER_ABIGAIL_1, 0, Route110_Text_297F09, Route110_Text_297F37 + msgbox Route110_Text_297F58, 6 + end + +Route110_EventScript_1EF5A2:: @ 81EF5A2 + trainerbattle 2, TRAINER_ISABEL_1, 0, Route110_Text_298349, Route110_Text_298389, Route110_EventScript_1EF5CE + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route110_EventScript_1EF5ED + msgbox Route110_Text_2983A2, 4 + release + end + +Route110_EventScript_1EF5CE:: @ 81EF5CE + special sub_80B4808 + waitmovement 0 + msgbox Route110_Text_2983EE, 4 + setvar VAR_0x8004, 302 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 302 + callstd 8 + release + end + +Route110_EventScript_1EF5ED:: @ 81EF5ED + trainerbattle 5, TRAINER_ISABEL_1, 0, Route110_Text_298466, Route110_Text_2984AF + msgbox Route110_Text_2984C8, 6 + end + +Route110_EventScript_1EF604:: @ 81EF604 + trainerbattle 0, TRAINER_TIMMY, 0, Route110_Text_298525, Route110_Text_298559 + msgbox Route110_Text_298579, 6 + end + +Route110_EventScript_1EF61B:: @ 81EF61B + end + +Route110_EventScript_1EF61C:: @ 81EF61C + trainerbattle 0, TRAINER_KALEB, 0, Route110_Text_2986ED, Route110_Text_298735 + msgbox Route110_Text_298755, 6 + end + +Route110_EventScript_1EF633:: @ 81EF633 + trainerbattle 0, TRAINER_JOSEPH, 0, Route110_Text_298642, Route110_Text_298686 + msgbox Route110_Text_2986A9, 6 + end + +Route110_EventScript_1EF64A:: @ 81EF64A + trainerbattle 0, TRAINER_ALYSSA, 0, Route110_Text_2985AB, Route110_Text_2985F9 + msgbox Route110_Text_298612, 6 + end + +Route110_EventScript_1EF661:: @ 81EF661 + lockall + applymovement 21, Route110_Movement_2725A8 + waitmovement 0 + call Route110_EventScript_1EF673 + releaseall + end + +Route110_EventScript_1EF673:: @ 81EF673 + special FinishCyclingRoadChallenge + msgbox Route110_Text_1F03FF, 4 + switch VAR_RESULT + case 10, Route110_EventScript_1EF6FD + case 9, Route110_EventScript_1EF70B + case 8, Route110_EventScript_1EF70B + case 7, Route110_EventScript_1EF70B + case 6, Route110_EventScript_1EF719 + case 5, Route110_EventScript_1EF719 + case 4, Route110_EventScript_1EF719 + case 3, Route110_EventScript_1EF727 + case 2, Route110_EventScript_1EF727 + case 1, Route110_EventScript_1EF727 + case 0, Route110_EventScript_1EF735 + end + +Route110_EventScript_1EF6FD:: @ 81EF6FD + msgbox Route110_Text_1F0431, 4 + goto Route110_EventScript_1EF743 + end + +Route110_EventScript_1EF70B:: @ 81EF70B + msgbox Route110_Text_1F04A4, 4 + goto Route110_EventScript_1EF743 + end + +Route110_EventScript_1EF719:: @ 81EF719 + msgbox Route110_Text_1F0500, 4 + goto Route110_EventScript_1EF743 + end + +Route110_EventScript_1EF727:: @ 81EF727 + msgbox Route110_Text_1F0567, 4 + goto Route110_EventScript_1EF743 + end + +Route110_EventScript_1EF735:: @ 81EF735 + msgbox Route110_Text_1F05CE, 4 + goto Route110_EventScript_1EF743 + end + +Route110_EventScript_1EF743:: @ 81EF743 + setvar VAR_0x40A9, 3 + savebgm MUS_DUMMY + fadedefaultbgm + return + +Route110_EventScript_1EF74D:: @ 81EF74D + setvar VAR_0x8008, 1 + goto Route110_EventScript_1EF76E + end + +Route110_EventScript_1EF758:: @ 81EF758 + setvar VAR_0x8008, 2 + goto Route110_EventScript_1EF76E + end + +Route110_EventScript_1EF763:: @ 81EF763 + setvar VAR_0x8008, 3 + goto Route110_EventScript_1EF76E + end + +Route110_EventScript_1EF76E:: @ 81EF76E + lockall + checkplayergender + compare VAR_RESULT, 0 + call_if 1, Route110_EventScript_1EF7E1 + compare VAR_RESULT, 1 + call_if 1, Route110_EventScript_1EF7E6 + applymovement 28, Route110_Movement_2725AA + waitmovement 0 + applymovement 28, Route110_Movement_272598 + waitmovement 0 + applymovement 28, Route110_Movement_27259A + waitmovement 0 + delay 30 + compare VAR_0x8008, 1 + call_if 1, Route110_EventScript_1EF94E + compare VAR_0x8008, 2 + call_if 1, Route110_EventScript_1EF959 + compare VAR_0x8008, 3 + call_if 1, Route110_EventScript_1EF964 + checkplayergender + compare VAR_RESULT, 0 + goto_eq Route110_EventScript_1EF7EB + compare VAR_RESULT, 1 + goto_eq Route110_EventScript_1EF865 + releaseall + end + +Route110_EventScript_1EF7E1:: @ 81EF7E1 + playbgm MUS_GIRL_SUP, 1 + return + +Route110_EventScript_1EF7E6:: @ 81EF7E6 + playbgm MUS_BOY_SUP, 1 + return + +Route110_EventScript_1EF7EB:: @ 81EF7EB + msgbox Route110_Text_1EFC48, 4 + switch VAR_FIRST_POKE + case 0, Route110_EventScript_1EF81A + case 1, Route110_EventScript_1EF82A + case 2, Route110_EventScript_1EF83A + end + +Route110_EventScript_1EF81A:: @ 81EF81A + trainerbattle 3, TRAINER_MAY_5, 0, Route110_Text_1EFCCB + goto Route110_EventScript_1EF84A + end + +Route110_EventScript_1EF82A:: @ 81EF82A + trainerbattle 3, TRAINER_MAY_8, 0, Route110_Text_1EFCCB + goto Route110_EventScript_1EF84A + end + +Route110_EventScript_1EF83A:: @ 81EF83A + trainerbattle 3, TRAINER_MAY_2, 0, Route110_Text_1EFCCB + goto Route110_EventScript_1EF84A + end + +Route110_EventScript_1EF84A:: @ 81EF84A + msgbox Route110_Text_1EFCF1, 4 + call Route110_EventScript_1EF8DF + msgbox Route110_Text_1EFD58, 4 + goto Route110_EventScript_1EF8EC + end + +Route110_EventScript_1EF865:: @ 81EF865 + msgbox Route110_Text_1EFE3F, 4 + switch VAR_FIRST_POKE + case 0, Route110_EventScript_1EF894 + case 1, Route110_EventScript_1EF8A4 + case 2, Route110_EventScript_1EF8B4 + end + +Route110_EventScript_1EF894:: @ 81EF894 + trainerbattle 3, TRAINER_BRENDAN_5, 0, Route110_Text_1EFEB4 + goto Route110_EventScript_1EF8C4 + end + +Route110_EventScript_1EF8A4:: @ 81EF8A4 + trainerbattle 3, TRAINER_BRENDAN_8, 0, Route110_Text_1EFEB4 + goto Route110_EventScript_1EF8C4 + end + +Route110_EventScript_1EF8B4:: @ 81EF8B4 + trainerbattle 3, TRAINER_BRENDAN_2, 0, Route110_Text_1EFEB4 + goto Route110_EventScript_1EF8C4 + end + +Route110_EventScript_1EF8C4:: @ 81EF8C4 + msgbox Route110_Text_1EFECD, 4 + call Route110_EventScript_1EF8DF + msgbox Route110_Text_1EFF1C, 4 + goto Route110_EventScript_1EF8EC + end + +Route110_EventScript_1EF8DF:: @ 81EF8DF + giveitem_std ITEM_ITEMFINDER + return + +Route110_EventScript_1EF8EC:: @ 81EF8EC + closemessage + compare VAR_0x8008, 1 + call_if 1, Route110_EventScript_1EF990 + compare VAR_0x8008, 2 + call_if 1, Route110_EventScript_1EF998 + compare VAR_0x8008, 3 + call_if 1, Route110_EventScript_1EF9A0 + setobjectmovementtype 28, 10 + setobjectmovementtype 29, 10 + removeobject 28 + addobject 29 + delay 45 + compare VAR_0x8008, 1 + call_if 1, Route110_EventScript_1EF96F + compare VAR_0x8008, 2 + call_if 1, Route110_EventScript_1EF97A + compare VAR_0x8008, 3 + call_if 1, Route110_EventScript_1EF985 + removeobject 29 + setvar VAR_0x4069, 1 + savebgm MUS_DUMMY + fadedefaultbgm + releaseall + end + +Route110_EventScript_1EF94E:: @ 81EF94E + applymovement 28, Route110_Movement_1EF9A8 + waitmovement 0 + return + +Route110_EventScript_1EF959:: @ 81EF959 + applymovement 28, Route110_Movement_1EF9AC + waitmovement 0 + return + +Route110_EventScript_1EF964:: @ 81EF964 + applymovement 28, Route110_Movement_1EF9AE + waitmovement 0 + return + +Route110_EventScript_1EF96F:: @ 81EF96F + applymovement 29, Route110_Movement_1EF9B2 + waitmovement 0 + return + +Route110_EventScript_1EF97A:: @ 81EF97A + applymovement 29, Route110_Movement_1EF9BA + waitmovement 0 + return + +Route110_EventScript_1EF985:: @ 81EF985 + applymovement 29, Route110_Movement_1EF9C3 + waitmovement 0 + return + +Route110_EventScript_1EF990:: @ 81EF990 + setobjectxyperm 29, 33, 55 + return + +Route110_EventScript_1EF998:: @ 81EF998 + setobjectxyperm 29, 34, 55 + return + +Route110_EventScript_1EF9A0:: @ 81EF9A0 + setobjectxyperm 29, 35, 55 + return + +Route110_Movement_1EF9A8: @ 81EF9A8 + walk_down + walk_left + walk_in_place_fastest_down + step_end + +Route110_Movement_1EF9AC: @ 81EF9AC + walk_down + step_end + +Route110_Movement_1EF9AE: @ 81EF9AE + walk_down + walk_right + walk_in_place_fastest_down + step_end + +Route110_Movement_1EF9B2: @ 81EF9B2 + 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 + 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 + 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 + lockall + setvar VAR_0x8008, 1 + goto Route110_EventScript_1EF9F7 + +Route110_EventScript_1EF9D6:: @ 81EF9D6 + lockall + setvar VAR_0x8008, 2 + goto Route110_EventScript_1EF9F7 + +Route110_EventScript_1EF9E1:: @ 81EF9E1 + lockall + setvar VAR_0x8008, 3 + goto Route110_EventScript_1EF9F7 + +Route110_EventScript_1EF9EC:: @ 81EF9EC + lockall + setvar VAR_0x8008, 4 + goto Route110_EventScript_1EF9F7 + +Route110_EventScript_1EF9F7:: @ 81EF9F7 + addobject 36 + applymovement 36, Route110_Movement_1EFB30 + waitmovement 0 + playse SE_PIN + applymovement 36, Route110_Movement_272598 + waitmovement 0 + applymovement 36, Route110_Movement_27259A + waitmovement 0 + compare VAR_0x8008, 1 + call_if 1, Route110_EventScript_1EFAD8 + compare VAR_0x8008, 2 + call_if 1, Route110_EventScript_1EFAE3 + compare VAR_0x8008, 3 + call_if 1, Route110_EventScript_1EFAEE + compare VAR_0x8008, 4 + call_if 1, Route110_EventScript_1EFAF9 + msgbox Route110_Text_1F0AB5, 4 + closemessage + delay 20 + applymovement 36, Route110_Movement_2725A4 + waitmovement 0 + delay 10 + applymovement 36, Route110_Movement_2725A8 + waitmovement 0 + delay 20 + applymovement 36, Route110_Movement_2725AA + waitmovement 0 + delay 30 + msgbox Route110_Text_1F0AFF, 4 + closemessage + delay 30 + playfanfare MUS_ME_TORE_EYE + msgbox Route110_Text_1F0C0C, 4 + waitfanfare + closemessage + delay 30 + setflag FLAG_0x119 + msgbox Route110_Text_1F0C33, 4 + closemessage + compare VAR_0x8008, 1 + call_if 1, Route110_EventScript_1EFB04 + compare VAR_0x8008, 2 + call_if 1, Route110_EventScript_1EFB0F + compare VAR_0x8008, 3 + call_if 1, Route110_EventScript_1EFB1A + compare VAR_0x8008, 4 + call_if 1, Route110_EventScript_1EFB25 + removeobject 36 + setvar VAR_0x40DA, 2 + releaseall + end + +Route110_EventScript_1EFAD8:: @ 81EFAD8 + applymovement 36, Route110_Movement_1EFB34 + waitmovement 0 + return + +Route110_EventScript_1EFAE3:: @ 81EFAE3 + applymovement 36, Route110_Movement_1EFB39 + waitmovement 0 + return + +Route110_EventScript_1EFAEE:: @ 81EFAEE + applymovement 36, Route110_Movement_1EFB3D + waitmovement 0 + return + +Route110_EventScript_1EFAF9:: @ 81EFAF9 + applymovement 36, Route110_Movement_1EFB40 + waitmovement 0 + return + +Route110_EventScript_1EFB04:: @ 81EFB04 + applymovement 36, Route110_Movement_1EFB44 + waitmovement 0 + return + +Route110_EventScript_1EFB0F:: @ 81EFB0F + applymovement 36, Route110_Movement_1EFB4B + waitmovement 0 + return + +Route110_EventScript_1EFB1A:: @ 81EFB1A + applymovement 36, Route110_Movement_1EFB51 + waitmovement 0 + return + +Route110_EventScript_1EFB25:: @ 81EFB25 + applymovement 36, Route110_Movement_1EFB57 + waitmovement 0 + return + +Route110_Movement_1EFB30: @ 81EFB30 + walk_down + walk_down + walk_down + step_end + +Route110_Movement_1EFB34: @ 81EFB34 + walk_down + walk_left + walk_left + walk_down + step_end + +Route110_Movement_1EFB39: @ 81EFB39 + walk_down + walk_left + walk_down + step_end + +Route110_Movement_1EFB3D: @ 81EFB3D + walk_down + walk_down + step_end + +Route110_Movement_1EFB40: @ 81EFB40 + walk_down + walk_right + walk_down + step_end + +Route110_Movement_1EFB44: @ 81EFB44 + walk_up + walk_up + walk_right + walk_up + walk_up + walk_up + step_end + +Route110_Movement_1EFB4B: @ 81EFB4B + walk_up + walk_up + walk_up + walk_up + walk_up + step_end + +Route110_Movement_1EFB51: @ 81EFB51 + walk_up + walk_up + walk_up + walk_up + walk_up + step_end + +Route110_Movement_1EFB57: @ 81EFB57 + walk_up + walk_up + walk_up + walk_up + walk_up + step_end + +Route110_Text_1EFB5D: @ 81EFB5D + .string "TEAM AQUA’s activities…\n" + .string "We can’t talk about them yet.$" + +Route110_Text_1EFB93: @ 81EFB93 + .string "I want to get going to SLATEPORT and\n" + .string "kick up a ruckus!$" + +Route110_Text_1EFBCA: @ 81EFBCA + .string "This is my first job after joining\n" + .string "TEAM AQUA. It’s a little scary.$" + +Route110_Text_1EFC0D: @ 81EFC0D + .string "TEAM AQUA’s actions should bring\n" + .string "smiles to people’s faces!$" + +Route110_Text_1EFC48: @ 81EFC48 + .string "MAY: Hi, {PLAYER}{KUN}, long time no see!\p" + .string "While I was searching for other\n" + .string "POKéMON, my POKéMON grew stronger.\p" + .string "So…\n" + .string "How about a little battle?$" + +Route110_Text_1EFCCB: @ 81EFCCB + .string "Yikes!\n" + .string "You’re better than I expected!$" + +Route110_Text_1EFCF1: @ 81EFCF1 + .string "MAY: {PLAYER}{KUN}, you’ve been busy\n" + .string "training, too, haven’t you?\p" + .string "I think you deserve a reward!\n" + .string "This is from me!$" + +Route110_Text_1EFD58: @ 81EFD58 + .string "MAY: That’s an ITEMFINDER.\p" + .string "Try it out. If there is an item that’s\n" + .string "not visible, it emits a sound.\p" + .string "Okay, {PLAYER}{KUN}, let’s meet again!\p" + .string "I know it’s a little silly coming from\n" + .string "me, but I think you should train a lot\l" + .string "harder for the next time.$" + +Route110_Text_1EFE3F: @ 81EFE3F + .string "BRENDAN: Hey, {PLAYER}.\n" + .string "So this is where you were.\l" + .string "How’s it going?\p" + .string "Have you been raising your POKéMON?\n" + .string "I’ll check for you.$" + +Route110_Text_1EFEB4: @ 81EFEB4 + .string "Hmm…\n" + .string "You’re pretty good.$" + +Route110_Text_1EFECD: @ 81EFECD + .string "BRENDAN: {PLAYER}, you’ve trained\n" + .string "without me noticing…\p" + .string "Good enough!\n" + .string "Here, take this.$" + +Route110_Text_1EFF1C: @ 81EFF1C + .string "BRENDAN: That’s an ITEMFINDER.\p" + .string "Use it to root around for items that\n" + .string "aren’t visible.\p" + .string "If it senses something, it emits\n" + .string "a sound.\p" + .string "Anyway, I’m off to look for new\n" + .string "POKéMON.$" + +Route110_Text_1EFFC3: @ 81EFFC3 + .string "Wouldn’t it be great to ride a BIKE\n" + .string "at full speed on CYCLING ROAD?$" + +Route110_Text_1F0006: @ 81F0006 + .string "How do you like the way my raven-\n" + .string "colored hair streams behind me?\p" + .string "I grew my hair out just for that.$" + +Route110_Text_1F006A: @ 81F006A + .string "Oh, hey, you got that BIKE from RYDEL!\p" + .string "Oh, it’s glaringly obvious.\n" + .string "It says right on your bike…\p" + .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n" + .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p" + .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n" + .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p" + .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n" + .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p" + .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n" + .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p" + .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL…\n" + .string "That name’s everywhere.\p" + .string "You should ride it around all over\n" + .string "the place--it’s good advertising!$" + +Route110_Text_1F0261: @ 81F0261 + .string "The two roads, one above, one below…\p" + .string "A road each for people and POKéMON.\n" + .string "Perhaps that is right and fair.$" + +Route110_Text_1F02CA: @ 81F02CA + .string "I don’t have a BIKE, so I’ll take\n" + .string "a leisurely walk on the low road.$" + +Route110_Text_1F030E: @ 81F030E + .string "Learning techniques will make BIKE\n" + .string "riding even more fun.\p" + .string "There are some places that you can\n" + .string "reach only by using a BIKE technique.$" + +Route110_Text_1F0390: @ 81F0390 + .string "Which should I choose?\p" + .string "Make a beeline for MAUVILLE on\n" + .string "CYCLING ROAD, or take the low road\l" + .string "and look for POKéMON?$" + +Route110_Text_1F03FF: @ 81F03FF + .string "Number of collisions:\n" + .string "… … {STR_VAR_1}!\p" + .string "Total time:\n" + .string "… … {STR_VAR_2}!$" + +Route110_Text_1F0431: @ 81F0431 + .string "Bravo! Splendid showing!\p" + .string "Your love of cycling comes from deep\n" + .string "within your heart.\l" + .string "You’ve shaken me to my very soul!$" + +Route110_Text_1F04A4: @ 81F04A4 + .string "Your technique is remarkable.\p" + .string "I suggest you speed up a bit while\n" + .string "still avoiding collisions.$" + +Route110_Text_1F0500: @ 81F0500 + .string "I would consider you a work in\n" + .string "progress.\p" + .string "Still, I hope you don’t forget the\n" + .string "sheer pleasure of cycling.$" + +Route110_Text_1F0567: @ 81F0567 + .string "My word… Your cycling skills border\n" + .string "on terrifying.\p" + .string "Most certainly, you need much more\n" + .string "practice riding.$" + +Route110_Text_1F05CE: @ 81F05CE + .string "…I am aghast…\p" + .string "You’re perhaps not cut out for this\n" + .string "unfortunate cycling business.\p" + .string "You ought to give serious thought to\n" + .string "returning that BIKE to RYDEL.$" + +Route110_Text_1F0661: @ 81F0661 + .string "This is CYCLING ROAD.\p" + .string "If you were to ride from MAUVILLE to\n" + .string "SLATEPORT on a MACH BIKE, you would\l" + .string "be rated for the number of collisions\l" + .string "and your total time.$" + +Route110_Text_1F06FB: @ 81F06FB + .string "Regardless of the results, I count on\n" + .string "seeing more challenges from you.\l" + .string "Always aim higher!$" + +Route110_Text_1F0755: @ 81F0755 + .string "On this CYCLING ROAD, those riding\n" + .string "MACH BIKES are rated for their number\l" + .string "of collisions and their total times.\p" + .string "ACRO BIKES do not qualify for rating.\n" + .string "They are easy to turn, so it’s not fair.$" + +Route110_Text_1F0812: @ 81F0812 + .string "ROUTE 110\n" + .string "{0x7A} SLATEPORT CITY$" + +Route110_Text_1F082D: @ 81F082D + .string "SEASIDE CYCLING ROAD$" + +Route110_Text_1F0842: @ 81F0842 + .string "“TEAM AQUA was here!â€\p" + .string "Someone painted that onto this sign,\n" + .string "but then someone else painted over it.\p" + .string "“TEAM MAGMA rules!†is what it\n" + .string "says now.$" + +Route110_Text_1F08CD: @ 81F08CD + .string "ROUTE 110\n" + .string "{0x7B} ROUTE 103$" + +Route110_Text_1F08E3: @ 81F08E3 + .string "SEASIDE PARKING$" + +Route110_Text_1F08F3: @ 81F08F3 + .string "ROUTE 110\n" + .string "{0x79} MAUVILLE CITY$" + +Route110_Text_1F090D: @ 81F090D + .string "TRAINER TIPS\p" + .string "The foe can be made helpless by\n" + .string "paralyzing it or causing it to sleep.\p" + .string "It is an important technique for\n" + .string "POKéMON battles.$" + +Route110_Text_1F0992: @ 81F0992 + .string "TRAINER TIPS\p" + .string "The items in the BAG can be reorganized\n" + .string "by pressing SELECT.$" + +Route110_Text_1F09DB: @ 81F09DB + .string "“Three steps {0x7C} and two steps {0x79}\n" + .string "to reach the wondrous TRICK HOUSE.â€$" + +Route110_Text_1F0A1E: @ 81F0A1E + .string "THE BEST RECORD TO DATE…\p" + .string "No. of collisions: {STR_VAR_1}\p" + .string "Elapsed time: {STR_VAR_2}$" + +Route110_Text_1F0A5E: @ 81F0A5E + .string "THE BEST RECORD TO DATE…\p" + .string "No one seems to have taken the\n" + .string "challenge. There is no record…$" + +Route110_Text_1F0AB5: @ 81F0AB5 + .string "PROF. BIRCH: Oh, {PLAYER}{KUN}!\n" + .string "Imagine seeing you here!\p" + .string "And where might my {RIVAL} be?$" + +Route110_Text_1F0AFF: @ 81F0AFF + .string "Oh, I see!\n" + .string "You two are running separately.\l" + .string "Well, that’s fine.\p" + .string "Oh, yes, I heard that your POKéNAV\n" + .string "had the MATCH CALL system installed.\p" + .string "Well, then, I should register you in\n" + .string "my POKéNAV as well.\p" + .string "That way, even when we’re apart,\n" + .string "I can rate your POKéDEX anytime.\p" + .string "… … … … … …$" + +Route110_Text_1F0C0C: @ 81F0C0C + .string "Registered PROF. BIRCH\n" + .string "in the POKéNAV.$" + +Route110_Text_1F0C33: @ 81F0C33 + .string "PROF. BIRCH: {PLAYER}{KUN}…\p" + .string "Please keep an eye out for my {RIVAL}.\n" + .string "… … … … … …\p" + .string "Well, I had better get going.\n" + .string "See you again, {PLAYER}{KUN}!$" + diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance1/events.inc b/data/maps/Route110_SeasideCyclingRoadEntrance1/events.inc new file mode 100644 index 000000000..ed1750f79 --- /dev/null +++ b/data/maps/Route110_SeasideCyclingRoadEntrance1/events.inc @@ -0,0 +1,16 @@ +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/scripts.inc b/data/maps/Route110_SeasideCyclingRoadEntrance1/scripts.inc new file mode 100644 index 000000000..9579df56c --- /dev/null +++ b/data/maps/Route110_SeasideCyclingRoadEntrance1/scripts.inc @@ -0,0 +1,50 @@ +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 new file mode 100644 index 000000000..5ad30e6c1 --- /dev/null +++ b/data/maps/Route110_SeasideCyclingRoadEntrance2/events.inc @@ -0,0 +1,16 @@ +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/scripts.inc b/data/maps/Route110_SeasideCyclingRoadEntrance2/scripts.inc new file mode 100644 index 000000000..499969d6e --- /dev/null +++ b/data/maps/Route110_SeasideCyclingRoadEntrance2/scripts.inc @@ -0,0 +1,69 @@ +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_TrickHouseCorridor/events.inc b/data/maps/Route110_TrickHouseCorridor/events.inc new file mode 100644 index 000000000..e9d84d56b --- /dev/null +++ b/data/maps/Route110_TrickHouseCorridor/events.inc @@ -0,0 +1,9 @@ +Route110_TrickHouseCorridor_MapWarps: @ 853DF54 + 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/Route110_TrickHouseCorridor/scripts.inc b/data/maps/Route110_TrickHouseCorridor/scripts.inc new file mode 100644 index 000000000..cf520c81f --- /dev/null +++ b/data/maps/Route110_TrickHouseCorridor/scripts.inc @@ -0,0 +1,8 @@ +Route110_TrickHouseCorridor_MapScripts:: @ 826B903 + map_script 3, Route110_TrickHouseCorridor_MapScript1_26B909 + .byte 0 + +Route110_TrickHouseCorridor_MapScript1_26B909: @ 826B909 + setvar VAR_0x40B5, 1 + end + diff --git a/data/maps/Route110_TrickHouseEnd/events.inc b/data/maps/Route110_TrickHouseEnd/events.inc new file mode 100644 index 000000000..12659457a --- /dev/null +++ b/data/maps/Route110_TrickHouseEnd/events.inc @@ -0,0 +1,16 @@ +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 + +Route110_TrickHouseEnd_MapWarps: @ 853DF14 + 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 + +Route110_TrickHouseEnd_MapBGEvents: @ 853DF34 + bg_event 4, 5, 3, 7, 0, ITEM_NUGGET, 1, 0 + +Route110_TrickHouseEnd_MapEvents:: @ 853DF40 + map_events Route110_TrickHouseEnd_EventObjects, Route110_TrickHouseEnd_MapWarps, Route110_TrickHouseEnd_MapCoordEvents, Route110_TrickHouseEnd_MapBGEvents + diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc new file mode 100644 index 000000000..4e15ddbe7 --- /dev/null +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -0,0 +1,369 @@ +Route110_TrickHouseEnd_MapScripts:: @ 826ACAF + map_script 5, Route110_TrickHouseEnd_MapScript1_26ACC4 + map_script 3, Route110_TrickHouseEnd_MapScript1_26ACD0 + map_script 2, Route110_TrickHouseEnd_MapScript2_26ACF5 + map_script 4, Route110_TrickHouseEnd_MapScript2_26ACDE + .byte 0 + +Route110_TrickHouseEnd_MapScript1_26ACC4: @ 826ACC4 + compare VAR_TEMP_1, 1 + call_if 1, Route110_TrickHouseEnd_EventScript_26AD0D + end + +Route110_TrickHouseEnd_MapScript1_26ACD0: @ 826ACD0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + special SetTrickHouseEndRoomFlag + end + +Route110_TrickHouseEnd_MapScript2_26ACDE: @ 826ACDE + map_script_2 VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_26ACE8 + .2byte 0 + +Route110_TrickHouseEnd_EventScript_26ACE8:: @ 826ACE8 + addobject 1 + showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_END + turnobject 1, 4 + end + +Route110_TrickHouseEnd_MapScript2_26ACF5: @ 826ACF5 + map_script_2 VAR_TEMP_1, 0, Route110_TrickHouseEnd_EventScript_26ACFF + .2byte 0 + +Route110_TrickHouseEnd_EventScript_26ACFF:: @ 826ACFF + setvar VAR_TEMP_1, 1 + call Route110_TrickHouseEnd_EventScript_26AD0D + special DrawWholeMapView + end + +Route110_TrickHouseEnd_EventScript_26AD0D:: @ 826AD0D + setmetatile 10, 1, 539, 1 + return + +Route110_TrickHouseEnd_EventScript_26AD17:: @ 826AD17 + lock + faceplayer + msgbox Route110_TrickHouseEnd_Text_26B08D, 4 + setvar VAR_TEMP_2, 1 + switch VAR_0x4044 + case 0, Route110_TrickHouseEnd_EventScript_26AD84 + case 1, Route110_TrickHouseEnd_EventScript_26ADC0 + case 2, Route110_TrickHouseEnd_EventScript_26ADFC + case 3, Route110_TrickHouseEnd_EventScript_26AE38 + case 4, Route110_TrickHouseEnd_EventScript_26AE74 + case 5, Route110_TrickHouseEnd_EventScript_26AEB0 + case 6, Route110_TrickHouseEnd_EventScript_26AEEC + case 7, Route110_TrickHouseEnd_EventScript_26AF28 + end + +Route110_TrickHouseEnd_EventScript_26AD84:: @ 826AD84 + msgbox Route110_TrickHouseEnd_Text_26B0BC, 4 + msgbox Route110_TrickHouseEnd_Text_26B73D, 4 + setvar VAR_0x40C1, 0 + giveitem_std ITEM_RARE_CANDY + compare VAR_RESULT, 0 + call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF + msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 + closemessage + call Route110_TrickHouseEnd_EventScript_26AFCF + release + end + +Route110_TrickHouseEnd_EventScript_26ADC0:: @ 826ADC0 + msgbox Route110_TrickHouseEnd_Text_26B13B, 4 + msgbox Route110_TrickHouseEnd_Text_26B73D, 4 + setvar VAR_0x40C1, 0 + giveitem_std ITEM_TIMER_BALL + compare VAR_RESULT, 0 + call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF + msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 + closemessage + call Route110_TrickHouseEnd_EventScript_26AFCF + release + end + +Route110_TrickHouseEnd_EventScript_26ADFC:: @ 826ADFC + msgbox Route110_TrickHouseEnd_Text_26B1AD, 4 + msgbox Route110_TrickHouseEnd_Text_26B73D, 4 + setvar VAR_0x40C1, 0 + giveitem_std ITEM_HARD_STONE + compare VAR_RESULT, 0 + call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF + msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 + closemessage + call Route110_TrickHouseEnd_EventScript_26AFCF + release + end + +Route110_TrickHouseEnd_EventScript_26AE38:: @ 826AE38 + msgbox Route110_TrickHouseEnd_Text_26B223, 4 + msgbox Route110_TrickHouseEnd_Text_26B73D, 4 + setvar VAR_0x40C1, 0 + giveitem_std ITEM_SMOKE_BALL + compare VAR_RESULT, 0 + call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF + msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 + closemessage + call Route110_TrickHouseEnd_EventScript_26AFCF + release + end + +Route110_TrickHouseEnd_EventScript_26AE74:: @ 826AE74 + msgbox Route110_TrickHouseEnd_Text_26B293, 4 + msgbox Route110_TrickHouseEnd_Text_26B73D, 4 + setvar VAR_0x40C1, 0 + giveitem_std ITEM_TM12 + compare VAR_RESULT, 0 + call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF + msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 + closemessage + call Route110_TrickHouseEnd_EventScript_26AFCF + release + end + +Route110_TrickHouseEnd_EventScript_26AEB0:: @ 826AEB0 + msgbox Route110_TrickHouseEnd_Text_26B315, 4 + msgbox Route110_TrickHouseEnd_Text_26B73D, 4 + setvar VAR_0x40C1, 0 + giveitem_std ITEM_MAGNET + compare VAR_RESULT, 0 + call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF + msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 + closemessage + call Route110_TrickHouseEnd_EventScript_26AFCF + release + end + +Route110_TrickHouseEnd_EventScript_26AEEC:: @ 826AEEC + msgbox Route110_TrickHouseEnd_Text_26B365, 4 + msgbox Route110_TrickHouseEnd_Text_26B73D, 4 + setvar VAR_0x40C1, 0 + giveitem_std ITEM_PP_MAX + compare VAR_RESULT, 0 + call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF + msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 + closemessage + call Route110_TrickHouseEnd_EventScript_26AFCF + release + end + +Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 + msgbox Route110_TrickHouseEnd_Text_26B3AB, 4 + closemessage + compare VAR_FACING, 1 + call_if 1, Route110_TrickHouseEnd_EventScript_26B015 + compare VAR_FACING, 2 + call_if 1, Route110_TrickHouseEnd_EventScript_26B020 + compare VAR_FACING, 3 + call_if 1, Route110_TrickHouseEnd_EventScript_26B02B + compare VAR_FACING, 4 + call_if 1, Route110_TrickHouseEnd_EventScript_26B036 + delay 30 + msgbox Route110_TrickHouseEnd_Text_26B3FA, 4 + closemessage + applymovement 1, Route110_TrickHouseEnd_Movement_27259E + waitmovement 0 + delay 30 + msgbox Route110_TrickHouseEnd_Text_26B485, 4 + setvar VAR_0x40C1, 0 + call Route110_TrickHouseEnd_EventScript_26AFA5 + compare VAR_RESULT, 0 + call_if 1, Route110_TrickHouseEnd_EventScript_26B002 + msgbox Route110_TrickHouseEnd_Text_26B69A, 4 + call Route110_TrickHouseEnd_EventScript_26AFCF + special ResetTrickHouseEndRoomFlag + release + end + +Route110_TrickHouseEnd_EventScript_26AFA5:: @ 826AFA5 + multichoice 0, 0, 88, 1 + switch VAR_RESULT + case 0, Route110_TrickHouseEnd_EventScript_26AFBF + goto Route110_TrickHouseEnd_EventScript_26AFC7 + +Route110_TrickHouseEnd_EventScript_26AFBF:: @ 826AFBF + givedecoration_std 31 + return + +Route110_TrickHouseEnd_EventScript_26AFC7:: @ 826AFC7 + givedecoration_std 32 + return + +Route110_TrickHouseEnd_EventScript_26AFCF:: @ 826AFCF + applymovement 1, Route110_TrickHouseEnd_Movement_269E36 + waitmovement 0 + playse SE_W153 + applymovement 1, Route110_TrickHouseEnd_Movement_269E3F + waitmovement 0 + removeobject 1 + addvar VAR_0x4044, 1 + return + +Route110_TrickHouseEnd_EventScript_26AFEF:: @ 826AFEF + call Route110_TrickHouseEnd_EventScript_27205E + msgbox Route110_TrickHouseEnd_Text_26B760, 4 + setvar VAR_0x40C1, 1 + return + +Route110_TrickHouseEnd_EventScript_26B002:: @ 826B002 + call Route110_TrickHouseEnd_EventScript_272071 + msgbox Route110_TrickHouseEnd_Text_26B615, 4 + setvar VAR_0x40C1, 1 + return + +Route110_TrickHouseEnd_EventScript_26B015:: @ 826B015 + applymovement 1, Route110_TrickHouseEnd_Movement_2725AA + waitmovement 0 + return + +Route110_TrickHouseEnd_EventScript_26B020:: @ 826B020 + applymovement 1, Route110_TrickHouseEnd_Movement_2725A6 + waitmovement 0 + return + +Route110_TrickHouseEnd_EventScript_26B02B:: @ 826B02B + applymovement 1, Route110_TrickHouseEnd_Movement_2725A4 + waitmovement 0 + return + +Route110_TrickHouseEnd_EventScript_26B036:: @ 826B036 + applymovement 1, Route110_TrickHouseEnd_Movement_2725A8 + waitmovement 0 + return + +Route110_TrickHouseEnd_EventScript_26B041:: @ 826B041 + lockall + turnobject 1, 3 + playse SE_PIN + applymovement 1, Route110_TrickHouseEnd_Movement_272598 + waitmovement 0 + delay 20 + applymovement 1, Route110_TrickHouseEnd_Movement_26B08B + waitmovement 0 + playse SE_W153 + applymovement 255, Route110_TrickHouseEnd_Movement_2725AA + waitmovement 0 + msgbox Route110_TrickHouseEnd_Text_26B8BD, 4 + closemessage + applymovement 255, Route110_TrickHouseEnd_Movement_26B089 + waitmovement 0 + delay 4 + turnobject 1, 4 + releaseall + end + +Route110_TrickHouseEnd_Movement_26B089: @ 826B089 + walk_down + step_end + +Route110_TrickHouseEnd_Movement_26B08B: @ 826B08B + jump_in_place_left + step_end + +Route110_TrickHouseEnd_Text_26B08D: @ 826B08D + .string "Aak!\n" + .string "You’ve made it to me?\l" + .string "Hmmm… You’re sharp!$" + +Route110_TrickHouseEnd_Text_26B0BC: @ 826B0BC + .string "It took me all night to plant all those\n" + .string "trees…\p" + .string "You’re almost my equal in greatness by\n" + .string "one, two, three, four, five, six places!$" + +Route110_TrickHouseEnd_Text_26B13B: @ 826B13B + .string "It took me all night to make the maze…\p" + .string "You’re almost my equal in greatness by\n" + .string "one, two, three, four, five places!$" + +Route110_TrickHouseEnd_Text_26B1AD: @ 826B1AD + .string "It took me all night to prepare\n" + .string "the wall panels…\p" + .string "You’re almost my equal in greatness by\n" + .string "one, two, three, four places!$" + +Route110_TrickHouseEnd_Text_26B223: @ 826B223 + .string "It took me all night to shove in those\n" + .string "boulders…\p" + .string "You’re almost my equal in greatness by\n" + .string "one, two, three places!$" + +Route110_TrickHouseEnd_Text_26B293: @ 826B293 + .string "It took me all night to make MECHADOLLS\n" + .string "and another to think up the quiz…\p" + .string "You’re almost my equal in greatness by\n" + .string "one, two places!$" + +Route110_TrickHouseEnd_Text_26B315: @ 826B315 + .string "It took me all night to install\n" + .string "the doors…\p" + .string "You’re almost my equal in greatness!$" + +Route110_TrickHouseEnd_Text_26B365: @ 826B365 + .string "It took me all night setting up arrows…\p" + .string "You’re my equal in greatness!$" + +Route110_TrickHouseEnd_Text_26B3AB: @ 826B3AB + .string "It took me all night polishing floors…\p" + .string "You’re above me in greatness!\n" + .string "Possibly…$" + +Route110_TrickHouseEnd_Text_26B3FA: @ 826B3FA + .string "Wh-what should I do?\n" + .string "My fountain of ideas for tricks has\l" + .string "run dry…\p" + .string "Perhaps it is time I toured the country\n" + .string "on a quest to devise new tricks…$" + +Route110_TrickHouseEnd_Text_26B485: @ 826B485 + .string "I hate to admit defeat, but you have\n" + .string "bested me!\p" + .string "Still, you must have been reeled in by\n" + .string "my charisma for you to visit me again\l" + .string "and again. Yes, you must have!\p" + .string "But that has nothing to do with my\n" + .string "losing!\p" + .string "In recognition of the friendship\n" + .string "between you, the driven, and the genius\l" + .string "that is myself, I demand that you take\l" + .string "this keepsake!\p" + .string "Actually there are two--\n" + .string "a RED TENT and a BLUE TENT.\l" + .string "Which do you prefer?$" + +Route110_TrickHouseEnd_Text_26B615: @ 826B615 + .string "What? No room in your PC?\n" + .string "What am I to make of that?\p" + .string "I wish I could say that, but I am much\n" + .string "too kind and caring, so come back later!$" + +Route110_TrickHouseEnd_Text_26B69A: @ 826B69A + .string "… … … … … …\p" + .string "I am leaving on a journey of discovery.\n" + .string "A quest in search of new tricks.\p" + .string "I wish that you will one day visit and\n" + .string "entertain me again.\p" + .string "And now, farewell!$" + +Route110_TrickHouseEnd_Text_26B73D: @ 826B73D + .string "Fine!\n" + .string "You have earned this reward!$" + +Route110_TrickHouseEnd_Text_26B760: @ 826B760 + .string "What? Have you no room for this?\n" + .string "What manner of items do you carry?\p" + .string "But fine, since you’ve reached me,\n" + .string "your reward will be with me till later.$" + +Route110_TrickHouseEnd_Text_26B7EF: @ 826B7EF + .string "Scrub that smug smirk from your face!\n" + .string "It’s much too early to think you’ve won!\p" + .string "I’ll make new tricks to stump you, I will.\n" + .string "You may mock me only when you’re done.\p" + .string "Come back for the next exciting\n" + .string "installment!$" + +Route110_TrickHouseEnd_Text_26B8BD: @ 826B8BD + .string "Now, now! You’re ignoring me now?\n" + .string "Now that, I consider heartbreaking!$" + diff --git a/data/maps/Route110_TrickHouseEntrance/events.inc b/data/maps/Route110_TrickHouseEntrance/events.inc new file mode 100644 index 000000000..30a6892df --- /dev/null +++ b/data/maps/Route110_TrickHouseEntrance/events.inc @@ -0,0 +1,20 @@ +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 + +Route110_TrickHouseEntrance_MapWarps: @ 853DE84 + 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 + 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 + +Route110_TrickHouseEntrance_MapBGEvents: @ 853DEDC + bg_event 5, 1, 0, 1, 0, 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_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc new file mode 100644 index 000000000..859a28d6a --- /dev/null +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -0,0 +1,901 @@ +Route110_TrickHouseEntrance_MapScripts:: @ 8269A50 + map_script 3, Route110_TrickHouseEntrance_MapScript1_269A60 + map_script 2, Route110_TrickHouseEntrance_MapScript2_269CEE + map_script 4, Route110_TrickHouseEntrance_MapScript2_269BD3 + .byte 0 + +Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60 + setflag FLAG_LANDMARK_TRICK_HOUSE + compare VAR_0x40B5, 1 + goto_eq Route110_TrickHouseEntrance_EventScript_269AF3 + compare VAR_0x40C1, 1 + goto_eq Route110_TrickHouseEntrance_EventScript_269AD7 + compare VAR_0x40A6, 1 + goto_eq Route110_TrickHouseEntrance_EventScript_269BB3 + compare VAR_0x40A7, 5 + call_if 1, Route110_TrickHouseEntrance_EventScript_269B03 + compare VAR_0x40A7, 3 + call_if 1, Route110_TrickHouseEntrance_EventScript_269B03 + compare VAR_0x40A7, 0 + call_if 1, Route110_TrickHouseEntrance_EventScript_269B03 + switch VAR_0x40A7 + case 0, Route110_TrickHouseEntrance_EventScript_269BBB + case 1, Route110_TrickHouseEntrance_EventScript_269BC1 + case 3, Route110_TrickHouseEntrance_EventScript_269BC7 + case 4, Route110_TrickHouseEntrance_EventScript_269BCD + end + +Route110_TrickHouseEntrance_EventScript_269AD7:: @ 8269AD7 + setvar VAR_0x40A5, 1 + compare VAR_0x4044, 8 + goto_eq Route110_TrickHouseEntrance_EventScript_269AED + setvar VAR_0x40A7, 2 + end + +Route110_TrickHouseEntrance_EventScript_269AED:: @ 8269AED + setvar VAR_0x40A7, 6 + end + +Route110_TrickHouseEntrance_EventScript_269AF3:: @ 8269AF3 + setvar VAR_0x40B5, 0 + setvar VAR_0x40A7, 5 + setvar VAR_0x40A5, 1 + end + +Route110_TrickHouseEntrance_EventScript_269B03:: @ 8269B03 + setvar VAR_0x40A7, 0 + compare VAR_0x4044, 1 + call_if 1, Route110_TrickHouseEntrance_EventScript_269B61 + compare VAR_0x4044, 2 + call_if 1, Route110_TrickHouseEntrance_EventScript_269B6B + compare VAR_0x4044, 3 + call_if 1, Route110_TrickHouseEntrance_EventScript_269B75 + compare VAR_0x4044, 4 + call_if 1, Route110_TrickHouseEntrance_EventScript_269B7F + compare VAR_0x4044, 5 + call_if 1, Route110_TrickHouseEntrance_EventScript_269B89 + compare VAR_0x4044, 6 + call_if 1, Route110_TrickHouseEntrance_EventScript_269B93 + compare VAR_0x4044, 7 + call_if 1, Route110_TrickHouseEntrance_EventScript_269B9D + compare VAR_0x4044, 8 + call_if 1, Route110_TrickHouseEntrance_EventScript_269BA7 + return + +Route110_TrickHouseEntrance_EventScript_269B61:: @ 8269B61 + checkflag FLAG_BADGE03_GET + call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD + return + +Route110_TrickHouseEntrance_EventScript_269B6B:: @ 8269B6B + checkflag FLAG_BADGE04_GET + call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD + return + +Route110_TrickHouseEntrance_EventScript_269B75:: @ 8269B75 + checkflag FLAG_BADGE05_GET + call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD + return + +Route110_TrickHouseEntrance_EventScript_269B7F:: @ 8269B7F + checkflag FLAG_BADGE06_GET + call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD + return + +Route110_TrickHouseEntrance_EventScript_269B89:: @ 8269B89 + checkflag FLAG_BADGE07_GET + call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD + return + +Route110_TrickHouseEntrance_EventScript_269B93:: @ 8269B93 + checkflag FLAG_BADGE08_GET + call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD + return + +Route110_TrickHouseEntrance_EventScript_269B9D:: @ 8269B9D + checkflag FLAG_SYS_GAME_CLEAR + call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD + return + +Route110_TrickHouseEntrance_EventScript_269BA7:: @ 8269BA7 + setvar VAR_0x40A7, 4 + return + +Route110_TrickHouseEntrance_EventScript_269BAD:: @ 8269BAD + setvar VAR_0x40A7, 3 + return + +Route110_TrickHouseEntrance_EventScript_269BB3:: @ 8269BB3 + setobjectxyperm 1, 5, 2 + end + +Route110_TrickHouseEntrance_EventScript_269BBB:: @ 8269BBB + setvar VAR_0x40A5, 0 + end + +Route110_TrickHouseEntrance_EventScript_269BC1:: @ 8269BC1 + setvar VAR_0x40A5, 1 + end + +Route110_TrickHouseEntrance_EventScript_269BC7:: @ 8269BC7 + setvar VAR_0x40A5, 1 + end + +Route110_TrickHouseEntrance_EventScript_269BCD:: @ 8269BCD + setvar VAR_0x40A5, 1 + end + +Route110_TrickHouseEntrance_MapScript2_269BD3: @ 8269BD3 + map_script_2 VAR_0x40A6, 1, Route110_TrickHouseEntrance_EventScript_269C15 + map_script_2 VAR_0x40A7, 0, Route110_TrickHouseEntrance_EventScript_269C26 + map_script_2 VAR_0x40A7, 1, Route110_TrickHouseEntrance_EventScript_269CCC + map_script_2 VAR_0x40A7, 2, Route110_TrickHouseEntrance_EventScript_269CD0 + map_script_2 VAR_0x40A7, 3, Route110_TrickHouseEntrance_EventScript_269CD0 + map_script_2 VAR_0x40A7, 4, Route110_TrickHouseEntrance_EventScript_269CCC + map_script_2 VAR_0x40A7, 5, Route110_TrickHouseEntrance_EventScript_269CCC + map_script_2 VAR_0x40A7, 6, Route110_TrickHouseEntrance_EventScript_269CDF + .2byte 0 + +Route110_TrickHouseEntrance_EventScript_269C15:: @ 8269C15 + addobject 1 + showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + turnobject 1, 4 + turnobject 255, 3 + end + +Route110_TrickHouseEntrance_EventScript_269C26:: @ 8269C26 + addobject 1 + hideobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + switch VAR_0x4044 + case 0, Route110_TrickHouseEntrance_EventScript_269C8C + case 1, Route110_TrickHouseEntrance_EventScript_269C94 + case 2, Route110_TrickHouseEntrance_EventScript_269C9C + case 3, Route110_TrickHouseEntrance_EventScript_269CA4 + case 4, Route110_TrickHouseEntrance_EventScript_269CAC + case 5, Route110_TrickHouseEntrance_EventScript_269CB4 + case 6, Route110_TrickHouseEntrance_EventScript_269CBC + case 7, Route110_TrickHouseEntrance_EventScript_269CC4 + end + +Route110_TrickHouseEntrance_EventScript_269C8C:: @ 8269C8C + setobjectxy 1, 6, 3 + end + +Route110_TrickHouseEntrance_EventScript_269C94:: @ 8269C94 + setobjectxy 1, 11, 5 + end + +Route110_TrickHouseEntrance_EventScript_269C9C:: @ 8269C9C + setobjectxy 1, 9, 1 + end + +Route110_TrickHouseEntrance_EventScript_269CA4:: @ 8269CA4 + setobjectxy 1, 3, 1 + end + +Route110_TrickHouseEntrance_EventScript_269CAC:: @ 8269CAC + setobjectxy 1, 0, 5 + end + +Route110_TrickHouseEntrance_EventScript_269CB4:: @ 8269CB4 + setobjectxy 1, 11, 1 + end + +Route110_TrickHouseEntrance_EventScript_269CBC:: @ 8269CBC + setobjectxy 1, 8, 1 + end + +Route110_TrickHouseEntrance_EventScript_269CC4:: @ 8269CC4 + setobjectxy 1, 4, 4 + end + +Route110_TrickHouseEntrance_EventScript_269CCC:: @ 8269CCC + removeobject 1 + end + +Route110_TrickHouseEntrance_EventScript_269CD0:: @ 8269CD0 + addobject 1 + setobjectxy 1, 5, 2 + turnobject 1, 2 + end + +Route110_TrickHouseEntrance_EventScript_269CDF:: @ 8269CDF + addobject 1 + setobjectxy 1, 5, 2 + turnobject 1, 1 + end + +Route110_TrickHouseEntrance_MapScript2_269CEE: @ 8269CEE + map_script_2 VAR_0x40A6, 1, Route110_TrickHouseEntrance_EventScript_269CF8 + .2byte 0 + +Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8 + lockall + delay 20 + compare VAR_0x4044, 0 + call_if 1, Route110_TrickHouseEntrance_EventScript_269E48 + msgbox Route110_TrickHouseEntrance_Text_26A78C, 4 + closemessage + delay 20 + applymovement 1, Route110_TrickHouseEntrance_Movement_269E36 + waitmovement 0 + playse SE_W153 + applymovement 1, Route110_TrickHouseEntrance_Movement_269E3F + waitmovement 0 + removeobject 1 + setvar VAR_0x40A7, 1 + setvar VAR_0x40A6, 0 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_269D39:: @ 8269D39 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_269D3B:: @ 8269D3B + lockall + switch VAR_0x40A7 + case 0, Route110_TrickHouseEntrance_EventScript_269D6E + case 2, Route110_TrickHouseEntrance_EventScript_269E8F + case 3, Route110_TrickHouseEntrance_EventScript_269E51 + case 6, Route110_TrickHouseEntrance_EventScript_26A039 + end + +Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E + playse SE_PIN + applymovement 255, Route110_TrickHouseEntrance_Movement_272598 + waitmovement 0 + applymovement 255, Route110_TrickHouseEntrance_Movement_27259A + waitmovement 0 + compare VAR_0x4044, 0 + call_if 1, Route110_TrickHouseEntrance_EventScript_269DEE + compare VAR_0x4044, 1 + call_if 1, Route110_TrickHouseEntrance_EventScript_269DF7 + compare VAR_0x4044, 2 + call_if 1, Route110_TrickHouseEntrance_EventScript_269E00 + compare VAR_0x4044, 3 + call_if 1, Route110_TrickHouseEntrance_EventScript_269E09 + compare VAR_0x4044, 4 + call_if 1, Route110_TrickHouseEntrance_EventScript_269E12 + compare VAR_0x4044, 5 + call_if 1, Route110_TrickHouseEntrance_EventScript_269E1B + compare VAR_0x4044, 6 + call_if 1, Route110_TrickHouseEntrance_EventScript_269E24 + compare VAR_0x4044, 7 + call_if 1, Route110_TrickHouseEntrance_EventScript_269E2D + closemessage + setvar VAR_0x40A6, 1 + warpsilent MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2 + waitstate + releaseall + end + +Route110_TrickHouseEntrance_EventScript_269DEE:: @ 8269DEE + msgbox Route110_TrickHouseEntrance_Text_26A48A, 4 + return + +Route110_TrickHouseEntrance_EventScript_269DF7:: @ 8269DF7 + msgbox Route110_TrickHouseEntrance_Text_26A4DA, 4 + return + +Route110_TrickHouseEntrance_EventScript_269E00:: @ 8269E00 + msgbox Route110_TrickHouseEntrance_Text_26A529, 4 + return + +Route110_TrickHouseEntrance_EventScript_269E09:: @ 8269E09 + msgbox Route110_TrickHouseEntrance_Text_26A577, 4 + return + +Route110_TrickHouseEntrance_EventScript_269E12:: @ 8269E12 + msgbox Route110_TrickHouseEntrance_Text_26A5C8, 4 + return + +Route110_TrickHouseEntrance_EventScript_269E1B:: @ 8269E1B + msgbox Route110_TrickHouseEntrance_Text_26A616, 4 + return + +Route110_TrickHouseEntrance_EventScript_269E24:: @ 8269E24 + msgbox Route110_TrickHouseEntrance_Text_26A665, 4 + return + +Route110_TrickHouseEntrance_EventScript_269E2D:: @ 8269E2D + msgbox Route110_TrickHouseEntrance_Text_26A6B6, 4 + return + +Route110_TrickHouseEnd_Movement_269E36: @ 8269E36 +Route110_TrickHouseEntrance_Movement_269E36: @ 8269E36 + 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 + face_up + disable_anim + slide_up + slide_up + slide_up + slide_up + slide_up + slide_up + step_end + +Route110_TrickHouseEntrance_EventScript_269E48:: @ 8269E48 + msgbox Route110_TrickHouseEntrance_Text_26A709, 4 + return + +Route110_TrickHouseEntrance_EventScript_269E51:: @ 8269E51 + msgbox Route110_TrickHouseEntrance_Text_26A921, 4 + closemessage + applymovement 1, Route110_TrickHouseEntrance_Movement_27259E + waitmovement 0 + playse SE_PIN + applymovement 1, Route110_TrickHouseEntrance_Movement_272598 + waitmovement 0 + applymovement 1, Route110_TrickHouseEntrance_Movement_27259A + waitmovement 0 + msgbox Route110_TrickHouseEntrance_Text_26A9AF, 4 + applymovement 1, Route110_TrickHouseEntrance_Movement_2725A6 + waitmovement 0 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_269E8F:: @ 8269E8F + applymovement 1, Route110_TrickHouseEntrance_Movement_27259E + waitmovement 0 + msgbox Route110_TrickHouseEntrance_Text_26AA82, 4 + compare VAR_0x4044, 1 + goto_eq Route110_TrickHouseEntrance_EventScript_269EEF + compare VAR_0x4044, 2 + goto_eq Route110_TrickHouseEntrance_EventScript_269F1B + compare VAR_0x4044, 3 + goto_eq Route110_TrickHouseEntrance_EventScript_269F47 + compare VAR_0x4044, 4 + goto_eq Route110_TrickHouseEntrance_EventScript_269F73 + compare VAR_0x4044, 5 + goto_eq Route110_TrickHouseEntrance_EventScript_269F9F + compare VAR_0x4044, 6 + goto_eq Route110_TrickHouseEntrance_EventScript_269FCB + compare VAR_0x4044, 7 + goto_eq Route110_TrickHouseEntrance_EventScript_269FF7 + end + +Route110_TrickHouseEntrance_EventScript_269EEF:: @ 8269EEF + giveitem_std ITEM_RARE_CANDY + compare VAR_RESULT, 1 + goto_eq Route110_TrickHouseEntrance_EventScript_26A023 + compare VAR_RESULT, 0 + call_if 1, Route110_TrickHouseEntrance_EventScript_27205E + msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_269F1B:: @ 8269F1B + giveitem_std ITEM_TIMER_BALL + compare VAR_RESULT, 1 + goto_eq Route110_TrickHouseEntrance_EventScript_26A023 + compare VAR_RESULT, 0 + call_if 1, Route110_TrickHouseEntrance_EventScript_27205E + msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_269F47:: @ 8269F47 + giveitem_std ITEM_HARD_STONE + compare VAR_RESULT, 1 + goto_eq Route110_TrickHouseEntrance_EventScript_26A023 + compare VAR_RESULT, 0 + call_if 1, Route110_TrickHouseEntrance_EventScript_27205E + msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_269F73:: @ 8269F73 + giveitem_std ITEM_SMOKE_BALL + compare VAR_RESULT, 1 + goto_eq Route110_TrickHouseEntrance_EventScript_26A023 + compare VAR_RESULT, 0 + call_if 1, Route110_TrickHouseEntrance_EventScript_27205E + msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_269F9F:: @ 8269F9F + giveitem_std ITEM_TM12 + compare VAR_RESULT, 1 + goto_eq Route110_TrickHouseEntrance_EventScript_26A023 + compare VAR_RESULT, 0 + call_if 1, Route110_TrickHouseEntrance_EventScript_27205E + msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_269FCB:: @ 8269FCB + giveitem_std ITEM_MAGNET + compare VAR_RESULT, 1 + goto_eq Route110_TrickHouseEntrance_EventScript_26A023 + compare VAR_RESULT, 0 + call_if 1, Route110_TrickHouseEntrance_EventScript_27205E + msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7 + giveitem_std ITEM_PP_MAX + compare VAR_RESULT, 1 + goto_eq Route110_TrickHouseEntrance_EventScript_26A023 + compare VAR_RESULT, 0 + call_if 1, Route110_TrickHouseEntrance_EventScript_27205E + msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A023:: @ 826A023 + setvar VAR_0x40C1, 0 + setvar VAR_0x40A7, 3 + applymovement 1, Route110_TrickHouseEntrance_Movement_2725A6 + waitmovement 0 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A039:: @ 826A039 + applymovement 1, Route110_TrickHouseEntrance_Movement_27259E + waitmovement 0 + msgbox Route110_TrickHouseEntrance_Text_26AB2C, 4 + call Route110_TrickHouseEntrance_EventScript_26A070 + compare VAR_RESULT, 1 + goto_eq Route110_TrickHouseEntrance_EventScript_26A09A + compare VAR_RESULT, 0 + call_if 1, Route110_TrickHouseEntrance_EventScript_272071 + msgbox Route110_TrickHouseEntrance_Text_26ABBD, 4 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A070:: @ 826A070 + multichoice 0, 0, 88, 1 + switch VAR_RESULT + case 0, Route110_TrickHouseEntrance_EventScript_26A08A + goto Route110_TrickHouseEntrance_EventScript_26A092 + +Route110_TrickHouseEntrance_EventScript_26A08A:: @ 826A08A + givedecoration_std 31 + return + +Route110_TrickHouseEntrance_EventScript_26A092:: @ 826A092 + givedecoration_std 32 + return + +Route110_TrickHouseEntrance_EventScript_26A09A:: @ 826A09A + msgbox Route110_TrickHouseEntrance_Text_26ABAE, 4 + closemessage + applymovement 1, Route110_TrickHouseEntrance_Movement_26D632 + waitmovement 0 + applymovement 1, Route110_TrickHouseEntrance_Movement_269E36 + waitmovement 0 + playse SE_W153 + applymovement 1, Route110_TrickHouseEntrance_Movement_269E3F + waitmovement 0 + removeobject 1 + setvar VAR_0x40C1, 0 + setvar VAR_0x40A7, 5 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A0D3:: @ 826A0D3 + lockall + switch VAR_0x40A7 + case 0, Route110_TrickHouseEntrance_EventScript_26A106 + case 1, Route110_TrickHouseEntrance_EventScript_26A110 + case 4, Route110_TrickHouseEntrance_EventScript_26A201 + case 5, Route110_TrickHouseEntrance_EventScript_26A20B + end + +Route110_TrickHouseEntrance_EventScript_26A106:: @ 826A106 + msgbox Route110_TrickHouseEntrance_Text_26A878, 4 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A110:: @ 826A110 + msgbox Route110_TrickHouseEntrance_Text_26A887, 5 + closemessage + compare VAR_RESULT, 1 + goto_eq Route110_TrickHouseEntrance_EventScript_26A126 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A126:: @ 826A126 + setmetatile 5, 1, 537, 0 + special DrawWholeMapView + delay 20 + applymovement 255, Route110_TrickHouseEntrance_Movement_2725C9 + waitmovement 0 + applymovement 255, Route110_TrickHouseEntrance_Movement_26A1A7 + waitmovement 0 + switch VAR_0x4044 + case 0, Route110_TrickHouseEntrance_EventScript_26A1A9 + case 1, Route110_TrickHouseEntrance_EventScript_26A1B4 + case 2, Route110_TrickHouseEntrance_EventScript_26A1BF + case 3, Route110_TrickHouseEntrance_EventScript_26A1CA + case 4, Route110_TrickHouseEntrance_EventScript_26A1D5 + case 5, Route110_TrickHouseEntrance_EventScript_26A1E0 + case 6, Route110_TrickHouseEntrance_EventScript_26A1EB + case 7, Route110_TrickHouseEntrance_EventScript_26A1F6 + end + +Route110_TrickHouseEntrance_Movement_26A1A7: @ 826A1A7 + set_invisible + step_end + +Route110_TrickHouseEntrance_EventScript_26A1A9:: @ 826A1A9 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE1, 255, 0, 21 + waitstate + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A1B4:: @ 826A1B4 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE2, 255, 0, 21 + waitstate + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A1BF:: @ 826A1BF + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE3, 255, 0, 21 + waitstate + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A1CA:: @ 826A1CA + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE4, 255, 0, 21 + waitstate + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A1D5:: @ 826A1D5 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21 + waitstate + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A1E0:: @ 826A1E0 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE6, 255, 0, 21 + waitstate + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A1EB:: @ 826A1EB + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 0, 21 + waitstate + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A1F6:: @ 826A1F6 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE8, 255, 0, 21 + waitstate + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A201:: @ 826A201 + msgbox Route110_TrickHouseEntrance_Text_26A8BD, 4 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A20B:: @ 826A20B + compare VAR_0x4044, 8 + goto_eq Route110_TrickHouseEntrance_EventScript_26A220 + msgbox Route110_TrickHouseEntrance_Text_26A878, 4 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A220:: @ 826A220 + msgbox Route110_TrickHouseEntrance_Text_26A8BD, 4 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A22A:: @ 826A22A + lockall + switch VAR_0x4044 + case 0, Route110_TrickHouseEntrance_EventScript_26A289 + case 1, Route110_TrickHouseEntrance_EventScript_26A2B2 + case 2, Route110_TrickHouseEntrance_EventScript_26A2DB + case 3, Route110_TrickHouseEntrance_EventScript_26A304 + case 4, Route110_TrickHouseEntrance_EventScript_26A32D + case 5, Route110_TrickHouseEntrance_EventScript_26A356 + case 6, Route110_TrickHouseEntrance_EventScript_26A37F + case 7, Route110_TrickHouseEntrance_EventScript_26A3A8 + end + +Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289 + compare VAR_0x40AB, 0 + goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + msgbox Route110_TrickHousePuzzle1_Text_26B98D, 4 + playse SE_PIN + setvar VAR_0x40AB, 2 + setmetatile 13, 1, 523, 0 + special DrawWholeMapView + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2 + compare VAR_0x40AC, 0 + goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + msgbox Route110_TrickHousePuzzle2_Text_26BCBA, 4 + playse SE_PIN + setvar VAR_0x40AC, 2 + setmetatile 13, 1, 523, 0 + special DrawWholeMapView + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB + compare VAR_0x40AD, 0 + goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + msgbox Route110_TrickHousePuzzle3_Text_26C609, 4 + playse SE_PIN + setvar VAR_0x40AD, 2 + setmetatile 13, 1, 523, 0 + special DrawWholeMapView + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304 + compare VAR_0x40AE, 0 + goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + msgbox Route110_TrickHousePuzzle4_Text_26C8C3, 4 + playse SE_PIN + setvar VAR_0x40AE, 2 + setmetatile 13, 1, 523, 0 + special DrawWholeMapView + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D + compare VAR_0x40AF, 0 + goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + msgbox Route110_TrickHousePuzzle5_Text_26D660, 4 + playse SE_PIN + setvar VAR_0x40AF, 2 + setmetatile 13, 1, 523, 0 + special DrawWholeMapView + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356 + compare VAR_0x40B0, 0 + goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + msgbox Route110_TrickHousePuzzle6_Text_26DE26, 4 + playse SE_PIN + setvar VAR_0x40B0, 2 + setmetatile 13, 1, 523, 0 + special DrawWholeMapView + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F + compare VAR_0x40B1, 0 + goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + msgbox Route110_TrickHousePuzzle7_EventScript_26E413, 4 + playse SE_PIN + setvar VAR_0x40B1, 2 + setmetatile 13, 1, 523, 0 + special DrawWholeMapView + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A3A8:: @ 826A3A8 + compare VAR_0x40B2, 0 + goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + msgbox Route110_TrickHousePuzzle8_EventScript_26E864, 4 + playse SE_PIN + setvar VAR_0x40B2, 2 + setmetatile 13, 1, 523, 0 + special DrawWholeMapView + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A3D1:: @ 826A3D1 + msgbox Route110_TrickHouseEntrance_Text_26AC4F, 4 + releaseall + end + +Route110_TrickHousePuzzle1_EventScript_26A3DB:: @ 826A3DB +Route110_TrickHousePuzzle2_EventScript_26A3DB:: @ 826A3DB +Route110_TrickHousePuzzle3_EventScript_26A3DB:: @ 826A3DB +Route110_TrickHousePuzzle4_EventScript_26A3DB:: @ 826A3DB +Route110_TrickHousePuzzle5_EventScript_26A3DB:: @ 826A3DB +Route110_TrickHousePuzzle6_EventScript_26A3DB:: @ 826A3DB +Route110_TrickHousePuzzle7_EventScript_26A3DB:: @ 826A3DB +Route110_TrickHousePuzzle8_EventScript_26A3DB:: @ 826A3DB + msgbox Route110_TrickHousePuzzle1_Text_26AC2F, 4 + releaseall + end + +Route110_TrickHousePuzzle1_EventScript_26A3E5:: @ 826A3E5 +Route110_TrickHousePuzzle2_EventScript_26A3E5:: @ 826A3E5 +Route110_TrickHousePuzzle3_EventScript_26A3E5:: @ 826A3E5 +Route110_TrickHousePuzzle4_EventScript_26A3E5:: @ 826A3E5 +Route110_TrickHousePuzzle5_EventScript_26A3E5:: @ 826A3E5 +Route110_TrickHousePuzzle6_EventScript_26A3E5:: @ 826A3E5 +Route110_TrickHousePuzzle7_EventScript_26A3E5:: @ 826A3E5 +Route110_TrickHousePuzzle8_EventScript_26A3E5:: @ 826A3E5 + playfanfare MUS_FANFA4 + message Route110_TrickHousePuzzle1_Text_26ABE8 + waitfanfare + msgbox Route110_TrickHousePuzzle1_Text_26ABFB, 4 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A3F8:: @ 826A3F8 + lockall + msgbox Route110_TrickHouseEntrance_Text_26A474, 4 + releaseall + compare VAR_0x4044, 0 + call_if 1, Route110_TrickHouseEntrance_EventScript_26A429 + compare VAR_0x4044, 1 + call_if 1, Route110_TrickHouseEntrance_EventScript_26A439 + compare VAR_0x4044, 2 + call_if 1, Route110_TrickHouseEntrance_EventScript_26A449 + setvar VAR_0x40A5, 1 + end + +Route110_TrickHouseEntrance_EventScript_26A429:: @ 826A429 + setvar VAR_0x8004, 6 + setvar VAR_0x8005, 3 + call Route110_TrickHouseEntrance_EventScript_26A459 + return + +Route110_TrickHouseEntrance_EventScript_26A439:: @ 826A439 + setvar VAR_0x8004, 11 + setvar VAR_0x8005, 5 + call Route110_TrickHouseEntrance_EventScript_26A459 + return + +Route110_TrickHouseEntrance_EventScript_26A449:: @ 826A449 + setvar VAR_0x8004, 9 + setvar VAR_0x8005, 2 + call Route110_TrickHouseEntrance_EventScript_26A459 + return + +Route110_TrickHouseEntrance_EventScript_26A459:: @ 826A459 + setvar VAR_0x8006, 0 + setfieldeffectargument 0, VAR_0x8004 + setfieldeffectargument 1, VAR_0x8005 + setfieldeffectargument 2, VAR_0x8006 + dofieldeffect 54 + waitfieldeffect 54 + delay 10 + return + +Route110_TrickHouseEntrance_Text_26A474: @ 826A474 + .string "You’re being watched…$" + +Route110_TrickHouseEntrance_Text_26A48A: @ 826A48A + .string "Hah? Grrr…\p" + .string "How did you know I concealed myself\n" + .string "beneath this desk? You’re sharp!$" + +Route110_TrickHouseEntrance_Text_26A4DA: @ 826A4DA + .string "Hah? Grrr…\p" + .string "How did you know I concealed myself\n" + .string "behind this tree? You’re sharp!$" + +Route110_TrickHouseEntrance_Text_26A529: @ 826A529 + .string "Hah? Grrr…\p" + .string "How did you know I concealed myself\n" + .string "in this dresser? You’re sharp!$" + +Route110_TrickHouseEntrance_Text_26A577: @ 826A577 + .string "Hah? Grrr…\p" + .string "How did you know I concealed myself\n" + .string "beyond this window? You’re sharp!$" + +Route110_TrickHouseEntrance_Text_26A5C8: @ 826A5C8 + .string "Hah? Grrr…\p" + .string "How did you know I concealed myself\n" + .string "in this planter? You’re sharp!$" + +Route110_TrickHouseEntrance_Text_26A616: @ 826A616 + .string "Hah? Grrr…\p" + .string "How did you know I concealed myself\n" + .string "in this cupboard? You’re sharp!$" + +Route110_TrickHouseEntrance_Text_26A665: @ 826A665 + .string "Hah? Grrr…\p" + .string "How did you know I concealed myself\n" + .string "behind this window? You’re sharp!$" + +Route110_TrickHouseEntrance_Text_26A6B6: @ 826A6B6 + .string "Hah? Grrr…\p" + .string "How did you know I concealed myself\n" + .string "beneath this cushion? You’re sharp!$" + +Route110_TrickHouseEntrance_Text_26A709: @ 826A709 + .string "Behold!\p" + .string "For I am the greatest living mystery\n" + .string "of a man in all of HOENN!\l" + .string "They call me…\p" + .string "The TRICK MASTER!\n" + .string "Wahahaha! Glad to meet you!$" + +Route110_TrickHouseEntrance_Text_26A78C: @ 826A78C + .string "You, you’ve come to challenge\n" + .string "my TRICK HOUSE, haven’t you?\p" + .string "That’s why you’re here, isn’t it?\n" + .string "Yes, it is!\p" + .string "Consider your challenge accepted!\p" + .string "Enter through the scroll there,\n" + .string "and let your challenge commence!\p" + .string "I shall be waiting in the back!$" + +Route110_TrickHouseEntrance_Text_26A878: @ 826A878 + .string "It’s a scroll.$" + +Route110_TrickHouseEntrance_Text_26A887: @ 826A887 + .string "There is a big hole behind the scroll!\p" + .string "Want to go in?$" + +Route110_TrickHouseEntrance_Text_26A8BD: @ 826A8BD + .string "There is a note affixed to the scroll…\p" + .string "“I am leaving on a journey.\n" + .string "Don’t look for me. TRICK MASTERâ€$" + +Route110_TrickHouseEntrance_Text_26A921: @ 826A921 + .string "For the next time, I’ll use this trick,\n" + .string "and that scheme, and those ruses…\p" + .string "Mufufufu… If I may say so, it’s\n" + .string "brilliantly difficult, even for me!$" + +Route110_TrickHouseEntrance_Text_26A9AF: @ 826A9AF + .string "Hah? What?!\n" + .string "Oh, it’s you!\p" + .string "I’m in the midst of devising new tricky\n" + .string "challenges!\p" + .string "It’s not too much to ask for a bit more\n" + .string "time for me to think, is it now?\l" + .string "You wouldn’t begrudge me that?\l" + .string "Come back in a little while!$" + +Route110_TrickHouseEntrance_Text_26AA82: @ 826AA82 + .string "Ah, it’s you! You’re here to accept the\n" + .string "reward from before, isn’t that right?\l" + .string "Yes, right I am!\p" + .string "Here!\n" + .string "I’ll give it to you now!$" + +Route110_TrickHouseEntrance_Text_26AB00: @ 826AB00 + .string "Hah?\n" + .string "Did you not come to claim your reward?$" + +Route110_TrickHouseEntrance_Text_26AB2C: @ 826AB2C + .string "MECHADOLL 5 I AM!\n" + .string "IF REWARD IS NOT TAKEN BY YOU,\l" + .string "THEN TRICK MASTER YOU CANNOT FOLLOW.\p" + .string "RED TENT OR BLUE TENT,\n" + .string "WHICH DO YOU PREFER?$" + +Route110_TrickHouseEntrance_Text_26ABAE: @ 826ABAE + .string "THEN FAREWELL.$" + +Route110_TrickHouseEntrance_Text_26ABBD: @ 826ABBD + .string "YOUR PC STATUS: FULL AGAIN.\n" + .string "MEAN, YOU ARE.$" + +Route110_TrickHousePuzzle1_Text_26ABE8: @ 826ABE8 + .string "{PLAYER} found a scroll.$" + +Route110_TrickHousePuzzle1_Text_26ABFB: @ 826ABFB + .string "{PLAYER} memorized the secret code\n" + .string "written on the scroll.$" + +Route110_TrickHousePuzzle1_Text_26AC2F: @ 826AC2F + .string "A secret code is written on it.$" + +Route110_TrickHouseEntrance_Text_26AC4F: @ 826AC4F + .string "The door is locked.\p" + .string "…On closer inspection, this is written\n" + .string "on it: “Write the secret code here.â€$" diff --git a/data/maps/Route110_TrickHousePuzzle1/events.inc b/data/maps/Route110_TrickHousePuzzle1/events.inc new file mode 100644 index 000000000..05824aa38 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle1/events.inc @@ -0,0 +1,28 @@ +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 + +Route110_TrickHousePuzzle1_MapWarps: @ 853E0F0 + 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 + +Route110_TrickHousePuzzle1_MapEvents:: @ 853E114 + map_events Route110_TrickHousePuzzle1_EventObjects, Route110_TrickHousePuzzle1_MapWarps, 0x0, Route110_TrickHousePuzzle1_MapBGEvents + diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc new file mode 100644 index 000000000..340a7e03c --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc @@ -0,0 +1,79 @@ +Route110_TrickHousePuzzle1_MapScripts:: @ 826B90F + map_script 1, Route110_TrickHousePuzzle1_MapScript1_26B915 + .byte 0 + +Route110_TrickHousePuzzle1_MapScript1_26B915: @ 826B915 + compare VAR_0x40AB, 2 + goto_eq Route110_TrickHousePuzzle1_EventScript_26B921 + end + +Route110_TrickHousePuzzle1_EventScript_26B921:: @ 826B921 + setmetatile 13, 1, 523, 0 + end + +Route110_TrickHousePuzzle1_EventScript_26B92B:: @ 826B92B + lockall + compare VAR_0x40AB, 0 + goto_eq Route110_TrickHousePuzzle1_EventScript_26B93D + goto Route110_TrickHousePuzzle1_EventScript_26A3DB + end + +Route110_TrickHousePuzzle1_EventScript_26B93D:: @ 826B93D + setvar VAR_0x40AB, 1 + goto Route110_TrickHousePuzzle1_EventScript_26A3E5 + end + +Route110_TrickHousePuzzle1_EventScript_26B948:: @ 826B948 + trainerbattle 0, TRAINER_SALLY, 0, Route110_TrickHousePuzzle1_Text_26B9FB, Route110_TrickHousePuzzle1_Text_26BA3F + msgbox Route110_TrickHousePuzzle1_Text_26BA57, 6 + end + +Route110_TrickHousePuzzle1_EventScript_26B95F:: @ 826B95F + trainerbattle 0, TRAINER_EDDIE, 0, Route110_TrickHousePuzzle1_Text_26BA82, Route110_TrickHousePuzzle1_Text_26BAB0 + msgbox Route110_TrickHousePuzzle1_Text_26BAC3, 6 + end + +Route110_TrickHousePuzzle1_EventScript_26B976:: @ 826B976 + trainerbattle 0, TRAINER_ROBIN, 0, Route110_TrickHousePuzzle1_Text_26BB10, Route110_TrickHousePuzzle1_Text_26BB2E + msgbox Route110_TrickHousePuzzle1_Text_26BB52, 6 + end + +Route110_TrickHousePuzzle1_Text_26B98D:: @ 826B98D + .string "{PLAYER} wrote down the secret code\n" + .string "on the door.\p" + .string "“TRICK MASTER is fabulous.â€\n" + .string "… … … … … … … …\p" + .string "The lock clicked open!$" + +Route110_TrickHousePuzzle1_Text_26B9FB: @ 826B9FB + .string "I’ll hack and slash my way to victory\n" + .string "with the CUT we just learned!$" + +Route110_TrickHousePuzzle1_Text_26BA3F: @ 826BA3F + .string "Why are you so serious?$" + +Route110_TrickHousePuzzle1_Text_26BA57: @ 826BA57 + .string "I never get tired of hacking\n" + .string "and slashing!$" + +Route110_TrickHousePuzzle1_Text_26BA82: @ 826BA82 + .string "I wandered into this weird house\n" + .string "by accident…$" + +Route110_TrickHousePuzzle1_Text_26BAB0: @ 826BAB0 + .string "And now I’ve lost…$" + +Route110_TrickHousePuzzle1_Text_26BAC3: @ 826BAC3 + .string "I lost my way, I lost a battle, and I’m\n" + .string "now even more lost… I can’t get out…$" + +Route110_TrickHousePuzzle1_Text_26BB10: @ 826BB10 + .string "Just who is the TRICK MASTER?$" + +Route110_TrickHousePuzzle1_Text_26BB2E: @ 826BB2E + .string "I lost while I was lost in thought!$" + +Route110_TrickHousePuzzle1_Text_26BB52: @ 826BB52 + .string "You’re strong!\n" + .string "Just who are you?$" + diff --git a/data/maps/Route110_TrickHousePuzzle2/events.inc b/data/maps/Route110_TrickHousePuzzle2/events.inc new file mode 100644 index 000000000..a7259e3b3 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle2/events.inc @@ -0,0 +1,24 @@ +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 + +Route110_TrickHousePuzzle2_MapWarps: @ 853E1A0 + 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 + 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 + +Route110_TrickHousePuzzle2_MapBGEvents: @ 853E1F8 + bg_event 14, 14, 0, 0, 0, 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_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc new file mode 100644 index 000000000..b724b986d --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc @@ -0,0 +1,146 @@ +Route110_TrickHousePuzzle2_MapScripts:: @ 826BB73 + map_script 5, Route110_TrickHousePuzzle2_MapScript1_26BB7E + map_script 3, Route110_TrickHousePuzzle2_MapScript1_26BBAB + .byte 0 + +Route110_TrickHousePuzzle2_MapScript1_26BB7E: @ 826BB7E + compare VAR_TEMP_1, 1 + call_if 1, Route110_TrickHousePuzzle2_EventScript_26BC29 + compare VAR_TEMP_2, 1 + call_if 1, Route110_TrickHousePuzzle2_EventScript_26BC3C + compare VAR_TEMP_3, 1 + call_if 1, Route110_TrickHousePuzzle2_EventScript_26BC4F + compare VAR_TEMP_4, 1 + call_if 1, Route110_TrickHousePuzzle2_EventScript_26BC62 + end + +Route110_TrickHousePuzzle2_MapScript1_26BBAB: @ 826BBAB + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 + end + +Route110_TrickHousePuzzle2_EventScript_26BBC0:: @ 826BBC0 + lockall + compare VAR_0x40AC, 0 + goto_eq Route110_TrickHousePuzzle2_EventScript_26BBD2 + goto Route110_TrickHousePuzzle2_EventScript_26A3DB + end + +Route110_TrickHousePuzzle2_EventScript_26BBD2:: @ 826BBD2 + setvar VAR_0x40AC, 1 + goto Route110_TrickHousePuzzle2_EventScript_26A3E5 + end + +Route110_TrickHousePuzzle2_EventScript_26BBDD:: @ 826BBDD + lockall + setvar VAR_TEMP_1, 1 + playse SE_PIN + call Route110_TrickHousePuzzle2_EventScript_26BC29 + special DrawWholeMapView + releaseall + end + +Route110_TrickHousePuzzle2_EventScript_26BBF0:: @ 826BBF0 + lockall + setvar VAR_TEMP_2, 1 + playse SE_PIN + call Route110_TrickHousePuzzle2_EventScript_26BC3C + special DrawWholeMapView + releaseall + end + +Route110_TrickHousePuzzle2_EventScript_26BC03:: @ 826BC03 + lockall + setvar VAR_TEMP_3, 1 + playse SE_PIN + call Route110_TrickHousePuzzle2_EventScript_26BC4F + special DrawWholeMapView + releaseall + end + +Route110_TrickHousePuzzle2_EventScript_26BC16:: @ 826BC16 + lockall + setvar VAR_TEMP_4, 1 + playse SE_PIN + call Route110_TrickHousePuzzle2_EventScript_26BC62 + special DrawWholeMapView + releaseall + end + +Route110_TrickHousePuzzle2_EventScript_26BC29:: @ 826BC29 + setmetatile 11, 12, 601, 0 + setmetatile 1, 13, 618, 0 + return + +Route110_TrickHousePuzzle2_EventScript_26BC3C:: @ 826BC3C + setmetatile 0, 4, 601, 0 + setmetatile 5, 6, 618, 0 + return + +Route110_TrickHousePuzzle2_EventScript_26BC4F:: @ 826BC4F + setmetatile 14, 5, 601, 0 + setmetatile 7, 15, 618, 0 + return + +Route110_TrickHousePuzzle2_EventScript_26BC62:: @ 826BC62 + setmetatile 7, 11, 601, 0 + setmetatile 14, 12, 618, 0 + return + +Route110_TrickHousePuzzle2_EventScript_26BC75:: @ 826BC75 + trainerbattle 0, TRAINER_TED, 0, Route110_TrickHousePuzzle2_Text_26BD25, Route110_TrickHousePuzzle2_Text_26BD45 + msgbox Route110_TrickHousePuzzle2_Text_26BD70, 6 + end + +Route110_TrickHousePuzzle2_EventScript_26BC8C:: @ 826BC8C + trainerbattle 0, TRAINER_PAUL, 0, Route110_TrickHousePuzzle2_Text_26BD9E, Route110_TrickHousePuzzle2_Text_26BDCF + msgbox Route110_TrickHousePuzzle2_Text_26BDEC, 6 + end + +Route110_TrickHousePuzzle2_EventScript_26BCA3:: @ 826BCA3 + trainerbattle 0, TRAINER_GEORGIA, 0, Route110_TrickHousePuzzle2_Text_26BE31, Route110_TrickHousePuzzle2_Text_26BE77 + msgbox Route110_TrickHousePuzzle2_Text_26BE97, 6 + end + +Route110_TrickHousePuzzle2_Text_26BCBA: @ 826BCBA + .string "{PLAYER} wrote down the secret code\n" + .string "on the door.\p" + .string "“TRICK MASTER is smart.â€\n" + .string "… … … … … … … …\p" + .string "The lock clicked open!$" + +Route110_TrickHousePuzzle2_Text_26BD25: @ 826BD25 + .string "Which switch closes which hole?$" + +Route110_TrickHousePuzzle2_Text_26BD45: @ 826BD45 + .string "After that battle, I’m even more\n" + .string "confused!$" + +Route110_TrickHousePuzzle2_Text_26BD70: @ 826BD70 + .string "Can I get you to push all the buttons\n" + .string "for me?$" + +Route110_TrickHousePuzzle2_Text_26BD9E: @ 826BD9E + .string "Oh! You’re on your second TRICK HOUSE\n" + .string "challenge!$" + +Route110_TrickHousePuzzle2_Text_26BDCF: @ 826BDCF + .string "You’re good at battling too?$" + +Route110_TrickHousePuzzle2_Text_26BDEC: @ 826BDEC + .string "The TRICK MASTER rigged all the tricks\n" + .string "in this house all by himself.$" + +Route110_TrickHousePuzzle2_Text_26BE31: @ 826BE31 + .string "I want to make my own GYM one day.\n" + .string "So, I’m studying how to set traps.$" + +Route110_TrickHousePuzzle2_Text_26BE77: @ 826BE77 + .string "I didn’t study battling enough!$" + +Route110_TrickHousePuzzle2_Text_26BE97: @ 826BE97 + .string "You’re strong, aren’t you?\n" + .string "Maybe even enough to be a GYM LEADER!$" + diff --git a/data/maps/Route110_TrickHousePuzzle3/events.inc b/data/maps/Route110_TrickHousePuzzle3/events.inc new file mode 100644 index 000000000..2f95cf052 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle3/events.inc @@ -0,0 +1,26 @@ +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 + +Route110_TrickHousePuzzle3_MapWarps: @ 853E2C0 + 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 + 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 + +Route110_TrickHousePuzzle3_MapBGEvents: @ 853E318 + bg_event 0, 14, 0, 0, 0, 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_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc new file mode 100644 index 000000000..9956f9889 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc @@ -0,0 +1,360 @@ +Route110_TrickHousePuzzle3_MapScripts:: @ 826BED8 + map_script 5, Route110_TrickHousePuzzle3_MapScript1_26BEE3 + map_script 3, Route110_TrickHousePuzzle3_MapScript1_26BEFF + .byte 0 + +Route110_TrickHousePuzzle3_MapScript1_26BEE3: @ 826BEE3 + call Route110_TrickHousePuzzle3_EventScript_26BF1E + compare VAR_TEMP_9, 0 + call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF97 + compare VAR_TEMP_9, 1 + call_if 1, Route110_TrickHousePuzzle3_EventScript_26C232 + end + +Route110_TrickHousePuzzle3_MapScript1_26BEFF: @ 826BEFF + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 + setvar VAR_TEMP_8, 0 + setvar VAR_TEMP_9, 0 + end + +Route110_TrickHousePuzzle3_EventScript_26BF1E:: @ 826BF1E + setmetatile 4, 14, 600, 0 + setmetatile 3, 11, 600, 0 + setmetatile 12, 5, 600, 0 + setmetatile 8, 2, 600, 0 + compare VAR_TEMP_8, 1 + call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF6F + compare VAR_TEMP_8, 2 + call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF79 + compare VAR_TEMP_8, 3 + call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF83 + compare VAR_TEMP_8, 4 + call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF8D + return + +Route110_TrickHousePuzzle3_EventScript_26BF6F:: @ 826BF6F + setmetatile 4, 14, 601, 0 + return + +Route110_TrickHousePuzzle3_EventScript_26BF79:: @ 826BF79 + setmetatile 3, 11, 601, 0 + return + +Route110_TrickHousePuzzle3_EventScript_26BF83:: @ 826BF83 + setmetatile 12, 5, 601, 0 + return + +Route110_TrickHousePuzzle3_EventScript_26BF8D:: @ 826BF8D + setmetatile 8, 2, 601, 0 + return + +Route110_TrickHousePuzzle3_EventScript_26BF97:: @ 826BF97 + setmetatile 1, 6, 587, 0 + setmetatile 2, 6, 588, 0 + setmetatile 1, 7, 595, 0 + setmetatile 2, 7, 596, 0 + setmetatile 1, 9, 587, 0 + setmetatile 2, 9, 588, 0 + setmetatile 1, 10, 595, 0 + setmetatile 2, 10, 596, 0 + setmetatile 4, 15, 587, 0 + setmetatile 5, 15, 588, 0 + setmetatile 4, 16, 595, 0 + setmetatile 5, 16, 596, 0 + setmetatile 13, 9, 587, 0 + setmetatile 14, 9, 588, 0 + setmetatile 13, 10, 595, 0 + setmetatile 14, 10, 596, 0 + setmetatile 13, 15, 587, 0 + setmetatile 14, 15, 588, 0 + setmetatile 13, 16, 595, 0 + setmetatile 14, 16, 596, 0 + setmetatile 3, 7, 589, 1 + setmetatile 3, 8, 597, 0 + setmetatile 3, 13, 589, 1 + setmetatile 3, 14, 597, 0 + setmetatile 6, 4, 589, 1 + setmetatile 6, 5, 597, 0 + setmetatile 9, 16, 589, 1 + setmetatile 9, 17, 597, 0 + setmetatile 12, 7, 589, 1 + setmetatile 12, 8, 597, 0 + setmetatile 1, 3, 568, 0 + setmetatile 2, 3, 569, 0 + setmetatile 1, 4, 576, 1 + setmetatile 2, 4, 577, 1 + setmetatile 1, 12, 568, 0 + setmetatile 2, 12, 569, 0 + setmetatile 1, 13, 576, 1 + setmetatile 2, 13, 577, 1 + setmetatile 4, 6, 568, 0 + setmetatile 5, 6, 569, 0 + setmetatile 4, 7, 576, 1 + setmetatile 5, 7, 577, 1 + setmetatile 4, 12, 568, 0 + setmetatile 5, 12, 569, 0 + setmetatile 4, 13, 576, 1 + setmetatile 5, 13, 577, 1 + setmetatile 4, 18, 568, 0 + setmetatile 5, 18, 569, 0 + setmetatile 4, 19, 576, 1 + setmetatile 5, 19, 577, 1 + setmetatile 7, 9, 568, 0 + setmetatile 8, 9, 569, 0 + setmetatile 7, 10, 576, 1 + setmetatile 8, 10, 577, 1 + setmetatile 10, 6, 568, 0 + setmetatile 11, 6, 569, 0 + setmetatile 10, 7, 576, 1 + setmetatile 11, 7, 577, 1 + setmetatile 10, 12, 568, 0 + setmetatile 11, 12, 569, 0 + setmetatile 10, 13, 576, 1 + setmetatile 11, 13, 577, 1 + setmetatile 10, 18, 568, 0 + setmetatile 11, 18, 569, 0 + setmetatile 10, 19, 576, 1 + setmetatile 11, 19, 577, 1 + setmetatile 13, 3, 568, 0 + setmetatile 14, 3, 569, 0 + setmetatile 13, 4, 576, 1 + setmetatile 14, 4, 577, 1 + setmetatile 3, 16, 570, 1 + setmetatile 3, 17, 578, 1 + setmetatile 9, 4, 570, 1 + setmetatile 9, 5, 578, 1 + return + +Route110_TrickHousePuzzle3_EventScript_26C232:: @ 826C232 + setmetatile 1, 6, 571, 0 + setmetatile 2, 6, 572, 0 + setmetatile 1, 7, 579, 1 + setmetatile 2, 7, 580, 1 + setmetatile 1, 9, 571, 0 + setmetatile 2, 9, 572, 0 + setmetatile 1, 10, 579, 1 + setmetatile 2, 10, 580, 1 + setmetatile 4, 15, 571, 0 + setmetatile 5, 15, 572, 0 + setmetatile 4, 16, 579, 1 + setmetatile 5, 16, 580, 1 + setmetatile 13, 9, 571, 0 + setmetatile 14, 9, 572, 0 + setmetatile 13, 10, 579, 1 + setmetatile 14, 10, 580, 1 + setmetatile 13, 15, 571, 0 + setmetatile 14, 15, 572, 0 + setmetatile 13, 16, 579, 1 + setmetatile 14, 16, 580, 1 + setmetatile 3, 7, 573, 1 + setmetatile 3, 8, 581, 1 + setmetatile 3, 13, 573, 1 + setmetatile 3, 14, 581, 1 + setmetatile 6, 4, 573, 1 + setmetatile 6, 5, 581, 1 + setmetatile 9, 16, 573, 1 + setmetatile 9, 17, 581, 1 + setmetatile 12, 7, 573, 1 + setmetatile 12, 8, 581, 1 + setmetatile 1, 3, 584, 0 + setmetatile 2, 3, 585, 0 + setmetatile 1, 4, 592, 0 + setmetatile 2, 4, 593, 0 + setmetatile 1, 12, 584, 0 + setmetatile 2, 12, 585, 0 + setmetatile 1, 13, 592, 0 + setmetatile 2, 13, 593, 0 + setmetatile 4, 6, 584, 0 + setmetatile 5, 6, 585, 0 + setmetatile 4, 7, 592, 0 + setmetatile 5, 7, 593, 0 + setmetatile 4, 12, 584, 0 + setmetatile 5, 12, 585, 0 + setmetatile 4, 13, 592, 0 + setmetatile 5, 13, 593, 0 + setmetatile 4, 18, 584, 0 + setmetatile 5, 18, 585, 0 + setmetatile 4, 19, 592, 0 + setmetatile 5, 19, 593, 0 + setmetatile 7, 9, 584, 0 + setmetatile 8, 9, 585, 0 + setmetatile 7, 10, 592, 0 + setmetatile 8, 10, 593, 0 + setmetatile 10, 6, 584, 0 + setmetatile 11, 6, 585, 0 + setmetatile 10, 7, 592, 0 + setmetatile 11, 7, 593, 0 + setmetatile 10, 12, 584, 0 + setmetatile 11, 12, 585, 0 + setmetatile 10, 13, 592, 0 + setmetatile 11, 13, 593, 0 + setmetatile 10, 18, 584, 0 + setmetatile 11, 18, 585, 0 + setmetatile 10, 19, 592, 0 + setmetatile 11, 19, 593, 0 + setmetatile 13, 3, 584, 0 + setmetatile 14, 3, 585, 0 + setmetatile 13, 4, 592, 0 + setmetatile 14, 4, 593, 0 + setmetatile 3, 16, 586, 1 + setmetatile 3, 17, 594, 0 + setmetatile 9, 4, 586, 1 + setmetatile 9, 5, 594, 0 + return + +Route110_TrickHousePuzzle3_EventScript_26C4CD:: @ 826C4CD + lockall + setvar VAR_TEMP_8, 1 + goto Route110_TrickHousePuzzle3_EventScript_26C4FD + end + +Route110_TrickHousePuzzle3_EventScript_26C4D9:: @ 826C4D9 + lockall + setvar VAR_TEMP_8, 2 + goto Route110_TrickHousePuzzle3_EventScript_26C4FD + end + +Route110_TrickHousePuzzle3_EventScript_26C4E5:: @ 826C4E5 + lockall + setvar VAR_TEMP_8, 3 + goto Route110_TrickHousePuzzle3_EventScript_26C4FD + end + +Route110_TrickHousePuzzle3_EventScript_26C4F1:: @ 826C4F1 + lockall + setvar VAR_TEMP_8, 4 + goto Route110_TrickHousePuzzle3_EventScript_26C4FD + end + +Route110_TrickHousePuzzle3_EventScript_26C4FD:: @ 826C4FD + call Route110_TrickHousePuzzle3_EventScript_26C510 + playse SE_PIN + call Route110_TrickHousePuzzle3_EventScript_26BF1E + goto Route110_TrickHousePuzzle3_EventScript_26C569 + end + +Route110_TrickHousePuzzle3_EventScript_26C510:: @ 826C510 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 + compare VAR_TEMP_8, 1 + call_if 1, Route110_TrickHousePuzzle3_EventScript_26C551 + compare VAR_TEMP_8, 2 + call_if 1, Route110_TrickHousePuzzle3_EventScript_26C557 + compare VAR_TEMP_8, 3 + call_if 1, Route110_TrickHousePuzzle3_EventScript_26C55D + compare VAR_TEMP_8, 4 + call_if 1, Route110_TrickHousePuzzle3_EventScript_26C563 + return + +Route110_TrickHousePuzzle3_EventScript_26C551:: @ 826C551 + setvar VAR_TEMP_1, 1 + return + +Route110_TrickHousePuzzle3_EventScript_26C557:: @ 826C557 + setvar VAR_TEMP_2, 1 + return + +Route110_TrickHousePuzzle3_EventScript_26C55D:: @ 826C55D + setvar VAR_TEMP_3, 1 + return + +Route110_TrickHousePuzzle3_EventScript_26C563:: @ 826C563 + setvar VAR_TEMP_4, 1 + return + +Route110_TrickHousePuzzle3_EventScript_26C569:: @ 826C569 + compare VAR_TEMP_9, 1 + call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF97 + compare VAR_TEMP_9, 0 + call_if 1, Route110_TrickHousePuzzle3_EventScript_26C232 + special DrawWholeMapView + compare VAR_TEMP_9, 1 + goto_eq Route110_TrickHousePuzzle3_EventScript_26C599 + compare VAR_TEMP_9, 0 + goto_eq Route110_TrickHousePuzzle3_EventScript_26C5A0 + end + +Route110_TrickHousePuzzle3_EventScript_26C599:: @ 826C599 + setvar VAR_TEMP_9, 0 + releaseall + end + +Route110_TrickHousePuzzle3_EventScript_26C5A0:: @ 826C5A0 + setvar VAR_TEMP_9, 1 + releaseall + end + +Route110_TrickHousePuzzle3_EventScript_26C5A7:: @ 826C5A7 + lockall + compare VAR_0x40AD, 0 + goto_eq Route110_TrickHousePuzzle3_EventScript_26C5B9 + goto Route110_TrickHousePuzzle3_EventScript_26A3DB + end + +Route110_TrickHousePuzzle3_EventScript_26C5B9:: @ 826C5B9 + setvar VAR_0x40AD, 1 + goto Route110_TrickHousePuzzle3_EventScript_26A3E5 + end + +Route110_TrickHousePuzzle3_EventScript_26C5C4:: @ 826C5C4 + trainerbattle 0, TRAINER_JUSTIN, 0, Route110_TrickHousePuzzle3_Text_26C676, Route110_TrickHousePuzzle3_Text_26C69D + msgbox Route110_TrickHousePuzzle3_Text_26C6E6, 6 + end + +Route110_TrickHousePuzzle3_EventScript_26C5DB:: @ 826C5DB + trainerbattle 0, TRAINER_MARTHA, 0, Route110_TrickHousePuzzle3_Text_26C726, Route110_TrickHousePuzzle3_Text_26C763 + msgbox Route110_TrickHousePuzzle3_Text_26C776, 6 + end + +Route110_TrickHousePuzzle3_EventScript_26C5F2:: @ 826C5F2 + trainerbattle 0, TRAINER_ALAN, 0, Route110_TrickHousePuzzle3_Text_26C7AA, Route110_TrickHousePuzzle3_Text_26C7EC + msgbox Route110_TrickHousePuzzle3_Text_26C80C, 6 + end + +Route110_TrickHousePuzzle3_Text_26C609: @ 826C609 + .string "{PLAYER} wrote down the secret code\n" + .string "on the door.\p" + .string "“TRICK MASTER is coveted.â€\n" + .string "… … … … … … … …\p" + .string "The lock clicked open!$" + +Route110_TrickHousePuzzle3_Text_26C676: @ 826C676 + .string "I keep coming back to this same place!$" + +Route110_TrickHousePuzzle3_Text_26C69D: @ 826C69D + .string "I’m already having trouble, and then\n" + .string "you have to beat me? It’s not fair!$" + +Route110_TrickHousePuzzle3_Text_26C6E6: @ 826C6E6 + .string "It’s full of doors here!\n" + .string "It’s too small and dark in here! Help!$" + +Route110_TrickHousePuzzle3_Text_26C726: @ 826C726 + .string "I don’t know what’s going on here.\n" + .string "I’m starting to feel sad…$" + +Route110_TrickHousePuzzle3_Text_26C763: @ 826C763 + .string "You… You’re awful!$" + +Route110_TrickHousePuzzle3_Text_26C776: @ 826C776 + .string "I know I’m weak!\n" + .string "And, I have no sense of direction!$" + +Route110_TrickHousePuzzle3_Text_26C7AA: @ 826C7AA + .string "I don’t get it. What would anyone want\n" + .string "with a house this bizarre?$" + +Route110_TrickHousePuzzle3_Text_26C7EC: @ 826C7EC + .string "I don’t get it.\n" + .string "How did I lose?$" + +Route110_TrickHousePuzzle3_Text_26C80C: @ 826C80C + .string "I don’t get it.\n" + .string "How many traps are in this house?\p" + .string "You may be the one to solve that.$" + diff --git a/data/maps/Route110_TrickHousePuzzle4/events.inc b/data/maps/Route110_TrickHousePuzzle4/events.inc new file mode 100644 index 000000000..b0dd3abf6 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle4/events.inc @@ -0,0 +1,27 @@ +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 + +Route110_TrickHousePuzzle4_MapWarps: @ 853E488 + 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 + +Route110_TrickHousePuzzle4_MapEvents:: @ 853E4AC + map_events Route110_TrickHousePuzzle4_EventObjects, Route110_TrickHousePuzzle4_MapWarps, 0x0, Route110_TrickHousePuzzle4_MapBGEvents + diff --git a/data/maps/Route110_TrickHousePuzzle4/scripts.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc new file mode 100644 index 000000000..56b4b02fb --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle4/scripts.inc @@ -0,0 +1,71 @@ +Route110_TrickHousePuzzle4_MapScripts:: @ 826C860 + .byte 0 + +Route110_TrickHousePuzzle4_EventScript_26C861:: @ 826C861 + lockall + compare VAR_0x40AE, 0 + goto_eq Route110_TrickHousePuzzle4_EventScript_26C873 + goto Route110_TrickHousePuzzle4_EventScript_26A3DB + end + +Route110_TrickHousePuzzle4_EventScript_26C873:: @ 826C873 + setvar VAR_0x40AE, 1 + goto Route110_TrickHousePuzzle4_EventScript_26A3E5 + end + +Route110_TrickHousePuzzle4_EventScript_26C87E:: @ 826C87E + trainerbattle 0, TRAINER_CORA, 0, Route110_TrickHousePuzzle4_Text_26C92D, Route110_TrickHousePuzzle4_Text_26C96E + msgbox Route110_TrickHousePuzzle4_Text_26C9A2, 6 + end + +Route110_TrickHousePuzzle4_EventScript_26C895:: @ 826C895 + trainerbattle 0, TRAINER_YUJI, 0, Route110_TrickHousePuzzle4_Text_26C9E4, Route110_TrickHousePuzzle4_Text_26CA20 + msgbox Route110_TrickHousePuzzle4_Text_26CA53, 6 + end + +Route110_TrickHousePuzzle4_EventScript_26C8AC:: @ 826C8AC + trainerbattle 0, TRAINER_PAULA, 0, Route110_TrickHousePuzzle4_Text_26CA9C, Route110_TrickHousePuzzle4_Text_26CACB + msgbox Route110_TrickHousePuzzle4_Text_26CAD1, 6 + end + +Route110_TrickHousePuzzle4_Text_26C8C3: @ 826C8C3 + .string "{PLAYER} wrote down the secret code\n" + .string "on the door.\p" + .string "“TRICK MASTER is cool.â€\n" + .string "… … … … … … … …\p" + .string "The lock clicked open!$" + +Route110_TrickHousePuzzle4_Text_26C92D: @ 826C92D + .string "It’s too much bother to think this out.\n" + .string "I only wanted to battle!$" + +Route110_TrickHousePuzzle4_Text_26C96E: @ 826C96E + .string "Even though I lost, I still like battling\n" + .string "the best!$" + +Route110_TrickHousePuzzle4_Text_26C9A2: @ 826C9A2 + .string "Wouldn’t you agree? You would go\n" + .string "anywhere if TRAINERS were there.$" + +Route110_TrickHousePuzzle4_Text_26C9E4: @ 826C9E4 + .string "Heh! Boulders like this, I can brush\n" + .string "aside with one finger!$" + +Route110_TrickHousePuzzle4_Text_26CA20: @ 826CA20 + .string "I can push boulders, but I can’t solve\n" + .string "the puzzle…$" + +Route110_TrickHousePuzzle4_Text_26CA53: @ 826CA53 + .string "It’s not good enough to be brawny…\n" + .string "You have to use your head. Be brainy!$" + +Route110_TrickHousePuzzle4_Text_26CA9C: @ 826CA9C + .string "The TRICK HOUSE is getting trickier,\n" + .string "isn’t it?$" + +Route110_TrickHousePuzzle4_Text_26CACB: @ 826CACB + .string "Aaak!$" + +Route110_TrickHousePuzzle4_Text_26CAD1: @ 826CAD1 + .string "Has anyone made it to the end?$" + diff --git a/data/maps/Route110_TrickHousePuzzle5/events.inc b/data/maps/Route110_TrickHousePuzzle5/events.inc new file mode 100644 index 000000000..8da7daf11 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle5/events.inc @@ -0,0 +1,42 @@ +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 + +Route110_TrickHousePuzzle5_MapWarps: @ 853E538 + 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 + 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 + +Route110_TrickHousePuzzle5_MapBGEvents: @ 853E6B0 + bg_event 11, 21, 0, 0, 0, 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_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc new file mode 100644 index 000000000..5afce1c88 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -0,0 +1,1091 @@ +Route110_TrickHousePuzzle5_MapScripts:: @ 826CAF0 + map_script 3, Route110_TrickHousePuzzle5_MapScript1_26CAF6 + .byte 0 + +Route110_TrickHousePuzzle5_MapScript1_26CAF6: @ 826CAF6 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 + setvar VAR_TEMP_5, 0 + setvar VAR_TEMP_8, 0 + end + +Route110_TrickHousePuzzle5_EventScript_26CB15:: @ 826CB15 + lockall + compare VAR_0x40AF, 0 + goto_eq Route110_TrickHousePuzzle5_EventScript_26CB27 + goto Route110_TrickHousePuzzle5_EventScript_26A3DB + end + +Route110_TrickHousePuzzle5_EventScript_26CB27:: @ 826CB27 + setvar VAR_0x40AF, 1 + goto Route110_TrickHousePuzzle5_EventScript_26A3E5 + end + +Route110_TrickHousePuzzle5_EventScript_26CB32:: @ 826CB32 + lockall + applymovement 1, Route110_TrickHousePuzzle5_Movement_27259E + waitmovement 0 + compare VAR_TEMP_1, 1 + goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA + setvar VAR_TEMP_9, 0 + goto Route110_TrickHousePuzzle5_EventScript_26CCEB + end + +Route110_TrickHousePuzzle5_EventScript_26CB53:: @ 826CB53 + lockall + applymovement 2, Route110_TrickHousePuzzle5_Movement_27259E + waitmovement 0 + compare VAR_TEMP_2, 1 + goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA + setvar VAR_TEMP_9, 0 + goto Route110_TrickHousePuzzle5_EventScript_26CD6A + end + +Route110_TrickHousePuzzle5_EventScript_26CB74:: @ 826CB74 + lockall + applymovement 3, Route110_TrickHousePuzzle5_Movement_27259E + waitmovement 0 + compare VAR_TEMP_3, 1 + goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA + setvar VAR_TEMP_9, 0 + goto Route110_TrickHousePuzzle5_EventScript_26CDF4 + end + +Route110_TrickHousePuzzle5_EventScript_26CB95:: @ 826CB95 + lockall + applymovement 4, Route110_TrickHousePuzzle5_Movement_27259E + waitmovement 0 + compare VAR_TEMP_4, 1 + goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA + setvar VAR_TEMP_9, 0 + goto Route110_TrickHousePuzzle5_EventScript_26CE73 + end + +Route110_TrickHousePuzzle5_EventScript_26CBB6:: @ 826CBB6 + lockall + applymovement 5, Route110_TrickHousePuzzle5_Movement_27259E + waitmovement 0 + compare VAR_TEMP_5, 1 + goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA + setvar VAR_TEMP_9, 0 + goto Route110_TrickHousePuzzle5_EventScript_26CEF2 + end + +Route110_TrickHousePuzzle5_EventScript_26CBD7:: @ 826CBD7 + lockall + setvar VAR_TEMP_9, 0 + goto Route110_TrickHousePuzzle5_EventScript_26CCEB + end + +Route110_TrickHousePuzzle5_EventScript_26CBE3:: @ 826CBE3 + lockall + setvar VAR_TEMP_9, 1 + goto Route110_TrickHousePuzzle5_EventScript_26CCEB + end + +Route110_TrickHousePuzzle5_EventScript_26CBEF:: @ 826CBEF + lockall + setvar VAR_TEMP_9, 2 + goto Route110_TrickHousePuzzle5_EventScript_26CCEB + end + +Route110_TrickHousePuzzle5_EventScript_26CBFB:: @ 826CBFB + lockall + setvar VAR_TEMP_9, 3 + goto Route110_TrickHousePuzzle5_EventScript_26CCEB + end + +Route110_TrickHousePuzzle5_EventScript_26CC07:: @ 826CC07 + lockall + setvar VAR_TEMP_9, 4 + goto Route110_TrickHousePuzzle5_EventScript_26CCEB + end + +Route110_TrickHousePuzzle5_EventScript_26CC13:: @ 826CC13 + lockall + setvar VAR_TEMP_9, 0 + goto Route110_TrickHousePuzzle5_EventScript_26CD6A + end + +Route110_TrickHousePuzzle5_EventScript_26CC1F:: @ 826CC1F + lockall + setvar VAR_TEMP_9, 1 + goto Route110_TrickHousePuzzle5_EventScript_26CD6A + end + +Route110_TrickHousePuzzle5_EventScript_26CC2B:: @ 826CC2B + lockall + setvar VAR_TEMP_9, 2 + goto Route110_TrickHousePuzzle5_EventScript_26CD6A + end + +Route110_TrickHousePuzzle5_EventScript_26CC37:: @ 826CC37 + lockall + setvar VAR_TEMP_9, 3 + goto Route110_TrickHousePuzzle5_EventScript_26CD6A + end + +Route110_TrickHousePuzzle5_EventScript_26CC43:: @ 826CC43 + lockall + setvar VAR_TEMP_9, 4 + goto Route110_TrickHousePuzzle5_EventScript_26CD6A + end + +Route110_TrickHousePuzzle5_EventScript_26CC4F:: @ 826CC4F + lockall + setvar VAR_TEMP_9, 5 + goto Route110_TrickHousePuzzle5_EventScript_26CD6A + end + +Route110_TrickHousePuzzle5_EventScript_26CC5B:: @ 826CC5B + lockall + setvar VAR_TEMP_9, 0 + goto Route110_TrickHousePuzzle5_EventScript_26CDF4 + end + +Route110_TrickHousePuzzle5_EventScript_26CC67:: @ 826CC67 + lockall + setvar VAR_TEMP_9, 1 + goto Route110_TrickHousePuzzle5_EventScript_26CDF4 + end + +Route110_TrickHousePuzzle5_EventScript_26CC73:: @ 826CC73 + lockall + setvar VAR_TEMP_9, 2 + goto Route110_TrickHousePuzzle5_EventScript_26CDF4 + end + +Route110_TrickHousePuzzle5_EventScript_26CC7F:: @ 826CC7F + lockall + setvar VAR_TEMP_9, 3 + goto Route110_TrickHousePuzzle5_EventScript_26CDF4 + end + +Route110_TrickHousePuzzle5_EventScript_26CC8B:: @ 826CC8B + lockall + setvar VAR_TEMP_9, 4 + goto Route110_TrickHousePuzzle5_EventScript_26CDF4 + end + +Route110_TrickHousePuzzle5_EventScript_26CC97:: @ 826CC97 + lockall + setvar VAR_TEMP_9, 0 + goto Route110_TrickHousePuzzle5_EventScript_26CE73 + end + +Route110_TrickHousePuzzle5_EventScript_26CCA3:: @ 826CCA3 + lockall + setvar VAR_TEMP_9, 1 + goto Route110_TrickHousePuzzle5_EventScript_26CE73 + end + +Route110_TrickHousePuzzle5_EventScript_26CCAF:: @ 826CCAF + lockall + setvar VAR_TEMP_9, 2 + goto Route110_TrickHousePuzzle5_EventScript_26CE73 + end + +Route110_TrickHousePuzzle5_EventScript_26CCBB:: @ 826CCBB + lockall + setvar VAR_TEMP_9, 3 + goto Route110_TrickHousePuzzle5_EventScript_26CE73 + end + +Route110_TrickHousePuzzle5_EventScript_26CCC7:: @ 826CCC7 + lockall + setvar VAR_TEMP_9, 4 + goto Route110_TrickHousePuzzle5_EventScript_26CE73 + end + +Route110_TrickHousePuzzle5_EventScript_26CCD3:: @ 826CCD3 + lockall + setvar VAR_TEMP_9, 5 + goto Route110_TrickHousePuzzle5_EventScript_26CE73 + end + +Route110_TrickHousePuzzle5_EventScript_26CCDF:: @ 826CCDF + lockall + setvar VAR_TEMP_9, 0 + goto Route110_TrickHousePuzzle5_EventScript_26CEF2 + end + +Route110_TrickHousePuzzle5_EventScript_26CCEB:: @ 826CCEB + setvar VAR_TEMP_1, 1 + setvar VAR_TEMP_8, 1 + playse SE_PIN + applymovement 1, Route110_TrickHousePuzzle5_Movement_272598 + waitmovement 0 + applymovement 1, Route110_TrickHousePuzzle5_Movement_27259A + waitmovement 0 + compare VAR_TEMP_9, 1 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1B4 + compare VAR_TEMP_9, 2 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1EC + compare VAR_TEMP_9, 3 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224 + compare VAR_TEMP_9, 4 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C + msgbox Route110_TrickHousePuzzle5_Text_26D6CE, 4 + random 3 + switch VAR_RESULT + case 0, Route110_TrickHousePuzzle5_EventScript_26CF45 + case 1, Route110_TrickHousePuzzle5_EventScript_26CF68 + case 2, Route110_TrickHousePuzzle5_EventScript_26CF8B + end + +Route110_TrickHousePuzzle5_EventScript_26CD6A:: @ 826CD6A + setvar VAR_TEMP_2, 1 + setvar VAR_TEMP_8, 2 + playse SE_PIN + applymovement 2, Route110_TrickHousePuzzle5_Movement_272598 + waitmovement 0 + applymovement 2, Route110_TrickHousePuzzle5_Movement_27259A + waitmovement 0 + compare VAR_TEMP_9, 1 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D2CC + compare VAR_TEMP_9, 2 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D304 + compare VAR_TEMP_9, 3 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D33C + compare VAR_TEMP_9, 4 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D374 + compare VAR_TEMP_9, 5 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3AC + msgbox Route110_TrickHousePuzzle5_Text_26D8EA, 4 + random 3 + switch VAR_RESULT + case 0, Route110_TrickHousePuzzle5_EventScript_26CFAE + case 1, Route110_TrickHousePuzzle5_EventScript_26CFD1 + case 2, Route110_TrickHousePuzzle5_EventScript_26CFF4 + end + +Route110_TrickHousePuzzle5_EventScript_26CDF4:: @ 826CDF4 + setvar VAR_TEMP_3, 1 + setvar VAR_TEMP_8, 3 + playse SE_PIN + applymovement 3, Route110_TrickHousePuzzle5_Movement_272598 + waitmovement 0 + applymovement 3, Route110_TrickHousePuzzle5_Movement_27259A + waitmovement 0 + compare VAR_TEMP_9, 1 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1B4 + compare VAR_TEMP_9, 2 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1EC + compare VAR_TEMP_9, 3 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224 + compare VAR_TEMP_9, 4 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C + msgbox Route110_TrickHousePuzzle5_Text_26DA1E, 4 + random 3 + switch VAR_RESULT + case 0, Route110_TrickHousePuzzle5_EventScript_26D017 + case 1, Route110_TrickHousePuzzle5_EventScript_26D03A + case 2, Route110_TrickHousePuzzle5_EventScript_26D05D + end + +Route110_TrickHousePuzzle5_EventScript_26CE73:: @ 826CE73 + setvar VAR_TEMP_4, 1 + setvar VAR_TEMP_8, 4 + playse SE_PIN + applymovement 4, Route110_TrickHousePuzzle5_Movement_272598 + waitmovement 0 + applymovement 4, Route110_TrickHousePuzzle5_Movement_27259A + waitmovement 0 + compare VAR_TEMP_9, 1 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1B4 + compare VAR_TEMP_9, 2 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1EC + compare VAR_TEMP_9, 3 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224 + compare VAR_TEMP_9, 4 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C + msgbox Route110_TrickHousePuzzle5_Text_26DB4C, 4 + random 3 + switch VAR_RESULT + case 0, Route110_TrickHousePuzzle5_EventScript_26D080 + case 1, Route110_TrickHousePuzzle5_EventScript_26D0A3 + case 2, Route110_TrickHousePuzzle5_EventScript_26D0C6 + end + +Route110_TrickHousePuzzle5_EventScript_26CEF2:: @ 826CEF2 + setvar VAR_TEMP_5, 1 + setvar VAR_TEMP_8, 5 + playse SE_PIN + applymovement 5, Route110_TrickHousePuzzle5_Movement_272598 + waitmovement 0 + applymovement 5, Route110_TrickHousePuzzle5_Movement_27259A + waitmovement 0 + msgbox Route110_TrickHousePuzzle5_Text_26DC78, 4 + random 3 + switch VAR_RESULT + case 0, Route110_TrickHousePuzzle5_EventScript_26D0E9 + case 1, Route110_TrickHousePuzzle5_EventScript_26D10C + case 2, Route110_TrickHousePuzzle5_EventScript_26D12F + end + +Route110_TrickHousePuzzle5_EventScript_26CF45:: @ 826CF45 + msgbox Route110_TrickHousePuzzle5_Text_26D757, 4 + multichoice 0, 0, 25, 1 + switch VAR_RESULT + case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0 + goto Route110_TrickHousePuzzle5_EventScript_26D152 + end + +Route110_TrickHousePuzzle5_EventScript_26CF68:: @ 826CF68 + msgbox Route110_TrickHousePuzzle5_Text_26D7AA, 4 + multichoice 0, 0, 26, 1 + switch VAR_RESULT + case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 + goto Route110_TrickHousePuzzle5_EventScript_26D152 + end + +Route110_TrickHousePuzzle5_EventScript_26CF8B:: @ 826CF8B + msgbox Route110_TrickHousePuzzle5_Text_26D7FC, 4 + multichoice 0, 0, 27, 1 + switch VAR_RESULT + case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 + goto Route110_TrickHousePuzzle5_EventScript_26D152 + end + +Route110_TrickHousePuzzle5_EventScript_26CFAE:: @ 826CFAE + msgbox Route110_TrickHousePuzzle5_Text_26D940, 4 + multichoice 0, 0, 28, 1 + switch VAR_RESULT + case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0 + goto Route110_TrickHousePuzzle5_EventScript_26D152 + end + +Route110_TrickHousePuzzle5_EventScript_26CFD1:: @ 826CFD1 + msgbox Route110_TrickHousePuzzle5_Text_26D98C, 4 + multichoice 0, 0, 29, 1 + switch VAR_RESULT + case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0 + goto Route110_TrickHousePuzzle5_EventScript_26D152 + end + +Route110_TrickHousePuzzle5_EventScript_26CFF4:: @ 826CFF4 + msgbox Route110_TrickHousePuzzle5_Text_26D9CE, 4 + multichoice 0, 0, 30, 1 + switch VAR_RESULT + case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 + goto Route110_TrickHousePuzzle5_EventScript_26D152 + end + +Route110_TrickHousePuzzle5_EventScript_26D017:: @ 826D017 + msgbox Route110_TrickHousePuzzle5_Text_26DA64, 4 + multichoice 0, 0, 31, 1 + switch VAR_RESULT + case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 + goto Route110_TrickHousePuzzle5_EventScript_26D152 + end + +Route110_TrickHousePuzzle5_EventScript_26D03A:: @ 826D03A + msgbox Route110_TrickHousePuzzle5_Text_26DAAD, 4 + multichoice 0, 0, 32, 1 + switch VAR_RESULT + case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0 + goto Route110_TrickHousePuzzle5_EventScript_26D152 + end + +Route110_TrickHousePuzzle5_EventScript_26D05D:: @ 826D05D + msgbox Route110_TrickHousePuzzle5_Text_26DAFF, 4 + multichoice 0, 0, 33, 1 + switch VAR_RESULT + case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0 + goto Route110_TrickHousePuzzle5_EventScript_26D152 + end + +Route110_TrickHousePuzzle5_EventScript_26D080:: @ 826D080 + msgbox Route110_TrickHousePuzzle5_Text_26DB94, 4 + multichoice 0, 0, 34, 1 + switch VAR_RESULT + case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 + goto Route110_TrickHousePuzzle5_EventScript_26D152 + end + +Route110_TrickHousePuzzle5_EventScript_26D0A3:: @ 826D0A3 + msgbox Route110_TrickHousePuzzle5_Text_26DBD7, 4 + multichoice 0, 0, 35, 1 + switch VAR_RESULT + case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 + goto Route110_TrickHousePuzzle5_EventScript_26D152 + end + +Route110_TrickHousePuzzle5_EventScript_26D0C6:: @ 826D0C6 + msgbox Route110_TrickHousePuzzle5_Text_26DC2A, 4 + multichoice 0, 0, 36, 1 + switch VAR_RESULT + case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0 + goto Route110_TrickHousePuzzle5_EventScript_26D152 + end + +Route110_TrickHousePuzzle5_EventScript_26D0E9:: @ 826D0E9 + msgbox Route110_TrickHousePuzzle5_Text_26DCCB, 4 + multichoice 0, 0, 37, 1 + switch VAR_RESULT + case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0 + goto Route110_TrickHousePuzzle5_EventScript_26D152 + end + +Route110_TrickHousePuzzle5_EventScript_26D10C:: @ 826D10C + msgbox Route110_TrickHousePuzzle5_Text_26DD1B, 4 + multichoice 0, 0, 38, 1 + switch VAR_RESULT + case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 + goto Route110_TrickHousePuzzle5_EventScript_26D152 + end + +Route110_TrickHousePuzzle5_EventScript_26D12F:: @ 826D12F + msgbox Route110_TrickHousePuzzle5_Text_26DD5F, 4 + multichoice 0, 0, 39, 1 + switch VAR_RESULT + case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0 + goto Route110_TrickHousePuzzle5_EventScript_26D152 + end + +Route110_TrickHousePuzzle5_EventScript_26D152:: @ 826D152 + waitse + playse SE_HAZURE + msgbox Route110_TrickHousePuzzle5_Text_26D883, 4 + applymovement 1, Route110_TrickHousePuzzle5_Movement_26D632 + applymovement 2, Route110_TrickHousePuzzle5_Movement_26D632 + applymovement 3, Route110_TrickHousePuzzle5_Movement_26D632 + applymovement 4, Route110_TrickHousePuzzle5_Movement_26D632 + applymovement 5, Route110_TrickHousePuzzle5_Movement_26D632 + msgbox Route110_TrickHousePuzzle5_Text_26D8A1, 4 + waitmovement 0 + msgbox Route110_TrickHousePuzzle5_Text_26D8C9, 4 + closemessage + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21 + waitstate + releaseall + end + +Route110_TrickHousePuzzle5_EventScript_26D1A0:: @ 826D1A0 + waitse + playse SE_SEIKAI + goto Route110_TrickHousePuzzle5_EventScript_26D1AA + end + +Route110_TrickHousePuzzle5_EventScript_26D1AA:: @ 826D1AA + msgbox Route110_TrickHousePuzzle5_Text_26D84D, 4 + releaseall + end + +Route110_TrickHousePuzzle5_EventScript_26D1B4:: @ 826D1B4 + compare VAR_TEMP_8, 1 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3E4 + compare VAR_TEMP_8, 2 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3EF + compare VAR_TEMP_8, 3 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3FA + compare VAR_TEMP_8, 4 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D405 + compare VAR_TEMP_8, 5 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D410 + return + +Route110_TrickHousePuzzle5_EventScript_26D1EC:: @ 826D1EC + compare VAR_TEMP_8, 1 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D41B + compare VAR_TEMP_8, 2 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D426 + compare VAR_TEMP_8, 3 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D431 + compare VAR_TEMP_8, 4 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D43C + compare VAR_TEMP_8, 5 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D447 + return + +Route110_TrickHousePuzzle5_EventScript_26D224:: @ 826D224 + compare VAR_TEMP_8, 1 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D452 + compare VAR_TEMP_8, 2 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D45D + compare VAR_TEMP_8, 3 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D468 + compare VAR_TEMP_8, 4 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D473 + compare VAR_TEMP_8, 5 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D47E + return + +Route110_TrickHousePuzzle5_EventScript_26D25C:: @ 826D25C + compare VAR_TEMP_8, 1 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D489 + compare VAR_TEMP_8, 2 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D494 + compare VAR_TEMP_8, 3 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D49F + compare VAR_TEMP_8, 4 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4AA + compare VAR_TEMP_8, 5 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4B5 + return + +Route110_TrickHousePuzzle5_EventScript_26D294:: @ 826D294 + compare VAR_TEMP_8, 1 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4C0 + compare VAR_TEMP_8, 2 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4CB + compare VAR_TEMP_8, 3 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4D6 + compare VAR_TEMP_8, 4 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4E1 + compare VAR_TEMP_8, 5 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4EC + return + +Route110_TrickHousePuzzle5_EventScript_26D2CC:: @ 826D2CC + compare VAR_TEMP_8, 1 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4F7 + compare VAR_TEMP_8, 2 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D502 + compare VAR_TEMP_8, 3 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D50D + compare VAR_TEMP_8, 4 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D518 + compare VAR_TEMP_8, 5 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D523 + return + +Route110_TrickHousePuzzle5_EventScript_26D304:: @ 826D304 + compare VAR_TEMP_8, 1 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D52E + compare VAR_TEMP_8, 2 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D539 + compare VAR_TEMP_8, 3 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D544 + compare VAR_TEMP_8, 4 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D54F + compare VAR_TEMP_8, 5 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D55A + return + +Route110_TrickHousePuzzle5_EventScript_26D33C:: @ 826D33C + compare VAR_TEMP_8, 1 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D565 + compare VAR_TEMP_8, 2 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D570 + compare VAR_TEMP_8, 3 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D57B + compare VAR_TEMP_8, 4 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D586 + compare VAR_TEMP_8, 5 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D591 + return + +Route110_TrickHousePuzzle5_EventScript_26D374:: @ 826D374 + compare VAR_TEMP_8, 1 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D59C + compare VAR_TEMP_8, 2 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5A7 + compare VAR_TEMP_8, 3 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5B2 + compare VAR_TEMP_8, 4 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5BD + compare VAR_TEMP_8, 5 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5C8 + return + +Route110_TrickHousePuzzle5_EventScript_26D3AC:: @ 826D3AC + compare VAR_TEMP_8, 1 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5D3 + compare VAR_TEMP_8, 2 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5DE + compare VAR_TEMP_8, 3 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5E9 + compare VAR_TEMP_8, 4 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5F4 + compare VAR_TEMP_8, 5 + call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5FF + return + +Route110_TrickHousePuzzle5_EventScript_26D3E4:: @ 826D3E4 + applymovement 1, Route110_TrickHousePuzzle5_Movement_26D60A + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D3EF:: @ 826D3EF + applymovement 2, Route110_TrickHousePuzzle5_Movement_26D60A + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D3FA:: @ 826D3FA + applymovement 3, Route110_TrickHousePuzzle5_Movement_26D60A + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D405:: @ 826D405 + applymovement 4, Route110_TrickHousePuzzle5_Movement_26D60A + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D410:: @ 826D410 + applymovement 5, Route110_TrickHousePuzzle5_Movement_26D60A + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D41B:: @ 826D41B + applymovement 1, Route110_TrickHousePuzzle5_Movement_26D60C + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D426:: @ 826D426 + applymovement 2, Route110_TrickHousePuzzle5_Movement_26D60C + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D431:: @ 826D431 + applymovement 3, Route110_TrickHousePuzzle5_Movement_26D60C + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D43C:: @ 826D43C + applymovement 4, Route110_TrickHousePuzzle5_Movement_26D60C + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D447:: @ 826D447 + applymovement 5, Route110_TrickHousePuzzle5_Movement_26D60C + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D452:: @ 826D452 + applymovement 1, Route110_TrickHousePuzzle5_Movement_26D60F + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D45D:: @ 826D45D + applymovement 2, Route110_TrickHousePuzzle5_Movement_26D60F + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D468:: @ 826D468 + applymovement 3, Route110_TrickHousePuzzle5_Movement_26D60F + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D473:: @ 826D473 + applymovement 4, Route110_TrickHousePuzzle5_Movement_26D60F + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D47E:: @ 826D47E + applymovement 5, Route110_TrickHousePuzzle5_Movement_26D60F + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D489:: @ 826D489 + applymovement 1, Route110_TrickHousePuzzle5_Movement_26D613 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D494:: @ 826D494 + applymovement 2, Route110_TrickHousePuzzle5_Movement_26D613 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D49F:: @ 826D49F + applymovement 3, Route110_TrickHousePuzzle5_Movement_26D613 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D4AA:: @ 826D4AA + applymovement 4, Route110_TrickHousePuzzle5_Movement_26D613 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D4B5:: @ 826D4B5 + applymovement 5, Route110_TrickHousePuzzle5_Movement_26D613 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D4C0:: @ 826D4C0 + applymovement 1, Movement_26D618 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D4CB:: @ 826D4CB + applymovement 2, Movement_26D618 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D4D6:: @ 826D4D6 + applymovement 3, Movement_26D618 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D4E1:: @ 826D4E1 + applymovement 4, Movement_26D618 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D4EC:: @ 826D4EC + applymovement 5, Movement_26D618 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D4F7:: @ 826D4F7 + applymovement 1, Route110_TrickHousePuzzle5_Movement_26D61E + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D502:: @ 826D502 + applymovement 2, Route110_TrickHousePuzzle5_Movement_26D61E + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D50D:: @ 826D50D + applymovement 3, Route110_TrickHousePuzzle5_Movement_26D61E + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D518:: @ 826D518 + applymovement 4, Route110_TrickHousePuzzle5_Movement_26D61E + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D523:: @ 826D523 + applymovement 5, Route110_TrickHousePuzzle5_Movement_26D61E + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D52E:: @ 826D52E + applymovement 1, Route110_TrickHousePuzzle5_Movement_26D620 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D539:: @ 826D539 + applymovement 2, Route110_TrickHousePuzzle5_Movement_26D620 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D544:: @ 826D544 + applymovement 3, Route110_TrickHousePuzzle5_Movement_26D620 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D54F:: @ 826D54F + applymovement 4, Route110_TrickHousePuzzle5_Movement_26D620 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D55A:: @ 826D55A + applymovement 5, Route110_TrickHousePuzzle5_Movement_26D620 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D565:: @ 826D565 + applymovement 1, Route110_TrickHousePuzzle5_Movement_26D623 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D570:: @ 826D570 + applymovement 2, Route110_TrickHousePuzzle5_Movement_26D623 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D57B:: @ 826D57B + applymovement 3, Route110_TrickHousePuzzle5_Movement_26D623 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D586:: @ 826D586 + applymovement 4, Route110_TrickHousePuzzle5_Movement_26D623 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D591:: @ 826D591 + applymovement 5, Route110_TrickHousePuzzle5_Movement_26D623 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D59C:: @ 826D59C + applymovement 1, Route110_TrickHousePuzzle5_Movement_26D627 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D5A7:: @ 826D5A7 + applymovement 2, Route110_TrickHousePuzzle5_Movement_26D627 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D5B2:: @ 826D5B2 + applymovement 3, Route110_TrickHousePuzzle5_Movement_26D627 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D5BD:: @ 826D5BD + applymovement 4, Route110_TrickHousePuzzle5_Movement_26D627 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D5C8:: @ 826D5C8 + applymovement 5, Route110_TrickHousePuzzle5_Movement_26D627 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D5D3:: @ 826D5D3 + applymovement 1, Route110_TrickHousePuzzle5_Movement_26D62C + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D5DE:: @ 826D5DE + applymovement 2, Route110_TrickHousePuzzle5_Movement_26D62C + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D5E9:: @ 826D5E9 + applymovement 3, Route110_TrickHousePuzzle5_Movement_26D62C + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D5F4:: @ 826D5F4 + applymovement 4, Route110_TrickHousePuzzle5_Movement_26D62C + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_26D5FF:: @ 826D5FF + applymovement 5, Route110_TrickHousePuzzle5_Movement_26D62C + waitmovement 0 + return + +Route110_TrickHousePuzzle5_Movement_26D60A: @ 826D60A + walk_left + step_end + +Route110_TrickHousePuzzle5_Movement_26D60C: @ 826D60C + walk_left + walk_left + step_end + +Route110_TrickHousePuzzle5_Movement_26D60F: @ 826D60F + walk_left + walk_left + walk_left + step_end + +Route110_TrickHousePuzzle5_Movement_26D613: @ 826D613 + walk_left + walk_left + walk_left + walk_left + step_end + + +Movement_26D618: @ 826D618 + walk_left + walk_left + walk_left + walk_left + walk_left + step_end + +Route110_TrickHousePuzzle5_Movement_26D61E: @ 826D61E + walk_right + step_end + +Route110_TrickHousePuzzle5_Movement_26D620: @ 826D620 + walk_right + walk_right + step_end + +Route110_TrickHousePuzzle5_Movement_26D623: @ 826D623 + walk_right + walk_right + walk_right + step_end + +Route110_TrickHousePuzzle5_Movement_26D627: @ 826D627 + walk_right + walk_right + walk_right + walk_right + step_end + +Route110_TrickHousePuzzle5_Movement_26D62C: @ 826D62C + walk_right + walk_right + walk_right + walk_right + walk_right + step_end + +Route110_TrickHouseEntrance_Movement_26D632: @ 826D632 +Route110_TrickHousePuzzle5_Movement_26D632: @ 826D632 + 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 + .string "{PLAYER} wrote down the secret code\n" + .string "on the door.\p" + .string "“TRICK MASTER is a genius.â€\n" + .string "… … … … … … … …\p" + .string "The lock clicked open!$" + +Route110_TrickHousePuzzle5_Text_26D6CE: @ 826D6CE + .string "CLICKETY-CLACK…\n" + .string "MECHADOLL 1 AM I!\p" + .string "IF YOU ANSWER QUIZZES CORRECTLY,\n" + .string "THEN YOU WILL GO TO MECHADOLL 5.\l" + .string "THEN YOU CAN OBTAIN THE SECRET CODE.$" + +Route110_TrickHousePuzzle5_Text_26D757: @ 826D757 + .string "MECHADOLL 1 QUIZ.\p" + .string "One of these POKéMON is not found\n" + .string "on ROUTE 110. Which one is it?$" + +Route110_TrickHousePuzzle5_Text_26D7AA: @ 826D7AA + .string "MECHADOLL 1 QUIZ.\p" + .string "One of these POKéMON is not of the\n" + .string "WATER type. Which one is it?$" + +Route110_TrickHousePuzzle5_Text_26D7FC: @ 826D7FC + .string "MECHADOLL 1 QUIZ.\p" + .string "One of these POKéMON does not use\n" + .string "LEECH LIFE. Which one is it?$" + +Route110_TrickHousePuzzle5_Text_26D84D: @ 826D84D + .string "CONGRATULATIONS. CORRECT YOU ARE.\n" + .string "GO THROUGH. PLEASE.$" + +Route110_TrickHousePuzzle5_Text_26D883: @ 826D883 + .string "BZZZT. DISAPPOINTMENT.\n" + .string "ERROR.$" + +Route110_TrickHousePuzzle5_Text_26D8A1: @ 826D8A1 + .string "WAHAHAHAHA! WAHAHAHAHA!\n" + .string "CLICKETY-CLACK!$" + +Route110_TrickHousePuzzle5_Text_26D8C9: @ 826D8C9 + .string "YOUR NEXT CHALLENGE WE WAIT FOR.$" + +Route110_TrickHousePuzzle5_Text_26D8EA: @ 826D8EA + .string "CLICKETY-CLACK…\n" + .string "MECHADOLL 2 AM I!\p" + .string "MECHADOLL 1’S QUIZ DIFFICULTY LEVEL\n" + .string "IS SET TOO LOW.$" + +Route110_TrickHousePuzzle5_Text_26D940: @ 826D940 + .string "MECHADOLL 2 QUIZ.\p" + .string "Which of these POKéMON did WALLY\n" + .string "borrow from your father?$" + +Route110_TrickHousePuzzle5_Text_26D98C: @ 826D98C + .string "MECHADOLL 2 QUIZ.\p" + .string "Which of these POKéMON was chasing\n" + .string "PROF. BIRCH?$" + +Route110_TrickHousePuzzle5_Text_26D9CE: @ 826D9CE + .string "MECHADOLL 2 QUIZ.\p" + .string "Which of these POKéMON did TEAM AQUA\n" + .string "use in PETALBURG FOREST?$" + +Route110_TrickHousePuzzle5_Text_26DA1E: @ 826DA1E + .string "CLICKETY-CLACK…\n" + .string "MECHADOLL 3 AM I!\p" + .string "MATTERS OF MONEY ARE MY SOLE FOCUS.$" + +Route110_TrickHousePuzzle5_Text_26DA64: @ 826DA64 + .string "MECHADOLL 3 QUIZ.\p" + .string "Which costs more?\n" + .string "Three HARBOR MAILS or one BURN HEAL?$" + +Route110_TrickHousePuzzle5_Text_26DAAD: @ 826DAAD + .string "MECHADOLL 3 QUIZ.\p" + .string "Sell one GREAT BALL and buy\n" + .string "one POTION. How much money remains?$" + +Route110_TrickHousePuzzle5_Text_26DAFF: @ 826DAFF + .string "MECHADOLL 3 QUIZ.\p" + .string "Do one REPEL and SODA POP cost\n" + .string "more than one SUPER POTION?$" + +Route110_TrickHousePuzzle5_Text_26DB4C: @ 826DB4C + .string "CLICKETY-CLACK…\n" + .string "MECHADOLL 4 THAT IS ME!\p" + .string "MY QUIZ IS AN OBJECT OF BEAUTY.$" + +Route110_TrickHousePuzzle5_Text_26DB94: @ 826DB94 + .string "MECHADOLL 4 QUIZ.\p" + .string "In SEASHORE HOUSE, were there more men\n" + .string "or women?$" + +Route110_TrickHousePuzzle5_Text_26DBD7: @ 826DBD7 + .string "MECHADOLL 4 QUIZ.\p" + .string "In LAVARIDGE TOWN, were there more\n" + .string "elderly men or elderly women?$" + +Route110_TrickHousePuzzle5_Text_26DC2A: @ 826DC2A + .string "MECHADOLL 4 QUIZ.\p" + .string "In the TRAINER’S SCHOOL, how many\n" + .string "girl students were there?$" + +Route110_TrickHousePuzzle5_Text_26DC78: @ 826DC78 + .string "CLICKETY-CLACK…\n" + .string "MECHADOLL 5 AM I!\p" + .string "THE MASTER’S BEST AND PROUDEST\n" + .string "ACHIEVEMENT AM I.$" + +Route110_TrickHousePuzzle5_Text_26DCCB: @ 826DCCB + .string "MECHADOLL 5 QUIZ.\p" + .string "In SLATEPORT’s POKéMON FAN CLUB,\n" + .string "how many POKéMON were there?$" + +Route110_TrickHousePuzzle5_Text_26DD1B: @ 826DD1B + .string "MECHADOLL 5 QUIZ.\p" + .string "In FORTREE CITY, how many\n" + .string "tree houses were there?$" + +Route110_TrickHousePuzzle5_Text_26DD5F: @ 826DD5F + .string "MECHADOLL 5 QUIZ.\p" + .string "On the CYCLING ROAD, how many\n" + .string "TRIATHLETES were there?$" diff --git a/data/maps/Route110_TrickHousePuzzle6/events.inc b/data/maps/Route110_TrickHousePuzzle6/events.inc new file mode 100644 index 000000000..7fc098f2c --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle6/events.inc @@ -0,0 +1,17 @@ +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 + +Route110_TrickHousePuzzle6_MapWarps: @ 853E730 + 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 + +Route110_TrickHousePuzzle6_MapEvents:: @ 853E754 + map_events Route110_TrickHousePuzzle6_EventObjects, Route110_TrickHousePuzzle6_MapWarps, 0x0, Route110_TrickHousePuzzle6_MapBGEvents + diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc new file mode 100644 index 000000000..0f20aac1f --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc @@ -0,0 +1,87 @@ +Route110_TrickHousePuzzle6_MapScripts:: @ 826DDA7 + map_script 3, Route110_TrickHousePuzzle6_MapScript1_26DDB2 + map_script 4, Route110_TrickHousePuzzle6_MapScript2_26DDB6 + .byte 0 + +Route110_TrickHousePuzzle6_MapScript1_26DDB2: @ 826DDB2 + special RotatingGate_InitPuzzle + end + +Route110_TrickHousePuzzle6_MapScript2_26DDB6: @ 826DDB6 + map_script_2 VAR_TEMP_0, 16384, Route110_TrickHousePuzzle6_EventScript_26DDC0 + .2byte 0 + +Route110_TrickHousePuzzle6_EventScript_26DDC0:: @ 826DDC0 + special RotatingGate_InitPuzzleAndGraphics + end + +Route110_TrickHousePuzzle6_EventScript_26DDC4:: @ 826DDC4 + lockall + compare VAR_0x40B0, 0 + goto_eq Route110_TrickHousePuzzle6_EventScript_26DDD6 + goto Route110_TrickHousePuzzle6_EventScript_26A3DB + end + +Route110_TrickHousePuzzle6_EventScript_26DDD6:: @ 826DDD6 + setvar VAR_0x40B0, 1 + goto Route110_TrickHousePuzzle6_EventScript_26A3E5 + end + +Route110_TrickHousePuzzle6_EventScript_26DDE1:: @ 826DDE1 + trainerbattle 0, TRAINER_SOPHIA, 0, Route110_TrickHousePuzzle6_Text_26DE93, Route110_TrickHousePuzzle6_Text_26DED2 + msgbox Route110_TrickHousePuzzle6_Text_26DEF3, 6 + end + +Route110_TrickHousePuzzle6_EventScript_26DDF8:: @ 826DDF8 + trainerbattle 0, TRAINER_BENNY, 0, Route110_TrickHousePuzzle6_Text_26DF55, Route110_TrickHousePuzzle6_Text_26DF8D + msgbox Route110_TrickHousePuzzle6_Text_26DFA0, 6 + end + +Route110_TrickHousePuzzle6_EventScript_26DE0F:: @ 826DE0F + trainerbattle 0, TRAINER_SEBASTIAN, 0, Route110_TrickHousePuzzle6_Text_26DFD7, Route110_TrickHousePuzzle6_Text_26E004 + msgbox Route110_TrickHousePuzzle6_Text_26E048, 6 + end + +Route110_TrickHousePuzzle6_Text_26DE26: @ 826DE26 + .string "{PLAYER} wrote down the secret code\n" + .string "on the door.\p" + .string "“TRICK MASTER is my life.â€\n" + .string "… … … … … … … …\p" + .string "The lock clicked open!$" + +Route110_TrickHousePuzzle6_Text_26DE93: @ 826DE93 + .string "When I heard there was a strange\n" + .string "house, I had to check it out.$" + +Route110_TrickHousePuzzle6_Text_26DED2: @ 826DED2 + .string "I’ve discovered a tough TRAINER!$" + +Route110_TrickHousePuzzle6_Text_26DEF3: @ 826DEF3 + .string "I’m sure having a good time checking\n" + .string "this place out.\p" + .string "It’s a challenge I’ve found worth\n" + .string "repeating!$" + +Route110_TrickHousePuzzle6_Text_26DF55: @ 826DF55 + .string "Maybe I could get my BIRD POKéMON\n" + .string "to fly over the wall…$" + +Route110_TrickHousePuzzle6_Text_26DF8D: @ 826DF8D + .string "Gwaaah! I blew it!$" + +Route110_TrickHousePuzzle6_Text_26DFA0: @ 826DFA0 + .string "Ehehehe… I guess I lost because\n" + .string "I was trying to cheat.$" + +Route110_TrickHousePuzzle6_Text_26DFD7: @ 826DFD7 + .string "I’m getting dizzy from these rotating\n" + .string "doors…$" + +Route110_TrickHousePuzzle6_Text_26E004: @ 826E004 + .string "Everything’s spinning around and\n" + .string "around. I can’t take this anymore…$" + +Route110_TrickHousePuzzle6_Text_26E048: @ 826E048 + .string "You don’t seem to be affected at all.\n" + .string "Or do you have your poker face on?$" + diff --git a/data/maps/Route110_TrickHousePuzzle7/events.inc b/data/maps/Route110_TrickHousePuzzle7/events.inc new file mode 100644 index 000000000..e72aa929a --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle7/events.inc @@ -0,0 +1,38 @@ +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 + +Route110_TrickHousePuzzle7_MapWarps: @ 853E840 + 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 + 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 + +Route110_TrickHousePuzzle7_MapBGEvents: @ 853E8E8 + bg_event 6, 17, 0, 0, 0, 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_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc new file mode 100644 index 000000000..fdf734423 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -0,0 +1,411 @@ +Route110_TrickHousePuzzle7_MapScripts:: @ 826E091 + map_script 5, Route110_TrickHousePuzzle7_MapScript1_26E0A6 + map_script 3, Route110_TrickHousePuzzle7_MapScript1_26E198 + map_script 1, Route110_TrickHousePuzzle7_MapScript1_26E1B4 + map_script 2, Route110_TrickHousePuzzle7_MapScript2_26E1C0 + .byte 0 + +Route110_TrickHousePuzzle7_MapScript1_26E0A6: @ 826E0A6 + call Route110_TrickHousePuzzle7_EventScript_26E0AC + end + +Route110_TrickHousePuzzle7_EventScript_26E0AC:: @ 826E0AC + checkflag FLAG_0x0C2 + call_if 1, Route110_TrickHousePuzzle7_EventScript_26E0DA + checkflag FLAG_0x0C3 + call_if 1, Route110_TrickHousePuzzle7_EventScript_26E0ED + checkflag FLAG_0x0C4 + call_if 1, Route110_TrickHousePuzzle7_EventScript_26E100 + checkflag FLAG_0x0C5 + call_if 1, Route110_TrickHousePuzzle7_EventScript_26E113 + checkflag FLAG_0x0C6 + call_if 1, Route110_TrickHousePuzzle7_EventScript_26E126 + return + +Route110_TrickHousePuzzle7_EventScript_26E0DA:: @ 826E0DA + setmetatile 13, 17, 610, 0 + setmetatile 12, 16, 575, 1 + return + +Route110_TrickHousePuzzle7_EventScript_26E0ED:: @ 826E0ED + setmetatile 12, 13, 610, 0 + setmetatile 12, 11, 575, 1 + return + +Route110_TrickHousePuzzle7_EventScript_26E100:: @ 826E100 + setmetatile 7, 12, 610, 0 + setmetatile 5, 10, 575, 1 + return + +Route110_TrickHousePuzzle7_EventScript_26E113:: @ 826E113 + setmetatile 6, 6, 636, 0 + setmetatile 4, 4, 575, 1 + return + +Route110_TrickHousePuzzle7_EventScript_26E126:: @ 826E126 + setmetatile 8, 4, 609, 0 + setmetatile 7, 5, 575, 1 + return + +Route110_TrickHousePuzzle7_EventScript_26E139:: @ 826E139 + setmetatile 13, 17, 611, 0 + setmetatile 12, 16, 574, 1 + return + +Route110_TrickHousePuzzle7_EventScript_26E14C:: @ 826E14C + setmetatile 12, 13, 609, 0 + setmetatile 12, 11, 574, 1 + return + +Route110_TrickHousePuzzle7_EventScript_26E15F:: @ 826E15F + setmetatile 7, 12, 611, 0 + setmetatile 5, 10, 574, 1 + return + +Route110_TrickHousePuzzle7_EventScript_26E172:: @ 826E172 + setmetatile 6, 6, 635, 0 + setmetatile 4, 4, 574, 1 + return + +Route110_TrickHousePuzzle7_EventScript_26E185:: @ 826E185 + setmetatile 8, 4, 608, 0 + setmetatile 7, 5, 574, 1 + return + +Route110_TrickHousePuzzle7_MapScript1_26E198: @ 826E198 + compare VAR_0x40B6, 1 + goto_eq Route110_TrickHousePuzzle7_EventScript_26E1B3 + clearflag FLAG_0x0C2 + clearflag FLAG_0x0C3 + clearflag FLAG_0x0C4 + clearflag FLAG_0x0C5 + clearflag FLAG_0x0C6 + end + +Route110_TrickHousePuzzle7_EventScript_26E1B3:: @ 826E1B3 + end + +Route110_TrickHousePuzzle7_MapScript1_26E1B4: @ 826E1B4 + compare VAR_0x40B6, 1 + call_if 1, Route110_TrickHousePuzzle7_EventScript_26E0AC + end + +Route110_TrickHousePuzzle7_MapScript2_26E1C0: @ 826E1C0 + map_script_2 VAR_0x40B6, 1, Route110_TrickHousePuzzle7_EventScript_26E1CA + .2byte 0 + +Route110_TrickHousePuzzle7_EventScript_26E1CA:: @ 826E1CA + setvar VAR_0x40B6, 0 + end + +Route110_TrickHousePuzzle7_EventScript_26E1D0:: @ 826E1D0 + lockall + compare VAR_0x40B1, 0 + goto_eq Route110_TrickHousePuzzle7_EventScript_26E1E2 + goto Route110_TrickHousePuzzle7_EventScript_26A3DB + end + +Route110_TrickHousePuzzle7_EventScript_26E1E2:: @ 826E1E2 + setvar VAR_0x40B1, 1 + goto Route110_TrickHousePuzzle7_EventScript_26A3E5 + end + +Route110_TrickHousePuzzle7_EventScript_26E1ED:: @ 826E1ED + lockall + setvar VAR_0x40B6, 1 + warpteleport MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 3, 19 + waitstate + releaseall + end + +Route110_TrickHousePuzzle7_EventScript_26E1FE:: @ 826E1FE + lockall + delay 32 + checkflag FLAG_0x0C2 + call_if 0, Route110_TrickHousePuzzle7_EventScript_26E0DA + checkflag FLAG_0x0C2 + call_if 1, Route110_TrickHousePuzzle7_EventScript_26E139 + special DrawWholeMapView + playse SE_TK_KASYA + checkflag FLAG_0x0C2 + goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E2E9 + checkflag FLAG_0x0C2 + goto_eq Route110_TrickHousePuzzle7_EventScript_26E2EE + end + +Route110_TrickHousePuzzle7_EventScript_26E22D:: @ 826E22D + lockall + delay 32 + checkflag FLAG_0x0C3 + call_if 0, Route110_TrickHousePuzzle7_EventScript_26E0ED + checkflag FLAG_0x0C3 + call_if 1, Route110_TrickHousePuzzle7_EventScript_26E14C + special DrawWholeMapView + playse SE_TK_KASYA + checkflag FLAG_0x0C3 + goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E2F3 + checkflag FLAG_0x0C3 + goto_eq Route110_TrickHousePuzzle7_EventScript_26E2F8 + end + +Route110_TrickHousePuzzle7_EventScript_26E25C:: @ 826E25C + lockall + delay 32 + checkflag FLAG_0x0C4 + call_if 0, Route110_TrickHousePuzzle7_EventScript_26E100 + checkflag FLAG_0x0C4 + call_if 1, Route110_TrickHousePuzzle7_EventScript_26E15F + special DrawWholeMapView + playse SE_TK_KASYA + checkflag FLAG_0x0C4 + goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E2FD + checkflag FLAG_0x0C4 + goto_eq Route110_TrickHousePuzzle7_EventScript_26E302 + end + +Route110_TrickHousePuzzle7_EventScript_26E28B:: @ 826E28B + lockall + delay 32 + checkflag FLAG_0x0C5 + call_if 0, Route110_TrickHousePuzzle7_EventScript_26E113 + checkflag FLAG_0x0C5 + call_if 1, Route110_TrickHousePuzzle7_EventScript_26E172 + special DrawWholeMapView + playse SE_TK_KASYA + checkflag FLAG_0x0C5 + goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E307 + checkflag FLAG_0x0C5 + goto_eq Route110_TrickHousePuzzle7_EventScript_26E30C + end + +Route110_TrickHousePuzzle7_EventScript_26E2BA:: @ 826E2BA + lockall + delay 32 + checkflag FLAG_0x0C6 + call_if 0, Route110_TrickHousePuzzle7_EventScript_26E126 + checkflag FLAG_0x0C6 + call_if 1, Route110_TrickHousePuzzle7_EventScript_26E185 + special DrawWholeMapView + playse SE_TK_KASYA + checkflag FLAG_0x0C6 + goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E311 + checkflag FLAG_0x0C6 + goto_eq Route110_TrickHousePuzzle7_EventScript_26E316 + end + +Route110_TrickHousePuzzle7_EventScript_26E2E9:: @ 826E2E9 + setflag FLAG_0x0C2 + releaseall + end + +Route110_TrickHousePuzzle7_EventScript_26E2EE:: @ 826E2EE + clearflag FLAG_0x0C2 + releaseall + end + +Route110_TrickHousePuzzle7_EventScript_26E2F3:: @ 826E2F3 + setflag FLAG_0x0C3 + releaseall + end + +Route110_TrickHousePuzzle7_EventScript_26E2F8:: @ 826E2F8 + clearflag FLAG_0x0C3 + releaseall + end + +Route110_TrickHousePuzzle7_EventScript_26E2FD:: @ 826E2FD + setflag FLAG_0x0C4 + releaseall + end + +Route110_TrickHousePuzzle7_EventScript_26E302:: @ 826E302 + clearflag FLAG_0x0C4 + releaseall + end + +Route110_TrickHousePuzzle7_EventScript_26E307:: @ 826E307 + setflag FLAG_0x0C5 + releaseall + end + +Route110_TrickHousePuzzle7_EventScript_26E30C:: @ 826E30C + clearflag FLAG_0x0C5 + releaseall + end + +Route110_TrickHousePuzzle7_EventScript_26E311:: @ 826E311 + setflag FLAG_0x0C6 + releaseall + end + +Route110_TrickHousePuzzle7_EventScript_26E316:: @ 826E316 + clearflag FLAG_0x0C6 + releaseall + end + +Route110_TrickHousePuzzle7_EventScript_26E31B:: @ 826E31B + playse SE_MU_PACHI + waitse + playse SE_TU_SAA + mossdeepgym3 1 + mossdeepgym1 0 + waitmovement 0 + mossdeepgym2 + waitmovement 0 + mossdeepgym4 + end + +Route110_TrickHousePuzzle7_EventScript_26E331:: @ 826E331 + playse SE_MU_PACHI + waitse + playse SE_TU_SAA + mossdeepgym3 1 + mossdeepgym1 1 + waitmovement 0 + mossdeepgym2 + waitmovement 0 + mossdeepgym4 + end + +Route110_TrickHousePuzzle7_EventScript_26E347:: @ 826E347 + playse SE_MU_PACHI + waitse + playse SE_TU_SAA + mossdeepgym3 1 + mossdeepgym1 2 + waitmovement 0 + mossdeepgym2 + waitmovement 0 + mossdeepgym4 + end + +Route110_TrickHousePuzzle7_EventScript_26E35D:: @ 826E35D + playse SE_MU_PACHI + waitse + playse SE_TU_SAA + mossdeepgym3 1 + mossdeepgym1 3 + waitmovement 0 + mossdeepgym2 + waitmovement 0 + mossdeepgym4 + end + +Route110_TrickHousePuzzle7_EventScript_26E373:: @ 826E373 + playse SE_MU_PACHI + waitse + playse SE_TU_SAA + mossdeepgym3 1 + mossdeepgym1 4 + waitmovement 0 + mossdeepgym2 + waitmovement 0 + mossdeepgym4 + end + +Route110_TrickHousePuzzle7_EventScript_26E389:: @ 826E389 + trainerbattle 0, TRAINER_JOSHUA, 0, Route110_TrickHousePuzzle7_Text_26E481, Route110_TrickHousePuzzle7_Text_26E4C1 + msgbox Route110_TrickHousePuzzle7_Text_26E4F4, 6 + end + +Route110_TrickHousePuzzle7_EventScript_26E3A0:: @ 826E3A0 + trainerbattle 0, TRAINER_PATRICIA, 0, Route110_TrickHousePuzzle7_Text_26E531, Route110_TrickHousePuzzle7_Text_26E564 + msgbox Route110_TrickHousePuzzle7_Text_26E57F, 6 + end + +Route110_TrickHousePuzzle7_EventScript_26E3B7:: @ 826E3B7 + trainerbattle 0, TRAINER_ALEXIS, 0, Route110_TrickHousePuzzle7_Text_26E5C0, Route110_TrickHousePuzzle7_Text_26E604 + msgbox Route110_TrickHousePuzzle7_Text_26E61E, 6 + end + +Route110_TrickHousePuzzle7_EventScript_26E3CE:: @ 826E3CE + trainerbattle 0, TRAINER_MARIELA, 0, Route110_TrickHousePuzzle7_Text_26E66B, Route110_TrickHousePuzzle7_Text_26E69C + msgbox Route110_TrickHousePuzzle7_Text_26E6BC, 6 + end + +Route110_TrickHousePuzzle7_EventScript_26E3E5:: @ 826E3E5 + trainerbattle 0, TRAINER_ALVARO, 0, Route110_TrickHousePuzzle7_Text_26E6DA, Route110_TrickHousePuzzle7_Text_26E700 + msgbox Route110_TrickHousePuzzle7_Text_26E722, 6 + end + +Route110_TrickHousePuzzle7_EventScript_26E3FC:: @ 826E3FC + trainerbattle 0, TRAINER_EVERETT, 0, Route110_TrickHousePuzzle7_Text_26E78D, Route110_TrickHousePuzzle7_Text_26E7AB + msgbox Route110_TrickHousePuzzle7_Text_26E7C4, 6 + end + +Route110_TrickHousePuzzle7_EventScript_26E413:: @ 826E413 + .string "{PLAYER} wrote down the secret code\n" + .string "on the door.\p" + .string "“TRICK MASTER is huggable.â€\n" + .string "… … … … … … … …\p" + .string "The lock clicked open!$" + +Route110_TrickHousePuzzle7_Text_26E481: @ 826E481 + .string "The TRICK MASTER always vanishes\n" + .string "like smoke. How does he do it?$" + +Route110_TrickHousePuzzle7_Text_26E4C1: @ 826E4C1 + .string "Aiyeeeh! You’re much too strong!\n" + .string "How do you do it?$" + +Route110_TrickHousePuzzle7_Text_26E4F4: @ 826E4F4 + .string "I wish I could appear and disappear as\n" + .string "if I were smoke, too.$" + +Route110_TrickHousePuzzle7_Text_26E531: @ 826E531 + .string "Going around the same spot…\n" + .string "It begets ill fortune…$" + +Route110_TrickHousePuzzle7_Text_26E564: @ 826E564 + .string "Defeated!\n" + .string "It’s a bad sign…$" + +Route110_TrickHousePuzzle7_Text_26E57F: @ 826E57F + .string "I’ve circled the same spot over ten\n" + .string "times now… It’s ill fortune…$" + +Route110_TrickHousePuzzle7_Text_26E5C0: @ 826E5C0 + .string "Whoever wins will get through here\n" + .string "first. That’s the feeling I get.$" + +Route110_TrickHousePuzzle7_Text_26E604: @ 826E604 + .string "Oh!\n" + .string "Well, go ahead, then!$" + +Route110_TrickHousePuzzle7_Text_26E61E: @ 826E61E + .string "You’re solving all the puzzles in the\n" + .string "TRICK HOUSE. That’s the feeling I get.$" + +Route110_TrickHousePuzzle7_Text_26E66B: @ 826E66B + .string "Nufufufu, here at last!\n" + .string "Let’s get right with it!$" + +Route110_TrickHousePuzzle7_Text_26E69C: @ 826E69C + .string "You’re so casual about winning!$" + +Route110_TrickHousePuzzle7_Text_26E6BC: @ 826E6BC + .string "Humph! I’m not upset!\n" + .string "Not me!$" + +Route110_TrickHousePuzzle7_Text_26E6DA: @ 826E6DA + .string "I ever so closely watched you coming!$" + +Route110_TrickHousePuzzle7_Text_26E700: @ 826E700 + .string "This outcome I didn’t see coming…$" + +Route110_TrickHousePuzzle7_Text_26E722: @ 826E722 + .string "Well, anyway, we both picked a weird\n" + .string "place to get acquainted.\p" + .string "As one weirdo to another,\n" + .string "let’s do our best!$" + +Route110_TrickHousePuzzle7_Text_26E78D: @ 826E78D + .string "It’s awfully cramped in here…$" + +Route110_TrickHousePuzzle7_Text_26E7AB: @ 826E7AB + .string "Oh, yes, strong you are.$" + +Route110_TrickHousePuzzle7_Text_26E7C4: @ 826E7C4 + .string "I was hoping to switch places with you\n" + .string "when I beat you, but…$" + diff --git a/data/maps/Route110_TrickHousePuzzle8/events.inc b/data/maps/Route110_TrickHousePuzzle8/events.inc new file mode 100644 index 000000000..eacc9e940 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle8/events.inc @@ -0,0 +1,17 @@ +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 + +Route110_TrickHousePuzzle8_MapWarps: @ 853E968 + 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 + +Route110_TrickHousePuzzle8_MapEvents:: @ 853E98C + map_events Route110_TrickHousePuzzle8_EventObjects, Route110_TrickHousePuzzle8_MapWarps, 0x0, Route110_TrickHousePuzzle8_MapBGEvents + diff --git a/data/maps/Route110_TrickHousePuzzle8/scripts.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc new file mode 100644 index 000000000..369bc59a7 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle8/scripts.inc @@ -0,0 +1,72 @@ +Route110_TrickHousePuzzle8_MapScripts:: @ 826E801 + .byte 0 + +Route110_TrickHousePuzzle8_EventScript_26E802:: @ 826E802 + lockall + compare VAR_0x40B2, 0 + goto_eq Route110_TrickHousePuzzle8_EventScript_26E814 + goto Route110_TrickHousePuzzle8_EventScript_26A3DB + end + +Route110_TrickHousePuzzle8_EventScript_26E814:: @ 826E814 + setvar VAR_0x40B2, 1 + goto Route110_TrickHousePuzzle8_EventScript_26A3E5 + end + +Route110_TrickHousePuzzle8_EventScript_26E81F:: @ 826E81F + trainerbattle 0, TRAINER_VINCENT, 0, Route110_TrickHousePuzzle8_Text_26E8CD, Route110_TrickHousePuzzle8_Text_26E8F6 + msgbox Route110_TrickHousePuzzle8_Text_26E918, 6 + end + +Route110_TrickHousePuzzle8_EventScript_26E836:: @ 826E836 + trainerbattle 0, TRAINER_KEIRA, 0, Route110_TrickHousePuzzle8_Text_26E954, Route110_TrickHousePuzzle8_Text_26E97F + msgbox Route110_TrickHousePuzzle8_Text_26E99F, 6 + end + +Route110_TrickHousePuzzle8_EventScript_26E84D:: @ 826E84D + trainerbattle 0, TRAINER_LEROY, 0, Route110_TrickHousePuzzle8_Text_26E9D7, Route110_TrickHousePuzzle8_Text_26EA14 + msgbox Route110_TrickHousePuzzle8_Text_26EA3F, 6 + end + +Route110_TrickHousePuzzle8_EventScript_26E864:: @ 826E864 + .string "{PLAYER} wrote down the secret code\n" + .string "on the door.\p" + .string "“TRICK MASTER I love.â€\n" + .string "… … … … … … … …\p" + .string "The lock clicked open!$" + +Route110_TrickHousePuzzle8_Text_26E8CD: @ 826E8CD + .string "Not many TRAINERS have made it\n" + .string "this far.$" + +Route110_TrickHousePuzzle8_Text_26E8F6: @ 826E8F6 + .string "That must mean you’re tough, too…$" + +Route110_TrickHousePuzzle8_Text_26E918: @ 826E918 + .string "You’ve beaten the POKéMON LEAGUE\n" + .string "CHAMPION? That’s too much!$" + +Route110_TrickHousePuzzle8_Text_26E954: @ 826E954 + .string "Consider yourself lucky to be\n" + .string "battling me!$" + +Route110_TrickHousePuzzle8_Text_26E97F: @ 826E97F + .string "This isn’t right!\n" + .string "I can’t lose!$" + +Route110_TrickHousePuzzle8_Text_26E99F: @ 826E99F + .string "It’s a miracle that you beat me.\n" + .string "You can brag about it.$" + +Route110_TrickHousePuzzle8_Text_26E9D7: @ 826E9D7 + .string "You’ve been slugging through the TRICK\n" + .string "HOUSE challenge, too.$" + +Route110_TrickHousePuzzle8_Text_26EA14: @ 826EA14 + .string "I see…\n" + .string "You possess an extraordinary style.$" + +Route110_TrickHousePuzzle8_Text_26EA3F: @ 826EA3F + .string "Seeing someone like you should please\n" + .string "the TRICK MASTER.$" + diff --git a/data/maps/Route111/events.inc b/data/maps/Route111/events.inc new file mode 100644 index 000000000..cea2db8d5 --- /dev/null +++ b/data/maps/Route111/events.inc @@ -0,0 +1,114 @@ +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 + +Route111_MapWarps: @ 8529640 + 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 + 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 + +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 + +Route111_MapEvents:: @ 8529960 + map_events Route111_EventObjects, Route111_MapWarps, Route111_MapCoordEvents, Route111_MapBGEvents + diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc new file mode 100644 index 000000000..fcbf32c91 --- /dev/null +++ b/data/maps/Route111/scripts.inc @@ -0,0 +1,756 @@ +Route111_MapScripts:: @ 81F0CA7 + map_script 1, Route111_MapScript1_1F0CBC + map_script 3, Route111_MapScript1_1F0D87 + map_script 4, Route111_MapScript2_1F0E46 + map_script 2, Route111_MapScript2_1F0E56 + .byte 0 + +Route111_MapScript1_1F0CBC: @ 81F0CBC + checkflag FLAG_0x0E4 + call_if 0, Route111_EventScript_1F0CD1 + compare VAR_0x40CB, 1 + call_if 1, Route111_EventScript_1F0CE4 + end + +Route111_EventScript_1F0CD1:: @ 81F0CD1 + setmetatile 29, 86, 124, 1 + setmetatile 29, 87, 145, 1 + return + +Route111_EventScript_1F0CE4:: @ 81F0CE4 + setmetatile 18, 53, 984, 0 + setmetatile 19, 53, 985, 0 + setmetatile 20, 53, 986, 0 + setmetatile 18, 54, 992, 0 + setmetatile 19, 54, 993, 0 + setmetatile 20, 54, 994, 0 + setmetatile 18, 55, 1000, 0 + setmetatile 19, 55, 1001, 0 + setmetatile 20, 55, 1002, 0 + setmetatile 18, 56, 1008, 0 + setmetatile 19, 56, 1009, 0 + setmetatile 20, 56, 1010, 0 + setmetatile 18, 57, 987, 0 + setmetatile 19, 57, 988, 0 + setmetatile 20, 57, 989, 0 + setmetatile 18, 58, 995, 0 + setmetatile 19, 58, 996, 0 + setmetatile 20, 58, 997, 0 + return + +Route111_MapScript1_1F0D87: @ 81F0D87 + setvar VAR_0x40D6, 0 + special sub_81BE79C + checkflag FLAG_0x14E + call_if 0, Route111_EventScript_1F0E3C + compare VAR_0x40CB, 1 + call_if 1, Route111_EventScript_1F0DC2 + compare VAR_0x40CB, 2 + call_if 1, Route111_EventScript_1F0E40 + call Route111_EventScript_1F0DE6 + call Route111_EventScript_28CCC7 + checktrainerflag TRAINER_VICKY + goto_if 0, Route111_EventScript_1F0E26 + end + +Route111_EventScript_1F0DC2:: @ 81F0DC2 + checkplayergender + compare VAR_RESULT, 0 + goto_eq Route111_EventScript_1F0DDA + compare VAR_RESULT, 1 + goto_eq Route111_EventScript_1F0DE0 + return + +Route111_EventScript_1F0DDA:: @ 81F0DDA + setvar VAR_OBJ_GFX_ID_0, 100 + return + +Route111_EventScript_1F0DE0:: @ 81F0DE0 + setvar VAR_OBJ_GFX_ID_0, 105 + return + +Route111_EventScript_1F0DE6:: @ 81F0DE6 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_1, 34 + goto_if 0, Route111_EventScript_1F0E25 + compare VAR_TEMP_1, 107 + goto_if 2, Route111_EventScript_1F0E25 + compare VAR_TEMP_1, 72 + goto_if 2, Route111_EventScript_1F0E22 + compare VAR_TEMP_0, 2000 + goto_if 2, Route111_EventScript_1F0E25 + compare VAR_TEMP_0, 8 + goto_if 0, Route111_EventScript_1F0E25 + +Route111_EventScript_1F0E22:: @ 81F0E22 + setweather 8 + +Route111_EventScript_1F0E25:: @ 81F0E25 + return + +Route111_EventScript_1F0E26:: @ 81F0E26 + clearflag FLAG_0x300 + setflag FLAG_0x301 + setflag FLAG_0x302 + setflag FLAG_0x303 + cleartrainerflag TRAINER_VICTOR + cleartrainerflag TRAINER_VICTORIA + cleartrainerflag TRAINER_VIVI + end + +Route111_EventScript_1F0E3C:: @ 81F0E3C + setmaplayoutindex 392 + return + +Route111_EventScript_1F0E40:: @ 81F0E40 + setvar VAR_0x40CB, 3 + return + +Route111_MapScript2_1F0E46: @ 81F0E46 + map_script_2 VAR_0x40CB, 1, Route111_EventScript_1F0E50 + .2byte 0 + +Route111_EventScript_1F0E50:: @ 81F0E50 + hideobjectat 255, MAP_LITTLEROOT_TOWN + end + +Route111_MapScript2_1F0E56: @ 81F0E56 + map_script_2 VAR_0x40CB, 1, Route111_EventScript_1F0E60 + .2byte 0 + +Route111_EventScript_1F0E60:: @ 81F0E60 + lockall + special sub_81BEB68 + waitstate + delay 24 + playse SE_RU_HYUU + addobject 45 + special sub_81BE7F4 + waitstate + showobjectat 255, MAP_LITTLEROOT_TOWN + removeobject 45 + delay 16 + turnobject 255, 2 + delay 16 + special sub_81BEB54 + waitstate + special sub_81BEB7C + waitstate + setvar VAR_0x40CB, 2 + clearflag FLAG_0x36A + checkflag FLAG_0x150 + goto_eq Route111_EventScript_1F0EA7 + msgbox Route111_Text_1F1C74, 4 + releaseall + end + +Route111_EventScript_1F0EA7:: @ 81F0EA7 + msgbox Route111_Text_1F1C9F, 4 + releaseall + end + +Route111_Movement_1F0EB1:: @ 81F0EB1 + 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 + lock + faceplayer + dodailyevents + checkflag FLAG_0x92C + goto_eq Route111_EventScript_1F0EF4 + msgbox Route111_Text_2A6EBD, 4 + giveitem_std ITEM_RAZZ_BERRY + compare VAR_RESULT, 0 + goto_eq Route111_EventScript_272054 + setflag FLAG_0x92C + special GetPlayerBigGuyGirlString + msgbox Route111_Text_2A6F3D, 4 + release + end + +Route111_EventScript_1F0EF4:: @ 81F0EF4 + msgbox Route111_Text_2A6F9A, 4 + release + end + +Route111_EventScript_1F0EFE:: @ 81F0EFE + lockall + setvar VAR_0x8004, 0 + goto Route111_EventScript_1F0F2E + end + +Route111_EventScript_1F0F0A:: @ 81F0F0A + lockall + setvar VAR_0x8004, 1 + goto Route111_EventScript_1F0F2E + end + +Route111_EventScript_1F0F16:: @ 81F0F16 + lockall + setvar VAR_0x8004, 2 + goto Route111_EventScript_1F0F2E + end + +Route111_EventScript_1F0F22:: @ 81F0F22 + lockall + setvar VAR_0x8004, 3 + goto Route111_EventScript_1F0F2E + end + +Route111_EventScript_1F0F2E:: @ 81F0F2E + checkitem ITEM_GO_GOGGLES, 1 + compare VAR_RESULT, 0 + goto_eq Route111_EventScript_1F0F45 + setvar VAR_TEMP_3, 1 + releaseall + end + +Route111_EventScript_1F0F45:: @ 81F0F45 + msgbox gUnknown_08272C5F, 4 + closemessage + compare VAR_0x8004, 0 + call_if 1, Route111_EventScript_1F0F7C + compare VAR_0x8004, 1 + call_if 1, Route111_EventScript_1F0F87 + compare VAR_0x8004, 2 + call_if 1, Route111_EventScript_1F0F92 + compare VAR_0x8004, 3 + call_if 1, Route111_EventScript_1F0F9D + releaseall + end + +Route111_EventScript_1F0F7C:: @ 81F0F7C + applymovement 255, Route111_Movement_1F0FA8 + waitmovement 0 + return + +Route111_EventScript_1F0F87:: @ 81F0F87 + applymovement 255, Route111_Movement_1F0FAA + waitmovement 0 + return + +Route111_EventScript_1F0F92:: @ 81F0F92 + applymovement 255, Route111_Movement_1F0FAC + waitmovement 0 + return + +Route111_EventScript_1F0F9D:: @ 81F0F9D + applymovement 255, Route111_Movement_1F0FAE + waitmovement 0 + return + +Route111_Movement_1F0FA8: @ 81F0FA8 + walk_up + step_end + +Route111_Movement_1F0FAA: @ 81F0FAA + walk_down + step_end + +Route111_Movement_1F0FAC: @ 81F0FAC + walk_left + step_end + +Route111_Movement_1F0FAE: @ 81F0FAE + walk_right + step_end + +Route111_EventScript_1F0FB0:: @ 81F0FB0 + setweather 2 + fadenewbgm MUS_DOORO_X1 + doweather + setvar VAR_TEMP_3, 0 + end + +Route111_EventScript_1F0FBD:: @ 81F0FBD + setweather 8 + fadenewbgm MUS_ASHROAD + doweather + end + +Route111_EventScript_1F0FC5:: @ 81F0FC5 + lock + faceplayer + setflag FLAG_LANDMARK_WINSTRATE_FAMILY + msgbox Route111_Text_1F1475, 5 + compare VAR_RESULT, 1 + goto_eq Route111_EventScript_1F0FE7 + msgbox Route111_Text_1F14F5, 4 + release + end + +Route111_EventScript_1F0FE7:: @ 81F0FE7 + msgbox Route111_Text_1F1523, 4 + trainerbattle 3, TRAINER_VICTOR, 0, Route111_Text_1F1542 + applymovement 1, Route111_Movement_2725A6 + waitmovement 0 + call Route111_EventScript_1F113C + msgbox Route111_Text_1F156F, 4 + closemessage + applymovement 1, Route111_Movement_1F114A + waitmovement 0 + removeobject 1 + call Route111_EventScript_1F1143 + applymovement 255, Route111_Movement_1F114F + waitmovement 0 + call Route111_EventScript_1F113C + addobject 2 + applymovement 2, Route111_Movement_1F114D + waitmovement 0 + call Route111_EventScript_1F1143 + msgbox Route111_Text_1F159D, 4 + trainerbattle 3, TRAINER_VICTORIA, 0, Route111_Text_1F1616 + applymovement 2, Route111_Movement_2725A6 + waitmovement 0 + call Route111_EventScript_1F113C + msgbox Route111_Text_1F1645, 4 + closemessage + applymovement 2, Route111_Movement_1F114A + waitmovement 0 + removeobject 2 + call Route111_EventScript_1F1143 + applymovement 255, Route111_Movement_1F114F + waitmovement 0 + call Route111_EventScript_1F113C + addobject 3 + applymovement 3, Route111_Movement_1F114D + waitmovement 0 + call Route111_EventScript_1F1143 + msgbox Route111_Text_1F167E, 4 + trainerbattle 3, TRAINER_VIVI, 0, Route111_Text_1F16C6 + applymovement 3, Route111_Movement_2725A6 + waitmovement 0 + call Route111_EventScript_1F113C + msgbox Route111_Text_1F16DC, 4 + closemessage + applymovement 3, Route111_Movement_1F114A + waitmovement 0 + removeobject 3 + call Route111_EventScript_1F1143 + applymovement 255, Route111_Movement_1F114F + waitmovement 0 + call Route111_EventScript_1F113C + addobject 4 + applymovement 4, Route111_Movement_1F114D + waitmovement 0 + call Route111_EventScript_1F1143 + msgbox Route111_Text_1F16FB, 4 + trainerbattle 3, TRAINER_VICKY, 0, Route111_Text_1F1756 + msgbox Route111_Text_1F1788, 4 + closemessage + applymovement 4, Route111_Movement_2725A6 + waitmovement 0 + call Route111_EventScript_1F113C + applymovement 4, Route111_Movement_1F114A + waitmovement 0 + removeobject 4 + call Route111_EventScript_1F1143 + release + end + +Route111_EventScript_1F113C:: @ 81F113C + opendoor 13, 113 + waitdooranim + return + +Route111_EventScript_1F1143:: @ 81F1143 + closedoor 13, 113 + waitdooranim + return + +Route111_Movement_1F114A: @ 81F114A + walk_in_place_fastest_up + walk_up + step_end + +Route111_Movement_1F114D: @ 81F114D + walk_down + step_end + +Route111_Movement_1F114F: @ 81F114F + delay_16 + delay_16 + delay_16 + step_end + +Route111_EventScript_1F1153:: @ 81F1153 + msgbox Route111_Text_1F18CE, 3 + end + +Route111_EventScript_1F115C:: @ 81F115C + msgbox Route111_Text_1F18E8, 3 + end + +Route111_EventScript_1F1165:: @ 81F1165 + msgbox Route111_Text_1F1921, 3 + end + +Route111_EventScript_1F116E:: @ 81F116E + msgbox Route111_Text_1F1937, 3 + end + +Route111_EventScript_1F1177:: @ 81F1177 + msgbox Route111_Text_1F194D, 3 + end + +Route111_EventScript_1F1180:: @ 81F1180 + msgbox Route111_Text_1F1987, 3 + end + +Route111_EventScript_1F1189:: @ 81F1189 + msgbox Route111_Text_1F17BA, 2 + end + +Route111_EventScript_1F1192:: @ 81F1192 + msgbox Route111_Text_1F186E, 2 + end + +Route111_EventScript_1F119B:: @ 81F119B + lock + faceplayer + compare VAR_0x40CB, 3 + goto_eq Route111_EventScript_1F11C6 + compare VAR_0x40CB, 2 + goto_eq Route111_EventScript_1F11D0 + checkflag FLAG_0x14E + goto_eq Route111_EventScript_1F11DA + msgbox Route111_Text_1F1A22, 4 + release + end + +Route111_EventScript_1F11C6:: @ 81F11C6 + msgbox Route111_Text_1F1C12, 4 + release + end + +Route111_EventScript_1F11D0:: @ 81F11D0 + msgbox Route111_Text_1F1B92, 4 + release + end + +Route111_EventScript_1F11DA:: @ 81F11DA + msgbox Route111_Text_1F1AC7, 4 + release + end + +Route111_EventScript_1F11E4:: @ 81F11E4 + lockall + applymovement 46, Route111_Movement_27259E + waitmovement 0 + msgbox Route111_Text_1F1CCA, 4 + closemessage + applymovement 46, Route111_Movement_2725A2 + waitmovement 0 + releaseall + end + +Route111_EventScript_1F1204:: @ 81F1204 + trainerbattle 0, TRAINER_DREW, 0, Route111_Text_29878E, Route111_Text_29880A + msgbox Route111_Text_298853, 6 + end + +Route111_EventScript_1F121B:: @ 81F121B + trainerbattle 0, TRAINER_HEIDI, 0, Route111_Text_2988A3, Route111_Text_298908 + msgbox Route111_Text_29891B, 6 + end + +Route111_EventScript_1F1232:: @ 81F1232 + trainerbattle 0, TRAINER_BEAU, 0, Route111_Text_29898E, Route111_Text_2989E6 + msgbox Route111_Text_298A03, 6 + end + +Route111_EventScript_1F1249:: @ 81F1249 + trainerbattle 0, TRAINER_BECKY, 0, Route111_Text_298A65, Route111_Text_298AAF + msgbox Route111_Text_298AC0, 6 + end + +Route111_EventScript_1F1260:: @ 81F1260 + trainerbattle 2, TRAINER_DUSTY_1, 0, Route111_Text_298B08, Route111_Text_298B53, Route111_EventScript_1F128C + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route111_EventScript_1F12AB + msgbox Route111_Text_298B9A, 4 + release + end + +Route111_EventScript_1F128C:: @ 81F128C + special sub_80B4808 + waitmovement 0 + msgbox Route111_Text_298C00, 4 + setvar VAR_0x8004, 44 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 44 + callstd 8 + release + end + +Route111_EventScript_1F12AB:: @ 81F12AB + trainerbattle 5, TRAINER_DUSTY_1, 0, Route111_Text_298C5F, Route111_Text_298CD2 + msgbox Route111_Text_298D0C, 6 + end + +Route111_EventScript_1F12C2:: @ 81F12C2 + trainerbattle 0, TRAINER_TRAVIS, 0, Route111_Text_298DA9, Route111_Text_298DD8 + msgbox Route111_Text_298DF1, 6 + end + +Route111_EventScript_1F12D9:: @ 81F12D9 + trainerbattle 0, TRAINER_IRENE, 0, Route111_Text_298E2F, Route111_Text_298E6E + msgbox Route111_Text_298E8C, 6 + end + +Route111_EventScript_1F12F0:: @ 81F12F0 + trainerbattle 0, TRAINER_DAISUKE, 0, Route111_Text_298EE6, Route111_Text_298F14 + msgbox Route111_Text_298F26, 6 + end + +Route111_EventScript_1F1307:: @ 81F1307 + trainerbattle 2, TRAINER_WILTON_1, 0, Route111_Text_298F79, Route111_Text_298FA9, Route111_EventScript_1F1333 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route111_EventScript_1F1352 + msgbox Route111_Text_298FD4, 4 + release + end + +Route111_EventScript_1F1333:: @ 81F1333 + special sub_80B4808 + waitmovement 0 + msgbox Route111_Text_29903D, 4 + setvar VAR_0x8004, 78 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 78 + callstd 8 + release + end + +Route111_EventScript_1F1352:: @ 81F1352 + trainerbattle 5, TRAINER_WILTON_1, 0, Route111_Text_29909B, Route111_Text_2990EE + msgbox Route111_Text_299102, 6 + end + +Route111_EventScript_1F1369:: @ 81F1369 + trainerbattle 2, TRAINER_BROOKE_1, 0, Route111_Text_299143, Route111_Text_299193, Route111_EventScript_1F1395 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route111_EventScript_1F13B4 + msgbox Route111_Text_2991C2, 4 + release + end + +Route111_EventScript_1F1395:: @ 81F1395 + special sub_80B4808 + waitmovement 0 + msgbox Route111_Text_29921D, 4 + setvar VAR_0x8004, 94 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 94 + callstd 8 + release + end + +Route111_EventScript_1F13B4:: @ 81F13B4 + trainerbattle 5, TRAINER_BROOKE_1, 0, Route111_Text_29925D, Route111_Text_2992D6 + msgbox Route111_Text_2992F5, 6 + end + +Route111_EventScript_1F13CB:: @ 81F13CB + trainerbattle 0, TRAINER_HAYDEN, 0, Route111_Text_299682, Route111_Text_2996BE + msgbox Route111_Text_2996C5, 6 + end + +Route111_EventScript_1F13E2:: @ 81F13E2 + trainerbattle 0, TRAINER_BIANCA, 0, Route111_Text_2996FE, Route111_Text_29973D + msgbox Route111_Text_29975D, 6 + end + +Route111_EventScript_1F13F9:: @ 81F13F9 + trainerbattle 0, TRAINER_TYRON, 0, Route111_Text_299524, Route111_Text_299549 + msgbox Route111_Text_299576, 6 + end + +Route111_EventScript_1F1410:: @ 81F1410 + trainerbattle 0, TRAINER_CELINA, 0, Route111_Text_2995F0, Route111_Text_299625 + msgbox Route111_Text_29964B, 6 + end + +Route111_EventScript_1F1427:: @ 81F1427 + trainerbattle 0, TRAINER_CELIA, 0, Route111_Text_29934B, Route111_Text_299384 + msgbox Route111_Text_2993A7, 6 + end + +Route111_EventScript_1F143E:: @ 81F143E + trainerbattle 0, TRAINER_BRYAN, 0, Route111_Text_299401, Route111_Text_299431 + msgbox Route111_Text_29945F, 6 + end + +Route111_EventScript_1F1455:: @ 81F1455 + trainerbattle 0, TRAINER_BRANDEN, 0, Route111_Text_299493, Route111_Text_2994C5 + msgbox Route111_Text_2994FB, 6 + end + +Route111_EventScript_1F146C:: @ 81F146C + msgbox Route111_Text_1F1D61, 3 + end + +Route111_Text_1F1475: @ 81F1475 + .string "Hello! I take it you’re a traveler.\p" + .string "How’s this? What do you say to taking\n" + .string "on our family of four in a series of\l" + .string "POKéMON battles?$" + +Route111_Text_1F14F5: @ 81F14F5 + .string "Is that so?\n" + .string "Drop in, if you change your mind!$" + +Route111_Text_1F1523: @ 81F1523 + .string "That’s the spirit! I like you!$" + +Route111_Text_1F1542: @ 81F1542 + .string "Aiyah!\n" + .string "You’re a lot tougher than I expected!$" + +Route111_Text_1F156F: @ 81F156F + .string "Hey, all!\n" + .string "I’ve found a pretty strong TRAINER!$" + +Route111_Text_1F159D: @ 81F159D + .string "Oh, my goodness! Aren’t you young?\p" + .string "You must be quite the TRAINER to beat\n" + .string "my husband, though.\p" + .string "It’s my turn to battle now!$" + +Route111_Text_1F1616: @ 81F1616 + .string "Oh, gosh!\n" + .string "I can’t get over how strong you are!$" + +Route111_Text_1F1645: @ 81F1645 + .string "There’s a strong TRAINER here!\n" + .string "This one’s really strong!$" + +Route111_Text_1F167E: @ 81F167E + .string "You’re stronger than Mommy? Wow!\p" + .string "But I’m strong, too!\n" + .string "Really! Honestly!$" + +Route111_Text_1F16C6: @ 81F16C6 + .string "Huh? Did I just lose?$" + +Route111_Text_1F16DC: @ 81F16DC + .string "This stinks…\p" + .string "…Snivel… Grandma!$" + +Route111_Text_1F16FB: @ 81F16FB + .string "How dare you make my granddaughter\n" + .string "cry!\p" + .string "For that, I’m going to smack you!\n" + .string "Prepare to lose!$" + +Route111_Text_1F1756: @ 81F1756 + .string "Kwah! You are strong…\n" + .string "My granddaughter was right…$" + +Route111_Text_1F1788: @ 81F1788 + .string "If you’re not in any hurry,\n" + .string "visit with us awhile.$" + +Route111_Text_1F17BA: @ 81F17BA + .string "If you don’t raise your POKéMON some\n" + .string "more, it could be tough to keep winning\l" + .string "up through the ranks.\p" + .string "I’ve heard the POKéMON LEAGUE’s\n" + .string "ELITE FOUR are far stronger than\l" + .string "any GYM LEADER.$" + +Route111_Text_1F186E: @ 81F186E + .string "I challenged the WINSTRATE family,\n" + .string "but four matches in a row is tough\l" + .string "going… They destroyed me.$" + +Route111_Text_1F18CE: @ 81F18CE + .string "ROUTE 111\n" + .string "{0x7A} MAUVILLE CITY$" + +Route111_Text_1F18E8: @ 81F18E8 + .string "“Our family’s hearts beat as one!â€\n" + .string "THE WINSTRATE’S HOUSE$" + +Route111_Text_1F1921: @ 81F1921 + .string "ROUTE 111\n" + .string "{0x7B} ROUTE 112$" + +Route111_Text_1F1937: @ 81F1937 + .string "ROUTE 111\n" + .string "{0x7B} ROUTE 113$" + +Route111_Text_1F194D: @ 81F194D + .string "OLD LADY’S REST STOP\n" + .string "“Come in and rest your tired bones.â€$" + +Route111_Text_1F1987: @ 81F1987 + .string "TRAINER TIPS\p" + .string "One of the indicators of a POKéMON’s\n" + .string "powerfulness is SP. ATK. It stands for\l" + .string "“SPECIAL ATTACK.â€\p" + .string "Likewise, SP. DEF stands for “SPECIAL\n" + .string "DEFENSE.â€$" + +Route111_Text_1F1A22: @ 81F1A22 + .string "There should be a tower made of sand\n" + .string "around here somewhere.\p" + .string "But for some reason, it can be seen\n" + .string "sometimes, and sometimes not.\p" + .string "That’s why I call it the MIRAGE TOWER.$" + +Route111_Text_1F1AC7: @ 81F1AC7 + .string "I see it!\n" + .string "The tower of sand!\p" + .string "The sand tower they called a mirage\n" + .string "is clearly visible!\p" + .string "But it looks so fragile…\n" + .string "It could crumble away anytime…\p" + .string "I want to go inside it, but I can’t\n" + .string "get my courage up for it…$" + +Route111_Text_1F1B92: @ 81F1B92 + .string "Whoa…\n" + .string "That was shocking.\p" + .string "Sand rained down in chunks all of\n" + .string "a sudden.\p" + .string "What was it like inside?\n" + .string "Were there sandy ghosts and such?$" + +Route111_Text_1F1C12: @ 81F1C12 + .string "Since I spoke to you, the tower of sand\n" + .string "hasn’t been seen.\p" + .string "Perhaps it really was\n" + .string "the MIRAGE TOWER…$" + +Route111_Text_1F1C74: @ 81F1C74 + .string "The CLAW FOSSIL disappeared into\n" + .string "the sand…$" + +Route111_Text_1F1C9F: @ 81F1C9F + .string "The ROOT FOSSIL disappeared into\n" + .string "the sand…$" + +Route111_Text_1F1CCA: @ 81F1CCA + .string "Oh, no!\p" + .string "My uncle in MAUVILLE told me to take\n" + .string "ROCK SMASH with me if I was going to\l" + .string "ROUTE 111!\p" + .string "My uncle? He lives across from\n" + .string "the bike shop in MAUVILLE.$" + +Route111_Text_1F1D61: @ 81F1D61 + .string "{0x7C} TRAINER HILL ENTRANCE\p" + .string "“Scale the heights, you hot-blooded\n" + .string "TRAINERS!â€$" + diff --git a/data/maps/Route111_OldLadysRestStop/events.inc b/data/maps/Route111_OldLadysRestStop/events.inc new file mode 100644 index 000000000..5ade76ba3 --- /dev/null +++ b/data/maps/Route111_OldLadysRestStop/events.inc @@ -0,0 +1,10 @@ +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 + +Route111_OldLadysRestStop_MapWarps: @ 8533C30 + 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/Route111_OldLadysRestStop/scripts.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc new file mode 100644 index 000000000..015a584f4 --- /dev/null +++ b/data/maps/Route111_OldLadysRestStop/scripts.inc @@ -0,0 +1,54 @@ +Route111_OldLadysRestStop_MapScripts:: @ 822A916 + map_script 3, Route111_OldLadysRestStop_MapScript1_22A91C + .byte 0 + +Route111_OldLadysRestStop_MapScript1_22A91C: @ 822A91C + setflag FLAG_LANDMARK_OLD_LADY_REST_SHOP + end + +Route111_OldLadysRestStop_EventScript_22A920:: @ 822A920 + lock + faceplayer + msgbox Route111_OldLadysRestStop_Text_22A978, 5 + compare VAR_RESULT, 1 + goto_eq Route111_OldLadysRestStop_EventScript_22A941 + compare VAR_RESULT, 0 + goto_eq Route111_OldLadysRestStop_EventScript_22A96E + end + +Route111_OldLadysRestStop_EventScript_22A941:: @ 822A941 + msgbox Route111_OldLadysRestStop_Text_22A9EC, 4 + closemessage + call Route111_OldLadysRestStop_EventScript_272083 + msgbox Route111_OldLadysRestStop_Text_22AA16, 5 + compare VAR_RESULT, 1 + goto_eq Route111_OldLadysRestStop_EventScript_22A941 + compare VAR_RESULT, 0 + goto_eq Route111_OldLadysRestStop_EventScript_22A96E + end + +Route111_OldLadysRestStop_EventScript_22A96E:: @ 822A96E + msgbox Route111_OldLadysRestStop_Text_22AA8F, 4 + release + end + +Route111_OldLadysRestStop_Text_22A978: @ 822A978 + .string "Oh, dear, dear.\n" + .string "Aren’t your POKéMON exhausted?\p" + .string "If you’d like, rest up here.\n" + .string "That’s a fine idea! You should do that.$" + +Route111_OldLadysRestStop_Text_22A9EC: @ 822A9EC + .string "That’s right.\n" + .string "Take your time and rest up!$" + +Route111_OldLadysRestStop_Text_22AA16: @ 822AA16 + .string "Oh, dear, dear.\n" + .string "Are your POKéMON still tired?\p" + .string "You should take another rest here.\n" + .string "That’s a fine idea. You should do that.$" + +Route111_OldLadysRestStop_Text_22AA8F: @ 822AA8F + .string "Is that so?\n" + .string "You don’t need to be shy about it.$" + diff --git a/data/maps/Route111_WinstrateFamilysHouse/events.inc b/data/maps/Route111_WinstrateFamilysHouse/events.inc new file mode 100644 index 000000000..0fe5b5df4 --- /dev/null +++ b/data/maps/Route111_WinstrateFamilysHouse/events.inc @@ -0,0 +1,13 @@ +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 + +Route111_WinstrateFamilysHouse_MapWarps: @ 8533BF4 + 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/Route111_WinstrateFamilysHouse/scripts.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc new file mode 100644 index 000000000..847119d2e --- /dev/null +++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc @@ -0,0 +1,105 @@ +Route111_WinstrateFamilysHouse_MapScripts:: @ 822A48C + .byte 0 + +Route111_WinstrateFamilysHouse_EventScript_22A48D:: @ 822A48D + lock + faceplayer + setvar VAR_0x8008, 2 + msgbox Route111_WinstrateFamilysHouse_Text_22A539, 4 + goto Route111_WinstrateFamilysHouse_EventScript_22A52C + end + +Route111_WinstrateFamilysHouse_EventScript_22A4A2:: @ 822A4A2 + lock + faceplayer + setvar VAR_0x8008, 3 + checkflag FLAG_0x115 + goto_eq Route111_WinstrateFamilysHouse_EventScript_22A4DA + msgbox Route111_WinstrateFamilysHouse_Text_22A5F4, 4 + giveitem_std ITEM_MACHO_BRACE + compare VAR_RESULT, 0 + goto_eq Route111_WinstrateFamilysHouse_EventScript_272054 + setflag FLAG_0x115 + goto Route111_WinstrateFamilysHouse_EventScript_22A52C + end + +Route111_WinstrateFamilysHouse_EventScript_22A4DA:: @ 822A4DA + msgbox Route111_WinstrateFamilysHouse_Text_22A6B4, 4 + goto Route111_WinstrateFamilysHouse_EventScript_22A52C + end + +Route111_WinstrateFamilysHouse_EventScript_22A4E8:: @ 822A4E8 + lock + faceplayer + setvar VAR_0x8008, 1 + msgbox Route111_WinstrateFamilysHouse_Text_22A6F7, 4 + goto Route111_WinstrateFamilysHouse_EventScript_22A52C + end + +Route111_WinstrateFamilysHouse_EventScript_22A4FD:: @ 822A4FD + lock + faceplayer + setvar VAR_0x8008, 4 + checkflag FLAG_0x004 + goto_eq Route111_WinstrateFamilysHouse_EventScript_22A51E + msgbox Route111_WinstrateFamilysHouse_Text_22A780, 4 + setflag FLAG_0x004 + goto Route111_WinstrateFamilysHouse_EventScript_22A52C + end + +Route111_WinstrateFamilysHouse_EventScript_22A51E:: @ 822A51E + msgbox Route111_WinstrateFamilysHouse_Text_22A89B, 4 + goto Route111_WinstrateFamilysHouse_EventScript_22A52C + end + +Route111_WinstrateFamilysHouse_EventScript_22A52C:: @ 822A52C + closemessage + applymovement VAR_0x8008, Route111_WinstrateFamilysHouse_Movement_2725A2 + waitmovement 0 + release + end + +Route111_WinstrateFamilysHouse_Text_22A539: @ 822A539 + .string "You’re the first TRAINER I’ve seen who\n" + .string "deploys POKéMON so masterfully.\p" + .string "But, I should tell you--my son is\n" + .string "stronger than you.\p" + .string "He even took the POKéMON LEAGUE\n" + .string "challenge, I’ll have you know.$" + +Route111_WinstrateFamilysHouse_Text_22A5F4: @ 822A5F4 + .string "We use this MACHO BRACE to more\n" + .string "effectively strengthen our POKéMON\l" + .string "in training.\p" + .string "Since you’ve beaten all of us here,\n" + .string "I don’t know if you need it, but we\l" + .string "would like you to have our MACHO BRACE.$" + +Route111_WinstrateFamilysHouse_Text_22A6B4: @ 822A6B4 + .string "When it comes to POKéMON battles,\n" + .string "we tend to be pretty passionate.$" + +Route111_WinstrateFamilysHouse_Text_22A6F7: @ 822A6F7 + .string "Mommy is stronger than Daddy.\p" + .string "I’m stronger than Mommy.\p" + .string "And Grandma’s stronger than me!\p" + .string "But my big brother is even stronger\n" + .string "than Grandma.$" + +Route111_WinstrateFamilysHouse_Text_22A780: @ 822A780 + .string "There’s no question that you’re strong.\p" + .string "But if you were to battle my grandson,\n" + .string "you’d end up crying in frustration.\p" + .string "He’s much stronger than any TRAINER\n" + .string "our family knows.\p" + .string "He must be challenging the POKéMON\n" + .string "LEAGUE CHAMPION by now.\p" + .string "Knowing my grandson, he could be the\n" + .string "CHAMPION already!$" + +Route111_WinstrateFamilysHouse_Text_22A89B: @ 822A89B + .string "My grandson must be challenging the\n" + .string "POKéMON LEAGUE CHAMPION by now.\p" + .string "Knowing my grandson, he could be the\n" + .string "CHAMPION already!$" + diff --git a/data/maps/Route112/events.inc b/data/maps/Route112/events.inc new file mode 100644 index 000000000..0e218cd78 --- /dev/null +++ b/data/maps/Route112/events.inc @@ -0,0 +1,32 @@ +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 + +Route112_MapWarps: @ 8529AC4 + 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 + bg_event 22, 37, 0, 0, 0, Route112_EventScript_1F1E46 + bg_event 4, 49, 0, 0, 0, Route112_EventScript_1F1E58 + +Route112_MapEvents:: @ 8529B18 + map_events Route112_EventObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents + diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc new file mode 100644 index 000000000..0ad5ee47c --- /dev/null +++ b/data/maps/Route112/scripts.inc @@ -0,0 +1,146 @@ +Route112_MapScripts:: @ 81F1DA8 + map_script 3, Route112_MapScript1_1F1DAE + .byte 0 + +Route112_MapScript1_1F1DAE: @ 81F1DAE + clearflag FLAG_0x09D + setvar VAR_0x40BD, 0 + end + +Route112_EventScript_1F1DB7:: @ 81F1DB7 + lockall + delay 40 + applymovement 1, Route112_Movement_2725A8 + waitmovement 0 + delay 20 + msgbox Route112_Text_1F1F3F, 4 + closemessage + applymovement 1, Route112_Movement_2725A2 + waitmovement 0 + delay 40 + applymovement 6, Route112_Movement_2725A4 + waitmovement 0 + delay 20 + msgbox Route112_Text_1F1F7A, 4 + closemessage + applymovement 6, Route112_Movement_2725A2 + waitmovement 0 + delay 40 + applymovement 1, Route112_Movement_2725A8 + waitmovement 0 + delay 20 + msgbox Route112_Text_1F1FBA, 4 + closemessage + applymovement 1, Route112_Movement_2725A2 + waitmovement 0 + delay 40 + applymovement 6, Route112_Movement_2725A4 + waitmovement 0 + delay 20 + msgbox Route112_Text_1F2003, 4 + closemessage + applymovement 6, Route112_Movement_2725A2 + waitmovement 0 + releaseall + end + +Route112_EventScript_1F1E46:: @ 81F1E46 + msgbox Route112_Text_1F20C1, 3 + end + +Route112_EventScript_1F1E4F:: @ 81F1E4F + msgbox Route112_Text_1F20ED, 3 + end + +Route112_EventScript_1F1E58:: @ 81F1E58 + msgbox Route112_Text_1F2138, 3 + end + +Route112_EventScript_1F1E61:: @ 81F1E61 + msgbox Route112_Text_1F204E, 2 + end + +Route112_EventScript_1F1E6A:: @ 81F1E6A + trainerbattle 0, TRAINER_BRICE, 0, Route112_Text_29978E, Route112_Text_2997CA + msgbox Route112_Text_2997DC, 6 + end + +Route112_EventScript_1F1E81:: @ 81F1E81 + trainerbattle 2, TRAINER_TRENT_1, 0, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route112_EventScript_1F1ECC + msgbox Route112_Text_299896, 4 + release + end + +Route112_EventScript_1F1EAD:: @ 81F1EAD + special sub_80B4808 + waitmovement 0 + msgbox Route112_Text_29993C, 4 + setvar VAR_0x8004, 627 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 627 + callstd 8 + release + end + +Route112_EventScript_1F1ECC:: @ 81F1ECC + trainerbattle 5, TRAINER_TRENT_1, 0, Route112_Text_2999BD, Route112_Text_2999F7 + msgbox Route112_Text_299A0F, 6 + end + +Route112_EventScript_1F1EE3:: @ 81F1EE3 + trainerbattle 0, TRAINER_LARRY, 0, Route112_Text_299A89, Route112_Text_299AAC + msgbox Route112_Text_299AB4, 6 + end + +Route112_EventScript_1F1EFA:: @ 81F1EFA + trainerbattle 0, TRAINER_CAROL, 0, Route112_Text_299AE4, Route112_Text_299B36 + msgbox Route112_Text_299B4C, 6 + end + +Route112_EventScript_1F1F11:: @ 81F1F11 + trainerbattle 0, TRAINER_BRYANT, 0, Route112_Text_299BAE, Route112_Text_299BDF + msgbox Route112_Text_299BFB, 6 + end + +Route112_EventScript_1F1F28:: @ 81F1F28 + trainerbattle 0, TRAINER_SHAYLA, 0, Route112_Text_299C34, Route112_Text_299C8F + msgbox Route112_Text_299CC6, 6 + end + +Route112_Text_1F1F3F: @ 81F1F3F + .string "Hey, man, is our leader really going\n" + .string "to awaken that thing?$" + +Route112_Text_1F1F7A: @ 81F1F7A + .string "Sounds like it, yeah. But I heard\n" + .string "we need a METEORITE to do it.$" + +Route112_Text_1F1FBA: @ 81F1FBA + .string "Oh, I get it now. That’s why the rest\n" + .string "of the crew went out to FALLARBOR.$" + +Route112_Text_1F2003: @ 81F2003 + .string "You got it. And until they come back,\n" + .string "we’re not to let anyone pass, right.$" + +Route112_Text_1F204E: @ 81F204E + .string "Eh, I’d like to get to MAUVILLE, but if\n" + .string "I went down these ledges, it’d be no\l" + .string "easy matter to get back to LAVARIDGE.$" + +Route112_Text_1F20C1: @ 81F20C1 + .string "MT. CHIMNEY CABLE CAR\n" + .string "“A short walk {0x79} way!â€$" + +Route112_Text_1F20ED: @ 81F20ED + .string "MT. CHIMNEY\p" + .string "“For LAVARIDGE TOWN or the summit,\n" + .string "please take the CABLE CAR.â€$" + +Route112_Text_1F2138: @ 81F2138 + .string "ROUTE 112\n" + .string "{0x7B} LAVARIDGE TOWN$" + diff --git a/data/maps/Route112_CableCarStation/events.inc b/data/maps/Route112_CableCarStation/events.inc new file mode 100644 index 000000000..77f37d72c --- /dev/null +++ b/data/maps/Route112_CableCarStation/events.inc @@ -0,0 +1,11 @@ +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 + +Route112_CableCarStation_MapWarps: @ 8533C84 + 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/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc new file mode 100644 index 000000000..93e8ea759 --- /dev/null +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -0,0 +1,99 @@ +Route112_CableCarStation_MapScripts:: @ 822AABE + map_script 3, Route112_CableCarStation_MapScript1_22AAC9 + map_script 2, Route112_CableCarStation_MapScript2_22AAE9 + .byte 0 + +Route112_CableCarStation_MapScript1_22AAC9: @ 822AAC9 + setescapewarp MAP_ROUTE112, 255, 28, 28 + compare VAR_0x40A3, 2 + call_if 1, Route112_CableCarStation_EventScript_22AADD + end + +Route112_CableCarStation_EventScript_22AADD:: @ 822AADD + setobjectxyperm 1, 7, 4 + setobjectmovementtype 1, 9 + return + +Route112_CableCarStation_MapScript2_22AAE9: @ 822AAE9 + map_script_2 VAR_0x40A3, 2, Route112_CableCarStation_EventScript_22AAF3 + .2byte 0 + +Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3 + lockall + applymovement 255, Route112_CableCarStation_Movement_22AB80 + applymovement 1, Route112_CableCarStation_Movement_22AB76 + waitmovement 0 + setvar VAR_0x40A3, 0 + setobjectxyperm 1, 6, 7 + setobjectmovementtype 1, 8 + releaseall + end + +Route112_CableCarStation_EventScript_22AB17:: @ 822AB17 + lock + faceplayer + msgbox Route112_CableCarStation_Text_22AB85, 5 + compare VAR_RESULT, 1 + goto_eq Route112_CableCarStation_EventScript_22AB38 + compare VAR_RESULT, 0 + goto_eq Route112_CableCarStation_EventScript_22AB67 + end + +Route112_CableCarStation_EventScript_22AB38:: @ 822AB38 + msgbox Route112_CableCarStation_Text_22ABC2, 4 + closemessage + applymovement 1, Route112_CableCarStation_Movement_22AB71 + applymovement 255, Route112_CableCarStation_Movement_22AB7B + waitmovement 0 + setvar VAR_0x8004, 0 + setvar VAR_0x40A3, 1 + incrementgamestat 48 + special CableCarWarp + special sub_814FC9C + waitstate + release + end + +Route112_CableCarStation_EventScript_22AB67:: @ 822AB67 + msgbox Route112_CableCarStation_Text_22ABD8, 4 + release + end + +Route112_CableCarStation_Movement_22AB71: @ 822AB71 + walk_up + walk_up + walk_right + walk_in_place_fastest_left + step_end + +Route112_CableCarStation_Movement_22AB76: @ 822AB76 + delay_16 + walk_left + walk_down + walk_down + step_end + +Route112_CableCarStation_Movement_22AB7B: @ 822AB7B + walk_up + walk_up + walk_up + delay_16 + step_end + +Route112_CableCarStation_Movement_22AB80: @ 822AB80 + walk_down + walk_down + walk_down + delay_16 + step_end + +Route112_CableCarStation_Text_22AB85: @ 822AB85 + .string "The CABLE CAR is ready to go up.\n" + .string "Would you like to be on it?$" + +Route112_CableCarStation_Text_22ABC2: @ 822ABC2 + .string "Please step this way.$" + +Route112_CableCarStation_Text_22ABD8: @ 822ABD8 + .string "Please ride with us another time.$" + diff --git a/data/maps/Route113/events.inc b/data/maps/Route113/events.inc new file mode 100644 index 000000000..25287a747 --- /dev/null +++ b/data/maps/Route113/events.inc @@ -0,0 +1,57 @@ +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 + +Route113_MapWarps: @ 8529CAC + 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 + 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 + +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 + +Route113_MapEvents:: @ 8529E54 + map_events Route113_EventObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents + diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc new file mode 100644 index 000000000..63dc6c47f --- /dev/null +++ b/data/maps/Route113/scripts.inc @@ -0,0 +1,176 @@ +Route113_MapScripts:: @ 81F2153 + map_script 5, Route113_MapScript1_1F215E + map_script 3, Route113_MapScript1_1F2161 + .byte 0 + +Route113_MapScript1_1F215E: @ 81F215E + setstepcallback 1 + end + +Route113_MapScript1_1F2161: @ 81F2161 + clearflag FLAG_0x09D + call Route113_EventScript_1F216A + end + +Route113_EventScript_1F216A:: @ 81F216A + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_0, 19 + goto_if 0, Route113_EventScript_1F2189 + compare VAR_TEMP_0, 84 + goto_if 2, Route113_EventScript_1F2189 + setweather 7 + return + +Route113_EventScript_1F2189:: @ 81F2189 + return + +Route113_EventScript_1F218A:: @ 81F218A + msgbox Route113_Text_1F235B, 2 + end + +Route113_EventScript_1F2193:: @ 81F2193 + msgbox Route113_Text_1F23CA, 2 + end + +Route113_EventScript_1F219C:: @ 81F219C + msgbox Route113_Text_1F2440, 3 + end + +Route113_EventScript_1F21A5:: @ 81F21A5 + msgbox Route113_Text_1F2456, 3 + end + +Route113_EventScript_1F21AE:: @ 81F21AE + msgbox Route113_Text_1F24F8, 3 + end + +Route113_EventScript_1F21B7:: @ 81F21B7 + msgbox Route113_Text_1F2471, 3 + end + +Route113_EventScript_1F21C0:: @ 81F21C0 + trainerbattle 0, TRAINER_JAYLEN, 0, Route113_Text_299D3C, Route113_Text_299D68 + msgbox Route113_Text_299D7D, 6 + end + +Route113_EventScript_1F21D7:: @ 81F21D7 + trainerbattle 0, TRAINER_DILLON, 0, Route113_Text_299DE3, Route113_Text_299E1C + msgbox Route113_Text_299E38, 6 + end + +Route113_EventScript_1F21EE:: @ 81F21EE + trainerbattle 2, TRAINER_MADELINE_1, 0, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route113_EventScript_1F2239 + msgbox Route113_Text_299F15, 4 + release + end + +Route113_EventScript_1F221A:: @ 81F221A + special sub_80B4808 + waitmovement 0 + msgbox Route113_Text_299F49, 4 + setvar VAR_0x8004, 434 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 434 + callstd 8 + release + end + +Route113_EventScript_1F2239:: @ 81F2239 + trainerbattle 5, TRAINER_MADELINE_1, 0, Route113_Text_299F8A, Route113_Text_299FC9 + msgbox Route113_Text_299FD8, 6 + end + +Route113_EventScript_1F2250:: @ 81F2250 + trainerbattle 2, TRAINER_LAO_1, 0, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route113_EventScript_1F229B + msgbox Route113_Text_29A067, 4 + release + end + +Route113_EventScript_1F227C:: @ 81F227C + special sub_80B4808 + waitmovement 0 + msgbox Route113_Text_29A0A2, 4 + setvar VAR_0x8004, 419 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 419 + callstd 8 + release + end + +Route113_EventScript_1F229B:: @ 81F229B + trainerbattle 5, TRAINER_LAO_1, 0, Route113_Text_29A0E8, Route113_Text_29A11F + msgbox Route113_Text_29A13A, 6 + end + +Route113_EventScript_1F22B2:: @ 81F22B2 + trainerbattle 0, TRAINER_LUNG, 0, Route113_Text_29A192, Route113_Text_29A1C6 + msgbox Route113_Text_29A219, 6 + end + +Route113_EventScript_1F22C9:: @ 81F22C9 + trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_29A261, Route113_Text_29A29D, Route113_Text_29A31F + msgbox Route113_Text_29A2DE, 6 + end + +Route113_EventScript_1F22E4:: @ 81F22E4 + trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_29A35C, Route113_Text_29A397, Route113_Text_29A419 + msgbox Route113_Text_29A3DA, 6 + end + +Route113_EventScript_1F22FF:: @ 81F22FF + trainerbattle 0, TRAINER_SOPHIE, 0, Route113_Text_29A4BF, Route113_Text_29A508 + msgbox Route113_Text_29A529, 6 + end + +Route113_EventScript_1F2316:: @ 81F2316 + trainerbattle 0, TRAINER_COBY, 0, Route113_Text_29A453, Route113_Text_29A480 + msgbox Route113_Text_29A489, 6 + end + +Route113_EventScript_1F232D:: @ 81F232D + trainerbattle 0, TRAINER_LAWRENCE, 0, Route113_Text_29A566, Route113_Text_29A5A0 + msgbox Route113_Text_29A5BE, 6 + end + +Route113_EventScript_1F2344:: @ 81F2344 + trainerbattle 0, TRAINER_WYATT, 0, Route113_Text_29A5E4, Route113_Text_29A628 + msgbox Route113_Text_29A65D, 6 + end + +Route113_Text_1F235B: @ 81F235B + .string "Wahahaha! Today’s technology is a\n" + .string "wondrous thing!\p" + .string "Take this volcanic ash here.\n" + .string "It can be fashioned into glass.$" + +Route113_Text_1F23CA: @ 81F23CA + .string "It’s fun walking through the volcano’s\n" + .string "ashes on the ground and grass.\p" + .string "You can see where you walked--it’s\n" + .string "really neat!$" + +Route113_Text_1F2440: @ 81F2440 + .string "ROUTE 113\n" + .string "{0x7C} ROUTE 111$" + +Route113_Text_1F2456: @ 81F2456 + .string "ROUTE 113\n" + .string "{0x7B} FALLARBOR TOWN$" + +Route113_Text_1F2471: @ 81F2471 + .string "TRAINER TIPS\p" + .string "You may register one of the KEY ITEMS\n" + .string "in your BAG as SELECT.\p" + .string "Simply press SELECT to use\n" + .string "the registered item conveniently.$" + +Route113_Text_1F24F8: @ 81F24F8 + .string "GLASS WORKSHOP\n" + .string "“Turning Volcanic Ash into Glass Itemsâ€$" + diff --git a/data/maps/Route113_GlassWorkshop/events.inc b/data/maps/Route113_GlassWorkshop/events.inc new file mode 100644 index 000000000..1d5104e1c --- /dev/null +++ b/data/maps/Route113_GlassWorkshop/events.inc @@ -0,0 +1,11 @@ +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 + +Route113_GlassWorkshop_MapWarps: @ 853EAA8 + 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/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc new file mode 100644 index 000000000..5ea100567 --- /dev/null +++ b/data/maps/Route113_GlassWorkshop/scripts.inc @@ -0,0 +1,397 @@ +Route113_GlassWorkshop_MapScripts:: @ 826ED03 + map_script 3, Route113_GlassWorkshop_MapScript1_26ED09 + .byte 0 + +Route113_GlassWorkshop_MapScript1_26ED09: @ 826ED09 + setflag FLAG_LANDMARK_GLASS_WORKSHOP + compare VAR_0x40BE, 1 + call_if 1, Route113_GlassWorkshop_EventScript_26ED18 + end + +Route113_GlassWorkshop_EventScript_26ED18:: @ 826ED18 + setvar VAR_0x40BE, 2 + return + +Route113_GlassWorkshop_EventScript_26ED1E:: @ 826ED1E + lock + faceplayer + compare VAR_0x40BE, 10 + goto_if 4, Route113_GlassWorkshop_EventScript_26F090 + compare VAR_0x40BE, 2 + goto_eq Route113_GlassWorkshop_EventScript_26ED6E + compare VAR_0x40BE, 1 + goto_eq Route113_GlassWorkshop_EventScript_26ED64 + msgbox Route113_GlassWorkshop_Text_26F19D, 4 + giveitem_std ITEM_SOOT_SACK + setvar VAR_0x40BE, 1 + msgbox Route113_GlassWorkshop_Text_26F252, 4 + release + end + +Route113_GlassWorkshop_EventScript_26ED64:: @ 826ED64 + msgbox Route113_GlassWorkshop_Text_26F252, 4 + release + end + +Route113_GlassWorkshop_EventScript_26ED6E:: @ 826ED6E + checkitem ITEM_SOOT_SACK, 1 + compare VAR_RESULT, 0 + goto_eq Route113_GlassWorkshop_EventScript_26ED9D + msgbox Route113_GlassWorkshop_Text_26F312, 4 + compare VAR_ASH_GATHER_COUNT, 250 + goto_if 0, Route113_GlassWorkshop_EventScript_26EFD6 + message Route113_GlassWorkshop_Text_26F40A + waitmessage + goto Route113_GlassWorkshop_EventScript_26EDA7 + end + +Route113_GlassWorkshop_EventScript_26ED9D:: @ 826ED9D + msgbox Route113_GlassWorkshop_Text_26F772, 4 + release + end + +Route113_GlassWorkshop_EventScript_26EDA7:: @ 826EDA7 + setvar VAR_0x8009, 0 + setvar VAR_0x8004, 1 + special sub_813A128 + waitstate + switch VAR_RESULT + case 0, Route113_GlassWorkshop_EventScript_26EE1E + case 1, Route113_GlassWorkshop_EventScript_26EE5A + case 2, Route113_GlassWorkshop_EventScript_26EE96 + case 3, Route113_GlassWorkshop_EventScript_26EED2 + case 4, Route113_GlassWorkshop_EventScript_26EF0E + case 5, Route113_GlassWorkshop_EventScript_26EF4A + case 6, Route113_GlassWorkshop_EventScript_26EF8B + case 7, Route113_GlassWorkshop_EventScript_26EFCC + case 127, Route113_GlassWorkshop_EventScript_26EFCC + end + +Route113_GlassWorkshop_EventScript_26EE1E:: @ 826EE1E + setvar VAR_0x8008, 39 + bufferitemname 0, VAR_0x8008 + setvar VAR_0x800A, 250 + compare VAR_ASH_GATHER_COUNT, 250 + goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE + msgbox Route113_GlassWorkshop_Text_26F480, 5 + compare VAR_RESULT, 0 + goto_eq Route113_GlassWorkshop_EventScript_26F003 + setvar VAR_0x40BE, 10 + subvar VAR_ASH_GATHER_COUNT, 250 + goto Route113_GlassWorkshop_EventScript_26F00F + end + +Route113_GlassWorkshop_EventScript_26EE5A:: @ 826EE5A + setvar VAR_0x8008, 40 + bufferitemname 0, VAR_0x8008 + setvar VAR_0x800A, 500 + compare VAR_ASH_GATHER_COUNT, 500 + goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE + msgbox Route113_GlassWorkshop_Text_26F480, 5 + compare VAR_RESULT, 0 + goto_eq Route113_GlassWorkshop_EventScript_26F003 + setvar VAR_0x40BE, 11 + subvar VAR_ASH_GATHER_COUNT, 500 + goto Route113_GlassWorkshop_EventScript_26F00F + end + +Route113_GlassWorkshop_EventScript_26EE96:: @ 826EE96 + setvar VAR_0x8008, 41 + bufferitemname 0, VAR_0x8008 + setvar VAR_0x800A, 500 + compare VAR_ASH_GATHER_COUNT, 500 + goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE + msgbox Route113_GlassWorkshop_Text_26F480, 5 + compare VAR_RESULT, 0 + goto_eq Route113_GlassWorkshop_EventScript_26F003 + setvar VAR_0x40BE, 12 + subvar VAR_ASH_GATHER_COUNT, 500 + goto Route113_GlassWorkshop_EventScript_26F00F + end + +Route113_GlassWorkshop_EventScript_26EED2:: @ 826EED2 + setvar VAR_0x8008, 43 + bufferitemname 0, VAR_0x8008 + setvar VAR_0x800A, 1000 + compare VAR_ASH_GATHER_COUNT, 1000 + goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE + msgbox Route113_GlassWorkshop_Text_26F480, 5 + compare VAR_RESULT, 0 + goto_eq Route113_GlassWorkshop_EventScript_26F003 + setvar VAR_0x40BE, 13 + subvar VAR_ASH_GATHER_COUNT, 1000 + goto Route113_GlassWorkshop_EventScript_26F00F + end + +Route113_GlassWorkshop_EventScript_26EF0E:: @ 826EF0E + setvar VAR_0x8008, 42 + bufferitemname 0, VAR_0x8008 + setvar VAR_0x800A, 1000 + compare VAR_ASH_GATHER_COUNT, 1000 + goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE + msgbox Route113_GlassWorkshop_Text_26F480, 5 + compare VAR_RESULT, 0 + goto_eq Route113_GlassWorkshop_EventScript_26F003 + setvar VAR_0x40BE, 14 + subvar VAR_ASH_GATHER_COUNT, 1000 + goto Route113_GlassWorkshop_EventScript_26F00F + end + +Route113_GlassWorkshop_EventScript_26EF4A:: @ 826EF4A + setvar VAR_0x8009, 1 + setvar VAR_0x8008, 13 + bufferdecorationname 0, VAR_0x8008 + setvar VAR_0x800A, 6000 + compare VAR_ASH_GATHER_COUNT, 6000 + goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE + msgbox Route113_GlassWorkshop_Text_26F480, 5 + compare VAR_RESULT, 0 + goto_eq Route113_GlassWorkshop_EventScript_26F003 + setvar VAR_0x40BE, 15 + subvar VAR_ASH_GATHER_COUNT, 6000 + goto Route113_GlassWorkshop_EventScript_26F00F + end + +Route113_GlassWorkshop_EventScript_26EF8B:: @ 826EF8B + setvar VAR_0x8009, 1 + setvar VAR_0x8008, 6 + bufferdecorationname 0, VAR_0x8008 + setvar VAR_0x800A, 8000 + compare VAR_ASH_GATHER_COUNT, 8000 + goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE + msgbox Route113_GlassWorkshop_Text_26F480, 5 + compare VAR_RESULT, 0 + goto_eq Route113_GlassWorkshop_EventScript_26F003 + setvar VAR_0x40BE, 16 + subvar VAR_ASH_GATHER_COUNT, 8000 + goto Route113_GlassWorkshop_EventScript_26F00F + end + +Route113_GlassWorkshop_EventScript_26EFCC:: @ 826EFCC + msgbox Route113_GlassWorkshop_Text_26F641, 4 + release + end + +Route113_GlassWorkshop_EventScript_26EFD6:: @ 826EFD6 + setvar VAR_0x800A, 250 + subvar VAR_0x800A, 16456 + buffernumberstring 0, VAR_0x800A + msgbox Route113_GlassWorkshop_Text_26F34E, 4 + release + end + +Route113_GlassWorkshop_EventScript_26EFEE:: @ 826EFEE + subvar VAR_0x800A, 16456 + buffernumberstring 1, VAR_0x800A + message Route113_GlassWorkshop_Text_26F543 + waitmessage + goto Route113_GlassWorkshop_EventScript_26EDA7 + end + +Route113_GlassWorkshop_EventScript_26F003:: @ 826F003 + message Route113_GlassWorkshop_Text_26F4B5 + waitmessage + goto Route113_GlassWorkshop_EventScript_26EDA7 + end + +Route113_GlassWorkshop_EventScript_26F00F:: @ 826F00F + msgbox Route113_GlassWorkshop_Text_26F4DA, 4 + closemessage + fadescreen 1 + playse SE_SELECT + delay 30 + fadescreen 0 + msgbox Route113_GlassWorkshop_Text_26F688, 4 + compare VAR_0x8009, 0 + call_if 1, Route113_GlassWorkshop_EventScript_26F047 + compare VAR_0x8009, 1 + call_if 1, Route113_GlassWorkshop_EventScript_26F05F + setvar VAR_0x40BE, 2 + release + end + +Route113_GlassWorkshop_EventScript_26F047:: @ 826F047 + giveitem_std VAR_0x8008 + compare VAR_RESULT, 0 + goto_eq Route113_GlassWorkshop_EventScript_26F072 + return + +Route113_GlassWorkshop_EventScript_26F05F:: @ 826F05F + givedecoration_std VAR_0x8008 + compare VAR_RESULT, 0 + goto_eq Route113_GlassWorkshop_EventScript_26F081 + return + +Route113_GlassWorkshop_EventScript_26F072:: @ 826F072 + call Route113_GlassWorkshop_EventScript_27205E + msgbox Route113_GlassWorkshop_Text_26F6B7, 4 + release + end + +Route113_GlassWorkshop_EventScript_26F081:: @ 826F081 + call Route113_GlassWorkshop_EventScript_272071 + msgbox Route113_GlassWorkshop_Text_26F715, 4 + release + end + +Route113_GlassWorkshop_EventScript_26F090:: @ 826F090 + switch VAR_0x40BE + case 10, Route113_GlassWorkshop_EventScript_26F0E3 + case 11, Route113_GlassWorkshop_EventScript_26F0F7 + case 12, Route113_GlassWorkshop_EventScript_26F10B + case 13, Route113_GlassWorkshop_EventScript_26F11F + case 14, Route113_GlassWorkshop_EventScript_26F133 + case 15, Route113_GlassWorkshop_EventScript_26F147 + case 16, Route113_GlassWorkshop_EventScript_26F15B + end + +Route113_GlassWorkshop_EventScript_26F0E3:: @ 826F0E3 + setvar VAR_0x8009, 0 + setvar VAR_0x8008, 39 + bufferitemname 0, VAR_0x8008 + goto Route113_GlassWorkshop_EventScript_26F16F + end + +Route113_GlassWorkshop_EventScript_26F0F7:: @ 826F0F7 + setvar VAR_0x8009, 0 + setvar VAR_0x8008, 40 + bufferitemname 0, VAR_0x8008 + goto Route113_GlassWorkshop_EventScript_26F16F + end + +Route113_GlassWorkshop_EventScript_26F10B:: @ 826F10B + setvar VAR_0x8009, 0 + setvar VAR_0x8008, 41 + bufferitemname 0, VAR_0x8008 + goto Route113_GlassWorkshop_EventScript_26F16F + end + +Route113_GlassWorkshop_EventScript_26F11F:: @ 826F11F + setvar VAR_0x8009, 0 + setvar VAR_0x8008, 43 + bufferitemname 0, VAR_0x8008 + goto Route113_GlassWorkshop_EventScript_26F16F + end + +Route113_GlassWorkshop_EventScript_26F133:: @ 826F133 + setvar VAR_0x8009, 0 + setvar VAR_0x8008, 42 + bufferitemname 0, VAR_0x8008 + goto Route113_GlassWorkshop_EventScript_26F16F + end + +Route113_GlassWorkshop_EventScript_26F147:: @ 826F147 + setvar VAR_0x8009, 1 + setvar VAR_0x8008, 13 + bufferdecorationname 0, 13 + goto Route113_GlassWorkshop_EventScript_26F16F + end + +Route113_GlassWorkshop_EventScript_26F15B:: @ 826F15B + setvar VAR_0x8009, 1 + setvar VAR_0x8008, 6 + bufferdecorationname 0, 6 + goto Route113_GlassWorkshop_EventScript_26F16F + end + +Route113_GlassWorkshop_EventScript_26F16F:: @ 826F16F + msgbox Route113_GlassWorkshop_Text_26F688, 4 + compare VAR_0x8009, 0 + call_if 1, Route113_GlassWorkshop_EventScript_26F047 + compare VAR_0x8009, 1 + call_if 1, Route113_GlassWorkshop_EventScript_26F05F + setvar VAR_0x40BE, 2 + release + end + +Route113_GlassWorkshop_EventScript_26F194:: @ 826F194 + msgbox Route113_GlassWorkshop_Text_26F7EC, 2 + end + +Route113_GlassWorkshop_Text_26F19D: @ 826F19D + .string "This area is covered in volcanic ash,\n" + .string "huff-puff!\p" + .string "I’m specially gifted, huff-puff.\p" + .string "I make glass out of volcanic ash\n" + .string "and make items, huff-puff.\p" + .string "Go collect ashes with this, huff-puff.$" + +Route113_GlassWorkshop_Text_26F252: @ 826F252 + .string "Just take that SOOT SACK and walk\n" + .string "through piles of ash, huff-puff.\p" + .string "And it will fill up with the volcanic ash,\n" + .string "huff-puff.\p" + .string "Once you think you’ve collected a good\n" + .string "amount, come see me, huff-puff.$" + +Route113_GlassWorkshop_Text_26F312: @ 826F312 + .string "Have you collected ashes, huff-puff?\n" + .string "Let me see, huff-puff.$" + +Route113_GlassWorkshop_Text_26F34E: @ 826F34E + .string "Hmmm…\n" + .string "There’s not enough ash here, huff-puff.\l" + .string "I can’t make glass with this, huff-puff.\p" + .string "Let’s see… {STR_VAR_1} is the number of steps\n" + .string "you’ll need to walk for me to make you\l" + .string "a BLUE FLUTE, huff-puff.$" + +Route113_GlassWorkshop_Text_26F40A: @ 826F40A + .string "Oh!\n" + .string "You’ve got a lot of ashes, huff-puff!\p" + .string "I’ll make you a glass item, huff-puff!\n" + .string "Which one would you like, huff-puff?$" + +Route113_GlassWorkshop_Text_26F480: @ 826F480 + .string "A {STR_VAR_1}, huff-puff?\n" + .string "Is that the one for you, huff-puff?$" + +Route113_GlassWorkshop_Text_26F4B5: @ 826F4B5 + .string "Which one would you like, huff-puff?$" + +Route113_GlassWorkshop_Text_26F4DA: @ 826F4DA + .string "A {STR_VAR_1} it is, then, huff-puff!\p" + .string "Okay! I’ll make it for you, huff-puff.\n" + .string "Just wait a little while, huff-puff.$" + +Route113_GlassWorkshop_Text_26F543: @ 826F543 + .string "A {STR_VAR_1}, huff-puff?\p" + .string "There’s not enough ash here to make\n" + .string "that, though, huff-puff.\p" + .string "Let’s see… {STR_VAR_2} is the number of steps\n" + .string "you’ll need to walk through volcanic ash\l" + .string "for me to make that item, huff-puff.\p" + .string "Which item would you rather have me\n" + .string "make instead, huff-puff?$" + +Route113_GlassWorkshop_Text_26F641: @ 826F641 + .string "You’ve collected all that ash, but you\n" + .string "don’t want anything, huff-puff?$" + +Route113_GlassWorkshop_Text_26F688: @ 826F688 + .string "Ah, I’ve finished your {STR_VAR_1}.\n" + .string "Take it, huff-puff.$" + +Route113_GlassWorkshop_Text_26F6B7: @ 826F6B7 + .string "Oh?\n" + .string "You’ve no room in your BAG, huff-puff.\p" + .string "I’ll hold on to it, so come back later,\n" + .string "huff-puff.$" + +Route113_GlassWorkshop_Text_26F715: @ 826F715 + .string "Oh?\n" + .string "You’ve no room in your PC, huff-puff?\p" + .string "I’ll hold on to it, so come back later,\n" + .string "huff-puff.$" + +Route113_GlassWorkshop_Text_26F772: @ 826F772 + .string "Hah? You haven’t got your SOOT SACK\n" + .string "with you, huff-puff.\p" + .string "You have to keep it with you to collect\n" + .string "volcanic ash, huff-puff.$" + +Route113_GlassWorkshop_Text_26F7EC: @ 826F7EC + .string "It’s fun to blow a glass flute while\n" + .string "my boss is talking.\p" + .string "Huff-huff! Puff-puff!$" + diff --git a/data/maps/Route114/events.inc b/data/maps/Route114/events.inc new file mode 100644 index 000000000..3e48c5721 --- /dev/null +++ b/data/maps/Route114/events.inc @@ -0,0 +1,53 @@ +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 + +Route114_MapWarps: @ 852A0F0 + 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 + 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 + +Route114_MapEvents:: @ 852A1A8 + map_events Route114_EventObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents + diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc new file mode 100644 index 000000000..9443d35bc --- /dev/null +++ b/data/maps/Route114/scripts.inc @@ -0,0 +1,219 @@ +Route114_MapScripts:: @ 81F252F + map_script 3, Route114_MapScript1_1F253F + map_script 1, Route114_MapScript1_1F2561 + map_script 2, Route114_MapScript2_1F2578 + .byte 0 + +Route114_MapScript1_1F253F: @ 81F253F + compare VAR_0x4039, 1 + call_if 1, Route114_EventScript_273D13 + compare VAR_0x4037, 1 + call_if 1, Route114_EventScript_273D1B + compare VAR_0x4037, 2 + call_if 1, Route114_EventScript_273D1B + end + +Route114_MapScript1_1F2561: @ 81F2561 + compare VAR_0x4037, 1 + call_if 1, Route114_EventScript_273913 + compare VAR_0x4037, 2 + call_if 1, Route114_EventScript_273926 + end + +Route114_MapScript2_1F2578: @ 81F2578 + map_script_2 VAR_0x4039, 1, gUnknown_08273D1F + .2byte 0 + +Route114_EventScript_1F2582:: @ 81F2582 + lock + faceplayer + dodailyevents + checkflag FLAG_0x92B + goto_eq Route114_EventScript_1F25C7 + msgbox Route114_Text_2A6FCB, 4 + random 5 + addvar VAR_RESULT, 15 + addvar VAR_RESULT, 133 + giveitem_std VAR_RESULT + compare VAR_RESULT, 0 + goto_eq Route114_EventScript_272054 + setflag FLAG_0x92B + msgbox Route114_Text_2A7034, 4 + release + end + +Route114_EventScript_1F25C7:: @ 81F25C7 + msgbox Route114_Text_2A706E, 4 + release + end + +Route114_EventScript_1F25D1:: @ 81F25D1 + lock + faceplayer + checkflag FLAG_0x0E7 + goto_eq Route114_EventScript_1F2608 + msgbox Route114_Text_1F2809, 4 + giveitem_std ITEM_TM05 + compare VAR_RESULT, 0 + goto_eq Route114_EventScript_272054 + setflag FLAG_0x0E7 + msgbox Route114_Text_1F2872, 4 + release + end + +Route114_EventScript_1F2608:: @ 81F2608 + msgbox Route114_Text_1F2872, 4 + release + end + +Route114_EventScript_1F2612:: @ 81F2612 + lock + faceplayer + waitse + playmoncry SPECIES_POOCHYENA, 2 + msgbox Route114_Text_1F28A6, 4 + waitmoncry + release + end + +Route114_EventScript_1F2625:: @ 81F2625 + msgbox Route114_Text_1F28B3, 3 + end + +Route114_EventScript_1F262E:: @ 81F262E + msgbox Route114_Text_1F28DB, 3 + end + +Route114_EventScript_1F2637:: @ 81F2637 + msgbox Route114_Text_1F2910, 3 + end + +Route114_EventScript_1F2640:: @ 81F2640 + trainerbattle 0, TRAINER_LENNY, 0, Route114_Text_29A6B1, Route114_Text_29A707 + msgbox Route114_Text_29A715, 6 + end + +Route114_EventScript_1F2657:: @ 81F2657 + trainerbattle 0, TRAINER_LUCAS_1, 0, Route114_Text_29A777, Route114_Text_29A7B5 + msgbox Route114_Text_29A7D4, 6 + end + +Route114_EventScript_1F266E:: @ 81F266E + trainerbattle 0, TRAINER_SHANE, 0, Route114_Text_29A818, Route114_Text_29A88F + msgbox Route114_Text_29A89F, 6 + end + +Route114_EventScript_1F2685:: @ 81F2685 + trainerbattle 0, TRAINER_NANCY, 0, Route114_Text_29A8D9, Route114_Text_29A90E + msgbox Route114_Text_29A916, 6 + end + +Route114_EventScript_1F269C:: @ 81F269C + trainerbattle 2, TRAINER_STEVE_1, 0, Route114_Text_29A943, Route114_Text_29A973, Route114_EventScript_1F26C8 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route114_EventScript_1F26E7 + msgbox Route114_Text_29A981, 4 + release + end + +Route114_EventScript_1F26C8:: @ 81F26C8 + special sub_80B4808 + waitmovement 0 + msgbox Route114_Text_29A9F7, 4 + setvar VAR_0x8004, 143 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 143 + callstd 8 + release + end + +Route114_EventScript_1F26E7:: @ 81F26E7 + trainerbattle 5, TRAINER_STEVE_1, 0, Route114_Text_29AA3E, Route114_Text_29AA67 + msgbox Route114_Text_29AA94, 6 + end + +Route114_EventScript_1F26FE:: @ 81F26FE + trainerbattle 2, TRAINER_BERNIE_1, 0, Route114_Text_29AADB, Route114_Text_29AB1A, Route114_EventScript_1F272A + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route114_EventScript_1F2749 + msgbox Route114_Text_29AB36, 4 + release + end + +Route114_EventScript_1F272A:: @ 81F272A + special sub_80B4808 + waitmovement 0 + msgbox Route114_Text_29ABA6, 4 + setvar VAR_0x8004, 206 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 206 + callstd 8 + release + end + +Route114_EventScript_1F2749:: @ 81F2749 + trainerbattle 5, TRAINER_BERNIE_1, 0, Route114_Text_29ABDC, Route114_Text_29AC10 + msgbox Route114_Text_29AC43, 6 + end + +Route114_EventScript_1F2760:: @ 81F2760 + trainerbattle 0, TRAINER_CLAUDE, 0, Route114_Text_29ACB3, Route114_Text_29AD0A + msgbox Route114_Text_29AD2E, 6 + end + +Route114_EventScript_1F2777:: @ 81F2777 + trainerbattle 0, TRAINER_NOLAN, 0, Route114_Text_29ADA1, Route114_Text_29AE05 + msgbox Route114_Text_29AE3D, 6 + end + +Route114_EventScript_1F278E:: @ 81F278E + trainerbattle 4, TRAINER_TYRA_AND_IVY, 0, Route114_Text_29AE96, Route114_Text_29AEE7, Route114_Text_29AF3D + msgbox Route114_Text_29AF0B, 6 + end + +Route114_EventScript_1F27A9:: @ 81F27A9 + trainerbattle 4, TRAINER_TYRA_AND_IVY, 0, Route114_Text_29AF89, Route114_Text_29AFAC, Route114_Text_29B01B + msgbox Route114_Text_29AFCF, 6 + end + +Route114_EventScript_1F27C4:: @ 81F27C4 + trainerbattle 0, TRAINER_ANGELINA, 0, Route114_Text_29B16F, Route114_Text_29B19C + msgbox Route114_Text_29B1BC, 6 + end + +Route114_EventScript_1F27DB:: @ 81F27DB + trainerbattle 0, TRAINER_CHARLOTTE, 0, Route114_Text_29B0DB, Route114_Text_29B0FB + msgbox Route114_Text_29B11A, 6 + end + +Route114_EventScript_1F27F2:: @ 81F27F2 + trainerbattle 0, TRAINER_KAI, 0, Route114_Text_29B05D, Route114_Text_29B089 + msgbox Route114_Text_29B0B5, 6 + end + +Route114_Text_1F2809: @ 81F2809 + .string "All my POKéMON does is ROAR…\n" + .string "No one dares to come near me…\p" + .string "Sigh… If you would, please take\n" + .string "this TM away…$" + +Route114_Text_1F2872: @ 81F2872 + .string "TM05 contains ROAR.\n" + .string "A ROAR sends POKéMON scurrying.$" + +Route114_Text_1F28A6: @ 81F28A6 + .string "Bow! Bowwow!$" + +Route114_Text_1F28B3: @ 81F28B3 + .string "METEOR FALLS\n" + .string "RUSTBORO CITY THROUGH HERE$" + +Route114_Text_1F28DB: @ 81F28DB + .string "FOSSIL MANIAC’S HOUSE\n" + .string "“Fossils gratefully accepted!â€$" + +Route114_Text_1F2910: @ 81F2910 + .string "LANETTE’S HOUSE$" + diff --git a/data/maps/Route114_FossilManiacsHouse/events.inc b/data/maps/Route114_FossilManiacsHouse/events.inc new file mode 100644 index 000000000..c947d9d8f --- /dev/null +++ b/data/maps/Route114_FossilManiacsHouse/events.inc @@ -0,0 +1,17 @@ +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 + +Route114_FossilManiacsHouse_MapWarps: @ 8533D14 + 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 + 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 + +Route114_FossilManiacsHouse_MapEvents:: @ 8533D5C + map_events Route114_FossilManiacsHouse_EventObjects, Route114_FossilManiacsHouse_MapWarps, 0x0, Route114_FossilManiacsHouse_MapBGEvents + diff --git a/data/maps/Route114_FossilManiacsHouse/scripts.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc new file mode 100644 index 000000000..f14c15f9e --- /dev/null +++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc @@ -0,0 +1,56 @@ +Route114_FossilManiacsHouse_MapScripts:: @ 822AD30 + map_script 3, Route114_FossilManiacsHouse_MapScript1_22AD36 + .byte 0 + +Route114_FossilManiacsHouse_MapScript1_22AD36: @ 822AD36 + setflag FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE + end + +Route114_FossilManiacsHouse_EventScript_22AD3A:: @ 822AD3A + lock + faceplayer + checkflag FLAG_0x105 + goto_eq Route114_FossilManiacsHouse_EventScript_22AD69 + msgbox Route114_FossilManiacsHouse_Text_22AD85, 4 + giveitem_std ITEM_TM28 + compare VAR_RESULT, 0 + goto_eq Route114_FossilManiacsHouse_EventScript_272054 + setflag FLAG_0x105 + release + end + +Route114_FossilManiacsHouse_EventScript_22AD69:: @ 822AD69 + msgbox Route114_FossilManiacsHouse_Text_22AE48, 4 + release + end + +Route114_FossilManiacsHouse_EventScript_22AD73:: @ 822AD73 + msgbox Route114_FossilManiacsHouse_Text_22AE92, 3 + end + +Route114_FossilManiacsHouse_EventScript_22AD7C:: @ 822AD7C + msgbox Route114_FossilManiacsHouse_Text_22AEC2, 3 + end + +Route114_FossilManiacsHouse_Text_22AD85: @ 822AD85 + .string "My big brother’s the FOSSIL MANIAC…\n" + .string "He’s a nice guy who loves FOSSILS…\p" + .string "He loves digging holes, too…\n" + .string "He dug this hole by himself…\p" + .string "You can have this, so you can DIG\n" + .string "holes just like my big brother…$" + +Route114_FossilManiacsHouse_Text_22AE48: @ 822AE48 + .string "If you make a POKéMON DIG inside a\n" + .string "cave, you’re returned to the entrance…$" + +Route114_FossilManiacsHouse_Text_22AE92: @ 822AE92 + .string "Rocks in peculiar shapes fill\n" + .string "the display case…$" + +Route114_FossilManiacsHouse_Text_22AEC2: @ 822AEC2 + .string "THE COMPOSITION OF STRATA…\n" + .string "HOW RAIN SHAPES THE LAND…\l" + .string "STONES, SOIL, AND ROCK…\p" + .string "It’s crammed with books.$" + diff --git a/data/maps/Route114_FossilManiacsTunnel/events.inc b/data/maps/Route114_FossilManiacsTunnel/events.inc new file mode 100644 index 000000000..99edadee1 --- /dev/null +++ b/data/maps/Route114_FossilManiacsTunnel/events.inc @@ -0,0 +1,15 @@ +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 + +Route114_FossilManiacsTunnel_MapWarps: @ 8533D88 + 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 + coord_event 6, 4, 3, 0, VAR_0x40CC, 1, 0, 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_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc new file mode 100644 index 000000000..bc5a6d977 --- /dev/null +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -0,0 +1,96 @@ +Route114_FossilManiacsTunnel_MapScripts:: @ 822AF28 + map_script 3, Route114_FossilManiacsTunnel_MapScript1_22AF33 + map_script 1, Route114_FossilManiacsTunnel_MapScript1_22AF49 + .byte 0 + +Route114_FossilManiacsTunnel_MapScript1_22AF33: @ 822AF33 + checkflag FLAG_SYS_GAME_CLEAR + call_if 1, Route114_FossilManiacsTunnel_EventScript_22AF3D + end + +Route114_FossilManiacsTunnel_EventScript_22AF3D:: @ 822AF3D + setobjectxyperm 1, 6, 5 + setobjectmovementtype 1, 8 + return + +Route114_FossilManiacsTunnel_MapScript1_22AF49: @ 822AF49 + checkflag FLAG_SYS_GAME_CLEAR + call_if 0, Route114_FossilManiacsTunnel_EventScript_22AF53 + end + +Route114_FossilManiacsTunnel_EventScript_22AF53:: @ 822AF53 + setmetatile 6, 1, 617, 1 + setmetatile 6, 2, 617, 1 + return + +Route114_FossilManiacsTunnel_EventScript_22AF66:: @ 822AF66 + lockall + applymovement 1, Route114_FossilManiacsTunnel_Movement_2725A6 + applymovement 255, Route114_FossilManiacsTunnel_Movement_2725AA + waitmovement 0 + msgbox Route114_FossilManiacsTunnel_Text_22B1F7, 4 + setvar VAR_0x40CC, 2 + releaseall + end + +Route114_FossilManiacsTunnel_EventScript_22AF87:: @ 822AF87 + lock + faceplayer + checkflag FLAG_0x10B + goto_eq Route114_FossilManiacsTunnel_EventScript_22AFC6 + checkitem ITEM_ROOT_FOSSIL, 1 + compare VAR_RESULT, 1 + goto_eq Route114_FossilManiacsTunnel_EventScript_22AFBC + checkitem ITEM_CLAW_FOSSIL, 1 + compare VAR_RESULT, 1 + goto_eq Route114_FossilManiacsTunnel_EventScript_22AFBC + msgbox Route114_FossilManiacsTunnel_Text_22AFD0, 4 + release + end + +Route114_FossilManiacsTunnel_EventScript_22AFBC:: @ 822AFBC + msgbox Route114_FossilManiacsTunnel_Text_22B0D6, 4 + release + end + +Route114_FossilManiacsTunnel_EventScript_22AFC6:: @ 822AFC6 + msgbox Route114_FossilManiacsTunnel_Text_22B1CC, 4 + release + end + +Route114_FossilManiacsTunnel_Text_22AFD0: @ 822AFD0 + .string "I’m the FOSSIL MANIAC…\n" + .string "I’m a nice guy who loves FOSSILS…\p" + .string "Do you want a FOSSIL?\p" + .string "But the FOSSILS around these parts all\n" + .string "belong to me… None for you…\p" + .string "If you can’t bear to go without\n" + .string "a FOSSIL, look in a desert where there\l" + .string "are boulders and sand that may hide\l" + .string "FOSSILS…$" + +Route114_FossilManiacsTunnel_Text_22B0D6: @ 822B0D6 + .string "You found a FOSSIL, didn’t you?\n" + .string "That’s so nice… It’s so dreamy…\p" + .string "What are you going to do with that\n" + .string "FOSSIL?\p" + .string "From what I’ve heard, DEVON is doing\n" + .string "research on reviving POKéMON from\l" + .string "FOSSILS…\p" + .string "I love my FOSSILS, so I would never\n" + .string "do anything like that…$" + +Route114_FossilManiacsTunnel_Text_22B1CC: @ 822B1CC + .string "FOSSILS are so… Wonderful…\n" + .string "It’s so dreamy…$" + +Route114_FossilManiacsTunnel_Text_22B1F7: @ 822B1F7 + .string "Oh…\n" + .string "It’s not safe that way…\p" + .string "I was digging away, you see…\n" + .string "When the whole wall collapsed…\p" + .string "I think there’s a giant cavern\n" + .string "underneath now…\p" + .string "But I’ve left it alone because I don’t\n" + .string "think there are any FOSSILS there…$" + diff --git a/data/maps/Route114_LanettesHouse/events.inc b/data/maps/Route114_LanettesHouse/events.inc new file mode 100644 index 000000000..352bb2037 --- /dev/null +++ b/data/maps/Route114_LanettesHouse/events.inc @@ -0,0 +1,15 @@ +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 + +Route114_LanettesHouse_MapWarps: @ 8533DEC + 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 + bg_event 8, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_22B345 + bg_event 7, 1, 0, 0, 0, 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/Route114_LanettesHouse/scripts.inc b/data/maps/Route114_LanettesHouse/scripts.inc new file mode 100644 index 000000000..00bb4f226 --- /dev/null +++ b/data/maps/Route114_LanettesHouse/scripts.inc @@ -0,0 +1,108 @@ +Route114_LanettesHouse_MapScripts:: @ 822B2C8 + map_script 3, Route114_LanettesHouse_MapScript1_22B2CE + .byte 0 + +Route114_LanettesHouse_MapScript1_22B2CE: @ 822B2CE + setflag FLAG_LANDMARK_LANETTES_HOUSE + end + +Route114_LanettesHouse_EventScript_22B2D2:: @ 822B2D2 + lock + faceplayer + checkflag FLAG_0x083 + goto_eq Route114_LanettesHouse_EventScript_22B2FF + setflag FLAG_SYS_PC_LANETTE + msgbox Route114_LanettesHouse_Text_22B34E, 4 + givedecoration_std 99 + compare VAR_RESULT, 0 + goto_eq Route114_LanettesHouse_EventScript_272067 + setflag FLAG_0x083 + release + end + +Route114_LanettesHouse_EventScript_22B2FF:: @ 822B2FF + msgbox Route114_LanettesHouse_Text_22B407, 4 + release + end + +Route114_LanettesHouse_EventScript_22B309:: @ 822B309 + lockall + msgbox Route114_LanettesHouse_Text_22B485, 5 + compare VAR_RESULT, 1 + goto_eq Route114_LanettesHouse_EventScript_22B327 + msgbox Route114_LanettesHouse_Text_22B6E4, 4 + releaseall + end + +Route114_LanettesHouse_EventScript_22B327:: @ 822B327 + msgbox Route114_LanettesHouse_Text_22B53C, 5 + compare VAR_RESULT, 1 + call_if 1, Route114_LanettesHouse_EventScript_22B33C + releaseall + end + +Route114_LanettesHouse_EventScript_22B33C:: @ 822B33C + msgbox Route114_LanettesHouse_Text_22B5EF, 4 + return + +Route114_LanettesHouse_EventScript_22B345:: @ 822B345 + msgbox Route114_LanettesHouse_Text_22B6FC, 3 + end + +Route114_LanettesHouse_Text_22B34E: @ 822B34E + .string "LANETTE: Oh! {PLAYER}{KUN}!\p" + .string "I’m sorry everything is so cluttered…\n" + .string "When I get engrossed in research,\l" + .string "things end up this way…\p" + .string "This is embarrassing… Please keep\n" + .string "this a secret in exchange for this.$" + +Route114_LanettesHouse_Text_22B407: @ 822B407 + .string "May I offer advice about my POKéMON\n" + .string "Storage System?\p" + .string "You should organize your BOXES so you\n" + .string "can tell which POKéMON are in them.$" + +Route114_LanettesHouse_Text_22B485: @ 822B485 + .string "It’s LANETTE’s research notes.\n" + .string "There’s information about BOXES.\p" + .string "Design BOXES to hold 30 POKéMON each.\p" + .string "Each TRAINER should be able to store\n" + .string "420 POKéMON on the PC system.\p" + .string "Keep reading?$" + +Route114_LanettesHouse_Text_22B53C: @ 822B53C + .string "A marking system should be added to\n" + .string "make POKéMON easier to organize.\p" + .string "The name and wallpaper design of each\n" + .string "BOX will be made changeable to please\l" + .string "the stored POKéMON.\p" + .string "Keep reading?$" + +Route114_LanettesHouse_Text_22B5EF: @ 822B5EF + .string "When storing a POKéMON, it should be\n" + .string "sent to the BOX inspected last.\p" + .string "If that BOX is full, the received\n" + .string "POKéMON is stored in the next BOX.\p" + .string "In other words, when a BOX is examined,\n" + .string "it is automatically selected as the BOX\l" + .string "to which POKéMON are sent.$" + +Route114_LanettesHouse_Text_22B6E4: @ 822B6E4 + .string "{PLAYER} closed the notebook.$" + +Route114_LanettesHouse_Text_22B6FC: @ 822B6FC + .string "There’s an e-mail from someone on\n" + .string "the PC.\p" + .string "“… … … … … … …\p" + .string "“Your Storage System offers more\n" + .string "convenience than mine.\p" + .string "“It has a lot of user-friendly features\n" + .string "that make it fun and useful, too.\p" + .string "“It makes me proud that I played\n" + .string "a part in its development.\p" + .string "“Here’s hoping that you’ll continue\n" + .string "research in Storage Systems.\p" + .string "“From BILL\n" + .string "… … … … … … … …â€$" + diff --git a/data/maps/Route115/events.inc b/data/maps/Route115/events.inc new file mode 100644 index 000000000..37d886e7f --- /dev/null +++ b/data/maps/Route115/events.inc @@ -0,0 +1,49 @@ +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 + +Route115_MapWarps: @ 852A3E4 + 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 + 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 + +Route115_MapEvents:: @ 852A4A4 + map_events Route115_EventObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents + diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc new file mode 100644 index 000000000..2d4f7c2e3 --- /dev/null +++ b/data/maps/Route115/scripts.inc @@ -0,0 +1,162 @@ +Route115_MapScripts:: @ 81F2920 + map_script 1, Route115_MapScript1_1F2930 + map_script 3, Route115_MapScript1_1F2947 + map_script 2, Route115_MapScript2_1F2969 + .byte 0 + +Route115_MapScript1_1F2930: @ 81F2930 + compare VAR_0x4037, 3 + call_if 1, Route115_EventScript_273939 + compare VAR_0x4037, 4 + call_if 1, Route115_EventScript_27394C + end + +Route115_MapScript1_1F2947: @ 81F2947 + compare VAR_0x4039, 1 + call_if 1, Route115_EventScript_273D13 + compare VAR_0x4037, 3 + call_if 1, Route115_EventScript_273D1B + compare VAR_0x4037, 4 + call_if 1, Route115_EventScript_273D1B + end + +Route115_MapScript2_1F2969: @ 81F2969 + map_script_2 VAR_0x4039, 1, gUnknown_08273D1F + .2byte 0 + +Route115_EventScript_1F2973:: @ 81F2973 + msgbox Route115_Text_1F2B55, 2 + end + +Route115_EventScript_1F297C:: @ 81F297C + msgbox Route115_Text_1F2BC9, 3 + end + +Route115_EventScript_1F2985:: @ 81F2985 + msgbox Route115_Text_1F2BE3, 3 + end + +Route115_EventScript_1F298E:: @ 81F298E + trainerbattle 2, TRAINER_TIMOTHY_1, 0, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route115_EventScript_1F29D9 + msgbox Route115_Text_29B258, 4 + release + end + +Route115_EventScript_1F29BA:: @ 81F29BA + special sub_80B4808 + waitmovement 0 + msgbox Route115_Text_29B2B3, 4 + setvar VAR_0x8004, 307 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 307 + callstd 8 + release + end + +Route115_EventScript_1F29D9:: @ 81F29D9 + trainerbattle 5, TRAINER_TIMOTHY_1, 0, Route115_Text_29B32C, Route115_Text_29B372 + msgbox Route115_Text_29B385, 6 + end + +Route115_EventScript_1F29F0:: @ 81F29F0 + trainerbattle 0, TRAINER_KOICHI, 0, Route115_Text_29B3CC, Route115_Text_29B3ED + msgbox Route115_Text_29B3FF, 6 + end + +Route115_EventScript_1F2A07:: @ 81F2A07 + trainerbattle 2, TRAINER_NOB_1, 0, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route115_EventScript_1F2A52 + msgbox Route115_Text_29B49D, 4 + release + end + +Route115_EventScript_1F2A33:: @ 81F2A33 + special sub_80B4808 + waitmovement 0 + msgbox Route115_Text_29B50B, 4 + setvar VAR_0x8004, 183 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 183 + callstd 8 + release + end + +Route115_EventScript_1F2A52:: @ 81F2A52 + trainerbattle 5, TRAINER_NOB_1, 0, Route115_Text_29B547, Route115_Text_29B59D + msgbox Route115_Text_29B5B5, 6 + end + +Route115_EventScript_1F2A69:: @ 81F2A69 + trainerbattle 2, TRAINER_CYNDY_1, 0, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route115_EventScript_1F2AB4 + msgbox Route115_Text_29B647, 4 + release + end + +Route115_EventScript_1F2A95:: @ 81F2A95 + special sub_80B4808 + waitmovement 0 + msgbox Route115_Text_29B6AB, 4 + setvar VAR_0x8004, 427 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 427 + callstd 8 + release + end + +Route115_EventScript_1F2AB4:: @ 81F2AB4 + trainerbattle 5, TRAINER_CYNDY_1, 0, Route115_Text_29B6FA, Route115_Text_29B71A + msgbox Route115_Text_29B737, 6 + end + +Route115_EventScript_1F2ACB:: @ 81F2ACB + trainerbattle 0, TRAINER_HECTOR, 0, Route115_Text_29B78F, Route115_Text_29B7C5 + msgbox Route115_Text_29B7EA, 6 + end + +Route115_EventScript_1F2AE2:: @ 81F2AE2 + trainerbattle 0, TRAINER_KYRA, 0, Route115_Text_29B826, Route115_Text_29B85D + msgbox Route115_Text_29B869, 6 + end + +Route115_EventScript_1F2AF9:: @ 81F2AF9 + trainerbattle 0, TRAINER_JAIDEN, 0, Route115_Text_29B8C1, Route115_Text_29B8E8 + msgbox Route115_Text_29B904, 6 + end + +Route115_EventScript_1F2B10:: @ 81F2B10 + trainerbattle 0, TRAINER_ALIX, 0, Route115_Text_29B9CB, Route115_Text_29B9F6 + msgbox Route115_Text_29BA04, 6 + end + +Route115_EventScript_1F2B27:: @ 81F2B27 + trainerbattle 0, TRAINER_HELENE, 0, Route115_Text_29B92D, Route115_Text_29B958 + msgbox Route115_Text_29B971, 6 + end + +Route115_EventScript_1F2B3E:: @ 81F2B3E + trainerbattle 0, TRAINER_MARLENE, 0, Route115_Text_29BA2C, Route115_Text_29BA67 + msgbox Route115_Text_29BA87, 6 + end + +Route115_Text_1F2B55: @ 81F2B55 + .string "Exploring a cave isn’t like walking\n" + .string "on a road.\p" + .string "You never know when wild POKéMON will\n" + .string "appear. It’s full of suspense.$" + +Route115_Text_1F2BC9: @ 81F2BC9 + .string "ROUTE 115\n" + .string "{0x7A} RUSTBORO CITY$" + +Route115_Text_1F2BE3: @ 81F2BE3 + .string "METEOR FALLS\n" + .string "FALLARBOR TOWN THROUGH HERE$" + diff --git a/data/maps/Route116/events.inc b/data/maps/Route116/events.inc new file mode 100644 index 000000000..16afe4482 --- /dev/null +++ b/data/maps/Route116/events.inc @@ -0,0 +1,56 @@ +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 + +Route116_MapWarps: @ 852A758 + 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 + +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 + +Route116_MapEvents:: @ 852A814 + map_events Route116_EventObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents + diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc new file mode 100644 index 000000000..68a32c3b5 --- /dev/null +++ b/data/maps/Route116/scripts.inc @@ -0,0 +1,511 @@ +Route116_MapScripts:: @ 81F2C0C + map_script 3, Route116_MapScript1_1F2C1C + map_script 1, Route116_MapScript1_1F2C4F + map_script 2, Route116_MapScript2_1F2C66 + .byte 0 + +Route116_MapScript1_1F2C1C: @ 81F2C1C + checkflag FLAG_0x08F + call_if 1, Route116_EventScript_1F2C47 + compare VAR_0x4039, 1 + call_if 1, Route116_EventScript_273D13 + compare VAR_0x4037, 5 + call_if 1, Route116_EventScript_273D1B + compare VAR_0x4037, 6 + call_if 1, Route116_EventScript_273D1B + end + +Route116_EventScript_1F2C47:: @ 81F2C47 + setobjectxyperm 21, 38, 10 + return + +Route116_MapScript1_1F2C4F: @ 81F2C4F + compare VAR_0x4037, 5 + call_if 1, Route116_EventScript_27395F + compare VAR_0x4037, 6 + call_if 1, Route116_EventScript_273972 + end + +Route116_MapScript2_1F2C66: @ 81F2C66 + map_script_2 VAR_0x4039, 1, gUnknown_08273D1F + .2byte 0 + +Route116_EventScript_1F2C70:: @ 81F2C70 + lock + faceplayer + checkflag FLAG_0x08F + goto_eq Route116_EventScript_1F2C8E + checkflag FLAG_0x08E + goto_eq Route116_EventScript_1F2C98 + msgbox Route116_Text_1F3140, 4 + release + end + +Route116_EventScript_1F2C8E:: @ 81F2C8E + msgbox Route116_Text_1F32C1, 4 + release + end + +Route116_EventScript_1F2C98:: @ 81F2C98 + msgbox Route116_Text_1F3166, 4 + release + end + +Route116_EventScript_1F2CA2:: @ 81F2CA2 + lock + faceplayer + checkflag FLAG_0x11F + goto_eq Route116_EventScript_1F2D2B + msgbox Route116_Text_1F3317, 4 + goto Route116_EventScript_1F2CBB + end + +Route116_EventScript_1F2CBB:: @ 81F2CBB + setflag FLAG_0x11F + giveitem_std ITEM_REPEAT_BALL + compare VAR_RESULT, 0 + goto_eq Route116_EventScript_1F2D39 + msgbox Route116_Text_1F3521, 4 + closemessage + compare VAR_FACING, 2 + call_if 1, Route116_EventScript_1F2D15 + compare VAR_FACING, 1 + call_if 1, Route116_EventScript_1F2D15 + compare VAR_FACING, 3 + call_if 1, Route116_EventScript_1F2D15 + compare VAR_FACING, 4 + call_if 1, Route116_EventScript_1F2D20 + removeobject VAR_LAST_TALKED + clearflag FLAG_0x3B5 + setflag FLAG_0x100 + release + end + +Route116_EventScript_1F2D15:: @ 81F2D15 + applymovement VAR_LAST_TALKED, Route116_Movement_1F2D43 + waitmovement 0 + return + +Route116_EventScript_1F2D20:: @ 81F2D20 + applymovement VAR_LAST_TALKED, Route116_Movement_1F2D4C + waitmovement 0 + return + +Route116_EventScript_1F2D2B:: @ 81F2D2B + msgbox Route116_Text_1F35CE, 4 + goto Route116_EventScript_1F2CBB + end + +Route116_EventScript_1F2D39:: @ 81F2D39 + msgbox Route116_Text_1F3593, 4 + release + end + +Route116_Movement_1F2D43: @ 81F2D43 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + step_end + +Route116_Movement_1F2D4C: @ 81F2D4C + 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 + msgbox Route116_Text_1F379D, 3 + end + +Route116_EventScript_1F2D60:: @ 81F2D60 + msgbox Route116_Text_1F37B7, 3 + end + +Route116_EventScript_1F2D69:: @ 81F2D69 + msgbox Route116_Text_1F380F, 3 + end + +Route116_EventScript_1F2D72:: @ 81F2D72 + msgbox Route116_Text_1F3825, 3 + end + +Route116_EventScript_1F2D7B:: @ 81F2D7B + msgbox Route116_Text_1F38D4, 3 + end + +Route116_EventScript_1F2D84:: @ 81F2D84 + lock + faceplayer + msgbox Route116_Text_1F309D, 4 + setvar VAR_0x406F, 2 + release + end + +Route116_EventScript_1F2D95:: @ 81F2D95 + lockall + applymovement 11, Route116_Movement_2725A8 + applymovement 255, Route116_Movement_2725A4 + waitmovement 0 + msgbox Route116_Text_1F309D, 4 + setvar VAR_0x406F, 2 + releaseall + end + +Route116_EventScript_1F2DB6:: @ 81F2DB6 + lock + faceplayer + checkitem ITEM_BLACK_GLASSES, 1 + compare VAR_RESULT, 1 + goto_eq Route116_EventScript_1F2DF1 + specialvar VAR_RESULT, sub_8139634 + compare VAR_RESULT, 1 + goto_eq Route116_EventScript_1F2DE2 + msgbox Route116_Text_1F3657, 4 + release + end + +Route116_EventScript_1F2DE2:: @ 81F2DE2 + msgbox Route116_Text_1F3718, 4 + closemessage + goto Route116_EventScript_1F2E2A + end + +Route116_EventScript_1F2DF1:: @ 81F2DF1 + msgbox Route116_Text_1F3657, 4 + msgbox Route116_Text_1F3688, 4 + specialvar VAR_RESULT, sub_8139634 + compare VAR_RESULT, 1 + goto_eq Route116_EventScript_1F2E1B + msgbox Route116_Text_1F375E, 4 + release + end + +Route116_EventScript_1F2E1B:: @ 81F2E1B + msgbox Route116_Text_1F36B4, 4 + closemessage + goto Route116_EventScript_1F2E2A + end + +Route116_EventScript_1F2E2A:: @ 81F2E2A + delay 20 + compare VAR_FACING, 2 + call_if 1, Route116_EventScript_1F2E5E + compare VAR_FACING, 1 + call_if 1, Route116_EventScript_1F2E5E + compare VAR_FACING, 3 + call_if 1, Route116_EventScript_1F2E5E + compare VAR_FACING, 4 + call_if 1, Route116_EventScript_1F2E69 + removeobject VAR_LAST_TALKED + release + end + +Route116_EventScript_1F2E5E:: @ 81F2E5E + applymovement VAR_LAST_TALKED, Route116_Movement_1F2E74 + waitmovement 0 + return + +Route116_EventScript_1F2E69:: @ 81F2E69 + applymovement VAR_LAST_TALKED, Route116_Movement_1F2E7E + waitmovement 0 + return + +Route116_Movement_1F2E74: @ 81F2E74 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + step_end + +Route116_Movement_1F2E7E: @ 81F2E7E + 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 + trainerbattle 0, TRAINER_JOEY, 0, Route116_Text_29BB79, Route116_Text_29BB9A + msgbox Route116_Text_29BBC6, 6 + end + +Route116_EventScript_1F2EA0:: @ 81F2EA0 + trainerbattle 0, TRAINER_JOSE, 0, Route116_Text_29BBFD, Route116_Text_29BC25 + msgbox Route116_Text_29BC42, 6 + end + +Route116_EventScript_1F2EB7:: @ 81F2EB7 + trainerbattle 2, TRAINER_JERRY_1, 0, Route116_Text_29BD0C, Route116_Text_29BD66, Route116_EventScript_1F2EF8 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route116_EventScript_1F2F4E + setvar VAR_0x8004, 273 + specialvar VAR_RESULT, sub_813B4E0 + compare VAR_RESULT, 0 + goto_eq Route116_EventScript_1F2F22 + msgbox Route116_Text_29BD92, 4 + release + end + +Route116_EventScript_1F2EF8:: @ 81F2EF8 + checkflag FLAG_HAS_MATCH_CALL + goto_eq Route116_EventScript_1F2F03 + release + end + +Route116_EventScript_1F2F03:: @ 81F2F03 + special sub_80B4808 + waitmovement 0 + msgbox Route116_Text_29BE71, 4 + setvar VAR_0x8004, 273 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 273 + callstd 8 + release + end + +Route116_EventScript_1F2F22:: @ 81F2F22 + checkflag FLAG_HAS_MATCH_CALL + goto_eq Route116_EventScript_1F2F35 + msgbox Route116_Text_29BD92, 4 + release + end + +Route116_EventScript_1F2F35:: @ 81F2F35 + msgbox Route116_Text_29BDEF, 4 + setvar VAR_0x8004, 273 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 273 + callstd 8 + release + end + +Route116_EventScript_1F2F4E:: @ 81F2F4E + trainerbattle 5, TRAINER_JERRY_1, 0, Route116_Text_29BEF3, Route116_Text_29BF4C + msgbox Route116_Text_29BF68, 6 + end + +Route116_EventScript_1F2F65:: @ 81F2F65 + trainerbattle 0, TRAINER_CLARK, 0, Route116_Text_29BACD, Route116_Text_29BB0F + msgbox Route116_Text_29BB31, 6 + end + +Route116_EventScript_1F2F7C:: @ 81F2F7C + trainerbattle 0, TRAINER_JANICE, 0, Route116_Text_29BC7F, Route116_Text_29BCB3 + msgbox Route116_Text_29BCCC, 6 + end + +Route116_EventScript_1F2F93:: @ 81F2F93 + trainerbattle 2, TRAINER_KAREN_1, 0, Route116_Text_29BFC5, Route116_Text_29BFFA, Route116_EventScript_1F2FD4 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route116_EventScript_1F302A + setvar VAR_0x8004, 280 + specialvar VAR_RESULT, sub_813B4E0 + compare VAR_RESULT, 0 + goto_eq Route116_EventScript_1F2FFE + msgbox Route116_Text_29C010, 4 + release + end + +Route116_EventScript_1F2FD4:: @ 81F2FD4 + checkflag FLAG_HAS_MATCH_CALL + goto_eq Route116_EventScript_1F2FDF + release + end + +Route116_EventScript_1F2FDF:: @ 81F2FDF + special sub_80B4808 + waitmovement 0 + msgbox Route116_Text_29C096, 4 + setvar VAR_0x8004, 280 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 280 + callstd 8 + release + end + +Route116_EventScript_1F2FFE:: @ 81F2FFE + checkflag FLAG_HAS_MATCH_CALL + goto_eq Route116_EventScript_1F3011 + msgbox Route116_Text_29C010, 4 + release + end + +Route116_EventScript_1F3011:: @ 81F3011 + msgbox Route116_Text_29C052, 4 + setvar VAR_0x8004, 280 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 280 + callstd 8 + release + end + +Route116_EventScript_1F302A:: @ 81F302A + trainerbattle 5, TRAINER_KAREN_1, 0, Route116_Text_29C0DA, Route116_Text_29C11F + msgbox Route116_Text_29C13B, 6 + end + +Route116_EventScript_1F3041:: @ 81F3041 + trainerbattle 0, TRAINER_SARAH, 0, Route116_Text_29C173, Route116_Text_29C1B8 + msgbox Route116_Text_29C1EA, 6 + end + +Route116_EventScript_1F3058:: @ 81F3058 + trainerbattle 0, TRAINER_DAWSON, 0, Route116_Text_29C266, Route116_Text_29C2C2 + msgbox Route116_Text_29C2DD, 6 + end + +Route116_EventScript_1F306F:: @ 81F306F + trainerbattle 0, TRAINER_DEVAN, 0, Route116_Text_29C350, Route116_Text_29C365 + msgbox Route116_Text_29C380, 6 + end + +Route116_EventScript_1F3086:: @ 81F3086 + trainerbattle 0, TRAINER_JOHNSON, 0, Route116_Text_29C3C1, Route116_Text_29C3F7 + msgbox Route116_Text_29C418, 6 + end + +Route116_Text_1F309D: @ 81F309D + .string "Ohhh, what am I to do?\p" + .string "We were on our walk, PEEKO and I, when\n" + .string "we were jumped by an odd thug…\p" + .string "The scoundrel made off with my\n" + .string "darling PEEKO!\p" + .string "Wrrrooooooaaaar! PEEKO!$" + +Route116_Text_1F3140: @ 81F3140 + .string "Nnn… Roar!\p" + .string "I want to dig that tunnel!$" + +Route116_Text_1F3166: @ 81F3166 + .string "Nnn… Roar!\n" + .string "What’s going on?\p" + .string "I was digging the tunnel without any\n" + .string "tools when some goon ordered me out!\p" + .string "That tunnel’s filled with POKéMON\n" + .string "that react badly to loud noises.\l" + .string "They could cause an uproar.\p" + .string "That’s why we stopped using heavy\n" + .string "equipment for tunneling…\p" + .string "I’m worried that the goon will do\n" + .string "something stupid and startle the\l" + .string "POKéMON into an uproar.$" + +Route116_Text_1F32C1: @ 81F32C1 + .string "Nnn… Roar!\p" + .string "That goofy goon hightailed it out of\n" + .string "the tunnel! I can go back to digging!$" + +Route116_Text_1F3317: @ 81F3317 + .string "Oh! It’s you!\p" + .string "You’re that person who not only helped\n" + .string "me in PETALBURG WOODS, but also got\l" + .string "back my stolen package and then even\l" + .string "graciously delivered it to SLATEPORT!\p" + .string "CAPT. STERN informed us that the\n" + .string "package arrived, too!\p" + .string "I thank you very, very much!\p" + .string "Why, if I were a rain cloud, I would\n" + .string "shower you with gratitude and hail\l" + .string "you as a hero!\p" + .string "For you, the most wonderful TRAINER,\n" + .string "I bear good news!\p" + .string "Recently, our company developed\n" + .string "a new kind of POKé BALL.\p" + .string "As a token of our appreciation, this\n" + .string "is our gift to our wonderful TRAINER!$" + +Route116_Text_1F3521: @ 81F3521 + .string "Our new POKé BALL will be available\n" + .string "at the POKéMON MART in RUSTBORO.\p" + .string "Please do try it out!\n" + .string "Thank you and bye-bye!$" + +Route116_Text_1F3593: @ 81F3593 + .string "Your BAG is jam-packed.\n" + .string "I can’t give you this REPEAT BALL.$" + +Route116_Text_1F35CE: @ 81F35CE + .string "As a token of our appreciation for\n" + .string "your delivering our package, I have\l" + .string "a gift of a new kind of POKé BALL\l" + .string "for our most wonderful TRAINER!$" + +Route116_Text_1F3657: @ 81F3657 + .string "I dropped my glasses…\n" + .string "Can you help me find them?$" + +Route116_Text_1F3688: @ 81F3688 + .string "Those glasses!\n" + .string "May I see them for a second?$" + +Route116_Text_1F36B4: @ 81F36B4 + .string "Hmm…\n" + .string "These are BLACKGLASSES.\l" + .string "They’re not what I’m looking for…\p" + .string "Maybe my glasses aren’t around\n" + .string "here…$" + +Route116_Text_1F3718: @ 81F3718 + .string "Hmm…\n" + .string "I can’t find my glasses anywhere…\l" + .string "Maybe they’re not around here…$" + +Route116_Text_1F375E: @ 81F375E + .string "Hmm…\n" + .string "These are BLACKGLASSES.\l" + .string "They’re not what I’m looking for…$" + +Route116_Text_1F379D: @ 81F379D + .string "ROUTE 116\n" + .string "{0x7B} RUSTBORO CITY$" + +Route116_Text_1F37B7: @ 81F37B7 + .string "RUSTURF TUNNEL\n" + .string "“Linking RUSTBORO and VERDANTURF\p" + .string "“The tunnel project has been\n" + .string "canceled.â€$" + +Route116_Text_1F380F: @ 81F380F + .string "TUNNELER’S REST HOUSE$" + +Route116_Text_1F3825: @ 81F3825 + .string "TRAINER TIPS\p" + .string "If you want to stop a POKéMON from\n" + .string "evolving, press the B Button while it\l" + .string "is trying to evolve.\l" + .string "The startled POKéMON will stop.\p" + .string "This is called an evolution cancel.$" + +Route116_Text_1F38D4: @ 81F38D4 + .string "TRAINER TIPS\p" + .string "Your BAG has several POCKETS.\p" + .string "Items you obtain are automatically\n" + .string "placed in the appropriate POCKETS.\p" + .string "No TRAINER can afford to be without\n" + .string "a BAG of their own.$" + diff --git a/data/maps/Route116_TunnelersRestHouse/events.inc b/data/maps/Route116_TunnelersRestHouse/events.inc new file mode 100644 index 000000000..8d133ab6d --- /dev/null +++ b/data/maps/Route116_TunnelersRestHouse/events.inc @@ -0,0 +1,12 @@ +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 + +Route116_TunnelersRestHouse_MapWarps: @ 8533E7C + 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/Route116_TunnelersRestHouse/scripts.inc b/data/maps/Route116_TunnelersRestHouse/scripts.inc new file mode 100644 index 000000000..f9dbbd3f2 --- /dev/null +++ b/data/maps/Route116_TunnelersRestHouse/scripts.inc @@ -0,0 +1,63 @@ +Route116_TunnelersRestHouse_MapScripts:: @ 822B850 + map_script 3, Route116_TunnelersRestHouse_MapScript1_22B856 + .byte 0 + +Route116_TunnelersRestHouse_MapScript1_22B856: @ 822B856 + setflag FLAG_LANDMARK_TUNNELERS_REST_HOUSE + end + +Route116_TunnelersRestHouse_EventScript_22B85A:: @ 822B85A + msgbox Route116_TunnelersRestHouse_Text_22B88B, 2 + end + +Route116_TunnelersRestHouse_EventScript_22B863:: @ 822B863 + msgbox Route116_TunnelersRestHouse_Text_22B99F, 2 + end + +Route116_TunnelersRestHouse_EventScript_22B86C:: @ 822B86C + lock + faceplayer + checkflag FLAG_0x0C7 + goto_eq Route116_TunnelersRestHouse_EventScript_22B881 + msgbox Route116_TunnelersRestHouse_Text_22BAAF, 4 + release + end + +Route116_TunnelersRestHouse_EventScript_22B881:: @ 822B881 + msgbox Route116_TunnelersRestHouse_Text_22BB3B, 4 + release + end + +Route116_TunnelersRestHouse_Text_22B88B: @ 822B88B + .string "That RUSTURF TUNNEL there…\p" + .string "At first, we had a huge work crew boring\n" + .string "through rock with the latest machinery.\l" + .string "But, we had to stop.\p" + .string "It turns out that we would have had\n" + .string "a negative effect on wild POKéMON in\l" + .string "the area.\p" + .string "So, we’ve got nothing to do but loll\n" + .string "around here doing nothing.$" + +Route116_TunnelersRestHouse_Text_22B99F: @ 822B99F + .string "There’s a man digging his way to\n" + .string "VERDANTURF all by his lonesome.\l" + .string "He’s desperate to get through.\p" + .string "He says that if he digs little by little\n" + .string "without using machines, he won’t\l" + .string "disturb POKéMON, and he’ll avoid\l" + .string "harming the natural environment.\p" + .string "I wonder if he made it through yet.$" + +Route116_TunnelersRestHouse_Text_22BAAF: @ 822BAAF + .string "To get to VERDANTURF without using\n" + .string "this TUNNEL, you’d have to cross the\l" + .string "sea to DEWFORD, sail on to SLATEPORT,\l" + .string "then travel through MAUVILLE.$" + +Route116_TunnelersRestHouse_Text_22BB3B: @ 822BB3B + .string "Did you hear? The TUNNEL to VERDANTURF\n" + .string "has gone through!\p" + .string "Sometimes, if you hope strongly enough,\n" + .string "dreams do come true.$" + diff --git a/data/maps/Route117/events.inc b/data/maps/Route117/events.inc new file mode 100644 index 000000000..f84ef6212 --- /dev/null +++ b/data/maps/Route117/events.inc @@ -0,0 +1,38 @@ +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 + +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 + +Route117_MapEvents:: @ 852AAA0 + map_events Route117_EventObjects, Route117_MapWarps, 0x0, Route117_MapBGEvents + diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc new file mode 100644 index 000000000..55a7b910e --- /dev/null +++ b/data/maps/Route117/scripts.inc @@ -0,0 +1,232 @@ +Route117_MapScripts:: @ 81F397D + map_script 3, Route117_MapScript1_1F3983 + .byte 0 + +Route117_MapScript1_1F3983: @ 81F3983 + call Route117_EventScript_1F3989 + end + +Route117_EventScript_1F3989:: @ 81F3989 + checkflag FLAG_PENDING_DAYCARE_EGG + goto_if 0, Route117_EventScript_1F3999 + setobjectxyperm 3, 47, 6 + +Route117_EventScript_1F3999:: @ 81F3999 + return + +Route117_EventScript_1F399A:: @ 81F399A + msgbox Route117_Text_1F3CFD, 2 + end + +Route117_EventScript_1F39A3:: @ 81F39A3 + msgbox Route117_Text_1F3D41, 2 + end + +Route117_EventScript_1F39AC:: @ 81F39AC + msgbox Route117_Text_1F3C7C, 2 + end + +Route117_EventScript_1F39B5:: @ 81F39B5 + msgbox Route117_Text_1F3D58, 3 + end + +Route117_EventScript_1F39BE:: @ 81F39BE + msgbox Route117_Text_1F3D74, 3 + end + +Route117_EventScript_1F39C7:: @ 81F39C7 + msgbox Route117_Text_1F3D8E, 3 + end + +Route117_EventScript_1F39D0:: @ 81F39D0 + trainerbattle 2, TRAINER_ISAAC_1, 0, Route117_Text_29C43F, Route117_Text_29C47A, Route117_EventScript_1F39FC + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route117_EventScript_1F3A1B + msgbox Route117_Text_29C498, 4 + release + end + +Route117_EventScript_1F39FC:: @ 81F39FC + special sub_80B4808 + waitmovement 0 + msgbox Route117_Text_29C508, 4 + setvar VAR_0x8004, 538 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 538 + callstd 8 + release + end + +Route117_EventScript_1F3A1B:: @ 81F3A1B + trainerbattle 5, TRAINER_ISAAC_1, 0, Route117_Text_29C549, Route117_Text_29C58B + msgbox Route117_Text_29C5D0, 6 + end + +Route117_EventScript_1F3A32:: @ 81F3A32 + trainerbattle 2, TRAINER_LYDIA_1, 0, Route117_Text_29C612, Route117_Text_29C659, Route117_EventScript_1F3A5E + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route117_EventScript_1F3A7D + msgbox Route117_Text_29C679, 4 + release + end + +Route117_EventScript_1F3A5E:: @ 81F3A5E + special sub_80B4808 + waitmovement 0 + msgbox Route117_Text_29C6BC, 4 + setvar VAR_0x8004, 545 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 545 + callstd 8 + release + end + +Route117_EventScript_1F3A7D:: @ 81F3A7D + trainerbattle 5, TRAINER_LYDIA_1, 0, Route117_Text_29C6FD, Route117_Text_29C73E + msgbox Route117_Text_29C75A, 6 + end + +Route117_EventScript_1F3A94:: @ 81F3A94 + trainerbattle 2, TRAINER_DYLAN_1, 0, Route117_Text_29C7A5, Route117_Text_29C7EB, Route117_EventScript_1F3AC0 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route117_EventScript_1F3ADF + msgbox Route117_Text_29C800, 4 + release + end + +Route117_EventScript_1F3AC0:: @ 81F3AC0 + special sub_80B4808 + waitmovement 0 + msgbox Route117_Text_29C846, 4 + setvar VAR_0x8004, 364 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 364 + callstd 8 + release + end + +Route117_EventScript_1F3ADF:: @ 81F3ADF + trainerbattle 5, TRAINER_DYLAN_1, 0, Route117_Text_29C880, Route117_Text_29C8E3 + msgbox Route117_Text_29C8FE, 6 + end + +Route117_EventScript_1F3AF6:: @ 81F3AF6 + trainerbattle 2, TRAINER_MARIA_1, 0, Route117_Text_29C955, Route117_Text_29C9A6, Route117_EventScript_1F3B22 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route117_EventScript_1F3B41 + msgbox Route117_Text_29C9D0, 4 + release + end + +Route117_EventScript_1F3B22:: @ 81F3B22 + special sub_80B4808 + waitmovement 0 + msgbox Route117_Text_29CA32, 4 + setvar VAR_0x8004, 369 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 369 + callstd 8 + release + end + +Route117_EventScript_1F3B41:: @ 81F3B41 + trainerbattle 5, TRAINER_MARIA_1, 0, Route117_Text_29CA7C, Route117_Text_29CACC + msgbox Route117_Text_29CAF6, 6 + end + +Route117_EventScript_1F3B58:: @ 81F3B58 + trainerbattle 0, TRAINER_DEREK, 0, Route117_Text_29CB32, Route117_Text_29CB87 + msgbox Route117_Text_29CBAD, 6 + end + +Route117_EventScript_1F3B6F:: @ 81F3B6F + trainerbattle 6, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CC4A, Route117_Text_29CC8E, Route117_Text_29CD61, Route117_EventScript_1F3B9F + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route117_EventScript_1F3BB8 + msgbox Route117_Text_29CCCB, 4 + release + end + +Route117_EventScript_1F3B9F:: @ 81F3B9F + msgbox Route117_Text_29CD1D, 4 + setvar VAR_0x8004, 287 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 287 + callstd 8 + release + end + +Route117_EventScript_1F3BB8:: @ 81F3BB8 + trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CEB6, Route117_Text_29CEF6, Route117_Text_29CF6E + msgbox Route117_Text_29CF1C, 6 + end + +Route117_EventScript_1F3BD3:: @ 81F3BD3 + trainerbattle 6, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CD9D, Route117_Text_29CDE9, Route117_Text_29CE52, Route117_EventScript_1F3C03 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route117_EventScript_1F3C1C + msgbox Route117_Text_29CE17, 4 + release + end + +Route117_EventScript_1F3C03:: @ 81F3C03 + msgbox Route117_Text_29CD1D, 4 + setvar VAR_0x8004, 287 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 287 + callstd 8 + release + end + +Route117_EventScript_1F3C1C:: @ 81F3C1C + trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CFAA, Route117_Text_29CFED, Route117_Text_29D053 + msgbox Route117_Text_29CFFE, 6 + end + +Route117_EventScript_1F3C37:: @ 81F3C37 + trainerbattle 0, TRAINER_MELINA, 0, Route117_Text_29D0B7, Route117_Text_29D0F1 + msgbox Route117_Text_29D10E, 6 + end + +Route117_EventScript_1F3C4E:: @ 81F3C4E + trainerbattle 0, TRAINER_BRANDI, 0, Route117_Text_29D14B, Route117_Text_29D189 + msgbox Route117_Text_29D196, 6 + end + +Route117_EventScript_1F3C65:: @ 81F3C65 + trainerbattle 0, TRAINER_AISHA, 0, Route117_Text_29D1D1, Route117_Text_29D206 + msgbox Route117_Text_29D24C, 6 + end + +Route117_Text_1F3C7C: @ 81F3C7C + .string "I left my POKéMON at the DAY CARE.\p" + .string "When I got it back, it had a new move\n" + .string "that I didn’t teach it.\l" + .string "I was really, really surprised.$" + +Route117_Text_1F3CFD: @ 81F3CFD + .string "What do you think?\n" + .string "Aren’t these flowers pretty?\p" + .string "I planted them all!$" + +Route117_Text_1F3D41: @ 81F3D41 + .string "The air is tasty here!$" + +Route117_Text_1F3D58: @ 81F3D58 + .string "ROUTE 117\n" + .string "{0x7B} VERDANTURF TOWN$" + +Route117_Text_1F3D74: @ 81F3D74 + .string "ROUTE 117\n" + .string "{0x7C} MAUVILLE CITY$" + +Route117_Text_1F3D8E: @ 81F3D8E + .string "POKéMON DAY CARE\n" + .string "“Let us raise your POKéMON.â€$" + diff --git a/data/maps/Route117_PokemonDayCare/events.inc b/data/maps/Route117_PokemonDayCare/events.inc new file mode 100644 index 000000000..05220bdc9 --- /dev/null +++ b/data/maps/Route117_PokemonDayCare/events.inc @@ -0,0 +1,10 @@ +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 + +Route117_PokemonDayCare_MapWarps: @ 8533EB8 + 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/Route117_PokemonDayCare/scripts.inc b/data/maps/Route117_PokemonDayCare/scripts.inc new file mode 100644 index 000000000..b2e9ddfaa --- /dev/null +++ b/data/maps/Route117_PokemonDayCare/scripts.inc @@ -0,0 +1,8 @@ +Route117_PokemonDayCare_MapScripts:: @ 822BBB1 + map_script 3, Route117_PokemonDayCare_MapScript1_22BBB7 + .byte 0 + +Route117_PokemonDayCare_MapScript1_22BBB7: @ 822BBB7 + setflag FLAG_LANDMARK_POKEMON_DAYCARE + end + diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc new file mode 100644 index 000000000..5e732890d --- /dev/null +++ b/data/maps/Route118/events.inc @@ -0,0 +1,46 @@ +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 + +Route118_MapWarps: @ 852ACAC + 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 + 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 + +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 + +Route118_MapEvents:: @ 852AD58 + map_events Route118_EventObjects, Route118_MapWarps, Route118_MapCoordEvents, Route118_MapBGEvents + diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc new file mode 100644 index 000000000..818111b81 --- /dev/null +++ b/data/maps/Route118/scripts.inc @@ -0,0 +1,318 @@ +Route118_MapScripts:: @ 81F3DBC + map_script 3, Route118_MapScript1_1F3DCC + map_script 1, Route118_MapScript1_1F3DF3 + map_script 2, Route118_MapScript2_1F3E0A + .byte 0 + +Route118_MapScript1_1F3DCC: @ 81F3DCC + call Route118_EventScript_28CCC7 + compare VAR_0x4039, 1 + call_if 1, Route118_EventScript_273D13 + compare VAR_0x4037, 7 + call_if 1, Route118_EventScript_273D1B + compare VAR_0x4037, 8 + call_if 1, Route118_EventScript_273D1B + end + +Route118_MapScript1_1F3DF3: @ 81F3DF3 + compare VAR_0x4037, 7 + call_if 1, Route118_EventScript_273985 + compare VAR_0x4037, 8 + call_if 1, Route118_EventScript_273998 + end + +Route118_MapScript2_1F3E0A: @ 81F3E0A + map_script_2 VAR_0x4039, 1, gUnknown_08273D1F + .2byte 0 + +Route118_EventScript_1F3E14:: @ 81F3E14 + lock + faceplayer + checkflag FLAG_0x0E3 + goto_eq Route118_EventScript_1F3E69 + msgbox Route118_Text_1F427B, 5 + compare VAR_RESULT, 1 + goto_eq Route118_EventScript_1F3E3E + compare VAR_RESULT, 0 + goto_eq Route118_EventScript_1F3E5F + end + +Route118_EventScript_1F3E3E:: @ 81F3E3E + msgbox Route118_Text_1F42AF, 4 + giveitem_std ITEM_GOOD_ROD + setflag FLAG_0x0E3 + msgbox Route118_Text_1F42E7, 4 + release + end + +Route118_EventScript_1F3E5F:: @ 81F3E5F + msgbox Route118_Text_1F4319, 4 + release + end + +Route118_EventScript_1F3E69:: @ 81F3E69 + msgbox Route118_Text_1F4331, 4 + release + end + +Route118_EventScript_1F3E73:: @ 81F3E73 + msgbox Route118_Text_1F4367, 2 + end + +Route118_EventScript_1F3E7C:: @ 81F3E7C + msgbox Route118_Text_1F43F4, 3 + end + +Route118_EventScript_1F3E85:: @ 81F3E85 + msgbox Route118_Text_1F440E, 3 + end + +Route118_EventScript_1F3E8E:: @ 81F3E8E + lockall + setvar VAR_0x8008, 0 + applymovement 255, Route118_Movement_2725B2 + waitmovement 0 + applymovement 19, Route118_Movement_1F3F61 + waitmovement 0 + goto Route118_EventScript_1F3EE4 + end + +Route118_EventScript_1F3EAE:: @ 81F3EAE + lockall + setvar VAR_0x8008, 1 + applymovement 255, Route118_Movement_2725B2 + waitmovement 0 + goto Route118_EventScript_1F3EE4 + end + +Route118_EventScript_1F3EC4:: @ 81F3EC4 + lockall + setvar VAR_0x8008, 2 + applymovement 255, Route118_Movement_2725B2 + waitmovement 0 + applymovement 19, Route118_Movement_1F3F63 + waitmovement 0 + goto Route118_EventScript_1F3EE4 + end + +Route118_EventScript_1F3EE4:: @ 81F3EE4 + playse SE_DANSA + applymovement 19, Route118_Movement_1F3F65 + waitmovement 0 + delay 30 + msgbox Route118_Text_1F40BE, 4 + closemessage + compare VAR_0x8008, 0 + call_if 1, Route118_EventScript_1F3F28 + compare VAR_0x8008, 1 + call_if 1, Route118_EventScript_1F3F3A + compare VAR_0x8008, 2 + call_if 1, Route118_EventScript_1F3F4C + setvar VAR_0x4071, 1 + removeobject 19 + releaseall + end + +Route118_EventScript_1F3F28:: @ 81F3F28 + applymovement 255, Route118_Movement_1F3F5E + applymovement 19, Route118_Movement_1F3F69 + waitmovement 0 + return + +Route118_EventScript_1F3F3A:: @ 81F3F3A + applymovement 255, Route118_Movement_1F3F5E + applymovement 19, Route118_Movement_1F3F74 + waitmovement 0 + return + +Route118_EventScript_1F3F4C:: @ 81F3F4C + applymovement 255, Route118_Movement_1F3F5E + applymovement 19, Route118_Movement_1F3F7E + waitmovement 0 + return + +Route118_Movement_1F3F5E: @ 81F3F5E + delay_16 + walk_in_place_fastest_right + step_end + +Route118_Movement_1F3F61: @ 81F3F61 + walk_left + step_end + +Route118_Movement_1F3F63: @ 81F3F63 + walk_right + step_end + +Route118_Movement_1F3F65: @ 81F3F65 + jump_2_down + delay_16 + walk_down + step_end + +Route118_Movement_1F3F69: @ 81F3F69 + 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 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + step_end + +Route118_Movement_1F3F7E: @ 81F3F7E + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + step_end + +Route118_EventScript_1F3F87:: @ 81F3F87 + trainerbattle 2, TRAINER_ROSE_1, 0, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route118_EventScript_1F3FD2 + msgbox Route118_Text_29D2FA, 4 + release + end + +Route118_EventScript_1F3FB3:: @ 81F3FB3 + special sub_80B4808 + waitmovement 0 + msgbox Route118_Text_29D343, 4 + setvar VAR_0x8004, 37 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 37 + callstd 8 + release + end + +Route118_EventScript_1F3FD2:: @ 81F3FD2 + trainerbattle 5, TRAINER_ROSE_1, 0, Route118_Text_29D382, Route118_Text_29D3AA + msgbox Route118_Text_29D3D9, 6 + end + +Route118_EventScript_1F3FE9:: @ 81F3FE9 + trainerbattle 0, TRAINER_BARNY, 0, Route118_Text_29D515, Route118_Text_29D55C + msgbox Route118_Text_29D587, 6 + end + +Route118_EventScript_1F4000:: @ 81F4000 + trainerbattle 0, TRAINER_WADE, 0, Route118_Text_29D5DF, Route118_Text_29D64C + msgbox Route118_Text_29D663, 6 + end + +Route118_EventScript_1F4017:: @ 81F4017 + trainerbattle 2, TRAINER_DALTON_1, 0, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route118_EventScript_1F4062 + msgbox Route118_Text_29D6D8, 4 + release + end + +Route118_EventScript_1F4043:: @ 81F4043 + special sub_80B4808 + waitmovement 0 + msgbox Route118_Text_29D74A, 4 + setvar VAR_0x8004, 196 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 196 + callstd 8 + release + end + +Route118_EventScript_1F4062:: @ 81F4062 + trainerbattle 5, TRAINER_DALTON_1, 0, Route118_Text_29D789, Route118_Text_29D7CA + msgbox Route118_Text_29D7D5, 6 + end + +Route118_EventScript_1F4079:: @ 81F4079 + trainerbattle 0, TRAINER_PERRY, 0, Route118_Text_29D41D, Route118_Text_29D45B + msgbox Route118_Text_29D46C, 6 + end + +Route118_EventScript_1F4090:: @ 81F4090 + trainerbattle 0, TRAINER_CHESTER, 0, Route118_Text_29D4A6, Route118_Text_29D4C4 + msgbox Route118_Text_29D4DA, 6 + end + +Route118_EventScript_1F40A7:: @ 81F40A7 + trainerbattle 0, TRAINER_DEANDRE, 0, Route118_Text_29D81B, Route118_Text_29D83C + msgbox Route118_Text_29D872, 6 + end + +Route118_Text_1F40BE: @ 81F40BE + .string "STEVEN: Hi, {PLAYER}{KUN}!\p" + .string "It’s me, STEVEN!\n" + .string "We met in the cave near DEWFORD.\p" + .string "Have you met many kinds of POKéMON\n" + .string "since I last saw you?\p" + .string "There are many, many kinds of POKéMON\n" + .string "in this wide world of ours.\p" + .string "If you wanted to raise only your\n" + .string "favorites, that’s fine.\p" + .string "Perhaps you find it more fun to raise\n" + .string "all sorts of POKéMON.\p" + .string "As a TRAINER of POKéMON,\n" + .string "what do you think?\p" + .string "Of course, it’s not any of my business.\p" + .string "It would be nice if we were to meet\n" + .string "again somewhere.$" + +Route118_Text_1F427B: @ 81F427B + .string "Hmm!\n" + .string "A GOOD ROD is really good!\p" + .string "Wouldn’t you agree?$" + +Route118_Text_1F42AF: @ 81F42AF + .string "Hmm!\n" + .string "We’re of identical minds!\p" + .string "Hmm!\n" + .string "Take this GOOD ROD!$" + +Route118_Text_1F42E7: @ 81F42E7 + .string "Wherever there’s water, try your luck\n" + .string "at fishing.$" + +Route118_Text_1F4319: @ 81F4319 + .string "Don’t you like to fish?$" + +Route118_Text_1F4331: @ 81F4331 + .string "Try catching all sorts of POKéMON\n" + .string "with your GOOD ROD.$" + +Route118_Text_1F4367: @ 81F4367 + .string "Even if there isn’t a boat, you can\n" + .string "cross rivers and the sea if you have\l" + .string "a POKéMON that knows SURF.\p" + .string "POKéMON can be counted on to do so\n" + .string "much!$" + +Route118_Text_1F43F4: @ 81F43F4 + .string "ROUTE 118\n" + .string "{0x7B} MAUVILLE CITY$" + +Route118_Text_1F440E: @ 81F440E + .string "ROUTE 118\n" + .string "{0x79} ROUTE 119$" + diff --git a/data/maps/Route119/events.inc b/data/maps/Route119/events.inc new file mode 100644 index 000000000..bd10dc05b --- /dev/null +++ b/data/maps/Route119/events.inc @@ -0,0 +1,99 @@ +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 + +Route119_MapWarps: @ 852B174 + 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 + 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 + +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 + +Route119_MapEvents:: @ 852B3E4 + map_events Route119_EventObjects, Route119_MapWarps, Route119_MapCoordEvents, Route119_MapBGEvents + diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc new file mode 100644 index 000000000..a4b6a5fb1 --- /dev/null +++ b/data/maps/Route119/scripts.inc @@ -0,0 +1,637 @@ +Route119_MapScripts:: @ 81F4424 + map_script 5, Route119_MapScript1_1F442F + map_script 3, Route119_MapScript1_1F444D + .byte 0 + +Route119_MapScript1_1F442F: @ 81F442F + checkflag FLAG_SYS_CTRL_OBJ_DELETE + call_if 1, Route119_EventScript_1F4439 + end + +Route119_EventScript_1F4439:: @ 81F4439 + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 7 + goto_if 5, Route119_EventScript_27374E + removeobject VAR_LAST_TALKED + return + +Route119_MapScript1_1F444D: @ 81F444D + call Route119_EventScript_271ED7 + call Route119_EventScript_271EFB + compare VAR_WEATHER_INSTITUTE_STATE, 1 + call_if 1, Route119_EventScript_1F4466 + special SetRoute119Weather + end + +Route119_EventScript_1F4466:: @ 81F4466 + setflag FLAG_0x37D + clearflag FLAG_0x37C + setvar VAR_WEATHER_INSTITUTE_STATE, 2 + return + +Route119_EventScript_1F4472:: @ 81F4472 + setvar VAR_TEMP_1, 1 + goto Route119_EventScript_1F4488 + end + +Route119_EventScript_1F447D:: @ 81F447D + setvar VAR_TEMP_1, 2 + goto Route119_EventScript_1F4488 + end + +Route119_EventScript_1F4488:: @ 81F4488 + lockall + addobject 25 + checkplayergender + compare VAR_RESULT, 0 + call_if 1, Route119_EventScript_1F4501 + compare VAR_RESULT, 1 + call_if 1, Route119_EventScript_1F4506 + delay 65 + compare VAR_TEMP_1, 1 + call_if 1, Route119_EventScript_1F46C6 + compare VAR_TEMP_1, 2 + call_if 1, Route119_EventScript_1F46D1 + applymovement 255, Route119_Movement_2725AA + waitmovement 0 + delay 30 + compare VAR_TEMP_1, 1 + call_if 1, Route119_EventScript_1F4700 + compare VAR_TEMP_1, 2 + call_if 1, Route119_EventScript_1F470F + removeobject 25 + addobject 16 + delay 30 + checkplayergender + compare VAR_RESULT, 0 + goto_eq Route119_EventScript_1F450B + compare VAR_RESULT, 1 + goto_eq Route119_EventScript_1F4585 + releaseall + end + +Route119_EventScript_1F4501:: @ 81F4501 + playbgm MUS_GIRL_SUP, 1 + return + +Route119_EventScript_1F4506:: @ 81F4506 + playbgm MUS_BOY_SUP, 1 + return + +Route119_EventScript_1F450B:: @ 81F450B + msgbox Route119_Text_1F49FD, 4 + switch VAR_FIRST_POKE + case 0, Route119_EventScript_1F453A + case 1, Route119_EventScript_1F454A + case 2, Route119_EventScript_1F455A + end + +Route119_EventScript_1F453A:: @ 81F453A + trainerbattle 3, TRAINER_MAY_6, 0, Route119_Text_1F4A98 + goto Route119_EventScript_1F456A + end + +Route119_EventScript_1F454A:: @ 81F454A + trainerbattle 3, TRAINER_MAY_9, 0, Route119_Text_1F4A98 + goto Route119_EventScript_1F456A + end + +Route119_EventScript_1F455A:: @ 81F455A + trainerbattle 3, TRAINER_MAY_3, 0, Route119_Text_1F4A98 + goto Route119_EventScript_1F456A + end + +Route119_EventScript_1F456A:: @ 81F456A + msgbox Route119_Text_1F4AF3, 4 + call Route119_EventScript_1F45FF + msgbox Route119_Text_1F4B56, 4 + goto Route119_EventScript_1F460F + end + +Route119_EventScript_1F4585:: @ 81F4585 + msgbox Route119_Text_1F4C9A, 4 + switch VAR_FIRST_POKE + case 0, Route119_EventScript_1F45B4 + case 1, Route119_EventScript_1F45C4 + case 2, Route119_EventScript_1F45D4 + end + +Route119_EventScript_1F45B4:: @ 81F45B4 + trainerbattle 3, TRAINER_BRENDAN_6, 0, Route119_Text_1F4D24 + goto Route119_EventScript_1F45E4 + end + +Route119_EventScript_1F45C4:: @ 81F45C4 + trainerbattle 3, TRAINER_BRENDAN_9, 0, Route119_Text_1F4D24 + goto Route119_EventScript_1F45E4 + end + +Route119_EventScript_1F45D4:: @ 81F45D4 + trainerbattle 3, TRAINER_BRENDAN_3, 0, Route119_Text_1F4D24 + goto Route119_EventScript_1F45E4 + end + +Route119_EventScript_1F45E4:: @ 81F45E4 + msgbox Route119_Text_1F4D4B, 4 + call Route119_EventScript_1F45FF + msgbox Route119_Text_1F4DB5, 4 + goto Route119_EventScript_1F460F + end + +Route119_EventScript_1F45FF:: @ 81F45FF + giveitem_std ITEM_HM02 + setflag FLAG_0x06E + return + +Route119_EventScript_1F460F:: @ 81F460F + closemessage + compare VAR_TEMP_1, 1 + call_if 1, Route119_EventScript_1F4700 + compare VAR_TEMP_1, 2 + call_if 1, Route119_EventScript_1F470F + removeobject 16 + addobject 25 + delay 30 + compare VAR_TEMP_1, 1 + call_if 1, Route119_EventScript_1F46DC + compare VAR_TEMP_1, 2 + call_if 1, Route119_EventScript_1F46EE + removeobject 25 + setvar VAR_0x4072, 1 + savebgm MUS_DUMMY + fadedefaultbgm + delay 60 + compare VAR_TEMP_1, 1 + call_if 1, Route119_EventScript_1F46A0 + compare VAR_TEMP_1, 2 + call_if 1, Route119_EventScript_1F46A8 + addobject 43 + applymovement 43, Route119_Movement_1F4752 + waitmovement 0 + addvar VAR_0x40D1, 1 + msgbox Route119_Text_1F4E60, 4 + closemessage + compare VAR_TEMP_1, 1 + call_if 1, Route119_EventScript_1F46B0 + compare VAR_TEMP_1, 2 + call_if 1, Route119_EventScript_1F46BB + removeobject 43 + releaseall + end + +Route119_EventScript_1F46A0:: @ 81F46A0 + setobjectxyperm 43, 27, 25 + return + +Route119_EventScript_1F46A8:: @ 81F46A8 + setobjectxyperm 43, 28, 25 + return + +Route119_EventScript_1F46B0:: @ 81F46B0 + applymovement 43, Route119_Movement_1F475A + waitmovement 0 + return + +Route119_EventScript_1F46BB:: @ 81F46BB + applymovement 43, Route119_Movement_1F4763 + waitmovement 0 + return + +Route119_EventScript_1F46C6:: @ 81F46C6 + applymovement 25, Route119_Movement_1F4728 + waitmovement 0 + return + +Route119_EventScript_1F46D1:: @ 81F46D1 + applymovement 25, Route119_Movement_1F4732 + waitmovement 0 + return + +Route119_EventScript_1F46DC:: @ 81F46DC + applymovement 255, Route119_Movement_1F471E + applymovement 25, Route119_Movement_1F473D + waitmovement 0 + return + +Route119_EventScript_1F46EE:: @ 81F46EE + applymovement 255, Route119_Movement_1F4723 + applymovement 25, Route119_Movement_1F4747 + waitmovement 0 + return + +Route119_EventScript_1F4700:: @ 81F4700 + setobjectxyperm 16, 25, 32 + setobjectxyperm 25, 25, 32 + return + +Route119_EventScript_1F470F:: @ 81F470F + setobjectxyperm 16, 26, 32 + setobjectxyperm 25, 26, 32 + return + +Route119_Movement_1F471E: @ 81F471E + delay_16 + walk_in_place_fastest_right + delay_8 + walk_in_place_fastest_up + step_end + +Route119_Movement_1F4723: @ 81F4723 + delay_16 + walk_in_place_fastest_left + delay_8 + walk_in_place_fastest_up + step_end + +Route119_Movement_1F4728: @ 81F4728 + 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 + 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 + 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 + 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 + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_down + step_end + +Route119_Movement_1F475A: @ 81F475A + walk_up + walk_right + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + step_end + +Route119_Movement_1F4763: @ 81F4763 + walk_up + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + step_end + +Route119_EventScript_1F476B:: @ 81F476B + msgbox Route119_Text_1F5261, 2 + end + +Route119_EventScript_1F4774:: @ 81F4774 + msgbox Route119_Text_1F530E, 3 + end + +Route119_EventScript_1F477D:: @ 81F477D + msgbox Route119_Text_1F5327, 3 + end + +Route119_EventScript_1F4786:: @ 81F4786 + trainerbattle 0, TRAINER_BRENT, 0, Route119_Text_29D8C2, Route119_Text_29D8F0 + msgbox Route119_Text_29D902, 6 + end + +Route119_EventScript_1F479D:: @ 81F479D + trainerbattle 0, TRAINER_DONALD, 0, Route119_Text_29D941, Route119_Text_29D97C + msgbox Route119_Text_29D993, 6 + end + +Route119_EventScript_1F47B4:: @ 81F47B4 + trainerbattle 0, TRAINER_TAYLOR, 0, Route119_Text_29D9CD, Route119_Text_29DA14 + msgbox Route119_Text_29DA2C, 6 + end + +Route119_EventScript_1F47CB:: @ 81F47CB + trainerbattle 0, TRAINER_DOUG, 0, Route119_Text_29DA7D, Route119_Text_29DABC + msgbox Route119_Text_29DADB, 6 + end + +Route119_EventScript_1F47E2:: @ 81F47E2 + trainerbattle 0, TRAINER_GREG, 0, Route119_Text_29DB17, Route119_Text_29DB66 + msgbox Route119_Text_29DB7C, 6 + end + +Route119_EventScript_1F47F9:: @ 81F47F9 + trainerbattle 0, TRAINER_KENT, 0, Route119_Text_29DBC2, Route119_Text_29DC20 + msgbox Route119_Text_29DC2B, 6 + end + +Route119_EventScript_1F4810:: @ 81F4810 + trainerbattle 2, TRAINER_JACKSON_1, 0, Route119_Text_29DC4C, Route119_Text_29DC9F, Route119_EventScript_1F483C + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route119_EventScript_1F485B + msgbox Route119_Text_29DCC6, 4 + release + end + +Route119_EventScript_1F483C:: @ 81F483C + special sub_80B4808 + waitmovement 0 + msgbox Route119_Text_29DD1C, 4 + setvar VAR_0x8004, 552 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 552 + callstd 8 + release + end + +Route119_EventScript_1F485B:: @ 81F485B + trainerbattle 5, TRAINER_JACKSON_1, 0, Route119_Text_29DD62, Route119_Text_29DDA5 + msgbox Route119_Text_29DDBD, 6 + end + +Route119_EventScript_1F4872:: @ 81F4872 + trainerbattle 2, TRAINER_CATHERINE_1, 0, Route119_Text_29DE0F, Route119_Text_29DE5D, Route119_EventScript_1F489E + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route119_EventScript_1F48BD + msgbox Route119_Text_29DE88, 4 + release + end + +Route119_EventScript_1F489E:: @ 81F489E + special sub_80B4808 + waitmovement 0 + msgbox Route119_Text_29DEF7, 4 + setvar VAR_0x8004, 559 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 559 + callstd 8 + release + end + +Route119_EventScript_1F48BD:: @ 81F48BD + trainerbattle 5, TRAINER_CATHERINE_1, 0, Route119_Text_29DF6B, Route119_Text_29DF92 + msgbox Route119_Text_29DFAF, 6 + end + +Route119_EventScript_1F48D4:: @ 81F48D4 + trainerbattle 0, TRAINER_HUGH, 0, Route119_Text_29E007, Route119_Text_29E063 + msgbox Route119_Text_29E071, 6 + end + +Route119_EventScript_1F48EB:: @ 81F48EB + trainerbattle 0, TRAINER_PHIL, 0, Route119_Text_29E0A5, Route119_Text_29E0E1 + msgbox Route119_Text_29E0F6, 6 + end + +Route119_EventScript_1F4902:: @ 81F4902 + trainerbattle 0, TRAINER_YASU, 0, Route119_Text_29E134, Route119_Text_29E18D + msgbox Route119_Text_29E19D, 6 + end + +Route119_EventScript_1F4919:: @ 81F4919 + trainerbattle 0, TRAINER_TAKASHI, 0, Route119_Text_29E1F5, Route119_Text_29E22B + msgbox Route119_Text_29E245, 6 + end + +Route119_EventScript_1F4930:: @ 81F4930 + trainerbattle 0, TRAINER_HIDEO, 0, Route119_Text_29E26A, Route119_Text_29E288 + msgbox Route119_Text_29E2A3, 6 + end + +Route119_EventScript_1F4947:: @ 81F4947 + trainerbattle 0, TRAINER_CHRIS, 0, Route119_Text_29E30D, Route119_Text_29E372 + msgbox Route119_Text_29E3A2, 6 + end + +Route119_EventScript_1F495E:: @ 81F495E + trainerbattle 0, TRAINER_FABIAN, 0, Route119_Text_29E3FF, Route119_Text_29E44F + msgbox Route119_Text_29E492, 6 + end + +Route119_EventScript_1F4975:: @ 81F4975 + trainerbattle 0, TRAINER_DAYTON, 0, Route119_Text_29E4DF, Route119_Text_29E513 + msgbox Route119_Text_29E532, 6 + end + +Route119_EventScript_1F498C:: @ 81F498C + trainerbattle 0, TRAINER_RACHEL, 0, Route119_Text_29E56F, Route119_Text_29E5B1 + msgbox Route119_Text_29E5CB, 6 + end + +Route119_EventScript_1F49A3:: @ 81F49A3 + lock + faceplayer + msgbox Route119_Text_1F50EB, 4 + closemessage + applymovement VAR_LAST_TALKED, Route119_Movement_2725A2 + waitmovement 0 + release + end + +Route119_EventScript_1F49BA:: @ 81F49BA + lock + faceplayer + msgbox Route119_Text_1F5147, 4 + closemessage + applymovement VAR_LAST_TALKED, Route119_Movement_2725A2 + waitmovement 0 + release + end + +Route119_EventScript_1F49D1:: @ 81F49D1 + msgbox Route119_Text_1F51A2, 2 + end + +Route119_EventScript_1F49DA:: @ 81F49DA + msgbox Route119_Text_1F52B9, 2 + end + +Route119_EventScript_1F49E3:: @ 81F49E3 + msgbox Route119_Text_1F5339, 3 + end + +Route119_EventScript_1F49EC:: @ 81F49EC + lockall + pokenavcall Route119_Text_1F4FBA + waitmessage + clearflag FLAG_0x08A + addvar VAR_0x40D1, 1 + releaseall + end + +Route119_Text_1F49FD: @ 81F49FD + .string "MAY: {PLAYER}{KUN}!\n" + .string "Where were you? I was looking for you!\p" + .string "How much stronger have you gotten?\n" + .string "Let me check for you!\p" + .string "Ready with your POKéMON?\n" + .string "Of course you are! Go!$" + +Route119_Text_1F4A98: @ 81F4A98 + .string "Achah!\n" + .string "{PLAYER}{KUN}, you’re strong!\p" + .string "I was worried that you might be\n" + .string "struggling with your training.$" + +Route119_Text_1F4AF3: @ 81F4AF3 + .string "MAY: But I had absolutely nothing to\n" + .string "worry about! Keep it up!\p" + .string "And, here! I have a present for you.$" + +Route119_Text_1F4B56: @ 81F4B56 + .string "MAY: Use FLY, and your POKéMON will\n" + .string "instantly carry you to any town you’ve\l" + .string "already visited.\p" + .string "But, to use FLY, you have to get\n" + .string "the GYM BADGE from FORTREE CITY.\l" + .string "That’s important, so don’t forget.\p" + .string "You should FLY home and visit\n" + .string "LITTLEROOT for a change.\p" + .string "I bet your mom’s worried about you,\n" + .string "{PLAYER}{KUN}.\p" + .string "Well, let’s meet again somewhere!$" + +Route119_Text_1F4C9A: @ 81F4C9A + .string "BRENDAN: {PLAYER}! So this is where\n" + .string "you’ve been looking for POKéMON?\p" + .string "Let me see how good you got.\n" + .string "I’ll test you!\p" + .string "Now!\n" + .string "It’s a battle, so battle!$" + +Route119_Text_1F4D24: @ 81F4D24 + .string "Hmm…\n" + .string "You’ve gotten pretty darn decent.$" + +Route119_Text_1F4D4B: @ 81F4D4B + .string "BRENDAN: I’d say you’re good enough\n" + .string "to search for POKéMON anywhere.\p" + .string "Here, I’ll give you this.\n" + .string "Try it out.$" + +Route119_Text_1F4DB5: @ 81F4DB5 + .string "BRENDAN: Use FLY, and your POKéMON\n" + .string "instantly carries you to any town\l" + .string "you’ve already visited.\p" + .string "But you need the FORTREE GYM BADGE \n" + .string "to do that.\p" + .string "Anyway, I have to move along.$" + +Route119_Text_1F4E60: @ 81F4E60 + .string "SCOTT: Hahahah!\n" + .string "Way to go, {PLAYER}{KUN}!\p" + .string "I just passed by a TRAINER riding\n" + .string "a BIKE.\p" + .string "You just beat that TRAINER, didn’t you?\n" + .string "It was pretty obvious that you did.\p" + .string "The kid looked really upset with\n" + .string "a face all red from anger.\p" + .string "I sure seem to run into you often.\n" + .string "Are you off to FORTREE GYM next?\p" + .string "I expect that you’ll do well at the GYM.\n" + .string "Well, I’ll be seeing you!$" + + +Route119_Text_1F4FBA: @ 81F4FBA + .string "… … … … … …\n" + .string "… … … … … Beep!\p" + .string "SCOTT: Hiya, {PLAYER}{KUN}, it’s me!\p" + .string "Just as I thought, you won at\n" + .string "the FORTREE GYM.\p" + .string "Your strength…\n" + .string "Perhaps you really are the TRAINER\l" + .string "that I’ve been searching for.\p" + .string "Remember, you have a fan in me.\n" + .string "I’ll be cheering from the sidelines.\l" + .string "Keep up the great work!\p" + .string "… … … … … …\n" + .string "… … … … … Click!$" + +Route119_Text_1F50EB: @ 81F50EB + .string "We’re standing lookout here.\p" + .string "Hey, you! Stay away from the WEATHER\n" + .string "INSTITUTE. It’s not safe.$" + +Route119_Text_1F5147: @ 81F5147 + .string "Lookout duty is surprisingly boring.\p" + .string "Hey, you! Please don’t go near the\n" + .string "WEATHER INSTITUTE.$" + +Route119_Text_1F51A2: @ 81F51A2 + .string "I thought you FLY by catching a whole\n" + .string "flock of BIRD POKéMON, and then\l" + .string "hanging on to them somehow.\p" + .string "But it turns out there’s an HM move\n" + .string "called FLY!\p" + .string "I wish I’d known about that a long\n" + .string "time ago…$" + +Route119_Text_1F5261: @ 81F5261 + .string "Tch…\n" + .string "It’s a no-go…\p" + .string "The tall grass snares BIKE tires.\n" + .string "There’s no way you can cycle here.$" + +Route119_Text_1F52B9: @ 81F52B9 + .string "Can your POKéMON use its SECRET POWER\n" + .string "on a big pile of grass and make a\l" + .string "SECRET BASE?$" + +Route119_Text_1F530E: @ 81F530E + .string "ROUTE 119\n" + .string "{0x7C} FORTREE CITY$" + +Route119_Text_1F5327: @ 81F5327 + .string "WEATHER INSTITUTE$" + +Route119_Text_1F5339: @ 81F5339 + .string "TRAINER TIPS\p" + .string "Up to sixteen decorations and\n" + .string "furniture items can be placed in\l" + .string "a SECRET BASE.\p" + .string "Pick your favorite items and create\n" + .string "your very own SECRET BASE exactly the\l" + .string "way you want.$" diff --git a/data/maps/Route119_House/events.inc b/data/maps/Route119_House/events.inc new file mode 100644 index 000000000..05d426fe5 --- /dev/null +++ b/data/maps/Route119_House/events.inc @@ -0,0 +1,16 @@ +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 + +Route119_House_MapWarps: @ 853ED78 + 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/Route119_House/scripts.inc b/data/maps/Route119_House/scripts.inc new file mode 100644 index 000000000..5e633437d --- /dev/null +++ b/data/maps/Route119_House/scripts.inc @@ -0,0 +1,27 @@ +Route119_House_MapScripts:: @ 8270965 + .byte 0 + +Route119_House_EventScript_270966:: @ 8270966 + msgbox Route119_House_Text_270982, 2 + end + +Route119_House_EventScript_27096F:: @ 827096F + lock + faceplayer + waitse + playmoncry SPECIES_WINGULL, 0 + msgbox Route119_House_Text_270A17, 4 + waitmoncry + release + end + +Route119_House_Text_270982: @ 8270982 + .string "I heard about a cave called the CAVE\n" + .string "OF ORIGIN.\p" + .string "People rumor that the spirits of\n" + .string "POKéMON are revived there. Could\l" + .string "something like that really happen?$" + +Route119_House_Text_270A17: @ 8270A17 + .string "WINGULL: Pihyoh!$" + diff --git a/data/maps/Route119_WeatherInstitute_1F/events.inc b/data/maps/Route119_WeatherInstitute_1F/events.inc new file mode 100644 index 000000000..ee9f42ac5 --- /dev/null +++ b/data/maps/Route119_WeatherInstitute_1F/events.inc @@ -0,0 +1,21 @@ +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 + +Route119_WeatherInstitute_1F_MapWarps: @ 853EB98 + 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 + 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 + +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/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc new file mode 100644 index 000000000..b008f52c0 --- /dev/null +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -0,0 +1,139 @@ +Route119_WeatherInstitute_1F_MapScripts:: @ 826FA86 + map_script 3, Route119_WeatherInstitute_1F_MapScript1_26FA8C + .byte 0 + +Route119_WeatherInstitute_1F_MapScript1_26FA8C: @ 826FA8C + compare VAR_WEATHER_INSTITUTE_STATE, 0 + call_if 1, Route119_WeatherInstitute_1F_EventScript_26FA98 + end + +Route119_WeatherInstitute_1F_EventScript_26FA98:: @ 826FA98 + setobjectxyperm 5, 0, 5 + setobjectmovementtype 5, 10 + return + +Route119_WeatherInstitute_1F_EventScript_26FAA4:: @ 826FAA4 + lock + faceplayer + special GetPlayerBigGuyGirlString + compare VAR_WEATHER_INSTITUTE_STATE, 0 + goto_eq Route119_WeatherInstitute_1F_EventScript_26FABE + msgbox Route119_WeatherInstitute_1F_Text_26FCE5, 4 + release + end + +Route119_WeatherInstitute_1F_EventScript_26FABE:: @ 826FABE + msgbox Route119_WeatherInstitute_1F_Text_26FCB7, 4 + release + end + +Route119_WeatherInstitute_1F_EventScript_26FAC8:: @ 826FAC8 + lock + faceplayer + checkflag FLAG_SYS_GAME_CLEAR + goto_if 0, Route119_WeatherInstitute_1F_EventScript_26FB05 + setvar VAR_0x8004, 0 + checkflag FLAG_0x1BE + call_if 1, Route119_WeatherInstitute_1F_EventScript_26FAFF + checkflag FLAG_0x1BF + call_if 1, Route119_WeatherInstitute_1F_EventScript_26FAFF + compare VAR_0x8004, 2 + goto_eq Route119_WeatherInstitute_1F_EventScript_26FB05 + msgbox Route119_WeatherInstitute_1F_Text_26FDE8, 4 + release + end + +Route119_WeatherInstitute_1F_EventScript_26FAFF:: @ 826FAFF + addvar VAR_0x8004, 1 + return + +Route119_WeatherInstitute_1F_EventScript_26FB05:: @ 826FB05 + msgbox Route119_WeatherInstitute_1F_Text_26FD2E, 4 + release + end + +Route119_WeatherInstitute_1F_EventScript_26FB0F:: @ 826FB0F + msgbox Route119_WeatherInstitute_1F_Text_26FE94, 2 + end + +Route119_WeatherInstitute_1F_EventScript_26FB18:: @ 826FB18 + lockall + msgbox Route119_WeatherInstitute_1F_Text_26FEFC, 4 + closemessage + call Route119_WeatherInstitute_1F_EventScript_272083 + releaseall + end + +Route119_WeatherInstitute_1F_EventScript_26FB29:: @ 826FB29 + trainerbattle 0, TRAINER_GRUNT_11, 0, Route119_WeatherInstitute_1F_Text_26FB57, Route119_WeatherInstitute_1F_Text_26FBBB + msgbox Route119_WeatherInstitute_1F_Text_26FBD7, 6 + end + +Route119_WeatherInstitute_1F_EventScript_26FB40:: @ 826FB40 + trainerbattle 0, TRAINER_GRUNT_20, 0, Route119_WeatherInstitute_1F_Text_26FC34, Route119_WeatherInstitute_1F_Text_26FC52 + msgbox Route119_WeatherInstitute_1F_Text_26FC60, 6 + end + +Route119_WeatherInstitute_1F_Text_26FB57: @ 826FB57 + .string "The BOSS got interested in\n" + .string "the research they have going here,\l" + .string "so he sent us out.\p" + .string "You quit meddling!$" + +Route119_WeatherInstitute_1F_Text_26FBBB: @ 826FBBB + .string "Blast it…\n" + .string "Blasted by a kid…$" + +Route119_WeatherInstitute_1F_Text_26FBD7: @ 826FBD7 + .string "Our BOSS knows everything.\p" + .string "But I’m just a GRUNT. What would I know\n" + .string "about what he’s thinking?$" + +Route119_WeatherInstitute_1F_Text_26FC34: @ 826FC34 + .string "Huh?\n" + .string "What’s a kid doing here?$" + +Route119_WeatherInstitute_1F_Text_26FC52: @ 826FC52 + .string "Huh?\n" + .string "I lost?!$" + +Route119_WeatherInstitute_1F_Text_26FC60: @ 826FC60 + .string "Oh, no…\n" + .string "I’ll catch an earful for losing to a kid…\p" + .string "I should just take a nap in the bed…$" + +Route119_WeatherInstitute_1F_Text_26FCB7: @ 826FCB7 + .string "While I was sleeping, everyone went\n" + .string "upstairs!$" + +Route119_WeatherInstitute_1F_Text_26FCE5: @ 826FCE5 + .string "Wow, you’re really strong!\p" + .string "I wish I could be a POKéMON TRAINER\n" + .string "like you!$" + +Route119_WeatherInstitute_1F_Text_26FD2E: @ 826FD2E + .string "The PROFESSOR loves rain.\n" + .string "That’s a fact.\p" + .string "But if it keeps raining, people will be in\n" + .string "trouble. That’s another fact.\p" + .string "And thus, the PROFESSOR is studying\n" + .string "if the rain can be put to good use.$" + +Route119_WeatherInstitute_1F_Text_26FDE8: @ 826FDE8 + .string "On the 2nd floor of the INSTITUTE,\n" + .string "we study the weather patterns over\l" + .string "the HOENN region.\p" + .string "We’ve been noticing temporary and\n" + .string "isolated cases of droughts and\l" + .string "heavy rain lately…$" + +Route119_WeatherInstitute_1F_Text_26FE94: @ 826FE94 + .string "Hello!\n" + .string "We’ve been saved by your actions!\p" + .string "What I don’t understand is what on\n" + .string "earth the AQUAS were up to.$" + +Route119_WeatherInstitute_1F_Text_26FEFC: @ 826FEFC + .string "There’s a bed…\n" + .string "Let’s take a rest.$" + diff --git a/data/maps/Route119_WeatherInstitute_2F/events.inc b/data/maps/Route119_WeatherInstitute_2F/events.inc new file mode 100644 index 000000000..4196be41b --- /dev/null +++ b/data/maps/Route119_WeatherInstitute_2F/events.inc @@ -0,0 +1,16 @@ +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 + +Route119_WeatherInstitute_2F_MapWarps: @ 853ECB4 + 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/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc new file mode 100644 index 000000000..b2341bf3d --- /dev/null +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -0,0 +1,339 @@ +Route119_WeatherInstitute_2F_MapScripts:: @ 826FF1E + map_script 3, Route119_WeatherInstitute_2F_MapScript1_26FF24 + .byte 0 + +Route119_WeatherInstitute_2F_MapScript1_26FF24: @ 826FF24 + compare VAR_WEATHER_INSTITUTE_STATE, 0 + call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF44 + compare VAR_WEATHER_INSTITUTE_STATE, 1 + call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF50 + checkflag FLAG_SYS_GAME_CLEAR + call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF5C + end + +Route119_WeatherInstitute_2F_EventScript_26FF44:: @ 826FF44 + setobjectxyperm 5, 1, 6 + setobjectmovementtype 5, 10 + return + +Route119_WeatherInstitute_2F_EventScript_26FF50:: @ 826FF50 + setobjectxyperm 5, 4, 6 + setobjectmovementtype 5, 10 + return + +Route119_WeatherInstitute_2F_EventScript_26FF5C:: @ 826FF5C + setobjectxyperm 5, 2, 2 + setobjectmovementtype 5, 7 + return + +Route119_WeatherInstitute_2F_EventScript_26FF68:: @ 826FF68 + trainerbattle 0, TRAINER_GRUNT_37, 0, Route119_WeatherInstitute_2F_Text_270335, Route119_WeatherInstitute_2F_Text_27039F + msgbox Route119_WeatherInstitute_2F_Text_2703C0, 6 + end + +Route119_WeatherInstitute_2F_EventScript_26FF7F:: @ 826FF7F + trainerbattle 0, TRAINER_GRUNT_12, 0, Route119_WeatherInstitute_2F_Text_27019C, Route119_WeatherInstitute_2F_Text_270208 + msgbox Route119_WeatherInstitute_2F_Text_27022B, 6 + end + +Route119_WeatherInstitute_2F_EventScript_26FF96:: @ 826FF96 + trainerbattle 0, TRAINER_GRUNT_13, 0, Route119_WeatherInstitute_2F_Text_270292, Route119_WeatherInstitute_2F_Text_2702CE + msgbox Route119_WeatherInstitute_2F_Text_2702DA, 6 + end + +Route119_WeatherInstitute_2F_EventScript_26FFAD:: @ 826FFAD + trainerbattle 2, TRAINER_SHELLY_1, 0, Route119_WeatherInstitute_2F_Text_270409, Route119_WeatherInstitute_2F_Text_2704BD, Route119_WeatherInstitute_2F_EventScript_26FFC8 + msgbox Route119_WeatherInstitute_2F_Text_2704E4, 6 + end + +Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8 + msgbox Route119_WeatherInstitute_2F_Text_2704E4, 4 + closemessage + addobject 7 + applymovement 7, Route119_WeatherInstitute_2F_Movement_270170 + applymovement 255, Route119_WeatherInstitute_2F_Movement_27017C + waitmovement 0 + msgbox Route119_WeatherInstitute_2F_Text_270568, 4 + closemessage + playse SE_PIN + applymovement 3, Route119_WeatherInstitute_2F_Movement_272598 + waitmovement 0 + applymovement 3, Route119_WeatherInstitute_2F_Movement_27259A + waitmovement 0 + msgbox Route119_WeatherInstitute_2F_Text_2705DD, 4 + closemessage + setvar VAR_WEATHER_INSTITUTE_STATE, 1 + clearflag FLAG_0x37D + fadedefaultbgm + fadescreen 1 + setflag FLAG_0x37A + setflag FLAG_0x3E0 + removeobject 1 + removeobject 2 + removeobject 3 + removeobject 8 + removeobject 7 + applymovement 255, Route119_WeatherInstitute_2F_Movement_270184 + waitmovement 0 + fadescreen 0 + applymovement 5, Route119_WeatherInstitute_2F_Movement_270187 + waitmovement 0 + moveobjectoffscreen 5 + goto Route119_WeatherInstitute_2F_EventScript_27004D + end + +Route119_WeatherInstitute_2F_EventScript_27004D:: @ 827004D + msgbox Route119_WeatherInstitute_2F_Text_270650, 4 + setvar VAR_TEMP_1, 385 + givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0 + compare VAR_RESULT, 0 + goto_eq Route119_WeatherInstitute_2F_EventScript_270085 + compare VAR_RESULT, 1 + goto_eq Route119_WeatherInstitute_2F_EventScript_2700AD + goto Route119_WeatherInstitute_2F_EventScript_273811 + end + +Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085 + call Route119_WeatherInstitute_2F_EventScript_2700DB + msgbox gUnknown_08273374, 5 + compare VAR_RESULT, 0 + goto_eq Route119_WeatherInstitute_2F_EventScript_2700EA + call Route119_WeatherInstitute_2F_EventScript_27378B + call Route119_WeatherInstitute_2F_EventScript_2723DD + goto Route119_WeatherInstitute_2F_EventScript_2700EA + end + +Route119_WeatherInstitute_2F_EventScript_2700AD:: @ 82700AD + call Route119_WeatherInstitute_2F_EventScript_2700DB + msgbox gUnknown_08273374, 5 + compare VAR_RESULT, 0 + goto_eq Route119_WeatherInstitute_2F_EventScript_2700D0 + call Route119_WeatherInstitute_2F_EventScript_273797 + goto Route119_WeatherInstitute_2F_EventScript_2700D0 + end + +Route119_WeatherInstitute_2F_EventScript_2700D0:: @ 82700D0 + call Route119_WeatherInstitute_2F_EventScript_2737A0 + goto Route119_WeatherInstitute_2F_EventScript_2700EA + end + +Route119_WeatherInstitute_2F_EventScript_2700DB:: @ 82700DB + playfanfare MUS_FANFA4 + message Route119_WeatherInstitute_2F_Text_2706E8 + waitmessage + waitfanfare + bufferspeciesname 0, SPECIES_CASTFORM + return + +Route119_WeatherInstitute_2F_EventScript_2700EA:: @ 82700EA + msgbox Route119_WeatherInstitute_2F_Text_2706FE, 4 + setflag FLAG_0x097 + release + end + +Route119_WeatherInstitute_2F_EventScript_2700F7:: @ 82700F7 + checkflag FLAG_SYS_GAME_CLEAR + goto_eq Route119_WeatherInstitute_2F_EventScript_27010A + msgbox Route119_WeatherInstitute_2F_Text_27077E, 4 + release + end + +Route119_WeatherInstitute_2F_EventScript_27010A:: @ 827010A + setvar VAR_0x8004, 0 + checkflag FLAG_0x1BE + call_if 1, Route119_WeatherInstitute_2F_EventScript_270160 + checkflag FLAG_0x1BF + call_if 1, Route119_WeatherInstitute_2F_EventScript_270160 + compare VAR_0x8004, 2 + goto_eq Route119_WeatherInstitute_2F_EventScript_270166 + checkflag FLAG_0x002 + call_if 0, Route119_WeatherInstitute_2F_EventScript_270159 + specialvar VAR_RESULT, sub_813B374 + compare VAR_RESULT, 1 + goto_eq Route119_WeatherInstitute_2F_EventScript_27014F + msgbox Route119_WeatherInstitute_2F_Text_2707F1, 4 + release + end + +Route119_WeatherInstitute_2F_EventScript_27014F:: @ 827014F + msgbox Route119_WeatherInstitute_2F_Text_270873, 4 + release + end + +Route119_WeatherInstitute_2F_EventScript_270159:: @ 8270159 + special sub_813B2E4 + setflag FLAG_0x002 + return + +Route119_WeatherInstitute_2F_EventScript_270160:: @ 8270160 + addvar VAR_0x8004, 1 + return + +Route119_WeatherInstitute_2F_EventScript_270166:: @ 8270166 + msgbox Route119_WeatherInstitute_2F_Text_2708FC, 4 + release + end + +Route119_WeatherInstitute_2F_Movement_270170: @ 8270170 + 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 + 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 + slide_down + walk_in_place_fastest_left + step_end + +Route119_WeatherInstitute_2F_Movement_270187: @ 8270187 + walk_right + walk_right + walk_right + step_end + +Route119_WeatherInstitute_2F_EventScript_27018B:: @ 827018B + lock + faceplayer + checkflag FLAG_0x097 + goto_eq Route119_WeatherInstitute_2F_EventScript_2700F7 + goto Route119_WeatherInstitute_2F_EventScript_27004D + end + +Route119_WeatherInstitute_2F_Text_27019C: @ 827019C + .string "The INSTITUTE created a type of\n" + .string "POKéMON that has something to do with\l" + .string "the weather. We’re here to take them!$" + +Route119_WeatherInstitute_2F_Text_270208: @ 8270208 + .string "Our plan’s being spoiled by a kid?$" + +Route119_WeatherInstitute_2F_Text_27022B: @ 827022B + .string "If the POKéMON they made here can\n" + .string "control the weather freely, then we of\l" + .string "TEAM AQUA definitely need it!$" + +Route119_WeatherInstitute_2F_Text_270292: @ 8270292 + .string "We’re TEAM AQUA!\n" + .string "We appear wherever anything rare is\l" + .string "found!$" + +Route119_WeatherInstitute_2F_Text_2702CE: @ 82702CE + .string "You got me!$" + +Route119_WeatherInstitute_2F_Text_2702DA: @ 82702DA + .string "You don’t have any idea what we of\n" + .string "TEAM AQUA are working towards!\l" + .string "You stay out of our way!$" + +Route119_WeatherInstitute_2F_Text_270335: @ 8270335 + .string "Don’t tell me you’re looking for that\n" + .string "weather POKéMON, too?\p" + .string "That’s a no-no!\n" + .string "We were here to get it first!$" + +Route119_WeatherInstitute_2F_Text_27039F: @ 827039F + .string "Oh, will you look at my POKéMON?$" + +Route119_WeatherInstitute_2F_Text_2703C0: @ 82703C0 + .string "Humph, so what?\n" + .string "What we want…\p" + .string "What we really want isn’t here…\n" + .string "Ihihihihi…$" + +Route119_WeatherInstitute_2F_Text_270409: @ 8270409 + .string "Ahahahaha!\p" + .string "You’re going to meddle in TEAM AQUA’s\n" + .string "affairs?\p" + .string "You’re either absolutely fearless,\n" + .string "simply ignorant, or both!\p" + .string "You’re so cute, you’re disgusting!\n" + .string "I’ll put you down, kiddy!$" + +Route119_WeatherInstitute_2F_Text_2704BD: @ 82704BD + .string "Ahahahaha!\n" + .string "You’re disgustingly strong!$" + +Route119_WeatherInstitute_2F_Text_2704E4: @ 82704E4 + .string "It’s bad enough to have TEAM MAGMA\n" + .string "blunder about, but now there’s you!\p" + .string "What makes you want to sniff around\n" + .string "in our business, anyway?$" + +Route119_WeatherInstitute_2F_Text_270568: @ 8270568 + .string "We have a situation here!\p" + .string "A TEAM MAGMA mob just passed\n" + .string "the WEATHER INSTITUTE.\p" + .string "They appear to be headed for\n" + .string "MT. PYRE!$" + +Route119_WeatherInstitute_2F_Text_2705DD: @ 82705DD + .string "What?!\p" + .string "We can’t waste any more time here!\n" + .string "We have to hurry to MT. PYRE, too!\p" + .string "Ahahahaha!\n" + .string "TEAM MAGMA, just you wait!$" + +Route119_WeatherInstitute_2F_Text_270650: @ 8270650 + .string "Thanks!\n" + .string "Thanks to you, we’re safe!\p" + .string "It might be an odd way of thanking you,\n" + .string "but take this POKéMON.$" + +Route119_WeatherInstitute_2F_Text_2706B2: @ 82706B2 + .string "Hm? You don’t seem to have any room\n" + .string "for this POKéMON.$" + +Route119_WeatherInstitute_2F_Text_2706E8: @ 82706E8 + .string "{PLAYER} received CASTFORM!$" + +Route119_WeatherInstitute_2F_Text_2706FE: @ 82706FE + .string "That POKéMON changes shape according\n" + .string "to the weather conditions.\p" + .string "There’re plenty of them in the\n" + .string "INSTITUTE--go ahead and take it.$" + +Route119_WeatherInstitute_2F_Text_27077E: @ 827077E + .string "I’ve been researching rain for many\n" + .string "years, but it’s ridiculous to think that\l" + .string "humans can freely change the weather.$" + +Route119_WeatherInstitute_2F_Text_2707F1: @ 82707F1 + .string "I track weather patterns over\n" + .string "the HOENN region.\p" + .string "Presently, a drought has been recorded\n" + .string "in {STR_VAR_1}.\p" + .string "Could that mean, somewhere near\n" + .string "{STR_VAR_1}…$" + +Route119_WeatherInstitute_2F_Text_270873: @ 8270873 + .string "I track weather patterns over\n" + .string "the HOENN region.\p" + .string "Presently, heavy rainfall has been\n" + .string "recorded over {STR_VAR_1}.\p" + .string "Could that mean, somewhere near\n" + .string "{STR_VAR_1}…$" + +Route119_WeatherInstitute_2F_Text_2708FC: @ 82708FC + .string "Abnormal weather conditions are\n" + .string "no longer being reported.\p" + .string "The occasional rainfall is a blessing,\n" + .string "really.$" + diff --git a/data/maps/Route120/events.inc b/data/maps/Route120/events.inc new file mode 100644 index 000000000..a19a70f33 --- /dev/null +++ b/data/maps/Route120/events.inc @@ -0,0 +1,90 @@ +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 + +Route120_MapWarps: @ 852B818 + 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 + 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 + +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 + +Route120_MapEvents:: @ 852BA00 + map_events Route120_EventObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents + diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc new file mode 100644 index 000000000..7d6876aeb --- /dev/null +++ b/data/maps/Route120/scripts.inc @@ -0,0 +1,466 @@ +Route120_MapScripts:: @ 81F53EC + map_script 5, Route120_MapScript1_1F53FC + map_script 3, Route120_MapScript1_1F54CD + map_script 1, Route120_MapScript1_1F5474 + .byte 0 + +Route120_MapScript1_1F53FC: @ 81F53FC + checkflag FLAG_SYS_CTRL_OBJ_DELETE + call_if 1, Route120_EventScript_1F5406 + end + +Route120_EventScript_1F5406:: @ 81F5406 + compare VAR_0x8009, 0 + call_if 1, Route120_EventScript_1F5449 + compare VAR_0x8009, 1 + call_if 1, Route120_EventScript_1F5460 + compare VAR_0x8009, 2 + call_if 1, Route120_EventScript_1F5460 + compare VAR_0x8009, 3 + call_if 1, Route120_EventScript_1F5460 + compare VAR_0x8009, 4 + call_if 1, Route120_EventScript_1F5460 + compare VAR_0x8009, 5 + call_if 1, Route120_EventScript_1F5460 + return + +Route120_EventScript_1F5449:: @ 81F5449 + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 7 + goto_if 5, Route120_EventScript_27374E + removeobject 30 + removeobject 36 + return + +Route120_EventScript_1F5460:: @ 81F5460 + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 7 + goto_if 5, Route120_EventScript_27374E + removeobject VAR_LAST_TALKED + return + +Route120_MapScript1_1F5474: @ 81F5474 + checkflag FLAG_0x0E4 + call_if 0, Route120_EventScript_1F5490 + checkflag FLAG_0x11D + call_if 1, Route120_EventScript_1F54A3 + checkflag FLAG_0x11D + call_if 0, Route120_EventScript_1F54C8 + end + +Route120_EventScript_1F5490:: @ 81F5490 + setmetatile 7, 54, 124, 1 + setmetatile 7, 55, 145, 1 + return + +Route120_EventScript_1F54A3:: @ 81F54A3 + setmetatile 13, 15, 663, 0 + setmetatile 12, 16, 671, 0 + setmetatile 12, 17, 161, 0 + setmetatile 13, 17, 161, 0 + return + +Route120_EventScript_1F54C8:: @ 81F54C8 + setobjectmovementtype 36, 10 + return + +Route120_MapScript1_1F54CD: @ 81F54CD + call Route120_EventScript_28CCC7 + call Route120_EventScript_1F54D8 + end + +Route120_EventScript_1F54D8:: @ 81F54D8 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_1, 14 + goto_if 3, Route120_EventScript_1F5503 + compare VAR_TEMP_1, 60 + goto_if 3, Route120_EventScript_1F5507 + compare VAR_TEMP_1, 61 + goto_if 4, Route120_EventScript_1F54FF + return + +Route120_EventScript_1F54FF:: @ 81F54FF + setweather 1 + return + +Route120_EventScript_1F5503:: @ 81F5503 + setweather 2 + return + +Route120_EventScript_1F5507:: @ 81F5507 + compare VAR_TEMP_0, 7 + goto_if 3, Route120_EventScript_1F5523 + compare VAR_TEMP_0, 19 + goto_if 3, Route120_EventScript_1F5503 + goto Route120_EventScript_1F5523 + end + +Route120_EventScript_1F5523:: @ 81F5523 + setweather 3 + return + +Route120_EventScript_1F5527:: @ 81F5527 + lock + faceplayer + dodailyevents + checkflag FLAG_0x92E + goto_eq Route120_EventScript_1F5625 + msgbox Route120_Text_2A70C7, 5 + compare VAR_RESULT, 1 + call_if 1, Route120_EventScript_1F562F + compare VAR_RESULT, 0 + call_if 1, Route120_EventScript_1F5638 + specialvar VAR_RESULT, GetPlayerTrainerIdOnesDigit + switch VAR_RESULT + case 0, Route120_EventScript_1F55CA + case 5, Route120_EventScript_1F55CA + case 1, Route120_EventScript_1F55D5 + case 6, Route120_EventScript_1F55D5 + case 2, Route120_EventScript_1F55E0 + case 7, Route120_EventScript_1F55E0 + case 3, Route120_EventScript_1F55EB + case 8, Route120_EventScript_1F55EB + case 4, Route120_EventScript_1F55F6 + case 9, Route120_EventScript_1F55F6 + end + +Route120_EventScript_1F55CA:: @ 81F55CA + setvar VAR_0x8004, 143 + goto Route120_EventScript_1F5601 + end + +Route120_EventScript_1F55D5:: @ 81F55D5 + setvar VAR_0x8004, 144 + goto Route120_EventScript_1F5601 + end + +Route120_EventScript_1F55E0:: @ 81F55E0 + setvar VAR_0x8004, 145 + goto Route120_EventScript_1F5601 + end + +Route120_EventScript_1F55EB:: @ 81F55EB + setvar VAR_0x8004, 146 + goto Route120_EventScript_1F5601 + end + +Route120_EventScript_1F55F6:: @ 81F55F6 + setvar VAR_0x8004, 147 + goto Route120_EventScript_1F5601 + end + +Route120_EventScript_1F5601:: @ 81F5601 + giveitem_std VAR_0x8004 + compare VAR_RESULT, 0 + goto_eq Route120_EventScript_272054 + setflag FLAG_0x92E + msgbox Route120_Text_2A71D5, 4 + release + end + +Route120_EventScript_1F5625:: @ 81F5625 + msgbox Route120_Text_2A7217, 4 + release + end + +Route120_EventScript_1F562F:: @ 81F562F + msgbox Route120_Text_2A7147, 4 + return + +Route120_EventScript_1F5638:: @ 81F5638 + msgbox Route120_Text_2A7183, 4 + return + +Route120_EventScript_1F5641:: @ 81F5641 + lock + faceplayer + checkflag FLAG_0x122 + goto_eq Route120_EventScript_1F5672 + msgbox Route120_Text_1F5998, 5 + compare VAR_RESULT, 0 + goto_eq Route120_EventScript_1F5665 + goto Route120_EventScript_1F568B + end + +Route120_EventScript_1F5665:: @ 81F5665 + msgbox Route120_Text_1F5AAC, 4 + setflag FLAG_0x122 + release + end + +Route120_EventScript_1F5672:: @ 81F5672 + msgbox Route120_Text_1F5ADE, 5 + compare VAR_RESULT, 0 + goto_eq Route120_EventScript_1F5665 + goto Route120_EventScript_1F568B + end + +Route120_EventScript_1F568B:: @ 81F568B + msgbox Route120_Text_1F5B0F, 4 + closemessage + compare VAR_FACING, 2 + call_if 1, Route120_EventScript_1F57A3 + compare VAR_FACING, 3 + call_if 1, Route120_EventScript_1F57AE + applymovement 31, Route120_Movement_2725A4 + waitmovement 0 + delay 20 + msgbox Route120_Text_1F5B43, 4 + closemessage + applymovement 30, Route120_Movement_2725A8 + waitmovement 0 + applymovement 30, Route120_Movement_2723C7 + waitmovement 0 + waitse + playmoncry SPECIES_KECLEON, 2 + delay 40 + waitmoncry + setwildbattle SPECIES_KECLEON, 30, ITEM_NONE + setvar VAR_0x8009, 0 + setflag FLAG_SYS_CTRL_OBJ_DELETE + dowildbattle + clearflag FLAG_SYS_CTRL_OBJ_DELETE + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 1 + goto_eq Route120_EventScript_1F571C + compare VAR_RESULT, 4 + goto_eq Route120_EventScript_1F571C + compare VAR_RESULT, 5 + goto_eq Route120_EventScript_1F571C + goto Route120_EventScript_1F572C + end + +Route120_EventScript_1F571C:: @ 81F571C + fadescreenswapbuffers 1 + removeobject 30 + removeobject 36 + fadescreenswapbuffers 0 + goto Route120_EventScript_1F572C + end + +Route120_EventScript_1F572C:: @ 81F572C + applymovement 31, Route120_Movement_2725AA + applymovement 255, Route120_Movement_2725A6 + waitmovement 0 + msgbox Route120_Text_1F5BAF, 4 + giveitem_std ITEM_DEVON_SCOPE + setflag FLAG_0x11D + msgbox Route120_Text_1F5C7B, 4 + closemessage + applymovement 31, Route120_Movement_2725AA + waitmovement 0 + delay 50 + setfieldeffectargument 0, 1 + dofieldeffect 30 + delay 15 + removeobject 31 + waitfieldeffect 30 + setmetatile 13, 15, 663, 0 + setmetatile 12, 16, 671, 0 + setmetatile 12, 17, 161, 0 + setmetatile 13, 17, 161, 0 + special DrawWholeMapView + release + end + +Route120_EventScript_1F57A3:: @ 81F57A3 + applymovement 255, Route120_Movement_2725A4 + waitmovement 0 + return + +Route120_EventScript_1F57AE:: @ 81F57AE + applymovement 255, Route120_Movement_1F57B9 + waitmovement 0 + return + +Route120_Movement_1F57B9: @ 81F57B9 + walk_down + walk_left + step_end + +Route120_EventScript_1F57BC:: @ 81F57BC + msgbox Route120_Text_1F5D00, 2 + end + +Route120_EventScript_1F57C5:: @ 81F57C5 + msgbox Route120_Text_1F5DCB, 3 + end + +Route120_EventScript_1F57CE:: @ 81F57CE + msgbox Route120_Text_1F5DE4, 3 + end + +Route120_EventScript_1F57D7:: @ 81F57D7 + trainerbattle 0, TRAINER_COLIN, 0, Route120_Text_29E62D, Route120_Text_29E665 + msgbox Route120_Text_29E67A, 6 + end + +Route120_EventScript_1F57EE:: @ 81F57EE + trainerbattle 2, TRAINER_ROBERT_1, 0, Route120_Text_29E6E3, Route120_Text_29E70A, Route120_EventScript_1F581A + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route120_EventScript_1F5839 + msgbox Route120_Text_29E726, 4 + release + end + +Route120_EventScript_1F581A:: @ 81F581A + special sub_80B4808 + waitmovement 0 + msgbox Route120_Text_29E75D, 4 + setvar VAR_0x8004, 406 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 406 + callstd 8 + release + end + +Route120_EventScript_1F5839:: @ 81F5839 + trainerbattle 5, TRAINER_ROBERT_1, 0, Route120_Text_29E7AA, Route120_Text_29E7E1 + msgbox Route120_Text_29E804, 6 + end + +Route120_EventScript_1F5850:: @ 81F5850 + trainerbattle 0, TRAINER_LORENZO, 0, Route120_Text_29E843, Route120_Text_29E884 + msgbox Route120_Text_29E8C5, 6 + end + +Route120_EventScript_1F5867:: @ 81F5867 + trainerbattle 0, TRAINER_JENNA, 0, Route120_Text_29E91C, Route120_Text_29E980 + msgbox Route120_Text_29E996, 6 + end + +Route120_EventScript_1F587E:: @ 81F587E + trainerbattle 2, TRAINER_JEFFREY_1, 0, Route120_Text_29E9D7, Route120_Text_29E9FF, Route120_EventScript_1F58AA + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route120_EventScript_1F58C9 + msgbox Route120_Text_29EA08, 4 + release + end + +Route120_EventScript_1F58AA:: @ 81F58AA + special sub_80B4808 + waitmovement 0 + msgbox Route120_Text_29EA31, 4 + setvar VAR_0x8004, 226 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 226 + callstd 8 + release + end + +Route120_EventScript_1F58C9:: @ 81F58C9 + trainerbattle 5, TRAINER_JEFFREY_1, 0, Route120_Text_29EA61, Route120_Text_29EA8F + msgbox Route120_Text_29EAA9, 6 + end + +Route120_EventScript_1F58E0:: @ 81F58E0 + trainerbattle 0, TRAINER_JENNIFER, 0, Route120_Text_29EAEF, Route120_Text_29EB53 + msgbox Route120_Text_29EB6E, 6 + end + +Route120_EventScript_1F58F7:: @ 81F58F7 + trainerbattle 0, TRAINER_CHIP, 0, Route120_Text_29EBAF, Route120_Text_29EC25 + msgbox Route120_Text_29EC41, 6 + end + +Route120_EventScript_1F590E:: @ 81F590E + trainerbattle 0, TRAINER_CLARISSA, 0, Route120_Text_29ECA6, Route120_Text_29ECEF + msgbox Route120_Text_29ED19, 6 + end + +Route120_EventScript_1F5925:: @ 81F5925 + trainerbattle 0, TRAINER_ANGELICA, 0, Route120_Text_29ED71, Route120_Text_29EDD3 + msgbox Route120_Text_29EDF7, 6 + end + +Route120_EventScript_1F593C:: @ 81F593C + trainerbattle 0, TRAINER_KEIGO, 0, Route120_Text_29EE50, Route120_Text_29EE97 + msgbox Route120_Text_29EED4, 6 + end + +Route120_EventScript_1F5953:: @ 81F5953 + trainerbattle 0, TRAINER_RILEY, 0, Route120_Text_29EF08, Route120_Text_29EF63 + msgbox Route120_Text_29EF89, 6 + end + +Route120_EventScript_1F596A:: @ 81F596A + trainerbattle 0, TRAINER_LEONEL, 0, Route120_Text_29F04F, Route120_Text_29F080 + msgbox Route120_Text_29F0A1, 6 + end + +Route120_EventScript_1F5981:: @ 81F5981 + trainerbattle 0, TRAINER_CALLIE, 0, Route120_Text_29EFB1, Route120_Text_29EFE1 + msgbox Route120_Text_29F002, 6 + end + +Route120_Text_1F5998: @ 81F5998 + .string "STEVEN: Hm? {PLAYER}{KUN}, hi.\n" + .string "It’s been a while.\p" + .string "There’s something here that you can’t\n" + .string "see, right?\p" + .string "Now, if I were to use this device on\n" + .string "the invisible obstacle…\p" + .string "No, no. Rather than describing it,\n" + .string "I should just show you.\l" + .string "That would be more fun.\p" + .string "{PLAYER}{KUN}, are your POKéMON ready for\n" + .string "battle?$" + +Route120_Text_1F5AAC: @ 81F5AAC + .string "STEVEN: No?\p" + .string "I’ll wait here, so you can get ready.$" + +Route120_Text_1F5ADE: @ 81F5ADE + .string "STEVEN: {PLAYER}{KUN}, are your POKéMON\n" + .string "ready for battle?$" + +Route120_Text_1F5B0F: @ 81F5B0F + .string "STEVEN: {PLAYER}{KUN}, show me your true\n" + .string "power as a TRAINER!$" + +Route120_Text_1F5B43: @ 81F5B43 + .string "STEVEN used the DEVON SCOPE.\p" + .string "An invisible POKéMON became completely\n" + .string "visible!\p" + .string "The startled POKéMON attacked!$" + +Route120_Text_1F5BAF: @ 81F5BAF + .string "STEVEN: I see…\n" + .string "Your battle style is intriguing.\p" + .string "Your POKéMON have obviously grown\n" + .string "since I first met you in DEWFORD.\p" + .string "I’d like you to have this\n" + .string "DEVON SCOPE.\p" + .string "Who knows, there may be other\n" + .string "concealed POKéMON.$" + +Route120_Text_1F5C7B: @ 81F5C7B + .string "STEVEN: {PLAYER}{KUN}.\p" + .string "I enjoy seeing POKéMON and TRAINERS\n" + .string "who strive together.\p" + .string "I think you’re doing great.\p" + .string "Well, let’s meet again somewhere.$" + +Route119_Text_1F5D00: @ 81F5D00 +Route120_Text_1F5D00: @ 81F5D00 + .string "Something unseeable is in the way.$" + +Route119_Text_1F5D23: @ 81F5D23 + .string "Something unseeable is in the way.\p" + .string "Want to use the DEVON SCOPE?$" + +Route119_Text_1F5D63: @ 81F5D63 + .string "{PLAYER} used the DEVON SCOPE.\p" + .string "An invisible POKéMON became completely\n" + .string "visible!\p" + .string "The startled POKéMON attacked!$" + +Route120_Text_1F5DCB: @ 81F5DCB + .string "ROUTE 120\n" + .string "{0x7B} FORTREE CITY$" + +Route120_Text_1F5DE4: @ 81F5DE4 + .string "{0x7C} ROUTE 121\n" + .string "{0x7B} ROUTE 120$" diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc new file mode 100644 index 000000000..17ddae47f --- /dev/null +++ b/data/maps/Route121/events.inc @@ -0,0 +1,55 @@ +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 + +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 + +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 + +Route121_MapEvents:: @ 852BD8C + map_events Route121_EventObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents + diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc new file mode 100644 index 000000000..f133ffe56 --- /dev/null +++ b/data/maps/Route121/scripts.inc @@ -0,0 +1,200 @@ +Route121_MapScripts:: @ 81F5DFC + .byte 0 + +Route121_EventScript_1F5DFD:: @ 81F5DFD + msgbox Route121_Text_1F607F, 2 + end + +Route121_EventScript_1F5E06:: @ 81F5E06 + msgbox Route121_Text_1F60D3, 3 + end + +Route121_EventScript_1F5E0F:: @ 81F5E0F + msgbox Route121_Text_1F611E, 3 + end + +Route121_EventScript_1F5E18:: @ 81F5E18 + lockall + playbgm MUS_AQA_0, 0 + applymovement 13, Route121_Movement_2725B8 + waitmovement 0 + msgbox Route121_Text_1F605A, 4 + closemessage + applymovement 12, Route121_Movement_1F5E59 + applymovement 13, Route121_Movement_1F5E62 + applymovement 14, Route121_Movement_1F5E6B + waitmovement 0 + fadedefaultbgm + removeobject 12 + removeobject 13 + removeobject 14 + setvar VAR_0x4074, 1 + releaseall + end + +Route121_Movement_1F5E59: @ 81F5E59 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + step_end + +Route121_Movement_1F5E62: @ 81F5E62 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + step_end + +Route121_Movement_1F5E6B: @ 81F5E6B + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + step_end + +Route121_EventScript_1F5E74:: @ 81F5E74 + trainerbattle 0, TRAINER_VANESSA, 0, Route121_Text_29F0EC, Route121_Text_29F11F + msgbox Route121_Text_29F138, 6 + end + +Route121_EventScript_1F5E8B:: @ 81F5E8B + trainerbattle 2, TRAINER_WALTER_1, 0, Route121_Text_29F199, Route121_Text_29F20D, Route121_EventScript_1F5EB7 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route121_EventScript_1F5ED6 + msgbox Route121_Text_29F21E, 4 + release + end + +Route121_EventScript_1F5EB7:: @ 81F5EB7 + special sub_80B4808 + waitmovement 0 + msgbox Route121_Text_29F25B, 4 + setvar VAR_0x8004, 254 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 254 + callstd 8 + release + end + +Route121_EventScript_1F5ED6:: @ 81F5ED6 + trainerbattle 5, TRAINER_WALTER_1, 0, Route121_Text_29F2A6, Route121_Text_29F31A + msgbox Route121_Text_29F32B, 6 + end + +Route121_EventScript_1F5EED:: @ 81F5EED + trainerbattle 0, TRAINER_TAMMY, 0, Route121_Text_29F381, Route121_Text_29F3B9 + msgbox Route121_Text_29F3C6, 6 + end + +Route121_EventScript_1F5F04:: @ 81F5F04 + trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_29F3FB, Route121_Text_29F43F, Route121_Text_29F4C9 + msgbox Route121_Text_29F476, 6 + end + +Route121_EventScript_1F5F1F:: @ 81F5F1F + trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_29F521, Route121_Text_29F564, Route121_Text_29F5CE + msgbox Route121_Text_29F582, 6 + end + +Route121_EventScript_1F5F3A:: @ 81F5F3A + trainerbattle 2, TRAINER_JESSICA_1, 0, Route121_Text_29F612, Route121_Text_29F641, Route121_EventScript_1F5F66 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route121_EventScript_1F5F85 + msgbox Route121_Text_29F66F, 4 + release + end + +Route121_EventScript_1F5F66:: @ 81F5F66 + special sub_80B4808 + waitmovement 0 + msgbox Route121_Text_29F69F, 4 + setvar VAR_0x8004, 127 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 127 + callstd 8 + release + end + +Route121_EventScript_1F5F85:: @ 81F5F85 + trainerbattle 5, TRAINER_JESSICA_1, 0, Route121_Text_29F6E4, Route121_Text_29F710 + msgbox Route121_Text_29F740, 6 + end + +Route121_EventScript_1F5F9C:: @ 81F5F9C + trainerbattle 0, TRAINER_CALE, 0, Route121_Text_29F91A, Route121_Text_29F97B + msgbox Route121_Text_29F9AE, 6 + end + +Route121_EventScript_1F5FB3:: @ 81F5FB3 + trainerbattle 0, TRAINER_MYLES, 0, Route121_Text_29FA1E, Route121_Text_29FA64 + msgbox Route121_Text_29FA73, 6 + end + +Route121_EventScript_1F5FCA:: @ 81F5FCA + trainerbattle 0, TRAINER_PAT, 0, Route121_Text_29FAA7, Route121_Text_29FAD8 + msgbox Route121_Text_29FAEA, 6 + end + +Route121_EventScript_1F5FE1:: @ 81F5FE1 + trainerbattle 0, TRAINER_MARCEL, 0, Route121_Text_29FB35, Route121_Text_29FB8C + msgbox Route121_Text_29FBA8, 6 + end + +Route121_EventScript_1F5FF8:: @ 81F5FF8 + trainerbattle 2, TRAINER_CRISTIN_1, 0, Route121_Text_29F770, Route121_Text_29F7C1, Route121_EventScript_1F6024 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route121_EventScript_1F6043 + msgbox Route121_Text_29F7D4, 4 + release + end + +Route121_EventScript_1F6024:: @ 81F6024 + special sub_80B4808 + waitmovement 0 + msgbox Route121_Text_29F80D, 4 + setvar VAR_0x8004, 767 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 767 + callstd 8 + release + end + +Route121_EventScript_1F6043:: @ 81F6043 + trainerbattle 5, TRAINER_CRISTIN_1, 0, Route121_Text_29F855, Route121_Text_29F8A8 + msgbox Route121_Text_29F8D0, 6 + end + +Route121_Text_1F605A: @ 81F605A + .string "Okay!\n" + .string "We’re to move out to MT. PYRE!$" + +Route121_Text_1F607F: @ 81F607F + .string "Ahead looms MT. PYRE…\p" + .string "It is a natural monument to the spirits \n" + .string "of departed POKéMON…$" + +Route121_Text_1F60D3: @ 81F60D3 + .string "MT. PYRE PIER\p" + .string "…The sign is old and worn out.\n" + .string "The words are barely legible…$" + +Route121_Text_1F611E: @ 81F611E + .string "“Filled with rare POKéMON!â€\n" + .string "SAFARI ZONE$" + diff --git a/data/maps/Route121_SafariZoneEntrance/events.inc b/data/maps/Route121_SafariZoneEntrance/events.inc new file mode 100644 index 000000000..2d8351534 --- /dev/null +++ b/data/maps/Route121_SafariZoneEntrance/events.inc @@ -0,0 +1,20 @@ +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 + +Route121_SafariZoneEntrance_MapWarps: @ 8533F24 + 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 + +Route121_SafariZoneEntrance_MapBGEvents: @ 8533F54 + bg_event 15, 1, 0, 0, 0, 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/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc new file mode 100644 index 000000000..1973b0e9e --- /dev/null +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -0,0 +1,142 @@ +Route121_SafariZoneEntrance_MapScripts:: @ 822BBBB + map_script 2, Route121_SafariZoneEntrance_MapScript2_22BBC1 + .byte 0 + +Route121_SafariZoneEntrance_MapScript2_22BBC1: @ 822BBC1 + map_script_2 VAR_0x40A4, 1, Route121_SafariZoneEntrance_EventScript_22BBCB + .2byte 0 + +Route121_SafariZoneEntrance_EventScript_22BBCB:: @ 822BBCB + lockall + applymovement 255, Route121_SafariZoneEntrance_Movement_22BBDD + waitmovement 0 + setvar VAR_0x40A4, 0 + releaseall + end + +Route121_SafariZoneEntrance_Movement_22BBDD: @ 822BBDD + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + step_end + +Route121_SafariZoneEntrance_EventScript_22BBE6:: @ 822BBE6 + msgbox Route121_SafariZoneEntrance_Text_2A4D12, 2 + end + +Route121_SafariZoneEntrance_EventScript_22BBEF:: @ 822BBEF + lock + faceplayer + msgbox Route121_SafariZoneEntrance_Text_2A4E46, 5 + compare VAR_RESULT, 1 + goto_eq Route121_SafariZoneEntrance_EventScript_22BC0E + msgbox Route121_SafariZoneEntrance_Text_2A4E7E, 4 + release + end + +Route121_SafariZoneEntrance_EventScript_22BC0E:: @ 822BC0E + msgbox Route121_SafariZoneEntrance_Text_2A4EA1, 4 + release + end + +Route121_SafariZoneEntrance_EventScript_22BC18:: @ 822BC18 + lockall + applymovement 255, Route121_SafariZoneEntrance_Movement_2725A6 + waitmovement 0 + showmoneybox 0, 0, 0 + msgbox Route121_SafariZoneEntrance_Text_2A4F74, 5 + compare VAR_RESULT, 1 + goto_eq Route121_SafariZoneEntrance_EventScript_22BC48 + msgbox Route121_SafariZoneEntrance_Text_2A4FD7, 4 + goto Route121_SafariZoneEntrance_EventScript_22BD06 + end + +Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48 + checkitem ITEM_POKEBLOCK_CASE, 1 + compare VAR_RESULT, 0 + goto_eq Route121_SafariZoneEntrance_EventScript_22BCEA + call Route121_SafariZoneEntrance_EventScript_22BCBF + checkmoney 0x1f4, 0 + compare VAR_RESULT, 0 + goto_eq Route121_SafariZoneEntrance_EventScript_22BCF8 + playse SE_REGI + msgbox Route121_SafariZoneEntrance_Text_2A501B, 4 + takemoney 0x1f4, 0 + updatemoneybox 0, 0 + nop + msgbox Route121_SafariZoneEntrance_Text_2A5036, 4 + playfanfare MUS_FANFA4 + message Route121_SafariZoneEntrance_Text_2A5052 + waitfanfare + msgbox Route121_SafariZoneEntrance_Text_2A506F, 4 + closemessage + hidemoneybox + nop + nop + applymovement 255, Route121_SafariZoneEntrance_Movement_22BD18 + waitmovement 0 + special EnterSafariMode + setvar VAR_0x40A4, 2 + clearflag FLAG_0x05D + warp MAP_SAFARI_ZONE_SOUTH, 255, 32, 33 + waitstate + end + +Route121_SafariZoneEntrance_EventScript_22BCBF:: @ 822BCBF + getpartysize + compare VAR_RESULT, 6 + goto_if 5, Route121_SafariZoneEntrance_EventScript_22BCE9 + specialvar VAR_RESULT, ScriptCheckFreePokemonStorageSpace + compare VAR_RESULT, 1 + goto_eq Route121_SafariZoneEntrance_EventScript_22BCE9 + msgbox Route121_SafariZoneEntrance_Text_2A50E5, 4 + goto Route121_SafariZoneEntrance_EventScript_22BD06 + end + +Route121_SafariZoneEntrance_EventScript_22BCE9:: @ 822BCE9 + return + +Route121_SafariZoneEntrance_EventScript_22BCEA:: @ 822BCEA + msgbox Route121_SafariZoneEntrance_Text_2A5105, 4 + goto Route121_SafariZoneEntrance_EventScript_22BD06 + end + +Route121_SafariZoneEntrance_EventScript_22BCF8:: @ 822BCF8 + msgbox Route121_SafariZoneEntrance_Text_2A4FF7, 4 + goto Route121_SafariZoneEntrance_EventScript_22BD06 + end + +Route121_SafariZoneEntrance_EventScript_22BD06:: @ 822BD06 + closemessage + hidemoneybox + nop + nop + applymovement 255, Route121_SafariZoneEntrance_Movement_22BD16 + waitmovement 0 + releaseall + end + +Route121_SafariZoneEntrance_Movement_22BD16: @ 822BD16 + walk_right + step_end + +Route121_SafariZoneEntrance_Movement_22BD18: @ 822BD18 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + delay_16 + step_end + +Route121_SafariZoneEntrance_EventScript_22BD21:: @ 822BD21 + msgbox Route121_SafariZoneEntrance_Text_2A55BB, 3 + end + diff --git a/data/maps/Route122/events.inc b/data/maps/Route122/events.inc new file mode 100644 index 000000000..4c5b9b464 --- /dev/null +++ b/data/maps/Route122/events.inc @@ -0,0 +1,6 @@ +Route122_MapWarps: @ 852BDA0 + 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/Route122/scripts.inc b/data/maps/Route122/scripts.inc new file mode 100644 index 000000000..8fcfb4c09 --- /dev/null +++ b/data/maps/Route122/scripts.inc @@ -0,0 +1,3 @@ +Route122_MapScripts:: @ 81F6146 + .byte 0 + diff --git a/data/maps/Route123/events.inc b/data/maps/Route123/events.inc new file mode 100644 index 000000000..0fc1b015b --- /dev/null +++ b/data/maps/Route123/events.inc @@ -0,0 +1,88 @@ +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 + +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 + +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 + +Route123_MapEvents:: @ 852C3B0 + map_events Route123_EventObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents + diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc new file mode 100644 index 000000000..b622a931b --- /dev/null +++ b/data/maps/Route123/scripts.inc @@ -0,0 +1,213 @@ +Route123_MapScripts:: @ 81F6147 + map_script 3, Route123_MapScript1_1F614D + .byte 0 + +Route123_MapScript1_1F614D: @ 81F614D + special SetRoute123Weather + end + +Route123_EventScript_1F6151:: @ 81F6151 + lock + faceplayer + checkflag FLAG_0x0E8 + goto_eq Route123_EventScript_1F61A0 + msgbox Route123_Text_1F641E, 4 + special IsGrassTypeInParty + compare VAR_RESULT, 0 + goto_eq Route123_EventScript_1F619E + msgbox Route123_Text_1F645D, 4 + giveitem_std ITEM_TM19 + compare VAR_RESULT, 0 + goto_eq Route123_EventScript_272054 + setflag FLAG_0x0E8 + msgbox Route123_Text_1F64CF, 4 + release + end + +Route123_EventScript_1F619E:: @ 81F619E + release + end + +Route123_EventScript_1F61A0:: @ 81F61A0 + msgbox Route123_Text_1F64CF, 4 + release + end + +Route123_EventScript_1F61AA:: @ 81F61AA + msgbox Route123_Text_1F6511, 3 + end + +Route123_EventScript_1F61B3:: @ 81F61B3 + msgbox Route123_Text_1F6529, 3 + end + +Route123_EventScript_1F61BC:: @ 81F61BC + msgbox Route123_Text_1F6557, 3 + end + +Route123_EventScript_1F61C5:: @ 81F61C5 + trainerbattle 0, TRAINER_WENDY, 0, Route123_Text_29FBEB, Route123_Text_29FC23 + msgbox Route123_Text_29FC42, 6 + end + +Route123_EventScript_1F61DC:: @ 81F61DC + trainerbattle 0, TRAINER_BRAXTON, 0, Route123_Text_29FC6F, Route123_Text_29FCD6 + msgbox Route123_Text_29FCF4, 6 + end + +Route123_EventScript_1F61F3:: @ 81F61F3 + trainerbattle 0, TRAINER_VIOLET, 0, Route123_Text_29FD1D, Route123_Text_29FD53 + msgbox Route123_Text_29FD7B, 6 + end + +Route123_EventScript_1F620A:: @ 81F620A + trainerbattle 2, TRAINER_CAMERON_1, 0, Route123_Text_29FDBA, Route123_Text_29FE1E, Route123_EventScript_1F6236 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route123_EventScript_1F6255 + msgbox Route123_Text_29FE2A, 4 + release + end + +Route123_EventScript_1F6236:: @ 81F6236 + special sub_80B4808 + waitmovement 0 + msgbox Route123_Text_29FE70, 4 + setvar VAR_0x8004, 238 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 238 + callstd 8 + release + end + +Route123_EventScript_1F6255:: @ 81F6255 + trainerbattle 5, TRAINER_CAMERON_1, 0, Route123_Text_29FED4, Route123_Text_29FF1B + msgbox Route123_Text_29FF27, 6 + end + +Route123_EventScript_1F626C:: @ 81F626C + trainerbattle 2, TRAINER_JACKI_1, 0, Route123_Text_29FF61, Route123_Text_29FFD8, Route123_EventScript_1F6298 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route123_EventScript_1F62B7 + msgbox Route123_Text_29FFE5, 4 + release + end + +Route123_EventScript_1F6298:: @ 81F6298 + special sub_80B4808 + waitmovement 0 + msgbox Route123_Text_2A0027, 4 + setvar VAR_0x8004, 249 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 249 + callstd 8 + release + end + +Route123_EventScript_1F62B7:: @ 81F62B7 + trainerbattle 5, TRAINER_JACKI_1, 0, Route123_Text_2A005E, Route123_Text_2A008D + msgbox Route123_Text_2A0099, 6 + end + +Route123_EventScript_1F62CE:: @ 81F62CE + trainerbattle 4, TRAINER_MIU_AND_YUKI, 0, Route123_Text_2A00D6, Route123_Text_2A0119, Route123_Text_2A016D + msgbox Route123_Text_2A012E, 6 + end + +Route123_EventScript_1F62E9:: @ 81F62E9 + trainerbattle 4, TRAINER_MIU_AND_YUKI, 0, Route123_Text_2A01A7, Route123_Text_2A01D8, Route123_Text_2A0224 + msgbox Route123_Text_2A01EE, 6 + end + +Route123_EventScript_1F6304:: @ 81F6304 + trainerbattle 0, TRAINER_KINDRA, 0, Route123_Text_2A025F, Route123_Text_2A02A6 + msgbox Route123_Text_2A02C1, 6 + end + +Route123_EventScript_1F631B:: @ 81F631B + trainerbattle 0, TRAINER_FREDRICK, 0, Route123_Text_2A060A, Route123_Text_2A0631 + msgbox Route123_Text_2A0672, 6 + end + +Route123_EventScript_1F6332:: @ 81F6332 + trainerbattle 0, TRAINER_ALBERTO, 0, Route123_Text_2A06AF, Route123_Text_2A0704 + msgbox Route123_Text_2A072B, 6 + end + +Route123_EventScript_1F6349:: @ 81F6349 + trainerbattle 0, TRAINER_ED, 0, Route123_Text_2A079B, Route123_Text_2A07F0 + msgbox Route123_Text_2A080D, 6 + end + +Route123_EventScript_1F6360:: @ 81F6360 + trainerbattle 0, TRAINER_KAYLEY, 0, Route123_Text_2A0902, Route123_Text_2A0943 + msgbox Route123_Text_2A096E, 6 + end + +Route123_EventScript_1F6377:: @ 81F6377 + trainerbattle 0, TRAINER_JONAS, 0, Route123_Text_2A0854, Route123_Text_2A088A + msgbox Route123_Text_2A08CA, 6 + end + +Route123_EventScript_1F638E:: @ 81F638E + trainerbattle 0, TRAINER_JAZMYN, 0, Route123_Text_2A054E, Route123_Text_2A0592 + msgbox Route123_Text_2A05AC, 6 + end + +Route123_EventScript_1F63A5:: @ 81F63A5 + trainerbattle 0, TRAINER_DAVIS, 0, Route123_Text_2A04C0, Route123_Text_2A04FE + msgbox Route123_Text_2A0512, 6 + end + +Route123_EventScript_1F63BC:: @ 81F63BC + trainerbattle 2, TRAINER_FERNANDO_1, 0, Route123_Text_2A0323, Route123_Text_2A035C, Route123_EventScript_1F63E8 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route123_EventScript_1F6407 + msgbox Route123_Text_2A0389, 4 + release + end + +Route123_EventScript_1F63E8:: @ 81F63E8 + special sub_80B4808 + waitmovement 0 + msgbox Route123_Text_2A03C1, 4 + setvar VAR_0x8004, 195 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 195 + callstd 8 + release + end + +Route123_EventScript_1F6407:: @ 81F6407 + trainerbattle 5, TRAINER_FERNANDO_1, 0, Route123_Text_2A03FB, Route123_Text_2A045A + msgbox Route123_Text_2A0487, 6 + end + +Route123_Text_1F641E: @ 81F641E + .string "I love GRASS-type POKéMON!\p" + .string "Do you have any GRASS-type POKéMON?$" + +Route123_Text_1F645D: @ 81F645D + .string "Oh?\p" + .string "You like GRASS-type POKéMON, too,\n" + .string "don’t you?\p" + .string "I’m so happy, you can have this!\n" + .string "It’s a token of our friendship.$" + +Route123_Text_1F64CF: @ 81F64CF + .string "I check trees with my GRASS-type\n" + .string "POKéMON. I’m like a tree doctor.$" + +Route123_Text_1F6511: @ 81F6511 + .string "{0x7C} ROUTE 123\n" + .string "{0x7B} ROUTE 118$" + +Route123_Text_1F6529: @ 81F6529 + .string "{0x79} MT. PYRE\n" + .string "“Forbidden to the faint of heart.â€$" + +Route123_Text_1F6557: @ 81F6557 + .string "BERRY MASTER’S HOUSE$" + diff --git a/data/maps/Route123_BerryMastersHouse/events.inc b/data/maps/Route123_BerryMastersHouse/events.inc new file mode 100644 index 000000000..3f4725870 --- /dev/null +++ b/data/maps/Route123_BerryMastersHouse/events.inc @@ -0,0 +1,11 @@ +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 + +Route123_BerryMastersHouse_MapWarps: @ 853EAFC + 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/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc new file mode 100644 index 000000000..9e865ad6a --- /dev/null +++ b/data/maps/Route123_BerryMastersHouse/scripts.inc @@ -0,0 +1,153 @@ +Route123_BerryMastersHouse_MapScripts:: @ 826F83B + map_script 3, Route123_BerryMastersHouse_MapScript1_26F841 + .byte 0 + +Route123_BerryMastersHouse_MapScript1_26F841: @ 826F841 + setflag FLAG_LANDMARK_BERRY_MASTERS_HOUSE + end + +Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 + lock + faceplayer + dodailyevents + checkflag FLAG_0x92D + goto_eq Route123_BerryMastersHouse_EventScript_26F8B6 + msgbox Route123_BerryMastersHouse_Text_2A7386, 4 + random 10 + addvar VAR_RESULT, 20 + addvar VAR_RESULT, 133 + giveitem_std VAR_RESULT + compare VAR_RESULT, 0 + goto_eq Route123_BerryMastersHouse_EventScript_272054 + setflag FLAG_0x92D + msgbox Route123_BerryMastersHouse_Text_2A7428, 4 + random 10 + addvar VAR_RESULT, 20 + addvar VAR_RESULT, 133 + giveitem_std VAR_RESULT + compare VAR_RESULT, 0 + goto_eq Route123_BerryMastersHouse_EventScript_272054 + msgbox Route123_BerryMastersHouse_Text_2A7445, 4 + release + end + +Route123_BerryMastersHouse_EventScript_26F8B6:: @ 826F8B6 + msgbox Route123_BerryMastersHouse_Text_2A749E, 4 + release + end + +Route123_BerryMastersHouse_EventScript_26F8C0:: @ 826F8C0 + lock + faceplayer + dodailyevents + checkflag FLAG_0x931 + goto_eq Route123_BerryMastersHouse_EventScript_26FA6F + msgbox Route123_BerryMastersHouse_Text_2A74E6, 4 + setvar VAR_0x8004, 13 + call Route123_BerryMastersHouse_EventScript_271E7C + lock + faceplayer + compare VAR_RESULT, 1 + goto_eq Route123_BerryMastersHouse_EventScript_26F909 + compare VAR_RESULT, 0 + goto_eq Route123_BerryMastersHouse_EventScript_26F8F7 + end + +Route123_BerryMastersHouse_EventScript_26F8F7:: @ 826F8F7 + msgbox Route123_BerryMastersHouse_Text_2A7682, 4 + msgbox Route123_BerryMastersHouse_Text_2A761B, 4 + release + end + +Route123_BerryMastersHouse_EventScript_26F909:: @ 826F909 + compare VAR_0x8004, 0 + goto_eq Route123_BerryMastersHouse_EventScript_26F94C + compare VAR_0x8004, 1 + goto_eq Route123_BerryMastersHouse_EventScript_26F97A + compare VAR_0x8004, 2 + goto_eq Route123_BerryMastersHouse_EventScript_26F9AB + compare VAR_0x8004, 3 + goto_eq Route123_BerryMastersHouse_EventScript_26F9DC + compare VAR_0x8004, 4 + goto_eq Route123_BerryMastersHouse_EventScript_26FA0D + compare VAR_0x8004, 5 + goto_eq Route123_BerryMastersHouse_EventScript_26FA3E + end + +Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C + msgbox Route123_BerryMastersHouse_Text_2A75D0, 4 + random 10 + addvar VAR_RESULT, 133 + giveitem_std VAR_RESULT + compare VAR_RESULT, 0 + goto_eq Route123_BerryMastersHouse_EventScript_272054 + goto Route123_BerryMastersHouse_EventScript_26FA79 + release + end + +Route123_BerryMastersHouse_EventScript_26F97A:: @ 826F97A + checkflag FLAG_0x0F8 + goto_eq Route123_BerryMastersHouse_EventScript_26F94C + msgbox Route123_BerryMastersHouse_Text_2A7583, 4 + giveitem_std ITEM_SPELON_BERRY + compare VAR_RESULT, 0 + goto_eq Route123_BerryMastersHouse_EventScript_272054 + setflag FLAG_0x0F8 + goto Route123_BerryMastersHouse_EventScript_26FA79 + end + +Route123_BerryMastersHouse_EventScript_26F9AB:: @ 826F9AB + checkflag FLAG_0x0F9 + goto_eq Route123_BerryMastersHouse_EventScript_26F94C + msgbox Route123_BerryMastersHouse_Text_2A7583, 4 + giveitem_std ITEM_PAMTRE_BERRY + compare VAR_RESULT, 0 + goto_eq Route123_BerryMastersHouse_EventScript_272054 + setflag FLAG_0x0F9 + goto Route123_BerryMastersHouse_EventScript_26FA79 + end + +Route123_BerryMastersHouse_EventScript_26F9DC:: @ 826F9DC + checkflag FLAG_0x0FA + goto_eq Route123_BerryMastersHouse_EventScript_26F94C + msgbox Route123_BerryMastersHouse_Text_2A7583, 4 + giveitem_std ITEM_WATMEL_BERRY + compare VAR_RESULT, 0 + goto_eq Route123_BerryMastersHouse_EventScript_272054 + setflag FLAG_0x0FA + goto Route123_BerryMastersHouse_EventScript_26FA79 + end + +Route123_BerryMastersHouse_EventScript_26FA0D:: @ 826FA0D + checkflag FLAG_0x0FB + goto_eq Route123_BerryMastersHouse_EventScript_26F94C + msgbox Route123_BerryMastersHouse_Text_2A7583, 4 + giveitem_std ITEM_DURIN_BERRY + compare VAR_RESULT, 0 + goto_eq Route123_BerryMastersHouse_EventScript_272054 + setflag FLAG_0x0FB + goto Route123_BerryMastersHouse_EventScript_26FA79 + end + +Route123_BerryMastersHouse_EventScript_26FA3E:: @ 826FA3E + checkflag FLAG_0x0FC + goto_eq Route123_BerryMastersHouse_EventScript_26F94C + msgbox Route123_BerryMastersHouse_Text_2A7583, 4 + giveitem_std ITEM_BELUE_BERRY + compare VAR_RESULT, 0 + goto_eq Route123_BerryMastersHouse_EventScript_272054 + setflag FLAG_0x0FC + goto Route123_BerryMastersHouse_EventScript_26FA79 + end + +Route123_BerryMastersHouse_EventScript_26FA6F:: @ 826FA6F + msgbox Route123_BerryMastersHouse_Text_2A761B, 4 + release + end + +Route123_BerryMastersHouse_EventScript_26FA79:: @ 826FA79 + setflag FLAG_0x931 + msgbox Route123_BerryMastersHouse_Text_2A761B, 4 + release + end + diff --git a/data/maps/Route124/events.inc b/data/maps/Route124/events.inc new file mode 100644 index 000000000..2dc839783 --- /dev/null +++ b/data/maps/Route124/events.inc @@ -0,0 +1,23 @@ +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 + +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 + +Route124_MapEvents:: @ 852C4F8 + map_events Route124_EventObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents + diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc new file mode 100644 index 000000000..b21e55417 --- /dev/null +++ b/data/maps/Route124/scripts.inc @@ -0,0 +1,117 @@ +Route124_MapScripts:: @ 81F656C + map_script 3, Route124_MapScript1_1F6572 + .byte 0 + +Route124_MapScript1_1F6572: @ 81F6572 + checkflag FLAG_SYS_WEATHER_CTRL + call_if 1, Route124_EventScript_27207A + end + +Route124_EventScript_1F657C:: @ 81F657C + msgbox Route124_Text_1F6739, 3 + end + +Route124_EventScript_1F6585:: @ 81F6585 + trainerbattle 0, TRAINER_SPENCER, 0, Route124_Text_2A09B1, Route124_Text_2A0A02 + msgbox Route124_Text_2A0A20, 6 + end + +Route124_EventScript_1F659C:: @ 81F659C + trainerbattle 0, TRAINER_ROLAND, 0, Route124_Text_2A0A84, Route124_Text_2A0ACC + msgbox Route124_Text_2A0AD9, 6 + end + +Route124_EventScript_1F65B3:: @ 81F65B3 + trainerbattle 2, TRAINER_JENNY_1, 0, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route124_EventScript_1F65FE + msgbox Route124_Text_2A0B9A, 4 + release + end + +Route124_EventScript_1F65DF:: @ 81F65DF + special sub_80B4808 + waitmovement 0 + msgbox Route124_Text_2A0C14, 4 + setvar VAR_0x8004, 449 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 449 + callstd 8 + release + end + +Route124_EventScript_1F65FE:: @ 81F65FE + trainerbattle 5, TRAINER_JENNY_1, 0, Route124_Text_2A0C60, Route124_Text_2A0CA0 + msgbox Route124_Text_2A0CBE, 6 + end + +Route124_EventScript_1F6615:: @ 81F6615 + trainerbattle 0, TRAINER_GRACE, 0, Route124_Text_2A0D0A, Route124_Text_2A0D3D + msgbox Route124_Text_2A0D66, 6 + end + +Route124_EventScript_1F662C:: @ 81F662C + trainerbattle 0, TRAINER_CHAD, 0, Route124_Text_2A0DA0, Route124_Text_2A0DFF + msgbox Route124_Text_2A0E1E, 6 + end + +Route124_EventScript_1F6643:: @ 81F6643 + trainerbattle 6, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A0E87, Route124_Text_2A0EFE, Route124_Text_2A0F8C, Route124_EventScript_1F6673 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route124_EventScript_1F668C + msgbox Route124_Text_2A0F3A, 4 + release + end + +Route124_EventScript_1F6673:: @ 81F6673 + msgbox Route124_Text_2A109F, 4 + setvar VAR_0x8004, 687 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 687 + callstd 8 + release + end + +Route124_EventScript_1F668C:: @ 81F668C + trainerbattle 7, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A111E, Route124_Text_2A11B2, Route124_Text_2A1255 + msgbox Route124_Text_2A1203, 6 + end + +Route124_EventScript_1F66A7:: @ 81F66A7 + trainerbattle 6, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A0FD1, Route124_Text_2A1012, Route124_Text_2A10E5, Route124_EventScript_1F66D7 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route124_EventScript_1F66F0 + msgbox Route124_Text_2A103E, 4 + release + end + +Route124_EventScript_1F66D7:: @ 81F66D7 + msgbox Route124_Text_2A109F, 4 + setvar VAR_0x8004, 687 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 687 + callstd 8 + release + end + +Route124_EventScript_1F66F0:: @ 81F66F0 + trainerbattle 7, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A129A, Route124_Text_2A12DD, Route124_Text_2A1384 + msgbox Route124_Text_2A130F, 6 + end + +Route124_EventScript_1F670B:: @ 81F670B + trainerbattle 0, TRAINER_DECLAN, 0, Route124_Text_2A13BD, Route124_Text_2A142C + msgbox Route124_Text_2A144F, 6 + end + +Route124_EventScript_1F6722:: @ 81F6722 + trainerbattle 0, TRAINER_ISABELLA, 0, Route124_Text_2A148E, Route124_Text_2A14BC + msgbox Route124_Text_2A14ED, 6 + end + +Route124_Text_1F6739: @ 81F6739 + .string "HUNTER’S HOUSE$" + diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc new file mode 100644 index 000000000..606138e38 --- /dev/null +++ b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc @@ -0,0 +1,12 @@ +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 + +Route124_DivingTreasureHuntersHouse_MapWarps: @ 853EDB4 + 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 + +Route124_DivingTreasureHuntersHouse_MapEvents:: @ 853EDD0 + map_events Route124_DivingTreasureHuntersHouse_EventObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc new file mode 100644 index 000000000..0892b216a --- /dev/null +++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc @@ -0,0 +1,349 @@ +Route124_DivingTreasureHuntersHouse_MapScripts:: @ 8270A28 + map_script 3, Route124_DivingTreasureHuntersHouse_MapScript1_270A2E + .byte 0 + +Route124_DivingTreasureHuntersHouse_MapScript1_270A2E: @ 8270A2E + setflag FLAG_LANDMARK_HUNTERS_HOUSE + end + +Route124_DivingTreasureHuntersHouse_EventScript_270A32:: @ 8270A32 + lock + faceplayer + checkflag FLAG_0x0D9 + goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270A4E + msgbox Route124_DivingTreasureHuntersHouse_Text_270F6C, 4 + setflag FLAG_0x0D9 + goto Route124_DivingTreasureHuntersHouse_EventScript_270A5C + end + +Route124_DivingTreasureHuntersHouse_EventScript_270A4E:: @ 8270A4E + msgbox Route124_DivingTreasureHuntersHouse_Text_270FE5, 4 + goto Route124_DivingTreasureHuntersHouse_EventScript_270A5C + end + +Route124_DivingTreasureHuntersHouse_EventScript_270A5C:: @ 8270A5C + call Route124_DivingTreasureHuntersHouse_EventScript_270A72 + compare VAR_TEMP_1, 0 + goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F57 + goto Route124_DivingTreasureHuntersHouse_EventScript_270AD0 + end + +Route124_DivingTreasureHuntersHouse_EventScript_270A72:: @ 8270A72 + setvar VAR_TEMP_1, 0 + checkitem ITEM_RED_SHARD, 1 + compare VAR_RESULT, 1 + call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_270AB8 + checkitem ITEM_YELLOW_SHARD, 1 + compare VAR_RESULT, 1 + call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_270ABE + checkitem ITEM_BLUE_SHARD, 1 + compare VAR_RESULT, 1 + call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_270AC4 + checkitem ITEM_GREEN_SHARD, 1 + compare VAR_RESULT, 1 + call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_270ACA + return + +Route124_DivingTreasureHuntersHouse_EventScript_270AB8:: @ 8270AB8 + addvar VAR_TEMP_1, 1 + return + +Route124_DivingTreasureHuntersHouse_EventScript_270ABE:: @ 8270ABE + addvar VAR_TEMP_1, 2 + return + +Route124_DivingTreasureHuntersHouse_EventScript_270AC4:: @ 8270AC4 + addvar VAR_TEMP_1, 4 + return + +Route124_DivingTreasureHuntersHouse_EventScript_270ACA:: @ 8270ACA + addvar VAR_TEMP_1, 8 + return + +Route124_DivingTreasureHuntersHouse_EventScript_270AD0:: @ 8270AD0 + msgbox Route124_DivingTreasureHuntersHouse_Text_271098, 4 + goto Route124_DivingTreasureHuntersHouse_EventScript_270ADE + end + +Route124_DivingTreasureHuntersHouse_EventScript_270ADE:: @ 8270ADE + message Route124_DivingTreasureHuntersHouse_Text_271117 + waitmessage + switch VAR_TEMP_1 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_270B8F + case 2, Route124_DivingTreasureHuntersHouse_EventScript_270BB5 + case 3, Route124_DivingTreasureHuntersHouse_EventScript_270BDB + case 4, Route124_DivingTreasureHuntersHouse_EventScript_270C0C + case 5, Route124_DivingTreasureHuntersHouse_EventScript_270C32 + case 6, Route124_DivingTreasureHuntersHouse_EventScript_270C63 + case 7, Route124_DivingTreasureHuntersHouse_EventScript_270C94 + case 8, Route124_DivingTreasureHuntersHouse_EventScript_270CD0 + case 9, Route124_DivingTreasureHuntersHouse_EventScript_270CF6 + case 10, Route124_DivingTreasureHuntersHouse_EventScript_270D27 + case 11, Route124_DivingTreasureHuntersHouse_EventScript_270D58 + case 12, Route124_DivingTreasureHuntersHouse_EventScript_270D94 + case 13, Route124_DivingTreasureHuntersHouse_EventScript_270DC5 + case 14, Route124_DivingTreasureHuntersHouse_EventScript_270E01 + case 15, Route124_DivingTreasureHuntersHouse_EventScript_270E3D + end + +Route124_DivingTreasureHuntersHouse_EventScript_270B8F:: @ 8270B8F + multichoice 0, 0, 58, 0 + switch VAR_RESULT + case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_270F4D + goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + end + +Route124_DivingTreasureHuntersHouse_EventScript_270BB5:: @ 8270BB5 + multichoice 0, 0, 59, 0 + switch VAR_RESULT + case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E93 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_270F4D + goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + end + +Route124_DivingTreasureHuntersHouse_EventScript_270BDB:: @ 8270BDB + multichoice 0, 0, 60, 0 + switch VAR_RESULT + case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_270E93 + case 2, Route124_DivingTreasureHuntersHouse_EventScript_270F4D + goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + end + +Route124_DivingTreasureHuntersHouse_EventScript_270C0C:: @ 8270C0C + multichoice 0, 0, 61, 0 + switch VAR_RESULT + case 0, Route124_DivingTreasureHuntersHouse_EventScript_270EA2 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_270F4D + goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + end + +Route124_DivingTreasureHuntersHouse_EventScript_270C32:: @ 8270C32 + multichoice 0, 0, 62, 0 + switch VAR_RESULT + case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EA2 + case 2, Route124_DivingTreasureHuntersHouse_EventScript_270F4D + goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + end + +Route124_DivingTreasureHuntersHouse_EventScript_270C63:: @ 8270C63 + multichoice 0, 0, 63, 0 + switch VAR_RESULT + case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E93 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EA2 + case 2, Route124_DivingTreasureHuntersHouse_EventScript_270F4D + goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + end + +Route124_DivingTreasureHuntersHouse_EventScript_270C94:: @ 8270C94 + multichoice 0, 0, 64, 0 + switch VAR_RESULT + case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_270E93 + case 2, Route124_DivingTreasureHuntersHouse_EventScript_270EA2 + case 3, Route124_DivingTreasureHuntersHouse_EventScript_270F4D + goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + end + +Route124_DivingTreasureHuntersHouse_EventScript_270CD0:: @ 8270CD0 + multichoice 0, 0, 65, 0 + switch VAR_RESULT + case 0, Route124_DivingTreasureHuntersHouse_EventScript_270EB1 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_270F4D + goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + end + +Route124_DivingTreasureHuntersHouse_EventScript_270CF6:: @ 8270CF6 + multichoice 0, 0, 66, 0 + switch VAR_RESULT + case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EB1 + case 2, Route124_DivingTreasureHuntersHouse_EventScript_270F4D + goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + end + +Route124_DivingTreasureHuntersHouse_EventScript_270D27:: @ 8270D27 + multichoice 0, 0, 67, 0 + switch VAR_RESULT + case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E93 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EB1 + case 2, Route124_DivingTreasureHuntersHouse_EventScript_270F4D + goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + end + +Route124_DivingTreasureHuntersHouse_EventScript_270D58:: @ 8270D58 + multichoice 0, 0, 68, 0 + switch VAR_RESULT + case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_270E93 + case 2, Route124_DivingTreasureHuntersHouse_EventScript_270EB1 + case 3, Route124_DivingTreasureHuntersHouse_EventScript_270F4D + goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + end + +Route124_DivingTreasureHuntersHouse_EventScript_270D94:: @ 8270D94 + multichoice 0, 0, 69, 0 + switch VAR_RESULT + case 0, Route124_DivingTreasureHuntersHouse_EventScript_270EA2 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EB1 + case 2, Route124_DivingTreasureHuntersHouse_EventScript_270F4D + goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + end + +Route124_DivingTreasureHuntersHouse_EventScript_270DC5:: @ 8270DC5 + multichoice 0, 0, 70, 0 + switch VAR_RESULT + case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EA2 + case 2, Route124_DivingTreasureHuntersHouse_EventScript_270EB1 + case 3, Route124_DivingTreasureHuntersHouse_EventScript_270F4D + goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + end + +Route124_DivingTreasureHuntersHouse_EventScript_270E01:: @ 8270E01 + multichoice 0, 0, 71, 0 + switch VAR_RESULT + case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E93 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EA2 + case 2, Route124_DivingTreasureHuntersHouse_EventScript_270EB1 + case 3, Route124_DivingTreasureHuntersHouse_EventScript_270F4D + goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + end + +Route124_DivingTreasureHuntersHouse_EventScript_270E3D:: @ 8270E3D + multichoice 0, 0, 72, 0 + switch VAR_RESULT + case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_270E93 + case 2, Route124_DivingTreasureHuntersHouse_EventScript_270EA2 + case 3, Route124_DivingTreasureHuntersHouse_EventScript_270EB1 + case 4, Route124_DivingTreasureHuntersHouse_EventScript_270F4D + goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + end + +Route124_DivingTreasureHuntersHouse_EventScript_270E84:: @ 8270E84 + setvar VAR_0x8008, 48 + setvar VAR_0x8009, 95 + goto Route124_DivingTreasureHuntersHouse_EventScript_270EC0 + +Route124_DivingTreasureHuntersHouse_EventScript_270E93:: @ 8270E93 + setvar VAR_0x8008, 50 + setvar VAR_0x8009, 96 + goto Route124_DivingTreasureHuntersHouse_EventScript_270EC0 + +Route124_DivingTreasureHuntersHouse_EventScript_270EA2:: @ 8270EA2 + setvar VAR_0x8008, 49 + setvar VAR_0x8009, 97 + goto Route124_DivingTreasureHuntersHouse_EventScript_270EC0 + +Route124_DivingTreasureHuntersHouse_EventScript_270EB1:: @ 8270EB1 + setvar VAR_0x8008, 51 + setvar VAR_0x8009, 98 + goto Route124_DivingTreasureHuntersHouse_EventScript_270EC0 + +Route124_DivingTreasureHuntersHouse_EventScript_270EC0:: @ 8270EC0 + bufferitemname 0, VAR_0x8008 + bufferitemname 1, VAR_0x8009 + msgbox Route124_DivingTreasureHuntersHouse_Text_271132, 5 + compare VAR_RESULT, 0 + goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F4D + checkitemspace VAR_0x8009, 1 + compare VAR_RESULT, 1 + goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F01 + checkitem VAR_0x8008, 2 + compare VAR_RESULT, 0 + goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F01 + goto Route124_DivingTreasureHuntersHouse_EventScript_270F43 + end + +Route124_DivingTreasureHuntersHouse_EventScript_270F01:: @ 8270F01 + takeitem VAR_0x8008, 1 + giveitem_std VAR_0x8009 + msgbox Route124_DivingTreasureHuntersHouse_Text_271158, 4 + call Route124_DivingTreasureHuntersHouse_EventScript_270A72 + compare VAR_TEMP_1, 0 + goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F61 + msgbox Route124_DivingTreasureHuntersHouse_Text_27117B, 5 + compare VAR_RESULT, 1 + goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270ADE + goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + end + +Route124_DivingTreasureHuntersHouse_EventScript_270F43:: @ 8270F43 + msgbox Route124_DivingTreasureHuntersHouse_Text_2711A0, 4 + release + end + +Route124_DivingTreasureHuntersHouse_EventScript_270F4D:: @ 8270F4D + msgbox Route124_DivingTreasureHuntersHouse_Text_2711D8, 4 + release + end + +Route124_DivingTreasureHuntersHouse_EventScript_270F57:: @ 8270F57 + msgbox Route124_DivingTreasureHuntersHouse_Text_271027, 4 + release + end + +Route124_DivingTreasureHuntersHouse_EventScript_270F61:: @ 8270F61 + release + end + +Route124_DivingTreasureHuntersHouse_EventScript_270F63:: @ 8270F63 + msgbox Route124_DivingTreasureHuntersHouse_Text_271217, 3 + end + +Route124_DivingTreasureHuntersHouse_Text_270F6C: @ 8270F6C + .string "I’m the DIVING TREASURE HUNTER!\p" + .string "I’m the awesome dude who makes\n" + .string "deep-sea dives to gather treasures\l" + .string "resting at the bottom.$" + +Route124_DivingTreasureHuntersHouse_Text_270FE5: @ 8270FE5 + .string "Tell me, have you seen any SHARDS of\n" + .string "tools made in ancient times?$" + +Route124_DivingTreasureHuntersHouse_Text_271027: @ 8271027 + .string "You haven’t got any treasures\n" + .string "for me…\p" + .string "If you see any SHARDS, like the RED\n" + .string "SHARD, you’ve got to trade it with me!$" + +Route124_DivingTreasureHuntersHouse_Text_271098: @ 8271098 + .string "Oh, hey! That…\n" + .string "That’s a SHARD! I’m looking for those!\p" + .string "Oh, man, you’ve got to trade that\n" + .string "with me! I’ll give you something good!$" + +Route124_DivingTreasureHuntersHouse_Text_271117: @ 8271117 + .string "What do you want to trade?$" + +Route124_DivingTreasureHuntersHouse_Text_271132: @ 8271132 + .string "You’ll trade your {STR_VAR_1} for\n" + .string "my {STR_VAR_2}, then?$" + +Route124_DivingTreasureHuntersHouse_Text_271158: @ 8271158 + .string "It’s a done deal!\n" + .string "Use that wisely!$" + +Route124_DivingTreasureHuntersHouse_Text_27117B: @ 827117B + .string "Do you want to trade something else?$" + +Route124_DivingTreasureHuntersHouse_Text_2711A0: @ 82711A0 + .string "Whoops, your BAG’s full.\n" + .string "Get rid of some items, friend!$" + +Route124_DivingTreasureHuntersHouse_Text_2711D8: @ 82711D8 + .string "No? That’s a downer.\n" + .string "Well, if you change your mind, come back.$" + +Route124_DivingTreasureHuntersHouse_Text_271217: @ 8271217 + .string "{CLEAR_TO}{0x0a}Wanted item{CLEAR_TO}{0x7c}Trade item\n" + .string "{CLEAR_TO}{0x0f}RED SHARD{CLEAR_TO}{0x59}{0x7B}{0x7C}{CLEAR_TO}{0x7b}FIRE STONE{CLEAR_TO}{0xc8}\p" + .string "{CLEAR_TO}{0x0a}Wanted item{CLEAR_TO}{0x7c}Trade item\n" + .string "{CLEAR_TO}{0x06}YELLOW SHARD{CLEAR_TO}{0x59}{0x7B}{0x7C}{CLEAR_TO}{0x73}THUNDERSTONE{CLEAR_TO}{0xc8}\p" + .string "{CLEAR_TO}{0x0a}Wanted item{CLEAR_TO}{0x7c}Trade item\n" + .string "{CLEAR_TO}{0x0c}BLUE SHARD{CLEAR_TO}{0x59}{0x7B}{0x7C}{CLEAR_TO}{0x79}WATER STONE{CLEAR_TO}{0xc8}\p" + .string "{CLEAR_TO}{0x0a}Wanted item{CLEAR_TO}{0x7c}Trade item\n" + .string "{CLEAR_TO}{0x08}GREEN SHARD{CLEAR_TO}{0x59}{0x7B}{0x7C}{CLEAR_TO}{0x7b}LEAF STONE$" diff --git a/data/maps/Route125/events.inc b/data/maps/Route125/events.inc new file mode 100644 index 000000000..b767e512d --- /dev/null +++ b/data/maps/Route125/events.inc @@ -0,0 +1,24 @@ +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 + +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 + +Route125_MapEvents:: @ 852C634 + map_events Route125_EventObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents + diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc new file mode 100644 index 000000000..2dda3fb2d --- /dev/null +++ b/data/maps/Route125/scripts.inc @@ -0,0 +1,93 @@ +Route125_MapScripts:: @ 81F6748 + map_script 3, Route125_MapScript1_1F6758 + map_script 1, Route125_MapScript1_1F6783 + map_script 2, Route125_MapScript2_1F679A + .byte 0 + +Route125_MapScript1_1F6758: @ 81F6758 + checkflag FLAG_SYS_WEATHER_CTRL + call_if 1, Route125_EventScript_27207A + compare VAR_0x4039, 1 + call_if 1, Route125_EventScript_273D13 + compare VAR_0x4037, 11 + call_if 1, Route125_EventScript_273D17 + compare VAR_0x4037, 12 + call_if 1, Route125_EventScript_273D17 + end + +Route125_MapScript1_1F6783: @ 81F6783 + compare VAR_0x4037, 11 + call_if 1, Route125_EventScript_273A85 + compare VAR_0x4037, 12 + call_if 1, Route125_EventScript_273AF2 + end + +Route125_MapScript2_1F679A: @ 81F679A + map_script_2 VAR_0x4039, 1, gUnknown_08273D1F + .2byte 0 + +Route125_EventScript_1F67A4:: @ 81F67A4 + trainerbattle 0, TRAINER_NOLEN, 0, Route125_Text_2A1527, Route125_Text_2A155A + msgbox Route125_Text_2A1567, 6 + end + +Route125_EventScript_1F67BB:: @ 81F67BB + trainerbattle 0, TRAINER_STAN, 0, Route125_Text_2A159F, Route125_Text_2A15C7 + msgbox Route125_Text_2A15D5, 6 + end + +Route125_EventScript_1F67D2:: @ 81F67D2 + trainerbattle 0, TRAINER_TANYA, 0, Route125_Text_2A1615, Route125_Text_2A164D + msgbox Route125_Text_2A165E, 6 + end + +Route125_EventScript_1F67E9:: @ 81F67E9 + trainerbattle 0, TRAINER_SHARON, 0, Route125_Text_2A1686, Route125_Text_2A16C5 + msgbox Route125_Text_2A16CE, 6 + end + +Route125_EventScript_1F6800:: @ 81F6800 + trainerbattle 2, TRAINER_ERNEST_1, 0, Route125_Text_2A16FC, Route125_Text_2A173A, Route125_EventScript_1F682C + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route125_EventScript_1F684B + msgbox Route125_Text_2A1755, 4 + release + end + +Route125_EventScript_1F682C:: @ 81F682C + special sub_80B4808 + waitmovement 0 + msgbox Route125_Text_2A17CF, 4 + setvar VAR_0x8004, 492 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 492 + callstd 8 + release + end + +Route125_EventScript_1F684B:: @ 81F684B + trainerbattle 5, TRAINER_ERNEST_1, 0, Route125_Text_2A180E, Route125_Text_2A1851 + msgbox Route125_Text_2A187A, 6 + end + +Route125_EventScript_1F6862:: @ 81F6862 + trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_2A192B, Route125_Text_2A1989, Route125_Text_2A19F8 + msgbox Route125_Text_2A19A6, 6 + end + +Route125_EventScript_1F687D:: @ 81F687D + trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_2A1A35, Route125_Text_2A1A71, Route125_Text_2A1AD9 + msgbox Route125_Text_2A1A92, 6 + end + +Route125_EventScript_1F6898:: @ 81F6898 + trainerbattle 0, TRAINER_PRESLEY, 0, Route125_Text_2A1B1A, Route125_Text_2A1B4E + msgbox Route125_Text_2A1B70, 6 + end + +Route125_EventScript_1F68AF:: @ 81F68AF + trainerbattle 0, TRAINER_AURON, 0, Route125_Text_2A1BCE, Route125_Text_2A1BFD + msgbox Route125_Text_2A1C2A, 6 + end + diff --git a/data/maps/Route126/events.inc b/data/maps/Route126/events.inc new file mode 100644 index 000000000..cf87bb74e --- /dev/null +++ b/data/maps/Route126/events.inc @@ -0,0 +1,14 @@ +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 + +Route126_MapEvents:: @ 852C720 + map_events Route126_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc new file mode 100644 index 000000000..3ea9ba786 --- /dev/null +++ b/data/maps/Route126/scripts.inc @@ -0,0 +1,69 @@ +Route126_MapScripts:: @ 81F68C6 + map_script 3, Route126_MapScript1_1F68CC + .byte 0 + +Route126_MapScript1_1F68CC: @ 81F68CC + checkflag FLAG_SYS_WEATHER_CTRL + call_if 1, Route126_EventScript_27207A + end + +Route126_EventScript_1F68D6:: @ 81F68D6 + trainerbattle 0, TRAINER_BARRY, 0, Route126_Text_2A1C95, Route126_Text_2A1CC8 + msgbox Route126_Text_2A1CDD, 6 + end + +Route126_EventScript_1F68ED:: @ 81F68ED + trainerbattle 0, TRAINER_DEAN, 0, Route126_Text_2A1D2A, Route126_Text_2A1D63 + msgbox Route126_Text_2A1D72, 6 + end + +Route126_EventScript_1F6904:: @ 81F6904 + trainerbattle 0, TRAINER_NIKKI, 0, Route126_Text_2A1DAE, Route126_Text_2A1DC8 + msgbox Route126_Text_2A1E03, 6 + end + +Route126_EventScript_1F691B:: @ 81F691B + trainerbattle 0, TRAINER_BRENDA, 0, Route126_Text_2A1E3E, Route126_Text_2A1E63 + msgbox Route126_Text_2A1E70, 6 + end + +Route126_EventScript_1F6932:: @ 81F6932 + trainerbattle 0, TRAINER_LEONARDO, 0, Route126_Text_2A2063, Route126_Text_2A20C6 + msgbox Route126_Text_2A20F7, 6 + end + +Route126_EventScript_1F6949:: @ 81F6949 + trainerbattle 0, TRAINER_ISOBEL, 0, Route126_Text_2A216A, Route126_Text_2A21A3 + msgbox Route126_Text_2A21B8, 6 + end + +Route126_EventScript_1F6960:: @ 81F6960 + trainerbattle 0, TRAINER_SIENNA, 0, Route126_Text_2A21EF, Route126_Text_2A2216 + msgbox Route126_Text_2A222A, 6 + end + +Route126_EventScript_1F6977:: @ 81F6977 + trainerbattle 2, TRAINER_PABLO_1, 0, Route126_Text_2A1EA5, Route126_Text_2A1EE3, Route126_EventScript_1F69A3 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route126_EventScript_1F69C2 + msgbox Route126_Text_2A1F10, 4 + release + end + +Route126_EventScript_1F69A3:: @ 81F69A3 + special sub_80B4808 + waitmovement 0 + msgbox Route126_Text_2A1F5A, 4 + setvar VAR_0x8004, 377 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 377 + callstd 8 + release + end + +Route126_EventScript_1F69C2:: @ 81F69C2 + trainerbattle 5, TRAINER_PABLO_1, 0, Route126_Text_2A1F98, Route126_Text_2A1FD8 + msgbox Route126_Text_2A200C, 6 + end + diff --git a/data/maps/Route127/events.inc b/data/maps/Route127/events.inc new file mode 100644 index 000000000..b7c378a96 --- /dev/null +++ b/data/maps/Route127/events.inc @@ -0,0 +1,23 @@ +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 + +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 + +Route127_MapEvents:: @ 852C878 + map_events Route127_EventObjects, 0x0, 0x0, Route127_MapBGEvents + diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc new file mode 100644 index 000000000..12e5bf127 --- /dev/null +++ b/data/maps/Route127/scripts.inc @@ -0,0 +1,88 @@ +Route127_MapScripts:: @ 81F69D9 + map_script 3, Route127_MapScript1_1F69E9 + map_script 1, Route127_MapScript1_1F6A14 + map_script 2, Route127_MapScript2_1F6A2B + .byte 0 + +Route127_MapScript1_1F69E9: @ 81F69E9 + checkflag FLAG_SYS_WEATHER_CTRL + call_if 1, Route127_EventScript_27207A + compare VAR_0x4039, 1 + call_if 1, Route127_EventScript_273D13 + compare VAR_0x4037, 13 + call_if 1, Route127_EventScript_273D17 + compare VAR_0x4037, 14 + call_if 1, Route127_EventScript_273D17 + end + +Route127_MapScript1_1F6A14: @ 81F6A14 + compare VAR_0x4037, 13 + call_if 1, Route127_EventScript_273B5F + compare VAR_0x4037, 14 + call_if 1, Route127_EventScript_273BCC + end + +Route127_MapScript2_1F6A2B: @ 81F6A2B + map_script_2 VAR_0x4039, 1, gUnknown_08273D1F + .2byte 0 + +Route127_EventScript_1F6A35:: @ 81F6A35 + trainerbattle 0, TRAINER_CAMDEN, 0, Route127_Text_2A225F, Route127_Text_2A2294 + msgbox Route127_Text_2A22A1, 6 + end + +Route127_EventScript_1F6A4C:: @ 81F6A4C + trainerbattle 0, TRAINER_DONNY, 0, Route127_Text_2A22DD, Route127_Text_2A2315 + msgbox Route127_Text_2A232C, 6 + end + +Route127_EventScript_1F6A63:: @ 81F6A63 + trainerbattle 0, TRAINER_JONAH, 0, Route127_Text_2A2381, Route127_Text_2A23E1 + msgbox Route127_Text_2A240C, 6 + end + +Route127_EventScript_1F6A7A:: @ 81F6A7A + trainerbattle 0, TRAINER_HENRY, 0, Route127_Text_2A2450, Route127_Text_2A2483 + msgbox Route127_Text_2A2494, 6 + end + +Route127_EventScript_1F6A91:: @ 81F6A91 + trainerbattle 0, TRAINER_ROGER, 0, Route127_Text_2A24C6, Route127_Text_2A250B + msgbox Route127_Text_2A2538, 6 + end + +Route127_EventScript_1F6AA8:: @ 81F6AA8 + trainerbattle 0, TRAINER_AIDAN, 0, Route127_Text_2A257A, Route127_Text_2A25C1 + msgbox Route127_Text_2A25D2, 6 + end + +Route127_EventScript_1F6ABF:: @ 81F6ABF + trainerbattle 0, TRAINER_ATHENA, 0, Route127_Text_2A27D0, Route127_Text_2A27FC + msgbox Route127_Text_2A2832, 6 + end + +Route127_EventScript_1F6AD6:: @ 81F6AD6 + trainerbattle 2, TRAINER_KOJI_1, 0, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route127_EventScript_1F6B21 + msgbox Route127_Text_2A26AC, 4 + release + end + +Route127_EventScript_1F6B02:: @ 81F6B02 + special sub_80B4808 + waitmovement 0 + msgbox Route127_Text_2A26EE, 4 + setvar VAR_0x8004, 672 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 672 + callstd 8 + release + end + +Route127_EventScript_1F6B21:: @ 81F6B21 + trainerbattle 5, TRAINER_KOJI_1, 0, Route127_Text_2A2734, Route127_Text_2A276B + msgbox Route127_Text_2A278E, 6 + end + diff --git a/data/maps/Route128/events.inc b/data/maps/Route128/events.inc new file mode 100644 index 000000000..c34f6eb16 --- /dev/null +++ b/data/maps/Route128/events.inc @@ -0,0 +1,20 @@ +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 + +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 + +Route128_MapEvents:: @ 852C9A0 + map_events Route128_EventObjects, 0x0, 0x0, Route128_MapBGEvents + diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc new file mode 100644 index 000000000..8e2742ff5 --- /dev/null +++ b/data/maps/Route128/scripts.inc @@ -0,0 +1,311 @@ +Route128_MapScripts:: @ 81F6B38 + map_script 3, Route128_MapScript1_1F6B43 + map_script 2, Route128_MapScript2_1F6B4D + .byte 0 + +Route128_MapScript1_1F6B43: @ 81F6B43 + checkflag FLAG_SYS_WEATHER_CTRL + call_if 1, Route128_EventScript_27207A + end + +Route128_MapScript2_1F6B4D: @ 81F6B4D + map_script_2 VAR_0x407B, 1, Route128_EventScript_1F6B57 + .2byte 0 + +Route128_EventScript_1F6B57:: @ 81F6B57 + lockall + delay 20 + applymovement 4, Route128_Movement_1F6C89 + waitmovement 0 + msgbox Route128_Text_1F6DF5, 4 + closemessage + applymovement 4, Route128_Movement_1F6C91 + waitmovement 0 + msgbox Route128_Text_1F6E48, 4 + closemessage + applymovement 5, Route128_Movement_1F6CAD + waitmovement 0 + applymovement 4, Route128_Movement_2725A6 + waitmovement 0 + msgbox Route128_Text_1F6E5A, 4 + closemessage + applymovement 5, Route128_Movement_1F6CBB + waitmovement 0 + applymovement 255, Route128_Movement_2725A6 + waitmovement 0 + msgbox Route128_Text_1F6F1E, 4 + closemessage + applymovement 4, Route128_Movement_1F6C96 + applymovement 255, Route128_Movement_2725A4 + applymovement 5, Route128_Movement_1F6CA8 + waitmovement 0 + msgbox Route128_Text_1F704F, 4 + closemessage + delay 40 + applymovement 5, Route128_Movement_1F6CB0 + applymovement 4, Route128_Movement_1F6C9B + waitmovement 0 + removeobject 5 + removeobject 4 + delay 100 + setfieldeffectargument 0, 1 + dofieldeffect 30 + waitfieldeffect 30 + addobject 3 + applymovement 3, Route128_Movement_1F6C87 + waitmovement 0 + applymovement 255, Route128_Movement_2725A8 + waitmovement 0 + msgbox Route128_Text_1F70C9, 4 + closemessage + applymovement 3, Route128_Movement_1F6C85 + applymovement 255, Route128_Movement_2725A6 + waitmovement 0 + msgbox Route128_Text_1F70EA, 4 + applymovement 3, Route128_Movement_2725AA + waitmovement 0 + msgbox Route128_Text_1F721B, 4 + closemessage + applymovement 3, Route128_Movement_2725AA + waitmovement 0 + delay 50 + setfieldeffectargument 0, 1 + dofieldeffect 30 + delay 15 + removeobject 3 + waitfieldeffect 30 + clearflag FLAG_SPECIAL_FLAG_0x4000 + setvar VAR_0x407B, 2 + releaseall + end + +Route128_Movement_1F6C76: @ 81F6C76 + walk_fast_left + step_end + +Route128_Movement_1F6C78: @ 81F6C78 + 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 + walk_up + step_end + +Route128_Movement_1F6C87: @ 81F6C87 + walk_fast_left + step_end + +Route128_Movement_1F6C89: @ 81F6C89 + 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 + lock_facing_direction + walk_slow_up + delay_16 + unlock_facing_direction + step_end + +Route128_Movement_1F6C96: @ 81F6C96 + walk_fast_left + walk_fast_left + walk_fast_left + walk_in_place_fastest_right + step_end + +Route128_Movement_1F6C9B: @ 81F6C9B + 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 + walk_left + walk_left + delay_8 + delay_4 + step_end + +Route128_Movement_1F6CAD: @ 81F6CAD + walk_left + walk_in_place_fastest_down + step_end + +Route128_Movement_1F6CB0: @ 81F6CB0 + 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 + walk_right + walk_in_place_fastest_down + step_end + +Route128_EventScript_1F6CBE:: @ 81F6CBE + trainerbattle 2, TRAINER_ISAIAH_1, 0, Route128_Text_2A287F, Route128_Text_2A28AB, Route128_EventScript_1F6CEA + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route128_EventScript_1F6D09 + msgbox Route128_Text_2A28D7, 4 + release + end + +Route128_EventScript_1F6CEA:: @ 81F6CEA + special sub_80B4808 + waitmovement 0 + msgbox Route128_Text_2A2916, 4 + setvar VAR_0x8004, 376 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 376 + callstd 8 + release + end + +Route128_EventScript_1F6D09:: @ 81F6D09 + trainerbattle 5, TRAINER_ISAIAH_1, 0, Route128_Text_2A2975, Route128_Text_2A29B8 + msgbox Route128_Text_2A29DC, 6 + end + +Route128_EventScript_1F6D20:: @ 81F6D20 + trainerbattle 2, TRAINER_KATELYN_1, 0, Route128_Text_2A2A1F, Route128_Text_2A2A94, Route128_EventScript_1F6D4C + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route128_EventScript_1F6D6B + msgbox Route128_Text_2A2AB7, 4 + release + end + +Route128_EventScript_1F6D4C:: @ 81F6D4C + special sub_80B4808 + waitmovement 0 + msgbox Route128_Text_2A2AF9, 4 + setvar VAR_0x8004, 386 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 386 + callstd 8 + release + end + +Route128_EventScript_1F6D6B:: @ 81F6D6B + trainerbattle 5, TRAINER_KATELYN_1, 0, Route128_Text_2A2B41, Route128_Text_2A2BAB + msgbox Route128_Text_2A2BDD, 6 + end + +Route128_EventScript_1F6D82:: @ 81F6D82 + trainerbattle 0, TRAINER_ALEXA, 0, Route128_Text_2A2C1C, Route128_Text_2A2C79 + msgbox Route128_Text_2A2C95, 6 + end + +Route128_EventScript_1F6D99:: @ 81F6D99 + trainerbattle 0, TRAINER_RUBEN, 0, Route128_Text_2A2CD9, Route128_Text_2A2CFE + msgbox Route128_Text_2A2D0D, 6 + end + +Route128_EventScript_1F6DB0:: @ 81F6DB0 + trainerbattle 0, TRAINER_WAYNE, 0, Route128_Text_2A2D3D, Route128_Text_2A2DA9 + msgbox Route128_Text_2A2DBA, 6 + end + +Route128_EventScript_1F6DC7:: @ 81F6DC7 + trainerbattle 0, TRAINER_HARRISON, 0, Route128_Text_2A2E0F, Route128_Text_2A2E44 + msgbox Route128_Text_2A2E6C, 6 + end + +Route128_EventScript_1F6DDE:: @ 81F6DDE + trainerbattle 0, TRAINER_CARLEE, 0, Route128_Text_2A2EC8, Route128_Text_2A2EFA + msgbox Route128_Text_2A2F2F, 6 + end + +Route128_Text_1F6DF5: @ 81F6DF5 + .string "ARCHIE: What happened…\n" + .string "What is this wretched scene…\p" + .string "Did I…make a horrible mistake?$" + +Route128_Text_1F6E48: @ 81F6E48 + .string "I…\n" + .string "I only wanted…$" + +Route128_Text_1F6E5A: @ 81F6E5A + .string "MAXIE: Do you understand now,\n" + .string "ARCHIE?\p" + .string "Do you finally see how disastrous\n" + .string "your dream turned out to be?\p" + .string "We have to hurry! We have to do\n" + .string "something before the situation goes\l" + .string "completely out of control!$" + +Route128_Text_1F6F1E: @ 81F6F1E + .string "MAXIE: {PLAYER}, don’t say anything.\p" + .string "I know that I have no right to be\n" + .string "critical of ARCHIE…\p" + .string "But the way things are now, I doubt\n" + .string "that we humans will be capable of\l" + .string "doing anything about it.\p" + .string "But neither can we stand by and\n" + .string "just watch helplessly.\p" + .string "The responsibility for putting an end\n" + .string "to this falls to ARCHIE and me…$" + +Route128_Text_1F704F: @ 81F704F + .string "MAXIE: This defies belief…\p" + .string "Those super-ancient POKéMON…\p" + .string "Their power is unbelievable.\n" + .string "They’ve upset the balance of nature…$" + +Route128_Text_1F70C9: @ 81F70C9 + .string "STEVEN: {PLAYER}{KUN}!\n" + .string "What is happening?$" + +Route128_Text_1F70EA: @ 81F70EA + .string "This is terrible…\p" + .string "After the scorching heat wave ended,\n" + .string "this deluge began.\p" + .string "If this doesn’t stop, all of HOENN…\n" + .string "No, the whole world will drown.\p" + .string "This huge rain cloud is spreading\n" + .string "from above SOOTOPOLIS…\p" + .string "What in the world is taking place there?\p" + .string "There’s no point arguing here…\n" + .string "SOOTOPOLIS might provide answers…$" + +Route128_Text_1F721B: @ 81F721B + .string "{PLAYER}{KUN}…\n" + .string "I don’t know what you intend to do,\l" + .string "but don’t do anything reckless.\p" + .string "Okay.\n" + .string "I’m going to SOOTOPOLIS.$" + diff --git a/data/maps/Route129/events.inc b/data/maps/Route129/events.inc new file mode 100644 index 000000000..7c1425ebe --- /dev/null +++ b/data/maps/Route129/events.inc @@ -0,0 +1,10 @@ +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 + +Route129_MapEvents:: @ 852CA2C + map_events Route129_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc new file mode 100644 index 000000000..170d87e56 --- /dev/null +++ b/data/maps/Route129/scripts.inc @@ -0,0 +1,58 @@ +Route129_MapScripts:: @ 81F7284 + map_script 3, Route129_MapScript1_1F72AB + map_script 1, Route129_MapScript1_1F7294 + map_script 2, Route129_MapScript2_1F72E2 + .byte 0 + +Route129_MapScript1_1F7294: @ 81F7294 + compare VAR_0x4037, 15 + call_if 1, Route129_EventScript_273C39 + compare VAR_0x4037, 16 + call_if 1, Route129_EventScript_273CA6 + end + +Route129_MapScript1_1F72AB: @ 81F72AB + compare VAR_0x4039, 1 + call_if 1, Route129_EventScript_273D13 + compare VAR_0x405E, 4 + call_if 4, Route129_EventScript_1F72D8 + compare VAR_0x4037, 15 + call_if 1, Route129_EventScript_273D17 + compare VAR_0x4037, 16 + call_if 1, Route129_EventScript_273D17 + end + +Route129_EventScript_1F72D8:: @ 81F72D8 + checkflag FLAG_SYS_WEATHER_CTRL + call_if 1, Route129_EventScript_27207A + return + +Route129_MapScript2_1F72E2: @ 81F72E2 + map_script_2 VAR_0x4039, 1, gUnknown_08273D1F + .2byte 0 + +Route129_EventScript_1F72EC:: @ 81F72EC + trainerbattle 0, TRAINER_CHASE, 0, Route129_Text_2A2F66, Route129_Text_2A2F9D + msgbox Route129_Text_2A2FB9, 6 + end + +Route129_EventScript_1F7303:: @ 81F7303 + trainerbattle 0, TRAINER_ALLISON, 0, Route129_Text_2A2FF2, Route129_Text_2A3034 + msgbox Route129_Text_2A3048, 6 + end + +Route129_EventScript_1F731A:: @ 81F731A + trainerbattle 0, TRAINER_REED, 0, Route129_Text_2A30CD, Route129_Text_2A30F1 + msgbox Route129_Text_2A3114, 6 + end + +Route129_EventScript_1F7331:: @ 81F7331 + trainerbattle 0, TRAINER_TISHA, 0, Route129_Text_2A314E, Route129_Text_2A317D + msgbox Route129_Text_2A31A6, 6 + end + +Route129_EventScript_1F7348:: @ 81F7348 + trainerbattle 0, TRAINER_CLARENCE, 0, Route129_Text_2A3204, Route129_Text_2A3239 + msgbox Route129_Text_2A3252, 6 + end + diff --git a/data/maps/Route130/events.inc b/data/maps/Route130/events.inc new file mode 100644 index 000000000..ad1429553 --- /dev/null +++ b/data/maps/Route130/events.inc @@ -0,0 +1,9 @@ +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 + +Route130_MapEvents:: @ 852CAA0 + map_events Route130_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc new file mode 100644 index 000000000..26278cf50 --- /dev/null +++ b/data/maps/Route130/scripts.inc @@ -0,0 +1,52 @@ +Route130_MapScripts:: @ 81F735F + map_script 3, Route130_MapScript1_1F7365 + .byte 0 + +Route130_MapScript1_1F7365: @ 81F7365 + compare VAR_0x405E, 4 + call_if 4, Route130_EventScript_1F73B5 + specialvar VAR_RESULT, IsMirageIslandPresent + compare VAR_RESULT, 1 + goto_eq Route130_EventScript_1F73B1 + setflag FLAG_0x011 + setflag FLAG_0x012 + setflag FLAG_0x013 + setflag FLAG_0x014 + setflag FLAG_0x015 + setflag FLAG_0x016 + setflag FLAG_0x017 + setflag FLAG_0x018 + setflag FLAG_0x019 + setflag FLAG_0x01A + setflag FLAG_0x01B + setflag FLAG_0x01C + setflag FLAG_0x01D + setflag FLAG_0x01E + setflag FLAG_0x01F + setmaplayoutindex 263 + end + +Route130_EventScript_1F73B1:: @ 81F73B1 + setmaplayoutindex 46 + end + +Route130_EventScript_1F73B5:: @ 81F73B5 + checkflag FLAG_SYS_WEATHER_CTRL + call_if 1, Route130_EventScript_27207A + return + +Route130_EventScript_1F73BF:: @ 81F73BF + trainerbattle 0, TRAINER_RODNEY, 0, Route130_Text_2A328A, Route130_Text_2A32E6 + msgbox Route130_Text_2A3300, 6 + end + +Route130_EventScript_1F73D6:: @ 81F73D6 + trainerbattle 0, TRAINER_KATIE, 0, Route130_Text_2A3363, Route130_Text_2A33AC + msgbox Route130_Text_2A33F5, 6 + end + +Route130_EventScript_1F73ED:: @ 81F73ED + trainerbattle 0, TRAINER_SANTIAGO, 0, Route130_Text_2A343A, Route130_Text_2A346D + msgbox Route130_Text_2A3494, 6 + end + diff --git a/data/maps/Route131/events.inc b/data/maps/Route131/events.inc new file mode 100644 index 000000000..2bb2c5cbc --- /dev/null +++ b/data/maps/Route131/events.inc @@ -0,0 +1,16 @@ +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 + +Route131_MapWarps: @ 852CB74 + 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/Route131/scripts.inc b/data/maps/Route131/scripts.inc new file mode 100644 index 000000000..566cbef66 --- /dev/null +++ b/data/maps/Route131/scripts.inc @@ -0,0 +1,59 @@ +Route131_MapScripts:: @ 81F7404 + map_script 3, Route131_MapScript1_1F740A + .byte 0 + +Route131_MapScript1_1F740A: @ 81F740A + compare VAR_0x405E, 4 + call_if 4, Route131_EventScript_1F741F + call Route131_EventScript_1F741B + end + +Route131_EventScript_1F741B:: @ 81F741B + setmaplayoutindex 319 + return + +Route131_EventScript_1F741F:: @ 81F741F + checkflag FLAG_SYS_WEATHER_CTRL + call_if 1, Route131_EventScript_27207A + return + +Route131_EventScript_1F7429:: @ 81F7429 + trainerbattle 0, TRAINER_RICHARD, 0, Route131_Text_2A34C8, Route131_Text_2A350D + msgbox Route131_Text_2A353D, 6 + end + +Route131_EventScript_1F7440:: @ 81F7440 + trainerbattle 0, TRAINER_HERMAN, 0, Route131_Text_2A35C6, Route131_Text_2A3626 + msgbox Route131_Text_2A362D, 6 + end + +Route131_EventScript_1F7457:: @ 81F7457 + trainerbattle 0, TRAINER_SUSIE, 0, Route131_Text_2A367B, Route131_Text_2A36AB + msgbox Route131_Text_2A36D6, 6 + end + +Route131_EventScript_1F746E:: @ 81F746E + trainerbattle 0, TRAINER_KARA, 0, Route131_Text_2A3751, Route131_Text_2A378A + msgbox Route131_Text_2A379F, 6 + end + +Route131_EventScript_1F7485:: @ 81F7485 + trainerbattle 4, TRAINER_RELI_AND_IAN, 0, Route131_Text_2A37E9, Route131_Text_2A381F, Route131_Text_2A38B7 + msgbox Route131_Text_2A3855, 6 + end + +Route131_EventScript_1F74A0:: @ 81F74A0 + trainerbattle 4, TRAINER_RELI_AND_IAN, 0, Route131_Text_2A38F8, Route131_Text_2A3925, Route131_Text_2A39CD + msgbox Route131_Text_2A3960, 6 + end + +Route131_EventScript_1F74BB:: @ 81F74BB + trainerbattle 0, TRAINER_TALIA, 0, Route131_Text_2A39FE, Route131_Text_2A3A38 + msgbox Route131_Text_2A3A48, 6 + end + +Route131_EventScript_1F74D2:: @ 81F74D2 + trainerbattle 0, TRAINER_KEVIN, 0, Route131_Text_2A3AA0, Route131_Text_2A3AFC + msgbox Route131_Text_2A3B02, 6 + end + diff --git a/data/maps/Route132/events.inc b/data/maps/Route132/events.inc new file mode 100644 index 000000000..19ff5ccc8 --- /dev/null +++ b/data/maps/Route132/events.inc @@ -0,0 +1,15 @@ +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 + +Route132_MapEvents:: @ 852CC80 + map_events Route132_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/Route132/scripts.inc b/data/maps/Route132/scripts.inc new file mode 100644 index 000000000..a4ae6f716 --- /dev/null +++ b/data/maps/Route132/scripts.inc @@ -0,0 +1,43 @@ +Route132_MapScripts:: @ 81F74E9 + .byte 0 + +Route132_EventScript_1F74EA:: @ 81F74EA + trainerbattle 0, TRAINER_GILBERT, 0, Route132_Text_2A3B4C, Route132_Text_2A3BAC + msgbox Route132_Text_2A3BC0, 6 + end + +Route132_EventScript_1F7501:: @ 81F7501 + trainerbattle 0, TRAINER_DANA, 0, Route132_Text_2A3C04, Route132_Text_2A3C39 + msgbox Route132_Text_2A3C49, 6 + end + +Route132_EventScript_1F7518:: @ 81F7518 + trainerbattle 0, TRAINER_RONALD, 0, Route132_Text_2A3C7F, Route132_Text_2A3CAD + msgbox Route132_Text_2A3CC5, 6 + end + +Route132_EventScript_1F752F:: @ 81F752F + trainerbattle 0, TRAINER_KIYO, 0, Route132_Text_2A3D26, Route132_Text_2A3D6C + msgbox Route132_Text_2A3D8B, 6 + end + +Route132_EventScript_1F7546:: @ 81F7546 + trainerbattle 0, TRAINER_PAXTON, 0, Route132_Text_2A3F4F, Route132_Text_2A3FA8 + msgbox Route132_Text_2A3FE5, 6 + end + +Route132_EventScript_1F755D:: @ 81F755D + trainerbattle 0, TRAINER_DARCY, 0, Route132_Text_2A4026, Route132_Text_2A406E + msgbox Route132_Text_2A40A4, 6 + end + +Route132_EventScript_1F7574:: @ 81F7574 + trainerbattle 0, TRAINER_JONATHAN, 0, Route132_Text_2A3EAC, Route132_Text_2A3EDD + msgbox Route132_Text_2A3F03, 6 + end + +Route132_EventScript_1F758B:: @ 81F758B + trainerbattle 0, TRAINER_MAKAYLA, 0, Route132_Text_2A3DF0, Route132_Text_2A3E2C + msgbox Route132_Text_2A3E4E, 6 + end + diff --git a/data/maps/Route133/events.inc b/data/maps/Route133/events.inc new file mode 100644 index 000000000..6adfce330 --- /dev/null +++ b/data/maps/Route133/events.inc @@ -0,0 +1,15 @@ +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 + +Route133_MapEvents:: @ 852CD84 + map_events Route133_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/Route133/scripts.inc b/data/maps/Route133/scripts.inc new file mode 100644 index 000000000..dc15a5d40 --- /dev/null +++ b/data/maps/Route133/scripts.inc @@ -0,0 +1,38 @@ +Route133_MapScripts:: @ 81F75A2 + .byte 0 + +Route133_EventScript_1F75A3:: @ 81F75A3 + trainerbattle 0, TRAINER_FRANKLIN, 0, Route133_Text_2A40F0, Route133_Text_2A413F + msgbox Route133_Text_2A4154, 6 + end + +Route133_EventScript_1F75BA:: @ 81F75BA + trainerbattle 0, TRAINER_DEBRA, 0, Route133_Text_2A41A8, Route133_Text_2A4200 + msgbox Route133_Text_2A420E, 6 + end + +Route133_EventScript_1F75D1:: @ 81F75D1 + trainerbattle 0, TRAINER_LINDA, 0, Route133_Text_2A4236, Route133_Text_2A4258 + msgbox Route133_Text_2A4264, 6 + end + +Route133_EventScript_1F75E8:: @ 81F75E8 + trainerbattle 0, TRAINER_WARREN, 0, Route133_Text_2A4290, Route133_Text_2A42E0 + msgbox Route133_Text_2A4304, 6 + end + +Route133_EventScript_1F75FF:: @ 81F75FF + trainerbattle 0, TRAINER_BECK, 0, Route133_Text_2A436A, Route133_Text_2A439C + msgbox Route133_Text_2A43B9, 6 + end + +Route133_EventScript_1F7616:: @ 81F7616 + trainerbattle 0, TRAINER_MOLLIE, 0, Route133_Text_2A4401, Route133_Text_2A443A + msgbox Route133_Text_2A4477, 6 + end + +Route133_EventScript_1F762D:: @ 81F762D + trainerbattle 0, TRAINER_CONOR, 0, Route133_Text_2A44BA, Route133_Text_2A4505 + msgbox Route133_Text_2A4527, 6 + end + diff --git a/data/maps/Route134/events.inc b/data/maps/Route134/events.inc new file mode 100644 index 000000000..5a2d57417 --- /dev/null +++ b/data/maps/Route134/events.inc @@ -0,0 +1,16 @@ +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 + +Route134_MapEvents:: @ 852CEA0 + map_events Route134_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc new file mode 100644 index 000000000..bdec88c42 --- /dev/null +++ b/data/maps/Route134/scripts.inc @@ -0,0 +1,53 @@ +Route134_MapScripts:: @ 81F7644 + map_script 5, Route134_MapScript1_1F764A + .byte 0 + +Route134_MapScript1_1F764A: @ 81F764A + setdivewarp MAP_UNDERWATER_ROUTE134, 255, 8, 6 + end + +Route134_EventScript_1F7653:: @ 81F7653 + trainerbattle 0, TRAINER_JACK, 0, Route134_Text_2A4571, Route134_Text_2A45BB + msgbox Route134_Text_2A45C5, 6 + end + +Route134_EventScript_1F766A:: @ 81F766A + trainerbattle 0, TRAINER_LAUREL, 0, Route134_Text_2A4609, Route134_Text_2A4643 + msgbox Route134_Text_2A464B, 6 + end + +Route134_EventScript_1F7681:: @ 81F7681 + trainerbattle 0, TRAINER_ALEX, 0, Route134_Text_2A4682, Route134_Text_2A46BE + msgbox Route134_Text_2A46D2, 6 + end + +Route134_EventScript_1F7698:: @ 81F7698 + trainerbattle 0, TRAINER_AARON, 0, Route134_Text_2A479E, Route134_Text_2A47E1 + msgbox Route134_Text_2A47FD, 6 + end + +Route134_EventScript_1F76AF:: @ 81F76AF + trainerbattle 0, TRAINER_HITOSHI, 0, Route134_Text_2A4709, Route134_Text_2A4745 + msgbox Route134_Text_2A475D, 6 + end + +Route134_EventScript_1F76C6:: @ 81F76C6 + trainerbattle 0, TRAINER_HUDSON, 0, Route134_Text_2A4A8F, Route134_Text_2A4AC1 + msgbox Route134_Text_2A4AD8, 6 + end + +Route134_EventScript_1F76DD:: @ 81F76DD + trainerbattle 0, TRAINER_REYNA, 0, Route134_Text_2A49E9, Route134_Text_2A4A10 + msgbox Route134_Text_2A4A34, 6 + end + +Route134_EventScript_1F76F4:: @ 81F76F4 + trainerbattle 0, TRAINER_MARLEY, 0, Route134_Text_2A4937, Route134_Text_2A496B + msgbox Route134_Text_2A49B1, 6 + end + +Route134_EventScript_1F770B:: @ 81F770B + trainerbattle 0, TRAINER_KELVIN, 0, Route134_Text_2A4875, Route134_Text_2A489B + msgbox Route134_Text_2A48BD, 6 + end + diff --git a/data/maps/RustboroCity/events.inc b/data/maps/RustboroCity/events.inc new file mode 100644 index 000000000..b71bdb875 --- /dev/null +++ b/data/maps/RustboroCity/events.inc @@ -0,0 +1,70 @@ +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 + +RustboroCity_MapWarps: @ 8526960 + 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 + 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 + +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 + +RustboroCity_MapEvents:: @ 8526B88 + map_events RustboroCity_EventObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents + diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc new file mode 100644 index 000000000..6eb8d48bc --- /dev/null +++ b/data/maps/RustboroCity/scripts.inc @@ -0,0 +1,1310 @@ +RustboroCity_MapScripts:: @ 81E06BD + map_script 3, RustboroCity_MapScript1_1E06C8 + map_script 2, RustboroCity_MapScript2_1E070B + .byte 0 + +RustboroCity_MapScript1_1E06C8: @ 81E06C8 + setflag FLAG_VISITED_RUSTBORO_CITY + call RustboroCity_EventScript_271ED7 + compare VAR_0x405A, 6 + call_if 1, RustboroCity_EventScript_1E0707 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_0x405A, 6 + goto_eq RustboroCity_EventScript_1E06EC + end + +RustboroCity_EventScript_1E06EC:: @ 81E06EC + compare VAR_TEMP_0, 11 + goto_eq RustboroCity_EventScript_1E06FF + setobjectxyperm 15, 12, 15 + end + +RustboroCity_EventScript_1E06FF:: @ 81E06FF + setobjectxyperm 15, 11, 15 + end + +RustboroCity_EventScript_1E0707:: @ 81E0707 + setflag FLAG_SPECIAL_FLAG_0x4000 + return + +RustboroCity_MapScript2_1E070B: @ 81E070B + map_script_2 VAR_0x405A, 6, RustboroCity_EventScript_1E0715 + .2byte 0 + +RustboroCity_EventScript_1E0715:: @ 81E0715 + lockall + setvar VAR_0x4063, 1 + applymovement 255, RustboroCity_Movement_1E0850 + waitmovement 0 + playse SE_KAIDAN + delay 10 + addobject 15 + applymovement 15, RustboroCity_Movement_1E0852 + waitmovement 0 + playse SE_PIN + applymovement 15, RustboroCity_Movement_272598 + waitmovement 0 + applymovement 15, RustboroCity_Movement_27259A + waitmovement 0 + applymovement 255, RustboroCity_Movement_2725A6 + waitmovement 0 + applymovement 15, RustboroCity_Movement_1E084E + waitmovement 0 + msgbox RustboroCity_Text_1E22A5, 4 + closemessage + setflag FLAG_HAS_MATCH_CALL + applymovement 15, RustboroCity_Movement_2725A4 + waitmovement 0 + playse SE_TK_KASYA + delay 10 + playse SE_TK_KASYA + delay 10 + playse SE_TK_KASYA + delay 10 + playse SE_TK_KASYA + delay 20 + applymovement 15, RustboroCity_Movement_2725AA + waitmovement 0 + msgbox RustboroCity_Text_1E2331, 4 + closemessage + delay 20 + goto RustboroCity_EventScript_1E07BD + +RustboroCity_EventScript_1E07AC:: @ 81E07AC + msgbox RustboroCity_Text_1E2449, 4 + closemessage + delay 10 + goto RustboroCity_EventScript_1E07BD + +RustboroCity_EventScript_1E07BD:: @ 81E07BD + setflag FLAG_0x130 + special sp106_CreateStartMenu + waitstate + switch VAR_RESULT + case 0, RustboroCity_EventScript_1E07AC + case 1, RustboroCity_EventScript_1E07AC + case 2, RustboroCity_EventScript_1E07AC + case 4, RustboroCity_EventScript_1E07AC + case 5, RustboroCity_EventScript_1E07AC + case 6, RustboroCity_EventScript_1E07AC + case 7, RustboroCity_EventScript_1E07AC + case 127, RustboroCity_EventScript_1E07AC + special sub_81C72A4 + waitstate + delay 20 + msgbox RustboroCity_Text_1E2464, 4 + closemessage + applymovement 15, RustboroCity_Movement_1E085D + waitmovement 0 + playse SE_KAIDAN + removeobject 15 + setflag FLAG_0x34C + setvar VAR_0x405A, 7 + clearflag FLAG_SPECIAL_FLAG_0x4000 + releaseall + end + +RustboroCity_Movement_1E084E: @ 81E084E + walk_in_place_down + step_end + +RustboroCity_Movement_1E0850: @ 81E0850 + walk_down + step_end + +RustboroCity_Movement_1E0852: @ 81E0852 + walk_down + delay_16 + step_end + +RustboroCity_Movement_1E0855: @ 81E0855 + delay_16 + walk_left + walk_down + walk_down + walk_right + walk_in_place_fastest_up + delay_16 + step_end + +RustboroCity_Movement_1E085D: @ 81E085D + walk_up + step_end + +RustboroCity_EventScript_1E085F:: @ 81E085F + lock + faceplayer + checkflag FLAG_0x08E + goto_eq RustboroCity_EventScript_1E0874 + msgbox RustboroCity_Text_1E123F, 4 + release + end + +RustboroCity_EventScript_1E0874:: @ 81E0874 + msgbox RustboroCity_Text_1E12AC, 4 + release + end + +RustboroCity_EventScript_1E087E:: @ 81E087E + lock + faceplayer + msgbox RustboroCity_Text_1E1407, 4 + release + end + +RustboroCity_EventScript_1E088A:: @ 81E088A + msgbox RustboroCity_Text_1E1480, 2 + end + +RustboroCity_EventScript_1E0893:: @ 81E0893 + lock + faceplayer + checkflag FLAG_BADGE01_GET + goto_eq RustboroCity_EventScript_1E08A8 + msgbox RustboroCity_Text_1E130D, 4 + release + end + +RustboroCity_EventScript_1E08A8:: @ 81E08A8 + msgbox RustboroCity_Text_1E139E, 4 + release + end + +RustboroCity_EventScript_1E08B2:: @ 81E08B2 + lock + faceplayer + checkflag FLAG_0x0BC + goto_eq RustboroCity_EventScript_1E08C7 + msgbox RustboroCity_Text_1E1520, 4 + release + end + +RustboroCity_EventScript_1E08C7:: @ 81E08C7 + msgbox RustboroCity_Text_1E1589, 4 + release + end + +RustboroCity_EventScript_1E08D1:: @ 81E08D1 + msgbox RustboroCity_Text_1E1633, 2 + end + +RustboroCity_EventScript_1E08DA:: @ 81E08DA + msgbox RustboroCity_Text_1E1695, 3 + end + +RustboroCity_EventScript_1E08E3:: @ 81E08E3 + msgbox RustboroCity_Text_1E20A6, 3 + end + +RustboroCity_EventScript_1E08EC:: @ 81E08EC + msgbox RustboroCity_Text_1E2128, 3 + end + +RustboroCity_EventScript_1E08F5:: @ 81E08F5 + msgbox RustboroCity_Text_1E2167, 3 + end + +RustboroCity_EventScript_1E08FE:: @ 81E08FE + msgbox RustboroCity_Text_1E21B3, 3 + end + +RustboroCity_EventScript_1E0907:: @ 81E0907 + msgbox RustboroCity_Text_1E220B, 3 + end + +RustboroCity_EventScript_1E0910:: @ 81E0910 + msgbox RustboroCity_Text_1E2253, 3 + end + +RustboroCity_EventScript_1E0919:: @ 81E0919 + msgbox RustboroCity_Text_1E2296, 3 + end + +RustboroCity_EventScript_1E0922:: @ 81E0922 + lock + faceplayer + msgbox RustboroCity_Text_1E16F4, 4 + applymovement 7, RustboroCity_Movement_2725A2 + waitmovement 0 + release + end + +RustboroCity_EventScript_1E0938:: @ 81E0938 + lock + faceplayer + msgbox RustboroCity_Text_1E174B, 4 + applymovement 8, RustboroCity_Movement_2725A2 + waitmovement 0 + release + end + +RustboroCity_EventScript_1E094E:: @ 81E094E + lock + faceplayer + msgbox RustboroCity_Text_1E1789, 4 + release + end + +RustboroCity_EventScript_1E095A:: @ 81E095A + lockall + setobjectxyperm 9, 14, 21 + setobjectmovementtype 9, 10 + setvar VAR_0x8004, 0 + goto RustboroCity_EventScript_1E09CD + end + +RustboroCity_EventScript_1E0971:: @ 81E0971 + lockall + setobjectxyperm 9, 14, 21 + setobjectmovementtype 9, 10 + setvar VAR_0x8004, 1 + goto RustboroCity_EventScript_1E09CD + end + +RustboroCity_EventScript_1E0988:: @ 81E0988 + lockall + setobjectxyperm 9, 14, 21 + setobjectmovementtype 9, 10 + setvar VAR_0x8004, 2 + goto RustboroCity_EventScript_1E09CD + end + +RustboroCity_EventScript_1E099F:: @ 81E099F + lockall + setobjectxyperm 9, 14, 21 + setobjectmovementtype 9, 10 + setvar VAR_0x8004, 3 + goto RustboroCity_EventScript_1E09CD + end + +RustboroCity_EventScript_1E09B6:: @ 81E09B6 + lockall + setobjectxyperm 9, 14, 21 + setobjectmovementtype 9, 10 + setvar VAR_0x8004, 4 + goto RustboroCity_EventScript_1E09CD + end + +RustboroCity_EventScript_1E09CD:: @ 81E09CD + msgbox RustboroCity_Text_1E17FE, 4 + closemessage + playbgm MUS_AQA_0, 0 + addobject 10 + addobject 9 + applymovement 10, RustboroCity_Movement_1E0AA0 + waitmovement 0 + removeobject 10 + applymovement 9, RustboroCity_Movement_1E0AB1 + waitmovement 0 + msgbox RustboroCity_Text_1E1817, 4 + closemessage + applymovement 9, RustboroCity_Movement_1E0AB9 + waitmovement 0 + fadedefaultbgm + removeobject 9 + setobjectxyperm 9, 30, 10 + clearflag FLAG_0x2DC + setflag FLAG_0x08E + setvar VAR_0x405A, 2 + setvar VAR_0x409A, 2 + setvar VAR_0x406F, 1 + clearflag FLAG_0x37B + clearflag FLAG_0x370 + clearflag FLAG_0x36E + setflag FLAG_0x2E3 + setflag FLAG_0x371 + releaseall + end + +RustboroCity_EventScript_1E0A3B:: @ 81E0A3B + msgbox RustboroCity_Text_1E1904, 4 + return + +RustboroCity_EventScript_1E0A44:: @ 81E0A44 + msgbox RustboroCity_Text_1E194D, 4 + return + +RustboroCity_EventScript_1E0A4D:: @ 81E0A4D + applymovement 9, RustboroCity_Movement_1E0AC1 + waitmovement 0 + return + +RustboroCity_EventScript_1E0A58:: @ 81E0A58 + applymovement 9, RustboroCity_Movement_1E0AC5 + waitmovement 0 + return + +RustboroCity_EventScript_1E0A63:: @ 81E0A63 + applymovement 9, RustboroCity_Movement_1E0ACA + waitmovement 0 + return + +RustboroCity_EventScript_1E0A6E:: @ 81E0A6E + applymovement 9, RustboroCity_Movement_1E0ACF + waitmovement 0 + return + +RustboroCity_EventScript_1E0A79:: @ 81E0A79 + applymovement 9, RustboroCity_Movement_1E0AD5 + waitmovement 0 + applymovement 255, RustboroCity_Movement_2725A6 + waitmovement 0 + return + +RustboroCity_Movement_1E0A8E: @ 81E0A8E + 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 + 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 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up + step_end + +RustboroCity_Movement_1E0AB9: @ 81E0AB9 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + step_end + +RustboroCity_Movement_1E0AC1: @ 81E0AC1 + walk_down + walk_right + walk_right + step_end + +RustboroCity_Movement_1E0AC5: @ 81E0AC5 + walk_down + walk_down + walk_right + walk_right + step_end + +RustboroCity_Movement_1E0ACA: @ 81E0ACA + walk_down + walk_down + walk_right + walk_right + step_end + +RustboroCity_Movement_1E0ACF: @ 81E0ACF + walk_down + walk_down + walk_down + walk_right + walk_right + step_end + +RustboroCity_Movement_1E0AD5: @ 81E0AD5 + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_in_place_fastest_down + step_end + +RustboroCity_EventScript_1E0ADD:: @ 81E0ADD + lock + faceplayer + checkflag FLAG_0x08F + goto_eq RustboroCity_EventScript_1E0AF2 + msgbox RustboroCity_Text_1E1904, 4 + release + end + +RustboroCity_EventScript_1E0AF2:: @ 81E0AF2 + waitse + setvar VAR_TEMP_1, 4 + goto RustboroCity_EventScript_1E0C5B + end + +RustboroCity_EventScript_1E0AFE:: @ 81E0AFE + lockall + setvar VAR_TEMP_1, 0 + goto RustboroCity_EventScript_1E0B2E + end + +RustboroCity_EventScript_1E0B0A:: @ 81E0B0A + lockall + setvar VAR_TEMP_1, 1 + goto RustboroCity_EventScript_1E0B2E + end + +RustboroCity_EventScript_1E0B16:: @ 81E0B16 + lockall + setvar VAR_TEMP_1, 2 + goto RustboroCity_EventScript_1E0B2E + end + +RustboroCity_EventScript_1E0B22:: @ 81E0B22 + lockall + setvar VAR_TEMP_1, 3 + goto RustboroCity_EventScript_1E0B2E + end + +RustboroCity_EventScript_1E0B2E:: @ 81E0B2E + compare VAR_TEMP_1, 0 + call_if 1, RustboroCity_EventScript_1E0B6F + compare VAR_TEMP_1, 1 + call_if 1, RustboroCity_EventScript_1E0B9B + compare VAR_TEMP_1, 2 + call_if 1, RustboroCity_EventScript_1E0BC7 + compare VAR_TEMP_1, 3 + call_if 1, RustboroCity_EventScript_1E0BF3 + setflag FLAG_0x09F + setvar VAR_0x405A, 3 + moveobjectoffscreen 9 + msgbox RustboroCity_Text_1E183E, 4 + releaseall + end + +RustboroCity_EventScript_1E0B6F:: @ 81E0B6F + applymovement 9, RustboroCity_Movement_2725A6 + waitmovement 0 + playse SE_PIN + applymovement 9, RustboroCity_Movement_272598 + waitmovement 0 + applymovement 9, RustboroCity_Movement_27259A + waitmovement 0 + applymovement 255, RustboroCity_Movement_2725AA + waitmovement 0 + return + +RustboroCity_EventScript_1E0B9B:: @ 81E0B9B + applymovement 9, RustboroCity_Movement_2725A4 + waitmovement 0 + playse SE_PIN + applymovement 9, RustboroCity_Movement_272598 + waitmovement 0 + applymovement 9, RustboroCity_Movement_27259A + waitmovement 0 + applymovement 255, RustboroCity_Movement_2725AC + waitmovement 0 + return + +RustboroCity_EventScript_1E0BC7:: @ 81E0BC7 + applymovement 9, RustboroCity_Movement_2725AA + waitmovement 0 + playse SE_PIN + applymovement 9, RustboroCity_Movement_272598 + waitmovement 0 + applymovement 9, RustboroCity_Movement_27259A + waitmovement 0 + applymovement 255, RustboroCity_Movement_2725A6 + waitmovement 0 + return + +RustboroCity_EventScript_1E0BF3:: @ 81E0BF3 + applymovement 9, RustboroCity_Movement_2725AA + waitmovement 0 + playse SE_PIN + applymovement 9, RustboroCity_Movement_272598 + waitmovement 0 + applymovement 9, RustboroCity_Movement_27259A + waitmovement 0 + applymovement 9, RustboroCity_Movement_1E0C29 + waitmovement 0 + applymovement 255, RustboroCity_Movement_2725A6 + waitmovement 0 + return + +RustboroCity_Movement_1E0C29: @ 81E0C29 + walk_down + step_end + +RustboroCity_EventScript_1E0C2B:: @ 81E0C2B + lockall + setvar VAR_TEMP_1, 0 + goto RustboroCity_EventScript_1E0C5B + end + +RustboroCity_EventScript_1E0C37:: @ 81E0C37 + lockall + setvar VAR_TEMP_1, 1 + goto RustboroCity_EventScript_1E0C5B + end + +RustboroCity_EventScript_1E0C43:: @ 81E0C43 + lockall + setvar VAR_TEMP_1, 2 + goto RustboroCity_EventScript_1E0C5B + end + +RustboroCity_EventScript_1E0C4F:: @ 81E0C4F + lockall + setvar VAR_TEMP_1, 3 + goto RustboroCity_EventScript_1E0C5B + end + +RustboroCity_EventScript_1E0C5B:: @ 81E0C5B + compare VAR_TEMP_1, 0 + call_if 1, RustboroCity_EventScript_1E0CDC + compare VAR_TEMP_1, 1 + call_if 1, RustboroCity_EventScript_1E0D08 + compare VAR_TEMP_1, 2 + call_if 1, RustboroCity_EventScript_1E0D34 + compare VAR_TEMP_1, 3 + call_if 1, RustboroCity_EventScript_1E0D60 + compare VAR_TEMP_1, 4 + call_if 1, RustboroCity_EventScript_1E0D96 + msgbox RustboroCity_Text_1E194D, 4 + giveitem_std ITEM_GREAT_BALL + compare VAR_RESULT, 0 + call_if 1, RustboroCity_EventScript_1E0CD3 + msgbox RustboroCity_Text_1E1A21, 4 + closemessage + setflag FLAG_0x090 + setflag FLAG_0x2DC + setvar VAR_0x405A, 5 + delay 30 + warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2 + waitstate + releaseall + end + +RustboroCity_EventScript_1E0CD3:: @ 81E0CD3 + msgbox RustboroCity_Text_1E19E5, 4 + return + +RustboroCity_EventScript_1E0CDC:: @ 81E0CDC + applymovement 9, RustboroCity_Movement_2725A6 + waitmovement 0 + playse SE_PIN + applymovement 9, RustboroCity_Movement_272598 + waitmovement 0 + applymovement 9, RustboroCity_Movement_27259A + waitmovement 0 + applymovement 255, RustboroCity_Movement_2725AA + waitmovement 0 + return + +RustboroCity_EventScript_1E0D08:: @ 81E0D08 + applymovement 9, RustboroCity_Movement_2725A8 + waitmovement 0 + playse SE_PIN + applymovement 9, RustboroCity_Movement_272598 + waitmovement 0 + applymovement 9, RustboroCity_Movement_27259A + waitmovement 0 + applymovement 255, RustboroCity_Movement_2725AE + waitmovement 0 + return + +RustboroCity_EventScript_1E0D34:: @ 81E0D34 + applymovement 9, RustboroCity_Movement_2725AA + waitmovement 0 + playse SE_PIN + applymovement 9, RustboroCity_Movement_272598 + waitmovement 0 + applymovement 9, RustboroCity_Movement_27259A + waitmovement 0 + applymovement 255, RustboroCity_Movement_2725A6 + waitmovement 0 + return + +RustboroCity_EventScript_1E0D60:: @ 81E0D60 + applymovement 9, RustboroCity_Movement_2725AA + waitmovement 0 + playse SE_PIN + applymovement 9, RustboroCity_Movement_272598 + waitmovement 0 + applymovement 9, RustboroCity_Movement_27259A + waitmovement 0 + applymovement 9, RustboroCity_Movement_1E0C29 + waitmovement 0 + applymovement 255, RustboroCity_Movement_2725A6 + waitmovement 0 + return + +RustboroCity_EventScript_1E0D96:: @ 81E0D96 + applymovement 9, RustboroCity_Movement_2725A4 + waitmovement 0 + playse SE_PIN + applymovement 9, RustboroCity_Movement_272598 + waitmovement 0 + applymovement 9, RustboroCity_Movement_27259A + waitmovement 0 + return + +RustboroCity_EventScript_1E0DB8:: @ 81E0DB8 + lockall + checkflag FLAG_0x120 + call_if 0, RustboroCity_EventScript_1E0DD1 + applymovement 14, RustboroCity_Movement_27259E + waitmovement 0 + goto RustboroCity_EventScript_1E0FF3 + +Route104_EventScript_1E0DD1:: @ 81E0DD1 +RustboroCity_EventScript_1E0DD1:: @ 81E0DD1 + checkplayergender + compare VAR_RESULT, 0 + goto_eq RustboroCity_EventScript_1E0DE9 + compare VAR_RESULT, 1 + goto_eq RustboroCity_EventScript_1E0DEE + return + +RustboroCity_EventScript_1E0DE9:: @ 81E0DE9 + playbgm MUS_GIRL_SUP, 1 + return + +RustboroCity_EventScript_1E0DEE:: @ 81E0DEE + playbgm MUS_BOY_SUP, 1 + return + +RustboroCity_EventScript_1E0DF3:: @ 81E0DF3 + lockall + call RustboroCity_EventScript_1E0DD1 + applymovement 14, RustboroCity_Movement_2725AA + waitmovement 0 + playse SE_PIN + applymovement 14, RustboroCity_Movement_272598 + waitmovement 0 + applymovement 14, RustboroCity_Movement_27259A + waitmovement 0 + applymovement 14, RustboroCity_Movement_1E120E + waitmovement 0 + applymovement 255, RustboroCity_Movement_2725A6 + waitmovement 0 + goto RustboroCity_EventScript_1E0FF3 + +RustboroCity_EventScript_1E0E33:: @ 81E0E33 + lockall + call RustboroCity_EventScript_1E0DD1 + applymovement 14, RustboroCity_Movement_2725AA + waitmovement 0 + playse SE_PIN + applymovement 14, RustboroCity_Movement_272598 + waitmovement 0 + applymovement 14, RustboroCity_Movement_27259A + waitmovement 0 + applymovement 14, RustboroCity_Movement_1E1215 + waitmovement 0 + applymovement 255, RustboroCity_Movement_2725A6 + waitmovement 0 + goto RustboroCity_EventScript_1E0FF3 + +RustboroCity_EventScript_1E0E73:: @ 81E0E73 + lockall + call RustboroCity_EventScript_1E0DD1 + applymovement 14, RustboroCity_Movement_2725AA + waitmovement 0 + playse SE_PIN + applymovement 14, RustboroCity_Movement_272598 + waitmovement 0 + applymovement 14, RustboroCity_Movement_27259A + waitmovement 0 + applymovement 14, RustboroCity_Movement_1E121B + waitmovement 0 + applymovement 255, RustboroCity_Movement_2725A6 + waitmovement 0 + goto RustboroCity_EventScript_1E0FF3 + +RustboroCity_EventScript_1E0EB3:: @ 81E0EB3 + lockall + call RustboroCity_EventScript_1E0DD1 + applymovement 14, RustboroCity_Movement_2725AA + waitmovement 0 + playse SE_PIN + applymovement 14, RustboroCity_Movement_272598 + waitmovement 0 + applymovement 14, RustboroCity_Movement_27259A + waitmovement 0 + applymovement 14, RustboroCity_Movement_1E1220 + waitmovement 0 + applymovement 255, RustboroCity_Movement_2725A6 + waitmovement 0 + goto RustboroCity_EventScript_1E0FF3 + +RustboroCity_EventScript_1E0EF3:: @ 81E0EF3 + lockall + call RustboroCity_EventScript_1E0DD1 + applymovement 14, RustboroCity_Movement_2725AA + waitmovement 0 + playse SE_PIN + applymovement 14, RustboroCity_Movement_272598 + waitmovement 0 + applymovement 14, RustboroCity_Movement_27259A + waitmovement 0 + applymovement 14, RustboroCity_Movement_1E1224 + waitmovement 0 + applymovement 255, RustboroCity_Movement_2725A6 + waitmovement 0 + goto RustboroCity_EventScript_1E0FF3 + +RustboroCity_EventScript_1E0F33:: @ 81E0F33 + lockall + call RustboroCity_EventScript_1E0DD1 + applymovement 14, RustboroCity_Movement_2725AA + waitmovement 0 + playse SE_PIN + applymovement 14, RustboroCity_Movement_272598 + waitmovement 0 + applymovement 14, RustboroCity_Movement_27259A + waitmovement 0 + applymovement 14, RustboroCity_Movement_1E1227 + waitmovement 0 + applymovement 255, RustboroCity_Movement_2725A6 + waitmovement 0 + goto RustboroCity_EventScript_1E0FF3 + +RustboroCity_EventScript_1E0F73:: @ 81E0F73 + lockall + call RustboroCity_EventScript_1E0DD1 + applymovement 14, RustboroCity_Movement_2725AA + waitmovement 0 + playse SE_PIN + applymovement 14, RustboroCity_Movement_272598 + waitmovement 0 + applymovement 14, RustboroCity_Movement_27259A + waitmovement 0 + applymovement 14, RustboroCity_Movement_1E122B + waitmovement 0 + applymovement 255, RustboroCity_Movement_2725A6 + waitmovement 0 + goto RustboroCity_EventScript_1E0FF3 + +RustboroCity_EventScript_1E0FB3:: @ 81E0FB3 + lockall + call RustboroCity_EventScript_1E0DD1 + applymovement 14, RustboroCity_Movement_2725AA + waitmovement 0 + playse SE_PIN + applymovement 14, RustboroCity_Movement_272598 + waitmovement 0 + applymovement 14, RustboroCity_Movement_27259A + waitmovement 0 + applymovement 14, RustboroCity_Movement_1E1230 + waitmovement 0 + applymovement 255, RustboroCity_Movement_2725A6 + waitmovement 0 + goto RustboroCity_EventScript_1E0FF3 + +RustboroCity_EventScript_1E0FF3:: @ 81E0FF3 + checkplayergender + compare VAR_RESULT, 0 + goto_eq RustboroCity_EventScript_1E100B + compare VAR_RESULT, 1 + goto_eq RustboroCity_EventScript_1E1114 + end + +RustboroCity_EventScript_1E100B:: @ 81E100B + checkflag FLAG_0x0D3 + goto_eq RustboroCity_EventScript_1E10C1 + checkflag FLAG_0x120 + goto_eq RustboroCity_EventScript_1E1070 + setflag FLAG_0x120 + msgbox RustboroCity_Text_1E1A49, 4 + closemessage + delay 30 + playfanfare MUS_ME_TORE_EYE + msgbox RustboroCity_Text_1E1ADB, 4 + waitfanfare + closemessage + delay 30 + setflag FLAG_0x0FD + setvar VAR_0x405A, 8 + setvar VAR_0x4063, 2 + setvar VAR_0x8008, 0 + msgbox RustboroCity_Text_1E1AFA, 5 + compare VAR_RESULT, 1 + goto_eq RustboroCity_EventScript_1E1092 + msgbox RustboroCity_Text_1E1BD3, 4 + call RustboroCity_EventScript_1E10D6 + releaseall + end + +RustboroCity_EventScript_1E1070:: @ 81E1070 + setvar VAR_0x8008, 1 + msgbox RustboroCity_Text_1E1C48, 5 + compare VAR_RESULT, 1 + goto_eq RustboroCity_EventScript_1E1092 + msgbox RustboroCity_Text_1E1BD3, 4 + releaseall + end + +RustboroCity_EventScript_1E1092:: @ 81E1092 + msgbox RustboroCity_Text_1E1C84, 4 + switch VAR_FIRST_POKE + case 0, RustboroCity_EventScript_1E10DB + case 1, RustboroCity_EventScript_1E10EE + case 2, RustboroCity_EventScript_1E1101 + end + +RustboroCity_EventScript_1E10C1:: @ 81E10C1 + msgbox RustboroCity_Text_1E1CE7, 4 + compare VAR_0x8008, 0 + call_if 1, RustboroCity_EventScript_1E10D6 + releaseall + end + +RustboroCity_EventScript_1E10D6:: @ 81E10D6 + savebgm MUS_DUMMY + fadedefaultbgm + return + +RustboroCity_EventScript_1E10DB:: @ 81E10DB + trainerbattle 3, TRAINER_MAY_14, 0, RustboroCity_Text_1E1CC1 + setflag FLAG_0x0D3 + goto RustboroCity_EventScript_1E10C1 + end + +RustboroCity_EventScript_1E10EE:: @ 81E10EE + trainerbattle 3, TRAINER_MAY_15, 0, RustboroCity_Text_1E1CC1 + setflag FLAG_0x0D3 + goto RustboroCity_EventScript_1E10C1 + end + +RustboroCity_EventScript_1E1101:: @ 81E1101 + trainerbattle 3, TRAINER_MAY_10, 0, RustboroCity_Text_1E1CC1 + setflag FLAG_0x0D3 + goto RustboroCity_EventScript_1E10C1 + end + +RustboroCity_EventScript_1E1114:: @ 81E1114 + checkflag FLAG_0x0D3 + goto_eq RustboroCity_EventScript_1E11C0 + checkflag FLAG_0x120 + goto_eq RustboroCity_EventScript_1E1174 + setflag FLAG_0x120 + msgbox RustboroCity_Text_1E1D7D, 4 + closemessage + delay 30 + playfanfare MUS_ME_TORE_EYE + msgbox RustboroCity_Text_1E1E11, 4 + waitfanfare + closemessage + delay 30 + setflag FLAG_0x0FD + setvar VAR_0x405A, 8 + setvar VAR_0x4063, 2 + msgbox RustboroCity_Text_1E1E34, 5 + compare VAR_RESULT, 1 + goto_eq RustboroCity_EventScript_1E1191 + msgbox RustboroCity_Text_1E1F2F, 4 + call RustboroCity_EventScript_1E10D6 + releaseall + end + +RustboroCity_EventScript_1E1174:: @ 81E1174 + msgbox RustboroCity_Text_1E1F76, 5 + compare VAR_RESULT, 1 + goto_eq RustboroCity_EventScript_1E1191 + msgbox RustboroCity_Text_1E1F2F, 4 + releaseall + end + +RustboroCity_EventScript_1E1191:: @ 81E1191 + msgbox RustboroCity_Text_1E1FA9, 4 + switch VAR_FIRST_POKE + case 0, RustboroCity_EventScript_1E11D5 + case 1, RustboroCity_EventScript_1E11E8 + case 2, RustboroCity_EventScript_1E11FB + end + +RustboroCity_EventScript_1E11C0:: @ 81E11C0 + msgbox RustboroCity_Text_1E2002, 4 + compare VAR_0x8008, 0 + call_if 1, RustboroCity_EventScript_1E10D6 + releaseall + end + +RustboroCity_EventScript_1E11D5:: @ 81E11D5 + trainerbattle 3, TRAINER_BRENDAN_10, 0, RustboroCity_Text_1E1FE9 + setflag FLAG_0x0D3 + goto RustboroCity_EventScript_1E11C0 + end + +RustboroCity_EventScript_1E11E8:: @ 81E11E8 + trainerbattle 3, TRAINER_BRENDAN_12, 0, RustboroCity_Text_1E1FE9 + setflag FLAG_0x0D3 + goto RustboroCity_EventScript_1E11C0 + end + +RustboroCity_EventScript_1E11FB:: @ 81E11FB + trainerbattle 3, TRAINER_BRENDAN_11, 0, RustboroCity_Text_1E1FE9 + setflag FLAG_0x0D3 + goto RustboroCity_EventScript_1E11C0 + end + +RustboroCity_Movement_1E120E: @ 81E120E + walk_down + walk_left + walk_left + walk_left + walk_left + walk_down + step_end + +RustboroCity_Movement_1E1215: @ 81E1215 + walk_down + walk_left + walk_left + walk_left + walk_down + step_end + +RustboroCity_Movement_1E121B: @ 81E121B + walk_down + walk_left + walk_left + walk_down + step_end + +RustboroCity_Movement_1E1220: @ 81E1220 + walk_down + walk_left + walk_down + step_end + +RustboroCity_Movement_1E1224: @ 81E1224 + walk_down + walk_down + step_end + +RustboroCity_Movement_1E1227: @ 81E1227 + walk_down + walk_right + walk_down + step_end + +RustboroCity_Movement_1E122B: @ 81E122B + walk_down + walk_right + walk_right + walk_down + step_end + +RustboroCity_Movement_1E1230: @ 81E1230 + walk_down + walk_right + walk_right + walk_right + walk_down + step_end + +RustboroCity_EventScript_1E1236:: @ 81E1236 + msgbox RustboroCity_Text_1E249D, 2 + end + +RustboroCity_Text_1E123F: @ 81E123F + .string "The DEVON CORPORATION…\n" + .string "We all just shorten it to DEVON.\p" + .string "That company makes all sorts of\n" + .string "convenient products.$" + +RustboroCity_Text_1E12AC: @ 81E12AC + .string "Hm? A sneaky-looking man?\p" + .string "Come to think of it, yes, a shady-\n" + .string "looking guy went around the corner.$" + +RustboroCity_Text_1E130D: @ 81E130D + .string "Have you taken the POKéMON GYM\n" + .string "challenge?\p" + .string "When you get that shiny GYM BADGE\n" + .string "in hand, I guess TRAINERS begin to\l" + .string "realize what is required of them.$" + +RustboroCity_Text_1E139E: @ 81E139E + .string "Hey, that’s RUSTBORO’s GYM BADGE!\p" + .string "Out of all the POKéMON GYM BADGES,\n" + .string "RUSTBORO’s is the coolest, I’d say.$" + +RustboroCity_Text_1E1407: @ 81E1407 + .string "Oh? Who might you be?\n" + .string "You’re a new face around these parts.\p" + .string "Have you just transferred into the\n" + .string "POKéMON TRAINER’S SCHOOL?$" + +RustboroCity_Text_1E1480: @ 81E1480 + .string "I challenged the GYM LEADER, but…\p" + .string "It’s not going to be easy winning with\n" + .string "my FIRE-type POKéMON…\p" + .string "FIRE-type POKéMON don’t match up\n" + .string "well against ROCK-type POKéMON…$" + +RustboroCity_Text_1E1520: @ 81E1520 + .string "The old sailor MR. BRINEY lives in\n" + .string "a cottage by the sea.\p" + .string "He goes for walks in the tunnel every\n" + .string "so often.$" + +RustboroCity_Text_1E1589: @ 81E1589 + .string "The old sailor MR. BRINEY lives in\n" + .string "a cottage by the sea.\p" + .string "He said he was going shopping in\n" + .string "SLATEPORT for his pet, PEEKO.\p" + .string "That old sea dog, he must really love\n" + .string "that PEEKO.$" + +RustboroCity_Text_1E1633: @ 81E1633 + .string "Wow, you have POKéMON with you, too.\p" + .string "When I get bigger, I’m going to go\n" + .string "places with POKéMON, too.$" + +RustboroCity_Text_1E1695: @ 81E1695 + .string "POKéMON TRAINER’S SCHOOL!\p" + .string "If I go to this school, will I be able\n" + .string "to catch rare POKéMON easily?$" + +RustboroCity_Text_1E16F4: @ 81E16F4 + .string "If a POKéMON gains experience in\n" + .string "battles, it can sometimes change in\l" + .string "the way it looks.$" + +RustboroCity_Text_1E174B: @ 81E174B + .string "A POKéMON changes shape?\n" + .string "If one did that, I would be shocked!$" + +RustboroCity_Text_1E1789: @ 81E1789 + .string "A POKéMON you get in a trade from\n" + .string "someone grows fast.\p" + .string "But if you don’t have certain GYM\n" + .string "BADGES, it may not obey you…$" + +RustboroCity_Text_1E17FE: @ 81E17FE + .string "Get out!\n" + .string "Out of the way!$" + +RustboroCity_Text_1E1817: @ 81E1817 + .string "Wait! Pleeeaaase!\p" + .string "Don’t take my GOODS!$" + +RustboroCity_Text_1E183E: @ 81E183E + .string "Oh, it’s you!\p" + .string "You’re that fantastic TRAINER who\n" + .string "helped me in PETALBURG WOODS!\p" + .string "Help me! I was robbed by TEAM AQUA!\n" + .string "I have to get the DEVON GOODS back!\p" + .string "If I don’t…\n" + .string "I’m going to be in serious trouble.$" + +RustboroCity_Text_1E1904: @ 81E1904 + .string "That shady character, I think he took\n" + .string "off towards the tunnel over there.$" + +RustboroCity_Text_1E194D: @ 81E194D + .string "Oh! How did it go?\n" + .string "The DEVON GOODS?\p" + .string "You did!\n" + .string "You got them back!\p" + .string "You really are a great TRAINER!\p" + .string "I know! As my thanks, I’ll give you\n" + .string "another GREAT BALL!$" + +RustboroCity_Text_1E19E5: @ 81E19E5 + .string "You’re loaded with items.\n" + .string "I can’t give you this GREAT BALL.$" + +RustboroCity_Text_1E1A21: @ 81E1A21 + .string "Excuse me, please!\n" + .string "Please come with me!$" + +RustboroCity_Text_1E1A49: @ 81E1A49 + .string "MAY: Oh, hi, {PLAYER}{KUN}!\p" + .string "You had a MATCH CALL feature put\n" + .string "on your POKéNAV!\p" + .string "Let’s register each other so we can\n" + .string "contact one another anytime!\p" + .string "… … … … … …$" + +RustboroCity_Text_1E1ADB: @ 81E1ADB + .string "Registered MAY\n" + .string "in the POKéNAV.$" + +RustboroCity_Text_1E1AFA: @ 81E1AFA + .string "MAY: Oh, by the way, I passed\n" + .string "MR. BRINEY in PETALBURG WOODS.\p" + .string "I guess he’s on his way home to his\n" + .string "cottage by the sea.\p" + .string "How’s your POKéDEX coming along,\n" + .string "{PLAYER}{KUN}? Mine’s looking pretty decent!\p" + .string "So…\n" + .string "How about a little battle?$" + +RustboroCity_Text_1E1BD3: @ 81E1BD3 + .string "MAY: Oh, what’s the matter?\p" + .string "Haven’t you caught or raised your\n" + .string "POKéMON very much?\p" + .string "That’s not very good for a TRAINER!$" + +RustboroCity_Text_1E1C48: @ 81E1C48 + .string "MAY: So, what do you think?\n" + .string "How about a little battle here?$" + +RustboroCity_Text_1E1C84: @ 81E1C84 + .string "MAY: You just became a TRAINER,\n" + .string "{PLAYER}{KUN}. I’m not going to lose!$" + +RustboroCity_Text_1E1CC1: @ 81E1CC1 + .string "Yikes!\n" + .string "You’re better than I expected!$" + +RustboroCity_Text_1E1CE7: @ 81E1CE7 + .string "MAY: Oh, by the way, MR. BRINEY, who\n" + .string "I just passed…\p" + .string "{PLAYER}{KUN}, you just moved here so you\n" + .string "might not know this, but MR. BRINEY\l" + .string "was once a revered seafarer.$" + +RustboroCity_Text_1E1D7D: @ 81E1D7D + .string "BRENDAN: Oh, hey, {PLAYER}!\p" + .string "You had a MATCH CALL feature put\n" + .string "on your POKéNAV! Cool!\p" + .string "Let’s register each other so we can\n" + .string "get in touch anytime!\p" + .string "… … … … … …$" + +RustboroCity_Text_1E1E11: @ 81E1E11 + .string "Registered BRENDAN\n" + .string "in the POKéNAV.$" + +RustboroCity_Text_1E1E34: @ 81E1E34 + .string "BRENDAN: By the way, {PLAYER}, I walked\n" + .string "by MR. BRINEY in PETALBURG WOODS.\p" + .string "I bet he was on his way home to his\n" + .string "cottage by the sea.\p" + .string "{PLAYER}, how’s your POKéDEX?\n" + .string "Have you filled in any pages yet?\p" + .string "Mine rules.\p" + .string "Want to have a battle to test how\n" + .string "far you’ve progressed?$" + +RustboroCity_Text_1E1F2F: @ 81E1F2F + .string "BRENDAN: What’s the matter? Don’t have\n" + .string "any confidence in your POKéMON?$" + +RustboroCity_Text_1E1F76: @ 81E1F76 + .string "BRENDAN: What’s up?\n" + .string "Want to have a battle with me?$" + +RustboroCity_Text_1E1FA9: @ 81E1FA9 + .string "BRENDAN: I know you just became\n" + .string "a TRAINER, but I won’t go easy!$" + +RustboroCity_Text_1E1FE9: @ 81E1FE9 + .string "Hmm…\n" + .string "You’re pretty good.$" + +RustboroCity_Text_1E2002: @ 81E2002 + .string "BRENDAN: By the way, you know\n" + .string "MR. BRINEY? The guy I just passed?\p" + .string "I bet you didn’t know this, since you\n" + .string "just moved here, {PLAYER}, but\l" + .string "MR. BRINEY was once a great sailor.$" + +RustboroCity_Text_1E20A6: @ 81E20A6 + .string "“Timesaving tunnel nearing\n" + .string "completion!â€\p" + .string "…Is what it says on the sign, but\n" + .string "there’s also a big “X†splashed\l" + .string "across it in red paint…$" + +RustboroCity_Text_1E2128: @ 81E2128 + .string "DEVON CORPORATION\p" + .string "“For all your living needs, we make\n" + .string "it all.â€$" + +RustboroCity_Text_1E2167: @ 81E2167 + .string "RUSTBORO CITY POKéMON GYM\n" + .string "LEADER: ROXANNE\p" + .string "“The ROCK-loving honors student!â€$" + +RustboroCity_Text_1E21B3: @ 81E21B3 + .string "DEVON CORP. BRANCH OFFICE\p" + .string "“Access limited to DEVON employees\n" + .string "and authorized personnel.â€$" + +RustboroCity_Text_1E220B: @ 81E220B + .string "RUSTBORO CITY\p" + .string "“The city probing the integration of\n" + .string "nature and science.â€$" + +RustboroCity_Text_1E2253: @ 81E2253 + .string "POKéMON TRAINER’S SCHOOL\p" + .string "“We’ll teach you anything about\n" + .string "POKéMON!â€$" + +RustboroCity_Text_1E2296: @ 81E2296 + .string "CUTTER’S HOUSE$" + +RustboroCity_Text_1E22A5: @ 81E22A5 + .string "I’ve been developing an added feature\n" + .string "for the POKéNAV…\p" + .string "And it turned out great!\p" + .string "{PLAYER}, may I see that POKéNAV?\n" + .string "The one our PRESIDENT gave you?$" + +RustboroCity_Text_1E2331: @ 81E2331 + .string "There you go, {PLAYER}!\p" + .string "I added a new feature named\n" + .string "MATCH CALL to your POKéNAV.\p" + .string "Using the MATCH CALL feature,\n" + .string "you can chat with people who have\l" + .string "been registered in your POKéNAV.\p" + .string "{PLAYER}, our PRESIDENT STONE should\n" + .string "be registered in your POKéNAV.\p" + .string "Test it out.\n" + .string "Please give our PRESIDENT a call.$" + +RustboroCity_Text_1E2449: @ 81E2449 + .string "Please select the POKéNAV.$" + +RustboroCity_Text_1E2464: @ 81E2464 + .string "Okay, I’d better get back to work.\n" + .string "Please take care, {PLAYER}!$" + +RustboroCity_Text_1E249D: @ 81E249D + .string "Did you know this?\p" + .string "You can have a 2-on-2 battle even\n" + .string "if you’re not with another TRAINER.\p" + .string "If you catch the eyes of two TRAINERS\n" + .string "when you have two or more POKéMON,\l" + .string "they’ll both challenge you.\p" + .string "Don’t you think it’d be cool if you\n" + .string "could beat two TRAINERS by yourself?$" + diff --git a/data/maps/RustboroCity_CuttersHouse/events.inc b/data/maps/RustboroCity_CuttersHouse/events.inc new file mode 100644 index 000000000..db9b6f56d --- /dev/null +++ b/data/maps/RustboroCity_CuttersHouse/events.inc @@ -0,0 +1,11 @@ +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 + +RustboroCity_CuttersHouse_MapWarps: @ 8530A4C + 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/RustboroCity_CuttersHouse/scripts.inc b/data/maps/RustboroCity_CuttersHouse/scripts.inc new file mode 100644 index 000000000..e5c7527f7 --- /dev/null +++ b/data/maps/RustboroCity_CuttersHouse/scripts.inc @@ -0,0 +1,53 @@ +RustboroCity_CuttersHouse_MapScripts:: @ 8215BD3 + .byte 0 + +RustboroCity_CuttersHouse_EventScript_215BD4:: @ 8215BD4 + lock + faceplayer + checkflag FLAG_0x089 + goto_eq RustboroCity_CuttersHouse_EventScript_215C00 + msgbox RustboroCity_CuttersHouse_Text_215C13, 4 + giveitem_std ITEM_HM01 + setflag FLAG_0x089 + msgbox RustboroCity_CuttersHouse_Text_215D33, 4 + release + end + +RustboroCity_CuttersHouse_EventScript_215C00:: @ 8215C00 + msgbox RustboroCity_CuttersHouse_Text_215D33, 4 + release + end + +RustboroCity_CuttersHouse_EventScript_215C0A:: @ 8215C0A + msgbox RustboroCity_CuttersHouse_Text_215E39, 2 + end + +RustboroCity_CuttersHouse_Text_215C13: @ 8215C13 + .string "That determined expression…\n" + .string "That limber way you move…\l" + .string "And your well-trained POKéMON…\p" + .string "You’re obviously a skilled TRAINER!\p" + .string "No, wait, don’t say a word.\n" + .string "I can tell just by looking at you.\p" + .string "I’m sure that you can put this\n" + .string "HIDDEN MACHINE to good use.\p" + .string "No need to be modest or shy.\n" + .string "Go on, take it!$" + +RustboroCity_CuttersHouse_Text_215D33: @ 8215D33 + .string "That HIDDEN MACHINE, or HM for\n" + .string "short, is CUT.\p" + .string "An HM move is one that can be used\n" + .string "by POKéMON outside of battle.\p" + .string "Any POKéMON that’s learned CUT can\n" + .string "chop down thin trees if the TRAINER\l" + .string "has earned the STONE BADGE.\p" + .string "And, unlike a TM, an HM can be used\n" + .string "more than once.$" + +RustboroCity_CuttersHouse_Text_215E39: @ 8215E39 + .string "When they were expanding the city of\n" + .string "RUSTBORO, my dad helped out.\p" + .string "He made his POKéMON use CUT to clear\n" + .string "the land of trees.$" + diff --git a/data/maps/RustboroCity_DevonCorp_1F/events.inc b/data/maps/RustboroCity_DevonCorp_1F/events.inc new file mode 100644 index 000000000..c6d4048c4 --- /dev/null +++ b/data/maps/RustboroCity_DevonCorp_1F/events.inc @@ -0,0 +1,17 @@ +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 + +RustboroCity_DevonCorp_1F_MapWarps: @ 85303C4 + 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 + bg_event 8, 2, 0, 0, 0, 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_1F/scripts.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc new file mode 100644 index 000000000..97d7dcf78 --- /dev/null +++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc @@ -0,0 +1,153 @@ +RustboroCity_DevonCorp_1F_MapScripts:: @ 8211245 + map_script 3, RustboroCity_DevonCorp_1F_MapScript1_21124B + .byte 0 + +RustboroCity_DevonCorp_1F_MapScript1_21124B: @ 821124B + checkflag FLAG_0x090 + call_if 0, RustboroCity_DevonCorp_1F_EventScript_211255 + end + +RustboroCity_DevonCorp_1F_EventScript_211255:: @ 8211255 + setobjectxyperm 2, 14, 2 + setobjectmovementtype 2, 8 + return + +RustboroCity_DevonCorp_1F_EventScript_211261:: @ 8211261 + lock + faceplayer + checkflag FLAG_0x090 + goto_eq RustboroCity_DevonCorp_1F_EventScript_211289 + checkflag FLAG_0x08E + goto_eq RustboroCity_DevonCorp_1F_EventScript_21127F + msgbox RustboroCity_DevonCorp_1F_Text_2113D1, 4 + release + end + +RustboroCity_DevonCorp_1F_EventScript_21127F:: @ 821127F + msgbox RustboroCity_DevonCorp_1F_Text_211446, 4 + release + end + +RustboroCity_DevonCorp_1F_EventScript_211289:: @ 8211289 + msgbox RustboroCity_DevonCorp_1F_Text_2114DE, 4 + release + end + +RustboroCity_DevonCorp_1F_EventScript_211293:: @ 8211293 + lock + faceplayer + checkflag FLAG_0x090 + goto_eq RustboroCity_DevonCorp_1F_EventScript_2112BA + checkflag FLAG_0x08F + goto_eq RustboroCity_DevonCorp_1F_EventScript_2112C4 + checkflag FLAG_0x08E + goto_eq RustboroCity_DevonCorp_1F_EventScript_2112C4 + msgbox RustboroCity_DevonCorp_1F_Text_21151B, 4 + release + end + +RustboroCity_DevonCorp_1F_EventScript_2112BA:: @ 82112BA + msgbox RustboroCity_DevonCorp_1F_Text_211585, 4 + release + end + +RustboroCity_DevonCorp_1F_EventScript_2112C4:: @ 82112C4 + msgbox RustboroCity_DevonCorp_1F_Text_211558, 4 + release + end + +RustboroCity_DevonCorp_1F_EventScript_2112CE:: @ 82112CE + lock + faceplayer + checkflag FLAG_0x090 + goto_eq RustboroCity_DevonCorp_1F_EventScript_2112F5 + checkflag FLAG_0x08F + goto_eq RustboroCity_DevonCorp_1F_EventScript_2112FF + checkflag FLAG_0x08E + goto_eq RustboroCity_DevonCorp_1F_EventScript_2112FF + msgbox RustboroCity_DevonCorp_1F_Text_21131B, 4 + release + end + +RustboroCity_DevonCorp_1F_EventScript_2112F5:: @ 82112F5 + msgbox RustboroCity_DevonCorp_1F_Text_21131B, 4 + release + end + +RustboroCity_DevonCorp_1F_EventScript_2112FF:: @ 82112FF + msgbox RustboroCity_DevonCorp_1F_Text_21138B, 4 + release + end + +RustboroCity_DevonCorp_1F_EventScript_211309:: @ 8211309 + msgbox RustboroCity_DevonCorp_1F_Text_2115AC, 3 + end + +RustboroCity_DevonCorp_1F_EventScript_211312:: @ 8211312 + msgbox RustboroCity_DevonCorp_1F_Text_211722, 3 + end + +RustboroCity_DevonCorp_1F_Text_21131B: @ 821131B + .string "Hello and welcome to the DEVON\n" + .string "CORPORATION.\p" + .string "We’re proud producers of items and\n" + .string "medicine that enhance your life.$" + +RustboroCity_DevonCorp_1F_Text_21138B: @ 821138B + .string "One of our research staff stupidly\n" + .string "got robbed of an important parcel.$" + +RustboroCity_DevonCorp_1F_Text_2113D1: @ 82113D1 + .string "Hey, those RUNNING SHOES!\n" + .string "They’re one of our products!\p" + .string "It makes me happy when I see someone\n" + .string "using something we made.$" + +RustboroCity_DevonCorp_1F_Text_211446: @ 8211446 + .string "That stolen parcel…\p" + .string "Well, sure it’s important, but it’s not\n" + .string "anything that anyone can use.\p" + .string "In my estimation, that robber must not\n" + .string "have been very bright.$" + +RustboroCity_DevonCorp_1F_Text_2114DE: @ 82114DE + .string "It sounds like they’ve recovered\n" + .string "the ripped-off DEVON GOODS.$" + +RustboroCity_DevonCorp_1F_Text_21151B: @ 821151B + .string "I’m sorry, only authorized people\n" + .string "are allowed to enter here.$" + +RustboroCity_DevonCorp_1F_Text_211558: @ 8211558 + .string "It’s beyond stupid.\n" + .string "How could we get robbed?$" + +RustboroCity_DevonCorp_1F_Text_211585: @ 8211585 + .string "Hi, there!\n" + .string "You’re always welcome here!$" + +RustboroCity_DevonCorp_1F_Text_2115AC: @ 82115AC + .string "Samples of rocks and metal are\n" + .string "displayed in the glass case.\p" + .string "There’s a panel with some writing\n" + .string "on it…\p" + .string "“DEVON CORPORATION got its start as\n" + .string "a producer of stones from quarries.\p" + .string "“The company also produced iron from\n" + .string "filings in the sand.\p" + .string "“From that humble start as a producer\n" + .string "of raw materials, DEVON developed.\p" + .string "“DEVON is now a manufacturer of a wide\n" + .string "range of industrial products.â€$" + +RustboroCity_DevonCorp_1F_Text_211722: @ 8211722 + .string "Prototypes and test products fill\n" + .string "the glass display case.\p" + .string "There’s a panel with a description…\p" + .string "“In addition to industrial products,\n" + .string "DEVON now markets sundries and\l" + .string "pharmaceuticals for better lifestyles.\p" + .string "“Recently, DEVON has begun marketing\n" + .string "tools for POKéMON TRAINERS, including\l" + .string "POKé BALLS and POKéNAV systems.â€$" + diff --git a/data/maps/RustboroCity_DevonCorp_2F/events.inc b/data/maps/RustboroCity_DevonCorp_2F/events.inc new file mode 100644 index 000000000..31a3d1de6 --- /dev/null +++ b/data/maps/RustboroCity_DevonCorp_2F/events.inc @@ -0,0 +1,15 @@ +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 + +RustboroCity_DevonCorp_2F_MapWarps: @ 8530498 + 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/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc new file mode 100644 index 000000000..88f0c2e73 --- /dev/null +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -0,0 +1,407 @@ +RustboroCity_DevonCorp_2F_MapScripts:: @ 8211857 + map_script 3, RustboroCity_DevonCorp_2F_MapScript1_21185D + .byte 0 + +RustboroCity_DevonCorp_2F_MapScript1_21185D: @ 821185D + compare VAR_0x40C4, 1 + call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 + end + +RustboroCity_DevonCorp_2F_EventScript_211869:: @ 8211869 + setvar VAR_0x40C4, 2 + return + +RustboroCity_DevonCorp_2F_EventScript_21186F:: @ 821186F + lock + faceplayer + compare VAR_0x40C4, 1 + call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 + msgbox RustboroCity_DevonCorp_2F_Text_211BFB, 4 + release + end + +RustboroCity_DevonCorp_2F_EventScript_211886:: @ 8211886 + lock + faceplayer + compare VAR_0x40C4, 1 + call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 + checkflag FLAG_0x11F + goto_eq RustboroCity_DevonCorp_2F_EventScript_2118A6 + msgbox RustboroCity_DevonCorp_2F_Text_211C50, 4 + release + end + +RustboroCity_DevonCorp_2F_EventScript_2118A6:: @ 82118A6 + msgbox RustboroCity_DevonCorp_2F_Text_211C99, 4 + release + end + +RustboroCity_DevonCorp_2F_EventScript_2118B0:: @ 82118B0 + lock + faceplayer + compare VAR_0x40C4, 1 + call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 + checkflag FLAG_0x0BC + goto_eq RustboroCity_DevonCorp_2F_EventScript_2118D0 + msgbox RustboroCity_DevonCorp_2F_Text_211D9F, 4 + release + end + +RustboroCity_DevonCorp_2F_EventScript_2118D0:: @ 82118D0 + msgbox RustboroCity_DevonCorp_2F_Text_211DF3, 4 + release + end + +RustboroCity_DevonCorp_2F_EventScript_2118DA:: @ 82118DA + lock + faceplayer + compare VAR_0x40C4, 1 + call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 + msgbox RustboroCity_DevonCorp_2F_Text_211EE0, 4 + release + end + +RustboroCity_DevonCorp_2F_EventScript_2118F1:: @ 82118F1 + lock + faceplayer + compare VAR_0x40C4, 2 + goto_eq RustboroCity_DevonCorp_2F_EventScript_211A03 + compare VAR_0x40C4, 1 + goto_eq RustboroCity_DevonCorp_2F_EventScript_2119F9 + msgbox RustboroCity_DevonCorp_2F_Text_211F48, 4 + checkitem ITEM_ROOT_FOSSIL, 1 + compare VAR_RESULT, 1 + goto_eq RustboroCity_DevonCorp_2F_EventScript_211933 + checkitem ITEM_CLAW_FOSSIL, 1 + compare VAR_RESULT, 1 + goto_eq RustboroCity_DevonCorp_2F_EventScript_211991 + release + end + +RustboroCity_DevonCorp_2F_EventScript_211933:: @ 8211933 + closemessage + playse SE_PIN + applymovement 5, RustboroCity_DevonCorp_2F_Movement_272598 + waitmovement 0 + applymovement 5, RustboroCity_DevonCorp_2F_Movement_27259A + waitmovement 0 + msgbox RustboroCity_DevonCorp_2F_Text_211FA6, 5 + compare VAR_RESULT, 0 + goto_eq RustboroCity_DevonCorp_2F_EventScript_2119EF + checkitem ITEM_CLAW_FOSSIL, 1 + compare VAR_RESULT, 1 + goto_eq RustboroCity_DevonCorp_2F_EventScript_211B84 + goto RustboroCity_DevonCorp_2F_EventScript_211974 + end + +RustboroCity_DevonCorp_2F_EventScript_211974:: @ 8211974 + bufferitemname 0, ITEM_ROOT_FOSSIL + msgbox RustboroCity_DevonCorp_2F_Text_212153, 4 + takeitem ITEM_ROOT_FOSSIL, 1 + setvar VAR_0x40C4, 1 + setvar VAR_0x40C5, 1 + release + end + +RustboroCity_DevonCorp_2F_EventScript_211991:: @ 8211991 + closemessage + playse SE_PIN + applymovement 5, RustboroCity_DevonCorp_2F_Movement_272598 + waitmovement 0 + applymovement 5, RustboroCity_DevonCorp_2F_Movement_27259A + waitmovement 0 + msgbox RustboroCity_DevonCorp_2F_Text_211FA6, 5 + compare VAR_RESULT, 0 + goto_eq RustboroCity_DevonCorp_2F_EventScript_2119EF + checkitem ITEM_ROOT_FOSSIL, 1 + compare VAR_RESULT, 1 + goto_eq RustboroCity_DevonCorp_2F_EventScript_211B84 + goto RustboroCity_DevonCorp_2F_EventScript_2119D2 + end + +RustboroCity_DevonCorp_2F_EventScript_2119D2:: @ 82119D2 + bufferitemname 0, ITEM_CLAW_FOSSIL + msgbox RustboroCity_DevonCorp_2F_Text_212153, 4 + takeitem ITEM_CLAW_FOSSIL, 1 + setvar VAR_0x40C4, 1 + setvar VAR_0x40C5, 2 + release + end + +RustboroCity_DevonCorp_2F_EventScript_2119EF:: @ 82119EF + msgbox RustboroCity_DevonCorp_2F_Text_212046, 4 + release + end + +RustboroCity_DevonCorp_2F_EventScript_2119F9:: @ 82119F9 + msgbox RustboroCity_DevonCorp_2F_Text_2121A2, 4 + release + end + +RustboroCity_DevonCorp_2F_EventScript_211A03:: @ 8211A03 + compare VAR_0x40C5, 1 + goto_eq RustboroCity_DevonCorp_2F_EventScript_211A1A + compare VAR_0x40C5, 2 + goto_eq RustboroCity_DevonCorp_2F_EventScript_211A2C + end + +RustboroCity_DevonCorp_2F_EventScript_211A1A:: @ 8211A1A + bufferspeciesname 1, SPECIES_LILEEP + msgbox RustboroCity_DevonCorp_2F_Text_212251, 4 + goto RustboroCity_DevonCorp_2F_EventScript_211A3E + end + +RustboroCity_DevonCorp_2F_EventScript_211A2C:: @ 8211A2C + bufferspeciesname 1, SPECIES_ANORITH + msgbox RustboroCity_DevonCorp_2F_Text_212251, 4 + goto RustboroCity_DevonCorp_2F_EventScript_211AE1 + end + +RustboroCity_DevonCorp_2F_EventScript_211A3E:: @ 8211A3E + setvar VAR_TEMP_1, 388 + givemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 + compare VAR_RESULT, 0 + goto_eq RustboroCity_DevonCorp_2F_EventScript_211A6E + compare VAR_RESULT, 1 + goto_eq RustboroCity_DevonCorp_2F_EventScript_211A96 + goto RustboroCity_DevonCorp_2F_EventScript_273811 + end + +RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E + call RustboroCity_DevonCorp_2F_EventScript_211AC4 + msgbox gUnknown_08273374, 5 + compare VAR_RESULT, 0 + goto_eq RustboroCity_DevonCorp_2F_EventScript_211AD7 + call RustboroCity_DevonCorp_2F_EventScript_27378B + call RustboroCity_DevonCorp_2F_EventScript_2723DD + goto RustboroCity_DevonCorp_2F_EventScript_211AD7 + end + +RustboroCity_DevonCorp_2F_EventScript_211A96:: @ 8211A96 + call RustboroCity_DevonCorp_2F_EventScript_211AC4 + msgbox gUnknown_08273374, 5 + compare VAR_RESULT, 0 + goto_eq RustboroCity_DevonCorp_2F_EventScript_211AB9 + call RustboroCity_DevonCorp_2F_EventScript_273797 + goto RustboroCity_DevonCorp_2F_EventScript_211AB9 + end + +RustboroCity_DevonCorp_2F_EventScript_211AB9:: @ 8211AB9 + call RustboroCity_DevonCorp_2F_EventScript_2737A0 + goto RustboroCity_DevonCorp_2F_EventScript_211AD7 + end + +RustboroCity_DevonCorp_2F_EventScript_211AC4:: @ 8211AC4 + bufferspeciesname 1, SPECIES_LILEEP + playfanfare MUS_FANFA4 + message RustboroCity_DevonCorp_2F_Text_2122CB + waitmessage + waitfanfare + bufferspeciesname 0, SPECIES_LILEEP + return + +RustboroCity_DevonCorp_2F_EventScript_211AD7:: @ 8211AD7 + setvar VAR_0x40C4, 0 + setflag FLAG_0x10B + release + end + +RustboroCity_DevonCorp_2F_EventScript_211AE1:: @ 8211AE1 + setvar VAR_TEMP_1, 390 + givemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 + compare VAR_RESULT, 0 + goto_eq RustboroCity_DevonCorp_2F_EventScript_211B11 + compare VAR_RESULT, 1 + goto_eq RustboroCity_DevonCorp_2F_EventScript_211B39 + goto RustboroCity_DevonCorp_2F_EventScript_273811 + end + +RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11 + call RustboroCity_DevonCorp_2F_EventScript_211B67 + msgbox gUnknown_08273374, 5 + compare VAR_RESULT, 0 + goto_eq RustboroCity_DevonCorp_2F_EventScript_211B7A + call RustboroCity_DevonCorp_2F_EventScript_27378B + call RustboroCity_DevonCorp_2F_EventScript_2723DD + goto RustboroCity_DevonCorp_2F_EventScript_211B7A + end + +RustboroCity_DevonCorp_2F_EventScript_211B39:: @ 8211B39 + call RustboroCity_DevonCorp_2F_EventScript_211B67 + msgbox gUnknown_08273374, 5 + compare VAR_RESULT, 0 + goto_eq RustboroCity_DevonCorp_2F_EventScript_211B5C + call RustboroCity_DevonCorp_2F_EventScript_273797 + goto RustboroCity_DevonCorp_2F_EventScript_211B5C + end + +RustboroCity_DevonCorp_2F_EventScript_211B5C:: @ 8211B5C + call RustboroCity_DevonCorp_2F_EventScript_2737A0 + goto RustboroCity_DevonCorp_2F_EventScript_211B7A + end + +RustboroCity_DevonCorp_2F_EventScript_211B67:: @ 8211B67 + bufferspeciesname 1, SPECIES_ANORITH + playfanfare MUS_FANFA4 + message RustboroCity_DevonCorp_2F_Text_2122CB + waitmessage + waitfanfare + bufferspeciesname 0, SPECIES_ANORITH + return + +RustboroCity_DevonCorp_2F_EventScript_211B7A:: @ 8211B7A + setvar VAR_0x40C4, 0 + setflag FLAG_0x10B + release + end + +RustboroCity_DevonCorp_2F_EventScript_211B84:: @ 8211B84 + message RustboroCity_DevonCorp_2F_Text_212092 + waitmessage + multichoice 17, 6, 93, 0 + switch VAR_RESULT + case 0, RustboroCity_DevonCorp_2F_EventScript_211BC1 + case 1, RustboroCity_DevonCorp_2F_EventScript_211BC7 + case 2, RustboroCity_DevonCorp_2F_EventScript_211BCD + case 127, RustboroCity_DevonCorp_2F_EventScript_211BCD + end + +RustboroCity_DevonCorp_2F_EventScript_211BC1:: @ 8211BC1 + goto RustboroCity_DevonCorp_2F_EventScript_2119D2 + end + +RustboroCity_DevonCorp_2F_EventScript_211BC7:: @ 8211BC7 + goto RustboroCity_DevonCorp_2F_EventScript_211974 + end + +RustboroCity_DevonCorp_2F_EventScript_211BCD:: @ 8211BCD + release + end + +RustboroCity_DevonCorp_2F_EventScript_211BCF:: @ 8211BCF + lock + faceplayer + compare VAR_0x40C4, 1 + call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 + compare VAR_0x405A, 6 + goto_if 4, RustboroCity_DevonCorp_2F_EventScript_211BF1 + msgbox RustboroCity_DevonCorp_2F_Text_212338, 4 + release + end + +RustboroCity_DevonCorp_2F_EventScript_211BF1:: @ 8211BF1 + msgbox RustboroCity_DevonCorp_2F_Text_212386, 4 + release + end + +RustboroCity_DevonCorp_2F_Text_211BFB: @ 8211BFB + .string "We’re developing a device for talking\n" + .string "with POKéMON.\p" + .string "But we haven’t had much success…$" + +RustboroCity_DevonCorp_2F_Text_211C50: @ 8211C50 + .string "I’m developing new kinds of\n" + .string "POKé BALLS…\p" + .string "But I haven’t made much headway…$" + +RustboroCity_DevonCorp_2F_Text_211C99: @ 8211C99 + .string "We finally made new kinds of\n" + .string "POKé BALLS!\p" + .string "The REPEAT BALL makes it easier to\n" + .string "catch POKéMON you’ve caught before.\p" + .string "The TIMER BALL gets better at catching\n" + .string "POKéMON the longer a battle runs.\p" + .string "Both are proudly developed by\n" + .string "the DEVON CORPORATION.\p" + .string "Please give them a try!$" + +RustboroCity_DevonCorp_2F_Text_211D9F: @ 8211D9F + .string "I made the POKéNAV!\p" + .string "As an engineer, I feel blessed to have\n" + .string "made something so great!$" + +RustboroCity_DevonCorp_2F_Text_211DF3: @ 8211DF3 + .string "Oh, wow!\n" + .string "That’s a POKéNAV!\p" + .string "It came about as a result of our\n" + .string "PRESIDENT’s desire to learn about\l" + .string "the feelings of POKéMON.\p" + .string "Would you like me to describe its\n" + .string "features in detail?\p" + .string "No, no. I think you’ll find out just by\n" + .string "trying the POKéNAV out.$" + +RustboroCity_DevonCorp_2F_Text_211EE0: @ 8211EE0 + .string "I’m trying to develop a device that\n" + .string "visually reproduces the dreams of\l" + .string "POKéMON…\p" + .string "But it’s not going well.$" + +RustboroCity_DevonCorp_2F_Text_211F48: @ 8211F48 + .string "I’ve been trying to develop a device\n" + .string "that resurrects POKéMON from fossils…\p" + .string "And, it’s working!$" + +RustboroCity_DevonCorp_2F_Text_211FA6: @ 8211FA6 + .string "Wait! That thing you have there…\n" + .string "Is that a POKéMON fossil?\p" + .string "Would you like to bring that POKéMON\n" + .string "back to life?\p" + .string "I can with my newly developed\n" + .string "FOSSIL REGENERATOR.$" + +RustboroCity_DevonCorp_2F_Text_212046: @ 8212046 + .string "Oh, is that so?\p" + .string "DEVON’s technological expertise\n" + .string "is outstanding, I tell you.$" + +RustboroCity_DevonCorp_2F_Text_212092: @ 8212092 + .string "Oh, now that’s a surprise!\n" + .string "You have not one, but two, fossils?\p" + .string "Unfortunately, my machine can only\n" + .string "regenerate one POKéMON at a time.\p" + .string "Would you like to pick one of your\n" + .string "fossils for regeneration?$" + +RustboroCity_DevonCorp_2F_Text_212153: @ 8212153 + .string "Excellent!\n" + .string "Let’s do this right away.\p" + .string "{PLAYER} handed the {STR_VAR_1} to\n" + .string "the DEVON RESEARCHER.$" + +RustboroCity_DevonCorp_2F_Text_2121A2: @ 82121A2 + .string "The FOSSIL REGENERATOR, which I made,\n" + .string "is incredible.\p" + .string "But it has one drawback--it takes\n" + .string "a long time to work.\p" + .string "So, uh… How about you go for a stroll\n" + .string "and look around for a while?$" + +RustboroCity_DevonCorp_2F_Text_212251: @ 8212251 + .string "Thanks for waiting!\p" + .string "Your fossilized POKéMON has been\n" + .string "brought back to life!\p" + .string "The fossil was an ancient POKéMON.\n" + .string "{STR_VAR_2}, it was!$" + +RustboroCity_DevonCorp_2F_Text_2122CB: @ 82122CB + .string "{PLAYER} received {STR_VAR_2} from\n" + .string "the DEVON RESEARCHER.$" + +RustboroCity_DevonCorp_2F_Text_2122F5: @ 82122F5 + .string "Uh-oh, you’ve got too many POKéMON.\n" + .string "You have no room for this one.$" + +RustboroCity_DevonCorp_2F_Text_212338: @ 8212338 + .string "I’m trying to develop a new feature\n" + .string "for the POKéNAV…\p" + .string "But it’s not going well.$" + +RustboroCity_DevonCorp_2F_Text_212386: @ 8212386 + .string "Well, now what shall I work on\n" + .string "developing next?\p" + .string "Our company allows us to make our\n" + .string "inspirations into reality.\p" + .string "One couldn’t ask for a better\n" + .string "environment as an engineer.$" + diff --git a/data/maps/RustboroCity_DevonCorp_3F/events.inc b/data/maps/RustboroCity_DevonCorp_3F/events.inc new file mode 100644 index 000000000..8db3c085c --- /dev/null +++ b/data/maps/RustboroCity_DevonCorp_3F/events.inc @@ -0,0 +1,15 @@ +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 + +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 + +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_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc new file mode 100644 index 000000000..ffc2614cb --- /dev/null +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -0,0 +1,311 @@ +RustboroCity_DevonCorp_3F_MapScripts:: @ 821242D + map_script 3, RustboroCity_DevonCorp_3F_MapScript1_21243D + map_script 4, RustboroCity_DevonCorp_3F_MapScript2_212455 + map_script 2, RustboroCity_DevonCorp_3F_MapScript2_212464 + .byte 0 + +RustboroCity_DevonCorp_3F_MapScript1_21243D: @ 821243D + compare VAR_0x408F, 0 + call_if 1, RustboroCity_DevonCorp_3F_EventScript_212449 + end + +RustboroCity_DevonCorp_3F_EventScript_212449:: @ 8212449 + setobjectxyperm 2, 3, 2 + setobjectmovementtype 2, 9 + return + +RustboroCity_DevonCorp_3F_MapScript2_212455: @ 8212455 + map_script_2 VAR_0x408F, 0, RustboroCity_DevonCorp_3F_EventScript_21245F + .2byte 0 + +RustboroCity_DevonCorp_3F_EventScript_21245F:: @ 821245F + turnobject 255, 4 + end + +RustboroCity_DevonCorp_3F_MapScript2_212464: @ 8212464 + map_script_2 VAR_0x408F, 0, RustboroCity_DevonCorp_3F_EventScript_21246E + .2byte 0 + +RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E + lockall + msgbox RustboroCity_DevonCorp_3F_Text_212C37, 4 + closemessage + applymovement 2, RustboroCity_DevonCorp_3F_Movement_212546 + waitmovement 0 + delay 80 + applymovement 2, RustboroCity_DevonCorp_3F_Movement_21254F + waitmovement 0 + msgbox RustboroCity_DevonCorp_3F_Text_212DE8, 4 + closemessage + playbgm MUS_TSURETEK, 0 + applymovement 2, RustboroCity_DevonCorp_3F_Movement_212534 + applymovement 255, RustboroCity_DevonCorp_3F_Movement_212558 + waitmovement 0 + msgbox RustboroCity_DevonCorp_3F_Text_212E2F, 4 + closemessage + fadedefaultbgm + applymovement 2, RustboroCity_DevonCorp_3F_Movement_212543 + applymovement 255, RustboroCity_DevonCorp_3F_Movement_212566 + waitmovement 0 + msgbox RustboroCity_DevonCorp_3F_Text_212609, 4 + giveitem_std ITEM_LETTER + msgbox RustboroCity_DevonCorp_3F_Text_21277C, 4 + playfanfare MUS_FANFA4 + message RustboroCity_DevonCorp_3F_Text_212820 + waitfanfare + setflag FLAG_SYS_POKENAV_GET + setflag FLAG_0x0BC + setflag FLAG_0x3E7 + msgbox RustboroCity_DevonCorp_3F_Text_212837, 4 + closemessage + call RustboroCity_DevonCorp_3F_EventScript_272083 + msgbox RustboroCity_DevonCorp_3F_Text_2129D2, 4 + setflag FLAG_0x37E + clearflag FLAG_0x327 + clearflag FLAG_0x3D7 + clearflag FLAG_0x2E3 + clearflag FLAG_0x371 + setvar VAR_0x4096, 1 + clearflag FLAG_0x32E + setvar VAR_0x408F, 1 + setvar VAR_0x405A, 6 + releaseall + end + +RustboroCity_DevonCorp_3F_Movement_21252F: @ 821252F + walk_up + walk_up + walk_up + walk_in_place_fastest_left + step_end + +RustboroCity_DevonCorp_3F_Movement_212534: @ 8212534 + 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 + delay_16 + walk_in_place_fastest_down + step_end + +RustboroCity_DevonCorp_3F_Movement_212546: @ 8212546 + walk_right + walk_right + walk_right + walk_down + walk_right + walk_right + walk_right + walk_right + step_end + +RustboroCity_DevonCorp_3F_Movement_21254F: @ 821254F + walk_left + walk_left + walk_left + walk_left + walk_up + walk_left + walk_left + walk_left + step_end + +RustboroCity_DevonCorp_3F_Movement_212558: @ 8212558 + 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 + delay_16 + delay_16 + walk_down + walk_down + walk_in_place_fastest_right + step_end + +RustboroCity_DevonCorp_3F_EventScript_21256C:: @ 821256C + lock + faceplayer + checkflag FLAG_0x110 + goto_eq RustboroCity_DevonCorp_3F_EventScript_2125CC + checkflag FLAG_0x0BD + goto_eq RustboroCity_DevonCorp_3F_EventScript_212595 + msgbox RustboroCity_DevonCorp_3F_Text_212A09, 4 + closemessage + applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 + waitmovement 0 + release + end + +RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595 + msgbox RustboroCity_DevonCorp_3F_Text_212A29, 4 + giveitem_std ITEM_EXP_SHARE + compare VAR_RESULT, 0 + goto_eq RustboroCity_DevonCorp_3F_EventScript_272054 + setflag FLAG_0x110 + msgbox RustboroCity_DevonCorp_3F_Text_212A9E, 4 + closemessage + applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 + waitmovement 0 + release + end + +RustboroCity_DevonCorp_3F_EventScript_2125CC:: @ 82125CC + msgbox RustboroCity_DevonCorp_3F_Text_212B78, 4 + closemessage + applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 + waitmovement 0 + release + end + +RustboroCity_DevonCorp_3F_EventScript_2125E1:: @ 82125E1 + lock + faceplayer + checkflag FLAG_0x100 + goto_eq RustboroCity_DevonCorp_3F_EventScript_2125F6 + msgbox RustboroCity_DevonCorp_3F_Text_212E41, 4 + release + end + +RustboroCity_DevonCorp_3F_EventScript_2125F6:: @ 82125F6 + msgbox RustboroCity_DevonCorp_3F_Text_212E88, 4 + release + end + +RustboroCity_DevonCorp_3F_EventScript_212600:: @ 8212600 + msgbox RustboroCity_DevonCorp_3F_Text_212EE9, 3 + end + +RustboroCity_DevonCorp_3F_Text_212609: @ 8212609 + .string "I’m MR. STONE, the PRESIDENT of\n" + .string "the DEVON CORPORATION.\p" + .string "I’d just got word about you!\p" + .string "You saved our staff not just once,\n" + .string "but twice!\p" + .string "I have a favor to ask of an amazing\n" + .string "person like you.\p" + .string "I understand that you’re delivering\n" + .string "a package to SLATEPORT’s SHIPYARD.\p" + .string "Well, on the way, could you stop off in\n" + .string "DEWFORD TOWN?\p" + .string "I was hoping that you’d deliver a\n" + .string "LETTER to STEVEN in DEWFORD.$" + +RustboroCity_DevonCorp_3F_Text_21277C: @ 821277C + .string "MR. STONE: Now, you should know that\n" + .string "I am a great PRESIDENT.\p" + .string "So, I’d never be so cheap as to ask\n" + .string "a favor for nothing in return.\p" + .string "That’s why I want you to have this!$" + +RustboroCity_DevonCorp_3F_Text_212820: @ 8212820 + .string "{PLAYER} received a POKéNAV.$" + +RustboroCity_DevonCorp_3F_Text_212837: @ 8212837 + .string "MR. STONE: That device…\p" + .string "It’s a POKéMON NAVIGATOR, or POKéNAV\n" + .string "for short.\p" + .string "It’s an indispensable tool for any\n" + .string "TRAINER on an adventure.\p" + .string "It has a map of the HOENN region.\p" + .string "You can check the locations of\n" + .string "DEWFORD and SLATEPORT easily!\p" + .string "By the way, I’ve heard that sinister\n" + .string "criminals--MAGMA and AQUA, I believe--\l" + .string "have been making trouble far and wide.\p" + .string "I think it would be best if you rested\n" + .string "up before you go on your way.$" + +RustboroCity_DevonCorp_3F_Text_2129D2: @ 82129D2 + .string "MR. STONE: Well, then, {PLAYER}{KUN},\n" + .string "go with caution and care!$" + +RustboroCity_DevonCorp_3F_Text_212A09: @ 8212A09 + .string "MR. STONE: I’m counting on you!$" + +RustboroCity_DevonCorp_3F_Text_212A29: @ 8212A29 + .string "MR. STONE: You delivered my LETTER?\n" + .string "Thank you kindly!\p" + .string "This is my way of thanking you.\n" + .string "It should help you, a TRAINER.$" + +RustboroCity_DevonCorp_3F_Text_212A9E: @ 8212A9E + .string "MR. STONE: A POKéMON holding that\n" + .string "EXP. SHARE will be given some of the\l" + .string "EXP Points from battle.\p" + .string "It will get EXP Points even if it didn’t\n" + .string "actually battle.\p" + .string "I would say EXP. SHARE is quite useful\n" + .string "for raising weak POKéMON.$" + +RustboroCity_DevonCorp_3F_Text_212B78: @ 8212B78 + .string "MR. STONE: Since my youth, I’ve immersed\n" + .string "myself in work.\p" + .string "Consequently, I’m not familiar with\n" + .string "trends and that sort of thing.\p" + .string "But do young people all want to be\n" + .string "TRAINERS in the POKéMON LEAGUE?$" + +RustboroCity_DevonCorp_3F_Text_212C37: @ 8212C37 + .string "This is the DEVON CORPORATION’s\n" + .string "third floor.\p" + .string "Our PRESIDENT’s OFFICE is on\n" + .string "this floor.\p" + .string "Anyway, I can’t tell you how much I’m\n" + .string "grateful for what you’ve done.\p" + .string "Um… By the way, that parcel\n" + .string "you got back for us…\p" + .string "Could I get you to deliver that to\n" + .string "the SHIPYARD in SLATEPORT?\p" + .string "It would be awful if those robbers\n" + .string "tried to take it again.\p" + .string "Uh… Hehehe, so, uh, could I count\n" + .string "on you to do that for me?\p" + .string "Oh, that’s right.\n" + .string "Could you wait here a second?$" + +RustboroCity_DevonCorp_3F_Text_212DE8: @ 8212DE8 + .string "Our PRESIDENT would like to have\n" + .string "a word with you.\p" + .string "Please come with me.$" + +RustboroCity_DevonCorp_3F_Text_212E2F: @ 8212E2F + .string "Please, go ahead.$" + +RustboroCity_DevonCorp_3F_Text_212E41: @ 8212E41 + .string "If you visit the SHIPYARD in SLATEPORT,\n" + .string "you should go see CAPT. STERN.$" + +RustboroCity_DevonCorp_3F_Text_212E88: @ 8212E88 + .string "DEVON’s new products, the REPEAT BALL\n" + .string "and TIMER BALL, have become hugely\l" + .string "popular among TRAINERS.$" + +RustboroCity_DevonCorp_3F_Text_212EE9: @ 8212EE9 + .string "It’s a collection of rare rocks and\n" + .string "stones assembled by the PRESIDENT.$" + diff --git a/data/maps/RustboroCity_Flat1_1F/events.inc b/data/maps/RustboroCity_Flat1_1F/events.inc new file mode 100644 index 000000000..1f2ae85fd --- /dev/null +++ b/data/maps/RustboroCity_Flat1_1F/events.inc @@ -0,0 +1,12 @@ +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 + +RustboroCity_Flat1_1F_MapWarps: @ 85308C0 + 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/RustboroCity_Flat1_1F/scripts.inc b/data/maps/RustboroCity_Flat1_1F/scripts.inc new file mode 100644 index 000000000..947ea14d3 --- /dev/null +++ b/data/maps/RustboroCity_Flat1_1F/scripts.inc @@ -0,0 +1,18 @@ +RustboroCity_Flat1_1F_MapScripts:: @ 82150CD + .byte 0 + +RustboroCity_Flat1_1F_EventScript_2150CE:: @ 82150CE + msgbox RustboroCity_Flat1_1F_Text_2150E0, 2 + end + +RustboroCity_Flat1_1F_EventScript_2150D7:: @ 82150D7 + msgbox RustboroCity_Flat1_1F_Text_215115, 2 + end + +RustboroCity_Flat1_1F_Text_2150E0: @ 82150E0 + .string "Every POKéMON has a special ability\n" + .string "that it can use.$" + +RustboroCity_Flat1_1F_Text_215115: @ 8215115 + .string "POKéMON are such strange creatures.$" + diff --git a/data/maps/RustboroCity_Flat1_2F/events.inc b/data/maps/RustboroCity_Flat1_2F/events.inc new file mode 100644 index 000000000..647e7a437 --- /dev/null +++ b/data/maps/RustboroCity_Flat1_2F/events.inc @@ -0,0 +1,16 @@ +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 + +RustboroCity_Flat1_2F_MapWarps: @ 85309AC + 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/RustboroCity_Flat1_2F/scripts.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc new file mode 100644 index 000000000..425d61f52 --- /dev/null +++ b/data/maps/RustboroCity_Flat1_2F/scripts.inc @@ -0,0 +1,184 @@ +RustboroCity_Flat1_2F_MapScripts:: @ 8215139 + .byte 0 + +RustboroCity_Flat1_2F_EventScript_21513A:: @ 821513A + lock + faceplayer + specialvar VAR_RESULT, TryBufferWaldaPhrase + compare VAR_RESULT, 0 + goto_eq RustboroCity_Flat1_2F_EventScript_21518D + compare VAR_RESULT, 1 + goto_eq RustboroCity_Flat1_2F_EventScript_2151AD + +RustboroCity_Flat1_2F_EventScript_215157:: @ 8215157 + special DoWaldaNamingScreen + waitstate + compare VAR_0x8004, 1 + goto_eq RustboroCity_Flat1_2F_EventScript_2151D7 + compare VAR_0x8004, 2 + goto_eq RustboroCity_Flat1_2F_EventScript_2151E1 + specialvar VAR_RESULT, TryGetWallpaperWithWaldaPhrase + compare VAR_RESULT, 1 + goto_eq RustboroCity_Flat1_2F_EventScript_2151F8 + compare VAR_RESULT, 0 + goto_eq RustboroCity_Flat1_2F_EventScript_215221 + end + +RustboroCity_Flat1_2F_EventScript_21518D:: @ 821518D + msgbox RustboroCity_Flat1_2F_Text_2152FA, 5 + compare VAR_RESULT, 0 + goto_eq RustboroCity_Flat1_2F_EventScript_2151CD + msgbox RustboroCity_Flat1_2F_Text_2154AD, 4 + goto RustboroCity_Flat1_2F_EventScript_215157 + +RustboroCity_Flat1_2F_EventScript_2151AD:: @ 82151AD + msgbox RustboroCity_Flat1_2F_Text_215448, 5 + compare VAR_RESULT, 0 + goto_eq RustboroCity_Flat1_2F_EventScript_2151CD + msgbox RustboroCity_Flat1_2F_Text_2154AD, 4 + goto RustboroCity_Flat1_2F_EventScript_215157 + +RustboroCity_Flat1_2F_EventScript_2151CD:: @ 82151CD + msgbox RustboroCity_Flat1_2F_Text_2154E7, 4 + release + end + +RustboroCity_Flat1_2F_EventScript_2151D7:: @ 82151D7 + msgbox RustboroCity_Flat1_2F_Text_2156E3, 4 + release + end + +RustboroCity_Flat1_2F_EventScript_2151E1:: @ 82151E1 + msgbox RustboroCity_Flat1_2F_Text_21561E, 4 + call RustboroCity_Flat1_2F_EventScript_215238 + msgbox RustboroCity_Flat1_2F_Text_215699, 4 + release + end + +RustboroCity_Flat1_2F_EventScript_2151F8:: @ 82151F8 + msgbox RustboroCity_Flat1_2F_Text_215535, 4 + call RustboroCity_Flat1_2F_EventScript_215238 + msgbox RustboroCity_Flat1_2F_Text_215565, 4 + applymovement 6, RustboroCity_Flat1_2F_Movement_27259E + waitmovement 0 + msgbox RustboroCity_Flat1_2F_Text_215792, 4 + release + end + +RustboroCity_Flat1_2F_EventScript_215221:: @ 8215221 + msgbox RustboroCity_Flat1_2F_Text_2155A4, 4 + call RustboroCity_Flat1_2F_EventScript_215238 + msgbox RustboroCity_Flat1_2F_Text_2155D4, 4 + release + end + +RustboroCity_Flat1_2F_EventScript_215238:: @ 8215238 + turnobject 6, 4 + return + +RustboroCity_Flat1_2F_EventScript_21523D:: @ 821523D + msgbox RustboroCity_Flat1_2F_Text_21524F, 2 + end + +RustboroCity_Flat1_2F_EventScript_215246:: @ 8215246 + msgbox RustboroCity_Flat1_2F_Text_215923, 3 + end + +RustboroCity_Flat1_2F_Text_21524F: @ 821524F + .string "Oh, it’s so hard every day…\p" + .string "What’s hard?\n" + .string "You need to ask?\p" + .string "It’s trying to figure out what to\n" + .string "make for meals every day.\p" + .string "It really isn’t easy coming up with\n" + .string "meals every day.$" + +RustboroCity_Flat1_2F_Text_2152FA: @ 82152FA + .string "Oh, hello!\n" + .string "Welcome to the PEPPER household.\p" + .string "I have a question for you.\n" + .string "Have you ever baby-sat?\p" + .string "You see, I’m a new father, so raising\n" + .string "a child is all new to me.\p" + .string "And I have a problem. My daughter\n" + .string "WALDA doesn’t laugh enough.\p" + .string "I think she’d laugh for me if I told\n" + .string "her something funny.\p" + .string "Do you know of a funny word or\n" + .string "phrase you can tell me?$" + +RustboroCity_Flat1_2F_Text_215448: @ 8215448 + .string "I’ve been saying “{STR_VAR_1}â€\n" + .string "to amuse her lately.\p" + .string "Do you know of a better word or\n" + .string "a phrase that might work?$" + +RustboroCity_Flat1_2F_Text_2154AD: @ 82154AD + .string "Oh, that’s wonderful.\n" + .string "So, let’s hear it, your suggestion.$" + +RustboroCity_Flat1_2F_Text_2154E7: @ 82154E7 + .string "Oh, is that right?\p" + .string "Well, if you come up with a good\n" + .string "suggestion, I’m all ears.$" + +RustboroCity_Flat1_2F_Text_215535: @ 8215535 + .string "Ah, I see.\n" + .string "Well, let’s give it a try, shall we?$" + +RustboroCity_Flat1_2F_Text_215565: @ 8215565 + .string "{STR_VAR_1}.\n" + .string "{STR_VAR_1}.\p" + .string "Oh, yes! She’s laughing!\n" + .string "Oh, I am as delighted as she!$" + +RustboroCity_Flat1_2F_Text_2155A4: @ 82155A4 + .string "Ah, I see.\n" + .string "Well, let’s give it a try, shall we?$" + +RustboroCity_Flat1_2F_Text_2155D4: @ 82155D4 + .string "{STR_VAR_1}.\n" + .string "{STR_VAR_1}.\p" + .string "Hmmm… She’s not smiling at all.\n" + .string "Maybe WALDA is one serious child…$" + +RustboroCity_Flat1_2F_Text_21561E: @ 821561E + .string "Oh, so you don’t know any good words.\n" + .string "I’d better think for myself, then.\p" + .string "Hmm…\n" + .string "How about “{STR_VAR_1}â€?\l" + .string "Let’s see if that will work.$" + +RustboroCity_Flat1_2F_Text_215699: @ 8215699 + .string "{STR_VAR_1}.\n" + .string "{STR_VAR_1}.\p" + .string "Hmmm… She’s not smiling at all.\n" + .string "Maybe WALDA is one serious child…$" + +RustboroCity_Flat1_2F_Text_2156E3: @ 82156E3 + .string "Oh, so you don’t know any good words.\n" + .string "I guess I’ll try to amuse her with\l" + .string "the saying I used before.\p" + .string "Anyways, if you have a good suggestion,\n" + .string "don’t hesitate in telling me, okay?$" + +RustboroCity_Flat1_2F_Text_215792: @ 8215792 + .string "Thank you!\p" + .string "Thanks to you, my darling WALDA\n" + .string "laughed for me!\p" + .string "Actually, I may not look all that\n" + .string "special, but I’m one of DEVON\l" + .string "CORPORATION’s top researchers.\p" + .string "So, how about I do something in return\n" + .string "for you?\p" + .string "I know, I’ll add some new wallpaper\n" + .string "patterns for the BOXES in the PC\l" + .string "POKéMON Storage System.\p" + .string "In the wallpaper pattern menu,\n" + .string "select “FRIENDS.â€\p" + .string "That will give you access to the new\n" + .string "wallpaper patterns.$" + +RustboroCity_Flat1_2F_Text_215923: @ 8215923 + .string "It’s a POKéMON plush DOLL!$" + diff --git a/data/maps/RustboroCity_Flat2_1F/events.inc b/data/maps/RustboroCity_Flat2_1F/events.inc new file mode 100644 index 000000000..392f5b1fa --- /dev/null +++ b/data/maps/RustboroCity_Flat2_1F/events.inc @@ -0,0 +1,12 @@ +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 + +RustboroCity_Flat2_1F_MapWarps: @ 8530AF4 + 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/RustboroCity_Flat2_1F/scripts.inc b/data/maps/RustboroCity_Flat2_1F/scripts.inc new file mode 100644 index 000000000..fbb174a29 --- /dev/null +++ b/data/maps/RustboroCity_Flat2_1F/scripts.inc @@ -0,0 +1,24 @@ +RustboroCity_Flat2_1F_MapScripts:: @ 8215F76 + .byte 0 + +RustboroCity_Flat2_1F_EventScript_215F77:: @ 8215F77 + msgbox RustboroCity_Flat2_1F_Text_215F93, 2 + end + +RustboroCity_Flat2_1F_EventScript_215F80:: @ 8215F80 + lock + faceplayer + waitse + playmoncry SPECIES_SKITTY, 0 + msgbox RustboroCity_Flat2_1F_Text_215FC6, 4 + waitmoncry + release + end + +RustboroCity_Flat2_1F_Text_215F93: @ 8215F93 + .string "DEVON CORPORATION’s workers live in\n" + .string "this building.$" + +RustboroCity_Flat2_1F_Text_215FC6: @ 8215FC6 + .string "SKITTY: Gyaaaah!$" + diff --git a/data/maps/RustboroCity_Flat2_2F/events.inc b/data/maps/RustboroCity_Flat2_2F/events.inc new file mode 100644 index 000000000..9914eed3c --- /dev/null +++ b/data/maps/RustboroCity_Flat2_2F/events.inc @@ -0,0 +1,11 @@ +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 + +RustboroCity_Flat2_2F_MapWarps: @ 8530B50 + 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/RustboroCity_Flat2_2F/scripts.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc new file mode 100644 index 000000000..e623aa485 --- /dev/null +++ b/data/maps/RustboroCity_Flat2_2F/scripts.inc @@ -0,0 +1,39 @@ +RustboroCity_Flat2_2F_MapScripts:: @ 8215FD7 + .byte 0 + +RustboroCity_Flat2_2F_EventScript_215FD8:: @ 8215FD8 + msgbox RustboroCity_Flat2_2F_Text_21601A, 2 + end + +RustboroCity_Flat2_2F_EventScript_215FE1:: @ 8215FE1 + lock + faceplayer + checkflag FLAG_0x0D5 + goto_eq RustboroCity_Flat2_2F_EventScript_216010 + msgbox RustboroCity_Flat2_2F_Text_21605A, 4 + giveitem_std ITEM_PREMIER_BALL + compare VAR_RESULT, 0 + goto_eq RustboroCity_Flat2_2F_EventScript_272054 + setflag FLAG_0x0D5 + release + end + +RustboroCity_Flat2_2F_EventScript_216010:: @ 8216010 + msgbox RustboroCity_Flat2_2F_Text_2160BD, 4 + release + end + +RustboroCity_Flat2_2F_Text_21601A: @ 821601A + .string "Way back in the old days, DEVON was just\n" + .string "a teeny, tiny company.$" + +RustboroCity_Flat2_2F_Text_21605A: @ 821605A + .string "My daddy’s working at the CORPORATION.\p" + .string "My daddy made this!\n" + .string "But I can’t use it, so you can have it.$" + +RustboroCity_Flat2_2F_Text_2160BD: @ 82160BD + .string "My daddy’s working at the CORPORATION.\p" + .string "When I grow up, I’m going to work for\n" + .string "DEVON, too.$" + diff --git a/data/maps/RustboroCity_Flat2_3F/events.inc b/data/maps/RustboroCity_Flat2_3F/events.inc new file mode 100644 index 000000000..4a67fdc47 --- /dev/null +++ b/data/maps/RustboroCity_Flat2_3F/events.inc @@ -0,0 +1,10 @@ +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 + +RustboroCity_Flat2_3F_MapWarps: @ 8530BA4 + 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/RustboroCity_Flat2_3F/scripts.inc b/data/maps/RustboroCity_Flat2_3F/scripts.inc new file mode 100644 index 000000000..6a267c336 --- /dev/null +++ b/data/maps/RustboroCity_Flat2_3F/scripts.inc @@ -0,0 +1,19 @@ +RustboroCity_Flat2_3F_MapScripts:: @ 8216116 + .byte 0 + +RustboroCity_Flat2_3F_EventScript_216117:: @ 8216117 + msgbox RustboroCity_Flat2_3F_Text_216129, 2 + end + +RustboroCity_Flat2_3F_EventScript_216120:: @ 8216120 + msgbox RustboroCity_Flat2_3F_Text_216159, 2 + end + +RustboroCity_Flat2_3F_Text_216129: @ 8216129 + .string "DEVON’s PRESIDENT likes to collect\n" + .string "rare stones.$" + +RustboroCity_Flat2_3F_Text_216159: @ 8216159 + .string "I think the PRESIDENT’s son also\n" + .string "collects rare stones.$" + diff --git a/data/maps/RustboroCity_Gym/events.inc b/data/maps/RustboroCity_Gym/events.inc new file mode 100644 index 000000000..193c41685 --- /dev/null +++ b/data/maps/RustboroCity_Gym/events.inc @@ -0,0 +1,18 @@ +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 + +RustboroCity_Gym_MapWarps: @ 85305B0 + 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 + bg_event 8, 18, 0, 1, 0, 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_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc new file mode 100644 index 000000000..1d722b7de --- /dev/null +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -0,0 +1,291 @@ +RustboroCity_Gym_MapScripts:: @ 8212F30 + .byte 0 + +RustboroCity_Gym_EventScript_212F31:: @ 8212F31 + trainerbattle 1, TRAINER_ROXANNE_1, 0, RustboroCity_Gym_Text_21362A, RustboroCity_Gym_Text_21370B, RustboroCity_Gym_EventScript_212F66 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq RustboroCity_Gym_EventScript_212FC8 + checkflag FLAG_0x0A5 + goto_if 0, RustboroCity_Gym_EventScript_212FA4 + msgbox RustboroCity_Gym_Text_2139A7, 4 + release + end + +RustboroCity_Gym_EventScript_212F66:: @ 8212F66 + message RustboroCity_Gym_Text_2137EC + waitmessage + call RustboroCity_Gym_EventScript_27207E + msgbox RustboroCity_Gym_Text_213816, 4 + setflag FLAG_0x4F0 + setflag FLAG_BADGE01_GET + setvar VAR_0x405A, 1 + addvar VAR_0x4085, 1 + setvar VAR_0x8008, 1 + call RustboroCity_Gym_EventScript_271F43 + compare VAR_0x4085, 6 + call_if 1, RustboroCity_Gym_EventScript_271E84 + goto RustboroCity_Gym_EventScript_212FA4 + end + +RustboroCity_Gym_EventScript_212FA4:: @ 8212FA4 + giveitem_std ITEM_TM39 + compare VAR_RESULT, 0 + goto_eq RustboroCity_Gym_EventScript_272054 + setflag FLAG_0x0A5 + msgbox RustboroCity_Gym_Text_2138B1, 4 + release + end + +RustboroCity_Gym_EventScript_212FC8:: @ 8212FC8 + trainerbattle 7, TRAINER_ROXANNE_1, 0, RustboroCity_Gym_Text_213C2F, RustboroCity_Gym_Text_213CF9, RustboroCity_Gym_Text_213D93 + msgbox RustboroCity_Gym_Text_213D12, 6 + end + +RustboroCity_Gym_EventScript_212FE3:: @ 8212FE3 + trainerbattle 0, TRAINER_JOSH, 0, RustboroCity_Gym_Text_2133E9, RustboroCity_Gym_Text_21342D + msgbox RustboroCity_Gym_Text_213447, 6 + end + +RustboroCity_Gym_EventScript_212FFA:: @ 8212FFA + trainerbattle 0, TRAINER_TOMMY, 0, RustboroCity_Gym_Text_213486, RustboroCity_Gym_Text_2134C6 + msgbox RustboroCity_Gym_Text_2134E6, 6 + end + +RustboroCity_Gym_EventScript_213011:: @ 8213011 + trainerbattle 0, TRAINER_MARC, 0, RustboroCity_Gym_Text_213533, RustboroCity_Gym_Text_213589 + msgbox RustboroCity_Gym_Text_2135C0, 6 + end + +RustboroCity_Gym_EventScript_213028:: @ 8213028 + lock + faceplayer + checkflag FLAG_0x4F0 + goto_eq RustboroCity_Gym_EventScript_21303D + msgbox RustboroCity_Gym_Text_21309D, 4 + release + end + +RustboroCity_Gym_EventScript_21303D:: @ 821303D + msgbox RustboroCity_Gym_Text_2132E2, 4 + release + end + +RustboroCity_Gym_EventScript_213047:: @ 8213047 + lockall + checkflag FLAG_BADGE01_GET + goto_eq RustboroCity_Gym_EventScript_213067 + goto RustboroCity_Gym_EventScript_213071 + end + +RustboroCity_Gym_EventScript_213057:: @ 8213057 + lockall + checkflag FLAG_BADGE01_GET + goto_eq RustboroCity_Gym_EventScript_213067 + goto RustboroCity_Gym_EventScript_213071 + end + +RustboroCity_Gym_EventScript_213067:: @ 8213067 + msgbox RustboroCity_Gym_Text_213A3B, 4 + releaseall + end + +RustboroCity_Gym_EventScript_213071:: @ 8213071 + msgbox RustboroCity_Gym_Text_213A21, 4 + releaseall + end + +RustboroCity_Gym_EventScript_21307B:: @ 821307B + lockall + pokenavcall RustboroCity_Gym_Text_213A76 + waitmessage + delay 30 + playfanfare MUS_ME_TORE_EYE + msgbox RustboroCity_Gym_Text_213C01, 4 + waitfanfare + closemessage + delay 30 + setflag FLAG_0x1D3 + clearflag FLAG_0x080 + releaseall + end + +RustboroCity_Gym_Text_21309D: @ 821309D + .string "Yo, how’s it going?\p" + .string "Listen, my friend!\n" + .string "Would you like to become the CHAMPION?\p" + .string "I’m no TRAINER, not me, but I can\n" + .string "sure give you winning advice.\p" + .string "That’s settled, then! We’ll aim for the\n" + .string "POKéMON CHAMPIONSHIP together!\p" + .string "It’s your job as a TRAINER to collect\n" + .string "GYM BADGES, am I right?\p" + .string "But GYM LEADERS aren’t pushovers!\p" + .string "And that’s where I come in!\n" + .string "I’m here to provide expert advice!\p" + .string "ROXANNE, the GYM LEADER, is a user\n" + .string "of ROCK-type POKéMON.\p" + .string "The ROCK type is very durable, but\n" + .string "it can’t stand WATER-type and\l" + .string "GRASS-type moves.\p" + .string "Come see me afterwards, if you beat\n" + .string "the GYM LEADER.\p" + .string "Well, go for it!$" + +RustboroCity_Gym_Text_2132E2: @ 82132E2 + .string "Whoa! What a breathtaking victory!\n" + .string "My cheering must’ve worked!\p" + .string "Great!\n" + .string "Check your TRAINER CARD.\p" + .string "The STONE BADGE you got should be\n" + .string "properly recorded on it.\p" + .string "In other words…\p" + .string "You’ve climbed the first step on\n" + .string "the stairs to the CHAMPIONSHIP!\p" + .string "That’s got to feel awesome!$" + +RustboroCity_Gym_Text_2133E9: @ 82133E9 + .string "Don’t take us GYM TRAINERS lightly!\n" + .string "I’ll show you why we’re better!$" + +RustboroCity_Gym_Text_21342D: @ 821342D + .string "You were too good for me…$" + +RustboroCity_Gym_Text_213447: @ 8213447 + .string "You haven’t seen anything of the ROCK\n" + .string "type’s terrifying power!$" + +RustboroCity_Gym_Text_213486: @ 8213486 + .string "If you can’t beat me, you won’t stand\n" + .string "a chance against ROXANNE!$" + +RustboroCity_Gym_Text_2134C6: @ 82134C6 + .string "Wow! You’ve got some potential!$" + +RustboroCity_Gym_Text_2134E6: @ 82134E6 + .string "ROXANNE is stronger than me by\n" + .string "several times.\p" + .string "You’d better be on your guard!$" + +RustboroCity_Gym_Text_213533: @ 8213533 + .string "We might be in the middle of town,\n" + .string "but so what?\p" + .string "My ROCK POKéMON need room to\n" + .string "rampage!$" + +RustboroCity_Gym_Text_213589: @ 8213589 + .string "Oh, man oh man!\n" + .string "Our challenger is one feisty customer!$" + +RustboroCity_Gym_Text_2135C0: @ 82135C0 + .string "I have to hand it to our LEADER.\p" + .string "It took smarts and sense for her to\n" + .string "pick the ROCK type at her young age.$" + +RustboroCity_Gym_Text_21362A: @ 821362A + .string "Hello, I am ROXANNE, the RUSTBORO\n" + .string "POKéMON GYM LEADER.\p" + .string "I became a GYM LEADER so that I might\n" + .string "apply what I learned at the POKéMON\l" + .string "TRAINER’S SCHOOL in battle.\p" + .string "Would you kindly demonstrate how you\n" + .string "battle, and with which POKéMON?$" + +RustboroCity_Gym_Text_21370B: @ 821370B + .string "So…\n" + .string "I lost…\p" + .string "It seems that I still have much more\n" + .string "to learn…\p" + .string "I understand.\p" + .string "The POKéMON LEAGUE’s rules state\n" + .string "that TRAINERS are to be given this\l" + .string "if they defeat a GYM LEADER.\p" + .string "Please accept the official POKéMON\n" + .string "LEAGUE STONE BADGE.$" + +RustboroCity_Gym_Text_2137EC: @ 82137EC + .string "{PLAYER} received the STONE BADGE\n" + .string "from ROXANNE.$" + +RustboroCity_Gym_Text_213816: @ 8213816 + .string "The STONE BADGE heightens the ATTACK\n" + .string "power of your POKéMON.\p" + .string "It also enables them to use the HM move\n" + .string "CUT outside of battle.\p" + .string "Please take this with you, too.$" + +RustboroCity_Gym_Text_2138B1: @ 82138B1 + .string "That TECHNICAL MACHINE, TM39,\n" + .string "contains ROCK TOMB.\p" + .string "It not only inflicts damage by dropping\n" + .string "rocks, it also lowers SPEED.\p" + .string "If you use a TM, it instantly teaches\n" + .string "the move to a POKéMON.\p" + .string "Remember, a TM can be used only once,\n" + .string "so think before you use it.$" + +RustboroCity_Gym_Text_2139A7: @ 82139A7 + .string "Since you are so strong, you should\n" + .string "challenge other GYM LEADERS.\p" + .string "By battling many TRAINERS, you should\n" + .string "learn many things.$" + +RustboroCity_Gym_Text_213A21: @ 8213A21 + .string "RUSTBORO CITY POKéMON GYM$" + +RustboroCity_Gym_Text_213A3B: @ 8213A3B + .string "RUSTBORO CITY POKéMON GYM\p" + .string "ROXANNE’S CERTIFIED TRAINERS:\n" + .string "{PLAYER}$" + + +RustboroCity_Gym_Text_213A76: @ 8213A76 + .string "… … … … … …\n" + .string "… … … … … Beep!\p" + .string "ROXANNE: Oh, hello, {PLAYER}?\n" + .string "This is ROXANNE of RUSTBORO CITY.\p" + .string "I heard from BRAWLY that you’re\n" + .string "moving up through the ranks of\l" + .string "TRAINERS at an incredible clip.\p" + .string "Well, I’d rather not think that\n" + .string "I can’t beat you.\p" + .string "I promise, I will shape up my GYM\n" + .string "so that you may challenge us again.\p" + .string "I hope you’ll be looking forward to\n" + .string "that occasion as much as me!\p" + .string "… … … … … …\n" + .string "… … … … … Click!$" + +RustboroCity_Gym_Text_213C01: @ 8213C01 + .string "Registered GYM LEADER ROXANNE\n" + .string "in the POKéNAV.$" + +RustboroCity_Gym_Text_213C2F: @ 8213C2F + .string "ROXANNE: I’m so glad to see you again.\n" + .string "I’m ROXANNE, the GYM LEADER here.\p" + .string "I’m sure we’ve both experienced many\n" + .string "battles since we last met.\p" + .string "I would like to see how much better\n" + .string "we’ve become. Let us battle!$" + +RustboroCity_Gym_Text_213CF9: @ 8213CF9 + .string "Grr…\n" + .string "Again, I have lost…$" + +RustboroCity_Gym_Text_213D12: @ 8213D12 + .string "ROXANNE: I still have much to learn\n" + .string "when it comes to battling POKéMON.\p" + .string "That awareness makes me love battling\n" + .string "all that much more!$" + +RustboroCity_Gym_Text_213D93: @ 8213D93 + .string "ROXANNE: I’m so glad to see you again.\n" + .string "I’m ROXANNE, the GYM LEADER here.\p" + .string "I’m sure we’ve both experienced many\n" + .string "battles since we last met.\p" + .string "I would like to see how much better\n" + .string "we’ve become…\p" + .string "Oh, no…\n" + .string "You only have one POKéMON with you?\p" + .string "Please return with at least one more\n" + .string "POKéMON.$" diff --git a/data/maps/RustboroCity_House1/events.inc b/data/maps/RustboroCity_House1/events.inc new file mode 100644 index 000000000..1d2b2d0b7 --- /dev/null +++ b/data/maps/RustboroCity_House1/events.inc @@ -0,0 +1,11 @@ +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 + +RustboroCity_House1_MapWarps: @ 85309F8 + 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/RustboroCity_House1/scripts.inc b/data/maps/RustboroCity_House1/scripts.inc new file mode 100644 index 000000000..d63536c55 --- /dev/null +++ b/data/maps/RustboroCity_House1/scripts.inc @@ -0,0 +1,85 @@ +RustboroCity_House1_MapScripts:: @ 821593E + .byte 0 + +RustboroCity_House1_EventScript_21593F:: @ 821593F + lock + faceplayer + checkflag FLAG_0x099 + goto_eq RustboroCity_House1_EventScript_2159D5 + setvar VAR_0x8008, 0 + copyvar VAR_0x8004, VAR_0x8008 + specialvar VAR_RESULT, sub_807E73C + copyvar VAR_0x8009, VAR_RESULT + msgbox RustboroCity_House1_Text_2159E8, 5 + compare VAR_RESULT, 0 + goto_eq RustboroCity_House1_EventScript_2159BD + special sub_81B94B0 + waitstate + copyvar VAR_0x800A, VAR_0x8004 + compare VAR_0x8004, 255 + goto_eq RustboroCity_House1_EventScript_2159BD + copyvar VAR_0x8005, VAR_0x800A + specialvar VAR_RESULT, sub_807E9D4 + copyvar VAR_0x800B, VAR_RESULT + compare VAR_RESULT, VAR_0x8009 + goto_if 5, RustboroCity_House1_EventScript_2159C7 + copyvar VAR_0x8004, VAR_0x8008 + copyvar VAR_0x8005, VAR_0x800A + special sub_807EA10 + special sub_807F0E4 + waitstate + msgbox RustboroCity_House1_Text_215A77, 4 + setflag FLAG_0x099 + release + end + +RustboroCity_House1_EventScript_2159BD:: @ 82159BD + msgbox RustboroCity_House1_Text_215ACE, 4 + release + end + +RustboroCity_House1_EventScript_2159C7:: @ 82159C7 + bufferspeciesname 0, VAR_0x8009 + msgbox RustboroCity_House1_Text_215A9D, 4 + release + end + +RustboroCity_House1_EventScript_2159D5:: @ 82159D5 + msgbox RustboroCity_House1_Text_215B17, 4 + release + end + +RustboroCity_House1_EventScript_2159DF:: @ 82159DF + msgbox RustboroCity_House1_Text_215B57, 2 + end + +RustboroCity_House1_Text_2159E8: @ 82159E8 + .string "Huh? My POKéMON is cute?\n" + .string "Sure, I knew that.\p" + .string "But if you really want, I’m willing\n" + .string "to trade it to you.\p" + .string "I’ll trade you my {STR_VAR_2} for\n" + .string "a {STR_VAR_1} if you want.$" + +RustboroCity_House1_Text_215A77: @ 8215A77 + .string "Eheheh…\n" + .string "Please be good to my POKéMON.$" + +RustboroCity_House1_Text_215A9D: @ 8215A9D + .string "Huh? That doesn’t look anything like\n" + .string "a {STR_VAR_1} to me.$" + +RustboroCity_House1_Text_215ACE: @ 8215ACE + .string "Oh, if you don’t want to, that’s okay.\n" + .string "But my POKéMON is cute, you know…$" + +RustboroCity_House1_Text_215B17: @ 8215B17 + .string "Any POKéMON can be cute if you raise\n" + .string "it with care and kindness.$" + +RustboroCity_House1_Text_215B57: @ 8215B57 + .string "In all sorts of places, there are all\n" + .string "sorts of POKéMON and people.\p" + .string "I find that fascinating, so I go to all\n" + .string "sorts of places.$" + diff --git a/data/maps/RustboroCity_House2/events.inc b/data/maps/RustboroCity_House2/events.inc new file mode 100644 index 000000000..3a4e5e15e --- /dev/null +++ b/data/maps/RustboroCity_House2/events.inc @@ -0,0 +1,11 @@ +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 + +RustboroCity_House2_MapWarps: @ 8530AA0 + 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/RustboroCity_House2/scripts.inc b/data/maps/RustboroCity_House2/scripts.inc new file mode 100644 index 000000000..fd71dc016 --- /dev/null +++ b/data/maps/RustboroCity_House2/scripts.inc @@ -0,0 +1,21 @@ +RustboroCity_House2_MapScripts:: @ 8215EB3 + .byte 0 + +RustboroCity_House2_EventScript_215EB4:: @ 8215EB4 + msgbox RustboroCity_House2_Text_215EC6, 2 + end + +RustboroCity_House2_EventScript_215EBD:: @ 8215EBD + msgbox RustboroCity_House2_Text_215F21, 2 + end + +RustboroCity_House2_Text_215EC6: @ 8215EC6 + .string "The TRAINER’S SCHOOL is excellent.\p" + .string "If you study there, you could even\n" + .string "become a GYM LEADER.$" + +RustboroCity_House2_Text_215F21: @ 8215F21 + .string "ROXANNE, the GYM LEADER, really knows\n" + .string "a lot about POKéMON.\p" + .string "She’s really strong, too!$" + diff --git a/data/maps/RustboroCity_House3/events.inc b/data/maps/RustboroCity_House3/events.inc new file mode 100644 index 000000000..07234fc2e --- /dev/null +++ b/data/maps/RustboroCity_House3/events.inc @@ -0,0 +1,12 @@ +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 + +RustboroCity_House3_MapWarps: @ 8530C08 + 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/RustboroCity_House3/scripts.inc b/data/maps/RustboroCity_House3/scripts.inc new file mode 100644 index 000000000..87d278099 --- /dev/null +++ b/data/maps/RustboroCity_House3/scripts.inc @@ -0,0 +1,36 @@ +RustboroCity_House3_MapScripts:: @ 8216190 + .byte 0 + +RustboroCity_House3_EventScript_216191:: @ 8216191 + msgbox RustboroCity_House3_Text_2161B6, 2 + end + +RustboroCity_House3_EventScript_21619A:: @ 821619A + msgbox RustboroCity_House3_Text_21622A, 2 + end + +RustboroCity_House3_EventScript_2161A3:: @ 82161A3 + lock + faceplayer + waitse + playmoncry SPECIES_PIKACHU, 0 + msgbox RustboroCity_House3_Text_2162AB, 4 + waitmoncry + release + end + +RustboroCity_House3_Text_2161B6: @ 82161B6 + .string "For my own POKéMON, I give them\n" + .string "perfectly suited nicknames!\p" + .string "It’s my expression of, uh…\n" + .string "originality, yes, that’s it!$" + +RustboroCity_House3_Text_21622A: @ 821622A + .string "But giving the name PEKACHU to\n" + .string "a PIKACHU? It seems pointless.\p" + .string "I suppose it is good to use a name\n" + .string "that’s easy to understand, but…$" + +RustboroCity_House3_Text_2162AB: @ 82162AB + .string "PEKACHU: Peka!$" + diff --git a/data/maps/RustboroCity_Mart/events.inc b/data/maps/RustboroCity_Mart/events.inc new file mode 100644 index 000000000..038d13bf7 --- /dev/null +++ b/data/maps/RustboroCity_Mart/events.inc @@ -0,0 +1,13 @@ +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 + +RustboroCity_Mart_MapWarps: @ 853086C + 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/RustboroCity_Mart/scripts.inc b/data/maps/RustboroCity_Mart/scripts.inc new file mode 100644 index 000000000..daa445a0e --- /dev/null +++ b/data/maps/RustboroCity_Mart/scripts.inc @@ -0,0 +1,89 @@ +RustboroCity_Mart_MapScripts:: @ 8214F05 + .byte 0 + +RustboroCity_Mart_EventScript_214F06:: @ 8214F06 + lock + faceplayer + message gUnknown_08272A21 + waitmessage + checkflag FLAG_0x11F + goto_if 0, RustboroCity_Mart_EventScript_214F21 + checkflag FLAG_0x11F + goto_eq RustboroCity_Mart_EventScript_214F48 + end + +RustboroCity_Mart_EventScript_214F21:: @ 8214F21 + pokemart RustboroCity_Mart_Pokemart_214F30 + msgbox gUnknown_08272A3F, 4 + release + end + +RustboroCity_Mart_Pokemart_214F30: @ 8214F30 + .2byte ITEM_POKE_BALL + .2byte ITEM_POTION + .2byte ITEM_SUPER_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_REPEL + .2byte ITEM_X_SPEED + .2byte ITEM_X_ATTACK + .2byte ITEM_X_DEFEND + .2byte ITEM_NONE + release + end + +RustboroCity_Mart_EventScript_214F48:: @ 8214F48 + pokemart RustboroCity_Mart_Pokemart_214F58 + msgbox gUnknown_08272A3F, 4 + release + end + + .align 2 +RustboroCity_Mart_Pokemart_214F58: @ 8214F58 + .2byte ITEM_POKE_BALL + .2byte ITEM_TIMER_BALL + .2byte ITEM_REPEAT_BALL + .2byte ITEM_POTION + .2byte ITEM_SUPER_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_REPEL + .2byte ITEM_X_SPEED + .2byte ITEM_X_ATTACK + .2byte ITEM_X_DEFEND + .2byte ITEM_NONE + release + end + +RustboroCity_Mart_EventScript_214F74:: @ 8214F74 + msgbox RustboroCity_Mart_Text_214F8F, 2 + end + +RustboroCity_Mart_EventScript_214F7D:: @ 8214F7D + msgbox RustboroCity_Mart_Text_214FF1, 2 + end + +RustboroCity_Mart_EventScript_214F86:: @ 8214F86 + msgbox RustboroCity_Mart_Text_21505C, 2 + end + +RustboroCity_Mart_Text_214F8F: @ 8214F8F + .string "I’m buying some PARLYZ HEALS and\n" + .string "ANTIDOTES.\p" + .string "Just in case I run into SHROOMISH\n" + .string "in PETALBURG WOODS.$" + +RustboroCity_Mart_Text_214FF1: @ 8214FF1 + .string "My POKéMON evolved.\n" + .string "It has a lot of HP now.\p" + .string "I should buy SUPER POTIONS for it\n" + .string "instead of ordinary POTIONS.$" + +RustboroCity_Mart_Text_21505C: @ 821505C + .string "I’m getting an ESCAPE ROPE just in\n" + .string "case I get lost in a cave.\p" + .string "I just need to use it to get back to\n" + .string "the entrance.$" + diff --git a/data/maps/RustboroCity_PokemonCenter_1F/events.inc b/data/maps/RustboroCity_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..e2945f435 --- /dev/null +++ b/data/maps/RustboroCity_PokemonCenter_1F/events.inc @@ -0,0 +1,14 @@ +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 + +RustboroCity_PokemonCenter_1F_MapWarps: @ 8530754 + 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/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..a9156d5aa --- /dev/null +++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc @@ -0,0 +1,47 @@ +RustboroCity_PokemonCenter_1F_MapScripts:: @ 8214D62 + map_script 3, RustboroCity_PokemonCenter_1F_MapScript1_214D6D + map_script 5, RustboroCity_PokemonCenter_1F_MapScript1_277C30 + .byte 0 + +RustboroCity_PokemonCenter_1F_MapScript1_214D6D: @ 8214D6D + setrespawn 6 + call RustboroCity_PokemonCenter_1F_EventScript_2718DE + end + +RustboroCity_PokemonCenter_1F_EventScript_214D76:: @ 8214D76 + setvar VAR_0x800B, 1 + call RustboroCity_PokemonCenter_1F_EventScript_27191E + waitmessage + waitbuttonpress + release + end + +RustboroCity_PokemonCenter_1F_EventScript_214D84:: @ 8214D84 + msgbox RustboroCity_PokemonCenter_1F_Text_214D9F, 2 + end + +RustboroCity_PokemonCenter_1F_EventScript_214D8D:: @ 8214D8D + msgbox RustboroCity_PokemonCenter_1F_Text_214E13, 2 + end + +RustboroCity_PokemonCenter_1F_EventScript_214D96:: @ 8214D96 + msgbox RustboroCity_PokemonCenter_1F_Text_214E81, 2 + end + +RustboroCity_PokemonCenter_1F_Text_214D9F: @ 8214D9F + .string "My POKéMON has a NAIVE nature, and my\n" + .string "friend’s has a JOLLY nature.\p" + .string "It’s fascinating how POKéMON have\n" + .string "personalities!$" + +RustboroCity_PokemonCenter_1F_Text_214E13: @ 8214E13 + .string "Just like people, there are male and\n" + .string "female POKéMON.\p" + .string "But no one seems to have any idea how\n" + .string "they’re different.$" + +RustboroCity_PokemonCenter_1F_Text_214E81: @ 8214E81 + .string "The man next door gave me an HM!\p" + .string "I used it to teach my POKéMON how to\n" + .string "CUT down skinny trees.$" + diff --git a/data/maps/RustboroCity_PokemonCenter_2F/events.inc b/data/maps/RustboroCity_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..d1ec1adb9 --- /dev/null +++ b/data/maps/RustboroCity_PokemonCenter_2F/events.inc @@ -0,0 +1,14 @@ +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 + +RustboroCity_PokemonCenter_2F_MapWarps: @ 85307E0 + 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/RustboroCity_PokemonCenter_2F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..a1bdeba5b --- /dev/null +++ b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc @@ -0,0 +1,19 @@ +RustboroCity_PokemonCenter_2F_MapScripts:: @ 8214EDE + map_script 2, RustboroCity_PokemonCenter_2F_MapScript2_276C3B + map_script 4, RustboroCity_PokemonCenter_2F_MapScript2_276B6C + map_script 1, RustboroCity_PokemonCenter_2F_MapScript1_276BBE + map_script 3, RustboroCity_PokemonCenter_2F_MapScript1_276ACF + .byte 0 + +RustboroCity_PokemonCenter_2F_EventScript_214EF3:: @ 8214EF3 + call OldaleTown_PokemonCenter_2F_EventScript_276EB7 + end + +RustboroCity_PokemonCenter_2F_EventScript_214EF9:: @ 8214EF9 + call OldaleTown_PokemonCenter_2F_EventScript_2770B2 + end + +RustboroCity_PokemonCenter_2F_EventScript_214EFF:: @ 8214EFF + call OldaleTown_PokemonCenter_2F_EventScript_2771DB + end + diff --git a/data/maps/RustboroCity_PokemonSchool/events.inc b/data/maps/RustboroCity_PokemonSchool/events.inc new file mode 100644 index 000000000..2deabdb5c --- /dev/null +++ b/data/maps/RustboroCity_PokemonSchool/events.inc @@ -0,0 +1,23 @@ +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 + +RustboroCity_PokemonSchool_MapWarps: @ 8530694 + 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 + 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 + +RustboroCity_PokemonSchool_MapEvents:: @ 85306E0 + map_events RustboroCity_PokemonSchool_EventObjects, RustboroCity_PokemonSchool_MapWarps, 0x0, RustboroCity_PokemonSchool_MapBGEvents + diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc new file mode 100644 index 000000000..f5030facd --- /dev/null +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -0,0 +1,359 @@ +RustboroCity_PokemonSchool_MapScripts:: @ 8213EA8 + .byte 0 + +RustboroCity_PokemonSchool_EventScript_213EA9:: @ 8213EA9 + lockall + msgbox RustboroCity_PokemonSchool_Text_2140B2, 4 + goto RustboroCity_PokemonSchool_EventScript_213EB8 + end + +RustboroCity_PokemonSchool_EventScript_213EB8:: @ 8213EB8 + message RustboroCity_PokemonSchool_Text_2140F9 + waitmessage + multichoicegrid 8, 1, 13, 3, 0 + switch VAR_RESULT + case 0, RustboroCity_PokemonSchool_EventScript_213F17 + case 1, RustboroCity_PokemonSchool_EventScript_213F25 + case 2, RustboroCity_PokemonSchool_EventScript_213F33 + case 3, RustboroCity_PokemonSchool_EventScript_213F41 + case 4, RustboroCity_PokemonSchool_EventScript_213F4F + case 5, RustboroCity_PokemonSchool_EventScript_213F5D + case 127, RustboroCity_PokemonSchool_EventScript_213F5D + end + +RustboroCity_PokemonSchool_EventScript_213F17:: @ 8213F17 + msgbox RustboroCity_PokemonSchool_Text_21411A, 4 + goto RustboroCity_PokemonSchool_EventScript_213EB8 + end + +RustboroCity_PokemonSchool_EventScript_213F25:: @ 8213F25 + msgbox RustboroCity_PokemonSchool_Text_2141D8, 4 + goto RustboroCity_PokemonSchool_EventScript_213EB8 + end + +RustboroCity_PokemonSchool_EventScript_213F33:: @ 8213F33 + msgbox RustboroCity_PokemonSchool_Text_21427D, 4 + goto RustboroCity_PokemonSchool_EventScript_213EB8 + end + +RustboroCity_PokemonSchool_EventScript_213F41:: @ 8213F41 + msgbox RustboroCity_PokemonSchool_Text_214336, 4 + goto RustboroCity_PokemonSchool_EventScript_213EB8 + end + +RustboroCity_PokemonSchool_EventScript_213F4F:: @ 8213F4F + msgbox RustboroCity_PokemonSchool_Text_2143B8, 4 + goto RustboroCity_PokemonSchool_EventScript_213EB8 + end + +RustboroCity_PokemonSchool_EventScript_213F5D:: @ 8213F5D + releaseall + end + +RustboroCity_PokemonSchool_EventScript_213F5F:: @ 8213F5F + msgbox RustboroCity_PokemonSchool_Text_21459F, 2 + end + +RustboroCity_PokemonSchool_EventScript_213F68:: @ 8213F68 + msgbox RustboroCity_PokemonSchool_Text_2145CD, 2 + end + +RustboroCity_PokemonSchool_EventScript_213F71:: @ 8213F71 + msgbox RustboroCity_PokemonSchool_Text_214604, 2 + end + +RustboroCity_PokemonSchool_EventScript_213F7A:: @ 8213F7A + msgbox RustboroCity_PokemonSchool_Text_214669, 2 + end + +RustboroCity_PokemonSchool_EventScript_213F83:: @ 8213F83 + msgbox RustboroCity_PokemonSchool_Text_214719, 2 + end + +RustboroCity_PokemonSchool_EventScript_213F8C:: @ 8213F8C + msgbox RustboroCity_PokemonSchool_Text_2147A2, 3 + end + +RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95 + lock + faceplayer + checkflag FLAG_0x113 + goto_eq RustboroCity_PokemonSchool_EventScript_213FFB + compare VAR_FACING, 4 + call_if 1, RustboroCity_PokemonSchool_EventScript_213FE5 + compare VAR_FACING, 3 + call_if 1, RustboroCity_PokemonSchool_EventScript_213FF0 + msgbox RustboroCity_PokemonSchool_Text_214433, 4 + giveitem_std ITEM_QUICK_CLAW + compare VAR_RESULT, 0 + goto_eq RustboroCity_PokemonSchool_EventScript_272054 + closemessage + applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA + waitmovement 0 + setflag FLAG_0x113 + release + end + +RustboroCity_PokemonSchool_EventScript_213FE5:: @ 8213FE5 + applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_214027 + waitmovement 0 + return + +RustboroCity_PokemonSchool_EventScript_213FF0:: @ 8213FF0 + applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_214010 + waitmovement 0 + return + +RustboroCity_PokemonSchool_EventScript_213FFB:: @ 8213FFB + msgbox RustboroCity_PokemonSchool_Text_2144C8, 4 + closemessage + applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA + waitmovement 0 + release + end + +RustboroCity_PokemonSchool_Movement_214010: @ 8214010 + 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 + 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 + lock + faceplayer + checkflag FLAG_0x1CB + goto_eq RustboroCity_PokemonSchool_EventScript_2140A8 + checkflag FLAG_0x136 + goto_eq RustboroCity_PokemonSchool_EventScript_21406F + checkflag FLAG_BADGE01_GET + goto_eq RustboroCity_PokemonSchool_EventScript_214082 + msgbox RustboroCity_PokemonSchool_Text_2148C0, 4 + addvar VAR_0x40D1, 1 + setflag FLAG_0x136 + release + end + +RustboroCity_PokemonSchool_EventScript_21406F:: @ 821406F + checkflag FLAG_BADGE01_GET + goto_eq RustboroCity_PokemonSchool_EventScript_214090 + msgbox RustboroCity_PokemonSchool_Text_214A5F, 4 + release + end + +RustboroCity_PokemonSchool_EventScript_214082:: @ 8214082 + msgbox RustboroCity_PokemonSchool_Text_214B8A, 4 + goto RustboroCity_PokemonSchool_EventScript_21409E + end + +RustboroCity_PokemonSchool_EventScript_214090:: @ 8214090 + msgbox RustboroCity_PokemonSchool_Text_214AB6, 4 + goto RustboroCity_PokemonSchool_EventScript_21409E + end + +RustboroCity_PokemonSchool_EventScript_21409E:: @ 821409E + addvar VAR_0x40D1, 1 + setflag FLAG_0x1CB + release + end + +RustboroCity_PokemonSchool_EventScript_2140A8:: @ 82140A8 + msgbox RustboroCity_PokemonSchool_Text_214A5F, 4 + release + end + +RustboroCity_PokemonSchool_Text_2140B2: @ 82140B2 + .string "The blackboard lists status changes\n" + .string "that may affect POKéMON in battle.$" + +RustboroCity_PokemonSchool_Text_2140F9: @ 82140F9 + .string "Which topic do you want to read?$" + +RustboroCity_PokemonSchool_Text_21411A: @ 821411A + .string "If a POKéMON is poisoned, it will\n" + .string "steadily lose HP.\p" + .string "The effects of poison remain after\n" + .string "a battle.\p" + .string "A poisoned POKéMON’s HP will drop\n" + .string "while it is traveling.\p" + .string "Heal a poisoning using an ANTIDOTE.$" + +RustboroCity_PokemonSchool_Text_2141D8: @ 82141D8 + .string "If a POKéMON becomes paralyzed,\n" + .string "its SPEED drops.\p" + .string "It may also not be able to move while\n" + .string "it is in battle.\p" + .string "Paralysis remains after battle.\n" + .string "Cure it using a PARLYZ HEAL.$" + +RustboroCity_PokemonSchool_Text_21427D: @ 821427D + .string "If a POKéMON falls asleep, it will be\n" + .string "unable to attack.\p" + .string "A POKéMON may wake up on its own,\n" + .string "but if a battle ends while it is\l" + .string "sleeping, it will stay asleep.\p" + .string "Wake it up using an AWAKENING.$" + +RustboroCity_PokemonSchool_Text_214336: @ 8214336 + .string "A burn reduces ATTACK power, and it\n" + .string "steadily reduces the victim’s HP.\p" + .string "A burn lingers after battle.\n" + .string "Cure a burn using a BURN HEAL.$" + +RustboroCity_PokemonSchool_Text_2143B8: @ 82143B8 + .string "If a POKéMON is frozen, it becomes\n" + .string "completely helpless.\p" + .string "It will remain frozen after battle.\n" + .string "Thaw it out using an ICE HEAL.$" + +RustboroCity_PokemonSchool_Text_214433: @ 8214433 + .string "Students who don’t study get a little\n" + .string "taste of my QUICK CLAW.\p" + .string "Whether or not you are a good student \n" + .string "will be evident from the way you use\l" + .string "this item.$" + +RustboroCity_PokemonSchool_Text_2144C8: @ 82144C8 + .string "A POKéMON holding the QUICK CLAW will\n" + .string "occasionally speed up and get to move\l" + .string "before its opponent.\p" + .string "There are many other items that are\n" + .string "meant to be held by POKéMON.\p" + .string "Just those alone will give you many\n" + .string "topics to study!$" + +RustboroCity_PokemonSchool_Text_21459F: @ 821459F + .string "I’m trading POKéMON with my friend\n" + .string "right now.$" + +RustboroCity_PokemonSchool_Text_2145CD: @ 82145CD + .string "I always wanted a SEEDOT, and\n" + .string "I’m finally getting one!$" + +RustboroCity_PokemonSchool_Text_214604: @ 8214604 + .string "POKéMON can hold items, but they\n" + .string "don’t know what to do with man-made\l" + .string "items like POTION and ANTIDOTE.$" + +RustboroCity_PokemonSchool_Text_214669: @ 8214669 + .string "You know how some POKéMON moves can\n" + .string "confuse a POKéMON?\p" + .string "A confused POKéMON will sometimes\n" + .string "attack itself without meaning to.\p" + .string "But once it leaves battle, it will\n" + .string "return to normal.$" + +RustboroCity_PokemonSchool_Text_214719: @ 8214719 + .string "A POKéMON holding a BERRY will heal\n" + .string "itself…\p" + .string "There are many kinds of items that\n" + .string "POKéMON can hold…\p" + .string "Boy, it sure is hard taking notes\n" + .string "down…$" + +RustboroCity_PokemonSchool_Text_2147A2: @ 82147A2 + .string "It’s this student’s notebook…\p" + .string "POKéMON are to be caught using\n" + .string "POKé BALLS.\p" + .string "Up to six POKéMON can accompany\n" + .string "a TRAINER.\p" + .string "A TRAINER is someone who catches\n" + .string "POKéMON, raises them, and battles\l" + .string "with them.\p" + .string "A TRAINER’s mission is to defeat\n" + .string "the strong TRAINERS who await\l" + .string "challengers in POKéMON GYMS.$" + +RustboroCity_PokemonSchool_Text_2148C0: @ 82148C0 + .string "Hello? Didn’t we meet before?\n" + .string "I think back in PETALBURG CITY.\p" + .string "Let me introduce myself.\n" + .string "My name’s SCOTT.\p" + .string "I’ve been traveling everywhere in\n" + .string "search of outstanding TRAINERS.\p" + .string "More specifically, I’m looking for\n" + .string "POKéMON battle experts.\p" + .string "So, what brings you to this SCHOOL?\n" + .string "Are you a TRAINER, too?\p" + .string "The first thing you should do is to\n" + .string "have a POKéMON learn the move CUT.\p" + .string "If I remember correctly, someone in\n" + .string "this town has CUT.$" + +RustboroCity_PokemonSchool_Text_214A5F: @ 8214A5F + .string "SCOTT: Hmm…\p" + .string "The talent levels of the students here\n" + .string "are unknown. The potential’s there.$" + +RustboroCity_PokemonSchool_Text_214AB6: @ 8214AB6 + .string "SCOTT: Oh, what’s that?\p" + .string "It’s a STONE BADGE, isn’t it?\n" + .string "That’s pretty impressive, I’d say.\p" + .string "But, you know, I would’ve loved to see\n" + .string "you in battle.\p" + .string "It’s hard to tell what you’re like as\n" + .string "a TRAINER from a LEAGUE BADGE.$" + +RustboroCity_PokemonSchool_Text_214B8A: @ 8214B8A + .string "Hello? Didn’t we meet before?\n" + .string "I think back in PETALBURG CITY.\p" + .string "Let me introduce myself.\n" + .string "My name’s SCOTT.\p" + .string "I’ve been traveling everywhere in\n" + .string "search of outstanding TRAINERS.\p" + .string "More specifically, I’m looking for\n" + .string "POKéMON battle experts.\p" + .string "Oh, what’s that?\n" + .string "It’s a STONE BADGE, isn’t it?\p" + .string "That’s pretty impressive, I’d say, for\n" + .string "a starting TRAINER like yourself.\p" + .string "But, you know, I would’ve loved to see\n" + .string "you in battle.\p" + .string "It’s hard to tell what you’re like as\n" + .string "a TRAINER from a LEAGUE BADGE.$" + diff --git a/data/maps/RusturfTunnel/events.inc b/data/maps/RusturfTunnel/events.inc new file mode 100644 index 000000000..e294e200e --- /dev/null +++ b/data/maps/RusturfTunnel/events.inc @@ -0,0 +1,27 @@ +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 + +RusturfTunnel_MapWarps: @ 85342B4 + 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 + 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 + +RusturfTunnel_MapEvents:: @ 853431C + map_events RusturfTunnel_EventObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0 + diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc new file mode 100644 index 000000000..5e42be78d --- /dev/null +++ b/data/maps/RusturfTunnel/scripts.inc @@ -0,0 +1,539 @@ +RusturfTunnel_MapScripts:: @ 822CE27 + map_script 3, RusturfTunnel_MapScript1_22CE44 + map_script 2, RusturfTunnel_MapScript2_22CE32 + .byte 0 + +RusturfTunnel_MapScript2_22CE32: @ 822CE32 + map_script_2 VAR_0x409A, 4, RusturfTunnel_EventScript_22CEAE + map_script_2 VAR_0x409A, 5, RusturfTunnel_EventScript_22CEAE + .2byte 0 + +RusturfTunnel_MapScript1_22CE44: @ 822CE44 + compare VAR_0x409A, 2 + call_if 1, RusturfTunnel_EventScript_22CE50 + end + +RusturfTunnel_EventScript_22CE50:: @ 822CE50 + setobjectxyperm 7, 13, 4 + setobjectxyperm 6, 13, 5 + return + +RusturfTunnel_EventScript_22CE5F:: @ 822CE5F + lock + faceplayer + msgbox RusturfTunnel_Text_22D7A3, 4 + closemessage + applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2 + waitmovement 0 + release + end + +RusturfTunnel_EventScript_22CE76:: @ 822CE76 + lock + faceplayer + checkflag FLAG_0x001 + goto_eq RusturfTunnel_EventScript_22CE99 + setflag FLAG_0x001 + msgbox RusturfTunnel_Text_22D510, 4 + closemessage + applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2 + waitmovement 0 + release + end + +RusturfTunnel_EventScript_22CE99:: @ 822CE99 + msgbox RusturfTunnel_Text_22D5F3, 4 + closemessage + applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2 + waitmovement 0 + release + end + +RusturfTunnel_EventScript_22CEAE:: @ 822CEAE + lockall + compare VAR_TEMP_1, 1 + call_if 1, RusturfTunnel_EventScript_22CFA7 + compare VAR_TEMP_1, 2 + call_if 1, RusturfTunnel_EventScript_22CFBC + compare VAR_TEMP_1, 3 + call_if 1, RusturfTunnel_EventScript_22CFC7 + call RusturfTunnel_EventScript_22CFFF + msgbox RusturfTunnel_Text_22D65C, 4 + compare VAR_TEMP_1, 2 + call_if 1, RusturfTunnel_EventScript_22CFC8 + compare VAR_TEMP_1, 3 + call_if 1, RusturfTunnel_EventScript_22CFC8 + giveitem_std ITEM_HM04 + setflag FLAG_0x06A + msgbox RusturfTunnel_Text_22D6D2, 4 + closemessage + compare VAR_TEMP_1, 1 + call_if 1, RusturfTunnel_EventScript_22CF5D + compare VAR_TEMP_1, 2 + call_if 1, RusturfTunnel_EventScript_22CF6F + compare VAR_TEMP_1, 3 + call_if 1, RusturfTunnel_EventScript_22CF8B + msgbox RusturfTunnel_Text_22D745, 4 + closemessage + compare VAR_TEMP_1, 1 + call_if 1, RusturfTunnel_EventScript_22CFD4 + compare VAR_TEMP_1, 2 + call_if 1, RusturfTunnel_EventScript_22CFE6 + compare VAR_TEMP_1, 3 + call_if 1, RusturfTunnel_EventScript_22CFE6 + call RusturfTunnel_EventScript_272216 + releaseall + end + +RusturfTunnel_EventScript_22CF5D:: @ 822CF5D + applymovement 255, RusturfTunnel_Movement_22D042 + applymovement 1, RusturfTunnel_Movement_22D067 + waitmovement 0 + return + +RusturfTunnel_EventScript_22CF6F:: @ 822CF6F + applymovement 255, RusturfTunnel_Movement_22D045 + applymovement 1, RusturfTunnel_Movement_22D06C + waitmovement 0 + applymovement 10, RusturfTunnel_Movement_2725AA + waitmovement 0 + return + +RusturfTunnel_EventScript_22CF8B:: @ 822CF8B + applymovement 255, RusturfTunnel_Movement_22D045 + applymovement 1, RusturfTunnel_Movement_22D06C + waitmovement 0 + applymovement 10, RusturfTunnel_Movement_2725AA + waitmovement 0 + return + +RusturfTunnel_EventScript_22CFA7:: @ 822CFA7 + applymovement 1, RusturfTunnel_Movement_2725A6 + waitmovement 0 + applymovement 255, RusturfTunnel_Movement_2725AA + waitmovement 0 + return + +RusturfTunnel_EventScript_22CFBC:: @ 822CFBC + applymovement 1, RusturfTunnel_Movement_22D048 + waitmovement 0 + return + +RusturfTunnel_EventScript_22CFC7:: @ 822CFC7 + return + +RusturfTunnel_EventScript_22CFC8:: @ 822CFC8 + closemessage + applymovement 1, RusturfTunnel_Movement_22D065 + waitmovement 0 + return + +RusturfTunnel_EventScript_22CFD4:: @ 822CFD4 + applymovement 10, RusturfTunnel_Movement_22D017 + applymovement 1, RusturfTunnel_Movement_22D04B + waitmovement 0 + return + +RusturfTunnel_EventScript_22CFE6:: @ 822CFE6 + applymovement 255, RusturfTunnel_Movement_22D02F + applymovement 10, RusturfTunnel_Movement_22D023 + applymovement 1, RusturfTunnel_Movement_22D058 + waitmovement 0 + return + +RusturfTunnel_EventScript_22CFFF:: @ 822CFFF + playse SE_PIN + applymovement 1, RusturfTunnel_Movement_272598 + waitmovement 0 + applymovement 1, RusturfTunnel_Movement_27259A + waitmovement 0 + return + +RusturfTunnel_Movement_22D017: @ 822D017 + 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 + 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 + delay_8 + walk_in_place_fastest_up + delay_16 + delay_16 + walk_in_place_fastest_right + step_end + +RusturfTunnel_Movement_22D035: @ 822D035 + walk_left + walk_in_place_fastest_right + step_end + +RusturfTunnel_Movement_22D038: @ 822D038 + walk_down + walk_in_place_fastest_up + delay_8 + walk_in_place_fastest_right + step_end + +RusturfTunnel_Movement_22D03D: @ 822D03D + walk_up + walk_in_place_fastest_down + delay_8 + walk_in_place_fastest_right + step_end + +RusturfTunnel_Movement_22D042: @ 822D042 + walk_left + walk_in_place_fastest_right + step_end + +RusturfTunnel_Movement_22D045: @ 822D045 + walk_right + walk_in_place_fastest_left + step_end + +RusturfTunnel_Movement_22D048: @ 822D048 + walk_up + walk_in_place_fastest_right + step_end + +RusturfTunnel_Movement_22D04B: @ 822D04B + 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 + 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 + walk_right + step_end + +RusturfTunnel_Movement_22D067: @ 822D067 + walk_in_place_fast_up + walk_in_place_fast_up + walk_fast_up + walk_fast_right + step_end + +RusturfTunnel_Movement_22D06C: @ 822D06C + walk_in_place_fast_right + walk_in_place_fast_right + walk_fast_right + walk_in_place_fastest_up + step_end + +RusturfTunnel_EventScript_22D071:: @ 822D071 + setvar VAR_TEMP_1, 1 + end + +RusturfTunnel_EventScript_22D077:: @ 822D077 + setvar VAR_TEMP_1, 2 + end + +RusturfTunnel_EventScript_22D07D:: @ 822D07D + setvar VAR_TEMP_1, 3 + end + +RusturfTunnel_EventScript_22D083:: @ 822D083 + lockall + msgbox RusturfTunnel_Text_22D1C8, 4 + closemessage + applymovement 6, RusturfTunnel_Movement_22D0AB + applymovement 7, RusturfTunnel_Movement_22D0AB + waitmovement 0 + moveobjectoffscreen 6 + moveobjectoffscreen 7 + setvar VAR_0x409A, 3 + releaseall + end + +RusturfTunnel_Movement_22D0AB: @ 822D0AB + lock_facing_direction + walk_right + unlock_facing_direction + step_end + +RusturfTunnel_EventScript_22D0AF:: @ 822D0AF + lock + faceplayer + waitse + playmoncry SPECIES_WINGULL, 0 + msgbox RusturfTunnel_Text_22D1F7, 4 + waitmoncry + release + end + +RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 + lock + faceplayer + playbgm MUS_AQA_0, 0 + msgbox RusturfTunnel_Text_22D20A, 4 + trainerbattle 3, TRAINER_GRUNT_10, 0, RusturfTunnel_Text_22D2B0 + msgbox RusturfTunnel_Text_22D2E1, 4 + giveitem_std ITEM_DEVON_GOODS + closemessage + applymovement 255, RusturfTunnel_Movement_22D178 + applymovement 6, RusturfTunnel_Movement_22D181 + waitmovement 0 + removeobject 6 + delay 50 + addobject 5 + applymovement 5, RusturfTunnel_Movement_22D18B + waitmovement 0 + applymovement 255, RusturfTunnel_Movement_22D17E + applymovement 5, RusturfTunnel_Movement_22D1A4 + waitmovement 0 + msgbox RusturfTunnel_Text_22D395, 4 + applymovement 5, RusturfTunnel_Movement_27259E + waitmovement 0 + message RusturfTunnel_Text_22D3BA + waitmessage + waitse + playmoncry SPECIES_WINGULL, 0 + waitbuttonpress + waitmoncry + closemessage + applymovement 255, RusturfTunnel_Movement_22D19F + applymovement 5, RusturfTunnel_Movement_22D193 + applymovement 7, RusturfTunnel_Movement_22D1A7 + waitmovement 0 + removeobject 5 + removeobject 7 + clearflag FLAG_0x08E + setflag FLAG_0x08F + setvar VAR_0x405A, 4 + setvar VAR_0x4090, 1 + setflag FLAG_0x37B + release + end + +RusturfTunnel_Movement_22D178: @ 822D178 + face_down + lock_facing_direction + walk_up + unlock_facing_direction + walk_in_place_fastest_left + step_end + +RusturfTunnel_Movement_22D17E: @ 822D17E + walk_down + walk_in_place_fastest_up + step_end + +RusturfTunnel_Movement_22D181: @ 822D181 + 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 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + step_end + +RusturfTunnel_Movement_22D193: @ 822D193 + 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 + delay_16 + delay_8 + delay_4 + walk_in_place_fastest_left + step_end + +RusturfTunnel_Movement_22D1A4: @ 822D1A4 + delay_16 + walk_right + step_end + +RusturfTunnel_Movement_22D1A7: @ 822D1A7 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + step_end + +RusturfTunnel_EventScript_22D1B1:: @ 822D1B1 + trainerbattle 0, TRAINER_MIKE_2, 0, RusturfTunnel_Text_22D84D, RusturfTunnel_Text_22D8DB + msgbox RusturfTunnel_Text_22D8F9, 6 + end + +RusturfTunnel_Text_22D1C8: @ 822D1C8 + .string "What, are you coming?\n" + .string "Come and get some, then!$" + +RusturfTunnel_Text_22D1F7: @ 822D1F7 + .string "PEEKO: Pii pihyoh!$" + +RusturfTunnel_Text_22D20A: @ 822D20A + .string "Grah, keelhaul it all!\p" + .string "That hostage POKéMON turned out to\n" + .string "be worthless!\p" + .string "And to think I made a getaway…\n" + .string "In this tunnel to nowhere!\p" + .string "Hey! You!\n" + .string "So you want to battle me?$" + +RusturfTunnel_Text_22D2B0: @ 822D2B0 + .string "Urrrggh! My career in crime comes to\n" + .string "a dead end!$" + +RusturfTunnel_Text_22D2E1: @ 822D2E1 + .string "This is plain not right…\p" + .string "The BOSS told me this would be a\n" + .string "slick-and-easy job to pull.\p" + .string "All I had to do was steal some package\n" + .string "from DEVON.\p" + .string "Tch!\n" + .string "You want it back that badly, take it!$" + +RusturfTunnel_Text_22D395: @ 822D395 + .string "PEEKO!\n" + .string "Am I glad to see you’re safe!$" + +RusturfTunnel_Text_22D3BA: @ 822D3BA + .string "PEEKO owes her life to you!\p" + .string "They call me MR. BRINEY.\n" + .string "And, you are?\p" + .string "… … … … … … … …\n" + .string "… … … … … … … …\p" + .string "Ah, so you are {PLAYER}{KUN}!\n" + .string "I sincerely thank you!\p" + .string "Now, if there’s anything that troubles\n" + .string "you, don’t hesitate to tell me!\p" + .string "You can usually find me in my cottage\n" + .string "by the sea near PETALBURG WOODS.\p" + .string "Come, PEEKO, we should make our way\n" + .string "home.\p" + .string "PEEKO: Pihyoh!$" + +RusturfTunnel_Text_22D510: @ 822D510 + .string "… …\p" + .string "Why can’t they keep digging?\n" + .string "Is the bedrock too hard?\p" + .string "My beloved awaits me in VERDANTURF\n" + .string "TOWN just beyond here…\p" + .string "If RUSTBORO and VERDANTURF were\n" + .string "joined by this tunnel, I could visit\l" + .string "her every day…\p" + .string "But this…\n" + .string "What am I to do?$" + +RusturfTunnel_Text_22D5F3: @ 822D5F3 + .string "To get from RUSTBORO to VERDANTURF,\n" + .string "you need to go to DEWFORD, then pass\l" + .string "through SLATEPORT and MAUVILLE…$" + +RusturfTunnel_Text_22D65C: @ 822D65C + .string "Wow! You shattered that boulder\n" + .string "blocking the way.\p" + .string "To show you how much I appreciate it,\n" + .string "I’d like you to have this HM.$" + +RusturfTunnel_Text_22D6D2: @ 822D6D2 + .string "That HM contains STRENGTH.\p" + .string "If a muscular POKéMON were to learn\n" + .string "that, it would be able to move even\l" + .string "large boulders.$" + +RusturfTunnel_Text_22D745: @ 822D745 + .string "WANDA!\n" + .string "Now I can see you anytime!\p" + .string "WANDA: That’s…wonderful.\p" + .string "Please, take some rest at my home.$" + +RusturfTunnel_Text_22D7A3: @ 822D7A3 + .string "On the other side of this rock…\n" + .string "My boyfriend is there.\p" + .string "He… He’s not just digging the tunnel\n" + .string "to come see me.\p" + .string "He works his hands raw and rough\n" + .string "for the benefit of everyone.$" + +RusturfTunnel_Text_22D84D: @ 822D84D + .string "What do you call a wild man up in the\n" + .string "mountains? A mountain man, right?\p" + .string "So why don’t they call a POKéMON in\n" + .string "the mountains a mountain POKéMON?$" + +RusturfTunnel_Text_22D8DB: @ 822D8DB + .string "My POKéMON…\n" + .string "Ran out of power…$" + +RusturfTunnel_Text_22D8F9: @ 822D8F9 + .string "They halted development here to\n" + .string "protect POKéMON, right?\l" + .string "There’s a feel-good story!$" + diff --git a/data/maps/SSTidalCorridor/events.inc b/data/maps/SSTidalCorridor/events.inc new file mode 100644 index 000000000..8f0b1de77 --- /dev/null +++ b/data/maps/SSTidalCorridor/events.inc @@ -0,0 +1,35 @@ +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 + +SSTidalCorridor_MapWarps: @ 853A1D0 + 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 + 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 + +SSTidalCorridor_MapEvents:: @ 853A2A8 + map_events SSTidalCorridor_EventObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents + diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc new file mode 100644 index 000000000..2e1b4cfa4 --- /dev/null +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -0,0 +1,356 @@ +SSTidalCorridor_MapScripts:: @ 823BFCF + map_script 2, SSTidalCorridor_MapScript2_23BFD5 + .byte 0 + +SSTidalCorridor_MapScript2_23BFD5: @ 823BFD5 + map_script_2 VAR_0x40D4, 0, SSTidalCorridor_EventScript_23C219 + map_script_2 VAR_PORTHOLE, 1, SSTidalCorridor_EventScript_23BFFF + map_script_2 VAR_PORTHOLE, 5, SSTidalCorridor_EventScript_23C015 + map_script_2 VAR_PORTHOLE, 9, SSTidalCorridor_EventScript_23C067 + map_script_2 VAR_PORTHOLE, 10, SSTidalCorridor_EventScript_23C07D + .2byte 0 + +SSTidalCorridor_EventScript_23BFFF:: @ 823BFFF + special SetSSTidalFlag + setvar VAR_PORTHOLE, 2 + lockall + playse SE_PINPON + msgbox SSTidalCorridor_Text_23C462, 4 + releaseall + end + +SSTidalCorridor_EventScript_23C015:: @ 823C015 + setvar VAR_PORTHOLE, 6 + lockall + playse SE_PINPON + msgbox SSTidalCorridor_Text_23C4E3, 4 + releaseall + end + +SSTidalRooms_EventScript_23C028:: @ 823C028 + special SetSSTidalFlag + setvar VAR_PORTHOLE, 7 + playse SE_PINPON + msgbox SSTidalRooms_Text_23C462, 4 + return + +SSTidalRooms_EventScript_23C03C:: @ 823C03C + special ResetSSTidalFlag + setvar VAR_PORTHOLE, 4 + playse SE_PINPON + msgbox SSTidalRooms_Text_23C553, 4 + return + +SSTidalCorridor_EventScript_23C050:: @ 823C050 + compare VAR_PORTHOLE, 2 + goto_eq SSTidalCorridor_EventScript_23C067 + compare VAR_PORTHOLE, 7 + goto_eq SSTidalCorridor_EventScript_23C07D + end + +SSTidalCorridor_EventScript_23C067:: @ 823C067 + special ResetSSTidalFlag + setvar VAR_PORTHOLE, 3 + lockall + playse SE_PINPON + msgbox SSTidalCorridor_Text_23C4E3, 4 + releaseall + end + +SSTidalCorridor_EventScript_23C07D:: @ 823C07D + special ResetSSTidalFlag + setvar VAR_PORTHOLE, 8 + lockall + playse SE_PINPON + msgbox SSTidalCorridor_Text_23C50F, 4 + releaseall + end + +SSTidalRooms_EventScript_23C093:: @ 823C093 + special ResetSSTidalFlag + setvar VAR_PORTHOLE, 8 + playse SE_PINPON + msgbox SSTidalRooms_Text_23C50F, 4 + return + +SSTidalRooms_EventScript_23C0A7:: @ 823C0A7 + switch VAR_PORTHOLE + case 2, SSTidalRooms_EventScript_23C03C + case 3, SSTidalRooms_EventScript_23C03C + case 6, SSTidalRooms_EventScript_23C028 + case 7, SSTidalRooms_EventScript_23C093 + return + +SSTidalCorridor_EventScript_23C0D9:: @ 823C0D9 + msgbox SSTidalCorridor_Text_23C6EC, 2 + end + +SSTidalCorridor_EventScript_23C0E2:: @ 823C0E2 + lock + faceplayer + waitse + playmoncry SPECIES_WINGULL, 0 + msgbox SSTidalCorridor_Text_23C7E1, 4 + waitmoncry + release + end + +SSTidalCorridor_EventScript_23C0F5:: @ 823C0F5 + msgbox SSTidalCorridor_Text_23C7F8, 3 + end + +SSTidalCorridor_EventScript_23C0FE:: @ 823C0FE + msgbox SSTidalCorridor_Text_23C800, 3 + end + +SSTidalCorridor_EventScript_23C107:: @ 823C107 + msgbox SSTidalCorridor_Text_23C808, 3 + end + +SSTidalCorridor_EventScript_23C110:: @ 823C110 + msgbox SSTidalCorridor_Text_23C810, 3 + end + +SSTidalCorridor_EventScript_23C119:: @ 823C119 + lock + faceplayer + compare VAR_PORTHOLE, 4 + goto_eq SSTidalCorridor_EventScript_23C13B + compare VAR_PORTHOLE, 8 + goto_eq SSTidalCorridor_EventScript_23C15A + msgbox SSTidalCorridor_Text_23C596, 4 + release + end + +SSTidalCorridor_EventScript_23C13B:: @ 823C13B + setrespawn 8 + msgbox SSTidalCorridor_Text_23C64F, 4 + checkflag FLAG_0x104 + call_if 1, SSTidalCorridor_EventScript_23C179 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 + waitstate + release + end + +SSTidalCorridor_EventScript_23C15A:: @ 823C15A + setrespawn 4 + msgbox SSTidalCorridor_Text_23C64F, 4 + checkflag FLAG_0x104 + call_if 1, SSTidalCorridor_EventScript_23C179 + warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 + waitstate + release + end + +SSTidalCorridor_EventScript_23C179:: @ 823C179 + setflag FLAG_0x3B7 + return + +SSTidalCorridor_EventScript_23C17D:: @ 823C17D + lockall + compare VAR_PORTHOLE, 2 + goto_eq SSTidalCorridor_EventScript_23C19E + compare VAR_PORTHOLE, 7 + goto_eq SSTidalCorridor_EventScript_23C19E + msgbox SSTidalCorridor_Text_23C6C3, 4 + releaseall + end + +SSTidalCorridor_EventScript_23C19E:: @ 823C19E + special sub_80FB7A4 + waitstate + end + +SSTidalCorridor_EventScript_23C1A3:: @ 823C1A3 + lock + faceplayer + checkflag FLAG_0x0F7 + goto_eq SSTidalCorridor_EventScript_23C1BD + call SSTidalCorridor_EventScript_23C1C7 + msgbox SSTidalCorridor_Text_23C65E, 4 + release + end + +SSTidalCorridor_EventScript_23C1BD:: @ 823C1BD + msgbox SSTidalCorridor_Text_23C6B0, 4 + release + end + +SSTidalCorridor_EventScript_23C1C7:: @ 823C1C7 + checktrainerflag TRAINER_PHILLIP + goto_if 0, SSTidalCorridor_EventScript_23C218 + checktrainerflag TRAINER_LEONARD + goto_if 0, SSTidalCorridor_EventScript_23C218 + checktrainerflag TRAINER_COLTON + goto_if 0, SSTidalCorridor_EventScript_23C218 + checktrainerflag TRAINER_MICAH + goto_if 0, SSTidalCorridor_EventScript_23C218 + checktrainerflag TRAINER_THOMAS + goto_if 0, SSTidalCorridor_EventScript_23C218 + checktrainerflag TRAINER_LEA_AND_JED + goto_if 0, SSTidalCorridor_EventScript_23C218 + checktrainerflag TRAINER_GARRET + goto_if 0, SSTidalCorridor_EventScript_23C218 + checktrainerflag TRAINER_NAOMI + goto_if 0, SSTidalCorridor_EventScript_23C218 + setflag FLAG_0x0F7 + goto SSTidalCorridor_EventScript_23C1BD + return + +SSTidalCorridor_EventScript_23C218:: @ 823C218 + return + +SSTidalCorridor_EventScript_23C219:: @ 823C219 + lockall + applymovement 5, SSTidalCorridor_Movement_23C26D + waitmovement 0 + applymovement 255, SSTidalCorridor_Movement_2725A8 + waitmovement 0 + msgbox SSTidalCorridor_Text_23C28F, 4 + closemessage + applymovement 255, SSTidalCorridor_Movement_23C27D + applymovement 1, SSTidalCorridor_Movement_23C284 + applymovement 5, SSTidalCorridor_Movement_23C275 + waitmovement 0 + playse SE_KAIDAN + waitse + removeobject 5 + applymovement 1, SSTidalCorridor_Movement_23C28B + waitmovement 0 + delay 30 + setflag FLAG_0x1D0 + setvar VAR_0x40D4, 1 + releaseall + end + +SSTidalCorridor_Movement_23C26D: @ 823C26D + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + step_end + +SSTidalCorridor_Movement_23C275: @ 823C275 + walk_in_place_fastest_down + delay_16 + delay_16 + delay_16 + delay_16 + walk_down + walk_left + step_end + +SSTidalCorridor_Movement_23C27D: @ 823C27D + delay_16 + delay_16 + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_down + step_end + +SSTidalCorridor_Movement_23C284: @ 823C284 + delay_16 + walk_right + walk_right + walk_in_place_fastest_up + delay_16 + walk_in_place_fastest_left + step_end + +SSTidalCorridor_Movement_23C28B: @ 823C28B + walk_left + walk_left + walk_in_place_fastest_up + step_end + +SSTidalCorridor_Text_23C28F: @ 823C28F + .string "SCOTT: Well, hi, hi!\n" + .string "{PLAYER}{KUN}, {PLAYER}{KUN}!\p" + .string "Something’s come up, so I have to\n" + .string "disembark, but am I glad to see you!\p" + .string "Congratulations, LEAGUE CHAMPION!\p" + .string "There’s a place I’d like to invite\n" + .string "someone like you.\p" + .string "It’s the…\n" + .string "BATTLE FRONTIER!\p" + .string "What’s the place like?\n" + .string "You’ll understand when you see it!\p" + .string "I’ve spoken with the ship’s CAPTAIN\n" + .string "about this.\p" + .string "The next time you take a ferry,\n" + .string "you should be able to sail to\l" + .string "the BATTLE FRONTIER.\p" + .string "Okay, {PLAYER}{KUN}, I’ll be waiting for you\n" + .string "at the BATTLE FRONTIER!$" + +SSTidalCorridor_Text_23C462: @ 823C462 +SSTidalRooms_Text_23C462: @ 823C462 + .string "This ferry is built to plow through\n" + .string "fast-running currents.\p" + .string "We hope you enjoy your voyage with us.\n" + .string "Feel free to explore the ship.$" + +SSTidalCorridor_Text_23C4E3: @ 823C4E3 + .string "We hope you enjoy your voyage on\n" + .string "our ferry.$" + +SSTidalCorridor_Text_23C50F: @ 823C50F +SSTidalRooms_Text_23C50F: @ 823C50F + .string "We have made land in SLATEPORT CITY.\n" + .string "Thank you for sailing with us.$" + +SSTidalRooms_Text_23C553: @ 823C553 + .string "We have made land in LILYCOVE CITY.\n" + .string "Thank you for sailing with us.$" + +SSTidalCorridor_Text_23C596: @ 823C596 + .string "It’ll be some time before we make land,\n" + .string "I reckon.\p" + .string "You can rest up in your cabin if you’d\n" + .string "like. Your cabin’s No. 2.\p" + .string "The bed in there is soft and plushy.\n" + .string "I can attest to how comfy it is!$" + +SSTidalCorridor_Text_23C64F: @ 823C64F + .string "We’ve arrived!$" + +SSTidalCorridor_Text_23C65E: @ 823C65E + .string "Go visit other cabins.\n" + .string "TRAINERS bored of the boat trip will\l" + .string "be itching to battle.$" + +SSTidalCorridor_Text_23C6B0: @ 823C6B0 + .string "Enjoy your cruise!$" + +SSTidalCorridor_Text_23C6C3: @ 823C6C3 + .string "The horizon spreads beyond\n" + .string "the porthole.$" + +SSTidalCorridor_Text_23C6EC: @ 823C6EC + .string "MR. BRINEY: Welcome aboard, {PLAYER}{KUN}!\p" + .string "They made me honorary captain of\n" + .string "the S.S. TIDAL!\p" + .string "You can call me CAPTAIN BRINEY now!\p" + .string "You know, I retired once before,\n" + .string "but when I saw this majestic ship…\p" + .string "Let me just say, it stirred my sleeping\n" + .string "soul as a sailor!$" + +SSTidalCorridor_Text_23C7E1: @ 823C7E1 + .string "PEEKO: Pihyo pihyohyo…$" + +SSTidalCorridor_Text_23C7F8: @ 823C7F8 + .string "Cabin 1$" + +SSTidalCorridor_Text_23C800: @ 823C800 + .string "Cabin 2$" + +SSTidalCorridor_Text_23C808: @ 823C808 + .string "Cabin 3$" + +SSTidalCorridor_Text_23C810: @ 823C810 + .string "Cabin 4$" diff --git a/data/maps/SSTidalLowerDeck/events.inc b/data/maps/SSTidalLowerDeck/events.inc new file mode 100644 index 000000000..969830d37 --- /dev/null +++ b/data/maps/SSTidalLowerDeck/events.inc @@ -0,0 +1,13 @@ +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 + +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 + +SSTidalLowerDeck_MapEvents:: @ 853A300 + map_events SSTidalLowerDeck_EventObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents + diff --git a/data/maps/SSTidalLowerDeck/scripts.inc b/data/maps/SSTidalLowerDeck/scripts.inc new file mode 100644 index 000000000..2ad1ed580 --- /dev/null +++ b/data/maps/SSTidalLowerDeck/scripts.inc @@ -0,0 +1,39 @@ +SSTidalLowerDeck_MapScripts:: @ 823C818 + .byte 0 + +SSTidalLowerDeck_EventScript_23C819:: @ 823C819 + trainerbattle 0, TRAINER_PHILLIP, 0, SSTidalLowerDeck_Text_23C847, SSTidalLowerDeck_Text_23C8A0 + msgbox SSTidalLowerDeck_Text_23C8B4, 6 + end + +SSTidalLowerDeck_EventScript_23C830:: @ 823C830 + trainerbattle 0, TRAINER_LEONARD, 0, SSTidalLowerDeck_Text_23C917, SSTidalLowerDeck_Text_23C97D + msgbox SSTidalLowerDeck_Text_23C98E, 6 + end + +SSTidalLowerDeck_Text_23C847: @ 823C847 + .string "Arrrgh! I’m fed up and dog-tired of\n" + .string "cleaning this huge place!\p" + .string "Let’s have a quick battle!$" + +SSTidalLowerDeck_Text_23C8A0: @ 823C8A0 + .string "Little bro, I lost!$" + +SSTidalLowerDeck_Text_23C8B4: @ 823C8B4 + .string "We’re the CLEANUP BROTHERS!\p" + .string "The old one dumps the detergent,\n" + .string "and the young one does the scrubbing!$" + +SSTidalLowerDeck_Text_23C917: @ 823C917 + .string "This is the bottom of the ship’s hull.\n" + .string "There’s plenty of room.\l" + .string "It’ll be alright for a POKéMON battle.$" + +SSTidalLowerDeck_Text_23C97D: @ 823C97D + .string "Big bro, I lost!$" + +SSTidalLowerDeck_Text_23C98E: @ 823C98E + .string "We’re the CLEANUP BROTHERS!\p" + .string "The old one dumps the detergent,\n" + .string "and the young one does the scrubbing!$" + diff --git a/data/maps/SSTidalRooms/events.inc b/data/maps/SSTidalRooms/events.inc new file mode 100644 index 000000000..a9900294c --- /dev/null +++ b/data/maps/SSTidalRooms/events.inc @@ -0,0 +1,31 @@ +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 + +SSTidalRooms_MapWarps: @ 853A3D4 + 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 + bg_event 15, 12, 0, 0, 0, SSTidalRooms_EventScript_23CA33 + +SSTidalRooms_MapEvents:: @ 853A44C + map_events SSTidalRooms_EventObjects, SSTidalRooms_MapWarps, 0x0, SSTidalRooms_MapBGEvents + diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc new file mode 100644 index 000000000..39c453e98 --- /dev/null +++ b/data/maps/SSTidalRooms/scripts.inc @@ -0,0 +1,177 @@ +SSTidalRooms_MapScripts:: @ 823C9F1 + .byte 0 + +SSTidalRooms_EventScript_23C9F2:: @ 823C9F2 + lock + faceplayer + checkflag FLAG_0x104 + goto_eq SSTidalRooms_EventScript_23CA29 + msgbox SSTidalRooms_Text_23D098, 4 + giveitem_std ITEM_TM49 + compare VAR_RESULT, 0 + goto_eq SSTidalRooms_EventScript_272054 + setflag FLAG_0x104 + msgbox SSTidalRooms_Text_23D145, 4 + release + end + +SSTidalRooms_EventScript_23CA29:: @ 823CA29 + msgbox SSTidalRooms_Text_23D145, 4 + release + end + +SSTidalRooms_EventScript_23CA33:: @ 823CA33 + lockall + msgbox SSTidalRooms_Text_23CAF2, 4 + closemessage + call SSTidalRooms_EventScript_272083 + call SSTidalRooms_EventScript_23C0A7 + releaseall + end + +SSTidalRooms_EventScript_23CA49:: @ 823CA49 + trainerbattle 0, TRAINER_COLTON, 0, SSTidalRooms_Text_23CB14, SSTidalRooms_Text_23CB58 + msgbox SSTidalRooms_Text_23CB75, 6 + end + +SSTidalRooms_EventScript_23CA60:: @ 823CA60 + trainerbattle 0, TRAINER_MICAH, 0, SSTidalRooms_Text_23CBEB, SSTidalRooms_Text_23CC04 + msgbox SSTidalRooms_Text_23CC26, 6 + end + +SSTidalRooms_EventScript_23CA77:: @ 823CA77 + trainerbattle 0, TRAINER_THOMAS, 0, SSTidalRooms_Text_23CC68, SSTidalRooms_Text_23CC8A + msgbox SSTidalRooms_Text_23CCBB, 6 + end + +SSTidalRooms_EventScript_23CA8E:: @ 823CA8E + trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_23CD04, SSTidalRooms_Text_23CD54, SSTidalRooms_Text_23CDC6 + msgbox SSTidalRooms_Text_23CD5F, 6 + end + +SSTidalRooms_EventScript_23CAA9:: @ 823CAA9 + trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_23CE04, SSTidalRooms_Text_23CE4B, SSTidalRooms_Text_23CEB0 + msgbox SSTidalRooms_Text_23CE59, 6 + end + +SSTidalRooms_EventScript_23CAC4:: @ 823CAC4 + trainerbattle 0, TRAINER_GARRET, 0, SSTidalRooms_Text_23CEEE, SSTidalRooms_Text_23CF36 + msgbox SSTidalRooms_Text_23CF45, 6 + end + +SSTidalRooms_EventScript_23CADB:: @ 823CADB + trainerbattle 0, TRAINER_NAOMI, 0, SSTidalRooms_Text_23CF97, SSTidalRooms_Text_23CFF4 + msgbox SSTidalRooms_Text_23D013, 6 + end + +SSTidalRooms_Text_23CAF2: @ 823CAF2 + .string "There’s a bed…\n" + .string "Let’s take a rest.$" + +SSTidalRooms_Text_23CB14: @ 823CB14 + .string "I often sail to LILYCOVE CITY.\p" + .string "I enjoy attending CONTESTS,\n" + .string "you see.$" + +SSTidalRooms_Text_23CB58: @ 823CB58 + .string "That was an enjoyable match!$" + +SSTidalRooms_Text_23CB75: @ 823CB75 + .string "I get so excited imagining what kinds\n" + .string "of POKéMON I’ll get to see in the next\l" + .string "CONTEST. The anticipation of it thrills!$" + +SSTidalRooms_Text_23CBEB: @ 823CBEB + .string "Are your friends strong?$" + +SSTidalRooms_Text_23CC04: @ 823CC04 + .string "Your friends are, indeed, strong.$" + +SSTidalRooms_Text_23CC26: @ 823CC26 + .string "Friends need not be human.\n" + .string "For me, POKéMON are treasured friends!$" + +SSTidalRooms_Text_23CC68: @ 823CC68 + .string "Child…\n" + .string "Did you knock on the door?$" + +SSTidalRooms_Text_23CC8A: @ 823CC8A + .string "A loss is to be accepted without haste\n" + .string "or panic.$" + +SSTidalRooms_Text_23CCBB: @ 823CCBB + .string "To be never ruffled in any situation is\n" + .string "the GENTLEMAN’s code of conduct.$" + +SSTidalRooms_Text_23CD04: @ 823CD04 + .string "JED: I feel a little shy about this, but…\n" + .string "We’ll show you our lovey-dovey power!$" + +SSTidalRooms_Text_23CD54: @ 823CD54 + .string "JED: Sigh…$" + +SSTidalRooms_Text_23CD5F: @ 823CD5F + .string "JED: It’s the first time that our lovey-\n" + .string "dovey power couldn’t prevail!\l" + .string "You must be an awesome TRAINER!$" + +SSTidalRooms_Text_23CDC6: @ 823CDC6 + .string "JED: You only have one POKéMON?\n" + .string "Isn’t that just too lonesome?$" + +SSTidalRooms_Text_23CE04: @ 823CE04 + .string "LEA: I feel a little silly, but…\n" + .string "We’ll show you our lovey-dovey power!$" + +SSTidalRooms_Text_23CE4B: @ 823CE4B + .string "LEA: Oh, boo!$" + +SSTidalRooms_Text_23CE59: @ 823CE59 + .string "LEA: I can’t believe it!\n" + .string "Our lovey-dovey power failed…\l" + .string "You must be an awesome TRAINER!$" + +SSTidalRooms_Text_23CEB0: @ 823CEB0 + .string "LEA: I wanted to battle…\n" + .string "But you don’t even have two POKéMON…$" + +SSTidalRooms_Text_23CEEE: @ 823CEEE + .string "Ah, you’ve come just in time.\p" + .string "I’m bored, you see.\n" + .string "You may entertain me.$" + +SSTidalRooms_Text_23CF36: @ 823CF36 + .string "…That will do.$" + +SSTidalRooms_Text_23CF45: @ 823CF45 + .string "Perhaps I shall get Father to acquire\n" + .string "a yacht for me.\l" + .string "A yacht for me and POKéMON!$" + +SSTidalRooms_Text_23CF97: @ 823CF97 + .string "Oh, you’re such an adorable TRAINER.\n" + .string "Would you like to have tea?\l" + .string "Or would you rather battle?$" + +SSTidalRooms_Text_23CFF4: @ 823CFF4 + .string "I see.\n" + .string "You’re the active sort.$" + +SSTidalRooms_Text_23D013: @ 823D013 + .string "A world cruise on a luxury liner has its\n" + .string "charms, I must say…\p" + .string "But, I will admit there is an appealing\n" + .string "side to touring HOENN by ferry.$" + +SSTidalRooms_Text_23D098: @ 823D098 + .string "Uh… Hi! I… I’m not acting suspicious!\n" + .string "Uh… You can have this! For free!\p" + .string "It… Honestly, I didn’t SNATCH it from\n" + .string "someone! I’d never do such a thing!\l" + .string "It’s clean! You can use it!$" + +SSTidalRooms_Text_23D145: @ 823D145 + .string "SNATCH steals the beneficial effects\n" + .string "of certain moves before they can be\l" + .string "used by a foe or ally.$" + diff --git a/data/maps/SafariZone_North/events.inc b/data/maps/SafariZone_North/events.inc new file mode 100644 index 000000000..88b41669b --- /dev/null +++ b/data/maps/SafariZone_North/events.inc @@ -0,0 +1,14 @@ +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 + +SafariZone_North_MapEvents:: @ 853B238 + map_events SafariZone_North_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/SafariZone_North/scripts.inc b/data/maps/SafariZone_North/scripts.inc new file mode 100644 index 000000000..a96b6b95d --- /dev/null +++ b/data/maps/SafariZone_North/scripts.inc @@ -0,0 +1,11 @@ +SafariZone_North_MapScripts:: @ 823D253 + .byte 0 + +SafariZone_North_EventScript_23D254:: @ 823D254 + msgbox SafariZone_North_Text_2A5489, 2 + end + +SafariZone_North_EventScript_23D25D:: @ 823D25D + msgbox SafariZone_North_Text_2A54F0, 2 + end + diff --git a/data/maps/SafariZone_Northeast/events.inc b/data/maps/SafariZone_Northeast/events.inc new file mode 100644 index 000000000..e71ba4dd5 --- /dev/null +++ b/data/maps/SafariZone_Northeast/events.inc @@ -0,0 +1,18 @@ +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 + +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_EventObjects, 0x0, 0x0, SafariZone_Northeast_MapBGEvents + diff --git a/data/maps/SafariZone_Northeast/scripts.inc b/data/maps/SafariZone_Northeast/scripts.inc new file mode 100644 index 000000000..207e2a584 --- /dev/null +++ b/data/maps/SafariZone_Northeast/scripts.inc @@ -0,0 +1,3 @@ +SafariZone_Northeast_MapScripts:: @ 8242C02 + .byte 0 + diff --git a/data/maps/SafariZone_Northwest/events.inc b/data/maps/SafariZone_Northwest/events.inc new file mode 100644 index 000000000..8e5b242b9 --- /dev/null +++ b/data/maps/SafariZone_Northwest/events.inc @@ -0,0 +1,7 @@ +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 + +SafariZone_Northwest_MapEvents:: @ 853B14C + map_events SafariZone_Northwest_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/SafariZone_Northwest/scripts.inc b/data/maps/SafariZone_Northwest/scripts.inc new file mode 100644 index 000000000..34e510237 --- /dev/null +++ b/data/maps/SafariZone_Northwest/scripts.inc @@ -0,0 +1,7 @@ +SafariZone_Northwest_MapScripts:: @ 823D249 + .byte 0 + +SafariZone_Northwest_EventScript_23D24A:: @ 823D24A + msgbox SafariZone_Northwest_Text_2A542C, 2 + end + diff --git a/data/maps/SafariZone_RestHouse/events.inc b/data/maps/SafariZone_RestHouse/events.inc new file mode 100644 index 000000000..0607ffcc7 --- /dev/null +++ b/data/maps/SafariZone_RestHouse/events.inc @@ -0,0 +1,12 @@ +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 + +SafariZone_RestHouse_MapWarps: @ 853B944 + 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/SafariZone_RestHouse/scripts.inc b/data/maps/SafariZone_RestHouse/scripts.inc new file mode 100644 index 000000000..22657eeb1 --- /dev/null +++ b/data/maps/SafariZone_RestHouse/scripts.inc @@ -0,0 +1,15 @@ +SafariZone_RestHouse_MapScripts:: @ 8242BE6 + .byte 0 + +SafariZone_RestHouse_EventScript_242BE7:: @ 8242BE7 + msgbox SafariZone_RestHouse_Text_2A5639, 2 + end + +SafariZone_RestHouse_EventScript_242BF0:: @ 8242BF0 + msgbox SafariZone_RestHouse_Text_2A56E1, 2 + end + +SafariZone_RestHouse_EventScript_242BF9:: @ 8242BF9 + msgbox SafariZone_RestHouse_Text_2A5764, 2 + end + diff --git a/data/maps/SafariZone_South/events.inc b/data/maps/SafariZone_South/events.inc new file mode 100644 index 000000000..46173d11a --- /dev/null +++ b/data/maps/SafariZone_South/events.inc @@ -0,0 +1,14 @@ +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 + +SafariZone_South_MapWarps: @ 853B334 + 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/SafariZone_South/scripts.inc b/data/maps/SafariZone_South/scripts.inc new file mode 100644 index 000000000..19f51b873 --- /dev/null +++ b/data/maps/SafariZone_South/scripts.inc @@ -0,0 +1,154 @@ +SafariZone_South_MapScripts:: @ 823D279 + map_script 3, SafariZone_South_MapScript1_23D2B1 + map_script 2, SafariZone_South_MapScript2_23D284 + .byte 0 + +SafariZone_South_MapScript2_23D284: @ 823D284 + map_script_2 VAR_0x40A4, 2, SafariZone_South_EventScript_23D28E + .2byte 0 + +SafariZone_South_EventScript_23D28E:: @ 823D28E + lockall + applymovement 255, SafariZone_South_Movement_23D2C5 + waitmovement 0 + applymovement 1, SafariZone_South_Movement_23D2C7 + waitmovement 0 + setobjectxyperm 1, 32, 34 + setvar VAR_0x40A4, 0 + releaseall + end + +SafariZone_South_MapScript1_23D2B1: @ 823D2B1 + compare VAR_0x40A4, 2 + call_if 1, SafariZone_South_EventScript_23D2BD + end + +SafariZone_South_EventScript_23D2BD:: @ 823D2BD + setobjectxyperm 1, 31, 34 + return + +SafariZone_South_Movement_23D2C5: @ 823D2C5 + walk_down + step_end + +SafariZone_South_Movement_23D2C7: @ 823D2C7 + walk_right + walk_in_place_fastest_down + step_end + +SafariZone_South_EventScript_23D2CA:: @ 823D2CA + msgbox SafariZone_South_Text_2A52EF, 2 + end + +SafariZone_South_EventScript_23D2D3:: @ 823D2D3 + msgbox SafariZone_South_Text_2A533B, 2 + end + +SafariZone_South_EventScript_23D2DC:: @ 823D2DC + msgbox SafariZone_South_Text_2A553E, 2 + end + +SafariZone_South_EventScript_23D2E5:: @ 823D2E5 + lock + faceplayer + checkflag FLAG_0x05D + goto_if 0, SafariZone_South_EventScript_23D30D + msgbox SafariZone_South_Text_2A51D4, 5 + compare VAR_RESULT, 1 + goto_eq SafariZone_South_EventScript_23D31A + msgbox SafariZone_South_Text_2A521A, 4 + release + end + +SafariZone_South_EventScript_23D30D:: @ 823D30D + setflag FLAG_0x05D + msgbox SafariZone_South_Text_2A52AB, 4 + release + end + +SafariZone_South_EventScript_23D31A:: @ 823D31A + msgbox SafariZone_South_Text_2A5248, 4 + closemessage + switch VAR_FACING + case 2, SafariZone_South_EventScript_23D33F + case 4, SafariZone_South_EventScript_23D359 + end + +SafariZone_South_EventScript_23D33F:: @ 823D33F + applymovement 1, SafariZone_South_Movement_23D38A + waitmovement 0 + applymovement 255, SafariZone_South_Movement_23D385 + waitmovement 0 + goto SafariZone_South_EventScript_23D373 + end + +SafariZone_South_EventScript_23D359:: @ 823D359 + applymovement 1, SafariZone_South_Movement_23D38D + waitmovement 0 + applymovement 255, SafariZone_South_Movement_23D387 + waitmovement 0 + goto SafariZone_South_EventScript_23D373 + end + +SafariZone_South_EventScript_23D373:: @ 823D373 + setvar VAR_0x40A4, 1 + special ExitSafariMode + warpdoor MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 + waitstate + end + +SafariZone_South_Movement_23D385: @ 823D385 + walk_up + step_end + +SafariZone_South_Movement_23D387: @ 823D387 + walk_right + walk_in_place_fastest_up + step_end + +SafariZone_South_Movement_23D38A: @ 823D38A + walk_left + walk_in_place_fastest_right + step_end + +SafariZone_South_Movement_23D38D: @ 823D38D + walk_down + walk_in_place_fastest_up + step_end + +SafariZone_South_EventScript_23D390:: @ 823D390 + msgbox SafariZone_South_Text_2A57EE, 2 + end + +SafariZone_Southeast_EventScript_23D399:: @ 823D399 + msgbox SafariZone_Southeast_Text_2A582D, 2 + end + +SafariZone_South_EventScript_23D3A2:: @ 823D3A2 + msgbox SafariZone_South_Text_2A5887, 2 + end + +SafariZone_Southeast_EventScript_23D3AB:: @ 823D3AB + msgbox SafariZone_Southeast_Text_2A58C6, 2 + end + +SafariZone_Southeast_EventScript_23D3B4:: @ 823D3B4 + msgbox SafariZone_Southeast_Text_2A58FD, 2 + end + +SafariZone_Southeast_EventScript_23D3BD:: @ 823D3BD + msgbox SafariZone_Southeast_Text_2A5960, 2 + end + +SafariZone_Northeast_EventScript_23D3C6:: @ 823D3C6 + msgbox SafariZone_Northeast_Text_2A59A4, 2 + end + +SafariZone_Northeast_EventScript_23D3CF:: @ 823D3CF + msgbox SafariZone_Northeast_Text_2A5A09, 2 + end + +SafariZone_Northeast_EventScript_23D3D8:: @ 823D3D8 + msgbox SafariZone_Northeast_Text_2A5A44, 2 + end + diff --git a/data/maps/SafariZone_Southeast/events.inc b/data/maps/SafariZone_Southeast/events.inc new file mode 100644 index 000000000..af2da0575 --- /dev/null +++ b/data/maps/SafariZone_Southeast/events.inc @@ -0,0 +1,14 @@ +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 + +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_EventObjects, 0x0, 0x0, SafariZone_Southeast_MapBGEvents + diff --git a/data/maps/SafariZone_Southeast/scripts.inc b/data/maps/SafariZone_Southeast/scripts.inc new file mode 100644 index 000000000..f88cd22fb --- /dev/null +++ b/data/maps/SafariZone_Southeast/scripts.inc @@ -0,0 +1,3 @@ +SafariZone_Southeast_MapScripts:: @ 8242C03 + .byte 0 + diff --git a/data/maps/SafariZone_Southwest/events.inc b/data/maps/SafariZone_Southwest/events.inc new file mode 100644 index 000000000..ccd775dd2 --- /dev/null +++ b/data/maps/SafariZone_Southwest/events.inc @@ -0,0 +1,13 @@ +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 + +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 + +SafariZone_Southwest_MapEvents:: @ 853B290 + map_events SafariZone_Southwest_EventObjects, SafariZone_Southwest_MapWarps, 0x0, SafariZone_Southwest_MapBGEvents + diff --git a/data/maps/SafariZone_Southwest/scripts.inc b/data/maps/SafariZone_Southwest/scripts.inc new file mode 100644 index 000000000..d2e75eb1b --- /dev/null +++ b/data/maps/SafariZone_Southwest/scripts.inc @@ -0,0 +1,11 @@ +SafariZone_Southwest_MapScripts:: @ 823D266 + .byte 0 + +SafariZone_Southwest_EventScript_23D267:: @ 823D267 + msgbox SafariZone_Southwest_Text_2A53B7, 2 + end + +SafariZone_Southwest_EventScript_23D270:: @ 823D270 + msgbox SafariZone_Southwest_Text_2A5613, 3 + end + diff --git a/data/maps/ScorchedSlab/events.inc b/data/maps/ScorchedSlab/events.inc new file mode 100644 index 000000000..588b7a9ae --- /dev/null +++ b/data/maps/ScorchedSlab/events.inc @@ -0,0 +1,9 @@ +ScorchedSlab_EventObjects: @ 8536F88 + 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 + +ScorchedSlab_MapEvents:: @ 8536FA8 + map_events ScorchedSlab_EventObjects, ScorchedSlab_MapWarps, 0x0, 0x0 + diff --git a/data/maps/ScorchedSlab/scripts.inc b/data/maps/ScorchedSlab/scripts.inc new file mode 100644 index 000000000..f83724ec5 --- /dev/null +++ b/data/maps/ScorchedSlab/scripts.inc @@ -0,0 +1,8 @@ +ScorchedSlab_MapScripts:: @ 8239291 + map_script 3, ScorchedSlab_MapScript1_239297 + .byte 0 + +ScorchedSlab_MapScript1_239297: @ 8239297 + setflag FLAG_LANDMARK_SCORCHED_SLAB + end + diff --git a/data/maps/SeafloorCavern_Entrance/events.inc b/data/maps/SeafloorCavern_Entrance/events.inc new file mode 100644 index 000000000..e27362f00 --- /dev/null +++ b/data/maps/SeafloorCavern_Entrance/events.inc @@ -0,0 +1,10 @@ +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 + +SeafloorCavern_Entrance_MapWarps: @ 85356D4 + 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/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc new file mode 100644 index 000000000..9eb71d5e3 --- /dev/null +++ b/data/maps/SeafloorCavern_Entrance/scripts.inc @@ -0,0 +1,93 @@ +SeafloorCavern_Entrance_MapScripts:: @ 823446E + map_script 5, SeafloorCavern_Entrance_MapScript1_234474 + .byte 0 + +SeafloorCavern_Entrance_MapScript1_234474: @ 8234474 + setdivewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5 + setescapewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5 + end + +SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 + lockall + compare VAR_0x40D9, 1 + goto_eq SeafloorCavern_Entrance_EventScript_2344ED + waitse + playse SE_PIN + applymovement 1, SeafloorCavern_Entrance_Movement_272598 + waitmovement 0 + applymovement 1, SeafloorCavern_Entrance_Movement_27259A + waitmovement 0 + delay 20 + compare VAR_FACING, 3 + call_if 1, SeafloorCavern_Entrance_EventScript_23452E + compare VAR_FACING, 4 + call_if 1, SeafloorCavern_Entrance_EventScript_234523 + compare VAR_FACING, 2 + call_if 1, SeafloorCavern_Entrance_EventScript_234539 + delay 30 + setvar VAR_0x40D9, 1 + moveobjectoffscreen 1 + msgbox SeafloorCavern_Entrance_Text_234544, 4 + closemessage + applymovement 1, SeafloorCavern_Entrance_Movement_2725A6 + waitmovement 0 + releaseall + end + +SeafloorCavern_Entrance_EventScript_2344ED:: @ 82344ED + compare VAR_FACING, 3 + call_if 1, SeafloorCavern_Entrance_EventScript_23452E + compare VAR_FACING, 4 + call_if 1, SeafloorCavern_Entrance_EventScript_234523 + compare VAR_FACING, 2 + call_if 1, SeafloorCavern_Entrance_EventScript_234539 + msgbox SeafloorCavern_Entrance_Text_2346C8, 4 + closemessage + applymovement 1, SeafloorCavern_Entrance_Movement_2725A6 + waitmovement 0 + releaseall + end + +SeafloorCavern_Entrance_EventScript_234523:: @ 8234523 + applymovement 1, SeafloorCavern_Entrance_Movement_2725A4 + waitmovement 0 + return + +SeafloorCavern_Entrance_EventScript_23452E:: @ 823452E + applymovement 1, SeafloorCavern_Entrance_Movement_2725A8 + waitmovement 0 + return + +SeafloorCavern_Entrance_EventScript_234539:: @ 8234539 + applymovement 1, SeafloorCavern_Entrance_Movement_2725AA + waitmovement 0 + return + +SeafloorCavern_Entrance_Text_234544: @ 8234544 + .string "Hey!\n" + .string "I remember your face!\p" + .string "If you’re here, it must mean that\n" + .string "you’re about to mess with us again!\p" + .string "A punk like you, do you really think\n" + .string "you can take on TEAM AQUA?\p" + .string "I’d say you’re too early by about\n" + .string "a trillion years!\p" + .string "You’re a perfect fit for the likes of\n" + .string "TEAM MAGMA!\p" + .string "Speaking of TEAM MAGMA, I hear they\n" + .string "were spotted near MOSSDEEP.\p" + .string "That bunch of goons, they sure don’t\n" + .string "look good near the sea!$" + +SeafloorCavern_Entrance_Text_2346C8: @ 82346C8 + .string "A punk like you, do you really think\n" + .string "you can take on TEAM AQUA?\p" + .string "I’d say you’re too early by about\n" + .string "a trillion years!\p" + .string "You’re a perfect fit for the likes of\n" + .string "TEAM MAGMA!\p" + .string "Speaking of TEAM MAGMA, I hear they\n" + .string "were spotted near MOSSDEEP.\p" + .string "That bunch of goons, they sure don’t\n" + .string "look good near the sea!$" + diff --git a/data/maps/SeafloorCavern_Room1/events.inc b/data/maps/SeafloorCavern_Room1/events.inc new file mode 100644 index 000000000..261314b9b --- /dev/null +++ b/data/maps/SeafloorCavern_Room1/events.inc @@ -0,0 +1,15 @@ +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 + +SeafloorCavern_Room1_MapWarps: @ 8535770 + 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/SeafloorCavern_Room1/scripts.inc b/data/maps/SeafloorCavern_Room1/scripts.inc new file mode 100644 index 000000000..d3308fca2 --- /dev/null +++ b/data/maps/SeafloorCavern_Room1/scripts.inc @@ -0,0 +1,36 @@ +SeafloorCavern_Room1_MapScripts:: @ 82347EB + .byte 0 + +SeafloorCavern_Room1_EventScript_2347EC:: @ 82347EC + trainerbattle 0, TRAINER_GRUNT_5, 0, SeafloorCavern_Room1_Text_23481A, SeafloorCavern_Room1_Text_23484A + msgbox SeafloorCavern_Room1_Text_23485D, 6 + end + +SeafloorCavern_Room1_EventScript_234803:: @ 8234803 + trainerbattle 0, TRAINER_GRUNT_6, 0, SeafloorCavern_Room1_Text_234898, SeafloorCavern_Room1_Text_2348CD + msgbox SeafloorCavern_Room1_Text_2348E3, 6 + end + +SeafloorCavern_Room1_Text_23481A: @ 823481A + .string "We don’t need a kid around!\n" + .string "Go on home already!$" + +SeafloorCavern_Room1_Text_23484A: @ 823484A + .string "I want to go home…$" + +SeafloorCavern_Room1_Text_23485D: @ 823485D + .string "I want to get a promotion so I can\n" + .string "boss around the GRUNTS…$" + +SeafloorCavern_Room1_Text_234898: @ 8234898 + .string "That submarine… It’s tiny inside.\n" + .string "I’m sore all over!$" + +SeafloorCavern_Room1_Text_2348CD: @ 82348CD + .string "Losing makes me sore!$" + +SeafloorCavern_Room1_Text_2348E3: @ 82348E3 + .string "That submarine we jacked, man,\n" + .string "it’s brutal as a ride.\l" + .string "It’s way too tight in there!$" + diff --git a/data/maps/SeafloorCavern_Room2/events.inc b/data/maps/SeafloorCavern_Room2/events.inc new file mode 100644 index 000000000..01f6f3ba5 --- /dev/null +++ b/data/maps/SeafloorCavern_Room2/events.inc @@ -0,0 +1,19 @@ +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 + +SeafloorCavern_Room2_MapWarps: @ 853585C + 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/SeafloorCavern_Room2/scripts.inc b/data/maps/SeafloorCavern_Room2/scripts.inc new file mode 100644 index 000000000..15201dac0 --- /dev/null +++ b/data/maps/SeafloorCavern_Room2/scripts.inc @@ -0,0 +1,3 @@ +SeafloorCavern_Room2_MapScripts:: @ 8234936 + .byte 0 + diff --git a/data/maps/SeafloorCavern_Room3/events.inc b/data/maps/SeafloorCavern_Room3/events.inc new file mode 100644 index 000000000..300db40c5 --- /dev/null +++ b/data/maps/SeafloorCavern_Room3/events.inc @@ -0,0 +1,19 @@ +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 + +SeafloorCavern_Room3_MapWarps: @ 8535968 + 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/SeafloorCavern_Room3/scripts.inc b/data/maps/SeafloorCavern_Room3/scripts.inc new file mode 100644 index 000000000..f57d58e22 --- /dev/null +++ b/data/maps/SeafloorCavern_Room3/scripts.inc @@ -0,0 +1,58 @@ +SeafloorCavern_Room3_MapScripts:: @ 8234937 + .byte 0 + +SeafloorCavern_Room3_EventScript_234938:: @ 8234938 + trainerbattle 0, TRAINER_SHELLY_2, 0, SeafloorCavern_Room3_Text_234966, SeafloorCavern_Room3_Text_234A79 + msgbox SeafloorCavern_Room3_Text_234A8A, 6 + end + +SeafloorCavern_Room3_EventScript_23494F:: @ 823494F + trainerbattle 0, TRAINER_GRUNT_27, 0, SeafloorCavern_Room3_Text_234B3A, SeafloorCavern_Room3_Text_234BFE + msgbox SeafloorCavern_Room3_Text_234C04, 6 + end + +SeafloorCavern_Room3_Text_234966: @ 8234966 + .string "Ahahahaha!\p" + .string "How did you manage to get here without\n" + .string "a submarine?\l" + .string "What an impressive child!\p" + .string "But… It won’t do to have you\n" + .string "meddling about here.\p" + .string "And, I do want payback for what\n" + .string "happened at the WEATHER INSTITUTE…\p" + .string "I’m going to give you a little taste\n" + .string "of pain! Resign yourself to it!$" + +SeafloorCavern_Room3_Text_234A79: @ 8234A79 + .string "Ahahahaha!\p" + .string "Ouch!$" + +SeafloorCavern_Room3_Text_234A8A: @ 8234A8A + .string "Ahahahaha!\n" + .string "You’re so darn strong.\p" + .string "It’s terribly disappointing that you’re\n" + .string "not a TEAM AQUA member.\p" + .string "You could have enjoyed the fabulous\n" + .string "world our BOSS has promised as\l" + .string "one of us…$" + +SeafloorCavern_Room3_Text_234B3A: @ 8234B3A + .string "For our dream to become real, we need\n" + .string "the power of POKéMON.\p" + .string "But meddlers like you use the power of\n" + .string "POKéMON to mess with us even at\l" + .string "a place like this!\p" + .string "Life just doesn’t work the way we\n" + .string "need it to!$" + +SeafloorCavern_Room3_Text_234BFE: @ 8234BFE + .string "Gwah!$" + +SeafloorCavern_Room3_Text_234C04: @ 8234C04 + .string "You know, we don’t dare question\n" + .string "the motives of our leader.\p" + .string "But here you are, just some punk,\n" + .string "going up against our BOSS.\p" + .string "Maybe…\n" + .string "You must be something…$" + diff --git a/data/maps/SeafloorCavern_Room4/events.inc b/data/maps/SeafloorCavern_Room4/events.inc new file mode 100644 index 000000000..6b6df78f2 --- /dev/null +++ b/data/maps/SeafloorCavern_Room4/events.inc @@ -0,0 +1,13 @@ +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 + +SeafloorCavern_Room4_MapWarps: @ 85359C4 + 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/SeafloorCavern_Room4/scripts.inc b/data/maps/SeafloorCavern_Room4/scripts.inc new file mode 100644 index 000000000..e509013d6 --- /dev/null +++ b/data/maps/SeafloorCavern_Room4/scripts.inc @@ -0,0 +1,36 @@ +SeafloorCavern_Room4_MapScripts:: @ 8234C9B + .byte 0 + +SeafloorCavern_Room4_EventScript_234C9C:: @ 8234C9C + trainerbattle 0, TRAINER_GRUNT_7, 0, SeafloorCavern_Room4_Text_234CCA, SeafloorCavern_Room4_Text_234CF3 + msgbox SeafloorCavern_Room4_Text_234CFC, 6 + end + +SeafloorCavern_Room4_EventScript_234CB3:: @ 8234CB3 + trainerbattle 0, TRAINER_GRUNT_9, 0, SeafloorCavern_Room4_Text_234D3A, SeafloorCavern_Room4_Text_234D68 + msgbox SeafloorCavern_Room4_Text_234D79, 6 + end + +SeafloorCavern_Room4_Text_234CCA: @ 8234CCA + .string "Who are you?\n" + .string "Where did you come in from?$" + +SeafloorCavern_Room4_Text_234CF3: @ 8234CF3 + .string "Lost it…$" + +SeafloorCavern_Room4_Text_234CFC: @ 8234CFC + .string "I can’t find the way out!\p" + .string "I’m not afraid. Don’t get me wrong!$" + +SeafloorCavern_Room4_Text_234D3A: @ 8234D3A + .string "Who are you?\n" + .string "Where do you think you’re going?$" + +SeafloorCavern_Room4_Text_234D68: @ 8234D68 + .string "I failed to win!$" + +SeafloorCavern_Room4_Text_234D79: @ 8234D79 + .string "My partner forgot the map in that\n" + .string "submarine!\p" + .string "How’s that for being useless?$" + diff --git a/data/maps/SeafloorCavern_Room5/events.inc b/data/maps/SeafloorCavern_Room5/events.inc new file mode 100644 index 000000000..97787ebbf --- /dev/null +++ b/data/maps/SeafloorCavern_Room5/events.inc @@ -0,0 +1,16 @@ +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 + +SeafloorCavern_Room5_MapWarps: @ 8535A88 + 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/SeafloorCavern_Room5/scripts.inc b/data/maps/SeafloorCavern_Room5/scripts.inc new file mode 100644 index 000000000..e1c68db6e --- /dev/null +++ b/data/maps/SeafloorCavern_Room5/scripts.inc @@ -0,0 +1,3 @@ +SeafloorCavern_Room5_MapScripts:: @ 8234DC4 + .byte 0 + diff --git a/data/maps/SeafloorCavern_Room6/events.inc b/data/maps/SeafloorCavern_Room6/events.inc new file mode 100644 index 000000000..99c10d87e --- /dev/null +++ b/data/maps/SeafloorCavern_Room6/events.inc @@ -0,0 +1,8 @@ +SeafloorCavern_Room6_MapWarps: @ 8535AB4 + 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/SeafloorCavern_Room6/scripts.inc b/data/maps/SeafloorCavern_Room6/scripts.inc new file mode 100644 index 000000000..ae8cf02fa --- /dev/null +++ b/data/maps/SeafloorCavern_Room6/scripts.inc @@ -0,0 +1,3 @@ +SeafloorCavern_Room6_MapScripts:: @ 8234DC5 + .byte 0 + diff --git a/data/maps/SeafloorCavern_Room7/events.inc b/data/maps/SeafloorCavern_Room7/events.inc new file mode 100644 index 000000000..2d8fca999 --- /dev/null +++ b/data/maps/SeafloorCavern_Room7/events.inc @@ -0,0 +1,7 @@ +SeafloorCavern_Room7_MapWarps: @ 8535AE0 + 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/SeafloorCavern_Room7/scripts.inc b/data/maps/SeafloorCavern_Room7/scripts.inc new file mode 100644 index 000000000..e91cf6193 --- /dev/null +++ b/data/maps/SeafloorCavern_Room7/scripts.inc @@ -0,0 +1,3 @@ +SeafloorCavern_Room7_MapScripts:: @ 8234DC6 + .byte 0 + diff --git a/data/maps/SeafloorCavern_Room8/events.inc b/data/maps/SeafloorCavern_Room8/events.inc new file mode 100644 index 000000000..42dcf9faa --- /dev/null +++ b/data/maps/SeafloorCavern_Room8/events.inc @@ -0,0 +1,21 @@ +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 + +SeafloorCavern_Room8_MapWarps: @ 8535C24 + 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/SeafloorCavern_Room8/scripts.inc b/data/maps/SeafloorCavern_Room8/scripts.inc new file mode 100644 index 000000000..471cafd17 --- /dev/null +++ b/data/maps/SeafloorCavern_Room8/scripts.inc @@ -0,0 +1,3 @@ +SeafloorCavern_Room8_MapScripts:: @ 8234DC7 + .byte 0 + diff --git a/data/maps/SeafloorCavern_Room9/events.inc b/data/maps/SeafloorCavern_Room9/events.inc new file mode 100644 index 000000000..ac3337bed --- /dev/null +++ b/data/maps/SeafloorCavern_Room9/events.inc @@ -0,0 +1,18 @@ +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 + +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 + +SeafloorCavern_Room9_MapEvents:: @ 8535D08 + map_events SeafloorCavern_Room9_EventObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0 + diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc new file mode 100644 index 000000000..cbfbccfe4 --- /dev/null +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -0,0 +1,323 @@ +SeafloorCavern_Room9_MapScripts:: @ 8234DC8 + .byte 0 + +SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 + lockall + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 4 + setvar VAR_0x8007, 5 + applymovement 255, SeafloorCavern_Room9_Movement_2725A6 + waitmovement 0 + applymovement 255, SeafloorCavern_Room9_Movement_23505C + waitmovement 0 + playbgm MUS_AQA_0, 0 + msgbox SeafloorCavern_Room9_Text_23505F, 4 + closemessage + addobject VAR_0x8004 + applymovement 255, SeafloorCavern_Room9_Movement_2725A4 + waitmovement 0 + applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23502A + waitmovement 0 + msgbox SeafloorCavern_Room9_Text_23507C, 4 + applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A6 + waitmovement 0 + msgbox SeafloorCavern_Room9_Text_2350A6, 4 + applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_27259E + waitmovement 0 + msgbox SeafloorCavern_Room9_Text_23512C, 4 + trainerbattle 3, TRAINER_ARCHIE, 0, SeafloorCavern_Room9_Text_2351BC + msgbox SeafloorCavern_Room9_Text_2351E5, 4 + setweather 0 + doweather + special sub_80B05B4 + waitstate + msgbox SeafloorCavern_Room9_Text_235279, 4 + special WaitWeather + waitstate + setvar VAR_RESULT, 1 + playse SE_W197 + setfieldeffectargument 0, 16 + setfieldeffectargument 1, 42 + setfieldeffectargument 2, 0 + dofieldeffect 54 + waitfieldeffect 54 + closemessage + setvar VAR_RESULT, 0 + playfanfare MUS_ME_TAMA + playse SE_TAMA + special sub_80B0534 + applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A6 + applymovement 255, SeafloorCavern_Room9_Movement_2725A6 + waitmovement 0 + delay 150 + removeobject 7 + addobject 1 + waitstate + delay 60 + applymovement 1, SeafloorCavern_Room9_Movement_235040 + waitmovement 0 + special sub_80B058C + waitstate + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 8 + setvar VAR_0x8007, 5 + special sub_8139560 + waitstate + applymovement 1, SeafloorCavern_Room9_Movement_23504B + waitmovement 0 + removeobject 1 + delay 4 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + setvar VAR_0x8006, 8 + setvar VAR_0x8007, 5 + special sub_8139560 + waitstate + delay 30 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 4 + setvar VAR_0x8007, 5 + msgbox SeafloorCavern_Room9_Text_2352A7, 4 + playse SE_PC_LOGIN + applymovement 255, SeafloorCavern_Room9_Movement_2725A4 + waitmovement 0 + msgbox SeafloorCavern_Room9_Text_2352F6, 4 + closemessage + applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_235035 + waitmovement 0 + msgbox SeafloorCavern_Room9_Text_23532B, 4 + closemessage + playse SE_PC_OFF + delay 20 + applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725AA + waitmovement 0 + msgbox SeafloorCavern_Room9_Text_23546F, 4 + closemessage + addobject VAR_0x8005 + addobject VAR_0x8006 + addobject VAR_0x8007 + applymovement VAR_0x8007, SeafloorCavern_Room9_Movement_235057 + applymovement VAR_0x8006, SeafloorCavern_Room9_Movement_235057 + applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_23504E + waitmovement 0 + applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A4 + waitmovement 0 + msgbox SeafloorCavern_Room9_Text_2354F0, 4 + playse SE_PIN + applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_272598 + waitmovement 0 + applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_27259A + waitmovement 0 + msgbox SeafloorCavern_Room9_Text_2355C2, 4 + msgbox SeafloorCavern_Room9_Text_235692, 4 + closemessage + applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_235054 + applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23503A + waitmovement 0 + msgbox SeafloorCavern_Room9_Text_235723, 4 + setvar VAR_0x407B, 1 + setvar VAR_0x405E, 1 + clearflag FLAG_0x3CD + clearflag FLAG_0x33A + clearflag FLAG_0x33B + clearflag FLAG_0x356 + clearflag FLAG_0x3E6 + clearflag FLAG_0x3E5 + setflag FLAG_0x347 + setflag FLAG_LEGENDARIES_IN_SOOTOPOLIS + clearflag FLAG_0x3B0 + clearflag FLAG_0x3B1 + setflag FLAG_SYS_WEATHER_CTRL + setflag FLAG_0x081 + setflag FLAG_0x3C7 + setvar VAR_0x40C6, 2 + setvar VAR_0x40A2, 1 + setflag FLAG_0x33C + setflag FLAG_0x33D + setflag FLAG_0x33F + setflag FLAG_0x35B + setflag FLAG_0x3B2 + setflag FLAG_SPECIAL_FLAG_0x4000 + warp MAP_ROUTE128, 255, 38, 22 + waitstate + releaseall + end + +SeafloorCavern_Room9_Movement_23502A: @ 823502A + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + step_end + +SeafloorCavern_Room9_Movement_235032: @ 8235032 + walk_left + walk_left + step_end + +SeafloorCavern_Room9_Movement_235035: @ 8235035 + walk_left + delay_16 + step_end + +SeafloorCavern_Room9_Movement_235038: @ 8235038 + walk_right + step_end + +SeafloorCavern_Room9_Movement_23503A: @ 823503A + face_up + lock_facing_direction + walk_down + unlock_facing_direction + walk_in_place_fastest_right + step_end + +SeafloorCavern_Room9_Movement_235040: @ 8235040 + 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 + slide_up + slide_up + step_end + +SeafloorCavern_Room9_Movement_23504E: @ 823504E + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + step_end + +SeafloorCavern_Room9_Movement_235054: @ 8235054 + walk_right + walk_right + step_end + +SeafloorCavern_Room9_Movement_235057: @ 8235057 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + step_end + +SeafloorCavern_Room9_Movement_23505C: @ 823505C + delay_16 + delay_16 + step_end + +SeafloorCavern_Room9_Text_23505F: @ 823505F + .string "ARCHIE: Hold it right there.$" + +SeafloorCavern_Room9_Text_23507C: @ 823507C + .string "ARCHIE: Fufufu…\n" + .string "So it was you, after all.$" + +SeafloorCavern_Room9_Text_2350A6: @ 82350A6 + .string "ARCHIE: Behold!\p" + .string "See how beautiful it is, the sleeping\n" + .string "form of the ancient POKéMON KYOGRE!\p" + .string "I have waited so long for this day to\n" + .string "come…$" + +SeafloorCavern_Room9_Text_23512C: @ 823512C + .string "ARCHIE: It surprises me, how you’ve\n" + .string "managed to chase me here.\p" + .string "But that’s all over now.\p" + .string "For the realization of my dream,\n" + .string "you must disappear now!$" + +SeafloorCavern_Room9_Text_2351BC: @ 82351BC + .string "What?!\n" + .string "I lost to a mere child like you?!$" + +SeafloorCavern_Room9_Text_2351E5: @ 82351E5 + .string "ARCHIE: Fufufu…\p" + .string "I commend you. I must recognize that\n" + .string "you are truly gifted.\p" + .string "But!\n" + .string "I have this in my possession!\p" + .string "With this RED ORB, I can make KYOGRE…$" + +SeafloorCavern_Room9_Text_235279: @ 8235279 + .string "The RED ORB suddenly began shining\n" + .string "by itself!$" + +SeafloorCavern_Room9_Text_2352A7: @ 82352A7 + .string "ARCHIE: What?!\p" + .string "I didn’t do anything.\n" + .string "Why did the RED ORB…\p" + .string "Where did KYOGRE go?$" + +SeafloorCavern_Room9_Text_2352F6: @ 82352F6 + .string "ARCHIE: Hm? It’s a message from our\n" + .string "members outside…$" + +SeafloorCavern_Room9_Text_23532B: @ 823532B + .string "ARCHIE: Yes, what is it?\p" + .string "Hm…\n" + .string "It’s raining heavily?\p" + .string "Good… That should have happened.\n" + .string "That is why we awakened KYOGRE,\l" + .string "to realize TEAM AQUA’s vision of\l" + .string "expanding the sea.\p" + .string "What?!\p" + .string "It’s raining far harder than we\n" + .string "envisioned? You’re in danger?\p" + .string "That can’t be…\n" + .string "That’s just not possible…\p" + .string "Hold your position and monitor\n" + .string "the situation!$" + +SeafloorCavern_Room9_Text_23546F: @ 823546F + .string "ARCHIE: There’s something wrong…\p" + .string "The RED ORB is supposed to awaken\n" + .string "and control KYOGRE…\p" + .string "But… Why?\n" + .string "Why did KYOGRE disappear?\p" + .string "Why?!$" + +SeafloorCavern_Room9_Text_2354F0: @ 82354F0 + .string "MAXIE: What have you wrought?\p" + .string "ARCHIE… You’ve finally awoken KYOGRE,\n" + .string "haven’t you?\p" + .string "What will happen to the world if this\n" + .string "downpour continues for all eternity?\p" + .string "The world’s landmass will drown in\n" + .string "the deepening sea…$" + +SeafloorCavern_Room9_Text_2355C2: @ 82355C2 + .string "ARCHIE: W-what?!\n" + .string "Don’t get all high and mighty with me!\p" + .string "Wasn’t it you, TEAM MAGMA, that\n" + .string "infuriated GROUDON?\p" + .string "So long as I have this RED ORB,\n" + .string "I should be able to control KYOGRE…\p" + .string "I should be able to control it…$" + +SeafloorCavern_Room9_Text_235692: @ 8235692 + .string "MAXIE: We don’t have the time to\n" + .string "argue about it here!\p" + .string "Get outside and see for yourself!\p" + .string "See if what you’ve wrought is the\n" + .string "world that we desired!$" + +SeafloorCavern_Room9_Text_235723: @ 8235723 + .string "MAXIE: {PLAYER}, come on, you have\n" + .string "to get out of here, too!$" + diff --git a/data/maps/SealedChamber_InnerRoom/events.inc b/data/maps/SealedChamber_InnerRoom/events.inc new file mode 100644 index 000000000..dd331570e --- /dev/null +++ b/data/maps/SealedChamber_InnerRoom/events.inc @@ -0,0 +1,17 @@ +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 + +SealedChamber_InnerRoom_MapEvents:: @ 8536F74 + map_events 0x0, SealedChamber_InnerRoom_MapWarps, 0x0, SealedChamber_InnerRoom_MapBGEvents + diff --git a/data/maps/SealedChamber_InnerRoom/scripts.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc new file mode 100644 index 000000000..9cd3727bb --- /dev/null +++ b/data/maps/SealedChamber_InnerRoom/scripts.inc @@ -0,0 +1,89 @@ +SealedChamber_InnerRoom_MapScripts:: @ 82391F7 + .byte 0 + +SealedChamber_InnerRoom_EventScript_2391F8:: @ 82391F8 + lockall + braillemessage SealedChamber_InnerRoom_Braille_2A6B99 + waitbuttonpress + hidebox2 + checkflag FLAG_0x0E4 + goto_eq SealedChamber_InnerRoom_EventScript_239253 + specialvar VAR_RESULT, CheckRelicanthWailord + compare VAR_RESULT, 0 + goto_eq SealedChamber_InnerRoom_EventScript_239253 + fadeoutbgm 0 + playse SE_TRACK_MOVE + special DoSealedChamberShakingEffect1 + waitstate + delay 40 + special DoSealedChamberShakingEffect2 + waitstate + playse SE_DOOR + delay 40 + special DoSealedChamberShakingEffect2 + waitstate + playse SE_DOOR + delay 40 + special DoSealedChamberShakingEffect2 + waitstate + playse SE_DOOR + delay 40 + msgbox gUnknown_0827301B, 4 + closemessage + fadeinbgm 0 + setflag FLAG_0x0E4 + releaseall + end + +SealedChamber_InnerRoom_EventScript_239253:: @ 8239253 + releaseall + end + +SealedChamber_InnerRoom_EventScript_239255:: @ 8239255 + lockall + braillemessage SealedChamber_InnerRoom_Braille_2A6BCA + waitbuttonpress + hidebox2 + releaseall + end + +SealedChamber_InnerRoom_EventScript_23925F:: @ 823925F + lockall + braillemessage SealedChamber_InnerRoom_Braille_2A6BEC + waitbuttonpress + hidebox2 + releaseall + end + +SealedChamber_InnerRoom_EventScript_239269:: @ 8239269 + lockall + braillemessage SealedChamber_InnerRoom_Braille_2A6C0D + waitbuttonpress + hidebox2 + releaseall + end + +SealedChamber_InnerRoom_EventScript_239273:: @ 8239273 + lockall + braillemessage SealedChamber_InnerRoom_Braille_2A6C34 + waitbuttonpress + hidebox2 + releaseall + end + +SealedChamber_InnerRoom_EventScript_23927D:: @ 823927D + lockall + braillemessage SealedChamber_InnerRoom_Braille_2A6C48 + waitbuttonpress + hidebox2 + releaseall + end + +SealedChamber_InnerRoom_EventScript_239287:: @ 8239287 + lockall + braillemessage SealedChamber_InnerRoom_Braille_2A6C73 + waitbuttonpress + hidebox2 + releaseall + end + diff --git a/data/maps/SealedChamber_OuterRoom/events.inc b/data/maps/SealedChamber_OuterRoom/events.inc new file mode 100644 index 000000000..0181f3193 --- /dev/null +++ b/data/maps/SealedChamber_OuterRoom/events.inc @@ -0,0 +1,37 @@ +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 + +SealedChamber_OuterRoom_MapEvents:: @ 8536EEC + map_events 0x0, SealedChamber_OuterRoom_MapWarps, 0x0, SealedChamber_OuterRoom_MapBGEvents + diff --git a/data/maps/SealedChamber_OuterRoom/scripts.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc new file mode 100644 index 000000000..e9e79d1e9 --- /dev/null +++ b/data/maps/SealedChamber_OuterRoom/scripts.inc @@ -0,0 +1,132 @@ +SealedChamber_OuterRoom_MapScripts:: @ 8239106 + map_script 5, SealedChamber_OuterRoom_MapScript1_239116 + map_script 3, SealedChamber_OuterRoom_MapScript1_239127 + map_script 1, SealedChamber_OuterRoom_MapScript1_23912B + .byte 0 + +SealedChamber_OuterRoom_MapScript1_239116: @ 8239116 + setdivewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44 + setescapewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44 + end + +SealedChamber_OuterRoom_MapScript1_239127: @ 8239127 + setflag FLAG_LANDMARK_SEALED_CHAMBER + end + +SealedChamber_OuterRoom_MapScript1_23912B: @ 823912B + checkflag FLAG_SYS_BRAILLE_DIG + call_if 0, SealedChamber_OuterRoom_EventScript_239135 + end + +SealedChamber_OuterRoom_EventScript_239135:: @ 8239135 + setmetatile 9, 1, 553, 1 + setmetatile 10, 1, 553, 1 + setmetatile 11, 1, 553, 1 + setmetatile 9, 2, 565, 1 + setmetatile 10, 2, 565, 1 + setmetatile 11, 2, 565, 1 + return + +SealedChamber_OuterRoom_EventScript_23916C:: @ 823916C + lockall + braillemessage SealedChamber_OuterRoom_Braille_2A6B27 + waitbuttonpress + hidebox2 + releaseall + end + +SealedChamber_OuterRoom_EventScript_239176:: @ 8239176 + lockall + braillemessage SealedChamber_OuterRoom_Braille_2A6B31 + waitbuttonpress + hidebox2 + releaseall + end + +SealedChamber_OuterRoom_EventScript_239180:: @ 8239180 + lockall + braillemessage SealedChamber_OuterRoom_Braille_2A6B3B + waitbuttonpress + hidebox2 + releaseall + end + +SealedChamber_OuterRoom_EventScript_23918A:: @ 823918A + lockall + braillemessage SealedChamber_OuterRoom_Braille_2A6B45 + waitbuttonpress + hidebox2 + releaseall + end + +SealedChamber_OuterRoom_EventScript_239194:: @ 8239194 + lockall + braillemessage SealedChamber_OuterRoom_Braille_2A6B4F + waitbuttonpress + hidebox2 + releaseall + end + +SealedChamber_OuterRoom_EventScript_23919E:: @ 823919E + lockall + braillemessage SealedChamber_OuterRoom_Braille_2A6B59 + waitbuttonpress + hidebox2 + releaseall + end + +SealedChamber_OuterRoom_EventScript_2391A8:: @ 82391A8 + lockall + braillemessage SealedChamber_OuterRoom_Braille_2A6B63 + waitbuttonpress + hidebox2 + releaseall + end + +SealedChamber_OuterRoom_EventScript_2391B2:: @ 82391B2 + lockall + braillemessage SealedChamber_OuterRoom_Braille_2A6B6E + waitbuttonpress + hidebox2 + releaseall + end + +SealedChamber_OuterRoom_EventScript_2391BC:: @ 82391BC + lockall + braillemessage SealedChamber_OuterRoom_Braille_2A6B76 + waitbuttonpress + hidebox2 + releaseall + end + +SealedChamber_OuterRoom_EventScript_2391C6:: @ 82391C6 + lockall + braillemessage SealedChamber_OuterRoom_Braille_2A6B81 + waitbuttonpress + hidebox2 + releaseall + end + +SealedChamber_OuterRoom_EventScript_2391D0:: @ 82391D0 + lockall + checkflag FLAG_SYS_BRAILLE_DIG + goto_eq SealedChamber_OuterRoom_EventScript_2391E3 + braillemessage SealedChamber_OuterRoom_Braille_2A6B89 + waitbuttonpress + hidebox2 + releaseall + end + +SealedChamber_OuterRoom_EventScript_2391E3:: @ 82391E3 + msgbox gUnknown_0827304E, 4 + releaseall + end + +SealedChamber_OuterRoom_EventScript_2391ED:: @ 82391ED + lockall + braillemessage SealedChamber_OuterRoom_Braille_2A6B89 + waitbuttonpress + hidebox2 + releaseall + end + diff --git a/data/maps/SecretBase_BlueCave1/events.inc b/data/maps/SecretBase_BlueCave1/events.inc new file mode 100644 index 000000000..2905764cf --- /dev/null +++ b/data/maps/SecretBase_BlueCave1/events.inc @@ -0,0 +1,23 @@ +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 + +SecretBase_BlueCave1_MapWarps: @ 8537D54 + 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/SecretBase_BlueCave1/scripts.inc b/data/maps/SecretBase_BlueCave1/scripts.inc new file mode 100644 index 000000000..a7f979bde --- /dev/null +++ b/data/maps/SecretBase_BlueCave1/scripts.inc @@ -0,0 +1 @@ +SecretBase_BlueCave1_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_BlueCave2/events.inc b/data/maps/SecretBase_BlueCave2/events.inc new file mode 100644 index 000000000..8202b7a42 --- /dev/null +++ b/data/maps/SecretBase_BlueCave2/events.inc @@ -0,0 +1,23 @@ +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 + +SecretBase_BlueCave2_MapWarps: @ 853866C + 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/SecretBase_BlueCave2/scripts.inc b/data/maps/SecretBase_BlueCave2/scripts.inc new file mode 100644 index 000000000..cb4ad3565 --- /dev/null +++ b/data/maps/SecretBase_BlueCave2/scripts.inc @@ -0,0 +1 @@ +SecretBase_BlueCave2_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_BlueCave3/events.inc b/data/maps/SecretBase_BlueCave3/events.inc new file mode 100644 index 000000000..733b674b7 --- /dev/null +++ b/data/maps/SecretBase_BlueCave3/events.inc @@ -0,0 +1,23 @@ +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 + +SecretBase_BlueCave3_MapWarps: @ 8538F84 + 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/SecretBase_BlueCave3/scripts.inc b/data/maps/SecretBase_BlueCave3/scripts.inc new file mode 100644 index 000000000..f49ff6dc1 --- /dev/null +++ b/data/maps/SecretBase_BlueCave3/scripts.inc @@ -0,0 +1 @@ +SecretBase_BlueCave3_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_BlueCave4/events.inc b/data/maps/SecretBase_BlueCave4/events.inc new file mode 100644 index 000000000..afd1622b8 --- /dev/null +++ b/data/maps/SecretBase_BlueCave4/events.inc @@ -0,0 +1,23 @@ +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 + +SecretBase_BlueCave4_MapWarps: @ 853989C + 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/SecretBase_BlueCave4/scripts.inc b/data/maps/SecretBase_BlueCave4/scripts.inc new file mode 100644 index 000000000..faa808545 --- /dev/null +++ b/data/maps/SecretBase_BlueCave4/scripts.inc @@ -0,0 +1 @@ +SecretBase_BlueCave4_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_BrownCave1/events.inc b/data/maps/SecretBase_BrownCave1/events.inc new file mode 100644 index 000000000..e4fffab49 --- /dev/null +++ b/data/maps/SecretBase_BrownCave1/events.inc @@ -0,0 +1,23 @@ +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 + +SecretBase_BrownCave1_MapWarps: @ 8537BD0 + 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/SecretBase_BrownCave1/scripts.inc b/data/maps/SecretBase_BrownCave1/scripts.inc new file mode 100644 index 000000000..9d2925611 --- /dev/null +++ b/data/maps/SecretBase_BrownCave1/scripts.inc @@ -0,0 +1 @@ +SecretBase_BrownCave1_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_BrownCave2/events.inc b/data/maps/SecretBase_BrownCave2/events.inc new file mode 100644 index 000000000..29e90b592 --- /dev/null +++ b/data/maps/SecretBase_BrownCave2/events.inc @@ -0,0 +1,23 @@ +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 + +SecretBase_BrownCave2_MapWarps: @ 85384E8 + 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/SecretBase_BrownCave2/scripts.inc b/data/maps/SecretBase_BrownCave2/scripts.inc new file mode 100644 index 000000000..e9c497fac --- /dev/null +++ b/data/maps/SecretBase_BrownCave2/scripts.inc @@ -0,0 +1 @@ +SecretBase_BrownCave2_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_BrownCave3/events.inc b/data/maps/SecretBase_BrownCave3/events.inc new file mode 100644 index 000000000..3322b9d5a --- /dev/null +++ b/data/maps/SecretBase_BrownCave3/events.inc @@ -0,0 +1,23 @@ +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 + +SecretBase_BrownCave3_MapWarps: @ 8538E00 + 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/SecretBase_BrownCave3/scripts.inc b/data/maps/SecretBase_BrownCave3/scripts.inc new file mode 100644 index 000000000..284262d91 --- /dev/null +++ b/data/maps/SecretBase_BrownCave3/scripts.inc @@ -0,0 +1 @@ +SecretBase_BrownCave3_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_BrownCave4/events.inc b/data/maps/SecretBase_BrownCave4/events.inc new file mode 100644 index 000000000..310033947 --- /dev/null +++ b/data/maps/SecretBase_BrownCave4/events.inc @@ -0,0 +1,23 @@ +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 + +SecretBase_BrownCave4_MapWarps: @ 8539718 + 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/SecretBase_BrownCave4/scripts.inc b/data/maps/SecretBase_BrownCave4/scripts.inc new file mode 100644 index 000000000..84f685508 --- /dev/null +++ b/data/maps/SecretBase_BrownCave4/scripts.inc @@ -0,0 +1 @@ +SecretBase_BrownCave4_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_RedCave1/events.inc b/data/maps/SecretBase_RedCave1/events.inc new file mode 100644 index 000000000..eba992586 --- /dev/null +++ b/data/maps/SecretBase_RedCave1/events.inc @@ -0,0 +1,23 @@ +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 + +SecretBase_RedCave1_MapWarps: @ 8537A4C + 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/SecretBase_RedCave1/scripts.inc b/data/maps/SecretBase_RedCave1/scripts.inc new file mode 100644 index 000000000..f9c55a2b5 --- /dev/null +++ b/data/maps/SecretBase_RedCave1/scripts.inc @@ -0,0 +1 @@ +SecretBase_RedCave1_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_RedCave2/events.inc b/data/maps/SecretBase_RedCave2/events.inc new file mode 100644 index 000000000..c6f534965 --- /dev/null +++ b/data/maps/SecretBase_RedCave2/events.inc @@ -0,0 +1,23 @@ +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 + +SecretBase_RedCave2_MapWarps: @ 8538364 + 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/SecretBase_RedCave2/scripts.inc b/data/maps/SecretBase_RedCave2/scripts.inc new file mode 100644 index 000000000..e7e0c7ba5 --- /dev/null +++ b/data/maps/SecretBase_RedCave2/scripts.inc @@ -0,0 +1 @@ +SecretBase_RedCave2_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_RedCave3/events.inc b/data/maps/SecretBase_RedCave3/events.inc new file mode 100644 index 000000000..dda054b44 --- /dev/null +++ b/data/maps/SecretBase_RedCave3/events.inc @@ -0,0 +1,23 @@ +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 + +SecretBase_RedCave3_MapWarps: @ 8538C7C + 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/SecretBase_RedCave3/scripts.inc b/data/maps/SecretBase_RedCave3/scripts.inc new file mode 100644 index 000000000..512f7f92a --- /dev/null +++ b/data/maps/SecretBase_RedCave3/scripts.inc @@ -0,0 +1 @@ +SecretBase_RedCave3_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_RedCave4/events.inc b/data/maps/SecretBase_RedCave4/events.inc new file mode 100644 index 000000000..54e33dc3d --- /dev/null +++ b/data/maps/SecretBase_RedCave4/events.inc @@ -0,0 +1,23 @@ +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 + +SecretBase_RedCave4_MapWarps: @ 8539594 + 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/SecretBase_RedCave4/scripts.inc b/data/maps/SecretBase_RedCave4/scripts.inc new file mode 100644 index 000000000..98e79f89f --- /dev/null +++ b/data/maps/SecretBase_RedCave4/scripts.inc @@ -0,0 +1 @@ +SecretBase_RedCave4_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_Shrub1/events.inc b/data/maps/SecretBase_Shrub1/events.inc new file mode 100644 index 000000000..acdac9692 --- /dev/null +++ b/data/maps/SecretBase_Shrub1/events.inc @@ -0,0 +1,23 @@ +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 + +SecretBase_Shrub1_MapWarps: @ 85381E0 + 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/SecretBase_Shrub1/scripts.inc b/data/maps/SecretBase_Shrub1/scripts.inc new file mode 100644 index 000000000..24b8685a0 --- /dev/null +++ b/data/maps/SecretBase_Shrub1/scripts.inc @@ -0,0 +1 @@ +SecretBase_Shrub1_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_Shrub2/events.inc b/data/maps/SecretBase_Shrub2/events.inc new file mode 100644 index 000000000..a370d2e72 --- /dev/null +++ b/data/maps/SecretBase_Shrub2/events.inc @@ -0,0 +1,23 @@ +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 + +SecretBase_Shrub2_MapWarps: @ 8538AF8 + 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/SecretBase_Shrub2/scripts.inc b/data/maps/SecretBase_Shrub2/scripts.inc new file mode 100644 index 000000000..dad94f46d --- /dev/null +++ b/data/maps/SecretBase_Shrub2/scripts.inc @@ -0,0 +1 @@ +SecretBase_Shrub2_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_Shrub3/events.inc b/data/maps/SecretBase_Shrub3/events.inc new file mode 100644 index 000000000..942be3617 --- /dev/null +++ b/data/maps/SecretBase_Shrub3/events.inc @@ -0,0 +1,23 @@ +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 + +SecretBase_Shrub3_MapWarps: @ 8539410 + 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/SecretBase_Shrub3/scripts.inc b/data/maps/SecretBase_Shrub3/scripts.inc new file mode 100644 index 000000000..22c67c939 --- /dev/null +++ b/data/maps/SecretBase_Shrub3/scripts.inc @@ -0,0 +1 @@ +SecretBase_Shrub3_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_Shrub4/events.inc b/data/maps/SecretBase_Shrub4/events.inc new file mode 100644 index 000000000..a027b266b --- /dev/null +++ b/data/maps/SecretBase_Shrub4/events.inc @@ -0,0 +1,23 @@ +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 + +SecretBase_Shrub4_MapWarps: @ 8539D28 + 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/SecretBase_Shrub4/scripts.inc b/data/maps/SecretBase_Shrub4/scripts.inc new file mode 100644 index 000000000..1a9952232 --- /dev/null +++ b/data/maps/SecretBase_Shrub4/scripts.inc @@ -0,0 +1 @@ +SecretBase_Shrub4_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_Tree1/events.inc b/data/maps/SecretBase_Tree1/events.inc new file mode 100644 index 000000000..3379e8ecb --- /dev/null +++ b/data/maps/SecretBase_Tree1/events.inc @@ -0,0 +1,23 @@ +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 + +SecretBase_Tree1_MapWarps: @ 853805C + 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/SecretBase_Tree1/scripts.inc b/data/maps/SecretBase_Tree1/scripts.inc new file mode 100644 index 000000000..7e7704d6a --- /dev/null +++ b/data/maps/SecretBase_Tree1/scripts.inc @@ -0,0 +1 @@ +SecretBase_Tree1_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_Tree2/events.inc b/data/maps/SecretBase_Tree2/events.inc new file mode 100644 index 000000000..e330951cf --- /dev/null +++ b/data/maps/SecretBase_Tree2/events.inc @@ -0,0 +1,23 @@ +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 + +SecretBase_Tree2_MapWarps: @ 8538974 + 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/SecretBase_Tree2/scripts.inc b/data/maps/SecretBase_Tree2/scripts.inc new file mode 100644 index 000000000..b30a6ec74 --- /dev/null +++ b/data/maps/SecretBase_Tree2/scripts.inc @@ -0,0 +1 @@ +SecretBase_Tree2_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_Tree3/events.inc b/data/maps/SecretBase_Tree3/events.inc new file mode 100644 index 000000000..b4a8c2eb3 --- /dev/null +++ b/data/maps/SecretBase_Tree3/events.inc @@ -0,0 +1,23 @@ +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 + +SecretBase_Tree3_MapWarps: @ 853928C + 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/SecretBase_Tree3/scripts.inc b/data/maps/SecretBase_Tree3/scripts.inc new file mode 100644 index 000000000..9512bbb80 --- /dev/null +++ b/data/maps/SecretBase_Tree3/scripts.inc @@ -0,0 +1 @@ +SecretBase_Tree3_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_Tree4/events.inc b/data/maps/SecretBase_Tree4/events.inc new file mode 100644 index 000000000..4c57fcdfd --- /dev/null +++ b/data/maps/SecretBase_Tree4/events.inc @@ -0,0 +1,23 @@ +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 + +SecretBase_Tree4_MapWarps: @ 8539BA4 + 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/SecretBase_Tree4/scripts.inc b/data/maps/SecretBase_Tree4/scripts.inc new file mode 100644 index 000000000..62f41627f --- /dev/null +++ b/data/maps/SecretBase_Tree4/scripts.inc @@ -0,0 +1 @@ +SecretBase_Tree4_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_YellowCave1/events.inc b/data/maps/SecretBase_YellowCave1/events.inc new file mode 100644 index 000000000..e7f4ed7ce --- /dev/null +++ b/data/maps/SecretBase_YellowCave1/events.inc @@ -0,0 +1,23 @@ +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 + +SecretBase_YellowCave1_MapWarps: @ 8537ED8 + 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/SecretBase_YellowCave1/scripts.inc b/data/maps/SecretBase_YellowCave1/scripts.inc new file mode 100644 index 000000000..fa56be0eb --- /dev/null +++ b/data/maps/SecretBase_YellowCave1/scripts.inc @@ -0,0 +1 @@ +SecretBase_YellowCave1_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_YellowCave2/events.inc b/data/maps/SecretBase_YellowCave2/events.inc new file mode 100644 index 000000000..84aabf3d4 --- /dev/null +++ b/data/maps/SecretBase_YellowCave2/events.inc @@ -0,0 +1,23 @@ +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 + +SecretBase_YellowCave2_MapWarps: @ 85387F0 + 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/SecretBase_YellowCave2/scripts.inc b/data/maps/SecretBase_YellowCave2/scripts.inc new file mode 100644 index 000000000..86c3c876f --- /dev/null +++ b/data/maps/SecretBase_YellowCave2/scripts.inc @@ -0,0 +1 @@ +SecretBase_YellowCave2_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_YellowCave3/events.inc b/data/maps/SecretBase_YellowCave3/events.inc new file mode 100644 index 000000000..2e1d61708 --- /dev/null +++ b/data/maps/SecretBase_YellowCave3/events.inc @@ -0,0 +1,23 @@ +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 + +SecretBase_YellowCave3_MapWarps: @ 8539108 + 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/SecretBase_YellowCave3/scripts.inc b/data/maps/SecretBase_YellowCave3/scripts.inc new file mode 100644 index 000000000..26311e6c5 --- /dev/null +++ b/data/maps/SecretBase_YellowCave3/scripts.inc @@ -0,0 +1 @@ +SecretBase_YellowCave3_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_YellowCave4/events.inc b/data/maps/SecretBase_YellowCave4/events.inc new file mode 100644 index 000000000..07ac363ac --- /dev/null +++ b/data/maps/SecretBase_YellowCave4/events.inc @@ -0,0 +1,23 @@ +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 + +SecretBase_YellowCave4_MapWarps: @ 8539A20 + 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/SecretBase_YellowCave4/scripts.inc b/data/maps/SecretBase_YellowCave4/scripts.inc new file mode 100644 index 000000000..32da39388 --- /dev/null +++ b/data/maps/SecretBase_YellowCave4/scripts.inc @@ -0,0 +1,24 @@ +SecretBase_YellowCave4_MapScripts:: @ 823B483 + map_script 4, SecretBase_RedCave1_MapScript2_23B498 + map_script 3, SecretBase_RedCave1_MapScript1_23B4A2 + map_script 2, SecretBase_RedCave1_MapScript2_23B4AE + map_script 5, SecretBase_RedCave1_MapScript1_23B4B8 + .byte 0 + +SecretBase_RedCave1_MapScript2_23B498: @ 823B498 + map_script_2 VAR_0x4089, 0, EventScript_275D0C + .2byte 0 + +SecretBase_RedCave1_MapScript1_23B4A2: @ 823B4A2 + call SecretBase_RedCave1_EventScript_275CE1 + special sub_80E95D4 + special sub_80EB1AC + end + +SecretBase_RedCave1_MapScript2_23B4AE: @ 823B4AE + map_script_2 VAR_0x4097, 0, SecretBase_RedCave1_EventScript_275B81 + .2byte 0 + +SecretBase_RedCave1_MapScript1_23B4B8: @ 823B4B8 + setstepcallback 6 + end diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/events.inc b/data/maps/ShoalCave_HighTideEntranceRoom/events.inc new file mode 100644 index 000000000..e04abe693 --- /dev/null +++ b/data/maps/ShoalCave_HighTideEntranceRoom/events.inc @@ -0,0 +1,3 @@ +ShoalCave_HighTideEntranceRoom_MapEvents:: @ 853644C + map_events 0x0, 0x0, 0x0, 0x0 + diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc new file mode 100644 index 000000000..d2a93f8e9 --- /dev/null +++ b/data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc @@ -0,0 +1,3 @@ +ShoalCave_HighTideEntranceRoom_MapScripts:: @ 82372AB + .byte 0 + diff --git a/data/maps/ShoalCave_HighTideInnerRoom/events.inc b/data/maps/ShoalCave_HighTideInnerRoom/events.inc new file mode 100644 index 000000000..20d59a56f --- /dev/null +++ b/data/maps/ShoalCave_HighTideInnerRoom/events.inc @@ -0,0 +1,3 @@ +ShoalCave_HighTideInnerRoom_MapEvents:: @ 8536460 + map_events 0x0, 0x0, 0x0, 0x0 + diff --git a/data/maps/ShoalCave_HighTideInnerRoom/scripts.inc b/data/maps/ShoalCave_HighTideInnerRoom/scripts.inc new file mode 100644 index 000000000..6045f80a6 --- /dev/null +++ b/data/maps/ShoalCave_HighTideInnerRoom/scripts.inc @@ -0,0 +1,3 @@ +ShoalCave_HighTideInnerRoom_MapScripts:: @ 82372AC + .byte 0 + diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc new file mode 100644 index 000000000..1f4a008e3 --- /dev/null +++ b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc @@ -0,0 +1,13 @@ +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 + +ShoalCave_LowTideEntranceRoom_MapWarps: @ 85362AC + 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/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc new file mode 100644 index 000000000..f57a27c1d --- /dev/null +++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc @@ -0,0 +1,103 @@ +ShoalCave_LowTideEntranceRoom_MapScripts:: @ 8236DBA + map_script 3, ShoalCave_LowTideEntranceRoom_MapScript1_236DC0 + .byte 0 + +ShoalCave_LowTideEntranceRoom_MapScript1_236DC0: @ 8236DC0 + special UpdateShoalTideFlag + checkflag FLAG_SYS_SHOAL_TIDE + goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236DD1 + goto ShoalCave_LowTideEntranceRoom_EventScript_236DD5 + +ShoalCave_LowTideEntranceRoom_EventScript_236DD1:: @ 8236DD1 + setmaplayoutindex 168 + end + +ShoalCave_LowTideEntranceRoom_EventScript_236DD5:: @ 8236DD5 + setmaplayoutindex 164 + end + +ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9 + lock + faceplayer + dodailyevents + checkflag FLAG_SYS_SHOAL_ITEM + call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_236ED9 + checkitem ITEM_SHOAL_SALT, 4 + compare VAR_RESULT, 0 + goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B + checkitem ITEM_SHOAL_SHELL, 4 + compare VAR_RESULT, 0 + goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B + msgbox ShoalCave_LowTideEntranceRoom_Text_2A7F37, 5 + compare VAR_RESULT, 0 + goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236ECF + checkitemspace ITEM_SHELL_BELL, 1 + compare VAR_RESULT, 0 + call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_236E69 + compare VAR_RESULT, 2 + goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E91 + msgbox ShoalCave_LowTideEntranceRoom_Text_2A7FAC, 4 + takeitem ITEM_SHOAL_SALT, 4 + takeitem ITEM_SHOAL_SHELL, 4 + giveitem_std ITEM_SHELL_BELL + compare VAR_RESULT, 0 + goto_eq ShoalCave_LowTideEntranceRoom_EventScript_272054 + msgbox ShoalCave_LowTideEntranceRoom_Text_2A8012, 4 + setflag FLAG_0x002 + release + end + +ShoalCave_LowTideEntranceRoom_EventScript_236E69:: @ 8236E69 + checkitem ITEM_SHOAL_SALT, 5 + compare VAR_RESULT, 1 + goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E7A + return + +ShoalCave_LowTideEntranceRoom_EventScript_236E7A:: @ 8236E7A + checkitem ITEM_SHOAL_SHELL, 5 + compare VAR_RESULT, 1 + goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E8B + return + +ShoalCave_LowTideEntranceRoom_EventScript_236E8B:: @ 8236E8B + setvar VAR_RESULT, 2 + return + +ShoalCave_LowTideEntranceRoom_EventScript_236E91:: @ 8236E91 + msgbox ShoalCave_LowTideEntranceRoom_Text_2A80F5, 4 + release + end + +ShoalCave_LowTideEntranceRoom_EventScript_236E9B:: @ 8236E9B + checkitem ITEM_SHOAL_SALT, 1 + compare VAR_RESULT, 1 + goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236EC5 + checkitem ITEM_SHOAL_SHELL, 1 + compare VAR_RESULT, 1 + goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236EC5 + msgbox ShoalCave_LowTideEntranceRoom_Text_2A7E0E, 4 + release + end + +ShoalCave_LowTideEntranceRoom_EventScript_236EC5:: @ 8236EC5 + msgbox ShoalCave_LowTideEntranceRoom_Text_2A7EB3, 4 + release + end + +ShoalCave_LowTideEntranceRoom_EventScript_236ECF:: @ 8236ECF + msgbox ShoalCave_LowTideEntranceRoom_Text_2A80C6, 4 + release + end + +ShoalCave_LowTideEntranceRoom_EventScript_236ED9:: @ 8236ED9 + clearflag FLAG_0x3B8 + clearflag FLAG_0x3B9 + clearflag FLAG_0x3BA + clearflag FLAG_0x3BB + clearflag FLAG_0x3BC + clearflag FLAG_0x3BD + clearflag FLAG_0x3BE + clearflag FLAG_0x3BF + clearflag FLAG_SYS_SHOAL_ITEM + return + diff --git a/data/maps/ShoalCave_LowTideIceRoom/events.inc b/data/maps/ShoalCave_LowTideIceRoom/events.inc new file mode 100644 index 000000000..57922e322 --- /dev/null +++ b/data/maps/ShoalCave_LowTideIceRoom/events.inc @@ -0,0 +1,10 @@ +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 + +ShoalCave_LowTideIceRoom_MapWarps: @ 8537130 + 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/ShoalCave_LowTideIceRoom/scripts.inc b/data/maps/ShoalCave_LowTideIceRoom/scripts.inc new file mode 100644 index 000000000..3f7a5cce8 --- /dev/null +++ b/data/maps/ShoalCave_LowTideIceRoom/scripts.inc @@ -0,0 +1,3 @@ +ShoalCave_LowTideIceRoom_MapScripts:: @ 82396A1 + .byte 0 + diff --git a/data/maps/ShoalCave_LowTideInnerRoom/events.inc b/data/maps/ShoalCave_LowTideInnerRoom/events.inc new file mode 100644 index 000000000..f1d894264 --- /dev/null +++ b/data/maps/ShoalCave_LowTideInnerRoom/events.inc @@ -0,0 +1,24 @@ +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 + +ShoalCave_LowTideInnerRoom_MapWarps: @ 85362F8 + 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 + 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 + +ShoalCave_LowTideInnerRoom_MapEvents:: @ 8536380 + map_events ShoalCave_LowTideInnerRoom_EventObjects, ShoalCave_LowTideInnerRoom_MapWarps, 0x0, ShoalCave_LowTideInnerRoom_MapBGEvents + diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc new file mode 100644 index 000000000..94505a96d --- /dev/null +++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc @@ -0,0 +1,158 @@ +ShoalCave_LowTideInnerRoom_MapScripts:: @ 8236EF5 + map_script 1, ShoalCave_LowTideInnerRoom_MapScript1_236F16 + map_script 3, ShoalCave_LowTideInnerRoom_MapScript1_236F00 + .byte 0 + +ShoalCave_LowTideInnerRoom_MapScript1_236F00: @ 8236F00 + checkflag FLAG_SYS_SHOAL_TIDE + goto_eq ShoalCave_LowTideInnerRoom_EventScript_236F0E + goto ShoalCave_LowTideInnerRoom_EventScript_236F12 + +ShoalCave_LowTideInnerRoom_EventScript_236F0E:: @ 8236F0E + setmaplayoutindex 169 + end + +ShoalCave_LowTideInnerRoom_EventScript_236F12:: @ 8236F12 + setmaplayoutindex 165 + end + +ShoalCave_LowTideInnerRoom_MapScript1_236F16: @ 8236F16 + call ShoalCave_LowTideInnerRoom_EventScript_236F1C + end + +ShoalCave_LowTideInnerRoom_EventScript_236F1C:: @ 8236F1C + checkflag FLAG_0x3B8 + goto_eq ShoalCave_LowTideInnerRoom_EventScript_236F3D + checkflag FLAG_SYS_SHOAL_TIDE + goto_eq ShoalCave_LowTideInnerRoom_EventScript_236F3D + setmetatile 31, 8, 856, 1 + goto ShoalCave_LowTideInnerRoom_EventScript_236F3D + end + +ShoalCave_LowTideInnerRoom_EventScript_236F3D:: @ 8236F3D + checkflag FLAG_0x3B9 + goto_eq ShoalCave_LowTideInnerRoom_EventScript_236F5E + checkflag FLAG_SYS_SHOAL_TIDE + goto_eq ShoalCave_LowTideInnerRoom_EventScript_236F5E + setmetatile 14, 26, 856, 1 + goto ShoalCave_LowTideInnerRoom_EventScript_236F5E + end + +ShoalCave_LowTideInnerRoom_EventScript_236F5E:: @ 8236F5E + checkflag FLAG_0x3BC + goto_eq ShoalCave_LowTideInnerRoom_EventScript_236F76 + setmetatile 41, 20, 857, 1 + goto ShoalCave_LowTideInnerRoom_EventScript_236F76 + end + +ShoalCave_LowTideInnerRoom_EventScript_236F76:: @ 8236F76 + checkflag FLAG_0x3BD + goto_eq ShoalCave_LowTideInnerRoom_EventScript_236F8E + setmetatile 41, 10, 857, 1 + goto ShoalCave_LowTideInnerRoom_EventScript_236F8E + end + +ShoalCave_LowTideInnerRoom_EventScript_236F8E:: @ 8236F8E + checkflag FLAG_0x3BE + goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FA6 + setmetatile 6, 9, 857, 1 + goto ShoalCave_LowTideInnerRoom_EventScript_236FA6 + end + +ShoalCave_LowTideInnerRoom_EventScript_236FA6:: @ 8236FA6 + checkflag FLAG_0x3BF + goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FB9 + setmetatile 16, 13, 857, 1 + return + +ShoalCave_LowTideInnerRoom_EventScript_236FB9:: @ 8236FB9 + return + +ShoalCave_LowTideInnerRoom_EventScript_236FBA:: @ 8236FBA + lockall + checkflag FLAG_0x3BC + goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FEC + giveitem_std ITEM_SHOAL_SHELL + compare VAR_RESULT, 0 + goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + setmetatile 41, 20, 859, 0 + special DrawWholeMapView + setflag FLAG_0x3BC + releaseall + end + +ShoalCave_LowTideInnerRoom_EventScript_236FEC:: @ 8236FEC + msgbox ShoalCave_LowTideInnerRoom_Text_2A81A8, 4 + releaseall + end + +ShoalCave_LowTideInnerRoom_EventScript_236FF6:: @ 8236FF6 + lockall + checkflag FLAG_0x3BD + goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FEC + giveitem_std ITEM_SHOAL_SHELL + compare VAR_RESULT, 0 + goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + setmetatile 41, 10, 859, 0 + special DrawWholeMapView + setflag FLAG_0x3BD + releaseall + end + +ShoalCave_LowTideInnerRoom_EventScript_237028:: @ 8237028 + lockall + checkflag FLAG_0x3BE + goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FEC + giveitem_std ITEM_SHOAL_SHELL + compare VAR_RESULT, 0 + goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + setmetatile 6, 9, 859, 0 + special DrawWholeMapView + setflag FLAG_0x3BE + releaseall + end + +ShoalCave_LowTideInnerRoom_EventScript_23705A:: @ 823705A + lockall + checkflag FLAG_0x3BF + goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FEC + giveitem_std ITEM_SHOAL_SHELL + compare VAR_RESULT, 0 + goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + setmetatile 16, 13, 859, 0 + special DrawWholeMapView + setflag FLAG_0x3BF + releaseall + end + +ShoalCave_LowTideInnerRoom_EventScript_23708C:: @ 823708C + lockall + checkflag FLAG_0x3B8 + goto_eq ShoalCave_LowTideInnerRoom_EventScript_2370BE + giveitem_std ITEM_SHOAL_SALT + compare VAR_RESULT, 0 + goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + setmetatile 31, 8, 858, 0 + special DrawWholeMapView + setflag FLAG_0x3B8 + releaseall + end + +ShoalCave_LowTideInnerRoom_EventScript_2370BE:: @ 82370BE + msgbox ShoalCave_LowTideInnerRoom_Text_2A8169, 4 + releaseall + end + +ShoalCave_LowTideInnerRoom_EventScript_2370C8:: @ 82370C8 + lockall + checkflag FLAG_0x3B9 + goto_eq ShoalCave_LowTideInnerRoom_EventScript_2370BE + giveitem_std ITEM_SHOAL_SALT + compare VAR_RESULT, 0 + goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + setmetatile 14, 26, 858, 0 + special DrawWholeMapView + setflag FLAG_0x3B9 + releaseall + end + diff --git a/data/maps/ShoalCave_LowTideLowerRoom/events.inc b/data/maps/ShoalCave_LowTideLowerRoom/events.inc new file mode 100644 index 000000000..d3d656452 --- /dev/null +++ b/data/maps/ShoalCave_LowTideLowerRoom/events.inc @@ -0,0 +1,16 @@ +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 + +ShoalCave_LowTideLowerRoom_MapWarps: @ 853640C + 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 + +ShoalCave_LowTideLowerRoom_MapEvents:: @ 8536438 + map_events ShoalCave_LowTideLowerRoom_EventObjects, ShoalCave_LowTideLowerRoom_MapWarps, 0x0, ShoalCave_LowTideLowerRoom_MapBGEvents + diff --git a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc new file mode 100644 index 000000000..9883bf3da --- /dev/null +++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc @@ -0,0 +1,63 @@ +ShoalCave_LowTideLowerRoom_MapScripts:: @ 8237156 + map_script 1, ShoalCave_LowTideLowerRoom_MapScript1_23715C + .byte 0 + +ShoalCave_LowTideLowerRoom_MapScript1_23715C: @ 823715C + call ShoalCave_LowTideLowerRoom_EventScript_237162 + end + +ShoalCave_LowTideLowerRoom_EventScript_237162:: @ 8237162 + checkflag FLAG_0x3BB + goto_eq ShoalCave_LowTideLowerRoom_EventScript_237175 + setmetatile 18, 2, 856, 1 + return + +ShoalCave_LowTideLowerRoom_EventScript_237175:: @ 8237175 + return + +ShoalCave_LowTideLowerRoom_EventScript_237176:: @ 8237176 + lockall + checkflag FLAG_0x3BB + goto_eq ShoalCave_LowTideLowerRoom_EventScript_2371A8 + giveitem_std ITEM_SHOAL_SALT + compare VAR_RESULT, 0 + goto_eq ShoalCave_LowTideLowerRoom_EventScript_272054 + setmetatile 18, 2, 858, 0 + special DrawWholeMapView + setflag FLAG_0x3BB + releaseall + end + +ShoalCave_LowTideLowerRoom_EventScript_2371A8:: @ 82371A8 + msgbox ShoalCave_LowTideLowerRoom_Text_2A8169, 4 + releaseall + end + +ShoalCave_LowTideLowerRoom_EventScript_2371B2:: @ 82371B2 + lock + faceplayer + checkflag FLAG_0x11B + goto_eq ShoalCave_LowTideLowerRoom_EventScript_2371E1 + msgbox ShoalCave_LowTideLowerRoom_Text_2371EB, 4 + giveitem_std ITEM_FOCUS_BAND + compare VAR_RESULT, 0 + goto_eq ShoalCave_LowTideLowerRoom_EventScript_272054 + setflag FLAG_0x11B + release + end + +ShoalCave_LowTideLowerRoom_EventScript_2371E1:: @ 82371E1 + msgbox ShoalCave_LowTideLowerRoom_Text_23728D, 4 + release + end + +ShoalCave_LowTideLowerRoom_Text_2371EB: @ 82371EB + .string "The penetrating cold around these\n" + .string "parts is an impediment to training.\p" + .string "But with focus, one can overcome!\p" + .string "With this FOCUS BAND, buckle down and\n" + .string "withstand the cold!$" + +ShoalCave_LowTideLowerRoom_Text_23728D: @ 823728D + .string "Everything starts with focus!$" + diff --git a/data/maps/ShoalCave_LowTideStairsRoom/events.inc b/data/maps/ShoalCave_LowTideStairsRoom/events.inc new file mode 100644 index 000000000..875f337a5 --- /dev/null +++ b/data/maps/ShoalCave_LowTideStairsRoom/events.inc @@ -0,0 +1,13 @@ +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 + +ShoalCave_LowTideStairsRoom_MapWarps: @ 85363AC + 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 + +ShoalCave_LowTideStairsRoom_MapEvents:: @ 85363C8 + map_events ShoalCave_LowTideStairsRoom_EventObjects, ShoalCave_LowTideStairsRoom_MapWarps, 0x0, ShoalCave_LowTideStairsRoom_MapBGEvents + diff --git a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc new file mode 100644 index 000000000..e8c87bd98 --- /dev/null +++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc @@ -0,0 +1,35 @@ +ShoalCave_LowTideStairsRoom_MapScripts:: @ 82370FA + map_script 1, ShoalCave_LowTideStairsRoom_MapScript1_237100 + .byte 0 + +ShoalCave_LowTideStairsRoom_MapScript1_237100: @ 8237100 + call ShoalCave_LowTideStairsRoom_EventScript_237106 + end + +ShoalCave_LowTideStairsRoom_EventScript_237106:: @ 8237106 + checkflag FLAG_0x3BA + goto_eq ShoalCave_LowTideStairsRoom_EventScript_237119 + setmetatile 11, 11, 856, 1 + return + +ShoalCave_LowTideStairsRoom_EventScript_237119:: @ 8237119 + return + +ShoalCave_LowTideStairsRoom_EventScript_23711A:: @ 823711A + lockall + checkflag FLAG_0x3BA + goto_eq ShoalCave_LowTideStairsRoom_EventScript_23714C + giveitem_std ITEM_SHOAL_SALT + compare VAR_RESULT, 0 + goto_eq ShoalCave_LowTideStairsRoom_EventScript_272054 + setmetatile 11, 11, 858, 0 + special DrawWholeMapView + setflag FLAG_0x3BA + releaseall + end + +ShoalCave_LowTideStairsRoom_EventScript_23714C:: @ 823714C + msgbox ShoalCave_LowTideStairsRoom_Text_2A8169, 4 + releaseall + end + diff --git a/data/maps/SingleBattleColosseum/events.inc b/data/maps/SingleBattleColosseum/events.inc new file mode 100644 index 000000000..4ef0de89f --- /dev/null +++ b/data/maps/SingleBattleColosseum/events.inc @@ -0,0 +1,14 @@ +SingleBattleColosseum_EventObjects: @ 8539D44 + 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 + 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 + +SingleBattleColosseum_MapEvents:: @ 8539D8C + map_events SingleBattleColosseum_EventObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0 + diff --git a/data/maps/SingleBattleColosseum/scripts.inc b/data/maps/SingleBattleColosseum/scripts.inc new file mode 100644 index 000000000..06ed3ef16 --- /dev/null +++ b/data/maps/SingleBattleColosseum/scripts.inc @@ -0,0 +1,3 @@ +SingleBattleColosseum_MapScripts:: @ 823B77D + .byte 0 + diff --git a/data/maps/SkyPillar_1F/events.inc b/data/maps/SkyPillar_1F/events.inc new file mode 100644 index 000000000..59ac1aac0 --- /dev/null +++ b/data/maps/SkyPillar_1F/events.inc @@ -0,0 +1,8 @@ +SkyPillar_1F_MapWarps: @ 8537058 + 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/SkyPillar_1F/scripts.inc b/data/maps/SkyPillar_1F/scripts.inc new file mode 100644 index 000000000..6afc5aa64 --- /dev/null +++ b/data/maps/SkyPillar_1F/scripts.inc @@ -0,0 +1,13 @@ +SkyPillar_1F_MapScripts:: @ 8239615 + map_script 3, SkyPillar_1F_MapScript1_23961B + .byte 0 + +SkyPillar_1F_MapScript1_23961B: @ 823961B + compare VAR_0x40CA, 2 + call_if 0, SkyPillar_1F_EventScript_239627 + end + +SkyPillar_1F_EventScript_239627:: @ 8239627 + setmaplayoutindex 433 + return + diff --git a/data/maps/SkyPillar_2F/events.inc b/data/maps/SkyPillar_2F/events.inc new file mode 100644 index 000000000..780db9ccc --- /dev/null +++ b/data/maps/SkyPillar_2F/events.inc @@ -0,0 +1,7 @@ +SkyPillar_2F_MapWarps: @ 8537084 + 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/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc new file mode 100644 index 000000000..c15f1f8c4 --- /dev/null +++ b/data/maps/SkyPillar_2F/scripts.inc @@ -0,0 +1,21 @@ +SkyPillar_2F_MapScripts:: @ 823962B + map_script 2, SkyPillar_2F_MapScript2_2A8327 + map_script 3, SkyPillar_2F_MapScript1_23963B + map_script 5, SkyPillar_2F_MapScript1_239650 + .byte 0 + +SkyPillar_2F_MapScript1_23963B: @ 823963B + compare VAR_0x40CA, 2 + call_if 0, SkyPillar_2F_EventScript_23964C + copyvar VAR_ICE_STEP_COUNT, 0x1 + end + +SkyPillar_2F_EventScript_23964C:: @ 823964C + setmaplayoutindex 434 + return + +SkyPillar_2F_MapScript1_239650: @ 8239650 + setstepcallback 7 + setholewarp MAP_SKY_PILLAR_1F, 255, 0, 0 + end + diff --git a/data/maps/SkyPillar_3F/events.inc b/data/maps/SkyPillar_3F/events.inc new file mode 100644 index 000000000..2e7697395 --- /dev/null +++ b/data/maps/SkyPillar_3F/events.inc @@ -0,0 +1,8 @@ +SkyPillar_3F_MapWarps: @ 85370A8 + 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/SkyPillar_3F/scripts.inc b/data/maps/SkyPillar_3F/scripts.inc new file mode 100644 index 000000000..0ddae05b2 --- /dev/null +++ b/data/maps/SkyPillar_3F/scripts.inc @@ -0,0 +1,13 @@ +SkyPillar_3F_MapScripts:: @ 823965B + map_script 3, SkyPillar_3F_MapScript1_239661 + .byte 0 + +SkyPillar_3F_MapScript1_239661: @ 8239661 + compare VAR_0x40CA, 2 + call_if 0, SkyPillar_3F_EventScript_23966D + end + +SkyPillar_3F_EventScript_23966D:: @ 823966D + setmaplayoutindex 435 + return + diff --git a/data/maps/SkyPillar_4F/events.inc b/data/maps/SkyPillar_4F/events.inc new file mode 100644 index 000000000..248e36f95 --- /dev/null +++ b/data/maps/SkyPillar_4F/events.inc @@ -0,0 +1,8 @@ +SkyPillar_4F_MapWarps: @ 85370D4 + 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/SkyPillar_4F/scripts.inc b/data/maps/SkyPillar_4F/scripts.inc new file mode 100644 index 000000000..3884864d7 --- /dev/null +++ b/data/maps/SkyPillar_4F/scripts.inc @@ -0,0 +1,21 @@ +SkyPillar_4F_MapScripts:: @ 8239671 + map_script 2, SkyPillar_4F_MapScript2_2A8327 + map_script 3, SkyPillar_4F_MapScript1_239681 + map_script 5, SkyPillar_4F_MapScript1_239696 + .byte 0 + +SkyPillar_4F_MapScript1_239681: @ 8239681 + compare VAR_0x40CA, 2 + call_if 0, SkyPillar_4F_EventScript_239692 + copyvar VAR_ICE_STEP_COUNT, 0x1 + end + +SkyPillar_4F_EventScript_239692:: @ 8239692 + setmaplayoutindex 436 + return + +SkyPillar_4F_MapScript1_239696: @ 8239696 + setstepcallback 7 + setholewarp MAP_SKY_PILLAR_3F, 255, 0, 0 + end + diff --git a/data/maps/SkyPillar_5F/events.inc b/data/maps/SkyPillar_5F/events.inc new file mode 100644 index 000000000..c0acb14c0 --- /dev/null +++ b/data/maps/SkyPillar_5F/events.inc @@ -0,0 +1,7 @@ +SkyPillar_5F_MapWarps: @ 853714C + 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/SkyPillar_5F/scripts.inc b/data/maps/SkyPillar_5F/scripts.inc new file mode 100644 index 000000000..8e08fb2bd --- /dev/null +++ b/data/maps/SkyPillar_5F/scripts.inc @@ -0,0 +1,13 @@ +SkyPillar_5F_MapScripts:: @ 82396A2 + map_script 3, SkyPillar_5F_MapScript1_2396A8 + .byte 0 + +SkyPillar_5F_MapScript1_2396A8: @ 82396A8 + compare VAR_0x40CA, 2 + call_if 0, SkyPillar_5F_EventScript_2396B4 + return + +SkyPillar_5F_EventScript_2396B4:: @ 82396B4 + setmaplayoutindex 437 + return + diff --git a/data/maps/SkyPillar_Entrance/events.inc b/data/maps/SkyPillar_Entrance/events.inc new file mode 100644 index 000000000..92cf0da9b --- /dev/null +++ b/data/maps/SkyPillar_Entrance/events.inc @@ -0,0 +1,7 @@ +SkyPillar_Entrance_MapWarps: @ 8536FF8 + 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/SkyPillar_Entrance/scripts.inc b/data/maps/SkyPillar_Entrance/scripts.inc new file mode 100644 index 000000000..09ee9eae2 --- /dev/null +++ b/data/maps/SkyPillar_Entrance/scripts.inc @@ -0,0 +1,8 @@ +SkyPillar_Entrance_MapScripts:: @ 823929E + map_script 3, SkyPillar_Entrance_MapScript1_2392A4 + .byte 0 + +SkyPillar_Entrance_MapScript1_2392A4: @ 82392A4 + setflag FLAG_LANDMARK_SKY_PILLAR + end + diff --git a/data/maps/SkyPillar_Outside/events.inc b/data/maps/SkyPillar_Outside/events.inc new file mode 100644 index 000000000..4fb4cc010 --- /dev/null +++ b/data/maps/SkyPillar_Outside/events.inc @@ -0,0 +1,10 @@ +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 + +SkyPillar_Outside_MapWarps: @ 8537034 + 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/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc new file mode 100644 index 000000000..e9fbf4ad6 --- /dev/null +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -0,0 +1,174 @@ +SkyPillar_Outside_MapScripts:: @ 82392A8 + map_script 3, SkyPillar_Outside_MapScript1_2392B8 + map_script 1, SkyPillar_Outside_MapScript1_2392DD + map_script 2, SkyPillar_Outside_MapScript2_2392FA + .byte 0 + +SkyPillar_Outside_MapScript1_2392B8: @ 82392B8 + compare VAR_0x405E, 3 + call_if 1, SkyPillar_Outside_EventScript_2392CF + compare VAR_0x405E, 4 + call_if 4, SkyPillar_Outside_EventScript_2392D3 + end + +SkyPillar_Outside_EventScript_2392CF:: @ 82392CF + setflag FLAG_SPECIAL_FLAG_0x4000 + return + +SkyPillar_Outside_EventScript_2392D3:: @ 82392D3 + checkflag FLAG_SYS_WEATHER_CTRL + call_if 1, SkyPillar_Outside_EventScript_27207A + return + +SkyPillar_Outside_MapScript1_2392DD: @ 82392DD + checkflag FLAG_0x137 + call_if 1, SkyPillar_Outside_EventScript_2392E7 + end + +SkyPillar_Outside_EventScript_2392E7:: @ 82392E7 + setmetatile 14, 4, 682, 0 + setmetatile 14, 5, 690, 0 + return + +SkyPillar_Outside_MapScript2_2392FA: @ 82392FA + map_script_2 VAR_0x405E, 3, SkyPillar_Outside_EventScript_239304 + .2byte 0 + +SkyPillar_Outside_EventScript_239304:: @ 8239304 + lockall + applymovement 1, SkyPillar_Outside_Movement_2393D3 + waitmovement 0 + applymovement 255, SkyPillar_Outside_Movement_2725A4 + waitmovement 0 + msgbox SkyPillar_Outside_Text_239416, 4 + closemessage + delay 30 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 8 + setvar VAR_0x8007, 3 + special sub_8139560 + waitstate + delay 40 + msgbox SkyPillar_Outside_Text_2394BC, 4 + closemessage + applymovement 255, SkyPillar_Outside_Movement_2393EB + applymovement 1, SkyPillar_Outside_Movement_2393DE + waitmovement 0 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 20 + setvar VAR_0x8007, 5 + special sub_8139560 + waitstate + delay 20 + applymovement 1, SkyPillar_Outside_Movement_2725A4 + waitmovement 0 + delay 10 + applymovement 1, SkyPillar_Outside_Movement_2725A8 + waitmovement 0 + delay 20 + applymovement 1, SkyPillar_Outside_Movement_2725AA + waitmovement 0 + delay 30 + msgbox SkyPillar_Outside_Text_23950C, 4 + closemessage + setflag FLAG_SYS_WEATHER_CTRL + setweather 15 + doweather + special WaitWeather + waitstate + delay 30 + msgbox SkyPillar_Outside_Text_23953A, 4 + closemessage + playse SE_KAIDAN + fadescreenswapbuffers 1 + clearflag FLAG_SPECIAL_FLAG_0x4000 + setvar VAR_0x405E, 4 + removeobject 1 + clearflag FLAG_0x330 + fadescreenswapbuffers 0 + releaseall + end + +SkyPillar_Outside_Movement_2393D3: @ 82393D3 + 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 + 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 + 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 + end + +SkyPillar_Outside_EventScript_2393F9:: @ 82393F9 + msgbox SkyPillar_Outside_Text_239402, 3 + end + +SkyPillar_Outside_Text_239402: @ 8239402 + .string "The door is closed.$" + +SkyPillar_Outside_Text_239416: @ 8239416 + .string "WALLACE: Oh, my, I’m terribly sorry!\p" + .string "In my haste, I didn’t notice that\n" + .string "I’d left you behind!\p" + .string "I’ve opened the locked door of\n" + .string "the SKY PILLAR.\p" + .string "{PLAYER}{KUN}, let’s be on our way!$" + +SkyPillar_Outside_Text_2394BC: @ 82394BC + .string "WALLACE: It’s an earthquake!\p" + .string "There’s not a moment to waste!\n" + .string "We’ve got to hurry!$" + +SkyPillar_Outside_Text_23950C: @ 823950C + .string "WALLACE: Hmm…\n" + .string "The situation is getting worse…$" + +SkyPillar_Outside_Text_23953A: @ 823953A + .string "WALLACE: This isn’t good…\p" + .string "The weather distortion is spreading\n" + .string "even here…\p" + .string "{PLAYER}{KUN}.\p" + .string "RAYQUAZA should be farther up\n" + .string "from here.\p" + .string "I’m worried about SOOTOPOLIS.\n" + .string "I’ve got to go back.\p" + .string "Everything is in your hands now.\n" + .string "Don’t fail us!$" diff --git a/data/maps/SkyPillar_Top/events.inc b/data/maps/SkyPillar_Top/events.inc new file mode 100644 index 000000000..26bccf67f --- /dev/null +++ b/data/maps/SkyPillar_Top/events.inc @@ -0,0 +1,13 @@ +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 + +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 + +SkyPillar_Top_MapEvents:: @ 85371B8 + map_events SkyPillar_Top_EventObjects, SkyPillar_Top_MapWarps, SkyPillar_Top_MapCoordEvents, 0x0 + diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc new file mode 100644 index 000000000..334acc8ac --- /dev/null +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -0,0 +1,189 @@ +SkyPillar_Top_MapScripts:: @ 82396B8 + map_script 5, SkyPillar_Top_MapScript1_2396C8 + map_script 3, SkyPillar_Top_MapScript1_2396E6 + map_script 4, SkyPillar_Top_MapScript2_239713 + .byte 0 + +SkyPillar_Top_MapScript1_2396C8: @ 82396C8 + checkflag FLAG_SYS_CTRL_OBJ_DELETE + call_if 1, SkyPillar_Top_EventScript_2396D2 + end + +SkyPillar_Top_EventScript_2396D2:: @ 82396D2 + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 7 + goto_if 5, SkyPillar_Top_EventScript_27374E + removeobject VAR_LAST_TALKED + return + +SkyPillar_Top_MapScript1_2396E6: @ 82396E6 + compare VAR_0x40CA, 2 + call_if 0, SkyPillar_Top_EventScript_2396FD + compare VAR_0x40CA, 2 + call_if 4, SkyPillar_Top_EventScript_239705 + end + +SkyPillar_Top_EventScript_2396FD:: @ 82396FD + setmaplayoutindex 438 + setobjectmovementtype 1, 8 + return + +SkyPillar_Top_EventScript_239705:: @ 8239705 + checkflag FLAG_0x1C0 + call_if 0, SkyPillar_Top_EventScript_23970F + return + +SkyPillar_Top_EventScript_23970F:: @ 823970F + clearflag FLAG_0x050 + return + +SkyPillar_Top_MapScript2_239713: @ 8239713 + map_script_2 VAR_0x40CA, 0, SkyPillar_Top_EventScript_23971D + .2byte 0 + +SkyPillar_Top_EventScript_23971D:: @ 823971D + turnobject 1, 1 + end + +SkyPillar_Top_EventScript_239722:: @ 8239722 + lockall + waitse + playmoncry SPECIES_RAYQUAZA, 2 + delay 40 + waitmoncry + setwildbattle SPECIES_RAYQUAZA, 70, ITEM_NONE + setflag FLAG_SYS_CTRL_OBJ_DELETE + special BattleSetup_StartLegendaryBattle + waitstate + clearflag FLAG_SYS_CTRL_OBJ_DELETE + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 1 + goto_eq SkyPillar_Top_EventScript_239768 + compare VAR_RESULT, 4 + goto_eq SkyPillar_Top_EventScript_239771 + compare VAR_RESULT, 5 + goto_eq SkyPillar_Top_EventScript_239771 + setflag FLAG_0x1C0 + releaseall + end + +SkyPillar_Top_EventScript_239768:: @ 8239768 + setflag FLAG_0x1C0 + goto SkyPillar_Top_EventScript_23977C + end + +SkyPillar_Top_EventScript_239771:: @ 8239771 + setvar VAR_0x8004, 406 + goto SkyPillar_Top_EventScript_239785 + end + +SkyPillar_Top_EventScript_23977C:: @ 823977C + fadescreenswapbuffers 1 + removeobject VAR_LAST_TALKED + fadescreenswapbuffers 0 + releaseall + end + +SkyPillar_Top_EventScript_239785:: @ 8239785 + fadescreenswapbuffers 1 + removeobject VAR_LAST_TALKED + fadescreenswapbuffers 0 + bufferspeciesname 0, VAR_0x8004 + msgbox gUnknown_08273204, 4 + releaseall + end + +SkyPillar_Top_EventScript_23979A:: @ 823979A + lockall + fadeoutbgm 1 + applymovement 255, SkyPillar_Top_Movement_2725B2 + waitmovement 0 + special SpawnScriptEventObject + applymovement 127, SkyPillar_Top_Movement_239858 + waitmovement 0 + special RemoveScriptEventObject + applymovement 1, SkyPillar_Top_Movement_23983A + waitmovement 0 + waitse + playmoncry SPECIES_RAYQUAZA, 2 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 8 + setvar VAR_0x8007, 3 + special sub_8139560 + waitstate + waitse + playmoncry SPECIES_RAYQUAZA, 2 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + setvar VAR_0x8006, 8 + setvar VAR_0x8007, 5 + special sub_8139560 + waitstate + waitmoncry + applymovement 1, SkyPillar_Top_Movement_23984B + waitmovement 0 + removeobject 1 + msgbox SkyPillar_Top_Text_239860, 4 + closemessage + delay 20 + fadeinbgm 1 + special SpawnScriptEventObject + applymovement 127, SkyPillar_Top_Movement_23985C + waitmovement 0 + special RemoveScriptEventObject + setvar VAR_0x405E, 5 + setvar VAR_0x40CA, 1 + setvar VAR_0x40D7, 1 + releaseall + end + +SkyPillar_Top_Movement_23983A: @ 823983A + 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 + 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 + walk_slow_up + walk_slow_up + walk_slow_up + step_end + +SkyPillar_Top_Movement_23985C: @ 823985C + walk_slow_down + walk_slow_down + walk_slow_down + step_end + +SkyPillar_Top_Text_239860: @ 8239860 + .string "The awakened RAYQUAZA flew off…$" + diff --git a/data/maps/SlateportCity/events.inc b/data/maps/SlateportCity/events.inc new file mode 100644 index 000000000..b8480dfb6 --- /dev/null +++ b/data/maps/SlateportCity/events.inc @@ -0,0 +1,71 @@ +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 + +SlateportCity_MapWarps: @ 8526514 + 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 + +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 + +SlateportCity_MapEvents:: @ 8526618 + map_events SlateportCity_EventObjects, SlateportCity_MapWarps, SlateportCity_MapCoordEvents, SlateportCity_MapBGEvents + diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc new file mode 100644 index 000000000..9a5e41b15 --- /dev/null +++ b/data/maps/SlateportCity/scripts.inc @@ -0,0 +1,1383 @@ +SlateportCity_MapScripts:: @ 81DCC61 + map_script 3, SlateportCity_MapScript1_1DCC6C + map_script 2, SlateportCity_MapScript2_1DCD12 + .byte 0 + +SlateportCity_MapScript1_1DCC6C: @ 81DCC6C + setvar VAR_0x40AA, 0 + call SlateportCity_EventScript_1DCC8D + compare VAR_0x4058, 1 + call_if 1, SlateportCity_EventScript_1DCC99 + compare VAR_0x40D2, 1 + call_if 1, SlateportCity_EventScript_1DCCE7 + end + +SlateportCity_EventScript_1DCC8D:: @ 81DCC8D + setflag FLAG_VISITED_SLATEPORT_CITY + setvar VAR_0x4086, 0 + setflag FLAG_0x323 + return + +SlateportCity_EventScript_1DCC99:: @ 81DCC99 + setobjectxyperm 11, 28, 13 + setobjectxyperm 7, 25, 13 + setobjectxyperm 3, 25, 14 + setobjectxyperm 6, 27, 16 + setobjectxyperm 8, 28, 16 + setobjectxyperm 1, 29, 16 + setobjectxyperm 2, 31, 14 + setobjectmovementtype 11, 8 + setobjectmovementtype 7, 18 + setobjectmovementtype 3, 16 + setobjectmovementtype 6, 7 + setobjectmovementtype 8, 7 + setobjectmovementtype 1, 7 + setobjectmovementtype 2, 9 + return + +SlateportCity_EventScript_1DCCE7:: @ 81DCCE7 + setflag FLAG_SPECIAL_FLAG_0x4000 + getplayerxy VAR_0x8004, VAR_0x8005 + compare VAR_0x8004, 30 + goto_eq SlateportCity_EventScript_1DCD06 + setobjectxyperm 35, 23, 27 + setobjectmovementtype 35, 10 + return + +SlateportCity_EventScript_1DCD06:: @ 81DCD06 + setobjectxyperm 35, 22, 27 + setobjectmovementtype 35, 10 + return + +SlateportCity_MapScript2_1DCD12: @ 81DCD12 + map_script_2 VAR_0x40D2, 1, SlateportCity_EventScript_1DCD1C + .2byte 0 + +SlateportCity_EventScript_1DCD1C:: @ 81DCD1C + lockall + addobject 35 + applymovement 255, SlateportCity_Movement_1DCDA8 + applymovement 35, SlateportCity_Movement_1DCDAC + waitmovement 0 + msgbox SlateportCity_Text_1DF032, 4 + closemessage + applymovement 35, SlateportCity_Movement_2725A4 + waitmovement 0 + delay 60 + msgbox SlateportCity_Text_1DF0FE, 4 + applymovement 35, SlateportCity_Movement_2725A8 + waitmovement 0 + msgbox SlateportCity_Text_1DF12B, 4 + closemessage + delay 30 + playfanfare MUS_ME_TORE_EYE + msgbox SlateportCity_Text_1DF1A6, 4 + waitfanfare + closemessage + delay 30 + setflag FLAG_0x0D7 + msgbox SlateportCity_Text_1DF1D3, 4 + closemessage + applymovement 35, SlateportCity_Movement_1DCDB4 + waitmovement 0 + removeobject 35 + setobjectxyperm 35, 10, 12 + setobjectmovementtype 35, 8 + clearflag FLAG_SPECIAL_FLAG_0x4000 + setvar VAR_0x40D2, 2 + addvar VAR_0x40D1, 1 + releaseall + end + +SlateportCity_Movement_1DCDA8: @ 81DCDA8 + delay_16 + delay_8 + walk_in_place_fastest_left + step_end + +SlateportCity_Movement_1DCDAC: @ 81DCDAC + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + step_end + +SlateportCity_Movement_1DCDB4: @ 81DCDB4 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + step_end + +SlateportCity_EventScript_1DCDBD:: @ 81DCDBD + lock + faceplayer + message SlateportCity_Text_1DD64A + waitmessage + pokemart SlateportCity_Pokemart_1DCDD4 + msgbox gUnknown_08272A3F, 4 + release + end + +SlateportCity_Pokemart_1DCDD4: @ 81DCDD4 + .2byte ITEM_PROTEIN + .2byte ITEM_IRON + .2byte ITEM_CARBOS + .2byte ITEM_ZINC + .2byte ITEM_CALCIUM + .2byte ITEM_HP_UP + .2byte ITEM_NONE + release + end + +SlateportCity_EventScript_1DCDE4:: @ 81DCDE4 + lock + faceplayer + bufferleadmonspeciesname 0 + msgbox SlateportCity_Text_1DD68A, 4 + specialvar VAR_RESULT, LeadMonHasEffortRibbon + compare VAR_RESULT, 1 + call_if 1, SlateportCity_EventScript_1DCE38 + specialvar VAR_RESULT, Special_AreLeadMonEVsMaxedOut + compare VAR_RESULT, 0 + call_if 1, SlateportCity_EventScript_1DCE2E + msgbox SlateportCity_Text_1DD697, 4 + playfanfare MUS_FANFA4 + message SlateportCity_Text_1DD6E3 + waitfanfare + msgbox SlateportCity_Text_1DD702, 4 + special GiveLeadMonEffortRibbon + release + end + +SlateportCity_EventScript_1DCE2E:: @ 81DCE2E + msgbox SlateportCity_Text_1DD722, 4 + release + end + +SlateportCity_EventScript_1DCE38:: @ 81DCE38 + msgbox SlateportCity_Text_1DD77B, 4 + release + end + +SlateportCity_EventScript_1DCE42:: @ 81DCE42 + lock + faceplayer + compare VAR_0x4058, 1 + call_if 1, SlateportCity_EventScript_1DCE59 + msgbox SlateportCity_Text_1DD81A, 4 + release + end + +SlateportCity_EventScript_1DCE59:: @ 81DCE59 + msgbox SlateportCity_Text_1DE3E2, 4 + release + end + +SlateportCity_EventScript_1DCE63:: @ 81DCE63 + lock + faceplayer + compare VAR_0x4058, 1 + call_if 1, SlateportCity_EventScript_1DCE7A + msgbox SlateportCity_Text_1DD8A6, 4 + release + end + +SlateportCity_EventScript_1DCE7A:: @ 81DCE7A + msgbox SlateportCity_Text_1DE28E, 4 + release + end + +SlateportCity_EventScript_1DCE84:: @ 81DCE84 + lock + faceplayer + compare VAR_0x4058, 1 + call_if 1, SlateportCity_EventScript_1DCEA4 + checkflag FLAG_0x060 + goto_eq SlateportCity_EventScript_1DCEAE + msgbox SlateportCity_Text_1DD93D, 4 + release + end + +SlateportCity_EventScript_1DCEA4:: @ 81DCEA4 + msgbox SlateportCity_Text_1DE30C, 4 + release + end + +SlateportCity_EventScript_1DCEAE:: @ 81DCEAE + msgbox SlateportCity_Text_1DD999, 4 + release + end + +SlateportCity_EventScript_1DCEB8:: @ 81DCEB8 + lock + faceplayer + compare VAR_0x4058, 1 + call_if 1, SlateportCity_EventScript_1DCECF + msgbox SlateportCity_Text_1DDA34, 4 + release + end + +SlateportCity_EventScript_1DCECF:: @ 81DCECF + msgbox SlateportCity_Text_1DE376, 4 + release + end + +SlateportCity_EventScript_1DCED9:: @ 81DCED9 + compare VAR_0x4058, 1 + goto_eq SlateportCity_EventScript_1DCEED + msgbox SlateportCity_Text_1DDA9A, 2 + end + +SlateportCity_EventScript_1DCEED:: @ 81DCEED + msgbox SlateportCity_Text_1DE43D, 3 + end + +SlateportCity_EventScript_1DCEF6:: @ 81DCEF6 + lock + faceplayer + compare VAR_0x4058, 1 + call_if 1, SlateportCity_EventScript_1DCF0D + msgbox SlateportCity_Text_1DDB21, 4 + release + end + +SlateportCity_EventScript_1DCF0D:: @ 81DCF0D + msgbox SlateportCity_Text_1DE460, 4 + release + end + +SlateportCity_EventScript_1DCF17:: @ 81DCF17 + lock + faceplayer + checkflag FLAG_0x094 + goto_eq SlateportCity_EventScript_1DCF2C + msgbox SlateportCity_Text_1DDBAC, 4 + release + end + +SlateportCity_EventScript_1DCF2C:: @ 81DCF2C + msgbox SlateportCity_Text_1DDBD5, 4 + release + end + +SlateportCity_EventScript_1DCF36:: @ 81DCF36 + msgbox SlateportCity_Text_1DE8BC, 3 + end + +SlateportCity_EventScript_1DCF3F:: @ 81DCF3F + lockall + checkflag FLAG_SYS_GAME_CLEAR + goto_eq SlateportCity_EventScript_1DCF66 + checkflag FLAG_BADGE07_GET + goto_eq SlateportCity_EventScript_1DCF5C + msgbox SlateportCity_Text_1DE8F8, 4 + releaseall + end + +SlateportCity_EventScript_1DCF5C:: @ 81DCF5C + msgbox SlateportCity_Text_1DE940, 4 + releaseall + end + +SlateportCity_EventScript_1DCF66:: @ 81DCF66 + msgbox SlateportCity_Text_1DE9AA, 4 + releaseall + end + +SlateportCity_EventScript_1DCF70:: @ 81DCF70 + msgbox SlateportCity_Text_1DEA0B, 3 + end + +SlateportCity_EventScript_1DCF79:: @ 81DCF79 + msgbox SlateportCity_Text_1DEA3B, 3 + end + +SlateportCity_EventScript_1DCF82:: @ 81DCF82 + msgbox SlateportCity_Text_1DEA6F, 3 + end + +SlateportCity_EventScript_1DCF8B:: @ 81DCF8B + msgbox SlateportCity_Text_1DEAAF, 3 + end + +SlateportCity_EventScript_1DCF94:: @ 81DCF94 + lockall + checkflag FLAG_SYS_GAME_CLEAR + goto_eq SlateportCity_EventScript_1DCFA8 + msgbox SlateportCity_Text_1DEAE3, 4 + releaseall + end + +SlateportCity_EventScript_1DCFA8:: @ 81DCFA8 + msgbox SlateportCity_Text_1DEB5A, 4 + releaseall + end + +SlateportCity_EventScript_1DCFB2:: @ 81DCFB2 + msgbox SlateportCity_Text_1DEBA0, 3 + end + +SlateportCity_EventScript_1DCFBB:: @ 81DCFBB + lock + faceplayer + compare VAR_0x4058, 1 + call_if 1, SlateportCity_EventScript_1DCFD2 + msgbox SlateportCity_Text_1DE10E, 4 + release + end + +SlateportCity_EventScript_1DCFD2:: @ 81DCFD2 + msgbox SlateportCity_Text_1DE10E, 4 + release + end + +SlateportCity_EventScript_1DCFDC:: @ 81DCFDC + msgbox SlateportCity_Text_1DE16C, 2 + end + +SlateportCity_EventScript_1DCFE5:: @ 81DCFE5 + msgbox SlateportCity_Text_1DDFF7, 2 + end + +SlateportCity_EventScript_1DCFEE:: @ 81DCFEE + msgbox SlateportCity_Text_1DE04B, 2 + end + +SlateportCity_EventScript_1DCFF7:: @ 81DCFF7 + msgbox SlateportCity_Text_1DE0D2, 2 + end + +SlateportCity_EventScript_1DD000:: @ 81DD000 + msgbox SlateportCity_Text_1DE1EC, 2 + end + +SlateportCity_EventScript_1DD009:: @ 81DD009 + lock + faceplayer + msgbox SlateportCity_Text_1DDC4F, 4 + closemessage + applymovement 5, SlateportCity_Movement_2725A2 + waitmovement 0 + release + end + +SlateportCity_EventScript_1DD020:: @ 81DD020 + lock + faceplayer + msgbox SlateportCity_Text_1DDC8A, 4 + closemessage + applymovement 18, SlateportCity_Movement_2725A2 + waitmovement 0 + release + end + +SlateportCity_EventScript_1DD037:: @ 81DD037 + lock + faceplayer + msgbox SlateportCity_Text_1DDCD5, 4 + closemessage + applymovement 19, SlateportCity_Movement_2725A2 + waitmovement 0 + release + end + +SlateportCity_EventScript_1DD04E:: @ 81DD04E + lock + faceplayer + msgbox SlateportCity_Text_1DDD18, 4 + closemessage + applymovement 26, SlateportCity_Movement_2725A2 + waitmovement 0 + release + end + +SlateportCity_EventScript_1DD065:: @ 81DD065 + lock + faceplayer + msgbox SlateportCity_Text_1DDD7D, 4 + closemessage + applymovement 27, SlateportCity_Movement_2725A2 + waitmovement 0 + release + end + +SlateportCity_EventScript_1DD07C:: @ 81DD07C + lock + faceplayer + msgbox SlateportCity_Text_1DDDC0, 4 + closemessage + applymovement 28, SlateportCity_Movement_2725A2 + waitmovement 0 + release + end + +SlateportCity_EventScript_1DD093:: @ 81DD093 + lock + faceplayer + msgbox SlateportCity_Text_1DDDDF, 4 + closemessage + applymovement 29, SlateportCity_Movement_2725A2 + waitmovement 0 + release + end + +SlateportCity_EventScript_1DD0AA:: @ 81DD0AA + lock + faceplayer + msgbox SlateportCity_Text_1DDE2F, 4 + closemessage + applymovement 30, SlateportCity_Movement_2725A2 + waitmovement 0 + release + end + +SlateportCity_EventScript_1DD0C1:: @ 81DD0C1 + lock + faceplayer + playse SE_PIN + applymovement 31, SlateportCity_Movement_272598 + waitmovement 0 + applymovement 31, SlateportCity_Movement_27259A + waitmovement 0 + msgbox SlateportCity_Text_1DDE6E, 4 + closemessage + applymovement 31, SlateportCity_Movement_2725A2 + waitmovement 0 + applymovement 31, SlateportCity_Movement_1DD147 + waitmovement 0 + applymovement 31, SlateportCity_Movement_27259E + waitmovement 0 + msgbox SlateportCity_Text_1DDE86, 4 + closemessage + applymovement 31, SlateportCity_Movement_2725A2 + waitmovement 0 + applymovement 31, SlateportCity_Movement_1DD147 + waitmovement 0 + msgbox SlateportCity_Text_1DDEB8, 4 + closemessage + applymovement 31, SlateportCity_Movement_27259E + waitmovement 0 + applymovement 31, SlateportCity_Movement_1DD147 + waitmovement 0 + applymovement 31, SlateportCity_Movement_2725A2 + waitmovement 0 + release + end + +SlateportCity_Movement_1DD147: @ 81DD147 + delay_16 + delay_16 + step_end + +SlateportCity_EventScript_1DD14A:: @ 81DD14A + msgbox SlateportCity_Text_1DDF32, 3 + end + +SlateportCity_EventScript_1DD153:: @ 81DD153 + lock + faceplayer + msgbox SlateportCity_Text_1DDF8D, 4 + closemessage + applymovement 33, SlateportCity_Movement_2725A2 + waitmovement 0 + release + end + +SlateportCity_EventScript_1DD16A:: @ 81DD16A + lock + faceplayer + message gUnknown_08272A21 + waitmessage + pokemartdecoration SlateportCity_PokemartDecor_1DD184 + msgbox gUnknown_08272A3F, 4 + release + end + + .align 2 +SlateportCity_PokemartDecor_1DD184: @ 81DD184 + .2byte 95 + .2byte 78 + .2byte 96 + .2byte 0 + release + end + +SlateportCity_EventScript_1DD18E:: @ 81DD18E + msgbox gUnknown_08272E30, 4 + release + end + +SlateportCity_EventScript_1DD198:: @ 81DD198 + lock + faceplayer + checkflag FLAG_0x060 + goto_if 0, SlateportCity_EventScript_1DD18E + message gUnknown_08272A21 + waitmessage + pokemartdecoration SlateportCity_PokemartDecor_1DD1B8 + msgbox gUnknown_08272A3F, 4 + release + end + +SlateportCity_PokemartDecor_1DD1B8: @ 81DD1B8 + .2byte 25 + .2byte 27 + .2byte 26 + .2byte 28 + .2byte 29 + .2byte 30 + .2byte 51 + .2byte 52 + .2byte 53 + .2byte 54 + .2byte 55 + .2byte 56 + .2byte 57 + .2byte 58 + .2byte 0 + release + end + +SlateportCity_EventScript_1DD1D8:: @ 81DD1D8 + lock + faceplayer + message gUnknown_08272A21 + waitmessage + pokemart SlateportCity_Pokemart_1DD1F0 + msgbox gUnknown_08272A3F, 4 + release + end + + .align 2 +SlateportCity_Pokemart_1DD1F0: @ 81DD1F0 + .2byte ITEM_TM10 + .2byte ITEM_TM43 + .2byte ITEM_NONE + release + end + +SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 + lockall + msgbox SlateportCity_Text_1DE502, 4 + msgbox SlateportCity_Text_1DE54A, 4 + closemessage + applymovement 10, SlateportCity_Movement_2725A8 + waitmovement 0 + delay 10 + applymovement 9, SlateportCity_Movement_2725AA + waitmovement 0 + delay 25 + applymovement 11, SlateportCity_Movement_1DD33C + applymovement 255, SlateportCity_Movement_1DD34A + applymovement 10, SlateportCity_Movement_1DD319 + applymovement 9, SlateportCity_Movement_1DD326 + waitmovement 0 + removeobject 10 + removeobject 9 + msgbox SlateportCity_Text_1DE5F7, 4 + applymovement 11, SlateportCity_Movement_2725A6 + waitmovement 0 + msgbox SlateportCity_Text_1DE64F, 4 + playbgm MUS_AQA_0, 0 + msgbox SlateportCity_Text_1DE724, 4 + applymovement 6, SlateportCity_Movement_2725A4 + applymovement 1, SlateportCity_Movement_2725A4 + applymovement 7, SlateportCity_Movement_1DD309 + applymovement 3, SlateportCity_Movement_272596 + applymovement 2, SlateportCity_Movement_1DD311 + waitmovement 0 + applymovement 11, SlateportCity_Movement_2725AA + waitmovement 0 + msgbox SlateportCity_Text_1DE7F7, 4 + playse SE_PIN + applymovement 11, SlateportCity_Movement_272598 + waitmovement 0 + applymovement 11, SlateportCity_Movement_27259A + waitmovement 0 + applymovement 11, SlateportCity_Movement_2725A6 + waitmovement 0 + msgbox SlateportCity_Text_1DE860, 4 + msgbox SlateportCity_Text_1DE8A0, 4 + closemessage + applymovement 11, SlateportCity_Movement_1DD337 + applymovement 255, SlateportCity_Movement_1DD344 + waitmovement 0 + removeobject 11 + clearflag FLAG_0x349 + clearflag FLAG_0x350 + clearflag FLAG_0x34D + clearflag FLAG_0x34E + setvar VAR_0x4058, 2 + warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14 + waitstate + releaseall + end + +SlateportCity_Movement_1DD309: @ 81DD309 + 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 + 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 + 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 + 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 + walk_down + walk_in_place_fastest_up + step_end + +SlateportCity_Movement_1DD337: @ 81DD337 + walk_right + walk_up + walk_up + set_invisible + step_end + +SlateportCity_Movement_1DD33C: @ 81DD33C + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_down + walk_left + step_end + +SlateportCity_Movement_1DD344: @ 81DD344 + walk_in_place_fastest_right + delay_16 + delay_16 + walk_right + walk_up + step_end + +SlateportCity_Movement_1DD34A: @ 81DD34A + 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 + msgbox SlateportCity_Text_1DE491, 3 + end + +SlateportCity_EventScript_1DD35C:: @ 81DD35C + msgbox SlateportCity_Text_1DE4C4, 3 + end + +SlateportCity_EventScript_1DD365:: @ 81DD365 + msgbox SlateportCity_Text_1DD7AD, 2 + end + +SlateportCity_EventScript_1DD36E:: @ 81DD36E + lock + faceplayer + checkflag FLAG_0x151 + goto_eq SlateportCity_EventScript_1DD39A + msgbox SlateportCity_Text_1DEBCE, 4 + giveitem_std ITEM_POWDER_JAR + setflag FLAG_0x151 + msgbox SlateportCity_Text_1DED27, 4 + release + end + +SlateportCity_EventScript_1DD39A:: @ 81DD39A + setvar VAR_0x8004, 1 + specialvar VAR_RESULT, sub_80246D4 + compare VAR_RESULT, 0 + goto_eq SlateportCity_EventScript_1DD3C0 + msgbox SlateportCity_Text_1DEE40, 4 + special sub_80248B0 + goto SlateportCity_EventScript_1DD3CA + end + +SlateportCity_EventScript_1DD3C0:: @ 81DD3C0 + msgbox SlateportCity_Text_1DED27, 4 + release + end + +SlateportCity_EventScript_1DD3CA:: @ 81DD3CA + message SlateportCity_Text_1DEE67 + waitmessage + setvar VAR_0x8004, 7 + special sub_813A128 + waitstate + switch VAR_RESULT + case 0, SlateportCity_EventScript_1DD46E + case 1, SlateportCity_EventScript_1DD482 + case 2, SlateportCity_EventScript_1DD496 + case 3, SlateportCity_EventScript_1DD4AA + case 4, SlateportCity_EventScript_1DD4BE + case 5, SlateportCity_EventScript_1DD4D2 + case 6, SlateportCity_EventScript_1DD4E6 + case 7, SlateportCity_EventScript_1DD4FA + case 8, SlateportCity_EventScript_1DD50E + case 9, SlateportCity_EventScript_1DD522 + case 10, SlateportCity_EventScript_1DD536 + case 11, SlateportCity_EventScript_1DD54A + case 127, SlateportCity_EventScript_1DD54A + end + +SlateportCity_EventScript_1DD46E:: @ 81DD46E + bufferitemname 0, ITEM_ENERGY_POWDER + setvar VAR_0x8008, 30 + setvar VAR_0x8009, 50 + goto SlateportCity_EventScript_1DD557 + end + +SlateportCity_EventScript_1DD482:: @ 81DD482 + bufferitemname 0, ITEM_ENERGY_ROOT + setvar VAR_0x8008, 31 + setvar VAR_0x8009, 80 + goto SlateportCity_EventScript_1DD557 + end + +SlateportCity_EventScript_1DD496:: @ 81DD496 + bufferitemname 0, ITEM_HEAL_POWDER + setvar VAR_0x8008, 32 + setvar VAR_0x8009, 50 + goto SlateportCity_EventScript_1DD557 + end + +SlateportCity_EventScript_1DD4AA:: @ 81DD4AA + bufferitemname 0, ITEM_REVIVAL_HERB + setvar VAR_0x8008, 33 + setvar VAR_0x8009, 300 + goto SlateportCity_EventScript_1DD557 + end + +SlateportCity_EventScript_1DD4BE:: @ 81DD4BE + bufferitemname 0, ITEM_PROTEIN + setvar VAR_0x8008, 64 + setvar VAR_0x8009, 1000 + goto SlateportCity_EventScript_1DD557 + end + +SlateportCity_EventScript_1DD4D2:: @ 81DD4D2 + bufferitemname 0, ITEM_IRON + setvar VAR_0x8008, 65 + setvar VAR_0x8009, 1000 + goto SlateportCity_EventScript_1DD557 + end + +SlateportCity_EventScript_1DD4E6:: @ 81DD4E6 + bufferitemname 0, ITEM_CARBOS + setvar VAR_0x8008, 66 + setvar VAR_0x8009, 1000 + goto SlateportCity_EventScript_1DD557 + end + +SlateportCity_EventScript_1DD4FA:: @ 81DD4FA + bufferitemname 0, ITEM_CALCIUM + setvar VAR_0x8008, 67 + setvar VAR_0x8009, 1000 + goto SlateportCity_EventScript_1DD557 + end + +SlateportCity_EventScript_1DD50E:: @ 81DD50E + bufferitemname 0, ITEM_ZINC + setvar VAR_0x8008, 70 + setvar VAR_0x8009, 1000 + goto SlateportCity_EventScript_1DD557 + end + +SlateportCity_EventScript_1DD522:: @ 81DD522 + bufferitemname 0, ITEM_HP_UP + setvar VAR_0x8008, 63 + setvar VAR_0x8009, 1000 + goto SlateportCity_EventScript_1DD557 + end + +SlateportCity_EventScript_1DD536:: @ 81DD536 + bufferitemname 0, ITEM_PP_UP + setvar VAR_0x8008, 69 + setvar VAR_0x8009, 3000 + goto SlateportCity_EventScript_1DD557 + end + +SlateportCity_EventScript_1DD54A:: @ 81DD54A + msgbox SlateportCity_Text_1DEFBC, 4 + special sub_8024918 + release + end + +SlateportCity_EventScript_1DD557:: @ 81DD557 + msgbox SlateportCity_Text_1DEE90, 5 + compare VAR_RESULT, 0 + goto_eq SlateportCity_EventScript_1DD3CA + copyvar VAR_0x8004, VAR_0x8009 + specialvar VAR_RESULT, sub_80246D4 + compare VAR_RESULT, 0 + goto_eq SlateportCity_EventScript_1DD5CE + giveitem_std VAR_0x8008 + compare VAR_RESULT, 0 + goto_eq SlateportCity_EventScript_1DD5C1 + copyvar VAR_0x8004, VAR_0x8009 + special sub_802477C + special sub_802488C + msgbox SlateportCity_Text_1DEEF7, 5 + compare VAR_RESULT, 1 + goto_eq SlateportCity_EventScript_1DD3CA + msgbox SlateportCity_Text_1DEF79, 4 + special sub_8024918 + release + end + +SlateportCity_EventScript_1DD5C1:: @ 81DD5C1 + msgbox gUnknown_08272A89, 4 + special sub_8024918 + release + end + +SlateportCity_EventScript_1DD5CE:: @ 81DD5CE + msgbox SlateportCity_Text_1DEEC9, 4 + goto SlateportCity_EventScript_1DD3CA + end + +SlateportCity_EventScript_1DD5DC:: @ 81DD5DC + lockall + applymovement 255, SlateportCity_Movement_2725B2 + waitmovement 0 + opendoor 10, 12 + waitdooranim + addobject 35 + applymovement 255, SlateportCity_Movement_1DD630 + applymovement 35, SlateportCity_Movement_1DD637 + waitmovement 0 + closedoor 10, 12 + waitdooranim + msgbox SlateportCity_Text_1DF28C, 4 + closemessage + applymovement 255, SlateportCity_Movement_1DD634 + applymovement 35, SlateportCity_Movement_1DD63A + waitmovement 0 + removeobject 35 + addvar VAR_0x40D1, 1 + setvar VAR_0x40D2, 3 + releaseall + end + +SlateportCity_Movement_1DD630: @ 81DD630 + lock_facing_direction + walk_down + unlock_facing_direction + step_end + +SlateportCity_Movement_1DD634: @ 81DD634 + delay_16 + walk_in_place_fastest_right + step_end + +SlateportCity_Movement_1DD637: @ 81DD637 + delay_8 + walk_down + step_end + +SlateportCity_Movement_1DD63A: @ 81DD63A + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + step_end + +SlateportCity_EventScript_1DD643:: @ 81DD643 + lockall + special sub_80224D0 + waitstate + releaseall + end + +SlateportCity_Text_1DD64A: @ 81DD64A + .string "I’m the ENERGY GURU! I’ll go for it and\n" + .string "sell you what you need!$" + +SlateportCity_Text_1DD68A: @ 81DD68A + .string "Oh?\n" + .string "Your {STR_VAR_1}…$" + +SlateportCity_Text_1DD697: @ 81DD697 + .string "Went for it stupendously!\p" + .string "As its reward, please give it this\n" + .string "EFFORT RIBBON.$" + +SlateportCity_Text_1DD6E3: @ 81DD6E3 + .string "{PLAYER} received the EFFORT RIBBON.$" + +SlateportCity_Text_1DD702: @ 81DD702 + .string "{PLAYER} put the EFFORT RIBBON\n" + .string "on {STR_VAR_1}.$" + +SlateportCity_Text_1DD722: @ 81DD722 + .string "You have to go for it a little harder.\p" + .string "If you do, I’ll give your POKéMON\n" + .string "something nice.$" + +SlateportCity_Text_1DD77B: @ 81DD77B + .string "Oh! Your {STR_VAR_1}, that EFFORT\n" + .string "RIBBON looks good on it!$" + +SlateportCity_Text_1DD7AD: @ 81DD7AD + .string "The light of the lighthouse reaches\n" + .string "dozens of miles away.\p" + .string "I wonder if it doesn’t startle POKéMON\n" + .string "in the sea.$" + +SlateportCity_Text_1DD81A: @ 81DD81A + .string "Ooh, look at this!\p" + .string "The seaweed you can get around these\n" + .string "parts is fresh and full of life.\p" + .string "Why, it looks like it can even rear up\n" + .string "and attack!$" + +SlateportCity_Text_1DD8A6: @ 81DD8A6 + .string "Where the water is clean, the fruits\n" + .string "of bountiful harvest gather.\p" + .string "And where people gather, a market\n" + .string "soon starts.\p" + .string "That is how a town is born and grows.$" + +SlateportCity_Text_1DD93D: @ 81DD93D + .string "Shopping where you can breathe the\n" + .string "scent of the ocean…\p" + .string "SLATEPORT is such a wonderful place!$" + +SlateportCity_Text_1DD999: @ 81DD999 + .string "If you put DOLLS or CUSHIONS on\n" + .string "the floor, they’ll get dirty.\p" + .string "I’m going to buy some BRICKS so my\n" + .string "DOLLS and CUSHIONS won’t get dirty\l" + .string "when I leave them out.$" + +SlateportCity_Text_1DDA34: @ 81DDA34 + .string "Wroooar! I’m going to compete in\n" + .string "the BATTLE TENT, too!\p" + .string "But before that, I need to catch\n" + .string "some POKéMON!$" + +SlateportCity_Text_1DDA9A: @ 81DDA9A + .string "Whew… I’m just bushed…\p" + .string "I hiked over from MAUVILLE CITY.\n" + .string "But, boy, this city’s huge.\p" + .string "If I’d known this, I would’ve ridden\n" + .string "my BIKE here.$" + +SlateportCity_Text_1DDB21: @ 81DDB21 + .string "STERN, the fellow who built the\n" + .string "MUSEUM, also happens to be the leader\l" + .string "of an undersea exploration team.\p" + .string "So, everyone calls him CAPT. STERN.$" + +SlateportCity_Text_1DDBAC: @ 81DDBAC + .string "What is that over there?\n" + .string "That long line…$" + +SlateportCity_Text_1DDBD5: @ 81DDBD5 + .string "When I was a child, I visited\n" + .string "the MUSEUM often.\p" + .string "I used to dream about the mysteries of\n" + .string "the sea after seeing the exhibits.$" + +SlateportCity_Text_1DDC4F: @ 81DDC4F + .string "Hey, there! Quit pushing!\n" + .string "This is the line, can’t you see?$" + +SlateportCity_Text_1DDC8A: @ 81DDC8A + .string "TEAM AQUA has a policy of\n" + .string "assembling and dispersing at\l" + .string "the operation site.$" + +SlateportCity_Text_1DDCD5: @ 81DDCD5 + .string "Our BOSS is brilliant.\p" + .string "What would he want to do with\n" + .string "a MUSEUM now?$" + +SlateportCity_Text_1DDD18: @ 81DDD18 + .string "What’s the new scheme, I wonder?\p" + .string "Our BOSS is scary when he’s mad, so\n" + .string "I’d better not screw things up…$" + +SlateportCity_Text_1DDD7D: @ 81DDD7D + .string "If there’s something we need in\n" + .string "the MUSEUM, we should take it all!$" + +SlateportCity_Text_1DDDC0: @ 81DDDC0 + .string "Hey, you there!\n" + .string "Don’t butt in!$" + +SlateportCity_Text_1DDDDF: @ 81DDDDF + .string "A long line, huh?\p" + .string "It reminds me of the times I lined up to\n" + .string "buy smash-hit games…$" + +SlateportCity_Text_1DDE2F: @ 81DDE2F + .string "Why are we even lining up and paying?\n" + .string "We should just march in!$" + +SlateportCity_Text_1DDE6E: @ 81DDE6E + .string "What?\n" + .string "What do you want?$" + +SlateportCity_Text_1DDE86: @ 81DDE86 + .string "You want to read this sign?\n" + .string "I’ll read it for you!$" + +SlateportCity_Text_1DDEB8: @ 81DDEB8 + .string "Let’s see…\p" + .string "Um… I think it says something like\n" + .string "“the life in the sea is endless.â€\p" + .string "Yup, I’m pretty sure that’s what\n" + .string "it says.$" + +SlateportCity_Text_1DDF32: @ 81DDF32 + .string "Grumble…\p" + .string "I should’ve brought my Game Boy\n" + .string "Advance so I wouldn’t get bored in line…\p" + .string "Grumble…$" + +SlateportCity_Text_1DDF8D: @ 81DDF8D + .string "When this operation’s over, I’ll take\n" + .string "you to a hot spring spa!\p" + .string "That’s what our leader said.\n" + .string "I can’t wait!$" + +SlateportCity_Text_1DDFF7: @ 81DDFF7 + .string "The sea is just so vast…\p" + .string "Could the sea have been made by\n" + .string "the tears shed by POKéMON?$" + +SlateportCity_Text_1DE04B: @ 81DE04B + .string "Do you know what they do with old\n" + .string "ships that become too creaky to sail?\p" + .string "They sink them in the sea so they\n" + .string "become habitats for POKéMON.$" + +SlateportCity_Text_1DE0D2: @ 81DE0D2 + .string "Whenever I visit here, I get carried\n" + .string "away and buy too much.$" + +SlateportCity_Text_1DE10E: @ 81DE10E + .string "If you want to change your POKéMON’s\n" + .string "nickname, you’ll have to get the NAME\l" + .string "RATER to help you.$" + +SlateportCity_Text_1DE16C: @ 81DE16C + .string "Any POKéMON you get in a trade,\n" + .string "you can’t change its nickname.\p" + .string "The original TRAINER’s love for that\n" + .string "POKéMON is in the nickname.$" + +SlateportCity_Text_1DE1EC: @ 81DE1EC + .string "Recently, a BATTLE TENT was built\n" + .string "in SLATEPORT.\p" + .string "GYMS are fun, but the BATTLE TENT’s\n" + .string "awesome in its own way.\p" + .string "You should go find tough POKéMON\n" + .string "for the BATTLE TENT!$" + +SlateportCity_Text_1DE28E: @ 81DE28E + .string "I was hoping that it was a famous star\n" + .string "so I could get an autograph.\p" + .string "But who’s that being interviewed?\n" + .string "Isn’t that CAPT. STERN?$" + +SlateportCity_Text_1DE30C: @ 81DE30C + .string "That lady interviewer is so cool\n" + .string "and pretty.\p" + .string "When I grow up, I’m going to be\n" + .string "an international journalist!$" + +SlateportCity_Text_1DE376: @ 81DE376 + .string "CAPT. STERN says they discovered\n" + .string "something at the bottom of the sea.\p" + .string "I wonder what it is?\n" + .string "What could it be?$" + +SlateportCity_Text_1DE3E2: @ 81DE3E2 + .string "What’s going on here?\p" + .string "Did the good CAPTAIN come back with\n" + .string "a big fish from the ocean floor?$" + +SlateportCity_Text_1DE43D: @ 81DE43D + .string "Hey! Are you watching?\n" + .string "Am I on TV?$" + +SlateportCity_Text_1DE460: @ 81DE460 + .string "A TV interview! Here!\n" + .string "The CAPTAIN’s a celebrity!$" + +SlateportCity_Text_1DE491: @ 81DE491 + .string "TY: Okay, CAPT. STERN, a big smile\n" + .string "for the camera!$" + +SlateportCity_Text_1DE4C4: @ 81DE4C4 + .string "GABBY: I see, I see. You’ve had a most\n" + .string "invaluable experience…$" + +SlateportCity_Text_1DE502: @ 81DE502 + .string "CAPT. STERN: Yes, indeed. We intend to\n" + .string "move ahead with our exploration.$" + +SlateportCity_Text_1DE54A: @ 81DE54A + .string "GABBY: That’s wonderful, CAPT. STERN!\n" + .string "Thank you for taking the time from\l" + .string "your busy schedule to talk to us.\p" + .string "We hope we can interview you again\n" + .string "with news of more discoveries!$" + +SlateportCity_Text_1DE5F7: @ 81DE5F7 + .string "CAPT. STERN: Whew…\p" + .string "That was my first time to be filmed for\n" + .string "TV. That was nerve-wracking.$" + +SlateportCity_Text_1DE64F: @ 81DE64F + .string "Oh! {PLAYER}{KUN}!\n" + .string "You’re looking great!\p" + .string "We made a huge discovery on our last\n" + .string "seafloor exploration.\p" + .string "We found an underwater cavern on\n" + .string "ROUTE 128.\p" + .string "We think it’s the habitat of a POKéMON\n" + .string "that’s said to have been long extinct.$" + +SlateportCity_Text_1DE724: @ 81DE724 + .string "Fufufu…\n" + .string "CAPT. STERN, I presume.\p" + .string "We of TEAM AQUA will assume\n" + .string "control of your submarine!\p" + .string "Your objections are meaningless!\n" + .string "We expect your total cooperation!\p" + .string "Fufufu…\n" + .string "Just watch and learn what TEAM\l" + .string "AQUA has planned!$" + +SlateportCity_Text_1DE7F7: @ 81DE7F7 + .string "CAPT. STERN: What was that all about?\p" + .string "It sounded like someone using\n" + .string "a megaphone…\p" + .string "Where did it come from?$" + +SlateportCity_Text_1DE860: @ 81DE860 + .string "It’s from the HARBOR!\p" + .string "The submarine!\n" + .string "They’re trying to take it!$" + +SlateportCity_Text_1DE8A0: @ 81DE8A0 + .string "{PLAYER}{KUN}!\n" + .string "Please, come with me!$" + +SlateportCity_Text_1DE8BC: @ 81DE8BC + .string "BATTLE TENT SLATEPORT SITE\n" + .string "“Find it! The ultimate POKéMON!â€$" + +SlateportCity_Text_1DE8F8: @ 81DE8F8 + .string "STERN’S SHIPYARD\p" + .string "“Wanted: A sailor capable of sailing\n" + .string "in all currents.â€$" + +SlateportCity_Text_1DE940: @ 81DE940 + .string "STERN’S SHIPYARD\p" + .string "“The ferry S.S. TIDAL nears\n" + .string "completion for serving the ports of\l" + .string "SLATEPORT and LILYCOVE.â€$" + +SlateportCity_Text_1DE9AA: @ 81DE9AA + .string "STERN’S SHIPYARD\p" + .string "“Boarding of the SLATEPORT-LILYCOVE\n" + .string "ferry S.S. TIDAL is handled at the\l" + .string "HARBOR.â€$" + +SlateportCity_Text_1DEA0B: @ 81DEA0B + .string "POKéMON FAN CLUB\n" + .string "“Calling all fans of POKéMON!â€$" + +SlateportCity_Text_1DEA3B: @ 81DEA3B + .string "“The endless sea sustains\n" + .string "all life.â€\p" + .string "OCEANIC MUSEUM$" + +SlateportCity_Text_1DEA6F: @ 81DEA6F + .string "SLATEPORT CITY\p" + .string "“The port where people and POKéMON\n" + .string "cross paths.â€$" + +SlateportCity_Text_1DEAAF: @ 81DEAAF + .string "SLATEPORT MARKET\n" + .string "“Unique items found nowhere else!â€$" + +SlateportCity_Text_1DEAE3: @ 81DEAE3 + .string "SLATEPORT HARBOR\p" + .string "“The ferry S.S. TIDAL is under\n" + .string "construction in the SHIPYARD.\p" + .string "“Service is scheduled to begin\n" + .string "shortly.â€$" + +SlateportCity_Text_1DEB5A: @ 81DEB5A + .string "SLATEPORT HARBOR\p" + .string "“Enjoy a delightful cruise on\n" + .string "the ferry S.S. TIDAL.â€$" + +SlateportCity_Text_1DEBA0: @ 81DEBA0 + .string "NAME RATER’S HOUSE\n" + .string "“POKéMON nicknames rated.â€$" + +SlateportCity_Text_1DEBCE: @ 81DEBCE + .string "If a wild POKéMON gets hurt, it heals\n" + .string "itself by chewing on BERRIES.\p" + .string "Did you know that?\p" + .string "Somebody saw that and got the idea\n" + .string "of making medicine from BERRIES.\p" + .string "Did you know that?\p" + .string "To turn BERRIES into medicine,\n" + .string "they must be crushed into powder.\p" + .string "Did you know that?\p" + .string "You seem to have an interest\n" + .string "in BERRIES!\p" + .string "I’ve got something good for someone\n" + .string "like you.$" + +SlateportCity_Text_1DED27: @ 81DED27 + .string "I recently had machines installed at\n" + .string "POKéMON CENTERS for crushing BERRIES.\p" + .string "The BERRY CRUSH machines are at\n" + .string "the DIRECT CORNER upstairs.\p" + .string "Did you know?\p" + .string "Could you make BERRY POWDER for\n" + .string "me using those machines?\p" + .string "I can make you all sorts of medicine\n" + .string "if you bring me lots of BERRY POWDER.$" + +SlateportCity_Text_1DEE40: @ 81DEE40 + .string "Have you brought me some\n" + .string "BERRY POWDER?$" + +SlateportCity_Text_1DEE67: @ 81DEE67 + .string "What would you like to exchange\n" + .string "it with?$" + +SlateportCity_Text_1DEE90: @ 81DEE90 + .string "Okay, you want to exchange your\n" + .string "BERRY POWDER for one {STR_VAR_1}?$" + +SlateportCity_Text_1DEEC9: @ 81DEEC9 + .string "Oh, dear. You don’t have enough\n" + .string "BERRY POWDER.$" + +SlateportCity_Text_1DEEF7: @ 81DEEF7 + .string "This is fine BERRY POWDER.\n" + .string "It will make excellent medicine.\p" + .string "Would you like to trade more of your\n" + .string "BERRY POWDER for something else?$" + +SlateportCity_Text_1DEF79: @ 81DEF79 + .string "Okay! When you get some more\n" + .string "BERRY POWDER, bring it to me, please!$" + +SlateportCity_Text_1DEFBC: @ 81DEFBC + .string "Come back if you’d like to trade your\n" + .string "BERRY POWDER for some medicine.\p" + .string "I’m always running a bazaar here.\p" + .string "Did you know?$" + +SlateportCity_Text_1DF032: @ 81DF032 + .string "SCOTT: Huh?\n" + .string "I’m sure I met you somewhere before.\p" + .string "Have I introduced myself to you?\n" + .string "If not, my name’s SCOTT.\p" + .string "I just saw TEAM AQUA run away from\n" + .string "here like they were stung.\p" + .string "Let me guess--you drove them away?$" + +SlateportCity_Text_1DF0FE: @ 81DF0FE + .string "SCOTT: Hmm…\n" + .string "Maybe, just maybe, this TRAINER…$" + +SlateportCity_Text_1DF12B: @ 81DF12B + .string "SCOTT: All right! I think you’re going\n" + .string "to become a good friend.\p" + .string "So, let’s register each other in our\n" + .string "POKéNAVS.\p" + .string "… … … … … …$" + +SlateportCity_Text_1DF1A6: @ 81DF1A6 + .string "Registered this SCOTT person\n" + .string "in the POKéNAV.$" + +SlateportCity_Text_1DF1D3: @ 81DF1D3 + .string "SCOTT: What I’d like to do is tag along\n" + .string "with you, but I do want to keep an eye\l" + .string "on the talents of other people, too.\p" + .string "So, I’ll be off to roam other towns\n" + .string "a bit more.\p" + .string "Be seeing you, {PLAYER}{KUN}!$" + +SlateportCity_Text_1DF28C: @ 81DF28C + .string "SCOTT: Oh, hey!\n" + .string "If it isn’t {PLAYER}{KUN}!\p" + .string "{PLAYER}{KUN}, let me guess--you’re going\n" + .string "to take the BATTLE TENT challenge?\p" + .string "Yeah! That’s a good idea!\n" + .string "That’s a really great idea!\p" + .string "After all, a tough TRAINER is\n" + .string "the perfect fit for the BATTLE TENT!\p" + .string "Give it your best effort!$" + diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/events.inc b/data/maps/SlateportCity_BattleTentBattleRoom/events.inc new file mode 100644 index 000000000..ce13a5899 --- /dev/null +++ b/data/maps/SlateportCity_BattleTentBattleRoom/events.inc @@ -0,0 +1,8 @@ +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 + +SlateportCity_BattleTentBattleRoom_MapEvents:: @ 852F524 + map_events SlateportCity_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc new file mode 100644 index 000000000..150cc425b --- /dev/null +++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc @@ -0,0 +1,115 @@ +SlateportCity_BattleTentBattleRoom_MapScripts:: @ 8209960 + map_script 3, SlateportCity_BattleTentBattleRoom_MapScript1_209970 + map_script 4, SlateportCity_BattleTentBattleRoom_MapScript2_20999A + map_script 2, SlateportCity_BattleTentBattleRoom_MapScript2_2099B4 + .byte 0 + +SlateportCity_BattleTentBattleRoom_MapScript1_209970: @ 8209970 + call SlateportCity_BattleTentBattleRoom_EventScript_209976 + end + +SlateportCity_BattleTentBattleRoom_EventScript_209976:: @ 8209976 + checkplayergender + compare VAR_RESULT, 0 + goto_eq SlateportCity_BattleTentBattleRoom_EventScript_20998E + compare VAR_RESULT, 1 + goto_eq SlateportCity_BattleTentBattleRoom_EventScript_209994 + return + +SlateportCity_BattleTentBattleRoom_EventScript_20998E:: @ 820998E + setvar VAR_OBJ_GFX_ID_1, 100 + return + +SlateportCity_BattleTentBattleRoom_EventScript_209994:: @ 8209994 + setvar VAR_OBJ_GFX_ID_1, 105 + return + +SlateportCity_BattleTentBattleRoom_MapScript2_20999A: @ 820999A + map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentBattleRoom_EventScript_2099A4 + .2byte 0 + +SlateportCity_BattleTentBattleRoom_EventScript_2099A4:: @ 82099A4 + setvar VAR_TEMP_1, 1 + hideobjectat 255, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM + hideobjectat 2, MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM + end + +SlateportCity_BattleTentBattleRoom_MapScript2_2099B4: @ 82099B4 + map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentBattleRoom_EventScript_2099BE + .2byte 0 + +SlateportCity_BattleTentBattleRoom_EventScript_2099BE:: @ 82099BE + applymovement 3, SlateportCity_BattleTentBattleRoom_Movement_209A99 + waitmovement 0 + setvar VAR_0x8004, 11 + special sub_81A5E74 + setobjectxyperm 2, 5, 1 + removeobject 2 + addobject 2 + applymovement 2, SlateportCity_BattleTentBattleRoom_Movement_209A9E + waitmovement 0 + setvar VAR_0x8004, 4 + special sub_81B99B4 + lockall + msgbox 0x2021fc4, 4 + waitmessage + closemessage + special HealPlayerParty + setvar VAR_0x8004, 6 + setvar VAR_0x8005, 0 + special sub_8163AC4 + waitstate + switch VAR_RESULT + case 1, SlateportCity_BattleTentBattleRoom_EventScript_209A39 + +SlateportCity_BattleTentCorridor_EventScript_209A1B:: @ 8209A1B + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 4 + special sub_81A1780 + special LoadPlayerParty + warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6 + waitstate + +SlateportCity_BattleTentBattleRoom_EventScript_209A39:: @ 8209A39 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special sub_81A1780 + addvar VAR_RESULT, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + copyvar VAR_0x8006, VAR_RESULT + special sub_81A1780 + switch VAR_RESULT + case 3, SlateportCity_BattleTentBattleRoom_EventScript_209A7B +@ case 3, SlateportCity_BattleTentCorridor_EventScript_209A7B + setvar VAR_0x8006, 1 + warp MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 3 + waitstate + +SlateportCity_BattleTentBattleRoom_EventScript_209A7B:: @ 8209A7B +SlateportCity_BattleTentCorridor_EventScript_209A7B:: @ 8209A7B + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 3 + special sub_81A1780 + special LoadPlayerParty + warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6 + waitstate +@ forced stop + +SlateportCity_BattleTentBattleRoom_Movement_209A99: @ 8209A99 + walk_up + walk_up + walk_up + walk_in_place_fastest_right + step_end + +SlateportCity_BattleTentBattleRoom_Movement_209A9E: @ 8209A9E + walk_down + walk_down + walk_down + walk_down + walk_in_place_fastest_left + step_end + diff --git a/data/maps/SlateportCity_BattleTentCorridor/events.inc b/data/maps/SlateportCity_BattleTentCorridor/events.inc new file mode 100644 index 000000000..b56b50a0e --- /dev/null +++ b/data/maps/SlateportCity_BattleTentCorridor/events.inc @@ -0,0 +1,6 @@ +SlateportCity_BattleTentCorridor_EventObjects: @ 852F4B0 + 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/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc new file mode 100644 index 000000000..0a9eb6cf5 --- /dev/null +++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc @@ -0,0 +1,280 @@ +SlateportCity_BattleTentCorridor_MapScripts:: @ 8208E26 + map_script 2, SlateportCity_BattleTentCorridor_MapScript2_208E5B + map_script 4, SlateportCity_BattleTentCorridor_MapScript2_208E31 + .byte 0 + +SlateportCity_BattleTentCorridor_MapScript2_208E31: @ 8208E31 + map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentCorridor_EventScript_208E3B + .2byte 0 + +SlateportCity_BattleTentCorridor_EventScript_208E3B:: @ 8208E3B + setvar VAR_TEMP_1, 1 + compare VAR_0x8006, 1 + goto_if 5, SlateportCity_BattleTentCorridor_EventScript_208E56 + setobjectxy 1, 2, 2 + turnobject 1, 1 + +SlateportCity_BattleTentCorridor_EventScript_208E56:: @ 8208E56 + turnobject 255, 2 + end + +SlateportCity_BattleTentCorridor_MapScript2_208E5B: @ 8208E5B + map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentCorridor_EventScript_208E65 + .2byte 0 + +SlateportCity_BattleTentCorridor_EventScript_208E65:: @ 8208E65 + compare VAR_0x8006, 1 + goto_eq SlateportCity_BattleTentCorridor_EventScript_208EEE + setvar VAR_TEMP_0, 1 + applymovement 1, SlateportCity_BattleTentCorridor_Movement_209062 + applymovement 255, SlateportCity_BattleTentCorridor_Movement_209059 + waitmovement 0 + compare VAR_0x8006, 2 + goto_eq SlateportCity_BattleTentCorridor_EventScript_209044 + setvar VAR_0x8004, 9 + special sub_81B9D08 + setvar VAR_0x8004, 8 + special sub_81B9D08 + msgbox SlateportCity_BattleTentCorridor_Text_25A1C8, 4 + fadescreen 1 + setvar VAR_0x8004, 6 + special sub_81B9D08 + waitstate + +SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4 + msgbox SlateportCity_BattleTentCorridor_Text_25AB96, 4 + closemessage + applymovement 1, SlateportCity_BattleTentCorridor_Movement_2725A6 + waitmovement 0 + opendoor 2, 1 + waitdooranim + applymovement 1, SlateportCity_BattleTentCorridor_Movement_209068 + applymovement 255, SlateportCity_BattleTentCorridor_Movement_20905E + waitmovement 0 + closedoor 2, 1 + waitdooranim + warp MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM, 255, 4, 4 + waitstate + end + +SlateportCity_BattleTentCorridor_EventScript_208EEE:: @ 8208EEE + setvar VAR_0x8004, 9 + special sub_81A5E74 + setvar VAR_0x8004, 16 + special sub_81A5E74 + msgbox SlateportCity_BattleTentCorridor_Text_25A22D, 4 + playfanfare MUS_ME_ASA + waitfanfare + special HealPlayerParty + +SlateportCity_BattleTentCorridor_EventScript_208F0D:: @ 8208F0D + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special sub_81A1780 + compare VAR_RESULT, 1 + call_if 1, SlateportCity_BattleTentCorridor_EventScript_209014 + compare VAR_RESULT, 2 + call_if 1, SlateportCity_BattleTentCorridor_EventScript_20901B + multichoice 20, 6, 104, 1 + switch VAR_RESULT + case 0, SlateportCity_BattleTentCorridor_EventScript_208FBB + case 1, SlateportCity_BattleTentCorridor_EventScript_208F5B + case 2, SlateportCity_BattleTentCorridor_EventScript_208F89 + +SlateportCity_BattleTentCorridor_EventScript_208F5B:: @ 8208F5B + msgbox SlateportCity_BattleTentCorridor_Text_25A350, 5 + switch VAR_RESULT + case 0, SlateportCity_BattleTentCorridor_EventScript_208F0D + case 1, SlateportCity_BattleTentCorridor_EventScript_209022 + case 127, SlateportCity_BattleTentCorridor_EventScript_208F0D + +SlateportCity_BattleTentCorridor_EventScript_208F89:: @ 8208F89 + message SlateportCity_BattleTentCorridor_Text_25A37A + waitmessage + multichoicedefault 20, 8, 94, 1, 0 + switch VAR_RESULT + case 1, SlateportCity_BattleTentCorridor_EventScript_208F0D + case 0, SlateportCity_BattleTentCorridor_EventScript_209A1B + case 127, SlateportCity_BattleTentCorridor_EventScript_208F0D + +SlateportCity_BattleTentCorridor_EventScript_208FBB:: @ 8208FBB + setvar VAR_0x8004, 8 + special sub_81B9D08 + msgbox SlateportCity_BattleTentCorridor_Text_25AB2E, 5 + switch VAR_RESULT + case 0, SlateportCity_BattleTentCorridor_EventScript_208EB4 + case 1, SlateportCity_BattleTentCorridor_EventScript_208FF1 + case 127, SlateportCity_BattleTentCorridor_EventScript_208EB4 + +SlateportCity_BattleTentCorridor_EventScript_208FF1:: @ 8208FF1 + fadescreen 1 + setvar VAR_0x8004, 7 + special sub_81B9D08 + waitstate + compare VAR_RESULT, 1 + goto_eq SlateportCity_BattleTentCorridor_EventScript_208EB4 + msgbox SlateportCity_BattleTentCorridor_Text_25AB6C, 4 + goto SlateportCity_BattleTentCorridor_EventScript_208EB4 + +SlateportCity_BattleTentCorridor_EventScript_209014:: @ 8209014 + message SlateportCity_BattleTentCorridor_Text_25A263 + waitmessage + return + +SlateportCity_BattleTentCorridor_EventScript_20901B:: @ 820901B + message SlateportCity_BattleTentCorridor_Text_25A289 + waitmessage + return + +SlateportCity_BattleTentCorridor_EventScript_209022:: @ 8209022 + message SlateportCity_BattleTentCorridor_Text_25ABAE + waitmessage + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 2 + special sub_81B9D08 + playse SE_SAVE + waitse + fadescreen 1 + setvar VAR_0x8004, 4 + special sub_81A1780 + end + +SlateportCity_BattleTentCorridor_EventScript_209044:: @ 8209044 + special SavePlayerParty + setvar VAR_0x8004, 10 + setvar VAR_0x8005, 0 + special sub_81A5E74 + goto SlateportCity_BattleTentCorridor_EventScript_208F0D + +SlateportCity_BattleTentCorridor_Movement_209059: @ 8209059 + walk_up + walk_up + walk_up + walk_up + step_end + +SlateportCity_BattleTentCorridor_Movement_20905E: @ 820905E + walk_up + walk_up + set_invisible + step_end + +SlateportCity_BattleTentCorridor_Movement_209062: @ 8209062 + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_down + step_end + +SlateportCity_BattleTentCorridor_Movement_209068: @ 8209068 + walk_up + set_invisible + step_end + +SlateportCity_BattleTentCorridor_Text_20906B: @ 820906B + .string "Want a tasty little bit of advice\n" + .string "for CONTESTS?\p" + .string "Using a certain move after another\n" + .string "certain kind of move sometimes gets\l" + .string "you extra attention.\p" + .string "If you know what you’re doing,\n" + .string "you can score big in appeal.\p" + .string "Of course, your opponents might try\n" + .string "disrupting your POKéMON’s showing.$" + +SlateportCity_BattleTentCorridor_Text_20917A: @ 820917A + .string "My papa, he’s a CONTEST JUDGE.\p" + .string "I wonder what I should be when I\n" + .string "grow up, a JUDGE or a GYM LEADER?$" + +SlateportCity_BattleTentCorridor_Text_2091DC: @ 82091DC + .string "Hey, man, I’m like majorly cheesed,\n" + .string "you know. Like, you know, I just\l" + .string "wanted to know why my POKéMON\l" + .string "never won, you know, like, hey?\p" + .string "So, like, I gave the JUDGE my two\n" + .string "cents, you know, they’re free.\p" + .string "And he wouldn’t hear me out, like, hey!\n" + .string "So, like, total bummer, man!\p" + .string "Hey, like, you! Zip it, you know?\n" + .string "Just, you know, take this!$" + +SlateportCity_BattleTentCorridor_Text_209322: @ 8209322 + .string "That’s, like, TM41, you know?\n" + .string "Hey, it’s TORMENT, you hearing me?\p" + .string "Like, it won’t let the other guy\n" + .string "use the same move twice in a row, see?\p" + .string "Hey, now, you listen here, like,\n" + .string "I’m not laying a torment on you!$" + +SlateportCity_BattleTentCorridor_Text_2093ED: @ 82093ED + .string "MC: Oh, my, my!\n" + .string "Now isn’t that a dandy of a POKéMON?\p" + .string "Please! Do step right up and take\n" + .string "part in our splendid CONTESTS!\p" + .string "You’ll do well! I’m sure of it!\n" + .string "My eyes have never failed me!$" + +SlateportCity_BattleTentCorridor_Text_2094A1: @ 82094A1 + .string "JUDGE: Well, hello there!\n" + .string "I see that you’re a TRAINER!\p" + .string "Then, it just wouldn’t do for you\n" + .string "to miss a POKéMON CONTEST!\p" + .string "Get a CONTEST PASS in VERDANTURF\n" + .string "CITY and enter anytime!$" + +SlateportCity_BattleTentCorridor_Text_20954E: @ 820954E + .string "It’s appeal time!\n" + .string "What should I lead with?$" + +SlateportCity_BattleTentCorridor_Text_209579: @ 8209579 + .string "They didn’t pay much attention to\n" + .string "my POKéMON’s appeal…\p" + .string "Humph, that JUDGE, he doesn’t know\n" + .string "a good thing when he sees it.$" + +SlateportCity_BattleTentCorridor_Text_2095F1: @ 82095F1 + .string "Oh, hi! You must be a serious fan to get\n" + .string "this close to the action.\p" + .string "I’ll reward your enthusiasm with\n" + .string "this sage advice.\p" + .string "If a move goes over really well,\n" + .string "the audience will get excited.\p" + .string "The POKéMON that makes its appeal\n" + .string "right when everyone’s excited…\p" + .string "Well, you’d think something good has\n" + .string "to happen!$" + +SlateportCity_BattleTentCorridor_Text_209718: @ 8209718 + .string "I can’t do this! I’m more freaked out\n" + .string "than my POKéMON.\p" + .string "I’m shivering and my heart is racing!$" + +SlateportCity_BattleTentCorridor_Text_209775: @ 8209775 + .string "A battle and a CONTEST aren’t the\n" + .string "same, but they are alike, too.\p" + .string "You need to work hard and believe\n" + .string "in the POKéMON you’ve raised.$" + +SlateportCity_BattleTentCorridor_Text_2097F6: @ 82097F6 + .string "That POKéMON looks like it’s on top\n" + .string "of its game, huh?\p" + .string "A POKéMON that does good in the\n" + .string "secondary judging seems to be more\l" + .string "relaxed when it’s doing appeals.$" + +SlateportCity_BattleTentCorridor_Text_209890: @ 8209890 + .string "Will you look at that sorry sight?\p" + .string "Heh, my POKéMON’s absolutely better\n" + .string "than that lot!$" + +SlateportCity_BattleTentCorridor_Text_2098E6: @ 82098E6 + .string "Don’t you get the urge to move with\n" + .string "POKéMON if they’re putting on an\l" + .string "energetic appeal?$" + +SlateportCity_BattleTentCorridor_Text_20993D: @ 820993D + .string "POKéMON CONTESTS\n" + .string "HYPER RANK STAGE!$" + diff --git a/data/maps/SlateportCity_BattleTentLobby/events.inc b/data/maps/SlateportCity_BattleTentLobby/events.inc new file mode 100644 index 000000000..0ceca119b --- /dev/null +++ b/data/maps/SlateportCity_BattleTentLobby/events.inc @@ -0,0 +1,17 @@ +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 + +SlateportCity_BattleTentLobby_MapWarps: @ 852F480 + 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 + +SlateportCity_BattleTentLobby_MapEvents:: @ 852F49C + map_events SlateportCity_BattleTentLobby_EventObjects, SlateportCity_BattleTentLobby_MapWarps, 0x0, SlateportCity_BattleTentLobby_MapBGEvents + diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc new file mode 100644 index 000000000..fc66d7387 --- /dev/null +++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc @@ -0,0 +1,357 @@ +SlateportCity_BattleTentLobby_MapScripts:: @ 8208730 + map_script 2, SlateportCity_BattleTentLobby_MapScript2_20874F + map_script 4, SlateportCity_BattleTentLobby_MapScript2_20873B + .byte 0 + +SlateportCity_BattleTentLobby_MapScript2_20873B: @ 820873B + map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentLobby_EventScript_208745 + .2byte 0 + +SlateportCity_BattleTentLobby_EventScript_208745:: @ 8208745 + setvar VAR_TEMP_1, 1 + turnobject 255, 2 + end + +SlateportCity_BattleTentLobby_MapScript2_20874F: @ 820874F + map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentLobby_EventScript_208779 + map_script_2 VAR_TEMP_0, 1, SlateportCity_BattleTentLobby_EventScript_208782 + map_script_2 VAR_TEMP_0, 2, SlateportCity_BattleTentLobby_EventScript_208871 + map_script_2 VAR_TEMP_0, 3, SlateportCity_BattleTentLobby_EventScript_2087B7 + map_script_2 VAR_TEMP_0, 4, SlateportCity_BattleTentLobby_EventScript_208837 + .2byte 0 + +SlateportCity_BattleTentLobby_EventScript_208779:: @ 8208779 + setvar VAR_0x8004, 0 + special sub_81A1780 + end + +SlateportCity_BattleTentLobby_EventScript_208782:: @ 8208782 + lockall + msgbox SlateportCity_BattleTentLobby_Text_2C5DFA, 4 + closemessage + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_TEMP_0, 255 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 0 + special sub_81A1780 + releaseall + end + +SlateportCity_BattleTentLobby_EventScript_2087B7:: @ 82087B7 + lockall + message SlateportCity_BattleTentLobby_Text_2C5C6F + waitmessage + setvar VAR_0x8004, 4 + special sub_81B9D08 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 0 + special sub_81B9D08 + playse SE_SAVE + waitse + +SlateportCity_BattleTentLobby_EventScript_2087E9:: @ 82087E9 + msgbox SlateportCity_BattleTentLobby_Text_2C5D14, 4 + setvar VAR_0x8004, 5 + special sub_81B9D08 + switch VAR_RESULT + case 0, SlateportCity_BattleTentLobby_EventScript_20882A + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 0 + special sub_81A1780 + message SlateportCity_BattleTentLobby_Text_23F68C + waitmessage + playfanfare MUS_FANFA4 + waitfanfare + goto SlateportCity_BattleTentLobby_EventScript_208861 + +SlateportCity_BattleTentLobby_EventScript_20882A:: @ 820882A + msgbox SlateportCity_BattleTentLobby_Text_2C5D52, 4 + goto SlateportCity_BattleTentLobby_EventScript_208861 + +SlateportCity_BattleTentLobby_EventScript_208837:: @ 8208837 + lockall + message SlateportCity_BattleTentLobby_Text_2C5BA2 + waitmessage + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 0 + special sub_81B9D08 + playse SE_SAVE + waitse + +SlateportCity_BattleTentLobby_EventScript_208861:: @ 8208861 + msgbox SlateportCity_BattleTentLobby_Text_2C5AA5, 4 + closemessage + setvar VAR_TEMP_0, 255 + releaseall + end + +SlateportCity_BattleTentLobby_EventScript_208871:: @ 8208871 + lockall + message SlateportCity_BattleTentLobby_Text_2C5DA7 + waitmessage + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 1 + special sub_81B9D08 + playse SE_SAVE + waitse + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_TEMP_0, 255 + setvar VAR_0x8006, 2 + goto SlateportCity_BattleTentLobby_EventScript_2089AC + +SlateportCity_BattleTentLobby_EventScript_2088AA:: @ 82088AA + lock + faceplayer + setvar VAR_0x8004, 1 + special sub_81B9D08 + compare VAR_RESULT, 0 + goto_if 5, SlateportCity_BattleTentLobby_EventScript_2087E9 + special SavePlayerParty + msgbox SlateportCity_BattleTentLobby_Text_2C5810, 4 + +SlateportCity_BattleTentLobby_EventScript_2088CA:: @ 82088CA + message SlateportCity_BattleTentLobby_Text_2C586A + waitmessage + multichoice 17, 6, 23, 0 + switch VAR_RESULT + case 0, SlateportCity_BattleTentLobby_EventScript_208906 + case 1, SlateportCity_BattleTentLobby_EventScript_208A07 + case 2, SlateportCity_BattleTentLobby_EventScript_208A2E + case 127, SlateportCity_BattleTentLobby_EventScript_208A2E + +SlateportCity_BattleTentLobby_EventScript_208906:: @ 8208906 + setvar VAR_FRONTIER_FACILITY, 4 + setvar VAR_0x40CE, 0 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 2 + special sub_81A1780 + msgbox SlateportCity_BattleTentLobby_Text_2C5B06, 5 + switch VAR_RESULT + case 0, SlateportCity_BattleTentLobby_EventScript_208A2B + case 1, SlateportCity_BattleTentLobby_EventScript_208950 + case 127, SlateportCity_BattleTentLobby_EventScript_208A2B + +SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950 + setvar VAR_TEMP_0, 0 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 4 + special sub_81A1780 + setvar VAR_0x8004, 0 + special sub_81B9D08 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 1 + special sub_81A1780 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 0 + special sub_81A1780 + closemessage + delay 2 + call SlateportCity_BattleTentLobby_EventScript_27134F + setvar VAR_TEMP_0, 255 + compare VAR_RESULT, 0 + goto_eq SlateportCity_BattleTentLobby_EventScript_208A14 + setvar VAR_0x8006, 0 + +SlateportCity_BattleTentLobby_EventScript_2089AC:: @ 82089AC + msgbox SlateportCity_BattleTentLobby_Text_2C5B8C, 4 + closemessage + call SlateportCity_BattleTentLobby_EventScript_2089C9 + warp MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 7 + setvar VAR_TEMP_0, 0 + waitstate + end + +SlateportCity_BattleTentLobby_EventScript_2089C9:: @ 82089C9 + applymovement 1, SlateportCity_BattleTentLobby_Movement_2089F8 + applymovement 255, SlateportCity_BattleTentLobby_Movement_2089FF + waitmovement 0 + opendoor 6, 1 + waitdooranim + applymovement 1, SlateportCity_BattleTentLobby_Movement_2089FC + applymovement 255, SlateportCity_BattleTentLobby_Movement_208A03 + waitmovement 0 + closedoor 6, 1 + waitdooranim + return + +SlateportCity_BattleTentLobby_Movement_2089F8: @ 82089F8 + walk_up + walk_up + walk_up + step_end + +SlateportCity_BattleTentLobby_Movement_2089FC: @ 82089FC + walk_up + set_invisible + step_end + +SlateportCity_BattleTentLobby_Movement_2089FF: @ 82089FF + walk_up + walk_up + walk_up + step_end + +SlateportCity_BattleTentLobby_Movement_208A03: @ 8208A03 + walk_up + walk_up + set_invisible + step_end + +SlateportCity_BattleTentLobby_EventScript_208A07:: @ 8208A07 + msgbox SlateportCity_BattleTentLobby_Text_2C589C, 4 + goto SlateportCity_BattleTentLobby_EventScript_2088CA + +SlateportCity_BattleTentLobby_EventScript_208A14:: @ 8208A14 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 0 + special sub_81A1780 + goto SlateportCity_BattleTentLobby_EventScript_208A2E + +SlateportCity_BattleTentLobby_EventScript_208A2B:: @ 8208A2B + special LoadPlayerParty + +SlateportCity_BattleTentLobby_EventScript_208A2E:: @ 8208A2E + msgbox SlateportCity_BattleTentLobby_Text_2C5AA5, 4 + release + end + +SlateportCity_BattleTentLobby_Movement_208A38:: @ 8208A38 + walk_up + walk_up + walk_up + set_invisible + step_end + +SlateportCity_BattleTentLobby_EventScript_208A3D:: @ 8208A3D + lock + faceplayer + checkflag FLAG_0x109 + goto_eq SlateportCity_BattleTentLobby_EventScript_208A74 + msgbox SlateportCity_BattleTentLobby_Text_208B4E, 4 + giveitem_std ITEM_TM41 + compare VAR_RESULT, 0 + goto_eq SlateportCity_BattleTentLobby_EventScript_272054 + setflag FLAG_0x109 + msgbox SlateportCity_BattleTentLobby_Text_208C5C, 4 + release + end + +SlateportCity_BattleTentLobby_EventScript_208A74:: @ 8208A74 + msgbox SlateportCity_BattleTentLobby_Text_208C5C, 4 + release + end + +SlateportCity_BattleTentLobby_EventScript_208A7E:: @ 8208A7E + msgbox SlateportCity_BattleTentLobby_Text_208D27, 2 + end + +SlateportCity_BattleTentLobby_EventScript_208A87:: @ 8208A87 + msgbox SlateportCity_BattleTentLobby_Text_208DA6, 2 + end + +SlateportCity_BattleTentLobby_EventScript_208A90:: @ 8208A90 + msgbox SlateportCity_BattleTentLobby_Text_208DF1, 2 + end + +SlateportCity_BattleTentLobby_EventScript_208A99:: @ 8208A99 + lockall + msgbox SlateportCity_BattleTentLobby_Text_259721, 4 + goto SlateportCity_BattleTentLobby_EventScript_208AA8 + end + +SlateportCity_BattleTentLobby_EventScript_208AA8:: @ 8208AA8 + message SlateportCity_BattleTentLobby_Text_259743 + waitmessage + multichoice 17, 0, 111, 0 + switch VAR_RESULT + case 0, SlateportCity_BattleTentLobby_EventScript_208B06 + case 1, SlateportCity_BattleTentLobby_EventScript_208B14 + case 2, SlateportCity_BattleTentLobby_EventScript_208B22 + case 3, SlateportCity_BattleTentLobby_EventScript_208B30 + case 4, SlateportCity_BattleTentLobby_EventScript_208B3E + case 5, SlateportCity_BattleTentLobby_EventScript_208B4C + case 127, SlateportCity_BattleTentLobby_EventScript_208B4C + end + +SlateportCity_BattleTentLobby_EventScript_208B06:: @ 8208B06 + msgbox SlateportCity_BattleTentLobby_Text_2C5F08, 4 + goto SlateportCity_BattleTentLobby_EventScript_208AA8 + end + +SlateportCity_BattleTentLobby_EventScript_208B14:: @ 8208B14 + msgbox SlateportCity_BattleTentLobby_Text_2C5F9D, 4 + goto SlateportCity_BattleTentLobby_EventScript_208AA8 + end + +SlateportCity_BattleTentLobby_EventScript_208B22:: @ 8208B22 + msgbox SlateportCity_BattleTentLobby_Text_2C6020, 4 + goto SlateportCity_BattleTentLobby_EventScript_208AA8 + end + +SlateportCity_BattleTentLobby_EventScript_208B30:: @ 8208B30 + msgbox SlateportCity_BattleTentLobby_Text_2C60C0, 4 + goto SlateportCity_BattleTentLobby_EventScript_208AA8 + end + +SlateportCity_BattleTentLobby_EventScript_208B3E:: @ 8208B3E + msgbox SlateportCity_BattleTentLobby_Text_2C61FE, 4 + goto SlateportCity_BattleTentLobby_EventScript_208AA8 + end + +SlateportCity_BattleTentLobby_EventScript_208B4C:: @ 8208B4C + releaseall + end + +SlateportCity_BattleTentLobby_Text_208B4E: @ 8208B4E + .string "So, like, I couldn’t find myself any\n" + .string "POKéMON that were, like, for me.\p" + .string "So, I figured, like, hey, I should file\n" + .string "a complaint to the guy there?\p" + .string "And he wouldn’t hear me out, like, hey!\n" + .string "So, like, total bummer, man!\p" + .string "Hey, like, you! Zip it, you know?\n" + .string "Just, you know, take this!$" + +SlateportCity_BattleTentLobby_Text_208C5C: @ 8208C5C + .string "That’s, like, TM41, you know?\n" + .string "Hey, it’s TORMENT, you hearing me?\p" + .string "Like, it won’t let the other guy\n" + .string "use the same move twice in a row, see?\p" + .string "Hey, now, you listen here, like,\n" + .string "I’m not laying a torment on you!$" + +SlateportCity_BattleTentLobby_Text_208D27: @ 8208D27 + .string "I don’t really like BUG POKéMON,\n" + .string "but maybe I’ll try using some for\l" + .string "a change of pace.\p" + .string "Who knows, I might even get to like\n" + .string "them!$" + +SlateportCity_BattleTentLobby_Text_208DA6: @ 8208DA6 + .string "You can battle all you want here even\n" + .string "if you don’t have any tough POKéMON.$" + +SlateportCity_BattleTentLobby_Text_208DF1: @ 8208DF1 + .string "Wouldn’t it be nice if they had more of\n" + .string "a selection?$" + diff --git a/data/maps/SlateportCity_Harbor/events.inc b/data/maps/SlateportCity_Harbor/events.inc new file mode 100644 index 000000000..af274e22f --- /dev/null +++ b/data/maps/SlateportCity_Harbor/events.inc @@ -0,0 +1,25 @@ +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 + +SlateportCity_Harbor_MapWarps: @ 852FB28 + 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 + 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 + +SlateportCity_Harbor_MapEvents:: @ 852FB88 + map_events SlateportCity_Harbor_EventObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0 + diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc new file mode 100644 index 000000000..e1f373bb2 --- /dev/null +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -0,0 +1,567 @@ +SlateportCity_Harbor_MapScripts:: @ 820C97D + map_script 3, SlateportCity_Harbor_MapScript1_20C983 + .byte 0 + +SlateportCity_Harbor_MapScript1_20C983: @ 820C983 + setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13 + setvar VAR_TEMP_1, 0 + compare VAR_0x40A0, 1 + call_if 1, SlateportCity_Harbor_EventScript_20C9A9 + checkflag FLAG_SYS_GAME_CLEAR + call_if 1, SlateportCity_Harbor_EventScript_20C9A5 + end + +SlateportCity_Harbor_EventScript_20C9A5:: @ 820C9A5 + clearflag FLAG_0x35C + return + +SlateportCity_Harbor_EventScript_20C9A9:: @ 820C9A9 + savebgm MUS_AQA_0 + setobjectxyperm 4, 12, 13 + setobjectmovementtype 4, 9 + setflag FLAG_0x389 + return + +SlateportCity_Harbor_EventScript_20C9BB:: @ 820C9BB + lockall + setvar VAR_0x8008, 0 + goto SlateportCity_Harbor_EventScript_20C9F5 + end + +SlateportCity_Harbor_EventScript_20C9C7:: @ 820C9C7 + lockall + setvar VAR_0x8008, 1 + goto SlateportCity_Harbor_EventScript_20C9F5 + end + +SlateportCity_Harbor_EventScript_20C9D3:: @ 820C9D3 + lockall + setvar VAR_0x8008, 2 + goto SlateportCity_Harbor_EventScript_20C9F5 + end + +SlateportCity_Harbor_EventScript_20C9DF:: @ 820C9DF + lockall + setvar VAR_0x8008, 3 + applymovement 255, SlateportCity_Harbor_Movement_20CAEF + waitmovement 0 + goto SlateportCity_Harbor_EventScript_20C9F5 + end + +SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 + applymovement 7, SlateportCity_Harbor_Movement_2725AA + waitmovement 0 + applymovement 6, SlateportCity_Harbor_Movement_2725AA + applymovement 255, SlateportCity_Harbor_Movement_2725A6 + waitmovement 0 + msgbox SlateportCity_Harbor_Text_20D291, 4 + closemessage + applymovement 6, SlateportCity_Harbor_Movement_20CAC8 + applymovement 7, SlateportCity_Harbor_Movement_20CAC8 + applymovement 8, SlateportCity_Harbor_Movement_20CAD2 + waitmovement 0 + removeobject 6 + removeobject 7 + removeobject 8 + setvar VAR_0x40A0, 2 + setflag FLAG_0x061 + setflag FLAG_0x313 + compare VAR_0x8008, 0 + call_if 1, SlateportCity_Harbor_EventScript_20CA89 + compare VAR_0x8008, 1 + call_if 1, SlateportCity_Harbor_EventScript_20CA9E + compare VAR_0x8008, 2 + call_if 1, SlateportCity_Harbor_EventScript_20CAB3 + compare VAR_0x8008, 3 + call_if 1, SlateportCity_Harbor_EventScript_20CAB3 + msgbox SlateportCity_Harbor_Text_20D35A, 4 + closemessage + setflag FLAG_0x335 + setflag FLAG_0x336 + moveobjectoffscreen 4 + setobjectmovementtype 4, 10 + releaseall + end + +SlateportCity_Harbor_EventScript_20CA89:: @ 820CA89 + applymovement 4, SlateportCity_Harbor_Movement_20CAE0 + waitmovement 0 + applymovement 255, SlateportCity_Harbor_Movement_2725AA + waitmovement 0 + return + +SlateportCity_Harbor_EventScript_20CA9E:: @ 820CA9E + applymovement 4, SlateportCity_Harbor_Movement_20CAE6 + waitmovement 0 + applymovement 255, SlateportCity_Harbor_Movement_2725A8 + waitmovement 0 + return + +SlateportCity_Harbor_EventScript_20CAB3:: @ 820CAB3 + applymovement 4, SlateportCity_Harbor_Movement_20CAEB + waitmovement 0 + applymovement 255, SlateportCity_Harbor_Movement_2725A8 + waitmovement 0 + return + +SlateportCity_Harbor_Movement_20CAC8: @ 820CAC8 + delay_16 + delay_16 + jump_up + set_invisible + step_end + +SlateportCity_Harbor_Movement_20CACD: @ 820CACD + delay_16 + delay_16 + jump_up + set_invisible + step_end + +SlateportCity_Harbor_Movement_20CAD2: @ 820CAD2 + 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 + walk_left + walk_left + walk_left + walk_left + walk_up + step_end + +SlateportCity_Harbor_Movement_20CAE6: @ 820CAE6 + walk_left + walk_left + walk_up + walk_left + step_end + +SlateportCity_Harbor_Movement_20CAEB: @ 820CAEB + walk_left + walk_left + walk_left + step_end + +SlateportCity_Harbor_Movement_20CAEF: @ 820CAEF + walk_up + step_end + +SlateportCity_Harbor_EventScript_20CAF1:: @ 820CAF1 + lock + faceplayer + checkflag FLAG_SYS_GAME_CLEAR + goto_eq SlateportCity_Harbor_EventScript_20CB06 + msgbox SlateportCity_Harbor_Text_20CE20, 4 + release + end + +SlateportCity_Harbor_EventScript_20CB06:: @ 820CB06 + msgbox SlateportCity_Harbor_Text_20CE87, 4 + message SlateportCity_Harbor_Text_20CF1C + waitmessage + goto SlateportCity_Harbor_EventScript_20CB1A + end + +SlateportCity_Harbor_EventScript_20CB1A:: @ 820CB1A + checkflag FLAG_0x1D0 + goto_eq SlateportCity_Harbor_EventScript_20CB50 + multichoicedefault 18, 8, 56, 2, 0 + switch VAR_RESULT + case 0, SlateportCity_Harbor_EventScript_20CB92 + case 1, SlateportCity_Harbor_EventScript_20CC2D + case 127, SlateportCity_Harbor_EventScript_20CC2D + end + +SlateportCity_Harbor_EventScript_20CB50:: @ 820CB50 + multichoicedefault 17, 6, 52, 2, 0 + switch VAR_RESULT + case 0, SlateportCity_Harbor_EventScript_20CB92 + case 1, SlateportCity_Harbor_EventScript_20CBBA + case 2, SlateportCity_Harbor_EventScript_20CC2D + case 127, SlateportCity_Harbor_EventScript_20CC2D + end + +SlateportCity_Harbor_EventScript_20CB88:: @ 820CB88 + msgbox SlateportCity_Harbor_Text_20CEC1, 4 + release + end + +SlateportCity_Harbor_EventScript_20CB92:: @ 820CB92 + msgbox SlateportCity_Harbor_Text_20CF93, 5 + compare VAR_RESULT, 0 + goto_eq SlateportCity_Harbor_EventScript_20CBDD + setvar VAR_PORTHOLE, 1 + call SlateportCity_Harbor_EventScript_20CBE9 + warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 + waitstate + release + end + +SlateportCity_Harbor_EventScript_20CBBA:: @ 820CBBA + msgbox SlateportCity_Harbor_Text_20CFAE, 5 + compare VAR_RESULT, 0 + goto_eq SlateportCity_Harbor_EventScript_20CBDD + call SlateportCity_Harbor_EventScript_20CBE9 + warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 + waitstate + release + end + +SlateportCity_Harbor_EventScript_20CBDD:: @ 820CBDD + message SlateportCity_Harbor_Text_20CFFA + waitmessage + goto SlateportCity_Harbor_EventScript_20CB1A + end + +SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9 + msgbox SlateportCity_Harbor_Text_20CFCB, 4 + closemessage + applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_2725A6 + waitmovement 0 + delay 30 + 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, MAP_PETALBURG_CITY + setvar VAR_0x8004, 5 + call SlateportCity_Harbor_EventScript_2721E2 + return + +SlateportCity_Harbor_EventScript_20CC2D:: @ 820CC2D + msgbox SlateportCity_Harbor_Text_20CF71, 4 + release + end + +SlateportCity_Harbor_EventScript_20CC37:: @ 820CC37 + applymovement 255, SlateportCity_Harbor_Movement_20CC4D + waitmovement 0 + return + +SlateportCity_Harbor_EventScript_20CC42:: @ 820CC42 + applymovement 255, SlateportCity_Harbor_Movement_20CC50 + waitmovement 0 + return + +SlateportCity_Harbor_Movement_20CC4D: @ 820CC4D + walk_right + walk_in_place_fastest_up + step_end + +SlateportCity_Harbor_Movement_20CC50: @ 820CC50 + walk_up + step_end + +SlateportCity_Harbor_EventScript_20CC52:: @ 820CC52 + lock + faceplayer + checkflag FLAG_SYS_GAME_CLEAR + goto_if 0, SlateportCity_Harbor_EventScript_20CC89 + setvar VAR_0x8004, 0 + checkflag FLAG_0x1BE + call_if 1, SlateportCity_Harbor_EventScript_20CC93 + checkflag FLAG_0x1BF + call_if 1, SlateportCity_Harbor_EventScript_20CC93 + compare VAR_0x8004, 2 + goto_eq SlateportCity_Harbor_EventScript_20CC89 + msgbox SlateportCity_Harbor_Text_20D08E, 4 + release + end + +SlateportCity_Harbor_EventScript_20CC89:: @ 820CC89 + msgbox SlateportCity_Harbor_Text_20D01C, 4 + release + end + +SlateportCity_Harbor_EventScript_20CC93:: @ 820CC93 + addvar VAR_0x8004, 1 + return + +SlateportCity_Harbor_EventScript_20CC99:: @ 820CC99 + msgbox SlateportCity_Harbor_Text_20D194, 2 + end + +SlateportCity_Harbor_EventScript_20CCA2:: @ 820CCA2 + lock + faceplayer + checkflag FLAG_BADGE07_GET + goto_eq SlateportCity_Harbor_EventScript_20CD00 + checkflag FLAG_0x10F + goto_eq SlateportCity_Harbor_EventScript_20CCF6 + checkflag FLAG_0x070 + goto_eq SlateportCity_Harbor_EventScript_20CCE9 + compare VAR_0x40A0, 2 + goto_eq SlateportCity_Harbor_EventScript_20CCDF + msgbox SlateportCity_Harbor_Text_20D232, 4 + closemessage + applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_2725A2 + waitmovement 0 + release + end + +SlateportCity_Harbor_EventScript_20CCDF:: @ 820CCDF + msgbox SlateportCity_Harbor_Text_20D35A, 4 + release + end + +SlateportCity_Harbor_EventScript_20CCE9:: @ 820CCE9 + setflag FLAG_0x10F + msgbox SlateportCity_Harbor_Text_20D42B, 4 + release + end + +SlateportCity_Harbor_EventScript_20CCF6:: @ 820CCF6 + msgbox SlateportCity_Harbor_Text_20D58A, 4 + release + end + +SlateportCity_Harbor_EventScript_20CD00:: @ 820CD00 + compare VAR_TEMP_1, 1 + goto_eq SlateportCity_Harbor_EventScript_20CE11 + checkitem ITEM_SCANNER, 1 + compare VAR_RESULT, 1 + goto_eq SlateportCity_Harbor_EventScript_20CD38 + checkflag FLAG_SYS_GAME_CLEAR + goto_eq SlateportCity_Harbor_EventScript_20CD2E + msgbox SlateportCity_Harbor_Text_20D65C, 4 + release + end + +SlateportCity_Harbor_EventScript_20CD2E:: @ 820CD2E + msgbox SlateportCity_Harbor_Text_20D6CB, 4 + release + end + +SlateportCity_Harbor_EventScript_20CD38:: @ 820CD38 + message SlateportCity_Harbor_Text_20D76C + waitmessage + goto SlateportCity_Harbor_EventScript_20CD44 + end + +SlateportCity_Harbor_EventScript_20CD44:: @ 820CD44 + multichoice 0, 0, 46, 0 + switch VAR_RESULT + case 0, SlateportCity_Harbor_EventScript_20CD7B + case 1, SlateportCity_Harbor_EventScript_20CDBB + case 2, SlateportCity_Harbor_EventScript_20CDFB + case 127, SlateportCity_Harbor_EventScript_20CDFB + end + +SlateportCity_Harbor_EventScript_20CD7B:: @ 820CD7B + msgbox SlateportCity_Harbor_Text_20D8BC, 5 + compare VAR_RESULT, 0 + goto_eq SlateportCity_Harbor_EventScript_20CE05 + giveitem_std ITEM_DEEP_SEA_TOOTH + compare VAR_RESULT, 0 + goto_eq SlateportCity_Harbor_EventScript_272054 + takeitem ITEM_SCANNER, 1 + msgbox SlateportCity_Harbor_Text_20D94A, 4 + setflag FLAG_0x126 + goto SlateportCity_Harbor_EventScript_20CE11 + end + +SlateportCity_Harbor_EventScript_20CDBB:: @ 820CDBB + msgbox SlateportCity_Harbor_Text_20D8F1, 5 + compare VAR_RESULT, 0 + goto_eq SlateportCity_Harbor_EventScript_20CE05 + giveitem_std ITEM_DEEP_SEA_SCALE + compare VAR_RESULT, 0 + goto_eq SlateportCity_Harbor_EventScript_272054 + takeitem ITEM_SCANNER, 1 + msgbox SlateportCity_Harbor_Text_20D94A, 4 + setflag FLAG_0x126 + goto SlateportCity_Harbor_EventScript_20CE11 + end + +SlateportCity_Harbor_EventScript_20CDFB:: @ 820CDFB + msgbox SlateportCity_Harbor_Text_20D841, 4 + release + end + +SlateportCity_Harbor_EventScript_20CE05:: @ 820CE05 + message SlateportCity_Harbor_Text_20D926 + waitmessage + goto SlateportCity_Harbor_EventScript_20CD44 + end + +SlateportCity_Harbor_EventScript_20CE11:: @ 820CE11 + setvar VAR_TEMP_1, 1 + msgbox SlateportCity_Harbor_Text_20D970, 4 + release + end + +SlateportCity_Harbor_Text_20CE20: @ 820CE20 + .string "I beg your pardon?\n" + .string "You’re looking for a ship?\p" + .string "I’m sorry, the ferry service isn’t\n" + .string "available at present…$" + +SlateportCity_Harbor_Text_20CE87: @ 820CE87 + .string "Hello, are you here for the ferry?\n" + .string "May I see your TICKET?$" + + +SlateportCity_Harbor_Text_20CEC1: @ 820CEC1 + .string "{PLAYER} doesn’t have the TICKET…\p" + .string "I’m terribly sorry.\p" + .string "You must have a TICKET to board\n" + .string "the ferry.$" + +SlateportCity_Harbor_Text_20CF1C: @ 820CF1C + .string "{PLAYER} flashed the TICKET.\p" + .string "Perfect! That’s all you need!\p" + .string "And where would you like to go?$" + +SlateportCity_Harbor_Text_20CF71: @ 820CF71 + .string "Please sail with us another time!$" + +SlateportCity_Harbor_Text_20CF93: @ 820CF93 + .string "LILYCOVE CITY it is, then!$" + +SlateportCity_Harbor_Text_20CFAE: @ 820CFAE + .string "BATTLE FRONTIER it is, then!$" + +SlateportCity_Harbor_Text_20CFCB: @ 820CFCB + .string "Please board the ferry and wait for\n" + .string "departure.$" + +SlateportCity_Harbor_Text_20CFFA: @ 820CFFA + .string "Then, where would you like to go?$" + +SlateportCity_Harbor_Text_20D01C: @ 820D01C + .string "A journey to the bottom of the sea…\n" + .string "I wonder what it’d be like?\p" + .string "I’d love to go deep underwater like\n" + .string "that someday.$" + +SlateportCity_Harbor_Text_20D08E: @ 820D08E + .string "For a ship to sail safely, we need to\n" + .string "know about the weather!\p" + .string "Speaking of weather, I heard something\n" + .string "from a guy at the WEATHER INSTITUTE.\p" + .string "He was saying abnormal weather has\n" + .string "been reported all over the place!\p" + .string "You should visit the WEATHER INSTITUTE\n" + .string "and ask around!$" + +SlateportCity_Harbor_Text_20D194: @ 820D194 + .string "I wanted to go with CAPT. STERN on\n" + .string "the ocean floor exploration.\p" + .string "But the sub’s too small for me.\p" + .string "If I squeezed in, there wouldn’t be\n" + .string "any room for the CAPTAIN…$" + +SlateportCity_Harbor_Text_20D232: @ 820D232 + .string "CAPT. STERN: Those thugs…\p" + .string "They’re the same lot who tried to rob\n" + .string "the DEVON GOODS at the MUSEUM.$" + +SlateportCity_Harbor_Text_20D291: @ 820D291 + .string "ARCHIE: Oh?\n" + .string "Not you again…\p" + .string "You are tenacious to track us here,\n" + .string "that much I will give you.\p" + .string "But now…\n" + .string "No one can stop us! No one!\p" + .string "Or, will you follow us back to our\n" + .string "HIDEOUT in LILYCOVE CITY?\p" + .string "Fwahahahaha…$" + +SlateportCity_Harbor_Text_20D35A: @ 820D35A + .string "CAPT. STERN: Why…\p" + .string "Why would TEAM AQUA steal my\n" + .string "SUBMARINE EXPLORER 1?\p" + .string "They can’t be after the slumbering\n" + .string "POKéMON at the bottom of the sea…\p" + .string "But even if I were to chase them,\n" + .string "I don’t stand a chance against them…$" + +SlateportCity_Harbor_Text_20D42B: @ 820D42B + .string "CAPT. STERN: Oh, {PLAYER}{KUN}…\p" + .string "Okay… So TEAM AQUA left before you\n" + .string "could stop them…\p" + .string "Oh, no, don’t blame yourself.\n" + .string "You’re not responsible for this.\p" + .string "Trying to catch a submarine…\n" + .string "It’s impossible for most people.\p" + .string "You would need a POKéMON that knows\n" + .string "how to DIVE…\p" + .string "Perhaps if you went out to\n" + .string "MOSSDEEP CITY…\p" + .string "A lot of divers live out there, so\n" + .string "someone might teach you…$" + +SlateportCity_Harbor_Text_20D58A: @ 820D58A + .string "CAPT. STERN: Trying to catch a\n" + .string "submarine… It’s impossible.\p" + .string "You would need a POKéMON that knows\n" + .string "how to DIVE…\p" + .string "Perhaps if you went out to\n" + .string "MOSSDEEP CITY…\p" + .string "A lot of divers live out there, so\n" + .string "someone might teach you…$" + +SlateportCity_Harbor_Text_20D65C: @ 820D65C + .string "CAPT. STERN: Oh, yes.\n" + .string "MR. BRINEY came to our SHIPYARD.\p" + .string "It won’t be long now before we finish\n" + .string "making the ferry!$" + +SlateportCity_Harbor_Text_20D6CB: @ 820D6CB + .string "CAPT. STERN: {PLAYER}{KUN}!\p" + .string "We finally finished making the ferry\n" + .string "S.S. TIDAL!\p" + .string "We couldn’t have done it without\n" + .string "your friend MR. BRINEY.\p" + .string "Please go for a short cruise on it!$" + +SlateportCity_Harbor_Text_20D76C: @ 820D76C + .string "CAPT. STERN: Oh?\n" + .string "{PLAYER}{KUN}, that item you have…\p" + .string "That’s a SCANNER! That would sure\n" + .string "help us on our explorations.\p" + .string "{PLAYER}{KUN}, would you trade your\n" + .string "SCANNER for something?\p" + .string "Like, say, a DEEPSEATOOTH or\n" + .string "a DEEPSEASCALE that I have?$" + +SlateportCity_Harbor_Text_20D841: @ 820D841 + .string "CAPT. STERN: Are you certain?\n" + .string "It’s useless to you, {PLAYER}{KUN}…\p" + .string "Well, okay, then. If you want to trade\n" + .string "your SCANNER, let me know.$" + +SlateportCity_Harbor_Text_20D8BC: @ 820D8BC + .string "CAPT. STERN: So you’ll trade it for\n" + .string "my DEEPSEATOOTH?$" + +SlateportCity_Harbor_Text_20D8F1: @ 820D8F1 + .string "CAPT. STERN: So you’ll trade it for\n" + .string "my DEEPSEASCALE?$" + +SlateportCity_Harbor_Text_20D926: @ 820D926 + .string "CAPT. STERN: Which one do you want?$" + +SlateportCity_Harbor_Text_20D94A: @ 820D94A + .string "{PLAYER} handed the SCANNER to\n" + .string "CAPT. STERN.$" + +SlateportCity_Harbor_Text_20D970: @ 820D970 + .string "CAPT. STERN: Thanks, {PLAYER}{KUN}!\n" + .string "This will help our research a lot!$" + diff --git a/data/maps/SlateportCity_House1/events.inc b/data/maps/SlateportCity_House1/events.inc new file mode 100644 index 000000000..493bb2922 --- /dev/null +++ b/data/maps/SlateportCity_House1/events.inc @@ -0,0 +1,10 @@ +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 + +SlateportCity_House1_MapWarps: @ 852F550 + 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/SlateportCity_House1/scripts.inc b/data/maps/SlateportCity_House1/scripts.inc new file mode 100644 index 000000000..8ecc859f7 --- /dev/null +++ b/data/maps/SlateportCity_House1/scripts.inc @@ -0,0 +1,121 @@ +SlateportCity_House1_MapScripts:: @ 8209AA4 + .byte 0 + +SlateportCity_House1_EventScript_209AA5:: @ 8209AA5 + lock + faceplayer + msgbox SlateportCity_House1_Text_209B8E, 5 + compare VAR_RESULT, 1 + goto_eq SlateportCity_House1_EventScript_209AC6 + compare VAR_RESULT, 0 + goto_eq SlateportCity_House1_EventScript_209AE9 + end + +SlateportCity_House1_EventScript_209AC6:: @ 8209AC6 + msgbox SlateportCity_House1_Text_209BFF, 4 + special sub_81B94B0 + waitstate + compare VAR_0x8004, 255 + goto_if 5, SlateportCity_House1_EventScript_209AF3 + compare VAR_0x8004, 255 + goto_eq SlateportCity_House1_EventScript_209AE9 + end + +SlateportCity_House1_EventScript_209AE9:: @ 8209AE9 + msgbox SlateportCity_House1_Text_209D42, 4 + release + end + +SlateportCity_House1_EventScript_209AF3:: @ 8209AF3 + specialvar VAR_RESULT, ScriptGetPartyMonSpecies + compare VAR_RESULT, 412 + goto_eq SlateportCity_House1_EventScript_209B46 + special TV_CopyNicknameToStringVar1AndEnsureTerminated + special TV_CheckMonOTIDEqualsPlayerID + compare VAR_RESULT, 1 + goto_eq SlateportCity_House1_EventScript_209B50 + specialvar VAR_RESULT, sub_8139770 + special TV_CopyNicknameToStringVar1AndEnsureTerminated + compare VAR_RESULT, 1 + goto_eq SlateportCity_House1_EventScript_209B50 + msgbox SlateportCity_House1_Text_209C2B, 5 + compare VAR_RESULT, 1 + goto_eq SlateportCity_House1_EventScript_209B5A + compare VAR_RESULT, 0 + goto_eq SlateportCity_House1_EventScript_209AE9 + end + +SlateportCity_House1_EventScript_209B46:: @ 8209B46 + msgbox SlateportCity_House1_Text_209E74, 4 + release + end + +SlateportCity_House1_EventScript_209B50:: @ 8209B50 + msgbox SlateportCity_House1_Text_209DF0, 4 + release + end + +SlateportCity_House1_EventScript_209B5A:: @ 8209B5A + msgbox SlateportCity_House1_Text_209CA4, 4 + call SlateportCity_House1_EventScript_2723DD + specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicnkameChanged + special TV_CopyNicknameToStringVar1AndEnsureTerminated + compare VAR_RESULT, 1 + goto_eq SlateportCity_House1_EventScript_209B84 + msgbox SlateportCity_House1_Text_209D5E, 4 + release + end + +SlateportCity_House1_EventScript_209B84:: @ 8209B84 + msgbox SlateportCity_House1_Text_209CD4, 4 + release + end + +SlateportCity_House1_Text_209B8E: @ 8209B8E + .string "Hi, hi! I’m the NAME RATER!\n" + .string "I’m the fortune-teller of names!\p" + .string "I shall be pleased to rate your\n" + .string "POKéMON’s nickname.$" + +SlateportCity_House1_Text_209BFF: @ 8209BFF + .string "Which POKéMON’s nickname should\n" + .string "I critique?$" + +SlateportCity_House1_Text_209C2B: @ 8209C2B + .string "Hmmm… {STR_VAR_1}, is it? That is\n" + .string "quite a fine name you bestowed.\p" + .string "But! What say you, if I were to\n" + .string "suggest a slightly better name?$" + +SlateportCity_House1_Text_209CA4: @ 8209CA4 + .string "Ah, good. Then, what shall the new\n" + .string "nickname be?$" + +SlateportCity_House1_Text_209CD4: @ 8209CD4 + .string "Done! From now on, this POKéMON\n" + .string "shall be known as {STR_VAR_1}!\p" + .string "It is a better name than before!\n" + .string "How fortunate for you!$" + +SlateportCity_House1_Text_209D42: @ 8209D42 + .string "I see.\n" + .string "Do come visit again.$" + +SlateportCity_House1_Text_209D5E: @ 8209D5E + .string "Done! From now on, this POKéMON\n" + .string "shall be known as {STR_VAR_1}!\p" + .string "It looks no different from before,\n" + .string "and yet, this is vastly superior!\p" + .string "How fortunate for you!$" + +SlateportCity_House1_Text_209DF0: @ 8209DF0 + .string "Hmmm… {STR_VAR_1} it is!\p" + .string "This is a magnificent nickname!\n" + .string "It is impeccably beyond reproach!\p" + .string "You’ll do well to cherish your\n" + .string "{STR_VAR_1} now and beyond.$" + +SlateportCity_House1_Text_209E74: @ 8209E74 + .string "Now, now.\n" + .string "That is merely an EGG!$" + diff --git a/data/maps/SlateportCity_House2/events.inc b/data/maps/SlateportCity_House2/events.inc new file mode 100644 index 000000000..42d0e3660 --- /dev/null +++ b/data/maps/SlateportCity_House2/events.inc @@ -0,0 +1,11 @@ +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 + +SlateportCity_House2_MapWarps: @ 852FBCC + 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/SlateportCity_House2/scripts.inc b/data/maps/SlateportCity_House2/scripts.inc new file mode 100644 index 000000000..28a05ed38 --- /dev/null +++ b/data/maps/SlateportCity_House2/scripts.inc @@ -0,0 +1,23 @@ +SlateportCity_House2_MapScripts:: @ 820D9AE + .byte 0 + +SlateportCity_House2_EventScript_20D9AF:: @ 820D9AF + msgbox SlateportCity_House2_Text_20D9C1, 2 + end + +SlateportCity_House2_EventScript_20D9B8:: @ 820D9B8 + msgbox SlateportCity_House2_Text_20DA59, 2 + end + +SlateportCity_House2_Text_20D9C1: @ 820D9C1 + .string "My POKéMON has a HASTY nature.\p" + .string "It has higher SPEED compared to\n" + .string "my other POKéMON.\p" + .string "Maybe their nature has something to\n" + .string "do with the stat gains of POKéMON.$" + +SlateportCity_House2_Text_20DA59: @ 820DA59 + .string "You’re a TRAINER, aren’t you?\p" + .string "Since you came to SLATEPORT CITY,\n" + .string "you must be going to the BATTLE TENT.$" + diff --git a/data/maps/SlateportCity_Mart/events.inc b/data/maps/SlateportCity_Mart/events.inc new file mode 100644 index 000000000..d6391598e --- /dev/null +++ b/data/maps/SlateportCity_Mart/events.inc @@ -0,0 +1,12 @@ +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 + +SlateportCity_Mart_MapWarps: @ 852FD38 + 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/SlateportCity_Mart/scripts.inc b/data/maps/SlateportCity_Mart/scripts.inc new file mode 100644 index 000000000..da217f809 --- /dev/null +++ b/data/maps/SlateportCity_Mart/scripts.inc @@ -0,0 +1,47 @@ +SlateportCity_Mart_MapScripts:: @ 820DC48 + .byte 0 + +SlateportCity_Mart_EventScript_20DC49:: @ 820DC49 + lock + faceplayer + message gUnknown_08272A21 + waitmessage + pokemart SlateportCity_Mart_Pokemart_20DC60 + msgbox gUnknown_08272A3F, 4 + release + end + +SlateportCity_Mart_Pokemart_20DC60: @ 820DC60 + .2byte ITEM_POKE_BALL + .2byte ITEM_GREAT_BALL + .2byte ITEM_POTION + .2byte ITEM_SUPER_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_REPEL + .2byte ITEM_HARBOR_MAIL + .2byte ITEM_NONE + release + end + +SlateportCity_Mart_EventScript_20DC76:: @ 820DC76 + msgbox SlateportCity_Mart_Text_20DC88, 2 + end + +SlateportCity_Mart_EventScript_20DC7F:: @ 820DC7F + msgbox SlateportCity_Mart_Text_20DCF8, 2 + end + +SlateportCity_Mart_Text_20DC88: @ 820DC88 + .string "The MARKET does have some interesting\n" + .string "merchandise.\p" + .string "But there are some items you can only\n" + .string "get at a POKéMON MART.$" + +SlateportCity_Mart_Text_20DCF8: @ 820DCF8 + .string "A GREAT BALL is better than a POKé BALL\n" + .string "at catching POKéMON.\p" + .string "With this, I should be able to get that\n" + .string "elusive POKéMON…$" + diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc new file mode 100644 index 000000000..cfe385a3c --- /dev/null +++ b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc @@ -0,0 +1,43 @@ +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 + +SlateportCity_OceanicMuseum_1F_MapWarps: @ 852F7C0 + 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 + coord_event 10, 7, 3, 0, VAR_0x40AA, 0, 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 + +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_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc new file mode 100644 index 000000000..4464ee582 --- /dev/null +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -0,0 +1,395 @@ +SlateportCity_OceanicMuseum_1F_MapScripts:: @ 820AD95 + .byte 0 + +SlateportCity_OceanicMuseum_1F_EventScript_20AD96:: @ 820AD96 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, 2 + end + +SlateportCity_OceanicMuseum_1F_EventScript_20AD9F:: @ 820AD9F + lockall + applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_2725A4 + waitmovement 0 + goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1 + end + +SlateportCity_OceanicMuseum_1F_EventScript_20ADB0:: @ 820ADB0 + lockall + applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_2725A8 + waitmovement 0 + goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1 + end + +SlateportCity_OceanicMuseum_1F_EventScript_20ADC1:: @ 820ADC1 + showmoneybox 0, 0, 0 + msgbox SlateportCity_OceanicMuseum_1F_Text_20AFD5, 5 + compare VAR_RESULT, 1 + goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20ADE8 + closemessage + hidemoneybox + nop + nop + applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_20AE4B + waitmovement 0 + releaseall + end + +SlateportCity_OceanicMuseum_1F_EventScript_20ADE8:: @ 820ADE8 + checkmoney 0x32, 0 + compare VAR_RESULT, 0 + goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AE18 + playse SE_REGI + takemoney 0x32, 0 + updatemoneybox 0, 0 + nop + msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, 4 + setvar VAR_0x40AA, 1 + hidemoneybox + nop + nop + releaseall + end + +SlateportCity_OceanicMuseum_1F_EventScript_20AE18:: @ 820AE18 + checkflag FLAG_0x095 + goto_if 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE39 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B03D, 4 + closemessage + hidemoneybox + nop + nop + applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_20AE4B + waitmovement 0 + releaseall + end + +SlateportCity_OceanicMuseum_1F_EventScript_20AE39:: @ 820AE39 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B075, 4 + setvar VAR_0x40AA, 1 + hidemoneybox + nop + nop + releaseall + end + +SlateportCity_OceanicMuseum_1F_Movement_20AE4B: @ 820AE4B + walk_down + step_end + +SlateportCity_OceanicMuseum_1F_EventScript_20AE4D:: @ 820AE4D + msgbox SlateportCity_OceanicMuseum_1F_Text_20B0E8, 2 + end + +SlateportCity_OceanicMuseum_1F_EventScript_20AE56:: @ 820AE56 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B112, 2 + end + +SlateportCity_OceanicMuseum_1F_EventScript_20AE5F:: @ 820AE5F + msgbox SlateportCity_OceanicMuseum_1F_Text_20B165, 2 + end + +SlateportCity_OceanicMuseum_1F_EventScript_20AE68:: @ 820AE68 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B19C, 3 + end + +SlateportCity_OceanicMuseum_1F_EventScript_20AE71:: @ 820AE71 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B1D4, 2 + end + +SlateportCity_OceanicMuseum_1F_EventScript_20AE7A:: @ 820AE7A + msgbox SlateportCity_OceanicMuseum_1F_Text_20B218, 2 + end + +SlateportCity_OceanicMuseum_1F_EventScript_20AE83:: @ 820AE83 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B4CF, 3 + end + +SlateportCity_OceanicMuseum_1F_EventScript_20AE8C:: @ 820AE8C + msgbox SlateportCity_OceanicMuseum_1F_Text_20B547, 3 + end + +SlateportCity_OceanicMuseum_1F_EventScript_20AE95:: @ 820AE95 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B5CA, 3 + end + +SlateportCity_OceanicMuseum_1F_EventScript_20AE9E:: @ 820AE9E + msgbox SlateportCity_OceanicMuseum_1F_Text_20B699, 3 + end + +SlateportCity_OceanicMuseum_1F_EventScript_20AEA7:: @ 820AEA7 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B74B, 3 + end + +SlateportCity_OceanicMuseum_1F_EventScript_20AEB0:: @ 820AEB0 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B81F, 3 + end + +SlateportCity_OceanicMuseum_1F_EventScript_20AEB9:: @ 820AEB9 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B912, 3 + end + +SlateportCity_OceanicMuseum_1F_EventScript_20AEC2:: @ 820AEC2 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B9C0, 3 + end + +SlateportCity_OceanicMuseum_1F_EventScript_20AECB:: @ 820AECB + msgbox SlateportCity_OceanicMuseum_1F_Text_20BA9C, 3 + end + +SlateportCity_OceanicMuseum_1F_EventScript_20AED4:: @ 820AED4 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B25F, 2 + end + +SlateportCity_OceanicMuseum_1F_EventScript_20AEDD:: @ 820AEDD + msgbox SlateportCity_OceanicMuseum_1F_Text_20B2A2, 2 + end + +SlateportCity_OceanicMuseum_1F_EventScript_20AEE6:: @ 820AEE6 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B302, 2 + end + +SlateportCity_OceanicMuseum_1F_EventScript_20AEEF:: @ 820AEEF + msgbox SlateportCity_OceanicMuseum_1F_Text_20B369, 2 + end + +SlateportCity_OceanicMuseum_1F_EventScript_20AEF8:: @ 820AEF8 + lock + faceplayer + delay 8 + playse SE_PIN + applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_272598 + waitmovement 0 + applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_27259A + waitmovement 0 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B3AB, 4 + giveitem_std ITEM_TM46 + compare VAR_RESULT, 0 + goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AFB5 + setflag FLAG_0x10D + msgbox SlateportCity_OceanicMuseum_1F_Text_20B449, 4 + closemessage + compare VAR_FACING, 2 + goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF6C + compare VAR_FACING, 1 + goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF83 + compare VAR_FACING, 3 + goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93 + compare VAR_FACING, 4 + goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93 + end + +SlateportCity_OceanicMuseum_1F_EventScript_20AF6C:: @ 820AF6C + applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_20AFBF + applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_20AFCE + waitmovement 0 + goto SlateportCity_OceanicMuseum_1F_EventScript_20AFAA + end + +SlateportCity_OceanicMuseum_1F_EventScript_20AF83:: @ 820AF83 + applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_20AFC7 + waitmovement 0 + goto SlateportCity_OceanicMuseum_1F_EventScript_20AFAA + end + +SlateportCity_OceanicMuseum_1F_EventScript_20AF93:: @ 820AF93 + applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_20AFC4 + applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_20AFC7 + waitmovement 0 + goto SlateportCity_OceanicMuseum_1F_EventScript_20AFAA + end + +SlateportCity_OceanicMuseum_1F_EventScript_20AFAA:: @ 820AFAA + setflag FLAG_0x3C5 + playse SE_KAIDAN + removeobject 13 + release + end + +SlateportCity_OceanicMuseum_1F_EventScript_20AFB5:: @ 820AFB5 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B49B, 4 + release + end + +SlateportCity_OceanicMuseum_1F_Movement_20AFBF: @ 820AFBF + delay_16 + delay_8 + delay_4 + walk_in_place_fastest_down + step_end + +SlateportCity_OceanicMuseum_1F_Movement_20AFC4: @ 820AFC4 + delay_16 + walk_in_place_fastest_down + step_end + +SlateportCity_OceanicMuseum_1F_Movement_20AFC7: @ 820AFC7 + face_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + delay_8 + step_end + +SlateportCity_OceanicMuseum_1F_Movement_20AFCE: @ 820AFCE + 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 + .string "Welcome to the OCEANIC MUSEUM.\p" + .string "The entrance fee is Â¥50.\n" + .string "Would you like to enter?$" + +SlateportCity_OceanicMuseum_1F_Text_20B026: @ 820B026 + .string "Please enjoy yourself.$" + +SlateportCity_OceanicMuseum_1F_Text_20B03D: @ 820B03D + .string "Oh? I’m sorry, but you don’t seem to\n" + .string "have enough money.$" + +SlateportCity_OceanicMuseum_1F_Text_20B075: @ 820B075 + .string "Oh? You’re with that group that\n" + .string "went in earlier?\p" + .string "You’re the only one who’s late.\n" + .string "You’d better go catch up to them!$" + +SlateportCity_OceanicMuseum_1F_Text_20B0E8: @ 820B0E8 + .string "We, TEAM AQUA, exist for the good\n" + .string "of all!$" + +SlateportCity_OceanicMuseum_1F_Text_20B112: @ 820B112 + .string "We were told to assemble here,\n" + .string "so we did, but…\p" + .string "Our BOSS, the linchpin, isn’t here.$" + +SlateportCity_OceanicMuseum_1F_Text_20B165: @ 820B165 + .string "If I ripped off the stuff here,\n" + .string "would it make me rich?$" + +SlateportCity_OceanicMuseum_1F_Text_20B19C: @ 820B19C + .string "What I learn here, I can put to use on\n" + .string "nefarious deeds…$" + +SlateportCity_OceanicMuseum_1F_Text_20B1D4: @ 820B1D4 + .string "If our goons didn’t bungle things\n" + .string "in RUSTBORO, we wouldn’t be here!$" + +SlateportCity_OceanicMuseum_1F_Text_20B218: @ 820B218 + .string "I didn’t have Â¥50, so it took a long\n" + .string "time getting by the receptionist.$" + +SlateportCity_OceanicMuseum_1F_Text_20B25F: @ 820B25F + .string "I want to learn about the sea and\n" + .string "use that knowledge for battling.$" + +SlateportCity_OceanicMuseum_1F_Text_20B2A2: @ 820B2A2 + .string "I get all giddy and gooey when\n" + .string "I see the sea!\p" + .string "For me, CAPT. STERN is the number\n" + .string "one role model!$" + +SlateportCity_OceanicMuseum_1F_Text_20B302: @ 820B302 + .string "The sea is vast without end, and\n" + .string "infinitely deep…\p" + .string "There must be many POKéMON that\n" + .string "we don’t know about.$" + +SlateportCity_OceanicMuseum_1F_Text_20B369: @ 820B369 + .string "I want a sea POKéMON.\p" + .string "I think it would feel cool and nice\n" + .string "to hug.$" + +SlateportCity_OceanicMuseum_1F_Text_20B3AB: @ 820B3AB + .string "Aiyeeeh!\n" + .string "What are you doing here?\p" + .string "Me? I’m the TEAM AQUA member\n" + .string "you thumped before, remember?\l" + .string "Back in RUSTURF TUNNEL?\p" + .string "Here, take this!\n" + .string "You have to forgive me!$" + +SlateportCity_OceanicMuseum_1F_Text_20B449: @ 820B449 + .string "That TM, it suits you more than it\n" + .string "does me.\p" + .string "Hope I never see you again!\n" + .string "Wahahaha!$" + +SlateportCity_OceanicMuseum_1F_Text_20B49B: @ 820B49B + .string "Awww, come on!\n" + .string "You have to take this and let me go!$" + +SlateportCity_OceanicMuseum_1F_Text_20B4CF: @ 820B4CF + .string "A blue fluid is spiraling inside\n" + .string "a glass vessel.\p" + .string "“This is an experiment to create a\n" + .string "WHIRLPOOL artificially using wind.â€$" + +SlateportCity_OceanicMuseum_1F_Text_20B547: @ 820B547 + .string "A red ball is bobbing up and down\n" + .string "inside a glass vessel.\p" + .string "“This is an experiment simulating a\n" + .string "WATERFALL using the ball’s buoyancy.â€$" + +SlateportCity_OceanicMuseum_1F_Text_20B5CA: @ 820B5CA + .string "It’s a sample of soil from the ocean\n" + .string "floor.\p" + .string "“Over many years, the remains of\n" + .string "life-forms settle at the bottom of\l" + .string "the sea, making sedimentary layers.\p" + .string "“By analyzing these layers, the\n" + .string "ancient past is revealed.â€$" + +SlateportCity_OceanicMuseum_1F_Text_20B699: @ 820B699 + .string "It’s a sample of beach sand.\p" + .string "“Stones from mountains are washed\n" + .string "down by rivers where they are\l" + .string "chipped and ground down.\p" + .string "“They are reduced to grains and end\n" + .string "up as sand on beaches.â€$" + +SlateportCity_OceanicMuseum_1F_Text_20B74B: @ 820B74B + .string "“OCEANIC MINIFACT 1\n" + .string "Why is seawater blue?\p" + .string "“Light is composed of many colors.\p" + .string "“When light passes through water,\n" + .string "most kinds of light lose color.\p" + .string "“However, blue light retains its\n" + .string "color, making the sea appear blue.â€$" + +SlateportCity_OceanicMuseum_1F_Text_20B81F: @ 820B81F + .string "“OCEANIC MINIFACT 2\n" + .string "Why is the sea salty?\p" + .string "“Seawater contains dissolved salt in\n" + .string "the form of sodium and chlorine ions.\p" + .string "“These ions leech out of rocks\n" + .string "and are carried out to sea by rain.\p" + .string "“The concentration of dissolved salt\n" + .string "makes the sea salty.â€$" + +SlateportCity_OceanicMuseum_1F_Text_20B912: @ 820B912 + .string "“OCEANIC MINIFACT 3\n" + .string "Which is bigger? The sea or land?\p" + .string "“The sea covers about 70% of\n" + .string "the planet, and the rest is land.\p" + .string "“The sea is therefore more than twice\n" + .string "the size of land.â€$" + +SlateportCity_OceanicMuseum_1F_Text_20B9C0: @ 820B9C0 + .string "It’s a fossil with wavy ridges on it.\p" + .string "“Soil on the ocean floor gets scoured\n" + .string "by the tide.\p" + .string "“The flowing seawater marks the soil\n" + .string "with small ridges and valleys.\p" + .string "“If this soil becomes fossilized, it is\n" + .string "called a ripple mark.â€$" + +SlateportCity_OceanicMuseum_1F_Text_20BA9C: @ 820BA9C + .string "A strange machine is rotating under\n" + .string "a glass dome.\p" + .string "Maybe it’s for measuring the depth\n" + .string "of something…$" + diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc new file mode 100644 index 000000000..dc0c8a8d9 --- /dev/null +++ b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc @@ -0,0 +1,38 @@ +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 + +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 + +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/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc new file mode 100644 index 000000000..4172c47ef --- /dev/null +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -0,0 +1,441 @@ +SlateportCity_OceanicMuseum_2F_MapScripts:: @ 820BAFF + .byte 0 + +SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 + lock + faceplayer + msgbox SlateportCity_OceanicMuseum_2F_Text_20BD8D, 4 + closemessage + playbgm MUS_AQA_0, 1 + addobject 3 + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE4 + waitmovement 0 + addobject 4 + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCF3 + waitmovement 0 + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE8 + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCF5 + waitmovement 0 + compare VAR_FACING, 1 + call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC92 + compare VAR_FACING, 4 + call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC92 + msgbox SlateportCity_OceanicMuseum_2F_Text_20BE40, 4 + compare VAR_FACING, 4 + call_if 5, SlateportCity_OceanicMuseum_2F_EventScript_20BC9D + msgbox SlateportCity_OceanicMuseum_2F_Text_20BE69, 4 + msgbox SlateportCity_OceanicMuseum_2F_Text_20BE93, 4 + closemessage + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCE2 + waitmovement 0 + compare VAR_FACING, 1 + call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BCA8 + compare VAR_FACING, 3 + call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BCB3 + trainerbattle 3, TRAINER_GRUNT_14, 0, SlateportCity_OceanicMuseum_2F_Text_20BEE2 + msgbox SlateportCity_OceanicMuseum_2F_Text_20BEFA, 4 + closemessage + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCEF + waitmovement 0 + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE2 + waitmovement 0 + msgbox SlateportCity_OceanicMuseum_2F_Text_20BF35, 4 + trainerbattle 3, TRAINER_GRUNT_15, 0, SlateportCity_OceanicMuseum_2F_Text_20BF66 + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCEF + waitmovement 0 + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_2725AA + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_2725A6 + waitmovement 0 + msgbox SlateportCity_OceanicMuseum_2F_Text_20BF7A, 4 + closemessage + delay 35 + addobject 2 + applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_20BCD8 + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCFE + waitmovement 0 + msgbox SlateportCity_OceanicMuseum_2F_Text_20BFF2, 4 + closemessage + applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_20BCD6 + waitmovement 0 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C059, 4 + closemessage + savebgm MUS_DUMMY + fadedefaultbgm + fadescreen 1 + removeobject 2 + removeobject 3 + removeobject 4 + fadescreen 0 + delay 30 + setflag FLAG_0x373 + applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_2725A8 + waitmovement 0 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C2BE, 4 + setvar VAR_0x8004, 269 + call SlateportCity_OceanicMuseum_2F_EventScript_2723E4 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C36C, 4 + closemessage + fadescreen 1 + playfanfare MUS_ME_ASA + waitfanfare + special HealPlayerParty + removeobject 1 + setflag FLAG_0x384 + compare VAR_0x40DA, 0 + call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC8C + setflag FLAG_0x095 + clearflag FLAG_0x3B3 + setflag FLAG_0x3B5 + setvar VAR_0x40D2, 1 + fadescreen 0 + release + end + +SlateportCity_OceanicMuseum_2F_EventScript_20BC8C:: @ 820BC8C + setvar VAR_0x40DA, 1 + return + +SlateportCity_OceanicMuseum_2F_EventScript_20BC92:: @ 820BC92 + applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_2725A4 + waitmovement 0 + return + +SlateportCity_OceanicMuseum_2F_EventScript_20BC9D:: @ 820BC9D + applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_2725A4 + waitmovement 0 + return + +SlateportCity_OceanicMuseum_2F_EventScript_20BCA8:: @ 820BCA8 + applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_20BCBE + waitmovement 0 + return + +SlateportCity_OceanicMuseum_2F_EventScript_20BCB3:: @ 820BCB3 + applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_20BCC2 + waitmovement 0 + return + +SlateportCity_OceanicMuseum_2F_Movement_20BCBE: @ 820BCBE + walk_left + walk_down + walk_in_place_fastest_left + step_end + +SlateportCity_OceanicMuseum_2F_Movement_20BCC2: @ 820BCC2 + walk_up + walk_left + walk_left + walk_down + walk_in_place_fastest_left + step_end + +SlateportCity_OceanicMuseum_2F_Movement_20BCC8: @ 820BCC8 + 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 + walk_right + step_end + +SlateportCity_OceanicMuseum_2F_Movement_20BCD8: @ 820BCD8 + 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 + walk_right + step_end + +SlateportCity_OceanicMuseum_2F_Movement_20BCE4: @ 820BCE4 + walk_down + walk_right + walk_in_place_fastest_down + step_end + +SlateportCity_OceanicMuseum_2F_Movement_20BCE8: @ 820BCE8 + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + step_end + +SlateportCity_OceanicMuseum_2F_Movement_20BCEF: @ 820BCEF + lock_facing_direction + walk_left + unlock_facing_direction + step_end + +SlateportCity_OceanicMuseum_2F_Movement_20BCF3: @ 820BCF3 + walk_down + step_end + +SlateportCity_OceanicMuseum_2F_Movement_20BCF5: @ 820BCF5 + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + step_end + +SlateportCity_OceanicMuseum_2F_Movement_20BCFE: @ 820BCFE + 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 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C4F9, 3 + end + +SlateportCity_OceanicMuseum_2F_EventScript_20BD13:: @ 820BD13 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C566, 3 + end + +SlateportCity_OceanicMuseum_2F_EventScript_20BD1C:: @ 820BD1C + msgbox SlateportCity_OceanicMuseum_2F_Text_20C5C6, 3 + end + +SlateportCity_OceanicMuseum_2F_EventScript_20BD25:: @ 820BD25 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C6C7, 3 + end + +SlateportCity_OceanicMuseum_2F_EventScript_20BD2E:: @ 820BD2E + msgbox SlateportCity_OceanicMuseum_2F_Text_20C72F, 3 + end + +SlateportCity_OceanicMuseum_2F_EventScript_20BD37:: @ 820BD37 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C7C1, 3 + end + +SlateportCity_OceanicMuseum_2F_EventScript_20BD40:: @ 820BD40 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C82F, 3 + end + +SlateportCity_OceanicMuseum_2F_EventScript_20BD49:: @ 820BD49 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C88B, 3 + end + +SlateportCity_OceanicMuseum_2F_EventScript_20BD52:: @ 820BD52 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C8E8, 3 + end + +SlateportCity_OceanicMuseum_2F_EventScript_20BD5B:: @ 820BD5B + msgbox SlateportCity_OceanicMuseum_2F_Text_20C93A, 3 + end + +SlateportCity_OceanicMuseum_2F_EventScript_20BD64:: @ 820BD64 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C43F, 2 + end + +SlateportCity_OceanicMuseum_2F_EventScript_20BD6D:: @ 820BD6D + msgbox SlateportCity_OceanicMuseum_2F_Text_20C495, 2 + end + +SlateportCity_OceanicMuseum_2F_EventScript_20BD76:: @ 820BD76 + lock + faceplayer + msgbox SlateportCity_OceanicMuseum_2F_Text_20C4C2, 4 + closemessage + applymovement VAR_LAST_TALKED, SlateportCity_OceanicMuseum_2F_Movement_2725A2 + waitmovement 0 + release + end + +SlateportCity_OceanicMuseum_2F_Text_20BD8D: @ 820BD8D + .string "Yes? If you’re looking for STERN,\n" + .string "that would be me.\p" + .string "Ah! Those must be the parts I ordered\n" + .string "from MR. STONE of DEVON.\p" + .string "Thank you! That’s great!\n" + .string "We can prepare for our expedition now.$" + +SlateportCity_OceanicMuseum_2F_Text_20BE40: @ 820BE40 + .string "Hehehe, hold it!\n" + .string "We’ll take those parts!$" + +SlateportCity_OceanicMuseum_2F_Text_20BE69: @ 820BE69 + .string "CAPT. STERN: Wh-what?\n" + .string "Who are you people?$" + +SlateportCity_OceanicMuseum_2F_Text_20BE93: @ 820BE93 + .string "We’re TEAM AQUA!\p" + .string "Our BOSS wants those parts!\n" + .string "Shut your yap and fork them over!$" + +SlateportCity_OceanicMuseum_2F_Text_20BEE2: @ 820BEE2 + .string "Awaaaah!\n" + .string "A kid beat me!$" + +SlateportCity_OceanicMuseum_2F_Text_20BEFA: @ 820BEFA + .string "Oh, man, what a disaster…\n" + .string "The BOSS is going to be furious…$" + +SlateportCity_OceanicMuseum_2F_Text_20BF35: @ 820BF35 + .string "Humph, sniveling wimp!\n" + .string "Let me take care of this!$" + +SlateportCity_OceanicMuseum_2F_Text_20BF66: @ 820BF66 + .string "What?!\n" + .string "I lost, too!$" + +SlateportCity_OceanicMuseum_2F_Text_20BF7A: @ 820BF7A + .string "Now what? If we don’t get the parts,\n" + .string "we’re in for it!\p" + .string "Arrgh, I didn’t count on being meddled\n" + .string "with by some meddling kid!$" + +SlateportCity_OceanicMuseum_2F_Text_20BFF2: @ 820BFF2 + .string "I came to see what was taking so\n" + .string "long to snatch some parts, and you\l" + .string "simps are held up by a mere child?$" + +SlateportCity_OceanicMuseum_2F_Text_20C059: @ 820C059 + .string "We are TEAM AQUA,\n" + .string "and we love the sea!\p" + .string "And I am TEAM AQUA’s leader,\n" + .string "ARCHIE!\p" + .string "What makes you interfere with us?\p" + .string "…No! You can’t be!\n" + .string "You’re not one of TEAM MAGMA?\p" + .string "Wait, that can’t be right.\n" + .string "You’re not dressed for the part.\p" + .string "… … … … … …\n" + .string "… … … … … …\p" + .string "POKéMON, people… All life depends on\n" + .string "the sea.\p" + .string "So, TEAM AQUA is dedicated to\n" + .string "the expansion of the sea.\p" + .string "Don’t you agree? What we are doing\n" + .string "is a magnificent undertaking.\p" + .string "Ah, fine…\n" + .string "You’re still too young to understand\l" + .string "our noble objective.\p" + .string "But, I warn you, don’t even consider\n" + .string "interfering with our plans again.\p" + .string "The consequences will cost you\n" + .string "dearly!\p" + .string "And don’t you forget it!$" + +SlateportCity_OceanicMuseum_2F_Text_20C2BE: @ 820C2BE + .string "CAPT. STERN: You’re…\n" + .string "Ah, okay, you’re {PLAYER}{KUN}…\p" + .string "Anyway, that was a tense situation!\n" + .string "Thank you for saving us!\p" + .string "Oh, yes, I almost forgot that you\n" + .string "even brought the parts from DEVON!$" + +SlateportCity_OceanicMuseum_2F_Text_20C36C: @ 820C36C + .string "CAPT. STERN: Whoops!\n" + .string "There’s no time to lose!\p" + .string "We have to set out on our ocean-floor\n" + .string "expedition really soon.\p" + .string "Thanks again, but now I’ve got\n" + .string "to go!\p" + .string "Feel free to wander around and check\n" + .string "out our facilities, though.$" + +SlateportCity_OceanicMuseum_2F_Text_20C43F: @ 820C43F + .string "I saw a model of a ship here.\p" + .string "It reminded me of the ABANDONED SHIP\n" + .string "near DEWFORD TOWN…$" + +SlateportCity_OceanicMuseum_2F_Text_20C495: @ 820C495 + .string "Don’t you dare run around inside\n" + .string "the MUSEUM!$" + +SlateportCity_OceanicMuseum_2F_Text_20C4C2: @ 820C4C2 + .string "Wow, the submarine’s awesome!\n" + .string "I want to go for a ride!$" + +SlateportCity_OceanicMuseum_2F_Text_20C4F9: @ 820C4F9 + .string "“WATER QUALITY SAMPLE 1,†the\n" + .string "label says.\p" + .string "The sea is all connected, but the\n" + .string "water seems to differ by region.$" + +SlateportCity_OceanicMuseum_2F_Text_20C566: @ 820C566 + .string "“WATER QUALITY SAMPLE 2,†the\n" + .string "label says.\p" + .string "Does the saltiness of seawater differ\n" + .string "by region, too?$" + +SlateportCity_OceanicMuseum_2F_Text_20C5C6: @ 820C5C6 + .string "A rubber ball is expanding and\n" + .string "shrinking.\p" + .string "“In the sea, the weight of water itself\n" + .string "exerts pressure.\p" + .string "“In shallow water, the pressure is not\n" + .string "very heavy.\p" + .string "“However, in extremely deep water,\n" + .string "the pressure can reach even tens of\l" + .string "thousands of tons on a small area.â€$" + +SlateportCity_OceanicMuseum_2F_Text_20C6C7: @ 820C6C7 + .string "“MODEL OF HOENN REGIONâ€\p" + .string "It’s a miniature diorama of the\n" + .string "HOENN region.\p" + .string "Where is LITTLEROOT TOWN on this?$" + +SlateportCity_OceanicMuseum_2F_Text_20C72F: @ 820C72F + .string "It’s a display on the flow of seawater.\p" + .string "“Near the bottom of the sea, water\n" + .string "flows due to differences in such\l" + .string "factors as temperature and salinity.â€$" + +SlateportCity_OceanicMuseum_2F_Text_20C7C1: @ 820C7C1 + .string "It’s a display on the flow of seawater.\p" + .string "“Toward the surface, seawater flows\n" + .string "as currents driven by the winds.â€$" + +SlateportCity_OceanicMuseum_2F_Text_20C82F: @ 820C82F + .string "“THE FERRY S.S. TIDAL\p" + .string "“A scale replica of the ship under\n" + .string "construction at STERN’S SHIPYARD.â€$" + +SlateportCity_OceanicMuseum_2F_Text_20C88B: @ 820C88B + .string "“SUBMARINE EXPLORER 1\p" + .string "“A replica of the high-performance\n" + .string "ocean floor exploration submarine.â€$" + +SlateportCity_OceanicMuseum_2F_Text_20C8E8: @ 820C8E8 + .string "“SUBMERSIBLE POD\p" + .string "“A replica of a compact, unmanned\n" + .string "pod for seafloor exploration.â€$" + +SlateportCity_OceanicMuseum_2F_Text_20C93A: @ 820C93A + .string "“S.S. ANNE\p" + .string "“A replica of the luxury liner that\n" + .string "circles the globe.â€$" + diff --git a/data/maps/SlateportCity_PokemonCenter_1F/events.inc b/data/maps/SlateportCity_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..f59413aba --- /dev/null +++ b/data/maps/SlateportCity_PokemonCenter_1F/events.inc @@ -0,0 +1,13 @@ +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 + +SlateportCity_PokemonCenter_1F_MapWarps: @ 852FC38 + 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/SlateportCity_PokemonCenter_1F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..404804c57 --- /dev/null +++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc @@ -0,0 +1,40 @@ +SlateportCity_PokemonCenter_1F_MapScripts:: @ 820DABF + map_script 3, SlateportCity_PokemonCenter_1F_MapScript1_20DACA + map_script 5, SlateportCity_PokemonCenter_1F_MapScript1_277C30 + .byte 0 + +SlateportCity_PokemonCenter_1F_MapScript1_20DACA: @ 820DACA + setrespawn 4 + call SlateportCity_PokemonCenter_1F_EventScript_2718DE + end + +SlateportCity_PokemonCenter_1F_EventScript_20DAD3:: @ 820DAD3 + setvar VAR_0x800B, 1 + call SlateportCity_PokemonCenter_1F_EventScript_27191E + waitmessage + waitbuttonpress + release + end + +SlateportCity_PokemonCenter_1F_EventScript_20DAE1:: @ 820DAE1 + msgbox SlateportCity_PokemonCenter_1F_Text_20DAF3, 2 + end + +SlateportCity_PokemonCenter_1F_EventScript_20DAEA:: @ 820DAEA + msgbox SlateportCity_PokemonCenter_1F_Text_20DBBC, 2 + end + +SlateportCity_PokemonCenter_1F_Text_20DAF3: @ 820DAF3 + .string "Want a tip for battling?\p" + .string "I’d say it’s raising different kinds\n" + .string "of POKéMON in a balanced manner.\p" + .string "It’s no good to make just one\n" + .string "POKéMON strong.\p" + .string "If it has a type disadvantage,\n" + .string "it might not stand a chance.$" + +SlateportCity_PokemonCenter_1F_Text_20DBBC: @ 820DBBC + .string "I trade POKéMON with my friends.\p" + .string "If a traded POKéMON is holding an\n" + .string "item, it makes me twice as happy!$" + diff --git a/data/maps/SlateportCity_PokemonCenter_2F/events.inc b/data/maps/SlateportCity_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..f59512311 --- /dev/null +++ b/data/maps/SlateportCity_PokemonCenter_2F/events.inc @@ -0,0 +1,14 @@ +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 + +SlateportCity_PokemonCenter_2F_MapWarps: @ 852FCC4 + 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/SlateportCity_PokemonCenter_2F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..3138f20d6 --- /dev/null +++ b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc @@ -0,0 +1,19 @@ +SlateportCity_PokemonCenter_2F_MapScripts:: @ 820DC21 + map_script 2, SlateportCity_PokemonCenter_2F_MapScript2_276C3B + map_script 4, SlateportCity_PokemonCenter_2F_MapScript2_276B6C + map_script 1, SlateportCity_PokemonCenter_2F_MapScript1_276BBE + map_script 3, SlateportCity_PokemonCenter_2F_MapScript1_276ACF + .byte 0 + +SlateportCity_PokemonCenter_2F_EventScript_20DC36:: @ 820DC36 + call OldaleTown_PokemonCenter_2F_EventScript_276EB7 + end + +SlateportCity_PokemonCenter_2F_EventScript_20DC3C:: @ 820DC3C + call OldaleTown_PokemonCenter_2F_EventScript_2770B2 + end + +SlateportCity_PokemonCenter_2F_EventScript_20DC42:: @ 820DC42 + call OldaleTown_PokemonCenter_2F_EventScript_2771DB + end + diff --git a/data/maps/SlateportCity_PokemonFanClub/events.inc b/data/maps/SlateportCity_PokemonFanClub/events.inc new file mode 100644 index 000000000..92974f5b4 --- /dev/null +++ b/data/maps/SlateportCity_PokemonFanClub/events.inc @@ -0,0 +1,18 @@ +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 + +SlateportCity_PokemonFanClub_MapWarps: @ 852F64C + 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/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc new file mode 100644 index 000000000..307f42af5 --- /dev/null +++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc @@ -0,0 +1,428 @@ +SlateportCity_PokemonFanClub_MapScripts:: @ 8209E95 + .byte 0 + +SlateportCity_PokemonFanClub_EventScript_209E96:: @ 8209E96 + lock + faceplayer + checkflag FLAG_0x155 + goto_if 0, SlateportCity_PokemonFanClub_EventScript_20A152 + checkflag FLAG_0x156 + call_if 0, SlateportCity_PokemonFanClub_EventScript_20A172 + switch VAR_0x40B7 + case 0, SlateportCity_PokemonFanClub_EventScript_209ED2 + case 1, SlateportCity_PokemonFanClub_EventScript_209EE5 + case 2, SlateportCity_PokemonFanClub_EventScript_209F3B + release + end + +SlateportCity_PokemonFanClub_EventScript_209ED2:: @ 8209ED2 + setvar VAR_0x40B7, 1 + msgbox SlateportCity_PokemonFanClub_Text_20A445, 4 + goto SlateportCity_PokemonFanClub_EventScript_209F45 + end + +SlateportCity_PokemonFanClub_EventScript_209EE5:: @ 8209EE5 + setvar VAR_TEMP_2, 0 + checkflag FLAG_0x0CC + call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0 + checkflag FLAG_0x0CB + call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0 + checkflag FLAG_0x0CA + call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0 + checkflag FLAG_0x0C9 + call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0 + checkflag FLAG_0x0C8 + call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0 + compare VAR_TEMP_2, 5 + call_if 1, SlateportCity_PokemonFanClub_EventScript_209FCA + compare VAR_0x40B7, 2 + goto_eq SlateportCity_PokemonFanClub_EventScript_209F3B + msgbox SlateportCity_PokemonFanClub_Text_20A62A, 4 + goto SlateportCity_PokemonFanClub_EventScript_209F45 + end + +SlateportCity_PokemonFanClub_EventScript_209F3B:: @ 8209F3B + msgbox SlateportCity_PokemonFanClub_Text_20A9E1, 4 + release + end + +SlateportCity_PokemonFanClub_EventScript_209F45:: @ 8209F45 + msgbox SlateportCity_PokemonFanClub_Text_20A65F, 4 + setvar VAR_TEMP_1, 0 + checkflag FLAG_0x0CC + call_if 0, SlateportCity_PokemonFanClub_EventScript_20A13B + checkflag FLAG_0x0CB + call_if 0, SlateportCity_PokemonFanClub_EventScript_20A124 + checkflag FLAG_0x0CA + call_if 0, SlateportCity_PokemonFanClub_EventScript_20A10D + checkflag FLAG_0x0C9 + call_if 0, SlateportCity_PokemonFanClub_EventScript_20A0F6 + checkflag FLAG_0x0C8 + call_if 0, SlateportCity_PokemonFanClub_EventScript_20A0DF + bufferleadmonspeciesname 0 + switch VAR_TEMP_1 + case 0, SlateportCity_PokemonFanClub_EventScript_209FD6 + case 1, SlateportCity_PokemonFanClub_EventScript_209FE0 + case 2, SlateportCity_PokemonFanClub_EventScript_20A011 + case 3, SlateportCity_PokemonFanClub_EventScript_20A042 + case 4, SlateportCity_PokemonFanClub_EventScript_20A073 + case 5, SlateportCity_PokemonFanClub_EventScript_20A0A4 + release + end + +SlateportCity_PokemonFanClub_EventScript_209FCA:: @ 8209FCA + setvar VAR_0x40B7, 2 + return + +SlateportCity_PokemonFanClub_EventScript_209FD0:: @ 8209FD0 + addvar VAR_TEMP_2, 1 + return + +SlateportCity_PokemonFanClub_EventScript_209FD6:: @ 8209FD6 + msgbox SlateportCity_PokemonFanClub_Text_20A66E, 4 + release + end + +SlateportCity_PokemonFanClub_EventScript_209FE0:: @ 8209FE0 + checkitemspace ITEM_RED_SCARF, 1 + compare VAR_RESULT, 0 + goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 + msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 + setflag FLAG_0x0C8 + giveitem_std ITEM_RED_SCARF + msgbox SlateportCity_PokemonFanClub_Text_20A827, 4 + release + end + +SlateportCity_PokemonFanClub_EventScript_20A011:: @ 820A011 + checkitemspace ITEM_BLUE_SCARF, 1 + compare VAR_RESULT, 0 + goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 + msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 + setflag FLAG_0x0C9 + giveitem_std ITEM_BLUE_SCARF + msgbox SlateportCity_PokemonFanClub_Text_20A880, 4 + release + end + +SlateportCity_PokemonFanClub_EventScript_20A042:: @ 820A042 + checkitemspace ITEM_PINK_SCARF, 1 + compare VAR_RESULT, 0 + goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 + msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 + setflag FLAG_0x0CA + giveitem_std ITEM_PINK_SCARF + msgbox SlateportCity_PokemonFanClub_Text_20A8D7, 4 + release + end + +SlateportCity_PokemonFanClub_EventScript_20A073:: @ 820A073 + checkitemspace ITEM_GREEN_SCARF, 1 + compare VAR_RESULT, 0 + goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 + msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 + setflag FLAG_0x0CB + giveitem_std ITEM_GREEN_SCARF + msgbox SlateportCity_PokemonFanClub_Text_20A933, 4 + release + end + +SlateportCity_PokemonFanClub_EventScript_20A0A4:: @ 820A0A4 + checkitemspace ITEM_YELLOW_SCARF, 1 + compare VAR_RESULT, 0 + goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 + msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 + setflag FLAG_0x0CC + giveitem_std ITEM_YELLOW_SCARF + msgbox SlateportCity_PokemonFanClub_Text_20A984, 4 + release + end + +SlateportCity_PokemonFanClub_EventScript_20A0D5:: @ 820A0D5 + msgbox SlateportCity_PokemonFanClub_Text_20A719, 4 + release + end + +SlateportCity_PokemonFanClub_EventScript_20A0DF:: @ 820A0DF + specialvar VAR_RESULT, CheckLeadMonCool + compare VAR_RESULT, 1 + call_if 1, SlateportCity_PokemonFanClub_EventScript_20A0F0 + return + +SlateportCity_PokemonFanClub_EventScript_20A0F0:: @ 820A0F0 + setvar VAR_TEMP_1, 1 + return + +SlateportCity_PokemonFanClub_EventScript_20A0F6:: @ 820A0F6 + specialvar VAR_RESULT, CheckLeadMonBeauty + compare VAR_RESULT, 1 + call_if 1, SlateportCity_PokemonFanClub_EventScript_20A107 + return + +SlateportCity_PokemonFanClub_EventScript_20A107:: @ 820A107 + setvar VAR_TEMP_1, 2 + return + +SlateportCity_PokemonFanClub_EventScript_20A10D:: @ 820A10D + specialvar VAR_RESULT, CheckLeadMonCute + compare VAR_RESULT, 1 + call_if 1, SlateportCity_PokemonFanClub_EventScript_20A11E + return + +SlateportCity_PokemonFanClub_EventScript_20A11E:: @ 820A11E + setvar VAR_TEMP_1, 3 + return + +SlateportCity_PokemonFanClub_EventScript_20A124:: @ 820A124 + specialvar VAR_RESULT, CheckLeadMonSmart + compare VAR_RESULT, 1 + call_if 1, SlateportCity_PokemonFanClub_EventScript_20A135 + return + +SlateportCity_PokemonFanClub_EventScript_20A135:: @ 820A135 + setvar VAR_TEMP_1, 4 + return + +SlateportCity_PokemonFanClub_EventScript_20A13B:: @ 820A13B + specialvar VAR_RESULT, CheckLeadMonTough + compare VAR_RESULT, 1 + call_if 1, SlateportCity_PokemonFanClub_EventScript_20A14C + return + +SlateportCity_PokemonFanClub_EventScript_20A14C:: @ 820A14C + setvar VAR_TEMP_1, 5 + return + +SlateportCity_PokemonFanClub_EventScript_20A152:: @ 820A152 + checkflag FLAG_0x156 + goto_eq SlateportCity_PokemonFanClub_EventScript_20A168 + msgbox SlateportCity_PokemonFanClub_Text_20A233, 4 + setflag FLAG_0x156 + release + end + +SlateportCity_PokemonFanClub_EventScript_20A168:: @ 820A168 + msgbox SlateportCity_PokemonFanClub_Text_20A3EE, 4 + release + end + +SlateportCity_PokemonFanClub_EventScript_20A172:: @ 820A172 + msgbox SlateportCity_PokemonFanClub_Text_20A233, 4 + setflag FLAG_0x156 + return + +SlateportCity_PokemonFanClub_EventScript_20A17E:: @ 820A17E + lock + faceplayer + checkflag FLAG_0x116 + goto_eq SlateportCity_PokemonFanClub_EventScript_20A1DE + msgbox SlateportCity_PokemonFanClub_Text_20AA77, 4 + specialvar VAR_RESULT, GetLeadMonFriendshipScore + compare VAR_RESULT, 4 + goto_if 4, SlateportCity_PokemonFanClub_EventScript_20A1A3 + release + end + +SlateportCity_PokemonFanClub_EventScript_20A1A3:: @ 820A1A3 + playse SE_PIN + applymovement VAR_LAST_TALKED, SlateportCity_PokemonFanClub_Movement_272598 + waitmovement 0 + applymovement VAR_LAST_TALKED, SlateportCity_PokemonFanClub_Movement_27259A + waitmovement 0 + msgbox SlateportCity_PokemonFanClub_Text_20AB63, 4 + giveitem_std ITEM_SOOTHE_BELL + compare VAR_RESULT, 0 + goto_eq SlateportCity_PokemonFanClub_EventScript_272054 + setflag FLAG_0x116 + release + end + +SlateportCity_PokemonFanClub_EventScript_20A1DE:: @ 820A1DE + msgbox SlateportCity_PokemonFanClub_Text_20ABC4, 4 + release + end + +SlateportCity_PokemonFanClub_EventScript_20A1E8:: @ 820A1E8 + msgbox SlateportCity_PokemonFanClub_Text_20AC47, 2 + end + +SlateportCity_PokemonFanClub_EventScript_20A1F1:: @ 820A1F1 + msgbox SlateportCity_PokemonFanClub_Text_20ACF9, 2 + end + +SlateportCity_PokemonFanClub_EventScript_20A1FA:: @ 820A1FA + lock + faceplayer + waitse + playmoncry SPECIES_SKITTY, 0 + msgbox SlateportCity_PokemonFanClub_Text_20AD5A, 4 + waitmoncry + release + end + +SlateportCity_PokemonFanClub_EventScript_20A20D:: @ 820A20D + lock + faceplayer + waitse + playmoncry SPECIES_ZIGZAGOON, 0 + msgbox SlateportCity_PokemonFanClub_Text_20AD6E, 4 + waitmoncry + release + end + +SlateportCity_PokemonFanClub_EventScript_20A220:: @ 820A220 + lock + faceplayer + waitse + playmoncry SPECIES_AZUMARILL, 0 + msgbox SlateportCity_PokemonFanClub_Text_20AD80, 4 + waitmoncry + release + end + +SlateportCity_PokemonFanClub_Text_20A233: @ 820A233 + .string "Er-hem! I am the CHAIRMAN of the\n" + .string "POKéMON FAN CLUB!\p" + .string "Being the CHAIRMAN, I am naturally\n" + .string "the most important!\p" + .string "No one can best me when it comes\n" + .string "to raising POKéMON. No one!\p" + .string "Well, let me tell you about\n" + .string "POKéMON CONTESTS.\p" + .string "They’re events where one can show off\n" + .string "POKéMON for the world to see!\p" + .string "However, they’re held in far-off towns,\n" + .string "so I cannot participate often enough.\p" + .string "That is why we gather here to show\n" + .string "off our POKéMON, and have others\l" + .string "show us theirs.$" + +SlateportCity_PokemonFanClub_Text_20A3EE: @ 820A3EE + .string "The POKéMON of a TRAINER who has\n" + .string "entered a POKéMON CONTEST…\l" + .string "That, I would like to see.$" + +SlateportCity_PokemonFanClub_Text_20A445: @ 820A445 + .string "Er-hem! I see you’ve participated in\n" + .string "a POKéMON CONTEST!\p" + .string "Please! Allow me to examine how you\n" + .string "have raised your POKéMON.\p" + .string "It delights me no end to see POKéMON\n" + .string "raised by other TRAINERS.\p" + .string "The happy expressions of POKéMON\n" + .string "raised with proper care…\p" + .string "The kindly eyes of the TRAINER that\n" + .string "nurtured and raised the POKéMON…\p" + .string "The very thought fills my heart to\n" + .string "overwhelming with joy.\p" + .string "Oh! I do beg your pardon!\n" + .string "Forgive me for prattling on so!\p" + .string "Please! Allow me to examine how much\n" + .string "your POKéMON has grown!$" + +SlateportCity_PokemonFanClub_Text_20A62A: @ 820A62A + .string "How is your POKéMON growing?\n" + .string "Allow me to examine it.$" + +SlateportCity_PokemonFanClub_Text_20A65F: @ 820A65F + .string "Hm, hm…\n" + .string "I see…$" + +SlateportCity_PokemonFanClub_Text_20A66E: @ 820A66E + .string "Hmmm… It’s not bad, but it’s not\n" + .string "good, either…\p" + .string "You, the TRAINER, must put more\n" + .string "effort into raising this POKéMON!\p" + .string "For instance, may I suggest that\n" + .string "you give it more {POKEBLOCK}S?$" + +SlateportCity_PokemonFanClub_Text_20A719: @ 820A719 + .string "Oh, my…\p" + .string "Your POKéMON is growing quite well,\n" + .string "so you deserve a reward.\p" + .string "Unfortunately, you have no space for\n" + .string "this in your BAG.$" + +SlateportCity_PokemonFanClub_Text_20A795: @ 820A795 + .string "Your {STR_VAR_1}, it is growing in\n" + .string "a most impressive manner!\l" + .string "It is one fine specimen!\p" + .string "But! If you were to give it this,\n" + .string "it would grow even better! Indeed!$" + +SlateportCity_PokemonFanClub_Text_20A827: @ 820A827 + .string "Let a POKéMON hold that RED SCARF.\p" + .string "Everyone will recognize the coolness\n" + .string "of that POKéMON!$" + +SlateportCity_PokemonFanClub_Text_20A880: @ 820A880 + .string "Let a POKéMON hold that BLUE SCARF.\p" + .string "Its beauty will be accentuated much\n" + .string "more than now!$" + +SlateportCity_PokemonFanClub_Text_20A8D7: @ 820A8D7 + .string "Let a POKéMON hold that PINK SCARF.\p" + .string "It will draw out the cuteness of\n" + .string "the POKéMON some more!$" + +SlateportCity_PokemonFanClub_Text_20A933: @ 820A933 + .string "Let a POKéMON hold that GREEN SCARF.\p" + .string "That will enhance the\n" + .string "smartness of POKéMON!$" + +SlateportCity_PokemonFanClub_Text_20A984: @ 820A984 + .string "Let a POKéMON hold that YELLOW SCARF.\p" + .string "It will bolster your POKéMON’s\n" + .string "toughness so much more!$" + +SlateportCity_PokemonFanClub_Text_20A9E1: @ 820A9E1 + .string "I’m sorry, but I’ve nothing else to\n" + .string "give you! None at all!\p" + .string "After all, you’re blessed with the gift\n" + .string "of raising POKéMON without resorting\l" + .string "to any items!$" + +SlateportCity_PokemonFanClub_Text_20AA77: @ 820AA77 + .string "I love seeing POKéMON that love\n" + .string "their TRAINERS.\p" + .string "POKéMON are very sensitive to\n" + .string "the feelings of their TRAINERS.\p" + .string "If you treat your POKéMON with love\n" + .string "and care, they’ll love you back.\p" + .string "When your POKéMON grow to love you,\n" + .string "please come show me.$" + +SlateportCity_PokemonFanClub_Text_20AB63: @ 820AB63 + .string "Your POKéMON really adores you.\p" + .string "For you, a most compassionate\n" + .string "TRAINER, a gift from the FAN CLUB!$" + +SlateportCity_PokemonFanClub_Text_20ABC4: @ 820ABC4 + .string "POKéMON are very sensitive to\n" + .string "the feelings of their TRAINERS.\p" + .string "If you treat your POKéMON with love\n" + .string "and care, they’ll love you back.$" + +SlateportCity_PokemonFanClub_Text_20AC47: @ 820AC47 + .string "If you keep letting a POKéMON faint\n" + .string "in battle, it’ll come to resent it.\p" + .string "Soon, it will become less trusting\n" + .string "of the TRAINER.\p" + .string "In other words, it certainly won’t\n" + .string "like you very much.$" + +SlateportCity_PokemonFanClub_Text_20ACF9: @ 820ACF9 + .string "Do POKéMON enjoy having items used\n" + .string "on them?\p" + .string "Mine acted really happy when I gave\n" + .string "it some PROTEIN.$" + +SlateportCity_PokemonFanClub_Text_20AD5A: @ 820AD5A + .string "SKITTY: Fffnyaaaah…$" + +SlateportCity_PokemonFanClub_Text_20AD6E: @ 820AD6E + .string "ZIGZAGOON: Kyuuu…$" + +SlateportCity_PokemonFanClub_Text_20AD80: @ 820AD80 + .string "AZUMARILL: Marimari?$" + diff --git a/data/maps/SlateportCity_SternsShipyard_1F/events.inc b/data/maps/SlateportCity_SternsShipyard_1F/events.inc new file mode 100644 index 000000000..b231f9816 --- /dev/null +++ b/data/maps/SlateportCity_SternsShipyard_1F/events.inc @@ -0,0 +1,14 @@ +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 + +SlateportCity_SternsShipyard_1F_MapWarps: @ 852F378 + 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/SlateportCity_SternsShipyard_1F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc new file mode 100644 index 000000000..8197eb873 --- /dev/null +++ b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc @@ -0,0 +1,145 @@ +SlateportCity_SternsShipyard_1F_MapScripts:: @ 8207F3F + .byte 0 + +SlateportCity_SternsShipyard_1F_EventScript_207F40:: @ 8207F40 + lockall + checkflag FLAG_SYS_GAME_CLEAR + goto_eq SlateportCity_SternsShipyard_1F_EventScript_207F92 + checkflag FLAG_BADGE07_GET + goto_eq SlateportCity_SternsShipyard_1F_EventScript_207FA6 + checkflag FLAG_0x095 + goto_eq SlateportCity_SternsShipyard_1F_EventScript_207FD9 + checkflag FLAG_0x094 + goto_eq SlateportCity_SternsShipyard_1F_EventScript_207FBA + msgbox SlateportCity_SternsShipyard_1F_Text_208008, 4 + applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E + waitmovement 0 + msgbox SlateportCity_SternsShipyard_1F_Text_2080A5, 4 + closemessage + applymovement 1, SlateportCity_SternsShipyard_1F_Movement_2725A2 + waitmovement 0 + setflag FLAG_0x094 + setflag FLAG_0x372 + releaseall + end + +SlateportCity_SternsShipyard_1F_EventScript_207F92:: @ 8207F92 + applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E + waitmovement 0 + msgbox SlateportCity_SternsShipyard_1F_Text_208323, 4 + releaseall + end + +SlateportCity_SternsShipyard_1F_EventScript_207FA6:: @ 8207FA6 + applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E + waitmovement 0 + msgbox SlateportCity_SternsShipyard_1F_Text_2082A8, 4 + releaseall + end + +SlateportCity_SternsShipyard_1F_EventScript_207FBA:: @ 8207FBA + applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E + waitmovement 0 + msgbox SlateportCity_SternsShipyard_1F_Text_2081A5, 4 + closemessage + applymovement 1, SlateportCity_SternsShipyard_1F_Movement_2725A2 + waitmovement 0 + releaseall + end + +SlateportCity_SternsShipyard_1F_EventScript_207FD9:: @ 8207FD9 + applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E + waitmovement 0 + msgbox SlateportCity_SternsShipyard_1F_Text_208213, 4 + releaseall + end + +SlateportCity_SternsShipyard_1F_EventScript_207FED:: @ 8207FED + msgbox SlateportCity_SternsShipyard_1F_Text_208558, 2 + end + +SlateportCity_SternsShipyard_1F_EventScript_207FF6:: @ 8207FF6 + msgbox SlateportCity_SternsShipyard_1F_Text_2085FF, 2 + end + +SlateportCity_SternsShipyard_1F_EventScript_207FFF:: @ 8207FFF + msgbox SlateportCity_SternsShipyard_1F_Text_2083EE, 2 + end + +SlateportCity_SternsShipyard_1F_Text_208008: @ 8208008 + .string "Umm… If this goes here, and that\n" + .string "goes over there…\p" + .string "Then where does this thing go?\n" + .string "And what about that doohickey?\p" + .string "Aaargh! I can’t make heads or tails\n" + .string "of this!$" + +SlateportCity_SternsShipyard_1F_Text_2080A5: @ 82080A5 + .string "Hm?\n" + .string "Hi, I’m DOCK.\p" + .string "CAPT. STERN commissioned me to\n" + .string "design a ferry.\p" + .string "Oh! That there…\n" + .string "Are they DEVON GOODS?\p" + .string "But, hmm…\n" + .string "This won’t do…\p" + .string "CAPT. STERN went off somewhere.\n" + .string "He said he had some work to do.\p" + .string "Could I get you to go find CAPT.\n" + .string "STERN and deliver that to him?$" + +SlateportCity_SternsShipyard_1F_Text_2081A5: @ 82081A5 + .string "DOCK: Where could CAPT. STERN have\n" + .string "gone off to?\p" + .string "Could you go find CAPT. STERN and\n" + .string "deliver that parcel to him?$" + +SlateportCity_SternsShipyard_1F_Text_208213: @ 8208213 + .string "DOCK: Shipbuilding is an art.\p" + .string "A lot of things can’t be figured out\n" + .string "just by calculating.\p" + .string "I really could use advice from a veteran\n" + .string "who knows the seas…$" + +SlateportCity_SternsShipyard_1F_Text_2082A8: @ 82082A8 + .string "DOCK: Hi! MR. BRINEY’s joined us to\n" + .string "lend us his help.\p" + .string "Thanks to the veteran sailor, the\n" + .string "ferry is steadily coming together.$" + +SlateportCity_SternsShipyard_1F_Text_208323: @ 8208323 + .string "DOCK: The ferry is finally ready!\p" + .string "The new S.S. TIDAL is truly a marvel\n" + .string "of technology!\p" + .string "But, I get the feeling that we can\n" + .string "make something even better.\p" + .string "You know, there’s never an end to\n" + .string "technology’s march.$" + +SlateportCity_SternsShipyard_1F_Text_2083EE: @ 82083EE + .string "MR. BRINEY: Ah, {PLAYER}{KUN}!\n" + .string "It’s been too long!\p" + .string "Aye, since I met you, this old sea dog’s\n" + .string "been feeling frisky!\p" + .string "So I’ve decided to help DOCK make\n" + .string "a ferry.\p" + .string "Aye, after all, a ferry would be able\n" + .string "to carry a lot of people.\p" + .string "But, you know, that DOCK is really\n" + .string "something special.\p" + .string "With his knack for technology and\n" + .string "my experience, I’m sure that we can\l" + .string "build one great ship, aye!$" + +SlateportCity_SternsShipyard_1F_Text_208558: @ 8208558 + .string "The seasons, the weather, where\n" + .string "the moon sits in the sky…\p" + .string "These and other conditions make\n" + .string "the sea change its expression.\p" + .string "That’s right!\n" + .string "The sea is like a living thing!$" + +SlateportCity_SternsShipyard_1F_Text_2085FF: @ 82085FF + .string "I get seasick real easily.\n" + .string "So I get to help out here instead.$" + diff --git a/data/maps/SlateportCity_SternsShipyard_2F/events.inc b/data/maps/SlateportCity_SternsShipyard_2F/events.inc new file mode 100644 index 000000000..450f40fe7 --- /dev/null +++ b/data/maps/SlateportCity_SternsShipyard_2F/events.inc @@ -0,0 +1,11 @@ +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 + +SlateportCity_SternsShipyard_2F_MapWarps: @ 852F3EC + 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/SlateportCity_SternsShipyard_2F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc new file mode 100644 index 000000000..a599ac9b8 --- /dev/null +++ b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc @@ -0,0 +1,22 @@ +SlateportCity_SternsShipyard_2F_MapScripts:: @ 820863D + .byte 0 + +SlateportCity_SternsShipyard_2F_EventScript_20863E:: @ 820863E + msgbox SlateportCity_SternsShipyard_2F_Text_208650, 2 + end + +SlateportCity_SternsShipyard_2F_EventScript_208647:: @ 8208647 + msgbox SlateportCity_SternsShipyard_2F_Text_2086BA, 2 + end + +SlateportCity_SternsShipyard_2F_Text_208650: @ 8208650 + .string "Designing a large ship is more like\n" + .string "making a big building than putting\l" + .string "together a transportation vehicle.$" + +SlateportCity_SternsShipyard_2F_Text_2086BA: @ 82086BA + .string "Don’t you think it’s strange that\n" + .string "a ship made of heavy iron floats?\p" + .string "It floats because of a principle\n" + .string "called buoyancy.$" + diff --git a/data/maps/SootopolisCity/events.inc b/data/maps/SootopolisCity/events.inc new file mode 100644 index 000000000..96aaefd9c --- /dev/null +++ b/data/maps/SootopolisCity/events.inc @@ -0,0 +1,46 @@ +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 + +SootopolisCity_MapWarps: @ 85274C4 + 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 + 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 + +SootopolisCity_MapEvents:: @ 8527574 + map_events SootopolisCity_EventObjects, SootopolisCity_MapWarps, 0x0, SootopolisCity_MapBGEvents + diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc new file mode 100644 index 000000000..5de8c7d12 --- /dev/null +++ b/data/maps/SootopolisCity/scripts.inc @@ -0,0 +1,1784 @@ +SootopolisCity_MapScripts:: @ 81E565C + map_script 1, SootopolisCity_MapScript1_1E5676 + map_script 3, SootopolisCity_MapScript1_1E56EF + map_script 5, SootopolisCity_MapScript1_1E590B + map_script 2, SootopolisCity_MapScript2_1E5914 + map_script 4, SootopolisCity_MapScript2_1E58DB + .byte 0 + +SootopolisCity_MapScript1_1E5676: @ 81E5676 + checkflag FLAG_0x09E + call_if 0, SootopolisCity_EventScript_1E56E5 + checkflag FLAG_0x081 + goto_if 0, SootopolisCity_EventScript_1E5692 + checkflag FLAG_0x09E + call_if 0, SootopolisCity_EventScript_1E5693 + end + +SootopolisCity_EventScript_1E5692:: @ 81E5692 + end + +SootopolisCity_EventScript_1E5693:: @ 81E5693 + setmetatile 9, 6, 584, 1 + setmetatile 9, 17, 584, 1 + setmetatile 9, 26, 584, 1 + setmetatile 44, 17, 584, 1 + setmetatile 8, 35, 584, 1 + setmetatile 53, 28, 584, 1 + setmetatile 45, 6, 584, 1 + setmetatile 48, 25, 584, 1 + setmetatile 51, 36, 584, 1 + return + +SootopolisCity_EventScript_1E56E5:: @ 81E56E5 + setmetatile 31, 32, 592, 1 + return + +SootopolisCity_MapScript1_1E56EF: @ 81E56EF + setflag FLAG_VISITED_SOOTOPOLIS_CITY + compare VAR_0x405E, 1 + call_if 1, SootopolisCity_EventScript_1E5781 + compare VAR_0x40CA, 1 + call_if 1, SootopolisCity_EventScript_1E5781 + call SootopolisCity_EventScript_1E5805 + call SootopolisCity_EventScript_1E57B2 + compare VAR_0x405E, 1 + call_if 1, SootopolisCity_EventScript_1E5785 + compare VAR_0x405E, 2 + call_if 1, SootopolisCity_EventScript_1E5785 + compare VAR_0x405E, 3 + call_if 1, SootopolisCity_EventScript_1E5785 + compare VAR_0x405E, 4 + call_if 1, SootopolisCity_EventScript_1E5785 + compare VAR_0x405E, 5 + call_if 1, SootopolisCity_EventScript_1E5785 + compare VAR_0x405E, 2 + call_if 1, SootopolisCity_EventScript_1E5842 + compare VAR_0x405E, 3 + call_if 1, SootopolisCity_EventScript_1E5842 + compare VAR_0x405E, 4 + call_if 1, SootopolisCity_EventScript_1E585B + compare VAR_0x405E, 5 + call_if 1, SootopolisCity_EventScript_1E5871 + compare VAR_0x405E, 6 + call_if 1, SootopolisCity_EventScript_1E58D3 + end + +SootopolisCity_EventScript_1E5781:: @ 81E5781 + setflag FLAG_SPECIAL_FLAG_0x4000 + return + +SootopolisCity_EventScript_1E5785:: @ 81E5785 + setobjectxyperm 3, 13, 48 + setobjectxyperm 5, 46, 32 + setobjectxyperm 4, 48, 41 + setobjectxyperm 8, 45, 43 + setobjectmovementtype 3, 7 + setobjectmovementtype 5, 9 + setobjectmovementtype 4, 9 + setobjectmovementtype 8, 9 + return + +SootopolisCity_EventScript_1E57B2:: @ 81E57B2 + compare VAR_0x405E, 0 + goto_eq SootopolisCity_EventScript_1E5800 + compare VAR_0x405E, 6 + goto_if 4, SootopolisCity_EventScript_1E5800 + compare VAR_0x405E, 1 + goto_eq SootopolisCity_EventScript_1E5801 + compare VAR_0x405E, 2 + goto_eq SootopolisCity_EventScript_1E5801 + compare VAR_0x405E, 3 + goto_eq SootopolisCity_EventScript_1E5801 + compare VAR_0x405E, 4 + goto_eq SootopolisCity_EventScript_1E5801 + compare VAR_0x40CA, 1 + goto_if 3, SootopolisCity_EventScript_1E5801 + return + +SootopolisCity_EventScript_1E5800:: @ 81E5800 + return + +SootopolisCity_EventScript_1E5801:: @ 81E5801 + setmaplayoutindex 357 + return + +SootopolisCity_EventScript_1E5805:: @ 81E5805 + compare VAR_0x405E, 0 + goto_eq SootopolisCity_EventScript_1E583D + compare VAR_0x405E, 6 + goto_if 4, SootopolisCity_EventScript_1E583D + compare VAR_0x405E, 1 + goto_eq SootopolisCity_EventScript_1E583E + compare VAR_0x40CA, 1 + goto_eq SootopolisCity_EventScript_1E583E + compare VAR_0x40CA, 1 + goto_if 3, SootopolisCity_EventScript_27207A + return + +SootopolisCity_EventScript_1E583D:: @ 81E583D + return + +SootopolisCity_EventScript_1E583E:: @ 81E583E + setweather 13 + return + +SootopolisCity_EventScript_1E5842:: @ 81E5842 + checkflag FLAG_0x133 + goto_eq SootopolisCity_EventScript_1E584C + return + +SootopolisCity_EventScript_1E584C:: @ 81E584C + setobjectxyperm 1, 30, 18 + setobjectxyperm 7, 32, 18 + return + +SootopolisCity_EventScript_1E585B:: @ 81E585B + setobjectxyperm 1, 30, 18 + setobjectxyperm 18, 31, 18 + setobjectxyperm 7, 32, 18 + end + +SootopolisCity_EventScript_1E5871:: @ 81E5871 + setobjectxyperm 1, 31, 18 + setobjectxyperm 7, 29, 33 + setobjectxyperm 16, 33, 35 + setobjectxyperm 17, 34, 35 + compare VAR_0x40D8, 0 + call_if 1, SootopolisCity_EventScript_1E58AF + compare VAR_0x40D8, 1 + call_if 1, SootopolisCity_EventScript_1E58BB + compare VAR_0x40D8, 2 + call_if 1, SootopolisCity_EventScript_1E58C7 + return + +SootopolisCity_EventScript_1E58AF:: @ 81E58AF + setobjectxyperm 18, 31, 33 + setobjectmovementtype 18, 8 + return + +SootopolisCity_EventScript_1E58BB:: @ 81E58BB + setobjectxyperm 18, 32, 33 + setobjectmovementtype 18, 8 + return + +SootopolisCity_EventScript_1E58C7:: @ 81E58C7 + setobjectxyperm 18, 30, 33 + setobjectmovementtype 18, 8 + return + +SootopolisCity_EventScript_1E58D3:: @ 81E58D3 + setobjectxyperm 1, 31, 18 + return + +SootopolisCity_MapScript2_1E58DB: @ 81E58DB + map_script_2 VAR_0x405E, 5, SootopolisCity_EventScript_1E58E5 + .2byte 0 + +SootopolisCity_EventScript_1E58E5:: @ 81E58E5 + compare VAR_0x40CA, 1 + call_if 1, SootopolisCity_EventScript_1E58FC + compare VAR_0x40CA, 2 + call_if 1, SootopolisCity_EventScript_1E5901 + end + +SootopolisCity_EventScript_1E58FC:: @ 81E58FC + turnobject 255, 2 + return + +SootopolisCity_EventScript_1E5901:: @ 81E5901 + turnobject 255, 2 + setvar VAR_0x40CA, 3 + return + +SootopolisCity_MapScript1_1E590B: @ 81E590B + setdivewarp MAP_UNDERWATER_SOOTOPOLIS_CITY, 255, 9, 6 + end + +SootopolisCity_MapScript2_1E5914: @ 81E5914 + map_script_2 VAR_0x405E, 1, SootopolisCity_EventScript_1E5926 + map_script_2 VAR_0x40CA, 1, SootopolisCity_EventScript_1E5BFE + .2byte 0 + +SootopolisCity_EventScript_1E5926:: @ 81E5926 + lockall + special StorePlayerCoordsInVars + compare VAR_0x8004, 43 + goto_if 5, SootopolisCity_EventScript_1E5A82 + compare VAR_0x8005, 32 + goto_if 5, SootopolisCity_EventScript_1E5A82 + goto SootopolisCity_EventScript_1E5946 + end + +SootopolisCity_EventScript_1E5946:: @ 81E5946 + delay 60 + special SpawnScriptEventObject + applymovement 127, SootopolisCity_Movement_1E5A68 + waitmovement 0 + special RemoveScriptEventObject + delay 60 + fadescreenspeed 1, 8 + setweather 15 + doweather + setvar VAR_0x8004, 0 + special sub_813B7D8 + waitstate + applymovement 10, SootopolisCity_Movement_2725A4 + applymovement 9, SootopolisCity_Movement_2725A8 + waitmovement 0 + delay 60 + waitse + playmoncry SPECIES_KYOGRE, 2 + applymovement 10, SootopolisCity_Movement_1E5BB8 + applymovement 9, SootopolisCity_Movement_1E5BE5 + waitmovement 0 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 8 + setvar VAR_0x8007, 5 + special sub_8139560 + waitstate + applymovement 10, SootopolisCity_Movement_1E5BCF + applymovement 9, SootopolisCity_Movement_1E5BF0 + waitmovement 0 + waitse + playmoncry SPECIES_GROUDON, 2 + applymovement 10, SootopolisCity_Movement_1E5BC2 + applymovement 9, SootopolisCity_Movement_1E5BDD + waitmovement 0 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 8 + setvar VAR_0x8007, 5 + special sub_8139560 + waitstate + applymovement 10, SootopolisCity_Movement_1E5BCF + applymovement 9, SootopolisCity_Movement_1E5BF0 + waitmovement 0 + waitse + playmoncry SPECIES_KYOGRE, 2 + applymovement 10, SootopolisCity_Movement_1E5BB8 + applymovement 9, SootopolisCity_Movement_1E5BE5 + waitmovement 0 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 8 + setvar VAR_0x8007, 5 + special sub_8139560 + waitstate + applymovement 10, SootopolisCity_Movement_1E5BCF + applymovement 9, SootopolisCity_Movement_1E5BF0 + waitmovement 0 + special SpawnScriptEventObject + applymovement 10, SootopolisCity_Movement_1E5BD6 + applymovement 9, SootopolisCity_Movement_1E5BF7 + applymovement 127, SootopolisCity_Movement_1E5A75 + waitmovement 0 + special RemoveScriptEventObject + setvar VAR_0x405E, 2 + clearflag FLAG_SPECIAL_FLAG_0x4000 + releaseall + end + +SootopolisCity_Movement_1E5A68: @ 81E5A68 + 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 + 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 + delay 60 + special SpawnScriptEventObject + applymovement 127, SootopolisCity_Movement_1E5BA4 + waitmovement 0 + special RemoveScriptEventObject + delay 60 + fadescreenspeed 1, 8 + setweather 15 + doweather + setvar VAR_0x8004, 0 + special sub_813B7D8 + waitstate + applymovement 10, SootopolisCity_Movement_2725A4 + applymovement 9, SootopolisCity_Movement_2725A8 + waitmovement 0 + delay 60 + waitse + playmoncry SPECIES_KYOGRE, 2 + applymovement 10, SootopolisCity_Movement_1E5BB8 + applymovement 9, SootopolisCity_Movement_1E5BE5 + waitmovement 0 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 8 + setvar VAR_0x8007, 5 + special sub_8139560 + waitstate + applymovement 10, SootopolisCity_Movement_1E5BCF + applymovement 9, SootopolisCity_Movement_1E5BF0 + waitmovement 0 + waitse + playmoncry SPECIES_GROUDON, 2 + applymovement 10, SootopolisCity_Movement_1E5BC2 + applymovement 9, SootopolisCity_Movement_1E5BDD + waitmovement 0 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 8 + setvar VAR_0x8007, 5 + special sub_8139560 + waitstate + applymovement 10, SootopolisCity_Movement_1E5BCF + applymovement 9, SootopolisCity_Movement_1E5BF0 + waitmovement 0 + waitse + playmoncry SPECIES_KYOGRE, 2 + applymovement 10, SootopolisCity_Movement_1E5BB8 + applymovement 9, SootopolisCity_Movement_1E5BE5 + waitmovement 0 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 8 + setvar VAR_0x8007, 5 + special sub_8139560 + waitstate + applymovement 10, SootopolisCity_Movement_1E5BCF + applymovement 9, SootopolisCity_Movement_1E5BF0 + waitmovement 0 + special SpawnScriptEventObject + applymovement 10, SootopolisCity_Movement_1E5BD6 + applymovement 9, SootopolisCity_Movement_1E5BF7 + applymovement 127, SootopolisCity_Movement_1E5BAE + waitmovement 0 + special RemoveScriptEventObject + setvar VAR_0x405E, 2 + clearflag FLAG_SPECIAL_FLAG_0x4000 + releaseall + end + +SootopolisCity_Movement_1E5BA4: @ 81E5BA4 + 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 + 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 + 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 + 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 + lock_facing_direction + walk_right + delay_16 + delay_16 + delay_16 + unlock_facing_direction + step_end + +SootopolisCity_Movement_1E5BD6: @ 81E5BD6 + 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 + 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 + 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 + lock_facing_direction + walk_left + delay_16 + delay_16 + delay_16 + unlock_facing_direction + step_end + +SootopolisCity_Movement_1E5BF7: @ 81E5BF7 + 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 + lockall + special StorePlayerCoordsInVars + compare VAR_0x8004, 43 + goto_if 5, SootopolisCity_EventScript_1E5CCE + compare VAR_0x8005, 32 + goto_if 5, SootopolisCity_EventScript_1E5CCE + goto SootopolisCity_EventScript_1E5C1E + end + +SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E + delay 60 + special SpawnScriptEventObject + applymovement 127, SootopolisCity_Movement_1E5A68 + waitmovement 0 + special RemoveScriptEventObject + delay 60 + fadescreenspeed 1, 8 + call SootopolisCity_EventScript_1E5D82 + removeobject 9 + removeobject 10 + addobject 11 + setvar VAR_0x8004, 1 + special sub_813B7D8 + waitstate + playse SE_T_KAMI + special SpawnScriptEventObject + applymovement 127, SootopolisCity_Movement_1E5E63 + waitmovement 0 + waitse + playmoncry SPECIES_RAYQUAZA, 2 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 8 + setvar VAR_0x8007, 3 + special sub_8139560 + waitstate + waitse + playmoncry SPECIES_RAYQUAZA, 2 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + setvar VAR_0x8006, 8 + setvar VAR_0x8007, 5 + special sub_8139560 + waitstate + waitmoncry + setweather 0 + doweather + applymovement 11, SootopolisCity_Movement_1E5E5B + waitmovement 0 + removeobject 11 + special WaitWeather + waitstate + clearflag FLAG_SYS_WEATHER_CTRL + setvar VAR_0x40CA, 3 + clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS + fadenewbgm MUS_RUNECITY + delay 120 + clearflag FLAG_SPECIAL_FLAG_0x4000 + warp8 MAP_SOOTOPOLIS_CITY, 255, 43, 32 + waitstate + end + +SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE + delay 60 + special SpawnScriptEventObject + applymovement 127, SootopolisCity_Movement_1E5BA4 + waitmovement 0 + special RemoveScriptEventObject + delay 60 + fadescreenspeed 1, 8 + call SootopolisCity_EventScript_1E5D82 + removeobject 9 + removeobject 10 + addobject 11 + setvar VAR_0x8004, 1 + special sub_813B7D8 + waitstate + special SpawnScriptEventObject + applymovement 127, SootopolisCity_Movement_1E5E63 + applymovement 255, SootopolisCity_Movement_1E5E68 + waitmovement 0 + waitse + playmoncry SPECIES_RAYQUAZA, 2 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 8 + setvar VAR_0x8007, 3 + special sub_8139560 + waitstate + waitse + playmoncry SPECIES_RAYQUAZA, 2 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + setvar VAR_0x8006, 8 + setvar VAR_0x8007, 5 + special sub_8139560 + waitstate + waitmoncry + setweather 0 + doweather + applymovement 11, SootopolisCity_Movement_1E5E5B + waitmovement 0 + removeobject 11 + special WaitWeather + waitstate + clearflag FLAG_SYS_WEATHER_CTRL + setvar VAR_0x40CA, 2 + clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS + fadenewbgm MUS_NAMINORI + delay 120 + clearflag FLAG_SPECIAL_FLAG_0x4000 + warp8 MAP_SOOTOPOLIS_CITY, 255, 29, 53 + waitstate + end + +SootopolisCity_EventScript_1E5D82:: @ 81E5D82 + setmetatile 27, 43, 656, 0 + setmetatile 28, 43, 656, 0 + setmetatile 29, 43, 656, 0 + setmetatile 30, 43, 656, 0 + setmetatile 27, 44, 656, 0 + setmetatile 28, 44, 656, 0 + setmetatile 29, 44, 656, 0 + setmetatile 30, 44, 656, 0 + setmetatile 27, 45, 656, 0 + setmetatile 28, 45, 656, 0 + setmetatile 29, 45, 656, 0 + setmetatile 30, 45, 656, 0 + setmetatile 32, 43, 656, 0 + setmetatile 33, 43, 656, 0 + setmetatile 34, 43, 656, 0 + setmetatile 35, 43, 656, 0 + setmetatile 32, 44, 656, 0 + setmetatile 33, 44, 656, 0 + setmetatile 34, 44, 656, 0 + setmetatile 35, 44, 656, 0 + setmetatile 32, 45, 656, 0 + setmetatile 33, 45, 656, 0 + setmetatile 34, 45, 656, 0 + setmetatile 35, 45, 656, 0 + return + +SootopolisCity_Movement_1E5E5B: @ 81E5E5B + 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 + walk_up + walk_up + walk_up + walk_up + step_end + +SootopolisCity_Movement_1E5E68: @ 81E5E68 + walk_up + walk_up + walk_up + walk_up + step_end + +SootopolisCity_Movement_1E5E6D: @ 81E5E6D + walk_down + walk_down + walk_down + walk_down + step_end + +SootopolisCity_Movement_1E5E72: @ 81E5E72 + 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 + 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 + lock + faceplayer + compare VAR_0x405E, 6 + goto_if 4, SootopolisCity_EventScript_1E5EC4 + compare VAR_0x405E, 5 + goto_eq SootopolisCity_EventScript_1E5ECE + compare VAR_0x405E, 2 + goto_if 4, SootopolisCity_EventScript_1E5EBA + msgbox SootopolisCity_Text_1E6D77, 4 + release + end + +SootopolisCity_EventScript_1E5EBA:: @ 81E5EBA + msgbox SootopolisCity_Text_1E6DFE, 4 + release + end + +SootopolisCity_EventScript_1E5EC4:: @ 81E5EC4 + msgbox SootopolisCity_Text_1E6F38, 4 + release + end + +SootopolisCity_EventScript_1E5ECE:: @ 81E5ECE + msgbox SootopolisCity_Text_1E6ED4, 4 + release + end + +SootopolisCity_EventScript_1E5ED8:: @ 81E5ED8 + lock + faceplayer + compare VAR_0x405E, 1 + goto_if 3, SootopolisCity_EventScript_1E5F1B + compare VAR_0x405E, 6 + goto_if 4, SootopolisCity_EventScript_1E5F1B + compare VAR_0x405E, 5 + goto_eq SootopolisCity_EventScript_1E5F10 + msgbox SootopolisCity_Text_1E6BFF, 4 + closemessage + applymovement 3, SootopolisCity_Movement_2725A2 + waitmovement 0 + release + end + +SootopolisCity_EventScript_1E5F10:: @ 81E5F10 + msgbox SootopolisCity_Text_1E6C53, 4 + closemessage + release + end + +SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B + dodailyevents + special GetPlayerBigGuyGirlString + checkflag FLAG_0x932 + goto_eq SootopolisCity_EventScript_1E5FBB + msgbox SootopolisCity_Text_2A7BB0, 4 + random 10 + addvar VAR_RESULT, 20 + addvar VAR_RESULT, 133 + giveitem_std VAR_RESULT + compare VAR_RESULT, 0 + goto_eq SootopolisCity_EventScript_272054 + setflag FLAG_0x932 + msgbox SootopolisCity_Text_2A7C7C, 4 + random 2 + compare VAR_RESULT, 0 + goto_eq SootopolisCity_EventScript_1E5F79 + compare VAR_RESULT, 1 + goto_eq SootopolisCity_EventScript_1E5F9A + end + +SootopolisCity_EventScript_1E5F79:: @ 81E5F79 + giveitem_std ITEM_FIGY_BERRY + compare VAR_RESULT, 0 + goto_eq SootopolisCity_EventScript_272054 + msgbox SootopolisCity_Text_2A7CB7, 4 + release + end + +SootopolisCity_EventScript_1E5F9A:: @ 81E5F9A + giveitem_std ITEM_IAPAPA_BERRY + compare VAR_RESULT, 0 + goto_eq SootopolisCity_EventScript_272054 + msgbox SootopolisCity_Text_2A7CB7, 4 + release + end + +SootopolisCity_EventScript_1E5FBB:: @ 81E5FBB + msgbox SootopolisCity_Text_2A7CEC, 5 + compare VAR_RESULT, 1 + goto_eq SootopolisCity_EventScript_1E5FD8 + msgbox SootopolisCity_Text_2A7DD2, 4 + release + end + +SootopolisCity_EventScript_1E5FD8:: @ 81E5FD8 + msgbox SootopolisCity_Text_2A7D80, 4 + release + end + +SootopolisCity_EventScript_1E5FE2:: @ 81E5FE2 + lockall + applymovement 2, SootopolisCity_Movement_27259E + waitmovement 0 + compare VAR_0x405E, 5 + goto_eq SootopolisCity_EventScript_1E600D + msgbox SootopolisCity_Text_1E71A1, 4 + closemessage + applymovement 2, SootopolisCity_Movement_2725A2 + waitmovement 0 + releaseall + end + +SootopolisCity_EventScript_1E600D:: @ 81E600D + msgbox SootopolisCity_Text_1E728C, 4 + releaseall + end + +SootopolisCity_EventScript_1E6017:: @ 81E6017 + lock + faceplayer + compare VAR_0x405E, 6 + goto_if 4, SootopolisCity_EventScript_1E602E + msgbox SootopolisCity_Text_1E6CCA, 4 + release + end + +SootopolisCity_EventScript_1E602E:: @ 81E602E + msgbox SootopolisCity_Text_1E6D57, 4 + release + end + +SootopolisCity_EventScript_1E6038:: @ 81E6038 + lock + faceplayer + compare VAR_0x405E, 6 + goto_if 4, SootopolisCity_EventScript_1E607A + compare VAR_0x405E, 5 + goto_eq SootopolisCity_EventScript_1E6084 + compare VAR_0x405E, 2 + goto_if 4, SootopolisCity_EventScript_1E6065 + msgbox SootopolisCity_Text_1E6F90, 4 + release + end + +SootopolisCity_EventScript_1E6065:: @ 81E6065 + msgbox SootopolisCity_Text_1E7078, 4 + closemessage + applymovement 8, SootopolisCity_Movement_2725A2 + waitmovement 0 + release + end + +SootopolisCity_EventScript_1E607A:: @ 81E607A + msgbox SootopolisCity_Text_1E710B, 4 + release + end + +SootopolisCity_EventScript_1E6084:: @ 81E6084 + msgbox SootopolisCity_Text_1E70D4, 4 + release + end + +SootopolisCity_EventScript_1E608E:: @ 81E608E + lockall + applymovement 4, SootopolisCity_Movement_27259E + waitmovement 0 + compare VAR_0x405E, 5 + goto_eq SootopolisCity_EventScript_1E60D9 + compare VAR_0x405E, 6 + goto_if 4, SootopolisCity_EventScript_1E60CF + compare VAR_0x405E, 1 + goto_if 3, SootopolisCity_EventScript_1E60CF + msgbox SootopolisCity_Text_1E690B, 4 + closemessage + applymovement 4, SootopolisCity_Movement_2725A2 + waitmovement 0 + release + end + +SootopolisCity_EventScript_1E60CF:: @ 81E60CF + msgbox SootopolisCity_Text_1E68A1, 4 + release + end + +SootopolisCity_EventScript_1E60D9:: @ 81E60D9 + msgbox SootopolisCity_Text_1E6920, 4 + release + end + +SootopolisCity_EventScript_1E60E3:: @ 81E60E3 + lockall + applymovement 5, SootopolisCity_Movement_27259E + waitmovement 0 + compare VAR_0x405E, 5 + goto_eq SootopolisCity_EventScript_1E612D + checkflag FLAG_SYS_GAME_CLEAR + goto_eq SootopolisCity_EventScript_1E6137 + compare VAR_0x405E, 6 + goto_if 4, SootopolisCity_EventScript_1E6141 + compare VAR_0x405E, 1 + goto_if 3, SootopolisCity_EventScript_1E6141 + msgbox SootopolisCity_Text_1E6692, 4 + closemessage + applymovement 5, SootopolisCity_Movement_2725A2 + waitmovement 0 + release + end + +SootopolisCity_EventScript_1E612D:: @ 81E612D + msgbox SootopolisCity_Text_1E6750, 4 + release + end + +SootopolisCity_EventScript_1E6137:: @ 81E6137 + msgbox SootopolisCity_Text_1E677F, 4 + release + end + +SootopolisCity_EventScript_1E6141:: @ 81E6141 + msgbox SootopolisCity_Text_1E6618, 4 + release + end + +SootopolisCity_EventScript_1E614B:: @ 81E614B + msgbox SootopolisCity_Text_1E656F, 3 + end + +SootopolisCity_EventScript_1E6154:: @ 81E6154 + msgbox SootopolisCity_Text_1E65C8, 3 + end + +SootopolisCity_EventScript_1E615D:: @ 81E615D + msgbox SootopolisCity_Text_1E6604, 3 + end + +SootopolisCity_EventScript_1E6166:: @ 81E6166 + lockall + applymovement 7, SootopolisCity_Movement_27259E + waitmovement 0 + checkflag FLAG_0x133 + call_if 0, SootopolisCity_EventScript_1E61CC + compare VAR_0x405E, 2 + goto_eq SootopolisCity_EventScript_1E61AE + compare VAR_0x405E, 3 + goto_eq SootopolisCity_EventScript_1E61C2 + compare VAR_0x405E, 4 + goto_eq SootopolisCity_EventScript_1E61C2 + checkflag FLAG_0x09E + goto_eq SootopolisCity_EventScript_1E61B8 + msgbox SootopolisCity_Text_1E78E5, 4 + releaseall + end + +SootopolisCity_EventScript_1E61AE:: @ 81E61AE + msgbox SootopolisCity_Text_1E7866, 4 + releaseall + end + +SootopolisCity_EventScript_1E61B8:: @ 81E61B8 + msgbox SootopolisCity_Text_1E794B, 4 + releaseall + end + +SootopolisCity_EventScript_1E61C2:: @ 81E61C2 + msgbox SootopolisCity_Text_1E789A, 4 + releaseall + end + +SootopolisCity_EventScript_1E61CC:: @ 81E61CC + msgbox SootopolisCity_Text_1E75CB, 4 + closemessage + compare VAR_FACING, 3 + call_if 1, SootopolisCity_EventScript_1E6243 + compare VAR_FACING, 2 + call_if 1, SootopolisCity_EventScript_1E6255 + msgbox SootopolisCity_Text_1E7737, 4 + closemessage + applymovement 7, SootopolisCity_Movement_1E62D4 + applymovement 255, SootopolisCity_Movement_1E630E + waitmovement 0 + delay 120 + applymovement 1, SootopolisCity_Movement_1E6341 + waitmovement 0 + applymovement 7, SootopolisCity_Movement_1E6344 + applymovement 255, SootopolisCity_Movement_1E634F + waitmovement 0 + msgbox SootopolisCity_Text_1E77F0, 4 + closemessage + setflag FLAG_0x133 + applymovement 255, SootopolisCity_Movement_1E635A + waitmovement 0 + warp MAP_CAVE_OF_ORIGIN_ENTRANCE, 255, 9, 20 + waitstate + end + +SootopolisCity_EventScript_1E6243:: @ 81E6243 + applymovement 7, SootopolisCity_Movement_1E6267 + applymovement 255, SootopolisCity_Movement_1E628C + waitmovement 0 + return + +SootopolisCity_EventScript_1E6255:: @ 81E6255 + applymovement 7, SootopolisCity_Movement_1E6267 + applymovement 255, SootopolisCity_Movement_1E62B0 + waitmovement 0 + return + +SootopolisCity_Movement_1E6267: @ 81E6267 + 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 + 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 + 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 + 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 + 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 + walk_slow_left + walk_in_place_fastest_right + step_end + +SootopolisCity_Movement_1E6344: @ 81E6344 + 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 + 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 + walk_up + walk_up + step_end + +SootopolisCity_EventScript_1E635D:: @ 81E635D + lockall + applymovement 15, SootopolisCity_Movement_27259E + waitmovement 0 + compare VAR_0x405E, 5 + goto_eq SootopolisCity_EventScript_1E6388 + msgbox SootopolisCity_Text_1E67DC, 4 + closemessage + applymovement 15, SootopolisCity_Movement_2725A2 + waitmovement 0 + releaseall + end + +SootopolisCity_EventScript_1E6388:: @ 81E6388 + msgbox SootopolisCity_Text_1E6853, 4 + closemessage + releaseall + end + +SootopolisCity_EventScript_1E6393:: @ 81E6393 + lockall + compare VAR_0x405E, 5 + goto_eq SootopolisCity_EventScript_1E63C7 + msgbox SootopolisCity_Text_1E6936, 4 + closemessage + applymovement 14, SootopolisCity_Movement_27259E + waitmovement 0 + msgbox SootopolisCity_Text_1E696C, 4 + closemessage + applymovement 14, SootopolisCity_Movement_2725A2 + waitmovement 0 + releaseall + end + +SootopolisCity_EventScript_1E63C7:: @ 81E63C7 + applymovement 14, SootopolisCity_Movement_27259E + waitmovement 0 + msgbox SootopolisCity_Text_1E69B8, 4 + releaseall + end + +SootopolisCity_EventScript_1E63DB:: @ 81E63DB + lockall + applymovement 13, SootopolisCity_Movement_27259E + waitmovement 0 + compare VAR_0x405E, 5 + goto_eq SootopolisCity_EventScript_1E6406 + msgbox SootopolisCity_Text_1E6C7C, 4 + closemessage + applymovement 13, SootopolisCity_Movement_2725A2 + waitmovement 0 + releaseall + end + +SootopolisCity_EventScript_1E6406:: @ 81E6406 + msgbox SootopolisCity_Text_1E6CA6, 4 + closemessage + releaseall + end + +SootopolisCity_EventScript_1E6411:: @ 81E6411 + lockall + applymovement 12, SootopolisCity_Movement_27259E + waitmovement 0 + compare VAR_0x405E, 5 + goto_eq SootopolisCity_EventScript_1E643C + msgbox SootopolisCity_Text_1E6A50, 4 + closemessage + applymovement 12, SootopolisCity_Movement_2725A2 + waitmovement 0 + releaseall + end + +SootopolisCity_EventScript_1E643C:: @ 81E643C + msgbox SootopolisCity_Text_1E6B2A, 4 + releaseall + end + +SootopolisCity_EventScript_1E6446:: @ 81E6446 + lock + faceplayer + compare VAR_0x405E, 4 + goto_eq SootopolisCity_EventScript_1E64D8 + checkflag FLAG_0x138 + goto_eq SootopolisCity_EventScript_1E64E2 + checkflag FLAG_0x09E + goto_eq SootopolisCity_EventScript_1E646F + msgbox SootopolisCity_Text_1E7A3E, 4 + release + end + +SootopolisCity_EventScript_1E646F:: @ 81E646F + msgbox SootopolisCity_Text_1E7ACF, 4 + giveitem_std ITEM_HM07 + setflag FLAG_0x138 + msgbox SootopolisCity_Text_1E7B86, 4 + closemessage + compare VAR_FACING, 2 + call_if 1, SootopolisCity_EventScript_1E64B2 + compare VAR_FACING, 4 + call_if 1, SootopolisCity_EventScript_1E64B2 + compare VAR_FACING, 3 + call_if 1, SootopolisCity_EventScript_1E64C5 + release + end + +SootopolisCity_EventScript_1E64B2:: @ 81E64B2 + applymovement 18, SootopolisCity_Movement_1E64EC + waitmovement 0 + moveobjectoffscreen 18 + setvar VAR_0x40D8, 1 + return + +SootopolisCity_EventScript_1E64C5:: @ 81E64C5 + applymovement 18, SootopolisCity_Movement_1E64EF + waitmovement 0 + moveobjectoffscreen 18 + setvar VAR_0x40D8, 2 + return + +SootopolisCity_EventScript_1E64D8:: @ 81E64D8 + msgbox SootopolisCity_Text_1E79C8, 4 + release + end + +SootopolisCity_EventScript_1E64E2:: @ 81E64E2 + msgbox SootopolisCity_Text_1E7CBC, 4 + release + end + +SootopolisCity_Movement_1E64EC: @ 81E64EC + walk_right + walk_in_place_fastest_down + step_end + +SootopolisCity_Movement_1E64EF: @ 81E64EF + walk_left + walk_in_place_fastest_down + step_end + +SootopolisCity_EventScript_1E64F2:: @ 81E64F2 + lockall + compare VAR_0x405E, 5 + goto_eq SootopolisCity_EventScript_1E6509 + msgbox SootopolisCity_Text_1E72DB, 4 + closemessage + releaseall + end + +SootopolisCity_EventScript_1E6509:: @ 81E6509 + msgbox SootopolisCity_Text_1E737E, 4 + setflag FLAG_0x135 + checkflag FLAG_0x134 + goto_eq SootopolisCity_EventScript_1E654C + releaseall + end + +SootopolisCity_EventScript_1E651F:: @ 81E651F + lockall + compare VAR_0x405E, 5 + goto_eq SootopolisCity_EventScript_1E6536 + msgbox SootopolisCity_Text_1E7460, 4 + closemessage + releaseall + end + +SootopolisCity_EventScript_1E6536:: @ 81E6536 + msgbox SootopolisCity_Text_1E74F6, 4 + setflag FLAG_0x134 + checkflag FLAG_0x135 + goto_eq SootopolisCity_EventScript_1E654C + releaseall + end + +SootopolisCity_EventScript_1E654C:: @ 81E654C + setflag FLAG_0x33B + setflag FLAG_0x33A + setflag FLAG_0x09E + clearflag FLAG_0x358 + clearflag FLAG_0x394 + setvar VAR_0x40B9, 2 + warpsilent MAP_SOOTOPOLIS_CITY, 255, 31, 34 + waitstate + releaseall + end + +SootopolisCity_Movement_1E656B:: @ 81E656B + levitate + step_end + +SootopolisCity_Movement_1E656D:: @ 81E656D + destroy_extra_task + step_end + +SootopolisCity_Text_1E656F: @ 81E656F + .string "SOOTOPOLIS CITY POKéMON GYM\n" + .string "LEADER: JUAN\p" + .string "“The GYM LEADER with the beauty\n" + .string "of pure water!â€$" + +SootopolisCity_Text_1E65C8: @ 81E65C8 + .string "SOOTOPOLIS CITY\p" + .string "“The mystical city where history\n" + .string "slumbers.â€$" + + +SootopolisCity_Text_1E6604: @ 81E6604 + .string "The door is closed.$" + +SootopolisCity_Text_1E6618: @ 81E6618 + .string "Diving in the sea. Climbing up and\n" + .string "down stairs all the time…\p" + .string "If you live in this town, you end up\n" + .string "getting physically fit.$" + +SootopolisCity_Text_1E6692: @ 81E6692 + .string "These giant POKéMON suddenly appeared\n" + .string "in the middle of the city!\p" + .string "And, I’ve never seen them before!\p" + .string "Why are they smashing into each\n" + .string "other like that?\p" + .string "Why can’t they be friends, those\n" + .string "POKéMON?$" + +SootopolisCity_Text_1E6750: @ 81E6750 + .string "What? What? What?\n" + .string "What is that green POKéMON?!$" + +SootopolisCity_Text_1E677F: @ 81E677F + .string "GROUDON and KYOGRE…\n" + .string "Where did they go?\p" + .string "Will they cause droughts or downpours\n" + .string "somewhere else?$" + +SootopolisCity_Text_1E67DC: @ 81E67DC + .string "I just get this sense somehow that\n" + .string "the two POKéMON aren’t angry.\p" + .string "I think… They probably can’t control\n" + .string "their own power…$" + +SootopolisCity_Text_1E6853: @ 81E6853 + .string "That flying POKéMON came down from\n" + .string "the sky and stopped the rampaging\l" + .string "POKéMON…$" + +SootopolisCity_Text_1E68A1: @ 81E68A1 + .string "I… I’ve never been out of this city.\p" + .string "I wonder what the world is like on\n" + .string "the other side of this round sky?$" + +SootopolisCity_Text_1E690B: @ 81E690B + .string "Wow!\n" + .string "This is wicked!$" + +SootopolisCity_Text_1E6920: @ 81E6920 + .string "Wow!\n" + .string "That was wicked!$" + +SootopolisCity_Text_1E6936: @ 81E6936 + .string "Go for it, red POKéMON!\n" + .string "Don’t back off, blue POKéMON!$" + +SootopolisCity_Text_1E696C: @ 81E696C + .string "… … … … … …\p" + .string "Hi, do you know the names of those\n" + .string "POKéMON fighting over there?$" + +SootopolisCity_Text_1E69B8: @ 81E69B8 + .string "I was wondering which one would win,\n" + .string "the red one or the blue one, but, oh no,\l" + .string "it’s the green one that settles things!\p" + .string "Talk about a huge turn of events!$" + +SootopolisCity_Text_1E6A50: @ 81E6A50 + .string "There’s an ancient legend that claims\n" + .string "the land and sea were shaped by\l" + .string "a colossal battle between POKéMON.\p" + .string "Well, I’m seeing that happen with\n" + .string "my very own eyes!\p" + .string "Whoa! I never expected to be\n" + .string "witness to something this huge!$" + +SootopolisCity_Text_1E6B2A: @ 81E6B2A + .string "There’s an ancient legend that claims\n" + .string "the land and sea were shaped by\l" + .string "a colossal battle between POKéMON.\p" + .string "Well, I saw that happen with\n" + .string "my very own eyes!\p" + .string "Whoa! I never expected to be\n" + .string "witness to something this huge!$" + +SootopolisCity_Text_1E6BFF: @ 81E6BFF + .string "A big POKéMON is fighting with\n" + .string "another big POKéMON!\p" + .string "Please, someone make them stop!$" + +SootopolisCity_Text_1E6C53: @ 81E6C53 + .string "A pretty POKéMON came down from\n" + .string "the sky…$" + +SootopolisCity_Text_1E6C7C: @ 81E6C7C + .string "Oh, no!\n" + .string "SOOTOPOLIS CITY will get wrecked!$" + +SootopolisCity_Text_1E6CA6: @ 81E6CA6 + .string "SOOTOPOLIS CITY didn’t get wrecked!$" + +SootopolisCity_Text_1E6CCA: @ 81E6CCA + .string "Hm!\n" + .string "You’ve come all the way to SOOTOPOLIS?\l" + .string "You’re no ordinary tourist.\p" + .string "But I suppose that doesn’t make you\n" + .string "an extraordinary tourist, either.$" + +SootopolisCity_Text_1E6D57: @ 81E6D57 + .string "The city has regained its calm…$" + +SootopolisCity_Text_1E6D77: @ 81E6D77 + .string "Who might you be?\p" + .string "This is the CAVE OF ORIGIN.\p" + .string "The spirits of POKéMON, becalmed at\n" + .string "MT. PYRE, are said to be revived here.\p" + .string "Please leave.$" + +SootopolisCity_Text_1E6DFE: @ 81E6DFE + .string "A person with a strong will and\n" + .string "superior talent…\p" + .string "A TRAINER who has knowledge and\n" + .string "experience of many kinds of POKéMON…\p" + .string "If such a person were to appear, I was\n" + .string "instructed by WALLACE to lead that\l" + .string "TRAINER to this CAVE.$" + +SootopolisCity_Text_1E6ED4: @ 81E6ED4 + .string "Oh, my…\p" + .string "The clash between the two awakened\n" + .string "POKéMON was quelled by the awakening\l" + .string "of a third POKéMON…$" + +SootopolisCity_Text_1E6F38: @ 81E6F38 + .string "This is the CAVE OF ORIGIN…\p" + .string "With the passing of the crisis,\n" + .string "the cave, too, shall sleep…$" + +SootopolisCity_Text_1E6F90: @ 81E6F90 + .string "SOOTOPOLIS sprang up as a town in\n" + .string "the crater of a volcano.\p" + .string "If you look up at the sky, the lip of\n" + .string "the crater is also visible.\l" + .string "So, all you see is the sky in a circle.\p" + .string "But that’s what makes the sky above\n" + .string "SOOTOPOLIS the most beautiful.$" + +SootopolisCity_Text_1E7078: @ 81E7078 + .string "When two POKéMON that gigantic\n" + .string "are fighting that savagely, there’s\l" + .string "not much that we can do.$" + +SootopolisCity_Text_1E70D4: @ 81E70D4 + .string "When that third POKéMON flew down,\n" + .string "I feared the worst.$" + +SootopolisCity_Text_1E710B: @ 81E710B + .string "A circle of a night sky framed by\n" + .string "the crater of a volcano…\p" + .string "And in that ring, stars flicker and\n" + .string "blink as if they were alive…\l" + .string "It’s my favorite scenery.$" + +SootopolisCity_Text_1E71A1: @ 81E71A1 + .string "The weather was clear this morning,\n" + .string "but…\p" + .string "All of a sudden, dark clouds brewed up,\n" + .string "rain started falling in sheets, and\l" + .string "there was thunder and lightning, too.\p" + .string "The weather just went completely\n" + .string "wild!\p" + .string "Is all of this because of those\n" + .string "POKéMON?$" + +SootopolisCity_Text_1E728C: @ 81E728C + .string "Oh?\p" + .string "It was you who brought that flying\n" + .string "POKéMON here?\p" + .string "Well, aren’t you amazing!$" + +SootopolisCity_Text_1E72DB: @ 81E72DB + .string "MAXIE: G… GROUDON…\n" + .string "Please! Stop what you’re doing!\p" + .string "I know the extent of your power now!\p" + .string "If you keep going, all HOENN, not just\n" + .string "SOOTOPOLIS, will be utterly ruined!$" + +SootopolisCity_Text_1E737E: @ 81E737E + .string "MAXIE: So the super-ancient POKéMON\n" + .string "weren’t only GROUDON and KYOGRE…\p" + .string "After all our fruitless scheming and\n" + .string "frantic efforts, that one POKéMON’s\l" + .string "simple action puts everything right\l" + .string "again as if nothing had happened…\p" + .string "Fu…\n" + .string "Fuhahaha…$" + +SootopolisCity_Text_1E7460: @ 81E7460 + .string "ARCHIE: KYOGRE! What’s wrong?!\n" + .string "Look over here! It’s the RED ORB!\l" + .string "Calm down! KYOGRE!\p" + .string "… … … … … …\n" + .string "… … … … … …\p" + .string "It’s no good!\n" + .string "It’s not responding at all!$" + +SootopolisCity_Text_1E74F6: @ 81E74F6 + .string "ARCHIE: KYOGRE and GROUDON both\n" + .string "flew off to who knows where.\p" + .string "The weather in HOENN has returned\n" + .string "to its normal state…\p" + .string "Haha…\n" + .string "Hahaha…\p" + .string "Maybe what we were trying to do was\n" + .string "something small, even meaningless,\l" + .string "to POKéMON…$" + +SootopolisCity_Text_1E75CB: @ 81E75CB + .string "STEVEN: Those POKéMON fighting…\n" + .string "GROUDON… And KYOGRE…\p" + .string "The two super-ancient POKéMON\n" + .string "were awakened from a long sleep…\p" + .string "And now they are smashing each other\n" + .string "with their uncontrollable energy…\p" + .string "…{PLAYER}{KUN}.\p" + .string "You being here now I’ll take to mean\n" + .string "that you’re prepared to become\l" + .string "involved in this crisis.\p" + .string "Well, then, there’s someone that\n" + .string "I’d like you to meet.\p" + .string "Come with me, please.$" + +SootopolisCity_Text_1E7737: @ 81E7737 + .string "STEVEN: Listen, {PLAYER}{KUN}.\p" + .string "Does seeing GROUDON and KYOGRE make\n" + .string "you think POKéMON are to be feared?\p" + .string "But that’s not true.\n" + .string "POKéMON are really more…\p" + .string "…Why am I asking you this?\n" + .string "You already know.$" + +SootopolisCity_Text_1E77F0: @ 81E77F0 + .string "STEVEN: Okay, here we are!\p" + .string "Inside here you’ll find someone named\n" + .string "WALLACE.\p" + .string "I think you have what’s needed to\n" + .string "help him…$" + +SootopolisCity_Text_1E7866: @ 81E7866 + .string "STEVEN: I think you have what’s\n" + .string "needed to help him…$" + +SootopolisCity_Text_1E789A: @ 81E789A + .string "STEVEN: The SKY PILLAR…\p" + .string "I’ve never been there.\n" + .string "I wonder where it could be?$" + +SootopolisCity_Text_1E78E5: @ 81E78E5 + .string "STEVEN: So that’s RAYQUAZA…\p" + .string "It’s incredible how the two rampaging\n" + .string "POKéMON would flee from it in fear…$" + +SootopolisCity_Text_1E794B: @ 81E794B + .string "STEVEN: It looks like both MAXIE and\n" + .string "ARCHIE have gone away somewhere.\p" + .string "Perhaps they’ve gone to MT. PYRE to\n" + .string "return those ORBS…$" + +SootopolisCity_Text_1E79C8: @ 81E79C8 + .string "WALLACE: Oh?\n" + .string "{PLAYER}{KUN}?\p" + .string "Haven’t you scaled the SKY PILLAR\n" + .string "yet?\p" + .string "I’m sure that you can make it to\n" + .string "the top of the SKY PILLAR…$" + +SootopolisCity_Text_1E7A3E: @ 81E7A3E + .string "WALLACE: {PLAYER}{KUN}…\p" + .string "The leaders of TEAM MAGMA and AQUA,\n" + .string "I don’t think they meant harm.\p" + .string "It wouldn’t hurt to hear what they\n" + .string "have to say for themselves.$" + +SootopolisCity_Text_1E7ACF: @ 81E7ACF + .string "WALLACE: {PLAYER}{KUN}…\n" + .string "My eyes didn’t deceive me.\p" + .string "Thanks to your help, SOOTOPOLIS…\n" + .string "No, all of HOENN was saved.\p" + .string "On behalf of the people, I thank you.\p" + .string "This is a gift from me.\n" + .string "Please accept it.$" + +SootopolisCity_Text_1E7B86: @ 81E7B86 + .string "That HIDDEN MACHINE contains\n" + .string "WATERFALL.\p" + .string "If you have the RAIN BADGE, a POKéMON\n" + .string "that has learned that HM move can\l" + .string "force its way up waterfalls.\p" + .string "And where does one get the RAIN BADGE?\n" + .string "You know, don’t you?\p" + .string "That’s right! You have to beat\n" + .string "the SOOTOPOLIS GYM LEADER.\p" + .string "When you’re all set to go, step through\n" + .string "that door.$" + +SootopolisCity_Text_1E7CBC: @ 81E7CBC + .string "WALLACE: I’m sure that you will be\n" + .string "dazzled by my mentor’s breathtakingly\l" + .string "elegant battle style.$" diff --git a/data/maps/SootopolisCity_Gym_1F/events.inc b/data/maps/SootopolisCity_Gym_1F/events.inc new file mode 100644 index 000000000..925acc34b --- /dev/null +++ b/data/maps/SootopolisCity_Gym_1F/events.inc @@ -0,0 +1,16 @@ +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 + +SootopolisCity_Gym_1F_MapWarps: @ 8533024 + 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 + bg_event 10, 24, 0, 1, 0, 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_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc new file mode 100644 index 000000000..af661890f --- /dev/null +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -0,0 +1,329 @@ +SootopolisCity_Gym_1F_MapScripts:: @ 8224E4C + map_script 2, SootopolisCity_Gym_1F_MapScript2_224ECB + map_script 5, SootopolisCity_Gym_1F_MapScript1_224E67 + map_script 1, SootopolisCity_Gym_1F_MapScript1_224E6A + map_script 3, SootopolisCity_Gym_1F_MapScript1_224E61 + .byte 0 + +SootopolisCity_Gym_1F_MapScript1_224E61: @ 8224E61 + setvar VAR_ICE_STEP_COUNT, 1 + end + +SootopolisCity_Gym_1F_MapScript1_224E67: @ 8224E67 + setstepcallback 4 + end + +SootopolisCity_Gym_1F_MapScript1_224E6A: @ 8224E6A + call SootopolisCity_Gym_1F_EventScript_224E73 + special SetSootopolisGymCrackedIceMetatiles + end + +SootopolisCity_Gym_1F_EventScript_224E73:: @ 8224E73 + compare VAR_ICE_STEP_COUNT, 8 + goto_if 0, SootopolisCity_Gym_1F_EventScript_224ECA + compare VAR_ICE_STEP_COUNT, 28 + goto_if 0, SootopolisCity_Gym_1F_EventScript_224EB8 + compare VAR_ICE_STEP_COUNT, 67 + goto_if 0, SootopolisCity_Gym_1F_EventScript_224EA6 + setmetatile 8, 4, 519, 0 + setmetatile 8, 5, 519, 0 + +SootopolisCity_Gym_1F_EventScript_224EA6:: @ 8224EA6 + setmetatile 8, 10, 519, 0 + setmetatile 8, 11, 519, 0 + +SootopolisCity_Gym_1F_EventScript_224EB8:: @ 8224EB8 + setmetatile 8, 15, 519, 0 + setmetatile 8, 16, 519, 0 + +SootopolisCity_Gym_1F_EventScript_224ECA:: @ 8224ECA + return + +SootopolisCity_Gym_1F_MapScript2_224ECB: @ 8224ECB + map_script_2 VAR_ICE_STEP_COUNT, 8, SootopolisCity_Gym_1F_EventScript_224EED + map_script_2 VAR_ICE_STEP_COUNT, 28, SootopolisCity_Gym_1F_EventScript_224F01 + map_script_2 VAR_ICE_STEP_COUNT, 67, SootopolisCity_Gym_1F_EventScript_224F15 + map_script_2 VAR_ICE_STEP_COUNT, 0, SootopolisCity_Gym_1F_EventScript_224F29 + .2byte 0 + +SootopolisCity_Gym_1F_EventScript_224EED:: @ 8224EED + addvar VAR_ICE_STEP_COUNT, 1 + delay 40 + playse SE_RU_GASHIN + call SootopolisCity_Gym_1F_EventScript_224E73 + special DrawWholeMapView + end + +SootopolisCity_Gym_1F_EventScript_224F01:: @ 8224F01 + addvar VAR_ICE_STEP_COUNT, 1 + delay 40 + playse SE_RU_GASHIN + call SootopolisCity_Gym_1F_EventScript_224E73 + special DrawWholeMapView + end + +SootopolisCity_Gym_1F_EventScript_224F15:: @ 8224F15 + addvar VAR_ICE_STEP_COUNT, 1 + delay 40 + playse SE_RU_GASHIN + call SootopolisCity_Gym_1F_EventScript_224E73 + special DrawWholeMapView + end + +SootopolisCity_Gym_1F_EventScript_224F29:: @ 8224F29 + lockall + delay 20 + applymovement 255, SootopolisCity_Gym_1F_Movement_224F42 + waitmovement 0 + playse SE_RU_HYUU + delay 60 + warphole MAP_SOOTOPOLIS_CITY_GYM_B1F + waitstate + end + +SootopolisCity_Gym_1F_Movement_224F42: @ 8224F42 + set_invisible + step_end + +SootopolisCity_Gym_1F_EventScript_224F44:: @ 8224F44 + trainerbattle 1, TRAINER_JUAN_1, 0, SootopolisCity_Gym_1F_Text_225268, SootopolisCity_Gym_1F_Text_225432, SootopolisCity_Gym_1F_EventScript_224F82 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq SootopolisCity_Gym_1F_EventScript_225025 + checkflag FLAG_0x0AC + goto_if 0, SootopolisCity_Gym_1F_EventScript_224FF7 + checkflag FLAG_BADGE06_GET + goto_if 0, SootopolisCity_Gym_1F_EventScript_22501B + msgbox SootopolisCity_Gym_1F_Text_225778, 4 + release + end + +SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 + message SootopolisCity_Gym_1F_Text_225598 + waitmessage + call SootopolisCity_Gym_1F_EventScript_27207E + msgbox SootopolisCity_Gym_1F_Text_2255BE, 4 + setflag FLAG_0x4F7 + setflag FLAG_BADGE08_GET + setflag FLAG_0x356 + setflag FLAG_0x3CD + setflag FLAG_0x330 + setvar VAR_0x405E, 6 + clearflag FLAG_0x347 + setvar VAR_0x8008, 8 + call SootopolisCity_Gym_1F_EventScript_271F43 + call SootopolisCity_Gym_1F_EventScript_224FD4 + closemessage + delay 30 + playfanfare MUS_ME_TORE_EYE + msgbox SootopolisCity_Gym_1F_Text_22574D, 4 + waitfanfare + closemessage + delay 30 + setflag FLAG_0x1D9 + release + end + +SootopolisCity_Gym_1F_EventScript_224FD4:: @ 8224FD4 + giveitem_std ITEM_TM03 + compare VAR_RESULT, 0 + goto_eq SootopolisCity_Gym_1F_EventScript_27205E + msgbox SootopolisCity_Gym_1F_Text_2256C1, 4 + setflag FLAG_0x0AC + return + +SootopolisCity_Gym_1F_EventScript_224FF7:: @ 8224FF7 + giveitem_std ITEM_TM03 + compare VAR_RESULT, 0 + goto_eq SootopolisCity_Gym_1F_EventScript_272054 + msgbox SootopolisCity_Gym_1F_Text_2256C1, 4 + setflag FLAG_0x0AC + release + end + +SootopolisCity_Gym_1F_EventScript_22501B:: @ 822501B + msgbox SootopolisCity_Gym_1F_Text_225865, 4 + release + end + +SootopolisCity_Gym_1F_EventScript_225025:: @ 8225025 + trainerbattle 7, TRAINER_JUAN_1, 0, SootopolisCity_Gym_1F_Text_225950, SootopolisCity_Gym_1F_Text_225A2E, SootopolisCity_Gym_1F_Text_225B48 + msgbox SootopolisCity_Gym_1F_Text_225A67, 6 + end + +SootopolisCity_Gym_1F_EventScript_225040:: @ 8225040 + lock + faceplayer + checkflag FLAG_0x4F7 + goto_eq SootopolisCity_Gym_1F_EventScript_225055 + msgbox SootopolisCity_Gym_1F_Text_225093, 4 + release + end + +SootopolisCity_Gym_1F_EventScript_225055:: @ 8225055 + msgbox SootopolisCity_Gym_1F_Text_2251AF, 4 + release + end + +SootopolisCity_Gym_1F_EventScript_22505F:: @ 822505F + lockall + checkflag FLAG_BADGE08_GET + goto_eq SootopolisCity_Gym_1F_EventScript_22507F + goto SootopolisCity_Gym_1F_EventScript_225089 + end + +SootopolisCity_Gym_1F_EventScript_22506F:: @ 822506F + lockall + checkflag FLAG_BADGE08_GET + goto_eq SootopolisCity_Gym_1F_EventScript_22507F + goto SootopolisCity_Gym_1F_EventScript_225089 + end + +SootopolisCity_Gym_1F_EventScript_22507F:: @ 822507F + msgbox SootopolisCity_Gym_1F_Text_225916, 4 + releaseall + end + +SootopolisCity_Gym_1F_EventScript_225089:: @ 8225089 + msgbox SootopolisCity_Gym_1F_Text_2258FA, 4 + releaseall + end + +SootopolisCity_Gym_1F_Text_225093: @ 8225093 + .string "Yo! How’s it going, CHAMPION-\n" + .string "bound {PLAYER}?\p" + .string "SOOTOPOLIS’s GYM LEADER JUAN is\n" + .string "a master of WATER-type POKéMON.\p" + .string "And, to get to JUAN, an icy floor\n" + .string "will hamper your progress…\p" + .string "Listen, I’m sorry, but that’s all the\n" + .string "advice that I have for you.\p" + .string "The rest of the way, you have to\n" + .string "go for it yourself!$" + +SootopolisCity_Gym_1F_Text_2251AF: @ 82251AF + .string "Yow! You’ve beaten even JUAN, who\n" + .string "was supposedly the best in all HOENN!\p" + .string "Okay! Check out your TRAINER CARD.\p" + .string "If you’ve gotten all the BADGES, you’re\n" + .string "set for the POKéMON LEAGUE challenge!$" + +SootopolisCity_Gym_1F_Text_225268: @ 8225268 + .string "Let me ask you.\n" + .string "Did you know?\l" + .string "Ah, I should not be so coy.\p" + .string "It was I who taught WALLACE everything\n" + .string "there is to know about POKéMON.\p" + .string "Once, I had given up my position as\n" + .string "the GYM LEADER.\p" + .string "In my place, I had entrusted WALLACE\n" + .string "with the GYM.\p" + .string "However, a compelling reason arose for\n" + .string "me to make a comeback.\p" + .string "Ah, but enough chatter.\n" + .string "Let us begin our match, shall we?\p" + .string "Please, you shall bear witness to\n" + .string "our artistry.\p" + .string "A grand illusion of water sculpted\n" + .string "by POKéMON and myself!$" + +SootopolisCity_Gym_1F_Text_225432: @ 8225432 + .string "Ahahaha, excellent!\n" + .string "Very well, you are the winner.\p" + .string "From you, I sense the brilliant shine\n" + .string "of skill that will overcome all.\p" + .string "However, compared with me or even\n" + .string "WALLACE, you are lacking in elegance.\p" + .string "Perhaps I should make you a loan\n" + .string "of my outfit?\p" + .string "… … … … … …\n" + .string "… … … … … …\p" + .string "Hahaha, I merely jest!\p" + .string "Rather than my clothes, I shall reward\n" + .string "you with this, the RAIN BADGE!$" + +SootopolisCity_Gym_1F_Text_225598: @ 8225598 + .string "{PLAYER} received the RAIN BADGE\n" + .string "from JUAN.$" + +SootopolisCity_Gym_1F_Text_2255BE: @ 82255BE + .string "Having the RAIN BADGE shall assure you\n" + .string "the full obedience of all your POKéMON\l" + .string "to your every command.\p" + .string "The RAIN BADGE also allows the use\n" + .string "of the HM move WATERFALL to scale\l" + .string "walls of cascading water.\p" + .string "And, so that you never forget the\n" + .string "battle we shared, take this…$" + +SootopolisCity_Gym_1F_Text_2256C1: @ 82256C1 + .string "The TECHNICAL MACHINE I handed you\n" + .string "contains WATER PULSE.\p" + .string "In use, it will occasionally confuse\n" + .string "the target with ultrasonic waves.\p" + .string "… … … … … …$" + +SootopolisCity_Gym_1F_Text_22574D: @ 822574D + .string "Registered GYM LEADER JUAN\n" + .string "in the POKéNAV.$" + +SootopolisCity_Gym_1F_Text_225778: @ 8225778 + .string "The TRAINERS who have gathered all\n" + .string "the GYM BADGES of HOENN should make\l" + .string "way to the ultimate destination.\p" + .string "The POKéMON LEAGUE.\p" + .string "Travel to the easternmost reaches\n" + .string "of HOENN, to the island EVER GRANDE.\p" + .string "There, you shall find the POKéMON\n" + .string "LEAGUE.$" + +SootopolisCity_Gym_1F_Text_225865: @ 8225865 + .string "There remains but one BADGE to\n" + .string "obtain in HOENN.\p" + .string "If you wish to challenge the POKéMON\n" + .string "LEAGUE, you must obtain the last\l" + .string "BADGE from the GYM in FORTREE.$" + +SootopolisCity_Gym_1F_Text_2258FA: @ 82258FA + .string "SOOTOPOLIS CITY POKéMON GYM$" + +SootopolisCity_Gym_1F_Text_225916: @ 8225916 + .string "SOOTOPOLIS CITY POKéMON GYM\p" + .string "JUAN’S CERTIFIED TRAINERS:\n" + .string "{PLAYER}$" + +SootopolisCity_Gym_1F_Text_225950: @ 8225950 + .string "JUAN: Ah, this GYM had returned to its\n" + .string "usual state of serenity…\p" + .string "But our young typhoon has returned\n" + .string "to put us to the test again!\p" + .string "Well, my friend, most certainly!\p" + .string "I shall be delighted to dance with you\n" + .string "as often as you wish!$" + +SootopolisCity_Gym_1F_Text_225A2E: @ 8225A2E + .string "Ahahaha, you are the winner!\n" + .string "You have defeated me again!$" + +SootopolisCity_Gym_1F_Text_225A67: @ 8225A67 + .string "JUAN: If I told you to become my\n" + .string "apprentice, you will refuse, I am sure.\p" + .string "I would like to make a gift of my coat\n" + .string "to you.\p" + .string "But again, you will refuse.\n" + .string "I imagine that to be so.\p" + .string "And that, my friend, is a certain sign\n" + .string "of nobility!$" + +SootopolisCity_Gym_1F_Text_225B48: @ 8225B48 + .string "JUAN: Ah, this GYM had returned to its\n" + .string "usual state of serenity…\p" + .string "But our young typhoon has returned\n" + .string "to put us to the test again!\p" + .string "Well, my friend, most certainly!\n" + .string "I shall be delighted to dance with you…\p" + .string "Ah, no, no, no.\n" + .string "You have with you but one POKéMON.\p" + .string "I wish that you would return with\n" + .string "two, perhaps more, POKéMON, please.$" + diff --git a/data/maps/SootopolisCity_Gym_B1F/events.inc b/data/maps/SootopolisCity_Gym_B1F/events.inc new file mode 100644 index 000000000..1ed20fc94 --- /dev/null +++ b/data/maps/SootopolisCity_Gym_B1F/events.inc @@ -0,0 +1,18 @@ +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 + +SootopolisCity_Gym_B1F_MapWarps: @ 8533158 + 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/SootopolisCity_Gym_B1F/scripts.inc b/data/maps/SootopolisCity_Gym_B1F/scripts.inc new file mode 100644 index 000000000..8aaa604e2 --- /dev/null +++ b/data/maps/SootopolisCity_Gym_B1F/scripts.inc @@ -0,0 +1,183 @@ +SootopolisCity_Gym_B1F_MapScripts:: @ 8225C8A + .byte 0 + +SootopolisCity_Gym_B1F_EventScript_225C8B:: @ 8225C8B + trainerbattle 0, TRAINER_ANDREA, 0, SootopolisCity_Gym_B1F_Text_225D71, SootopolisCity_Gym_B1F_Text_225DB6 + msgbox SootopolisCity_Gym_B1F_Text_225DCF, 6 + end + +SootopolisCity_Gym_B1F_EventScript_225CA2:: @ 8225CA2 + trainerbattle 0, TRAINER_CRISSY, 0, SootopolisCity_Gym_B1F_Text_225E04, SootopolisCity_Gym_B1F_Text_225E60 + msgbox SootopolisCity_Gym_B1F_Text_225E90, 6 + end + +SootopolisCity_Gym_B1F_EventScript_225CB9:: @ 8225CB9 + trainerbattle 0, TRAINER_BRIANNA, 0, SootopolisCity_Gym_B1F_Text_22646E, SootopolisCity_Gym_B1F_Text_226495 + msgbox SootopolisCity_Gym_B1F_Text_2264BC, 6 + end + +SootopolisCity_Gym_B1F_EventScript_225CD0:: @ 8225CD0 + trainerbattle 0, TRAINER_CONNIE, 0, SootopolisCity_Gym_B1F_Text_225FBE, SootopolisCity_Gym_B1F_Text_225FEB + msgbox SootopolisCity_Gym_B1F_Text_225FFE, 6 + end + +SootopolisCity_Gym_B1F_EventScript_225CE7:: @ 8225CE7 + trainerbattle 0, TRAINER_BRIDGET, 0, SootopolisCity_Gym_B1F_Text_226061, SootopolisCity_Gym_B1F_Text_2260B6 + msgbox SootopolisCity_Gym_B1F_Text_2260D1, 6 + end + +SootopolisCity_Gym_B1F_EventScript_225CFE:: @ 8225CFE + trainerbattle 0, TRAINER_OLIVIA, 0, SootopolisCity_Gym_B1F_Text_226164, SootopolisCity_Gym_B1F_Text_2261A7 + msgbox SootopolisCity_Gym_B1F_Text_2261B5, 6 + end + +SootopolisCity_Gym_B1F_EventScript_225D15:: @ 8225D15 + trainerbattle 0, TRAINER_TIFFANY, 0, SootopolisCity_Gym_B1F_Text_2261F7, SootopolisCity_Gym_B1F_Text_226274 + msgbox SootopolisCity_Gym_B1F_Text_226286, 6 + end + +SootopolisCity_Gym_B1F_EventScript_225D2C:: @ 8225D2C + trainerbattle 0, TRAINER_BETHANY, 0, SootopolisCity_Gym_B1F_Text_2262F3, SootopolisCity_Gym_B1F_Text_22633B + msgbox SootopolisCity_Gym_B1F_Text_226341, 6 + end + +SootopolisCity_Gym_B1F_EventScript_225D43:: @ 8225D43 + trainerbattle 0, TRAINER_ANNIKA, 0, SootopolisCity_Gym_B1F_Text_226388, SootopolisCity_Gym_B1F_Text_2263BD + msgbox SootopolisCity_Gym_B1F_Text_2263F4, 6 + end + +SootopolisCity_Gym_B1F_EventScript_225D5A:: @ 8225D5A + trainerbattle 0, TRAINER_DAPHNE, 0, SootopolisCity_Gym_B1F_Text_225ED6, SootopolisCity_Gym_B1F_Text_225F35 + msgbox SootopolisCity_Gym_B1F_Text_225F67, 6 + end + +SootopolisCity_Gym_B1F_Text_225D71: @ 8225D71 + .string "I’ll show you the sublime techniques\n" + .string "I learned from our LEADER JUAN!$" + +SootopolisCity_Gym_B1F_Text_225DB6: @ 8225DB6 + .string "Please forgive me, JUAN…$" + +SootopolisCity_Gym_B1F_Text_225DCF: @ 8225DCF + .string "Watch what happens if you crack all\n" + .string "the floor tiles.$" + +SootopolisCity_Gym_B1F_Text_225E04: @ 8225E04 + .string "You came all the way here, but you won’t\n" + .string "get to see JUAN.\p" + .string "Not if you lose to me, you won’t!$" + +SootopolisCity_Gym_B1F_Text_225E60: @ 8225E60 + .string "You’re strong!\n" + .string "I was fooled by your cute looks!$" + +SootopolisCity_Gym_B1F_Text_225E90: @ 8225E90 + .string "You might be good enough to avoid\n" + .string "being wiped out in one hit by JUAN.$" + +SootopolisCity_Gym_B1F_Text_225ED6: @ 8225ED6 + .string "The sight of JUAN conducting\n" + .string "a battle…\p" + .string "The very beauty of it compelled me to\n" + .string "become a TRAINER.$" + +SootopolisCity_Gym_B1F_Text_225F35: @ 8225F35 + .string "You battled with more beauty than\n" + .string "I could muster…$" + +SootopolisCity_Gym_B1F_Text_225F67: @ 8225F67 + .string "The grace you bring to battle is\n" + .string "fabulous.\p" + .string "Oh… I’m so fortunate to have found\n" + .string "POKéMON.$" + +SootopolisCity_Gym_B1F_Text_225FBE: @ 8225FBE + .string "I should teach you how harsh battles\n" + .string "can be.$" + +SootopolisCity_Gym_B1F_Text_225FEB: @ 8225FEB + .string "Oh.\n" + .string "You’re strong.$" + +SootopolisCity_Gym_B1F_Text_225FFE: @ 8225FFE + .string "I’ll tell you something good.\p" + .string "If you want to reach JUAN, you\n" + .string "need to walk on each floor tile once.$" + +SootopolisCity_Gym_B1F_Text_226061: @ 8226061 + .string "The POKéMON GYM of the highest level\n" + .string "in the HOENN region…\p" + .string "That’s the SOOTOPOLIS GYM.$" + +SootopolisCity_Gym_B1F_Text_2260B6: @ 82260B6 + .string "What a high level you are!$" + +SootopolisCity_Gym_B1F_Text_2260D1: @ 82260D1 + .string "Rather than being satisfied by being\n" + .string "in a strong GYM, I imagine training in\l" + .string "other places will make you stronger.\l" + .string "But above all, it looks more fun.$" + +SootopolisCity_Gym_B1F_Text_226164: @ 8226164 + .string "I train my POKéMON together with\n" + .string "JUAN.\p" + .string "Don’t think I’m a pushover.$" + +SootopolisCity_Gym_B1F_Text_2261A7: @ 82261A7 + .string "I was beaten…$" + +SootopolisCity_Gym_B1F_Text_2261B5: @ 82261B5 + .string "I think you have potential.\n" + .string "Why don’t you stay and train with us?$" + +SootopolisCity_Gym_B1F_Text_2261F7: @ 82261F7 + .string "A graceful glide across the ice while\n" + .string "crossing no lines…\p" + .string "A TRAINER putting on that performance\n" + .string "would be elegantly beautiful!$" + +SootopolisCity_Gym_B1F_Text_226274: @ 8226274 + .string "Well, excuse me?!$" + +SootopolisCity_Gym_B1F_Text_226286: @ 8226286 + .string "This is really obvious, but how strong\n" + .string "you are as a TRAINER has nothing to do\l" + .string "with how young or old you are.$" + +SootopolisCity_Gym_B1F_Text_2262F3: @ 82262F3 + .string "When I’m with my POKéMON, the time\n" + .string "flies by before you can say, “Oops!â€$" + +SootopolisCity_Gym_B1F_Text_22633B: @ 822633B + .string "Oops!$" + +SootopolisCity_Gym_B1F_Text_226341: @ 8226341 + .string "I wish I could forget about lost causes\n" + .string "before I can manage an “Oops!â€$" + +SootopolisCity_Gym_B1F_Text_226388: @ 8226388 + .string "I can battle with really rare POKéMON\n" + .string "if you’d like.$" + +SootopolisCity_Gym_B1F_Text_2263BD: @ 82263BD + .string "Oh, there now! Did you have a good look\n" + .string "at my POKéMON?$" + +SootopolisCity_Gym_B1F_Text_2263F4: @ 82263F4 + .string "I came to this GYM because JUAN\n" + .string "praised me for my darling POKéMON.\p" + .string "Oh, if only I’d met JUAN years ago\n" + .string "when I was younger…$" + +SootopolisCity_Gym_B1F_Text_22646E: @ 822646E + .string "Giggle…\n" + .string "Your grim look is so charming.$" + +SootopolisCity_Gym_B1F_Text_226495: @ 8226495 + .string "Oh, dear.\n" + .string "I went much too easy on you.$" + +SootopolisCity_Gym_B1F_Text_2264BC: @ 82264BC + .string "You couldn’t lay a finger on JUAN,\n" + .string "I’m sure. Giggle…$" + diff --git a/data/maps/SootopolisCity_House1/events.inc b/data/maps/SootopolisCity_House1/events.inc new file mode 100644 index 000000000..4ddbd23ea --- /dev/null +++ b/data/maps/SootopolisCity_House1/events.inc @@ -0,0 +1,11 @@ +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 + +SootopolisCity_House1_MapWarps: @ 8533328 + 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/SootopolisCity_House1/scripts.inc b/data/maps/SootopolisCity_House1/scripts.inc new file mode 100644 index 000000000..7c898a0b2 --- /dev/null +++ b/data/maps/SootopolisCity_House1/scripts.inc @@ -0,0 +1,45 @@ +SootopolisCity_House1_MapScripts:: @ 822694C + .byte 0 + +SootopolisCity_House1_EventScript_22694D:: @ 822694D + lock + faceplayer + checkflag FLAG_0x079 + goto_eq SootopolisCity_House1_EventScript_226984 + msgbox SootopolisCity_House1_Text_2269A1, 4 + giveitem_std ITEM_TM31 + compare VAR_RESULT, 0 + goto_eq SootopolisCity_House1_EventScript_272054 + setflag FLAG_0x079 + msgbox SootopolisCity_House1_Text_226A13, 4 + release + end + +SootopolisCity_House1_EventScript_226984:: @ 8226984 + msgbox SootopolisCity_House1_Text_226A13, 4 + release + end + +SootopolisCity_House1_EventScript_22698E:: @ 822698E + lock + faceplayer + waitse + playmoncry SPECIES_KECLEON, 0 + msgbox SootopolisCity_House1_Text_226A60, 4 + waitmoncry + release + end + +SootopolisCity_House1_Text_2269A1: @ 82269A1 + .string "For thirty years I’ve remained in\n" + .string "SOOTOPOLIS honing my skills.\p" + .string "I developed a shattering TM.\n" + .string "I bequeath it to you!$" + +SootopolisCity_House1_Text_226A13: @ 8226A13 + .string "TM31 contains BRICK BREAK! It’s a move\n" + .string "so horrible that I can’t describe it.$" + +SootopolisCity_House1_Text_226A60: @ 8226A60 + .string "KECLEON: Puu puhyaah.$" + diff --git a/data/maps/SootopolisCity_House2/events.inc b/data/maps/SootopolisCity_House2/events.inc new file mode 100644 index 000000000..213fe39d3 --- /dev/null +++ b/data/maps/SootopolisCity_House2/events.inc @@ -0,0 +1,10 @@ +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 + +SootopolisCity_House2_MapWarps: @ 8533364 + 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/SootopolisCity_House2/scripts.inc b/data/maps/SootopolisCity_House2/scripts.inc new file mode 100644 index 000000000..82270ca56 --- /dev/null +++ b/data/maps/SootopolisCity_House2/scripts.inc @@ -0,0 +1,36 @@ +SootopolisCity_House2_MapScripts:: @ 8226A76 + .byte 0 + +SootopolisCity_House2_EventScript_226A77:: @ 8226A77 + lock + faceplayer + msgbox SootopolisCity_House2_Text_226AAB, 5 + compare VAR_RESULT, 1 + call_if 1, SootopolisCity_House2_EventScript_226A99 + compare VAR_RESULT, 0 + call_if 1, SootopolisCity_House2_EventScript_226AA2 + release + end + +SootopolisCity_House2_EventScript_226A99:: @ 8226A99 + msgbox SootopolisCity_House2_Text_226AF1, 4 + return + +SootopolisCity_House2_EventScript_226AA2:: @ 8226AA2 + msgbox SootopolisCity_House2_Text_226B41, 4 + return + +SootopolisCity_House2_Text_226AAB: @ 8226AAB + .string "MT. PYRE…\p" + .string "At its peak are two orbs placed side\n" + .string "by side. Did you know?$" + +SootopolisCity_House2_Text_226AF1: @ 8226AF1 + .string "Yes, two orbs side by side…\p" + .string "The sight of them together…\n" + .string "It is somehow soothing…$" + +SootopolisCity_House2_Text_226B41: @ 8226B41 + .string "Is that so?\n" + .string "Perhaps you ought to visit and see…$" + diff --git a/data/maps/SootopolisCity_House3/events.inc b/data/maps/SootopolisCity_House3/events.inc new file mode 100644 index 000000000..0feca97cb --- /dev/null +++ b/data/maps/SootopolisCity_House3/events.inc @@ -0,0 +1,11 @@ +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 + +SootopolisCity_House3_MapWarps: @ 85333B8 + 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/SootopolisCity_House3/scripts.inc b/data/maps/SootopolisCity_House3/scripts.inc new file mode 100644 index 000000000..415f90642 --- /dev/null +++ b/data/maps/SootopolisCity_House3/scripts.inc @@ -0,0 +1,43 @@ +SootopolisCity_House3_MapScripts:: @ 8226B71 + .byte 0 + +SootopolisCity_House3_EventScript_226B72:: @ 8226B72 + lock + faceplayer + msgbox SootopolisCity_House3_Text_226BA4, 5 + compare VAR_RESULT, 1 + goto_eq SootopolisCity_House3_EventScript_226B91 + msgbox SootopolisCity_House3_Text_226C44, 4 + release + end + +SootopolisCity_House3_EventScript_226B91:: @ 8226B91 + msgbox SootopolisCity_House3_Text_226C20, 4 + release + end + +SootopolisCity_House3_EventScript_226B9B:: @ 8226B9B + msgbox SootopolisCity_House3_Text_226C9C, 2 + end + +SootopolisCity_House3_Text_226BA4: @ 8226BA4 + .string "You’re a POKéMON TRAINER, aren’t you?\p" + .string "SOOTOPOLIS’s JUAN has many fans.\n" + .string "Even more than his student WALLACE!\p" + .string "Do you have any?$" + +SootopolisCity_House3_Text_226C20: @ 8226C20 + .string "Oh, then you must be pretty strong.$" + +SootopolisCity_House3_Text_226C44: @ 8226C44 + .string "Oh, dear…\n" + .string "That’s a little lonesome.\p" + .string "Try working a little harder to get\n" + .string "a fan following.$" + +SootopolisCity_House3_Text_226C9C: @ 8226C9C + .string "Dedicated fans come over from even\n" + .string "outside of HOENN.\p" + .string "It was really wild when I went to the\n" + .string "TRAINER FAN CLUB in LILYCOVE.$" + diff --git a/data/maps/SootopolisCity_House4/events.inc b/data/maps/SootopolisCity_House4/events.inc new file mode 100644 index 000000000..1f14ba6e9 --- /dev/null +++ b/data/maps/SootopolisCity_House4/events.inc @@ -0,0 +1,12 @@ +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 + +SootopolisCity_House4_MapWarps: @ 8533424 + 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/SootopolisCity_House4/scripts.inc b/data/maps/SootopolisCity_House4/scripts.inc new file mode 100644 index 000000000..e34e6991d --- /dev/null +++ b/data/maps/SootopolisCity_House4/scripts.inc @@ -0,0 +1,39 @@ +SootopolisCity_House4_MapScripts:: @ 8226D15 + .byte 0 + +SootopolisCity_House4_EventScript_226D16:: @ 8226D16 + msgbox SootopolisCity_House4_Text_226D3B, 2 + end + +SootopolisCity_House4_EventScript_226D1F:: @ 8226D1F + msgbox SootopolisCity_House4_Text_226DEA, 2 + end + +SootopolisCity_House4_EventScript_226D28:: @ 8226D28 + lock + faceplayer + waitse + playmoncry SPECIES_AZUMARILL, 0 + msgbox SootopolisCity_House4_Text_226E7F, 4 + waitmoncry + release + end + +SootopolisCity_House4_Text_226D3B: @ 8226D3B + .string "Listen up, and I’ll tell you something\n" + .string "good.\p" + .string "There’s supposed to be an ancient\n" + .string "ruin in the sea around here.\p" + .string "There could be treasures just waiting\n" + .string "to be discovered down there.$" + +SootopolisCity_House4_Text_226DEA: @ 8226DEA + .string "Ancient treasures…\p" + .string "It would be nice if they existed, but\n" + .string "even if they didn’t, it would be so\l" + .string "beautiful to take an underwater\l" + .string "stroll with my POKéMON.$" + +SootopolisCity_House4_Text_226E7F: @ 8226E7F + .string "AZUMARILL: Marurii.$" + diff --git a/data/maps/SootopolisCity_House5/events.inc b/data/maps/SootopolisCity_House5/events.inc new file mode 100644 index 000000000..566631c02 --- /dev/null +++ b/data/maps/SootopolisCity_House5/events.inc @@ -0,0 +1,11 @@ +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 + +SootopolisCity_House5_MapWarps: @ 8533478 + 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/SootopolisCity_House5/scripts.inc b/data/maps/SootopolisCity_House5/scripts.inc new file mode 100644 index 000000000..51da02de1 --- /dev/null +++ b/data/maps/SootopolisCity_House5/scripts.inc @@ -0,0 +1,20 @@ +SootopolisCity_House5_MapScripts:: @ 8226E93 + .byte 0 + +SootopolisCity_House5_EventScript_226E94:: @ 8226E94 + msgbox SootopolisCity_House5_Text_226EA6, 2 + end + +SootopolisCity_House5_EventScript_226E9D:: @ 8226E9D + msgbox SootopolisCity_House5_Text_226F35, 2 + end + +SootopolisCity_House5_Text_226EA6: @ 8226EA6 + .string "There appears to be some connection\n" + .string "between SOOTOPOLIS and MT. PYRE.\p" + .string "My friends and I did some research on\n" + .string "it at the lab where I used to work.$" + +SootopolisCity_House5_Text_226F35: @ 8226F35 + .string "My big brother used to study the sea.$" + diff --git a/data/maps/SootopolisCity_House6/events.inc b/data/maps/SootopolisCity_House6/events.inc new file mode 100644 index 000000000..a85356317 --- /dev/null +++ b/data/maps/SootopolisCity_House6/events.inc @@ -0,0 +1,10 @@ +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 + +SootopolisCity_House6_MapWarps: @ 85334B4 + 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/SootopolisCity_House6/scripts.inc b/data/maps/SootopolisCity_House6/scripts.inc new file mode 100644 index 000000000..38c8456a3 --- /dev/null +++ b/data/maps/SootopolisCity_House6/scripts.inc @@ -0,0 +1,56 @@ +SootopolisCity_House6_MapScripts:: @ 8226F5B + .byte 0 + +SootopolisCity_House6_EventScript_226F5C:: @ 8226F5C + lock + faceplayer + checkflag FLAG_0x0F5 + goto_eq SootopolisCity_House6_EventScript_226FA3 + msgbox SootopolisCity_House6_Text_226FC3, 5 + compare VAR_RESULT, 0 + call_if 1, SootopolisCity_House6_EventScript_226F99 + msgbox SootopolisCity_House6_Text_227034, 4 + givedecoration_std 117 + compare VAR_RESULT, 0 + goto_eq SootopolisCity_House6_EventScript_226FAD + setflag FLAG_0x0F5 + release + end + +SootopolisCity_House6_EventScript_226F99:: @ 8226F99 + msgbox SootopolisCity_House6_Text_22708F, 4 + release + end + +SootopolisCity_House6_EventScript_226FA3:: @ 8226FA3 + msgbox SootopolisCity_House6_Text_2270B7, 4 + release + end + +SootopolisCity_House6_EventScript_226FAD:: @ 8226FAD + bufferdecorationname 1, 117 + msgbox gUnknown_08272B1A, 4 + msgbox SootopolisCity_House6_Text_22704A, 4 + release + end + +SootopolisCity_House6_Text_226FC3: @ 8226FC3 + .string "Hello! You’re our first guest in\n" + .string "a good while.\p" + .string "You’ve brightened up my day, so I’ll\n" + .string "give you a big WAILMER DOLL.$" + +SootopolisCity_House6_Text_227034: @ 8227034 + .string "Take good care of it!$" + +SootopolisCity_House6_Text_22704A: @ 822704A + .string "Oh, you want it, but not right now?\n" + .string "Okay, then I’ll hold it for you.$" + +SootopolisCity_House6_Text_22708F: @ 822708F + .string "Are you sure?\n" + .string "You don’t want this DOLL?$" + +SootopolisCity_House6_Text_2270B7: @ 82270B7 + .string "I love plush DOLLS!$" + diff --git a/data/maps/SootopolisCity_House7/events.inc b/data/maps/SootopolisCity_House7/events.inc new file mode 100644 index 000000000..65b0cf9dd --- /dev/null +++ b/data/maps/SootopolisCity_House7/events.inc @@ -0,0 +1,11 @@ +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 + +SootopolisCity_House7_MapWarps: @ 8533508 + 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/SootopolisCity_House7/scripts.inc b/data/maps/SootopolisCity_House7/scripts.inc new file mode 100644 index 000000000..9df9cde0b --- /dev/null +++ b/data/maps/SootopolisCity_House7/scripts.inc @@ -0,0 +1,26 @@ +SootopolisCity_House7_MapScripts:: @ 82270CB + .byte 0 + +SootopolisCity_House7_EventScript_2270CC:: @ 82270CC + msgbox SootopolisCity_House7_Text_2270DE, 2 + end + +SootopolisCity_House7_EventScript_2270D5:: @ 82270D5 + msgbox SootopolisCity_House7_Text_227190, 2 + end + +SootopolisCity_House7_Text_2270DE: @ 82270DE + .string "An underwater volcano erupted and\n" + .string "forced itself up from the depths.\p" + .string "Its crater emerged from the sea and\n" + .string "became filled with rainwater.\p" + .string "That’s how SOOTOPOLIS CITY came into\n" + .string "being.$" + +SootopolisCity_House7_Text_227190: @ 8227190 + .string "The cave that links SOOTOPOLIS and\n" + .string "the outside world…\p" + .string "It seems as if the cave was made to\n" + .string "keep something from getting out.\p" + .string "Or am I just imagining things?$" + diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc new file mode 100644 index 000000000..84e642bac --- /dev/null +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc @@ -0,0 +1,15 @@ +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 + +SootopolisCity_LotadAndSeedotHouse_MapWarps: @ 853355C + 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 + bg_event 2, 1, 0, 0, 0, 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/SootopolisCity_LotadAndSeedotHouse/scripts.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc new file mode 100644 index 000000000..26a322b89 --- /dev/null +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc @@ -0,0 +1,210 @@ +SootopolisCity_LotadAndSeedotHouse_MapScripts:: @ 822722A + .byte 0 + +SootopolisCity_LotadAndSeedotHouse_EventScript_22722B:: @ 822722B + special GetSeedotSizeRecordInfo + lock + faceplayer + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227369, 4 + special sub_81B94B0 + waitstate + copyvar VAR_RESULT, VAR_0x8004 + compare VAR_RESULT, 255 + goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227272 + special CompareSeedotSize + compare VAR_RESULT, 1 + goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_22727C + compare VAR_RESULT, 2 + goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227286 + compare VAR_RESULT, 3 + goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227290 + release + end + +SootopolisCity_LotadAndSeedotHouse_EventScript_227272:: @ 8227272 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_2275BC, 4 + release + end + +SootopolisCity_LotadAndSeedotHouse_EventScript_22727C:: @ 822727C + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227584, 4 + release + end + +SootopolisCity_LotadAndSeedotHouse_EventScript_227286:: @ 8227286 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227544, 4 + release + end + +SootopolisCity_LotadAndSeedotHouse_EventScript_227290:: @ 8227290 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227480, 4 + giveitem_std ITEM_ELIXIR + compare VAR_RESULT, 0 + goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_2272B2 + closemessage + release + end + +SootopolisCity_LotadAndSeedotHouse_EventScript_2272B2:: @ 82272B2 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227524, 4 + release + end + +SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC:: @ 82272BC + special GetLotadSizeRecordInfo + lock + faceplayer + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227676, 4 + special sub_81B94B0 + waitstate + copyvar VAR_RESULT, VAR_0x8004 + compare VAR_RESULT, 255 + goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227303 + special CompareLotadSize + compare VAR_RESULT, 1 + goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_22730D + compare VAR_RESULT, 2 + goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227317 + compare VAR_RESULT, 3 + goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227321 + release + end + +SootopolisCity_LotadAndSeedotHouse_EventScript_227303:: @ 8227303 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227896, 4 + release + end + +SootopolisCity_LotadAndSeedotHouse_EventScript_22730D:: @ 822730D + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227867, 4 + release + end + +SootopolisCity_LotadAndSeedotHouse_EventScript_227317:: @ 8227317 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_22782A, 4 + release + end + +SootopolisCity_LotadAndSeedotHouse_EventScript_227321:: @ 8227321 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_22776C, 4 + giveitem_std ITEM_ELIXIR + compare VAR_RESULT, 0 + goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227343 + closemessage + release + end + +SootopolisCity_LotadAndSeedotHouse_EventScript_227343:: @ 8227343 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_22780A, 4 + release + end + +SootopolisCity_LotadAndSeedotHouse_EventScript_22734D:: @ 822734D + special GetSeedotSizeRecordInfo + lockall + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227617, 4 + releaseall + end + +SootopolisCity_LotadAndSeedotHouse_EventScript_22735B:: @ 822735B + special GetLotadSizeRecordInfo + lockall + msgbox SootopolisCity_LotadAndSeedotHouse_Text_2278F2, 4 + releaseall + end + +SootopolisCity_LotadAndSeedotHouse_Text_227369: @ 8227369 + .string "Do you know the POKéMON SEEDOT?\n" + .string "It’s hardly ever seen in SOOTOPOLIS.\p" + .string "Anyway, I love big SEEDOT.\n" + .string "The bigger the better.\p" + .string "But my younger brother, he says that\n" + .string "LOTAD is bigger.\p" + .string "That’s silly.\n" + .string "SEEDOT has to be bigger than that!\p" + .string "Huh? Do you have a SEEDOT with you?\n" + .string "P-p-please, show me!$" + +SootopolisCity_LotadAndSeedotHouse_Text_227480: @ 8227480 + .string "{STR_VAR_2} inches!\n" + .string "Oh, my gosh, this is a big one!\p" + .string "It might even beat the big LOTAD\n" + .string "my younger brother saw!\p" + .string "Thanks for showing me.\n" + .string "This is my thanks!$" + +SootopolisCity_LotadAndSeedotHouse_Text_22750E: @ 822750E + .string "{PLAYER} received a POTION.$" + +SootopolisCity_LotadAndSeedotHouse_Text_227524: @ 8227524 + .string "Hunh?\n" + .string "Your BAG is crammed full.$" + +SootopolisCity_LotadAndSeedotHouse_Text_227544: @ 8227544 + .string "{STR_VAR_2} inches, is it?\p" + .string "Hmm… I’ve seen a bigger SEEDOT\n" + .string "than this one.$" + +SootopolisCity_LotadAndSeedotHouse_Text_227584: @ 8227584 + .string "Oh, now this is quite something…\n" + .string "But it’s not a SEEDOT!$" + +SootopolisCity_LotadAndSeedotHouse_Text_2275BC: @ 82275BC + .string "You don’t have a big SEEDOT?\n" + .string "That’s too bad…\p" + .string "If you get a big SEEDOT, please\n" + .string "come show me.$" + +SootopolisCity_LotadAndSeedotHouse_Text_227617: @ 8227617 + .string "The biggest SEEDOT in history!\n" + .string "{STR_VAR_2}’s {STR_VAR_3}-inch giant!\p" + .string "A SEEDOT bigger than a LOTAD\n" + .string "always wanted!$" + +SootopolisCity_LotadAndSeedotHouse_Text_227676: @ 8227676 + .string "Do you know the POKéMON LOTAD?\n" + .string "It’s rarely seen in SOOTOPOLIS.\p" + .string "I love, I mean love, big LOTAD!\p" + .string "My big brother says that SEEDOT is\n" + .string "bigger.\p" + .string "But that’s wrong! Everyone knows that\n" + .string "LOTAD is a lot bigger.\p" + .string "Hunh? Do you have a LOTAD?\n" + .string "P-p-please show me!$" + +SootopolisCity_LotadAndSeedotHouse_Text_22776C: @ 822776C + .string "{STR_VAR_2} inches!\n" + .string "Wow, that is big!\p" + .string "It might be even bigger than the huge\n" + .string "SEEDOT my big brother saw.\p" + .string "Thanks for showing me!\n" + .string "This is my thanks!$" + +SootopolisCity_LotadAndSeedotHouse_Text_2277F4: @ 82277F4 + .string "{PLAYER} received a POTION.$" + +SootopolisCity_LotadAndSeedotHouse_Text_22780A: @ 822780A + .string "Hunh?\n" + .string "Your BAG is crammed full.$" + +SootopolisCity_LotadAndSeedotHouse_Text_22782A: @ 822782A + .string "{STR_VAR_2} inches?\p" + .string "Hmm… I’ve seen a bigger LOTAD\n" + .string "than this one here.$" + +SootopolisCity_LotadAndSeedotHouse_Text_227867: @ 8227867 + .string "Well, isn’t this something!\n" + .string "But it’s no LOTAD!$" + +SootopolisCity_LotadAndSeedotHouse_Text_227896: @ 8227896 + .string "Don’t you have a big LOTAD?\n" + .string "How disappointing…\p" + .string "If you get a big LOTAD, please\n" + .string "come show me!$" + +SootopolisCity_LotadAndSeedotHouse_Text_2278F2: @ 82278F2 + .string "The biggest LOTAD in history!\n" + .string "{STR_VAR_2}’s {STR_VAR_3}-inch colossus!\p" + .string "A LOTAD bigger than a SEEDOT\n" + .string "always wanted!$" + diff --git a/data/maps/SootopolisCity_Mart/events.inc b/data/maps/SootopolisCity_Mart/events.inc new file mode 100644 index 000000000..0c32cb482 --- /dev/null +++ b/data/maps/SootopolisCity_Mart/events.inc @@ -0,0 +1,12 @@ +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 + +SootopolisCity_Mart_MapWarps: @ 85332D4 + 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/SootopolisCity_Mart/scripts.inc b/data/maps/SootopolisCity_Mart/scripts.inc new file mode 100644 index 000000000..26ab5497c --- /dev/null +++ b/data/maps/SootopolisCity_Mart/scripts.inc @@ -0,0 +1,80 @@ +SootopolisCity_Mart_MapScripts:: @ 8226794 + .byte 0 + +SootopolisCity_Mart_EventScript_226795:: @ 8226795 + lock + faceplayer + message gUnknown_08272A21 + waitmessage + pokemart SootopolisCity_Mart_Pokemart_2267AC + msgbox gUnknown_08272A3F, 4 + release + end + +SootopolisCity_Mart_Pokemart_2267AC: @ 82267AC + .2byte ITEM_ULTRA_BALL + .2byte ITEM_HYPER_POTION + .2byte ITEM_MAX_POTION + .2byte ITEM_FULL_HEAL + .2byte ITEM_REVIVE + .2byte ITEM_MAX_REPEL + .2byte ITEM_X_ATTACK + .2byte ITEM_X_DEFEND + .2byte ITEM_SHADOW_MAIL + .2byte ITEM_NONE + release + end + +SootopolisCity_Mart_EventScript_2267C2:: @ 82267C2 + lock + faceplayer + compare VAR_0x40CA, 2 + goto_if 4, SootopolisCity_Mart_EventScript_2267E2 + checkflag FLAG_0x081 + goto_if 0, SootopolisCity_Mart_EventScript_2267E2 + msgbox SootopolisCity_Mart_Text_22685D, 4 + release + end + +SootopolisCity_Mart_EventScript_2267E2:: @ 82267E2 + msgbox SootopolisCity_Mart_Text_226816, 4 + release + end + +SootopolisCity_Mart_EventScript_2267EC:: @ 82267EC + lock + faceplayer + compare VAR_0x40CA, 2 + goto_if 4, SootopolisCity_Mart_EventScript_22680C + checkflag FLAG_0x081 + goto_if 0, SootopolisCity_Mart_EventScript_22680C + msgbox SootopolisCity_Mart_Text_226928, 4 + release + end + +SootopolisCity_Mart_EventScript_22680C:: @ 822680C + msgbox SootopolisCity_Mart_Text_2268AF, 4 + release + end + +SootopolisCity_Mart_Text_226816: @ 8226816 + .string "PP UP is great!\p" + .string "It raises the POWER POINTS, the PP,\n" + .string "of a POKéMON move.$" + +SootopolisCity_Mart_Text_22685D: @ 822685D + .string "What…\n" + .string "What is happening?\p" + .string "I really want to know, but it’s too\n" + .string "scary to go outside.$" + +SootopolisCity_Mart_Text_2268AF: @ 82268AF + .string "Do you know FULL RESTORE?\p" + .string "Full restoration of HP!\n" + .string "Eradication of all status problems!\p" + .string "It’s truly an item of your dreams!$" + +SootopolisCity_Mart_Text_226928: @ 8226928 + .string "This weather…\n" + .string "Did something awaken?$" + diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc new file mode 100644 index 000000000..bf06c2cd9 --- /dev/null +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc @@ -0,0 +1,11 @@ +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 + +SootopolisCity_MysteryEventsHouse_1F_MapWarps: @ 85335B0 + 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/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc new file mode 100644 index 000000000..cdcf5866c --- /dev/null +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -0,0 +1,241 @@ +SootopolisCity_MysteryEventsHouse_1F_MapScripts:: @ 8227953 + map_script 3, SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E + map_script 2, SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D + .byte 0 + +SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E + setvar VAR_0x8004, 16 + special sub_81A1780 + compare VAR_RESULT, 0 + call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D + compare VAR_0x40C0, 0 + call_if 5, SootopolisCity_MysteryEventsHouse_1F_EventScript_227991 + end + +SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D:: @ 822797D + setvar VAR_TEMP_1, 1 + setobjectxyperm 1, 3, 2 + setobjectmovementtype 1, 8 + setmaplayoutindex 441 + return + +SootopolisCity_MysteryEventsHouse_1F_EventScript_227991:: @ 8227991 + setobjectxyperm 1, 2, 2 + setobjectmovementtype 1, 10 + return + +SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D: @ 822799D + map_script_2 VAR_0x40C0, 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7 + map_script_2 VAR_0x40C0, 2, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7 + map_script_2 VAR_0x40C0, 3, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7 + .2byte 0 + +SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7 + lockall + applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_227A1F + waitmovement 0 + applymovement 1, SootopolisCity_MysteryEventsHouse_1F_Movement_227A21 + waitmovement 0 + moveobjectoffscreen 1 + applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6 + waitmovement 0 + compare VAR_0x40C0, 1 + call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04 + compare VAR_0x40C0, 2 + call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A0D + compare VAR_0x40C0, 3 + call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16 + special LoadPlayerParty + setvar VAR_0x40C0, 0 + releaseall + end + +SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04:: @ 8227A04 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227DB8, 4 + return + +SootopolisCity_MysteryEventsHouse_1F_EventScript_227A0D:: @ 8227A0D + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227E03, 4 + return + +SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16:: @ 8227A16 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D5B, 4 + return + +SootopolisCity_MysteryEventsHouse_1F_Movement_227A1F: @ 8227A1F + walk_down + step_end + +SootopolisCity_MysteryEventsHouse_1F_Movement_227A21: @ 8227A21 + walk_right + walk_in_place_fastest_down + step_end + +SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24:: @ 8227A24 + lock + faceplayer + setvar VAR_0x8004, 16 + special sub_81A1780 + compare VAR_RESULT, 1 + goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E + compare VAR_TEMP_1, 1 + goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227B46, 4 + release + end + +SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E:: @ 8227A4E + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227B46, 4 + release + end + +SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58 + special SavePlayerParty + special sub_8139238 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227BFC, 5 + compare VAR_RESULT, 0 + goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 + call SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF + compare VAR_RESULT, 0 + goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227CEB, 5 + compare VAR_RESULT, 0 + goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 + special LoadPlayerParty + call SootopolisCity_MysteryEventsHouse_1F_EventScript_27134F + compare VAR_RESULT, 0 + goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 + special SavePlayerParty + special sub_80F94E8 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D21, 4 + closemessage + compare VAR_FACING, 2 + call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227AFE + compare VAR_FACING, 4 + call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227B10 + compare VAR_FACING, 3 + call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22 + warp MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F, 255, 3, 1 + waitstate + release + end + +SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2:: @ 8227AE2 + special LoadPlayerParty + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C44, 4 + release + end + +SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF:: @ 8227AEF + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C84, 4 + fadescreen 1 + special sub_80F9438 + waitstate + return + +SootopolisCity_MysteryEventsHouse_1F_EventScript_227AFE:: @ 8227AFE + applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_227B40 + applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_227B34 + waitmovement 0 + return + +SootopolisCity_MysteryEventsHouse_1F_EventScript_227B10:: @ 8227B10 + applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_227B43 + applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_227B38 + waitmovement 0 + return + +SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22:: @ 8227B22 + applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_227B40 + applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_227B3C + waitmovement 0 + return + +SootopolisCity_MysteryEventsHouse_1F_Movement_227B34: @ 8227B34 + delay_16 + walk_up + walk_up + step_end + +SootopolisCity_MysteryEventsHouse_1F_Movement_227B38: @ 8227B38 + delay_16 + walk_right + walk_up + step_end + +SootopolisCity_MysteryEventsHouse_1F_Movement_227B3C: @ 8227B3C + delay_16 + walk_left + walk_up + step_end + +SootopolisCity_MysteryEventsHouse_1F_Movement_227B40: @ 8227B40 + walk_left + walk_in_place_fastest_right + step_end + +SootopolisCity_MysteryEventsHouse_1F_Movement_227B43: @ 8227B43 + walk_right + walk_in_place_fastest_left + step_end + +SootopolisCity_MysteryEventsHouse_1F_Text_227B46: @ 8227B46 + .string "When I was young, I traveled the world\n" + .string "as a POKéMON TRAINER.\p" + .string "Now that I’ve become an old buzzard,\n" + .string "my only amusement is watching young\l" + .string "TRAINERS battle.$" + +SootopolisCity_MysteryEventsHouse_1F_Text_227BDD: @ 8227BDD + .string "The door appears to be locked.$" + +SootopolisCity_MysteryEventsHouse_1F_Text_227BFC: @ 8227BFC + .string "A TRAINER named {STR_VAR_1}\n" + .string "is visiting my home.\p" + .string "Would you like to challenge\n" + .string "{STR_VAR_1}?$" + +SootopolisCity_MysteryEventsHouse_1F_Text_227C44: @ 8227C44 + .string "You won’t battle? I’m disappointed\n" + .string "that I can’t see you battle…$" + +SootopolisCity_MysteryEventsHouse_1F_Text_227C84: @ 8227C84 + .string "Oh, good, good!\p" + .string "But my house isn’t all that sturdy.\p" + .string "Could I ask you to keep it down to\n" + .string "a 3-on-3 match?$" + +SootopolisCity_MysteryEventsHouse_1F_Text_227CEB: @ 8227CEB + .string "Before you two battle, you should\n" + .string "save your progress.$" + +SootopolisCity_MysteryEventsHouse_1F_Text_227D21: @ 8227D21 + .string "I hope to see a good match!$" + +SootopolisCity_MysteryEventsHouse_1F_Text_227D3D: @ 8227D3D + .string "{STR_VAR_1}$" + +SootopolisCity_MysteryEventsHouse_B1F_Text_227D40: @ 8227D40 + .string "The match ended up a draw.$" + +SootopolisCity_MysteryEventsHouse_1F_Text_227D5B: @ 8227D5B + .string "So, it became a standoff.\p" + .string "It was a brilliant match in which\n" + .string "neither side conceded a step!$" + +SootopolisCity_MysteryEventsHouse_1F_Text_227DB5: @ 8227DB5 + .string "{STR_VAR_1}$" + +SootopolisCity_MysteryEventsHouse_1F_Text_227DB8: @ 8227DB8 + .string "That was superlative!\p" + .string "Why, it was like seeing myself in\n" + .string "my youth again!$" + +SootopolisCity_MysteryEventsHouse_1F_Text_227E00: @ 8227E00 + .string "{STR_VAR_1}$" + +SootopolisCity_MysteryEventsHouse_1F_Text_227E03: @ 8227E03 + .string "Ah, too bad for you!\p" + .string "But it was a good match.\n" + .string "I hope you can win next time.$" + diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc new file mode 100644 index 000000000..21ea255a4 --- /dev/null +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc @@ -0,0 +1,9 @@ +SootopolisCity_MysteryEventsHouse_B1F_EventObjects: @ 85335DC + 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 + +SootopolisCity_MysteryEventsHouse_B1F_MapEvents:: @ 85335FC + map_events SootopolisCity_MysteryEventsHouse_B1F_EventObjects, SootopolisCity_MysteryEventsHouse_B1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc new file mode 100644 index 000000000..b29ef99a5 --- /dev/null +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc @@ -0,0 +1,78 @@ +SootopolisCity_MysteryEventsHouse_B1F_MapScripts:: @ 8227E4F + map_script 3, SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A + map_script 2, SootopolisCity_MysteryEventsHouse_B1F_MapScript2_227E5E + .byte 0 + +SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A: @ 8227E5A + special sub_8162794 + end + +SootopolisCity_MysteryEventsHouse_B1F_MapScript2_227E5E: @ 8227E5E + map_script_2 VAR_TEMP_1, 0, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68 + .2byte 0 + +SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68 + lockall + applymovement 255, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF3 + waitmovement 0 + special sub_8165360 + msgbox 0x2021fc4, 4 + closemessage + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + special sub_8163AC4 + waitstate + compare VAR_RESULT, 3 + call_if 1, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF + compare VAR_RESULT, 1 + call_if 1, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EDD + compare VAR_RESULT, 2 + call_if 1, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8 + closemessage + special HealPlayerParty + applymovement 255, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF9 + waitmovement 0 + special LoadPlayerParty + setvar VAR_TEMP_1, 1 + warp MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F, 255, 3, 1 + waitstate + releaseall + end + +SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF:: @ 8227ECF + setvar VAR_0x40C0, 3 + msgbox SootopolisCity_MysteryEventsHouse_B1F_Text_227D40, 4 + return + +SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EDD:: @ 8227EDD + setvar VAR_0x40C0, 1 + special ShowFieldMessageStringVar4 + waitmessage + waitbuttonpress + return + +SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8:: @ 8227EE8 + setvar VAR_0x40C0, 2 + special ShowFieldMessageStringVar4 + waitmessage + waitbuttonpress + return + +SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF3: @ 8227EF3 + walk_down + walk_down + walk_down + walk_right + walk_right + step_end + +SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF9: @ 8227EF9 + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + delay_8 + step_end + diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/events.inc b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..9bca02a56 --- /dev/null +++ b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc @@ -0,0 +1,14 @@ +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 + +SootopolisCity_PokemonCenter_1F_MapWarps: @ 85331D4 + 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/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..fcb1b5863 --- /dev/null +++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc @@ -0,0 +1,74 @@ +SootopolisCity_PokemonCenter_1F_MapScripts:: @ 82264F1 + map_script 3, SootopolisCity_PokemonCenter_1F_MapScript1_2264FC + map_script 5, SootopolisCity_PokemonCenter_1F_MapScript1_277C30 + .byte 0 + +SootopolisCity_PokemonCenter_1F_MapScript1_2264FC: @ 82264FC + setrespawn 10 + end + +SootopolisCity_PokemonCenter_1F_EventScript_226500:: @ 8226500 + setvar VAR_0x800B, 1 + call SootopolisCity_PokemonCenter_1F_EventScript_27191E + waitmessage + waitbuttonpress + release + end + +SootopolisCity_PokemonCenter_1F_EventScript_22650E:: @ 822650E + lock + faceplayer + compare VAR_0x40CA, 2 + goto_if 4, SootopolisCity_PokemonCenter_1F_EventScript_22652E + checkflag FLAG_0x081 + goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_22652E + msgbox SootopolisCity_PokemonCenter_1F_Text_22664B, 4 + release + end + +SootopolisCity_PokemonCenter_1F_EventScript_22652E:: @ 822652E + msgbox SootopolisCity_PokemonCenter_1F_Text_226562, 4 + release + end + +SootopolisCity_PokemonCenter_1F_EventScript_226538:: @ 8226538 + lock + faceplayer + compare VAR_0x40CA, 2 + goto_if 4, SootopolisCity_PokemonCenter_1F_EventScript_226558 + checkflag FLAG_0x081 + goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_226558 + msgbox SootopolisCity_PokemonCenter_1F_Text_22672F, 4 + release + end + +SootopolisCity_PokemonCenter_1F_EventScript_226558:: @ 8226558 + msgbox SootopolisCity_PokemonCenter_1F_Text_2266B9, 4 + release + end + +SootopolisCity_PokemonCenter_1F_Text_226562: @ 8226562 + .string "WALLACE is rumored to be the toughest\n" + .string "TRAINER in the whole HOENN region.\p" + .string "This town’s GYM is led by the TRAINER\n" + .string "who taught WALLACE.\p" + .string "But the ELITE FOUR… They’re said to be\n" + .string "even stronger than WALLACE’s mentor.\p" + .string "How strong could they be?$" + +SootopolisCity_PokemonCenter_1F_Text_22664B: @ 822664B + .string "Everyone in town has taken refuge\n" + .string "and won’t come out of their homes.\p" + .string "Even I would rather not venture\n" + .string "outside.$" + +SootopolisCity_PokemonCenter_1F_Text_2266B9: @ 82266B9 + .string "Whenever, wherever, and whatever\n" + .string "happens, I will always be friends with\l" + .string "POKéMON.\p" + .string "Because it’s fun to be with POKéMON!$" + +SootopolisCity_PokemonCenter_1F_Text_22672F: @ 822672F + .string "Aren’t POKéMON our friends?\p" + .string "Why are they going wild this way?$" + diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/events.inc b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..8498f9de2 --- /dev/null +++ b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc @@ -0,0 +1,14 @@ +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 + +SootopolisCity_PokemonCenter_2F_MapWarps: @ 8533260 + 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/SootopolisCity_PokemonCenter_2F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..43d8a9d2f --- /dev/null +++ b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc @@ -0,0 +1,19 @@ +SootopolisCity_PokemonCenter_2F_MapScripts:: @ 822676D + map_script 2, SootopolisCity_PokemonCenter_2F_MapScript2_276C3B + map_script 4, SootopolisCity_PokemonCenter_2F_MapScript2_276B6C + map_script 1, SootopolisCity_PokemonCenter_2F_MapScript1_276BBE + map_script 3, SootopolisCity_PokemonCenter_2F_MapScript1_276ACF + .byte 0 + +SootopolisCity_PokemonCenter_2F_EventScript_226782:: @ 8226782 + call OldaleTown_PokemonCenter_2F_EventScript_276EB7 + end + +SootopolisCity_PokemonCenter_2F_EventScript_226788:: @ 8226788 + call OldaleTown_PokemonCenter_2F_EventScript_2770B2 + end + +SootopolisCity_PokemonCenter_2F_EventScript_22678E:: @ 822678E + call OldaleTown_PokemonCenter_2F_EventScript_2771DB + end + diff --git a/data/maps/SouthernIsland_Exterior/events.inc b/data/maps/SouthernIsland_Exterior/events.inc new file mode 100644 index 000000000..69cddf603 --- /dev/null +++ b/data/maps/SouthernIsland_Exterior/events.inc @@ -0,0 +1,14 @@ +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 + +SouthernIsland_Exterior_MapWarps: @ 853B86C + 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 + +SouthernIsland_Exterior_MapEvents:: @ 853B888 + map_events SouthernIsland_Exterior_EventObjects, SouthernIsland_Exterior_MapWarps, 0x0, SouthernIsland_Exterior_MapBGEvents + diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc new file mode 100644 index 000000000..d303e0614 --- /dev/null +++ b/data/maps/SouthernIsland_Exterior/scripts.inc @@ -0,0 +1,55 @@ +SouthernIsland_Exterior_MapScripts:: @ 82429C8 + map_script 3, SouthernIsland_Exterior_MapScript1_2429CE + .byte 0 + +SouthernIsland_Exterior_MapScript1_2429CE: @ 82429CE + setflag FLAG_LANDMARK_SOUTHERN_ISLAND + end + +SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2 + lock + faceplayer + msgbox SouthernIsland_Exterior_Text_2A69F1, 5 + compare VAR_RESULT, 0 + goto_eq SouthernIsland_Exterior_EventScript_242A17 + msgbox SouthernIsland_Exterior_Text_2A6A5D, 4 + closemessage + applymovement VAR_LAST_TALKED, SouthernIsland_Exterior_Movement_2725AA + waitmovement 0 + delay 30 + hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR + setvar VAR_0x8004, 2 + call SouthernIsland_Exterior_EventScript_272250 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 + waitstate + release + end + +SouthernIsland_Exterior_EventScript_242A17:: @ 8242A17 + msgbox SouthernIsland_Exterior_Text_2A6A82, 4 + release + end + +BattleFrontier_OutsideWest_EventScript_242A21:: @ 8242A21 + applymovement 255, BattleFrontier_OutsideWest_Movement_242A37 + waitmovement 0 + return + +BattleFrontier_OutsideWest_EventScript_242A2C:: @ 8242A2C + applymovement 255, BattleFrontier_OutsideWest_Movement_242A39 + waitmovement 0 + return + +BattleFrontier_OutsideWest_Movement_242A37: @ 8242A37 + walk_down + step_end + +BattleFrontier_OutsideWest_Movement_242A39: @ 8242A39 + walk_left + walk_in_place_fastest_down + step_end + +SouthernIsland_Exterior_EventScript_242A3C:: @ 8242A3C + msgbox SouthernIsland_Exterior_Text_2A6AD5, 3 + end + diff --git a/data/maps/SouthernIsland_Interior/events.inc b/data/maps/SouthernIsland_Interior/events.inc new file mode 100644 index 000000000..c31a5568b --- /dev/null +++ b/data/maps/SouthernIsland_Interior/events.inc @@ -0,0 +1,14 @@ +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 + +SouthernIsland_Interior_MapWarps: @ 853B8CC + 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 + +SouthernIsland_Interior_MapEvents:: @ 853B8E8 + map_events SouthernIsland_Interior_EventObjects, SouthernIsland_Interior_MapWarps, 0x0, SouthernIsland_Interior_MapBGEvents + diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc new file mode 100644 index 000000000..432667cc9 --- /dev/null +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -0,0 +1,167 @@ +SouthernIsland_Interior_MapScripts:: @ 8242A45 + map_script 5, SouthernIsland_Interior_MapScript1_242A50 + map_script 3, SouthernIsland_Interior_MapScript1_242A6E + .byte 0 + +SouthernIsland_Interior_MapScript1_242A50: @ 8242A50 + checkflag FLAG_SYS_CTRL_OBJ_DELETE + call_if 1, SouthernIsland_Interior_EventScript_242A5A + end + +SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 7 + goto_if 5, SouthernIsland_Interior_EventScript_27374E + removeobject 2 + return + +SouthernIsland_Interior_MapScript1_242A6E: @ 8242A6E + compare VAR_0x40D5, 0 + call_if 1, SouthernIsland_Interior_EventScript_242A8A + compare VAR_0x40D5, 0 + call_if 5, SouthernIsland_Interior_EventScript_242A95 + call SouthernIsland_Interior_EventScript_242AA0 + end + +SouthernIsland_Interior_EventScript_242A8A:: @ 8242A8A + setvar VAR_OBJ_GFX_ID_1, 188 + setvar VAR_TEMP_4, 408 + return + +SouthernIsland_Interior_EventScript_242A95:: @ 8242A95 + setvar VAR_OBJ_GFX_ID_1, 187 + setvar VAR_TEMP_4, 407 + return + +SouthernIsland_Interior_EventScript_242AA0:: @ 8242AA0 + checkplayergender + compare VAR_RESULT, 0 + goto_eq SouthernIsland_Interior_EventScript_242AB8 + compare VAR_RESULT, 1 + goto_eq SouthernIsland_Interior_EventScript_242ABE + end + +SouthernIsland_Interior_EventScript_242AB8:: @ 8242AB8 + setvar VAR_OBJ_GFX_ID_0, 100 + return + +SouthernIsland_Interior_EventScript_242ABE:: @ 8242ABE + setvar VAR_OBJ_GFX_ID_0, 105 + return + +SouthernIsland_Interior_EventScript_242AC4:: @ 8242AC4 + lockall + setvar VAR_0x8008, 12 + goto SouthernIsland_Interior_EventScript_242AD0 + end + +SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 + checkflag FLAG_0x002 + goto_eq SouthernIsland_Interior_EventScript_242B9A + checkflag FLAG_0x1C8 + goto_eq SouthernIsland_Interior_EventScript_242B9A + checkflag FLAG_0x1C9 + goto_eq SouthernIsland_Interior_EventScript_242B9A + checkflag FLAG_SYS_HAS_EON_TICKET + goto_if 0, SouthernIsland_Interior_EventScript_242B9A + setflag FLAG_0x0CE + setflag FLAG_0x002 + special SpawnScriptEventObject + applymovement 127, SouthernIsland_Interior_Movement_242BCA + waitmovement 0 + delay 50 + waitse + playmoncry VAR_TEMP_4, 0 + delay 30 + waitmoncry + addobject 2 + delay 30 + applymovement 127, SouthernIsland_Interior_Movement_242BCE + applymovement 2, SouthernIsland_Interior_Movement_242BDA + waitmovement 0 + delay 50 + special RemoveScriptEventObject + setvar VAR_LAST_TALKED, 2 + compare VAR_0x40D5, 0 + call_if 1, SouthernIsland_Interior_EventScript_242BA4 + compare VAR_0x40D5, 0 + call_if 5, SouthernIsland_Interior_EventScript_242BB7 + setflag FLAG_SYS_CTRL_OBJ_DELETE + special BattleSetup_StartLatiBattle + waitstate + clearflag FLAG_SYS_CTRL_OBJ_DELETE + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 1 + goto_eq SouthernIsland_Interior_EventScript_242B81 + compare VAR_RESULT, 4 + goto_eq SouthernIsland_Interior_EventScript_242B8F + compare VAR_RESULT, 5 + goto_eq SouthernIsland_Interior_EventScript_242B8F + setflag FLAG_0x1C9 + releaseall + end + +SouthernIsland_Interior_EventScript_242B81:: @ 8242B81 + setflag FLAG_0x1C8 + copyvar VAR_0x8004, VAR_TEMP_4 + goto SouthernIsland_Interior_EventScript_273776 + end + +SouthernIsland_Interior_EventScript_242B8F:: @ 8242B8F + copyvar VAR_0x8004, VAR_TEMP_4 + goto SouthernIsland_Interior_EventScript_273776 + end + +SouthernIsland_Interior_EventScript_242B9A:: @ 8242B9A + msgbox SouthernIsland_Interior_Text_2A6AA1, 4 + releaseall + end + +SouthernIsland_Interior_EventScript_242BA4:: @ 8242BA4 + setvar VAR_0x8004, 408 + setvar VAR_0x8005, 50 + setvar VAR_0x8006, 191 + special CreateObedientEnemyMon + return + +SouthernIsland_Interior_EventScript_242BB7:: @ 8242BB7 + setvar VAR_0x8004, 407 + setvar VAR_0x8005, 50 + setvar VAR_0x8006, 191 + special CreateObedientEnemyMon + return + +SouthernIsland_Interior_Movement_242BCA: @ 8242BCA + walk_up + walk_up + walk_up + step_end + +SouthernIsland_Interior_Movement_242BCE: @ 8242BCE + 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 + 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/maps/TerraCave_End/events.inc b/data/maps/TerraCave_End/events.inc new file mode 100644 index 000000000..61edb1e28 --- /dev/null +++ b/data/maps/TerraCave_End/events.inc @@ -0,0 +1,12 @@ +TerraCave_End_EventObjects: @ 8537850 + 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 + +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_EventObjects, TerraCave_End_MapWarps, TerraCave_End_MapCoordEvents, 0x0 + diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc new file mode 100644 index 000000000..5152f85cf --- /dev/null +++ b/data/maps/TerraCave_End/scripts.inc @@ -0,0 +1,78 @@ +TerraCave_End_MapScripts:: @ 823B0B0 + map_script 5, TerraCave_End_MapScript1_23B0BB + map_script 3, TerraCave_End_MapScript1_23B0D9 + .byte 0 + +TerraCave_End_MapScript1_23B0BB: @ 823B0BB + checkflag FLAG_SYS_CTRL_OBJ_DELETE + call_if 1, TerraCave_End_EventScript_23B0C5 + end + +TerraCave_End_EventScript_23B0C5:: @ 823B0C5 + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 7 + goto_if 5, TerraCave_End_EventScript_27374E + removeobject 1 + return + +TerraCave_End_MapScript1_23B0D9: @ 823B0D9 + checkflag FLAG_0x1BF + call_if 0, TerraCave_End_EventScript_23B0E3 + end + +TerraCave_End_EventScript_23B0E3:: @ 823B0E3 + clearflag FLAG_0x30F + setvar VAR_TEMP_1, 1 + return + +TerraCave_End_EventScript_23B0EC:: @ 823B0EC + lockall + applymovement 255, TerraCave_End_Movement_2725B2 + waitmovement 0 + applymovement 1, TerraCave_End_Movement_23B16E + waitmovement 0 + waitse + playmoncry SPECIES_GROUDON, 2 + delay 40 + waitmoncry + setvar VAR_LAST_TALKED, 1 + setwildbattle SPECIES_GROUDON, 70, ITEM_NONE + setflag FLAG_SYS_CTRL_OBJ_DELETE + special BattleSetup_StartLegendaryBattle + waitstate + clearflag FLAG_SYS_CTRL_OBJ_DELETE + setvar VAR_TEMP_1, 0 + specialvar VAR_RESULT, sub_8138B80 + compare VAR_RESULT, 1 + goto_eq TerraCave_End_EventScript_23B155 + compare VAR_RESULT, 4 + goto_eq TerraCave_End_EventScript_23B163 + compare VAR_RESULT, 5 + goto_eq TerraCave_End_EventScript_23B163 + setvar VAR_0x4039, 1 + setflag FLAG_0x1BF + releaseall + end + +TerraCave_End_EventScript_23B155:: @ 823B155 + setvar VAR_0x4039, 1 + setflag FLAG_0x1BF + goto TerraCave_End_EventScript_27376D + end + +TerraCave_End_EventScript_23B163:: @ 823B163 + setvar VAR_0x8004, 405 + goto TerraCave_End_EventScript_273776 + end + +TerraCave_End_Movement_23B16E: @ 823B16E + 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/maps/TerraCave_Entrance/events.inc b/data/maps/TerraCave_Entrance/events.inc new file mode 100644 index 000000000..a176c548d --- /dev/null +++ b/data/maps/TerraCave_Entrance/events.inc @@ -0,0 +1,7 @@ +TerraCave_Entrance_MapWarps: @ 853782C + 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/TerraCave_Entrance/scripts.inc b/data/maps/TerraCave_Entrance/scripts.inc new file mode 100644 index 000000000..1762265ea --- /dev/null +++ b/data/maps/TerraCave_Entrance/scripts.inc @@ -0,0 +1,8 @@ +TerraCave_Entrance_MapScripts:: @ 823B0A6 + map_script 3, TerraCave_Entrance_MapScript1_23B0AC + .byte 0 + +TerraCave_Entrance_MapScript1_23B0AC: @ 823B0AC + setflag FLAG_0x8DA + end + diff --git a/data/maps/TradeCenter/events.inc b/data/maps/TradeCenter/events.inc new file mode 100644 index 000000000..89e5eac90 --- /dev/null +++ b/data/maps/TradeCenter/events.inc @@ -0,0 +1,14 @@ +TradeCenter_EventObjects: @ 8539DA0 + 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 + 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 + +TradeCenter_MapEvents:: @ 8539DE8 + map_events TradeCenter_EventObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0 + diff --git a/data/maps/TradeCenter/scripts.inc b/data/maps/TradeCenter/scripts.inc new file mode 100644 index 000000000..e0e0e7d1e --- /dev/null +++ b/data/maps/TradeCenter/scripts.inc @@ -0,0 +1,3 @@ +TradeCenter_MapScripts:: @ 823B77E + .byte 0 + diff --git a/data/maps/TrainerHill_1F/events.inc b/data/maps/TrainerHill_1F/events.inc new file mode 100644 index 000000000..2a2428f57 --- /dev/null +++ b/data/maps/TrainerHill_1F/events.inc @@ -0,0 +1,7 @@ +TrainerHill_1F_MapWarps: @ 853D934 + 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/TrainerHill_1F/scripts.inc b/data/maps/TrainerHill_1F/scripts.inc new file mode 100644 index 000000000..465a6d781 --- /dev/null +++ b/data/maps/TrainerHill_1F/scripts.inc @@ -0,0 +1,6 @@ +TrainerHill_1F_MapScripts:: @ 8268F71 + map_script 5, TrainerHill_1F_MapScript1_2C8336 + map_script 4, TrainerHill_1F_MapScript2_2C8372 + map_script 2, TrainerHill_1F_MapScript2_2C8381 + .byte 0 + diff --git a/data/maps/TrainerHill_2F/events.inc b/data/maps/TrainerHill_2F/events.inc new file mode 100644 index 000000000..ca50380d5 --- /dev/null +++ b/data/maps/TrainerHill_2F/events.inc @@ -0,0 +1,7 @@ +TrainerHill_2F_MapWarps: @ 853D958 + 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/TrainerHill_2F/scripts.inc b/data/maps/TrainerHill_2F/scripts.inc new file mode 100644 index 000000000..ca8eeff72 --- /dev/null +++ b/data/maps/TrainerHill_2F/scripts.inc @@ -0,0 +1,6 @@ +TrainerHill_2F_MapScripts:: @ 8268F81 + map_script 5, TrainerHill_2F_MapScript1_2C8336 + map_script 4, TrainerHill_2F_MapScript2_2C8372 + map_script 2, TrainerHill_2F_MapScript2_2C8381 + .byte 0 + diff --git a/data/maps/TrainerHill_3F/events.inc b/data/maps/TrainerHill_3F/events.inc new file mode 100644 index 000000000..e12394655 --- /dev/null +++ b/data/maps/TrainerHill_3F/events.inc @@ -0,0 +1,7 @@ +TrainerHill_3F_MapWarps: @ 853D97C + 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/TrainerHill_3F/scripts.inc b/data/maps/TrainerHill_3F/scripts.inc new file mode 100644 index 000000000..921a8d808 --- /dev/null +++ b/data/maps/TrainerHill_3F/scripts.inc @@ -0,0 +1,5 @@ +TrainerHill_3F_MapScripts:: @ 8268F91 + map_script 5, TrainerHill_3F_MapScript1_2C8336 + map_script 2, TrainerHill_3F_MapScript2_2C8381 + .byte 0 + diff --git a/data/maps/TrainerHill_4F/events.inc b/data/maps/TrainerHill_4F/events.inc new file mode 100644 index 000000000..e9696de15 --- /dev/null +++ b/data/maps/TrainerHill_4F/events.inc @@ -0,0 +1,7 @@ +TrainerHill_4F_MapWarps: @ 853D9A0 + 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/TrainerHill_4F/scripts.inc b/data/maps/TrainerHill_4F/scripts.inc new file mode 100644 index 000000000..0f710152c --- /dev/null +++ b/data/maps/TrainerHill_4F/scripts.inc @@ -0,0 +1,5 @@ +TrainerHill_4F_MapScripts:: @ 8268F9C + map_script 5, TrainerHill_4F_MapScript1_2C8336 + map_script 2, TrainerHill_4F_MapScript2_2C8381 + .byte 0 + diff --git a/data/maps/TrainerHill_Elevator/events.inc b/data/maps/TrainerHill_Elevator/events.inc new file mode 100644 index 000000000..7af4c5425 --- /dev/null +++ b/data/maps/TrainerHill_Elevator/events.inc @@ -0,0 +1,10 @@ +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 + +TrainerHill_Elevator_MapWarps: @ 853DD9C + 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/TrainerHill_Elevator/scripts.inc b/data/maps/TrainerHill_Elevator/scripts.inc new file mode 100644 index 000000000..ac2d5c8a7 --- /dev/null +++ b/data/maps/TrainerHill_Elevator/scripts.inc @@ -0,0 +1,87 @@ +TrainerHill_Elevator_MapScripts:: @ 826934F + map_script 2, TrainerHill_Elevator_MapScript2_269355 + .byte 0 + +TrainerHill_Elevator_MapScript2_269355: @ 8269355 + map_script_2 VAR_TEMP_4, 0, TrainerHill_Elevator_EventScript_269375 + .2byte 0 + +TrainerHill_Elevator_EventScript_26935F:: @ 826935F + end + +TrainerHill_Elevator_EventScript_269360:: @ 8269360 + applymovement 255, TrainerHill_Elevator_Movement_2693EB + waitmovement 0 + releaseall + warp MAP_TRAINER_HILL_ROOF, 255, 15, 5 + waitstate + end + +TrainerHill_Elevator_EventScript_269375:: @ 8269375 + applymovement 255, TrainerHill_Elevator_Movement_2693E4 + waitmovement 0 + applymovement 1, TrainerHill_Elevator_Movement_2693EE + waitmovement 0 + lockall + msgbox TrainerHill_Elevator_Text_268F3E, 5 + compare VAR_RESULT, 0 + goto_eq TrainerHill_Elevator_EventScript_269360 + releaseall + applymovement 1, TrainerHill_Elevator_Movement_2693F0 + waitmovement 0 + applymovement 255, TrainerHill_Elevator_Movement_2693DF + waitmovement 0 + call TrainerHill_Elevator_EventScript_2693D9 + delay 25 + applymovement 255, TrainerHill_Elevator_Movement_2693E7 + waitmovement 0 + warp MAP_TRAINER_HILL_ENTRANCE, 255, 17, 8 + waitstate + end + +TrainerHill_Elevator_EventScript_2693CE:: @ 82693CE + goto TrainerHill_Elevator_EventScript_2693D4 + end + +TrainerHill_Elevator_EventScript_2693D4:: @ 82693D4 + special sub_8139C10 + releaseall + end + +TrainerHill_Elevator_EventScript_2693D9:: @ 82693D9 + waitse + special sub_8139A78 + waitstate + return + +TrainerHill_Elevator_Movement_2693DF: @ 82693DF + walk_up + walk_up + walk_right + face_down + step_end + +TrainerHill_Elevator_Movement_2693E4: @ 82693E4 + delay_16 + walk_left + step_end + +TrainerHill_Elevator_Movement_2693E7: @ 82693E7 + delay_16 + walk_down + walk_down + step_end + +TrainerHill_Elevator_Movement_2693EB: @ 82693EB + face_down + delay_16 + step_end + +TrainerHill_Elevator_Movement_2693EE: @ 82693EE + face_right + step_end + +TrainerHill_Elevator_Movement_2693F0: @ 82693F0 + face_down + step_end + diff --git a/data/maps/TrainerHill_Entrance/events.inc b/data/maps/TrainerHill_Entrance/events.inc new file mode 100644 index 000000000..4b974ce9b --- /dev/null +++ b/data/maps/TrainerHill_Entrance/events.inc @@ -0,0 +1,21 @@ +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 + +TrainerHill_Entrance_MapWarps: @ 853D8EC + 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 + +TrainerHill_Entrance_MapBGEvents: @ 853D914 + bg_event 8, 10, 0, 1, 0, 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/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc new file mode 100644 index 000000000..84543ff2b --- /dev/null +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -0,0 +1,476 @@ +TrainerHill_Entrance_MapScripts:: @ 82680AC + map_script 5, TrainerHill_Entrance_MapScript1_2680D0 + map_script 7, TrainerHill_Entrance_MapScript1_26811B + map_script 3, TrainerHill_Entrance_MapScript1_2680C6 + map_script 1, TrainerHill_Entrance_MapScript1_268128 + map_script 2, TrainerHill_Entrance_MapScript2_26813E + .byte 0 + +TrainerHill_Entrance_MapScript1_2680C6: @ 82680C6 + setflag FLAG_LANDMARK_TRAINER_HILL + getplayerxy VAR_TEMP_D, VAR_RESULT + end + +TrainerHill_Entrance_MapScript1_2680CF: @ 82680CF + end + +TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0 + setvar VAR_0x8004, 4 + special sp194_trainer_tower + setvar VAR_TEMP_0, 0 + setvar VAR_0x8004, 9 + special sp194_trainer_tower + compare VAR_RESULT, 0 + goto_eq TrainerHill_Entrance_EventScript_2680FF + setobjectxy 255, 9, 6 + applymovement 255, TrainerHill_Entrance_Movement_26837F + end + +TrainerHill_Entrance_EventScript_2680FF:: @ 82680FF + setvar VAR_0x8004, 16 + special sp194_trainer_tower + compare VAR_RESULT, 1 + goto_eq TrainerHill_Entrance_EventScript_26811A + applymovement 255, TrainerHill_Entrance_Movement_26837F + end + +TrainerHill_Entrance_EventScript_26811A:: @ 826811A + end + +TrainerHill_Entrance_MapScript1_26811B: @ 826811B + addobject 2 + addobject 1 + addobject 5 + addobject 4 + end + +TrainerHill_Entrance_MapScript1_268128: @ 8268128 + compare VAR_TEMP_D, 17 + call_if 1, TrainerHill_Entrance_EventScript_268134 + end + +TrainerHill_Entrance_EventScript_268134:: @ 8268134 + setmetatile 17, 10, 775, 0 + return + +TrainerHill_Entrance_MapScript2_26813E: @ 826813E + map_script_2 VAR_TEMP_0, 0, TrainerHill_Entrance_EventScript_268182 + map_script_2 VAR_TEMP_D, 17, TrainerHill_Entrance_EventScript_268160 + map_script_2 VAR_TEMP_5, 1, TrainerHill_Entrance_EventScript_268229 + map_script_2 VAR_TEMP_1, 1, TrainerHill_Entrance_EventScript_2C83DF + .2byte 0 + +TrainerHill_Entrance_EventScript_268160:: @ 8268160 + lockall + applymovement 255, TrainerHill_Entrance_Movement_268385 + waitmovement 0 + setmetatile 17, 10, 820, 1 + special DrawWholeMapView + playse SE_TK_KASYA + waitse + setvar VAR_TEMP_D, 0 + releaseall + end + +TrainerHill_Entrance_EventScript_268182:: @ 8268182 + setvar VAR_TEMP_0, 1 + setvar VAR_0x8004, 6 + special sp194_trainer_tower + switch VAR_RESULT + case 0, TrainerHill_Entrance_EventScript_2681B5 + case 1, TrainerHill_Entrance_EventScript_2681CA + case 2, TrainerHill_Entrance_EventScript_2681EE + +TrainerHill_Entrance_EventScript_2681B5:: @ 82681B5 + lockall + applymovement 255, TrainerHill_Entrance_Movement_26837F + msgbox TrainerHill_Entrance_Text_268689, 4 + goto TrainerHill_Entrance_EventScript_2681DA + +TrainerHill_Entrance_EventScript_2681CA:: @ 82681CA + lockall + applymovement 255, TrainerHill_Entrance_Movement_26837F + msgbox TrainerHill_Entrance_Text_268712, 4 + +TrainerHill_Entrance_EventScript_2681DA:: @ 82681DA + closemessage + applymovement 255, TrainerHill_Entrance_Movement_268381 + waitmovement 0 + setvar VAR_0x40D6, 0 + special HealPlayerParty + releaseall + +TrainerHill_Entrance_EventScript_2681EE:: @ 82681EE + end + +TrainerHill_Entrance_EventScript_2681EF:: @ 82681EF + setvar VAR_0x800B, 2 + call TrainerHill_Entrance_EventScript_27191E + waitmessage + waitbuttonpress + release + end + +TrainerHill_Entrance_EventScript_2681FD:: @ 82681FD + lock + faceplayer + setvar VAR_0x8004, 10 + special sp194_trainer_tower + compare VAR_RESULT, 0 + goto_eq TrainerHill_Entrance_EventScript_26821F + msgbox TrainerHill_Entrance_Text_2686F4, 4 + goto TrainerHill_Entrance_EventScript_268227 + +TrainerHill_Entrance_EventScript_26821F:: @ 826821F + msgbox TrainerHill_Entrance_Text_2687AC, 4 + +TrainerHill_Entrance_EventScript_268227:: @ 8268227 + release + end + +TrainerHill_Entrance_EventScript_268229:: @ 8268229 + lockall + applymovement 255, TrainerHill_Entrance_Movement_26837F + checkflag FLAG_SYS_GAME_CLEAR + goto_if 0, TrainerHill_Entrance_EventScript_26836A + msgbox TrainerHill_Entrance_Text_2684C6, 4 + setvar VAR_0x8004, 13 + special sp194_trainer_tower + compare VAR_RESULT, 0 + call_if 1, TrainerHill_Entrance_EventScript_26832E + setvar VAR_0x8004, 8 + special sp194_trainer_tower + compare VAR_RESULT, 1 + goto_eq TrainerHill_Entrance_EventScript_268275 + msgbox TrainerHill_Entrance_Text_268564, 4 + goto TrainerHill_Entrance_EventScript_26827D + +TrainerHill_Entrance_EventScript_268275:: @ 8268275 + msgbox TrainerHill_Entrance_Text_26859E, 4 + +TrainerHill_Entrance_EventScript_26827D:: @ 826827D + message TrainerHill_Entrance_Text_2685F8 + waitmessage + multichoice 15, 6, 17, 0 + switch VAR_RESULT + case 0, TrainerHill_Entrance_EventScript_2682C8 + case 1, TrainerHill_Entrance_EventScript_268314 + case 2, TrainerHill_Entrance_EventScript_2682BA + case 127, TrainerHill_Entrance_EventScript_268314 + end + +TrainerHill_Entrance_EventScript_2682BA:: @ 82682BA + msgbox TrainerHill_Entrance_Text_2687C3, 4 + goto TrainerHill_Entrance_EventScript_26827D + end + +TrainerHill_Entrance_EventScript_2682C8:: @ 82682C8 + multichoice 13, 2, 113, 0 + switch VAR_RESULT + case 4, TrainerHill_Entrance_EventScript_268314 + case 127, TrainerHill_Entrance_EventScript_268314 + setvar VAR_0x8004, 17 + copyvar VAR_0x8005, VAR_RESULT + special sp194_trainer_tower + setvar VAR_0x40D6, 1 + setvar VAR_TEMP_5, 0 + special HealPlayerParty + msgbox TrainerHill_Entrance_Text_26862A, 4 + setvar VAR_0x8004, 0 + special sp194_trainer_tower + releaseall + end + +TrainerHill_Entrance_EventScript_268314:: @ 8268314 + setvar VAR_TEMP_5, 0 + msgbox TrainerHill_Entrance_Text_26866F, 4 + closemessage + applymovement 255, TrainerHill_Entrance_Movement_268381 + waitmovement 0 + releaseall + end + +TrainerHill_Entrance_EventScript_26832E:: @ 826832E + msgbox TrainerHill_Entrance_Text_26851C, 4 + setvar VAR_0x8004, 14 + special sp194_trainer_tower + setvar VAR_TEMP_5, 1 + call TrainerHill_Entrance_EventScript_27134F + compare VAR_RESULT, 0 + goto_eq TrainerHill_Entrance_EventScript_26835C + setvar VAR_0x8004, 14 + special sp194_trainer_tower + return + +TrainerHill_Entrance_EventScript_26835C:: @ 826835C + setvar VAR_0x8004, 15 + special sp194_trainer_tower + goto TrainerHill_Entrance_EventScript_268314 + end + +TrainerHill_Entrance_EventScript_26836A:: @ 826836A + msgbox TrainerHill_Entrance_Text_268430, 4 + closemessage + applymovement 255, TrainerHill_Entrance_Movement_268381 + waitmovement 0 + releaseall + end + +TrainerHill_Entrance_Movement_26837F: @ 826837F + face_right + step_end + +TrainerHill_Entrance_Movement_268381: @ 8268381 + walk_down + step_end + +TrainerHill_Entrance_Movement_268383: @ 8268383 + face_up + step_end + +TrainerHill_Entrance_Movement_268385: @ 8268385 + walk_down + walk_down + step_end + +TrainerHill_Entrance_EventScript_268388:: @ 8268388 + lockall + fadescreen 1 + special ShowTrainerHillRecords + waitstate + releaseall + end + +TrainerHill_Entrance_EventScript_268391:: @ 8268391 + checkflag FLAG_SYS_GAME_CLEAR + goto_if 0, TrainerHill_Entrance_EventScript_2683A3 + msgbox TrainerHill_Entrance_Text_268D5A, 2 + end + +TrainerHill_Entrance_EventScript_2683A3:: @ 82683A3 + msgbox TrainerHill_Entrance_Text_268DDA, 2 + end + +TrainerHill_Entrance_EventScript_2683AC:: @ 82683AC + checkflag FLAG_SYS_GAME_CLEAR + goto_if 0, TrainerHill_Entrance_EventScript_2683BE + msgbox TrainerHill_Entrance_Text_268E6A, 2 + end + +TrainerHill_Entrance_EventScript_2683BE:: @ 82683BE + msgbox TrainerHill_Entrance_Text_268EDC, 2 + end + +TrainerHill_Entrance_EventScript_2683C7:: @ 82683C7 + lock + faceplayer + message gUnknown_08272A21 + waitmessage + checkflag FLAG_SYS_GAME_CLEAR + goto_eq TrainerHill_Entrance_EventScript_268402 + pokemart TrainerHill_Entrance_Pokemart_2683E8 + msgbox gUnknown_08272A3F, 4 + release + end + + .align 2 +TrainerHill_Entrance_Pokemart_2683E8: @ 82683E8 + .2byte ITEM_SUPER_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_AWAKENING + .2byte ITEM_X_SPEED + .2byte ITEM_X_SPECIAL + .2byte ITEM_X_ATTACK + .2byte ITEM_X_DEFEND + .2byte ITEM_DIRE_HIT + .2byte ITEM_GUARD_SPEC + .2byte ITEM_X_ACCURACY + .2byte ITEM_NONE + release + end + +TrainerHill_Entrance_EventScript_268402:: @ 8268402 + pokemart TrainerHill_Entrance_Pokemart_268414 + msgbox gUnknown_08272A3F, 4 + release + end + + .align 2 +TrainerHill_Entrance_Pokemart_268414: @ 8268414 + .2byte ITEM_HYPER_POTION + .2byte ITEM_MAX_POTION + .2byte ITEM_FULL_RESTORE + .2byte ITEM_FULL_HEAL + .2byte ITEM_REVIVE + .2byte ITEM_X_SPEED + .2byte ITEM_X_SPECIAL + .2byte ITEM_X_ATTACK + .2byte ITEM_X_DEFEND + .2byte ITEM_DIRE_HIT + .2byte ITEM_GUARD_SPEC + .2byte ITEM_X_ACCURACY + .2byte ITEM_NONE + release + end + +TrainerHill_Entrance_Text_268430: @ 8268430 + .string "This is the TRAINER HILL where\n" + .string "you may enjoy tag battles with many\l" + .string "TRAINERS.\p" + .string "Unfortunately, we’re still getting\n" + .string "things ready. Please come back later!$" + +TrainerHill_Entrance_Text_2684C6: @ 82684C6 + .string "Welcome!\p" + .string "This is the TRAINER HILL where\n" + .string "you may enjoy tag battles with many\l" + .string "TRAINERS!$" + +TrainerHill_Entrance_Text_26851C: @ 826851C + .string "Is this your first visit here?\p" + .string "Before you enter, please save\n" + .string "your game.$" + +TrainerHill_Entrance_Text_268564: @ 8268564 + .string "Let’s see…\n" + .string "The TRAINERS here now are…\p" + .string "Up to floor no. {STR_VAR_1}.$" + +TrainerHill_Entrance_Text_26859E: @ 826859E + .string "Let’s see…\n" + .string "The TRAINERS here now are…\p" + .string "There appear to be TRAINERS gathered\n" + .string "in every room.$" + +TrainerHill_Entrance_Text_2685F8: @ 82685F8 + .string "Would you like to challenge the\n" + .string "waiting TRAINERS?$" + +TrainerHill_Entrance_Text_26862A: @ 826862A + .string "I will time your progress.\n" + .string "Best of luck!\p" + .string "On your marks…\p" + .string "Get set…\p" + .string "Go!$" + +TrainerHill_Entrance_Text_26866F: @ 826866F + .string "Please do visit us again!$" + +TrainerHill_Entrance_Text_268689: @ 8268689 + .string "That was too bad.\p" + .string "I think you put in a tremendous\n" + .string "effort in your battling.\p" + .string "Please come back and try again!$" + +TrainerHill_Entrance_Text_2686F4: @ 82686F4 + .string "I hope you give it your best.$" + +TrainerHill_Entrance_Text_268712: @ 8268712 + .string "When the TRAINERS switch places,\n" + .string "the movement can be hectic.\p" + .string "To avoid the stampede, we moved\n" + .string "the reception counter here.\p" + .string "I’m sorry for the inconvenience.$" + +TrainerHill_Entrance_Text_2687AC: @ 82687AC + .string "Thank you for playing!$" + +TrainerHill_Entrance_Text_2687C3: @ 82687C3 + .string "Here at the TRAINER HILL, we conduct\n" + .string "an event called the Time Attack.\p" + .string "It is a race that measures how long\n" + .string "you take to reach our owner on\l" + .string "the rooftop from this counter.\p" + .string "The fastest times are posted on\n" + .string "the Time Board--try competing with\l" + .string "your friends.\p" + .string "In TRAINER battles along the way,\n" + .string "neither Exp. Points nor money will\l" + .string "be awarded.$" + +TrainerHill_Entrance_Text_26890D: @ 826890D + .string "Oh, I’m sorry, but you appear to have\n" + .string "only one POKéMON with you.\p" + .string "You will need at least two POKéMON\n" + .string "to enter this event.$" + +TrainerHill_Roof_Text_268986: @ 8268986 + .string "Hm! Hm!\p" + .string "You finally came!\n" + .string "Yes, you have arrived!\p" + .string "Wait! Don’t say it!\n" + .string "I know why you came all the way\l" + .string "here by yourself!\p" + .string "You wanted to see me, the owner\n" + .string "of the TRAINER HILL, because…\p" + .string "You want to form a tag team with me!\n" + .string "Wa-hoo!\p" + .string "…Uh?\n" + .string "That’s not it?\p" + .string "Anyway, I watched you on your way up.\n" + .string "Marvelous battling! Bravo, indeed!$" + +TrainerHill_Roof_Text_268AC5: @ 8268AC5 + .string "For a marvelous someone like you,\n" + .string "I have the most marvelous gift!$" + +TrainerHill_Roof_Text_268B07: @ 8268B07 + .string "Oh, no, full up with things!\n" + .string "You’ll be back later for this!$" + +TrainerHill_Roof_Text_268B43: @ 8268B43 + .string "Oh, hold on here! Did you possibly get\n" + .string "here marvelously quickly?\p" + .string "How splendid! You needn’t have\n" + .string "hurried so to see me!\p" + .string "That is so delightful. I’ll have the Time\n" + .string "Board at the reception updated!$" + +TrainerHill_Roof_Text_268C03: @ 8268C03 + .string "But, oh…\n" + .string "You weren’t very quick getting here.$" + +TrainerHill_Roof_Text_268C31: @ 8268C31 + .string "Perhaps it would please me more if you\n" + .string "arrived zippier next time.\p" + .string "Then, I should be pleased to form\n" + .string "a tag team with you!\p" + .string "Until we meet again, amigo!$" + +TrainerHill_Roof_Text_268CC6: @ 8268CC6 + .string "I had the TRAINER HILL built for but\n" + .string "one reason and one only!\p" + .string "To find the most suitable partner\n" + .string "with whom I may form a tag team!$" + +TrainerHill_Entrance_Text_268D47: @ 8268D47 + .string "{STR_VAR_1} min. {STR_VAR_2}.{STR_VAR_3} sec.$" + +TrainerHill_Entrance_Text_268D5A: @ 8268D5A + .string "Who knows what sort of TRAINERS\n" + .string "and POKéMON combos are ahead?\p" + .string "All I know is that I’ll knock aside\n" + .string "anyone that stands in my way!$" + +TrainerHill_Entrance_Text_268DDA: @ 8268DDA + .string "I heard tough TRAINERS come to this\n" + .string "TRAINER HILL from all over.\p" + .string "I can’t wait to test the waters!\p" + .string "I’ll knock aside anyone that stands\n" + .string "in my way!$" + +TrainerHill_Entrance_Text_268E6A: @ 8268E6A + .string "Do you see the Time Board over there?\p" + .string "My friends and I are trying to see who\n" + .string "can reach the top in the least time.$" + +TrainerHill_Entrance_Text_268EDC: @ 8268EDC + .string "Do you know when they’re opening\n" + .string "this place up?\p" + .string "I’m waiting here to be the first\n" + .string "challenger ever!$" + +TrainerHill_Elevator_Text_268F3E: @ 8268F3E + .string "Would you like to return to\n" + .string "the reception counter?$" diff --git a/data/maps/TrainerHill_Roof/events.inc b/data/maps/TrainerHill_Roof/events.inc new file mode 100644 index 000000000..c322d7e96 --- /dev/null +++ b/data/maps/TrainerHill_Roof/events.inc @@ -0,0 +1,10 @@ +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 + +TrainerHill_Roof_MapWarps: @ 853D9DC + 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/TrainerHill_Roof/scripts.inc b/data/maps/TrainerHill_Roof/scripts.inc new file mode 100644 index 000000000..bdec2f7aa --- /dev/null +++ b/data/maps/TrainerHill_Roof/scripts.inc @@ -0,0 +1,70 @@ +TrainerHill_Roof_MapScripts:: @ 8268FA7 + map_script 5, TrainerHill_Roof_MapScript1_2C8336 + map_script 2, TrainerHill_Roof_MapScript2_2C8381 + .byte 0 + +TrainerHill_Roof_EventScript_268FB2:: @ 8268FB2 + setvar VAR_0x8004, 12 + special sp194_trainer_tower + lock + faceplayer + setvar VAR_0x8004, 1 + special sp194_trainer_tower + switch VAR_RESULT + case 0, TrainerHill_Roof_EventScript_268FEA + case 1, TrainerHill_Roof_EventScript_268FF2 + case 2, TrainerHill_Roof_EventScript_2690A8 + +TrainerHill_Roof_EventScript_268FEA:: @ 8268FEA + msgbox TrainerHill_Roof_Text_268986, 4 + +TrainerHill_Roof_EventScript_268FF2:: @ 8268FF2 + setvar VAR_0x8004, 2 + special sp194_trainer_tower + switch VAR_RESULT + case 0, TrainerHill_Roof_EventScript_269020 + case 1, TrainerHill_Roof_EventScript_269037 + case 2, TrainerHill_Roof_EventScript_269054 + +TrainerHill_Roof_EventScript_269020:: @ 8269020 + msgbox TrainerHill_Roof_Text_268AC5, 4 + playfanfare MUS_FANFA1 + message gUnknown_08272A78 + waitfanfare + waitmessage + goto TrainerHill_Roof_EventScript_269054 + +TrainerHill_Roof_EventScript_269037:: @ 8269037 + msgbox TrainerHill_Roof_Text_268AC5, 4 + msgbox gUnknown_08272A89, 4 + msgbox TrainerHill_Roof_Text_268B07, 4 + goto TrainerHill_Roof_EventScript_269054 + +TrainerHill_Roof_EventScript_269054:: @ 8269054 + setvar VAR_0x8004, 3 + special sp194_trainer_tower + switch VAR_RESULT + case 0, TrainerHill_Roof_EventScript_269082 + case 1, TrainerHill_Roof_EventScript_269090 + case 2, TrainerHill_Roof_EventScript_26909E + +TrainerHill_Roof_EventScript_269082:: @ 8269082 + msgbox TrainerHill_Roof_Text_268B43, 4 + goto TrainerHill_Roof_EventScript_26909E + end + +TrainerHill_Roof_EventScript_269090:: @ 8269090 + msgbox TrainerHill_Roof_Text_268C03, 4 + goto TrainerHill_Roof_EventScript_26909E + end + +TrainerHill_Roof_EventScript_26909E:: @ 826909E + msgbox TrainerHill_Roof_Text_268C31, 4 + release + end + +TrainerHill_Roof_EventScript_2690A8:: @ 82690A8 + msgbox TrainerHill_Roof_Text_268C31, 4 + release + end + diff --git a/data/maps/Underwater1/events.inc b/data/maps/Underwater1/events.inc new file mode 100644 index 000000000..08cf19a4c --- /dev/null +++ b/data/maps/Underwater1/events.inc @@ -0,0 +1,12 @@ +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 + +Underwater1_MapEvents:: @ 852CF08 + map_events 0x0, 0x0, 0x0, Underwater1_MapBGEvents + diff --git a/data/maps/Underwater1/scripts.inc b/data/maps/Underwater1/scripts.inc new file mode 100644 index 000000000..107a038a8 --- /dev/null +++ b/data/maps/Underwater1/scripts.inc @@ -0,0 +1,3 @@ +Underwater1_MapScripts:: @ 81F7722 + .byte 0 + diff --git a/data/maps/Underwater2/events.inc b/data/maps/Underwater2/events.inc new file mode 100644 index 000000000..416e9fe86 --- /dev/null +++ b/data/maps/Underwater2/events.inc @@ -0,0 +1,16 @@ +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 + +Underwater2_MapEvents:: @ 852CF84 + map_events 0x0, Underwater2_MapWarps, 0x0, Underwater2_MapBGEvents + diff --git a/data/maps/Underwater2/scripts.inc b/data/maps/Underwater2/scripts.inc new file mode 100644 index 000000000..80c854c63 --- /dev/null +++ b/data/maps/Underwater2/scripts.inc @@ -0,0 +1,3 @@ +Underwater2_MapScripts:: @ 81F7723 + .byte 0 + diff --git a/data/maps/Underwater3/events.inc b/data/maps/Underwater3/events.inc new file mode 100644 index 000000000..ba8ed9508 --- /dev/null +++ b/data/maps/Underwater3/events.inc @@ -0,0 +1,13 @@ +Underwater3_MapWarps: @ 852CF98 + 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 + 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 + +Underwater3_MapEvents:: @ 852CFD8 + map_events 0x0, Underwater3_MapWarps, 0x0, Underwater3_MapBGEvents + diff --git a/data/maps/Underwater3/scripts.inc b/data/maps/Underwater3/scripts.inc new file mode 100644 index 000000000..463f7a0ff --- /dev/null +++ b/data/maps/Underwater3/scripts.inc @@ -0,0 +1,8 @@ +Underwater3_MapScripts:: @ 81F7724 + map_script 5, Underwater3_MapScript1_1F772A + .byte 0 + +Underwater3_MapScript1_1F772A: @ 81F772A + call Underwater3_EventScript_274223 + end + diff --git a/data/maps/Underwater4/events.inc b/data/maps/Underwater4/events.inc new file mode 100644 index 000000000..5f8b99b64 --- /dev/null +++ b/data/maps/Underwater4/events.inc @@ -0,0 +1,10 @@ +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 + +Underwater4_MapEvents:: @ 852D00C + map_events 0x0, Underwater4_MapWarps, 0x0, Underwater4_MapBGEvents + diff --git a/data/maps/Underwater4/scripts.inc b/data/maps/Underwater4/scripts.inc new file mode 100644 index 000000000..295c27356 --- /dev/null +++ b/data/maps/Underwater4/scripts.inc @@ -0,0 +1,3 @@ +Underwater4_MapScripts:: @ 81F7730 + .byte 0 + diff --git a/data/maps/Underwater5/events.inc b/data/maps/Underwater5/events.inc new file mode 100644 index 000000000..4b902cf96 --- /dev/null +++ b/data/maps/Underwater5/events.inc @@ -0,0 +1,7 @@ +Underwater5_MapWarps: @ 852D020 + 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/Underwater5/scripts.inc b/data/maps/Underwater5/scripts.inc new file mode 100644 index 000000000..9d0cc373c --- /dev/null +++ b/data/maps/Underwater5/scripts.inc @@ -0,0 +1,8 @@ +Underwater5_MapScripts:: @ 81F7731 + map_script 5, Underwater5_MapScript1_1F7737 + .byte 0 + +Underwater5_MapScript1_1F7737: @ 81F7737 + call Underwater5_EventScript_274223 + end + diff --git a/data/maps/Underwater6/events.inc b/data/maps/Underwater6/events.inc new file mode 100644 index 000000000..a624efba3 --- /dev/null +++ b/data/maps/Underwater6/events.inc @@ -0,0 +1,7 @@ +Underwater6_MapWarps: @ 852D044 + 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/Underwater6/scripts.inc b/data/maps/Underwater6/scripts.inc new file mode 100644 index 000000000..047628c9c --- /dev/null +++ b/data/maps/Underwater6/scripts.inc @@ -0,0 +1,8 @@ +Underwater6_MapScripts:: @ 81F773D + map_script 5, Underwater6_MapScript1_1F7743 + .byte 0 + +Underwater6_MapScript1_1F7743: @ 81F7743 + call Underwater6_EventScript_274223 + end + diff --git a/data/maps/Underwater7/events.inc b/data/maps/Underwater7/events.inc new file mode 100644 index 000000000..fba9324f6 --- /dev/null +++ b/data/maps/Underwater7/events.inc @@ -0,0 +1,7 @@ +Underwater7_MapWarps: @ 852D068 + 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/Underwater7/scripts.inc b/data/maps/Underwater7/scripts.inc new file mode 100644 index 000000000..dd757f98a --- /dev/null +++ b/data/maps/Underwater7/scripts.inc @@ -0,0 +1,8 @@ +Underwater7_MapScripts:: @ 81F7749 + map_script 5, Underwater7_MapScript1_1F774F + .byte 0 + +Underwater7_MapScript1_1F774F: @ 81F774F + call Underwater7_EventScript_274223 + end + diff --git a/data/maps/Underwater_MarineCave/events.inc b/data/maps/Underwater_MarineCave/events.inc new file mode 100644 index 000000000..685abaa16 --- /dev/null +++ b/data/maps/Underwater_MarineCave/events.inc @@ -0,0 +1,6 @@ +Underwater_MarineCave_MapWarps: @ 85377B0 + 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/Underwater_MarineCave/scripts.inc b/data/maps/Underwater_MarineCave/scripts.inc new file mode 100644 index 000000000..ac96e3a9b --- /dev/null +++ b/data/maps/Underwater_MarineCave/scripts.inc @@ -0,0 +1,13 @@ +Underwater_MarineCave_MapScripts:: @ 823AFB8 + map_script 5, Underwater_MarineCave_MapScript1_23AFC7 + map_script 3, Underwater_MarineCave_MapScript1_23AFC3 + .byte 0 + +Underwater_MarineCave_MapScript1_23AFC3: @ 823AFC3 + setflag FLAG_0x8D9 + end + +Underwater_MarineCave_MapScript1_23AFC7: @ 823AFC7 + setdivewarp MAP_MARINE_CAVE_ENTRANCE, 255, 10, 17 + end + diff --git a/data/maps/Underwater_Route134/events.inc b/data/maps/Underwater_Route134/events.inc new file mode 100644 index 000000000..3a5219511 --- /dev/null +++ b/data/maps/Underwater_Route134/events.inc @@ -0,0 +1,6 @@ +Underwater_Route134_MapWarps: @ 8536D44 + 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/Underwater_Route134/scripts.inc b/data/maps/Underwater_Route134/scripts.inc new file mode 100644 index 000000000..786de1757 --- /dev/null +++ b/data/maps/Underwater_Route134/scripts.inc @@ -0,0 +1,8 @@ +Underwater_Route134_MapScripts:: @ 82390B5 + map_script 5, Underwater_Route134_MapScript1_2390BB + .byte 0 + +Underwater_Route134_MapScript1_2390BB: @ 82390BB + setdivewarp MAP_ROUTE134, 255, 60, 31 + end + diff --git a/data/maps/Underwater_SeafloorCavern/events.inc b/data/maps/Underwater_SeafloorCavern/events.inc new file mode 100644 index 000000000..a22465ca0 --- /dev/null +++ b/data/maps/Underwater_SeafloorCavern/events.inc @@ -0,0 +1,12 @@ +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 + +Underwater_SeafloorCavern_MapWarps: @ 85356A0 + 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/Underwater_SeafloorCavern/scripts.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc new file mode 100644 index 000000000..128cb31c0 --- /dev/null +++ b/data/maps/Underwater_SeafloorCavern/scripts.inc @@ -0,0 +1,52 @@ +Underwater_SeafloorCavern_MapScripts:: @ 823433B + map_script 5, Underwater_SeafloorCavern_MapScript1_2343D3 + map_script 3, Underwater_SeafloorCavern_MapScript1_23434B + map_script 1, Underwater_SeafloorCavern_MapScript1_23435C + .byte 0 + +Underwater_SeafloorCavern_MapScript1_23434B: @ 823434B + setflag FLAG_LANDMARK_SEAFLOOR_CAVERN + checkflag FLAG_0x081 + goto_eq Underwater_SeafloorCavern_EventScript_234358 + end + +Underwater_SeafloorCavern_EventScript_234358:: @ 8234358 + setflag FLAG_0x3D4 + end + +Underwater_SeafloorCavern_MapScript1_23435C: @ 823435C + checkflag FLAG_0x081 + call_if 1, Underwater_SeafloorCavern_EventScript_234366 + end + +Underwater_SeafloorCavern_EventScript_234366:: @ 8234366 + setmetatile 5, 3, 542, 1 + setmetatile 6, 3, 542, 1 + setmetatile 7, 3, 542, 1 + setmetatile 8, 3, 542, 1 + setmetatile 5, 4, 552, 0 + setmetatile 6, 4, 552, 0 + setmetatile 7, 4, 552, 0 + setmetatile 8, 4, 552, 0 + setmetatile 5, 5, 552, 0 + setmetatile 6, 5, 552, 0 + setmetatile 7, 5, 552, 0 + setmetatile 8, 5, 552, 0 + return + +Underwater_SeafloorCavern_MapScript1_2343D3: @ 82343D3 + setdivewarp MAP_SEAFLOOR_CAVERN_ENTRANCE, 255, 10, 17 + end + +Underwater_SeafloorCavern_EventScript_2343DC:: @ 82343DC + msgbox Underwater_SeafloorCavern_Text_2343E5, 3 + end + +Underwater_SeafloorCavern_Text_2343E5: @ 82343E5 + .string "“SUBMARINE EXPLORER 1†is painted\n" + .string "on the hull.\p" + .string "This is the submarine TEAM AQUA\n" + .string "stole in SLATEPORT!\p" + .string "TEAM AQUA must have gone\n" + .string "ashore here.$" + diff --git a/data/maps/Underwater_SealedChamber/events.inc b/data/maps/Underwater_SealedChamber/events.inc new file mode 100644 index 000000000..350cca5d6 --- /dev/null +++ b/data/maps/Underwater_SealedChamber/events.inc @@ -0,0 +1,9 @@ +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 + +Underwater_SealedChamber_MapEvents:: @ 8536D74 + map_events 0x0, Underwater_SealedChamber_MapWarps, 0x0, Underwater_SealedChamber_MapBGEvents + diff --git a/data/maps/Underwater_SealedChamber/scripts.inc b/data/maps/Underwater_SealedChamber/scripts.inc new file mode 100644 index 000000000..7ac032c5f --- /dev/null +++ b/data/maps/Underwater_SealedChamber/scripts.inc @@ -0,0 +1,28 @@ +Underwater_SealedChamber_MapScripts:: @ 82390C4 + map_script 6, Underwater_SealedChamber_MapScript1_2390CA + .byte 0 + +Underwater_SealedChamber_MapScript1_2390CA: @ 82390CA + getplayerxy VAR_0x8004, VAR_0x8005 + compare VAR_0x8004, 12 + goto_if 5, Underwater_SealedChamber_EventScript_2390EA + compare VAR_0x8005, 44 + goto_if 5, Underwater_SealedChamber_EventScript_2390EA + goto Underwater_SealedChamber_EventScript_2390F3 + +Underwater_SealedChamber_EventScript_2390EA:: @ 82390EA + setdivewarp MAP_ROUTE134, 255, 60, 31 + end + +Underwater_SealedChamber_EventScript_2390F3:: @ 82390F3 + setdivewarp MAP_SEALED_CHAMBER_OUTER_ROOM, 255, 10, 19 + end + +Underwater_SealedChamber_EventScript_2390FC:: @ 82390FC + lockall + braillemessage Underwater_SealedChamber_Braille_2A6B15 + waitbuttonpress + hidebox2 + releaseall + end + diff --git a/data/maps/Underwater_SootopolisCity/events.inc b/data/maps/Underwater_SootopolisCity/events.inc new file mode 100644 index 000000000..78839e8a1 --- /dev/null +++ b/data/maps/Underwater_SootopolisCity/events.inc @@ -0,0 +1,7 @@ +Underwater_SootopolisCity_MapWarps: @ 8534330 + 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/Underwater_SootopolisCity/scripts.inc b/data/maps/Underwater_SootopolisCity/scripts.inc new file mode 100644 index 000000000..cbeefcb1d --- /dev/null +++ b/data/maps/Underwater_SootopolisCity/scripts.inc @@ -0,0 +1,8 @@ +Underwater_SootopolisCity_MapScripts:: @ 822D94C + map_script 5, Underwater_SootopolisCity_MapScript1_22D952 + .byte 0 + +Underwater_SootopolisCity_MapScript1_22D952: @ 822D952 + setdivewarp MAP_SOOTOPOLIS_CITY, 255, 29, 53 + end + diff --git a/data/maps/UnionRoom/events.inc b/data/maps/UnionRoom/events.inc new file mode 100644 index 000000000..1a50ea7d8 --- /dev/null +++ b/data/maps/UnionRoom/events.inc @@ -0,0 +1,18 @@ +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 + +UnionRoom_MapWarps: @ 853B0F8 + 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/UnionRoom/scripts.inc b/data/maps/UnionRoom/scripts.inc new file mode 100644 index 000000000..250b4b402 --- /dev/null +++ b/data/maps/UnionRoom/scripts.inc @@ -0,0 +1,107 @@ +UnionRoom_MapScripts:: @ 823D1A6 + map_script 5, UnionRoom_MapScript1_23D1B1 + map_script 3, UnionRoom_MapScript1_23D1E5 + .byte 0 + +UnionRoom_MapScript1_23D1B1: @ 823D1B1 + setflag FLAG_0x2BF + setflag FLAG_0x2C0 + setflag FLAG_0x2C1 + setflag FLAG_0x2C2 + setflag FLAG_0x2C3 + setflag FLAG_0x2C4 + setflag FLAG_0x2C5 + setflag FLAG_0x2C6 + removeobject 9 + removeobject 8 + removeobject 7 + removeobject 2 + removeobject 6 + removeobject 5 + removeobject 4 + removeobject 3 + special UnionRoomSpecial + end + +UnionRoom_MapScript1_23D1E5: @ 823D1E5 + end + +UnionRoom_EventScript_23D1E6:: @ 823D1E6 + lock + faceplayer + setvar VAR_RESULT, 1 + waitstate + release + end + +UnionRoom_EventScript_23D1F0:: @ 823D1F0 + lock + faceplayer + setvar VAR_RESULT, 2 + waitstate + release + end + +UnionRoom_EventScript_23D1FA:: @ 823D1FA + lock + faceplayer + setvar VAR_RESULT, 3 + waitstate + release + end + +UnionRoom_EventScript_23D204:: @ 823D204 + lock + faceplayer + setvar VAR_RESULT, 4 + waitstate + release + end + +UnionRoom_EventScript_23D20E:: @ 823D20E + lock + faceplayer + setvar VAR_RESULT, 5 + waitstate + release + end + +UnionRoom_EventScript_23D218:: @ 823D218 + lock + faceplayer + setvar VAR_RESULT, 6 + waitstate + release + end + +UnionRoom_EventScript_23D222:: @ 823D222 + lock + faceplayer + setvar VAR_RESULT, 7 + waitstate + release + end + +UnionRoom_EventScript_23D22C:: @ 823D22C + lock + faceplayer + setvar VAR_RESULT, 8 + waitstate + release + end + +UnionRoom_EventScript_23D236:: @ 823D236 + lock + faceplayer + setvar VAR_RESULT, 9 + waitstate + release + end + +UnionRoom_EventScript_23D240:: @ 823D240 + lockall + setvar VAR_RESULT, 10 + waitstate + releaseall + end + diff --git a/data/maps/UnknownMap_25_29/events.inc b/data/maps/UnknownMap_25_29/events.inc new file mode 100644 index 000000000..13ea1b8b9 --- /dev/null +++ b/data/maps/UnknownMap_25_29/events.inc @@ -0,0 +1 @@ +UnknownMap_25_29_MapEvents:: @ 853A064 diff --git a/data/maps/UnknownMap_25_29/scripts.inc b/data/maps/UnknownMap_25_29/scripts.inc new file mode 100644 index 000000000..575e7a898 --- /dev/null +++ b/data/maps/UnknownMap_25_29/scripts.inc @@ -0,0 +1 @@ +UnknownMap_25_29_MapScripts:: @ 823B781 diff --git a/data/maps/UnknownMap_25_30/events.inc b/data/maps/UnknownMap_25_30/events.inc new file mode 100644 index 000000000..0e221e240 --- /dev/null +++ b/data/maps/UnknownMap_25_30/events.inc @@ -0,0 +1 @@ +UnknownMap_25_30_MapEvents:: @ 853A064 diff --git a/data/maps/UnknownMap_25_30/scripts.inc b/data/maps/UnknownMap_25_30/scripts.inc new file mode 100644 index 000000000..dbc73166d --- /dev/null +++ b/data/maps/UnknownMap_25_30/scripts.inc @@ -0,0 +1 @@ +UnknownMap_25_30_MapScripts:: @ 823B781 diff --git a/data/maps/UnknownMap_25_31/events.inc b/data/maps/UnknownMap_25_31/events.inc new file mode 100644 index 000000000..99e450de5 --- /dev/null +++ b/data/maps/UnknownMap_25_31/events.inc @@ -0,0 +1 @@ +UnknownMap_25_31_MapEvents:: @ 853A064 diff --git a/data/maps/UnknownMap_25_31/scripts.inc b/data/maps/UnknownMap_25_31/scripts.inc new file mode 100644 index 000000000..cacda4d1f --- /dev/null +++ b/data/maps/UnknownMap_25_31/scripts.inc @@ -0,0 +1 @@ +UnknownMap_25_31_MapScripts:: @ 823B781 diff --git a/data/maps/UnknownMap_25_32/events.inc b/data/maps/UnknownMap_25_32/events.inc new file mode 100644 index 000000000..c48eedb17 --- /dev/null +++ b/data/maps/UnknownMap_25_32/events.inc @@ -0,0 +1 @@ +UnknownMap_25_32_MapEvents:: @ 853A064 diff --git a/data/maps/UnknownMap_25_32/scripts.inc b/data/maps/UnknownMap_25_32/scripts.inc new file mode 100644 index 000000000..e34f454e7 --- /dev/null +++ b/data/maps/UnknownMap_25_32/scripts.inc @@ -0,0 +1 @@ +UnknownMap_25_32_MapScripts:: @ 823B781 diff --git a/data/maps/UnknownMap_25_33/events.inc b/data/maps/UnknownMap_25_33/events.inc new file mode 100644 index 000000000..14f4571d2 --- /dev/null +++ b/data/maps/UnknownMap_25_33/events.inc @@ -0,0 +1 @@ +UnknownMap_25_33_MapEvents:: @ 853A064 diff --git a/data/maps/UnknownMap_25_33/scripts.inc b/data/maps/UnknownMap_25_33/scripts.inc new file mode 100644 index 000000000..086d2d32c --- /dev/null +++ b/data/maps/UnknownMap_25_33/scripts.inc @@ -0,0 +1 @@ +UnknownMap_25_33_MapScripts:: @ 823B781 diff --git a/data/maps/UnknownMap_25_34/events.inc b/data/maps/UnknownMap_25_34/events.inc new file mode 100644 index 000000000..975f08470 --- /dev/null +++ b/data/maps/UnknownMap_25_34/events.inc @@ -0,0 +1,3 @@ +UnknownMap_25_34_MapEvents:: @ 853A064 + map_events LinkContestRoom1_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/UnknownMap_25_34/scripts.inc b/data/maps/UnknownMap_25_34/scripts.inc new file mode 100644 index 000000000..eb6bf8da4 --- /dev/null +++ b/data/maps/UnknownMap_25_34/scripts.inc @@ -0,0 +1,458 @@ +UnknownMap_25_34_MapScripts:: @ 823B781 + map_script 4, LinkContestRoom1_MapScript2_23B81F + map_script 2, LinkContestRoom1_MapScript2_23B815 + map_script 3, LinkContestRoom1_MapScript1_23B79F + map_script 5, LinkContestRoom1_MapScript1_23B803 + map_script 7, LinkContestRoom1_MapScript1_23B79B + .byte 0 + +LinkContestRoom1_MapScript1_23B79B: @ 823B79B + special sub_80F8B94 + end + +LinkContestRoom1_MapScript1_23B79F: @ 823B79F + call LinkContestRoom1_EventScript_23B7AF + setvar VAR_TEMP_0, 1 + call LinkContestRoom1_EventScript_23B842 + end + +LinkContestRoom1_EventScript_23B7AF:: @ 823B7AF + call LinkContestRoom1_EventScript_27A133 + special sub_80F8FA0 + compare VAR_RESULT, 0 + call_if 1, LinkContestRoom1_EventScript_23B7EF + compare VAR_RESULT, 1 + call_if 1, LinkContestRoom1_EventScript_23B7F3 + compare VAR_RESULT, 2 + call_if 1, LinkContestRoom1_EventScript_23B7F7 + compare VAR_RESULT, 3 + call_if 1, LinkContestRoom1_EventScript_23B7FB + compare VAR_RESULT, 4 + call_if 1, LinkContestRoom1_EventScript_23B7FF + return + +LinkContestRoom1_EventScript_23B7EF:: @ 823B7EF + savebgm MUS_TEST1 + return + +LinkContestRoom1_EventScript_23B7F3:: @ 823B7F3 + savebgm MUS_TEST2 + return + +LinkContestRoom1_EventScript_23B7F7:: @ 823B7F7 + savebgm MUS_TEST3 + return + +LinkContestRoom1_EventScript_23B7FB:: @ 823B7FB + savebgm MUS_TEST4 + return + +LinkContestRoom1_EventScript_23B7FF:: @ 823B7FF + savebgm MUS_CONTEST0 + return + +LinkContestRoom1_MapScript1_23B803: @ 823B803 + compare VAR_TEMP_9, 1 + call_if 1, LinkContestRoom1_EventScript_23B80F + end + +LinkContestRoom1_EventScript_23B80F:: @ 823B80F + call LinkContestRoom1_EventScript_23BB2B + return + +LinkContestRoom1_MapScript2_23B815: @ 823B815 + map_script_2 VAR_0x4086, 1, LinkContestRoom1_EventScript_23B829 + .2byte 0 + +LinkContestRoom1_MapScript2_23B81F: @ 823B81F + map_script_2 VAR_0x4086, 1, LinkContestRoom1_EventScript_23B834 + .2byte 0 + +LinkContestRoom1_EventScript_23B829:: @ 823B829 + call LinkContestRoom1_EventScript_279F97 + call LinkContestRoom1_EventScript_23BE44 + end + +LinkContestRoom1_EventScript_23B834:: @ 823B834 + special sub_80F8B94 + hideobjectat 255, MAP_LITTLEROOT_TOWN + call LinkContestRoom1_EventScript_23BB2B + end + +LinkContestRoom1_EventScript_23B842:: @ 823B842 + call LinkContestRoom1_EventScript_23B8F8 + call LinkContestRoom1_EventScript_23B858 + compare VAR_TEMP_0, 8 + goto_if 0, LinkContestRoom1_EventScript_23B842 + return + +LinkContestRoom1_EventScript_23B858:: @ 823B858 + switch VAR_TEMP_0 + case 1, LinkContestRoom1_EventScript_23B8AB + case 2, LinkContestRoom1_EventScript_23B8B6 + case 3, LinkContestRoom1_EventScript_23B8C1 + case 4, LinkContestRoom1_EventScript_23B8CC + case 5, LinkContestRoom1_EventScript_23B8D7 + case 6, LinkContestRoom1_EventScript_23B8E2 + case 7, LinkContestRoom1_EventScript_23B8ED + end + +LinkContestRoom1_EventScript_23B8AB:: @ 823B8AB + copyvar VAR_OBJ_GFX_ID_4, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +LinkContestRoom1_EventScript_23B8B6:: @ 823B8B6 + copyvar VAR_OBJ_GFX_ID_5, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +LinkContestRoom1_EventScript_23B8C1:: @ 823B8C1 + copyvar VAR_OBJ_GFX_ID_6, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +LinkContestRoom1_EventScript_23B8CC:: @ 823B8CC + copyvar VAR_OBJ_GFX_ID_7, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +LinkContestRoom1_EventScript_23B8D7:: @ 823B8D7 + copyvar VAR_OBJ_GFX_ID_8, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +LinkContestRoom1_EventScript_23B8E2:: @ 823B8E2 + copyvar VAR_OBJ_GFX_ID_9, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +LinkContestRoom1_EventScript_23B8ED:: @ 823B8ED + copyvar VAR_OBJ_GFX_ID_A, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +LinkContestRoom1_EventScript_23B8F8:: @ 823B8F8 + setvar VAR_RESULT, 32 + special sub_80F8FE8 + addvar VAR_RESULT, 1 + switch VAR_RESULT + case 1, LinkContestRoom1_EventScript_23BA6B + case 2, LinkContestRoom1_EventScript_23BA71 + case 3, LinkContestRoom1_EventScript_23BA77 + case 4, LinkContestRoom1_EventScript_23BA7D + case 5, LinkContestRoom1_EventScript_23BA83 + case 6, LinkContestRoom1_EventScript_23BA89 + case 7, LinkContestRoom1_EventScript_23BA8F + case 8, LinkContestRoom1_EventScript_23BA95 + case 9, LinkContestRoom1_EventScript_23BA9B + case 10, LinkContestRoom1_EventScript_23BAA1 + case 11, LinkContestRoom1_EventScript_23BAA7 + case 12, LinkContestRoom1_EventScript_23BAAD + case 13, LinkContestRoom1_EventScript_23BAB3 + case 14, LinkContestRoom1_EventScript_23BAB9 + case 15, LinkContestRoom1_EventScript_23BABF + case 16, LinkContestRoom1_EventScript_23BAC5 + case 17, LinkContestRoom1_EventScript_23BACB + case 18, LinkContestRoom1_EventScript_23BAD1 + case 19, LinkContestRoom1_EventScript_23BAD7 + case 20, LinkContestRoom1_EventScript_23BADD + case 21, LinkContestRoom1_EventScript_23BAE3 + case 22, LinkContestRoom1_EventScript_23BAE9 + case 23, LinkContestRoom1_EventScript_23BAEF + case 24, LinkContestRoom1_EventScript_23BAF5 + case 25, LinkContestRoom1_EventScript_23BAFB + case 26, LinkContestRoom1_EventScript_23BB01 + case 27, LinkContestRoom1_EventScript_23BB07 + case 28, LinkContestRoom1_EventScript_23BB0D + case 29, LinkContestRoom1_EventScript_23BB13 + case 30, LinkContestRoom1_EventScript_23BB19 + case 31, LinkContestRoom1_EventScript_23BB1F + case 32, LinkContestRoom1_EventScript_23BB25 + end + +LinkContestRoom1_EventScript_23BA6B:: @ 823BA6B + setvar VAR_TEMP_1, 5 + return + +LinkContestRoom1_EventScript_23BA71:: @ 823BA71 + setvar VAR_TEMP_1, 6 + return + +LinkContestRoom1_EventScript_23BA77:: @ 823BA77 + setvar VAR_TEMP_1, 7 + return + +LinkContestRoom1_EventScript_23BA7D:: @ 823BA7D + setvar VAR_TEMP_1, 8 + return + +LinkContestRoom1_EventScript_23BA83:: @ 823BA83 + setvar VAR_TEMP_1, 10 + return + +LinkContestRoom1_EventScript_23BA89:: @ 823BA89 + setvar VAR_TEMP_1, 11 + return + +LinkContestRoom1_EventScript_23BA8F:: @ 823BA8F + setvar VAR_TEMP_1, 12 + return + +LinkContestRoom1_EventScript_23BA95:: @ 823BA95 + setvar VAR_TEMP_1, 13 + return + +LinkContestRoom1_EventScript_23BA9B:: @ 823BA9B + setvar VAR_TEMP_1, 14 + return + +LinkContestRoom1_EventScript_23BAA1:: @ 823BAA1 + setvar VAR_TEMP_1, 15 + return + +LinkContestRoom1_EventScript_23BAA7:: @ 823BAA7 + setvar VAR_TEMP_1, 17 + return + +LinkContestRoom1_EventScript_23BAAD:: @ 823BAAD + setvar VAR_TEMP_1, 18 + return + +LinkContestRoom1_EventScript_23BAB3:: @ 823BAB3 + setvar VAR_TEMP_1, 19 + return + +LinkContestRoom1_EventScript_23BAB9:: @ 823BAB9 + setvar VAR_TEMP_1, 20 + return + +LinkContestRoom1_EventScript_23BABF:: @ 823BABF + setvar VAR_TEMP_1, 21 + return + +LinkContestRoom1_EventScript_23BAC5:: @ 823BAC5 + setvar VAR_TEMP_1, 22 + return + +LinkContestRoom1_EventScript_23BACB:: @ 823BACB + setvar VAR_TEMP_1, 25 + return + +LinkContestRoom1_EventScript_23BAD1:: @ 823BAD1 + setvar VAR_TEMP_1, 26 + return + +LinkContestRoom1_EventScript_23BAD7:: @ 823BAD7 + setvar VAR_TEMP_1, 27 + return + +LinkContestRoom1_EventScript_23BADD:: @ 823BADD + setvar VAR_TEMP_1, 47 + return + +LinkContestRoom1_EventScript_23BAE3:: @ 823BAE3 + setvar VAR_TEMP_1, 30 + return + +LinkContestRoom1_EventScript_23BAE9:: @ 823BAE9 + setvar VAR_TEMP_1, 31 + return + +LinkContestRoom1_EventScript_23BAEF:: @ 823BAEF + setvar VAR_TEMP_1, 32 + return + +LinkContestRoom1_EventScript_23BAF5:: @ 823BAF5 + setvar VAR_TEMP_1, 33 + return + +LinkContestRoom1_EventScript_23BAFB:: @ 823BAFB + setvar VAR_TEMP_1, 34 + return + +LinkContestRoom1_EventScript_23BB01:: @ 823BB01 + setvar VAR_TEMP_1, 35 + return + +LinkContestRoom1_EventScript_23BB07:: @ 823BB07 + setvar VAR_TEMP_1, 36 + return + +LinkContestRoom1_EventScript_23BB0D:: @ 823BB0D + setvar VAR_TEMP_1, 37 + return + +LinkContestRoom1_EventScript_23BB13:: @ 823BB13 + setvar VAR_TEMP_1, 38 + return + +LinkContestRoom1_EventScript_23BB19:: @ 823BB19 + setvar VAR_TEMP_1, 44 + return + +LinkContestRoom1_EventScript_23BB1F:: @ 823BB1F + setvar VAR_TEMP_1, 45 + return + +LinkContestRoom1_EventScript_23BB25:: @ 823BB25 + setvar VAR_TEMP_1, 46 + return + +LinkContestRoom1_EventScript_23BB2B:: @ 823BB2B + specialvar VAR_RESULT, sub_80F9160 + compare VAR_RESULT, 1 + goto_eq LinkContestRoom1_EventScript_23BD86 + switch VAR_0x4088 + case 1, LinkContestRoom1_EventScript_23BB78 + case 2, LinkContestRoom1_EventScript_23BB8B + case 3, LinkContestRoom1_EventScript_23BBE6 + case 4, LinkContestRoom1_EventScript_23BC92 + case 5, LinkContestRoom1_EventScript_23BC92 + return + +LinkContestRoom1_EventScript_23BB78:: @ 823BB78 + createvobject 5, 20, 3, 2, 3, 1 + createvobject 46, 24, 11, 2, 3, 1 + return + +LinkContestRoom1_EventScript_23BB8B:: @ 823BB8B + createvobject 45, 0, 2, 3, 3, 4 + createvobject 66, 1, 2, 4, 3, 4 + createvobject 55, 2, 2, 7, 3, 4 + createvobject 46, 3, 2, 8, 3, 4 + createvobject 5, 10, 12, 3, 3, 3 + createvobject 20, 11, 12, 4, 3, 3 + createvobject 24, 12, 12, 7, 3, 3 + createvobject 12, 13, 12, 8, 3, 3 + createvobject 47, 20, 3, 2, 3, 1 + createvobject 46, 24, 11, 2, 3, 1 + return + +LinkContestRoom1_EventScript_23BBE6:: @ 823BBE6 + createvobject 45, 0, 2, 3, 3, 4 + createvobject 66, 1, 2, 4, 3, 4 + createvobject 55, 2, 2, 7, 3, 4 + createvobject 48, 3, 2, 8, 3, 4 + createvobject 5, 10, 12, 3, 3, 3 + createvobject 20, 11, 12, 4, 3, 3 + createvobject 24, 12, 12, 7, 3, 3 + createvobject 45, 13, 12, 8, 3, 3 + createvobject 22, 20, 3, 2, 3, 1 + createvobject 23, 20, 6, 2, 3, 1 + createvobject 34, 20, 7, 2, 3, 1 + createvobject 46, 24, 8, 2, 3, 1 + createvobject 48, 24, 11, 2, 3, 1 + createvobject 11, 25, 3, 9, 3, 2 + createvobject 35, 26, 4, 9, 3, 2 + createvobject 17, 27, 5, 9, 3, 2 + createvobject 40, 28, 9, 9, 3, 2 + createvobject 38, 29, 10, 9, 3, 2 + createvobject 83, 30, 11, 9, 3, 2 + return + +LinkContestRoom1_EventScript_23BC92:: @ 823BC92 + createvobject 45, 0, 2, 3, 3, 4 + createvobject 66, 1, 2, 4, 3, 4 + createvobject 55, 2, 2, 7, 3, 4 + createvobject 12, 3, 2, 8, 3, 4 + createvobject 39, 4, 1, 3, 3, 4 + createvobject 34, 6, 1, 5, 3, 4 + createvobject 26, 7, 1, 6, 3, 4 + createvobject 48, 9, 1, 8, 3, 4 + createvobject 5, 10, 12, 3, 3, 3 + createvobject 20, 11, 12, 4, 3, 3 + createvobject 24, 12, 12, 7, 3, 3 + createvobject 45, 13, 12, 8, 3, 3 + createvobject 50, 14, 13, 3, 3, 3 + createvobject 52, 15, 13, 4, 3, 3 + createvobject 65, 17, 13, 6, 3, 3 + createvobject 83, 18, 13, 7, 3, 3 + createvobject 116, 19, 13, 8, 3, 3 + createvobject 25, 20, 3, 2, 3, 1 + createvobject 31, 21, 6, 2, 3, 1 + createvobject 33, 22, 7, 2, 3, 1 + createvobject 46, 24, 11, 2, 3, 1 + createvobject 49, 25, 3, 9, 3, 2 + createvobject 35, 26, 4, 9, 3, 2 + createvobject 48, 27, 5, 9, 3, 2 + createvobject 40, 28, 9, 9, 3, 2 + createvobject 38, 29, 10, 9, 3, 2 + createvobject 83, 30, 11, 9, 3, 2 + return + +LinkContestRoom1_EventScript_23BD86:: @ 823BD86 + createvobject 45, 0, 2, 3, 3, 4 + createvobject 66, 1, 2, 4, 3, 4 + createvobject 55, 2, 2, 7, 3, 4 + createvobject 12, 3, 2, 8, 3, 4 + createvobject 39, 4, 1, 3, 3, 4 + createvobject 34, 6, 1, 5, 3, 4 + createvobject 26, 7, 1, 6, 3, 4 + createvobject 48, 9, 1, 8, 3, 4 + createvobject 5, 10, 12, 3, 3, 3 + createvobject 20, 11, 12, 4, 3, 3 + createvobject 24, 12, 12, 7, 3, 3 + createvobject 45, 13, 12, 8, 3, 3 + createvobject 50, 14, 13, 3, 3, 3 + createvobject 52, 15, 13, 4, 3, 3 + createvobject 65, 17, 13, 6, 3, 3 + createvobject 83, 18, 13, 7, 3, 3 + createvobject 116, 19, 13, 8, 3, 3 + createvobject 25, 20, 3, 2, 3, 1 + createvobject 31, 21, 6, 2, 3, 1 + createvobject 33, 22, 7, 2, 3, 1 + createvobject 46, 24, 11, 2, 3, 1 + return + +LinkContestRoom1_EventScript_23BE44:: @ 823BE44 + special sub_80F9154 + switch VAR_0x4088 + case 1, LinkContestRoom1_EventScript_23BE84 + case 2, LinkContestRoom1_EventScript_23BE8E + case 3, LinkContestRoom1_EventScript_23BE98 + case 4, LinkContestRoom1_EventScript_23BEA2 + case 5, LinkContestRoom1_EventScript_23BEAC + return + +LinkContestRoom1_EventScript_23BE84:: @ 823BE84 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 + waitstate + end + +LinkContestRoom1_EventScript_23BE8E:: @ 823BE8E + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 + waitstate + end + +LinkContestRoom1_EventScript_23BE98:: @ 823BE98 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 + waitstate + end + +LinkContestRoom1_EventScript_23BEA2:: @ 823BEA2 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 + waitstate + end + +LinkContestRoom1_EventScript_23BEAC:: @ 823BEAC + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 15, 4 + waitstate + end + +LilycoveCity_ContestLobby_EventScript_23BEB6:: @ 823BEB6 + checkplayergender + compare VAR_RESULT, 0 + goto_eq LilycoveCity_ContestLobby_EventScript_23BECE + compare VAR_RESULT, 1 + goto_eq LilycoveCity_ContestLobby_EventScript_23BED4 + return + +LilycoveCity_ContestLobby_EventScript_23BECE:: @ 823BECE + setvar VAR_OBJ_GFX_ID_3, 100 + return + +LilycoveCity_ContestLobby_EventScript_23BED4:: @ 823BED4 + setvar VAR_OBJ_GFX_ID_3, 105 + return + diff --git a/data/maps/VerdanturfTown/events.inc b/data/maps/VerdanturfTown/events.inc new file mode 100644 index 000000000..c844cfa1a --- /dev/null +++ b/data/maps/VerdanturfTown/events.inc @@ -0,0 +1,28 @@ +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 + +VerdanturfTown_MapWarps: @ 8527D3C + 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 + 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 + +VerdanturfTown_MapEvents:: @ 8527DD4 + map_events VerdanturfTown_EventObjects, VerdanturfTown_MapWarps, 0x0, VerdanturfTown_MapBGEvents + diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc new file mode 100644 index 000000000..2987a9a59 --- /dev/null +++ b/data/maps/VerdanturfTown/scripts.inc @@ -0,0 +1,127 @@ +VerdanturfTown_MapScripts:: @ 81EB566 + map_script 3, VerdanturfTown_MapScript1_1EB56C + .byte 0 + +VerdanturfTown_MapScript1_1EB56C: @ 81EB56C + setflag FLAG_VISITED_VERDANTURF_TOWN + setvar VAR_0x4086, 0 + end + +VerdanturfTown_EventScript_1EB575:: @ 81EB575 + lock + faceplayer + checkflag FLAG_0x0C7 + goto_eq VerdanturfTown_EventScript_1EB594 + msgbox VerdanturfTown_Text_1EB5FD, 4 + applymovement 2, VerdanturfTown_Movement_2725A2 + waitmovement 0 + release + end + +VerdanturfTown_EventScript_1EB594:: @ 81EB594 + msgbox VerdanturfTown_Text_1EB6E0, 4 + applymovement 2, VerdanturfTown_Movement_2725A2 + waitmovement 0 + release + end + +VerdanturfTown_EventScript_1EB5A8:: @ 81EB5A8 + msgbox VerdanturfTown_Text_1EB736, 2 + end + +VerdanturfTown_EventScript_1EB5B1:: @ 81EB5B1 + msgbox VerdanturfTown_Text_1EB7E2, 2 + end + +VerdanturfTown_EventScript_1EB5BA:: @ 81EB5BA + lock + faceplayer + checkflag FLAG_0x0C7 + goto_eq VerdanturfTown_EventScript_1EB5CF + msgbox VerdanturfTown_Text_1EB854, 4 + release + end + +VerdanturfTown_EventScript_1EB5CF:: @ 81EB5CF + msgbox VerdanturfTown_Text_1EB935, 4 + release + end + +VerdanturfTown_EventScript_1EB5D9:: @ 81EB5D9 + msgbox VerdanturfTown_Text_1EB9C4, 3 + end + +VerdanturfTown_EventScript_1EB5E2:: @ 81EB5E2 + msgbox VerdanturfTown_Text_1EBA11, 3 + end + +VerdanturfTown_EventScript_1EB5EB:: @ 81EB5EB + msgbox VerdanturfTown_Text_1EBA1F, 3 + end + +VerdanturfTown_EventScript_1EB5F4:: @ 81EB5F4 + msgbox VerdanturfTown_Text_1EBA59, 3 + end + +VerdanturfTown_Text_1EB5FD: @ 81EB5FD + .string "My papa told me.\p" + .string "He says this tunnel is full of\n" + .string "timid POKéMON.\p" + .string "They get all scared of loud noise and\n" + .string "make a big uproar.\p" + .string "So they had to stop the big tunnel\n" + .string "project.\p" + .string "But there’s one man. He’s trying to dig\n" + .string "the tunnel by himself!$" + +VerdanturfTown_Text_1EB6E0: @ 81EB6E0 + .string "There was a man who dug a tunnel for\n" + .string "a lady he loved.\p" + .string "I don’t really get it, but hey!$" + +VerdanturfTown_Text_1EB736: @ 81EB736 + .string "The way the winds blow, volcanic ash\n" + .string "is never blown in this direction.\p" + .string "The air is clean and delicious here.\n" + .string "Living here should do wonders for even\l" + .string "frail and sickly people.$" + +VerdanturfTown_Text_1EB7E2: @ 81EB7E2 + .string "My POKéMON and I, we’ve been riding\n" + .string "a hot winning streak.\p" + .string "So I decided to make my BATTLE TENT\n" + .string "debut in this town.$" + +VerdanturfTown_Text_1EB854: @ 81EB854 + .string "Did you see the cave next to the\n" + .string "POKéMON MART?\p" + .string "There’s a guy in there who’s trying to\n" + .string "bust up boulders so he can bust out\l" + .string "through to the other side.\p" + .string "It’d be great if we could go through…\n" + .string "It’ll make it easy to visit RUSTBORO.$" + +VerdanturfTown_Text_1EB935: @ 81EB935 + .string "That cave next to the POKéMON MART\n" + .string "is now a tunnel to the other side.\p" + .string "It’s great--it’s easy to go shop for\n" + .string "new DEVON products in RUSTBORO now.$" + +VerdanturfTown_Text_1EB9C4: @ 81EB9C4 + .string "VERDANTURF TOWN\p" + .string "“The windswept highlands with the\n" + .string "sweet fragrance of grass.â€$" + +VerdanturfTown_Text_1EBA11: @ 81EBA11 + .string "WANDA’S HOUSE$" + +VerdanturfTown_Text_1EBA1F: @ 81EBA1F + .string "BATTLE TENT VERDANTURF SITE\n" + .string "“Feast Your Eyes on Battles!â€$" + +VerdanturfTown_Text_1EBA59: @ 81EBA59 + .string "RUSTURF TUNNEL\n" + .string "“Linking RUSTBORO and VERDANTURF\p" + .string "“The tunnel project has been\n" + .string "canceled.â€$" + diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc new file mode 100644 index 000000000..6276192b3 --- /dev/null +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc @@ -0,0 +1,8 @@ +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 + +VerdanturfTown_BattleTentBattleRoom_MapEvents:: @ 852E77C + map_events VerdanturfTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc new file mode 100644 index 000000000..b7f687cdf --- /dev/null +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -0,0 +1,200 @@ +VerdanturfTown_BattleTentBattleRoom_MapScripts:: @ 82022FA + map_script 3, VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A + map_script 2, VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E + map_script 4, VerdanturfTown_BattleTentBattleRoom_MapScript2_202541 + .byte 0 + +VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A: @ 820230A + call VerdanturfTown_BattleTentBattleRoom_EventScript_202310 + end + +VerdanturfTown_BattleTentBattleRoom_EventScript_202310:: @ 8202310 + checkplayergender + compare VAR_RESULT, 0 + goto_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202328 + compare VAR_RESULT, 1 + goto_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202333 + return + +VerdanturfTown_BattleTentBattleRoom_EventScript_202328:: @ 8202328 + setvar VAR_OBJ_GFX_ID_1, 100 + setvar VAR_OBJ_GFX_ID_0, 100 + return + +VerdanturfTown_BattleTentBattleRoom_EventScript_202333:: @ 8202333 + setvar VAR_OBJ_GFX_ID_1, 105 + setvar VAR_OBJ_GFX_ID_0, 105 + return + +VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E: @ 820233E + map_script_2 VAR_TEMP_0, 0, VerdanturfTown_BattleTentBattleRoom_EventScript_202348 + .2byte 0 + +VerdanturfTown_BattleTentBattleRoom_EventScript_202348:: @ 8202348 + showobjectat 1, MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM + applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_202575 + waitmovement 0 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special sub_81A1780 + compare VAR_RESULT, 0 + goto_if 5, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C + +VerdanturfTown_BattleTentBattleRoom_EventScript_20236F:: @ 820236F + setvar VAR_0x8004, 3 + special sub_8161F74 + addobject 2 + applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_20257B + waitmovement 0 + setvar VAR_0x8004, 4 + special sub_81B99B4 + msgbox 0x2021fc4, 4 + waitmessage + call VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7 + switch VAR_RESULT + case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8 + +VerdanturfTown_BattleTentBattleRoom_EventScript_2023AA:: @ 82023AA + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 4 + special sub_81A1780 + special LoadPlayerParty + warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 + waitstate + +VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special sub_81A1780 + addvar VAR_RESULT, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + copyvar VAR_0x8006, VAR_RESULT + special sub_81A1780 + switch VAR_RESULT + case 3, VerdanturfTown_BattleTentBattleRoom_EventScript_202501 + applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_202581 + waitmovement 0 + removeobject 2 + applymovement 3, VerdanturfTown_BattleTentBattleRoom_Movement_2725AA + applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_2725A6 + waitmovement 0 + msgbox VerdanturfTown_BattleTentBattleRoom_Text_24FF00, 4 + special LoadPlayerParty + special SavePlayerParty + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 3 + special sub_81A1780 + playfanfare MUS_ME_ASA + waitfanfare + special HealPlayerParty + +VerdanturfTown_BattleTentBattleRoom_EventScript_20243C:: @ 820243C + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special sub_81A1780 + compare VAR_RESULT, 1 + call_if 1, VerdanturfTown_BattleTentBattleRoom_EventScript_202565 + compare VAR_RESULT, 2 + call_if 1, VerdanturfTown_BattleTentBattleRoom_EventScript_20256C + multichoice 20, 6, 104, 1 + switch VAR_RESULT + case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_2024EA + case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_20248A + case 2, VerdanturfTown_BattleTentBattleRoom_EventScript_2024B8 + +VerdanturfTown_BattleTentBattleRoom_EventScript_20248A:: @ 820248A + msgbox VerdanturfTown_BattleTentBattleRoom_Text_250030, 5 + switch VAR_RESULT + case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C + case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_20251F + case 127, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C + +VerdanturfTown_BattleTentBattleRoom_EventScript_2024B8:: @ 82024B8 + message VerdanturfTown_BattleTentBattleRoom_Text_25005A + waitmessage + multichoicedefault 20, 8, 94, 1, 0 + switch VAR_RESULT + case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C + case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_2023AA + case 127, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C + +VerdanturfTown_BattleTentBattleRoom_EventScript_2024EA:: @ 82024EA + applymovement 3, VerdanturfTown_BattleTentBattleRoom_Movement_2725A8 + applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_2725A8 + waitmovement 0 + closemessage + goto VerdanturfTown_BattleTentBattleRoom_EventScript_20236F + +VerdanturfTown_BattleTentBattleRoom_EventScript_202501:: @ 8202501 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 3 + special sub_81A1780 + special LoadPlayerParty + warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 + waitstate + +VerdanturfTown_BattleTentBattleRoom_EventScript_20251F:: @ 820251F + message VerdanturfTown_BattleTentBattleRoom_Text_25007E + waitmessage + setvar VAR_0x8004, 5 + setvar VAR_0x8005, 2 + special sub_81B99B4 + playse SE_SAVE + waitse + fadescreen 1 + setvar VAR_0x8004, 4 + special sub_81A1780 + end + +VerdanturfTown_BattleTentBattleRoom_MapScript2_202541: @ 8202541 + map_script_2 VAR_TEMP_1, 0, VerdanturfTown_BattleTentBattleRoom_EventScript_20254B + .2byte 0 + +VerdanturfTown_BattleTentBattleRoom_EventScript_20254B:: @ 820254B + 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 + removeobject 2 + end + +VerdanturfTown_BattleTentBattleRoom_EventScript_202565:: @ 8202565 + message VerdanturfTown_BattleTentBattleRoom_Text_24FF28 + waitmessage + return + +VerdanturfTown_BattleTentBattleRoom_EventScript_20256C:: @ 820256C + message VerdanturfTown_BattleTentBattleRoom_Text_24FF54 + waitmessage + return + +VerdanturfTown_BattleTentBattleRoom_Movement_202573: @ 8202573 + set_invisible + step_end + +VerdanturfTown_BattleTentBattleRoom_Movement_202575: @ 8202575 + set_visible + walk_up + walk_up + walk_up + face_right + step_end + +VerdanturfTown_BattleTentBattleRoom_Movement_20257B: @ 820257B + walk_down + walk_down + walk_down + walk_down + face_left + step_end + +VerdanturfTown_BattleTentBattleRoom_Movement_202581: @ 8202581 + walk_up + walk_up + walk_up + walk_up + step_end + diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/events.inc b/data/maps/VerdanturfTown_BattleTentCorridor/events.inc new file mode 100644 index 000000000..4fa836d58 --- /dev/null +++ b/data/maps/VerdanturfTown_BattleTentCorridor/events.inc @@ -0,0 +1,6 @@ +VerdanturfTown_BattleTentCorridor_EventObjects: @ 852E708 + 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/VerdanturfTown_BattleTentCorridor/scripts.inc b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc new file mode 100644 index 000000000..a4c2e502c --- /dev/null +++ b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc @@ -0,0 +1,69 @@ +VerdanturfTown_BattleTentCorridor_MapScripts:: @ 820208A + map_script 2, VerdanturfTown_BattleTentCorridor_MapScript2_202090 + .byte 0 + +VerdanturfTown_BattleTentCorridor_MapScript2_202090: @ 8202090 + map_script_2 VAR_TEMP_0, 0, VerdanturfTown_BattleTentCorridor_EventScript_20209A + .2byte 0 + +VerdanturfTown_BattleTentCorridor_EventScript_20209A:: @ 820209A + lockall + setvar VAR_TEMP_0, 1 + applymovement 1, VerdanturfTown_BattleTentCorridor_Movement_2020DE + applymovement 255, VerdanturfTown_BattleTentCorridor_Movement_2020DE + waitmovement 0 + opendoor 2, 1 + waitdooranim + applymovement 1, VerdanturfTown_BattleTentCorridor_Movement_2020E4 + applymovement 255, VerdanturfTown_BattleTentCorridor_Movement_2020E3 + waitmovement 0 + closedoor 2, 1 + waitdooranim + setvar VAR_0x8006, 0 + warp MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM, 255, 6, 5 + waitstate + releaseall + end + +VerdanturfTown_BattleTentCorridor_Movement_2020DE: @ 82020DE + walk_up + walk_up + walk_up + walk_up + step_end + +VerdanturfTown_BattleTentCorridor_Movement_2020E3: @ 82020E3 + walk_up + +VerdanturfTown_BattleTentCorridor_Movement_2020E4: @ 82020E4 + walk_up + set_invisible + step_end + +VerdanturfTown_BattleTentCorridor_Text_2020E7: @ 82020E7 + .string "Which CONTEST are you entering?\n" + .string "Want a piece of advice?\p" + .string "In any CONTEST, for example, a CUTE\n" + .string "CONTEST, I don’t think they judge you\l" + .string "only on cuteness in the first round.\p" + .string "You need to work out ways for raising\n" + .string "POKéMON better.$" + +VerdanturfTown_BattleTentCorridor_Text_2021C4: @ 82021C4 + .string "I raised my POKéMON to be cute.\p" + .string "I found out you can put POKéMON in\n" + .string "a CONTEST for cuteness!\p" + .string "I’m so glad I raised my POKéMON with\n" + .string "loving care…$" + +VerdanturfTown_BattleTentCorridor_Text_202251: @ 8202251 + .string "My POKéMON rules!\p" + .string "It’s cool, tough yet beautiful, cute,\n" + .string "and smart. It’s complete!\p" + .string "I may as well go for wins in every\n" + .string "single CONTEST.$" + +VerdanturfTown_BattleTentCorridor_Text_2022D6: @ 82022D6 + .string "POKéMON CONTESTS\n" + .string "NORMAL RANK STAGE!$" + diff --git a/data/maps/VerdanturfTown_BattleTentLobby/events.inc b/data/maps/VerdanturfTown_BattleTentLobby/events.inc new file mode 100644 index 000000000..570e600fe --- /dev/null +++ b/data/maps/VerdanturfTown_BattleTentLobby/events.inc @@ -0,0 +1,18 @@ +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 + +VerdanturfTown_BattleTentLobby_MapWarps: @ 852E6D8 + 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 + +VerdanturfTown_BattleTentLobby_MapEvents:: @ 852E6F4 + map_events VerdanturfTown_BattleTentLobby_EventObjects, VerdanturfTown_BattleTentLobby_MapWarps, 0x0, VerdanturfTown_BattleTentLobby_MapBGEvents + diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc new file mode 100644 index 000000000..26f0680a0 --- /dev/null +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -0,0 +1,439 @@ +VerdanturfTown_BattleTentLobby_MapScripts:: @ 82016D0 + map_script 2, VerdanturfTown_BattleTentLobby_MapScript2_2016EF + map_script 4, VerdanturfTown_BattleTentLobby_MapScript2_2016DB + .byte 0 + +VerdanturfTown_BattleTentLobby_MapScript2_2016DB: @ 82016DB + map_script_2 VAR_TEMP_1, 0, VerdanturfTown_BattleTentLobby_EventScript_2016E5 + .2byte 0 + +VerdanturfTown_BattleTentLobby_EventScript_2016E5:: @ 82016E5 + setvar VAR_TEMP_1, 1 + turnobject 255, 2 + end + +VerdanturfTown_BattleTentLobby_MapScript2_2016EF: @ 82016EF + map_script_2 VAR_TEMP_0, 0, VerdanturfTown_BattleTentLobby_EventScript_201719 + map_script_2 VAR_TEMP_0, 1, VerdanturfTown_BattleTentLobby_EventScript_201722 + map_script_2 VAR_TEMP_0, 2, VerdanturfTown_BattleTentLobby_EventScript_201837 + map_script_2 VAR_TEMP_0, 3, VerdanturfTown_BattleTentLobby_EventScript_201757 + map_script_2 VAR_TEMP_0, 4, VerdanturfTown_BattleTentLobby_EventScript_2017FD + .2byte 0 + +VerdanturfTown_BattleTentLobby_EventScript_201719:: @ 8201719 + setvar VAR_0x8004, 0 + special sub_81A1780 + end + +VerdanturfTown_BattleTentLobby_EventScript_201722:: @ 8201722 + lockall + msgbox VerdanturfTown_BattleTentLobby_Text_24E636, 4 + closemessage + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_TEMP_0, 255 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 0 + special sub_81A1780 + releaseall + end + +VerdanturfTown_BattleTentLobby_EventScript_201757:: @ 8201757 + lockall + msgbox VerdanturfTown_BattleTentLobby_Text_2C5731, 4 + message VerdanturfTown_BattleTentLobby_Text_2C5791 + waitmessage + setvar VAR_0x8004, 6 + special sub_81B99B4 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_0x8004, 5 + setvar VAR_0x8005, 0 + special sub_81B99B4 + playse SE_SAVE + waitse + +VerdanturfTown_BattleTentLobby_EventScript_201791:: @ 8201791 + msgbox VerdanturfTown_BattleTentLobby_Text_2C57CD, 4 + setvar VAR_0x8004, 7 + special sub_81B99B4 + switch VAR_RESULT + case 0, VerdanturfTown_BattleTentLobby_EventScript_2017DD + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 0 + special sub_81A1780 + message VerdanturfTown_BattleTentLobby_Text_24A554 + waitmessage + playfanfare MUS_FANFA4 + waitfanfare + msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, 4 + closemessage + setvar VAR_TEMP_0, 255 + releaseall + end + +VerdanturfTown_BattleTentLobby_EventScript_2017DD:: @ 82017DD + msgbox VerdanturfTown_BattleTentLobby_Text_24E57B, 4 + waitmessage + closemessage + setvar VAR_TEMP_0, 255 + releaseall + end + +VerdanturfTown_BattleTentLobby_EventScript_2017EE:: @ 82017EE + lockall + msgbox VerdanturfTown_BattleTentLobby_Text_2C5731, 4 + goto VerdanturfTown_BattleTentLobby_EventScript_201791 + end + +VerdanturfTown_BattleTentLobby_EventScript_2017FD:: @ 82017FD + lockall + message VerdanturfTown_BattleTentLobby_Text_2C56B8 + waitmessage + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_0x8004, 5 + setvar VAR_0x8005, 0 + special sub_81B99B4 + playse SE_SAVE + waitse + msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, 4 + closemessage + setvar VAR_TEMP_0, 255 + releaseall + end + +VerdanturfTown_BattleTentLobby_EventScript_201837:: @ 8201837 + lockall + msgbox VerdanturfTown_BattleTentLobby_Text_24E5D8, 4 + message VerdanturfTown_BattleTentLobby_Text_24E5F6 + waitmessage + setvar VAR_0x8004, 5 + setvar VAR_0x8005, 1 + special sub_81B99B4 + playse SE_SAVE + waitse + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_TEMP_0, 255 + goto VerdanturfTown_BattleTentLobby_EventScript_2019AE + +VerdanturfTown_BattleTentLobby_EventScript_201873:: @ 8201873 + lock + faceplayer + setvar VAR_0x8004, 1 + special sub_81B99B4 + compare VAR_RESULT, 0 + goto_if 5, VerdanturfTown_BattleTentLobby_EventScript_2017EE + special SavePlayerParty + msgbox VerdanturfTown_BattleTentLobby_Text_2C50C3, 4 + +VerdanturfTown_BattleTentLobby_EventScript_201893:: @ 8201893 + message VerdanturfTown_BattleTentLobby_Text_2C5129 + waitmessage + multichoice 17, 6, 23, 0 + switch VAR_RESULT + case 0, VerdanturfTown_BattleTentLobby_EventScript_2018CF + case 1, VerdanturfTown_BattleTentLobby_EventScript_2019DB + case 2, VerdanturfTown_BattleTentLobby_EventScript_201A37 + case 127, VerdanturfTown_BattleTentLobby_EventScript_201A37 + +VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF + setvar VAR_FRONTIER_FACILITY, 2 + setvar VAR_0x40CE, 0 + setvar VAR_RESULT, 2 + setvar VAR_0x8004, 15 + special sub_81A1780 + compare VAR_0x8004, 1 + goto_eq VerdanturfTown_BattleTentLobby_EventScript_2019E8 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 2 + special sub_81A1780 + msgbox VerdanturfTown_BattleTentLobby_Text_2C5633, 4 + fadescreen 1 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 3 + special sub_80F9490 + waitstate + compare VAR_RESULT, 0 + goto_eq VerdanturfTown_BattleTentLobby_EventScript_201A34 + msgbox VerdanturfTown_BattleTentLobby_Text_2C5662, 5 + switch VAR_RESULT + case 0, VerdanturfTown_BattleTentLobby_EventScript_201A34 + case 1, VerdanturfTown_BattleTentLobby_EventScript_201954 + case 127, VerdanturfTown_BattleTentLobby_EventScript_201A34 + +VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954 + setvar VAR_TEMP_0, 0 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 4 + special sub_81A1780 + setvar VAR_0x8004, 0 + special sub_81B99B4 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 1 + special sub_81A1780 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 0 + special sub_81A1780 + special LoadPlayerParty + closemessage + delay 2 + call VerdanturfTown_BattleTentLobby_EventScript_27134F + setvar VAR_TEMP_0, 255 + compare VAR_RESULT, 0 + goto_eq VerdanturfTown_BattleTentLobby_EventScript_201A1D + +VerdanturfTown_BattleTentLobby_EventScript_2019AE:: @ 82019AE + special SavePlayerParty + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 3 + special sub_81A1780 + msgbox VerdanturfTown_BattleTentLobby_Text_2C56A2, 4 + closemessage + call VerdanturfTown_BattleTentLobby_EventScript_201A41 + warp MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7 + setvar VAR_TEMP_0, 0 + waitstate + end + +VerdanturfTown_BattleTentLobby_EventScript_2019DB:: @ 82019DB + msgbox VerdanturfTown_BattleTentLobby_Text_2C5163, 4 + goto VerdanturfTown_BattleTentLobby_EventScript_201893 + +VerdanturfTown_BattleTentLobby_EventScript_2019E8:: @ 82019E8 + switch VAR_RESULT + case 0, VerdanturfTown_BattleTentLobby_EventScript_201A03 + case 1, VerdanturfTown_BattleTentLobby_EventScript_201A10 + +VerdanturfTown_BattleTentLobby_EventScript_201A03:: @ 8201A03 + msgbox VerdanturfTown_BattleTentLobby_Text_2C543D, 4 + goto VerdanturfTown_BattleTentLobby_EventScript_201A3F + +VerdanturfTown_BattleTentLobby_EventScript_201A10:: @ 8201A10 + msgbox VerdanturfTown_BattleTentLobby_Text_2C5538, 4 + goto VerdanturfTown_BattleTentLobby_EventScript_201A3F + +VerdanturfTown_BattleTentLobby_EventScript_201A1D:: @ 8201A1D + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 0 + special sub_81A1780 + goto VerdanturfTown_BattleTentLobby_EventScript_201A37 + +VerdanturfTown_BattleTentLobby_EventScript_201A34:: @ 8201A34 + special LoadPlayerParty + +VerdanturfTown_BattleTentLobby_EventScript_201A37:: @ 8201A37 + msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, 4 + +VerdanturfTown_BattleTentLobby_EventScript_201A3F:: @ 8201A3F + release + end + +VerdanturfTown_BattleTentLobby_EventScript_201A41:: @ 8201A41 + applymovement 1, VerdanturfTown_BattleTentLobby_Movement_201A70 + applymovement 255, VerdanturfTown_BattleTentLobby_Movement_201A70 + waitmovement 0 + opendoor 6, 1 + waitdooranim + applymovement 1, VerdanturfTown_BattleTentLobby_Movement_201A74 + applymovement 255, VerdanturfTown_BattleTentLobby_Movement_201A77 + waitmovement 0 + closedoor 6, 1 + waitdooranim + return + +VerdanturfTown_BattleTentLobby_Movement_201A70: @ 8201A70 + walk_up + walk_up + walk_up + step_end + +VerdanturfTown_BattleTentLobby_Movement_201A74: @ 8201A74 + walk_up + set_invisible + step_end + +VerdanturfTown_BattleTentLobby_Movement_201A77: @ 8201A77 + walk_up + walk_up + set_invisible + step_end + +VerdanturfTown_BattleTentLobby_EventScript_201A7B:: @ 8201A7B + lock + faceplayer + checkflag FLAG_0x0EB + goto_eq VerdanturfTown_BattleTentLobby_EventScript_201AB2 + msgbox VerdanturfTown_BattleTentLobby_Text_201D9E, 4 + giveitem_std ITEM_TM45 + compare VAR_RESULT, 0 + goto_eq VerdanturfTown_BattleTentLobby_EventScript_272054 + setflag FLAG_0x0EB + msgbox VerdanturfTown_BattleTentLobby_Text_201E43, 4 + release + end + +VerdanturfTown_BattleTentLobby_EventScript_201AB2:: @ 8201AB2 + msgbox VerdanturfTown_BattleTentLobby_Text_201E43, 4 + release + end + +VerdanturfTown_BattleTentLobby_EventScript_201ABC:: @ 8201ABC + msgbox VerdanturfTown_BattleTentLobby_Text_201EB1, 2 + end + +VerdanturfTown_BattleTentLobby_EventScript_201AC5:: @ 8201AC5 + lock + msgbox VerdanturfTown_BattleTentLobby_Text_201BD4, 4 + release + end + +VerdanturfTown_BattleTentLobby_EventScript_201AD0:: @ 8201AD0 + lock + faceplayer + checkflag FLAG_0x1CC + goto_eq VerdanturfTown_BattleTentLobby_EventScript_201AED + msgbox VerdanturfTown_BattleTentLobby_Text_201F3F, 4 + addvar VAR_0x40D1, 1 + setflag FLAG_0x1CC + release + end + +VerdanturfTown_BattleTentLobby_EventScript_201AED:: @ 8201AED + msgbox VerdanturfTown_BattleTentLobby_Text_202025, 4 + release + end + +VerdanturfTown_BattleTentLobby_EventScript_201AF7:: @ 8201AF7 + lock + msgbox VerdanturfTown_BattleTentLobby_Text_201D11, 4 + release + end + +VerdanturfTown_BattleTentLobby_EventScript_201B02:: @ 8201B02 + lockall + msgbox VerdanturfTown_BattleTentLobby_Text_2C6878, 4 + goto VerdanturfTown_BattleTentLobby_EventScript_201B11 + end + +VerdanturfTown_BattleTentLobby_EventScript_201B11:: @ 8201B11 + message VerdanturfTown_BattleTentLobby_Text_24EF88 + waitmessage + setvar VAR_0x8004, 12 + special sub_813A128 + waitstate + switch VAR_RESULT + case 0, VerdanturfTown_BattleTentLobby_EventScript_201B7E + case 1, VerdanturfTown_BattleTentLobby_EventScript_201B8C + case 2, VerdanturfTown_BattleTentLobby_EventScript_201B9A + case 3, VerdanturfTown_BattleTentLobby_EventScript_201BA8 + case 4, VerdanturfTown_BattleTentLobby_EventScript_201BB6 + case 5, VerdanturfTown_BattleTentLobby_EventScript_201BC4 + case 6, VerdanturfTown_BattleTentLobby_EventScript_201BD2 + case 127, VerdanturfTown_BattleTentLobby_EventScript_201BD2 + end + +VerdanturfTown_BattleTentLobby_EventScript_201B7E:: @ 8201B7E + msgbox VerdanturfTown_BattleTentLobby_Text_2C67CD, 4 + goto VerdanturfTown_BattleTentLobby_EventScript_201B11 + end + +VerdanturfTown_BattleTentLobby_EventScript_201B8C:: @ 8201B8C + msgbox VerdanturfTown_BattleTentLobby_Text_24EFAB, 4 + goto VerdanturfTown_BattleTentLobby_EventScript_201B11 + end + +VerdanturfTown_BattleTentLobby_EventScript_201B9A:: @ 8201B9A + msgbox VerdanturfTown_BattleTentLobby_Text_24F049, 4 + goto VerdanturfTown_BattleTentLobby_EventScript_201B11 + end + +VerdanturfTown_BattleTentLobby_EventScript_201BA8:: @ 8201BA8 + msgbox VerdanturfTown_BattleTentLobby_Text_24F190, 4 + goto VerdanturfTown_BattleTentLobby_EventScript_201B11 + end + +VerdanturfTown_BattleTentLobby_EventScript_201BB6:: @ 8201BB6 + msgbox VerdanturfTown_BattleTentLobby_Text_24F2E8, 4 + goto VerdanturfTown_BattleTentLobby_EventScript_201B11 + end + +VerdanturfTown_BattleTentLobby_EventScript_201BC4:: @ 8201BC4 + msgbox VerdanturfTown_BattleTentLobby_Text_24F3F4, 4 + goto VerdanturfTown_BattleTentLobby_EventScript_201B11 + end + +VerdanturfTown_BattleTentLobby_EventScript_201BD2:: @ 8201BD2 + releaseall + end + +VerdanturfTown_BattleTentLobby_Text_201BD4: @ 8201BD4 + .string "If it doesn’t like a certain move,\n" + .string "a POKéMON will be reluctant to use it.\p" + .string "It doesn’t matter how strong it is,\n" + .string "either.\p" + .string "For example, a POKéMON with a GENTLE\n" + .string "nature probably won’t enjoy hurting\l" + .string "its opponents.\p" + .string "If it can’t seem to live up to its\n" + .string "potential, it’s probably failing at\l" + .string "using a disliked move against its will.$" + +VerdanturfTown_BattleTentLobby_Text_201D11: @ 8201D11 + .string "My big sister is gentle usually.\n" + .string "But when she gets angry,\l" + .string "she’s really, really scary!\p" + .string "I bet a gentle POKéMON will be scary\n" + .string "if it gets angry!$" + +VerdanturfTown_BattleTentLobby_Text_201D9E: @ 8201D9E + .string "My feelings toward my POKéMON…\n" + .string "The attraction runs deep…\p" + .string "Oh, hi, you didn’t see that, did you?\n" + .string "Well, it doesn’t matter.\p" + .string "How would you like this TM for\n" + .string "your POKéMON?$" + +VerdanturfTown_BattleTentLobby_Text_201E43: @ 8201E43 + .string "My feelings toward my POKéMON…\n" + .string "I’m sure the attraction is mutual!\p" + .string "They battle exactly the way I want\n" + .string "them to!$" + +VerdanturfTown_BattleTentLobby_Text_201EB1: @ 8201EB1 + .string "What kind of moves have you taught\n" + .string "your POKéMON?\p" + .string "I think you would give yourself\n" + .string "an advantage if they knew how to\l" + .string "heal or protect themselves.$" + +VerdanturfTown_BattleTentLobby_Text_201F3F: @ 8201F3F + .string "SCOTT: Hey there, {PLAYER}{KUN}!\n" + .string "I thought I might see you here.\p" + .string "A BATTLE TENT’s a place where\n" + .string "you can meet tough TRAINERS.\p" + .string "It doesn’t matter what the rules are,\n" + .string "or how battles are waged, either.\p" + .string "{PLAYER}{KUN}, I expect you to do\n" + .string "the best you can!$" + +VerdanturfTown_BattleTentLobby_Text_202025: @ 8202025 + .string "SCOTT: I visit here regularly in hopes\n" + .string "of seeing tough TRAINERS in action\l" + .string "in whatever the situation.$" + diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc new file mode 100644 index 000000000..fd5fa0292 --- /dev/null +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc @@ -0,0 +1,11 @@ +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 + +VerdanturfTown_FriendshipRatersHouse_MapWarps: @ 852E9F8 + 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/VerdanturfTown_FriendshipRatersHouse/scripts.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc new file mode 100644 index 000000000..28030d869 --- /dev/null +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc @@ -0,0 +1,104 @@ +VerdanturfTown_FriendshipRatersHouse_MapScripts:: @ 8203030 + .byte 0 + +VerdanturfTown_FriendshipRatersHouse_EventScript_203031:: @ 8203031 + lock + faceplayer + msgbox VerdanturfTown_FriendshipRatersHouse_Text_2030ED, 4 + specialvar VAR_RESULT, GetLeadMonFriendshipScore + switch VAR_RESULT + case 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203094 + case 1, VerdanturfTown_FriendshipRatersHouse_EventScript_20309E + case 2, VerdanturfTown_FriendshipRatersHouse_EventScript_2030A8 + case 3, VerdanturfTown_FriendshipRatersHouse_EventScript_2030B2 + case 4, VerdanturfTown_FriendshipRatersHouse_EventScript_2030BC + case 5, VerdanturfTown_FriendshipRatersHouse_EventScript_2030C6 + case 6, VerdanturfTown_FriendshipRatersHouse_EventScript_2030D0 + release + end + +VerdanturfTown_FriendshipRatersHouse_EventScript_203094:: @ 8203094 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_2032DF, 4 + release + end + +VerdanturfTown_FriendshipRatersHouse_EventScript_20309E:: @ 820309E + msgbox VerdanturfTown_FriendshipRatersHouse_Text_203288, 4 + release + end + +VerdanturfTown_FriendshipRatersHouse_EventScript_2030A8:: @ 82030A8 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_203249, 4 + release + end + +VerdanturfTown_FriendshipRatersHouse_EventScript_2030B2:: @ 82030B2 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_203213, 4 + release + end + +VerdanturfTown_FriendshipRatersHouse_EventScript_2030BC:: @ 82030BC + msgbox VerdanturfTown_FriendshipRatersHouse_Text_2031D1, 4 + release + end + +VerdanturfTown_FriendshipRatersHouse_EventScript_2030C6:: @ 82030C6 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_203192, 4 + release + end + +VerdanturfTown_FriendshipRatersHouse_EventScript_2030D0:: @ 82030D0 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_203141, 4 + release + end + +VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA:: @ 82030DA + lock + faceplayer + waitse + playmoncry SPECIES_PIKACHU, 0 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_20334A, 4 + waitmoncry + release + end + +VerdanturfTown_FriendshipRatersHouse_Text_2030ED: @ 82030ED + .string "Let me see your POKéMON.\n" + .string "I’ll check to see how much it likes you.\p" + .string "Oh.\n" + .string "Your POKéMON…$" + +VerdanturfTown_FriendshipRatersHouse_Text_203141: @ 8203141 + .string "It adores you.\n" + .string "It can’t possibly love you any more.\l" + .string "I even feel happy seeing it.$" + +VerdanturfTown_FriendshipRatersHouse_Text_203192: @ 8203192 + .string "It seems to be very happy.\n" + .string "It obviously likes you a whole lot.$" + +VerdanturfTown_FriendshipRatersHouse_Text_2031D1: @ 82031D1 + .string "It likes you quite a lot.\n" + .string "It seems to want to be babied a little.$" + +VerdanturfTown_FriendshipRatersHouse_Text_203213: @ 8203213 + .string "It’s getting used to you.\n" + .string "It seems to believe in you.$" + +VerdanturfTown_FriendshipRatersHouse_Text_203249: @ 8203249 + .string "It’s not very used to you yet.\n" + .string "It neither loves nor hates you.$" + +VerdanturfTown_FriendshipRatersHouse_Text_203288: @ 8203288 + .string "It’s very wary.\n" + .string "It has scary viciousness in its eyes.\l" + .string "It doesn’t like you much at all.$" + +VerdanturfTown_FriendshipRatersHouse_Text_2032DF: @ 82032DF + .string "This is a little hard for me to say…\p" + .string "Your POKéMON simply detests you.\n" + .string "Doesn’t that make you uncomfortable?$" + +VerdanturfTown_FriendshipRatersHouse_Text_20334A: @ 820334A + .string "PIKACHU: Pika pika!$" + diff --git a/data/maps/VerdanturfTown_House/events.inc b/data/maps/VerdanturfTown_House/events.inc new file mode 100644 index 000000000..49b8d47ee --- /dev/null +++ b/data/maps/VerdanturfTown_House/events.inc @@ -0,0 +1,11 @@ +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 + +VerdanturfTown_House_MapWarps: @ 852EA4C + 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/VerdanturfTown_House/scripts.inc b/data/maps/VerdanturfTown_House/scripts.inc new file mode 100644 index 000000000..ce48fd662 --- /dev/null +++ b/data/maps/VerdanturfTown_House/scripts.inc @@ -0,0 +1,25 @@ +VerdanturfTown_House_MapScripts:: @ 820335E + .byte 0 + +VerdanturfTown_House_EventScript_20335F:: @ 820335F + msgbox VerdanturfTown_House_Text_203371, 2 + end + +VerdanturfTown_House_EventScript_203368:: @ 8203368 + msgbox VerdanturfTown_House_Text_2033EE, 2 + end + +VerdanturfTown_House_Text_203371: @ 8203371 + .string "Far away, deep in EVER GRANDE CITY,\n" + .string "is the POKéMON LEAGUE.\p" + .string "The TRAINERS who gather there are\n" + .string "all frighteningly well skilled.$" + +VerdanturfTown_House_Text_2033EE: @ 82033EE + .string "In the POKéMON LEAGUE, I think the\n" + .string "rules say that you have to battle the\l" + .string "ELITE FOUR all in a row.\p" + .string "If you lose to any of them, you have\n" + .string "to begin your challenge again from the\l" + .string "first one.$" + diff --git a/data/maps/VerdanturfTown_Mart/events.inc b/data/maps/VerdanturfTown_Mart/events.inc new file mode 100644 index 000000000..804f39647 --- /dev/null +++ b/data/maps/VerdanturfTown_Mart/events.inc @@ -0,0 +1,13 @@ +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 + +VerdanturfTown_Mart_MapWarps: @ 852E7F0 + 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/VerdanturfTown_Mart/scripts.inc b/data/maps/VerdanturfTown_Mart/scripts.inc new file mode 100644 index 000000000..96daf2c84 --- /dev/null +++ b/data/maps/VerdanturfTown_Mart/scripts.inc @@ -0,0 +1,60 @@ +VerdanturfTown_Mart_MapScripts:: @ 8202586 + .byte 0 + +VerdanturfTown_Mart_EventScript_202587:: @ 8202587 + lock + faceplayer + message gUnknown_08272A21 + waitmessage + pokemart VerdanturfTown_Mart_Pokemart_2025A0 + msgbox gUnknown_08272A3F, 4 + release + end + + .align 2 +VerdanturfTown_Mart_Pokemart_2025A0: @ 82025A0 + .2byte ITEM_GREAT_BALL + .2byte ITEM_NEST_BALL + .2byte ITEM_SUPER_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_AWAKENING + .2byte ITEM_BURN_HEAL + .2byte ITEM_ICE_HEAL + .2byte ITEM_REPEL + .2byte ITEM_X_SPECIAL + .2byte ITEM_FLUFFY_TAIL + .2byte ITEM_NONE + release + end + +VerdanturfTown_Mart_EventScript_2025BA:: @ 82025BA + msgbox VerdanturfTown_Mart_Text_2025D5, 2 + end + +VerdanturfTown_Mart_EventScript_2025C3:: @ 82025C3 + msgbox VerdanturfTown_Mart_Text_20264C, 2 + end + +VerdanturfTown_Mart_EventScript_2025CC:: @ 82025CC + msgbox VerdanturfTown_Mart_Text_2026C9, 2 + end + +VerdanturfTown_Mart_Text_2025D5: @ 82025D5 + .string "For any POKéMON match, X SPECIAL\n" + .string "is crucial.\p" + .string "It jacks up the power of some moves\n" + .string "even though it’s only for one battle.$" + +VerdanturfTown_Mart_Text_20264C: @ 820264C + .string "They don’t seem to sell any winning\n" + .string "strategy guides for the BATTLE TENT…\p" + .string "It seems one must rely on one’s\n" + .string "own wits after all…$" + +VerdanturfTown_Mart_Text_2026C9: @ 82026C9 + .string "The NEST BALL works better on\n" + .string "weakened POKéMON.\p" + .string "VERDANTURF is the only place you can\n" + .string "buy it.$" + diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..77bd6748c --- /dev/null +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc @@ -0,0 +1,14 @@ +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 + +VerdanturfTown_PokemonCenter_1F_MapWarps: @ 852E874 + 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/VerdanturfTown_PokemonCenter_1F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..73c7fe1f3 --- /dev/null +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc @@ -0,0 +1,42 @@ +VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8202726 + map_script 3, VerdanturfTown_PokemonCenter_1F_MapScript1_202731 + map_script 5, VerdanturfTown_PokemonCenter_1F_MapScript1_277C30 + .byte 0 + +VerdanturfTown_PokemonCenter_1F_MapScript1_202731: @ 8202731 + setrespawn 18 + call VerdanturfTown_PokemonCenter_1F_EventScript_2718DE + end + +VerdanturfTown_PokemonCenter_1F_EventScript_20273A:: @ 820273A + setvar VAR_0x800B, 1 + call VerdanturfTown_PokemonCenter_1F_EventScript_27191E + waitmessage + waitbuttonpress + release + end + +VerdanturfTown_PokemonCenter_1F_EventScript_202748:: @ 8202748 + msgbox VerdanturfTown_PokemonCenter_1F_Text_20275A, 2 + end + +VerdanturfTown_PokemonCenter_1F_EventScript_202751:: @ 8202751 + msgbox VerdanturfTown_PokemonCenter_1F_Text_20280B, 2 + end + +VerdanturfTown_PokemonCenter_1F_Text_20275A: @ 820275A + .string "You can’t consider yourself a real\n" + .string "TRAINER if you don’t have faith\l" + .string "in your POKéMON.\p" + .string "Only those people who can believe\n" + .string "in their battling POKéMON can win\l" + .string "through to the very end.$" + +VerdanturfTown_PokemonCenter_1F_Text_20280B: @ 820280B + .string "The reason why anyone would visit\n" + .string "VERDANTURF…\p" + .string "It’s the BATTLE TENT. It goes without\n" + .string "saying.\p" + .string "Or is there somebody here that you\n" + .string "came to see?$" + diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..40cbe6aec --- /dev/null +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc @@ -0,0 +1,14 @@ +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 + +VerdanturfTown_PokemonCenter_2F_MapWarps: @ 852E900 + 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/VerdanturfTown_PokemonCenter_2F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..9e93a628e --- /dev/null +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc @@ -0,0 +1,19 @@ +VerdanturfTown_PokemonCenter_2F_MapScripts:: @ 8202897 + map_script 2, VerdanturfTown_PokemonCenter_2F_MapScript2_276C3B + map_script 4, VerdanturfTown_PokemonCenter_2F_MapScript2_276B6C + map_script 1, VerdanturfTown_PokemonCenter_2F_MapScript1_276BBE + map_script 3, VerdanturfTown_PokemonCenter_2F_MapScript1_276ACF + .byte 0 + +VerdanturfTown_PokemonCenter_2F_EventScript_2028AC:: @ 82028AC + call OldaleTown_PokemonCenter_2F_EventScript_276EB7 + end + +VerdanturfTown_PokemonCenter_2F_EventScript_2028B2:: @ 82028B2 + call OldaleTown_PokemonCenter_2F_EventScript_2770B2 + end + +VerdanturfTown_PokemonCenter_2F_EventScript_2028B8:: @ 82028B8 + call OldaleTown_PokemonCenter_2F_EventScript_2771DB + end + diff --git a/data/maps/VerdanturfTown_WandasHouse/events.inc b/data/maps/VerdanturfTown_WandasHouse/events.inc new file mode 100644 index 000000000..cfa46e102 --- /dev/null +++ b/data/maps/VerdanturfTown_WandasHouse/events.inc @@ -0,0 +1,14 @@ +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 + +VerdanturfTown_WandasHouse_MapWarps: @ 852E9A4 + 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/VerdanturfTown_WandasHouse/scripts.inc b/data/maps/VerdanturfTown_WandasHouse/scripts.inc new file mode 100644 index 000000000..fabff6420 --- /dev/null +++ b/data/maps/VerdanturfTown_WandasHouse/scripts.inc @@ -0,0 +1,176 @@ +VerdanturfTown_WandasHouse_MapScripts:: @ 82028BE + .byte 0 + +VerdanturfTown_WandasHouse_EventScript_2028BF:: @ 82028BF + lock + faceplayer + checkflag FLAG_0x0C1 + goto_eq VerdanturfTown_WandasHouse_EventScript_2028D7 + msgbox VerdanturfTown_WandasHouse_Text_202993, 4 + setflag FLAG_0x0C1 + release + end + +VerdanturfTown_WandasHouse_EventScript_2028D7:: @ 82028D7 + msgbox VerdanturfTown_WandasHouse_Text_202ABE, 4 + release + end + +VerdanturfTown_WandasHouse_EventScript_2028E1:: @ 82028E1 + lock + faceplayer + checkflag FLAG_0x07E + goto_eq VerdanturfTown_WandasHouse_EventScript_202909 + checkflag FLAG_0x4F3 + goto_eq VerdanturfTown_WandasHouse_EventScript_2028FF + msgbox VerdanturfTown_WandasHouse_Text_202B37, 4 + release + end + +VerdanturfTown_WandasHouse_EventScript_2028FF:: @ 82028FF + msgbox VerdanturfTown_WandasHouse_Text_202C20, 4 + release + end + +VerdanturfTown_WandasHouse_EventScript_202909:: @ 8202909 + msgbox VerdanturfTown_WandasHouse_Text_202C4E, 4 + release + end + +VerdanturfTown_WandasHouse_EventScript_202913:: @ 8202913 + msgbox VerdanturfTown_WandasHouse_Text_202E00, 2 + end + +VerdanturfTown_WandasHouse_EventScript_20291C:: @ 820291C + lock + faceplayer + checkflag FLAG_0x4F3 + goto_eq VerdanturfTown_WandasHouse_EventScript_202944 + checkflag FLAG_0x0BE + goto_eq VerdanturfTown_WandasHouse_EventScript_20293A + msgbox VerdanturfTown_WandasHouse_Text_202D91, 4 + release + end + +VerdanturfTown_WandasHouse_EventScript_20293A:: @ 820293A + msgbox VerdanturfTown_WandasHouse_Text_202CCF, 4 + release + end + +VerdanturfTown_WandasHouse_EventScript_202944:: @ 8202944 + msgbox VerdanturfTown_WandasHouse_Text_202D91, 4 + release + end + +VerdanturfTown_WandasHouse_EventScript_20294E:: @ 820294E + lock + faceplayer + checkflag FLAG_0x07E + goto_eq VerdanturfTown_WandasHouse_EventScript_202989 + checkflag FLAG_0x4F3 + goto_eq VerdanturfTown_WandasHouse_EventScript_20297F + checkflag FLAG_0x0C7 + goto_eq VerdanturfTown_WandasHouse_EventScript_202975 + msgbox VerdanturfTown_WandasHouse_Text_202E47, 4 + release + end + +VerdanturfTown_WandasHouse_EventScript_202975:: @ 8202975 + msgbox VerdanturfTown_WandasHouse_Text_202F19, 4 + release + end + +VerdanturfTown_WandasHouse_EventScript_20297F:: @ 820297F + msgbox VerdanturfTown_WandasHouse_Text_202F73, 4 + release + end + +VerdanturfTown_WandasHouse_EventScript_202989:: @ 8202989 + msgbox VerdanturfTown_WandasHouse_Text_202FDB, 4 + release + end + +VerdanturfTown_WandasHouse_Text_202993: @ 8202993 + .string "WALLY: I lost to you, {PLAYER}, but I’m\n" + .string "not feeling down anymore.\p" + .string "Because I have a new purpose in life.\n" + .string "Together with my RALTS, I’m going\l" + .string "to challenge POKéMON GYMS and become\l" + .string "a great TRAINER.\p" + .string "Please watch me, {PLAYER}.\n" + .string "I’m going to be stronger than you.\p" + .string "When I do, I’m going to challenge you\n" + .string "to another battle.$" + +VerdanturfTown_WandasHouse_Text_202ABE: @ 8202ABE + .string "WALLY: Please watch me, {PLAYER}.\n" + .string "I’m going to get stronger than you.\p" + .string "When I do, I’m going to challenge you\n" + .string "to another battle.$" + +VerdanturfTown_WandasHouse_Text_202B37: @ 8202B37 + .string "UNCLE: Oh! {PLAYER}{KUN}!\n" + .string "WALLY’s next door.\p" + .string "But, boy, there’s something I have to\n" + .string "tell you.\p" + .string "This natural environment is doing\n" + .string "wonders for WALLY’s health.\p" + .string "Maybe it’s not just the environment.\n" + .string "It could be POKéMON that are giving\l" + .string "the boy hope.$" + +VerdanturfTown_WandasHouse_Text_202C20: @ 8202C20 + .string "WALLY’s gone away…\n" + .string "He slipped off on his own…$" + +VerdanturfTown_WandasHouse_Text_202C4E: @ 8202C4E + .string "UNCLE: Is that right?\n" + .string "WALLY’s gone away that far all by\l" + .string "himself…\p" + .string "Well, I have to give him credit--he is\n" + .string "my little brother’s son.$" + +VerdanturfTown_WandasHouse_Text_202CCF: @ 8202CCF + .string "WANDA: You are?\n" + .string "Oh, right, I get it!\p" + .string "You’re the {PLAYER} who WALLY was\n" + .string "telling me about.\p" + .string "I’m WALLY’s cousin.\n" + .string "Glad to meet you!\p" + .string "I think WALLY’s become a lot more lively\n" + .string "and healthy since he came here.$" + +VerdanturfTown_WandasHouse_Text_202D91: @ 8202D91 + .string "WANDA: Don’t worry about WALLY.\n" + .string "He’ll be just fine.\p" + .string "I know my little cousin, and he has\n" + .string "POKéMON with him, too.$" + +VerdanturfTown_WandasHouse_Text_202E00: @ 8202E00 + .string "Thanks to you, I can see my girlfriend\n" + .string "every day.\l" + .string "Happy? You bet I am!$" + +VerdanturfTown_WandasHouse_Text_202E47: @ 8202E47 + .string "My daughter’s boyfriend is a very\n" + .string "driven and passionate sort of person.\p" + .string "He’s been digging a tunnel nonstop\n" + .string "just so he can see my daughter.\p" + .string "My daughter’s a little concerned,\n" + .string "so she goes out to the tunnel a lot.$" + +VerdanturfTown_WandasHouse_Text_202F19: @ 8202F19 + .string "It’s amazing. My daughter’s boyfriend\n" + .string "was digging the tunnel by hand!\p" + .string "It’s so incredible!$" + +VerdanturfTown_WandasHouse_Text_202F73: @ 8202F73 + .string "If anything were to happen to WALLY,\n" + .string "I would never be able to look his\l" + .string "parents in PETALBURG in the eye…$" + +VerdanturfTown_WandasHouse_Text_202FDB: @ 8202FDB + .string "WALLY was in EVER GRANDE?\p" + .string "His parents in PETALBURG would be\n" + .string "astonished to hear that!$" + diff --git a/data/maps/VictoryRoad_1F/events.inc b/data/maps/VictoryRoad_1F/events.inc new file mode 100644 index 000000000..d5fa881dc --- /dev/null +++ b/data/maps/VictoryRoad_1F/events.inc @@ -0,0 +1,28 @@ +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 + +VictoryRoad_1F_MapWarps: @ 8535EDC + 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 + coord_event 3, 23, 4, 0, VAR_0x40C3, 0, 0, VictoryRoad_1F_EventScript_235DC8 + +VictoryRoad_1F_MapBGEvents: @ 8535F24 + bg_event 30, 39, 4, 7, 0, ITEM_ULTRA_BALL, 81, 0 + +VictoryRoad_1F_MapEvents:: @ 8535F30 + map_events VictoryRoad_1F_EventObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents + diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc new file mode 100644 index 000000000..2ed1c6baf --- /dev/null +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -0,0 +1,220 @@ +VictoryRoad_1F_MapScripts:: @ 8235D7A + map_script 3, VictoryRoad_1F_MapScript1_235D80 + .byte 0 + +VictoryRoad_1F_MapScript1_235D80: @ 8235D80 + compare VAR_0x40C3, 1 + call_if 1, VictoryRoad_1F_EventScript_235D97 + compare VAR_0x40C3, 2 + call_if 1, VictoryRoad_1F_EventScript_235DA3 + end + +VictoryRoad_1F_EventScript_235D97:: @ 8235D97 + setobjectxyperm 4, 2, 24 + setobjectmovementtype 4, 8 + return + +VictoryRoad_1F_EventScript_235DA3:: @ 8235DA3 + setobjectxyperm 4, 3, 24 + setobjectmovementtype 4, 8 + return + +VictoryRoad_1F_EventScript_235DAF:: @ 8235DAF + lockall + setvar VAR_0x8008, 1 + addobject 4 + applymovement 4, VictoryRoad_1F_Movement_235E15 + waitmovement 0 + goto VictoryRoad_1F_EventScript_235DE1 + end + +VictoryRoad_1F_EventScript_235DC8:: @ 8235DC8 + lockall + setvar VAR_0x8008, 2 + addobject 4 + applymovement 4, VictoryRoad_1F_Movement_235E21 + waitmovement 0 + goto VictoryRoad_1F_EventScript_235DE1 + end + +VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1 + applymovement 255, VictoryRoad_1F_Movement_2725AA + waitmovement 0 + msgbox VictoryRoad_1F_Text_235EE6, 4 + trainerbattle 3, TRAINER_WALLY_1, 0, VictoryRoad_1F_Text_235FFC + msgbox VictoryRoad_1F_Text_236020, 4 + clearflag FLAG_0x35A + moveobjectoffscreen 4 + setflag FLAG_0x07E + copyvar VAR_0x40C3, VAR_0x8008 + releaseall + end + +VictoryRoad_1F_Movement_235E15: @ 8235E15 + 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 + 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 + msgbox VictoryRoad_1F_Text_236020, 2 + end + +VictoryRoad_1F_EventScript_235E35:: @ 8235E35 + trainerbattle 0, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq VictoryRoad_1F_EventScript_235E5C + msgbox VictoryRoad_1F_Text_2360FE, 6 + end + +VictoryRoad_1F_EventScript_235E5C:: @ 8235E5C + trainerbattle 5, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA + msgbox VictoryRoad_1F_Text_2360FE, 6 + end + +VictoryRoad_1F_EventScript_235E73:: @ 8235E73 + trainerbattle 0, TRAINER_EDGAR, 0, VictoryRoad_1F_Text_236184, VictoryRoad_1F_Text_2361CB + msgbox VictoryRoad_1F_Text_2361E5, 6 + end + +VictoryRoad_1F_EventScript_235E8A:: @ 8235E8A + trainerbattle 0, TRAINER_ALBERT, 0, VictoryRoad_1F_Text_236248, VictoryRoad_1F_Text_236290 + msgbox VictoryRoad_1F_Text_2362A4, 6 + end + +VictoryRoad_1F_EventScript_235EA1:: @ 8235EA1 + trainerbattle 0, TRAINER_HOPE, 0, VictoryRoad_1F_Text_2362EE, VictoryRoad_1F_Text_236336 + msgbox VictoryRoad_1F_Text_236356, 6 + end + +VictoryRoad_1F_EventScript_235EB8:: @ 8235EB8 + trainerbattle 0, TRAINER_QUINCY, 0, VictoryRoad_1F_Text_236390, VictoryRoad_1F_Text_2363C4 + msgbox VictoryRoad_1F_Text_2363D5, 6 + end + +VictoryRoad_1F_EventScript_235ECF:: @ 8235ECF + trainerbattle 0, TRAINER_KATELYNN, 0, VictoryRoad_1F_Text_236468, VictoryRoad_1F_Text_2364A7 + msgbox VictoryRoad_1F_Text_2364BB, 6 + end + +VictoryRoad_1F_Text_235EE6: @ 8235EE6 + .string "WALLY: Hi! {PLAYER}!\p" + .string "I bet you’re surprised to see me here!\p" + .string "I made it all the way here, and it’s\n" + .string "all thanks to you!\p" + .string "{PLAYER}, losing to you that time\n" + .string "made me stronger!\p" + .string "But I’m not going to lose anymore!\p" + .string "I’m going to win! For the POKéMON who\n" + .string "gave me courage and strength!\p" + .string "Okay… Here I come!$" + +VictoryRoad_1F_Text_235FFC: @ 8235FFC + .string "Wow!\n" + .string "{PLAYER}, you are strong, after all!$" + +VictoryRoad_1F_Text_236020: @ 8236020 + .string "WALLY: I couldn’t beat you today,\n" + .string "{PLAYER}, but one of these days, I’ll\l" + .string "catch up to you!$" + +VictoryRoad_1F_Text_236073: @ 8236073 + .string "WALLY: Hi! {PLAYER}!\p" + .string "I’ve gotten stronger since that last\n" + .string "time! I wanted to show you, {PLAYER}!\p" + .string "Okay… Here I come!$" + +VictoryRoad_1F_Text_2360DA: @ 82360DA + .string "Wow!\n" + .string "{PLAYER}, you are strong, after all!$" + +VictoryRoad_1F_Text_2360FE: @ 82360FE + .string "WALLY: I couldn’t beat you this time,\n" + .string "too… But one of these days, {PLAYER},\l" + .string "I’m going to catch up to you…\p" + .string "And challenge the POKéMON LEAGUE!$" + +VictoryRoad_1F_Text_236184: @ 8236184 + .string "I’ve made it this far a couple times,\n" + .string "but the last stretch is so long…$" + +VictoryRoad_1F_Text_2361CB: @ 82361CB + .string "My dream ends here again…$" + +VictoryRoad_1F_Text_2361E5: @ 82361E5 + .string "You’ve made it this far. Keep the\n" + .string "momentum going and become the\l" + .string "CHAMPION! If anyone can, it’s you!$" + +VictoryRoad_1F_Text_236248: @ 8236248 + .string "I didn’t come all this way to lose now.\n" + .string "That possibility doesn’t exist!$" + +VictoryRoad_1F_Text_236290: @ 8236290 + .string "Impossible…\n" + .string "I lost?$" + +VictoryRoad_1F_Text_2362A4: @ 82362A4 + .string "I lost here…\p" + .string "That means I lack the qualifications\n" + .string "to become the CHAMPION…$" + +VictoryRoad_1F_Text_2362EE: @ 82362EE + .string "This seemingly infinite and harsh road\n" + .string "lives up to its name of VICTORY.$" + +VictoryRoad_1F_Text_236336: @ 8236336 + .string "Your battle style is fantastic…$" + +VictoryRoad_1F_Text_236356: @ 8236356 + .string "You seem to have the potential for\n" + .string "becoming the CHAMPION.$" + +VictoryRoad_1F_Text_236390: @ 8236390 + .string "What is the VICTORY ROAD?\n" + .string "I’ll tell you if you win!$" + +VictoryRoad_1F_Text_2363C4: @ 82363C4 + .string "Okay!\n" + .string "Well done!$" + +VictoryRoad_1F_Text_2363D5: @ 82363D5 + .string "Getting through here safely--that’s\n" + .string "the final test for any TRAINER aiming\l" + .string "to become the POKéMON CHAMPION.\p" + .string "That’s why it’s called the VICTORY\n" + .string "ROAD.$" + +VictoryRoad_1F_Text_236468: @ 8236468 + .string "I have nothing to say to anyone\n" + .string "that’s come this far. Come on!$" + +VictoryRoad_1F_Text_2364A7: @ 82364A7 + .string "This is a disgrace…$" + +VictoryRoad_1F_Text_2364BB: @ 82364BB + .string "Humph, go right on ahead.\n" + .string "See if I care.$" + diff --git a/data/maps/VictoryRoad_B1F/events.inc b/data/maps/VictoryRoad_B1F/events.inc new file mode 100644 index 000000000..26d67171d --- /dev/null +++ b/data/maps/VictoryRoad_B1F/events.inc @@ -0,0 +1,35 @@ +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 + +VictoryRoad_B1F_MapWarps: @ 853613C + 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/VictoryRoad_B1F/scripts.inc b/data/maps/VictoryRoad_B1F/scripts.inc new file mode 100644 index 000000000..376fda7d5 --- /dev/null +++ b/data/maps/VictoryRoad_B1F/scripts.inc @@ -0,0 +1,91 @@ +VictoryRoad_B1F_MapScripts:: @ 82364E4 + .byte 0 + +VictoryRoad_B1F_EventScript_2364E5:: @ 82364E5 + trainerbattle 0, TRAINER_SAMUEL, 0, VictoryRoad_B1F_Text_236558, VictoryRoad_B1F_Text_2365AD + msgbox VictoryRoad_B1F_Text_2365C4, 6 + end + +VictoryRoad_B1F_EventScript_2364FC:: @ 82364FC + trainerbattle 0, TRAINER_SHANNON, 0, VictoryRoad_B1F_Text_2365FD, VictoryRoad_B1F_Text_23664D + msgbox VictoryRoad_B1F_Text_236678, 6 + end + +VictoryRoad_B1F_EventScript_236513:: @ 8236513 + trainerbattle 0, TRAINER_MICHELLE, 0, VictoryRoad_B1F_Text_2366C2, VictoryRoad_B1F_Text_23670B + msgbox VictoryRoad_B1F_Text_23671B, 6 + end + +VictoryRoad_B1F_EventScript_23652A:: @ 823652A + trainerbattle 0, TRAINER_MITCHELL, 0, VictoryRoad_B1F_Text_236757, VictoryRoad_B1F_Text_236780 + msgbox VictoryRoad_B1F_Text_2367A7, 6 + end + +VictoryRoad_B1F_EventScript_236541:: @ 8236541 + trainerbattle 0, TRAINER_HALLE, 0, VictoryRoad_B1F_Text_2367FD, VictoryRoad_B1F_Text_23683B + msgbox VictoryRoad_B1F_Text_23684C, 6 + end + +VictoryRoad_B1F_Text_236558: @ 8236558 + .string "The thought that I’m getting closer to\n" + .string "the POKéMON LEAGUE…\p" + .string "I’m getting stage fright…$" + +VictoryRoad_B1F_Text_2365AD: @ 82365AD + .string "I couldn’t do a thing…$" + +VictoryRoad_B1F_Text_2365C4: @ 82365C4 + .string "The POKéMON LEAGUE became distant\n" + .string "again… What a letdown…$" + +VictoryRoad_B1F_Text_2365FD: @ 82365FD + .string "To win your way through the POKéMON\n" + .string "LEAGUE, you need the trust of your\l" + .string "POKéMON.$" + +VictoryRoad_B1F_Text_23664D: @ 823664D + .string "Your relationship is based on\n" + .string "solid trust.$" + +VictoryRoad_B1F_Text_236678: @ 8236678 + .string "By being together all the time, trust\n" + .string "grows between POKéMON and TRAINERS.$" + +VictoryRoad_B1F_Text_2366C2: @ 82366C2 + .string "This isn’t the goal. It’s only a place\n" + .string "on the way to the POKéMON LEAGUE.$" + +VictoryRoad_B1F_Text_23670B: @ 823670B + .string "That’s the way!$" + +VictoryRoad_B1F_Text_23671B: @ 823671B + .string "You’ll do fine, for sure!\n" + .string "Your POKéMON are all eager to go!$" + +VictoryRoad_B1F_Text_236757: @ 8236757 + .string "My POKéMON are cosmically\n" + .string "awe inspiring!$" + +VictoryRoad_B1F_Text_236780: @ 8236780 + .string "I’ve never met anyone like you before.$" + +VictoryRoad_B1F_Text_2367A7: @ 82367A7 + .string "Even outside of battle, I sense\n" + .string "incredible power emanating from you\l" + .string "and your POKéMON.$" + +VictoryRoad_B1F_Text_2367FD: @ 82367FD + .string "Okay, no need to get your back up!\n" + .string "Relax, let’s take it easy!$" + +VictoryRoad_B1F_Text_23683B: @ 823683B + .string "Whoa!\n" + .string "Wonderful!$" + +VictoryRoad_B1F_Text_23684C: @ 823684C + .string "Sure, this is VICTORY ROAD.\p" + .string "But it’s not all that different from\n" + .string "the path you’ve taken so far.\p" + .string "Try to enjoy things the rest of\n" + .string "the way!$" + diff --git a/data/maps/VictoryRoad_B2F/events.inc b/data/maps/VictoryRoad_B2F/events.inc new file mode 100644 index 000000000..a25c76c81 --- /dev/null +++ b/data/maps/VictoryRoad_B2F/events.inc @@ -0,0 +1,22 @@ +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 + +VictoryRoad_B2F_MapWarps: @ 8536230 + 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 + bg_event 37, 1, 3, 7, 0, ITEM_MAX_REPEL, 83, 0 + +VictoryRoad_B2F_MapEvents:: @ 8536268 + map_events VictoryRoad_B2F_EventObjects, VictoryRoad_B2F_MapWarps, 0x0, VictoryRoad_B2F_MapBGEvents + diff --git a/data/maps/VictoryRoad_B2F/scripts.inc b/data/maps/VictoryRoad_B2F/scripts.inc new file mode 100644 index 000000000..15deea104 --- /dev/null +++ b/data/maps/VictoryRoad_B2F/scripts.inc @@ -0,0 +1,108 @@ +VictoryRoad_B2F_MapScripts:: @ 82368D4 + .byte 0 + +VictoryRoad_B2F_EventScript_2368D5:: @ 82368D5 + trainerbattle 0, TRAINER_VITO, 0, VictoryRoad_B2F_Text_23695F, VictoryRoad_B2F_Text_2369B3 + msgbox VictoryRoad_B2F_Text_2369DE, 6 + end + +VictoryRoad_B2F_EventScript_2368EC:: @ 82368EC + trainerbattle 0, TRAINER_OWEN, 0, VictoryRoad_B2F_Text_236A4C, VictoryRoad_B2F_Text_236A92 + msgbox VictoryRoad_B2F_Text_236AAE, 6 + end + +VictoryRoad_B2F_EventScript_236903:: @ 8236903 + trainerbattle 0, TRAINER_CAROLINE, 0, VictoryRoad_B2F_Text_236AF0, VictoryRoad_B2F_Text_236B14 + msgbox VictoryRoad_B2F_Text_236B2F, 6 + end + +VictoryRoad_B2F_EventScript_23691A:: @ 823691A + trainerbattle 0, TRAINER_JULIE, 0, VictoryRoad_B2F_Text_236B88, VictoryRoad_B2F_Text_236C0A + msgbox VictoryRoad_B2F_Text_236C21, 6 + end + +VictoryRoad_B2F_EventScript_236931:: @ 8236931 + trainerbattle 0, TRAINER_FELIX, 0, VictoryRoad_B2F_Text_236C67, VictoryRoad_B2F_Text_236CAB + msgbox VictoryRoad_B2F_Text_236CBA, 6 + end + +VictoryRoad_B2F_EventScript_236948:: @ 8236948 + trainerbattle 0, TRAINER_DIANNE, 0, VictoryRoad_B2F_Text_236D27, VictoryRoad_B2F_Text_236D6E + msgbox VictoryRoad_B2F_Text_236D8C, 6 + end + +VictoryRoad_B2F_Text_23695F: @ 823695F + .string "I trained together with my whole family,\n" + .string "every one of us!\l" + .string "I’m not losing to anyone!$" + +VictoryRoad_B2F_Text_2369B3: @ 82369B3 + .string "Better than my family?!\n" + .string "Is that possible?!$" + +VictoryRoad_B2F_Text_2369DE: @ 82369DE + .string "I was better than everyone in my\n" + .string "family. I’ve never lost before…\p" + .string "I’ve lost my confidence…\n" + .string "Maybe I’ll go home…$" + +VictoryRoad_B2F_Text_236A4C: @ 8236A4C + .string "I’d heard that there was a tough\n" + .string "little kid around. Do they mean you?$" + +VictoryRoad_B2F_Text_236A92: @ 8236A92 + .string "The little shrimp is tough!$" + +VictoryRoad_B2F_Text_236AAE: @ 8236AAE + .string "The rumors I heard, that tough little\n" + .string "kid is from PETALBURG CITY.$" + +VictoryRoad_B2F_Text_236AF0: @ 8236AF0 + .string "You must be getting a little tired.$" + +VictoryRoad_B2F_Text_236B14: @ 8236B14 + .string "No signs of tiring at all!$" + +VictoryRoad_B2F_Text_236B2F: @ 8236B2F + .string "VICTORY ROAD and the POKéMON LEAGUE\n" + .string "are long and grueling challenges.\l" + .string "Beware of fatigue!$" + +VictoryRoad_B2F_Text_236B88: @ 8236B88 + .string "You shouldn’t get complacent just\n" + .string "because you have a lot of GYM BADGES.\p" + .string "There’s always going to be someone\n" + .string "who’s better than you!$" + +VictoryRoad_B2F_Text_236C0A: @ 8236C0A + .string "You’re better than me!$" + +VictoryRoad_B2F_Text_236C21: @ 8236C21 + .string "Gaze on your collected BADGES and\n" + .string "remember the TRAINERS you’ve faced.$" + +VictoryRoad_B2F_Text_236C67: @ 8236C67 + .string "I’ve come this far, but the tension’s\n" + .string "giving me awful stomach pain…$" + +VictoryRoad_B2F_Text_236CAB: @ 8236CAB + .string "Ooh…\n" + .string "It hurts…$" + +VictoryRoad_B2F_Text_236CBA: @ 8236CBA + .string "I can’t help getting all tense knowing\n" + .string "that I’m nearing the POKéMON LEAGUE.\p" + .string "It’s all I can do to feign calm.$" + +VictoryRoad_B2F_Text_236D27: @ 8236D27 + .string "The elite among the elite gather in\n" + .string "this cave.\p" + .string "How are you finding it?$" + +VictoryRoad_B2F_Text_236D6E: @ 8236D6E + .string "Not rattled in the least bit!$" + +VictoryRoad_B2F_Text_236D8C: @ 8236D8C + .string "You do have guts! I like that!\n" + .string "Keep it going!$" + diff --git a/data/maps/events/AbandonedShip_CaptainsOffice.inc b/data/maps/events/AbandonedShip_CaptainsOffice.inc deleted file mode 100644 index e7e48568c..000000000 --- a/data/maps/events/AbandonedShip_CaptainsOffice.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -AbandonedShip_CaptainsOffice_MapWarps: @ 8536A8C - 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 deleted file mode 100644 index f0e276032..000000000 --- a/data/maps/events/AbandonedShip_Corridors_1F.inc +++ /dev/null @@ -1,21 +0,0 @@ -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 - -AbandonedShip_Corridors_1F_MapWarps: @ 85366F0 - 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 deleted file mode 100644 index d1ee69499..000000000 --- a/data/maps/events/AbandonedShip_Corridors_B1F.inc +++ /dev/null @@ -1,20 +0,0 @@ -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 - -AbandonedShip_Corridors_B1F_MapWarps: @ 8536838 - 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 - -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/events/AbandonedShip_Deck.inc b/data/maps/events/AbandonedShip_Deck.inc deleted file mode 100644 index 289f917af..000000000 --- a/data/maps/events/AbandonedShip_Deck.inc +++ /dev/null @@ -1,10 +0,0 @@ -AbandonedShip_Deck_MapWarps: @ 8536684 - 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 deleted file mode 100644 index fd5cb4ac8..000000000 --- a/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc +++ /dev/null @@ -1,17 +0,0 @@ -AbandonedShip_HiddenFloorCorridors_MapWarps: @ 8536ACC - 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 - 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 - -AbandonedShip_HiddenFloorCorridors_MapEvents:: @ 8536B2C - map_events 0x0, AbandonedShip_HiddenFloorCorridors_MapWarps, 0x0, AbandonedShip_HiddenFloorCorridors_MapBGEvents - diff --git a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc deleted file mode 100644 index e352635a5..000000000 --- a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc +++ /dev/null @@ -1,32 +0,0 @@ -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 - -AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0 - 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 - 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 - -AbandonedShip_HiddenFloorRooms_MapEvents:: @ 8536C60 - 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 deleted file mode 100644 index 1f1cab59a..000000000 --- a/data/maps/events/AbandonedShip_Room_B1F.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -AbandonedShip_Room_B1F_MapWarps: @ 8536994 - 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 deleted file mode 100644 index 7dfb4d059..000000000 --- a/data/maps/events/AbandonedShip_Rooms2_1F.inc +++ /dev/null @@ -1,15 +0,0 @@ -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 - -AbandonedShip_Rooms2_1F_MapWarps: @ 8536A30 - 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 deleted file mode 100644 index 40e4600af..000000000 --- a/data/maps/events/AbandonedShip_Rooms2_B1F.inc +++ /dev/null @@ -1,13 +0,0 @@ -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 - -AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924 - 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 deleted file mode 100644 index 072892b0a..000000000 --- a/data/maps/events/AbandonedShip_Rooms_1F.inc +++ /dev/null @@ -1,17 +0,0 @@ -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 - -AbandonedShip_Rooms_1F_MapWarps: @ 85367C4 - 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 deleted file mode 100644 index 50bc7c0ee..000000000 --- a/data/maps/events/AbandonedShip_Rooms_B1F.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8 - 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 deleted file mode 100644 index 5c9af3c10..000000000 --- a/data/maps/events/AbandonedShip_Underwater1.inc +++ /dev/null @@ -1,7 +0,0 @@ -AbandonedShip_Underwater1_MapWarps: @ 8536958 - 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 deleted file mode 100644 index f06c21b2a..000000000 --- a/data/maps/events/AbandonedShip_Underwater2.inc +++ /dev/null @@ -1,6 +0,0 @@ -AbandonedShip_Underwater2_MapWarps: @ 8536AB0 - 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 deleted file mode 100644 index 898038715..000000000 --- a/data/maps/events/AlteringCave.inc +++ /dev/null @@ -1,6 +0,0 @@ -AlteringCave_MapWarps: @ 8537894 - 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 deleted file mode 100644 index 4950be4ac..000000000 --- a/data/maps/events/AncientTomb.inc +++ /dev/null @@ -1,16 +0,0 @@ -AncientTomb_EventObjects: @ 8536CDC - 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 - 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 - bg_event 7, 20, 0, 0, 0, AncientTomb_EventScript_239050 - bg_event 9, 20, 0, 0, 0, AncientTomb_EventScript_239050 - -AncientTomb_MapEvents:: @ 8536D30 - 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 deleted file mode 100644 index 7d0befd16..000000000 --- a/data/maps/events/AquaHideout_1F.inc +++ /dev/null @@ -1,13 +0,0 @@ -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 - -AquaHideout_1F_MapWarps: @ 853534C - 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 deleted file mode 100644 index 31108fa9c..000000000 --- a/data/maps/events/AquaHideout_B1F.inc +++ /dev/null @@ -1,41 +0,0 @@ -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 - -AquaHideout_B1F_MapWarps: @ 8535450 - 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 deleted file mode 100644 index eca22f5f7..000000000 --- a/data/maps/events/AquaHideout_B2F.inc +++ /dev/null @@ -1,27 +0,0 @@ -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 - -AquaHideout_B2F_MapWarps: @ 85355BC - 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 - coord_event 28, 16, 3, 0, VAR_TEMP_1, 0, 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/events/AquaHideout_UnusedRubyMap1.inc b/data/maps/events/AquaHideout_UnusedRubyMap1.inc deleted file mode 100644 index 45663b68f..000000000 --- a/data/maps/events/AquaHideout_UnusedRubyMap1.inc +++ /dev/null @@ -1,3 +0,0 @@ -AquaHideout_UnusedRubyMap1_MapEvents:: @ 8536FBC - map_events 0x0, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/AquaHideout_UnusedRubyMap2.inc b/data/maps/events/AquaHideout_UnusedRubyMap2.inc deleted file mode 100644 index 6f53de284..000000000 --- a/data/maps/events/AquaHideout_UnusedRubyMap2.inc +++ /dev/null @@ -1,3 +0,0 @@ -AquaHideout_UnusedRubyMap2_MapEvents:: @ 8536FD0 - map_events 0x0, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/AquaHideout_UnusedRubyMap3.inc b/data/maps/events/AquaHideout_UnusedRubyMap3.inc deleted file mode 100644 index 8a23a3786..000000000 --- a/data/maps/events/AquaHideout_UnusedRubyMap3.inc +++ /dev/null @@ -1,3 +0,0 @@ -AquaHideout_UnusedRubyMap3_MapEvents:: @ 8536FE4 - map_events 0x0, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/ArtisanCave_1F.inc b/data/maps/events/ArtisanCave_1F.inc deleted file mode 100644 index edd7429a3..000000000 --- a/data/maps/events/ArtisanCave_1F.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -ArtisanCave_1F_MapWarps: @ 853778C - 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 deleted file mode 100644 index a0b96c316..000000000 --- a/data/maps/events/ArtisanCave_B1F.inc +++ /dev/null @@ -1,16 +0,0 @@ -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 - -ArtisanCave_B1F_MapWarps: @ 8537720 - 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 - 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 - -ArtisanCave_B1F_MapEvents:: @ 8537760 - 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 deleted file mode 100644 index ce6eeb952..000000000 --- a/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -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 deleted file mode 100644 index 03a2cb14d..000000000 --- a/data/maps/events/BattleFrontier_BattleArenaCorridor.inc +++ /dev/null @@ -1,6 +0,0 @@ -BattleFrontier_BattleArenaCorridor_EventObjects: @ 853C8C0 - 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 deleted file mode 100644 index d0343228b..000000000 --- a/data/maps/events/BattleFrontier_BattleArenaLobby.inc +++ /dev/null @@ -1,17 +0,0 @@ -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 - -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 - -BattleFrontier_BattleArenaLobby_MapEvents:: @ 853C8AC - 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 deleted file mode 100644 index 2500a826b..000000000 --- a/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc +++ /dev/null @@ -1,20 +0,0 @@ -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 - -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 deleted file mode 100644 index 8a8d5448e..000000000 --- a/data/maps/events/BattleFrontier_BattleDomeCorridor.inc +++ /dev/null @@ -1,10 +0,0 @@ -BattleFrontier_BattleDomeCorridor_EventObjects: @ 853C14C - 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 - 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 deleted file mode 100644 index 9c6eb2649..000000000 --- a/data/maps/events/BattleFrontier_BattleDomeLobby.inc +++ /dev/null @@ -1,21 +0,0 @@ -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 - -BattleFrontier_BattleDomeLobby_MapWarps: @ 853C0F8 - 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 - 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 - -BattleFrontier_BattleDomeLobby_MapEvents:: @ 853C138 - 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 deleted file mode 100644 index 7f2133ac5..000000000 --- a/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc +++ /dev/null @@ -1,10 +0,0 @@ -BattleFrontier_BattleDomePreBattleRoom_EventObjects: @ 853C188 - 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 - 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_BattleFactoryBattleRoom.inc b/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc deleted file mode 100644 index 2ea1fbd41..000000000 --- a/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc +++ /dev/null @@ -1,13 +0,0 @@ -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 - -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 deleted file mode 100644 index 13de4c539..000000000 --- a/data/maps/events/BattleFrontier_BattleFactoryLobby.inc +++ /dev/null @@ -1,20 +0,0 @@ -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 - -BattleFrontier_BattleFactoryLobby_MapWarps: @ 853CA68 - 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 - bg_event 11, 7, 0, 1, 0, BattleFrontier_BattleFactoryLobby_EventScript_2587FA - bg_event 9, 4, 0, 0, 0, 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/events/BattleFrontier_BattleFactoryPreBattleRoom.inc b/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc deleted file mode 100644 index b8ffbfc6d..000000000 --- a/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc +++ /dev/null @@ -1,6 +0,0 @@ -BattleFrontier_BattleFactoryPreBattleRoom_EventObjects: @ 853CAB0 - 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 deleted file mode 100644 index bc1d5a525..000000000 --- a/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -BattleFrontier_BattlePalaceBattleRoom_MapWarps: @ 853C574 - 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 deleted file mode 100644 index f6baf26f6..000000000 --- a/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc +++ /dev/null @@ -1,18 +0,0 @@ -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 - -BattleFrontier_BattlePalaceCorridor_MapWarps: @ 853C4C8 - 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 deleted file mode 100644 index 56da378cb..000000000 --- a/data/maps/events/BattleFrontier_BattlePalaceLobby.inc +++ /dev/null @@ -1,21 +0,0 @@ -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 - -BattleFrontier_BattlePalaceLobby_MapWarps: @ 853C3D0 - 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 - bg_event 16, 7, 0, 1, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC69 - bg_event 10, 4, 0, 0, 0, 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/events/BattleFrontier_BattlePikeCorridor.inc b/data/maps/events/BattleFrontier_BattlePikeCorridor.inc deleted file mode 100644 index 67ceaaae6..000000000 --- a/data/maps/events/BattleFrontier_BattlePikeCorridor.inc +++ /dev/null @@ -1,6 +0,0 @@ -BattleFrontier_BattlePikeCorridor_EventObjects: @ 853CC54 - 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 deleted file mode 100644 index 45d3da103..000000000 --- a/data/maps/events/BattleFrontier_BattlePikeLobby.inc +++ /dev/null @@ -1,18 +0,0 @@ -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 - -BattleFrontier_BattlePikeLobby_MapWarps: @ 853CC10 - 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 - bg_event 1, 3, 0, 0, 0, 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/events/BattleFrontier_BattlePikeRandomRoom1.inc b/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc deleted file mode 100644 index 80c1fc3bf..000000000 --- a/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc +++ /dev/null @@ -1,16 +0,0 @@ -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 - -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 - -BattleFrontier_BattlePikeRandomRoom1_MapEvents:: @ 853CDF4 - 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 deleted file mode 100644 index 9cff20517..000000000 --- a/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc +++ /dev/null @@ -1,6 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom2_EventObjects: @ 853CE08 - 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_BattlePikeRandomRoom3.inc b/data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc deleted file mode 100644 index 20e6cb085..000000000 --- a/data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -BattleFrontier_BattlePikeRandomRoom3_MapEvents:: @ 853CEA4 - map_events 0x0, 0x0, BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents, 0x0 - diff --git a/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc b/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc deleted file mode 100644 index 7a23ba892..000000000 --- a/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc +++ /dev/null @@ -1,18 +0,0 @@ -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 - -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 - -BattleFrontier_BattlePikeThreePathRoom_MapEvents:: @ 853CD40 - 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 deleted file mode 100644 index 7a8c584ac..000000000 --- a/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc +++ /dev/null @@ -1,19 +0,0 @@ -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 - -BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: @ 853D0F0 - 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_BattlePyramidEmptySquare.inc b/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc deleted file mode 100644 index f7d22a5ed..000000000 --- a/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc +++ /dev/null @@ -1,21 +0,0 @@ -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 - -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 deleted file mode 100644 index 28b5f5c61..000000000 --- a/data/maps/events/BattleFrontier_BattlePyramidLobby.inc +++ /dev/null @@ -1,16 +0,0 @@ -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 - -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 - -BattleFrontier_BattlePyramidLobby_MapEvents:: @ 853C618 - 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 deleted file mode 100644 index f724f4f9f..000000000 --- a/data/maps/events/BattleFrontier_BattlePyramidTop.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -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_EventObjects, 0x0, BattleFrontier_BattlePyramidTop_MapCoordEvents, 0x0 - diff --git a/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc b/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc deleted file mode 100644 index 0bc8d0434..000000000 --- a/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -BattleFrontier_BattleTowerBattleRoom_MapWarps: @ 853B818 - 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_BattleTowerBattleRoom2.inc b/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc deleted file mode 100644 index f97d8ad0c..000000000 --- a/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -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 deleted file mode 100644 index 23f3377f3..000000000 --- a/data/maps/events/BattleFrontier_BattleTowerCorridor.inc +++ /dev/null @@ -1,6 +0,0 @@ -BattleFrontier_BattleTowerCorridor_EventObjects: @ 853B7A4 - 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 deleted file mode 100644 index 9dce5da52..000000000 --- a/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc +++ /dev/null @@ -1,9 +0,0 @@ -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 - -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 deleted file mode 100644 index 321fc90e3..000000000 --- a/data/maps/events/BattleFrontier_BattleTowerElevator.inc +++ /dev/null @@ -1,6 +0,0 @@ -BattleFrontier_BattleTowerElevator_EventObjects: @ 853B778 - 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 deleted file mode 100644 index 86e159b63..000000000 --- a/data/maps/events/BattleFrontier_BattleTowerLobby.inc +++ /dev/null @@ -1,26 +0,0 @@ -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 - -BattleFrontier_BattleTowerLobby_MapWarps: @ 853B710 - 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 - 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 - -BattleFrontier_BattleTowerLobby_MapEvents:: @ 853B764 - 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 deleted file mode 100644 index 0c730f37d..000000000 --- a/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -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 deleted file mode 100644 index b6c6ecdd0..000000000 --- a/data/maps/events/BattleFrontier_Lounge1.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -BattleFrontier_Lounge1_MapWarps: @ 853CFFC - 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 deleted file mode 100644 index 0616573bd..000000000 --- a/data/maps/events/BattleFrontier_Lounge2.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -BattleFrontier_Lounge2_MapWarps: @ 853D194 - 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 deleted file mode 100644 index dbaa20fe1..000000000 --- a/data/maps/events/BattleFrontier_Lounge3.inc +++ /dev/null @@ -1,13 +0,0 @@ -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 - -BattleFrontier_Lounge3_MapWarps: @ 853D230 - 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 deleted file mode 100644 index 613adfae2..000000000 --- a/data/maps/events/BattleFrontier_Lounge4.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -BattleFrontier_Lounge4_MapWarps: @ 853D294 - 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 deleted file mode 100644 index 0224ae0a9..000000000 --- a/data/maps/events/BattleFrontier_Lounge5.inc +++ /dev/null @@ -1,13 +0,0 @@ -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 - -BattleFrontier_Lounge5_MapWarps: @ 853D34C - 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 deleted file mode 100644 index 092be452b..000000000 --- a/data/maps/events/BattleFrontier_Lounge6.inc +++ /dev/null @@ -1,9 +0,0 @@ -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 - -BattleFrontier_Lounge6_MapWarps: @ 853D388 - 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 deleted file mode 100644 index c5490d6c9..000000000 --- a/data/maps/events/BattleFrontier_Lounge7.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -BattleFrontier_Lounge7_MapWarps: @ 853D404 - 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 deleted file mode 100644 index 116cc007f..000000000 --- a/data/maps/events/BattleFrontier_Lounge8.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -BattleFrontier_Lounge8_MapWarps: @ 853D504 - 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 deleted file mode 100644 index 6500ab66a..000000000 --- a/data/maps/events/BattleFrontier_Lounge9.inc +++ /dev/null @@ -1,10 +0,0 @@ -BattleFrontier_Lounge9_EventObjects: @ 853D520 - 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 - 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 deleted file mode 100644 index 669945b99..000000000 --- a/data/maps/events/BattleFrontier_Mart.inc +++ /dev/null @@ -1,13 +0,0 @@ -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 - -BattleFrontier_Mart_MapWarps: @ 853D6EC - 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 deleted file mode 100644 index 37fa6e7bd..000000000 --- a/data/maps/events/BattleFrontier_OutsideEast.inc +++ /dev/null @@ -1,57 +0,0 @@ -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 - -BattleFrontier_OutsideEast_MapWarps: @ 853BD80 - 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 - 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 - -BattleFrontier_OutsideEast_MapEvents:: @ 853BE50 - 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 deleted file mode 100644 index 643e26e2e..000000000 --- a/data/maps/events/BattleFrontier_OutsideWest.inc +++ /dev/null @@ -1,49 +0,0 @@ -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 - -BattleFrontier_OutsideWest_MapWarps: @ 853B590 - 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 - 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 - -BattleFrontier_OutsideWest_MapEvents:: @ 853B624 - 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 deleted file mode 100644 index ba07ed15c..000000000 --- a/data/maps/events/BattleFrontier_PokemonCenter_1F.inc +++ /dev/null @@ -1,15 +0,0 @@ -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 - -BattleFrontier_PokemonCenter_1F_MapWarps: @ 853D5D4 - 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 deleted file mode 100644 index bb5bb6119..000000000 --- a/data/maps/events/BattleFrontier_PokemonCenter_2F.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -BattleFrontier_PokemonCenter_2F_MapWarps: @ 853D660 - 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 deleted file mode 100644 index 239c372c6..000000000 --- a/data/maps/events/BattleFrontier_RankingHall.inc +++ /dev/null @@ -1,26 +0,0 @@ -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 - -BattleFrontier_RankingHall_MapWarps: @ 853CF00 - 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 - 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 - -BattleFrontier_RankingHall_MapEvents:: @ 853CFA0 - 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 deleted file mode 100644 index 34db359fc..000000000 --- a/data/maps/events/BattleFrontier_ReceptionGate.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -BattleFrontier_ReceptionGate_MapWarps: @ 853D498 - 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 deleted file mode 100644 index 6e3de083c..000000000 --- a/data/maps/events/BattleFrontier_ScottsHouse.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -BattleFrontier_ScottsHouse_MapWarps: @ 853D2C8 - 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/BattlePyramidSquare01.inc b/data/maps/events/BattlePyramidSquare01.inc deleted file mode 100644 index 677499152..000000000 --- a/data/maps/events/BattlePyramidSquare01.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -BattlePyramidSquare01_MapEvents:: @ 853A508 - map_events BattlePyramidSquare01_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/BattlePyramidSquare02.inc b/data/maps/events/BattlePyramidSquare02.inc deleted file mode 100644 index 1133979ee..000000000 --- a/data/maps/events/BattlePyramidSquare02.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -BattlePyramidSquare02_MapEvents:: @ 853A5C4 - map_events BattlePyramidSquare02_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/BattlePyramidSquare03.inc b/data/maps/events/BattlePyramidSquare03.inc deleted file mode 100644 index 95fdb77bc..000000000 --- a/data/maps/events/BattlePyramidSquare03.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -BattlePyramidSquare03_MapEvents:: @ 853A680 - map_events BattlePyramidSquare03_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/BattlePyramidSquare04.inc b/data/maps/events/BattlePyramidSquare04.inc deleted file mode 100644 index 3b19c7f09..000000000 --- a/data/maps/events/BattlePyramidSquare04.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -BattlePyramidSquare04_MapEvents:: @ 853A73C - map_events BattlePyramidSquare04_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/BattlePyramidSquare05.inc b/data/maps/events/BattlePyramidSquare05.inc deleted file mode 100644 index 17f6aab60..000000000 --- a/data/maps/events/BattlePyramidSquare05.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -BattlePyramidSquare05_MapEvents:: @ 853A7F8 - map_events BattlePyramidSquare05_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/BattlePyramidSquare06.inc b/data/maps/events/BattlePyramidSquare06.inc deleted file mode 100644 index 6ae39b52f..000000000 --- a/data/maps/events/BattlePyramidSquare06.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -BattlePyramidSquare06_MapEvents:: @ 853A8B4 - map_events BattlePyramidSquare06_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/BattlePyramidSquare07.inc b/data/maps/events/BattlePyramidSquare07.inc deleted file mode 100644 index 788c5e40c..000000000 --- a/data/maps/events/BattlePyramidSquare07.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -BattlePyramidSquare07_MapEvents:: @ 853A970 - map_events BattlePyramidSquare07_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/BattlePyramidSquare08.inc b/data/maps/events/BattlePyramidSquare08.inc deleted file mode 100644 index 780fab9ed..000000000 --- a/data/maps/events/BattlePyramidSquare08.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -BattlePyramidSquare08_MapEvents:: @ 853AA2C - map_events BattlePyramidSquare08_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/BattlePyramidSquare09.inc b/data/maps/events/BattlePyramidSquare09.inc deleted file mode 100644 index 569059af5..000000000 --- a/data/maps/events/BattlePyramidSquare09.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -BattlePyramidSquare09_MapEvents:: @ 853AAE8 - map_events BattlePyramidSquare09_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/BattlePyramidSquare10.inc b/data/maps/events/BattlePyramidSquare10.inc deleted file mode 100644 index ae3c4f88e..000000000 --- a/data/maps/events/BattlePyramidSquare10.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -BattlePyramidSquare10_MapEvents:: @ 853ABA4 - map_events BattlePyramidSquare10_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/BattlePyramidSquare11.inc b/data/maps/events/BattlePyramidSquare11.inc deleted file mode 100644 index 0389ee141..000000000 --- a/data/maps/events/BattlePyramidSquare11.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -BattlePyramidSquare11_MapEvents:: @ 853AC60 - map_events BattlePyramidSquare11_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/BattlePyramidSquare12.inc b/data/maps/events/BattlePyramidSquare12.inc deleted file mode 100644 index db27c6c64..000000000 --- a/data/maps/events/BattlePyramidSquare12.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -BattlePyramidSquare12_MapEvents:: @ 853AD1C - map_events BattlePyramidSquare12_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/BattlePyramidSquare13.inc b/data/maps/events/BattlePyramidSquare13.inc deleted file mode 100644 index 12ac8ffe7..000000000 --- a/data/maps/events/BattlePyramidSquare13.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -BattlePyramidSquare13_MapEvents:: @ 853ADD8 - map_events BattlePyramidSquare13_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/BattlePyramidSquare14.inc b/data/maps/events/BattlePyramidSquare14.inc deleted file mode 100644 index c63fabee3..000000000 --- a/data/maps/events/BattlePyramidSquare14.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -BattlePyramidSquare14_MapEvents:: @ 853AE94 - map_events BattlePyramidSquare14_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/BattlePyramidSquare15.inc b/data/maps/events/BattlePyramidSquare15.inc deleted file mode 100644 index f2332f18b..000000000 --- a/data/maps/events/BattlePyramidSquare15.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -BattlePyramidSquare15_MapEvents:: @ 853AF50 - map_events BattlePyramidSquare15_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/BattlePyramidSquare16.inc b/data/maps/events/BattlePyramidSquare16.inc deleted file mode 100644 index 38d398b5b..000000000 --- a/data/maps/events/BattlePyramidSquare16.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -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 deleted file mode 100644 index 86f4d43cb..000000000 --- a/data/maps/events/BirthIsland_Exterior.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -BirthIsland_Exterior_MapWarps: @ 853D80C - 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 deleted file mode 100644 index f5c38358d..000000000 --- a/data/maps/events/BirthIsland_Harbor.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -BirthIsland_Harbor_MapWarps: @ 853D858 - 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 deleted file mode 100644 index bdc629846..000000000 --- a/data/maps/events/CaveOfOrigin_1F.inc +++ /dev/null @@ -1,7 +0,0 @@ -CaveOfOrigin_1F_MapWarps: @ 8535D40 - 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 deleted file mode 100644 index 72a2c6210..000000000 --- a/data/maps/events/CaveOfOrigin_B1F.inc +++ /dev/null @@ -1,9 +0,0 @@ -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 - -CaveOfOrigin_B1F_MapWarps: @ 8535DE8 - 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 deleted file mode 100644 index 5a5ad59f7..000000000 --- a/data/maps/events/CaveOfOrigin_Entrance.inc +++ /dev/null @@ -1,7 +0,0 @@ -CaveOfOrigin_Entrance_MapWarps: @ 8535D1C - 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 deleted file mode 100644 index c9eeaff22..000000000 --- a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc +++ /dev/null @@ -1,7 +0,0 @@ -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 - -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 deleted file mode 100644 index c8e9bbeeb..000000000 --- a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc +++ /dev/null @@ -1,7 +0,0 @@ -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 - -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 deleted file mode 100644 index 953eef558..000000000 --- a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc +++ /dev/null @@ -1,7 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap3_MapWarps: @ 8535DAC - 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 deleted file mode 100644 index b7ccd35b0..000000000 --- a/data/maps/events/DesertRuins.inc +++ /dev/null @@ -1,16 +0,0 @@ -DesertRuins_EventObjects: @ 8534354 - 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 - 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 - bg_event 7, 20, 0, 0, 0, DesertRuins_EventScript_22D9F8 - bg_event 9, 20, 0, 0, 0, DesertRuins_EventScript_22D9F8 - -DesertRuins_MapEvents:: @ 85343A8 - map_events DesertRuins_EventObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents - diff --git a/data/maps/events/DesertUnderpass.inc b/data/maps/events/DesertUnderpass.inc deleted file mode 100644 index 05fb939a0..000000000 --- a/data/maps/events/DesertUnderpass.inc +++ /dev/null @@ -1,9 +0,0 @@ -DesertUnderpass_EventObjects: @ 85376D4 - 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 - -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 deleted file mode 100644 index c96b4c95e..000000000 --- a/data/maps/events/DewfordTown.inc +++ /dev/null @@ -1,24 +0,0 @@ -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 - -DewfordTown_MapWarps: @ 85279DC - 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 - 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 - -DewfordTown_MapEvents:: @ 8527A40 - 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 deleted file mode 100644 index 11f5d5a92..000000000 --- a/data/maps/events/DewfordTown_Gym.inc +++ /dev/null @@ -1,23 +0,0 @@ -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 - -DewfordTown_Gym_MapWarps: @ 852DBF4 - 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 - 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 - -DewfordTown_Gym_MapEvents:: @ 852DC34 - 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 deleted file mode 100644 index e12a02a3c..000000000 --- a/data/maps/events/DewfordTown_Hall.inc +++ /dev/null @@ -1,22 +0,0 @@ -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 - -DewfordTown_Hall_MapWarps: @ 852DD20 - 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 - bg_event 7, 1, 3, 0, 0, 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/events/DewfordTown_House1.inc b/data/maps/events/DewfordTown_House1.inc deleted file mode 100644 index 849bb0244..000000000 --- a/data/maps/events/DewfordTown_House1.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -DewfordTown_House1_MapWarps: @ 852DA10 - 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 deleted file mode 100644 index 8aec9176b..000000000 --- a/data/maps/events/DewfordTown_House2.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -DewfordTown_House2_MapWarps: @ 852DD8C - 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 deleted file mode 100644 index aad05249c..000000000 --- a/data/maps/events/DewfordTown_PokemonCenter_1F.inc +++ /dev/null @@ -1,13 +0,0 @@ -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 - -DewfordTown_PokemonCenter_1F_MapWarps: @ 852DA7C - 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 deleted file mode 100644 index 9c739974b..000000000 --- a/data/maps/events/DewfordTown_PokemonCenter_2F.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -DewfordTown_PokemonCenter_2F_MapWarps: @ 852DB08 - 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 deleted file mode 100644 index f28e9e3e1..000000000 --- a/data/maps/events/DoubleBattleColosseum.inc +++ /dev/null @@ -1,15 +0,0 @@ -DoubleBattleColosseum_MapWarps: @ 8539E88 - 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 - 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 - -DoubleBattleColosseum_MapEvents:: @ 8539EE8 - map_events 0x0, DoubleBattleColosseum_MapWarps, DoubleBattleColosseum_MapCoordEvents, 0x0 - diff --git a/data/maps/events/EverGrandeCity.inc b/data/maps/events/EverGrandeCity.inc deleted file mode 100644 index b8ca9eea4..000000000 --- a/data/maps/events/EverGrandeCity.inc +++ /dev/null @@ -1,29 +0,0 @@ -EverGrandeCity_MapWarps: @ 8527588 - 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 - 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 - -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 - -EverGrandeCity_MapEvents:: @ 8527694 - map_events 0x0, EverGrandeCity_MapWarps, EverGrandeCity_MapCoordEvents, EverGrandeCity_MapBGEvents - diff --git a/data/maps/events/EverGrandeCity_ChampionsRoom.inc b/data/maps/events/EverGrandeCity_ChampionsRoom.inc deleted file mode 100644 index 6226fe527..000000000 --- a/data/maps/events/EverGrandeCity_ChampionsRoom.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -EverGrandeCity_ChampionsRoom_MapWarps: @ 8533748 - 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 deleted file mode 100644 index 56eda4374..000000000 --- a/data/maps/events/EverGrandeCity_DrakesRoom.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -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 deleted file mode 100644 index c8d85fd98..000000000 --- a/data/maps/events/EverGrandeCity_GlaciasRoom.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -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 deleted file mode 100644 index 3351b42e0..000000000 --- a/data/maps/events/EverGrandeCity_Hall1.inc +++ /dev/null @@ -1,9 +0,0 @@ -EverGrandeCity_Hall1_MapWarps: @ 853376C - 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 deleted file mode 100644 index e3eacab10..000000000 --- a/data/maps/events/EverGrandeCity_Hall2.inc +++ /dev/null @@ -1,9 +0,0 @@ -EverGrandeCity_Hall2_MapWarps: @ 85337A0 - 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 deleted file mode 100644 index e44182b4f..000000000 --- a/data/maps/events/EverGrandeCity_Hall3.inc +++ /dev/null @@ -1,9 +0,0 @@ -EverGrandeCity_Hall3_MapWarps: @ 85337D4 - 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 deleted file mode 100644 index b2d011234..000000000 --- a/data/maps/events/EverGrandeCity_Hall4.inc +++ /dev/null @@ -1,7 +0,0 @@ -EverGrandeCity_Hall4_MapWarps: @ 8533808 - 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 deleted file mode 100644 index 687920b71..000000000 --- a/data/maps/events/EverGrandeCity_Hall5.inc +++ /dev/null @@ -1,9 +0,0 @@ -EverGrandeCity_Hall5_MapWarps: @ 853382C - 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 deleted file mode 100644 index 50fc7fbdc..000000000 --- a/data/maps/events/EverGrandeCity_HallOfFame.inc +++ /dev/null @@ -1,9 +0,0 @@ -EverGrandeCity_HallOfFame_EventObjects: @ 85338FC - 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 - -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 deleted file mode 100644 index c9b5ef7fd..000000000 --- a/data/maps/events/EverGrandeCity_PhoebesRoom.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -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 deleted file mode 100644 index 1f7e26046..000000000 --- a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -EverGrandeCity_PokemonCenter_1F_MapWarps: @ 8533990 - 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 deleted file mode 100644 index 98671f414..000000000 --- a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -EverGrandeCity_PokemonCenter_2F_MapWarps: @ 8533A1C - 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 deleted file mode 100644 index 536dbf934..000000000 --- a/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc +++ /dev/null @@ -1,16 +0,0 @@ -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 - -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 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 deleted file mode 100644 index a09e8ed31..000000000 --- a/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -EverGrandeCity_PokemonLeague_2F_MapWarps: @ 8533AA8 - 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 deleted file mode 100644 index 1823af7cd..000000000 --- a/data/maps/events/EverGrandeCity_SidneysRoom.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -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 deleted file mode 100644 index 91a98cc28..000000000 --- a/data/maps/events/FallarborTown.inc +++ /dev/null @@ -1,26 +0,0 @@ -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 - -FallarborTown_MapWarps: @ 8527C40 - 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 - 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 - -FallarborTown_MapEvents:: @ 8527CC8 - 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 deleted file mode 100644 index c4e35ebbb..000000000 --- a/data/maps/events/FallarborTown_BattleTentBattleRoom.inc +++ /dev/null @@ -1,8 +0,0 @@ -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 - -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 deleted file mode 100644 index 471ca66a3..000000000 --- a/data/maps/events/FallarborTown_BattleTentCorridor.inc +++ /dev/null @@ -1,6 +0,0 @@ -FallarborTown_BattleTentCorridor_EventObjects: @ 852E418 - 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 deleted file mode 100644 index 570287ae3..000000000 --- a/data/maps/events/FallarborTown_BattleTentLobby.inc +++ /dev/null @@ -1,17 +0,0 @@ -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 - -FallarborTown_BattleTentLobby_MapWarps: @ 852E3E8 - 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 - -FallarborTown_BattleTentLobby_MapEvents:: @ 852E404 - 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 deleted file mode 100644 index 5c2323b74..000000000 --- a/data/maps/events/FallarborTown_House1.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -FallarborTown_House1_MapWarps: @ 852E5E8 - 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 deleted file mode 100644 index 342e2e60b..000000000 --- a/data/maps/events/FallarborTown_House2.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -FallarborTown_House2_MapWarps: @ 852E624 - 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 deleted file mode 100644 index 6d7188c6a..000000000 --- a/data/maps/events/FallarborTown_Mart.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -FallarborTown_Mart_MapWarps: @ 852E34C - 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 deleted file mode 100644 index 368190914..000000000 --- a/data/maps/events/FallarborTown_PokemonCenter_1F.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -FallarborTown_PokemonCenter_1F_MapWarps: @ 852E500 - 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 deleted file mode 100644 index 9162a2822..000000000 --- a/data/maps/events/FallarborTown_PokemonCenter_2F.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -FallarborTown_PokemonCenter_2F_MapWarps: @ 852E58C - 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 deleted file mode 100644 index 8af15533b..000000000 --- a/data/maps/events/FarawayIsland_Entrance.inc +++ /dev/null @@ -1,19 +0,0 @@ -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 - -FarawayIsland_Entrance_MapWarps: @ 853D740 - 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 - 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 - -FarawayIsland_Entrance_MapBGEvents: @ 853D780 - bg_event 3, 32, 0, 1, 0, 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/events/FarawayIsland_Interior.inc b/data/maps/events/FarawayIsland_Interior.inc deleted file mode 100644 index c2cd25b40..000000000 --- a/data/maps/events/FarawayIsland_Interior.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -FarawayIsland_Interior_MapWarps: @ 853D7B8 - 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 deleted file mode 100644 index 37fecaf5e..000000000 --- a/data/maps/events/FieryPath.inc +++ /dev/null @@ -1,17 +0,0 @@ -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 - -FieryPath_MapWarps: @ 8534D40 - 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 deleted file mode 100644 index c943e230d..000000000 --- a/data/maps/events/FortreeCity.inc +++ /dev/null @@ -1,31 +0,0 @@ -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 - -FortreeCity_MapWarps: @ 8526C44 - 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 - 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 - -FortreeCity_MapEvents:: @ 8526CD4 - 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 deleted file mode 100644 index fe85e94d6..000000000 --- a/data/maps/events/FortreeCity_DecorationShop.inc +++ /dev/null @@ -1,13 +0,0 @@ -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 - -FortreeCity_DecorationShop_MapWarps: @ 8531110 - 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 deleted file mode 100644 index 234c10b0c..000000000 --- a/data/maps/events/FortreeCity_Gym.inc +++ /dev/null @@ -1,21 +0,0 @@ -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 - -FortreeCity_Gym_MapWarps: @ 8530D58 - 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 - bg_event 17, 21, 0, 1, 0, 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/events/FortreeCity_House1.inc b/data/maps/events/FortreeCity_House1.inc deleted file mode 100644 index 99d34626c..000000000 --- a/data/maps/events/FortreeCity_House1.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -FortreeCity_House1_MapWarps: @ 8530C74 - 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 deleted file mode 100644 index 2d78b2774..000000000 --- a/data/maps/events/FortreeCity_House2.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -FortreeCity_House2_MapWarps: @ 8530F60 - 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 deleted file mode 100644 index 54ac6ed6a..000000000 --- a/data/maps/events/FortreeCity_House3.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -FortreeCity_House3_MapWarps: @ 8530FB4 - 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 deleted file mode 100644 index 1bddf3416..000000000 --- a/data/maps/events/FortreeCity_House4.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -FortreeCity_House4_MapWarps: @ 8531020 - 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 deleted file mode 100644 index d6c03578e..000000000 --- a/data/maps/events/FortreeCity_House5.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -FortreeCity_House5_MapWarps: @ 853108C - 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 deleted file mode 100644 index 115b04ccd..000000000 --- a/data/maps/events/FortreeCity_Mart.inc +++ /dev/null @@ -1,13 +0,0 @@ -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 - -FortreeCity_Mart_MapWarps: @ 8530F0C - 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 deleted file mode 100644 index 4b681b5cb..000000000 --- a/data/maps/events/FortreeCity_PokemonCenter_1F.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -FortreeCity_PokemonCenter_1F_MapWarps: @ 8530DF4 - 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 deleted file mode 100644 index 7a7f666b2..000000000 --- a/data/maps/events/FortreeCity_PokemonCenter_2F.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -FortreeCity_PokemonCenter_2F_MapWarps: @ 8530E80 - 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 deleted file mode 100644 index 83368e186..000000000 --- a/data/maps/events/GraniteCave_1F.inc +++ /dev/null @@ -1,13 +0,0 @@ -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 - -GraniteCave_1F_MapWarps: @ 85343EC - 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 deleted file mode 100644 index 90b0f498e..000000000 --- a/data/maps/events/GraniteCave_B1F.inc +++ /dev/null @@ -1,15 +0,0 @@ -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 - -GraniteCave_B1F_MapWarps: @ 8534438 - 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 deleted file mode 100644 index d7ce41812..000000000 --- a/data/maps/events/GraniteCave_B2F.inc +++ /dev/null @@ -1,25 +0,0 @@ -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 - -GraniteCave_B2F_MapWarps: @ 853455C - 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 - bg_event 15, 11, 3, 7, 0, ITEM_EVERSTONE, 49, 0 - -GraniteCave_B2F_MapEvents:: @ 853459C - 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 deleted file mode 100644 index 49e808cda..000000000 --- a/data/maps/events/GraniteCave_StevensRoom.inc +++ /dev/null @@ -1,9 +0,0 @@ -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 - -GraniteCave_StevensRoom_MapWarps: @ 85345C8 - 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 deleted file mode 100644 index 5dafdf1fd..000000000 --- a/data/maps/events/InsideOfTruck.inc +++ /dev/null @@ -1,25 +0,0 @@ -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 - -InsideOfTruck_MapWarps: @ 853A0C0 - 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 - 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 - -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 - -InsideOfTruck_MapEvents:: @ 853A144 - map_events InsideOfTruck_EventObjects, InsideOfTruck_MapWarps, InsideOfTruck_MapCoordEvents, InsideOfTruck_MapBGEvents - diff --git a/data/maps/events/IslandCave.inc b/data/maps/events/IslandCave.inc deleted file mode 100644 index d7807a725..000000000 --- a/data/maps/events/IslandCave.inc +++ /dev/null @@ -1,16 +0,0 @@ -IslandCave_EventObjects: @ 8536C74 - 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 - 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 - bg_event 7, 20, 0, 0, 0, IslandCave_EventScript_238F1D - bg_event 9, 20, 0, 0, 0, IslandCave_EventScript_238F1D - -IslandCave_MapEvents:: @ 8536CC8 - map_events IslandCave_EventObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents - diff --git a/data/maps/events/JaggedPass.inc b/data/maps/events/JaggedPass.inc deleted file mode 100644 index fe193cd97..000000000 --- a/data/maps/events/JaggedPass.inc +++ /dev/null @@ -1,35 +0,0 @@ -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 - -JaggedPass_MapWarps: @ 8534B8C - 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 - 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 - -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 - -JaggedPass_MapEvents:: @ 8534C6C - map_events JaggedPass_EventObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents - diff --git a/data/maps/events/LavaridgeTown.inc b/data/maps/events/LavaridgeTown.inc deleted file mode 100644 index cf32b8377..000000000 --- a/data/maps/events/LavaridgeTown.inc +++ /dev/null @@ -1,35 +0,0 @@ -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 - -LavaridgeTown_MapWarps: @ 8527B2C - 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 - -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 - -LavaridgeTown_MapEvents:: @ 8527BCC - 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 deleted file mode 100644 index cc35053f0..000000000 --- a/data/maps/events/LavaridgeTown_Gym_1F.inc +++ /dev/null @@ -1,43 +0,0 @@ -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 - -LavaridgeTown_Gym_1F_MapWarps: @ 852DEAC - 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 - bg_event 16, 15, 0, 1, 0, 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/events/LavaridgeTown_Gym_B1F.inc b/data/maps/events/LavaridgeTown_Gym_B1F.inc deleted file mode 100644 index eabf8e51d..000000000 --- a/data/maps/events/LavaridgeTown_Gym_B1F.inc +++ /dev/null @@ -1,35 +0,0 @@ -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 - -LavaridgeTown_Gym_B1F_MapWarps: @ 852E008 - 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 deleted file mode 100644 index dd5ffdbe9..000000000 --- a/data/maps/events/LavaridgeTown_HerbShop.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -LavaridgeTown_HerbShop_MapWarps: @ 852DDF8 - 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 deleted file mode 100644 index 17809fc45..000000000 --- a/data/maps/events/LavaridgeTown_House.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -LavaridgeTown_House_MapWarps: @ 852E124 - 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 deleted file mode 100644 index 0206eefd7..000000000 --- a/data/maps/events/LavaridgeTown_Mart.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -LavaridgeTown_Mart_MapWarps: @ 852E190 - 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 deleted file mode 100644 index 767f01713..000000000 --- a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc +++ /dev/null @@ -1,15 +0,0 @@ -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 - -LavaridgeTown_PokemonCenter_1F_MapWarps: @ 852E214 - 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 deleted file mode 100644 index 3191e7533..000000000 --- a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -LavaridgeTown_PokemonCenter_2F_MapWarps: @ 852E2A8 - 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 deleted file mode 100644 index 343249c2d..000000000 --- a/data/maps/events/LilycoveCity.inc +++ /dev/null @@ -1,58 +0,0 @@ -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 - -LilycoveCity_MapWarps: @ 8526EF8 - 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 - 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 - -LilycoveCity_MapEvents:: @ 8527004 - 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 deleted file mode 100644 index dd5655beb..000000000 --- a/data/maps/events/LilycoveCity_ContestHall.inc +++ /dev/null @@ -1,51 +0,0 @@ -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 - -LilycoveCity_ContestHall_MapWarps: @ 8531B50 - 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 - 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 - -LilycoveCity_ContestHall_MapEvents:: @ 8531BB8 - 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 deleted file mode 100644 index d7c31c837..000000000 --- a/data/maps/events/LilycoveCity_ContestLobby.inc +++ /dev/null @@ -1,50 +0,0 @@ -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 - -LilycoveCity_ContestLobby_MapWarps: @ 853178C - 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 - 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 - -LilycoveCity_ContestLobby_MapEvents:: @ 853183C - 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 deleted file mode 100644 index 7ccbc4aec..000000000 --- a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -LilycoveCity_CoveLilyMotel_1F_MapWarps: @ 853114C - 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 - -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/events/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc deleted file mode 100644 index 631eba91b..000000000 --- a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc +++ /dev/null @@ -1,15 +0,0 @@ -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 - -LilycoveCity_CoveLilyMotel_2F_MapWarps: @ 8531230 - 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 deleted file mode 100644 index bdeda0bd9..000000000 --- a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -LilycoveCity_DepartmentStoreElevator_MapWarps: @ 85324C8 - 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 deleted file mode 100644 index aca7598ec..000000000 --- a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc +++ /dev/null @@ -1,16 +0,0 @@ -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 - -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 - -LilycoveCity_DepartmentStoreRooftop_MapEvents:: @ 853249C - 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 deleted file mode 100644 index 17a6db615..000000000 --- a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc +++ /dev/null @@ -1,20 +0,0 @@ -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 - -LilycoveCity_DepartmentStore_1F_MapWarps: @ 853211C - 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 - -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/events/LilycoveCity_DepartmentStore_2F.inc b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc deleted file mode 100644 index 1747ece5a..000000000 --- a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc +++ /dev/null @@ -1,15 +0,0 @@ -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 - -LilycoveCity_DepartmentStore_2F_MapWarps: @ 85321D4 - 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 deleted file mode 100644 index 93ef37b4b..000000000 --- a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc +++ /dev/null @@ -1,15 +0,0 @@ -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 - -LilycoveCity_DepartmentStore_3F_MapWarps: @ 8532278 - 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 deleted file mode 100644 index 5e6d0d94a..000000000 --- a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc +++ /dev/null @@ -1,15 +0,0 @@ -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 - -LilycoveCity_DepartmentStore_4F_MapWarps: @ 853231C - 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 deleted file mode 100644 index f2b9b130a..000000000 --- a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc +++ /dev/null @@ -1,17 +0,0 @@ -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 - -LilycoveCity_DepartmentStore_5F_MapWarps: @ 85323F0 - 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 deleted file mode 100644 index 73d21e9ce..000000000 --- a/data/maps/events/LilycoveCity_Harbor.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -LilycoveCity_Harbor_MapWarps: @ 8531E94 - 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 deleted file mode 100644 index d268037ba..000000000 --- a/data/maps/events/LilycoveCity_House1.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -LilycoveCity_House1_MapWarps: @ 8531F24 - 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 deleted file mode 100644 index 7e5276102..000000000 --- a/data/maps/events/LilycoveCity_House2.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -LilycoveCity_House2_MapWarps: @ 8531F60 - 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 deleted file mode 100644 index 4f582bdef..000000000 --- a/data/maps/events/LilycoveCity_House3.inc +++ /dev/null @@ -1,15 +0,0 @@ -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 - -LilycoveCity_House3_MapWarps: @ 8532014 - 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 deleted file mode 100644 index e85c296d3..000000000 --- a/data/maps/events/LilycoveCity_House4.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -LilycoveCity_House4_MapWarps: @ 8532068 - 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 deleted file mode 100644 index 47b39c6ee..000000000 --- a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc +++ /dev/null @@ -1,38 +0,0 @@ -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 - -LilycoveCity_LilycoveMuseum_1F_MapWarps: @ 853133C - 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 - 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 - -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/events/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc deleted file mode 100644 index ba1e74e65..000000000 --- a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc +++ /dev/null @@ -1,26 +0,0 @@ -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 - -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 - -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/events/LilycoveCity_MoveDeletersHouse.inc b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc deleted file mode 100644 index 784b388ae..000000000 --- a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -LilycoveCity_MoveDeletersHouse_MapWarps: @ 8531ED0 - 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 deleted file mode 100644 index dce57df3d..000000000 --- a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc +++ /dev/null @@ -1,15 +0,0 @@ -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 - -LilycoveCity_PokemonCenter_1F_MapWarps: @ 8531C44 - 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 deleted file mode 100644 index ec8e4cf6e..000000000 --- a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -LilycoveCity_PokemonCenter_2F_MapWarps: @ 8531CD0 - 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 deleted file mode 100644 index 228e56e4d..000000000 --- a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc +++ /dev/null @@ -1,18 +0,0 @@ -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 - -LilycoveCity_PokemonTrainerFanClub_MapWarps: @ 8531DF8 - 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 deleted file mode 100644 index 0481a1c0b..000000000 --- a/data/maps/events/LilycoveCity_UnusedMart.inc +++ /dev/null @@ -1,7 +0,0 @@ -LilycoveCity_UnusedMart_MapWarps: @ 8531CFC - 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/LinkContestRoom1.inc b/data/maps/events/LinkContestRoom1.inc deleted file mode 100644 index c1bdfe3fb..000000000 --- a/data/maps/events/LinkContestRoom1.inc +++ /dev/null @@ -1,18 +0,0 @@ -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 - -LinkContestRoom1_MapEvents:: @ 853A064 diff --git a/data/maps/events/LinkContestRoom2.inc b/data/maps/events/LinkContestRoom2.inc deleted file mode 100644 index 89cb251d5..000000000 --- a/data/maps/events/LinkContestRoom2.inc +++ /dev/null @@ -1 +0,0 @@ -LinkContestRoom2_MapEvents:: @ 853A064 diff --git a/data/maps/events/LinkContestRoom3.inc b/data/maps/events/LinkContestRoom3.inc deleted file mode 100644 index 1e1b194c6..000000000 --- a/data/maps/events/LinkContestRoom3.inc +++ /dev/null @@ -1 +0,0 @@ -LinkContestRoom3_MapEvents:: @ 853A064 diff --git a/data/maps/events/LinkContestRoom4.inc b/data/maps/events/LinkContestRoom4.inc deleted file mode 100644 index 56e608f20..000000000 --- a/data/maps/events/LinkContestRoom4.inc +++ /dev/null @@ -1 +0,0 @@ -LinkContestRoom4_MapEvents:: @ 853A064 diff --git a/data/maps/events/LinkContestRoom5.inc b/data/maps/events/LinkContestRoom5.inc deleted file mode 100644 index 90644518e..000000000 --- a/data/maps/events/LinkContestRoom5.inc +++ /dev/null @@ -1 +0,0 @@ -LinkContestRoom5_MapEvents:: @ 853A064 diff --git a/data/maps/events/LinkContestRoom6.inc b/data/maps/events/LinkContestRoom6.inc deleted file mode 100644 index 802987a1d..000000000 --- a/data/maps/events/LinkContestRoom6.inc +++ /dev/null @@ -1 +0,0 @@ -LinkContestRoom6_MapEvents:: @ 853A064 diff --git a/data/maps/events/LittlerootTown.inc b/data/maps/events/LittlerootTown.inc deleted file mode 100644 index 23b8cc3e5..000000000 --- a/data/maps/events/LittlerootTown.inc +++ /dev/null @@ -1,35 +0,0 @@ -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 - -LittlerootTown_MapWarps: @ 8527768 - 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 - 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 - -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 - -LittlerootTown_MapEvents:: @ 8527840 - 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 deleted file mode 100644 index cd08fbad8..000000000 --- a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc +++ /dev/null @@ -1,23 +0,0 @@ -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 - -LittlerootTown_BrendansHouse_1F_MapWarps: @ 852D134 - 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 - 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 - -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/events/LittlerootTown_BrendansHouse_2F.inc b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc deleted file mode 100644 index a6649c9b6..000000000 --- a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc +++ /dev/null @@ -1,30 +0,0 @@ -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 - -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 - -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/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/events/LittlerootTown_MaysHouse_1F.inc deleted file mode 100644 index 6822c20e8..000000000 --- a/data/maps/events/LittlerootTown_MaysHouse_1F.inc +++ /dev/null @@ -1,23 +0,0 @@ -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 - -LittlerootTown_MaysHouse_1F_MapWarps: @ 852D414 - 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 - 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 - -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/events/LittlerootTown_MaysHouse_2F.inc b/data/maps/events/LittlerootTown_MaysHouse_2F.inc deleted file mode 100644 index a5f1dd43c..000000000 --- a/data/maps/events/LittlerootTown_MaysHouse_2F.inc +++ /dev/null @@ -1,30 +0,0 @@ -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 - -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 - -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/events/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc deleted file mode 100644 index a4596ce5c..000000000 --- a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc +++ /dev/null @@ -1,32 +0,0 @@ -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 - -LittlerootTown_ProfessorBirchsLab_MapWarps: @ 852D6DC - 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 - 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 - -LittlerootTown_ProfessorBirchsLab_MapEvents:: @ 852D7A0 - 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 deleted file mode 100644 index 1274e2373..000000000 --- a/data/maps/events/MagmaHideout_1F.inc +++ /dev/null @@ -1,17 +0,0 @@ -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 - -MagmaHideout_1F_MapWarps: @ 853725C - 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 deleted file mode 100644 index 32f835efc..000000000 --- a/data/maps/events/MagmaHideout_2F_1R.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -MagmaHideout_2F_1R_MapWarps: @ 85372F0 - 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 deleted file mode 100644 index 5567bf9cf..000000000 --- a/data/maps/events/MagmaHideout_2F_2R.inc +++ /dev/null @@ -1,15 +0,0 @@ -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 - -MagmaHideout_2F_2R_MapWarps: @ 85373AC - 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 deleted file mode 100644 index ca379a0c7..000000000 --- a/data/maps/events/MagmaHideout_2F_3R.inc +++ /dev/null @@ -1,7 +0,0 @@ -MagmaHideout_2F_3R_MapWarps: @ 85375B0 - 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 deleted file mode 100644 index b2f157f57..000000000 --- a/data/maps/events/MagmaHideout_3F_1R.inc +++ /dev/null @@ -1,13 +0,0 @@ -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 - -MagmaHideout_3F_1R_MapWarps: @ 8537418 - 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 deleted file mode 100644 index 27ea129c3..000000000 --- a/data/maps/events/MagmaHideout_3F_2R.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -MagmaHideout_3F_2R_MapWarps: @ 8537474 - 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 deleted file mode 100644 index 3f96b5652..000000000 --- a/data/maps/events/MagmaHideout_3F_3R.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -MagmaHideout_3F_3R_MapWarps: @ 853758C - 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 deleted file mode 100644 index 1865c3b84..000000000 --- a/data/maps/events/MagmaHideout_4F.inc +++ /dev/null @@ -1,17 +0,0 @@ -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 - -MagmaHideout_4F_MapWarps: @ 8537550 - 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 deleted file mode 100644 index 14903539b..000000000 --- a/data/maps/events/MarineCave_End.inc +++ /dev/null @@ -1,12 +0,0 @@ -MarineCave_End_EventObjects: @ 85377E8 - 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 - -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_EventObjects, MarineCave_End_MapWarps, MarineCave_End_MapCoordEvents, 0x0 - diff --git a/data/maps/events/MarineCave_Entrance.inc b/data/maps/events/MarineCave_Entrance.inc deleted file mode 100644 index 4db3e1ddc..000000000 --- a/data/maps/events/MarineCave_Entrance.inc +++ /dev/null @@ -1,6 +0,0 @@ -MarineCave_Entrance_MapWarps: @ 85377CC - 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 deleted file mode 100644 index c8318005c..000000000 --- a/data/maps/events/MauvilleCity.inc +++ /dev/null @@ -1,35 +0,0 @@ -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 - -MauvilleCity_MapWarps: @ 8526734 - 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 - 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 - -MauvilleCity_MapEvents:: @ 85267CC - 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 deleted file mode 100644 index b4c0d19df..000000000 --- a/data/maps/events/MauvilleCity_BikeShop.inc +++ /dev/null @@ -1,15 +0,0 @@ -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 - -MauvilleCity_BikeShop_MapWarps: @ 852FEB0 - 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 - bg_event 11, 1, 0, 0, 0, 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/events/MauvilleCity_GameCorner.inc b/data/maps/events/MauvilleCity_GameCorner.inc deleted file mode 100644 index a956f16d8..000000000 --- a/data/maps/events/MauvilleCity_GameCorner.inc +++ /dev/null @@ -1,47 +0,0 @@ -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 - -MauvilleCity_GameCorner_MapWarps: @ 8530048 - 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 - 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 - -MauvilleCity_GameCorner_MapEvents:: @ 8530178 - 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 deleted file mode 100644 index 08c8db444..000000000 --- a/data/maps/events/MauvilleCity_Gym.inc +++ /dev/null @@ -1,26 +0,0 @@ -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 - -MauvilleCity_Gym_MapWarps: @ 852FE04 - 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 - 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 - -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 - -MauvilleCity_Gym_MapEvents:: @ 852FE6C - 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 deleted file mode 100644 index 2590e33b9..000000000 --- a/data/maps/events/MauvilleCity_House1.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -MauvilleCity_House1_MapWarps: @ 852FF04 - 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 deleted file mode 100644 index f8e04f5ea..000000000 --- a/data/maps/events/MauvilleCity_House2.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -MauvilleCity_House2_MapWarps: @ 85301A4 - 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 deleted file mode 100644 index f67840783..000000000 --- a/data/maps/events/MauvilleCity_Mart.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -MauvilleCity_Mart_MapWarps: @ 8530358 - 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 deleted file mode 100644 index adab7d3e4..000000000 --- a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc +++ /dev/null @@ -1,15 +0,0 @@ -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 - -MauvilleCity_PokemonCenter_1F_MapWarps: @ 8530240 - 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 deleted file mode 100644 index c3a0c4990..000000000 --- a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc +++ /dev/null @@ -1,15 +0,0 @@ -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 - -MauvilleCity_PokemonCenter_2F_MapWarps: @ 85302E4 - 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 deleted file mode 100644 index 977559950..000000000 --- a/data/maps/events/MeteorFalls_1F_1R.inc +++ /dev/null @@ -1,29 +0,0 @@ -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 - -MeteorFalls_1F_1R_MapWarps: @ 8534064 - 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 - -MeteorFalls_1F_1R_MapBGEvents: @ 85340A4 - bg_event 9, 58, 0, 0, 0, 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/events/MeteorFalls_1F_2R.inc b/data/maps/events/MeteorFalls_1F_2R.inc deleted file mode 100644 index 0436851c5..000000000 --- a/data/maps/events/MeteorFalls_1F_2R.inc +++ /dev/null @@ -1,17 +0,0 @@ -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 - -MeteorFalls_1F_2R_MapWarps: @ 853410C - 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 - -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/events/MeteorFalls_B1F_1R.inc b/data/maps/events/MeteorFalls_B1F_1R.inc deleted file mode 100644 index 039f316d9..000000000 --- a/data/maps/events/MeteorFalls_B1F_1R.inc +++ /dev/null @@ -1,11 +0,0 @@ -MeteorFalls_B1F_1R_MapWarps: @ 853414C - 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 deleted file mode 100644 index 8e2c9e1c4..000000000 --- a/data/maps/events/MeteorFalls_B1F_2R.inc +++ /dev/null @@ -1,9 +0,0 @@ -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 - -MeteorFalls_B1F_2R_MapWarps: @ 85341A8 - 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 deleted file mode 100644 index ff920f86d..000000000 --- a/data/maps/events/MeteorFalls_StevensCave.inc +++ /dev/null @@ -1,9 +0,0 @@ -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 - -MeteorFalls_StevensCave_MapWarps: @ 85378C8 - 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 deleted file mode 100644 index f35ce6d2a..000000000 --- a/data/maps/events/MirageTower_1F.inc +++ /dev/null @@ -1,7 +0,0 @@ -MirageTower_1F_MapWarps: @ 85375D4 - 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 deleted file mode 100644 index fdbafbe06..000000000 --- a/data/maps/events/MirageTower_2F.inc +++ /dev/null @@ -1,7 +0,0 @@ -MirageTower_2F_MapWarps: @ 85375F8 - 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 deleted file mode 100644 index e12b4873d..000000000 --- a/data/maps/events/MirageTower_3F.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -MirageTower_3F_MapWarps: @ 853764C - 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 deleted file mode 100644 index 7b215a83a..000000000 --- a/data/maps/events/MirageTower_4F.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -MirageTower_4F_MapWarps: @ 85376B8 - 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 deleted file mode 100644 index d288400b5..000000000 --- a/data/maps/events/MossdeepCity.inc +++ /dev/null @@ -1,56 +0,0 @@ -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 - -MossdeepCity_MapWarps: @ 85271B0 - 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 - 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 - -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 - -MossdeepCity_MapEvents:: @ 8527300 - 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 deleted file mode 100644 index 42face3c4..000000000 --- a/data/maps/events/MossdeepCity_GameCorner_1F.inc +++ /dev/null @@ -1,17 +0,0 @@ -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 - -MossdeepCity_GameCorner_1F_MapWarps: @ 8532F70 - 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 - bg_event 0, 1, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_277E9D - bg_event 1, 1, 0, 0, 0, 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/events/MossdeepCity_GameCorner_B1F.inc b/data/maps/events/MossdeepCity_GameCorner_B1F.inc deleted file mode 100644 index 7146d30b8..000000000 --- a/data/maps/events/MossdeepCity_GameCorner_B1F.inc +++ /dev/null @@ -1,9 +0,0 @@ -MossdeepCity_GameCorner_B1F_EventObjects: @ 8532FC0 - 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 - -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 deleted file mode 100644 index e383463af..000000000 --- a/data/maps/events/MossdeepCity_Gym.inc +++ /dev/null @@ -1,72 +0,0 @@ -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 - -MossdeepCity_Gym_MapWarps: @ 853284C - 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 - 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 - -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 - -MossdeepCity_Gym_MapEvents:: @ 8532964 - 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 deleted file mode 100644 index a7832fb09..000000000 --- a/data/maps/events/MossdeepCity_House1.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -MossdeepCity_House1_MapWarps: @ 85329A8 - 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 deleted file mode 100644 index 86ba58946..000000000 --- a/data/maps/events/MossdeepCity_House2.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -MossdeepCity_House2_MapWarps: @ 8532A14 - 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 deleted file mode 100644 index e40e79e10..000000000 --- a/data/maps/events/MossdeepCity_House3.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -MossdeepCity_House3_MapWarps: @ 8532BEC - 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 deleted file mode 100644 index 96d8fe7d8..000000000 --- a/data/maps/events/MossdeepCity_House4.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -MossdeepCity_House4_MapWarps: @ 8532CF4 - 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 deleted file mode 100644 index d8314e6e5..000000000 --- a/data/maps/events/MossdeepCity_Mart.inc +++ /dev/null @@ -1,13 +0,0 @@ -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 - -MossdeepCity_Mart_MapWarps: @ 8532BB0 - 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 deleted file mode 100644 index 7e56185b2..000000000 --- a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc +++ /dev/null @@ -1,13 +0,0 @@ -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 - -MossdeepCity_PokemonCenter_1F_MapWarps: @ 8532A80 - 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 deleted file mode 100644 index c5d5af15a..000000000 --- a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc +++ /dev/null @@ -1,15 +0,0 @@ -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 - -MossdeepCity_PokemonCenter_2F_MapWarps: @ 8532B24 - 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 deleted file mode 100644 index fa5a8f3bb..000000000 --- a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc +++ /dev/null @@ -1,21 +0,0 @@ -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 - -MossdeepCity_SpaceCenter_1F_MapWarps: @ 8532E20 - 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 deleted file mode 100644 index bf143934e..000000000 --- a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc +++ /dev/null @@ -1,17 +0,0 @@ -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 - -MossdeepCity_SpaceCenter_2F_MapWarps: @ 8532F24 - 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 deleted file mode 100644 index 0ee8e7d15..000000000 --- a/data/maps/events/MossdeepCity_StevensHouse.inc +++ /dev/null @@ -1,18 +0,0 @@ -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 - -MossdeepCity_StevensHouse_MapWarps: @ 8532C58 - 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 - 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 - -MossdeepCity_StevensHouse_MapEvents:: @ 8532C98 - 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 deleted file mode 100644 index bb7e1a913..000000000 --- a/data/maps/events/MtChimney.inc +++ /dev/null @@ -1,45 +0,0 @@ -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 - -MtChimney_MapWarps: @ 8534A98 - 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 - bg_event 24, 37, 3, 0, 0, MtChimney_EventScript_22F141 - -MtChimney_MapEvents:: @ 8534AD0 - 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 deleted file mode 100644 index 19385b3d5..000000000 --- a/data/maps/events/MtChimney_CableCarStation.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -MtChimney_CableCarStation_MapWarps: @ 8533CD8 - 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 deleted file mode 100644 index 80bf46c2e..000000000 --- a/data/maps/events/MtPyre_1F.inc +++ /dev/null @@ -1,16 +0,0 @@ -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 - -MtPyre_1F_MapWarps: @ 8534DAC - 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 deleted file mode 100644 index d5b24c06f..000000000 --- a/data/maps/events/MtPyre_2F.inc +++ /dev/null @@ -1,20 +0,0 @@ -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 - -MtPyre_2F_MapWarps: @ 8534EB0 - 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 deleted file mode 100644 index bf0d1af77..000000000 --- a/data/maps/events/MtPyre_3F.inc +++ /dev/null @@ -1,17 +0,0 @@ -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 - -MtPyre_3F_MapWarps: @ 8534F4C - 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 deleted file mode 100644 index e39075d8b..000000000 --- a/data/maps/events/MtPyre_4F.inc +++ /dev/null @@ -1,15 +0,0 @@ -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 - -MtPyre_4F_MapWarps: @ 8534FC0 - 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 deleted file mode 100644 index 03a9b773f..000000000 --- a/data/maps/events/MtPyre_5F.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -MtPyre_5F_MapWarps: @ 8535034 - 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 deleted file mode 100644 index 1f00209b2..000000000 --- a/data/maps/events/MtPyre_6F.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -MtPyre_6F_MapWarps: @ 85350B8 - 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 deleted file mode 100644 index badd884f9..000000000 --- a/data/maps/events/MtPyre_Exterior.inc +++ /dev/null @@ -1,23 +0,0 @@ -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 - -MtPyre_Exterior_MapWarps: @ 853510C - 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 - 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 - -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 - -MtPyre_Exterior_MapEvents:: @ 853518C - 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 deleted file mode 100644 index 2df3aaafd..000000000 --- a/data/maps/events/MtPyre_Summit.inc +++ /dev/null @@ -1,30 +0,0 @@ -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 - -MtPyre_Summit_MapWarps: @ 8535260 - 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 - 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 - -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 - -MtPyre_Summit_MapEvents:: @ 85352F0 - map_events MtPyre_Summit_EventObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents - diff --git a/data/maps/events/NavelRock_B1F.inc b/data/maps/events/NavelRock_B1F.inc deleted file mode 100644 index e83d221dd..000000000 --- a/data/maps/events/NavelRock_B1F.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_B1F_MapWarps: @ 853DA94 - 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 deleted file mode 100644 index fec170ae9..000000000 --- a/data/maps/events/NavelRock_Bottom.inc +++ /dev/null @@ -1,9 +0,0 @@ -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 - -NavelRock_Bottom_MapWarps: @ 853DD68 - 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 deleted file mode 100644 index 3a6045215..000000000 --- a/data/maps/events/NavelRock_Down01.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down01_MapWarps: @ 853DBC4 - 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 deleted file mode 100644 index 7441539c9..000000000 --- a/data/maps/events/NavelRock_Down02.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down02_MapWarps: @ 853DBE8 - 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 deleted file mode 100644 index 20dabdfaf..000000000 --- a/data/maps/events/NavelRock_Down03.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down03_MapWarps: @ 853DC0C - 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 deleted file mode 100644 index e50f6fe23..000000000 --- a/data/maps/events/NavelRock_Down04.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down04_MapWarps: @ 853DC30 - 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 deleted file mode 100644 index 500d38e9b..000000000 --- a/data/maps/events/NavelRock_Down05.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down05_MapWarps: @ 853DC54 - 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 deleted file mode 100644 index 077367747..000000000 --- a/data/maps/events/NavelRock_Down06.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down06_MapWarps: @ 853DC78 - 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 deleted file mode 100644 index 83f7ce9a6..000000000 --- a/data/maps/events/NavelRock_Down07.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down07_MapWarps: @ 853DC9C - 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 deleted file mode 100644 index 38bef10e8..000000000 --- a/data/maps/events/NavelRock_Down08.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down08_MapWarps: @ 853DCC0 - 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 deleted file mode 100644 index e3843e759..000000000 --- a/data/maps/events/NavelRock_Down09.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down09_MapWarps: @ 853DCE4 - 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 deleted file mode 100644 index 805e399b4..000000000 --- a/data/maps/events/NavelRock_Down10.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down10_MapWarps: @ 853DD08 - 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 deleted file mode 100644 index 505a6ed6d..000000000 --- a/data/maps/events/NavelRock_Down11.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down11_MapWarps: @ 853DD2C - 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 deleted file mode 100644 index ee45485a7..000000000 --- a/data/maps/events/NavelRock_Entrance.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Entrance_MapWarps: @ 853DA70 - 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 deleted file mode 100644 index 66bbf376f..000000000 --- a/data/maps/events/NavelRock_Exterior.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Exterior_MapWarps: @ 853DA00 - 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 deleted file mode 100644 index 869dc0f08..000000000 --- a/data/maps/events/NavelRock_Fork.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_Fork_MapWarps: @ 853DAB8 - 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 deleted file mode 100644 index 2ffdc5fa1..000000000 --- a/data/maps/events/NavelRock_Harbor.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -NavelRock_Harbor_MapWarps: @ 853DA54 - 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 deleted file mode 100644 index dc7c1e7df..000000000 --- a/data/maps/events/NavelRock_Top.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Top_EventObjects: @ 853DB74 - 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 - -NavelRock_Top_MapCoordEvents: @ 853DB94 - coord_event 12, 10, 3, 0, VAR_TEMP_1, 0, 0, NavelRock_Top_EventScript_26916F - -NavelRock_Top_MapBGEvents: @ 853DBA4 - bg_event 12, 9, 3, 7, 0, ITEM_SACRED_ASH, 109, 0 - -NavelRock_Top_MapEvents:: @ 853DBB0 - map_events NavelRock_Top_EventObjects, NavelRock_Top_MapWarps, NavelRock_Top_MapCoordEvents, NavelRock_Top_MapBGEvents - diff --git a/data/maps/events/NavelRock_Up1.inc b/data/maps/events/NavelRock_Up1.inc deleted file mode 100644 index fd0741a6a..000000000 --- a/data/maps/events/NavelRock_Up1.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Up1_MapWarps: @ 853DAE4 - 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 deleted file mode 100644 index bd142b997..000000000 --- a/data/maps/events/NavelRock_Up2.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Up2_MapWarps: @ 853DB08 - 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 deleted file mode 100644 index 9491e5dac..000000000 --- a/data/maps/events/NavelRock_Up3.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Up3_MapWarps: @ 853DB2C - 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 deleted file mode 100644 index 3d81f1523..000000000 --- a/data/maps/events/NavelRock_Up4.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Up4_MapWarps: @ 853DB50 - 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 deleted file mode 100644 index 29f46af20..000000000 --- a/data/maps/events/NewMauville_Entrance.inc +++ /dev/null @@ -1,10 +0,0 @@ -NewMauville_Entrance_MapWarps: @ 8536474 - 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 - -NewMauville_Entrance_MapEvents:: @ 8536494 - map_events 0x0, NewMauville_Entrance_MapWarps, NewMauville_Entrance_MapCoordEvents, 0x0 - diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/events/NewMauville_Inside.inc deleted file mode 100644 index 794f1965c..000000000 --- a/data/maps/events/NewMauville_Inside.inc +++ /dev/null @@ -1,38 +0,0 @@ -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 - -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 - -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 - -NewMauville_Inside_MapEvents:: @ 8536670 - 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 deleted file mode 100644 index b7bc6ab08..000000000 --- a/data/maps/events/OldaleTown.inc +++ /dev/null @@ -1,28 +0,0 @@ -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 - -OldaleTown_MapWarps: @ 85278B4 - 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 - 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 - -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 - -OldaleTown_MapEvents:: @ 8527950 - 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 deleted file mode 100644 index cf853c8ac..000000000 --- a/data/maps/events/OldaleTown_House1.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -OldaleTown_House1_MapWarps: @ 852D7CC - 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 deleted file mode 100644 index 2feeb8949..000000000 --- a/data/maps/events/OldaleTown_House2.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -OldaleTown_House2_MapWarps: @ 852D820 - 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 deleted file mode 100644 index f850fa482..000000000 --- a/data/maps/events/OldaleTown_Mart.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -OldaleTown_Mart_MapWarps: @ 852D9A4 - 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 deleted file mode 100644 index bb102baab..000000000 --- a/data/maps/events/OldaleTown_PokemonCenter_1F.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -OldaleTown_PokemonCenter_1F_MapWarps: @ 852D8A4 - 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 deleted file mode 100644 index b25b155ea..000000000 --- a/data/maps/events/OldaleTown_PokemonCenter_2F.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -OldaleTown_PokemonCenter_2F_MapWarps: @ 852D930 - 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 deleted file mode 100644 index 41d54e9fc..000000000 --- a/data/maps/events/PacifidlogTown.inc +++ /dev/null @@ -1,21 +0,0 @@ -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 - -PacifidlogTown_MapWarps: @ 8527E30 - 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 - bg_event 7, 16, 0, 0, 0, PacifidlogTown_EventScript_1EBADE - bg_event 10, 15, 0, 1, 0, PacifidlogTown_EventScript_271E73 - -PacifidlogTown_MapEvents:: @ 8527E84 - 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 deleted file mode 100644 index 77ca4c832..000000000 --- a/data/maps/events/PacifidlogTown_House1.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -PacifidlogTown_House1_MapWarps: @ 852EBD0 - 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 deleted file mode 100644 index 450533014..000000000 --- a/data/maps/events/PacifidlogTown_House2.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -PacifidlogTown_House2_MapWarps: @ 852EC3C - 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 deleted file mode 100644 index 635ba86a7..000000000 --- a/data/maps/events/PacifidlogTown_House3.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -PacifidlogTown_House3_MapWarps: @ 852EC90 - 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 deleted file mode 100644 index e5f8dd4f1..000000000 --- a/data/maps/events/PacifidlogTown_House4.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -PacifidlogTown_House4_MapWarps: @ 852ECFC - 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 deleted file mode 100644 index febb80ad6..000000000 --- a/data/maps/events/PacifidlogTown_House5.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -PacifidlogTown_House5_MapWarps: @ 852ED50 - 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 deleted file mode 100644 index 66b8caa67..000000000 --- a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc +++ /dev/null @@ -1,15 +0,0 @@ -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 - -PacifidlogTown_PokemonCenter_1F_MapWarps: @ 852EAE8 - 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 deleted file mode 100644 index 1aa279980..000000000 --- a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -PacifidlogTown_PokemonCenter_2F_MapWarps: @ 852EB74 - 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 deleted file mode 100644 index 29fe0e02e..000000000 --- a/data/maps/events/PetalburgCity.inc +++ /dev/null @@ -1,42 +0,0 @@ -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 - -PetalburgCity_MapWarps: @ 85260A8 - 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 - 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 - -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 - -PetalburgCity_MapEvents:: @ 85261B8 - 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 deleted file mode 100644 index 2df386d2c..000000000 --- a/data/maps/events/PetalburgCity_Gym.inc +++ /dev/null @@ -1,72 +0,0 @@ -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 - -PetalburgCity_Gym_MapWarps: @ 852EED0 - 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 - 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 - -PetalburgCity_Gym_MapEvents:: @ 852F0A8 - 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 deleted file mode 100644 index dcd3b071f..000000000 --- a/data/maps/events/PetalburgCity_House1.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -PetalburgCity_House1_MapWarps: @ 852F0EC - 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 deleted file mode 100644 index 7d1a863cb..000000000 --- a/data/maps/events/PetalburgCity_House2.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -PetalburgCity_House2_MapWarps: @ 852F140 - 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 deleted file mode 100644 index 3dc327c6a..000000000 --- a/data/maps/events/PetalburgCity_Mart.inc +++ /dev/null @@ -1,13 +0,0 @@ -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 - -PetalburgCity_Mart_MapWarps: @ 852F2F4 - 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 deleted file mode 100644 index e7a4ec6e6..000000000 --- a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc +++ /dev/null @@ -1,15 +0,0 @@ -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 - -PetalburgCity_PokemonCenter_1F_MapWarps: @ 852F1DC - 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 deleted file mode 100644 index 7d2ff52f4..000000000 --- a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -PetalburgCity_PokemonCenter_2F_MapWarps: @ 852F268 - 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 deleted file mode 100644 index 563d61579..000000000 --- a/data/maps/events/PetalburgCity_WallysHouse.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -PetalburgCity_WallysHouse_MapWarps: @ 852EDA4 - 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 deleted file mode 100644 index da904f8ef..000000000 --- a/data/maps/events/PetalburgWoods.inc +++ /dev/null @@ -1,38 +0,0 @@ -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 - -PetalburgWoods_MapWarps: @ 853471C - 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 - coord_event 27, 23, 3, 0, VAR_0x4098, 0, 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 - -PetalburgWoods_MapEvents:: @ 85347B4 - map_events PetalburgWoods_EventObjects, PetalburgWoods_MapWarps, PetalburgWoods_MapCoordEvents, PetalburgWoods_MapBGEvents - diff --git a/data/maps/events/RecordCorner.inc b/data/maps/events/RecordCorner.inc deleted file mode 100644 index 7970c14ba..000000000 --- a/data/maps/events/RecordCorner.inc +++ /dev/null @@ -1,18 +0,0 @@ -RecordCorner_EventObjects: @ 8539DFC - 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 - 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 - 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 - -RecordCorner_MapEvents:: @ 8539E74 - map_events RecordCorner_EventObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0 - diff --git a/data/maps/events/Route101.inc b/data/maps/events/Route101.inc deleted file mode 100644 index 82b674f9e..000000000 --- a/data/maps/events/Route101.inc +++ /dev/null @@ -1,25 +0,0 @@ -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 - -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 - -Route101_MapBGEvents: @ 8527FB8 - bg_event 5, 9, 0, 0, 0, Route101_EventScript_1EBE0D - -Route101_MapEvents:: @ 8527FC4 - map_events Route101_EventObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents - diff --git a/data/maps/events/Route102.inc b/data/maps/events/Route102.inc deleted file mode 100644 index fc30a195c..000000000 --- a/data/maps/events/Route102.inc +++ /dev/null @@ -1,18 +0,0 @@ -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 - -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_EventObjects, 0x0, 0x0, Route102_MapBGEvents - diff --git a/data/maps/events/Route103.inc b/data/maps/events/Route103.inc deleted file mode 100644 index e4bf74177..000000000 --- a/data/maps/events/Route103.inc +++ /dev/null @@ -1,31 +0,0 @@ -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 - -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 - -Route103_MapEvents:: @ 85282D0 - map_events Route103_EventObjects, Route103_MapWarps, 0x0, Route103_MapBGEvents - diff --git a/data/maps/events/Route104.inc b/data/maps/events/Route104.inc deleted file mode 100644 index 315b5614e..000000000 --- a/data/maps/events/Route104.inc +++ /dev/null @@ -1,64 +0,0 @@ -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 - -Route104_MapWarps: @ 8528614 - 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 - -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 - -Route104_MapEvents:: @ 85286DC - 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 deleted file mode 100644 index 9eccc2286..000000000 --- a/data/maps/events/Route104_MrBrineysHouse.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -Route104_MrBrineysHouse_MapWarps: @ 8533B04 - 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 deleted file mode 100644 index 025daad04..000000000 --- a/data/maps/events/Route104_PrettyPetalFlowerShop.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -Route104_PrettyPetalFlowerShop_MapWarps: @ 8533B70 - 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/Route104_Prototype.inc b/data/maps/events/Route104_Prototype.inc deleted file mode 100644 index 08976e5a8..000000000 --- a/data/maps/events/Route104_Prototype.inc +++ /dev/null @@ -1,3 +0,0 @@ -Route104_Prototype_MapEvents:: @ 853DDC0 - map_events 0x0, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc b/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc deleted file mode 100644 index e66b3c841..000000000 --- a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc +++ /dev/null @@ -1,3 +0,0 @@ -Route104_PrototypePrettyPetalFlowerShop_MapEvents:: @ 853DDD4 - map_events 0x0, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/Route105.inc b/data/maps/events/Route105.inc deleted file mode 100644 index bbe9cf73b..000000000 --- a/data/maps/events/Route105.inc +++ /dev/null @@ -1,20 +0,0 @@ -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 - -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 - -Route105_MapEvents:: @ 85287D0 - map_events Route105_EventObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents - diff --git a/data/maps/events/Route106.inc b/data/maps/events/Route106.inc deleted file mode 100644 index 8fdbaad5f..000000000 --- a/data/maps/events/Route106.inc +++ /dev/null @@ -1,19 +0,0 @@ -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 - -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 - -Route106_MapEvents:: @ 8528894 - map_events Route106_EventObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents - diff --git a/data/maps/events/Route107.inc b/data/maps/events/Route107.inc deleted file mode 100644 index f748e2ff9..000000000 --- a/data/maps/events/Route107.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -Route107_MapEvents:: @ 8528950 - map_events Route107_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/Route108.inc b/data/maps/events/Route108.inc deleted file mode 100644 index 0a0b448c4..000000000 --- a/data/maps/events/Route108.inc +++ /dev/null @@ -1,18 +0,0 @@ -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 - -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 - -Route108_MapEvents:: @ 8528A20 - map_events Route108_EventObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents - diff --git a/data/maps/events/Route109.inc b/data/maps/events/Route109.inc deleted file mode 100644 index 1d847897d..000000000 --- a/data/maps/events/Route109.inc +++ /dev/null @@ -1,42 +0,0 @@ -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 - -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 - -Route109_MapEvents:: @ 8528CDC - 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 deleted file mode 100644 index 140b92a21..000000000 --- a/data/maps/events/Route109_SeashoreHouse.inc +++ /dev/null @@ -1,13 +0,0 @@ -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 - -Route109_SeashoreHouse_MapWarps: @ 853DE48 - 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 deleted file mode 100644 index c982ededf..000000000 --- a/data/maps/events/Route110.inc +++ /dev/null @@ -1,79 +0,0 @@ -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 - -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 - -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 - -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 - -Route110_MapEvents:: @ 85291DC - 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 deleted file mode 100644 index ed1750f79..000000000 --- a/data/maps/events/Route110_SeasideCyclingRoadEntrance1.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/events/Route110_SeasideCyclingRoadEntrance2.inc b/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc deleted file mode 100644 index 5ad30e6c1..000000000 --- a/data/maps/events/Route110_SeasideCyclingRoadEntrance2.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/events/Route110_TrickHouseCorridor.inc b/data/maps/events/Route110_TrickHouseCorridor.inc deleted file mode 100644 index e9d84d56b..000000000 --- a/data/maps/events/Route110_TrickHouseCorridor.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route110_TrickHouseCorridor_MapWarps: @ 853DF54 - 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 deleted file mode 100644 index 12659457a..000000000 --- a/data/maps/events/Route110_TrickHouseEnd.inc +++ /dev/null @@ -1,16 +0,0 @@ -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 - -Route110_TrickHouseEnd_MapWarps: @ 853DF14 - 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 - -Route110_TrickHouseEnd_MapBGEvents: @ 853DF34 - bg_event 4, 5, 3, 7, 0, ITEM_NUGGET, 1, 0 - -Route110_TrickHouseEnd_MapEvents:: @ 853DF40 - 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 deleted file mode 100644 index 30a6892df..000000000 --- a/data/maps/events/Route110_TrickHouseEntrance.inc +++ /dev/null @@ -1,20 +0,0 @@ -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 - -Route110_TrickHouseEntrance_MapWarps: @ 853DE84 - 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 - 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 - -Route110_TrickHouseEntrance_MapBGEvents: @ 853DEDC - bg_event 5, 1, 0, 1, 0, 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/events/Route110_TrickHousePuzzle1.inc b/data/maps/events/Route110_TrickHousePuzzle1.inc deleted file mode 100644 index 05824aa38..000000000 --- a/data/maps/events/Route110_TrickHousePuzzle1.inc +++ /dev/null @@ -1,28 +0,0 @@ -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 - -Route110_TrickHousePuzzle1_MapWarps: @ 853E0F0 - 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 - -Route110_TrickHousePuzzle1_MapEvents:: @ 853E114 - 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 deleted file mode 100644 index a7259e3b3..000000000 --- a/data/maps/events/Route110_TrickHousePuzzle2.inc +++ /dev/null @@ -1,24 +0,0 @@ -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 - -Route110_TrickHousePuzzle2_MapWarps: @ 853E1A0 - 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 - 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 - -Route110_TrickHousePuzzle2_MapBGEvents: @ 853E1F8 - bg_event 14, 14, 0, 0, 0, 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/events/Route110_TrickHousePuzzle3.inc b/data/maps/events/Route110_TrickHousePuzzle3.inc deleted file mode 100644 index 2f95cf052..000000000 --- a/data/maps/events/Route110_TrickHousePuzzle3.inc +++ /dev/null @@ -1,26 +0,0 @@ -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 - -Route110_TrickHousePuzzle3_MapWarps: @ 853E2C0 - 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 - 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 - -Route110_TrickHousePuzzle3_MapBGEvents: @ 853E318 - bg_event 0, 14, 0, 0, 0, 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/events/Route110_TrickHousePuzzle4.inc b/data/maps/events/Route110_TrickHousePuzzle4.inc deleted file mode 100644 index b0dd3abf6..000000000 --- a/data/maps/events/Route110_TrickHousePuzzle4.inc +++ /dev/null @@ -1,27 +0,0 @@ -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 - -Route110_TrickHousePuzzle4_MapWarps: @ 853E488 - 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 - -Route110_TrickHousePuzzle4_MapEvents:: @ 853E4AC - 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 deleted file mode 100644 index 8da7daf11..000000000 --- a/data/maps/events/Route110_TrickHousePuzzle5.inc +++ /dev/null @@ -1,42 +0,0 @@ -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 - -Route110_TrickHousePuzzle5_MapWarps: @ 853E538 - 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 - 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 - -Route110_TrickHousePuzzle5_MapBGEvents: @ 853E6B0 - bg_event 11, 21, 0, 0, 0, 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/events/Route110_TrickHousePuzzle6.inc b/data/maps/events/Route110_TrickHousePuzzle6.inc deleted file mode 100644 index 7fc098f2c..000000000 --- a/data/maps/events/Route110_TrickHousePuzzle6.inc +++ /dev/null @@ -1,17 +0,0 @@ -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 - -Route110_TrickHousePuzzle6_MapWarps: @ 853E730 - 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 - -Route110_TrickHousePuzzle6_MapEvents:: @ 853E754 - 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 deleted file mode 100644 index e72aa929a..000000000 --- a/data/maps/events/Route110_TrickHousePuzzle7.inc +++ /dev/null @@ -1,38 +0,0 @@ -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 - -Route110_TrickHousePuzzle7_MapWarps: @ 853E840 - 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 - 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 - -Route110_TrickHousePuzzle7_MapBGEvents: @ 853E8E8 - bg_event 6, 17, 0, 0, 0, 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/events/Route110_TrickHousePuzzle8.inc b/data/maps/events/Route110_TrickHousePuzzle8.inc deleted file mode 100644 index eacc9e940..000000000 --- a/data/maps/events/Route110_TrickHousePuzzle8.inc +++ /dev/null @@ -1,17 +0,0 @@ -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 - -Route110_TrickHousePuzzle8_MapWarps: @ 853E968 - 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 - -Route110_TrickHousePuzzle8_MapEvents:: @ 853E98C - 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 deleted file mode 100644 index cea2db8d5..000000000 --- a/data/maps/events/Route111.inc +++ /dev/null @@ -1,114 +0,0 @@ -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 - -Route111_MapWarps: @ 8529640 - 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 - 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 - -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 - -Route111_MapEvents:: @ 8529960 - 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 deleted file mode 100644 index 5ade76ba3..000000000 --- a/data/maps/events/Route111_OldLadysRestStop.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -Route111_OldLadysRestStop_MapWarps: @ 8533C30 - 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 deleted file mode 100644 index 0fe5b5df4..000000000 --- a/data/maps/events/Route111_WinstrateFamilysHouse.inc +++ /dev/null @@ -1,13 +0,0 @@ -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 - -Route111_WinstrateFamilysHouse_MapWarps: @ 8533BF4 - 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 deleted file mode 100644 index 0e218cd78..000000000 --- a/data/maps/events/Route112.inc +++ /dev/null @@ -1,32 +0,0 @@ -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 - -Route112_MapWarps: @ 8529AC4 - 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 - bg_event 22, 37, 0, 0, 0, Route112_EventScript_1F1E46 - bg_event 4, 49, 0, 0, 0, Route112_EventScript_1F1E58 - -Route112_MapEvents:: @ 8529B18 - 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 deleted file mode 100644 index 77f37d72c..000000000 --- a/data/maps/events/Route112_CableCarStation.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -Route112_CableCarStation_MapWarps: @ 8533C84 - 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 deleted file mode 100644 index 25287a747..000000000 --- a/data/maps/events/Route113.inc +++ /dev/null @@ -1,57 +0,0 @@ -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 - -Route113_MapWarps: @ 8529CAC - 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 - 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 - -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 - -Route113_MapEvents:: @ 8529E54 - 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 deleted file mode 100644 index 1d5104e1c..000000000 --- a/data/maps/events/Route113_GlassWorkshop.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -Route113_GlassWorkshop_MapWarps: @ 853EAA8 - 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 deleted file mode 100644 index 3e48c5721..000000000 --- a/data/maps/events/Route114.inc +++ /dev/null @@ -1,53 +0,0 @@ -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 - -Route114_MapWarps: @ 852A0F0 - 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 - 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 - -Route114_MapEvents:: @ 852A1A8 - 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 deleted file mode 100644 index c947d9d8f..000000000 --- a/data/maps/events/Route114_FossilManiacsHouse.inc +++ /dev/null @@ -1,17 +0,0 @@ -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 - -Route114_FossilManiacsHouse_MapWarps: @ 8533D14 - 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 - 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 - -Route114_FossilManiacsHouse_MapEvents:: @ 8533D5C - 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 deleted file mode 100644 index 99edadee1..000000000 --- a/data/maps/events/Route114_FossilManiacsTunnel.inc +++ /dev/null @@ -1,15 +0,0 @@ -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 - -Route114_FossilManiacsTunnel_MapWarps: @ 8533D88 - 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 - coord_event 6, 4, 3, 0, VAR_0x40CC, 1, 0, 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/events/Route114_LanettesHouse.inc b/data/maps/events/Route114_LanettesHouse.inc deleted file mode 100644 index 352bb2037..000000000 --- a/data/maps/events/Route114_LanettesHouse.inc +++ /dev/null @@ -1,15 +0,0 @@ -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 - -Route114_LanettesHouse_MapWarps: @ 8533DEC - 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 - bg_event 8, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_22B345 - bg_event 7, 1, 0, 0, 0, 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/events/Route115.inc b/data/maps/events/Route115.inc deleted file mode 100644 index 37d886e7f..000000000 --- a/data/maps/events/Route115.inc +++ /dev/null @@ -1,49 +0,0 @@ -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 - -Route115_MapWarps: @ 852A3E4 - 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 - 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 - -Route115_MapEvents:: @ 852A4A4 - map_events Route115_EventObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents - diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc deleted file mode 100644 index 16afe4482..000000000 --- a/data/maps/events/Route116.inc +++ /dev/null @@ -1,56 +0,0 @@ -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 - -Route116_MapWarps: @ 852A758 - 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 - -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 - -Route116_MapEvents:: @ 852A814 - 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 deleted file mode 100644 index 8d133ab6d..000000000 --- a/data/maps/events/Route116_TunnelersRestHouse.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -Route116_TunnelersRestHouse_MapWarps: @ 8533E7C - 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 deleted file mode 100644 index f84ef6212..000000000 --- a/data/maps/events/Route117.inc +++ /dev/null @@ -1,38 +0,0 @@ -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 - -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 - -Route117_MapEvents:: @ 852AAA0 - 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 deleted file mode 100644 index 05220bdc9..000000000 --- a/data/maps/events/Route117_PokemonDayCare.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -Route117_PokemonDayCare_MapWarps: @ 8533EB8 - 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 deleted file mode 100644 index 5e732890d..000000000 --- a/data/maps/events/Route118.inc +++ /dev/null @@ -1,46 +0,0 @@ -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 - -Route118_MapWarps: @ 852ACAC - 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 - 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 - -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 - -Route118_MapEvents:: @ 852AD58 - map_events Route118_EventObjects, Route118_MapWarps, Route118_MapCoordEvents, Route118_MapBGEvents - diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc deleted file mode 100644 index bd10dc05b..000000000 --- a/data/maps/events/Route119.inc +++ /dev/null @@ -1,99 +0,0 @@ -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 - -Route119_MapWarps: @ 852B174 - 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 - 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 - -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 - -Route119_MapEvents:: @ 852B3E4 - 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 deleted file mode 100644 index 05d426fe5..000000000 --- a/data/maps/events/Route119_House.inc +++ /dev/null @@ -1,16 +0,0 @@ -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 - -Route119_House_MapWarps: @ 853ED78 - 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 deleted file mode 100644 index ee9f42ac5..000000000 --- a/data/maps/events/Route119_WeatherInstitute_1F.inc +++ /dev/null @@ -1,21 +0,0 @@ -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 - -Route119_WeatherInstitute_1F_MapWarps: @ 853EB98 - 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 - 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 - -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/events/Route119_WeatherInstitute_2F.inc b/data/maps/events/Route119_WeatherInstitute_2F.inc deleted file mode 100644 index 4196be41b..000000000 --- a/data/maps/events/Route119_WeatherInstitute_2F.inc +++ /dev/null @@ -1,16 +0,0 @@ -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 - -Route119_WeatherInstitute_2F_MapWarps: @ 853ECB4 - 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 deleted file mode 100644 index a19a70f33..000000000 --- a/data/maps/events/Route120.inc +++ /dev/null @@ -1,90 +0,0 @@ -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 - -Route120_MapWarps: @ 852B818 - 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 - 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 - -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 - -Route120_MapEvents:: @ 852BA00 - map_events Route120_EventObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents - diff --git a/data/maps/events/Route121.inc b/data/maps/events/Route121.inc deleted file mode 100644 index 17ddae47f..000000000 --- a/data/maps/events/Route121.inc +++ /dev/null @@ -1,55 +0,0 @@ -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 - -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 - -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 - -Route121_MapEvents:: @ 852BD8C - 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 deleted file mode 100644 index 2d8351534..000000000 --- a/data/maps/events/Route121_SafariZoneEntrance.inc +++ /dev/null @@ -1,20 +0,0 @@ -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 - -Route121_SafariZoneEntrance_MapWarps: @ 8533F24 - 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 - -Route121_SafariZoneEntrance_MapBGEvents: @ 8533F54 - bg_event 15, 1, 0, 0, 0, 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/events/Route122.inc b/data/maps/events/Route122.inc deleted file mode 100644 index 4c5b9b464..000000000 --- a/data/maps/events/Route122.inc +++ /dev/null @@ -1,6 +0,0 @@ -Route122_MapWarps: @ 852BDA0 - 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 deleted file mode 100644 index 0fc1b015b..000000000 --- a/data/maps/events/Route123.inc +++ /dev/null @@ -1,88 +0,0 @@ -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 - -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 - -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 - -Route123_MapEvents:: @ 852C3B0 - 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 deleted file mode 100644 index 3f4725870..000000000 --- a/data/maps/events/Route123_BerryMastersHouse.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -Route123_BerryMastersHouse_MapWarps: @ 853EAFC - 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 deleted file mode 100644 index 2dc839783..000000000 --- a/data/maps/events/Route124.inc +++ /dev/null @@ -1,23 +0,0 @@ -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 - -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 - -Route124_MapEvents:: @ 852C4F8 - 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 deleted file mode 100644 index 606138e38..000000000 --- a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -Route124_DivingTreasureHuntersHouse_MapWarps: @ 853EDB4 - 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 - -Route124_DivingTreasureHuntersHouse_MapEvents:: @ 853EDD0 - 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 deleted file mode 100644 index b767e512d..000000000 --- a/data/maps/events/Route125.inc +++ /dev/null @@ -1,24 +0,0 @@ -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 - -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 - -Route125_MapEvents:: @ 852C634 - map_events Route125_EventObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents - diff --git a/data/maps/events/Route126.inc b/data/maps/events/Route126.inc deleted file mode 100644 index cf87bb74e..000000000 --- a/data/maps/events/Route126.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -Route126_MapEvents:: @ 852C720 - map_events Route126_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/Route127.inc b/data/maps/events/Route127.inc deleted file mode 100644 index b7c378a96..000000000 --- a/data/maps/events/Route127.inc +++ /dev/null @@ -1,23 +0,0 @@ -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 - -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 - -Route127_MapEvents:: @ 852C878 - map_events Route127_EventObjects, 0x0, 0x0, Route127_MapBGEvents - diff --git a/data/maps/events/Route128.inc b/data/maps/events/Route128.inc deleted file mode 100644 index c34f6eb16..000000000 --- a/data/maps/events/Route128.inc +++ /dev/null @@ -1,20 +0,0 @@ -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 - -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 - -Route128_MapEvents:: @ 852C9A0 - map_events Route128_EventObjects, 0x0, 0x0, Route128_MapBGEvents - diff --git a/data/maps/events/Route129.inc b/data/maps/events/Route129.inc deleted file mode 100644 index 7c1425ebe..000000000 --- a/data/maps/events/Route129.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -Route129_MapEvents:: @ 852CA2C - map_events Route129_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/Route130.inc b/data/maps/events/Route130.inc deleted file mode 100644 index ad1429553..000000000 --- a/data/maps/events/Route130.inc +++ /dev/null @@ -1,9 +0,0 @@ -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 - -Route130_MapEvents:: @ 852CAA0 - map_events Route130_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/Route131.inc b/data/maps/events/Route131.inc deleted file mode 100644 index 2bb2c5cbc..000000000 --- a/data/maps/events/Route131.inc +++ /dev/null @@ -1,16 +0,0 @@ -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 - -Route131_MapWarps: @ 852CB74 - 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/Route132.inc b/data/maps/events/Route132.inc deleted file mode 100644 index 19ff5ccc8..000000000 --- a/data/maps/events/Route132.inc +++ /dev/null @@ -1,15 +0,0 @@ -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 - -Route132_MapEvents:: @ 852CC80 - map_events Route132_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/Route133.inc b/data/maps/events/Route133.inc deleted file mode 100644 index 6adfce330..000000000 --- a/data/maps/events/Route133.inc +++ /dev/null @@ -1,15 +0,0 @@ -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 - -Route133_MapEvents:: @ 852CD84 - map_events Route133_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/Route134.inc b/data/maps/events/Route134.inc deleted file mode 100644 index 5a2d57417..000000000 --- a/data/maps/events/Route134.inc +++ /dev/null @@ -1,16 +0,0 @@ -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 - -Route134_MapEvents:: @ 852CEA0 - map_events Route134_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/RustboroCity.inc b/data/maps/events/RustboroCity.inc deleted file mode 100644 index b71bdb875..000000000 --- a/data/maps/events/RustboroCity.inc +++ /dev/null @@ -1,70 +0,0 @@ -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 - -RustboroCity_MapWarps: @ 8526960 - 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 - 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 - -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 - -RustboroCity_MapEvents:: @ 8526B88 - 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 deleted file mode 100644 index db9b6f56d..000000000 --- a/data/maps/events/RustboroCity_CuttersHouse.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -RustboroCity_CuttersHouse_MapWarps: @ 8530A4C - 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 deleted file mode 100644 index c6d4048c4..000000000 --- a/data/maps/events/RustboroCity_DevonCorp_1F.inc +++ /dev/null @@ -1,17 +0,0 @@ -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 - -RustboroCity_DevonCorp_1F_MapWarps: @ 85303C4 - 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 - bg_event 8, 2, 0, 0, 0, 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/events/RustboroCity_DevonCorp_2F.inc b/data/maps/events/RustboroCity_DevonCorp_2F.inc deleted file mode 100644 index 31a3d1de6..000000000 --- a/data/maps/events/RustboroCity_DevonCorp_2F.inc +++ /dev/null @@ -1,15 +0,0 @@ -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 - -RustboroCity_DevonCorp_2F_MapWarps: @ 8530498 - 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 deleted file mode 100644 index 8db3c085c..000000000 --- a/data/maps/events/RustboroCity_DevonCorp_3F.inc +++ /dev/null @@ -1,15 +0,0 @@ -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 - -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 - -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/events/RustboroCity_Flat1_1F.inc b/data/maps/events/RustboroCity_Flat1_1F.inc deleted file mode 100644 index 1f2ae85fd..000000000 --- a/data/maps/events/RustboroCity_Flat1_1F.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -RustboroCity_Flat1_1F_MapWarps: @ 85308C0 - 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 deleted file mode 100644 index 647e7a437..000000000 --- a/data/maps/events/RustboroCity_Flat1_2F.inc +++ /dev/null @@ -1,16 +0,0 @@ -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 - -RustboroCity_Flat1_2F_MapWarps: @ 85309AC - 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 deleted file mode 100644 index 392f5b1fa..000000000 --- a/data/maps/events/RustboroCity_Flat2_1F.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -RustboroCity_Flat2_1F_MapWarps: @ 8530AF4 - 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 deleted file mode 100644 index 9914eed3c..000000000 --- a/data/maps/events/RustboroCity_Flat2_2F.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -RustboroCity_Flat2_2F_MapWarps: @ 8530B50 - 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 deleted file mode 100644 index 4a67fdc47..000000000 --- a/data/maps/events/RustboroCity_Flat2_3F.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -RustboroCity_Flat2_3F_MapWarps: @ 8530BA4 - 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 deleted file mode 100644 index 193c41685..000000000 --- a/data/maps/events/RustboroCity_Gym.inc +++ /dev/null @@ -1,18 +0,0 @@ -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 - -RustboroCity_Gym_MapWarps: @ 85305B0 - 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 - bg_event 8, 18, 0, 1, 0, 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/events/RustboroCity_House1.inc b/data/maps/events/RustboroCity_House1.inc deleted file mode 100644 index 1d2b2d0b7..000000000 --- a/data/maps/events/RustboroCity_House1.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -RustboroCity_House1_MapWarps: @ 85309F8 - 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 deleted file mode 100644 index 3a4e5e15e..000000000 --- a/data/maps/events/RustboroCity_House2.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -RustboroCity_House2_MapWarps: @ 8530AA0 - 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 deleted file mode 100644 index 07234fc2e..000000000 --- a/data/maps/events/RustboroCity_House3.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -RustboroCity_House3_MapWarps: @ 8530C08 - 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 deleted file mode 100644 index 038d13bf7..000000000 --- a/data/maps/events/RustboroCity_Mart.inc +++ /dev/null @@ -1,13 +0,0 @@ -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 - -RustboroCity_Mart_MapWarps: @ 853086C - 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 deleted file mode 100644 index e2945f435..000000000 --- a/data/maps/events/RustboroCity_PokemonCenter_1F.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -RustboroCity_PokemonCenter_1F_MapWarps: @ 8530754 - 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 deleted file mode 100644 index d1ec1adb9..000000000 --- a/data/maps/events/RustboroCity_PokemonCenter_2F.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -RustboroCity_PokemonCenter_2F_MapWarps: @ 85307E0 - 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 deleted file mode 100644 index 2deabdb5c..000000000 --- a/data/maps/events/RustboroCity_PokemonSchool.inc +++ /dev/null @@ -1,23 +0,0 @@ -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 - -RustboroCity_PokemonSchool_MapWarps: @ 8530694 - 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 - 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 - -RustboroCity_PokemonSchool_MapEvents:: @ 85306E0 - 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 deleted file mode 100644 index e294e200e..000000000 --- a/data/maps/events/RusturfTunnel.inc +++ /dev/null @@ -1,27 +0,0 @@ -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 - -RusturfTunnel_MapWarps: @ 85342B4 - 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 - 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 - -RusturfTunnel_MapEvents:: @ 853431C - map_events RusturfTunnel_EventObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0 - diff --git a/data/maps/events/SSTidalCorridor.inc b/data/maps/events/SSTidalCorridor.inc deleted file mode 100644 index 8f0b1de77..000000000 --- a/data/maps/events/SSTidalCorridor.inc +++ /dev/null @@ -1,35 +0,0 @@ -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 - -SSTidalCorridor_MapWarps: @ 853A1D0 - 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 - 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 - -SSTidalCorridor_MapEvents:: @ 853A2A8 - map_events SSTidalCorridor_EventObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents - diff --git a/data/maps/events/SSTidalLowerDeck.inc b/data/maps/events/SSTidalLowerDeck.inc deleted file mode 100644 index 969830d37..000000000 --- a/data/maps/events/SSTidalLowerDeck.inc +++ /dev/null @@ -1,13 +0,0 @@ -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 - -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 - -SSTidalLowerDeck_MapEvents:: @ 853A300 - map_events SSTidalLowerDeck_EventObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents - diff --git a/data/maps/events/SSTidalRooms.inc b/data/maps/events/SSTidalRooms.inc deleted file mode 100644 index a9900294c..000000000 --- a/data/maps/events/SSTidalRooms.inc +++ /dev/null @@ -1,31 +0,0 @@ -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 - -SSTidalRooms_MapWarps: @ 853A3D4 - 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 - bg_event 15, 12, 0, 0, 0, SSTidalRooms_EventScript_23CA33 - -SSTidalRooms_MapEvents:: @ 853A44C - 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 deleted file mode 100644 index 88b41669b..000000000 --- a/data/maps/events/SafariZone_North.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -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 deleted file mode 100644 index e71ba4dd5..000000000 --- a/data/maps/events/SafariZone_Northeast.inc +++ /dev/null @@ -1,18 +0,0 @@ -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 - -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_EventObjects, 0x0, 0x0, SafariZone_Northeast_MapBGEvents - diff --git a/data/maps/events/SafariZone_Northwest.inc b/data/maps/events/SafariZone_Northwest.inc deleted file mode 100644 index 8e5b242b9..000000000 --- a/data/maps/events/SafariZone_Northwest.inc +++ /dev/null @@ -1,7 +0,0 @@ -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 - -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 deleted file mode 100644 index 0607ffcc7..000000000 --- a/data/maps/events/SafariZone_RestHouse.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -SafariZone_RestHouse_MapWarps: @ 853B944 - 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 deleted file mode 100644 index 46173d11a..000000000 --- a/data/maps/events/SafariZone_South.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -SafariZone_South_MapWarps: @ 853B334 - 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_Southeast.inc b/data/maps/events/SafariZone_Southeast.inc deleted file mode 100644 index af2da0575..000000000 --- a/data/maps/events/SafariZone_Southeast.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -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_EventObjects, 0x0, 0x0, SafariZone_Southeast_MapBGEvents - diff --git a/data/maps/events/SafariZone_Southwest.inc b/data/maps/events/SafariZone_Southwest.inc deleted file mode 100644 index ccd775dd2..000000000 --- a/data/maps/events/SafariZone_Southwest.inc +++ /dev/null @@ -1,13 +0,0 @@ -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 - -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 - -SafariZone_Southwest_MapEvents:: @ 853B290 - 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 deleted file mode 100644 index 588b7a9ae..000000000 --- a/data/maps/events/ScorchedSlab.inc +++ /dev/null @@ -1,9 +0,0 @@ -ScorchedSlab_EventObjects: @ 8536F88 - 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 - -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 deleted file mode 100644 index e27362f00..000000000 --- a/data/maps/events/SeafloorCavern_Entrance.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -SeafloorCavern_Entrance_MapWarps: @ 85356D4 - 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 deleted file mode 100644 index 261314b9b..000000000 --- a/data/maps/events/SeafloorCavern_Room1.inc +++ /dev/null @@ -1,15 +0,0 @@ -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 - -SeafloorCavern_Room1_MapWarps: @ 8535770 - 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 deleted file mode 100644 index 01f6f3ba5..000000000 --- a/data/maps/events/SeafloorCavern_Room2.inc +++ /dev/null @@ -1,19 +0,0 @@ -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 - -SeafloorCavern_Room2_MapWarps: @ 853585C - 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 deleted file mode 100644 index 300db40c5..000000000 --- a/data/maps/events/SeafloorCavern_Room3.inc +++ /dev/null @@ -1,19 +0,0 @@ -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 - -SeafloorCavern_Room3_MapWarps: @ 8535968 - 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 deleted file mode 100644 index 6b6df78f2..000000000 --- a/data/maps/events/SeafloorCavern_Room4.inc +++ /dev/null @@ -1,13 +0,0 @@ -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 - -SeafloorCavern_Room4_MapWarps: @ 85359C4 - 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 deleted file mode 100644 index 97787ebbf..000000000 --- a/data/maps/events/SeafloorCavern_Room5.inc +++ /dev/null @@ -1,16 +0,0 @@ -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 - -SeafloorCavern_Room5_MapWarps: @ 8535A88 - 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 deleted file mode 100644 index 99c10d87e..000000000 --- a/data/maps/events/SeafloorCavern_Room6.inc +++ /dev/null @@ -1,8 +0,0 @@ -SeafloorCavern_Room6_MapWarps: @ 8535AB4 - 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 deleted file mode 100644 index 2d8fca999..000000000 --- a/data/maps/events/SeafloorCavern_Room7.inc +++ /dev/null @@ -1,7 +0,0 @@ -SeafloorCavern_Room7_MapWarps: @ 8535AE0 - 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 deleted file mode 100644 index 42dcf9faa..000000000 --- a/data/maps/events/SeafloorCavern_Room8.inc +++ /dev/null @@ -1,21 +0,0 @@ -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 - -SeafloorCavern_Room8_MapWarps: @ 8535C24 - 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 deleted file mode 100644 index ac3337bed..000000000 --- a/data/maps/events/SeafloorCavern_Room9.inc +++ /dev/null @@ -1,18 +0,0 @@ -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 - -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 - -SeafloorCavern_Room9_MapEvents:: @ 8535D08 - map_events SeafloorCavern_Room9_EventObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0 - diff --git a/data/maps/events/SealedChamber_InnerRoom.inc b/data/maps/events/SealedChamber_InnerRoom.inc deleted file mode 100644 index dd331570e..000000000 --- a/data/maps/events/SealedChamber_InnerRoom.inc +++ /dev/null @@ -1,17 +0,0 @@ -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 - -SealedChamber_InnerRoom_MapEvents:: @ 8536F74 - map_events 0x0, SealedChamber_InnerRoom_MapWarps, 0x0, SealedChamber_InnerRoom_MapBGEvents - diff --git a/data/maps/events/SealedChamber_OuterRoom.inc b/data/maps/events/SealedChamber_OuterRoom.inc deleted file mode 100644 index 0181f3193..000000000 --- a/data/maps/events/SealedChamber_OuterRoom.inc +++ /dev/null @@ -1,37 +0,0 @@ -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 - -SealedChamber_OuterRoom_MapEvents:: @ 8536EEC - map_events 0x0, SealedChamber_OuterRoom_MapWarps, 0x0, SealedChamber_OuterRoom_MapBGEvents - diff --git a/data/maps/events/SecretBase_BlueCave1.inc b/data/maps/events/SecretBase_BlueCave1.inc deleted file mode 100644 index 2905764cf..000000000 --- a/data/maps/events/SecretBase_BlueCave1.inc +++ /dev/null @@ -1,23 +0,0 @@ -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 - -SecretBase_BlueCave1_MapWarps: @ 8537D54 - 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 deleted file mode 100644 index 8202b7a42..000000000 --- a/data/maps/events/SecretBase_BlueCave2.inc +++ /dev/null @@ -1,23 +0,0 @@ -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 - -SecretBase_BlueCave2_MapWarps: @ 853866C - 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 deleted file mode 100644 index 733b674b7..000000000 --- a/data/maps/events/SecretBase_BlueCave3.inc +++ /dev/null @@ -1,23 +0,0 @@ -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 - -SecretBase_BlueCave3_MapWarps: @ 8538F84 - 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 deleted file mode 100644 index afd1622b8..000000000 --- a/data/maps/events/SecretBase_BlueCave4.inc +++ /dev/null @@ -1,23 +0,0 @@ -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 - -SecretBase_BlueCave4_MapWarps: @ 853989C - 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 deleted file mode 100644 index e4fffab49..000000000 --- a/data/maps/events/SecretBase_BrownCave1.inc +++ /dev/null @@ -1,23 +0,0 @@ -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 - -SecretBase_BrownCave1_MapWarps: @ 8537BD0 - 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 deleted file mode 100644 index 29e90b592..000000000 --- a/data/maps/events/SecretBase_BrownCave2.inc +++ /dev/null @@ -1,23 +0,0 @@ -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 - -SecretBase_BrownCave2_MapWarps: @ 85384E8 - 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 deleted file mode 100644 index 3322b9d5a..000000000 --- a/data/maps/events/SecretBase_BrownCave3.inc +++ /dev/null @@ -1,23 +0,0 @@ -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 - -SecretBase_BrownCave3_MapWarps: @ 8538E00 - 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 deleted file mode 100644 index 310033947..000000000 --- a/data/maps/events/SecretBase_BrownCave4.inc +++ /dev/null @@ -1,23 +0,0 @@ -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 - -SecretBase_BrownCave4_MapWarps: @ 8539718 - 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 deleted file mode 100644 index eba992586..000000000 --- a/data/maps/events/SecretBase_RedCave1.inc +++ /dev/null @@ -1,23 +0,0 @@ -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 - -SecretBase_RedCave1_MapWarps: @ 8537A4C - 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 deleted file mode 100644 index c6f534965..000000000 --- a/data/maps/events/SecretBase_RedCave2.inc +++ /dev/null @@ -1,23 +0,0 @@ -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 - -SecretBase_RedCave2_MapWarps: @ 8538364 - 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 deleted file mode 100644 index dda054b44..000000000 --- a/data/maps/events/SecretBase_RedCave3.inc +++ /dev/null @@ -1,23 +0,0 @@ -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 - -SecretBase_RedCave3_MapWarps: @ 8538C7C - 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 deleted file mode 100644 index 54e33dc3d..000000000 --- a/data/maps/events/SecretBase_RedCave4.inc +++ /dev/null @@ -1,23 +0,0 @@ -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 - -SecretBase_RedCave4_MapWarps: @ 8539594 - 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 deleted file mode 100644 index acdac9692..000000000 --- a/data/maps/events/SecretBase_Shrub1.inc +++ /dev/null @@ -1,23 +0,0 @@ -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 - -SecretBase_Shrub1_MapWarps: @ 85381E0 - 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 deleted file mode 100644 index a370d2e72..000000000 --- a/data/maps/events/SecretBase_Shrub2.inc +++ /dev/null @@ -1,23 +0,0 @@ -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 - -SecretBase_Shrub2_MapWarps: @ 8538AF8 - 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 deleted file mode 100644 index 942be3617..000000000 --- a/data/maps/events/SecretBase_Shrub3.inc +++ /dev/null @@ -1,23 +0,0 @@ -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 - -SecretBase_Shrub3_MapWarps: @ 8539410 - 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 deleted file mode 100644 index a027b266b..000000000 --- a/data/maps/events/SecretBase_Shrub4.inc +++ /dev/null @@ -1,23 +0,0 @@ -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 - -SecretBase_Shrub4_MapWarps: @ 8539D28 - 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 deleted file mode 100644 index 3379e8ecb..000000000 --- a/data/maps/events/SecretBase_Tree1.inc +++ /dev/null @@ -1,23 +0,0 @@ -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 - -SecretBase_Tree1_MapWarps: @ 853805C - 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 deleted file mode 100644 index e330951cf..000000000 --- a/data/maps/events/SecretBase_Tree2.inc +++ /dev/null @@ -1,23 +0,0 @@ -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 - -SecretBase_Tree2_MapWarps: @ 8538974 - 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 deleted file mode 100644 index b4a8c2eb3..000000000 --- a/data/maps/events/SecretBase_Tree3.inc +++ /dev/null @@ -1,23 +0,0 @@ -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 - -SecretBase_Tree3_MapWarps: @ 853928C - 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 deleted file mode 100644 index 4c57fcdfd..000000000 --- a/data/maps/events/SecretBase_Tree4.inc +++ /dev/null @@ -1,23 +0,0 @@ -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 - -SecretBase_Tree4_MapWarps: @ 8539BA4 - 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 deleted file mode 100644 index e7f4ed7ce..000000000 --- a/data/maps/events/SecretBase_YellowCave1.inc +++ /dev/null @@ -1,23 +0,0 @@ -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 - -SecretBase_YellowCave1_MapWarps: @ 8537ED8 - 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 deleted file mode 100644 index 84aabf3d4..000000000 --- a/data/maps/events/SecretBase_YellowCave2.inc +++ /dev/null @@ -1,23 +0,0 @@ -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 - -SecretBase_YellowCave2_MapWarps: @ 85387F0 - 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 deleted file mode 100644 index 2e1d61708..000000000 --- a/data/maps/events/SecretBase_YellowCave3.inc +++ /dev/null @@ -1,23 +0,0 @@ -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 - -SecretBase_YellowCave3_MapWarps: @ 8539108 - 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 deleted file mode 100644 index 07ac363ac..000000000 --- a/data/maps/events/SecretBase_YellowCave4.inc +++ /dev/null @@ -1,23 +0,0 @@ -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 - -SecretBase_YellowCave4_MapWarps: @ 8539A20 - 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_HighTideEntranceRoom.inc b/data/maps/events/ShoalCave_HighTideEntranceRoom.inc deleted file mode 100644 index e04abe693..000000000 --- a/data/maps/events/ShoalCave_HighTideEntranceRoom.inc +++ /dev/null @@ -1,3 +0,0 @@ -ShoalCave_HighTideEntranceRoom_MapEvents:: @ 853644C - map_events 0x0, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/ShoalCave_HighTideInnerRoom.inc b/data/maps/events/ShoalCave_HighTideInnerRoom.inc deleted file mode 100644 index 20d59a56f..000000000 --- a/data/maps/events/ShoalCave_HighTideInnerRoom.inc +++ /dev/null @@ -1,3 +0,0 @@ -ShoalCave_HighTideInnerRoom_MapEvents:: @ 8536460 - map_events 0x0, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc deleted file mode 100644 index 1f4a008e3..000000000 --- a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc +++ /dev/null @@ -1,13 +0,0 @@ -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 - -ShoalCave_LowTideEntranceRoom_MapWarps: @ 85362AC - 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 deleted file mode 100644 index 57922e322..000000000 --- a/data/maps/events/ShoalCave_LowTideIceRoom.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -ShoalCave_LowTideIceRoom_MapWarps: @ 8537130 - 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 deleted file mode 100644 index f1d894264..000000000 --- a/data/maps/events/ShoalCave_LowTideInnerRoom.inc +++ /dev/null @@ -1,24 +0,0 @@ -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 - -ShoalCave_LowTideInnerRoom_MapWarps: @ 85362F8 - 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 - 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 - -ShoalCave_LowTideInnerRoom_MapEvents:: @ 8536380 - 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 deleted file mode 100644 index d3d656452..000000000 --- a/data/maps/events/ShoalCave_LowTideLowerRoom.inc +++ /dev/null @@ -1,16 +0,0 @@ -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 - -ShoalCave_LowTideLowerRoom_MapWarps: @ 853640C - 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 - -ShoalCave_LowTideLowerRoom_MapEvents:: @ 8536438 - 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 deleted file mode 100644 index 875f337a5..000000000 --- a/data/maps/events/ShoalCave_LowTideStairsRoom.inc +++ /dev/null @@ -1,13 +0,0 @@ -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 - -ShoalCave_LowTideStairsRoom_MapWarps: @ 85363AC - 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 - -ShoalCave_LowTideStairsRoom_MapEvents:: @ 85363C8 - 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 deleted file mode 100644 index 4ef0de89f..000000000 --- a/data/maps/events/SingleBattleColosseum.inc +++ /dev/null @@ -1,14 +0,0 @@ -SingleBattleColosseum_EventObjects: @ 8539D44 - 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 - 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 - -SingleBattleColosseum_MapEvents:: @ 8539D8C - map_events SingleBattleColosseum_EventObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0 - diff --git a/data/maps/events/SkyPillar_1F.inc b/data/maps/events/SkyPillar_1F.inc deleted file mode 100644 index 59ac1aac0..000000000 --- a/data/maps/events/SkyPillar_1F.inc +++ /dev/null @@ -1,8 +0,0 @@ -SkyPillar_1F_MapWarps: @ 8537058 - 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 deleted file mode 100644 index 780db9ccc..000000000 --- a/data/maps/events/SkyPillar_2F.inc +++ /dev/null @@ -1,7 +0,0 @@ -SkyPillar_2F_MapWarps: @ 8537084 - 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 deleted file mode 100644 index 2e7697395..000000000 --- a/data/maps/events/SkyPillar_3F.inc +++ /dev/null @@ -1,8 +0,0 @@ -SkyPillar_3F_MapWarps: @ 85370A8 - 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 deleted file mode 100644 index 248e36f95..000000000 --- a/data/maps/events/SkyPillar_4F.inc +++ /dev/null @@ -1,8 +0,0 @@ -SkyPillar_4F_MapWarps: @ 85370D4 - 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 deleted file mode 100644 index c0acb14c0..000000000 --- a/data/maps/events/SkyPillar_5F.inc +++ /dev/null @@ -1,7 +0,0 @@ -SkyPillar_5F_MapWarps: @ 853714C - 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 deleted file mode 100644 index 92cf0da9b..000000000 --- a/data/maps/events/SkyPillar_Entrance.inc +++ /dev/null @@ -1,7 +0,0 @@ -SkyPillar_Entrance_MapWarps: @ 8536FF8 - 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 deleted file mode 100644 index 4fb4cc010..000000000 --- a/data/maps/events/SkyPillar_Outside.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -SkyPillar_Outside_MapWarps: @ 8537034 - 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 deleted file mode 100644 index 26bccf67f..000000000 --- a/data/maps/events/SkyPillar_Top.inc +++ /dev/null @@ -1,13 +0,0 @@ -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 - -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 - -SkyPillar_Top_MapEvents:: @ 85371B8 - 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 deleted file mode 100644 index b8480dfb6..000000000 --- a/data/maps/events/SlateportCity.inc +++ /dev/null @@ -1,71 +0,0 @@ -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 - -SlateportCity_MapWarps: @ 8526514 - 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 - -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 - -SlateportCity_MapEvents:: @ 8526618 - 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 deleted file mode 100644 index ce13a5899..000000000 --- a/data/maps/events/SlateportCity_BattleTentBattleRoom.inc +++ /dev/null @@ -1,8 +0,0 @@ -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 - -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 deleted file mode 100644 index b56b50a0e..000000000 --- a/data/maps/events/SlateportCity_BattleTentCorridor.inc +++ /dev/null @@ -1,6 +0,0 @@ -SlateportCity_BattleTentCorridor_EventObjects: @ 852F4B0 - 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 deleted file mode 100644 index 0ceca119b..000000000 --- a/data/maps/events/SlateportCity_BattleTentLobby.inc +++ /dev/null @@ -1,17 +0,0 @@ -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 - -SlateportCity_BattleTentLobby_MapWarps: @ 852F480 - 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 - -SlateportCity_BattleTentLobby_MapEvents:: @ 852F49C - 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 deleted file mode 100644 index af274e22f..000000000 --- a/data/maps/events/SlateportCity_Harbor.inc +++ /dev/null @@ -1,25 +0,0 @@ -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 - -SlateportCity_Harbor_MapWarps: @ 852FB28 - 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 - 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 - -SlateportCity_Harbor_MapEvents:: @ 852FB88 - 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 deleted file mode 100644 index 493bb2922..000000000 --- a/data/maps/events/SlateportCity_House1.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -SlateportCity_House1_MapWarps: @ 852F550 - 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 deleted file mode 100644 index 42d0e3660..000000000 --- a/data/maps/events/SlateportCity_House2.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -SlateportCity_House2_MapWarps: @ 852FBCC - 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 deleted file mode 100644 index d6391598e..000000000 --- a/data/maps/events/SlateportCity_Mart.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -SlateportCity_Mart_MapWarps: @ 852FD38 - 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 deleted file mode 100644 index cfe385a3c..000000000 --- a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc +++ /dev/null @@ -1,43 +0,0 @@ -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 - -SlateportCity_OceanicMuseum_1F_MapWarps: @ 852F7C0 - 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 - coord_event 10, 7, 3, 0, VAR_0x40AA, 0, 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 - -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/events/SlateportCity_OceanicMuseum_2F.inc b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc deleted file mode 100644 index dc0c8a8d9..000000000 --- a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc +++ /dev/null @@ -1,38 +0,0 @@ -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 - -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 - -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/events/SlateportCity_PokemonCenter_1F.inc b/data/maps/events/SlateportCity_PokemonCenter_1F.inc deleted file mode 100644 index f59413aba..000000000 --- a/data/maps/events/SlateportCity_PokemonCenter_1F.inc +++ /dev/null @@ -1,13 +0,0 @@ -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 - -SlateportCity_PokemonCenter_1F_MapWarps: @ 852FC38 - 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 deleted file mode 100644 index f59512311..000000000 --- a/data/maps/events/SlateportCity_PokemonCenter_2F.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -SlateportCity_PokemonCenter_2F_MapWarps: @ 852FCC4 - 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 deleted file mode 100644 index 92974f5b4..000000000 --- a/data/maps/events/SlateportCity_PokemonFanClub.inc +++ /dev/null @@ -1,18 +0,0 @@ -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 - -SlateportCity_PokemonFanClub_MapWarps: @ 852F64C - 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 deleted file mode 100644 index b231f9816..000000000 --- a/data/maps/events/SlateportCity_SternsShipyard_1F.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -SlateportCity_SternsShipyard_1F_MapWarps: @ 852F378 - 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 deleted file mode 100644 index 450f40fe7..000000000 --- a/data/maps/events/SlateportCity_SternsShipyard_2F.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -SlateportCity_SternsShipyard_2F_MapWarps: @ 852F3EC - 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 deleted file mode 100644 index 96aaefd9c..000000000 --- a/data/maps/events/SootopolisCity.inc +++ /dev/null @@ -1,46 +0,0 @@ -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 - -SootopolisCity_MapWarps: @ 85274C4 - 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 - 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 - -SootopolisCity_MapEvents:: @ 8527574 - 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 deleted file mode 100644 index 925acc34b..000000000 --- a/data/maps/events/SootopolisCity_Gym_1F.inc +++ /dev/null @@ -1,16 +0,0 @@ -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 - -SootopolisCity_Gym_1F_MapWarps: @ 8533024 - 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 - bg_event 10, 24, 0, 1, 0, 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/events/SootopolisCity_Gym_B1F.inc b/data/maps/events/SootopolisCity_Gym_B1F.inc deleted file mode 100644 index 1ed20fc94..000000000 --- a/data/maps/events/SootopolisCity_Gym_B1F.inc +++ /dev/null @@ -1,18 +0,0 @@ -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 - -SootopolisCity_Gym_B1F_MapWarps: @ 8533158 - 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 deleted file mode 100644 index 4ddbd23ea..000000000 --- a/data/maps/events/SootopolisCity_House1.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -SootopolisCity_House1_MapWarps: @ 8533328 - 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 deleted file mode 100644 index 213fe39d3..000000000 --- a/data/maps/events/SootopolisCity_House2.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -SootopolisCity_House2_MapWarps: @ 8533364 - 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 deleted file mode 100644 index 0feca97cb..000000000 --- a/data/maps/events/SootopolisCity_House3.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -SootopolisCity_House3_MapWarps: @ 85333B8 - 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 deleted file mode 100644 index 1f14ba6e9..000000000 --- a/data/maps/events/SootopolisCity_House4.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -SootopolisCity_House4_MapWarps: @ 8533424 - 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 deleted file mode 100644 index 566631c02..000000000 --- a/data/maps/events/SootopolisCity_House5.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -SootopolisCity_House5_MapWarps: @ 8533478 - 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 deleted file mode 100644 index a85356317..000000000 --- a/data/maps/events/SootopolisCity_House6.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -SootopolisCity_House6_MapWarps: @ 85334B4 - 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 deleted file mode 100644 index 65b0cf9dd..000000000 --- a/data/maps/events/SootopolisCity_House7.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -SootopolisCity_House7_MapWarps: @ 8533508 - 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 deleted file mode 100644 index 84e642bac..000000000 --- a/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc +++ /dev/null @@ -1,15 +0,0 @@ -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 - -SootopolisCity_LotadAndSeedotHouse_MapWarps: @ 853355C - 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 - bg_event 2, 1, 0, 0, 0, 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/events/SootopolisCity_Mart.inc b/data/maps/events/SootopolisCity_Mart.inc deleted file mode 100644 index 0c32cb482..000000000 --- a/data/maps/events/SootopolisCity_Mart.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -SootopolisCity_Mart_MapWarps: @ 85332D4 - 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 deleted file mode 100644 index bf06c2cd9..000000000 --- a/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -SootopolisCity_MysteryEventsHouse_1F_MapWarps: @ 85335B0 - 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 deleted file mode 100644 index 21ea255a4..000000000 --- a/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc +++ /dev/null @@ -1,9 +0,0 @@ -SootopolisCity_MysteryEventsHouse_B1F_EventObjects: @ 85335DC - 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 - -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 deleted file mode 100644 index 9bca02a56..000000000 --- a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -SootopolisCity_PokemonCenter_1F_MapWarps: @ 85331D4 - 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 deleted file mode 100644 index 8498f9de2..000000000 --- a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -SootopolisCity_PokemonCenter_2F_MapWarps: @ 8533260 - 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 deleted file mode 100644 index 69cddf603..000000000 --- a/data/maps/events/SouthernIsland_Exterior.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -SouthernIsland_Exterior_MapWarps: @ 853B86C - 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 - -SouthernIsland_Exterior_MapEvents:: @ 853B888 - 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 deleted file mode 100644 index c31a5568b..000000000 --- a/data/maps/events/SouthernIsland_Interior.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -SouthernIsland_Interior_MapWarps: @ 853B8CC - 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 - -SouthernIsland_Interior_MapEvents:: @ 853B8E8 - 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 deleted file mode 100644 index 61edb1e28..000000000 --- a/data/maps/events/TerraCave_End.inc +++ /dev/null @@ -1,12 +0,0 @@ -TerraCave_End_EventObjects: @ 8537850 - 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 - -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_EventObjects, TerraCave_End_MapWarps, TerraCave_End_MapCoordEvents, 0x0 - diff --git a/data/maps/events/TerraCave_Entrance.inc b/data/maps/events/TerraCave_Entrance.inc deleted file mode 100644 index a176c548d..000000000 --- a/data/maps/events/TerraCave_Entrance.inc +++ /dev/null @@ -1,7 +0,0 @@ -TerraCave_Entrance_MapWarps: @ 853782C - 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 deleted file mode 100644 index 89e5eac90..000000000 --- a/data/maps/events/TradeCenter.inc +++ /dev/null @@ -1,14 +0,0 @@ -TradeCenter_EventObjects: @ 8539DA0 - 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 - 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 - -TradeCenter_MapEvents:: @ 8539DE8 - map_events TradeCenter_EventObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0 - diff --git a/data/maps/events/TrainerHill_1F.inc b/data/maps/events/TrainerHill_1F.inc deleted file mode 100644 index 2a2428f57..000000000 --- a/data/maps/events/TrainerHill_1F.inc +++ /dev/null @@ -1,7 +0,0 @@ -TrainerHill_1F_MapWarps: @ 853D934 - 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 deleted file mode 100644 index ca50380d5..000000000 --- a/data/maps/events/TrainerHill_2F.inc +++ /dev/null @@ -1,7 +0,0 @@ -TrainerHill_2F_MapWarps: @ 853D958 - 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 deleted file mode 100644 index e12394655..000000000 --- a/data/maps/events/TrainerHill_3F.inc +++ /dev/null @@ -1,7 +0,0 @@ -TrainerHill_3F_MapWarps: @ 853D97C - 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 deleted file mode 100644 index e9696de15..000000000 --- a/data/maps/events/TrainerHill_4F.inc +++ /dev/null @@ -1,7 +0,0 @@ -TrainerHill_4F_MapWarps: @ 853D9A0 - 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 deleted file mode 100644 index 7af4c5425..000000000 --- a/data/maps/events/TrainerHill_Elevator.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -TrainerHill_Elevator_MapWarps: @ 853DD9C - 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 deleted file mode 100644 index 4b974ce9b..000000000 --- a/data/maps/events/TrainerHill_Entrance.inc +++ /dev/null @@ -1,21 +0,0 @@ -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 - -TrainerHill_Entrance_MapWarps: @ 853D8EC - 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 - -TrainerHill_Entrance_MapBGEvents: @ 853D914 - bg_event 8, 10, 0, 1, 0, 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/events/TrainerHill_Roof.inc b/data/maps/events/TrainerHill_Roof.inc deleted file mode 100644 index c322d7e96..000000000 --- a/data/maps/events/TrainerHill_Roof.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -TrainerHill_Roof_MapWarps: @ 853D9DC - 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/Underwater1.inc b/data/maps/events/Underwater1.inc deleted file mode 100644 index 08cf19a4c..000000000 --- a/data/maps/events/Underwater1.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -Underwater1_MapEvents:: @ 852CF08 - map_events 0x0, 0x0, 0x0, Underwater1_MapBGEvents - diff --git a/data/maps/events/Underwater2.inc b/data/maps/events/Underwater2.inc deleted file mode 100644 index 416e9fe86..000000000 --- a/data/maps/events/Underwater2.inc +++ /dev/null @@ -1,16 +0,0 @@ -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 - -Underwater2_MapEvents:: @ 852CF84 - map_events 0x0, Underwater2_MapWarps, 0x0, Underwater2_MapBGEvents - diff --git a/data/maps/events/Underwater3.inc b/data/maps/events/Underwater3.inc deleted file mode 100644 index ba8ed9508..000000000 --- a/data/maps/events/Underwater3.inc +++ /dev/null @@ -1,13 +0,0 @@ -Underwater3_MapWarps: @ 852CF98 - 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 - 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 - -Underwater3_MapEvents:: @ 852CFD8 - map_events 0x0, Underwater3_MapWarps, 0x0, Underwater3_MapBGEvents - diff --git a/data/maps/events/Underwater4.inc b/data/maps/events/Underwater4.inc deleted file mode 100644 index 5f8b99b64..000000000 --- a/data/maps/events/Underwater4.inc +++ /dev/null @@ -1,10 +0,0 @@ -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 - -Underwater4_MapEvents:: @ 852D00C - map_events 0x0, Underwater4_MapWarps, 0x0, Underwater4_MapBGEvents - diff --git a/data/maps/events/Underwater5.inc b/data/maps/events/Underwater5.inc deleted file mode 100644 index 4b902cf96..000000000 --- a/data/maps/events/Underwater5.inc +++ /dev/null @@ -1,7 +0,0 @@ -Underwater5_MapWarps: @ 852D020 - 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 deleted file mode 100644 index a624efba3..000000000 --- a/data/maps/events/Underwater6.inc +++ /dev/null @@ -1,7 +0,0 @@ -Underwater6_MapWarps: @ 852D044 - 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 deleted file mode 100644 index fba9324f6..000000000 --- a/data/maps/events/Underwater7.inc +++ /dev/null @@ -1,7 +0,0 @@ -Underwater7_MapWarps: @ 852D068 - 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 deleted file mode 100644 index 685abaa16..000000000 --- a/data/maps/events/Underwater_MarineCave.inc +++ /dev/null @@ -1,6 +0,0 @@ -Underwater_MarineCave_MapWarps: @ 85377B0 - 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 deleted file mode 100644 index 3a5219511..000000000 --- a/data/maps/events/Underwater_Route134.inc +++ /dev/null @@ -1,6 +0,0 @@ -Underwater_Route134_MapWarps: @ 8536D44 - 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 deleted file mode 100644 index a22465ca0..000000000 --- a/data/maps/events/Underwater_SeafloorCavern.inc +++ /dev/null @@ -1,12 +0,0 @@ -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 - -Underwater_SeafloorCavern_MapWarps: @ 85356A0 - 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 deleted file mode 100644 index 350cca5d6..000000000 --- a/data/maps/events/Underwater_SealedChamber.inc +++ /dev/null @@ -1,9 +0,0 @@ -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 - -Underwater_SealedChamber_MapEvents:: @ 8536D74 - map_events 0x0, Underwater_SealedChamber_MapWarps, 0x0, Underwater_SealedChamber_MapBGEvents - diff --git a/data/maps/events/Underwater_SootopolisCity.inc b/data/maps/events/Underwater_SootopolisCity.inc deleted file mode 100644 index 78839e8a1..000000000 --- a/data/maps/events/Underwater_SootopolisCity.inc +++ /dev/null @@ -1,7 +0,0 @@ -Underwater_SootopolisCity_MapWarps: @ 8534330 - 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 deleted file mode 100644 index 1a50ea7d8..000000000 --- a/data/maps/events/UnionRoom.inc +++ /dev/null @@ -1,18 +0,0 @@ -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 - -UnionRoom_MapWarps: @ 853B0F8 - 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/UnknownMap_25_29.inc b/data/maps/events/UnknownMap_25_29.inc deleted file mode 100644 index 13ea1b8b9..000000000 --- a/data/maps/events/UnknownMap_25_29.inc +++ /dev/null @@ -1 +0,0 @@ -UnknownMap_25_29_MapEvents:: @ 853A064 diff --git a/data/maps/events/UnknownMap_25_30.inc b/data/maps/events/UnknownMap_25_30.inc deleted file mode 100644 index 0e221e240..000000000 --- a/data/maps/events/UnknownMap_25_30.inc +++ /dev/null @@ -1 +0,0 @@ -UnknownMap_25_30_MapEvents:: @ 853A064 diff --git a/data/maps/events/UnknownMap_25_31.inc b/data/maps/events/UnknownMap_25_31.inc deleted file mode 100644 index 99e450de5..000000000 --- a/data/maps/events/UnknownMap_25_31.inc +++ /dev/null @@ -1 +0,0 @@ -UnknownMap_25_31_MapEvents:: @ 853A064 diff --git a/data/maps/events/UnknownMap_25_32.inc b/data/maps/events/UnknownMap_25_32.inc deleted file mode 100644 index c48eedb17..000000000 --- a/data/maps/events/UnknownMap_25_32.inc +++ /dev/null @@ -1 +0,0 @@ -UnknownMap_25_32_MapEvents:: @ 853A064 diff --git a/data/maps/events/UnknownMap_25_33.inc b/data/maps/events/UnknownMap_25_33.inc deleted file mode 100644 index 14f4571d2..000000000 --- a/data/maps/events/UnknownMap_25_33.inc +++ /dev/null @@ -1 +0,0 @@ -UnknownMap_25_33_MapEvents:: @ 853A064 diff --git a/data/maps/events/UnknownMap_25_34.inc b/data/maps/events/UnknownMap_25_34.inc deleted file mode 100644 index 975f08470..000000000 --- a/data/maps/events/UnknownMap_25_34.inc +++ /dev/null @@ -1,3 +0,0 @@ -UnknownMap_25_34_MapEvents:: @ 853A064 - map_events LinkContestRoom1_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/VerdanturfTown.inc b/data/maps/events/VerdanturfTown.inc deleted file mode 100644 index c844cfa1a..000000000 --- a/data/maps/events/VerdanturfTown.inc +++ /dev/null @@ -1,28 +0,0 @@ -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 - -VerdanturfTown_MapWarps: @ 8527D3C - 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 - 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 - -VerdanturfTown_MapEvents:: @ 8527DD4 - 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 deleted file mode 100644 index 6276192b3..000000000 --- a/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc +++ /dev/null @@ -1,8 +0,0 @@ -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 - -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 deleted file mode 100644 index 4fa836d58..000000000 --- a/data/maps/events/VerdanturfTown_BattleTentCorridor.inc +++ /dev/null @@ -1,6 +0,0 @@ -VerdanturfTown_BattleTentCorridor_EventObjects: @ 852E708 - 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 deleted file mode 100644 index 570e600fe..000000000 --- a/data/maps/events/VerdanturfTown_BattleTentLobby.inc +++ /dev/null @@ -1,18 +0,0 @@ -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 - -VerdanturfTown_BattleTentLobby_MapWarps: @ 852E6D8 - 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 - -VerdanturfTown_BattleTentLobby_MapEvents:: @ 852E6F4 - 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 deleted file mode 100644 index fd5fa0292..000000000 --- a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -VerdanturfTown_FriendshipRatersHouse_MapWarps: @ 852E9F8 - 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 deleted file mode 100644 index 49b8d47ee..000000000 --- a/data/maps/events/VerdanturfTown_House.inc +++ /dev/null @@ -1,11 +0,0 @@ -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 - -VerdanturfTown_House_MapWarps: @ 852EA4C - 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 deleted file mode 100644 index 804f39647..000000000 --- a/data/maps/events/VerdanturfTown_Mart.inc +++ /dev/null @@ -1,13 +0,0 @@ -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 - -VerdanturfTown_Mart_MapWarps: @ 852E7F0 - 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 deleted file mode 100644 index 77bd6748c..000000000 --- a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -VerdanturfTown_PokemonCenter_1F_MapWarps: @ 852E874 - 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 deleted file mode 100644 index 40cbe6aec..000000000 --- a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -VerdanturfTown_PokemonCenter_2F_MapWarps: @ 852E900 - 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 deleted file mode 100644 index cfa46e102..000000000 --- a/data/maps/events/VerdanturfTown_WandasHouse.inc +++ /dev/null @@ -1,14 +0,0 @@ -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 - -VerdanturfTown_WandasHouse_MapWarps: @ 852E9A4 - 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 deleted file mode 100644 index d5fa881dc..000000000 --- a/data/maps/events/VictoryRoad_1F.inc +++ /dev/null @@ -1,28 +0,0 @@ -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 - -VictoryRoad_1F_MapWarps: @ 8535EDC - 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 - coord_event 3, 23, 4, 0, VAR_0x40C3, 0, 0, VictoryRoad_1F_EventScript_235DC8 - -VictoryRoad_1F_MapBGEvents: @ 8535F24 - bg_event 30, 39, 4, 7, 0, ITEM_ULTRA_BALL, 81, 0 - -VictoryRoad_1F_MapEvents:: @ 8535F30 - 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 deleted file mode 100644 index 26d67171d..000000000 --- a/data/maps/events/VictoryRoad_B1F.inc +++ /dev/null @@ -1,35 +0,0 @@ -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 - -VictoryRoad_B1F_MapWarps: @ 853613C - 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 deleted file mode 100644 index a25c76c81..000000000 --- a/data/maps/events/VictoryRoad_B2F.inc +++ /dev/null @@ -1,22 +0,0 @@ -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 - -VictoryRoad_B2F_MapWarps: @ 8536230 - 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 - bg_event 37, 1, 3, 7, 0, ITEM_MAX_REPEL, 83, 0 - -VictoryRoad_B2F_MapEvents:: @ 8536268 - map_events VictoryRoad_B2F_EventObjects, VictoryRoad_B2F_MapWarps, 0x0, VictoryRoad_B2F_MapBGEvents - diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc deleted file mode 100644 index 5b3941dd2..000000000 --- a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc +++ /dev/null @@ -1,44 +0,0 @@ -AbandonedShip_CaptainsOffice_MapScripts:: @ 82387E1 - .byte 0 - -AbandonedShip_CaptainsOffice_EventScript_2387E2:: @ 82387E2 - lock - faceplayer - checkflag FLAG_0x126 - goto_eq AbandonedShip_CaptainsOffice_EventScript_23881A - checkitem ITEM_SCANNER, 1 - compare VAR_RESULT, 1 - goto_eq AbandonedShip_CaptainsOffice_EventScript_238810 - checkflag FLAG_0x436 - goto_eq AbandonedShip_CaptainsOffice_EventScript_23881A - msgbox AbandonedShip_CaptainsOffice_Text_238824, 4 - release - end - -AbandonedShip_CaptainsOffice_EventScript_238810:: @ 8238810 - msgbox AbandonedShip_CaptainsOffice_Text_23889D, 4 - release - end - -AbandonedShip_CaptainsOffice_EventScript_23881A:: @ 823881A - msgbox AbandonedShip_CaptainsOffice_Text_238918, 4 - release - end - -AbandonedShip_CaptainsOffice_Text_238824: @ 8238824 - .string "I’m investigating this ship on behalf\n" - .string "of CAPT. STERN.\p" - .string "He also asked me to find a SCANNER,\n" - .string "but I haven’t had any success…$" - -AbandonedShip_CaptainsOffice_Text_23889D: @ 823889D - .string "Oh! That’s a SCANNER!\p" - .string "Listen, can I get you to deliver that\n" - .string "to CAPT. STERN?\p" - .string "I want to investigate this ship a\n" - .string "little more.$" - -AbandonedShip_CaptainsOffice_Text_238918: @ 8238918 - .string "This ship is called S.S. CACTUS.\n" - .string "It seems to be from an earlier era.$" - diff --git a/data/scripts/maps/AbandonedShip_Corridors_1F.inc b/data/scripts/maps/AbandonedShip_Corridors_1F.inc deleted file mode 100644 index 39c7861a1..000000000 --- a/data/scripts/maps/AbandonedShip_Corridors_1F.inc +++ /dev/null @@ -1,27 +0,0 @@ -AbandonedShip_Corridors_1F_MapScripts:: @ 82379A4 - .byte 0 - -AbandonedShip_Corridors_1F_EventScript_2379A5:: @ 82379A5 - msgbox AbandonedShip_Corridors_1F_Text_237A60, 2 - end - -AbandonedShip_Corridors_1F_EventScript_2379AE:: @ 82379AE - trainerbattle 0, TRAINER_CHARLIE, 0, AbandonedShip_Corridors_1F_Text_2379C5, AbandonedShip_Corridors_1F_Text_237A01 - msgbox AbandonedShip_Corridors_1F_Text_237A1B, 6 - end - -AbandonedShip_Corridors_1F_Text_2379C5: @ 82379C5 - .string "What’s so funny about having my inner\n" - .string "tube aboard the ship?$" - -AbandonedShip_Corridors_1F_Text_237A01: @ 8237A01 - .string "Whoa, you overwhelmed me!$" - -AbandonedShip_Corridors_1F_Text_237A1B: @ 8237A1B - .string "It’s not easy throwing POKé BALLS\n" - .string "while hanging on to an inner tube!$" - -AbandonedShip_Corridors_1F_Text_237A60: @ 8237A60 - .string "Isn’t it fun here?\n" - .string "I get excited just being here!$" - diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc deleted file mode 100644 index f19dfe322..000000000 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc +++ /dev/null @@ -1,91 +0,0 @@ -AbandonedShip_Corridors_B1F_MapScripts:: @ 8237D84 - map_script 5, AbandonedShip_Corridors_B1F_MapScript1_237D8F - map_script 1, AbandonedShip_Corridors_B1F_MapScript1_237D98 - .byte 0 - -AbandonedShip_Corridors_B1F_MapScript1_237D8F: @ 8237D8F - setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4 - end - -AbandonedShip_Corridors_B1F_MapScript1_237D98: @ 8237D98 - checkflag FLAG_0x0EF - call_if 0, AbandonedShip_Corridors_B1F_EventScript_237DAB - checkflag FLAG_0x0EF - call_if 1, AbandonedShip_Corridors_B1F_EventScript_237DB5 - end - -AbandonedShip_Corridors_B1F_EventScript_237DAB:: @ 8237DAB - setmetatile 11, 4, 563, 1 - return - -AbandonedShip_Corridors_B1F_EventScript_237DB5:: @ 8237DB5 - setmetatile 11, 4, 555, 1 - return - -AbandonedShip_Corridors_B1F_EventScript_237DBF:: @ 8237DBF - msgbox AbandonedShip_Corridors_B1F_Text_237F03, 2 - end - -AbandonedShip_Corridors_B1F_EventScript_237DC8:: @ 8237DC8 - lockall - checkflag FLAG_0x0EF - goto_eq AbandonedShip_Corridors_B1F_EventScript_237E09 - checkitem ITEM_STORAGE_KEY, 1 - compare VAR_RESULT, 0 - goto_eq AbandonedShip_Corridors_B1F_EventScript_237DFF - msgbox AbandonedShip_Corridors_B1F_Text_237F4B, 4 - playse SE_PIN - takeitem ITEM_STORAGE_KEY, 1 - setflag FLAG_0x0EF - call AbandonedShip_Corridors_B1F_EventScript_237DB5 - special DrawWholeMapView - releaseall - end - -AbandonedShip_Corridors_B1F_EventScript_237DFF:: @ 8237DFF - msgbox AbandonedShip_Corridors_B1F_Text_237F15, 4 - releaseall - end - -AbandonedShip_Corridors_B1F_EventScript_237E09:: @ 8237E09 - msgbox AbandonedShip_Corridors_B1F_Text_237FA5, 4 - releaseall - end - -AbandonedShip_Corridors_B1F_EventScript_237E13:: @ 8237E13 - trainerbattle 0, TRAINER_DUNCAN, 0, AbandonedShip_Corridors_B1F_Text_237E2A, AbandonedShip_Corridors_B1F_Text_237E80 - msgbox AbandonedShip_Corridors_B1F_Text_237E92, 6 - end - -AbandonedShip_Corridors_B1F_Text_237E2A: @ 8237E2A - .string "When we go out to sea, we SAILORS\n" - .string "always bring our POKéMON.\l" - .string "How about a quick battle?$" - -AbandonedShip_Corridors_B1F_Text_237E80: @ 8237E80 - .string "Whoops, I’m sunk!$" - -AbandonedShip_Corridors_B1F_Text_237E92: @ 8237E92 - .string "The ship’s bottom has sunk into the\n" - .string "depths.\p" - .string "If a POKéMON knew how to go underwater,\n" - .string "we might make some progress…$" - -AbandonedShip_Corridors_B1F_Text_237F03: @ 8237F03 - .string "Yay!\n" - .string "It’s a ship!$" - -AbandonedShip_Corridors_B1F_Text_237F15: @ 8237F15 - .string "The door is locked.\p" - .string "“STORAGE†is painted on the door.$" - -AbandonedShip_Corridors_B1F_Text_237F4B: @ 8237F4B - .string "{PLAYER} inserted and turned the\n" - .string "STORAGE KEY.\p" - .string "The inserted KEY stuck fast,\n" - .string "but the door opened.$" - -AbandonedShip_Corridors_B1F_Text_237FA5: @ 8237FA5 -AbandonedShip_HiddenFloorCorridors_Text_237FA5: @ 8237FA5 - .string "The door is open.$" - diff --git a/data/scripts/maps/AbandonedShip_Deck.inc b/data/scripts/maps/AbandonedShip_Deck.inc deleted file mode 100644 index 1f0c0e2f2..000000000 --- a/data/scripts/maps/AbandonedShip_Deck.inc +++ /dev/null @@ -1,8 +0,0 @@ -AbandonedShip_Deck_MapScripts:: @ 823799A - map_script 3, AbandonedShip_Deck_MapScript1_2379A0 - .byte 0 - -AbandonedShip_Deck_MapScript1_2379A0: @ 82379A0 - setflag FLAG_LANDMARK_ABANDONED_SHIP - end - diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc deleted file mode 100644 index 2cd278f91..000000000 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc +++ /dev/null @@ -1,171 +0,0 @@ -AbandonedShip_HiddenFloorCorridors_MapScripts:: @ 823896C - map_script 5, AbandonedShip_HiddenFloorCorridors_MapScript1_238977 - map_script 1, AbandonedShip_HiddenFloorCorridors_MapScript1_238980 - .byte 0 - -AbandonedShip_HiddenFloorCorridors_MapScript1_238977: @ 8238977 - setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4 - end - -AbandonedShip_HiddenFloorCorridors_MapScript1_238980: @ 8238980 - checkflag FLAG_0x0F0 - call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_2389F1 - checkflag FLAG_0x0F1 - call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_2389FB - checkflag FLAG_0x0F2 - call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A05 - checkflag FLAG_0x0F3 - call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A0F - checkflag FLAG_0x0F0 - call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389C9 - checkflag FLAG_0x0F1 - call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389D3 - checkflag FLAG_0x0F2 - call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389DD - checkflag FLAG_0x0F3 - call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389E7 - end - -AbandonedShip_HiddenFloorCorridors_EventScript_2389C9:: @ 82389C9 - setmetatile 3, 8, 555, 1 - return - -AbandonedShip_HiddenFloorCorridors_EventScript_2389D3:: @ 82389D3 - setmetatile 6, 8, 555, 1 - return - -AbandonedShip_HiddenFloorCorridors_EventScript_2389DD:: @ 82389DD - setmetatile 3, 3, 538, 0 - return - -AbandonedShip_HiddenFloorCorridors_EventScript_2389E7:: @ 82389E7 - setmetatile 9, 3, 538, 0 - return - -AbandonedShip_HiddenFloorCorridors_EventScript_2389F1:: @ 82389F1 - setmetatile 3, 8, 563, 1 - return - -AbandonedShip_HiddenFloorCorridors_EventScript_2389FB:: @ 82389FB - setmetatile 6, 8, 563, 1 - return - -AbandonedShip_HiddenFloorCorridors_EventScript_238A05:: @ 8238A05 - setmetatile 3, 3, 564, 0 - return - -AbandonedShip_HiddenFloorCorridors_EventScript_238A0F:: @ 8238A0F - setmetatile 9, 3, 564, 0 - return - -AbandonedShip_HiddenFloorCorridors_EventScript_238A19:: @ 8238A19 - lockall - checkflag FLAG_0x0F0 - goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D - checkitem ITEM_ROOM_1_KEY, 1 - compare VAR_RESULT, 0 - goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AF5 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4 - playse SE_PIN - takeitem ITEM_ROOM_1_KEY, 1 - setflag FLAG_0x0F0 - call AbandonedShip_HiddenFloorCorridors_EventScript_2389C9 - special DrawWholeMapView - releaseall - end - -AbandonedShip_HiddenFloorCorridors_EventScript_238A50:: @ 8238A50 - lockall - checkflag FLAG_0x0F1 - goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D - checkitem ITEM_ROOM_2_KEY, 1 - compare VAR_RESULT, 0 - goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AFF - msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4 - playse SE_PIN - takeitem ITEM_ROOM_2_KEY, 1 - setflag FLAG_0x0F1 - call AbandonedShip_HiddenFloorCorridors_EventScript_2389D3 - special DrawWholeMapView - releaseall - end - -AbandonedShip_HiddenFloorCorridors_EventScript_238A87:: @ 8238A87 - lockall - checkflag FLAG_0x0F2 - goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D - checkitem ITEM_ROOM_4_KEY, 1 - compare VAR_RESULT, 0 - goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B09 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4 - playse SE_PIN - takeitem ITEM_ROOM_4_KEY, 1 - setflag FLAG_0x0F2 - call AbandonedShip_HiddenFloorCorridors_EventScript_2389DD - special DrawWholeMapView - releaseall - end - -AbandonedShip_HiddenFloorCorridors_EventScript_238ABE:: @ 8238ABE - lockall - checkflag FLAG_0x0F3 - goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D - checkitem ITEM_ROOM_6_KEY, 1 - compare VAR_RESULT, 0 - goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B13 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4 - playse SE_PIN - takeitem ITEM_ROOM_6_KEY, 1 - setflag FLAG_0x0F3 - call AbandonedShip_HiddenFloorCorridors_EventScript_2389E7 - special DrawWholeMapView - releaseall - end - -AbandonedShip_HiddenFloorCorridors_EventScript_238AF5:: @ 8238AF5 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238B27, 4 - releaseall - end - -AbandonedShip_HiddenFloorCorridors_EventScript_238AFF:: @ 8238AFF - msgbox AbandonedShip_HiddenFloorCorridors_Text_238B5B, 4 - releaseall - end - -AbandonedShip_HiddenFloorCorridors_EventScript_238B09:: @ 8238B09 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238B8F, 4 - releaseall - end - -AbandonedShip_HiddenFloorCorridors_EventScript_238B13:: @ 8238B13 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238BC3, 4 - releaseall - end - -AbandonedShip_HiddenFloorCorridors_EventScript_238B1D:: @ 8238B1D - msgbox AbandonedShip_HiddenFloorCorridors_Text_237FA5, 4 - releaseall - end - -AbandonedShip_HiddenFloorCorridors_Text_238B27: @ 8238B27 - .string "The door is locked.\p" - .string "“RM. 1†is painted on the door.$" - -AbandonedShip_HiddenFloorCorridors_Text_238B5B: @ 8238B5B - .string "The door is locked.\p" - .string "“RM. 2†is painted on the door.$" - -AbandonedShip_HiddenFloorCorridors_Text_238B8F: @ 8238B8F - .string "The door is locked.\p" - .string "“RM. 4†is painted on the door.$" - -AbandonedShip_HiddenFloorCorridors_Text_238BC3: @ 8238BC3 - .string "The door is locked.\p" - .string "“RM. 6†is painted on the door.$" - -AbandonedShip_HiddenFloorCorridors_Text_238BF7: @ 8238BF7 - .string "{PLAYER} inserted and turned the\n" - .string "KEY.\p" - .string "The inserted KEY stuck fast,\n" - .string "but the door opened.$" - diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc deleted file mode 100644 index 701b79fbf..000000000 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc +++ /dev/null @@ -1,148 +0,0 @@ -AbandonedShip_HiddenFloorRooms_MapScripts:: @ 8238C49 - map_script 2, AbandonedShip_HiddenFloorRooms_MapScript2_238C4F - .byte 0 - -AbandonedShip_HiddenFloorRooms_MapScript2_238C4F: @ 8238C4F - map_script_2 VAR_TEMP_1, 0, AbandonedShip_HiddenFloorRooms_EventScript_238C59 - .2byte 0 - -AbandonedShip_HiddenFloorRooms_EventScript_238C59:: @ 8238C59 - setvar VAR_TEMP_1, 1 - getplayerxy VAR_TEMP_2, VAR_TEMP_3 - setvar VAR_TEMP_4, 1 - compare VAR_TEMP_2, 21 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238CD1 - compare VAR_TEMP_2, 36 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238CD7 - compare VAR_TEMP_3, 2 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238CDD - switch VAR_TEMP_4 - case 1, AbandonedShip_HiddenFloorRooms_EventScript_238CE3 - case 2, AbandonedShip_HiddenFloorRooms_EventScript_238D0C - case 3, AbandonedShip_HiddenFloorRooms_EventScript_238D0D - case 4, AbandonedShip_HiddenFloorRooms_EventScript_238D33 - case 5, AbandonedShip_HiddenFloorRooms_EventScript_238D6B - case 6, AbandonedShip_HiddenFloorRooms_EventScript_238DB2 - end - -AbandonedShip_HiddenFloorRooms_EventScript_238CD1:: @ 8238CD1 - addvar VAR_TEMP_4, 1 - return - -AbandonedShip_HiddenFloorRooms_EventScript_238CD7:: @ 8238CD7 - addvar VAR_TEMP_4, 2 - return - -AbandonedShip_HiddenFloorRooms_EventScript_238CDD:: @ 8238CDD - addvar VAR_TEMP_4, 3 - return - -AbandonedShip_HiddenFloorRooms_EventScript_238CE3:: @ 8238CE3 - delay 20 - setfieldeffectargument 0, 10 - setfieldeffectargument 1, 10 - setfieldeffectargument 2, 0 - dofieldeffect 54 - specialvar VAR_RESULT, sub_81392F8 - compare VAR_RESULT, 0 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DD3 - waitfieldeffect 54 - delay 10 - end - -AbandonedShip_HiddenFloorRooms_EventScript_238D0C:: @ 8238D0C - end - -AbandonedShip_HiddenFloorRooms_EventScript_238D0D:: @ 8238D0D - specialvar VAR_RESULT, sub_81392AC - compare VAR_RESULT, 1 - goto_eq AbandonedShip_HiddenFloorRooms_EventScript_238D32 - delay 20 - compare VAR_RESULT, 0 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DB3 - waitfieldeffect 54 - delay 10 - end - -AbandonedShip_HiddenFloorRooms_EventScript_238D32:: @ 8238D32 - end - -AbandonedShip_HiddenFloorRooms_EventScript_238D33:: @ 8238D33 - delay 20 - setfieldeffectargument 0, 8 - setfieldeffectargument 1, 5 - setfieldeffectargument 2, 0 - dofieldeffect 54 - setfieldeffectargument 0, 11 - setfieldeffectargument 1, 3 - setfieldeffectargument 2, 0 - dofieldeffect 54 - specialvar VAR_RESULT, sub_8139320 - compare VAR_RESULT, 0 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DE3 - waitfieldeffect 54 - delay 10 - end - -AbandonedShip_HiddenFloorRooms_EventScript_238D6B:: @ 8238D6B - delay 20 - setfieldeffectargument 0, 16 - setfieldeffectargument 1, 3 - setfieldeffectargument 2, 0 - dofieldeffect 54 - setfieldeffectargument 0, 25 - setfieldeffectargument 1, 2 - setfieldeffectargument 2, 0 - dofieldeffect 54 - setfieldeffectargument 0, 24 - setfieldeffectargument 1, 6 - setfieldeffectargument 2, 0 - dofieldeffect 54 - specialvar VAR_RESULT, sub_81392D4 - compare VAR_RESULT, 0 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DC3 - waitfieldeffect 54 - delay 10 - end - -AbandonedShip_HiddenFloorRooms_EventScript_238DB2:: @ 8238DB2 - end - -AbandonedShip_HiddenFloorRooms_EventScript_238DB3:: @ 8238DB3 - setfieldeffectargument 0, 42 - setfieldeffectargument 1, 10 - setfieldeffectargument 2, 0 - dofieldeffect 54 - return - -AbandonedShip_HiddenFloorRooms_EventScript_238DC3:: @ 8238DC3 - setfieldeffectargument 0, 20 - setfieldeffectargument 1, 5 - setfieldeffectargument 2, 0 - dofieldeffect 54 - return - -AbandonedShip_HiddenFloorRooms_EventScript_238DD3:: @ 8238DD3 - setfieldeffectargument 0, 1 - setfieldeffectargument 1, 12 - setfieldeffectargument 2, 0 - dofieldeffect 54 - return - -AbandonedShip_HiddenFloorRooms_EventScript_238DE3:: @ 8238DE3 - setfieldeffectargument 0, 1 - setfieldeffectargument 1, 2 - setfieldeffectargument 2, 0 - dofieldeffect 54 - return - -AbandonedShip_HiddenFloorRooms_EventScript_238DF3:: @ 8238DF3 - lockall - msgbox AbandonedShip_HiddenFloorRooms_Text_238DFE, 4 - releaseall - end - -AbandonedShip_HiddenFloorRooms_Text_238DFE: @ 8238DFE - .string "It’s bright and shiny!\n" - .string "But it’s just trash…$" - diff --git a/data/scripts/maps/AbandonedShip_Room_B1F.inc b/data/scripts/maps/AbandonedShip_Room_B1F.inc deleted file mode 100644 index 5dd7a2bad..000000000 --- a/data/scripts/maps/AbandonedShip_Room_B1F.inc +++ /dev/null @@ -1,3 +0,0 @@ -AbandonedShip_Room_B1F_MapScripts:: @ 82380A5 - .byte 0 - diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc deleted file mode 100644 index 2ffe3afc7..000000000 --- a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc +++ /dev/null @@ -1,158 +0,0 @@ -AbandonedShip_Rooms2_1F_MapScripts:: @ 82380A6 - .byte 0 - -AbandonedShip_Rooms2_1F_EventScript_2380A7:: @ 82380A7 - trainerbattle 6, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_23819D, AbandonedShip_Rooms2_1F_Text_2381DA, AbandonedShip_Rooms2_1F_Text_238257, AbandonedShip_Rooms2_1F_EventScript_2380D7 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq AbandonedShip_Rooms2_1F_EventScript_2380F0 - msgbox AbandonedShip_Rooms2_1F_Text_23820F, 4 - release - end - -AbandonedShip_Rooms2_1F_EventScript_2380D7:: @ 82380D7 - msgbox AbandonedShip_Rooms2_1F_Text_2383BB, 4 - setvar VAR_0x8004, 642 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 642 - callstd 8 - release - end - -AbandonedShip_Rooms2_1F_EventScript_2380F0:: @ 82380F0 - trainerbattle 7, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_2383FF, AbandonedShip_Rooms2_1F_Text_238473, AbandonedShip_Rooms2_1F_Text_238509 - msgbox AbandonedShip_Rooms2_1F_Text_238491, 6 - end - -AbandonedShip_Rooms2_1F_EventScript_23810B:: @ 823810B - trainerbattle 6, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_2382A4, AbandonedShip_Rooms2_1F_Text_2382F4, AbandonedShip_Rooms2_1F_Text_23836F, AbandonedShip_Rooms2_1F_EventScript_23813B - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq AbandonedShip_Rooms2_1F_EventScript_238154 - msgbox AbandonedShip_Rooms2_1F_Text_23830A, 4 - release - end - -AbandonedShip_Rooms2_1F_EventScript_23813B:: @ 823813B - msgbox AbandonedShip_Rooms2_1F_Text_2383BB, 4 - setvar VAR_0x8004, 642 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 642 - callstd 8 - release - end - -AbandonedShip_Rooms2_1F_EventScript_238154:: @ 8238154 - trainerbattle 7, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_238556, AbandonedShip_Rooms2_1F_Text_2385F2, AbandonedShip_Rooms2_1F_Text_238668 - msgbox AbandonedShip_Rooms2_1F_Text_23860B, 6 - end - -AbandonedShip_Rooms2_1F_EventScript_23816F:: @ 823816F - trainerbattle 0, TRAINER_JANI, 0, AbandonedShip_Rooms2_1F_Text_2386B4, AbandonedShip_Rooms2_1F_Text_2386E8 - msgbox AbandonedShip_Rooms2_1F_Text_238708, 6 - end - -AbandonedShip_Rooms2_1F_EventScript_238186:: @ 8238186 - trainerbattle 0, TRAINER_GARRISON, 0, AbandonedShip_Rooms2_1F_Text_23873F, AbandonedShip_Rooms2_1F_Text_238779 - msgbox AbandonedShip_Rooms2_1F_Text_2387A9, 6 - end - -AbandonedShip_Rooms2_1F_Text_23819D: @ 823819D - .string "DAN: While searching for treasures,\n" - .string "we discovered a TRAINER!$" - -AbandonedShip_Rooms2_1F_Text_2381DA: @ 82381DA - .string "DAN: We couldn’t win even though\n" - .string "we worked together…$" - -AbandonedShip_Rooms2_1F_Text_23820F: @ 823820F - .string "DAN: We can’t find any treasures…\n" - .string "I wonder if someone got them already?$" - -AbandonedShip_Rooms2_1F_Text_238257: @ 8238257 - .string "DAN: You don’t even have two POKéMON.\n" - .string "You can’t expect to beat us like that.$" - -AbandonedShip_Rooms2_1F_Text_2382A4: @ 82382A4 - .string "KIRA: Oh?\n" - .string "We were searching for treasures.\l" - .string "But we discovered a TRAINER instead!$" - -AbandonedShip_Rooms2_1F_Text_2382F4: @ 82382F4 - .string "KIRA: Ooh, so strong!$" - -AbandonedShip_Rooms2_1F_Text_23830A: @ 823830A - .string "KIRA: Where could the treasures be?\p" - .string "I’ve already decided what I’m buying\n" - .string "when we find the treasures!$" - -AbandonedShip_Rooms2_1F_Text_23836F: @ 823836F - .string "KIRA: Oh, you don’t have two POKéMON?\n" - .string "We’ll have to battle some other time!$" - -AbandonedShip_Rooms2_1F_Text_2383BB: @ 82383BB - .string "KIRA: Oh, you make me so angry!\n" - .string "I’m going to register you for that!$" - -AbandonedShip_Rooms2_1F_Text_2383FF: @ 82383FF - .string "DAN: We’ve been searching for\n" - .string "treasures all this time.\p" - .string "Our POKéMON have grown stronger, too.\n" - .string "Let us show you, okay?$" - -AbandonedShip_Rooms2_1F_Text_238473: @ 8238473 - .string "DAN: You’re strong, as usual!$" - -AbandonedShip_Rooms2_1F_Text_238491: @ 8238491 - .string "DAN: We can’t find any treasures,\n" - .string "we lose at POKéMON…\p" - .string "I want to go home… But if I say that,\n" - .string "she gets all angry with me…$" - -AbandonedShip_Rooms2_1F_Text_238509: @ 8238509 - .string "DAN: You don’t even have two POKéMON.\n" - .string "You can’t expect to beat us like that.$" - -AbandonedShip_Rooms2_1F_Text_238556: @ 8238556 - .string "KIRA: Oh? We meet again!\p" - .string "Just like us, you still haven’t given up\n" - .string "searching for treasures, have you?\p" - .string "Want to make it so the loser has\n" - .string "to give up searching?$" - -AbandonedShip_Rooms2_1F_Text_2385F2: @ 82385F2 - .string "KIRA: Oh, we lost again…$" - -AbandonedShip_Rooms2_1F_Text_23860B: @ 823860B - .string "KIRA: We’re not leaving until we raise\n" - .string "our POKéMON some more and we find\l" - .string "the treasures here!$" - -AbandonedShip_Rooms2_1F_Text_238668: @ 8238668 - .string "KIRA: Oh, you don’t have two POKéMON?\n" - .string "We’ll have to battle some other time!$" - -AbandonedShip_Rooms2_1F_Text_2386B4: @ 82386B4 - .string "I’m not good at swimming,\n" - .string "but I am good at battles!$" - -AbandonedShip_Rooms2_1F_Text_2386E8: @ 82386E8 - .string "Oops.\n" - .string "That didn’t go very well.$" - -AbandonedShip_Rooms2_1F_Text_238708: @ 8238708 - .string "Walking around barefoot in this ship\n" - .string "is kind of gross.$" - -AbandonedShip_Rooms2_1F_Text_23873F: @ 823873F - .string "Strength and compassion…\n" - .string "Those are a TRAINER’s treasures!$" - -AbandonedShip_Rooms2_1F_Text_238779: @ 8238779 - .string "Ah, there is something about you\n" - .string "that sparkles.$" - -AbandonedShip_Rooms2_1F_Text_2387A9: @ 82387A9 - .string "In a cabin somewhere on board,\n" - .string "I saw something sparkle.$" - diff --git a/data/scripts/maps/AbandonedShip_Rooms2_B1F.inc b/data/scripts/maps/AbandonedShip_Rooms2_B1F.inc deleted file mode 100644 index 00b3d0fb9..000000000 --- a/data/scripts/maps/AbandonedShip_Rooms2_B1F.inc +++ /dev/null @@ -1,13 +0,0 @@ -AbandonedShip_Rooms2_B1F_MapScripts:: @ 8238024 - .byte 0 - -AbandonedShip_Rooms2_B1F_EventScript_238025:: @ 8238025 - msgbox AbandonedShip_Rooms2_B1F_Text_23802E, 2 - end - -AbandonedShip_Rooms2_B1F_Text_23802E: @ 823802E - .string "This is a perfect place to go exploring!\n" - .string "It’s exciting here!\p" - .string "I bet there’re amazing treasures on\n" - .string "board.$" - diff --git a/data/scripts/maps/AbandonedShip_Rooms_1F.inc b/data/scripts/maps/AbandonedShip_Rooms_1F.inc deleted file mode 100644 index 2a6bc36b6..000000000 --- a/data/scripts/maps/AbandonedShip_Rooms_1F.inc +++ /dev/null @@ -1,81 +0,0 @@ -AbandonedShip_Rooms_1F_MapScripts:: @ 8237A92 - .byte 0 - -AbandonedShip_Rooms_1F_EventScript_237A93:: @ 8237A93 - msgbox AbandonedShip_Rooms_1F_Text_237B15, 2 - end - -AbandonedShip_Rooms_1F_EventScript_237A9C:: @ 8237A9C - trainerbattle 0, TRAINER_DEMETRIUS, 0, AbandonedShip_Rooms_1F_Text_237D0C, AbandonedShip_Rooms_1F_Text_237D2A - msgbox AbandonedShip_Rooms_1F_Text_237D41, 6 - end - -AbandonedShip_Rooms_1F_EventScript_237AB3:: @ 8237AB3 - trainerbattle 2, TRAINER_THALIA_1, 0, AbandonedShip_Rooms_1F_Text_237B76, AbandonedShip_Rooms_1F_Text_237BB8, AbandonedShip_Rooms_1F_EventScript_237ADF - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq AbandonedShip_Rooms_1F_EventScript_237AFE - msgbox AbandonedShip_Rooms_1F_Text_237BDB, 4 - release - end - -AbandonedShip_Rooms_1F_EventScript_237ADF:: @ 8237ADF - special sub_80B4808 - waitmovement 0 - msgbox AbandonedShip_Rooms_1F_Text_237C2A, 4 - setvar VAR_0x8004, 144 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 144 - callstd 8 - release - end - -AbandonedShip_Rooms_1F_EventScript_237AFE:: @ 8237AFE - trainerbattle 5, TRAINER_THALIA_1, 0, AbandonedShip_Rooms_1F_Text_237C69, AbandonedShip_Rooms_1F_Text_237CB2 - msgbox AbandonedShip_Rooms_1F_Text_237CC9, 6 - end - -AbandonedShip_Rooms_1F_Text_237B15: @ 8237B15 - .string "Ships of this sort are rare, so I’m\n" - .string "taking a look around.\p" - .string "Hmhm…\n" - .string "There appear to be other cabins…$" - -AbandonedShip_Rooms_1F_Text_237B76: @ 8237B76 - .string "What on earth would compel you to\n" - .string "come here? You must be curious!$" - -AbandonedShip_Rooms_1F_Text_237BB8: @ 8237BB8 - .string "Not just curious, but also strong…$" - -AbandonedShip_Rooms_1F_Text_237BDB: @ 8237BDB - .string "The man next door…\p" - .string "He says he’s just sightseeing,\n" - .string "but I don’t know about that.$" - -AbandonedShip_Rooms_1F_Text_237C2A: @ 8237C2A - .string "You’re such a tough TRAINER!\n" - .string "Let me register you as a memento!$" - -AbandonedShip_Rooms_1F_Text_237C69: @ 8237C69 - .string "What on earth would compel you to\n" - .string "come back? You must really be curious!$" - -AbandonedShip_Rooms_1F_Text_237CB2: @ 8237CB2 - .string "Aren’t you too strong?$" - -AbandonedShip_Rooms_1F_Text_237CC9: @ 8237CC9 - .string "I’m sure that man’s up to something!\n" - .string "He just acts so suspiciously!$" - -AbandonedShip_Rooms_1F_Text_237D0C: @ 8237D0C - .string "Waaah!\n" - .string "I’ve been found! …Huh?$" - -AbandonedShip_Rooms_1F_Text_237D2A: @ 8237D2A - .string "Oh, you’re not my mom.$" - -AbandonedShip_Rooms_1F_Text_237D41: @ 8237D41 - .string "I’m in trouble with my mom, so I ran.\n" - .string "Keep it a secret where I am!$" - diff --git a/data/scripts/maps/AbandonedShip_Rooms_B1F.inc b/data/scripts/maps/AbandonedShip_Rooms_B1F.inc deleted file mode 100644 index d4a5c9233..000000000 --- a/data/scripts/maps/AbandonedShip_Rooms_B1F.inc +++ /dev/null @@ -1,18 +0,0 @@ -AbandonedShip_Rooms_B1F_MapScripts:: @ 8237FB7 - map_script 5, AbandonedShip_Rooms_B1F_MapScript1_237FBD - .byte 0 - -AbandonedShip_Rooms_B1F_MapScript1_237FBD: @ 8237FBD - setdivewarp MAP_ABANDONED_SHIP_UNDERWATER2, 255, 17, 4 - end - -AbandonedShip_Rooms_B1F_EventScript_237FC6:: @ 8237FC6 - msgbox AbandonedShip_Rooms_B1F_Text_237FCF, 2 - end - -AbandonedShip_Rooms_B1F_Text_237FCF: @ 8237FCF - .string "Urrrrppp…\p" - .string "I’m getting queasy just being aboard\n" - .string "this ship…\p" - .string "It’s not even moving, but…$" - diff --git a/data/scripts/maps/AbandonedShip_Underwater1.inc b/data/scripts/maps/AbandonedShip_Underwater1.inc deleted file mode 100644 index 7e39b1939..000000000 --- a/data/scripts/maps/AbandonedShip_Underwater1.inc +++ /dev/null @@ -1,8 +0,0 @@ -AbandonedShip_Underwater1_MapScripts:: @ 8238096 - map_script 5, AbandonedShip_Underwater1_MapScript1_23809C - .byte 0 - -AbandonedShip_Underwater1_MapScript1_23809C: @ 823809C - 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 deleted file mode 100644 index 17f52c691..000000000 --- a/data/scripts/maps/AbandonedShip_Underwater2.inc +++ /dev/null @@ -1,8 +0,0 @@ -AbandonedShip_Underwater2_MapScripts:: @ 823895D - map_script 5, AbandonedShip_Underwater2_MapScript1_238963 - .byte 0 - -AbandonedShip_Underwater2_MapScript1_238963: @ 8238963 - setdivewarp MAP_ABANDONED_SHIP_ROOMS_B1F, 255, 13, 7 - end - diff --git a/data/scripts/maps/AlteringCave.inc b/data/scripts/maps/AlteringCave.inc deleted file mode 100644 index a9faddc36..000000000 --- a/data/scripts/maps/AlteringCave.inc +++ /dev/null @@ -1,8 +0,0 @@ -AlteringCave_MapScripts:: @ 823B177 - map_script 3, AlteringCave_MapScript1_23B17D - .byte 0 - -AlteringCave_MapScript1_23B17D: @ 823B17D - setflag FLAG_LANDMARK_ALTERING_CAVE - end - diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc deleted file mode 100644 index 3cd0b9eff..000000000 --- a/data/scripts/maps/AncientTomb.inc +++ /dev/null @@ -1,98 +0,0 @@ -AncientTomb_MapScripts:: @ 8238FB3 - map_script 5, AncientTomb_MapScript1_238FC3 - map_script 1, AncientTomb_MapScript1_238FF2 - map_script 3, AncientTomb_MapScript1_238FE1 - .byte 0 - -AncientTomb_MapScript1_238FC3: @ 8238FC3 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, AncientTomb_EventScript_238FCD - end - -AncientTomb_EventScript_238FCD:: @ 8238FCD - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 7 - goto_if 5, AncientTomb_EventScript_27374E - removeobject VAR_LAST_TALKED - return - -AncientTomb_MapScript1_238FE1: @ 8238FE1 - setflag FLAG_LANDMARK_ANCIENT_TOMB - checkflag FLAG_0x1BD - call_if 0, AncientTomb_EventScript_238FEE - end - -AncientTomb_EventScript_238FEE:: @ 8238FEE - clearflag FLAG_0x3A9 - return - -AncientTomb_MapScript1_238FF2: @ 8238FF2 - checkflag FLAG_SYS_BRAILLE_FLY - call_if 0, AncientTomb_EventScript_238FFC - end - -AncientTomb_EventScript_238FFC:: @ 8238FFC - setmetatile 7, 19, 553, 1 - setmetatile 8, 19, 553, 1 - setmetatile 9, 19, 553, 1 - setmetatile 7, 20, 565, 1 - setmetatile 8, 20, 565, 1 - setmetatile 9, 20, 565, 1 - return - -AncientTomb_EventScript_239033:: @ 8239033 - lockall - checkflag FLAG_SYS_BRAILLE_FLY - goto_eq AncientTomb_EventScript_239046 - braillemessage AncientTomb_Braille_2A6D06 - waitbuttonpress - hidebox2 - releaseall - end - -AncientTomb_EventScript_239046:: @ 8239046 - msgbox gUnknown_0827304E, 4 - releaseall - end - -AncientTomb_EventScript_239050:: @ 8239050 - lockall - braillemessage AncientTomb_Braille_2A6D06 - waitbuttonpress - hidebox2 - releaseall - end - -AncientTomb_EventScript_23905A:: @ 823905A - lock - faceplayer - waitse - playmoncry SPECIES_REGISTEEL, 2 - delay 40 - waitmoncry - setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE - setflag FLAG_SYS_CTRL_OBJ_DELETE - special StartRegiBattle - waitstate - clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 1 - goto_eq AncientTomb_EventScript_2390A1 - compare VAR_RESULT, 4 - goto_eq AncientTomb_EventScript_2390AA - compare VAR_RESULT, 5 - goto_eq AncientTomb_EventScript_2390AA - setflag FLAG_0x1BD - release - end - -AncientTomb_EventScript_2390A1:: @ 82390A1 - setflag FLAG_0x1BD - goto AncientTomb_EventScript_27376D - end - -AncientTomb_EventScript_2390AA:: @ 82390AA - setvar VAR_0x8004, 403 - goto AncientTomb_EventScript_273776 - end - diff --git a/data/scripts/maps/AquaHideout_1F.inc b/data/scripts/maps/AquaHideout_1F.inc deleted file mode 100644 index 9172c3927..000000000 --- a/data/scripts/maps/AquaHideout_1F.inc +++ /dev/null @@ -1,122 +0,0 @@ -AquaHideout_1F_MapScripts:: @ 8233493 - .byte 0 - -AquaHideout_1F_EventScript_233494:: @ 8233494 - lock - faceplayer - checkflag FLAG_0x06F - goto_eq AquaHideout_1F_EventScript_2334BC - checkflag FLAG_0x0D4 - goto_eq AquaHideout_1F_EventScript_2334B2 - msgbox AquaHideout_1F_Text_23351D, 4 - release - end - -AquaHideout_1F_EventScript_2334B2:: @ 82334B2 - msgbox AquaHideout_1F_Text_2335E3, 4 - release - end - -AquaHideout_1F_EventScript_2334BC:: @ 82334BC - msgbox AquaHideout_1F_Text_23367D, 4 - release - end - -AquaHideout_1F_EventScript_2334C6:: @ 82334C6 - lock - faceplayer - checkflag FLAG_0x06F - goto_eq AquaHideout_1F_EventScript_2334EE - checkflag FLAG_0x0D4 - goto_eq AquaHideout_1F_EventScript_2334E4 - msgbox AquaHideout_1F_Text_233739, 4 - release - end - -AquaHideout_1F_EventScript_2334E4:: @ 82334E4 - msgbox AquaHideout_1F_Text_2337FA, 4 - release - end - -AquaHideout_1F_EventScript_2334EE:: @ 82334EE - msgbox AquaHideout_1F_Text_233884, 4 - release - end - -AquaHideout_1F_EventScript_2334F8:: @ 82334F8 - trainerbattle 2, TRAINER_GRUNT_1, 0, AquaHideout_1F_Text_23393D, AquaHideout_1F_Text_233964, AquaHideout_1F_EventScript_233513 - msgbox AquaHideout_1F_Text_233977, 6 - end - -AquaHideout_1F_EventScript_233513:: @ 8233513 - msgbox AquaHideout_1F_Text_233977, 4 - release - end - -AquaHideout_1F_Text_23351D: @ 823351D - .string "What? What? What do you want with \n" - .string "TEAM AQUA?\p" - .string "Our BOSS isn’t here! He’s gone off to\n" - .string "snatch something important!\p" - .string "… …\n" - .string "Where did he go?\p" - .string "Wahaha! Do you really think I’d tell\n" - .string "you something that crucial?$" - -AquaHideout_1F_Text_2335E3: @ 82335E3 - .string "What? What?\n" - .string "Are you a TEAM MAGMA grunt?\p" - .string "I hear that TEAM MAGMA is trying to\n" - .string "awaken an awesome POKéMON at their\l" - .string "HIDEOUT.\p" - .string "But where might their HIDEOUT be?$" - -AquaHideout_1F_Text_23367D: @ 823367D - .string "What? What? What do you want with \n" - .string "TEAM AQUA?\p" - .string "Our BOSS isn’t here!\n" - .string "He’s gone off to jack a submarine!\p" - .string "… …\n" - .string "Where did he go?\p" - .string "Wahaha! Do you really think I’d tell\n" - .string "you something that crucial?$" - -AquaHideout_1F_Text_233739: @ 8233739 - .string "What? What? What do you want with \n" - .string "TEAM AQUA?\p" - .string "Our BOSS isn’t here! He’s on his way to\n" - .string "MT. PYRE on ROUTE 122!\p" - .string "… …\n" - .string "Why did he go?\p" - .string "Wahaha! Do you really think I’d tell\n" - .string "you something that crucial?$" - -AquaHideout_1F_Text_2337FA: @ 82337FA - .string "What? What?\n" - .string "Are you a TEAM MAGMA grunt?\p" - .string "I hear that TEAM MAGMA is after\n" - .string "an awesome POKéMON at MT. CHIMNEY.\p" - .string "But what is that POKéMON like?$" - -AquaHideout_1F_Text_233884: @ 8233884 - .string "What? What? What do you want with\n" - .string "TEAM AQUA?\p" - .string "Our BOSS isn’t here!\n" - .string "He’s on his way to SLATEPORT CITY!\p" - .string "… …\n" - .string "Why did he go?\p" - .string "Wahaha! Do you really think I’d tell\n" - .string "you something that crucial?$" - -AquaHideout_1F_Text_23393D: @ 823393D - .string "Ayiyiyi!\n" - .string "Suspicious character spotted!$" - -AquaHideout_1F_Text_233964: @ 8233964 - .string "Grrrrr…\n" - .string "I lost it!$" - -AquaHideout_1F_Text_233977: @ 8233977 - .string "I took the loss for the TEAM,\n" - .string "but I did my job…$" - diff --git a/data/scripts/maps/AquaHideout_B1F.inc b/data/scripts/maps/AquaHideout_B1F.inc deleted file mode 100644 index cf59bdacc..000000000 --- a/data/scripts/maps/AquaHideout_B1F.inc +++ /dev/null @@ -1,171 +0,0 @@ -AquaHideout_B1F_MapScripts:: @ 82339A7 - map_script 5, AquaHideout_B1F_MapScript1_2339B2 - map_script 3, AquaHideout_B1F_MapScript1_2339D0 - .byte 0 - -AquaHideout_B1F_MapScript1_2339B2: @ 82339B2 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, AquaHideout_B1F_EventScript_2339BC - end - -AquaHideout_B1F_EventScript_2339BC:: @ 82339BC - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 7 - goto_if 5, AquaHideout_B1F_EventScript_27374E - removeobject VAR_LAST_TALKED - return - -AquaHideout_B1F_MapScript1_2339D0: @ 82339D0 - checkflag FLAG_0x1C4 - call_if 0, AquaHideout_B1F_EventScript_2339E3 - checkflag FLAG_0x1C5 - call_if 0, AquaHideout_B1F_EventScript_2339E7 - end - -AquaHideout_B1F_EventScript_2339E3:: @ 82339E3 - clearflag FLAG_0x3D1 - return - -AquaHideout_B1F_EventScript_2339E7:: @ 82339E7 - clearflag FLAG_0x3D2 - return - -AquaHideout_B1F_EventScript_2339EB:: @ 82339EB - lock - faceplayer - setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE - waitse - playmoncry SPECIES_ELECTRODE, 2 - delay 40 - waitmoncry - setflag FLAG_SYS_CTRL_OBJ_DELETE - dowildbattle - clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 1 - goto_eq AquaHideout_B1F_EventScript_233A2F - compare VAR_RESULT, 4 - goto_eq AquaHideout_B1F_EventScript_233A2F - compare VAR_RESULT, 5 - goto_eq AquaHideout_B1F_EventScript_233A2F - setflag FLAG_0x1C4 - release - end - -AquaHideout_B1F_EventScript_233A2F:: @ 8233A2F - setflag FLAG_0x1C4 - goto AquaHideout_B1F_EventScript_27376D - end - -AquaHideout_B1F_EventScript_233A38:: @ 8233A38 - lock - faceplayer - setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE - waitse - playmoncry SPECIES_ELECTRODE, 2 - delay 40 - waitmoncry - setflag FLAG_SYS_CTRL_OBJ_DELETE - dowildbattle - clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 1 - goto_eq AquaHideout_B1F_EventScript_233A7C - compare VAR_RESULT, 4 - goto_eq AquaHideout_B1F_EventScript_233A7C - compare VAR_RESULT, 5 - goto_eq AquaHideout_B1F_EventScript_233A7C - setflag FLAG_0x1C5 - release - end - -AquaHideout_B1F_EventScript_233A7C:: @ 8233A7C - setflag FLAG_0x1C5 - goto AquaHideout_B1F_EventScript_27376D - end - -AquaHideout_B1F_EventScript_233A85:: @ 8233A85 - trainerbattle 2, TRAINER_GRUNT_2, 0, AquaHideout_B1F_Text_233B03, AquaHideout_B1F_Text_233B4A, AquaHideout_B1F_EventScript_233AA0 - msgbox AquaHideout_B1F_Text_233B5E, 6 - end - -AquaHideout_B1F_EventScript_233AA0:: @ 8233AA0 - special sub_80B4808 - waitmovement 0 - msgbox AquaHideout_B1F_Text_233B5E, 4 - release - end - -AquaHideout_B1F_EventScript_233AB0:: @ 8233AB0 - trainerbattle 2, TRAINER_GRUNT_3, 0, AquaHideout_B1F_Text_233BC5, AquaHideout_B1F_Text_233C27, AquaHideout_B1F_EventScript_233ACB - msgbox AquaHideout_B1F_Text_233C41, 6 - end - -AquaHideout_B1F_EventScript_233ACB:: @ 8233ACB - msgbox AquaHideout_B1F_Text_233C41, 4 - release - end - -AquaHideout_B1F_EventScript_233AD5:: @ 8233AD5 - trainerbattle 0, TRAINER_GRUNT_21, 0, AquaHideout_B1F_Text_233C89, AquaHideout_B1F_Text_233CCA - msgbox AquaHideout_B1F_Text_233CDC, 6 - end - -AquaHideout_B1F_EventScript_233AEC:: @ 8233AEC - trainerbattle 0, TRAINER_GRUNT_25, 0, AquaHideout_B1F_Text_233D1B, AquaHideout_B1F_Text_233D6E - msgbox AquaHideout_B1F_Text_233D84, 6 - end - -AquaHideout_B1F_Text_233B03: @ 8233B03 - .string "If you want to know the secret about\n" - .string "our HIDEOUT, you have me to beat!$" - -AquaHideout_B1F_Text_233B4A: @ 8233B4A - .string "I can’t win at all…$" - -AquaHideout_B1F_Text_233B5E: @ 8233B5E - .string "Our HIDEOUT’s secret?\p" - .string "Well, let’s just say…\n" - .string "There’s a submarine at the far end!\p" - .string "But, by now…\n" - .string "Kekekeke…$" - -AquaHideout_B1F_Text_233BC5: @ 8233BC5 - .string "Fuel supply loaded A-OK!\n" - .string "In-cruise snacks loaded A-OK!\p" - .string "Nothing left to do but KO a pesky\n" - .string "meddler!$" - -AquaHideout_B1F_Text_233C27: @ 8233C27 - .string "I took a serious licking!$" - -AquaHideout_B1F_Text_233C41: @ 8233C41 - .string "Humph!\n" - .string "This was supposed to happen!\p" - .string "My mission was to just hold you up!$" - -AquaHideout_B1F_Text_233C89: @ 8233C89 - .string "Yawn… Keeping watch over the\n" - .string "HIDEOUT bores me. I’ll take you on.$" - -AquaHideout_B1F_Text_233CCA: @ 8233CCA - .string "Yawn…\n" - .string "Oh, I lost…$" - -AquaHideout_B1F_Text_233CDC: @ 8233CDC - .string "If you scurry too much, other TEAM\n" - .string "AQUA members might get you.$" - -AquaHideout_B1F_Text_233D1B: @ 8233D1B - .string "Hey!\n" - .string "You there!\p" - .string "Which do you think is cooler?\n" - .string "TEAM AQUA’s uniform or TEAM MAGMA’s?$" - -AquaHideout_B1F_Text_233D6E: @ 8233D6E - .string "I lost in a cool way…$" - -AquaHideout_B1F_Text_233D84: @ 8233D84 - .string "If you have a cool uniform, you look\n" - .string "good even in a loss, don’t you think?$" - diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc deleted file mode 100644 index fd3868512..000000000 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ /dev/null @@ -1,160 +0,0 @@ -AquaHideout_B2F_MapScripts:: @ 8233DCF - map_script 3, AquaHideout_B2F_MapScript1_233DD5 - .byte 0 - -AquaHideout_B2F_MapScript1_233DD5: @ 8233DD5 - checkflag FLAG_0x070 - call_if 1, AquaHideout_B2F_EventScript_233DDF - end - -AquaHideout_B2F_EventScript_233DDF:: @ 8233DDF - setvar VAR_TEMP_1, 1 - return - -AquaHideout_B2F_EventScript_233DE5:: @ 8233DE5 - lockall - setvar VAR_0x8008, 1 - playse SE_PIN - applymovement VAR_0x8008, AquaHideout_B2F_Movement_272598 - waitmovement 0 - applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E - waitmovement 0 - setvar VAR_TEMP_1, 1 - releaseall - end - -AquaHideout_B2F_EventScript_233E09:: @ 8233E09 - trainerbattle 2, TRAINER_MATT, 0, AquaHideout_B2F_Text_233EDD, AquaHideout_B2F_Text_233F8D, AquaHideout_B2F_EventScript_233E25 - msgbox AquaHideout_B2F_Text_233FF2, 4 - release - end - -AquaHideout_B2F_EventScript_233E25:: @ 8233E25 - setvar VAR_0x8008, 1 - setvar VAR_0x8009, 4 - applymovement VAR_0x8008, AquaHideout_B2F_Movement_2725A4 - waitmovement 0 - delay 20 - applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E - waitmovement 0 - msgbox AquaHideout_B2F_Text_233FA6, 4 - closemessage - applymovement VAR_0x8008, AquaHideout_B2F_Movement_2725A4 - applymovement VAR_0x8009, AquaHideout_B2F_Movement_233E80 - waitmovement 0 - removeobject VAR_0x8009 - delay 20 - applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E - waitmovement 0 - msgbox AquaHideout_B2F_Text_233FF2, 4 - setflag FLAG_0x070 - setflag FLAG_0x354 - release - end - -AquaHideout_B2F_Movement_233E80: @ 8233E80 - walk_left - walk_left - walk_left - walk_left - step_end - -AquaHideout_B2F_Movement_233E85: @ 8233E85 - walk_right - walk_right - walk_right - walk_right - step_end - -AquaHideout_B2F_EventScript_233E8A:: @ 8233E8A - trainerbattle 2, TRAINER_GRUNT_4, 0, AquaHideout_B2F_Text_2340B4, AquaHideout_B2F_Text_2340F0, AquaHideout_B2F_EventScript_233EA5 - msgbox AquaHideout_B2F_Text_234112, 6 - end - -AquaHideout_B2F_EventScript_233EA5:: @ 8233EA5 - msgbox AquaHideout_B2F_Text_234112, 4 - release - end - -AquaHideout_B2F_EventScript_233EAF:: @ 8233EAF - trainerbattle 0, TRAINER_GRUNT_22, 0, AquaHideout_B2F_Text_23412D, AquaHideout_B2F_Text_2341CE - msgbox AquaHideout_B2F_Text_2341FE, 6 - end - -AquaHideout_B2F_EventScript_233EC6:: @ 8233EC6 - trainerbattle 0, TRAINER_GRUNT_26, 0, AquaHideout_B2F_Text_23426F, AquaHideout_B2F_Text_2342CC - msgbox AquaHideout_B2F_Text_2342FF, 6 - end - -AquaHideout_B2F_Text_233EDD: @ 8233EDD - .string "Hehehe…\p" - .string "Got here already, did you?\n" - .string "We underestimated you!\p" - .string "But this is it!\p" - .string "I’m a cut above the GRUNTS you’ve seen\n" - .string "so far.\p" - .string "I’m not stalling for time.\n" - .string "I’m going to pulverize you!$" - -AquaHideout_B2F_Text_233F8D: @ 8233F8D - .string "Hehehe…\n" - .string "So, I lost, too…$" - -AquaHideout_B2F_Text_233FA6: @ 8233FA6 - .string "Hehehe!\p" - .string "While I was toying with you, our BOSS\n" - .string "got through his preparations!$" - -AquaHideout_B2F_Text_233FF2: @ 8233FF2 - .string "Hehehe!\p" - .string "Our BOSS has already gone on his way to\n" - .string "some cave under the sea!\p" - .string "If you’re going to give chase, you’d\n" - .string "better search the big, wide sea beyond\l" - .string "LILYCOVE.\p" - .string "But will you find it then?\n" - .string "Hehehe!$" - -AquaHideout_B2F_Text_2340B4: @ 82340B4 - .string "Wahahah, I grew weary of waiting!\n" - .string "You owe me a battle, too!$" - -AquaHideout_B2F_Text_2340F0: @ 82340F0 - .string "Tired of waiting…\n" - .string "Lost and dazed…$" - -AquaHideout_B2F_Text_234112: @ 8234112 - .string "BOSS…\n" - .string "Is this good enough?$" - -AquaHideout_B2F_Text_23412D: @ 823412D - .string "Warp panels, the HIDEOUT’s pride\n" - .string "and joy!\p" - .string "You’re clueless about where you are,\n" - .string "aren’t you?\p" - .string "Fluster and tire out the enemy, then\n" - .string "lower the boom! That’s our plan!$" - -AquaHideout_B2F_Text_2341CE: @ 82341CE - .string "What’s wrong with you?\n" - .string "You’re not tired at all!$" - -AquaHideout_B2F_Text_2341FE: @ 82341FE - .string "That reminds me… I can’t remember\n" - .string "where I put the MASTER BALL.\p" - .string "If I fail to guard it, our BOSS will\n" - .string "chew me out…$" - -AquaHideout_B2F_Text_23426F: @ 823426F - .string "When I joined TEAM AQUA, the first\n" - .string "thing I had to learn was how these\l" - .string "warp panels connected.$" - -AquaHideout_B2F_Text_2342CC: @ 82342CC - .string "I was too occupied thinking about\n" - .string "the warp panels…$" - -AquaHideout_B2F_Text_2342FF: @ 82342FF - .string "I’ll have to learn about how I can\n" - .string "battle more effectively…$" - diff --git a/data/scripts/maps/AquaHideout_UnusedRubyMap1.inc b/data/scripts/maps/AquaHideout_UnusedRubyMap1.inc deleted file mode 100644 index 73cde82a9..000000000 --- a/data/scripts/maps/AquaHideout_UnusedRubyMap1.inc +++ /dev/null @@ -1,3 +0,0 @@ -AquaHideout_UnusedRubyMap1_MapScripts:: @ 823929B - .byte 0 - diff --git a/data/scripts/maps/AquaHideout_UnusedRubyMap2.inc b/data/scripts/maps/AquaHideout_UnusedRubyMap2.inc deleted file mode 100644 index 28901497a..000000000 --- a/data/scripts/maps/AquaHideout_UnusedRubyMap2.inc +++ /dev/null @@ -1,3 +0,0 @@ -AquaHideout_UnusedRubyMap2_MapScripts:: @ 823929C - .byte 0 - diff --git a/data/scripts/maps/AquaHideout_UnusedRubyMap3.inc b/data/scripts/maps/AquaHideout_UnusedRubyMap3.inc deleted file mode 100644 index de0e6d7dd..000000000 --- a/data/scripts/maps/AquaHideout_UnusedRubyMap3.inc +++ /dev/null @@ -1,3 +0,0 @@ -AquaHideout_UnusedRubyMap3_MapScripts:: @ 823929D - .byte 0 - diff --git a/data/scripts/maps/ArtisanCave_1F.inc b/data/scripts/maps/ArtisanCave_1F.inc deleted file mode 100644 index 18090ff68..000000000 --- a/data/scripts/maps/ArtisanCave_1F.inc +++ /dev/null @@ -1,3 +0,0 @@ -ArtisanCave_1F_MapScripts:: @ 823AFB7 - .byte 0 - diff --git a/data/scripts/maps/ArtisanCave_B1F.inc b/data/scripts/maps/ArtisanCave_B1F.inc deleted file mode 100644 index 059343a56..000000000 --- a/data/scripts/maps/ArtisanCave_B1F.inc +++ /dev/null @@ -1,8 +0,0 @@ -ArtisanCave_B1F_MapScripts:: @ 823AFAD - map_script 3, ArtisanCave_B1F_MapScript1_23AFB3 - .byte 0 - -ArtisanCave_B1F_MapScript1_23AFB3: @ 823AFB3 - setflag FLAG_0x8DF - end - diff --git a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc deleted file mode 100644 index 076eeab6e..000000000 --- a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc +++ /dev/null @@ -1,712 +0,0 @@ -BattleFrontier_BattleArenaBattleRoom_MapScripts:: @ 8257487 - map_script 3, BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0 - map_script 2, BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2 - map_script 4, BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C - map_script 5, BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C - .byte 0 - -BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C: @ 825749C - special sub_8139980 - end - -BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0: @ 82574A0 - setvar VAR_0x8004, 5 - special sub_81A1780 - call BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE - end - -BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE:: @ 82574AE - checkplayergender - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC - return - -BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6:: @ 82574C6 - setvar VAR_OBJ_GFX_ID_1, 100 - return - -BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC:: @ 82574CC - setvar VAR_OBJ_GFX_ID_1, 105 - return - -BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2: @ 82574D2 - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC - .2byte 0 - -BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC:: @ 82574DC - lockall - showobjectat 8, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM - applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE2 - waitmovement 0 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25752E - applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257C08 - applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BEB - setvar VAR_TEMP_2, 1 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 6 - setvar VAR_0x8006, 1 - special sub_81A1780 - goto BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 - -BattleFrontier_BattleArenaBattleRoom_EventScript_25752E:: @ 825752E - setvar VAR_0x8004, 3 - special sub_8161F74 - addobject 7 - applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BEF - waitmovement 0 - applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 - playse SE_W187 - waitse - waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C3D, 4 - closemessage - applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE5 - waitmovement 0 - applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 - playse SE_W187 - waitse - waitmovement 0 - setvar VAR_0x8004, 6 - special sub_81A5238 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C68, 4 - closemessage - applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF2 - waitmovement 0 - applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 - playse SE_W187 - waitse - waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C93, 4 - closemessage - applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE5 - applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF2 - waitmovement 0 - setvar VAR_0x8004, 5 - special sub_8195960 - msgbox 0x2021fc4, 4 - waitmessage - call BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C - switch VAR_RESULT - case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257630 - -BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB:: @ 82575DB - applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 - applymovement 1, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 - applymovement 2, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 - applymovement 3, BattleFrontier_BattleArenaBattleRoom_Movement_257C05 - applymovement 4, BattleFrontier_BattleArenaBattleRoom_Movement_257C05 - playse SE_W173 - waitse - waitmovement 0 - setvar VAR_0x8004, 6 - special sub_81A5238 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CCE, 4 - -BattleFrontier_BattleArenaBattleRoom_EventScript_257615:: @ 8257615 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 4 - special sub_81A1780 - warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8 - waitstate - -BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630 - call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special sub_81A1780 - addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 - switch VAR_RESULT - case 7, BattleFrontier_BattleArenaBattleRoom_EventScript_257852 - applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE7 - applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BFA - waitmovement 0 - removeobject 7 - applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257C08 - applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BEB - waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CE9, 4 - special LoadPlayerParty - special SavePlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 - special sub_81A1780 - playfanfare MUS_ME_ASA - waitfanfare - special HealPlayerParty - -BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0:: @ 82576B0 - setvar VAR_0x8004, 9 - special sub_81A1780 - copyvar VAR_TEMP_F, VAR_RESULT - compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special sub_81A1780 - compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257870 - compare VAR_RESULT, 2 - call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257877 - compare VAR_RESULT, 3 - call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25787E - compare VAR_RESULT, 4 - call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257885 - compare VAR_RESULT, 5 - call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25788C - compare VAR_RESULT, 6 - call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257893 - call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257768 - multichoice 19, 4, 103, 1 - switch VAR_RESULT - case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_25783A - case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25779E - case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA - case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_257808 - case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 - -BattleFrontier_BattleArenaBattleRoom_EventScript_257768:: @ 8257768 - multichoice 20, 6, 104, 1 - switch VAR_RESULT - case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_25783A - case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA - case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_257808 - case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 - -BattleFrontier_BattleArenaBattleRoom_EventScript_25779E:: @ 825779E - message BattleFrontier_BattleArenaBattleRoom_Text_257F04 - waitmessage - multichoicedefault 20, 8, 94, 1, 0 - switch VAR_RESULT - case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 - case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_2577D0 - case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 - -BattleFrontier_BattleArenaBattleRoom_EventScript_2577D0:: @ 82577D0 - call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8B4 - goto BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 - -BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA:: @ 82577DA - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257E6B, 5 - switch VAR_RESULT - case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 - case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25789A - case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 - -BattleFrontier_BattleArenaBattleRoom_EventScript_257808:: @ 8257808 - message BattleFrontier_BattleArenaBattleRoom_Text_257E9E - waitmessage - multichoicedefault 20, 8, 94, 1, 0 - switch VAR_RESULT - case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 - case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_257615 - case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 - -BattleFrontier_BattleArenaBattleRoom_EventScript_25783A:: @ 825783A - closemessage - applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BED - applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257BED - waitmovement 0 - goto BattleFrontier_BattleArenaBattleRoom_EventScript_25752E - waitstate - -BattleFrontier_BattleArenaBattleRoom_EventScript_257852:: @ 8257852 - delay 60 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 3 - special sub_81A1780 - warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8 - waitstate - -BattleFrontier_BattleArenaBattleRoom_EventScript_257870:: @ 8257870 - message BattleFrontier_BattleArenaBattleRoom_Text_257D17 - waitmessage - return - -BattleFrontier_BattleArenaBattleRoom_EventScript_257877:: @ 8257877 - message BattleFrontier_BattleArenaBattleRoom_Text_257D50 - waitmessage - return - -BattleFrontier_BattleArenaBattleRoom_EventScript_25787E:: @ 825787E - message BattleFrontier_BattleArenaBattleRoom_Text_257D88 - waitmessage - return - -BattleFrontier_BattleArenaBattleRoom_EventScript_257885:: @ 8257885 - message BattleFrontier_BattleArenaBattleRoom_Text_257DC1 - waitmessage - return - -BattleFrontier_BattleArenaBattleRoom_EventScript_25788C:: @ 825788C - message BattleFrontier_BattleArenaBattleRoom_Text_257DF9 - waitmessage - return - -BattleFrontier_BattleArenaBattleRoom_EventScript_257893:: @ 8257893 - message BattleFrontier_BattleArenaBattleRoom_Text_257E31 - waitmessage - return - -BattleFrontier_BattleArenaBattleRoom_EventScript_25789A:: @ 825789A - message BattleFrontier_BattleArenaBattleRoom_Text_257EDB - waitmessage - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 2 - special sub_81A5238 - playse SE_SAVE - waitse - fadescreen 1 - setvar VAR_0x8004, 4 - special sub_81A1780 - end - -BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC:: @ 82578BC - compare VAR_TEMP_2, 1 - goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257F45, 4 - setvar VAR_TEMP_2, 1 - -BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4:: @ 82578D4 - message BattleFrontier_BattleArenaBattleRoom_Text_257FBB - waitmessage - call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25792B - multichoice 19, 4, 103, 1 - switch VAR_RESULT - case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_257961 - case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25779E - case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA - case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_257808 - case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4 - -BattleFrontier_BattleArenaBattleRoom_EventScript_25792B:: @ 825792B - multichoice 20, 6, 104, 1 - switch VAR_RESULT - case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_257961 - case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA - case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_257808 - case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4 - -BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961 - call BattleFrontier_BattleArenaBattleRoom_EventScript_242170 - applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BED - applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257BED - waitmovement 0 - applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 - playse SE_W187 - waitse - waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C3D, 4 - closemessage - applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE4 - waitmovement 0 - applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 - playse SE_W187 - waitse - waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257FED, 4 - closemessage - addobject 7 - applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF4 - waitmovement 0 - applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF2 - waitmovement 0 - switch VAR_TEMP_F - case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5 - case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F - case 4, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 7 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F - msgbox BattleFrontier_BattleArenaBattleRoom_Text_25801C, 4 - closemessage - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 7 - special sub_81A1780 - applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30 - waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_25804E, 4 - closemessage - applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C3A - waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_258068, 4 - -BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F:: @ 8257A3F - msgbox BattleFrontier_BattleArenaBattleRoom_Text_25810D, 4 - call BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C - goto BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB - -BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C - call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9 - setvar VAR_0x8004, 12 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257852 - applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1 - waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_25813F, 4 - playfanfare MUS_ME_SYMBOLGET - message BattleFrontier_BattleArenaBattleRoom_Text_25819C - waitmessage - waitfanfare - setvar VAR_0x8004, 13 - special sub_81A1780 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_2581CF, 4 - goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852 - -BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5:: @ 8257AA5 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 7 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_258213, 4 - closemessage - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 7 - special sub_81A1780 - applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30 - waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582A2, 4 - closemessage - applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C3A - waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582BB, 4 - -BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8:: @ 8257AF8 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582F9, 4 - call BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257B15 - goto BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB - -BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15 - call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9 - setvar VAR_0x8004, 12 - special sub_81A1780 - compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257852 - applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1 - waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_258323, 4 - playfanfare MUS_ME_SYMBOLGET - message BattleFrontier_BattleArenaBattleRoom_Text_25835B - waitmessage - waitfanfare - setvar VAR_0x8004, 13 - special sub_81A1780 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_258383, 4 - goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852 - -BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E:: @ 8257B5E - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C93, 4 - call BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C - return - -BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C:: @ 8257B6C -FallarborTown_BattleTentBattleRoom_EventScript_257B6C:: @ 8257B6C - closemessage - setvar VAR_TEMP_2, 0 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 6 - setvar VAR_0x8006, 0 - special sub_81A1780 - special HealPlayerParty - setvar VAR_0x8004, 5 - setvar VAR_0x8005, 0 - special sub_8163AC4 - waitstate - setvar VAR_0x8004, 18 - special sub_81A1780 - special HealPlayerParty - setvar VAR_0x8004, 21 - special sub_81A1780 - return - -BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9:: @ 8257BA9 - applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 - applymovement 1, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 - applymovement 2, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 - applymovement 3, BattleFrontier_BattleArenaBattleRoom_Movement_257C05 - applymovement 4, BattleFrontier_BattleArenaBattleRoom_Movement_257C05 - playse SE_BAN - waitse - waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CB3, 4 - closemessage - call BattleFrontier_BattleArenaBattleRoom_EventScript_241EBA - return - -BattleFrontier_BattleArenaBattleRoom_Movement_257BE2: @ 8257BE2 - walk_right - walk_right - -BattleFrontier_BattleArenaBattleRoom_Movement_257BE4: @ 8257BE4 - walk_right - -BattleFrontier_BattleArenaBattleRoom_Movement_257BE5: @ 8257BE5 - walk_right - step_end - -BattleFrontier_BattleArenaBattleRoom_Movement_257BE7: @ 8257BE7 - walk_left - walk_left - walk_in_place_fastest_right - step_end - -BattleFrontier_BattleArenaBattleRoom_Movement_257BEB: @ 8257BEB - walk_in_place_fastest_up - step_end - -BattleFrontier_BattleArenaBattleRoom_Movement_257BED: @ 8257BED - walk_in_place_fastest_right - step_end - -BattleFrontier_BattleArenaBattleRoom_Movement_257BEF: @ 8257BEF - walk_left - walk_left - -BattleFrontier_BattleArenaBattleRoom_Movement_257BF1: @ 8257BF1 - walk_left - -BattleFrontier_BattleArenaBattleRoom_Movement_257BF2: @ 8257BF2 - walk_left - step_end - -BattleFrontier_BattleArenaBattleRoom_Movement_257BF4: @ 8257BF4 - walk_fast_left - walk_fast_left - walk_fast_left - walk_fast_left - walk_fast_left - step_end - -BattleFrontier_BattleArenaBattleRoom_Movement_257BFA: @ 8257BFA - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - step_end - -BattleFrontier_BattleArenaBattleRoom_Movement_257C02: @ 8257C02 - disable_jump_landing_ground_effect - jump_in_place_down - step_end - -BattleFrontier_BattleArenaBattleRoom_Movement_257C05: @ 8257C05 - disable_jump_landing_ground_effect - jump_in_place_up - step_end - -BattleFrontier_BattleArenaBattleRoom_Movement_257C08: @ 8257C08 - walk_in_place_fastest_down - step_end - -BattleFrontier_BattleArenaBattleRoom_Movement_257C0A: @ 8257C0A - walk_in_place_fastest_right - step_end - -BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C: @ 8257C0C - map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleArenaBattleRoom_EventScript_257C16 - .2byte 0 - -BattleFrontier_BattleArenaBattleRoom_EventScript_257C16:: @ 8257C16 - hideobjectat 8, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM - removeobject 7 - call BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC - applymovement 255, BattleFrontier_BattleArenaBattleRoom_Movement_24C773 - setvar VAR_TEMP_1, 1 - end - -BattleFrontier_BattleArenaBattleRoom_Movement_257C30: @ 8257C30 - 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 - walk_down - walk_in_place_fastest_left - step_end - -BattleFrontier_BattleArenaBattleRoom_Text_257C3D: @ 8257C3D - .string "REFEREE: TRAINER {PLAYER}!\n" - .string "Step forward, please!$" - -BattleFrontier_BattleArenaBattleRoom_Text_257C68: @ 8257C68 - .string "REFEREE: TRAINER {STR_VAR_1}!\n" - .string "Step forward, please!$" - -BattleFrontier_BattleArenaBattleRoom_Text_257C93: @ 8257C93 -FallarborTown_BattleTentBattleRoom_Text_257C93: @ 8257C93 - .string "REFEREE: Set KO Tourney!\n" - .string "Begin!$" - -BattleFrontier_BattleArenaBattleRoom_Text_257CB3: @ 8257CB3 -FallarborTown_BattleTentBattleRoom_Text_257CB3: @ 8257CB3 - .string "REFEREE: The winner is {PLAYER}!$" - -BattleFrontier_BattleArenaBattleRoom_Text_257CCE: @ 8257CCE -FallarborTown_BattleTentBattleRoom_Text_257CCE: @ 8257CCE - .string "REFEREE: The winner is {STR_VAR_1}!$" - -BattleFrontier_BattleArenaBattleRoom_Text_257CE9: @ 8257CE9 -FallarborTown_BattleTentBattleRoom_Text_257CE9: @ 8257CE9 - .string "Your POKéMON will be restored to\n" - .string "full health.$" - -BattleFrontier_BattleArenaBattleRoom_Text_257D17: @ 8257D17 -FallarborTown_BattleTentBattleRoom_Text_257D17: @ 8257D17 - .string "Next up, your second opponent!\n" - .string "Are you ready to move on?$" - -BattleFrontier_BattleArenaBattleRoom_Text_257D50: @ 8257D50 -FallarborTown_BattleTentBattleRoom_Text_257D50: @ 8257D50 - .string "Next up, your third opponent!\n" - .string "Are you ready to move on?$" - -BattleFrontier_BattleArenaBattleRoom_Text_257D88: @ 8257D88 - .string "Next up, your fourth opponent!\n" - .string "Are you ready to move on?$" - -BattleFrontier_BattleArenaBattleRoom_Text_257DC1: @ 8257DC1 - .string "Next up, your fifth opponent!\n" - .string "Are you ready to move on?$" - -BattleFrontier_BattleArenaBattleRoom_Text_257DF9: @ 8257DF9 - .string "Next up, your sixth opponent!\n" - .string "Are you ready to move on?$" - -BattleFrontier_BattleArenaBattleRoom_Text_257E31: @ 8257E31 - .string "Next up, your seventh opponent!\n" - .string "Are you ready to move on?$" - -BattleFrontier_BattleArenaBattleRoom_Text_257E6B: @ 8257E6B -FallarborTown_BattleTentBattleRoom_Text_257E6B: @ 8257E6B - .string "Would you like to save the game and\n" - .string "shut down now?$" - -BattleFrontier_BattleArenaBattleRoom_Text_257E9E: @ 8257E9E -FallarborTown_BattleTentBattleRoom_Text_257E9E: @ 8257E9E - .string "Would you like to retire from your\n" - .string "Set KO Tourney challenge?$" - -BattleFrontier_BattleArenaBattleRoom_Text_257EDB: @ 8257EDB -FallarborTown_BattleTentBattleRoom_Text_257EDB: @ 8257EDB - .string "I am saving your game data.\n" - .string "Please wait.$" - -BattleFrontier_BattleArenaBattleRoom_Text_257F04: @ 8257F04 - .string "Would you like to record your last\n" - .string "battle on your FRONTIER PASS?$" - -BattleFrontier_BattleArenaBattleRoom_Text_257F45: @ 8257F45 - .string "My dear challenger!\p" - .string "Your skill level is truly astounding!\p" - .string "We now would like you to face our\n" - .string "leader, the ARENA TYCOON!$" - -BattleFrontier_BattleArenaBattleRoom_Text_257FBB: @ 8257FBB - .string "A battle with the ARENA TYCOON!\n" - .string "Are you prepared?$" - -BattleFrontier_BattleArenaBattleRoom_Text_257FED: @ 8257FED - .string "REFEREE: The ARENA TYCOON!\n" - .string "Make way for GRETA!$" - -BattleFrontier_BattleArenaBattleRoom_Text_25801C: @ 825801C - .string "GRETA: Hey!\n" - .string "Howdy!\p" - .string "…Wait, are you the challenger?$" - -BattleFrontier_BattleArenaBattleRoom_Text_25804E: @ 825804E - .string "Is that right? Hmm…\n" - .string "Hmhm…$" - -BattleFrontier_BattleArenaBattleRoom_Text_258068: @ 8258068 - .string "I don’t know how to say it, but…\n" - .string "To put it bluntly, you look pretty weak.\l" - .string "Are you sure you’re up for me?\p" - .string "Hmm…\p" - .string "Well, all right!\n" - .string "We’ll take things easy to start with!$" - -BattleFrontier_BattleArenaBattleRoom_Text_25810D: @ 825810D - .string "Okay! Let’s see you ignite my passion\n" - .string "for battle!$" - -BattleFrontier_BattleArenaBattleRoom_Text_25813F: @ 825813F - .string "GRETA: Ow, wait a second!\n" - .string "You are tough after all!\p" - .string "I like you!\n" - .string "Let’s see your FRONTIER PASS.$" - -BattleFrontier_BattleArenaBattleRoom_Text_25819C: @ 825819C - .string "The Guts Symbol was embossed on\n" - .string "the FRONTIER PASS!$" - -BattleFrontier_BattleArenaBattleRoom_Text_2581CF: @ 82581CF - .string "Hmm…\p" - .string "It’s going to be fun the next time!\n" - .string "I’m looking forward to it!$" - -BattleFrontier_BattleArenaBattleRoom_Text_258213: @ 8258213 - .string "GRETA: Hey! Howdy!\n" - .string "You finally won your way up to me!\p" - .string "I was getting worried waiting for you!\n" - .string "I was really looking forward to seeing\l" - .string "you again!$" - -BattleFrontier_BattleArenaBattleRoom_Text_2582A2: @ 82582A2 - .string "… … …\n" - .string "So, are you ready?$" - -BattleFrontier_BattleArenaBattleRoom_Text_2582BB: @ 82582BB - .string "I won’t allow a halfhearted effort!\n" - .string "Be ready for a thrashing!$" - -BattleFrontier_BattleArenaBattleRoom_Text_2582F9: @ 82582F9 - .string "Come on, REFEREE!\n" - .string "Let’s get this started!$" - -BattleFrontier_BattleArenaBattleRoom_Text_258323: @ 8258323 - .string "GRETA: Gaaah! Blown away!\n" - .string "Let’s see your FRONTIER PASS!$" - -BattleFrontier_BattleArenaBattleRoom_Text_25835B: @ 825835B - .string "The Guts Symbol took on\n" - .string "a golden shine!$" - -BattleFrontier_BattleArenaBattleRoom_Text_258383: @ 8258383 - .string "Arrrgh!\n" - .string "This is so infuriating!\p" - .string "If we ever battle again, I won’t lose!\n" - .string "Don’t you forget it! Bye-bye!$" diff --git a/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc b/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc deleted file mode 100644 index a353379c2..000000000 --- a/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc +++ /dev/null @@ -1,90 +0,0 @@ -BattleFrontier_BattleArenaCorridor_MapScripts:: @ 82573B9 - map_script 2, BattleFrontier_BattleArenaCorridor_MapScript2_2573BF - .byte 0 - -BattleFrontier_BattleArenaCorridor_MapScript2_2573BF: @ 82573BF - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaCorridor_EventScript_2573C9 - .2byte 0 - -BattleFrontier_BattleArenaCorridor_EventScript_2573C9:: @ 82573C9 - delay 16 - setvar VAR_TEMP_0, 1 - applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_25742F - applymovement 255, BattleFrontier_BattleArenaCorridor_Movement_257417 - waitmovement 0 - applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_257444 - waitmovement 0 - msgbox BattleFrontier_BattleArenaCorridor_Text_257449, 3 - applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_257446 - waitmovement 0 - applymovement 255, BattleFrontier_BattleArenaCorridor_Movement_25742C - waitmovement 0 - setvar VAR_0x8006, 0 - warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM, 255, 7, 5 - waitstate - end - -BattleFrontier_BattleArenaCorridor_Movement_257417: @ 8257417 - 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 - walk_right - set_invisible - step_end - -BattleFrontier_BattleArenaCorridor_Movement_25742F: @ 825742F - 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 - walk_in_place_fastest_left - step_end - -BattleFrontier_BattleArenaCorridor_Movement_257446: @ 8257446 - walk_up - walk_in_place_fastest_down - step_end - -BattleFrontier_BattleArenaCorridor_Text_257449: @ 8257449 - .string "Your battles shall be waged in\n" - .string "the next room. Please step in!$" - diff --git a/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc b/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc deleted file mode 100644 index a376bfe22..000000000 --- a/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc +++ /dev/null @@ -1,638 +0,0 @@ -BattleFrontier_BattleArenaLobby_MapScripts:: @ 8255C36 - map_script 2, BattleFrontier_BattleArenaLobby_MapScript2_255C55 - map_script 4, BattleFrontier_BattleArenaLobby_MapScript2_255C41 - .byte 0 - -BattleFrontier_BattleArenaLobby_MapScript2_255C41: @ 8255C41 - map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleArenaLobby_EventScript_255C4B - .2byte 0 - -BattleFrontier_BattleArenaLobby_EventScript_255C4B:: @ 8255C4B - setvar VAR_TEMP_1, 1 - turnobject 255, 2 - end - -BattleFrontier_BattleArenaLobby_MapScript2_255C55: @ 8255C55 - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaLobby_EventScript_255C7F - map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattleArenaLobby_EventScript_255C88 - map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattleArenaLobby_EventScript_255DC0 - map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattleArenaLobby_EventScript_255CCF - map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattleArenaLobby_EventScript_255D2B - .2byte 0 - -BattleFrontier_BattleArenaLobby_EventScript_255C7F:: @ 8255C7F - setvar VAR_0x8004, 0 - special sub_81A1780 - end - -BattleFrontier_BattleArenaLobby_EventScript_255C88:: @ 8255C88 - lockall - msgbox BattleFrontier_BattleArenaLobby_Text_256811, 4 - closemessage - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 0 - special sub_81A5238 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 0 - special sub_81A5238 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_TEMP_0, 255 - releaseall - end - -BattleFrontier_BattleArenaLobby_EventScript_255CCF:: @ 8255CCF - lockall - setvar VAR_0x8004, 10 - special sub_81A1780 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleArenaLobby_EventScript_255CF0 - msgbox BattleFrontier_BattleArenaLobby_Text_2568E7, 4 - goto BattleFrontier_BattleArenaLobby_EventScript_255CF8 - -BattleFrontier_BattleArenaLobby_EventScript_255CF0:: @ 8255CF0 - msgbox BattleFrontier_BattleArenaLobby_Text_2572D9, 4 - -BattleFrontier_BattleArenaLobby_EventScript_255CF8:: @ 8255CF8 - msgbox BattleFrontier_BattleArenaLobby_Text_257353, 4 - setvar VAR_0x8004, 11 - special sub_81A1780 - msgbox BattleFrontier_BattleArenaLobby_Text_241520, 9 - message BattleFrontier_BattleArenaLobby_Text_256931 - waitmessage - call BattleFrontier_BattleArenaLobby_EventScript_255D59 - msgbox BattleFrontier_BattleArenaLobby_Text_256A74, 4 - closemessage - setvar VAR_TEMP_0, 255 - releaseall - end - -BattleFrontier_BattleArenaLobby_EventScript_255D2B:: @ 8255D2B - lockall - message BattleFrontier_BattleArenaLobby_Text_256A2C - waitmessage - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 0 - special sub_81A5238 - call BattleFrontier_BattleArenaLobby_EventScript_255D59 - msgbox BattleFrontier_BattleArenaLobby_Text_256A74, 4 - closemessage - setvar VAR_TEMP_0, 255 - releaseall - end - -BattleFrontier_BattleArenaLobby_EventScript_255D59:: @ 8255D59 - setvar VAR_0x8004, 8 - special sub_81A1780 - special LoadPlayerParty - special HealPlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 0 - special sub_81A5238 - playse SE_SAVE - waitse - call BattleFrontier_BattleArenaLobby_EventScript_23E8E0 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleArenaLobby_EventScript_255DBF - message BattleFrontier_BattleArenaLobby_Text_256B19 - waitmessage - multichoicedefault 20, 8, 94, 1, 0 - switch VAR_RESULT - case 1, BattleFrontier_BattleArenaLobby_EventScript_255DBF - case 0, BattleFrontier_BattleArenaLobby_EventScript_255DBA - case 127, BattleFrontier_BattleArenaLobby_EventScript_255DBF - -BattleFrontier_BattleArenaLobby_EventScript_255DBA:: @ 8255DBA - call BattleFrontier_BattleArenaLobby_EventScript_23E8B4 - -BattleFrontier_BattleArenaLobby_EventScript_255DBF:: @ 8255DBF - return - -BattleFrontier_BattleArenaLobby_EventScript_255DC0:: @ 8255DC0 - lockall - message BattleFrontier_BattleArenaLobby_Text_256AA1 - waitmessage - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 1 - special sub_81A5238 - playse SE_SAVE - waitse - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_TEMP_0, 255 - goto BattleFrontier_BattleArenaLobby_EventScript_255F54 - -BattleFrontier_BattleArenaLobby_EventScript_255DF4:: @ 8255DF4 - lock - faceplayer - setvar VAR_FRONTIER_FACILITY, 3 - setvar VAR_0x40CE, 0 - special SavePlayerParty - msgbox BattleFrontier_BattleArenaLobby_Text_256166, 4 - -BattleFrontier_BattleArenaLobby_EventScript_255E0B:: @ 8255E0B - message BattleFrontier_BattleArenaLobby_Text_2561EA - waitmessage - multichoice 17, 6, 23, 0 - switch VAR_RESULT - case 0, BattleFrontier_BattleArenaLobby_EventScript_255E47 - case 1, BattleFrontier_BattleArenaLobby_EventScript_255F9F - case 2, BattleFrontier_BattleArenaLobby_EventScript_255FFB - case 127, BattleFrontier_BattleArenaLobby_EventScript_255FFB - -BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47 - message BattleFrontier_BattleArenaLobby_Text_256513 - waitmessage - multichoice 17, 6, 24, 0 - switch VAR_RESULT - case 2, BattleFrontier_BattleArenaLobby_EventScript_255FFB - case 127, BattleFrontier_BattleArenaLobby_EventScript_255FFB - setvar VAR_0x8004, 15 - special sub_81A1780 - compare VAR_0x8004, 1 - goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FAC - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 - msgbox BattleFrontier_BattleArenaLobby_Text_256573, 4 - fadescreen 1 - call BattleFrontier_BattleArenaLobby_EventScript_23F2B7 - copyvar VAR_0x8004, VAR_RESULT - setvar VAR_0x8005, 3 - special sub_80F9490 - waitstate - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FF8 - msgbox BattleFrontier_BattleArenaLobby_Text_2564CE, 5 - switch VAR_RESULT - case 0, BattleFrontier_BattleArenaLobby_EventScript_255FF8 - case 1, BattleFrontier_BattleArenaLobby_EventScript_255EE8 - case 127, BattleFrontier_BattleArenaLobby_EventScript_255FF8 - -BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8 - setvar VAR_TEMP_0, 0 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 4 - special sub_81A1780 - setvar VAR_0x8004, 0 - special sub_81A5238 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 1 - special sub_81A5238 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 1 - special sub_81A1780 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 0 - special sub_81A1780 - special LoadPlayerParty - closemessage - delay 2 - call BattleFrontier_BattleArenaLobby_EventScript_27134F - setvar VAR_TEMP_0, 255 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FE1 - -BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54 - special SavePlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 - special sub_81A1780 - msgbox BattleFrontier_BattleArenaLobby_Text_2567E6, 4 - closemessage - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - special sub_81A1780 - compare VAR_RESULT, 0 - call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256005 - compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256050 - warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR, 255, 9, 13 - setvar VAR_TEMP_0, 0 - waitstate - end - -BattleFrontier_BattleArenaLobby_EventScript_255F9F:: @ 8255F9F - msgbox BattleFrontier_BattleArenaLobby_Text_25624C, 4 - goto BattleFrontier_BattleArenaLobby_EventScript_255E0B - -BattleFrontier_BattleArenaLobby_EventScript_255FAC:: @ 8255FAC - switch VAR_RESULT - case 0, BattleFrontier_BattleArenaLobby_EventScript_255FC7 - case 1, BattleFrontier_BattleArenaLobby_EventScript_255FD4 - -BattleFrontier_BattleArenaLobby_EventScript_255FC7:: @ 8255FC7 - msgbox BattleFrontier_BattleArenaLobby_Text_2566A8, 4 - goto BattleFrontier_BattleArenaLobby_EventScript_256003 - -BattleFrontier_BattleArenaLobby_EventScript_255FD4:: @ 8255FD4 - msgbox BattleFrontier_BattleArenaLobby_Text_2565A5, 4 - goto BattleFrontier_BattleArenaLobby_EventScript_256003 - -BattleFrontier_BattleArenaLobby_EventScript_255FE1:: @ 8255FE1 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special sub_81A1780 - goto BattleFrontier_BattleArenaLobby_EventScript_255FFB - -BattleFrontier_BattleArenaLobby_EventScript_255FF8:: @ 8255FF8 - special LoadPlayerParty - -BattleFrontier_BattleArenaLobby_EventScript_255FFB:: @ 8255FFB - msgbox BattleFrontier_BattleArenaLobby_Text_25621F, 4 - -BattleFrontier_BattleArenaLobby_EventScript_256003:: @ 8256003 - release - end - -BattleFrontier_BattleArenaLobby_EventScript_256005:: @ 8256005 - applymovement 1, BattleFrontier_BattleArenaLobby_Movement_256034 - applymovement 255, BattleFrontier_BattleArenaLobby_Movement_256041 - waitmovement 0 - opendoor 2, 2 - waitdooranim - applymovement 1, BattleFrontier_BattleArenaLobby_Movement_25603E - applymovement 255, BattleFrontier_BattleArenaLobby_Movement_25604C - waitmovement 0 - closedoor 2, 2 - waitdooranim - return - -BattleFrontier_BattleArenaLobby_Movement_256034: @ 8256034 - 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 - walk_up - set_invisible - step_end - -BattleFrontier_BattleArenaLobby_Movement_256041: @ 8256041 - 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 - walk_up - walk_up - set_invisible - step_end - -BattleFrontier_BattleArenaLobby_EventScript_256050:: @ 8256050 - applymovement 1, BattleFrontier_BattleArenaLobby_Movement_25607F - applymovement 255, BattleFrontier_BattleArenaLobby_Movement_256088 - waitmovement 0 - opendoor 11, 2 - waitdooranim - applymovement 1, BattleFrontier_BattleArenaLobby_Movement_25603E - applymovement 255, BattleFrontier_BattleArenaLobby_Movement_25604C - waitmovement 0 - closedoor 11, 2 - waitdooranim - return - -BattleFrontier_BattleArenaLobby_Movement_25607F: @ 825607F - walk_up - walk_up - walk_up - walk_right - walk_right - walk_right - walk_right - walk_up - step_end - -BattleFrontier_BattleArenaLobby_Movement_256088: @ 8256088 - 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 - lockall - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 3 - special sub_81A1780 - waitbuttonpress - special RemoveRecordsWindow - releaseall - end - -BattleFrontier_BattleArenaLobby_EventScript_2560A6:: @ 82560A6 - msgbox BattleFrontier_BattleArenaLobby_Text_256B5C, 2 - end - -BattleFrontier_BattleArenaLobby_EventScript_2560AF:: @ 82560AF - msgbox BattleFrontier_BattleArenaLobby_Text_256BCB, 2 - end - -BattleFrontier_BattleArenaLobby_EventScript_2560B8:: @ 82560B8 - msgbox BattleFrontier_BattleArenaLobby_Text_256C19, 2 - end - -BattleFrontier_BattleArenaLobby_EventScript_2560C1:: @ 82560C1 - msgbox BattleFrontier_BattleArenaLobby_Text_256C9A, 2 - end - -BattleFrontier_BattleArenaLobby_EventScript_2560CA:: @ 82560CA - lockall - msgbox BattleFrontier_BattleArenaLobby_Text_256DB8, 4 - goto BattleFrontier_BattleArenaLobby_EventScript_2560D9 - end - -BattleFrontier_BattleArenaLobby_EventScript_2560D9:: @ 82560D9 - message BattleFrontier_BattleArenaLobby_Text_256DDF - waitmessage - multichoice 17, 2, 96, 0 - switch VAR_RESULT - case 0, BattleFrontier_BattleArenaLobby_EventScript_25612C - case 1, BattleFrontier_BattleArenaLobby_EventScript_25613A - case 2, BattleFrontier_BattleArenaLobby_EventScript_256148 - case 3, BattleFrontier_BattleArenaLobby_EventScript_256156 - case 4, BattleFrontier_BattleArenaLobby_EventScript_256164 - case 127, BattleFrontier_BattleArenaLobby_EventScript_256164 - end - -BattleFrontier_BattleArenaLobby_EventScript_25612C:: @ 825612C - msgbox BattleFrontier_BattleArenaLobby_Text_256E02, 4 - goto BattleFrontier_BattleArenaLobby_EventScript_2560D9 - end - -BattleFrontier_BattleArenaLobby_EventScript_25613A:: @ 825613A - msgbox BattleFrontier_BattleArenaLobby_Text_256F43, 4 - goto BattleFrontier_BattleArenaLobby_EventScript_2560D9 - end - -BattleFrontier_BattleArenaLobby_EventScript_256148:: @ 8256148 - msgbox BattleFrontier_BattleArenaLobby_Text_256FF2, 4 - goto BattleFrontier_BattleArenaLobby_EventScript_2560D9 - end - -BattleFrontier_BattleArenaLobby_EventScript_256156:: @ 8256156 - msgbox BattleFrontier_BattleArenaLobby_Text_257202, 4 - goto BattleFrontier_BattleArenaLobby_EventScript_2560D9 - end - -BattleFrontier_BattleArenaLobby_EventScript_256164:: @ 8256164 - releaseall - end - -BattleFrontier_BattleArenaLobby_Text_256166: @ 8256166 - .string "Where the battling spirit of TRAINERS\n" - .string "is put to the test!\p" - .string "I welcome you to the BATTLE ARENA!\p" - .string "I am your guide to the Set KO Tourney!$" - -BattleFrontier_BattleArenaLobby_Text_2561EA: @ 82561EA - .string "Now, do you wish to take\n" - .string "the BATTLE ARENA challenge?$" - -BattleFrontier_BattleArenaLobby_Text_25621F: @ 825621F - .string "We await your challenge on\n" - .string "another occasion!$" - -BattleFrontier_BattleArenaLobby_Text_25624C: @ 825624C - .string "In the BATTLE ARENA, we undertake\n" - .string "the Set KO Tourney.\p" - .string "All participants enter with a team of\n" - .string "three POKéMON.\p" - .string "The three POKéMON must be lined up in\n" - .string "the order in which they are to appear.\p" - .string "During battle, the POKéMON will appear\n" - .string "one at a time in the preset order.\p" - .string "Once a POKéMON enters battle, it must\n" - .string "remain out until the match is decided.\p" - .string "If a match remains undecided in\n" - .string "three turns, it goes to judging.\p" - .string "If you wish to interrupt your challenge,\n" - .string "please save the game.\p" - .string "If you don’t save, you will not be able\n" - .string "to continue with your challenge.\p" - .string "If you pull off the feat of beating\n" - .string "seven TRAINERS in succession,\l" - .string "we will present you with Battle Points.$" - -BattleFrontier_BattleArenaLobby_Text_2564CE: @ 82564CE - .string "Before showing you to the BATTLE\n" - .string "ARENA, you must save. Is that okay?$" - -BattleFrontier_BattleArenaLobby_Text_256513: @ 8256513 - .string "The BATTLE ARENA offers two levels\n" - .string "of challenge, Level 50 and Open Level.\l" - .string "Which is your choice?$" - -BattleFrontier_BattleArenaLobby_Text_256573: @ 8256573 - .string "Very well, now select your\n" - .string "three POKéMON, please.$" - -BattleFrontier_BattleArenaLobby_Text_2565A5: @ 82565A5 - .string "My dear challenger!\p" - .string "You do not have the three POKéMON\n" - .string "required for entry.\p" - .string "To qualify, you must bring three\n" - .string "different kinds of POKéMON.\p" - .string "They also must not hold the same\n" - .string "kinds of items.\p" - .string "EGGS{STR_VAR_1} ineligible.\p" - .string "When you have made your preparations,\n" - .string "please do return.$" - -BattleFrontier_BattleArenaLobby_Text_2566A8: @ 82566A8 - .string "My dear challenger!\p" - .string "You do not have the three POKéMON\n" - .string "required for entry.\p" - .string "To qualify, you must bring three\n" - .string "different kinds of POKéMON.\p" - .string "The three different POKéMON\n" - .string "must all be Level 50 or lower.\p" - .string "They also must not hold the same\n" - .string "kinds of items.\p" - .string "EGGS{STR_VAR_1} ineligible.\p" - .string "When you have made your preparations,\n" - .string "please do return.$" - -BattleFrontier_BattleArenaLobby_Text_2567E6: @ 82567E6 - .string "I shall now guide you to\n" - .string "the BATTLE ARENA.$" - -BattleFrontier_BattleArenaLobby_Text_256811: @ 8256811 - .string "My dear challenger!\p" - .string "You did not save the game before\n" - .string "shutting down, did you?\p" - .string "It is unfortunate, but that has\n" - .string "resulted in your disqualification\l" - .string "from your challenge.\p" - .string "You may, of course, start with a fresh\n" - .string "challenge.$" - -BattleFrontier_BattleArenaLobby_Text_2568E7: @ 82568E7 - .string "We congratulate you for your splendid\n" - .string "string of wins over seven TRAINERS!$" - -BattleFrontier_BattleArenaLobby_Text_256931: @ 8256931 - .string "Your achievement will be recorded.\n" - .string "Please wait while I save the game.$" - -BattleFrontier_BattleArenaLobby_Text_256977: @ 8256977 - .string "In commemoration of your 7-win streak,\n" - .string "we present you with this prize.$" - -BattleFrontier_BattleArenaLobby_Text_2569BE: @ 82569BE - .string "{PLAYER} received the prize\n" - .string "{STR_VAR_1}.$" - -BattleFrontier_BattleArenaLobby_Text_2569D8: @ 82569D8 - .string "Oh?\n" - .string "Your BAG seems to be full.\p" - .string "I urge you to clear space and\n" - .string "return for your prize.$" - -BattleFrontier_BattleArenaLobby_Text_256A2C: @ 8256A2C - .string "Thank you so much for participating!\p" - .string "Please wait while I save the game.$" - -BattleFrontier_BattleArenaLobby_Text_256A74: @ 8256A74 - .string "We await your challenge on\n" - .string "another occasion!$" - -BattleFrontier_BattleArenaLobby_Text_256AA1: @ 8256AA1 - .string "We have been looking forward to\n" - .string "your arrival.\p" - .string "Before I show you to the BATTLE\n" - .string "ARENA, I must save the game.\l" - .string "Please wait.$" - -BattleFrontier_BattleArenaLobby_Text_256B19: @ 8256B19 - .string "Shall I record your last BATTLE ARENA\n" - .string "match on your FRONTIER PASS?$" - -BattleFrontier_BattleArenaLobby_Text_256B5C: @ 8256B5C - .string "I lost on the REFEREE’s decision…\p" - .string "I don’t think it was a good idea to only\n" - .string "use defensive moves and not attack…$" - -BattleFrontier_BattleArenaLobby_Text_256BCB: @ 8256BCB - .string "I won in judging!\p" - .string "Landing hits consistently on\n" - .string "the opponent’s POKéMON worked!$" - -BattleFrontier_BattleArenaLobby_Text_256C19: @ 8256C19 - .string "Our match was declared a draw.\p" - .string "When we ran out of time, both my\n" - .string "POKéMON and the opponent’s had about\l" - .string "the same amount of HP left.$" - -BattleFrontier_BattleArenaLobby_Text_256C9A: @ 8256C9A - .string "In the BATTLE ARENA, the order of\n" - .string "POKéMON is totally important.\p" - .string "For example, if your first POKéMON\n" - .string "has certain type disadvantages,\l" - .string "try making your second POKéMON one\l" - .string "with moves that are super effective\l" - .string "against the first one.\p" - .string "I think that will be a good way of\n" - .string "making an effective team.$" - -BattleFrontier_BattleArenaLobby_Text_256DB8: @ 8256DB8 -FallarborTown_BattleTentLobby_Text_256DB8: @ 8256DB8 - .string "The Set KO Tourney’s rules are listed.$" - -BattleFrontier_BattleArenaLobby_Text_256DDF: @ 8256DDF -FallarborTown_BattleTentLobby_Text_256DDF: @ 8256DDF - .string "Which heading do you want to read?$" - -BattleFrontier_BattleArenaLobby_Text_256E02: @ 8256E02 -FallarborTown_BattleTentLobby_Text_256E02: @ 8256E02 - .string "The Set KO Tourney has special rules,\n" - .string "unlike standard battles.\p" - .string "First, one battle lasts only\n" - .string "three turns.\p" - .string "If the outcome is not decided after\n" - .string "three turns, it goes to judging.\p" - .string "The REFEREE will choose the winner\n" - .string "based on how the POKéMON battled.\p" - .string "Also, a POKéMON cannot be switched out\n" - .string "until its battle’s outcome is decided.$" - -BattleFrontier_BattleArenaLobby_Text_256F43: @ 8256F43 -FallarborTown_BattleTentLobby_Text_256F43: @ 8256F43 - .string "The first judging factor is “Mind.â€\n" - .string "This factor evaluates how aggressive\l" - .string "the battlers were.\p" - .string "The judging is based on how often\n" - .string "the TRAINERS ordered the use of\l" - .string "offensive moves.$" - -BattleFrontier_BattleArenaLobby_Text_256FF2: @ 8256FF2 -FallarborTown_BattleTentLobby_Text_256FF2: @ 8256FF2 - .string "The second judging factor is “Skill.â€\n" - .string "This factor evaluates how effectively\l" - .string "POKéMON moves were used.\p" - .string "If a move worked successfully,\n" - .string "the Skill rating goes up.\p" - .string "If a move failed, the Skill rating\n" - .string "is lowered.\p" - .string "If it was an offensive move, the Skill\n" - .string "rating goes up if the move was “super\l" - .string "effective†and goes down if it was\l" - .string "“not very effective.â€\p" - .string "The Skill rating will not go up for\n" - .string "moves such as PROTECT and DETECT.\p" - .string "If the opponent used PROTECT or\n" - .string "DETECT, and your POKéMON failed to\l" - .string "hit with a move, its Skill rating will not\l" - .string "go down.$" - -BattleFrontier_BattleArenaLobby_Text_257202: @ 8257202 -FallarborTown_BattleTentLobby_Text_257202: @ 8257202 - .string "The third judging factor is “Body.â€\n" - .string "This factor is based on how much HP\l" - .string "remained at the end of a battle.\p" - .string "The rating takes into account how much\n" - .string "HP a POKéMON had at the start of\l" - .string "battle, and what remained at the end.$" - -BattleFrontier_BattleArenaLobby_Text_2572D9: @ 82572D9 - .string "A victory snatched from the ARENA\n" - .string "TYCOON, and a seven-TRAINER sweep!\p" - .string "We congratulate you on your most\n" - .string "splendid challenge!$" - -BattleFrontier_BattleArenaLobby_Text_257353: @ 8257353 - .string "My dear challenger, in recognition of\n" - .string "your indefatigable spirit, please\l" - .string "accept these Battle Point(s).$" diff --git a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc deleted file mode 100644 index e853afda0..000000000 --- a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc +++ /dev/null @@ -1,1277 +0,0 @@ -BattleFrontier_BattleDomeBattleRoom_MapScripts:: @ 824BC9C - map_script 3, BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1 - map_script 2, BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00 - map_script 4, BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481 - map_script 5, BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0 - .byte 0 - -BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1 - setvar VAR_0x8004, 10 - special sub_818E9AC - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special sub_81A1780 - copyvar VAR_TEMP_F, VAR_RESULT - compare VAR_RESULT, 0 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C919 - call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC - end - -BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC:: @ 824BCDC -BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC:: @ 824BCDC - checkplayergender - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4:: @ 824BCF4 - setvar VAR_OBJ_GFX_ID_1, 100 - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA:: @ 824BCFA - setvar VAR_OBJ_GFX_ID_1, 105 - return - -BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00: @ 824BD00 - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A - .2byte 0 - -BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A:: @ 824BD0A - lockall - call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD - compare VAR_RESULT, 0 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C938 - applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4 - waitmovement 0 - call BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C970, 4 - closemessage - 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 - goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD5A - -BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E:: @ 824BD4E - applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C775 - goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BD61 - -BattleFrontier_BattleDomeBattleRoom_EventScript_24BD5A:: @ 824BD5A - applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C77F - -BattleFrontier_BattleDomeBattleRoom_EventScript_24BD61:: @ 824BD61 - playse SE_W227B - call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E - waitmovement 0 - compare VAR_TEMP_F, 3 - goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82 - compare VAR_TEMP_E, 0 - goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB - -BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82 - setvar VAR_0x8004, 4 - special sub_818E9AC - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C990, 4 - closemessage - applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C77B - applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C789 - waitmovement 0 - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 0 - special sub_8161F74 - msgbox 0x2021fc4, 4 - closemessage - setvar VAR_0x8004, 5 - special sub_818E9AC - call BattleFrontier_BattleDomeBattleRoom_EventScript_24C440 - setvar VAR_TEMP_2, 0 - switch VAR_RESULT - case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0 - case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F - case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F - setvar VAR_TEMP_2, 1 - -BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7:: @ 824BDF7 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA86, 4 - closemessage - playse SE_W227B - call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E - delay 60 - applymovement 9, BattleFrontier_BattleDomeBattleRoom_Movement_24C964 - waitmovement 0 - applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_24C969 - waitmovement 0 - delay 180 - applymovement 9, BattleFrontier_BattleDomeBattleRoom_Movement_24C96B - waitmovement 0 - compare VAR_TEMP_2, 2 - goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F - setvar VAR_0x8004, 19 - special sub_818E9AC - switch VAR_RESULT - case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0 - -BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F - applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4 - waitmovement 0 - setvar VAR_0x8004, 4 - special sub_818E9AC - compare VAR_TEMP_2, 0 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1 - compare VAR_TEMP_2, 1 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEC5 - compare VAR_TEMP_2, 2 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BED9 - playse SE_W227B - call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E - delay 60 - -BattleFrontier_BattleDomeBattleRoom_EventScript_24BE8D:: @ 824BE8D - setvar VAR_0x8004, 12 - setvar VAR_0x8005, 2 - special sub_818E9AC - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A:: @ 824BE9A - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 4 - special sub_81A1780 - goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5 -@ goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5 - -BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1:: @ 824BEB1 - setvar VAR_0x8004, 20 - setvar VAR_0x8005, 1 - special sub_81A1780 - message BattleFrontier_BattleDomeBattleRoom_Text_24C9E1 - waitmessage - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24BEC5:: @ 824BEC5 - setvar VAR_0x8004, 20 - setvar VAR_0x8005, 0 - special sub_81A1780 - message BattleFrontier_BattleDomeBattleRoom_Text_24CB34 - waitmessage - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24BED9:: @ 824BED9 - message BattleFrontier_BattleDomeBattleRoom_Text_24D6BE - waitmessage - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0 - applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4 - waitmovement 0 - compare VAR_TEMP_2, 0 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3 - compare VAR_TEMP_2, 1 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BFCC - playse SE_W227B - call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E - delay 60 - setvar VAR_0x8004, 3 - special sub_818E9AC - setvar VAR_0x8004, 12 - setvar VAR_0x8005, 1 - special sub_818E9AC - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special sub_81A1780 - addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 - switch VAR_RESULT - case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 - setvar VAR_0x8006, 1 - warp MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 3 - waitstate - -BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62:: @ 824BF62 - applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C77D - waitmovement 0 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - special sub_81A1780 - switch VAR_RESULT - case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF96 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA04, 4 - goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF9E - -BattleFrontier_BattleDomeBattleRoom_EventScript_24BF96:: @ 824BF96 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA44, 4 - -BattleFrontier_BattleDomeBattleRoom_EventScript_24BF9E:: @ 824BF9E - special sub_8175280 - playse SE_W227B - call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E - delay 60 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 3 - special sub_81A1780 - goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5 - -BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3:: @ 824BFC3 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C9BE, 4 - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24BFCC:: @ 824BFCC - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CB9D, 4 - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5:: @ 824BFD5 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 6 - special sub_818E9AC - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C023 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 7 - special sub_818E9AC - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C076 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - special sub_818E9AC - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C16A - goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C9 - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C023:: @ 824C023 - call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD - switch VAR_RESULT - case 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24C05A - case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C061 - case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C068 - case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C06F - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C05A:: @ 824C05A - message BattleFrontier_BattleDomeBattleRoom_Text_24CC06 - waitmessage - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C061:: @ 824C061 - message BattleFrontier_BattleDomeBattleRoom_Text_24CC1C - waitmessage - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C068:: @ 824C068 - message BattleFrontier_BattleDomeBattleRoom_Text_24CC2E - waitmessage - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C06F:: @ 824C06F - message BattleFrontier_BattleDomeBattleRoom_Text_24CC5B - waitmessage - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C076:: @ 824C076 - call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD - switch VAR_RESULT - case 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24C0AD - case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C0B4 - case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C0BB - case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C2 - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C0AD:: @ 824C0AD - message BattleFrontier_BattleDomeBattleRoom_Text_24CC99 - waitmessage - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C0B4:: @ 824C0B4 - message BattleFrontier_BattleDomeBattleRoom_Text_24CCC5 - waitmessage - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C0BB:: @ 824C0BB - message BattleFrontier_BattleDomeBattleRoom_Text_24CCFD - waitmessage - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C2:: @ 824C0C2 - message BattleFrontier_BattleDomeBattleRoom_Text_24CD33 - waitmessage - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C9:: @ 824C0C9 - compare VAR_TEMP_F, 3 - goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C105 - switch VAR_TEMP_E - case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C158 - case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C161 - case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C158 - case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24C161 - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C105:: @ 824C105 - call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD - switch VAR_RESULT - case 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24C13C - case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C143 - case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C14A - case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C151 - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C13C:: @ 824C13C - message BattleFrontier_BattleDomeBattleRoom_Text_24CD72 - waitmessage - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C143:: @ 824C143 - message BattleFrontier_BattleDomeBattleRoom_Text_24CD8C - waitmessage - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C14A:: @ 824C14A - message BattleFrontier_BattleDomeBattleRoom_Text_24CDB3 - waitmessage - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C151:: @ 824C151 - message BattleFrontier_BattleDomeBattleRoom_Text_24CDDE - waitmessage - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C158:: @ 824C158 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CEBE, 4 - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C161:: @ 824C161 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D232, 4 - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C16A:: @ 824C16A - call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD - switch VAR_RESULT - case 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1A1 - case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1A8 - case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1AF - case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1B6 - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C1A1:: @ 824C1A1 - message BattleFrontier_BattleDomeBattleRoom_Text_24CE10 - waitmessage - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C1A8:: @ 824C1A8 - message BattleFrontier_BattleDomeBattleRoom_Text_24CE33 - waitmessage - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C1AF:: @ 824C1AF - message BattleFrontier_BattleDomeBattleRoom_Text_24CE57 - waitmessage - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C1B6:: @ 824C1B6 - message BattleFrontier_BattleDomeBattleRoom_Text_24CE94 - waitmessage - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD:: @ 824C1BD - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special sub_81A1780 - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB:: @ 824C1CB - switch VAR_TEMP_E - case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1FC - case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C209 - case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1FC - case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24C209 - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C1FC:: @ 824C1FC - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CEDE, 4 - goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C211 - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C209:: @ 824C209 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D26C, 4 - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C211:: @ 824C211 - closemessage - applymovement 2, BattleFrontier_BattleDomeBattleRoom_Movement_24C94B - applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_24C7F9 - applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C78E - playse SE_W227B - call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E - waitse - playse SE_W227B - call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E - waitse - playse SE_W227B - call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E - waitse - playse SE_W227B - call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E - waitse - playse SE_W227B - call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E - waitse - waitmovement 0 - message BattleFrontier_BattleDomeBattleRoom_Text_24CF7A - waitmessage - playse SE_W227B - call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E - waitse - switch VAR_TEMP_E - case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C346 - case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9 - case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 7 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CFAE, 4 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 7 - special sub_81A1780 - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0D9, 4 - call BattleFrontier_BattleDomeBattleRoom_EventScript_24C400 - switch VAR_RESULT - case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420 - case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420 - case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C436 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, 4 - setvar VAR_0x8004, 12 - setvar VAR_0x8005, 1 - special sub_818E9AC - setvar VAR_0x8004, 12 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 - closemessage - applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B - waitmovement 0 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D172, 4 - playfanfare MUS_ME_SYMBOLGET - message BattleFrontier_BattleDomeBattleRoom_Text_24D1AA - waitmessage - waitfanfare - setvar VAR_0x8004, 13 - special sub_81A1780 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D1E0, 4 - goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C346:: @ 824C346 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 7 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D319, 4 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 7 - special sub_81A1780 - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D43E, 4 - call BattleFrontier_BattleDomeBattleRoom_EventScript_24C400 - switch VAR_RESULT - case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420 - case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420 - case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C436 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, 4 - setvar VAR_0x8004, 12 - setvar VAR_0x8005, 1 - special sub_818E9AC - setvar VAR_0x8004, 12 - special sub_81A1780 - compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 - closemessage - applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B - waitmovement 0 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D47F, 4 - playfanfare MUS_ME_SYMBOLGET - message BattleFrontier_BattleDomeBattleRoom_Text_24D522 - waitmessage - waitfanfare - setvar VAR_0x8004, 13 - special sub_81A1780 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D54D, 4 - goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C400:: @ 824C400 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D677, 4 - closemessage - applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C787 - applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C829 - waitmovement 0 - call BattleFrontier_BattleDomeBattleRoom_EventScript_24C440 - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C420:: @ 824C420 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D127, 4 - playse SE_W227B - call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E - waitse - goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BE8D - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C436:: @ 824C436 - setvar VAR_TEMP_2, 2 - goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7 - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 6 - setvar VAR_0x8006, 0 - special sub_81A1780 - special HealPlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 0 - setvar VAR_TEMP_9, 1 - special sub_8163AC4 - waitstate - setvar VAR_TEMP_9, 0 - setvar VAR_0x8004, 17 - special sub_818E9AC - special HealPlayerParty - setvar VAR_0x8004, 16 - special sub_818E9AC - return - -BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481: @ 824C481 - map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B - .2byte 0 - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B:: @ 824C48B - hideobjectat 13, MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM - call BattleFrontier_BattleDomeBattleRoom_EventScript_24C502 - call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC - setvar VAR_TEMP_1, 1 - applymovement 255, BattleFrontier_BattleDomeBattleRoom_Movement_24C773 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special sub_81A1780 - compare VAR_RESULT, 3 - goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF - setvar VAR_0x8004, 9 - special sub_81A1780 - copyvar VAR_TEMP_E, VAR_RESULT - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF - call BattleFrontier_BattleDomeBattleRoom_EventScript_242170 - setobjectxyperm 15, 13, 9 - removeobject 15 - addobject 15 - applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C78B - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF:: @ 824C4EF - end - -BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0: @ 824C4F0 - compare VAR_TEMP_9, 1 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC - end - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC:: @ 824C4FC - call BattleFrontier_BattleDomeBattleRoom_EventScript_24C502 - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C502:: @ 824C502 - compare VAR_TEMP_F, 0 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F - compare VAR_TEMP_F, 1 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C530 - compare VAR_TEMP_F, 2 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C594 - compare VAR_TEMP_F, 3 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C652 - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F:: @ 824C52F - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C530:: @ 824C530 - createvobject 46, 1, 3, 0, 3, 1 - createvobject 22, 4, 6, 0, 3, 1 - createvobject 5, 6, 8, 0, 3, 1 - createvobject 12, 9, 11, 0, 3, 1 - createvobject 46, 11, 13, 0, 3, 1 - createvobject 66, 13, 15, 0, 3, 1 - createvobject 45, 19, 7, 1, 3, 1 - createvobject 34, 22, 11, 1, 3, 1 - createvobject 11, 25, 15, 1, 3, 1 - createvobject 35, 26, 2, 2, 3, 1 - createvobject 38, 29, 5, 1, 3, 1 - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C594:: @ 824C594 - createvobject 46, 1, 3, 0, 3, 1 - createvobject 22, 4, 6, 0, 3, 1 - createvobject 5, 6, 8, 0, 3, 1 - createvobject 20, 7, 9, 0, 3, 1 - createvobject 12, 9, 11, 0, 3, 1 - createvobject 47, 10, 12, 0, 3, 1 - createvobject 46, 11, 13, 0, 3, 1 - createvobject 66, 13, 15, 0, 3, 1 - createvobject 48, 15, 2, 1, 3, 1 - createvobject 5, 16, 3, 1, 3, 1 - createvobject 20, 17, 4, 1, 3, 1 - createvobject 45, 19, 7, 1, 3, 1 - createvobject 22, 20, 9, 1, 3, 1 - createvobject 34, 22, 11, 1, 3, 1 - createvobject 46, 23, 13, 1, 3, 1 - createvobject 11, 25, 15, 1, 3, 1 - createvobject 35, 26, 2, 2, 3, 1 - createvobject 40, 28, 5, 2, 3, 1 - createvobject 38, 29, 5, 1, 3, 1 - createvobject 83, 30, 6, 2, 3, 1 - createvobject 34, 31, 8, 2, 3, 1 - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C652:: @ 824C652 - createvobject 5, 0, 2, 0, 3, 1 - createvobject 46, 1, 3, 0, 3, 1 - createvobject 45, 2, 15, 0, 3, 1 - createvobject 66, 3, 5, 0, 3, 1 - createvobject 22, 4, 6, 0, 3, 1 - createvobject 46, 5, 7, 0, 3, 1 - createvobject 5, 6, 8, 0, 3, 1 - createvobject 20, 7, 9, 0, 3, 1 - createvobject 24, 8, 10, 0, 3, 1 - createvobject 12, 9, 11, 0, 3, 1 - createvobject 47, 10, 12, 0, 3, 1 - createvobject 46, 11, 13, 0, 3, 1 - createvobject 45, 12, 14, 0, 3, 1 - createvobject 66, 13, 15, 2, 3, 1 - createvobject 55, 14, 12, 2, 3, 1 - createvobject 48, 15, 2, 1, 3, 1 - createvobject 5, 16, 3, 1, 3, 1 - createvobject 20, 17, 4, 1, 3, 1 - createvobject 24, 18, 6, 1, 3, 1 - createvobject 45, 19, 7, 1, 3, 1 - createvobject 22, 20, 9, 1, 3, 1 - createvobject 23, 21, 10, 1, 3, 1 - createvobject 34, 22, 11, 1, 3, 1 - createvobject 46, 23, 13, 1, 3, 1 - createvobject 48, 24, 14, 1, 3, 1 - createvobject 11, 25, 15, 1, 3, 1 - createvobject 35, 26, 2, 2, 3, 1 - createvobject 17, 27, 3, 2, 3, 1 - createvobject 40, 28, 5, 2, 3, 1 - createvobject 38, 29, 5, 1, 3, 1 - createvobject 83, 30, 6, 2, 3, 1 - createvobject 34, 31, 8, 2, 3, 1 - return - -BattleFrontier_BattleArenaBattleRoom_Movement_24C773: @ 824C773 -BattleFrontier_BattleDomeBattleRoom_Movement_24C773: @ 824C773 - set_invisible - step_end - -BattleFrontier_BattleDomeBattleRoom_Movement_24C775: @ 824C775 - set_visible - delay_16 - walk_up - walk_up - walk_up - walk_right - -BattleFrontier_BattleDomeBattleRoom_Movement_24C77B: @ 824C77B - walk_right - step_end - -BattleFrontier_BattleDomeBattleRoom_Movement_24C77D: @ 824C77D - walk_up - step_end - -BattleFrontier_BattleDomeBattleRoom_Movement_24C77F: @ 824C77F - set_visible - delay_16 - walk_up - walk_up - walk_up - walk_right - walk_right - step_end - -BattleFrontier_BattleDomeBattleRoom_Movement_24C787: @ 824C787 - walk_right - step_end - -BattleFrontier_BattleDomeBattleRoom_Movement_24C789: @ 824C789 - walk_left - step_end - -BattleFrontier_BattleDomeBattleRoom_Movement_24C78B: @ 824C78B - face_up - set_invisible - step_end - -BattleFrontier_BattleDomeBattleRoom_Movement_24C78E: @ 824C78E - 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 - 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 - walk_left - step_end - -BattleFrontier_BattleDomeBattleRoom_Movement_24C82B: @ 824C82B - walk_left - walk_left - step_end - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E:: @ 824C82E - turnvobject 0, 4 - turnvobject 2, 4 - turnvobject 4, 4 - turnvobject 6, 4 - turnvobject 8, 4 - turnvobject 10, 3 - turnvobject 12, 3 - turnvobject 14, 3 - turnvobject 16, 3 - turnvobject 18, 3 - turnvobject 20, 4 - turnvobject 22, 4 - turnvobject 24, 4 - turnvobject 26, 4 - turnvobject 28, 4 - turnvobject 30, 4 - delay 20 - turnvobject 0, 1 - turnvobject 2, 1 - turnvobject 4, 1 - turnvobject 6, 1 - turnvobject 8, 1 - turnvobject 10, 1 - turnvobject 12, 1 - turnvobject 14, 1 - turnvobject 16, 1 - turnvobject 18, 1 - turnvobject 20, 1 - turnvobject 22, 1 - turnvobject 24, 1 - turnvobject 26, 1 - turnvobject 28, 1 - turnvobject 30, 1 - delay 20 - turnvobject 1, 4 - turnvobject 3, 4 - turnvobject 5, 4 - turnvobject 7, 4 - turnvobject 9, 4 - turnvobject 11, 3 - turnvobject 13, 3 - turnvobject 15, 3 - turnvobject 17, 3 - turnvobject 19, 3 - turnvobject 21, 4 - turnvobject 23, 4 - turnvobject 25, 4 - turnvobject 27, 3 - turnvobject 31, 3 - delay 20 - turnvobject 1, 1 - turnvobject 3, 1 - turnvobject 5, 1 - turnvobject 7, 1 - turnvobject 9, 1 - turnvobject 11, 1 - turnvobject 13, 1 - turnvobject 15, 1 - turnvobject 17, 1 - turnvobject 19, 1 - turnvobject 21, 1 - turnvobject 23, 1 - turnvobject 25, 1 - turnvobject 27, 1 - turnvobject 31, 1 - delay 20 - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5:: @ 824C8F5 -BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5:: @ 824C8F5 - copyvar VAR_RESULT, VAR_0x40CE - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F - warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 5, 11 - waitstate - end - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F:: @ 824C90F - warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 17, 11 - waitstate - end - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C919:: @ 824C919 - random 2 - copyvar VAR_TEMP_D, VAR_RESULT - compare VAR_TEMP_D, 0 - goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E - setobjectxyperm 6, 2, 0 - setobjectmovementtype 6, 10 - return - -BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938 - compare VAR_TEMP_D, 0 - goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E - applymovement 6, BattleFrontier_BattleDomeBattleRoom_Movement_24C95E - return - -BattleFrontier_BattleDomeBattleRoom_Movement_24C94B: @ 824C94B - 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 - walk_down - walk_down - walk_right - walk_right - walk_in_place_fastest_down - step_end - -BattleFrontier_BattleDomeBattleRoom_Movement_24C964: @ 824C964 - walk_right - walk_right - walk_right - walk_right - step_end - -BattleFrontier_BattleDomeBattleRoom_Movement_24C969: @ 824C969 - walk_in_place_fastest_left - step_end - -BattleFrontier_BattleDomeBattleRoom_Movement_24C96B: @ 824C96B - walk_left - walk_left - walk_left - walk_left - step_end - -BattleFrontier_BattleDomeBattleRoom_Text_24C970: @ 824C970 - .string "{PLAYER} has entered the BATTLE DOME!$" - -BattleFrontier_BattleDomeBattleRoom_Text_24C990: @ 824C990 - .string "{STR_VAR_1}\n" - .string "match!\p" - .string "{PLAYER} versus {STR_VAR_2}!\p" - .string "Let the battle begin!$" - -BattleFrontier_BattleDomeBattleRoom_Text_24C9BE: @ 824C9BE - .string "{PLAYER} is the winner!\n" - .string "Congratulations!$" - -BattleFrontier_BattleDomeBattleRoom_Text_24C9E1: @ 824C9E1 - .string "{STR_VAR_2} is the winner!\n" - .string "Congratulations!$" - -BattleFrontier_BattleDomeBattleRoom_Text_24CA04: @ 824CA04 - .string "{PLAYER} is the Level 50\n" - .string "Battle Tournament Champion!\p" - .string "Congratulations!$" - -BattleFrontier_BattleDomeBattleRoom_Text_24CA44: @ 824CA44 - .string "{PLAYER} is the Open Level\n" - .string "Battle Tournament Champion!\p" - .string "Congratulations!$" - -BattleFrontier_BattleDomeBattleRoom_Text_24CA86: @ 824CA86 - .string "What an unbelievable finish!\n" - .string "We have a double knockout!\p" - .string "In this event, the Battle Tournament\n" - .string "rules call for a REFEREE’S decision.\p" - .string "Please wait while the judging\n" - .string "is under way.$" - -BattleFrontier_BattleDomeBattleRoom_Text_24CB34: @ 824CB34 - .string "The REFEREES have reached\n" - .string "a decision!\p" - .string "The winner is…\n" - .string "Oh, my goodness!\l" - .string "The winner is {STR_VAR_1}!\l" - .string "Congratulations!$" - -BattleFrontier_BattleDomeBattleRoom_Text_24CB9D: @ 824CB9D - .string "The REFEREES have reached\n" - .string "a decision!\p" - .string "The winner is…\n" - .string "Oh, my goodness!\l" - .string "The winner is {PLAYER}!\l" - .string "Congratulations!$" - -BattleFrontier_BattleDomeBattleRoom_Text_24CC06: @ 824CC06 - .string "The bright new hope!\p" - .string "$" - -BattleFrontier_BattleDomeBattleRoom_Text_24CC1C: @ 824CC1C - .string "The rising star!\p" - .string "$" - -BattleFrontier_BattleDomeBattleRoom_Text_24CC2E: @ 824CC2E - .string "Will this TRAINER race to\n" - .string "the championship?\p" - .string "$" - -BattleFrontier_BattleDomeBattleRoom_Text_24CC5B: @ 824CC5B - .string "Can the feat of a championship\n" - .string "on the first try be achieved?\p" - .string "$" - -BattleFrontier_BattleDomeBattleRoom_Text_24CC99: @ 824CC99 - .string "Can the loss of the last match\n" - .string "be avenged?\p" - .string "$" - -BattleFrontier_BattleDomeBattleRoom_Text_24CCC5: @ 824CCC5 - .string "The TRAINER is on fire for\n" - .string "the first championship try!\p" - .string "$" - -BattleFrontier_BattleDomeBattleRoom_Text_24CCFD: @ 824CCFD - .string "A win here means this TRAINER\n" - .string "advances to the final!\p" - .string "$" - -BattleFrontier_BattleDomeBattleRoom_Text_24CD33: @ 824CD33 - .string "Will the long-held dream of\n" - .string "a championship finally come true?\p" - .string "$" - -BattleFrontier_BattleDomeBattleRoom_Text_24CD72: @ 824CD72 - .string "The invincible champion!\p" - .string "$" - -BattleFrontier_BattleDomeBattleRoom_Text_24CD8C: @ 824CD8C - .string "Can anyone hope to beat this\n" - .string "TRAINER?\p" - .string "$" - -BattleFrontier_BattleDomeBattleRoom_Text_24CDB3: @ 824CDB3 - .string "Do battles exist solely for\n" - .string "this TRAINER?\p" - .string "$" - -BattleFrontier_BattleDomeBattleRoom_Text_24CDDE: @ 824CDDE - .string "The current champion aiming to\n" - .string "retain the title!\p" - .string "$" - -BattleFrontier_BattleDomeBattleRoom_Text_24CE10: @ 824CE10 - .string "The former champion has returned!\p" - .string "$" - -BattleFrontier_BattleDomeBattleRoom_Text_24CE33: @ 824CE33 - .string "The former toughness has returned!\p" - .string "$" - -BattleFrontier_BattleDomeBattleRoom_Text_24CE57: @ 824CE57 - .string "Will this TRAINER do as expected\n" - .string "and advance to the finals?\p" - .string "$" - -BattleFrontier_BattleDomeBattleRoom_Text_24CE94: @ 824CE94 - .string "Will the former champ regain\n" - .string "lost glory?\p" - .string "$" - -BattleFrontier_BattleDomeBattleRoom_Text_24CEBE: @ 824CEBE - .string "Feel the glow of a true master!$" - -BattleFrontier_BattleDomeBattleRoom_Text_24CEDE: @ 824CEDE - .string "And now… The TRAINER standing in\n" - .string "{PLAYER}’s record-setting path…\p" - .string "Yes! The one and only!\n" - .string "The BATTLE DOME COMMISSIONER!\l" - .string "Our very own DOME ACE!\l" - .string "Make way for TUCKER!$" - -BattleFrontier_BattleDomeBattleRoom_Text_24CF7A: @ 824CF7A - .string "Spectators: TUCKER! TUCKER!\n" - .string "TUCKER! TUCKER! TUCKER!$" - -BattleFrontier_BattleDomeBattleRoom_Text_24CFAE: @ 824CFAE - .string "TUCKER: Ahahah!\p" - .string "Do you hear it? This crowd!\n" - .string "They’re all itching to see our match!\p" - .string "Ahahah!\p" - .string "I bet you’re twitching all over from\n" - .string "the tension of getting to battle me!\p" - .string "But don’t you worry about a thing!\p" - .string "I’m the no. 1 star of the BATTLE DOME!\n" - .string "I, TUCKER the DOME ACE, will bathe you\l" - .string "in my brilliant glow!$" - -BattleFrontier_BattleDomeBattleRoom_Text_24D0D9: @ 824D0D9 - .string "Your strategy!\n" - .string "Let’s see it!$" - -BattleFrontier_BattleDomeBattleRoom_Text_24D0F6: @ 824D0F6 - .string "Unbelievable! It’s incredible!\n" - .string "The victor is {PLAYER}!$" - -BattleFrontier_BattleDomeBattleRoom_Text_24D127: @ 824D127 - .string "The winner is TUCKER!\n" - .string "The DOME ACE has prevailed!\p" - .string "Congratulations, TUCKER!$" - -BattleFrontier_BattleDomeBattleRoom_Text_24D172: @ 824D172 - .string "TUCKER: Rules are rules!\n" - .string "Let me see your FRONTIER PASS.$" - -BattleFrontier_BattleDomeBattleRoom_Text_24D1AA: @ 824D1AA - .string "The Tactics Symbol was embossed on\n" - .string "the FRONTIER PASS!$" - -BattleFrontier_BattleDomeBattleRoom_Text_24D1E0: @ 824D1E0 - .string "… … … … … …\p" - .string "I sorely underestimated you. I won’t\n" - .string "make the same mistake next time…$" - -BattleFrontier_BattleDomeBattleRoom_Text_24D232: @ 824D232 - .string "Can the win streak be stretched?\n" - .string "The confidence is there!$" - -BattleFrontier_BattleDomeBattleRoom_Text_24D26C: @ 824D26C - .string "Ladies and gentlemen!\n" - .string "Boys, girls, and POKéMON!\p" - .string "Finally!\n" - .string "Finally, the legend has returned!\p" - .string "Yes, the name of that legend!\n" - .string "Our very own DOME ACE!\l" - .string "It’s none other than TUCKER!$" - -BattleFrontier_BattleDomeBattleRoom_Text_24D319: @ 824D319 - .string "TUCKER: Ah…\n" - .string "The pummeling roar of the crowd…\l" - .string "Their furnace-like heat of excitement…\l" - .string "This is a wonderful place…\p" - .string "To the crowd, I am the DOME ACE…\n" - .string "I represent their hopes and dreams…\l" - .string "I must never fade from their sight…\p" - .string "I must burn!\n" - .string "Brighter and more brilliant!\l" - .string "I must light all that gather here!$" - -BattleFrontier_BattleDomeBattleRoom_Text_24D43E: @ 824D43E - .string "I will unleash all the power that\n" - .string "I possess! Right here and now!$" - -BattleFrontier_BattleDomeBattleRoom_Text_24D47F: @ 824D47F - .string "TUCKER: You’re genuinely fantastic!\p" - .string "Never before! I haven’t ever lost in the\n" - .string "times I’ve had to unleash my power.\p" - .string "Yes, quite fantastic!\n" - .string "Your FRONTIER PASS, please?$" - -BattleFrontier_BattleDomeBattleRoom_Text_24D522: @ 824D522 - .string "The Tactics Symbol took on\n" - .string "a golden shine!$" - -BattleFrontier_BattleDomeBattleRoom_Text_24D54D: @ 824D54D - .string "You’re strong, but above all,\n" - .string "you have a unique charm!\p" - .string "In you, I see a definite potential for\n" - .string "a superstar like me.\p" - .string "I will very much look forward to\n" - .string "our next encounter!$" - -BattleFrontier_BattleDomeBattleRoom_Text_24D5F5: @ 824D5F5 - .string "{PLAYER} is the Level 50\n" - .string "Battle Tournament Champion!\p" - .string "Congratulations!$" - -BattleFrontier_BattleDomeBattleRoom_Text_24D635: @ 824D635 - .string "{PLAYER} is the Open Level\n" - .string "Battle Tournament Champion!\p" - .string "Congratulations!$" - -BattleFrontier_BattleDomeBattleRoom_Text_24D677: @ 824D677 - .string "The final match!\p" - .string "{PLAYER} versus the DOME ACE, TUCKER!\p" - .string "Let the battle begin!$" - -BattleFrontier_BattleDomeBattleRoom_Text_24D6BE: @ 824D6BE - .string "The REFEREES have reached\n" - .string "a decision!\p" - .string "The winner is…\n" - .string "Oh, my goodness!\l" - .string "The winner is our very own DOME ACE!\l" - .string "It’s TUCKER!\p" - .string "Congratulations! And thank you!\n" - .string "Let’s hear it for the DOME ACE, TUCKER!$" diff --git a/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc b/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc deleted file mode 100644 index 989ebe2f3..000000000 --- a/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc +++ /dev/null @@ -1,152 +0,0 @@ -BattleFrontier_BattleDomeCorridor_MapScripts:: @ 824B0FE - map_script 2, BattleFrontier_BattleDomeCorridor_MapScript2_24B104 - .byte 0 - -BattleFrontier_BattleDomeCorridor_MapScript2_24B104: @ 824B104 - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeCorridor_EventScript_24B10E - .2byte 0 - -BattleFrontier_BattleDomeCorridor_EventScript_24B10E:: @ 824B10E - delay 16 - setvar VAR_TEMP_0, 1 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - special sub_81A1780 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleDomeCorridor_EventScript_24B161 - applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1B2 - applymovement 255, BattleFrontier_BattleDomeCorridor_Movement_24B1A1 - waitmovement 0 - opendoor 13, 3 - waitdooranim - applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1BE - applymovement 255, BattleFrontier_BattleDomeCorridor_Movement_24B1AE - waitmovement 0 - closedoor 13, 3 - waitdooranim - goto BattleFrontier_BattleDomeCorridor_EventScript_24B18F - -BattleFrontier_BattleDomeCorridor_EventScript_24B161:: @ 824B161 - applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1D6 - applymovement 255, BattleFrontier_BattleDomeCorridor_Movement_24B1C1 - waitmovement 0 - opendoor 37, 3 - waitdooranim - applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1E6 - applymovement 255, BattleFrontier_BattleDomeCorridor_Movement_24B1D2 - waitmovement 0 - closedoor 37, 3 - waitdooranim - -BattleFrontier_BattleDomeCorridor_EventScript_24B18F:: @ 824B18F - waitmovement 0 - setvar VAR_0x8006, 0 - warp MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 7 - waitstate - end - -BattleFrontier_BattleDomeCorridor_Movement_24B1A1: @ 824B1A1 - 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 - walk_up - walk_up - set_invisible - step_end - -BattleFrontier_BattleDomeCorridor_Movement_24B1B2: @ 824B1B2 - 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 - walk_up - set_invisible - step_end - -BattleFrontier_BattleDomeCorridor_Movement_24B1C1: @ 824B1C1 - 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 - walk_up - walk_up - set_invisible - step_end - -BattleFrontier_BattleDomeCorridor_Movement_24B1D6: @ 824B1D6 - 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 - walk_up - set_invisible - step_end - -BattleFrontier_BattleDomeCorridor_Movement_24B1E9: @ 824B1E9 - 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 deleted file mode 100644 index 1e50357bc..000000000 --- a/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc +++ /dev/null @@ -1,777 +0,0 @@ -BattleFrontier_BattleDomeLobby_MapScripts:: @ 82497E2 - map_script 5, BattleFrontier_BattleDomeLobby_MapScript1_2497F2 - map_script 2, BattleFrontier_BattleDomeLobby_MapScript2_24980F - map_script 4, BattleFrontier_BattleDomeLobby_MapScript2_2497FB - .byte 0 - -BattleFrontier_BattleDomeLobby_MapScript1_2497F2: @ 82497F2 - setvar VAR_0x8004, 21 - special sub_818E9AC - end - -BattleFrontier_BattleDomeLobby_MapScript2_2497FB: @ 82497FB -BattleFrontier_BattlePyramidLobby_MapScript2_2497FB: @ 82497FB - map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomeLobby_EventScript_249805 - .2byte 0 - -BattleFrontier_BattleDomeLobby_EventScript_249805:: @ 8249805 - setvar VAR_TEMP_1, 1 - turnobject 255, 2 - end - -BattleFrontier_BattleDomeLobby_MapScript2_24980F: @ 824980F - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeLobby_EventScript_249839 - map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattleDomeLobby_EventScript_249842 - map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattleDomeLobby_EventScript_2499F9 - map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattleDomeLobby_EventScript_24989B - map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattleDomeLobby_EventScript_249940 - .2byte 0 - -BattleFrontier_BattleDomeLobby_EventScript_249839:: @ 8249839 - setvar VAR_0x8004, 0 - special sub_81A1780 - end - -BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842 - lockall - msgbox BattleFrontier_BattleDomeLobby_Text_24A45F, 4 - closemessage - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special sub_818E9AC - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 0 - special sub_818E9AC - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 6 - setvar VAR_0x8006, 1 - special sub_818E9AC - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_TEMP_0, 255 - releaseall - end - -BattleFrontier_BattleDomeLobby_EventScript_24989B:: @ 824989B - call BattleFrontier_BattleDomeLobby_EventScript_241EBA - lockall - setvar VAR_0x8004, 10 - special sub_81A1780 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleDomeLobby_EventScript_2498C1 - msgbox BattleFrontier_BattleDomeLobby_Text_24A4E9, 4 - goto BattleFrontier_BattleDomeLobby_EventScript_2498C9 - -BattleFrontier_BattleDomeLobby_EventScript_2498C1:: @ 82498C1 - msgbox BattleFrontier_BattleDomeLobby_Text_24AD67, 4 - -BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9 - msgbox BattleFrontier_BattleDomeLobby_Text_24ADB1, 4 - setvar VAR_0x8004, 11 - special sub_81A1780 - msgbox BattleFrontier_BattleDomeLobby_Text_241520, 9 - message BattleFrontier_BattleDomeLobby_Text_24A5D6 - waitmessage - special LoadPlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 - special sub_81A1780 - setvar VAR_0x8004, 8 - special sub_81A1780 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 6 - setvar VAR_0x8006, 1 - special sub_818E9AC - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 7 - setvar VAR_0x8006, 1 - special sub_818E9AC - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 1 - special sub_818E9AC - special LoadPlayerParty - special HealPlayerParty - goto BattleFrontier_BattleDomeLobby_EventScript_249991 - -BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940 - lockall - msgbox BattleFrontier_BattleDomeLobby_Text_24A5BF, 4 - message BattleFrontier_BattleDomeLobby_Text_24A5D6 - waitmessage - special LoadPlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 - special sub_81A1780 - setvar VAR_0x8004, 8 - special sub_81A1780 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 0 - special sub_818E9AC - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 6 - setvar VAR_0x8006, 1 - special sub_818E9AC - special LoadPlayerParty - special HealPlayerParty - -BattleFrontier_BattleDomeLobby_EventScript_249991:: @ 8249991 - setvar VAR_0x8004, 13 - setvar VAR_0x8005, 0 - special sub_818E9AC - playse SE_SAVE - waitse - call BattleFrontier_BattleDomeLobby_EventScript_23E8E0 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleDomeLobby_EventScript_2499E9 - message BattleFrontier_BattleDomeLobby_Text_24AE17 - waitmessage - multichoicedefault 20, 8, 94, 1, 0 - switch VAR_RESULT - case 1, BattleFrontier_BattleDomeLobby_EventScript_2499E9 - case 0, BattleFrontier_BattleDomeLobby_EventScript_2499E4 - case 127, BattleFrontier_BattleDomeLobby_EventScript_2499E9 - -BattleFrontier_BattleDomeLobby_EventScript_2499E4:: @ 82499E4 - call BattleFrontier_BattleDomeLobby_EventScript_23E8B4 - -BattleFrontier_BattleDomeLobby_EventScript_2499E9:: @ 82499E9 - msgbox BattleFrontier_BattleDomeLobby_Text_249F74, 4 - closemessage - setvar VAR_TEMP_0, 255 - releaseall - end - -BattleFrontier_BattleDomeLobby_EventScript_2499F9:: @ 82499F9 - lockall - msgbox BattleFrontier_BattleDomeLobby_Text_24A5FE, 4 - message BattleFrontier_BattleDomeLobby_Text_24A61A - waitmessage - setvar VAR_0x8004, 13 - setvar VAR_0x8005, 1 - special sub_818E9AC - playse SE_SAVE - waitse - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_TEMP_0, 255 - goto BattleFrontier_BattleDomeLobby_EventScript_249BC2 - -BattleFrontier_BattleDomeLobby_EventScript_249A35:: @ 8249A35 - lock - faceplayer - setvar VAR_FRONTIER_FACILITY, 1 - setvar VAR_0x40CE, 0 - goto BattleFrontier_BattleDomeLobby_EventScript_249A59 - end - -BattleFrontier_BattleDomeLobby_EventScript_249A47:: @ 8249A47 - lock - faceplayer - setvar VAR_FRONTIER_FACILITY, 1 - setvar VAR_0x40CE, 1 - goto BattleFrontier_BattleDomeLobby_EventScript_249A59 - end - -BattleFrontier_BattleDomeLobby_EventScript_249A59:: @ 8249A59 - special SavePlayerParty - compare VAR_0x40CE, 0 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CFD - compare VAR_0x40CE, 1 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D06 - -BattleFrontier_BattleDomeLobby_EventScript_249A72:: @ 8249A72 - compare VAR_0x40CE, 0 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D0F - compare VAR_0x40CE, 1 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D15 - waitmessage - multichoice 17, 6, 23, 0 - switch VAR_RESULT - case 0, BattleFrontier_BattleDomeLobby_EventScript_249ABF - case 1, BattleFrontier_BattleDomeLobby_EventScript_249BFA - case 2, BattleFrontier_BattleDomeLobby_EventScript_249C64 - case 127, BattleFrontier_BattleDomeLobby_EventScript_249C64 - -BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF - message BattleFrontier_BattleDomeLobby_Text_24A210 - waitmessage - multichoice 17, 6, 24, 0 - switch VAR_RESULT - case 2, BattleFrontier_BattleDomeLobby_EventScript_249C64 - case 127, BattleFrontier_BattleDomeLobby_EventScript_249C64 - setvar VAR_0x8004, 15 - special sub_81A1780 - compare VAR_0x8004, 1 - goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C15 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 - msgbox BattleFrontier_BattleDomeLobby_Text_24A26E, 4 - fadescreen 1 - call BattleFrontier_BattleDomeLobby_EventScript_23F2B7 - copyvar VAR_0x8004, VAR_RESULT - setvar VAR_0x8005, 3 - special sub_80F9490 - waitstate - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C61 - msgbox BattleFrontier_BattleDomeLobby_Text_24A1C6, 5 - switch VAR_RESULT - case 0, BattleFrontier_BattleDomeLobby_EventScript_249C61 - case 1, BattleFrontier_BattleDomeLobby_EventScript_249B60 - case 127, BattleFrontier_BattleDomeLobby_EventScript_249C61 - -BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60 - setvar VAR_TEMP_0, 0 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 4 - special sub_81A1780 - setvar VAR_0x8004, 0 - special sub_818E9AC - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 1 - special sub_81A1780 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 0 - special sub_81A1780 - special LoadPlayerParty - closemessage - delay 2 - call BattleFrontier_BattleDomeLobby_EventScript_27134F - setvar VAR_TEMP_0, 255 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A - setvar VAR_0x8004, 22 - special sub_818E9AC - -BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2 - special SavePlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 - special sub_81A1780 - setvar VAR_0x8004, 15 - special sub_818E9AC - msgbox BattleFrontier_BattleDomeLobby_Text_24A437, 4 - closemessage - call BattleFrontier_BattleDomeLobby_EventScript_249C6E - special HealPlayerParty - warp MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR, 255, 23, 6 - setvar VAR_TEMP_0, 0 - waitstate - end - -BattleFrontier_BattleDomeLobby_EventScript_249BFA:: @ 8249BFA - compare VAR_0x40CE, 0 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D1B - compare VAR_0x40CE, 1 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D24 - goto BattleFrontier_BattleDomeLobby_EventScript_249A72 - -BattleFrontier_BattleDomeLobby_EventScript_249C15:: @ 8249C15 - switch VAR_RESULT - case 0, BattleFrontier_BattleDomeLobby_EventScript_249C30 - case 1, BattleFrontier_BattleDomeLobby_EventScript_249C3D - -BattleFrontier_BattleDomeLobby_EventScript_249C30:: @ 8249C30 - msgbox BattleFrontier_BattleDomeLobby_Text_24A353, 4 - goto BattleFrontier_BattleDomeLobby_EventScript_249C6C - -BattleFrontier_BattleDomeLobby_EventScript_249C3D:: @ 8249C3D - msgbox BattleFrontier_BattleDomeLobby_Text_24A2AB, 4 - goto BattleFrontier_BattleDomeLobby_EventScript_249C6C - -BattleFrontier_BattleDomeLobby_EventScript_249C4A:: @ 8249C4A - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special sub_81A1780 - goto BattleFrontier_BattleDomeLobby_EventScript_249C64 - -BattleFrontier_BattleDomeLobby_EventScript_249C61:: @ 8249C61 - special LoadPlayerParty - -BattleFrontier_BattleDomeLobby_EventScript_249C64:: @ 8249C64 - msgbox BattleFrontier_BattleDomeLobby_Text_249F74, 4 - -BattleFrontier_BattleDomeLobby_EventScript_249C6C:: @ 8249C6C - release - end - -BattleFrontier_BattleDomeLobby_EventScript_249C6E:: @ 8249C6E - compare VAR_0x40CE, 0 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CDD - compare VAR_0x40CE, 1 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CE5 - applymovement 255, BattleFrontier_BattleDomeLobby_Movement_249D45 - waitmovement 0 - compare VAR_0x40CE, 0 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D2D - compare VAR_0x40CE, 1 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D33 - waitdooranim - compare VAR_0x40CE, 0 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CED - compare VAR_0x40CE, 1 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CF5 - applymovement 255, BattleFrontier_BattleDomeLobby_Movement_249D4E - waitmovement 0 - compare VAR_0x40CE, 0 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D39 - compare VAR_0x40CE, 1 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D3F - waitdooranim - return - -BattleFrontier_BattleDomeLobby_EventScript_249CDD:: @ 8249CDD - applymovement 1, BattleFrontier_BattleDomeLobby_Movement_249D45 - return - -BattleFrontier_BattleDomeLobby_EventScript_249CE5:: @ 8249CE5 - applymovement 6, BattleFrontier_BattleDomeLobby_Movement_249D45 - return - -BattleFrontier_BattleDomeLobby_EventScript_249CED:: @ 8249CED - applymovement 1, BattleFrontier_BattleDomeLobby_Movement_249D4B - return - -BattleFrontier_BattleDomeLobby_EventScript_249CF5:: @ 8249CF5 - applymovement 6, BattleFrontier_BattleDomeLobby_Movement_249D4B - return - -BattleFrontier_BattleDomeLobby_EventScript_249CFD:: @ 8249CFD - msgbox BattleFrontier_BattleDomeLobby_Text_249EB7, 4 - return - -BattleFrontier_BattleDomeLobby_EventScript_249D06:: @ 8249D06 - msgbox BattleFrontier_BattleDomeLobby_Text_24A664, 4 - return - -BattleFrontier_BattleDomeLobby_EventScript_249D0F:: @ 8249D0F - message BattleFrontier_BattleDomeLobby_Text_249F3A - return - -BattleFrontier_BattleDomeLobby_EventScript_249D15:: @ 8249D15 - message BattleFrontier_BattleDomeLobby_Text_24A6E7 - return - -BattleFrontier_BattleDomeLobby_EventScript_249D1B:: @ 8249D1B - msgbox BattleFrontier_BattleDomeLobby_Text_249F8E, 4 - return - -BattleFrontier_BattleDomeLobby_EventScript_249D24:: @ 8249D24 - msgbox BattleFrontier_BattleDomeLobby_Text_24A721, 4 - return - -BattleFrontier_BattleDomeLobby_EventScript_249D2D:: @ 8249D2D - opendoor 5, 4 - return - -BattleFrontier_BattleDomeLobby_EventScript_249D33:: @ 8249D33 - opendoor 17, 4 - return - -BattleFrontier_BattleDomeLobby_EventScript_249D39:: @ 8249D39 - closedoor 5, 4 - return - -BattleFrontier_BattleDomeLobby_EventScript_249D3F:: @ 8249D3F - closedoor 17, 4 - return - -BattleFrontier_BattleDomeLobby_Movement_249D45: @ 8249D45 - walk_up - walk_up - walk_up - walk_up - walk_up - step_end - -BattleFrontier_BattleDomeLobby_Movement_249D4B: @ 8249D4B - walk_up - set_invisible - step_end - -BattleFrontier_BattleDomeLobby_Movement_249D4E: @ 8249D4E - walk_up - walk_up - set_invisible - step_end - -BattleFrontier_BattleDomeLobby_EventScript_249D52:: @ 8249D52 - lockall - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 0 - special sub_81A1780 - waitbuttonpress - special RemoveRecordsWindow - releaseall - end - -BattleFrontier_BattleDomeLobby_EventScript_249D6B:: @ 8249D6B - lockall - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 1 - special sub_81A1780 - waitbuttonpress - special RemoveRecordsWindow - releaseall - end - -BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 9 - special sub_818E9AC - compare VAR_RESULT, 0 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DC9 - compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DD2 - compare VAR_RESULT, 2 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DDB - compare VAR_RESULT, 3 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DE4 - fadescreen 1 - setvar VAR_0x8004, 8 - special sub_818E9AC - waitstate - end - -BattleFrontier_BattleDomeLobby_EventScript_249DC9:: @ 8249DC9 - msgbox BattleFrontier_BattleDomeLobby_Text_24A966, 3 - return - -BattleFrontier_BattleDomeLobby_EventScript_249DD2:: @ 8249DD2 - msgbox BattleFrontier_BattleDomeLobby_Text_24A9A9, 3 - return - -BattleFrontier_BattleDomeLobby_EventScript_249DDB:: @ 8249DDB - msgbox BattleFrontier_BattleDomeLobby_Text_24A9EC, 3 - return - -BattleFrontier_BattleDomeLobby_EventScript_249DE4:: @ 8249DE4 - msgbox BattleFrontier_BattleDomeLobby_Text_24AA31, 3 - return - -BattleFrontier_BattleDomeLobby_EventScript_249DED:: @ 8249DED - setvar VAR_0x8004, 20 - special sub_818E9AC - msgbox BattleFrontier_BattleDomeLobby_Text_24AA76, 2 - end - -BattleFrontier_BattleDomeLobby_EventScript_249DFE:: @ 8249DFE - msgbox BattleFrontier_BattleDomeLobby_Text_24AB94, 2 - end - -BattleFrontier_BattleDomeLobby_EventScript_249E07:: @ 8249E07 - msgbox BattleFrontier_BattleDomeLobby_Text_24AC76, 2 - end - -BattleFrontier_BattleDomeLobby_EventScript_249E10:: @ 8249E10 - msgbox BattleFrontier_BattleDomeLobby_Text_24ACD3, 2 - end - -BattleFrontier_OutsideWest_EventScript_249E19:: @ 8249E19 - msgbox BattleFrontier_OutsideWest_Text_24AB06, 2 - end - -BattleFrontier_OutsideWest_EventScript_249E22:: @ 8249E22 - loadword 0, BattleFrontier_OutsideWest_Text_24AB44 - callstd 2 - end - -BattleFrontier_OutsideWest_EventScript_249E2B:: @ 8249E2B - loadword 0, BattleFrontier_OutsideWest_Text_24AB75 - callstd 2 - end - -BattleFrontier_BattleDomeLobby_EventScript_249E34:: @ 8249E34 - lockall - msgbox BattleFrontier_BattleDomeLobby_Text_24AE63, 4 - goto BattleFrontier_BattleDomeLobby_EventScript_249E43 - end - -BattleFrontier_BattleDomeLobby_EventScript_249E43:: @ 8249E43 - message BattleFrontier_BattleDomeLobby_Text_24AE8B - waitmessage - multichoice 17, 4, 98, 0 - switch VAR_RESULT - case 0, BattleFrontier_BattleDomeLobby_EventScript_249E8B - case 1, BattleFrontier_BattleDomeLobby_EventScript_249E99 - case 2, BattleFrontier_BattleDomeLobby_EventScript_249EA7 - case 3, BattleFrontier_BattleDomeLobby_EventScript_249EB5 - case 127, BattleFrontier_BattleDomeLobby_EventScript_249EB5 - end - -BattleFrontier_BattleDomeLobby_EventScript_249E8B:: @ 8249E8B - msgbox BattleFrontier_BattleDomeLobby_Text_24AEAE, 4 - goto BattleFrontier_BattleDomeLobby_EventScript_249E43 - end - -BattleFrontier_BattleDomeLobby_EventScript_249E99:: @ 8249E99 - msgbox BattleFrontier_BattleDomeLobby_Text_24AF4C, 4 - goto BattleFrontier_BattleDomeLobby_EventScript_249E43 - end - -BattleFrontier_BattleDomeLobby_EventScript_249EA7:: @ 8249EA7 - msgbox BattleFrontier_BattleDomeLobby_Text_24B073, 4 - goto BattleFrontier_BattleDomeLobby_EventScript_249E43 - end - -BattleFrontier_BattleDomeLobby_EventScript_249EB5:: @ 8249EB5 - releaseall - end - -BattleFrontier_BattleDomeLobby_Text_249EB7: @ 8249EB7 - .string "Where the strategies of TRAINERS\n" - .string "are put to the test!\p" - .string "Welcome to the BATTLE DOME!\p" - .string "I am your guide to the SINGLE BATTLE\n" - .string "Tournament.$" - -BattleFrontier_BattleDomeLobby_Text_249F3A: @ 8249F3A - .string "Would you like to challenge\n" - .string "the SINGLE BATTLE Tournament?$" - -BattleFrontier_BattleDomeLobby_Text_249F74: @ 8249F74 - .string "We hope to see you again.$" - -BattleFrontier_BattleDomeLobby_Text_249F8E: @ 8249F8E - .string "The SINGLE BATTLE Tournament\n" - .string "is exactly as the name suggests--\l" - .string "a tournament of SINGLE BATTLES.\p" - .string "All participating TRAINERS must\n" - .string "enter three POKéMON each.\p" - .string "In each battle, one of the three\n" - .string "POKéMON must be held in reserve.\p" - .string "The other two POKéMON can battle\n" - .string "one at a time.\p" - .string "Choose the two battling POKéMON after\n" - .string "examining the opponent’s trio.\p" - .string "You win the tournament by defeating\n" - .string "four TRAINERS.\p" - .string "Battle Points are awarded to\n" - .string "the tournament winner.\p" - .string "If you want to interrupt your\n" - .string "tournament, please save the game.\p" - .string "If you don’t save before interrupting,\n" - .string "you will be disqualified.$" - -BattleFrontier_BattleDomeLobby_Text_24A1C6: @ 824A1C6 - .string "Before I show you to the BATTLE DOME,\n" - .string "I must save the data. Is that okay?$" - -BattleFrontier_BattleDomeLobby_Text_24A210: @ 824A210 - .string "The tournament offers two levels\n" - .string "of challenge, Level 50 and Open Level.\l" - .string "Which is your choice?$" - -BattleFrontier_BattleDomeLobby_Text_24A26E: @ 824A26E - .string "Now select the three POKéMON that\n" - .string "you wish to enter, please.$" - -BattleFrontier_BattleDomeLobby_Text_24A2AB: @ 824A2AB - .string "Excuse me!\p" - .string "You don’t have three eligible POKéMON.\p" - .string "Also, the POKéMON must be holding\n" - .string "different kinds of items.\p" - .string "EGGS{STR_VAR_1} ineligible.\p" - .string "Please come see me when you are ready.$" - -BattleFrontier_BattleDomeLobby_Text_24A353: @ 824A353 - .string "Excuse me!\p" - .string "You don’t have three eligible POKéMON.\p" - .string "You must have three different POKéMON\n" - .string "of Level 50 or less to enter.\p" - .string "They also must be holding different\n" - .string "kinds of items.\p" - .string "EGGS{STR_VAR_1} ineligible.\p" - .string "Please come see me when you are ready.$" - -BattleFrontier_BattleDomeLobby_Text_24A437: @ 824A437 - .string "I will now show you to\n" - .string "the BATTLE DOME.$" - -BattleFrontier_BattleDomeLobby_Text_24A45F: @ 824A45F - .string "Excuse me!\p" - .string "You didn’t save before you quit your\n" - .string "challenge last time.\p" - .string "Because of that, your challenge so far\n" - .string "has been disqualified. Sorry!$" - -BattleFrontier_BattleDomeLobby_Text_24A4E9: @ 824A4E9 - .string "Congratulations for winning\n" - .string "your Battle Tournament!$" - -BattleFrontier_BattleDomeLobby_Text_24A51D: @ 824A51D - .string "Here is your prize for your Battle\n" - .string "Tournament victory.$" - -VerdanturfTown_BattleTentLobby_Text_24A554: @ 824A554 - .string "{PLAYER} received the prize\n" - .string "{STR_VAR_1}.$" - -VerdanturfTown_BattleTentLobby_Text_24A56E: @ 824A56E - .string "Oh, your BAG appears to be full.\p" - .string "Please make room in your BAG, then come\n" - .string "see me.$" - -BattleFrontier_BattleDomeLobby_Text_24A5BF: @ 824A5BF - .string "Thank you for playing!$" - -BattleFrontier_BattleDomeLobby_Text_24A5D6: @ 824A5D6 - .string "Your record will be saved.\n" - .string "Please wait.$" - -BattleFrontier_BattleDomeLobby_Text_24A5FE: @ 824A5FE - .string "We’ve been waiting for you!$" - -BattleFrontier_BattleDomeLobby_Text_24A61A: @ 824A61A - .string "Before I show you to the BATTLE DOME,\n" - .string "I must save the data. Is that okay?$" - -BattleFrontier_BattleDomeLobby_Text_24A664: @ 824A664 - .string "Where the strategies of TRAINERS\n" - .string "are put to the test!\p" - .string "Welcome to the BATTLE DOME!\p" - .string "I am your guide to the DOUBLE BATTLE\n" - .string "Tournament.$" - -BattleFrontier_BattleDomeLobby_Text_24A6E7: @ 824A6E7 - .string "Would you like to challenge\n" - .string "the DOUBLE BATTLE Tournament?$" - -BattleFrontier_BattleDomeLobby_Text_24A721: @ 824A721 - .string "The DOUBLE BATTLE Tournament\n" - .string "is exactly as the name suggests--\l" - .string "a tournament of DOUBLE BATTLES.\p" - .string "All participating TRAINERS must\n" - .string "enter three POKéMON each.\p" - .string "In each battle, one of the three\n" - .string "POKéMON must be held in reserve.\p" - .string "The remaining two POKéMON must take\n" - .string "part in a DOUBLE BATTLE.\p" - .string "Choose the two battling POKéMON after\n" - .string "examining the opponent’s trio.\p" - .string "You win the tournament by defeating\n" - .string "four TRAINERS.\p" - .string "Battle Points are awarded to\n" - .string "the tournament winner.\p" - .string "If you want to interrupt your\n" - .string "tournament, please save the game.\p" - .string "If you don’t save before interrupting,\n" - .string "you will be disqualified.$" - -BattleFrontier_BattleDomeLobby_Text_24A966: @ 824A966 - .string "They’re the results of the last\n" - .string "Level 50 SINGLE BATTLE Tournament.$" - -BattleFrontier_BattleDomeLobby_Text_24A9A9: @ 824A9A9 - .string "They’re the results of the last\n" - .string "Level 50 DOUBLE BATTLE Tournament.$" - -BattleFrontier_BattleDomeLobby_Text_24A9EC: @ 824A9EC - .string "They’re the results of the last\n" - .string "Open Level SINGLE BATTLE Tournament.$" - -BattleFrontier_BattleDomeLobby_Text_24AA31: @ 824AA31 - .string "They’re the results of the last\n" - .string "Open Level DOUBLE BATTLE Tournament.$" - -BattleFrontier_BattleDomeLobby_Text_24AA76: @ 824AA76 - .string "Did you see it?\n" - .string "The last Battle Tournament?\p" - .string "The winner, {STR_VAR_1}, was seriously\n" - .string "tough.\p" - .string "You should check out the results\n" - .string "on the monitor beside the PC.$" - -BattleFrontier_OutsideWest_Text_24AB06: @ 824AB06 - .string "The BATTLE FRONTIER…\n" - .string "I’ve long dreamed about a place like it.$" - -BattleFrontier_OutsideWest_Text_24AB44: @ 824AB44 - .string "The BATTLE DOME\n" - .string "Become the Unbeatable Superstar!$" - -BattleFrontier_OutsideWest_Text_24AB75: @ 824AB75 - .string "The ??????\n" - .string "Under Construction!$" - -BattleFrontier_BattleDomeLobby_Text_24AB94: @ 824AB94 - .string "When a TRAINER chains tournament\n" - .string "wins at the BATTLE DOME, he or she\l" - .string "gains a reputation as a star.\p" - .string "Tough TRAINERS are drawn by that\n" - .string "reputation to the BATTLE DOME.\p" - .string "A true superstar is a TRAINER who\n" - .string "can keep winning tournaments.$" - -BattleFrontier_BattleDomeLobby_Text_24AC76: @ 824AC76 - .string "I ran into one of the tournament\n" - .string "favorites in the very first round.\p" - .string "Of course I got trashed…$" - -BattleFrontier_BattleDomeLobby_Text_24ACD3: @ 824ACD3 - .string "I would’ve won if I’d kept this POKéMON\n" - .string "held in reserve.\p" - .string "You need to check your opponent’s\n" - .string "POKéMON carefully before choosing\l" - .string "your battling POKéMON.$" - -BattleFrontier_BattleDomeLobby_Text_24AD67: @ 824AD67 - .string "Congratulations!\p" - .string "You defeated the DOME ACE and won\n" - .string "the Battle Tournament!$" - -BattleFrontier_BattleDomeLobby_Text_24ADB1: @ 824ADB1 - .string "In recognition of your strategy--\n" - .string "a thing of beauty it was, too--\l" - .string "we award you these Battle Point(s)!$" - -BattleFrontier_BattleDomeLobby_Text_24AE17: @ 824AE17 - .string "Would you like to record your\n" - .string "last BATTLE DOME match on your\l" - .string "FRONTIER PASS?$" - -BattleFrontier_BattleDomeLobby_Text_24AE63: @ 824AE63 - .string "The Battle Tournament rules\n" - .string "are listed.$" - -BattleFrontier_BattleDomeLobby_Text_24AE8B: @ 824AE8B - .string "Which heading do you want to read?$" - -BattleFrontier_BattleDomeLobby_Text_24AEAE: @ 824AEAE - .string "The tournament matchups are drawn up\n" - .string "based on the toughness of POKéMON\l" - .string "held by TRAINERS.\p" - .string "The matchups avoid having tough\n" - .string "TRAINERS face each other right away.$" - -BattleFrontier_BattleDomeLobby_Text_24AF4C: @ 824AF4C - .string "The tournament chart, or as we call it,\n" - .string "the “Tree,†is available for viewing\l" - .string "in the Waiting Room from any guide.\p" - .string "The Tournament Tree will provide\n" - .string "several kinds of data.\p" - .string "The data on view includes the previous\n" - .string "tournament’s results, the POKéMON held\l" - .string "by TRAINERS, and the battle styles of\l" - .string "TRAINERS.$" - -BattleFrontier_BattleDomeLobby_Text_24B073: @ 824B073 - .string "If battling POKéMON faint at the same\n" - .string "time--a double KO--in a tournament\l" - .string "match, the REFEREES will review\l" - .string "the match and declare the winner.$" diff --git a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc deleted file mode 100644 index 024162cee..000000000 --- a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc +++ /dev/null @@ -1,417 +0,0 @@ -BattleFrontier_BattleDomePreBattleRoom_MapScripts:: @ 824B1F9 - map_script 2, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218 - map_script 4, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204 - .byte 0 - -BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204: @ 824B204 - map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B20E - .2byte 0 - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B20E:: @ 824B20E - setvar VAR_TEMP_1, 1 - turnobject 255, 2 - end - -BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218 - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222 - .2byte 0 - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222:: @ 824B222 - compare VAR_0x8006, 1 - goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 6 - setvar VAR_0x8006, 1 - special sub_81A1780 - setvar VAR_TEMP_0, 1 - applymovement 255, BattleFrontier_BattleDomePreBattleRoom_Movement_24B652 - waitmovement 0 - lockall - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F:: @ 824B24F - call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B4FB - waitmessage - switch VAR_RESULT - call BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8E0 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B2C1 - multichoice 16, 0, 73, 1 - switch VAR_RESULT - case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD - case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5 - case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D - case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B30D - case 4, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B349 - case 5, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377 - case 127, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B2C1:: @ 824B2C1 - multichoice 16, 2, 107, 1 - switch VAR_RESULT - case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD - case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5 - case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D - case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B349 - case 4, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377 - case 127, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B30D:: @ 824B30D - message BattleFrontier_BattleDomePreBattleRoom_Text_24BAF7 - waitmessage - multichoicedefault 20, 8, 94, 1, 0 - switch VAR_RESULT - case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F - case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B33F - case 127, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B33F:: @ 824B33F - call BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8B4 - goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B349:: @ 824B349 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA69, 5 - switch VAR_RESULT - case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F - case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB - case 127, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377:: @ 824B377 - message BattleFrontier_BattleDomePreBattleRoom_Text_24BA93 - waitmessage - multichoicedefault 20, 8, 94, 1, 0 - switch VAR_RESULT - case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F - case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3A9 - case 127, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3A9:: @ 824B3A9 - setvar VAR_0x8004, 12 - setvar VAR_0x8005, 9 - special sub_818E9AC - goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB - message BattleFrontier_BattleDomePreBattleRoom_Text_24BAD3 - waitmessage - setvar VAR_0x8004, 13 - setvar VAR_0x8005, 2 - special sub_818E9AC - playse SE_SAVE - waitse - fadescreen 1 - setvar VAR_0x8004, 4 - special sub_81A1780 - end - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD:: @ 824B3DD - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5, 4 - fadescreen 1 - setvar VAR_0x8004, 6 - special sub_818E9AC - waitstate - goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5:: @ 824B3F5 - call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A - fadescreen 1 - setvar VAR_0x8004, 7 - special sub_818E9AC - waitstate - goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A:: @ 824B40A - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special sub_81A1780 - switch VAR_RESULT - case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B449 - case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B452 - case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B45B - case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B464 - return - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B449:: @ 824B449 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9D9, 4 - return - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B452:: @ 824B452 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9FD, 4 - return - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B45B:: @ 824B45B - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA21, 4 - return - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B464:: @ 824B464 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA46, 4 - return - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D - message BattleFrontier_BattleDomePreBattleRoom_Text_24B70C - waitmessage - waitbuttonpress - fadescreen 1 - call BattleFrontier_BattleDomePreBattleRoom_EventScript_23F2B7 - copyvar VAR_0x8004, VAR_RESULT - setvar VAR_0x8005, 2 - special sub_80F9490 - waitstate - setvar VAR_0x8004, 21 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 8 - special sub_818E9AC - setvar VAR_0x8004, 18 - special sub_818E9AC - setvar VAR_0x8004, 9 - special sub_818E9AC - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B748, 4 - closemessage - applymovement 1, BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F - waitmovement 0 - applymovement 255, BattleFrontier_BattleDomePreBattleRoom_Movement_24B657 - waitmovement 0 - opendoor 5, 1 - waitdooranim - applymovement 255, BattleFrontier_BattleDomePreBattleRoom_Movement_24B659 - waitmovement 0 - closedoor 5, 1 - waitdooranim - warp MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM, 255, 9, 5 - setvar VAR_TEMP_0, 0 - waitstate - end - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B4FB:: @ 824B4FB - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special sub_81A1780 - switch VAR_RESULT - case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B53A - case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B540 - case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B546 - case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B54C - return - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B53A:: @ 824B53A - message BattleFrontier_BattleDomePreBattleRoom_Text_24B65C - return - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B540:: @ 824B540 - message BattleFrontier_BattleDomePreBattleRoom_Text_24B689 - return - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B546:: @ 824B546 - message BattleFrontier_BattleDomePreBattleRoom_Text_24B6B6 - return - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B54C:: @ 824B54C - setvar VAR_0x8004, 9 - special sub_81A1780 - switch VAR_RESULT - case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B - case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0 - case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B - case 4, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0 - message BattleFrontier_BattleDomePreBattleRoom_Text_24B6E3 - return - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B:: @ 824B58B - checkflag FLAG_0x001 - goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BB2E, 4 - setflag FLAG_0x001 - return - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0:: @ 824B5A0 - checkflag FLAG_0x001 - goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BBAC, 4 - setflag FLAG_0x001 - return - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5:: @ 824B5B5 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BC2A, 4 - return - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE:: @ 824B5BE - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BC63, 4 - return - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7 - setvar VAR_TEMP_0, 1 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B760, 4 - special LoadPlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 - special sub_81A1780 - playfanfare MUS_ME_ASA - waitfanfare - special HealPlayerParty - call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600 - fadescreen 1 - setvar VAR_0x8004, 11 - special sub_818E9AC - waitstate - goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600:: @ 824B600 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special sub_81A1780 - switch VAR_RESULT - case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B634 - case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B63D - case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B646 - return - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B634:: @ 824B634 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B7A3, 4 - return - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B63D:: @ 824B63D - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B7F1, 4 - return - -BattleFrontier_BattleDomePreBattleRoom_EventScript_24B646:: @ 824B646 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B83F, 4 - return - -BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F: @ 824B64F - walk_right - face_left - step_end - -BattleFrontier_BattleDomePreBattleRoom_Movement_24B652: @ 824B652 - walk_up - walk_up - walk_up - walk_up - step_end - -BattleFrontier_BattleDomePreBattleRoom_Movement_24B657: @ 824B657 - walk_up - step_end - -BattleFrontier_BattleDomePreBattleRoom_Movement_24B659: @ 824B659 - walk_up - set_invisible - step_end - -BattleFrontier_BattleDomePreBattleRoom_Text_24B65C: @ 824B65C - .string "Your 1st-round match is next.\n" - .string "Are you ready?$" - -BattleFrontier_BattleDomePreBattleRoom_Text_24B689: @ 824B689 - .string "Your 2nd-round match is next.\n" - .string "Are you ready?$" - -BattleFrontier_BattleDomePreBattleRoom_Text_24B6B6: @ 824B6B6 - .string "Your semifinal match is next.\n" - .string "Are you ready?$" - -BattleFrontier_BattleDomePreBattleRoom_Text_24B6E3: @ 824B6E3 - .string "Your final match is next.\n" - .string "Are you ready?$" - -BattleFrontier_BattleDomePreBattleRoom_Text_24B70C: @ 824B70C - .string "Please choose the two POKéMON\n" - .string "that are to appear in battle.$" - -BattleFrontier_BattleDomePreBattleRoom_Text_24B748: @ 824B748 - .string "Right this way, please.$" - -BattleFrontier_BattleDomePreBattleRoom_Text_24B760: @ 824B760 - .string "Thank you for competing!\p" - .string "I’ll restore your POKéMON to\n" - .string "full health.$" - -BattleFrontier_BattleDomePreBattleRoom_Text_24B7A3: @ 824B7A3 - .string "All 1st-round matches have been\n" - .string "completed.\p" - .string "These are the teams that advanced!$" - -BattleFrontier_BattleDomePreBattleRoom_Text_24B7F1: @ 824B7F1 - .string "All 2nd-round matches have been\n" - .string "completed.\p" - .string "These are the teams that advanced!$" - -BattleFrontier_BattleDomePreBattleRoom_Text_24B83F: @ 824B83F - .string "All semifinal matches have been\n" - .string "completed.\p" - .string "These are the teams that advanced!$" - -BattleFrontier_BattleDomePreBattleRoom_Text_24B88D: @ 824B88D - .string "Congratulations for getting through\n" - .string "the 1st round.\p" - .string "The 2nd round is next.\n" - .string "Are you ready?$" - -BattleFrontier_BattleDomePreBattleRoom_Text_24B8E6: @ 824B8E6 - .string "Congratulations for advancing\n" - .string "to the semifinals.\p" - .string "The best four teams meet in this round.\n" - .string "Are you ready?$" - -BattleFrontier_BattleDomePreBattleRoom_Text_24B94E: @ 824B94E - .string "Congratulations for advancing\n" - .string "to the final match.\p" - .string "You’re one win from the championship.\n" - .string "Are you ready?$" - -BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5: @ 824B9B5 - .string "{PLAYER}’s next opponent\n" - .string "is this TRAINER.$" - -BattleFrontier_BattleDomePreBattleRoom_Text_24B9D9: @ 824B9D9 - .string "The tournament is in the 1st round.$" - -BattleFrontier_BattleDomePreBattleRoom_Text_24B9FD: @ 824B9FD - .string "The tournament is in the 2nd round.$" - -BattleFrontier_BattleDomePreBattleRoom_Text_24BA21: @ 824BA21 - .string "The tournament is in the semifinals.$" - -BattleFrontier_BattleDomePreBattleRoom_Text_24BA46: @ 824BA46 - .string "The tournament is up to the final.$" - -BattleFrontier_BattleDomePreBattleRoom_Text_24BA69: @ 824BA69 - .string "Would you like to save and\n" - .string "quit the game?$" - -BattleFrontier_BattleDomePreBattleRoom_Text_24BA93: @ 824BA93 - .string "Would you like to retire from your\n" - .string "Battle Tournament challenge?$" - -BattleFrontier_BattleDomePreBattleRoom_Text_24BAD3: @ 824BAD3 - .string "I am saving your data.\n" - .string "Please wait.$" - -BattleFrontier_BattleDomePreBattleRoom_Text_24BAF7: @ 824BAF7 - .string "Should I record your last match\n" - .string "on your FRONTIER PASS?$" - -BattleFrontier_BattleDomePreBattleRoom_Text_24BB2E: @ 824BB2E - .string "Congratulations for advancing\n" - .string "to the final match.\p" - .string "For the final match, you will challenge\n" - .string "the DOME ACE TUCKER.\p" - .string "Are you ready?$" - -BattleFrontier_BattleDomePreBattleRoom_Text_24BBAC: @ 824BBAC - .string "Congratulations for advancing\n" - .string "to the final match.\p" - .string "For the final match, you will challenge\n" - .string "the DOME ACE TUCKER.\p" - .string "Are you ready?$" - -BattleFrontier_BattleDomePreBattleRoom_Text_24BC2A: @ 824BC2A - .string "Your final battle against TUCKER is\n" - .string "next. Are you ready?$" - -BattleFrontier_BattleDomePreBattleRoom_Text_24BC63: @ 824BC63 - .string "Your final battle against TUCKER is\n" - .string "next. Are you ready?$" - diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc deleted file mode 100644 index 5b6a674fb..000000000 --- a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc +++ /dev/null @@ -1,384 +0,0 @@ -BattleFrontier_BattleFactoryBattleRoom_MapScripts:: @ 825ADAB - map_script 3, BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB - map_script 4, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00 - map_script 2, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31 - .byte 0 - -BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB - setvar VAR_0x8004, 5 - special sub_81A1780 - checkplayergender - compare VAR_RESULT, 0 - call_if 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25 - compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B - setvar VAR_0x8004, 9 - special sub_81A1780 - copyvar VAR_TEMP_F, VAR_RESULT - compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25ADF3 - end - -BattleFrontier_BattleFactoryBattleRoom_EventScript_25ADF3:: @ 825ADF3 - call BattleFrontier_BattleFactoryBattleRoom_EventScript_242170 - setobjectxyperm 2, 7, 9 - end - -BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00: @ 825AE00 - map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE0A - .2byte 0 - -BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE0A:: @ 825AE0A - setvar VAR_TEMP_1, 1 - hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM - compare VAR_TEMP_F, 0 - goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24 - hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM - -BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24:: @ 825AE24 - end - -BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25:: @ 825AE25 - setvar VAR_OBJ_GFX_ID_F, 100 - return - -BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B:: @ 825AE2B - setvar VAR_OBJ_GFX_ID_F, 105 - return - -BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31: @ 825AE31 - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67 - .2byte 0 - -BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B:: @ 825AE3B - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1E2, 4 - closemessage - applymovement 2, BattleFrontier_BattleFactoryBattleRoom_Movement_25B18B - applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B - applymovement 255, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B - waitmovement 0 - call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4 - goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7 - end - -BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67:: @ 825AE67 - compare VAR_TEMP_F, 0 - goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B - applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B - applymovement 255, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B - waitmovement 0 - call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4 - setvar VAR_0x8004, 11 - special sub_81A5E74 - removeobject 2 - setobjectxyperm 2, 7, 1 - addobject 2 - applymovement 2, BattleFrontier_BattleFactoryBattleRoom_Movement_25B184 - waitmovement 0 - -BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7 - compare VAR_TEMP_F, 0 - goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C - setvar VAR_0x8004, 5 - special sub_8195960 - lockall - msgbox 0x2021fc4, 4 - waitmessage - closemessage - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 6 - setvar VAR_0x8006, 0 - special sub_81A1780 - special HealPlayerParty - setvar VAR_0x8004, 6 - setvar VAR_0x8005, 0 - special sub_8163AC4 - waitstate - switch VAR_RESULT - case 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF0F - -BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8:: @ 825AEF8 -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25AEF8:: @ 825AEF8 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 4 - special sub_81A1780 - goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190 -@ goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B190 - -BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF0F:: @ 825AF0F - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 3 - special sub_81A5E74 - compare VAR_RESULT, 9999 - goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E - addvar VAR_RESULT, 1 - setorcopyvar VAR_0x8006, VAR_RESULT - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - special sub_81A5E74 - -BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E:: @ 825AF3E - call BattleFrontier_BattleFactoryBattleRoom_EventScript_241EBA - -BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43:: @ 825AF43 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special sub_81A1780 - addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 - switch VAR_RESULT - case 7, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85 - setvar VAR_0x8006, 1 - warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 8 - waitstate - -BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85:: @ 825AF85 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 3 - special sub_81A1780 - goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190 - -BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C:: @ 825AF9C - switch VAR_TEMP_F - case 2, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051 - case 3, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF - case 4, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 7 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB, 4 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 7 - special sub_81A1780 - -BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF:: @ 825AFEF - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1, 4 - call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C - goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8 - -BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C - setvar VAR_0x8004, 12 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B42D, 4 - closemessage - applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B182 - waitmovement 0 - playfanfare MUS_ME_SYMBOLGET - message BattleFrontier_BattleFactoryBattleRoom_Text_25B460 - waitmessage - waitfanfare - setvar VAR_0x8004, 13 - special sub_81A1780 - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B498, 4 - goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 - -BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051:: @ 825B051 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 7 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B517, 4 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 7 - special sub_81A1780 - -BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E:: @ 825B07E - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF, 4 - call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B - goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8 - -BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B - setvar VAR_0x8004, 12 - special sub_81A1780 - compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5E7, 4 - waitmessage - applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B182 - waitmovement 0 - playfanfare MUS_ME_SYMBOLGET - message BattleFrontier_BattleFactoryBattleRoom_Text_25B640 - waitmessage - waitfanfare - setvar VAR_0x8004, 13 - special sub_81A1780 - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B66D, 4 - goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 - -BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0:: @ 825B0E0 - closemessage - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 6 - setvar VAR_0x8006, 0 - special sub_81A1780 - special HealPlayerParty - setvar VAR_0x8004, 6 - setvar VAR_0x8005, 0 - special sub_8163AC4 - waitstate - return - -BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105:: @ 825B105 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 3 - special sub_81A5E74 - compare VAR_RESULT, 9999 - goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E - addvar VAR_RESULT, 1 - setorcopyvar VAR_0x8006, VAR_RESULT - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - special sub_81A5E74 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - special sub_81A5E74 - compare VAR_RESULT, 9999 - goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43 - addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - copyvar VAR_0x8006, VAR_RESULT - special sub_81A5E74 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special sub_81A1780 - addvar VAR_RESULT, 1 - goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85 - end - -BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B: @ 825B17B - walk_up - walk_up - walk_up - walk_up - walk_up - face_right - step_end - -BattleFrontier_BattleFactoryBattleRoom_Movement_25B182: @ 825B182 - walk_right - step_end - -BattleFrontier_BattleFactoryBattleRoom_Movement_25B184: @ 825B184 - walk_down - walk_down - walk_down - walk_down - walk_down - face_left - step_end - -BattleFrontier_BattleFactoryBattleRoom_Movement_25B18B: @ 825B18B - walk_up - walk_up - walk_up - face_left - step_end - -BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190:: @ 825B190 -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B190:: @ 825B190 - copyvar VAR_RESULT, VAR_0x40CE - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA - warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 4, 8 - waitstate - end - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA:: @ 825B1AA - warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 14, 8 - waitstate - end - -BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4:: @ 825B1B4 - applymovement 1, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8 - applymovement 3, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8 - applymovement 4, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8 - applymovement 5, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4 - applymovement 6, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4 - applymovement 7, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4 - waitmovement 0 - return - -BattleFrontier_BattleFactoryBattleRoom_Text_25B1E2: @ 825B1E2 - .string "Hey, hey!\n" - .string "Get a move on!$" - -BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB: @ 825B1FB - .string "Hey, my name’s NOLAND!\n" - .string "I’m basically in charge of this place,\l" - .string "which is why I’m the FACTORY HEAD!\p" - .string "I had a look at your Battle Swap data.\p" - .string "You seem to have the right idea,\n" - .string "but you’re still square in your head!\p" - .string "Listen up, okay? Knowledge isn’t only\n" - .string "about reading books or doing desk work.\p" - .string "Just doing that sort of thing…\n" - .string "It may as well be useless!\p" - .string "You have to experience things with\n" - .string "your heart and your body, understand?\p" - .string "I’ll take you on under the same\n" - .string "conditions as you.\p" - .string "I’ll be using rental POKéMON, too!$" - -BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1: @ 825B3F1 - .string "Shake out every last bit of your\n" - .string "knowledge and bring it on!$" - -BattleFrontier_BattleFactoryBattleRoom_Text_25B42D: @ 825B42D - .string "NOLAND: Smart going!\n" - .string "Let’s see your FRONTIER PASS.$" - -BattleFrontier_BattleFactoryBattleRoom_Text_25B460: @ 825B460 - .string "The Knowledge Symbol was embossed\n" - .string "on the FRONTIER PASS!$" - -BattleFrontier_BattleFactoryBattleRoom_Text_25B498: @ 825B498 - .string "Heh…\n" - .string "You’re a pretty bright spark…\p" - .string "Next time, I’ll come after you hard.\n" - .string "No holds barred, understand?\p" - .string "You keep up your studies!$" - -BattleFrontier_BattleFactoryBattleRoom_Text_25B517: @ 825B517 - .string "NOLAND: Hey, hey! How’s it going?\n" - .string "You keeping up with your studies?\p" - .string "…Oh?\p" - .string "You’ve taken on a harder look than\n" - .string "the last time I saw you.\p" - .string "Now, this should be fun!\n" - .string "I’m getting excited, hey!$" - -BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF: @ 825B5CF - .string "All right!\n" - .string "Bring it on!$" - -BattleFrontier_BattleFactoryBattleRoom_Text_25B5E7: @ 825B5E7 - .string "NOLAND: What the…\n" - .string "You’re getting out of my league!\p" - .string "Sheesh!\n" - .string "Let’s see that FRONTIER PASS!$" - -BattleFrontier_BattleFactoryBattleRoom_Text_25B640: @ 825B640 - .string "The Knowledge Symbol took on\n" - .string "a golden shine!$" - -BattleFrontier_BattleFactoryBattleRoom_Text_25B66D: @ 825B66D - .string "Pfft, man!\p" - .string "That’s absolutely the last time\n" - .string "I lose to you!\p" - .string "We have to do this again, hey?$" - diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc b/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc deleted file mode 100644 index ec2483390..000000000 --- a/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc +++ /dev/null @@ -1,611 +0,0 @@ -BattleFrontier_BattleFactoryLobby_MapScripts:: @ 82583E8 - map_script 2, BattleFrontier_BattleFactoryLobby_MapScript2_258407 - map_script 4, BattleFrontier_BattleFactoryLobby_MapScript2_2583F3 - .byte 0 - -BattleFrontier_BattleFactoryLobby_MapScript2_2583F3: @ 82583F3 - map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleFactoryLobby_EventScript_2583FD - .2byte 0 - -BattleFrontier_BattleFactoryLobby_EventScript_2583FD:: @ 82583FD - setvar VAR_TEMP_1, 1 - turnobject 255, 2 - end - -BattleFrontier_BattleFactoryLobby_MapScript2_258407: @ 8258407 - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258431 - map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattleFactoryLobby_EventScript_25843A - map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattleFactoryLobby_EventScript_258592 - map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattleFactoryLobby_EventScript_25849B - map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattleFactoryLobby_EventScript_258506 - .2byte 0 - -BattleFrontier_BattleFactoryLobby_EventScript_258431:: @ 8258431 - setvar VAR_0x8004, 0 - special sub_81A1780 - end - -BattleFrontier_BattleFactoryLobby_EventScript_25843A:: @ 825843A - lockall - msgbox BattleFrontier_BattleFactoryLobby_Text_258ECA, 4 - closemessage - setvar VAR_0x8004, 8 - special sub_81A5E74 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 0 - special sub_81A5E74 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 0 - special sub_81A5E74 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 0 - special sub_81A5E74 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_TEMP_0, 255 - releaseall - end - -BattleFrontier_BattleFactoryLobby_EventScript_25849B:: @ 825849B - lockall - setvar VAR_0x8004, 10 - special sub_81A1780 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleFactoryLobby_EventScript_2584BD - msgbox BattleFrontier_BattleFactoryLobby_Text_258D93, 4 - waitmessage - goto BattleFrontier_BattleFactoryLobby_EventScript_2584C6 - -BattleFrontier_BattleFactoryLobby_EventScript_2584BD:: @ 82584BD - msgbox BattleFrontier_BattleFactoryLobby_Text_25926A, 4 - waitmessage - -BattleFrontier_BattleFactoryLobby_EventScript_2584C6:: @ 82584C6 - msgbox BattleFrontier_BattleFactoryLobby_Text_2592BD, 4 - setvar VAR_0x8004, 11 - special sub_81A1780 - msgbox BattleFrontier_BattleFactoryLobby_Text_241520, 9 - message BattleFrontier_BattleFactoryLobby_Text_259323 - waitmessage - setvar VAR_0x8004, 8 - special sub_81A1780 - special LoadPlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 0 - special sub_81A5E74 - playse SE_SAVE - waitse - goto BattleFrontier_BattleFactoryLobby_EventScript_25853B - end - -BattleFrontier_BattleFactoryLobby_EventScript_258506:: @ 8258506 - lockall - message BattleFrontier_BattleFactoryLobby_Text_258CC7 - waitmessage - setvar VAR_0x8004, 8 - special sub_81A1780 - special LoadPlayerParty - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 0 - special sub_81A5E74 - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 0 - special sub_81A5E74 - playse SE_SAVE - waitse - -BattleFrontier_BattleFactoryLobby_EventScript_25853B:: @ 825853B - call BattleFrontier_BattleFactoryLobby_EventScript_23E8E0 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleFactoryLobby_EventScript_258582 - message BattleFrontier_BattleFactoryLobby_Text_259388 - waitmessage - multichoicedefault 20, 8, 94, 1, 0 - switch VAR_RESULT - case 1, BattleFrontier_BattleFactoryLobby_EventScript_258582 - case 0, BattleFrontier_BattleFactoryLobby_EventScript_25857D - case 127, BattleFrontier_BattleFactoryLobby_EventScript_258582 - -BattleFrontier_BattleFactoryLobby_EventScript_25857D:: @ 825857D - call BattleFrontier_BattleFactoryLobby_EventScript_23E8B4 - -BattleFrontier_BattleFactoryLobby_EventScript_258582:: @ 8258582 - msgbox BattleFrontier_BattleFactoryLobby_Text_258BC5, 4 - closemessage - setvar VAR_TEMP_0, 255 - releaseall - end - -BattleFrontier_BattleFactoryLobby_EventScript_258592:: @ 8258592 - lockall - message BattleFrontier_BattleFactoryLobby_Text_258E77 - waitmessage - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 1 - special sub_81A5E74 - playse SE_SAVE - waitse - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_TEMP_0, 255 - setvar VAR_0x8006, 2 - goto BattleFrontier_BattleFactoryLobby_EventScript_25871A - -BattleFrontier_BattleFactoryLobby_EventScript_2585CB:: @ 82585CB - lock - faceplayer - setvar VAR_FRONTIER_FACILITY, 4 - setvar VAR_0x40CE, 0 - goto BattleFrontier_BattleFactoryLobby_EventScript_2585ED - end - -BattleFrontier_BattleFactoryLobby_EventScript_2585DD:: @ 82585DD - setvar VAR_FRONTIER_FACILITY, 4 - setvar VAR_0x40CE, 1 - goto BattleFrontier_BattleFactoryLobby_EventScript_2585ED - end - -BattleFrontier_BattleFactoryLobby_EventScript_2585ED:: @ 82585ED - special SavePlayerParty - compare VAR_0x40CE, 0 - call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587B1 - compare VAR_0x40CE, 1 - call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587BA - -BattleFrontier_BattleFactoryLobby_EventScript_258606:: @ 8258606 - compare VAR_0x40CE, 0 - call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587C3 - compare VAR_0x40CE, 1 - call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587C9 - waitmessage - multichoice 17, 6, 23, 0 - switch VAR_RESULT - case 0, BattleFrontier_BattleFactoryLobby_EventScript_258653 - case 1, BattleFrontier_BattleFactoryLobby_EventScript_258768 - case 2, BattleFrontier_BattleFactoryLobby_EventScript_25879D - case 127, BattleFrontier_BattleFactoryLobby_EventScript_25879D - -BattleFrontier_BattleFactoryLobby_EventScript_258653:: @ 8258653 - message BattleFrontier_BattleFactoryLobby_Text_258BE9 - waitmessage - multichoice 17, 6, 24, 0 - switch VAR_RESULT - case 2, BattleFrontier_BattleFactoryLobby_EventScript_25879D - case 127, BattleFrontier_BattleFactoryLobby_EventScript_25879D - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 - msgbox BattleFrontier_BattleFactoryLobby_Text_258C27, 5 - switch VAR_RESULT - case 0, BattleFrontier_BattleFactoryLobby_EventScript_25879A - case 1, BattleFrontier_BattleFactoryLobby_EventScript_2586B9 - case 127, BattleFrontier_BattleFactoryLobby_EventScript_25879A - -BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9 - setvar VAR_TEMP_0, 0 - setvar VAR_0x8004, 0 - special sub_81A5E74 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 1 - special sub_81A1780 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 1 - special sub_81A5E74 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 0 - special sub_81A1780 - closemessage - delay 2 - call BattleFrontier_BattleFactoryLobby_EventScript_27134F - setvar VAR_TEMP_0, 255 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleFactoryLobby_EventScript_258783 - setvar VAR_0x8006, 0 - -BattleFrontier_BattleFactoryLobby_EventScript_25871A:: @ 825871A - special SavePlayerParty - msgbox BattleFrontier_BattleFactoryLobby_Text_258CB1, 4 - closemessage - compare VAR_0x40CE, 0 - call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_25875C - compare VAR_0x40CE, 1 - call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_258762 - applymovement VAR_LAST_TALKED, BattleFrontier_BattleFactoryLobby_Movement_2587A7 - applymovement 255, BattleFrontier_BattleFactoryLobby_Movement_2587AC - waitmovement 0 - warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 13 - setvar VAR_TEMP_0, 0 - waitstate - end - -BattleFrontier_BattleFactoryLobby_EventScript_25875C:: @ 825875C - setvar VAR_LAST_TALKED, 1 - return - -BattleFrontier_BattleFactoryLobby_EventScript_258762:: @ 8258762 - setvar VAR_LAST_TALKED, 6 - return - -BattleFrontier_BattleFactoryLobby_EventScript_258768:: @ 8258768 - compare VAR_0x40CE, 0 - call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587CF - compare VAR_0x40CE, 1 - call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587D8 - goto BattleFrontier_BattleFactoryLobby_EventScript_258606 - -BattleFrontier_BattleFactoryLobby_EventScript_258783:: @ 8258783 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special sub_81A1780 - goto BattleFrontier_BattleFactoryLobby_EventScript_25879D - -BattleFrontier_BattleFactoryLobby_EventScript_25879A:: @ 825879A - special LoadPlayerParty - -BattleFrontier_BattleFactoryLobby_EventScript_25879D:: @ 825879D - msgbox BattleFrontier_BattleFactoryLobby_Text_258BC5, 4 - release - end - -BattleFrontier_BattleFactoryLobby_Movement_2587A7: @ 82587A7 - walk_up - walk_up - walk_up - set_invisible - step_end - -BattleFrontier_BattleFactoryLobby_Movement_2587AC: @ 82587AC - walk_up - walk_up - walk_up - walk_up - step_end - -BattleFrontier_BattleFactoryLobby_EventScript_2587B1:: @ 82587B1 - msgbox BattleFrontier_BattleFactoryLobby_Text_2588EE, 4 - return - -BattleFrontier_BattleFactoryLobby_EventScript_2587BA:: @ 82587BA - msgbox BattleFrontier_BattleFactoryLobby_Text_258F93, 4 - return - -BattleFrontier_BattleFactoryLobby_EventScript_2587C3:: @ 82587C3 - message BattleFrontier_BattleFactoryLobby_Text_25897A - return - -BattleFrontier_BattleFactoryLobby_EventScript_2587C9:: @ 82587C9 - message BattleFrontier_BattleFactoryLobby_Text_25901F - return - -BattleFrontier_BattleFactoryLobby_EventScript_2587CF:: @ 82587CF - msgbox BattleFrontier_BattleFactoryLobby_Text_2589B3, 4 - return - -BattleFrontier_BattleFactoryLobby_EventScript_2587D8:: @ 82587D8 - msgbox BattleFrontier_BattleFactoryLobby_Text_259058, 4 - return - -BattleFrontier_BattleFactoryLobby_EventScript_2587E1:: @ 82587E1 - lockall - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 4 - setvar VAR_0x8006, 0 - special sub_81A1780 - waitbuttonpress - special RemoveRecordsWindow - releaseall - end - -BattleFrontier_BattleFactoryLobby_EventScript_2587FA:: @ 82587FA - lockall - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 4 - setvar VAR_0x8006, 1 - special sub_81A1780 - waitbuttonpress - special RemoveRecordsWindow - releaseall - end - -BattleFrontier_BattleFactoryLobby_EventScript_258813:: @ 8258813 - msgbox BattleFrontier_BattleFactoryLobby_Text_2593D7, 2 - end - -BattleFrontier_BattleFactoryLobby_EventScript_25881C:: @ 825881C - msgbox BattleFrontier_BattleFactoryLobby_Text_2594E5, 2 - end - -BattleFrontier_BattleFactoryLobby_EventScript_258825:: @ 8258825 - lock - msgbox BattleFrontier_BattleFactoryLobby_Text_259547, 4 - release - end - -BattleFrontier_BattleFactoryLobby_EventScript_258830:: @ 8258830 - msgbox BattleFrontier_BattleFactoryLobby_Text_2595C4, 2 - end - -BattleFrontier_BattleFactoryLobby_EventScript_258839:: @ 8258839 - lockall - msgbox BattleFrontier_BattleFactoryLobby_Text_259721, 4 - goto BattleFrontier_BattleFactoryLobby_EventScript_258848 - end - -BattleFrontier_BattleFactoryLobby_EventScript_258848:: @ 8258848 - message BattleFrontier_BattleFactoryLobby_Text_259743 - waitmessage - multichoice 17, 0, 99, 0 - switch VAR_RESULT - case 0, BattleFrontier_BattleFactoryLobby_EventScript_2588A6 - case 1, BattleFrontier_BattleFactoryLobby_EventScript_2588B4 - case 2, BattleFrontier_BattleFactoryLobby_EventScript_2588C2 - case 3, BattleFrontier_BattleFactoryLobby_EventScript_2588D0 - case 4, BattleFrontier_BattleFactoryLobby_EventScript_2588DE - case 5, BattleFrontier_BattleFactoryLobby_EventScript_2588EC - case 127, BattleFrontier_BattleFactoryLobby_EventScript_2588EC - end - -BattleFrontier_BattleFactoryLobby_EventScript_2588A6:: @ 82588A6 - msgbox BattleFrontier_BattleFactoryLobby_Text_259766, 4 - goto BattleFrontier_BattleFactoryLobby_EventScript_258848 - end - -BattleFrontier_BattleFactoryLobby_EventScript_2588B4:: @ 82588B4 - msgbox BattleFrontier_BattleFactoryLobby_Text_2597FB, 4 - goto BattleFrontier_BattleFactoryLobby_EventScript_258848 - end - -BattleFrontier_BattleFactoryLobby_EventScript_2588C2:: @ 82588C2 - msgbox BattleFrontier_BattleFactoryLobby_Text_25987E, 4 - goto BattleFrontier_BattleFactoryLobby_EventScript_258848 - end - -BattleFrontier_BattleFactoryLobby_EventScript_2588D0:: @ 82588D0 - msgbox BattleFrontier_BattleFactoryLobby_Text_259920, 4 - goto BattleFrontier_BattleFactoryLobby_EventScript_258848 - end - -BattleFrontier_BattleFactoryLobby_EventScript_2588DE:: @ 82588DE - msgbox BattleFrontier_BattleFactoryLobby_Text_259A5E, 4 - goto BattleFrontier_BattleFactoryLobby_EventScript_258848 - end - -BattleFrontier_BattleFactoryLobby_EventScript_2588EC:: @ 82588EC - releaseall - end - -BattleFrontier_BattleFactoryLobby_Text_2588EE: @ 82588EE - .string "Where the intelligence of TRAINERS\n" - .string "is put to the test!\p" - .string "Welcome to the BATTLE FACTORY!\p" - .string "I am your guide to the Battle Swap\n" - .string "Single Tournament.$" - -BattleFrontier_BattleFactoryLobby_Text_25897A: @ 825897A - .string "Would you like to take the Battle\n" - .string "Swap Single challenge?$" - -BattleFrontier_BattleFactoryLobby_Text_2589B3: @ 82589B3 - .string "The Battle Swap Single Tournament\n" - .string "is a SINGLE BATTLE competition using\l" - .string "only rental POKéMON.\p" - .string "First, you will be loaned three\n" - .string "POKéMON specifically for this event.\p" - .string "Using the supplied rental POKéMON,\n" - .string "you must conduct a SINGLE BATTLE.\p" - .string "If you win, you are permitted to trade\n" - .string "one of your rental POKéMON.\p" - .string "Repeat this cycle of battling and\n" - .string "trading--if you win seven times in\l" - .string "a row, you will earn Battle Points.\p" - .string "If you want to interrupt your\n" - .string "challenge, please save the game.\p" - .string "If you don’t save, you will be\n" - .string "disqualified from your challenge.$" - -BattleFrontier_BattleFactoryLobby_Text_258BC5: @ 8258BC5 - .string "We look forward to your next visit.$" - -BattleFrontier_BattleFactoryLobby_Text_258BE9: @ 8258BE9 - .string "Which level do you wish to challenge?\n" - .string "Level 50 or Open Level?$" - -BattleFrontier_BattleFactoryLobby_Text_258C27: @ 8258C27 - .string "Before you begin your challenge,\n" - .string "I need to save the game. Is that okay?$" - -BattleFrontier_BattleFactoryLobby_Text_258C6F: @ 8258C6F - .string "Okay, I will hold your POKéMON for\n" - .string "safekeeping while you compete.$" - -BattleFrontier_BattleFactoryLobby_Text_258CB1: @ 8258CB1 - .string "Please step this way.$" - -BattleFrontier_BattleFactoryLobby_Text_258CC7: @ 8258CC7 - .string "Thank you for participating!\p" - .string "I will return your POKéMON in exchange\n" - .string "for our rental POKéMON.\p" - .string "I must also save the event results.\n" - .string "Please wait.$" - -BattleFrontier_BattleFactoryLobby_Text_258D54: @ 8258D54 - .string "I will return your POKéMON in exchange\n" - .string "for our rental POKéMON.$" - -BattleFrontier_BattleFactoryLobby_Text_258D93: @ 8258D93 - .string "Congratulations! You’ve won seven\n" - .string "straight Battle Swap matches!$" - -BattleFrontier_BattleFactoryLobby_Text_258DD3: @ 8258DD3 - .string "In recognition of your 7-win streak,\n" - .string "we award you these Battle Point(s).$" - -BattleFrontier_BattleFactoryLobby_Text_258E1C: @ 8258E1C - .string "Oh, oh, oh!\p" - .string "Your Battle Points are maxed.\p" - .string "Please come back after using\n" - .string "some Battle Points.$" - -BattleFrontier_BattleFactoryLobby_Text_258E77: @ 8258E77 - .string "We’ve been waiting for you!\p" - .string "Before we resume your challenge,\n" - .string "I must save the game.$" - -BattleFrontier_BattleFactoryLobby_Text_258ECA: @ 8258ECA - .string "I’m sorry to say this, but you didn’t\n" - .string "save before you quit playing last time.\p" - .string "As a result, you have been disqualified\n" - .string "from your challenge.$" - -BattleFrontier_BattleFactoryLobby_Text_258F55: @ 8258F55 - .string "We’ll return your personal POKéMON.$" - -BattleFrontier_BattleFactoryLobby_Text_258F79: @ 8258F79 - .string "{PLAYER} received the prize\n" - .string "{STR_VAR_1}.$" - -BattleFrontier_BattleFactoryLobby_Text_258F93: @ 8258F93 - .string "Where the intelligence of TRAINERS\n" - .string "is put to the test!\p" - .string "Welcome to the BATTLE FACTORY!\p" - .string "I am your guide to the Battle Swap\n" - .string "Double Tournament.$" - -BattleFrontier_BattleFactoryLobby_Text_25901F: @ 825901F - .string "Would you like to take the Battle\n" - .string "Swap Double challenge?$" - -BattleFrontier_BattleFactoryLobby_Text_259058: @ 8259058 - .string "The Battle Swap Double Tournament\n" - .string "is a DOUBLE BATTLE competition using\l" - .string "only rental POKéMON.\p" - .string "First, you will be loaned three\n" - .string "POKéMON specifically for this event.\p" - .string "Using the supplied rental POKéMON,\n" - .string "you must conduct a DOUBLE BATTLE.\p" - .string "If you win, you are permitted to trade\n" - .string "one of your rental POKéMON.\p" - .string "Repeat this cycle of battling and\n" - .string "trading--if you win seven times in\l" - .string "a row, you will earn Battle Points.\p" - .string "If you want to interrupt your\n" - .string "challenge, please save the game.\p" - .string "If you don’t save before interrupting,\n" - .string "you will be disqualified.$" - -BattleFrontier_BattleFactoryLobby_Text_25926A: @ 825926A - .string "Congratulations for defeating\n" - .string "the FACTORY HEAD and winning\l" - .string "seven matches in a row!$" - -BattleFrontier_BattleFactoryLobby_Text_2592BD: @ 82592BD - .string "In recognition of your wealth of\n" - .string "knowledge and keen intelligence,\l" - .string "we award you these Battle Point(s).$" - -BattleFrontier_BattleFactoryLobby_Text_259323: @ 8259323 - .string "Let me exchange your POKéMON\n" - .string "for our rental POKéMON.\p" - .string "I need to save the battle data,\n" - .string "so please wait.$" - -BattleFrontier_BattleFactoryLobby_Text_259388: @ 8259388 - .string "Would you like to record your last\n" - .string "BATTLE FACTORY match on your\l" - .string "FRONTIER PASS?$" - -BattleFrontier_BattleFactoryLobby_Text_2593D7: @ 82593D7 - .string "Hi!\n" - .string "You, there!\p" - .string "Are you thinking that the events here\n" - .string "are easy since you don’t need to have\l" - .string "a raised team of POKéMON?\p" - .string "I wouldn’t be too sure about winning\n" - .string "that easily.\p" - .string "If you don’t have thorough knowledge\n" - .string "about POKéMON and their moves,\l" - .string "it will be tough to keep winning.$" - -BattleFrontier_BattleFactoryLobby_Text_2594E5: @ 82594E5 - .string "I swapped for a weak POKéMON…\n" - .string "I thought it was a good kind to have…\p" - .string "They wiped the floor with us…$" - -BattleFrontier_BattleFactoryLobby_Text_259547: @ 8259547 - .string "Things haven’t been going my way\n" - .string "at all.\p" - .string "You need to check your opponent’s\n" - .string "POKéMON during battle to see if\l" - .string "they’re any good.$" - -BattleFrontier_BattleFactoryLobby_Text_2595C4: @ 82595C4 - .string "You know how the staff here give you\n" - .string "a few hints about your next opponent?\p" - .string "Well, I’m a full-grown man, but I have\n" - .string "trouble figuring out their hints.$" - -BattleFrontier_BattleFactoryLobby_Text_259658: @ 8259658 - .string "Like, I’m really tough, but I get bored\n" - .string "really easily, so I just kept swapping\l" - .string "and battling over and over.\p" - .string "So anyway, when I kept entering\n" - .string "Battle Swap events, I noticed they\l" - .string "varied the rental POKéMON.$" - -BattleFrontier_BattleFactoryLobby_Text_259721: @ 8259721 -SlateportCity_BattleTentLobby_Text_259721: @ 8259721 - .string "The Battle Swap rules are listed.$" - -BattleFrontier_BattleFactoryLobby_Text_259743: @ 8259743 -SlateportCity_BattleTentLobby_Text_259743: @ 8259743 - .string "Which heading do you want to read?$" - -BattleFrontier_BattleFactoryLobby_Text_259766: @ 8259766 - .string "In a Battle Swap event, you may use\n" - .string "only three POKéMON.\p" - .string "Whether you are renting or swapping,\n" - .string "your team may not have two or more\l" - .string "of the same POKéMON.$" - -BattleFrontier_BattleFactoryLobby_Text_2597FB: @ 82597FB - .string "You may swap POKéMON only with\n" - .string "the TRAINER you have just defeated.\p" - .string "You may swap for only those POKéMON\n" - .string "used by the beaten TRAINER.$" - -BattleFrontier_BattleFactoryLobby_Text_25987E: @ 825987E - .string "After every battle you win, you may\n" - .string "swap for one of your defeated\l" - .string "opponent’s POKéMON.\p" - .string "You will not be able to swap POKéMON\n" - .string "with the seventh TRAINER in the event.$" - -BattleFrontier_BattleFactoryLobby_Text_259920: @ 8259920 - .string "There are two key points to be aware\n" - .string "of when swapping POKéMON.\p" - .string "First, when swapping, you can’t check\n" - .string "the stats of the POKéMON you are\l" - .string "about to receive.\p" - .string "Second, the POKéMON on your team\n" - .string "are lined up in sequence, depending on\l" - .string "the order in which you rented them.\p" - .string "This sequence remains unchanged\n" - .string "even when swaps are made.$" - -BattleFrontier_BattleFactoryLobby_Text_259A5E: @ 8259A5E - .string "In the Open Level, the rental POKéMON\n" - .string "and the opposing TRAINERS’ POKéMON\l" - .string "are all Level 100.$" diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc deleted file mode 100644 index e05c49885..000000000 --- a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc +++ /dev/null @@ -1,726 +0,0 @@ -BattleFrontier_BattleFactoryPreBattleRoom_MapScripts:: @ 8259ABA - map_script 2, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF - map_script 4, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5 - .byte 0 - -BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5: @ 8259AC5 - map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259ACF - .2byte 0 - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259ACF:: @ 8259ACF - setvar VAR_TEMP_1, 1 - compare VAR_0x8006, 1 - goto_if 5, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA - setobjectxy 1, 8, 7 - turnobject 1, 1 - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA:: @ 8259AEA - turnobject 255, 2 - end - -BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF: @ 8259AEF - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AF9 - .2byte 0 - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AF9:: @ 8259AF9 - compare VAR_0x8006, 1 - goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5 - setvar VAR_TEMP_0, 1 - applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1AC - applymovement 255, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A - waitmovement 0 - compare VAR_0x8006, 2 - goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69 - setvar VAR_0x8004, 13 - special sub_81A5E74 - setvar VAR_0x8004, 12 - special sub_81A5E74 - setvar VAR_0x8004, 14 - special sub_81A5E74 - setorcopyvar VAR_0x8005, VAR_RESULT - setvar VAR_0x8004, 15 - special sub_81A5E74 - setorcopyvar VAR_0x8006, VAR_RESULT - call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93 - call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A1C8, 4 - fadescreen 1 - setvar VAR_0x8004, 8 - special sub_81A5E74 - setvar VAR_0x8004, 6 - special sub_81A5E74 - waitstate - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74:: @ 8259B74 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB96, 4 - closemessage - call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23F2B7 - compare VAR_RESULT, 0 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A17C - compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B - waitmovement 0 - warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM, 255, 6, 11 - waitstate - end - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5 - setvar VAR_0x8004, 9 - special sub_81A5E74 - setvar VAR_0x8004, 16 - special sub_81A5E74 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A22D, 4 - playfanfare MUS_ME_ASA - waitfanfare - special HealPlayerParty - setvar VAR_0x8004, 9 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26 - playse 263 - waitse - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC15, 4 - closemessage - applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1BF - waitmovement 0 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC58, 4 - closemessage - applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1C3 - waitmovement 0 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC89, 4 - closemessage - delay 16 - goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9 - end - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13:: @ 8259C13 - setvar VAR_0x8004, 9 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9 - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26:: @ 8259C26 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special sub_81A1780 - compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E1D - compare VAR_RESULT, 2 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E24 - compare VAR_RESULT, 3 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E2B - compare VAR_RESULT, 4 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E32 - compare VAR_RESULT, 5 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E39 - compare VAR_RESULT, 6 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E40 - call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CC6 - multichoice 19, 4, 103, 1 - switch VAR_RESULT - case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98 - case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CFC - case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38 - case 3, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66 - case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CC6:: @ 8259CC6 - multichoice 20, 6, 104, 1 - switch VAR_RESULT - case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98 - case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38 - case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66 - case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CFC:: @ 8259CFC - message BattleFrontier_BattleFactoryPreBattleRoom_Text_25ABD2 - waitmessage - multichoicedefault 20, 8, 94, 1, 0 - switch VAR_RESULT - case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 - case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D2E - case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D2E:: @ 8259D2E - call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8B4 - goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38:: @ 8259D38 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A350, 5 - switch VAR_RESULT - case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 - case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47 - case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66:: @ 8259D66 - message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A37A - waitmessage - multichoicedefault 20, 8, 94, 1, 0 - switch VAR_RESULT - case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 - case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25AEF8 - case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98:: @ 8259D98 - setvar VAR_0x8004, 12 - special sub_81A5E74 - setvar VAR_0x8004, 14 - special sub_81A5E74 - setorcopyvar VAR_0x8005, VAR_RESULT - setvar VAR_0x8004, 15 - special sub_81A5E74 - setorcopyvar VAR_0x8006, VAR_RESULT - call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93 - call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB2E, 5 - switch VAR_RESULT - case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 - case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2 - case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2:: @ 8259DF2 - fadescreen 1 - setvar VAR_0x8004, 7 - special sub_81A5E74 - waitstate - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 - setvar VAR_0x8004, 8 - special sub_81A5E74 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB6C, 4 - goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E1D:: @ 8259E1D - message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A263 - waitmessage - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E24:: @ 8259E24 - message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A289 - waitmessage - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E2B:: @ 8259E2B - message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A2AF - waitmessage - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E32:: @ 8259E32 - message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A2D5 - waitmessage - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E39:: @ 8259E39 - message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A2FB - waitmessage - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E40:: @ 8259E40 - message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A321 - waitmessage - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47:: @ 8259E47 - message BattleFrontier_BattleFactoryPreBattleRoom_Text_25ABAE - waitmessage - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 2 - special sub_81A5E74 - playse SE_SAVE - waitse - fadescreen 1 - setvar VAR_0x8004, 4 - special sub_81A1780 - end - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69 - special SavePlayerParty - setvar VAR_0x8004, 10 - setvar VAR_0x8005, 0 - special sub_81A5E74 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 6 - setvar VAR_0x8006, 1 - special sub_81A1780 - special CalculatePlayerPartyCount - goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93:: @ 8259E93 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3B4, 4 - compare VAR_0x8005, 0 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62 - compare VAR_0x8005, 1 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F6B - compare VAR_0x8005, 2 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F74 - compare VAR_0x8005, 3 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F7D - compare VAR_0x8005, 4 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F86 - compare VAR_0x8005, 5 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F8F - compare VAR_0x8005, 6 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F98 - compare VAR_0x8005, 7 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FA1 - compare VAR_0x8005, 8 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FAA - compare VAR_0x8005, 10 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FB3 - compare VAR_0x8005, 11 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FBC - compare VAR_0x8005, 12 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FC5 - compare VAR_0x8005, 13 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FCE - compare VAR_0x8005, 14 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FD7 - compare VAR_0x8005, 15 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE0 - compare VAR_0x8005, 16 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE9 - compare VAR_0x8005, 17 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FF2 - compare VAR_0x8005, 18 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62:: @ 8259F62 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3F8, 4 - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F6B:: @ 8259F6B - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A597, 4 - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F74:: @ 8259F74 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A66B, 4 - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F7D:: @ 8259F7D - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A5DF, 4 - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F86:: @ 8259F86 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A625, 4 - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F8F:: @ 8259F8F - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A73B, 4 - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F98:: @ 8259F98 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6F8, 4 - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FA1:: @ 8259FA1 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A77F, 4 - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FAA:: @ 8259FAA - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A84E, 4 - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FB3:: @ 8259FB3 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A43E, 4 - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FBC:: @ 8259FBC - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A482, 4 - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FC5:: @ 8259FC5 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A50F, 4 - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FCE:: @ 8259FCE - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A4C7, 4 - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FD7:: @ 8259FD7 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6B1, 4 - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE0:: @ 8259FE0 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A554, 4 - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE9:: @ 8259FE9 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A7C4, 4 - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FF2:: @ 8259FF2 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A80A, 4 - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB:: @ 8259FFB - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A893, 4 - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004:: @ 825A004 - compare VAR_0x8006, 0 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A068 - compare VAR_0x8006, 1 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A071 - compare VAR_0x8006, 2 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A07A - compare VAR_0x8006, 3 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A083 - compare VAR_0x8006, 4 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A08C - compare VAR_0x8006, 5 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A095 - compare VAR_0x8006, 6 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A09E - compare VAR_0x8006, 7 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0A7 - compare VAR_0x8006, 8 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B0 - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A068:: @ 825A068 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AAE6, 4 - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A071:: @ 825A071 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A9CE, 4 - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A07A:: @ 825A07A - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A8D9, 4 - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A083:: @ 825A083 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A912, 4 - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A08C:: @ 825A08C - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A94C, 4 - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A095:: @ 825A095 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AA16, 4 - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A09E:: @ 825A09E - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AAA7, 4 - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0A7:: @ 825A0A7 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A98C, 4 - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B0:: @ 825A0B0 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AA5A, 4 - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9:: @ 825A0B9 - message BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD20 - waitmessage - call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A110 - multichoice 19, 4, 103, 1 - switch VAR_RESULT - case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146 - case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CFC - case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38 - case 3, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66 - case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9 - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A110:: @ 825A110 - multichoice 20, 6, 104, 1 - switch VAR_RESULT - case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146 - case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38 - case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66 - case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9 - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146:: @ 825A146 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD61, 4 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB2E, 5 - switch VAR_RESULT - case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 - case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2 - case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A17C:: @ 825A17C - applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B3 - applymovement 255, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A0 - return - -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B:: @ 825A18B - applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B9 - applymovement 255, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A6 - return - -BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A: @ 825A19A - walk_up - walk_up - walk_up - walk_up - walk_up - step_end - -BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A0: @ 825A1A0 - walk_up - walk_left - walk_left - walk_up - walk_up - step_end - -BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A6: @ 825A1A6 - walk_up - walk_right - walk_right - walk_up - walk_up - step_end - -BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1AC: @ 825A1AC - walk_up - walk_up - walk_up - walk_up - walk_up - face_down - step_end - -BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B3: @ 825A1B3 - walk_left - walk_left - walk_up - walk_up - set_invisible - step_end - -BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B9: @ 825A1B9 - walk_right - walk_right - walk_up - walk_up - set_invisible - step_end - -BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1BF: @ 825A1BF - walk_left - walk_left - walk_left - step_end - -BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1C3: @ 825A1C3 - walk_right - walk_right - walk_right - face_down - step_end - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A1C8: @ 825A1C8 -SlateportCity_BattleTentCorridor_Text_25A1C8: @ 825A1C8 - .string "First, we will hold your POKéMON for\n" - .string "safekeeping.\p" - .string "You may then choose from our\n" - .string "selection of POKéMON.$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A22D: @ 825A22D -SlateportCity_BattleTentCorridor_Text_25A22D: @ 825A22D - .string "Thank you for competing!\n" - .string "Let us restore your POKéMON!$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A263: @ 825A263 -SlateportCity_BattleTentCorridor_Text_25A263: @ 825A263 - .string "The 2nd match is next!\n" - .string "Are you ready?$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A289: @ 825A289 -SlateportCity_BattleTentCorridor_Text_25A289: @ 825A289 - .string "The 3rd match is next!\n" - .string "Are you ready?$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A2AF: @ 825A2AF - .string "The 4th match is next!\n" - .string "Are you ready?$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A2D5: @ 825A2D5 - .string "The 5th match is next!\n" - .string "Are you ready?$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A2FB: @ 825A2FB - .string "The 6th match is next!\n" - .string "Are you ready?$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A321: @ 825A321 - .string "Finally, the 7th match is next!\n" - .string "Are you ready?$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A350: @ 825A350 -SlateportCity_BattleTentCorridor_Text_25A350: @ 825A350 - .string "Would you like to save and quit\n" - .string "the game?$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A37A: @ 825A37A -SlateportCity_BattleTentCorridor_Text_25A37A: @ 825A37A - .string "Would you like to retire from your\n" - .string "Battle Swap challenge?$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3B4: @ 825A3B4 - .string "I’ve conducted a little investigation\n" - .string "about your upcoming opponent.$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3F8: @ 825A3F8 - .string "The TRAINER is apparently skilled\n" - .string "in the handling of the NORMAL type.$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A43E: @ 825A43E - .string "The TRAINER is apparently skilled\n" - .string "in the handling of the FIRE type.$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A482: @ 825A482 - .string "The TRAINER is apparently skilled\n" - .string "in the handling of the WATER type.$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A4C7: @ 825A4C7 - .string "The TRAINER is apparently skilled\n" - .string "in the handling of the ELECTRIC type.$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A50F: @ 825A50F - .string "The TRAINER is apparently skilled\n" - .string "in the handling of the GRASS type.$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A554: @ 825A554 - .string "The TRAINER is apparently skilled\n" - .string "in the handling of the ICE type.$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A597: @ 825A597 - .string "The TRAINER is apparently skilled\n" - .string "in the handling of the FIGHTING type.$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A5DF: @ 825A5DF - .string "The TRAINER is apparently skilled\n" - .string "in the handling of the POISON type.$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A625: @ 825A625 - .string "The TRAINER is apparently skilled\n" - .string "in the handling of the GROUND type.$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A66B: @ 825A66B - .string "The TRAINER is apparently skilled\n" - .string "in the handling of the FLYING type.$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6B1: @ 825A6B1 - .string "The TRAINER is apparently skilled\n" - .string "in the handling of the PSYCHIC type.$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6F8: @ 825A6F8 - .string "The TRAINER is apparently skilled\n" - .string "in the handling of the BUG type.$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A73B: @ 825A73B - .string "The TRAINER is apparently skilled\n" - .string "in the handling of the ROCK type.$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A77F: @ 825A77F - .string "The TRAINER is apparently skilled\n" - .string "in the handling of the GHOST type.$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A7C4: @ 825A7C4 - .string "The TRAINER is apparently skilled\n" - .string "in the handling of the DRAGON type.$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A80A: @ 825A80A - .string "The TRAINER is apparently skilled\n" - .string "in the handling of the DARK type.$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A84E: @ 825A84E - .string "The TRAINER is apparently skilled\n" - .string "in the handling of the STEEL type.$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A893: @ 825A893 - .string "The TRAINER appears to have no clear\n" - .string "favorites when it comes to type.$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A8D9: @ 825A8D9 - .string "The favorite battle style appears to\n" - .string "be slow and steady.$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A912: @ 825A912 - .string "The favorite battle style appears to\n" - .string "be one of endurance.$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A94C: @ 825A94C - .string "The favorite battle style appears to\n" - .string "be high risk, high return.$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A98C: @ 825A98C - .string "The favorite battle style appears to\n" - .string "depend on the battle’s flow.$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A9CE: @ 825A9CE - .string "The favorite battle style appears to\n" - .string "be one based on total preparation.$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25AA16: @ 825AA16 - .string "The favorite battle style appears\n" - .string "to be weakening the foe to start.$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25AA5A: @ 825AA5A - .string "The favorite battle style appears to\n" - .string "be flexibly adaptable to the situation.$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25AAA7: @ 825AAA7 - .string "The favorite battle style appears to\n" - .string "be impossible to predict.$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25AAE6: @ 825AAE6 - .string "The favorite battle style appears to\n" - .string "be free-spirited and unrestrained.$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB2E: @ 825AB2E -SlateportCity_BattleTentCorridor_Text_25AB2E: @ 825AB2E - .string "Before starting the battle, would you\n" - .string "like to swap a POKéMON?$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB6C: @ 825AB6C -SlateportCity_BattleTentCorridor_Text_25AB6C: @ 825AB6C - .string "Thank you!\n" - .string "Your POKéMON swap is complete.$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB96: @ 825AB96 -SlateportCity_BattleTentCorridor_Text_25AB96: @ 825AB96 - .string "Right this way, please!$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25ABAE: @ 825ABAE -SlateportCity_BattleTentCorridor_Text_25ABAE: @ 825ABAE - .string "I am saving your data.\n" - .string "Please wait.$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25ABD2: @ 825ABD2 - .string "Would you like to record your latest\n" - .string "battle on your FRONTIER PASS?$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC15: @ 825AC15 - .string "Excuse me! Excuse me, please!\n" - .string "May I get you to wait a few moments?$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC58: @ 825AC58 - .string "…Uh-huh? What?! …Whoa!\n" - .string "Understood, sir! Will do!$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC89: @ 825AC89 - .string "Oh, my…\n" - .string "Sorry to keep you waiting!\p" - .string "I have a message from this facility’s\n" - .string "boss, the FACTORY HEAD.\p" - .string "He says, “We’re going to do it!\n" - .string "Come here right now!â€$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD20: @ 825AD20 - .string "The FACTORY HEAD is demanding you.\n" - .string "Are you prepared to face him?$" - -BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD61: @ 825AD61 - .string "I’m terribly sorry, but I can’t tell you\n" - .string "anything about the FACTORY HEAD.$" diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc deleted file mode 100644 index 2ae154927..000000000 --- a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc +++ /dev/null @@ -1,650 +0,0 @@ -BattleFrontier_BattlePalaceBattleRoom_MapScripts:: @ 824F815 - map_script 3, BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825 - map_script 2, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861 - map_script 4, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34 - .byte 0 - -BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825: @ 824F825 - setvar VAR_0x8004, 5 - special sub_81A1780 - call BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833 - end - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833:: @ 824F833 - checkplayergender - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856 - return - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B:: @ 824F84B - setvar VAR_OBJ_GFX_ID_1, 100 - setvar VAR_OBJ_GFX_ID_0, 100 - return - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856:: @ 824F856 - setvar VAR_OBJ_GFX_ID_1, 105 - setvar VAR_OBJ_GFX_ID_0, 105 - return - -BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861: @ 824F861 - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B - .2byte 0 - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B:: @ 824F86B - showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5 - applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE9B - waitmovement 0 - applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC - setvar VAR_TEMP_2, 1 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 6 - setvar VAR_0x8006, 1 - special sub_81A1780 - goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5:: @ 824F8B5 - applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE92 - waitmovement 0 - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF:: @ 824F8BF - setvar VAR_0x8004, 3 - special sub_8161F74 - addobject 2 - applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA1 - waitmovement 0 - setvar VAR_0x8004, 5 - special sub_8195960 - msgbox 0x2021fc4, 4 - waitmessage - call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7 - switch VAR_RESULT - case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911 - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA:: @ 824F8FA - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 4 - special sub_81A1780 - goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911 - call BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special sub_81A1780 - addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 - switch VAR_RESULT - case 7, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 - applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA7 - waitmovement 0 - removeobject 2 - applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99 - applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC - waitmovement 0 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_24FF00, 4 - special LoadPlayerParty - special SavePlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 - special sub_81A1780 - playfanfare MUS_ME_ASA - waitfanfare - special HealPlayerParty - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A:: @ 824F98A - setvar VAR_0x8004, 9 - special sub_81A1780 - copyvar VAR_TEMP_F, VAR_RESULT - compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special sub_81A1780 - compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE66 - compare VAR_RESULT, 2 - call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE6D - compare VAR_RESULT, 3 - call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE74 - compare VAR_RESULT, 4 - call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE7B - compare VAR_RESULT, 5 - call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE82 - compare VAR_RESULT, 6 - call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE89 - call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA42 - multichoice 19, 4, 103, 1 - switch VAR_RESULT - case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB14 - case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA78 - case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4 - case 3, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2 - case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA42:: @ 824FA42 - multichoice 20, 6, 104, 1 - switch VAR_RESULT - case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB14 - case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4 - case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2 - case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA78:: @ 824FA78 - message BattleFrontier_BattlePalaceBattleRoom_Text_25009E - waitmessage - multichoicedefault 20, 8, 94, 1, 0 - switch VAR_RESULT - case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A - case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAAA - case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAAA:: @ 824FAAA - call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8B4 - goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4:: @ 824FAB4 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250030, 5 - switch VAR_RESULT - case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A - case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F - case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2:: @ 824FAE2 - message BattleFrontier_BattlePalaceBattleRoom_Text_25005A - waitmessage - multichoicedefault 20, 8, 94, 1, 0 - switch VAR_RESULT - case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A - case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA - case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB14:: @ 824FB14 - applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97 - applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97 - closemessage - goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28:: @ 824FB28 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 3 - special sub_81A1780 - goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F - message BattleFrontier_BattlePalaceBattleRoom_Text_25007E - waitmessage - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 2 - special sub_8195960 - playse SE_SAVE - waitse - fadescreen 1 - setvar VAR_0x8004, 4 - special sub_81A1780 - end - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61:: @ 824FB61 - compare VAR_TEMP_2, 1 - goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2500DD, 4 - setvar VAR_TEMP_2, 1 - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79:: @ 824FB79 - message BattleFrontier_BattlePalaceBattleRoom_Text_25014A - waitmessage - call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FBD0 - multichoice 19, 4, 103, 1 - switch VAR_RESULT - case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06 - case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA78 - case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4 - case 3, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2 - case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79 - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24FBD0:: @ 824FBD0 - multichoice 20, 6, 104, 1 - switch VAR_RESULT - case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06 - case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4 - case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2 - case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79 - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06:: @ 824FC06 - call BattleFrontier_BattlePalaceBattleRoom_EventScript_242170 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25017C, 4 - closemessage - applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97 - applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97 - setobjectxyperm 2, 15, 1 - addobject 2 - hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM - setobjectxy 2, 13, 1 - setobjectxyperm 2, 13, 1 - applymovement 4, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEDF - applymovement 5, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEE7 - applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEF2 - waitmovement 0 - switch VAR_TEMP_F - case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A - case 3, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA - case 4, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 7 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2501C1, 4 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 7 - special sub_81A1780 - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA:: @ 824FCAA - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502C4, 4 - call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7 - goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7 - setvar VAR_0x8004, 6 - special sub_8195960 - setvar VAR_0x8004, 12 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502FF, 4 - applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99 - applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25036D, 4 - playfanfare MUS_ME_SYMBOLGET - message BattleFrontier_BattlePalaceBattleRoom_Text_2503DC - waitmessage - waitfanfare - setvar VAR_0x8004, 13 - special sub_81A1780 - applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6 - waitmovement 0 - applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 - applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 - waitmovement 0 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250412, 4 - goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A:: @ 824FD3A - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 7 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250485, 4 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 7 - special sub_81A1780 - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67:: @ 824FD67 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250572, 4 - call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84 - goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84 - setvar VAR_0x8004, 6 - special sub_8195960 - setvar VAR_0x8004, 12 - special sub_81A1780 - compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25057E, 4 - applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99 - applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250629, 4 - playfanfare MUS_ME_SYMBOLGET - message BattleFrontier_BattlePalaceBattleRoom_Text_250699 - waitmessage - waitfanfare - setvar VAR_0x8004, 13 - special sub_81A1780 - applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6 - waitmovement 0 - applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 - applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 - waitmovement 0 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2506C4, 4 - goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7:: @ 824FDF7 -VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7:: @ 824FDF7 - closemessage - setvar VAR_TEMP_2, 0 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 6 - setvar VAR_0x8006, 0 - special sub_81A1780 - special HealPlayerParty - setvar VAR_0x8004, 4 - setvar VAR_0x8005, 0 - special sub_8163AC4 - waitstate - setvar VAR_0x8004, 18 - special sub_81A1780 - special HealPlayerParty - setvar VAR_0x8004, 21 - special sub_81A1780 - return - -BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34: @ 824FE34 - map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE3E - .2byte 0 - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE3E:: @ 824FE3E - 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 - removeobject 2 - applymovement 4, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90 - applymovement 5, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90 - end - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE66:: @ 824FE66 - message BattleFrontier_BattlePalaceBattleRoom_Text_24FF28 - waitmessage - return - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE6D:: @ 824FE6D - message BattleFrontier_BattlePalaceBattleRoom_Text_24FF54 - waitmessage - return - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE74:: @ 824FE74 - message BattleFrontier_BattlePalaceBattleRoom_Text_24FF80 - waitmessage - return - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE7B:: @ 824FE7B - message BattleFrontier_BattlePalaceBattleRoom_Text_24FFAC - waitmessage - return - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE82:: @ 824FE82 - message BattleFrontier_BattlePalaceBattleRoom_Text_24FFD8 - waitmessage - return - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE89:: @ 824FE89 - message BattleFrontier_BattlePalaceBattleRoom_Text_250004 - waitmessage - return - -BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90: @ 824FE90 - set_invisible - step_end - -BattleFrontier_BattlePalaceBattleRoom_Movement_24FE92: @ 824FE92 - set_visible - walk_up - walk_up - walk_up - walk_up - -BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97: @ 824FE97 - face_right - step_end - -BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99: @ 824FE99 - face_up - step_end - -BattleFrontier_BattlePalaceBattleRoom_Movement_24FE9B: @ 824FE9B - set_visible - walk_up - walk_up - walk_up - walk_up - step_end - -BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA1: @ 824FEA1 - walk_down - walk_down - walk_down - walk_down - face_left - step_end - -BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA7: @ 824FEA7 - walk_up - walk_up - walk_up - walk_up - step_end - -BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC: @ 824FEAC - face_down - step_end - -BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAE: @ 824FEAE - set_visible - walk_slow_down - walk_slow_down - face_left - step_end - -BattleFrontier_BattlePalaceBattleRoom_Movement_24FEB3: @ 824FEB3 - set_visible - walk_slow_down - step_end - -BattleFrontier_BattlePalaceBattleRoom_Movement_24FEB6: @ 824FEB6 - walk_slow_down - walk_slow_down - walk_slow_down - face_left - step_end - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB:: @ 824FEBB - copyvar VAR_RESULT, VAR_0x40CE - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5 - warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 5, 7 - waitstate - end - -BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5:: @ 824FED5 - warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 19, 7 - waitstate - end - -BattleFrontier_BattlePalaceBattleRoom_Movement_24FEDF: @ 824FEDF - delay_16 - delay_16 - set_visible - walk_down - walk_right - walk_down - walk_in_place_fastest_left - step_end - -BattleFrontier_BattlePalaceBattleRoom_Movement_24FEE7: @ 824FEE7 - 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 - 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 -VerdanturfTown_BattleTentBattleRoom_Text_24FF00: @ 824FF00 - .string "Excellent…\n" - .string "Let me restore your POKéMON.$" - -BattleFrontier_BattlePalaceBattleRoom_Text_24FF28: @ 824FF28 -VerdanturfTown_BattleTentBattleRoom_Text_24FF28: @ 824FF28 - .string "The 2nd opponent is next.\n" - .string "Are you prepared?$" - -BattleFrontier_BattlePalaceBattleRoom_Text_24FF54: @ 824FF54 -VerdanturfTown_BattleTentBattleRoom_Text_24FF54: @ 824FF54 - .string "The 3rd opponent is next.\n" - .string "Are you prepared?$" - -BattleFrontier_BattlePalaceBattleRoom_Text_24FF80: @ 824FF80 - .string "The 4th opponent is next.\n" - .string "Are you prepared?$" - -BattleFrontier_BattlePalaceBattleRoom_Text_24FFAC: @ 824FFAC - .string "The 5th opponent is next.\n" - .string "Are you prepared?$" - -BattleFrontier_BattlePalaceBattleRoom_Text_24FFD8: @ 824FFD8 - .string "The 6th opponent is next.\n" - .string "Are you prepared?$" - -BattleFrontier_BattlePalaceBattleRoom_Text_250004: @ 8250004 - .string "The 7th opponent is next.\n" - .string "Are you prepared?$" - -BattleFrontier_BattlePalaceBattleRoom_Text_250030: @ 8250030 -VerdanturfTown_BattleTentBattleRoom_Text_250030: @ 8250030 - .string "Would you like to save and quit\n" - .string "the game?$" - -BattleFrontier_BattlePalaceBattleRoom_Text_25005A: @ 825005A -VerdanturfTown_BattleTentBattleRoom_Text_25005A: @ 825005A - .string "Do you wish to quit your challenge?$" - -BattleFrontier_BattlePalaceBattleRoom_Text_25007E: @ 825007E -VerdanturfTown_BattleTentBattleRoom_Text_25007E: @ 825007E - .string "Saving the data.\n" - .string "Have patience…$" - -BattleFrontier_BattlePalaceBattleRoom_Text_25009E: @ 825009E - .string "Do you wish to record your latest\n" - .string "match on your FRONTIER PASS?$" - -BattleFrontier_BattlePalaceBattleRoom_Text_2500DD: @ 82500DD - .string "And now…\p" - .string "By winning consistently, you have\n" - .string "earned the privilege of challenging\l" - .string "our master, the PALACE MAVEN…$" - -BattleFrontier_BattlePalaceBattleRoom_Text_25014A: @ 825014A - .string "I shall send for the PALACE MAVEN.\n" - .string "Are you ready?$" - -BattleFrontier_BattlePalaceBattleRoom_Text_25017C: @ 825017C - .string "Let great fanfare announce the arrival\n" - .string "of the PALACE MAVEN, SPENSER!$" - -BattleFrontier_BattlePalaceBattleRoom_Text_2501C1: @ 82501C1 - .string "SPENSER: My physical being is with\n" - .string "POKéMON always!\p" - .string "My heart beats as one with\n" - .string "POKéMON always!\p" - .string "Young one of a TRAINER!\n" - .string "Do you believe in your POKéMON?\p" - .string "Can you believe them through\n" - .string "and through?\p" - .string "If your bonds of trust are frail,\n" - .string "you will never beat my brethren!$" - -BattleFrontier_BattlePalaceBattleRoom_Text_2502C4: @ 82502C4 - .string "The bond you share with your POKéMON!\n" - .string "Prove it to me here!$" - -BattleFrontier_BattlePalaceBattleRoom_Text_2502FF: @ 82502FF - .string "SPENSER: Gwahahah!\p" - .string "Hah, you never fell for my bluster!\n" - .string "Sorry for trying that stunt!\p" - .string "Here!\n" - .string "Bring me the thing!$" - -BattleFrontier_BattlePalaceBattleRoom_Text_25036D: @ 825036D - .string "My, my, if only you could maintain that\n" - .string "facade of distinguished authority…\p" - .string "Here!\n" - .string "Let’s see your FRONTIER PASS!$" - -BattleFrontier_BattlePalaceBattleRoom_Text_2503DC: @ 82503DC - .string "The Spirits Symbol was embossed on\n" - .string "the FRONTIER PASS!$" - -BattleFrontier_BattlePalaceBattleRoom_Text_250412: @ 8250412 - .string "SPENSER: Your POKéMON’s eyes are \n" - .string "truly clear and unclouded.\p" - .string "I will eagerly await the next\n" - .string "opportunity to see you.$" - -BattleFrontier_BattlePalaceBattleRoom_Text_250485: @ 8250485 - .string "SPENSER: Gwahahah!\n" - .string "You’ve battled your way up again?\p" - .string "You must have developed a truly\n" - .string "formidable bond with your POKéMON.\p" - .string "So be it!\p" - .string "This time, I won’t bluster or hold back.\n" - .string "This time, there’s no fooling around.\p" - .string "Ready now?\n" - .string "Prepare to lose!$" - -BattleFrontier_BattlePalaceBattleRoom_Text_250572: @ 8250572 - .string "… … …Kaaah!$" - -BattleFrontier_BattlePalaceBattleRoom_Text_25057E: @ 825057E - .string "SPENSER: Well, that was some display!\n" - .string "Even fully unleashed, my brethren\l" - .string "could not overpower you.\p" - .string "Your team spirit is truly admirable!\p" - .string "Here!\n" - .string "Bring me that thing, will you?$" - -BattleFrontier_BattlePalaceBattleRoom_Text_250629: @ 8250629 - .string "My, my, if only you could maintain\n" - .string "a certain level of decorum…\p" - .string "Gaaah, here!\n" - .string "Hurry with that FRONTIER PASS, you!$" - -BattleFrontier_BattlePalaceBattleRoom_Text_250699: @ 8250699 - .string "The Spirits Symbol took on\n" - .string "a golden shine!$" - -BattleFrontier_BattlePalaceBattleRoom_Text_2506C4: @ 82506C4 - .string "SPENSER: Gwahahah!\p" - .string "Come see me time and again!\n" - .string "My brethren and I will be waiting!$" diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc b/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc deleted file mode 100644 index c8142a207..000000000 --- a/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc +++ /dev/null @@ -1,160 +0,0 @@ -BattleFrontier_BattlePalaceCorridor_MapScripts:: @ 824F4A3 - map_script 2, BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9 - .byte 0 - -BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9: @ 824F4A9 - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3 - .2byte 0 - -BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3 - delay 16 - applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5B8 - applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5B8 - waitmovement 0 - lockall - setvar VAR_0x8004, 3 - special sub_8195960 - compare VAR_RESULT, 0 - call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F58B - compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F594 - compare VAR_RESULT, 2 - call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F59D - compare VAR_RESULT, 3 - call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F5A6 - compare VAR_RESULT, 4 - call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F5AF - closemessage - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - special sub_81A1780 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F553 - applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5BD - applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5C4 - waitmovement 0 - opendoor 6, 3 - waitdooranim - applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5DA - applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5D9 - waitmovement 0 - closedoor 6, 3 - waitdooranim - goto BattleFrontier_BattlePalaceCorridor_EventScript_24F581 - -BattleFrontier_BattlePalaceCorridor_EventScript_24F553:: @ 824F553 - applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5CB - applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5D2 - waitmovement 0 - opendoor 10, 3 - waitdooranim - applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5DA - applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5D9 - waitmovement 0 - closedoor 10, 3 - waitdooranim - -BattleFrontier_BattlePalaceCorridor_EventScript_24F581:: @ 824F581 - warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM, 255, 7, 4 - waitstate - end - -BattleFrontier_BattlePalaceCorridor_EventScript_24F58B:: @ 824F58B - msgbox BattleFrontier_BattlePalaceCorridor_Text_24F5DD, 4 - return - -BattleFrontier_BattlePalaceCorridor_EventScript_24F594:: @ 824F594 - msgbox BattleFrontier_BattlePalaceCorridor_Text_24F65B, 4 - return - -BattleFrontier_BattlePalaceCorridor_EventScript_24F59D:: @ 824F59D - msgbox BattleFrontier_BattlePalaceCorridor_Text_24F718, 4 - return - -BattleFrontier_BattlePalaceCorridor_EventScript_24F5A6:: @ 824F5A6 - msgbox BattleFrontier_BattlePalaceCorridor_Text_24F78C, 4 - return - -BattleFrontier_BattlePalaceCorridor_EventScript_24F5AF:: @ 824F5AF - msgbox BattleFrontier_BattlePalaceCorridor_Text_24F7D4, 4 - return - -BattleFrontier_BattlePalaceCorridor_Movement_24F5B8: @ 824F5B8 - walk_up - walk_up - walk_up - walk_up - step_end - -BattleFrontier_BattlePalaceCorridor_Movement_24F5BD: @ 824F5BD - walk_up - walk_up - walk_left - walk_left - walk_up - walk_up - step_end - -BattleFrontier_BattlePalaceCorridor_Movement_24F5C4: @ 824F5C4 - walk_up - walk_up - walk_up - walk_left - walk_left - walk_up - step_end - -BattleFrontier_BattlePalaceCorridor_Movement_24F5CB: @ 824F5CB - walk_up - walk_right - walk_right - walk_up - walk_up - walk_up - step_end - -BattleFrontier_BattlePalaceCorridor_Movement_24F5D2: @ 824F5D2 - walk_up - walk_up - walk_right - walk_right - walk_up - walk_up - step_end - -BattleFrontier_BattlePalaceCorridor_Movement_24F5D9: @ 824F5D9 - walk_up - -BattleFrontier_BattlePalaceCorridor_Movement_24F5DA: @ 824F5DA - walk_up - set_invisible - step_end - -BattleFrontier_BattlePalaceCorridor_Text_24F5DD: @ 824F5DD - .string "People and POKéMON, they are but\n" - .string "the same…\p" - .string "Their individual nature makes them\n" - .string "good at certain things, and not good\l" - .string "at others.$" - -BattleFrontier_BattlePalaceCorridor_Text_24F65B: @ 824F65B - .string "Rather than trying to make a POKéMON\n" - .string "do what it dislikes, try to let it do\l" - .string "what it likes and is good at doing.\p" - .string "Put yourself in the POKéMON’s position\n" - .string "and consider what moves it would like.$" - -BattleFrontier_BattlePalaceCorridor_Text_24F718: @ 824F718 - .string "A POKéMON’s nature is a remarkable\n" - .string "thing…\p" - .string "Some POKéMON behave in a completely\n" - .string "different way when they are cornered.$" - -BattleFrontier_BattlePalaceCorridor_Text_24F78C: @ 824F78C - .string "Are you beginning to understand how\n" - .string "a POKéMON’s nature makes it behave?$" - -BattleFrontier_BattlePalaceCorridor_Text_24F7D4: @ 824F7D4 - .string "Ah… I see a strong, heartfelt bond\n" - .string "between you and your POKéMON…$" - diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc b/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc deleted file mode 100644 index 91c1abd0f..000000000 --- a/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc +++ /dev/null @@ -1,729 +0,0 @@ -BattleFrontier_BattlePalaceLobby_MapScripts:: @ 824D77E - map_script 2, BattleFrontier_BattlePalaceLobby_MapScript2_24D79D - map_script 4, BattleFrontier_BattlePalaceLobby_MapScript2_24D789 - .byte 0 - -BattleFrontier_BattlePalaceLobby_MapScript2_24D789: @ 824D789 - map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D793 - .2byte 0 - -BattleFrontier_BattlePalaceLobby_EventScript_24D793:: @ 824D793 - setvar VAR_TEMP_1, 1 - turnobject 255, 2 - end - -BattleFrontier_BattlePalaceLobby_MapScript2_24D79D: @ 824D79D - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D7C7 - map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattlePalaceLobby_EventScript_24D7D0 - map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattlePalaceLobby_EventScript_24D908 - map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattlePalaceLobby_EventScript_24D817 - map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattlePalaceLobby_EventScript_24D873 - .2byte 0 - -BattleFrontier_BattlePalaceLobby_EventScript_24D7C7:: @ 824D7C7 - setvar VAR_0x8004, 0 - special sub_81A1780 - end - -BattleFrontier_BattlePalaceLobby_EventScript_24D7D0:: @ 824D7D0 - lockall - msgbox BattleFrontier_BattlePalaceLobby_Text_24E636, 4 - closemessage - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 0 - special sub_8195960 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 0 - special sub_8195960 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_TEMP_0, 255 - releaseall - end - -BattleFrontier_BattlePalaceLobby_EventScript_24D817:: @ 824D817 - lockall - setvar VAR_0x8004, 10 - special sub_81A1780 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24D838 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E497, 4 - goto BattleFrontier_BattlePalaceLobby_EventScript_24D840 - -BattleFrontier_BattlePalaceLobby_EventScript_24D838:: @ 824D838 - msgbox BattleFrontier_BattlePalaceLobby_Text_24EE81, 4 - -BattleFrontier_BattlePalaceLobby_EventScript_24D840:: @ 824D840 - msgbox BattleFrontier_BattlePalaceLobby_Text_24EEB9, 4 - setvar VAR_0x8004, 11 - special sub_81A1780 - msgbox BattleFrontier_BattlePalaceLobby_Text_241520, 9 - message BattleFrontier_BattlePalaceLobby_Text_24E4F7 - waitmessage - call BattleFrontier_BattlePalaceLobby_EventScript_24D8A1 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, 4 - closemessage - setvar VAR_TEMP_0, 255 - releaseall - end - -BattleFrontier_BattlePalaceLobby_EventScript_24D873:: @ 824D873 - lockall - message BattleFrontier_BattlePalaceLobby_Text_24E41E - waitmessage - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 0 - special sub_8195960 - call BattleFrontier_BattlePalaceLobby_EventScript_24D8A1 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, 4 - closemessage - setvar VAR_TEMP_0, 255 - releaseall - end - -BattleFrontier_BattlePalaceLobby_EventScript_24D8A1:: @ 824D8A1 - setvar VAR_0x8004, 8 - special sub_81A1780 - special LoadPlayerParty - special HealPlayerParty - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 0 - special sub_8195960 - playse SE_SAVE - waitse - call BattleFrontier_BattlePalaceLobby_EventScript_23E8E0 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24D907 - message BattleFrontier_BattlePalaceLobby_Text_24EF16 - waitmessage - multichoicedefault 20, 8, 94, 1, 0 - switch VAR_RESULT - case 1, BattleFrontier_BattlePalaceLobby_EventScript_24D907 - case 0, BattleFrontier_BattlePalaceLobby_EventScript_24D902 - case 127, BattleFrontier_BattlePalaceLobby_EventScript_24D907 - -BattleFrontier_BattlePalaceLobby_EventScript_24D902:: @ 824D902 - call BattleFrontier_BattlePalaceLobby_EventScript_23E8B4 - -BattleFrontier_BattlePalaceLobby_EventScript_24D907:: @ 824D907 - return - -BattleFrontier_BattlePalaceLobby_EventScript_24D908:: @ 824D908 - lockall - msgbox BattleFrontier_BattlePalaceLobby_Text_24E5D8, 4 - message BattleFrontier_BattlePalaceLobby_Text_24E5F6 - waitmessage - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 1 - special sub_8195960 - playse SE_SAVE - waitse - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_TEMP_0, 255 - goto BattleFrontier_BattlePalaceLobby_EventScript_24DAF3 - -BattleFrontier_BattlePalaceLobby_EventScript_24D944:: @ 824D944 - lock - faceplayer - setvar VAR_FRONTIER_FACILITY, 2 - setvar VAR_0x40CE, 0 - goto BattleFrontier_BattlePalaceLobby_EventScript_24D968 - end - -BattleFrontier_BattlePalaceLobby_EventScript_24D956:: @ 824D956 - lock - faceplayer - setvar VAR_FRONTIER_FACILITY, 2 - setvar VAR_0x40CE, 1 - goto BattleFrontier_BattlePalaceLobby_EventScript_24D968 - end - -BattleFrontier_BattlePalaceLobby_EventScript_24D968:: @ 824D968 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 0 - special sub_8195960 - compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePalaceLobby_EventScript_24D817 - special SavePlayerParty - compare VAR_0x40CE, 0 - call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB9E - compare VAR_0x40CE, 1 - call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBA7 - -BattleFrontier_BattlePalaceLobby_EventScript_24D999:: @ 824D999 - compare VAR_0x40CE, 0 - call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBB0 - compare VAR_0x40CE, 1 - call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBB6 - waitmessage - multichoice 17, 6, 23, 0 - switch VAR_RESULT - case 0, BattleFrontier_BattlePalaceLobby_EventScript_24D9E6 - case 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB20 - case 2, BattleFrontier_BattlePalaceLobby_EventScript_24DB94 - case 127, BattleFrontier_BattlePalaceLobby_EventScript_24DB94 - -BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6 - message BattleFrontier_BattlePalaceLobby_Text_24E119 - waitmessage - multichoice 17, 6, 24, 0 - switch VAR_RESULT - case 2, BattleFrontier_BattlePalaceLobby_EventScript_24DB94 - case 127, BattleFrontier_BattlePalaceLobby_EventScript_24DB94 - setvar VAR_0x8004, 15 - special sub_81A1780 - compare VAR_0x8004, 1 - goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB45 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E399, 4 - fadescreen 1 - call BattleFrontier_BattlePalaceLobby_EventScript_23F2B7 - copyvar VAR_0x8004, VAR_RESULT - setvar VAR_0x8005, 3 - special sub_80F9490 - waitstate - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB91 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E3C8, 5 - switch VAR_RESULT - case 0, BattleFrontier_BattlePalaceLobby_EventScript_24DB91 - case 1, BattleFrontier_BattlePalaceLobby_EventScript_24DA87 - case 127, BattleFrontier_BattlePalaceLobby_EventScript_24DB91 - -BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87 - setvar VAR_TEMP_0, 0 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 4 - special sub_81A1780 - setvar VAR_0x8004, 0 - special sub_8195960 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 1 - special sub_8195960 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 1 - special sub_81A1780 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 0 - special sub_81A1780 - special LoadPlayerParty - closemessage - delay 2 - call BattleFrontier_BattlePalaceLobby_EventScript_27134F - setvar VAR_TEMP_0, 255 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB7A - -BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3 - special SavePlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 - special sub_81A1780 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E408, 4 - closemessage - call BattleFrontier_BattlePalaceLobby_EventScript_24DBBC - warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR, 255, 8, 13 - setvar VAR_TEMP_0, 0 - waitstate - end - -BattleFrontier_BattlePalaceLobby_EventScript_24DB20:: @ 824DB20 - compare VAR_0x40CE, 1 - goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB38 - msgbox BattleFrontier_BattlePalaceLobby_Text_24DE17, 4 - goto BattleFrontier_BattlePalaceLobby_EventScript_24D999 - -BattleFrontier_BattlePalaceLobby_EventScript_24DB38:: @ 824DB38 - msgbox BattleFrontier_BattlePalaceLobby_Text_24EBC2, 4 - goto BattleFrontier_BattlePalaceLobby_EventScript_24D999 - -BattleFrontier_BattlePalaceLobby_EventScript_24DB45:: @ 824DB45 - switch VAR_RESULT - case 0, BattleFrontier_BattlePalaceLobby_EventScript_24DB60 - case 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB6D - -BattleFrontier_BattlePalaceLobby_EventScript_24DB60:: @ 824DB60 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E173, 4 - goto BattleFrontier_BattlePalaceLobby_EventScript_24DB9C - -BattleFrontier_BattlePalaceLobby_EventScript_24DB6D:: @ 824DB6D - msgbox BattleFrontier_BattlePalaceLobby_Text_24E29E, 4 - goto BattleFrontier_BattlePalaceLobby_EventScript_24DB9C - -BattleFrontier_BattlePalaceLobby_EventScript_24DB7A:: @ 824DB7A - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special sub_81A1780 - goto BattleFrontier_BattlePalaceLobby_EventScript_24DB94 - -BattleFrontier_BattlePalaceLobby_EventScript_24DB91:: @ 824DB91 - special LoadPlayerParty - -BattleFrontier_BattlePalaceLobby_EventScript_24DB94:: @ 824DB94 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, 4 - -BattleFrontier_BattlePalaceLobby_EventScript_24DB9C:: @ 824DB9C - release - end - -BattleFrontier_BattlePalaceLobby_EventScript_24DB9E:: @ 824DB9E - msgbox BattleFrontier_BattlePalaceLobby_Text_24DD5B, 4 - return - -BattleFrontier_BattlePalaceLobby_EventScript_24DBA7:: @ 824DBA7 - msgbox BattleFrontier_BattlePalaceLobby_Text_24EB06, 4 - return - -BattleFrontier_BattlePalaceLobby_EventScript_24DBB0:: @ 824DBB0 - message BattleFrontier_BattlePalaceLobby_Text_24DDE1 - return - -BattleFrontier_BattlePalaceLobby_EventScript_24DBB6:: @ 824DBB6 - message BattleFrontier_BattlePalaceLobby_Text_24EB8C - return - -BattleFrontier_BattlePalaceLobby_EventScript_24DBBC:: @ 824DBBC - compare VAR_0x40CE, 0 - call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC23 - compare VAR_0x40CE, 1 - call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC29 - applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC47 - applymovement 255, BattleFrontier_BattlePalaceLobby_Movement_24DC47 - waitmovement 0 - compare VAR_0x40CE, 0 - call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC2F - compare VAR_0x40CE, 1 - call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC35 - waitdooranim - applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC49 - applymovement 255, BattleFrontier_BattlePalaceLobby_Movement_24DC4C - waitmovement 0 - compare VAR_0x40CE, 0 - call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC3B - compare VAR_0x40CE, 1 - call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC41 - waitdooranim - return - -BattleFrontier_BattlePalaceLobby_EventScript_24DC23:: @ 824DC23 - setvar VAR_LAST_TALKED, 1 - return - -BattleFrontier_BattlePalaceLobby_EventScript_24DC29:: @ 824DC29 - setvar VAR_LAST_TALKED, 6 - return - -BattleFrontier_BattlePalaceLobby_EventScript_24DC2F:: @ 824DC2F - opendoor 5, 4 - return - -BattleFrontier_BattlePalaceLobby_EventScript_24DC35:: @ 824DC35 - opendoor 19, 4 - return - -BattleFrontier_BattlePalaceLobby_EventScript_24DC3B:: @ 824DC3B - closedoor 5, 4 - return - -BattleFrontier_BattlePalaceLobby_EventScript_24DC41:: @ 824DC41 - closedoor 19, 4 - return - -BattleFrontier_BattlePalaceLobby_Movement_24DC47: @ 824DC47 - walk_up - step_end - -BattleFrontier_BattlePalaceLobby_Movement_24DC49: @ 824DC49 - walk_up - set_invisible - step_end - -BattleFrontier_BattlePalaceLobby_Movement_24DC4C: @ 824DC4C - walk_up - walk_up - set_invisible - step_end - -BattleFrontier_BattlePalaceLobby_EventScript_24DC50:: @ 824DC50 - lockall - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 0 - special sub_81A1780 - waitbuttonpress - special RemoveRecordsWindow - releaseall - end - -BattleFrontier_BattlePalaceLobby_EventScript_24DC69:: @ 824DC69 - lockall - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 1 - special sub_81A1780 - waitbuttonpress - special RemoveRecordsWindow - releaseall - end - -BattleFrontier_BattlePalaceLobby_EventScript_24DC82:: @ 824DC82 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E6E3, 2 - end - -BattleFrontier_BattlePalaceLobby_EventScript_24DC8B:: @ 824DC8B - msgbox BattleFrontier_BattlePalaceLobby_Text_24E851, 2 - end - -BattleFrontier_BattlePalaceLobby_EventScript_24DC94:: @ 824DC94 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E992, 2 - end - -BattleFrontier_BattlePalaceLobby_EventScript_24DC9D:: @ 824DC9D - msgbox BattleFrontier_BattlePalaceLobby_Text_24EA4B, 2 - end - -BattleFrontier_BattlePalaceLobby_EventScript_24DCA6:: @ 824DCA6 - lockall - msgbox BattleFrontier_BattlePalaceLobby_Text_24EF66, 4 - goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5 - end - -BattleFrontier_BattlePalaceLobby_EventScript_24DCB5:: @ 824DCB5 - message BattleFrontier_BattlePalaceLobby_Text_24EF88 - waitmessage - multichoice 16, 0, 100, 0 - switch VAR_RESULT - case 0, BattleFrontier_BattlePalaceLobby_EventScript_24DD13 - case 1, BattleFrontier_BattlePalaceLobby_EventScript_24DD21 - case 2, BattleFrontier_BattlePalaceLobby_EventScript_24DD2F - case 3, BattleFrontier_BattlePalaceLobby_EventScript_24DD3D - case 4, BattleFrontier_BattlePalaceLobby_EventScript_24DD4B - case 5, BattleFrontier_BattlePalaceLobby_EventScript_24DD59 - case 127, BattleFrontier_BattlePalaceLobby_EventScript_24DD59 - end - -BattleFrontier_BattlePalaceLobby_EventScript_24DD13:: @ 824DD13 - msgbox BattleFrontier_BattlePalaceLobby_Text_24EFAB, 4 - goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5 - end - -BattleFrontier_BattlePalaceLobby_EventScript_24DD21:: @ 824DD21 - msgbox BattleFrontier_BattlePalaceLobby_Text_24F049, 4 - goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5 - end - -BattleFrontier_BattlePalaceLobby_EventScript_24DD2F:: @ 824DD2F - msgbox BattleFrontier_BattlePalaceLobby_Text_24F190, 4 - goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5 - end - -BattleFrontier_BattlePalaceLobby_EventScript_24DD3D:: @ 824DD3D - msgbox BattleFrontier_BattlePalaceLobby_Text_24F2E8, 4 - goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5 - end - -BattleFrontier_BattlePalaceLobby_EventScript_24DD4B:: @ 824DD4B - msgbox BattleFrontier_BattlePalaceLobby_Text_24F3F4, 4 - goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5 - end - -BattleFrontier_BattlePalaceLobby_EventScript_24DD59:: @ 824DD59 - releaseall - end - -BattleFrontier_BattlePalaceLobby_Text_24DD5B: @ 824DD5B - .string "Where the hearts of TRAINERS\n" - .string "are put to the test.\p" - .string "I welcome you to the BATTLE PALACE.\p" - .string "I accept challenges to the SINGLE\n" - .string "BATTLE HALLS.$" - -BattleFrontier_BattlePalaceLobby_Text_24DDE1: @ 824DDE1 - .string "Do you wish to take\n" - .string "the SINGLE BATTLE HALL challenge?$" - -BattleFrontier_BattlePalaceLobby_Text_24DE17: @ 824DE17 - .string "In the BATTLE PALACE, there are\n" - .string "several auditoriums for SINGLE BATTLES\l" - .string "that are named SINGLE BATTLE HALLS.\p" - .string "The SINGLE BATTLES are conducted in\n" - .string "the usual way, except with one crucial\l" - .string "rule that must be obeyed.\p" - .string "TRAINERS are permitted only to switch\n" - .string "their POKéMON in and out.\p" - .string "TRAINERS are otherwise forbidden to\n" - .string "command their POKéMON.\p" - .string "The POKéMON are to behave according\n" - .string "to their nature and battle on their own.\p" - .string "You must put your trust in your\n" - .string "POKéMON and watch over them.\p" - .string "If you achieve the honor of beating\n" - .string "seven TRAINERS in succession,\l" - .string "we will present you with Battle Points.\p" - .string "If you want to interrupt your\n" - .string "challenge, you must save the game.\p" - .string "If you don’t save before interrupting,\n" - .string "you will be disqualified.$" - -BattleFrontier_BattlePalaceLobby_Text_24E0D8: @ 824E0D8 - .string "When you have fortified your heart\n" - .string "and POKéMON, you must return.$" - -BattleFrontier_BattlePalaceLobby_Text_24E119: @ 824E119 - .string "There are two BATTLE HALLS,\n" - .string "Level 50 and Open Level.\l" - .string "Which is your choice of a challenge?$" - -BattleFrontier_BattlePalaceLobby_Text_24E173: @ 824E173 - .string "Sigh…\p" - .string "You do not have the three POKéMON\n" - .string "required for the challenge.\p" - .string "To enter, you must provide three\n" - .string "different kinds of POKéMON.\p" - .string "These POKéMON must all be of\n" - .string "Level 50 or lower.\p" - .string "They also must not be holding\n" - .string "the same kinds of items.\p" - .string "EGGS{STR_VAR_1} ineligible.\p" - .string "Come back when you have made\n" - .string "your preparations.$" - -BattleFrontier_BattlePalaceLobby_Text_24E29E: @ 824E29E - .string "Sigh…\p" - .string "You do not have the three POKéMON\n" - .string "required for the challenge.\p" - .string "To enter, you must provide three\n" - .string "different kinds of POKéMON.\p" - .string "They also must not be holding\n" - .string "the same kinds of items.\p" - .string "EGGS{STR_VAR_1} ineligible.\p" - .string "Come back when you have made\n" - .string "your preparations.$" - -BattleFrontier_BattlePalaceLobby_Text_24E399: @ 824E399 - .string "Good. Now, you must select your\n" - .string "three POKéMON.$" - -BattleFrontier_BattlePalaceLobby_Text_24E3C8: @ 824E3C8 - .string "I must save before I show you to\n" - .string "the BATTLE HALL. Is that okay?$" - -BattleFrontier_BattlePalaceLobby_Text_24E408: @ 824E408 - .string "Good.\n" - .string "Now, follow me.$" - -BattleFrontier_BattlePalaceLobby_Text_24E41E: @ 824E41E - .string "I feel privileged for having seen\n" - .string "your POKéMON’s exploits.\p" - .string "The results will be recorded.\n" - .string "I must ask you to briefly wait.$" - -BattleFrontier_BattlePalaceLobby_Text_24E497: @ 824E497 - .string "To achieve a 7-win streak…\p" - .string "The bonds that bind your heart with\n" - .string "your POKéMON seem firm and true.$" - -BattleFrontier_BattlePalaceLobby_Text_24E4F7: @ 824E4F7 - .string "Your feat will be recorded.\n" - .string "I must ask you to briefly wait.$" - -BattleFrontier_BattlePalaceLobby_Text_24E533: @ 824E5333 - .string "For the feat of your 7-win streak,\n" - .string "we present you with Battle Point(s).$" - -VerdanturfTown_BattleTentLobby_Text_24E57B: @ 824E57B - .string "You seem to have no space for\n" - .string "our prize.\p" - .string "You should return when you have\n" - .string "organized your BAG.$" - -BattleFrontier_BattlePalaceLobby_Text_24E5D8: @ 824E5D8 -VerdanturfTown_BattleTentLobby_Text_24E5D8: @ 824E5D8 - .string "We have been waiting for you…$" - -BattleFrontier_BattlePalaceLobby_Text_24E5F6: @ 824E5F6 -VerdanturfTown_BattleTentLobby_Text_24E5F6: @ 824E5F6 - .string "I must save before I show you to\n" - .string "the BATTLE HALL. Is that okay?$" - -BattleFrontier_BattlePalaceLobby_Text_24E636: @ 824E636 -VerdanturfTown_BattleTentLobby_Text_24E636: @ 824E636 - .string "Sigh…\p" - .string "You failed to save before you ended\n" - .string "your challenge the last time.\p" - .string "As a result, your challenge has been\n" - .string "disqualified. It is most unfortunate.$" - -BattleFrontier_BattlePalaceLobby_Text_24E6C9: @ 824E6C9 - .string "{PLAYER} received the prize\n" - .string "{STR_VAR_1}.$" - -BattleFrontier_BattlePalaceLobby_Text_24E6E3: @ 824E6E3 - .string "For a hardy fellow like me,\n" - .string "hardy POKéMON are the best.\p" - .string "Offense is the best defense!\n" - .string "A relentless attack is the ultimate!\p" - .string "But that’s not what I wanted to chat\n" - .string "about.\p" - .string "Every so often a really cute lady\n" - .string "swings by here.\p" - .string "She says that she can tell what\n" - .string "POKéMON are thinking.\p" - .string "I don’t know about that part,\n" - .string "but she is really cute.\p" - .string "Huh?\n" - .string "Why are you looking at me like that?$" - -BattleFrontier_BattlePalaceLobby_Text_24E851: @ 824E851 - .string "Hmm…\p" - .string "It appears that the nature of POKéMON\n" - .string "and the moves that they have been\l" - .string "taught are the keys to battle here.\p" - .string "To be more precise, it’s how well\n" - .string "the moves match the nature of\l" - .string "the POKéMON.\p" - .string "If your POKéMON is in trouble and\n" - .string "unable to live up to its potential,\l" - .string "you may need to examine how well\l" - .string "its moves match its nature.$" - -BattleFrontier_BattlePalaceLobby_Text_24E992: @ 824E992 - .string "My POKéMON is usually very docile.\p" - .string "But when it’s in a BATTLE HALL,\n" - .string "it sometimes seems to become\l" - .string "transformed into something wicked!\p" - .string "It becomes totally intimidating.\n" - .string "It’s shocking, even.$" - -BattleFrontier_BattlePalaceLobby_Text_24EA4B: @ 824EA4B - .string "I wonder what sort of nature a POKéMON\n" - .string "would have if it favored enfeebling its\l" - .string "opponents and chipping away slowly.\p" - .string "I’d be surprised if it was a LAX nature.\p" - .string "But, nah, that can’t be right.$" - -BattleFrontier_BattlePalaceLobby_Text_24EB06: @ 824EB06 - .string "Where the hearts of TRAINERS\n" - .string "are put to the test.\p" - .string "I welcome you to the BATTLE PALACE.\p" - .string "I accept challenges to the DOUBLE\n" - .string "BATTLE HALLS.$" - -BattleFrontier_BattlePalaceLobby_Text_24EB8C: @ 824EB8C - .string "Do you wish to take\n" - .string "the DOUBLE BATTLE HALL challenge?$" - -BattleFrontier_BattlePalaceLobby_Text_24EBC2: @ 824EBC2 - .string "In the BATTLE PALACE, there are\n" - .string "several auditoriums for DOUBLE BATTLES\l" - .string "that are named DOUBLE BATTLE HALLS.\p" - .string "The DOUBLE BATTLES are conducted in\n" - .string "the usual way, except with one crucial\l" - .string "rule that must be obeyed.\p" - .string "TRAINERS are permitted only to switch\n" - .string "their POKéMON in and out.\p" - .string "TRAINERS are otherwise forbidden to\n" - .string "command their POKéMON.\p" - .string "The POKéMON are to behave according\n" - .string "to their nature and battle on their own.\p" - .string "You must put your trust in your\n" - .string "POKéMON and watch over them.\p" - .string "If you achieve the honor of beating\n" - .string "seven TRAINERS in succession,\l" - .string "we will present you with Battle Points.\p" - .string "If you want to interrupt your\n" - .string "challenge, please save the game.\p" - .string "If you don’t save before interrupting,\n" - .string "you will be disqualified.$" - -BattleFrontier_BattlePalaceLobby_Text_24EE81: @ 824EE81 - .string "To defeat the PALACE MAVEN\n" - .string "and seven TRAINERS in a row…$" - -BattleFrontier_BattlePalaceLobby_Text_24EEB9: @ 824EEB9 - .string "In honor of the bond you share with\n" - .string "your POKéMON, we present you with\l" - .string "these Battle Point(s).$" - -BattleFrontier_BattlePalaceLobby_Text_24EF16: @ 824EF16 - .string "Would you like to record your latest\n" - .string "BATTLE PALACE match on your\l" - .string "FRONTIER PASS?$" - -BattleFrontier_BattlePalaceLobby_Text_24EF66: @ 824EF66 - .string "The BATTLE HALL rules are listed.$" - -BattleFrontier_BattlePalaceLobby_Text_24EF88: @ 824EF88 -VerdanturfTown_BattleTentLobby_Text_24EF88: @ 824EF88 - .string "Which heading do you want to read?$" - -BattleFrontier_BattlePalaceLobby_Text_24EFAB: @ 824EFAB -VerdanturfTown_BattleTentLobby_Text_24EFAB: @ 824EFAB - .string "Here, POKéMON are required to think\n" - .string "and battle by themselves.\p" - .string "Unlike in the wild, POKéMON that live\n" - .string "with people behave differently\l" - .string "depending on their nature.$" - -BattleFrontier_BattlePalaceLobby_Text_24F049: @ 824F049 -VerdanturfTown_BattleTentLobby_Text_24F049: @ 824F049 - .string "Depending on its nature, a POKéMON\n" - .string "may prefer to attack no matter what.\p" - .string "Another POKéMON may prefer to protect\n" - .string "itself from any harm.\p" - .string "Yet another may enjoy vexing or\n" - .string "confounding its foes.\p" - .string "Due to its nature, a POKéMON\n" - .string "will have favorite moves that it is good\l" - .string "at using.\p" - .string "It may also dislike certain moves that\n" - .string "it has trouble using.$" - -BattleFrontier_BattlePalaceLobby_Text_24F190: @ 824F190 -VerdanturfTown_BattleTentLobby_Text_24F190: @ 824F190 - .string "There are offensive moves that inflict\n" - .string "direct damage on the foe.\p" - .string "There are defensive moves that are\n" - .string "used to prepare for enemy attacks or\l" - .string "used to heal HP and so on.\p" - .string "There are also other somewhat-odd\n" - .string "moves that may enfeeble the foes with\l" - .string "stat problems including poison and \l" - .string "paralysis.\p" - .string "POKéMON will consider using moves in\n" - .string "these three categories.$" - -BattleFrontier_BattlePalaceLobby_Text_24F2E8: @ 824F2E8 -VerdanturfTown_BattleTentLobby_Text_24F2E8: @ 824F2E8 - .string "When not under command by its TRAINER,\n" - .string "a POKéMON may be unable to effectively\l" - .string "use certain moves.\p" - .string "A POKéMON is not good at using any\n" - .string "move that it dislikes.\p" - .string "If a POKéMON only knows moves that\n" - .string "do not match its nature, it will often\l" - .string "be unable to live up to its potential.$" - -BattleFrontier_BattlePalaceLobby_Text_24F3F4: @ 824F3F4 -VerdanturfTown_BattleTentLobby_Text_24F3F4: @ 824F3F4 - .string "Depending on its nature, a POKéMON may\n" - .string "start using moves that don’t match its\l" - .string "nature when it is in trouble.\p" - .string "If a POKéMON begins behaving oddly\n" - .string "in a pinch, watch it carefully.$" - diff --git a/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc b/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc deleted file mode 100644 index 23ad26692..000000000 --- a/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc +++ /dev/null @@ -1,69 +0,0 @@ -BattleFrontier_BattlePikeCorridor_MapScripts:: @ 825C771 - map_script 2, BattleFrontier_BattlePikeCorridor_MapScript2_25C77C - map_script 4, BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7 - .byte 0 - -BattleFrontier_BattlePikeCorridor_MapScript2_25C77C: @ 825C77C - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeCorridor_EventScript_25C786 - .2byte 0 - -BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786 - delay 16 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 1 - special sub_81A1780 - setvar VAR_0x8004, 20 - special sub_81A703C - setvar VAR_0x8004, 24 - setvar VAR_0x8005, 1 - special sub_81A703C - applymovement 255, BattleFrontier_BattlePikeCorridor_Movement_25C80B - applymovement 1, BattleFrontier_BattlePikeCorridor_Movement_25C812 - waitmovement 0 - lockall - msgbox BattleFrontier_BattlePikeCorridor_Text_25C817, 4 - closemessage - releaseall - applymovement 255, BattleFrontier_BattlePikeCorridor_Movement_25C80E - waitmovement 0 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 99 - special sub_81A1780 - call BattleFrontier_BattlePikeCorridor_EventScript_25BB49 - warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10 - waitstate - end - -BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7: @ 825C7F7 - map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePikeCorridor_EventScript_25C801 - .2byte 0 - -BattleFrontier_BattlePikeCorridor_EventScript_25C801:: @ 825C801 - setvar VAR_TEMP_1, 1 - turnobject 255, 2 - end - -BattleFrontier_BattlePikeCorridor_Movement_25C80B: @ 825C80B - walk_up - walk_up - step_end - -BattleFrontier_BattlePikeCorridor_Movement_25C80E: @ 825C80E - walk_up - walk_up - set_invisible - step_end - -BattleFrontier_BattlePikeCorridor_Movement_25C812: @ 825C812 - walk_up - walk_up - walk_left - face_down - step_end - -BattleFrontier_BattlePikeCorridor_Text_25C817: @ 825C817 - .string "Your Battle Choice challenge\n" - .string "has now begun…$" - diff --git a/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc b/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc deleted file mode 100644 index 5323c4a6b..000000000 --- a/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc +++ /dev/null @@ -1,497 +0,0 @@ -BattleFrontier_BattlePikeLobby_MapScripts:: @ 825B6C6 - map_script 2, BattleFrontier_BattlePikeLobby_MapScript2_25B6D1 - map_script 4, BattleFrontier_BattlePikeLobby_MapScript2_25B6F3 - .byte 0 - -BattleFrontier_BattlePikeLobby_MapScript2_25B6D1: @ 825B6D1 - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B707 - map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattlePikeLobby_EventScript_25B710 - map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattlePikeLobby_EventScript_25B762 - map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattlePikeLobby_EventScript_25B806 - .2byte 0 - -BattleFrontier_BattlePikeLobby_MapScript2_25B6F3: @ 825B6F3 - map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePikeLobby_EventScript_25B6FD - .2byte 0 - -BattleFrontier_BattlePikeLobby_EventScript_25B6FD:: @ 825B6FD - setvar VAR_TEMP_1, 1 - turnobject 255, 2 - end - -BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707 - setvar VAR_0x8004, 0 - special sub_81A1780 - end - -BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710 - special HealPlayerParty - setvar VAR_0x8004, 27 - special sub_81A703C - lockall - msgbox BattleFrontier_BattlePikeLobby_Text_25C2E0, 4 - closemessage - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 0 - special sub_81A703C - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 4 - setvar VAR_0x8006, 0 - special sub_81A703C - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_TEMP_0, 255 - releaseall - end - -BattleFrontier_BattlePikeLobby_EventScript_25B762:: @ 825B762 - lockall - setvar VAR_0x8004, 10 - special sub_81A1780 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePikeLobby_EventScript_25B784 - msgbox BattleFrontier_BattlePikeLobby_Text_25C18A, 4 - waitmessage - goto BattleFrontier_BattlePikeLobby_EventScript_25B78D - -BattleFrontier_BattlePikeLobby_EventScript_25B784:: @ 825B784 - msgbox BattleFrontier_BattlePikeLobby_Text_25C383, 4 - waitmessage - -BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D - msgbox BattleFrontier_BattlePikeLobby_Text_25C3D9, 4 - setvar VAR_0x8004, 11 - special sub_81A1780 - msgbox BattleFrontier_BattlePikeLobby_Text_241520, 9 - setvar VAR_0x8004, 8 - special sub_81A1780 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 3 - special sub_81A703C - addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - copyvar VAR_0x8006, VAR_RESULT - special sub_81A703C - special LoadPlayerParty - special HealPlayerParty - setvar VAR_0x8004, 27 - special sub_81A703C - message BattleFrontier_BattlePikeLobby_Text_25C1DF - waitmessage - setvar VAR_0x8004, 8 - setvar VAR_0x8005, 0 - special sub_81A703C - playse SE_SAVE - waitse - msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, 4 - closemessage - setvar VAR_TEMP_0, 255 - releaseall - end - -BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806 - lockall - message BattleFrontier_BattlePikeLobby_Text_25C146 - waitmessage - setvar VAR_0x8004, 8 - special sub_81A1780 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 4 - setvar VAR_0x8006, 0 - special sub_81A703C - special LoadPlayerParty - special HealPlayerParty - setvar VAR_0x8004, 27 - special sub_81A703C - setvar VAR_0x8004, 8 - setvar VAR_0x8005, 0 - special sub_81A703C - playse SE_SAVE - waitse - msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, 4 - closemessage - setvar VAR_TEMP_0, 255 - releaseall - end - -BattleFrontier_BattlePikeLobby_EventScript_25B868:: @ 825B868 - lock - faceplayer - setvar VAR_FRONTIER_FACILITY, 5 - setvar VAR_0x40CE, 0 - special SavePlayerParty - msgbox BattleFrontier_BattlePikeLobby_Text_25BB52, 4 - -BattleFrontier_BattlePikeLobby_EventScript_25B87F:: @ 825B87F - message BattleFrontier_BattlePikeLobby_Text_25BBC1 - waitmessage - multichoice 17, 6, 23, 0 - switch VAR_RESULT - case 0, BattleFrontier_BattlePikeLobby_EventScript_25B8BB - case 1, BattleFrontier_BattlePikeLobby_EventScript_25BA1A - case 2, BattleFrontier_BattlePikeLobby_EventScript_25BA76 - case 127, BattleFrontier_BattlePikeLobby_EventScript_25BA76 - -BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB - message BattleFrontier_BattlePikeLobby_Text_25BE35 - waitmessage - multichoice 17, 6, 24, 0 - switch VAR_RESULT - case 2, BattleFrontier_BattlePikeLobby_EventScript_25BA76 - case 127, BattleFrontier_BattlePikeLobby_EventScript_25BA76 - setvar VAR_0x8004, 15 - special sub_81A1780 - compare VAR_0x8004, 1 - goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA27 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 - msgbox BattleFrontier_BattlePikeLobby_Text_25C094, 4 - fadescreen 1 - call BattleFrontier_BattlePikeLobby_EventScript_23F2B7 - copyvar VAR_0x8004, VAR_RESULT - setvar VAR_0x8005, 3 - special sub_80F9490 - waitstate - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA73 - msgbox BattleFrontier_BattlePikeLobby_Text_25C0D8, 5 - switch VAR_RESULT - case 0, BattleFrontier_BattlePikeLobby_EventScript_25BA73 - case 1, BattleFrontier_BattlePikeLobby_EventScript_25B95C - case 127, BattleFrontier_BattlePikeLobby_EventScript_25BA73 - -BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C - setvar VAR_TEMP_0, 0 - setvar VAR_TEMP_1, 0 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 4 - special sub_81A1780 - setvar VAR_0x8004, 28 - special sub_81A703C - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 1 - special sub_81A1780 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 4 - setvar VAR_0x8006, 1 - special sub_81A703C - setvar VAR_0x8004, 26 - special sub_81A703C - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 0 - special sub_81A1780 - special LoadPlayerParty - closemessage - delay 2 - call BattleFrontier_BattlePikeLobby_EventScript_27134F - setvar VAR_TEMP_0, 255 - setvar VAR_0x8004, 26 - special sub_81A703C - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA5C - special SavePlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 - special sub_81A1780 - msgbox BattleFrontier_BattlePikeLobby_Text_25C130, 4 - closemessage - setvar VAR_0x8004, 5 - special sub_81A1780 - call BattleFrontier_BattlePikeLobby_EventScript_25BA94 - special HealPlayerParty - call BattleFrontier_BattlePikeLobby_EventScript_25BB49 - warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR, 255, 6, 7 - setvar VAR_TEMP_0, 0 - waitstate - end - -BattleFrontier_BattlePikeLobby_EventScript_25BA1A:: @ 825BA1A - msgbox BattleFrontier_BattlePikeLobby_Text_25BBF5, 4 - goto BattleFrontier_BattlePikeLobby_EventScript_25B87F - -BattleFrontier_BattlePikeLobby_EventScript_25BA27:: @ 825BA27 - switch VAR_RESULT - case 0, BattleFrontier_BattlePikeLobby_EventScript_25BA42 - case 1, BattleFrontier_BattlePikeLobby_EventScript_25BA4F - -BattleFrontier_BattlePikeLobby_EventScript_25BA42:: @ 825BA42 - msgbox BattleFrontier_BattlePikeLobby_Text_25BE8C, 4 - goto BattleFrontier_BattlePikeLobby_EventScript_25BA7E - -BattleFrontier_BattlePikeLobby_EventScript_25BA4F:: @ 825BA4F - msgbox BattleFrontier_BattlePikeLobby_Text_25BF9A, 4 - goto BattleFrontier_BattlePikeLobby_EventScript_25BA7E - -BattleFrontier_BattlePikeLobby_EventScript_25BA5C:: @ 825BA5C - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special sub_81A1780 - goto BattleFrontier_BattlePikeLobby_EventScript_25BA76 - -BattleFrontier_BattlePikeLobby_EventScript_25BA73:: @ 825BA73 - special LoadPlayerParty - -BattleFrontier_BattlePikeLobby_EventScript_25BA76:: @ 825BA76 - msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, 4 - -BattleFrontier_BattlePikeLobby_EventScript_25BA7E:: @ 825BA7E - release - end - -BattleFrontier_BattlePikeLobby_EventScript_25BA80:: @ 825BA80 - lockall - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 5 - special sub_81A1780 - waitbuttonpress - special RemoveRecordsWindow - releaseall - end - -BattleFrontier_BattlePikeLobby_EventScript_25BA94:: @ 825BA94 - applymovement 1, BattleFrontier_BattlePikeLobby_Movement_25BAA7 - applymovement 255, BattleFrontier_BattlePikeLobby_Movement_25BAA6 - waitmovement 0 - return - -BattleFrontier_BattlePikeLobby_Movement_25BAA6: @ 825BAA6 - walk_up - -BattleFrontier_BattlePikeLobby_Movement_25BAA7: @ 825BAA7 - walk_up - walk_up - set_invisible - step_end - -BattleFrontier_BattlePikeLobby_EventScript_25BAAB:: @ 825BAAB - msgbox BattleFrontier_BattlePikeLobby_Text_25C422, 2 - end - -BattleFrontier_BattlePikeLobby_EventScript_25BAB4:: @ 825BAB4 - msgbox BattleFrontier_BattlePikeLobby_Text_25C4A5, 2 - end - -BattleFrontier_BattlePikeLobby_EventScript_25BABD:: @ 825BABD - msgbox BattleFrontier_BattlePikeLobby_Text_25C4FD, 2 - end - -BattleFrontier_BattlePikeLobby_EventScript_25BAC6:: @ 825BAC6 - lockall - msgbox BattleFrontier_BattlePikeLobby_Text_25C5FB, 4 - goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5 - end - -BattleFrontier_BattlePikeLobby_EventScript_25BAD5:: @ 825BAD5 - message BattleFrontier_BattlePikeLobby_Text_25C621 - waitmessage - multichoice 16, 4, 102, 0 - switch VAR_RESULT - case 0, BattleFrontier_BattlePikeLobby_EventScript_25BB1D - case 1, BattleFrontier_BattlePikeLobby_EventScript_25BB2B - case 2, BattleFrontier_BattlePikeLobby_EventScript_25BB39 - case 3, BattleFrontier_BattlePikeLobby_EventScript_25BB47 - case 127, BattleFrontier_BattlePikeLobby_EventScript_25BB47 - end - -BattleFrontier_BattlePikeLobby_EventScript_25BB1D:: @ 825BB1D - msgbox BattleFrontier_BattlePikeLobby_Text_25C644, 4 - goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5 - end - -BattleFrontier_BattlePikeLobby_EventScript_25BB2B:: @ 825BB2B - msgbox BattleFrontier_BattlePikeLobby_Text_25C68A, 4 - goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5 - end - -BattleFrontier_BattlePikeLobby_EventScript_25BB39:: @ 825BB39 - msgbox BattleFrontier_BattlePikeLobby_Text_25C6EB, 4 - goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5 - end - -BattleFrontier_BattlePikeLobby_EventScript_25BB47:: @ 825BB47 - releaseall - end - -BattleFrontier_BattlePikeCorridor_EventScript_25BB49:: @ 825BB49 -BattleFrontier_BattlePikeLobby_EventScript_25BB49:: @ 825BB49 -BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49:: @ 825BB49 -BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49:: @ 825BB49 - playse 267 - special sub_813B880 - waitstate - waitse - return - -BattleFrontier_BattlePikeLobby_Text_25BB52: @ 825BB52 - .string "Where the luck of TRAINERS\n" - .string "is put to the test…\p" - .string "Welcome to the BATTLE PIKE…\p" - .string "I am your guide to the BATTLE PIKE…$" - -BattleFrontier_BattlePikeLobby_Text_25BBC1: @ 825BBC1 - .string "Would you like to take the Battle\n" - .string "Choice challenge?$" - -BattleFrontier_BattlePikeLobby_Text_25BBF5: @ 825BBF5 - .string "Here we conduct an event we call\n" - .string "the Battle Choice.\p" - .string "The Battle Choice rules are very\n" - .string "simple…\p" - .string "Choose one of three paths and make\n" - .string "your way to the goal room at the end\l" - .string "of the BATTLE PIKE. It’s that simple.\p" - .string "However, what happens on the chosen\n" - .string "path depends entirely on the luck\l" - .string "of the challenger…\p" - .string "If you reach the goal, you will be\n" - .string "rewarded with Battle Points.\p" - .string "If you want to interrupt your\n" - .string "challenge, please have a word with\l" - .string "our staff in the big rooms on the way.\p" - .string "If you don’t save before interrupting,\n" - .string "you will be disqualified.$" - -BattleFrontier_BattlePikeLobby_Text_25BE02: @ 825BE02 - .string "We look forward to seeing you\n" - .string "on another occasion…$" - -BattleFrontier_BattlePikeLobby_Text_25BE35: @ 825BE35 - .string "You have the choice of two courses,\n" - .string "Level 50 and Open Level.\l" - .string "Which will you challenge?$" - -BattleFrontier_BattlePikeLobby_Text_25BE8C: @ 825BE8C - .string "I beg your pardon, but…\p" - .string "You do not have three eligible\n" - .string "POKéMON for the Battle Choice event.\p" - .string "You must have three different POKéMON\n" - .string "of Level 50 or less to enter.\p" - .string "They also must be holding different\n" - .string "kinds of items.\p" - .string "EGGS{STR_VAR_1} ineligible.\p" - .string "Please come see me when\n" - .string "you are ready…$" - -BattleFrontier_BattlePikeLobby_Text_25BF9A: @ 825BF9A - .string "I beg your pardon, but…\p" - .string "You do not have three eligible\n" - .string "POKéMON for the Battle Choice event.\p" - .string "You must have three different\n" - .string "POKéMON to enter.\p" - .string "They also must be holding different\n" - .string "kinds of items.\p" - .string "EGGS{STR_VAR_1} ineligible.\p" - .string "Please come see me when\n" - .string "you are ready…$" - -BattleFrontier_BattlePikeLobby_Text_25C094: @ 825C094 - .string "Please choose the three POKéMON\n" - .string "you wish to enter in the challenge…$" - -BattleFrontier_BattlePikeLobby_Text_25C0D8: @ 825C0D8 - .string "Before starting your Battle Choice\n" - .string "challenge, I must save the game.\l" - .string "Is that acceptable?$" - -BattleFrontier_BattlePikeLobby_Text_25C130: @ 825C130 - .string "Please step this way…$" - -BattleFrontier_BattlePikeLobby_Text_25C146: @ 825C146 - .string "Your challenge has ended…\p" - .string "I shall record your results.\n" - .string "Please wait…$" - -BattleFrontier_BattlePikeLobby_Text_25C18A: @ 825C18A - .string "You have completed the challenge…\p" - .string "I must say… You seem to possess luck\n" - .string "in abundance…$" - -BattleFrontier_BattlePikeLobby_Text_25C1DF: @ 825C1DF - .string "I shall record your results.\n" - .string "Please wait…$" - -BattleFrontier_BattlePikeLobby_Text_25C209: @ 825C209 - .string "To commemorate your completion of\n" - .string "the Battle Choice challenge, we award\l" - .string "you these Battle Point(s)…$" - -BattleFrontier_BattlePikeLobby_Text_25C26C: @ 825C26C - .string "You appear to have reached the limit\n" - .string "for Battle Points…\pPlease exchange some Battle Points\n" - .string "for prizes, then return…$" - -BattleFrontier_BattlePikeLobby_Text_25C2E0: @ 825C2E0 - .string "I beg your pardon, but…\p" - .string "You failed to save before you quit\n" - .string "your challenge the last time.\p" - .string "Because of that, your challenge so far\n" - .string "has been disqualified. I am sorry…$" - -BattleFrontier_BattlePikeLobby_Text_25C383: @ 825C383 - .string "Congratulations…\p" - .string "You have snatched victory from the\n" - .string "PIKE QUEEN and cleared the event…$" - -BattleFrontier_BattlePikeLobby_Text_25C3D9: @ 825C3D9 - .string "In recognition of your amazing luck,\n" - .string "we award you these Battle Point(s)…$" - -BattleFrontier_BattlePikeLobby_Text_25C422: @ 825C422 - .string "Arrgh! I blew my chance!\n" - .string "I was one room away from the goal!\p" - .string "In this place, you’d better watch out\n" - .string "for poison, freezing, and so on.$" - -BattleFrontier_BattlePikeLobby_Text_25C4A5: @ 825C4A5 - .string "I’ve completed the challenge 10 times\n" - .string "now, but I’ve never had to battle\l" - .string "a TRAINER once.$" - -BattleFrontier_BattlePikeLobby_Text_25C4FD: @ 825C4FD - .string "Listen! Listen!\p" - .string "Don’t you think that the special\n" - .string "abilities of POKéMON will be useful\l" - .string "here?$" - -BattleFrontier_BattlePikeLobby_Text_25C558: @ 825C558 - .string "What is this weird place?\n" - .string "I can’t figure it out at all!\p" - .string "I’ve taken the challenge a bunch\n" - .string "of times, but all I ever do is run into\l" - .string "TRAINERS whichever path I choose.$" - -BattleFrontier_BattlePikeLobby_Text_25C5FB: @ 825C5FB - .string "The Battle Choice’s rules are listed.$" - -BattleFrontier_BattlePikeLobby_Text_25C621: @ 825C621 - .string "Which heading do you want to read?$" - -BattleFrontier_BattlePikeLobby_Text_25C644: @ 825C644 - .string "The BAG and POKéNAV may not be used\n" - .string "during a Battle Choice challenge.$" - -BattleFrontier_BattlePikeLobby_Text_25C68A: @ 825C68A - .string "During a Battle Choice challenge,\n" - .string "any BERRY or HERB held by POKéMON\l" - .string "will be effective only once.$" - -BattleFrontier_BattlePikeLobby_Text_25C6EB: @ 825C6EB - .string "During a Battle Choice challenge,\n" - .string "the sequence of POKéMON cannot be\l" - .string "changed.\p" - .string "The sequence must be set before\n" - .string "starting your challenge.$" - diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc deleted file mode 100644 index 509806531..000000000 --- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc +++ /dev/null @@ -1,895 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom1_MapScripts:: @ 825D152 - map_script 5, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C423E - map_script 3, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25 - map_script 2, BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167 - map_script 4, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE - .byte 0 - -BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167: @ 825D167 - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D171 - .2byte 0 - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D171:: @ 825D171 - setvar VAR_TEMP_0, 1 - setvar VAR_0x8004, 5 - special sub_81A703C - switch VAR_RESULT - case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6 - case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D50E - case 3, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D605 - case 6, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D231 - case 7, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E - case 8, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2BF - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6:: @ 825D1C6 - lockall - delay 16 - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795 - waitmovement 0 - setvar VAR_0x8004, 21 - setvar VAR_0x8005, 0 - special sub_81A703C - msgbox 0x2021fc4, 4 - waitmessage - closemessage - releaseall - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 0 - special sub_8163AC4 - waitstate - switch VAR_RESULT - case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D226 - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A:: @ 825D20A - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 4 - special sub_81A1780 - warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 - waitstate - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D226:: @ 825D226 - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798 - waitmovement 0 - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D231:: @ 825D231 - lockall - delay 16 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDFE, 4 - waitmessage - closemessage - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795 - waitmovement 0 - setvar VAR_0x8004, 21 - setvar VAR_0x8005, 0 - special sub_81A703C - msgbox 0x2021fc4, 4 - waitmessage - closemessage - releaseall - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 0 - special sub_8163AC4 - waitstate - switch VAR_RESULT - case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D285 - goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D285:: @ 825D285 - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798 - waitmovement 0 - applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B6 - waitmovement 0 - lock - faceplayer - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE3F, 4 - playfanfare MUS_ME_ASA - waitfanfare - special HealPlayerParty - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE94, 4 - closemessage - release - applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798 - waitmovement 0 - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2BF:: @ 825D2BF - delay 22 - lockall - applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DF - waitmovement 0 - setvar VAR_0x8004, 23 - special sub_81A703C - switch VAR_RESULT - case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4DC - case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4EA - case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4FC - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E311, 4 - closemessage - special SpawnScriptEventObject - applymovement 127, BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0 - applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E2 - waitmovement 0 - playse 267 - call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8E7 - delay 4 - call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8A4 - delay 4 - call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D96D - delay 4 - waitse - delay 60 - playse 268 - delay 65 - call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8A4 - showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 - delay 4 - call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8E7 - delay 4 - call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D92A - waitse - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E7 - waitmovement 0 - setvar VAR_0x8004, 22 - special sub_81A703C - switch VAR_RESULT - case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416 - case 3, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD - case 4, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 7 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DED2, 4 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 7 - special sub_81A1780 - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD:: @ 825D3BD - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DF71, 4 - call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA - goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA - setvar VAR_0x8004, 12 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2, 4 - waitmessage - playfanfare MUS_ME_SYMBOLGET - message BattleFrontier_BattlePikeRandomRoom1_Text_25DFD0 - waitmessage - waitfanfare - setvar VAR_0x8004, 13 - special sub_81A1780 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E003, 4 - closemessage - goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416:: @ 825D416 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 7 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E02C, 4 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 7 - special sub_81A1780 - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443:: @ 825D443 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8, 4 - call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460 - goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460 - setvar VAR_0x8004, 12 - special sub_81A1780 - compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0F6, 4 - waitmessage - playfanfare MUS_ME_SYMBOLGET - message BattleFrontier_BattlePikeRandomRoom1_Text_25E118 - waitmessage - waitfanfare - setvar VAR_0x8004, 13 - special sub_81A1780 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E140, 4 - closemessage - goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D:: @ 825D49D - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7EA - waitmovement 0 - applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC - waitmovement 0 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - special sub_81A703C - addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - copyvar VAR_0x8006, VAR_RESULT - special sub_81A703C - call BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144 - waitstate - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4DC:: @ 825D4DC - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E15D, 4 - goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4EA:: @ 825D4EA - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E1DD, 4 - playfanfare MUS_ME_ASA - waitfanfare - goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4FC:: @ 825D4FC - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E238, 4 - playfanfare MUS_ME_ASA - waitfanfare - goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D50E:: @ 825D50E - lockall - delay 16 - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795 - waitmovement 0 - message BattleFrontier_BattlePikeRandomRoom1_Text_25D9B6 - waitmessage - playfanfare MUS_ME_ASA - waitfanfare - special HealPlayerParty - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA13, 4 - closemessage - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798 - waitmovement 0 - releaseall - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E - lockall - delay 16 - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C1 - applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C3 - waitmovement 0 - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C5 - applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C5 - waitmovement 0 - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C8 - applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CA - waitmovement 0 - applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BB - waitmovement 0 - setvar VAR_0x8004, 21 - setvar VAR_0x8005, 0 - special sub_81A703C - msgbox 0x2021fc4, 4 - closemessage - delay 16 - applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD - waitmovement 0 - setvar VAR_0x8004, 21 - setvar VAR_0x8005, 1 - special sub_81A703C - msgbox 0x2021fc4, 4 - closemessage - setvar VAR_0x8004, 9 - setvar VAR_0x8005, 0 - special sub_8163AC4 - waitstate - switch VAR_RESULT - case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D5DC - goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D5DC:: @ 825D5DC - applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD - waitmovement 0 - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CC - waitmovement 0 - applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7D4 - waitmovement 0 - applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BF - waitmovement 0 - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D605:: @ 825D605 - lockall - message BattleFrontier_BattlePikeRandomRoom1_Text_25DBD1 - applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7AA - waitmovement 0 - setvar VAR_0x8004, 12 - special sub_81A703C - copyvar VAR_0x8004, VAR_RESULT - compare VAR_0x8004, 0 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643 - compare VAR_0x8004, 1 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD3F, 4 - closemessage - releaseall - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DBE4, 4 - closemessage - waitse - playmoncry SPECIES_KIRLIA, 0 - waitmoncry - setvar VAR_0x8004, 11 - special sub_81A703C - compare VAR_RESULT, 2 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751 - compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D758 - compare VAR_RESULT, 3 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D75F - compare VAR_RESULT, 4 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766 - setvar VAR_0x8004, 15 - special sub_81A703C - waitstate - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2 - waitmovement 0 - applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B1 - waitmovement 0 - waitse - playmoncry SPECIES_KIRLIA, 0 - waitmoncry - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF, 4 - waitse - playmoncry SPECIES_KIRLIA, 0 - waitmoncry - closemessage - applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B3 - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A4 - waitmovement 0 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCCF, 4 - return - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5:: @ 825D6D5 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DC01, 4 - closemessage - waitse - playmoncry SPECIES_DUSCLOPS, 0 - waitmoncry - setvar VAR_0x8004, 11 - special sub_81A703C - compare VAR_RESULT, 0 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D - compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774 - setvar VAR_0x8004, 15 - special sub_81A703C - waitstate - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2 - waitmovement 0 - applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B1 - waitmovement 0 - waitse - playmoncry SPECIES_DUSCLOPS, 0 - waitmoncry - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF, 4 - waitse - playmoncry SPECIES_DUSCLOPS, 0 - waitmoncry - closemessage - applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B3 - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A4 - waitmovement 0 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD06, 4 - return - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751:: @ 825D751 - message BattleFrontier_BattlePikeRandomRoom1_Text_25DC20 - waitmessage - return - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D758:: @ 825D758 - message BattleFrontier_BattlePikeRandomRoom1_Text_25DC63 - waitmessage - return - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D75F:: @ 825D75F - message BattleFrontier_BattlePikeRandomRoom1_Text_25DC49 - waitmessage - return - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766:: @ 825D766 - message BattleFrontier_BattlePikeRandomRoom1_Text_25DC33 - waitmessage - return - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D:: @ 825D76D - message BattleFrontier_BattlePikeRandomRoom1_Text_25DC97 - waitmessage - return - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774:: @ 825D774 - message BattleFrontier_BattlePikeRandomRoom1_Text_25DC7C - waitmessage - return - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B:: @ 825D77B - closemessage - applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC - waitmovement 0 - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 0 - special sub_8163AC4 - waitstate - return - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D795: @ 825D795 - walk_down - walk_down - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D798: @ 825D798 - walk_up - walk_up - walk_up - set_invisible - walk_up - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D79E: @ 825D79E - walk_up - set_invisible - walk_up - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2: @ 825D7A2 - walk_down - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A4: @ 825D7A4 - walk_down - face_left - delay_16 - delay_16 - face_down - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7AA: @ 825D7AA - walk_fast_down - walk_fast_right - walk_fast_right - walk_fast_down - walk_fast_left - face_down - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B1: @ 825D7B1 - face_up - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B3: @ 825D7B3 - walk_left - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B4: @ 825D7B4 - face_right - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B6: @ 825D7B6 - walk_down - walk_down - walk_right - face_down - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BB: @ 825D7BB - face_left - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD: @ 825D7BD - face_right - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BF: @ 825D7BF - face_up - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C1: @ 825D7C1 - walk_right - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C3: @ 825D7C3 - walk_left - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C5: @ 825D7C5 - walk_down - walk_down - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C8: @ 825D7C8 - face_right - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CA: @ 825D7CA - face_left - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CC: @ 825D7CC - walk_up - walk_up - walk_up - walk_right - walk_up - set_invisible - walk_up - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7D4: @ 825D7D4 - walk_up - walk_up - walk_up - walk_left - walk_up - set_invisible - walk_up - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC: @ 825D7DC - walk_up - walk_up - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DF: @ 825D7DF - walk_down - walk_down - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E2: @ 825D7E2 - walk_up - walk_up - walk_up - set_invisible - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E7: @ 825D7E7 - set_visible - walk_down - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7EA: @ 825D7EA - walk_left - face_right - step_end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED:: @ 825D7ED - setvar VAR_0x8004, 5 - special sub_81A703C - switch VAR_RESULT - case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B - case 3, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D831 - case 4, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B:: @ 825D81B - lock - faceplayer - setvar VAR_0x8004, 14 - special sub_81A703C - msgbox 0x2021fc4, 4 - waitmessage - closemessage - release - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D831:: @ 825D831 - lock - faceplayer - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDA3, 4 - closemessage - release - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E:: @ 825D83E - setvar VAR_0x8004, 13 - special sub_81A703C - compare VAR_RESULT, 2 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881 - compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875 - playfanfare MUS_ME_ASA - waitfanfare - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DABE, 4 - closemessage - release - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D79E - waitmovement 0 - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875:: @ 825D875 - lock - faceplayer - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA51, 4 - closemessage - return - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881:: @ 825D881 - lock - faceplayer - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E32E, 4 - closemessage - return - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D:: @ 825D88D - lock - faceplayer - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDE6, 4 - closemessage - release - applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B4 - waitmovement 0 - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8A4:: @ 825D8A4 - setmetatile 4, 1, 554, 1 - setmetatile 3, 2, 561, 1 - setmetatile 4, 2, 562, 1 - setmetatile 5, 2, 563, 1 - setmetatile 3, 3, 569, 1 - setmetatile 4, 3, 570, 0 - setmetatile 5, 3, 571, 1 - special DrawWholeMapView - return - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8E7:: @ 825D8E7 - setmetatile 4, 1, 522, 1 - setmetatile 3, 2, 529, 1 - setmetatile 4, 2, 530, 1 - setmetatile 5, 2, 531, 1 - setmetatile 3, 3, 537, 1 - setmetatile 4, 3, 538, 0 - setmetatile 5, 3, 539, 1 - special DrawWholeMapView - return - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D92A:: @ 825D92A - setmetatile 4, 1, 683, 1 - setmetatile 3, 2, 690, 1 - setmetatile 4, 2, 691, 1 - setmetatile 5, 2, 692, 1 - setmetatile 3, 3, 698, 1 - setmetatile 4, 3, 699, 0 - setmetatile 5, 3, 700, 1 - special DrawWholeMapView - return - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D96D:: @ 825D96D - setmetatile 4, 1, 586, 1 - setmetatile 3, 2, 593, 1 - setmetatile 4, 2, 594, 1 - setmetatile 5, 2, 595, 1 - setmetatile 3, 3, 601, 1 - setmetatile 4, 3, 602, 0 - setmetatile 5, 3, 603, 1 - special DrawWholeMapView - return - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0: @ 825D9B0 - walk_up - walk_up - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B3: @ 825D9B3 - walk_down - walk_down - step_end - -BattleFrontier_BattlePikeRandomRoom1_Text_25D9B6: @ 825D9B6 - .string "Welcome…\n" - .string "You must be commended for your luck…\p" - .string "Your POKéMON shall be restored\n" - .string "to full health…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DA13: @ 825DA13 - .string "I urge you to enjoy the rest of your\n" - .string "Battle Choice challenge…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DA51: @ 825DA51 - .string "Ah, you’re a lucky one.\n" - .string "I’m in somewhat-good spirits now.\p" - .string "I will restore one of your POKéMON\n" - .string "to full health.$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DABE: @ 825DABE - .string "The best of luck to you.\n" - .string "Farewell.$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DAE1: @ 825DAE1 - .string "Excuse me…\p" - .string "Would you care for a battle?\n" - .string "I’ll restore your POKéMON if you win.$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DB2F: @ 825DB2F - .string "Very well…\n" - .string "Now, shall we?$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DB49: @ 825DB49 - .string "I see…\n" - .string "How unsporting of you…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DB67: @ 825DB67 - .string "Magnificent…\p" - .string "As promised, I shall restore your\n" - .string "POKéMON to full health.$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DBAE: @ 825DBAE - .string "The best of luck to you.\n" - .string "Farewell.$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DBD1: @ 825DBD1 - .string "Oh, my!\p" - .string "Watch out!$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DBE4: @ 825DBE4 - .string "Now, now!\n" - .string "KIRLIA, stop that!$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DC01: @ 825DC01 - .string "Now, now!\n" - .string "DUSCLOPS, stop that!$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DC20: @ 825DC20 - .string "KIRLIA used TOXIC!$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DC33: @ 825DC33 - .string "KIRLIA used HYPNOSIS!$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DC49: @ 825DC49 - .string "KIRLIA used THUNDER WAVE!$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DC63: @ 825DC63 - .string "KIRLIA used WILL-O-WISP!$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DC7C: @ 825DC7C - .string "DUSCLOPS used WILL-O-WISP!$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DC97: @ 825DC97 - .string "DUSCLOPS used ICE BEAM!$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF: @ 825DCAF - .string "Look here!\n" - .string "That’s quite enough!$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DCCF: @ 825DCCF - .string "I must apologize to you…\p" - .string "My KIRLIA has a TIMID nature…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DD06: @ 825DD06 - .string "I must apologize to you…\p" - .string "My DUSCLOPS has a TIMID nature…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DD3F: @ 825DD3F - .string "It attacks without warning if it is\n" - .string "startled by another person…\p" - .string "Are you and your POKéMON all right?$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DDA3: @ 825DDA3 - .string "I do apologize for what happened…\n" - .string "I do hope your POKéMON are fine.$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DDE6: @ 825DDE6 - .string "… … … … … …\n" - .string "… … … … … …$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DDFE: @ 825DDFE - .string "Welcome…\p" - .string "Here, we will have you battle\n" - .string "a somewhat-tough TRAINER…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DE3F: @ 825DE3F - .string "How wonderful…\p" - .string "To honor your victory, your POKéMON\n" - .string "shall be restored to full health…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DE94: @ 825DE94 - .string "I urge you to enjoy the rest of your\n" - .string "Battle Choice challenge…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DED2: @ 825DED2 - .string "I am LUCY…\n" - .string "I am the law here…\l" - .string "For I am the PIKE QUEEN…\p" - .string "You already know it, but to advance,\n" - .string "you must defeat me…\p" - .string "…I’m not one for idle chatter.\n" - .string "Hurry. Come on…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DF71: @ 825DF71 - .string "Your luck…\n" - .string "I hope you didn’t use it all up here…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2: @ 825DFA2 - .string "LUCY: … … … … … …\n" - .string "Show me your FRONTIER PASS…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DFD0: @ 825DFD0 - .string "The Luck Symbol was embossed on\n" - .string "the FRONTIER PASS!$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25E003: @ 825E003 - .string "…That’s all there is…\n" - .string "Disappear already…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25E02C: @ 825E02C - .string "LUCY: …You again…\p" - .string "… … … … … …\p" - .string "…I’ve trampled flowers and braved\n" - .string "storms to get to where I am…\p" - .string "I don’t feel any compulsion to keep\n" - .string "losing to the same opponent…\p" - .string "… … … … … …\n" - .string "Fine… I’ll do it…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8: @ 825E0E8 - .string "Now!\n" - .string "Come on!$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25E0F6: @ 825E0F6 - .string "LUCY: … … … … … …\p" - .string "…FRONTIER PASS…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25E118: @ 825E118 - .string "The Luck Symbol took on\n" - .string "a golden shine!$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25E140: @ 825E140 - .string "…You, I won’t forget…\n" - .string "…Ever…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25E15D: @ 825E15D - .string "I welcome you…\p" - .string "Giggle…\n" - .string "You seem to be bereft of luck…\p" - .string "If only you hadn’t chosen this room,\n" - .string "your POKéMON could have been healed…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25E1DD: @ 825E1DD - .string "I welcome you…\p" - .string "Since you have chosen this room, I will\n" - .string "restore one POKéMON to full health…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25E238: @ 825E238 - .string "I welcome you…\p" - .string "Since you have chosen this room, I will\n" - .string "restore two POKéMON to full health…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25E293: @ 825E293 - .string "I welcome you…\p" - .string "Giggle…\n" - .string "You should thank your lucky stars…\p" - .string "Since you have chosen this room,\n" - .string "all your POKéMON will be restored…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25E311: @ 825E311 - .string "I shall go fetch our master…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25E32E: @ 825E32E - .string "Ah, you’re a lucky one!\n" - .string "I’m in good spirits now.\p" - .string "I will restore two of your POKéMON\n" - .string "to full health!$" - diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc deleted file mode 100644 index 4f0d4632b..000000000 --- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc +++ /dev/null @@ -1,43 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom2_MapScripts:: @ 825E392 - map_script 2, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D - map_script 4, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE - .byte 0 - -BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D: @ 825E39D - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7 - .2byte 0 - -BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7:: @ 825E3A7 - delay 16 - applymovement 1, BattleFrontier_BattlePikeRandomRoom2_Movement_25E3DB - waitmovement 0 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 3 - special sub_81A1780 - lockall - msgbox BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2, 4 - closemessage - releaseall - warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 - waitstate - end - -BattleFrontier_BattlePikeRandomRoom2_Movement_25E3DB: @ 825E3DB - walk_down - walk_down - step_end - -BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE: @ 825E3DE - map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3E8 - .2byte 0 - -BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3E8:: @ 825E3E8 - setvar VAR_TEMP_4, 1 - turnobject 255, 2 - end - -BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2: @ 825E3F2 - .string "Congratulations…\n" - .string "Now, this way, please…$" - diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc deleted file mode 100644 index 9256764e8..000000000 --- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc +++ /dev/null @@ -1,50 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom3_MapScripts:: @ 825E41A - map_script 5, BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A - map_script 2, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A - map_script 4, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466 - .byte 0 - -BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A: @ 825E42A - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_25E43C - map_script_2 VAR_TEMP_1, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_25E44A - .2byte 0 - -BattleFrontier_BattlePikeRandomRoom3_EventScript_25E43C:: @ 825E43C - setvar VAR_TEMP_0, 1 - setvar VAR_0x8004, 6 - special sub_81A703C - end - -BattleFrontier_BattlePikeRandomRoom3_EventScript_25E44A:: @ 825E44A - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 4 - special sub_81A1780 - warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 - waitstate - end - -BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466: @ 825E466 - map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_25E470 - .2byte 0 - -BattleFrontier_BattlePikeRandomRoom3_EventScript_25E470:: @ 825E470 - setvar VAR_TEMP_4, 1 - turnobject 255, 2 - end - -BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A: @ 825E47A - call BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4271 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 5 - special sub_81A1780 - compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3 - compare VAR_RESULT, 3 - goto_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3 - end - -BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3:: @ 825E4A3 - setvar VAR_TEMP_1, 1 - end - diff --git a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc b/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc deleted file mode 100644 index a4725036b..000000000 --- a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc +++ /dev/null @@ -1,393 +0,0 @@ -BattleFrontier_BattlePikeThreePathRoom_MapScripts:: @ 825C843 - map_script 5, BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E - map_script 2, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853 - map_script 4, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D - .byte 0 - -BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853: @ 825C853 - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891 - map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C89A - map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4 - map_script_2 VAR_TEMP_5, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78 - map_script_2 VAR_TEMP_5, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97 - .2byte 0 - -BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D: @ 825C87D - map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887 - .2byte 0 - -BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887:: @ 825C887 - setvar VAR_TEMP_4, 1 - turnobject 255, 2 - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891:: @ 825C891 - setvar VAR_0x8004, 0 - special sub_81A1780 - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_25C89A:: @ 825C89A - warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 - waitstate - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4 - lockall - message BattleFrontier_BattlePikeThreePathRoom_Text_25CD75 - waitmessage - setvar VAR_0x8004, 8 - setvar VAR_0x8005, 1 - special sub_81A703C - playse SE_SAVE - waitse - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_TEMP_0, 255 - special SavePlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 - special sub_81A1780 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CDDA, 4 - closemessage - releaseall - setvar VAR_0x8004, 5 - special sub_81A1780 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 99 - special sub_81A1780 - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908:: @ 825C908 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special sub_81A1780 - switch VAR_RESULT - case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C968 - case 3, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C978 - case 5, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C988 - case 7, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C998 - case 9, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9A8 - case 11, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9B8 - case 13, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9C8 - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_25C968:: @ 825C968 - lock - faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CBDD, 4 - goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_25C978:: @ 825C978 - lock - faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC00, 4 - goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_25C988:: @ 825C988 - lock - faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC23, 4 - goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_25C998:: @ 825C998 - lock - faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC46, 4 - goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9A8:: @ 825C9A8 - lock - faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC69, 4 - goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9B8:: @ 825C9B8 - lock - faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC8C, 4 - goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9C8:: @ 825C9C8 - lock - faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCB0, 4 - goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8:: @ 825C9D8 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCD4, 5 - switch VAR_RESULT - case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A - case 127, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A - release - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD - setvar VAR_0x8004, 6 - special sub_81A1780 - message BattleFrontier_BattlePikeThreePathRoom_Text_25CE08 - waitmessage - special LoadPlayerParty - setvar VAR_0x8004, 8 - setvar VAR_0x8005, 2 - special sub_81A703C - playse SE_SAVE - waitse - fadescreen 1 - setvar VAR_0x8004, 4 - special sub_81A1780 - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A:: @ 825CA2A - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCFB, 5 - switch VAR_RESULT - case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD - case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A - case 127, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A - release - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A:: @ 825CA5A - message BattleFrontier_BattlePikeThreePathRoom_Text_25CD3C - waitmessage - multichoicedefault 20, 8, 94, 1, 0 - switch VAR_RESULT - case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222 - release - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78:: @ 825CA78 - setvar VAR_0x8004, 17 - special sub_81A703C - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91 - setvar VAR_TEMP_5, 255 - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91:: @ 825CA91 - setvar VAR_TEMP_5, 1 - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97:: @ 825CA97 - applymovement 2, BattleFrontier_BattlePikeThreePathRoom_Movement_25CBCE - waitmovement 0 - lockall - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D094, 4 - releaseall - applymovement 2, BattleFrontier_BattlePikeThreePathRoom_Movement_25CBD5 - waitmovement 0 - setvar VAR_TEMP_5, 255 - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB:: @ 825CABB - setvar VAR_0x8004, 19 - special sub_81A703C - compare VAR_RESULT, 4 - goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2 - lock - faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CE69, 5 - switch VAR_RESULT - case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB0A - case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00 - case 127, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00 - release - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00:: @ 825CB00 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CEBB, 4 - release - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB0A:: @ 825CB0A - setvar VAR_0x8004, 18 - special sub_81A703C - switch VAR_RESULT - case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB39 - case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB46 - case 2, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB53 - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB39:: @ 825CB39 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CF64, 4 - goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60 - -BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB46:: @ 825CB46 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CF23, 4 - goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60 - -BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB53:: @ 825CB53 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CEE3, 4 - goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60 - -BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60:: @ 825CB60 - setvar VAR_0x8004, 19 - special sub_81A703C - switch VAR_RESULT - case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB9A - case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBA4 - case 2, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBAE - case 3, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBB8 - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB9A:: @ 825CB9A - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D054, 4 - release - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBA4:: @ 825CBA4 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D017, 4 - release - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBAE:: @ 825CBAE - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CFA3, 4 - release - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBB8:: @ 825CBB8 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CFE5, 4 - release - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2:: @ 825CBC2 - lock - faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D125, 4 - release - end - -BattleFrontier_BattlePikeThreePathRoom_Movement_25CBCE: @ 825CBCE - walk_left - walk_left - walk_down - walk_down - walk_down - walk_down - step_end - -BattleFrontier_BattlePikeThreePathRoom_Movement_25CBD5: @ 825CBD5 - walk_up - walk_up - walk_up - walk_up - walk_right - walk_right - face_down - step_end - -BattleFrontier_BattlePikeThreePathRoom_Text_25CBDD: @ 825CBDD - .string "You are currently in\n" - .string "the 1st room…$" - -BattleFrontier_BattlePikeThreePathRoom_Text_25CC00: @ 825CC00 - .string "You are currently in\n" - .string "the 3rd room…$" - -BattleFrontier_BattlePikeThreePathRoom_Text_25CC23: @ 825CC23 - .string "You are currently in\n" - .string "the 5th room…$" - -BattleFrontier_BattlePikeThreePathRoom_Text_25CC46: @ 825CC46 - .string "You are currently in\n" - .string "the 7th room…$" - -BattleFrontier_BattlePikeThreePathRoom_Text_25CC69: @ 825CC69 - .string "You are currently in\n" - .string "the 9th room…$" - -BattleFrontier_BattlePikeThreePathRoom_Text_25CC8C: @ 825CC8C - .string "You are currently in\n" - .string "the 11th room…$" - -BattleFrontier_BattlePikeThreePathRoom_Text_25CCB0: @ 825CCB0 - .string "You are currently in\n" - .string "the 13th room…$" - -BattleFrontier_BattlePikeThreePathRoom_Text_25CCD4: @ 825CCD4 - .string "Will you continue with\n" - .string "your challenge?$" - -BattleFrontier_BattlePikeThreePathRoom_Text_25CCFB: @ 825CCFB - .string "Would you like to save your challenge\n" - .string "and quit the game for now?$" - -BattleFrontier_BattlePikeThreePathRoom_Text_25CD3C: @ 825CD3C - .string "Do you wish to retire from your\n" - .string "Battle Choice challenge?$" - -BattleFrontier_BattlePikeThreePathRoom_Text_25CD75: @ 825CD75 - .string "We’ve been awaiting your return…\p" - .string "Before resuming your Battle Choice\n" - .string "challenge, let me save the game…$" - -BattleFrontier_BattlePikeThreePathRoom_Text_25CDDA: @ 825CDDA - .string "Please do enjoy your Battle Choice\n" - .string "challenge…$" - -BattleFrontier_BattlePikeThreePathRoom_Text_25CE08: @ 825CE08 - .string "I am saving your data…\n" - .string "A little time, please…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25CE36: @ 825CE36 -BattleFrontier_BattlePikeRandomRoom3_Text_25CE36: @ 825CE36 -BattleFrontier_BattlePikeThreePathRoom_Text_25CE36: @ 825CE36 - .string "The path is blocked!\n" - .string "And there is no turning back…$" - -BattleFrontier_BattlePikeThreePathRoom_Text_25CE69: @ 825CE69 - .string "I beg your pardon, but…\p" - .string "Are you perhaps finding it difficult\n" - .string "to choose your path?$" - -BattleFrontier_BattlePikeThreePathRoom_Text_25CEBB: @ 825CEBB - .string "I see…\n" - .string "I apologize for my impertinence…$" - -BattleFrontier_BattlePikeThreePathRoom_Text_25CEE3: @ 825CEE3 - .string "Ah, let me see… There is something\n" - .string "about the path on the right…$" - -BattleFrontier_BattlePikeThreePathRoom_Text_25CF23: @ 825CF23 - .string "Ah, let me see… There is something\n" - .string "about the path in the center…$" - -BattleFrontier_BattlePikeThreePathRoom_Text_25CF64: @ 825CF64 - .string "Ah, let me see… There is something\n" - .string "about the path on the left…$" - -BattleFrontier_BattlePikeThreePathRoom_Text_25CFA3: @ 825CFA3 - .string "It seems to have the distinct aroma\n" - .string "of POKéMON wafting around it…$" - -BattleFrontier_BattlePikeThreePathRoom_Text_25CFE5: @ 825CFE5 - .string "Is it… A TRAINER?\n" - .string "I sense the presence of people…$" - -BattleFrontier_BattlePikeThreePathRoom_Text_25D017: @ 825D017 - .string "I seem to have heard something…\n" - .string "It may have been whispering…$" - -BattleFrontier_BattlePikeThreePathRoom_Text_25D054: @ 825D054 - .string "For some odd reason, I felt a wave\n" - .string "of nostalgia coming from it…$" - -BattleFrontier_BattlePikeThreePathRoom_Text_25D094: @ 825D094 - .string "I am sorry to say…\p" - .string "A terrifying event, yes, a horrible one,\n" - .string "is about to befall you…\p" - .string "I urge you to pay the utmost care\n" - .string "and prepare for the worst…$" - -BattleFrontier_BattlePikeThreePathRoom_Text_25D125: @ 825D125 - .string "From every path I sense a dreadful\n" - .string "presence…$" diff --git a/data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc b/data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc deleted file mode 100644 index 5bb6a87e0..000000000 --- a/data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc +++ /dev/null @@ -1,764 +0,0 @@ -BattleFrontier_BattlePointExchangeServiceCorner_MapScripts:: @ 825F070 - .byte 0 - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F071:: @ 825F071 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F7FA, 4 - special sub_813A958 - return - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D:: @ 825F07D - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF12, 4 - special sub_813A988 - release - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A:: @ 825F08A - specialvar VAR_TEMP_1, sub_813AA04 - compare VAR_TEMP_1, VAR_0x8008 - goto_if 4, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0C9 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE86, 4 - compare VAR_TEMP_2, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 - compare VAR_TEMP_2, 1 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E - compare VAR_TEMP_2, 2 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0C9:: @ 825F0C9 - compare VAR_TEMP_2, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5 - compare VAR_TEMP_2, 1 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5:: @ 825F0E5 - checkdecorspace VAR_0x8009 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D - copyvar VAR_0x8004, VAR_0x8008 - special sub_813A9A4 - givedecoration VAR_0x8009 - special sub_813A8FC - playse SE_REGI - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE45, 4 - compare VAR_TEMP_2, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D:: @ 825F11D - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEB9, 4 - special sub_813A988 - release - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A:: @ 825F12A - checkitemspace VAR_0x8009, 1 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F166 - copyvar VAR_0x8004, VAR_0x8008 - special sub_813A9A4 - giveitem VAR_0x8009, 1 - special sub_813A8FC - playse SE_REGI - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE72, 4 - compare VAR_TEMP_2, 2 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F166:: @ 825F166 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEE3, 4 - special sub_813A988 - release - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173:: @ 825F173 - lock - faceplayer - setvar VAR_TEMP_2, 0 - call BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F071 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185:: @ 825F185 - setvar VAR_0x8004, 3 - special sub_813AA18 - special sub_813A128 - waitstate - special sub_813AA44 - switch VAR_RESULT - case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E - case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241 - case 2, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F264 - case 3, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F287 - case 4, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2AA - case 5, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2CD - case 6, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2F0 - case 7, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F313 - case 8, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F336 - case 9, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F359 - case 10, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D - case 127, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E:: @ 825F21E - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8B6, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 - setvar VAR_0x8008, 16 - setvar VAR_0x8009, 75 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241:: @ 825F241 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8E6, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 - setvar VAR_0x8008, 32 - setvar VAR_0x8009, 103 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F264:: @ 825F264 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F917, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 - setvar VAR_0x8008, 32 - setvar VAR_0x8009, 87 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F287:: @ 825F287 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F949, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 - setvar VAR_0x8008, 48 - setvar VAR_0x8009, 79 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2AA:: @ 825F2AA - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F979, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 - setvar VAR_0x8008, 48 - setvar VAR_0x8009, 84 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2CD:: @ 825F2CD - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9A9, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 - setvar VAR_0x8008, 48 - setvar VAR_0x8009, 85 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2F0:: @ 825F2F0 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9DB, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 - setvar VAR_0x8008, 48 - setvar VAR_0x8009, 86 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F313:: @ 825F313 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA0A, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 - setvar VAR_0x8008, 80 - setvar VAR_0x8009, 80 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F336:: @ 825F336 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA3D, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 - setvar VAR_0x8008, 80 - setvar VAR_0x8009, 81 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F359:: @ 825F359 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA70, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 - setvar VAR_0x8008, 80 - setvar VAR_0x8009, 82 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C:: @ 825F37C - lock - faceplayer - setvar VAR_TEMP_2, 1 - call BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F071 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E:: @ 825F38E - setvar VAR_0x8004, 4 - special sub_813AA18 - special sub_813A128 - waitstate - special sub_813AA44 - switch VAR_RESULT - case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0 - case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413 - case 2, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F436 - case 3, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F459 - case 4, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F47C - case 5, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D - case 127, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0:: @ 825F3F0 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAA2, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E - setvar VAR_0x8008, 128 - setvar VAR_0x8009, 113 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413:: @ 825F413 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAD2, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E - setvar VAR_0x8008, 128 - setvar VAR_0x8009, 111 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F436:: @ 825F436 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB03, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E - setvar VAR_0x8008, 256 - setvar VAR_0x8009, 114 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F459:: @ 825F459 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB35, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E - setvar VAR_0x8008, 256 - setvar VAR_0x8009, 115 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F47C:: @ 825F47C - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB68, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E - setvar VAR_0x8008, 256 - setvar VAR_0x8009, 116 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F:: @ 825F49F - lock - faceplayer - setvar VAR_TEMP_2, 2 - call BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F071 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1:: @ 825F4B1 - setvar VAR_0x8004, 5 - special sub_813AA18 - special sub_813A128 - waitstate - special sub_813AA44 - switch VAR_RESULT - case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E - case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541 - case 2, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F564 - case 3, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F587 - case 4, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5AA - case 5, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5CD - case 6, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D - case 127, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E:: @ 825F51E - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB9B, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 - setvar VAR_0x8008, 1 - setvar VAR_0x8009, 64 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541:: @ 825F541 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBC7, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 - setvar VAR_0x8008, 1 - setvar VAR_0x8009, 67 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F564:: @ 825F564 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBF3, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 - setvar VAR_0x8008, 1 - setvar VAR_0x8009, 65 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F587:: @ 825F587 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC1C, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 - setvar VAR_0x8008, 1 - setvar VAR_0x8009, 70 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5AA:: @ 825F5AA - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC45, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 - setvar VAR_0x8008, 1 - setvar VAR_0x8009, 66 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5CD:: @ 825F5CD - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC70, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 - setvar VAR_0x8008, 1 - setvar VAR_0x8009, 63 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0:: @ 825F5F0 - lock - faceplayer - setvar VAR_TEMP_2, 3 - call BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F071 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602:: @ 825F602 - setvar VAR_0x8004, 6 - special sub_813AA18 - special sub_813A128 - waitstate - special sub_813AA44 - switch VAR_RESULT - case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690 - case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3 - case 2, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6D6 - case 3, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6F9 - case 4, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F71C - case 5, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F73F - case 6, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F762 - case 7, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F785 - case 8, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7A8 - case 9, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D - case 127, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690:: @ 825F690 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE17, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 - setvar VAR_0x8008, 48 - setvar VAR_0x8009, 200 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3:: @ 825F6B3 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCCB, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 - setvar VAR_0x8008, 48 - setvar VAR_0x8009, 180 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6D6:: @ 825F6D6 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCFA, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 - setvar VAR_0x8008, 48 - setvar VAR_0x8009, 183 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6F9:: @ 825F6F9 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD29, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 - setvar VAR_0x8008, 48 - setvar VAR_0x8009, 185 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F71C:: @ 825F71C - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC9A, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 - setvar VAR_0x8008, 64 - setvar VAR_0x8009, 179 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F73F:: @ 825F73F - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD59, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 - setvar VAR_0x8008, 64 - setvar VAR_0x8009, 186 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F762:: @ 825F762 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD89, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 - setvar VAR_0x8008, 64 - setvar VAR_0x8009, 187 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F785:: @ 825F785 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDB9, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 - setvar VAR_0x8008, 64 - setvar VAR_0x8009, 196 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7A8:: @ 825F7A8 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDE8, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 - setvar VAR_0x8008, 64 - setvar VAR_0x8009, 198 - goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB:: @ 825F7CB - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_260099, 2 - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4:: @ 825F7D4 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_26002E, 2 - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD:: @ 825F7DD - lock - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FFD0, 4 - release - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8:: @ 825F7E8 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF5D, 2 - end - -BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1:: @ 825F7F1 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_26012D, 2 - end - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25F7FA: @ 825F7FA - .string "Hello, this is the EXCHANGE SERVICE\n" - .string "CORNER.\p" - .string "We exchange the Battle Points you\n" - .string "have collected for lovely prizes.\p" - .string "Please choose a prize from this list.$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25F890: @ 825F890 - .string "Please choose a prize from this list.$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8B6: @ 825F8B6 - .string "You’ve chosen the KISS POSTER.\n" - .string "Is that correct?$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8E6: @ 825F8E6 - .string "You’ve chosen the KISS CUSHION.\n" - .string "Is that correct?$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25F917: @ 825F917 - .string "You’ve chosen the SMOOCHUM DOLL.\n" - .string "Is that correct?$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25F949: @ 825F949 - .string "You’ve chosen the TOGEPI DOLL.\n" - .string "Is that correct?$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25F979: @ 825F979 - .string "You’ve chosen the MEOWTH DOLL.\n" - .string "Is that correct?$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9A9: @ 825F9A9 - .string "You’ve chosen the CLEFAIRY DOLL.\n" - .string "Is that correct?$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9DB: @ 825F9DB - .string "You’ve chosen the DITTO DOLL.\n" - .string "Is that correct?$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA0A: @ 825FA0A - .string "You’ve chosen the CYNDAQUIL DOLL.\n" - .string "Is that correct?$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA3D: @ 825FA3D - .string "You’ve chosen the CHIKORITA DOLL.\n" - .string "Is that correct?$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA70: @ 825FA70 - .string "You’ve chosen the TOTODILE DOLL.\n" - .string "Is that correct?$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAA2: @ 825FAA2 - .string "You’ve chosen the LAPRAS DOLL.\n" - .string "Is that correct?$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAD2: @ 825FAD2 - .string "You’ve chosen the SNORLAX DOLL.\n" - .string "Is that correct?$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB03: @ 825FB03 - .string "You’ve chosen the VENUSAUR DOLL.\n" - .string "Is that correct?$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB35: @ 825FB35 - .string "You’ve chosen the CHARIZARD DOLL.\n" - .string "Is that correct?$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB68: @ 825FB68 - .string "You’ve chosen the BLASTOISE DOLL.\n" - .string "Is that correct?$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB9B: @ 825FB9B - .string "You’ve chosen the PROTEIN.\n" - .string "Is that correct?$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBC7: @ 825FBC7 - .string "You’ve chosen the CALCIUM.\n" - .string "Is that correct?$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBF3: @ 825FBF3 - .string "You’ve chosen the IRON.\n" - .string "Is that correct?$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC1C: @ 825FC1C - .string "You’ve chosen the ZINC.\n" - .string "Is that correct?$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC45: @ 825FC45 - .string "You’ve chosen the CARBOS.\n" - .string "Is that correct?$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC70: @ 825FC70 - .string "You’ve chosen the HP UP.\n" - .string "Is that correct?$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC9A: @ 825FC9A - .string "You’ve chosen the BRIGHTPOWDER.\n" - .string "Is that correct?$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCCB: @ 825FCCB - .string "You’ve chosen the WHITE HERB.\n" - .string "Is that correct?$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCFA: @ 825FCFA - .string "You’ve chosen the QUICK CLAW.\n" - .string "Is that correct?$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD29: @ 825FD29 - .string "You’ve chosen the MENTAL HERB.\n" - .string "Is that correct?$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD59: @ 825FD59 - .string "You’ve chosen the CHOICE BAND.\n" - .string "Is that correct?$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD89: @ 825FD89 - .string "You’ve chosen the KING’S ROCK.\n" - .string "Is that correct?$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDB9: @ 825FDB9 - .string "You’ve chosen the FOCUS BAND.\n" - .string "Is that correct?$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDE8: @ 825FDE8 - .string "You’ve chosen the SCOPE LENS.\n" - .string "Is that correct?$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE17: @ 825FE17 - .string "You’ve chosen the LEFTOVERS.\n" - .string "Is that correct?$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE45: @ 825FE45 - .string "Thank you!\n" - .string "We’ll send it to your PC at home.$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE72: @ 825FE72 - .string "Here is your prize!$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE86: @ 825FE86 - .string "I’m so sorry…\n" - .string "You don’t have enough Battle Points…$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEB9: @ 825FEB9 - .string "I’m so sorry…\n" - .string "Your PC appears to be full…$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEE3: @ 825FEE3 - .string "I’m so sorry…\n" - .string "You don’t have space to hold it…$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF12: @ 825FF12 - .string "Thank you very much.\p" - .string "Please visit us when you have\n" - .string "saved up Battle Points.$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF5D: @ 825FF5D - .string "Oh, they’re so nice!\n" - .string "I wish I had them!\l" - .string "Cute cushions!\l" - .string "Big plush DOLLS!\l" - .string "Little plush DOLLS!\l" - .string "I wish I had them all!$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_25FFD0: @ 825FFD0 - .string "Leave it to your mommy!\p" - .string "If it’s anything you want, I’ll go\n" - .string "through anything to get it, honey!$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_26002E: @ 826002E - .string "If I can get hold of the items here,\n" - .string "my POKéMON will get tougher.\p" - .string "You bet they will!\n" - .string "No question about it!$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_260099: @ 8260099 - .string "Hah?\n" - .string "What are you gawking at?\p" - .string "I don’t like you staring at my plush\n" - .string "doll like that.\p" - .string "If you want it, go get one yourself!\n" - .string "Isn’t that right, SMOOCHUM?$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_26012D: @ 826012D - .string "Did you know?\p" - .string "If you stretch your record at any of\n" - .string "the BATTLE facilities, they start\l" - .string "giving you more and more Battle Points.$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_2601AA:: @ 82601AA - .string "A large poster with a SMOOCHUM print.$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_2601D0:: @ 82601D0 - .string "A SMOOCHUM cushion.\n" - .string "Place it on a mat or a desk.$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_260201:: @ 8260201 - .string "A SMOOCHUM DOLL.\n" - .string "Place it on a mat or a desk.$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_26022F:: @ 826022F - .string "A TOGEPI DOLL.\n" - .string "Place it on a mat or a desk.$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_26025B:: @ 826025B - .string "A MEOWTH DOLL.\n" - .string "Place it on a mat or a desk.$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_260287:: @ 8260287 - .string "A CLEFAIRY DOLL.\n" - .string "Place it on a mat or a desk.$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_2602B5:: @ 82602B5 - .string "A DITTO DOLL.\n" - .string "Place it on a mat or a desk.$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_2602E0:: @ 82602E0 - .string "A CYNDAQUIL DOLL.\n" - .string "Place it on a mat or a desk.$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_26030F:: @ 826030F - .string "A CHIKORITA DOLL.\n" - .string "Place it on a mat or a desk.$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_26033E:: @ 826033E - .string "A TOTODILE DOLL.\n" - .string "Place it on a mat or a desk.$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C:: @ 826036C - .string "A large DOLL.\n" - .string "Place it on a mat or a desk.$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_260397:: @ 8260397 - .string "Raises the stat ATTACK of one\n" - .string "POKéMON.$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_2603BE:: @ 82603BE - .string "Raises the stat SP. ATK of one\n" - .string "POKéMON.$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_2603E6:: @ 82603E6 - .string "Raises the stat DEFENSE of one\n" - .string "POKéMON.$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_26040E:: @ 826040E - .string "Raises the stat SP. DEF of one\n" - .string "POKéMON.$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_260436:: @ 8260436 - .string "Raises the stat SPEED of one\n" - .string "POKéMON.$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_26045C:: @ 826045C - .string "Raises the HP of one POKéMON.$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_26047A:: @ 826047A - .string "A hold item that gradually restores\n" - .string "HP in battle.$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_2604AC:: @ 82604AC - .string "A hold item that restores any\n" - .string "lowered stat.$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_2604D8:: @ 82604D8 - .string "A hold item that occasionally allows\n" - .string "the first strike.$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_26050F:: @ 826050F - .string "A hold item that snaps POKéMON out\n" - .string "of infatuation.$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_260542:: @ 8260542 - .string "A hold item that casts a glare to\n" - .string "reduce accuracy.$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_260575:: @ 8260575 - .string "Raises a move’s power, but permits\n" - .string "only that move.$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_2605A8:: @ 82605A8 - .string "A hold item that may cause flinching\n" - .string "when the foe is hit.$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_2605E2:: @ 82605E2 - .string "A hold item that occasionally\n" - .string "prevents fainting.$" - -BattleFrontier_BattlePointExchangeServiceCorner_Text_260613:: @ 8260613 - .string "A hold item that raises the\n" - .string "critical-hit rate.$" diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc deleted file mode 100644 index eacee4cf3..000000000 --- a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc +++ /dev/null @@ -1,784 +0,0 @@ -BattleFrontier_BattlePyramidEmptySquare_MapScripts:: @ 8252A33 - map_script 5, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2 - map_script 2, BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43 - map_script 3, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA - .byte 0 - -BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43: @ 8252A43 - map_script_2 VAR_TEMP_D, 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D - map_script_2 VAR_TEMP_E, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98 - map_script_2 VAR_TEMP_F, 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A8F - .2byte 0 - -BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D:: @ 8252A5D - lockall - setvar VAR_0x8004, 13 - setvar VAR_0x8005, 4 - setvar VAR_0x8006, 1 - setvar VAR_0x8007, 55 - setvar VAR_RESULT, 0 - -BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77:: @ 8252A77 - special sub_81A8E7C - delay 2 - compare VAR_RESULT, 2 - goto_if 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77 - setvar VAR_TEMP_D, 0 - releaseall - end - -BattleFrontier_BattlePyramidEmptySquare_EventScript_252A8F:: @ 8252A8F - special ShowMapNamePopup - setvar VAR_TEMP_F, 0 - end - -BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98:: @ 8252A98 - playbgm MUS_PYRAMID, 0 - setvar VAR_TEMP_E, 1 - end - -BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2 - setvar VAR_0x8004, 15 - special sub_81A8E7C - setvar VAR_0x8004, 0 - special sub_81A1780 - switch VAR_TEMP_0 - case 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D - case 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66 - case 2, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 5 - special sub_81A1780 - compare VAR_RESULT, 4 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 - compare VAR_RESULT, 5 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 - compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 - compare VAR_RESULT, 3 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 - compare VAR_RESULT, 9 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 - setvar VAR_0x8004, 14 - setvar VAR_0x8005, 8 - special sub_81A1780 - setvar VAR_TEMP_D, 1 - -BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39:: @ 8252B39 - setvar VAR_0x8004, 17 - special sub_81A8E7C - end - -BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42:: @ 8252B42 -BattleFrontier_BattlePyramidTop_EventScript_252B42:: @ 8252B42 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 4 - special sub_81A1780 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 7 - setvar VAR_0x8006, 255 - special sub_81A8E7C - -BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66:: @ 8252B66 -BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66 - setvar VAR_0x8004, 13 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special sub_81A8E7C - setvar VAR_0x8004, 14 - special sub_81A8E7C - special HealPlayerParty - warpsilent MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13 - waitstate - end - -BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 1 - special sub_81A8E7C - special SavePlayerParty - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_0x8004, 9 - special sub_81A8E7C - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 - special sub_81A1780 - setvar VAR_TEMP_F, 1 - end - -BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA: @ 8252BCA - call BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5 - setvar VAR_TEMP_F, 1 - end - -BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5:: @ 8252BD5 - setvar VAR_0x8004, 13 - setvar VAR_0x8005, 32 - setvar VAR_0x8006, 0 - special sub_81A8E7C - return - -BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8 - call BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special sub_81A1780 - addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 - compare VAR_RESULT, 7 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45 - setvar VAR_0x8004, 6 - special sub_81A8E7C - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_RESULT, 0 - warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1 - waitstate - end - -BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45 - warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP, 255, 17, 17 - waitstate - end - -BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F:: @ 8252C4F - trainerbattle 9, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D - setvar VAR_0x8004, 10 - special sub_81A8E7C - waitmessage - waitbuttonpress - closemessage - releaseall - end - -BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A:: @ 8252C6A - setvar VAR_0x8004, 7 - special sub_81A8E7C - callstd 1 - compare VAR_0x8007, 0 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87 - setvar VAR_0x8004, 8 - special sub_81A8E7C - -BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87:: @ 8252C87 - end - -BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88:: @ 8252C88 - goto BattleFrontier_BattlePyramidTop_EventScript_252B42 - -BattleFrontier_BattlePyramidEmptySquare_Text_252C8D: @ 8252C8D - .string "This is a sample message.$" - -gText_BattlePyramidConfirmRest:: @ 8252CA7 - .string "Your BATTLE PYRAMID quest will be\n" - .string "saved so that you may quit for now.\l" - .string "Is that okay?$" - -gText_BattlePyramidConfirmRetire:: @ 8252CFB - .string "Are you sure you want to quit your\n" - .string "PYRAMID quest?$" - -BattleFrontier_BattlePyramidEmptySquare_Text_252D2D:: @ 8252D2D - .string "This floor’s exit is in\n" - .string "that direction: {UP_ARROW}$" - -BattleFrontier_BattlePyramidEmptySquare_Text_252D57:: @ 8252D57 - .string "This floor’s exit is in\n" - .string "that direction: {LEFT_ARROW}$" - -BattleFrontier_BattlePyramidEmptySquare_Text_252D81:: @ 8252D81 - .string "This floor’s exit is in\n" - .string "that direction: {RIGHT_ARROW}$" - -BattleFrontier_BattlePyramidEmptySquare_Text_252DAB:: @ 8252DAB - .string "This floor’s exit is in\n" - .string "that direction: {DOWN_ARROW}$" - -BattleFrontier_BattlePyramidEmptySquare_Text_252DD5:: @ 8252DD5 - .string "The exit on this floor is in\n" - .string "the {UP_ARROW} direction.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_252E03:: @ 8252E03 - .string "The exit on this floor is in\n" - .string "the {LEFT_ARROW} direction.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_252E31:: @ 8252E31 - .string "The exit on this floor is in\n" - .string "the {RIGHT_ARROW} direction.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_252E5F:: @ 8252E5F - .string "The exit on this floor is in\n" - .string "the {DOWN_ARROW} direction.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_252E8D:: @ 8252E8D - .string "The exit is over\n" - .string "that {UP_ARROW} way.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_252EAA:: @ 8252EAA - .string "The exit is over\n" - .string "that {LEFT_ARROW} way.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_252EC7:: @ 8252EC7 - .string "The exit is over\n" - .string "that {RIGHT_ARROW} way.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_252EE4:: @ 8252EE4 - .string "The exit is over\n" - .string "that {DOWN_ARROW} way.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_252F01:: @ 8252F01 - .string "On this floor, the exit is somewhere\n" - .string "in the {UP_ARROW} direction.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_252F3A:: @ 8252F3A - .string "On this floor, the exit is somewhere\n" - .string "in the {LEFT_ARROW} direction.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_252F73:: @ 8252F73 - .string "On this floor, the exit is somewhere\n" - .string "in the {RIGHT_ARROW} direction.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_252FAC:: @ 8252FAC - .string "On this floor, the exit is somewhere\n" - .string "in the {DOWN_ARROW} direction.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_252FE5:: @ 8252FE5 - .string "The exit?\n" - .string "It’s that {UP_ARROW} way.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253000:: @ 8253000 - .string "The exit?\n" - .string "It’s that {LEFT_ARROW} way.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_25301B:: @ 825301B - .string "The exit?\n" - .string "It’s that {RIGHT_ARROW} way.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253036:: @ 8253036 - .string "The exit?\n" - .string "It’s that {DOWN_ARROW} way.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253051:: @ 8253051 - .string "The exit happens to be in\n" - .string "the {UP_ARROW} direction.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_25307C:: @ 825307C - .string "The exit happens to be in\n" - .string "the {LEFT_ARROW} direction.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_2530A7:: @ 82530A7 - .string "The exit happens to be in\n" - .string "the {RIGHT_ARROW} direction.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_2530D2:: @ 82530D2 - .string "The exit happens to be in\n" - .string "the {DOWN_ARROW} direction.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_2530FD:: @ 82530FD - .string "Are you looking for items?\p" - .string "There are eight items left to\n" - .string "be found.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253140:: @ 8253140 - .string "Are you looking for items?\p" - .string "There are seven items left to\n" - .string "be found.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253183:: @ 8253183 - .string "Are you looking for items?\p" - .string "There are six items left to\n" - .string "be found.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_2531C4:: @ 82531C4 - .string "Are you looking for items?\p" - .string "There are five items left to\n" - .string "be found.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253206:: @ 8253206 - .string "Are you looking for items?\p" - .string "There are four items left to\n" - .string "be found.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253248:: @ 8253248 - .string "Are you looking for items?\p" - .string "There are three items left to\n" - .string "be found.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_25328B:: @ 825328B - .string "Are you looking for items?\p" - .string "There are two items left to\n" - .string "be found.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_2532CC:: @ 82532CC - .string "Are you looking for items?\p" - .string "There is one item left to\n" - .string "be found.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_25330B:: @ 825330B - .string "Are you looking for items?\p" - .string "There isn’t anything left to\n" - .string "be found!$" - -BattleFrontier_BattlePyramidEmptySquare_Text_25334D:: @ 825334D - .string "Because you won, I’ll tell you\n" - .string "a little secret!\p" - .string "There are eight items\n" - .string "lying around here.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_2533A6:: @ 82533A6 - .string "Because you won, I’ll tell you\n" - .string "a little secret!\p" - .string "There are seven items left\n" - .string "lying around here.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253404:: @ 8253404 - .string "Because you won, I’ll tell you\n" - .string "a little secret!\p" - .string "There are six items left\n" - .string "lying around here.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253460:: @ 8253460 - .string "Because you won, I’ll tell you\n" - .string "a little secret!\p" - .string "There are five items left\n" - .string "lying around here.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_2534BD:: @ 82534BD - .string "Because you won, I’ll tell you\n" - .string "a little secret!\p" - .string "There are four items left\n" - .string "lying around here.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_25351A:: @ 825351A - .string "Because you won, I’ll tell you\n" - .string "a little secret!\p" - .string "There are three items left\n" - .string "lying around here.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253578:: @ 8253578 - .string "Because you won, I’ll tell you\n" - .string "a little secret!\p" - .string "There are two items left\n" - .string "lying around here.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_2535D4:: @ 82535D4 - .string "Because you won, I’ll tell you\n" - .string "a little secret!\p" - .string "There is just one item\n" - .string "lying around here.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_25362E:: @ 825362E - .string "Because you won, I’ll tell you\n" - .string "a little secret!\p" - .string "There isn’t anything left\n" - .string "lying around here.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_25368B:: @ 825368B - .string "How’s your stock of items holding up?\p" - .string "I reckon there are eight items left\n" - .string "waiting to be found on this floor.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_2536F8:: @ 82536F8 - .string "How’s your stock of items holding up?\p" - .string "I reckon there are seven items left\n" - .string "waiting to be found on this floor.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253765:: @ 8253765 - .string "How’s your stock of items holding up?\p" - .string "I reckon there are six items left\n" - .string "waiting to be found on this floor.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_2537D0:: @ 82537D0 - .string "How’s your stock of items holding up?\p" - .string "I reckon there are five items left\n" - .string "waiting to be found on this floor.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_25383C:: @ 825383C - .string "How’s your stock of items holding up?\p" - .string "I reckon there are four items left\n" - .string "waiting to be found on this floor.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_2538A8:: @ 82538A8 - .string "How’s your stock of items holding up?\p" - .string "I reckon there are three items left\n" - .string "waiting to be found on this floor.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253915:: @ 8253915 - .string "How’s your stock of items holding up?\p" - .string "I reckon there are two items left\n" - .string "waiting to be found on this floor.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253980:: @ 8253980 - .string "How’s your stock of items holding up?\p" - .string "I reckon there’s but one item left\n" - .string "waiting to be found on this floor.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_2539EC:: @ 82539EC - .string "How’s your stock of items holding up?\p" - .string "I reckon there are no more items\n" - .string "waiting to be found on this floor.\l" - .string "You take care now!$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253A69:: @ 8253A69 - .string "You’re strong, so you’ve earned\n" - .string "a hint!\p" - .string "There appear to be eight more\n" - .string "items on the ground.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253AC4:: @ 8253AC4 - .string "You’re strong, so you’ve earned\n" - .string "a hint!\p" - .string "There appear to be seven more\n" - .string "items on the ground.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253B1F:: @ 8253B1F - .string "You’re strong, so you’ve earned\n" - .string "a hint!\p" - .string "There appear to be six more\n" - .string "items on the ground.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253B78:: @ 8253B78 - .string "You’re strong, so you’ve earned\n" - .string "a hint!\p" - .string "There appear to be five more\n" - .string "items on the ground.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253BD2:: @ 8253BD2 - .string "You’re strong, so you’ve earned\n" - .string "a hint!\p" - .string "There appear to be four more\n" - .string "items on the ground.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253C2C:: @ 8253C2C - .string "You’re strong, so you’ve earned\n" - .string "a hint!\p" - .string "There appear to be three more\n" - .string "items on the ground.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253C87:: @ 8253C87 - .string "You’re strong, so you’ve earned\n" - .string "a hint!\p" - .string "There appear to be two more\n" - .string "items on the ground.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253CE0:: @ 8253CE0 - .string "You’re strong, so you’ve earned\n" - .string "a hint!\p" - .string "There appears to be only one more\n" - .string "item on the ground.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253D3E:: @ 8253D3E - .string "You’re strong, so you’ve earned\n" - .string "a hint!\p" - .string "There appear to be no more\n" - .string "items on the ground.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253D96:: @ 8253D96 - .string "On this floor of the PYRAMID,\n" - .string "I hear there are eight items…$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253DD2:: @ 8253DD2 - .string "On this floor of the PYRAMID,\n" - .string "I hear there are seven items…$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253E0E:: @ 8253E0E - .string "On this floor of the PYRAMID,\n" - .string "I hear there are six items…$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253E48:: @ 8253E48 - .string "On this floor of the PYRAMID,\n" - .string "I hear there are five items…$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253E83:: @ 8253E83 - .string "On this floor of the PYRAMID,\n" - .string "I hear there are four items…$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253EBE:: @ 8253EBE - .string "On this floor of the PYRAMID,\n" - .string "I hear there are three items…$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253EFA:: @ 8253EFA - .string "On this floor of the PYRAMID,\n" - .string "I hear there are two items…$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253F34:: @ 8253F34 - .string "On this floor of the PYRAMID,\n" - .string "I hear there is one item…$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253F6C:: @ 8253F6C - .string "On this floor of the PYRAMID,\n" - .string "I hear there are no items…$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253FA5:: @ 8253FA5 - .string "Have you collected any items?\p" - .string "I believe there are eight more\n" - .string "items on this floor.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_253FF7:: @ 8253FF7 - .string "Have you collected any items?\p" - .string "I believe there are seven more\n" - .string "items on this floor.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_254049:: @ 8254049 - .string "Have you collected any items?\p" - .string "I believe there are six more\n" - .string "items on this floor.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_254099:: @ 8254099 - .string "Have you collected any items?\p" - .string "I believe there are five more\n" - .string "items on this floor.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_2540EA:: @ 82540EA - .string "Have you collected any items?\p" - .string "I believe there are four more\n" - .string "items on this floor.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_25413B:: @ 825413B - .string "Have you collected any items?\p" - .string "I believe there are three more\n" - .string "items on this floor.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_25418D:: @ 825418D - .string "Have you collected any items?\p" - .string "I believe there are two more\n" - .string "items on this floor.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_2541DD:: @ 82541DD - .string "Have you collected any items?\p" - .string "I believe there is one more\n" - .string "item on this floor.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_25422B:: @ 825422B - .string "Have you collected any items?\p" - .string "I believe there are no more\n" - .string "items on this floor.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_25427A:: @ 825427A - .string "You were really awesome!\p" - .string "But there are still seven tough\n" - .string "TRAINERS other than me!$" - -BattleFrontier_BattlePyramidEmptySquare_Text_2542CB:: @ 82542CB - .string "You were really awesome!\p" - .string "But there are still six tough\n" - .string "TRAINERS other than me!$" - -BattleFrontier_BattlePyramidEmptySquare_Text_25431A:: @ 825431A - .string "You were really awesome!\p" - .string "But there are still five tough\n" - .string "TRAINERS other than me!$" - -BattleFrontier_BattlePyramidEmptySquare_Text_25436A:: @ 825436A - .string "You were really awesome!\p" - .string "But there are still four tough\n" - .string "TRAINERS other than me!$" - -BattleFrontier_BattlePyramidEmptySquare_Text_2543BA:: @ 82543BA - .string "You were really awesome!\p" - .string "But there are still three tough\n" - .string "TRAINERS other than me!$" - -BattleFrontier_BattlePyramidEmptySquare_Text_25440B:: @ 825440B - .string "You were really awesome!\p" - .string "But there are still two tough\n" - .string "TRAINERS other than me!$" - -BattleFrontier_BattlePyramidEmptySquare_Text_25445A:: @ 825445A - .string "You were really awesome!\p" - .string "But there’s still one tough\n" - .string "TRAINER other than me!$" - -BattleFrontier_BattlePyramidEmptySquare_Text_2544A6:: @ 82544A6 - .string "You were really awesome!\p" - .string "There’s no one left that\n" - .string "can beat you!$" - -BattleFrontier_BattlePyramidEmptySquare_Text_2544E6:: @ 82544E6 - .string "This is so upsetting!\p" - .string "But there are seven TRAINERS left!\n" - .string "Someone will humble you!$" - -BattleFrontier_BattlePyramidEmptySquare_Text_254538:: @ 8254538 - .string "This is so upsetting!\p" - .string "But there are six TRAINERS left!\n" - .string "Someone will humble you!$" - -BattleFrontier_BattlePyramidEmptySquare_Text_254588:: @ 8254588 - .string "This is so upsetting!\p" - .string "But there are five TRAINERS left!\n" - .string "Someone will humble you!$" - -BattleFrontier_BattlePyramidEmptySquare_Text_2545D9:: @ 82545D9 - .string "This is so upsetting!\p" - .string "But there are four TRAINERS left!\n" - .string "Someone will humble you!$" - -BattleFrontier_BattlePyramidEmptySquare_Text_25462A:: @ 825462A - .string "This is so upsetting!\p" - .string "But there are three TRAINERS left!\n" - .string "Someone will humble you!$" - -BattleFrontier_BattlePyramidEmptySquare_Text_25467C:: @ 825467C - .string "This is so upsetting!\p" - .string "But there are two TRAINERS left!\n" - .string "Someone will humble you!$" - -BattleFrontier_BattlePyramidEmptySquare_Text_2546CC:: @ 82546CC - .string "This is so upsetting!\p" - .string "But there’s one TRAINER left!\n" - .string "I’m sure you will be humbled!$" - -BattleFrontier_BattlePyramidEmptySquare_Text_25471E:: @ 825471E - .string "This is so upsetting!\p" - .string "But there are no more TRAINERS\n" - .string "who can engage you!$" - -BattleFrontier_BattlePyramidEmptySquare_Text_254767:: @ 8254767 - .string "That’s pretty impressive!\p" - .string "But there are seven more TRAINERS\n" - .string "on this floor. Can you beat them all?$" - -BattleFrontier_BattlePyramidEmptySquare_Text_2547C9:: @ 82547C9 - .string "That’s pretty impressive!\p" - .string "But there are six more TRAINERS\n" - .string "on this floor. Can you beat them all?$" - -BattleFrontier_BattlePyramidEmptySquare_Text_254829:: @ 8254829 - .string "That’s pretty impressive!\p" - .string "But there are five more TRAINERS\n" - .string "on this floor. Can you beat them all?$" - -BattleFrontier_BattlePyramidEmptySquare_Text_25488A:: @ 825488A - .string "That’s pretty impressive!\p" - .string "But there are four more TRAINERS\n" - .string "on this floor. Can you beat them all?$" - -BattleFrontier_BattlePyramidEmptySquare_Text_2548EB:: @ 82548EB - .string "That’s pretty impressive!\p" - .string "But there are three more TRAINERS\n" - .string "on this floor. Can you beat them all?$" - -BattleFrontier_BattlePyramidEmptySquare_Text_25494D:: @ 825494D - .string "That’s pretty impressive!\p" - .string "But there are two more TRAINERS\n" - .string "on this floor. Can you beat them both?$" - -BattleFrontier_BattlePyramidEmptySquare_Text_2549AE:: @ 82549AE - .string "That’s pretty impressive!\p" - .string "But there’s still one more TRAINER\n" - .string "on this floor. Can you prevail?$" - -BattleFrontier_BattlePyramidEmptySquare_Text_254A0B:: @ 8254A0B - .string "That’s pretty impressive!\p" - .string "You’ve gone through all the TRAINERS\n" - .string "on this floor.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_254A59:: @ 8254A59 - .string "Maybe you could sweep through\n" - .string "the seven TRAINERS left on this floor.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_254A9E:: @ 8254A9E - .string "Maybe you could sweep through\n" - .string "the six TRAINERS left on this floor.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_254AE1:: @ 8254AE1 - .string "Maybe you could sweep through\n" - .string "the five TRAINERS left on this floor.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_254B25:: @ 8254B25 - .string "Maybe you could sweep through\n" - .string "the four TRAINERS left on this floor.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_254B69:: @ 8254B69 - .string "Maybe you could sweep through\n" - .string "the three TRAINERS left on this floor.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_254BAE:: @ 8254BAE - .string "Maybe you could sweep through\n" - .string "the two TRAINERS left on this floor.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_254BF1:: @ 8254BF1 - .string "Maybe you could complete your sweep\n" - .string "with the one TRAINER left on this floor.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_254C3E:: @ 8254C3E - .string "There isn’t a single person left who\n" - .string "can defeat you now…$" - -BattleFrontier_BattlePyramidEmptySquare_Text_254C77:: @ 8254C77 - .string "You may have what it takes to beat\n" - .string "the seven expert TRAINERS who remain.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_254CC0:: @ 8254CC0 - .string "You may have what it takes to beat\n" - .string "the six expert TRAINERS who remain.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_254D07:: @ 8254D07 - .string "You may have what it takes to beat\n" - .string "the five expert TRAINERS who remain.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_254D4F:: @ 8254D4F - .string "You may have what it takes to beat\n" - .string "the four expert TRAINERS who remain.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_254D97:: @ 8254D97 - .string "You may have what it takes to beat\n" - .string "the three expert TRAINERS who remain.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_254DE0:: @ 8254DE0 - .string "You may have what it takes to beat\n" - .string "the two expert TRAINERS who remain.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_254E27:: @ 8254E27 - .string "You may have what it takes to beat\n" - .string "the one expert TRAINER who remains.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_254E6E:: @ 8254E6E - .string "Your skills are beyond reproach.\p" - .string "There are no more TRAINERS here\n" - .string "who have any chance of beating you.$" - -BattleFrontier_BattlePyramidEmptySquare_Text_254ED3:: @ 8254ED3 - .string "Can you keep winning against\n" - .string "the seven remaining TRAINERS?$" - -BattleFrontier_BattlePyramidEmptySquare_Text_254F0E:: @ 8254F0E - .string "Can you keep winning against\n" - .string "the six remaining TRAINERS?$" - -BattleFrontier_BattlePyramidEmptySquare_Text_254F47:: @ 8254F47 - .string "Can you keep winning against\n" - .string "the five remaining TRAINERS?$" - -BattleFrontier_BattlePyramidEmptySquare_Text_254F81:: @ 8254F81 - .string "Can you keep winning against\n" - .string "the four remaining TRAINERS?$" - -BattleFrontier_BattlePyramidEmptySquare_Text_254FBB:: @ 8254FBB - .string "Can you keep winning against\n" - .string "the three remaining TRAINERS?$" - -BattleFrontier_BattlePyramidEmptySquare_Text_254FF6:: @ 8254FF6 - .string "Can you keep winning against\n" - .string "the two remaining TRAINERS?$" - -BattleFrontier_BattlePyramidEmptySquare_Text_25502F:: @ 825502F - .string "Can you keep winning against\n" - .string "the last remaining TRAINER?$" - -BattleFrontier_BattlePyramidEmptySquare_Text_255068:: @ 8255068 - .string "There aren’t any TRAINERS left that\n" - .string "can take you on now…$" - diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc b/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc deleted file mode 100644 index 07b9fee47..000000000 --- a/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc +++ /dev/null @@ -1,970 +0,0 @@ -BattleFrontier_BattlePyramidLobby_MapScripts:: @ 8250716 - map_script 2, BattleFrontier_BattlePyramidLobby_MapScript2_250735 - map_script 4, BattleFrontier_BattlePyramidLobby_MapScript2_2497FB - .byte 0 - -BattleFrontier_BattlePyramidLobby_MapScript2_250721: @ 8250721 - map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePyramidLobby_EventScript_25072B - .2byte 0 - -BattleFrontier_BattlePyramidLobby_EventScript_25072B: @ 825072B - setvar VAR_TEMP_1, 1 - turnobject 255, 2 - end - -BattleFrontier_BattlePyramidLobby_MapScript2_250735: @ 8250735 - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePyramidLobby_EventScript_25075F - map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattlePyramidLobby_EventScript_250768 - map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattlePyramidLobby_EventScript_2508AC - map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattlePyramidLobby_EventScript_2507B1 - map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattlePyramidLobby_EventScript_250852 - .2byte 0 - -BattleFrontier_BattlePyramidLobby_EventScript_25075F:: @ 825075F - setvar VAR_0x8004, 0 - special sub_81A1780 - end - -BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768 - lockall - message BattleFrontier_BattlePyramidLobby_Text_2516D6 - waitmessage - playse SE_EXPMAX - waitse - closemessage - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 0 - special sub_81A8E7C - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 0 - special sub_81A8E7C - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_TEMP_0, 255 - releaseall - end - -BattleFrontier_BattlePyramidLobby_EventScript_2507B1:: @ 82507B1 - lockall - setvar VAR_0x8004, 10 - special sub_81A1780 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePyramidLobby_EventScript_2507D2 - msgbox BattleFrontier_BattlePyramidLobby_Text_2517B5, 4 - goto BattleFrontier_BattlePyramidLobby_EventScript_2507DA - -BattleFrontier_BattlePyramidLobby_EventScript_2507D2:: @ 82507D2 - msgbox BattleFrontier_BattlePyramidLobby_Text_2525F4, 4 - -BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA - special sub_81B95E0 - compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattlePyramidLobby_EventScript_250DDB - clearflag FLAG_SPECIAL_FLAG_0x4004 - setvar VAR_0x8004, 8 - special sub_81A1780 - special LoadPlayerParty - setvar VAR_0x8004, 14 - special sub_81A8E7C - special HealPlayerParty - message BattleFrontier_BattlePyramidLobby_Text_2519F8 - waitmessage - playse SE_EXPMAX - waitse - msgbox BattleFrontier_BattlePyramidLobby_Text_252662, 4 - setvar VAR_0x8004, 11 - special sub_81A1780 - msgbox BattleFrontier_BattlePyramidLobby_Text_241520, 9 - message BattleFrontier_BattlePyramidLobby_Text_251A77 - waitmessage - setvar VAR_0x8004, 4 - special sub_81A8E7C - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 0 - special sub_81A8E7C - playse SE_SAVE - waitse - msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, 4 - closemessage - setvar VAR_TEMP_0, 255 - releaseall - end - -BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852 - setvar VAR_0x8004, 8 - special sub_81A1780 - special LoadPlayerParty - setvar VAR_0x8004, 14 - special sub_81A8E7C - special HealPlayerParty - lockall - message BattleFrontier_BattlePyramidLobby_Text_251B5A - waitmessage - playse SE_EXPMAX - waitse - message BattleFrontier_BattlePyramidLobby_Text_251A77 - waitmessage - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 0 - special sub_81A8E7C - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 0 - special sub_81A8E7C - playse SE_SAVE - waitse - msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, 4 - closemessage - setvar VAR_TEMP_0, 255 - releaseall - end - -BattleFrontier_BattlePyramidLobby_EventScript_2508AC:: @ 82508AC - goto BattleFrontier_BattlePyramidLobby_EventScript_250A21 - -BattleFrontier_BattlePyramidLobby_EventScript_2508B1:: @ 82508B1 - lock - faceplayer - setvar VAR_FRONTIER_FACILITY, 6 - setvar VAR_0x40CE, 0 - special SavePlayerParty - msgbox BattleFrontier_BattlePyramidLobby_Text_250F31, 4 - -BattleFrontier_BattlePyramidLobby_EventScript_2508C8:: @ 82508C8 - message BattleFrontier_BattlePyramidLobby_Text_250FA7 - waitmessage - multichoice 17, 6, 23, 0 - switch VAR_RESULT - case 0, BattleFrontier_BattlePyramidLobby_EventScript_250904 - case 1, BattleFrontier_BattlePyramidLobby_EventScript_250A68 - case 2, BattleFrontier_BattlePyramidLobby_EventScript_250AC4 - case 127, BattleFrontier_BattlePyramidLobby_EventScript_250AC4 - -BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904 - message BattleFrontier_BattlePyramidLobby_Text_251248 - waitmessage - multichoice 17, 6, 24, 0 - switch VAR_RESULT - case 2, BattleFrontier_BattlePyramidLobby_EventScript_250AC4 - case 127, BattleFrontier_BattlePyramidLobby_EventScript_250AC4 - setvar VAR_0x8004, 15 - special sub_81A1780 - compare VAR_0x8004, 1 - goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250A75 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 - msgbox BattleFrontier_BattlePyramidLobby_Text_251297, 4 - fadescreen 1 - call BattleFrontier_BattlePyramidLobby_EventScript_23F2B7 - copyvar VAR_0x8004, VAR_RESULT - setvar VAR_0x8005, 3 - special sub_80F9490 - waitstate - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250AC1 - msgbox BattleFrontier_BattlePyramidLobby_Text_2514E6, 5 - switch VAR_RESULT - case 0, BattleFrontier_BattlePyramidLobby_EventScript_250AC1 - case 1, BattleFrontier_BattlePyramidLobby_EventScript_2509A5 - case 127, BattleFrontier_BattlePyramidLobby_EventScript_250AC1 - -BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5 - setvar VAR_TEMP_0, 0 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 4 - special sub_81A1780 - setvar VAR_0x8004, 0 - special sub_81A8E7C - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 1 - special sub_81A8E7C - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 1 - special sub_81A1780 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_0x8004, 6 - special sub_81A8E7C - setvar VAR_0x8004, 9 - special sub_81A8E7C - special LoadPlayerParty - closemessage - delay 2 - call BattleFrontier_BattlePyramidLobby_EventScript_27134F - setvar VAR_TEMP_0, 255 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250AAA - -BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21 - special SavePlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 - special sub_81A1780 - msgbox BattleFrontier_BattlePyramidLobby_Text_251531, 4 - closemessage - call BattleFrontier_BattlePyramidLobby_EventScript_250D56 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_RESULT, 0 - special HealPlayerParty - warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1 - setvar VAR_TEMP_0, 0 - waitstate - end - -BattleFrontier_BattlePyramidLobby_EventScript_250A68:: @ 8250A68 - msgbox BattleFrontier_BattlePyramidLobby_Text_25100C, 4 - goto BattleFrontier_BattlePyramidLobby_EventScript_2508C8 - -BattleFrontier_BattlePyramidLobby_EventScript_250A75:: @ 8250A75 - switch VAR_RESULT - case 0, BattleFrontier_BattlePyramidLobby_EventScript_250A90 - case 1, BattleFrontier_BattlePyramidLobby_EventScript_250A9D - -BattleFrontier_BattlePyramidLobby_EventScript_250A90:: @ 8250A90 - msgbox BattleFrontier_BattlePyramidLobby_Text_2513C1, 4 - goto BattleFrontier_BattlePyramidLobby_EventScript_250ACC - -BattleFrontier_BattlePyramidLobby_EventScript_250A9D:: @ 8250A9D - msgbox BattleFrontier_BattlePyramidLobby_Text_2512E2, 4 - goto BattleFrontier_BattlePyramidLobby_EventScript_250ACC - -BattleFrontier_BattlePyramidLobby_EventScript_250AAA:: @ 8250AAA - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special sub_81A1780 - goto BattleFrontier_BattlePyramidLobby_EventScript_250AC4 - -BattleFrontier_BattlePyramidLobby_EventScript_250AC1:: @ 8250AC1 - special LoadPlayerParty - -BattleFrontier_BattlePyramidLobby_EventScript_250AC4:: @ 8250AC4 - msgbox BattleFrontier_BattlePyramidLobby_Text_250FE5, 4 - -BattleFrontier_BattlePyramidLobby_EventScript_250ACC:: @ 8250ACC - release - end - -BattleFrontier_BattlePyramidLobby_EventScript_250ACE:: @ 8250ACE - lockall - applymovement 2, BattleFrontier_BattlePyramidLobby_Movement_27259E - waitmovement 0 - msgbox BattleFrontier_BattlePyramidLobby_Text_251C3B, 4 - call BattleFrontier_BattlePyramidLobby_EventScript_250AF0 - msgbox BattleFrontier_BattlePyramidLobby_Text_252461, 4 - releaseall - end - -BattleFrontier_BattlePyramidLobby_EventScript_250AF0:: @ 8250AF0 - multichoice 17, 6, 24, 0 - switch VAR_RESULT - case 0, BattleFrontier_BattlePyramidLobby_EventScript_250B28 - case 1, BattleFrontier_BattlePyramidLobby_EventScript_250B66 - case 2, BattleFrontier_BattlePyramidLobby_EventScript_250B27 - case 127, BattleFrontier_BattlePyramidLobby_EventScript_250B27 - return - -BattleFrontier_BattlePyramidLobby_EventScript_250B27:: @ 8250B27 - return - -BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28 - msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, 4 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 5 - special sub_81A8E7C - compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePyramidLobby_EventScript_250B53 - setvar VAR_RESULT, 0 - goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4 - return - -BattleFrontier_BattlePyramidLobby_EventScript_250B53:: @ 8250B53 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 3 - special sub_81A8E7C - goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4 - return - -BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66 - msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, 4 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 6 - special sub_81A8E7C - compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePyramidLobby_EventScript_250B91 - setvar VAR_RESULT, 0 - goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4 - return - -BattleFrontier_BattlePyramidLobby_EventScript_250B91:: @ 8250B91 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 4 - special sub_81A8E7C - goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4 - return - -BattleFrontier_BattlePyramidLobby_EventScript_250BA4:: @ 8250BA4 - copyvar VAR_0x8004, VAR_RESULT - special sub_813B968 - switch VAR_RESULT - case 0, BattleFrontier_BattlePyramidLobby_EventScript_250C8E - case 1, BattleFrontier_BattlePyramidLobby_EventScript_250C97 - case 2, BattleFrontier_BattlePyramidLobby_EventScript_250CA0 - case 3, BattleFrontier_BattlePyramidLobby_EventScript_250CA9 - case 4, BattleFrontier_BattlePyramidLobby_EventScript_250CB2 - case 5, BattleFrontier_BattlePyramidLobby_EventScript_250CBB - case 6, BattleFrontier_BattlePyramidLobby_EventScript_250CC4 - case 7, BattleFrontier_BattlePyramidLobby_EventScript_250CCD - case 8, BattleFrontier_BattlePyramidLobby_EventScript_250CD6 - case 9, BattleFrontier_BattlePyramidLobby_EventScript_250CDF - case 10, BattleFrontier_BattlePyramidLobby_EventScript_250CE8 - case 11, BattleFrontier_BattlePyramidLobby_EventScript_250CF1 - case 12, BattleFrontier_BattlePyramidLobby_EventScript_250CFA - case 13, BattleFrontier_BattlePyramidLobby_EventScript_250D03 - case 14, BattleFrontier_BattlePyramidLobby_EventScript_250D0C - case 15, BattleFrontier_BattlePyramidLobby_EventScript_250D15 - case 16, BattleFrontier_BattlePyramidLobby_EventScript_250D1E - case 17, BattleFrontier_BattlePyramidLobby_EventScript_250D27 - case 18, BattleFrontier_BattlePyramidLobby_EventScript_250D30 - case 19, BattleFrontier_BattlePyramidLobby_EventScript_250D39 - return - -BattleFrontier_BattlePyramidLobby_EventScript_250C8E:: @ 8250C8E - msgbox BattleFrontier_BattlePyramidLobby_Text_251CB3, 4 - return - -BattleFrontier_BattlePyramidLobby_EventScript_250C97:: @ 8250C97 - msgbox BattleFrontier_BattlePyramidLobby_Text_251D07, 4 - return - -BattleFrontier_BattlePyramidLobby_EventScript_250CA0:: @ 8250CA0 - msgbox BattleFrontier_BattlePyramidLobby_Text_251D54, 4 - return - -BattleFrontier_BattlePyramidLobby_EventScript_250CA9:: @ 8250CA9 - msgbox BattleFrontier_BattlePyramidLobby_Text_251D9C, 4 - return - -BattleFrontier_BattlePyramidLobby_EventScript_250CB2:: @ 8250CB2 - msgbox BattleFrontier_BattlePyramidLobby_Text_251E3D, 4 - return - -BattleFrontier_BattlePyramidLobby_EventScript_250CBB:: @ 8250CBB - msgbox BattleFrontier_BattlePyramidLobby_Text_251EA1, 4 - return - -BattleFrontier_BattlePyramidLobby_EventScript_250CC4:: @ 8250CC4 - msgbox BattleFrontier_BattlePyramidLobby_Text_251F17, 4 - return - -BattleFrontier_BattlePyramidLobby_EventScript_250CCD:: @ 8250CCD - msgbox BattleFrontier_BattlePyramidLobby_Text_251F6E, 4 - return - -BattleFrontier_BattlePyramidLobby_EventScript_250CD6:: @ 8250CD6 - msgbox BattleFrontier_BattlePyramidLobby_Text_251FC7, 4 - return - -BattleFrontier_BattlePyramidLobby_EventScript_250CDF:: @ 8250CDF - msgbox BattleFrontier_BattlePyramidLobby_Text_25201B, 4 - return - -BattleFrontier_BattlePyramidLobby_EventScript_250CE8:: @ 8250CE8 - msgbox BattleFrontier_BattlePyramidLobby_Text_252068, 4 - return - -BattleFrontier_BattlePyramidLobby_EventScript_250CF1:: @ 8250CF1 - msgbox BattleFrontier_BattlePyramidLobby_Text_2520BA, 4 - return - -BattleFrontier_BattlePyramidLobby_EventScript_250CFA:: @ 8250CFA - msgbox BattleFrontier_BattlePyramidLobby_Text_252158, 4 - return - -BattleFrontier_BattlePyramidLobby_EventScript_250D03:: @ 8250D03 - msgbox BattleFrontier_BattlePyramidLobby_Text_2521B4, 4 - return - -BattleFrontier_BattlePyramidLobby_EventScript_250D0C:: @ 8250D0C - msgbox BattleFrontier_BattlePyramidLobby_Text_252206, 4 - return - -BattleFrontier_BattlePyramidLobby_EventScript_250D15:: @ 8250D15 - msgbox BattleFrontier_BattlePyramidLobby_Text_25225A, 4 - return - -BattleFrontier_BattlePyramidLobby_EventScript_250D1E:: @ 8250D1E - msgbox BattleFrontier_BattlePyramidLobby_Text_2522AE, 4 - return - -BattleFrontier_BattlePyramidLobby_EventScript_250D27:: @ 8250D27 - msgbox BattleFrontier_BattlePyramidLobby_Text_25230B, 4 - return - -BattleFrontier_BattlePyramidLobby_EventScript_250D30:: @ 8250D30 - msgbox BattleFrontier_BattlePyramidLobby_Text_252364, 4 - return - -BattleFrontier_BattlePyramidLobby_EventScript_250D39:: @ 8250D39 - msgbox BattleFrontier_BattlePyramidLobby_Text_252403, 4 - return - -BattleFrontier_BattlePyramidLobby_EventScript_250D42:: @ 8250D42 - lockall - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 6 - special sub_81A1780 - waitbuttonpress - special RemoveRecordsWindow - releaseall - end - -BattleFrontier_BattlePyramidLobby_EventScript_250D56:: @ 8250D56 - applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_250DC4 - applymovement 255, BattleFrontier_BattlePyramidLobby_Movement_250DCD - waitmovement 0 - msgbox BattleFrontier_BattlePyramidLobby_Text_251569, 4 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - special sub_81A8E7C - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250D94 - msgbox BattleFrontier_BattlePyramidLobby_Text_2515AD, 4 - goto BattleFrontier_BattlePyramidLobby_EventScript_250D9C - -BattleFrontier_BattlePyramidLobby_EventScript_250D94:: @ 8250D94 - msgbox BattleFrontier_BattlePyramidLobby_Text_2515F4, 4 - -BattleFrontier_BattlePyramidLobby_EventScript_250D9C:: @ 8250D9C - message BattleFrontier_BattlePyramidLobby_Text_25161E - waitmessage - playse SE_EXPMAX - waitse - msgbox BattleFrontier_BattlePyramidLobby_Text_251647, 4 - closemessage - applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_250DD5 - waitmovement 0 - applymovement 255, BattleFrontier_BattlePyramidLobby_Movement_250DD8 - waitmovement 0 - return - -BattleFrontier_BattlePyramidLobby_Movement_250DC4: @ 8250DC4 - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - face_down - step_end - -BattleFrontier_BattlePyramidLobby_Movement_250DCD: @ 8250DCD - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - step_end - -BattleFrontier_BattlePyramidLobby_Movement_250DD5: @ 8250DD5 - walk_right - face_left - step_end - -BattleFrontier_BattlePyramidLobby_Movement_250DD8: @ 8250DD8 - walk_up - walk_up - step_end - -BattleFrontier_BattlePyramidLobby_EventScript_250DDB:: @ 8250DDB - msgbox BattleFrontier_BattlePyramidLobby_Text_2517FC, 4 - setflag FLAG_SPECIAL_FLAG_0x4004 - special sub_81C6A94 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250E00 - message BattleFrontier_BattlePyramidLobby_Text_2518C6 - waitmessage - goto BattleFrontier_BattlePyramidLobby_EventScript_250E09 - end - -BattleFrontier_BattlePyramidLobby_EventScript_250E00:: @ 8250E00 - msgbox BattleFrontier_BattlePyramidLobby_Text_251881, 4 - return - -BattleFrontier_BattlePyramidLobby_EventScript_250E09:: @ 8250E09 - multichoice 17, 6, 83, 0 - switch VAR_RESULT - case 0, BattleFrontier_BattlePyramidLobby_EventScript_250E40 - case 1, BattleFrontier_BattlePyramidLobby_EventScript_250E50 - case 2, BattleFrontier_BattlePyramidLobby_EventScript_250E60 - case 127, BattleFrontier_BattlePyramidLobby_EventScript_250E60 - end - -BattleFrontier_BattlePyramidLobby_EventScript_250E40:: @ 8250E40 - special sub_81C4F24 - waitstate - message BattleFrontier_BattlePyramidLobby_Text_25197E - waitmessage - goto BattleFrontier_BattlePyramidLobby_EventScript_250E09 - end - -BattleFrontier_BattlePyramidLobby_EventScript_250E50:: @ 8250E50 - special sub_81B9620 - waitstate - message BattleFrontier_BattlePyramidLobby_Text_25197E - waitmessage - goto BattleFrontier_BattlePyramidLobby_EventScript_250E09 - end - -BattleFrontier_BattlePyramidLobby_EventScript_250E60:: @ 8250E60 - special sub_81B95E0 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250E6F - return - -BattleFrontier_BattlePyramidLobby_EventScript_250E6F:: @ 8250E6F - msgbox BattleFrontier_BattlePyramidLobby_Text_25194F, 4 - message BattleFrontier_BattlePyramidLobby_Text_25197E - waitmessage - goto BattleFrontier_BattlePyramidLobby_EventScript_250E09 - end - -BattleFrontier_BattlePyramidLobby_EventScript_250E83:: @ 8250E83 - msgbox BattleFrontier_BattlePyramidLobby_Text_2524DA, 2 - end - -BattleFrontier_BattlePyramidLobby_EventScript_250E8C:: @ 8250E8C - msgbox BattleFrontier_BattlePyramidLobby_Text_252595, 2 - end - -BattleFrontier_BattlePyramidLobby_EventScript_250E95:: @ 8250E95 - lockall - msgbox BattleFrontier_BattlePyramidLobby_Text_2526B6, 4 - goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4 - end - -BattleFrontier_BattlePyramidLobby_EventScript_250EA4:: @ 8250EA4 - message BattleFrontier_BattlePyramidLobby_Text_2526D9 - waitmessage - multichoice 15, 2, 101, 0 - switch VAR_RESULT - case 0, BattleFrontier_BattlePyramidLobby_EventScript_250EF7 - case 1, BattleFrontier_BattlePyramidLobby_EventScript_250F05 - case 2, BattleFrontier_BattlePyramidLobby_EventScript_250F13 - case 3, BattleFrontier_BattlePyramidLobby_EventScript_250F21 - case 4, BattleFrontier_BattlePyramidLobby_EventScript_250F2F - case 127, BattleFrontier_BattlePyramidLobby_EventScript_250F2F - end - -BattleFrontier_BattlePyramidLobby_EventScript_250EF7:: @ 8250EF7 - msgbox BattleFrontier_BattlePyramidLobby_Text_2526FC, 4 - goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4 - end - -BattleFrontier_BattlePyramidLobby_EventScript_250F05:: @ 8250F05 - msgbox BattleFrontier_BattlePyramidLobby_Text_2527A9, 4 - goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4 - end - -BattleFrontier_BattlePyramidLobby_EventScript_250F13:: @ 8250F13 - msgbox BattleFrontier_BattlePyramidLobby_Text_25285A, 4 - goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4 - end - -BattleFrontier_BattlePyramidLobby_EventScript_250F21:: @ 8250F21 - msgbox BattleFrontier_BattlePyramidLobby_Text_252924, 4 - goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4 - end - -BattleFrontier_BattlePyramidLobby_EventScript_250F2F:: @ 8250F2F - releaseall - end - -BattleFrontier_BattlePyramidLobby_Text_250F31: @ 8250F31 - .string "Where the courage of TRAINERS\n" - .string "is put to the test!\p" - .string "Welcome to the BATTLE PYRAMID!\p" - .string "I am your guide to\n" - .string "the Battle Quest.$" - -BattleFrontier_BattlePyramidLobby_Text_250FA7: @ 8250FA7 - .string "Have you the courage to embark on\n" - .string "the Battle Quest challenge?$" - -BattleFrontier_BattlePyramidLobby_Text_250FE5: @ 8250FE5 - .string "We await your challenge in the future!$" - -BattleFrontier_BattlePyramidLobby_Text_25100C: @ 825100C - .string "The Battle Quest is a battling\n" - .string "event in which you must explore\l" - .string "the PYRAMID and try to reach the top.\p" - .string "In the PYRAMID are seven floors of\n" - .string "mazes, all of them filled with not only\l" - .string "skilled TRAINERS but also wild POKéMON.\p" - .string "You must enter with three POKéMON,\n" - .string "none of them holding an item.\p" - .string "On your ascent, you will be provided\n" - .string "with a BATTLE BAG for items.\p" - .string "If you fail in your challenge, any item\n" - .string "placed in the BATTLE BAG disappears.\p" - .string "If you want to interrupt your\n" - .string "challenge, you must select “RESTâ€\l" - .string "and save the game.\p" - .string "If you don’t save before interrupting,\n" - .string "you will be disqualified.$" - -BattleFrontier_BattlePyramidLobby_Text_251248: @ 8251248 - .string "The PYRAMID offers two courses,\n" - .string "Level 50 and Open Level.\l" - .string "Which will you enter?$" - -BattleFrontier_BattlePyramidLobby_Text_251297: @ 8251297 - .string "Very good. Now, please select the three\n" - .string "POKéMON you wish to accompany you.$" - -BattleFrontier_BattlePyramidLobby_Text_2512E2: @ 82512E2 - .string "A slight problem, adventurer!\p" - .string "You seem to not have the three\n" - .string "POKéMON qualified for the challenge.\p" - .string "Please also remember to take all\n" - .string "items from your POKéMON.\p" - .string "EGGS{STR_VAR_1} ineligible.\p" - .string "When you are ready, please have\n" - .string "a word with me.$" - -BattleFrontier_BattlePyramidLobby_Text_2513C1: @ 82513C1 - .string "A slight problem, adventurer!\p" - .string "You seem to not have the three\n" - .string "POKéMON qualified for the challenge.\p" - .string "The three POKéMON must be different\n" - .string "and each no higher than Level 50.\p" - .string "Please also remember to take all\n" - .string "items from your POKéMON.\p" - .string "EGGS{STR_VAR_1} ineligible.\p" - .string "When you are ready, please have\n" - .string "a word with me.$" - -BattleFrontier_BattlePyramidLobby_Text_2514E6: @ 82514E6 - .string "Before you enter the BATTLE PYRAMID,\n" - .string "the game must be saved. Is that okay?$" - -BattleFrontier_BattlePyramidLobby_Text_251531: @ 8251531 - .string "Very good. I will now show you into\n" - .string "the BATTLE PYRAMID.$" - -BattleFrontier_BattlePyramidLobby_Text_251569: @ 8251569 - .string "We will hold your BAG for safekeeping,\n" - .string "{PLAYER}, while you are exploring.$" - -BattleFrontier_BattlePyramidLobby_Text_2515AD: @ 82515AD - .string "In exchange, please take this BATTLE\n" - .string "BAG, the one you used previously.$" - -BattleFrontier_BattlePyramidLobby_Text_2515F4: @ 82515F4 - .string "In exchange, please take this\n" - .string "BATTLE BAG.$" - -BattleFrontier_BattlePyramidLobby_Text_25161E: @ 825161E - .string "{PLAYER} exchanged the BAG for\n" - .string "the BATTLE BAG.$" - -BattleFrontier_BattlePyramidLobby_Text_251647: @ 8251647 - .string "When you step on this floor panel,\n" - .string "you will be transported to a higher\l" - .string "floor in the PYRAMID.\p" - .string "I hope for your sake that your\n" - .string "quest goes safely!$" - -BattleFrontier_BattlePyramidLobby_Text_2516D6: @ 82516D6 - .string "A major problem, explorer!\p" - .string "You did not save before ending\n" - .string "your challenge the last time.\p" - .string "Consequently, your challenge has\n" - .string "been disqualified, I’m sorry to say.\p" - .string "Here is the BAG we’ve been holding\n" - .string "for you.\p" - .string "{PLAYER} got the BAG back.$" - -BattleFrontier_BattlePyramidLobby_Text_2517B5: @ 82517B5 - .string "Excellent to see you back!\p" - .string "You’ve conquered the PYRAMID!\n" - .string "How splendid!$" - -BattleFrontier_BattlePyramidLobby_Text_2517FC: @ 82517FC - .string "Ah, a slight problem.\p" - .string "At least one POKéMON is holding\n" - .string "an item.\p" - .string "I’m sorry to say, items obtained in\n" - .string "the PYRAMID cannot be taken away.$" - -BattleFrontier_BattlePyramidLobby_Text_251881: @ 8251881 - .string "All items held by your POKéMON will be\n" - .string "moved to your BATTLE BAG, {PLAYER}.$" - -BattleFrontier_BattlePyramidLobby_Text_2518C6: @ 82518C6 - .string "The BATTLE BAG cannot hold all your\n" - .string "items, I’m sorry to say.\p" - .string "Please pick the items you’ll keep in the\n" - .string "BATTLE BAG, and with your POKéMON.$" - -BattleFrontier_BattlePyramidLobby_Text_25194F: @ 825194F - .string "At least one POKéMON is still\n" - .string "holding an item.$" - -BattleFrontier_BattlePyramidLobby_Text_25197E: @ 825197E - .string "Please pick the items you’ll keep in the\n" - .string "BATTLE BAG, and with your POKéMON.$" - -BattleFrontier_BattlePyramidLobby_Text_2519CA: @ 82519CA - .string "{PLAYER} returned everything that\n" - .string "the POKéMON held.$" - -BattleFrontier_BattlePyramidLobby_Text_2519F8: @ 82519F8 - .string "The BATTLE BAG you used will be kept\n" - .string "in readiness for your next challenge.\p" - .string "{PLAYER} turned the BATTLE BAG over\n" - .string "for the BAG’s return.$" - -BattleFrontier_BattlePyramidLobby_Text_251A77: @ 8251A77 - .string "I must record your results.\n" - .string "Please wait.$" - -BattleFrontier_BattlePyramidLobby_Text_251AA0: @ 8251AA0 - .string "As a memento for conquering\n" - .string "the BATTLE PYRAMID, please take this.$" - -BattleFrontier_BattlePyramidLobby_Text_251AE2: @ 8251AE2 - .string "{PLAYER} received the prize\n" - .string "{STR_VAR_1}.$" - -BattleFrontier_BattlePyramidLobby_Text_251AFC: @ 8251AFC - .string "…Ah…\n" - .string "Your BAG appears to be filled.\p" - .string "Please return after you’ve organized\n" - .string "your BAG’s contents.$" - -BattleFrontier_BattlePyramidLobby_Text_251B5A: @ 8251B5A - .string "How disappointing for you…\p" - .string "Here is the BAG we’ve been holding\n" - .string "for you.\p" - .string "{PLAYER} got the BAG back.$" - -BattleFrontier_BattlePyramidLobby_Text_251BB6: @ 8251BB6 - .string "We look forward to your\n" - .string "next challenge!$" - -BattleFrontier_BattlePyramidLobby_Text_251BDE: @ 8251BDE - .string "We have been looking forward to\n" - .string "your arrival!\p" - .string "Here is your prize for conquering\n" - .string "the PYRAMID.$" - -BattleFrontier_BattlePyramidLobby_Text_251C3B: @ 8251C3B - .string "Welcome…\p" - .string "I shall be pleased to tell you what\n" - .string "misfortunes await in the PYRAMID…$" - -BattleFrontier_BattlePyramidLobby_Text_251C8A: @ 8251C8A - .string "… … … … … …\n" - .string "… … … … … …\p" - .string "… … … … … …\n" - .string "Aah!$" - -BattleFrontier_BattlePyramidLobby_Text_251CB3: @ 8251CB3 - .string "I see a shower of sparks…\p" - .string "…And in it, I see your POKéMON\n" - .string "struggling with paralysis…$" - -BattleFrontier_BattlePyramidLobby_Text_251D07: @ 8251D07 - .string "I see poison…\p" - .string "…And, I see your POKéMON suffering\n" - .string "from the effects of poison…$" - -BattleFrontier_BattlePyramidLobby_Text_251D54: @ 8251D54 - .string "I see bright red flames…\p" - .string "…And, I see your POKéMON suffering\n" - .string "from burns…$" - -BattleFrontier_BattlePyramidLobby_Text_251D9C: @ 8251D9C - .string "I sense the tremendous pressure of\n" - .string "unrequited anger…\p" - .string "It is a curse…\p" - .string "…And, I see your POKéMON drained of\n" - .string "Power Points and having no recourse\l" - .string "but to use STRUGGLE…$" - -BattleFrontier_BattlePyramidLobby_Text_251E3D: @ 8251E3D - .string "I see POKéMON loftily airborne…\p" - .string "…And, I see your POKéMON frustrated\n" - .string "by powerless GROUND-type moves…$" - -BattleFrontier_BattlePyramidLobby_Text_251EA1: @ 8251EA1 - .string "I sense terrific energy rising from\n" - .string "the ground below…\p" - .string "…And, I see your POKéMON unable to\n" - .string "escape the power’s clutches…$" - -BattleFrontier_BattlePyramidLobby_Text_251F17: @ 8251F17 - .string "I see ICE-type POKéMON…\p" - .string "…And, I see your POKéMON fighting\n" - .string "the freezing effects of ice…$" - -BattleFrontier_BattlePyramidLobby_Text_251F6E: @ 8251F6E - .string "I see a flurry of moves that imperil\n" - .string "the user…\p" - .string "…And, I see your POKéMON falling\n" - .string "to them…$" - -BattleFrontier_BattlePyramidLobby_Text_251FC7: @ 8251FC7 - .string "I see PSYCHIC-type POKéMON…\p" - .string "…And, I see your POKéMON in torment\n" - .string "from PSYCHIC moves…$" - -BattleFrontier_BattlePyramidLobby_Text_25201B: @ 825201B - .string "I see ROCK-type POKéMON…\p" - .string "…And, I see your POKéMON suffering\n" - .string "from ROCK moves…$" - -BattleFrontier_BattlePyramidLobby_Text_252068: @ 8252068 - .string "I see FIGHTING-type POKéMON…\p" - .string "…And, I see your POKéMON pummeled\n" - .string "by FIGHTING moves…$" - -BattleFrontier_BattlePyramidLobby_Text_2520BA: @ 82520BA - .string "RAIN DANCE… SUNNY DAY…\n" - .string "SANDSTORM… HAIL…\p" - .string "I see POKéMON that become stronger\n" - .string "with the weather…\p" - .string "…And, I see your POKéMON confounded\n" - .string "by different types of moves…$" - -BattleFrontier_BattlePyramidLobby_Text_252158: @ 8252158 - .string "I see BUG-type POKéMON…\p" - .string "…And, I see your POKéMON suffering\n" - .string "from different kinds of attacks…$" - -BattleFrontier_BattlePyramidLobby_Text_2521B4: @ 82521B4 - .string "I see DARK-type POKéMON…\p" - .string "…And, I see your POKéMON suffering\n" - .string "from DARK-type moves…$" - -BattleFrontier_BattlePyramidLobby_Text_252206: @ 8252206 - .string "I see WATER-type POKéMON…\p" - .string "…And, I see your POKéMON suffering\n" - .string "from WATER-type moves…$" - -BattleFrontier_BattlePyramidLobby_Text_25225A: @ 825225A - .string "I see GHOST-type POKéMON…\p" - .string "…And, I see your POKéMON suffering\n" - .string "from GHOST-type moves…$" - -BattleFrontier_BattlePyramidLobby_Text_2522AE: @ 82522AE - .string "I see STEEL-type POKéMON…\p" - .string "…And, I see your POKéMON suffering\n" - .string "from enormously powerful moves…$" - -BattleFrontier_BattlePyramidLobby_Text_25230B: @ 825230B - .string "I see flying POKéMON…\p" - .string "…And, I see your POKéMON suffering\n" - .string "from enormously powerful moves…$" - -BattleFrontier_BattlePyramidLobby_Text_252364: @ 8252364 - .string "I see those that have evolved from\n" - .string "the power of stones…\p" - .string "I also sense fire, water,\n" - .string "and electricity…\p" - .string "…And, I see your POKéMON suffering\n" - .string "from those three powers…$" - -BattleFrontier_BattlePyramidLobby_Text_252403: @ 8252403 - .string "I see NORMAL-type POKéMON…\p" - .string "…And, I see your POKéMON suffering\n" - .string "from enormously powerful moves…$" - -BattleFrontier_BattlePyramidLobby_Text_252461: @ 8252461 - .string "Whether you believe my fortunes\n" - .string "or not, the choice is yours…\p" - .string "The future can be changed anytime…\n" - .string "I wish you safe passage…$" - -BattleFrontier_BattlePyramidLobby_Text_2524DA: @ 82524DA - .string "Did you know?\p" - .string "If you run fast, TRAINERS may notice\n" - .string "and come after you for a battle.\p" - .string "So, if you want to avoid TRAINERS,\n" - .string "don’t catch their eyes, but sneak\l" - .string "cautiously and quietly past them.$" - -BattleFrontier_BattlePyramidLobby_Text_252595: @ 8252595 - .string "Awaaaaaaarrrrgh!\p" - .string "I had a whole lot of items, but I lost\n" - .string "them all when I lost!\p" - .string "Awaaaaaaarrrrgh!$" - -BattleFrontier_BattlePyramidLobby_Text_2525F4: @ 82525F4 - .string "Welcome back!\n" - .string "You’ve done the unthinkable!\p" - .string "You’ve defeated the PYRAMID KING\n" - .string "and conquered the BATTLE PYRAMID!$" - -BattleFrontier_BattlePyramidLobby_Text_252662: @ 8252662 - .string "Young explorer!\n" - .string "In commendation of your courage,\l" - .string "we give you these Battle Point(s)!$" - -BattleFrontier_BattlePyramidLobby_Text_2526B6: @ 82526B6 - .string "The Battle Quest rules are listed.$" - -BattleFrontier_BattlePyramidLobby_Text_2526D9: @ 82526D9 - .string "Which heading do you want to read?$" - -BattleFrontier_BattlePyramidLobby_Text_2526FC: @ 82526FC - .string "When the PYRAMID is conquered,\n" - .string "the wild POKéMON that appear in it\l" - .string "are replaced by different kinds.\p" - .string "Explore, observe, and learn what kinds\n" - .string "of wild POKéMON you may encounter.$" - -BattleFrontier_BattlePyramidLobby_Text_2527A9: @ 82527A9 - .string "TRAINERS are lying in wait for you\n" - .string "inside the PYRAMID.\p" - .string "On each floor, there are up to\n" - .string "eight TRAINERS.\p" - .string "When you defeat a TRAINER, you will\n" - .string "get a helpful hint for your adventure.$" - -BattleFrontier_BattlePyramidLobby_Text_25285A: @ 825285A - .string "The mazes in the PYRAMID rearrange\n" - .string "themselves every time you enter it.\p" - .string "The mazes are poorly lit.\n" - .string "You must advance with caution.\p" - .string "The light grows brighter whenever you\n" - .string "defeat a wild POKéMON or a TRAINER.$" - -BattleFrontier_BattlePyramidLobby_Text_252924: @ 8252924 - .string "The BATTLE BAG serves as your BAG\n" - .string "while in the PYRAMID.\p" - .string "There are two separate BATTLE BAGS--\n" - .string "one each for the Level 50 and\l" - .string "Open Level adventures.\p" - .string "They each can hold up to 99 pieces\n" - .string "of ten kinds of items.\p" - .string "The contents of the BATTLE BAG are\n" - .string "lost if you fail in your quest.$" - diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc deleted file mode 100644 index 886b3fe01..000000000 --- a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc +++ /dev/null @@ -1,379 +0,0 @@ -BattleFrontier_BattlePyramidTop_MapScripts:: @ 82550A1 - map_script 5, BattleFrontier_BattlePyramidTop_MapScript1_2550F4 - map_script 2, BattleFrontier_BattlePyramidTop_MapScript2_25516E - map_script 3, BattleFrontier_BattlePyramidTop_MapScript1_2550B6 - map_script 4, BattleFrontier_BattlePyramidTop_MapScript2_2550CE - .byte 0 - -BattleFrontier_BattlePyramidTop_MapScript1_2550B6: @ 82550B6 - setvar VAR_0x8004, 13 - setvar VAR_0x8005, 200 - setvar VAR_0x8006, 0 - special sub_81A8E7C - setvar VAR_TEMP_F, 1 - end - -BattleFrontier_BattlePyramidTop_MapScript2_2550CE: @ 82550CE - map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePyramidTop_EventScript_2550D8 - .2byte 0 - -BattleFrontier_BattlePyramidTop_EventScript_2550D8:: @ 82550D8 - setvar VAR_TEMP_1, 1 - turnobject 255, 2 - compare VAR_TEMP_C, 0 - goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_2550F3 - setobjectxyperm 2, 0, 0 - -BattleFrontier_BattlePyramidTop_EventScript_2550F3:: @ 82550F3 - end - -BattleFrontier_BattlePyramidTop_MapScript1_2550F4: @ 82550F4 - setvar VAR_0x8004, 9 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePyramidTop_EventScript_25510C - call BattleFrontier_BattlePyramidTop_EventScript_242170 - -BattleFrontier_BattlePyramidTop_EventScript_25510C:: @ 825510C - copyvar VAR_TEMP_C, VAR_RESULT - setvar VAR_0x8004, 0 - special sub_81A1780 - switch VAR_TEMP_0 - case 0, BattleFrontier_BattlePyramidTop_EventScript_255193 - case 1, BattleFrontier_BattlePyramidTop_EventScript_252B66 - case 2, BattleFrontier_BattlePyramidTop_EventScript_255193 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 5 - special sub_81A1780 - compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 - compare VAR_RESULT, 3 - goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 - compare VAR_RESULT, 9 - goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 - end - -BattleFrontier_BattlePyramidTop_MapScript2_25516E: @ 825516E - map_script_2 VAR_TEMP_E, 0, BattleFrontier_BattlePyramidTop_EventScript_255180 - map_script_2 VAR_TEMP_F, 1, BattleFrontier_BattlePyramidTop_EventScript_25518A - .2byte 0 - -BattleFrontier_BattlePyramidTop_EventScript_255180:: @ 8255180 - playbgm MUS_PYRAMID_TOP, 0 - setvar VAR_TEMP_E, 1 - end - -BattleFrontier_BattlePyramidTop_EventScript_25518A:: @ 825518A - special ShowMapNamePopup - setvar VAR_TEMP_F, 0 - end - -BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193 - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 1 - special sub_81A8E7C - special SavePlayerParty - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_0x8004, 9 - special sub_81A8E7C - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 - special sub_81A1780 - setvar VAR_TEMP_F, 1 - end - -BattleFrontier_BattlePyramidTop_EventScript_2551D0:: @ 82551D0 - lock - faceplayer - compare VAR_TEMP_D, 0 - goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255236 - compare VAR_TEMP_C, 0 - goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255240 - msgbox BattleFrontier_BattlePyramidTop_Text_255410, 4 - closemessage - applymovement 1, BattleFrontier_BattlePyramidTop_Movement_2553FD - waitmovement 0 - applymovement 255, BattleFrontier_BattlePyramidTop_Movement_255403 - waitmovement 0 - applymovement 1, BattleFrontier_BattlePyramidTop_Movement_255400 - waitmovement 0 - message BattleFrontier_BattlePyramidTop_Text_2554E8 - waitmessage - playfanfare MUS_ME_POINTGET - waitfanfare - closemessage - -BattleFrontier_BattlePyramidTop_EventScript_25521A:: @ 825521A - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 3 - special sub_81A1780 - warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13 - waitstate - end - -BattleFrontier_BattlePyramidTop_EventScript_255236:: @ 8255236 - msgbox BattleFrontier_BattlePyramidTop_Text_255BFE, 4 - closemessage - end - -BattleFrontier_BattlePyramidTop_EventScript_255240:: @ 8255240 - msgbox BattleFrontier_BattlePyramidTop_Text_25551F, 4 - applymovement 1, BattleFrontier_BattlePyramidTop_Movement_2553FD - setvar VAR_TEMP_D, 1 - closemessage - end - -BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256 - lockall - switch VAR_TEMP_C - case 2, BattleFrontier_BattlePyramidTop_EventScript_255335 - case 3, BattleFrontier_BattlePyramidTop_EventScript_2552D0 - case 4, BattleFrontier_BattlePyramidTop_EventScript_255388 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 7 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_2552D0 - special SpawnScriptEventObject - applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C - waitmovement 0 - msgbox BattleFrontier_BattlePyramidTop_Text_255669, 4 - closemessage - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 7 - special sub_81A1780 - applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A - waitmovement 0 - msgbox BattleFrontier_BattlePyramidTop_Text_25573E, 4 - goto BattleFrontier_BattlePyramidTop_EventScript_2552DA - end - -BattleFrontier_BattlePyramidTop_EventScript_2552D0:: @ 82552D0 - applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A - waitmovement 0 - -BattleFrontier_BattlePyramidTop_EventScript_2552DA:: @ 82552DA - msgbox BattleFrontier_BattlePyramidTop_Text_255846, 4 - call BattleFrontier_BattlePyramidTop_EventScript_2553ED - playbgm MUS_PYRAMID_TOP, 0 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePyramidTop_EventScript_2552FB - goto BattleFrontier_BattlePyramidTop_EventScript_252B42 - -BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB - setvar VAR_0x8004, 12 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_25521A - msgbox BattleFrontier_BattlePyramidTop_Text_255873, 4 - playfanfare MUS_ME_SYMBOLGET - message BattleFrontier_BattlePyramidTop_Text_2558E9 - waitmessage - waitfanfare - setvar VAR_0x8004, 13 - special sub_81A1780 - msgbox BattleFrontier_BattlePyramidTop_Text_25591D, 4 - goto BattleFrontier_BattlePyramidTop_EventScript_25521A - -BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 7 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255388 - special SpawnScriptEventObject - applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C - waitmovement 0 - msgbox BattleFrontier_BattlePyramidTop_Text_255951, 4 - closemessage - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 7 - special sub_81A1780 - applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A - waitmovement 0 - msgbox BattleFrontier_BattlePyramidTop_Text_255A6D, 4 - goto BattleFrontier_BattlePyramidTop_EventScript_255392 - end - -BattleFrontier_BattlePyramidTop_EventScript_255388:: @ 8255388 - applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A - waitmovement 0 - -BattleFrontier_BattlePyramidTop_EventScript_255392:: @ 8255392 - msgbox BattleFrontier_BattlePyramidTop_Text_255AA1, 4 - call BattleFrontier_BattlePyramidTop_EventScript_2553ED - playbgm MUS_PYRAMID_TOP, 0 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePyramidTop_EventScript_2553B3 - goto BattleFrontier_BattlePyramidTop_EventScript_252B42 - -BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3 - setvar VAR_0x8004, 12 - special sub_81A1780 - compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattlePyramidTop_EventScript_25521A - msgbox BattleFrontier_BattlePyramidTop_Text_255ACD, 4 - playfanfare MUS_ME_SYMBOLGET - message BattleFrontier_BattlePyramidTop_Text_255B59 - waitmessage - waitfanfare - setvar VAR_0x8004, 13 - special sub_81A1780 - msgbox BattleFrontier_BattlePyramidTop_Text_255B82, 4 - goto BattleFrontier_BattlePyramidTop_EventScript_25521A - -BattleFrontier_BattlePyramidTop_EventScript_2553ED:: @ 82553ED - closemessage - setvar VAR_0x8004, 10 - setvar VAR_0x8005, 0 - special sub_8163AC4 - waitstate - return - -BattleFrontier_BattlePyramidTop_Movement_2553FD: @ 82553FD - walk_right - walk_in_place_fastest_left - step_end - -BattleFrontier_BattlePyramidTop_Movement_255400: @ 8255400 - walk_left - walk_in_place_fastest_up - step_end - -BattleFrontier_BattlePyramidTop_Movement_255403: @ 8255403 - walk_up - walk_up - walk_up - walk_up - walk_up - walk_in_place_fastest_down - step_end - -BattleFrontier_BattlePyramidTop_Movement_25540A: @ 825540A - walk_fast_down - step_end - -BattleFrontier_BattlePyramidTop_Movement_25540C: @ 825540C - walk_slow_up - walk_slow_up - delay_16 - step_end - -BattleFrontier_BattlePyramidTop_Text_255410: @ 8255410 - .string "It is a delight to see you here!\n" - .string "You have reached the summit of\l" - .string "the BATTLE PYRAMID!\p" - .string "Above here is the PYRAMID’s\n" - .string "lookout point.\p" - .string "It is a place open only to those\n" - .string "who have conquered the PYRAMID.\p" - .string "Now, please!\n" - .string "Up you go!$" - -BattleFrontier_BattlePyramidTop_Text_2554E8: @ 82554E8 - .string "The PYRAMID’s new conqueror!\n" - .string "Let the name {PLAYER} be known!$" - -BattleFrontier_BattlePyramidTop_Text_25551F: @ 825551F - .string "It is a delight to see you here!\p" - .string "Unfortunately, you were second by\n" - .string "a mere fraction of time!\p" - .string "Our chief has already conquered\n" - .string "the PYRAMID ahead of you.\p" - .string "However, my young explorer…\n" - .string "You are a TRAINER!\p" - .string "Assert your power and take the glory\n" - .string "of the pinnacle from our chief!\p" - .string "Now, please! When you are ready,\n" - .string "take one more step of courage!$" - -BattleFrontier_BattlePyramidTop_Text_255669: @ 8255669 - .string "Young adventurer…\p" - .string "Wouldn’t you agree that explorations\n" - .string "are the grandest of adventures?\p" - .string "Your own wits!\p" - .string "Your own strength!\p" - .string "Your own POKéMON!\p" - .string "And, above all, only your own courage\n" - .string "to lead you through unknown worlds…$" - -BattleFrontier_BattlePyramidTop_Text_25573E: @ 825573E - .string "Aah, yes, indeed this life is grand!\n" - .string "Grand, it is! Eh?\p" - .string "I’m BRANDON!\p" - .string "I’m the PYRAMID KING, which means\n" - .string "I’m in charge here.\p" - .string "Most people call me the chief!\p" - .string "You coming here means you have\n" - .string "that much confidence in yourself,\l" - .string "am I right?\p" - .string "Hahahah!\n" - .string "This should be exciting!$" - -BattleFrontier_BattlePyramidTop_Text_255846: @ 8255846 - .string "Now, then!\n" - .string "Bring your courage to our battle!$" - -BattleFrontier_BattlePyramidTop_Text_255873: @ 8255873 - .string "BRANDON: Hahahah! Grand it was!\n" - .string "Grand, yes, indeed!\p" - .string "Well done! You’ve earned recognition!\n" - .string "Your FRONTIER PASS, please!$" - -BattleFrontier_BattlePyramidTop_Text_2558E9: @ 82558E9 - .string "The Brave Symbol was embossed on\n" - .string "the FRONTIER PASS!$" - -BattleFrontier_BattlePyramidTop_Text_25591D: @ 825591D - .string "Young explorer!\n" - .string "I look forward to our next meeting!$" - -BattleFrontier_BattlePyramidTop_Text_255951: @ 8255951 - .string "BRANDON: …You’ve finally returned,\n" - .string "young explorer…\p" - .string "Your love of adventure seems to come\n" - .string "deep from within your heart…\p" - .string "Yes… You are exactly as I was in\n" - .string "my own youth…\p" - .string "… … …Ah…\p" - .string "The passionate!\p" - .string "The dangerous!\p" - .string "The desperate!\p" - .string "Those days of death-defying,\n" - .string "life-affirming adventures are back…$" - -BattleFrontier_BattlePyramidTop_Text_255A6D: @ 8255A6D - .string "Now, then!\p" - .string "I sense my own courage is off\n" - .string "the meter!$" - -BattleFrontier_BattlePyramidTop_Text_255AA1: @ 8255AA1 - .string "Everything you have!\n" - .string "I’m braced for it all!$" - -BattleFrontier_BattlePyramidTop_Text_255ACD: @ 8255ACD - .string "BRANDON: Hahahah!\n" - .string "Remarkable!\l" - .string "Yes, it’s grand, indeed!\p" - .string "Young explorer!\p" - .string "You’ve bested me through and through!\n" - .string "Here! I want you to have this!$" - -BattleFrontier_BattlePyramidTop_Text_255B59: @ 8255B59 - .string "The Brave Symbol took on\n" - .string "a golden shine!$" - -BattleFrontier_BattlePyramidTop_Text_255B82: @ 8255B82 - .string "Ah, yes! It just goes to show that\n" - .string "I have much to learn still!\p" - .string "May our paths cross again!\n" - .string "Farewell for now, young explorer!$" - -BattleFrontier_BattlePyramidTop_Text_255BFE: @ 8255BFE - .string "Now, when you are ready, take courage\n" - .string "and step forward.$" - diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc deleted file mode 100644 index f684e215d..000000000 --- a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc +++ /dev/null @@ -1,651 +0,0 @@ -BattleFrontier_BattleTowerBattleRoom_MapScripts:: @ 8241B40 - map_script 2, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62 - map_script 4, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B - .byte 0 - -BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B: @ 8241B4B - map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241B55 - .2byte 0 - -BattleFrontier_BattleTowerBattleRoom_EventScript_241B55:: @ 8241B55 - setvar VAR_TEMP_1, 1 - applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_242198 - end - -BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62: @ 8241B62 - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C - .2byte 0 - -BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C - setvar VAR_TEMP_0, 1 - applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_242179 - waitmovement 0 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3 - applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D - waitmovement 0 - applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_24217E - waitmovement 0 - setvar VAR_TEMP_2, 1 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 6 - setvar VAR_0x8006, 1 - special sub_81A1780 - goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F - -BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3:: @ 8241BC3 - setvar VAR_0x8004, 3 - special sub_8161F74 - addobject 1 - applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_242182 - waitmovement 0 - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 0 - special sub_8161F74 - msgbox 0x2021fc4, 4 - waitmessage - call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E - switch VAR_RESULT - case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F - -BattleFrontier_BattleTowerBattleRoom_EventScript_241C03:: @ 8241C03 -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03:: @ 8241C03 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 4 - special sub_81A1780 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - special sub_8161F74 - setvar VAR_0x8004, 3 - special sub_813BF7C - goto BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8 - -BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F - call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA - setvar VAR_0x8004, 4 - special sub_8161F74 - switch VAR_RESULT - case 7, BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 - applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_242188 - waitmovement 0 - removeobject 1 - setvar VAR_0x8004, 9 - special sub_81A1780 - compare VAR_RESULT, 0 - call_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3 - applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D - waitmovement 0 - applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_24217E - waitmovement 0 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_242217, 4 - playfanfare MUS_ME_ASA - waitfanfare - special HealPlayerParty - -BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F:: @ 8241C8F - setvar VAR_0x8004, 9 - special sub_81A1780 - copyvar VAR_TEMP_F, VAR_RESULT - compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special sub_81A1780 - call BattleFrontier_BattleTowerBattleRoom_EventScript_241E44 - call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241D0A - multichoice 19, 4, 103, 1 - switch VAR_RESULT - case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC - case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D40 - case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C - case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA - case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F - -BattleFrontier_BattleTowerBattleRoom_EventScript_241D0A:: @ 8241D0A - multichoice 20, 6, 104, 1 - switch VAR_RESULT - case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC - case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C - case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA - case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F - -BattleFrontier_BattleTowerBattleRoom_EventScript_241D40:: @ 8241D40 - message BattleFrontier_BattleTowerBattleRoom_Text_2423A3 - waitmessage - multichoicedefault 20, 8, 94, 1, 0 - switch VAR_RESULT - case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F - case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241D72 - case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F - -BattleFrontier_BattleTowerBattleRoom_EventScript_241D72:: @ 8241D72 - call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8B4 - goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F - -BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C:: @ 8241D7C - msgbox BattleFrontier_BattleTowerBattleRoom_Text_2423FC, 5 - switch VAR_RESULT - case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F - case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241E22 - case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F - -BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA:: @ 8241DAA - message BattleFrontier_BattleTowerBattleRoom_Text_24244C - waitmessage - multichoicedefault 20, 8, 94, 1, 0 - switch VAR_RESULT - case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F - case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_24220E - case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F - -BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC:: @ 8241DDC - closemessage - applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_242180 - waitmovement 0 - applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_242192 - waitmovement 0 - goto BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3 - -BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6:: @ 8241DF6 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 3 - special sub_81A1780 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - special sub_8161F74 - setvar VAR_0x8004, 3 - special sub_813BF7C - goto BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8 - -BattleFrontier_BattleTowerBattleRoom_EventScript_241E22:: @ 8241E22 - message BattleFrontier_BattleTowerBattleRoom_Text_242426 - waitmessage - setvar VAR_0x8004, 6 - setvar VAR_0x8005, 2 - special sub_8161F74 - playse SE_SAVE - waitse - fadescreen 1 - setvar VAR_0x8004, 4 - special sub_81A1780 - end - -BattleFrontier_BattleTowerBattleRoom_EventScript_241E44:: @ 8241E44 - copyvar VAR_TEMP_F, VAR_RESULT - switch VAR_TEMP_F - case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241E90 - case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241E97 - case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_241E9E - case 4, BattleFrontier_BattleTowerBattleRoom_EventScript_241EA5 - case 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241EAC - case 6, BattleFrontier_BattleTowerBattleRoom_EventScript_241EB3 - -BattleFrontier_BattleTowerBattleRoom_EventScript_241E90:: @ 8241E90 - message BattleFrontier_BattleTowerBattleRoom_Text_242277 - waitmessage - return - -BattleFrontier_BattleTowerBattleRoom_EventScript_241E97:: @ 8241E97 - message BattleFrontier_BattleTowerBattleRoom_Text_2422A9 - waitmessage - return - -BattleFrontier_BattleTowerBattleRoom_EventScript_241E9E:: @ 8241E9E - message BattleFrontier_BattleTowerBattleRoom_Text_2422DB - waitmessage - return - -BattleFrontier_BattleTowerBattleRoom_EventScript_241EA5:: @ 8241EA5 - message BattleFrontier_BattleTowerBattleRoom_Text_24230D - waitmessage - return - -BattleFrontier_BattleTowerBattleRoom_EventScript_241EAC:: @ 8241EAC - message BattleFrontier_BattleTowerBattleRoom_Text_24233F - waitmessage - return - -BattleFrontier_BattleTowerBattleRoom_EventScript_241EB3:: @ 8241EB3 - message BattleFrontier_BattleTowerBattleRoom_Text_242371 - waitmessage - return - -BattleFrontier_BattleArenaBattleRoom_EventScript_241EBA:: @ 8241EBA -BattleFrontier_BattleDomeLobby_EventScript_241EBA:: @ 8241EBA -BattleFrontier_BattleFactoryBattleRoom_EventScript_241EBA:: @ 8241EBA -BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA:: @ 8241EBA -BattleFrontier_BattleTowerBattleRoom2_EventScript_241EBA:: @ 8241EBA -BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA:: @ 8241EBA - setvar VAR_0x8004, 17 - special sub_81A1780 - return - -BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3 - applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_24219A - waitmovement 0 - applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2725B6 - waitmovement 0 - playse SE_PIN - applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_272598 - waitmovement 0 - applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_27259A - waitmovement 0 - applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2421A6 - applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_2421AB - waitmovement 0 - applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2421A1 - waitmovement 0 - return - -BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A:: @ 8241F0A - compare VAR_TEMP_2, 1 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F22 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_2424C2, 4 - setvar VAR_TEMP_2, 1 - -BattleFrontier_BattleTowerBattleRoom_EventScript_241F22:: @ 8241F22 - message BattleFrontier_BattleTowerBattleRoom_Text_242542 - waitmessage - call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F79 - multichoice 19, 4, 103, 1 - switch VAR_RESULT - case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF - case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D40 - case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C - case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA - case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241F22 - -BattleFrontier_BattleTowerBattleRoom_EventScript_241F79:: @ 8241F79 - multichoice 20, 6, 104, 1 - switch VAR_RESULT - case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF - case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C - case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA - case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241F22 - -BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF - call BattleFrontier_BattleTowerBattleRoom_EventScript_242170 - closemessage - applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_242180 - waitmovement 0 - applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_242192 - waitmovement 0 - addobject 1 - applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_2421B2 - waitmovement 0 - switch VAR_TEMP_F - case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_242085 - case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_242029 - case 4, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 7 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_242029 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_242579, 4 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 7 - special sub_81A1780 - -BattleFrontier_BattleTowerBattleRoom_EventScript_242029:: @ 8242029 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_24268C, 4 - call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_242046 - goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03 - -BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046 - call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA - setvar VAR_0x8004, 12 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_2426B4, 4 - playfanfare MUS_ME_SYMBOLGET - message BattleFrontier_BattleTowerBattleRoom_Text_24270E - waitmessage - waitfanfare - setvar VAR_0x8004, 13 - special sub_81A1780 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_242744, 4 - goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 - -BattleFrontier_BattleTowerBattleRoom_EventScript_242085:: @ 8242085 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 7 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_2427F9, 4 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 7 - special sub_81A1780 - -BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2:: @ 82420B2 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428E0, 4 - call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF - goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03 - -BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF - call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA - setvar VAR_0x8004, 12 - special sub_81A1780 - compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428F7, 4 - playfanfare MUS_ME_SYMBOLGET - message BattleFrontier_BattleTowerBattleRoom_Text_242932 - waitmessage - waitfanfare - setvar VAR_0x8004, 13 - special sub_81A1780 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_24295D, 4 - goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_24210E:: @ 824210E -BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E - closemessage - setvar VAR_TEMP_2, 0 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 6 - setvar VAR_0x8006, 0 - special sub_81A1780 - special HealPlayerParty - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 0 - special sub_8163AC4 - waitstate - copyvar VAR_0x8004, VAR_0x40CE - compare VAR_0x8004, 3 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_24215A - setvar VAR_0x8004, 18 - special sub_81A1780 - special HealPlayerParty - setvar VAR_0x8004, 21 - special sub_81A1780 - -BattleFrontier_BattleTowerBattleRoom_EventScript_24215A:: @ 824215A - setvar VAR_0x8004, 15 - special sub_8161F74 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 5 - special sub_81A1780 - return - -BattleFrontier_BattleArenaBattleRoom_EventScript_242170:: @ 8242170 -BattleFrontier_BattleDomeBattleRoom_EventScript_242170:: @ 8242170 -BattleFrontier_BattleFactoryBattleRoom_EventScript_242170:: @ 8242170 -BattleFrontier_BattlePalaceBattleRoom_EventScript_242170:: @ 8242170 -BattleFrontier_BattlePyramidTop_EventScript_242170:: @ 8242170 -BattleFrontier_BattleTowerBattleRoom_EventScript_242170:: @ 8242170 - setvar VAR_0x8004, 22 - special sub_81A1780 - return - -BattleFrontier_BattleTowerBattleRoom_Movement_242179: @ 8242179 - walk_up - walk_up - walk_up - face_right - step_end - -BattleFrontier_BattleTowerBattleRoom_Movement_24217E: @ 824217E - face_down - step_end - -BattleFrontier_BattleTowerBattleRoom_Movement_242180: @ 8242180 - face_right - step_end - -BattleFrontier_BattleTowerBattleRoom_Movement_242182: @ 8242182 - walk_down - walk_down - walk_down - walk_down - face_left - step_end - -BattleFrontier_BattleTowerBattleRoom_Movement_242188: @ 8242188 - walk_up - walk_up - walk_up - walk_up - step_end - -BattleFrontier_BattleTowerBattleRoom_Movement_24218D: @ 824218D - walk_right - walk_right - walk_right - walk_up - step_end - -BattleFrontier_BattleTowerBattleRoom_Movement_242192: @ 8242192 - walk_down - walk_left - walk_left - walk_left - face_right - step_end - -BattleFrontier_BattleTowerBattleRoom_Movement_242198: @ 8242198 - set_invisible - step_end - -BattleFrontier_BattleTowerBattleRoom_Movement_24219A: @ 824219A - set_visible - delay_16 - walk_up - walk_left - walk_left - delay_8 - step_end - -BattleFrontier_BattleTowerBattleRoom_Movement_2421A1: @ 82421A1 - walk_right - walk_right - walk_down - set_invisible - step_end - -BattleFrontier_BattleTowerBattleRoom_Movement_2421A6: @ 82421A6 - delay_16 - delay_16 - delay_16 - delay_16 - step_end - -BattleFrontier_BattleTowerBattleRoom_Movement_2421AB: @ 82421AB - face_right - delay_16 - delay_16 - delay_16 - delay_16 - walk_in_place_right - step_end - -BattleFrontier_BattleTowerBattleRoom_Movement_2421B2: @ 82421B2 - walk_slow_down - walk_slow_down - walk_slow_down - walk_slow_down - face_left - step_end - -BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8:: @ 82421B8 -BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8:: @ 82421B8 - copyvar VAR_RESULT, VAR_0x40CE - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421E8 - compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421F2 - compare VAR_RESULT, 3 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC - warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 6, 6 - waitstate - end - -BattleFrontier_BattleTowerBattleRoom_EventScript_2421E8:: @ 82421E8 - warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 10, 6 - waitstate - end - -BattleFrontier_BattleTowerBattleRoom_EventScript_2421F2:: @ 82421F2 - 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 MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 18, 6 - waitstate - end - -BattleFrontier_BattleTowerBattleRoom_EventScript_24220E:: @ 824220E - setflag FLAG_0x077 - goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03 - end - -BattleFrontier_BattleTowerBattleRoom2_Text_242217: @ 8242217 -BattleFrontier_BattleTowerBattleRoom_Text_242217: @ 8242217 - .string "We will restore your POKéMON to\n" - .string "full health.$" - -BattleFrontier_BattleTowerBattleRoom_Text_242244: @ 8242244 - .string "You will be facing opponent no. {STR_VAR_1}.\n" - .string "Are you ready?$" - -BattleFrontier_BattleTowerBattleRoom_Text_242277: @ 8242277 - .string "You will be facing opponent no. 2.\n" - .string "Are you ready?$" - -BattleFrontier_BattleTowerBattleRoom_Text_2422A9: @ 82422A9 - .string "You will be facing opponent no. 3.\n" - .string "Are you ready?$" - -BattleFrontier_BattleTowerBattleRoom_Text_2422DB: @ 82422DB - .string "You will be facing opponent no. 4.\n" - .string "Are you ready?$" - -BattleFrontier_BattleTowerBattleRoom_Text_24230D: @ 824230D - .string "You will be facing opponent no. 5.\n" - .string "Are you ready?$" - -BattleFrontier_BattleTowerBattleRoom_Text_24233F: @ 824233F - .string "You will be facing opponent no. 6.\n" - .string "Are you ready?$" - -BattleFrontier_BattleTowerBattleRoom_Text_242371: @ 8242371 - .string "You will be facing opponent no. 7.\n" - .string "Are you ready?$" - -BattleFrontier_BattleTowerBattleRoom2_Text_2423A3: @ 82423A3 -BattleFrontier_BattleTowerBattleRoom_Text_2423A3: @ 82423A3 - .string "Record your battle on your\n" - .string "FRONTIER PASS?$" - -BattleFrontier_BattleTowerLobby_Text_2423CD: @ 82423CD - .string "{PLAYER}’s battle was recorded\n" - .string "on the FRONTIER PASS.$" - -BattleFrontier_BattleTowerBattleRoom2_Text_2423FC: @ 82423FC -BattleFrontier_BattleTowerBattleRoom_Text_2423FC: @ 82423FC - .string "Would you like to save and\n" - .string "quit the game?$" - -BattleFrontier_BattleTowerBattleRoom2_Text_242426: @ 8242426 -BattleFrontier_BattleTowerBattleRoom_Text_242426: @ 8242426 - .string "Saving your battle data.\n" - .string "Please wait.$" - -BattleFrontier_BattleTowerBattleRoom2_Text_24244C: @ 824244C -BattleFrontier_BattleTowerBattleRoom_Text_24244C: @ 824244C - .string "Would you like to cancel your BATTLE\n" - .string "ROOM challenge?$" - -gText_BattleRecordCouldntBeSaved:: @ 8242481 - .string "There was an error of some sort.\n" - .string "Your record could not be saved.$" - -BattleFrontier_BattleTowerBattleRoom_Text_2424C2: @ 82424C2 - .string "Excuse me, but…\p" - .string "Our leader, the SALON MAIDEN, is on\n" - .string "her way here in hopes of battling you.\p" - .string "She should be arriving very shortly.$" - -BattleFrontier_BattleTowerBattleRoom_Text_242542: @ 8242542 - .string "You will be facing the SALON MAIDEN.\n" - .string "Are you prepared?$" - -BattleFrontier_BattleTowerBattleRoom_Text_242579: @ 8242579 - .string "Greetings…\n" - .string "My name is ANABEL.\p" - .string "I am the SALON MAIDEN, and I am in\n" - .string "charge of running the BATTLE TOWER…\p" - .string "I have heard several rumors\n" - .string "about you…\p" - .string "In all honesty, what I have heard does\n" - .string "not seem attractive in any way…\p" - .string "The reason I’ve come to see you…\n" - .string "Well, there is but one reason…$" - -BattleFrontier_BattleTowerBattleRoom_Text_24268C: @ 824268C - .string "Let me see your talent in\n" - .string "its entirety…$" - -BattleFrontier_BattleTowerBattleRoom_Text_2426B4: @ 82426B4 - .string "ANABEL: Fufufu, nicely done…\p" - .string "Your FRONTIER PASS, please…\n" - .string "Your talent shall be recognized.$" - -BattleFrontier_BattleTowerBattleRoom_Text_24270E: @ 824270E - .string "The Ability Symbol was embossed on\n" - .string "the FRONTIER PASS!$" - -BattleFrontier_BattleTowerBattleRoom_Text_242744: @ 8242744 - .string "… … … … … …\p" - .string "You have confidence in your POKéMON\n" - .string "battling talent, don’t you?\p" - .string "I urge you to keep battling and\n" - .string "keep on winning.\p" - .string "I will be waiting for you.\n" - .string "Until the next time we meet…$" - -BattleFrontier_BattleTowerBattleRoom_Text_2427F9: @ 82427F9 - .string "ANABEL: You really did come back to\n" - .string "see me…\p" - .string "… … … … … …\p" - .string "You’ve won straight matches to see me…\n" - .string "I won’t have to hold back against you…\p" - .string "It’s been too long now…\p" - .string "Too long since I’ve been able to battle\n" - .string "without thinking about anything…$" - -BattleFrontier_BattleTowerBattleRoom_Text_2428E0: @ 82428E0 - .string "Let’s begin, shall we?$" - -BattleFrontier_BattleTowerBattleRoom_Text_2428F7: @ 82428F7 - .string "ANABEL: Fufu, congratulations…\n" - .string "Your FRONTIER PASS, please…$" - -BattleFrontier_BattleTowerBattleRoom_Text_242932: @ 8242932 - .string "The Ability Symbol took on\n" - .string "a golden shine!$" - -BattleFrontier_BattleTowerBattleRoom_Text_24295D: @ 824295D - .string "That was fun…\p" - .string "I have never had a POKéMON battle\n" - .string "so enjoyable before…\p" - .string "I wish I could battle with you again…$" - diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc deleted file mode 100644 index d1b07451c..000000000 --- a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc +++ /dev/null @@ -1,540 +0,0 @@ -BattleFrontier_BattleTowerBattleRoom2_MapScripts:: @ 8248EE8 - map_script 3, BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8 - map_script 4, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33 - map_script 2, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43 - .byte 0 - -BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8: @ 8248EF8 - compare VAR_0x40CE, 2 - call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F - compare VAR_0x40CE, 3 - call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F - end - -BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F - setvar VAR_0x8004, 14 - special sub_8161F74 - checkplayergender - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29 - setvar VAR_OBJ_GFX_ID_F, 0 - return - -BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29:: @ 8248F29 - setvar VAR_OBJ_GFX_ID_F, 89 - return - -BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F:: @ 8248F2F - special sub_813A76C - return - -BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33: @ 8248F33 - map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D - .2byte 0 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D:: @ 8248F3D - hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2 - end - -BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43: @ 8248F43 - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D - .2byte 0 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D - setvar VAR_TEMP_0, 1 - applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249518 - applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_24951E - waitmovement 0 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4 - applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E - applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E - waitmovement 0 - applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249524 - applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524 - waitmovement 0 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 6 - setvar VAR_0x8006, 1 - special sub_81A1780 - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4 - setvar VAR_0x8004, 3 - special sub_8161F74 - addobject 1 - addobject 4 - applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249528 - applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_24952E - waitmovement 0 - compare VAR_0x40CE, 3 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249026 - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 0 - special sub_8161F74 - delay 15 - applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545 - waitmovement 0 - msgbox 0x2021fc4, 4 - waitmessage - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 1 - special sub_8161F74 - applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545 - waitmovement 0 - msgbox 0x2021fc4, 4 - waitmessage - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249069 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249026:: @ 8249026 - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 0 - special sub_8161F74 - delay 15 - applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545 - waitmovement 0 - messageautoscroll 0x2021fc4 - waitmessage - delay 48 - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 1 - special sub_8161F74 - applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545 - waitmovement 0 - messageautoscroll 0x2021fc4 - waitmessage - delay 48 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249069:: @ 8249069 - call BattleFrontier_BattleTowerBattleRoom2_EventScript_24210E - switch VAR_RESULT - case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA - -BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E:: @ 824907E - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 4 - special sub_81A1780 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - special sub_8161F74 - setvar VAR_0x8004, 3 - special sub_813BF7C - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA:: @ 82490AA - call BattleFrontier_BattleTowerBattleRoom2_EventScript_241EBA - setvar VAR_0x8004, 4 - special sub_8161F74 - switch VAR_RESULT - case 7, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF - applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249534 - applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249539 - waitmovement 0 - removeobject 1 - removeobject 4 - applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E - applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E - waitmovement 0 - applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249524 - applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524 - waitmovement 0 - compare VAR_0x40CE, 3 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249118 - msgbox BattleFrontier_BattleTowerBattleRoom2_Text_242217, 4 - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249121 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249118:: @ 8249118 - messageautoscroll BattleFrontier_BattleTowerBattleRoom2_Text_242217 - waitmessage - delay 48 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121 - special LoadPlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 2 - special sub_81A1780 - compare VAR_0x40CE, 3 - call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249514 - playfanfare MUS_ME_ASA - waitfanfare - special HealPlayerParty - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special sub_81A1780 - call BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD - compare VAR_0x40CE, 3 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249283 - call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1 - multichoice 19, 4, 103, 1 - switch VAR_RESULT - case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249283 - case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2491E7 - case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249223 - case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_249251 - case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1:: @ 82491B1 - multichoice 20, 6, 104, 1 - switch VAR_RESULT - case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249283 - case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249223 - case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249251 - case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_2491E7:: @ 82491E7 - message BattleFrontier_BattleTowerBattleRoom2_Text_2423A3 - waitmessage - multichoicedefault 20, 8, 94, 1, 0 - switch VAR_RESULT - case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 - case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249219 - case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249219:: @ 8249219 - call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8B4 - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249223:: @ 8249223 - msgbox BattleFrontier_BattleTowerBattleRoom2_Text_2423FC, 5 - switch VAR_RESULT - case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 - case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB - case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249251:: @ 8249251 - message BattleFrontier_BattleTowerBattleRoom2_Text_24244C - waitmessage - multichoicedefault 20, 8, 94, 1, 0 - switch VAR_RESULT - case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 - case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E - case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249283:: @ 8249283 - closemessage - clearflag FLAG_0x002 - applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249526 - applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249526 - waitmovement 0 - applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_249541 - applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_249541 - waitmovement 0 - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4 - end - -BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF:: @ 82492AF - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 3 - special sub_81A1780 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - special sub_8161F74 - setvar VAR_0x8004, 3 - special sub_813BF7C - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB - message BattleFrontier_BattleTowerBattleRoom2_Text_242426 - waitmessage - setvar VAR_0x8004, 6 - setvar VAR_0x8005, 2 - special sub_8161F74 - playse SE_SAVE - waitse - fadescreen 1 - setvar VAR_0x8004, 4 - special sub_81A1780 - end - -BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD:: @ 82492FD - compare VAR_0x40CE, 3 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E - copyvar VAR_TEMP_F, VAR_RESULT - switch VAR_TEMP_F - case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249354 - case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_24935B - case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_249362 - case 4, BattleFrontier_BattleTowerBattleRoom2_EventScript_249369 - case 5, BattleFrontier_BattleTowerBattleRoom2_EventScript_249370 - case 6, BattleFrontier_BattleTowerBattleRoom2_EventScript_249377 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249354:: @ 8249354 - message BattleFrontier_BattleTowerBattleRoom2_Text_249547 - waitmessage - return - -BattleFrontier_BattleTowerBattleRoom2_EventScript_24935B:: @ 824935B - message BattleFrontier_BattleTowerBattleRoom2_Text_249578 - waitmessage - return - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249362:: @ 8249362 - message BattleFrontier_BattleTowerBattleRoom2_Text_2495A9 - waitmessage - return - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249369:: @ 8249369 - message BattleFrontier_BattleTowerBattleRoom2_Text_2495DA - waitmessage - return - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249370:: @ 8249370 - message BattleFrontier_BattleTowerBattleRoom2_Text_24960B - waitmessage - return - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249377:: @ 8249377 - message BattleFrontier_BattleTowerBattleRoom2_Text_24963C - waitmessage - return - -BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E:: @ 824937E - copyvar VAR_TEMP_F, VAR_RESULT - switch VAR_TEMP_F - case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493CA - case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493D6 - case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493E2 - case 4, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493EE - case 5, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493FA - case 6, BattleFrontier_BattleTowerBattleRoom2_EventScript_249406 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_2493CA:: @ 82493CA - message BattleFrontier_BattleTowerBattleRoom2_Text_249547 - waitmessage - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417 - end - -BattleFrontier_BattleTowerBattleRoom2_EventScript_2493D6:: @ 82493D6 - message BattleFrontier_BattleTowerBattleRoom2_Text_249578 - waitmessage - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417 - end - -BattleFrontier_BattleTowerBattleRoom2_EventScript_2493E2:: @ 82493E2 - message BattleFrontier_BattleTowerBattleRoom2_Text_2495A9 - waitmessage - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417 - end - -BattleFrontier_BattleTowerBattleRoom2_EventScript_2493EE:: @ 82493EE - message BattleFrontier_BattleTowerBattleRoom2_Text_2495DA - waitmessage - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417 - end - -BattleFrontier_BattleTowerBattleRoom2_EventScript_2493FA:: @ 82493FA - message BattleFrontier_BattleTowerBattleRoom2_Text_24960B - waitmessage - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417 - end - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249406:: @ 8249406 - message BattleFrontier_BattleTowerBattleRoom2_Text_24963C - waitmessage - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417 - end - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249412:: @ 8249412 - waitmessage - delay 48 - return - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249417:: @ 8249417 - checkflag FLAG_0x002 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249457 - multichoice 19, 6, 105, 1 - switch VAR_RESULT - case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249483 - case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8 - case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD - case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD - end - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249457:: @ 8249457 - multichoice 20, 8, 106, 1 - switch VAR_RESULT - case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249483 - case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD - case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD - end - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249483:: @ 8249483 - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 0 - message gText_LinkStandby3 - waitmessage - special sub_813B568 - waitstate - compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249412 - end - -BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8:: @ 82494A8 - message BattleFrontier_BattleTowerBattleRoom2_Text_2423A3 - waitmessage - multichoicedefault 20, 8, 94, 1, 0 - switch VAR_RESULT - case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 - case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 - call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8B4 - setflag FLAG_0x002 - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 - end - -BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD:: @ 82494DD - message BattleFrontier_BattleTowerBattleRoom2_Text_24244C - waitmessage - multichoicedefault 20, 8, 94, 1, 0 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 - end - -BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA:: @ 82494FA - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 0 - message gText_LinkStandby3 - waitmessage - special sub_813B568 - waitstate - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E - end - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249514:: @ 8249514 - special sub_813B534 - return - -BattleFrontier_BattleTowerBattleRoom2_Movement_249518: @ 8249518 - walk_up - walk_up - walk_up - walk_up - face_right - step_end - -BattleFrontier_BattleTowerBattleRoom2_Movement_24951E: @ 824951E - walk_left - walk_up - walk_up - walk_up - face_right - step_end - -BattleFrontier_BattleTowerBattleRoom2_Movement_249524: @ 8249524 - face_left - step_end - -BattleFrontier_BattleTowerBattleRoom2_Movement_249526: @ 8249526 - walk_in_place_fastest_right - step_end - -BattleFrontier_BattleTowerBattleRoom2_Movement_249528: @ 8249528 - walk_down - walk_down - walk_down - walk_down - face_left - step_end - -BattleFrontier_BattleTowerBattleRoom2_Movement_24952E: @ 824952E - walk_right - walk_down - walk_down - walk_down - face_left - step_end - -BattleFrontier_BattleTowerBattleRoom2_Movement_249534: @ 8249534 - walk_up - walk_up - walk_up - set_invisible - step_end - -BattleFrontier_BattleTowerBattleRoom2_Movement_249539: @ 8249539 - walk_up - walk_up - walk_up - walk_up - step_end - -BattleFrontier_BattleTowerBattleRoom2_Movement_24953E: @ 824953E - walk_right - walk_right - step_end - -BattleFrontier_BattleTowerBattleRoom2_Movement_249541: @ 8249541 - walk_left - walk_left - walk_in_place_fastest_right - step_end - -BattleFrontier_BattleTowerBattleRoom2_Movement_249545: @ 8249545 - walk_in_place_left - step_end - -BattleFrontier_BattleTowerBattleRoom2_Text_249547: @ 8249547 - .string "The 2nd set of opponents is next.\n" - .string "Are you ready?$" - -BattleFrontier_BattleTowerBattleRoom2_Text_249578: @ 8249578 - .string "The 3rd set of opponents is next.\n" - .string "Are you ready?$" - -BattleFrontier_BattleTowerBattleRoom2_Text_2495A9: @ 82495A9 - .string "The 4th set of opponents is next.\n" - .string "Are you ready?$" - -BattleFrontier_BattleTowerBattleRoom2_Text_2495DA: @ 82495DA - .string "The 5th set of opponents is next.\n" - .string "Are you ready?$" - -BattleFrontier_BattleTowerBattleRoom2_Text_24960B: @ 824960B - .string "The 6th set of opponents is next.\n" - .string "Are you ready?$" - -BattleFrontier_BattleTowerBattleRoom2_Text_24963C: @ 824963C - .string "The 7th set of opponents is next.\n" - .string "Are you ready?$" - -BattleFrontier_BattleTowerBattleRoom2_Text_24966D: @ 824966D - .string "The 2nd set of opponents is next.\n" - .string "Do your best!$" - -BattleFrontier_BattleTowerBattleRoom2_Text_24969D: @ 824969D - .string "The 3rd set of opponents is next.\n" - .string "Do your best!$" - -BattleFrontier_BattleTowerBattleRoom2_Text_2496CD: @ 82496CD - .string "The 4th set of opponents is next.\n" - .string "Do your best!$" - -BattleFrontier_BattleTowerBattleRoom2_Text_2496FD: @ 82496FD - .string "The 5th set of opponents is next.\n" - .string "Do your best!$" - -BattleFrontier_BattleTowerBattleRoom2_Text_24972D: @ 824972D - .string "The 6th set of opponents is next.\n" - .string "Do your best!$" - -BattleFrontier_BattleTowerBattleRoom2_Text_24975D: @ 824975D - .string "The 7th set of opponents is next.\n" - .string "Do your best!$" - -gText_LinkStandby3:: @ 824978D - .string "Link standby…$" - -gText_YourPartnerHasRetired:: @ 824979B - .string "Your partner has retired.\p" - .string "Your BATTLE ROOM challenge\n" - .string "will be canceled.$" diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc b/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc deleted file mode 100644 index 9ff6bbc59..000000000 --- a/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc +++ /dev/null @@ -1,59 +0,0 @@ -BattleFrontier_BattleTowerCorridor_MapScripts:: @ 8241AAA - map_script 1, BattleFrontier_BattleTowerCorridor_MapScript1_241AB5 - map_script 2, BattleFrontier_BattleTowerCorridor_MapScript2_241AE6 - .byte 0 - -BattleFrontier_BattleTowerCorridor_MapScript1_241AB5: @ 8241AB5 - compare VAR_0x8006, 1 - goto_eq BattleFrontier_BattleTowerCorridor_EventScript_241AD3 - setmetatile 12, 0, 519, 0 - setmetatile 12, 1, 527, 0 - end - -BattleFrontier_BattleTowerCorridor_EventScript_241AD3:: @ 8241AD3 - setmetatile 15, 0, 519, 0 - setmetatile 15, 1, 527, 0 - end - -BattleFrontier_BattleTowerCorridor_MapScript2_241AE6: @ 8241AE6 - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerCorridor_EventScript_241AF0 - .2byte 0 - -BattleFrontier_BattleTowerCorridor_EventScript_241AF0:: @ 8241AF0 - setvar VAR_TEMP_0, 1 - compare VAR_0x8006, 1 - goto_eq BattleFrontier_BattleTowerCorridor_EventScript_241B16 - applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_241B3A - applymovement 255, BattleFrontier_BattleTowerCorridor_Movement_241B39 - waitmovement 0 - goto BattleFrontier_BattleTowerCorridor_EventScript_241B27 - -BattleFrontier_BattleTowerCorridor_EventScript_241B16:: @ 8241B16 - applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_241B37 - applymovement 255, BattleFrontier_BattleTowerCorridor_Movement_241B36 - waitmovement 0 - -BattleFrontier_BattleTowerCorridor_EventScript_241B27:: @ 8241B27 - setvar VAR_TEMP_0, 0 - warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 - waitstate - end - -BattleFrontier_BattleTowerCorridor_Movement_241B36: @ 8241B36 - walk_right - -BattleFrontier_BattleTowerCorridor_Movement_241B37: @ 8241B37 - walk_right - walk_right - -BattleFrontier_BattleTowerCorridor_Movement_241B39: @ 8241B39 - walk_right - -BattleFrontier_BattleTowerCorridor_Movement_241B3A: @ 8241B3A - 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 deleted file mode 100644 index 36cf93ada..000000000 --- a/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc +++ /dev/null @@ -1,172 +0,0 @@ -BattleFrontier_BattleTowerCorridor2_MapScripts:: @ 8248D4A - map_script 3, BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A - map_script 4, BattleFrontier_BattleTowerCorridor2_MapScript2_248D95 - map_script 2, BattleFrontier_BattleTowerCorridor2_MapScript2_248DB2 - .byte 0 - -BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A: @ 8248D5A - compare VAR_0x40CE, 2 - call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248D71 - compare VAR_0x40CE, 3 - call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248D91 - end - -BattleFrontier_BattleTowerCorridor2_EventScript_248D71:: @ 8248D71 - setvar VAR_0x8004, 14 - special sub_8161F74 - checkplayergender - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D8B - setvar VAR_OBJ_GFX_ID_F, 0 - return - -BattleFrontier_BattleTowerCorridor2_EventScript_248D8B:: @ 8248D8B - setvar VAR_OBJ_GFX_ID_F, 89 - return - -BattleFrontier_BattleTowerCorridor2_EventScript_248D91:: @ 8248D91 - special sub_813A76C - return - -BattleFrontier_BattleTowerCorridor2_MapScript2_248D95: @ 8248D95 - map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerCorridor2_EventScript_248D9F - .2byte 0 - -BattleFrontier_BattleTowerCorridor2_EventScript_248D9F:: @ 8248D9F - 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 - -BattleFrontier_BattleTowerCorridor2_MapScript2_248DB2: @ 8248DB2 - map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerCorridor2_EventScript_248DBC - .2byte 0 - -BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC - lockall - setflag FLAG_SPECIAL_FLAG_0x4002 - setvar VAR_0x8004, 14 - setvar VAR_0x8005, 1 - opendoor 1, 1 - waitdooranim - clearflag FLAG_SPECIAL_FLAG_0x4002 - 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 - setflag FLAG_SPECIAL_FLAG_0x4002 - setvar VAR_0x8004, 14 - setvar VAR_0x8005, 1 - closedoor 1, 1 - waitdooranim - clearflag FLAG_SPECIAL_FLAG_0x4002 - applymovement 1, BattleFrontier_BattleTowerCorridor2_Movement_248EBC - applymovement 4, BattleFrontier_BattleTowerCorridor2_Movement_248EC4 - applymovement 3, BattleFrontier_BattleTowerCorridor2_Movement_248ECC - applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_248ED5 - waitmovement 0 - delay 40 - applymovement 3, BattleFrontier_BattleTowerCorridor2_Movement_2725A6 - applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_2725A6 - waitmovement 0 - opendoor 7, 1 - waitdooranim - applymovement 3, BattleFrontier_BattleTowerCorridor2_Movement_248EE3 - applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_248EE3 - applymovement 1, BattleFrontier_BattleTowerCorridor2_Movement_248EDE - applymovement 4, BattleFrontier_BattleTowerCorridor2_Movement_248EDE - waitmovement 0 - closedoor 7, 1 - waitdooranim - delay 30 - setvar VAR_TEMP_1, 1 - call BattleFrontier_BattleTowerCorridor2_EventScript_248E71 - releaseall - end - -BattleFrontier_BattleTowerCorridor2_EventScript_248E71:: @ 8248E71 - compare VAR_0x40CE, 0 - call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248E9E - compare VAR_0x40CE, 1 - call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248E9E - compare VAR_0x40CE, 2 - call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248EA8 - compare VAR_0x40CE, 3 - call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248EB2 - return - -BattleFrontier_BattleTowerCorridor2_EventScript_248E9E:: @ 8248E9E - warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 - waitstate - return - -BattleFrontier_BattleTowerCorridor2_EventScript_248EA8:: @ 8248EA8 - warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2, 255, 4, 5 - waitstate - return - -BattleFrontier_BattleTowerCorridor2_EventScript_248EB2:: @ 8248EB2 - warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2, 255, 4, 5 - waitstate - return - -BattleFrontier_BattleTowerCorridor2_Movement_248EBC: @ 8248EBC - walk_down - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - step_end - -BattleFrontier_BattleTowerCorridor2_Movement_248EC4: @ 8248EC4 - walk_down - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - step_end - -BattleFrontier_BattleTowerCorridor2_Movement_248ECC: @ 8248ECC - 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 - 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 - delay_16 - walk_up - walk_up - set_invisible - step_end - -BattleFrontier_BattleTowerCorridor2_Movement_248EE3: @ 8248EE3 - walk_up - set_invisible - step_end - -BattleFrontier_BattleTowerCorridor2_Movement_248EE6: @ 8248EE6 - walk_down - step_end - diff --git a/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc b/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc deleted file mode 100644 index 248c1f9ca..000000000 --- a/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc +++ /dev/null @@ -1,91 +0,0 @@ -BattleFrontier_BattleTowerElevator_MapScripts:: @ 82419DB - map_script 2, BattleFrontier_BattleTowerElevator_MapScript2_2419E6 - map_script 4, BattleFrontier_BattleTowerElevator_MapScript2_241A96 - .byte 0 - -BattleFrontier_BattleTowerElevator_MapScript2_2419E6: @ 82419E6 - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerElevator_EventScript_2419F0 - .2byte 0 - -BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0 - setvar VAR_TEMP_0, 1 - applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A86 - applymovement 255, BattleFrontier_BattleTowerElevator_Movement_241A8A - waitmovement 0 - special sub_813A080 - waitse - special sub_8139A78 - waitstate - delay 48 - applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A8E - applymovement 255, BattleFrontier_BattleTowerElevator_Movement_241A92 - waitmovement 0 - call BattleFrontier_BattleTowerElevator_EventScript_241A28 - end - -BattleFrontier_BattleTowerElevator_EventScript_241A28:: @ 8241A28 - compare VAR_0x40CE, 0 - call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A55 - compare VAR_0x40CE, 1 - call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A55 - compare VAR_0x40CE, 2 - call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A5F - compare VAR_0x40CE, 3 - call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A72 - return - -BattleFrontier_BattleTowerElevator_EventScript_241A55:: @ 8241A55 - 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 MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2, 255, 7, 2 - waitstate - return - -BattleFrontier_BattleTowerElevator_EventScript_241A72:: @ 8241A72 - warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2, 255, 7, 2 - waitstate - return - -BattleFrontier_BattleTowerElevator_EventScript_241A7C:: @ 8241A7C - warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 1 - waitstate - return - -BattleFrontier_BattleTowerElevator_Movement_241A86: @ 8241A86 - walk_up - walk_right - face_down - step_end - -BattleFrontier_BattleTowerElevator_Movement_241A8A: @ 8241A8A - walk_up - walk_up - face_down - step_end - -BattleFrontier_BattleTowerElevator_Movement_241A8E: @ 8241A8E - walk_down - walk_down - set_invisible - step_end - -BattleFrontier_BattleTowerElevator_Movement_241A92: @ 8241A92 - walk_right - walk_down - walk_down - step_end - -BattleFrontier_BattleTowerElevator_MapScript2_241A96: @ 8241A96 - map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerElevator_EventScript_241AA0 - .2byte 0 - -BattleFrontier_BattleTowerElevator_EventScript_241AA0:: @ 8241AA0 - setvar VAR_TEMP_1, 1 - turnobject 255, 2 - end - diff --git a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc deleted file mode 100644 index 478d61656..000000000 --- a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc +++ /dev/null @@ -1,1589 +0,0 @@ -BattleFrontier_BattleTowerLobby_MapScripts:: @ 823E67B - map_script 5, BattleFrontier_BattleTowerLobby_MapScript1_23E690 - map_script 3, BattleFrontier_BattleTowerLobby_MapScript1_23E694 - map_script 2, BattleFrontier_BattleTowerLobby_MapScript2_23E6DD - map_script 4, BattleFrontier_BattleTowerLobby_MapScript2_23E6C9 - .byte 0 - -BattleFrontier_BattleTowerLobby_MapScript1_23E690: @ 823E690 - special sub_81653CC - end - -BattleFrontier_BattleTowerLobby_MapScript1_23E694: @ 823E694 - call BattleFrontier_BattleTowerLobby_EventScript_28CC84 - setvar VAR_0x8004, 10 - special sub_81A085C - compare VAR_0x8004, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E6B5 - checkflag FLAG_0x934 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E6C1 - -BattleFrontier_BattleTowerLobby_EventScript_23E6B5:: @ 823E6B5 - clearflag FLAG_0x2BD - setvar VAR_0x8004, 23 - special sub_81A085C - -BattleFrontier_BattleTowerLobby_EventScript_23E6C0:: @ 823E6C0 - end - -BattleFrontier_BattleTowerLobby_EventScript_23E6C1:: @ 823E6C1 - setflag FLAG_0x2BD - goto BattleFrontier_BattleTowerLobby_EventScript_23E6C0 - -BattleFrontier_BattleTowerLobby_MapScript2_23E6C9: @ 823E6C9 - map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerLobby_EventScript_23E6D3 - .2byte 0 - -BattleFrontier_BattleTowerLobby_EventScript_23E6D3:: @ 823E6D3 - setvar VAR_TEMP_1, 1 - turnobject 255, 2 - end - -BattleFrontier_BattleTowerLobby_MapScript2_23E6DD: @ 823E6DD - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E707 - map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattleTowerLobby_EventScript_23E710 - map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattleTowerLobby_EventScript_23E8EE - map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattleTowerLobby_EventScript_23E758 - map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattleTowerLobby_EventScript_23E7F2 - .2byte 0 - -BattleFrontier_BattleTowerLobby_EventScript_23E707:: @ 823E707 - setvar VAR_0x8004, 0 - special sub_81A1780 - end - -BattleFrontier_BattleTowerLobby_EventScript_23E710:: @ 823E710 - lock - faceplayer - msgbox BattleFrontier_BattleTowerLobby_Text_23F583, 4 - closemessage - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 0 - special sub_8161F74 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 0 - special sub_8161F74 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_TEMP_0, 255 - release - end - -BattleFrontier_BattleTowerLobby_EventScript_23E758:: @ 823E758 - lock - faceplayer - setvar VAR_0x8004, 10 - special sub_81A1780 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E778 - message BattleFrontier_BattleTowerLobby_Text_23F60D - waitmessage - goto BattleFrontier_BattleTowerLobby_EventScript_23E780 - -BattleFrontier_BattleTowerLobby_EventScript_23E778:: @ 823E778 - msgbox BattleFrontier_BattleTowerLobby_Text_241486, 4 - -BattleFrontier_BattleTowerLobby_EventScript_23E780:: @ 823E780 - setvar VAR_0x8004, 5 - special sub_8161F74 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E7A5 - message BattleFrontier_BattleTowerLobby_Text_23F844 - waitmessage - playfanfare MUS_FANFA4 - waitfanfare - msgbox BattleFrontier_BattleTowerLobby_Text_23F89F, 4 - -BattleFrontier_BattleTowerLobby_EventScript_23E7A5:: @ 823E7A5 - msgbox BattleFrontier_BattleTowerLobby_Text_2414D4, 4 - setvar VAR_0x8004, 11 - special sub_81A1780 - msgbox BattleFrontier_BattleTowerLobby_Text_241520, 9 - call BattleFrontier_BattleTowerLobby_EventScript_23E84D - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - special sub_8161F74 - compare VAR_RESULT, 49 - goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E7E2 - msgbox BattleFrontier_BattleTowerLobby_Text_23F79D, 4 - -BattleFrontier_BattleTowerLobby_EventScript_23E7E2:: @ 823E7E2 - msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, 4 - closemessage - setvar VAR_TEMP_0, 255 - release - end - -BattleFrontier_BattleTowerLobby_EventScript_23E7F2:: @ 823E7F2 - compare VAR_0x40CE, 2 - goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E81E - checkflag FLAG_0x152 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E81E - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - special sub_8161F74 - compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E830 - -BattleFrontier_BattleTowerLobby_EventScript_23E81E:: @ 823E81E - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 0 - special sub_8161F74 - -BattleFrontier_BattleTowerLobby_EventScript_23E830:: @ 823E830 - lock - faceplayer - message BattleFrontier_BattleTowerLobby_Text_23F6F7 - waitmessage - call BattleFrontier_BattleTowerLobby_EventScript_23E84D - msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, 4 - closemessage - setvar VAR_TEMP_0, 255 - release - end - -BattleFrontier_BattleTowerLobby_EventScript_23E84D:: @ 823E84D - message BattleFrontier_BattleTowerLobby_Text_23F70F - waitmessage - setvar VAR_0x8004, 8 - special sub_81A1780 - special LoadPlayerParty - special HealPlayerParty - setvar VAR_0x8004, 6 - setvar VAR_0x8005, 0 - special sub_8161F74 - playse SE_SAVE - waitse - call BattleFrontier_BattleTowerLobby_EventScript_23E8E0 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E8DF - message BattleFrontier_BattleTowerLobby_Text_23FE3C - waitmessage - multichoicedefault 20, 8, 94, 1, 0 - switch VAR_RESULT - case 1, BattleFrontier_BattleTowerLobby_EventScript_23E8DF - case 0, BattleFrontier_BattleTowerLobby_EventScript_23E8B4 - case 127, BattleFrontier_BattleTowerLobby_EventScript_23E8DF - -BattleFrontier_BattleArenaBattleRoom_EventScript_23E8B4:: @ 823E8B4 -BattleFrontier_BattleArenaLobby_EventScript_23E8B4:: @ 823E8B4 -BattleFrontier_BattleDomeLobby_EventScript_23E8B4:: @ 823E8B4 -BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8B4:: @ 823E8B4 -BattleFrontier_BattleFactoryLobby_EventScript_23E8B4:: @ 823E8B4 -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8B4:: @ 823E8B4 -BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8B4:: @ 823E8B4 -BattleFrontier_BattlePalaceLobby_EventScript_23E8B4:: @ 823E8B4 -BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8B4:: @ 823E8B4 -BattleFrontier_BattleTowerBattleRoom_EventScript_23E8B4:: @ 823E8B4 -BattleFrontier_BattleTowerLobby_EventScript_23E8B4:: @ 823E8B4 - setvar VAR_0x8004, 19 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E8D7 - playse SE_SAVE - msgbox BattleFrontier_BattleTowerLobby_Text_2423CD, 4 - goto BattleFrontier_BattleTowerLobby_EventScript_23E8DF - -BattleFrontier_BattleTowerLobby_EventScript_23E8D7:: @ 823E8D7 - msgbox gText_BattleRecordCouldntBeSaved, 4 - -BattleFrontier_BattleTowerLobby_EventScript_23E8DF:: @ 823E8DF - return - -BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0:: @ 823E8E0 -BattleFrontier_BattleArenaLobby_EventScript_23E8E0:: @ 823E8E0 -BattleFrontier_BattleDomeLobby_EventScript_23E8E0:: @ 823E8E0 -BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8E0:: @ 823E8E0 -BattleFrontier_BattleFactoryLobby_EventScript_23E8E0:: @ 823E8E0 -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0:: @ 823E8E0 -BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0:: @ 823E8E0 -BattleFrontier_BattlePalaceLobby_EventScript_23E8E0:: @ 823E8E0 -BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0:: @ 823E8E0 -BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0:: @ 823E8E0 -BattleFrontier_BattleTowerLobby_EventScript_23E8E0:: @ 823E8E0 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 6 - special sub_81A1780 - return - -BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE - lock - faceplayer - compare VAR_0x40CE, 0 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23E930 - message BattleFrontier_BattleTowerLobby_Text_23F737 - waitmessage - message BattleFrontier_BattleTowerLobby_Text_23F754 - waitmessage - setvar VAR_0x8004, 6 - setvar VAR_0x8005, 1 - special sub_8161F74 - playse SE_SAVE - waitse - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 0 - special sub_81A1780 - goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 - end - -BattleFrontier_BattleTowerLobby_EventScript_23E930:: @ 823E930 - setvar VAR_0x40BC, 1 - return - -BattleFrontier_BattleTowerLobby_EventScript_23E936:: @ 823E936 - lock - faceplayer - setvar VAR_FRONTIER_FACILITY, 0 - special SavePlayerParty - msgbox BattleFrontier_BattleTowerLobby_Text_240537, 4 - -BattleFrontier_BattleTowerLobby_EventScript_23E948:: @ 823E948 - message BattleFrontier_BattleTowerLobby_Text_2405B3 - waitmessage - multichoice 17, 6, 23, 0 - switch VAR_RESULT - case 0, BattleFrontier_BattleTowerLobby_EventScript_23E984 - case 1, BattleFrontier_BattleTowerLobby_EventScript_23EA91 - case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - -BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984 - setvar VAR_0x40CE, 0 - message BattleFrontier_BattleTowerLobby_Text_23FD3B - waitmessage - multichoice 17, 6, 24, 0 - switch VAR_RESULT - case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - setvar VAR_0x8004, 15 - special sub_81A1780 - compare VAR_0x8004, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 - msgbox BattleFrontier_BattleTowerLobby_Text_2407A6, 4 - fadescreen 1 - call BattleFrontier_BattleTowerLobby_EventScript_23F2B7 - copyvar VAR_0x8004, VAR_RESULT - setvar VAR_0x8005, 3 - special sub_80F9490 - waitstate - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5 - switch VAR_RESULT - case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - case 1, BattleFrontier_BattleTowerLobby_EventScript_23EA2A - case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - -BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 4 - special sub_81A1780 - setvar VAR_TEMP_0, 0 - setvar VAR_0x8004, 0 - special sub_8161F74 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 1 - special sub_8161F74 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 0 - special sub_81A1780 - special LoadPlayerParty - closemessage - delay 2 - call BattleFrontier_BattleTowerLobby_EventScript_27134F - setvar VAR_TEMP_0, 255 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 - incrementgamestat 30 - setvar VAR_0x40BC, 1 - goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 - end - -BattleFrontier_BattleTowerLobby_EventScript_23EA91:: @ 823EA91 - msgbox BattleFrontier_BattleTowerLobby_Text_2405EC, 4 - goto BattleFrontier_BattleTowerLobby_EventScript_23E948 - end - -BattleFrontier_BattleTowerLobby_EventScript_23EA9F:: @ 823EA9F - lock - faceplayer - setvar VAR_FRONTIER_FACILITY, 0 - special SavePlayerParty - msgbox BattleFrontier_BattleTowerLobby_Text_2407E2, 4 - -BattleFrontier_BattleTowerLobby_EventScript_23EAB1:: @ 823EAB1 - message BattleFrontier_BattleTowerLobby_Text_24085E - waitmessage - multichoice 17, 6, 23, 0 - switch VAR_RESULT - case 0, BattleFrontier_BattleTowerLobby_EventScript_23EAED - case 1, BattleFrontier_BattleTowerLobby_EventScript_23EBFA - case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - -BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED - setvar VAR_0x40CE, 1 - message BattleFrontier_BattleTowerLobby_Text_23FD3B - waitmessage - multichoice 17, 6, 24, 0 - switch VAR_RESULT - case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - setvar VAR_0x8004, 15 - special sub_81A1780 - compare VAR_0x8004, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 - msgbox BattleFrontier_BattleTowerLobby_Text_240A50, 4 - fadescreen 1 - call BattleFrontier_BattleTowerLobby_EventScript_23F2B7 - copyvar VAR_0x8004, VAR_RESULT - setvar VAR_0x8005, 4 - special sub_80F9490 - waitstate - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5 - switch VAR_RESULT - case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - case 1, BattleFrontier_BattleTowerLobby_EventScript_23EB93 - case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - -BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 4 - special sub_81A1780 - setvar VAR_TEMP_0, 0 - setvar VAR_0x8004, 0 - special sub_8161F74 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 1 - special sub_8161F74 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 0 - special sub_81A1780 - special LoadPlayerParty - closemessage - delay 2 - call BattleFrontier_BattleTowerLobby_EventScript_27134F - setvar VAR_TEMP_0, 255 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 - incrementgamestat 30 - setvar VAR_0x40BC, 0 - goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 - end - -BattleFrontier_BattleTowerLobby_EventScript_23EBFA:: @ 823EBFA - msgbox BattleFrontier_BattleTowerLobby_Text_240897, 4 - goto BattleFrontier_BattleTowerLobby_EventScript_23EAB1 - end - -BattleFrontier_BattleTowerLobby_EventScript_23EC08:: @ 823EC08 - lock - faceplayer - setvar VAR_FRONTIER_FACILITY, 0 - clearflag FLAG_0x152 - special SavePlayerParty - msgbox BattleFrontier_BattleTowerLobby_Text_240A8B, 4 - -BattleFrontier_BattleTowerLobby_EventScript_23EC1D:: @ 823EC1D - message BattleFrontier_BattleTowerLobby_Text_240B06 - waitmessage - multichoice 17, 6, 23, 0 - switch VAR_RESULT - case 0, BattleFrontier_BattleTowerLobby_EventScript_23EC59 - case 1, BattleFrontier_BattleTowerLobby_EventScript_23ED66 - case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - -BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59 - setvar VAR_0x40CE, 2 - message BattleFrontier_BattleTowerLobby_Text_23FD3B - waitmessage - multichoice 17, 6, 24, 0 - switch VAR_RESULT - case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - setvar VAR_0x8004, 15 - special sub_81A1780 - compare VAR_0x8004, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 - msgbox BattleFrontier_BattleTowerLobby_Text_240DDB, 4 - fadescreen 1 - call BattleFrontier_BattleTowerLobby_EventScript_23F2B7 - copyvar VAR_0x8004, VAR_RESULT - setvar VAR_0x8005, 2 - special sub_80F9490 - waitstate - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5 - switch VAR_RESULT - case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - case 1, BattleFrontier_BattleTowerLobby_EventScript_23ECFF - case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - -BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 4 - special sub_81A1780 - setvar VAR_TEMP_0, 0 - setvar VAR_0x8004, 0 - special sub_8161F74 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 1 - special sub_8161F74 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 0 - special sub_81A1780 - special LoadPlayerParty - closemessage - delay 2 - call BattleFrontier_BattleTowerLobby_EventScript_27134F - setvar VAR_TEMP_0, 255 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 - incrementgamestat 30 - setvar VAR_0x40BC, 0 - goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 - end - -BattleFrontier_BattleTowerLobby_EventScript_23ED66:: @ 823ED66 - msgbox BattleFrontier_BattleTowerLobby_Text_240B3E, 4 - goto BattleFrontier_BattleTowerLobby_EventScript_23EC1D - end - -BattleFrontier_BattleTowerLobby_EventScript_23ED74:: @ 823ED74 - lock - faceplayer - setvar VAR_FRONTIER_FACILITY, 0 - special SavePlayerParty - msgbox BattleFrontier_BattleTowerLobby_Text_240E15, 4 - -BattleFrontier_BattleTowerLobby_EventScript_23ED86:: @ 823ED86 - message BattleFrontier_BattleTowerLobby_Text_240E95 - waitmessage - multichoice 17, 6, 23, 0 - switch VAR_RESULT - case 0, BattleFrontier_BattleTowerLobby_EventScript_23EDC2 - case 1, BattleFrontier_BattleTowerLobby_EventScript_23F3DA - case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - -BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2 - setvar VAR_0x40CE, 3 - message BattleFrontier_BattleTowerLobby_Text_23FD3B - waitmessage - multichoice 17, 6, 24, 0 - switch VAR_RESULT - case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - setvar VAR_0x8004, 15 - special sub_81A1780 - compare VAR_0x8004, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 - msgbox BattleFrontier_BattleTowerLobby_Text_24115E, 4 - fadescreen 1 - call BattleFrontier_BattleTowerLobby_EventScript_23F2B7 - copyvar VAR_0x8004, VAR_RESULT - setvar VAR_0x8005, 2 - special sub_80F9490 - waitstate - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5 - switch VAR_RESULT - case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - case 1, BattleFrontier_BattleTowerLobby_EventScript_23EE68 - case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - -BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 4 - special sub_81A1780 - setvar VAR_TEMP_0, 0 - setvar VAR_0x8004, 0 - special sub_8161F74 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 1 - special sub_8161F74 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 0 - special sub_81A1780 - special LoadPlayerParty - closemessage - delay 2 - setvar VAR_0x8004, 6 - setvar VAR_0x8005, 0 - special sub_8161F74 - call BattleFrontier_BattleTowerLobby_EventScript_27134F - setvar VAR_TEMP_0, 255 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 - incrementgamestat 30 - specialvar VAR_RESULT, sub_80093CC - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3E8 - goto BattleFrontier_BattleTowerLobby_EventScript_23F2C5 - end - -BattleFrontier_BattleTowerLobby_EventScript_23EEE7:: @ 823EEE7 - lock - faceplayer - message BattleFrontier_BattleTowerLobby_Text_23F8CD - waitmessage - multichoice 16, 4, 109, 0 - switch VAR_RESULT - case 0, BattleFrontier_BattleTowerLobby_EventScript_23EF32 - case 1, BattleFrontier_BattleTowerLobby_EventScript_23EF4C - case 2, BattleFrontier_BattleTowerLobby_EventScript_23EF66 - case 3, BattleFrontier_BattleTowerLobby_EventScript_23EF80 - case 127, BattleFrontier_BattleTowerLobby_EventScript_23EF80 - release - end - -BattleFrontier_BattleTowerLobby_EventScript_23EF32:: @ 823EF32 - msgbox BattleFrontier_BattleTowerLobby_Text_23F969, 4 - setvar VAR_0x8004, 1 - call BattleFrontier_BattleTowerLobby_EventScript_271E7C - lock - faceplayer - goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A - end - -BattleFrontier_BattleTowerLobby_EventScript_23EF4C:: @ 823EF4C - msgbox BattleFrontier_BattleTowerLobby_Text_23F9AA, 4 - setvar VAR_0x8004, 2 - call BattleFrontier_BattleTowerLobby_EventScript_271E7C - lock - faceplayer - goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A - end - -BattleFrontier_BattleTowerLobby_EventScript_23EF66:: @ 823EF66 - msgbox BattleFrontier_BattleTowerLobby_Text_23F9D4, 4 - setvar VAR_0x8004, 3 - call BattleFrontier_BattleTowerLobby_EventScript_271E7C - lock - faceplayer - goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A - end - -BattleFrontier_BattleTowerLobby_EventScript_23EF80:: @ 823EF80 - msgbox BattleFrontier_BattleTowerLobby_Text_23FA0F, 4 - release - end - -BattleFrontier_BattleTowerLobby_EventScript_23EF8A:: @ 823EF8A - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23EFA1 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23EFAB - end - -BattleFrontier_BattleTowerLobby_EventScript_23EFA1:: @ 823EFA1 - msgbox BattleFrontier_BattleTowerLobby_Text_23FA4F, 4 - release - end - -BattleFrontier_BattleTowerLobby_EventScript_23EFAB:: @ 823EFAB - msgbox BattleFrontier_BattleTowerLobby_Text_23FA83, 4 - release - end - -BattleFrontier_BattleTowerLobby_EventScript_23EFB5:: @ 823EFB5 - msgbox BattleFrontier_BattleTowerLobby_Text_23FAC0, 2 - end - -BattleFrontier_BattleTowerLobby_EventScript_23EFBE:: @ 823EFBE - msgbox BattleFrontier_BattleTowerLobby_Text_23FB26, 2 - end - -BattleFrontier_BattleTowerLobby_EventScript_23EFC7:: @ 823EFC7 - lockall - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special sub_81A1780 - waitbuttonpress - special RemoveRecordsWindow - releaseall - end - -BattleFrontier_BattleTowerLobby_EventScript_23EFE0:: @ 823EFE0 - lockall - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 1 - special sub_81A1780 - waitbuttonpress - special RemoveRecordsWindow - releaseall - end - -BattleFrontier_BattleTowerLobby_EventScript_23EFF9:: @ 823EFF9 - lockall - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 2 - special sub_81A1780 - waitbuttonpress - special RemoveRecordsWindow - releaseall - end - -BattleFrontier_BattleTowerLobby_EventScript_23F012:: @ 823F012 - lockall - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 3 - special sub_81A1780 - waitbuttonpress - special RemoveRecordsWindow - releaseall - end - -BattleFrontier_BattleTowerLobby_EventScript_23F02B:: @ 823F02B - switch VAR_RESULT - case 0, BattleFrontier_BattleTowerLobby_EventScript_23F046 - case 1, BattleFrontier_BattleTowerLobby_EventScript_23F08B - -BattleFrontier_BattleTowerLobby_EventScript_23F046:: @ 823F046 - switch VAR_0x40CE - case 0, BattleFrontier_BattleTowerLobby_EventScript_23F06F - case 1, BattleFrontier_BattleTowerLobby_EventScript_23F07D - msgbox BattleFrontier_BattleTowerLobby_Text_24038B, 4 - goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 - end - -BattleFrontier_BattleTowerLobby_EventScript_23F06F:: @ 823F06F - msgbox BattleFrontier_BattleTowerLobby_Text_240027, 4 - goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 - end - -BattleFrontier_BattleTowerLobby_EventScript_23F07D:: @ 823F07D - msgbox BattleFrontier_BattleTowerLobby_Text_2401DB, 4 - goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 - end - -BattleFrontier_BattleTowerLobby_EventScript_23F08B:: @ 823F08B - switch VAR_0x40CE - case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0B4 - case 1, BattleFrontier_BattleTowerLobby_EventScript_23F0C2 - msgbox BattleFrontier_BattleTowerLobby_Text_24046B, 4 - goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 - end - -BattleFrontier_BattleTowerLobby_EventScript_23F0B4:: @ 823F0B4 - msgbox BattleFrontier_BattleTowerLobby_Text_24010B, 4 - goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 - end - -BattleFrontier_BattleTowerLobby_EventScript_23F0C2:: @ 823F0C2 - msgbox BattleFrontier_BattleTowerLobby_Text_2402BD, 4 - goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 - end - -BattleFrontier_BattleTowerLobby_EventScript_23F0D0:: @ 823F0D0 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - special sub_81A1780 - goto BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - end - -BattleFrontier_BattleTowerLobby_EventScript_23F0E3:: @ 823F0E3 - special LoadPlayerParty - -BattleFrontier_BattleTowerLobby_EventScript_23F0E6:: @ 823F0E6 - special CloseLink - msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, 4 - -BattleFrontier_BattleTowerLobby_EventScript_23F0F1:: @ 823F0F1 - release - end - -BattleFrontier_BattleTowerLobby_EventScript_23F0F3:: @ 823F0F3 - special SavePlayerParty - setvar VAR_0x8004, 3 - call BattleFrontier_BattleTowerLobby_EventScript_23F272 - special sub_81A1780 - setvar VAR_RESULT, 0 - -BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108 - setvar VAR_0x8004, 12 - special sub_8161F74 - delay 1 - compare VAR_RESULT, 6 - goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23F108 - call BattleFrontier_BattleTowerLobby_EventScript_23F135 - clearflag FLAG_0x077 - warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6 - setvar VAR_TEMP_0, 0 - waitstate - end - -BattleFrontier_BattleTowerLobby_EventScript_23F135:: @ 823F135 - call BattleFrontier_BattleTowerLobby_EventScript_23F1A7 - compare VAR_0x40CE, 3 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F152 - msgbox BattleFrontier_BattleTowerLobby_Text_23FE11, 4 - goto BattleFrontier_BattleTowerLobby_EventScript_23F15B - -BattleFrontier_BattleTowerLobby_EventScript_23F152:: @ 823F152 - messageautoscroll BattleFrontier_BattleTowerLobby_Text_23FE11 - waitmessage - delay 48 - -BattleFrontier_BattleTowerLobby_EventScript_23F15B:: @ 823F15B - closemessage - call BattleFrontier_BattleTowerLobby_EventScript_23F1E8 - call BattleFrontier_BattleTowerLobby_EventScript_23F22D - applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerLobby_Movement_23F195 - applymovement 255, BattleFrontier_BattleTowerLobby_Movement_23F195 - waitmovement 0 - opendoor VAR_0x8004, 1 - waitdooranim - applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerLobby_Movement_23F199 - applymovement 255, BattleFrontier_BattleTowerLobby_Movement_23F19C - waitmovement 0 - closedoor VAR_0x8004, 1 - waitdooranim - return - -BattleFrontier_BattleTowerLobby_Movement_23F195: @ 823F195 - walk_up - walk_up - walk_up - step_end - -BattleFrontier_BattleTowerLobby_Movement_23F199: @ 823F199 - walk_up - set_invisible - step_end - -BattleFrontier_BattleTowerLobby_Movement_23F19C: @ 823F19C - walk_up - walk_up - set_invisible - step_end - -BattleFrontier_BattleTowerLobby_Movement_23F1A0: @ 823F1A0 - walk_fast_up - walk_fast_up - walk_fast_up - walk_fast_up - walk_fast_up - set_invisible - step_end - -BattleFrontier_BattleTowerLobby_EventScript_23F1A7:: @ 823F1A7 - compare VAR_0x40CE, 0 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1D4 - compare VAR_0x40CE, 1 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1D9 - compare VAR_0x40CE, 2 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1DE - compare VAR_0x40CE, 3 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1E3 - return - -BattleFrontier_BattleTowerLobby_EventScript_23F1D4:: @ 823F1D4 - bufferstdstring 0, 19 - return - -BattleFrontier_BattleTowerLobby_EventScript_23F1D9:: @ 823F1D9 - bufferstdstring 0, 20 - return - -BattleFrontier_BattleTowerLobby_EventScript_23F1DE:: @ 823F1DE - bufferstdstring 0, 21 - return - -BattleFrontier_BattleTowerLobby_EventScript_23F1E3:: @ 823F1E3 - bufferstdstring 0, 22 - return - -BattleFrontier_BattleTowerLobby_EventScript_23F1E8:: @ 823F1E8 - compare VAR_0x40CE, 0 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F215 - compare VAR_0x40CE, 1 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F21B - compare VAR_0x40CE, 2 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F221 - compare VAR_0x40CE, 3 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F227 - return - -BattleFrontier_BattleTowerLobby_EventScript_23F215:: @ 823F215 - setvar VAR_LAST_TALKED, 1 - return - -BattleFrontier_BattleTowerLobby_EventScript_23F21B:: @ 823F21B - setvar VAR_LAST_TALKED, 7 - return - -BattleFrontier_BattleTowerLobby_EventScript_23F221:: @ 823F221 - setvar VAR_LAST_TALKED, 8 - return - -BattleFrontier_BattleTowerLobby_EventScript_23F227:: @ 823F227 - setvar VAR_LAST_TALKED, 9 - return - -BattleFrontier_BattleTowerLobby_EventScript_23F22D:: @ 823F22D - compare VAR_0x40CE, 0 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F25A - compare VAR_0x40CE, 1 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F260 - compare VAR_0x40CE, 2 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F266 - compare VAR_0x40CE, 3 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F26C - return - -BattleFrontier_BattleTowerLobby_EventScript_23F25A:: @ 823F25A - setvar VAR_0x8004, 6 - return - -BattleFrontier_BattleTowerLobby_EventScript_23F260:: @ 823F260 - setvar VAR_0x8004, 10 - return - -BattleFrontier_BattleTowerLobby_EventScript_23F266:: @ 823F266 - setvar VAR_0x8004, 14 - return - -BattleFrontier_BattleTowerLobby_EventScript_23F26C:: @ 823F26C - setvar VAR_0x8004, 18 - return - -BattleFrontier_BattleTowerLobby_EventScript_23F272:: @ 823F272 - compare VAR_0x40CE, 0 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F29F - compare VAR_0x40CE, 1 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2A5 - compare VAR_0x40CE, 2 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2AB - compare VAR_0x40CE, 3 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2B1 - return - -BattleFrontier_BattleTowerLobby_EventScript_23F29F:: @ 823F29F - setvar VAR_0x8005, 3 - return - -BattleFrontier_BattleTowerLobby_EventScript_23F2A5:: @ 823F2A5 - setvar VAR_0x8005, 4 - return - -BattleFrontier_BattleTowerLobby_EventScript_23F2AB:: @ 823F2AB - setvar VAR_0x8005, 2 - return - -BattleFrontier_BattleTowerLobby_EventScript_23F2B1:: @ 823F2B1 - setvar VAR_0x8005, 2 - return - -BattleFrontier_BattleArenaLobby_EventScript_23F2B7:: @ 823F2B7 -BattleFrontier_BattleDomeLobby_EventScript_23F2B7:: @ 823F2B7 -BattleFrontier_BattleDomePreBattleRoom_EventScript_23F2B7:: @ 823F2B7 -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23F2B7:: @ 823F2B7 -BattleFrontier_BattlePalaceLobby_EventScript_23F2B7:: @ 823F2B7 -BattleFrontier_BattlePikeLobby_EventScript_23F2B7:: @ 823F2B7 -BattleFrontier_BattlePyramidLobby_EventScript_23F2B7:: @ 823F2B7 -BattleFrontier_BattleTowerLobby_EventScript_23F2B7:: @ 823F2B7 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - special sub_81A1780 - return - -BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5 - setvar VAR_0x8004, 9 - message OldaleTown_PokemonCenter_2F_Text_278091 - waitmessage - setvar VAR_0x8005, 0 - special sub_80B2DA4 - waitstate - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3AF - compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_2772D2 - compare VAR_RESULT, 3 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F327 - compare VAR_RESULT, 4 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F351 - compare VAR_RESULT, 5 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - compare VAR_RESULT, 6 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_2772C5 - compare VAR_RESULT, 11 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F366 - end - -BattleFrontier_BattleTowerLobby_EventScript_23F327:: @ 823F327 - special CloseLink - compare VAR_0x8005, 3 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F33F - msgbox BattleFrontier_BattleTowerLobby_Text_278255, 4 - release - end - -BattleFrontier_BattleTowerLobby_EventScript_23F33F:: @ 823F33F - msgbox BattleFrontier_BattleTowerLobby_Text_2412E8, 4 - msgbox BattleFrontier_BattleTowerLobby_Text_2413DE, 4 - release - end - -BattleFrontier_BattleTowerLobby_EventScript_23F351:: @ 823F351 - msgbox BattleFrontier_BattleTowerLobby_Text_241240, 4 - special CloseLink - msgbox BattleFrontier_BattleTowerLobby_Text_2782A8, 4 - release - end - -BattleFrontier_BattleTowerLobby_EventScript_23F366:: @ 823F366 - special CloseLink - compare VAR_0x8005, 0 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F394 - compare VAR_0x8005, 1 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F39D - compare VAR_0x8005, 2 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F3A6 - msgbox BattleFrontier_BattleTowerLobby_Text_2413DE, 4 - release - end - -BattleFrontier_BattleTowerLobby_EventScript_23F394:: @ 823F394 - msgbox BattleFrontier_BattleTowerLobby_Text_2412E8, 4 - return - -BattleFrontier_BattleTowerLobby_EventScript_23F39D:: @ 823F39D - msgbox BattleFrontier_BattleTowerLobby_Text_241285, 4 - return - -BattleFrontier_BattleTowerLobby_EventScript_23F3A6:: @ 823F3A6 - msgbox BattleFrontier_BattleTowerLobby_Text_2412B3, 4 - return - -BattleFrontier_BattleTowerLobby_EventScript_23F3AF:: @ 823F3AF - incrementgamestat 30 - setvar VAR_0x40BC, 0 - message BattleFrontier_BattleTowerLobby_Text_24144D - waitmessage - setvar VAR_0x8004, 6 - setvar VAR_0x8005, 1 - special sub_8161F74 - special sub_80A08CC - waitstate - playse SE_SAVE - waitse - special sub_80B3BC4 - goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 - end - -BattleFrontier_BattleTowerLobby_EventScript_23F3DA:: @ 823F3DA - msgbox BattleFrontier_BattleTowerLobby_Text_240ED2, 4 - goto BattleFrontier_BattleTowerLobby_EventScript_23ED86 - end - -BattleFrontier_BattleTowerLobby_EventScript_23F3E8:: @ 823F3E8 - setvar VAR_0x8004, 20 - goto BattleFrontier_BattleTowerLobby_EventScript_23F3F3 - end - -BattleFrontier_BattleTowerLobby_EventScript_23F3F3:: @ 823F3F3 - message BattleFrontier_BattleTowerLobby_Text_2792CD - waitmessage - multichoice 16, 6, 81, 0 - switch VAR_RESULT - case 0, BattleFrontier_BattleTowerLobby_EventScript_23F463 - case 1, BattleFrontier_BattleTowerLobby_EventScript_23F430 - case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - end - -BattleFrontier_BattleTowerLobby_EventScript_23F430:: @ 823F430 - call BattleFrontier_BattleTowerLobby_EventScript_277B30 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F496 - compare VAR_RESULT, 5 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3F3 - compare VAR_RESULT, 8 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F430 - compare VAR_RESULT, 11 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F366 - release - return - -BattleFrontier_BattleTowerLobby_EventScript_23F463:: @ 823F463 - call BattleFrontier_BattleTowerLobby_EventScript_277B35 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F496 - compare VAR_RESULT, 5 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3F3 - compare VAR_RESULT, 8 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F463 - compare VAR_RESULT, 11 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F366 - release - return - -BattleFrontier_BattleTowerLobby_EventScript_23F496:: @ 823F496 - incrementgamestat 30 - setvar VAR_0x40BC, 0 - message BattleFrontier_BattleTowerLobby_Text_24144D - waitmessage - setvar VAR_0x8004, 6 - setvar VAR_0x8005, 1 - special sub_8161F74 - special sub_80A08CC - waitstate - playse SE_SAVE - waitse - goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 - end - -BattleFrontier_BattleTowerLobby_EventScript_23F4BE:: @ 823F4BE - lockall - msgbox BattleFrontier_BattleTowerLobby_Text_241540, 4 - goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD - end - -BattleFrontier_BattleTowerLobby_EventScript_23F4CD:: @ 823F4CD - message BattleFrontier_BattleTowerLobby_Text_241563 - waitmessage - multichoice 17, 2, 97, 0 - switch VAR_RESULT - case 0, BattleFrontier_BattleTowerLobby_EventScript_23F520 - case 1, BattleFrontier_BattleTowerLobby_EventScript_23F52E - case 2, BattleFrontier_BattleTowerLobby_EventScript_23F53C - case 3, BattleFrontier_BattleTowerLobby_EventScript_23F54A - case 4, BattleFrontier_BattleTowerLobby_EventScript_23F558 - case 127, BattleFrontier_BattleTowerLobby_EventScript_23F558 - end - -BattleFrontier_BattleTowerLobby_EventScript_23F520:: @ 823F520 - msgbox BattleFrontier_BattleTowerLobby_Text_241586, 4 - goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD - end - -BattleFrontier_BattleTowerLobby_EventScript_23F52E:: @ 823F52E - msgbox BattleFrontier_BattleTowerLobby_Text_241693, 4 - goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD - end - -BattleFrontier_BattleTowerLobby_EventScript_23F53C:: @ 823F53C - msgbox BattleFrontier_BattleTowerLobby_Text_241777, 4 - goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD - end - -BattleFrontier_BattleTowerLobby_EventScript_23F54A:: @ 823F54A - msgbox BattleFrontier_BattleTowerLobby_Text_24187E, 4 - goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD - end - -BattleFrontier_BattleTowerLobby_EventScript_23F558:: @ 823F558 - releaseall - end - -BattleFrontier_BattleTowerLobby_EventScript_23F55A: @ 823F55A - .string "I’ll direct you to your BATTLE ROOM now.$" - -BattleFrontier_BattleTowerLobby_Text_23F583: @ 823F583 - .string "Excuse me!\p" - .string "You didn’t save before you quit your\n" - .string "challenge last time.\p" - .string "Because of that, your challenge so far\n" - .string "has been disqualified. Sorry!$" - -BattleFrontier_BattleTowerLobby_Text_23F60D: @ 823F60D - .string "Congratulations!\n" - .string "You’ve beaten all seven TRAINERS!\p" - .string "$" - -BattleFrontier_BattleTowerLobby_Text_23F641: @ 823F641 - .string "For beating seven TRAINERS in a row,\n" - .string "you have earned this fabulous prize!\p" - .string "$" - -SlateportCity_BattleTentLobby_Text_23F68C: @ 823F68C - .string "{PLAYER} received the prize\n" - .string "{STR_VAR_1}.$" - -SlateportCity_BattleTentLobby_Text_23F6A6: @ 823F6A6 - .string "Oh, your BAG appears to be full.\p" - .string "Please make room in your BAG, then come\n" - .string "see me.$" - -BattleFrontier_BattleTowerLobby_Text_23F6F7: @ 823F6F7 - .string "Thank you for playing!\p" - .string "$" - -BattleFrontier_BattleTowerLobby_Text_23F70F: @ 823F70F - .string "Your record will be saved.\n" - .string "Please wait.$" - -BattleFrontier_BattleTowerLobby_Text_23F737: @ 823F737 - .string "We’ve been waiting for you!\p" - .string "$" - -BattleFrontier_BattleTowerLobby_Text_23F754: @ 823F754 - .string "Before entering a BATTLE ROOM, your\n" - .string "progress will be saved. Please wait.$" - -BattleFrontier_BattleTowerLobby_Text_23F79D: @ 823F79D - .string "You’re finally about to face the\n" - .string "50th TRAINER.\p" - .string "From here on, every time you beat seven\n" - .string "TRAINERS in a row, your POKéMON will\l" - .string "receive a commemorative RIBBON.\p" - .string "Good luck!$" - -BattleFrontier_BattleTowerLobby_Text_23F844: @ 823F844 - .string "Here are some RIBBONS for beating\n" - .string "seven tough TRAINERS in a row.\p" - .string "{PLAYER} received some RIBBONS!$" - -BattleFrontier_BattleTowerLobby_Text_23F89F: @ 823F89F - .string "{PLAYER} put the RIBBONS on\n" - .string "the challenger POKéMON.$" - -BattleFrontier_BattleTowerLobby_Text_23F8CD: @ 823F8CD - .string "Excuse me, do you have a moment?\p" - .string "Can you describe your feelings when\n" - .string "you’re about to begin a BATTLE TOWER\l" - .string "match, or when you’ve either won or\l" - .string "lost a match?$" - -BattleFrontier_BattleTowerLobby_Text_23F969: @ 823F969 - .string "Okay, what are your feelings when\n" - .string "you’re about to begin a match?$" - -BattleFrontier_BattleTowerLobby_Text_23F9AA: @ 823F9AA - .string "What do you feel when you’ve won\n" - .string "a match?$" - -BattleFrontier_BattleTowerLobby_Text_23F9D4: @ 823F9D4 - .string "Can I hear about your feelings when\n" - .string "you have lost a match?$" - -BattleFrontier_BattleTowerLobby_Text_23FA0F: @ 823FA0F - .string "Oh, so you don’t think much about it?\n" - .string "You’re one cool customer.$" - -BattleFrontier_BattleTowerLobby_Text_23FA4F: @ 823FA4F - .string "Hunh? You changed your mind?\n" - .string "I guess you’re fickle.$" - -BattleFrontier_BattleTowerLobby_Text_23FA83: @ 823FA83 - .string "Okay, so that’s how you feel?\n" - .string "That’s quite original.\p" - .string "Thanks!$" - -BattleFrontier_BattleTowerLobby_Text_23FAC0: @ 823FAC0 - .string "The number of matches you win in a row\n" - .string "is recorded.\p" - .string "I’d better not get beaten in\n" - .string "an embarrassing way!$" - -BattleFrontier_BattleTowerLobby_Text_23FB26: @ 823FB26 - .string "Once you’ve entered the BATTLE TOWER,\n" - .string "you can’t leave until you either lose\l" - .string "or you beat seven TRAINERS in a row.\p" - .string "You’d best be certain that you’re up\n" - .string "to the challenge.$" - -BattleFrontier_BattleTowerLobby_Text_23FBCE: @ 823FBCE - .string "Welcome to the BATTLE TOWER\n" - .string "DOUBLE BATTLE CORNER!\p" - .string "Unfortunately, the BATTLE ROOMS\n" - .string "are still under construction.\p" - .string "Please come back when the work\n" - .string "is completed.$" - -BattleFrontier_BattleTowerLobby_Text_23FC6B: @ 823FC6B - .string "Welcome to the BATTLE TOWER\n" - .string "MULTI BATTLE CORNER!\p" - .string "Unfortunately, the BATTLE ROOMS\n" - .string "are still under construction.\p" - .string "Please come back when the work\n" - .string "is completed.$" - -BattleFrontier_BattleTowerLobby_Text_23FD07: @ 823FD07 - .string "We look forward to seeing you on\n" - .string "another challenge!$" - -BattleFrontier_BattleTowerLobby_Text_23FD3B: @ 823FD3B - .string "The BATTLE ROOM offers two levels\n" - .string "of challenge, Level 50 and Open Level.\l" - .string "Which is your choice?$" - -BattleFrontier_BattleTowerLobby_Text_23FD9A: @ 823FD9A - .string "Please select the POKéMON you wish\n" - .string "to enter.$" - -BattleFrontier_BattleTowerLobby_Text_23FDC7: @ 823FDC7 - .string "Before entering a BATTLE ROOM, your\n" - .string "progress must be saved. Is that okay?$" - -BattleFrontier_BattleTowerLobby_Text_23FE11: @ 823FE11 - .string "I will now show you to the\n" - .string "{STR_VAR_1} BATTLE ROOM.$" - -BattleFrontier_BattleTowerLobby_Text_23FE3C: @ 823FE3C - .string "Shall I record your last BATTLE TOWER\n" - .string "match on your FRONTIER PASS?$" - -BattleFrontier_BattleTowerLobby_Text_23FE7F: @ 823FE7F - .string "Excuse me!\p" - .string "You don’t have {STR_VAR_2} eligible POKéMON.\p" - .string "You must have {STR_VAR_2} different POKéMON\n" - .string "of Level 50 or less to enter.\p" - .string "They also must be holding different\n" - .string "kinds of items.\p" - .string "EGGS{STR_VAR_1} ineligible.\p" - .string "Please come see me when you are ready.$" - -BattleFrontier_BattleTowerLobby_Text_23FF5D: @ 823FF5D - .string "Excuse me!\p" - .string "You don’t have {STR_VAR_2} eligible POKéMON.\p" - .string "You must have {STR_VAR_2} different POKéMON\n" - .string "to enter.\p" - .string "They also must be holding different\n" - .string "kinds of items.\p" - .string "EGGS{STR_VAR_1} ineligible.\p" - .string "Please come see me when you are ready.$" - -BattleFrontier_BattleTowerLobby_Text_240027: @ 8240027 - .string "Excuse me!\p" - .string "You don’t have three eligible POKéMON.\p" - .string "You must have three different POKéMON\n" - .string "of Level 50 or less to enter.\p" - .string "They also must be holding different\n" - .string "kinds of items.\p" - .string "EGGS{STR_VAR_1} ineligible.\p" - .string "Please come see me when you are ready.$" - -BattleFrontier_BattleTowerLobby_Text_24010B: @ 824010B - .string "Excuse me!\p" - .string "You don’t have three eligible POKéMON.\p" - .string "You must have three different POKéMON\n" - .string "to enter.\p" - .string "They also must be holding different\n" - .string "kinds of items.\p" - .string "EGGS{STR_VAR_1} ineligible.\p" - .string "Please come see me when you are ready.$" - -BattleFrontier_BattleTowerLobby_Text_2401DB: @ 82401DB - .string "Excuse me!\p" - .string "You don’t have four eligible POKéMON.\p" - .string "You must have four different POKéMON\n" - .string "of Level 50 or less to enter.\p" - .string "They also must be holding different\n" - .string "kinds of items.\p" - .string "EGGS{STR_VAR_1} ineligible.\p" - .string "Please come see me when you are ready.$" - -BattleFrontier_BattleTowerLobby_Text_2402BD: @ 82402BD - .string "Excuse me!\p" - .string "You don’t have four eligible POKéMON.\p" - .string "You must have four different POKéMON\n" - .string "to enter.\p" - .string "They also must be holding different\n" - .string "kinds of items.\p" - .string "EGGS{STR_VAR_1} ineligible.\p" - .string "Please come see me when you are ready.$" - -BattleFrontier_BattleTowerLobby_Text_24038B: @ 824038B - .string "Excuse me!\p" - .string "You don’t have two eligible POKéMON.\p" - .string "You must have two different POKéMON\n" - .string "of Level 50 or less to enter.\p" - .string "They also must be holding different\n" - .string "kinds of items.\p" - .string "EGGS{STR_VAR_1} ineligible.\p" - .string "Please come see me when you are ready.$" - -BattleFrontier_BattleTowerLobby_Text_24046B: @ 824046B - .string "Excuse me!\p" - .string "You don’t have two eligible POKéMON.\p" - .string "You must have two different POKéMON\n" - .string "to enter.\p" - .string "They also must be holding different\n" - .string "kinds of items.\p" - .string "EGGS{STR_VAR_1} ineligible.\p" - .string "Please come see me when you are ready.$" - -BattleFrontier_BattleTowerLobby_Text_240537: @ 8240537 - .string "Where the talents of TRAINERS\n" - .string "are put to the test!\p" - .string "Welcome to the BATTLE TOWER!\p" - .string "I am your guide to the SINGLE\n" - .string "BATTLE ROOMS.$" - -BattleFrontier_BattleTowerLobby_Text_2405B3: @ 82405B3 - .string "Would you like to take the SINGLE\n" - .string "BATTLE ROOM challenge?$" - -BattleFrontier_BattleTowerLobby_Text_2405EC: @ 82405EC - .string "The BATTLE TOWER’s SINGLE BATTLE\n" - .string "ROOMS are facilities for conducting\l" - .string "SINGLE BATTLES with three POKéMON.\p" - .string "There are many SINGLE BATTLE ROOMS\n" - .string "in the BATTLE TOWER for team battles.\p" - .string "In each of the SINGLE BATTLE ROOMS,\n" - .string "seven TRAINERS await your challenge.\p" - .string "If you manage to defeat all seven,\n" - .string "you will earn Battle Points.\p" - .string "If you want to interrupt your\n" - .string "challenge, please save the game.\p" - .string "If you don’t save before interrupting,\n" - .string "you will be disqualified.$" - -BattleFrontier_BattleTowerLobby_Text_2407A6: @ 82407A6 - .string "Now please select the three POKéMON\n" - .string "that are to be entered.$" - -BattleFrontier_BattleTowerLobby_Text_2407E2: @ 82407E2 - .string "Where the talents of TRAINERS\n" - .string "are put to the test!\p" - .string "Welcome to the BATTLE TOWER!\p" - .string "I am your guide to the DOUBLE\n" - .string "BATTLE ROOMS.$" - -BattleFrontier_BattleTowerLobby_Text_24085E: @ 824085E - .string "Would you like to take the DOUBLE\n" - .string "BATTLE ROOM challenge?$" - -BattleFrontier_BattleTowerLobby_Text_240897: @ 8240897 - .string "The BATTLE TOWER’s DOUBLE BATTLE\n" - .string "ROOMS are facilities for conducting\l" - .string "DOUBLE BATTLES with four POKéMON.\p" - .string "There are many DOUBLE BATTLE ROOMS\n" - .string "in the BATTLE TOWER for team battles.\p" - .string "In each of the DOUBLE BATTLE ROOMS,\n" - .string "seven TRAINERS await your challenge.\p" - .string "If you manage to defeat all seven,\n" - .string "you will earn Battle Points.\p" - .string "If you want to interrupt your\n" - .string "challenge, please save the game.\p" - .string "If you don’t save before interrupting,\n" - .string "you will be disqualified.$" - -BattleFrontier_BattleTowerLobby_Text_240A50: @ 8240A50 - .string "Now please select the four POKéMON\n" - .string "that are to be entered.$" - -BattleFrontier_BattleTowerLobby_Text_240A8B: @ 8240A8B - .string "Where the talents of TRAINERS\n" - .string "are put to the test!\p" - .string "Welcome to the BATTLE TOWER!\p" - .string "I am your guide to the MULTI\n" - .string "BATTLE ROOMS.$" - -BattleFrontier_BattleTowerLobby_Text_240B06: @ 8240B06 - .string "Would you like to take the MULTI\n" - .string "BATTLE ROOM challenge?$" - -BattleFrontier_BattleTowerLobby_Text_240B3E: @ 8240B3E - .string "The BATTLE TOWER’s MULTI BATTLE\n" - .string "ROOMS are facilities for conducting\l" - .string "MULTI BATTLES.\p" - .string "For MULTI BATTLES, you must partner\n" - .string "with a TRAINER in the TOWER and enter\l" - .string "with two POKéMON each.\p" - .string "Inside the TOWER is a room named\n" - .string "the BATTLE SALON where you may meet\l" - .string "other TRAINERS.\p" - .string "There, you must find a TRAINER to act\n" - .string "as your partner in MULTI BATTLES.\p" - .string "Once you have partnered up, you will\n" - .string "be shown to a MULTI BATTLE ROOM.\p" - .string "In the MULTI BATTLE ROOM, seven\n" - .string "tag teams await your challenge.\p" - .string "If you manage to defeat all seven\n" - .string "teams, you will earn Battle Points.\p" - .string "If you want to interrupt your\n" - .string "challenge, please save the game.\p" - .string "If you don’t save before interrupting,\n" - .string "you will be disqualified.$" - -BattleFrontier_BattleTowerLobby_Text_240DDB: @ 8240DDB - .string "Now please select the two POKéMON\n" - .string "that are to be entered.$" - -BattleFrontier_BattleTowerLobby_Text_240E15: @ 8240E15 - .string "Where the talents of TRAINERS\n" - .string "are put to the test!\p" - .string "Welcome to the BATTLE TOWER!\p" - .string "I am your guide to the LINK MULTI\n" - .string "BATTLE ROOMS.$" - -BattleFrontier_BattleTowerLobby_Text_240E95: @ 8240E95 - .string "Would you like to take the LINK MULTI\n" - .string "BATTLE ROOM challenge?$" - -BattleFrontier_BattleTowerLobby_Text_240ED2: @ 8240ED2 - .string "The BATTLE TOWER’s MULTI BATTLE\n" - .string "ROOMS are facilities for conducting\l" - .string "MULTI BATTLES with a friend.\p" - .string "You must link with your friend using\n" - .string "Wireless Adapters or a Game Boy\l" - .string "Advance Game Link cable.\p" - .string "You must partner with your friend and\n" - .string "enter two different kinds of POKéMON.\p" - .string "There are many MULTI BATTLE ROOMS\n" - .string "in the BATTLE TOWER for team battles.\p" - .string "In a MULTI BATTLE ROOM, seven\n" - .string "tag teams await you and your friend\l" - .string "to make a tag-team challenge.\p" - .string "If you manage to defeat all seven\n" - .string "teams, you will earn Battle Points.\p" - .string "Please beware that unlike other ROOMS,\n" - .string "you may not interrupt your challenge.\p" - .string "Once you start, you must battle seven\n" - .string "MULTI BATTLES in a row nonstop.$" - -BattleFrontier_BattleTowerLobby_Text_24115E: @ 824115E - .string "Now please select the two POKéMON\n" - .string "that are to be entered.$" - -BattleFrontier_BattleTowerLobby_Text_241198: @ 8241198 - .string "You have chosen the same kind of\n" - .string "POKéMON as your friend.\p" - .string "Please choose two POKéMON different\n" - .string "from your friend’s, match the level\l" - .string "you wish to enter, and register again.$" - -BattleFrontier_BattleTowerLobby_Text_241240: @ 8241240 - .string "The LINK MULTI BATTLE ROOM challenge\n" - .string "is only for two linked players.$" - -BattleFrontier_BattleTowerLobby_Text_241285: @ 8241285 - .string "Your friend has also selected\n" - .string "the POKéMON {STR_VAR_1}.$" - -BattleFrontier_BattleTowerLobby_Text_2412B3: @ 82412B3 - .string "Your friend has also selected the\n" - .string "POKéMON {STR_VAR_1} and {STR_VAR_2}.$" - -BattleFrontier_BattleTowerLobby_Text_2412E8: @ 82412E8 - .string "Your friend has chosen a different\n" - .string "battle level.$" - -BattleFrontier_BattleTowerLobby_Text_241319: @ 8241319 - .string "Your friend has chosen a different\n" - .string "battle level.\p" - .string "Your friend has also selected\n" - .string "the POKéMON {STR_VAR_1}.$" - -BattleFrontier_BattleTowerLobby_Text_241378: @ 8241378 - .string "Your friend has chosen a different\n" - .string "battle level.\p" - .string "Your friend has also selected the\n" - .string "POKéMON {STR_VAR_1} and {STR_VAR_2}.$" - -BattleFrontier_BattleTowerLobby_Text_2413DE: @ 82413DE - .string "Please choose two POKéMON different\n" - .string "from your friend’s, match the level\l" - .string "you wish to enter, and register again.$" - -BattleFrontier_BattleTowerLobby_Text_24144D: @ 824144D - .string "I will save the game before\n" - .string "showing you in. Please wait.$" - -BattleFrontier_BattleTowerLobby_Text_241486: @ 8241486 - .string "Congratulations!\n" - .string "You have defeated the SALON MAIDEN\l" - .string "and swept seven TRAINERS!$" - -BattleFrontier_BattleTowerLobby_Text_2414D4: @ 82414D4 - .string "In recognition of your infinite talent,\n" - .string "we award you these Battle Point(s).$" - -BattleFrontier_BattleArenaLobby_Text_241520: @ 8241520 -BattleFrontier_BattleDomeLobby_Text_241520: @ 8241520 -BattleFrontier_BattleFactoryLobby_Text_241520: @ 8241520 -BattleFrontier_BattlePalaceLobby_Text_241520: @ 8241520 -BattleFrontier_BattlePikeLobby_Text_241520: @ 8241520 -BattleFrontier_BattlePyramidLobby_Text_241520: @ 8241520 -BattleFrontier_BattleTowerLobby_Text_241520: @ 8241520 - .string "{PLAYER} obtained {STR_VAR_1} Battle Point(s).$" - -BattleFrontier_BattleTowerLobby_Text_241540: @ 8241540 - .string "The BATTLE TOWER rules are listed.$" - -BattleFrontier_BattleTowerLobby_Text_241563: @ 8241563 - .string "Which heading do you want to read?$" - -BattleFrontier_BattleTowerLobby_Text_241586: @ 8241586 - .string "The BATTLE TOWER is a facility where\n" - .string "four types of battles are waged--\l" - .string "SINGLE BATTLE, DOUBLE BATTLE, MULTI\l" - .string "BATTLE, and LINK MULTI BATTLE.\p" - .string "For each of these types, there are\n" - .string "separate BATTLE ROOMS.\p" - .string "Please speak with a guide offering\n" - .string "the type of battle you wish to enter.$" - -BattleFrontier_BattleTowerLobby_Text_241693: @ 8241693 - .string "Depending on the BATTLE ROOM you are\n" - .string "entering, you will be required to take\l" - .string "a certain number of POKéMON.\p" - .string "The SINGLE BATTLE mode requires\n" - .string "three POKéMON.\p" - .string "The DOUBLE BATTLE mode requires four,\n" - .string "and the MULTI modes both require two.$" - -BattleFrontier_BattleTowerLobby_Text_241777: @ 8241777 - .string "The BATTLE SALON is where you must\n" - .string "find a partner to form a tag team for\l" - .string "the MULTI BATTLE ROOM challenge.\p" - .string "Choose the best partner for you by\n" - .string "examining other TRAINERS’\l" - .string "POKéMON and their moves.\p" - .string "You may choose a new tag partner\n" - .string "after winning seven straight matches.$" - -BattleFrontier_BattleTowerLobby_Text_24187E: @ 824187E - .string "The LINK MULTI BATTLE Mode is for two\n" - .string "friends to mount a challenge together.\p" - .string "You and your friend must be linked with\n" - .string "Wireless Adapters or a GBA Game Link\l" - .string "cable.\p" - .string "You must choose two POKéMON at\n" - .string "the registration counter.\p" - .string "These POKéMON must be different\n" - .string "from those of your friend.\p" - .string "You may not interrupt this challenge\n" - .string "in the middle, unlike other modes.$" diff --git a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc deleted file mode 100644 index a2f003b85..000000000 --- a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc +++ /dev/null @@ -1,1822 +0,0 @@ -BattleFrontier_BattleTowerMultiBattleRoom_MapScripts:: @ 8243D92 - map_script 5, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7 - map_script 3, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0 - map_script 4, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14 - map_script 2, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23 - .byte 0 - -BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7 - setvar VAR_0x8004, 17 - special sub_81A8E7C - end - -BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0 - checkflag FLAG_0x152 - goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA - clearflag FLAG_0x2C7 - clearflag FLAG_0x2C8 - clearflag FLAG_0x2C9 - clearflag FLAG_0x2CA - clearflag FLAG_0x2CB - clearflag FLAG_0x2CC - setflag FLAG_0x360 - setflag FLAG_0x361 - setvar VAR_0x8004, 10 - special sub_8161F74 - end - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA:: @ 8243DDA - setvar VAR_OBJ_GFX_ID_0, 7 - setvar VAR_OBJ_GFX_ID_1, 7 - setvar VAR_OBJ_GFX_ID_2, 7 - setvar VAR_OBJ_GFX_ID_3, 7 - setvar VAR_OBJ_GFX_ID_4, 7 - setvar VAR_OBJ_GFX_ID_5, 7 - setvar VAR_OBJ_GFX_ID_6, 7 - setvar VAR_OBJ_GFX_ID_7, 7 - setvar VAR_TEMP_1, 1 - setvar VAR_TEMP_3, 1 - setobjectxyperm 1, 10, 2 - end - -BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14: @ 8243E14 - map_script_2 VAR_TEMP_3, 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E1E - .2byte 0 - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E1E:: @ 8243E1E - turnobject 255, 2 - end - -BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23: @ 8243E23 - map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41 - map_script_2 VAR_TEMP_3, 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E35 - .2byte 0 - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E35:: @ 8243E35 - lockall - setvar VAR_TEMP_3, 0 - goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5 - end - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41 - lockall - applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E75 - waitmovement 0 - applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77 - waitmovement 0 - moveobjectoffscreen 1 - applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6 - waitmovement 0 - msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, 4 - special HealPlayerParty - setvar VAR_TEMP_1, 1 - releaseall - end - -BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E75: @ 8243E75 - walk_down - step_end - -BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77: @ 8243E77 - walk_left - walk_in_place_fastest_down - step_end - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A:: @ 8243E7A - lock - faceplayer - message BattleFrontier_BattleTowerMultiBattleRoom_Text_244094 - waitmessage - multichoicedefault 20, 8, 94, 1, 0 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D - msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_24410C, 4 - release - end - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D:: @ 8243E9D - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 6 - setvar VAR_0x8006, 1 - special sub_81A1780 - goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03 - end - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5:: @ 8243EB5 - msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244149, 4 - closemessage - applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6 - waitmovement 0 - opendoor 10, 1 - waitdooranim - call BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EE4 - closedoor 10, 1 - waitdooranim - warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6 - waitstate - releaseall - end - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EE4:: @ 8243EE4 - applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26 - applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1A - waitmovement 0 - return - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EF6: @ 8243EF6 - applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26 - applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1E - waitmovement 0 - return - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F08: @ 8243F08 - applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26 - applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F22 - waitmovement 0 - return - -BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1A: @ 8243F1A - walk_up - walk_up - set_invisible - step_end - -BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1E: @ 8243F1E - walk_right - walk_up - set_invisible - step_end - -BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F22: @ 8243F22 - walk_left - walk_up - set_invisible - step_end - -BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26: @ 8243F26 - walk_up - set_invisible - step_end - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29:: @ 8243F29 - lock - faceplayer - setvar VAR_TEMP_2, 0 - goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 - end - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36 - checkflag FLAG_0x152 - goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3 - setvar VAR_0x8004, 11 - setvar VAR_0x8005, 0 - special sub_8161F74 - waitmessage - waitbuttonpress - setvar VAR_0x8004, 11 - setvar VAR_0x8005, 1 - special sub_8161F74 - waitmessage - waitbuttonpress - setvar VAR_0x8004, 11 - setvar VAR_0x8005, 2 - special sub_8161F74 - waitmessage - multichoicedefault 20, 8, 94, 1, 0 - switch VAR_RESULT - case 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3 - case 127, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3 - setvar VAR_0x8004, 11 - setvar VAR_0x8005, 3 - special sub_8161F74 - waitmessage - waitbuttonpress - closemessage - compare VAR_FACING, 1 - call_if 5, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FD4 - compare VAR_FACING, 1 - call_if 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF - removeobject VAR_LAST_TALKED - setflag FLAG_0x152 - warpsilent MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 3 - waitstate - release - end - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3:: @ 8243FC3 - setvar VAR_0x8004, 11 - setvar VAR_0x8005, 4 - special sub_8161F74 - waitmessage - waitbuttonpress - release - end - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FD4:: @ 8243FD4 - applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243FEA - waitmovement 0 - return - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF:: @ 8243FDF - applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243FF2 - waitmovement 0 - return - -BattleFrontier_BattleTowerMultiBattleRoom_Movement_243FEA: @ 8243FEA - 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 - 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 - lock - faceplayer - setvar VAR_TEMP_2, 1 - goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 - end - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008:: @ 8244008 - lock - faceplayer - setvar VAR_TEMP_2, 2 - goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 - end - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015:: @ 8244015 - lock - faceplayer - setvar VAR_TEMP_2, 3 - goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 - end - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022:: @ 8244022 - lock - faceplayer - setvar VAR_TEMP_2, 4 - goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 - end - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F:: @ 824402F - lock - faceplayer - setvar VAR_TEMP_2, 5 - goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 - end - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C:: @ 824403C - lock - faceplayer - setvar VAR_TEMP_2, 6 - goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 - end - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049:: @ 8244049 - lock - faceplayer - setvar VAR_TEMP_2, 7 - goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 - end - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244056: @ 8244056 - .string "Please find a partner from out of\n" - .string "the TRAINERS gathered here.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244094: @ 8244094 - .string "{PLAYER}, you have not found a partner\n" - .string "for your tag team.\p" - .string "Would you like to quit looking and\n" - .string "return to the reception counter?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24410C: @ 824410C - .string "Then, please find a partner from\n" - .string "the TRAINERS gathered here.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244149:: @ 8244149 - .string "Thank you for choosing a partner.\p" - .string "I will now show you to your\n" - .string "MULTI BATTLE ROOM.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24419A:: @ 824419A - .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n" - .string "You can call me {STR_VAR_3}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2441CA:: @ 82441CA - .string "On {STR_VAR_1}’s advice, I brought\n" - .string "one {STR_VAR_3} with {STR_VAR_2} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2441F7:: @ 82441F7 - .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "Please, let me join you as a tag team.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24422E:: @ 824422E - .string "Thank you!\n" - .string "I’ll go register right now.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244255:: @ 8244255 - .string "I really wanted to form a tag team\n" - .string "with you, {PLAYER}…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244286:: @ 8244286 - .string "I am {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n" - .string "My name is {STR_VAR_3}.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2442B2:: @ 82442B2 - .string "I got advice from {STR_VAR_1} and chose\n" - .string "one {STR_VAR_3} with {STR_VAR_2} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2442E4:: @ 82442E4 - .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "Please, let’s form a tag team!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244313:: @ 8244313 - .string "Thank you very much!\n" - .string "I’ll be done with registration quickly!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244350:: @ 8244350 - .string "{PLAYER}, I was hoping that I could\n" - .string "partner up with you…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244383:: @ 8244383 - .string "Um, my name’s {STR_VAR_3}, and I’m\n" - .string "{STR_VAR_1}’s no. {STR_VAR_2} apprentice.\p" - .string "Snivel…\p" - .string "I’m sorry!\n" - .string "This tension is making me cry…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2443E7:: @ 82443E7 - .string "{STR_VAR_3} advised me, so I have\n" - .string "one {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244413:: @ 8244413 - .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "Snivel…\n" - .string "Please, please team up with me!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24444B:: @ 824444B - .string "Oh, really? You will?\n" - .string "Awesome! Wicked! Awoooh!\p" - .string "Oh… I’m sorry…\n" - .string "I’m so happy, I’m crying…\p" - .string "I’ll go register right away.\n" - .string "Please don’t go away!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2444D6:: @ 82444D6 - .string "Oh, b-but…\n" - .string "Sob… Waaaaah!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2444EF:: @ 82444EF - .string "Hi, there! I’m {STR_VAR_3}!\n" - .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24451E:: @ 824451E - .string "{STR_VAR_3} recommended my crew.\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244549:: @ 8244549 - .string "one {STR_VAR_2} with {STR_VAR_1},\n" - .string "that’s what I have! Cool, huh?\p" - .string "So come on!\n" - .string "Let’s form a tag team!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24459B:: @ 824459B - .string "Yay! Great!\n" - .string "Okay, I’ll go register, okay?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2445C5:: @ 82445C5 - .string "Aww, why?\n" - .string "I wanted to team up, {PLAYER}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2445E8:: @ 82445E8 - .string "I’m {STR_VAR_3}, the no. {STR_VAR_2} apprentice\n" - .string "of the famous {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244618:: @ 8244618 - .string "I looked to {STR_VAR_3} for advice.\n" - .string "One {STR_VAR_1}-using {STR_VAR_2}$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244643:: @ 8244643 - .string "and one {STR_VAR_2} with {STR_VAR_1},\n" - .string "that’s my pair.\p" - .string "Please, will you join me in\n" - .string "a tag team?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24468F:: @ 824468F - .string "Thank you!\n" - .string "I’ll register right away!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2446B4:: @ 82446B4 - .string "{PLAYER}, I had been hoping to join\n" - .string "you in a tag team…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2446E5:: @ 82446E5 - .string "Um… I’m sincerely happy that you\n" - .string "would take the time to talk to me.\p" - .string "I’m {STR_VAR_3}.\n" - .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24474D:: @ 824474D - .string "{STR_VAR_3} gave me advice.\n" - .string "I’m very grateful for it.\p" - .string "I have a team of one {STR_VAR_2}\n" - .string "with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24479E:: @ 824479E - .string "one {STR_VAR_2} with {STR_VAR_1}.\n" - .string "I know I’m asking a lot…\p" - .string "I don’t think you’ll be willing to,\n" - .string "but may I join you as a partner?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24480C:: @ 824480C - .string "Really? I can’t believe it!\n" - .string "I can’t believe you’ll let me join you!\l" - .string "I… I won’t let you down!\p" - .string "Um… If it’s really okay, I’ll go register\n" - .string "right this instant!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2448A7:: @ 82448A7 - .string "Oh…\n" - .string "I didn’t think I was good enough…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2448CD:: @ 82448CD - .string "Hi, I’m {STR_VAR_3}.\n" - .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2448F5:: @ 82448F5 - .string "{STR_VAR_3} told me that it would be\n" - .string "good to make this team:\l" - .string "one {STR_VAR_1}-using {STR_VAR_2}$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244939:: @ 8244939 - .string "and one {STR_VAR_2} that knows how\n" - .string "to use {STR_VAR_1}.\p" - .string "Not bad, huh?\n" - .string "Want me to team up with you?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244989:: @ 8244989 - .string "Okay, glad to join you!\n" - .string "I hope you won’t mess things up for me!\l" - .string "I’ll do my registration now.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2449E6:: @ 82449E6 - .string "Huh? Why did you turn me down?\n" - .string "You’re no judge of character!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244A23:: @ 8244A23 - .string "I’m {STR_VAR_3} and I’m a TRIATHLETE.\n" - .string "I’m busy every day what with jogging,\l" - .string "training, and rapping.\p" - .string "I also happen to be {STR_VAR_1}’s\n" - .string "no. {STR_VAR_2} apprentice.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244AA9:: @ 8244AA9 - .string "This is what {STR_VAR_3} recommended.\n" - .string "One {STR_VAR_1}-using {STR_VAR_2}$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244AD6:: @ 8244AD6 - .string "and one {STR_VAR_1}-using\n" - .string "{STR_VAR_2}.\p" - .string "I put a lot of effort into raising\n" - .string "them, even though I’m busy.\p" - .string "Let’s form a tag team\n" - .string "and give it a go!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244B52:: @ 8244B52 - .string "Thanks, that’s the spirit!\n" - .string "Hang tight while I go register, okay?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244B93:: @ 8244B93 - .string "I took time from my busy schedule\n" - .string "to be here! Give me a break!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244BD2:: @ 8244BD2 - .string "Hi!\n" - .string "How’s it going?\p" - .string "I’m {STR_VAR_3}, {STR_VAR_1}’s\n" - .string "no. {STR_VAR_2} apprentice. Glad to meet you!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244C18:: @ 8244C18 - .string "Listen, listen! You have to hear about\n" - .string "the POKéMON {STR_VAR_3} recommended.\l" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244C6E:: @ 8244C6E - .string "one {STR_VAR_2} with {STR_VAR_1}.\n" - .string "Of course I raised them superbly!\p" - .string "So, want to team up?\n" - .string "I’m sure it’ll be a great combo!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244CD6:: @ 8244CD6 - .string "Yay, I think this will be fun!\n" - .string "I’ll go register!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244D07:: @ 8244D07 - .string "Oh, you’re mean!\n" - .string "I come recommended, you know.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244D36:: @ 8244D36 - .string "Please let me introduce myself.\n" - .string "I am {STR_VAR_3}.\p" - .string "I serve as {STR_VAR_1}’s\n" - .string "no. {STR_VAR_2} apprentice.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244D82:: @ 8244D82 - .string "I sought the sage advice of\n" - .string "{STR_VAR_3} and raised my team\l" - .string "of one {STR_VAR_2} with {STR_VAR_1}$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244DC6:: @ 8244DC6 - .string "and one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "Please agree to a tag team with me!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244DFE:: @ 8244DFE - .string "Oh… I’m delighted!\n" - .string "I promise to give you my best!\p" - .string "Of course I will register us!\n" - .string "Please wait!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244E5B:: @ 8244E5B - .string "I had been hoping to join you,\n" - .string "{PLAYER}…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244E7E:: @ 8244E7E - .string "Eek! You spoke to me!\n" - .string "I… I’m overjoyed!\p" - .string "I’m {STR_VAR_3}! I’m {STR_VAR_1}’s\n" - .string "no. {STR_VAR_2} apprentice!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244ECA:: @ 8244ECA - .string "On {STR_VAR_3}’s advice, I trained\n" - .string "one {STR_VAR_1}-using {STR_VAR_2}$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244EF4:: @ 8244EF4 - .string "and one {STR_VAR_1}-using\n" - .string "{STR_VAR_2}.\p" - .string "Please, can you grant me my wish?\n" - .string "I want to be your tag-team partner!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244F4F:: @ 8244F4F - .string "Eek! I… I feel giddy!\n" - .string "Thank you so much!\l" - .string "I’ll go register us right away!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244F98:: @ 8244F98 - .string "Waaah! Don’t you feel any pity?\n" - .string "But that makes you cooler…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244FD3:: @ 8244FD3 - .string "Yeehaw! I’m {STR_VAR_1}’s\n" - .string "no. {STR_VAR_2} apprentice!\p" - .string "{STR_VAR_3}’s my name, hello, hello!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245013:: @ 8245013 - .string "My mentor {STR_VAR_3} recommended\n" - .string "one {STR_VAR_1}-master {STR_VAR_2}$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24503D:: @ 824503D - .string "and one {STR_VAR_1}-master\n" - .string "{STR_VAR_2}.\p" - .string "Good stuff, huh?\n" - .string "You’ll partner with me, won’t you?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245087:: @ 8245087 - .string "Okay, excellent!\n" - .string "I’ll get the registration done quickly!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2450C0:: @ 82450C0 - .string "Gwaaah!\n" - .string "You’re a calculating one, {PLAYER}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2450E6:: @ 82450E6 - .string "Hey! There’s big trouble! This is\n" - .string "the BATTLE TOWER’s last day!\p" - .string "… … … … … …\n" - .string "I’m only joking!\p" - .string "People call me {STR_VAR_3} and I do, too!\n" - .string "I’m {STR_VAR_1}’s 1,000th apprentice!\l" - .string "Actually, I’m no. {STR_VAR_2}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245196:: @ 8245196 - .string "{STR_VAR_3} gave me some advice.\n" - .string "{STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2451BD:: @ 82451BD - .string "{STR_VAR_2} with {STR_VAR_1}.\n" - .string "I’ve got ten of each kind!\l" - .string "Actually, just one of each!\p" - .string "How about it?\n" - .string "Want to try tag battles with me?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24522F:: @ 824522F - .string "Yippee!\n" - .string "I’ll give you a POKéMON as my thanks!\p" - .string "Just joking! But I will really go do\n" - .string "the registration, okay?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24529A:: @ 824529A - .string "Oh, that’s so cold! I’ll have to wreck\n" - .string "the BATTLE TOWER for that!\p" - .string "Of course I won’t!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2452EF:: @ 82452EF - .string "Hey, there, I’m rockin’ and a-rollin’!\n" - .string "POKéMON, I be controllin’!\p" - .string "I’m {STR_VAR_3} the rappin’ SAILOR.\n" - .string "Don’t be mistakin’ me for no wailer!\p" - .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n" - .string "Me, you shouldn’t be quick to dismiss!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2453B4:: @ 82453B4 - .string "With the advice of {STR_VAR_3} I did\n" - .string "abide, put together my team of pride!\l" - .string "One {STR_VAR_1}-using {STR_VAR_2}$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245406:: @ 8245406 - .string "and one {STR_VAR_1}-using\n" - .string "{STR_VAR_2}!\p" - .string "Our meeting we should commemorate,\n" - .string "with a tag-team victory to celebrate!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245464:: @ 8245464 - .string "Hey, hey, I like your style!\n" - .string "Our registration, I will go file!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2454A3:: @ 82454A3 - .string "Oh, hey, {PLAYER}, now that’s cold!\n" - .string "If I may be so bold!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2454D6:: @ 82454D6 - .string "Yippee-yahoo!\n" - .string "Oh, don’t run! I was just having fun!\p" - .string "Howdy! I’m {STR_VAR_3}!\n" - .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245535:: @ 8245535 - .string "{STR_VAR_3} told me what to do.\n" - .string "So one {STR_VAR_1}-using {STR_VAR_2}$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24555F:: @ 824555F - .string "and one {STR_VAR_1}-using\n" - .string "{STR_VAR_2}, I did choose.\p" - .string "So, what do you say?\n" - .string "Come on, make my day!\p" - .string "Please, I’m begging you!\n" - .string "Let me join you, don’t leave me blue!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2455EC:: @ 82455EC - .string "Yeahah! Luck is with me!\n" - .string "It sure makes me happy!\p" - .string "Before we go join the fray,\n" - .string "I’ll go register right away!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245656:: @ 8245656 - .string "You’re turning me down?\n" - .string "{PLAYER}, you’re making me frown!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24568A:: @ 824568A - .string "Cough!\p" - .string "Oh, sorry, I have a cold.\n" - .string "My POKéMON are fine, though.\p" - .string "My name’s {STR_VAR_3}, {STR_VAR_1}’s\n" - .string "no. {STR_VAR_2} apprentice. Cough!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2456F5:: @ 82456F5 - .string "I took {STR_VAR_3}’s advice to heart\n" - .string "and put together my team of\l" - .string "one {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245740:: @ 8245740 - .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "I trained them every day,\n" - .string "even in wind and rain.\p" - .string "That’s why I have this cold,\n" - .string "I think.\p" - .string "That’s what I’m about.\n" - .string "Want to be my tag partner?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2457D9:: @ 82457D9 - .string "Thanks, I appreciate this!\n" - .string "Cough, cough!\l" - .string "Hang on while I go register.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24581F:: @ 824581F - .string "Oh, you won’t?\n" - .string "{PLAYER}, I think we’d make a good pair.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245851:: @ 8245851 - .string "Oh, hello!\n" - .string "This is nerve-racking.\p" - .string "I’m {STR_VAR_3}.\n" - .string "I’m the no. {STR_VAR_2} apprentice of {STR_VAR_1}.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24589C:: @ 824589C - .string "{STR_VAR_3} said this team’ll be good--\n" - .string "one {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2458CE:: @ 82458CE - .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "I’m feeling self-conscious about this,\n" - .string "but will you let me join you?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245923:: @ 8245923 - .string "Oh, gee, thank you!\n" - .string "I feel bashful, but I’ll do my best!\p" - .string "I’ll go get the registration done.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24597F:: @ 824597F - .string "Oh, please don’t say no!\n" - .string "I feel self-conscious enough already…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2459BE:: @ 82459BE - .string "I am {STR_VAR_3}, and that’s no lie.\n" - .string "I am {STR_VAR_1}’s no. {STR_VAR_2} apprentice.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2459F7:: @ 82459F7 - .string "{STR_VAR_3} recommended my team.\p" - .string "Since the advice sounded sincere,\n" - .string "I decided to bring with me\l" - .string "my {STR_VAR_1}-using {STR_VAR_2} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245A5F:: @ 8245A5F - .string "my {STR_VAR_1}-using {STR_VAR_2}.\p" - .string "If possible, I would like you to accept\n" - .string "me as your tag-team partner.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245AB4:: @ 8245AB4 - .string "You really will accept me?\n" - .string "It would be too terrible otherwise.\p" - .string "But since you’ve agreed, this is fine.\n" - .string "I shall go register the both of us.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245B3E:: @ 8245B3E - .string "Hm? Now why would you refuse?\n" - .string "Is this your idea of a joke?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245B79:: @ 8245B79 - .string "I’m {STR_VAR_1}, and I’m a LASS!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245B91:: @ 8245B91 - .string "What I have are one {STR_VAR_2}\n" - .string "that uses {STR_VAR_1} and one$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245BBD:: @ 8245BBD - .string "{STR_VAR_2} that uses {STR_VAR_1}.\n" - .string "Those are what I have with me.\p" - .string "Will you be my partner?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245C05:: @ 8245C05 - .string "Thank you!\n" - .string "I’ll go do the registration!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245C2D:: @ 8245C2D - .string "You don’t want to be my partner?\n" - .string "You’ll regret it later!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245C66:: @ 8245C66 - .string "Hello!\p" - .string "I’m YOUNGSTER {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245C7F:: @ 8245C7F - .string "Want to know what I have?\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245CAC:: @ 8245CAC - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "You’ll be my tag-team partner,\n" - .string "won’t you?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245CE6:: @ 8245CE6 - .string "Yay!\n" - .string "I’ll go and register, okay?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245D07:: @ 8245D07 - .string "Aww! If you’d form a tag team with\n" - .string "my POKéMON, we’d be unstoppable!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245D4B:: @ 8245D4B - .string "Yahoo!\n" - .string "I’m HIKER {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245D60:: @ 8245D60 - .string "Know what I have with me?\n" - .string "My {STR_VAR_1}-using {STR_VAR_2} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245D8D:: @ 8245D8D - .string "my {STR_VAR_1}-using {STR_VAR_2}!\p" - .string "Sounds good, eh?\n" - .string "Want to form a tag team?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245DC7:: @ 8245DC7 - .string "Yahoo!\n" - .string "I’ll go do the registering, then.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245DF0:: @ 8245DF0 - .string "I would’ve liked to battle with you\n" - .string "at my side.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245E20:: @ 8245E20 - .string "Hello!\n" - .string "I’m {STR_VAR_1}, and I’m a BEAUTY!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245E41:: @ 8245E41 - .string "Do you know what I’ve been raising?\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245E78:: @ 8245E78 - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "What do you think?\n" - .string "Want to make a tag team together?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245EBD:: @ 8245EBD - .string "Wonderful!\n" - .string "I’ll get the registration done now!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245EEC:: @ 8245EEC - .string "How disappointing!\p" - .string "We two together--we would’ve been\n" - .string "the best!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245F2B:: @ 8245F2B - .string "Yo!\p" - .string "You know who I am?\n" - .string "I’m {STR_VAR_1} the FISHERMAN!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245F58:: @ 8245F58 - .string "I’ve got with me a team of one\n" - .string "{STR_VAR_1}-using {STR_VAR_2} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245F87:: @ 8245F87 - .string "one {STR_VAR_1}-using {STR_VAR_2}.\p" - .string "So, how about it?\n" - .string "Will you battle at my side?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245FC6:: @ 8245FC6 - .string "Good, good!\n" - .string "Leave it up to me!\p" - .string "I’ll go and register us now.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246002:: @ 8246002 - .string "We matched up perfectly, too…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246020:: @ 8246020 - .string "Glad to make your acquaintance.\n" - .string "I am {STR_VAR_1}, a LADY.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246051:: @ 8246051 - .string "I am accompanied by a team of\n" - .string "one {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246082:: @ 8246082 - .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "I hope I meet your approval.\n" - .string "For I wish to have you as my partner.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2460D5:: @ 82460D5 - .string "I thank you sincerely.\n" - .string "I shall handle the registration.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24610D:: @ 824610D - .string "I’m sure that you will regret not\n" - .string "having me as your partner.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24614A:: @ 824614A - .string "I’m TRIATHLETE {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24615D:: @ 824615D - .string "What I have…\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24617D:: @ 824617D - .string "one {STR_VAR_2} with {STR_VAR_1}!\n" - .string "That’s my pair!\p" - .string "Please?\n" - .string "Will you form a tag team with me?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2461C7:: @ 82461C7 - .string "Gee, thanks!\n" - .string "I’ll go register at the counter.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2461F5:: @ 82461F5 - .string "We two together, we would’ve been\n" - .string "tough for certain!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24622A:: @ 824622A - .string "Hiya!\n" - .string "I’m BUG CATCHER {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246244:: @ 8246244 - .string "Check out what I have!\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24626E:: @ 824626E - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "So, listen!\n" - .string "Do you want to form a tag team?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2462AA:: @ 82462AA - .string "Gotcha!\p" - .string "I’ll go do the registration stuff\n" - .string "at the counter.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2462E4:: @ 82462E4 - .string "Aww, my POKéMON are awesome.\n" - .string "I hope you won’t regret this!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24631F:: @ 824631F - .string "Good day!\n" - .string "I’m SCHOOL KID {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24633C:: @ 824633C - .string "What I’ve been raising are one\n" - .string "{STR_VAR_2} that uses {STR_VAR_1}$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24636B:: @ 824636B - .string "and one {STR_VAR_2} that uses\n" - .string "{STR_VAR_1}.\p" - .string "Not too bad, don’t you think?\n" - .string "Would you care to form a tag team?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2463C5:: @ 82463C5 - .string "Thank you very much!\n" - .string "I’ll get done with the registration.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2463FF:: @ 82463FF - .string "That’s too bad…\p" - .string "I was hoping that I could learn\n" - .string "from you as your partner…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246449:: @ 8246449 - .string "Yo! Let me tell you who I am!\n" - .string "I’m RICH BOY {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246478:: @ 8246478 - .string "Guess what I got!\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D:: @ 824649D - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "I’m willing to offer you the chance\n" - .string "to be in a tag team with me.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2464EE:: @ 82464EE - .string "Smart move!\p" - .string "I’ll finish up the registration\n" - .string "process quick!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246529:: @ 8246529 - .string "You’d turn me of all people down?\n" - .string "You’ll regret that decision for sure!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246571:: @ 8246571 - .string "Hiyah!\n" - .string "I am BLACK BELT {STR_VAR_1}.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24658C:: @ 824658C - .string "As my companions, I have\n" - .string "one {STR_VAR_2} using {STR_VAR_1}$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2465B5:: @ 82465B5 - .string "and one {STR_VAR_2} using\n" - .string "{STR_VAR_1}.\p" - .string "Please, grant me my wish!\n" - .string "Allow me to be your tag partner!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246605:: @ 8246605 - .string "Hiyah!\n" - .string "I will go register forthwith!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24662A:: @ 824662A - .string "I see… I hope for an opportunity\n" - .string "the next time we meet…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246662:: @ 8246662 - .string "Hi, there!\n" - .string "I’m {STR_VAR_1}, and I’m a TUBER!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246686:: @ 8246686 - .string "I’ll tell you what I have.\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2466B4:: @ 82466B4 - .string "one {STR_VAR_2} with {STR_VAR_1}!\n" - .string "May I please be on your tag team?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2466E6:: @ 82466E6 - .string "Thank you!\n" - .string "I’ll go register us now!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24670A:: @ 824670A - .string "If we’d become partners, we could\n" - .string "have been so strong!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246741:: @ 8246741 - .string "Greetings…\n" - .string "I am HEX MANIAC {STR_VAR_1}…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246760:: @ 8246760 - .string "I bear with me one {STR_VAR_1}-using\n" - .string "{STR_VAR_2} together with one$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246791:: @ 8246791 - .string "{STR_VAR_1}-using {STR_VAR_2}…\p" - .string "I beseech you…\n" - .string "Join me in a tag team…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2467C4:: @ 82467C4 - .string "I thank you…\n" - .string "I shall register us…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2467E6:: @ 82467E6 - .string "I so longed to join you…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2467FF:: @ 82467FF - .string "How do you do? I’m {STR_VAR_1},\n" - .string "and I’m a POKéMON BREEDER!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246831:: @ 8246831 - .string "I’m raising a couple good ones!\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246864:: @ 8246864 - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "How about it?\n" - .string "Feel like making a tag team with me?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2468A7:: @ 82468A7 - .string "Thank you kindly!\p" - .string "I’ll go take care of the registration\n" - .string "stuff, so you wait right here!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2468FE:: @ 82468FE - .string "I was looking forward to being\n" - .string "your partner…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24692B:: @ 824692B - .string "Well, hello!\n" - .string "I’m TRIATHLETE {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24694B:: @ 824694B - .string "Want to know what I run with?\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24697C:: @ 824697C - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "Well?\n" - .string "Want to be in a tag team with me?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2469B4:: @ 82469B4 - .string "Good going!\p" - .string "I’ll be quick and get the registration\n" - .string "all done!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2469F1:: @ 82469F1 - .string "You and me, we would’ve been tops.\n" - .string "It’s too bad…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246A22:: @ 8246A22 - .string "Hey, there! My name’s {STR_VAR_1}!\n" - .string "I’m a TRIATHLETE!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246A4E:: @ 8246A4E - .string "I go on runs with my durable team--\n" - .string "one {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246A85:: @ 8246A85 - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "Not too shabby, huh?\n" - .string "We should be in a tag team together!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246ACF:: @ 8246ACF - .string "All right!\n" - .string "I’ll go register in a flash!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246AF7:: @ 8246AF7 - .string "I really wanted to battle as your\n" - .string "tag-team partner…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246B2B:: @ 8246B2B - .string "I’m BATTLE GIRL {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246B3F:: @ 8246B3F - .string "I’ve been toughening up one\n" - .string "{STR_VAR_1}-using {STR_VAR_2} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246B6B:: @ 8246B6B - .string "one {STR_VAR_1}-using {STR_VAR_2}!\p" - .string "Do you like that combo?\n" - .string "How about you and me join up?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246BB2:: @ 8246BB2 - .string "Why, thanks!\p" - .string "I’ll get the registration done\n" - .string "right now!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246BE9:: @ 8246BE9 - .string "With you, I thought we could form\n" - .string "the ultimate tag team…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246C22:: @ 8246C22 - .string "I’m TRIATHLETE {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246C35:: @ 8246C35 - .string "I’ve been running with one {STR_VAR_2}\n" - .string "that knows how to use {STR_VAR_1}$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246C6C:: @ 8246C6C - .string "and one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "We could be in a tag team.\n" - .string "Wouldn’t that be great?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246CB3:: @ 8246CB3 - .string "Thank you!\p" - .string "I’ll go register us, and that’s\n" - .string "right now!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246CE9:: @ 8246CE9 - .string "Aww, that’s too bad. We would’ve been\n" - .string "the toughest tag team around!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246D2D:: @ 8246D2D - .string "Me?\n" - .string "I’m TUBER {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246D3F:: @ 8246D3F - .string "What do I have with me?\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246D6A:: @ 8246D6A - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "Hey?\n" - .string "You’ll team up with me, right?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246D9E:: @ 8246D9E - .string "Okay!\p" - .string "I’ll go register!\n" - .string "Let’s be excellent together!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246DD3:: @ 8246DD3 - .string "My POKéMON are tough for sure…\n" - .string "It’s too bad you don’t want to team up.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246E1A:: @ 8246E1A - .string "Yay-hey!\n" - .string "Call me GUITARIST {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246E39:: @ 8246E39 - .string "Check out my entourage!\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246E64:: @ 8246E64 - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "Yay-hey! Pretty wild, huh?\n" - .string "We’ll have to do a duet in a tag team!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246EB6:: @ 8246EB6 - .string "Yay-hey! Right on!\n" - .string "I’ll do that registration stuff now!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246EEE:: @ 8246EEE - .string "My POKéMON rock hard!\n" - .string "You’ll be sorry, I tell you!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246F21:: @ 8246F21 - .string "Pleased to meet you.\n" - .string "I am {STR_VAR_1}, a GENTLEMAN.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246F4C:: @ 8246F4C - .string "I am accompanied by my trusted\n" - .string "{STR_VAR_1}-using {STR_VAR_2} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246F7B:: @ 8246F7B - .string "one {STR_VAR_1}-using {STR_VAR_2}.\p" - .string "May I ask you to join me in a tag-team\n" - .string "partnership arrangement?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246FCC:: @ 8246FCC - .string "Ah, I thank you for your trust.\n" - .string "I shall be done with the registration.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247013:: @ 8247013 - .string "That is most unfortunate…\p" - .string "I shall look forward to the next\n" - .string "opportunity…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24705B:: @ 824705B - .string "Hello, I’m {STR_VAR_1},\n" - .string "and I’m a POKéFAN.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24707D:: @ 824707D - .string "I have with me now one {STR_VAR_2}\n" - .string "that knows the move {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2470B2:: @ 82470B2 - .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "Do you like what you see?\n" - .string "Why don’t you be my tag partner?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2470FD:: @ 82470FD - .string "Thank you!\n" - .string "I’ll look after the registration!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24712A:: @ 824712A - .string "My POKéMON are top grade…\n" - .string "It’s too bad you can’t appreciate that.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24716C:: @ 824716C - .string "Hm!\n" - .string "I am {STR_VAR_1}, and an EXPERT am I!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24718D:: @ 824718D - .string "The POKéMON that I’ve toughened up are\n" - .string "one {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2471C7:: @ 82471C7 - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "What say you to a tag team with me?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2471FB:: @ 82471FB - .string "Hm!\n" - .string "I shall register us right away!\l" - .string "Let us both do our best!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247238:: @ 8247238 - .string "I will hope that your choice is\n" - .string "indeed correct…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247268:: @ 8247268 - .string "Hello, hello.\n" - .string "I’m {STR_VAR_1}, and I’m an EXPERT.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247291:: @ 8247291 - .string "I’ve raised my POKéMON thoroughly.\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2472C7:: @ 82472C7 - .string "one {STR_VAR_2} with {STR_VAR_1}--\n" - .string "they’re what I have.\p" - .string "Wouldn’t you like to team up with me?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247313:: @ 8247313 - .string "Good, good.\n" - .string "I’ll see to the registration right away.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247348:: @ 8247348 - .string "Perhaps we can form a team the next\n" - .string "time we meet.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24737A:: @ 824737A - .string "I’m DRAGON TAMER {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24738F:: @ 824738F - .string "The team I’ve been toughening up is\n" - .string "one {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2473C6:: @ 82473C6 - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "How about it?\n" - .string "Want to be my partner?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2473FB:: @ 82473FB - .string "Okay, I’ll give it my best!\n" - .string "I’ll go register now, all right?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247438:: @ 8247438 - .string "You’re not going to find many tougher\n" - .string "partners than me!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247470:: @ 8247470 - .string "I’m BIRD KEEPER {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247484:: @ 8247484 - .string "What POKéMON do I have?\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2474AF:: @ 82474AF - .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "Don’t you think we’d make a decent\n" - .string "tag team?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2474EC:: @ 82474EC - .string "Great, thanks!\n" - .string "I’ll look after the registration!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24751D:: @ 824751D - .string "My POKéMON and I are strong.\n" - .string "What a letdown.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24754A:: @ 824754A - .string "I’m NINJA BOY {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24755C:: @ 824755C - .string "My POKéMON team consists of one\n" - .string "{STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24758B:: @ 824758B - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "Let’s be in a tag team together!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2475BC:: @ 82475BC - .string "Yay!\n" - .string "Let me go register!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2475D5:: @ 82475D5 - .string "You’ll regret not having my tough\n" - .string "POKéMON on your side!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24760D:: @ 824760D - .string "Hello!\n" - .string "I’m PARASOL LADY {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247629:: @ 8247629 - .string "Escorting me now are my {STR_VAR_2}\n" - .string "that uses {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247655:: @ 8247655 - .string "one {STR_VAR_2} that uses\n" - .string "{STR_VAR_1}.\p" - .string "Aren’t they nice?\n" - .string "Care to join us in a tag team?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24769B:: @ 824769B - .string "Thanks a bunch!\p" - .string "I’ll go register at the counter.\n" - .string "Let’s not disappoint each other!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2476ED:: @ 82476ED - .string "My POKéMON are tremendously strong.\n" - .string "How disappointing…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247724:: @ 8247724 - .string "Hello.\n" - .string "I’m {STR_VAR_1}, and I’m a BUG MANIAC!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247749:: @ 8247749 - .string "I have found my POKéMON, yes.\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24777A:: @ 824777A - .string "one {STR_VAR_2} with {STR_VAR_1}--\n" - .string "they are what I found.\p" - .string "Could I interest you in forming\n" - .string "a tag team?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2477CE:: @ 82477CE - .string "Okay!\n" - .string "Understood!\p" - .string "I won’t be long with the registration!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247807:: @ 8247807 - .string "With the POKéMON I found, we wouldn’t\n" - .string "have lost…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247838:: @ 8247838 - .string "Ahoy, there!\n" - .string "I’m SAILOR {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247854:: @ 8247854 - .string "Let me show you my pride and joy!\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247889:: @ 8247889 - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "Of course you’re not going to turn\n" - .string "me down. We will team up, right?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2478DD:: @ 82478DD - .string "I didn’t expect any less!\n" - .string "I’ll go register now.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24790D:: @ 824790D - .string "We would’ve stormed through\n" - .string "the opposition! Too bad!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247942:: @ 8247942 - .string "Hi, I’m {STR_VAR_1}.\n" - .string "I’m a COLLECTOR.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24795F:: @ 824795F - .string "The jewels in my collection are\n" - .string "my {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247991:: @ 8247991 - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "Swell, huh?\n" - .string "We should be in a team together.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2479CE:: @ 82479CE - .string "Oh, yeah!\p" - .string "Well, let’s not waste any time.\n" - .string "I’ll go register the two of us.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247A18:: @ 8247A18 - .string "Well, that’s upsetting.\n" - .string "You don’t appreciate my POKéMON.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247A51:: @ 8247A51 - .string "Howdy, I’m {STR_VAR_1}.\n" - .string "I’m a POKéMON RANGER.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247A76:: @ 8247A76 - .string "Keeping me company are one\n" - .string "{STR_VAR_1}-using {STR_VAR_2} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247AA1:: @ 8247AA1 - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "Don’t you think we’d make an impressive\n" - .string "tag team?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247AE3:: @ 8247AE3 - .string "That’s super!\n" - .string "I’ll deal with the registration now.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247B16:: @ 8247B16 - .string "Next time, choose my POKéMON,\n" - .string "will you?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247B3E:: @ 8247B3E - .string "My name’s {STR_VAR_1}.\n" - .string "I’m a POKéMON RANGER!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247B62:: @ 8247B62 - .string "Let me tell you about my team. I have\n" - .string "one {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247B9B:: @ 8247B9B - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "How would you like to form a tag team\n" - .string "with my little posse?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247BE7:: @ 8247BE7 - .string "We’ll be at our best!\n" - .string "I’ll get the registration done quick!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247C23:: @ 8247C23 - .string "I hope you’ll choose my POKéMON\n" - .string "next time.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247C4E:: @ 8247C4E - .string "Pleased to meet you. I’m {STR_VAR_1}.\n" - .string "I consider myself an AROMA LADY.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247C8C:: @ 8247C8C - .string "I travel with one {STR_VAR_2}\n" - .string "that uses {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247CB2:: @ 8247CB2 - .string "one {STR_VAR_2} that uses\n" - .string "{STR_VAR_1}.\p" - .string "I hope they strike your fancy.\n" - .string "Would you care to be my partner?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247D07:: @ 8247D07 - .string "I’m honored by your acceptance.\n" - .string "I will go register right this instant.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247D4E:: @ 8247D4E - .string "It would be wonderful if we could form\n" - .string "a tag team the next time we meet.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247D97:: @ 8247D97 - .string "Want to know who I am?\n" - .string "I’m {STR_VAR_1}, the RUIN MANIAC!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247DC7:: @ 8247DC7 - .string "The POKéMON that I have with me are\n" - .string "one {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247DFE:: @ 8247DFE - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "Intriguing, eh?\n" - .string "How about you and I partner up?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247E3E:: @ 8247E3E - .string "That’s a sound decision!\n" - .string "I’ll go do the registration paperwork.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247E7E:: @ 8247E7E - .string "Hmm…\n" - .string "I think my POKéMON are tough…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247EA1:: @ 8247EA1 - .string "I’m COOLTRAINER {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247EB5:: @ 8247EB5 - .string "The POKéMON I have right now are one\n" - .string "{STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247EE9:: @ 8247EE9 - .string "one {STR_VAR_2} with {STR_VAR_1}.\n" - .string "Cool, huh?\p" - .string "Don’t you think it’d be pretty cool\n" - .string "if we made a tag team?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247F3F:: @ 8247F3F - .string "Cool!\n" - .string "I’ll go do the registration in a flash!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247F6D:: @ 8247F6D - .string "I thought that we’d make just\n" - .string "the greatest team ever.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247FA3:: @ 8247FA3 - .string "I’m COOLTRAINER {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247FB7:: @ 8247FB7 - .string "The team I’ve been raising has one\n" - .string "{STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247FE9:: @ 8247FE9 - .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "Does that sound okay?\n" - .string "How about we become tag partners?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248031:: @ 8248031 - .string "Sounds A-OK!\n" - .string "I’d better do the registration.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24805E:: @ 824805E - .string "I was thinking how we would be\n" - .string "one tough team…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24808D:: @ 824808D - .string "Heyo!\n" - .string "I’m {STR_VAR_1}, the POKéMANIAC!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2480AB:: @ 82480AB - .string "What does a guy like me have?\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2480DC:: @ 82480DC - .string "one {STR_VAR_2} with {STR_VAR_1},\n" - .string "that’s what!\p" - .string "Let’s do it!\n" - .string "We’ll stomp around as a tag team!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248128:: @ 8248128 - .string "Good call!\n" - .string "I’ll register the both of us!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248151:: @ 8248151 - .string "My POKéMON are brutal!\n" - .string "It’s not my fault if you regret this!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24818E:: @ 824818E - .string "Yo, there!\n" - .string "I’m KINDLER {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2481A9:: @ 82481A9 - .string "You know what my training cooked up?\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2481E1:: @ 82481E1 - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "Well, what do you say?\n" - .string "Want to form a tag team?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248221:: @ 8248221 - .string "All right!\n" - .string "I’ll get on with the registration.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24824F:: @ 824824F - .string "Promise you’ll partner up with me\n" - .string "the next time we run into each other.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248297:: @ 8248297 - .string "I’m {STR_VAR_1}, and I’m a CAMPER!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2482B1:: @ 82482B1 - .string "I’ve been raising one {STR_VAR_1}-\n" - .string "using {STR_VAR_2} and one$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2482DC:: @ 82482DC - .string "{STR_VAR_1}-using {STR_VAR_2}.\p" - .string "Do you think it’d be fun to team up?\n" - .string "I bet it would be!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248321:: @ 8248321 - .string "Yeah!\n" - .string "Off I go to register!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24833D:: @ 824833D - .string "Next time, okay?\n" - .string "I want to be on your team.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248369:: @ 8248369 - .string "Hello!\n" - .string "I’m {STR_VAR_1}, and I’m a PICNICKER!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24838D:: @ 824838D - .string "The POKéMON I’ve been taking are\n" - .string "one {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2483C1:: @ 82483C1 - .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "Are you interested in joining me\n" - .string "on a tag team?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248401:: @ 8248401 - .string "Why, thank you!\n" - .string "I will do the registration now.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248431:: @ 8248431 - .string "It would be nice if I could join you\n" - .string "some other time.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248467:: @ 8248467 - .string "I’m PSYCHIC {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248477:: @ 8248477 - .string "The twosome I’ve been raising are\n" - .string "one {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2484AC:: @ 82484AC - .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "Would you like to form a tag team\n" - .string "with me?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2484E7:: @ 82484E7 - .string "Sure thing!\n" - .string "I’ll take care of the registration!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248517:: @ 8248517 - .string "If we meet again, that’s when I’d like\n" - .string "to team up with you.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248553:: @ 8248553 - .string "I’m {STR_VAR_1}.\n" - .string "I’m a PSYCHIC.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24856A:: @ 824856A - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24857D:: @ 824857D - .string "one {STR_VAR_2} with {STR_VAR_1}--\n" - .string "they’re my disciples.\p" - .string "Doesn’t the idea of forming a tag-team\n" - .string "partnership intrigue you?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2485E5:: @ 82485E5 - .string "Thank you.\n" - .string "I’ll go deal with the registration.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248614:: @ 8248614 - .string "I hope there will be another chance\n" - .string "to forge an alliance.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24864E:: @ 824864E - .string "I’m SCHOOL KID {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248661:: @ 8248661 - .string "One {STR_VAR_1}-using {STR_VAR_2}$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248671:: @ 8248671 - .string "and one {STR_VAR_1}-using\n" - .string "{STR_VAR_2} are my POKéMON pair.\p" - .string "May I please be your partner on\n" - .string "a tag team?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2486C6:: @ 82486C6 - .string "Ooh, thank you!\n" - .string "I’ll register at the counter right away!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2486FF:: @ 82486FF - .string "Please?\n" - .string "May I join you the next time?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248725:: @ 8248725 - .string "Hiya! The name’s {STR_VAR_1}!\n" - .string "I’m a POKéMON BREEDER!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248751:: @ 8248751 - .string "The POKéMON I’ve raised are one\n" - .string "{STR_VAR_1}-using {STR_VAR_2} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248781:: @ 8248781 - .string "one {STR_VAR_1}-using {STR_VAR_2}.\p" - .string "Sound interesting?\n" - .string "How about we form a tag team, then?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2487C9:: @ 82487C9 - .string "All righty!\n" - .string "You leave the registration to me!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2487F7:: @ 82487F7 - .string "You have to team up with me next time,\n" - .string "all right?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248829:: @ 8248829 - .string "I’m {STR_VAR_1}, and I’m proud to say\n" - .string "that I am a POKéFAN.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24885B:: @ 824885B - .string "The darling POKéMON I’ve raised are\n" - .string "one {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248892:: @ 8248892 - .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "Aren’t they just the cutest?\n" - .string "We ought to make a team!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2488D8:: @ 82488D8 - .string "Thank you, dear!\n" - .string "I’ll be on my way to register!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248908:: @ 8248908 - .string "My darling POKéMON are the best,\n" - .string "I’ll have you know. How annoying!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24894B:: @ 824894B - .string "Hi, I’m SWIMMER {STR_VAR_1}.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24895F:: @ 824895F - .string "One {STR_VAR_1}-using {STR_VAR_2}$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24896F:: @ 824896F - .string "and one {STR_VAR_1}-using\n" - .string "{STR_VAR_2} are what I’ve trained.\p" - .string "You and me, let’s make a tag team.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2489BD:: @ 82489BD - .string "That’s cool!\n" - .string "I’ll register the two of us.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2489E7:: @ 82489E7 - .string "If we meet again, you owe me\n" - .string "a tag team!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248A10:: @ 8248A10 - .string "What’s happening?\n" - .string "I’m {STR_VAR_1}, and I’m a TRIATHLETE.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248A40:: @ 8248A40 - .string "I got a couple decent POKéMON.\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248A72:: @ 8248A72 - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "It’d be neat if we made a tag team\n" - .string "together, so how about it?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248AC0:: @ 8248AC0 - .string "Right on!\n" - .string "You wait while I register, okay?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248AEB:: @ 8248AEB - .string "I expect you’ll let me join you\n" - .string "next time, how’s that?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248B22:: @ 8248B22 - .string "I’m the TRIATHLETE {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248B39:: @ 8248B39 - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248B4C:: @ 8248B4C - .string "another {STR_VAR_2} that knows how\n" - .string "to use {STR_VAR_1}. That’s my pair.\p" - .string "What do you think?\n" - .string "We’d make a good team, I’d say.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248BB4:: @ 8248BB4 - .string "I like that answer!\n" - .string "I’ll get done with registration fast!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248BEE:: @ 8248BEE - .string "You’ll give me another chance to form\n" - .string "a partnership, won’t you?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248C2E:: @ 8248C2E - .string "Hi, there! Hello!\n" - .string "I’m {STR_VAR_1}, and I’m a SWIMMER!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248C5B:: @ 8248C5B - .string "Check out what I’ve been raising!\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248C90:: @ 8248C90 - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "Sweet, huh?\n" - .string "It’d be sweet to form a team, too!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248CCF:: @ 8248CCF - .string "Much obliged!\n" - .string "I’ll get this registration thing done!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248D04:: @ 8248D04 - .string "If we meet again, you have to team up\n" - .string "with me. You’ll do that, right?$" - diff --git a/data/scripts/maps/BattleFrontier_Lounge1.inc b/data/scripts/maps/BattleFrontier_Lounge1.inc deleted file mode 100644 index ba8ca0cb6..000000000 --- a/data/scripts/maps/BattleFrontier_Lounge1.inc +++ /dev/null @@ -1,269 +0,0 @@ -BattleFrontier_Lounge1_MapScripts:: @ 825E774 - .byte 0 - -BattleFrontier_Lounge1_EventScript_25E775:: @ 825E775 - lock - faceplayer - checkflag FLAG_0x153 - call_if 0, BattleFrontier_Lounge1_EventScript_25E7AD - checkflag FLAG_0x153 - call_if 1, BattleFrontier_Lounge1_EventScript_25E7B6 - setflag FLAG_0x153 - goto BattleFrontier_Lounge1_EventScript_25E792 - end - -BattleFrontier_Lounge1_EventScript_25E792:: @ 825E792 - special sub_81B94B0 - waitstate - compare VAR_0x8004, 255 - goto_if 5, BattleFrontier_Lounge1_EventScript_25E7BF - compare VAR_0x8004, 255 - goto_eq BattleFrontier_Lounge1_EventScript_25E943 - end - -BattleFrontier_Lounge1_EventScript_25E7AD:: @ 825E7AD - msgbox BattleFrontier_Lounge1_Text_25E95F, 4 - return - -BattleFrontier_Lounge1_EventScript_25E7B6:: @ 825E7B6 - msgbox BattleFrontier_Lounge1_Text_25EEF6, 4 - return - -BattleFrontier_Lounge1_EventScript_25E7BF:: @ 825E7BF - specialvar VAR_RESULT, ScriptGetPartyMonSpecies - compare VAR_RESULT, 412 - goto_eq BattleFrontier_Lounge1_EventScript_25E7FF - special sub_8139D98 - compare VAR_0x8005, 90 - goto_if 3, BattleFrontier_Lounge1_EventScript_25E87F - compare VAR_0x8005, 120 - goto_if 3, BattleFrontier_Lounge1_EventScript_25E88D - compare VAR_0x8005, 150 - goto_if 3, BattleFrontier_Lounge1_EventScript_25E89B - compare VAR_0x8005, 151 - goto_if 4, BattleFrontier_Lounge1_EventScript_25E8A9 - end - -BattleFrontier_Lounge1_EventScript_25E7FF:: @ 825E7FF - msgbox BattleFrontier_Lounge1_Text_25EF5E, 4 - goto BattleFrontier_Lounge1_EventScript_25E792 - end - -BattleFrontier_Lounge1_EventScript_25E80D:: @ 825E80D - compare VAR_0x8006, 0 - goto_eq BattleFrontier_Lounge1_EventScript_25E8B7 - compare VAR_0x8006, 1 - goto_eq BattleFrontier_Lounge1_EventScript_25E8C5 - compare VAR_0x8006, 2 - goto_eq BattleFrontier_Lounge1_EventScript_25E8D3 - compare VAR_0x8006, 3 - goto_eq BattleFrontier_Lounge1_EventScript_25E8E1 - compare VAR_0x8006, 4 - goto_eq BattleFrontier_Lounge1_EventScript_25E8EF - compare VAR_0x8006, 5 - goto_eq BattleFrontier_Lounge1_EventScript_25E8FD - end - -BattleFrontier_Lounge1_EventScript_25E850:: @ 825E850 - compare VAR_0x8007, 15 - goto_if 3, BattleFrontier_Lounge1_EventScript_25E90B - compare VAR_0x8007, 25 - goto_if 3, BattleFrontier_Lounge1_EventScript_25E919 - compare VAR_0x8007, 30 - goto_if 3, BattleFrontier_Lounge1_EventScript_25E927 - compare VAR_0x8007, 31 - goto_if 4, BattleFrontier_Lounge1_EventScript_25E935 - end - -BattleFrontier_Lounge1_EventScript_25E87D:: @ 825E87D - release - end - -BattleFrontier_Lounge1_EventScript_25E87F:: @ 825E87F - msgbox BattleFrontier_Lounge1_Text_25EA92, 4 - goto BattleFrontier_Lounge1_EventScript_25E80D - end - -BattleFrontier_Lounge1_EventScript_25E88D:: @ 825E88D - msgbox BattleFrontier_Lounge1_Text_25EAD9, 4 - goto BattleFrontier_Lounge1_EventScript_25E80D - end - -BattleFrontier_Lounge1_EventScript_25E89B:: @ 825E89B - msgbox BattleFrontier_Lounge1_Text_25EB2A, 4 - goto BattleFrontier_Lounge1_EventScript_25E80D - end - -BattleFrontier_Lounge1_EventScript_25E8A9:: @ 825E8A9 - msgbox BattleFrontier_Lounge1_Text_25EB6F, 4 - goto BattleFrontier_Lounge1_EventScript_25E80D - end - -BattleFrontier_Lounge1_EventScript_25E8B7:: @ 825E8B7 - msgbox BattleFrontier_Lounge1_Text_25EBBB, 4 - goto BattleFrontier_Lounge1_EventScript_25E850 - end - -BattleFrontier_Lounge1_EventScript_25E8C5:: @ 825E8C5 - msgbox BattleFrontier_Lounge1_Text_25EBF8, 4 - goto BattleFrontier_Lounge1_EventScript_25E850 - end - -BattleFrontier_Lounge1_EventScript_25E8D3:: @ 825E8D3 - msgbox BattleFrontier_Lounge1_Text_25EC39, 4 - goto BattleFrontier_Lounge1_EventScript_25E850 - end - -BattleFrontier_Lounge1_EventScript_25E8E1:: @ 825E8E1 - msgbox BattleFrontier_Lounge1_Text_25ED0E, 4 - goto BattleFrontier_Lounge1_EventScript_25E850 - end - -BattleFrontier_Lounge1_EventScript_25E8EF:: @ 825E8EF - msgbox BattleFrontier_Lounge1_Text_25EC7B, 4 - goto BattleFrontier_Lounge1_EventScript_25E850 - end - -BattleFrontier_Lounge1_EventScript_25E8FD:: @ 825E8FD - msgbox BattleFrontier_Lounge1_Text_25ECC4, 4 - goto BattleFrontier_Lounge1_EventScript_25E850 - end - -BattleFrontier_Lounge1_EventScript_25E90B:: @ 825E90B - msgbox BattleFrontier_Lounge1_Text_25ED4E, 4 - goto BattleFrontier_Lounge1_EventScript_25E87D - end - -BattleFrontier_Lounge1_EventScript_25E919:: @ 825E919 - msgbox BattleFrontier_Lounge1_Text_25ED87, 4 - goto BattleFrontier_Lounge1_EventScript_25E87D - end - -BattleFrontier_Lounge1_EventScript_25E927:: @ 825E927 - msgbox BattleFrontier_Lounge1_Text_25EDC1, 4 - goto BattleFrontier_Lounge1_EventScript_25E87D - end - -BattleFrontier_Lounge1_EventScript_25E935:: @ 825E935 - msgbox BattleFrontier_Lounge1_Text_25EDF6, 4 - goto BattleFrontier_Lounge1_EventScript_25E87D - end - -BattleFrontier_Lounge1_EventScript_25E943:: @ 825E943 - msgbox BattleFrontier_Lounge1_Text_25EE37, 4 - release - end - -BattleFrontier_Lounge1_EventScript_25E94D:: @ 825E94D - msgbox BattleFrontier_Lounge1_Text_25EFDD, 2 - end - -BattleFrontier_Lounge1_EventScript_25E956:: @ 825E956 - msgbox BattleFrontier_Lounge1_Text_25F020, 2 - end - -BattleFrontier_Lounge1_Text_25E95F: @ 825E95F - .string "For 70 years I have raised POKéMON!\n" - .string "I am the man they revere as\l" - .string "the legendary top POKéMON BREEDER!\p" - .string "If you ever become as seasoned as me,\n" - .string "you’ll see the abilities of POKéMON\l" - .string "at a glance.\p" - .string "You’re a TRAINER. Doesn’t it interest\n" - .string "you to know your own POKéMON’s\l" - .string "abilities?\p" - .string "Here!\n" - .string "Let’s have a look at your POKéMON!$" - -BattleFrontier_Lounge1_Text_25EA92: @ 825EA92 - .string "…Hmm…\p" - .string "This one, overall, I would describe\n" - .string "as being of average ability.$" - -BattleFrontier_Lounge1_Text_25EAD9: @ 825EAD9 - .string "…Hmm…\p" - .string "This one, overall, I would describe as\n" - .string "having better-than-average ability.$" - -BattleFrontier_Lounge1_Text_25EB2A: @ 825EB2A - .string "…Hmm…\p" - .string "This one, overall, I would say is\n" - .string "quite impressive in ability!$" - -BattleFrontier_Lounge1_Text_25EB6F: @ 825EB6F - .string "…Hmm…\p" - .string "This one, overall, I would say is\n" - .string "wonderfully outstanding in ability!$" - -BattleFrontier_Lounge1_Text_25EBBB: @ 825EBBB - .string "Incidentally, the best aspect of it,\n" - .string "I would say, is its HP…$" - -BattleFrontier_Lounge1_Text_25EBF8: @ 825EBF8 - .string "Incidentally, the best aspect of it,\n" - .string "I would say, is its ATTACK…$" - -BattleFrontier_Lounge1_Text_25EC39: @ 825EC39 - .string "Incidentally, the best aspect of it,\n" - .string "I would say, is its DEFENSE…$" - -BattleFrontier_Lounge1_Text_25EC7B: @ 825EC7B - .string "Incidentally, the best aspect of it,\n" - .string "I would say, is its SPECIAL ATTACK…$" - -BattleFrontier_Lounge1_Text_25ECC4: @ 825ECC4 - .string "Incidentally, the best aspect of it,\n" - .string "I would say, is its SPECIAL DEFENSE…$" - -BattleFrontier_Lounge1_Text_25ED0E: @ 825ED0E - .string "Incidentally, the best aspect of it,\n" - .string "I would say, is its SPEED…$" - -BattleFrontier_Lounge1_Text_25ED4E: @ 825ED4E - .string "That stat is relatively good.\n" - .string "…Hm… That’s how I call it.$" - -BattleFrontier_Lounge1_Text_25ED87: @ 825ED87 - .string "That stat is quite impressive.\n" - .string "…Hm… That’s how I call it.$" - -BattleFrontier_Lounge1_Text_25EDC1: @ 825EDC1 - .string "That stat is outstanding!\n" - .string "…Hm… That’s how I call it.$" - -BattleFrontier_Lounge1_Text_25EDF6: @ 825EDF6 - .string "It’s flawless! A thing of perfection!\n" - .string "…Hm… That’s how I call it.$" - -BattleFrontier_Lounge1_Text_25EE37: @ 825EE37 - .string "What?\n" - .string "You have no time for my advice?\p" - .string "You should always be eager to learn\n" - .string "from the experiences of your elders!$" - -BattleFrontier_Lounge1_Text_25EEA6: @ 825EEA6 - .string "Yes, what is it now?\p" - .string "I have business that needs tending!\n" - .string "Save it for next time!$" - -BattleFrontier_Lounge1_Text_25EEF6: @ 825EEF6 - .string "Ah, youngster! Do your POKéMON’s\n" - .string "abilities intrigue you?\p" - .string "Here, here!\n" - .string "Let’s have a look at your POKéMON!$" - -BattleFrontier_Lounge1_Text_25EF5E: @ 825EF5E - .string "An expert I am, but even I can’t tell\n" - .string "anything about an unhatched POKéMON!\p" - .string "Show me a POKéMON!\n" - .string "A POKéMON is what I need to see!$" - -BattleFrontier_Lounge1_Text_25EFDD: @ 825EFDD - .string "He said my POKéMON is outstanding!\n" - .string "I’m glad I raised it carefully!$" - -BattleFrontier_Lounge1_Text_25F020: @ 825F020 - .string "He said my POKéMON is outstanding!\n" - .string "But I didn’t do anything special\l" - .string "raising it…$" - diff --git a/data/scripts/maps/BattleFrontier_Lounge2.inc b/data/scripts/maps/BattleFrontier_Lounge2.inc deleted file mode 100644 index bbb298b5b..000000000 --- a/data/scripts/maps/BattleFrontier_Lounge2.inc +++ /dev/null @@ -1,373 +0,0 @@ -BattleFrontier_Lounge2_MapScripts:: @ 8260642 - .byte 0 - -BattleFrontier_Lounge2_EventScript_260643:: @ 8260643 - lock - faceplayer - checkflag FLAG_0x154 - goto_eq BattleFrontier_Lounge2_EventScript_26065F - setflag FLAG_0x154 - msgbox BattleFrontier_Lounge2_Text_260766, 4 - goto BattleFrontier_Lounge2_EventScript_26066D - end - -BattleFrontier_Lounge2_EventScript_26065F:: @ 826065F - msgbox BattleFrontier_Lounge2_Text_260857, 4 - goto BattleFrontier_Lounge2_EventScript_26066D - end - -BattleFrontier_Lounge2_EventScript_26066D:: @ 826066D - compare VAR_FRONTIER_MANIAC_FACILITY, 0 - call_if 1, BattleFrontier_Lounge2_EventScript_26070A - compare VAR_FRONTIER_MANIAC_FACILITY, 1 - call_if 1, BattleFrontier_Lounge2_EventScript_26070F - compare VAR_FRONTIER_MANIAC_FACILITY, 2 - call_if 1, BattleFrontier_Lounge2_EventScript_260714 - compare VAR_FRONTIER_MANIAC_FACILITY, 3 - call_if 1, BattleFrontier_Lounge2_EventScript_260719 - compare VAR_FRONTIER_MANIAC_FACILITY, 4 - call_if 1, BattleFrontier_Lounge2_EventScript_26071E - compare VAR_FRONTIER_MANIAC_FACILITY, 5 - call_if 1, BattleFrontier_Lounge2_EventScript_260723 - compare VAR_FRONTIER_MANIAC_FACILITY, 6 - call_if 1, BattleFrontier_Lounge2_EventScript_260728 - compare VAR_FRONTIER_MANIAC_FACILITY, 7 - call_if 1, BattleFrontier_Lounge2_EventScript_26072D - compare VAR_FRONTIER_MANIAC_FACILITY, 8 - call_if 1, BattleFrontier_Lounge2_EventScript_260732 - compare VAR_FRONTIER_MANIAC_FACILITY, 9 - call_if 1, BattleFrontier_Lounge2_EventScript_260737 - compare VAR_FRONTIER_MANIAC_FACILITY, 3 - call_if 3, BattleFrontier_Lounge2_EventScript_2606F8 - compare VAR_FRONTIER_MANIAC_FACILITY, 4 - call_if 4, BattleFrontier_Lounge2_EventScript_260701 - special sub_8139F20 - waitmessage - waitbuttonpress - release - end - -BattleFrontier_Lounge2_EventScript_2606F8:: @ 82606F8 - msgbox BattleFrontier_Lounge2_Text_260933, 4 - return - -BattleFrontier_Lounge2_EventScript_260701:: @ 8260701 - msgbox BattleFrontier_Lounge2_Text_2608F2, 4 - return - -BattleFrontier_Lounge2_EventScript_26070A:: @ 826070A - bufferstdstring 0, 19 - return - -BattleFrontier_Lounge2_EventScript_26070F:: @ 826070F - bufferstdstring 0, 20 - return - -BattleFrontier_Lounge2_EventScript_260714:: @ 8260714 - bufferstdstring 0, 21 - return - -BattleFrontier_Lounge2_EventScript_260719:: @ 8260719 - bufferstdstring 0, 22 - return - -BattleFrontier_Lounge2_EventScript_26071E:: @ 826071E - bufferstdstring 0, 24 - return - -BattleFrontier_Lounge2_EventScript_260723:: @ 8260723 - bufferstdstring 0, 25 - return - -BattleFrontier_Lounge2_EventScript_260728:: @ 8260728 - bufferstdstring 0, 26 - return - -BattleFrontier_Lounge2_EventScript_26072D:: @ 826072D - bufferstdstring 0, 27 - return - -BattleFrontier_Lounge2_EventScript_260732:: @ 8260732 - bufferstdstring 0, 28 - return - -BattleFrontier_Lounge2_EventScript_260737:: @ 8260737 - bufferstdstring 0, 29 - return - -BattleFrontier_Lounge2_EventScript_26073C:: @ 826073C - lock - msgbox BattleFrontier_Lounge2_Text_261C9C, 4 - release - end - -BattleFrontier_Lounge2_EventScript_260747:: @ 8260747 - lock - msgbox BattleFrontier_Lounge2_Text_261CDC, 4 - release - end - -BattleFrontier_Lounge2_EventScript_260752:: @ 8260752 - lock - msgbox BattleFrontier_Lounge2_Text_261D1D, 4 - release - end - -BattleFrontier_Lounge2_EventScript_26075D:: @ 826075D - msgbox BattleFrontier_Lounge2_Text_261D5C, 2 - end - -BattleFrontier_Lounge2_Text_260766:: @ 8260766 - .string "Howdy! When it comes to news about\n" - .string "the BATTLE FRONTIER, I’m no. 1.\p" - .string "You can think of me as\n" - .string "the FRONTIER MANIAC.\p" - .string "Just checking, but you are a TRAINER,\n" - .string "isn’t that right?\p" - .string "I’ll happily share the hottest news\n" - .string "I gathered about the BATTLE FRONTIER.$" - -BattleFrontier_Lounge2_Text_260857:: @ 8260857 - .string "Howdy! Did you swing by to grill me\n" - .string "about the latest word? Oh, all right!$" - -BattleFrontier_Lounge2_Text_2608A1:: @ 82608A1 - .string "Well? Well? Well?\p" - .string "I’m sure my information’s been\n" - .string "seriously useful to you, right?$" - -BattleFrontier_Lounge2_Text_2608F2:: @ 82608F2 - .string "Let’s see now…\p" - .string "It sounds like the {STR_VAR_1}\n" - .string "is the hottest place going.$" - -BattleFrontier_Lounge2_Text_260933:: @ 8260933 - .string "Let’s see now…\p" - .string "It sounds like BATTLE TOWER\n" - .string "{STR_VAR_1} is the hottest.$" - -BattleFrontier_Lounge2_Text_260971:: @ 8260971 - .string "Bet you didn’t know this!\p" - .string "One of those top TRAINERS that SCOTT\n" - .string "calls the FRONTIER BRAINS is there.\p" - .string "It’s this mysterious TRAINER called\n" - .string "the SALON MAIDEN that runs the place.$" - -BattleFrontier_Lounge2_Text_260A1E:: @ 8260A1E - .string "Have you battled the SALON MAIDEN?\p" - .string "When she’s measuring up her opponent,\n" - .string "she apparently uses these POKéMON:\p" - .string "A PSYCHIC-type PSI POKéMON,\n" - .string "a FIRE-type VOLCANO POKéMON,\l" - .string "and a NORMAL-type SLEEPING POKéMON.$" - -BattleFrontier_Lounge2_Text_260AE7:: @ 8260AE7 - .string "Have you battled the SALON MAIDEN\n" - .string "when she’s serious?\p" - .string "When she’s battling flat out,\n" - .string "she apparently uses these POKéMON:\p" - .string "A DRAGON & PSYCHIC EON POKéMON,\n" - .string "an ELECTRIC-type THUNDER POKéMON,\l" - .string "and a NORMAL-type SLEEPING POKéMON.$" - -BattleFrontier_Lounge2_Text_260BC4:: @ 8260BC4 - .string "Bet you didn’t know this!\p" - .string "One of those top TRAINERS that SCOTT\n" - .string "calls the FRONTIER BRAINS is there.\p" - .string "It’s this flamboyant TRAINER called\n" - .string "the DOME ACE that runs the place.$" - -BattleFrontier_Lounge2_Text_260C6D:: @ 8260C6D - .string "Have you battled the DOME ACE?\p" - .string "When he’s treating the opponent\n" - .string "lightly, he uses these three POKéMON:\p" - .string "A DRAGON & FLYING DRAGON POKéMON,\n" - .string "a WATER & GROUND MUD FISH POKéMON,\l" - .string "and a FIRE & FLYING FLAME POKéMON.$" - -BattleFrontier_Lounge2_Text_260D3A:: @ 8260D3A - .string "Have you battled the DOME ACE\n" - .string "when he’s serious?\p" - .string "When he’s demonstrating his strategy,\n" - .string "he uses these three POKéMON:\p" - .string "A DRAGON & FLYING EON POKéMON,\n" - .string "a WATER & GROUND MUD FISH POKéMON,\l" - .string "and a STEEL- & PSYCHIC-type IRON LEG\l" - .string "POKéMON.$" - -BattleFrontier_Lounge2_Text_260E1E:: @ 8260E1E - .string "Bet you didn’t know this!\p" - .string "One of those top TRAINERS that SCOTT\n" - .string "calls the FRONTIER BRAINS is there.\p" - .string "It’s this freaky TRAINER called\n" - .string "the FACTORY HEAD that runs the place.$" - -BattleFrontier_Lounge2_Text_260EC7:: @ 8260EC7 - .string "Have you battled the FACTORY HEAD\n" - .string "already?\p" - .string "Let me think… When he goes to battle,\n" - .string "he just gets three rental POKéMON.\p" - .string "He battles under pretty much the same\n" - .string "conditions as you.$" - -BattleFrontier_Lounge2_Text_260F74:: @ 8260F74 - .string "Have you battled the FACTORY HEAD\n" - .string "when he’s serious?\p" - .string "When he goes seriously to battle,\n" - .string "he still gets three rental POKéMON.\p" - .string "He battles under virtually the same\n" - .string "conditions as you.$" - -BattleFrontier_Lounge2_Text_261026:: @ 8261026 - .string "Bet you didn’t know this!\p" - .string "One of those top TRAINERS that SCOTT\n" - .string "calls the FRONTIER BRAINS is there.\p" - .string "It’s this scary TRAINER called\n" - .string "the PIKE QUEEN that runs the place.$" - -BattleFrontier_Lounge2_Text_2610CC:: @ 82610CC - .string "Have you battled the PIKE QUEEN\n" - .string "before?\p" - .string "When she’s in a good mood, they say\n" - .string "she uses these three POKéMON:\p" - .string "A POISON-type FANG SNAKE POKéMON,\n" - .string "a BUG & ROCK MOLD POKéMON,\l" - .string "and a WATER-type TENDER POKéMON.$" - -BattleFrontier_Lounge2_Text_261194:: @ 8261194 - .string "Have you battled the PIKE QUEEN\n" - .string "when she’s serious?\p" - .string "When she’s seriously annoyed, they say\n" - .string "she uses these three POKéMON:\p" - .string "A POISON-type FANG SNAKE POKéMON,\n" - .string "a STEEL & GROUND IRON SNAKE POKéMON,\l" - .string "and a WATER- & FLYING-type ATROCIOUS\l" - .string "POKéMON.$" - -BattleFrontier_Lounge2_Text_261282:: @ 8261282 - .string "Bet you didn’t know this!\p" - .string "One of those top TRAINERS that SCOTT\n" - .string "calls the FRONTIER BRAINS is there.\p" - .string "It’s this cute TRAINER called\n" - .string "the ARENA TYCOON that runs the place.$" - -BattleFrontier_Lounge2_Text_261329:: @ 8261329 - .string "Have you battled the ARENA TYCOON\n" - .string "before?\p" - .string "When she’s assessing the foe’s ability,\n" - .string "she supposedly uses these POKéMON:\p" - .string "A BUG & FIGHTING SINGLE HORN POKéMON,\n" - .string "a DARK-type MOONLIGHT POKéMON,\l" - .string "and a BUG & GHOST SHED POKéMON.$" - -BattleFrontier_Lounge2_Text_261403:: @ 8261403 - .string "Have you battled the ARENA TYCOON\n" - .string "when she’s serious?\p" - .string "When she battles for keeps,\n" - .string "she supposedly uses these POKéMON:\p" - .string "A DARK-type MOONLIGHT POKéMON,\n" - .string "a GHOST & POISON SHADOW POKéMON\l" - .string "and a GRASS- & FIGHTING-type\l" - .string "MUSHROOM POKéMON.$" - -BattleFrontier_Lounge2_Text_2614E6:: @ 82614E6 - .string "Bet you didn’t know this!\p" - .string "One of those top TRAINERS that SCOTT\n" - .string "calls the FRONTIER BRAINS is there.\p" - .string "It’s this sinister TRAINER called\n" - .string "the PALACE MAVEN that runs the place.$" - -BattleFrontier_Lounge2_Text_261591:: @ 8261591 - .string "Have you battled the PALACE MAVEN\n" - .string "before?\p" - .string "When he’s testing the opponent’s\n" - .string "spirit, he’s said to use these POKéMON:\p" - .string "A POISON & FLYING-type BAT POKéMON,\n" - .string "a NORMAL-type LAZY POKéMON, and a\l" - .string "WATER- & ICE-type TRANSPORT POKéMON.$" - -BattleFrontier_Lounge2_Text_26166F:: @ 826166F - .string "Have you battled the PALACE MAVEN\n" - .string "when he’s serious?\p" - .string "When he throws his entire might into\n" - .string "battle, he’s said to use these POKéMON:\p" - .string "A FIRE-type LEGENDARY POKéMON,\n" - .string "a NORMAL-type LAZY POKéMON,\l" - .string "and a WATER-type AURORA POKéMON.$" - -BattleFrontier_Lounge2_Text_26174D:: @ 826174D - .string "Bet you didn’t know this!\p" - .string "One of those top TRAINERS that SCOTT\n" - .string "calls the FRONTIER BRAINS is there.\p" - .string "It’s this fiery-hot TRAINER called\n" - .string "the PYRAMID KING that runs the place.$" - -BattleFrontier_Lounge2_Text_2617F9:: @ 82617F9 - .string "Have you battled the PYRAMID KING\n" - .string "before?\p" - .string "When he’s checking the foe’s power,\n" - .string "he apparently uses these POKéMON:\p" - .string "A ROCK-type ROCK PEAK POKéMON,\n" - .string "an ICE-type ICEBERG POKéMON,\l" - .string "and a STEEL-type IRON POKéMON.$" - -BattleFrontier_Lounge2_Text_2618C4:: @ 82618C4 - .string "Have you battled the PYRAMID KING\n" - .string "when he’s serious?\p" - .string "When he’s pumped with hot power,\n" - .string "he apparently uses these POKéMON:\p" - .string "An ICE & FLYING FREEZE POKéMON, an\n" - .string "ELECTRIC & FLYING ELECTRIC POKéMON,\l" - .string "and a FIRE- & FLYING-type FLAME\l" - .string "POKéMON.$" - -BattleFrontier_Lounge2_Text_2619AC:: @ 82619AC - .string "Sure, there are several places where\n" - .string "you can enter DOUBLE BATTLES.\p" - .string "But the DOUBLE BATTLE ROOMS of\n" - .string "the BATTLE TOWER are, like, basic!\p" - .string "They’re where you should learn about\n" - .string "how DOUBLE BATTLES are played here\l" - .string "in the BATTLE FRONTIER.$" - -BattleFrontier_Lounge2_Text_261A91:: @ 8261A91 - .string "Watch yourself in the battles here.\p" - .string "I hear there are TRAINERS that have\n" - .string "strategies they developed just for\l" - .string "DOUBLE BATTLES.$" - -BattleFrontier_Lounge2_Text_261B0C:: @ 8261B0C - .string "Once you’re confident and comfortable\n" - .string "with DOUBLE BATTLES here, you should\l" - .string "think about challenging other places\l" - .string "offering DOUBLE BATTLES.$" - -BattleFrontier_Lounge2_Text_261B95:: @ 8261B95 - .string "All sorts of TRAINERS gather in\n" - .string "the BATTLE SALON.\p" - .string "Just think--you may run into your\n" - .string "friends or followers!\l" - .string "You should look carefully!$" - -BattleFrontier_Lounge2_Text_261C1A:: @ 8261C1A - .string "If you’re with a friend, head for the\n" - .string "LINK MULTI BATTLE ROOM.\p" - .string "If you play with a strong friend,\n" - .string "you can expect to see tough foes!$" - -BattleFrontier_Lounge2_Text_261C9C:: @ 8261C9C - .string "What amazing news-gathering power!\n" - .string "My mentor’s like none other!$" - -BattleFrontier_Lounge2_Text_261CDC:: @ 8261CDC - .string "What amazing powers of observation!\n" - .string "My mentor’s like none other!$" - -BattleFrontier_Lounge2_Text_261D1D:: @ 8261D1D - .string "What amazing power of persuasion!\n" - .string "My mentor’s like none other!$" - -BattleFrontier_Lounge2_Text_261D5C:: @ 8261D5C - .string "…What is this place?\n" - .string "It’s scaring me…$" - diff --git a/data/scripts/maps/BattleFrontier_Lounge3.inc b/data/scripts/maps/BattleFrontier_Lounge3.inc deleted file mode 100644 index 2638541b2..000000000 --- a/data/scripts/maps/BattleFrontier_Lounge3.inc +++ /dev/null @@ -1,483 +0,0 @@ -BattleFrontier_Lounge3_MapScripts:: @ 8261D82 - .byte 0 - -BattleFrontier_Lounge3_EventScript_261D83:: @ 8261D83 - lock - faceplayer - checkflag FLAG_0x157 - goto_eq BattleFrontier_Lounge3_EventScript_261EF9 - call BattleFrontier_Lounge3_EventScript_261EA0 - compare VAR_0x8004, 2 - goto_if 3, BattleFrontier_Lounge3_EventScript_261EEB - setflag FLAG_0x157 - msgbox BattleFrontier_Lounge3_Text_262061, 4 - goto BattleFrontier_Lounge3_EventScript_261DAF - end - -BattleFrontier_Lounge3_EventScript_261DAF:: @ 8261DAF - special sub_813A820 - waitmessage - waitbuttonpress - msgbox BattleFrontier_Lounge3_Text_262A60, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_Lounge3_EventScript_261FA5 - msgbox BattleFrontier_Lounge3_Text_262ABD, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_Lounge3_EventScript_261FA5 - message BattleFrontier_Lounge3_Text_262B42 - waitmessage - special sub_813A958 - goto BattleFrontier_Lounge3_EventScript_261DE9 - end - -BattleFrontier_Lounge3_EventScript_261DE9:: @ 8261DE9 - multichoice 20, 4, 87, 0 - copyvar VAR_FRONTIER_GAMBLER_AMOUNT_BET, VAR_RESULT - switch VAR_RESULT - case 0, BattleFrontier_Lounge3_EventScript_261E30 - case 1, BattleFrontier_Lounge3_EventScript_261E3B - case 2, BattleFrontier_Lounge3_EventScript_261E46 - case 3, BattleFrontier_Lounge3_EventScript_261FAF - case 127, BattleFrontier_Lounge3_EventScript_261FAF - end - -BattleFrontier_Lounge3_EventScript_261E30:: @ 8261E30 - setvar VAR_0x8008, 5 - goto BattleFrontier_Lounge3_EventScript_261E51 - end - -BattleFrontier_Lounge3_EventScript_261E3B:: @ 8261E3B - setvar VAR_0x8008, 10 - goto BattleFrontier_Lounge3_EventScript_261E51 - end - -BattleFrontier_Lounge3_EventScript_261E46:: @ 8261E46 - setvar VAR_0x8008, 15 - goto BattleFrontier_Lounge3_EventScript_261E51 - end - -BattleFrontier_Lounge3_EventScript_261E51:: @ 8261E51 - specialvar VAR_TEMP_1, sub_813AA04 - compare VAR_TEMP_1, VAR_0x8008 - goto_if 4, BattleFrontier_Lounge3_EventScript_261E75 - msgbox BattleFrontier_Lounge3_Text_262B6E, 4 - message BattleFrontier_Lounge3_Text_262B42 - waitmessage - goto BattleFrontier_Lounge3_EventScript_261DE9 - end - -BattleFrontier_Lounge3_EventScript_261E75:: @ 8261E75 - copyvar VAR_0x8004, VAR_0x8008 - special sub_813A9A4 - setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1 - special sub_813A8FC - playse SE_REGI - msgbox BattleFrontier_Lounge3_Text_262BE0, 4 - goto BattleFrontier_Lounge3_EventScript_261E96 - end - -BattleFrontier_Lounge3_EventScript_261E96:: @ 8261E96 - special sub_813A854 - waitmessage - waitbuttonpress - special sub_813A988 - release - end - -BattleFrontier_Lounge3_EventScript_261EA0:: @ 8261EA0 - setvar VAR_0x8004, 0 - checkflag FLAG_SYS_TOWER_SILVER - call_if 1, BattleFrontier_Lounge3_EventScript_261EE5 - checkflag FLAG_SYS_DOME_SILVER - call_if 1, BattleFrontier_Lounge3_EventScript_261EE5 - checkflag FLAG_SYS_PALACE_SILVER - call_if 1, BattleFrontier_Lounge3_EventScript_261EE5 - checkflag FLAG_SYS_ARENA_SILVER - call_if 1, BattleFrontier_Lounge3_EventScript_261EE5 - checkflag FLAG_SYS_FACTORY_SILVER - call_if 1, BattleFrontier_Lounge3_EventScript_261EE5 - checkflag FLAG_SYS_PIKE_SILVER - call_if 1, BattleFrontier_Lounge3_EventScript_261EE5 - checkflag FLAG_SYS_PYRAMID_SILVER - call_if 1, BattleFrontier_Lounge3_EventScript_261EE5 - return - -BattleFrontier_Lounge3_EventScript_261EE5:: @ 8261EE5 - addvar VAR_0x8004, 1 - return - -BattleFrontier_Lounge3_EventScript_261EEB:: @ 8261EEB - msgbox BattleFrontier_Lounge3_Text_261FFE, 4 - goto BattleFrontier_Lounge3_EventScript_261FF1 - end - -BattleFrontier_Lounge3_EventScript_261EF9:: @ 8261EF9 - msgbox BattleFrontier_Lounge3_Text_26346B, 4 - compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1 - goto_if 4, BattleFrontier_Lounge3_EventScript_261F12 - goto BattleFrontier_Lounge3_EventScript_261DAF - end - -BattleFrontier_Lounge3_EventScript_261F12:: @ 8261F12 - compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1 - goto_eq BattleFrontier_Lounge3_EventScript_261F9E - compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 2 - goto_eq BattleFrontier_Lounge3_EventScript_261F2E - goto BattleFrontier_Lounge3_EventScript_261F71 - end - -BattleFrontier_Lounge3_EventScript_261F2E:: @ 8261F2E - msgbox BattleFrontier_Lounge3_Text_263334, 4 - compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 0 - call_if 1, BattleFrontier_Lounge3_EventScript_261F80 - compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 1 - call_if 1, BattleFrontier_Lounge3_EventScript_261F8A - compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 2 - call_if 1, BattleFrontier_Lounge3_EventScript_261F94 - msgbox BattleFrontier_Lounge3_Text_2633D4, 9 - special sub_813A9D0 - msgbox BattleFrontier_Lounge3_Text_2633F2, 4 - setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 0 - release - end - -BattleFrontier_Lounge3_EventScript_261F71:: @ 8261F71 - msgbox BattleFrontier_Lounge3_Text_263298, 4 - setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 0 - release - end - -BattleFrontier_Lounge3_EventScript_261F80:: @ 8261F80 - buffernumberstring 0, 10 - setvar VAR_0x8004, 10 - return - -BattleFrontier_Lounge3_EventScript_261F8A:: @ 8261F8A - buffernumberstring 0, 20 - setvar VAR_0x8004, 20 - return - -BattleFrontier_Lounge3_EventScript_261F94:: @ 8261F94 - buffernumberstring 0, 30 - setvar VAR_0x8004, 30 - return - -BattleFrontier_Lounge3_EventScript_261F9E:: @ 8261F9E - special sub_813A854 - waitmessage - waitbuttonpress - release - end - -BattleFrontier_Lounge3_EventScript_261FA5:: @ 8261FA5 - msgbox BattleFrontier_Lounge3_Text_26342D, 4 - release - end - -BattleFrontier_Lounge3_EventScript_261FAF:: @ 8261FAF - special sub_813A988 - goto BattleFrontier_Lounge3_EventScript_261FA5 - end - -BattleFrontier_Lounge3_EventScript_261FB8:: @ 8261FB8 - msgbox BattleFrontier_Lounge3_Text_263545, 2 - end - -BattleFrontier_Lounge3_EventScript_261FC1:: @ 8261FC1 - lock - faceplayer - msgbox BattleFrontier_Lounge3_Text_26346F, 4 - goto BattleFrontier_Lounge3_EventScript_261FF1 - end - -BattleFrontier_Lounge3_EventScript_261FD1:: @ 8261FD1 - lock - faceplayer - msgbox BattleFrontier_Lounge3_Text_26351D, 4 - goto BattleFrontier_Lounge3_EventScript_261FF1 - end - -BattleFrontier_Lounge3_EventScript_261FE1:: @ 8261FE1 - lock - faceplayer - msgbox BattleFrontier_Lounge3_Text_2634C9, 4 - goto BattleFrontier_Lounge3_EventScript_261FF1 - end - -BattleFrontier_Lounge3_EventScript_261FF1:: @ 8261FF1 - closemessage - applymovement VAR_LAST_TALKED, BattleFrontier_Lounge3_Movement_2725A2 - waitmovement 0 - release - end - -BattleFrontier_Lounge3_Text_261FFE:: @ 8261FFE - .string "…What’s that you want?\p" - .string "Can’t you see we’re kind of busy here?\n" - .string "Can’t your business wait till later?$" - -BattleFrontier_Lounge3_Text_262061:: @ 8262061 - .string "…Huh?\n" - .string "You look to me like a tough TRAINER.\p" - .string "Heheh…\n" - .string "Listen, I have this proposition.\p" - .string "We have a little group going here,\n" - .string "and we play a little game with what\l" - .string "goes on in the BATTLE FRONTIER.\p" - .string "The rules are really simple.\p" - .string "First, we pick one of the facilities\n" - .string "in the BATTLE FRONTIER.\p" - .string "Then, we each pick a different TRAINER\n" - .string "who’s taking that facility’s challenge,\l" - .string "and bet with our Battle Points.\p" - .string "The guy who bet on the TRAINER with\n" - .string "the best record takes all the Battle\l" - .string "Points in the pool.\p" - .string "Sounds simple, huh?\n" - .string "So, anyway…$" - -BattleFrontier_Lounge3_Text_262261:: @ 8262261 - .string "What I’m looking for is a TRAINER who’s\n" - .string "going to be challenging the BATTLE\l" - .string "TOWER’s SINGLE BATTLE ROOMS.\p" - .string "But so far, I haven’t seen a TRAINER\n" - .string "that has that winning quality.$" - -BattleFrontier_Lounge3_Text_26230D:: @ 826230D - .string "What I’m looking for is a TRAINER who’s\n" - .string "going to be challenging the BATTLE\l" - .string "TOWER’s DOUBLE BATTLE ROOMS.\p" - .string "But so far, I haven’t seen a TRAINER\n" - .string "that has that winning quality.$" - -BattleFrontier_Lounge3_Text_2623B9:: @ 82623B9 - .string "What I’m looking for is a TRAINER who’s\n" - .string "going to be challenging the BATTLE\l" - .string "TOWER’s MULTI BATTLE ROOMS.\p" - .string "But so far, I haven’t seen a TRAINER\n" - .string "that has that winning quality.$" - -BattleFrontier_Lounge3_Text_262464:: @ 8262464 - .string "What I’m looking for is a TRAINER who’s\n" - .string "going to be entering the BATTLE\l" - .string "DOME’s SINGLE BATTLE Tourney.\p" - .string "But so far, I haven’t seen a TRAINER\n" - .string "that has that winning quality.$" - -BattleFrontier_Lounge3_Text_26250E:: @ 826250E - .string "What I’m looking for is a TRAINER who’s\n" - .string "going to be entering the BATTLE\l" - .string "DOME’s DOUBLE BATTLE Tourney.\p" - .string "But so far, I haven’t seen a TRAINER\n" - .string "that has that winning quality.$" - -BattleFrontier_Lounge3_Text_2625B8:: @ 82625B8 - .string "What I’m looking for is a TRAINER who’s\n" - .string "going to be entering the BATTLE\l" - .string "FACTORY’s Battle Swap Single Tourney.\p" - .string "But so far, I haven’t seen a TRAINER\n" - .string "that has that winning quality.$" - -BattleFrontier_Lounge3_Text_26266A:: @ 826266A - .string "What I’m looking for is a TRAINER who’s\n" - .string "going to be entering the BATTLE\l" - .string "FACTORY’s Battle Swap Double Tourney.\p" - .string "But so far, I haven’t seen a TRAINER\n" - .string "that has that winning quality.$" - -BattleFrontier_Lounge3_Text_26271C:: @ 826271C - .string "What I’m looking for is a TRAINER who’s\n" - .string "going to be challenging the BATTLE\l" - .string "PALACE’s SINGLE BATTLE HALLS.\p" - .string "But so far, I haven’t seen a TRAINER\n" - .string "that has that winning quality.$" - -BattleFrontier_Lounge3_Text_2627C9:: @ 82627C9 - .string "What I’m looking for is a TRAINER who’s\n" - .string "going to be challenging the BATTLE\l" - .string "PALACE’s DOUBLE BATTLE HALLS.\p" - .string "But so far, I haven’t seen a TRAINER\n" - .string "that has that winning quality.$" - -BattleFrontier_Lounge3_Text_262876:: @ 8262876 - .string "What I’m looking for is a TRAINER who’s\n" - .string "going to be entering the BATTLE\l" - .string "ARENA’s Set KO Tourney.\p" - .string "But so far, I haven’t seen a TRAINER\n" - .string "that has that winning quality.$" - -BattleFrontier_Lounge3_Text_26291A:: @ 826291A - .string "What I’m looking for is a TRAINER who’s\n" - .string "going to be entering the BATTLE PIKE’s\l" - .string "Battle Choice.\p" - .string "But so far, I haven’t seen a TRAINER\n" - .string "that has that winning quality.$" - -BattleFrontier_Lounge3_Text_2629BC:: @ 82629BC - .string "What I’m looking for is a TRAINER who’s\n" - .string "going to be entering the BATTLE\l" - .string "PYRAMID’s Battle Quest.\p" - .string "But so far, I haven’t seen a TRAINER\n" - .string "that has that winning quality.$" - -BattleFrontier_Lounge3_Text_262A60:: @ 8262A60 - .string "I’ll see to it that you benefit, too.\n" - .string "So how about it?\l" - .string "How about entering that event for me?$" - -BattleFrontier_Lounge3_Text_262ABD:: @ 8262ABD - .string "All right, that’s perfect.\n" - .string "So, uh… How about spotting me some\l" - .string "of your Battle Points?\p" - .string "Trust me, I’ll show you my gratitude\n" - .string "afterward.$" - -BattleFrontier_Lounge3_Text_262B42:: @ 8262B42 - .string "Great, great!\n" - .string "So, how much can you spot me?$" - -BattleFrontier_Lounge3_Text_262B6E:: @ 8262B6E - .string "Oh, no, no, no!\n" - .string "You don’t have enough Battle Points!\p" - .string "I wish you wouldn’t monkey around and\n" - .string "waste everyone’s time!$" - -BattleFrontier_Lounge3_Text_262BE0:: @ 8262BE0 - .string "Heheh! Thanks much!\n" - .string "So, off you go!$" - -BattleFrontier_Lounge3_Text_262C04:: @ 8262C04 - .string "Get to the BATTLE TOWER’s\n" - .string "SINGLE BATTLE ROOMS pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" - .string "Both of our futures depend on you!$" - -BattleFrontier_Lounge3_Text_262C90:: @ 8262C90 - .string "Get to the BATTLE TOWER’s\n" - .string "DOUBLE BATTLE ROOMS pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" - .string "Both of our futures depend on you!$" - -BattleFrontier_Lounge3_Text_262D1C:: @ 8262D1C - .string "Get to the BATTLE TOWER’s\n" - .string "MULTI BATTLE ROOMS pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" - .string "Both of our futures depend on you!$" - -BattleFrontier_Lounge3_Text_262DA7:: @ 8262DA7 - .string "Get to the BATTLE DOME’s\n" - .string "SINGLE BATTLE Tourney pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" - .string "Both of our futures depend on you!$" - -BattleFrontier_Lounge3_Text_262E34:: @ 8262E34 - .string "Get to the BATTLE DOME’s\n" - .string "DOUBLE BATTLE Tourney pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" - .string "Both of our futures depend on you!$" - -BattleFrontier_Lounge3_Text_262EC1:: @ 8262EC1 - .string "Get to the BATTLE FACTORY’s\n" - .string "Battle Swap Single Tourney pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" - .string "Both of our futures depend on you!$" - -BattleFrontier_Lounge3_Text_262F56:: @ 8262F56 - .string "Get to the BATTLE FACTORY’s\n" - .string "Battle Swap Double Tourney pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" - .string "Both of our futures depend on you!$" - -BattleFrontier_Lounge3_Text_262FEB:: @ 8262FEB - .string "Get to the BATTLE PALACE’s\n" - .string "SINGLE BATTLE HALLS pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" - .string "Both of our futures depend on you!$" - -BattleFrontier_Lounge3_Text_263078:: @ 8263078 - .string "Get to the BATTLE PALACE’s\n" - .string "DOUBLE BATTLE HALLS pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" - .string "Both of our futures depend on you!$" - -BattleFrontier_Lounge3_Text_263105:: @ 8263105 - .string "Get to the BATTLE ARENA’s\n" - .string "Set KO Tourney pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" - .string "Both of our futures depend on you!$" - -BattleFrontier_Lounge3_Text_26318C:: @ 826318C - .string "Get to the BATTLE PIKE’s\n" - .string "Battle Choice pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" - .string "Both of our futures depend on you!$" - -BattleFrontier_Lounge3_Text_263211:: @ 8263211 - .string "Get to the BATTLE PYRAMID’s\n" - .string "Battle Quest pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" - .string "Both of our futures depend on you!$" - -BattleFrontier_Lounge3_Text_263298:: @ 8263298 - .string "Oh, it’s you…\n" - .string "Nice try…\p" - .string "I hate to break it to you, but I can’t\n" - .string "return your Battle Points…\p" - .string "I guess we’ll have to let it motivate\n" - .string "us to try harder next time!$" - -BattleFrontier_Lounge3_Text_263334:: @ 8263334 - .string "Oh, yes!\n" - .string "Hello there, champ!\p" - .string "I knew you could!\n" - .string "I knew you would!\l" - .string "We’re both big winners!\p" - .string "I’ll return your Battle Points and,\n" - .string "of course, a little extra from me!$" - -BattleFrontier_Lounge3_Text_2633D4:: @ 82633D4 - .string "{PLAYER} obtained\n" - .string "{STR_VAR_1} Battle Points.$" - -BattleFrontier_Lounge3_Text_2633F2:: @ 82633F2 - .string "If you’re up for another challenge,\n" - .string "please do think of me!$" - -BattleFrontier_Lounge3_Text_26342D:: @ 826342D - .string "Not interested?! You shouldn’t be\n" - .string "so afraid to take a chance!$" - -BattleFrontier_Lounge3_Text_26346B:: @ 826346B - .string "Oh…$" - -BattleFrontier_Lounge3_Text_26346F:: @ 826346F - .string "I backed the wrong TRAINER again!\p" - .string "Maybe I should be battling normally\n" - .string "like everyone else…$" - -BattleFrontier_Lounge3_Text_2634C9:: @ 82634C9 - .string "That TRAINER…\p" - .string "He’s good, but he gets rattled too\n" - .string "easily to survive the BATTLE DOME…$" - -BattleFrontier_Lounge3_Text_26351D:: @ 826351D - .string "Giggle!\n" - .string "I know a winner when I see one!$" - -BattleFrontier_Lounge3_Text_263545:: @ 8263545 - .string "Those TRAINERS…\n" - .string "What are they doing?\l" - .string "They should be taking challenges.$" - diff --git a/data/scripts/maps/BattleFrontier_Lounge4.inc b/data/scripts/maps/BattleFrontier_Lounge4.inc deleted file mode 100644 index 1108ceee7..000000000 --- a/data/scripts/maps/BattleFrontier_Lounge4.inc +++ /dev/null @@ -1,30 +0,0 @@ -BattleFrontier_Lounge4_MapScripts:: @ 826358C - .byte 0 - -BattleFrontier_Lounge4_EventScript_26358D:: @ 826358D - msgbox BattleFrontier_Lounge4_Text_2635A8, 2 - end - -BattleFrontier_Lounge4_EventScript_263596:: @ 8263596 - msgbox BattleFrontier_Lounge4_Text_2635EC, 2 - end - -BattleFrontier_Lounge4_EventScript_26359F:: @ 826359F - msgbox BattleFrontier_Lounge4_Text_263625, 2 - end - -BattleFrontier_Lounge4_Text_2635A8: @ 82635A8 - .string "I wonder if they’ll be airing interviews\n" - .string "with tough TRAINERS today?$" - -BattleFrontier_Lounge4_Text_2635EC: @ 82635EC - .string "If I opened a restaurant here,\n" - .string "it’d make money for sure.$" - -BattleFrontier_Lounge4_Text_263625: @ 8263625 - .string "Whew…\p" - .string "I need to take a breather after\n" - .string "some intense battles…\p" - .string "But even now, I never take a break\n" - .string "from plotting strategy and combos.$" - diff --git a/data/scripts/maps/BattleFrontier_Lounge5.inc b/data/scripts/maps/BattleFrontier_Lounge5.inc deleted file mode 100644 index bb1feceec..000000000 --- a/data/scripts/maps/BattleFrontier_Lounge5.inc +++ /dev/null @@ -1,206 +0,0 @@ -BattleFrontier_Lounge5_MapScripts:: @ 82645C5 - .byte 0 - -BattleFrontier_Lounge5_EventScript_2645C6:: @ 82645C6 - lock - faceplayer - msgbox BattleFrontier_Lounge5_Text_264632, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_Lounge5_EventScript_26460D - special sub_81B94B0 - waitstate - lock - faceplayer - compare VAR_0x8004, 255 - goto_eq BattleFrontier_Lounge5_EventScript_26460D - specialvar VAR_RESULT, ScriptGetPartyMonSpecies - compare VAR_RESULT, 412 - goto_eq BattleFrontier_Lounge5_EventScript_264603 - special sub_813A7B8 - waitmessage - waitbuttonpress - release - end - -BattleFrontier_Lounge5_EventScript_264603:: @ 8264603 - msgbox BattleFrontier_Lounge5_Text_264EEE, 4 - release - end - -BattleFrontier_Lounge5_EventScript_26460D:: @ 826460D - msgbox BattleFrontier_Lounge5_Text_26467F, 4 - release - end - -BattleFrontier_Lounge5_EventScript_264617:: @ 8264617 - msgbox BattleFrontier_Lounge5_Text_264F22, 2 - end - -BattleFrontier_Lounge5_EventScript_264620:: @ 8264620 - msgbox BattleFrontier_Lounge5_Text_264F64, 2 - end - -BattleFrontier_Lounge5_EventScript_264629:: @ 8264629 - msgbox BattleFrontier_Lounge5_Text_264FAB, 2 - end - -BattleFrontier_Lounge5_Text_264632:: @ 8264632 - .string "Ehehe!\n" - .string "I can tell what POKéMON are thinking!\p" - .string "Please!\n" - .string "Can I see your POKéMON?$" - -BattleFrontier_Lounge5_Text_26467F:: @ 826467F - .string "Boo!\n" - .string "Cheapie!$" - -BattleFrontier_Lounge5_Text_26468D:: @ 826468D - .string "Hmhm…\p" - .string "This one says it likes to battle!\n" - .string "It will battle even if it has a lot\l" - .string "of ouchies!$" - -BattleFrontier_Lounge5_Text_2646E5:: @ 82646E5 - .string "Hmhm…\p" - .string "This one says it likes to be sneaky!\n" - .string "But if it gets enough ouchies,\l" - .string "it will hit back!$" - -BattleFrontier_Lounge5_Text_264741:: @ 8264741 - .string "Hmhm…\p" - .string "This one says it likes to battle!\n" - .string "But if it gets enough ouchies,\l" - .string "it will worry about itself!$" - -BattleFrontier_Lounge5_Text_2647A4:: @ 82647A4 - .string "Hmhm…\p" - .string "This one says it likes to battle!\n" - .string "It will battle even if it has a lot\l" - .string "of ouchies!$" - -BattleFrontier_Lounge5_Text_2647FC:: @ 82647FC - .string "Hmhm…\p" - .string "This one says it looks after itself!\n" - .string "But if it gets enough ouchies,\l" - .string "it will hit back!$" - -BattleFrontier_Lounge5_Text_264858:: @ 8264858 - .string "Hmhm…\p" - .string "This one says it likes to be sneaky!\n" - .string "But if it gets enough ouchies,\l" - .string "it will worry about itself!$" - -BattleFrontier_Lounge5_Text_2648BE:: @ 82648BE - .string "Hmhm…\p" - .string "This one says it likes to battle!\n" - .string "It will battle even if it has a lot\l" - .string "of ouchies!$" - -BattleFrontier_Lounge5_Text_264916:: @ 8264916 - .string "Hmhm…\p" - .string "This one says it likes to be sneaky!\n" - .string "But if it gets enough ouchies,\l" - .string "it will hit back!$" - -BattleFrontier_Lounge5_Text_264972:: @ 8264972 - .string "Hmhm…\p" - .string "This one says it likes to battle!\n" - .string "But if it gets enough ouchies,\l" - .string "it will worry about itself!$" - -BattleFrontier_Lounge5_Text_2649D5:: @ 82649D5 - .string "Hmhm…\p" - .string "This one says it likes to be sneaky!\n" - .string "It says it likes to be sneaky even\l" - .string "if it has a lot of ouchies!$" - -BattleFrontier_Lounge5_Text_264A3F:: @ 8264A3F - .string "Hmhm…\p" - .string "This one says it likes to battle!\n" - .string "But if it gets enough ouchies,\l" - .string "it will turn sneaky!$" - -BattleFrontier_Lounge5_Text_264A9B:: @ 8264A9B - .string "Hmhm…\p" - .string "This one says it likes to battle!\n" - .string "It will battle even if it has a lot\l" - .string "of ouchies!$" - -BattleFrontier_Lounge5_Text_264AF3:: @ 8264AF3 - .string "Hmhm…\p" - .string "This one says it likes to be sneaky!\n" - .string "It says it likes to be sneaky even\l" - .string "if it has a lot of ouchies!$" - -BattleFrontier_Lounge5_Text_264B5D:: @ 8264B5D - .string "Hmhm…\p" - .string "This one says it likes to be sneaky!\n" - .string "But if it gets enough ouchies,\l" - .string "it will worry about itself!$" - -BattleFrontier_Lounge5_Text_264BC3:: @ 8264BC3 - .string "Hmhm…\p" - .string "This one says it looks after itself!\n" - .string "It says it worries about itself whether\l" - .string "or not it has a lot of ouchies!$" - -BattleFrontier_Lounge5_Text_264C36:: @ 8264C36 - .string "Hmhm…\p" - .string "This one says it looks after itself!\n" - .string "But if it gets enough ouchies,\l" - .string "it will turn sneaky!$" - -BattleFrontier_Lounge5_Text_264C95:: @ 8264C95 - .string "Hmhm…\p" - .string "This one says it looks after itself!\n" - .string "It says it worries about itself even\l" - .string "if it has a lot of ouchies!$" - -BattleFrontier_Lounge5_Text_264D01:: @ 8264D01 - .string "Hmhm…\p" - .string "This one says it likes to be sneaky!\n" - .string "It says it likes to be sneaky even\l" - .string "if it has a lot of ouchies!$" - -BattleFrontier_Lounge5_Text_264D6B:: @ 8264D6B - .string "Hmhm…\p" - .string "This one says it looks after itself!\n" - .string "It says it worries about itself even\l" - .string "if it has a lot of ouchies!$" - -BattleFrontier_Lounge5_Text_264DD7:: @ 8264DD7 - .string "Hmhm…\p" - .string "This one says it looks after itself!\n" - .string "But if it gets enough ouchies,\l" - .string "it will hit back!$" - -BattleFrontier_Lounge5_Text_264E33:: @ 8264E33 - .string "Hmhm…\p" - .string "This one says it likes to battle!\n" - .string "But if it gets enough ouchies,\l" - .string "it will turn sneaky!$" - -BattleFrontier_Lounge5_Text_264E8F:: @ 8264E8F - .string "Hmhm…\p" - .string "This one says it looks after itself!\n" - .string "But if it gets enough ouchies,\l" - .string "it will turn sneaky!$" - -BattleFrontier_Lounge5_Text_264EEE:: @ 8264EEE - .string "That’s silly! An EGG is asleep!\n" - .string "I can’t talk to it!$" - -BattleFrontier_Lounge5_Text_264F22:: @ 8264F22 - .string "How charming!\n" - .string "That little lady claims she can\l" - .string "understand POKéMON!$" - -BattleFrontier_Lounge5_Text_264F64:: @ 8264F64 - .string "I have this feeling that the little girl\n" - .string "is saying something profound.$" - -BattleFrontier_Lounge5_Text_264FAB:: @ 8264FAB - .string "I know something!\p" - .string "That little girl plays at the red house\n" - .string "a lot!$" - diff --git a/data/scripts/maps/BattleFrontier_Lounge6.inc b/data/scripts/maps/BattleFrontier_Lounge6.inc deleted file mode 100644 index c779e7c76..000000000 --- a/data/scripts/maps/BattleFrontier_Lounge6.inc +++ /dev/null @@ -1,82 +0,0 @@ -BattleFrontier_Lounge6_MapScripts:: @ 8264FEC - .byte 0 - -BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED - lock - faceplayer - checkflag FLAG_0x09C - goto_eq BattleFrontier_Lounge6_EventScript_265083 - setvar VAR_0x8008, 3 - copyvar VAR_0x8004, VAR_0x8008 - specialvar VAR_RESULT, sub_807E73C - copyvar VAR_0x8009, VAR_RESULT - msgbox BattleFrontier_Lounge6_Text_26508D, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_Lounge6_EventScript_26506B - special sub_81B94B0 - waitstate - copyvar VAR_0x800A, VAR_0x8004 - compare VAR_0x8004, 255 - goto_eq BattleFrontier_Lounge6_EventScript_26506B - copyvar VAR_0x8005, VAR_0x800A - specialvar VAR_RESULT, sub_807E9D4 - copyvar VAR_0x800B, VAR_RESULT - compare VAR_RESULT, VAR_0x8009 - goto_if 5, BattleFrontier_Lounge6_EventScript_265075 - copyvar VAR_0x8004, VAR_0x8008 - copyvar VAR_0x8005, VAR_0x800A - special sub_807EA10 - special sub_807F0E4 - waitstate - msgbox BattleFrontier_Lounge6_Text_265128, 4 - setflag FLAG_0x09C - release - end - -BattleFrontier_Lounge6_EventScript_26506B:: @ 826506B - msgbox BattleFrontier_Lounge6_Text_2651CB, 4 - release - end - -BattleFrontier_Lounge6_EventScript_265075:: @ 8265075 - bufferspeciesname 0, VAR_0x8009 - msgbox BattleFrontier_Lounge6_Text_26518D, 4 - release - end - -BattleFrontier_Lounge6_EventScript_265083:: @ 8265083 - msgbox BattleFrontier_Lounge6_Text_26520E, 4 - release - end - -BattleFrontier_Lounge6_Text_26508D: @ 826508D - .string "My POKéMON is a {STR_VAR_2}.\n" - .string "Do you know it?\l" - .string "It’s quite cute and rather nice.\p" - .string "This little one, I could trade with\n" - .string "pride!\p" - .string "Would you like to trade me a {STR_VAR_1}\n" - .string "for my {STR_VAR_2}?$" - -BattleFrontier_Lounge6_Text_265128: @ 8265128 - .string "Oh, it’s adorable!\n" - .string "Thank you!\l" - .string "I promise I’ll be good to it!\p" - .string "Oh! I hope you’ll be good to\n" - .string "my {STR_VAR_2}, too!$" - -BattleFrontier_Lounge6_Text_26518D: @ 826518D - .string "Oh, I’m sorry!\n" - .string "I don’t intend to trade for anything\l" - .string "but a {STR_VAR_1}.$" - -BattleFrontier_Lounge6_Text_2651CB: @ 82651CB - .string "Oh, you won’t?\n" - .string "Well, that’s fine, too.\l" - .string "Please come visit us again.$" - -BattleFrontier_Lounge6_Text_26520E: @ 826520E - .string "Giggle!\n" - .string "A SKITTY is so much cuter than I had\l" - .string "imagined. I’m delighted!$" - diff --git a/data/scripts/maps/BattleFrontier_Lounge7.inc b/data/scripts/maps/BattleFrontier_Lounge7.inc deleted file mode 100644 index 0b810d4f7..000000000 --- a/data/scripts/maps/BattleFrontier_Lounge7.inc +++ /dev/null @@ -1,482 +0,0 @@ -BattleFrontier_Lounge7_MapScripts:: @ 8265254 - .byte 0 - -BattleFrontier_Lounge7_EventScript_265255:: @ 8265255 - lock - faceplayer - setvar VAR_TEMP_C, 9 - checkflag FLAG_0x15A - goto_eq BattleFrontier_Lounge7_EventScript_265276 - msgbox BattleFrontier_Lounge7_Text_2656ED, 4 - setflag FLAG_0x15A - goto BattleFrontier_Lounge7_EventScript_265284 - end - -BattleFrontier_Lounge7_EventScript_265276:: @ 8265276 - msgbox BattleFrontier_Lounge7_Text_2658AB, 4 - goto BattleFrontier_Lounge7_EventScript_265284 - end - -BattleFrontier_Lounge7_EventScript_265284:: @ 8265284 - message BattleFrontier_Lounge7_Text_2658EF - waitmessage - special sub_813A958 - setvar VAR_TEMP_E, 0 - setvar VAR_0x8004, 9 - setvar VAR_0x8006, 0 - special sub_813A128 - waitstate - copyvar VAR_TEMP_D, VAR_RESULT - switch VAR_RESULT - case 0, BattleFrontier_Lounge7_EventScript_2653D7 - case 1, BattleFrontier_Lounge7_EventScript_2653E2 - case 2, BattleFrontier_Lounge7_EventScript_2653ED - case 3, BattleFrontier_Lounge7_EventScript_2653F8 - case 4, BattleFrontier_Lounge7_EventScript_265403 - case 5, BattleFrontier_Lounge7_EventScript_26540E - case 6, BattleFrontier_Lounge7_EventScript_265419 - case 7, BattleFrontier_Lounge7_EventScript_265424 - case 8, BattleFrontier_Lounge7_EventScript_26542F - case 9, BattleFrontier_Lounge7_EventScript_26543A - case 10, BattleFrontier_Lounge7_EventScript_265635 - case 127, BattleFrontier_Lounge7_EventScript_265635 - end - -BattleFrontier_Lounge7_EventScript_26532F:: @ 826532F - message BattleFrontier_Lounge7_Text_2658EF - waitmessage - setvar VAR_TEMP_E, 0 - setvar VAR_0x8004, 9 - setvar VAR_0x8006, 1 - special sub_813A128 - waitstate - copyvar VAR_TEMP_D, VAR_RESULT - switch VAR_RESULT - case 0, BattleFrontier_Lounge7_EventScript_2653D7 - case 1, BattleFrontier_Lounge7_EventScript_2653E2 - case 2, BattleFrontier_Lounge7_EventScript_2653ED - case 3, BattleFrontier_Lounge7_EventScript_2653F8 - case 4, BattleFrontier_Lounge7_EventScript_265403 - case 5, BattleFrontier_Lounge7_EventScript_26540E - case 6, BattleFrontier_Lounge7_EventScript_265419 - case 7, BattleFrontier_Lounge7_EventScript_265424 - case 8, BattleFrontier_Lounge7_EventScript_26542F - case 9, BattleFrontier_Lounge7_EventScript_26543A - case 10, BattleFrontier_Lounge7_EventScript_265635 - case 127, BattleFrontier_Lounge7_EventScript_265635 - end - -BattleFrontier_Lounge7_EventScript_2653D7:: @ 82653D7 - setvar VAR_0x8008, 16 - goto BattleFrontier_Lounge7_EventScript_26564F - end - -BattleFrontier_Lounge7_EventScript_2653E2:: @ 82653E2 - setvar VAR_0x8008, 24 - goto BattleFrontier_Lounge7_EventScript_26564F - end - -BattleFrontier_Lounge7_EventScript_2653ED:: @ 82653ED - setvar VAR_0x8008, 24 - goto BattleFrontier_Lounge7_EventScript_26564F - end - -BattleFrontier_Lounge7_EventScript_2653F8:: @ 82653F8 - setvar VAR_0x8008, 24 - goto BattleFrontier_Lounge7_EventScript_26564F - end - -BattleFrontier_Lounge7_EventScript_265403:: @ 8265403 - setvar VAR_0x8008, 48 - goto BattleFrontier_Lounge7_EventScript_26564F - end - -BattleFrontier_Lounge7_EventScript_26540E:: @ 826540E - setvar VAR_0x8008, 48 - goto BattleFrontier_Lounge7_EventScript_26564F - end - -BattleFrontier_Lounge7_EventScript_265419:: @ 8265419 - setvar VAR_0x8008, 48 - goto BattleFrontier_Lounge7_EventScript_26564F - end - -BattleFrontier_Lounge7_EventScript_265424:: @ 8265424 - setvar VAR_0x8008, 48 - goto BattleFrontier_Lounge7_EventScript_26564F - end - -BattleFrontier_Lounge7_EventScript_26542F:: @ 826542F - setvar VAR_0x8008, 48 - goto BattleFrontier_Lounge7_EventScript_26564F - end - -BattleFrontier_Lounge7_EventScript_26543A:: @ 826543A - setvar VAR_0x8008, 48 - goto BattleFrontier_Lounge7_EventScript_26564F - end - -BattleFrontier_Lounge7_EventScript_265445:: @ 8265445 - lock - faceplayer - setvar VAR_TEMP_C, 10 - checkflag FLAG_0x15B - goto_eq BattleFrontier_Lounge7_EventScript_265466 - msgbox BattleFrontier_Lounge7_Text_265A6C, 4 - setflag FLAG_0x15B - goto BattleFrontier_Lounge7_EventScript_265474 - end - -BattleFrontier_Lounge7_EventScript_265466:: @ 8265466 - msgbox BattleFrontier_Lounge7_Text_265C2C, 4 - goto BattleFrontier_Lounge7_EventScript_265474 - end - -BattleFrontier_Lounge7_EventScript_265474:: @ 8265474 - message BattleFrontier_Lounge7_Text_2658EF - waitmessage - special sub_813A958 - setvar VAR_TEMP_E, 1 - setvar VAR_0x8004, 10 - setvar VAR_0x8006, 0 - special sub_813A128 - waitstate - copyvar VAR_TEMP_D, VAR_RESULT - switch VAR_RESULT - case 0, BattleFrontier_Lounge7_EventScript_2655C7 - case 1, BattleFrontier_Lounge7_EventScript_2655D2 - case 2, BattleFrontier_Lounge7_EventScript_2655DD - case 3, BattleFrontier_Lounge7_EventScript_2655E8 - case 4, BattleFrontier_Lounge7_EventScript_2655F3 - case 5, BattleFrontier_Lounge7_EventScript_2655FE - case 6, BattleFrontier_Lounge7_EventScript_265609 - case 7, BattleFrontier_Lounge7_EventScript_265614 - case 8, BattleFrontier_Lounge7_EventScript_26561F - case 9, BattleFrontier_Lounge7_EventScript_26562A - case 10, BattleFrontier_Lounge7_EventScript_265635 - case 127, BattleFrontier_Lounge7_EventScript_265635 - end - -BattleFrontier_Lounge7_EventScript_26551F:: @ 826551F - message BattleFrontier_Lounge7_Text_2658EF - waitmessage - setvar VAR_TEMP_E, 1 - setvar VAR_0x8004, 10 - setvar VAR_0x8006, 1 - special sub_813A128 - waitstate - copyvar VAR_TEMP_D, VAR_RESULT - switch VAR_RESULT - case 0, BattleFrontier_Lounge7_EventScript_2655C7 - case 1, BattleFrontier_Lounge7_EventScript_2655D2 - case 2, BattleFrontier_Lounge7_EventScript_2655DD - case 3, BattleFrontier_Lounge7_EventScript_2655E8 - case 4, BattleFrontier_Lounge7_EventScript_2655F3 - case 5, BattleFrontier_Lounge7_EventScript_2655FE - case 6, BattleFrontier_Lounge7_EventScript_265609 - case 7, BattleFrontier_Lounge7_EventScript_265614 - case 8, BattleFrontier_Lounge7_EventScript_26561F - case 9, BattleFrontier_Lounge7_EventScript_26562A - case 10, BattleFrontier_Lounge7_EventScript_265635 - case 127, BattleFrontier_Lounge7_EventScript_265635 - end - -BattleFrontier_Lounge7_EventScript_2655C7:: @ 82655C7 - setvar VAR_0x8008, 16 - goto BattleFrontier_Lounge7_EventScript_26564F - end - -BattleFrontier_Lounge7_EventScript_2655D2:: @ 82655D2 - setvar VAR_0x8008, 24 - goto BattleFrontier_Lounge7_EventScript_26564F - end - -BattleFrontier_Lounge7_EventScript_2655DD:: @ 82655DD - setvar VAR_0x8008, 24 - goto BattleFrontier_Lounge7_EventScript_26564F - end - -BattleFrontier_Lounge7_EventScript_2655E8:: @ 82655E8 - setvar VAR_0x8008, 24 - goto BattleFrontier_Lounge7_EventScript_26564F - end - -BattleFrontier_Lounge7_EventScript_2655F3:: @ 82655F3 - setvar VAR_0x8008, 24 - goto BattleFrontier_Lounge7_EventScript_26564F - end - -BattleFrontier_Lounge7_EventScript_2655FE:: @ 82655FE - setvar VAR_0x8008, 48 - goto BattleFrontier_Lounge7_EventScript_26564F - end - -BattleFrontier_Lounge7_EventScript_265609:: @ 8265609 - setvar VAR_0x8008, 48 - goto BattleFrontier_Lounge7_EventScript_26564F - end - -BattleFrontier_Lounge7_EventScript_265614:: @ 8265614 - setvar VAR_0x8008, 48 - goto BattleFrontier_Lounge7_EventScript_26564F - end - -BattleFrontier_Lounge7_EventScript_26561F:: @ 826561F - setvar VAR_0x8008, 48 - goto BattleFrontier_Lounge7_EventScript_26564F - end - -BattleFrontier_Lounge7_EventScript_26562A:: @ 826562A - setvar VAR_0x8008, 48 - goto BattleFrontier_Lounge7_EventScript_26564F - end - -BattleFrontier_Lounge7_EventScript_265635:: @ 8265635 - special sub_813ADB8 - special sub_813A988 - msgbox BattleFrontier_Lounge7_Text_265A0E, 4 - release - end - -BattleFrontier_Lounge7_EventScript_265645:: @ 8265645 - msgbox BattleFrontier_Lounge7_Text_265A0E, 4 - release - end - -BattleFrontier_Lounge7_EventScript_26564F:: @ 826564F - copyvar VAR_0x8004, VAR_TEMP_D - copyvar VAR_0x8005, VAR_TEMP_E - special sub_813AC7C - buffernumberstring 1, VAR_0x8008 - copyvar VAR_0x8004, VAR_TEMP_C - msgbox BattleFrontier_Lounge7_Text_265921, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_Lounge7_EventScript_2656CA - specialvar VAR_TEMP_1, sub_813AA04 - compare VAR_TEMP_1, VAR_0x8008 - goto_if 4, BattleFrontier_Lounge7_EventScript_265696 - msgbox BattleFrontier_Lounge7_Text_265997, 4 - goto BattleFrontier_Lounge7_EventScript_2656CA - end - -BattleFrontier_Lounge7_EventScript_265696:: @ 8265696 - msgbox BattleFrontier_Lounge7_Text_26595A, 4 - special sub_813AEB4 - fadescreen 1 - special sub_813A988 - special sub_813ADB8 - special sub_81B892C - waitstate - compare VAR_RESULT, 0 - goto_eq BattleFrontier_Lounge7_EventScript_265645 - msgbox BattleFrontier_Lounge7_Text_2659C7, 4 - copyvar VAR_0x8004, VAR_0x8008 - special sub_813A9A4 - release - end - -BattleFrontier_Lounge7_EventScript_2656CA:: @ 82656CA - compare VAR_TEMP_E, 0 - goto_eq BattleFrontier_Lounge7_EventScript_26532F - goto BattleFrontier_Lounge7_EventScript_26551F - end - -BattleFrontier_Lounge7_EventScript_2656DB:: @ 82656DB - msgbox BattleFrontier_Lounge7_Text_265C6F, 2 - end - -BattleFrontier_Lounge7_EventScript_2656E4:: @ 82656E4 - msgbox BattleFrontier_Lounge7_Text_265D17, 2 - end - -BattleFrontier_Lounge7_Text_2656ED: @ 82656ED - .string "Buhahaha!\p" - .string "You couldn’t tell it from looking now,\n" - .string "but I used to be one tough TRAINER.\p" - .string "I had a reputation as the toughest\n" - .string "BEAUTY around, I tell you!\p" - .string "… … … … … …\p" - .string "What is it now?\n" - .string "You don’t believe me.\p" - .string "I’m not like that blowhard woman over\n" - .string "there. I’m actually talented!\p" - .string "Let me prove it to you.\n" - .string "I can teach your POKéMON special and\l" - .string "yet cute moves.\p" - .string "But my lessons don’t come free.\n" - .string "How about paying for the moves I teach\l" - .string "with a wee bit of Battle Points?$" - -BattleFrontier_Lounge7_Text_2658AB: @ 82658AB - .string "Buhahaha!\p" - .string "Are you back to learn special and\n" - .string "yet cute POKéMON moves?$" - -BattleFrontier_Lounge7_Text_2658EF: @ 82658EF - .string "Fine, fine, look here!\n" - .string "Which move should I teach?$" - -BattleFrontier_Lounge7_Text_265921: @ 8265921 - .string "The move {STR_VAR_1}, is it?\n" - .string "That will be {STR_VAR_2} Battle Points, okay?$" - -BattleFrontier_Lounge7_Text_26595A: @ 826595A - .string "Fine, fine, now pick the POKéMON\n" - .string "I should teach the move to.$" - -BattleFrontier_Lounge7_Text_265997: @ 8265997 - .string "What the…\n" - .string "You haven’t got enough Battle Points!$" - -BattleFrontier_Lounge7_Text_2659C7: @ 82659C7 - .string "Do you see how skilled I am now?\n" - .string "I’ll take your Battle Points, thanks!$" - -BattleFrontier_Lounge7_Text_265A0E: @ 8265A0E - .string "What’s that?\n" - .string "You don’t want to…\p" - .string "If you want to see how skilled I am,\n" - .string "you come see me anytime!$" - -BattleFrontier_Lounge7_Text_265A6C: @ 8265A6C - .string "Ihihihi!\p" - .string "I know it’s hard to see now, but I used\n" - .string "to be one fantastic TRAINER.\p" - .string "I had a reputation as the most\n" - .string "invincible SWIMMER around, I tell you!\p" - .string "… … … … … …\p" - .string "What’s wrong?\n" - .string "You don’t believe me.\p" - .string "I’m not like that buffoonish woman over\n" - .string "there. I’m actually experienced!\p" - .string "I can prove it to you.\n" - .string "I can teach your POKéMON hard and\l" - .string "yet pretty moves.\p" - .string "But my lessons don’t come free.\n" - .string "How about paying for the moves I teach\l" - .string "with a wee bit of Battle Points?$" - -BattleFrontier_Lounge7_Text_265C2C: @ 8265C2C - .string "Ihihihi!\p" - .string "Have you come to learn hard and\n" - .string "yet pretty POKéMON moves?$" - -BattleFrontier_Lounge7_Text_265C6F: @ 8265C6F - .string "Those ladies, the way they bad-mouth\n" - .string "each other, you probably think that\l" - .string "they don’t get along.\p" - .string "But if that were true, they wouldn’t\n" - .string "stay out here together, would they?$" - -BattleFrontier_Lounge7_Text_265D17: @ 8265D17 - .string "When I was just a wee YOUNGSTER,\n" - .string "those ladies were strong and beautiful.\p" - .string "They were idols among us TRAINERS.\p" - .string "Even now, age hasn’t dulled their\n" - .string "abilities.\p" - .string "In fact, their POKéMON moves have\n" - .string "grown even more polished.\p" - .string "But… For some reason, I can’t help\n" - .string "but feel this…\p" - .string "Time is so cruel…$" - -BattleFrontier_Lounge7_Text_265E30:: @ 8265E30 - .string "Recovers up to\n" - .string "half the user’s\n" - .string "maximum HP.$" - -BattleFrontier_Lounge7_Text_265E5B:: @ 8265E5B - .string "Inflicts damage\n" - .string "identical to the\n" - .string "user’s level.$" - -BattleFrontier_Lounge7_Text_265E8A:: @ 8265E8A - .string "Recovers half the\n" - .string "damage inflicted\n" - .string "on a sleeping foe.$" - -BattleFrontier_Lounge7_Text_265EC0:: @ 8265EC0 - .string "A strong punch\n" - .string "thrown with\n" - .string "incredible power.$" - -BattleFrontier_Lounge7_Text_265EED:: @ 8265EED - .string "An extremely\n" - .string "powerful kick with\n" - .string "intense force.$" - -BattleFrontier_Lounge7_Text_265F1C:: @ 8265F1C - .string "A full-body slam\n" - .string "that may cause\n" - .string "paralysis.$" - -BattleFrontier_Lounge7_Text_265F47:: @ 8265F47 - .string "Large boulders\n" - .string "are hurled. May\n" - .string "cause flinching.$" - -BattleFrontier_Lounge7_Text_265F77:: @ 8265F77 - .string "Retaliates any\n" - .string "physical hit with\n" - .string "double the power.$" - -BattleFrontier_Lounge7_Text_265FAA:: @ 8265FAA - .string "A weak jolt of\n" - .string "electricity that\n" - .string "paralyzes the foe.$" - -BattleFrontier_Lounge7_Text_265FDD:: @ 8265FDD - .string "A fighting dance\n" - .string "that sharply\n" - .string "raises ATTACK.$" - -BattleFrontier_Lounge7_Text_26600A:: @ 826600A - .string "Curls up to con-\n" - .string "ceal weak spots\n" - .string "and raise DEFENSE.$" - -BattleFrontier_Lounge7_Text_26603E:: @ 826603E - .string "A loud attack\n" - .string "that can be used\n" - .string "only while asleep.$" - -BattleFrontier_Lounge7_Text_266070:: @ 8266070 - .string "Hurls mud in the\n" - .string "foe’s face to re-\n" - .string "duce its accuracy.$" - -BattleFrontier_Lounge7_Text_2660A6:: @ 82660A6 - .string "Sprays star-\n" - .string "shaped rays\n" - .string "that never miss.$" - -BattleFrontier_Lounge7_Text_2660D0:: @ 82660D0 - .string "A chilling attack\n" - .string "that lowers the\n" - .string "foe’s SPEED.$" - -BattleFrontier_Lounge7_Text_2660FF:: @ 82660FF - .string "Endures any at-\n" - .string "tack for 1 turn,\n" - .string "leaving 1HP.$" - -BattleFrontier_Lounge7_Text_26612D:: @ 826612D - .string "Copies the foe’s\n" - .string "effect(s) and\n" - .string "gives to the user.$" - -BattleFrontier_Lounge7_Text_26615F:: @ 826615F - .string "An icy punch\n" - .string "that may\n" - .string "freeze the foe.$" - -BattleFrontier_Lounge7_Text_266185:: @ 8266185 - .string "An electrified\n" - .string "punch that may\n" - .string "paralyze the foe.$" - -BattleFrontier_Lounge7_Text_2661B5:: @ 82661B5 - .string "A fiery punch\n" - .string "that may burn\n" - .string "the foe.$" - diff --git a/data/scripts/maps/BattleFrontier_Lounge8.inc b/data/scripts/maps/BattleFrontier_Lounge8.inc deleted file mode 100644 index 35f83baff..000000000 --- a/data/scripts/maps/BattleFrontier_Lounge8.inc +++ /dev/null @@ -1,45 +0,0 @@ -BattleFrontier_Lounge8_MapScripts:: @ 82676C9 - .byte 0 - -BattleFrontier_Lounge8_EventScript_2676CA:: @ 82676CA - msgbox BattleFrontier_Lounge8_Text_2676E5, 2 - end - -BattleFrontier_Lounge8_EventScript_2676D3:: @ 82676D3 - msgbox BattleFrontier_Lounge8_Text_26779C, 2 - end - -BattleFrontier_Lounge8_EventScript_2676DC:: @ 82676DC - msgbox BattleFrontier_Lounge8_Text_26782C, 2 - end - -BattleFrontier_Lounge8_Text_2676E5: @ 82676E5 - .string "What a TRAINER needs…\p" - .string "Knowledge…\n" - .string "Strategy…\l" - .string "Luck…\l" - .string "Guts…\l" - .string "Spirit…\l" - .string "Bravery…\l" - .string "And ability…\p" - .string "Well, I’m all set in every way!\n" - .string "I’ll be unstoppable at every building!\p" - .string "Huh? POKéMON?\n" - .string "What’s that?$" - -BattleFrontier_Lounge8_Text_26779C: @ 826779C - .string "Do you know about the FRONTIER\n" - .string "BRAINS?\p" - .string "That’s what SCOTT calls the seven\n" - .string "special TRAINERS that run the seven\l" - .string "facilities in the BATTLE FRONTIER.$" - -BattleFrontier_Lounge8_Text_26782C: @ 826782C - .string "At the BATTLE TOWER, an older girl\n" - .string "told me that I have a lot of talent\l" - .string "for battling!\p" - .string "I like POKéMON CONTESTS more!\p" - .string "But I’m no good at CONTESTS!\p" - .string "I guess having talent and liking\n" - .string "something aren’t the same.$" - diff --git a/data/scripts/maps/BattleFrontier_Lounge9.inc b/data/scripts/maps/BattleFrontier_Lounge9.inc deleted file mode 100644 index cba75ee77..000000000 --- a/data/scripts/maps/BattleFrontier_Lounge9.inc +++ /dev/null @@ -1,3 +0,0 @@ -BattleFrontier_Lounge9_MapScripts:: @ 82678F8 - .byte 0 - diff --git a/data/scripts/maps/BattleFrontier_Mart.inc b/data/scripts/maps/BattleFrontier_Mart.inc deleted file mode 100644 index 0b7f5b767..000000000 --- a/data/scripts/maps/BattleFrontier_Mart.inc +++ /dev/null @@ -1,67 +0,0 @@ -BattleFrontier_Mart_MapScripts:: @ 8267ACB - .byte 0 - -BattleFrontier_Mart_EventScript_267ACC:: @ 8267ACC - lock - faceplayer - message gUnknown_08272A21 - waitmessage - pokemart BattleFrontier_Mart_Pokemart_267AE4 - msgbox gUnknown_08272A3F, 4 - release - end - - .align 2 -BattleFrontier_Mart_Pokemart_267AE4: @ 8267AE4 - .2byte ITEM_ULTRA_BALL - .2byte ITEM_HYPER_POTION - .2byte ITEM_MAX_POTION - .2byte ITEM_FULL_RESTORE - .2byte ITEM_FULL_HEAL - .2byte ITEM_REVIVE - .2byte ITEM_MAX_REPEL - .2byte ITEM_PROTEIN - .2byte ITEM_CALCIUM - .2byte ITEM_IRON - .2byte ITEM_ZINC - .2byte ITEM_CARBOS - .2byte ITEM_HP_UP - .2byte ITEM_NONE - release - end - -BattleFrontier_Mart_EventScript_267B02:: @ 8267B02 - msgbox BattleFrontier_Mart_Text_267B29, 2 - end - -BattleFrontier_Mart_EventScript_267B0B:: @ 8267B0B - lock - applymovement 2, BattleFrontier_Mart_Movement_2725B0 - waitmovement 0 - msgbox BattleFrontier_Mart_Text_267B8F, 4 - release - end - -BattleFrontier_Mart_EventScript_267B20:: @ 8267B20 - msgbox BattleFrontier_Mart_Text_267C01, 2 - end - -BattleFrontier_Mart_Text_267B29: @ 8267B29 - .string "We came here to chaperon our\n" - .string "grandson.\p" - .string "But since we’re here, we thought\n" - .string "we should get some souvenirs.$" - -BattleFrontier_Mart_Text_267B8F: @ 8267B8F - .string "Dear, what do you think of this?\n" - .string "Wouldn’t this make a nice gift?\p" - .string "It’s…PRO…TE…IN?\n" - .string "It sounds delicious, doesn’t it?$" - -BattleFrontier_Mart_Text_267C01: @ 8267C01 - .string "A lot of the BATTLE FRONTIER’s\n" - .string "facilities don’t allow the use of items\l" - .string "during battles.\p" - .string "That rule makes things tougher than\n" - .string "they already are!$" - diff --git a/data/scripts/maps/BattleFrontier_OutsideEast.inc b/data/scripts/maps/BattleFrontier_OutsideEast.inc deleted file mode 100644 index dff56322a..000000000 --- a/data/scripts/maps/BattleFrontier_OutsideEast.inc +++ /dev/null @@ -1,444 +0,0 @@ -BattleFrontier_OutsideEast_MapScripts:: @ 8242C04 - map_script 5, BattleFrontier_OutsideEast_MapScript1_242C0F - map_script 3, BattleFrontier_OutsideEast_MapScript1_242C2D - .byte 0 - -BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, BattleFrontier_OutsideEast_EventScript_242C19 - end - -BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19 - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 7 - goto_if 5, BattleFrontier_OutsideEast_EventScript_27374E - removeobject VAR_LAST_TALKED - return - -BattleFrontier_OutsideEast_MapScript1_242C2D: @ 8242C2D - setvar VAR_0x40BC, 0 - setflag FLAG_0x396 - checkflag FLAG_0x1C6 - call_if 0, BattleFrontier_OutsideEast_EventScript_242C3F - end - -BattleFrontier_OutsideEast_EventScript_242C3F:: @ 8242C3F - clearflag FLAG_0x34A - return - -BattleFrontier_OutsideEast_EventScript_242C43:: @ 8242C43 - msgbox BattleFrontier_OutsideEast_Text_242E11, 3 - end - -BattleFrontier_OutsideEast_EventScript_242C4C:: @ 8242C4C - msgbox BattleFrontier_OutsideEast_Text_242E58, 3 - end - -BattleFrontier_OutsideEast_EventScript_242C55:: @ 8242C55 - msgbox BattleFrontier_OutsideEast_Text_242E96, 3 - end - -BattleFrontier_OutsideEast_EventScript_242C5E:: @ 8242C5E - msgbox BattleFrontier_OutsideEast_Text_242ECF, 3 - end - -BattleFrontier_OutsideEast_EventScript_242C67:: @ 8242C67 - msgbox BattleFrontier_OutsideEast_Text_242F8C, 2 - end - -BattleFrontier_OutsideEast_EventScript_242C70:: @ 8242C70 - msgbox BattleFrontier_OutsideEast_Text_242FDC, 2 - end - -BattleFrontier_OutsideEast_EventScript_242C79:: @ 8242C79 - msgbox BattleFrontier_OutsideEast_Text_24308C, 2 - end - -BattleFrontier_OutsideEast_EventScript_242C82:: @ 8242C82 - msgbox BattleFrontier_OutsideEast_Text_243106, 2 - end - -BattleFrontier_OutsideEast_EventScript_242C8B:: @ 8242C8B - msgbox BattleFrontier_OutsideEast_Text_2431A5, 2 - end - -BattleFrontier_OutsideEast_EventScript_242C94:: @ 8242C94 - lock - msgbox BattleFrontier_OutsideEast_Text_2432DD, 4 - release - end - -BattleFrontier_OutsideEast_EventScript_242C9F:: @ 8242C9F - lock - faceplayer - waitse - playmoncry SPECIES_ZIGZAGOON, 0 - msgbox BattleFrontier_OutsideEast_Text_24334B, 4 - waitmoncry - release - end - -BattleFrontier_OutsideEast_EventScript_242CB2:: @ 8242CB2 - msgbox BattleFrontier_OutsideEast_Text_243363, 2 - end - -BattleFrontier_OutsideEast_EventScript_242CBB:: @ 8242CBB - msgbox BattleFrontier_OutsideEast_Text_243425, 2 - end - -BattleFrontier_OutsideEast_EventScript_242CC4:: @ 8242CC4 - msgbox BattleFrontier_OutsideEast_Text_2434A0, 2 - end - -BattleFrontier_OutsideEast_EventScript_242CCD:: @ 8242CCD - msgbox BattleFrontier_OutsideEast_Text_243504, 2 - end - -BattleFrontier_OutsideEast_EventScript_242CD6:: @ 8242CD6 - lock - msgbox BattleFrontier_OutsideEast_Text_243529, 4 - release - end - -BattleFrontier_OutsideEast_EventScript_242CE1:: @ 8242CE1 - msgbox BattleFrontier_OutsideEast_Text_243230, 2 - end - -BattleFrontier_OutsideEast_EventScript_242CEA:: @ 8242CEA - lock - faceplayer - waitse - playse 269 - applymovement 14, BattleFrontier_OutsideEast_Movement_242D69 - waitmovement 0 - release - end - -BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC - lock - faceplayer - special sub_80FAFF8 - waitstate - waitse - playse 269 - applymovement 14, BattleFrontier_OutsideEast_Movement_242D69 - waitmovement 0 - msgbox gUnknown_082731BD, 4 - closemessage - waitse - playmoncry SPECIES_SUDOWOODO, 2 - delay 40 - waitmoncry - setvar VAR_LAST_TALKED, 14 - setwildbattle SPECIES_SUDOWOODO, 40, ITEM_NONE - setflag FLAG_SYS_CTRL_OBJ_DELETE - dowildbattle - clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_OutsideEast_EventScript_242D60 - compare VAR_RESULT, 4 - goto_eq BattleFrontier_OutsideEast_EventScript_242D60 - compare VAR_RESULT, 5 - goto_eq BattleFrontier_OutsideEast_EventScript_242D60 - setflag FLAG_0x1C6 - release - end - -BattleFrontier_OutsideEast_EventScript_242D60:: @ 8242D60 - setflag FLAG_0x1C6 - goto IslandCave_EventScript_27376D - end - -BattleFrontier_OutsideEast_Movement_242D69: @ 8242D69 - 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 - msgbox BattleFrontier_OutsideEast_Text_243598, 2 - end - -BattleFrontier_OutsideEast_EventScript_242D82:: @ 8242D82 - msgbox BattleFrontier_OutsideEast_Text_243668, 2 - end - -BattleFrontier_OutsideEast_EventScript_242D8B:: @ 8242D8B - msgbox BattleFrontier_OutsideEast_Text_2436F2, 2 - end - -BattleFrontier_OutsideEast_EventScript_242D94:: @ 8242D94 - msgbox BattleFrontier_OutsideEast_Text_243809, 2 - end - -BattleFrontier_OutsideEast_EventScript_242D9D:: @ 8242D9D - msgbox BattleFrontier_OutsideEast_Text_243895, 2 - end - -BattleFrontier_OutsideEast_EventScript_242DA6:: @ 8242DA6 - msgbox BattleFrontier_OutsideEast_Text_243943, 2 - end - -BattleFrontier_OutsideEast_EventScript_242DAF:: @ 8242DAF - msgbox BattleFrontier_OutsideEast_Text_2439A0, 2 - end - -BattleFrontier_OutsideEast_EventScript_242DB8:: @ 8242DB8 - lock - msgbox BattleFrontier_OutsideEast_Text_243A2B, 4 - release - end - -BattleFrontier_OutsideEast_EventScript_242DC3:: @ 8242DC3 - lock - msgbox BattleFrontier_OutsideEast_Text_243A53, 4 - release - end - -BattleFrontier_OutsideEast_EventScript_242DCE:: @ 8242DCE - msgbox BattleFrontier_OutsideEast_Text_242F0D, 3 - end - -BattleFrontier_OutsideEast_EventScript_242DD7:: @ 8242DD7 - msgbox BattleFrontier_OutsideEast_Text_242F4A, 3 - end - -BattleFrontier_OutsideEast_EventScript_242DE0:: @ 8242DE0 - msgbox BattleFrontier_OutsideEast_Text_243B68, 2 - end - -BattleFrontier_OutsideEast_EventScript_242DE9:: @ 8242DE9 - lock - faceplayer - checkflag FLAG_0x1C6 - goto_eq BattleFrontier_OutsideEast_EventScript_242DFE - msgbox BattleFrontier_OutsideEast_Text_243C2C, 4 - release - end - -BattleFrontier_OutsideEast_EventScript_242DFE:: @ 8242DFE - msgbox BattleFrontier_OutsideEast_Text_243CA3, 4 - release - end - -BattleFrontier_OutsideEast_EventScript_242E08:: @ 8242E08 - msgbox BattleFrontier_OutsideEast_Text_243D0B, 2 - end - -BattleFrontier_OutsideEast_Text_242E11: @ 8242E11 - .string "This is the BATTLE TOWER!\n" - .string "Keep the win streak as the toughest\l" - .string "TRAINER!$" - -BattleFrontier_OutsideEast_Text_242E58: @ 8242E58 - .string "This is the BATTLE PALACE!\n" - .string "Keep your eyes on POKéMON battles!$" - -BattleFrontier_OutsideEast_Text_242E96: @ 8242E96 - .string "This is the BATTLE ARENA!\n" - .string "Let the toughest teams gather!$" - -BattleFrontier_OutsideEast_Text_242ECF: @ 8242ECF - .string "This is the BATTLE PYRAMID!\n" - .string "Advance through the Battle Quest!$" - -BattleFrontier_OutsideEast_Text_242F0D: @ 8242F0D - .string "BATTLE FRONTIER RANKING HALL\n" - .string "Set your sights on new records!$" - -BattleFrontier_OutsideEast_Text_242F4A: @ 8242F4A - .string "BATTLE POINT EXCHANGE SERVICE CORNER\n" - .string "Exchange your Battle Points!$" - -BattleFrontier_OutsideEast_Text_242F8C: @ 8242F8C - .string "Wow!\n" - .string "It’s huge!\p" - .string "The BATTLE TOWER feels special.\n" - .string "It’s different from the others.$" - -BattleFrontier_OutsideEast_Text_242FDC: @ 8242FDC - .string "My grand ambition is to conquer both\n" - .string "the BATTLE FRONTIER and the POKéMON\l" - .string "LEAGUE.\p" - .string "And if my dream comes true…\p" - .string "I… I’m going to ask MIMI next door\n" - .string "if she will be friends with me!$" - -BattleFrontier_OutsideEast_Text_24308C: @ 824308C - .string "The BATTLE PYRAMID’s too harsh!\n" - .string "I just can’t make it to the top!\p" - .string "Since I’m out of options, maybe I can\n" - .string "climb the outside…$" - -BattleFrontier_OutsideEast_Text_243106: @ 8243106 - .string "I thrive in darkness…\n" - .string "Yes… What is worthy of me?\l" - .string "None other than the BATTLE PYRAMID…\p" - .string "What say you to wandering in darkness\n" - .string "and in utter and total desperation?$" - -BattleFrontier_OutsideEast_Text_2431A5: @ 82431A5 - .string "I didn’t sleep for a week, but then\n" - .string "I put together the ultimate team!\p" - .string "I can’t see myself losing, no joke.\n" - .string "We’re storming the BATTLE ARENA!$" - -BattleFrontier_OutsideEast_Text_243230: @ 8243230 - .string "Did SCOTT bring you here, too?\n" - .string "What is it with that guy?\p" - .string "It sounds like he really does know\n" - .string "how to spot talented TRAINERS, but…\p" - .string "I’ve never seen him battling in person\n" - .string "ever.$" - -BattleFrontier_OutsideEast_Text_2432DD: @ 82432DD - .string "ZIGG!\n" - .string "I believe in you, little buddy!\p" - .string "I’ll make my little ZIGG any favorite\n" - .string "tasty treats you like if you win!$" - -BattleFrontier_OutsideEast_Text_24334B: @ 824334B - .string "ZIGZAGOON looks vacant…$" - -BattleFrontier_OutsideEast_Text_243363: @ 8243363 - .string "People call me a busybody,\n" - .string "but I can’t help it.\p" - .string "Your hat’s on crooked!\n" - .string "Oh, no, trash on the ground!\l" - .string "Oops, it’s almost dinnertime!\p" - .string "I don’t know if I can stand to just\n" - .string "watch at the BATTLE PALACE…$" - -BattleFrontier_OutsideEast_Text_243425: @ 8243425 - .string "I may not look that impressive now,\n" - .string "but I once beat a GYM LEADER.\p" - .string "Who knows, maybe I should give it\n" - .string "another shot at glory.$" - -BattleFrontier_OutsideEast_Text_2434A0: @ 82434A0 - .string "I’m fast on my BIKE, and that goes for\n" - .string "the way I battle, too.\p" - .string "I win matches in the blink of\n" - .string "an eye!$" - -BattleFrontier_OutsideEast_Text_243504: @ 8243504 - .string "I’m better than my daddy\n" - .string "at POKéMON.$" - -BattleFrontier_OutsideEast_Text_243529: @ 8243529 - .string "Go on, my baby sweetie!\n" - .string "Go rack up some wins for Daddy!\p" - .string "You’re just like your mother,\n" - .string "so you’ll be dominating!$" - -BattleFrontier_OutsideEast_Text_243598: @ 8243598 - .string "It wasn’t easy getting here,\n" - .string "but I’d heard about this knockout\l" - .string "pretty girl at the BATTLE ARENA.\p" - .string "Instead of her, do you know what\n" - .string "I found?\p" - .string "A whole teeming mob of sweaty,\n" - .string "stinky, and primitive martial artists!$" - -BattleFrontier_OutsideEast_Text_243668: @ 8243668 - .string "I sometimes see this really important-\n" - .string "looking old man going in there.\p" - .string "He has these really awesome POKéMON.\n" - .string "He seems really nice, though.$" - -BattleFrontier_OutsideEast_Text_2436F2: @ 82436F2 - .string "Do you know it?\n" - .string "The legend of the BATTLE PYRAMID?\p" - .string "When there comes a confident TRAINER\n" - .string "reaching for the golden pinnacle,\l" - .string "there shall appear a man among men.\p" - .string "Don’t know that legend?\n" - .string "Well, of course not!\l" - .string "I just made it up!\p" - .string "What’s it supposed to mean?\n" - .string "That, my friend, I can’t say!$" - -BattleFrontier_OutsideEast_Text_243809: @ 8243809 - .string "Man! Oh man!\n" - .string "I’ve never lost once before!\p" - .string "But I got wiped out with no saving\n" - .string "grace at all!\p" - .string "And then I’m told I don’t have any\n" - .string "talent?! Man!$" - -BattleFrontier_OutsideEast_Text_243895: @ 8243895 - .string "This guy ran into a horribly tough\n" - .string "TRAINER while he was on the BATTLE\l" - .string "TOWER challenge.\p" - .string "Now look at him…\p" - .string "You need to be cautious if you ever\n" - .string "decide to go to the BATTLE TOWER.$" - -BattleFrontier_OutsideEast_Text_243943: @ 8243943 - .string "Yes!\n" - .string "I’ve finally got enough Battle Points!\p" - .string "I guess I’ll trade for another giant\n" - .string "plush DOLL!$" - -BattleFrontier_OutsideEast_Text_2439A0: @ 82439A0 - .string "Oh, yeah, okay!\n" - .string "So this is the RANKING HALL!\p" - .string "I’d like to go down in history as\n" - .string "a super champ and have my name\l" - .string "recorded here for posterity.$" - -BattleFrontier_OutsideEast_Text_243A2B: @ 8243A2B - .string "With you by my side, I can do anything.$" - -BattleFrontier_OutsideEast_Text_243A53: @ 8243A53 - .string "Ooh, darling, you are so wonderful!\p" - .string "Ooh, I just can’t wait anymore!\p" - .string "Let’s go to a MULTI BATTLE ROOM\n" - .string "right this instant!\p" - .string "If we get together in the BATTLE SALON,\n" - .string "the power of our love will overcome\l" - .string "everyone we meet.\p" - .string "Why, before us, darling, everything\n" - .string "will topple like dominoes!$" - -BattleFrontier_OutsideEast_Text_243B68: @ 8243B68 - .string "The BATTLE FRONTIER isn’t exclusively\n" - .string "for tough TRAINERS.\p" - .string "Many people with special abilities\n" - .string "have been invited, it seems.\p" - .string "That man SCOTT…\p" - .string "He may have built this place to serve\n" - .string "a bigger objective…$" - -BattleFrontier_OutsideEast_Text_243C2C: @ 8243C2C - .string "Excuse me, young one.\n" - .string "Have you good eyesight?\p" - .string "There is an odd tree past here, and to\n" - .string "my tired eyes it seems to wiggle.$" - -BattleFrontier_OutsideEast_Text_243CA3: @ 8243CA3 - .string "Excuse me, young one.\n" - .string "Have you a good memory?\p" - .string "I have this feeling there once was\n" - .string "an odd tree past here.$" - -BattleFrontier_OutsideEast_Text_243D0B: @ 8243D0B - .string "I…\n" - .string "I saw it!\p" - .string "There was a sticky sort of a POKéMON\n" - .string "with a long tail up ahead!\p" - .string "It was hiding under a boulder, and\n" - .string "it kept staring at me!$" diff --git a/data/scripts/maps/BattleFrontier_OutsideWest.inc b/data/scripts/maps/BattleFrontier_OutsideWest.inc deleted file mode 100644 index bd9d508dd..000000000 --- a/data/scripts/maps/BattleFrontier_OutsideWest.inc +++ /dev/null @@ -1,526 +0,0 @@ -BattleFrontier_OutsideWest_MapScripts:: @ 823D3E1 - map_script 3, BattleFrontier_OutsideWest_MapScript1_23D3E7 - .byte 0 - -BattleFrontier_OutsideWest_MapScript1_23D3E7: @ 823D3E7 - setvar VAR_0x40BC, 0 - setflag FLAG_0x396 - end - -BattleFrontier_OutsideWest_EventScript_23D3F0:: @ 823D3F0 - lock - faceplayer - msgbox BattleFrontier_OutsideWest_Text_23D808, 4 - checkitem ITEM_SS_TICKET, 1 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_OutsideWest_EventScript_23D44E - message BattleFrontier_OutsideWest_Text_23D89D - waitmessage - goto BattleFrontier_OutsideWest_EventScript_23D416 - end - -BattleFrontier_OutsideWest_EventScript_23D416:: @ 823D416 - multichoicedefault 18, 6, 53, 2, 0 - switch VAR_RESULT - case 0, BattleFrontier_OutsideWest_EventScript_23D458 - case 1, BattleFrontier_OutsideWest_EventScript_23D483 - case 2, BattleFrontier_OutsideWest_EventScript_23D4D8 - case 127, BattleFrontier_OutsideWest_EventScript_23D4D8 - end - -BattleFrontier_OutsideWest_EventScript_23D44E:: @ 823D44E - msgbox BattleFrontier_OutsideWest_Text_23D842, 4 - release - end - -BattleFrontier_OutsideWest_EventScript_23D458:: @ 823D458 - msgbox BattleFrontier_OutsideWest_Text_23D8F2, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_OutsideWest_EventScript_23D4AE - msgbox BattleFrontier_OutsideWest_Text_23D94B, 4 - call BattleFrontier_OutsideWest_EventScript_23D4BA - warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 - waitstate - release - end - -BattleFrontier_OutsideWest_EventScript_23D483:: @ 823D483 - msgbox BattleFrontier_OutsideWest_Text_23D90E, 5 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_OutsideWest_EventScript_23D4AE - msgbox BattleFrontier_OutsideWest_Text_23D94B, 4 - call BattleFrontier_OutsideWest_EventScript_23D4BA - warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 - waitstate - release - end - -BattleFrontier_OutsideWest_EventScript_23D4AE:: @ 823D4AE - message BattleFrontier_OutsideWest_Text_23D97A - waitmessage - goto BattleFrontier_OutsideWest_EventScript_23D416 - end - -BattleFrontier_OutsideWest_EventScript_23D4BA:: @ 823D4BA - closemessage - applymovement VAR_LAST_TALKED, BattleFrontier_OutsideWest_Movement_2725AA - waitmovement 0 - delay 30 - hideobjectat 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - setvar VAR_0x8004, 2 - call BattleFrontier_OutsideWest_EventScript_272250 - return - -BattleFrontier_OutsideWest_EventScript_23D4D8:: @ 823D4D8 - msgbox BattleFrontier_OutsideWest_Text_23D929, 4 - release - end - -BattleFrontier_OutsideWest_EventScript_23D4E2:: @ 823D4E2 - msgbox BattleFrontier_OutsideWest_Text_23D6F7, 3 - end - -BattleFrontier_OutsideWest_EventScript_23D4EB:: @ 823D4EB - msgbox BattleFrontier_OutsideWest_Text_23D737, 3 - end - -BattleFrontier_OutsideWest_EventScript_23D4F4:: @ 823D4F4 - msgbox BattleFrontier_OutsideWest_Text_23D772, 3 - end - -BattleFrontier_OutsideWest_EventScript_23D4FD:: @ 823D4FD - msgbox BattleFrontier_OutsideWest_Text_23D7A6, 2 - end - -BattleFrontier_OutsideWest_EventScript_23D506:: @ 823D4FD - msgbox BattleFrontier_OutsideWest_Text_23D9DD, 2 - end - -BattleFrontier_OutsideWest_EventScript_23D50F:: @ 823D50F - msgbox BattleFrontier_OutsideWest_Text_23D99C, 2 - end - -BattleFrontier_OutsideWest_EventScript_23D518:: @ 823D518 - lock - faceplayer - message BattleFrontier_OutsideWest_Text_23DA60 - waitmessage - applymovement 18, BattleFrontier_OutsideWest_Movement_2725A0 - waitmovement 0 - waitbuttonpress - release - end - -BattleFrontier_OutsideWest_EventScript_23D52D:: @ 823D52D - msgbox BattleFrontier_OutsideWest_Text_23DABF, 2 - end - -BattleFrontier_OutsideWest_EventScript_23D536:: @ 823D536 - lock - goto BattleFrontier_OutsideWest_EventScript_23D544 - end - -BattleFrontier_OutsideWest_EventScript_23D53D:: @ 823D53D - lock - goto BattleFrontier_OutsideWest_EventScript_23D544 - end - -BattleFrontier_OutsideWest_EventScript_23D544:: @ 823D544 - applymovement 9, BattleFrontier_OutsideWest_Movement_2725A8 - waitmovement 0 - msgbox BattleFrontier_OutsideWest_Text_23DB7D, 4 - applymovement 10, BattleFrontier_OutsideWest_Movement_2725A4 - waitmovement 0 - msgbox BattleFrontier_OutsideWest_Text_23DBCE, 4 - closemessage - delay 25 - applymovement 9, BattleFrontier_OutsideWest_Movement_2725A6 - applymovement 10, BattleFrontier_OutsideWest_Movement_2725A6 - waitmovement 0 - release - end - -BattleFrontier_OutsideWest_EventScript_23D57F:: @ 823D57F - lock - faceplayer - delay 20 - compare VAR_FACING, 2 - call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA - compare VAR_FACING, 1 - call_if 1, BattleFrontier_OutsideWest_EventScript_23D5C5 - compare VAR_FACING, 3 - call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA - compare VAR_FACING, 4 - call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA - msgbox BattleFrontier_OutsideWest_Text_23DC36, 4 - release - end - -BattleFrontier_OutsideWest_EventScript_23D5BA:: @ 823D5BA - applymovement 14, BattleFrontier_OutsideWest_Movement_2725A6 - waitmovement 0 - return - -BattleFrontier_OutsideWest_EventScript_23D5C5:: @ 823D5C5 - return - -BattleFrontier_OutsideWest_EventScript_23D5C6:: @ 823D5C6 - lock - faceplayer - message BattleFrontier_OutsideWest_Text_23DCB0 - waitmessage - compare VAR_FACING, 2 - call_if 1, BattleFrontier_OutsideWest_EventScript_23D5FD - compare VAR_FACING, 1 - call_if 1, BattleFrontier_OutsideWest_EventScript_23D608 - compare VAR_FACING, 3 - call_if 1, BattleFrontier_OutsideWest_EventScript_23D613 - compare VAR_FACING, 4 - call_if 1, BattleFrontier_OutsideWest_EventScript_23D61E - waitbuttonpress - release - end - -BattleFrontier_OutsideWest_EventScript_23D5FD:: @ 823D5FD - applymovement 12, BattleFrontier_OutsideWest_Movement_23D629 - waitmovement 0 - return - -BattleFrontier_OutsideWest_EventScript_23D608:: @ 823D608 - applymovement 12, BattleFrontier_OutsideWest_Movement_23D62C - waitmovement 0 - return - -BattleFrontier_OutsideWest_EventScript_23D613:: @ 823D613 - applymovement 12, BattleFrontier_OutsideWest_Movement_23D62F - waitmovement 0 - return - -BattleFrontier_OutsideWest_EventScript_23D61E:: @ 823D61E - applymovement 12, BattleFrontier_OutsideWest_Movement_23D632 - waitmovement 0 - return - -BattleFrontier_OutsideWest_Movement_23D629: @ 823D629 - walk_in_place_fastest_down - walk_in_place_fastest_down - step_end - -BattleFrontier_OutsideWest_Movement_23D62C: @ 823D62C - walk_in_place_fastest_up - walk_in_place_fastest_up - step_end - -BattleFrontier_OutsideWest_Movement_23D62F: @ 823D62F - walk_in_place_fastest_right - walk_in_place_fastest_right - step_end - -BattleFrontier_OutsideWest_Movement_23D632: @ 823D632 - walk_in_place_fastest_left - walk_in_place_fastest_left - step_end - -BattleFrontier_OutsideWest_EventScript_23D635:: @ 823D635 - lock - faceplayer - msgbox BattleFrontier_OutsideWest_Text_23DD3B, 4 - random 2 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_OutsideWest_EventScript_23D653 - goto BattleFrontier_OutsideWest_EventScript_23D65D - end - -BattleFrontier_OutsideWest_EventScript_23D653:: @ 823D653 - msgbox BattleFrontier_OutsideWest_Text_23DD7A, 4 - release - end - -BattleFrontier_OutsideWest_EventScript_23D65D:: @ 823D65D - msgbox BattleFrontier_OutsideWest_Text_23DDAD, 4 - release - end - -BattleFrontier_OutsideWest_EventScript_23D667:: @ 823D667 - msgbox BattleFrontier_OutsideWest_Text_23DE15, 2 - end - -BattleFrontier_OutsideWest_EventScript_23D670:: @ 823D670 - msgbox BattleFrontier_OutsideWest_Text_23DF7D, 2 - end - -BattleFrontier_OutsideWest_EventScript_23D679:: @ 823D679 - msgbox BattleFrontier_OutsideWest_Text_23DEFD, 2 - end - -BattleFrontier_OutsideWest_EventScript_23D682:: @ 823D682 - msgbox BattleFrontier_OutsideWest_Text_23DEB4, 2 - end - -BattleFrontier_OutsideWest_EventScript_23D68B:: @ 823D68B - msgbox BattleFrontier_OutsideWest_Text_23DFBF, 2 - end - -BattleFrontier_OutsideWest_EventScript_23D694:: @ 823D694 - msgbox BattleFrontier_OutsideWest_Text_23E01E, 2 - end - -BattleFrontier_OutsideWest_EventScript_23D69D:: @ 823D69D - msgbox BattleFrontier_OutsideWest_Text_23E09F, 2 - end - -BattleFrontier_OutsideWest_EventScript_23D6A6:: @ 823D6A6 - msgbox BattleFrontier_OutsideWest_Text_23E102, 2 - end - -BattleFrontier_OutsideWest_EventScript_23D6AF:: @ 823D6AF - msgbox BattleFrontier_OutsideWest_Text_23E154, 2 - end - -BattleFrontier_OutsideWest_EventScript_23D6B8:: @ 823D6B8 - lock - msgbox BattleFrontier_OutsideWest_Text_23E273, 4 - release - end - -BattleFrontier_OutsideWest_EventScript_23D6C3:: @ 823D6C3 - lock - msgbox BattleFrontier_OutsideWest_Text_23E2E9, 4 - release - end - -BattleFrontier_OutsideWest_EventScript_23D6CE:: @ 823D6CE - msgbox BattleFrontier_OutsideWest_Text_23E37E, 2 - end - -BattleFrontier_OutsideWest_EventScript_23D6D7:: @ 823D6D7 - lock - faceplayer - msgbox BattleFrontier_OutsideWest_Text_23E410, 4 - closemessage - applymovement 23, BattleFrontier_OutsideWest_Movement_2725A2 - waitmovement 0 - release - end - -BattleFrontier_OutsideWest_EventScript_23D6EE:: @ 823D6EE - msgbox BattleFrontier_OutsideWest_Text_23E5A5, 2 - end - -BattleFrontier_OutsideWest_Text_23D6F7: @ 823D6F7 - .string "This is the BATTLE DOME!\n" - .string "Your path to the invincible superstar!$" - -BattleFrontier_OutsideWest_Text_23D737: @ 823D737 - .string "This is the BATTLE FACTORY!\n" - .string "Seek out the toughest POKéMON!$" - -BattleFrontier_OutsideWest_Text_23D772: @ 823D772 - .string "This is the BATTLE PIKE!\n" - .string "Choose one of three paths!$" - -BattleFrontier_OutsideWest_Text_23D7A6: @ 823D7A6 - .string "This is the BATTLE TOWER.\p" - .string "TRAINERS bring their best-raised\n" - .string "POKéMON for elimination-style matches.$" - -BattleFrontier_OutsideWest_Text_23D808: @ 823D808 - .string "Hello, are you here for the ferry?\n" - .string "May I see your TICKET?$" - -BattleFrontier_OutsideWest_Text_23D842: @ 823D842 - .string "{PLAYER} doesn’t have the TICKET…\p" - .string "I’m terribly sorry.\p" - .string "You must have a TICKET to board\n" - .string "the ferry.$" - -BattleFrontier_OutsideWest_Text_23D89D: @ 823D89D - .string "{PLAYER} flashed the TICKET.\p" - .string "Perfect! That’s all you need!\p" - .string "And where would you like to go?$" - -BattleFrontier_OutsideWest_Text_23D8F2: @ 823D8F2 - .string "SLATEPORT CITY it is, then!$" - -BattleFrontier_OutsideWest_Text_23D90E: @ 823D90E - .string "LILYCOVE CITY it is, then!$" - -BattleFrontier_OutsideWest_Text_23D929: @ 823D929 - .string "Please sail with us another time!$" - -BattleFrontier_OutsideWest_Text_23D94B: @ 823D94B - .string "Please board the ferry and wait for\n" - .string "departure.$" - -BattleFrontier_OutsideWest_Text_23D97A: @ 823D97A - .string "Then, where would you like to go?$" - -BattleFrontier_OutsideWest_Text_23D99C: @ 823D99C - .string "I’m the best out of all my friends.\n" - .string "But here…\l" - .string "I’ve been useless!$" - -BattleFrontier_OutsideWest_Text_23D9DD: @ 823D9DD - .string "I want to go to the BATTLE TOWER,\n" - .string "but I can’t find it even though I have\l" - .string "a map of the BATTLE FRONTIER.\p" - .string "This place is just too big!$" - -BattleFrontier_OutsideWest_Text_23DA60: @ 823DA60 - .string "I wanted to take a challenge as soon\n" - .string "as I arrived here.\p" - .string "But on the way, I got seasick…\n" - .string "Urrrrp…$" - -BattleFrontier_OutsideWest_Text_23DABF: @ 823DABF - .string "It’s not as if just anyone can come\n" - .string "here, you know?\p" - .string "Only those TRAINERS who’ve been\n" - .string "recognized as tough are brought here.\p" - .string "That’s why many TRAINERS don’t even\n" - .string "know about the BATTLE FRONTIER.$" - -BattleFrontier_OutsideWest_Text_23DB7D: @ 823DB7D - .string "Hey, bro…\p" - .string "Are you sure we can make challenges\n" - .string "even if we don’t have any POKéMON?$" - -BattleFrontier_OutsideWest_Text_23DBCE: @ 823DBCE - .string "Uh…\n" - .string "I’m sure it’ll be okay.\p" - .string "I think…\p" - .string "But remember that big scary guy?\n" - .string "He said, “I’ll lend you POKéMON!â€$" - -BattleFrontier_OutsideWest_Text_23DC36: @ 823DC36 - .string "That’s the BATTLE FACTORY.\n" - .string "You can rent strong POKéMON there.\p" - .string "But it makes me wonder.\n" - .string "Who’s raising those rental POKéMON?$" - -BattleFrontier_OutsideWest_Text_23DCB0: @ 823DCB0 - .string "I’m scared of going into the BATTLE\n" - .string "PIKE because of SEVIPER…\p" - .string "B-but I came all the way here, so I will\n" - .string "try to conquer everything!\l" - .string "…Shudder…$" - -BattleFrontier_OutsideWest_Text_23DD3B: @ 823DD3B - .string "Let’s play rock, paper, scissors!\n" - .string "One, two, three!\p" - .string "… … … … … …$" - -BattleFrontier_OutsideWest_Text_23DD7A: @ 823DD7A - .string "Yay! I won!\n" - .string "I will take the BATTLE PIKE challenge!$" - -BattleFrontier_OutsideWest_Text_23DDAD: @ 823DDAD - .string "Oh, no…\n" - .string "I lost.\p" - .string "I guess I’m not very lucky today.\n" - .string "I’ll put off my BATTLE PIKE challenge\l" - .string "until tomorrow.$" - -BattleFrontier_OutsideWest_Text_23DE15: @ 823DE15 - .string "I believe I’m the only person here who,\n" - .string "for some unknown reason, would choose\l" - .string "fishing over battling.\p" - .string "Huh? You can’t catch anything here?\n" - .string "That’s disappointing…$" - -BattleFrontier_OutsideWest_Text_23DEB4: @ 823DEB4 - .string "Today, I’m going to keep battling, no\n" - .string "matter what, until I get a Symbol.$" - -BattleFrontier_OutsideWest_Text_23DEFD: @ 823DEFD - .string "Oh? You’re off to challenge\n" - .string "the BATTLE DOME?\p" - .string "I’ll wish you the best of luck.\n" - .string "Let us both win our way up and meet\l" - .string "in challenges.$" - -BattleFrontier_OutsideWest_Text_23DF7D: @ 823DF7D - .string "Grandpa, over here!\n" - .string "The BATTLE DOME is here!\l" - .string "Go get ’em, Grandpa!$" - -BattleFrontier_OutsideWest_Text_23DFBF: @ 823DFBF - .string "Ah, so this here is the BATTLE DOME?\n" - .string "I won’t let GENTLEMEN beat me!\p" - .string "But where is the entrance?$" - -BattleFrontier_OutsideWest_Text_23E01E: @ 823E01E - .string "There used to be nothing here not all\n" - .string "that long ago.\p" - .string "But, now look at this place! Amazing!\n" - .string "I’ll bring my mother out to see this.$" - -BattleFrontier_OutsideWest_Text_23E09F: @ 823E09F - .string "I’ve finally arrived at the BATTLE\n" - .string "FRONTIER!\p" - .string "I’m sure to grab attention with\n" - .string "my looks and ability!$" - -BattleFrontier_OutsideWest_Text_23E102: @ 823E102 - .string "Munch, munch…\p" - .string "It looks like this square’s filled with\n" - .string "tough people.\p" - .string "Munch, munch…$" - -BattleFrontier_OutsideWest_Text_23E154: @ 823E154 - .string "Crunch, munch…\p" - .string "A while back, I met this older girl\n" - .string "at the BATTLE PIKE.\p" - .string "She had these eyes that were scary\n" - .string "in a real ornery way.\p" - .string "Crunch, munch…\p" - .string "She got all furious: “Will you quit\n" - .string "eating!†Then she whaled on me.\p" - .string "It was a hair-raising kind of\n" - .string "scary experience, sure enough.\p" - .string "Crunch, munch…$" - -BattleFrontier_OutsideWest_Text_23E273: @ 823E273 - .string "Huh? Will you listen to yourself?\n" - .string "That’s nothing!\p" - .string "Why, the last time I cheered for him,\n" - .string "our eyes met and sparks flew!$" - -BattleFrontier_OutsideWest_Text_23E2E9: @ 823E2E9 - .string "Whaaaaaat?!\n" - .string "Pfft!\p" - .string "That only happened because\n" - .string "I happened to be sitting next to you!\p" - .string "The DOME ACE only looked our way\n" - .string "because my cheering was so loud!$" - -BattleFrontier_OutsideWest_Text_23E37E: @ 823E37E - .string "Oh, shush!\n" - .string "Keep that racket down!\p" - .string "You fair-weather fans should stick\n" - .string "to cheering for some GYM LEADER!\p" - .string "The DOME ACE is mine!\n" - .string "The only idol for me!$" - -BattleFrontier_OutsideWest_Text_23E410: @ 823E410 - .string "Those people squabbling over there…\p" - .string "It’s hard to believe, but they once\n" - .string "were TRAINERS, and good ones, too.\p" - .string "They used to be incredibly tough,\n" - .string "and they were famous, too.\p" - .string "But they were obliterated by this\n" - .string "certain TRAINER at a tournament.\p" - .string "They were so thoroughly whipped,\n" - .string "they became smitten by the TRAINER.\p" - .string "Now they’re just fans of the TRAINER.\n" - .string "They go cheer for their idol at the\l" - .string "BATTLE DOME every day now.$" - -BattleFrontier_OutsideWest_Text_23E5A5: @ 823E5A5 - .string "I heard a rumor that someone saw\n" - .string "a POKéMON with an unusually long tail\l" - .string "somewhere in the BATTLE FRONTIER.\p" - .string "It must be adorable. I’m sure of it…\p" - .string "Oh, challenges can wait. I feel driven\n" - .string "to find the delightful creature!$" - diff --git a/data/scripts/maps/BattleFrontier_PokemonCenter_1F.inc b/data/scripts/maps/BattleFrontier_PokemonCenter_1F.inc deleted file mode 100644 index 23818d64c..000000000 --- a/data/scripts/maps/BattleFrontier_PokemonCenter_1F.inc +++ /dev/null @@ -1,59 +0,0 @@ -BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9 - map_script 3, BattleFrontier_PokemonCenter_1F_MapScript1_267904 - map_script 5, BattleFrontier_PokemonCenter_1F_MapScript1_277C30 - .byte 0 - -BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904 - setrespawn 22 - end - -BattleFrontier_PokemonCenter_1F_EventScript_267908:: @ 8267908 - setvar VAR_0x800B, 1 - call BattleFrontier_PokemonCenter_1F_EventScript_27191E - waitmessage - waitbuttonpress - release - end - -BattleFrontier_PokemonCenter_1F_EventScript_267916:: @ 8267916 - msgbox BattleFrontier_PokemonCenter_1F_Text_267944, 2 - end - -BattleFrontier_PokemonCenter_1F_EventScript_26791F:: @ 826791F - msgbox BattleFrontier_PokemonCenter_1F_Text_2679EB, 2 - end - -BattleFrontier_PokemonCenter_1F_EventScript_267928:: @ 8267928 - msgbox BattleFrontier_PokemonCenter_1F_Text_267A4B, 2 - end - -BattleFrontier_PokemonCenter_1F_EventScript_267931:: @ 8267931 - lock - faceplayer - waitse - playmoncry SPECIES_SKITTY, 0 - msgbox BattleFrontier_PokemonCenter_1F_Text_267A90, 4 - waitmoncry - release - end - -BattleFrontier_PokemonCenter_1F_Text_267944: @ 8267944 - .string "There was someone here using a \n" - .string "POKéMON I’ve never seen before.\p" - .string "I never learned about it at\n" - .string "TRAINER’S SCHOOL at least.\p" - .string "I wonder where you can catch POKéMON\n" - .string "like that.$" - -BattleFrontier_PokemonCenter_1F_Text_2679EB: @ 82679EB - .string "Okay! Next stop, the BATTLE ARENA!\n" - .string "I’d better get the right POKéMON from\l" - .string "the PC Storage System.$" - -BattleFrontier_PokemonCenter_1F_Text_267A4B: @ 8267A4B - .string "Giggle… I’m going to go through every\n" - .string "challenge with just this baby!$" - -BattleFrontier_PokemonCenter_1F_Text_267A90: @ 8267A90 - .string "SKITTY: Mya myaaah!$" - diff --git a/data/scripts/maps/BattleFrontier_PokemonCenter_2F.inc b/data/scripts/maps/BattleFrontier_PokemonCenter_2F.inc deleted file mode 100644 index 7d3c3a2f1..000000000 --- a/data/scripts/maps/BattleFrontier_PokemonCenter_2F.inc +++ /dev/null @@ -1,19 +0,0 @@ -BattleFrontier_PokemonCenter_2F_MapScripts:: @ 8267AA4 - map_script 2, BattleFrontier_PokemonCenter_2F_MapScript2_276C3B - map_script 4, BattleFrontier_PokemonCenter_2F_MapScript2_276B6C - map_script 1, BattleFrontier_PokemonCenter_2F_MapScript1_276BBE - map_script 3, BattleFrontier_PokemonCenter_2F_MapScript1_276ACF - .byte 0 - -BattleFrontier_PokemonCenter_2F_EventScript_267AB9:: @ 8267AB9 - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 - end - -BattleFrontier_PokemonCenter_2F_EventScript_267ABF:: @ 8267ABF - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 - end - -BattleFrontier_PokemonCenter_2F_EventScript_267AC5:: @ 8267AC5 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB - end - diff --git a/data/scripts/maps/BattleFrontier_RankingHall.inc b/data/scripts/maps/BattleFrontier_RankingHall.inc deleted file mode 100644 index e469024e9..000000000 --- a/data/scripts/maps/BattleFrontier_RankingHall.inc +++ /dev/null @@ -1,135 +0,0 @@ -BattleFrontier_RankingHall_MapScripts:: @ 825E4A9 - .byte 0 - -BattleFrontier_RankingHall_EventScript_25E4AA:: @ 825E4AA - lockall - setvar VAR_0x8005, 0 - goto BattleFrontier_RankingHall_EventScript_25E522 - end - -BattleFrontier_RankingHall_EventScript_25E4B6:: @ 825E4B6 - lockall - setvar VAR_0x8005, 1 - goto BattleFrontier_RankingHall_EventScript_25E522 - end - -BattleFrontier_RankingHall_EventScript_25E4C2:: @ 825E4C2 - lockall - setvar VAR_0x8005, 2 - goto BattleFrontier_RankingHall_EventScript_25E522 - end - -BattleFrontier_RankingHall_EventScript_25E4CE:: @ 825E4CE - lockall - setvar VAR_0x8005, 9 - goto BattleFrontier_RankingHall_EventScript_25E522 - end - -BattleFrontier_RankingHall_EventScript_25E4DA:: @ 825E4DA - lockall - setvar VAR_0x8005, 5 - goto BattleFrontier_RankingHall_EventScript_25E522 - end - -BattleFrontier_RankingHall_EventScript_25E4E6:: @ 825E4E6 - lockall - setvar VAR_0x8005, 4 - goto BattleFrontier_RankingHall_EventScript_25E522 - end - -BattleFrontier_RankingHall_EventScript_25E4F2:: @ 825E4F2 - lockall - setvar VAR_0x8005, 6 - goto BattleFrontier_RankingHall_EventScript_25E522 - end - -BattleFrontier_RankingHall_EventScript_25E4FE:: @ 825E4FE - lockall - setvar VAR_0x8005, 3 - goto BattleFrontier_RankingHall_EventScript_25E522 - end - -BattleFrontier_RankingHall_EventScript_25E50A:: @ 825E50A - lockall - setvar VAR_0x8005, 7 - goto BattleFrontier_RankingHall_EventScript_25E522 - end - -BattleFrontier_RankingHall_EventScript_25E516:: @ 825E516 - lockall - setvar VAR_0x8005, 8 - goto BattleFrontier_RankingHall_EventScript_25E522 - end - -BattleFrontier_RankingHall_EventScript_25E522:: @ 825E522 - special sub_81A4AA0 - waitbuttonpress - special sub_81A4AE8 - waitbuttonpress - special RemoveRecordsWindow - releaseall - end - -BattleFrontier_RankingHall_EventScript_25E52F:: @ 825E52F - msgbox BattleFrontier_RankingHall_Text_25E57C, 2 - end - -BattleFrontier_RankingHall_EventScript_25E538:: @ 825E538 - msgbox BattleFrontier_RankingHall_Text_25E5F9, 3 - end - -BattleFrontier_RankingHall_EventScript_25E541:: @ 825E541 - msgbox BattleFrontier_RankingHall_Text_25E62E, 3 - end - -BattleFrontier_RankingHall_EventScript_25E54A:: @ 825E54A - lock - faceplayer - msgbox BattleFrontier_RankingHall_Text_25E666, 5 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_RankingHall_EventScript_25E569 - msgbox BattleFrontier_RankingHall_Text_25E6B6, 4 - release - end - -BattleFrontier_RankingHall_EventScript_25E569:: @ 825E569 - msgbox BattleFrontier_RankingHall_Text_25E685, 4 - release - end - -BattleFrontier_RankingHall_EventScript_25E573:: @ 825E573 - msgbox BattleFrontier_RankingHall_Text_25E715, 2 - end - -BattleFrontier_RankingHall_Text_25E57C: @ 825E57C - .string "This is the RANKING HALL.\p" - .string "This is where we recognize the immortal\n" - .string "TRAINERS who left great records in\l" - .string "BATTLE FRONTIER events.$" - -BattleFrontier_RankingHall_Text_25E5F9: @ 825E5F9 - .string "BATTLE DOME, BATTLE PIKE,\n" - .string "and BATTLE FACTORY Records$" - -BattleFrontier_RankingHall_Text_25E62E: @ 825E62E - .string "BATTLE PALACE, BATTLE ARENA,\n" - .string "and BATTLE PYRAMID Records$" - -BattleFrontier_RankingHall_Text_25E666: @ 825E666 - .string "Hi, is your name on this list?$" - -BattleFrontier_RankingHall_Text_25E685: @ 825E685 - .string "Wow, that’s super!\n" - .string "I’ll have to try harder, too!$" - -BattleFrontier_RankingHall_Text_25E6B6: @ 825E6B6 - .string "Oh, is that right?\p" - .string "If you saw your friend’s name up here,\n" - .string "I bet it would make you work harder!$" - -BattleFrontier_RankingHall_Text_25E715: @ 825E715 - .string "Hmm…\n" - .string "My name’s not up there…\p" - .string "Well, it’s only natural since I haven’t\n" - .string "taken any challenges yet.$" - diff --git a/data/scripts/maps/BattleFrontier_ReceptionGate.inc b/data/scripts/maps/BattleFrontier_ReceptionGate.inc deleted file mode 100644 index ec38c3e9d..000000000 --- a/data/scripts/maps/BattleFrontier_ReceptionGate.inc +++ /dev/null @@ -1,505 +0,0 @@ -BattleFrontier_ReceptionGate_MapScripts:: @ 82661DA - map_script 2, BattleFrontier_ReceptionGate_MapScript2_2661E9 - map_script 3, BattleFrontier_ReceptionGate_MapScript1_2661E5 - .byte 0 - -BattleFrontier_ReceptionGate_MapScript1_2661E5: @ 82661E5 - setflag FLAG_LANDMARK_BATTLE_FRONTIER - end - -BattleFrontier_ReceptionGate_MapScript2_2661E9: @ 82661E9 - map_script_2 VAR_0x40D0, 0, BattleFrontier_ReceptionGate_EventScript_2661F3 - .2byte 0 - -BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3 - lockall - setvar VAR_0x40D0, 1 - playse SE_PIN - applymovement 1, BattleFrontier_ReceptionGate_Movement_272598 - waitmovement 0 - applymovement 1, BattleFrontier_ReceptionGate_Movement_27259A - waitmovement 0 - msgbox BattleFrontier_ReceptionGate_Text_266580, 4 - closemessage - applymovement 255, BattleFrontier_ReceptionGate_Movement_2662D2 - waitmovement 0 - goto BattleFrontier_ReceptionGate_EventScript_266229 - end - -BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229 - msgbox BattleFrontier_ReceptionGate_Text_2665B2, 4 - msgbox BattleFrontier_ReceptionGate_Text_2665F7, 4 - playfanfare MUS_FANFA4 - message BattleFrontier_ReceptionGate_Text_266676 - waitfanfare - waitmessage - msgbox BattleFrontier_ReceptionGate_Text_266695, 4 - setflag FLAG_SYS_FRONTIER_PASS - msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4 - msgbox BattleFrontier_ReceptionGate_Text_266703, 4 - closemessage - applymovement 1, BattleFrontier_ReceptionGate_Movement_2725A6 - applymovement 2, BattleFrontier_ReceptionGate_Movement_2725A6 - applymovement 255, BattleFrontier_ReceptionGate_Movement_2725A6 - waitmovement 0 - playse SE_PIN - applymovement 1, BattleFrontier_ReceptionGate_Movement_272598 - applymovement 2, BattleFrontier_ReceptionGate_Movement_272598 - applymovement 255, BattleFrontier_ReceptionGate_Movement_272598 - waitmovement 0 - msgbox BattleFrontier_ReceptionGate_Text_266733, 4 - closemessage - applymovement 1, BattleFrontier_ReceptionGate_Movement_2662F0 - applymovement 2, BattleFrontier_ReceptionGate_Movement_2662F6 - applymovement 255, BattleFrontier_ReceptionGate_Movement_2662D7 - applymovement 4, BattleFrontier_ReceptionGate_Movement_2662E0 - waitmovement 0 - msgbox BattleFrontier_ReceptionGate_Text_266764, 4 - closemessage - applymovement 4, BattleFrontier_ReceptionGate_Movement_2662E8 - waitmovement 0 - removeobject 4 - releaseall - end - -BattleFrontier_ReceptionGate_Movement_2662D2: @ 82662D2 - walk_up - walk_up - walk_left - walk_left - step_end - -BattleFrontier_ReceptionGate_Movement_2662D7: @ 82662D7 - delay_16 - delay_16 - delay_16 - delay_8 - walk_in_place_fastest_right - step_end - -BattleFrontier_ReceptionGate_Movement_2662DD: @ 82662DD - walk_down - walk_down - step_end - -BattleFrontier_ReceptionGate_Movement_2662E0: @ 82662E0 - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_left - step_end - -BattleFrontier_ReceptionGate_Movement_2662E8: @ 82662E8 - walk_right - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - step_end - -BattleFrontier_ReceptionGate_Movement_2662F0: @ 82662F0 - delay_16 - delay_16 - delay_16 - delay_8 - walk_in_place_fastest_right - step_end - -BattleFrontier_ReceptionGate_Movement_2662F6: @ 82662F6 - delay_16 - delay_16 - delay_16 - delay_8 - walk_in_place_fastest_left - step_end - -BattleFrontier_ReceptionGate_EventScript_2662FC:: @ 82662FC - lock - faceplayer - msgbox BattleFrontier_ReceptionGate_Text_2665B2, 4 - msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4 - release - end - -BattleFrontier_ReceptionGate_EventScript_266310:: @ 8266310 - lock - faceplayer - msgbox BattleFrontier_ReceptionGate_Text_266857, 4 - goto BattleFrontier_ReceptionGate_EventScript_266320 - end - -BattleFrontier_ReceptionGate_EventScript_266320:: @ 8266320 - message BattleFrontier_ReceptionGate_Text_26689D - waitmessage - setvar VAR_0x8004, 8 - special sub_813A128 - waitstate - switch VAR_RESULT - case 0, BattleFrontier_ReceptionGate_EventScript_2663AE - case 1, BattleFrontier_ReceptionGate_EventScript_2663BC - case 2, BattleFrontier_ReceptionGate_EventScript_2663CA - case 3, BattleFrontier_ReceptionGate_EventScript_2663D8 - case 4, BattleFrontier_ReceptionGate_EventScript_2663E6 - case 5, BattleFrontier_ReceptionGate_EventScript_2663F4 - case 6, BattleFrontier_ReceptionGate_EventScript_266402 - case 7, BattleFrontier_ReceptionGate_EventScript_266410 - case 8, BattleFrontier_ReceptionGate_EventScript_26641E - case 9, BattleFrontier_ReceptionGate_EventScript_26642C - case 127, BattleFrontier_ReceptionGate_EventScript_26642C - end - -BattleFrontier_ReceptionGate_EventScript_2663AE:: @ 82663AE - msgbox BattleFrontier_ReceptionGate_Text_2668C2, 4 - goto BattleFrontier_ReceptionGate_EventScript_266320 - end - -BattleFrontier_ReceptionGate_EventScript_2663BC:: @ 82663BC - msgbox BattleFrontier_ReceptionGate_Text_26696F, 4 - goto BattleFrontier_ReceptionGate_EventScript_266320 - end - -BattleFrontier_ReceptionGate_EventScript_2663CA:: @ 82663CA - msgbox BattleFrontier_ReceptionGate_Text_266A34, 4 - goto BattleFrontier_ReceptionGate_EventScript_266320 - end - -BattleFrontier_ReceptionGate_EventScript_2663D8:: @ 82663D8 - msgbox BattleFrontier_ReceptionGate_Text_266AC2, 4 - goto BattleFrontier_ReceptionGate_EventScript_266320 - end - -BattleFrontier_ReceptionGate_EventScript_2663E6:: @ 82663E6 - msgbox BattleFrontier_ReceptionGate_Text_266B5D, 4 - goto BattleFrontier_ReceptionGate_EventScript_266320 - end - -BattleFrontier_ReceptionGate_EventScript_2663F4:: @ 82663F4 - msgbox BattleFrontier_ReceptionGate_Text_266C24, 4 - goto BattleFrontier_ReceptionGate_EventScript_266320 - end - -BattleFrontier_ReceptionGate_EventScript_266402:: @ 8266402 - msgbox BattleFrontier_ReceptionGate_Text_266CBB, 4 - goto BattleFrontier_ReceptionGate_EventScript_266320 - end - -BattleFrontier_ReceptionGate_EventScript_266410:: @ 8266410 - msgbox BattleFrontier_ReceptionGate_Text_266D1C, 4 - goto BattleFrontier_ReceptionGate_EventScript_266320 - end - -BattleFrontier_ReceptionGate_EventScript_26641E:: @ 826641E - msgbox BattleFrontier_ReceptionGate_Text_266DCB, 4 - goto BattleFrontier_ReceptionGate_EventScript_266320 - end - -BattleFrontier_ReceptionGate_EventScript_26642C:: @ 826642C - msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4 - release - end - -BattleFrontier_ReceptionGate_EventScript_266436:: @ 8266436 - lock - faceplayer - msgbox BattleFrontier_ReceptionGate_Text_266E66, 4 - goto BattleFrontier_ReceptionGate_EventScript_266446 - end - -BattleFrontier_ReceptionGate_EventScript_266446:: @ 8266446 - message BattleFrontier_ReceptionGate_Text_266EE0 - waitmessage - multichoice 15, 0, 95, 0 - switch VAR_RESULT - case 0, BattleFrontier_ReceptionGate_EventScript_2664A4 - case 1, BattleFrontier_ReceptionGate_EventScript_2664B2 - case 2, BattleFrontier_ReceptionGate_EventScript_2664C0 - case 3, BattleFrontier_ReceptionGate_EventScript_2664CE - case 4, BattleFrontier_ReceptionGate_EventScript_2664DC - case 5, BattleFrontier_ReceptionGate_EventScript_2664EA - case 127, BattleFrontier_ReceptionGate_EventScript_2664EA - end - -BattleFrontier_ReceptionGate_EventScript_2664A4:: @ 82664A4 - msgbox BattleFrontier_ReceptionGate_Text_266F04, 4 - goto BattleFrontier_ReceptionGate_EventScript_266446 - end - -BattleFrontier_ReceptionGate_EventScript_2664B2:: @ 82664B2 - msgbox BattleFrontier_ReceptionGate_Text_266F69, 4 - goto BattleFrontier_ReceptionGate_EventScript_266446 - end - -BattleFrontier_ReceptionGate_EventScript_2664C0:: @ 82664C0 - msgbox BattleFrontier_ReceptionGate_Text_267080, 4 - goto BattleFrontier_ReceptionGate_EventScript_266446 - end - -BattleFrontier_ReceptionGate_EventScript_2664CE:: @ 82664CE - msgbox BattleFrontier_ReceptionGate_Text_26716A, 4 - goto BattleFrontier_ReceptionGate_EventScript_266446 - end - -BattleFrontier_ReceptionGate_EventScript_2664DC:: @ 82664DC - msgbox BattleFrontier_ReceptionGate_Text_267298, 4 - goto BattleFrontier_ReceptionGate_EventScript_266446 - end - -BattleFrontier_ReceptionGate_EventScript_2664EA:: @ 82664EA - msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4 - release - end - -BattleFrontier_ReceptionGate_EventScript_2664F4:: @ 82664F4 - lock - faceplayer - msgbox BattleFrontier_ReceptionGate_Text_267357, 4 - goto BattleFrontier_ReceptionGate_EventScript_266504 - end - -BattleFrontier_ReceptionGate_EventScript_266504:: @ 8266504 - message BattleFrontier_ReceptionGate_Text_26737C - waitmessage - multichoice 16, 4, 11, 0 - switch VAR_RESULT - case 0, BattleFrontier_ReceptionGate_EventScript_26654C - case 1, BattleFrontier_ReceptionGate_EventScript_26655A - case 2, BattleFrontier_ReceptionGate_EventScript_266568 - case 3, BattleFrontier_ReceptionGate_EventScript_266576 - case 127, BattleFrontier_ReceptionGate_EventScript_266576 - end - -BattleFrontier_ReceptionGate_EventScript_26654C:: @ 826654C - msgbox BattleFrontier_ReceptionGate_Text_2673A1, 4 - goto BattleFrontier_ReceptionGate_EventScript_266504 - end - -BattleFrontier_ReceptionGate_EventScript_26655A:: @ 826655A - msgbox BattleFrontier_ReceptionGate_Text_2674F3, 4 - goto BattleFrontier_ReceptionGate_EventScript_266504 - end - -BattleFrontier_ReceptionGate_EventScript_266568:: @ 8266568 - msgbox BattleFrontier_ReceptionGate_Text_26761C, 4 - goto BattleFrontier_ReceptionGate_EventScript_266504 - end - -BattleFrontier_ReceptionGate_EventScript_266576:: @ 8266576 - msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4 - release - end - -BattleFrontier_ReceptionGate_Text_266580: @ 8266580 - .string "Is it your first time here?\n" - .string "Please step this way!$" - -BattleFrontier_ReceptionGate_Text_2665B2: @ 82665B2 - .string "The front lines of POKéMON battling!\n" - .string "Welcome to the BATTLE FRONTIER!$" - -BattleFrontier_ReceptionGate_Text_2665F7: @ 82665F7 - .string "For a first-time visitor, we issue\n" - .string "the FRONTIER PASS.\p" - .string "It’s for use at all the facilities\n" - .string "in the BATTLE FRONTIER.\p" - .string "Here you are!$" - -BattleFrontier_ReceptionGate_Text_266676: @ 8266676 - .string "{PLAYER} obtained\n" - .string "the FRONTIER PASS.$" - -BattleFrontier_ReceptionGate_Text_266695: @ 8266695 - .string "{PLAYER} placed the TRAINER CARD\n" - .string "in the FRONTIER PASS.$" - -BattleFrontier_ReceptionGate_Text_2666C6: @ 82666C6 - .string "We hope you enjoy all that the BATTLE\n" - .string "FRONTIER has to offer!$" - -BattleFrontier_ReceptionGate_Text_266703: @ 8266703 - .string "???: Well, if it isn’t {PLAYER}{KUN}!\n" - .string "You came out here!$" - -BattleFrontier_ReceptionGate_Text_266733: @ 8266733 - .string "GUIDE: Oh! MR. SCOTT, sir!\n" - .string "Good day to you, sir!$" - -BattleFrontier_ReceptionGate_Text_266764: @ 8266764 - .string "SCOTT: It’s great to see you here,\n" - .string "it really is!\p" - .string "I hope you’ll take your time and\n" - .string "explore everywhere.\p" - .string "Naturally, I hope you’ll also experience\n" - .string "the pure essence of battling.\p" - .string "I also have my quarters here, so feel\n" - .string "free to visit if you have time.$" - -BattleFrontier_ReceptionGate_Text_266857: @ 8266857 - .string "I’m your guide to the various facilities\n" - .string "here in the BATTLE FRONTIER.$" - -BattleFrontier_ReceptionGate_Text_26689D: @ 826689D - .string "Which would you like to learn about?$" - -BattleFrontier_ReceptionGate_Text_2668C2: @ 82668C2 - .string "It is the gigantic tower considered\n" - .string "to be the BATTLE FRONTIER’s symbol.\p" - .string "There are four kinds of BATTLE ROOMS\n" - .string "in the tower for SINGLE, DOUBLE, MULTI,\l" - .string "and LINK MULTI BATTLES.$" - -BattleFrontier_ReceptionGate_Text_26696F: @ 826696F - .string "The BATTLE DOME is the large building\n" - .string "shaped like a huge egg.\p" - .string "Events named Battle Tourneys are held\n" - .string "in this facility.\p" - .string "The Battle Tourneys are offered in\n" - .string "two courses--for SINGLE and DOUBLE\l" - .string "BATTLES.$" - -BattleFrontier_ReceptionGate_Text_266A34: @ 8266A34 - .string "The BATTLE PALACE is the red building\n" - .string "on the right of the BATTLE FRONTIER.\p" - .string "There are two kinds of BATTLE HALLS\n" - .string "for SINGLE and DOUBLE BATTLES.$" - -BattleFrontier_ReceptionGate_Text_266AC2: @ 8266AC2 - .string "The BATTLE ARENA is the dojo-like\n" - .string "building at the center-right of\l" - .string "the BATTLE FRONTIER.\p" - .string "An event called the Set KO Tourney\n" - .string "takes place at the BATTLE ARENA.$" - -BattleFrontier_ReceptionGate_Text_266B5D: @ 8266B5D - .string "The BATTLE FACTORY is the large\n" - .string "building that is the closest to us.\p" - .string "An event called the Battle Swap\n" - .string "is conducted there.\p" - .string "The Battle Swap event is offered in\n" - .string "two courses for SINGLE and DOUBLE\l" - .string "BATTLES.$" - -BattleFrontier_ReceptionGate_Text_266C24: @ 8266C24 - .string "The BATTLE PIKE is the building shaped\n" - .string "like a POKéMON at the center-left of\l" - .string "the BATTLE FRONTIER.\p" - .string "An event called the Battle Choice\n" - .string "is conducted there.$" - -BattleFrontier_ReceptionGate_Text_266CBB: @ 8266CBB - .string "The BATTLE PYRAMID is the enormous\n" - .string "pyramid.\p" - .string "An event called the Battle Quest\n" - .string "is conducted there.$" - -BattleFrontier_ReceptionGate_Text_266D1C: @ 8266D1C - .string "The RANKING HALL is located near\n" - .string "the BATTLE TOWER.\p" - .string "There, you may see the most fantastic\n" - .string "records left by the TRAINERS that\l" - .string "took on the many challenges of\l" - .string "the BATTLE FRONTIER.$" - -BattleFrontier_ReceptionGate_Text_266DCB: @ 8266DCB - .string "The EXCHANGE SERVICE CORNER is near\n" - .string "the BATTLE TOWER.\p" - .string "The Battle Points you have earned in\n" - .string "the BATTLE FRONTIER may be exchanged\l" - .string "for fabulous prizes there.$" - -BattleFrontier_ReceptionGate_Text_266E66: @ 8266E66 - .string "I’m your guide to the basic rules that\n" - .string "are common to all the challenges\l" - .string "offered by the facilities in the BATTLE\l" - .string "FRONTIER.$" - -BattleFrontier_ReceptionGate_Text_266EE0: @ 8266EE0 - .string "What would you like to learn about?$" - -BattleFrontier_ReceptionGate_Text_266F04: @ 8266F04 - .string "All the challenges at the BATTLE\n" - .string "FRONTIER’s facilities come in\l" - .string "two courses--Level 50 and Open Level.$" - -BattleFrontier_ReceptionGate_Text_266F69: @ 8266F69 - .string "The Level 50 course is open to POKéMON\n" - .string "up to and including Level 50.\p" - .string "Please keep in mind, however, that\n" - .string "no TRAINER you face will have any\l" - .string "POKéMON below Level 50.\p" - .string "This course is the entry level for\n" - .string "battles at the BATTLE FRONTIER.\p" - .string "To begin, we hope you will challenge\n" - .string "this course.$" - -BattleFrontier_ReceptionGate_Text_267080: @ 8267080 - .string "The Open Level course places no limit\n" - .string "on the levels of POKéMON entering\l" - .string "challenges.\p" - .string "The levels of your opponents will\n" - .string "be adjusted to match the levels of\l" - .string "your POKéMON.\p" - .string "However, no TRAINER you face will\n" - .string "have any POKéMON below Level 60.$" - -BattleFrontier_ReceptionGate_Text_26716A: @ 826716A - .string "Virtually any kind of POKéMON may take\n" - .string "on the challenges at all facilities.\p" - .string "EGGS and certain kinds of POKéMON,\n" - .string "however, are not permitted.\p" - .string "The numbers of POKéMON required for\n" - .string "challenges will depend on the facility.\p" - .string "At all facilities, however, two or more\n" - .string "of the same kind of POKéMON are not\l" - .string "permitted.$" - -BattleFrontier_ReceptionGate_Text_267298: @ 8267298 - .string "When entering a challenge at a BATTLE\n" - .string "FRONTIER facility, POKéMON may not\l" - .string "be holding the same kind of item.\p" - .string "Please make sure that all POKéMON\n" - .string "entering a challenge are holding\l" - .string "different items.$" - -BattleFrontier_ReceptionGate_Text_267357: @ 8267357 - .string "I’m your guide to the FRONTIER PASS.$" - -BattleFrontier_ReceptionGate_Text_26737C: @ 826737C - .string "Which would you like to learn about?$" - -BattleFrontier_ReceptionGate_Text_2673A1: @ 82673A1 - .string "There are seven facilities at\n" - .string "the BATTLE FRONTIER.\p" - .string "TRAINERS who gain recognition for\n" - .string "their abilities may be rewarded with\l" - .string "symbols from each of the facilities.\p" - .string "To earn a symbol, TRAINERS may need\n" - .string "to defeat other TRAINERS in a row,\l" - .string "and may need to win events repeatedly.\p" - .string "It’s certainly not easy to win symbols.\n" - .string "I wish you the best of luck!$" - -BattleFrontier_ReceptionGate_Text_2674F3: @ 82674F3 - .string "It is possible to record one battle\n" - .string "on your FRONTIER PASS.\p" - .string "You may record a battle you had with\n" - .string "a friend or friends.\p" - .string "Or you may record a battle conducted\n" - .string "at the BATTLE FRONTIER excluding\l" - .string "matches at the BATTLE PIKE or\l" - .string "the BATTLE PYRAMID.\p" - .string "You may choose to record your match\n" - .string "at the end of a battle.$" - -BattleFrontier_ReceptionGate_Text_26761C: @ 826761C - .string "Battle Points are rewards given to\n" - .string "TRAINERS who battled outstandingly\l" - .string "at the BATTLE FRONTIER.\p" - .string "You may trade in your Battle Points\n" - .string "for prizes at the EXCHANGE SERVICE\l" - .string "CORNER.$" - diff --git a/data/scripts/maps/BattleFrontier_ScottsHouse.inc b/data/scripts/maps/BattleFrontier_ScottsHouse.inc deleted file mode 100644 index 5be72b9b5..000000000 --- a/data/scripts/maps/BattleFrontier_ScottsHouse.inc +++ /dev/null @@ -1,406 +0,0 @@ -BattleFrontier_ScottsHouse_MapScripts:: @ 82636A7 - .byte 0 - -BattleFrontier_ScottsHouse_EventScript_2636A8:: @ 82636A8 - lock - faceplayer - checkflag FLAG_0x004 - goto_eq BattleFrontier_ScottsHouse_EventScript_2637DA - checkflag FLAG_0x003 - goto_eq BattleFrontier_ScottsHouse_EventScript_2638AA - checkflag FLAG_0x002 - goto_eq BattleFrontier_ScottsHouse_EventScript_263939 - goto BattleFrontier_ScottsHouse_EventScript_2636CB - end - -BattleFrontier_ScottsHouse_EventScript_2636CB:: @ 82636CB - checkflag FLAG_0x1D1 - goto_if 0, BattleFrontier_ScottsHouse_EventScript_263943 - checkflag FLAG_0x05C - goto_if 0, BattleFrontier_ScottsHouse_EventScript_263704 - checkflag FLAG_0x1D2 - goto_if 0, BattleFrontier_ScottsHouse_EventScript_26376A - goto BattleFrontier_ScottsHouse_EventScript_2636EC - end - -BattleFrontier_ScottsHouse_EventScript_2636EC:: @ 82636EC - checkflag FLAG_0x0ED - goto_if 0, BattleFrontier_ScottsHouse_EventScript_26381B - checkflag FLAG_0x0EE - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2638B4 - goto BattleFrontier_ScottsHouse_EventScript_2637E4 - end - -BattleFrontier_ScottsHouse_EventScript_263704:: @ 8263704 - checkflag FLAG_SYS_TOWER_SILVER - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_DOME_SILVER - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_PALACE_SILVER - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_ARENA_SILVER - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_FACTORY_SILVER - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_PIKE_SILVER - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_PYRAMID_SILVER - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - msgbox BattleFrontier_ScottsHouse_Text_2640BC, 4 - giveitem_std ITEM_LANSAT_BERRY - compare VAR_RESULT, 0 - goto_eq BattleFrontier_ScottsHouse_EventScript_2637D0 - setflag FLAG_0x05C - setflag FLAG_0x004 - release - end - -BattleFrontier_ScottsHouse_EventScript_26376A:: @ 826376A - checkflag FLAG_SYS_TOWER_GOLD - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_DOME_GOLD - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_PALACE_GOLD - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_ARENA_GOLD - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_FACTORY_GOLD - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_PIKE_GOLD - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_PYRAMID_GOLD - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - msgbox BattleFrontier_ScottsHouse_Text_264216, 4 - giveitem_std ITEM_STARF_BERRY - compare VAR_RESULT, 0 - goto_eq BattleFrontier_ScottsHouse_EventScript_2637D0 - setflag FLAG_0x1D2 - setflag FLAG_0x004 - release - end - -BattleFrontier_ScottsHouse_EventScript_2637D0:: @ 82637D0 - msgbox BattleFrontier_ScottsHouse_Text_2643EB, 4 - release - end - -BattleFrontier_ScottsHouse_EventScript_2637DA:: @ 82637DA - msgbox BattleFrontier_ScottsHouse_Text_264373, 4 - release - end - -BattleFrontier_ScottsHouse_EventScript_2637E4:: @ 82637E4 - random 3 - compare VAR_RESULT, 1 - goto_eq BattleFrontier_ScottsHouse_EventScript_263807 - compare VAR_RESULT, 2 - goto_eq BattleFrontier_ScottsHouse_EventScript_263811 - msgbox BattleFrontier_ScottsHouse_Text_263DDD, 4 - release - end - -BattleFrontier_ScottsHouse_EventScript_263807:: @ 8263807 - msgbox BattleFrontier_ScottsHouse_Text_263F12, 4 - release - end - -BattleFrontier_ScottsHouse_EventScript_263811:: @ 8263811 - msgbox BattleFrontier_ScottsHouse_Text_263FFE, 4 - release - end - -BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B - setvar VAR_0x40CE, 0 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - special sub_8161F74 - compare VAR_RESULT, 50 - goto_if 4, BattleFrontier_ScottsHouse_EventScript_26387A - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 1 - special sub_81A1780 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - special sub_8161F74 - compare VAR_RESULT, 50 - goto_if 4, BattleFrontier_ScottsHouse_EventScript_26387A - goto BattleFrontier_ScottsHouse_EventScript_2637E4 - end - -BattleFrontier_ScottsHouse_EventScript_26387A:: @ 826387A - msgbox BattleFrontier_ScottsHouse_Text_264412, 4 - givedecoration_std 42 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_ScottsHouse_EventScript_2638A0 - setflag FLAG_0x0ED - setflag FLAG_0x003 - goto BattleFrontier_ScottsHouse_EventScript_2638AA - end - -BattleFrontier_ScottsHouse_EventScript_2638A0:: @ 82638A0 - msgbox BattleFrontier_ScottsHouse_Text_264583, 4 - release - end - -BattleFrontier_ScottsHouse_EventScript_2638AA:: @ 82638AA - msgbox BattleFrontier_ScottsHouse_Text_264546, 4 - release - end - -BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4 - setvar VAR_0x40CE, 0 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - special sub_8161F74 - compare VAR_RESULT, 100 - goto_if 4, BattleFrontier_ScottsHouse_EventScript_263913 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 1 - special sub_81A1780 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - special sub_8161F74 - compare VAR_RESULT, 100 - goto_if 4, BattleFrontier_ScottsHouse_EventScript_263913 - goto BattleFrontier_ScottsHouse_EventScript_2637E4 - end - -BattleFrontier_ScottsHouse_EventScript_263913:: @ 8263913 - msgbox BattleFrontier_ScottsHouse_Text_26449F, 4 - givedecoration_std 43 - compare VAR_RESULT, 0 - goto_eq BattleFrontier_ScottsHouse_EventScript_2638A0 - setflag FLAG_0x0EE - setflag FLAG_0x003 - goto BattleFrontier_ScottsHouse_EventScript_2638AA - end - -BattleFrontier_ScottsHouse_EventScript_263939:: @ 8263939 - msgbox BattleFrontier_ScottsHouse_Text_263DB8, 4 - release - end - -BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943 - msgbox BattleFrontier_ScottsHouse_Text_263A3F, 4 - closemessage - delay 30 - compare VAR_FACING, 2 - call_if 1, BattleFrontier_ScottsHouse_EventScript_263A13 - compare VAR_FACING, 1 - call_if 1, BattleFrontier_ScottsHouse_EventScript_263A1E - compare VAR_FACING, 4 - call_if 1, BattleFrontier_ScottsHouse_EventScript_263A29 - compare VAR_FACING, 3 - call_if 1, BattleFrontier_ScottsHouse_EventScript_263A34 - msgbox BattleFrontier_ScottsHouse_Text_263B29, 4 - applymovement 1, BattleFrontier_ScottsHouse_Movement_27259E - waitmovement 0 - msgbox BattleFrontier_ScottsHouse_Text_263BD4, 4 - compare VAR_0x40D1, 13 - goto_eq BattleFrontier_ScottsHouse_EventScript_2639BC - compare VAR_0x40D1, 9 - goto_if 4, BattleFrontier_ScottsHouse_EventScript_2639CB - compare VAR_0x40D1, 6 - goto_if 4, BattleFrontier_ScottsHouse_EventScript_2639DA - goto BattleFrontier_ScottsHouse_EventScript_2639E9 - end - -BattleFrontier_ScottsHouse_EventScript_2639BC:: @ 82639BC - buffernumberstring 0, 4 - setvar VAR_0x8004, 4 - goto BattleFrontier_ScottsHouse_EventScript_2639F8 - end - -BattleFrontier_ScottsHouse_EventScript_2639CB:: @ 82639CB - buffernumberstring 0, 3 - setvar VAR_0x8004, 3 - goto BattleFrontier_ScottsHouse_EventScript_2639F8 - end - -BattleFrontier_ScottsHouse_EventScript_2639DA:: @ 82639DA - buffernumberstring 0, 2 - setvar VAR_0x8004, 2 - goto BattleFrontier_ScottsHouse_EventScript_2639F8 - end - -BattleFrontier_ScottsHouse_EventScript_2639E9:: @ 82639E9 - buffernumberstring 0, 1 - setvar VAR_0x8004, 1 - goto BattleFrontier_ScottsHouse_EventScript_2639F8 - end - -BattleFrontier_ScottsHouse_EventScript_2639F8:: @ 82639F8 - special sub_813A9D0 - msgbox BattleFrontier_ScottsHouse_Text_263CB0, 9 - msgbox BattleFrontier_ScottsHouse_Text_263CD0, 4 - setflag FLAG_0x1D1 - setflag FLAG_0x002 - release - end - -BattleFrontier_ScottsHouse_EventScript_263A13:: @ 8263A13 - applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A6 - waitmovement 0 - return - -BattleFrontier_ScottsHouse_EventScript_263A1E:: @ 8263A1E - applymovement 1, BattleFrontier_ScottsHouse_Movement_2725AA - waitmovement 0 - return - -BattleFrontier_ScottsHouse_EventScript_263A29:: @ 8263A29 - applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A8 - waitmovement 0 - return - -BattleFrontier_ScottsHouse_EventScript_263A34:: @ 8263A34 - applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A4 - waitmovement 0 - return - -BattleFrontier_ScottsHouse_Text_263A3F: @ 8263A3F - .string "SCOTT: Well, hello and welcome!\n" - .string "Heheh… Sorry about the cramped space.\p" - .string "Anyway, {PLAYER}{KUN}, let me formally\n" - .string "welcome you to the BATTLE FRONTIER.\p" - .string "This is my dream come true.\n" - .string "It took me years and years, but I’ve\l" - .string "finally given shape to my dream.$" - -BattleFrontier_ScottsHouse_Text_263B29: @ 8263B29 - .string "On reflection, it was a terribly long\n" - .string "journey…\p" - .string "I left home alone on a quest to find\n" - .string "strong TRAINERS.\p" - .string "No one can imagine how much effort\n" - .string "or time it took to make this real.$" - -BattleFrontier_ScottsHouse_Text_263BD4: @ 8263BD4 - .string "But that’s all in the past.\n" - .string "No point dwelling on that!\p" - .string "All I want for you is to enjoy battling\n" - .string "to your heart’s content here.\p" - .string "{PLAYER}{KUN}, I want you to have this\n" - .string "as a memento for all the time our\l" - .string "paths crossed on our journeys.$" - -BattleFrontier_ScottsHouse_Text_263CB0: @ 8263CB0 - .string "{PLAYER} obtained\n" - .string "{STR_VAR_1} Battle Point(s).$" - -BattleFrontier_ScottsHouse_Text_263CD0: @ 8263CD0 - .string "SCOTT: You can check your Battle\n" - .string "Points on your FRONTIER PASS.\p" - .string "The more success you have here at\n" - .string "the BATTLE FRONTIER, the more Battle\l" - .string "Points you will collect.\p" - .string "Use your Battle Points the way you\n" - .string "see fit, like trading them for items.$" - -BattleFrontier_ScottsHouse_Text_263DB8: @ 8263DB8 - .string "I’m expecting great things from you!$" - -BattleFrontier_ScottsHouse_Text_263DDD: @ 8263DDD - .string "SCOTT: Every TRAINER is an individual.\n" - .string "They all lead lives of their own.\p" - .string "But when they’re in a battle,\n" - .string "it doesn’t matter who they are.\p" - .string "They’re all the same!\p" - .string "I love the purity of battle,\n" - .string "where everyone is equal.\p" - .string "That’s why I go everywhere seeking\n" - .string "TRAINERS who are serious about\l" - .string "battling, and invite them here.$" - -BattleFrontier_ScottsHouse_Text_263F12: @ 8263F12 - .string "SCOTT: Have you met any of\n" - .string "the FRONTIER BRAINS?\p" - .string "Better yet, have you obtained any\n" - .string "symbols from them?\p" - .string "I handpicked the FRONTIER BRAINS\n" - .string "as the toughest TRAINERS anywhere.\p" - .string "But I’m sure that seeing how tough\n" - .string "you are will startle even them!$" - -BattleFrontier_ScottsHouse_Text_263FFE: @ 8263FFE - .string "SCOTT: You don’t just train for battle,\n" - .string "right?\p" - .string "I think I remember you working on\n" - .string "a POKéDEX as well.\p" - .string "Well, guess what?\p" - .string "You may run into wild POKéMON in\n" - .string "the BATTLE FRONTIER somewhere…\l" - .string "Fufufu!$" - -BattleFrontier_ScottsHouse_Text_2640BC: @ 82640BC - .string "SCOTT: Are you enjoying things in\n" - .string "the BATTLE FRONTIER?\p" - .string "…Wait a second…\n" - .string "Oh!\p" - .string "Your FRONTIER PASS!\n" - .string "You’ve collected the full set\l" - .string "of silver symbols!\p" - .string "That’s more than impressive!\n" - .string "You are tough, just as I suspected!\p" - .string "Normally, I wouldn’t do something\n" - .string "like this, but this is a special time!\p" - .string "I want you to have this.\n" - .string "I’m sure you can put it to proper use.$" - -BattleFrontier_ScottsHouse_Text_264216: @ 8264216 - .string "SCOTT: I hope you’re enjoying\n" - .string "everything in the BATTLE FRONTIER.\p" - .string "…Wait a second…\n" - .string "Oh, my disbelieving eyes!\p" - .string "Your FRONTIER PASS!\n" - .string "You’ve gathered up the full set\l" - .string "of gold symbols!\p" - .string "That’s more than stupendous!\n" - .string "You’re incredible, just as I suspected!\p" - .string "… … … … … …\p" - .string "{PLAYER}, you’ve got to accept this!\p" - .string "I think you will be able to\n" - .string "appreciate the value of my gift!$" - -BattleFrontier_ScottsHouse_Text_264373: @ 8264373 - .string "I must say I have the gift of knowing\n" - .string "a good TRAINER when I see one.\p" - .string "I’m so glad I had the foresight to\n" - .string "bring you here!$" - -BattleFrontier_ScottsHouse_Text_2643EB: @ 82643EB - .string "Your BERRY POCKET seems to\n" - .string "be stuffed.$" - -BattleFrontier_ScottsHouse_Text_264412: @ 8264412 - .string "SCOTT: Oh, I heard about you!\n" - .string "How you ruled the BATTLE TOWER!\l" - .string "You beat over 50 TRAINERS in a row?\p" - .string "That’s fantastic!\n" - .string "I want you to have this!$" - -BattleFrontier_ScottsHouse_Text_26449F: @ 826449F - .string "SCOTT: Oh, my! I heard about you!\n" - .string "How you overwhelmed the BATTLE TOWER!\l" - .string "You beat over 100 TRAINERS in a row?\p" - .string "That’s ridiculously spectacular!\n" - .string "You’ve got to have this!$" - -BattleFrontier_ScottsHouse_Text_264546: @ 8264546 - .string "I’ll be expecting to hear even greater\n" - .string "things about you now!$" - -BattleFrontier_ScottsHouse_Text_264583: @ 8264583 - .string "Oops, well, if you have too much\n" - .string "stuff, come back for this later.$" - diff --git a/data/scripts/maps/BattlePyramidSquare01.inc b/data/scripts/maps/BattlePyramidSquare01.inc deleted file mode 100644 index c51e49ba7..000000000 --- a/data/scripts/maps/BattlePyramidSquare01.inc +++ /dev/null @@ -1 +0,0 @@ -BattlePyramidSquare01_MapScripts:: @ 823D1A5 diff --git a/data/scripts/maps/BattlePyramidSquare02.inc b/data/scripts/maps/BattlePyramidSquare02.inc deleted file mode 100644 index a694b03bf..000000000 --- a/data/scripts/maps/BattlePyramidSquare02.inc +++ /dev/null @@ -1 +0,0 @@ -BattlePyramidSquare02_MapScripts:: @ 823D1A5 diff --git a/data/scripts/maps/BattlePyramidSquare03.inc b/data/scripts/maps/BattlePyramidSquare03.inc deleted file mode 100644 index 229dd5a28..000000000 --- a/data/scripts/maps/BattlePyramidSquare03.inc +++ /dev/null @@ -1 +0,0 @@ -BattlePyramidSquare03_MapScripts:: @ 823D1A5 diff --git a/data/scripts/maps/BattlePyramidSquare04.inc b/data/scripts/maps/BattlePyramidSquare04.inc deleted file mode 100644 index a231965b5..000000000 --- a/data/scripts/maps/BattlePyramidSquare04.inc +++ /dev/null @@ -1 +0,0 @@ -BattlePyramidSquare04_MapScripts:: @ 823D1A5 diff --git a/data/scripts/maps/BattlePyramidSquare05.inc b/data/scripts/maps/BattlePyramidSquare05.inc deleted file mode 100644 index e4670f78c..000000000 --- a/data/scripts/maps/BattlePyramidSquare05.inc +++ /dev/null @@ -1 +0,0 @@ -BattlePyramidSquare05_MapScripts:: @ 823D1A5 diff --git a/data/scripts/maps/BattlePyramidSquare06.inc b/data/scripts/maps/BattlePyramidSquare06.inc deleted file mode 100644 index 6c0d38e41..000000000 --- a/data/scripts/maps/BattlePyramidSquare06.inc +++ /dev/null @@ -1 +0,0 @@ -BattlePyramidSquare06_MapScripts:: @ 823D1A5 diff --git a/data/scripts/maps/BattlePyramidSquare07.inc b/data/scripts/maps/BattlePyramidSquare07.inc deleted file mode 100644 index 8603a6916..000000000 --- a/data/scripts/maps/BattlePyramidSquare07.inc +++ /dev/null @@ -1 +0,0 @@ -BattlePyramidSquare07_MapScripts:: @ 823D1A5 diff --git a/data/scripts/maps/BattlePyramidSquare08.inc b/data/scripts/maps/BattlePyramidSquare08.inc deleted file mode 100644 index 68a055f0e..000000000 --- a/data/scripts/maps/BattlePyramidSquare08.inc +++ /dev/null @@ -1 +0,0 @@ -BattlePyramidSquare08_MapScripts:: @ 823D1A5 diff --git a/data/scripts/maps/BattlePyramidSquare09.inc b/data/scripts/maps/BattlePyramidSquare09.inc deleted file mode 100644 index e93734988..000000000 --- a/data/scripts/maps/BattlePyramidSquare09.inc +++ /dev/null @@ -1 +0,0 @@ -BattlePyramidSquare09_MapScripts:: @ 823D1A5 diff --git a/data/scripts/maps/BattlePyramidSquare10.inc b/data/scripts/maps/BattlePyramidSquare10.inc deleted file mode 100644 index 412e608e7..000000000 --- a/data/scripts/maps/BattlePyramidSquare10.inc +++ /dev/null @@ -1 +0,0 @@ -BattlePyramidSquare10_MapScripts:: @ 823D1A5 diff --git a/data/scripts/maps/BattlePyramidSquare11.inc b/data/scripts/maps/BattlePyramidSquare11.inc deleted file mode 100644 index 3b82fb925..000000000 --- a/data/scripts/maps/BattlePyramidSquare11.inc +++ /dev/null @@ -1 +0,0 @@ -BattlePyramidSquare11_MapScripts:: @ 823D1A5 diff --git a/data/scripts/maps/BattlePyramidSquare12.inc b/data/scripts/maps/BattlePyramidSquare12.inc deleted file mode 100644 index 87a38213b..000000000 --- a/data/scripts/maps/BattlePyramidSquare12.inc +++ /dev/null @@ -1 +0,0 @@ -BattlePyramidSquare12_MapScripts:: @ 823D1A5 diff --git a/data/scripts/maps/BattlePyramidSquare13.inc b/data/scripts/maps/BattlePyramidSquare13.inc deleted file mode 100644 index 188109305..000000000 --- a/data/scripts/maps/BattlePyramidSquare13.inc +++ /dev/null @@ -1 +0,0 @@ -BattlePyramidSquare13_MapScripts:: @ 823D1A5 diff --git a/data/scripts/maps/BattlePyramidSquare14.inc b/data/scripts/maps/BattlePyramidSquare14.inc deleted file mode 100644 index 5ae39cb8a..000000000 --- a/data/scripts/maps/BattlePyramidSquare14.inc +++ /dev/null @@ -1 +0,0 @@ -BattlePyramidSquare14_MapScripts:: @ 823D1A5 diff --git a/data/scripts/maps/BattlePyramidSquare15.inc b/data/scripts/maps/BattlePyramidSquare15.inc deleted file mode 100644 index f1b7782d7..000000000 --- a/data/scripts/maps/BattlePyramidSquare15.inc +++ /dev/null @@ -1 +0,0 @@ -BattlePyramidSquare15_MapScripts:: @ 823D1A5 diff --git a/data/scripts/maps/BattlePyramidSquare16.inc b/data/scripts/maps/BattlePyramidSquare16.inc deleted file mode 100644 index 9308930d1..000000000 --- a/data/scripts/maps/BattlePyramidSquare16.inc +++ /dev/null @@ -1,3 +0,0 @@ -BattlePyramidSquare16_MapScripts:: @ 823D1A5 - .byte 0 - diff --git a/data/scripts/maps/BirthIsland_Exterior.inc b/data/scripts/maps/BirthIsland_Exterior.inc deleted file mode 100644 index b2427e95d..000000000 --- a/data/scripts/maps/BirthIsland_Exterior.inc +++ /dev/null @@ -1,125 +0,0 @@ -BirthIsland_Exterior_MapScripts:: @ 8267F15 - map_script 3, BirthIsland_Exterior_MapScript1_267F29 - map_script 5, BirthIsland_Exterior_MapScript1_267F65 - map_script 7, BirthIsland_Exterior_MapScript1_267F25 - .byte 0 - -BirthIsland_Exterior_MapScript1_267F25: @ 8267F25 - special sub_813B1D0 - end - -BirthIsland_Exterior_MapScript1_267F29: @ 8267F29 - setflag FLAG_0x8D3 - setvar VAR_OBJ_GFX_ID_0, 100 - setvar VAR_0x4034, 0 - setvar VAR_0x4035, 0 - checkflag FLAG_0x1AD - call_if 1, BirthIsland_Exterior_EventScript_267F4E - checkflag FLAG_0x1AD - call_if 0, BirthIsland_Exterior_EventScript_267F55 - end - -BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E - setflag FLAG_0x2FB - setflag FLAG_0x2FC - return - -BirthIsland_Exterior_EventScript_267F55:: @ 8267F55 - checkflag FLAG_0x1AC - goto_eq BirthIsland_Exterior_EventScript_27374E - clearflag FLAG_0x2FC - clearflag FLAG_0x8D4 - return - -BirthIsland_Exterior_MapScript1_267F65: @ 8267F65 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, BirthIsland_Exterior_EventScript_267F6F - end - -BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 7 - goto_if 5, BirthIsland_Exterior_EventScript_27374E - removeobject 2 - return - -BirthIsland_Exterior_EventScript_267F83:: @ 8267F83 - lock - faceplayer - special sub_813AFC8 - waitstate - switch VAR_RESULT - case 0, BirthIsland_Exterior_EventScript_267FBB - case 1, BirthIsland_Exterior_EventScript_267FBD - case 2, BirthIsland_Exterior_EventScript_267FC1 - case 3, BirthIsland_Exterior_EventScript_267FBF - end - -BirthIsland_Exterior_EventScript_267FBB:: @ 8267FBB - release - end - -BirthIsland_Exterior_EventScript_267FBD:: @ 8267FBD - release - end - -BirthIsland_Exterior_EventScript_267FBF:: @ 8267FBF - release - end - -BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1 - waitse - setfieldeffectargument 0, 1 - setfieldeffectargument 1, 58 - setfieldeffectargument 2, 26 - dofieldeffect 65 - playbgm MUS_RG_DEOEYE, 0 - waitfieldeffect 65 - addobject 2 - applymovement 2, BirthIsland_Exterior_Movement_268054 - waitmovement 0 - waitse - playmoncry SPECIES_DEOXYS, 2 - delay 40 - waitmoncry - setvar VAR_LAST_TALKED, 2 - setvar VAR_0x8004, 410 - setvar VAR_0x8005, 30 - setvar VAR_0x8006, 0 - special CreateObedientEnemyMon - setflag FLAG_SYS_CTRL_OBJ_DELETE - special BattleSetup_StartLegendaryBattle - waitstate - clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 1 - goto_eq BirthIsland_Exterior_EventScript_26803B - compare VAR_RESULT, 4 - goto_eq BirthIsland_Exterior_EventScript_268049 - compare VAR_RESULT, 5 - goto_eq BirthIsland_Exterior_EventScript_268049 - setflag FLAG_0x1AD - release - end - -BirthIsland_Exterior_EventScript_26803B:: @ 826803B - setflag FLAG_0x1AC - setvar VAR_0x8004, 410 - goto BirthIsland_Exterior_EventScript_273776 - end - -BirthIsland_Exterior_EventScript_268049:: @ 8268049 - setvar VAR_0x8004, 410 - goto BirthIsland_Exterior_EventScript_273776 - end - -BirthIsland_Exterior_Movement_268054: @ 8268054 - 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/BirthIsland_Harbor.inc b/data/scripts/maps/BirthIsland_Harbor.inc deleted file mode 100644 index fe939172d..000000000 --- a/data/scripts/maps/BirthIsland_Harbor.inc +++ /dev/null @@ -1,27 +0,0 @@ -BirthIsland_Harbor_MapScripts:: @ 826805C - .byte 0 - -BirthIsland_Harbor_EventScript_26805D:: @ 826805D - lock - faceplayer - msgbox BirthIsland_Harbor_Text_2C6B90, 5 - compare VAR_RESULT, 0 - goto_eq BirthIsland_Harbor_EventScript_2680A2 - msgbox BirthIsland_Harbor_Text_2A6A5D, 4 - closemessage - applymovement VAR_LAST_TALKED, BirthIsland_Harbor_Movement_2725AA - waitmovement 0 - delay 30 - hideobjectat 1, MAP_BIRTH_ISLAND_HARBOR - setvar VAR_0x8004, 2 - call BirthIsland_Harbor_EventScript_272250 - warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 - waitstate - release - end - -BirthIsland_Harbor_EventScript_2680A2:: @ 82680A2 - msgbox BirthIsland_Harbor_Text_2A6A82, 4 - release - end - diff --git a/data/scripts/maps/CaveOfOrigin_1F.inc b/data/scripts/maps/CaveOfOrigin_1F.inc deleted file mode 100644 index 42c78d4b7..000000000 --- a/data/scripts/maps/CaveOfOrigin_1F.inc +++ /dev/null @@ -1,9 +0,0 @@ -CaveOfOrigin_1F_MapScripts:: @ 8235768 - map_script 3, CaveOfOrigin_1F_MapScript1_23576E - .byte 0 - -CaveOfOrigin_1F_MapScript1_23576E: @ 823576E - checkflag FLAG_0x071 - call_if 1, CaveOfOrigin_1F_EventScript_2722C1 - end - diff --git a/data/scripts/maps/CaveOfOrigin_B1F.inc b/data/scripts/maps/CaveOfOrigin_B1F.inc deleted file mode 100644 index 5ac3ec64a..000000000 --- a/data/scripts/maps/CaveOfOrigin_B1F.inc +++ /dev/null @@ -1,118 +0,0 @@ -CaveOfOrigin_B1F_MapScripts:: @ 82357A8 - .byte 0 - -CaveOfOrigin_B1F_EventScript_2357A9:: @ 82357A9 - lock - faceplayer - msgbox CaveOfOrigin_B1F_Text_23586E, 4 - closemessage - applymovement 1, CaveOfOrigin_B1F_Movement_2725A6 - waitmovement 0 - delay 60 - playse SE_PIN - applymovement 1, CaveOfOrigin_B1F_Movement_272598 - waitmovement 0 - applymovement 1, CaveOfOrigin_B1F_Movement_27259A - waitmovement 0 - delay 30 - applymovement 1, CaveOfOrigin_B1F_Movement_27259E - waitmovement 0 - message CaveOfOrigin_B1F_Text_235ACE - waitmessage - goto CaveOfOrigin_B1F_EventScript_2357F0 - -CaveOfOrigin_B1F_EventScript_2357F0:: @ 82357F0 - multichoice 0, 0, 110, 0 - switch VAR_RESULT - case 0, CaveOfOrigin_B1F_EventScript_23582C - case 1, CaveOfOrigin_B1F_EventScript_235837 - case 2, CaveOfOrigin_B1F_EventScript_23584D - case 3, CaveOfOrigin_B1F_EventScript_235842 - goto CaveOfOrigin_B1F_EventScript_235842 - end - -CaveOfOrigin_B1F_EventScript_23582C:: @ 823582C - message CaveOfOrigin_B1F_Text_235B23 - waitmessage - goto CaveOfOrigin_B1F_EventScript_2357F0 - -CaveOfOrigin_B1F_EventScript_235837:: @ 8235837 - message CaveOfOrigin_B1F_Text_235BBF - waitmessage - goto CaveOfOrigin_B1F_EventScript_2357F0 - -CaveOfOrigin_B1F_EventScript_235842:: @ 8235842 - message CaveOfOrigin_B1F_Text_235C99 - waitmessage - goto CaveOfOrigin_B1F_EventScript_2357F0 - -CaveOfOrigin_B1F_EventScript_23584D:: @ 823584D - msgbox CaveOfOrigin_B1F_Text_235CEE, 4 - closemessage - playse SE_KAIDAN - fadescreenspeed 1, 4 - setflag FLAG_0x137 - setvar VAR_0x405E, 3 - removeobject 1 - clearflag FLAG_0x357 - fadescreen 0 - release - end - -CaveOfOrigin_B1F_Text_23586E: @ 823586E - .string "Ah, so you are {PLAYER}{KUN}?\n" - .string "I’ve heard tales of your exploits.\p" - .string "My name is WALLACE.\p" - .string "I was once the GYM LEADER of\n" - .string "SOOTOPOLIS, but something came up.\p" - .string "So now, I’ve entrusted my mentor JUAN\n" - .string "with the GYM’s operation.\p" - .string "… … … … … …\n" - .string "… … … … … …\p" - .string "GROUDON and KYOGRE, the two POKéMON\n" - .string "wreaking havoc here, are considered\l" - .string "to be super-ancient POKéMON.\p" - .string "But there aren’t just two super-\n" - .string "ancient POKéMON.\p" - .string "There is one more somewhere.\p" - .string "Somewhere, there is a super-\n" - .string "ancient POKéMON named RAYQUAZA.\p" - .string "It’s said that it was RAYQUAZA that\n" - .string "becalmed the two combatants in\l" - .string "the distant past.\p" - .string "But even I have no clue as to\n" - .string "RAYQUAZA’s whereabouts…$" - -CaveOfOrigin_B1F_Text_235ACE: @ 8235ACE - .string "WALLACE: {PLAYER}{KUN}, do you perhaps\n" - .string "know where RAYQUAZA is now?\p" - .string "If you do, please tell me.$" - -CaveOfOrigin_B1F_Text_235B23: @ 8235B23 - .string "WALLACE: The CAVE OF ORIGIN?\p" - .string "But that’s right here!\n" - .string "I need you to do better than that!\p" - .string "Please, I need you to think about\n" - .string "where RAYQUAZA might be right now.$" - -CaveOfOrigin_B1F_Text_235BBF: @ 8235BBF - .string "WALLACE: MT. PYRE?\p" - .string "But when I met the old lady there\n" - .string "earlier, she made no mention of it.\p" - .string "I very much doubt that the old lady\n" - .string "would try to hide something from me…\p" - .string "{PLAYER}{KUN}, could you think about this\n" - .string "more carefully for me?$" - -CaveOfOrigin_B1F_Text_235C99: @ 8235C99 - .string "WALLACE: Huh? You don’t remember?\n" - .string "Hmm… That’s a problem…\p" - .string "Can’t you remember somehow?$" - -CaveOfOrigin_B1F_Text_235CEE: @ 8235CEE - .string "WALLACE: The SKY PILLAR?\p" - .string "That’s it!\n" - .string "It must be the SKY PILLAR!\p" - .string "{PLAYER}{KUN}, there’s not a moment to lose!\n" - .string "We’ll head to the SKY PILLAR right away!$" - diff --git a/data/scripts/maps/CaveOfOrigin_Entrance.inc b/data/scripts/maps/CaveOfOrigin_Entrance.inc deleted file mode 100644 index 1a771ae82..000000000 --- a/data/scripts/maps/CaveOfOrigin_Entrance.inc +++ /dev/null @@ -1,8 +0,0 @@ -CaveOfOrigin_Entrance_MapScripts:: @ 8235759 - map_script 5, CaveOfOrigin_Entrance_MapScript1_23575F - .byte 0 - -CaveOfOrigin_Entrance_MapScript1_23575F: @ 823575F - setescapewarp MAP_SOOTOPOLIS_CITY, 255, 31, 17 - end - diff --git a/data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap1.inc b/data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap1.inc deleted file mode 100644 index 4b4240833..000000000 --- a/data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap1.inc +++ /dev/null @@ -1,9 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap1_MapScripts:: @ 8235778 - map_script 3, CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E - .byte 0 - -CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E: @ 823577E - checkflag FLAG_0x071 - call_if 1, CaveOfOrigin_UnusedRubySapphireMap1_EventScript_2722C1 - end - diff --git a/data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap2.inc b/data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap2.inc deleted file mode 100644 index d73ff8231..000000000 --- a/data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap2.inc +++ /dev/null @@ -1,9 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap2_MapScripts:: @ 8235788 - map_script 3, CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E - .byte 0 - -CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E: @ 823578E - checkflag FLAG_0x071 - call_if 1, CaveOfOrigin_UnusedRubySapphireMap2_EventScript_2722C1 - end - diff --git a/data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap3.inc b/data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap3.inc deleted file mode 100644 index 7f4fb2ff1..000000000 --- a/data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap3.inc +++ /dev/null @@ -1,9 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap3_MapScripts:: @ 8235798 - map_script 3, CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E - .byte 0 - -CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E: @ 823579E - checkflag FLAG_0x071 - call_if 1, CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1 - end - diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc deleted file mode 100644 index 9137902f2..000000000 --- a/data/scripts/maps/DesertRuins.inc +++ /dev/null @@ -1,98 +0,0 @@ -DesertRuins_MapScripts:: @ 822D95B - map_script 5, DesertRuins_MapScript1_22D96B - map_script 1, DesertRuins_MapScript1_22D989 - map_script 3, DesertRuins_MapScript1_22D9CA - .byte 0 - -DesertRuins_MapScript1_22D96B: @ 822D96B - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, DesertRuins_EventScript_22D975 - end - -DesertRuins_EventScript_22D975:: @ 822D975 - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 7 - goto_if 5, DesertRuins_EventScript_27374E - removeobject VAR_LAST_TALKED - return - -DesertRuins_MapScript1_22D989: @ 822D989 - checkflag FLAG_SYS_BRAILLE_STRENGTH - call_if 0, DesertRuins_EventScript_22D993 - end - -DesertRuins_EventScript_22D993:: @ 822D993 - setmetatile 7, 19, 553, 1 - setmetatile 8, 19, 553, 1 - setmetatile 9, 19, 553, 1 - setmetatile 7, 20, 565, 1 - setmetatile 8, 20, 565, 1 - setmetatile 9, 20, 565, 1 - return - -DesertRuins_MapScript1_22D9CA: @ 822D9CA - setflag FLAG_LANDMARK_DESERT_RUINS - checkflag FLAG_0x1BB - call_if 0, DesertRuins_EventScript_22D9D7 - end - -DesertRuins_EventScript_22D9D7:: @ 822D9D7 - clearflag FLAG_0x3A7 - return - -DesertRuins_EventScript_22D9DB:: @ 822D9DB - lockall - checkflag FLAG_SYS_BRAILLE_STRENGTH - goto_eq DesertRuins_EventScript_22D9EE - braillemessage DesertRuins_Braille_2A6CA0 - waitbuttonpress - hidebox2 - releaseall - end - -DesertRuins_EventScript_22D9EE:: @ 822D9EE - msgbox gUnknown_0827304E, 4 - releaseall - end - -DesertRuins_EventScript_22D9F8:: @ 822D9F8 - lockall - braillemessage DesertRuins_Braille_2A6CA0 - waitbuttonpress - hidebox2 - releaseall - end - -DesertRuins_EventScript_22DA02:: @ 822DA02 - lock - faceplayer - waitse - playmoncry SPECIES_REGIROCK, 2 - delay 40 - waitmoncry - setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE - setflag FLAG_SYS_CTRL_OBJ_DELETE - special StartRegiBattle - waitstate - clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 1 - goto_eq DesertRuins_EventScript_22DA49 - compare VAR_RESULT, 4 - goto_eq DesertRuins_EventScript_22DA52 - compare VAR_RESULT, 5 - goto_eq DesertRuins_EventScript_22DA52 - setflag FLAG_0x1BB - release - end - -DesertRuins_EventScript_22DA49:: @ 822DA49 - setflag FLAG_0x1BB - goto DesertRuins_EventScript_27376D - end - -DesertRuins_EventScript_22DA52:: @ 822DA52 - setvar VAR_0x8004, 401 - goto DesertRuins_EventScript_273776 - end - diff --git a/data/scripts/maps/DesertUnderpass.inc b/data/scripts/maps/DesertUnderpass.inc deleted file mode 100644 index 486bd2577..000000000 --- a/data/scripts/maps/DesertUnderpass.inc +++ /dev/null @@ -1,36 +0,0 @@ -DesertUnderpass_MapScripts:: @ 823AF37 - map_script 3, DesertUnderpass_MapScript1_23AF3D - .byte 0 - -DesertUnderpass_MapScript1_23AF3D: @ 823AF3D - setflag FLAG_LANDMARK_DESERT_UNDERPASS - end - -DesertUnderpass_EventScript_23AF41:: @ 823AF41 - lock - faceplayer - checkflag FLAG_0x14F - goto_eq DesertUnderpass_EventScript_23AF57 - checkflag FLAG_0x150 - goto_eq DesertUnderpass_EventScript_23AF68 - release - end - -DesertUnderpass_EventScript_23AF57:: @ 823AF57 - giveitem_std ITEM_CLAW_FOSSIL - removeobject 1 - release - end - -DesertUnderpass_EventScript_23AF68:: @ 823AF68 - giveitem_std ITEM_ROOT_FOSSIL - removeobject 1 - release - end - -DesertUnderpass_Text_23AF79:: @ 823AF79 - .string "{PLAYER} found the ROOT FOSSIL.$" - -DesertUnderpass_Text_23AF93:: @ 823AF93 - .string "{PLAYER} found the CLAW FOSSIL.$" - diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc deleted file mode 100644 index 157c1f4d5..000000000 --- a/data/scripts/maps/DewfordTown.inc +++ /dev/null @@ -1,805 +0,0 @@ -DewfordTown_MapScripts:: @ 81E9507 - map_script 3, DewfordTown_MapScript1_1E950D - .byte 0 - -DewfordTown_MapScript1_1E950D: @ 81E950D - setflag FLAG_VISITED_DEWFORD_TOWN - end - -DewfordTown_EventScript_1E9511:: @ 81E9511 - lock - faceplayer - checkflag FLAG_0x0BD - goto_if 0, DewfordTown_EventScript_1E9585 - message DewfordTown_Text_1E9C8A - waitmessage - multichoicedefault 21, 6, 0, 2, 0 - switch VAR_RESULT - case 0, DewfordTown_EventScript_1E955A - case 1, DewfordTown_EventScript_1E956A - case 2, DewfordTown_EventScript_1E957A - case 127, DewfordTown_EventScript_1E957A - end - -DewfordTown_EventScript_1E955A:: @ 81E955A - msgbox DewfordTown_Text_1E9CE5, 4 - closemessage - goto DewfordTown_EventScript_1E9660 - release - end - -DewfordTown_EventScript_1E956A:: @ 81E956A - msgbox DewfordTown_Text_1E9D3A, 4 - closemessage - goto DewfordTown_EventScript_1E96E7 - release - end - -DewfordTown_EventScript_1E957A:: @ 81E957A - msgbox DewfordTown_Text_1E9D8F, 4 - closemessage - release - end - -DewfordTown_EventScript_1E9585:: @ 81E9585 - msgbox DewfordTown_Text_1E9B24, 5 - compare VAR_RESULT, 1 - goto_eq DewfordTown_EventScript_1E95A2 - msgbox DewfordTown_Text_1E9BD9, 4 - release - end - -DewfordTown_EventScript_1E95A2:: @ 81E95A2 - msgbox DewfordTown_Text_1E9B7F, 4 - closemessage - goto DewfordTown_EventScript_1E9660 - end - -DewfordTown_EventScript_1E95B1:: @ 81E95B1 - msgbox DewfordTown_Text_1E99A8, 2 - end - -DewfordTown_EventScript_1E95BA:: @ 81E95BA - msgbox DewfordTown_Text_1E9A0F, 3 - end - -DewfordTown_EventScript_1E95C3:: @ 81E95C3 - msgbox DewfordTown_Text_1E9A3D, 3 - end - -DewfordTown_EventScript_1E95CC:: @ 81E95CC - msgbox DewfordTown_Text_1E9A7F, 3 - end - -DewfordTown_EventScript_1E95D5:: @ 81E95D5 - lock - faceplayer - checkflag FLAG_0x101 - goto_eq DewfordTown_EventScript_1E962A - msgbox DewfordTown_Text_1E9DD1, 5 - compare VAR_RESULT, 1 - goto_eq DewfordTown_EventScript_1E95FF - compare VAR_RESULT, 0 - goto_eq DewfordTown_EventScript_1E9620 - end - -DewfordTown_EventScript_1E95FF:: @ 81E95FF - msgbox DewfordTown_Text_1E9E14, 4 - giveitem_std ITEM_OLD_ROD - setflag FLAG_0x101 - msgbox DewfordTown_Text_1E9E65, 4 - release - end - -DewfordTown_EventScript_1E9620:: @ 81E9620 - msgbox DewfordTown_Text_1E9F92, 4 - release - end - -DewfordTown_EventScript_1E962A:: @ 81E962A - message DewfordTown_Text_1E9FB8 - waitmessage - multichoice 20, 8, 50, 1 - compare VAR_RESULT, 0 - goto_eq DewfordTown_EventScript_1E964C - compare VAR_RESULT, 1 - goto_eq DewfordTown_EventScript_1E9656 - end - -DewfordTown_EventScript_1E964C:: @ 81E964C - msgbox DewfordTown_Text_1E9FD0, 4 - release - end - -DewfordTown_EventScript_1E9656:: @ 81E9656 - msgbox DewfordTown_Text_1EA004, 4 - release - end - -DewfordTown_EventScript_1E9660:: @ 81E9660 - call DewfordTown_EventScript_271E95 - 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, MAP_DEWFORD_TOWN - call DewfordTown_EventScript_2720A0 - applymovement 4, DewfordTown_Movement_1E97A2 - applymovement 255, DewfordTown_Movement_1E97A2 - waitmovement 0 - showobjectat 255, MAP_ROUTE104 - call DewfordTown_EventScript_2720A8 - applymovement 255, DewfordTown_Movement_1E9914 - waitmovement 0 - showobjectat 255, MAP_ROUTE104 - clearflag FLAG_0x2E3 - clearflag FLAG_0x371 - clearflag FLAG_0x2E6 - setflag FLAG_0x2E7 - hideobjectat 4, MAP_DEWFORD_TOWN - setvar VAR_0x408E, 2 - resetobjectpriority 255, MAP_DEWFORD_TOWN - warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 - copyvar VAR_0x4096, VAR_0x8008 - waitstate - release - end - -DewfordTown_EventScript_1E96E7:: @ 81E96E7 - call DewfordTown_EventScript_271E95 - 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, 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, MAP_ROUTE109 - applymovement 255, DewfordTown_Movement_1E9918 - waitmovement 0 - setobjectxyperm 2, 21, 26 - addobject 2 - 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, 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, MAP_DEWFORD_TOWN - resetobjectpriority 2, MAP_ROUTE109 - moveobjectoffscreen 2 - release - end - -DewfordTown_EventScript_1E9790:: @ 81E9790 - msgbox DewfordTown_Text_1EEC1D, 4 - return - -DewfordTown_EventScript_1E9799:: @ 81E9799 - msgbox DewfordTown_Text_1EEDA7, 4 - return - -DewfordTown_Movement_1E97A2: @ 81E97A2 - 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 - 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 - walk_right - walk_up - step_end - -DewfordTown_Movement_1E9914: @ 81E9914 - walk_up - walk_up - walk_up - step_end - -DewfordTown_Movement_1E9918: @ 81E9918 - walk_up - walk_up - walk_up - walk_in_place_fastest_down - step_end - -DewfordTown_Movement_1E991D: @ 81E991D - walk_up - step_end - -DewfordTown_Movement_1E991F: @ 81E991F - walk_up - walk_up - step_end - -DewfordTown_EventScript_1E9922:: @ 81E9922 - lock - faceplayer - call DewfordTown_EventScript_271E8B - msgbox DewfordTown_Text_1EA136, 5 - compare VAR_RESULT, 1 - goto_eq DewfordTown_EventScript_1E9948 - compare VAR_RESULT, 0 - goto_eq DewfordTown_EventScript_1E9952 - end - -DewfordTown_EventScript_1E9948:: @ 81E9948 - msgbox DewfordTown_Text_1EA491, 4 - release - end - -DewfordTown_EventScript_1E9952:: @ 81E9952 - msgbox DewfordTown_Text_1EA242, 4 - setvar VAR_0x8004, 9 - call DewfordTown_EventScript_271E7C - lock - faceplayer - compare VAR_RESULT, 1 - goto_eq DewfordTown_EventScript_1E997D - compare VAR_RESULT, 0 - goto_eq DewfordTown_EventScript_1E9994 - end - -DewfordTown_EventScript_1E997D:: @ 81E997D - incrementgamestat 2 - compare VAR_0x8004, 0 - goto_eq DewfordTown_EventScript_1E999E - msgbox DewfordTown_Text_1EA2AA, 4 - release - end - -DewfordTown_EventScript_1E9994:: @ 81E9994 - msgbox DewfordTown_Text_1EA443, 4 - release - end - -DewfordTown_EventScript_1E999E:: @ 81E999E - msgbox DewfordTown_Text_1EA3FE, 4 - release - end - -DewfordTown_Text_1E99A8: @ 81E99A8 - .string "DEWFORD is a tiny island community.\n" - .string "If something gets trendy here,\l" - .string "everyone picks up on it right away.$" - -DewfordTown_Text_1E9A0F: @ 81E9A0F - .string "DEWFORD TOWN\n" - .string "“A tiny island in the blue sea.â€$" - -DewfordTown_Text_1E9A3D: @ 81E9A3D - .string "DEWFORD TOWN POKéMON GYM\n" - .string "LEADER: BRAWLY\l" - .string "“A big wave in fighting!â€$" - -DewfordTown_Text_1E9A7F: @ 81E9A7F - .string "DEWFORD HALL\n" - .string "“Everyone’s information exchange!â€$" - -Route104_Text_1E9AAF: @ 81E9AAF - .string "MR. BRINEY: Ahoy!\n" - .string "We’ve hit land in DEWFORD.\p" - .string "I suppose you’re off to deliver that\n" - .string "LETTER to, who was it now, STEVEN!$" - -DewfordTown_Text_1E9B24: @ 81E9B24 - .string "MR. BRINEY: Have you delivered your\n" - .string "LETTER?\p" - .string "Or were you meaning to sail back to\n" - .string "PETALBURG?$" - -DewfordTown_Text_1E9B7F: @ 81E9B7F - .string "MR. BRINEY: PETALBURG it is, then!\p" - .string "Anchors aweigh!\n" - .string "PEEKO, we’re setting sail, my darling!$" - -DewfordTown_Text_1E9BD9: @ 81E9BD9 - .string "MR. BRINEY: Then you go on and deliver\n" - .string "the LETTER. I’ll be waiting.$" - -Route104_Text_1E9C1D: @ 81E9C1D -Route109_Text_1E9C1D: @ 81E9C1D - .string "MR. BRINEY: Ahoy!\n" - .string "We’ve hit land in DEWFORD!\p" - .string "You just go on and tell me whenever\n" - .string "you want to set sail again!$" - -DewfordTown_Text_1E9C8A: @ 81E9C8A - .string "MR. BRINEY: Ahoy!\n" - .string "For you, I’ll go out to sea anytime!\p" - .string "Now, my friend, where are we bound?$" - -DewfordTown_Text_1E9CE5: @ 81E9CE5 - .string "MR. BRINEY: PETALBURG, is it?\p" - .string "Anchors aweigh!\n" - .string "PEEKO, we’re setting sail, my darling!$" - -DewfordTown_Text_1E9D3A: @ 81E9D3A - .string "MR. BRINEY: SLATEPORT, is it?\p" - .string "Anchors aweigh!\n" - .string "PEEKO, we’re setting sail, my darling!$" - -DewfordTown_Text_1E9D8F: @ 81E9D8F - .string "MR. BRINEY: You just tell me whenever\n" - .string "you need to set sail again!$" - -DewfordTown_Text_1E9DD1: @ 81E9DD1 - .string "This is a renowned fishing spot.\n" - .string "Are you getting the itch to fish?$" - -DewfordTown_Text_1E9E14: @ 81E9E14 - .string "I hear you, and I like what\n" - .string "you’re saying!\p" - .string "I’ll give you one of my fishing RODS.$" - -DewfordTown_Text_1E9E65: @ 81E9E65 - .string "And, as an added bonus, I’ll even throw\n" - .string "in a little fishing advice!\p" - .string "First, you want to face the water,\n" - .string "then use the ROD.\p" - .string "Focus your mind…\n" - .string "If you get a bite, pull on the ROD.\p" - .string "Sometimes you can snag something\n" - .string "immediately, but with bigger catches,\l" - .string "you need to time the pulls on your ROD\l" - .string "to haul them in.$" - -DewfordTown_Text_1E9F92: @ 81E9F92 - .string "Oh, is that so?\n" - .string "That’s too bad, then.$" - -DewfordTown_Text_1E9FB8: @ 81E9FB8 - .string "Yo!\n" - .string "How’s your fishing?$" - -DewfordTown_Text_1E9FD0: @ 81E9FD0 - .string "Is that right! That’s great!\n" - .string "Haul in some big ones!$" - -DewfordTown_Text_1EA004: @ 81EA004 - .string "Oh, hey, don’t get down on yourself!\n" - .string "I’ll give you a little fishing advice.\p" - .string "First, you want to face the water,\n" - .string "then use the ROD.\p" - .string "Focus your mind…\n" - .string "If you get a bite, pull the ROD.\p" - .string "Sometimes you can snag something\n" - .string "immediately, but with bigger catches,\l" - .string "you need to time the pulls on your ROD\l" - .string "to haul them in.$" - -DewfordTown_Text_1EA136: @ 81EA136 - .string "I like what’s hip, happening, and trendy.\n" - .string "I’m always checking it out.\p" - .string "Listen, have you heard about this new\n" - .string "“{STR_VAR_1}â€?\p" - .string "That’s right!\n" - .string "Of course you know!\p" - .string "I mean, sheesh,\n" - .string "“{STR_VAR_1}â€â€¦\l" - .string "It’s the hottest thing in cool!\p" - .string "Wherever you’re from,\n" - .string "“{STR_VAR_1}â€\l" - .string "is the biggest happening thing, right?$" - -DewfordTown_Text_1EA242: @ 81EA242 - .string "Hunh?\n" - .string "It’s not the hip and happening thing?\p" - .string "Well, hey, you have to tell me,\n" - .string "what’s new and what’s “inâ€?$" - -DewfordTown_Text_1EA2AA: @ 81EA2AA - .string "Hunh?\n" - .string "“{STR_VAR_2}â€?\p" - .string "… …\p" - .string "…Uh… Yeah! That’s right!\n" - .string "Yeah, I knew that! Knew it all along!\p" - .string "Of course I know about that!\n" - .string "“{STR_VAR_2},†right?\p" - .string "Yeah, that’s it, it’s there!\n" - .string "Isn’t “{STR_VAR_2}â€\l" - .string "the coolest, or what?\p" - .string "It’s the hippest thing in hip.\n" - .string "You think I’d not know about it?\p" - .string "“{STR_VAR_1}â€â€¦\n" - .string "It’s, like, so five minutes ago.\p" - .string "Now, “{STR_VAR_2}†is\n" - .string "what’s vital and in tune with the times!$" - -DewfordTown_Text_1EA3FE: @ 81EA3FE - .string "Hmm…\n" - .string "“{STR_VAR_2},†huh?\p" - .string "But personally, I think\n" - .string "“{STR_VAR_1}â€\l" - .string "is what’s real in cool.$" - -DewfordTown_Text_1EA443: @ 81EA443 - .string "Well, if you hear of any happening new\n" - .string "trends, come share them with me, okay?$" - -DewfordTown_Text_1EA491: @ 81EA491 - .string "Yeah, absolutely right!\p" - .string "“{STR_VAR_1}†is the\n" - .string "definition of “in†right now.$" diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc deleted file mode 100644 index 6acd67792..000000000 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ /dev/null @@ -1,491 +0,0 @@ -DewfordTown_Gym_MapScripts:: @ 81FC63C - map_script 3, DewfordTown_Gym_MapScript1_1FC642 - .byte 0 - -DewfordTown_Gym_MapScript1_1FC642: @ 81FC642 - call DewfordTown_Gym_EventScript_1FC648 - end - -DewfordTown_Gym_EventScript_1FC648:: @ 81FC648 - checktrainerflag TRAINER_BRAWLY_1 - goto_eq DewfordTown_Gym_EventScript_1FC6A2 - call DewfordTown_Gym_EventScript_1FC768 - copyvar VAR_0x8001, VAR_0x8000 - compare VAR_0x8000, 0 - goto_eq DewfordTown_Gym_EventScript_1FC6BE - compare VAR_0x8000, 1 - goto_eq DewfordTown_Gym_EventScript_1FC6BA - compare VAR_0x8000, 2 - goto_eq DewfordTown_Gym_EventScript_1FC6B6 - compare VAR_0x8000, 3 - goto_eq DewfordTown_Gym_EventScript_1FC6B2 - compare VAR_0x8000, 4 - goto_eq DewfordTown_Gym_EventScript_1FC6AE - compare VAR_0x8000, 5 - goto_eq DewfordTown_Gym_EventScript_1FC6AA - goto DewfordTown_Gym_EventScript_1FC6A6 - -DewfordTown_Gym_EventScript_1FC6A2:: @ 81FC6A2 - setflashradius 0 - return - -DewfordTown_Gym_EventScript_1FC6A6:: @ 81FC6A6 - setflashradius 1 - return - -DewfordTown_Gym_EventScript_1FC6AA:: @ 81FC6AA - setflashradius 2 - return - -DewfordTown_Gym_EventScript_1FC6AE:: @ 81FC6AE - setflashradius 3 - return - -DewfordTown_Gym_EventScript_1FC6B2:: @ 81FC6B2 - setflashradius 4 - return - -DewfordTown_Gym_EventScript_1FC6B6:: @ 81FC6B6 - setflashradius 5 - return - -DewfordTown_Gym_EventScript_1FC6BA:: @ 81FC6BA - setflashradius 6 - return - -DewfordTown_Gym_EventScript_1FC6BE:: @ 81FC6BE - setflashradius 7 - return - -DewfordTown_Gym_EventScript_1FC6C2:: @ 81FC6C2 - call DewfordTown_Gym_EventScript_1FC768 - nop1 - compare VAR_0x8000, VAR_0x8001 - goto_eq DewfordTown_Gym_EventScript_1FC71A - copyvar VAR_0x8001, VAR_0x8000 - compare VAR_0x8000, 1 - goto_eq DewfordTown_Gym_EventScript_1FC71B - compare VAR_0x8000, 2 - goto_eq DewfordTown_Gym_EventScript_1FC726 - compare VAR_0x8000, 3 - goto_eq DewfordTown_Gym_EventScript_1FC731 - compare VAR_0x8000, 4 - goto_eq DewfordTown_Gym_EventScript_1FC73C - compare VAR_0x8000, 5 - goto_eq DewfordTown_Gym_EventScript_1FC747 - compare VAR_0x8000, 6 - goto_eq DewfordTown_Gym_EventScript_1FC752 - -DewfordTown_Gym_EventScript_1FC71A:: @ 81FC71A - return - -DewfordTown_Gym_EventScript_1FC71B:: @ 81FC71B - playse SE_MU_PACHI - animateflash 6 - call DewfordTown_Gym_EventScript_1FC648 - return - -DewfordTown_Gym_EventScript_1FC726:: @ 81FC726 - playse SE_MU_PACHI - animateflash 5 - call DewfordTown_Gym_EventScript_1FC648 - return - -DewfordTown_Gym_EventScript_1FC731:: @ 81FC731 - playse SE_MU_PACHI - animateflash 4 - call DewfordTown_Gym_EventScript_1FC648 - return - -DewfordTown_Gym_EventScript_1FC73C:: @ 81FC73C - playse SE_MU_PACHI - animateflash 3 - call DewfordTown_Gym_EventScript_1FC648 - return - -DewfordTown_Gym_EventScript_1FC747:: @ 81FC747 - playse SE_MU_PACHI - animateflash 2 - call DewfordTown_Gym_EventScript_1FC648 - return - -DewfordTown_Gym_EventScript_1FC752:: @ 81FC752 - playse SE_MU_PACHI - animateflash 1 - call DewfordTown_Gym_EventScript_1FC648 - return - -DewfordTown_Gym_EventScript_1FC75D:: @ 81FC75D - playse SE_MU_PACHI - animateflash 0 - call DewfordTown_Gym_EventScript_1FC648 - return - -DewfordTown_Gym_EventScript_1FC768:: @ 81FC768 - setvar VAR_0x8000, 0 - checktrainerflag TRAINER_TAKAO - goto_if 0, DewfordTown_Gym_EventScript_1FC77B - addvar VAR_0x8000, 1 - -DewfordTown_Gym_EventScript_1FC77B:: @ 81FC77B - checktrainerflag TRAINER_JOCELYN - goto_if 0, DewfordTown_Gym_EventScript_1FC789 - addvar VAR_0x8000, 1 - -DewfordTown_Gym_EventScript_1FC789:: @ 81FC789 - checktrainerflag TRAINER_LAURA - goto_if 0, DewfordTown_Gym_EventScript_1FC797 - addvar VAR_0x8000, 1 - -DewfordTown_Gym_EventScript_1FC797:: @ 81FC797 - checktrainerflag TRAINER_BRENDEN - goto_if 0, DewfordTown_Gym_EventScript_1FC7A5 - addvar VAR_0x8000, 1 - -DewfordTown_Gym_EventScript_1FC7A5:: @ 81FC7A5 - checktrainerflag TRAINER_CRISTIAN - goto_if 0, DewfordTown_Gym_EventScript_1FC7B3 - addvar VAR_0x8000, 1 - -DewfordTown_Gym_EventScript_1FC7B3:: @ 81FC7B3 - checktrainerflag TRAINER_LILITH - goto_if 0, DewfordTown_Gym_EventScript_1FC7C1 - addvar VAR_0x8000, 1 - -DewfordTown_Gym_EventScript_1FC7C1:: @ 81FC7C1 - return - -DewfordTown_Gym_EventScript_1FC7C2:: @ 81FC7C2 - trainerbattle 1, TRAINER_BRAWLY_1, 0, DewfordTown_Gym_Text_1FCF44, DewfordTown_Gym_Text_1FD008, DewfordTown_Gym_EventScript_1FC7F7 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq DewfordTown_Gym_EventScript_1FC89C - checkflag FLAG_0x0A6 - goto_if 0, DewfordTown_Gym_EventScript_1FC878 - msgbox DewfordTown_Gym_Text_1FD20D, 4 - release - end - -DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 - call DewfordTown_Gym_EventScript_1FC75D - message DewfordTown_Gym_Text_1FD07D - waitmessage - call DewfordTown_Gym_EventScript_27207E - msgbox DewfordTown_Gym_Text_1FD0A8, 4 - setflag FLAG_0x4F1 - setflag FLAG_BADGE02_GET - addvar VAR_0x4085, 1 - compare VAR_0x4085, 6 - call_if 1, DewfordTown_Gym_EventScript_271E84 - setvar VAR_0x8008, 2 - call DewfordTown_Gym_EventScript_271F43 - call DewfordTown_Gym_EventScript_1FC855 - closemessage - delay 30 - playfanfare MUS_ME_TORE_EYE - msgbox DewfordTown_Gym_Text_1FD1E0, 4 - waitfanfare - closemessage - delay 30 - setflag FLAG_0x1D4 - setvar VAR_0x40F4, 0 - setflag FLAG_0x080 - release - end - -DewfordTown_Gym_EventScript_1FC855:: @ 81FC855 - giveitem_std ITEM_TM08 - compare VAR_RESULT, 0 - goto_eq DewfordTown_Gym_EventScript_27205E - msgbox DewfordTown_Gym_Text_1FD181, 4 - setflag FLAG_0x0A6 - return - -DewfordTown_Gym_EventScript_1FC878:: @ 81FC878 - giveitem_std ITEM_TM08 - compare VAR_RESULT, 0 - goto_eq DewfordTown_Gym_EventScript_272054 - msgbox DewfordTown_Gym_Text_1FD181, 4 - setflag FLAG_0x0A6 - release - end - -DewfordTown_Gym_EventScript_1FC89C:: @ 81FC89C - trainerbattle 7, TRAINER_BRAWLY_1, 0, DewfordTown_Gym_Text_1FD2C4, DewfordTown_Gym_Text_1FD367, DewfordTown_Gym_Text_1FD3DE - msgbox DewfordTown_Gym_Text_1FD37B, 6 - end - -DewfordTown_Gym_EventScript_1FC8B7:: @ 81FC8B7 - trainerbattle 2, TRAINER_TAKAO, 0, DewfordTown_Gym_Text_1FCB9F, DewfordTown_Gym_Text_1FCBB8, DewfordTown_Gym_EventScript_1FC8D2 - msgbox DewfordTown_Gym_Text_1FCBCA, 6 - end - -DewfordTown_Gym_EventScript_1FC8D2:: @ 81FC8D2 - call DewfordTown_Gym_EventScript_1FC6C2 - release - end - -DewfordTown_Gym_EventScript_1FC8D9:: @ 81FC8D9 - trainerbattle 2, TRAINER_JOCELYN, 0, DewfordTown_Gym_Text_1FCC0A, DewfordTown_Gym_Text_1FCC45, DewfordTown_Gym_EventScript_1FC8F4 - msgbox DewfordTown_Gym_Text_1FCC6B, 6 - end - -DewfordTown_Gym_EventScript_1FC8F4:: @ 81FC8F4 - call DewfordTown_Gym_EventScript_1FC6C2 - release - end - -DewfordTown_Gym_EventScript_1FC8FB:: @ 81FC8FB - trainerbattle 2, TRAINER_LAURA, 0, DewfordTown_Gym_Text_1FCD01, DewfordTown_Gym_Text_1FCD3C, DewfordTown_Gym_EventScript_1FC916 - msgbox DewfordTown_Gym_Text_1FCD4F, 6 - end - -DewfordTown_Gym_EventScript_1FC916:: @ 81FC916 - call DewfordTown_Gym_EventScript_1FC6C2 - release - end - -DewfordTown_Gym_EventScript_1FC91D:: @ 81FC91D - trainerbattle 2, TRAINER_BRENDEN, 0, DewfordTown_Gym_Text_1FCE48, DewfordTown_Gym_Text_1FCE75, DewfordTown_Gym_EventScript_1FC938 - msgbox DewfordTown_Gym_Text_1FCEAB, 6 - end - -DewfordTown_Gym_EventScript_1FC938:: @ 81FC938 - call DewfordTown_Gym_EventScript_1FC6C2 - release - end - -DewfordTown_Gym_EventScript_1FC93F:: @ 81FC93F - trainerbattle 2, TRAINER_CRISTIAN, 0, DewfordTown_Gym_Text_1FCEDC, DewfordTown_Gym_Text_1FCF0A, DewfordTown_Gym_EventScript_1FC95A - msgbox DewfordTown_Gym_Text_1FCF26, 6 - end - -DewfordTown_Gym_EventScript_1FC95A:: @ 81FC95A - call DewfordTown_Gym_EventScript_1FC6C2 - release - end - -DewfordTown_Gym_EventScript_1FC961:: @ 81FC961 - trainerbattle 2, TRAINER_LILITH, 0, DewfordTown_Gym_Text_1FCDB8, DewfordTown_Gym_Text_1FCDE5, DewfordTown_Gym_EventScript_1FC97C - msgbox DewfordTown_Gym_Text_1FCE08, 6 - end - -DewfordTown_Gym_EventScript_1FC97C:: @ 81FC97C - call DewfordTown_Gym_EventScript_1FC6C2 - release - end - -DewfordTown_Gym_EventScript_1FC983:: @ 81FC983 - lock - faceplayer - checkflag FLAG_0x4F1 - goto_eq DewfordTown_Gym_EventScript_1FC998 - msgbox DewfordTown_Gym_Text_1FC9D6, 4 - release - end - -DewfordTown_Gym_EventScript_1FC998:: @ 81FC998 - msgbox DewfordTown_Gym_Text_1FCB5C, 4 - release - end - -DewfordTown_Gym_EventScript_1FC9A2:: @ 81FC9A2 - lockall - checkflag FLAG_BADGE02_GET - goto_eq DewfordTown_Gym_EventScript_1FC9C2 - goto DewfordTown_Gym_EventScript_1FC9CC - end - -DewfordTown_Gym_EventScript_1FC9B2:: @ 81FC9B2 - lockall - checkflag FLAG_BADGE02_GET - goto_eq DewfordTown_Gym_EventScript_1FC9C2 - goto DewfordTown_Gym_EventScript_1FC9CC - end - -DewfordTown_Gym_EventScript_1FC9C2:: @ 81FC9C2 - msgbox DewfordTown_Gym_Text_1FD28B, 4 - releaseall - end - -DewfordTown_Gym_EventScript_1FC9CC:: @ 81FC9CC - msgbox DewfordTown_Gym_Text_1FD272, 4 - releaseall - end - -DewfordTown_Gym_Text_1FC9D6: @ 81FC9D6 - .string "Hey, how’s it going, CHAMPION-\n" - .string "bound {PLAYER}?\p" - .string "DEWFORD’s GYM LEADER BRAWLY commands\n" - .string "FIGHTING-type POKéMON.\p" - .string "Going against him with NORMAL-type\n" - .string "POKéMON is asking for trouble.\p" - .string "FIGHTING POKéMON will lay a serious\n" - .string "smack down on NORMAL POKéMON,\l" - .string "so be careful!\p" - .string "What’s worse, the GYM is as dark as\n" - .string "the ocean floor.\p" - .string "But it will get brighter after defeating\n" - .string "the TRAINERS in your way.\p" - .string "Hey, okay, go for it!$" - -DewfordTown_Gym_Text_1FCB5C: @ 81FCB5C - .string "Whoah! It’s turned too bright in here!\p" - .string "Your future is bright, too!$" - -DewfordTown_Gym_Text_1FCB9F: @ 81FCB9F - .string "Might is right!\n" - .string "Come on!$" - -DewfordTown_Gym_Text_1FCBB8: @ 81FCBB8 - .string "Not enough power…$" - -DewfordTown_Gym_Text_1FCBCA: @ 81FCBCA - .string "Your skill overcame my strength!\n" - .string "Your technique is commendable!$" - -DewfordTown_Gym_Text_1FCC0A: @ 81FCC0A - .string "There’s no need for BRAWLY to be\n" - .string "involved!\p" - .string "I’ll crush you!$" - -DewfordTown_Gym_Text_1FCC45: @ 81FCC45 - .string "But… How?\n" - .string "How could I lose so easily?$" - -DewfordTown_Gym_Text_1FCC6B: @ 81FCC6B - .string "I’m not going to waste this loss.\n" - .string "I’ll use it to motivate me to train!\p" - .string "One day I’ll become a GYM LEADER…\p" - .string "No, I’ll become the POKéMON LEAGUE\n" - .string "CHAMPION!$" - -DewfordTown_Gym_Text_1FCD01: @ 81FCD01 - .string "Don’t you dare brush me off!\n" - .string "It’s not my fault if you cry!$" - -DewfordTown_Gym_Text_1FCD3C: @ 81FCD3C - .string "Waaaaaaah!\n" - .string "I lost!$" - -DewfordTown_Gym_Text_1FCD4F: @ 81FCD4F - .string "I battle in the dark to make my heart\n" - .string "stronger.\p" - .string "But because it’s so dark, I can never\n" - .string "see BRAWLY’s face…$" - -DewfordTown_Gym_Text_1FCDB8: @ 81FCDB8 - .string "Ufufu…\n" - .string "Are you stumbling around in the dark?$" - -DewfordTown_Gym_Text_1FCDE5: @ 81FCDE5 - .string "Oh, you…\n" - .string "I don’t want to know you!$" - -DewfordTown_Gym_Text_1FCE08: @ 81FCE08 - .string "You deserve to stay lost and end up\n" - .string "back at the entrance again!$" - -DewfordTown_Gym_Text_1FCE48: @ 81FCE48 - .string "I’ll show you the gumption of\n" - .string "a sailing man!$" - -DewfordTown_Gym_Text_1FCE75: @ 81FCE75 - .string "How’d this happen?\n" - .string "It’s not like me to lose this way!$" - -DewfordTown_Gym_Text_1FCEAB: @ 81FCEAB - .string "Oh, aye! You’re worthy of seeing\n" - .string "our GYM LEADER.$" - -DewfordTown_Gym_Text_1FCEDC: @ 81FCEDC - .string "If you mean to pass, it has to be\n" - .string "through me!$" - -DewfordTown_Gym_Text_1FCF0A: @ 81FCF0A - .string "Grrrrr!\n" - .string "Vastly overpowered!$" - -DewfordTown_Gym_Text_1FCF26: @ 81FCF26 - .string "You win!\n" - .string "Go after that BADGE!$" - -DewfordTown_Gym_Text_1FCF44: @ 81FCF44 - .string "I’m BRAWLY!\n" - .string "DEWFORD’s GYM LEADER!\p" - .string "I’ve been churned in the rough waves\n" - .string "of these parts, and I’ve grown tough\l" - .string "in the pitch-black cave!\p" - .string "So you wanted to challenge me?\n" - .string "Let me see what you’re made of!$" - -DewfordTown_Gym_Text_1FD008: @ 81FD008 - .string "Whoah, wow! You made a much bigger\n" - .string "splash than I expected!\p" - .string "You swamped me!\p" - .string "Okay, you’ve got me.\n" - .string "Take this GYM BADGE!$" - -DewfordTown_Gym_Text_1FD07D: @ 81FD07D - .string "{PLAYER} received the KNUCKLE BADGE\n" - .string "from BRAWLY.$" - -DewfordTown_Gym_Text_1FD0A8: @ 81FD0A8 - .string "The KNUCKLE BADGE makes all POKéMON\n" - .string "up to Level 30, even those you get in\l" - .string "trades, obey without question.\p" - .string "And, you’ll be able to use the HM move\n" - .string "FLASH outside of battle.\p" - .string "If you’d like, use this TECHNICAL\n" - .string "MACHINE, too.$" - -DewfordTown_Gym_Text_1FD181: @ 81FD181 - .string "That TM08 contains BULK UP.\p" - .string "It’s a move that raises both ATTACK\n" - .string "and DEFENSE stats.\p" - .string "… … … … … …$" - -DewfordTown_Gym_Text_1FD1E0: @ 81FD1E0 - .string "Registered GYM LEADER BRAWLY\n" - .string "in the POKéNAV.$" - -DewfordTown_Gym_Text_1FD20D: @ 81FD20D - .string "I can see your talent becoming a giant\n" - .string "wave to cause a storm of astonishment\l" - .string "among TRAINERS one day!$" - -DewfordTown_Gym_Text_1FD272: @ 81FD272 - .string "DEWFORD TOWN POKéMON GYM$" - -DewfordTown_Gym_Text_1FD28B: @ 81FD28B - .string "DEWFORD TOWN POKéMON GYM\p" - .string "BRAWLY’S CERTIFIED TRAINERS:\n" - .string "{PLAYER}$" - -DewfordTown_Gym_Text_1FD2C4: @ 81FD2C4 - .string "BRAWLY: A wave may draw back, but it\n" - .string "always returns to the shore.\p" - .string "A giant wave of a talent like you…\n" - .string "I knew you would return!\p" - .string "Show me how much higher\n" - .string "you’ve gone!$" - -DewfordTown_Gym_Text_1FD367: @ 81FD367 - .string "Wow!\n" - .string "Swamped again!$" - -DewfordTown_Gym_Text_1FD37B: @ 81FD37B - .string "BRAWLY: Battling is vast and it’s deep.\n" - .string "You can’t see the bottom.\l" - .string "It’s just like the sea of HOENN!$" - -DewfordTown_Gym_Text_1FD3DE: @ 81FD3DE - .string "BRAWLY: A wave may draw back, but it\n" - .string "always returns to the shore.\p" - .string "A giant wave of a talent like you…\n" - .string "I knew you would return!\p" - .string "Oh? You only have one POKéMON\n" - .string "that can battle.\p" - .string "I’m sorry, but I’d like you to come back\n" - .string "with at least two POKéMON.$" - diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc deleted file mode 100644 index 37122a640..000000000 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ /dev/null @@ -1,453 +0,0 @@ -DewfordTown_Hall_MapScripts:: @ 81FD4CF - .byte 0 - -DewfordTown_Hall_EventScript_1FD4D0:: @ 81FD4D0 - lock - faceplayer - call DewfordTown_Hall_EventScript_271E8B - special TrendyPhraseIsOld - compare VAR_RESULT, 1 - goto_eq DewfordTown_Hall_EventScript_1FD4EF - msgbox DewfordTown_Hall_Text_1FD818, 4 - release - end - -DewfordTown_Hall_EventScript_1FD4EF:: @ 81FD4EF - msgbox DewfordTown_Hall_Text_1FD877, 4 - release - end - -DewfordTown_Hall_EventScript_1FD4F9:: @ 81FD4F9 - lock - faceplayer - call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FD8ED, 4 - release - end - -DewfordTown_Hall_EventScript_1FD50A:: @ 81FD50A - lock - faceplayer - call DewfordTown_Hall_EventScript_271E8B - special sub_811EF6C - msgbox DewfordTown_Hall_Text_1FD948, 5 - compare VAR_RESULT, 1 - goto_eq DewfordTown_Hall_EventScript_1FD533 - compare VAR_RESULT, 0 - goto_eq DewfordTown_Hall_EventScript_1FD53D - end - -DewfordTown_Hall_EventScript_1FD533:: @ 81FD533 - msgbox DewfordTown_Hall_Text_1FD9B3, 4 - release - end - -DewfordTown_Hall_EventScript_1FD53D:: @ 81FD53D - msgbox DewfordTown_Hall_Text_1FDA06, 4 - release - end - -DewfordTown_Hall_EventScript_1FD547:: @ 81FD547 - lock - faceplayer - call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FDA5C, 4 - closemessage - applymovement 4, DewfordTown_Hall_Movement_2725A6 - waitmovement 0 - release - end - -DewfordTown_Hall_EventScript_1FD563:: @ 81FD563 - lock - faceplayer - call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FDA99, 4 - closemessage - applymovement 5, DewfordTown_Hall_Movement_2725A6 - waitmovement 0 - release - end - -DewfordTown_Hall_EventScript_1FD57F:: @ 81FD57F - lock - faceplayer - call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FDAC4, 4 - release - end - -DewfordTown_Hall_EventScript_1FD590:: @ 81FD590 - lockall - call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FDB89, 4 - releaseall - end - -DewfordTown_Hall_EventScript_1FD5A0:: @ 81FD5A0 - lockall - call DewfordTown_Hall_EventScript_271E8B - special GetDewfordHallPaintingNameIndex - switch VAR_RESULT - case 0, DewfordTown_Hall_EventScript_1FD607 - case 4, DewfordTown_Hall_EventScript_1FD607 - case 1, DewfordTown_Hall_EventScript_1FD611 - case 5, DewfordTown_Hall_EventScript_1FD607 - case 2, DewfordTown_Hall_EventScript_1FD61B - case 6, DewfordTown_Hall_EventScript_1FD61B - case 3, DewfordTown_Hall_EventScript_1FD625 - case 7, DewfordTown_Hall_EventScript_1FD61B - end - -DewfordTown_Hall_EventScript_1FD607:: @ 81FD607 - msgbox DewfordTown_Hall_Text_1FDC05, 4 - releaseall - end - -DewfordTown_Hall_EventScript_1FD611:: @ 81FD611 - msgbox DewfordTown_Hall_Text_1FDC21, 4 - releaseall - end - -DewfordTown_Hall_EventScript_1FD61B:: @ 81FD61B - msgbox DewfordTown_Hall_Text_1FDC3C, 4 - releaseall - end - -DewfordTown_Hall_EventScript_1FD625:: @ 81FD625 - msgbox DewfordTown_Hall_Text_1FDC57, 4 - releaseall - end - -DewfordTown_Hall_EventScript_1FD62F:: @ 81FD62F - lockall - setvar VAR_0x8008, 0 - goto DewfordTown_Hall_EventScript_1FD647 - end - -DewfordTown_Hall_EventScript_1FD63B:: @ 81FD63B - lockall - setvar VAR_0x8008, 1 - goto DewfordTown_Hall_EventScript_1FD647 - end - -DewfordTown_Hall_EventScript_1FD647:: @ 81FD647 - call DewfordTown_Hall_EventScript_271E8B - special GetDewfordHallPaintingNameIndex - switch VAR_RESULT - case 0, DewfordTown_Hall_EventScript_1FD6AD - case 1, DewfordTown_Hall_EventScript_1FD6AD - case 2, DewfordTown_Hall_EventScript_1FD6C9 - case 3, DewfordTown_Hall_EventScript_1FD6C9 - case 4, DewfordTown_Hall_EventScript_1FD6E5 - case 5, DewfordTown_Hall_EventScript_1FD6E5 - case 6, DewfordTown_Hall_EventScript_1FD701 - case 7, DewfordTown_Hall_EventScript_1FD71D - end - -DewfordTown_Hall_EventScript_1FD6AD:: @ 81FD6AD - call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FDC76, 4 - call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FDCE2, 4 - releaseall - end - -DewfordTown_Hall_EventScript_1FD6C9:: @ 81FD6C9 - call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FDD95, 4 - call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FDE0E, 4 - releaseall - end - -DewfordTown_Hall_EventScript_1FD6E5:: @ 81FD6E5 - call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FDE77, 4 - call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FDED8, 4 - releaseall - end - -DewfordTown_Hall_EventScript_1FD701:: @ 81FD701 - call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FDF72, 4 - call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FDFF1, 4 - releaseall - end - -DewfordTown_Hall_EventScript_1FD71D:: @ 81FD71D - call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FE09A, 4 - call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FE0F2, 4 - releaseall - end - -DewfordTown_Hall_EventScript_1FD739:: @ 81FD739 - return - -DewfordTown_Hall_EventScript_1FD73A:: @ 81FD73A - applymovement 8, DewfordTown_Hall_Movement_1FD7D6 - waitmovement 0 - compare VAR_0x8008, 0 - goto_eq DewfordTown_Hall_EventScript_1FD75B - compare VAR_0x8008, 1 - goto_eq DewfordTown_Hall_EventScript_1FD771 - end - -DewfordTown_Hall_EventScript_1FD75B:: @ 81FD75B - compare VAR_FACING, 4 - goto_eq DewfordTown_Hall_EventScript_1FD739 - applymovement 255, DewfordTown_Hall_Movement_2725A8 - waitmovement 0 - return - -DewfordTown_Hall_EventScript_1FD771:: @ 81FD771 - return - -DewfordTown_Hall_EventScript_1FD772:: @ 81FD772 - applymovement 7, DewfordTown_Hall_Movement_1FD7D8 - waitmovement 0 - compare VAR_0x8008, 0 - goto_eq DewfordTown_Hall_EventScript_1FD793 - compare VAR_0x8008, 1 - goto_eq DewfordTown_Hall_EventScript_1FD7C0 - end - -DewfordTown_Hall_EventScript_1FD793:: @ 81FD793 - compare VAR_FACING, 2 - call_if 1, DewfordTown_Hall_EventScript_1FD7AA - compare VAR_FACING, 1 - call_if 1, DewfordTown_Hall_EventScript_1FD7B5 - return - -DewfordTown_Hall_EventScript_1FD7AA:: @ 81FD7AA - applymovement 255, DewfordTown_Hall_Movement_2725A6 - waitmovement 0 - return - -DewfordTown_Hall_EventScript_1FD7B5:: @ 81FD7B5 - applymovement 255, DewfordTown_Hall_Movement_2725AA - waitmovement 0 - return - -DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0 - compare VAR_FACING, 3 - goto_eq DewfordTown_Hall_EventScript_1FD739 - applymovement 255, DewfordTown_Hall_Movement_2725A4 - waitmovement 0 - return - -DewfordTown_Hall_Movement_1FD7D6: @ 81FD7D6 - walk_in_place_left - step_end - -DewfordTown_Hall_Movement_1FD7D8: @ 81FD7D8 - walk_in_place_right - step_end - -DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA - lock - faceplayer - call DewfordTown_Hall_EventScript_271E8B - checkflag FLAG_0x0E6 - goto_eq DewfordTown_Hall_EventScript_1FD80E - msgbox DewfordTown_Hall_Text_1FE142, 4 - giveitem_std ITEM_TM36 - compare VAR_RESULT, 0 - goto_eq DewfordTown_Hall_EventScript_272054 - setflag FLAG_0x0E6 - release - end - -DewfordTown_Hall_EventScript_1FD80E:: @ 81FD80E - msgbox DewfordTown_Hall_Text_1FE1ED, 4 - release - end - -DewfordTown_Hall_Text_1FD818: @ 81FD818 - .string "What’s in vogue? Why, it has to be\n" - .string "“{STR_VAR_1}â€!\p" - .string "I can’t imagine what life would be like\n" - .string "without “{STR_VAR_1}â€!$" - -DewfordTown_Hall_Text_1FD877: @ 81FD877 - .string "What’s in vogue? Why, it has to be\n" - .string "“{STR_VAR_1}â€!\p" - .string "But I’m getting kind of bored with it.\p" - .string "I should look for the next big thing.$" - -DewfordTown_Hall_Text_1FD8ED: @ 81FD8ED - .string "I’m teaching my POKéMON about\n" - .string "“{STR_VAR_1},â€\l" - .string "but it’s not going well.\p" - .string "It’s a bit too much, I think.$" - -DewfordTown_Hall_Text_1FD948: @ 81FD948 - .string "I’m studying up on the hip and trendy\n" - .string "“{STR_VAR_1}†now.\p" - .string "Is it true that there’s a deep link\n" - .string "between “{STR_VAR_1}â€\l" - .string "and “{STR_VAR_2}â€?$" - -DewfordTown_Hall_Text_1FD9B3: @ 81FD9B3 - .string "Oh!\n" - .string "So, my hunch was right!\p" - .string "I’m one step closer to being hip and\n" - .string "happening, yowza!$" - -DewfordTown_Hall_Text_1FDA06: @ 81FDA06 - .string "What?!\n" - .string "Is that so?!\p" - .string "It’s not easy for an older fellow like\n" - .string "me to keep up with trends!$" - -DewfordTown_Hall_Text_1FDA5C: @ 81FDA5C - .string "This whole business about\n" - .string "“{STR_VAR_1}â€â€¦\l" - .string "Isn’t there a TV show on it?$" - -DewfordTown_Hall_Text_1FDA99: @ 81FDA99 - .string "Across the sea…\p" - .string "Is “{STR_VAR_1}â€\n" - .string "even more popular?$" - -DewfordTown_Hall_Text_1FDAC4: @ 81FDAC4 - .string "I collect official\n" - .string "“{STR_VAR_1}â€\l" - .string "licensed merchandise.\p" - .string "I have official\n" - .string "“{STR_VAR_1}†DOLLS…\p" - .string "Official “{STR_VAR_1}â€\n" - .string "brand clothing…\p" - .string "And officially licensed\n" - .string "“{STR_VAR_1}â€\l" - .string "picture books.\p" - .string "Heheh, I own!\n" - .string "I’m not sharing anything with you!$" - -DewfordTown_Hall_Text_1FDB89: @ 81FDB89 - .string "IDENTIFYING GOOD\n" - .string "“{STR_VAR_1}†&\l" - .string "BAD “{STR_VAR_1}â€â€¦\p" - .string "THE LINK BETWEEN\n" - .string "“{STR_VAR_1}†AND\l" - .string "POKéMON…\p" - .string "USEFUL\n" - .string "“{STR_VAR_1}â€â€¦\p" - .string "It’s neatly jammed with books about\n" - .string "“{STR_VAR_1}.â€$" - -DewfordTown_Hall_Text_1FDC05: @ 81FDC05 - .string "“{STR_VAR_1}’S\n" - .string "SCREAM†is the title.$" - -DewfordTown_Hall_Text_1FDC21: @ 81FDC21 - .string "“{STR_VAR_1}’S\n" - .string "SMILE†is the title.$" - -DewfordTown_Hall_Text_1FDC3C: @ 81FDC3C - .string "It’s titled “THE LAST\n" - .string "{STR_VAR_1}â€.$" - -DewfordTown_Hall_Text_1FDC57: @ 81FDC57 - .string "It’s titled “THE BIRTH OF\n" - .string "{STR_VAR_1}â€.$" - -DewfordTown_Hall_Text_1FDC76: @ 81FDC76 - .string "I saw “{STR_VAR_1}â€!\n" - .string "Cool, huh?\p" - .string "It’s, like, the coolest thing going!\p" - .string "It was awesome!\n" - .string "It was the real thing, oh yeah!$" - -DewfordTown_Hall_Text_1FDCE2: @ 81FDCE2 - .string "Oh, no, no, no.\p" - .string "That alleged\n" - .string "“{STR_VAR_1}â€\l" - .string "you claim to have seen--it’s not.\p" - .string "The authentic article is much…\n" - .string "How should I say it?\l" - .string "Sharper, yet more mellow!\p" - .string "Ah, no matter. It’s astonishing!$" - -DewfordTown_Hall_Text_1FDD95: @ 81FDD95 - .string "Hey, listen, I composed a theme song\n" - .string "for “{STR_VAR_1}.â€\p" - .string "“{STR_VAR_1}â€\n" - .string "is really popular right now.\p" - .string "Okay, listen!\n" - .string "… …\p" - .string "Oh!\n" - .string "{STR_VAR_1}!\p" - .string "Wonderful\n" - .string "{STR_VAR_1}!$" - -DewfordTown_Hall_Text_1FDE0E: @ 81FDE0E - .string "… …\p" - .string "I dare say, chap, it would pay for you\n" - .string "to work on your singing before you\l" - .string "trifle yourself with\l" - .string "“{STR_VAR_1}.â€$" - -DewfordTown_Hall_Text_1FDE77: @ 81FDE77 - .string "Anyway, as I was saying earlier, we\n" - .string "should get together and organize a\l" - .string "“{STR_VAR_1}†party\l" - .string "on the island.$" - -DewfordTown_Hall_Text_1FDED8: @ 81FDED8 - .string "Oh, a smashing good idea!\p" - .string "It will settle once and for all\n" - .string "who is the best at\l" - .string "“{STR_VAR_1}.â€\l" - .string "Brilliant, indeed!\p" - .string "Starting today, our lives will revolve\n" - .string "around “{STR_VAR_1}â€!$" - -DewfordTown_Hall_Text_1FDF72: @ 81FDF72 - .string "I was thinking, though…\p" - .string "Wouldn’t you agree that\n" - .string "“{STR_VAR_1}†has\l" - .string "grown from being something trendy to\l" - .string "being a part of our daily lives?$" - -DewfordTown_Hall_Text_1FDFF1: @ 81FDFF1 - .string "Beg pardon?\n" - .string "That much, what?\p" - .string "However, it’s true that\n" - .string "“{STR_VAR_1}â€\l" - .string "weighs heavily on your mind, whether\l" - .string "you’re awake or asleep.\p" - .string "Absolutely, you’re the\n" - .string "“{STR_VAR_1}â€\l" - .string "PROFESSOR, old sport!$" - -DewfordTown_Hall_Text_1FE09A: @ 81FE09A - .string "If you and me team up as a combo,\n" - .string "we’ll be invincible when it comes to all\l" - .string "things “{STR_VAR_1}â€!$" - -DewfordTown_Hall_Text_1FE0F2: @ 81FE0F2 - .string "Spot on, my friend!\p" - .string "We shall be the\n" - .string "“{STR_VAR_1}†DUO!\p" - .string "Isn’t that a ripe image?\n" - .string "Hahahah!$" - -DewfordTown_Hall_Text_1FE142: @ 81FE142 - .string "For me, SLUDGE BOMB is at the peak\n" - .string "of popularity. It’s the one.\p" - .string "Hunh? You’re telling me that you don’t\n" - .string "know about SLUDGE BOMB?\p" - .string "That’s outright pitiful.\n" - .string "I’ll give you one.$" - -DewfordTown_Hall_Text_1FE1ED: @ 81FE1ED - .string "I love SLUDGE BOMB.\p" - .string "But POKéMON with the move\n" - .string "“{STR_VAR_1}â€\l" - .string "are in, too.$" - diff --git a/data/scripts/maps/DewfordTown_House1.inc b/data/scripts/maps/DewfordTown_House1.inc deleted file mode 100644 index 59c490d81..000000000 --- a/data/scripts/maps/DewfordTown_House1.inc +++ /dev/null @@ -1,36 +0,0 @@ -DewfordTown_House1_MapScripts:: @ 81FC3CD - .byte 0 - -DewfordTown_House1_EventScript_1FC3CE:: @ 81FC3CE - msgbox DewfordTown_House1_Text_1FC3F3, 2 - end - -DewfordTown_House1_EventScript_1FC3D7:: @ 81FC3D7 - msgbox DewfordTown_House1_Text_1FC45B, 2 - end - -DewfordTown_House1_EventScript_1FC3E0:: @ 81FC3E0 - lock - faceplayer - waitse - playmoncry SPECIES_ZIGZAGOON, 0 - msgbox DewfordTown_House1_Text_1FC510, 4 - waitmoncry - release - end - -DewfordTown_House1_Text_1FC3F3: @ 81FC3F3 - .string "There’s a lot to be said for living on\n" - .string "a small island like this in harmony with\l" - .string "POKéMON and the family.$" - -DewfordTown_House1_Text_1FC45B: @ 81FC45B - .string "I left the major port of SLATEPORT\n" - .string "CITY when I married my husband here.\p" - .string "Life goes by slowly on this little\n" - .string "island. But being surrounded by the\l" - .string "beautiful sea--that’s happiness, too.$" - -DewfordTown_House1_Text_1FC510: @ 81FC510 - .string "ZIGZAGOON: Guguuh!$" - diff --git a/data/scripts/maps/DewfordTown_House2.inc b/data/scripts/maps/DewfordTown_House2.inc deleted file mode 100644 index 1805164af..000000000 --- a/data/scripts/maps/DewfordTown_House2.inc +++ /dev/null @@ -1,59 +0,0 @@ -DewfordTown_House2_MapScripts:: @ 81FE22D - .byte 0 - -DewfordTown_House2_EventScript_1FE22E:: @ 81FE22E - lock - faceplayer - checkflag FLAG_0x121 - goto_eq DewfordTown_House2_EventScript_1FE267 - msgbox DewfordTown_House2_Text_1FE27A, 4 - giveitem_std ITEM_SILK_SCARF - compare VAR_RESULT, 0 - goto_eq DewfordTown_House2_EventScript_1FE25D - setflag FLAG_0x121 - release - end - -DewfordTown_House2_EventScript_1FE25D:: @ 81FE25D - msgbox DewfordTown_House2_Text_1FE356, 4 - release - end - -DewfordTown_House2_EventScript_1FE267:: @ 81FE267 - msgbox DewfordTown_House2_Text_1FE3D1, 4 - release - end - -DewfordTown_House2_EventScript_1FE271:: @ 81FE271 - msgbox DewfordTown_House2_Text_1FE444, 2 - end - -DewfordTown_House2_Text_1FE27A: @ 81FE27A - .string "Gorge your eyes on this!\p" - .string "It’s a SILK SCARF. It’s right at the\n" - .string "cutting edge of fashion, yeah!\p" - .string "Oh, I can see your eyes twinkling!\n" - .string "You appreciate my dazzling style!\p" - .string "Oh, you’re a delight!\n" - .string "Here you go. I want you to have it!$" - -DewfordTown_House2_Text_1FE356: @ 81FE356 - .string "Oh, you don’t have room?\p" - .string "Now, listen tight, this SCARF is a must-\n" - .string "have! Why, I would sell all my items\l" - .string "in order to get it!$" - -DewfordTown_House2_Text_1FE3D1: @ 81FE3D1 - .string "The SILK SCARF raises the power of\n" - .string "NORMAL-type moves.\p" - .string "It’s a marvelous SCARF that will go\n" - .string "with almost all POKéMON!$" - -DewfordTown_House2_Text_1FE444: @ 81FE444 - .string "Wow, you bothered to cross the sea\n" - .string "to visit DEWFORD?\p" - .string "Did you maybe come here because you\n" - .string "heard about BRAWLY?\p" - .string "He’s so cool…\n" - .string "Everyone idolizes him.$" - diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc b/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc deleted file mode 100644 index 15a1c81b9..000000000 --- a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc +++ /dev/null @@ -1,37 +0,0 @@ -DewfordTown_PokemonCenter_1F_MapScripts:: @ 81FC523 - map_script 3, DewfordTown_PokemonCenter_1F_MapScript1_1FC52E - map_script 5, DewfordTown_PokemonCenter_1F_MapScript1_277C30 - .byte 0 - -DewfordTown_PokemonCenter_1F_MapScript1_1FC52E: @ 81FC52E - setrespawn 15 - call DewfordTown_PokemonCenter_1F_EventScript_2718DE - end - -DewfordTown_PokemonCenter_1F_EventScript_1FC537:: @ 81FC537 - setvar VAR_0x800B, 1 - call DewfordTown_PokemonCenter_1F_EventScript_27191E - waitmessage - waitbuttonpress - release - end - -DewfordTown_PokemonCenter_1F_EventScript_1FC545:: @ 81FC545 - msgbox DewfordTown_PokemonCenter_1F_Text_1FC557, 2 - end - -DewfordTown_PokemonCenter_1F_EventScript_1FC54E:: @ 81FC54E - msgbox DewfordTown_PokemonCenter_1F_Text_1FC5AE, 2 - end - -DewfordTown_PokemonCenter_1F_Text_1FC557: @ 81FC557 - .string "There’s a stone cavern at the edge\n" - .string "of town.\p" - .string "I’ve heard you can find rare stones\n" - .string "there.$" - -DewfordTown_PokemonCenter_1F_Text_1FC5AE: @ 81FC5AE - .string "Even if a POKéMON faints and can’t\n" - .string "battle, it can still use a move learned\l" - .string "from a HIDDEN MACHINE (HM).$" - diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_2F.inc b/data/scripts/maps/DewfordTown_PokemonCenter_2F.inc deleted file mode 100644 index f2a30ecd2..000000000 --- a/data/scripts/maps/DewfordTown_PokemonCenter_2F.inc +++ /dev/null @@ -1,19 +0,0 @@ -DewfordTown_PokemonCenter_2F_MapScripts:: @ 81FC615 - map_script 2, DewfordTown_PokemonCenter_2F_MapScript2_276C3B - map_script 4, DewfordTown_PokemonCenter_2F_MapScript2_276B6C - map_script 1, DewfordTown_PokemonCenter_2F_MapScript1_276BBE - map_script 3, DewfordTown_PokemonCenter_2F_MapScript1_276ACF - .byte 0 - -DewfordTown_PokemonCenter_2F_EventScript_1FC62A:: @ 81FC62A - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 - end - -DewfordTown_PokemonCenter_2F_EventScript_1FC630:: @ 81FC630 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 - end - -DewfordTown_PokemonCenter_2F_EventScript_1FC636:: @ 81FC636 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB - end - diff --git a/data/scripts/maps/DoubleBattleColosseum.inc b/data/scripts/maps/DoubleBattleColosseum.inc deleted file mode 100644 index ac64377ae..000000000 --- a/data/scripts/maps/DoubleBattleColosseum.inc +++ /dev/null @@ -1,3 +0,0 @@ -DoubleBattleColosseum_MapScripts:: @ 823B780 - .byte 0 - diff --git a/data/scripts/maps/EverGrandeCity.inc b/data/scripts/maps/EverGrandeCity.inc deleted file mode 100644 index 178621217..000000000 --- a/data/scripts/maps/EverGrandeCity.inc +++ /dev/null @@ -1,38 +0,0 @@ -EverGrandeCity_MapScripts:: @ 81E7D1B - map_script 3, EverGrandeCity_MapScript1_1E7D21 - .byte 0 - -EverGrandeCity_MapScript1_1E7D21: @ 81E7D21 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, EverGrandeCity_EventScript_27207A - end - -EverGrandeCity_EventScript_1E7D2B:: @ 81E7D2B - msgbox EverGrandeCity_Text_1E7D4F, 3 - end - -EverGrandeCity_EventScript_1E7D34:: @ 81E7D34 - msgbox EverGrandeCity_Text_1E7D89, 3 - end - -EverGrandeCity_EventScript_1E7D3D:: @ 81E7D3D - msgbox EverGrandeCity_Text_1E7D65, 3 - end - -EverGrandeCity_EventScript_1E7D46:: @ 81E7D46 - setflag FLAG_VISITED_EVER_GRANDE_CITY - setvar VAR_TEMP_1, 1 - end - -EverGrandeCity_Text_1E7D4F: @ 81E7D4F - .string "ENTERING VICTORY ROAD$" - -EverGrandeCity_Text_1E7D65: @ 81E7D65 - .string "ENTERING POKéMON LEAGUE\n" - .string "CENTER GATE$" - -EverGrandeCity_Text_1E7D89: @ 81E7D89 - .string "EVER GRANDE CITY\p" - .string "“The paradise of flowers, the sea,\n" - .string "and POKéMON.â€$" - diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc deleted file mode 100644 index 3e68f4fed..000000000 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ /dev/null @@ -1,346 +0,0 @@ -EverGrandeCity_ChampionsRoom_MapScripts:: @ 82289EF - map_script 3, EverGrandeCity_ChampionsRoom_MapScript1_2289FF - map_script 4, EverGrandeCity_ChampionsRoom_MapScript2_228A05 - map_script 2, EverGrandeCity_ChampionsRoom_MapScript2_228A14 - .byte 0 - -EverGrandeCity_ChampionsRoom_MapScript1_2289FF: @ 82289FF - call EverGrandeCity_ChampionsRoom_EventScript_271ED7 - end - -EverGrandeCity_ChampionsRoom_MapScript2_228A05: @ 8228A05 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_228A0F - .2byte 0 - -EverGrandeCity_ChampionsRoom_EventScript_228A0F:: @ 8228A0F - turnobject 255, 2 - end - -EverGrandeCity_ChampionsRoom_MapScript2_228A14: @ 8228A14 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_228A1E - .2byte 0 - -EverGrandeCity_ChampionsRoom_EventScript_228A1E:: @ 8228A1E - lockall - applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725C1 - waitmovement 0 - delay 40 - applymovement 255, EverGrandeCity_ChampionsRoom_Movement_228A42 - waitmovement 0 - setvar VAR_TEMP_1, 1 - goto EverGrandeCity_ChampionsRoom_EventScript_228A45 - releaseall - end - -EverGrandeCity_ChampionsRoom_Movement_228A42: @ 8228A42 - walk_up - walk_up - step_end - -EverGrandeCity_ChampionsRoom_EventScript_228A45:: @ 8228A45 - playbgm MUS_DAIGO, 0 - msgbox EverGrandeCity_ChampionsRoom_Text_228C4C, 4 - trainerbattle 3, TRAINER_WALLACE, 0, EverGrandeCity_ChampionsRoom_Text_228EAC - goto EverGrandeCity_ChampionsRoom_EventScript_228A61 - end - -EverGrandeCity_ChampionsRoom_EventScript_228A61:: @ 8228A61 - playse SE_DOOR - setmetatile 6, 1, 838, 0 - setmetatile 6, 2, 839, 0 - special DrawWholeMapView - msgbox EverGrandeCity_ChampionsRoom_Text_228F66, 4 - closemessage - playse SE_DOOR - checkplayergender - compare VAR_RESULT, 0 - call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228ABC - compare VAR_RESULT, 1 - call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228AC1 - addobject 2 - call EverGrandeCity_ChampionsRoom_EventScript_228BFD - checkplayergender - compare VAR_RESULT, 0 - goto_eq EverGrandeCity_ChampionsRoom_EventScript_228AC6 - compare VAR_RESULT, 1 - goto_eq EverGrandeCity_ChampionsRoom_EventScript_228AFB - end - -EverGrandeCity_ChampionsRoom_EventScript_228ABC:: @ 8228ABC - playbgm MUS_GIRL_SUP, 0 - return - -EverGrandeCity_ChampionsRoom_EventScript_228AC1:: @ 8228AC1 - playbgm MUS_BOY_SUP, 0 - return - -EverGrandeCity_ChampionsRoom_EventScript_228AC6:: @ 8228AC6 - msgbox EverGrandeCity_ChampionsRoom_Text_2290CA, 4 - delay 40 - playse SE_PIN - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_272598 - waitmovement 0 - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_27259A - waitmovement 0 - call EverGrandeCity_ChampionsRoom_EventScript_228C12 - msgbox EverGrandeCity_ChampionsRoom_Text_22910B, 4 - goto EverGrandeCity_ChampionsRoom_EventScript_228B30 - end - -EverGrandeCity_ChampionsRoom_EventScript_228AFB:: @ 8228AFB - msgbox EverGrandeCity_ChampionsRoom_Text_229152, 4 - delay 40 - playse SE_PIN - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_272598 - waitmovement 0 - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_27259A - waitmovement 0 - call EverGrandeCity_ChampionsRoom_EventScript_228C12 - msgbox EverGrandeCity_ChampionsRoom_Text_2291A2, 4 - goto EverGrandeCity_ChampionsRoom_EventScript_228B30 - end - -EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 - closemessage - addobject 3 - applymovement 3, EverGrandeCity_ChampionsRoom_Movement_228C43 - waitmovement 0 - applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725A8 - waitmovement 0 - msgbox EverGrandeCity_ChampionsRoom_Text_2291E6, 4 - call EverGrandeCity_ChampionsRoom_EventScript_272184 - msgbox EverGrandeCity_ChampionsRoom_Text_22934D, 4 - applymovement 1, EverGrandeCity_ChampionsRoom_Movement_2725A6 - waitmovement 0 - delay 20 - applymovement 1, EverGrandeCity_ChampionsRoom_Movement_2725AA - waitmovement 0 - msgbox EverGrandeCity_ChampionsRoom_Text_229399, 4 - closemessage - delay 30 - applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3B - applymovement 255, EverGrandeCity_ChampionsRoom_Movement_228C1D - applymovement 3, EverGrandeCity_ChampionsRoom_Movement_2725A6 - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C38 - waitmovement 0 - delay 20 - applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725AA - waitmovement 0 - msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, 4 - checkplayergender - compare VAR_RESULT, 0 - call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228BEB - compare VAR_RESULT, 1 - call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228BF4 - closemessage - applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3F - applymovement 255, EverGrandeCity_ChampionsRoom_Movement_228C20 - waitmovement 0 - setflag FLAG_0x30D - warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16 - waitstate - releaseall - end - -EverGrandeCity_ChampionsRoom_EventScript_228BEB:: @ 8228BEB - msgbox EverGrandeCity_ChampionsRoom_Text_229479, 4 - return - -EverGrandeCity_ChampionsRoom_EventScript_228BF4:: @ 8228BF4 - msgbox EverGrandeCity_ChampionsRoom_Text_2294F5, 4 - return - -EverGrandeCity_ChampionsRoom_EventScript_228BFD:: @ 8228BFD - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C26 - waitmovement 0 - applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725A4 - waitmovement 0 - return - -EverGrandeCity_ChampionsRoom_EventScript_228C12:: @ 8228C12 - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C2F - waitmovement 0 - return - -EverGrandeCity_ChampionsRoom_Movement_228C1D: @ 8228C1D - walk_up - walk_up - step_end - -EverGrandeCity_ChampionsRoom_Movement_228C20: @ 8228C20 - walk_up - delay_16 - walk_up - delay_8 - set_invisible - step_end - -EverGrandeCity_ChampionsRoom_Movement_228C26: @ 8228C26 - 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 - 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 - walk_right - walk_up - step_end - -EverGrandeCity_ChampionsRoom_Movement_228C3B: @ 8228C3B - walk_up - walk_up - walk_in_place_fastest_down - step_end - -EverGrandeCity_ChampionsRoom_Movement_228C3F: @ 8228C3F - walk_up - delay_8 - set_invisible - step_end - -EverGrandeCity_ChampionsRoom_Movement_228C43: @ 8228C43 - 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 - .string "WALLACE: Welcome, {PLAYER}{KUN}.\p" - .string "That incident in SOOTOPOLIS CITY…\n" - .string "That was superb work, putting an end\l" - .string "to that crisis all by yourself.\p" - .string "Oops!\p" - .string "It wouldn’t be fair to say that you\n" - .string "alone ended the crisis.\p" - .string "You overcame that difficult situation\n" - .string "by working as one with your POKéMON.\p" - .string "We TRAINERS raise POKéMON by giving\n" - .string "them items and by teaching them new\l" - .string "techniques for battle.\p" - .string "But we ourselves also learn many\n" - .string "things from POKéMON.\p" - .string "And this is where your achievements\n" - .string "are put to the test against what\l" - .string "others like you have achieved.\p" - .string "Now!\p" - .string "Who can most elegantly dance with\n" - .string "their POKéMON in HOENN?\p" - .string "Show me right here and now!$" - -EverGrandeCity_ChampionsRoom_Text_228EAC: @ 8228EAC - .string "I, the CHAMPION, fall in defeat…\p" - .string "That was wonderful work.\n" - .string "You were elegant, infuriatingly so.\l" - .string "And yet it was utterly glorious!\p" - .string "Kudos to you, {PLAYER}{KUN}!\p" - .string "You are a truly noble POKéMON\n" - .string "TRAINER!$" - -EverGrandeCity_ChampionsRoom_Text_228F66: @ 8228F66 - .string "WALLACE: The POKéMON you sent into\n" - .string "battle…\p" - .string "At times they danced like a spring\n" - .string "breeze, and at times they struck\l" - .string "like lightning.\p" - .string "It was with light, yet surefooted,\n" - .string "elegance that you led your POKéMON.\p" - .string "Even I felt bedazzled by your\n" - .string "masterful performance!\p" - .string "You now stand at the glorious peak\n" - .string "of the POKéMON LEAGUE.\p" - .string "I now proclaim you to be the new\n" - .string "HOENN region…$" - -EverGrandeCity_ChampionsRoom_Text_2290CA: @ 82290CA - .string "MAY: {PLAYER}{KUN}!\p" - .string "Here’s some advice before you challenge\n" - .string "the CHAMPION…$" - -EverGrandeCity_ChampionsRoom_Text_22910B: @ 822910B - .string "MAY: Huh?\n" - .string "What, what, what?\p" - .string "{PLAYER}{KUN}…\n" - .string "Could it be that…\l" - .string "It’s already over?$" - -EverGrandeCity_ChampionsRoom_Text_229152: @ 8229152 - .string "BRENDAN: {PLAYER}!\p" - .string "How would you like some advice before\n" - .string "you challenge the CHAMPION?…$" - -EverGrandeCity_ChampionsRoom_Text_2291A2: @ 82291A2 - .string "BRENDAN: {PLAYER}…\p" - .string "Are you trying to tell me…\n" - .string "You’ve beaten the CHAMPION?$" - -EverGrandeCity_ChampionsRoom_Text_2291E6: @ 82291E6 - .string "PROF. BIRCH: See?\n" - .string "What did I tell you, {RIVAL}?\p" - .string "Didn’t I tell you that you don’t need\n" - .string "to worry about {PLAYER}{KUN}?\p" - .string "… … … … … … … …\n" - .string "{PLAYER}{KUN}, you’ve finally done it.\p" - .string "When I heard that you defeated your\n" - .string "own father at the PETALBURG GYM,\l" - .string "I thought perhaps you had a chance…\p" - .string "But to think you’ve actually become\n" - .string "the CHAMPION!\p" - .string "Ah, yes!\p" - .string "What became of your POKéDEX?\n" - .string "Here, let me see.$" - -EverGrandeCity_ChampionsRoom_Text_22934D: @ 822934D - .string "PROF. BIRCH: Anyways,\n" - .string "congratulations!\p" - .string "Now, go proudly into the final room!$" - -EverGrandeCity_ChampionsRoom_Text_229399: @ 8229399 - .string "WALLACE: {PLAYER}{KUN}…\p" - .string "No, let me rephrase that properly.\p" - .string "The new CHAMPION!\p" - .string "Come with me.$" - -EverGrandeCity_ChampionsRoom_Text_2293EB: @ 82293EB - .string "WALLACE: I’m sorry, but…\p" - .string "From here on, only those TRAINERS who\n" - .string "have become CHAMPIONS may enter.\p" - .string "You’ll have to wait outside with\n" - .string "PROF. BIRCH.$" - -EverGrandeCity_ChampionsRoom_Text_229479: @ 8229479 - .string "MAY: Groan…\p" - .string "… … … … … … … …\n" - .string "… … … … … … … …\p" - .string "I’m just joking! That’s okay!\n" - .string "That’s the rule!\p" - .string "{PLAYER}{KUN}!\n" - .string "Honestly, congratulations!$" - -EverGrandeCity_ChampionsRoom_Text_2294F5: @ 82294F5 - .string "BRENDAN: Whaaaat?! … … … … …\n" - .string "… … … … … … … …\p" - .string "It can’t be helped if that’s the rule.\p" - .string "{PLAYER}, way to go!\n" - .string "Congratulations!$" - diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc deleted file mode 100644 index 4c90417af..000000000 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ /dev/null @@ -1,94 +0,0 @@ -EverGrandeCity_DrakesRoom_MapScripts:: @ 822869C - map_script 2, EverGrandeCity_DrakesRoom_MapScript2_2286BB - map_script 1, EverGrandeCity_DrakesRoom_MapScript1_2286D2 - map_script 4, EverGrandeCity_DrakesRoom_MapScript2_227F3E - .byte 0 - -EverGrandeCity_DrakesRoom_MapScript2_2286AC: @ 82286AC - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_DrakesRoom_EventScript_2286B6 - .2byte 0 - -EverGrandeCity_DrakesRoom_EventScript_2286B6:: @ 82286B6 - turnobject 255, 2 - end - -EverGrandeCity_DrakesRoom_MapScript2_2286BB: @ 82286BB - map_script_2 VAR_0x409C, 3, EverGrandeCity_DrakesRoom_EventScript_2286C5 - .2byte 0 - -EverGrandeCity_DrakesRoom_EventScript_2286C5:: @ 82286C5 - lockall - call EverGrandeCity_DrakesRoom_EventScript_272475 - setvar VAR_0x409C, 4 - releaseall - end - -EverGrandeCity_DrakesRoom_MapScript1_2286D2: @ 82286D2 - checkflag FLAG_0x4FE - call_if 1, EverGrandeCity_DrakesRoom_EventScript_2286E7 - compare VAR_0x409C, 4 - call_if 1, EverGrandeCity_DrakesRoom_EventScript_2286ED - end - -EverGrandeCity_DrakesRoom_EventScript_2286E7:: @ 82286E7 - call EverGrandeCity_DrakesRoom_EventScript_2724BC - return - -EverGrandeCity_DrakesRoom_EventScript_2286ED:: @ 82286ED - call EverGrandeCity_DrakesRoom_EventScript_27255F - return - -EverGrandeCity_DrakesRoom_EventScript_2286F3:: @ 82286F3 - lock - faceplayer - checkflag FLAG_0x4FE - goto_eq EverGrandeCity_DrakesRoom_EventScript_22871A - playbgm MUS_SITENNOU, 0 - msgbox EverGrandeCity_DrakesRoom_Text_22873E, 4 - trainerbattle 3, TRAINER_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_228895 - goto EverGrandeCity_DrakesRoom_EventScript_228724 - end - -EverGrandeCity_DrakesRoom_EventScript_22871A:: @ 822871A - msgbox EverGrandeCity_DrakesRoom_Text_2288B0, 4 - release - end - -EverGrandeCity_DrakesRoom_EventScript_228724:: @ 8228724 - setvar VAR_0x8004, 0 - special sub_813BF7C - setflag FLAG_0x4FE - call EverGrandeCity_DrakesRoom_EventScript_2723F8 - msgbox EverGrandeCity_DrakesRoom_Text_2288B0, 4 - release - end - -EverGrandeCity_DrakesRoom_Text_22873E: @ 822873E - .string "I am the last of the POKéMON LEAGUE\n" - .string "ELITE FOUR, DRAKE the DRAGON master!\p" - .string "In their natural state, POKéMON are\n" - .string "wild living things. They are free.\p" - .string "At times, they hinder us.\n" - .string "At times, they help us.\p" - .string "For us to battle with POKéMON as\n" - .string "partners, do you know what it takes?\p" - .string "Do you know what is needed?\p" - .string "If you don’t, then you will never\n" - .string "prevail over me!$" - -EverGrandeCity_DrakesRoom_Text_228895: @ 8228895 - .string "Superb, it should be said.$" - -EverGrandeCity_DrakesRoom_Text_2288B0: @ 82288B0 - .string "You deserve every credit for coming\n" - .string "this far as a TRAINER of POKéMON.\p" - .string "You do seem to know what is needed.\p" - .string "Yes, what a TRAINER needs is a\n" - .string "virtuous heart.\p" - .string "POKéMON touch the good hearts of\n" - .string "TRAINERS and learn good from wrong.\p" - .string "They touch the good hearts of\n" - .string "TRAINERS and grow strong.\p" - .string "Go! Go onwards!\n" - .string "The CHAMPION is waiting!$" - diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc deleted file mode 100644 index f1d846f03..000000000 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ /dev/null @@ -1,86 +0,0 @@ -EverGrandeCity_GlaciasRoom_MapScripts:: @ 8228412 - map_script 2, EverGrandeCity_GlaciasRoom_MapScript2_228431 - map_script 1, EverGrandeCity_GlaciasRoom_MapScript1_228448 - map_script 4, EverGrandeCity_GlaciasRoom_MapScript2_228422 - .byte 0 - -EverGrandeCity_GlaciasRoom_MapScript2_228422: @ 8228422 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_GlaciasRoom_EventScript_22842C - .2byte 0 - -EverGrandeCity_GlaciasRoom_EventScript_22842C:: @ 822842C - turnobject 255, 2 - end - -EverGrandeCity_GlaciasRoom_MapScript2_228431: @ 8228431 - map_script_2 VAR_0x409C, 2, EverGrandeCity_GlaciasRoom_EventScript_22843B - .2byte 0 - -EverGrandeCity_GlaciasRoom_EventScript_22843B:: @ 822843B - lockall - call EverGrandeCity_GlaciasRoom_EventScript_272475 - setvar VAR_0x409C, 3 - releaseall - end - -EverGrandeCity_GlaciasRoom_MapScript1_228448: @ 8228448 - checkflag FLAG_0x4FD - call_if 1, EverGrandeCity_GlaciasRoom_EventScript_22845D - compare VAR_0x409C, 3 - call_if 1, EverGrandeCity_GlaciasRoom_EventScript_228463 - end - -EverGrandeCity_GlaciasRoom_EventScript_22845D:: @ 822845D - call EverGrandeCity_GlaciasRoom_EventScript_2724BC - return - -EverGrandeCity_GlaciasRoom_EventScript_228463:: @ 8228463 - call EverGrandeCity_GlaciasRoom_EventScript_27255F - return - -EverGrandeCity_GlaciasRoom_EventScript_228469:: @ 8228469 - lock - faceplayer - checkflag FLAG_0x4FD - goto_eq EverGrandeCity_GlaciasRoom_EventScript_228490 - playbgm MUS_SITENNOU, 0 - msgbox EverGrandeCity_GlaciasRoom_Text_2284AC, 4 - trainerbattle 3, TRAINER_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_2285B4 - goto EverGrandeCity_GlaciasRoom_EventScript_22849A - end - -EverGrandeCity_GlaciasRoom_EventScript_228490:: @ 8228490 - msgbox EverGrandeCity_GlaciasRoom_Text_228640, 4 - release - end - -EverGrandeCity_GlaciasRoom_EventScript_22849A:: @ 822849A - setflag FLAG_0x4FD - call EverGrandeCity_GlaciasRoom_EventScript_2723F8 - msgbox EverGrandeCity_GlaciasRoom_Text_228640, 4 - release - end - -EverGrandeCity_GlaciasRoom_Text_2284AC: @ 82284AC - .string "Welcome, my name is GLACIA\n" - .string "of the ELITE FOUR.\p" - .string "I’ve traveled from afar to HOENN\n" - .string "so that I may hone my ice skills.\p" - .string "But all I have seen are challenges by\n" - .string "weak TRAINERS and their POKéMON.\p" - .string "What about you?\p" - .string "It would please me to no end if I could\n" - .string "go all out against you!$" - -EverGrandeCity_GlaciasRoom_Text_2285B4: @ 82285B4 - .string "You and your POKéMON…\n" - .string "How hot your spirits burn!\p" - .string "The all-consuming heat overwhelms.\p" - .string "It’s no surprise that my icy skills\n" - .string "failed to harm you.$" - -EverGrandeCity_GlaciasRoom_Text_228640: @ 8228640 - .string "Advance to the next room.\p" - .string "And there, confirm the truly fearsome\n" - .string "side of the POKéMON LEAGUE.$" - diff --git a/data/scripts/maps/EverGrandeCity_Hall1.inc b/data/scripts/maps/EverGrandeCity_Hall1.inc deleted file mode 100644 index 960918662..000000000 --- a/data/scripts/maps/EverGrandeCity_Hall1.inc +++ /dev/null @@ -1,12 +0,0 @@ -EverGrandeCity_Hall1_MapScripts:: @ 8229569 - map_script 4, EverGrandeCity_Hall1_MapScript2_22956F - .byte 0 - -EverGrandeCity_Hall1_MapScript2_22956F: @ 822956F - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall1_EventScript_229579 - .2byte 0 - -EverGrandeCity_Hall1_EventScript_229579:: @ 8229579 - turnobject 255, 2 - end - diff --git a/data/scripts/maps/EverGrandeCity_Hall2.inc b/data/scripts/maps/EverGrandeCity_Hall2.inc deleted file mode 100644 index 1d76e3695..000000000 --- a/data/scripts/maps/EverGrandeCity_Hall2.inc +++ /dev/null @@ -1,12 +0,0 @@ -EverGrandeCity_Hall2_MapScripts:: @ 822957E - map_script 4, EverGrandeCity_Hall2_MapScript2_229584 - .byte 0 - -EverGrandeCity_Hall2_MapScript2_229584: @ 8229584 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall2_EventScript_22958E - .2byte 0 - -EverGrandeCity_Hall2_EventScript_22958E:: @ 822958E - turnobject 255, 2 - end - diff --git a/data/scripts/maps/EverGrandeCity_Hall3.inc b/data/scripts/maps/EverGrandeCity_Hall3.inc deleted file mode 100644 index a100487f5..000000000 --- a/data/scripts/maps/EverGrandeCity_Hall3.inc +++ /dev/null @@ -1,12 +0,0 @@ -EverGrandeCity_Hall3_MapScripts:: @ 8229593 - map_script 4, EverGrandeCity_Hall3_MapScript2_229599 - .byte 0 - -EverGrandeCity_Hall3_MapScript2_229599: @ 8229599 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall3_EventScript_2295A3 - .2byte 0 - -EverGrandeCity_Hall3_EventScript_2295A3:: @ 82295A3 - turnobject 255, 2 - end - diff --git a/data/scripts/maps/EverGrandeCity_Hall4.inc b/data/scripts/maps/EverGrandeCity_Hall4.inc deleted file mode 100644 index a7c730594..000000000 --- a/data/scripts/maps/EverGrandeCity_Hall4.inc +++ /dev/null @@ -1,12 +0,0 @@ -EverGrandeCity_Hall4_MapScripts:: @ 82295A8 - map_script 4, EverGrandeCity_Hall4_MapScript2_2295AE - .byte 0 - -EverGrandeCity_Hall4_MapScript2_2295AE: @ 82295AE - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall4_EventScript_2295B8 - .2byte 0 - -EverGrandeCity_Hall4_EventScript_2295B8:: @ 82295B8 - turnobject 255, 2 - end - diff --git a/data/scripts/maps/EverGrandeCity_Hall5.inc b/data/scripts/maps/EverGrandeCity_Hall5.inc deleted file mode 100644 index 9ca9991e4..000000000 --- a/data/scripts/maps/EverGrandeCity_Hall5.inc +++ /dev/null @@ -1,12 +0,0 @@ -EverGrandeCity_Hall5_MapScripts:: @ 82295BD - map_script 4, EverGrandeCity_Hall5_MapScript2_2295C3 - .byte 0 - -EverGrandeCity_Hall5_MapScript2_2295C3: @ 82295C3 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall5_EventScript_2295CD - .2byte 0 - -EverGrandeCity_Hall5_EventScript_2295CD:: @ 82295CD - turnobject 255, 2 - end - diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc deleted file mode 100644 index 60f0dd1ad..000000000 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ /dev/null @@ -1,99 +0,0 @@ -EverGrandeCity_HallOfFame_MapScripts:: @ 822982C - map_script 2, EverGrandeCity_HallOfFame_MapScript2_229846 - map_script 4, EverGrandeCity_HallOfFame_MapScript2_229837 - .byte 0 - -EverGrandeCity_HallOfFame_MapScript2_229837: @ 8229837 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_229841 - .2byte 0 - -EverGrandeCity_HallOfFame_EventScript_229841:: @ 8229841 - turnobject 255, 2 - end - -EverGrandeCity_HallOfFame_MapScript2_229846: @ 8229846 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_229850 - .2byte 0 - -EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 - lockall - applymovement 1, EverGrandeCity_HallOfFame_Movement_229901 - applymovement 255, EverGrandeCity_HallOfFame_Movement_229901 - waitmovement 0 - applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8 - applymovement 255, EverGrandeCity_HallOfFame_Movement_2725A4 - waitmovement 0 - msgbox EverGrandeCity_HallOfFame_Text_22990E, 4 - closemessage - applymovement 1, EverGrandeCity_HallOfFame_Movement_229908 - applymovement 255, EverGrandeCity_HallOfFame_Movement_229908 - waitmovement 0 - delay 20 - applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8 - applymovement 255, EverGrandeCity_HallOfFame_Movement_2725A4 - waitmovement 0 - msgbox EverGrandeCity_HallOfFame_Text_2299A3, 4 - closemessage - applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A6 - applymovement 255, EverGrandeCity_HallOfFame_Movement_2725A6 - waitmovement 0 - delay 20 - dofieldeffect 62 - waitfieldeffect 62 - delay 40 - setvar VAR_TEMP_1, 1 - call EverGrandeCity_HallOfFame_EventScript_2717C1 - checkplayergender - compare VAR_RESULT, 0 - goto_eq EverGrandeCity_HallOfFame_EventScript_2298E9 - compare VAR_RESULT, 1 - goto_eq EverGrandeCity_HallOfFame_EventScript_2298F5 - end - -EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9 - setrespawn 1 - fadescreenspeed 1, 24 - special GameClear - waitstate - releaseall - end - -EverGrandeCity_HallOfFame_EventScript_2298F5:: @ 82298F5 - setrespawn 2 - fadescreenspeed 1, 24 - special GameClear - waitstate - releaseall - end - -EverGrandeCity_HallOfFame_Movement_229901: @ 8229901 - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - step_end - -EverGrandeCity_HallOfFame_Movement_229908: @ 8229908 - walk_up - walk_up - walk_up - walk_up - walk_up - step_end - -EverGrandeCity_HallOfFame_Text_22990E: @ 822990E - .string "WALLACE: This room…\p" - .string "This is where we keep records of\n" - .string "POKéMON that prevailed through\l" - .string "harsh battles.\p" - .string "It is here that the LEAGUE CHAMPIONS\n" - .string "are honored.$" - -EverGrandeCity_HallOfFame_Text_2299A3: @ 82299A3 - .string "WALLACE: Come on, let’s record your\n" - .string "name as a TRAINER who triumphed over\l" - .string "the POKéMON LEAGUE, and the names of\l" - .string "the partners who battled with you.$" - diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc deleted file mode 100644 index 679e4f663..000000000 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ /dev/null @@ -1,87 +0,0 @@ -EverGrandeCity_PhoebesRoom_MapScripts:: @ 8228174 - map_script 1, EverGrandeCity_PhoebesRoom_MapScript1_2281AA - map_script 4, EverGrandeCity_PhoebesRoom_MapScript2_228184 - map_script 2, EverGrandeCity_PhoebesRoom_MapScript2_228193 - .byte 0 - -EverGrandeCity_PhoebesRoom_MapScript2_228184: @ 8228184 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_PhoebesRoom_EventScript_22818E - .2byte 0 - -EverGrandeCity_PhoebesRoom_EventScript_22818E:: @ 822818E - turnobject 255, 2 - end - -EverGrandeCity_PhoebesRoom_MapScript2_228193: @ 8228193 - map_script_2 VAR_0x409C, 1, EverGrandeCity_PhoebesRoom_EventScript_22819D - .2byte 0 - -EverGrandeCity_PhoebesRoom_EventScript_22819D:: @ 822819D - lockall - call EverGrandeCity_PhoebesRoom_EventScript_272475 - setvar VAR_0x409C, 2 - releaseall - end - -EverGrandeCity_PhoebesRoom_MapScript1_2281AA: @ 82281AA - checkflag FLAG_0x4FC - call_if 1, EverGrandeCity_PhoebesRoom_EventScript_2281BF - compare VAR_0x409C, 2 - call_if 1, EverGrandeCity_PhoebesRoom_EventScript_2281C5 - end - -EverGrandeCity_PhoebesRoom_EventScript_2281BF:: @ 82281BF - call EverGrandeCity_PhoebesRoom_EventScript_2724BC - return - -EverGrandeCity_PhoebesRoom_EventScript_2281C5:: @ 82281C5 - call EverGrandeCity_PhoebesRoom_EventScript_27255F - return - -EverGrandeCity_PhoebesRoom_EventScript_2281CB:: @ 82281CB - lock - faceplayer - checkflag FLAG_0x4FC - goto_eq EverGrandeCity_PhoebesRoom_EventScript_2281F2 - playbgm MUS_SITENNOU, 0 - msgbox EverGrandeCity_PhoebesRoom_Text_22820E, 4 - trainerbattle 3, TRAINER_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_228325 - goto EverGrandeCity_PhoebesRoom_EventScript_2281FC - end - -EverGrandeCity_PhoebesRoom_EventScript_2281F2:: @ 82281F2 - msgbox EverGrandeCity_PhoebesRoom_Text_228343, 4 - release - end - -EverGrandeCity_PhoebesRoom_EventScript_2281FC:: @ 82281FC - setflag FLAG_0x4FC - call EverGrandeCity_PhoebesRoom_EventScript_2723F8 - msgbox EverGrandeCity_PhoebesRoom_Text_228343, 4 - release - end - -EverGrandeCity_PhoebesRoom_Text_22820E: @ 822820E - .string "Ahahaha!\p" - .string "I’m PHOEBE of the ELITE FOUR.\n" - .string "I did my training on MT. PYRE.\p" - .string "While I trained, I gained the ability\n" - .string "to commune with GHOST-type POKéMON.\p" - .string "Yes, the bond I developed with POKéMON\n" - .string "is extremely tight.\p" - .string "So, come on, just try and see if you can\n" - .string "even inflict damage on my POKéMON!$" - -EverGrandeCity_PhoebesRoom_Text_228325: @ 8228325 - .string "Oh, darn.\n" - .string "I’ve gone and lost.$" - -EverGrandeCity_PhoebesRoom_Text_228343: @ 8228343 - .string "There’s a definite bond between you\n" - .string "and your POKéMON, too.\p" - .string "I didn’t recognize it, so it’s only\n" - .string "natural that I lost.\p" - .string "Yup, I’d like to see how far your bond\n" - .string "will carry you.\p" - .string "Go ahead, move on to the next room.$" - diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc deleted file mode 100644 index ed6e6a497..000000000 --- a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc +++ /dev/null @@ -1,104 +0,0 @@ -EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34 - map_script 3, EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F - map_script 5, EverGrandeCity_PokemonCenter_1F_MapScript1_277C30 - .byte 0 - -EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F - setrespawn 11 - checkflag FLAG_0x1CF - call_if 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A4C - end - -EverGrandeCity_PokemonCenter_1F_EventScript_229A4C:: @ 8229A4C - checkflag FLAG_BADGE06_GET - goto_if 0, EverGrandeCity_PokemonCenter_1F_EventScript_27374E - clearflag FLAG_0x319 - return - -EverGrandeCity_PokemonCenter_1F_EventScript_229A59:: @ 8229A59 - setvar VAR_0x800B, 1 - call EverGrandeCity_PokemonCenter_1F_EventScript_27191E - waitmessage - waitbuttonpress - release - end - -EverGrandeCity_PokemonCenter_1F_EventScript_229A67:: @ 8229A67 - msgbox EverGrandeCity_PokemonCenter_1F_Text_229ADA, 2 - end - -EverGrandeCity_PokemonCenter_1F_EventScript_229A70:: @ 8229A70 - msgbox EverGrandeCity_PokemonCenter_1F_Text_229B62, 2 - end - -EverGrandeCity_PokemonCenter_1F_EventScript_229A79:: @ 8229A79 - lock - faceplayer - msgbox EverGrandeCity_PokemonCenter_1F_Text_229BF1, 4 - closemessage - compare VAR_FACING, 2 - call_if 1, EverGrandeCity_PokemonCenter_1F_EventScript_229AB6 - compare VAR_FACING, 4 - call_if 1, EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 - compare VAR_FACING, 3 - call_if 1, EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 - addvar VAR_0x40D1, 1 - setflag FLAG_0x1CF - playse SE_KAIDAN - waitse - removeobject 4 - release - end - -EverGrandeCity_PokemonCenter_1F_EventScript_229AB6:: @ 8229AB6 - applymovement 4, EverGrandeCity_PokemonCenter_1F_Movement_229ACC - waitmovement 0 - return - -EverGrandeCity_PokemonCenter_1F_EventScript_229AC1:: @ 8229AC1 - applymovement 4, EverGrandeCity_PokemonCenter_1F_Movement_229AD3 - waitmovement 0 - return - -EverGrandeCity_PokemonCenter_1F_Movement_229ACC: @ 8229ACC - walk_left - walk_down - walk_down - walk_left - walk_down - walk_down - step_end - -EverGrandeCity_PokemonCenter_1F_Movement_229AD3: @ 8229AD3 - walk_down - walk_down - walk_left - walk_left - walk_down - walk_down - step_end - -EverGrandeCity_PokemonCenter_1F_Text_229ADA: @ 8229ADA - .string "The POKéMON LEAGUE is only a short\n" - .string "distance after the VICTORY ROAD.\p" - .string "If you’ve come this far, what choice\n" - .string "do you have but to keep going?$" - -EverGrandeCity_PokemonCenter_1F_Text_229B62: @ 8229B62 - .string "The long and harrowing VICTORY ROAD…\p" - .string "It’s like reliving the path one has\n" - .string "traveled in life…\p" - .string "Believe in your POKéMON and give it\n" - .string "your very best!$" - -EverGrandeCity_PokemonCenter_1F_Text_229BF1: @ 8229BF1 - .string "SCOTT: {PLAYER}{KUN}, you’ve clawed your\n" - .string "way up to face the POKéMON LEAGUE!\p" - .string "I’m happy for you!\n" - .string "You made my cheering worthwhile!\p" - .string "{PLAYER}{KUN}, if you were to become\n" - .string "the POKéMON LEAGUE CHAMPION…\p" - .string "I’ll get in touch with you then.\p" - .string "Okay, {PLAYER}{KUN}.\n" - .string "Go for greatness!$" - diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc b/data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc deleted file mode 100644 index 09d382b2b..000000000 --- a/data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc +++ /dev/null @@ -1,20 +0,0 @@ -EverGrandeCity_PokemonCenter_2F_MapScripts:: @ 8229CE0 - map_script 2, EverGrandeCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, EverGrandeCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, EverGrandeCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, EverGrandeCity_PokemonCenter_2F_MapScript1_276ACF - .byte 0 - -EverGrandeCity_PokemonCenter_2F_EventScript_229CF5:: @ 8229CF5 - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 - end - -EverGrandeCity_PokemonCenter_2F_EventScript_229CFB:: @ 8229CFB - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 - end - -EverGrandeCity_PokemonCenter_2F_EventScript_229D01:: @ 8229D01 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB - end - - diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc deleted file mode 100644 index f1a6ce17f..000000000 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc +++ /dev/null @@ -1,142 +0,0 @@ -EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2 - map_script 3, EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD - map_script 5, EverGrandeCity_PokemonLeague_1F_MapScript1_277C30 - .byte 0 - -EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD: @ 82295DD - setrespawn 20 - setflag FLAG_LANDMARK_POKEMON_LEAGUE - checkflag FLAG_0x107 - call_if 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295ED - end - -EverGrandeCity_PokemonLeague_1F_EventScript_2295ED:: @ 82295ED - setobjectxyperm 3, 9, 2 - setobjectxyperm 4, 10, 2 - return - -EverGrandeCity_PokemonLeague_1F_EventScript_2295FC:: @ 82295FC - setvar VAR_0x800B, 1 - call EverGrandeCity_PokemonLeague_1F_EventScript_27191E - waitmessage - waitbuttonpress - release - end - -EverGrandeCity_PokemonLeague_1F_EventScript_22960A:: @ 822960A - lock - faceplayer - message gUnknown_08272A21 - waitmessage - pokemart EverGrandeCity_PokemonLeague_1F_Pokemart_229624 - msgbox gUnknown_08272A3F, 4 - release - end - - .align 2 -EverGrandeCity_PokemonLeague_1F_Pokemart_229624: @ 8229624 - .2byte ITEM_ULTRA_BALL - .2byte ITEM_HYPER_POTION - .2byte ITEM_MAX_POTION - .2byte ITEM_FULL_RESTORE - .2byte ITEM_FULL_HEAL - .2byte ITEM_REVIVE - .2byte ITEM_MAX_REPEL - .2byte ITEM_NONE - release - end - -EverGrandeCity_PokemonLeague_1F_EventScript_229636:: @ 8229636 - lockall - checkflag FLAG_0x107 - goto_eq EverGrandeCity_PokemonLeague_1F_EventScript_2296BB - getplayerxy VAR_TEMP_0, VAR_TEMP_1 - compare VAR_TEMP_0, 11 - call_if 4, EverGrandeCity_PokemonLeague_1F_EventScript_229698 - compare VAR_TEMP_0, 8 - call_if 3, EverGrandeCity_PokemonLeague_1F_EventScript_2296A3 - message EverGrandeCity_PokemonLeague_1F_Text_2296E8 - waitmessage - delay 120 - checkflag FLAG_BADGE06_GET - goto_if 0, EverGrandeCity_PokemonLeague_1F_EventScript_2296AE - closemessage - applymovement 3, EverGrandeCity_PokemonLeague_1F_Movement_2296E2 - applymovement 4, EverGrandeCity_PokemonLeague_1F_Movement_2296E5 - waitmovement 0 - delay 10 - playfanfare MUS_ME_BACHI - message EverGrandeCity_PokemonLeague_1F_Text_2297EF - waitmessage - waitfanfare - closemessage - moveobjectoffscreen 3 - moveobjectoffscreen 4 - setflag FLAG_0x107 - releaseall - end - -EverGrandeCity_PokemonLeague_1F_EventScript_229698:: @ 8229698 - applymovement 255, EverGrandeCity_PokemonLeague_1F_Movement_2296DA - waitmovement 0 - return - -EverGrandeCity_PokemonLeague_1F_EventScript_2296A3:: @ 82296A3 - applymovement 255, EverGrandeCity_PokemonLeague_1F_Movement_2296DE - waitmovement 0 - return - -EverGrandeCity_PokemonLeague_1F_EventScript_2296AE:: @ 82296AE - playse SE_HAZURE - msgbox EverGrandeCity_PokemonLeague_1F_Text_229787, 4 - releaseall - end - -EverGrandeCity_PokemonLeague_1F_EventScript_2296BB:: @ 82296BB - applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_1F_Movement_27259E - waitmovement 0 - msgbox EverGrandeCity_PokemonLeague_1F_Text_2297EF, 4 - closemessage - applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_1F_Movement_2725A2 - waitmovement 0 - releaseall - end - -EverGrandeCity_PokemonLeague_1F_Movement_2296DA: @ 82296DA - walk_down - walk_left - walk_in_place_fastest_up - step_end - -EverGrandeCity_PokemonLeague_1F_Movement_2296DE: @ 82296DE - walk_down - walk_right - walk_in_place_fastest_up - step_end - -EverGrandeCity_PokemonLeague_1F_Movement_2296E2: @ 82296E2 - walk_left - walk_in_place_fastest_down - step_end - -EverGrandeCity_PokemonLeague_1F_Movement_2296E5: @ 82296E5 - walk_right - walk_in_place_fastest_down - step_end - -EverGrandeCity_PokemonLeague_1F_Text_2296E8: @ 82296E8 - .string "Beyond this point, only those TRAINERS\n" - .string "who have collected all the GYM BADGES\l" - .string "are permitted to enter.\p" - .string "TRAINER, let us confirm that you have\n" - .string "all the GYM BADGES.$" - -EverGrandeCity_PokemonLeague_1F_Text_229787: @ 8229787 - .string "You haven’t obtained all the BADGES.\p" - .string "If you’re bound for the POKéMON\n" - .string "LEAGUE, you must return with them.$" - -EverGrandeCity_PokemonLeague_1F_Text_2297EF: @ 82297EF - .string "TRAINER! Believe in yourself and your\n" - .string "POKéMON, and go forth!$" - diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague_2F.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague_2F.inc deleted file mode 100644 index d3a77a051..000000000 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague_2F.inc +++ /dev/null @@ -1,19 +0,0 @@ -EverGrandeCity_PokemonLeague_2F_MapScripts:: @ 8229D07 - map_script 2, EverGrandeCity_PokemonLeague_2F_MapScript2_276C3B - map_script 4, EverGrandeCity_PokemonLeague_2F_MapScript2_276B6C - map_script 1, EverGrandeCity_PokemonLeague_2F_MapScript1_276BBE - map_script 3, EverGrandeCity_PokemonLeague_2F_MapScript1_276ACF - .byte 0 - -EverGrandeCity_PokemonLeague_2F_EventScript_229D1C:: @ 8229D1C - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 - end - -EverGrandeCity_PokemonLeague_2F_EventScript_229D22:: @ 8229D22 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 - end - -EverGrandeCity_PokemonLeague_2F_EventScript_229D28:: @ 8229D28 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB - end - diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc deleted file mode 100644 index b2db55e36..000000000 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ /dev/null @@ -1,91 +0,0 @@ -EverGrandeCity_SidneysRoom_MapScripts:: @ 8227F01 - map_script 1, EverGrandeCity_SidneysRoom_MapScript1_227F1D - map_script 4, EverGrandeCity_SidneysRoom_MapScript2_227F3E - map_script 3, EverGrandeCity_SidneysRoom_MapScript1_227F16 - map_script 2, EverGrandeCity_SidneysRoom_MapScript2_227F4D - .byte 0 - -EverGrandeCity_SidneysRoom_MapScript1_227F16: @ 8227F16 - setflag FLAG_0x1CF - setflag FLAG_0x319 - end - -EverGrandeCity_SidneysRoom_MapScript1_227F1D: @ 8227F1D - checkflag FLAG_0x4FB - call_if 1, EverGrandeCity_SidneysRoom_EventScript_227F32 - compare VAR_0x409C, 1 - call_if 1, EverGrandeCity_SidneysRoom_EventScript_227F38 - end - -EverGrandeCity_SidneysRoom_EventScript_227F32:: @ 8227F32 - call EverGrandeCity_SidneysRoom_EventScript_2724BC - return - -EverGrandeCity_SidneysRoom_EventScript_227F38:: @ 8227F38 - call EverGrandeCity_SidneysRoom_EventScript_27255F - return - -EverGrandeCity_DrakesRoom_MapScript2_227F3E: @ 8227F3E -EverGrandeCity_SidneysRoom_MapScript2_227F3E: @ 8227F3E - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_SidneysRoom_EventScript_227F48 - .2byte 0 - -EverGrandeCity_SidneysRoom_EventScript_227F48:: @ 8227F48 - turnobject 255, 2 - end - -EverGrandeCity_SidneysRoom_MapScript2_227F4D: @ 8227F4D - map_script_2 VAR_0x409C, 0, EverGrandeCity_SidneysRoom_EventScript_227F57 - .2byte 0 - -EverGrandeCity_SidneysRoom_EventScript_227F57:: @ 8227F57 - lockall - call EverGrandeCity_SidneysRoom_EventScript_272475 - setvar VAR_0x409C, 1 - releaseall - end - -EverGrandeCity_SidneysRoom_EventScript_227F64:: @ 8227F64 - lock - faceplayer - checkflag FLAG_0x4FB - goto_eq EverGrandeCity_SidneysRoom_EventScript_227F8B - playbgm MUS_SITENNOU, 0 - msgbox EverGrandeCity_SidneysRoom_Text_227FA7, 4 - trainerbattle 3, TRAINER_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_2280A2 - goto EverGrandeCity_SidneysRoom_EventScript_227F95 - end - -EverGrandeCity_SidneysRoom_EventScript_227F8B:: @ 8227F8B - msgbox EverGrandeCity_SidneysRoom_Text_2280EC, 4 - release - end - -EverGrandeCity_SidneysRoom_EventScript_227F95:: @ 8227F95 - setflag FLAG_0x4FB - call EverGrandeCity_SidneysRoom_EventScript_2723F8 - msgbox EverGrandeCity_SidneysRoom_Text_2280EC, 4 - release - end - -EverGrandeCity_SidneysRoom_Text_227FA7: @ 8227FA7 - .string "Welcome, challenger!\n" - .string "I’m SIDNEY of the ELITE FOUR.\p" - .string "I like that look you’re giving me.\n" - .string "I guess you’ll give me a good match.\l" - .string "That’s good! Looking real good!\p" - .string "All right! You and me, let’s enjoy\n" - .string "a battle that can only be staged\l" - .string "here in the POKéMON LEAGUE!$" - -EverGrandeCity_SidneysRoom_Text_2280A2: @ 82280A2 - .string "Well, how do you like that? I lost!\n" - .string "Eh, it was fun, so it doesn’t matter.$" - -EverGrandeCity_SidneysRoom_Text_2280EC: @ 82280EC - .string "Well, listen to what this loser has\n" - .string "to say.\p" - .string "You’ve got what it takes to go far.\n" - .string "Now, go on to the next room and enjoy\l" - .string "your next battle!$" - diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc deleted file mode 100644 index 21cea72e1..000000000 --- a/data/scripts/maps/FallarborTown.inc +++ /dev/null @@ -1,96 +0,0 @@ -FallarborTown_MapScripts:: @ 81EB1FA - map_script 3, FallarborTown_MapScript1_1EB200 - .byte 0 - -FallarborTown_MapScript1_1EB200: @ 81EB200 - setflag FLAG_VISITED_FALLARBOR_TOWN - setvar VAR_0x4086, 0 - clearflag FLAG_0x10E - end - -FallarborTown_EventScript_1EB20C:: @ 81EB20C - lock - faceplayer - checkflag FLAG_0x08B - goto_eq FallarborTown_EventScript_1EB221 - msgbox FallarborTown_Text_1EB26B, 4 - release - end - -FallarborTown_EventScript_1EB221:: @ 81EB221 - msgbox FallarborTown_Text_1EB2DE, 4 - release - end - -FallarborTown_EventScript_1EB22B:: @ 81EB22B - msgbox FallarborTown_Text_1EB35F, 2 - end - -FallarborTown_EventScript_1EB234:: @ 81EB234 - msgbox FallarborTown_Text_1EB3CA, 2 - end - -FallarborTown_EventScript_1EB23D:: @ 81EB23D - lock - faceplayer - waitse - playmoncry SPECIES_AZURILL, 0 - msgbox FallarborTown_Text_1EB3B5, 4 - waitmoncry - release - end - -FallarborTown_EventScript_1EB250:: @ 81EB250 - msgbox FallarborTown_Text_1EB4C2, 3 - end - -FallarborTown_EventScript_1EB259:: @ 81EB259 - msgbox FallarborTown_Text_1EB4FE, 3 - end - -FallarborTown_EventScript_1EB262:: @ 81EB262 - msgbox FallarborTown_Text_1EB534, 3 - end - -FallarborTown_Text_1EB26B: @ 81EB26B - .string "Something’s happening,\n" - .string "and I don’t like it!\p" - .string "I’ve seen shady characters wandering\n" - .string "in and out of PROF. COZMO’s home…$" - -FallarborTown_Text_1EB2DE: @ 81EB2DE - .string "This region’s been known for meteors\n" - .string "since the olden days.\p" - .string "They say METEOR FALLS was gouged out\n" - .string "by a falling meteorite long ago.$" - -FallarborTown_Text_1EB35F: @ 81EB35F - .string "See! Take a look!\n" - .string "This is my precious AZURILL!\p" - .string "It’s slick and smooth and plushy, too!$" - -FallarborTown_Text_1EB3B5: @ 81EB3B5 - .string "AZURILL: Rooreelooo.$" - -FallarborTown_Text_1EB3CA: @ 81EB3CA - .string "Have you already challenged FLANNERY,\n" - .string "the LEADER of LAVARIDGE GYM?\p" - .string "The girl’s grandfather was famous.\n" - .string "He was one of the ELITE FOUR in the\l" - .string "POKéMON LEAGUE at one point.\p" - .string "It wouldn’t surprise me to see FLANNERY\n" - .string "become a great TRAINER in her own\l" - .string "right.$" - -FallarborTown_Text_1EB4C2: @ 81EB4C2 - .string "BATTLE TENT FALLARBOR SITE\n" - .string "“May the Greatest Teams Gather!â€$" - -FallarborTown_Text_1EB4FE: @ 81EB4FE - .string "FALLARBOR TOWN\n" - .string "“A farm community with small gardens.â€$" - -FallarborTown_Text_1EB534: @ 81EB534 - .string "MOVE TUTOR’S HOUSE\n" - .string "“New moves taught to POKéMON.â€$" - diff --git a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc b/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc deleted file mode 100644 index e373ff5ad..000000000 --- a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc +++ /dev/null @@ -1,268 +0,0 @@ -FallarborTown_BattleTentBattleRoom_MapScripts:: @ 8200899 - map_script 3, FallarborTown_BattleTentBattleRoom_MapScript1_2008A9 - map_script 2, FallarborTown_BattleTentBattleRoom_MapScript2_2008DD - map_script 4, FallarborTown_BattleTentBattleRoom_MapScript2_200BB0 - .byte 0 - -FallarborTown_BattleTentBattleRoom_MapScript1_2008A9: @ 82008A9 - call FallarborTown_BattleTentBattleRoom_EventScript_2008AF - end - -FallarborTown_BattleTentBattleRoom_EventScript_2008AF:: @ 82008AF - checkplayergender - compare VAR_RESULT, 0 - goto_eq FallarborTown_BattleTentBattleRoom_EventScript_2008C7 - compare VAR_RESULT, 1 - goto_eq FallarborTown_BattleTentBattleRoom_EventScript_2008D2 - return - -FallarborTown_BattleTentBattleRoom_EventScript_2008C7:: @ 82008C7 - setvar VAR_OBJ_GFX_ID_1, 100 - setvar VAR_OBJ_GFX_ID_0, 100 - return - -FallarborTown_BattleTentBattleRoom_EventScript_2008D2:: @ 82008D2 - setvar VAR_OBJ_GFX_ID_1, 105 - setvar VAR_OBJ_GFX_ID_0, 105 - return - -FallarborTown_BattleTentBattleRoom_MapScript2_2008DD: @ 82008DD - map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentBattleRoom_EventScript_2008E7 - .2byte 0 - -FallarborTown_BattleTentBattleRoom_EventScript_2008E7:: @ 82008E7 - lockall - showobjectat 1, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM - applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B8D - waitmovement 0 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_if 5, FallarborTown_BattleTentBattleRoom_EventScript_200B73 - -FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F - setvar VAR_0x8004, 3 - special sub_8161F74 - addobject 3 - applymovement 3, FallarborTown_BattleTentBattleRoom_Movement_200B96 - waitmovement 0 - applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BA3 - playse SE_W187 - waitse - waitmovement 0 - msgbox FallarborTown_BattleTentBattleRoom_Text_257C93, 4 - setvar VAR_0x8004, 4 - special sub_81B99B4 - msgbox 0x2021fc4, 4 - waitmessage - call FallarborTown_BattleTentBattleRoom_EventScript_257B6C - switch VAR_RESULT - case 1, FallarborTown_BattleTentBattleRoom_EventScript_20099C - applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BA3 - playse SE_W173 - waitse - waitmovement 0 - setvar VAR_0x8004, 6 - special sub_81B9B80 - msgbox FallarborTown_BattleTentBattleRoom_Text_257CCE, 4 - -FallarborTown_BattleTentBattleRoom_EventScript_20097E:: @ 820097E - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 4 - special sub_81A1780 - special LoadPlayerParty - warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 - waitstate - -FallarborTown_BattleTentBattleRoom_EventScript_20099C:: @ 820099C - applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BA3 - playse SE_BAN - waitse - waitmovement 0 - msgbox FallarborTown_BattleTentBattleRoom_Text_257CB3, 4 - closemessage - -FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special sub_81A1780 - addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 - switch VAR_RESULT - case 3, FallarborTown_BattleTentBattleRoom_EventScript_200AF3 - applymovement 3, FallarborTown_BattleTentBattleRoom_Movement_200B9E - waitmovement 0 - removeobject 3 - applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BA6 - waitmovement 0 - applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B94 - waitmovement 0 - msgbox FallarborTown_BattleTentBattleRoom_Text_257CE9, 4 - special LoadPlayerParty - special SavePlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 - special sub_81A1780 - playfanfare MUS_ME_ASA - waitfanfare - special HealPlayerParty - -FallarborTown_BattleTentBattleRoom_EventScript_200A2A:: @ 8200A2A - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special sub_81A1780 - compare VAR_RESULT, 1 - call_if 1, FallarborTown_BattleTentBattleRoom_EventScript_200B43 - compare VAR_RESULT, 2 - call_if 1, FallarborTown_BattleTentBattleRoom_EventScript_200B4A - multichoice 20, 6, 104, 1 - switch VAR_RESULT - case 0, FallarborTown_BattleTentBattleRoom_EventScript_200AD8 - case 1, FallarborTown_BattleTentBattleRoom_EventScript_200A78 - case 2, FallarborTown_BattleTentBattleRoom_EventScript_200AA6 - -FallarborTown_BattleTentBattleRoom_EventScript_200A78:: @ 8200A78 - msgbox FallarborTown_BattleTentBattleRoom_Text_257E6B, 5 - switch VAR_RESULT - case 0, FallarborTown_BattleTentBattleRoom_EventScript_200A2A - case 1, FallarborTown_BattleTentBattleRoom_EventScript_200B51 - case 127, FallarborTown_BattleTentBattleRoom_EventScript_200A2A - -FallarborTown_BattleTentBattleRoom_EventScript_200AA6:: @ 8200AA6 - message FallarborTown_BattleTentBattleRoom_Text_257E9E - waitmessage - multichoicedefault 20, 8, 94, 1, 0 - switch VAR_RESULT - case 1, FallarborTown_BattleTentBattleRoom_EventScript_200A2A - case 0, FallarborTown_BattleTentBattleRoom_EventScript_20097E - case 127, FallarborTown_BattleTentBattleRoom_EventScript_200A2A - -FallarborTown_BattleTentBattleRoom_EventScript_200AD8:: @ 8200AD8 - closemessage - applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BAB - waitmovement 0 - applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B92 - waitmovement 0 - goto FallarborTown_BattleTentBattleRoom_EventScript_20090F - waitstate - -FallarborTown_BattleTentBattleRoom_EventScript_200AF3:: @ 8200AF3 - delay 60 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 3 - special sub_81A1780 - special LoadPlayerParty - warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 - waitstate - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - special sub_81A5238 - compare VAR_RESULT, 9999 - goto_eq FallarborTown_BattleTentBattleRoom_EventScript_2009B3 - addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - copyvar VAR_0x8006, VAR_RESULT - special sub_81A5238 - -FallarborTown_BattleTentBattleRoom_EventScript_200B43:: @ 8200B43 - message FallarborTown_BattleTentBattleRoom_Text_257D17 - waitmessage - return - -FallarborTown_BattleTentBattleRoom_EventScript_200B4A:: @ 8200B4A - message FallarborTown_BattleTentBattleRoom_Text_257D50 - waitmessage - return - -FallarborTown_BattleTentBattleRoom_EventScript_200B51:: @ 8200B51 - message FallarborTown_BattleTentBattleRoom_Text_257EDB - waitmessage - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 2 - special sub_81B9B80 - playse SE_SAVE - waitse - fadescreen 1 - setvar VAR_0x8004, 4 - special sub_81A1780 - end - -FallarborTown_BattleTentBattleRoom_EventScript_200B73:: @ 8200B73 - applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BA6 - waitmovement 0 - applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B94 - waitmovement 0 - goto FallarborTown_BattleTentBattleRoom_EventScript_200A2A - end - -FallarborTown_BattleTentBattleRoom_Movement_200B8D: @ 8200B8D - walk_up - walk_up - walk_up - walk_in_place_fastest_right - step_end - -FallarborTown_BattleTentBattleRoom_Movement_200B92: @ 8200B92 - walk_in_place_fastest_right - step_end - -FallarborTown_BattleTentBattleRoom_Movement_200B94: @ 8200B94 - walk_in_place_fastest_left - step_end - -FallarborTown_BattleTentBattleRoom_Movement_200B96: @ 8200B96 - walk_down - walk_down - walk_down - walk_down - walk_in_place_fastest_left - step_end - -FallarborTown_BattleTentBattleRoom_Movement_200B9C: @ 8200B9C - walk_left - step_end - -FallarborTown_BattleTentBattleRoom_Movement_200B9E: @ 8200B9E - walk_up - walk_up - walk_up - walk_up - step_end - -FallarborTown_BattleTentBattleRoom_Movement_200BA3: @ 8200BA3 - disable_jump_landing_ground_effect - jump_in_place_down - step_end - -FallarborTown_BattleTentBattleRoom_Movement_200BA6: @ 8200BA6 - walk_down - walk_down - walk_down - walk_in_place_fastest_right - step_end - -FallarborTown_BattleTentBattleRoom_Movement_200BAB: @ 8200BAB - walk_up - walk_up - walk_up - walk_in_place_fastest_down - step_end - -FallarborTown_BattleTentBattleRoom_MapScript2_200BB0: @ 8200BB0 - map_script_2 VAR_TEMP_1, 0, FallarborTown_BattleTentBattleRoom_EventScript_200BBA - .2byte 0 - -FallarborTown_BattleTentBattleRoom_EventScript_200BBA:: @ 8200BBA - 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 deleted file mode 100644 index f1a144a14..000000000 --- a/data/scripts/maps/FallarborTown_BattleTentCorridor.inc +++ /dev/null @@ -1,64 +0,0 @@ -FallarborTown_BattleTentCorridor_MapScripts:: @ 82006A7 - map_script 2, FallarborTown_BattleTentCorridor_MapScript2_2006AD - .byte 0 - -FallarborTown_BattleTentCorridor_MapScript2_2006AD: @ 82006AD - map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentCorridor_EventScript_2006B7 - .2byte 0 - -FallarborTown_BattleTentCorridor_EventScript_2006B7:: @ 82006B7 - lockall - setvar VAR_TEMP_0, 1 - applymovement 1, FallarborTown_BattleTentCorridor_Movement_2006FB - applymovement 255, FallarborTown_BattleTentCorridor_Movement_2006FB - waitmovement 0 - opendoor 2, 1 - waitdooranim - applymovement 1, FallarborTown_BattleTentCorridor_Movement_200701 - applymovement 255, FallarborTown_BattleTentCorridor_Movement_200700 - waitmovement 0 - closedoor 2, 1 - waitdooranim - setvar VAR_0x8006, 0 - warp MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM, 255, 4, 4 - waitstate - releaseall - end - -FallarborTown_BattleTentCorridor_Movement_2006FB: @ 82006FB - walk_up - walk_up - walk_up - walk_up - step_end - -FallarborTown_BattleTentCorridor_Movement_200700: @ 8200700 - walk_up - -FallarborTown_BattleTentCorridor_Movement_200701: @ 8200701 - walk_up - set_invisible - step_end - -FallarborTown_BattleTentCorridor_Text_200704: @ 8200704 - .string "We do all right in the preliminary round,\n" - .string "but we can never win the appeals…\p" - .string "Maybe it means I have to watch what\n" - .string "other contestants are doing…$" - -FallarborTown_BattleTentCorridor_Text_200791: @ 8200791 - .string "See!\n" - .string "My POKéMON won all these RIBBONS!\p" - .string "Have your POKéMON earned any RIBBONS?\n" - .string "You can check them on your POKéNAV.$" - -FallarborTown_BattleTentCorridor_Text_200802: @ 8200802 - .string "I can’t beat GYM LEADERS…\p" - .string "I can’t win any CONTESTS…\p" - .string "I’ve been here, there, and everywhere,\n" - .string "and it’s all for naught…$" - -FallarborTown_BattleTentCorridor_Text_200876: @ 8200876 - .string "POKéMON CONTESTS\n" - .string "SUPER RANK STAGE!$" - diff --git a/data/scripts/maps/FallarborTown_BattleTentLobby.inc b/data/scripts/maps/FallarborTown_BattleTentLobby.inc deleted file mode 100644 index 00efa5394..000000000 --- a/data/scripts/maps/FallarborTown_BattleTentLobby.inc +++ /dev/null @@ -1,402 +0,0 @@ -FallarborTown_BattleTentLobby_MapScripts:: @ 81FFE66 - map_script 2, FallarborTown_BattleTentLobby_MapScript2_1FFE85 - map_script 4, FallarborTown_BattleTentLobby_MapScript2_1FFE71 - .byte 0 - -FallarborTown_BattleTentLobby_MapScript2_1FFE71: @ 81FFE71 - map_script_2 VAR_TEMP_1, 0, FallarborTown_BattleTentLobby_EventScript_1FFE7B - .2byte 0 - -FallarborTown_BattleTentLobby_EventScript_1FFE7B:: @ 81FFE7B - setvar VAR_TEMP_1, 1 - turnobject 255, 2 - end - -FallarborTown_BattleTentLobby_MapScript2_1FFE85: @ 81FFE85 - map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentLobby_EventScript_1FFEAF - map_script_2 VAR_TEMP_0, 1, FallarborTown_BattleTentLobby_EventScript_1FFEB8 - map_script_2 VAR_TEMP_0, 2, FallarborTown_BattleTentLobby_EventScript_1FFFCD - map_script_2 VAR_TEMP_0, 3, FallarborTown_BattleTentLobby_EventScript_1FFEED - map_script_2 VAR_TEMP_0, 4, FallarborTown_BattleTentLobby_EventScript_1FFF93 - .2byte 0 - -FallarborTown_BattleTentLobby_EventScript_1FFEAF:: @ 81FFEAF - setvar VAR_0x8004, 0 - special sub_81A1780 - end - -FallarborTown_BattleTentLobby_EventScript_1FFEB8:: @ 81FFEB8 - lockall - msgbox FallarborTown_BattleTentLobby_Text_2C4DED, 4 - closemessage - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_TEMP_0, 255 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 0 - special sub_81A1780 - releaseall - end - -FallarborTown_BattleTentLobby_EventScript_1FFEED:: @ 81FFEED - lockall - msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, 4 - message FallarborTown_BattleTentLobby_Text_2C4EFF - waitmessage - setvar VAR_0x8004, 4 - special sub_81B9B80 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 0 - special sub_81B9B80 - playse SE_SAVE - waitse - -FallarborTown_BattleTentLobby_EventScript_1FFF27:: @ 81FFF27 - msgbox FallarborTown_BattleTentLobby_Text_2C4F22, 4 - setvar VAR_0x8004, 5 - special sub_81B9B80 - switch VAR_RESULT - case 0, FallarborTown_BattleTentLobby_EventScript_1FFF73 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special sub_81A1780 - message FallarborTown_BattleTentLobby_Text_2C4F69 - waitmessage - playfanfare MUS_FANFA4 - waitfanfare - msgbox FallarborTown_BattleTentLobby_Text_2C501F, 4 - closemessage - setvar VAR_TEMP_0, 255 - releaseall - end - -FallarborTown_BattleTentLobby_EventScript_1FFF73:: @ 81FFF73 - msgbox FallarborTown_BattleTentLobby_Text_2C4F83, 4 - waitmessage - closemessage - setvar VAR_TEMP_0, 255 - releaseall - end - -FallarborTown_BattleTentLobby_EventScript_1FFF84:: @ 81FFF84 - lockall - msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, 4 - goto FallarborTown_BattleTentLobby_EventScript_1FFF27 - end - -FallarborTown_BattleTentLobby_EventScript_1FFF93:: @ 81FFF93 - lockall - message FallarborTown_BattleTentLobby_Text_2C4FD7 - waitmessage - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 0 - special sub_81B9B80 - playse SE_SAVE - waitse - msgbox FallarborTown_BattleTentLobby_Text_2C501F, 4 - closemessage - setvar VAR_TEMP_0, 255 - releaseall - end - -FallarborTown_BattleTentLobby_EventScript_1FFFCD:: @ 81FFFCD - lockall - message FallarborTown_BattleTentLobby_Text_2C504C - waitmessage - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 1 - special sub_81B9B80 - playse SE_SAVE - waitse - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_TEMP_0, 255 - goto FallarborTown_BattleTentLobby_EventScript_20013C - -FallarborTown_BattleTentLobby_EventScript_200001:: @ 8200001 - lock - faceplayer - setvar VAR_0x8004, 1 - special sub_81B9B80 - compare VAR_RESULT, 0 - goto_if 5, FallarborTown_BattleTentLobby_EventScript_1FFF84 - special SavePlayerParty - msgbox FallarborTown_BattleTentLobby_Text_2C47EB, 4 - -FallarborTown_BattleTentLobby_EventScript_200021:: @ 8200021 - message FallarborTown_BattleTentLobby_Text_2C4843 - waitmessage - multichoice 17, 6, 23, 0 - switch VAR_RESULT - case 0, FallarborTown_BattleTentLobby_EventScript_20005D - case 1, FallarborTown_BattleTentLobby_EventScript_200169 - case 2, FallarborTown_BattleTentLobby_EventScript_2001C5 - case 127, FallarborTown_BattleTentLobby_EventScript_2001C5 - -FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D - setvar VAR_FRONTIER_FACILITY, 3 - setvar VAR_0x40CE, 0 - setvar VAR_RESULT, 2 - setvar VAR_0x8004, 15 - special sub_81A1780 - compare VAR_0x8004, 1 - goto_eq FallarborTown_BattleTentLobby_EventScript_200176 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 2 - special sub_81A1780 - msgbox FallarborTown_BattleTentLobby_Text_2C4BC8, 4 - fadescreen 1 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - special sub_80F9490 - waitstate - compare VAR_RESULT, 0 - goto_eq FallarborTown_BattleTentLobby_EventScript_2001C2 - msgbox FallarborTown_BattleTentLobby_Text_2C4B35, 5 - switch VAR_RESULT - case 0, FallarborTown_BattleTentLobby_EventScript_2001C2 - case 1, FallarborTown_BattleTentLobby_EventScript_2000E2 - case 127, FallarborTown_BattleTentLobby_EventScript_2001C2 - -FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2 - setvar VAR_TEMP_0, 0 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 4 - special sub_81A1780 - setvar VAR_0x8004, 0 - special sub_81B9B80 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 1 - special sub_81A1780 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 0 - special sub_81A1780 - special LoadPlayerParty - closemessage - delay 2 - call FallarborTown_BattleTentLobby_EventScript_27134F - setvar VAR_TEMP_0, 255 - compare VAR_RESULT, 0 - goto_eq FallarborTown_BattleTentLobby_EventScript_2001AB - -FallarborTown_BattleTentLobby_EventScript_20013C:: @ 820013C - special SavePlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 - special sub_81A1780 - msgbox FallarborTown_BattleTentLobby_Text_2C4DC3, 4 - closemessage - call FallarborTown_BattleTentLobby_EventScript_2001CF - warp MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7 - setvar VAR_TEMP_0, 0 - waitstate - end - -FallarborTown_BattleTentLobby_EventScript_200169:: @ 8200169 - msgbox FallarborTown_BattleTentLobby_Text_2C48AC, 4 - goto FallarborTown_BattleTentLobby_EventScript_200021 - -FallarborTown_BattleTentLobby_EventScript_200176:: @ 8200176 - switch VAR_RESULT - case 0, FallarborTown_BattleTentLobby_EventScript_200191 - case 1, FallarborTown_BattleTentLobby_EventScript_20019E - -FallarborTown_BattleTentLobby_EventScript_200191:: @ 8200191 - msgbox FallarborTown_BattleTentLobby_Text_2C4BFA, 4 - goto FallarborTown_BattleTentLobby_EventScript_2001CD - -FallarborTown_BattleTentLobby_EventScript_20019E:: @ 820019E - msgbox FallarborTown_BattleTentLobby_Text_2C4CC0, 4 - goto FallarborTown_BattleTentLobby_EventScript_2001CD - -FallarborTown_BattleTentLobby_EventScript_2001AB:: @ 82001AB - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special sub_81A1780 - goto FallarborTown_BattleTentLobby_EventScript_2001C5 - -FallarborTown_BattleTentLobby_EventScript_2001C2:: @ 82001C2 - special LoadPlayerParty - -FallarborTown_BattleTentLobby_EventScript_2001C5:: @ 82001C5 - msgbox FallarborTown_BattleTentLobby_Text_2C487F, 4 - -FallarborTown_BattleTentLobby_EventScript_2001CD:: @ 82001CD - release - end - -FallarborTown_BattleTentLobby_EventScript_2001CF:: @ 82001CF - applymovement 1, FallarborTown_BattleTentLobby_Movement_2001FE - applymovement 255, FallarborTown_BattleTentLobby_Movement_200205 - waitmovement 0 - opendoor 6, 1 - waitdooranim - applymovement 1, FallarborTown_BattleTentLobby_Movement_200202 - applymovement 255, FallarborTown_BattleTentLobby_Movement_200209 - waitmovement 0 - closedoor 6, 1 - waitdooranim - return - -FallarborTown_BattleTentLobby_Movement_2001FE: @ 82001FE - walk_up - walk_up - walk_up - step_end - -FallarborTown_BattleTentLobby_Movement_200202: @ 8200202 - walk_up - set_invisible - step_end - -FallarborTown_BattleTentLobby_Movement_200205: @ 8200205 - walk_up - walk_up - walk_up - step_end - -FallarborTown_BattleTentLobby_Movement_200209: @ 8200209 - walk_up - walk_up - set_invisible - step_end - -FallarborTown_BattleTentLobby_EventScript_20020D:: @ 820020D - msgbox FallarborTown_BattleTentLobby_Text_20045A, 2 - end - -FallarborTown_BattleTentLobby_EventScript_200216:: @ 8200216 - msgbox FallarborTown_BattleTentLobby_Text_200304, 2 - end - -FallarborTown_BattleTentLobby_EventScript_20021F:: @ 820021F - msgbox FallarborTown_BattleTentLobby_Text_200382, 2 - end - -FallarborTown_BattleTentLobby_EventScript_200228:: @ 8200228 - lock - faceplayer - checkflag FLAG_0x1CD - goto_eq FallarborTown_BattleTentLobby_EventScript_200245 - msgbox FallarborTown_BattleTentLobby_Text_200501, 4 - addvar VAR_0x40D1, 1 - setflag FLAG_0x1CD - release - end - -FallarborTown_BattleTentLobby_EventScript_200245:: @ 8200245 - msgbox FallarborTown_BattleTentLobby_Text_200653, 4 - release - end - -FallarborTown_BattleTentLobby_EventScript_20024F:: @ 820024F - lockall - msgbox FallarborTown_BattleTentLobby_Text_256DB8, 4 - goto FallarborTown_BattleTentLobby_EventScript_20025E - end - -FallarborTown_BattleTentLobby_EventScript_20025E:: @ 820025E - message FallarborTown_BattleTentLobby_Text_256DDF - waitmessage - multichoice 17, 0, 112, 0 - switch VAR_RESULT - case 0, FallarborTown_BattleTentLobby_EventScript_2002BC - case 1, FallarborTown_BattleTentLobby_EventScript_2002CA - case 2, FallarborTown_BattleTentLobby_EventScript_2002D8 - case 3, FallarborTown_BattleTentLobby_EventScript_2002E6 - case 4, FallarborTown_BattleTentLobby_EventScript_2002F4 - case 5, FallarborTown_BattleTentLobby_EventScript_200302 - case 127, FallarborTown_BattleTentLobby_EventScript_200302 - end - -FallarborTown_BattleTentLobby_EventScript_2002BC:: @ 82002BC - msgbox FallarborTown_BattleTentLobby_Text_2C67CD, 4 - goto FallarborTown_BattleTentLobby_EventScript_20025E - end - -FallarborTown_BattleTentLobby_EventScript_2002CA:: @ 82002CA - msgbox FallarborTown_BattleTentLobby_Text_256E02, 4 - goto FallarborTown_BattleTentLobby_EventScript_20025E - end - -FallarborTown_BattleTentLobby_EventScript_2002D8:: @ 82002D8 - msgbox FallarborTown_BattleTentLobby_Text_256F43, 4 - goto FallarborTown_BattleTentLobby_EventScript_20025E - end - -FallarborTown_BattleTentLobby_EventScript_2002E6:: @ 82002E6 - msgbox FallarborTown_BattleTentLobby_Text_256FF2, 4 - goto FallarborTown_BattleTentLobby_EventScript_20025E - end - -FallarborTown_BattleTentLobby_EventScript_2002F4:: @ 82002F4 - msgbox FallarborTown_BattleTentLobby_Text_257202, 4 - goto FallarborTown_BattleTentLobby_EventScript_20025E - end - -FallarborTown_BattleTentLobby_EventScript_200302:: @ 8200302 - releaseall - end - -FallarborTown_BattleTentLobby_Text_200304: @ 8200304 - .string "Fufufufufu.\p" - .string "I’m going to make everyone think\n" - .string "I’m just a kid and let them play down.\p" - .string "Then, I’ll shock them and grab\n" - .string "the title!$" - -FallarborTown_BattleTentLobby_Text_200382: @ 8200382 - .string "You know how BATTLE TENTS offer\n" - .string "different events in different towns?\p" - .string "My favorite is definitely the BATTLE\n" - .string "TENT in FALLARBOR TOWN.\p" - .string "I think it’s fantastic how TRAINERS\n" - .string "try to win with all their faith in\l" - .string "their POKéMON.$" - -FallarborTown_BattleTentLobby_Text_20045A: @ 820045A - .string "I heard something about some tent,\n" - .string "so I came to camp out.\p" - .string "I didn’t know that tents these days\n" - .string "are so luxurious!\p" - .string "Since I’m here, I may as well try\n" - .string "my hand at battling!$" - -FallarborTown_BattleTentLobby_Text_200501: @ 8200501 - .string "SCOTT: Hi, {PLAYER}{KUN}!\n" - .string "So you came out to this BATTLE TENT!\p" - .string "The people in these parts tend to be\n" - .string "easygoing and laid-back.\p" - .string "But, you see, what I’m looking for are\n" - .string "people with…\p" - .string "How should I say this?\p" - .string "Someone bursting with the desire\n" - .string "and the drive to win.\p" - .string "If there were a TRAINER like that,\n" - .string "I’d immediately…\p" - .string "Whoops! Never mind!\n" - .string "Keep working at it!$" - -FallarborTown_BattleTentLobby_Text_200653: @ 8200653 - .string "SCOTT: Instead of wasting your\n" - .string "time with the likes of me, why not\l" - .string "make a challenge?$" - diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc deleted file mode 100644 index 47459f8d5..000000000 --- a/data/scripts/maps/FallarborTown_House1.inc +++ /dev/null @@ -1,126 +0,0 @@ -FallarborTown_House1_MapScripts:: @ 8200F12 - .byte 0 - -FallarborTown_House1_EventScript_200F13:: @ 8200F13 - lock - faceplayer - checkflag FLAG_0x0E5 - goto_eq FallarborTown_House1_EventScript_200FB2 - checkitem ITEM_METEORITE, 1 - compare VAR_RESULT, 1 - goto_eq FallarborTown_House1_EventScript_200F38 - msgbox FallarborTown_House1_Text_200FEE, 4 - release - end - -FallarborTown_House1_EventScript_200F38:: @ 8200F38 - checkflag FLAG_0x002 - call_if 0, FallarborTown_House1_EventScript_200F8B - checkflag FLAG_0x002 - call_if 1, FallarborTown_House1_EventScript_200F9C - compare VAR_RESULT, 0 - goto_eq FallarborTown_House1_EventScript_200FA5 - msgbox FallarborTown_House1_Text_201159, 4 - giveitem_std ITEM_TM27 - compare VAR_RESULT, 0 - goto_eq FallarborTown_House1_EventScript_272054 - setvar VAR_0x8004, 280 - call FallarborTown_House1_EventScript_2723E4 - setflag FLAG_0x0E5 - msgbox FallarborTown_House1_Text_2011A5, 4 - release - end - -FallarborTown_House1_EventScript_200F8B:: @ 8200F8B - msgbox FallarborTown_House1_Text_200FEE, 4 - msgbox FallarborTown_House1_Text_2010A2, 5 - return - -FallarborTown_House1_EventScript_200F9C:: @ 8200F9C - msgbox FallarborTown_House1_Text_201249, 5 - return - -FallarborTown_House1_EventScript_200FA5:: @ 8200FA5 - setflag FLAG_0x002 - msgbox FallarborTown_House1_Text_201212, 4 - release - end - -FallarborTown_House1_EventScript_200FB2:: @ 8200FB2 - msgbox FallarborTown_House1_Text_2011A5, 4 - release - end - -FallarborTown_House1_EventScript_200FBC:: @ 8200FBC - lock - faceplayer - checkflag FLAG_0x0E5 - goto_eq FallarborTown_House1_EventScript_200FE4 - checkflag FLAG_0x08B - goto_eq FallarborTown_House1_EventScript_200FDA - msgbox FallarborTown_House1_Text_2012BC, 4 - release - end - -FallarborTown_House1_EventScript_200FDA:: @ 8200FDA - msgbox FallarborTown_House1_Text_201310, 4 - release - end - -FallarborTown_House1_EventScript_200FE4:: @ 8200FE4 - msgbox FallarborTown_House1_Text_20134B, 4 - release - end - -FallarborTown_House1_Text_200FEE: @ 8200FEE - .string "PROF. COZMO: Oh…\n" - .string "I never should have let myself be\l" - .string "conned into telling TEAM MAGMA where\l" - .string "you can find METEORITES…\p" - .string "That METEORITE from METEOR FALLS…\n" - .string "It’s never going to be mine now…$" - -FallarborTown_House1_Text_2010A2: @ 82010A2 - .string "Oh!\n" - .string "Hah?\p" - .string "That item…\p" - .string "Could it be?\p" - .string "Is it the METEORITE that TEAM MAGMA\n" - .string "took from METEOR FALLS?\p" - .string "Please, may I have it?\p" - .string "I’m not asking for it for free.\n" - .string "How about in exchange for this TM?$" - -FallarborTown_House1_Text_201159: @ 8201159 - .string "PROF. COZMO: This TM, it represents\n" - .string "my feeling of gratitude.\l" - .string "Please use it!$" - -FallarborTown_House1_Text_2011A5: @ 82011A5 - .string "PROF. COZMO: Oh, I can’t believe it.\n" - .string "This is really, really great!\p" - .string "This is really going to help my research!$" - -FallarborTown_House1_Text_201212: @ 8201212 - .string "PROF. COZMO: Oh, but…\n" - .string "I’m crushed with disappointment…$" - -FallarborTown_House1_Text_201249: @ 8201249 - .string "PROF. COZMO: Please, may I have that\n" - .string "METEORITE?\p" - .string "I’m not asking for it for free.\n" - .string "How about in exchange for this TM?$" - -FallarborTown_House1_Text_2012BC: @ 82012BC - .string "PROF. COZMO went off to METEOR FALLS\n" - .string "on ROUTE 114 with some people from\l" - .string "TEAM MAGMA.$" - -FallarborTown_House1_Text_201310: @ 8201310 - .string "Poor PROF. COZMO…\n" - .string "He’s so depressed… I feel sorry for him.$" - -FallarborTown_House1_Text_20134B: @ 820134B - .string "Look at PROF. COZMO…\n" - .string "He’s so happy! I think it’s cute.$" - diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc deleted file mode 100644 index b78756e0a..000000000 --- a/data/scripts/maps/FallarborTown_House2.inc +++ /dev/null @@ -1,103 +0,0 @@ -FallarborTown_House2_MapScripts:: @ 8201382 - .byte 0 - -FallarborTown_House2_EventScript_201383:: @ 8201383 - lockall - applymovement 1, FallarborTown_House2_Movement_27259E - waitmovement 0 - checkflag FLAG_0x001 - goto_eq FallarborTown_House2_EventScript_2013A8 - msgbox FallarborTown_House2_Text_20145C, 4 - setflag FLAG_0x001 - goto FallarborTown_House2_EventScript_2013A8 - end - -FallarborTown_House2_EventScript_2013A8:: @ 82013A8 - checkitem ITEM_HEART_SCALE, 1 - compare VAR_RESULT, 0 - goto_eq FallarborTown_House2_EventScript_201452 - msgbox FallarborTown_House2_Text_201541, 5 - switch VAR_RESULT - case 0, FallarborTown_House2_EventScript_201452 - goto FallarborTown_House2_EventScript_2013D6 - end - -FallarborTown_House2_EventScript_2013D6:: @ 82013D6 - msgbox FallarborTown_House2_Text_2015A5, 4 - special sub_81B951C - waitstate - compare VAR_0x8004, 255 - goto_eq FallarborTown_House2_EventScript_201452 - special sub_81B98DC - compare VAR_RESULT, 1 - goto_eq FallarborTown_House2_EventScript_201444 - compare VAR_0x8005, 0 - goto_eq FallarborTown_House2_EventScript_201436 - goto FallarborTown_House2_EventScript_20140C - end - -FallarborTown_House2_EventScript_20140C:: @ 820140C - msgbox FallarborTown_House2_Text_2015C3, 4 - special sub_8160638 - waitstate - compare VAR_0x8004, 0 - goto_eq FallarborTown_House2_EventScript_2013D6 - msgbox FallarborTown_House2_Text_201627, 4 - takeitem ITEM_HEART_SCALE, 1 - goto FallarborTown_House2_EventScript_201452 - end - -FallarborTown_House2_EventScript_201436:: @ 8201436 - msgbox FallarborTown_House2_Text_2015DE, 4 - goto FallarborTown_House2_EventScript_2013D6 - end - -FallarborTown_House2_EventScript_201444:: @ 8201444 - msgbox FallarborTown_House2_Text_201697, 4 - goto FallarborTown_House2_EventScript_2013D6 - end - -FallarborTown_House2_EventScript_201452:: @ 8201452 - msgbox FallarborTown_House2_Text_201653, 4 - releaseall - end - -FallarborTown_House2_Text_20145C: @ 820145C - .string "I’m the MOVE TUTOR.\p" - .string "I know all the moves that POKéMON\n" - .string "learn--every one of them--and I can\l" - .string "teach POKéMON those moves.\p" - .string "I can teach a move to a POKéMON\n" - .string "of yours if you’d like.\p" - .string "I’ll do it for a HEART SCALE.\n" - .string "I’m collecting those now.$" - -FallarborTown_House2_Text_201541: @ 8201541 - .string "Oh! That’s it! That’s an honest to\n" - .string "goodness HEART SCALE!\p" - .string "Let me guess, you want me to teach\n" - .string "a move?$" - -FallarborTown_House2_Text_2015A5: @ 82015A5 - .string "Which POKéMON needs tutoring?$" - -FallarborTown_House2_Text_2015C3: @ 82015C3 - .string "Which move should I teach?$" - -FallarborTown_House2_Text_2015DE: @ 82015DE - .string "Sorry…\p" - .string "It doesn’t appear as if I have any move\n" - .string "I can teach that POKéMON.$" - -FallarborTown_House2_Text_201627: @ 8201627 - .string "{PLAYER} handed over one HEART SCALE\n" - .string "in exchange.$" - -FallarborTown_House2_Text_201653: @ 8201653 - .string "If your POKéMON need to learn a move,\n" - .string "come back with a HEART SCALE.$" - -FallarborTown_House2_Text_201697: @ 8201697 - .string "Hunh? There isn’t a single move that\n" - .string "I can teach an EGG.$" - diff --git a/data/scripts/maps/FallarborTown_Mart.inc b/data/scripts/maps/FallarborTown_Mart.inc deleted file mode 100644 index dbaf33f4e..000000000 --- a/data/scripts/maps/FallarborTown_Mart.inc +++ /dev/null @@ -1,66 +0,0 @@ -FallarborTown_Mart_MapScripts:: @ 81FFCBE - .byte 0 - -FallarborTown_Mart_EventScript_1FFCBF:: @ 81FFCBF - lock - faceplayer - message gUnknown_08272A21 - waitmessage - pokemart FallarborTown_Mart_Pokemart_1FFCD8 - msgbox gUnknown_08272A3F, 4 - release - end - - .align 2 -FallarborTown_Mart_Pokemart_1FFCD8: @ 81FFCD8 - .2byte ITEM_GREAT_BALL - .2byte ITEM_SUPER_POTION - .2byte ITEM_ANTIDOTE - .2byte ITEM_PARALYZE_HEAL - .2byte ITEM_ESCAPE_ROPE - .2byte ITEM_SUPER_REPEL - .2byte ITEM_X_SPECIAL - .2byte ITEM_X_SPEED - .2byte ITEM_X_ATTACK - .2byte ITEM_X_DEFEND - .2byte ITEM_DIRE_HIT - .2byte ITEM_GUARD_SPEC - .2byte ITEM_NONE - release - end - -FallarborTown_Mart_EventScript_1FFCF4:: @ 81FFCF4 - msgbox FallarborTown_Mart_Text_1FFD19, 2 - end - -FallarborTown_Mart_EventScript_1FFCFD:: @ 81FFCFD - msgbox FallarborTown_Mart_Text_1FFE09, 2 - end - -FallarborTown_Mart_EventScript_1FFD06:: @ 81FFD06 - lock - faceplayer - waitse - playmoncry SPECIES_SKITTY, 0 - msgbox FallarborTown_Mart_Text_1FFDFA, 4 - waitmoncry - release - end - -FallarborTown_Mart_Text_1FFD19: @ 81FFD19 - .string "I’m having a hard time deciding if I\n" - .string "should make my SKITTY evolve or not.\p" - .string "I only have to use this MOON STONE,\n" - .string "but it’s so hard to decide…\p" - .string "If I make it evolve, it will become\n" - .string "much stronger.\p" - .string "But it will look so different, too.$" - -FallarborTown_Mart_Text_1FFDFA: @ 81FFDFA - .string "SKITTY: Miyao?$" - -FallarborTown_Mart_Text_1FFE09: @ 81FFE09 - .string "This NUGGET I found here…\n" - .string "I suppose I’ll have to sell it, seeing\l" - .string "as how it has no other use.$" - diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc deleted file mode 100644 index 15f5d2b9e..000000000 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ /dev/null @@ -1,111 +0,0 @@ -FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD - map_script 3, FallarborTown_PokemonCenter_1F_MapScript1_200BD8 - map_script 5, FallarborTown_PokemonCenter_1F_MapScript1_277C30 - .byte 0 - -FallarborTown_PokemonCenter_1F_MapScript1_200BD8: @ 8200BD8 - setrespawn 17 - call FallarborTown_PokemonCenter_1F_EventScript_2718DE - end - -FallarborTown_PokemonCenter_1F_EventScript_200BE1:: @ 8200BE1 - setvar VAR_0x800B, 1 - call FallarborTown_PokemonCenter_1F_EventScript_27191E - waitmessage - waitbuttonpress - release - end - -FallarborTown_PokemonCenter_1F_EventScript_200BEF:: @ 8200BEF - msgbox FallarborTown_PokemonCenter_1F_Text_200E22, 2 - end - -FallarborTown_PokemonCenter_1F_EventScript_200BF8:: @ 8200BF8 - msgbox FallarborTown_PokemonCenter_1F_Text_200E8B, 2 - end - -FallarborTown_PokemonCenter_1F_EventScript_200C01:: @ 8200C01 - lock - faceplayer - msgbox FallarborTown_PokemonCenter_1F_Text_200C6B, 4 - closemessage - switch VAR_FACING - case 2, FallarborTown_PokemonCenter_1F_EventScript_200C28 - case 3, FallarborTown_PokemonCenter_1F_EventScript_200C38 - end - -FallarborTown_PokemonCenter_1F_EventScript_200C28:: @ 8200C28 - applymovement 4, FallarborTown_PokemonCenter_1F_Movement_200C53 - waitmovement 0 - goto FallarborTown_PokemonCenter_1F_EventScript_200C48 - end - -FallarborTown_PokemonCenter_1F_EventScript_200C38:: @ 8200C38 - applymovement 4, FallarborTown_PokemonCenter_1F_Movement_200C60 - waitmovement 0 - goto FallarborTown_PokemonCenter_1F_EventScript_200C48 - end - -FallarborTown_PokemonCenter_1F_EventScript_200C48:: @ 8200C48 - playse SE_JIDO_DOA - removeobject 4 - clearflag FLAG_0x366 - release - end - -FallarborTown_PokemonCenter_1F_Movement_200C53: @ 8200C53 - 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 - 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 - .string "Oh, hello.\n" - .string "You are?\p" - .string "Okay, your name’s {PLAYER}{KUN}.\n" - .string "I can see that you’re a TRAINER.\p" - .string "So that means you use the POKéMON\n" - .string "Storage System I developed.\p" - .string "How I arrived at that conclusion is\n" - .string "a simple deductive process.\p" - .string "You spoke to me because you wanted\n" - .string "to access something on this PC.\p" - .string "Oh, I’m sorry. I’m LANETTE.\p" - .string "Honestly, I’m glad to meet you--it’s\n" - .string "great you’re using the Storage System.\p" - .string "If you could, please visit me at home.\n" - .string "My house is on ROUTE 114.$" - -FallarborTown_PokemonCenter_1F_Text_200E22: @ 8200E22 - .string "I wonder what POKéMON looked like\n" - .string "long, long ago?\p" - .string "Maybe the FOSSIL MANIAC at the edge\n" - .string "of town will know.$" - -FallarborTown_PokemonCenter_1F_Text_200E8B: @ 8200E8B - .string "In the fields of FALLARBOR, we plant\n" - .string "seedlings of hardy trees that thrive\l" - .string "even in volcanic ash.$" - diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_2F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_2F.inc deleted file mode 100644 index 93482e860..000000000 --- a/data/scripts/maps/FallarborTown_PokemonCenter_2F.inc +++ /dev/null @@ -1,19 +0,0 @@ -FallarborTown_PokemonCenter_2F_MapScripts:: @ 8200EEB - map_script 2, FallarborTown_PokemonCenter_2F_MapScript2_276C3B - map_script 4, FallarborTown_PokemonCenter_2F_MapScript2_276B6C - map_script 1, FallarborTown_PokemonCenter_2F_MapScript1_276BBE - map_script 3, FallarborTown_PokemonCenter_2F_MapScript1_276ACF - .byte 0 - -FallarborTown_PokemonCenter_2F_EventScript_200F00:: @ 8200F00 - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 - end - -FallarborTown_PokemonCenter_2F_EventScript_200F06:: @ 8200F06 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 - end - -FallarborTown_PokemonCenter_2F_EventScript_200F0C:: @ 8200F0C - call OldaleTown_PokemonCenter_2F_EventScript_2771DB - end - diff --git a/data/scripts/maps/FarawayIsland_Entrance.inc b/data/scripts/maps/FarawayIsland_Entrance.inc deleted file mode 100644 index 08331b33b..000000000 --- a/data/scripts/maps/FarawayIsland_Entrance.inc +++ /dev/null @@ -1,46 +0,0 @@ -FarawayIsland_Entrance_MapScripts:: @ 8267C8E - map_script 3, FarawayIsland_Entrance_MapScript1_267C94 - .byte 0 - -FarawayIsland_Entrance_MapScript1_267C94: @ 8267C94 - setflag FLAG_0x8D8 - end - -FarawayIsland_Entrance_EventScript_267C98:: @ 8267C98 - setweather 1 - doweather - end - -FarawayIsland_Entrance_EventScript_267C9D:: @ 8267C9D - setweather 0 - doweather - end - -FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2 - lock - faceplayer - msgbox FarawayIsland_Entrance_Text_2C6B42, 5 - compare VAR_RESULT, 0 - goto_eq FarawayIsland_Entrance_EventScript_267CE7 - msgbox FarawayIsland_Entrance_Text_2A6A5D, 4 - closemessage - applymovement VAR_LAST_TALKED, FarawayIsland_Entrance_Movement_2725AA - waitmovement 0 - delay 30 - hideobjectat 1, MAP_FARAWAY_ISLAND_ENTRANCE - setvar VAR_0x8004, 2 - call FarawayIsland_Entrance_EventScript_272250 - warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 - waitstate - release - end - -FarawayIsland_Entrance_EventScript_267CE7:: @ 8267CE7 - msgbox FarawayIsland_Entrance_Text_2A6A82, 4 - release - end - -FarawayIsland_Entrance_EventScript_267CF1:: @ 8267CF1 - msgbox FarawayIsland_Entrance_Text_2C6D5A, 3 - end - diff --git a/data/scripts/maps/FarawayIsland_Interior.inc b/data/scripts/maps/FarawayIsland_Interior.inc deleted file mode 100644 index e7d67431d..000000000 --- a/data/scripts/maps/FarawayIsland_Interior.inc +++ /dev/null @@ -1,207 +0,0 @@ -FarawayIsland_Interior_MapScripts:: @ 8267CFA - map_script 5, FarawayIsland_Interior_MapScript1_267D54 - map_script 3, FarawayIsland_Interior_MapScript1_267D72 - map_script 2, FarawayIsland_Interior_MapScript2_267D98 - map_script 7, FarawayIsland_Interior_MapScript1_267D0F - .byte 0 - -FarawayIsland_Interior_MapScript1_267D0F: @ 8267D0F - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, FarawayIsland_Interior_EventScript_267D19 - end - -FarawayIsland_Interior_EventScript_267D19:: @ 8267D19 - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 1 - goto_eq FarawayIsland_Interior_EventScript_267D4B - compare VAR_RESULT, 4 - goto_eq FarawayIsland_Interior_EventScript_267D4B - compare VAR_RESULT, 5 - goto_eq FarawayIsland_Interior_EventScript_267D4B - compare VAR_RESULT, 10 - goto_eq FarawayIsland_Interior_EventScript_267D4B - return - -FarawayIsland_Interior_EventScript_267D4B:: @ 8267D4B - setvar VAR_0x8004, 1 - special sub_81D4A90 - return - -FarawayIsland_Interior_MapScript1_267D54: @ 8267D54 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, FarawayIsland_Interior_EventScript_267D5E - end - -FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 7 - goto_if 5, FarawayIsland_Interior_EventScript_27374E - removeobject VAR_LAST_TALKED - return - -FarawayIsland_Interior_MapScript1_267D72: @ 8267D72 - setvar VAR_0x403A, 0 - setvar VAR_TEMP_1, 1 - checkflag FLAG_0x1CA - call_if 0, FarawayIsland_Interior_EventScript_267D86 - end - -FarawayIsland_Interior_EventScript_267D86:: @ 8267D86 - checkflag FLAG_0x1C7 - goto_eq FarawayIsland_Interior_EventScript_27374E - clearflag FLAG_0x2CE - setvar VAR_TEMP_1, 0 - return - -FarawayIsland_Interior_MapScript2_267D98: @ 8267D98 - map_script_2 VAR_TEMP_1, 0, FarawayIsland_Interior_EventScript_267DA2 - .2byte 0 - -FarawayIsland_Interior_EventScript_267DA2:: @ 8267DA2 - lockall - playse SE_PIN - applymovement 1, FarawayIsland_Interior_Movement_272598 - waitmovement 0 - applymovement 1, FarawayIsland_Interior_Movement_27259A - waitmovement 0 - applymovement 1, FarawayIsland_Interior_Movement_267DCE - waitmovement 0 - moveobjectoffscreen 1 - setvar VAR_TEMP_1, 1 - releaseall - end - -FarawayIsland_Interior_Movement_267DCE: @ 8267DCE - walk_up - walk_up - walk_up - walk_in_place_fastest_down - set_invisible - step_end - -FarawayIsland_Interior_Movement_267DD4: @ 8267DD4 - set_visible - step_end - -FarawayIsland_Interior_Movement_267DD6: @ 8267DD6 - 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 - 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 - 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 - 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 - lock - faceplayer - applymovement 1, FarawayIsland_Interior_Movement_267DD4 - waitmovement 0 - setvar VAR_0x8004, 0 - special sub_81D4A90 - message FarawayIsland_Interior_Text_2C6DFF - waitse - playmoncry SPECIES_MEW, 2 - compare VAR_FACING, 2 - call_if 1, FarawayIsland_Interior_EventScript_267EAF - compare VAR_FACING, 1 - call_if 1, FarawayIsland_Interior_EventScript_267EBA - compare VAR_FACING, 3 - call_if 1, FarawayIsland_Interior_EventScript_267EC5 - compare VAR_FACING, 4 - call_if 1, FarawayIsland_Interior_EventScript_267ED0 - special sub_81D4BEC - delay 40 - waitmoncry - setvar VAR_0x8004, 151 - setvar VAR_0x8005, 30 - setvar VAR_0x8006, 0 - special CreateObedientEnemyMon - setflag FLAG_SYS_CTRL_OBJ_DELETE - special BattleSetup_StartLegendaryBattle - waitstate - clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 1 - goto_eq FarawayIsland_Interior_EventScript_267E96 - compare VAR_RESULT, 4 - goto_eq FarawayIsland_Interior_EventScript_267EA4 - compare VAR_RESULT, 5 - goto_eq FarawayIsland_Interior_EventScript_267EA4 - compare VAR_RESULT, 10 - goto_eq FarawayIsland_Interior_EventScript_267EA4 - setflag FLAG_0x1CA - release - end - -FarawayIsland_Interior_EventScript_267E96:: @ 8267E96 - setflag FLAG_0x1C7 - setvar VAR_0x8004, 151 - goto FarawayIsland_Interior_EventScript_273776 - end - -FarawayIsland_Interior_EventScript_267EA4:: @ 8267EA4 - setvar VAR_0x8004, 151 - goto FarawayIsland_Interior_EventScript_273776 - end - -FarawayIsland_Interior_EventScript_267EAF:: @ 8267EAF - applymovement 1, FarawayIsland_Interior_Movement_267DD6 - waitmovement 0 - return - -FarawayIsland_Interior_EventScript_267EBA:: @ 8267EBA - applymovement 1, FarawayIsland_Interior_Movement_267DDD - waitmovement 0 - return - -FarawayIsland_Interior_EventScript_267EC5:: @ 8267EC5 - applymovement 1, FarawayIsland_Interior_Movement_267DE4 - waitmovement 0 - return - -FarawayIsland_Interior_EventScript_267ED0:: @ 8267ED0 - applymovement 1, FarawayIsland_Interior_Movement_267DEB - waitmovement 0 - return - -FarawayIsland_Interior_EventScript_267EDB:: @ 8267EDB - lockall - fadescreenswapbuffers 1 - setflag FLAG_0x2CE - removeobject 1 - fadescreenswapbuffers 0 - msgbox FarawayIsland_Interior_Text_267EF1, 4 - closemessage - releaseall - end - -FarawayIsland_Interior_Text_267EF1: @ 8267EF1 - .string "The feeling of being watched faded…$" diff --git a/data/scripts/maps/FieryPath.inc b/data/scripts/maps/FieryPath.inc deleted file mode 100644 index a040a5327..000000000 --- a/data/scripts/maps/FieryPath.inc +++ /dev/null @@ -1,15 +0,0 @@ -FieryPath_MapScripts:: @ 8230F24 - map_script 3, FieryPath_MapScript1_230F2A - .byte 0 - -FieryPath_MapScript1_230F2A: @ 8230F2A - checkflag FLAG_LANDMARK_FIERY_PATH - call_if 0, FieryPath_EventScript_230F37 - setflag FLAG_LANDMARK_FIERY_PATH - end - -FieryPath_EventScript_230F37:: @ 8230F37 - setflag FLAG_0x2FE - clearflag FLAG_0x2FF - return - diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc deleted file mode 100644 index 4a28a180b..000000000 --- a/data/scripts/maps/FortreeCity.inc +++ /dev/null @@ -1,159 +0,0 @@ -FortreeCity_MapScripts:: @ 81E25A4 - map_script 3, FortreeCity_MapScript1_1E25AF - map_script 5, FortreeCity_MapScript1_1E25B3 - .byte 0 - -FortreeCity_MapScript1_1E25AF: @ 81E25AF - setflag FLAG_VISITED_FORTREE_CITY - end - -FortreeCity_MapScript1_1E25B3: @ 81E25B3 - setstepcallback 2 - end - -FortreeCity_EventScript_1E25B6:: @ 81E25B6 - msgbox FortreeCity_Text_1E2676, 2 - end - -FortreeCity_EventScript_1E25BF:: @ 81E25BF - lock - faceplayer - checkflag FLAG_0x127 - goto_eq FortreeCity_EventScript_1E25D4 - msgbox FortreeCity_Text_1E2738, 4 - release - end - -FortreeCity_EventScript_1E25D4:: @ 81E25D4 - msgbox FortreeCity_Text_1E27B6, 4 - release - end - -FortreeCity_EventScript_1E25DE:: @ 81E25DE - msgbox FortreeCity_Text_1E27FE, 2 - end - -FortreeCity_EventScript_1E25E7:: @ 81E25E7 - msgbox FortreeCity_Text_1E2880, 2 - end - -FortreeCity_EventScript_1E25F0:: @ 81E25F0 - msgbox FortreeCity_Text_1E292E, 2 - end - -FortreeCity_EventScript_1E25F9:: @ 81E25F9 - msgbox FortreeCity_Text_1E299D, 2 - end - -FortreeCity_EventScript_1E2602:: @ 81E2602 - msgbox FortreeCity_Text_1E2AAC, 3 - end - -FortreeCity_EventScript_1E260B:: @ 81E260B - msgbox FortreeCity_Text_1E2AE6, 3 - end - -FortreeCity_EventScript_1E2614:: @ 81E2614 - lock - faceplayer - checkitem ITEM_DEVON_SCOPE, 1 - compare VAR_RESULT, 1 - goto_eq FortreeCity_EventScript_1E2630 - msgbox FortreeCity_Text_1E29E5, 4 - release - end - -FortreeCity_EventScript_1E2630:: @ 81E2630 - msgbox FortreeCity_Text_1E2A08, 5 - compare VAR_RESULT, 1 - goto_eq FortreeCity_EventScript_1E2645 - release - end - -FortreeCity_EventScript_1E2645:: @ 81E2645 - msgbox FortreeCity_Text_1E2A48, 4 - closemessage - applymovement VAR_LAST_TALKED, FortreeCity_Movement_2723C7 - waitmovement 0 - waitse - playmoncry SPECIES_KECLEON, 2 - delay 40 - waitmoncry - applymovement VAR_LAST_TALKED, FortreeCity_Movement_1E2674 - waitmovement 0 - removeobject VAR_LAST_TALKED - setflag FLAG_0x127 - release - end - -FortreeCity_Movement_1E2674: @ 81E2674 - walk_right - step_end - -FortreeCity_Text_1E2676: @ 81E2676 - .string "No one believes me, but I saw this\n" - .string "gigantic POKéMON in the sky.\p" - .string "It seemed to squirm as it flew toward\n" - .string "ROUTE 131.\p" - .string "By the way… Sniff…\n" - .string "Um… You, uh…smell singed.\p" - .string "Were you at a volcano or something?$" - -FortreeCity_Text_1E2738: @ 81E2738 - .string "I want to go to the POKéMON GYM,\n" - .string "but something’s blocking the way.\p" - .string "After all the bother I went through\n" - .string "training on ROUTE 120…$" - -FortreeCity_Text_1E27B6: @ 81E27B6 - .string "I’ve got my pride-and-joy POKéMON\n" - .string "with me. This time, I’ll beat WINONA.$" - -FortreeCity_Text_1E27FE: @ 81E27FE - .string "The ground absorbs rainwater, and\n" - .string "trees grow by drinking that water…\p" - .string "Our FORTREE CITY exists because\n" - .string "there’s both water and soil.$" - -FortreeCity_Text_1E2880: @ 81E2880 - .string "The CITY consists of homes built on\n" - .string "trees.\p" - .string "Perhaps because of that lifestyle,\n" - .string "everyone is healthy and lively.\p" - .string "Why, even myself--I feel as if I’ve\n" - .string "grown thirty years younger.$" - -FortreeCity_Text_1E292E: @ 81E292E - .string "Living on top of trees is okay.\p" - .string "But sometimes BUG POKéMON come in\n" - .string "through windows.\l" - .string "It can be really startling.$" - -FortreeCity_Text_1E299D: @ 81E299D - .string "There are POKéMON that evolve when\n" - .string "you trade them! That’s what I heard.$" - -FortreeCity_Text_1E29E5: @ 81E29E5 - .string "Something unseeable is in the way.$" - -FortreeCity_Text_1E2A08: @ 81E2A08 - .string "Something unseeable is in the way.\p" - .string "Want to use the DEVON SCOPE?$" - -FortreeCity_Text_1E2A48: @ 81E2A48 - .string "{PLAYER} used the DEVON SCOPE.\p" - .string "An invisible POKéMON became completely\n" - .string "visible!\p" - .string "The startled POKéMON fled!$" - -FortreeCity_Text_1E2AAC: @ 81E2AAC - .string "FORTREE CITY\n" - .string "“The treetop city that frolics with\l" - .string "nature.â€$" - -FortreeCity_Text_1E2AE6: @ 81E2AE6 - .string "FORTREE CITY POKéMON GYM\n" - .string "LEADER: WINONA\p" - .string "“The bird user taking flight into\n" - .string "the world.â€$" - diff --git a/data/scripts/maps/FortreeCity_DecorationShop.inc b/data/scripts/maps/FortreeCity_DecorationShop.inc deleted file mode 100644 index 2229ab702..000000000 --- a/data/scripts/maps/FortreeCity_DecorationShop.inc +++ /dev/null @@ -1,72 +0,0 @@ -FortreeCity_DecorationShop_MapScripts:: @ 821800D - .byte 0 - -FortreeCity_DecorationShop_EventScript_21800E:: @ 821800E - msgbox FortreeCity_DecorationShop_Text_218078, 2 - end - -FortreeCity_DecorationShop_EventScript_218017:: @ 8218017 - msgbox FortreeCity_DecorationShop_Text_2180ED, 2 - end - -FortreeCity_DecorationShop_EventScript_218020:: @ 8218020 - lock - faceplayer - message gUnknown_08272A21 - waitmessage - pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_218038 - msgbox gUnknown_08272A3F, 4 - release - end - - .align 2 -FortreeCity_DecorationShop_PokemartDecor_218038: @ 8218038 - .2byte 1 - .2byte 2 - .2byte 3 - .2byte 4 - .2byte 5 - .2byte 7 - .2byte 8 - .2byte 9 - .2byte 0 - release - end - -FortreeCity_DecorationShop_EventScript_21804C:: @ 821804C - lock - faceplayer - message gUnknown_08272A21 - waitmessage - pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_218064 - msgbox gUnknown_08272A3F, 4 - release - end - - .align 2 -FortreeCity_DecorationShop_PokemartDecor_218064: @ 8218064 - .2byte 10 - .2byte 11 - .2byte 12 - .2byte 15 - .2byte 14 - .2byte 16 - .2byte 17 - .2byte 18 - .2byte 0 - release - end - -FortreeCity_DecorationShop_Text_218078: @ 8218078 - .string "Merchandise you buy here is sent to\n" - .string "your own PC.\p" - .string "That’s fantastic! I wish they could\n" - .string "also deliver me home like that.$" - -FortreeCity_DecorationShop_Text_2180ED: @ 82180ED - .string "I’m buying a pretty desk and I’m\n" - .string "putting my cute DOLLS on it.\p" - .string "If I don’t, when I decorate my\n" - .string "SECRET BASE, my DOLLS will get\l" - .string "dirty or poked with splinters.$" - diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc deleted file mode 100644 index 1b1100cf3..000000000 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ /dev/null @@ -1,325 +0,0 @@ -FortreeCity_Gym_MapScripts:: @ 82165AB - map_script 3, FortreeCity_Gym_MapScript1_2165B6 - map_script 4, FortreeCity_Gym_MapScript2_2165BA - .byte 0 - -FortreeCity_Gym_MapScript1_2165B6: @ 82165B6 - special RotatingGate_InitPuzzle - end - -FortreeCity_Gym_MapScript2_2165BA: @ 82165BA - map_script_2 VAR_TEMP_0, 16384, FortreeCity_Gym_EventScript_2165C4 - .2byte 0 - -FortreeCity_Gym_EventScript_2165C4:: @ 82165C4 - special RotatingGate_InitPuzzleAndGraphics - end - -FortreeCity_Gym_EventScript_2165C8:: @ 82165C8 - trainerbattle 1, TRAINER_WINONA_1, 0, FortreeCity_Gym_Text_216D75, FortreeCity_Gym_Text_216E60, FortreeCity_Gym_EventScript_2165FD - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq FortreeCity_Gym_EventScript_21668D - checkflag FLAG_0x0AA - goto_if 0, FortreeCity_Gym_EventScript_216646 - msgbox FortreeCity_Gym_Text_217071, 4 - release - end - -FortreeCity_Gym_EventScript_2165FD:: @ 82165FD - message FortreeCity_Gym_Text_216EEC - waitmessage - call FortreeCity_Gym_EventScript_27207E - msgbox FortreeCity_Gym_Text_216F17, 4 - setflag FLAG_0x4F5 - setflag FLAG_BADGE06_GET - setvar VAR_0x8008, 6 - call FortreeCity_Gym_EventScript_271F43 - call FortreeCity_Gym_EventScript_21666A - closemessage - delay 30 - playfanfare MUS_ME_TORE_EYE - msgbox FortreeCity_Gym_Text_217044, 4 - waitfanfare - closemessage - delay 30 - setflag FLAG_0x1D7 - setvar VAR_0x40F3, 0 - setflag FLAG_0x08A - release - end - -FortreeCity_Gym_EventScript_216646:: @ 8216646 - giveitem_std ITEM_TM40 - compare VAR_RESULT, 0 - goto_eq FortreeCity_Gym_EventScript_272054 - msgbox FortreeCity_Gym_Text_216FEC, 4 - setflag FLAG_0x0AA - release - end - -FortreeCity_Gym_EventScript_21666A:: @ 821666A - giveitem_std ITEM_TM40 - compare VAR_RESULT, 0 - goto_eq FortreeCity_Gym_EventScript_27205E - msgbox FortreeCity_Gym_Text_216FEC, 4 - setflag FLAG_0x0AA - return - -FortreeCity_Gym_EventScript_21668D:: @ 821668D - trainerbattle 7, TRAINER_WINONA_1, 0, FortreeCity_Gym_Text_217100, FortreeCity_Gym_Text_2171E6, FortreeCity_Gym_Text_217292 - msgbox FortreeCity_Gym_Text_21720B, 6 - end - -FortreeCity_Gym_EventScript_2166A8:: @ 82166A8 - trainerbattle 0, TRAINER_JARED, 0, FortreeCity_Gym_Text_2168A2, FortreeCity_Gym_Text_2168D3 - msgbox FortreeCity_Gym_Text_2168E7, 6 - end - -FortreeCity_Gym_EventScript_2166BF:: @ 82166BF - trainerbattle 0, TRAINER_EDWARDO, 0, FortreeCity_Gym_Text_21695A, FortreeCity_Gym_Text_2169C7 - msgbox FortreeCity_Gym_Text_2169F1, 6 - end - -FortreeCity_Gym_EventScript_2166D6:: @ 82166D6 - trainerbattle 0, TRAINER_FLINT, 0, FortreeCity_Gym_Text_216A66, FortreeCity_Gym_Text_216AC4 - msgbox FortreeCity_Gym_Text_216AD7, 6 - end - -FortreeCity_Gym_EventScript_2166ED:: @ 82166ED - trainerbattle 0, TRAINER_ASHLEY, 0, FortreeCity_Gym_Text_216B1A, FortreeCity_Gym_Text_216B51 - msgbox FortreeCity_Gym_Text_216B5F, 6 - end - -FortreeCity_Gym_EventScript_216704:: @ 8216704 - trainerbattle 0, TRAINER_HUMBERTO, 0, FortreeCity_Gym_Text_216B9E, FortreeCity_Gym_Text_216C18 - msgbox FortreeCity_Gym_Text_216C32, 6 - end - -FortreeCity_Gym_EventScript_21671B:: @ 821671B - trainerbattle 0, TRAINER_DARIUS, 0, FortreeCity_Gym_Text_216C96, FortreeCity_Gym_Text_216CF2 - msgbox FortreeCity_Gym_Text_216D0F, 6 - end - -FortreeCity_Gym_EventScript_216732:: @ 8216732 - lock - faceplayer - checkflag FLAG_0x4F5 - goto_eq FortreeCity_Gym_EventScript_216747 - msgbox FortreeCity_Gym_Text_216785, 4 - release - end - -FortreeCity_Gym_EventScript_216747:: @ 8216747 - msgbox FortreeCity_Gym_Text_21687D, 4 - release - end - -FortreeCity_Gym_EventScript_216751:: @ 8216751 - lockall - checkflag FLAG_BADGE06_GET - goto_eq FortreeCity_Gym_EventScript_216771 - goto FortreeCity_Gym_EventScript_21677B - end - -FortreeCity_Gym_EventScript_216761:: @ 8216761 - lockall - checkflag FLAG_BADGE06_GET - goto_eq FortreeCity_Gym_EventScript_216771 - goto FortreeCity_Gym_EventScript_21677B - end - -FortreeCity_Gym_EventScript_216771:: @ 8216771 - msgbox FortreeCity_Gym_Text_2170C7, 4 - releaseall - end - -FortreeCity_Gym_EventScript_21677B:: @ 821677B - msgbox FortreeCity_Gym_Text_2170AE, 4 - releaseall - end - -FortreeCity_Gym_Text_216785: @ 8216785 - .string "Yo, how’s it going, CHAMPION-\n" - .string "bound {PLAYER}?\p" - .string "FORTREE GYM LEADER WINONA is\n" - .string "a master of FLYING-type POKéMON.\p" - .string "She’s waiting at the back of this GYM,\n" - .string "behind the rotating doors.\p" - .string "She’s waiting for new challengers\n" - .string "who are trying to take wing!\p" - .string "Okay, go for it!$" - -FortreeCity_Gym_Text_21687D: @ 821687D - .string "You did it!\n" - .string "You’ve achieved liftoff!$" - -FortreeCity_Gym_Text_2168A2: @ 82168A2 - .string "Behold the elegant battle style of\n" - .string "BIRD POKéMON!$" - -FortreeCity_Gym_Text_2168D3: @ 82168D3 - .string "You…\n" - .string "You’re strong…$" - -FortreeCity_Gym_Text_2168E7: @ 82168E7 - .string "A TRAINER has to be smart to keep\n" - .string "up with unexpected turns of events.\p" - .string "Do you have the smarts to get to\n" - .string "our LEADER?$" - -FortreeCity_Gym_Text_21695A: @ 821695A - .string "The lovers of BIRD POKéMON aspire\n" - .string "to join this GYM.\p" - .string "As a member of the FORTREE GYM,\n" - .string "I’m not allowed to lose!$" - -FortreeCity_Gym_Text_2169C7: @ 82169C7 - .string "It was too much of a load for me\n" - .string "to bear…$" - -FortreeCity_Gym_Text_2169F1: @ 82169F1 - .string "The world is huge, and there are\n" - .string "countless tough TRAINERS.\p" - .string "I’m going to keep training and make\n" - .string "myself even stronger.$" - -FortreeCity_Gym_Text_216A66: @ 8216A66 - .string "There’s no need for WINONA, our GYM\n" - .string "LEADER, to deal with you!\p" - .string "I’m plenty good enough for you!$" - -FortreeCity_Gym_Text_216AC4: @ 8216AC4 - .string "WINONA, I…\n" - .string "I lost!$" - -FortreeCity_Gym_Text_216AD7: @ 8216AD7 - .string "WINONA is cute and she’s strong.\n" - .string "She’s the ultimate LEADER!\p" - .string "Blush…$" - -FortreeCity_Gym_Text_216B1A: @ 8216B1A - .string "WINONA taught me personally!\n" - .string "You can’t beat me easily!$" - -FortreeCity_Gym_Text_216B51: @ 8216B51 - .string "I was beaten…$" - -FortreeCity_Gym_Text_216B5F: @ 8216B5F - .string "Thanks to WINONA, the people of\n" - .string "FORTREE can live without fear.$" - -FortreeCity_Gym_Text_216B9E: @ 8216B9E - .string "When WINONA takes to battle, her face\n" - .string "shines with beautiful determination…\p" - .string "I’m not letting you witness that\n" - .string "lovely sight!$" - -FortreeCity_Gym_Text_216C18: @ 8216C18 - .string "Urk!\n" - .string "I couldn’t stop you.$" - -FortreeCity_Gym_Text_216C32: @ 8216C32 - .string "You’d better watch it!\n" - .string "Don’t get distracted staring at WINONA\l" - .string "or you’ll go crashing down in a heap!$" - -FortreeCity_Gym_Text_216C96: @ 8216C96 - .string "You’d better know that there are all\n" - .string "sorts of FLYING-type POKéMON.\p" - .string "You do know that, right?$" - -FortreeCity_Gym_Text_216CF2: @ 8216CF2 - .string "You seem to know your stuff!$" - -FortreeCity_Gym_Text_216D0F: @ 8216D0F - .string "Sure, you beat me all right.\n" - .string "But you’d better watch it! Our LEADER\l" - .string "WINONA’s POKéMON are all business.$" - -FortreeCity_Gym_Text_216D75: @ 8216D75 - .string "I am WINONA. I am the LEADER of\n" - .string "the FORTREE POKéMON GYM.\p" - .string "I have become one with BIRD POKéMON\n" - .string "and have soared the skies…\p" - .string "However grueling the battle, we have\n" - .string "triumphed with grace…\p" - .string "Witness the elegant choreography\n" - .string "of BIRD POKéMON and I!$" - -FortreeCity_Gym_Text_216E60: @ 8216E60 - .string "Never before have I seen a TRAINER\n" - .string "command POKéMON with more grace\l" - .string "than I…\p" - .string "In recognition of your prowess,\n" - .string "I present to you this GYM BADGE.$" - -FortreeCity_Gym_Text_216EEC: @ 8216EEC - .string "{PLAYER} received the FEATHER BADGE\n" - .string "from WINONA.$" - -FortreeCity_Gym_Text_216F17: @ 8216F17 - .string "With the FEATHER BADGE, all POKéMON up\n" - .string "to LV 70, even those received through\l" - .string "trades, will obey your every command.\p" - .string "You will also be able to use\n" - .string "the HM move FLY outside of battle.\p" - .string "And this…\n" - .string "This is a gift from me.$" - -FortreeCity_Gym_Text_216FEC: @ 8216FEC - .string "TM40 contains AERIAL ACE.\p" - .string "Its speed…\n" - .string "No POKéMON should be able to avoid it.\p" - .string "… … … … … …$" - -FortreeCity_Gym_Text_217044: @ 8217044 - .string "Registered GYM LEADER WINONA\n" - .string "in the POKéNAV.$" - -FortreeCity_Gym_Text_217071: @ 8217071 - .string "Though I fell to you, I will remain\n" - .string "devoted to BIRD POKéMON.$" - -FortreeCity_Gym_Text_2170AE: @ 82170AE - .string "FORTREE CITY POKéMON GYM$" - -FortreeCity_Gym_Text_2170C7: @ 82170C7 - .string "FORTREE CITY POKéMON GYM\p" - .string "WINONA’S CERTIFIED TRAINERS:\n" - .string "{PLAYER}$" - -FortreeCity_Gym_Text_217100: @ 8217100 - .string "WINONA: We humans can never escape\n" - .string "gravity’s pull on the ground.\p" - .string "But by striving for excellence,\n" - .string "we have the power to soar!\p" - .string "You have scaled the pinnacle as\n" - .string "the reigning CHAMPION.\p" - .string "Please, allow me to see your power\n" - .string "at full flight!$" - -FortreeCity_Gym_Text_2171E6: @ 82171E6 - .string "I failed to reach your height again…$" - -FortreeCity_Gym_Text_21720B: @ 821720B - .string "WINONA: Even though I have lost,\n" - .string "the wings of my heart remain unbroken.\p" - .string "I can rise and soar again and\n" - .string "yet again.\p" - .string "I am convinced of it!$" - -FortreeCity_Gym_Text_217292: @ 8217292 - .string "WINONA: We humans can never escape\n" - .string "gravity’s pull on the ground.\p" - .string "But by striving for excellence,\n" - .string "we have the power to soar!\p" - .string "You have scaled the pinnacle as\n" - .string "the reigning CHAMPION.\p" - .string "Please, allow me to see your power\n" - .string "at full flight!\p" - .string "Oh, no… Do you have but one\n" - .string "POKéMON with you?\p" - .string "Please return with two POKéMON\n" - .string "at the very least.$" - diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc deleted file mode 100644 index 7e45bf87a..000000000 --- a/data/scripts/maps/FortreeCity_House1.inc +++ /dev/null @@ -1,102 +0,0 @@ -FortreeCity_House1_MapScripts:: @ 82162BA - .byte 0 - -FortreeCity_House1_EventScript_2162BB:: @ 82162BB - lock - faceplayer - checkflag FLAG_0x09B - goto_eq FortreeCity_House1_EventScript_216355 - setvar VAR_0x8008, 1 - copyvar VAR_0x8004, VAR_0x8008 - specialvar VAR_RESULT, sub_807E73C - copyvar VAR_0x8009, VAR_RESULT - msgbox FortreeCity_House1_Text_21637B, 5 - compare VAR_RESULT, 0 - goto_eq FortreeCity_House1_EventScript_21633D - special sub_81B94B0 - waitstate - copyvar VAR_0x800A, VAR_0x8004 - compare VAR_0x8004, 255 - goto_eq FortreeCity_House1_EventScript_21633D - copyvar VAR_0x8005, VAR_0x800A - specialvar VAR_RESULT, sub_807E9D4 - copyvar VAR_0x800B, VAR_RESULT - compare VAR_RESULT, VAR_0x8009 - goto_if 5, FortreeCity_House1_EventScript_216347 - copyvar VAR_0x8004, VAR_0x8008 - copyvar VAR_0x8005, VAR_0x800A - special sub_807EA10 - special sub_807F0E4 - waitstate - bufferspeciesname 0, VAR_0x8009 - msgbox FortreeCity_House1_Text_216440, 4 - setflag FLAG_0x09B - release - end - -FortreeCity_House1_EventScript_21633D:: @ 821633D - msgbox FortreeCity_House1_Text_21649F, 4 - release - end - -FortreeCity_House1_EventScript_216347:: @ 8216347 - bufferspeciesname 0, VAR_0x8009 - msgbox FortreeCity_House1_Text_216474, 4 - release - end - -FortreeCity_House1_EventScript_216355:: @ 8216355 - msgbox FortreeCity_House1_Text_2164DB, 4 - release - end - -FortreeCity_House1_EventScript_21635F:: @ 821635F - msgbox FortreeCity_House1_Text_21653B, 2 - end - -FortreeCity_House1_EventScript_216368:: @ 8216368 - lock - faceplayer - waitse - playmoncry SPECIES_ZIGZAGOON, 0 - msgbox FortreeCity_House1_Text_216597, 4 - waitmoncry - release - end - -FortreeCity_House1_Text_21637B: @ 821637B - .string "Wrooooaaar! I need it!\n" - .string "I have to get me a {STR_VAR_1}!\l" - .string "I’ll do anything for it!\p" - .string "…Uh… Did you hear that?\n" - .string "My shout from the bottom of my heart?\p" - .string "Having heard that, you will trade\n" - .string "your {STR_VAR_1} for my {STR_VAR_2},\l" - .string "won’t you?$" - -FortreeCity_House1_Text_216440: @ 8216440 - .string "Oh, yeah, right on!\p" - .string "{STR_VAR_1}, welcome!\n" - .string "{STR_VAR_2}, you take care!$" - -FortreeCity_House1_Text_216474: @ 8216474 - .string "Uh, no, I don’t think so.\n" - .string "That isn’t a {STR_VAR_1}.$" - -FortreeCity_House1_Text_21649F: @ 821649F - .string "No? You won’t trade me?\n" - .string "Even after I bared my heart to you?$" - -FortreeCity_House1_Text_2164DB: @ 82164DB - .string "I’m going to make VOLBEAT super\n" - .string "strong from this moment on!\p" - .string "I hope you do the same with PLUSLE!$" - -FortreeCity_House1_Text_21653B: @ 821653B - .string "Trading POKéMON with others…\p" - .string "It’s as if you’re trading your own\n" - .string "memories with other people.$" - -FortreeCity_House1_Text_216597: @ 8216597 - .string "ZIGZAGOON: Gumomoh?$" - diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/scripts/maps/FortreeCity_House2.inc deleted file mode 100644 index 8f75b20d9..000000000 --- a/data/scripts/maps/FortreeCity_House2.inc +++ /dev/null @@ -1,84 +0,0 @@ -FortreeCity_House2_MapScripts:: @ 82177CA - .byte 0 - -FortreeCity_House2_EventScript_2177CB:: @ 82177CB - lock - faceplayer - checkflag FLAG_0x108 - goto_eq FortreeCity_House2_EventScript_21786E - checkflag FLAG_0x076 - call_if 0, FortreeCity_House2_EventScript_217862 - msgbox FortreeCity_House2_Text_2178D6, 4 - multichoice 21, 8, 54, 1 - switch VAR_RESULT - case 1, FortreeCity_House2_EventScript_217878 - msgbox FortreeCity_House2_Text_21796A, 4 - multichoice 21, 8, 54, 1 - switch VAR_RESULT - case 1, FortreeCity_House2_EventScript_217878 - msgbox FortreeCity_House2_Text_2179C9, 4 - multichoice 21, 8, 54, 1 - switch VAR_RESULT - case 0, FortreeCity_House2_EventScript_217878 - msgbox FortreeCity_House2_Text_217A28, 4 - giveitem_std ITEM_TM10 - compare VAR_RESULT, 0 - goto_eq FortreeCity_House2_EventScript_272054 - setflag FLAG_0x108 - msgbox FortreeCity_House2_Text_217A91, 4 - release - end - -FortreeCity_House2_EventScript_217862:: @ 8217862 - msgbox FortreeCity_House2_Text_217882, 4 - setflag FLAG_0x076 - return - -FortreeCity_House2_EventScript_21786E:: @ 821786E - msgbox FortreeCity_House2_Text_217A91, 4 - release - end - -FortreeCity_House2_EventScript_217878:: @ 8217878 - msgbox FortreeCity_House2_Text_217AC7, 4 - release - end - -FortreeCity_House2_Text_217882: @ 8217882 - .string "People… POKéMON…\p" - .string "Their hidden powers are aroused by\n" - .string "living in natural environments…$" - -FortreeCity_House2_Text_2178D6: @ 82178D6 - .string "Let this old woman see if your hidden\n" - .string "power has awoken…\p" - .string "I hold a coin in my hand.\p" - .string "Now, tell me, have I palmed it in\n" - .string "the right hand? Or in the left?$" - -FortreeCity_House2_Text_21796A: @ 821796A - .string "Oh! Yes, correct!\p" - .string "We shall try again.\p" - .string "In which hand have I palmed the coin?\n" - .string "The right or left?$" - -FortreeCity_House2_Text_2179C9: @ 82179C9 - .string "Oh! Yes, correct!\p" - .string "We shall try again.\p" - .string "In which hand have I palmed the coin?\n" - .string "The right or left?$" - -FortreeCity_House2_Text_217A28: @ 8217A28 - .string "Oh! Splendid!\n" - .string "Your hidden power has awoken!\p" - .string "Here, take this and awaken the hidden\n" - .string "power of your POKéMON.$" - -FortreeCity_House2_Text_217A91: @ 8217A91 - .string "HIDDEN POWER is a move that changes\n" - .string "with the POKéMON.$" - -FortreeCity_House2_Text_217AC7: @ 8217AC7 - .string "No, too bad.\n" - .string "You guessed wrong.$" - diff --git a/data/scripts/maps/FortreeCity_House3.inc b/data/scripts/maps/FortreeCity_House3.inc deleted file mode 100644 index 92b963811..000000000 --- a/data/scripts/maps/FortreeCity_House3.inc +++ /dev/null @@ -1,29 +0,0 @@ -FortreeCity_House3_MapScripts:: @ 8217AE7 - .byte 0 - -FortreeCity_House3_EventScript_217AE8:: @ 8217AE8 - msgbox FortreeCity_House3_Text_217AFA, 2 - end - -FortreeCity_House3_EventScript_217AF1:: @ 8217AF1 - msgbox FortreeCity_House3_Text_217C22, 2 - end - -FortreeCity_House3_Text_217AFA: @ 8217AFA - .string "While speaking about POKéDEXES,\n" - .string "I remembered something.\p" - .string "I met this TRAINER, STEVEN, when\n" - .string "I was searching for rare stones.\p" - .string "Hoo, boy, he had some amazing POKéMON\n" - .string "with him.\p" - .string "They weren’t just rare, they were\n" - .string "trained to terrifying extremes!\p" - .string "He might even be stronger than the\n" - .string "GYM LEADER in this town…$" - -FortreeCity_House3_Text_217C22: @ 8217C22 - .string "What’s that thing you have there?\p" - .string "… … … … … …\p" - .string "Oh, it’s called a POKéDEX?\n" - .string "It’s really awesome!$" - diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc deleted file mode 100644 index 27ead9ec2..000000000 --- a/data/scripts/maps/FortreeCity_House4.inc +++ /dev/null @@ -1,99 +0,0 @@ -FortreeCity_House4_MapScripts:: @ 8217C80 - .byte 0 - -FortreeCity_House4_EventScript_217C81:: @ 8217C81 - msgbox FortreeCity_House4_Text_217D33, 2 - end - -FortreeCity_House4_EventScript_217C8A:: @ 8217C8A - lockall - checkflag FLAG_0x0DF - goto_eq FortreeCity_House4_EventScript_217D06 - checkflag FLAG_0x0E0 - goto_eq FortreeCity_House4_EventScript_217CD8 - checkflag FLAG_0x0DE - goto_eq FortreeCity_House4_EventScript_217CC4 - msgbox FortreeCity_House4_Text_217DB9, 4 - closemessage - setflag FLAG_0x0DE - clearflag FLAG_0x3A6 - applymovement 3, FortreeCity_House4_Movement_217D1A - waitmovement 0 - removeobject 3 - releaseall - end - -FortreeCity_House4_EventScript_217CC4:: @ 8217CC4 - applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E - waitmovement 0 - msgbox FortreeCity_House4_Text_217DD2, 4 - releaseall - end - -FortreeCity_House4_EventScript_217CD8:: @ 8217CD8 - applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E - waitmovement 0 - msgbox FortreeCity_House4_Text_217E05, 4 - giveitem_std ITEM_MENTAL_HERB - compare VAR_RESULT, 0 - goto_eq FortreeCity_House4_EventScript_272054 - setflag FLAG_0x0DF - releaseall - end - -FortreeCity_House4_EventScript_217D06:: @ 8217D06 - applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E - waitmovement 0 - msgbox FortreeCity_House4_Text_217EA8, 4 - releaseall - end - -FortreeCity_House4_Movement_217D1A: @ 8217D1A - walk_fast_down - walk_fast_down - walk_fast_right - walk_in_place_fastest_down - delay_8 - step_end - -FortreeCity_House4_EventScript_217D20:: @ 8217D20 - lock - faceplayer - waitse - playmoncry SPECIES_WINGULL, 0 - msgbox FortreeCity_House4_Text_217EE0, 4 - waitmoncry - release - end - -FortreeCity_House4_Text_217D33: @ 8217D33 - .string "By being together with POKéMON,\n" - .string "people make more and more friends.\p" - .string "And that brings the world closer\n" - .string "together. I think it’s wonderful!$" - -FortreeCity_House4_Text_217DB9: @ 8217DB9 - .string "There!\n" - .string "Go, BIRD POKéMON!$" - -FortreeCity_House4_Text_217DD2: @ 8217DD2 - .string "Heheh, I asked my WINGULL to run\n" - .string "an errand for me.$" - -FortreeCity_House4_Text_217E05: @ 8217E05 - .string "Good!\n" - .string "Welcome back, WINGULL!\p" - .string "Huh? What is this?\n" - .string "What is it holding?\p" - .string "A MENTAL HERB?\n" - .string "It must have picked it up somewhere.\p" - .string "But I’m not a TRAINER, so you can\n" - .string "have it.$" - -FortreeCity_House4_Text_217EA8: @ 8217EA8 - .string "Thanks to my WINGULL, I have friends\n" - .string "who live far away.$" - -FortreeCity_House4_Text_217EE0: @ 8217EE0 - .string "WINGULL: Pihyoh!$" - diff --git a/data/scripts/maps/FortreeCity_House5.inc b/data/scripts/maps/FortreeCity_House5.inc deleted file mode 100644 index d4f1f2b02..000000000 --- a/data/scripts/maps/FortreeCity_House5.inc +++ /dev/null @@ -1,35 +0,0 @@ -FortreeCity_House5_MapScripts:: @ 8217EF1 - .byte 0 - -FortreeCity_House5_EventScript_217EF2:: @ 8217EF2 - msgbox FortreeCity_House5_Text_217F17, 2 - end - -FortreeCity_House5_EventScript_217EFB:: @ 8217EFB - msgbox FortreeCity_House5_Text_217F80, 2 - end - -FortreeCity_House5_EventScript_217F04:: @ 8217F04 - lock - faceplayer - waitse - playmoncry SPECIES_ZIGZAGOON, 0 - msgbox FortreeCity_House5_Text_217FFB, 4 - waitmoncry - release - end - -FortreeCity_House5_Text_217F17: @ 8217F17 - .string "The tree houses of FORTREE are great!\p" - .string "I think it’s the number one town for\n" - .string "living together with POKéMON.$" - -FortreeCity_House5_Text_217F80: @ 8217F80 - .string "POKéMON and people have adapted to\n" - .string "nature for survival.\p" - .string "There’s no need to make nature\n" - .string "conform to the way we want to live.$" - -FortreeCity_House5_Text_217FFB: @ 8217FFB - .string "ZIGZAGOON: Bufuu!$" - diff --git a/data/scripts/maps/FortreeCity_Mart.inc b/data/scripts/maps/FortreeCity_Mart.inc deleted file mode 100644 index 050fc8f4c..000000000 --- a/data/scripts/maps/FortreeCity_Mart.inc +++ /dev/null @@ -1,57 +0,0 @@ -FortreeCity_Mart_MapScripts:: @ 8217665 - .byte 0 - -FortreeCity_Mart_EventScript_217666:: @ 8217666 - lock - faceplayer - message gUnknown_08272A21 - waitmessage - pokemart FortreeCity_Mart_Pokemart_217680 - msgbox gUnknown_08272A3F, 4 - release - end - - .align 2 -FortreeCity_Mart_Pokemart_217680: @ 8217680 - .2byte ITEM_GREAT_BALL - .2byte ITEM_ULTRA_BALL - .2byte ITEM_SUPER_POTION - .2byte ITEM_HYPER_POTION - .2byte ITEM_ANTIDOTE - .2byte ITEM_PARALYZE_HEAL - .2byte ITEM_AWAKENING - .2byte ITEM_REVIVE - .2byte ITEM_SUPER_REPEL - .2byte ITEM_WOOD_MAIL - .2byte ITEM_NONE - release - end - -FortreeCity_Mart_EventScript_217698:: @ 8217698 - msgbox FortreeCity_Mart_Text_2176B3, 2 - end - -FortreeCity_Mart_EventScript_2176A1:: @ 82176A1 - msgbox FortreeCity_Mart_Text_217715, 2 - end - -FortreeCity_Mart_EventScript_2176AA:: @ 82176AA - msgbox FortreeCity_Mart_Text_21778E, 2 - end - -FortreeCity_Mart_Text_2176B3: @ 82176B3 - .string "SUPER REPEL lasts a long time,\n" - .string "and it gets the job done.\p" - .string "It’s much better than an ordinary\n" - .string "REPEL.$" - -FortreeCity_Mart_Text_217715: @ 8217715 - .string "I always stock up on more items than\n" - .string "I’m sure I’ll need.\p" - .string "You never know what might happen.\n" - .string "Better to be safe than sorry!$" - -FortreeCity_Mart_Text_21778E: @ 821778E - .string "A RARE CANDY makes a POKéMON grow\n" - .string "immediately by one level.$" - diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc b/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc deleted file mode 100644 index e119a0f29..000000000 --- a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc +++ /dev/null @@ -1,55 +0,0 @@ -FortreeCity_PokemonCenter_1F_MapScripts:: @ 82173D8 - map_script 3, FortreeCity_PokemonCenter_1F_MapScript1_2173E3 - map_script 5, FortreeCity_PokemonCenter_1F_MapScript1_277C30 - .byte 0 - -FortreeCity_PokemonCenter_1F_MapScript1_2173E3: @ 82173E3 - setrespawn 7 - end - -FortreeCity_PokemonCenter_1F_EventScript_2173E7:: @ 82173E7 - setvar VAR_0x800B, 1 - call FortreeCity_PokemonCenter_1F_EventScript_27191E - waitmessage - waitbuttonpress - release - end - -FortreeCity_PokemonCenter_1F_EventScript_2173F5:: @ 82173F5 - msgbox FortreeCity_PokemonCenter_1F_Text_217410, 2 - end - -FortreeCity_PokemonCenter_1F_EventScript_2173FE:: @ 82173FE - msgbox FortreeCity_PokemonCenter_1F_Text_21746D, 2 - end - -FortreeCity_PokemonCenter_1F_EventScript_217407:: @ 8217407 - msgbox FortreeCity_PokemonCenter_1F_Text_21751F, 2 - end - -FortreeCity_PokemonCenter_1F_Text_217410: @ 8217410 - .string "Listen, kid, are you working\n" - .string "on a POKéDEX?\p" - .string "Hmm… Go to the SAFARI ZONE.\n" - .string "That’s my suggestion.$" - -FortreeCity_PokemonCenter_1F_Text_21746D: @ 821746D - .string "Have you done anything at\n" - .string "the RECORD CORNER?\p" - .string "It’s pretty neat. It mixes and matches\n" - .string "the records of TRAINERS.\p" - .string "I don’t know quite how it works,\n" - .string "but it’s cool. It’s exciting, even!$" - -FortreeCity_PokemonCenter_1F_Text_21751F: @ 821751F - .string "Oh, wow, you have a POKéNAV!\n" - .string "And it’s just like mine!\p" - .string "Do you know about POKéNAV’s\n" - .string "MATCH CALL system?\p" - .string "Access it, and you can chat with\n" - .string "registered TRAINERS anytime.\p" - .string "It also shows you which TRAINERS\n" - .string "want a rematch with you.\p" - .string "It’s really nifty! Those DEVON guys\n" - .string "sure know what they’re doing!$" - diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_2F.inc b/data/scripts/maps/FortreeCity_PokemonCenter_2F.inc deleted file mode 100644 index f631aa3c6..000000000 --- a/data/scripts/maps/FortreeCity_PokemonCenter_2F.inc +++ /dev/null @@ -1,19 +0,0 @@ -FortreeCity_PokemonCenter_2F_MapScripts:: @ 821763E - map_script 2, FortreeCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, FortreeCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, FortreeCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, FortreeCity_PokemonCenter_2F_MapScript1_276ACF - .byte 0 - -FortreeCity_PokemonCenter_2F_EventScript_217653:: @ 8217653 - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 - end - -FortreeCity_PokemonCenter_2F_EventScript_217659:: @ 8217659 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 - end - -FortreeCity_PokemonCenter_2F_EventScript_21765F:: @ 821765F - call OldaleTown_PokemonCenter_2F_EventScript_2771DB - end - diff --git a/data/scripts/maps/GraniteCave_1F.inc b/data/scripts/maps/GraniteCave_1F.inc deleted file mode 100644 index f3d303c0f..000000000 --- a/data/scripts/maps/GraniteCave_1F.inc +++ /dev/null @@ -1,40 +0,0 @@ -GraniteCave_1F_MapScripts:: @ 822DA5D - .byte 0 - -GraniteCave_1F_EventScript_22DA5E:: @ 822DA5E - lock - faceplayer - checkflag FLAG_0x06D - goto_eq GraniteCave_1F_EventScript_22DA8A - msgbox GraniteCave_1F_Text_22DA94, 4 - giveitem_std ITEM_HM05 - setflag FLAG_0x06D - msgbox GraniteCave_1F_Text_22DBB7, 4 - release - end - -GraniteCave_1F_EventScript_22DA8A:: @ 822DA8A - msgbox GraniteCave_1F_Text_22DBB7, 4 - release - end - -GraniteCave_1F_Text_22DA94: @ 822DA94 - .string "Hey, you.\n" - .string "It gets awfully dark ahead.\l" - .string "It’ll be tough trying to explore.\p" - .string "That guy who came by earlier…\n" - .string "STEVEN, I think it was.\p" - .string "He knew how to use FLASH, so he ought\n" - .string "to be all right, but…\p" - .string "Well, for us HIKERS, helping out those\n" - .string "that we meet is our motto.\p" - .string "Here you go, I’ll pass this on to you.$" - -GraniteCave_1F_Text_22DBB7: @ 822DBB7 - .string "Teach that hidden move FLASH to\n" - .string "a POKéMON and use it.\p" - .string "It lights up even the inky darkness\n" - .string "of caves.\p" - .string "But, to use it, you need the GYM BADGE\n" - .string "from DEWFORD’s POKéMON GYM.$" - diff --git a/data/scripts/maps/GraniteCave_B1F.inc b/data/scripts/maps/GraniteCave_B1F.inc deleted file mode 100644 index 360b10a08..000000000 --- a/data/scripts/maps/GraniteCave_B1F.inc +++ /dev/null @@ -1,11 +0,0 @@ -GraniteCave_B1F_MapScripts:: @ 822DC5E - map_script 2, GraniteCave_B1F_MapScript2_2A8327 - map_script 3, GraniteCave_B1F_MapScript1_2A8331 - map_script 5, GraniteCave_B1F_MapScript1_22DC6E - .byte 0 - -GraniteCave_B1F_MapScript1_22DC6E: @ 822DC6E - setstepcallback 7 - setholewarp MAP_GRANITE_CAVE_B2F, 255, 0, 0 - end - diff --git a/data/scripts/maps/GraniteCave_B2F.inc b/data/scripts/maps/GraniteCave_B2F.inc deleted file mode 100644 index d8cacbe38..000000000 --- a/data/scripts/maps/GraniteCave_B2F.inc +++ /dev/null @@ -1,3 +0,0 @@ -GraniteCave_B2F_MapScripts:: @ 822DC79 - .byte 0 - diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc deleted file mode 100644 index b057a0548..000000000 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ /dev/null @@ -1,124 +0,0 @@ -GraniteCave_StevensRoom_MapScripts:: @ 822DC7A - .byte 0 - -GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B - lock - faceplayer - msgbox GraniteCave_StevensRoom_Text_22DD5A, 4 - setvar VAR_0x8004, 274 - call GraniteCave_StevensRoom_EventScript_2723E4 - setflag FLAG_0x0BD - msgbox GraniteCave_StevensRoom_Text_22DDBD, 4 - giveitem_std ITEM_TM47 - compare VAR_RESULT, 0 - call_if 1, GraniteCave_StevensRoom_EventScript_22DD3C - msgbox GraniteCave_StevensRoom_Text_22DE6B, 4 - closemessage - delay 30 - playfanfare MUS_ME_TORE_EYE - msgbox GraniteCave_StevensRoom_Text_22DF6A, 4 - waitfanfare - closemessage - delay 30 - setflag FLAG_0x131 - msgbox GraniteCave_StevensRoom_Text_22DF8C, 4 - closemessage - compare VAR_FACING, 2 - call_if 1, GraniteCave_StevensRoom_EventScript_22DD0D - compare VAR_FACING, 1 - call_if 1, GraniteCave_StevensRoom_EventScript_22DD2A - compare VAR_FACING, 3 - call_if 1, GraniteCave_StevensRoom_EventScript_22DD18 - compare VAR_FACING, 4 - call_if 1, GraniteCave_StevensRoom_EventScript_22DD18 - playse SE_KAIDAN - removeobject 1 - release - end - -GraniteCave_StevensRoom_EventScript_22DD0D:: @ 822DD0D - applymovement 1, GraniteCave_StevensRoom_Movement_22DD45 - waitmovement 0 - return - -GraniteCave_StevensRoom_EventScript_22DD18:: @ 822DD18 - applymovement 255, GraniteCave_StevensRoom_Movement_22DD4C - applymovement 1, GraniteCave_StevensRoom_Movement_22DD45 - waitmovement 0 - return - -GraniteCave_StevensRoom_EventScript_22DD2A:: @ 822DD2A - applymovement 255, GraniteCave_StevensRoom_Movement_22DD4C - applymovement 1, GraniteCave_StevensRoom_Movement_22DD51 - waitmovement 0 - return - -GraniteCave_StevensRoom_EventScript_22DD3C:: @ 822DD3C - msgbox GraniteCave_StevensRoom_Text_22DFAA, 4 - return - -GraniteCave_StevensRoom_Movement_22DD45: @ 822DD45 - walk_up - walk_up - walk_up - walk_up - walk_up - delay_8 - step_end - -GraniteCave_StevensRoom_Movement_22DD4C: @ 822DD4C - delay_16 - delay_16 - delay_16 - walk_in_place_fastest_up - step_end - -GraniteCave_StevensRoom_Movement_22DD51: @ 822DD51 - walk_left - walk_up - walk_up - walk_up - walk_right - walk_up - walk_up - delay_8 - step_end - -GraniteCave_StevensRoom_Text_22DD5A: @ 822DD5A - .string "My name is STEVEN.\p" - .string "I’m interested in rare stones,\n" - .string "so I travel here and there.\p" - .string "Oh?\n" - .string "A LETTER for me?$" - -GraniteCave_StevensRoom_Text_22DDBD: @ 822DDBD - .string "STEVEN: Okay, thank you.\p" - .string "You went through all this trouble to\n" - .string "deliver that. I need to thank you.\p" - .string "Let me see…\n" - .string "I’ll give you this TM.\p" - .string "It contains my favorite move,\n" - .string "STEEL WING.$" - -GraniteCave_StevensRoom_Text_22DE6B: @ 822DE6B - .string "STEVEN: Your POKéMON appear quite\n" - .string "capable.\p" - .string "If you keep training, you could even\n" - .string "become the CHAMPION of the POKéMON\l" - .string "LEAGUE one day. That’s what I think.\p" - .string "I know, since we’ve gotten to know each\n" - .string "other, let’s register one another in\l" - .string "our POKéNAVS.\p" - .string "… … … … … …$" - -GraniteCave_StevensRoom_Text_22DF6A: @ 822DF6A - .string "Registered STEVEN\n" - .string "in the POKéNAV.$" - -GraniteCave_StevensRoom_Text_22DF8C: @ 822DF8C - .string "Now, I’ve got to hurry along.$" - -GraniteCave_StevensRoom_Text_22DFAA: @ 822DFAA - .string "Oh, your BAG is full…\n" - .string "That’s too bad, then.$" - diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc deleted file mode 100644 index 963dd196d..000000000 --- a/data/scripts/maps/InsideOfTruck.inc +++ /dev/null @@ -1,60 +0,0 @@ -InsideOfTruck_MapScripts:: @ 823BEDA - map_script 1, InsideOfTruck_MapScript1_23BEE5 - map_script 5, InsideOfTruck_MapScript1_23BF01 - .byte 0 - -InsideOfTruck_MapScript1_23BEE5: @ 823BEE5 - setmetatile 4, 1, 520, 0 - setmetatile 4, 2, 528, 0 - setmetatile 4, 3, 536, 0 - end - -InsideOfTruck_MapScript1_23BF01: @ 823BF01 - setstepcallback 5 - end - -InsideOfTruck_EventScript_23BF04:: @ 823BF04 - lockall - setflag FLAG_SPECIAL_FLAG_0x4000 - checkplayergender - compare VAR_RESULT, 0 - goto_eq InsideOfTruck_EventScript_23BF20 - compare VAR_RESULT, 1 - goto_eq InsideOfTruck_EventScript_23BF46 - end - -InsideOfTruck_EventScript_23BF20:: @ 823BF20 - setrespawn 1 - setvar VAR_0x4092, 1 - setflag FLAG_0x2F7 - setflag FLAG_0x2FA - setflag FLAG_0x310 - setflag FLAG_0x2DF - setflag FLAG_0x331 - setvar VAR_0x408C, 1 - setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10 - releaseall - end - -InsideOfTruck_EventScript_23BF46:: @ 823BF46 - setrespawn 2 - setvar VAR_0x4092, 2 - setflag FLAG_0x2F6 - setflag FLAG_0x2F9 - setflag FLAG_0x311 - setflag FLAG_0x2E0 - setflag FLAG_0x332 - setvar VAR_0x4082, 1 - setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10 - releaseall - end - -InsideOfTruck_EventScript_23BF6C:: @ 823BF6C - msgbox InsideOfTruck_Text_23BF75, 3 - end - -InsideOfTruck_Text_23BF75: @ 823BF75 - .string "The box is printed with a POKéMON logo.\p" - .string "It’s a POKéMON brand moving and\n" - .string "delivery service.$" - diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc deleted file mode 100644 index a96d13902..000000000 --- a/data/scripts/maps/IslandCave.inc +++ /dev/null @@ -1,129 +0,0 @@ -IslandCave_MapScripts:: @ 8238E2A - map_script 5, IslandCave_MapScript1_238E3A - map_script 1, IslandCave_MapScript1_238E58 - map_script 3, IslandCave_MapScript1_238E99 - .byte 0 - -IslandCave_MapScript1_238E3A: @ 8238E3A - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, IslandCave_EventScript_238E44 - end - -IslandCave_EventScript_238E44:: @ 8238E44 - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 7 - goto_if 5, IslandCave_EventScript_27374E - removeobject VAR_LAST_TALKED - return - -IslandCave_MapScript1_238E58: @ 8238E58 - checkflag FLAG_SYS_BRAILLE_WAIT - call_if 0, IslandCave_EventScript_238E62 - end - -IslandCave_EventScript_238E62:: @ 8238E62 - setmetatile 7, 19, 553, 1 - setmetatile 8, 19, 553, 1 - setmetatile 9, 19, 553, 1 - setmetatile 7, 20, 565, 1 - setmetatile 8, 20, 565, 1 - setmetatile 9, 20, 565, 1 - return - -IslandCave_MapScript1_238E99: @ 8238E99 - setflag FLAG_LANDMARK_ISLAND_CAVE - call IslandCave_EventScript_238F45 - checkflag FLAG_0x1BC - call_if 0, IslandCave_EventScript_238EAB - end - -IslandCave_EventScript_238EAB:: @ 8238EAB - clearflag FLAG_0x3A8 - return - -IslandCave_EventScript_238EAF:: @ 8238EAF - setmetatile 7, 19, 554, 1 - setmetatile 8, 19, 555, 1 - setmetatile 9, 19, 556, 1 - setmetatile 7, 20, 562, 1 - setmetatile 8, 20, 563, 0 - setmetatile 9, 20, 564, 1 - special DrawWholeMapView - playse SE_BAN - setflag FLAG_SYS_BRAILLE_WAIT - end - -IslandCave_EventScript_238EEF:: @ 8238EEF - lockall - checkflag FLAG_0x003 - call_if 1, IslandCave_EventScript_238F45 - checkflag FLAG_SYS_BRAILLE_WAIT - goto_eq IslandCave_EventScript_238F13 - braillemessage IslandCave_Braille_2A6CD4 - setflag FLAG_0x002 - special ShouldDoBrailleRegicePuzzle - goto IslandCave_EventScript_238F41 - end - -IslandCave_EventScript_238F13:: @ 8238F13 - msgbox gUnknown_0827304E, 4 - releaseall - end - -IslandCave_EventScript_238F1D:: @ 8238F1D - lockall - checkflag FLAG_0x003 - call_if 1, IslandCave_EventScript_238F45 - braillemessage IslandCave_Braille_2A6CD4 - checkflag FLAG_SYS_BRAILLE_WAIT - goto_eq IslandCave_EventScript_238F41 - setflag FLAG_0x002 - special ShouldDoBrailleRegicePuzzle - goto IslandCave_EventScript_238F41 - end - -IslandCave_EventScript_238F41:: @ 8238F41 - waitbuttonpress - hidebox2 - releaseall - end - -IslandCave_EventScript_238F45:: @ 8238F45 - setvar VAR_0x403B, 0 - setvar VAR_0x403C, 0 - setvar VAR_0x403D, 0 - clearflag FLAG_0x003 - return - -IslandCave_EventScript_238F58:: @ 8238F58 - lock - faceplayer - waitse - playmoncry SPECIES_REGICE, 2 - delay 40 - waitmoncry - setwildbattle SPECIES_REGICE, 40, ITEM_NONE - setflag FLAG_SYS_CTRL_OBJ_DELETE - special StartRegiBattle - waitstate - clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 1 - goto_eq IslandCave_EventScript_238F9F - compare VAR_RESULT, 4 - goto_eq IslandCave_EventScript_238FA8 - compare VAR_RESULT, 5 - goto_eq IslandCave_EventScript_238FA8 - setflag FLAG_0x1BC - release - end - -IslandCave_EventScript_238F9F:: @ 8238F9F - setflag FLAG_0x1BC - goto IslandCave_EventScript_27376D - end - -IslandCave_EventScript_238FA8:: @ 8238FA8 - setvar VAR_0x8004, 402 - goto IslandCave_EventScript_273776 - end diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc deleted file mode 100644 index 15ac1bae6..000000000 --- a/data/scripts/maps/JaggedPass.inc +++ /dev/null @@ -1,279 +0,0 @@ -JaggedPass_MapScripts:: @ 8230656 - map_script 5, JaggedPass_MapScript1_230666 - map_script 3, JaggedPass_MapScript1_23068B - map_script 1, JaggedPass_MapScript1_23069C - .byte 0 - -JaggedPass_MapScript1_230666: @ 8230666 - setstepcallback 1 - compare VAR_0x40C8, 0 - call_if 1, JaggedPass_EventScript_230674 - end - -JaggedPass_EventScript_230674:: @ 8230674 - checkitem ITEM_MAGMA_EMBLEM, 1 - compare VAR_RESULT, 1 - goto_eq JaggedPass_EventScript_230685 - return - -JaggedPass_EventScript_230685:: @ 8230685 - setvar VAR_0x40C8, 1 - return - -JaggedPass_MapScript1_23068B: @ 823068B - compare VAR_0x40BD, 1 - call_if 1, JaggedPass_EventScript_230697 - end - -JaggedPass_EventScript_230697:: @ 8230697 - setweather 7 - doweather - return - -JaggedPass_MapScript1_23069C: @ 823069C - compare VAR_0x40C8, 1 - goto_if 3, JaggedPass_EventScript_2306A8 - end - -JaggedPass_EventScript_2306A8:: @ 82306A8 - setmetatile 16, 17, 628, 1 - setmetatile 16, 18, 628, 1 - end - -JaggedPass_EventScript_2306BB:: @ 82306BB - lockall - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 5 - special sub_8139560 - waitstate - msgbox JaggedPass_Text_230DBA, 4 - closemessage - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 16 - setvar VAR_0x8007, 3 - special sub_8139560 - waitstate - playse SE_KOUKA_M - setmetatile 16, 17, 598, 1 - setmetatile 16, 18, 606, 0 - special DrawWholeMapView - delay 30 - setvar VAR_0x40C8, 2 - waitse - releaseall - end - -JaggedPass_EventScript_230718:: @ 8230718 - lockall - checkflag FLAG_0x139 - goto_eq JaggedPass_EventScript_230766 - waitse - playse SE_PIN - applymovement 5, JaggedPass_Movement_272598 - waitmovement 0 - applymovement 5, JaggedPass_Movement_27259A - waitmovement 0 - applymovement 5, JaggedPass_Movement_27259E - waitmovement 0 - msgbox JaggedPass_Text_230CCB, 4 - closemessage - trainerbattle 3, TRAINER_GRUNT_30, 0, JaggedPass_Text_230D2D - setflag FLAG_0x139 - applymovement 5, JaggedPass_Movement_2725A2 - waitmovement 0 - releaseall - end - -JaggedPass_EventScript_230766:: @ 8230766 - applymovement 5, JaggedPass_Movement_27259E - waitmovement 0 - msgbox JaggedPass_Text_230D65, 4 - closemessage - applymovement 5, JaggedPass_Movement_2725A2 - waitmovement 0 - releaseall - end - -JaggedPass_EventScript_230785:: @ 8230785 - trainerbattle 0, TRAINER_ERIC, 0, JaggedPass_Text_230888, JaggedPass_Text_2308FF - msgbox JaggedPass_Text_230916, 6 - end - -JaggedPass_EventScript_23079C:: @ 823079C - trainerbattle 2, TRAINER_DIANA_1, 0, JaggedPass_Text_230974, JaggedPass_Text_2309B5, JaggedPass_EventScript_2307C8 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq JaggedPass_EventScript_2307E4 - msgbox JaggedPass_Text_2309D8, 4 - release - end - -JaggedPass_EventScript_2307C8:: @ 82307C8 - special sub_80B4808 - msgbox JaggedPass_Text_230A2C, 4 - setvar VAR_0x8004, 474 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 474 - callstd 8 - release - end - -JaggedPass_EventScript_2307E4:: @ 82307E4 - trainerbattle 5, TRAINER_DIANA_1, 0, JaggedPass_Text_230A76, JaggedPass_Text_230AAA - msgbox JaggedPass_Text_230AD7, 6 - end - -JaggedPass_EventScript_2307FB:: @ 82307FB - trainerbattle 2, TRAINER_ETHAN_1, 0, JaggedPass_Text_230B10, JaggedPass_Text_230B50, JaggedPass_EventScript_230827 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq JaggedPass_EventScript_230843 - msgbox JaggedPass_Text_230B93, 4 - release - end - -JaggedPass_EventScript_230827:: @ 8230827 - special sub_80B4808 - msgbox JaggedPass_Text_230BC6, 4 - setvar VAR_0x8004, 216 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 216 - callstd 8 - release - end - -JaggedPass_EventScript_230843:: @ 8230843 - trainerbattle 5, TRAINER_ETHAN_1, 0, JaggedPass_Text_230C28, JaggedPass_Text_230C60 - msgbox JaggedPass_Text_230C94, 6 - end - -JaggedPass_EventScript_23085A:: @ 823085A - trainerbattle 0, TRAINER_JULIO, 0, JaggedPass_Text_230DF7, JaggedPass_Text_230E38 - msgbox JaggedPass_Text_230E57, 6 - end - -JaggedPass_EventScript_230871:: @ 8230871 - trainerbattle 0, TRAINER_AUTUMN, 0, JaggedPass_Text_230E8E, JaggedPass_Text_230ECD - msgbox JaggedPass_Text_230EE3, 6 - end - -JaggedPass_Text_230888: @ 8230888 - .string "MT. CHIMNEY’s JAGGED PASS…\p" - .string "Now this is what I’ve always wanted\n" - .string "in a mountain.\p" - .string "This jagged bumpiness…\n" - .string "It rocks my soul!$" - -JaggedPass_Text_2308FF: @ 82308FF - .string "Losing left me bitter!$" - -JaggedPass_Text_230916: @ 8230916 - .string "Yes, I did lose at POKéMON…\p" - .string "But, when it comes to the love of\n" - .string "the mountains, I have you beat!$" - -JaggedPass_Text_230974: @ 8230974 - .string "This place isn’t your casual hike.\n" - .string "It’s not suited for a picnic.$" - -JaggedPass_Text_2309B5: @ 82309B5 - .string "Ohhh, no!\n" - .string "The ground is too bumpy…$" - -JaggedPass_Text_2309D8: @ 82309D8 - .string "Did you know?\p" - .string "Some people cleverly ride their\n" - .string "bicycles up this horribly bumpy pass.$" - -JaggedPass_Text_230A2C: @ 8230A2C - .string "Will you ever be back in this area?\n" - .string "If you do return, I’d like a rematch.$" - -JaggedPass_Text_230A76: @ 8230A76 - .string "Picnics are fun wherever you go.\n" - .string "Just like POKéMON!$" - -JaggedPass_Text_230AAA: @ 8230AAA - .string "I only lost because the ground is\n" - .string "too bumpy!$" - -JaggedPass_Text_230AD7: @ 8230AD7 - .string "I’ll forget about losing and just\n" - .string "enjoy this bumpy hike.$" - -JaggedPass_Text_230B10: @ 8230B10 - .string "JAGGED PASS is hard to walk on.\n" - .string "It’s a good place for training.$" - -JaggedPass_Text_230B50: @ 8230B50 - .string "It was all over while we were still\n" - .string "trying to find a good footing…$" - -JaggedPass_Text_230B93: @ 8230B93 - .string "If I had an ACRO BIKE, I’d be able to\n" - .string "jump ledges.$" - -JaggedPass_Text_230BC6: @ 8230BC6 - .string "When I get more used to this bumpiness,\n" - .string "I’ll be sure to win!\p" - .string "Can you register me in your POKéNAV?$" - -JaggedPass_Text_230C28: @ 8230C28 - .string "I got used to this bumpiness.\n" - .string "I sing while I climb now.$" - -JaggedPass_Text_230C60: @ 8230C60 - .string "It’s still not easy to battle on this\n" - .string "bumpy ground…$" - -JaggedPass_Text_230C94: @ 8230C94 - .string "I should get an ACRO BIKE from RYDEL\n" - .string "in MAUVILLE CITY…$" - -JaggedPass_Text_230CCB: @ 8230CCB - .string "Wah!\n" - .string "What are you doing here?\p" - .string "What am I doing in a place like this?\p" - .string "What business is it of yours?$" - -JaggedPass_Text_230D2D: @ 8230D2D - .string "Urrrgh…\p" - .string "I should’ve ducked into our HIDEOUT\n" - .string "right away…$" - -JaggedPass_Text_230D65: @ 8230D65 - .string "Okay, oh-kay!\n" - .string "I admit it--you’re strong!\p" - .string "Don’t worry about me.\n" - .string "Go wherever you want!$" - -JaggedPass_Text_230DBA: @ 8230DBA - .string "Oh! This boulder is shaking in response\n" - .string "to the MAGMA EMBLEM!$" - -JaggedPass_Text_230DF7: @ 8230DF7 - .string "Aiyeeh! It’s awfully scary to shoot\n" - .string "down the mountain in one go!$" - -JaggedPass_Text_230E38: @ 8230E38 - .string "I feel like I’m falling apart…$" - -JaggedPass_Text_230E57: @ 8230E57 - .string "My bicycle bounced around so much,\n" - .string "my rear end’s sore…$" - -JaggedPass_Text_230E8E: @ 8230E8E - .string "I climb this hill every day.\n" - .string "I have confidence in my strength!$" - -JaggedPass_Text_230ECD: @ 8230ECD - .string "Hmm…\n" - .string "What went wrong?$" - -JaggedPass_Text_230EE3: @ 8230EE3 - .string "What is that odd rock protrusion\n" - .string "a little up the hill from here?$" - diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc deleted file mode 100644 index 5670d9b6e..000000000 --- a/data/scripts/maps/LavaridgeTown.inc +++ /dev/null @@ -1,425 +0,0 @@ -LavaridgeTown_MapScripts:: @ 81EA4D3 - map_script 3, LavaridgeTown_MapScript1_1EA4DE - map_script 2, LavaridgeTown_MapScript2_1EA547 - .byte 0 - -LavaridgeTown_MapScript1_1EA4DE: @ 81EA4DE - setflag FLAG_VISITED_LAVARIDGE_TOWN - checkflag FLAG_0x06C - call_if 1, LavaridgeTown_EventScript_1EA514 - checkflag FLAG_0x08B - call_if 1, LavaridgeTown_EventScript_1EA53F - call LavaridgeTown_EventScript_271ED7 - call LavaridgeTown_EventScript_271EFB - compare VAR_0x4053, 1 - call_if 1, LavaridgeTown_EventScript_1EA518 - compare VAR_0x4053, 1 - call_if 1, LavaridgeTown_EventScript_1EA543 - end - -LavaridgeTown_EventScript_1EA514:: @ 81EA514 - clearflag FLAG_0x06C - return - -LavaridgeTown_EventScript_1EA518:: @ 81EA518 - getplayerxy VAR_0x8004, VAR_0x8005 - compare VAR_0x8004, 9 - goto_eq LavaridgeTown_EventScript_1EA529 - return - -LavaridgeTown_EventScript_1EA529:: @ 81EA529 - setobjectxyperm 8, 11, 9 - setobjectxyperm 7, 9, 8 - setobjectmovementtype 7, 7 - clearflag FLAG_0x3A1 - return - -LavaridgeTown_EventScript_1EA53F:: @ 81EA53F - clearflag FLAG_0x36D - return - -LavaridgeTown_EventScript_1EA543:: @ 81EA543 - setflag FLAG_SPECIAL_FLAG_0x4000 - return - -LavaridgeTown_MapScript2_1EA547: @ 81EA547 - map_script_2 VAR_0x4053, 1, LavaridgeTown_EventScript_1EA551 - .2byte 0 - -LavaridgeTown_EventScript_1EA551:: @ 81EA551 - lockall - getplayerxy VAR_0x8008, VAR_0x8009 - compare VAR_0x8008, 9 - call_if 1, LavaridgeTown_EventScript_1EA63A - compare VAR_0x8008, 9 - call_if 5, LavaridgeTown_EventScript_1EA65C - delay 20 - checkplayergender - compare VAR_RESULT, 0 - call_if 1, LavaridgeTown_EventScript_1EA630 - compare VAR_RESULT, 1 - call_if 1, LavaridgeTown_EventScript_1EA635 - compare VAR_0x8008, 9 - call_if 1, LavaridgeTown_EventScript_1EA6A1 - compare VAR_0x8008, 9 - call_if 5, LavaridgeTown_EventScript_1EA6AC - checkplayergender - compare VAR_RESULT, 0 - goto_eq LavaridgeTown_EventScript_1EA5B5 - compare VAR_RESULT, 1 - goto_eq LavaridgeTown_EventScript_1EA5DA - end - -LavaridgeTown_EventScript_1EA5B5:: @ 81EA5B5 - msgbox LavaridgeTown_Text_1EA7C0, 4 - giveitem_std ITEM_GO_GOGGLES - setflag FLAG_0x0DD - msgbox LavaridgeTown_Text_1EA897, 4 - goto LavaridgeTown_EventScript_1EA5FF - end - -LavaridgeTown_EventScript_1EA5DA:: @ 81EA5DA - msgbox LavaridgeTown_Text_1EA9A2, 4 - giveitem_std ITEM_GO_GOGGLES - setflag FLAG_0x0DD - msgbox LavaridgeTown_Text_1EAA2E, 4 - goto LavaridgeTown_EventScript_1EA5FF - end - -LavaridgeTown_EventScript_1EA5FF:: @ 81EA5FF - closemessage - removeobject 8 - addobject 7 - delay 30 - compare VAR_0x8008, 9 - call_if 1, LavaridgeTown_EventScript_1EA6B7 - compare VAR_0x8008, 9 - call_if 5, LavaridgeTown_EventScript_1EA6C9 - removeobject 7 - setvar VAR_0x4053, 2 - clearflag FLAG_SPECIAL_FLAG_0x4000 - savebgm MUS_DUMMY - fadedefaultbgm - releaseall - end - -LavaridgeTown_EventScript_1EA630:: @ 81EA630 - playbgm MUS_GIRL_SUP, 1 - return - -LavaridgeTown_EventScript_1EA635:: @ 81EA635 - playbgm MUS_BOY_SUP, 1 - return - -LavaridgeTown_EventScript_1EA63A:: @ 81EA63A - applymovement 8, LavaridgeTown_Movement_2725A6 - waitmovement 0 - playse SE_PIN - applymovement 8, LavaridgeTown_Movement_272598 - waitmovement 0 - applymovement 8, LavaridgeTown_Movement_27259A - waitmovement 0 - return - -LavaridgeTown_EventScript_1EA65C:: @ 81EA65C - opendoor 12, 15 - waitdooranim - addobject 8 - applymovement 8, LavaridgeTown_Movement_1EA6F8 - waitmovement 0 - closedoor 12, 15 - waitdooranim - applymovement 8, LavaridgeTown_Movement_2725A4 - waitmovement 0 - playse SE_PIN - applymovement 8, LavaridgeTown_Movement_272598 - waitmovement 0 - applymovement 8, LavaridgeTown_Movement_27259A - waitmovement 0 - applymovement 255, LavaridgeTown_Movement_2725A8 - waitmovement 0 - return - -LavaridgeTown_EventScript_1EA6A1:: @ 81EA6A1 - applymovement 8, LavaridgeTown_Movement_1EA6F4 - waitmovement 0 - return - -LavaridgeTown_EventScript_1EA6AC:: @ 81EA6AC - applymovement 8, LavaridgeTown_Movement_1EA6ED - waitmovement 0 - return - -LavaridgeTown_EventScript_1EA6B7:: @ 81EA6B7 - applymovement 255, LavaridgeTown_Movement_1EA6DF - applymovement 7, LavaridgeTown_Movement_1EA6E3 - waitmovement 0 - return - -LavaridgeTown_EventScript_1EA6C9:: @ 81EA6C9 - applymovement 7, LavaridgeTown_Movement_1EA6D4 - waitmovement 0 - return - -LavaridgeTown_Movement_1EA6D4: @ 81EA6D4 - 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 - delay_16 - delay_8 - walk_in_place_fastest_right - step_end - -LavaridgeTown_Movement_1EA6E3: @ 81EA6E3 - 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 - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - step_end - -LavaridgeTown_Movement_1EA6F4: @ 81EA6F4 - walk_left - walk_left - walk_up - step_end - -LavaridgeTown_Movement_1EA6F8: @ 81EA6F8 - walk_down - step_end - -LavaridgeTown_EventScript_1EA6FA:: @ 81EA6FA - specialvar VAR_RESULT, GetPlayerFacingDirection - compare VAR_RESULT, 1 - goto_eq LavaridgeTown_EventScript_1EA70B - end - -LavaridgeTown_EventScript_1EA70B:: @ 81EA70B - incrementgamestat 49 - end - -LavaridgeTown_EventScript_1EA70E:: @ 81EA70E - msgbox LavaridgeTown_Text_1EAE03, 2 - end - -LavaridgeTown_EventScript_1EA717:: @ 81EA717 - msgbox LavaridgeTown_Text_1EAEE1, 3 - end - -LavaridgeTown_EventScript_1EA720:: @ 81EA720 - msgbox LavaridgeTown_Text_1EAF9B, 2 - end - -LavaridgeTown_EventScript_1EA729:: @ 81EA729 - msgbox LavaridgeTown_Text_1EB003, 2 - end - -LavaridgeTown_EventScript_1EA732:: @ 81EA732 - msgbox LavaridgeTown_Text_1EB092, 2 - end - -LavaridgeTown_EventScript_1EA73B:: @ 81EA73B - msgbox LavaridgeTown_Text_1EAF4E, 2 - end - -LavaridgeTown_EventScript_1EA744:: @ 81EA744 - lock - faceplayer - checkflag FLAG_0x10A - goto_eq LavaridgeTown_EventScript_1EA787 - msgbox LavaridgeTown_Text_1EAB80, 5 - compare VAR_RESULT, 0 - goto_eq LavaridgeTown_EventScript_1EA79B - getpartysize - compare VAR_RESULT, 6 - goto_eq LavaridgeTown_EventScript_1EA791 - msgbox LavaridgeTown_Text_1EACC0, 4 - setflag FLAG_0x10A - playfanfare MUS_FANFA4 - message LavaridgeTown_Text_1EACF4 - waitfanfare - giveegg SPECIES_WYNAUT - release - end - -LavaridgeTown_EventScript_1EA787:: @ 81EA787 - msgbox LavaridgeTown_Text_1EAD9E, 4 - release - end - -LavaridgeTown_EventScript_1EA791:: @ 81EA791 - msgbox LavaridgeTown_Text_1EAD09, 4 - release - end - -LavaridgeTown_EventScript_1EA79B:: @ 81EA79B - msgbox LavaridgeTown_Text_1EAD44, 4 - release - end - -LavaridgeTown_EventScript_1EA7A5:: @ 81EA7A5 - msgbox LavaridgeTown_Text_1EB12B, 3 - end - -LavaridgeTown_EventScript_1EA7AE:: @ 81EA7AE - msgbox LavaridgeTown_Text_1EB178, 3 - end - -LavaridgeTown_EventScript_1EA7B7:: @ 81EA7B7 - msgbox LavaridgeTown_Text_1EB1CB, 3 - end - -LavaridgeTown_Text_1EA7C0: @ 81EA7C0 - .string "MAY: {PLAYER}{KUN}! Long time no see!\p" - .string "Oh? While I visited the hot springs,\n" - .string "you got the LAVARIDGE GYM BADGE.\p" - .string "You must have collected\n" - .string "good POKéMON…\l" - .string "No, I believe you raised some.\p" - .string "I guess it would be okay for you to\n" - .string "have this.$" - -LavaridgeTown_Text_1EA897: @ 81EA897 - .string "MAY: With those GO-GOGGLES, you’ll\n" - .string "have no trouble getting through the\l" - .string "desert near ROUTE 111.\p" - .string "But, wow, {PLAYER}{KUN}…\n" - .string "Challenging GYMS…\p" - .string "You’re trying hard because you don’t\n" - .string "want to lose to me, I bet!\p" - .string "{PLAYER}{KUN}, I think I should challenge\n" - .string "your dad in PETALBURG GYM.\p" - .string "See you again!$" - -LavaridgeTown_Text_1EA9A2: @ 81EA9A2 - .string "BRENDAN: {PLAYER}, hey, it’s been a while.\n" - .string "How’s it going?\p" - .string "Hmm…\n" - .string "That’s a decent collection of BADGES.\p" - .string "All right, then.\n" - .string "You may as well have this.$" - -LavaridgeTown_Text_1EAA2E: @ 81EAA2E - .string "BRENDAN: Keep those with you if you’re\n" - .string "planning on going into that desert near\l" - .string "ROUTE 111.\p" - .string "There should be some POKéMON that\n" - .string "are exclusively desert-dwellers.\l" - .string "You might look around for those.\p" - .string "As for me…\n" - .string "I’m considering challenging NORMAN,\l" - .string "the GYM LEADER of PETALBURG.\p" - .string "Unlike you, {PLAYER}, your dad looks like\n" - .string "he really is tough.\p" - .string "See you around!$" - -LavaridgeTown_Text_1EAB80: @ 81EAB80 - .string "I have here an EGG.\p" - .string "I’d hoped to hatch it by covering it in\n" - .string "hot sand by the hot springs.\l" - .string "But that doesn’t seem to be enough…\p" - .string "I’ve heard it would be best if it were\n" - .string "kept together with POKéMON and\l" - .string "carried about.\p" - .string "You are a TRAINER, yes?\n" - .string "And your POKéMON radiate vitality.\p" - .string "So, what say you?\n" - .string "Will you take this EGG to hatch?$" - -LavaridgeTown_Text_1EACC0: @ 81EACC0 - .string "Good! I hope you’ll walk plenty with\n" - .string "this here EGG!$" - -LavaridgeTown_Text_1EACF4: @ 81EACF4 - .string "{PLAYER} received the EGG.$" - -LavaridgeTown_Text_1EAD09: @ 81EAD09 - .string "Oh? You’ve too many POKéMON.\n" - .string "There’s no room for this EGG…$" - -LavaridgeTown_Text_1EAD44: @ 81EAD44 - .string "As you wish, then…\p" - .string "If you have a change of heart about\n" - .string "hatching this EGG, I will be here.$" - -LavaridgeTown_Text_1EAD9E: @ 81EAD9E - .string "Every so often, an EGG will be found at\n" - .string "the POKéMON DAY CARE.\p" - .string "Or at least that’s how the rumor goes.$" - -LavaridgeTown_Text_1EAE03: @ 81EAE03 - .string "We draw as much hot water as we need,\n" - .string "and yet the hot springs never run dry.\p" - .string "Isn’t it magical?\p" - .string "These hot springs appear near active\n" - .string "volcanoes. Veins of water under the\l" - .string "ground are heated by magma to well up\l" - .string "as hot springs.$" - -LavaridgeTown_Text_1EAEE1: @ 81EAEE1 - .string "Being buried in this hot sand is…\n" - .string "Sigh…\p" - .string "So warm and heavenly…\p" - .string "Eh? Gyaah! Ouch!\p" - .string "A POKéMON nipped my backside!$" - -LavaridgeTown_Text_1EAF4E: @ 81EAF4E - .string "Oh, you like hot springs, do you?\p" - .string "That’s surprising for one as young\n" - .string "as you.$" - -LavaridgeTown_Text_1EAF9B: @ 81EAF9B - .string "I bathe in the hot springs every day.\p" - .string "I want to become a beautiful and strong\n" - .string "GYM LEADER like FLANNERY.$" - -LavaridgeTown_Text_1EB003: @ 81EB003 - .string "If people put POKéMON in hot springs,\n" - .string "it might be seriously strange.\p" - .string "Why, it might be an electric bath, or\n" - .string "a bubble bath, or even a lava bath…$" - -LavaridgeTown_Text_1EB092: @ 81EB092 - .string "They’re claiming that these hot springs\n" - .string "are good for calming nervous tension,\l" - .string "relieving aching muscles, solving\l" - .string "romantic problems, and attracting\l" - .string "money…$" - -LavaridgeTown_Text_1EB12B: @ 81EB12B - .string "LAVARIDGE TOWN\p" - .string "“POKéMON CENTER HOT SPRINGS\n" - .string "An excellent place for relaxing!â€$" - -LavaridgeTown_Text_1EB178: @ 81EB178 - .string "LAVARIDGE TOWN POKéMON GYM\n" - .string "LEADER: FLANNERY\l" - .string "“One with a fiery passion that burns!â€$" - -LavaridgeTown_Text_1EB1CB: @ 81EB1CB - .string "POKéMON HERB SHOP\n" - .string "“Bitter taste--better cure!â€$" - diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc deleted file mode 100644 index 1d317d43b..000000000 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ /dev/null @@ -1,424 +0,0 @@ -LavaridgeTown_Gym_1F_MapScripts:: @ 81FE6F4 - map_script 3, LavaridgeTown_Gym_1F_MapScript1_1FE6FA - .byte 0 - -LavaridgeTown_Gym_1F_MapScript1_1FE6FA: @ 81FE6FA - call LavaridgeTown_Gym_1F_EventScript_1FE705 - call LavaridgeTown_Gym_1F_EventScript_1FE757 - end - -LavaridgeTown_Gym_1F_EventScript_1FE705:: @ 81FE705 - setvar VAR_TEMP_B, 0 - setvar VAR_TEMP_C, 0 - setvar VAR_TEMP_D, 0 - setvar VAR_TEMP_E, 0 - setvar VAR_TEMP_F, 0 - checktrainerflag TRAINER_COLE - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE72C - setvar VAR_TEMP_B, 1 - -LavaridgeTown_Gym_1F_EventScript_1FE72C:: @ 81FE72C - checktrainerflag TRAINER_GERALD - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE73A - setvar VAR_TEMP_C, 1 - -LavaridgeTown_Gym_1F_EventScript_1FE73A:: @ 81FE73A - checktrainerflag TRAINER_AXLE - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE748 - setvar VAR_TEMP_D, 1 - -LavaridgeTown_Gym_1F_EventScript_1FE748:: @ 81FE748 - checktrainerflag TRAINER_DANIELLE - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE756 - setvar VAR_TEMP_E, 1 - -LavaridgeTown_Gym_1F_EventScript_1FE756:: @ 81FE756 - return - -LavaridgeTown_Gym_1F_EventScript_1FE757:: @ 81FE757 - checktrainerflag TRAINER_COLE - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE764 - setobjectmovementtype 2, 63 - -LavaridgeTown_Gym_1F_EventScript_1FE764:: @ 81FE764 - checktrainerflag TRAINER_GERALD - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE771 - setobjectmovementtype 3, 63 - -LavaridgeTown_Gym_1F_EventScript_1FE771:: @ 81FE771 - checktrainerflag TRAINER_AXLE - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE77E - setobjectmovementtype 4, 63 - -LavaridgeTown_Gym_1F_EventScript_1FE77E:: @ 81FE77E - checktrainerflag TRAINER_DANIELLE - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE78B - setobjectmovementtype 5, 63 - -LavaridgeTown_Gym_1F_EventScript_1FE78B:: @ 81FE78B - return - -LavaridgeTown_Gym_1F_EventScript_1FE78C:: @ 81FE78C - trainerbattle 1, TRAINER_FLANNERY_1, 0, LavaridgeTown_Gym_1F_Text_1FF0DC, LavaridgeTown_Gym_1F_Text_1FF233, LavaridgeTown_Gym_1F_EventScript_1FE7C1 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE864 - checkflag FLAG_0x0A8 - goto_if 0, LavaridgeTown_Gym_1F_EventScript_1FE81D - msgbox LavaridgeTown_Gym_1F_Text_1FF546, 4 - release - end - -LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 - message LavaridgeTown_Gym_1F_Text_1FF32F - waitmessage - call LavaridgeTown_Gym_1F_EventScript_27207E - msgbox LavaridgeTown_Gym_1F_Text_1FF359, 4 - setflag FLAG_0x06C - setflag FLAG_0x4F3 - setflag FLAG_BADGE04_GET - addvar VAR_0x4085, 1 - compare VAR_0x4085, 6 - call_if 1, LavaridgeTown_Gym_1F_EventScript_271E84 - setvar VAR_0x8008, 4 - call LavaridgeTown_Gym_1F_EventScript_271F43 - setflag FLAG_0x326 - setvar VAR_0x4053, 1 - call LavaridgeTown_Gym_1F_EventScript_1FE841 - closemessage - delay 30 - playfanfare MUS_ME_TORE_EYE - msgbox LavaridgeTown_Gym_1F_Text_1FF517, 4 - waitfanfare - closemessage - delay 30 - setflag FLAG_0x1D6 - release - end - -LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D - giveitem_std ITEM_TM50 - compare VAR_RESULT, 0 - goto_eq LavaridgeTown_Gym_1F_EventScript_272054 - msgbox LavaridgeTown_Gym_1F_Text_1FF45C, 4 - setflag FLAG_0x0A8 - release - end - -LavaridgeTown_Gym_1F_EventScript_1FE841:: @ 81FE841 - giveitem_std ITEM_TM50 - compare VAR_RESULT, 0 - goto_eq LavaridgeTown_Gym_1F_EventScript_27205E - msgbox LavaridgeTown_Gym_1F_Text_1FF45C, 4 - setflag FLAG_0x0A8 - return - -LavaridgeTown_Gym_1F_EventScript_1FE864:: @ 81FE864 - trainerbattle 7, TRAINER_FLANNERY_1, 0, LavaridgeTown_Gym_1F_Text_1FF601, LavaridgeTown_Gym_1F_Text_1FF69F, LavaridgeTown_Gym_1F_Text_1FF75E - msgbox LavaridgeTown_Gym_1F_Text_1FF6BF, 6 - end - -LavaridgeTown_Gym_1F_EventScript_1FE87F:: @ 81FE87F - trainerbattle 2, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_1FEADE, LavaridgeTown_Gym_1F_Text_1FEAFB, LavaridgeTown_Gym_1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_1F_Text_1FEB1C, 6 - end - -LavaridgeTown_Gym_1F_EventScript_1FE89A:: @ 81FE89A -LavaridgeTown_Gym_B1F_EventScript_1FE89A:: @ 81FE89A - call LavaridgeTown_Gym_1F_EventScript_1FE705 - release - special ShouldTryGetTrainerScript - compare VAR_RESULT, 1 - goto_eq EventScript_GotoTrainerScript - end - -LavaridgeTown_Gym_1F_EventScript_1FE8AF:: @ 81FE8AF - trainerbattle 2, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_1FEB7B, LavaridgeTown_Gym_1F_Text_1FEBC0, LavaridgeTown_Gym_1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_1F_Text_1FEBE1, 6 - end - -LavaridgeTown_Gym_B1F_EventScript_1FE8CA:: @ 81FE8CA - trainerbattle 2, TRAINER_KEEGAN, 2, LavaridgeTown_Gym_B1F_Text_1FEC31, LavaridgeTown_Gym_B1F_Text_1FECE3, LavaridgeTown_Gym_B1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_B1F_Text_1FED02, 6 - end - -LavaridgeTown_Gym_1F_EventScript_1FE8E5:: @ 81FE8E5 - trainerbattle 2, TRAINER_DANIELLE, 5, LavaridgeTown_Gym_1F_Text_1FEE22, LavaridgeTown_Gym_1F_Text_1FEE42, LavaridgeTown_Gym_1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_1F_Text_1FEE5D, 6 - end - -LavaridgeTown_Gym_1F_EventScript_1FE900:: @ 81FE900 - trainerbattle 2, TRAINER_GERALD, 3, LavaridgeTown_Gym_1F_Text_1FED72, LavaridgeTown_Gym_1F_Text_1FED9E, LavaridgeTown_Gym_1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_1F_Text_1FEDBB, 6 - end - -LavaridgeTown_Gym_B1F_EventScript_1FE91B:: @ 81FE91B - trainerbattle 2, TRAINER_JACE, 1, LavaridgeTown_Gym_B1F_Text_1FEE9D, LavaridgeTown_Gym_B1F_Text_1FEED5, LavaridgeTown_Gym_B1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_B1F_Text_1FEF07, 6 - end - -LavaridgeTown_Gym_B1F_EventScript_1FE936:: @ 81FE936 - trainerbattle 2, TRAINER_JEFF, 3, LavaridgeTown_Gym_B1F_Text_1FEF60, LavaridgeTown_Gym_B1F_Text_1FEFA7, LavaridgeTown_Gym_B1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_B1F_Text_1FEFC2, 6 - end - -LavaridgeTown_Gym_B1F_EventScript_1FE951:: @ 81FE951 - trainerbattle 2, TRAINER_ELI, 4, LavaridgeTown_Gym_B1F_Text_1FF025, LavaridgeTown_Gym_B1F_Text_1FF05F, LavaridgeTown_Gym_B1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_B1F_Text_1FF09A, 6 - end - -LavaridgeTown_Gym_1F_EventScript_1FE96C:: @ 81FE96C - lock - faceplayer - checkflag FLAG_0x4F3 - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE981 - msgbox LavaridgeTown_Gym_1F_Text_1FE9BF, 4 - release - end - -LavaridgeTown_Gym_1F_EventScript_1FE981:: @ 81FE981 - msgbox LavaridgeTown_Gym_1F_Text_1FEAB8, 4 - release - end - -LavaridgeTown_Gym_1F_EventScript_1FE98B:: @ 81FE98B - lockall - checkflag FLAG_BADGE04_GET - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE9AB - goto LavaridgeTown_Gym_1F_EventScript_1FE9B5 - end - -LavaridgeTown_Gym_1F_EventScript_1FE99B:: @ 81FE99B - lockall - checkflag FLAG_BADGE04_GET - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE9AB - goto LavaridgeTown_Gym_1F_EventScript_1FE9B5 - end - -LavaridgeTown_Gym_1F_EventScript_1FE9AB:: @ 81FE9AB - msgbox LavaridgeTown_Gym_1F_Text_1FF5C4, 4 - releaseall - end - -LavaridgeTown_Gym_1F_EventScript_1FE9B5:: @ 81FE9B5 - msgbox LavaridgeTown_Gym_1F_Text_1FF5A9, 4 - releaseall - end - -LavaridgeTown_Gym_1F_Text_1FE9BF: @ 81FE9BF - .string "Hey, how’s it going, CHAMPION-\n" - .string "bound {PLAYER}?\p" - .string "LAVARIDGE’s GYM LEADER FLANNERY\n" - .string "uses FIRE-type POKéMON.\p" - .string "Her passion for POKéMON burns stronger\n" - .string "and hotter than a volcano.\p" - .string "Don’t get too close to her--you’ll burn!\n" - .string "Hose her down with water and then\l" - .string "go for it!$" - -LavaridgeTown_Gym_1F_Text_1FEAB8: @ 81FEAB8 - .string "Yow! That was a scorching-hot battle!$" - -LavaridgeTown_Gym_1F_Text_1FEADE: @ 81FEADE - .string "Owowowowow!\n" - .string "Yikes, it’s hot!$" - -LavaridgeTown_Gym_1F_Text_1FEAFB: @ 81FEAFB - .string "I’m blinded by sweat in my eyes…$" - -LavaridgeTown_Gym_1F_Text_1FEB1C: @ 81FEB1C - .string "Being buried in hot sand promotes\n" - .string "circulation.\p" - .string "It’s effective for healing pain in\n" - .string "your joints.$" - -LavaridgeTown_Gym_1F_Text_1FEB7B: @ 81FEB7B - .string "I’m trying to relieve my stress.\n" - .string "Don’t come along and stress me out!$" - -LavaridgeTown_Gym_1F_Text_1FEBC0: @ 81FEBC0 - .string "I hope FLANNERY flames you good!$" - -LavaridgeTown_Gym_1F_Text_1FEBE1: @ 81FEBE1 - .string "Haaah… Whew…\p" - .string "If you spend too much time buried in\n" - .string "hot sand, it tuckers you out…$" - -LavaridgeTown_Gym_B1F_Text_1FEC31: @ 81FEC31 - .string "You must be getting tired by now.\n" - .string "You’d like to rest in the hot sand,\l" - .string "wouldn’t you?\p" - .string "But you should know that maintaining\n" - .string "your willpower is an important ability\l" - .string "for all TRAINERS.$" - -LavaridgeTown_Gym_B1F_Text_1FECE3: @ 81FECE3 - .string "Play with fire, and be burned…$" - -LavaridgeTown_Gym_B1F_Text_1FED02: @ 81FED02 - .string "Your skill is real…\n" - .string "But our LEADER FLANNERY is strong.\p" - .string "If you don’t watch yourself, you’ll be\n" - .string "burned seriously.$" - -LavaridgeTown_Gym_1F_Text_1FED72: @ 81FED72 - .string "Can your POKéMON withstand\n" - .string "392-degree heat?$" - -LavaridgeTown_Gym_1F_Text_1FED9E: @ 81FED9E - .string "It didn’t burn hotly enough…$" - -LavaridgeTown_Gym_1F_Text_1FEDBB: @ 81FEDBB - .string "The temperature of magma is\n" - .string "392 degrees.\p" - .string "Your POKéMON beat me, so they should\n" - .string "easily survive in magma.$" - -LavaridgeTown_Gym_1F_Text_1FEE22: @ 81FEE22 - .string "Um…\n" - .string "Okay, I’ll battle with you.$" - -LavaridgeTown_Gym_1F_Text_1FEE42: @ 81FEE42 - .string "Oh, but you’re too strong.$" - -LavaridgeTown_Gym_1F_Text_1FEE5D: @ 81FEE5D - .string "I’m going to be a pretty and strong\n" - .string "TRAINER just like FLANNERY.$" - -LavaridgeTown_Gym_B1F_Text_1FEE9D: @ 81FEE9D - .string "Come on, get with it!\n" - .string "Let’s go before my feelings cool!$" - -LavaridgeTown_Gym_B1F_Text_1FEED5: @ 81FEED5 - .string "It’s so hot, and yet my heart is\n" - .string "clutched by ice…$" - -LavaridgeTown_Gym_B1F_Text_1FEF07: @ 81FEF07 - .string "The way the battling spirit burns\n" - .string "within you, you may stand a chance\l" - .string "against our LEADER.$" - -LavaridgeTown_Gym_B1F_Text_1FEF60: @ 81FEF60 - .string "See how the flames blaze wildly?\n" - .string "They flare in anticipation of my win!$" - -LavaridgeTown_Gym_B1F_Text_1FEFA7: @ 81FEFA7 - .string "Something didn’t go right.$" - -LavaridgeTown_Gym_B1F_Text_1FEFC2: @ 81FEFC2 - .string "Well, so what? I say so what?\n" - .string "I can walk on hot coals barefoot!\p" - .string "…Don’t even think about trying it!$" - -LavaridgeTown_Gym_B1F_Text_1FF025: @ 81FF025 - .string "As much as I love mountains,\n" - .string "I especially love volcanoes.$" - -LavaridgeTown_Gym_B1F_Text_1FF05F: @ 81FF05F - .string "Well, it seems to me I lost without\n" - .string "ever being in control.$" - -LavaridgeTown_Gym_B1F_Text_1FF09A: @ 81FF09A - .string "I stay here because I became a fan\n" - .string "of FLANNERY’s power.\p" - .string "Hehehehe.$" - -LavaridgeTown_Gym_1F_Text_1FF0DC: @ 81FF0DC - .string "Welcome… No, wait.\p" - .string "Puny TRAINER, how good to see you’ve\n" - .string "made it here!\p" - .string "I have been entrusted with the…\n" - .string "No, wait.\p" - .string "I am FLANNERY, and I’m the GYM\n" - .string "LEADER here!\p" - .string "Uh…\n" - .string "Dare not underestimate me, though\l" - .string "I have been LEADER only a short time!\p" - .string "With skills inherited from my grand-\n" - .string "father, I shall, uh…demonstrate the\l" - .string "hot moves we have honed on this land!$" - -LavaridgeTown_Gym_1F_Text_1FF233: @ 81FF233 - .string "Oh…\n" - .string "I guess I was trying too hard…\p" - .string "I… I’ve only recently become\n" - .string "a GYM LEADER.\p" - .string "I tried too hard to be someone\n" - .string "I’m not.\p" - .string "I have to do things my natural way. If\n" - .string "I don’t, my POKéMON will be confused.\p" - .string "Thanks for teaching me that.\n" - .string "For that, you deserve this.$" - -LavaridgeTown_Gym_1F_Text_1FF32F: @ 81FF32F - .string "{PLAYER} received the HEAT BADGE\n" - .string "from FLANNERY.$" - -LavaridgeTown_Gym_1F_Text_1FF359: @ 81FF359 - .string "If you have a HEAT BADGE, all POKéMON\n" - .string "up to Level 50, even those you get in\l" - .string "trades from other people, will obey\l" - .string "you completely.\p" - .string "And, it lets POKéMON use the HM move\n" - .string "STRENGTH outside of battle.\p" - .string "This is a token of my appreciation.\n" - .string "Don’t be shy about taking it!$" - -LavaridgeTown_Gym_1F_Text_1FF45C: @ 81FF45C - .string "That TM50 contains OVERHEAT.\p" - .string "That move inflicts serious damage on\n" - .string "the opponent.\p" - .string "But it also sharply cuts the SP. ATK\n" - .string "of the POKéMON using it. It might not\l" - .string "be suitable for longer battles.$" - -LavaridgeTown_Gym_1F_Text_1FF517: @ 81FF517 - .string "Registered GYM LEADER FLANNERY\n" - .string "in the POKéNAV.$" - -LavaridgeTown_Gym_1F_Text_1FF546: @ 81FF546 - .string "Your power reminds me of someone…\p" - .string "Oh! I know! You battle like NORMAN,\n" - .string "the GYM LEADER of PETALBURG.$" - -LavaridgeTown_Gym_1F_Text_1FF5A9: @ 81FF5A9 - .string "LAVARIDGE TOWN POKéMON GYM$" - -LavaridgeTown_Gym_1F_Text_1FF5C4: @ 81FF5C4 - .string "LAVARIDGE TOWN POKéMON GYM\p" - .string "FLANNERY’S CERTIFIED TRAINERS:\n" - .string "{PLAYER}$" - -LavaridgeTown_Gym_1F_Text_1FF601: @ 81FF601 - .string "FLANNERY: Losing a battle isn’t going\n" - .string "to deflate me.\p" - .string "I love POKéMON.\n" - .string "I love to battle.\l" - .string "And… I love this GYM!\p" - .string "Let’s exchange superhot moves\n" - .string "in another battle!$" - -LavaridgeTown_Gym_1F_Text_1FF69F: @ 81FF69F - .string "Whew!\n" - .string "On the verge of eruption!$" - -LavaridgeTown_Gym_1F_Text_1FF6BF: @ 81FF6BF - .string "FLANNERY: I lost the match,\n" - .string "but I’m completely satisfied.\p" - .string "It’s not often I get to enjoy a battle\n" - .string "this heated.\p" - .string "Let’s have another one like this\n" - .string "again sometime!$" - -LavaridgeTown_Gym_1F_Text_1FF75E: @ 81FF75E - .string "FLANNERY: Losing a battle isn’t going\n" - .string "to deflate me.\p" - .string "I love POKéMON.\n" - .string "I love to battle.\l" - .string "And… I love this GYM!\p" - .string "Let’s exchange superhot moves\n" - .string "in another battle!\p" - .string "Oh, wait. Do you only have one POKéMON\n" - .string "that can battle?\p" - .string "I hate to say this, but when you come\n" - .string "see me, bring at least two POKéMON.$" diff --git a/data/scripts/maps/LavaridgeTown_Gym_B1F.inc b/data/scripts/maps/LavaridgeTown_Gym_B1F.inc deleted file mode 100644 index ad2be83ea..000000000 --- a/data/scripts/maps/LavaridgeTown_Gym_B1F.inc +++ /dev/null @@ -1,59 +0,0 @@ -LavaridgeTown_Gym_B1F_MapScripts:: @ 81FF87E - map_script 3, LavaridgeTown_Gym_B1F_MapScript1_1FF884 - .byte 0 - -LavaridgeTown_Gym_B1F_MapScript1_1FF884: @ 81FF884 - call LavaridgeTown_Gym_B1F_EventScript_1FF88F - call LavaridgeTown_Gym_B1F_EventScript_1FF8DC - end - -LavaridgeTown_Gym_B1F_EventScript_1FF88F:: @ 81FF88F - setvar VAR_TEMP_7, 0 - setvar VAR_TEMP_8, 0 - setvar VAR_TEMP_9, 0 - setvar VAR_TEMP_A, 0 - checktrainerflag TRAINER_KEEGAN - goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF8B1 - setvar VAR_TEMP_7, 1 - -LavaridgeTown_Gym_B1F_EventScript_1FF8B1:: @ 81FF8B1 - checktrainerflag TRAINER_JACE - goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF8BF - setvar VAR_TEMP_8, 1 - -LavaridgeTown_Gym_B1F_EventScript_1FF8BF:: @ 81FF8BF - checktrainerflag TRAINER_JEFF - goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF8CD - setvar VAR_TEMP_9, 1 - -LavaridgeTown_Gym_B1F_EventScript_1FF8CD:: @ 81FF8CD - checktrainerflag TRAINER_ELI - goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF8DB - setvar VAR_TEMP_A, 1 - -LavaridgeTown_Gym_B1F_EventScript_1FF8DB:: @ 81FF8DB - return - -LavaridgeTown_Gym_B1F_EventScript_1FF8DC:: @ 81FF8DC - checktrainerflag TRAINER_KEEGAN - goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF8E9 - setobjectmovementtype 2, 63 - -LavaridgeTown_Gym_B1F_EventScript_1FF8E9:: @ 81FF8E9 - checktrainerflag TRAINER_JACE - goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF8F6 - setobjectmovementtype 1, 63 - -LavaridgeTown_Gym_B1F_EventScript_1FF8F6:: @ 81FF8F6 - checktrainerflag TRAINER_JEFF - goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF903 - setobjectmovementtype 3, 63 - -LavaridgeTown_Gym_B1F_EventScript_1FF903:: @ 81FF903 - checktrainerflag TRAINER_ELI - goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF910 - setobjectmovementtype 4, 63 - -LavaridgeTown_Gym_B1F_EventScript_1FF910:: @ 81FF910 - return - diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/scripts/maps/LavaridgeTown_HerbShop.inc deleted file mode 100644 index 6af8132e4..000000000 --- a/data/scripts/maps/LavaridgeTown_HerbShop.inc +++ /dev/null @@ -1,68 +0,0 @@ -LavaridgeTown_HerbShop_MapScripts:: @ 81FE4D6 - .byte 0 - -LavaridgeTown_HerbShop_EventScript_1FE4D7:: @ 81FE4D7 - lock - faceplayer - message LavaridgeTown_HerbShop_Text_1FE53E - waitmessage - pokemart LavaridgeTown_HerbShop_Pokemart_1FE4F0 - msgbox gUnknown_08272A3F, 4 - release - end - - .align 2 -LavaridgeTown_HerbShop_Pokemart_1FE4F0: @ 81FE4F0 - .2byte ITEM_ENERGY_POWDER - .2byte ITEM_ENERGY_ROOT - .2byte ITEM_HEAL_POWDER - .2byte ITEM_REVIVAL_HERB - .2byte ITEM_NONE - release - end - -LavaridgeTown_HerbShop_EventScript_1FE4FC:: @ 81FE4FC - msgbox LavaridgeTown_HerbShop_Text_1FE685, 2 - end - -LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505 - lock - faceplayer - checkflag FLAG_0x0FE - goto_eq LavaridgeTown_HerbShop_EventScript_1FE534 - msgbox LavaridgeTown_HerbShop_Text_1FE584, 4 - giveitem_std ITEM_CHARCOAL - compare VAR_RESULT, 0 - goto_eq LavaridgeTown_HerbShop_EventScript_272054 - setflag FLAG_0x0FE - release - end - -LavaridgeTown_HerbShop_EventScript_1FE534:: @ 81FE534 - msgbox LavaridgeTown_HerbShop_Text_1FE5EB, 4 - release - end - -LavaridgeTown_HerbShop_Text_1FE53E: @ 81FE53E - .string "Welcome to the HERB SHOP, home of\n" - .string "effective and inexpensive medicine!$" - -LavaridgeTown_HerbShop_Text_1FE584: @ 81FE584 - .string "You’ve come to look at herbal medicine\n" - .string "in LAVARIDGE?\p" - .string "That’s rather commendable.\p" - .string "I like you! Take this!$" - -LavaridgeTown_HerbShop_Text_1FE5EB: @ 81FE5EB - .string "That CHARCOAL I gave you, it’s used\n" - .string "for making herbal medicine.\p" - .string "It also does wonders when held by\n" - .string "a POKéMON.\p" - .string "It intensifies the power of FIRE-type\n" - .string "moves.$" - -LavaridgeTown_HerbShop_Text_1FE685: @ 81FE685 - .string "Herbal medicine works impressively well.\n" - .string "But your POKéMON will dislike you for it.\l" - .string "It must be horribly bitter!$" - diff --git a/data/scripts/maps/LavaridgeTown_House.inc b/data/scripts/maps/LavaridgeTown_House.inc deleted file mode 100644 index 14d112de9..000000000 --- a/data/scripts/maps/LavaridgeTown_House.inc +++ /dev/null @@ -1,26 +0,0 @@ -LavaridgeTown_House_MapScripts:: @ 81FF911 - .byte 0 - -LavaridgeTown_House_EventScript_1FF912:: @ 81FF912 - msgbox LavaridgeTown_House_Text_1FF92E, 2 - end - -LavaridgeTown_House_EventScript_1FF91B:: @ 81FF91B - lock - faceplayer - waitse - playmoncry SPECIES_ZIGZAGOON, 0 - msgbox LavaridgeTown_House_Text_1FF9BB, 4 - waitmoncry - release - end - -LavaridgeTown_House_Text_1FF92E: @ 81FF92E - .string "My wife’s warming an EGG in the hot\n" - .string "springs. This is what she told me.\p" - .string "She left two POKéMON with the DAY CARE.\n" - .string "And they discovered that EGG!$" - -LavaridgeTown_House_Text_1FF9BB: @ 81FF9BB - .string "ZIGZAGOON: Pshoo!$" - diff --git a/data/scripts/maps/LavaridgeTown_Mart.inc b/data/scripts/maps/LavaridgeTown_Mart.inc deleted file mode 100644 index 2c5681983..000000000 --- a/data/scripts/maps/LavaridgeTown_Mart.inc +++ /dev/null @@ -1,47 +0,0 @@ -LavaridgeTown_Mart_MapScripts:: @ 81FF9CD - .byte 0 - -LavaridgeTown_Mart_EventScript_1FF9CE:: @ 81FF9CE - lock - faceplayer - message gUnknown_08272A21 - waitmessage - pokemart LavaridgeTown_Mart_Pokemart_1FF9E8 - msgbox gUnknown_08272A3F, 4 - release - end - - .align 2 -LavaridgeTown_Mart_Pokemart_1FF9E8: @ 81FF9E8 - .2byte ITEM_GREAT_BALL - .2byte ITEM_SUPER_POTION - .2byte ITEM_ANTIDOTE - .2byte ITEM_PARALYZE_HEAL - .2byte ITEM_AWAKENING - .2byte ITEM_BURN_HEAL - .2byte ITEM_REVIVE - .2byte ITEM_SUPER_REPEL - .2byte ITEM_X_SPEED - .2byte ITEM_NONE - release - end - -LavaridgeTown_Mart_EventScript_1FF9FE:: @ 81FF9FE - msgbox LavaridgeTown_Mart_Text_1FFA10, 2 - end - -LavaridgeTown_Mart_EventScript_1FFA07:: @ 81FFA07 - msgbox LavaridgeTown_Mart_Text_1FFA83, 2 - end - -LavaridgeTown_Mart_Text_1FFA10: @ 81FFA10 - .string "Use X SPEED to add to a POKéMON’s\n" - .string "SPEED in battle.\p" - .string "That will help it get in the first\n" - .string "strike--a decided advantage!$" - -LavaridgeTown_Mart_Text_1FFA83: @ 81FFA83 - .string "On MT. CHIMNEY’s peak, there’s a local\n" - .string "specialty that you can buy only there.\p" - .string "Give it to a POKéMON--it will be elated.$" - diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc deleted file mode 100644 index 24f19b1d0..000000000 --- a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc +++ /dev/null @@ -1,48 +0,0 @@ -LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 81FFAFA - map_script 3, LavaridgeTown_PokemonCenter_1F_MapScript1_1FFB05 - map_script 5, LavaridgeTown_PokemonCenter_1F_MapScript1_277C30 - .byte 0 - -LavaridgeTown_PokemonCenter_1F_MapScript1_1FFB05: @ 81FFB05 - setrespawn 16 - call LavaridgeTown_PokemonCenter_1F_EventScript_2718DE - end - -LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E:: @ 81FFB0E - setvar VAR_0x800B, 1 - call LavaridgeTown_PokemonCenter_1F_EventScript_27191E - waitmessage - waitbuttonpress - release - end - -LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C:: @ 81FFB1C - msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFBAD, 2 - end - -LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25:: @ 81FFB25 - msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFB37, 2 - end - -LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E:: @ 81FFB2E - msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFC21, 2 - end - -LavaridgeTown_PokemonCenter_1F_Text_1FFB37: @ 81FFB37 - .string "I think POKéMON get closer to their\n" - .string "TRAINERS if they spend time together.\p" - .string "The longer the better.\n" - .string "That’s what I think.$" - -LavaridgeTown_PokemonCenter_1F_Text_1FFBAD: @ 81FFBAD - .string "It’s sort of magical how just sitting\n" - .string "in a hot-spring pool can invigorate.\p" - .string "I wish I could let my POKéMON\n" - .string "soak, too.$" - -LavaridgeTown_PokemonCenter_1F_Text_1FFC21: @ 81FFC21 - .string "Hohoho! Hey, kid, you can reach\n" - .string "the hot springs from here.\p" - .string "If POKéMON are getting rest, so too\n" - .string "should their TRAINERS.$" - diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc b/data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc deleted file mode 100644 index b1491f621..000000000 --- a/data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc +++ /dev/null @@ -1,19 +0,0 @@ -LavaridgeTown_PokemonCenter_2F_MapScripts:: @ 81FFC97 - map_script 2, LavaridgeTown_PokemonCenter_2F_MapScript2_276C3B - map_script 4, LavaridgeTown_PokemonCenter_2F_MapScript2_276B6C - map_script 1, LavaridgeTown_PokemonCenter_2F_MapScript1_276BBE - map_script 3, LavaridgeTown_PokemonCenter_2F_MapScript1_276ACF - .byte 0 - -LavaridgeTown_PokemonCenter_2F_EventScript_1FFCAC:: @ 81FFCAC - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 - end - -LavaridgeTown_PokemonCenter_2F_EventScript_1FFCB2:: @ 81FFCB2 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 - end - -LavaridgeTown_PokemonCenter_2F_EventScript_1FFCB8:: @ 81FFCB8 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB - end - diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc deleted file mode 100644 index 87a129620..000000000 --- a/data/scripts/maps/LilycoveCity.inc +++ /dev/null @@ -1,787 +0,0 @@ -LilycoveCity_MapScripts:: @ 81E2B3C - map_script 3, LilycoveCity_MapScript1_1E2B47 - map_script 1, LilycoveCity_MapScript1_1E2B61 - .byte 0 - -LilycoveCity_MapScript1_1E2B47: @ 81E2B47 - setflag FLAG_VISITED_LILYCOVE_CITY - setvar VAR_0x4086, 0 - setflag FLAG_0x322 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, LilycoveCity_EventScript_27207A - call LilycoveCity_EventScript_271ED7 - end - -LilycoveCity_MapScript1_1E2B61: @ 81E2B61 - checkflag FLAG_0x070 - call_if 0, LilycoveCity_EventScript_1E2B6B - end - -LilycoveCity_EventScript_1E2B6B:: @ 81E2B6B - setmetatile 76, 12, 656, 1 - setmetatile 77, 12, 657, 1 - setmetatile 76, 13, 672, 1 - setmetatile 77, 13, 673, 1 - setmetatile 76, 14, 664, 1 - setmetatile 77, 14, 665, 1 - setmetatile 76, 15, 672, 1 - setmetatile 77, 15, 673, 1 - setmetatile 77, 16, 664, 1 - setmetatile 78, 16, 665, 1 - setmetatile 77, 17, 672, 1 - setmetatile 78, 17, 673, 1 - return - -LilycoveCity_EventScript_1E2BD8:: @ 81E2BD8 - lock - faceplayer - dodailyevents - checkflag FLAG_0x92F - goto_eq LilycoveCity_EventScript_1E2C18 - msgbox LilycoveCity_Text_2A7244, 4 - random 10 - addvar VAR_RESULT, 133 - giveitem_std VAR_RESULT - compare VAR_RESULT, 0 - goto_eq LilycoveCity_EventScript_272054 - setflag FLAG_0x92F - msgbox LilycoveCity_Text_2A72E3, 4 - release - end - -LilycoveCity_EventScript_1E2C18:: @ 81E2C18 - msgbox LilycoveCity_Text_2A7321, 4 - release - end - -LilycoveCity_EventScript_1E2C22:: @ 81E2C22 - msgbox LilycoveCity_Text_1E3D9E, 2 - end - -LilycoveCity_EventScript_1E2C2B:: @ 81E2C2B - lock - faceplayer - checkflag FLAG_BADGE07_GET - goto_eq LilycoveCity_EventScript_1E2C40 - msgbox LilycoveCity_Text_1E3E3C, 4 - release - end - -LilycoveCity_EventScript_1E2C40:: @ 81E2C40 - msgbox LilycoveCity_Text_1E3E7D, 4 - release - end - -LilycoveCity_EventScript_1E2C4A:: @ 81E2C4A - msgbox LilycoveCity_Text_1E3F05, 2 - end - -LilycoveCity_EventScript_1E2C53:: @ 81E2C53 - lock - faceplayer - checkflag FLAG_0x070 - goto_eq LilycoveCity_EventScript_1E2C68 - msgbox LilycoveCity_Text_1E3FAB, 4 - release - end - -LilycoveCity_EventScript_1E2C68:: @ 81E2C68 - msgbox LilycoveCity_Text_1E4020, 4 - release - end - -LilycoveCity_EventScript_1E2C72:: @ 81E2C72 - lock - faceplayer - checkflag FLAG_0x070 - goto_eq LilycoveCity_EventScript_1E2C87 - msgbox LilycoveCity_Text_1E40AD, 4 - release - end - -LilycoveCity_EventScript_1E2C87:: @ 81E2C87 - msgbox LilycoveCity_Text_1E4145, 4 - release - end - -LilycoveCity_EventScript_1E2C91:: @ 81E2C91 - msgbox LilycoveCity_Text_1E417B, 2 - end - -LilycoveCity_EventScript_1E2C9A:: @ 81E2C9A - msgbox LilycoveCity_Text_1E420B, 3 - end - -LilycoveCity_EventScript_1E2CA3:: @ 81E2CA3 - msgbox LilycoveCity_Text_1E4283, 3 - end - -LilycoveCity_EventScript_1E2CAC:: @ 81E2CAC - lock - faceplayer - checkflag FLAG_BADGE07_GET - goto_eq LilycoveCity_EventScript_1E2CC1 - msgbox LilycoveCity_Text_1E42FC, 4 - release - end - -LilycoveCity_EventScript_1E2CC1:: @ 81E2CC1 - msgbox LilycoveCity_Text_1E43FF, 4 - release - end - -LilycoveCity_EventScript_1E2CCB:: @ 81E2CCB - msgbox LilycoveCity_Text_1E48A5, 2 - end - -LilycoveCity_EventScript_1E2CD4:: @ 81E2CD4 - msgbox LilycoveCity_Text_1E4902, 2 - end - -LilycoveCity_EventScript_1E2CDD:: @ 81E2CDD - lockall - msgbox LilycoveCity_Text_1E494D, 2 - applymovement 20, LilycoveCity_Movement_2725A2 - end - -LilycoveCity_EventScript_1E2CEE:: @ 81E2CEE - lockall - msgbox LilycoveCity_Text_1E49F4, 2 - applymovement 19, LilycoveCity_Movement_2725A2 - end - -LilycoveCity_EventScript_1E2CFF:: @ 81E2CFF - msgbox LilycoveCity_Text_1E448B, 3 - end - -LilycoveCity_EventScript_1E2D08:: @ 81E2D08 - msgbox LilycoveCity_Text_1E44C3, 3 - end - -LilycoveCity_EventScript_1E2D11:: @ 81E2D11 - msgbox LilycoveCity_Text_1E44FC, 3 - end - -LilycoveCity_EventScript_1E2D1A:: @ 81E2D1A - lockall - specialvar VAR_0x8004, sub_80F8940 - switch VAR_0x8004 - case 0, LilycoveCity_EventScript_1E2D3A - msgbox LilycoveCity_Text_1E4571, 4 - releaseall - end - -LilycoveCity_EventScript_1E2D3A:: @ 81E2D3A - msgbox LilycoveCity_Text_1E4534, 4 - releaseall - end - -LilycoveCity_EventScript_1E2D44:: @ 81E2D44 - lockall - checkflag FLAG_SYS_GAME_CLEAR - goto_eq LilycoveCity_EventScript_1E2D58 - msgbox LilycoveCity_Text_1E45A7, 4 - releaseall - end - -LilycoveCity_EventScript_1E2D58:: @ 81E2D58 - msgbox LilycoveCity_Text_1E4624, 4 - releaseall - end - -LilycoveCity_EventScript_1E2D62:: @ 81E2D62 - msgbox LilycoveCity_Text_1E466E, 3 - end - -LilycoveCity_EventScript_1E2D6B:: @ 81E2D6B - msgbox LilycoveCity_Text_1E46BE, 3 - end - -LilycoveCity_EventScript_1E2D74:: @ 81E2D74 - msgbox LilycoveCity_Text_1E473D, 3 - end - -LilycoveCity_EventScript_1E2D7D:: @ 81E2D7D - lockall - checkflag FLAG_0x0DA - goto_eq LilycoveCity_EventScript_1E2DB0 - msgbox LilycoveCity_Text_1E3D1F, 4 - applymovement VAR_LAST_TALKED, LilycoveCity_Movement_27259E - waitmovement 0 - msgbox LilycoveCity_Text_1E3D4A, 4 - applymovement VAR_LAST_TALKED, LilycoveCity_Movement_2725A2 - waitmovement 0 - setflag FLAG_0x0DA - releaseall - end - -LilycoveCity_EventScript_1E2DB0:: @ 81E2DB0 - msgbox LilycoveCity_Text_1E3D1F, 4 - releaseall - end - -LilycoveCity_EventScript_1E2DBA:: @ 81E2DBA - msgbox LilycoveCity_Text_1E3B2C, 2 - end - -LilycoveCity_EventScript_1E2DC3:: @ 81E2DC3 - msgbox LilycoveCity_Text_1E3B95, 2 - end - -LilycoveCity_EventScript_1E2DCC:: @ 81E2DCC - msgbox LilycoveCity_Text_1E3C46, 2 - end - -LilycoveCity_EventScript_1E2DD5:: @ 81E2DD5 - msgbox LilycoveCity_Text_1E3CBE, 2 - end - -LilycoveCity_EventScript_1E2DDE:: @ 81E2DDE - lock - faceplayer - checkplayergender - compare VAR_RESULT, 0 - goto_eq LilycoveCity_EventScript_1E2DF8 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_EventScript_1E2E6B - end - -LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8 - playbgm MUS_GIRL_SUP, 1 - checkflag FLAG_0x11E - call_if 1, LilycoveCity_EventScript_1E2E48 - checkflag FLAG_0x11E - call_if 0, LilycoveCity_EventScript_1E2E51 - compare VAR_RESULT, 0 - goto_eq LilycoveCity_EventScript_1E2E5A - msgbox LilycoveCity_Text_1E3234, 4 - switch VAR_FIRST_POKE - case 0, LilycoveCity_EventScript_1E2EDE - case 1, LilycoveCity_EventScript_1E2EEE - case 2, LilycoveCity_EventScript_1E2EFE - end - -LilycoveCity_EventScript_1E2E48:: @ 81E2E48 - msgbox LilycoveCity_Text_1E31F5, 5 - return - -LilycoveCity_EventScript_1E2E51:: @ 81E2E51 - msgbox LilycoveCity_Text_1E3061, 5 - return - -LilycoveCity_EventScript_1E2E5A:: @ 81E2E5A - setflag FLAG_0x11E - msgbox LilycoveCity_Text_1E318D, 4 - savebgm MUS_DUMMY - fadedefaultbgm - release - end - -LilycoveCity_EventScript_1E2E6B:: @ 81E2E6B - playbgm MUS_BOY_SUP, 1 - checkflag FLAG_0x11E - call_if 1, LilycoveCity_EventScript_1E2EBB - checkflag FLAG_0x11E - call_if 0, LilycoveCity_EventScript_1E2EC4 - compare VAR_RESULT, 0 - goto_eq LilycoveCity_EventScript_1E2ECD - msgbox LilycoveCity_Text_1E373C, 4 - switch VAR_FIRST_POKE - case 0, LilycoveCity_EventScript_1E2F0E - case 1, LilycoveCity_EventScript_1E2F1E - case 2, LilycoveCity_EventScript_1E2F2E - end - -LilycoveCity_EventScript_1E2EBB:: @ 81E2EBB - msgbox LilycoveCity_Text_1E36FA, 5 - return - -LilycoveCity_EventScript_1E2EC4:: @ 81E2EC4 - msgbox LilycoveCity_Text_1E3608, 5 - return - -LilycoveCity_EventScript_1E2ECD:: @ 81E2ECD - setflag FLAG_0x11E - msgbox LilycoveCity_Text_1E36BF, 4 - savebgm MUS_DUMMY - fadedefaultbgm - release - end - -LilycoveCity_EventScript_1E2EDE:: @ 81E2EDE - trainerbattle 3, TRAINER_MAY_12, 0, LilycoveCity_Text_1E3275 - goto LilycoveCity_EventScript_1E2F3E - end - -LilycoveCity_EventScript_1E2EEE:: @ 81E2EEE - trainerbattle 3, TRAINER_MAY_13, 0, LilycoveCity_Text_1E3275 - goto LilycoveCity_EventScript_1E2F3E - end - -LilycoveCity_EventScript_1E2EFE:: @ 81E2EFE - trainerbattle 3, TRAINER_MAY_11, 0, LilycoveCity_Text_1E3275 - goto LilycoveCity_EventScript_1E2F3E - end - -LilycoveCity_EventScript_1E2F0E:: @ 81E2F0E - trainerbattle 3, TRAINER_BRENDAN_14, 0, LilycoveCity_Text_1E3777 - goto LilycoveCity_EventScript_1E2FAA - end - -LilycoveCity_EventScript_1E2F1E:: @ 81E2F1E - trainerbattle 3, TRAINER_BRENDAN_15, 0, LilycoveCity_Text_1E3777 - goto LilycoveCity_EventScript_1E2FAA - end - -LilycoveCity_EventScript_1E2F2E:: @ 81E2F2E - trainerbattle 3, TRAINER_BRENDAN_13, 0, LilycoveCity_Text_1E3777 - goto LilycoveCity_EventScript_1E2FAA - end - -LilycoveCity_EventScript_1E2F3E:: @ 81E2F3E - msgbox LilycoveCity_Text_1E32FB, 4 - setvar VAR_RESULT, 0 - checkflag FLAG_BADGE06_GET - call_if 1, LilycoveCity_EventScript_1E2F76 - compare VAR_RESULT, 0 - call_if 1, LilycoveCity_EventScript_1E2F86 - compare VAR_RESULT, 1 - call_if 1, LilycoveCity_EventScript_1E2F8F - clearflag FLAG_0x2D2 - clearflag FLAG_0x351 - goto LilycoveCity_EventScript_1E3006 - end - -LilycoveCity_EventScript_1E2F76:: @ 81E2F76 - checkflag FLAG_BADGE08_GET - goto_eq LilycoveCity_EventScript_1E2F80 - return - -LilycoveCity_EventScript_1E2F80:: @ 81E2F80 - setvar VAR_RESULT, 1 - return - -LilycoveCity_EventScript_1E2F86:: @ 81E2F86 - msgbox LilycoveCity_Text_1E3398, 4 - return - -LilycoveCity_EventScript_1E2F8F:: @ 81E2F8F - checkflag FLAG_SYS_GAME_CLEAR - goto_eq LilycoveCity_EventScript_1E2FA1 - msgbox LilycoveCity_Text_1E346D, 4 - return - -LilycoveCity_EventScript_1E2FA1:: @ 81E2FA1 - msgbox LilycoveCity_Text_1E353A, 4 - return - -LilycoveCity_EventScript_1E2FAA:: @ 81E2FAA - msgbox LilycoveCity_Text_1E37D7, 4 - setvar VAR_RESULT, 0 - checkflag FLAG_BADGE06_GET - call_if 1, LilycoveCity_EventScript_1E2F76 - compare VAR_RESULT, 0 - call_if 1, LilycoveCity_EventScript_1E2FE2 - compare VAR_RESULT, 1 - call_if 1, LilycoveCity_EventScript_1E2FEB - clearflag FLAG_0x2F8 - clearflag FLAG_0x32F - goto LilycoveCity_EventScript_1E3006 - end - -LilycoveCity_EventScript_1E2FE2:: @ 81E2FE2 - msgbox LilycoveCity_Text_1E3876, 4 - return - -LilycoveCity_EventScript_1E2FEB:: @ 81E2FEB - checkflag FLAG_SYS_GAME_CLEAR - goto_eq LilycoveCity_EventScript_1E2FFD - msgbox LilycoveCity_Text_1E390C, 4 - return - -LilycoveCity_EventScript_1E2FFD:: @ 81E2FFD - msgbox LilycoveCity_Text_1E39E3, 4 - return - -LilycoveCity_EventScript_1E3006:: @ 81E3006 - closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_Movement_2725AA - waitmovement 0 - delay 50 - setfieldeffectargument 0, 1 - dofieldeffect 30 - delay 15 - removeobject VAR_LAST_TALKED - waitfieldeffect 30 - savebgm MUS_DUMMY - fadedefaultbgm - setflag FLAG_0x124 - release - end - -LilycoveCity_EventScript_1E302D:: @ 81E302D - lock - faceplayer - msgbox LilycoveCity_Text_1E4774, 5 - compare VAR_RESULT, 1 - call_if 1, LilycoveCity_EventScript_1E304F - compare VAR_RESULT, 0 - call_if 1, LilycoveCity_EventScript_1E3058 - release - end - -LilycoveCity_EventScript_1E304F:: @ 81E304F - msgbox LilycoveCity_Text_1E47A1, 4 - return - -LilycoveCity_EventScript_1E3058:: @ 81E3058 - msgbox LilycoveCity_Text_1E4824, 4 - return - -LilycoveCity_Text_1E3061: @ 81E3061 - .string "MAY: Oh, hey?\n" - .string "{PLAYER}{KUN}, are you shopping, too?\p" - .string "I bought a whole bunch of DOLLS and\n" - .string "POSTERS.\p" - .string "Of course, I’ve also caught a lot of\n" - .string "POKéMON, and I’m raising them\l" - .string "properly, too.\p" - .string "Actually, I’m more worried if you’re\n" - .string "raising POKéMON properly, {PLAYER}{KUN}.\p" - .string "I’ll battle with you, so you can show\n" - .string "me your POKéMON, {PLAYER}{KUN}.$" - -LilycoveCity_Text_1E318D: @ 81E318D - .string "MAY: Oh, why? {PLAYER}{KUN}, haven’t you\n" - .string "been raising your POKéMON?\p" - .string "That’s not a very good showing as a\n" - .string "TRAINER…$" - -LilycoveCity_Text_1E31F5: @ 81E31F5 - .string "MAY: Come on, battle with me, so I can\n" - .string "check out your POKéMON!$" - -LilycoveCity_Text_1E3234: @ 81E3234 - .string "MAY: The POKéMON I raised won’t be\n" - .string "beaten by your POKéMON, {PLAYER}{KUN}!$" - -LilycoveCity_Text_1E3275: @ 81E3275 - .string "… … … … … … … …\p" - .string "I remember the battle I had with you,\n" - .string "{PLAYER}{KUN}, on ROUTE 103.\p" - .string "That battle helped you become this\n" - .string "strong, {PLAYER}{KUN}, didn’t it?$" - -LilycoveCity_Text_1E32FB: @ 81E32FB - .string "MAY: I’m thinking of going back to\n" - .string "LITTLEROOT soon.\p" - .string "I’ve caught a decent group of POKéMON,\n" - .string "and my POKéDEX is coming along, so\l" - .string "I’m going home to show my dad.$" - -LilycoveCity_Text_1E3398: @ 81E3398 - .string "{PLAYER}{KUN}, what are you going to do?\p" - .string "Collect all the GYM BADGES and take\n" - .string "the POKéMON LEAGUE challenge?\p" - .string "Well, while you’re collecting BADGES,\n" - .string "{PLAYER}{KUN}, I’m going to work on my\l" - .string "POKéDEX. I’ll complete it before you!\p" - .string "See you!$" - -LilycoveCity_Text_1E346D: @ 81E346D - .string "{PLAYER}{KUN}, what are you going to do?\p" - .string "Are you taking the POKéMON LEAGUE\n" - .string "challenge?\p" - .string "Or, are you going to complete your\n" - .string "POKéDEX?\p" - .string "I might’ve lost to you in battling,\n" - .string "but I’ll finish my POKéDEX before you!\p" - .string "See you!$" - -LilycoveCity_Text_1E353A: @ 81E353A - .string "{PLAYER}{KUN}, what are you going to do?\p" - .string "Are you taking the BATTLE FRONTIER\n" - .string "challenge?\p" - .string "Or, are you going to complete your\n" - .string "POKéDEX?\p" - .string "I might’ve lost to you in battling,\n" - .string "but I’ll finish my POKéDEX before you!\p" - .string "See you!$" - -LilycoveCity_Text_1E3608: @ 81E3608 - .string "BRENDAN: Oh, hey, it’s {PLAYER}.\p" - .string "I’m running an errand for my dad.\n" - .string "No, I’m not buying any DOLLS.\p" - .string "Anyways, it’s been a while.\p" - .string "Want to have a battle to see who’s been\n" - .string "raising POKéMON better?$" - -LilycoveCity_Text_1E36BF: @ 81E36BF - .string "BRENDAN: Oh, what’s the matter?\n" - .string "Don’t have the confidence?$" - -LilycoveCity_Text_1E36FA: @ 81E36FA - .string "BRENDAN: Want to battle to see who’s\n" - .string "been raising POKéMON better?$" - -LilycoveCity_Text_1E373C: @ 81E373C - .string "BRENDAN: Aww, but you know I’m not\n" - .string "going to lose to no {PLAYER}.$" - -LilycoveCity_Text_1E3777: @ 81E3777 - .string "Humph…\n" - .string "You’ve done a lot of raising.\p" - .string "That stings a bit--I had a head start\n" - .string "on you as a TRAINER…$" - -LilycoveCity_Text_1E37D7: @ 81E37D7 - .string "BRENDAN: I…\n" - .string "I plan on going home to LITTLEROOT.\p" - .string "You know I’m helping out my dad on his\n" - .string "POKéDEX. It’s coming together pretty\l" - .string "decently, so I should go show him.$" - -LilycoveCity_Text_1E3876: @ 81E3876 - .string "{PLAYER}, what are you going to do?\p" - .string "Collect all the GYM BADGES and take\n" - .string "the POKéMON LEAGUE challenge?\p" - .string "Maybe I’ll do that, too…\p" - .string "Well, anyway, hang in there!$" - -LilycoveCity_Text_1E390C: @ 81E390C - .string "{PLAYER}, what are you going to do?\p" - .string "Since you’re that strong, are you\n" - .string "taking the POKéMON LEAGUE challenge?\p" - .string "Heh, even me--if I trained my POKéMON\n" - .string "a bit more, I should be stronger than\l" - .string "you, {PLAYER}.\p" - .string "Well, anyway, hang in there!$" - -LilycoveCity_Text_1E39E3: @ 81E39E3 - .string "{PLAYER}, what are you going to do?\p" - .string "Are you taking the BATTLE FRONTIER\n" - .string "challenge?\p" - .string "Or, are you going to complete your\n" - .string "POKéDEX?\p" - .string "Since you’re that strong, you should\n" - .string "consider the BATTLE FRONTIER.\p" - .string "Heh, if I train my POKéMON a bit more,\n" - .string "I’ll get stronger than you, {PLAYER}.\p" - .string "Maybe I should go to the BATTLE\n" - .string "FRONTIER.\p" - .string "Well, anyway, hang in there!$" - -LilycoveCity_Text_1E3B2C: @ 81E3B2C - .string "Fufufu…\p" - .string "We moved more loot into our secret\n" - .string "HIDEOUT today…\p" - .string "Wh-who are you?!\n" - .string "I was just talking to myself!$" - -LilycoveCity_Text_1E3B95: @ 81E3B95 - .string "I’m just a GRUNT, so I don’t know what\n" - .string "the BOSS is thinking…\p" - .string "But being on TEAM AQUA, I know I’ll get\n" - .string "the chance to do big things!\p" - .string "Wh-who are you?!\n" - .string "I was just talking to myself!$" - -LilycoveCity_Text_1E3C46: @ 81E3C46 - .string "Hey, you!\p" - .string "Don’t go near the cave in the cove!\p" - .string "Why? You don’t need a reason why!\n" - .string "I’m an adult, so you just listen to me!$" - -LilycoveCity_Text_1E3CBE: @ 81E3CBE - .string "If this whole wide world becomes ours,\n" - .string "TEAM AQUA’s, it will be a happier\l" - .string "place for POKéMON, too.$" - -LilycoveCity_Text_1E3D1F: @ 81E3D1F - .string "There! WAILMER!\n" - .string "Leap out of the water now!$" - -LilycoveCity_Text_1E3D4A: @ 81E3D4A - .string "Hunh? What do you want?\p" - .string "You’re messing up our training,\n" - .string "so can you, like, get lost?$" - -LilycoveCity_Text_1E3D9E: @ 81E3D9E - .string "There’s a POKéMON CONTEST HALL\n" - .string "right in this here town. \p" - .string "That means well-raised POKéMON will\n" - .string "come from all over the country.\p" - .string "My heart swells with excitement!$" - -LilycoveCity_Text_1E3E3C: @ 81E3E3C - .string "Have you seen that strange cave in\n" - .string "the cove at the edge of town?$" - -LilycoveCity_Text_1E3E7D: @ 81E3E7D - .string "I’m going to teach my POKéMON some new\n" - .string "moves for entering a CONTEST.\p" - .string "So, I’m going to see the MOVE DELETER\n" - .string "and make it forget HM moves.$" - -LilycoveCity_Text_1E3F05: @ 81E3F05 - .string "I came from KANTO.\p" - .string "The HOENN region is beautiful with\n" - .string "all its water and verdant nature.\p" - .string "Hunh? Wait a second…\p" - .string "Could there be rare POKéMON that live\n" - .string "only in this area?$" - -LilycoveCity_Text_1E3FAB: @ 81E3FAB - .string "TEAM AQUA’s been training their\n" - .string "WAILMER in the cove.\p" - .string "We SAILORS can’t get our boats out\n" - .string "to sea with them in the way!$" - -LilycoveCity_Text_1E4020: @ 81E4020 - .string "Ahoy, did you know?\p" - .string "Someone punted TEAM AQUA out of\n" - .string "the way for us!\p" - .string "That got the WAILMER out of the cove,\n" - .string "so we can get our boats out again.$" - -LilycoveCity_Text_1E40AD: @ 81E40AD - .string "I was taking a relaxing snooze at the\n" - .string "seaside inn to the sound of waves…\p" - .string "When someone stole my POKéMON!\p" - .string "Who’s the abductor?\n" - .string "TEAM AQUA? Is it TEAM AQUA?$" - -LilycoveCity_Text_1E4145: @ 81E4145 - .string "My missing POKéMON…\n" - .string "It came back without me noticing!$" - -LilycoveCity_Text_1E417B: @ 81E417B - .string "I’m an ART DEALER.\p" - .string "I am a buyer and seller of fine art,\n" - .string "especially paintings.\p" - .string "I’ve heard that the MUSEUM here has\n" - .string "magnificent works on exhibit…$" - -LilycoveCity_Text_1E420B: @ 81E420B - .string "Even as we grow old and wrinkled,\n" - .string "the sea remains forever young with\l" - .string "the vivid brilliance of life…\p" - .string "Fwohoho fwohohohoho…$" - -LilycoveCity_Text_1E4283: @ 81E4283 - .string "It was sixty years ago that my husband\n" - .string "proposed to me here.\l" - .string "The sea remains as beautiful as ever.\p" - .string "Mufufufu mufufufufufu…$" - -LilycoveCity_Text_1E42FC: @ 81E42FC - .string "Hm, you know of the peculiar cavern\n" - .string "in this cove?\p" - .string "That had been a natural formation,\n" - .string "but then that TEAM AQUA lot came\l" - .string "along and made their renovations.\p" - .string "They call themselves\n" - .string "the “nature-loving TEAM AQUAâ€!\p" - .string "But what they do and what they say\n" - .string "don’t match at all!$" - -LilycoveCity_Text_1E43FF: @ 81E43FF - .string "That cave in the cove…\p" - .string "I didn’t notice it right away,\n" - .string "but it’s completely empty now.\p" - .string "That TEAM AQUA lot, they must\n" - .string "have gone away for good.$" - -LilycoveCity_Text_1E448B: @ 81E448B - .string "LILYCOVE CITY\p" - .string "“Where the land ends and the\n" - .string "sea begins.â€$" - -LilycoveCity_Text_1E44C3: @ 81E44C3 - .string "POKéMON CONTEST HALL\n" - .string "“The gathering place for TRAINERS!â€$" - -LilycoveCity_Text_1E44FC: @ 81E44FC - .string "COVE LILY MOTEL\p" - .string "“Remember us as COVE LILY of\n" - .string "LILYCOVE.â€$" - -LilycoveCity_Text_1E4534: @ 81E4534 - .string "LILYCOVE MUSEUM\p" - .string "“POKéMON Masterpiece Collection\n" - .string "on exhibit!â€$" - -LilycoveCity_Text_1E4571: @ 81E4571 - .string "LILYCOVE MUSEUM\p" - .string "“{PLAYER}’s POKéMON Collection\n" - .string "on exhibit!â€$" - -LilycoveCity_Text_1E45A7: @ 81E45A7 - .string "LILYCOVE CITY HARBOR\p" - .string "“The ferry S.S. TIDAL is under\n" - .string "construction in SLATEPORT CITY.\p" - .string "“Service is scheduled to begin\n" - .string "shortly.â€$" - -LilycoveCity_Text_1E4624: @ 81E4624 - .string "LILYCOVE CITY HARBOR\p" - .string "“Enjoy a delightful cruise on\n" - .string "the ferry S.S. TIDAL.â€$" - -LilycoveCity_Text_1E466E: @ 81E466E - .string "POKéMON TRAINER FAN CLUB\p" - .string "The names of TRAINERS are scribbled\n" - .string "all over the sign…$" - -LilycoveCity_Text_1E46BE: @ 81E46BE - .string "LILYCOVE DEPARTMENT STORE\p" - .string "“Overflowing with great merchandise\n" - .string "and excitement!\p" - .string "“A great place to find that something\n" - .string "you need!â€$" - -LilycoveCity_Text_1E473D: @ 81E473D - .string "MOVE DELETER’S HOUSE\p" - .string "“Unwanted POKéMON moves deleted.â€$" - -LilycoveCity_Text_1E4774: @ 81E4774 - .string "Do you know about the machine\n" - .string "BERRY BLENDER?$" - -LilycoveCity_Text_1E47A1: @ 81E47A1 - .string "People have to work together to get it\n" - .string "to spin faster.\p" - .string "The faster you can make it spin, the\n" - .string "better {POKEBLOCK}S you can get, I’ve heard.$" - -LilycoveCity_Text_1E4824: @ 81E4824 - .string "It’s used for making a kind of candy\n" - .string "called a {POKEBLOCK}.\p" - .string "If you give a good {POKEBLOCK} to a POKéMON,\n" - .string "its condition will improve by a lot.$" - -LilycoveCity_Text_1E48A5: @ 81E48A5 - .string "I heard there’s a tower somewhere out\n" - .string "on the sea routes.\p" - .string "It’s called the SKY PILLAR, I hear.$" - -LilycoveCity_Text_1E4902: @ 81E4902 - .string "I saw this tall tower somewhere\n" - .string "around ROUTE 131.\p" - .string "Could that possibly be…?$" - -LilycoveCity_Text_1E494D: @ 81E494D - .string "We just arrived here on our\n" - .string "honeymoon vacation.\p" - .string "We happened to see a DRAGON-type\n" - .string "POKéMON flying way up in the sky.\p" - .string "Do cool POKéMON like that live in\n" - .string "the HOENN region?$" - -LilycoveCity_Text_1E49F4: @ 81E49F4 - .string "On our honeymoon, we vowed to see as\n" - .string "many rare POKéMON as we can.\p" - .string "So we were delighted to see a rare\n" - .string "POKéMON as soon as we arrived.\p" - .string "I mean, we are totally happy!$" - diff --git a/data/scripts/maps/LilycoveCity_ContestHall.inc b/data/scripts/maps/LilycoveCity_ContestHall.inc deleted file mode 100644 index 3f02a404c..000000000 --- a/data/scripts/maps/LilycoveCity_ContestHall.inc +++ /dev/null @@ -1,509 +0,0 @@ -LilycoveCity_ContestHall_MapScripts:: @ 821B484 - .byte 0 - -LilycoveCity_ContestHall_EventScript_21B485:: @ 821B485 - msgbox LilycoveCity_ContestHall_Text_21B74E, 2 - end - -LilycoveCity_ContestHall_EventScript_21B48E:: @ 821B48E - msgbox LilycoveCity_ContestHall_Text_21B7D7, 2 - end - -LilycoveCity_ContestHall_EventScript_21B497:: @ 821B497 - msgbox LilycoveCity_ContestHall_Text_21B899, 2 - end - -LilycoveCity_ContestHall_EventScript_21B4A0:: @ 821B4A0 - msgbox LilycoveCity_ContestHall_Text_21B911, 2 - end - -LilycoveCity_ContestHall_EventScript_21B4A9:: @ 821B4A9 - lock - faceplayer - msgbox LilycoveCity_ContestHall_Text_21B977, 4 - closemessage - applymovement 4, LilycoveCity_ContestHall_Movement_2725A2 - waitmovement 0 - release - end - -LilycoveCity_ContestHall_EventScript_21B4C0:: @ 821B4C0 - lock - faceplayer - msgbox LilycoveCity_ContestHall_Text_21B9DC, 4 - closemessage - applymovement 5, LilycoveCity_ContestHall_Movement_2725A2 - waitmovement 0 - release - end - -LilycoveCity_ContestHall_EventScript_21B4D7:: @ 821B4D7 - lock - faceplayer - msgbox LilycoveCity_ContestHall_Text_21BA44, 4 - closemessage - applymovement 6, LilycoveCity_ContestHall_Movement_2725A2 - waitmovement 0 - release - end - -LilycoveCity_ContestHall_EventScript_21B4EE:: @ 821B4EE - lock - faceplayer - msgbox LilycoveCity_ContestHall_Text_21BAD5, 4 - closemessage - applymovement 7, LilycoveCity_ContestHall_Movement_2725A2 - waitmovement 0 - release - end - -LilycoveCity_ContestHall_EventScript_21B505:: @ 821B505 - lock - faceplayer - msgbox LilycoveCity_ContestHall_Text_21BB84, 4 - closemessage - applymovement 8, LilycoveCity_ContestHall_Movement_2725A2 - waitmovement 0 - release - end - -LilycoveCity_ContestHall_EventScript_21B51C:: @ 821B51C - lock - faceplayer - msgbox LilycoveCity_ContestHall_Text_21BBDD, 4 - closemessage - applymovement 9, LilycoveCity_ContestHall_Movement_2725A2 - waitmovement 0 - release - end - -LilycoveCity_ContestHall_EventScript_21B533:: @ 821B533 - msgbox LilycoveCity_ContestHall_Text_21BC65, 3 - end - -LilycoveCity_ContestHall_EventScript_21B53C:: @ 821B53C - lock - faceplayer - msgbox LilycoveCity_ContestHall_Text_21BC89, 4 - closemessage - applymovement 12, LilycoveCity_ContestHall_Movement_2725A2 - waitmovement 0 - release - end - -LilycoveCity_ContestHall_EventScript_21B553:: @ 821B553 - lock - faceplayer - msgbox LilycoveCity_ContestHall_Text_21BD30, 4 - closemessage - applymovement 22, LilycoveCity_ContestHall_Movement_2725A2 - waitmovement 0 - release - end - -LilycoveCity_ContestHall_EventScript_21B56A:: @ 821B56A - lock - faceplayer - msgbox LilycoveCity_ContestHall_Text_21BD70, 4 - closemessage - applymovement 11, LilycoveCity_ContestHall_Movement_2725A2 - waitmovement 0 - release - end - -LilycoveCity_ContestHall_EventScript_21B581:: @ 821B581 - lock - faceplayer - msgbox LilycoveCity_ContestHall_Text_21BDDD, 4 - closemessage - applymovement 13, LilycoveCity_ContestHall_Movement_2725A2 - waitmovement 0 - release - end - -LilycoveCity_ContestHall_EventScript_21B598:: @ 821B598 - lock - faceplayer - msgbox LilycoveCity_ContestHall_Text_21BE16, 4 - closemessage - applymovement 14, LilycoveCity_ContestHall_Movement_2725A2 - waitmovement 0 - release - end - -LilycoveCity_ContestHall_EventScript_21B5AF:: @ 821B5AF - lock - faceplayer - msgbox LilycoveCity_ContestHall_Text_21BE77, 4 - closemessage - applymovement 15, LilycoveCity_ContestHall_Movement_2725A2 - waitmovement 0 - release - end - -LilycoveCity_ContestHall_EventScript_21B5C6:: @ 821B5C6 - lock - faceplayer - msgbox LilycoveCity_ContestHall_Text_21BEDE, 4 - closemessage - applymovement 16, LilycoveCity_ContestHall_Movement_2725A2 - waitmovement 0 - release - end - -LilycoveCity_ContestHall_EventScript_21B5DD:: @ 821B5DD - lock - faceplayer - msgbox LilycoveCity_ContestHall_Text_21BF6E, 4 - closemessage - applymovement 17, LilycoveCity_ContestHall_Movement_2725A2 - waitmovement 0 - release - end - -LilycoveCity_ContestHall_EventScript_21B5F4:: @ 821B5F4 - lock - faceplayer - msgbox LilycoveCity_ContestHall_Text_21BFE3, 4 - closemessage - applymovement 18, LilycoveCity_ContestHall_Movement_2725A2 - waitmovement 0 - release - end - -LilycoveCity_ContestHall_EventScript_21B60B:: @ 821B60B - lock - faceplayer - msgbox LilycoveCity_ContestHall_Text_21C07F, 4 - closemessage - applymovement 19, LilycoveCity_ContestHall_Movement_2725A2 - waitmovement 0 - release - end - -LilycoveCity_ContestHall_EventScript_21B622:: @ 821B622 - lock - faceplayer - msgbox LilycoveCity_ContestHall_Text_21C0D8, 4 - closemessage - applymovement 21, LilycoveCity_ContestHall_Movement_2725A2 - waitmovement 0 - release - end - -LilycoveCity_ContestHall_EventScript_21B639:: @ 821B639 - lock - faceplayer - msgbox LilycoveCity_ContestHall_Text_21C137, 4 - closemessage - applymovement 20, LilycoveCity_ContestHall_Movement_2725A2 - waitmovement 0 - release - end - -LilycoveCity_ContestHall_EventScript_21B650:: @ 821B650 - lock - faceplayer - msgbox LilycoveCity_ContestHall_Text_21C1A4, 4 - closemessage - applymovement 23, LilycoveCity_ContestHall_Movement_2725A2 - waitmovement 0 - release - end - -LilycoveCity_ContestHall_EventScript_21B667:: @ 821B667 - lock - faceplayer - msgbox LilycoveCity_ContestHall_Text_21C215, 4 - closemessage - applymovement 24, LilycoveCity_ContestHall_Movement_2725A2 - waitmovement 0 - release - end - -LilycoveCity_ContestHall_EventScript_21B67E:: @ 821B67E - lock - faceplayer - msgbox LilycoveCity_ContestHall_Text_21C27F, 4 - closemessage - applymovement 25, LilycoveCity_ContestHall_Movement_2725A2 - waitmovement 0 - release - end - -LilycoveCity_ContestHall_EventScript_21B695:: @ 821B695 - lock - faceplayer - msgbox LilycoveCity_ContestHall_Text_21C2BB, 4 - closemessage - applymovement 26, LilycoveCity_ContestHall_Movement_2725A2 - waitmovement 0 - release - end - -LilycoveCity_ContestHall_EventScript_21B6AC:: @ 821B6AC - lock - faceplayer - msgbox LilycoveCity_ContestHall_Text_21C307, 4 - closemessage - applymovement 27, LilycoveCity_ContestHall_Movement_2725A2 - waitmovement 0 - release - end - -LilycoveCity_ContestHall_EventScript_21B6C3:: @ 821B6C3 - lock - faceplayer - msgbox LilycoveCity_ContestHall_Text_21C365, 4 - closemessage - applymovement 28, LilycoveCity_ContestHall_Movement_2725A2 - waitmovement 0 - release - end - -LilycoveCity_ContestHall_EventScript_21B6DA:: @ 821B6DA - lockall - applymovement 29, LilycoveCity_ContestHall_Movement_27259E - waitmovement 0 - msgbox LilycoveCity_ContestHall_Text_21C3F4, 4 - closemessage - applymovement 29, LilycoveCity_ContestHall_Movement_2725A2 - waitmovement 0 - delay 25 - msgbox LilycoveCity_ContestHall_Text_21C411, 4 - releaseall - end - -LilycoveCity_ContestHall_EventScript_21B705:: @ 821B705 - lock - faceplayer - msgbox LilycoveCity_ContestHall_Text_21C4B1, 4 - closemessage - applymovement 31, LilycoveCity_ContestHall_Movement_2725A2 - waitmovement 0 - release - end - -LilycoveCity_ContestHall_EventScript_21B71C:: @ 821B71C - lock - faceplayer - msgbox LilycoveCity_ContestHall_Text_21C445, 4 - closemessage - applymovement 30, LilycoveCity_ContestHall_Movement_2725A2 - waitmovement 0 - release - end - -LilycoveCity_ContestHall_EventScript_21B733:: @ 821B733 - msgbox LilycoveCity_ContestHall_Text_21C512, 3 - end - -LilycoveCity_ContestHall_EventScript_21B73C:: @ 821B73C - msgbox LilycoveCity_ContestHall_Text_21C548, 3 - end - -LilycoveCity_ContestHall_EventScript_21B745:: @ 821B745 - msgbox LilycoveCity_ContestHall_Text_21C57B, 3 - end - -LilycoveCity_ContestHall_Text_21B74E: @ 821B74E - .string "This POKéMON won the BEAUTY CONTEST\n" - .string "here before.\p" - .string "Well, guess what? Today, I made it\n" - .string "win a SMARTNESS CONTEST!\p" - .string "My abilities scare even me…$" - -LilycoveCity_ContestHall_Text_21B7D7: @ 821B7D7 - .string "I’ve entered a bunch of CONTESTS,\n" - .string "so I’m seeing how things work.\p" - .string "If you’re in a COOLNESS CONTEST,\n" - .string "cool moves go over as appeals.\p" - .string "But smart moves and cute moves\n" - .string "don’t go over well, for instance.$" - -LilycoveCity_ContestHall_Text_21B899: @ 821B899 - .string "That young man who won earlier had\n" - .string "a whole bunch of different {POKEBLOCK}S.\p" - .string "Can you win if you had that many\n" - .string "of those things?$" - -LilycoveCity_ContestHall_Text_21B911: @ 821B911 - .string "Whoa, isn’t this place humongous!\p" - .string "The tension in the air… It’s not\n" - .string "like a CONTEST hall in the sticks.$" - -LilycoveCity_ContestHall_Text_21B977: @ 821B977 - .string "MC: Okay, SMART POKéMON and their\n" - .string "TRAINERS, are you ready?!\p" - .string "Give it your best showing!\n" - .string "Let’s appeal!$" - -LilycoveCity_ContestHall_Text_21B9DC: @ 821B9DC - .string "JUDGE: Are you enjoying this CONTEST?\p" - .string "Come back with three friends, and\n" - .string "all of you may enter a CONTEST!$" - -LilycoveCity_ContestHall_Text_21BA44: @ 821BA44 - .string "Ayayayay…\n" - .string "I entered the wrong CONTEST.\p" - .string "I entered this tough POKéMON in\n" - .string "the SMARTNESS CONTEST…\p" - .string "Come on, wow them with a smart-looking\n" - .string "ROCK SMASH.$" - -LilycoveCity_ContestHall_Text_21BAD5: @ 821BAD5 - .string "I’ve spent many a year, and all my\n" - .string "wisdom besides, raising this POKéMON\l" - .string "to be smart.\p" - .string "It won’t be easily bested by some\n" - .string "young pup’s POKéMON.\p" - .string "My dear wife, are you seeing this?$" - -LilycoveCity_ContestHall_Text_21BB84: @ 821BB84 - .string "There it is!\p" - .string "If my POKéMON pulls a smart move next,\n" - .string "the audience’s excitement will peak!$" - -LilycoveCity_ContestHall_Text_21BBDD: @ 821BBDD - .string "Oh, dear, no!\p" - .string "My darling ZUBAT’s LEECH LIFE is so\n" - .string "cute I kept using it over and over!\p" - .string "But these mean people don’t appreciate\n" - .string "it at all!$" - -LilycoveCity_ContestHall_Text_21BC65: @ 821BC65 - .string "Kiyaaah! You’re beautiful, Grandpa!$" - -LilycoveCity_ContestHall_Text_21BC89: @ 821BC89 - .string "Even when TRAINERS enter the same\n" - .string "kind of POKéMON, they all seem to use\l" - .string "different moves for appeals.\p" - .string "It’s just like the way people have\n" - .string "different styles for battling.$" - -LilycoveCity_ContestHall_Text_21BD30: @ 821BD30 - .string "I think the POKéMON look smarter\n" - .string "than their TRAINERS. By a lot.$" - -LilycoveCity_ContestHall_Text_21BD70: @ 821BD70 - .string "When all’s said and done, I still love\n" - .string "SMARTNESS CONTESTS.\p" - .string "That intellectual green color…\n" - .string "It’s so… So… Cool.$" - -LilycoveCity_ContestHall_Text_21BDDD: @ 821BDDD - .string "MC: Are you entering the BEAUTY\n" - .string "CONTEST, too? Good luck!$" - -LilycoveCity_ContestHall_Text_21BE16: @ 821BE16 - .string "JUDGE: Ah, every POKéMON here is\n" - .string "a model of pristine beauty!\p" - .string "Why, I almost forgot to score them!$" - -LilycoveCity_ContestHall_Text_21BE77: @ 821BE77 - .string "A POKéMON this beautiful…\n" - .string "There isn’t another one like it.\p" - .string "Everyone’s eyes will be glued to\n" - .string "my beauty.$" - -LilycoveCity_ContestHall_Text_21BEDE: @ 821BEDE - .string "Waaaah!\p" - .string "I brushed and groomed my POKéMON\n" - .string "carefully for this CONTEST…\p" - .string "But I overdid it…\n" - .string "My POKéMON’s coat turned all scraggly…\p" - .string "What should I do?$" - -LilycoveCity_ContestHall_Text_21BF6E: @ 821BF6E - .string "This AURORA BEAM is so dazzling,\n" - .string "the JUDGE won’t be able to see it.\p" - .string "Uh, wait a second…\n" - .string "That’ll be meaningless, then!$" - -LilycoveCity_ContestHall_Text_21BFE3: @ 821BFE3 - .string "This pretty POKéMON looks just like\n" - .string "me when I was younger.\p" - .string "Right when I said that, my husband\n" - .string "spewed the coffee he was drinking.\p" - .string "Did I say something funny?$" - -LilycoveCity_ContestHall_Text_21C07F: @ 821C07F - .string "You know, if I win at a BEAUTY\n" - .string "CONTEST, sure it makes me\l" - .string "happy. More than usual, anyway.$" - -LilycoveCity_ContestHall_Text_21C0D8: @ 821C0D8 - .string "Wahahahah!\p" - .string "Will you take a gander at all those\n" - .string "pretty POKéMON!\l" - .string "I just love this sort of glitz!$" - -LilycoveCity_ContestHall_Text_21C137: @ 821C137 - .string "You can’t always win on just beauty\n" - .string "alone.\p" - .string "You have to groom your POKéMON so\n" - .string "it’s nice and glossy like mine.$" - -LilycoveCity_ContestHall_Text_21C1A4: @ 821C1A4 - .string "MC: Uh-oh! Hello!\n" - .string "We’re in the middle of a CONTEST!\p" - .string "Please enter at our registration\n" - .string "counter and come out, okay?$" - -LilycoveCity_ContestHall_Text_21C215: @ 821C215 - .string "JUDGE: Oh, such charming and cute\n" - .string "appeals!\p" - .string "Oh, my goodness! What a perfectly\n" - .string "adorable WATER SPORT appeal!$" - -LilycoveCity_ContestHall_Text_21C27F: @ 821C27F - .string "Oh, no… My sweet AZURILL was\n" - .string "distracted by another POKéMON.$" - -LilycoveCity_ContestHall_Text_21C2BB: @ 821C2BB - .string "My POKéMON has never won in a battle,\n" - .string "but put it in a CONTEST and look out!$" - -LilycoveCity_ContestHall_Text_21C307: @ 821C307 - .string "My POKéMON’s PETAL DANCE is a marvel\n" - .string "of elegance.\p" - .string "I won’t let anyone disturb its\n" - .string "performance.$" - -LilycoveCity_ContestHall_Text_21C365: @ 821C365 - .string "Everyone’s POKéMON are very cute.\p" - .string "However, if my POKéMON were to make\n" - .string "a cute appeal…\p" - .string "I’m sure that it would be so much \n" - .string "cuter than the others.$" - -LilycoveCity_ContestHall_Text_21C3F4: @ 821C3F4 - .string "My child is in this CONTEST.$" - -LilycoveCity_ContestHall_Text_21C411: @ 821C411 - .string "Come on, dear. Go for it!\n" - .string "Your POKéMON is the best!$" - -LilycoveCity_ContestHall_Text_21C445: @ 821C445 - .string "I think that girl over there is\n" - .string "the cutest of the lot.\p" - .string "What’s that? They’re judging\n" - .string "POKéMON by their looks?$" - -LilycoveCity_ContestHall_Text_21C4B1: @ 821C4B1 - .string "Ohh, seeing all these cute POKéMON,\n" - .string "they make we want to get my own!\p" - .string "I’m going to go catch some!$" - -LilycoveCity_ContestHall_Text_21C512: @ 821C512 - .string "BEAUTY CONTEST STAGE\n" - .string "BE ALLURED BY BEAUTIFUL POKéMON!$" - -LilycoveCity_ContestHall_Text_21C548: @ 821C548 - .string "CUTENESS CONTEST STAGE\n" - .string "BE CHARMED BY CUTE POKéMON!$" - -LilycoveCity_ContestHall_Text_21C57B: @ 821C57B - .string "SMARTNESS CONTEST STAGE\n" - .string "BE IMPRESSED BY SMART POKéMON!$" - diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc deleted file mode 100644 index a4609ab54..000000000 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ /dev/null @@ -1,1121 +0,0 @@ -LilycoveCity_ContestLobby_MapScripts:: @ 821A211 - map_script 3, LilycoveCity_ContestLobby_MapScript1_21A21C - map_script 2, LilycoveCity_ContestLobby_MapScript2_21A243 - .byte 0 - -LilycoveCity_ContestLobby_MapScript1_21A21C: @ 821A21C - call LilycoveCity_ContestLobby_EventScript_28CB2B - call LilycoveCity_ContestLobby_EventScript_21A227 - end - -LilycoveCity_ContestLobby_EventScript_21A227:: @ 821A227 - getpricereduction 4 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21A23C - clearflag FLAG_0x369 - setflag FLAG_0x340 - return - -LilycoveCity_ContestLobby_EventScript_21A23C:: @ 821A23C - setflag FLAG_0x369 - clearflag FLAG_0x340 - return - -LilycoveCity_ContestLobby_MapScript2_21A243: @ 821A243 - map_script_2 VAR_0x4099, 1, LilycoveCity_ContestLobby_EventScript_21A255 - map_script_2 VAR_0x4099, 2, LilycoveCity_ContestLobby_EventScript_21A427 - .2byte 0 - -LilycoveCity_ContestLobby_EventScript_21A255:: @ 821A255 - checkflag FLAG_0x307 - goto_eq LilycoveCity_ContestLobby_EventScript_21A264 - setvar VAR_0x4099, 0 - end - -LilycoveCity_ContestLobby_EventScript_21A264:: @ 821A264 - lockall - addobject 4 - applymovement 4, LilycoveCity_ContestLobby_Movement_21A407 - waitmovement 4 - applymovement 255, LilycoveCity_ContestLobby_Movement_21A418 - waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_21ADB9, 4 - lockall - fadescreen 1 - drawcontestwinner 0 - lockall - msgbox LilycoveCity_ContestLobby_Text_21AE78, 5 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21A2AA - compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_21A2E4 - releaseall - end - -LilycoveCity_ContestLobby_EventScript_21A2AA:: @ 821A2AA - msgbox LilycoveCity_ContestLobby_Text_21AF63, 4 - closemessage - special sub_80F88DC - setvar VAR_0x4099, 0 - specialvar VAR_RESULT, sub_80F8C7C - compare VAR_RESULT, 1 - call_if 1, LilycoveCity_ContestLobby_EventScript_21A314 - applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F - waitmovement 0 - removeobject 4 - call LilycoveCity_ContestLobby_EventScript_21A360 - call LilycoveCity_ContestLobby_EventScript_21A3B6 - releaseall - end - -LilycoveCity_ContestLobby_EventScript_21A2E4:: @ 821A2E4 - msgbox LilycoveCity_ContestLobby_Text_21B0BC, 5 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21A2AA - msgbox LilycoveCity_ContestLobby_Text_21B132, 4 - closemessage - applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F - waitmovement 0 - setvar VAR_0x4099, 0 - removeobject 4 - releaseall - end - -LilycoveCity_ContestLobby_EventScript_21A314:: @ 821A314 - incrementgamestat 42 - special sub_80F8390 - applymovement 4, LilycoveCity_ContestLobby_Movement_21A41A - waitmovement 0 - playse SE_PIN - applymovement 4, LilycoveCity_ContestLobby_Movement_272598 - waitmovement 0 - applymovement 4, LilycoveCity_ContestLobby_Movement_21A41E - waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_21B030, 4 - playfanfare MUS_FANFA4 - msgbox LilycoveCity_ContestLobby_Text_21B07E, 4 - waitfanfare - msgbox LilycoveCity_ContestLobby_Text_21B094, 4 - msgbox LilycoveCity_ContestLobby_Text_21B0AD, 4 - closemessage - return - -LilycoveCity_ContestLobby_EventScript_21A360:: @ 821A360 - specialvar VAR_0x8004, sub_80F8940 - switch VAR_0x8004 - case 1, LilycoveCity_ContestLobby_EventScript_21A3A2 - case 2, LilycoveCity_ContestLobby_EventScript_21A3A6 - case 3, LilycoveCity_ContestLobby_EventScript_21A3AA - case 4, LilycoveCity_ContestLobby_EventScript_21A3AE - case 5, LilycoveCity_ContestLobby_EventScript_21A3B2 - return - -LilycoveCity_ContestLobby_EventScript_21A3A2:: @ 821A3A2 - clearflag FLAG_0x308 - return - -LilycoveCity_ContestLobby_EventScript_21A3A6:: @ 821A3A6 - clearflag FLAG_0x309 - return - -LilycoveCity_ContestLobby_EventScript_21A3AA:: @ 821A3AA - clearflag FLAG_0x30A - return - -LilycoveCity_ContestLobby_EventScript_21A3AE:: @ 821A3AE - clearflag FLAG_0x30B - return - -LilycoveCity_ContestLobby_EventScript_21A3B2:: @ 821A3B2 - clearflag FLAG_0x30C - return - -LilycoveCity_ContestLobby_EventScript_21A3B6:: @ 821A3B6 - switch VAR_CONTEST_CATEGORY - case 0, LilycoveCity_ContestLobby_EventScript_21A3F3 - case 1, LilycoveCity_ContestLobby_EventScript_21A3F7 - case 2, LilycoveCity_ContestLobby_EventScript_21A3FB - case 3, LilycoveCity_ContestLobby_EventScript_21A3FF - case 4, LilycoveCity_ContestLobby_EventScript_21A403 - return - -LilycoveCity_ContestLobby_EventScript_21A3F3:: @ 821A3F3 - setflag FLAG_0x0A0 - return - -LilycoveCity_ContestLobby_EventScript_21A3F7:: @ 821A3F7 - setflag FLAG_0x0A1 - return - -LilycoveCity_ContestLobby_EventScript_21A3FB:: @ 821A3FB - setflag FLAG_0x0A2 - return - -LilycoveCity_ContestLobby_EventScript_21A3FF:: @ 821A3FF - setflag FLAG_0x0A3 - return - -LilycoveCity_ContestLobby_EventScript_21A403:: @ 821A403 - setflag FLAG_0x0A4 - return - -LilycoveCity_ContestLobby_Movement_21A407: @ 821A407 - walk_down - walk_down - walk_down - walk_right - walk_right - walk_right - walk_right - step_end - -LilycoveCity_ContestLobby_Movement_21A40F: @ 821A40F - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - step_end - -LilycoveCity_ContestLobby_Movement_21A418: @ 821A418 - walk_in_place_fastest_left - step_end - -LilycoveCity_ContestLobby_Movement_21A41A: @ 821A41A - walk_down - walk_down - walk_down - step_end - -LilycoveCity_ContestLobby_Movement_21A41E: @ 821A41E - 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 - checkflag FLAG_0x307 - goto_eq LilycoveCity_ContestLobby_EventScript_21A436 - setvar VAR_0x4099, 0 - end - -LilycoveCity_ContestLobby_EventScript_21A436:: @ 821A436 - lockall - addobject 11 - applymovement 11, LilycoveCity_ContestLobby_Movement_21A533 - waitmovement 11 - applymovement 255, LilycoveCity_ContestLobby_Movement_21A545 - waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_21ADB9, 4 - lockall - fadescreen 1 - drawcontestwinner 0 - msgbox LilycoveCity_ContestLobby_Text_21AE78, 5 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21A47A - compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_21A4B4 - end - -LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A - msgbox LilycoveCity_ContestLobby_Text_21AF63, 4 - closemessage - special sub_80F88DC - setvar VAR_0x4099, 0 - specialvar VAR_RESULT, sub_80F8C7C - compare VAR_RESULT, 1 - call_if 1, LilycoveCity_ContestLobby_EventScript_21A4E4 - applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C - waitmovement 0 - removeobject 11 - call LilycoveCity_ContestLobby_EventScript_21A360 - call LilycoveCity_ContestLobby_EventScript_21A3B6 - releaseall - end - -LilycoveCity_ContestLobby_EventScript_21A4B4:: @ 821A4B4 - msgbox LilycoveCity_ContestLobby_Text_21B0BC, 5 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21A47A - msgbox LilycoveCity_ContestLobby_Text_21B132, 4 - closemessage - applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C - waitmovement 0 - setvar VAR_0x4099, 0 - removeobject 11 - releaseall - end - -LilycoveCity_ContestLobby_EventScript_21A4E4:: @ 821A4E4 - incrementgamestat 42 - setflag FLAG_SYS_RIBBON_GET - special sub_80F8390 - applymovement 11, LilycoveCity_ContestLobby_Movement_21A547 - waitmovement 0 - playse SE_PIN - applymovement 11, LilycoveCity_ContestLobby_Movement_272598 - waitmovement 0 - applymovement 11, LilycoveCity_ContestLobby_Movement_21A54B - waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_21B030, 4 - playfanfare MUS_FANFA4 - msgbox LilycoveCity_ContestLobby_Text_21B07E, 4 - waitfanfare - msgbox LilycoveCity_ContestLobby_Text_21B094, 4 - msgbox LilycoveCity_ContestLobby_Text_21B0AD, 4 - closemessage - return - -LilycoveCity_ContestLobby_Movement_21A533: @ 821A533 - walk_down - walk_down - walk_down - walk_left - walk_left - walk_left - walk_left - walk_left - step_end - -LilycoveCity_ContestLobby_Movement_21A53C: @ 821A53C - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - step_end - -LilycoveCity_ContestLobby_Movement_21A545: @ 821A545 - walk_in_place_fastest_right - step_end - -LilycoveCity_ContestLobby_Movement_21A547: @ 821A547 - walk_down - walk_down - walk_down - step_end - -LilycoveCity_ContestLobby_Movement_21A54B: @ 821A54B - 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 - special sub_80F9154 - specialvar VAR_RESULT, sub_80F8D24 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21A5CF - call LilycoveCity_ContestLobby_EventScript_279CC5 - call LilycoveCity_ContestLobby_EventScript_21A670 - special sub_80F87D8 - call LilycoveCity_ContestLobby_EventScript_23BEB6 - call LilycoveCity_ContestLobby_EventScript_21A585 - call LilycoveCity_ContestLobby_EventScript_21A5EF - waitstate - end - -LilycoveCity_ContestLobby_EventScript_21A585:: @ 821A585 - switch VAR_CONTEST_RANK - case 0, LilycoveCity_ContestLobby_EventScript_21A5B7 - case 1, LilycoveCity_ContestLobby_EventScript_21A5BD - case 2, LilycoveCity_ContestLobby_EventScript_21A5C3 - case 3, LilycoveCity_ContestLobby_EventScript_21A5C9 - return - -LilycoveCity_ContestLobby_EventScript_21A5B7:: @ 821A5B7 - setvar VAR_0x4088, 1 - return - -LilycoveCity_ContestLobby_EventScript_21A5BD:: @ 821A5BD - setvar VAR_0x4088, 2 - return - -LilycoveCity_ContestLobby_EventScript_21A5C3:: @ 821A5C3 - setvar VAR_0x4088, 3 - return - -LilycoveCity_ContestLobby_EventScript_21A5C9:: @ 821A5C9 - setvar VAR_0x4088, 4 - return - -LilycoveCity_ContestLobby_EventScript_21A5CF:: @ 821A5CF - setflag FLAG_0x307 - copyvar VAR_0x4094, 0x1 - giveitem ITEM_CONTEST_PASS, 1 - setvar VAR_0x800B, 8 - setvar VAR_CONTEST_RANK, 3 - setvar VAR_0x4099, 1 - setflag FLAG_SYS_RIBBON_GET - end - -LilycoveCity_ContestLobby_EventScript_21A5EF:: @ 821A5EF - setflag FLAG_0x155 - switch VAR_CONTEST_CATEGORY - case 0, LilycoveCity_ContestLobby_EventScript_21A62F - case 1, LilycoveCity_ContestLobby_EventScript_21A63C - case 2, LilycoveCity_ContestLobby_EventScript_21A649 - case 3, LilycoveCity_ContestLobby_EventScript_21A656 - case 4, LilycoveCity_ContestLobby_EventScript_21A663 - return - -LilycoveCity_ContestLobby_EventScript_21A62F:: @ 821A62F - setwarp MAP_LINK_CONTEST_ROOM4, 255, 7, 5 - special sub_80AFC60 - waitstate - return - -LilycoveCity_ContestLobby_EventScript_21A63C:: @ 821A63C - setwarp MAP_LINK_CONTEST_ROOM2, 255, 7, 5 - special sub_80AFC60 - waitstate - return - -LilycoveCity_ContestLobby_EventScript_21A649:: @ 821A649 - setwarp MAP_LINK_CONTEST_ROOM6, 255, 7, 5 - special sub_80AFC60 - waitstate - return - -LilycoveCity_ContestLobby_EventScript_21A656:: @ 821A656 - setwarp MAP_LINK_CONTEST_ROOM5, 255, 7, 5 - special sub_80AFC60 - waitstate - return - -LilycoveCity_ContestLobby_EventScript_21A663:: @ 821A663 - setwarp MAP_LINK_CONTEST_ROOM3, 255, 7, 5 - special sub_80AFC60 - waitstate - return - -LilycoveCity_ContestLobby_EventScript_21A670:: @ 821A670 - lockall - applymovement 1, LilycoveCity_ContestLobby_Movement_21A6F5 - waitmovement 0 - playse SE_HASHI - setmetatile 12, 2, 545, 1 - setmetatile 12, 3, 609, 1 - special DrawWholeMapView - applymovement 1, LilycoveCity_ContestLobby_Movement_21A6F9 - waitmovement 0 - playse SE_HASHI - setmetatile 12, 2, 721, 1 - setmetatile 12, 3, 729, 1 - special DrawWholeMapView - delay 20 - applymovement 1, LilycoveCity_ContestLobby_Movement_21A706 - waitmovement 0 - applymovement 255, LilycoveCity_ContestLobby_Movement_21A6F2 - waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_27B653, 4 - closemessage - applymovement 1, LilycoveCity_ContestLobby_Movement_21A6FD - applymovement 255, LilycoveCity_ContestLobby_Movement_21A6E8 - waitmovement 0 - releaseall - return - -LilycoveCity_ContestLobby_Movement_21A6E8: @ 821A6E8 - 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 - walk_in_place_fastest_left - walk_left - step_end - -LilycoveCity_ContestLobby_Movement_21A6F5: @ 821A6F5 - walk_left - walk_left - walk_in_place_fastest_down - step_end - -LilycoveCity_ContestLobby_Movement_21A6F9: @ 821A6F9 - walk_down - walk_down - walk_in_place_fastest_up - step_end - -LilycoveCity_ContestLobby_Movement_21A6FD: @ 821A6FD - walk_left - walk_left - walk_left - walk_up - walk_up - walk_up - delay_8 - set_invisible - step_end - -LilycoveCity_ContestLobby_Movement_21A706: @ 821A706 - walk_in_place_fastest_right - step_end - -LilycoveCity_ContestLobby_EventScript_21A708:: @ 821A708 - msgbox LilycoveCity_ContestLobby_Text_21B1B1, 2 - end - -LilycoveCity_ContestLobby_EventScript_21A711:: @ 821A711 - msgbox LilycoveCity_ContestLobby_Text_21B24D, 2 - end - -LilycoveCity_ContestLobby_EventScript_21A71A:: @ 821A71A - msgbox LilycoveCity_ContestLobby_Text_21B2BA, 2 - end - -LilycoveCity_ContestLobby_EventScript_21A723:: @ 821A723 - msgbox LilycoveCity_ContestLobby_Text_21B334, 2 - end - -LilycoveCity_ContestLobby_EventScript_21A72C:: @ 821A72C - msgbox LilycoveCity_ContestLobby_Text_21B392, 2 - end - -LilycoveCity_ContestLobby_EventScript_21A735:: @ 821A735 - msgbox LilycoveCity_ContestLobby_Text_21B3FC, 2 - end - -LilycoveCity_ContestLobby_EventScript_21A73E:: @ 821A73E - lockall - fadescreen 1 - drawcontestwinner 1 - releaseall - end - -LilycoveCity_ContestLobby_EventScript_21A745:: @ 821A745 - lockall - fadescreen 1 - drawcontestwinner 2 - releaseall - end - -LilycoveCity_ContestLobby_EventScript_21A74C:: @ 821A74C - lockall - fadescreen 1 - drawcontestwinner 3 - releaseall - end - -LilycoveCity_ContestLobby_EventScript_21A753:: @ 821A753 - lockall - fadescreen 1 - drawcontestwinner 4 - releaseall - end - -LilycoveCity_ContestLobby_EventScript_21A75A:: @ 821A75A - lockall - fadescreen 1 - drawcontestwinner 5 - releaseall - end - -LilycoveCity_ContestLobby_EventScript_21A761:: @ 821A761 - lockall - fadescreen 1 - drawcontestwinner 6 - releaseall - end - -LilycoveCity_ContestLobby_EventScript_21A768:: @ 821A768 - msgbox LilycoveCity_ContestLobby_Text_2931AA, 2 - end - -LilycoveCity_ContestLobby_EventScript_21A771:: @ 821A771 - msgbox LilycoveCity_ContestLobby_Text_2931C6, 2 - end - -LilycoveCity_ContestLobby_EventScript_21A77A:: @ 821A77A - lockall - special ShowBerryBlenderRecordWindow - waitbuttonpress - special RemoveRecordsWindow - releaseall - end - -LilycoveCity_ContestLobby_EventScript_21A784:: @ 821A784 - lockall - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 7 - special sub_81A1780 - waitbuttonpress - special RemoveRecordsWindow - releaseall - end - -LilycoveCity_ContestLobby_EventScript_21A798:: @ 821A798 - lock - faceplayer - msgbox LilycoveCity_ContestLobby_Text_2C427C, 4 - goto LilycoveCity_ContestLobby_EventScript_21A7F9 - end - -LilycoveCity_ContestLobby_EventScript_21A7A8:: @ 821A7A8 - lock - msgbox LilycoveCity_ContestLobby_Text_2C464B, 4 - release - end - -LilycoveCity_ContestLobby_EventScript_21A7B3:: @ 821A7B3 - lock - msgbox LilycoveCity_ContestLobby_Text_2C465A, 4 - release - end - -LilycoveCity_ContestLobby_EventScript_21A7BE:: @ 821A7BE - lock - msgbox LilycoveCity_ContestLobby_Text_2C4669, 4 - release - end - -LilycoveCity_ContestLobby_EventScript_21A7C9:: @ 821A7C9 - lock - faceplayer - msgbox LilycoveCity_ContestLobby_Text_2C4679, 4 - goto LilycoveCity_ContestLobby_EventScript_21A7F9 - end - -LilycoveCity_ContestLobby_EventScript_21A7D9:: @ 821A7D9 - lock - faceplayer - msgbox LilycoveCity_ContestLobby_Text_2C46B1, 4 - goto LilycoveCity_ContestLobby_EventScript_21A7F9 - end - -LilycoveCity_ContestLobby_EventScript_21A7E9:: @ 821A7E9 - lock - faceplayer - msgbox LilycoveCity_ContestLobby_Text_2C4763, 4 - goto LilycoveCity_ContestLobby_EventScript_21A7F9 - end - -LilycoveCity_ContestLobby_EventScript_21A7F9:: @ 821A7F9 - closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_ContestLobby_Movement_2725A2 - waitmovement 0 - release - end - -LilycoveCity_ContestLobby_EventScript_21A806:: @ 821A806 - special sub_80F9154 - lock - faceplayer - msgbox LilycoveCity_ContestLobby_Text_27C063, 4 - goto LilycoveCity_ContestLobby_EventScript_21A819 - end - -LilycoveCity_ContestLobby_EventScript_21A819:: @ 821A819 - message LilycoveCity_ContestLobby_Text_27C0F6 - waitmessage - multichoice 0, 0, 2, 0 - switch VAR_RESULT - case 0, LilycoveCity_ContestLobby_EventScript_21A856 - case 1, LilycoveCity_ContestLobby_EventScript_21A90D - case 2, LilycoveCity_ContestLobby_EventScript_21A97F - case 127, LilycoveCity_ContestLobby_EventScript_21A97F - end - -LilycoveCity_ContestLobby_EventScript_21A856:: @ 821A856 - msgbox LilycoveCity_ContestLobby_Text_27BD17, 5 - compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_21A97F - call LilycoveCity_ContestLobby_EventScript_27134F - compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_21A97F - message LilycoveCity_ContestLobby_Text_27C8FD - waitmessage - specialvar VAR_TEMP_D, sub_80093CC - multichoice 0, 0, 85, 0 - switch VAR_RESULT - case 0, LilycoveCity_ContestLobby_EventScript_21A8BB - case 1, LilycoveCity_ContestLobby_EventScript_21A8C6 - case 2, LilycoveCity_ContestLobby_EventScript_21A97F - case 127, LilycoveCity_ContestLobby_EventScript_21A97F - end - -LilycoveCity_ContestLobby_EventScript_21A8BB:: @ 821A8BB - setvar VAR_TEMP_C, 0 - goto LilycoveCity_ContestLobby_EventScript_21A8DC - end - -LilycoveCity_ContestLobby_EventScript_21A8C6:: @ 821A8C6 - setvar VAR_TEMP_C, 1 - compare VAR_TEMP_D, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21AAFC - goto LilycoveCity_ContestLobby_EventScript_21A8DC - end - -LilycoveCity_ContestLobby_EventScript_21A8DC:: @ 821A8DC - message LilycoveCity_ContestLobby_Text_27C119 - waitmessage - multichoice 0, 0, 4, 0 - switch VAR_RESULT - case 5, LilycoveCity_ContestLobby_EventScript_21A97F - case 127, LilycoveCity_ContestLobby_EventScript_21A97F - copyvar VAR_CONTEST_CATEGORY, VAR_RESULT - goto LilycoveCity_ContestLobby_EventScript_21A98C - end - -LilycoveCity_ContestLobby_EventScript_21A90D:: @ 821A90D - message LilycoveCity_ContestLobby_Text_27C0DA - waitmessage - multichoice 0, 0, 84, 0 - switch VAR_RESULT - case 0, LilycoveCity_ContestLobby_EventScript_21A955 - case 1, LilycoveCity_ContestLobby_EventScript_21A963 - case 2, LilycoveCity_ContestLobby_EventScript_21A971 - case 3, LilycoveCity_ContestLobby_EventScript_21A819 - case 127, LilycoveCity_ContestLobby_EventScript_21A819 - end - -LilycoveCity_ContestLobby_EventScript_21A955:: @ 821A955 - msgbox LilycoveCity_ContestLobby_Text_27C340, 4 - goto LilycoveCity_ContestLobby_EventScript_21A90D - end - -LilycoveCity_ContestLobby_EventScript_21A963:: @ 821A963 - msgbox LilycoveCity_ContestLobby_Text_27C5B1, 4 - goto LilycoveCity_ContestLobby_EventScript_21A90D - end - -LilycoveCity_ContestLobby_EventScript_21A971:: @ 821A971 - msgbox LilycoveCity_ContestLobby_Text_27C742, 4 - goto LilycoveCity_ContestLobby_EventScript_21A90D - end - -LilycoveCity_ContestLobby_EventScript_21A97F:: @ 821A97F - special CloseLink - msgbox LilycoveCity_ContestLobby_Text_27BD4F, 4 - release - end - -LilycoveCity_ContestLobby_EventScript_21A98C:: @ 821A98C - msgbox LilycoveCity_ContestLobby_Text_27C1C3, 4 - setvar VAR_CONTEST_RANK, 0 - choosecontestmon - compare VAR_0x8004, 255 - goto_eq LilycoveCity_ContestLobby_EventScript_21A97F - special sub_80F7F30 - compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_21A9E0 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21AA0A - compare VAR_RESULT, 2 - goto_eq LilycoveCity_ContestLobby_EventScript_21AA0A - compare VAR_RESULT, 3 - goto_eq LilycoveCity_ContestLobby_EventScript_21A9EE - compare VAR_RESULT, 4 - goto_eq LilycoveCity_ContestLobby_EventScript_21A9FC - end - -LilycoveCity_ContestLobby_EventScript_21A9E0:: @ 821A9E0 - msgbox LilycoveCity_ContestLobby_Text_27B471, 4 - goto LilycoveCity_ContestLobby_EventScript_21A98C - end - -LilycoveCity_ContestLobby_EventScript_21A9EE:: @ 821A9EE - msgbox LilycoveCity_ContestLobby_Text_27C186, 4 - goto LilycoveCity_ContestLobby_EventScript_21A98C - end - -LilycoveCity_ContestLobby_EventScript_21A9FC:: @ 821A9FC - msgbox LilycoveCity_ContestLobby_Text_27C140, 4 - goto LilycoveCity_ContestLobby_EventScript_21A98C - end - -LilycoveCity_ContestLobby_EventScript_21AA0A:: @ 821AA0A - copyvar VAR_0x8008, VAR_0x8004 - goto LilycoveCity_ContestLobby_EventScript_21AA15 - end - -LilycoveCity_ContestLobby_EventScript_21AA15:: @ 821AA15 - compare VAR_TEMP_D, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21AB4B - compare VAR_TEMP_D, 2 - goto_if 4, LilycoveCity_ContestLobby_EventScript_21A97F - message LilycoveCity_ContestLobby_Text_27BF85 - waitmessage - copyvar VAR_0x8004, VAR_RESULT - compare VAR_TEMP_C, 0 - call_if 1, LilycoveCity_ContestLobby_EventScript_21AABB - compare VAR_TEMP_C, 1 - call_if 1, LilycoveCity_ContestLobby_EventScript_21AAC0 - compare VAR_TEMP_C, 2 - goto_if 4, LilycoveCity_ContestLobby_EventScript_21A97F - compare VAR_RESULT, 4 - goto_eq LilycoveCity_ContestLobby_EventScript_21AAD3 - compare VAR_RESULT, 3 - goto_eq LilycoveCity_ContestLobby_EventScript_21AAD3 - compare VAR_RESULT, 5 - goto_eq LilycoveCity_ContestLobby_EventScript_21A97F - compare VAR_RESULT, 6 - goto_eq LilycoveCity_ContestLobby_EventScript_21AAEF - compare VAR_RESULT, 10 - goto_eq LilycoveCity_ContestLobby_EventScript_21AAE1 - message3 LilycoveCity_ContestLobby_Text_27BEEC - contestlinktransfer - switch VAR_0x8004 - case 0, LilycoveCity_ContestLobby_EventScript_21AB17 - case 1, LilycoveCity_ContestLobby_EventScript_21AAC5 - case 2, LilycoveCity_ContestLobby_EventScript_21AB09 - end - -LilycoveCity_ContestLobby_EventScript_21AABB:: @ 821AABB - special sub_80B3028 - waitstate - return - -LilycoveCity_ContestLobby_EventScript_21AAC0:: @ 821AAC0 - special sub_80B3000 - waitstate - return - -LilycoveCity_ContestLobby_EventScript_21AAC5:: @ 821AAC5 - msgbox LilycoveCity_ContestLobby_Text_27BF0E, 4 - goto LilycoveCity_ContestLobby_EventScript_21A97F - end - -LilycoveCity_ContestLobby_EventScript_21AAD3:: @ 821AAD3 - msgbox LilycoveCity_ContestLobby_Text_27BF4B, 4 - goto LilycoveCity_ContestLobby_EventScript_21A97F - end - -LilycoveCity_ContestLobby_EventScript_21AAE1:: @ 821AAE1 - msgbox LilycoveCity_ContestLobby_Text_27C254, 4 - goto LilycoveCity_ContestLobby_EventScript_21A97F - end - -LilycoveCity_ContestLobby_EventScript_21AAEF:: @ 821AAEF - special CloseLink - msgbox LilycoveCity_ContestLobby_Text_27821C, 4 - release - end - -LilycoveCity_ContestLobby_EventScript_21AAFC:: @ 821AAFC - special CloseLink - msgbox LilycoveCity_ContestLobby_Text_27C879, 4 - release - end - -LilycoveCity_ContestLobby_EventScript_21AB09:: @ 821AB09 - msgbox LilycoveCity_ContestLobby_Text_27BEFA, 4 - goto LilycoveCity_ContestLobby_EventScript_21A97F - end - -LilycoveCity_ContestLobby_EventScript_21AB17:: @ 821AB17 - special sub_80F84B0 - addvar VAR_0x8004, 1 - buffernumberstring 1, VAR_0x8004 - messageautoscroll LilycoveCity_ContestLobby_Text_27BFF8 - waitmessage - subvar VAR_0x8004, 1 - call LilycoveCity_ContestLobby_EventScript_21AC49 - setvar VAR_0x4086, 1 - special sub_80F8AFC - setvar VAR_0x4088, 5 - setvar VAR_CONTEST_RANK, 3 - call LilycoveCity_ContestLobby_EventScript_21A5EF - end - -LilycoveCity_ContestLobby_EventScript_21AB4B:: @ 821AB4B - compare VAR_CONTEST_CATEGORY, 0 - call_if 1, LilycoveCity_ContestLobby_EventScript_21AB88 - compare VAR_CONTEST_CATEGORY, 1 - call_if 1, LilycoveCity_ContestLobby_EventScript_21AB8E - compare VAR_CONTEST_CATEGORY, 2 - call_if 1, LilycoveCity_ContestLobby_EventScript_21AB94 - compare VAR_CONTEST_CATEGORY, 3 - call_if 1, LilycoveCity_ContestLobby_EventScript_21AB9A - compare VAR_CONTEST_CATEGORY, 4 - call_if 1, LilycoveCity_ContestLobby_EventScript_21ABA0 - goto LilycoveCity_ContestLobby_EventScript_21ABA6 - end - -LilycoveCity_ContestLobby_EventScript_21AB88:: @ 821AB88 - setvar VAR_0x8004, 15 - return - -LilycoveCity_ContestLobby_EventScript_21AB8E:: @ 821AB8E - setvar VAR_0x8004, 16 - return - -LilycoveCity_ContestLobby_EventScript_21AB94:: @ 821AB94 - setvar VAR_0x8004, 17 - return - -LilycoveCity_ContestLobby_EventScript_21AB9A:: @ 821AB9A - setvar VAR_0x8004, 18 - return - -LilycoveCity_ContestLobby_EventScript_21ABA0:: @ 821ABA0 - setvar VAR_0x8004, 19 - return - -LilycoveCity_ContestLobby_EventScript_21ABA6:: @ 821ABA6 - message LilycoveCity_ContestLobby_Text_27C1EA - waitmessage - multichoice 16, 6, 81, 0 - switch VAR_RESULT - case 0, LilycoveCity_ContestLobby_EventScript_21AC0B - case 1, LilycoveCity_ContestLobby_EventScript_21ABE3 - case 2, LilycoveCity_ContestLobby_EventScript_21A97F - case 127, LilycoveCity_ContestLobby_EventScript_21A97F - end - -LilycoveCity_ContestLobby_EventScript_21ABE3:: @ 821ABE3 - call LilycoveCity_ContestLobby_EventScript_21AC33 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21AC3D - compare VAR_RESULT, 5 - goto_eq LilycoveCity_ContestLobby_EventScript_21ABA6 - compare VAR_RESULT, 8 - goto_eq LilycoveCity_ContestLobby_EventScript_21ABE3 - release - end - -LilycoveCity_ContestLobby_EventScript_21AC0B:: @ 821AC0B - call LilycoveCity_ContestLobby_EventScript_21AC38 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21AC3D - compare VAR_RESULT, 5 - goto_eq LilycoveCity_ContestLobby_EventScript_21ABA6 - compare VAR_RESULT, 8 - goto_eq LilycoveCity_ContestLobby_EventScript_21AC0B - release - end - -LilycoveCity_ContestLobby_EventScript_21AC33:: @ 821AC33 - special BerryBlenderLinkBecomeLeader - waitstate - return - -LilycoveCity_ContestLobby_EventScript_21AC38:: @ 821AC38 - special BerryBlenderLinkJoinGroup - waitstate - return - -LilycoveCity_ContestLobby_EventScript_21AC3D:: @ 821AC3D - message3 LilycoveCity_ContestLobby_Text_27BEEC - contestlinktransfer - goto LilycoveCity_ContestLobby_EventScript_21AB17 - end - -LilycoveCity_ContestLobby_EventScript_21AC49:: @ 821AC49 - messageautoscroll LilycoveCity_ContestLobby_Text_27C043 - waitmessage - delay 20 - closemessage - applymovement 2, LilycoveCity_ContestLobby_Movement_21ACDD - waitmovement 0 - playse SE_HASHI - setmetatile 17, 2, 545, 1 - setmetatile 17, 3, 609, 1 - special DrawWholeMapView - applymovement 2, LilycoveCity_ContestLobby_Movement_21ACE1 - waitmovement 0 - playse SE_HASHI - setmetatile 17, 2, 721, 1 - setmetatile 17, 3, 729, 1 - special DrawWholeMapView - delay 20 - applymovement 2, LilycoveCity_ContestLobby_Movement_21ACEF - waitmovement 0 - applymovement 255, LilycoveCity_ContestLobby_Movement_21ACDB - waitmovement 0 - messageautoscroll LilycoveCity_ContestLobby_Text_27B653 - waitmessage - delay 20 - closemessage - call LilycoveCity_ContestLobby_EventScript_27AD92 - applymovement 2, LilycoveCity_ContestLobby_Movement_21ACE5 - applymovement 255, LilycoveCity_ContestLobby_Movement_21ACD0 - waitmovement 0 - release - return - -LilycoveCity_ContestLobby_Movement_21ACD0: @ 821ACD0 - 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 - walk_right - step_end - -LilycoveCity_ContestLobby_Movement_21ACDD: @ 821ACDD - walk_right - walk_right - walk_in_place_fastest_down - step_end - -LilycoveCity_ContestLobby_Movement_21ACE1: @ 821ACE1 - walk_down - walk_down - walk_in_place_fastest_up - step_end - -LilycoveCity_ContestLobby_Movement_21ACE5: @ 821ACE5 - 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 - walk_in_place_fastest_left - step_end - -LilycoveCity_ContestLobby_EventScript_21ACF1:: @ 821ACF1 - lock - faceplayer - checkflag FLAG_0x05F - goto_eq LilycoveCity_ContestLobby_EventScript_21AD06 - msgbox LilycoveCity_ContestLobby_Text_21AD10, 4 - release - end - -LilycoveCity_ContestLobby_EventScript_21AD06:: @ 821AD06 - msgbox LilycoveCity_ContestLobby_Text_21AD55, 4 - release - end - -LilycoveCity_ContestLobby_Text_21AD10: @ 821AD10 - .string "Yippee!\p" - .string "The lady at the reception counter\n" - .string "gave me a case for {POKEBLOCK}S!$" - -LilycoveCity_ContestLobby_Text_21AD55: @ 821AD55 - .string "Make {POKEBLOCK}S and put them in there.\p" - .string "When you make a {POKEBLOCK}, everyone\n" - .string "has to put in a different BERRY.$" - -LilycoveCity_ContestLobby_Text_21ADB9: @ 821ADB9 - .string "Congratulations!\p" - .string "I did a painting of your POKéMON to\n" - .string "commemorate its victory…\p" - .string "Well, your POKéMON’s appeals were\n" - .string "so fantastic, it spurred me into\l" - .string "painting better than I usually do.\l" - .string "Look, see?$" - -LilycoveCity_ContestLobby_Text_21AE78: @ 821AE78 - .string "What do you think? I’m confident in\n" - .string "what I’ve done, but do you like it?\p" - .string "A work of this caliber, it wouldn’t look\n" - .string "out of place in an art museum.\p" - .string "Huh? An art museum really is looking\n" - .string "for paintings?\p" - .string "Do you think I should take this there?$" - -LilycoveCity_ContestLobby_Text_21AF63: @ 821AF63 - .string "What, really? Then, sure, I will take\n" - .string "this painting there right now.\p" - .string "I’ll give it a proper title, too.\p" - .string "I hope they’ll like it and consider\n" - .string "exhibiting this.\p" - .string "Please check if they did accept this.\n" - .string "Thank you!$" - -LilycoveCity_ContestLobby_Text_21B030: @ 821B030 - .string "Oh, that’s right!\p" - .string "As a memento of me painting your\n" - .string "POKéMON, please take this.$" - -LilycoveCity_ContestLobby_Text_21B07E: @ 821B07E - .string "{PLAYER} received a RIBBON.$" - -LilycoveCity_ContestLobby_Text_21B094: @ 821B094 - .string "{PLAYER} put the RIBBON on\n" - .string "{STR_VAR_1}.$" - -LilycoveCity_ContestLobby_Text_21B0AD: @ 821B0AD - .string "Okay, see you!$" - -LilycoveCity_ContestLobby_Text_21B0BC: @ 821B0BC - .string "Oh… Then, I guess I’ll just take\n" - .string "this home with me…\p" - .string "But, you know, I would like to take\n" - .string "this to the art museum… Okay?$" - -LilycoveCity_ContestLobby_Text_21B132: @ 821B132 - .string "Oh, fine, that’s the way it is.\n" - .string "I will hang this in my own house.\p" - .string "I’ll just have to try harder next time.\n" - .string "Well, be seeing you.$" - -LilycoveCity_ContestLobby_Text_21B1B1: @ 821B1B1 - .string "Hoo, boy… Master Rank CONTESTS,\n" - .string "here I come.\p" - .string "The world will know that my dearest\n" - .string "POKéMON is the cutest being in all\l" - .string "existence. The time has come!\l" - .string "Uheheheh.$" - -LilycoveCity_ContestLobby_Text_21B24D: @ 821B24D - .string "You can see a whole variety of\n" - .string "POKéMON here.\p" - .string "That’s why I make this place a regular\n" - .string "part of my daily stroll.$" - -LilycoveCity_ContestLobby_Text_21B2BA: @ 821B2BA - .string "Wow, coming out to a CONTEST is\n" - .string "a feast for these eyes!\p" - .string "Would you look at all the POKéMON\n" - .string "that just scream to be painted?$" - -LilycoveCity_ContestLobby_Text_21B334: @ 821B334 - .string "The TOUGHNESS CONTEST is like\n" - .string "extreme, man!\p" - .string "Those muscular appeals…\n" - .string "Cascading sweat… I swoon!$" - -LilycoveCity_ContestLobby_Text_21B392: @ 821B392 - .string "Day in and day out, I lavished my care\n" - .string "on this POKéMON.\p" - .string "Its condition is peaking.\n" - .string "Today, victory is mine!$" - -LilycoveCity_ContestLobby_Text_21B3FC: @ 821B3FC - .string "I made {POKEBLOCK}S with Mom, Dad, and\n" - .string "Big Sister. They turned out great!\p" - .string "I bet you can make smoother, better\n" - .string "{POKEBLOCK}S if you have more people.$" - diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc deleted file mode 100644 index 3468299a9..000000000 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc +++ /dev/null @@ -1,131 +0,0 @@ -LilycoveCity_CoveLilyMotel_1F_MapScripts:: @ 8218188 - .byte 0 - -LilycoveCity_CoveLilyMotel_1F_EventScript_218189:: @ 8218189 - lockall - checkflag FLAG_SYS_GAME_CLEAR - goto_eq LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA - checkflag FLAG_BADGE07_GET - goto_eq LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_218264, 4 - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E - waitmovement 0 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_21831E, 4 - closemessage - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2 - waitmovement 0 - releaseall - end - -LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3:: @ 82181C3 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_2183C3, 4 - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E - waitmovement 0 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_218470, 4 - closemessage - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2 - waitmovement 0 - releaseall - end - -LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA:: @ 82181EA - msgbox LilycoveCity_CoveLilyMotel_1F_Text_218544, 4 - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E - waitmovement 0 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_2185F4, 4 - closemessage - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2 - waitmovement 0 - releaseall - end - -LilycoveCity_CoveLilyMotel_1F_EventScript_218211:: @ 8218211 - lockall - playse SE_PIN - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_272598 - waitmovement 0 - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259A - waitmovement 0 - applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_2725AA - waitmovement 0 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_21839B, 4 - closemessage - applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_218259 - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_21825E - waitmovement 0 - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_218260 - waitmovement 0 - release - end - -LilycoveCity_CoveLilyMotel_1F_Movement_218259: @ 8218259 - face_right - lock_facing_direction - walk_left - unlock_facing_direction - step_end - -LilycoveCity_CoveLilyMotel_1F_Movement_21825E: @ 821825E - walk_up - step_end - -LilycoveCity_CoveLilyMotel_1F_Movement_218260: @ 8218260 - face_down - walk_down - face_up - step_end - -LilycoveCity_CoveLilyMotel_1F_Text_218264: @ 8218264 - .string "Hm, so they doubled the guests by\n" - .string "using POKéMON as attractions?\p" - .string "Hm, well, maybe I should make a cute\n" - .string "POKéMON our inn’s mascot.\p" - .string "I wonder if that will attract more\n" - .string "guests to stay with us?$" - -LilycoveCity_CoveLilyMotel_1F_Text_21831E: @ 821831E - .string "Oh, sorry, sorry!\n" - .string "I was too involved in watching TV!\p" - .string "Since that TEAM AQUA came to town,\n" - .string "the tourists have been staying away.$" - -LilycoveCity_CoveLilyMotel_1F_Text_21839B: @ 821839B - .string "Hey, down in front!\n" - .string "I can’t see the TV!$" - -LilycoveCity_CoveLilyMotel_1F_Text_2183C3: @ 82183C3 - .string "Amazing! You’re telling me a POKéMON\n" - .string "found someone’s lost item?\p" - .string "That’s something. If we had some smart\n" - .string "POKéMON like that…\p" - .string "We could recover anything that our\n" - .string "guests mislaid…$" - -LilycoveCity_CoveLilyMotel_1F_Text_218470: @ 8218470 - .string "Oh, sorry, sorry!\n" - .string "I was too involved in watching TV!\p" - .string "I heard that someone busted\n" - .string "the TEAM AQUA HIDEOUT.\p" - .string "Thanks to that, we just booked\n" - .string "a reservation from a big group.\p" - .string "It was a company called… Uh…\n" - .string "GAME something…$" - -LilycoveCity_CoveLilyMotel_1F_Text_218544: @ 8218544 - .string "Amazing! A house-sitting POKéMON\n" - .string "caught a burglar?\p" - .string "That’s something. If we had a tough\n" - .string "POKéMON as a security guard…\p" - .string "We would be able to provide our guests\n" - .string "with greater safety.$" - -LilycoveCity_CoveLilyMotel_1F_Text_2185F4: @ 82185F4 - .string "Oh, sorry, sorry!\n" - .string "I was too involved in watching TV.\p" - .string "Oh, yes. A big group of guests arrived\n" - .string "a little while ago.\p" - .string "They booked in as GAME FREAK,\n" - .string "so I guess they must make games.\p" - .string "Uh-oh, I’d better get working on\n" - .string "their dinner!$" - diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc deleted file mode 100644 index 90769b550..000000000 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ /dev/null @@ -1,140 +0,0 @@ -LilycoveCity_CoveLilyMotel_2F_MapScripts:: @ 82186D2 - .byte 0 - -LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3:: @ 82186D3 - lock - faceplayer - checkflag FLAG_0x002 - call_if 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186F9 - checkflag FLAG_0x002 - call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_21870F - specialvar VAR_RESULT, sub_80C08E4 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_CoveLilyMotel_2F_EventScript_218702 - release - end - -LilycoveCity_CoveLilyMotel_2F_EventScript_2186F9:: @ 82186F9 - msgbox LilycoveCity_CoveLilyMotel_2F_Text_218774, 4 - return - -LilycoveCity_CoveLilyMotel_2F_EventScript_218702:: @ 8218702 - setflag FLAG_0x002 - playfanfare MUS_FANFA4 - waitfanfare - goto LilycoveCity_CoveLilyMotel_2F_EventScript_21870F - end - -LilycoveCity_CoveLilyMotel_2F_EventScript_21870F:: @ 821870F - message LilycoveCity_CoveLilyMotel_2F_Text_21881C - waitmessage - call LilycoveCity_CoveLilyMotel_2F_EventScript_27207E - special Special_ShowDiploma - waitstate - release - end - -LilycoveCity_CoveLilyMotel_2F_EventScript_218720:: @ 8218720 - msgbox LilycoveCity_CoveLilyMotel_2F_Text_2188D6, 2 - end - -LilycoveCity_CoveLilyMotel_2F_EventScript_218729:: @ 8218729 - msgbox LilycoveCity_CoveLilyMotel_2F_Text_21892B, 2 - end - -LilycoveCity_CoveLilyMotel_2F_EventScript_218732:: @ 8218732 - msgbox LilycoveCity_CoveLilyMotel_2F_Text_21896C, 2 - end - -LilycoveCity_CoveLilyMotel_2F_EventScript_21873B:: @ 821873B - msgbox LilycoveCity_CoveLilyMotel_2F_Text_218A21, 2 - end - -LilycoveCity_CoveLilyMotel_2F_EventScript_218744:: @ 8218744 - msgbox LilycoveCity_CoveLilyMotel_2F_Text_218A5B, 2 - end - -LilycoveCity_CoveLilyMotel_2F_EventScript_21874D:: @ 821874D - lock - faceplayer - checkflag FLAG_0x1CE - goto_eq LilycoveCity_CoveLilyMotel_2F_EventScript_21876A - msgbox LilycoveCity_CoveLilyMotel_2F_Text_218ACF, 4 - addvar VAR_0x40D1, 1 - setflag FLAG_0x1CE - release - end - -LilycoveCity_CoveLilyMotel_2F_EventScript_21876A:: @ 821876A - msgbox LilycoveCity_CoveLilyMotel_2F_Text_218C33, 4 - release - end - -LilycoveCity_CoveLilyMotel_2F_Text_218774: @ 8218774 - .string "I’m the GAME DESIGNER.\p" - .string "Oh, is that right?\n" - .string "You’re working on a POKéDEX?\p" - .string "It’s tough trying to complete it,\n" - .string "but don’t give up.\p" - .string "If you do complete it, please come\n" - .string "show me.$" - -LilycoveCity_CoveLilyMotel_2F_Text_21881C: @ 821881C - .string "Wow! That’s awesome!\n" - .string "Yep, it’s totally awesome!\p" - .string "This POKéDEX is completely filled!\n" - .string "You really must love POKéMON!\p" - .string "I’m so impressed!\p" - .string "Let me give you something in\n" - .string "recognition of your feat!$" - -LilycoveCity_CoveLilyMotel_2F_Text_2188D6: @ 82188D6 - .string "Me? You’re talking to me?\n" - .string "I’m the PROGRAMMER.\p" - .string "I wonder what the SLOTS are\n" - .string "like here.$" - -LilycoveCity_CoveLilyMotel_2F_Text_21892B: @ 821892B - .string "I’m the GRAPHIC ARTIST! Aren’t the\n" - .string "POKéMON of HOENN interesting?$" - -LilycoveCity_CoveLilyMotel_2F_Text_21896C: @ 821896C - .string "The girl TUBERS, they’re cute, hey?\n" - .string "To battle against a cute TUBER…\p" - .string "Whoop, it’s so awesome!\p" - .string "And the TWINS! Aren’t they cute?\n" - .string "A 2-on-2 battle with TWINS…\p" - .string "Whoop, it’s unbearably fun!$" - -LilycoveCity_CoveLilyMotel_2F_Text_218A21: @ 8218A21 - .string "The sea breeze tickles my heart.\n" - .string "It feels wonderful here!$" - -LilycoveCity_CoveLilyMotel_2F_Text_218A5B: @ 8218A5B - .string "You never know when and where\n" - .string "people will challenge you.\p" - .string "That’s why I never leave home without\n" - .string "my GAME BOY ADVANCE.$" - -LilycoveCity_CoveLilyMotel_2F_Text_218ACF: @ 8218ACF - .string "SCOTT: … … … … …\n" - .string "… … … … … Zzz…\p" - .string "… … … … … Huh?!\n" - .string "Oh, sorry, sorry! I was snoozing!\p" - .string "I came to check out this POKéMON\n" - .string "CONTEST thing.\p" - .string "I have to admit, it does look quite\n" - .string "entertaining, but…\p" - .string "Consider me a purist--I prefer\n" - .string "battles and tough TRAINERS.\p" - .string "But that’s just me.\p" - .string "{PLAYER}{KUN}, I hope you’ll enjoy everything\n" - .string "like the GYMS, CONTESTS, BATTLE TENT,\l" - .string "the whole works!$" - -LilycoveCity_CoveLilyMotel_2F_Text_218C33: @ 8218C33 - .string "SCOTT: I think it does take strategy\n" - .string "to win a CONTEST.\p" - .string "Devising CONTEST strategies is one way\n" - .string "of becoming a better TRAINER, I’d say.$" - diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc deleted file mode 100644 index 234751910..000000000 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ /dev/null @@ -1,129 +0,0 @@ -LilycoveCity_DepartmentStoreElevator_MapScripts:: @ 8220623 - .byte 0 - -LilycoveCity_DepartmentStoreElevator_EventScript_220624:: @ 8220624 - lock - faceplayer - setvar VAR_0x8004, 0 - checkflag FLAG_0x002 - call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_2207FC - copyvar VAR_0x8005, VAR_DEPT_STORE_FLOOR - special sub_8139B60 - message gUnknown_08272C1D - waitmessage - setvar VAR_0x8004, 0 - specialvar VAR_RESULT, sub_81399F4 - switch VAR_RESULT - case 0, LilycoveCity_DepartmentStoreElevator_EventScript_220689 - case 1, LilycoveCity_DepartmentStoreElevator_EventScript_220695 - case 2, LilycoveCity_DepartmentStoreElevator_EventScript_2206A1 - case 3, LilycoveCity_DepartmentStoreElevator_EventScript_2206AD - case 4, LilycoveCity_DepartmentStoreElevator_EventScript_2206B9 - end - -LilycoveCity_DepartmentStoreElevator_EventScript_220689:: @ 8220689 - multichoicedefault 0, 0, 57, 0, 0 - goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5 - end - -LilycoveCity_DepartmentStoreElevator_EventScript_220695:: @ 8220695 - multichoicedefault 0, 0, 57, 1, 0 - goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5 - end - -LilycoveCity_DepartmentStoreElevator_EventScript_2206A1:: @ 82206A1 - multichoicedefault 0, 0, 57, 2, 0 - goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5 - end - -LilycoveCity_DepartmentStoreElevator_EventScript_2206AD:: @ 82206AD - multichoicedefault 0, 0, 57, 3, 0 - goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5 - end - -LilycoveCity_DepartmentStoreElevator_EventScript_2206B9:: @ 82206B9 - multichoicedefault 0, 0, 57, 4, 0 - goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5 - end - -LilycoveCity_DepartmentStoreElevator_EventScript_2206C5:: @ 82206C5 - switch VAR_RESULT - case 0, LilycoveCity_DepartmentStoreElevator_EventScript_2207B8 - case 1, LilycoveCity_DepartmentStoreElevator_EventScript_220790 - case 2, LilycoveCity_DepartmentStoreElevator_EventScript_220768 - case 3, LilycoveCity_DepartmentStoreElevator_EventScript_220740 - case 4, LilycoveCity_DepartmentStoreElevator_EventScript_220718 - case 5, LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 - case 127, LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 - end - -LilycoveCity_DepartmentStoreElevator_EventScript_220718:: @ 8220718 - setvar VAR_0x8006, 4 - 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 - setvar VAR_DEPT_STORE_FLOOR, 4 - goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 - end - -LilycoveCity_DepartmentStoreElevator_EventScript_220740:: @ 8220740 - setvar VAR_0x8006, 5 - 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 - setvar VAR_DEPT_STORE_FLOOR, 5 - goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 - end - -LilycoveCity_DepartmentStoreElevator_EventScript_220768:: @ 8220768 - setvar VAR_0x8006, 6 - 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 - setvar VAR_DEPT_STORE_FLOOR, 6 - goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 - end - -LilycoveCity_DepartmentStoreElevator_EventScript_220790:: @ 8220790 - setvar VAR_0x8006, 7 - 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 - setvar VAR_DEPT_STORE_FLOOR, 7 - goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 - end - -LilycoveCity_DepartmentStoreElevator_EventScript_2207B8:: @ 82207B8 - setvar VAR_0x8006, 8 - 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 - setvar VAR_DEPT_STORE_FLOOR, 8 - goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 - end - -LilycoveCity_DepartmentStoreElevator_EventScript_2207E0:: @ 82207E0 - special sub_8139C10 - release - end - -LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5 - special sub_8139C10 - closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_2725AA - waitmovement 0 - waitse - special sub_8139A78 - waitstate - setflag FLAG_0x002 - return - -LilycoveCity_DepartmentStoreElevator_EventScript_2207FC:: @ 82207FC - special sub_8139994 - return - diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc deleted file mode 100644 index da97bbf81..000000000 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ /dev/null @@ -1,238 +0,0 @@ -LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 8220207 - map_script 3, LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D - .byte 0 - -LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D: @ 822020D - getpricereduction 3 - compare VAR_RESULT, 1 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220227 - compare VAR_RESULT, 0 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_22022B - end - -LilycoveCity_DepartmentStoreRooftop_EventScript_220227:: @ 8220227 - clearflag FLAG_0x3C2 - return - -LilycoveCity_DepartmentStoreRooftop_EventScript_22022B:: @ 822022B - setflag FLAG_0x3C2 - return - -LilycoveCity_DepartmentStoreRooftop_EventScript_22022F:: @ 822022F - lock - faceplayer - message gUnknown_08272A21 - waitmessage - pokemartdecoration LilycoveCity_DepartmentStoreRooftop_PokemartDecor_220248 - msgbox gUnknown_08272A3F, 4 - release - end - - .align 2 -LilycoveCity_DepartmentStoreRooftop_PokemartDecor_220248: @ 8220248 - .2byte 39 - .2byte 35 - .2byte 36 - .2byte 37 - .2byte 40 - .2byte 33 - .2byte 41 - .2byte 38 - .2byte 34 - .2byte 45 - .2byte 46 - .2byte 47 - .2byte 117 - .2byte 112 - .2byte 0 - release - end - -LilycoveCity_DepartmentStoreRooftop_EventScript_220268:: @ 8220268 - lock - faceplayer - getpricereduction 3 - compare VAR_RESULT, 1 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220282 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_220463, 4 - release - end - -LilycoveCity_DepartmentStoreRooftop_EventScript_220282:: @ 8220282 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2204C9, 4 - release - end - -LilycoveCity_DepartmentStoreRooftop_EventScript_22028C:: @ 822028C - msgbox LilycoveCity_DepartmentStoreRooftop_Text_220552, 2 - end - -LilycoveCity_DepartmentStoreRooftop_EventScript_220295:: @ 8220295 - lockall - message LilycoveCity_DepartmentStoreRooftop_Text_22056D - waitmessage - showmoneybox 0, 0, 0 - goto LilycoveCity_DepartmentStoreRooftop_EventScript_2202A6 - end - -LilycoveCity_DepartmentStoreRooftop_EventScript_2202A6:: @ 82202A6 - multichoice 16, 0, 42, 0 - copyvar VAR_TEMP_1, VAR_RESULT - switch VAR_TEMP_1 - case 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2202E4 - case 1, LilycoveCity_DepartmentStoreRooftop_EventScript_2202EF - case 2, LilycoveCity_DepartmentStoreRooftop_EventScript_2202FA - msgbox LilycoveCity_DepartmentStoreRooftop_Text_220603, 4 - goto LilycoveCity_DepartmentStoreRooftop_EventScript_22045E - end - -LilycoveCity_DepartmentStoreRooftop_EventScript_2202E4:: @ 82202E4 - setvar VAR_TEMP_0, 26 - goto LilycoveCity_DepartmentStoreRooftop_EventScript_22032F - end - -LilycoveCity_DepartmentStoreRooftop_EventScript_2202EF:: @ 82202EF - setvar VAR_TEMP_0, 27 - goto LilycoveCity_DepartmentStoreRooftop_EventScript_22032F - end - -LilycoveCity_DepartmentStoreRooftop_EventScript_2202FA:: @ 82202FA - setvar VAR_TEMP_0, 28 - goto LilycoveCity_DepartmentStoreRooftop_EventScript_22032F - end - -LilycoveCity_DepartmentStoreRooftop_EventScript_220305:: @ 8220305 - checkmoney 0xc8, 0 - return - -LilycoveCity_DepartmentStoreRooftop_EventScript_22030C:: @ 822030C - checkmoney 0x12c, 0 - return - -LilycoveCity_DepartmentStoreRooftop_EventScript_220313:: @ 8220313 - checkmoney 0x15e, 0 - return - -LilycoveCity_DepartmentStoreRooftop_EventScript_22031A:: @ 822031A - takemoney 0xc8, 0 - return - -LilycoveCity_DepartmentStoreRooftop_EventScript_220321:: @ 8220321 - takemoney 0x12c, 0 - return - -LilycoveCity_DepartmentStoreRooftop_EventScript_220328:: @ 8220328 - takemoney 0x15e, 0 - return - -LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F - compare VAR_TEMP_1, 0 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220305 - compare VAR_TEMP_1, 1 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_22030C - compare VAR_TEMP_1, 2 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220313 - compare VAR_RESULT, 0 - goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220442 - checkitemspace VAR_TEMP_0, 1 - compare VAR_RESULT, 0 - goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 - compare VAR_TEMP_1, 0 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_22031A - compare VAR_TEMP_1, 1 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220321 - compare VAR_TEMP_1, 2 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220328 - updatemoneybox 0, 0 - nop - bufferitemname 0, VAR_TEMP_0 - playse SE_JIHANKI - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205A1, 4 - giveitem VAR_TEMP_0, 1 - bufferitemname 1, VAR_TEMP_0 - bufferstdstring 2, 14 - msgbox gUnknown_08272A9A, 4 - random 64 - compare VAR_RESULT, 0 - goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_220436 - checkitemspace VAR_TEMP_0, 1 - compare VAR_RESULT, 0 - goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 - playse SE_JIHANKI - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, 4 - giveitem VAR_TEMP_0, 1 - bufferitemname 1, VAR_TEMP_0 - bufferstdstring 2, 14 - msgbox gUnknown_08272A9A, 4 - random 64 - compare VAR_RESULT, 0 - goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_220436 - checkitemspace VAR_TEMP_0, 1 - compare VAR_RESULT, 0 - goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 - playse SE_JIHANKI - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, 4 - giveitem VAR_TEMP_0, 1 - bufferitemname 1, VAR_TEMP_0 - bufferstdstring 2, 14 - msgbox gUnknown_08272A9A, 4 - goto LilycoveCity_DepartmentStoreRooftop_EventScript_220436 - end - -LilycoveCity_DepartmentStoreRooftop_EventScript_220436:: @ 8220436 - message LilycoveCity_DepartmentStoreRooftop_Text_22056D - waitmessage - goto LilycoveCity_DepartmentStoreRooftop_EventScript_2202A6 - end - -LilycoveCity_DepartmentStoreRooftop_EventScript_220442:: @ 8220442 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205F1, 4 - goto LilycoveCity_DepartmentStoreRooftop_EventScript_22045E - end - -LilycoveCity_DepartmentStoreRooftop_EventScript_220450:: @ 8220450 - msgbox gUnknown_08272A89, 4 - goto LilycoveCity_DepartmentStoreRooftop_EventScript_22045E - end - -LilycoveCity_DepartmentStoreRooftop_EventScript_22045E:: @ 822045E - hidemoneybox - nop - nop - releaseall - end - -LilycoveCity_DepartmentStoreRooftop_Text_220463: @ 8220463 - .string "Don’t they have set dates for their\n" - .string "clear-out sales?\p" - .string "I watch TV, but they never show any\n" - .string "commercials.$" - -LilycoveCity_DepartmentStoreRooftop_Text_2204C9: @ 82204C9 - .string "Yes! I’ve been waiting a long time for\n" - .string "this clear-out sale.\p" - .string "They have items that you can only get\n" - .string "here. I’m going to load up, that I am!$" - -LilycoveCity_DepartmentStoreRooftop_Text_220552: @ 8220552 - .string "Ohh… I’m bone-dry thirsty!$" - -LilycoveCity_DepartmentStoreRooftop_Text_22056D: @ 822056D - .string "It’s a VENDING MACHINE.\n" - .string "Which drink would you like?$" - -LilycoveCity_DepartmentStoreRooftop_Text_2205A1: @ 82205A1 - .string "Clang!\p" - .string "A can of {STR_VAR_1} dropped down.$" - -LilycoveCity_DepartmentStoreRooftop_Text_2205C2: @ 82205C2 - .string "Clang!\p" - .string "Score! An extra can of {STR_VAR_1}\n" - .string "dropped down!$" - -LilycoveCity_DepartmentStoreRooftop_Text_2205F1: @ 82205F1 - .string "Not enough money…$" - -LilycoveCity_DepartmentStoreRooftop_Text_220603: @ 8220603 - .string "Decided against buying a drink.$" - diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc deleted file mode 100644 index 8de2d5d6f..000000000 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ /dev/null @@ -1,193 +0,0 @@ -LilycoveCity_DepartmentStore_1F_MapScripts:: @ 821F692 - .byte 0 - -LilycoveCity_DepartmentStore_1F_EventScript_21F693:: @ 821F693 - msgbox LilycoveCity_DepartmentStore_1F_Text_21F866, 2 - end - -LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C - lock - faceplayer - dodailyevents - compare VAR_POKELOT_PRIZE, 0 - goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_21F7F7 - checkflag FLAG_0x92A - goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F78D - msgbox LilycoveCity_DepartmentStore_1F_Text_2A6390, 5 - compare VAR_RESULT, 0 - goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F797 - setflag FLAG_0x92A - message LilycoveCity_DepartmentStore_1F_Text_2A64C8 - waitmessage - special RetrieveLotteryNumber - copyvar VAR_0x8008, VAR_RESULT - special sub_81397C4 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A650B, 4 - applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_2725A8 - waitmovement 0 - playse SE_PC_ON - special DoLotteryCornerComputerEffect - special PickLotteryCornerTicket - delay 220 - special EndLotteryCornerComputerEffect - delay 10 - applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_27259E - waitmovement 0 - compare VAR_0x8004, 0 - goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7A1 - incrementgamestat 46 - compare VAR_0x8006, 0 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F77B - compare VAR_0x8006, 1 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F784 - bufferitemname 0, VAR_0x8005 - compare VAR_0x8004, 1 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F7B9 - compare VAR_0x8004, 2 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F7C2 - compare VAR_0x8004, 3 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F7CB - compare VAR_0x8004, 4 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F7D4 - giveitem_std VAR_0x8005 - compare VAR_RESULT, 0 - goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7DD - special sub_80EE2CC - goto LilycoveCity_DepartmentStore_1F_EventScript_21F7AF - end - -LilycoveCity_DepartmentStore_1F_EventScript_21F77B:: @ 821F77B - msgbox LilycoveCity_DepartmentStore_1F_Text_2A6592, 4 - return - -LilycoveCity_DepartmentStore_1F_EventScript_21F784:: @ 821F784 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A65E6, 4 - return - -LilycoveCity_DepartmentStore_1F_EventScript_21F78D:: @ 821F78D - msgbox LilycoveCity_DepartmentStore_1F_Text_2A6496, 4 - release - end - -LilycoveCity_DepartmentStore_1F_EventScript_21F797:: @ 821F797 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A64B1, 4 - release - end - -LilycoveCity_DepartmentStore_1F_EventScript_21F7A1:: @ 821F7A1 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A663C, 4 - goto LilycoveCity_DepartmentStore_1F_EventScript_21F7AF - end - -LilycoveCity_DepartmentStore_1F_EventScript_21F7AF:: @ 821F7AF - msgbox LilycoveCity_DepartmentStore_1F_Text_2A6831, 4 - release - end - -LilycoveCity_DepartmentStore_1F_EventScript_21F7B9:: @ 821F7B9 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A6664, 4 - return - -LilycoveCity_DepartmentStore_1F_EventScript_21F7C2:: @ 821F7C2 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A66A7, 4 - return - -LilycoveCity_DepartmentStore_1F_EventScript_21F7CB:: @ 821F7CB - msgbox LilycoveCity_DepartmentStore_1F_Text_2A66ED, 4 - return - -LilycoveCity_DepartmentStore_1F_EventScript_21F7D4:: @ 821F7D4 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A6731, 4 - return - -LilycoveCity_DepartmentStore_1F_EventScript_21F7DD:: @ 821F7DD - copyvar VAR_0x404D, VAR_0x8004 - copyvar VAR_POKELOT_PRIZE, VAR_0x8005 - goto LilycoveCity_DepartmentStore_1F_EventScript_21F7ED - end - -LilycoveCity_DepartmentStore_1F_EventScript_21F7ED:: @ 821F7ED - msgbox LilycoveCity_DepartmentStore_1F_Text_2A678C, 4 - release - end - -LilycoveCity_DepartmentStore_1F_EventScript_21F7F7:: @ 821F7F7 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A67E1, 4 - giveitem_std VAR_POKELOT_PRIZE - compare VAR_RESULT, 0 - goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7ED - copyvar VAR_0x8004, VAR_0x404D - copyvar VAR_0x8005, VAR_POKELOT_PRIZE - special sub_80EE2CC - setvar VAR_POKELOT_PRIZE, 0 - setvar VAR_0x404D, 0 - release - end - -LilycoveCity_DepartmentStore_1F_EventScript_21F82F:: @ 821F82F - msgbox LilycoveCity_DepartmentStore_1F_Text_21F88C, 2 - end - -LilycoveCity_DepartmentStore_1F_EventScript_21F838:: @ 821F838 - msgbox LilycoveCity_DepartmentStore_1F_Text_21F8F5, 2 - end - -LilycoveCity_DepartmentStore_1F_EventScript_21F841:: @ 821F841 - msgbox LilycoveCity_DepartmentStore_1F_Text_21F92B, 2 - end - -LilycoveCity_DepartmentStore_1F_EventScript_21F84A:: @ 821F84A - lock - faceplayer - waitse - playmoncry SPECIES_AZUMARILL, 0 - msgbox LilycoveCity_DepartmentStore_1F_Text_21F974, 4 - waitmoncry - release - end - -LilycoveCity_DepartmentStore_1F_EventScript_21F85D:: @ 821F85D - msgbox LilycoveCity_DepartmentStore_1F_Text_21F98A, 3 - end - -LilycoveCity_DepartmentStore_1F_Text_21F866: @ 821F866 - .string "Welcome to LILYCOVE DEPARTMENT STORE.$" - -LilycoveCity_DepartmentStore_1F_Text_21F88C: @ 821F88C - .string "Whenever I come to the DEPARTMENT\n" - .string "STORE, I always end up buying all sorts\l" - .string "of things because it’s so fun.$" - -LilycoveCity_DepartmentStore_1F_Text_21F8F5: @ 821F8F5 - .string "Today, my mom is going to buy me some\n" - .string "nice furniture.$" - -LilycoveCity_DepartmentStore_1F_Text_21F92B: @ 821F92B - .string "I’m buying something for my AZUMARILL\n" - .string "as a reward for winning a CONTEST.$" - -LilycoveCity_DepartmentStore_1F_Text_21F974: @ 821F974 - .string "AZUMARILL: Maririroo!$" - -LilycoveCity_DepartmentStore_1F_Text_21F98A: @ 821F98A - .string "1F: SERVICE COUNTER\n" - .string " LOTTERY CORNER\p" - .string "2F: TRAINER’S ZONE\p" - .string "3F: BATTLE COLLECTION\p" - .string "4F: TM CORNER\p" - .string "5F: POKé DOLL FLOOR\p" - .string "ROOFTOP: ROOFTOP PLAZA$" - -LilycoveCity_DepartmentStore_1F_Text_21FA13: @ 821FA13 - .string "Wireless Communication is a\n" - .string "lot of fun, isn’t it?\p" - .string "I think it lets you do things that\n" - .string "weren’t possible before.\p" - .string "For instance, you can now trade\n" - .string "with people you couldn’t before.\p" - .string "I think it’s going to be exciting!$" - -LilycoveCity_DepartmentStore_1F_Text_21FAE5: @ 821FAE5 - .string "I want to spread the word about how\n" - .string "fun Wireless Communication can be.$" - diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc deleted file mode 100644 index 8bc6d8b29..000000000 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc +++ /dev/null @@ -1,80 +0,0 @@ -LilycoveCity_DepartmentStore_2F_MapScripts:: @ 821FB2C - .byte 0 - -LilycoveCity_DepartmentStore_2F_EventScript_21FB2D:: @ 821FB2D - msgbox LilycoveCity_DepartmentStore_2F_Text_21FBAC, 2 - end - -LilycoveCity_DepartmentStore_2F_EventScript_21FB36:: @ 821FB36 - msgbox LilycoveCity_DepartmentStore_2F_Text_21FBDF, 2 - end - -LilycoveCity_DepartmentStore_2F_EventScript_21FB3F:: @ 821FB3F - msgbox LilycoveCity_DepartmentStore_2F_Text_21FC23, 2 - end - -LilycoveCity_DepartmentStore_2F_EventScript_21FB48:: @ 821FB48 - lock - faceplayer - message gUnknown_08272A21 - waitmessage - pokemart LilycoveCity_DepartmentStore_2F_Pokemart_21FB60 - msgbox gUnknown_08272A3F, 4 - release - end - - .align 2 -LilycoveCity_DepartmentStore_2F_Pokemart_21FB60: @ 821FB60 - .2byte ITEM_POKE_BALL - .2byte ITEM_GREAT_BALL - .2byte ITEM_ULTRA_BALL - .2byte ITEM_ESCAPE_ROPE - .2byte ITEM_FULL_HEAL - .2byte ITEM_ANTIDOTE - .2byte ITEM_PARALYZE_HEAL - .2byte ITEM_BURN_HEAL - .2byte ITEM_ICE_HEAL - .2byte ITEM_AWAKENING - .2byte ITEM_FLUFFY_TAIL - .2byte ITEM_NONE - release - end - -LilycoveCity_DepartmentStore_2F_EventScript_21FB7A:: @ 821FB7A - lock - faceplayer - message gUnknown_08272A21 - waitmessage - pokemart LilycoveCity_DepartmentStore_2F_Pokemart_21FB94 - msgbox gUnknown_08272A3F, 4 - release - end - - .align 2 -LilycoveCity_DepartmentStore_2F_Pokemart_21FB94: @ 821FB94 - .2byte ITEM_POTION - .2byte ITEM_SUPER_POTION - .2byte ITEM_HYPER_POTION - .2byte ITEM_MAX_POTION - .2byte ITEM_REVIVE - .2byte ITEM_REPEL - .2byte ITEM_SUPER_REPEL - .2byte ITEM_MAX_REPEL - .2byte ITEM_WAVE_MAIL - .2byte ITEM_MECH_MAIL - .2byte ITEM_NONE - release - end - -LilycoveCity_DepartmentStore_2F_Text_21FBAC: @ 821FBAC - .string "Learn to use items properly.\n" - .string "That’s basic, really.$" - -LilycoveCity_DepartmentStore_2F_Text_21FBDF: @ 821FBDF - .string "My husband is waiting at home.\n" - .string "What would make a good gift for him?$" - -LilycoveCity_DepartmentStore_2F_Text_21FC23: @ 821FC23 - .string "I’m leaving on a long journey soon.\n" - .string "I need to stock up on items.$" - diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc deleted file mode 100644 index 1d980f83e..000000000 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc +++ /dev/null @@ -1,75 +0,0 @@ -LilycoveCity_DepartmentStore_3F_MapScripts:: @ 821FC64 - .byte 0 - -LilycoveCity_DepartmentStore_3F_EventScript_21FC65:: @ 821FC65 - lock - faceplayer - message gUnknown_08272A21 - waitmessage - pokemart LilycoveCity_DepartmentStore_3F_Pokemart_21FC7C - msgbox gUnknown_08272A3F, 4 - release - end - -LilycoveCity_DepartmentStore_3F_Pokemart_21FC7C: @ 821FC7C - .2byte ITEM_PROTEIN - .2byte ITEM_CALCIUM - .2byte ITEM_IRON - .2byte ITEM_ZINC - .2byte ITEM_CARBOS - .2byte ITEM_HP_UP - .2byte ITEM_NONE - release - end - -LilycoveCity_DepartmentStore_3F_EventScript_21FC8C:: @ 821FC8C - lock - faceplayer - message gUnknown_08272A21 - waitmessage - pokemart LilycoveCity_DepartmentStore_3F_Pokemart_21FCA4 - msgbox gUnknown_08272A3F, 4 - release - end - - .align 2 -LilycoveCity_DepartmentStore_3F_Pokemart_21FCA4: @ 821FCA4 - .2byte ITEM_X_SPEED - .2byte ITEM_X_SPECIAL - .2byte ITEM_X_ATTACK - .2byte ITEM_X_DEFEND - .2byte ITEM_DIRE_HIT - .2byte ITEM_GUARD_SPEC - .2byte ITEM_X_ACCURACY - .2byte ITEM_NONE - release - end - -LilycoveCity_DepartmentStore_3F_EventScript_21FCB6:: @ 821FCB6 - msgbox LilycoveCity_DepartmentStore_3F_Text_21FCD1, 2 - end - -LilycoveCity_DepartmentStore_3F_EventScript_21FCBF:: @ 821FCBF - msgbox LilycoveCity_DepartmentStore_3F_Text_21FD3B, 2 - end - -LilycoveCity_DepartmentStore_3F_EventScript_21FCC8:: @ 821FCC8 - msgbox LilycoveCity_DepartmentStore_3F_Text_21FDB4, 2 - end - -LilycoveCity_DepartmentStore_3F_Text_21FCD1: @ 821FCD1 - .string "For quickly toughening up POKéMON,\n" - .string "items are the best.\p" - .string "PROTEIN boosts ATTACK,\n" - .string "and CALCIUM raises SP. ATK.$" - -LilycoveCity_DepartmentStore_3F_Text_21FD3B: @ 821FD3B - .string "I want my POKéMON to have more\n" - .string "endurance.\p" - .string "I’m trying to decide whether to raise\n" - .string "DEFENSE with IRON, or SP. DEF with ZINC.$" - -LilycoveCity_DepartmentStore_3F_Text_21FDB4: @ 821FDB4 - .string "I gave a CARBOS to my POKéMON,\n" - .string "and its SPEED went up.$" - diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc deleted file mode 100644 index b162c4740..000000000 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc +++ /dev/null @@ -1,72 +0,0 @@ -LilycoveCity_DepartmentStore_4F_MapScripts:: @ 821FDEA - .byte 0 - -LilycoveCity_DepartmentStore_4F_EventScript_21FDEB:: @ 821FDEB - msgbox LilycoveCity_DepartmentStore_4F_Text_21FE50, 2 - end - -LilycoveCity_DepartmentStore_4F_EventScript_21FDF4:: @ 821FDF4 - msgbox LilycoveCity_DepartmentStore_4F_Text_21FEC7, 2 - end - -LilycoveCity_DepartmentStore_4F_EventScript_21FDFD:: @ 821FDFD - msgbox LilycoveCity_DepartmentStore_4F_Text_21FF2D, 2 - end - -LilycoveCity_DepartmentStore_4F_EventScript_21FE06:: @ 821FE06 - lock - faceplayer - message gUnknown_08272A21 - waitmessage - pokemart LilycoveCity_DepartmentStore_4F_Pokemart_21FE20 - msgbox gUnknown_08272A3F, 4 - release - end - - .align 2 -LilycoveCity_DepartmentStore_4F_Pokemart_21FE20: @ 821FE20 - .2byte ITEM_TM38 - .2byte ITEM_TM25 - .2byte ITEM_TM14 - .2byte ITEM_TM15 - .2byte ITEM_NONE - release - end - -LilycoveCity_DepartmentStore_4F_EventScript_21FE2C:: @ 821FE2C - lock - faceplayer - message gUnknown_08272A21 - waitmessage - pokemart LilycoveCity_DepartmentStore_4F_Pokemart_21FE44 - msgbox gUnknown_08272A3F, 4 - release - end - - .align 2 -LilycoveCity_DepartmentStore_4F_Pokemart_21FE44: @ 821FE44 - .2byte ITEM_TM17 - .2byte ITEM_TM20 - .2byte ITEM_TM33 - .2byte ITEM_TM16 - .2byte ITEM_NONE - release - end - -LilycoveCity_DepartmentStore_4F_Text_21FE50: @ 821FE50 - .string "Hmm…\p" - .string "An attacking move…\n" - .string "Or a defensive move…\p" - .string "It’s no easy matter to decide which TM\n" - .string "moves should be taught to POKéMON…$" - -LilycoveCity_DepartmentStore_4F_Text_21FEC7: @ 821FEC7 - .string "There are so many different kinds of\n" - .string "TM moves.\p" - .string "A catalog I read said there are fifty\n" - .string "different kinds.$" - -LilycoveCity_DepartmentStore_4F_Text_21FF2D: @ 821FF2D - .string "I’d like to get all the different TMs,\n" - .string "but a POKéMON learns only four moves.$" - diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc deleted file mode 100644 index d5f5e49ad..000000000 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc +++ /dev/null @@ -1,170 +0,0 @@ -LilycoveCity_DepartmentStore_5F_MapScripts:: @ 821FF7A - map_script 4, LilycoveCity_DepartmentStore_5F_MapScript2_21FF80 - .byte 0 - -LilycoveCity_DepartmentStore_5F_MapScript2_21FF80: @ 821FF80 - map_script_2 VAR_0x405E, 1, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A - map_script_2 VAR_0x405E, 2, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A - map_script_2 VAR_0x405E, 3, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A - .2byte 0 - -LilycoveCity_DepartmentStore_5F_EventScript_21FF9A:: @ 821FF9A - setobjectxy 7, 16, 2 - turnobject 7, 2 - end - -LilycoveCity_DepartmentStore_5F_EventScript_21FFA6:: @ 821FFA6 - lock - faceplayer - message gUnknown_08272A21 - waitmessage - pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_21FFC0 - msgbox gUnknown_08272A3F, 4 - release - end - - .align 2 -LilycoveCity_DepartmentStore_5F_Pokemart_21FFC0: @ 821FFC0 - .2byte ITEM_X_DEFEND - .2byte ITEM_X_SPEED - .2byte ITEM_X_ACCURACY - .2byte ITEM_SUPER_REPEL - .2byte 91 - .2byte 92 - .2byte ITEM_SUN_STONE - .2byte ITEM_MOON_STONE - .2byte ITEM_FIRE_STONE - .2byte ITEM_THUNDER_STONE - .2byte ITEM_WATER_STONE - .2byte ITEM_LEAF_STONE - .2byte ITEM_NONE - release - end - -LilycoveCity_DepartmentStore_5F_EventScript_21FFDC:: @ 821FFDC - lock - faceplayer - message gUnknown_08272A21 - waitmessage - pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_21FFF4 - msgbox gUnknown_08272A3F, 4 - release - end - - .align 2 -LilycoveCity_DepartmentStore_5F_Pokemart_21FFF4: @ 821FFF4 - .2byte 101 - .2byte 102 - .2byte ITEM_BIG_MUSHROOM - .2byte 105 - .2byte ITEM_PEARL - .2byte ITEM_BIG_PEARL - .2byte ITEM_STARDUST - .2byte ITEM_STAR_PIECE - .2byte ITEM_NUGGET - .2byte ITEM_NONE - release - end - -LilycoveCity_DepartmentStore_5F_EventScript_22000A:: @ 822000A - lock - faceplayer - message gUnknown_08272A21 - waitmessage - pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_220024 - msgbox gUnknown_08272A3F, 4 - release - end - - .align 2 -LilycoveCity_DepartmentStore_5F_Pokemart_220024: @ 8220024 - .2byte ITEM_CARBOS - .2byte ITEM_CALCIUM - .2byte ITEM_RARE_CANDY - .2byte ITEM_PP_UP - .2byte ITEM_ZINC - .2byte ITEM_PP_MAX - .2byte 72 - .2byte ITEM_GUARD_SPEC - .2byte ITEM_DIRE_HIT - .2byte ITEM_NONE - release - end - -LilycoveCity_DepartmentStore_5F_EventScript_22003A:: @ 822003A - lock - faceplayer - message gUnknown_08272A21 - waitmessage - pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_220054 - msgbox gUnknown_08272A3F, 4 - release - end - - .align 2 -LilycoveCity_DepartmentStore_5F_Pokemart_220054: @ 8220054 - .2byte 59 - .2byte 60 - .2byte 61 - .2byte 62 - .2byte ITEM_HP_UP - .2byte ITEM_PROTEIN - .2byte ITEM_IRON - .2byte ITEM_RED_SHARD - .2byte ITEM_BLUE_SHARD - .2byte ITEM_YELLOW_SHARD - .2byte ITEM_NONE - release - end - -LilycoveCity_DepartmentStore_5F_EventScript_22006C:: @ 822006C - msgbox LilycoveCity_DepartmentStore_5F_Text_2200C5, 2 - end - -LilycoveCity_DepartmentStore_5F_EventScript_220075:: @ 8220075 - lockall - applymovement 7, LilycoveCity_DepartmentStore_5F_Movement_27259E - waitmovement 0 - compare VAR_0x405E, 0 - goto_eq LilycoveCity_DepartmentStore_5F_EventScript_22009C - compare VAR_0x405E, 4 - goto_if 4, LilycoveCity_DepartmentStore_5F_EventScript_22009C - goto LilycoveCity_DepartmentStore_5F_EventScript_2200A7 - end - -LilycoveCity_DepartmentStore_5F_EventScript_22009C:: @ 822009C - msgbox LilycoveCity_DepartmentStore_5F_Text_22016B, 4 - closemessage - releaseall - end - -LilycoveCity_DepartmentStore_5F_EventScript_2200A7:: @ 82200A7 - msgbox LilycoveCity_DepartmentStore_5F_Text_2201C4, 4 - closemessage - applymovement 7, LilycoveCity_DepartmentStore_5F_Movement_2725A6 - waitmovement 0 - releaseall - end - -LilycoveCity_DepartmentStore_5F_EventScript_2200BC:: @ 82200BC - msgbox LilycoveCity_DepartmentStore_5F_Text_220122, 2 - end - -LilycoveCity_DepartmentStore_5F_Text_2200C5: @ 82200C5 - .string "This place is full of cute DOLLS.\p" - .string "I should buy some for me, instead of\n" - .string "just for my children.$" - -LilycoveCity_DepartmentStore_5F_Text_220122: @ 8220122 - .string "I’m not big enough to raise POKéMON,\n" - .string "so I’m getting a cute DOLL instead.$" - -LilycoveCity_DepartmentStore_5F_Text_22016B: @ 822016B - .string "They sell many cute MATS here.\p" - .string "I wonder which one I should get?\n" - .string "Maybe I’ll buy them all…$" - -LilycoveCity_DepartmentStore_5F_Text_2201C4: @ 82201C4 - .string "I think they closed the rooftop\n" - .string "because the weather is wild today.$" - diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc deleted file mode 100644 index 1dfd9c29a..000000000 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ /dev/null @@ -1,630 +0,0 @@ -LilycoveCity_Harbor_MapScripts:: @ 821E000 - map_script 3, LilycoveCity_Harbor_MapScript1_21E006 - .byte 0 - -LilycoveCity_Harbor_MapScript1_21E006: @ 821E006 - setescapewarp MAP_LILYCOVE_CITY, 255, 12, 33 - end - -LilycoveCity_Harbor_EventScript_21E00F:: @ 821E00F - lock - faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, LilycoveCity_Harbor_EventScript_21E54D - call LilycoveCity_Harbor_EventScript_21E194 - call LilycoveCity_Harbor_EventScript_21E1C6 - call LilycoveCity_Harbor_EventScript_21E1F8 - call LilycoveCity_Harbor_EventScript_21E22A - call LilycoveCity_Harbor_EventScript_21E25C - call LilycoveCity_Harbor_EventScript_21E2A6 - compare VAR_TEMP_C, 2 - goto_eq LilycoveCity_Harbor_EventScript_21E350 - compare VAR_TEMP_B, 1 - goto_eq LilycoveCity_Harbor_EventScript_21E2F0 - compare VAR_TEMP_B, 2 - goto_eq LilycoveCity_Harbor_EventScript_21E320 - compare VAR_TEMP_B, 4 - goto_eq LilycoveCity_Harbor_EventScript_21E350 - compare VAR_TEMP_B, 8 - goto_eq LilycoveCity_Harbor_EventScript_21E41D - compare VAR_TEMP_B, 0 - goto_if 5, LilycoveCity_Harbor_EventScript_21E44D - goto LilycoveCity_Harbor_EventScript_21E080 - end - -LilycoveCity_Harbor_EventScript_21E080:: @ 821E080 - compare VAR_TEMP_A, 0 - goto_eq LilycoveCity_Harbor_EventScript_21E557 - msgbox LilycoveCity_Harbor_Text_21E758, 4 - message LilycoveCity_Harbor_Text_21E7ED - waitmessage - goto LilycoveCity_Harbor_EventScript_21E09F - end - -LilycoveCity_Harbor_EventScript_21E09F:: @ 821E09F - setvar VAR_0x8004, 0 - special sub_80E2548 - waitstate - special sub_80E2878 - switch VAR_RESULT - case 0, LilycoveCity_Harbor_EventScript_21E149 - case 1, LilycoveCity_Harbor_EventScript_21E171 - case 2, LilycoveCity_Harbor_EventScript_21E109 - case 3, LilycoveCity_Harbor_EventScript_21E119 - case 4, LilycoveCity_Harbor_EventScript_21E129 - case 5, LilycoveCity_Harbor_EventScript_21E139 - case 6, LilycoveCity_Harbor_EventScript_21E626 - case 127, LilycoveCity_Harbor_EventScript_21E626 - end - -LilycoveCity_Harbor_EventScript_21E109:: @ 821E109 - call LilycoveCity_Harbor_EventScript_21E5CC - warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22 - waitstate - release - end - -LilycoveCity_Harbor_EventScript_21E119:: @ 821E119 - call LilycoveCity_Harbor_EventScript_21E5CC - warp MAP_NAVEL_ROCK_HARBOR, 255, 8, 4 - waitstate - release - end - -LilycoveCity_Harbor_EventScript_21E129:: @ 821E129 - call LilycoveCity_Harbor_EventScript_21E5CC - warp MAP_BIRTH_ISLAND_HARBOR, 255, 8, 4 - waitstate - release - end - -LilycoveCity_Harbor_EventScript_21E139:: @ 821E139 - call LilycoveCity_Harbor_EventScript_21E5CC - warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38 - waitstate - release - end - -LilycoveCity_Harbor_EventScript_21E149:: @ 821E149 - msgbox LilycoveCity_Harbor_Text_21E864, 5 - compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_21E5C0 - setvar VAR_PORTHOLE, 5 - call LilycoveCity_Harbor_EventScript_21E5CC - warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 - waitstate - release - end - -LilycoveCity_Harbor_EventScript_21E171:: @ 821E171 - msgbox LilycoveCity_Harbor_Text_21E880, 5 - compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_21E5C0 - call LilycoveCity_Harbor_EventScript_21E5CC - warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 - waitstate - release - end - -LilycoveCity_Harbor_EventScript_21E194:: @ 821E194 - setvar VAR_TEMP_E, 0 - checkflag FLAG_SYS_HAS_EON_TICKET - goto_if 0, LilycoveCity_Harbor_EventScript_27374E - checkitem ITEM_EON_TICKET, 1 - compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_27374E - setvar VAR_TEMP_E, 1 - checkflag FLAG_0x1AE - goto_eq LilycoveCity_Harbor_EventScript_27374E - setvar VAR_TEMP_E, 2 - return - -LilycoveCity_Harbor_EventScript_21E1C6:: @ 821E1C6 - setvar VAR_TEMP_D, 0 - checkflag FLAG_0x8D5 - goto_if 0, LilycoveCity_Harbor_EventScript_27374E - checkitem ITEM_AURORA_TICKET, 1 - compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_27374E - setvar VAR_TEMP_D, 1 - checkflag FLAG_0x1AF - goto_eq LilycoveCity_Harbor_EventScript_27374E - setvar VAR_TEMP_D, 2 - return - -LilycoveCity_Harbor_EventScript_21E1F8:: @ 821E1F8 - setvar VAR_TEMP_C, 0 - checkflag FLAG_0x8D6 - goto_if 0, LilycoveCity_Harbor_EventScript_27374E - checkitem ITEM_OLD_SEA_MAP, 1 - compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_27374E - setvar VAR_TEMP_C, 1 - checkflag FLAG_0x1B0 - goto_eq LilycoveCity_Harbor_EventScript_27374E - setvar VAR_TEMP_C, 2 - return - -LilycoveCity_Harbor_EventScript_21E22A:: @ 821E22A - setvar VAR_TEMP_9, 0 - checkflag FLAG_0x8E0 - goto_if 0, LilycoveCity_Harbor_EventScript_27374E - checkitem ITEM_MYSTIC_TICKET, 1 - compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_27374E - setvar VAR_TEMP_9, 1 - checkflag FLAG_0x1DB - goto_eq LilycoveCity_Harbor_EventScript_27374E - setvar VAR_TEMP_9, 2 - return - -LilycoveCity_Harbor_EventScript_21E25C:: @ 821E25C - setvar VAR_TEMP_B, 0 - compare VAR_TEMP_E, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E28E - compare VAR_TEMP_D, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E294 - compare VAR_TEMP_C, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E29A - compare VAR_TEMP_9, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E2A0 - return - -LilycoveCity_Harbor_EventScript_21E28E:: @ 821E28E - addvar VAR_TEMP_B, 1 - return - -LilycoveCity_Harbor_EventScript_21E294:: @ 821E294 - addvar VAR_TEMP_B, 2 - return - -LilycoveCity_Harbor_EventScript_21E29A:: @ 821E29A - addvar VAR_TEMP_B, 4 - return - -LilycoveCity_Harbor_EventScript_21E2A0:: @ 821E2A0 - addvar VAR_TEMP_B, 8 - return - -LilycoveCity_Harbor_EventScript_21E2A6:: @ 821E2A6 - setvar VAR_TEMP_A, 0 - compare VAR_TEMP_E, 1 - call_if 1, LilycoveCity_Harbor_EventScript_21E2D8 - compare VAR_TEMP_D, 1 - call_if 1, LilycoveCity_Harbor_EventScript_21E2DE - compare VAR_TEMP_C, 1 - call_if 1, LilycoveCity_Harbor_EventScript_21E2E4 - compare VAR_TEMP_9, 1 - call_if 1, LilycoveCity_Harbor_EventScript_21E2EA - return - -LilycoveCity_Harbor_EventScript_21E2D8:: @ 821E2D8 - addvar VAR_TEMP_A, 1 - return - -LilycoveCity_Harbor_EventScript_21E2DE:: @ 821E2DE - addvar VAR_TEMP_A, 2 - return - -LilycoveCity_Harbor_EventScript_21E2E4:: @ 821E2E4 - addvar VAR_TEMP_A, 4 - return - -LilycoveCity_Harbor_EventScript_21E2EA:: @ 821E2EA - addvar VAR_TEMP_A, 8 - return - -LilycoveCity_Harbor_EventScript_21E2F0:: @ 821E2F0 - setflag FLAG_0x1AE - msgbox LilycoveCity_Harbor_Text_2A68D2, 4 - closemessage - call LilycoveCity_Harbor_EventScript_21E4EE - msgbox LilycoveCity_Harbor_Text_2A68FC, 4 - goto LilycoveCity_Harbor_EventScript_21E30F - end - -LilycoveCity_Harbor_EventScript_21E30F:: @ 821E30F - closemessage - call LilycoveCity_Harbor_EventScript_21E514 - warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22 - waitstate - release - end - -LilycoveCity_Harbor_EventScript_21E320:: @ 821E320 - setflag FLAG_0x1AF - msgbox LilycoveCity_Harbor_Text_2A68D2, 4 - closemessage - call LilycoveCity_Harbor_EventScript_21E4EE - msgbox LilycoveCity_Harbor_Text_2C6A71, 4 - goto LilycoveCity_Harbor_EventScript_21E33F - end - -LilycoveCity_Harbor_EventScript_21E33F:: @ 821E33F - closemessage - call LilycoveCity_Harbor_EventScript_21E514 - warp MAP_BIRTH_ISLAND_HARBOR, 255, 8, 4 - waitstate - release - end - -LilycoveCity_Harbor_EventScript_21E350:: @ 821E350 - setflag FLAG_0x1B0 - msgbox LilycoveCity_Harbor_Text_2A6848, 4 - closemessage - call LilycoveCity_Harbor_EventScript_21E4EE - msgbox LilycoveCity_Harbor_Text_2C68A5, 4 - closemessage - applymovement 4, LilycoveCity_Harbor_Movement_2725A6 - waitmovement 0 - playse SE_PIN - applymovement 4, LilycoveCity_Harbor_Movement_272598 - waitmovement 0 - applymovement 4, LilycoveCity_Harbor_Movement_27259A - waitmovement 0 - compare VAR_FACING, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E656 - compare VAR_FACING, 4 - call_if 1, LilycoveCity_Harbor_EventScript_21E661 - addobject 5 - compare VAR_FACING, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E675 - compare VAR_FACING, 4 - call_if 1, LilycoveCity_Harbor_EventScript_21E680 - msgbox LilycoveCity_Harbor_Text_2C6951, 4 - compare VAR_FACING, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E68B - compare VAR_FACING, 4 - call_if 1, LilycoveCity_Harbor_EventScript_21E696 - msgbox LilycoveCity_Harbor_Text_2C69AA, 4 - closemessage - compare VAR_FACING, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E6A1 - compare VAR_FACING, 4 - call_if 1, LilycoveCity_Harbor_EventScript_21E6BA - setvar VAR_0x8004, 2 - call LilycoveCity_Harbor_EventScript_2721E2 - warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38 - waitstate - release - end - -LilycoveCity_Harbor_EventScript_21E40C:: @ 821E40C - closemessage - call LilycoveCity_Harbor_EventScript_21E514 - warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38 - waitstate - release - end - -LilycoveCity_Harbor_EventScript_21E41D:: @ 821E41D - setflag FLAG_0x1DB - msgbox LilycoveCity_Harbor_Text_2A68D2, 4 - closemessage - call LilycoveCity_Harbor_EventScript_21E4EE - msgbox LilycoveCity_Harbor_Text_2C6A71, 4 - goto LilycoveCity_Harbor_EventScript_21E43C - end - -LilycoveCity_Harbor_EventScript_21E43C:: @ 821E43C - closemessage - call LilycoveCity_Harbor_EventScript_21E514 - warp MAP_NAVEL_ROCK_HARBOR, 255, 8, 4 - waitstate - release - end - -LilycoveCity_Harbor_EventScript_21E44D:: @ 821E44D - msgbox LilycoveCity_Harbor_Text_2A68D2, 4 - closemessage - call LilycoveCity_Harbor_EventScript_21E4EE - message LilycoveCity_Harbor_Text_2C6BD4 - waitmessage - setvar VAR_0x8004, 1 - special sub_80E2548 - waitstate - special sub_80E2878 - switch VAR_RESULT - case 2, LilycoveCity_Harbor_EventScript_21E30F - case 3, LilycoveCity_Harbor_EventScript_21E43C - case 4, LilycoveCity_Harbor_EventScript_21E33F - case 5, LilycoveCity_Harbor_EventScript_21E40C - case 6, LilycoveCity_Harbor_EventScript_21E4B6 - case 127, LilycoveCity_Harbor_EventScript_21E4B6 - release - end - -LilycoveCity_Harbor_EventScript_21E4B6:: @ 821E4B6 - msgbox LilycoveCity_Harbor_Text_2A6A82, 4 - closemessage - applymovement 4, LilycoveCity_Harbor_Movement_2725A6 - waitmovement 0 - delay 30 - removeobject 4 - delay 30 - applymovement 1, LilycoveCity_Harbor_Movement_2725AA - waitmovement 0 - showobjectat 1, MAP_LILYCOVE_CITY_HARBOR - delay 30 - msgbox LilycoveCity_Harbor_Text_21E842, 4 - release - end - -LilycoveCity_Harbor_EventScript_21E4EE:: @ 821E4EE - applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_2725A6 - waitmovement 0 - delay 30 - hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR - delay 60 - addobject 4 - delay 30 - applymovement 4, LilycoveCity_Harbor_Movement_27259E - waitmovement 0 - return - -LilycoveCity_Harbor_EventScript_21E514:: @ 821E514 - applymovement 4, LilycoveCity_Harbor_Movement_2725A6 - waitmovement 0 - delay 30 - removeobject 4 - 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, MAP_PETALBURG_CITY - setvar VAR_0x8004, 2 - call LilycoveCity_Harbor_EventScript_2721E2 - return - -LilycoveCity_Harbor_EventScript_21E54D:: @ 821E54D - msgbox LilycoveCity_Harbor_Text_21E6F1, 4 - release - end - -LilycoveCity_Harbor_EventScript_21E557:: @ 821E557 - msgbox LilycoveCity_Harbor_Text_21E758, 4 - message LilycoveCity_Harbor_Text_21E7ED - waitmessage - goto LilycoveCity_Harbor_EventScript_21E09F - end - -LilycoveCity_Harbor_EventScript_21E56B:: @ 821E56B - msgbox LilycoveCity_Harbor_Text_21E792, 4 - release - end - -LilycoveCity_Harbor_EventScript_21E575:: @ 821E575 - msgbox LilycoveCity_Harbor_Text_21E864, 5 - compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_21E5C0 - setvar VAR_PORTHOLE, 5 - call LilycoveCity_Harbor_EventScript_21E5CC - warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 - waitstate - release - end - -LilycoveCity_Harbor_EventScript_21E59D:: @ 821E59D - msgbox LilycoveCity_Harbor_Text_21E880, 5 - compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_21E5C0 - call LilycoveCity_Harbor_EventScript_21E5CC - warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 - waitstate - release - end - -LilycoveCity_Harbor_EventScript_21E5C0:: @ 821E5C0 - message LilycoveCity_Harbor_Text_21E8CC - waitmessage - goto LilycoveCity_Harbor_EventScript_21E09F - end - -LilycoveCity_Harbor_EventScript_21E5CC:: @ 821E5CC - msgbox LilycoveCity_Harbor_Text_21E89D, 4 - closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_2725A6 - waitmovement 0 - delay 30 - 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, MAP_PETALBURG_CITY - setvar VAR_0x8004, 2 - call LilycoveCity_Harbor_EventScript_2721E2 - return - -LilycoveCity_Harbor_EventScript_21E610:: @ 821E610 - applymovement 255, LilycoveCity_Harbor_Movement_21E630 - waitmovement 0 - return - -LilycoveCity_Harbor_EventScript_21E61B:: @ 821E61B - applymovement 255, LilycoveCity_Harbor_Movement_21E633 - waitmovement 0 - return - -LilycoveCity_Harbor_EventScript_21E626:: @ 821E626 - msgbox LilycoveCity_Harbor_Text_21E842, 4 - release - end - -LilycoveCity_Harbor_Movement_21E630: @ 821E630 - walk_right - walk_in_place_fastest_up - step_end - -LilycoveCity_Harbor_Movement_21E633: @ 821E633 - walk_up - step_end - -LilycoveCity_Harbor_Movement_21E635: @ 821E635 - walk_up - step_end - -LilycoveCity_Harbor_EventScript_21E637:: @ 821E637 - lock - faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_eq LilycoveCity_Harbor_EventScript_21E64C - msgbox LilycoveCity_Harbor_Text_21E8EE, 4 - release - end - -LilycoveCity_Harbor_EventScript_21E64C:: @ 821E64C - msgbox LilycoveCity_Harbor_Text_21E976, 4 - release - end - -LilycoveCity_Harbor_EventScript_21E656:: @ 821E656 - applymovement 4, LilycoveCity_Harbor_Movement_21E66C - waitmovement 0 - return - -LilycoveCity_Harbor_EventScript_21E661:: @ 821E661 - applymovement 4, LilycoveCity_Harbor_Movement_21E671 - waitmovement 0 - return - -LilycoveCity_Harbor_Movement_21E66C: @ 821E66C - walk_in_place_fastest_right - lock_facing_direction - walk_left - unlock_facing_direction - step_end - -LilycoveCity_Harbor_Movement_21E671: @ 821E671 - lock_facing_direction - walk_down - unlock_facing_direction - step_end - -LilycoveCity_Harbor_EventScript_21E675:: @ 821E675 - applymovement 5, LilycoveCity_Harbor_Movement_2725A4 - waitmovement 0 - return - -LilycoveCity_Harbor_EventScript_21E680:: @ 821E680 - applymovement 5, LilycoveCity_Harbor_Movement_2725AA - waitmovement 0 - return - -LilycoveCity_Harbor_EventScript_21E68B:: @ 821E68B - applymovement 5, LilycoveCity_Harbor_Movement_2725AA - waitmovement 0 - return - -LilycoveCity_Harbor_EventScript_21E696:: @ 821E696 - applymovement 5, LilycoveCity_Harbor_Movement_2725A4 - waitmovement 0 - return - -LilycoveCity_Harbor_EventScript_21E6A1:: @ 821E6A1 - applymovement 5, LilycoveCity_Harbor_Movement_21E6D3 - applymovement 255, LilycoveCity_Harbor_Movement_21E6D7 - applymovement 4, LilycoveCity_Harbor_Movement_21E6DC - waitmovement 0 - return - -LilycoveCity_Harbor_EventScript_21E6BA:: @ 821E6BA - applymovement 5, LilycoveCity_Harbor_Movement_21E6D3 - applymovement 255, LilycoveCity_Harbor_Movement_21E6E4 - applymovement 4, LilycoveCity_Harbor_Movement_21E6EA - waitmovement 0 - return - -LilycoveCity_Harbor_Movement_21E6D3: @ 821E6D3 - walk_in_place_fastest_up - delay_8 - set_invisible - step_end - -LilycoveCity_Harbor_Movement_21E6D7: @ 821E6D7 - delay_16 - walk_up - delay_16 - set_invisible - step_end - -LilycoveCity_Harbor_Movement_21E6DC: @ 821E6DC - delay_16 - delay_16 - delay_16 - walk_right - walk_in_place_fastest_up - delay_16 - set_invisible - step_end - -LilycoveCity_Harbor_Movement_21E6E4: @ 821E6E4 - delay_16 - walk_right - walk_in_place_fastest_up - delay_16 - set_invisible - step_end - -LilycoveCity_Harbor_Movement_21E6EA: @ 821E6EA - delay_16 - delay_16 - delay_16 - walk_up - delay_16 - set_invisible - step_end - -LilycoveCity_Harbor_Text_21E6F1: @ 821E6F1 - .string "I beg your pardon?\n" - .string "You’re looking for a ship?\p" - .string "I’m sorry, the ferry service isn’t\n" - .string "available at present…$" - -LilycoveCity_Harbor_Text_21E758: @ 821E758 - .string "Hello, are you here for the ferry?\n" - .string "May I see your TICKET?$" - - -LilycoveCity_Harbor_Text_21E792: @ 821E792 - .string "{PLAYER} doesn’t have the TICKET…\p" - .string "I’m terribly sorry.\p" - .string "You must have a TICKET to board\n" - .string "the ferry.$" - -LilycoveCity_Harbor_Text_21E7ED: @ 821E7ED - .string "{PLAYER} flashed the TICKET.\p" - .string "Perfect! That’s all you need!\p" - .string "And where would you like to go?$" - -LilycoveCity_Harbor_Text_21E842: @ 821E842 - .string "Please sail with us another time!$" - -LilycoveCity_Harbor_Text_21E864: @ 821E864 - .string "SLATEPORT CITY it is, then!$" - -LilycoveCity_Harbor_Text_21E880: @ 821E880 - .string "BATTLE FRONTIER it is, then!$" - -LilycoveCity_Harbor_Text_21E89D: @ 821E89D - .string "Please board the ferry and wait for\n" - .string "departure.$" - -LilycoveCity_Harbor_Text_21E8CC: @ 821E8CC - .string "Then, where would you like to go?$" - -LilycoveCity_Harbor_Text_21E8EE: @ 821E8EE - .string "Until they finish making the ferry,\n" - .string "we sailors have nothing to do…\p" - .string "I wish they’d get a move on, the folks\n" - .string "at the SHIPYARD in SLATEPORT.$" - -LilycoveCity_Harbor_Text_21E976: @ 821E976 - .string "The ferry S.S. TIDAL is finally in\n" - .string "operation.\p" - .string "The folks at the SHIPYARD in SLATEPORT\n" - .string "must’ve worked extra hard.\p" - .string "Well, it’s my turn to get busy now!$" - diff --git a/data/scripts/maps/LilycoveCity_House1.inc b/data/scripts/maps/LilycoveCity_House1.inc deleted file mode 100644 index 59418e667..000000000 --- a/data/scripts/maps/LilycoveCity_House1.inc +++ /dev/null @@ -1,26 +0,0 @@ -LilycoveCity_House1_MapScripts:: @ 821ECCD - .byte 0 - -LilycoveCity_House1_EventScript_21ECCE:: @ 821ECCE - msgbox LilycoveCity_House1_Text_21ECEA, 2 - end - -LilycoveCity_House1_EventScript_21ECD7:: @ 821ECD7 - lock - faceplayer - waitse - playmoncry SPECIES_KECLEON, 0 - msgbox LilycoveCity_House1_Text_21ED63, 4 - waitmoncry - release - end - -LilycoveCity_House1_Text_21ECEA: @ 821ECEA - .string "POKéMON are partners to people.\n" - .string "They aren’t our tools.\p" - .string "Unfortunately, there are some people\n" - .string "who fail to understand that…$" - -LilycoveCity_House1_Text_21ED63: @ 821ED63 - .string "KECLEON: Ruroro?$" - diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/scripts/maps/LilycoveCity_House2.inc deleted file mode 100644 index 486df9be0..000000000 --- a/data/scripts/maps/LilycoveCity_House2.inc +++ /dev/null @@ -1,32 +0,0 @@ -LilycoveCity_House2_MapScripts:: @ 821ED74 - .byte 0 - -LilycoveCity_House2_EventScript_21ED75:: @ 821ED75 - lock - faceplayer - checkflag FLAG_0x0EA - goto_eq LilycoveCity_House2_EventScript_21EDAC - msgbox LilycoveCity_House2_Text_21EDB6, 4 - giveitem_std ITEM_TM44 - compare VAR_RESULT, 0 - goto_eq LilycoveCity_House2_EventScript_272054 - setflag FLAG_0x0EA - msgbox LilycoveCity_House2_Text_21EDF9, 4 - release - end - -LilycoveCity_House2_EventScript_21EDAC:: @ 821EDAC - msgbox LilycoveCity_House2_Text_21EDF9, 4 - release - end - -LilycoveCity_House2_Text_21EDB6: @ 821EDB6 - .string "Huh? What? What’s that?\p" - .string "I’m not near awake yet…\n" - .string "You can have this…$" - -LilycoveCity_House2_Text_21EDF9: @ 821EDF9 - .string "Yawn…\p" - .string "Sleep is essential for good health…\n" - .string "Sleep and regain health…$" - diff --git a/data/scripts/maps/LilycoveCity_House3.inc b/data/scripts/maps/LilycoveCity_House3.inc deleted file mode 100644 index 38210196e..000000000 --- a/data/scripts/maps/LilycoveCity_House3.inc +++ /dev/null @@ -1,169 +0,0 @@ -LilycoveCity_House3_MapScripts:: @ 821EE3C - map_script 3, LilycoveCity_House3_MapScript1_21EE42 - .byte 0 - -LilycoveCity_House3_MapScript1_21EE42: @ 821EE42 - random 4 - copyvar VAR_TEMP_1, VAR_RESULT - end - -LilycoveCity_House3_EventScript_21EE4B:: @ 821EE4B - lock - faceplayer - msgbox LilycoveCity_House3_Text_21EF99, 5 - compare VAR_RESULT, 0 - goto_eq LilycoveCity_House3_EventScript_21EE75 - msgbox LilycoveCity_House3_Text_21F0F8, 4 - closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 - waitmovement 0 - release - end - -LilycoveCity_House3_EventScript_21EE75:: @ 821EE75 - msgbox LilycoveCity_House3_Text_21F0A9, 4 - closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 - waitmovement 0 - release - end - -LilycoveCity_House3_EventScript_21EE8A:: @ 821EE8A - lock - faceplayer - msgbox LilycoveCity_House3_Text_21F430, 4 - closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 - waitmovement 0 - release - end - -LilycoveCity_House3_EventScript_21EEA1:: @ 821EEA1 - lock - faceplayer - switch VAR_TEMP_1 - case 0, LilycoveCity_House3_EventScript_21EF71 - case 1, LilycoveCity_House3_EventScript_21EF7B - case 2, LilycoveCity_House3_EventScript_21EF85 - case 3, LilycoveCity_House3_EventScript_21EF8F - end - -LilycoveCity_House3_EventScript_21EED5:: @ 821EED5 - lock - faceplayer - switch VAR_TEMP_1 - case 0, LilycoveCity_House3_EventScript_21EF71 - case 1, LilycoveCity_House3_EventScript_21EF7B - case 2, LilycoveCity_House3_EventScript_21EF85 - case 3, LilycoveCity_House3_EventScript_21EF8F - end - -LilycoveCity_House3_EventScript_21EF09:: @ 821EF09 - lock - faceplayer - switch VAR_TEMP_1 - case 0, LilycoveCity_House3_EventScript_21EF71 - case 1, LilycoveCity_House3_EventScript_21EF7B - case 2, LilycoveCity_House3_EventScript_21EF85 - case 3, LilycoveCity_House3_EventScript_21EF8F - end - -LilycoveCity_House3_EventScript_21EF3D:: @ 821EF3D - lock - faceplayer - switch VAR_TEMP_1 - case 0, LilycoveCity_House3_EventScript_21EF71 - case 1, LilycoveCity_House3_EventScript_21EF7B - case 2, LilycoveCity_House3_EventScript_21EF85 - case 3, LilycoveCity_House3_EventScript_21EF8F - end - -LilycoveCity_House3_EventScript_21EF71:: @ 821EF71 - msgbox LilycoveCity_House3_Text_21F4A7, 4 - release - end - -LilycoveCity_House3_EventScript_21EF7B:: @ 821EF7B - msgbox LilycoveCity_House3_Text_21F4E0, 4 - release - end - -LilycoveCity_House3_EventScript_21EF85:: @ 821EF85 - msgbox LilycoveCity_House3_Text_21F523, 4 - release - end - -LilycoveCity_House3_EventScript_21EF8F:: @ 821EF8F - msgbox LilycoveCity_House3_Text_21F55A, 4 - release - end - -LilycoveCity_House3_Text_21EF99: @ 821EF99 - .string "Oh, my, my! Are you traveling alone?\n" - .string "But you’re so young! Good for you!\p" - .string "I’m sure my kids could learn a thing\n" - .string "or two from you!\p" - .string "Me? I’m a master of {POKEBLOCK}S.\p" - .string "If I get serious just a little, why,\n" - .string "I can concoct great {POKEBLOCK}S.\p" - .string "Would you like to learn from me,\n" - .string "a master of {POKEBLOCK}S?$" - -LilycoveCity_House3_Text_21F0A9: @ 821F0A9 - .string "Oh? Are you sure?\p" - .string "You shouldn’t always try to do\n" - .string "everything by yourself, dear!$" - -LilycoveCity_House3_Text_21F0F8: @ 821F0F8 - .string "Oh, good! You’re a smart soul!\n" - .string "This is a bit long, so listen up!\p" - .string "Are you ready?\p" - .string "If you look at {POKEBLOCK}S, you should see\n" - .string "that they are rated on how they feel.\p" - .string "The lower the feel rating,\n" - .string "the better it is. Don’t forget this!\p" - .string "A good {POKEBLOCK} has a low feel\n" - .string "rating and a high level.\p" - .string "A POKéMON can eat more good\n" - .string "{POKEBLOCK}S than ordinary ones, too.\p" - .string "And this is important.\p" - .string "If you want to make smooth {POKEBLOCK}S,\n" - .string "use different kinds of BERRIES.\p" - .string "Don’t be stingy--the kinds of BERRIES\n" - .string "affect the smoothness of {POKEBLOCK}S.\p" - .string "And another thing.\p" - .string "The more people blending BERRIES,\n" - .string "the smoother the {POKEBLOCK}S.\p" - .string "That’s why you should talk to other\n" - .string "people and make {POKEBLOCK}S together.\p" - .string "That’s about all you need to know to\n" - .string "make good {POKEBLOCK}S.\p" - .string "If everyone had POKéMON they love,\n" - .string "smooth {POKEBLOCK}S, and a loving family,\l" - .string "the world would be a happier place.\p" - .string "Don’t give up, dear!$" - -LilycoveCity_House3_Text_21F430: @ 821F430 - .string "When my wife gave birth to quadruplets,\n" - .string "you bet I was shocked.\p" - .string "But, now, seeing them play together,\n" - .string "it makes me happy.$" - -LilycoveCity_House3_Text_21F4A7: @ 821F4A7 - .string "We’re having MULTI BATTLES, but I know\n" - .string "I’m going to win.$" - -LilycoveCity_House3_Text_21F4E0: @ 821F4E0 - .string "We like mixing stuff at\n" - .string "the RECORD CORNER.\p" - .string "But what gets mixed up?$" - -LilycoveCity_House3_Text_21F523: @ 821F523 - .string "We’re going to make super {POKEBLOCK}S\n" - .string "with a BERRY BLENDER!$" - -LilycoveCity_House3_Text_21F55A: @ 821F55A - .string "I want to brag about how tough my\n" - .string "POKéMON is, so we’re going to enter\l" - .string "a CONTEST together.$" - diff --git a/data/scripts/maps/LilycoveCity_House4.inc b/data/scripts/maps/LilycoveCity_House4.inc deleted file mode 100644 index 8bfdb2d48..000000000 --- a/data/scripts/maps/LilycoveCity_House4.inc +++ /dev/null @@ -1,21 +0,0 @@ -LilycoveCity_House4_MapScripts:: @ 821F5B4 - .byte 0 - -LilycoveCity_House4_EventScript_21F5B5:: @ 821F5B5 - msgbox LilycoveCity_House4_Text_21F5C7, 2 - end - -LilycoveCity_House4_EventScript_21F5BE:: @ 821F5BE - msgbox LilycoveCity_House4_Text_21F62B, 2 - end - -LilycoveCity_House4_Text_21F5C7: @ 821F5C7 - .string "This planet’s biggest mysteries are\n" - .string "at the bottom of the sea.\p" - .string "Somebody said that, but I don’t know…$" - -LilycoveCity_House4_Text_21F62B: @ 821F62B - .string "There’s a deep underwater trench\n" - .string "between MOSSDEEP and SOOTOPOLIS.\p" - .string "That’s what someone told me, anyway.$" - diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc deleted file mode 100644 index c2f3be7d6..000000000 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ /dev/null @@ -1,296 +0,0 @@ -LilycoveCity_LilycoveMuseum_1F_MapScripts:: @ 8218CB8 - .byte 0 - -LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9:: @ 8218CB9 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_218E4B, 3 - end - -LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2:: @ 8218CC2 - lockall - applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_27259E - message LilycoveCity_LilycoveMuseum_1F_Text_218EBC - waitmessage - multichoice 20, 8, 16, 1 - compare VAR_RESULT, 0 - goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218CEC - end - -LilycoveCity_LilycoveMuseum_1F_EventScript_218CEC:: @ 8218CEC - msgbox LilycoveCity_LilycoveMuseum_1F_Text_218F5C, 2 - end - -LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5:: @ 8218CF5 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_218F98, 5 - compare VAR_RESULT, 0 - goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218D14 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218D1E - end - -LilycoveCity_LilycoveMuseum_1F_EventScript_218D14:: @ 8218D14 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_218FF8, 3 - releaseall - end - -LilycoveCity_LilycoveMuseum_1F_EventScript_218D1E:: @ 8218D1E - msgbox LilycoveCity_LilycoveMuseum_1F_Text_219035, 3 - applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_218D99 - waitmovement 0 - removeobject 2 - switch VAR_FACING - case 2, LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A - case 3, LilycoveCity_LilycoveMuseum_1F_EventScript_218D6F - case 4, LilycoveCity_LilycoveMuseum_1F_EventScript_218D84 - end - -LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A:: @ 8218D5A - lockall - applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_218DA1 - waitmovement 0 - warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 - waitstate - end - -LilycoveCity_LilycoveMuseum_1F_EventScript_218D6F:: @ 8218D6F - lockall - applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_218D9B - waitmovement 0 - warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 - waitstate - end - -LilycoveCity_LilycoveMuseum_1F_EventScript_218D84:: @ 8218D84 - lockall - applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_218D9E - waitmovement 0 - warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 - waitstate - end - -LilycoveCity_LilycoveMuseum_1F_Movement_218D99: @ 8218D99 - walk_up - step_end - -LilycoveCity_LilycoveMuseum_1F_Movement_218D9B: @ 8218D9B - walk_left - walk_up - step_end - -LilycoveCity_LilycoveMuseum_1F_Movement_218D9E: @ 8218D9E - walk_right - walk_up - step_end - -LilycoveCity_LilycoveMuseum_1F_Movement_218DA1: @ 8218DA1 - walk_up - walk_up - step_end - -LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4:: @ 8218DA4 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_219080, 3 - end - -LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD:: @ 8218DAD - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2190BF, 3 - end - -LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6:: @ 8218DB6 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2190F9, 3 - end - -LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF:: @ 8218DBF - msgbox LilycoveCity_LilycoveMuseum_1F_Text_219142, 3 - end - -LilycoveCity_LilycoveMuseum_1F_EventScript_218DC8:: @ 8218DC8 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2191A2, 3 - end - -LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1:: @ 8218DD1 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_21920D, 3 - end - -LilycoveCity_LilycoveMuseum_1F_EventScript_218DDA:: @ 8218DDA -LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA:: @ 8218DDA - msgbox LilycoveCity_LilycoveMuseum_1F_Text_219260, 3 - end - -LilycoveCity_LilycoveMuseum_1F_EventScript_218DE3:: @ 8218DE3 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2192AA, 3 - end - -LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC:: @ 8218DEC - msgbox LilycoveCity_LilycoveMuseum_1F_Text_219311, 3 - end - -LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5:: @ 8218DF5 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2193B4, 2 - end - -LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE:: @ 8218DFE - msgbox LilycoveCity_LilycoveMuseum_1F_Text_21941A, 2 - end - -LilycoveCity_LilycoveMuseum_1F_EventScript_218E07:: @ 8218E07 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2194BA, 3 - end - -LilycoveCity_LilycoveMuseum_1F_EventScript_218E10:: @ 8218E10 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2194E1, 3 - end - -LilycoveCity_LilycoveMuseum_1F_EventScript_218E19:: @ 8218E19 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_219515, 2 - end - -LilycoveCity_LilycoveMuseum_1F_EventScript_218E22:: @ 8218E22 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_21959B, 2 - end - -LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B:: @ 8218E2B - lock - faceplayer - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2195FF, 4 - closemessage - applymovement 8, LilycoveCity_LilycoveMuseum_1F_Movement_2725A2 - waitmovement 0 - release - end - -LilycoveCity_LilycoveMuseum_1F_EventScript_218E42:: @ 8218E42 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_21967A, 2 - end - -LilycoveCity_LilycoveMuseum_1F_Text_218E4B: @ 8218E4B - .string "Welcome to LILYCOVE MUSEUM.\p" - .string "Please take the time to enjoy our\n" - .string "collection of fantastic artwork\l" - .string "featuring POKéMON.$" - -LilycoveCity_LilycoveMuseum_1F_Text_218EBC: @ 8218EBC - .string "I’m the CURATOR of this MUSEUM of\n" - .string "fine arts.\p" - .string "It’s heartening to see someone so\n" - .string "young as you in our MUSEUM.\p" - .string "Have you viewed our collection of\n" - .string "paintings already?$" - -LilycoveCity_LilycoveMuseum_1F_Text_218F5C: @ 8218F5C - .string "Ah, then let me not disturb you.\n" - .string "Please, do take your time.$" - -LilycoveCity_LilycoveMuseum_1F_Text_218F98: @ 8218F98 - .string "Oh? I do believe that you seem to\n" - .string "be a POKéMON TRAINER.\p" - .string "Have you an interest in paintings,\n" - .string "too?$" - -LilycoveCity_LilycoveMuseum_1F_Text_218FF8: @ 8218FF8 - .string "I see…\p" - .string "I’m honored that you would visit\n" - .string "us in spite of that.$" - -LilycoveCity_LilycoveMuseum_1F_Text_219035: @ 8219035 - .string "Ah, excellent!\n" - .string "You do like paintings!\p" - .string "Then, may I ask you to come with me?$" - -LilycoveCity_LilycoveMuseum_1F_Text_219080: @ 8219080 - .string "It’s a very old painting.\n" - .string "The paint is peeling here and there.$" - -LilycoveCity_LilycoveMuseum_1F_Text_2190BF: @ 82190BF - .string "It’s an odd landscape with bizarre\n" - .string "and fantastic scenery.$" - -LilycoveCity_LilycoveMuseum_1F_Text_2190F9: @ 82190F9 - .string "It’s a painting of a beautiful, smiling\n" - .string "woman with a POKéMON on her lap.$" - -LilycoveCity_LilycoveMuseum_1F_Text_219142: @ 8219142 - .string "It’s a painting of a legendary POKéMON\n" - .string "from long ago.\p" - .string "The artist painted this from\n" - .string "imagination.$" - -LilycoveCity_LilycoveMuseum_1F_Text_2191A2: @ 82191A2 - .string "It’s a painting of GRASS POKéMON\n" - .string "swaying in a breeze.\p" - .string "They appear to be enjoying the wind’s\n" - .string "gentle caress.$" - -LilycoveCity_LilycoveMuseum_1F_Text_21920D: @ 821920D - .string "It’s a delicious-looking painting\n" - .string "of BERRIES.\p" - .string "This painting could make you hungry!$" - -LilycoveCity_LilycoveMuseum_1F_Text_219260: @ 8219260 - .string "It’s a replica of a famous sculpture.\p" - .string "It depicts an ancient BIRD POKéMON.$" - -LilycoveCity_LilycoveMuseum_1F_Text_2192AA: @ 82192AA - .string "It’s a big POKé BALL carved from\n" - .string "a black stone.\p" - .string "It was apparently used in festivals\n" - .string "in the olden days.$" - -LilycoveCity_LilycoveMuseum_1F_Text_219311: @ 8219311 - .string "It’s a huge stone tablet inscribed\n" - .string "with POKéMON and dense text in the\l" - .string "small characters of an ancient,\l" - .string "unreadable language.$" - -LilycoveCity_LilycoveMuseum_1F_Text_21938C: @ 821938C - .string "Hmmm…\n" - .string "What works of great magnificence…$" - -LilycoveCity_LilycoveMuseum_1F_Text_2193B4: @ 82193B4 - .string "Battling with POKéMON is fun,\n" - .string "I’ll grant you that.\p" - .string "But one mustn’t forget our love for\n" - .string "the fine arts.$" - -LilycoveCity_LilycoveMuseum_1F_Text_21941A: @ 821941A - .string "This ART MUSEUM… Well, you could\n" - .string "see many fantastic paintings.\p" - .string "And the CURATOR is a wonderful person.\p" - .string "Among artists like myself, this MUSEUM\n" - .string "is an inspiration.$" - -LilycoveCity_LilycoveMuseum_1F_Text_2194BA: @ 82194BA - .string "This lady is pretty!\n" - .string "She’s like Mommy!$" - -LilycoveCity_LilycoveMuseum_1F_Text_2194E1: @ 82194E1 - .string "This POKéMON is adorable!\n" - .string "Just like our little boy!$" - -LilycoveCity_LilycoveMuseum_1F_Text_219515: @ 8219515 - .string "I’d heard that this ART MUSEUM got\n" - .string "in some new paintings.\p" - .string "So, naturally I hurried over.\p" - .string "Are the new paintings up on\n" - .string "the second floor?$" - -LilycoveCity_LilycoveMuseum_1F_Text_21959B: @ 821959B - .string "Lately, the CURATOR has been\n" - .string "unusually cheerful.\p" - .string "I bet something good happened for him.\n" - .string "Definitely.$" - -LilycoveCity_LilycoveMuseum_1F_Text_2195FF: @ 82195FF - .string "I aim to see many great paintings\n" - .string "here and learn from them.\p" - .string "I have this dream of one day having\n" - .string "my artwork exhibited here.$" - -LilycoveCity_LilycoveMuseum_1F_Text_21967A: @ 821967A - .string "The ART MUSEUM has become a favorite\n" - .string "tourist destination.\p" - .string "It’s great for LILYCOVE…\n" - .string "No, great for the HOENN region!\p" - .string "This is what I’ve heard--a lone TRAINER\n" - .string "procured all the paintings upstairs.$" - diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc deleted file mode 100644 index 6b4f0f3da..000000000 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ /dev/null @@ -1,340 +0,0 @@ -LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 821973A - map_script 1, LilycoveCity_LilycoveMuseum_2F_MapScript1_219745 - map_script 2, LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE - .byte 0 - -LilycoveCity_LilycoveMuseum_2F_MapScript1_219745: @ 8219745 - checkflag FLAG_0x0A0 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_21978B - goto LilycoveCity_LilycoveMuseum_2F_EventScript_219754 - end - -LilycoveCity_LilycoveMuseum_2F_EventScript_219754:: @ 8219754 - checkflag FLAG_0x0A1 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2197A3 - goto LilycoveCity_LilycoveMuseum_2F_EventScript_219763 - end - -LilycoveCity_LilycoveMuseum_2F_EventScript_219763:: @ 8219763 - checkflag FLAG_0x0A2 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2197BB - goto LilycoveCity_LilycoveMuseum_2F_EventScript_219772 - end - -LilycoveCity_LilycoveMuseum_2F_EventScript_219772:: @ 8219772 - checkflag FLAG_0x0A3 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2197D3 - goto LilycoveCity_LilycoveMuseum_2F_EventScript_219781 - end - -LilycoveCity_LilycoveMuseum_2F_EventScript_219781:: @ 8219781 - checkflag FLAG_0x0A4 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2197EB - end - -LilycoveCity_LilycoveMuseum_2F_EventScript_21978B:: @ 821978B - setmetatile 10, 6, 606, 1 - setmetatile 11, 6, 607, 1 - goto LilycoveCity_LilycoveMuseum_2F_EventScript_219754 - end - -LilycoveCity_LilycoveMuseum_2F_EventScript_2197A3:: @ 82197A3 - setmetatile 18, 6, 604, 1 - setmetatile 19, 6, 605, 1 - goto LilycoveCity_LilycoveMuseum_2F_EventScript_219763 - end - -LilycoveCity_LilycoveMuseum_2F_EventScript_2197BB:: @ 82197BB - setmetatile 14, 10, 608, 1 - setmetatile 15, 10, 609, 1 - goto LilycoveCity_LilycoveMuseum_2F_EventScript_219772 - end - -LilycoveCity_LilycoveMuseum_2F_EventScript_2197D3:: @ 82197D3 - setmetatile 6, 10, 602, 1 - setmetatile 7, 10, 603, 1 - goto LilycoveCity_LilycoveMuseum_2F_EventScript_219781 - end - -LilycoveCity_LilycoveMuseum_2F_EventScript_2197EB:: @ 82197EB - setmetatile 2, 6, 610, 1 - setmetatile 3, 6, 611, 1 - end - -LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE: @ 82197FE - map_script_2 VAR_0x4094, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219808 - .2byte 0 - -LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808 - lockall - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E - applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_219861 - waitmovement 0 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_2199EB, 3 - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_219863 - waitmovement 0 - applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_219863 - waitmovement 0 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219A0D, 3 - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E - waitmovement 0 - applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_219861 - waitmovement 0 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219BC4, 3 - copyvar VAR_0x4094, 0x1 - releaseall - end - -LilycoveCity_LilycoveMuseum_2F_Movement_219861: @ 8219861 - walk_in_place_fastest_left - step_end - -LilycoveCity_LilycoveMuseum_2F_Movement_219863: @ 8219863 - face_up - delay_16 - step_end - -LilycoveCity_LilycoveMuseum_2F_EventScript_219866:: @ 8219866 - lockall - checkflag FLAG_0x0EC - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_219921 - specialvar VAR_0x8004, sub_80F8940 - switch VAR_0x8004 - case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA - case 2, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA - case 3, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA - case 4, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA - case 5, LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219CF3, 2 - end - -LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA:: @ 82198BA - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219D42, 2 - end - -LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3:: @ 82198C3 - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E - waitmovement 0 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DD4, 4 - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_219863 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DE6, 4 - goto LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA - end - -LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EC5, 4 - givedecoration_std 44 - compare VAR_RESULT, 0 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_219911 - setflag FLAG_0x0EC - closemessage - releaseall - end - -LilycoveCity_LilycoveMuseum_2F_EventScript_219911:: @ 8219911 - call LilycoveCity_LilycoveMuseum_2F_EventScript_272071 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EED, 4 - closemessage - releaseall - end - -LilycoveCity_LilycoveMuseum_2F_EventScript_219921:: @ 8219921 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219F1B, 2 - releaseall - end - -LilycoveCity_LilycoveMuseum_2F_EventScript_21992B:: @ 821992B - lockall - checkflag FLAG_0x0A2 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199C1 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FA0, 3 - end - -LilycoveCity_LilycoveMuseum_2F_EventScript_21993E:: @ 821993E - lockall - checkflag FLAG_0x0A4 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199DD - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FD3, 3 - end - -LilycoveCity_LilycoveMuseum_2F_EventScript_219951:: @ 8219951 - lockall - checkflag FLAG_0x0A0 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199A5 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A03B, 3 - end - -LilycoveCity_LilycoveMuseum_2F_EventScript_219964:: @ 8219964 - lockall - checkflag FLAG_0x0A1 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199B3 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A008, 3 - end - -LilycoveCity_LilycoveMuseum_2F_EventScript_219977:: @ 8219977 - lockall - checkflag FLAG_0x0A3 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199CF - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A06D, 3 - end - -LilycoveCity_LilycoveMuseum_2F_EventScript_21998A:: @ 821998A - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0BD, 2 - end - -LilycoveCity_LilycoveMuseum_2F_EventScript_219993:: @ 8219993 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A132, 2 - end - -LilycoveCity_LilycoveMuseum_2F_EventScript_21999C:: @ 821999C - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A1A8, 2 - end - -LilycoveCity_LilycoveMuseum_2F_EventScript_2199A5:: @ 82199A5 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3 - fadescreen 1 - drawcontestwinner 9 - releaseall - end - -LilycoveCity_LilycoveMuseum_2F_EventScript_2199B3:: @ 82199B3 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3 - fadescreen 1 - drawcontestwinner 10 - releaseall - end - -LilycoveCity_LilycoveMuseum_2F_EventScript_2199C1:: @ 82199C1 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3 - fadescreen 1 - drawcontestwinner 11 - releaseall - end - -LilycoveCity_LilycoveMuseum_2F_EventScript_2199CF:: @ 82199CF - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3 - fadescreen 1 - drawcontestwinner 12 - releaseall - end - -LilycoveCity_LilycoveMuseum_2F_EventScript_2199DD:: @ 82199DD - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3 - fadescreen 1 - drawcontestwinner 13 - releaseall - end - -LilycoveCity_LilycoveMuseum_2F_Text_2199EB: @ 82199EB - .string "This is our special exhibit hall.$" - -LilycoveCity_LilycoveMuseum_2F_Text_219A0D: @ 8219A0D - .string "As you can plainly see, there is not\n" - .string "a single painting on exhibit.\p" - .string "Here, I don’t wish to exhibit works of\n" - .string "so-called classical art.\p" - .string "Such classical works you can see on\n" - .string "our ground floor.\p" - .string "I wish to exhibit work that is far\n" - .string "different from the classics.\p" - .string "Art, after all, is not restricted to old,\n" - .string "famous works!\p" - .string "This exhibit hall, I wish to fill it with…\p" - .string "Modern and vibrant artworks of\n" - .string "POKéMON seemingly ready to spring\l" - .string "forth into glorious life!$" - -LilycoveCity_LilycoveMuseum_2F_Text_219BC4: @ 8219BC4 - .string "I beg your pardon. I didn’t intend\n" - .string "to monopolize the conversation.\p" - .string "Now, as you are young, and yet\n" - .string "obviously well traveled…\p" - .string "You must encounter lively POKéMON\n" - .string "and works of art depicting them.\p" - .string "If you were to come across such\n" - .string "a painting, may we ask you to obtain\l" - .string "the artist’s permission to exhibit\l" - .string "it here?$" - -LilycoveCity_LilycoveMuseum_2F_Text_219CF3: @ 8219CF3 - .string "I wish to fill this exhibit hall with\n" - .string "modern and vibrant paintings of\l" - .string "POKéMON.$" - -LilycoveCity_LilycoveMuseum_2F_Text_219D42: @ 8219D42 - .string "Thanks to you, we’ve added a new\n" - .string "painting to our collection!\p" - .string "I’ve heard it depicts your POKéMON.\n" - .string "Truly magnificent!\p" - .string "Thank you so very, very much!$" - -LilycoveCity_LilycoveMuseum_2F_Text_219DD4: @ 8219DD4 - .string "Ah! It’s you!\n" - .string "{PLAYER}!$" - -LilycoveCity_LilycoveMuseum_2F_Text_219DE6: @ 8219DE6 - .string "Isn’t this marvelous?\n" - .string "This collection of paintings!\p" - .string "Each one of them flawless!\n" - .string "None better than another!\p" - .string "These paintings have attracted\n" - .string "more guests to our ART MUSEUM.\p" - .string "Sincerely, I thank you, {PLAYER}.\n" - .string "This is my dream come true!$" - -LilycoveCity_LilycoveMuseum_2F_Text_219EC5: @ 8219EC5 - .string "This is merely a token of my gratitude.$" - -LilycoveCity_LilycoveMuseum_2F_Text_219EED: @ 8219EED - .string "I will keep this for you until we\n" - .string "meet again.$" - -LilycoveCity_LilycoveMuseum_2F_Text_219F1B: @ 8219F1B - .string "Ah, so good to see you, {PLAYER}!\p" - .string "It’s an honor to have you visit us\n" - .string "on your busy journeys.\p" - .string "Please, relax and do enjoy your\n" - .string "visit with us.$" - -LilycoveCity_LilycoveMuseum_2F_Text_219FA0: @ 8219FA0 - .string "It’s a picture frame with pink-colored\n" - .string "adornments.$" - -LilycoveCity_LilycoveMuseum_2F_Text_219FD3: @ 8219FD3 - .string "It’s a picture frame with\n" - .string "yellow-colored adornments.$" - -LilycoveCity_LilycoveMuseum_2F_Text_21A008: @ 821A008 - .string "It’s a picture frame with\n" - .string "blue-colored adornments.$" - -LilycoveCity_LilycoveMuseum_2F_Text_21A03B: @ 821A03B - .string "It’s a picture frame with\n" - .string "red-colored adornments.$" - -LilycoveCity_LilycoveMuseum_2F_Text_21A06D: @ 821A06D - .string "It’s a picture frame with\n" - .string "green-colored adornments.$" - -LilycoveCity_LilycoveMuseum_2F_Text_21A0A1: @ 821A0A1 - .string "It’s a painting of POKéMON.$" - -LilycoveCity_LilycoveMuseum_2F_Text_21A0BD: @ 821A0BD - .string "I’ve been away awhile, so the new\n" - .string "paintings up here surprised me.\p" - .string "I wish someone would paint my POKéMON\n" - .string "this pretty.$" - -LilycoveCity_LilycoveMuseum_2F_Text_21A132: @ 821A132 - .string "Well… So this is where they show\n" - .string "the topical POKéMON paintings.\p" - .string "I see, these new paintings are indeed\n" - .string "rather amusing.$" - -LilycoveCity_LilycoveMuseum_2F_Text_21A1A8: @ 821A1A8 - .string "Wow, is that right?\n" - .string "These paintings are of your POKéMON.\p" - .string "Isn’t that just the ultimate joy for\n" - .string "a TRAINER?$" - diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc deleted file mode 100644 index 19471d2e1..000000000 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ /dev/null @@ -1,111 +0,0 @@ -LilycoveCity_MoveDeletersHouse_MapScripts:: @ 821EA0A - .byte 0 - -LilycoveCity_MoveDeletersHouse_EventScript_21EA0B:: @ 821EA0B - lockall - applymovement 1, LilycoveCity_MoveDeletersHouse_Movement_27259E - waitmovement 0 - msgbox LilycoveCity_MoveDeletersHouse_Text_21EAFD, 5 - switch VAR_RESULT - case 1, LilycoveCity_MoveDeletersHouse_EventScript_21EA3B - case 0, LilycoveCity_MoveDeletersHouse_EventScript_21EAE6 - releaseall - end - -LilycoveCity_MoveDeletersHouse_EventScript_21EA3B:: @ 821EA3B - msgbox LilycoveCity_MoveDeletersHouse_Text_21EB65, 4 - special sub_81B94B0 - waitstate - compare VAR_0x8004, 255 - goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EAE6 - special sub_81B98DC - compare VAR_RESULT, 1 - goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EADC - special sub_81B96D0 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EACF - msgbox LilycoveCity_MoveDeletersHouse_Text_21EB89, 4 - fadescreen 1 - special sub_81B968C - fadescreen 0 - compare VAR_0x8005, 4 - goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EA3B - special sub_81B9718 - msgbox LilycoveCity_MoveDeletersHouse_Text_21EBDA, 5 - switch VAR_RESULT - case 1, LilycoveCity_MoveDeletersHouse_EventScript_21EAB0 - case 0, LilycoveCity_MoveDeletersHouse_EventScript_21EAE6 - releaseall - end - -LilycoveCity_MoveDeletersHouse_EventScript_21EAB0:: @ 821EAB0 - special sub_81B9918 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EAF0 - special sub_81B9770 - playfanfare MUS_ME_WASURE - waitfanfare - msgbox LilycoveCity_MoveDeletersHouse_Text_21EC06, 4 - releaseall - end - -LilycoveCity_MoveDeletersHouse_EventScript_21EACF:: @ 821EACF - special sub_81B9718 - msgbox LilycoveCity_MoveDeletersHouse_Text_21EBA9, 4 - releaseall - end - -LilycoveCity_MoveDeletersHouse_EventScript_21EADC:: @ 821EADC - msgbox LilycoveCity_MoveDeletersHouse_Text_21EC78, 4 - releaseall - end - -LilycoveCity_MoveDeletersHouse_EventScript_21EAE6:: @ 821EAE6 - msgbox LilycoveCity_MoveDeletersHouse_Text_21EC3F, 4 - releaseall - end - -LilycoveCity_MoveDeletersHouse_EventScript_21EAF0:: @ 821EAF0 - special sub_81B9718 - msgbox LilycoveCity_MoveDeletersHouse_Text_21EC9C, 4 - releaseall - end - -LilycoveCity_MoveDeletersHouse_Text_21EAFD: @ 821EAFD - .string "Uh…\n" - .string "Oh, yes, I’m the MOVE DELETER.\p" - .string "I can make POKéMON forget their moves.\p" - .string "Would you like me to do that?$" - -LilycoveCity_MoveDeletersHouse_Text_21EB65: @ 821EB65 - .string "Which POKéMON should forget a move?$" - -LilycoveCity_MoveDeletersHouse_Text_21EB89: @ 821EB89 - .string "Which move should be forgotten?$" - -LilycoveCity_MoveDeletersHouse_Text_21EBA9: @ 821EBA9 - .string "{STR_VAR_1} knows only one move\n" - .string "so it can’t be forgotten…$" - -LilycoveCity_MoveDeletersHouse_Text_21EBDA: @ 821EBDA - .string "Hm! {STR_VAR_1}’s {STR_VAR_2}?\n" - .string "That move should be forgotten?$" - -LilycoveCity_MoveDeletersHouse_Text_21EC06: @ 821EC06 - .string "It worked to perfection!\p" - .string "{STR_VAR_1} has forgotten\n" - .string "{STR_VAR_2} completely.$" - -LilycoveCity_MoveDeletersHouse_Text_21EC3F: @ 821EC3F - .string "Come again if there are moves that\n" - .string "need to be forgotten.$" - -LilycoveCity_MoveDeletersHouse_Text_21EC78: @ 821EC78 - .string "What?\n" - .string "No EGG should know any moves.$" - -LilycoveCity_MoveDeletersHouse_Text_21EC9C: @ 821EC9C - .string "Hm!\p" - .string "Your {STR_VAR_1} doesn’t seem willing\n" - .string "to forget SURF.$" - diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc deleted file mode 100644 index b6ca09906..000000000 --- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc +++ /dev/null @@ -1,68 +0,0 @@ -LilycoveCity_PokemonCenter_1F_MapScripts:: @ 821C5B2 - map_script 3, LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD - map_script 5, LilycoveCity_PokemonCenter_1F_MapScript1_277C30 - .byte 0 - -LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD: @ 821C5BD - setrespawn 8 - goto LilycoveCity_PokemonCenter_1F_EventScript_21C5C6 - end - -LilycoveCity_PokemonCenter_1F_EventScript_21C5C6:: @ 821C5C6 - special sub_818D9C0 - compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_21C5E0 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_21C5E4 - end - -LilycoveCity_PokemonCenter_1F_EventScript_21C5E0:: @ 821C5E0 - setflag FLAG_0x3E1 - end - -LilycoveCity_PokemonCenter_1F_EventScript_21C5E4:: @ 821C5E4 - clearflag FLAG_0x3E1 - end - -LilycoveCity_PokemonCenter_1F_EventScript_21C5E8:: @ 821C5E8 - setvar VAR_0x800B, 1 - call LilycoveCity_PokemonCenter_1F_EventScript_27191E - waitmessage - waitbuttonpress - release - end - -LilycoveCity_PokemonCenter_1F_EventScript_21C5F6:: @ 821C5F6 - msgbox LilycoveCity_PokemonCenter_1F_Text_21C61E, 2 - end - -LilycoveCity_PokemonCenter_1F_EventScript_21C5FF:: @ 821C5FF - lock - faceplayer - checkflag FLAG_BADGE07_GET - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_21C614 - msgbox LilycoveCity_PokemonCenter_1F_Text_21C69D, 4 - release - end - -LilycoveCity_PokemonCenter_1F_EventScript_21C614:: @ 821C614 - msgbox LilycoveCity_PokemonCenter_1F_Text_21C6F6, 4 - release - end - -LilycoveCity_PokemonCenter_1F_Text_21C61E: @ 821C61E - .string "I wonder how many kinds of POKéMON\n" - .string "there are in the world.\p" - .string "It’d be great to cross seas and\n" - .string "trade POKéMON with people far away.$" - -LilycoveCity_PokemonCenter_1F_Text_21C69D: @ 821C69D - .string "I’ve been hearing about some rotten\n" - .string "scoundrels who steal POKéMON and rip\l" - .string "off METEORITES.$" - -LilycoveCity_PokemonCenter_1F_Text_21C6F6: @ 821C6F6 - .string "Those rotten scoundrels who steal\n" - .string "POKéMON and rip off METEORITES…\p" - .string "I haven’t seen them around recently.$" - diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc b/data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc deleted file mode 100644 index f4a25f137..000000000 --- a/data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc +++ /dev/null @@ -1,19 +0,0 @@ -LilycoveCity_PokemonCenter_2F_MapScripts:: @ 821C75D - map_script 2, LilycoveCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, LilycoveCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, LilycoveCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, LilycoveCity_PokemonCenter_2F_MapScript1_276ACF - .byte 0 - -LilycoveCity_PokemonCenter_2F_EventScript_21C772:: @ 821C772 - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 - end - -LilycoveCity_PokemonCenter_2F_EventScript_21C778:: @ 821C778 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 - end - -LilycoveCity_PokemonCenter_2F_EventScript_21C77E:: @ 821C77E - call OldaleTown_PokemonCenter_2F_EventScript_2771DB - end - diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc deleted file mode 100644 index 74146fc7e..000000000 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ /dev/null @@ -1,864 +0,0 @@ -LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 821C785 - map_script 2, LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790 - map_script 3, LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D - .byte 0 - -LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790 - map_script_2 VAR_0x4095, 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A - .2byte 0 - -LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A - lockall - applymovement 1, LilycoveCity_PokemonTrainerFanClub_Movement_2725AA - waitmovement 0 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF00, 4 - applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD - applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5 - waitmovement 0 - applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_2725A8 - waitmovement 0 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF12, 4 - applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C804 - waitmovement 0 - applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_2725A4 - waitmovement 0 - applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C807 - waitmovement 0 - setvar VAR_0x4095, 2 - releaseall - end - -LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5: @ 821C7F5 - delay_8 - walk_in_place_fastest_down - walk_down - walk_down - walk_down - walk_left - walk_left - step_end - -LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD: @ 821C7FD - 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 - walk_down - walk_in_place_fastest_right - step_end - -LilycoveCity_PokemonTrainerFanClub_Movement_21C807: @ 821C807 - 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 - call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA - compare VAR_0x4095, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F8 - compare VAR_0x4095, 2 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C829 - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21C829:: @ 821C829 - special sub_813BCE8 - call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5 - setvar VAR_0x8004, 8 - specialvar VAR_RESULT, sub_813BD60 - compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B8 - setvar VAR_0x8004, 9 - specialvar VAR_RESULT, sub_813BD60 - compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C0 - setvar VAR_0x8004, 10 - specialvar VAR_RESULT, sub_813BD60 - compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C8 - setvar VAR_0x8004, 11 - specialvar VAR_RESULT, sub_813BD60 - compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D0 - setvar VAR_0x8004, 12 - specialvar VAR_RESULT, sub_813BD60 - compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D8 - setvar VAR_0x8004, 13 - specialvar VAR_RESULT, sub_813BD60 - compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E0 - setvar VAR_0x8004, 14 - specialvar VAR_RESULT, sub_813BD60 - compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E8 - setvar VAR_0x8004, 15 - specialvar VAR_RESULT, sub_813BD60 - compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F0 - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA:: @ 821C8DA - specialvar VAR_RESULT, sub_80EE7C0 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1 - clearflag FLAG_0x2DA - clearflag FLAG_0x0D2 - return - -LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1:: @ 821C8F1 - setflag FLAG_0x2DA - return - -LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5:: @ 821C8F5 - setvar VAR_0x8005, 8 - setvar VAR_0x8004, 8 - specialvar VAR_RESULT, sub_813BD60 - compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE - setvar VAR_0x8004, 9 - specialvar VAR_RESULT, sub_813BD60 - compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE - setvar VAR_0x8004, 10 - specialvar VAR_RESULT, sub_813BD60 - compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE - setvar VAR_0x8004, 11 - specialvar VAR_RESULT, sub_813BD60 - compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE - setvar VAR_0x8004, 12 - specialvar VAR_RESULT, sub_813BD60 - compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE - setvar VAR_0x8004, 13 - specialvar VAR_RESULT, sub_813BD60 - compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE - setvar VAR_0x8004, 14 - specialvar VAR_RESULT, sub_813BD60 - compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE - setvar VAR_0x8004, 15 - specialvar VAR_RESULT, sub_813BD60 - compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE - compare VAR_0x8005, 5 - goto_if 4, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B4 - return - -LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE:: @ 821C9AE - subvar VAR_0x8005, 1 - return - -LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B4:: @ 821C9B4 - special sub_80EE72C - return - -LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B8:: @ 821C9B8 - setobjectxyperm 1, 7, 5 - return - -LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C0:: @ 821C9C0 - setobjectxyperm 3, 3, 4 - return - -LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C8:: @ 821C9C8 - setobjectxyperm 4, 7, 2 - return - -LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D0:: @ 821C9D0 - setobjectxyperm 5, 5, 5 - return - -LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D8:: @ 821C9D8 - setobjectxyperm 6, 5, 2 - return - -LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E0:: @ 821C9E0 - setobjectxyperm 2, 8, 4 - return - -LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E8:: @ 821C9E8 - setobjectxyperm 7, 3, 3 - return - -LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F0:: @ 821C9F0 - setobjectxyperm 8, 8, 3 - return - -LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F8:: @ 821C9F8 - call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5 - call LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C0 - call LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D0 - call LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D8 - call LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E8 - call LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F0 - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17:: @ 821CA17 - lock - faceplayer - setvar VAR_0x8004, 13 - special sub_813BDB4 - compare VAR_0x4095, 0 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA84 - specialvar VAR_RESULT, sub_813BD60 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56 - specialvar VAR_RESULT, sub_813BCA8 - compare VAR_RESULT, 7 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA7A - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D12A, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56:: @ 821CA56 - specialvar VAR_RESULT, sub_813BCA8 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA70 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D094, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CA70:: @ 821CA70 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D0BB, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CA7A:: @ 821CA7A - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D1B5, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CA84:: @ 821CA84 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D20C, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E:: @ 821CA8E - lock - faceplayer - setvar VAR_0x8004, 8 - special sub_813BDB4 - compare VAR_0x4095, 0 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAFB - specialvar VAR_RESULT, sub_813BD60 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD - specialvar VAR_RESULT, sub_813BCA8 - compare VAR_RESULT, 7 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAF1 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D347, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD:: @ 821CACD - specialvar VAR_RESULT, sub_813BCA8 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAE7 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2A6, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CAE7:: @ 821CAE7 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2CE, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CAF1:: @ 821CAF1 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D377, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CAFB:: @ 821CAFB - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D3EE, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05:: @ 821CB05 - lock - faceplayer - setvar VAR_0x8004, 9 - special sub_813BDB4 - compare VAR_0x4095, 0 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB72 - specialvar VAR_RESULT, sub_813BD60 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44 - specialvar VAR_RESULT, sub_813BCA8 - compare VAR_RESULT, 7 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB68 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D52E, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44:: @ 821CB44 - specialvar VAR_RESULT, sub_813BCA8 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB5E - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D438, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CB5E:: @ 821CB5E - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D4A3, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CB68:: @ 821CB68 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D5DC, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CB72:: @ 821CB72 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D69C, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C:: @ 821CB7C - lock - faceplayer - setvar VAR_0x8004, 10 - special sub_813BDB4 - compare VAR_0x4095, 0 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBE9 - specialvar VAR_RESULT, sub_813BD60 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB - specialvar VAR_RESULT, sub_813BCA8 - compare VAR_RESULT, 7 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBDF - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D822, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB:: @ 821CBBB - specialvar VAR_RESULT, sub_813BCA8 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBD5 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D751, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CBD5:: @ 821CBD5 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D79B, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CBDF:: @ 821CBDF - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D857, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CBE9:: @ 821CBE9 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D8C4, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3:: @ 821CBF3 - lock - faceplayer - setvar VAR_0x8004, 11 - special sub_813BDB4 - specialvar VAR_RESULT, sub_813BD60 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27 - specialvar VAR_RESULT, sub_813BCA8 - compare VAR_RESULT, 7 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC4B - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D9D1, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27:: @ 821CC27 - specialvar VAR_RESULT, sub_813BCA8 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC41 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D921, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CC41:: @ 821CC41 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D96A, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CC4B:: @ 821CC4B - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA0D, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55:: @ 821CC55 - lock - faceplayer - setvar VAR_0x8004, 12 - special sub_813BDB4 - specialvar VAR_RESULT, sub_813BD60 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89 - specialvar VAR_RESULT, sub_813BCA8 - compare VAR_RESULT, 7 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCAD - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DB69, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89:: @ 821CC89 - specialvar VAR_RESULT, sub_813BCA8 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCA3 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA73, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CCA3:: @ 821CCA3 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DAF5, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CCAD:: @ 821CCAD - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DBFB, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7:: @ 821CCB7 - lock - faceplayer - setvar VAR_0x8004, 14 - special sub_813BDB4 - specialvar VAR_RESULT, sub_813BD60 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB - specialvar VAR_RESULT, sub_813BCA8 - compare VAR_RESULT, 7 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD0F - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DD36, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB:: @ 821CCEB - specialvar VAR_RESULT, sub_813BCA8 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD05 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DC68, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CD05:: @ 821CD05 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DCD6, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CD0F:: @ 821CD0F - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DDCE, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19 - lock - faceplayer - setvar VAR_0x8004, 15 - special sub_813BDB4 - specialvar VAR_RESULT, sub_813BD60 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D - specialvar VAR_RESULT, sub_813BCA8 - compare VAR_RESULT, 7 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DEFF, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D:: @ 821CD4D - specialvar VAR_RESULT, sub_813BCA8 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE72, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67:: @ 821CD67 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE83, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71:: @ 821CD71 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DF51, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B:: @ 821CD7B - lock - faceplayer - checkflag FLAG_0x0D2 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED - checkflag FLAG_0x0D2 - goto_if 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90 - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90 - setvar VAR_0x8005, 11 - special InterviewBefore - compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF - copyvar VAR_0x800A, VAR_0x8006 - setvar VAR_0x8004, 8 - special sub_813BDB4 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281BCB, 4 - setvar VAR_0x8004, 14 - copyvar VAR_0x8005, VAR_0x800A - call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C - lock - faceplayer - compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0 - compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0:: @ 821CDE0 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C06, 4 - goto LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE - setvar VAR_0x8004, 8 - special sub_813BDB4 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C3D, 5 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 - compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15 - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15 - setvar VAR_0x8004, 8 - special sub_813BDB4 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C65, 4 - setvar VAR_0x8004, 14 - copyvar VAR_0x8005, VAR_0x800A - call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C - lock - faceplayer - compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0 - compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D - setvar VAR_0x8004, 8 - special sub_813BDB4 - message LilycoveCity_PokemonTrainerFanClub_Text_281C95 - waitmessage - setvar VAR_0x8004, 2 - special sub_813A128 - waitstate - setvar VAR_0x8004, 8 - switch VAR_RESULT - case 11, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F - case 127, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F - setvar VAR_0x8004, 8 - special sub_813BDB4 - copyvar VAR_0x8006, VAR_0x800A - copyvar VAR_0x8005, VAR_RESULT - special PutFanClubSpecialOnTheAir - goto LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8 - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F - setvar VAR_0x8004, 8 - special sub_813BDB4 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CCD, 5 - compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 - compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6:: @ 821CEC6 - setvar VAR_0x8004, 8 - special sub_813BDB4 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CF5, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8 - setvar VAR_0x8004, 8 - special sub_813BDB4 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281D40, 4 - setflag FLAG_0x0D2 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED:: @ 821CEED - setvar VAR_0x8004, 8 - special sub_813BDB4 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281DB4, 4 - release - end - -LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF:: @ 821CEFF - end - -LilycoveCity_PokemonTrainerFanClub_Text_21CF00: @ 821CF00 - .string "Oh, wow!\n" - .string "It’s {PLAYER}!$" - -LilycoveCity_PokemonTrainerFanClub_Text_21CF12: @ 821CF12 - .string "I’ve heard the news!\n" - .string "You’re really strong, aren’t you?\p" - .string "We always argue about who is the\n" - .string "strongest of all TRAINERS here.\p" - .string "So when I heard about you, I decided\n" - .string "to be your fan!\p" - .string "I hope you’ll keep on battling other\n" - .string "tough TRAINERS.\p" - .string "That way, we’ll be able to see more\n" - .string "of your hot, hot battles.\p" - .string "That will make the others here see\n" - .string "exactly how great you are.\p" - .string "Remember, I’m cheering for you,\n" - .string "{PLAYER}!$" - -LilycoveCity_PokemonTrainerFanClub_Text_21D094: @ 821D094 - .string "Yo, {PLAYER}!\n" - .string "You’re the one we want to win!$" - -LilycoveCity_PokemonTrainerFanClub_Text_21D0BB: @ 821D0BB - .string "The others, they don’t know that\n" - .string "you’re the best of the best!\p" - .string "Isn’t that right, {PLAYER}?\n" - .string "Show them you’ve got guts!$" - -LilycoveCity_PokemonTrainerFanClub_Text_21D12A: @ 821D12A - .string "I hate to say this, but the TRAINER\n" - .string "everybody’s talking about is\l" - .string "{STR_VAR_1}, no question about it!\p" - .string "That TRAINER’s power…\n" - .string "It’s out of the ordinary.$" - -LilycoveCity_PokemonTrainerFanClub_Text_21D1B5: @ 821D1B5 - .string "Darn it… I’ve been telling people\n" - .string "that {STR_VAR_1} is the best now…\p" - .string "But no one wants to listen…$" - -LilycoveCity_PokemonTrainerFanClub_Text_21D20C: @ 821D20C - .string "I’ve been hearing things about\n" - .string "a tough new TRAINER.\p" - .string "This TRAINER’s supposed to be beating\n" - .string "GYM LEADERS, even.\p" - .string "Do you know anything about this\n" - .string "new TRAINER?$" - -LilycoveCity_PokemonTrainerFanClub_Text_21D2A6: @ 821D2A6 - .string "Oh!\n" - .string "{PLAYER}!\p" - .string "Go for it!\n" - .string "I’m pulling for you!$" - -LilycoveCity_PokemonTrainerFanClub_Text_21D2CE: @ 821D2CE - .string "Sigh…\n" - .string "BRAWLY…\p" - .string "Oh, no! Wait!\n" - .string "That’s not right! No, no, no!\p" - .string "I’m your fan through and through!\p" - .string "So make me proud!\n" - .string "Go for it!$" - -LilycoveCity_PokemonTrainerFanClub_Text_21D347: @ 821D347 - .string "I can’t help it, I can only get to\n" - .string "like BRAWLY…$" - -LilycoveCity_PokemonTrainerFanClub_Text_21D377: @ 821D377 - .string "Nobody understands the charm of\n" - .string "BRAWLY…\p" - .string "I don’t care!\p" - .string "Even if I’m the only one, I’m going\n" - .string "to keep cheering for BRAWLY!$" - -LilycoveCity_PokemonTrainerFanClub_Text_21D3EE: @ 821D3EE - .string "Whatever anyone says, my favorite\n" - .string "TRAINER is DEWFORD’s GYM LEADER\l" - .string "BRAWLY!$" - -LilycoveCity_PokemonTrainerFanClub_Text_21D438: @ 821D438 - .string "You’ve surpassed your own father in\n" - .string "every regard!\p" - .string "I’m telling you, so there’s no question\n" - .string "about it at all!$" - -LilycoveCity_PokemonTrainerFanClub_Text_21D4A3: @ 821D4A3 - .string "Even when things turned bleak,\n" - .string "your father never gave up.\p" - .string "This I know to be true.\p" - .string "You never give up even if you lose!\n" - .string "So keep on battling!$" - -LilycoveCity_PokemonTrainerFanClub_Text_21D52E: @ 821D52E - .string "NORMAN battled with more power,\n" - .string "charisma, and showmanship than you.\p" - .string "Even though people may say that\n" - .string "you’re strong…\p" - .string "You’ve still got a long way to go\n" - .string "compared to your father.$" - -LilycoveCity_PokemonTrainerFanClub_Text_21D5DC: @ 821D5DC - .string "You’re beginning to get the same\n" - .string "air of awe NORMAN exudes.\p" - .string "But there’s something conclusively\n" - .string "different between you and NORMAN.\p" - .string "I can’t tell you what that is.\n" - .string "You’ll have to find it yourself.$" - -LilycoveCity_PokemonTrainerFanClub_Text_21D69C: @ 821D69C - .string "Everyone here, we’re all huge fans\n" - .string "of POKéMON battles.\p" - .string "We discuss who we consider to be\n" - .string "the strongest of all TRAINERS.\p" - .string "If you were to become famous,\n" - .string "we might even become your fans!$" - -LilycoveCity_PokemonTrainerFanClub_Text_21D751: @ 821D751 - .string "Oh, woweee! It’s {PLAYER}!\n" - .string "For real, too!\p" - .string "Please, shake my hand, shake my hand!$" - -LilycoveCity_PokemonTrainerFanClub_Text_21D79B: @ 821D79B - .string "I’ll always cheer for you, {PLAYER}!\n" - .string "Always, always!\p" - .string "I don’t want to see you lose ever,\n" - .string "{PLAYER}.\p" - .string "Because I know you’re really,\n" - .string "really strong, {PLAYER}!$" - -LilycoveCity_PokemonTrainerFanClub_Text_21D822: @ 821D822 - .string "{STR_VAR_1} is really cool…\p" - .string "Everyone thinks so, right, right?$" - -LilycoveCity_PokemonTrainerFanClub_Text_21D857: @ 821D857 - .string "{STR_VAR_1} really is cool, don’t\n" - .string "you think so?\p" - .string "Even if it’s just me, I’m going to keep\n" - .string "cheering my favorite TRAINER.$" - -LilycoveCity_PokemonTrainerFanClub_Text_21D8C4: @ 821D8C4 - .string "My favorite TRAINER is…\p" - .string "Cool…\p" - .string "Strong…\p" - .string "And really nice…\p" - .string "I wish there was a TRAINER like that…$" - -LilycoveCity_PokemonTrainerFanClub_Text_21D921: @ 821D921 - .string "Whoa! It’s {PLAYER}!\n" - .string "Wicked!\p" - .string "When I grow up, I want to be strong\n" - .string "like you, {PLAYER}!$" - -LilycoveCity_PokemonTrainerFanClub_Text_21D96A: @ 821D96A - .string "Even if I’m the only one…\p" - .string "You’ll always be the only one\n" - .string "I cheer for, {PLAYER}!\p" - .string "Because I believe in you, {PLAYER}!$" - -LilycoveCity_PokemonTrainerFanClub_Text_21D9D1: @ 821D9D1 - .string "{STR_VAR_1} is so wickedly cool…\n" - .string "I want to shake hands with my hero.$" - -LilycoveCity_PokemonTrainerFanClub_Text_21DA0D: @ 821DA0D - .string "Even if I’m the only one…\p" - .string "I’m never going to stop being\n" - .string "{STR_VAR_1}’s fan!\p" - .string "Because I’ve heard, {STR_VAR_1}\n" - .string "never loses!$" - -LilycoveCity_PokemonTrainerFanClub_Text_21DA73: @ 821DA73 - .string "{PLAYER}!\n" - .string "You are amazing after all!\p" - .string "Ever since I set eyes on you,\n" - .string "I knew that you were great.\p" - .string "It looks like my eyes didn’t deceive me.$" - -LilycoveCity_PokemonTrainerFanClub_Text_21DAF5: @ 821DAF5 - .string "Who cares about the others.\n" - .string "I’m in your corner!\p" - .string "You don’t need to worry. Just get\n" - .string "out there and battle like always.$" - -LilycoveCity_PokemonTrainerFanClub_Text_21DB69: @ 821DB69 - .string "You’re a pretty decent TRAINER,\n" - .string "I think.\p" - .string "But I also think that {STR_VAR_1}\n" - .string "is number one right now.\p" - .string "That’s just my opinion.\n" - .string "Don’t worry about it too much.$" - -LilycoveCity_PokemonTrainerFanClub_Text_21DBFB: @ 821DBFB - .string "Wow, you really are strong.\n" - .string "Maybe even stronger than {STR_VAR_1}.\p" - .string "But {STR_VAR_1} needs me.\p" - .string "If I don’t cheer for {STR_VAR_1},\n" - .string "who will?$" - -LilycoveCity_PokemonTrainerFanClub_Text_21DC68: @ 821DC68 - .string "You’ve changed my mind!\n" - .string "You are strong, aren’t you?\p" - .string "I’d like you to tell me how you managed\n" - .string "to get so strong!$" - -LilycoveCity_PokemonTrainerFanClub_Text_21DCD6: @ 821DCD6 - .string "The tougher the situation, the more\n" - .string "attractively you battle.\p" - .string "I can’t wait for your next battle!$" - -LilycoveCity_PokemonTrainerFanClub_Text_21DD36: @ 821DD36 - .string "Among the recently hot TRAINERS,\n" - .string "{STR_VAR_1} is the standout.\p" - .string "That toughness, it’s simply not normal.\p" - .string "You’re doing okay, but you’re not in\n" - .string "the same class as {STR_VAR_1}.$" - -LilycoveCity_PokemonTrainerFanClub_Text_21DDCE: @ 821DDCE - .string "You are really popular…\p" - .string "You’re strong, and you’re caring to\n" - .string "POKéMON. No one can knock you.\p" - .string "But, you know, I believe in {STR_VAR_1}.\p" - .string "{STR_VAR_1} is definitely stronger!\n" - .string "I’m positive!$" - -LilycoveCity_PokemonTrainerFanClub_Text_21DE72: @ 821DE72 - .string "You…\p" - .string "Impressive!$" - -LilycoveCity_PokemonTrainerFanClub_Text_21DE83: @ 821DE83 - .string "Your true worth, it is fine if only\n" - .string "I recognized it.\p" - .string "The others I doubt will understand\n" - .string "the hidden power that beats within.$" - -LilycoveCity_PokemonTrainerFanClub_Text_21DEFF: @ 821DEFF - .string "Yes, I see strength in your eyes.\p" - .string "But!\p" - .string "You still haven’t realized your\n" - .string "potential.$" - -LilycoveCity_PokemonTrainerFanClub_Text_21DF51: @ 821DF51 - .string "It is true that you are tremendously\n" - .string "powerful.\p" - .string "But!\n" - .string "I can tell…\p" - .string "That strength cannot be considered\n" - .string "true strength yet!\p" - .string "True strength is…!\n" - .string "… …\p" - .string "Actually, I have no idea, either.$" - diff --git a/data/scripts/maps/LilycoveCity_UnusedMart.inc b/data/scripts/maps/LilycoveCity_UnusedMart.inc deleted file mode 100644 index fa0405f68..000000000 --- a/data/scripts/maps/LilycoveCity_UnusedMart.inc +++ /dev/null @@ -1,3 +0,0 @@ -LilycoveCity_UnusedMart_MapScripts:: @ 821C784 - .byte 0 - diff --git a/data/scripts/maps/LinkContestRoom1.inc b/data/scripts/maps/LinkContestRoom1.inc deleted file mode 100644 index 5276adcd8..000000000 --- a/data/scripts/maps/LinkContestRoom1.inc +++ /dev/null @@ -1 +0,0 @@ -LinkContestRoom1_MapScripts:: @ 823B781 diff --git a/data/scripts/maps/LinkContestRoom2.inc b/data/scripts/maps/LinkContestRoom2.inc deleted file mode 100644 index ff85310f7..000000000 --- a/data/scripts/maps/LinkContestRoom2.inc +++ /dev/null @@ -1 +0,0 @@ -LinkContestRoom2_MapScripts:: @ 823B781 diff --git a/data/scripts/maps/LinkContestRoom3.inc b/data/scripts/maps/LinkContestRoom3.inc deleted file mode 100644 index c3a5c95fb..000000000 --- a/data/scripts/maps/LinkContestRoom3.inc +++ /dev/null @@ -1 +0,0 @@ -LinkContestRoom3_MapScripts:: @ 823B781 diff --git a/data/scripts/maps/LinkContestRoom4.inc b/data/scripts/maps/LinkContestRoom4.inc deleted file mode 100644 index 9a544e6f3..000000000 --- a/data/scripts/maps/LinkContestRoom4.inc +++ /dev/null @@ -1 +0,0 @@ -LinkContestRoom4_MapScripts:: @ 823B781 diff --git a/data/scripts/maps/LinkContestRoom5.inc b/data/scripts/maps/LinkContestRoom5.inc deleted file mode 100644 index f7ea72996..000000000 --- a/data/scripts/maps/LinkContestRoom5.inc +++ /dev/null @@ -1 +0,0 @@ -LinkContestRoom5_MapScripts:: @ 823B781 diff --git a/data/scripts/maps/LinkContestRoom6.inc b/data/scripts/maps/LinkContestRoom6.inc deleted file mode 100644 index bea65ea48..000000000 --- a/data/scripts/maps/LinkContestRoom6.inc +++ /dev/null @@ -1 +0,0 @@ -LinkContestRoom6_MapScripts:: @ 823B781 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc deleted file mode 100644 index eb78368af..000000000 --- a/data/scripts/maps/LittlerootTown.inc +++ /dev/null @@ -1,1040 +0,0 @@ -LittlerootTown_MapScripts:: @ 81E7DCB - map_script 3, LittlerootTown_MapScript1_1E7DDB - map_script 2, LittlerootTown_MapScript2_1E7EC1 - map_script 4, LittlerootTown_MapScript2_1E7FE2 - .byte 0 - -LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB - setflag FLAG_VISITED_LITTLEROOT_TOWN - call LittlerootTown_EventScript_271ED7 - compare VAR_0x4092, 2 - call_if 1, LittlerootTown_EventScript_1E7E67 - checkflag FLAG_0x052 - call_if 0, LittlerootTown_EventScript_1E7E6F - compare VAR_0x4050, 3 - call_if 1, LittlerootTown_EventScript_1E7E92 - compare VAR_0x4082, 4 - call_if 1, LittlerootTown_EventScript_1E7E5C - compare VAR_0x408C, 4 - call_if 1, LittlerootTown_EventScript_1E7E5C - compare VAR_0x40C7, 1 - call_if 1, LittlerootTown_EventScript_1E7E53 - compare VAR_0x408D, 3 - call_if 1, LittlerootTown_EventScript_1E7E4F - compare VAR_0x40D3, 1 - call_if 1, LittlerootTown_EventScript_1E7E4B - compare VAR_0x40D3, 2 - call_if 1, LittlerootTown_EventScript_1E7E45 - end - -LittlerootTown_EventScript_1E7E45:: @ 81E7E45 - setvar VAR_0x40D3, 3 - return - -LittlerootTown_EventScript_1E7E4B:: @ 81E7E4B - setflag FLAG_SPECIAL_FLAG_0x4000 - return - -LittlerootTown_EventScript_1E7E4F:: @ 81E7E4F - setflag FLAG_0x12D - return - -LittlerootTown_EventScript_1E7E53:: @ 81E7E53 - setvar VAR_0x40C7, 2 - setflag FLAG_0x3D3 - return - -LittlerootTown_EventScript_1E7E5C:: @ 81E7E5C - setvar VAR_0x4082, 5 - setvar VAR_0x408C, 5 - return - -LittlerootTown_EventScript_1E7E67:: @ 81E7E67 - setobjectxyperm 4, 14, 8 - return - -LittlerootTown_EventScript_1E7E6F:: @ 81E7E6F - compare VAR_0x4050, 0 - goto_eq LittlerootTown_EventScript_1E7E86 - setobjectxyperm 1, 10, 1 - setobjectmovementtype 1, 7 - return - -LittlerootTown_EventScript_1E7E86:: @ 81E7E86 - setobjectxyperm 1, 7, 2 - setobjectmovementtype 1, 8 - return - -LittlerootTown_EventScript_1E7E92:: @ 81E7E92 - clearflag FLAG_0x2F0 - setobjectmovementtype 4, 8 - checkplayergender - compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E7EB1 - compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E7EB9 - return - -LittlerootTown_EventScript_1E7EB1:: @ 81E7EB1 - setobjectxyperm 4, 5, 9 - return - -LittlerootTown_EventScript_1E7EB9:: @ 81E7EB9 - setobjectxyperm 4, 14, 9 - return - -LittlerootTown_MapScript2_1E7EC1: @ 81E7EC1 - map_script_2 VAR_0x4092, 1, LittlerootTown_EventScript_1E7EDB - map_script_2 VAR_0x4092, 2, LittlerootTown_EventScript_1E7EF9 - map_script_2 VAR_0x40D3, 1, LittlerootTown_EventScript_1E7FB1 - .2byte 0 - -LittlerootTown_EventScript_1E7EDB:: @ 81E7EDB - lockall - setvar VAR_0x8004, 5 - setvar VAR_0x8005, 8 - call LittlerootTown_EventScript_1E7F17 - setflag FLAG_0x2F9 - warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8 - waitstate - releaseall - end - -LittlerootTown_EventScript_1E7EF9:: @ 81E7EF9 - lockall - setvar VAR_0x8004, 14 - setvar VAR_0x8005, 8 - call LittlerootTown_EventScript_1E7F17 - setflag FLAG_0x2FA - warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8 - waitstate - releaseall - end - -LittlerootTown_EventScript_1E7F17:: @ 81E7F17 - delay 15 - playse SE_DANSA - applymovement 255, LittlerootTown_Movement_1E7FAC - waitmovement 0 - opendoor VAR_0x8004, VAR_0x8005 - waitdooranim - addobject 4 - applymovement 4, LittlerootTown_Movement_1E7F98 - waitmovement 0 - closedoor VAR_0x8004, VAR_0x8005 - waitdooranim - delay 10 - applymovement 4, LittlerootTown_Movement_1E7F9A - waitmovement 0 - msgbox LittlerootTown_Text_1E86BC, 4 - closemessage - applymovement 4, LittlerootTown_Movement_1E7F9D - applymovement 255, LittlerootTown_Movement_1E7FA4 - waitmovement 0 - opendoor VAR_0x8004, VAR_0x8005 - waitdooranim - applymovement 4, LittlerootTown_Movement_1E7FA1 - applymovement 255, LittlerootTown_Movement_1E7FA9 - waitmovement 0 - setflag FLAG_0x2F0 - setvar VAR_0x4092, 3 - hideobjectat 255, MAP_PETALBURG_CITY - closedoor VAR_0x8004, VAR_0x8005 - waitdooranim - clearflag FLAG_0x364 - clearflag FLAG_SPECIAL_FLAG_0x4000 - return - -LittlerootTown_Movement_1E7F98: @ 81E7F98 - walk_down - step_end - -LittlerootTown_Movement_1E7F9A: @ 81E7F9A - walk_down - walk_in_place_fastest_left - step_end - -LittlerootTown_Movement_1E7F9D: @ 81E7F9D - delay_16 - delay_8 - walk_up - step_end - -LittlerootTown_Movement_1E7FA1: @ 81E7FA1 - walk_up - set_invisible - step_end - -LittlerootTown_Movement_1E7FA4: @ 81E7FA4 - delay_16 - delay_8 - walk_right - walk_in_place_fastest_up - step_end - -LittlerootTown_Movement_1E7FA9: @ 81E7FA9 - walk_up - walk_up - step_end - -LittlerootTown_Movement_1E7FAC: @ 81E7FAC - jump_right - delay_16 - delay_16 - delay_16 - step_end - -LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1 - lockall - playse SE_PIN - applymovement 8, LittlerootTown_Movement_272598 - waitmovement 0 - delay 80 - msgbox LittlerootTown_Text_1E8DA2, 4 - closemessage - clearflag FLAG_0x31A - clearflag FLAG_0x31B - delay 20 - clearflag FLAG_SPECIAL_FLAG_0x4000 - warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 - waitstate - releaseall - end - -LittlerootTown_MapScript2_1E7FE2: @ 81E7FE2 - map_script_2 VAR_0x40D3, 1, LittlerootTown_EventScript_1E7FEC - .2byte 0 - -LittlerootTown_EventScript_1E7FEC:: @ 81E7FEC - addobject 8 - addobject 7 - checkplayergender - compare VAR_RESULT, 0 - goto_eq LittlerootTown_EventScript_1E8004 - goto LittlerootTown_EventScript_1E8013 - end - -LittlerootTown_EventScript_1E8004:: @ 81E8004 - setobjectxy 7, 6, 10 - setobjectxy 8, 5, 10 - end - -LittlerootTown_EventScript_1E8013:: @ 81E8013 - setobjectxy 7, 13, 10 - setobjectxy 8, 14, 10 - end - -LittlerootTown_EventScript_1E8022:: @ 81E8022 - msgbox LittlerootTown_Text_1E8ACF, 2 - end - -LittlerootTown_EventScript_1E802B:: @ 81E802B - msgbox LittlerootTown_Text_1E8B25, 2 - end - -LittlerootTown_EventScript_1E8034:: @ 81E8034 - lock - faceplayer - checkflag FLAG_0x074 - goto_eq LittlerootTown_EventScript_1E8087 - checkflag FLAG_0x052 - goto_eq LittlerootTown_EventScript_1E807A - compare VAR_0x4050, 0 - goto_if 5, LittlerootTown_EventScript_1E805D - msgbox LittlerootTown_Text_1E8BB8, 4 - release - end - -LittlerootTown_EventScript_1E805D:: @ 81E805D - special GetPlayerBigGuyGirlString - msgbox LittlerootTown_Text_1E8C3A, 4 - closemessage - applymovement 1, LittlerootTown_Movement_2725A2 - waitmovement 0 - setvar VAR_0x4050, 2 - release - end - -LittlerootTown_EventScript_1E807A:: @ 81E807A - special GetPlayerBigGuyGirlString - msgbox LittlerootTown_Text_1E8CE3, 4 - release - end - -LittlerootTown_EventScript_1E8087:: @ 81E8087 - msgbox LittlerootTown_Text_1E8D07, 4 - release - end - -LittlerootTown_EventScript_1E8091:: @ 81E8091 - lockall - applymovement 1, LittlerootTown_Movement_1E80D1 - waitmovement 0 - call LittlerootTown_EventScript_1E80AD - applymovement 1, LittlerootTown_Movement_1E80E1 - waitmovement 0 - releaseall - end - -LittlerootTown_EventScript_1E80AD:: @ 81E80AD - msgbox LittlerootTown_Text_1E8BB8, 4 - closemessage - applymovement 1, LittlerootTown_Movement_1E80DF - applymovement 255, LittlerootTown_Movement_1E80EB - waitmovement 0 - msgbox LittlerootTown_Text_1E8C07, 4 - closemessage - return - -LittlerootTown_Movement_1E80D1: @ 81E80D1 - 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 - walk_down - step_end - -LittlerootTown_Movement_1E80E1: @ 81E80E1 - 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 - lock_facing_direction - walk_down - unlock_facing_direction - step_end - -LittlerootTown_EventScript_1E80EF:: @ 81E80EF - lockall - applymovement 1, LittlerootTown_Movement_1E810B - waitmovement 0 - call LittlerootTown_EventScript_1E80AD - applymovement 1, LittlerootTown_Movement_1E8118 - waitmovement 0 - releaseall - end - -LittlerootTown_Movement_1E810B: @ 81E810B - 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 - walk_left - walk_down - walk_left - walk_left - walk_left - walk_in_place_fastest_down - step_end - -LittlerootTown_EventScript_1E811F:: @ 81E811F - lockall - applymovement 1, LittlerootTown_Movement_2725A8 - waitmovement 0 - applymovement 255, LittlerootTown_Movement_2725A4 - waitmovement 0 - special GetPlayerBigGuyGirlString - msgbox LittlerootTown_Text_1E8C3A, 4 - closemessage - applymovement 1, LittlerootTown_Movement_2725A2 - waitmovement 0 - setvar VAR_0x4050, 2 - releaseall - end - -LittlerootTown_EventScript_1E8151:: @ 81E8151 - msgbox LittlerootTown_Text_1E8D32, 3 - end - -LittlerootTown_EventScript_1E815A:: @ 81E815A - msgbox LittlerootTown_Text_1E8D69, 3 - end - -LittlerootTown_EventScript_1E8163:: @ 81E8163 - lockall - checkplayergender - compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E817D - compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E8186 - releaseall - end - -LittlerootTown_EventScript_1E817D:: @ 81E817D - msgbox LittlerootTown_Text_1E8D83, 4 - return - -LittlerootTown_EventScript_1E8186:: @ 81E8186 - msgbox LittlerootTown_Text_1E8D8E, 4 - return - -LittlerootTown_EventScript_1E818F:: @ 81E818F - lockall - checkplayergender - compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E81A9 - compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E81B2 - releaseall - end - -LittlerootTown_EventScript_1E81A9:: @ 81E81A9 - msgbox LittlerootTown_Text_1E8D8E, 4 - return - -LittlerootTown_EventScript_1E81B2:: @ 81E81B2 - msgbox LittlerootTown_Text_1E8D83, 4 - return - -LittlerootTown_EventScript_1E81BB:: @ 81E81BB - lockall - setvar VAR_0x8008, 0 - setobjectxy 4, 10, 9 - goto LittlerootTown_EventScript_1E8211 - end - -LittlerootTown_EventScript_1E81CE:: @ 81E81CE - lockall - setvar VAR_0x8008, 1 - setobjectxy 4, 11, 9 - goto LittlerootTown_EventScript_1E8211 - end - -LittlerootTown_EventScript_1E81E1:: @ 81E81E1 - lockall - setvar VAR_0x8008, 2 - goto LittlerootTown_EventScript_1E8211 - end - -LittlerootTown_EventScript_1E81ED:: @ 81E81ED - lockall - setvar VAR_0x8008, 3 - goto LittlerootTown_EventScript_1E8211 - end - -LittlerootTown_EventScript_1E81F9:: @ 81E81F9 - lockall - setvar VAR_0x8008, 4 - goto LittlerootTown_EventScript_1E8211 - end - -LittlerootTown_EventScript_1E8205:: @ 81E8205 - lockall - setvar VAR_0x8008, 5 - goto LittlerootTown_EventScript_1E8211 - end - -LittlerootTown_EventScript_1E8211:: @ 81E8211 - checkplayergender - compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E8297 - compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E82A2 - checkplayergender - compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E8281 - compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E828C - msgbox LittlerootTown_Text_1E87E1, 4 - closemessage - checkplayergender - compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E82AD - compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E82F0 - call LittlerootTown_EventScript_1E8693 - checkplayergender - compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E8405 - compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E8448 - goto LittlerootTown_EventScript_1E8686 - end - -LittlerootTown_EventScript_1E8281:: @ 81E8281 - setvar VAR_0x8009, 5 - setvar VAR_0x800A, 8 - return - -LittlerootTown_EventScript_1E828C:: @ 81E828C - setvar VAR_0x8009, 14 - setvar VAR_0x800A, 8 - return - -LittlerootTown_EventScript_1E8297:: @ 81E8297 - applymovement 4, LittlerootTown_Movement_2725A8 - waitmovement 0 - return - -LittlerootTown_EventScript_1E82A2:: @ 81E82A2 - applymovement 4, LittlerootTown_Movement_2725A4 - waitmovement 0 - return - -LittlerootTown_EventScript_1E82AD:: @ 81E82AD - compare VAR_0x8008, 0 - call_if 1, LittlerootTown_EventScript_1E8333 - compare VAR_0x8008, 1 - call_if 1, LittlerootTown_EventScript_1E8348 - compare VAR_0x8008, 2 - call_if 1, LittlerootTown_EventScript_1E835D - compare VAR_0x8008, 3 - call_if 1, LittlerootTown_EventScript_1E8372 - compare VAR_0x8008, 4 - call_if 1, LittlerootTown_EventScript_1E8387 - compare VAR_0x8008, 5 - call_if 1, LittlerootTown_EventScript_1E839C - return - -LittlerootTown_EventScript_1E82F0:: @ 81E82F0 - compare VAR_0x8008, 0 - call_if 1, LittlerootTown_EventScript_1E8333 - compare VAR_0x8008, 1 - call_if 1, LittlerootTown_EventScript_1E8348 - compare VAR_0x8008, 2 - call_if 1, LittlerootTown_EventScript_1E83B1 - compare VAR_0x8008, 3 - call_if 1, LittlerootTown_EventScript_1E83C6 - compare VAR_0x8008, 4 - call_if 1, LittlerootTown_EventScript_1E83DB - compare VAR_0x8008, 5 - call_if 1, LittlerootTown_EventScript_1E83F0 - return - -LittlerootTown_EventScript_1E8333:: @ 81E8333 - applymovement 255, LittlerootTown_Movement_2725AA - waitmovement 0 - applymovement 4, LittlerootTown_Movement_1E85D1 - waitmovement 0 - return - -LittlerootTown_EventScript_1E8348:: @ 81E8348 - applymovement 255, LittlerootTown_Movement_2725AA - waitmovement 0 - applymovement 4, LittlerootTown_Movement_1E85D8 - waitmovement 0 - return - -LittlerootTown_EventScript_1E835D:: @ 81E835D - applymovement 255, LittlerootTown_Movement_2725A4 - waitmovement 0 - applymovement 4, LittlerootTown_Movement_1E85DF - waitmovement 0 - return - -LittlerootTown_EventScript_1E8372:: @ 81E8372 - applymovement 255, LittlerootTown_Movement_2725A4 - waitmovement 0 - applymovement 4, LittlerootTown_Movement_1E85E4 - waitmovement 0 - return - -LittlerootTown_EventScript_1E8387:: @ 81E8387 - applymovement 255, LittlerootTown_Movement_2725A4 - waitmovement 0 - applymovement 4, LittlerootTown_Movement_1E85EA - waitmovement 0 - return - -LittlerootTown_EventScript_1E839C:: @ 81E839C - applymovement 255, LittlerootTown_Movement_2725A4 - waitmovement 0 - applymovement 4, LittlerootTown_Movement_1E85ED - waitmovement 0 - return - -LittlerootTown_EventScript_1E83B1:: @ 81E83B1 - applymovement 255, LittlerootTown_Movement_2725A8 - waitmovement 0 - applymovement 4, LittlerootTown_Movement_1E85F1 - waitmovement 0 - return - -LittlerootTown_EventScript_1E83C6:: @ 81E83C6 - applymovement 255, LittlerootTown_Movement_2725A8 - waitmovement 0 - applymovement 4, LittlerootTown_Movement_1E85F5 - waitmovement 0 - return - -LittlerootTown_EventScript_1E83DB:: @ 81E83DB - applymovement 255, LittlerootTown_Movement_2725A8 - waitmovement 0 - applymovement 4, LittlerootTown_Movement_1E85F8 - waitmovement 0 - return - -LittlerootTown_EventScript_1E83F0:: @ 81E83F0 - applymovement 255, LittlerootTown_Movement_2725A8 - waitmovement 0 - applymovement 4, LittlerootTown_Movement_1E85FE - waitmovement 0 - return - -LittlerootTown_EventScript_1E8405:: @ 81E8405 - compare VAR_0x8008, 0 - call_if 1, LittlerootTown_EventScript_1E848B - compare VAR_0x8008, 1 - call_if 1, LittlerootTown_EventScript_1E8496 - compare VAR_0x8008, 2 - call_if 1, LittlerootTown_EventScript_1E84A1 - compare VAR_0x8008, 3 - call_if 1, LittlerootTown_EventScript_1E84C7 - compare VAR_0x8008, 4 - call_if 1, LittlerootTown_EventScript_1E84ED - compare VAR_0x8008, 5 - call_if 1, LittlerootTown_EventScript_1E8513 - return - -LittlerootTown_EventScript_1E8448:: @ 81E8448 - compare VAR_0x8008, 0 - call_if 1, LittlerootTown_EventScript_1E848B - compare VAR_0x8008, 1 - call_if 1, LittlerootTown_EventScript_1E8496 - compare VAR_0x8008, 2 - call_if 1, LittlerootTown_EventScript_1E8539 - compare VAR_0x8008, 3 - call_if 1, LittlerootTown_EventScript_1E855F - compare VAR_0x8008, 4 - call_if 1, LittlerootTown_EventScript_1E8585 - compare VAR_0x8008, 5 - call_if 1, LittlerootTown_EventScript_1E85AB - return - -LittlerootTown_EventScript_1E848B:: @ 81E848B - applymovement 4, LittlerootTown_Movement_1E8603 - waitmovement 0 - return - -LittlerootTown_EventScript_1E8496:: @ 81E8496 - applymovement 4, LittlerootTown_Movement_1E8609 - waitmovement 0 - return - -LittlerootTown_EventScript_1E84A1:: @ 81E84A1 - applymovement 4, LittlerootTown_Movement_1E860F - waitmovement 0 - opendoor VAR_0x8009, VAR_0x800A - waitdooranim - applymovement 4, LittlerootTown_Movement_1E863B - waitmovement 0 - hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor VAR_0x8009, VAR_0x800A - waitdooranim - return - -LittlerootTown_EventScript_1E84C7:: @ 81E84C7 - applymovement 4, LittlerootTown_Movement_1E8615 - waitmovement 0 - opendoor VAR_0x8009, VAR_0x800A - waitdooranim - applymovement 4, LittlerootTown_Movement_1E863B - waitmovement 0 - hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor VAR_0x8009, VAR_0x800A - waitdooranim - return - -LittlerootTown_EventScript_1E84ED:: @ 81E84ED - applymovement 4, LittlerootTown_Movement_1E861C - waitmovement 0 - opendoor VAR_0x8009, VAR_0x800A - waitdooranim - applymovement 4, LittlerootTown_Movement_1E863B - waitmovement 0 - hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor VAR_0x8009, VAR_0x800A - waitdooranim - return - -LittlerootTown_EventScript_1E8513:: @ 81E8513 - applymovement 4, LittlerootTown_Movement_1E8620 - waitmovement 0 - opendoor VAR_0x8009, VAR_0x800A - waitdooranim - applymovement 4, LittlerootTown_Movement_1E863B - waitmovement 0 - hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor VAR_0x8009, VAR_0x800A - waitdooranim - return - -LittlerootTown_EventScript_1E8539:: @ 81E8539 - applymovement 4, LittlerootTown_Movement_1E8625 - waitmovement 0 - opendoor VAR_0x8009, VAR_0x800A - waitdooranim - applymovement 4, LittlerootTown_Movement_1E863B - waitmovement 0 - hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor VAR_0x8009, VAR_0x800A - waitdooranim - return - -LittlerootTown_EventScript_1E855F:: @ 81E855F - applymovement 4, LittlerootTown_Movement_1E862A - waitmovement 0 - opendoor VAR_0x8009, VAR_0x800A - waitdooranim - applymovement 4, LittlerootTown_Movement_1E863B - waitmovement 0 - hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor VAR_0x8009, VAR_0x800A - waitdooranim - return - -LittlerootTown_EventScript_1E8585:: @ 81E8585 - applymovement 4, LittlerootTown_Movement_1E862E - waitmovement 0 - opendoor VAR_0x8009, VAR_0x800A - waitdooranim - applymovement 4, LittlerootTown_Movement_1E863B - waitmovement 0 - hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor VAR_0x8009, VAR_0x800A - waitdooranim - return - -LittlerootTown_EventScript_1E85AB:: @ 81E85AB - applymovement 4, LittlerootTown_Movement_1E8635 - waitmovement 0 - opendoor VAR_0x8009, VAR_0x800A - waitdooranim - applymovement 4, LittlerootTown_Movement_1E863B - waitmovement 0 - hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor VAR_0x8009, VAR_0x800A - waitdooranim - return - -LittlerootTown_Movement_1E85D1: @ 81E85D1 - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - step_end - -LittlerootTown_Movement_1E85D8: @ 81E85D8 - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - step_end - -LittlerootTown_Movement_1E85DF: @ 81E85DF - walk_right - walk_right - walk_right - walk_right - step_end - -LittlerootTown_Movement_1E85E4: @ 81E85E4 - walk_right - walk_right - walk_right - walk_right - walk_right - step_end - -LittlerootTown_Movement_1E85EA: @ 81E85EA - walk_right - walk_right - step_end - -LittlerootTown_Movement_1E85ED: @ 81E85ED - walk_right - walk_right - walk_right - step_end - -LittlerootTown_Movement_1E85F1: @ 81E85F1 - walk_left - walk_left - walk_left - step_end - -LittlerootTown_Movement_1E85F5: @ 81E85F5 - walk_left - walk_left - step_end - -LittlerootTown_Movement_1E85F8: @ 81E85F8 - walk_left - walk_left - walk_left - walk_left - walk_left - step_end - -LittlerootTown_Movement_1E85FE: @ 81E85FE - walk_left - walk_left - walk_left - walk_left - step_end - -LittlerootTown_Movement_1E8603: @ 81E8603 - walk_down - walk_down - walk_down - walk_down - walk_down - step_end - -LittlerootTown_Movement_1E8609: @ 81E8609 - walk_down - walk_down - walk_down - walk_down - walk_down - step_end - -LittlerootTown_Movement_1E860F: @ 81E860F - walk_left - walk_left - walk_left - walk_left - walk_in_place_fastest_up - step_end - -LittlerootTown_Movement_1E8615: @ 81E8615 - walk_left - walk_left - walk_left - walk_left - walk_left - walk_in_place_fastest_up - step_end - -LittlerootTown_Movement_1E861C: @ 81E861C - walk_left - walk_left - walk_in_place_fastest_up - step_end - -LittlerootTown_Movement_1E8620: @ 81E8620 - walk_left - walk_left - walk_left - walk_in_place_fastest_up - step_end - -LittlerootTown_Movement_1E8625: @ 81E8625 - walk_right - walk_right - walk_right - walk_in_place_fastest_up - step_end - -LittlerootTown_Movement_1E862A: @ 81E862A - walk_right - walk_right - walk_in_place_fastest_up - step_end - -LittlerootTown_Movement_1E862E: @ 81E862E - walk_right - walk_right - walk_right - walk_right - walk_right - walk_in_place_fastest_up - step_end - -LittlerootTown_Movement_1E8635: @ 81E8635 - walk_right - walk_right - walk_right - walk_right - walk_in_place_fastest_up - step_end - -LittlerootTown_Movement_1E863B: @ 81E863B - walk_up - step_end - -LittlerootTown_EventScript_1E863D:: @ 81E863D - lock - faceplayer - checkplayergender - compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E8281 - compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E828C - call LittlerootTown_EventScript_1E8693 - applymovement 4, LittlerootTown_Movement_2725A6 - waitmovement 0 - opendoor VAR_0x8009, VAR_0x800A - waitdooranim - applymovement 4, LittlerootTown_Movement_1E863B - waitmovement 0 - hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor VAR_0x8009, VAR_0x800A - waitdooranim - goto LittlerootTown_EventScript_1E8686 - end - -LittlerootTown_EventScript_1E8686:: @ 81E8686 - removeobject 4 - setflag FLAG_SYS_B_DASH - setvar VAR_0x4050, 4 - release - end - -LittlerootTown_EventScript_1E8693:: @ 81E8693 - msgbox LittlerootTown_Text_1E87F0, 4 - playfanfare MUS_FANFA4 - message LittlerootTown_Text_1E8925 - waitfanfare - setflag FLAG_0x112 - msgbox LittlerootTown_Text_1E894F, 4 - msgbox LittlerootTown_Text_1E8A03, 4 - closemessage - delay 30 - return - -LittlerootTown_Text_1E86BC: @ 81E86BC - .string "MOM: {PLAYER}, we’re here, honey!\p" - .string "It must be tiring riding with our things\n" - .string "in the moving truck.\p" - .string "Well, this is LITTLEROOT TOWN.\p" - .string "How do you like it?\n" - .string "This is our new home!\p" - .string "It has a quaint feel, but it seems to be\n" - .string "an easy place to live, don’t you think?\p" - .string "And, you get your own room, {PLAYER}!\n" - .string "Let’s go inside.$" - -LittlerootTown_Text_1E87E1: @ 81E87E1 - .string "MOM: Wait, {PLAYER}!$" - -LittlerootTown_Text_1E87F0: @ 81E87F0 - .string "MOM: {PLAYER}! {PLAYER}! Did you\n" - .string "introduce yourself to PROF. BIRCH?\p" - .string "Oh! What an adorable POKéMON!\n" - .string "You got it from PROF. BIRCH. How nice!\p" - .string "You’re your father’s child, all right.\n" - .string "You look good together with POKéMON!\p" - .string "Here, honey! If you’re going out on an\n" - .string "adventure, wear these RUNNING SHOES.\p" - .string "They’ll put a zip in your step!$" - -LittlerootTown_Text_1E8925: @ 81E8925 - .string "{PLAYER} switched shoes with the\n" - .string "RUNNING SHOES.$" - -LittlerootTown_Text_1E894F: @ 81E894F - .string "MOM: {PLAYER}, those shoes came with\n" - .string "instructions.\p" - .string "“Press the B Button while wearing these\n" - .string "RUNNING SHOES to run extra-fast!\p" - .string "“Slip on these RUNNING SHOES and race\n" - .string "in the great outdoors!â€$" - -LittlerootTown_Text_1E8A03: @ 81E8A03 - .string "… … … … … … … …\n" - .string "… … … … … … … …\p" - .string "To think that you have your very own\n" - .string "POKéMON now…\l" - .string "Your father will be overjoyed.\p" - .string "…But please be careful.\n" - .string "If anything happens, you can come home.\p" - .string "Go on, go get them, honey!$" - -LittlerootTown_Text_1E8ACF: @ 81E8ACF - .string "If you use a PC, you can store items\n" - .string "and POKéMON.\p" - .string "The power of science is staggering!$" - -LittlerootTown_Text_1E8B25: @ 81E8B25 - .string "PROF. BIRCH spends days in his LAB\n" - .string "studying, then he’ll suddenly go out in\l" - .string "the wild to do more research…\p" - .string "When does PROF. BIRCH spend time\n" - .string "at home?$" - -LittlerootTown_Text_1E8BB8: @ 81E8BB8 - .string "Um, um, um!\p" - .string "If you go outside and go in the grass,\n" - .string "wild POKéMON will jump out!$" - -LittlerootTown_Text_1E8C07: @ 81E8C07 - .string "It’s dangerous if you don’t have\n" - .string "your own POKéMON.$" - -LittlerootTown_Text_1E8C3A: @ 81E8C3A - .string "Um, hi!\p" - .string "There are scary POKéMON outside!\n" - .string "I can hear their cries!\p" - .string "I want to go see what’s going on,\n" - .string "but I don’t have any POKéMON…\p" - .string "Can you go see what’s happening\n" - .string "for me?$" - -LittlerootTown_Text_1E8CE3: @ 81E8CE3 - .string "You saved PROF. BIRCH!\n" - .string "I’m so glad!$" - -LittlerootTown_Text_1E8D07: @ 81E8D07 - .string "Are you going to catch POKéMON?\n" - .string "Good luck!$" - -LittlerootTown_Text_1E8D32: @ 81E8D32 - .string "LITTLEROOT TOWN\n" - .string "“A town that can’t be shaded any hue.â€$" - -LittlerootTown_Text_1E8D69: @ 81E8D69 - .string "PROF. BIRCH’S POKéMON LAB$" - -LittlerootTown_Text_1E8D83: @ 81E8D83 - .string "{PLAYER}’s HOUSE$" - -LittlerootTown_Text_1E8D8E: @ 81E8D8E - .string "PROF. BIRCH’S HOUSE$" - -LittlerootTown_Text_1E8DA2: @ 81E8DA2 - .string "PROF. BIRCH: Well, well, {PLAYER}{KUN}!\n" - .string "That was good work out there!\p" - .string "I knew there was something special\n" - .string "about you when I first saw you,\l" - .string "but I never expected this.\p" - .string "Oh, yes. Do you still have the POKéDEX\n" - .string "I gave you?\p" - .string "I have something to show you.\n" - .string "Let’s go to my LAB.$" - diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc deleted file mode 100644 index 4c904b001..000000000 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ /dev/null @@ -1,451 +0,0 @@ -LittlerootTown_BrendansHouse_1F_MapScripts:: @ 81F7755 - map_script 1, LittlerootTown_BrendansHouse_1F_MapScript1_1F7765 - map_script 3, LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4 - map_script 2, LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA - .byte 0 - -LittlerootTown_BrendansHouse_1F_MapScript1_1F7765: @ 81F7765 - compare VAR_0x4092, 6 - call_if 0, LittlerootTown_BrendansHouse_1F_EventScript_1F777A - checkflag FLAG_0x112 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F778D - end - -LittlerootTown_BrendansHouse_1F_EventScript_1F777A:: @ 81F777A - setmetatile 5, 4, 624, 1 - setmetatile 5, 2, 616, 1 - return - -LittlerootTown_BrendansHouse_1F_EventScript_1F778D:: @ 81F778D - checkplayergender - compare VAR_RESULT, 0 - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F779A - return - -LittlerootTown_BrendansHouse_1F_EventScript_1F779A:: @ 81F779A - setmetatile 3, 7, 659, 1 - return - -LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4: @ 81F77A4 - compare VAR_0x4092, 3 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F77DE - compare VAR_0x4092, 5 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F77C6 - compare VAR_0x4092, 6 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F77D2 - end - -LittlerootTown_BrendansHouse_1F_EventScript_1F77C6:: @ 81F77C6 - setobjectxyperm 1, 8, 4 - setobjectmovementtype 1, 7 - return - -LittlerootTown_BrendansHouse_1F_EventScript_1F77D2:: @ 81F77D2 - setobjectxyperm 1, 4, 5 - setobjectmovementtype 1, 7 - return - -LittlerootTown_BrendansHouse_1F_EventScript_1F77DE:: @ 81F77DE - setobjectxyperm 1, 9, 8 - setobjectmovementtype 1, 7 - return - -LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA: @ 81F77EA - map_script_2 VAR_0x4092, 3, LittlerootTown_BrendansHouse_1F_EventScript_1F783C - map_script_2 VAR_0x4092, 5, LittlerootTown_BrendansHouse_1F_EventScript_1F7814 - map_script_2 VAR_0x4092, 6, LittlerootTown_BrendansHouse_1F_EventScript_1F784D - map_script_2 VAR_0x4082, 1, LittlerootTown_BrendansHouse_1F_EventScript_1F785E - map_script_2 VAR_0x4082, 3, LittlerootTown_BrendansHouse_1F_EventScript_292AF2 - .2byte 0 - -LittlerootTown_BrendansHouse_1F_EventScript_1F7814:: @ 81F7814 - lockall - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B67, 4 - closemessage - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1F783A - applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_1F783A - waitmovement 0 - warp MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 255, 7, 1 - waitstate - releaseall - end - -LittlerootTown_BrendansHouse_1F_Movement_1F783A: @ 81F783A - walk_up - step_end - -LittlerootTown_BrendansHouse_1F_EventScript_1F783C:: @ 81F783C - lockall - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 0 - goto LittlerootTown_BrendansHouse_1F_EventScript_292704 - end - -LittlerootTown_BrendansHouse_1F_EventScript_1F784D:: @ 81F784D - lockall - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 1 - goto LittlerootTown_BrendansHouse_1F_EventScript_29286D - end - -LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E - lockall - playse SE_PIN - applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_272598 - waitmovement 0 - applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_27259A - waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A4 - applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1F789C - waitmovement 0 - special GetRivalSonDaughterString - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8BC5, 4 - setflag FLAG_0x057 - setvar VAR_0x4082, 2 - releaseall - end - -LittlerootTown_BrendansHouse_1F_Movement_1F789C: @ 81F789C - walk_down - walk_right - walk_right - walk_right - walk_right - walk_right - step_end - -LittlerootTown_BrendansHouse_1F_EventScript_1F78A3:: @ 81F78A3 - lockall - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 0 - applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A4 - waitmovement 0 - goto LittlerootTown_BrendansHouse_1F_EventScript_292765 - end - -LittlerootTown_BrendansHouse_1F_EventScript_1F78BE:: @ 81F78BE - lockall - setvar VAR_0x8008, 0 - goto LittlerootTown_BrendansHouse_1F_EventScript_1F78E2 - end - -LittlerootTown_BrendansHouse_1F_EventScript_1F78CA:: @ 81F78CA - lockall - setvar VAR_0x8008, 1 - goto LittlerootTown_BrendansHouse_1F_EventScript_1F78E2 - end - -LittlerootTown_BrendansHouse_1F_EventScript_1F78D6:: @ 81F78D6 - lockall - setvar VAR_0x8008, 2 - goto LittlerootTown_BrendansHouse_1F_EventScript_1F78E2 - end - -LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 - playse SE_KAIDAN - delay 10 - addobject 7 - delay 30 - playse SE_PIN - applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_272598 - waitmovement 0 - applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_27259A - waitmovement 0 - compare VAR_0x8008, 1 - call_if 5, LittlerootTown_BrendansHouse_1F_EventScript_1F7981 - playbgm MUS_BOY_SUP, 1 - compare VAR_0x8008, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F798C - compare VAR_0x8008, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F7997 - compare VAR_0x8008, 2 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79A2 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F90B4, 4 - closemessage - compare VAR_0x8008, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79C1 - compare VAR_0x8008, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79D3 - compare VAR_0x8008, 2 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79E5 - playse SE_KAIDAN - removeobject 7 - setflag FLAG_0x2E9 - setflag FLAG_0x331 - clearflag FLAG_0x2F8 - delay 30 - setvar VAR_0x408D, 3 - setvar VAR_0x4050, 1 - savebgm MUS_DUMMY - fadedefaultbgm - releaseall - end - -LittlerootTown_BrendansHouse_1F_EventScript_1F7981:: @ 81F7981 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725AA - waitmovement 0 - return - -LittlerootTown_BrendansHouse_1F_EventScript_1F798C:: @ 81F798C - applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F79AD - waitmovement 0 - return - -LittlerootTown_BrendansHouse_1F_EventScript_1F7997:: @ 81F7997 - applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F79B5 - waitmovement 0 - return - -LittlerootTown_BrendansHouse_1F_EventScript_1F79A2:: @ 81F79A2 - applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F79B9 - waitmovement 0 - return - -LittlerootTown_BrendansHouse_1F_Movement_1F79AD: @ 81F79AD - 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 - walk_up - walk_up - walk_up - step_end - -LittlerootTown_BrendansHouse_1F_Movement_1F79B9: @ 81F79B9 - 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 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1F79F7 - applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F7A06 - waitmovement 0 - return - -LittlerootTown_BrendansHouse_1F_EventScript_1F79D3:: @ 81F79D3 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1F79FB - applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F7A0C - waitmovement 0 - return - -LittlerootTown_BrendansHouse_1F_EventScript_1F79E5:: @ 81F79E5 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1F7A02 - applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F7A16 - waitmovement 0 - return - -LittlerootTown_BrendansHouse_1F_Movement_1F79F7: @ 81F79F7 - delay_16 - delay_8 - walk_in_place_fastest_right - step_end - -LittlerootTown_BrendansHouse_1F_Movement_1F79FB: @ 81F79FB - 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 - delay_16 - delay_8 - walk_in_place_fastest_left - step_end - -LittlerootTown_BrendansHouse_1F_Movement_1F7A06: @ 81F7A06 - walk_in_place_fastest_right - walk_right - walk_in_place_fastest_up - walk_up - walk_up - step_end - -LittlerootTown_BrendansHouse_1F_Movement_1F7A0C: @ 81F7A0C - 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 - walk_in_place_fastest_left - walk_left - walk_in_place_fastest_up - walk_up - walk_up - step_end - -LittlerootTown_BrendansHouse_1F_Text_1F7A1C: @ 81F7A1C - .string "MOM: See, {PLAYER}?\n" - .string "Isn’t it nice in here, too?$" - -LittlerootTown_BrendansHouse_1F_Text_1F7A46: @ 81F7A46 - .string "The mover’s POKéMON do all the work\n" - .string "of moving us in and cleaning up after.\l" - .string "This is so convenient!\p" - .string "{PLAYER}, your room is upstairs.\n" - .string "Go check it out, dear!\p" - .string "DAD bought you a new clock to mark\n" - .string "our move here.\l" - .string "Don’t forget to set it!$" - -LittlerootTown_BrendansHouse_1F_Text_1F7B24: @ 81F7B24 - .string "MOM: Well, {PLAYER}?\p" - .string "Aren’t you interested in seeing your\n" - .string "very own room?$" - -LittlerootTown_BrendansHouse_1F_Text_1F7B67: @ 81F7B67 -LittlerootTown_MaysHouse_1F_Text_1F7B67: @ 81F7B67 - .string "MOM: {PLAYER}.\p" - .string "Go set the clock in your room, honey.$" - -LittlerootTown_BrendansHouse_1F_Text_1F7B96: @ 81F7B96 - .string "MOM: Oh! {PLAYER}, {PLAYER}!\n" - .string "Quick! Come quickly!$" - -LittlerootTown_BrendansHouse_1F_Text_1F7BBC: @ 81F7BBC -LittlerootTown_MaysHouse_1F_Text_1F7BBC: @ 81F7BBC - .string "MOM: Look! It’s PETALBURG GYM!\n" - .string "Maybe DAD will be on!$" - -LittlerootTown_BrendansHouse_1F_Text_1F7BF1: @ 81F7BF1 -LittlerootTown_MaysHouse_1F_Text_1F7BF1: @ 81F7BF1 - .string "MOM: Oh… It’s over.\p" - .string "I think DAD was on, but we missed him.\n" - .string "Too bad.$" - -LittlerootTown_BrendansHouse_1F_Text_1F7C35: @ 81F7C35 -LittlerootTown_MaysHouse_1F_Text_1F7C35: @ 81F7C35 - .string "Oh, yes.\n" - .string "One of DAD’s friends lives in town.\p" - .string "PROF. BIRCH is his name.\p" - .string "He lives right next door, so you should\n" - .string "go over and introduce yourself.$" - -LittlerootTown_BrendansHouse_1F_Text_1F7CC3: @ 81F7CC3 - .string "MOM: See you, honey!$" - -LittlerootTown_BrendansHouse_1F_Text_1F7CD8: @ 81F7CD8 - .string "MOM: Did you introduce yourself to\n" - .string "PROF. BIRCH?$" - -LittlerootTown_BrendansHouse_1F_Text_1F7D08: @ 81F7D08 - .string "MOM: How are you doing, {PLAYER}?\n" - .string "You look a little tired.\p" - .string "I think you should rest a bit.$" - -LittlerootTown_BrendansHouse_1F_Text_1F7D5C: @ 81F7D5C - .string "MOM: Take care, honey!$" - -LittlerootTown_BrendansHouse_1F_Text_1F7D73: @ 81F7D73 - .string "MOM: Oh? Did DAD give you that BADGE?\p" - .string "Then here’s something from your MOM!$" - -LittlerootTown_BrendansHouse_1F_Text_1F7DBE: @ 81F7DBE - .string "Don’t push yourself too hard, dear.\n" - .string "You can always come home.\p" - .string "Go for it, honey!$" - -LittlerootTown_BrendansHouse_1F_Text_1F7E0E: @ 81F7E0E - .string "MOM: What is that, honey? A POKéNAV?\n" - .string "Someone from DEVON gave it to you?\p" - .string "Well, honey, how about registering\n" - .string "your mom?\p" - .string "… … …$" - -LittlerootTown_BrendansHouse_1F_Text_1F7E89: @ 81F7E89 - .string "Registered MOM\n" - .string "in the POKéNAV.$" - -LittlerootTown_BrendansHouse_1F_Text_1F7EA8: @ 81F7EA8 - .string "Fugiiiiih!$" - -LittlerootTown_BrendansHouse_1F_Text_1F7EB3: @ 81F7EB3 - .string "Huggoh, uggo uggo…$" - -LittlerootTown_BrendansHouse_1F_Text_1F7EC6: @ 81F7EC6 - .string "INTERVIEWER: …We brought you this\n" - .string "report from in front of PETALBURG GYM.$" - -LittlerootTown_BrendansHouse_1F_Text_1F7F0F: @ 81F7F0F - .string "There is a movie on TV.\p" - .string "Two men are dancing on a big piano\n" - .string "keyboard.\p" - .string "Better get going!$" - -LittlerootTown_BrendansHouse_1F_Text_1F7F66: @ 81F7F66 - .string "It’s the instruction booklet for the\n" - .string "RUNNING SHOES.\p" - .string "“Press the B Button to run while\n" - .string "wearing your RUNNING SHOES.\p" - .string "“Lace up your RUNNING SHOES and hit\n" - .string "the road running!â€$" - -LittlerootTown_BrendansHouse_1F_Text_1F800E: @ 81F800E - .string "DAD: Hm?\p" - .string "Hey, it’s {PLAYER}!\p" - .string "It’s been a while since I saw you,\n" - .string "but you look…stronger, somehow.\p" - .string "That’s the impression I get.\n" - .string "But your old man hasn’t given up yet!\p" - .string "Oh, yes, I have something for you.\n" - .string "This came to you from someone named\l" - .string "MR. BRINEY.$" - -LittlerootTown_BrendansHouse_1F_Text_1F80FE: @ 81F80FE - .string "DAD: Hm, a TICKET for a ferry?\p" - .string "If I recall, there are ferry ports in\n" - .string "SLATEPORT and LILYCOVE.$" - -LittlerootTown_BrendansHouse_1F_Text_1F815B: @ 81F815B - .string "I’d better get back to PETALBURG GYM.\p" - .string "MOM, thanks for looking after the house\n" - .string "while I’m away.$" - -LittlerootTown_BrendansHouse_1F_Text_1F81B9: @ 81F81B9 - .string "MOM: That DAD of yours…\p" - .string "He comes home for the first time in a\n" - .string "while, but all he talks about is POKéMON.\p" - .string "He should relax and stay a little longer.$" - -LittlerootTown_BrendansHouse_1F_Text_1F824B: @ 81F824B - .string "MOM: Is that a breaking news story?$" - -LittlerootTown_BrendansHouse_1F_Text_1F826F: @ 81F826F - .string "We bring you this emergency\n" - .string "news flash!\p" - .string "In various HOENN locales, there have\n" - .string "been reports of a BZZT…colored\l" - .string "POKéMON in flight.\p" - .string "The identity of this POKéMON is\n" - .string "currently unknown.\p" - .string "We now return you to the regular\n" - .string "movie program.$" - -LittlerootTown_BrendansHouse_1F_Text_1F8351: @ 81F8351 - .string "MOM: {PLAYER}, did you catch that?\p" - .string "What color did the announcer say\n" - .string "that POKéMON was?$" - -LittlerootTown_BrendansHouse_1F_Text_1F83A1: @ 81F83A1 - .string "MOM: Well, isn’t that something!\n" - .string "There are still unknown POKéMON.$" diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc deleted file mode 100644 index 429c933fc..000000000 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ /dev/null @@ -1,318 +0,0 @@ -LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81F83E3 - map_script 3, LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE - map_script 4, LittlerootTown_BrendansHouse_2F_MapScript2_1F846A - .byte 0 - -LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE - compare VAR_0x408D, 2 - call_if 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8457 - compare VAR_0x408D, 3 - call_if 4, LittlerootTown_BrendansHouse_2F_EventScript_1F841A - compare VAR_0x4092, 4 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_2926FE - call LittlerootTown_BrendansHouse_2F_EventScript_275CE1 - setvar VAR_0x4089, 0 - end - -LittlerootTown_BrendansHouse_2F_EventScript_1F841A:: @ 81F841A - checkflag FLAG_0x124 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8433 - compare VAR_0x4084, 2 - goto_if 4, LittlerootTown_BrendansHouse_2F_EventScript_1F8456 - goto LittlerootTown_BrendansHouse_2F_EventScript_1F8433 - -LittlerootTown_BrendansHouse_2F_EventScript_1F8433:: @ 81F8433 - checkplayergender - compare VAR_RESULT, 0 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8456 - compare VAR_0x40D3, 2 - goto_if 4, LittlerootTown_BrendansHouse_2F_EventScript_1F9309 - setobjectxyperm 1, 0, 2 - setobjectmovementtype 1, 7 - return - -LittlerootTown_BrendansHouse_2F_EventScript_1F8456:: @ 81F8456 - return - -LittlerootTown_BrendansHouse_2F_EventScript_1F8457:: @ 81F8457 - checkplayergender - compare VAR_RESULT, 1 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8464 - return - -LittlerootTown_BrendansHouse_2F_EventScript_1F8464:: @ 81F8464 - setvar VAR_0x408D, 2 - return - -LittlerootTown_BrendansHouse_2F_MapScript2_1F846A: @ 81F846A - map_script_2 VAR_0x4089, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8474 - .2byte 0 - -LittlerootTown_BrendansHouse_2F_EventScript_1F8474:: @ 81F8474 - checkplayergender - compare VAR_RESULT, 0 - goto_eq EventScript_275D0C - end - -LittlerootTown_BrendansHouse_2F_EventScript_1F8481:: @ 81F8481 - lockall - compare VAR_0x408D, 2 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8497 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F9991, 4 - releaseall - end - -LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 - delay 10 - addobject 1 - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85BC - waitmovement 0 - playse SE_PIN - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_272598 - waitmovement 0 - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_27259A - waitmovement 0 - delay 10 - playbgm MUS_BOY_SUP, 1 - compare VAR_FACING, 2 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8507 - compare VAR_FACING, 1 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8536 - compare VAR_FACING, 3 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8565 - compare VAR_FACING, 4 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8594 - setvar VAR_0x408D, 3 - setflag FLAG_0x331 - clearflag FLAG_0x2F8 - setvar VAR_0x4050, 1 - savebgm MUS_DUMMY - fadedefaultbgm - releaseall - end - -LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507 - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85C0 - waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8 - waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, 4 - closemessage - applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1F85CF - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85C6 - waitmovement 0 - return - -LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536 - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85D7 - waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8 - waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, 4 - closemessage - applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1F85E2 - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85DB - waitmovement 0 - return - -LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565 - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85E8 - waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8 - waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, 4 - closemessage - applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1F85F6 - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85ED - waitmovement 0 - return - -LittlerootTown_BrendansHouse_2F_EventScript_1F8594:: @ 81F8594 - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85FD - waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A6 - waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, 4 - closemessage - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F8604 - waitmovement 0 - return - -LittlerootTown_BrendansHouse_2F_Movement_1F85BC: @ 81F85BC - walk_down - walk_down - walk_in_place_fastest_left - step_end - -LittlerootTown_BrendansHouse_2F_Movement_1F85C0: @ 81F85C0 - walk_left - walk_left - walk_down - walk_down - walk_left - step_end - -LittlerootTown_BrendansHouse_2F_Movement_1F85C6: @ 81F85C6 - 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 - 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 - walk_left - walk_left - walk_left - step_end - -LittlerootTown_BrendansHouse_2F_Movement_1F85DB: @ 81F85DB - walk_up - walk_left - walk_left - walk_left - walk_left - walk_in_place_fastest_up - step_end - -LittlerootTown_BrendansHouse_2F_Movement_1F85E2: @ 81F85E2 - delay_16 - walk_in_place_fastest_up - delay_16 - delay_16 - walk_in_place_fastest_left - step_end - -LittlerootTown_BrendansHouse_2F_Movement_1F85E8: @ 81F85E8 - walk_left - walk_left - walk_down - walk_in_place_fastest_left - step_end - -LittlerootTown_BrendansHouse_2F_Movement_1F85ED: @ 81F85ED - 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 - 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 - walk_left - walk_left - walk_left - walk_left - walk_left - walk_in_place_fastest_down - step_end - -LittlerootTown_BrendansHouse_2F_Movement_1F8604: @ 81F8604 - walk_up - walk_left - walk_left - walk_in_place_fastest_up - step_end - -LittlerootTown_BrendansHouse_2F_Movement_1F8609: @ 81F8609 - delay_16 - delay_16 - walk_in_place_fastest_left - step_end - -gUnknown_081F860D:: @ 81F860D - lockall - checkplayergender - compare VAR_RESULT, 0 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8626 - compare VAR_RESULT, 1 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F864C - end - -LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626 - setvar VAR_0x8004, 1 - special DoPCTurnOnEffect - playse SE_PC_ON - msgbox gUnknown_08272D87, 4 - special BedroomPC - waitstate - releaseall - end - -LittlerootTown_BrendansHouse_2F_EventScript_1F863F:: @ 81F863F - setvar VAR_0x8004, 1 - playse SE_PC_OFF - special DoPCTurnOffEffect - releaseall - end - -LittlerootTown_BrendansHouse_2F_EventScript_1F864C:: @ 81F864C - msgbox gUnknown_08272CD5, 4 - releaseall - end - -LittlerootTown_BrendansHouse_2F_EventScript_1F8656:: @ 81F8656 -LittlerootTown_MaysHouse_2F_EventScript_1F8656:: @ 81F8656 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F877F, 3 - end - -LittlerootTown_BrendansHouse_2F_EventScript_1F865F:: @ 81F865F -LittlerootTown_MaysHouse_2F_EventScript_1F865F:: @ 81F865F - msgbox LittlerootTown_BrendansHouse_2F_Text_1F884F, 3 - end - -LittlerootTown_BrendansHouse_2F_Text_1F8668: @ 81F8668 - .string "The clock is stopped…\p" - .string "Better set it and start it!$" - -LittlerootTown_BrendansHouse_2F_Text_1F869A: @ 81F869A - .string "MOM: {PLAYER}, how do you like your\n" - .string "new room?\p" - .string "Good! Everything’s put away neatly!\p" - .string "They finished moving everything in\n" - .string "downstairs, too.\p" - .string "POKéMON movers are so convenient!\p" - .string "Oh, you should make sure that\n" - .string "everything’s all there on your desk.$" - -LittlerootTown_BrendansHouse_2F_Text_1F877F: @ 81F877F - .string "{PLAYER} flipped open the notebook.\p" - .string "ADVENTURE RULE NO. 1\n" - .string "Open the MENU with START.\p" - .string "ADVENTURE RULE NO. 2\n" - .string "Record your progress with SAVE.\p" - .string "The remaining pages are blank…$" - -LittlerootTown_BrendansHouse_2F_Text_1F8820: @ 81F8820 - .string "{PLAYER} took a closer look at the\n" - .string "HOENN region map.$" - -LittlerootTown_BrendansHouse_2F_Text_1F884F: @ 81F884F - .string "It’s a Nintendo GameCube.\p" - .string "A Game Boy Advance is connected to\n" - .string "serve as the Controller.$" diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc deleted file mode 100644 index 99d47f938..000000000 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ /dev/null @@ -1,423 +0,0 @@ -LittlerootTown_MaysHouse_1F_MapScripts:: @ 81F88A5 - map_script 1, LittlerootTown_MaysHouse_1F_MapScript1_1F88B5 - map_script 3, LittlerootTown_MaysHouse_1F_MapScript1_1F88F4 - map_script 2, LittlerootTown_MaysHouse_1F_MapScript2_1F893A - .byte 0 - -LittlerootTown_MaysHouse_1F_MapScript1_1F88B5: @ 81F88B5 - compare VAR_0x4092, 6 - call_if 0, LittlerootTown_MaysHouse_1F_EventScript_1F88CA - checkflag FLAG_0x112 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F88DD - end - -LittlerootTown_MaysHouse_1F_EventScript_1F88CA:: @ 81F88CA - setmetatile 5, 4, 624, 1 - setmetatile 5, 2, 616, 1 - return - -LittlerootTown_MaysHouse_1F_EventScript_1F88DD:: @ 81F88DD - checkplayergender - compare VAR_RESULT, 1 - goto_eq LittlerootTown_MaysHouse_1F_EventScript_1F88EA - return - -LittlerootTown_MaysHouse_1F_EventScript_1F88EA:: @ 81F88EA - setmetatile 6, 7, 659, 1 - return - -LittlerootTown_MaysHouse_1F_MapScript1_1F88F4: @ 81F88F4 - compare VAR_0x4092, 3 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F892E - compare VAR_0x4092, 5 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8916 - compare VAR_0x4092, 6 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8922 - end - -LittlerootTown_MaysHouse_1F_EventScript_1F8916:: @ 81F8916 - setobjectxyperm 1, 2, 4 - setobjectmovementtype 1, 7 - return - -LittlerootTown_MaysHouse_1F_EventScript_1F8922:: @ 81F8922 - setobjectxyperm 1, 6, 5 - setobjectmovementtype 1, 7 - return - -LittlerootTown_MaysHouse_1F_EventScript_1F892E:: @ 81F892E - setobjectxyperm 1, 1, 8 - setobjectmovementtype 1, 7 - return - -LittlerootTown_MaysHouse_1F_MapScript2_1F893A: @ 81F893A - map_script_2 VAR_0x4092, 3, LittlerootTown_MaysHouse_1F_EventScript_1F898C - map_script_2 VAR_0x4092, 5, LittlerootTown_MaysHouse_1F_EventScript_1F8964 - map_script_2 VAR_0x4092, 6, LittlerootTown_MaysHouse_1F_EventScript_1F899D - map_script_2 VAR_0x408C, 1, LittlerootTown_MaysHouse_1F_EventScript_1F89AE - map_script_2 VAR_0x4082, 3, LittlerootTown_MaysHouse_1F_EventScript_292AF2 - .2byte 0 - -LittlerootTown_MaysHouse_1F_EventScript_1F8964:: @ 81F8964 - lockall - msgbox LittlerootTown_MaysHouse_1F_Text_1F7B67, 4 - closemessage - applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1F898A - applymovement 1, LittlerootTown_MaysHouse_1F_Movement_1F898A - waitmovement 0 - warp MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F, 255, 1, 1 - waitstate - releaseall - end - -LittlerootTown_MaysHouse_1F_Movement_1F898A: @ 81F898A - walk_up - step_end - -LittlerootTown_MaysHouse_1F_EventScript_1F898C:: @ 81F898C - lockall - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - goto LittlerootTown_MaysHouse_1F_EventScript_292704 - end - -LittlerootTown_MaysHouse_1F_EventScript_1F899D:: @ 81F899D - lockall - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - goto LittlerootTown_MaysHouse_1F_EventScript_2928DC - end - -LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE - lockall - playse SE_PIN - applymovement 4, LittlerootTown_MaysHouse_1F_Movement_272598 - waitmovement 0 - applymovement 4, LittlerootTown_MaysHouse_1F_Movement_27259A - waitmovement 0 - applymovement 255, LittlerootTown_MaysHouse_1F_Movement_2725A8 - applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1F89EC - waitmovement 0 - special GetRivalSonDaughterString - msgbox LittlerootTown_MaysHouse_1F_Text_1F8BC5, 4 - setflag FLAG_0x057 - setvar VAR_0x408C, 2 - releaseall - end - -LittlerootTown_MaysHouse_1F_Movement_1F89EC: @ 81F89EC - walk_down - walk_left - walk_left - walk_left - walk_left - walk_left - step_end - -LittlerootTown_BrendansHouse_1F_EventScript_1F89F3:: @ 81F89F3 -LittlerootTown_MaysHouse_1F_EventScript_1F89F3:: @ 81F89F3 - lock - faceplayer - checkflag FLAG_0x082 - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A33 - checkflag FLAG_SYS_POKEMON_GET - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A29 - compare VAR_0x408D, 3 - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F - special GetRivalSonDaughterString - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8CA5, 4 - release - end - -LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F:: @ 81F8A1F - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8D37, 4 - release - end - -LittlerootTown_BrendansHouse_1F_EventScript_1F8A29:: @ 81F8A29 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8D93, 4 - release - end - -LittlerootTown_BrendansHouse_1F_EventScript_1F8A33:: @ 81F8A33 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8E01, 4 - release - end - -LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D:: @ 81F8A3D -LittlerootTown_MaysHouse_1F_EventScript_1F8A3D:: @ 81F8A3D - lock - faceplayer - special GetPlayerBigGuyGirlString - msgbox LittlerootTown_BrendansHouse_1F_Text_1F9262, 4 - release - end - -LittlerootTown_MaysHouse_1F_EventScript_1F8A4C:: @ 81F8A4C - lockall - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - applymovement VAR_0x8004, LittlerootTown_MaysHouse_1F_Movement_2725A8 - waitmovement 0 - goto LittlerootTown_MaysHouse_1F_EventScript_292765 - end - -LittlerootTown_MaysHouse_1F_EventScript_1F8A67:: @ 81F8A67 - lockall - setvar VAR_0x8008, 0 - goto LittlerootTown_MaysHouse_1F_EventScript_1F8A8B - end - -LittlerootTown_MaysHouse_1F_EventScript_1F8A73:: @ 81F8A73 - lockall - setvar VAR_0x8008, 1 - goto LittlerootTown_MaysHouse_1F_EventScript_1F8A8B - end - -LittlerootTown_MaysHouse_1F_EventScript_1F8A7F:: @ 81F8A7F - lockall - setvar VAR_0x8008, 2 - goto LittlerootTown_MaysHouse_1F_EventScript_1F8A8B - end - -LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B - playse SE_KAIDAN - delay 10 - addobject 7 - delay 30 - playse SE_PIN - applymovement 7, LittlerootTown_MaysHouse_1F_Movement_272598 - waitmovement 0 - applymovement 7, LittlerootTown_MaysHouse_1F_Movement_27259A - waitmovement 0 - compare VAR_0x8008, 1 - call_if 5, LittlerootTown_MaysHouse_1F_EventScript_1F8B2A - playbgm MUS_GIRL_SUP, 1 - compare VAR_0x8008, 0 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B35 - compare VAR_0x8008, 1 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B40 - compare VAR_0x8008, 2 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B4B - msgbox LittlerootTown_MaysHouse_1F_Text_1F8EC6, 4 - closemessage - compare VAR_0x8008, 0 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B6A - compare VAR_0x8008, 1 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B7C - compare VAR_0x8008, 2 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B8E - playse SE_KAIDAN - removeobject 7 - setflag FLAG_0x2EA - setflag FLAG_0x332 - clearflag FLAG_0x2D2 - delay 30 - setvar VAR_0x408D, 3 - setvar VAR_0x4050, 1 - savebgm MUS_DUMMY - fadedefaultbgm - releaseall - end - -LittlerootTown_MaysHouse_1F_EventScript_1F8B2A:: @ 81F8B2A - applymovement 255, LittlerootTown_MaysHouse_1F_Movement_2725AA - waitmovement 0 - return - -LittlerootTown_MaysHouse_1F_EventScript_1F8B35:: @ 81F8B35 - applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8B56 - waitmovement 0 - return - -LittlerootTown_MaysHouse_1F_EventScript_1F8B40:: @ 81F8B40 - applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8B5E - waitmovement 0 - return - -LittlerootTown_MaysHouse_1F_EventScript_1F8B4B:: @ 81F8B4B - applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8B62 - waitmovement 0 - return - -LittlerootTown_MaysHouse_1F_Movement_1F8B56: @ 81F8B56 - 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 - walk_up - walk_up - walk_up - step_end - -LittlerootTown_MaysHouse_1F_Movement_1F8B62: @ 81F8B62 - 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 - applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1F8BA0 - applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8BAF - waitmovement 0 - return - -LittlerootTown_MaysHouse_1F_EventScript_1F8B7C:: @ 81F8B7C - applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1F8BA4 - applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8BB5 - waitmovement 0 - return - -LittlerootTown_MaysHouse_1F_EventScript_1F8B8E:: @ 81F8B8E - applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1F8BAB - applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8BBF - waitmovement 0 - return - -LittlerootTown_MaysHouse_1F_Movement_1F8BA0: @ 81F8BA0 - delay_16 - delay_8 - walk_in_place_fastest_right - step_end - -LittlerootTown_MaysHouse_1F_Movement_1F8BA4: @ 81F8BA4 - 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 - delay_16 - delay_8 - walk_in_place_fastest_left - step_end - -LittlerootTown_MaysHouse_1F_Movement_1F8BAF: @ 81F8BAF - walk_in_place_fastest_right - walk_right - walk_in_place_fastest_up - walk_up - walk_up - step_end - -LittlerootTown_MaysHouse_1F_Movement_1F8BB5: @ 81F8BB5 - 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 - walk_in_place_fastest_left - walk_left - walk_in_place_fastest_up - walk_up - walk_up - step_end - -LittlerootTown_BrendansHouse_1F_Text_1F8BC5: @ 81F8BC5 -LittlerootTown_MaysHouse_1F_Text_1F8BC5: @ 81F8BC5 - .string "Oh, hello. And you are?\p" - .string "… … … … … … … … …\n" - .string "… … … … … … … … …\p" - .string "Oh, you’re {PLAYER}{KUN}, our new next-door\n" - .string "neighbor! Hi!\p" - .string "We have a {STR_VAR_1} about the same\n" - .string "age as you.\p" - .string "Our {STR_VAR_1} was excited about making\n" - .string "a new friend.\p" - .string "Our {STR_VAR_1} is upstairs, I think.$" - -LittlerootTown_BrendansHouse_1F_Text_1F8CA5: @ 81F8CA5 - .string "Like child, like father.\p" - .string "My husband is as wild about POKéMON\n" - .string "as our child.\p" - .string "If he’s not at his LAB, he’s likely\n" - .string "scrabbling about in grassy places.$" - -LittlerootTown_BrendansHouse_1F_Text_1F8D37: @ 81F8D37 - .string "That {RIVAL}!\p" - .string "I guess our child is too busy with\n" - .string "POKéMON to notice that you came\l" - .string "to visit, {PLAYER}{KUN}.$" - -LittlerootTown_BrendansHouse_1F_Text_1F8D93: @ 81F8D93 - .string "Oh, {RIVAL} went out to ROUTE 103\n" - .string "just a little while ago.\p" - .string "Like father, like child.\n" - .string "{RIVAL} can’t stay quietly at home.$" - -LittlerootTown_BrendansHouse_1F_Text_1F8E01: @ 81F8E01 - .string "I think it’s wonderful for people to\n" - .string "travel with POKéMON.\p" - .string "But you should go home every so often\n" - .string "to let your mother know you’re okay.\p" - .string "She might not say it, but I’m sure she\n" - .string "worries about you, {PLAYER}{KUN}.$" - -LittlerootTown_MaysHouse_1F_Text_1F8EC6: @ 81F8EC6 - .string "Huh?\n" - .string "Who… Who are you?\p" - .string "… … … … … … … …\n" - .string "… … … … … … … …\p" - .string "Oh, you’re {PLAYER}{KUN}.\n" - .string "So your move was today.\p" - .string "Um… I’m MAY.\n" - .string "Glad to meet you!\p" - .string "I…\n" - .string "I have this dream of becoming friends\l" - .string "with POKéMON all over the world.\p" - .string "I… I heard about you, {PLAYER}{KUN}, from\n" - .string "my dad, PROF. BIRCH.\p" - .string "I was hoping that you would be nice,\n" - .string "{PLAYER}{KUN}, and that we could be friends.\p" - .string "Oh, this is silly, isn’t it?\n" - .string "I… I’ve just met you, {PLAYER}{KUN}.\p" - .string "Eheheh…\p" - .string "Oh, no! I forgot!\p" - .string "I was supposed to go help Dad catch\n" - .string "some wild POKéMON!\p" - .string "{PLAYER}{KUN}, I’ll catch you later!$" - -LittlerootTown_BrendansHouse_1F_Text_1F90B4: @ 81F90B4 - .string "Hey!\n" - .string "You…\p" - .string "Who are you?\p" - .string "Oh, you’re {PLAYER}, aren’t you?\n" - .string "Moved in next door, right?\p" - .string "I didn’t know that you’re a girl.\p" - .string "Dad, PROF. BIRCH, said that our new\n" - .string "next-door neighbor is a GYM LEADER’s\l" - .string "kid, so I assumed you’d be a guy.\p" - .string "My name’s BRENDAN.\n" - .string "So, hi, neighbor!\p" - .string "Huh? Hey, {PLAYER}, don’t you have\n" - .string "a POKéMON?\p" - .string "Do you want me to go catch you one?\p" - .string "Aw, darn, I forgot…\p" - .string "I’m supposed to go help my dad catch\n" - .string "some wild POKéMON.\p" - .string "Some other time, okay?$" - -LittlerootTown_BrendansHouse_1F_Text_1F9262: @ 81F9262 - .string "Hi, neighbor!\p" - .string "Do you already have your\n" - .string "own POKéMON?$" diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc deleted file mode 100644 index 5501f5ad5..000000000 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ /dev/null @@ -1,422 +0,0 @@ -LittlerootTown_MaysHouse_2F_MapScripts:: @ 81F9296 - map_script 3, LittlerootTown_MaysHouse_2F_MapScript1_1F92A1 - map_script 4, LittlerootTown_MaysHouse_2F_MapScript2_1F931D - .byte 0 - -LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1 - compare VAR_0x408D, 2 - call_if 0, LittlerootTown_MaysHouse_2F_EventScript_1F930A - compare VAR_0x408D, 3 - call_if 4, LittlerootTown_MaysHouse_2F_EventScript_1F92CD - compare VAR_0x4092, 4 - call_if 1, LittlerootTown_MaysHouse_2F_EventScript_2926FE - call LittlerootTown_MaysHouse_2F_EventScript_275CE1 - setvar VAR_0x4089, 0 - end - -LittlerootTown_MaysHouse_2F_EventScript_1F92CD:: @ 81F92CD - checkflag FLAG_0x124 - goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F92E6 - compare VAR_0x4084, 2 - goto_if 4, LittlerootTown_MaysHouse_2F_EventScript_1F9309 - goto LittlerootTown_MaysHouse_2F_EventScript_1F92E6 - -LittlerootTown_MaysHouse_2F_EventScript_1F92E6:: @ 81F92E6 - checkplayergender - compare VAR_RESULT, 1 - goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F9309 - compare VAR_0x40D3, 2 - goto_if 4, LittlerootTown_MaysHouse_2F_EventScript_1F9309 - setobjectxyperm 1, 8, 2 - setobjectmovementtype 1, 7 - return - -LittlerootTown_BrendansHouse_2F_EventScript_1F9309:: @ 81F9309 -LittlerootTown_MaysHouse_2F_EventScript_1F9309:: @ 81F9309 - return - -LittlerootTown_MaysHouse_2F_EventScript_1F930A:: @ 81F930A - checkplayergender - compare VAR_RESULT, 0 - goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F9317 - return - -LittlerootTown_MaysHouse_2F_EventScript_1F9317:: @ 81F9317 - setvar VAR_0x408D, 2 - return - -LittlerootTown_MaysHouse_2F_MapScript2_1F931D: @ 81F931D - map_script_2 VAR_0x4089, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9327 - .2byte 0 - -LittlerootTown_MaysHouse_2F_EventScript_1F9327:: @ 81F9327 - checkplayergender - compare VAR_RESULT, 1 - goto_eq EventScript_275D0C - end - -LittlerootTown_MaysHouse_2F_EventScript_1F9334:: @ 81F9334 - lockall - compare VAR_0x408D, 2 - goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F934A - msgbox LittlerootTown_MaysHouse_2F_Text_1F9991, 4 - releaseall - end - -LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A - delay 10 - addobject 1 - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F946F - waitmovement 0 - playse SE_PIN - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_272598 - waitmovement 0 - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_27259A - waitmovement 0 - delay 10 - playbgm MUS_GIRL_SUP, 1 - compare VAR_FACING, 2 - call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F93BA - compare VAR_FACING, 1 - call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F93E9 - compare VAR_FACING, 3 - call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F9418 - compare VAR_FACING, 4 - call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F9440 - setvar VAR_0x408D, 3 - setflag FLAG_0x332 - clearflag FLAG_0x2D2 - setvar VAR_0x4050, 1 - savebgm MUS_DUMMY - fadedefaultbgm - releaseall - end - -LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F9473 - waitmovement 0 - applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A4 - waitmovement 0 - msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, 4 - closemessage - applymovement 255, LittlerootTown_MaysHouse_2F_Movement_1F9483 - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F9479 - waitmovement 0 - return - -LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9 - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F948B - waitmovement 0 - applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A4 - waitmovement 0 - msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, 4 - closemessage - applymovement 255, LittlerootTown_MaysHouse_2F_Movement_1F9497 - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F948F - waitmovement 0 - return - -LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418 - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F949D - waitmovement 0 - applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A6 - waitmovement 0 - msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, 4 - closemessage - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94A4 - waitmovement 0 - return - -LittlerootTown_MaysHouse_2F_EventScript_1F9440:: @ 81F9440 - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94AD - waitmovement 0 - applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A4 - waitmovement 0 - msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, 4 - closemessage - applymovement 255, LittlerootTown_MaysHouse_2F_Movement_1F94BB - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94B2 - waitmovement 0 - return - -LittlerootTown_MaysHouse_2F_Movement_1F946F: @ 81F946F - walk_down - walk_down - walk_in_place_fastest_right - step_end - -LittlerootTown_MaysHouse_2F_Movement_1F9473: @ 81F9473 - walk_right - walk_right - walk_down - walk_down - walk_right - step_end - -LittlerootTown_MaysHouse_2F_Movement_1F9479: @ 81F9479 - 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 - 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 - walk_right - walk_right - walk_right - step_end - -LittlerootTown_MaysHouse_2F_Movement_1F948F: @ 81F948F - 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 - delay_16 - walk_in_place_fastest_up - delay_16 - delay_16 - walk_in_place_fastest_right - step_end - -LittlerootTown_MaysHouse_2F_Movement_1F949D: @ 81F949D - walk_right - walk_right - walk_right - walk_right - walk_right - walk_in_place_fastest_down - step_end - -LittlerootTown_MaysHouse_2F_Movement_1F94A4: @ 81F94A4 - walk_up - walk_right - walk_right - walk_in_place_fastest_up - step_end - -LittlerootTown_MaysHouse_2F_Movement_1F94A9: @ 81F94A9 - delay_16 - delay_16 - walk_in_place_fastest_right - step_end - -LittlerootTown_MaysHouse_2F_Movement_1F94AD: @ 81F94AD - walk_right - walk_right - walk_down - walk_in_place_fastest_right - step_end - -LittlerootTown_MaysHouse_2F_Movement_1F94B2: @ 81F94B2 - 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 - delay_16 - walk_in_place_fastest_up - delay_16 - delay_16 - walk_in_place_fastest_right - step_end - -LittlerootTown_BrendansHouse_2F_EventScript_1F94C1:: @ 81F94C1 -LittlerootTown_MaysHouse_2F_EventScript_1F94C1:: @ 81F94C1 - lockall - checkflag FLAG_0x124 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94F7 - checkplayergender - compare VAR_RESULT, 0 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94E3 - compare VAR_RESULT, 1 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94ED - end - -LittlerootTown_BrendansHouse_2F_EventScript_1F94E3:: @ 81F94E3 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F978A, 4 - releaseall - end - -LittlerootTown_BrendansHouse_2F_EventScript_1F94ED:: @ 81F94ED - msgbox LittlerootTown_BrendansHouse_2F_Text_1F9962, 4 - releaseall - end - -LittlerootTown_BrendansHouse_2F_EventScript_1F94F7:: @ 81F94F7 - applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_27259E - waitmovement 0 - checkplayergender - compare VAR_RESULT, 0 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F951D - compare VAR_RESULT, 1 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F952F - setflag FLAG_0x125 - releaseall - end - -LittlerootTown_BrendansHouse_2F_EventScript_1F951D:: @ 81F951D - checkflag FLAG_0x125 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F9541 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F99C9, 4 - return - -LittlerootTown_BrendansHouse_2F_EventScript_1F952F:: @ 81F952F - checkflag FLAG_0x125 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F954A - msgbox LittlerootTown_BrendansHouse_2F_Text_1F9B0D, 4 - return - -LittlerootTown_BrendansHouse_2F_EventScript_1F9541:: @ 81F9541 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F9A9E, 4 - return - -LittlerootTown_BrendansHouse_2F_EventScript_1F954A:: @ 81F954A - msgbox LittlerootTown_BrendansHouse_2F_Text_1F9BE7, 4 - return - -gUnknown_081F9553:: @ 81F9553 - lockall - checkplayergender - compare VAR_RESULT, 0 - goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F956C - compare VAR_RESULT, 1 - goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F9576 - end - -LittlerootTown_MaysHouse_2F_EventScript_1F956C:: @ 81F956C - msgbox gUnknown_08272CD5, 4 - releaseall - end - -LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576 - setvar VAR_0x8004, 2 - special DoPCTurnOnEffect - playse SE_PC_ON - msgbox gUnknown_08272D87, 4 - special BedroomPC - waitstate - releaseall - end - -LittlerootTown_MaysHouse_2F_EventScript_1F958F:: @ 81F958F - setvar VAR_0x8004, 2 - playse SE_PC_OFF - special DoPCTurnOffEffect - releaseall - end - -LittlerootTown_MaysHouse_2F_Text_1F959C: @ 81F959C - .string "Huh?\n" - .string "Who… Who are you?\p" - .string "… … … … … … … …\n" - .string "… … … … … … … …\p" - .string "Oh, you’re {PLAYER}{KUN}.\n" - .string "So your move was today.\p" - .string "Um… I’m MAY.\n" - .string "Glad to meet you!\p" - .string "I…\n" - .string "I have this dream of becoming friends\l" - .string "with POKéMON all over the world.\p" - .string "I… I heard about you, {PLAYER}{KUN}, from\n" - .string "my dad, PROF. BIRCH.\p" - .string "I was hoping that you would be nice,\n" - .string "{PLAYER}{KUN}, and that we could be friends.\p" - .string "Oh, this is silly, isn’t it?\n" - .string "I… I’ve just met you, {PLAYER}{KUN}.\p" - .string "Eheheh…\p" - .string "Oh, no! I forgot!\p" - .string "I was supposed to go help Dad catch\n" - .string "some wild POKéMON!\p" - .string "{PLAYER}{KUN}, I’ll catch you later!$" - -LittlerootTown_BrendansHouse_2F_Text_1F978A: @ 81F978A - .string "POKéMON fully restored!\n" - .string "Items ready, and…$" - -LittlerootTown_BrendansHouse_2F_Text_1F97B4: @ 81F97B4 - .string "Hey!\n" - .string "You…\p" - .string "Who are you?\p" - .string "Oh, you’re {PLAYER}, aren’t you?\n" - .string "Moved in next door, right?\p" - .string "I didn’t know that you’re a girl.\p" - .string "Dad, PROF. BIRCH, said that our new\n" - .string "next-door neighbor is a GYM LEADER’s\l" - .string "kid, so I assumed you’d be a guy.\p" - .string "My name’s BRENDAN.\n" - .string "So, hi, neighbor!\p" - .string "Huh? Hey, {PLAYER}, don’t you have\n" - .string "a POKéMON?\p" - .string "Do you want me to go catch you one?\p" - .string "Aw, darn, I forgot…\p" - .string "I’m supposed to go help my dad catch\n" - .string "some wild POKéMON.\p" - .string "Some other time, okay?$" - -LittlerootTown_BrendansHouse_2F_Text_1F9962: @ 81F9962 - .string "POKéMON fully restored…\n" - .string "Items all packed, and…$" - -LittlerootTown_BrendansHouse_2F_Text_1F9991: @ 81F9991 -LittlerootTown_MaysHouse_2F_Text_1F9991: @ 81F9991 - .string "It’s {RIVAL}’s POKé BALL!\p" - .string "Better leave it right where it is.$" - -LittlerootTown_BrendansHouse_2F_Text_1F99C9: @ 81F99C9 - .string "MAY: {PLAYER}{KUN}!\p" - .string "I was just checking my POKéDEX.\p" - .string "There’s still a lot of POKéMON that\n" - .string "I’ve seen but haven’t caught.\p" - .string "And there are many others that\n" - .string "I think will evolve.\p" - .string "I wonder where I should go catch\n" - .string "some POKéMON next?$" - -LittlerootTown_BrendansHouse_2F_Text_1F9A9E: @ 81F9A9E - .string "MAY: I wonder where I should go catch\n" - .string "some POKéMON next?\p" - .string "Wouldn’t it be funny if we ran into each\n" - .string "other, {PLAYER}{KUN}?$" - -LittlerootTown_BrendansHouse_2F_Text_1F9B0D: @ 81F9B0D - .string "BRENDAN: Hey, it’s {PLAYER}.\p" - .string "I was just checking out my POKéDEX.\p" - .string "There are still many POKéMON that\n" - .string "I need to catch, I know, but this\l" - .string "is looking pretty good.\p" - .string "Checking this POKéDEX out gives me\n" - .string "the urge to hit the road again.$" - -LittlerootTown_BrendansHouse_2F_Text_1F9BE7: @ 81F9BE7 - .string "BRENDAN: I’m having a hard time deciding\n" - .string "where I should catch POKéMON next.\p" - .string "Hey, {PLAYER}, if I see you while I’m out\n" - .string "catching POKéMON, I can pitch you a\l" - .string "battle if you’d like.$" diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc deleted file mode 100644 index 75b83b6a1..000000000 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ /dev/null @@ -1,1030 +0,0 @@ -LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 81F9C91 - map_script 3, LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1 - map_script 4, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06 - map_script 2, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9DB9 - .byte 0 - -LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1 - call LittlerootTown_ProfessorBirchsLab_EventScript_271ED7 - call LittlerootTown_ProfessorBirchsLab_EventScript_2720AD - compare VAR_0x40D3, 6 - goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7 - compare VAR_0x40D3, 4 - goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3 - compare VAR_0x40D3, 3 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD:: @ 81F9CCD - specialvar VAR_RESULT, sub_80C08E4 - compare VAR_RESULT, 1 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9 - setobjectmovementtype 3, 3 - setobjectxyperm 3, 5, 10 - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9:: @ 81F9CE9 - setvar VAR_0x40D3, 4 - goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3 - -LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3:: @ 81F9CF3 - setmaplayoutindex 432 - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7:: @ 81F9CF7 - setmaplayoutindex 432 - setobjectmovementtype 3, 3 - setobjectxyperm 3, 5, 10 - end - -LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06: @ 81F9D06 - map_script_2 VAR_0x4084, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40 - map_script_2 VAR_0x40D3, 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45 - map_script_2 VAR_0x40D3, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45 - map_script_2 VAR_0x40D3, 3, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D71 - map_script_2 VAR_0x40D3, 6, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D71 - map_script_2 VAR_0x40D3, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75 - map_script_2 VAR_0x40D3, 5, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75 - .2byte 0 - -LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40:: @ 81F9D40 - turnobject 255, 2 - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45:: @ 81F9D45 - turnobject 255, 2 - addobject 2 - addobject 3 - turnobject 3, 2 - setobjectxy 3, 5, 5 - turnobject 2, 1 - setobjectxy 2, 6, 4 - turnobject 1, 4 - setobjectxy 1, 10, 10 - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1F9D71:: @ 81F9D71 - addobject 3 - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75:: @ 81F9D75 - addobject 4 - addobject 5 - addobject 6 - addobject 3 - turnobject 4, 1 - setobjectxy 4, 8, 4 - turnobject 5, 1 - setobjectxy 5, 9, 4 - turnobject 6, 1 - setobjectxy 6, 10, 4 - turnobject 2, 1 - setobjectxy 2, 6, 4 - turnobject 3, 4 - setobjectxy 3, 5, 5 - end - -LittlerootTown_ProfessorBirchsLab_MapScript2_1F9DB9: @ 81F9DB9 - map_script_2 VAR_0x4084, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB - map_script_2 VAR_0x4084, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67 - map_script_2 VAR_0x40D3, 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80 - map_script_2 VAR_0x40D3, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62 - .2byte 0 - -LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB:: @ 81F9DDB - lockall - bufferleadmonspeciesname 0 - message LittlerootTown_ProfessorBirchsLab_Text_1FA74D - waitmessage - playfanfare MUS_FANFA4 - waitfanfare - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8B1, 5 - compare VAR_RESULT, 1 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07 - compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17 - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07:: @ 81F9E07 - setvar VAR_0x8004, 0 - call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD - goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17 - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17:: @ 81F9E17 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8F6, 5 - compare VAR_RESULT, 1 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36 - compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48 - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36:: @ 81F9E36 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA9D5, 4 - clearflag FLAG_0x3DF - setvar VAR_0x4084, 3 - releaseall - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48:: @ 81F9E48 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA35, 5 - compare VAR_RESULT, 1 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36 - compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48 - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67:: @ 81F9E67 - lockall - applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_1F9E78 - waitmovement 0 - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8 - end - -LittlerootTown_ProfessorBirchsLab_Movement_1F9E78: @ 81F9E78 - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - step_end - -LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 - lockall - delay 30 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB16D, 4 - closemessage - applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_1F9F46 - waitmovement 0 - delay 20 - playse SE_TK_KASYA - delay 10 - playse SE_TK_KASYA - delay 10 - playse SE_TK_KASYA - delay 10 - playse SE_TK_KASYA - delay 20 - applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 - applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_2725A4 - waitmovement 0 - checkplayergender - compare VAR_RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F32 - compare VAR_RESULT, 1 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F3C - playse SE_PC_ON - waitse - delay 20 - applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_1F9F58 - waitmovement 0 - applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_2725A6 - applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_2725A6 - waitmovement 0 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB419, 4 - playfanfare MUS_FANFA4 - message LittlerootTown_ProfessorBirchsLab_Text_1FB436 - waitmessage - waitfanfare - setflag FLAG_SYS_NATIONAL_DEX - special EnableNationalPokedex - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB466, 4 - closemessage - setflag FLAG_0x31B - setflag FLAG_0x31A - setvar VAR_0x40D3, 2 - setvar VAR_0x40F5, 0 - setflag FLAG_0x072 - releaseall - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1F9F32:: @ 81F9F32 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB30F, 4 - closemessage - return - -LittlerootTown_ProfessorBirchsLab_EventScript_1F9F3C:: @ 81F9F3C - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB38E, 4 - closemessage - return - -LittlerootTown_ProfessorBirchsLab_Movement_1F9F46: @ 81F9F46 - 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 - 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 - lockall - applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C - waitmovement 0 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB5F9, 4 - setvar VAR_0x40D3, 5 - releaseall - end - -LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C: @ 81F9F7C - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - step_end - -LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84:: @ 81F9F84 - lock - faceplayer - compare VAR_0x4084, 3 - goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1 - checkflag FLAG_0x058 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA4E2, 4 - setflag FLAG_0x058 - release - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7:: @ 81F9FA7 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA641, 4 - release - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1:: @ 81F9FB1 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA6CE, 4 - release - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB:: @ 81F9FBB - release - compare VAR_0x40D3, 6 - goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 - applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 - waitmovement 0 - drawmonpic SPECIES_CYNDAQUIL, 10, 3 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, 5 - compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF:: @ 81F9FEF - release - compare VAR_0x40D3, 6 - goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 - applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 - waitmovement 0 - drawmonpic SPECIES_TOTODILE, 10, 3 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, 5 - compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA023:: @ 81FA023 - release - compare VAR_0x40D3, 6 - goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 - applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 - waitmovement 0 - drawmonpic SPECIES_CHIKORITA, 10, 3 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, 5 - compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA057:: @ 81FA057 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBAF8, 4 - releaseall - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA061:: @ 81FA061 - erasemonpic - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB959, 4 - releaseall - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C:: @ 81FA06C - bufferspeciesname 0, SPECIES_CYNDAQUIL - setvar VAR_TEMP_1, 155 - givemon SPECIES_CYNDAQUIL, 5, ITEM_NONE, 0x0, 0x0, 0 - compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1 - compare VAR_RESULT, 1 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC - erasemonpic - goto LittlerootTown_ProfessorBirchsLab_EventScript_273811 - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1 - call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F - removeobject 4 - msgbox gUnknown_08273374, 5 - compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD - call LittlerootTown_ProfessorBirchsLab_EventScript_27378B - call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC:: @ 81FA0CC - call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F - removeobject 4 - msgbox gUnknown_08273374, 5 - compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2 - call LittlerootTown_ProfessorBirchsLab_EventScript_273797 - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2 - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2:: @ 81FA0F2 - call LittlerootTown_ProfessorBirchsLab_EventScript_2737A0 - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD:: @ 81FA0FD - erasemonpic - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, 4 - setvar VAR_0x40D3, 6 - releaseall - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D:: @ 81FA10D - bufferspeciesname 0, SPECIES_TOTODILE - setvar VAR_TEMP_1, 158 - givemon SPECIES_TOTODILE, 5, ITEM_NONE, 0x0, 0x0, 0 - compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA142 - compare VAR_RESULT, 1 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D - erasemonpic - goto LittlerootTown_ProfessorBirchsLab_EventScript_273811 - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142 - call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F - removeobject 5 - msgbox gUnknown_08273374, 5 - compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E - call LittlerootTown_ProfessorBirchsLab_EventScript_27378B - call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D:: @ 81FA16D - call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F - removeobject 5 - msgbox gUnknown_08273374, 5 - compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA193 - call LittlerootTown_ProfessorBirchsLab_EventScript_273797 - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA193 - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA193:: @ 81FA193 - call LittlerootTown_ProfessorBirchsLab_EventScript_2737A0 - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E:: @ 81FA19E - erasemonpic - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, 4 - setvar VAR_0x40D3, 6 - releaseall - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE:: @ 81FA1AE - bufferspeciesname 0, SPECIES_CHIKORITA - setvar VAR_TEMP_1, 152 - givemon SPECIES_CHIKORITA, 5, ITEM_NONE, 0x0, 0x0, 0 - compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3 - compare VAR_RESULT, 1 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E - erasemonpic - goto LittlerootTown_ProfessorBirchsLab_EventScript_273811 - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3 - call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F - removeobject 6 - msgbox gUnknown_08273374, 5 - compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F - call LittlerootTown_ProfessorBirchsLab_EventScript_27378B - call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E:: @ 81FA20E - call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F - removeobject 6 - msgbox gUnknown_08273374, 5 - compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA234 - call LittlerootTown_ProfessorBirchsLab_EventScript_273797 - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA234 - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA234:: @ 81FA234 - call LittlerootTown_ProfessorBirchsLab_EventScript_2737A0 - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F:: @ 81FA23F - erasemonpic - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, 4 - setvar VAR_0x40D3, 6 - releaseall - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F:: @ 81FA24F - playfanfare MUS_FANFA4 - message LittlerootTown_ProfessorBirchsLab_Text_1FB9D7 - waitmessage - waitfanfare - return - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A:: @ 81FA25A - lock - faceplayer - compare VAR_0x40D3, 5 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA28A - compare VAR_0x40D3, 2 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA294 - checkflag FLAG_HAS_MATCH_CALL - goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E - checkflag FLAG_0x119 - goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2 - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA28A:: @ 81FA28A - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB787, 4 - release - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA294:: @ 81FA294 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB466, 4 - release - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E:: @ 81FA29E - checkflag FLAG_0x380 - goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_272141 - compare VAR_0x40D3, 3 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_272141 - compare VAR_0x40D3, 6 - goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_272141 - compare VAR_0x4084, 5 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA74, 4 - release - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2:: @ 81FA2D2 -Route101_EventScript_1FA2D2:: @ 81FA2D2 - msgbox Route101_Text_2B5F52, 4 - closemessage - delay 30 - playfanfare MUS_ME_TORE_EYE - msgbox Route101_Text_2B603A, 4 - waitfanfare - closemessage - delay 30 - setflag FLAG_0x119 - setvar VAR_0x40DA, 2 - release - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAB22, 4 - call LittlerootTown_ProfessorBirchsLab_EventScript_1FA3AC - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAC4B, 4 - closemessage - applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0 - waitmovement 0 - applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 - waitmovement 0 - checkplayergender - compare VAR_RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA352 - compare VAR_RESULT, 1 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F - setvar VAR_0x4084, 5 - setflag FLAG_0x074 - setvar VAR_0x4051, 1 - setvar VAR_0x408D, 4 - setvar VAR_0x4050, 3 - releaseall - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA352:: @ 81FA352 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FADD7, 4 - giveitem_std ITEM_POKE_BALL, 5 - compare VAR_RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3CE - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAE40, 4 - setvar VAR_RESULT, 0 - return - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F:: @ 81FA37F - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF3F, 4 - giveitem_std ITEM_POKE_BALL, 5 - compare VAR_RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF8E, 4 - setvar VAR_RESULT, 1 - return - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA3AC:: @ 81FA3AC - playfanfare MUS_FANFA4 - message LittlerootTown_ProfessorBirchsLab_Text_1FAC32 - waitfanfare - setflag FLAG_SYS_POKEDEX_GET - special sub_81AFDA0 - setflag FLAG_0x8E4 - setvar VAR_0x40CD, 1 - return - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4:: @ 81FA3C4 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAD6F, 4 - release - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA3CE:: @ 81FA3CE - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAEF3, 4 - return - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7:: @ 81FA3D7 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB05D, 4 - return - -LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0: @ 81FA3E0 - walk_down - walk_in_place_fastest_left - step_end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3:: @ 81FA3E3 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB0A2, 3 - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC:: @ 81FA3EC - lock - faceplayer - compare VAR_0x40D3, 5 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A - compare VAR_0x40D3, 6 - goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA465 - compare VAR_0x40D3, 2 - goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA490 - checkplayergender - compare VAR_RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA428 - compare VAR_RESULT, 1 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA431 - release - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA428:: @ 81FA428 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF08, 4 - return - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA431:: @ 81FA431 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB073, 4 - return - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A:: @ 81FA43A - checkplayergender - compare VAR_RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA453 - compare VAR_RESULT, 1 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C - release - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA453:: @ 81FA453 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBB68, 4 - return - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C:: @ 81FA45C - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBC2D, 4 - return - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA465:: @ 81FA465 - checkplayergender - compare VAR_RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA47E - compare VAR_RESULT, 1 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA487 - release - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA47E:: @ 81FA47E - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBC8D, 4 - return - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA487:: @ 81FA487 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBCD2, 4 - return - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA490:: @ 81FA490 - checkplayergender - compare VAR_RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4A9 - compare VAR_RESULT, 1 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4B2 - release - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA4A9:: @ 81FA4A9 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB528, 4 - return - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA4B2:: @ 81FA4B2 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB58A, 4 - return - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB:: @ 81FA4BB - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB0E7, 3 - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4:: @ 81FA4C4 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB124, 3 - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD:: @ 81FA4CD - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB148, 3 - end - -LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6:: @ 81FA4D6 - lockall - pokenavcall LittlerootTown_ProfessorBirchsLab_Text_1FBD1A - waitmessage - clearflag FLAG_0x072 - releaseall - end - -LittlerootTown_ProfessorBirchsLab_Text_1FA4E2: @ 81FA4E2 - .string "Hunh? PROF. BIRCH?\p" - .string "The PROF’s away on fieldwork.\n" - .string "Ergo, he isn’t here.\p" - .string "Oh, let me explain what fieldwork is.\p" - .string "It is to study things in the natural\n" - .string "environment, like fields and mountains,\l" - .string "instead of a laboratory.\p" - .string "The PROF isn’t one for doing desk work.\n" - .string "He’s the type of person who would\l" - .string "rather go outside and experience\l" - .string "things than read about them here.$" - -LittlerootTown_ProfessorBirchsLab_Text_1FA641: @ 81FA641 - .string "The PROF isn’t one for doing desk work.\n" - .string "He’s the type of person who would\l" - .string "rather go outside and experience\l" - .string "things than read about them here.$" - -LittlerootTown_ProfessorBirchsLab_Text_1FA6CE: @ 81FA6CE - .string "PROF. BIRCH is studying the habitats\n" - .string "and distribution of POKéMON.\p" - .string "The PROF enjoys {RIVAL}’s help, too.\n" - .string "There’s a lot of love there.$" - -LittlerootTown_ProfessorBirchsLab_Text_1FA74D: @ 81FA74D - .string "PROF. BIRCH: So, {PLAYER}{KUN}.\p" - .string "I’ve heard so much about you from\n" - .string "your father.\p" - .string "I’ve heard that you don’t have your\n" - .string "own POKéMON yet.\p" - .string "But the way you battled earlier,\n" - .string "you pulled it off with aplomb!\p" - .string "I guess you have your father’s blood\n" - .string "in your veins after all!\p" - .string "Oh, yes. As thanks for rescuing me,\n" - .string "I’d like you to have the POKéMON you\l" - .string "used earlier.\p" - .string "{PLAYER} received the {STR_VAR_1}!$" - -LittlerootTown_ProfessorBirchsLab_Text_1FA8B1: @ 81FA8B1 - .string "PROF. BIRCH: While you’re at it, why not\n" - .string "give a nickname to that {STR_VAR_1}?$" - -LittlerootTown_ProfessorBirchsLab_Text_1FA8F6: @ 81FA8F6 - .string "PROF. BIRCH: If you work at POKéMON\n" - .string "and gain experience, I think you’ll make\l" - .string "an extremely good TRAINER.\p" - .string "My kid, {RIVAL}, is also studying\n" - .string "POKéMON while helping me out.\p" - .string "{PLAYER}{KUN}, don’t you think it might be\n" - .string "a good idea to go see {RIVAL}?$" - -LittlerootTown_ProfessorBirchsLab_Text_1FA9D5: @ 81FA9D5 - .string "PROF. BIRCH: Great!\n" - .string "{RIVAL} should be happy, too.\p" - .string "Get {RIVAL} to teach you what it\n" - .string "means to be a TRAINER.$" - -LittlerootTown_ProfessorBirchsLab_Text_1FAA35: @ 81FAA35 - .string "PROF. BIRCH: Oh, don’t be that way.\n" - .string "You should go meet my kid.$" - -LittlerootTown_ProfessorBirchsLab_Text_1FAA74: @ 81FAA74 - .string "PROF. BIRCH: {RIVAL}?\n" - .string "Gone home, I think.\p" - .string "Or maybe that kid’s scrabbling around\n" - .string "in tall grass again somewhere…\p" - .string "If you or your POKéMON get tired,\n" - .string "you should get some rest at home.$" - -LittlerootTown_ProfessorBirchsLab_Text_1FAB22: @ 81FAB22 - .string "PROF. BIRCH: Oh, hi, {PLAYER}{KUN}!\p" - .string "I heard you beat {RIVAL} on\n" - .string "your first try. That’s excellent!\p" - .string "{RIVAL}’s been helping with my research\n" - .string "for a long time.\p" - .string "{RIVAL} has an extensive history as\n" - .string "a TRAINER already.\p" - .string "Here, {PLAYER}{KUN}, I ordered this for my\n" - .string "research, but I think you should have\l" - .string "this POKéDEX.$" - -LittlerootTown_ProfessorBirchsLab_Text_1FAC32: @ 81FAC32 - .string "{PLAYER} received the POKéDEX!$" - -LittlerootTown_ProfessorBirchsLab_Text_1FAC4B: @ 81FAC4B - .string "PROF. BIRCH: The POKéDEX is a high-tech\n" - .string "tool that automatically makes a record\l" - .string "of any POKéMON you meet or catch.\p" - .string "My kid, {RIVAL}, goes everywhere\n" - .string "with it.\p" - .string "Whenever my kid catches a rare POKéMON\n" - .string "and records its data in the POKéDEX,\l" - .string "why, {RIVAL} looks for me while I’m out\l" - .string "doing fieldwork, and shows me.$" - -LittlerootTown_ProfessorBirchsLab_Text_1FAD6F: @ 81FAD6F - .string "PROF. BIRCH: Countless POKéMON\n" - .string "await you!\p" - .string "Argh, I’m getting the itch to get out\n" - .string "and do fieldwork again!$" - -LittlerootTown_ProfessorBirchsLab_Text_1FADD7: @ 81FADD7 - .string "MAY: Oh, wow, {PLAYER}{KUN}!\n" - .string "You got a POKéDEX, too!\p" - .string "That’s great! Just like me!\n" - .string "I’ve got something for you, too!$" - -LittlerootTown_ProfessorBirchsLab_Text_1FAE40: @ 81FAE40 - .string "MAY: It’s fun if you can get a lot of\n" - .string "POKéMON!\p" - .string "I’m going to look all over the place\n" - .string "because I want different POKéMON.\p" - .string "If I find any cute POKéMON, I’ll catch\n" - .string "them with POKé BALLS!$" - -LittlerootTown_ProfessorBirchsLab_Text_1FAEF3: @ 81FAEF3 - .string "Oh? Your BAG’s full.$" - -LittlerootTown_ProfessorBirchsLab_Text_1FAF08: @ 81FAF08 - .string "MAY: I wonder where I should go look\n" - .string "for POKéMON next?$" - -LittlerootTown_ProfessorBirchsLab_Text_1FAF3F: @ 81FAF3F - .string "BRENDAN: Huh…\n" - .string "So you got a POKéDEX, too.\p" - .string "Well then, here.\n" - .string "I’ll give you these.$" - -LittlerootTown_ProfessorBirchsLab_Text_1FAF8E: @ 81FAF8E - .string "BRENDAN: You know it’s more fun to\n" - .string "have a whole bunch of POKéMON.\p" - .string "I’m going to explore all over the place\n" - .string "to find different POKéMON.\p" - .string "If I find any cool POKéMON, you bet\n" - .string "I’ll try to get them with POKé BALLS.$" - -LittlerootTown_ProfessorBirchsLab_Text_1FB05D: @ 81FB05D - .string "Hey, your BAG’s full.$" - -LittlerootTown_ProfessorBirchsLab_Text_1FB073: @ 81FB073 - .string "BRENDAN: Where should I look for\n" - .string "POKéMON next…$" - -LittlerootTown_ProfessorBirchsLab_Text_1FB0A2: @ 81FB0A2 - .string "It’s a serious-looking machine.\n" - .string "The PROF must use this for research.$" - -LittlerootTown_ProfessorBirchsLab_Text_1FB0E7: @ 81FB0E7 - .string "It’s a PC used for research.\n" - .string "Better not mess around with it.$" - -LittlerootTown_ProfessorBirchsLab_Text_1FB124: @ 81FB124 - .string "It’s crammed with books on POKéMON.$" - -LittlerootTown_ProfessorBirchsLab_Text_1FB148: @ 81FB148 - .string "It’s a book that’s too hard to read.$" - -LittlerootTown_ProfessorBirchsLab_Text_1FB16D: @ 81FB16D - .string "PROF. BIRCH: Now…\p" - .string "{PLAYER}{KUN} and {RIVAL}, I’ve had the two\n" - .string "of you help me study POKéMON.\p" - .string "Thanks to your help, new facts\n" - .string "are coming to light.\p" - .string "It appears that in the HOENN region,\n" - .string "there are also POKéMON from other\l" - .string "regions.\p" - .string "It goes to show how rich and varied\n" - .string "the natural environments of HOENN\l" - .string "happen to be.\p" - .string "That’s why I think it’s necessary for\n" - .string "me to upgrade your POKéDEX to\l" - .string "the NATIONAL Mode.\p" - .string "Here, let me see your POKéDEX units.$" - -LittlerootTown_ProfessorBirchsLab_Text_1FB30F: @ 81FB30F - .string "MAY: Eheheh!\p" - .string "It’s so cool that even my POKéDEX\n" - .string "is getting updated!\p" - .string "It’s because you went out and caught\n" - .string "so many POKéMON, {PLAYER}{KUN}!$" - -LittlerootTown_ProfessorBirchsLab_Text_1FB38E: @ 81FB38E - .string "BRENDAN: I went out all over HOENN\n" - .string "and checked out POKéMON.\p" - .string "You can thank me for getting\n" - .string "the NATIONAL Mode POKéDEX.\p" - .string "Yep, you’re lucky, {PLAYER}!$" - -LittlerootTown_ProfessorBirchsLab_Text_1FB419: @ 81FB419 - .string "PROF. BIRCH: Okay, all done!$" - -LittlerootTown_ProfessorBirchsLab_Text_1FB436: @ 81FB436 - .string "{PLAYER}’s POKéDEX was upgraded\n" - .string "to the NATIONAL Mode!$" - -LittlerootTown_ProfessorBirchsLab_Text_1FB466: @ 81FB466 - .string "PROF. BIRCH: But listen.\n" - .string "You’ve become the CHAMPION,\l" - .string "but your POKéMON journey isn’t over.\p" - .string "There is no end to the road\n" - .string "that is POKéMON.\p" - .string "Somewhere, there is a grassy patch\n" - .string "that’s waiting for you!$" - -LittlerootTown_ProfessorBirchsLab_Text_1FB528: @ 81FB528 - .string "MAY: I think I’ll take a short break\n" - .string "from fieldwork.\p" - .string "I think I’ll help the PROF here for\n" - .string "a while.$" - -LittlerootTown_ProfessorBirchsLab_Text_1FB58A: @ 81FB58A - .string "BRENDAN: For the time being,\n" - .string "I’m taking a break from fieldwork.\p" - .string "I’ll be helping out the PROF here\n" - .string "for a while.$" - -LittlerootTown_ProfessorBirchsLab_Text_1FB5F9: @ 81FB5F9 - .string "PROF. BIRCH: Oh, {PLAYER}{KUN}!\n" - .string "Let’s have a look at your POKéDEX.\p" - .string "… … … … … …\n" - .string "… … … … … …\p" - .string "Yes, there’s no doubt about it.\p" - .string "You really have completed the HOENN\n" - .string "region’s POKéDEX.\p" - .string "That’s more than just impressive.\p" - .string "I have a gift for you.\p" - .string "Consider it my show of appreciation\n" - .string "for the fantastic work you’ve done.\p" - .string "My gift is a rare POKéMON only found\n" - .string "in another region!\p" - .string "You can have any one of these\n" - .string "three POKéMON!$" - -LittlerootTown_ProfessorBirchsLab_Text_1FB787: @ 81FB787 - .string "PROF. BIRCH: These are rare POKéMON\n" - .string "only found in another region!\p" - .string "You can have any one of these\n" - .string "three POKéMON!$" - -LittlerootTown_ProfessorBirchsLab_Text_1FB7F6: @ 81FB7F6 - .string "PROF. BIRCH: The FIRE POKéMON\n" - .string "CYNDAQUIL caught your eye!\p" - .string "You’re as sharp as ever!\p" - .string "So the CYNDAQUIL is your choice?$" - -LittlerootTown_ProfessorBirchsLab_Text_1FB869: @ 81FB869 - .string "PROF. BIRCH: The WATER POKéMON\n" - .string "TOTODILE is your choice!\p" - .string "You know how to pick a good one.\p" - .string "So, you’ll take the TOTODILE?$" - -LittlerootTown_ProfessorBirchsLab_Text_1FB8E0: @ 81FB8E0 - .string "PROF. BIRCH: The GRASS POKéMON\n" - .string "CHIKORITA is your choice!\p" - .string "You sure know what you’re doing.\p" - .string "So, you’ll take the CHIKORITA?$" - -LittlerootTown_ProfessorBirchsLab_Text_1FB959: @ 81FB959 - .string "PROF. BIRCH: Take your time before\n" - .string "you decide.\p" - .string "They’re all invaluable POKéMON.$" - -LittlerootTown_ProfessorBirchsLab_Text_1FB9A8: @ 81FB9A8 - .string "PROF. BIRCH: I see!\n" - .string "You picked a fine POKéMON!$" - -LittlerootTown_ProfessorBirchsLab_Text_1FB9D7: @ 81FB9D7 - .string "{PLAYER} received the {STR_VAR_1}\n" - .string "from PROF. BIRCH!$" - -LittlerootTown_ProfessorBirchsLab_Text_1FB9FC: @ 81FB9FC - .string "Want to give a nickname to\n" - .string "the {STR_VAR_1} you received?$" - -LittlerootTown_ProfessorBirchsLab_Text_1FBA2C: @ 81FBA2C - .string "PROF. BIRCH: Listen, {PLAYER}{KUN}.\n" - .string "You’ve completed the HOENN POKéDEX,\l" - .string "but your POKéMON journey isn’t over.\p" - .string "There is no end to the road\n" - .string "that is POKéMON.\p" - .string "Somewhere, there is a grassy patch\n" - .string "that’s waiting for you!$" - -LittlerootTown_ProfessorBirchsLab_Text_1FBAF8: @ 81FBAF8 - .string "You received the promised POKéMON.\n" - .string "Better leave the others alone.$" - -LittlerootTown_ProfessorBirchsLab_Text_1FBB3A: @ 81FBB3A - .string "Oh, you don’t have any room for\n" - .string "this POKéMON.$" - -LittlerootTown_ProfessorBirchsLab_Text_1FBB68: @ 81FBB68 - .string "MAY: {PLAYER}{KUN}, after this…\n" - .string "What are you going to do?\p" - .string "Are you going to keep battling\n" - .string "and sharpening your skills?\p" - .string "Or are you going to try filling\n" - .string "the NATIONAL POKéDEX?\p" - .string "I’m staying here to help the PROF.$" - -LittlerootTown_ProfessorBirchsLab_Text_1FBC2D: @ 81FBC2D - .string "BRENDAN: Rather than collecting\n" - .string "POKéMON, I prefer slowly and \l" - .string "steadily raising the one I chose.$" - -LittlerootTown_ProfessorBirchsLab_Text_1FBC8D: @ 81FBC8D - .string "MAY: Oh, hi, {PLAYER}{KUN}!\n" - .string "Have you gone to that place,\l" - .string "the BATTLE FRONTIER?$" - -LittlerootTown_ProfessorBirchsLab_Text_1FBCD2: @ 81FBCD2 - .string "BRENDAN: Hey, {PLAYER}!\n" - .string "Have you gone out to that place,\l" - .string "the BATTLE FRONTIER?$" - -LittlerootTown_ProfessorBirchsLab_Text_1FBD1A: @ 81FBD1A - .string "… … … … … …\n" - .string "… … … … … Beep!\p" - .string "SCOTT: Hi, hi, {PLAYER}!\n" - .string "It’s me, SCOTT.\p" - .string "I’m aboard the S.S. TIDAL now.\n" - .string "It feels great to be on the sea!\p" - .string "By the way…\p" - .string "There’s this place that I’d like to\n" - .string "invite you to for a visit.\p" - .string "If you’re interested, board a ferry\n" - .string "at either SLATEPORT or LILYCOVE.\p" - .string "I’ll fill you in on the details when\n" - .string "we meet. I’ll be waiting!\p" - .string "… … … … … …\n" - .string "… … … … … Click!$" diff --git a/data/scripts/maps/MagmaHideout_1F.inc b/data/scripts/maps/MagmaHideout_1F.inc deleted file mode 100644 index 0e133a890..000000000 --- a/data/scripts/maps/MagmaHideout_1F.inc +++ /dev/null @@ -1,53 +0,0 @@ -MagmaHideout_1F_MapScripts:: @ 8239880 - map_script 3, MagmaHideout_1F_MapScript1_239886 - .byte 0 - -MagmaHideout_1F_MapScript1_239886: @ 8239886 - setvar VAR_0x40BD, 0 - end - -MagmaHideout_1F_EventScript_23988C:: @ 823988C - trainerbattle 0, TRAINER_GRUNT_38, 0, MagmaHideout_1F_Text_2398BA, MagmaHideout_1F_Text_239964 - msgbox MagmaHideout_1F_Text_2399B1, 6 - end - -MagmaHideout_1F_EventScript_2398A3:: @ 82398A3 - trainerbattle 0, TRAINER_GRUNT_39, 0, MagmaHideout_1F_Text_2399F5, MagmaHideout_1F_Text_239ABA - msgbox MagmaHideout_1F_Text_239ACD, 6 - end - -MagmaHideout_1F_Text_2398BA: @ 82398BA - .string "When TEAM MAGMA has roll call, we get\n" - .string "important guarding assignments in\l" - .string "the order that we line up.\p" - .string "That’s why I’m stuck off in this corner.\n" - .string "I’m always late to roll call!$" - -MagmaHideout_1F_Text_239964: @ 8239964 - .string "I’m always late for training sessions,\n" - .string "too!\p" - .string "I hate to say it, but I’m wimpy…$" - -MagmaHideout_1F_Text_2399B1: @ 82399B1 - .string "Okay, I’ll try to put a little more\n" - .string "effort into things from now on…$" - -MagmaHideout_1F_Text_2399F5: @ 82399F5 - .string "Our leader told us to dig into\n" - .string "MT. CHIMNEY, so we dug and dug.\p" - .string "And in the course of digging, we came\n" - .string "across something that blew our minds!\p" - .string "What did we find?\p" - .string "Fuhahaha!\n" - .string "I’ll tell you if you beat me!$" - -MagmaHideout_1F_Text_239ABA: @ 8239ABA - .string "Arrgh!\n" - .string "Taken down!$" - -MagmaHideout_1F_Text_239ACD: @ 8239ACD - .string "I won’t tell you after all.\n" - .string "You’ll find out when you get there!\p" - .string "It’d be better if you saved surprises\n" - .string "to the end, don’t you think?$" - diff --git a/data/scripts/maps/MagmaHideout_2F_1R.inc b/data/scripts/maps/MagmaHideout_2F_1R.inc deleted file mode 100644 index 33252bb57..000000000 --- a/data/scripts/maps/MagmaHideout_2F_1R.inc +++ /dev/null @@ -1,75 +0,0 @@ -MagmaHideout_2F_1R_MapScripts:: @ 8239B50 - .byte 0 - -MagmaHideout_2F_1R_EventScript_239B51:: @ 8239B51 - trainerbattle 0, TRAINER_GRUNT_51, 0, MagmaHideout_2F_1R_Text_239BAD, MagmaHideout_2F_1R_Text_239C4B - msgbox MagmaHideout_2F_1R_Text_239C74, 6 - end - -MagmaHideout_2F_1R_EventScript_239B68:: @ 8239B68 - trainerbattle 0, TRAINER_GRUNT_40, 0, MagmaHideout_2F_1R_Text_239CAB, MagmaHideout_2F_1R_Text_239D09 - msgbox MagmaHideout_2F_1R_Text_239D1D, 6 - end - -MagmaHideout_2F_1R_EventScript_239B7F:: @ 8239B7F - trainerbattle 0, TRAINER_GRUNT_41, 0, MagmaHideout_2F_1R_Text_239D62, MagmaHideout_2F_1R_Text_239D75 - msgbox MagmaHideout_2F_1R_Text_239D7D, 6 - end - -MagmaHideout_2F_1R_EventScript_239B96:: @ 8239B96 - trainerbattle 0, TRAINER_GRUNT_42, 0, MagmaHideout_2F_1R_Text_239DC5, MagmaHideout_2F_1R_Text_239DDA - msgbox MagmaHideout_2F_1R_Text_239DE2, 6 - end - -MagmaHideout_2F_1R_Text_239BAD: @ 8239BAD - .string "What, what, what?\p" - .string "Only TEAM MAGMA members are supposed\n" - .string "to be in here!\p" - .string "But you’re not dressed in TEAM MAGMA’s\n" - .string "uniform…\p" - .string "You rouse my suspicion!\n" - .string "Battle with me!$" - -MagmaHideout_2F_1R_Text_239C4B: @ 8239C4B - .string "Aiyiyi…\n" - .string "My pride as a TEAM MAGMA member…$" - -MagmaHideout_2F_1R_Text_239C74: @ 8239C74 - .string "If you suffer from chills, you should\n" - .string "join TEAM MAGMA.$" - -MagmaHideout_2F_1R_Text_239CAB: @ 8239CAB - .string "Hold it right there!\p" - .string "You don’t really expect me to keep\n" - .string "my trap shut and let you waltz by me?$" - -MagmaHideout_2F_1R_Text_239D09: @ 8239D09 - .string "Ooh wow!\n" - .string "I concede!$" - -MagmaHideout_2F_1R_Text_239D1D: @ 8239D1D - .string "Maybe it would’ve been better if I did\n" - .string "just let you go unchallenged…$" - -MagmaHideout_2F_1R_Text_239D62: @ 8239D62 - .string "Ahah!\n" - .string "An intruder!$" - -MagmaHideout_2F_1R_Text_239D75: @ 8239D75 - .string "Graaah!$" - -MagmaHideout_2F_1R_Text_239D7D: @ 8239D7D - .string "I’ve already lost.\p" - .string "Do I really need to keep running\n" - .string "around in a circle?$" - -MagmaHideout_2F_1R_Text_239DC5: @ 8239DC5 - .string "Oh, oh!\n" - .string "An intruder!$" - -MagmaHideout_2F_1R_Text_239DDA: @ 8239DDA - .string "Mutter…$" - -MagmaHideout_2F_1R_Text_239DE2: @ 8239DE2 - .string "Actually, I’m no expert at battling…$" - diff --git a/data/scripts/maps/MagmaHideout_2F_2R.inc b/data/scripts/maps/MagmaHideout_2F_2R.inc deleted file mode 100644 index 8b1e51f16..000000000 --- a/data/scripts/maps/MagmaHideout_2F_2R.inc +++ /dev/null @@ -1,78 +0,0 @@ -MagmaHideout_2F_2R_MapScripts:: @ 8239E07 - .byte 0 - -MagmaHideout_2F_2R_EventScript_239E08:: @ 8239E08 - trainerbattle 0, TRAINER_GRUNT_52, 0, MagmaHideout_2F_2R_Text_239E64, MagmaHideout_2F_2R_Text_239EA5 - msgbox MagmaHideout_2F_2R_Text_239EBB, 6 - end - -MagmaHideout_2F_2R_EventScript_239E1F:: @ 8239E1F - trainerbattle 0, TRAINER_GRUNT_43, 0, MagmaHideout_2F_2R_Text_239F31, MagmaHideout_2F_2R_Text_239F71 - msgbox MagmaHideout_2F_2R_Text_239FA1, 6 - end - -MagmaHideout_2F_2R_EventScript_239E36:: @ 8239E36 - trainerbattle 0, TRAINER_GRUNT_44, 0, MagmaHideout_2F_2R_Text_239FDE, MagmaHideout_2F_2R_Text_23A050 - msgbox MagmaHideout_2F_2R_Text_23A07D, 6 - end - -MagmaHideout_2F_2R_EventScript_239E4D:: @ 8239E4D - trainerbattle 0, TRAINER_GRUNT_45, 0, MagmaHideout_2F_2R_Text_23A0E4, MagmaHideout_2F_2R_Text_23A14C - msgbox MagmaHideout_2F_2R_Text_23A16F, 6 - end - -MagmaHideout_2F_2R_Text_239E64: @ 8239E64 - .string "I don’t have a bone to pick with you.\n" - .string "I’m just following orders!$" - -MagmaHideout_2F_2R_Text_239EA5: @ 8239EA5 - .string "I may have lost, but…$" - -MagmaHideout_2F_2R_Text_239EBB: @ 8239EBB - .string "We dug up something beyond belief!\n" - .string "And, we got the BLUE ORB!\p" - .string "All that’s left is for our leader to…\n" - .string "Fufufu… Fwahahaha!$" - -MagmaHideout_2F_2R_Text_239F31: @ 8239F31 - .string "I can’t stand heat. Maybe I should’ve\n" - .string "joined TEAM AQUA instead…$" - -MagmaHideout_2F_2R_Text_239F71: @ 8239F71 - .string "Yeah, I really may not be right for\n" - .string "TEAM MAGMA…$" - -MagmaHideout_2F_2R_Text_239FA1: @ 8239FA1 - .string "Don’t you get lonely for the sea\n" - .string "being in a place like this?$" - -MagmaHideout_2F_2R_Text_239FDE: @ 8239FDE - .string "You can hear tremors here sometimes.\p" - .string "Could it be the volcano rattling?\n" - .string "Or is it GROU…\p" - .string "Whoops!\n" - .string "No, no, never mind!$" - -MagmaHideout_2F_2R_Text_23A050: @ 823A050 - .string "You’re a fiery battler.\n" - .string "Just like a volcano!$" - -MagmaHideout_2F_2R_Text_23A07D: @ 823A07D - .string "You just happened to win this time,\n" - .string "but that doesn’t matter.\p" - .string "TEAM MAGMA’s goal is about to be\n" - .string "reached!$" - -MagmaHideout_2F_2R_Text_23A0E4: @ 823A0E4 - .string "One of our guys was freaking out that\n" - .string "he lost his MAGMA EMBLEM…\p" - .string "Wait a minute!\n" - .string "Was it you who found it?$" - -MagmaHideout_2F_2R_Text_23A14C: @ 823A14C - .string "I’m having trouble believing this…$" - -MagmaHideout_2F_2R_Text_23A16F: @ 823A16F - .string "I’m getting this feeling that our plan\n" - .string "is going to end in failure…$" - diff --git a/data/scripts/maps/MagmaHideout_2F_3R.inc b/data/scripts/maps/MagmaHideout_2F_3R.inc deleted file mode 100644 index cbcb3fd52..000000000 --- a/data/scripts/maps/MagmaHideout_2F_3R.inc +++ /dev/null @@ -1,3 +0,0 @@ -MagmaHideout_2F_3R_MapScripts:: @ 823AD00 - .byte 0 - diff --git a/data/scripts/maps/MagmaHideout_3F_1R.inc b/data/scripts/maps/MagmaHideout_3F_1R.inc deleted file mode 100644 index 068e71492..000000000 --- a/data/scripts/maps/MagmaHideout_3F_1R.inc +++ /dev/null @@ -1,43 +0,0 @@ -MagmaHideout_3F_1R_MapScripts:: @ 823A1B2 - .byte 0 - -MagmaHideout_3F_1R_EventScript_23A1B3:: @ 823A1B3 - trainerbattle 0, TRAINER_GRUNT_46, 0, MagmaHideout_3F_1R_Text_23A1E1, MagmaHideout_3F_1R_Text_23A229 - msgbox MagmaHideout_3F_1R_Text_23A246, 6 - end - -MagmaHideout_3F_1R_EventScript_23A1CA:: @ 823A1CA - trainerbattle 0, TRAINER_GRUNT_53, 0, MagmaHideout_3F_1R_Text_23A293, MagmaHideout_3F_1R_Text_23A353 - msgbox MagmaHideout_3F_1R_Text_23A37C, 6 - end - -MagmaHideout_3F_1R_Text_23A1E1: @ 823A1E1 - .string "What did I do to deserve this guard\n" - .string "posting?\p" - .string "My left ear is burning up!$" - -MagmaHideout_3F_1R_Text_23A229: @ 823A229 - .string "I’m getting heat exhaustion…$" - -MagmaHideout_3F_1R_Text_23A246: @ 823A246 - .string "Do you think it’s odd that we’re wearing\n" - .string "hoods in this magma-filled volcano?$" - -MagmaHideout_3F_1R_Text_23A293: @ 823A293 - .string "We joined so we can help our leader\n" - .string "achieve his fantastic vision.\p" - .string "I don’t care if you’re with TEAM AQUA\n" - .string "or if you’re just some kid passing by.\p" - .string "No one interferes with us and gets\n" - .string "away with it!$" - -MagmaHideout_3F_1R_Text_23A353: @ 823A353 - .string "Oh, no!\n" - .string "You’re not to be trusted at all!$" - -MagmaHideout_3F_1R_Text_23A37C: @ 823A37C - .string "Listen to me.\n" - .string "TEAM MAGMA is right!\p" - .string "Don’t listen to TEAM AQUA.\n" - .string "Don’t believe their lies!$" - diff --git a/data/scripts/maps/MagmaHideout_3F_2R.inc b/data/scripts/maps/MagmaHideout_3F_2R.inc deleted file mode 100644 index 15d0c26ea..000000000 --- a/data/scripts/maps/MagmaHideout_3F_2R.inc +++ /dev/null @@ -1,26 +0,0 @@ -MagmaHideout_3F_2R_MapScripts:: @ 823A3D4 - .byte 0 - -MagmaHideout_3F_2R_EventScript_23A3D5:: @ 823A3D5 - trainerbattle 0, TRAINER_GRUNT_47, 0, MagmaHideout_3F_2R_Text_23A3EC, MagmaHideout_3F_2R_Text_23A4BB - msgbox MagmaHideout_3F_2R_Text_23A4EF, 6 - end - -MagmaHideout_3F_2R_Text_23A3EC: @ 823A3EC - .string "I understand everything our leader\n" - .string "says. But you know what?\p" - .string "Doing stuff like digging up a super-\n" - .string "ancient POKéMON and ripping off\l" - .string "someone’s METEORITE…\p" - .string "I think we’re going a little too far.\n" - .string "What do you think?$" - -MagmaHideout_3F_2R_Text_23A4BB: @ 823A4BB - .string "Yeah, I think we are doing something\n" - .string "wrong somehow.$" - -MagmaHideout_3F_2R_Text_23A4EF: @ 823A4EF - .string "You know, losing to you cleared my mind.\p" - .string "The next time I see our leader,\n" - .string "I’m going to ask him about what we do.$" - diff --git a/data/scripts/maps/MagmaHideout_3F_3R.inc b/data/scripts/maps/MagmaHideout_3F_3R.inc deleted file mode 100644 index e85cff9a3..000000000 --- a/data/scripts/maps/MagmaHideout_3F_3R.inc +++ /dev/null @@ -1,3 +0,0 @@ -MagmaHideout_3F_3R_MapScripts:: @ 823ACFF - .byte 0 - diff --git a/data/scripts/maps/MagmaHideout_4F.inc b/data/scripts/maps/MagmaHideout_4F.inc deleted file mode 100644 index 0cc0fea56..000000000 --- a/data/scripts/maps/MagmaHideout_4F.inc +++ /dev/null @@ -1,228 +0,0 @@ -MagmaHideout_4F_MapScripts:: @ 823A55F - .byte 0 - -MagmaHideout_4F_EventScript_23A560:: @ 823A560 - lockall - playbgm MUS_MGM0, 0 - msgbox MagmaHideout_4F_Text_23A9F4, 4 - closemessage - delay 20 - setvar VAR_RESULT, 1 - playse SE_W197 - setfieldeffectargument 0, 18 - setfieldeffectargument 1, 42 - setfieldeffectargument 2, 0 - dofieldeffect 54 - waitfieldeffect 54 - setvar VAR_RESULT, 1 - playfanfare MUS_ME_TAMA - playse SE_TAMA - special sub_80B0534 - applymovement 255, MagmaHideout_4F_Movement_2725A6 - waitmovement 0 - delay 150 - removeobject 7 - addobject 1 - waitstate - delay 60 - applymovement 1, MagmaHideout_4F_Movement_23A672 - waitmovement 0 - special sub_80B058C - waitstate - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 5 - special sub_8139560 - waitstate - applymovement 1, MagmaHideout_4F_Movement_23A67D - waitmovement 0 - removeobject 1 - delay 4 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 5 - special sub_8139560 - waitstate - delay 30 - applymovement 6, MagmaHideout_4F_Movement_23A680 - waitmovement 0 - msgbox MagmaHideout_4F_Text_23AADA, 4 - closemessage - applymovement 255, MagmaHideout_4F_Movement_2725A8 - waitmovement 0 - delay 30 - applymovement 6, MagmaHideout_4F_Movement_27259E - waitmovement 0 - msgbox MagmaHideout_4F_Text_23AB33, 4 - closemessage - trainerbattle 3, TRAINER_MAXIE_1, 0, MagmaHideout_4F_Text_23ABB5 - msgbox MagmaHideout_4F_Text_23ABE2, 4 - closemessage - clearflag FLAG_0x348 - clearflag FLAG_0x343 - setvar VAR_0x4058, 1 - setflag FLAG_0x06F - setvar VAR_0x40A0, 1 - fadescreen 1 - removeobject 6 - removeobject 2 - removeobject 3 - removeobject 4 - removeobject 5 - setflag FLAG_0x359 - fadescreen 0 - releaseall - end - -MagmaHideout_4F_Movement_23A672: @ 823A672 - 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 - slide_up - slide_up - step_end - -MagmaHideout_4F_Movement_23A680: @ 823A680 - 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 - trainerbattle 0, TRAINER_GRUNT_48, 0, MagmaHideout_4F_Text_23A6E8, MagmaHideout_4F_Text_23A775 - msgbox MagmaHideout_4F_Text_23A7B5, 6 - end - -MagmaHideout_4F_EventScript_23A6A3:: @ 823A6A3 - trainerbattle 0, TRAINER_GRUNT_49, 0, MagmaHideout_4F_Text_23A7DA, MagmaHideout_4F_Text_23A81B - msgbox MagmaHideout_4F_Text_23A841, 6 - end - -MagmaHideout_4F_EventScript_23A6BA:: @ 823A6BA - trainerbattle 0, TRAINER_GRUNT_50, 0, MagmaHideout_4F_Text_23A86D, MagmaHideout_4F_Text_23A8A7 - msgbox MagmaHideout_4F_Text_23A8C6, 6 - end - -MagmaHideout_4F_EventScript_23A6D1:: @ 823A6D1 - trainerbattle 0, TRAINER_TABITHA_3, 0, MagmaHideout_4F_Text_23A8E1, MagmaHideout_4F_Text_23A994 - msgbox MagmaHideout_4F_Text_23A9AC, 6 - end - -MagmaHideout_4F_Text_23A6E8: @ 823A6E8 - .string "I want to see GROUDON, too, but they\n" - .string "won’t let me see even its tail…\p" - .string "It’s got me feeling really frustrated.\p" - .string "Oh, no!\n" - .string "I blabbed about GROUDON!$" - -MagmaHideout_4F_Text_23A775: @ 823A775 - .string "I guess it’s impossible to win if one\n" - .string "doesn’t have a calm mind…$" - -MagmaHideout_4F_Text_23A7B5: @ 823A7B5 - .string "I wonder if GROUDON even has a tail?$" - -MagmaHideout_4F_Text_23A7DA: @ 823A7DA - .string "Fuhahaha!\n" - .string "Soon! Very soon!\l" - .string "Our grand objective will be achieved!$" - -MagmaHideout_4F_Text_23A81B: @ 823A81B - .string "Grrr…\n" - .string "I’ve come so far, but now this?$" - -MagmaHideout_4F_Text_23A841: @ 823A841 - .string "MAXIE, sir!\n" - .string "An intruder is headed your way!$" - -MagmaHideout_4F_Text_23A86D: @ 823A86D - .string "You’re not finished yet!\n" - .string "You’re not getting by me easily!$" - -MagmaHideout_4F_Text_23A8A7: @ 823A8A7 - .string "Was I that easy to knock down?$" - -MagmaHideout_4F_Text_23A8C6: @ 823A8C6 - .string "C-come on, one more match…$" - -MagmaHideout_4F_Text_23A8E1: @ 823A8E1 - .string "Hehehe!\n" - .string "You made it this far, so I’ll tell you!\p" - .string "That’s right!\n" - .string "Up ahead, GROUDON is sleeping!\p" - .string "MAXIE went to GROUDON just seconds\n" - .string "ago!\p" - .string "It’s going to awaken real soon!\n" - .string "Hehe! Hehehe!$" - -MagmaHideout_4F_Text_23A994: @ 823A994 - .string "Taken down again…\n" - .string "Hehe…$" - -MagmaHideout_4F_Text_23A9AC: @ 823A9AC - .string "…And while you wasted time with me,\n" - .string "MAXIE should have awakened GROUDON…$" - -MagmaHideout_4F_Text_23A9F4: @ 823A9F4 - .string "MAXIE: GROUDON…\p" - .string "Nothing could awaken you from your\n" - .string "sleep bathed in magma…\p" - .string "This BLUE ORB is what you sought.\n" - .string "Wasn’t it?\p" - .string "I have brought you the BLUE ORB.\n" - .string "Let its shine awaken you!\p" - .string "And show me…\n" - .string "Show me the full extent of your power!$" - -MagmaHideout_4F_Text_23AADA: @ 823AADA - .string "MAXIE: GROUDON!\n" - .string "What’s wrong?\p" - .string "Wasn’t the BLUE ORB the key?\p" - .string "GROUDON!\n" - .string "Where have you gone…$" - -MagmaHideout_4F_Text_23AB33: @ 823AB33 - .string "MAXIE: Oh, so it was you?\p" - .string "I’ve seen you poking around uninvited\n" - .string "here and there…\p" - .string "I get it now!\n" - .string "You must have pulled a cheap stunt!$" - -MagmaHideout_4F_Text_23ABB5: @ 823ABB5 - .string "What makes you so adept at handling\n" - .string "POKéMON?$" - -MagmaHideout_4F_Text_23ABE2: @ 823ABE2 - .string "MAXIE: There has to be some reason\n" - .string "why GROUDON fled…\p" - .string "That’s what you’re trying to say,\n" - .string "aren’t you?\p" - .string "… … … … … …\n" - .string "… … … … … …\p" - .string "Humph…\n" - .string "You think I didn’t know that?\p" - .string "With GROUDON gone, there is no longer\n" - .string "any need for this blasted volcano.\p" - .string "I am going after GROUDON, so this\n" - .string "is where we part!$" - diff --git a/data/scripts/maps/MarineCave_End.inc b/data/scripts/maps/MarineCave_End.inc deleted file mode 100644 index 9c821e14f..000000000 --- a/data/scripts/maps/MarineCave_End.inc +++ /dev/null @@ -1,78 +0,0 @@ -MarineCave_End_MapScripts:: @ 823AFDF - map_script 5, MarineCave_End_MapScript1_23AFEA - map_script 3, MarineCave_End_MapScript1_23B008 - .byte 0 - -MarineCave_End_MapScript1_23AFEA: @ 823AFEA - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, MarineCave_End_EventScript_23AFF4 - end - -MarineCave_End_EventScript_23AFF4:: @ 823AFF4 - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 7 - goto_if 5, MarineCave_End_EventScript_27374E - removeobject 1 - return - -MarineCave_End_MapScript1_23B008: @ 823B008 - checkflag FLAG_0x1BE - call_if 0, MarineCave_End_EventScript_23B012 - end - -MarineCave_End_EventScript_23B012:: @ 823B012 - clearflag FLAG_0x30E - setvar VAR_TEMP_1, 1 - return - -MarineCave_End_EventScript_23B01B:: @ 823B01B - lockall - applymovement 255, MarineCave_End_Movement_2725B2 - waitmovement 0 - applymovement 1, MarineCave_End_Movement_23B09D - waitmovement 0 - waitse - playmoncry SPECIES_KYOGRE, 2 - delay 40 - waitmoncry - setvar VAR_LAST_TALKED, 1 - setwildbattle SPECIES_KYOGRE, 70, ITEM_NONE - setflag FLAG_SYS_CTRL_OBJ_DELETE - special BattleSetup_StartLegendaryBattle - waitstate - clearflag FLAG_SYS_CTRL_OBJ_DELETE - setvar VAR_TEMP_1, 0 - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 1 - goto_eq MarineCave_End_EventScript_23B084 - compare VAR_RESULT, 4 - goto_eq MarineCave_End_EventScript_23B092 - compare VAR_RESULT, 5 - goto_eq MarineCave_End_EventScript_23B092 - setvar VAR_0x4039, 1 - setflag FLAG_0x1BE - releaseall - end - -MarineCave_End_EventScript_23B084:: @ 823B084 - setvar VAR_0x4039, 1 - setflag FLAG_0x1BE - goto MarineCave_End_EventScript_27376D - end - -MarineCave_End_EventScript_23B092:: @ 823B092 - setvar VAR_0x8004, 404 - goto MarineCave_End_EventScript_273776 - end - -MarineCave_End_Movement_23B09D: @ 823B09D - 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/MarineCave_Entrance.inc b/data/scripts/maps/MarineCave_Entrance.inc deleted file mode 100644 index 24b288050..000000000 --- a/data/scripts/maps/MarineCave_Entrance.inc +++ /dev/null @@ -1,8 +0,0 @@ -MarineCave_Entrance_MapScripts:: @ 823AFD0 - map_script 5, MarineCave_Entrance_MapScript1_23AFD6 - .byte 0 - -MarineCave_Entrance_MapScript1_23AFD6: @ 823AFD6 - setdivewarp MAP_UNDERWATER_MARINE_CAVE, 255, 9, 6 - end - diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc deleted file mode 100644 index abb527d7f..000000000 --- a/data/scripts/maps/MauvilleCity.inc +++ /dev/null @@ -1,677 +0,0 @@ -MauvilleCity_MapScripts:: @ 81DF385 - map_script 3, MauvilleCity_MapScript1_1DF38B - .byte 0 - -MauvilleCity_MapScript1_1DF38B: @ 81DF38B - setflag FLAG_VISITED_MAUVILLE_CITY - clearflag FLAG_0x09D - clearflag FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION - setflag FLAG_SYS_TV_START - clearflag FLAG_0x063 - setvar VAR_0x4093, 0 - checkflag FLAG_GOT_TM24_FROM_WATTSON - call_if 1, MauvilleCity_EventScript_1DF3A9 - end - -MauvilleCity_EventScript_1DF3A9:: @ 81DF3A9 - clearflag FLAG_SPRITEVIS_MAUVILLE_GYM_WATTSON - setflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON - setflag FLAG_WATTSON_REMATCH_AVAILABLE - return - -MauvilleCity_EventScript_1DF3B3:: @ 81DF3B3 - msgbox MauvilleCity_Text_1E0301, 2 - end - -MauvilleCity_EventScript_1DF3BC:: @ 81DF3BC - msgbox MauvilleCity_Text_1E037C, 2 - end - -MauvilleCity_EventScript_1DF3C5:: @ 81DF3C5 - msgbox MauvilleCity_Text_1E03FB, 2 - end - -MauvilleCity_EventScript_1DF3CE:: @ 81DF3CE - msgbox MauvilleCity_Text_1E044A, 2 - end - -MauvilleCity_EventScript_1DF3D7:: @ 81DF3D7 - msgbox MauvilleCity_Text_1E0485, 3 - end - -MauvilleCity_EventScript_1DF3E0:: @ 81DF3E0 - msgbox MauvilleCity_Text_1E04B7, 3 - end - -MauvilleCity_EventScript_1DF3E9:: @ 81DF3E9 - msgbox MauvilleCity_Text_1E0504, 3 - end - -MauvilleCity_EventScript_1DF3F2:: @ 81DF3F2 - msgbox MauvilleCity_Text_1E053C, 3 - end - -MauvilleCity_EventScript_1DF3FB:: @ 81DF3FB - lock - faceplayer - checkflag FLAG_0x062 - goto_eq MauvilleCity_EventScript_1DF413 - msgbox MauvilleCity_Text_1E056A, 4 - setflag FLAG_0x062 - release - end - -MauvilleCity_EventScript_1DF413:: @ 81DF413 - msgbox MauvilleCity_Text_1E0699, 4 - release - end - -MauvilleCity_EventScript_1DF41D:: @ 81DF41D - lock - faceplayer - checkflag FLAG_0x11C - goto_eq MauvilleCity_EventScript_1DF43D - msgbox MauvilleCity_Text_1DF7DC, 4 - closemessage - applymovement 7, MauvilleCity_Movement_2725A2 - waitmovement 0 - release - end - -MauvilleCity_EventScript_1DF43D:: @ 81DF43D - msgbox MauvilleCity_Text_1DFAA5, 4 - closemessage - applymovement 7, MauvilleCity_Movement_2725A2 - waitmovement 0 - release - end - -MauvilleCity_EventScript_1DF452:: @ 81DF452 - lockall - checkflag FLAG_0x11C - goto_eq MauvilleCity_EventScript_1DF690 - applymovement 6, MauvilleCity_Movement_2725A8 - waitmovement 0 - msgbox MauvilleCity_Text_1DF845, 4 - msgbox MauvilleCity_Text_1DF8B9, 4 - msgbox MauvilleCity_Text_1DF963, 4 - applymovement 6, MauvilleCity_Movement_27259E - waitmovement 0 - playse SE_PIN - applymovement 6, MauvilleCity_Movement_272598 - waitmovement 0 - applymovement 6, MauvilleCity_Movement_27259A - waitmovement 0 - msgbox MauvilleCity_Text_1DF9B2, 5 - goto MauvilleCity_EventScript_1DF4AD - end - -MauvilleCity_EventScript_1DF4AD:: @ 81DF4AD - compare VAR_RESULT, 1 - call_if 1, MauvilleCity_EventScript_1DF63A - compare VAR_RESULT, 0 - goto_eq MauvilleCity_EventScript_1DF683 - closemessage - switch VAR_FACING - case 2, MauvilleCity_EventScript_1DF4E0 - case 4, MauvilleCity_EventScript_1DF53D - end - -MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0 - applymovement 255, MauvilleCity_Movement_1DF6DF - applymovement 6, MauvilleCity_Movement_1DF6A8 - applymovement 7, MauvilleCity_Movement_1DF6E2 - waitmovement 0 - applymovement 6, MauvilleCity_Movement_2725A8 - waitmovement 0 - delay 30 - applymovement 255, MauvilleCity_Movement_1DF6EE - applymovement 7, MauvilleCity_Movement_1DF6F3 - waitmovement 0 - msgbox MauvilleCity_Text_1DFD34, 4 - closemessage - applymovement 255, MauvilleCity_Movement_1DF6CC - applymovement 7, MauvilleCity_Movement_1DF6FA - applymovement 6, MauvilleCity_Movement_1DF6B4 - waitmovement 0 - goto MauvilleCity_EventScript_1DF593 - end - -MauvilleCity_EventScript_1DF53D:: @ 81DF53D - applymovement 255, MauvilleCity_Movement_1DF6DC - applymovement 6, MauvilleCity_Movement_1DF6AE - applymovement 7, MauvilleCity_Movement_1DF6E8 - waitmovement 0 - applymovement 6, MauvilleCity_Movement_2725A8 - waitmovement 0 - delay 30 - applymovement 7, MauvilleCity_Movement_1DF6F7 - waitmovement 0 - msgbox MauvilleCity_Text_1DFD34, 4 - closemessage - applymovement 255, MauvilleCity_Movement_1DF6D0 - applymovement 7, MauvilleCity_Movement_1DF703 - applymovement 6, MauvilleCity_Movement_1DF6C0 - waitmovement 0 - goto MauvilleCity_EventScript_1DF593 - end - -MauvilleCity_EventScript_1DF593:: @ 81DF593 - removeobject 6 - removeobject 7 - clearflag FLAG_0x326 - clearflag FLAG_0x329 - setflag FLAG_0x0BE - setvar VAR_0x40F2, 0 - setflag FLAG_0x088 - compare VAR_FACING, 2 - call_if 1, MauvilleCity_EventScript_1DF5F3 - compare VAR_FACING, 4 - call_if 1, MauvilleCity_EventScript_1DF601 - applymovement 255, MauvilleCity_Movement_2725AA - waitmovement 0 - msgbox MauvilleCity_Text_1DFED5, 4 - closemessage - addvar VAR_0x40D1, 1 - compare VAR_FACING, 2 - call_if 1, MauvilleCity_EventScript_1DF616 - compare VAR_FACING, 4 - call_if 1, MauvilleCity_EventScript_1DF628 - removeobject 11 - releaseall - end - -MauvilleCity_EventScript_1DF5F3:: @ 81DF5F3 - addobject 11 - applymovement 11, MauvilleCity_Movement_1DF70D - waitmovement 0 - return - -MauvilleCity_EventScript_1DF601:: @ 81DF601 - setobjectxyperm 11, 12, 13 - addobject 11 - applymovement 11, MauvilleCity_Movement_1DF719 - waitmovement 0 - return - -MauvilleCity_EventScript_1DF616:: @ 81DF616 - applymovement 255, MauvilleCity_Movement_1DF6D5 - applymovement 11, MauvilleCity_Movement_1DF725 - waitmovement 0 - return - -MauvilleCity_EventScript_1DF628:: @ 81DF628 - applymovement 255, MauvilleCity_Movement_1DF6D8 - applymovement 11, MauvilleCity_Movement_1DF72F - waitmovement 0 - return - -MauvilleCity_EventScript_1DF63A:: @ 81DF63A - msgbox MauvilleCity_Text_1DFB6D, 4 - trainerbattle 3, TRAINER_WALLY_2, 0, MauvilleCity_Text_1DFB96 - applymovement 6, MauvilleCity_Movement_2725A8 - waitmovement 0 - msgbox MauvilleCity_Text_1DFBC3, 4 - applymovement 6, MauvilleCity_Movement_27259E - waitmovement 0 - msgbox MauvilleCity_Text_1DFBED, 4 - applymovement 6, MauvilleCity_Movement_2725A8 - waitmovement 0 - msgbox MauvilleCity_Text_1DFC8A, 4 - return - -MauvilleCity_EventScript_1DF683:: @ 81DF683 - setflag FLAG_0x11C - msgbox MauvilleCity_Text_1DFA4A, 4 - release - end - -MauvilleCity_EventScript_1DF690:: @ 81DF690 - applymovement 6, MauvilleCity_Movement_27259E - waitmovement 0 - msgbox MauvilleCity_Text_1DFB42, 5 - goto MauvilleCity_EventScript_1DF4AD - end - -MauvilleCity_Movement_1DF6A8: @ 81DF6A8 - walk_left - walk_left - walk_down - walk_down - walk_left - step_end - -MauvilleCity_Movement_1DF6AE: @ 81DF6AE - walk_down - walk_down - walk_left - walk_left - walk_left - step_end - -MauvilleCity_Movement_1DF6B4: @ 81DF6B4 - 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 - 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 - delay_16 - delay_8 - walk_in_place_fastest_left - step_end - -MauvilleCity_Movement_1DF6D0: @ 81DF6D0 - delay_16 - delay_16 - delay_16 - walk_in_place_fastest_left - step_end - -MauvilleCity_Movement_1DF6D5: @ 81DF6D5 - delay_16 - walk_in_place_fastest_left - step_end - -MauvilleCity_Movement_1DF6D8: @ 81DF6D8 - delay_16 - delay_16 - walk_in_place_fastest_left - step_end - -MauvilleCity_Movement_1DF6DC: @ 81DF6DC - delay_16 - walk_in_place_fastest_down - step_end - -MauvilleCity_Movement_1DF6DF: @ 81DF6DF - delay_16 - walk_in_place_fastest_left - step_end - -MauvilleCity_Movement_1DF6E2: @ 81DF6E2 - walk_left - walk_left - walk_left - walk_down - walk_down - step_end - -MauvilleCity_Movement_1DF6E8: @ 81DF6E8 - walk_left - walk_down - walk_down - walk_left - walk_left - step_end - -MauvilleCity_Movement_1DF6EE: @ 81DF6EE - delay_16 - delay_8 - delay_4 - walk_in_place_fastest_down - step_end - -MauvilleCity_Movement_1DF6F3: @ 81DF6F3 - walk_right - walk_right - walk_in_place_fastest_up - step_end - -MauvilleCity_Movement_1DF6F7: @ 81DF6F7 - walk_right - walk_up - step_end - -MauvilleCity_Movement_1DF6FA: @ 81DF6FA - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - step_end - -MauvilleCity_Movement_1DF703: @ 81DF703 - walk_down - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - step_end - -MauvilleCity_Movement_1DF70D: @ 81DF70D - 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 - 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 - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - step_end - -MauvilleCity_Movement_1DF72F: @ 81DF72F - 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 - lock - faceplayer - checkflag FLAG_GOT_TM24_FROM_WATTSON - goto_eq MauvilleCity_EventScript_1DF7B0 - compare VAR_0x40BA, 2 - goto_eq MauvilleCity_EventScript_1DF784 - checkflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON - goto_eq MauvilleCity_EventScript_1DF77A - msgbox MauvilleCity_Text_1DFFE4, 4 - giveitem_std ITEM_BASEMENT_KEY - setflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON - msgbox MauvilleCity_Text_1E0154, 4 - release - end - -MauvilleCity_EventScript_1DF77A:: @ 81DF77A - msgbox MauvilleCity_Text_1E0154, 4 - release - end - -MauvilleCity_EventScript_1DF784:: @ 81DF784 - msgbox MauvilleCity_Text_1E020E, 4 - giveitem_std ITEM_TM24 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_EventScript_272054 - setflag FLAG_GOT_TM24_FROM_WATTSON - msgbox MauvilleCity_Text_1E02AA, 4 - release - end - -MauvilleCity_EventScript_1DF7B0:: @ 81DF7B0 - msgbox MauvilleCity_Text_1E02AA, 4 - release - end - -MauvilleCity_EventScript_1DF7BA:: @ 81DF7BA - lockall - pokenavcall MauvilleCity_Text_1DFDFB - waitmessage - delay 30 - playfanfare MUS_ME_TORE_EYE - msgbox MauvilleCity_Text_1DFEB4, 4 - waitfanfare - closemessage - delay 30 - setflag FLAG_0x0D6 - clearflag FLAG_0x088 - releaseall - end - -MauvilleCity_Text_1DF7DC: @ 81DF7DC - .string "UNCLE: It’s because of POKéMON that\n" - .string "this boy’s got more pep, I suppose…\l" - .string "But he’s become a bit too peppy…$" - -MauvilleCity_Text_1DF845: @ 81DF845 - .string "WALLY: Aww, UNCLE, please?\p" - .string "I want to challenge this GYM and see\n" - .string "how much better I’ve become.\p" - .string "Please? May I, please?$" - -MauvilleCity_Text_1DF8B9: @ 81DF8B9 - .string "UNCLE: Now hold on, WALLY.\p" - .string "Since you started living with POKéMON,\n" - .string "you have grown quite a lot stronger.\p" - .string "But don’t you think you’re pushing it\n" - .string "to suddenly challenge a GYM?$" - -MauvilleCity_Text_1DF963: @ 81DF963 - .string "WALLY: I’m not pushing it.\p" - .string "If I combine forces with RALTS,\n" - .string "we can beat anyone!$" - -MauvilleCity_Text_1DF9B2: @ 81DF9B2 - .string "WALLY: Oh! Hi, {PLAYER}!\p" - .string "I’ve gotten a lot stronger since\n" - .string "we met.\p" - .string "{PLAYER}, I want you and my UNCLE to\n" - .string "understand that.\p" - .string "{PLAYER}, please, will you have\n" - .string "a battle with me?$" - -MauvilleCity_Text_1DFA4A: @ 81DFA4A - .string "WALLY: Oh… If you won’t battle me,\n" - .string "{PLAYER}, my UNCLE won’t know that I’ve\l" - .string "become really strong.$" - -MauvilleCity_Text_1DFAA5: @ 81DFAA5 - .string "UNCLE: {PLAYER}{KUN}, was it?\n" - .string "On WALLY’s behalf, can I ask you to\l" - .string "battle with him just this once?\p" - .string "I don’t think he’s going to listen to\n" - .string "any reason the way he is now.$" - -MauvilleCity_Text_1DFB42: @ 81DFB42 - .string "WALLY: {PLAYER}, please!\n" - .string "Battle with me, please.$" - -MauvilleCity_Text_1DFB6D: @ 81DFB6D - .string "WALLY: {PLAYER}, thank you.\p" - .string "Okay… Here I come!$" - -MauvilleCity_Text_1DFB96: @ 81DFB96 - .string "WALLY: … … … … … … …\p" - .string "… … … … … … … …\p" - .string "I lost…$" - -MauvilleCity_Text_1DFBC3: @ 81DFBC3 - .string "WALLY: UNCLE…\n" - .string "I’ll go back to VERDANTURF…$" - -MauvilleCity_Text_1DFBED: @ 81DFBED - .string "{PLAYER}, thank you.\n" - .string "Being a TRAINER is tough, isn’t it?\p" - .string "It’s not enough just to have POKéMON\n" - .string "and make them battle. That isn’t what\l" - .string "being a real TRAINER is about.$" - -MauvilleCity_Text_1DFC8A: @ 81DFC8A - .string "UNCLE: WALLY, there’s no need to be so\n" - .string "down on yourself.\p" - .string "Why, what’s keeping you from becoming\n" - .string "stronger and stronger?\p" - .string "Come on, let’s go home.\n" - .string "Everyone’s waiting for you.$" - -MauvilleCity_Text_1DFD34: @ 81DFD34 - .string "UNCLE: {PLAYER}{KUN}, it just dawned on me\n" - .string "that you must be the TRAINER who kept\l" - .string "an eye out for WALLY when he caught\l" - .string "his POKéMON.\p" - .string "Why don’t you visit us in VERDANTURF\n" - .string "sometime?\l" - .string "I’m sure WALLY would enjoy it.$" - - -MauvilleCity_Text_1DFDFB: @ 81DFDFB - .string "… … … … … …\n" - .string "… … … … … Beep!\p" - .string "WALLY: Oh, hello, {PLAYER}!\p" - .string "I just wanted to tell you that\n" - .string "my uncle bought me a POKéNAV!\p" - .string "Now I can get in touch with you\n" - .string "anytime, {PLAYER}!\p" - .string "… … … … … …\n" - .string "… … … … … Click!$" - -MauvilleCity_Text_1DFEB4: @ 81DFEB4 - .string "Registered WALLY\n" - .string "in the POKéNAV.$" - -MauvilleCity_Text_1DFED5: @ 81DFED5 - .string "SCOTT: Hehe…\n" - .string "I was watching that match!\p" - .string "You’re friends with that boy WALLY,\n" - .string "aren’t you?\p" - .string "But you didn’t hold anything back\n" - .string "and beat him impressively.\p" - .string "Yeah! That’s what a real POKéMON\n" - .string "battle is all about!\p" - .string "I idolize TRAINERS like that!\p" - .string "… … … … … …\n" - .string "I’ll be cheering for you!$" - -MauvilleCity_Text_1DFFE4: @ 81DFFE4 - .string "WATTSON: Oh, {PLAYER}{KUN}!\n" - .string "You look like you have a lot of zip!\l" - .string "That’s a good thing, wahahahaha!\p" - .string "Fine! I’ve decided!\n" - .string "I need a favor, {PLAYER}{KUN}!\p" - .string "MAUVILLE CITY has an underground\n" - .string "sector called NEW MAUVILLE.\p" - .string "{PLAYER}{KUN}, I’d like you to go there and\n" - .string "switch off the GENERATOR.\p" - .string "The GENERATOR has been running a bit\n" - .string "haywire. It’s getting unsafe.\p" - .string "Here, this is the KEY to get into\n" - .string "NEW MAUVILLE.$" - -MauvilleCity_Text_1E0154: @ 81E0154 - .string "WATTSON: Don’t you worry about it.\n" - .string "It won’t be a challenge to you.\p" - .string "The entrance to NEW MAUVILLE is just\n" - .string "a short SURF away from ROUTE 110.\p" - .string "That’s it, then, you have my trust!\n" - .string "Wahahahaha!$" - -MauvilleCity_Text_1E020E: @ 81E020E - .string "WATTSON: Wahahahaha!\p" - .string "I knew it, {PLAYER}{KUN}! I knew I’d made\n" - .string "the right choice asking you!\p" - .string "This is my thanks--a TM containing\n" - .string "THUNDERBOLT!\p" - .string "Go on, you’ve earned it!$" - -MauvilleCity_Text_1E02AA: @ 81E02AA - .string "WATTSON: Wahahahaha!\p" - .string "It pleases me to no end to see\n" - .string "the young step up and take charge!$" - -MauvilleCity_Text_1E0301: @ 81E0301 - .string "You know, it’s cool to have POKéMON\n" - .string "battles and stuff…\p" - .string "But if your POKéMON gets hurt,\n" - .string "you have to nurse it back to health.$" - -MauvilleCity_Text_1E037C: @ 81E037C - .string "The roads of this town stretch north\n" - .string "and south, and east and west.\p" - .string "Because of that, we get all sorts of\n" - .string "people coming through.$" - -MauvilleCity_Text_1E03FB: @ 81E03FB - .string "Have you been to RYDEL’S CYCLES yet?\p" - .string "RYDEL, the owner, is a very generous\n" - .string "man.$" - -MauvilleCity_Text_1E044A: @ 81E044A - .string "Even if you’re riding a BIKE,\n" - .string "wild POKéMON could jump you.$" - -MauvilleCity_Text_1E0485: @ 81E0485 - .string "MAUVILLE CITY\n" - .string "“The bright and shiny city of fun!â€$" - -MauvilleCity_Text_1E04B7: @ 81E04B7 - .string "MAUVILLE CITY POKéMON GYM\n" - .string "LEADER: WATTSON\l" - .string "“The cheerfully electrifying man!â€$" - -MauvilleCity_Text_1E0504: @ 81E0504 - .string "“Ride in gravel and shake up your\n" - .string "soul!â€\l" - .string "RYDEL’S CYCLES$" - -MauvilleCity_Text_1E053C: @ 81E053C - .string "“The play spot for all!â€\n" - .string "MAUVILLE GAME CORNER$" - -MauvilleCity_Text_1E056A: @ 81E056A - .string "Hi, do you check out TV at all?\p" - .string "They’ve added a bunch of cool new\n" - .string "shows recently.\p" - .string "TV is so cool. I’ve seen my friends on\n" - .string "TV just out of the blue.\p" - .string "And, sometimes, they even put you on TV\n" - .string "without telling you.\p" - .string "I wish I would be on TV sometime.\p" - .string "That’s why I think you should check\n" - .string "out TVs whenever you can.$" - -MauvilleCity_Text_1E0699: @ 81E0699 - .string "Hi, have you been checking out TVs?$" diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc deleted file mode 100644 index 0231e5bde..000000000 --- a/data/scripts/maps/MauvilleCity_BikeShop.inc +++ /dev/null @@ -1,329 +0,0 @@ -MauvilleCity_BikeShop_MapScripts:: @ 820EBBB - .byte 0 - -MauvilleCity_BikeShop_EventScript_20EBBC:: @ 820EBBC - lock - faceplayer - checkflag FLAG_0x05A - goto_eq MauvilleCity_BikeShop_EventScript_20EC94 - checkflag FLAG_0x059 - goto_eq MauvilleCity_BikeShop_EventScript_20EBF7 - msgbox MauvilleCity_BikeShop_Text_20EE22, 4 - msgbox MauvilleCity_BikeShop_Text_20EE99, 5 - compare VAR_RESULT, 1 - goto_eq MauvilleCity_BikeShop_EventScript_20EC4A - compare VAR_RESULT, 0 - goto_eq MauvilleCity_BikeShop_EventScript_20EC3D - end - -MauvilleCity_BikeShop_EventScript_20EBF7:: @ 820EBF7 - msgbox MauvilleCity_BikeShop_Text_20EE99, 5 - compare VAR_RESULT, 1 - goto_eq MauvilleCity_BikeShop_EventScript_20EC4A - compare VAR_RESULT, 0 - goto_eq MauvilleCity_BikeShop_EventScript_20EC3D - end - -MauvilleCity_BikeShop_EventScript_20EC16:: @ 820EC16 - message MauvilleCity_BikeShop_Text_20EF32 - waitmessage - multichoice 21, 8, 12, 1 - switch VAR_RESULT - case 0, MauvilleCity_BikeShop_EventScript_20EC53 - case 1, MauvilleCity_BikeShop_EventScript_20EC6D - end - -MauvilleCity_BikeShop_EventScript_20EC3D:: @ 820EC3D - setflag FLAG_0x059 - msgbox MauvilleCity_BikeShop_Text_20EEE8, 4 - release - end - -MauvilleCity_BikeShop_EventScript_20EC4A:: @ 820EC4A - setflag FLAG_0x05A - goto MauvilleCity_BikeShop_EventScript_20EC16 - end - -MauvilleCity_BikeShop_EventScript_20EC53:: @ 820EC53 - msgbox MauvilleCity_BikeShop_Text_20F18D, 4 - giveitem_std ITEM_MACH_BIKE - goto MauvilleCity_BikeShop_EventScript_20EC87 - end - -MauvilleCity_BikeShop_EventScript_20EC6D:: @ 820EC6D - msgbox MauvilleCity_BikeShop_Text_20F1A5, 4 - giveitem_std ITEM_ACRO_BIKE - goto MauvilleCity_BikeShop_EventScript_20EC87 - end - -MauvilleCity_BikeShop_EventScript_20EC87:: @ 820EC87 - msgbox MauvilleCity_BikeShop_Text_20F1BD, 4 - special SwapRegisteredBike - release - end - -MauvilleCity_BikeShop_EventScript_20EC94:: @ 820EC94 - msgbox MauvilleCity_BikeShop_Text_20F1FB, 5 - compare VAR_RESULT, 1 - goto_eq MauvilleCity_BikeShop_EventScript_20ECB3 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_BikeShop_EventScript_20ECE5 - end - -MauvilleCity_BikeShop_EventScript_20ECB3:: @ 820ECB3 - msgbox MauvilleCity_BikeShop_Text_20F22F, 4 - checkitem ITEM_ACRO_BIKE, 1 - compare VAR_RESULT, 1 - goto_eq MauvilleCity_BikeShop_EventScript_20ECEF - checkitem ITEM_MACH_BIKE, 1 - compare VAR_RESULT, 1 - goto_eq MauvilleCity_BikeShop_EventScript_20ED10 - msgbox MauvilleCity_BikeShop_Text_20F2F3, 4 - release - end - -MauvilleCity_BikeShop_EventScript_20ECE5:: @ 820ECE5 - msgbox MauvilleCity_BikeShop_Text_20F2C4, 4 - release - end - -MauvilleCity_BikeShop_EventScript_20ECEF:: @ 820ECEF - incrementgamestat 4 - msgbox MauvilleCity_BikeShop_Text_20F294, 4 - takeitem ITEM_ACRO_BIKE, 1 - giveitem_std ITEM_MACH_BIKE - goto MauvilleCity_BikeShop_EventScript_20EC87 - end - -MauvilleCity_BikeShop_EventScript_20ED10:: @ 820ED10 - incrementgamestat 4 - msgbox MauvilleCity_BikeShop_Text_20F263, 4 - takeitem ITEM_MACH_BIKE, 1 - giveitem_std ITEM_ACRO_BIKE - goto MauvilleCity_BikeShop_EventScript_20EC87 - end - -MauvilleCity_BikeShop_EventScript_20ED31:: @ 820ED31 - msgbox MauvilleCity_BikeShop_Text_20F3C3, 2 - end - -MauvilleCity_BikeShop_EventScript_20ED3A:: @ 820ED3A - message MauvilleCity_BikeShop_Text_20F445 - waitmessage - goto MauvilleCity_BikeShop_EventScript_20ED46 - end - -MauvilleCity_BikeShop_EventScript_20ED46:: @ 820ED46 - multichoice 0, 0, 43, 0 - switch VAR_RESULT - case 0, MauvilleCity_BikeShop_EventScript_20ED88 - case 1, MauvilleCity_BikeShop_EventScript_20ED94 - case 2, MauvilleCity_BikeShop_EventScript_20EDA0 - case 3, MauvilleCity_BikeShop_EventScript_20EDAC - case 127, MauvilleCity_BikeShop_EventScript_20EDAC - end - -MauvilleCity_BikeShop_EventScript_20ED88:: @ 820ED88 - message MauvilleCity_BikeShop_Text_20F487 - waitmessage - goto MauvilleCity_BikeShop_EventScript_20ED46 - end - -MauvilleCity_BikeShop_EventScript_20ED94:: @ 820ED94 - message MauvilleCity_BikeShop_Text_20F550 - waitmessage - goto MauvilleCity_BikeShop_EventScript_20ED46 - end - -MauvilleCity_BikeShop_EventScript_20EDA0:: @ 820EDA0 - message MauvilleCity_BikeShop_Text_20F61A - waitmessage - goto MauvilleCity_BikeShop_EventScript_20ED46 - end - -MauvilleCity_BikeShop_EventScript_20EDAC:: @ 820EDAC - release - end - -MauvilleCity_BikeShop_EventScript_20EDAE:: @ 820EDAE - message MauvilleCity_BikeShop_Text_20F6ED - waitmessage - goto MauvilleCity_BikeShop_EventScript_20EDBA - end - -MauvilleCity_BikeShop_EventScript_20EDBA:: @ 820EDBA - multichoice 0, 0, 44, 0 - switch VAR_RESULT - case 0, MauvilleCity_BikeShop_EventScript_20EDFC - case 1, MauvilleCity_BikeShop_EventScript_20EE08 - case 2, MauvilleCity_BikeShop_EventScript_20EE14 - case 3, MauvilleCity_BikeShop_EventScript_20EE20 - case 127, MauvilleCity_BikeShop_EventScript_20EE20 - end - -MauvilleCity_BikeShop_EventScript_20EDFC:: @ 820EDFC - message MauvilleCity_BikeShop_Text_20F72F - waitmessage - goto MauvilleCity_BikeShop_EventScript_20EDBA - end - -MauvilleCity_BikeShop_EventScript_20EE08:: @ 820EE08 - message MauvilleCity_BikeShop_Text_20F7F5 - waitmessage - goto MauvilleCity_BikeShop_EventScript_20EDBA - end - -MauvilleCity_BikeShop_EventScript_20EE14:: @ 820EE14 - message MauvilleCity_BikeShop_Text_20F898 - waitmessage - goto MauvilleCity_BikeShop_EventScript_20EDBA - end - -MauvilleCity_BikeShop_EventScript_20EE20:: @ 820EE20 - release - end - -MauvilleCity_BikeShop_Text_20EE22: @ 820EE22 - .string "Well, well, what have we here?\n" - .string "A most energetic customer!\p" - .string "Me? You may call me RYDEL.\n" - .string "I’m the owner of this cycle shop.$" - -MauvilleCity_BikeShop_Text_20EE99: @ 820EE99 - .string "RYDEL: Your RUNNING SHOES…\n" - .string "They’re awfully filthy.\p" - .string "Did you come from far away?$" - -MauvilleCity_BikeShop_Text_20EEE8: @ 820EEE8 - .string "RYDEL: Is that right?\p" - .string "Then, I guess you have no need for\n" - .string "any of my BIKES.$" - -MauvilleCity_BikeShop_Text_20EF32: @ 820EF32 - .string "RYDEL: Hm, hm… … … … …\p" - .string "You’re saying that you came all this\n" - .string "way from LITTLEROOT?\p" - .string "My goodness!\n" - .string "That’s ridiculously far!\p" - .string "If you had one of my BIKES, you could\n" - .string "go anywhere easily while feeling the\l" - .string "gentle caress of the wind!\p" - .string "I’ll tell you what!\n" - .string "I’ll give you a BIKE!\p" - .string "Oh, wait a second!\p" - .string "I forgot to tell you that there are\n" - .string "two kinds of BIKES!\p" - .string "They are the MACH BIKE and\n" - .string "the ACRO BIKE!\p" - .string "The MACH BIKE is for cyclists who want\n" - .string "to feel the wind with their bodies!\p" - .string "And an ACRO BIKE is for those who\n" - .string "prefer technical rides!\p" - .string "I’m a real sweetheart, so you can\n" - .string "have whichever one you like!\p" - .string "Which one will you choose?$" - -MauvilleCity_BikeShop_Text_20F18D: @ 820F18D - .string "{PLAYER} chose the MACH BIKE.$" - -MauvilleCity_BikeShop_Text_20F1A5: @ 820F1A5 - .string "{PLAYER} chose the ACRO BIKE.$" - -MauvilleCity_BikeShop_Text_20F1BD: @ 820F1BD - .string "RYDEL: If you get the urge to switch\n" - .string "BIKES, just come see me!$" - -MauvilleCity_BikeShop_Text_20F1FB: @ 820F1FB - .string "RYDEL: Oh? Were you thinking about\n" - .string "switching BIKES?$" - -MauvilleCity_BikeShop_Text_20F22F: @ 820F22F - .string "RYDEL: Okay, no problem!\n" - .string "I’ll switch BIKES for you!$" - -MauvilleCity_BikeShop_Text_20F263: @ 820F263 - .string "{PLAYER} got the MACH BIKE exchanged\n" - .string "for an ACRO BIKE.$" - -MauvilleCity_BikeShop_Text_20F294: @ 820F294 - .string "{PLAYER} got the ACRO BIKE exchanged\n" - .string "for a MACH BIKE.$" - -MauvilleCity_BikeShop_Text_20F2C4: @ 820F2C4 - .string "RYDEL: Good, good!\n" - .string "I’m happy that you like it!$" - -MauvilleCity_BikeShop_Text_20F2F3: @ 820F2F3 - .string "Oh? What happened to that BIKE\n" - .string "I gave you?\p" - .string "Oh, I get it, you stored it using your PC.\p" - .string "Well, take it out of PC storage,\n" - .string "and I’ll be happy to exchange it!\p" - .string "May the wind always be at your back\n" - .string "on your adventure!$" - -MauvilleCity_BikeShop_Text_20F3C3: @ 820F3C3 - .string "I’m learning about BIKES while\n" - .string "I work here.\p" - .string "If you need advice on how to ride your\n" - .string "BIKE, there’re a couple handbooks in\l" - .string "the back.$" - -MauvilleCity_BikeShop_Text_20F445: @ 820F445 - .string "It’s a handbook on the MACH BIKE.\p" - .string "Which page do you want to read?$" - -MauvilleCity_BikeShop_Text_20F487: @ 820F487 - .string "A BIKE moves in the direction that\n" - .string "the + Control Pad is pressed.\p" - .string "It will speed up once it gets rolling.\p" - .string "To stop, release the + Control Pad.\n" - .string "The BIKE will slow to a stop.\p" - .string "Want to read a different page?$" - -MauvilleCity_BikeShop_Text_20F550: @ 820F550 - .string "A MACH BIKE is speedy, but it can’t\n" - .string "stop very quickly.\p" - .string "It gets a little tricky to get around\n" - .string "a corner.\p" - .string "Release the + Control Pad a little\n" - .string "before the corner and slow down.\p" - .string "Want to read a different page?$" - -MauvilleCity_BikeShop_Text_20F61A: @ 820F61A - .string "There are small sandy slopes\n" - .string "throughout the HOENN region.\p" - .string "The loose, crumbly sand makes it\n" - .string "impossible to climb normally.\p" - .string "But if you have a MACH BIKE, you can\n" - .string "zip up a sandy slope.\p" - .string "Want to read a different page?$" - -MauvilleCity_BikeShop_Text_20F6ED: @ 820F6ED - .string "It’s a handbook on the ACRO BIKE.\p" - .string "Which page do you want to read?$" - -MauvilleCity_BikeShop_Text_20F72F: @ 820F72F - .string "Press the B Button while riding,\n" - .string "and the front wheel lifts up.\p" - .string "You can zip around with the front\n" - .string "wheel up using the + Control Pad.\p" - .string "This technique is called a wheelie.\p" - .string "Want to read a different page?$" - -MauvilleCity_BikeShop_Text_20F7F5: @ 820F7F5 - .string "Keeping the B Button pressed,\n" - .string "your BIKE can hop on the spot.\p" - .string "This technique is called a bunny hop.\p" - .string "You can ride while hopping, too.\p" - .string "Want to read a different page?$" - -MauvilleCity_BikeShop_Text_20F898: @ 820F898 - .string "Press the B Button and the + Control\n" - .string "Pad at the same time to jump.\p" - .string "Press the + Control Pad to the side\n" - .string "to jump sideways.\p" - .string "Press it backwards to make the BIKE\n" - .string "change directions while jumping.\p" - .string "Want to read a different page?$" - diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc deleted file mode 100644 index 400a24c24..000000000 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ /dev/null @@ -1,821 +0,0 @@ -MauvilleCity_GameCorner_MapScripts:: @ 820FBB8 - .byte 0 - -MauvilleCity_GameCorner_EventScript_20FBB9:: @ 820FBB9 - lock - faceplayer - msgbox MauvilleCity_GameCorner_Text_210460, 4 - checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_20FCB7 - message MauvilleCity_GameCorner_Text_2104DF - waitmessage - showmoneybox 0, 0, 0 - showcoinsbox 1, 6 - goto MauvilleCity_GameCorner_EventScript_20FBE5 - -MauvilleCity_GameCorner_EventScript_20FBE5:: @ 820FBE5 - multichoicedefault 15, 0, 49, 0, 0 - switch VAR_RESULT - case 0, MauvilleCity_GameCorner_EventScript_20FC33 - case 1, MauvilleCity_GameCorner_EventScript_20FC75 - goto MauvilleCity_GameCorner_EventScript_20FCD1 - end - -MauvilleCity_GameCorner_EventScript_20FC0C:: @ 820FC0C - multichoicedefault 15, 0, 49, 1, 0 - switch VAR_RESULT - case 0, MauvilleCity_GameCorner_EventScript_20FC33 - case 1, MauvilleCity_GameCorner_EventScript_20FC75 - goto MauvilleCity_GameCorner_EventScript_20FCD1 - end - -MauvilleCity_GameCorner_EventScript_20FC33:: @ 820FC33 - checkcoins VAR_TEMP_1 - compare VAR_TEMP_1, 9950 - goto_if 4, MauvilleCity_GameCorner_EventScript_20FCE1 - checkmoney 0x3e8, 0 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_20FCC1 - givecoins 50 - takemoney 0x3e8, 0 - updatemoneybox 0, 0 - nop - updatecoinsbox 1, 6 - playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_210529, 4 - hidemoneybox - nop - nop - hidecoinsbox 0, 5 - release - end - -MauvilleCity_GameCorner_EventScript_20FC75:: @ 820FC75 - checkcoins VAR_TEMP_1 - compare VAR_TEMP_1, 9500 - goto_if 4, MauvilleCity_GameCorner_EventScript_20FCE1 - checkmoney 0x2710, 0 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_20FCC1 - givecoins 500 - takemoney 0x2710, 0 - updatemoneybox 0, 0 - nop - updatecoinsbox 1, 6 - playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_210529, 4 - hidemoneybox - nop - nop - hidecoinsbox 0, 5 - release - end - -MauvilleCity_GameCorner_EventScript_20FCB7:: @ 820FCB7 - msgbox MauvilleCity_GameCorner_Text_21047E, 4 - release - end - -MauvilleCity_GameCorner_EventScript_20FCC1:: @ 820FCC1 - msgbox MauvilleCity_GameCorner_Text_210553, 4 - hidemoneybox - nop - nop - hidecoinsbox 0, 5 - release - end - -MauvilleCity_GameCorner_EventScript_20FCD1:: @ 820FCD1 - msgbox MauvilleCity_GameCorner_Text_21059A, 4 - hidemoneybox - nop - nop - hidecoinsbox 0, 5 - release - end - -MauvilleCity_GameCorner_EventScript_20FCE1:: @ 820FCE1 - msgbox MauvilleCity_GameCorner_Text_21057E, 4 - hidemoneybox - nop - nop - hidecoinsbox 0, 5 - release - end - -MauvilleCity_GameCorner_EventScript_20FCF1:: @ 820FCF1 - lock - faceplayer - msgbox MauvilleCity_GameCorner_Text_2105D7, 4 - checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 1 - goto_eq MauvilleCity_GameCorner_EventScript_20FD0D - release - end - -MauvilleCity_GameCorner_EventScript_20FD0D:: @ 820FD0D - message MauvilleCity_GameCorner_Text_21060D - waitmessage - setvar VAR_TEMP_1, 0 - showcoinsbox 1, 1 - goto MauvilleCity_GameCorner_EventScript_20FD2B - -MauvilleCity_GameCorner_EventScript_20FD20:: @ 820FD20 - message MauvilleCity_GameCorner_Text_21060D - waitmessage - goto MauvilleCity_GameCorner_EventScript_20FD2B - -MauvilleCity_GameCorner_EventScript_20FD2B:: @ 820FD2B - multichoice 12, 0, 48, 0 - switch VAR_RESULT - case 0, MauvilleCity_GameCorner_EventScript_20FD67 - case 1, MauvilleCity_GameCorner_EventScript_20FD75 - case 2, MauvilleCity_GameCorner_EventScript_20FD83 - case 3, MauvilleCity_GameCorner_EventScript_20FE92 - goto MauvilleCity_GameCorner_EventScript_20FE92 - end - -MauvilleCity_GameCorner_EventScript_20FD67:: @ 820FD67 - setvar VAR_TEMP_1, 1 - bufferdecorationname 0, 88 - goto MauvilleCity_GameCorner_EventScript_20FD91 - -MauvilleCity_GameCorner_EventScript_20FD75:: @ 820FD75 - setvar VAR_TEMP_1, 2 - bufferdecorationname 0, 89 - goto MauvilleCity_GameCorner_EventScript_20FD91 - -MauvilleCity_GameCorner_EventScript_20FD83:: @ 820FD83 - setvar VAR_TEMP_1, 3 - bufferdecorationname 0, 90 - goto MauvilleCity_GameCorner_EventScript_20FD91 - -MauvilleCity_GameCorner_EventScript_20FD91:: @ 820FD91 - msgbox MauvilleCity_GameCorner_Text_210705, 5 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_20FE92 - switch VAR_TEMP_1 - case 1, MauvilleCity_GameCorner_EventScript_20FDCB - case 2, MauvilleCity_GameCorner_EventScript_20FE05 - case 3, MauvilleCity_GameCorner_EventScript_20FE3F - end - -MauvilleCity_GameCorner_EventScript_20FDCB:: @ 820FDCB - checkcoins VAR_TEMP_2 - compare VAR_TEMP_2, 1000 - goto_if 0, MauvilleCity_GameCorner_EventScript_20FE79 - bufferdecorationname 1, 88 - checkdecorspace 88 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_20FE87 - takecoins 1000 - givedecoration 88 - updatecoinsbox 1, 1 - playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_210646, 4 - goto MauvilleCity_GameCorner_EventScript_20FD20 - end - -MauvilleCity_GameCorner_EventScript_20FE05:: @ 820FE05 - checkcoins VAR_TEMP_2 - compare VAR_TEMP_2, 1000 - goto_if 0, MauvilleCity_GameCorner_EventScript_20FE79 - bufferdecorationname 1, 89 - checkdecorspace 89 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_20FE87 - takecoins 1000 - givedecoration 89 - updatecoinsbox 1, 1 - playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_210646, 4 - goto MauvilleCity_GameCorner_EventScript_20FD20 - end - -MauvilleCity_GameCorner_EventScript_20FE3F:: @ 820FE3F - checkcoins VAR_TEMP_2 - compare VAR_TEMP_2, 1000 - goto_if 0, MauvilleCity_GameCorner_EventScript_20FE79 - bufferdecorationname 1, 90 - checkdecorspace 90 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_20FE87 - takecoins 1000 - givedecoration 90 - updatecoinsbox 1, 1 - playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_210646, 4 - goto MauvilleCity_GameCorner_EventScript_20FD20 - end - -MauvilleCity_GameCorner_EventScript_20FE79:: @ 820FE79 - msgbox MauvilleCity_GameCorner_Text_210673, 4 - goto MauvilleCity_GameCorner_EventScript_20FD20 - end - -MauvilleCity_GameCorner_EventScript_20FE87:: @ 820FE87 - call MauvilleCity_GameCorner_EventScript_272071 - goto MauvilleCity_GameCorner_EventScript_20FD20 - end - -MauvilleCity_GameCorner_EventScript_20FE92:: @ 820FE92 - msgbox MauvilleCity_GameCorner_Text_2106BF, 4 - hidecoinsbox 0, 0 - release - end - -MauvilleCity_GameCorner_EventScript_20FE9F:: @ 820FE9F - lock - faceplayer - msgbox MauvilleCity_GameCorner_Text_2105D7, 4 - checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 1 - goto_eq MauvilleCity_GameCorner_EventScript_20FEBB - release - end - -MauvilleCity_GameCorner_EventScript_20FEBB:: @ 820FEBB - message MauvilleCity_GameCorner_Text_21060D - waitmessage - setvar VAR_TEMP_1, 0 - showcoinsbox 1, 1 - goto MauvilleCity_GameCorner_EventScript_20FED9 - -MauvilleCity_GameCorner_EventScript_20FECE:: @ 820FECE - message MauvilleCity_GameCorner_Text_21060D - waitmessage - goto MauvilleCity_GameCorner_EventScript_20FED9 - -MauvilleCity_GameCorner_EventScript_20FED9:: @ 820FED9 - multichoice 12, 0, 55, 0 - switch VAR_RESULT - case 0, MauvilleCity_GameCorner_EventScript_20FF2B - case 1, MauvilleCity_GameCorner_EventScript_20FF3E - case 2, MauvilleCity_GameCorner_EventScript_20FF51 - case 3, MauvilleCity_GameCorner_EventScript_20FF64 - case 4, MauvilleCity_GameCorner_EventScript_20FF77 - case 5, MauvilleCity_GameCorner_EventScript_210118 - goto MauvilleCity_GameCorner_EventScript_210118 - end - -MauvilleCity_GameCorner_EventScript_20FF2B:: @ 820FF2B - setvar VAR_TEMP_1, 1 - bufferitemname 0, ITEM_TM32 - setvar VAR_0x8004, 320 - goto MauvilleCity_GameCorner_EventScript_20FF8A - -MauvilleCity_GameCorner_EventScript_20FF3E:: @ 820FF3E - setvar VAR_TEMP_1, 2 - bufferitemname 0, ITEM_TM29 - setvar VAR_0x8004, 317 - goto MauvilleCity_GameCorner_EventScript_20FF8A - -MauvilleCity_GameCorner_EventScript_20FF51:: @ 820FF51 - setvar VAR_TEMP_1, 3 - bufferitemname 0, ITEM_TM35 - setvar VAR_0x8004, 323 - goto MauvilleCity_GameCorner_EventScript_20FF8A - -MauvilleCity_GameCorner_EventScript_20FF64:: @ 820FF64 - setvar VAR_TEMP_1, 4 - bufferitemname 0, ITEM_TM24 - setvar VAR_0x8004, 312 - goto MauvilleCity_GameCorner_EventScript_20FF8A - -MauvilleCity_GameCorner_EventScript_20FF77:: @ 820FF77 - setvar VAR_TEMP_1, 5 - bufferitemname 0, ITEM_TM13 - setvar VAR_0x8004, 301 - goto MauvilleCity_GameCorner_EventScript_20FF8A - -MauvilleCity_GameCorner_EventScript_20FF8A:: @ 820FF8A - special sub_81398C0 - msgbox MauvilleCity_GameCorner_Text_210629, 5 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210118 - switch VAR_TEMP_1 - case 1, MauvilleCity_GameCorner_EventScript_20FFDD - case 2, MauvilleCity_GameCorner_EventScript_210017 - case 3, MauvilleCity_GameCorner_EventScript_210051 - case 4, MauvilleCity_GameCorner_EventScript_21008B - case 5, MauvilleCity_GameCorner_EventScript_2100C5 - end - -MauvilleCity_GameCorner_EventScript_20FFDD:: @ 820FFDD - checkcoins VAR_TEMP_2 - compare VAR_TEMP_2, 1500 - goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF - checkitemspace ITEM_TM32, 1 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_21010D - takecoins 1500 - giveitem ITEM_TM32, 1 - updatecoinsbox 1, 1 - playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_21071B, 4 - goto MauvilleCity_GameCorner_EventScript_20FECE - end - -MauvilleCity_GameCorner_EventScript_210017:: @ 8210017 - checkcoins VAR_TEMP_2 - compare VAR_TEMP_2, 3500 - goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF - checkitemspace ITEM_TM29, 1 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_21010D - takecoins 3500 - giveitem ITEM_TM29, 1 - updatecoinsbox 1, 1 - playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_21071B, 4 - goto MauvilleCity_GameCorner_EventScript_20FECE - end - -MauvilleCity_GameCorner_EventScript_210051:: @ 8210051 - checkcoins VAR_TEMP_2 - compare VAR_TEMP_2, 4000 - goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF - checkitemspace ITEM_TM35, 1 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_21010D - takecoins 4000 - giveitem ITEM_TM35, 1 - updatecoinsbox 1, 1 - playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_21071B, 4 - goto MauvilleCity_GameCorner_EventScript_20FECE - end - -MauvilleCity_GameCorner_EventScript_21008B:: @ 821008B - checkcoins VAR_TEMP_2 - compare VAR_TEMP_2, 4000 - goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF - checkitemspace ITEM_TM24, 1 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_21010D - takecoins 4000 - giveitem ITEM_TM24, 1 - updatecoinsbox 1, 1 - playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_21071B, 4 - goto MauvilleCity_GameCorner_EventScript_20FECE - end - -MauvilleCity_GameCorner_EventScript_2100C5:: @ 82100C5 - checkcoins VAR_TEMP_2 - compare VAR_TEMP_2, 4000 - goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF - checkitemspace ITEM_TM13, 1 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_21010D - takecoins 4000 - giveitem ITEM_TM13, 1 - updatecoinsbox 1, 1 - playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_21071B, 4 - goto MauvilleCity_GameCorner_EventScript_20FECE - end - -MauvilleCity_GameCorner_EventScript_2100FF:: @ 82100FF - msgbox MauvilleCity_GameCorner_Text_210673, 4 - goto MauvilleCity_GameCorner_EventScript_20FECE - end - -MauvilleCity_GameCorner_EventScript_21010D:: @ 821010D - call MauvilleCity_GameCorner_EventScript_27205E - goto MauvilleCity_GameCorner_EventScript_20FECE - end - -MauvilleCity_GameCorner_EventScript_210118:: @ 8210118 - msgbox MauvilleCity_GameCorner_Text_2106BF, 4 - hidecoinsbox 0, 0 - release - end - -MauvilleCity_GameCorner_EventScript_210125:: @ 8210125 - msgbox MauvilleCity_GameCorner_Text_2109D3, 2 - end - -MauvilleCity_GameCorner_EventScript_21012E:: @ 821012E - msgbox MauvilleCity_GameCorner_Text_210A05, 2 - end - -MauvilleCity_GameCorner_EventScript_210137:: @ 8210137 - lock - faceplayer - checkflag FLAG_0x0E2 - goto_eq MauvilleCity_GameCorner_EventScript_210213 - msgbox MauvilleCity_GameCorner_Text_210750, 5 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210209 - switch VAR_FIRST_POKE - case 0, MauvilleCity_GameCorner_EventScript_21017C - case 1, MauvilleCity_GameCorner_EventScript_2101A6 - case 2, MauvilleCity_GameCorner_EventScript_2101D0 - end - -MauvilleCity_GameCorner_EventScript_21017C:: @ 821017C - bufferdecorationname 1, 88 - checkdecorspace 88 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_2101FA - msgbox MauvilleCity_GameCorner_Text_21079C, 4 - givedecoration_std 88 - setflag FLAG_0x0E2 - goto MauvilleCity_GameCorner_EventScript_210213 - end - -MauvilleCity_GameCorner_EventScript_2101A6:: @ 82101A6 - bufferdecorationname 1, 89 - checkdecorspace 89 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_2101FA - msgbox MauvilleCity_GameCorner_Text_21079C, 4 - givedecoration_std 89 - setflag FLAG_0x0E2 - goto MauvilleCity_GameCorner_EventScript_210213 - end - -MauvilleCity_GameCorner_EventScript_2101D0:: @ 82101D0 - bufferdecorationname 1, 90 - checkdecorspace 90 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_2101FA - msgbox MauvilleCity_GameCorner_Text_21079C, 4 - givedecoration_std 90 - setflag FLAG_0x0E2 - goto MauvilleCity_GameCorner_EventScript_210213 - end - -MauvilleCity_GameCorner_EventScript_2101FA:: @ 82101FA - call MauvilleCity_GameCorner_EventScript_272071 - msgbox MauvilleCity_GameCorner_Text_2107A9, 4 - release - end - -MauvilleCity_GameCorner_EventScript_210209:: @ 8210209 - msgbox MauvilleCity_GameCorner_Text_2107CE, 4 - release - end - -MauvilleCity_GameCorner_EventScript_210213:: @ 8210213 - msgbox MauvilleCity_GameCorner_Text_2107FB, 4 - release - end - -MauvilleCity_GameCorner_EventScript_21021D:: @ 821021D - lock - faceplayer - checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 1 - goto_eq MauvilleCity_GameCorner_EventScript_21023D - msgbox MauvilleCity_GameCorner_Text_210830, 4 - goto MauvilleCity_GameCorner_EventScript_2102A9 - end - -MauvilleCity_GameCorner_EventScript_21023D:: @ 821023D - checkflag FLAG_0x0E1 - goto_eq MauvilleCity_GameCorner_EventScript_21026B - checkcoins VAR_TEMP_1 - compare VAR_TEMP_1, 1 - goto_if 4, MauvilleCity_GameCorner_EventScript_21026B - setflag FLAG_0x0E1 - givecoins 20 - msgbox MauvilleCity_GameCorner_Text_2108A0, 4 - playse SE_REGI - goto MauvilleCity_GameCorner_EventScript_21026B - end - -MauvilleCity_GameCorner_EventScript_21026B:: @ 821026B - msgbox MauvilleCity_GameCorner_Text_2108EF, 4 - goto MauvilleCity_GameCorner_EventScript_2102A9 - end - -MauvilleCity_GameCorner_EventScript_210279:: @ 8210279 - lock - faceplayer - msgbox MauvilleCity_GameCorner_Text_210932, 4 - goto MauvilleCity_GameCorner_EventScript_2102A9 - end - -MauvilleCity_GameCorner_EventScript_210289:: @ 8210289 - lock - faceplayer - msgbox MauvilleCity_GameCorner_Text_21098E, 4 - goto MauvilleCity_GameCorner_EventScript_2102A9 - end - -MauvilleCity_GameCorner_EventScript_210299:: @ 8210299 - lock - faceplayer - msgbox MauvilleCity_GameCorner_Text_210A51, 4 - goto MauvilleCity_GameCorner_EventScript_2102A9 - end - -MauvilleCity_GameCorner_EventScript_2102A9:: @ 82102A9 - closemessage - applymovement VAR_LAST_TALKED, MauvilleCity_GameCorner_Movement_2725A2 - waitmovement 0 - release - end - -MauvilleCity_GameCorner_EventScript_2102B6:: @ 82102B6 - lock - faceplayer - msgbox MauvilleCity_GameCorner_Text_210A82, 4 - goto MauvilleCity_GameCorner_EventScript_2102A9 - end - -MauvilleCity_GameCorner_EventScript_2102C6:: @ 82102C6 - lock - faceplayer - msgbox MauvilleCity_GameCorner_Text_210B04, 4 - goto MauvilleCity_GameCorner_EventScript_2102A9 - end - -MauvilleCity_GameCorner_EventScript_2102D6:: @ 82102D6 - lockall - checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 - setvar VAR_0x8004, 0 - specialvar VAR_RESULT, sub_8139248 - playslotmachine VAR_RESULT - releaseall - end - -MauvilleCity_GameCorner_EventScript_2102F6:: @ 82102F6 - lockall - checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 - setvar VAR_0x8004, 1 - specialvar VAR_RESULT, sub_8139248 - playslotmachine VAR_RESULT - releaseall - end - -MauvilleCity_GameCorner_EventScript_210316:: @ 8210316 - lockall - checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 - setvar VAR_0x8004, 2 - specialvar VAR_RESULT, sub_8139248 - playslotmachine VAR_RESULT - releaseall - end - -MauvilleCity_GameCorner_EventScript_210336:: @ 8210336 - lockall - checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 - setvar VAR_0x8004, 3 - specialvar VAR_RESULT, sub_8139248 - playslotmachine VAR_RESULT - releaseall - end - -MauvilleCity_GameCorner_EventScript_210356:: @ 8210356 - lockall - checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 - setvar VAR_0x8004, 4 - specialvar VAR_RESULT, sub_8139248 - playslotmachine VAR_RESULT - releaseall - end - -MauvilleCity_GameCorner_EventScript_210376:: @ 8210376 - lockall - checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 - setvar VAR_0x8004, 5 - specialvar VAR_RESULT, sub_8139248 - playslotmachine VAR_RESULT - releaseall - end - -MauvilleCity_GameCorner_EventScript_210396:: @ 8210396 - lockall - checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 - setvar VAR_0x8004, 6 - specialvar VAR_RESULT, sub_8139248 - playslotmachine VAR_RESULT - releaseall - end - -MauvilleCity_GameCorner_EventScript_2103B6:: @ 82103B6 - lockall - checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 - setvar VAR_0x8004, 7 - specialvar VAR_RESULT, sub_8139248 - playslotmachine VAR_RESULT - releaseall - end - -MauvilleCity_GameCorner_EventScript_2103D6:: @ 82103D6 - lockall - checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 - setvar VAR_0x8004, 8 - specialvar VAR_RESULT, sub_8139248 - playslotmachine VAR_RESULT - releaseall - end - -MauvilleCity_GameCorner_EventScript_2103F6:: @ 82103F6 - lockall - checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 - setvar VAR_0x8004, 9 - specialvar VAR_RESULT, sub_8139248 - playslotmachine VAR_RESULT - releaseall - end - -MauvilleCity_GameCorner_EventScript_210416:: @ 8210416 - lockall - checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 - setvar VAR_0x8004, 10 - specialvar VAR_RESULT, sub_8139248 - playslotmachine VAR_RESULT - releaseall - end - -MauvilleCity_GameCorner_EventScript_210436:: @ 8210436 - lockall - checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 - setvar VAR_0x8004, 11 - specialvar VAR_RESULT, sub_8139248 - playslotmachine VAR_RESULT - releaseall - end - -MauvilleCity_GameCorner_EventScript_210456:: @ 8210456 - msgbox MauvilleCity_GameCorner_Text_210C2E, 4 - releaseall - end - -MauvilleCity_GameCorner_Text_210460: @ 8210460 - .string "This is MAUVILLE GAME CORNER.$" - -MauvilleCity_GameCorner_Text_21047E: @ 821047E - .string "Okay, you wanted some COINS for\n" - .string "the games?\p" - .string "But you don’t have a COIN CASE for\n" - .string "stowing the COINS.$" - -MauvilleCity_GameCorner_Text_2104DF: @ 82104DF - .string "Were you looking for COINS?\p" - .string "It’s Â¥1000 for 50 COINS.\n" - .string "Would you like some?$" - -MauvilleCity_GameCorner_Text_210529: @ 8210529 - .string "Thank you very much!\n" - .string "Here are your COINS!$" - -MauvilleCity_GameCorner_Text_210553: @ 8210553 - .string "Um… You don’t appear to have\n" - .string "enough money…$" - -MauvilleCity_GameCorner_Text_21057E: @ 821057E - .string "Oh?\n" - .string "Your COIN CASE is full.$" - -MauvilleCity_GameCorner_Text_21059A: @ 821059A - .string "Oh… You don’t need COINS, then?\n" - .string "Good luck on your adventure!$" - -MauvilleCity_GameCorner_Text_2105D7: @ 82105D7 - .string "Welcome.\p" - .string "You can exchange your COINS for\n" - .string "prizes here.$" - -MauvilleCity_GameCorner_Text_21060D: @ 821060D - .string "Which prize would you like?$" - -MauvilleCity_GameCorner_Text_210629: @ 8210629 - .string "So your choice is\n" - .string "the {STR_VAR_1} {STR_VAR_2}?$" - -MauvilleCity_GameCorner_Text_210646: @ 8210646 - .string "Thank you!\n" - .string "We’ll send it to your PC at home.$" - -MauvilleCity_GameCorner_Text_210673: @ 8210673 - .string "You don’t have enough COINS.$" - -MauvilleCity_GameCorner_Text_210690: @ 8210690 - .string "There isn’t any room available for\n" - .string "placing {STR_VAR_1}.$" - -MauvilleCity_GameCorner_Text_2106BF: @ 82106BF - .string "Oh, is that so? \n" - .string "You need to save some COINS before\l" - .string "coming back here.$" - -MauvilleCity_GameCorner_Text_210705: @ 8210705 - .string "So your choice is {STR_VAR_1}?$" - -MauvilleCity_GameCorner_Text_21071B: @ 821071B - .string "Here you go!$" - -MauvilleCity_GameCorner_Text_210728: @ 8210728 - .string "Oh, you can’t carry any more than that.$" - -MauvilleCity_GameCorner_Text_210750: @ 8210750 - .string "I made a mistake and got two of\n" - .string "the same DOLLS.\p" - .string "Would you like one of them?$" - -MauvilleCity_GameCorner_Text_21079C: @ 821079C - .string "Here you go!$" - -MauvilleCity_GameCorner_Text_2107A9: @ 82107A9 - .string "Huh?\n" - .string "You want it, but not right now?$" - -MauvilleCity_GameCorner_Text_2107CE: @ 82107CE - .string "Oh, don’t be so negative!\n" - .string "You can have this!$" - -MauvilleCity_GameCorner_Text_2107FB: @ 82107FB - .string "There’s a prize I want, but I can’t win\n" - .string "the jackpot.$" - -MauvilleCity_GameCorner_Text_210830: @ 8210830 - .string "Hey, kid, if you want to play here,\n" - .string "you need a COIN CASE.\p" - .string "I think the young lady next door\n" - .string "had one. Go see her!$" - -MauvilleCity_GameCorner_Text_2108A0: @ 82108A0 - .string "My luck can only last so long.\n" - .string "This is too much for me.\l" - .string "Here, take some COINS!$" - -MauvilleCity_GameCorner_Text_2108EF: @ 82108EF - .string "MAUVILLE has something for\n" - .string "everyone.\p" - .string "For me, it’s the GAME CORNER.$" - -MauvilleCity_GameCorner_Text_210932: @ 8210932 - .string "The ROULETTE tables have different\n" - .string "rates.\p" - .string "Check your COINS if you’re going to\n" - .string "pick a table.$" - -MauvilleCity_GameCorner_Text_21098E: @ 821098E - .string "It’s easy to lose track of time in here. \n" - .string "I should get back to work.$" - -MauvilleCity_GameCorner_Text_2109D3: @ 82109D3 - .string "COINS are needed to play here\n" - .string "in the GAME CORNER.$" - -MauvilleCity_GameCorner_Text_210A05: @ 8210A05 - .string "This ROULETTE thing…\n" - .string "It’s rather demanding.\p" - .string "Win or lose, it’s only by luck.$" - -MauvilleCity_GameCorner_Text_210A51: @ 8210A51 - .string "Up to three COINS can be used to play\n" - .string "the SLOTS.$" - -MauvilleCity_GameCorner_Text_210A82: @ 8210A82 - .string "It’s very difficult to make it stop\n" - .string "right on “7.â€\p" - .string "If it stops on “7†during the REEL TIME\n" - .string "bonus game, you’ll receive extra COINS.$" - -MauvilleCity_GameCorner_Text_210B04: @ 8210B04 - .string "Here’s some information for you\n" - .string "about the SLOTS.\p" - .string "The more lightning bolts you stock,\n" - .string "the more REEL TIME chances you get.\p" - .string "In a game with the maximum five\n" - .string "REEL TIME chances…\p" - .string "It is possible to receive four regular\n" - .string "bonuses, then a big bonus.\p" - .string "That would total 660 COINS, but it’s\n" - .string "very difficult to get.$" - -MauvilleCity_GameCorner_Text_210C2E: @ 8210C2E - .string "You can’t play if you don’t have\n" - .string "a COIN CASE.$" - diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc deleted file mode 100644 index 049833db0..000000000 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ /dev/null @@ -1,442 +0,0 @@ -MauvilleCity_Gym_MapScripts:: @ 820DD6E - map_script 1, MauvilleCity_Gym_MapScript1_20DD74 - .byte 0 - -MauvilleCity_Gym_MapScript1_20DD74: @ 820DD74 - checkflag FLAG_0x4F2 - goto_eq MauvilleCity_Gym_EventScript_20DEE7 - switch VAR_0x4093 - case 0, MauvilleCity_Gym_EventScript_20DDBA - case 1, MauvilleCity_Gym_EventScript_20DEAF - case 2, MauvilleCity_Gym_EventScript_20DEBD - case 3, MauvilleCity_Gym_EventScript_20DECB - case 4, MauvilleCity_Gym_EventScript_20DED9 - end - -MauvilleCity_Gym_EventScript_20DDBA:: @ 820DDBA - checkflag FLAG_0x063 - goto_eq MauvilleCity_Gym_EventScript_20DDC4 - end - -MauvilleCity_Gym_EventScript_20DDC4:: @ 820DDC4 - setmetatile 3, 11, 577, 1 - setmetatile 3, 12, 585, 1 - setmetatile 3, 13, 592, 1 - setmetatile 4, 10, 546, 0 - setmetatile 5, 10, 547, 0 - setmetatile 4, 11, 554, 1 - setmetatile 5, 11, 555, 1 - setmetatile 7, 10, 546, 0 - setmetatile 8, 10, 547, 0 - setmetatile 7, 11, 554, 1 - setmetatile 8, 11, 555, 1 - setmetatile 4, 13, 560, 0 - setmetatile 5, 13, 561, 0 - setmetatile 4, 14, 568, 0 - setmetatile 5, 14, 569, 0 - setmetatile 1, 10, 560, 0 - setmetatile 2, 10, 561, 0 - setmetatile 1, 11, 568, 0 - setmetatile 2, 11, 569, 0 - setmetatile 6, 8, 578, 1 - setmetatile 6, 9, 538, 0 - setmetatile 6, 10, 593, 0 - setmetatile 4, 6, 560, 0 - setmetatile 5, 6, 561, 0 - setmetatile 4, 7, 568, 0 - setmetatile 5, 7, 569, 0 - end - -MauvilleCity_Gym_EventScript_20DEAF:: @ 820DEAF - setvar VAR_0x8004, 0 - special MauvilleGymSpecial1 - goto MauvilleCity_Gym_EventScript_20DDBA - end - -MauvilleCity_Gym_EventScript_20DEBD:: @ 820DEBD - setvar VAR_0x8004, 1 - special MauvilleGymSpecial1 - goto MauvilleCity_Gym_EventScript_20DDBA - end - -MauvilleCity_Gym_EventScript_20DECB:: @ 820DECB - setvar VAR_0x8004, 2 - special MauvilleGymSpecial1 - goto MauvilleCity_Gym_EventScript_20DDBA - end - -MauvilleCity_Gym_EventScript_20DED9:: @ 820DED9 - setvar VAR_0x8004, 3 - special MauvilleGymSpecial1 - goto MauvilleCity_Gym_EventScript_20DDBA - end - -MauvilleCity_Gym_EventScript_20DEE7:: @ 820DEE7 - special MauvilleGymSpecial3 - end - -MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB - trainerbattle 1, TRAINER_WATTSON_1, 0, MauvilleCity_Gym_Text_20E602, MauvilleCity_Gym_Text_20E734, MauvilleCity_Gym_EventScript_20DF2B - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq MauvilleCity_Gym_EventScript_20DFDE - checkflag FLAG_0x0A7 - goto_if 0, MauvilleCity_Gym_EventScript_20DF8D - compare VAR_0x40BA, 2 - goto_eq MauvilleCity_Gym_EventScript_20DFD4 - msgbox MauvilleCity_Gym_Text_20E8E3, 4 - release - end - -MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B - message MauvilleCity_Gym_Text_20E77F - waitmessage - call MauvilleCity_Gym_EventScript_27207E - msgbox MauvilleCity_Gym_Text_20E7AA, 4 - setvar VAR_0x40D2, 3 - clearflag FLAG_0x2FE - setflag FLAG_0x4F2 - setflag FLAG_BADGE03_GET - addvar VAR_0x4085, 1 - compare VAR_0x4085, 6 - call_if 1, MauvilleCity_Gym_EventScript_271E84 - setvar VAR_0x8008, 3 - call MauvilleCity_Gym_EventScript_271F43 - special MauvilleGymSpecial3 - special DrawWholeMapView - playse SE_KI_GASYAN - call MauvilleCity_Gym_EventScript_20DFB1 - closemessage - delay 30 - playfanfare MUS_ME_TORE_EYE - msgbox MauvilleCity_Gym_Text_20E8B5, 4 - waitfanfare - closemessage - delay 30 - setflag FLAG_0x1D5 - release - end - -MauvilleCity_Gym_EventScript_20DF8D:: @ 820DF8D - giveitem_std ITEM_TM34 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_Gym_EventScript_272054 - msgbox MauvilleCity_Gym_Text_20E844, 4 - setflag FLAG_0x0A7 - release - end - -MauvilleCity_Gym_EventScript_20DFB1:: @ 820DFB1 - giveitem_std ITEM_TM34 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_Gym_EventScript_27205E - msgbox MauvilleCity_Gym_Text_20E844, 4 - setflag FLAG_0x0A7 - return - -MauvilleCity_Gym_EventScript_20DFD4:: @ 820DFD4 - msgbox MauvilleCity_Gym_Text_20E925, 4 - release - end - -MauvilleCity_Gym_EventScript_20DFDE:: @ 820DFDE - trainerbattle 7, TRAINER_WATTSON_1, 0, MauvilleCity_Gym_Text_20E9A7, MauvilleCity_Gym_Text_20EA42, MauvilleCity_Gym_Text_20EAFD - msgbox MauvilleCity_Gym_Text_20EA5E, 6 - end - -MauvilleCity_Gym_EventScript_20DFF9:: @ 820DFF9 - lockall - checkflag FLAG_0x4F2 - goto_eq MauvilleCity_Gym_EventScript_20E0AD - compare VAR_0x4093, 1 - goto_eq MauvilleCity_Gym_EventScript_20E0AD - setvar VAR_0x4093, 1 - setvar VAR_0x8004, 0 - goto MauvilleCity_Gym_EventScript_20E08D - end - -MauvilleCity_Gym_EventScript_20E01E:: @ 820E01E - lockall - checkflag FLAG_0x4F2 - goto_eq MauvilleCity_Gym_EventScript_20E0AD - compare VAR_0x4093, 2 - goto_eq MauvilleCity_Gym_EventScript_20E0AD - setvar VAR_0x4093, 2 - setvar VAR_0x8004, 1 - goto MauvilleCity_Gym_EventScript_20E08D - end - -MauvilleCity_Gym_EventScript_20E043:: @ 820E043 - lockall - checkflag FLAG_0x4F2 - goto_eq MauvilleCity_Gym_EventScript_20E0AD - compare VAR_0x4093, 3 - goto_eq MauvilleCity_Gym_EventScript_20E0AD - setvar VAR_0x4093, 3 - setvar VAR_0x8004, 2 - goto MauvilleCity_Gym_EventScript_20E08D - end - -MauvilleCity_Gym_EventScript_20E068:: @ 820E068 - lockall - checkflag FLAG_0x4F2 - goto_eq MauvilleCity_Gym_EventScript_20E0AD - compare VAR_0x4093, 4 - goto_eq MauvilleCity_Gym_EventScript_20E0AD - setvar VAR_0x4093, 4 - setvar VAR_0x8004, 3 - goto MauvilleCity_Gym_EventScript_20E08D - end - -MauvilleCity_Gym_EventScript_20E08D:: @ 820E08D - special MauvilleGymSpecial2 - special MauvilleGymSpecial1 - special DrawWholeMapView - playse SE_KI_GASYAN - checkflag FLAG_0x063 - goto_eq MauvilleCity_Gym_EventScript_20E0B4 - checkflag FLAG_0x063 - goto_if 0, MauvilleCity_Gym_EventScript_20E0AF - releaseall - end - -MauvilleCity_Gym_EventScript_20E0AD:: @ 820E0AD - releaseall - end - -MauvilleCity_Gym_EventScript_20E0AF:: @ 820E0AF - setflag FLAG_0x063 - releaseall - end - -MauvilleCity_Gym_EventScript_20E0B4:: @ 820E0B4 - clearflag FLAG_0x063 - releaseall - end - -MauvilleCity_Gym_EventScript_20E0B9:: @ 820E0B9 - trainerbattle 0, TRAINER_KIRK, 0, MauvilleCity_Gym_Text_20E2BC, MauvilleCity_Gym_Text_20E2FC - msgbox MauvilleCity_Gym_Text_20E336, 6 - end - -MauvilleCity_Gym_EventScript_20E0D0:: @ 820E0D0 - trainerbattle 0, TRAINER_SHAWN, 0, MauvilleCity_Gym_Text_20E369, MauvilleCity_Gym_Text_20E3A7 - msgbox MauvilleCity_Gym_Text_20E3C1, 6 - end - -MauvilleCity_Gym_EventScript_20E0E7:: @ 820E0E7 - trainerbattle 0, TRAINER_BEN, 0, MauvilleCity_Gym_Text_20E443, MauvilleCity_Gym_Text_20E469 - msgbox MauvilleCity_Gym_Text_20E47E, 6 - end - -MauvilleCity_Gym_EventScript_20E0FE:: @ 820E0FE - trainerbattle 0, TRAINER_VIVIAN, 0, MauvilleCity_Gym_Text_20E4BB, MauvilleCity_Gym_Text_20E4F4 - msgbox MauvilleCity_Gym_Text_20E50F, 6 - end - -MauvilleCity_Gym_EventScript_20E115:: @ 820E115 - trainerbattle 0, TRAINER_ANGELO, 0, MauvilleCity_Gym_Text_20E593, MauvilleCity_Gym_Text_20E5A8 - msgbox MauvilleCity_Gym_Text_20E5C2, 6 - end - -MauvilleCity_Gym_EventScript_20E12C:: @ 820E12C - lock - faceplayer - checkflag FLAG_0x4F2 - goto_eq MauvilleCity_Gym_EventScript_20E141 - msgbox MauvilleCity_Gym_Text_20E17F, 4 - release - end - -MauvilleCity_Gym_EventScript_20E141:: @ 820E141 - msgbox MauvilleCity_Gym_Text_20E283, 4 - release - end - -MauvilleCity_Gym_EventScript_20E14B:: @ 820E14B - lockall - checkflag FLAG_BADGE03_GET - goto_eq MauvilleCity_Gym_EventScript_20E16B - goto MauvilleCity_Gym_EventScript_20E175 - end - -MauvilleCity_Gym_EventScript_20E15B:: @ 820E15B - lockall - checkflag FLAG_BADGE03_GET - goto_eq MauvilleCity_Gym_EventScript_20E16B - goto MauvilleCity_Gym_EventScript_20E175 - end - -MauvilleCity_Gym_EventScript_20E16B:: @ 820E16B - msgbox MauvilleCity_Gym_Text_20E96C, 4 - releaseall - end - -MauvilleCity_Gym_EventScript_20E175:: @ 820E175 - msgbox MauvilleCity_Gym_Text_20E952, 4 - releaseall - end - -MauvilleCity_Gym_Text_20E17F: @ 820E17F - .string "Hey, how’s it going, CHAMPION-\n" - .string "bound {PLAYER}?\p" - .string "WATTSON, the LEADER of MAUVILLE\n" - .string "GYM, uses ELECTRIC-type POKéMON.\p" - .string "If you challenge him with WATER-type\n" - .string "POKéMON, he’ll zap them! Bzzt!\p" - .string "And, he’s put in switch-controlled\n" - .string "doors all over his GYM! Eccentric!\p" - .string "Hey, go for it!$" - -MauvilleCity_Gym_Text_20E283: @ 820E283 - .string "Whoa, you’re electrifying!\n" - .string "You’ve powered the door open!$" - -MauvilleCity_Gym_Text_20E2BC: @ 820E2BC - .string "My electric soul, it’ll shatter your\n" - .string "dreams whole, whoa-yeahah!$" - -MauvilleCity_Gym_Text_20E2FC: @ 820E2FC - .string "That was plugged in, amped up,\n" - .string "over-driven electric, man!$" - -MauvilleCity_Gym_Text_20E336: @ 820E336 - .string "POKéMON and rock, it’s all about heart,\n" - .string "whoa-yeah!$" - -MauvilleCity_Gym_Text_20E369: @ 820E369 - .string "I trained under WATTSON!\n" - .string "There ain’t no way I’ll lose easily!$" - -MauvilleCity_Gym_Text_20E3A7: @ 820E3A7 - .string "Unplugged and turned off…$" - -MauvilleCity_Gym_Text_20E3C1: @ 820E3C1 - .string "WATTSON, our GYM LEADER, has been\n" - .string "around for a long, long time.\p" - .string "He was battling even before your\n" - .string "daddy was born, that tough coot.$" - -MauvilleCity_Gym_Text_20E443: @ 820E443 - .string "This GYM’s got puzzles!\n" - .string "Isn’t it fun?$" - -MauvilleCity_Gym_Text_20E469: @ 820E469 - .string "It’s no fun to lose…$" - -MauvilleCity_Gym_Text_20E47E: @ 820E47E - .string "WATTSON says he likes setting up\n" - .string "little traps with switches.$" - -MauvilleCity_Gym_Text_20E4BB: @ 820E4BB - .string "With my charm and my POKéMON’s moves,\n" - .string "you’ll be shocked!$" - -MauvilleCity_Gym_Text_20E4F4: @ 820E4F4 - .string "I’m shocked by your power!$" - -MauvilleCity_Gym_Text_20E50F: @ 820E50F - .string "I’ve heard that MAUVILLE was founded\n" - .string "by WATTSON.\p" - .string "He was a TRAINER long before we\n" - .string "became TRAINERS.\l" - .string "He must know all sorts of things!$" - -MauvilleCity_Gym_Text_20E593: @ 820E593 - .string "I love shiny things!$" - -MauvilleCity_Gym_Text_20E5A8: @ 820E5A8 - .string "Oh…\n" - .string "My eyes are frazzled…$" - -MauvilleCity_Gym_Text_20E5C2: @ 820E5C2 - .string "MAUVILLE GYM’s WATTSON has a shiny\n" - .string "forehead. It makes me happy!$" - -MauvilleCity_Gym_Text_20E602: @ 820E602 - .string "I’ve given up on my plans to convert\n" - .string "the city, I have.\p" - .string "And so, I put my time into making\n" - .string "door traps in my GYM.\p" - .string "Oh? Now, what are you doing here?\p" - .string "What’s that? You say you’ve gotten\n" - .string "past all my rigged doors?\p" - .string "Wahahahah!\n" - .string "Now, that is amusing!\p" - .string "Then, I, WATTSON, the LEADER of\n" - .string "MAUVILLE GYM, shall electrify you!$" - -MauvilleCity_Gym_Text_20E734: @ 820E734 - .string "Wahahahah!\n" - .string "Fine, I lost!\p" - .string "You ended up giving me a thrill!\n" - .string "Take this BADGE!$" - -MauvilleCity_Gym_Text_20E77F: @ 820E77F - .string "{PLAYER} received the DYNAMO BADGE\n" - .string "from WATTSON.$" - -MauvilleCity_Gym_Text_20E7AA: @ 820E7AA - .string "With the DYNAMO BADGE, POKéMON can\n" - .string "use ROCK SMASH out of battle.\p" - .string "And, it will make your POKéMON a little\n" - .string "bit faster, too.\p" - .string "Hmm…\n" - .string "You should take this, too!$" - -MauvilleCity_Gym_Text_20E844: @ 820E844 - .string "That TM34 there contains SHOCK WAVE.\p" - .string "It’s a trustworthy move that never\n" - .string "misses! You can count on it!\p" - .string "… … … … … …$" - -MauvilleCity_Gym_Text_20E8B5: @ 820E8B5 - .string "Registered GYM LEADER WATTSON\n" - .string "in the POKéNAV.$" - -MauvilleCity_Gym_Text_20E8E3: @ 820E8E3 - .string "I swell with optimism, seeing a promising\n" - .string "young TRAINER like you!$" - -MauvilleCity_Gym_Text_20E925: @ 820E925 - .string "Wahahahah!\n" - .string "Go forth and endeavor, youngster!$" - -MauvilleCity_Gym_Text_20E952: @ 820E952 - .string "MAUVILLE CITY POKéMON GYM$" - -MauvilleCity_Gym_Text_20E96C: @ 820E96C - .string "MAUVILLE CITY POKéMON GYM\p" - .string "WATTSON’S CERTIFIED TRAINERS:\n" - .string "{PLAYER}$" - -MauvilleCity_Gym_Text_20E9A7: @ 820E9A7 - .string "WATTSON: Ah-ha! Here at last!\n" - .string "I know what you want.\l" - .string "You want to battle my POKéMON!\p" - .string "Wahahahaha!\p" - .string "I’ll make sparks fly from you!\n" - .string "Don’t say I didn’t warn you!$" - -MauvilleCity_Gym_Text_20EA42: @ 820EA42 - .string "Oof…\n" - .string "Our batteries ran dry…$" - -MauvilleCity_Gym_Text_20EA5E: @ 820EA5E - .string "WATTSON: We’ll have to recharge our\n" - .string "batteries again.\p" - .string "When we’re fully charged up, we’ll\n" - .string "gladly accept your challenge.\p" - .string "So, come back again sometime,\n" - .string "won’t you?$" - -MauvilleCity_Gym_Text_20EAFD: @ 820EAFD - .string "WATTSON: Ah-ha! Here at last!\n" - .string "I know what you want.\l" - .string "You want to battle my POKéMON!\p" - .string "Wahahahaha!\p" - .string "Oops! Wait!\n" - .string "You’ve only one POKéMON with you!\p" - .string "Come see me with two or more\n" - .string "POKéMON, all right?$" - diff --git a/data/scripts/maps/MauvilleCity_House1.inc b/data/scripts/maps/MauvilleCity_House1.inc deleted file mode 100644 index b36e116db..000000000 --- a/data/scripts/maps/MauvilleCity_House1.inc +++ /dev/null @@ -1,47 +0,0 @@ -MauvilleCity_House1_MapScripts:: @ 820F975 - .byte 0 - -MauvilleCity_House1_EventScript_20F976:: @ 820F976 - lock - faceplayer - checkflag FLAG_0x06B - goto_eq MauvilleCity_House1_EventScript_20F9A5 - msgbox MauvilleCity_House1_Text_20F9AF, 4 - giveitem_std ITEM_HM06 - setflag FLAG_0x06B - setflag FLAG_0x34B - msgbox MauvilleCity_House1_Text_20FAA9, 4 - release - end - -MauvilleCity_House1_EventScript_20F9A5:: @ 820F9A5 - msgbox MauvilleCity_House1_Text_20FB67, 4 - release - end - -MauvilleCity_House1_Text_20F9AF: @ 820F9AF - .string "Woohoo!\p" - .string "I hear people call me the ROCK SMASH\n" - .string "GUY, but I find that sort of degrading.\p" - .string "I think I deserve a bit more respect,\n" - .string "like maybe the ROCK SMASH DUDE.\p" - .string "Woohoo!\p" - .string "Anyways, your POKéMON look pretty\n" - .string "strong.\p" - .string "I like that!\n" - .string "Here, take this HIDDEN MACHINE!$" - -MauvilleCity_House1_Text_20FAA9: @ 820FAA9 - .string "That HM contains ROCK SMASH.\p" - .string "If you come across large boulders\n" - .string "that block your path…\p" - .string "Well, use that HM move and smash\n" - .string "them right out of your way!\p" - .string "Yes, sir! Smash rocks aside, I say!\n" - .string "Woohoo!$" - -MauvilleCity_House1_Text_20FB67: @ 820FB67 - .string "Oh, yes, if you smash a rock, a POKéMON\n" - .string "could come flying out of hiding.\p" - .string "Woohoo!$" - diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc deleted file mode 100644 index 7a1a1cad1..000000000 --- a/data/scripts/maps/MauvilleCity_House2.inc +++ /dev/null @@ -1,69 +0,0 @@ -MauvilleCity_House2_MapScripts:: @ 8210C5C - .byte 0 - -MauvilleCity_House2_EventScript_210C5D:: @ 8210C5D - lock - faceplayer - checkflag FLAG_0x102 - goto_eq MauvilleCity_House2_EventScript_210CDA - msgbox MauvilleCity_House2_Text_210CEE, 4 - checkitem ITEM_HARBOR_MAIL, 1 - compare VAR_RESULT, 1 - goto_eq MauvilleCity_House2_EventScript_210C82 - release - end - -MauvilleCity_House2_EventScript_210C82:: @ 8210C82 - playse SE_PIN - applymovement VAR_LAST_TALKED, MauvilleCity_House2_Movement_272598 - waitmovement 0 - applymovement VAR_LAST_TALKED, MauvilleCity_House2_Movement_27259A - waitmovement 0 - msgbox MauvilleCity_House2_Text_210D76, 5 - compare VAR_RESULT, 1 - goto_eq MauvilleCity_House2_EventScript_210CB8 - compare VAR_RESULT, 0 - goto_eq MauvilleCity_House2_EventScript_210CE4 - end - -MauvilleCity_House2_EventScript_210CB8:: @ 8210CB8 - msgbox MauvilleCity_House2_Text_210DB3, 4 - takeitem ITEM_HARBOR_MAIL, 1 - giveitem_std ITEM_COIN_CASE - setflag FLAG_0x102 - goto MauvilleCity_House2_EventScript_210CDA - end - -MauvilleCity_House2_EventScript_210CDA:: @ 8210CDA - msgbox MauvilleCity_House2_Text_210DE7, 4 - release - end - -MauvilleCity_House2_EventScript_210CE4:: @ 8210CE4 - msgbox MauvilleCity_House2_Text_210E16, 4 - release - end - -MauvilleCity_House2_Text_210CEE: @ 8210CEE - .string "If I had a BIKE, it’d be easy to cycle to\n" - .string "SLATEPORT for some shopping.\p" - .string "I’d be able to buy HARBOR MAIL at the\n" - .string "POKéMON MART in SLATEPORT…$" - -MauvilleCity_House2_Text_210D76: @ 8210D76 - .string "Oh! You have HARBOR MAIL?\n" - .string "Will you trade it for a COIN CASE?$" - -MauvilleCity_House2_Text_210DB3: @ 8210DB3 - .string "Oh, I’m so happy!\n" - .string "Okay, I’ll trade you a COIN CASE!$" - -MauvilleCity_House2_Text_210DE7: @ 8210DE7 - .string "That COIN CASE can be used\n" - .string "at the GAME CORNER.$" - -MauvilleCity_House2_Text_210E16: @ 8210E16 - .string "Oh, that’s disappointing.\p" - .string "A COIN CASE is needed for the\n" - .string "GAME CORNER.$" - diff --git a/data/scripts/maps/MauvilleCity_Mart.inc b/data/scripts/maps/MauvilleCity_Mart.inc deleted file mode 100644 index 56ee9497f..000000000 --- a/data/scripts/maps/MauvilleCity_Mart.inc +++ /dev/null @@ -1,53 +0,0 @@ -MauvilleCity_Mart_MapScripts:: @ 82110E5 - .byte 0 - -MauvilleCity_Mart_EventScript_2110E6:: @ 82110E6 - lock - faceplayer - message gUnknown_08272A21 - waitmessage - pokemart MauvilleCity_Mart_Pokemart_211100 - msgbox gUnknown_08272A3F, 4 - release - end - - .align 2 -MauvilleCity_Mart_Pokemart_211100: @ 8211100 - .2byte ITEM_POKE_BALL - .2byte ITEM_GREAT_BALL - .2byte ITEM_SUPER_POTION - .2byte ITEM_ANTIDOTE - .2byte ITEM_PARALYZE_HEAL - .2byte ITEM_AWAKENING - .2byte ITEM_X_SPEED - .2byte ITEM_X_ATTACK - .2byte ITEM_X_DEFEND - .2byte ITEM_GUARD_SPEC - .2byte ITEM_DIRE_HIT - .2byte ITEM_X_ACCURACY - .2byte ITEM_NONE - release - end - -MauvilleCity_Mart_EventScript_21111C:: @ 821111C - msgbox MauvilleCity_Mart_Text_21112E, 2 - end - -MauvilleCity_Mart_EventScript_211125:: @ 8211125 - msgbox MauvilleCity_Mart_Text_2111D8, 2 - end - -MauvilleCity_Mart_Text_21112E: @ 821112E - .string "There are items that temporarily\n" - .string "elevate the stats of POKéMON.\p" - .string "The ones I know you use in battle\n" - .string "are X ATTACK and X DEFEND…\p" - .string "I do believe that there are others\n" - .string "like them.$" - -MauvilleCity_Mart_Text_2111D8: @ 82111D8 - .string "Use a certain move, or use an item\n" - .string "instead…\p" - .string "The TRAINER’s decisions determine how\n" - .string "battles turn out, I think.$" - diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc deleted file mode 100644 index fb76a5fc7..000000000 --- a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc +++ /dev/null @@ -1,54 +0,0 @@ -MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8210E5B - map_script 3, MauvilleCity_PokemonCenter_1F_MapScript1_210E66 - map_script 5, MauvilleCity_PokemonCenter_1F_MapScript1_277C30 - .byte 0 - -MauvilleCity_PokemonCenter_1F_MapScript1_210E66: @ 8210E66 - setrespawn 5 - call MauvilleCity_PokemonCenter_1F_EventScript_2718DE - goto MauvilleCity_PokemonCenter_1F_EventScript_210E74 - end - -MauvilleCity_PokemonCenter_1F_EventScript_210E74:: @ 8210E74 - special ScrSpecial_SetMauvilleOldManEventObjGfx - end - -MauvilleCity_PokemonCenter_1F_EventScript_210E78:: @ 8210E78 - setvar VAR_0x800B, 1 - call MauvilleCity_PokemonCenter_1F_EventScript_27191E - waitmessage - waitbuttonpress - release - end - -MauvilleCity_PokemonCenter_1F_EventScript_210E86:: @ 8210E86 - msgbox MauvilleCity_PokemonCenter_1F_Text_210EA1, 2 - end - -MauvilleCity_PokemonCenter_1F_EventScript_210E8F:: @ 8210E8F - msgbox MauvilleCity_PokemonCenter_1F_Text_210F06, 2 - end - -MauvilleCity_PokemonCenter_1F_EventScript_210E98:: @ 8210E98 - msgbox MauvilleCity_PokemonCenter_1F_Text_210F8A, 2 - end - -MauvilleCity_PokemonCenter_1F_Text_210EA1: @ 8210EA1 - .string "That man over there, he says weird\n" - .string "things!\p" - .string "He’s funny in a weird way.\n" - .string "I doubt I’ll forget about him!$" - -MauvilleCity_PokemonCenter_1F_Text_210F06: @ 8210F06 - .string "When I accessed the RECORD CORNER,\n" - .string "the data for what’s hot in DEWFORD\l" - .string "got updated.\p" - .string "Now that bit of data is the same\n" - .string "as my friend’s!$" - -MauvilleCity_PokemonCenter_1F_Text_210F8A: @ 8210F8A - .string "A RECORD CORNER opened upstairs in\n" - .string "the POKéMON CENTER.\p" - .string "I don’t know what it’s about, but it\n" - .string "sounds fun. I’ll go check it out!$" - diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc b/data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc deleted file mode 100644 index c430b4440..000000000 --- a/data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc +++ /dev/null @@ -1,31 +0,0 @@ -MauvilleCity_PokemonCenter_2F_MapScripts:: @ 8211008 - map_script 2, MauvilleCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, MauvilleCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, MauvilleCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, MauvilleCity_PokemonCenter_2F_MapScript1_276ACF - .byte 0 - -MauvilleCity_PokemonCenter_2F_EventScript_21101D:: @ 821101D - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 - end - -MauvilleCity_PokemonCenter_2F_EventScript_211023:: @ 8211023 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 - end - -MauvilleCity_PokemonCenter_2F_EventScript_211029:: @ 8211029 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB - end - -MauvilleCity_PokemonCenter_2F_EventScript_21102F:: @ 821102F - msgbox MauvilleCity_PokemonCenter_2F_Text_211038, 2 - end - -MauvilleCity_PokemonCenter_2F_Text_211038: @ 8211038 - .string "Did you know that you can link battle\n" - .string "at the COLOSSEUM here?\p" - .string "They put up your record on the wall\n" - .string "for everyone to see.\p" - .string "It’s embarrassing if you lose more\n" - .string "often than you win…$" - diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc deleted file mode 100644 index b786dc961..000000000 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ /dev/null @@ -1,312 +0,0 @@ -MeteorFalls_1F_1R_MapScripts:: @ 822BD2A - map_script 1, MeteorFalls_1F_1R_MapScript1_22BD30 - .byte 0 - -MeteorFalls_1F_1R_MapScript1_22BD30: @ 822BD30 - checkflag FLAG_SYS_GAME_CLEAR - call_if 1, MeteorFalls_1F_1R_EventScript_22BD3A - end - -MeteorFalls_1F_1R_EventScript_22BD3A:: @ 822BD3A - setmetatile 4, 1, 582, 1 - setmetatile 3, 2, 589, 1 - setmetatile 4, 2, 590, 0 - setmetatile 5, 2, 591, 1 - return - -MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F - lockall - playbgm MUS_MGM0, 0 - applymovement 255, MeteorFalls_1F_1R_Movement_2725B0 - waitmovement 0 - delay 30 - applymovement 5, MeteorFalls_1F_1R_Movement_2725B4 - waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22BF47, 4 - closemessage - applymovement 5, MeteorFalls_1F_1R_Movement_2725A6 - applymovement 6, MeteorFalls_1F_1R_Movement_2725A6 - waitmovement 0 - playse SE_PIN - applymovement 5, MeteorFalls_1F_1R_Movement_272598 - waitmovement 0 - applymovement 5, MeteorFalls_1F_1R_Movement_27259A - waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22BF84, 4 - closemessage - applymovement 5, MeteorFalls_1F_1R_Movement_22BEC0 - waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22BFE4, 4 - closemessage - applymovement 255, MeteorFalls_1F_1R_Movement_2725A4 - applymovement 5, MeteorFalls_1F_1R_Movement_2725A4 - applymovement 6, MeteorFalls_1F_1R_Movement_2725A4 - waitmovement 0 - addobject 7 - addobject 8 - addobject 9 - playbgm MUS_AQA_0, 0 - applymovement 7, MeteorFalls_1F_1R_Movement_22BED9 - applymovement 8, MeteorFalls_1F_1R_Movement_22BEE0 - applymovement 9, MeteorFalls_1F_1R_Movement_22BEE8 - waitmovement 0 - applymovement 5, MeteorFalls_1F_1R_Movement_2725A4 - applymovement 6, MeteorFalls_1F_1R_Movement_2725A4 - waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22C04E, 4 - closemessage - applymovement 255, MeteorFalls_1F_1R_Movement_22BF1D - applymovement 5, MeteorFalls_1F_1R_Movement_22BEC4 - applymovement 6, MeteorFalls_1F_1R_Movement_22BECE - waitmovement 0 - removeobject 5 - removeobject 6 - applymovement 7, MeteorFalls_1F_1R_Movement_22BEF8 - waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22C11C, 4 - closemessage - applymovement 8, MeteorFalls_1F_1R_Movement_22BF08 - applymovement 9, MeteorFalls_1F_1R_Movement_22BF18 - waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22C268, 4 - applymovement 7, MeteorFalls_1F_1R_Movement_2725AA - waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22C292, 4 - applymovement 7, MeteorFalls_1F_1R_Movement_2725A4 - waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22C2FC, 4 - closemessage - applymovement 7, MeteorFalls_1F_1R_Movement_22BEF0 - applymovement 8, MeteorFalls_1F_1R_Movement_22BEFE - applymovement 9, MeteorFalls_1F_1R_Movement_22BF0D - waitmovement 0 - fadedefaultbgm - removeobject 7 - removeobject 8 - removeobject 9 - setflag FLAG_0x333 - setflag FLAG_0x0CF - setflag FLAG_0x2FF - setvar VAR_0x40BF, 1 - releaseall - end - -MeteorFalls_1F_1R_Movement_22BEC0: @ 822BEC0 - walk_right - walk_right - walk_in_place_fastest_up - step_end - -MeteorFalls_1F_1R_Movement_22BEC4: @ 822BEC4 - 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 - 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 - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - step_end - -MeteorFalls_1F_1R_Movement_22BEE0: @ 822BEE0 - delay_16 - delay_16 - walk_right - walk_right - walk_right - walk_right - walk_right - step_end - -MeteorFalls_1F_1R_Movement_22BEE8: @ 822BEE8 - delay_16 - delay_16 - walk_right - walk_right - walk_right - walk_right - walk_right - step_end - -MeteorFalls_1F_1R_Movement_22BEF0: @ 822BEF0 - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - step_end - -MeteorFalls_1F_1R_Movement_22BEF8: @ 822BEF8 - walk_right - walk_right - walk_up - walk_up - walk_in_place_fastest_left - step_end - -MeteorFalls_1F_1R_Movement_22BEFE: @ 822BEFE - 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 - walk_right - walk_right - walk_right - walk_in_place_fastest_up - step_end - -MeteorFalls_1F_1R_Movement_22BF0D: @ 822BF0D - 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 - walk_right - walk_right - walk_right - walk_in_place_fastest_up - step_end - -MeteorFalls_1F_1R_Movement_22BF1D: @ 822BF1D - 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 - lock - faceplayer - checkflag FLAG_0x0F4 - goto_eq MeteorFalls_1F_1R_EventScript_22BF3D - setflag FLAG_0x0F4 - msgbox MeteorFalls_1F_1R_Text_22C342, 4 - release - end - -MeteorFalls_1F_1R_EventScript_22BF3D:: @ 822BF3D - msgbox MeteorFalls_1F_1R_Text_22C47D, 4 - release - end - -MeteorFalls_1F_1R_Text_22BF47: @ 822BF47 - .string "Hehehe!\p" - .string "With this METEORITE, that thing in\n" - .string "MT. CHIMNEY will…$" - -MeteorFalls_1F_1R_Text_22BF84: @ 822BF84 - .string "Heh?\p" - .string "I don’t know who you are, but if you get\n" - .string "in the way of TEAM MAGMA, don’t\l" - .string "expect any mercy!$" - -MeteorFalls_1F_1R_Text_22BFE4: @ 822BFE4 - .string "Hold it right there, TEAM MAGMA!\p" - .string "You’re badly mistaken if you think you\n" - .string "can have your way with the world!$" - -MeteorFalls_1F_1R_Text_22C04E: @ 822C04E - .string "Hehehe!\n" - .string "Even TEAM AQUA joins us!\p" - .string "But it’s too much trouble to deal with\n" - .string "you all…\p" - .string "Heh, it doesn’t matter!\p" - .string "We’ve got the METEORITE, so off to\n" - .string "MT. CHIMNEY we go!\p" - .string "Hehehe! Be seeing you, you TEAM\n" - .string "AQUA dingbats!$" - -MeteorFalls_1F_1R_Text_22C11C: @ 822C11C - .string "ARCHIE: Didn’t I see you before?\n" - .string "At SLATEPORT’s MUSEUM?\p" - .string "Ah, so your name is {PLAYER}.\p" - .string "At the time, I thought you were one\n" - .string "of TEAM MAGMA’s goons.\p" - .string "Humph…\n" - .string "You’re one odd kid.\p" - .string "TEAM MAGMA is a dangerous group of\n" - .string "total fanatics.\p" - .string "They engage in destruction, claiming\n" - .string "to expand the land mass.\p" - .string "They are the rivals to us,\n" - .string "the sea-loving TEAM AQUA!$" - -MeteorFalls_1F_1R_Text_22C268: @ 822C268 - .string "BOSS, we should give chase to\n" - .string "TEAM MAGMA…$" - -MeteorFalls_1F_1R_Text_22C292: @ 822C292 - .string "ARCHIE: Yes, yes, we must!\n" - .string "We’ve got to hurry.\p" - .string "There’s no telling what TEAM MAGMA\n" - .string "will do at MT. CHIMNEY!$" - -MeteorFalls_1F_1R_Text_22C2FC: @ 822C2FC - .string "ARCHIE: {PLAYER}, you should keep\n" - .string "an eye out for TEAM MAGMA, too.\p" - .string "Farewell!$" - -MeteorFalls_1F_1R_Text_22C342: @ 822C342 - .string "I… I’m COZMO…\n" - .string "I’m a PROFESSOR…\p" - .string "TEAM MAGMA asked me to guide them\n" - .string "to METEOR FALLS…\p" - .string "But they tricked me.\n" - .string "They even took my METEORITE away…\p" - .string "And then another similar bunch,\n" - .string "TEAM AQUA showed up.\p" - .string "After that…\n" - .string "I don’t understand any of it.\p" - .string "But that TEAM MAGMA…\p" - .string "What are they going to do with that\n" - .string "METEORITE at MT. CHIMNEY?$" - -MeteorFalls_1F_1R_Text_22C47D: @ 822C47D - .string "PROF. COZMO: But that TEAM MAGMA…\p" - .string "What are they going to do with that\n" - .string "METEORITE at MT. CHIMNEY?$" - diff --git a/data/scripts/maps/MeteorFalls_1F_2R.inc b/data/scripts/maps/MeteorFalls_1F_2R.inc deleted file mode 100644 index 4f4ab7c6b..000000000 --- a/data/scripts/maps/MeteorFalls_1F_2R.inc +++ /dev/null @@ -1,195 +0,0 @@ -MeteorFalls_1F_2R_MapScripts:: @ 822C4DD - .byte 0 - -MeteorFalls_1F_2R_EventScript_22C4DE:: @ 822C4DE - trainerbattle 2, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_22C608, MeteorFalls_1F_2R_Text_22C678, MeteorFalls_1F_2R_EventScript_22C50A - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq MeteorFalls_1F_2R_EventScript_22C529 - msgbox MeteorFalls_1F_2R_Text_22C6A3, 4 - release - end - -MeteorFalls_1F_2R_EventScript_22C50A:: @ 822C50A - special sub_80B4808 - waitmovement 0 - msgbox MeteorFalls_1F_2R_Text_22C6F6, 4 - setvar VAR_0x8004, 392 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 392 - callstd 8 - release - end - -MeteorFalls_1F_2R_EventScript_22C529:: @ 822C529 - trainerbattle 5, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_22C73F, MeteorFalls_1F_2R_Text_22C7AD - msgbox MeteorFalls_1F_2R_Text_22C7D8, 6 - end - -MeteorFalls_1F_2R_EventScript_22C540:: @ 822C540 - trainerbattle 6, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22C843, MeteorFalls_1F_2R_Text_22C89C, MeteorFalls_1F_2R_Text_22C92B, MeteorFalls_1F_2R_EventScript_22C570 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq MeteorFalls_1F_2R_EventScript_22C589 - msgbox MeteorFalls_1F_2R_Text_22C8C1, 4 - release - end - -MeteorFalls_1F_2R_EventScript_22C570:: @ 822C570 - msgbox MeteorFalls_1F_2R_Text_22C99C, 4 - setvar VAR_0x8004, 681 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 681 - callstd 8 - release - end - -MeteorFalls_1F_2R_EventScript_22C589:: @ 822C589 - trainerbattle 7, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22CB47, MeteorFalls_1F_2R_Text_22CBA0, MeteorFalls_1F_2R_Text_22CC27 - msgbox MeteorFalls_1F_2R_Text_22CBC5, 6 - end - -MeteorFalls_1F_2R_EventScript_22C5A4:: @ 822C5A4 - trainerbattle 6, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22C9E6, MeteorFalls_1F_2R_Text_22CA44, MeteorFalls_1F_2R_Text_22CACD, MeteorFalls_1F_2R_EventScript_22C5D4 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq MeteorFalls_1F_2R_EventScript_22C5ED - msgbox MeteorFalls_1F_2R_Text_22CA70, 4 - release - end - -MeteorFalls_1F_2R_EventScript_22C5D4:: @ 822C5D4 - msgbox MeteorFalls_1F_2R_Text_22C99C, 4 - setvar VAR_0x8004, 681 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 681 - callstd 8 - release - end - -MeteorFalls_1F_2R_EventScript_22C5ED:: @ 822C5ED - trainerbattle 7, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22CC98, MeteorFalls_1F_2R_Text_22CD08, MeteorFalls_1F_2R_Text_22CDAB - msgbox MeteorFalls_1F_2R_Text_22CD34, 6 - end - -MeteorFalls_1F_2R_Text_22C608: @ 822C608 - .string "This is where we DRAGON users do our\n" - .string "training.\p" - .string "The CHAMPION even visits.\n" - .string "Now do you see how special it is here?$" - -MeteorFalls_1F_2R_Text_22C678: @ 822C678 - .string "Urgh!\n" - .string "I didn’t expect you to be so strong!$" - -MeteorFalls_1F_2R_Text_22C6A3: @ 822C6A3 - .string "The road ahead remains long and harsh.\p" - .string "When will my POKéMON and I become\n" - .string "the best?$" - -MeteorFalls_1F_2R_Text_22C6F6: @ 822C6F6 - .string "I want to know more about your power.\n" - .string "Let me register you in my POKéNAV.$" - -MeteorFalls_1F_2R_Text_22C73F: @ 822C73F - .string "Since we met, we have trained hard\n" - .string "with our sights on number one.\p" - .string "Help us see how much stronger we’ve\n" - .string "become!$" - -MeteorFalls_1F_2R_Text_22C7AD: @ 822C7AD - .string "Urgh!\n" - .string "I didn’t expect you to be so strong!$" - -MeteorFalls_1F_2R_Text_22C7D8: @ 822C7D8 - .string "You’ve obviously kept up your\n" - .string "POKéMON training.\p" - .string "So long as you remain strong, I, too,\n" - .string "can become stronger!$" - -MeteorFalls_1F_2R_Text_22C843: @ 822C843 - .string "JOHN: We’ve always battled POKéMON\n" - .string "together as a twosome.\l" - .string "We’ve confidence in ourselves.$" - -MeteorFalls_1F_2R_Text_22C89C: @ 822C89C - .string "JOHN: Oh, my.\n" - .string "We’ve lost, dear wife.$" - -MeteorFalls_1F_2R_Text_22C8C1: @ 822C8C1 - .string "JOHN: We’ve been married for\n" - .string "fifty years.\p" - .string "Come to think of it, I’ve yet to beat\n" - .string "my dear wife in a battle.$" - -MeteorFalls_1F_2R_Text_22C92B: @ 822C92B - .string "JOHN: Well, well, what a young TRAINER!\p" - .string "Will you battle with us? If so, you’ll\n" - .string "have to return with more POKéMON.$" - -MeteorFalls_1F_2R_Text_22C99C: @ 822C99C - .string "JOHN: Young TRAINER, if the chance\n" - .string "arises, will you battle with us again?$" - -MeteorFalls_1F_2R_Text_22C9E6: @ 822C9E6 - .string "JAY: We’ve been married for\n" - .string "fifty years.\p" - .string "The bond we share as a couple could\n" - .string "never be broken.$" - -MeteorFalls_1F_2R_Text_22CA44: @ 822CA44 - .string "JAY: Oh, dear.\n" - .string "We’ve lost, my dear husband.$" - -MeteorFalls_1F_2R_Text_22CA70: @ 822CA70 - .string "JAY: Fifty years of marriage…\p" - .string "If we ever argued, we always settled\n" - .string "it with a POKéMON battle…$" - -MeteorFalls_1F_2R_Text_22CACD: @ 822CACD - .string "JAY: Well, well, aren’t you a young\n" - .string "TRAINER?\p" - .string "If you’d care to battle with us, you’ll\n" - .string "have to come back with more POKéMON.$" - -MeteorFalls_1F_2R_Text_22CB47: @ 822CB47 - .string "JOHN: We’ve always battled POKéMON\n" - .string "together as a twosome.\l" - .string "We’ve confidence in ourselves.$" - -MeteorFalls_1F_2R_Text_22CBA0: @ 822CBA0 - .string "JOHN: Oh, my.\n" - .string "We’ve lost, dear wife.$" - -MeteorFalls_1F_2R_Text_22CBC5: @ 822CBC5 - .string "JOHN: Married for fifty years…\p" - .string "On reflection, the dear wife and I,\n" - .string "we battled day in and day out…$" - -MeteorFalls_1F_2R_Text_22CC27: @ 822CC27 - .string "JOHN: Well, well, what a young TRAINER!\p" - .string "Will you battle with us? If so, you’ll\n" - .string "have to return with more POKéMON.$" - -MeteorFalls_1F_2R_Text_22CC98: @ 822CC98 - .string "JAY: We’ve been married for\n" - .string "fifty years.\p" - .string "We’ve supported each other all that\n" - .string "time. We’ve made ourselves strong.$" - -MeteorFalls_1F_2R_Text_22CD08: @ 822CD08 - .string "JAY: Oh, dear.\n" - .string "We’ve lost, my dear husband.$" - -MeteorFalls_1F_2R_Text_22CD34: @ 822CD34 - .string "JAY: Fifty years of marriage…\n" - .string "Many things have happened.\p" - .string "I hope that we will continue to make\n" - .string "happy memories together.$" - -MeteorFalls_1F_2R_Text_22CDAB: @ 822CDAB - .string "JAY: Well, well, aren’t you a young\n" - .string "TRAINER?\p" - .string "If you’d care to battle with us, you’ll\n" - .string "have to come back with more POKéMON.$" - diff --git a/data/scripts/maps/MeteorFalls_B1F_1R.inc b/data/scripts/maps/MeteorFalls_B1F_1R.inc deleted file mode 100644 index 551e68180..000000000 --- a/data/scripts/maps/MeteorFalls_B1F_1R.inc +++ /dev/null @@ -1,3 +0,0 @@ -MeteorFalls_B1F_1R_MapScripts:: @ 822CE25 - .byte 0 - diff --git a/data/scripts/maps/MeteorFalls_B1F_2R.inc b/data/scripts/maps/MeteorFalls_B1F_2R.inc deleted file mode 100644 index 775b5787c..000000000 --- a/data/scripts/maps/MeteorFalls_B1F_2R.inc +++ /dev/null @@ -1,3 +0,0 @@ -MeteorFalls_B1F_2R_MapScripts:: @ 822CE26 - .byte 0 - diff --git a/data/scripts/maps/MeteorFalls_StevensCave.inc b/data/scripts/maps/MeteorFalls_StevensCave.inc deleted file mode 100644 index 5226ddb4a..000000000 --- a/data/scripts/maps/MeteorFalls_StevensCave.inc +++ /dev/null @@ -1,58 +0,0 @@ -MeteorFalls_StevensCave_MapScripts:: @ 823B181 - .byte 0 - -MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182 - lock - checkflag FLAG_0x4F8 - goto_eq MeteorFalls_StevensCave_EventScript_23B1CD - waitse - playse SE_PIN - applymovement 1, MeteorFalls_StevensCave_Movement_272598 - waitmovement 0 - applymovement 1, MeteorFalls_StevensCave_Movement_27259A - waitmovement 0 - applymovement 1, MeteorFalls_StevensCave_Movement_27259E - waitmovement 0 - msgbox MeteorFalls_StevensCave_Text_23B1E1, 4 - trainerbattle 3, TRAINER_STEVEN, 0, MeteorFalls_StevensCave_Text_23B32D - msgbox MeteorFalls_StevensCave_Text_23B358, 4 - setflag FLAG_0x4F8 - release - end - -MeteorFalls_StevensCave_EventScript_23B1CD:: @ 823B1CD - applymovement 1, MeteorFalls_StevensCave_Movement_27259E - waitmovement 0 - msgbox MeteorFalls_StevensCave_Text_23B358, 4 - release - end - -MeteorFalls_StevensCave_Text_23B1E1: @ 823B1E1 - .string "STEVEN: Oh, wow, {PLAYER}{KUN}.\n" - .string "I’m amazed you knew where to find me.\p" - .string "Do you, uh…maybe think of me as\n" - .string "just a rock maniac?\p" - .string "No, that can’t be right.\p" - .string "We battled alongside each other at\n" - .string "the SOOTOPOLIS SPACE CENTER.\p" - .string "You should have a very good idea\n" - .string "about how good I am.\p" - .string "Okay, {PLAYER}{KUN}, if you’re going to mount\n" - .string "a serious challenge, expect the worst!$" - -MeteorFalls_StevensCave_Text_23B32D: @ 823B32D - .string "You…\n" - .string "I had no idea you’d become so strong…$" - -MeteorFalls_StevensCave_Text_23B358: @ 823B358 - .string "STEVEN: Come to think of it, ever since\n" - .string "our paths first crossed in GRANITE\l" - .string "CAVE in DEWFORD, I had this feeling.\p" - .string "I thought that you would eventually\n" - .string "become the CHAMPION.\p" - .string "My predictions usually come true.\p" - .string "And where will you go from here?\p" - .string "… … … … … …\n" - .string "… … … … … …\p" - .string "Fufufu, even I couldn’t tell you that.$" - diff --git a/data/scripts/maps/MirageTower_1F.inc b/data/scripts/maps/MirageTower_1F.inc deleted file mode 100644 index d7d9619b5..000000000 --- a/data/scripts/maps/MirageTower_1F.inc +++ /dev/null @@ -1,10 +0,0 @@ -MirageTower_1F_MapScripts:: @ 823AD01 - map_script 3, MirageTower_1F_MapScript1_23AD07 - .byte 0 - -MirageTower_1F_MapScript1_23AD07: @ 823AD07 - setflag FLAG_0x8DC - setflag FLAG_0x09D - setflag FLAG_LANDMARK_MIRAGE_TOWER - end - diff --git a/data/scripts/maps/MirageTower_2F.inc b/data/scripts/maps/MirageTower_2F.inc deleted file mode 100644 index 79f3cce2a..000000000 --- a/data/scripts/maps/MirageTower_2F.inc +++ /dev/null @@ -1,11 +0,0 @@ -MirageTower_2F_MapScripts:: @ 823AD11 - map_script 2, MirageTower_2F_MapScript2_2A8327 - map_script 3, MirageTower_2F_MapScript1_2A8331 - map_script 5, MirageTower_2F_MapScript1_23AD21 - .byte 0 - -MirageTower_2F_MapScript1_23AD21: @ 823AD21 - setstepcallback 7 - 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 deleted file mode 100644 index 1ec82de55..000000000 --- a/data/scripts/maps/MirageTower_3F.inc +++ /dev/null @@ -1,11 +0,0 @@ -MirageTower_3F_MapScripts:: @ 823AD2C - map_script 2, MirageTower_3F_MapScript2_2A8327 - map_script 3, MirageTower_3F_MapScript1_2A8331 - map_script 5, MirageTower_3F_MapScript1_23AD3C - .byte 0 - -MirageTower_3F_MapScript1_23AD3C: @ 823AD3C - setstepcallback 7 - 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 deleted file mode 100644 index 1e079c5d7..000000000 --- a/data/scripts/maps/MirageTower_4F.inc +++ /dev/null @@ -1,79 +0,0 @@ -MirageTower_4F_MapScripts:: @ 823AD47 - .byte 0 - -MirageTower_4F_EventScript_23AD48:: @ 823AD48 - lock - faceplayer - msgbox MirageTower_4F_Text_23ADF9, 5 - compare VAR_RESULT, 0 - goto_eq MirageTower_4F_EventScript_23AD7F - giveitem_std ITEM_ROOT_FOSSIL - closemessage - setflag FLAG_0x3C3 - setflag FLAG_0x3C4 - removeobject 1 - delay 30 - setflag FLAG_0x14F - goto MirageTower_4F_EventScript_23ADCA - end - -MirageTower_4F_EventScript_23AD7F:: @ 823AD7F - msgbox MirageTower_4F_Text_23AE79, 4 - release - end - -MirageTower_4F_EventScript_23AD89:: @ 823AD89 - lock - faceplayer - msgbox MirageTower_4F_Text_23AE98, 5 - compare VAR_RESULT, 0 - goto_eq MirageTower_4F_EventScript_23ADC0 - giveitem_std ITEM_CLAW_FOSSIL - closemessage - setflag FLAG_0x3C4 - setflag FLAG_0x3C3 - removeobject 2 - delay 30 - setflag FLAG_0x150 - goto MirageTower_4F_EventScript_23ADCA - end - -MirageTower_4F_EventScript_23ADC0:: @ 823ADC0 - msgbox MirageTower_4F_Text_23AF18, 4 - release - end - -MirageTower_4F_EventScript_23ADCA:: @ 823ADCA - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 32 - setvar VAR_0x8007, 2 - special sub_8139560 - waitstate - special sub_81BE994 - waitstate - setvar VAR_0x40CB, 1 - clearflag FLAG_LANDMARK_MIRAGE_TOWER - warp MAP_ROUTE111, 255, 19, 59 - waitstate - release - end - -MirageTower_4F_Text_23ADF9: @ 823ADF9 - .string "You found the ROOT FOSSIL.\p" - .string "If this FOSSIL is taken, the ground\n" - .string "around it will likely crumble away…\p" - .string "Take the ROOT FOSSIL anyway?$" - -MirageTower_4F_Text_23AE79: @ 823AE79 - .string "{PLAYER} left the ROOT FOSSIL alone.$" - -MirageTower_4F_Text_23AE98: @ 823AE98 - .string "You found the CLAW FOSSIL.\p" - .string "If this FOSSIL is taken, the ground\n" - .string "around it will likely crumble away…\p" - .string "Take the CLAW FOSSIL anyway?$" - -MirageTower_4F_Text_23AF18: @ 823AF18 - .string "{PLAYER} left the CLAW FOSSIL alone.$" - diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc deleted file mode 100644 index 8cce8efeb..000000000 --- a/data/scripts/maps/MossdeepCity.inc +++ /dev/null @@ -1,436 +0,0 @@ -MossdeepCity_MapScripts:: @ 81E4A96 - map_script 3, MossdeepCity_MapScript1_1E4A9C - .byte 0 - -MossdeepCity_MapScript1_1E4A9C: @ 81E4A9C - clearflag FLAG_0x064 - clearflag FLAG_0x065 - clearflag FLAG_0x066 - clearflag FLAG_0x067 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, MossdeepCity_EventScript_27207A - end - -MossdeepCity_EventScript_1E4AB2:: @ 81E4AB2 - lock - faceplayer - checkflag FLAG_0x07B - goto_eq MossdeepCity_EventScript_1E4AC7 - msgbox MossdeepCity_Text_1E4E90, 4 - release - end - -MossdeepCity_EventScript_1E4AC7:: @ 81E4AC7 - msgbox MossdeepCity_Text_1E4F15, 4 - release - end - -MossdeepCity_EventScript_1E4AD1:: @ 81E4AD1 - lock - faceplayer - checkflag FLAG_0x07B - goto_eq MossdeepCity_EventScript_1E4AE6 - msgbox MossdeepCity_Text_1E4F50, 4 - release - end - -MossdeepCity_EventScript_1E4AE6:: @ 81E4AE6 - msgbox MossdeepCity_Text_1E5051, 4 - release - end - -MossdeepCity_EventScript_1E4AF0:: @ 81E4AF0 - msgbox MossdeepCity_Text_1E4E22, 2 - end - -MossdeepCity_EventScript_1E4AF9:: @ 81E4AF9 - msgbox MossdeepCity_Text_1E5135, 2 - end - -MossdeepCity_EventScript_1E4B02:: @ 81E4B02 - msgbox MossdeepCity_Text_1E50D9, 2 - end - -MossdeepCity_EventScript_1E4B0B:: @ 81E4B0B - msgbox MossdeepCity_Text_1E529D, 2 - end - -MossdeepCity_EventScript_1E4B14:: @ 81E4B14 - msgbox MossdeepCity_Text_1E5396, 3 - end - -MossdeepCity_EventScript_1E4B1D:: @ 81E4B1D - msgbox MossdeepCity_Text_1E53A9, 3 - end - -MossdeepCity_EventScript_1E4B26:: @ 81E4B26 - msgbox MossdeepCity_Text_1E53F2, 3 - end - -MossdeepCity_EventScript_1E4B2F:: @ 81E4B2F - msgbox MossdeepCity_Text_1E541F, 3 - end - -MossdeepCity_EventScript_1E4B38:: @ 81E4B38 - setflag FLAG_VISITED_MOSSDEEP_CITY - setvar VAR_TEMP_1, 1 - end - -MossdeepCity_EventScript_1E4B41:: @ 81E4B41 - lockall - applymovement 14, MossdeepCity_Movement_1E4BAD - waitmovement 0 - applymovement 10, MossdeepCity_Movement_1E4BB7 - applymovement 11, MossdeepCity_Movement_1E4BB7 - applymovement 12, MossdeepCity_Movement_1E4BB7 - applymovement 13, MossdeepCity_Movement_1E4BB7 - waitmovement 0 - applymovement 14, MossdeepCity_Movement_1E4BBC - applymovement 10, MossdeepCity_Movement_1E4BCA - applymovement 11, MossdeepCity_Movement_1E4BDD - applymovement 12, MossdeepCity_Movement_1E4BEF - applymovement 13, MossdeepCity_Movement_1E4C00 - waitmovement 0 - removeobject 14 - removeobject 10 - removeobject 11 - removeobject 12 - removeobject 13 - delay 30 - setvar VAR_0x405D, 2 - setflag FLAG_0x337 - releaseall - end - -MossdeepCity_Movement_1E4BAD: @ 81E4BAD - delay_16 - face_right - delay_16 - delay_16 - delay_16 - delay_16 - face_left - delay_16 - delay_16 - step_end - -MossdeepCity_Movement_1E4BB7: @ 81E4BB7 - face_right - delay_16 - delay_16 - delay_16 - step_end - -MossdeepCity_Movement_1E4BBC: @ 81E4BBC - 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 - 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 - 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 - 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 - 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 - lock - faceplayer - msgbox MossdeepCity_Text_1E5213, 4 - applymovement VAR_LAST_TALKED, MossdeepCity_Movement_2725A2 - waitmovement 0 - release - end - -MossdeepCity_EventScript_1E4C26:: @ 81E4C26 - lock - faceplayer - checkflag FLAG_0x114 - goto_eq MossdeepCity_EventScript_1E4C68 - msgbox MossdeepCity_Text_1E4CED, 5 - compare VAR_RESULT, 0 - goto_eq MossdeepCity_EventScript_1E4C72 - msgbox MossdeepCity_Text_1E4D5B, 4 - giveitem_std ITEM_KINGS_ROCK - compare VAR_RESULT, 0 - goto_eq MossdeepCity_EventScript_272054 - setflag FLAG_0x114 - release - end - -MossdeepCity_EventScript_1E4C68:: @ 81E4C68 - msgbox MossdeepCity_Text_1E4DB3, 4 - release - end - -MossdeepCity_EventScript_1E4C72:: @ 81E4C72 - msgbox MossdeepCity_Text_1E4DD7, 4 - release - end - -MossdeepCity_EventScript_1E4C7C:: @ 81E4C7C - msgbox MossdeepCity_Text_1E5581, 2 - end - -MossdeepCity_EventScript_1E4C85:: @ 81E4C85 - lock - faceplayer - msgbox MossdeepCity_Text_1E5453, 4 - closemessage - compare VAR_FACING, 2 - call_if 1, MossdeepCity_EventScript_1E4CB0 - compare VAR_FACING, 4 - call_if 1, MossdeepCity_EventScript_1E4CC2 - addvar VAR_0x40D1, 1 - removeobject 16 - release - end - -MossdeepCity_EventScript_1E4CB0:: @ 81E4CB0 - applymovement 255, MossdeepCity_Movement_1E4CD4 - applymovement 16, MossdeepCity_Movement_1E4CD8 - waitmovement 0 - return - -MossdeepCity_EventScript_1E4CC2:: @ 81E4CC2 - applymovement 255, MossdeepCity_Movement_1E4CD4 - applymovement 16, MossdeepCity_Movement_1E4CE2 - waitmovement 0 - return - -MossdeepCity_Movement_1E4CD4: @ 81E4CD4 - delay_16 - delay_16 - walk_in_place_fastest_left - step_end - -MossdeepCity_Movement_1E4CD8: @ 81E4CD8 - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - step_end - -MossdeepCity_Movement_1E4CE2: @ 81E4CE2 - 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 - .string "I got this from STEVEN, but I don’t\n" - .string "know what it’s good for.\p" - .string "I think it’s called KING’S ROCK.\n" - .string "Do you want it?$" - -MossdeepCity_Text_1E4D5B: @ 81E4D5B - .string "Why would you want it?\n" - .string "You’re weird.\p" - .string "You can keep it, but keep it a secret\n" - .string "from STEVEN.$" - -MossdeepCity_Text_1E4DB3: @ 81E4DB3 - .string "STEVEN’s house is right over there!$" - -MossdeepCity_Text_1E4DD7: @ 81E4DD7 - .string "Yeah, you think so, too! What are you\n" - .string "supposed to do with some weird rock?$" - -MossdeepCity_Text_1E4E22: @ 81E4E22 - .string "Around MOSSDEEP, you can see wild\n" - .string "WAILMER.\p" - .string "It’s called, uh…\n" - .string "What was it now…\p" - .string "WAI, WAI, WAI…\p" - .string "WAILMER watching!$" - -MossdeepCity_Text_1E4E90: @ 81E4E90 - .string "The island’s SPACE CENTER has been\n" - .string "launching huge rockets.\p" - .string "There’s been some kind of an uproar\n" - .string "over a letter they received recently.$" - -MossdeepCity_Text_1E4F15: @ 81E4F15 - .string "The island’s SPACE CENTER has been\n" - .string "launching huge rockets.$" - -MossdeepCity_Text_1E4F50: @ 81E4F50 - .string "I heard from a SAILOR buddy that\n" - .string "TEAM AQUA set up shop in LILYCOVE.\p" - .string "I also heard that someone came along\n" - .string "and wiped the floor with them!\p" - .string "But MOSSDEEP here’s been targeted\n" - .string "by that TEAM MAGMA.\p" - .string "If you want to know what they’re up to,\n" - .string "go visit the SPACE CENTER.$" - -MossdeepCity_Text_1E5051: @ 81E5051 - .string "I’m a SAILOR, so the sea’s obviously\n" - .string "more important to me.\p" - .string "But you know? When I get back on land\n" - .string "after a long voyage, I do feel relief!$" - -MossdeepCity_Text_1E50D9: @ 81E50D9 - .string "Wouldn’t it be nice?\p" - .string "If the whole world was covered in\n" - .string "plants and flowers like this island?$" - -MossdeepCity_Text_1E5135: @ 81E5135 - .string "All life needs the sea to live, even\n" - .string "though it makes its home on the land.\p" - .string "Life, having run its course, becomes\n" - .string "soil and returns to the land.\p" - .string "And the sea is always connected to\n" - .string "the land.\p" - .string "Yes, like the very shoreline here.$" - -MossdeepCity_Text_1E5213: @ 81E5213 - .string "A voyage on a ship is fine.\p" - .string "But crossing the sea with POKéMON\n" - .string "using SURF…\p" - .string "Now that’s an exhilarating trip!\n" - .string "Wouldn’t you agree, youngster?$" - -MossdeepCity_Text_1E529D: @ 81E529D - .string "This rock has a special meaning to\n" - .string "the people at the SPACE CENTER.\p" - .string "They put it here as their wish for\n" - .string "their rockets to fly safely.\p" - .string "When you make a wish, what do you use?\n" - .string "Do you wish upon a star?\p" - .string "I use a wish tag to make it happen.\n" - .string "That’s what I do.$" - -MossdeepCity_Text_1E5396: @ 81E5396 - .string "It’s a white rock.$" - -MossdeepCity_Text_1E53A9: @ 81E53A9 - .string "MOSSDEEP CITY POKéMON GYM\n" - .string "LEADERS: LIZA & TATE\p" - .string "“The mystic combination!â€$" - -MossdeepCity_Text_1E53F2: @ 81E53F2 - .string "MOSSDEEP CITY\n" - .string "“Our slogan: Cherish POKéMON!â€$" - -MossdeepCity_Text_1E541F: @ 81E541F - .string "MOSSDEEP SPACE CENTER\n" - .string "“The closest place to space.â€$" - -MossdeepCity_Text_1E5453: @ 81E5453 - .string "SCOTT: {PLAYER}{KUN}, feeling good?\n" - .string "I’m doing great!\p" - .string "I’d heard MOSSDEEP’s GYM LEADER is\n" - .string "pretty strong, so I decided to come\l" - .string "take a look-see for myself.\p" - .string "But there’s something wrong about\n" - .string "this town.\p" - .string "People are going on about a warning\n" - .string "letter and the SPACE CENTER…\p" - .string "I don’t think it concerns me in any\n" - .string "way, though.$" - -MossdeepCity_Text_1E5581: @ 81E5581 - .string "Ahh… It feels great letting the waves\n" - .string "wash over my feet…\p" - .string "Speaking of the waves, you know that\n" - .string "island city SOOTOPOLIS?\p" - .string "I think the GYM there had a new\n" - .string "LEADER come in.\p" - .string "People tell me the new LEADER once\n" - .string "mentored WALLACE.$" - diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc deleted file mode 100644 index ff5c14206..000000000 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ /dev/null @@ -1,80 +0,0 @@ -MossdeepCity_GameCorner_1F_MapScripts:: @ 8224B27 - map_script 2, MossdeepCity_GameCorner_1F_MapScript2_224B41 - map_script 4, MossdeepCity_GameCorner_1F_MapScript2_224B37 - map_script 1, MossdeepCity_GameCorner_1F_MapScript1_276BBE - .byte 0 - -MossdeepCity_GameCorner_1F_MapScript2_224B37: @ 8224B37 - map_script_2 VAR_0x4087, 8, MossdeepCity_GameCorner_1F_EventScript_276BAE - .2byte 0 - -MossdeepCity_GameCorner_1F_MapScript2_224B41: @ 8224B41 - map_script_2 VAR_0x4087, 8, MossdeepCity_GameCorner_1F_EventScript_276C9D - .2byte 0 - -MossdeepCity_GameCorner_1F_EventScript_224B4B:: @ 8224B4B - lock - faceplayer - goto MossdeepCity_GameCorner_1F_EventScript_277C34 - release - end - -MossdeepCity_GameCorner_1F_EventScript_224B54:: @ 8224B54 - lock - faceplayer - goto MossdeepCity_GameCorner_1F_EventScript_277C91 - release - end - -MossdeepCity_GameCorner_1F_EventScript_224B5D:: @ 8224B5D - msgbox MossdeepCity_GameCorner_1F_Text_224BFD, 3 - end - -MossdeepCity_GameCorner_1F_Text_224B66: @ 8224B66 - .string "When I was young, I traveled the world\n" - .string "as a POKéMON TRAINER.\p" - .string "Now that I’ve become an old buzzard,\n" - .string "my only amusement is watching young\l" - .string "TRAINERS battle.$" - -MossdeepCity_GameCorner_1F_Text_224BFD: @ 8224BFD - .string "The door appears to be locked.$" - -MossdeepCity_GameCorner_1F_Text_224C1C: @ 8224C1C - .string "A TRAINER named {STR_VAR_1} is\n" - .string "visiting my home.\p" - .string "Would you like to challenge\n" - .string "{STR_VAR_1}?$" - -MossdeepCity_GameCorner_1F_Text_224C64: @ 8224C64 - .string "You won’t battle? I’m disappointed\n" - .string "that I can’t see you battle…$" - -MossdeepCity_GameCorner_1F_Text_224CA4: @ 8224CA4 - .string "Oh, good, good!\p" - .string "But my house isn’t all that sturdy.\p" - .string "Could I ask you to keep it down to\n" - .string "a 3-on-3 match?$" - -MossdeepCity_GameCorner_1F_Text_224D0B: @ 8224D0B - .string "Before you two battle, you should\n" - .string "save your progress.$" - -MossdeepCity_GameCorner_1F_Text_224D41: @ 8224D41 - .string "I hope to see a good match!$" - -MossdeepCity_GameCorner_1F_Text_224D5D: @ 8224D5D - .string "So, it became a standoff.\p" - .string "It was a brilliant match in which\n" - .string "neither side conceded a step!$" - -MossdeepCity_GameCorner_1F_Text_224DB7: @ 8224DB7 - .string "That was superlative!\p" - .string "Why, it was like seeing myself in\n" - .string "my youth again!$" - -MossdeepCity_GameCorner_1F_Text_224DFF: @ 8224DFF - .string "Ah, too bad for you!\p" - .string "But it was a good match.\n" - .string "I hope you can win next time.$" - diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc deleted file mode 100644 index 695be3c6e..000000000 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ /dev/null @@ -1,3 +0,0 @@ -MossdeepCity_GameCorner_B1F_MapScripts:: @ 8224E4B - .byte 0 - diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc deleted file mode 100644 index f38fd606d..000000000 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ /dev/null @@ -1,658 +0,0 @@ -MossdeepCity_Gym_MapScripts:: @ 8220800 - map_script 1, MossdeepCity_Gym_MapScript1_220806 - .byte 0 - -MossdeepCity_Gym_MapScript1_220806: @ 8220806 - checkflag FLAG_0x064 - goto_eq MossdeepCity_Gym_EventScript_22083D - goto MossdeepCity_Gym_EventScript_220815 - end - -MossdeepCity_Gym_EventScript_220815:: @ 8220815 - checkflag FLAG_0x065 - goto_eq MossdeepCity_Gym_EventScript_220855 - goto MossdeepCity_Gym_EventScript_220824 - end - -MossdeepCity_Gym_EventScript_220824:: @ 8220824 - checkflag FLAG_0x066 - goto_eq MossdeepCity_Gym_EventScript_22086D - goto MossdeepCity_Gym_EventScript_220833 - end - -MossdeepCity_Gym_EventScript_220833:: @ 8220833 - checkflag FLAG_0x067 - goto_eq MossdeepCity_Gym_EventScript_220885 - end - -MossdeepCity_Gym_EventScript_22083D:: @ 822083D - setmetatile 5, 5, 516, 0 - setmetatile 2, 7, 569, 1 - goto MossdeepCity_Gym_EventScript_220815 - end - -MossdeepCity_Gym_EventScript_220855:: @ 8220855 - setmetatile 8, 14, 516, 0 - setmetatile 8, 10, 569, 1 - goto MossdeepCity_Gym_EventScript_220824 - end - -MossdeepCity_Gym_EventScript_22086D:: @ 822086D - setmetatile 15, 17, 524, 0 - setmetatile 17, 15, 569, 1 - goto MossdeepCity_Gym_EventScript_220833 - end - -MossdeepCity_Gym_EventScript_220885:: @ 8220885 - setmetatile 1, 23, 525, 0 - setmetatile 5, 24, 569, 1 - end - -MossdeepCity_Gym_EventScript_220898:: @ 8220898 - trainerbattle 8, TRAINER_TATE_AND_LIZA_1, 0, MossdeepCity_Gym_Text_221783, MossdeepCity_Gym_Text_2218EC, MossdeepCity_Gym_Text_221BCE, MossdeepCity_Gym_EventScript_2208D1 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq MossdeepCity_Gym_EventScript_22097E - checkflag FLAG_0x0AB - goto_if 0, MossdeepCity_Gym_EventScript_220937 - msgbox MossdeepCity_Gym_Text_221B1D, 4 - release - end - -MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 - message MossdeepCity_Gym_Text_22196A - waitmessage - call MossdeepCity_Gym_EventScript_27207E - msgbox MossdeepCity_Gym_Text_221999, 4 - setflag FLAG_0x4F6 - setflag FLAG_BADGE07_GET - setflag FLAG_0x39C - clearflag FLAG_0x365 - clearflag FLAG_0x393 - setvar VAR_0x8008, 7 - call MossdeepCity_Gym_EventScript_271F43 - clearflag FLAG_0x389 - clearflag FLAG_0x337 - clearflag FLAG_0x2F4 - clearflag FLAG_0x35E - clearflag FLAG_0x35F - setvar VAR_0x405D, 1 - setflag FLAG_0x2F1 - setvar VAR_0x409F, 1 - call MossdeepCity_Gym_EventScript_22095B - closemessage - delay 30 - playfanfare MUS_ME_TORE_EYE - msgbox MossdeepCity_Gym_Text_221AEA, 4 - waitfanfare - closemessage - delay 30 - setflag FLAG_0x1D8 - release - end - -MossdeepCity_Gym_EventScript_220937:: @ 8220937 - giveitem_std ITEM_TM04 - compare VAR_RESULT, 0 - goto_eq MossdeepCity_Gym_EventScript_272054 - msgbox MossdeepCity_Gym_Text_221A40, 4 - setflag FLAG_0x0AB - release - end - -MossdeepCity_Gym_EventScript_22095B:: @ 822095B - giveitem_std ITEM_TM04 - compare VAR_RESULT, 0 - goto_eq MossdeepCity_Gym_EventScript_27205E - msgbox MossdeepCity_Gym_Text_221A40, 4 - setflag FLAG_0x0AB - return - -MossdeepCity_Gym_EventScript_22097E:: @ 822097E - trainerbattle 7, TRAINER_TATE_AND_LIZA_1, 0, MossdeepCity_Gym_Text_221D0B, MossdeepCity_Gym_Text_221E05, MossdeepCity_Gym_Text_221EB8 - msgbox MossdeepCity_Gym_Text_221E45, 6 - end - -MossdeepCity_Gym_EventScript_220999:: @ 8220999 - lockall - checkflag FLAG_0x064 - goto_eq MossdeepCity_Gym_EventScript_2209D0 - setflag FLAG_0x064 - applymovement 255, MossdeepCity_Gym_Movement_220C30 - waitmovement 0 - setmetatile 5, 5, 516, 0 - setmetatile 2, 7, 569, 1 - goto MossdeepCity_Gym_EventScript_2209C8 - end - -MossdeepCity_Gym_EventScript_2209C8:: @ 82209C8 - special DrawWholeMapView - playse SE_TK_KASYA - releaseall - end - -MossdeepCity_Gym_EventScript_2209D0:: @ 82209D0 - clearflag FLAG_0x064 - applymovement 255, MossdeepCity_Gym_Movement_220C30 - waitmovement 0 - setmetatile 5, 5, 524, 0 - setmetatile 2, 7, 568, 1 - goto MossdeepCity_Gym_EventScript_2209C8 - end - -MossdeepCity_Gym_EventScript_2209F5:: @ 82209F5 - lockall - checkflag FLAG_0x065 - goto_eq MossdeepCity_Gym_EventScript_220A24 - setflag FLAG_0x065 - applymovement 255, MossdeepCity_Gym_Movement_220C30 - waitmovement 0 - setmetatile 8, 14, 516, 0 - setmetatile 8, 10, 569, 1 - goto MossdeepCity_Gym_EventScript_2209C8 - end - -MossdeepCity_Gym_EventScript_220A24:: @ 8220A24 - clearflag FLAG_0x065 - applymovement 255, MossdeepCity_Gym_Movement_220C30 - waitmovement 0 - setmetatile 8, 14, 517, 0 - setmetatile 8, 10, 568, 1 - goto MossdeepCity_Gym_EventScript_2209C8 - end - -MossdeepCity_Gym_EventScript_220A49:: @ 8220A49 - lockall - checkflag FLAG_0x066 - goto_eq MossdeepCity_Gym_EventScript_220A78 - setflag FLAG_0x066 - applymovement 255, MossdeepCity_Gym_Movement_220C30 - waitmovement 0 - setmetatile 15, 17, 524, 0 - setmetatile 17, 15, 569, 1 - goto MossdeepCity_Gym_EventScript_2209C8 - end - -MossdeepCity_Gym_EventScript_220A78:: @ 8220A78 - clearflag FLAG_0x066 - applymovement 255, MossdeepCity_Gym_Movement_220C30 - waitmovement 0 - setmetatile 15, 17, 516, 0 - setmetatile 17, 15, 568, 1 - goto MossdeepCity_Gym_EventScript_2209C8 - end - -MossdeepCity_Gym_EventScript_220A9D:: @ 8220A9D - lockall - checkflag FLAG_0x067 - goto_eq MossdeepCity_Gym_EventScript_220ACC - setflag FLAG_0x067 - applymovement 255, MossdeepCity_Gym_Movement_220C30 - waitmovement 0 - setmetatile 1, 23, 525, 0 - setmetatile 5, 24, 569, 1 - goto MossdeepCity_Gym_EventScript_2209C8 - end - -MossdeepCity_Gym_EventScript_220ACC:: @ 8220ACC - clearflag FLAG_0x067 - applymovement 255, MossdeepCity_Gym_Movement_220C30 - waitmovement 0 - setmetatile 1, 23, 516, 0 - setmetatile 5, 24, 568, 1 - goto MossdeepCity_Gym_EventScript_2209C8 - end - -MossdeepCity_Gym_EventScript_220AF1:: @ 8220AF1 - lockall - warp7 MAP_MOSSDEEP_CITY_GYM, 255, 7, 30 - waitstate - releaseall - end - -MossdeepCity_Gym_EventScript_220AFD:: @ 8220AFD - trainerbattle 0, TRAINER_PRESTON, 0, MossdeepCity_Gym_Text_220E5C, MossdeepCity_Gym_Text_220EAC - msgbox MossdeepCity_Gym_Text_220ED3, 6 - end - -MossdeepCity_Gym_EventScript_220B14:: @ 8220B14 - trainerbattle 0, TRAINER_VIRGIL, 0, MossdeepCity_Gym_Text_220F02, MossdeepCity_Gym_Text_220F1A - msgbox MossdeepCity_Gym_Text_220F3A, 6 - end - -MossdeepCity_Gym_EventScript_220B2B:: @ 8220B2B - trainerbattle 0, TRAINER_BLAKE, 0, MossdeepCity_Gym_Text_220FB0, MossdeepCity_Gym_Text_221024 - msgbox MossdeepCity_Gym_Text_221055, 6 - end - -MossdeepCity_Gym_EventScript_220B42:: @ 8220B42 - trainerbattle 0, TRAINER_HANNAH, 0, MossdeepCity_Gym_Text_2210EE, MossdeepCity_Gym_Text_221152 - msgbox MossdeepCity_Gym_Text_22116A, 6 - end - -MossdeepCity_Gym_EventScript_220B59:: @ 8220B59 - trainerbattle 0, TRAINER_SAMANTHA, 0, MossdeepCity_Gym_Text_2211E2, MossdeepCity_Gym_Text_221230 - msgbox MossdeepCity_Gym_Text_22123D, 6 - end - -MossdeepCity_Gym_EventScript_220B70:: @ 8220B70 - trainerbattle 0, TRAINER_MAURA, 0, MossdeepCity_Gym_Text_2212A6, MossdeepCity_Gym_Text_221309 - msgbox MossdeepCity_Gym_Text_22132E, 6 - end - -MossdeepCity_Gym_EventScript_220B87:: @ 8220B87 - trainerbattle 0, TRAINER_SYLVIA, 0, MossdeepCity_Gym_Text_2213C2, MossdeepCity_Gym_Text_2213F4 - msgbox MossdeepCity_Gym_Text_221412, 6 - end - -MossdeepCity_Gym_EventScript_220B9E:: @ 8220B9E - trainerbattle 0, TRAINER_NATE, 0, MossdeepCity_Gym_Text_221460, MossdeepCity_Gym_Text_2214A7 - msgbox MossdeepCity_Gym_Text_2214D3, 6 - end - -MossdeepCity_Gym_EventScript_220BB5:: @ 8220BB5 - trainerbattle 0, TRAINER_MACEY, 0, MossdeepCity_Gym_Text_22161B, MossdeepCity_Gym_Text_221658 - msgbox MossdeepCity_Gym_Text_221680, 6 - end - -MossdeepCity_Gym_EventScript_220BCC:: @ 8220BCC - trainerbattle 0, TRAINER_CLIFFORD, 0, MossdeepCity_Gym_Text_22157C, MossdeepCity_Gym_Text_2215B8 - msgbox MossdeepCity_Gym_Text_2215E2, 6 - end - -MossdeepCity_Gym_EventScript_220BE3:: @ 8220BE3 - trainerbattle 0, TRAINER_NICHOLAS, 0, MossdeepCity_Gym_Text_2216EE, MossdeepCity_Gym_Text_22172D - msgbox MossdeepCity_Gym_Text_22173A, 6 - end - -MossdeepCity_Gym_EventScript_220BFA:: @ 8220BFA - trainerbattle 0, TRAINER_KATHLEEN, 0, MossdeepCity_Gym_Text_221507, MossdeepCity_Gym_Text_22153B - msgbox MossdeepCity_Gym_Text_221545, 6 - end - -MossdeepCity_Gym_EventScript_220C11:: @ 8220C11 - lock - faceplayer - checkflag FLAG_0x4F6 - goto_eq MossdeepCity_Gym_EventScript_220C26 - msgbox MossdeepCity_Gym_Text_220CD5, 4 - release - end - -MossdeepCity_Gym_EventScript_220C26:: @ 8220C26 - msgbox MossdeepCity_Gym_Text_220E2A, 4 - release - end - -MossdeepCity_Gym_Movement_220C30: @ 8220C30 - delay_16 - delay_16 - step_end - -MossdeepCity_Gym_EventScript_220C33:: @ 8220C33 - lockall - checkflag FLAG_BADGE07_GET - goto_eq MossdeepCity_Gym_EventScript_220C53 - goto MossdeepCity_Gym_EventScript_220C5D - end - -MossdeepCity_Gym_EventScript_220C43:: @ 8220C43 - lockall - checkflag FLAG_BADGE07_GET - goto_eq MossdeepCity_Gym_EventScript_220C53 - goto MossdeepCity_Gym_EventScript_220C5D - end - -MossdeepCity_Gym_EventScript_220C53:: @ 8220C53 - msgbox MossdeepCity_Gym_Text_221CCA, 4 - releaseall - end - -MossdeepCity_Gym_EventScript_220C5D:: @ 8220C5D - msgbox MossdeepCity_Gym_Text_221CB0, 4 - releaseall - end - -MossdeepCity_Gym_EventScript_220C67:: @ 8220C67 - playse SE_MU_PACHI - waitse - playse SE_TU_SAA - mossdeepgym3 0 - mossdeepgym1 0 - waitmovement 0 - mossdeepgym2 - waitmovement 0 - mossdeepgym4 - end - -MossdeepCity_Gym_EventScript_220C7D:: @ 8220C7D - playse SE_MU_PACHI - waitse - playse SE_TU_SAA - mossdeepgym3 0 - mossdeepgym1 1 - waitmovement 0 - mossdeepgym2 - waitmovement 0 - mossdeepgym4 - end - -MossdeepCity_Gym_EventScript_220C93:: @ 8220C93 - playse SE_MU_PACHI - waitse - playse SE_TU_SAA - mossdeepgym3 0 - mossdeepgym1 2 - waitmovement 0 - mossdeepgym2 - waitmovement 0 - mossdeepgym4 - end - -MossdeepCity_Gym_EventScript_220CA9:: @ 8220CA9 - playse SE_MU_PACHI - waitse - playse SE_TU_SAA - mossdeepgym3 0 - mossdeepgym1 3 - waitmovement 0 - mossdeepgym2 - waitmovement 0 - mossdeepgym4 - end - -MossdeepCity_Gym_EventScript_220CBF:: @ 8220CBF - playse SE_MU_PACHI - waitse - playse SE_TU_SAA - mossdeepgym3 0 - mossdeepgym1 4 - waitmovement 0 - mossdeepgym2 - waitmovement 0 - mossdeepgym4 - end - -MossdeepCity_Gym_Text_220CD5: @ 8220CD5 - .string "Yo, how’s it going, CHAMPION-bound\n" - .string "{PLAYER}?\p" - .string "The GYM LEADERS here use\n" - .string "PSYCHIC-type POKéMON.\p" - .string "If you go up against them with\n" - .string "FIGHTING- or POISON-type POKéMON,\l" - .string "they’ll inflict horrible damage!\p" - .string "Plus, they’ll come at you with\n" - .string "outstanding combination attacks.\p" - .string "If you want to win, you’ll need to show\n" - .string "them how tight you are with your\l" - .string "POKéMON. Go for it!$" - -MossdeepCity_Gym_Text_220E2A: @ 8220E2A - .string "Wow, you’re astounding!\n" - .string "You’re one great TRAINER!$" - -MossdeepCity_Gym_Text_220E5C: @ 8220E5C - .string "Battles hinge on the strength of your\n" - .string "spirit! The weak-spirited will never win!$" - -MossdeepCity_Gym_Text_220EAC: @ 8220EAC - .string "I lost!\n" - .string "I must temper my spirit again!$" - -MossdeepCity_Gym_Text_220ED3: @ 8220ED3 - .string "The indecisive lose.\n" - .string "That’s my warning to you.$" - -MossdeepCity_Gym_Text_220F02: @ 8220F02 - .string "Let me see your talent!$" - -MossdeepCity_Gym_Text_220F1A: @ 8220F1A - .string "You possess spectacular talent!$" - -MossdeepCity_Gym_Text_220F3A: @ 8220F3A - .string "If there are prodigies in the world,\n" - .string "then our GYM LEADERS are them!\p" - .string "However, you may be even more talented\n" - .string "than them…$" - -MossdeepCity_Gym_Text_220FB0: @ 8220FB0 - .string "Fufufufu… Watch me levitate a POKé\n" - .string "BALL telekinetically!\p" - .string "Wrooooooooaaaar!\n" - .string "… … … … … … …\p" - .string "Sometimes, I’m out of sync…$" - -MossdeepCity_Gym_Text_221024: @ 8221024 - .string "My POKéMON battling skills are out\n" - .string "of sync, too!$" - -MossdeepCity_Gym_Text_221055: @ 8221055 - .string "A POKé BALL was too heavy to lift\n" - .string "psychically. But this dust bunny…\p" - .string "Whoooooooooooooooh!\n" - .string "… … … … … …\p" - .string "No, I’m not cheating!\n" - .string "I didn’t blow on it! Honestly!$" - -MossdeepCity_Gym_Text_2210EE: @ 82210EE - .string "When you lose to me, don’t be too hard\n" - .string "on yourself.\p" - .string "It’s not that you’re weak--I’m just\n" - .string "too strong!$" - -MossdeepCity_Gym_Text_221152: @ 8221152 - .string "You’re just too strong!$" - -MossdeepCity_Gym_Text_22116A: @ 822116A - .string "I’m not going to get down on myself for\n" - .string "losing. I just need to train harder.\p" - .string "Positive thinking--that’s my strong\n" - .string "point!$" - -MossdeepCity_Gym_Text_2211E2: @ 82211E2 - .string "I see it…\n" - .string "I see your future…\p" - .string "If you can beat me, I will tell you\n" - .string "your future!$" - -MossdeepCity_Gym_Text_221230: @ 8221230 - .string "I surrender!$" - -MossdeepCity_Gym_Text_22123D: @ 822123D - .string "You will wage a terrifically intense\n" - .string "battle with our GYM LEADERS…\p" - .string "The result…\n" - .string "You won’t hear it from me!$" - -MossdeepCity_Gym_Text_2212A6: @ 82212A6 - .string "The roads you have traveled…\n" - .string "What you have experienced…\p" - .string "Come at me with everything you’ve\n" - .string "learned!$" - -MossdeepCity_Gym_Text_221309: @ 8221309 - .string "You’ve traveled a path of greatness!$" - -MossdeepCity_Gym_Text_22132E: @ 822132E - .string "A bright future awaits those who have\n" - .string "worked diligently.\p" - .string "For those who lazed idly, there is\n" - .string "only despair at the end.\p" - .string "What goes around comes around…$" - -MossdeepCity_Gym_Text_2213C2: @ 82213C2 - .string "Even at the risk of life, I will win\n" - .string "this battle!$" - -MossdeepCity_Gym_Text_2213F4: @ 82213F4 - .string "What you do…\n" - .string "It horrifies me…$" - -MossdeepCity_Gym_Text_221412: @ 8221412 - .string "How dare you beat me…\p" - .string "It won’t be my fault if something\n" - .string "horrible befalls you…$" - -MossdeepCity_Gym_Text_221460: @ 8221460 - .string "Hohoho.\p" - .string "You need me to show you how tenacious\n" - .string "the PSYCHIC type can be.$" - -MossdeepCity_Gym_Text_2214A7: @ 82214A7 - .string "Oh! My, my!\n" - .string "Your battle style is fantastic!$" - -MossdeepCity_Gym_Text_2214D3: @ 82214D3 - .string "I… I don’t let defeat rattle m-me,\n" - .string "however b-badly.$" - -MossdeepCity_Gym_Text_221507: @ 8221507 - .string "Let me show you a perfectly awful,\n" - .string "horrifying time!$" - -MossdeepCity_Gym_Text_22153B: @ 822153B - .string "N-nooooo!$" - -MossdeepCity_Gym_Text_221545: @ 8221545 - .string "Your vitality is contagious!\n" - .string "Get away from me quickly!$" - -MossdeepCity_Gym_Text_22157C: @ 822157C - .string "I may be past my prime, but I suggest\n" - .string "you not patronize me.$" - -MossdeepCity_Gym_Text_2215B8: @ 82215B8 - .string "Ah, you overflow with the power\n" - .string "of youth!$" - -MossdeepCity_Gym_Text_2215E2: @ 82215E2 - .string "It seems that I could not overcome\n" - .string "your youthful energy.$" - -MossdeepCity_Gym_Text_22161B: @ 822161B - .string "You’re not getting through to the end!\n" - .string "Not if I can help it!$" - -MossdeepCity_Gym_Text_221658: @ 8221658 - .string "How could you be so ludicrously\n" - .string "strong?$" - -MossdeepCity_Gym_Text_221680: @ 8221680 - .string "Humph! You may be strong, but you’re\n" - .string "not suitable for the PSYCHIC type!\p" - .string "The way you battle is somehow brutal!$" - -MossdeepCity_Gym_Text_2216EE: @ 82216EE - .string "Wroooar! Have a taste of my super\n" - .string "POKéMON hard-battling power!$" - -MossdeepCity_Gym_Text_22172D: @ 822172D - .string "Oh!\n" - .string "Done in!$" - -MossdeepCity_Gym_Text_22173A: @ 822173A - .string "All right! I think I’ll develop a special\n" - .string "invincible POKéMON power next.$" - -MossdeepCity_Gym_Text_221783: @ 8221783 - .string "TATE: Hehehe… Were you surprised?\p" - .string "LIZA: Fufufu… Were you surprised?\p" - .string "TATE: That there are two GYM LEADERS?\n" - .string "LIZA: That there are two GYM LEADERS?\p" - .string "TATE: We’re twins!\n" - .string "LIZA: We’re twins!\p" - .string "TATE: We don’t need to talk because…\n" - .string "LIZA: We can each determine what…\p" - .string "TATE: The other is thinking…\n" - .string "LIZA: All in our minds!\p" - .string "TATE: This combination of ours…\n" - .string "LIZA: Can you beat it?$" - -MossdeepCity_Gym_Text_2218EC: @ 82218EC - .string "TATE: What?! Our combination…\n" - .string "LIZA: Was shattered!\p" - .string "TATE: It can’t be helped. You’ve won…\n" - .string "LIZA: So, in recognition, take this.$" - -MossdeepCity_Gym_Text_22196A: @ 822196A - .string "{PLAYER} received the MIND BADGE\n" - .string "from TATE and LIZA.$" - -MossdeepCity_Gym_Text_221999: @ 8221999 - .string "TATE: The MIND BADGE enhances the\n" - .string "SP. ATK and SP. DEF of POKéMON.\p" - .string "LIZA: It also lets you use the HM move\n" - .string "DIVE outside of battle.\p" - .string "TATE: You should also take this, too.$" - -MossdeepCity_Gym_Text_221A40: @ 8221A40 - .string "TATE: That TM04 contains…\n" - .string "LIZA: CALM MIND!\p" - .string "TATE: It raises SP. ATK and…\n" - .string "LIZA: It raises SP. DEF!\p" - .string "TATE: It’s a move that’s perfect…\n" - .string "LIZA: For PSYCHIC POKéMON!\p" - .string "… … … … … …$" - -MossdeepCity_Gym_Text_221AEA: @ 8221AEA - .string "Registered GYM LEADERS TATE & LIZA\n" - .string "in the POKéNAV.$" - -MossdeepCity_Gym_Text_221B1D: @ 8221B1D - .string "TATE: Looks like the bond between you\n" - .string "and your POKéMON is far stronger than\l" - .string "the bond that we share as twins.\p" - .string "LIZA: You will become even stronger!\n" - .string "We’ve battled you, so we know.$" - -MossdeepCity_Gym_Text_221BCE: @ 8221BCE - .string "TATE: Hehehe… Were you surprised?\p" - .string "LIZA: That there are two GYM LEADERS?\p" - .string "TATE: Oops, you have only one…\n" - .string "LIZA: POKéMON that can battle.\p" - .string "TATE: We can’t battle that way!\p" - .string "LIZA: If you want to challenge us,\n" - .string "bring some more POKéMON.$" - -MossdeepCity_Gym_Text_221CB0: @ 8221CB0 - .string "MOSSDEEP CITY POKéMON GYM$" - -MossdeepCity_Gym_Text_221CCA: @ 8221CCA - .string "MOSSDEEP CITY POKéMON GYM\p" - .string "LIZA AND TATE’S CERTIFIED TRAINERS:\n" - .string "{PLAYER}$" - -MossdeepCity_Gym_Text_221D0B: @ 8221D0B - .string "TATE: POKéMON…\n" - .string "LIZA: POKéMON…\p" - .string "TATE: By changing the party’s mix…\n" - .string "LIZA: The battle style changes.\p" - .string "TATE: But me…\n" - .string "LIZA: But me…\p" - .string "TATE: I’ll always be with LIZA!\n" - .string "LIZA: I’ll always be with TATE!\p" - .string "TATE: Our combination…\n" - .string "LIZA: We’ll show you again and again!$" - -MossdeepCity_Gym_Text_221E05: @ 8221E05 - .string "TATE: You and your POKéMON…\n" - .string "LIZA: It’s as if you were siblings!$" - -MossdeepCity_Gym_Text_221E45: @ 8221E45 - .string "TATE: You can knock us down,\n" - .string "but we’ll never stay down!\p" - .string "LIZA: Because the two of us,\n" - .string "we always support each other!$" - -MossdeepCity_Gym_Text_221EB8: @ 8221EB8 - .string "TATE: You’re back again…\n" - .string "LIZA: You’re back again…\p" - .string "TATE: To give us a rematch.\n" - .string "LIZA: To give us a rematch.\p" - .string "TATE: But…\n" - .string "LIZA: For our match…\p" - .string "TATE: You brought just one POKéMON!\n" - .string "LIZA: You brought just one POKéMON!\p" - .string "TATE: We need you to bring at least…\n" - .string "LIZA: Two POKéMON when you come back.$" - diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/scripts/maps/MossdeepCity_House1.inc deleted file mode 100644 index b08d296c7..000000000 --- a/data/scripts/maps/MossdeepCity_House1.inc +++ /dev/null @@ -1,42 +0,0 @@ -MossdeepCity_House1_MapScripts:: @ 8221FD5 - .byte 0 - -MossdeepCity_House1_EventScript_221FD6:: @ 8221FD6 - lock - faceplayer - bufferleadmonspeciesname 0 - msgbox MossdeepCity_House1_Text_22200F, 4 - specialvar VAR_RESULT, GetPokeblockNameByMonNature - compare VAR_RESULT, 0 - goto_eq MossdeepCity_House1_EventScript_221FFC - msgbox MossdeepCity_House1_Text_22201D, 4 - release - end - -MossdeepCity_House1_EventScript_221FFC:: @ 8221FFC - msgbox MossdeepCity_House1_Text_222068, 4 - release - end - -MossdeepCity_House1_EventScript_222006:: @ 8222006 - msgbox MossdeepCity_House1_Text_222099, 2 - end - -MossdeepCity_House1_Text_22200F: @ 822200F - .string "Hmm!\n" - .string "Your {STR_VAR_1}…$" - -MossdeepCity_House1_Text_22201D: @ 822201D - .string "It likes {STR_VAR_1}S,\n" - .string "doesn’t it?\p" - .string "No, I’m positive of it! It definitely\n" - .string "likes {STR_VAR_1}S!$" - -MossdeepCity_House1_Text_222068: @ 8222068 - .string "It doesn’t appear to like or dislike\n" - .string "any {POKEBLOCK}S.$" - -MossdeepCity_House1_Text_222099: @ 8222099 - .string "My husband can tell what kind of\n" - .string "{POKEBLOCK}S a POKéMON likes at a glance.$" - diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc deleted file mode 100644 index c61f74d99..000000000 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ /dev/null @@ -1,70 +0,0 @@ -MossdeepCity_House2_MapScripts:: @ 82220DE - .byte 0 - -MossdeepCity_House2_EventScript_2220DF:: @ 82220DF - msgbox MossdeepCity_House2_Text_222146, 2 - end - -MossdeepCity_House2_EventScript_2220E8:: @ 82220E8 - msgbox MossdeepCity_House2_Text_2221A6, 2 - end - -MossdeepCity_House2_EventScript_2220F1:: @ 82220F1 - lock - faceplayer - waitse - playmoncry SPECIES_WINGULL, 0 - msgbox MossdeepCity_House2_Text_22222E, 4 - waitmoncry - closemessage - setflag FLAG_0x0E0 - clearflag FLAG_0x3A5 - compare VAR_FACING, 2 - call_if 1, MossdeepCity_House2_EventScript_222124 - compare VAR_FACING, 3 - call_if 1, MossdeepCity_House2_EventScript_22212F - removeobject 3 - release - end - -MossdeepCity_House2_EventScript_222124:: @ 8222124 - applymovement 3, MossdeepCity_House2_Movement_22213A - waitmovement 0 - return - -MossdeepCity_House2_EventScript_22212F:: @ 822212F - applymovement 3, MossdeepCity_House2_Movement_222141 - waitmovement 0 - return - -MossdeepCity_House2_Movement_22213A: @ 822213A - walk_fast_right - walk_fast_down - walk_fast_down - walk_fast_left - walk_fast_down - delay_8 - step_end - -MossdeepCity_House2_Movement_222141: @ 8222141 - walk_fast_down - walk_fast_down - walk_fast_down - delay_8 - step_end - -MossdeepCity_House2_Text_222146: @ 8222146 - .string "My little sister exchanges MAIL with\n" - .string "her boyfriend in FORTREE.\p" - .string "I don’t envy her one bit at all.$" - -MossdeepCity_House2_Text_2221A6: @ 82221A6 - .string "Even though I can’t see my friend in\n" - .string "FORTREE, my POKéMON carries MAIL\l" - .string "back and forth for us.\p" - .string "I’m not lonesome, even though we’re\n" - .string "apart.$" - -MossdeepCity_House2_Text_22222E: @ 822222E - .string "WINGULL: Pihyoh!$" - diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/scripts/maps/MossdeepCity_House3.inc deleted file mode 100644 index dfdbfa956..000000000 --- a/data/scripts/maps/MossdeepCity_House3.inc +++ /dev/null @@ -1,52 +0,0 @@ -MossdeepCity_House3_MapScripts:: @ 82225C2 - .byte 0 - -MossdeepCity_House3_EventScript_2225C3:: @ 82225C3 - lock - faceplayer - checkflag FLAG_0x098 - goto_eq MossdeepCity_House3_EventScript_222602 - msgbox MossdeepCity_House3_Text_222616, 5 - compare VAR_RESULT, 0 - goto_eq MossdeepCity_House3_EventScript_22260C - msgbox MossdeepCity_House3_Text_2226B6, 4 - giveitem_std ITEM_SUPER_ROD - setflag FLAG_0x098 - msgbox MossdeepCity_House3_Text_2226F0, 4 - release - end - -MossdeepCity_House3_EventScript_222602:: @ 8222602 - msgbox MossdeepCity_House3_Text_222751, 4 - release - end - -MossdeepCity_House3_EventScript_22260C:: @ 822260C - msgbox MossdeepCity_House3_Text_222733, 4 - release - end - -MossdeepCity_House3_Text_222616: @ 8222616 - .string "Hey there, TRAINER!\n" - .string "A SUPER ROD really is super!\p" - .string "Say all you want, but this baby can\n" - .string "catch POKéMON off the seafloor!\p" - .string "What do you think?\n" - .string "You want it, don’t you?$" - -MossdeepCity_House3_Text_2226B6: @ 82226B6 - .string "You bet, you bet!\n" - .string "After all, a SUPER ROD is really super!$" - -MossdeepCity_House3_Text_2226F0: @ 82226F0 - .string "If there’s any water, try dropping in\n" - .string "your ROD and see what bites!$" - -MossdeepCity_House3_Text_222733: @ 8222733 - .string "Hunh?\n" - .string "Don’t you like to fish?$" - -MossdeepCity_House3_Text_222751: @ 8222751 - .string "Go after the seafloor POKéMON with\n" - .string "your SUPER ROD.$" - diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc deleted file mode 100644 index cb3cc0d16..000000000 --- a/data/scripts/maps/MossdeepCity_House4.inc +++ /dev/null @@ -1,63 +0,0 @@ -MossdeepCity_House4_MapScripts:: @ 8222DD7 - .byte 0 - -MossdeepCity_House4_EventScript_222DD8:: @ 8222DD8 - lock - faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_eq MossdeepCity_House4_EventScript_222DED - msgbox MossdeepCity_House4_Text_222E31, 4 - release - end - -MossdeepCity_House4_EventScript_222DED:: @ 8222DED - msgbox MossdeepCity_House4_Text_222E73, 4 - release - end - -MossdeepCity_House4_EventScript_222DF7:: @ 8222DF7 - lock - faceplayer - special sub_80E8BC8 - compare VAR_RESULT, 0 - goto_eq MossdeepCity_House4_EventScript_222E14 - special GetSecretBaseNearbyMapName - msgbox MossdeepCity_House4_Text_222ECC, 4 - release - end - -MossdeepCity_House4_EventScript_222E14:: @ 8222E14 - msgbox MossdeepCity_House4_Text_222EF7, 4 - release - end - -MossdeepCity_House4_EventScript_222E1E:: @ 8222E1E - lock - faceplayer - waitse - playmoncry SPECIES_SKITTY, 0 - msgbox MossdeepCity_House4_Text_222F31, 4 - waitmoncry - release - end - -MossdeepCity_House4_Text_222E31: @ 8222E31 - .string "My little brother says he likes to go\n" - .string "find people’s SECRET BASES.$" - -MossdeepCity_House4_Text_222E73: @ 8222E73 - .string "My little brother says he likes to\n" - .string "visit people’s SECRET BASES and have\l" - .string "POKéMON battles.$" - -MossdeepCity_House4_Text_222ECC: @ 8222ECC - .string "Was it you who made a SECRET BASE\n" - .string "near {STR_VAR_1}?$" - -MossdeepCity_House4_Text_222EF7: @ 8222EF7 - .string "You should make a SECRET BASE\n" - .string "somewhere. I’ll go find it!$" - -MossdeepCity_House4_Text_222F31: @ 8222F31 - .string "SKITTY: Miyaan?$" - diff --git a/data/scripts/maps/MossdeepCity_Mart.inc b/data/scripts/maps/MossdeepCity_Mart.inc deleted file mode 100644 index ed7ecd035..000000000 --- a/data/scripts/maps/MossdeepCity_Mart.inc +++ /dev/null @@ -1,60 +0,0 @@ -MossdeepCity_Mart_MapScripts:: @ 82223C7 - .byte 0 - -MossdeepCity_Mart_EventScript_2223C8:: @ 82223C8 - lock - faceplayer - message gUnknown_08272A21 - waitmessage - pokemart MossdeepCity_Mart_Pokemart_2223E0 - msgbox gUnknown_08272A3F, 4 - release - end - - .align 2 -MossdeepCity_Mart_Pokemart_2223E0: @ 82223E0 - .2byte ITEM_ULTRA_BALL - .2byte ITEM_NET_BALL - .2byte ITEM_DIVE_BALL - .2byte ITEM_HYPER_POTION - .2byte ITEM_FULL_HEAL - .2byte ITEM_REVIVE - .2byte ITEM_MAX_REPEL - .2byte ITEM_X_ATTACK - .2byte ITEM_X_DEFEND - .2byte ITEM_NONE - release - end - -MossdeepCity_Mart_EventScript_2223F6:: @ 82223F6 - msgbox MossdeepCity_Mart_Text_222411, 2 - end - -MossdeepCity_Mart_EventScript_2223FF:: @ 82223FF - msgbox MossdeepCity_Mart_Text_2224A0, 2 - end - -MossdeepCity_Mart_EventScript_222408:: @ 8222408 - msgbox MossdeepCity_Mart_Text_2224FA, 2 - end - -MossdeepCity_Mart_Text_222411: @ 8222411 - .string "REVIVE is fantastic!\p" - .string "Give it to a fainted POKéMON,\n" - .string "and the POKéMON will arise.\p" - .string "But be careful, REVIVE doesn’t restore\n" - .string "the used-up PP of moves.$" - -MossdeepCity_Mart_Text_2224A0: @ 82224A0 - .string "MAX REPEL keeps all weak POKéMON away.\p" - .string "Out of all the REPEL sprays, it lasts\n" - .string "the longest.$" - -MossdeepCity_Mart_Text_2224FA: @ 82224FA - .string "The NET and DIVE BALLS are rare POKé\n" - .string "BALLS that are only made in MOSSDEEP.\p" - .string "A NET BALL is effective against\n" - .string "BUG-type and WATER-type POKéMON.\p" - .string "A DIVE BALL works best on POKéMON\n" - .string "at the bottom of the sea.$" - diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc deleted file mode 100644 index 7fd2e61a0..000000000 --- a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc +++ /dev/null @@ -1,36 +0,0 @@ -MossdeepCity_PokemonCenter_1F_MapScripts:: @ 822223F - map_script 3, MossdeepCity_PokemonCenter_1F_MapScript1_22224A - map_script 5, MossdeepCity_PokemonCenter_1F_MapScript1_277C30 - .byte 0 - -MossdeepCity_PokemonCenter_1F_MapScript1_22224A: @ 822224A - setrespawn 9 - end - -MossdeepCity_PokemonCenter_1F_EventScript_22224E:: @ 822224E - setvar VAR_0x800B, 1 - call MossdeepCity_PokemonCenter_1F_EventScript_27191E - waitmessage - waitbuttonpress - release - end - -MossdeepCity_PokemonCenter_1F_EventScript_22225C:: @ 822225C - msgbox MossdeepCity_PokemonCenter_1F_Text_22226E, 2 - end - -MossdeepCity_PokemonCenter_1F_EventScript_222265:: @ 8222265 - msgbox MossdeepCity_PokemonCenter_1F_Text_2222D9, 2 - end - -MossdeepCity_PokemonCenter_1F_Text_22226E: @ 822226E - .string "The GYM LEADERS in this town are\n" - .string "a formidable duo.\p" - .string "Their combination attacks are, like,\n" - .string "excellent and wow!$" - -MossdeepCity_PokemonCenter_1F_Text_2222D9: @ 82222D9 - .string "Depending on the special abilities of\n" - .string "POKéMON, some moves might change\l" - .string "or not work at all.$" - diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc b/data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc deleted file mode 100644 index 142bce560..000000000 --- a/data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc +++ /dev/null @@ -1,28 +0,0 @@ -MossdeepCity_PokemonCenter_2F_MapScripts:: @ 8222334 - map_script 2, MossdeepCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, MossdeepCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, MossdeepCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, MossdeepCity_PokemonCenter_2F_MapScript1_276ACF - .byte 0 - -MossdeepCity_PokemonCenter_2F_EventScript_222349:: @ 8222349 - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 - end - -MossdeepCity_PokemonCenter_2F_EventScript_22234F:: @ 822234F - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 - end - -MossdeepCity_PokemonCenter_2F_EventScript_222355:: @ 8222355 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB - end - -MossdeepCity_PokemonCenter_2F_EventScript_22235B:: @ 822235B - msgbox MossdeepCity_PokemonCenter_2F_Text_222364, 2 - end - -MossdeepCity_PokemonCenter_2F_Text_222364: @ 8222364 - .string "If I win a whole lot of link battles\n" - .string "and show everyone how good I am,\l" - .string "I might get a fan following!$" - diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc deleted file mode 100644 index 2edf6d251..000000000 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ /dev/null @@ -1,439 +0,0 @@ -MossdeepCity_SpaceCenter_1F_MapScripts:: @ 8222F41 - map_script 1, MossdeepCity_SpaceCenter_1F_MapScript1_222FC2 - map_script 3, MossdeepCity_SpaceCenter_1F_MapScript1_222F4C - .byte 0 - -MossdeepCity_SpaceCenter_1F_MapScript1_222F4C: @ 8222F4C - compare VAR_0x405D, 2 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222F58 - end - -MossdeepCity_SpaceCenter_1F_EventScript_222F58:: @ 8222F58 - setobjectxyperm 3, 1, 9 - setobjectmovementtype 3, 10 - setobjectxyperm 5, 0, 8 - setobjectmovementtype 5, 10 - setobjectxyperm 4, 1, 6 - setobjectmovementtype 4, 10 - setobjectxyperm 1, 3, 4 - setobjectmovementtype 1, 10 - setobjectmovementtype 2, 10 - compare VAR_0x409E, 1 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222FAA - compare VAR_0x409E, 2 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222FB2 - compare VAR_0x409E, 3 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222FBA - end - -MossdeepCity_SpaceCenter_1F_EventScript_222FAA:: @ 8222FAA - setobjectxyperm 9, 12, 2 - end - -MossdeepCity_SpaceCenter_1F_EventScript_222FB2:: @ 8222FB2 - setobjectxyperm 9, 13, 3 - end - -MossdeepCity_SpaceCenter_1F_EventScript_222FBA:: @ 8222FBA - setobjectxyperm 9, 14, 2 - end - -MossdeepCity_SpaceCenter_1F_MapScript1_222FC2: @ 8222FC2 - compare VAR_0x405D, 2 - goto_if 3, MossdeepCity_SpaceCenter_1F_EventScript_222FCE - end - -MossdeepCity_SpaceCenter_1F_EventScript_222FCE:: @ 8222FCE - setmetatile 2, 5, 996, 1 - return - -MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8 - lock - faceplayer - compare VAR_0x405D, 2 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223024 - dodailyevents - specialvar VAR_RESULT, GetWeekCount - buffernumberstring 0, VAR_RESULT - compare VAR_RESULT, 0 - call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_223012 - compare VAR_RESULT, 1 - call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_22301B - closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 - waitmovement 0 - release - end - -MossdeepCity_SpaceCenter_1F_EventScript_223012:: @ 8223012 - msgbox MossdeepCity_SpaceCenter_1F_Text_2232A7, 4 - return - -MossdeepCity_SpaceCenter_1F_EventScript_22301B:: @ 822301B - msgbox MossdeepCity_SpaceCenter_1F_Text_2232C8, 4 - return - -MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024 - dodailyevents - specialvar VAR_RESULT, GetWeekCount - buffernumberstring 0, VAR_RESULT - compare VAR_RESULT, 0 - call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_223051 - compare VAR_RESULT, 1 - call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_22305A - closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 - waitmovement 0 - release - end - -MossdeepCity_SpaceCenter_1F_EventScript_223051:: @ 8223051 - msgbox MossdeepCity_SpaceCenter_1F_Text_223305, 4 - return - -MossdeepCity_SpaceCenter_1F_EventScript_22305A:: @ 822305A - msgbox MossdeepCity_SpaceCenter_1F_Text_22335E, 4 - return - -MossdeepCity_SpaceCenter_1F_EventScript_223063:: @ 8223063 - lock - faceplayer - compare VAR_0x405D, 2 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22307A - msgbox MossdeepCity_SpaceCenter_1F_Text_2233D3, 4 - release - end - -MossdeepCity_SpaceCenter_1F_EventScript_22307A:: @ 822307A - msgbox MossdeepCity_SpaceCenter_1F_Text_2234B7, 4 - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 - waitmovement 0 - release - end - -MossdeepCity_SpaceCenter_1F_EventScript_22308E:: @ 822308E - lock - faceplayer - compare VAR_0x405D, 2 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_2230DA - checkflag FLAG_0x0C0 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_2230D0 - msgbox MossdeepCity_SpaceCenter_1F_Text_223540, 4 - giveitem_std ITEM_SUN_STONE - compare VAR_RESULT, 0 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 - setflag FLAG_0x0C0 - msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, 4 - release - end - -MossdeepCity_SpaceCenter_1F_EventScript_2230D0:: @ 82230D0 - msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, 4 - release - end - -MossdeepCity_SpaceCenter_1F_EventScript_2230DA:: @ 82230DA - checkflag FLAG_0x0C0 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223119 - msgbox MossdeepCity_SpaceCenter_1F_Text_2235F0, 4 - giveitem_std ITEM_SUN_STONE - compare VAR_RESULT, 0 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 - setflag FLAG_0x0C0 - msgbox MossdeepCity_SpaceCenter_1F_Text_223664, 4 - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 - waitmovement 0 - release - end - -MossdeepCity_SpaceCenter_1F_EventScript_223119:: @ 8223119 - msgbox MossdeepCity_SpaceCenter_1F_Text_223664, 4 - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 - waitmovement 0 - release - end - -MossdeepCity_SpaceCenter_1F_EventScript_22312D:: @ 822312D - lock - faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223154 - compare VAR_0x405D, 2 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22315E - compare VAR_0x405D, 2 - goto_if 0, MossdeepCity_SpaceCenter_1F_EventScript_223154 - goto MossdeepCity_SpaceCenter_1F_EventScript_22315E - end - -MossdeepCity_SpaceCenter_1F_EventScript_223154:: @ 8223154 - msgbox MossdeepCity_SpaceCenter_1F_Text_2236A6, 4 - release - end - -MossdeepCity_SpaceCenter_1F_EventScript_22315E:: @ 822315E - msgbox MossdeepCity_SpaceCenter_1F_Text_2236E8, 4 - release - end - -MossdeepCity_SpaceCenter_1F_EventScript_223168:: @ 8223168 - lock - faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22318F - compare VAR_0x405D, 2 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_2231A4 - compare VAR_0x405D, 2 - goto_if 0, MossdeepCity_SpaceCenter_1F_EventScript_22318F - goto MossdeepCity_SpaceCenter_1F_EventScript_2231A4 - end - -MossdeepCity_SpaceCenter_1F_EventScript_22318F:: @ 822318F - msgbox MossdeepCity_SpaceCenter_1F_Text_22375B, 4 - closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 - waitmovement 0 - release - end - -MossdeepCity_SpaceCenter_1F_EventScript_2231A4:: @ 82231A4 - msgbox MossdeepCity_SpaceCenter_1F_Text_2237B5, 4 - closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 - waitmovement 0 - release - end - -MossdeepCity_SpaceCenter_1F_EventScript_2231B9:: @ 82231B9 - lock - faceplayer - msgbox MossdeepCity_SpaceCenter_1F_Text_223849, 4 - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 - waitmovement 0 - release - end - -MossdeepCity_SpaceCenter_1F_EventScript_2231CF:: @ 82231CF - lockall - msgbox MossdeepCity_SpaceCenter_1F_Text_223C2C, 4 - releaseall - end - -MossdeepCity_SpaceCenter_1F_EventScript_2231DA:: @ 82231DA - trainerbattle 0, TRAINER_GRUNT_32, 0, MossdeepCity_SpaceCenter_1F_Text_22396C, MossdeepCity_SpaceCenter_1F_Text_223999 - msgbox MossdeepCity_SpaceCenter_1F_Text_2239AA, 6 - end - -MossdeepCity_SpaceCenter_1F_EventScript_2231F1:: @ 82231F1 - trainerbattle 0, TRAINER_GRUNT_16, 0, MossdeepCity_SpaceCenter_1F_Text_2239E6, MossdeepCity_SpaceCenter_1F_Text_223A21 - msgbox MossdeepCity_SpaceCenter_1F_Text_223A4B, 6 - end - -MossdeepCity_SpaceCenter_1F_EventScript_223208:: @ 8223208 - trainerbattle 0, TRAINER_GRUNT_33, 0, MossdeepCity_SpaceCenter_1F_Text_223A8A, MossdeepCity_SpaceCenter_1F_Text_223AFA - msgbox MossdeepCity_SpaceCenter_1F_Text_223B37, 6 - end - -MossdeepCity_SpaceCenter_1F_EventScript_22321F:: @ 822321F - lock - faceplayer - checkflag FLAG_0x0BF - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22326E - msgbox MossdeepCity_SpaceCenter_1F_Text_223B90, 4 - trainerbattle 3, TRAINER_GRUNT_23, 0, MossdeepCity_SpaceCenter_1F_Text_223BC2 - setflag FLAG_0x0BF - moveobjectoffscreen 9 - switch VAR_FACING - case 3, MossdeepCity_SpaceCenter_1F_EventScript_223278 - case 3, MossdeepCity_SpaceCenter_1F_EventScript_223289 - applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_2232A2 - waitmovement 0 - setvar VAR_0x409E, 2 - release - end - -MossdeepCity_SpaceCenter_1F_EventScript_22326E:: @ 822326E - msgbox MossdeepCity_SpaceCenter_1F_Text_223BD3, 4 - release - end - -MossdeepCity_SpaceCenter_1F_EventScript_223278:: @ 8223278 - applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_22329A - waitmovement 0 - setvar VAR_0x409E, 1 - release - end - -MossdeepCity_SpaceCenter_1F_EventScript_223289:: @ 8223289 - applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_22329E - waitmovement 0 - setvar VAR_0x409E, 3 - release - end - -MossdeepCity_SpaceCenter_1F_Movement_22329A: @ 822329A - lock_facing_direction - walk_left - unlock_facing_direction - step_end - -MossdeepCity_SpaceCenter_1F_Movement_22329E: @ 822329E - lock_facing_direction - walk_right - unlock_facing_direction - step_end - -MossdeepCity_SpaceCenter_1F_Movement_2232A2: @ 82232A2 - face_left - lock_facing_direction - walk_right - unlock_facing_direction - step_end - -MossdeepCity_SpaceCenter_1F_Text_2232A7: @ 82232A7 - .string "The rocket’s launch is imminent!$" - -MossdeepCity_SpaceCenter_1F_Text_2232C8: @ 82232C8 - .string "The rocket launched safely!\n" - .string "That’s successful launch no. {STR_VAR_1}!$" - -MossdeepCity_SpaceCenter_1F_Text_223305: @ 8223305 - .string "I know that things are a little\n" - .string "haywire right now, but…\p" - .string "The rocket’s launch is imminent!$" - -MossdeepCity_SpaceCenter_1F_Text_22335E: @ 822335E - .string "I know that things are a little\n" - .string "haywire right now, but…\p" - .string "The rocket launched safely!\n" - .string "That’s successful launch no. {STR_VAR_1}!$" - -MossdeepCity_SpaceCenter_1F_Text_2233D3: @ 82233D3 - .string "A rocket launch demands perfection.\n" - .string "Not even a 1% margin of error is allowed.\p" - .string "Even if it’s 99% okay, the whole thing\n" - .string "is useless if 1% happens to be no good.\p" - .string "Despite that, we never stop trying.\n" - .string "Why? It’s a dream that never ends.$" - -MossdeepCity_SpaceCenter_1F_Text_2234B7: @ 82234B7 - .string "Those MAGMA thugs have their sights\n" - .string "set on our SPACE CENTER.\p" - .string "But we can’t allow anything that minor\n" - .string "to interfere with our rocket launch!$" - -MossdeepCity_SpaceCenter_1F_Text_223540: @ 8223540 - .string "I was taking a stroll down the beach\n" - .string "when I found this.\p" - .string "It’s not anything I need, so you can\n" - .string "have it.$" - -MossdeepCity_SpaceCenter_1F_Text_2235A6: @ 82235A6 - .string "The HOENN region has been famous for \n" - .string "its meteor showers for a long time.$" - -MossdeepCity_SpaceCenter_1F_Text_2235F0: @ 82235F0 - .string "TEAM MAGMA can’t be allowed to steal\n" - .string "the rocket fuel.\p" - .string "Oh, by the way, you can have this stone\n" - .string "I found on the beach.$" - -MossdeepCity_SpaceCenter_1F_Text_223664: @ 8223664 - .string "With TEAM MAGMA around, I guess\n" - .string "strolls on the beach aren’t safe.$" - -MossdeepCity_SpaceCenter_1F_Text_2236A6: @ 82236A6 - .string "Some people claim that POKéMON came\n" - .string "from space. Could it be true?$" - -MossdeepCity_SpaceCenter_1F_Text_2236E8: @ 82236E8 - .string "TEAM AQUA should take care of\n" - .string "TEAM MAGMA!\p" - .string "But if they did that, TEAM AQUA will\n" - .string "become bold and brazen, won’t they?$" - -MossdeepCity_SpaceCenter_1F_Text_22375B: @ 822375B - .string "A giant chunk of metal bursts through\n" - .string "the skies and flies into space…\p" - .string "It boggles my mind!$" - -MossdeepCity_SpaceCenter_1F_Text_2237B5: @ 82237B5 - .string "A giant chunk of metal bursts through\n" - .string "the skies and flies into space…\p" - .string "But TEAM MAGMA wants to spoil\n" - .string "that dream of mine!\p" - .string "I’m not having any of that!$" - -MossdeepCity_SpaceCenter_1F_Text_223849: @ 8223849 - .string "STEVEN: {PLAYER}{KUN}, have you read that\n" - .string "proclamation already?\p" - .string "TEAM MAGMA is coming after the rocket\n" - .string "fuel on this island.\p" - .string "I don’t know what they’d need it for,\n" - .string "but they can’t be allowed to take it.\p" - .string "I’ll keep an eye on things for\n" - .string "a while longer.\p" - .string "In the meantime, why don’t you go\n" - .string "check out the town?$" - -MossdeepCity_SpaceCenter_1F_Text_22396C: @ 822396C - .string "As promised, we’ve come for\n" - .string "the rocket fuel!$" - -MossdeepCity_SpaceCenter_1F_Text_223999: @ 8223999 - .string "Ran out of fuel…$" - -MossdeepCity_SpaceCenter_1F_Text_2239AA: @ 82239AA - .string "Don’t think you’re on a roll just\n" - .string "because you’ve beaten me!$" - -MossdeepCity_SpaceCenter_1F_Text_2239E6: @ 82239E6 - .string "We gave you fair warning!\n" - .string "There’s nothing sneaky about us!$" - -MossdeepCity_SpaceCenter_1F_Text_223A21: @ 8223A21 - .string "Grrr…\n" - .string "We should’ve used sneaky treachery…$" - -MossdeepCity_SpaceCenter_1F_Text_223A4B: @ 8223A4B - .string "Okay, I get it already! The next time,\n" - .string "we’ll come unannounced.$" - -MossdeepCity_SpaceCenter_1F_Text_223A8A: @ 8223A8A - .string "The rocket fuel the SPACE CENTER has\n" - .string "in storage--that’s what we’re after.\p" - .string "We mean to take every last bit of it!$" - -MossdeepCity_SpaceCenter_1F_Text_223AFA: @ 8223AFA - .string "Please, can you spare some fuel?\n" - .string "Even a chintzy cup will do!$" - -MossdeepCity_SpaceCenter_1F_Text_223B37: @ 8223B37 - .string "What are we going to do with\n" - .string "the rocket fuel?\p" - .string "How would I know?\n" - .string "Ask our leader upstairs!$" - -MossdeepCity_SpaceCenter_1F_Text_223B90: @ 8223B90 - .string "Our leader said no one, but no one,\n" - .string "gets past me!$" - -MossdeepCity_SpaceCenter_1F_Text_223BC2: @ 8223BC2 - .string "Ack! Ack! Aaack!$" - -MossdeepCity_SpaceCenter_1F_Text_223BD3: @ 8223BD3 - .string "Please, tell our leader that\n" - .string "I never abandoned my post.\l" - .string "That I stayed to the bitter end…$" - -MossdeepCity_SpaceCenter_1F_Text_223C2C: @ 8223C2C - .string "This is…\n" - .string "An intent-to-steal notice?\p" - .string "“To the staff of the SPACE CENTER:\n" - .string "How are you? We are doing fine.\p" - .string "“We will soon visit you to take your\n" - .string "rocket fuel.\p" - .string "“Please don’t try to stop us.\n" - .string "We will take the fuel no matter what.\p" - .string "“Let there be more land!\n" - .string " TEAM MAGMAâ€$" - diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc deleted file mode 100644 index 0052f09aa..000000000 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc +++ /dev/null @@ -1,524 +0,0 @@ -MossdeepCity_SpaceCenter_2F_MapScripts:: @ 8223D58 - map_script 3, MossdeepCity_SpaceCenter_2F_MapScript1_223D63 - map_script 2, MossdeepCity_SpaceCenter_2F_MapScript2_223DB5 - .byte 0 - -MossdeepCity_SpaceCenter_2F_MapScript1_223D63: @ 8223D63 - compare VAR_0x405D, 2 - call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_223D7A - compare VAR_0x409F, 2 - call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_223D9F - end - -MossdeepCity_SpaceCenter_2F_EventScript_223D7A:: @ 8223D7A - clearflag FLAG_0x0CD - setobjectxyperm 3, 5, 3 - setobjectmovementtype 3, 10 - setobjectxyperm 1, 3, 2 - setobjectmovementtype 1, 10 - setobjectxyperm 2, 1, 3 - setobjectmovementtype 2, 10 - return - -MossdeepCity_SpaceCenter_2F_EventScript_223D9F:: @ 8223D9F - setobjectxyperm 5, 11, 2 - setobjectxyperm 7, 15, 2 - setobjectxyperm 6, 13, 4 - return - -MossdeepCity_SpaceCenter_2F_MapScript2_223DB5: @ 8223DB5 - map_script_2 VAR_0x409F, 1, MossdeepCity_SpaceCenter_2F_EventScript_223DBF - .2byte 0 - -MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF - playse SE_PIN - applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_272598 - waitmovement 0 - applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_27259A - waitmovement 0 - msgbox MossdeepCity_SpaceCenter_2F_Text_2243A4, 5 - compare VAR_RESULT, 1 - goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223E09 - msgbox MossdeepCity_SpaceCenter_2F_Text_2243FE, 4 - closemessage - applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_223E07 - waitmovement 0 - warp MAP_MOSSDEEP_CITY_SPACE_CENTER_1F, 255, 13, 1 - waitstate - releaseall - end - -MossdeepCity_SpaceCenter_2F_Movement_223E07: @ 8223E07 - walk_up - step_end - -MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09 - msgbox MossdeepCity_SpaceCenter_2F_Text_22442D, 4 - trainerbattle 3, TRAINER_GRUNT_34, 0, MossdeepCity_SpaceCenter_2F_Text_224461 - applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_223E85 - waitmovement 0 - applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_2725A4 - waitmovement 0 - msgbox MossdeepCity_SpaceCenter_2F_Text_22446E, 4 - trainerbattle 3, TRAINER_GRUNT_35, 0, MossdeepCity_SpaceCenter_2F_Text_224499 - applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_223E81 - waitmovement 0 - applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_2725A8 - waitmovement 0 - msgbox MossdeepCity_SpaceCenter_2F_Text_2244AB, 4 - trainerbattle 3, TRAINER_GRUNT_36, 0, MossdeepCity_SpaceCenter_2F_Text_2244F1 - applymovement 7, MossdeepCity_SpaceCenter_2F_Movement_223E89 - waitmovement 0 - setvar VAR_0x409F, 2 - moveobjectoffscreen 5 - moveobjectoffscreen 7 - moveobjectoffscreen 6 - releaseall - end - -MossdeepCity_SpaceCenter_2F_Movement_223E81: @ 8223E81 - lock_facing_direction - walk_left - unlock_facing_direction - step_end - -MossdeepCity_SpaceCenter_2F_Movement_223E85: @ 8223E85 - lock_facing_direction - walk_down - unlock_facing_direction - step_end - -MossdeepCity_SpaceCenter_2F_Movement_223E89: @ 8223E89 - lock_facing_direction - walk_right - unlock_facing_direction - step_end - -MossdeepCity_SpaceCenter_2F_EventScript_223E8D:: @ 8223E8D - lock - faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EB4 - compare VAR_0x405D, 2 - goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EBE - compare VAR_0x405D, 2 - goto_if 0, MossdeepCity_SpaceCenter_2F_EventScript_223EB4 - goto MossdeepCity_SpaceCenter_2F_EventScript_223EBE - end - -MossdeepCity_SpaceCenter_2F_EventScript_223EB4:: @ 8223EB4 - msgbox MossdeepCity_SpaceCenter_2F_Text_2241A1, 4 - release - end - -MossdeepCity_SpaceCenter_2F_EventScript_223EBE:: @ 8223EBE - msgbox MossdeepCity_SpaceCenter_2F_Text_22420C, 4 - release - end - -MossdeepCity_SpaceCenter_2F_EventScript_223EC8:: @ 8223EC8 - lock - faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EEF - compare VAR_0x405D, 2 - goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EF9 - compare VAR_0x405D, 2 - goto_if 0, MossdeepCity_SpaceCenter_2F_EventScript_223EEF - goto MossdeepCity_SpaceCenter_2F_EventScript_223EF9 - end - -MossdeepCity_SpaceCenter_2F_EventScript_223EEF:: @ 8223EEF - msgbox MossdeepCity_SpaceCenter_2F_Text_224253, 4 - release - end - -MossdeepCity_SpaceCenter_2F_EventScript_223EF9:: @ 8223EF9 - msgbox MossdeepCity_SpaceCenter_2F_Text_2242C5, 4 - release - end - -MossdeepCity_SpaceCenter_2F_EventScript_223F03:: @ 8223F03 - lock - faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223F2A - compare VAR_0x405D, 2 - goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223F34 - compare VAR_0x405D, 2 - goto_if 0, MossdeepCity_SpaceCenter_2F_EventScript_223F2A - goto MossdeepCity_SpaceCenter_2F_EventScript_223F34 - end - -MossdeepCity_SpaceCenter_2F_EventScript_223F2A:: @ 8223F2A - msgbox MossdeepCity_SpaceCenter_2F_Text_224342, 4 - release - end - -MossdeepCity_SpaceCenter_2F_EventScript_223F34:: @ 8223F34 - msgbox MossdeepCity_SpaceCenter_2F_Text_224376, 4 - release - end - -MossdeepCity_SpaceCenter_2F_EventScript_223F3E:: @ 8223F3E - msgbox MossdeepCity_SpaceCenter_2F_Text_22452C, 2 - end - -MossdeepCity_SpaceCenter_2F_EventScript_223F47:: @ 8223F47 - msgbox MossdeepCity_SpaceCenter_2F_Text_224570, 2 - end - -MossdeepCity_SpaceCenter_2F_EventScript_223F50:: @ 8223F50 - msgbox MossdeepCity_SpaceCenter_2F_Text_2245AF, 2 - end - -MossdeepCity_SpaceCenter_2F_EventScript_223F59:: @ 8223F59 - lock - faceplayer - msgbox MossdeepCity_SpaceCenter_2F_Text_2245D9, 4 - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725A2 - waitmovement 0 - release - end - -MossdeepCity_SpaceCenter_2F_EventScript_223F6F:: @ 8223F6F - lockall - msgbox MossdeepCity_SpaceCenter_2F_Text_22467B, 4 - releaseall - end - -MossdeepCity_SpaceCenter_2F_EventScript_223F7A:: @ 8223F7A - lockall - checkflag FLAG_0x0CD - goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223FDA - setflag FLAG_0x0CD - msgbox MossdeepCity_SpaceCenter_2F_Text_2246B2, 4 - msgbox MossdeepCity_SpaceCenter_2F_Text_2246F0, 4 - closemessage - delay 30 - playse SE_KOUKA_L - switch VAR_FACING - case 1, MossdeepCity_SpaceCenter_2F_EventScript_223FBA - applymovement 4, MossdeepCity_SpaceCenter_2F_Movement_223FC6 - waitmovement 0 - releaseall - end - -MossdeepCity_SpaceCenter_2F_EventScript_223FBA:: @ 8223FBA - applymovement 4, MossdeepCity_SpaceCenter_2F_Movement_223FCF - waitmovement 0 - releaseall - end - -MossdeepCity_SpaceCenter_2F_Movement_223FC6: @ 8223FC6 - 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 - 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 - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_27259E - waitmovement 0 - msgbox MossdeepCity_SpaceCenter_2F_Text_2247FF, 5 - compare VAR_RESULT, 1 - goto_eq MossdeepCity_SpaceCenter_2F_EventScript_22400C - msgbox MossdeepCity_SpaceCenter_2F_Text_224854, 4 - closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725AA - waitmovement 0 - releaseall - end - -MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725AA - waitmovement 0 - special SavePlayerParty - fadescreen 1 - special sub_80F9438 - waitstate - compare VAR_RESULT, 0 - goto_if 5, MossdeepCity_SpaceCenter_2F_EventScript_224032 - special LoadPlayerParty - goto MossdeepCity_SpaceCenter_2F_EventScript_223FDA - -MossdeepCity_SpaceCenter_2F_EventScript_224032:: @ 8224032 - special sub_80F94E8 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 4 - special sub_81A1780 - setvar VAR_0x8004, 8 - setvar VAR_0x8005, 0 - special sub_8163AC4 - waitstate - setvar VAR_0x8004, 6 - special sub_81A1780 - special LoadPlayerParty - switch VAR_RESULT - case 1, MossdeepCity_SpaceCenter_2F_EventScript_224071 - fadescreen 1 - special sp0C8_whiteout_maybe - waitstate - -MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 - msgbox MossdeepCity_SpaceCenter_2F_Text_2248C2, 4 - closemessage - delay 20 - applymovement 9, MossdeepCity_SpaceCenter_2F_Movement_2725A4 - applymovement 8, MossdeepCity_SpaceCenter_2F_Movement_2725AA - waitmovement 0 - delay 60 - applymovement 9, MossdeepCity_SpaceCenter_2F_Movement_2725A6 - applymovement 8, MossdeepCity_SpaceCenter_2F_Movement_2725A8 - waitmovement 0 - delay 20 - msgbox MossdeepCity_SpaceCenter_2F_Text_2249DC, 4 - closemessage - setvar VAR_0x405D, 3 - fadedefaultbgm - fadescreen 1 - setvar VAR_0x409F, 3 - setflag FLAG_0x2F4 - setflag FLAG_0x35E - setflag FLAG_0x337 - removeobject 5 - removeobject 7 - removeobject 6 - removeobject 8 - removeobject 9 - setobjectxy 3, 5, 6 - turnobject 3, 1 - setobjectxy 2, 11, 8 - turnobject 2, 2 - setobjectxy 1, 6, 2 - turnobject 1, 2 - call MossdeepCity_SpaceCenter_2F_EventScript_224131 - fadescreen 0 - msgbox MossdeepCity_SpaceCenter_2F_Text_224A4A, 4 - closemessage - fadescreen 1 - setflag FLAG_0x075 - setflag FLAG_0x3C7 - removeobject 4 - setflag FLAG_0x2E1 - clearflag FLAG_0x3C7 - setvar VAR_0x40C6, 1 - setflag FLAG_0x314 - removeobject 3 - setobjectxyperm 3, 5, 6 - setobjectmovementtype 3, 2 - addobject 3 - fadescreen 0 - end - -MossdeepCity_SpaceCenter_2F_EventScript_224131:: @ 8224131 - switch VAR_FACING - case 1, MossdeepCity_SpaceCenter_2F_EventScript_22414D - case 3, MossdeepCity_SpaceCenter_2F_EventScript_224152 - return - -MossdeepCity_SpaceCenter_2F_EventScript_22414D:: @ 822414D - turnobject 4, 2 - return - -MossdeepCity_SpaceCenter_2F_EventScript_224152:: @ 8224152 - turnobject 4, 4 - return - -MossdeepCity_SpaceCenter_2F_EventScript_224157:: @ 8224157 - trainerbattle 10, TRAINER_MAXIE_3, 0, MossdeepCity_SpaceCenter_2F_Text_22487C, MossdeepCity_SpaceCenter_2F_Text_22487C - end - -MossdeepCity_SpaceCenter_2F_EventScript_224166:: @ 8224166 - trainerbattle 11, TRAINER_TABITHA_1, 0, MossdeepCity_SpaceCenter_Text_2248AD, MossdeepCity_SpaceCenter_Text_2248AD - end - -MossdeepCity_SpaceCenter_2F_EventScript_224175:: @ 8224175 - lockall - checkplayergender - compare VAR_RESULT, 0 - call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_224193 - compare VAR_RESULT, 1 - call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_22419A - closemessage - clearflag FLAG_0x075 - releaseall - end - -MossdeepCity_SpaceCenter_2F_EventScript_224193:: @ 8224193 - pokenavcall MossdeepCity_SpaceCenter_2F_Text_2B38C1 - waitmessage - return - -MossdeepCity_SpaceCenter_2F_EventScript_22419A:: @ 822419A - pokenavcall MossdeepCity_SpaceCenter_2F_Text_2B39C6 - waitmessage - return - -MossdeepCity_SpaceCenter_2F_Text_2241A1: @ 82241A1 - .string "MOSSDEEP has mainly sunny weather,\n" - .string "and its winds are stable.\p" - .string "It’s an ideal location for launching\n" - .string "rockets.$" - -MossdeepCity_SpaceCenter_2F_Text_22420C: @ 822420C - .string "Why would TEAM MAGMA want to steal\n" - .string "our rocket fuel in the first place?$" - -MossdeepCity_SpaceCenter_2F_Text_224253: @ 8224253 - .string "If only I was a little younger, I would\n" - .string "have liked being an astronaut…\p" - .string "No… It’s not too late!\n" - .string "I can and will try!$" - -MossdeepCity_SpaceCenter_2F_Text_2242C5: @ 82242C5 - .string "If TEAM MAGMA takes the rocket fuel,\n" - .string "I won’t be able to go to space!\p" - .string "They can’t be allowed to get away\n" - .string "with such an outrage!$" - -MossdeepCity_SpaceCenter_2F_Text_224342: @ 8224342 - .string "I wish ordinary people could go into\n" - .string "space one day…$" - -MossdeepCity_SpaceCenter_2F_Text_224376: @ 8224376 - .string "TEAM MAGMA…\n" - .string "Do they want to go to space, too?$" - -MossdeepCity_SpaceCenter_2F_Text_2243A4: @ 82243A4 - .string "What’s wrong with you?\p" - .string "You’re outnumbered three to one,\n" - .string "but you still want to take us on?$" - -MossdeepCity_SpaceCenter_2F_Text_2243FE: @ 82243FE - .string "Good answer!\n" - .string "That’s what a smart person’ll do!$" - -MossdeepCity_SpaceCenter_2F_Text_22442D: @ 822442D - .string "A reckless go-getter, are you?\n" - .string "Okay, I’ll go first!$" - -MossdeepCity_SpaceCenter_2F_Text_224461: @ 8224461 - .string "I lost!\n" - .string "But!$" - -MossdeepCity_SpaceCenter_2F_Text_22446E: @ 822446E - .string "It’s too soon to be relieved!\n" - .string "I’m up next!$" - -MossdeepCity_SpaceCenter_2F_Text_224499: @ 8224499 - .string "I lost, too!\n" - .string "But!$" - -MossdeepCity_SpaceCenter_2F_Text_2244AB: @ 82244AB - .string "I bet you want to take a break.\n" - .string "But I’m not about to let you do that!$" - -MossdeepCity_SpaceCenter_2F_Text_2244F1: @ 82244F1 - .string "We should’ve taken a break…\n" - .string "That’s what we should’ve done…$" - -MossdeepCity_SpaceCenter_2F_Text_22452C: @ 822452C - .string "Three of us here, and look at the sorry\n" - .string "mess we got ourselves into.$" - -MossdeepCity_SpaceCenter_2F_Text_224570: @ 8224570 - .string "We three losing like this…\n" - .string "We look worse than usual by triple!$" - -MossdeepCity_SpaceCenter_2F_Text_2245AF: @ 82245AF - .string "Are we being useful to our leader\n" - .string "at all?$" - -MossdeepCity_SpaceCenter_2F_Text_2245D9: @ 82245D9 - .string "Hehehe!\p" - .string "We come all the way here to get some\n" - .string "fuel, and we’re interfered with again!\p" - .string "If you’re going to mess with us too,\n" - .string "we’ll take care of you at the same time!$" - -MossdeepCity_SpaceCenter_2F_Text_22467B: @ 822467B - .string "MAXIE: Clear out of the way!\n" - .string "Don’t you dare interfere!$" - -MossdeepCity_SpaceCenter_2F_Text_2246B2: @ 82246B2 - .string "STEVEN: TEAM MAGMA…\p" - .string "What’s the point of stealing rocket\n" - .string "fuel?$" - -MossdeepCity_SpaceCenter_2F_Text_2246F0: @ 82246F0 - .string "MAXIE: Fufufu… Since you’re so\n" - .string "curious, you deserve an explanation.\p" - .string "We’re going to jettison the entire\n" - .string "load into MT. CHIMNEY!\p" - .string "With GROUDON gone, we have no need\n" - .string "for that slag heap of a mountain!\p" - .string "So we’ll use the fuel’s power to make\n" - .string "the volcano erupt!\p" - .string "It will be savage!$" - -MossdeepCity_SpaceCenter_2F_Text_2247FF: @ 82247FF - .string "STEVEN: {PLAYER}{KUN}!\n" - .string "You’re going to help me?\p" - .string "Let’s go into battle together!\n" - .string "Are you ready?$" - -MossdeepCity_SpaceCenter_2F_Text_224854: @ 8224854 - .string "STEVEN: Then, hurry!\n" - .string "Get ready quickly!$" - -MossdeepCity_SpaceCenter_2F_Text_22487C: @ 822487C - .string "All I want…\n" - .string "I just want to expand the land mass…$" - -MossdeepCity_SpaceCenter_Text_2248AD: @ 82248AD - .string "I’m with our leader…$" - -MossdeepCity_SpaceCenter_2F_Text_2248C2: @ 82248C2 - .string "MAXIE: We failed to make the volcano\n" - .string "erupt…\p" - .string "We failed to control GROUDON after\n" - .string "we had awoken it…\p" - .string "Is our goal to expand the land\n" - .string "misguided?\p" - .string "… … … … … …\n" - .string "… … … … … …\p" - .string "If…\n" - .string "If we, TEAM MAGMA, are wrong…\l" - .string "… … … … … …\p" - .string "Then might TEAM AQUA’s goal to expand\n" - .string "the sea also be equally misguided?$" - -MossdeepCity_SpaceCenter_2F_Text_2249DC: @ 82249DC - .string "MAXIE: All right…\n" - .string "We will give up on the fuel…\p" - .string "There appear to be more important\n" - .string "matters that I must examine…$" - -MossdeepCity_SpaceCenter_2F_Text_224A4A: @ 8224A4A - .string "STEVEN: Whew, that was too tense.\n" - .string "{PLAYER}{KUN}, thank you.\p" - .string "I have something to give you as\n" - .string "thanks for your support.\p" - .string "Please come see me at home\n" - .string "after this.\p" - .string "Oh, yes, I don’t live in RUSTBORO CITY.\n" - .string "I live right here on this island.$" - diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc deleted file mode 100644 index 14d0cd5c7..000000000 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ /dev/null @@ -1,219 +0,0 @@ -MossdeepCity_StevensHouse_MapScripts:: @ 8222784 - map_script 1, MossdeepCity_StevensHouse_MapScript1_222794 - map_script 3, MossdeepCity_StevensHouse_MapScript1_2227A8 - map_script 2, MossdeepCity_StevensHouse_MapScript2_2227C0 - .byte 0 - -MossdeepCity_StevensHouse_MapScript1_222794: @ 8222794 - checkflag FLAG_SYS_GAME_CLEAR - call_if 0, MossdeepCity_StevensHouse_EventScript_22279E - end - -MossdeepCity_StevensHouse_EventScript_22279E:: @ 822279E - setmetatile 6, 4, 753, 1 - return - -MossdeepCity_StevensHouse_MapScript1_2227A8: @ 82227A8 - compare VAR_0x40C6, 2 - call_if 1, MossdeepCity_StevensHouse_EventScript_2227B4 - end - -MossdeepCity_StevensHouse_EventScript_2227B4:: @ 82227B4 - setobjectxyperm 1, 6, 5 - setobjectmovementtype 1, 7 - return - -MossdeepCity_StevensHouse_MapScript2_2227C0: @ 82227C0 - map_script_2 VAR_0x40C6, 1, MossdeepCity_StevensHouse_EventScript_2227CA - .2byte 0 - -MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA - lockall - applymovement 1, MossdeepCity_StevensHouse_Movement_2725A4 - waitmovement 0 - playse SE_PIN - applymovement 1, MossdeepCity_StevensHouse_Movement_272598 - waitmovement 0 - applymovement 1, MossdeepCity_StevensHouse_Movement_27259A - waitmovement 0 - applymovement 1, MossdeepCity_StevensHouse_Movement_222833 - waitmovement 0 - msgbox MossdeepCity_StevensHouse_Text_222936, 4 - giveitem_std ITEM_HM08 - setflag FLAG_0x07B - setflag FLAG_0x12E - msgbox MossdeepCity_StevensHouse_Text_222A0E, 4 - closemessage - delay 20 - applymovement 1, MossdeepCity_StevensHouse_Movement_22283B - waitmovement 0 - setflag FLAG_0x314 - setflag FLAG_0x3AD - setvar VAR_0x40C6, 2 - releaseall - end - -MossdeepCity_StevensHouse_Movement_222833: @ 8222833 - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_in_place_fastest_down - step_end - -MossdeepCity_StevensHouse_Movement_22283B: @ 822283B - walk_up - walk_right - walk_right - walk_right - walk_in_place_fastest_up - step_end - -MossdeepCity_StevensHouse_EventScript_222841:: @ 8222841 - lockall - msgbox MossdeepCity_StevensHouse_Text_222B9E, 5 - compare VAR_RESULT, 0 - goto_eq MossdeepCity_StevensHouse_EventScript_22285B - goto MossdeepCity_StevensHouse_EventScript_222865 - end - -MossdeepCity_StevensHouse_EventScript_22285B:: @ 822285B - msgbox MossdeepCity_StevensHouse_Text_222C2A, 4 - releaseall - end - -MossdeepCity_StevensHouse_EventScript_222865:: @ 8222865 - setvar VAR_TEMP_1, 398 - givemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 - compare VAR_RESULT, 0 - goto_eq MossdeepCity_StevensHouse_EventScript_222895 - compare VAR_RESULT, 1 - goto_eq MossdeepCity_StevensHouse_EventScript_2228BD - goto MossdeepCity_StevensHouse_EventScript_273811 - end - -MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895 - call MossdeepCity_StevensHouse_EventScript_2228EB - msgbox gUnknown_08273374, 5 - compare VAR_RESULT, 0 - goto_eq MossdeepCity_StevensHouse_EventScript_222901 - call MossdeepCity_StevensHouse_EventScript_27378B - call MossdeepCity_StevensHouse_EventScript_2723DD - goto MossdeepCity_StevensHouse_EventScript_222901 - end - -MossdeepCity_StevensHouse_EventScript_2228BD:: @ 82228BD - call MossdeepCity_StevensHouse_EventScript_2228EB - msgbox gUnknown_08273374, 5 - compare VAR_RESULT, 0 - goto_eq MossdeepCity_StevensHouse_EventScript_2228E0 - call MossdeepCity_StevensHouse_EventScript_273797 - goto MossdeepCity_StevensHouse_EventScript_2228E0 - end - -MossdeepCity_StevensHouse_EventScript_2228E0:: @ 82228E0 - call MossdeepCity_StevensHouse_EventScript_2737A0 - goto MossdeepCity_StevensHouse_EventScript_222901 - end - -MossdeepCity_StevensHouse_EventScript_2228EB:: @ 82228EB - bufferspeciesname 1, SPECIES_BELDUM - removeobject 2 - playfanfare MUS_FANFA4 - message MossdeepCity_StevensHouse_Text_222BED - waitmessage - waitfanfare - bufferspeciesname 0, SPECIES_BELDUM - return - -MossdeepCity_StevensHouse_EventScript_222901:: @ 8222901 - setflag FLAG_0x3C8 - setflag FLAG_0x12A - releaseall - end - -MossdeepCity_StevensHouse_EventScript_222909:: @ 8222909 - msgbox MossdeepCity_StevensHouse_Text_222D97, 3 - end - -MossdeepCity_StevensHouse_EventScript_222912:: @ 8222912 - msgbox MossdeepCity_StevensHouse_Text_222B11, 2 - end - -MossdeepCity_StevensHouse_EventScript_22291B:: @ 822291B - lockall - msgbox MossdeepCity_StevensHouse_Text_222C4E, 4 - releaseall - end - -MossdeepCity_StevensHouse_EventScript_222926:: @ 8222926 - giveitem_std ITEM_HM08, 1, 1 - setflag FLAG_0x07B - end - -MossdeepCity_StevensHouse_Text_222936: @ 8222936 - .string "STEVEN: {PLAYER}{KUN}…\p" - .string "As you can see, there’s not much here,\n" - .string "but this is my home.\p" - .string "Thank you for all that you’ve done.\p" - .string "This is my token of appreciation.\n" - .string "It’s the HIDDEN MACHINE DIVE.\p" - .string "No need to be shy--you’ve earned\n" - .string "this HM.$" - -MossdeepCity_StevensHouse_Text_222A0E: @ 8222A0E - .string "STEVEN: While you’re using SURF, you\n" - .string "should notice dark patches of water.\p" - .string "Use DIVE if you come to deep water\n" - .string "like it. You’ll drop to the seafloor.\p" - .string "When you want to come back up, use\n" - .string "DIVE again.\p" - .string "In some places, it won’t be possible\n" - .string "for you to surface, though.$" - -MossdeepCity_StevensHouse_Text_222B11: @ 8222B11 - .string "STEVEN: Apparently, there’s an\n" - .string "underwater cavern between\l" - .string "MOSSDEEP and SOOTOPOLIS.\p" - .string "You know, the one that CAPT. STERN\n" - .string "found in his submarine.$" - -MossdeepCity_StevensHouse_Text_222B9E: @ 8222B9E - .string "{PLAYER} checked the POKé BALL.\p" - .string "It contained the POKéMON\n" - .string "BELDUM.\p" - .string "Take the POKé BALL?$" - -MossdeepCity_StevensHouse_Text_222BED: @ 8222BED - .string "{PLAYER} obtained a BELDUM.$" - -MossdeepCity_StevensHouse_Text_222C03: @ 8222C03 - .string "There is no space for another POKéMON.$" - -MossdeepCity_StevensHouse_Text_222C2A: @ 8222C2A - .string "{PLAYER} left the POKé BALL where\n" - .string "it was.$" - -MossdeepCity_StevensHouse_Text_222C4E: @ 8222C4E - .string "It’s a letter.\p" - .string "… … … … … …\p" - .string "To {PLAYER}{KUN}…\p" - .string "I’ve decided to do a little soul-\n" - .string "searching and train on the road.\p" - .string "I don’t plan to return home for some\n" - .string "time.\p" - .string "I have a favor to ask of you.\p" - .string "I want you to take the POKé BALL on\n" - .string "the desk.\p" - .string "Inside it is a BELDUM, my favorite\n" - .string "POKéMON.\p" - .string "I’m counting on you.\p" - .string "May our paths cross someday.\p" - .string "STEVEN STONE$" - -MossdeepCity_StevensHouse_Text_222D97: @ 8222D97 - .string "It’s a collection of rare rocks and\n" - .string "stones assembled by STEVEN.$" - diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc deleted file mode 100644 index 28135bb1e..000000000 --- a/data/scripts/maps/MtChimney.inc +++ /dev/null @@ -1,869 +0,0 @@ -MtChimney_MapScripts:: @ 822EDC1 - map_script 5, MtChimney_MapScript1_22EDD2 - map_script 3, MtChimney_MapScript1_22EDCC - .byte 0 - -MtChimney_MapScript1_22EDCC: @ 822EDCC - setvar VAR_0x40BD, 1 - end - -MtChimney_MapScript1_22EDD2: @ 822EDD2 - setstepcallback 1 - end - -MtChimney_EventScript_22EDD5:: @ 822EDD5 - lock - faceplayer - checkflag FLAG_0x0DB - call_if 0, MtChimney_EventScript_22EDF9 - checkflag FLAG_0x0DB - call_if 1, MtChimney_EventScript_22EE02 - closemessage - applymovement 1, MtChimney_Movement_2725A2 - waitmovement 0 - setflag FLAG_0x0DB - release - end - -MtChimney_EventScript_22EDF9:: @ 822EDF9 - msgbox MtChimney_Text_22FAD2, 4 - return - -MtChimney_EventScript_22EE02:: @ 822EE02 - msgbox MtChimney_Text_22FBC7, 4 - return - -MtChimney_EventScript_22EE0B:: @ 822EE0B - lockall - playbgm MUS_MGM0, 0 - msgbox MtChimney_Text_22F26A, 4 - applymovement 2, MtChimney_Movement_27259E - waitmovement 0 - playse SE_PIN - applymovement 2, MtChimney_Movement_272598 - waitmovement 0 - applymovement 2, MtChimney_Movement_27259A - waitmovement 0 - msgbox MtChimney_Text_22F32E, 4 - trainerbattle 3, TRAINER_MAXIE_2, 0, MtChimney_Text_22F5CF - msgbox MtChimney_Text_22F5F7, 4 - closemessage - delay 30 - fadescreen 1 - removeobject 2 - removeobject 29 - removeobject 3 - removeobject 22 - setflag FLAG_0x39F - fadescreen 0 - setobjectxyperm 1, 10, 12 - addobject 1 - compare VAR_FACING, 4 - call_if 1, MtChimney_EventScript_22EEC7 - compare VAR_FACING, 2 - call_if 1, MtChimney_EventScript_22EED2 - applymovement 255, MtChimney_Movement_2725A4 - waitmovement 0 - msgbox MtChimney_Text_22FC3D, 4 - closemessage - compare VAR_FACING, 4 - call_if 1, MtChimney_EventScript_22EEDD - compare VAR_FACING, 2 - call_if 1, MtChimney_EventScript_22EEE8 - removeobject 1 - setflag FLAG_0x39E - setflag FLAG_0x08B - clearflag FLAG_0x3A0 - setflag FLAG_0x3AE - clearflag FLAG_0x3E2 - releaseall - end - -MtChimney_EventScript_22EEC7:: @ 822EEC7 - applymovement 1, MtChimney_Movement_22EF83 - waitmovement 0 - return - -MtChimney_EventScript_22EED2:: @ 822EED2 - applymovement 1, MtChimney_Movement_22EF94 - waitmovement 0 - return - -MtChimney_EventScript_22EEDD:: @ 822EEDD - applymovement 1, MtChimney_Movement_22EF8B - waitmovement 0 - return - -MtChimney_EventScript_22EEE8:: @ 822EEE8 - applymovement 1, MtChimney_Movement_22EF9C - waitmovement 0 - return - -MtChimney_EventScript_22EEF3:: @ 822EEF3 - lock - faceplayer - showmoneybox 0, 0, 0 - msgbox MtChimney_Text_22FE04, 5 - compare VAR_RESULT, 0 - goto_eq MtChimney_EventScript_22EF69 - checkmoney 0xc8, 0 - compare VAR_RESULT, 0 - goto_eq MtChimney_EventScript_22EF76 - msgbox MtChimney_Text_22FE4D, 4 - checkitemspace ITEM_LAVA_COOKIE, 1 - compare VAR_RESULT, 1 - call_if 1, MtChimney_EventScript_22EF5E - giveitem_std ITEM_LAVA_COOKIE - compare VAR_RESULT, 0 - goto_eq MtChimney_EventScript_22EF51 - hidemoneybox - nop - nop - release - end - -MtChimney_EventScript_22EF51:: @ 822EF51 - msgbox gUnknown_08272AD0, 4 - hidemoneybox - nop - nop - release - end - -MtChimney_EventScript_22EF5E:: @ 822EF5E - takemoney 0xc8, 0 - updatemoneybox 0, 0 - nop - return - -MtChimney_EventScript_22EF69:: @ 822EF69 - msgbox MtChimney_Text_22FE9B, 4 - hidemoneybox - nop - nop - release - end - -MtChimney_EventScript_22EF76:: @ 822EF76 - msgbox MtChimney_Text_22FE5E, 4 - hidemoneybox - nop - nop - release - end - -MtChimney_Movement_22EF83: @ 822EF83 - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_right - step_end - -MtChimney_Movement_22EF8B: @ 822EF8B - walk_left - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - step_end - -MtChimney_Movement_22EF94: @ 822EF94 - walk_up - walk_up - walk_up - walk_up - walk_up - walk_right - walk_right - step_end - -MtChimney_Movement_22EF9C: @ 822EF9C - walk_left - walk_left - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - step_end - -MtChimney_Movement_22EFA6: @ 822EFA6 - 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 - walk_down - walk_down - walk_down - walk_down - walk_left - walk_left - walk_left - walk_down - step_end - -MtChimney_Movement_22EFC1: @ 822EFC1 - 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 - 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 - 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 - 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 - 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 - delay_16 - walk_down - walk_left - walk_left - walk_left - walk_left - walk_in_place_fastest_down - step_end - -MtChimney_Movement_22F01D: @ 822F01D - 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 - walk_down - step_end - -MtChimney_Movement_22F02D: @ 822F02D - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - step_end - -MtChimney_Movement_22F035: @ 822F035 - 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 - 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 - lock_facing_direction - walk_fast_left - unlock_facing_direction - face_right - step_end - -MtChimney_Movement_22F04F: @ 822F04F - walk_left - walk_in_place_fastest_right - delay_16 - step_end - -MtChimney_EventScript_22F053:: @ 822F053 - msgbox MtChimney_Text_22FD1F, 3 - end - -MtChimney_EventScript_22F05C:: @ 822F05C - msgbox MtChimney_Text_22FD5B, 3 - end - -MtChimney_EventScript_22F065:: @ 822F065 - msgbox MtChimney_Text_22FDA1, 3 - end - -MtChimney_EventScript_22F06E:: @ 822F06E - trainerbattle 0, TRAINER_TABITHA_2, 0, MtChimney_Text_22F6AA, MtChimney_Text_22F72C - msgbox MtChimney_Text_22F76D, 6 - end - -MtChimney_EventScript_22F085:: @ 822F085 - trainerbattle 0, TRAINER_GRUNT_31, 0, MtChimney_Text_22F7A2, MtChimney_Text_22F83A - msgbox MtChimney_Text_22F859, 6 - end - -MtChimney_EventScript_22F09C:: @ 822F09C - msgbox MtChimney_Text_22F978, 3 - end - -MtChimney_EventScript_22F0A5:: @ 822F0A5 - msgbox MtChimney_Text_22F9B2, 3 - end - -MtChimney_EventScript_22F0AE:: @ 822F0AE - msgbox MtChimney_Text_22F9D1, 3 - end - -MtChimney_EventScript_22F0B7:: @ 822F0B7 - msgbox MtChimney_Text_22FA2F, 3 - end - -MtChimney_EventScript_22F0C0:: @ 822F0C0 - msgbox MtChimney_Text_22FA8B, 3 - end - -MtChimney_EventScript_22F0C9:: @ 822F0C9 - msgbox MtChimney_Text_22FAA5, 3 - end - -MtChimney_EventScript_22F0D2:: @ 822F0D2 - msgbox MtChimney_Text_22FACB, 3 - end - -MtChimney_EventScript_22F0DB:: @ 822F0DB - msgbox MtChimney_Text_22FDFC, 3 - end - -MtChimney_EventScript_22F0E4:: @ 822F0E4 - lockall - checkflag FLAG_0x08B - goto_if 0, MtChimney_EventScript_22F137 - checkflag FLAG_0x073 - goto_eq MtChimney_EventScript_22F12D - msgbox MtChimney_Text_22FF12, 5 - compare VAR_RESULT, 0 - goto_eq MtChimney_EventScript_22F123 - msgbox MtChimney_Text_22FF66, 4 - giveitem_std ITEM_METEORITE - setflag FLAG_0x073 - releaseall - end - -MtChimney_EventScript_22F123:: @ 822F123 - msgbox MtChimney_Text_22FF9C, 4 - releaseall - end - -MtChimney_EventScript_22F12D:: @ 822F12D - msgbox MtChimney_Text_22FFC0, 4 - releaseall - end - -MtChimney_EventScript_22F137:: @ 822F137 - msgbox MtChimney_Text_22FEAA, 4 - releaseall - end - -MtChimney_EventScript_22F141:: @ 822F141 - msgbox MtChimney_Text_22FFFA, 3 - end - -MtChimney_EventScript_22F14A:: @ 822F14A - trainerbattle 2, TRAINER_SHELBY_1, 0, MtChimney_Text_23001D, MtChimney_Text_230076, MtChimney_EventScript_22F176 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq MtChimney_EventScript_22F195 - msgbox MtChimney_Text_2300A2, 4 - release - end - -MtChimney_EventScript_22F176:: @ 822F176 - special sub_80B4808 - waitmovement 0 - msgbox MtChimney_Text_2300E3, 4 - setvar VAR_0x8004, 313 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 313 - callstd 8 - release - end - -MtChimney_EventScript_22F195:: @ 822F195 - trainerbattle 5, TRAINER_SHELBY_1, 0, MtChimney_Text_230153, MtChimney_Text_2301BB - msgbox MtChimney_Text_2301E7, 6 - end - -MtChimney_EventScript_22F1AC:: @ 822F1AC - trainerbattle 0, TRAINER_MELISSA, 0, MtChimney_Text_23022A, MtChimney_Text_23026D - msgbox MtChimney_Text_230292, 6 - end - -MtChimney_EventScript_22F1C3:: @ 822F1C3 - trainerbattle 0, TRAINER_SHEILA, 0, MtChimney_Text_2302BD, MtChimney_Text_230304 - msgbox MtChimney_Text_23033A, 6 - end - -MtChimney_EventScript_22F1DA:: @ 822F1DA - trainerbattle 0, TRAINER_SHIRLEY, 0, MtChimney_Text_2303DF, MtChimney_Text_230436 - msgbox MtChimney_Text_230463, 6 - end - -MtChimney_EventScript_22F1F1:: @ 822F1F1 - trainerbattle 0, TRAINER_GRUNT_24, 0, MtChimney_Text_22F8B6, MtChimney_Text_22F921 - msgbox MtChimney_Text_22F93A, 6 - end - -MtChimney_EventScript_22F208:: @ 822F208 - trainerbattle 2, TRAINER_SAWYER_1, 0, MtChimney_Text_2304B3, MtChimney_Text_2304F7, MtChimney_EventScript_22F234 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq MtChimney_EventScript_22F253 - msgbox MtChimney_Text_230519, 4 - release - end - -MtChimney_EventScript_22F234:: @ 822F234 - special sub_80B4808 - waitmovement 0 - msgbox MtChimney_Text_230557, 4 - setvar VAR_0x8004, 1 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 1 - callstd 8 - release - end - -MtChimney_EventScript_22F253:: @ 822F253 - trainerbattle 5, TRAINER_SAWYER_1, 0, MtChimney_Text_23059C, MtChimney_Text_2305E3 - msgbox MtChimney_Text_230614, 6 - end - -MtChimney_Text_22F26A: @ 822F26A - .string "The power contained in the METEORITE…\p" - .string "By amplifying its power with this\n" - .string "machine, MT. CHIMNEY’s volcanic\l" - .string "activity will instantly intensify…\p" - .string "Its energy will grow deep inside\n" - .string "the crater and…\l" - .string "Fufufu…$" - -MtChimney_Text_22F32E: @ 822F32E - .string "MAXIE: Hm?\n" - .string "Who are you?\p" - .string "… … … … … …\n" - .string "… … … … … …\p" - .string "I’d heard ARCHIE bemoaning a child\n" - .string "who’s been meddling in TEAM AQUA’s\l" - .string "affairs.\p" - .string "It must be you he meant.\p" - .string "Humph! So you’re thinking of\n" - .string "interfering with us, TEAM MAGMA?\p" - .string "Now you listen.\n" - .string "Long ago, living things used the\l" - .string "land to live and grow.\p" - .string "That is why land is all important!\n" - .string "It is the cradle of all!\p" - .string "That is why TEAM MAGMA is dedicated\n" - .string "to the expansion of the land mass.\p" - .string "It is for further advancement of\n" - .string "humankind and POKéMON!\p" - .string "And for that, we need the power of\n" - .string "what sleeps within this mountain…\p" - .string "Oh! There was no need for you to\n" - .string "learn that much.\p" - .string "But, no matter!\n" - .string "I’ll teach you the consequences of\l" - .string "meddling in our grand design!$" - -MtChimney_Text_22F5CF: @ 822F5CF - .string "What?!\p" - .string "I, MAXIE, was caught off guard?!$" - -MtChimney_Text_22F5F7: @ 822F5F7 - .string "MAXIE: But, enough.\n" - .string "I will back off this time.\p" - .string "But don’t think that this is the last\n" - .string "you’ve seen of TEAM MAGMA.\p" - .string "Fufufu…\p" - .string "Even without the METEORITE, if we\n" - .string "obtain that ORB… Fufufu…$" - -MtChimney_Text_22F6AA: @ 822F6AA - .string "Hehehe!\p" - .string "So you’ve come all the way here!\p" - .string "But you’re too late!\n" - .string "I’ve already delivered the METEORITE\l" - .string "from METEOR FALLS to the BOSS!$" - -MtChimney_Text_22F72C: @ 822F72C - .string "Hehehe…\p" - .string "Even though I’ve lost, if our leader\n" - .string "awakens that thing…$" - -MtChimney_Text_22F76D: @ 822F76D - .string "BOSS, hurry!\n" - .string "Give it the METEORITE’s energy!\p" - .string "Hehehe…$" - -MtChimney_Text_22F7A2: @ 822F7A2 - .string "We of TEAM MAGMA are working hard for\n" - .string "everyone’s sake.\p" - .string "Like, if that thing’s power made more\n" - .string "land, there’d be more places to live.\p" - .string "Everyone’d be happy!$" - -MtChimney_Text_22F83A: @ 822F83A - .string "Hunh?\n" - .string "What do you mean I lost?$" - -MtChimney_Text_22F859: @ 822F859 - .string "Our BOSS says, “It will make everyone\n" - .string "happy.â€\p" - .string "But why does everyone keep getting\n" - .string "in our way?$" - -MtChimney_Text_22F8B6: @ 822F8B6 - .string "If there were more land, I’d be able\n" - .string "to get a big house of my own!\p" - .string "I’m going to build it on hardened lava!$" - -MtChimney_Text_22F921: @ 822F921 - .string "My dream of a big house…$" - -MtChimney_Text_22F93A: @ 822F93A - .string "A kid like you, you ought to be\n" - .string "splashing about in the waves!$" - -MtChimney_Text_22F978: @ 822F978 - .string "That annoying TEAM AQUA…\n" - .string "They always mess with our plans!$" - -MtChimney_Text_22F9B2: @ 822F9B2 - .string "METEORITES pack amazing power!$" - -MtChimney_Text_22F9D1: @ 822F9D1 - .string "You’d better not mess with us!\p" - .string "We’re trying to awaken that thing\n" - .string "for the benefit of everyone!$" - -MtChimney_Text_22FA2F: @ 822FA2F - .string "We’re TEAM MAGMA!\p" - .string "They’re TEAM AQUA!\p" - .string "It totally annoys me that they’d\n" - .string "use a name like ours!$" - -MtChimney_Text_22FA8B: @ 822FA8B - .string "Yeah!\n" - .string "Douse them in fire!$" - -MtChimney_Text_22FAA5: @ 822FAA5 - .string "We’re going to keep making more land!$" - -MtChimney_Text_22FACB: @ 822FACB - .string "Bufoh!$" - -MtChimney_Text_22FAD2: @ 822FAD2 - .string "ARCHIE: Grr, {PLAYER}!\n" - .string "I should’ve guessed you’d show up!\p" - .string "See for yourself what the fanatics\n" - .string "of TEAM MAGMA are up to!\p" - .string "They’re trying to inject the stolen\n" - .string "METEORITE’s power into the volcano!\p" - .string "Doing something like that will cause\n" - .string "the volcano’s eruption!$" - -MtChimney_Text_22FBC7: @ 822FBC7 - .string "ARCHIE: Grrr…\p" - .string "I want to stop that MAXIE,\n" - .string "but I can’t!\p" - .string "Not when I have my hands full battling\n" - .string "three opponents at once!$" - -MtChimney_Text_22FC3D: @ 822FC3D - .string "ARCHIE: {PLAYER}!\n" - .string "Thank you!\p" - .string "With your help, we thwarted TEAM\n" - .string "MAGMA’s destructive plan!\p" - .string "But… You…\n" - .string "Whose side are you on?\p" - .string "Ah, it doesn’t matter.\p" - .string "We will remain vigilant and keep up\n" - .string "our pursuit of TEAM MAGMA.\p" - .string "{PLAYER}, we shall meet again!$" - -MtChimney_Text_22FD1F: @ 822FD1F - .string "Darn… TEAM MAGMA outnumbers us!\n" - .string "We can’t keep up with them!$" - -MtChimney_Text_22FD5B: @ 822FD5B - .string "If they expand the land, there’ll be\n" - .string "less habitats for WATER POKéMON!$" - -MtChimney_Text_22FDA1: @ 822FDA1 - .string "We’re TEAM AQUA!\p" - .string "They’re TEAM MAGMA!\p" - .string "It burns me up that they’d use such\n" - .string "a confusing name!$" - -MtChimney_Text_22FDFC: @ 822FDFC - .string "Bushaa!$" - -MtChimney_Text_22FE04: @ 822FE04 - .string "LAVA COOKIES are MT. CHIMNEY’s local\n" - .string "specialty.\p" - .string "Try one. It’s just Â¥200.$" - -MtChimney_Text_22FE4D: @ 822FE4D - .string "Thank you, dear!$" - -MtChimney_Text_22FE5E: @ 822FE5E - .string "Oh, dear. You can’t buy a thing if\n" - .string "you’ve not got the money.$" - -MtChimney_Text_22FE9B: @ 822FE9B - .string "Oh, fine then.$" - -MtChimney_Text_22FEAA: @ 822FEAA - .string "A METEORITE is fitted on a mysterious\n" - .string "machine…\p" - .string "The machine seems to be storing\n" - .string "energy in the METEORITE.$" - -MtChimney_Text_22FF12: @ 822FF12 - .string "A METEORITE is fitted on a mysterious\n" - .string "machine…\p" - .string "Do you want to remove the METEORITE?$" - -MtChimney_Text_22FF66: @ 822FF66 - .string "{PLAYER} removed the METEORITE from\n" - .string "the mysterious machine.$" - -MtChimney_Text_22FF9C: @ 822FF9C - .string "{PLAYER} left the METEORITE where\n" - .string "it was.$" - -MtChimney_Text_22FFC0: @ 822FFC0 - .string "This mysterious machine…\n" - .string "It makes no response whatsoever.$" - -MtChimney_Text_22FFFA: @ 822FFFA - .string "{0x7A} JAGGED PATH\n" - .string "LAVARIDGE TOWN AHEAD$" - -MtChimney_Text_23001D: @ 823001D - .string "I’ve been to the hot springs and\n" - .string "refreshed my tired bones.\l" - .string "Right now I’m feeling strong!$" - -MtChimney_Text_230076: @ 8230076 - .string "Oh, my goodness.\n" - .string "Now, aren’t you something!$" - -MtChimney_Text_2300A2: @ 82300A2 - .string "Well, well, I’ve lost. I can’t call\n" - .string "myself an EXPERT now, can I?$" - -MtChimney_Text_2300E3: @ 82300E3 - .string "Thank you, child. It was fun, as if\n" - .string "I were battling my own grandchild.\p" - .string "Please, come see me again for\n" - .string "a rematch.$" - -MtChimney_Text_230153: @ 8230153 - .string "If you can mesh your heart with those\n" - .string "of your POKéMON, why, you should be\l" - .string "able to achieve great things.$" - -MtChimney_Text_2301BB: @ 82301BB - .string "Oh, my goodness.\n" - .string "Now, aren’t you something!$" - -MtChimney_Text_2301E7: @ 82301E7 - .string "Perhaps your heart has become one\n" - .string "with the hearts of your POKéMON.$" - -MtChimney_Text_23022A: @ 823022A - .string "I’ve got the fire in me, baby.\n" - .string "I can’t stand it! I have to battle!$" - -MtChimney_Text_23026D: @ 823026D - .string "Ooh, that was a scorching-hot match!$" - -MtChimney_Text_230292: @ 8230292 - .string "The heat of MT. CHIMNEY warms\n" - .string "me up, baby!$" - -MtChimney_Text_2302BD: @ 82302BD - .string "I’ve finally made it to MT. CHIMNEY.\n" - .string "I want to make my POKéMON battle!$" - -MtChimney_Text_230304: @ 8230304 - .string "The way you battle…\n" - .string "It’s like a MT. CHIMNEY eruption!$" - -MtChimney_Text_23033A: @ 823033A - .string "Like I said, I’ve finally made it to\n" - .string "MT. CHIMNEY. It would be a shame if\l" - .string "I only do a little sightseeing…\p" - .string "I want to get in some battles and buy\n" - .string "COOKIES as souvenirs.$" - -MtChimney_Text_2303DF: @ 82303DF - .string "Since I bathed in the hot springs,\n" - .string "I’ve been feeling great!\l" - .string "I’m sure I’m going to win!$" - -MtChimney_Text_230436: @ 8230436 - .string "Yowch!\n" - .string "I’m getting a chill out of the water.$" - -MtChimney_Text_230463: @ 8230463 - .string "I’ll have to take another dip in the\n" - .string "hot springs. Want to join me?\p" - .string "Just joking!$" - -MtChimney_Text_2304B3: @ 82304B3 - .string "This is one fine mountain! Plenty of\n" - .string "hot people around for company!$" - -MtChimney_Text_2304F7: @ 82304F7 - .string "Oh, you’re a real firebrand, too!$" - -MtChimney_Text_230519: @ 8230519 - .string "I think I need a dip in LAVARIDGE\n" - .string "HOT SPRING with the locals!$" - -MtChimney_Text_230557: @ 8230557 - .string "I like little fireballs like you.\n" - .string "Let me register you in my POKéNAV.$" - -MtChimney_Text_23059C: @ 823059C - .string "I’m happily surrounded by hot people\n" - .string "around these parts. I won’t lose!$" - -MtChimney_Text_2305E3: @ 82305E3 - .string "Gosh, you’re still the same\n" - .string "firebrand as before!$" - -MtChimney_Text_230614: @ 8230614 - .string "Actually, it really is hot here.\n" - .string "I’m overdressed for these parts.$" - diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc deleted file mode 100644 index b6c2118db..000000000 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ /dev/null @@ -1,98 +0,0 @@ -MtChimney_CableCarStation_MapScripts:: @ 822ABFA - map_script 3, MtChimney_CableCarStation_MapScript1_22AC05 - map_script 2, MtChimney_CableCarStation_MapScript2_22AC1D - .byte 0 - -MtChimney_CableCarStation_MapScript1_22AC05: @ 822AC05 - compare VAR_0x40A3, 1 - call_if 1, MtChimney_CableCarStation_EventScript_22AC11 - end - -MtChimney_CableCarStation_EventScript_22AC11:: @ 822AC11 - setobjectxyperm 1, 5, 4 - setobjectmovementtype 1, 10 - return - -MtChimney_CableCarStation_MapScript2_22AC1D: @ 822AC1D - map_script_2 VAR_0x40A3, 1, MtChimney_CableCarStation_EventScript_22AC27 - .2byte 0 - -MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27 - lockall - applymovement 255, MtChimney_CableCarStation_Movement_22ACB4 - applymovement 1, MtChimney_CableCarStation_Movement_22ACAA - waitmovement 0 - setvar VAR_0x40A3, 0 - setobjectxyperm 1, 6, 7 - setobjectmovementtype 1, 8 - releaseall - end - -MtChimney_CableCarStation_EventScript_22AC4B:: @ 822AC4B - lock - faceplayer - msgbox MtChimney_CableCarStation_Text_22ACB9, 5 - compare VAR_RESULT, 1 - goto_eq MtChimney_CableCarStation_EventScript_22AC6C - compare VAR_RESULT, 0 - goto_eq MtChimney_CableCarStation_EventScript_22AC9B - end - -MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C - msgbox MtChimney_CableCarStation_Text_22ACF8, 4 - closemessage - applymovement 1, MtChimney_CableCarStation_Movement_22ACA5 - applymovement 255, MtChimney_CableCarStation_Movement_22ACAF - waitmovement 0 - setvar VAR_0x8004, 1 - setvar VAR_0x40A3, 2 - incrementgamestat 48 - special CableCarWarp - special sub_814FC9C - waitstate - release - end - -MtChimney_CableCarStation_EventScript_22AC9B:: @ 822AC9B - msgbox MtChimney_CableCarStation_Text_22AD0E, 4 - release - end - -MtChimney_CableCarStation_Movement_22ACA5: @ 822ACA5 - walk_up - walk_up - walk_left - walk_in_place_fastest_right - step_end - -MtChimney_CableCarStation_Movement_22ACAA: @ 822ACAA - delay_16 - walk_right - walk_down - walk_down - step_end - -MtChimney_CableCarStation_Movement_22ACAF: @ 822ACAF - walk_up - walk_up - walk_up - delay_16 - step_end - -MtChimney_CableCarStation_Movement_22ACB4: @ 822ACB4 - walk_down - walk_down - walk_down - delay_16 - step_end - -MtChimney_CableCarStation_Text_22ACB9: @ 822ACB9 - .string "The CABLE CAR is ready to go down.\n" - .string "Would you like to be on it?$" - -MtChimney_CableCarStation_Text_22ACF8: @ 822ACF8 - .string "Please step this way.$" - -MtChimney_CableCarStation_Text_22AD0E: @ 822AD0E - .string "Please ride with us another time.$" - diff --git a/data/scripts/maps/MtPyre_1F.inc b/data/scripts/maps/MtPyre_1F.inc deleted file mode 100644 index 51c8a88fb..000000000 --- a/data/scripts/maps/MtPyre_1F.inc +++ /dev/null @@ -1,49 +0,0 @@ -MtPyre_1F_MapScripts:: @ 8230F3E - .byte 0 - -MtPyre_1F_EventScript_230F3F:: @ 8230F3F - lock - faceplayer - checkflag FLAG_0x11A - goto_eq MtPyre_1F_EventScript_230F6E - msgbox MtPyre_1F_Text_230F8A, 4 - giveitem_std ITEM_CLEANSE_TAG - compare VAR_RESULT, 0 - goto_eq MtPyre_1F_EventScript_272054 - setflag FLAG_0x11A - release - end - -MtPyre_1F_EventScript_230F6E:: @ 8230F6E - msgbox MtPyre_1F_Text_231005, 4 - release - end - -MtPyre_1F_EventScript_230F78:: @ 8230F78 - msgbox MtPyre_1F_Text_23104F, 2 - end - -MtPyre_1F_EventScript_230F81:: @ 8230F81 - msgbox MtPyre_1F_Text_2310BA, 2 - end - -MtPyre_1F_Text_230F8A: @ 8230F8A - .string "All sorts of beings wander the slopes\n" - .string "of MT. PYRE…\p" - .string "There is no telling what may happen.\n" - .string "Take this. It’s for your own good.$" - -MtPyre_1F_Text_231005: @ 8231005 - .string "Have a POKéMON hold that\n" - .string "CLEANSE TAG.\p" - .string "It will help ward off wild POKéMON.$" - -MtPyre_1F_Text_23104F: @ 823104F - .string "Did you come to pay your respect\n" - .string "to the spirits of departed POKéMON?\p" - .string "You must care for your POKéMON a lot.$" - -MtPyre_1F_Text_2310BA: @ 82310BA - .string "This is the final resting place of my\n" - .string "ZIGZAGOON. I cherished it…$" - diff --git a/data/scripts/maps/MtPyre_2F.inc b/data/scripts/maps/MtPyre_2F.inc deleted file mode 100644 index de8520954..000000000 --- a/data/scripts/maps/MtPyre_2F.inc +++ /dev/null @@ -1,135 +0,0 @@ -MtPyre_2F_MapScripts:: @ 82310FB - map_script 2, MtPyre_2F_MapScript2_2A8327 - map_script 3, MtPyre_2F_MapScript1_2A8331 - map_script 5, MtPyre_2F_MapScript1_23110B - .byte 0 - -MtPyre_2F_MapScript1_23110B: @ 823110B - setstepcallback 7 - setholewarp MAP_MT_PYRE_1F, 255, 0, 0 - end - -MtPyre_2F_EventScript_231116:: @ 8231116 - msgbox MtPyre_2F_Text_2311A3, 2 - end - -MtPyre_2F_EventScript_23111F:: @ 823111F - msgbox MtPyre_2F_Text_2311E6, 2 - end - -MtPyre_2F_EventScript_231128:: @ 8231128 - trainerbattle 0, TRAINER_MARK, 0, MtPyre_2F_Text_231258, MtPyre_2F_Text_2312A2 - msgbox MtPyre_2F_Text_2312CB, 6 - end - -MtPyre_2F_EventScript_23113F:: @ 823113F - trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_23130F, MtPyre_2F_Text_2313A1, MtPyre_2F_Text_231414 - msgbox MtPyre_2F_Text_2313B1, 6 - end - -MtPyre_2F_EventScript_23115A:: @ 823115A - trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_231492, MtPyre_2F_Text_231534, MtPyre_2F_Text_231582 - msgbox MtPyre_2F_Text_23154D, 6 - end - -MtPyre_2F_EventScript_231175:: @ 8231175 - trainerbattle 0, TRAINER_LEAH, 0, MtPyre_2F_Text_231604, MtPyre_2F_Text_231645 - msgbox MtPyre_2F_Text_23165A, 6 - end - -MtPyre_2F_EventScript_23118C:: @ 823118C - trainerbattle 0, TRAINER_ZANDER, 0, MtPyre_2F_Text_2316C7, MtPyre_2F_Text_2316E1 - msgbox MtPyre_2F_Text_2316FB, 6 - end - -MtPyre_2F_Text_2311A3: @ 82311A3 - .string "Memories of my darling SKITTY…\n" - .string "My eyes overflow thinking about it.$" - -MtPyre_2F_Text_2311E6: @ 82311E6 - .string "Ooch, ouch… There are holes in the\n" - .string "ground here and there.\p" - .string "I didn’t notice and took a tumble from\n" - .string "the floor above.$" - -MtPyre_2F_Text_231258: @ 8231258 - .string "Hey! Are you searching for POKéMON?\n" - .string "You came along after me! You’re rude!$" - -MtPyre_2F_Text_2312A2: @ 82312A2 - .string "Ayieeeeh!\n" - .string "I’m sorry, forgive me, please!$" - -MtPyre_2F_Text_2312CB: @ 82312CB - .string "People don’t come here often, so\n" - .string "I thought there’d be rare POKéMON.$" - -MtPyre_2F_Text_23130F: @ 823130F - .string "LUKE: We’re here on a dare.\p" - .string "Heheh, if I show her how cool I am,\n" - .string "she’ll fall for me. I know it!\p" - .string "I know! I’ll cream you and show her\n" - .string "how cool I am!$" - -MtPyre_2F_Text_2313A1: @ 82313A1 - .string "LUKE: Whoopsie!$" - -MtPyre_2F_Text_2313B1: @ 82313B1 - .string "LUKE: Well, we lost but that’s okay!\n" - .string "I’m right here by your side.\l" - .string "We’ll make it through this dare!$" - -MtPyre_2F_Text_231414: @ 8231414 - .string "LUKE: If you want to take me on,\n" - .string "bring some more POKéMON.\p" - .string "If you don’t, I won’t be able to show\n" - .string "off to my girl how cool I am!$" - -MtPyre_2F_Text_231492: @ 8231492 - .string "DEZ: I came here on a dare with my\n" - .string "boyfriend.\p" - .string "It’s really scary, but I’m with my\n" - .string "boyfriend. It’s okay.\p" - .string "I know! I’ll get my boyfriend to look\n" - .string "cool by beating you!$" - -MtPyre_2F_Text_231534: @ 8231534 - .string "DEZ: Waaaah! I’m scared!$" - -MtPyre_2F_Text_23154D: @ 823154D - .string "DEZ: We’re lovey-dovey, so we don’t\n" - .string "care if we lose!$" - -MtPyre_2F_Text_231582: @ 8231582 - .string "DEZ: If you want to challenge us, you\n" - .string "should bring at least two POKéMON.\p" - .string "My boyfriend’s strong.\n" - .string "Just one POKéMON won’t do at all.$" - -MtPyre_2F_Text_231604: @ 8231604 - .string "You are an unfamiliar sight…\n" - .string "Depart before anything befalls you!$" - -MtPyre_2F_Text_231645: @ 8231645 - .string "Hmm…\n" - .string "You’re durable.$" - -MtPyre_2F_Text_23165A: @ 823165A - .string "Our family has been TRAINERS here\n" - .string "since my great-grandmother’s time…\p" - .string "It is my duty to protect this\n" - .string "mountain…$" - -MtPyre_2F_Text_2316C7: @ 82316C7 - .string "Kiyaaaaah!\n" - .string "I’m terrified!$" - -MtPyre_2F_Text_2316E1: @ 82316E1 - .string "Nooooooo!\n" - .string "I lost my wits!$" - -MtPyre_2F_Text_2316FB: @ 82316FB - .string "I get freaked out every time I see\n" - .string "anything move…\p" - .string "I shouldn’t have come here to train…$" - diff --git a/data/scripts/maps/MtPyre_3F.inc b/data/scripts/maps/MtPyre_3F.inc deleted file mode 100644 index ec5373509..000000000 --- a/data/scripts/maps/MtPyre_3F.inc +++ /dev/null @@ -1,103 +0,0 @@ -MtPyre_3F_MapScripts:: @ 8231752 - .byte 0 - -MtPyre_3F_EventScript_231753:: @ 8231753 - trainerbattle 0, TRAINER_WILLIAM, 0, MtPyre_3F_Text_2317E3, MtPyre_3F_Text_231853 - msgbox MtPyre_3F_Text_231869, 6 - end - -MtPyre_3F_EventScript_23176A:: @ 823176A - trainerbattle 0, TRAINER_KAYLA, 0, MtPyre_3F_Text_2318A1, MtPyre_3F_Text_2318DD - msgbox MtPyre_3F_Text_2318F2, 6 - end - -MtPyre_3F_EventScript_231781:: @ 8231781 - trainerbattle 2, TRAINER_GABRIELLE_1, 0, MtPyre_3F_Text_231952, MtPyre_3F_Text_23196A, MtPyre_3F_EventScript_2317AD - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq MtPyre_3F_EventScript_2317CC - msgbox MtPyre_3F_Text_23199B, 4 - release - end - -MtPyre_3F_EventScript_2317AD:: @ 82317AD - special sub_80B4808 - waitmovement 0 - msgbox MtPyre_3F_Text_231A49, 4 - setvar VAR_0x8004, 9 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 9 - callstd 8 - release - end - -MtPyre_3F_EventScript_2317CC:: @ 82317CC - trainerbattle 5, TRAINER_GABRIELLE_1, 0, MtPyre_3F_Text_231AAB, MtPyre_3F_Text_231AE6 - msgbox MtPyre_3F_Text_231B0D, 6 - end - -MtPyre_3F_Text_2317E3: @ 82317E3 - .string "The rich atmosphere of the mountain\n" - .string "has elevated my psychic power!\p" - .string "A mere child like you…\n" - .string "You dream of winning?$" - -MtPyre_3F_Text_231853: @ 8231853 - .string "I drown in self-pity…$" - -MtPyre_3F_Text_231869: @ 8231869 - .string "My psychic powers have surely\n" - .string "grown several times, but…$" - -MtPyre_3F_Text_2318A1: @ 82318A1 - .string "Ahahahaha!\p" - .string "This is no place for children, least\n" - .string "of all you!$" - -MtPyre_3F_Text_2318DD: @ 82318DD - .string "I lost that cleanly…$" - -MtPyre_3F_Text_2318F2: @ 82318F2 - .string "This means my training is still not\n" - .string "enough…\p" - .string "I’ve got to keep working toward the\n" - .string "summit…\p" - .string "Go, me!$" - -MtPyre_3F_Text_231952: @ 8231952 - .string "Why have you come here?$" - -MtPyre_3F_Text_23196A: @ 823196A - .string "That was amazing!\n" - .string "You’re a very special TRAINER.$" - -MtPyre_3F_Text_23199B: @ 823199B - .string "POKéMON no longer of this world.\n" - .string "POKéMON that are with you now.\p" - .string "And the POKéMON that you will meet\n" - .string "in the future…\p" - .string "They are all to be equally cherished.\n" - .string "Please remember that.$" - -MtPyre_3F_Text_231A49: @ 8231A49 - .string "I would like to see your POKéMON\n" - .string "when they grow up some more…\p" - .string "Please, I need to see your POKéNAV.$" - -MtPyre_3F_Text_231AAB: @ 8231AAB - .string "Oh, it’s you…\p" - .string "Have you come to show me your grown\n" - .string "POKéMON?$" - -MtPyre_3F_Text_231AE6: @ 8231AE6 - .string "How amazing!\n" - .string "You are a special person.$" - -MtPyre_3F_Text_231B0D: @ 8231B0D - .string "POKéMON no longer of this world.\n" - .string "POKéMON that are with you now.\p" - .string "And the POKéMON that you will meet\n" - .string "in the future…\p" - .string "They are all to be equally cherished.\n" - .string "I see that you’ve remembered that.$" - diff --git a/data/scripts/maps/MtPyre_4F.inc b/data/scripts/maps/MtPyre_4F.inc deleted file mode 100644 index 0573e0f11..000000000 --- a/data/scripts/maps/MtPyre_4F.inc +++ /dev/null @@ -1,20 +0,0 @@ -MtPyre_4F_MapScripts:: @ 8231BC8 - .byte 0 - -MtPyre_5F_EventScript_231BC9:: @ 8231BC9 - trainerbattle 0, TRAINER_ATSUSHI, 0, MtPyre_5F_Text_231BE0, MtPyre_5F_Text_231C08 - msgbox MtPyre_5F_Text_231C24, 6 - end - -MtPyre_5F_Text_231BE0: @ 8231BE0 - .string "Teacher…\n" - .string "Please watch over my progress!$" - -MtPyre_5F_Text_231C08: @ 8231C08 - .string "Teacher…\n" - .string "Please forgive me!$" - -MtPyre_5F_Text_231C24: @ 8231C24 - .string "Until I improve, my teacher, who rests\n" - .string "here, will never find true peace…$" - diff --git a/data/scripts/maps/MtPyre_5F.inc b/data/scripts/maps/MtPyre_5F.inc deleted file mode 100644 index 4678ac7e0..000000000 --- a/data/scripts/maps/MtPyre_5F.inc +++ /dev/null @@ -1,23 +0,0 @@ -MtPyre_5F_MapScripts:: @ 8231C6D - .byte 0 - -MtPyre_4F_EventScript_231C6E:: @ 8231C6E - trainerbattle 0, TRAINER_TASHA, 0, MtPyre_4F_Text_231C85, MtPyre_4F_Text_231CDB - msgbox MtPyre_4F_Text_231CEE, 6 - end - -MtPyre_4F_Text_231C85: @ 8231C85 - .string "I love all things horrifying…\n" - .string "It’s like a disease…\p" - .string "When I’m here…\n" - .string "I shiver with fear…$" - -MtPyre_4F_Text_231CDB: @ 8231CDB - .string "Losing, I dislike…$" - -MtPyre_4F_Text_231CEE: @ 8231CEE - .string "I want to see dreadful things…\n" - .string "I can’t leave…\p" - .string "Stay…\n" - .string "Won’t you stay with me?$" - diff --git a/data/scripts/maps/MtPyre_6F.inc b/data/scripts/maps/MtPyre_6F.inc deleted file mode 100644 index 8d5d912c2..000000000 --- a/data/scripts/maps/MtPyre_6F.inc +++ /dev/null @@ -1,73 +0,0 @@ -MtPyre_6F_MapScripts:: @ 8231D3A - .byte 0 - -MtPyre_6F_EventScript_231D3B:: @ 8231D3B - trainerbattle 2, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_231DB4, MtPyre_6F_Text_231DE2, MtPyre_6F_EventScript_231D67 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq MtPyre_6F_EventScript_231D86 - msgbox MtPyre_6F_Text_231DFC, 4 - release - end - -MtPyre_6F_EventScript_231D67:: @ 8231D67 - special sub_80B4808 - waitmovement 0 - msgbox MtPyre_6F_Text_231E43, 4 - setvar VAR_0x8004, 108 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 108 - callstd 8 - release - end - -MtPyre_6F_EventScript_231D86:: @ 8231D86 - trainerbattle 5, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_231EB3, MtPyre_6F_Text_231ECB - msgbox MtPyre_6F_Text_231EE1, 6 - end - -MtPyre_6F_EventScript_231D9D:: @ 8231D9D - trainerbattle 0, TRAINER_CEDRIC, 0, MtPyre_6F_Text_231F11, MtPyre_6F_Text_231F4A - msgbox MtPyre_6F_Text_231F5C, 6 - end - -MtPyre_6F_Text_231DB4: @ 8231DB4 - .string "When I’m here…\n" - .string "A curious power flows into me…$" - -MtPyre_6F_Text_231DE2: @ 8231DE2 - .string "The power is ebbing away…$" - -MtPyre_6F_Text_231DFC: @ 8231DFC - .string "Perhaps the power is from the spirits\n" - .string "of POKéMON in fitful sleep here…$" - -MtPyre_6F_Text_231E43: @ 8231E43 - .string "Fufufu… I lost the match, but…\n" - .string "I have this little ability…\p" - .string "Without ever laying my hands on\n" - .string "your POKéNAV… Hiyah!$" - -MtPyre_6F_Text_231EB3: @ 8231EB3 - .string "Behind you…\n" - .string "What is it…$" - -MtPyre_6F_Text_231ECB: @ 8231ECB - .string "Something faded away…$" - -MtPyre_6F_Text_231EE1: @ 8231EE1 - .string "The POKéMON at rest here…\n" - .string "Sometimes, they play…$" - -MtPyre_6F_Text_231F11: @ 8231F11 - .string "Have you lost your bearings?\n" - .string "Have no fear for I am here!$" - -MtPyre_6F_Text_231F4A: @ 8231F4A - .string "Weren’t you lost?$" - -MtPyre_6F_Text_231F5C: @ 8231F5C - .string "I had this feeling that a lost TRAINER\n" - .string "would be panicked and easy to beat.\p" - .string "It’s dirty and I won’t try it again…$" - diff --git a/data/scripts/maps/MtPyre_Exterior.inc b/data/scripts/maps/MtPyre_Exterior.inc deleted file mode 100644 index 8f757ebb4..000000000 --- a/data/scripts/maps/MtPyre_Exterior.inc +++ /dev/null @@ -1,28 +0,0 @@ -MtPyre_Exterior_MapScripts:: @ 8231FCC - map_script 3, MtPyre_Exterior_MapScript1_231FD2 - .byte 0 - -MtPyre_Exterior_MapScript1_231FD2: @ 8231FD2 - call MtPyre_Exterior_EventScript_231FD8 - end - -MtPyre_Exterior_EventScript_231FD8:: @ 8231FD8 - getplayerxy VAR_TEMP_0, VAR_TEMP_1 - compare VAR_TEMP_1, 12 - goto_if 0, MtPyre_Exterior_EventScript_231FE9 - return - -MtPyre_Exterior_EventScript_231FE9:: @ 8231FE9 - setweather 6 - return - -MtPyre_Exterior_EventScript_231FED:: @ 8231FED - setweather 6 - doweather - end - -MtPyre_Exterior_EventScript_231FF2:: @ 8231FF2 - setweather 2 - doweather - end - diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc deleted file mode 100644 index fe39e9d48..000000000 --- a/data/scripts/maps/MtPyre_Summit.inc +++ /dev/null @@ -1,640 +0,0 @@ -MtPyre_Summit_MapScripts:: @ 8231FF7 - map_script 3, MtPyre_Summit_MapScript1_231FFD - .byte 0 - -MtPyre_Summit_MapScript1_231FFD: @ 8231FFD - compare VAR_0x40B9, 2 - call_if 1, MtPyre_Summit_EventScript_232009 - end - -MtPyre_Summit_EventScript_232009:: @ 8232009 - setobjectxyperm 8, 23, 6 - setobjectxyperm 2, 22, 6 - end - -MtPyre_Summit_EventScript_232018:: @ 8232018 - lockall - setvar VAR_0x8008, 0 - goto MtPyre_Summit_EventScript_23203C - end - -MtPyre_Summit_EventScript_232024:: @ 8232024 - lockall - setvar VAR_0x8008, 1 - goto MtPyre_Summit_EventScript_23203C - end - -MtPyre_Summit_EventScript_232030:: @ 8232030 - lockall - setvar VAR_0x8008, 2 - goto MtPyre_Summit_EventScript_23203C - end - -MtPyre_Summit_EventScript_23203C:: @ 823203C - playbgm MUS_AQA_0, 0 - applymovement 255, MtPyre_Summit_Movement_2725B2 - waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_2725AA - waitmovement 0 - delay 50 - compare VAR_0x8008, 0 - call_if 1, MtPyre_Summit_EventScript_2320E0 - compare VAR_0x8008, 1 - call_if 1, MtPyre_Summit_EventScript_2320EB - compare VAR_0x8008, 2 - call_if 1, MtPyre_Summit_EventScript_2320EC - msgbox MtPyre_Summit_Text_23281A, 4 - closemessage - fadescreen 1 - removeobject 2 - removeobject 4 - removeobject 5 - removeobject 6 - removeobject 7 - setflag FLAG_0x394 - setflag FLAG_0x395 - fadedefaultbgm - fadescreen 0 - delay 20 - setvar VAR_0x40B9, 1 - compare VAR_0x8008, 0 - call_if 1, MtPyre_Summit_EventScript_2320F7 - compare VAR_0x8008, 1 - call_if 1, MtPyre_Summit_EventScript_23210C - compare VAR_0x8008, 2 - call_if 1, MtPyre_Summit_EventScript_232117 - msgbox MtPyre_Summit_Text_23290E, 4 - giveitem_std ITEM_MAGMA_EMBLEM - setflag FLAG_0x0D4 - setflag FLAG_0x34F - releaseall - end - -MtPyre_Summit_EventScript_2320E0:: @ 82320E0 - applymovement 2, MtPyre_Summit_Movement_232136 - waitmovement 0 - return - -MtPyre_Summit_EventScript_2320EB:: @ 82320EB - return - -MtPyre_Summit_EventScript_2320EC:: @ 82320EC - applymovement 2, MtPyre_Summit_Movement_232139 - waitmovement 0 - return - -MtPyre_Summit_EventScript_2320F7:: @ 82320F7 - applymovement 3, MtPyre_Summit_Movement_23212C - waitmovement 0 - applymovement 255, MtPyre_Summit_Movement_2725A8 - waitmovement 0 - return - -MtPyre_Summit_EventScript_23210C:: @ 823210C - applymovement 3, MtPyre_Summit_Movement_232130 - waitmovement 0 - return - -MtPyre_Summit_EventScript_232117:: @ 8232117 - applymovement 3, MtPyre_Summit_Movement_232132 - waitmovement 0 - applymovement 255, MtPyre_Summit_Movement_2725A4 - waitmovement 0 - return - -MtPyre_Summit_Movement_23212C: @ 823212C - walk_down - walk_down - walk_in_place_fastest_left - step_end - -MtPyre_Summit_Movement_232130: @ 8232130 - walk_down - step_end - -MtPyre_Summit_Movement_232132: @ 8232132 - walk_down - walk_down - walk_in_place_fastest_right - step_end - -MtPyre_Summit_Movement_232136: @ 8232136 - walk_left - walk_in_place_fastest_down - step_end - -MtPyre_Summit_Movement_232139: @ 8232139 - walk_right - walk_in_place_fastest_down - step_end - -MtPyre_Summit_EventScript_23213C:: @ 823213C - lock - faceplayer - checkflag FLAG_0x09E - goto_eq MtPyre_Summit_EventScript_232167 - msgbox MtPyre_Summit_Text_232E0C, 5 - compare VAR_RESULT, 1 - call_if 1, MtPyre_Summit_EventScript_232187 - compare VAR_RESULT, 0 - call_if 1, MtPyre_Summit_EventScript_232190 - release - end - -MtPyre_Summit_EventScript_232167:: @ 8232167 - msgbox MtPyre_Summit_Text_2331A6, 5 - compare VAR_RESULT, 1 - call_if 1, MtPyre_Summit_EventScript_232199 - compare VAR_RESULT, 0 - call_if 1, MtPyre_Summit_EventScript_232190 - release - end - -MtPyre_Summit_EventScript_232187:: @ 8232187 - msgbox MtPyre_Summit_Text_232F27, 4 - return - -MtPyre_Summit_EventScript_232190:: @ 8232190 - msgbox MtPyre_Summit_Text_233162, 4 - return - -MtPyre_Summit_EventScript_232199:: @ 8232199 - msgbox MtPyre_Summit_Text_23325D, 4 - return - -MtPyre_Summit_EventScript_2321A2:: @ 82321A2 - lock - faceplayer - checkflag FLAG_0x103 - goto_eq MtPyre_Summit_EventScript_2321E2 - compare VAR_0x40B9, 3 - call_if 4, MtPyre_Summit_EventScript_2321CB - checkflag FLAG_0x081 - goto_eq MtPyre_Summit_EventScript_2321D8 - msgbox MtPyre_Summit_Text_232AD8, 4 - release - end - -MtPyre_Summit_EventScript_2321CB:: @ 82321CB - msgbox MtPyre_Summit_Text_232CA6, 4 - setflag FLAG_0x103 - release - end - -MtPyre_Summit_EventScript_2321D8:: @ 82321D8 - msgbox MtPyre_Summit_Text_232B4F, 4 - release - end - -MtPyre_Summit_EventScript_2321E2:: @ 82321E2 - msgbox MtPyre_Summit_Text_232D1E, 4 - release - end - -MtPyre_Summit_EventScript_2321EC:: @ 82321EC - lockall - setvar VAR_0x8008, 0 - goto MtPyre_Summit_EventScript_232210 - end - -MtPyre_Summit_EventScript_2321F8:: @ 82321F8 - lockall - setvar VAR_0x8008, 1 - goto MtPyre_Summit_EventScript_232210 - end - -MtPyre_Summit_EventScript_232204:: @ 8232204 - lockall - setvar VAR_0x8008, 2 - goto MtPyre_Summit_EventScript_232210 - end - -MtPyre_Summit_EventScript_232210:: @ 8232210 - applymovement 255, MtPyre_Summit_Movement_2725A6 - waitmovement 0 - delay 60 - compare VAR_0x8008, 0 - call_if 1, MtPyre_Summit_EventScript_2322C4 - compare VAR_0x8008, 1 - call_if 1, MtPyre_Summit_EventScript_2322DD - compare VAR_0x8008, 2 - call_if 1, MtPyre_Summit_EventScript_2322F6 - playse SE_PIN - applymovement 8, MtPyre_Summit_Movement_272598 - waitmovement 0 - applymovement 8, MtPyre_Summit_Movement_27259A - waitmovement 0 - delay 30 - compare VAR_0x8008, 0 - call_if 1, MtPyre_Summit_EventScript_23230F - compare VAR_0x8008, 1 - call_if 1, MtPyre_Summit_EventScript_232328 - compare VAR_0x8008, 2 - call_if 1, MtPyre_Summit_EventScript_232341 - msgbox MtPyre_Summit_Text_233183, 4 - closemessage - compare VAR_0x8008, 0 - call_if 1, MtPyre_Summit_EventScript_23235A - compare VAR_0x8008, 1 - call_if 1, MtPyre_Summit_EventScript_232376 - compare VAR_0x8008, 2 - call_if 1, MtPyre_Summit_EventScript_232392 - delay 30 - applymovement 2, MtPyre_Summit_Movement_2323B6 - applymovement 8, MtPyre_Summit_Movement_2323BD - waitmovement 0 - removeobject 2 - removeobject 8 - setvar VAR_0x40B9, 3 - releaseall - end - -MtPyre_Summit_EventScript_2322C4:: @ 82322C4 - applymovement 255, MtPyre_Summit_Movement_2323C4 - applymovement 2, MtPyre_Summit_Movement_2323B6 - applymovement 8, MtPyre_Summit_Movement_2323BD - waitmovement 0 - return - -MtPyre_Summit_EventScript_2322DD:: @ 82322DD - applymovement 255, MtPyre_Summit_Movement_2323CB - applymovement 2, MtPyre_Summit_Movement_2323B6 - applymovement 8, MtPyre_Summit_Movement_2323BD - waitmovement 0 - return - -MtPyre_Summit_EventScript_2322F6:: @ 82322F6 - applymovement 255, MtPyre_Summit_Movement_2323D2 - applymovement 2, MtPyre_Summit_Movement_2323B6 - applymovement 8, MtPyre_Summit_Movement_2323BD - waitmovement 0 - return - -MtPyre_Summit_EventScript_23230F:: @ 823230F - applymovement 255, MtPyre_Summit_Movement_2323AE - applymovement 2, MtPyre_Summit_Movement_2323E7 - applymovement 8, MtPyre_Summit_Movement_2323D8 - waitmovement 0 - return - -MtPyre_Summit_EventScript_232328:: @ 8232328 - applymovement 255, MtPyre_Summit_Movement_2323B2 - applymovement 2, MtPyre_Summit_Movement_2323E7 - applymovement 8, MtPyre_Summit_Movement_2323DD - waitmovement 0 - return - -MtPyre_Summit_EventScript_232341:: @ 8232341 - applymovement 255, MtPyre_Summit_Movement_2323B2 - applymovement 2, MtPyre_Summit_Movement_2323E7 - applymovement 8, MtPyre_Summit_Movement_2323E2 - waitmovement 0 - return - -MtPyre_Summit_EventScript_23235A:: @ 823235A - applymovement 255, MtPyre_Summit_Movement_2323EA - applymovement 8, MtPyre_Summit_Movement_2323ED - waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_2725A8 - waitmovement 0 - return - -MtPyre_Summit_EventScript_232376:: @ 8232376 - applymovement 255, MtPyre_Summit_Movement_2323EA - applymovement 8, MtPyre_Summit_Movement_2323F3 - waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_2725A8 - waitmovement 0 - return - -MtPyre_Summit_EventScript_232392:: @ 8232392 - applymovement 255, MtPyre_Summit_Movement_2323EA - applymovement 8, MtPyre_Summit_Movement_2323F8 - waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_2725A8 - waitmovement 0 - return - -MtPyre_Summit_Movement_2323AE: @ 82323AE - delay_16 - delay_16 - walk_in_place_fastest_right - step_end - -MtPyre_Summit_Movement_2323B2: @ 82323B2 - delay_16 - delay_16 - walk_in_place_fastest_left - step_end - -MtPyre_Summit_Movement_2323B6: @ 82323B6 - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - step_end - -MtPyre_Summit_Movement_2323BD: @ 82323BD - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - step_end - -MtPyre_Summit_Movement_2323C4: @ 82323C4 - 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 - 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 - delay_16 - delay_8 - walk_in_place_fastest_left - delay_16 - walk_in_place_fastest_down - step_end - -MtPyre_Summit_Movement_2323D8: @ 82323D8 - walk_up - walk_up - walk_up - walk_left - step_end - -MtPyre_Summit_Movement_2323DD: @ 82323DD - walk_up - walk_up - walk_up - walk_in_place_fastest_right - step_end - -MtPyre_Summit_Movement_2323E2: @ 82323E2 - walk_up - walk_up - walk_up - walk_in_place_fastest_right - step_end - -MtPyre_Summit_Movement_2323E7: @ 82323E7 - delay_16 - walk_in_place_fastest_up - step_end - -MtPyre_Summit_Movement_2323EA: @ 82323EA - delay_16 - walk_in_place_fastest_down - step_end - -MtPyre_Summit_Movement_2323ED: @ 82323ED - walk_down - walk_right - walk_down - walk_down - walk_in_place_fastest_left - step_end - -MtPyre_Summit_Movement_2323F3: @ 82323F3 - walk_down - walk_down - walk_down - walk_in_place_fastest_left - step_end - -MtPyre_Summit_Movement_2323F8: @ 82323F8 - walk_down - walk_down - walk_down - walk_in_place_fastest_left - step_end - -MtPyre_Summit_EventScript_2323FD:: @ 82323FD - trainerbattle 0, TRAINER_GRUNT_17, 0, MtPyre_Summit_Text_232459, MtPyre_Summit_Text_2324A0 - msgbox MtPyre_Summit_Text_2324E0, 6 - end - -MtPyre_Summit_EventScript_232414:: @ 8232414 - trainerbattle 0, TRAINER_GRUNT_18, 0, MtPyre_Summit_Text_232513, MtPyre_Summit_Text_2325B0 - msgbox MtPyre_Summit_Text_2325E4, 6 - end - -MtPyre_Summit_EventScript_23242B:: @ 823242B - trainerbattle 0, TRAINER_GRUNT_19, 0, MtPyre_Summit_Text_23261D, MtPyre_Summit_Text_232678 - msgbox MtPyre_Summit_Text_2326B3, 6 - end - -MtPyre_Summit_EventScript_232442:: @ 8232442 - trainerbattle 0, TRAINER_GRUNT_29, 0, MtPyre_Summit_Text_23271B, MtPyre_Summit_Text_23279A - msgbox MtPyre_Summit_Text_2327D8, 6 - end - -MtPyre_Summit_Text_232459: @ 8232459 - .string "No! Those TEAM MAGMA goons got\n" - .string "here ahead of us!\p" - .string "We can’t fall behind!$" - -MtPyre_Summit_Text_2324A0: @ 82324A0 - .string "I thought you were one of the MAGMAS\n" - .string "who happened to come back…$" - -MtPyre_Summit_Text_2324E0: @ 82324E0 - .string "Yeah, so you are strong…\n" - .string "But there’re a lot of us!$" - -MtPyre_Summit_Text_232513: @ 8232513 - .string "Hah!\n" - .string "Too bad for you!\p" - .string "If you came earlier, you only would’ve\n" - .string "had to battle the wimpy TEAM MAGMA.\p" - .string "But since you arrived now, you have\n" - .string "to take on us toughies!$" - -MtPyre_Summit_Text_2325B0: @ 82325B0 - .string "Urgh… I should’ve let you take on\n" - .string "TEAM MAGMA first…$" - -MtPyre_Summit_Text_2325E4: @ 82325E4 - .string "You don’t know anything!\n" - .string "So why are you messing with us?$" - -MtPyre_Summit_Text_23261D: @ 823261D - .string "You…\n" - .string "We saw you at MT. CHIMNEY.\p" - .string "You don’t belong to either TEAM,\n" - .string "so why would you be here?$" - -MtPyre_Summit_Text_232678: @ 8232678 - .string "If you’re going to mess with anyone,\n" - .string "let it be TEAM MAGMA…$" - -MtPyre_Summit_Text_2326B3: @ 82326B3 - .string "Heh, it doesn’t matter!\n" - .string "We bought ourselves some time!\p" - .string "The BOSS should have snatched what\n" - .string "he was after!$" - -MtPyre_Summit_Text_23271B: @ 823271B - .string "Oh, I know!\n" - .string "You tried to join TEAM MAGMA,\l" - .string "but they wouldn’t have you!\p" - .string "Well, don’t think that we’ll let you\n" - .string "join our TEAM AQUA!$" - -MtPyre_Summit_Text_23279A: @ 823279A - .string "If you want to join TEAM AQUA that\n" - .string "badly, we can consider it…$" - -MtPyre_Summit_Text_2327D8: @ 82327D8 - .string "We have a great combination going\n" - .string "with us members and our leader.$" - -MtPyre_Summit_Text_23281A: @ 823281A - .string "ARCHIE: TEAM MAGMA’s MAXIE got ahead\n" - .string "of us, but we also got what we wanted.\p" - .string "The RED ORB preserved at MT. PYRE…\n" - .string "I, ARCHIE, now have it in my possession!\p" - .string "Fufufu… Now we can bring our ultimate\n" - .string "objective to fruition!\p" - .string "Okay, TEAM!\n" - .string "We’re pulling out!$" - -MtPyre_Summit_Text_23290E: @ 823290E - .string "Oh, no…\n" - .string "This cannot happen…\p" - .string "Not only the BLUE ORB, but even\n" - .string "the RED ORB has been taken…\p" - .string "The BLUE ORB and RED ORB must never\n" - .string "be separated. They belong together.\p" - .string "What are those men trying to do with\n" - .string "the two ORBS?\p" - .string "… … … … … …\n" - .string "… … … … … …\p" - .string "Oh, yes. Was it TEAM MAGMA who came\n" - .string "and took the BLUE ORB first?\p" - .string "Well, in their haste, they left this\n" - .string "behind.\p" - .string "I couldn’t imagine what exactly it\n" - .string "could be.\p" - .string "I would like you to have it.\n" - .string "Perhaps it will be useful in some way.$" - -MtPyre_Summit_Text_232AD8: @ 8232AD8 - .string "The BLUE ORB and RED ORB taken by\n" - .string "those sinister men…\p" - .string "They must never be apart…\n" - .string "I fear something terrible will happen…$" - -MtPyre_Summit_Text_232B4F: @ 8232B4F - .string "Oh, my goodness…\p" - .string "You say that both GROUDON and KYOGRE\n" - .string "have been awakened?\p" - .string "It is said that the BLUE ORB and\n" - .string "the RED ORB quelled the rage of\l" - .string "the two POKéMON…\p" - .string "It is also said that the true owner\n" - .string "of the ORBS still exists.\p" - .string "However, no one knows who, or what\n" - .string "exactly, the ORBS belong to.\p" - .string "It could be a human, or perhaps\n" - .string "a POKéMON, but no one knows.$" - -MtPyre_Summit_Text_232CA6: @ 8232CA6 - .string "The two men who took the ORBS came\n" - .string "back to return them on their own.\p" - .string "Those men…\n" - .string "Perhaps they are not so evil after all…$" - -MtPyre_Summit_Text_232D1E: @ 8232D1E - .string "The embodiments of the land, sea,\n" - .string "and the sky…\p" - .string "That is said to be the identities of\n" - .string "the super-ancient POKéMON…\p" - .string "In the same way that we humans and\n" - .string "POKéMON have life, our world, too,\l" - .string "is alive…\p" - .string "The super-ancient POKéMON have\n" - .string "taught us that…$" - -MtPyre_Summit_Text_232E0C: @ 8232E0C - .string "MT. PYRE is where we calm the spirits\n" - .string "of POKéMON that have passed on…\p" - .string "This is a high place where one can\n" - .string "see all of HOENN…\p" - .string "The disembodied spirits of POKéMON\n" - .string "must find solace here…\p" - .string "Is it coincidence that you are here…\p" - .string "Will you hear out my tale? A tale long\n" - .string "told in the HOENN region?$" - -MtPyre_Summit_Text_232F27: @ 8232F27 - .string "It happened long, long ago…\p" - .string "The world was wracked by a ferocious\n" - .string "clash between the POKéMON of the land\l" - .string "and the POKéMON of the sea…\p" - .string "The POKéMON of the land raised\n" - .string "mountains and created continents…\p" - .string "The POKéMON of the sea raised huge\n" - .string "waves and carved out oceans…\p" - .string "Their fierce duel raged without end.\p" - .string "The world was engulfed in massive\n" - .string "infernos and vicious storms.\p" - .string "The BLUE ORB and the RED ORB brought\n" - .string "an end to the calamity.\p" - .string "Light poured from the two ORBS and\n" - .string "becalmed the enraged adversaries.\p" - .string "The pair, made docile, dove deep into\n" - .string "the sea where eventually they\l" - .string "disappeared…$" - -MtPyre_Summit_Text_233162: @ 8233162 - .string "I see…\n" - .string "Well, that, too, is fine…$" - -MtPyre_Summit_Text_233183: @ 8233183 - .string "MAXIE: {PLAYER}…\p" - .string "… … … … … …\n" - .string "… … … … … …$" - -MtPyre_Summit_Text_2331A6: @ 82331A6 - .string "It is my role to pass on the legends\n" - .string "of HOENN to future generations.\p" - .string "And the crisis that just ended in\n" - .string "SOOTOPOLIS rewrote a legend…\p" - .string "Have you the time to hear the new\n" - .string "legend of HOENN?$" - -MtPyre_Summit_Text_23325D: @ 823325D - .string "It happened long, long ago…\p" - .string "The world was wracked by a ferocious\n" - .string "clash between the POKéMON of the land\l" - .string "and the POKéMON of the sea…\p" - .string "The POKéMON of the land raised\n" - .string "mountains and created continents…\p" - .string "The POKéMON of the sea raised huge\n" - .string "waves and carved out oceans…\p" - .string "Their fierce duel raged without end.\p" - .string "The world was engulfed in massive\n" - .string "fires and vicious storms.\p" - .string "It was then that the POKéMON of\n" - .string "the sky descended from a storm.\p" - .string "The POKéMON, shining a vivid green,\n" - .string "becalmed the two enraged POKéMON.\p" - .string "Then, its duty done, the green POKéMON\n" - .string "flew off into the wild blue yonder…$" - diff --git a/data/scripts/maps/NavelRock_B1F.inc b/data/scripts/maps/NavelRock_B1F.inc deleted file mode 100644 index a8906f24d..000000000 --- a/data/scripts/maps/NavelRock_B1F.inc +++ /dev/null @@ -1,3 +0,0 @@ -NavelRock_B1F_MapScripts:: @ 826910D - .byte 0 - diff --git a/data/scripts/maps/NavelRock_Bottom.inc b/data/scripts/maps/NavelRock_Bottom.inc deleted file mode 100644 index cce93e624..000000000 --- a/data/scripts/maps/NavelRock_Bottom.inc +++ /dev/null @@ -1,88 +0,0 @@ -NavelRock_Bottom_MapScripts:: @ 8269255 - map_script 3, NavelRock_Bottom_MapScript1_269260 - map_script 5, NavelRock_Bottom_MapScript1_269284 - .byte 0 - -NavelRock_Bottom_MapScript1_269260: @ 8269260 - checkflag FLAG_0x091 - call_if 1, NavelRock_Bottom_EventScript_269273 - checkflag FLAG_0x091 - call_if 0, NavelRock_Bottom_EventScript_269277 - end - -NavelRock_Bottom_EventScript_269273:: @ 8269273 - setflag FLAG_0x320 - return - -NavelRock_Bottom_EventScript_269277:: @ 8269277 - checkflag FLAG_0x1DD - goto_eq NavelRock_Bottom_EventScript_27374E - clearflag FLAG_0x320 - return - -NavelRock_Bottom_MapScript1_269284: @ 8269284 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, NavelRock_Bottom_EventScript_26928E - end - -NavelRock_Bottom_EventScript_26928E:: @ 826928E - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 7 - goto_if 5, NavelRock_Bottom_EventScript_27374E - removeobject 1 - return - -NavelRock_Bottom_EventScript_2692A2:: @ 82692A2 - lock - faceplayer - waitse - delay 20 - playse SE_T_AME_E - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 4 - setvar VAR_0x8007, 2 - special sub_8139560 - delay 30 - playse SE_T_AME_E - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 4 - setvar VAR_0x8007, 2 - special sub_8139560 - delay 30 - delay 50 - waitse - playmoncry SPECIES_LUGIA, 2 - waitmoncry - delay 20 - setvar VAR_0x8004, 249 - setvar VAR_0x8005, 70 - setvar VAR_0x8006, 0 - special CreateObedientEnemyMon - setflag FLAG_SYS_CTRL_OBJ_DELETE - special BattleSetup_StartLegendaryBattle - waitstate - clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 1 - goto_eq NavelRock_Bottom_EventScript_269336 - compare VAR_RESULT, 4 - goto_eq NavelRock_Bottom_EventScript_269344 - compare VAR_RESULT, 5 - goto_eq NavelRock_Bottom_EventScript_269344 - setflag FLAG_0x091 - release - end - -NavelRock_Bottom_EventScript_269336:: @ 8269336 - setflag FLAG_0x1DD - setvar VAR_0x8004, 249 - goto NavelRock_Bottom_EventScript_273776 - end - -NavelRock_Bottom_EventScript_269344:: @ 8269344 - setvar VAR_0x8004, 249 - goto NavelRock_Bottom_EventScript_273776 - end - diff --git a/data/scripts/maps/NavelRock_Down01.inc b/data/scripts/maps/NavelRock_Down01.inc deleted file mode 100644 index 9677167eb..000000000 --- a/data/scripts/maps/NavelRock_Down01.inc +++ /dev/null @@ -1,3 +0,0 @@ -NavelRock_Down01_MapScripts:: @ 826924A - .byte 0 - diff --git a/data/scripts/maps/NavelRock_Down02.inc b/data/scripts/maps/NavelRock_Down02.inc deleted file mode 100644 index 946530a4a..000000000 --- a/data/scripts/maps/NavelRock_Down02.inc +++ /dev/null @@ -1,3 +0,0 @@ -NavelRock_Down02_MapScripts:: @ 826924B - .byte 0 - diff --git a/data/scripts/maps/NavelRock_Down03.inc b/data/scripts/maps/NavelRock_Down03.inc deleted file mode 100644 index 2a2a702c1..000000000 --- a/data/scripts/maps/NavelRock_Down03.inc +++ /dev/null @@ -1,3 +0,0 @@ -NavelRock_Down03_MapScripts:: @ 826924C - .byte 0 - diff --git a/data/scripts/maps/NavelRock_Down04.inc b/data/scripts/maps/NavelRock_Down04.inc deleted file mode 100644 index acf5aa456..000000000 --- a/data/scripts/maps/NavelRock_Down04.inc +++ /dev/null @@ -1,3 +0,0 @@ -NavelRock_Down04_MapScripts:: @ 826924D - .byte 0 - diff --git a/data/scripts/maps/NavelRock_Down05.inc b/data/scripts/maps/NavelRock_Down05.inc deleted file mode 100644 index 22a0c2059..000000000 --- a/data/scripts/maps/NavelRock_Down05.inc +++ /dev/null @@ -1,3 +0,0 @@ -NavelRock_Down05_MapScripts:: @ 826924E - .byte 0 - diff --git a/data/scripts/maps/NavelRock_Down06.inc b/data/scripts/maps/NavelRock_Down06.inc deleted file mode 100644 index 9acfe1e6a..000000000 --- a/data/scripts/maps/NavelRock_Down06.inc +++ /dev/null @@ -1,3 +0,0 @@ -NavelRock_Down06_MapScripts:: @ 826924F - .byte 0 - diff --git a/data/scripts/maps/NavelRock_Down07.inc b/data/scripts/maps/NavelRock_Down07.inc deleted file mode 100644 index 6c08fcc85..000000000 --- a/data/scripts/maps/NavelRock_Down07.inc +++ /dev/null @@ -1,3 +0,0 @@ -NavelRock_Down07_MapScripts:: @ 8269250 - .byte 0 - diff --git a/data/scripts/maps/NavelRock_Down08.inc b/data/scripts/maps/NavelRock_Down08.inc deleted file mode 100644 index 5a40a72a5..000000000 --- a/data/scripts/maps/NavelRock_Down08.inc +++ /dev/null @@ -1,3 +0,0 @@ -NavelRock_Down08_MapScripts:: @ 8269251 - .byte 0 - diff --git a/data/scripts/maps/NavelRock_Down09.inc b/data/scripts/maps/NavelRock_Down09.inc deleted file mode 100644 index 80bbbc0e5..000000000 --- a/data/scripts/maps/NavelRock_Down09.inc +++ /dev/null @@ -1,3 +0,0 @@ -NavelRock_Down09_MapScripts:: @ 8269252 - .byte 0 - diff --git a/data/scripts/maps/NavelRock_Down10.inc b/data/scripts/maps/NavelRock_Down10.inc deleted file mode 100644 index 2b27edeb5..000000000 --- a/data/scripts/maps/NavelRock_Down10.inc +++ /dev/null @@ -1,3 +0,0 @@ -NavelRock_Down10_MapScripts:: @ 8269253 - .byte 0 - diff --git a/data/scripts/maps/NavelRock_Down11.inc b/data/scripts/maps/NavelRock_Down11.inc deleted file mode 100644 index 91c6fa36a..000000000 --- a/data/scripts/maps/NavelRock_Down11.inc +++ /dev/null @@ -1,3 +0,0 @@ -NavelRock_Down11_MapScripts:: @ 8269254 - .byte 0 - diff --git a/data/scripts/maps/NavelRock_Entrance.inc b/data/scripts/maps/NavelRock_Entrance.inc deleted file mode 100644 index 9c25f5054..000000000 --- a/data/scripts/maps/NavelRock_Entrance.inc +++ /dev/null @@ -1,3 +0,0 @@ -NavelRock_Entrance_MapScripts:: @ 826910C - .byte 0 - diff --git a/data/scripts/maps/NavelRock_Exterior.inc b/data/scripts/maps/NavelRock_Exterior.inc deleted file mode 100644 index daa3fc964..000000000 --- a/data/scripts/maps/NavelRock_Exterior.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_Exterior_MapScripts:: @ 82690B2 - map_script 3, NavelRock_Exterior_MapScript1_2690B8 - .byte 0 - -NavelRock_Exterior_MapScript1_2690B8: @ 82690B8 - setflag FLAG_0x8E1 - end - diff --git a/data/scripts/maps/NavelRock_Fork.inc b/data/scripts/maps/NavelRock_Fork.inc deleted file mode 100644 index 4269feeac..000000000 --- a/data/scripts/maps/NavelRock_Fork.inc +++ /dev/null @@ -1,3 +0,0 @@ -NavelRock_Fork_MapScripts:: @ 826910E - .byte 0 - diff --git a/data/scripts/maps/NavelRock_Harbor.inc b/data/scripts/maps/NavelRock_Harbor.inc deleted file mode 100644 index 7f5a9e4c7..000000000 --- a/data/scripts/maps/NavelRock_Harbor.inc +++ /dev/null @@ -1,27 +0,0 @@ -NavelRock_Harbor_MapScripts:: @ 82690BC - .byte 0 - -NavelRock_Harbor_EventScript_2690BD:: @ 82690BD - lock - faceplayer - msgbox NavelRock_Harbor_Text_2C6CE6, 5 - compare VAR_RESULT, 0 - goto_eq NavelRock_Harbor_EventScript_269102 - msgbox NavelRock_Harbor_Text_2A6A5D, 4 - closemessage - applymovement VAR_LAST_TALKED, NavelRock_Harbor_Movement_2725AA - waitmovement 0 - delay 30 - hideobjectat 1, MAP_NAVEL_ROCK_HARBOR - setvar VAR_0x8004, 2 - call NavelRock_Harbor_EventScript_272250 - warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 - waitstate - release - end - -NavelRock_Harbor_EventScript_269102:: @ 8269102 - msgbox NavelRock_Harbor_Text_2A6A82, 4 - release - end - diff --git a/data/scripts/maps/NavelRock_Top.inc b/data/scripts/maps/NavelRock_Top.inc deleted file mode 100644 index 67ddbc373..000000000 --- a/data/scripts/maps/NavelRock_Top.inc +++ /dev/null @@ -1,127 +0,0 @@ -NavelRock_Top_MapScripts:: @ 8269113 - map_script 3, NavelRock_Top_MapScript1_26911E - map_script 5, NavelRock_Top_MapScript1_269151 - .byte 0 - -NavelRock_Top_MapScript1_26911E: @ 826911E - checkflag FLAG_0x092 - call_if 1, NavelRock_Top_EventScript_269131 - checkflag FLAG_0x092 - call_if 0, NavelRock_Top_EventScript_26913A - end - -NavelRock_Top_EventScript_269131:: @ 8269131 - setvar VAR_TEMP_1, 1 - setflag FLAG_0x321 - return - -NavelRock_Top_EventScript_26913A:: @ 826913A - setvar VAR_TEMP_1, 1 - checkflag FLAG_0x1DC - goto_eq NavelRock_Top_EventScript_27374E - setvar VAR_TEMP_1, 0 - clearflag FLAG_0x321 - return - -NavelRock_Top_MapScript1_269151: @ 8269151 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, NavelRock_Top_EventScript_26915B - end - -NavelRock_Top_EventScript_26915B:: @ 826915B - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 7 - goto_if 5, NavelRock_Top_EventScript_27374E - removeobject 1 - return - -NavelRock_Top_EventScript_26916F:: @ 826916F - lockall - setvar VAR_TEMP_1, 1 - special SpawnScriptEventObject - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 35 - special sub_813B80C - applymovement 1, NavelRock_Top_Movement_269243 - applymovement 127, NavelRock_Top_Movement_269230 - waitmovement 0 - delay 50 - setweather 0 - doweather - waitse - playmoncry SPECIES_HO_OH, 2 - delay 30 - waitmoncry - delay 60 - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 35 - special sub_813B80C - applymovement 127, NavelRock_Top_Movement_269234 - applymovement 1, NavelRock_Top_Movement_26923A - waitmovement 0 - special RemoveScriptEventObject - setvar VAR_0x8004, 250 - setvar VAR_0x8005, 70 - setvar VAR_0x8006, 0 - special CreateObedientEnemyMon - setflag FLAG_SYS_CTRL_OBJ_DELETE - special BattleSetup_StartLegendaryBattle - waitstate - clearflag FLAG_SYS_CTRL_OBJ_DELETE - setvar VAR_LAST_TALKED, 1 - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 1 - goto_eq NavelRock_Top_EventScript_269217 - compare VAR_RESULT, 4 - goto_eq NavelRock_Top_EventScript_269225 - compare VAR_RESULT, 5 - goto_eq NavelRock_Top_EventScript_269225 - setflag FLAG_0x092 - releaseall - end - -NavelRock_Top_EventScript_269217:: @ 8269217 - setflag FLAG_0x1DC - setvar VAR_0x8004, 250 - goto NavelRock_Top_EventScript_273776 - end - -NavelRock_Top_EventScript_269225:: @ 8269225 - setvar VAR_0x8004, 250 - goto NavelRock_Top_EventScript_273776 - end - -NavelRock_Top_Movement_269230: @ 8269230 - walk_up - walk_up - walk_up - step_end - -NavelRock_Top_Movement_269234: @ 8269234 - delay_16 - delay_16 - walk_down - walk_down - walk_down - step_end - -NavelRock_Top_Movement_26923A: @ 826923A - 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 - 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/NavelRock_Up1.inc b/data/scripts/maps/NavelRock_Up1.inc deleted file mode 100644 index c85af5f0c..000000000 --- a/data/scripts/maps/NavelRock_Up1.inc +++ /dev/null @@ -1,3 +0,0 @@ -NavelRock_Up1_MapScripts:: @ 826910F - .byte 0 - diff --git a/data/scripts/maps/NavelRock_Up2.inc b/data/scripts/maps/NavelRock_Up2.inc deleted file mode 100644 index 27ae52190..000000000 --- a/data/scripts/maps/NavelRock_Up2.inc +++ /dev/null @@ -1,3 +0,0 @@ -NavelRock_Up2_MapScripts:: @ 8269110 - .byte 0 - diff --git a/data/scripts/maps/NavelRock_Up3.inc b/data/scripts/maps/NavelRock_Up3.inc deleted file mode 100644 index a9c3e2a3c..000000000 --- a/data/scripts/maps/NavelRock_Up3.inc +++ /dev/null @@ -1,3 +0,0 @@ -NavelRock_Up3_MapScripts:: @ 8269111 - .byte 0 - diff --git a/data/scripts/maps/NavelRock_Up4.inc b/data/scripts/maps/NavelRock_Up4.inc deleted file mode 100644 index c6beead6d..000000000 --- a/data/scripts/maps/NavelRock_Up4.inc +++ /dev/null @@ -1,3 +0,0 @@ -NavelRock_Up4_MapScripts:: @ 8269112 - .byte 0 - diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc deleted file mode 100644 index 727b77985..000000000 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ /dev/null @@ -1,61 +0,0 @@ -NewMauville_Entrance_MapScripts:: @ 82372AD - map_script 1, NewMauville_Entrance_MapScript1_2372B8 - map_script 3, NewMauville_Entrance_MapScript1_2372FB - .byte 0 - -NewMauville_Entrance_MapScript1_2372B8: @ 82372B8 - compare VAR_0x40BA, 0 - call_if 1, NewMauville_Entrance_EventScript_2372C4 - end - -NewMauville_Entrance_EventScript_2372C4:: @ 82372C4 - setmetatile 3, 0, 788, 1 - setmetatile 4, 0, 789, 1 - setmetatile 5, 0, 790, 1 - setmetatile 3, 1, 796, 1 - setmetatile 4, 1, 797, 1 - setmetatile 5, 1, 798, 1 - return - -NewMauville_Entrance_MapScript1_2372FB: @ 82372FB - setflag FLAG_LANDMARK_NEW_MAUVILLE - end - -NewMauville_Entrance_EventScript_2372FF:: @ 82372FF - lockall - applymovement 255, NewMauville_Entrance_Movement_2725A6 - waitmovement 0 - msgbox NewMauville_Entrance_Text_237382, 4 - checkitem ITEM_BASEMENT_KEY, 1 - compare VAR_RESULT, 0 - goto_eq NewMauville_Entrance_EventScript_237380 - msgbox NewMauville_Entrance_Text_237396, 5 - compare VAR_RESULT, 0 - goto_eq NewMauville_Entrance_EventScript_237380 - msgbox NewMauville_Entrance_Text_2373AC, 4 - setmetatile 3, 0, 707, 0 - setmetatile 4, 0, 708, 0 - setmetatile 5, 0, 709, 0 - setmetatile 3, 1, 715, 1 - setmetatile 4, 1, 716, 0 - setmetatile 5, 1, 717, 1 - special DrawWholeMapView - playse SE_BAN - setvar VAR_0x40BA, 1 - releaseall - end - -NewMauville_Entrance_EventScript_237380:: @ 8237380 - releaseall - end - -NewMauville_Entrance_Text_237382: @ 8237382 - .string "The door is locked.$" - -NewMauville_Entrance_Text_237396: @ 8237396 - .string "Use the BASEMENT KEY?$" - -NewMauville_Entrance_Text_2373AC: @ 82373AC - .string "{PLAYER} used the BASEMENT KEY.\p" - .string "The door opened!$" - diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc deleted file mode 100644 index 81b21287d..000000000 --- a/data/scripts/maps/NewMauville_Inside.inc +++ /dev/null @@ -1,282 +0,0 @@ -NewMauville_Inside_MapScripts:: @ 82373D7 - map_script 5, NewMauville_Inside_MapScript1_2373E7 - map_script 3, NewMauville_Inside_MapScript1_23741B - map_script 1, NewMauville_Inside_MapScript1_23744D - .byte 0 - -NewMauville_Inside_MapScript1_2373E7: @ 82373E7 - compare VAR_TEMP_1, 1 - call_if 1, NewMauville_Inside_EventScript_237489 - compare VAR_TEMP_2, 1 - call_if 1, NewMauville_Inside_EventScript_2375D7 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, NewMauville_Inside_EventScript_237407 - end - -NewMauville_Inside_EventScript_237407:: @ 8237407 - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 7 - goto_if 5, NewMauville_Inside_EventScript_27374E - removeobject VAR_LAST_TALKED - return - -NewMauville_Inside_MapScript1_23741B: @ 823741B - setvar VAR_TEMP_1, 0 - setvar VAR_TEMP_2, 0 - checkflag FLAG_0x1C1 - call_if 0, NewMauville_Inside_EventScript_237441 - checkflag FLAG_0x1C2 - call_if 0, NewMauville_Inside_EventScript_237445 - checkflag FLAG_0x1C3 - call_if 0, NewMauville_Inside_EventScript_237449 - end - -NewMauville_Inside_EventScript_237441:: @ 8237441 - clearflag FLAG_0x3CE - return - -NewMauville_Inside_EventScript_237445:: @ 8237445 - clearflag FLAG_0x3CF - return - -NewMauville_Inside_EventScript_237449:: @ 8237449 - clearflag FLAG_0x3D0 - return - -NewMauville_Inside_MapScript1_23744D: @ 823744D - compare VAR_0x40BA, 2 - call_if 1, NewMauville_Inside_EventScript_23773A - end - -NewMauville_Inside_EventScript_237459:: @ 8237459 - lockall - setvar VAR_TEMP_1, 1 - setvar VAR_TEMP_2, 0 - playse SE_PIN - call NewMauville_Inside_EventScript_237489 - special DrawWholeMapView - releaseall - end - -NewMauville_Inside_EventScript_237471:: @ 8237471 - lockall - setvar VAR_TEMP_1, 0 - setvar VAR_TEMP_2, 1 - playse SE_PIN - call NewMauville_Inside_EventScript_2375D7 - special DrawWholeMapView - releaseall - end - -NewMauville_Inside_EventScript_237489:: @ 8237489 - setmetatile 23, 34, 617, 1 - setmetatile 23, 35, 625, 1 - setmetatile 23, 36, 621, 0 - setmetatile 23, 37, 641, 0 - setmetatile 10, 16, 617, 1 - setmetatile 10, 17, 625, 1 - setmetatile 10, 18, 621, 0 - setmetatile 10, 19, 641, 0 - setmetatile 10, 0, 617, 1 - setmetatile 10, 1, 625, 1 - setmetatile 10, 2, 621, 0 - setmetatile 10, 3, 641, 0 - setmetatile 37, 33, 694, 1 - setmetatile 37, 34, 702, 1 - setmetatile 37, 35, 710, 1 - setmetatile 37, 36, 718, 1 - setmetatile 28, 22, 694, 1 - setmetatile 28, 23, 702, 1 - setmetatile 28, 24, 710, 1 - setmetatile 28, 25, 718, 1 - setmetatile 10, 24, 694, 1 - setmetatile 10, 25, 702, 1 - setmetatile 10, 26, 710, 1 - setmetatile 10, 27, 718, 1 - setmetatile 21, 2, 694, 1 - setmetatile 21, 3, 702, 1 - setmetatile 21, 4, 710, 1 - setmetatile 21, 5, 718, 1 - setmetatile 6, 11, 591, 0 - setmetatile 13, 10, 591, 0 - setmetatile 16, 22, 591, 0 - setmetatile 4, 26, 591, 0 - setmetatile 30, 38, 591, 0 - setmetatile 2, 11, 558, 0 - setmetatile 17, 10, 558, 0 - setmetatile 25, 18, 558, 0 - setmetatile 18, 36, 558, 0 - return - -NewMauville_Inside_EventScript_2375D7:: @ 82375D7 - setmetatile 23, 34, 695, 1 - setmetatile 23, 35, 703, 1 - setmetatile 23, 36, 711, 1 - setmetatile 23, 37, 719, 1 - setmetatile 10, 16, 695, 1 - setmetatile 10, 17, 703, 1 - setmetatile 10, 18, 711, 1 - setmetatile 10, 19, 719, 1 - setmetatile 10, 0, 695, 1 - setmetatile 10, 1, 703, 1 - setmetatile 10, 2, 711, 1 - setmetatile 10, 3, 719, 1 - setmetatile 37, 33, 617, 1 - setmetatile 37, 34, 625, 1 - setmetatile 37, 35, 621, 0 - setmetatile 37, 36, 641, 0 - setmetatile 28, 22, 617, 1 - setmetatile 28, 23, 625, 1 - setmetatile 28, 24, 621, 0 - setmetatile 28, 25, 641, 0 - setmetatile 10, 24, 617, 1 - setmetatile 10, 25, 625, 1 - setmetatile 10, 26, 621, 0 - setmetatile 10, 27, 641, 0 - setmetatile 21, 2, 617, 1 - setmetatile 21, 3, 625, 1 - setmetatile 21, 4, 621, 0 - setmetatile 21, 5, 641, 0 - setmetatile 2, 11, 591, 0 - setmetatile 17, 10, 591, 0 - setmetatile 25, 18, 591, 0 - setmetatile 18, 36, 591, 0 - setmetatile 6, 11, 566, 0 - setmetatile 13, 10, 566, 0 - setmetatile 16, 22, 566, 0 - setmetatile 4, 26, 566, 0 - setmetatile 30, 38, 566, 0 - return - -NewMauville_Inside_EventScript_237725:: @ 8237725 - lockall - msgbox NewMauville_Inside_Text_237932, 4 - call NewMauville_Inside_EventScript_23773A - setvar VAR_0x40BA, 2 - releaseall - end - -NewMauville_Inside_EventScript_23773A:: @ 823773A - setmetatile 33, 6, 591, 0 - setmetatile 32, 2, 752, 1 - setmetatile 33, 2, 753, 1 - setmetatile 34, 2, 754, 1 - setmetatile 35, 2, 755, 1 - setmetatile 32, 3, 756, 1 - setmetatile 33, 3, 757, 1 - setmetatile 34, 3, 758, 1 - setmetatile 35, 3, 759, 1 - special DrawWholeMapView - return - -NewMauville_Inside_EventScript_23778F:: @ 823778F - lockall - compare VAR_0x40BA, 2 - goto_eq NewMauville_Inside_EventScript_2377A5 - msgbox NewMauville_Inside_Text_237896, 4 - releaseall - end - -NewMauville_Inside_EventScript_2377A5:: @ 82377A5 - msgbox NewMauville_Inside_Text_237916, 4 - releaseall - end - -NewMauville_Inside_EventScript_2377AF:: @ 82377AF - lock - faceplayer - setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE - waitse - playmoncry SPECIES_VOLTORB, 2 - delay 40 - waitmoncry - setflag FLAG_SYS_CTRL_OBJ_DELETE - dowildbattle - clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 1 - goto_eq NewMauville_Inside_EventScript_2377F3 - compare VAR_RESULT, 4 - goto_eq NewMauville_Inside_EventScript_2377F3 - compare VAR_RESULT, 5 - goto_eq NewMauville_Inside_EventScript_2377F3 - setflag FLAG_0x1C1 - release - end - -NewMauville_Inside_EventScript_2377F3:: @ 82377F3 - setflag FLAG_0x1C1 - goto NewMauville_Inside_EventScript_27376D - end - -NewMauville_Inside_EventScript_2377FC:: @ 82377FC - lock - faceplayer - setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE - waitse - playmoncry SPECIES_VOLTORB, 2 - delay 40 - waitmoncry - setflag FLAG_SYS_CTRL_OBJ_DELETE - dowildbattle - clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 1 - goto_eq NewMauville_Inside_EventScript_237840 - compare VAR_RESULT, 4 - goto_eq NewMauville_Inside_EventScript_237840 - compare VAR_RESULT, 5 - goto_eq NewMauville_Inside_EventScript_237840 - setflag FLAG_0x1C2 - release - end - -NewMauville_Inside_EventScript_237840:: @ 8237840 - setflag FLAG_0x1C2 - goto NewMauville_Inside_EventScript_27376D - end - -NewMauville_Inside_EventScript_237849:: @ 8237849 - lock - faceplayer - setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE - waitse - playmoncry SPECIES_VOLTORB, 2 - delay 40 - waitmoncry - setflag FLAG_SYS_CTRL_OBJ_DELETE - dowildbattle - clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 1 - goto_eq NewMauville_Inside_EventScript_23788D - compare VAR_RESULT, 4 - goto_eq NewMauville_Inside_EventScript_23788D - compare VAR_RESULT, 5 - goto_eq NewMauville_Inside_EventScript_23788D - setflag FLAG_0x1C3 - release - end - -NewMauville_Inside_EventScript_23788D:: @ 823788D - setflag FLAG_0x1C3 - goto NewMauville_Inside_EventScript_27376D - end - -NewMauville_Inside_Text_237896: @ 8237896 - .string "The generator is radiating heat that\n" - .string "can be felt even at a distance.\p" - .string "It looks like it should be turned off\n" - .string "as soon as possible.$" - -NewMauville_Inside_Text_237916: @ 8237916 - .string "The generator quieted down.$" - -NewMauville_Inside_Text_237932: @ 8237932 - .string "{PLAYER} stepped on the switch.\p" - .string "Click…\p" - .string "… … … … … … … …\n" - .string "… … … … … … … …\p" - .string "The generator appears to have\n" - .string "stopped…$" - diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc deleted file mode 100644 index 32bca3703..000000000 --- a/data/scripts/maps/OldaleTown.inc +++ /dev/null @@ -1,408 +0,0 @@ -OldaleTown_MapScripts:: @ 81E8EA2 - map_script 3, OldaleTown_MapScript1_1E8EA8 - .byte 0 - -OldaleTown_MapScript1_1E8EA8: @ 81E8EA8 - call OldaleTown_EventScript_271ED7 - setflag FLAG_VISITED_OLDALE_TOWN - checkflag FLAG_0x074 - call_if 0, OldaleTown_EventScript_1E8ED2 - checkflag FLAG_0x084 - call_if 0, OldaleTown_EventScript_1E8EDE - checkflag FLAG_0x074 - call_if 1, OldaleTown_EventScript_1E8ECC - end - -OldaleTown_EventScript_1E8ECC:: @ 81E8ECC - setvar VAR_0x4051, 1 - return - -OldaleTown_EventScript_1E8ED2:: @ 81E8ED2 - setobjectxyperm 3, 1, 11 - setobjectmovementtype 3, 9 - return - -OldaleTown_EventScript_1E8EDE:: @ 81E8EDE - setobjectxyperm 2, 13, 14 - setobjectmovementtype 2, 8 - return - -OldaleTown_EventScript_1E8EEA:: @ 81E8EEA - msgbox OldaleTown_Text_1E94DA, 3 - end - -OldaleTown_EventScript_1E8EF3:: @ 81E8EF3 - msgbox OldaleTown_Text_1E918E, 2 - end - -OldaleTown_EventScript_1E8EFC:: @ 81E8EFC - lock - faceplayer - checkflag FLAG_0x084 - goto_eq OldaleTown_EventScript_1E8FB9 - checkflag FLAG_0x001 - goto_eq OldaleTown_EventScript_1E8FB9 - setflag FLAG_0x001 - playbgm MUS_TSURETEK, 0 - msgbox OldaleTown_Text_1E91C0, 4 - closemessage - switch VAR_FACING - case 1, OldaleTown_EventScript_1E8F47 - case 2, OldaleTown_EventScript_1E8F5E - case 4, OldaleTown_EventScript_1E8F75 - end - -OldaleTown_EventScript_1E8F47:: @ 81E8F47 - applymovement 2, OldaleTown_Movement_1E8FD7 - applymovement 255, OldaleTown_Movement_1E9001 - waitmovement 0 - goto OldaleTown_EventScript_1E8F8C - end - -OldaleTown_EventScript_1E8F5E:: @ 81E8F5E - applymovement 2, OldaleTown_Movement_1E8FE2 - applymovement 255, OldaleTown_Movement_1E900B - waitmovement 0 - goto OldaleTown_EventScript_1E8F8C - end - -OldaleTown_EventScript_1E8F75:: @ 81E8F75 - applymovement 255, OldaleTown_Movement_1E8FF9 - applymovement 2, OldaleTown_Movement_1E8FCE - waitmovement 0 - goto OldaleTown_EventScript_1E8F8C - end - -OldaleTown_EventScript_1E8F8C:: @ 81E8F8C - msgbox OldaleTown_Text_1E91FD, 4 - giveitem_std ITEM_POTION - compare VAR_RESULT, 0 - goto_eq OldaleTown_EventScript_1E8FC3 - msgbox OldaleTown_Text_1E92AF, 4 - setflag FLAG_0x084 - fadedefaultbgm - release - end - -OldaleTown_EventScript_1E8FB9:: @ 81E8FB9 - msgbox OldaleTown_Text_1E92AF, 4 - release - end - -OldaleTown_EventScript_1E8FC3:: @ 81E8FC3 - msgbox gUnknown_08272AD0, 4 - fadedefaultbgm - release - end - -OldaleTown_Movement_1E8FCE: @ 81E8FCE - 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 - 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 - 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 - 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 - walk_right - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - step_end - -OldaleTown_Movement_1E9001: @ 81E9001 - delay_16 - delay_16 - delay_16 - delay_16 - walk_up - walk_up - walk_up - walk_up - walk_up - step_end - -OldaleTown_Movement_1E900B: @ 81E900B - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - step_end - -OldaleTown_Movement_1E9013: @ 81E9013 - 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 - lock - faceplayer - checkflag FLAG_0x074 - goto_eq OldaleTown_EventScript_1E9066 - msgbox OldaleTown_Text_1E939A, 4 - closemessage - applymovement 3, OldaleTown_Movement_2725A2 - waitmovement 0 - release - end - -OldaleTown_EventScript_1E903F:: @ 81E903F - lockall - applymovement 255, OldaleTown_Movement_1E9182 - applymovement 3, OldaleTown_Movement_1E9185 - waitmovement 0 - msgbox OldaleTown_Text_1E9313, 4 - closemessage - applymovement 3, OldaleTown_Movement_1E918B - waitmovement 0 - releaseall - end - -OldaleTown_EventScript_1E9066:: @ 81E9066 - msgbox OldaleTown_Text_1E93F8, 4 - release - end - -OldaleTown_EventScript_1E9070:: @ 81E9070 - lockall - applymovement 4, OldaleTown_Movement_27259E - waitmovement 0 - setvar VAR_0x8009, 0 - goto OldaleTown_EventScript_1E90E6 - end - -OldaleTown_EventScript_1E9086:: @ 81E9086 - lockall - applymovement 4, OldaleTown_Movement_1E9170 - waitmovement 0 - applymovement 255, OldaleTown_Movement_2725A8 - waitmovement 0 - setvar VAR_0x8009, 1 - goto OldaleTown_EventScript_1E90E6 - end - -OldaleTown_EventScript_1E90A6:: @ 81E90A6 - lockall - applymovement 4, OldaleTown_Movement_1E9173 - waitmovement 0 - applymovement 255, OldaleTown_Movement_2725A8 - waitmovement 0 - setvar VAR_0x8009, 1 - goto OldaleTown_EventScript_1E90E6 - end - -OldaleTown_EventScript_1E90C6:: @ 81E90C6 - lockall - applymovement 4, OldaleTown_Movement_1E9175 - waitmovement 0 - applymovement 255, OldaleTown_Movement_2725A8 - waitmovement 0 - setvar VAR_0x8009, 1 - goto OldaleTown_EventScript_1E90E6 - end - -OldaleTown_EventScript_1E90E6:: @ 81E90E6 - checkplayergender - compare VAR_RESULT, 0 - goto_eq OldaleTown_EventScript_1E90FE - compare VAR_RESULT, 1 - goto_eq OldaleTown_EventScript_1E910C - end - -OldaleTown_EventScript_1E90FE:: @ 81E90FE - msgbox OldaleTown_Text_1E9462, 4 - goto OldaleTown_EventScript_1E911A - end - -OldaleTown_EventScript_1E910C:: @ 81E910C - msgbox OldaleTown_Text_1E948A, 4 - goto OldaleTown_EventScript_1E911A - end - -OldaleTown_EventScript_1E911A:: @ 81E911A - closemessage - compare VAR_0x8009, 0 - call_if 1, OldaleTown_EventScript_1E9148 - compare VAR_0x8009, 1 - call_if 1, OldaleTown_EventScript_1E915E - applymovement 4, OldaleTown_Movement_1E9177 - waitmovement 0 - removeobject 4 - setvar VAR_0x40C7, 2 - setflag FLAG_0x3D3 - releaseall - end - -OldaleTown_EventScript_1E9148:: @ 81E9148 - compare VAR_FACING, 1 - goto_if 5, OldaleTown_EventScript_1E915E - applymovement 4, OldaleTown_Movement_1E9177 - waitmovement 0 - return - -OldaleTown_EventScript_1E915E:: @ 81E915E - applymovement 255, OldaleTown_Movement_1E917E - applymovement 4, OldaleTown_Movement_1E9177 - waitmovement 0 - return - -OldaleTown_Movement_1E9170: @ 81E9170 - walk_left - walk_left - step_end - -OldaleTown_Movement_1E9173: @ 81E9173 - walk_left - step_end - -OldaleTown_Movement_1E9175: @ 81E9175 - face_left - step_end - -OldaleTown_Movement_1E9177: @ 81E9177 - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - step_end - -OldaleTown_Movement_1E917E: @ 81E917E - delay_8 - delay_4 - walk_in_place_fastest_down - step_end - -OldaleTown_Movement_1E9182: @ 81E9182 - delay_8 - walk_right - step_end - -OldaleTown_Movement_1E9185: @ 81E9185 - walk_fast_up - walk_in_place_fastest_left - lock_facing_direction - walk_right - unlock_facing_direction - step_end - -OldaleTown_Movement_1E918B: @ 81E918B - walk_down - walk_left - step_end - -OldaleTown_Text_1E918E: @ 81E918E - .string "I want to take a rest, so I’m saving my\n" - .string "progress.$" - -OldaleTown_Text_1E91C0: @ 81E91C0 - .string "Hi!\n" - .string "I work at a POKéMON MART.\p" - .string "Can I get you to come with me?$" - -OldaleTown_Text_1E91FD: @ 81E91FD - .string "This is a POKéMON MART.\n" - .string "Just look for our blue roof.\p" - .string "We sell a variety of goods including\n" - .string "POKé BALLS for catching POKéMON.\p" - .string "Here, I’d like you to have this as\n" - .string "a promotional item.$" - -OldaleTown_Text_1E92AF: @ 81E92AF - .string "A POTION can be used anytime, so it’s\n" - .string "even more useful than a POKéMON CENTER\l" - .string "in certain situations.$" - -OldaleTown_Text_1E9313: @ 81E9313 - .string "Aaaaah! Wait!\n" - .string "Please don’t come in here.\p" - .string "I just discovered the footprints of\n" - .string "a rare POKéMON!\p" - .string "Wait until I finish sketching\n" - .string "them, okay?$" - -OldaleTown_Text_1E939A: @ 81E939A - .string "I just discovered the footprints of\n" - .string "a rare POKéMON!\p" - .string "Wait until I finish sketching\n" - .string "them, okay?$" - -OldaleTown_Text_1E93F8: @ 81E93F8 - .string "I finished sketching the footprints of\n" - .string "a rare POKéMON.\p" - .string "But it turns out they were only my\n" - .string "own footprints…$" - -OldaleTown_Text_1E9462: @ 81E9462 - .string "MAY: {PLAYER}{KUN}!\n" - .string "Over here!\l" - .string "Let’s hurry home!$" - -OldaleTown_Text_1E948A: @ 81E948A - .string "BRENDAN: I’m heading back to my dad’s\n" - .string "LAB now.\l" - .string "{PLAYER}, you should hustle back, too.$" - -OldaleTown_Text_1E94DA: @ 81E94DA - .string "OLDALE TOWN\n" - .string "“Where things start off scarce.â€$" - diff --git a/data/scripts/maps/OldaleTown_House1.inc b/data/scripts/maps/OldaleTown_House1.inc deleted file mode 100644 index 6a36ff57e..000000000 --- a/data/scripts/maps/OldaleTown_House1.inc +++ /dev/null @@ -1,15 +0,0 @@ -OldaleTown_House1_MapScripts:: @ 81FBE85 - .byte 0 - -OldaleTown_House1_EventScript_1FBE86:: @ 81FBE86 - msgbox OldaleTown_House1_Text_1FBE8F, 2 - end - -OldaleTown_House1_Text_1FBE8F: @ 81FBE8F - .string "When a POKéMON battle starts, the one\n" - .string "at the left of the list goes out first.\p" - .string "So, when you get more POKéMON in your\n" - .string "party, try switching around the order\l" - .string "of your POKéMON.\p" - .string "It could give you an advantage.$" - diff --git a/data/scripts/maps/OldaleTown_House2.inc b/data/scripts/maps/OldaleTown_House2.inc deleted file mode 100644 index 55941705c..000000000 --- a/data/scripts/maps/OldaleTown_House2.inc +++ /dev/null @@ -1,20 +0,0 @@ -OldaleTown_House2_MapScripts:: @ 81FBF5A - .byte 0 - -OldaleTown_House2_EventScript_1FBF5B:: @ 81FBF5B - msgbox OldaleTown_House2_Text_1FBF6D, 2 - end - -OldaleTown_House2_EventScript_1FBF64:: @ 81FBF64 - msgbox OldaleTown_House2_Text_1FBFB0, 2 - end - -OldaleTown_House2_Text_1FBF6D: @ 81FBF6D - .string "When POKéMON battle, they eventually\n" - .string "level up and become stronger.$" - -OldaleTown_House2_Text_1FBFB0: @ 81FBFB0 - .string "If the POKéMON with you become\n" - .string "stronger, you’ll be able to go farther\l" - .string "away from here.$" - diff --git a/data/scripts/maps/OldaleTown_Mart.inc b/data/scripts/maps/OldaleTown_Mart.inc deleted file mode 100644 index de8893712..000000000 --- a/data/scripts/maps/OldaleTown_Mart.inc +++ /dev/null @@ -1,73 +0,0 @@ -OldaleTown_Mart_MapScripts:: @ 81FC23F - .byte 0 - -OldaleTown_Mart_EventScript_1FC240:: @ 81FC240 - lock - faceplayer - message gUnknown_08272A21 - waitmessage - checkflag FLAG_0x074 - goto_eq OldaleTown_Mart_EventScript_1FC26C - pokemart OldaleTown_Mart_Pokemart_1FC260 - msgbox gUnknown_08272A3F, 4 - release - end - -OldaleTown_Mart_Pokemart_1FC260: @ 81FC260 - .2byte ITEM_POTION - .2byte ITEM_ANTIDOTE - .2byte ITEM_PARALYZE_HEAL - .2byte ITEM_AWAKENING - .2byte ITEM_NONE - release - end - -OldaleTown_Mart_EventScript_1FC26C:: @ 81FC26C - pokemart OldaleTown_Mart_Pokemart_1FC27C - msgbox gUnknown_08272A3F, 4 - release - end - - .align 2 -OldaleTown_Mart_Pokemart_1FC27C: @ 81FC27C - .2byte ITEM_POKE_BALL - .2byte ITEM_POTION - .2byte ITEM_ANTIDOTE - .2byte ITEM_PARALYZE_HEAL - .2byte ITEM_AWAKENING - .2byte ITEM_NONE - release - end - -OldaleTown_Mart_EventScript_1FC28A:: @ 81FC28A - lock - faceplayer - checkflag FLAG_0x074 - goto_eq OldaleTown_Mart_EventScript_1FC29F - msgbox OldaleTown_Mart_Text_1FC2B2, 4 - release - end - -OldaleTown_Mart_EventScript_1FC29F:: @ 81FC29F - msgbox OldaleTown_Mart_Text_1FC2F3, 4 - release - end - -OldaleTown_Mart_EventScript_1FC2A9:: @ 81FC2A9 - msgbox OldaleTown_Mart_Text_1FC338, 2 - end - -OldaleTown_Mart_Text_1FC2B2: @ 81FC2B2 - .string "The clerk says they’re all sold out.\n" - .string "I can’t buy any POKé BALLS.$" - -OldaleTown_Mart_Text_1FC2F3: @ 81FC2F3 - .string "I’m going to buy a bunch of POKé BALLS\n" - .string "and catch a bunch of POKéMON!$" - -OldaleTown_Mart_Text_1FC338: @ 81FC338 - .string "If a POKéMON gets hurt and loses its HP\n" - .string "and faints, it won’t be able to battle.\p" - .string "To prevent your POKéMON from fainting,\n" - .string "restore its HP with a POTION.$" - diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc deleted file mode 100644 index ece540e70..000000000 --- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc +++ /dev/null @@ -1,63 +0,0 @@ -OldaleTown_PokemonCenter_1F_MapScripts:: @ 81FC006 - map_script 3, OldaleTown_PokemonCenter_1F_MapScript1_1FC011 - map_script 5, OldaleTown_PokemonCenter_1F_MapScript1_277C30 - .byte 0 - -OldaleTown_PokemonCenter_1F_MapScript1_1FC011: @ 81FC011 - setrespawn 14 - call OldaleTown_PokemonCenter_1F_EventScript_2718DE - end - -OldaleTown_PokemonCenter_1F_EventScript_1FC01A:: @ 81FC01A - setvar VAR_0x800B, 1 - call OldaleTown_PokemonCenter_1F_EventScript_27191E - waitmessage - waitbuttonpress - release - end - -OldaleTown_PokemonCenter_1F_EventScript_1FC028:: @ 81FC028 - msgbox OldaleTown_PokemonCenter_1F_Text_1FC059, 2 - end - -OldaleTown_PokemonCenter_1F_EventScript_1FC031:: @ 81FC031 - msgbox OldaleTown_PokemonCenter_1F_Text_1FC0CD, 2 - end - -OldaleTown_PokemonCenter_1F_EventScript_1FC03A:: @ 81FC03A - lock - faceplayer - checkflag FLAG_SYS_POKEDEX_GET - goto_eq OldaleTown_PokemonCenter_1F_EventScript_1FC04F - msgbox OldaleTown_PokemonCenter_1F_Text_1FC148, 4 - release - end - -OldaleTown_PokemonCenter_1F_EventScript_1FC04F:: @ 81FC04F - msgbox OldaleTown_PokemonCenter_1F_Text_1FC1B9, 4 - release - end - -OldaleTown_PokemonCenter_1F_Text_1FC059: @ 81FC059 - .string "That PC in the corner there is\n" - .string "for any POKéMON TRAINER to use.\p" - .string "Naturally, that means you’re welcome\n" - .string "to use it, too.$" - -OldaleTown_PokemonCenter_1F_Text_1FC0CD: @ 81FC0CD - .string "POKéMON CENTERS are great!\p" - .string "You can use their services as much\n" - .string "as you like, and it’s all for free.\l" - .string "You never have to worry!$" - -OldaleTown_PokemonCenter_1F_Text_1FC148: @ 81FC148 - .string "The POKéMON WIRELESS CLUB on\n" - .string "the second floor was built recently.\p" - .string "But they say they’re still making\n" - .string "adjustments.$" - -OldaleTown_PokemonCenter_1F_Text_1FC1B9: @ 81FC1B9 - .string "The POKéMON WIRELESS CLUB on\n" - .string "the second floor was built recently.\p" - .string "I traded POKéMON right away.$" - diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_2F.inc b/data/scripts/maps/OldaleTown_PokemonCenter_2F.inc deleted file mode 100644 index 788157beb..000000000 --- a/data/scripts/maps/OldaleTown_PokemonCenter_2F.inc +++ /dev/null @@ -1,19 +0,0 @@ -OldaleTown_PokemonCenter_2F_MapScripts:: @ 81FC218 - map_script 2, OldaleTown_PokemonCenter_2F_MapScript2_276C3B - map_script 4, OldaleTown_PokemonCenter_2F_MapScript2_276B6C - map_script 1, OldaleTown_PokemonCenter_2F_MapScript1_276BBE - map_script 3, OldaleTown_PokemonCenter_2F_MapScript1_276ACF - .byte 0 - -OldaleTown_PokemonCenter_2F_EventScript_1FC22D:: @ 81FC22D - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 - end - -OldaleTown_PokemonCenter_2F_EventScript_1FC233:: @ 81FC233 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 - end - -OldaleTown_PokemonCenter_2F_EventScript_1FC239:: @ 81FC239 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB - end - diff --git a/data/scripts/maps/PacifidlogTown.inc b/data/scripts/maps/PacifidlogTown.inc deleted file mode 100644 index 1f4f0e872..000000000 --- a/data/scripts/maps/PacifidlogTown.inc +++ /dev/null @@ -1,54 +0,0 @@ -PacifidlogTown_MapScripts:: @ 81EBAB1 - map_script 3, PacifidlogTown_MapScript1_1EBABC - map_script 5, PacifidlogTown_MapScript1_1EBAC0 - .byte 0 - -PacifidlogTown_MapScript1_1EBABC: @ 81EBABC - setflag FLAG_VISITED_PACIFIDLOG_TOWN - end - -PacifidlogTown_MapScript1_1EBAC0: @ 81EBAC0 - setstepcallback 3 - end - -PacifidlogTown_EventScript_1EBAC3:: @ 81EBAC3 - msgbox PacifidlogTown_Text_1EBB6C, 2 - end - -PacifidlogTown_EventScript_1EBACC:: @ 81EBACC - msgbox PacifidlogTown_Text_1EBAE7, 2 - end - -PacifidlogTown_EventScript_1EBAD5:: @ 81EBAD5 - msgbox PacifidlogTown_Text_1EBBAC, 2 - end - -PacifidlogTown_EventScript_1EBADE:: @ 81EBADE - msgbox PacifidlogTown_Text_1EBC7A, 3 - end - -PacifidlogTown_Text_1EBAE7: @ 81EBAE7 - .string "The sea between PACIFIDLOG and\n" - .string "SLATEPORT has a fast-running tide.\p" - .string "If you decide to SURF, you could end\n" - .string "up swept away somewhere else.$" - -PacifidlogTown_Text_1EBB6C: @ 81EBB6C - .string "See, isn’t it neat?\n" - .string "These houses are on water!\p" - .string "I was born here!$" - -PacifidlogTown_Text_1EBBAC: @ 81EBBAC - .string "The SKY PILLAR?\p" - .string "…Oh, you must mean that tall, tall\n" - .string "tower a little further out.\p" - .string "If you asked me, I wouldn’t climb it.\n" - .string "It’s too scary to get up that high.\p" - .string "Life at sea level in PACIFIDLOG,\n" - .string "that suits me fine.$" - -PacifidlogTown_Text_1EBC7A: @ 81EBC7A - .string "PACIFIDLOG TOWN\p" - .string "“Where the morning sun smiles upon\n" - .string "the waters.â€$" - diff --git a/data/scripts/maps/PacifidlogTown_House1.inc b/data/scripts/maps/PacifidlogTown_House1.inc deleted file mode 100644 index b4fe4c979..000000000 --- a/data/scripts/maps/PacifidlogTown_House1.inc +++ /dev/null @@ -1,25 +0,0 @@ -PacifidlogTown_House1_MapScripts:: @ 820365C - .byte 0 - -PacifidlogTown_House1_EventScript_20365D:: @ 820365D - msgbox PacifidlogTown_House1_Text_20366F, 2 - end - -PacifidlogTown_House1_EventScript_203666:: @ 8203666 - msgbox PacifidlogTown_House1_Text_20373A, 2 - end - -PacifidlogTown_House1_Text_20366F: @ 820366F - .string "In the HOENN region, there are three\n" - .string "POKéMON that represent the power of\l" - .string "rock, ice, and steel.\p" - .string "Each of them is said to hide away deep\n" - .string "inside caves.\p" - .string "That’s the story I heard when I was\n" - .string "just a little kid.$" - -PacifidlogTown_House1_Text_20373A: @ 820373A - .string "“Six dots open three doors.â€\p" - .string "Grandpa used to say that, but I don’t\n" - .string "know what he meant.$" - diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc deleted file mode 100644 index 0e87677e6..000000000 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ /dev/null @@ -1,156 +0,0 @@ -PacifidlogTown_House2_MapScripts:: @ 8203791 - .byte 0 - -PacifidlogTown_House2_EventScript_203792:: @ 8203792 - lock - faceplayer - dodailyevents - call PacifidlogTown_House2_EventScript_2037DE - checkflag FLAG_0x12B - goto_eq PacifidlogTown_House2_EventScript_20387E - checkflag FLAG_0x12C - call_if 1, PacifidlogTown_House2_EventScript_2037F8 - checkflag FLAG_0x12C - call_if 0, PacifidlogTown_House2_EventScript_203801 - setflag FLAG_0x12C - specialvar VAR_RESULT, GetLeadMonFriendshipScore - compare VAR_RESULT, 4 - goto_if 4, PacifidlogTown_House2_EventScript_203816 - specialvar VAR_RESULT, GetLeadMonFriendshipScore - compare VAR_RESULT, 2 - goto_if 4, PacifidlogTown_House2_EventScript_203845 - goto PacifidlogTown_House2_EventScript_20384F - end - -PacifidlogTown_House2_EventScript_2037DE:: @ 82037DE - checkflag FLAG_0x12B - goto_if 0, PacifidlogTown_House2_EventScript_27374E - specialvar VAR_RESULT, sub_813970C - compare VAR_RESULT, 0 - call_if 1, PacifidlogTown_House2_EventScript_203812 - return - -PacifidlogTown_House2_EventScript_2037F8:: @ 82037F8 - msgbox PacifidlogTown_House2_Text_20395B, 4 - return - -PacifidlogTown_House2_EventScript_203801:: @ 8203801 - msgbox PacifidlogTown_House2_Text_2038C7, 4 - msgbox PacifidlogTown_House2_Text_20395B, 4 - return - -PacifidlogTown_House2_EventScript_203812:: @ 8203812 - clearflag FLAG_0x12B - return - -PacifidlogTown_House2_EventScript_203816:: @ 8203816 - msgbox PacifidlogTown_House2_Text_20396D, 4 - giveitem_std ITEM_TM27 - compare VAR_RESULT, 0 - goto_eq PacifidlogTown_House2_EventScript_272054 - setflag FLAG_0x12B - special sub_8139754 - msgbox PacifidlogTown_House2_Text_203A85, 4 - release - end - -PacifidlogTown_House2_EventScript_203845:: @ 8203845 - msgbox PacifidlogTown_House2_Text_2039CE, 4 - release - end - -PacifidlogTown_House2_EventScript_20384F:: @ 820384F - msgbox PacifidlogTown_House2_Text_203A2F, 4 - giveitem_std ITEM_TM21 - compare VAR_RESULT, 0 - goto_eq PacifidlogTown_House2_EventScript_272054 - setflag FLAG_0x12B - special sub_8139754 - msgbox PacifidlogTown_House2_Text_203A85, 4 - release - end - -PacifidlogTown_House2_EventScript_20387E:: @ 820387E - specialvar VAR_RESULT, sub_813970C - buffernumberstring 0, VAR_RESULT - msgbox PacifidlogTown_House2_Text_203AF4, 4 - release - end - -PacifidlogTown_House2_EventScript_203891:: @ 8203891 - lock - faceplayer - waitse - playmoncry SPECIES_AZURILL, 0 - msgbox PacifidlogTown_House2_Text_203B8D, 4 - waitmoncry - msgbox PacifidlogTown_House2_Text_203B9D, 4 - release - end - -PacifidlogTown_House2_EventScript_2038AC:: @ 82038AC - lock - faceplayer - waitse - playmoncry SPECIES_AZURILL, 2 - msgbox PacifidlogTown_House2_Text_203BCE, 4 - waitmoncry - msgbox PacifidlogTown_House2_Text_203BDF, 4 - release - end - -PacifidlogTown_House2_Text_2038C7: @ 82038C7 - .string "Er-hem!\p" - .string "I am the POKéMON FAN CLUB’s most\n" - .string "important person, the CHAIRMAN’s\l" - .string "younger brother.\p" - .string "I’m here enjoying my vacation with\n" - .string "POKéMON, yes, indeed.$" - -PacifidlogTown_House2_Text_20395B: @ 820395B - .string "Ah!\n" - .string "Your POKéMON…$" - -PacifidlogTown_House2_Text_20396D: @ 820396D - .string "It clearly likes you very much.\p" - .string "A POKéMON that adoring and adorable\n" - .string "deserves a TM like this, no?$" - -PacifidlogTown_House2_Text_2039CE: @ 82039CE - .string "Hmm…\n" - .string "It’s not bad, but it’s also not good.\p" - .string "You, as the TRAINER, need to put in\n" - .string "some more effort.$" - -PacifidlogTown_House2_Text_203A2F: @ 8203A2F - .string "It has a vicious look to it.\p" - .string "A frightening POKéMON like that\n" - .string "deserves a TM like this.$" - -PacifidlogTown_House2_Text_203A85: @ 8203A85 - .string "If a POKéMON likes you a lot, RETURN’s\n" - .string "power is enhanced.\p" - .string "If it doesn’t like you, FRUSTRATION’s\n" - .string "power goes up.$" - -PacifidlogTown_House2_Text_203AF4: @ 8203AF4 - .string "Oh, yes. In about {STR_VAR_1} or so days,\n" - .string "I should be getting a good TM or two.\p" - .string "You should come see me then.\n" - .string "I’ll give you a TM that’s suitable for\l" - .string "your POKéMON.$" - -PacifidlogTown_House2_Text_203B8D: @ 8203B8D - .string "AZURILL: Rurii.$" - -PacifidlogTown_House2_Text_203B9D: @ 8203B9D - .string "It appears to be very friendly with the\n" - .string "TRAINER.$" - -PacifidlogTown_House2_Text_203BCE: @ 8203BCE - .string "AZURILL: Rururi!$" - -PacifidlogTown_House2_Text_203BDF: @ 8203BDF - .string "It doesn’t appear to like the TRAINER\n" - .string "very much.$" - diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc deleted file mode 100644 index 98977b766..000000000 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ /dev/null @@ -1,93 +0,0 @@ -PacifidlogTown_House3_MapScripts:: @ 8203C10 - .byte 0 - -PacifidlogTown_House3_EventScript_203C11:: @ 8203C11 - lock - faceplayer - checkflag FLAG_0x09A - goto_eq PacifidlogTown_House3_EventScript_203CAB - setvar VAR_0x8008, 2 - copyvar VAR_0x8004, VAR_0x8008 - specialvar VAR_RESULT, sub_807E73C - copyvar VAR_0x8009, VAR_RESULT - msgbox PacifidlogTown_House3_Text_203CBE, 5 - compare VAR_RESULT, 0 - goto_eq PacifidlogTown_House3_EventScript_203C93 - special sub_81B94B0 - waitstate - copyvar VAR_0x800A, VAR_0x8004 - compare VAR_0x8004, 255 - goto_eq PacifidlogTown_House3_EventScript_203C93 - copyvar VAR_0x8005, VAR_0x800A - specialvar VAR_RESULT, sub_807E9D4 - copyvar VAR_0x800B, VAR_RESULT - compare VAR_RESULT, VAR_0x8009 - goto_if 5, PacifidlogTown_House3_EventScript_203C9D - copyvar VAR_0x8004, VAR_0x8008 - copyvar VAR_0x8005, VAR_0x800A - special sub_807EA10 - special sub_807F0E4 - waitstate - bufferspeciesname 0, VAR_0x8009 - msgbox PacifidlogTown_House3_Text_203D87, 4 - setflag FLAG_0x09A - release - end - -PacifidlogTown_House3_EventScript_203C93:: @ 8203C93 - msgbox PacifidlogTown_House3_Text_203E12, 4 - release - end - -PacifidlogTown_House3_EventScript_203C9D:: @ 8203C9D - bufferspeciesname 0, VAR_0x8009 - msgbox PacifidlogTown_House3_Text_203DDE, 4 - release - end - -PacifidlogTown_House3_EventScript_203CAB:: @ 8203CAB - msgbox PacifidlogTown_House3_Text_203E7F, 4 - release - end - -PacifidlogTown_House3_EventScript_203CB5:: @ 8203CB5 - msgbox PacifidlogTown_House3_Text_203EF1, 2 - end - -PacifidlogTown_House3_Text_203CBE: @ 8203CBE - .string "Check out this {STR_VAR_2}!\p" - .string "It’s the {STR_VAR_2} that I caught\n" - .string "yesterday to celebrate my birthday!\p" - .string "Oh, I can see that you want it!\n" - .string "After all, it’s priceless!\p" - .string "I’ll tell you what. I might be willing\n" - .string "to trade it for a {STR_VAR_1}.$" - -PacifidlogTown_House3_Text_203D87: @ 8203D87 - .string "Oh, so this is a {STR_VAR_1}?\p" - .string "It’s sort of like a {STR_VAR_2},\n" - .string "and yet it’s subtly different.\p" - .string "Thank you!$" - -PacifidlogTown_House3_Text_203DDE: @ 8203DDE - .string "No, no, no! I won’t accept any\n" - .string "less than a real {STR_VAR_1}!$" - -PacifidlogTown_House3_Text_203E12: @ 8203E12 - .string "Oh, so you’re not going to go through\n" - .string "with this?\p" - .string "That’s cool. I’m not desperate to make\n" - .string "a trade or anything.$" - -PacifidlogTown_House3_Text_203E7F: @ 8203E7F - .string "I know I could go looking for one\n" - .string "on my own, but…\p" - .string "But I really wanted to get a BAGON\n" - .string "that another TRAINER caught…$" - -PacifidlogTown_House3_Text_203EF1: @ 8203EF1 - .string "Is that a POKéDEX?\p" - .string "Did you get to meet a lot of different\n" - .string "POKéMON?\p" - .string "I wish I was like you.$" - diff --git a/data/scripts/maps/PacifidlogTown_House4.inc b/data/scripts/maps/PacifidlogTown_House4.inc deleted file mode 100644 index a3e9cf0a4..000000000 --- a/data/scripts/maps/PacifidlogTown_House4.inc +++ /dev/null @@ -1,55 +0,0 @@ -PacifidlogTown_House4_MapScripts:: @ 8203F4B - .byte 0 - -PacifidlogTown_House4_EventScript_203F4C:: @ 8203F4C - msgbox PacifidlogTown_House4_Text_204017, 2 - end - -PacifidlogTown_House4_EventScript_203F55:: @ 8203F55 - msgbox PacifidlogTown_House4_Text_203F93, 2 - end - -PacifidlogTown_House4_EventScript_203F5E:: @ 8203F5E - lock - faceplayer - msgbox PacifidlogTown_House4_Text_204035, 5 - compare VAR_RESULT, 1 - goto_eq PacifidlogTown_House4_EventScript_203F7F - compare VAR_RESULT, 0 - goto_eq PacifidlogTown_House4_EventScript_203F89 - end - -PacifidlogTown_House4_EventScript_203F7F:: @ 8203F7F - msgbox PacifidlogTown_House4_Text_20404E, 4 - release - end - -PacifidlogTown_House4_EventScript_203F89:: @ 8203F89 - msgbox PacifidlogTown_House4_Text_204084, 4 - release - end - -PacifidlogTown_House4_Text_203F93: @ 8203F93 - .string "People were saying they saw a POKéMON\n" - .string "flying high above HOENN.\p" - .string "Is it flying around all the time?\n" - .string "Doesn’t it need to rest somewhere?$" - -PacifidlogTown_House4_Text_204017: @ 8204017 - .string "A sky POKéMON!\n" - .string "A sky POKéMON!$" - -PacifidlogTown_House4_Text_204035: @ 8204035 - .string "Where did you come from?$" - -PacifidlogTown_House4_Text_20404E: @ 820404E - .string "Yes?\n" - .string "YES TOWN?\p" - .string "I’ve never heard of a place like that.$" - -PacifidlogTown_House4_Text_204084: @ 8204084 - .string "No? That doesn’t make any sense.\n" - .string "You have to come from somewhere.\p" - .string "Oh! Wait! You’re not going to say you\n" - .string "were born at the bottom of the sea?$" - diff --git a/data/scripts/maps/PacifidlogTown_House5.inc b/data/scripts/maps/PacifidlogTown_House5.inc deleted file mode 100644 index ec97a639e..000000000 --- a/data/scripts/maps/PacifidlogTown_House5.inc +++ /dev/null @@ -1,37 +0,0 @@ -PacifidlogTown_House5_MapScripts:: @ 8204110 - .byte 0 - -PacifidlogTown_House5_EventScript_204111:: @ 8204111 - lock - faceplayer - specialvar VAR_RESULT, IsMirageIslandPresent - compare VAR_RESULT, 1 - goto_eq PacifidlogTown_House5_EventScript_20412D - msgbox PacifidlogTown_House5_Text_204140, 4 - release - end - -PacifidlogTown_House5_EventScript_20412D:: @ 820412D - msgbox PacifidlogTown_House5_Text_204161, 4 - release - end - -PacifidlogTown_House5_EventScript_204137:: @ 8204137 - msgbox PacifidlogTown_House5_Text_20418B, 2 - end - -PacifidlogTown_House5_Text_204140: @ 8204140 - .string "I can’t see MIRAGE ISLAND today…$" - -PacifidlogTown_House5_Text_204161: @ 8204161 - .string "Oh! Oh my!\n" - .string "I can see MIRAGE ISLAND today!$" - -PacifidlogTown_House5_Text_20418B: @ 820418B - .string "MIRAGE ISLAND…\p" - .string "It must become visible and invisible\n" - .string "depending on the weather conditions\l" - .string "that make mirages appear.\p" - .string "Or is it really appearing and\n" - .string "disappearing?$" - diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc deleted file mode 100644 index fd34cd2aa..000000000 --- a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc +++ /dev/null @@ -1,48 +0,0 @@ -PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 82034A7 - map_script 3, PacifidlogTown_PokemonCenter_1F_MapScript1_2034B2 - map_script 5, PacifidlogTown_PokemonCenter_1F_MapScript1_277C30 - .byte 0 - -PacifidlogTown_PokemonCenter_1F_MapScript1_2034B2: @ 82034B2 - setrespawn 19 - end - -PacifidlogTown_PokemonCenter_1F_EventScript_2034B6:: @ 82034B6 - setvar VAR_0x800B, 1 - call PacifidlogTown_PokemonCenter_1F_EventScript_27191E - waitmessage - waitbuttonpress - release - end - -PacifidlogTown_PokemonCenter_1F_EventScript_2034C4:: @ 82034C4 - msgbox PacifidlogTown_PokemonCenter_1F_Text_2034DF, 2 - end - -PacifidlogTown_PokemonCenter_1F_EventScript_2034CD:: @ 82034CD - msgbox PacifidlogTown_PokemonCenter_1F_Text_20350F, 2 - end - -PacifidlogTown_PokemonCenter_1F_EventScript_2034D6:: @ 82034D6 - msgbox PacifidlogTown_PokemonCenter_1F_Text_20356F, 2 - end - -PacifidlogTown_PokemonCenter_1F_Text_2034DF: @ 82034DF - .string "What color is your TRAINER CARD?\n" - .string "Mine’s copper!$" - -PacifidlogTown_PokemonCenter_1F_Text_20350F: @ 820350F - .string "PACIFIDLOG TOWN floats on top of\n" - .string "a colony of CORSOLA.\p" - .string "If I told you that, would you believe\n" - .string "me?$" - -PacifidlogTown_PokemonCenter_1F_Text_20356F: @ 820356F - .string "The ancestors of the people in\n" - .string "PACIFIDLOG were said to have been\l" - .string "born on boats and then lived and died \l" - .string "aboard them.\p" - .string "I understand that they lived that way\n" - .string "because they were searching for\l" - .string "something.$" - diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc b/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc deleted file mode 100644 index 0199c2215..000000000 --- a/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc +++ /dev/null @@ -1,19 +0,0 @@ -PacifidlogTown_PokemonCenter_2F_MapScripts:: @ 8203635 - map_script 2, PacifidlogTown_PokemonCenter_2F_MapScript2_276C3B - map_script 4, PacifidlogTown_PokemonCenter_2F_MapScript2_276B6C - map_script 1, PacifidlogTown_PokemonCenter_2F_MapScript1_276BBE - map_script 3, PacifidlogTown_PokemonCenter_2F_MapScript1_276ACF - .byte 0 - -PacifidlogTown_PokemonCenter_2F_EventScript_20364A:: @ 820364A - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 - end - -PacifidlogTown_PokemonCenter_2F_EventScript_203650:: @ 8203650 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 - end - -PacifidlogTown_PokemonCenter_2F_EventScript_203656:: @ 8203656 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB - end - diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc deleted file mode 100644 index 67a9f83f3..000000000 --- a/data/scripts/maps/PetalburgCity.inc +++ /dev/null @@ -1,771 +0,0 @@ -PetalburgCity_MapScript1_1DC2D7: @ 81DC2D7 - setflag FLAG_VISITED_PETALBURG_CITY - compare VAR_0x4057, 0 - call_if 1, PetalburgCity_EventScript_1DC307 - compare VAR_0x4057, 2 - call_if 1, PetalburgCity_EventScript_1DC30F - compare VAR_0x4057, 4 - call_if 1, PetalburgCity_EventScript_1DC30F - compare VAR_0x4085, 8 - call_if 1, PetalburgCity_EventScript_1DC316 - end - -PetalburgCity_EventScript_1DC307:: @ 81DC307 - setobjectxyperm 8, 5, 11 - return - -PetalburgCity_EventScript_1DC30F:: @ 81DC30F - setflag FLAG_SPECIAL_FLAG_0x4000 - savebgm MUS_TSURETEK - return - -PetalburgCity_EventScript_1DC316:: @ 81DC316 - setvar VAR_0x4085, 7 - return - -PetalburgCity_MapScript2_1DC31C: @ 81DC31C - map_script_2 VAR_0x4057, 2, PetalburgCity_EventScript_1DC32E - map_script_2 VAR_0x4057, 4, PetalburgCity_EventScript_1DC390 - .2byte 0 - -PetalburgCity_EventScript_1DC32E:: @ 81DC32E - lockall - special SavePlayerParty - special PutZigzagoonInPlayerParty - applymovement 2, PetalburgCity_Movement_1DC451 - applymovement 255, PetalburgCity_Movement_1DC430 - waitmovement 0 - msgbox PetalburgCity_Text_1EC1F8, 4 - special StartWallyTutorialBattle - waitstate - msgbox PetalburgCity_Text_1EC271, 4 - applymovement 2, PetalburgCity_Movement_2725A4, MAP_PETALBURG_CITY - waitmovement 2, MAP_PETALBURG_CITY - msgbox PetalburgCity_Text_1EC297, 4 - closemessage - clearflag FLAG_SPECIAL_FLAG_0x4000 - setvar VAR_0x4057, 3 - fadedefaultbgm - clearflag FLAG_SPECIAL_FLAG_0x4001 - special LoadPlayerParty - setvar VAR_0x4085, 1 - warp MAP_PETALBURG_CITY_GYM, 255, 4, 108 - waitstate - releaseall - end - -PetalburgCity_EventScript_1DC390:: @ 81DC390 - lockall - setflag FLAG_SPECIAL_FLAG_0x4000 - applymovement 5, PetalburgCity_Movement_1DC41B - applymovement 255, PetalburgCity_Movement_1DC406 - waitmovement 0 - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 5 - opendoor VAR_0x8004, VAR_0x8005 - waitdooranim - applymovement 5, PetalburgCity_Movement_1DC42D - applymovement 255, PetalburgCity_Movement_1DC418 - waitmovement 0 - setflag FLAG_0x33E - hideobjectat 255, MAP_PETALBURG_CITY - closedoor VAR_0x8004, VAR_0x8005 - waitdooranim - clearflag FLAG_SPECIAL_FLAG_0x4000 - fadedefaultbgm - clearflag FLAG_SPECIAL_FLAG_0x4001 - warp MAP_PETALBURG_CITY_WALLYS_HOUSE, 255, 2, 4 - waitstate - releaseall - end - -PetalburgCity_EventScript_1DC3E6:: @ 81DC3E6 - lock - faceplayer - msgbox PetalburgCity_Text_1DC985, 4 - closemessage - applymovement 3, PetalburgCity_Movement_2725A2 - waitmovement 0 - release - end - -PetalburgCity_EventScript_1DC3FD:: @ 81DC3FD - msgbox PetalburgCity_Text_1DC837, 2 - end - -PetalburgCity_Movement_1DC406: @ 81DC406 - 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 - walk_up - walk_up - step_end - -PetalburgCity_Movement_1DC41B: @ 81DC41B - 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 - walk_up - set_invisible - step_end - -PetalburgCity_Movement_1DC430: @ 81DC430 - 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 - 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 - msgbox PetalburgCity_Text_1DCAAA, 3 - end - -PetalburgCity_EventScript_1DC47F:: @ 81DC47F - msgbox PetalburgCity_Text_1DCAF1, 3 - end - -PetalburgCity_EventScript_1DC488:: @ 81DC488 - msgbox PetalburgCity_Text_1DCA30, 2 - end - -PetalburgCity_EventScript_1DC491:: @ 81DC491 - msgbox PetalburgCity_Text_1DCB23, 3 - end - -PetalburgCity_EventScript_1DC49A:: @ 81DC49A - lockall - setvar VAR_0x8008, 0 - goto PetalburgCity_EventScript_1DC4CA - end - -PetalburgCity_EventScript_1DC4A6:: @ 81DC4A6 - lockall - setvar VAR_0x8008, 1 - goto PetalburgCity_EventScript_1DC4CA - end - -PetalburgCity_EventScript_1DC4B2:: @ 81DC4B2 - lockall - setvar VAR_0x8008, 2 - goto PetalburgCity_EventScript_1DC4CA - end - -PetalburgCity_EventScript_1DC4BE:: @ 81DC4BE - lockall - setvar VAR_0x8008, 3 - goto PetalburgCity_EventScript_1DC4CA - end - -PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA - applymovement 8, PetalburgCity_Movement_27259E - waitmovement 0 - playbgm MUS_TSURETEK, 0 - playse SE_PIN - applymovement 8, PetalburgCity_Movement_272598 - waitmovement 0 - applymovement 8, PetalburgCity_Movement_27259A - waitmovement 0 - compare VAR_0x8008, 0 - call_if 1, PetalburgCity_EventScript_1DC57F - compare VAR_0x8008, 1 - call_if 1, PetalburgCity_EventScript_1DC594 - compare VAR_0x8008, 2 - call_if 1, PetalburgCity_EventScript_1DC59F - compare VAR_0x8008, 3 - call_if 1, PetalburgCity_EventScript_1DC5B4 - msgbox PetalburgCity_Text_1DC881, 4 - closemessage - compare VAR_0x8008, 0 - call_if 1, PetalburgCity_EventScript_1DC5C9 - compare VAR_0x8008, 1 - call_if 1, PetalburgCity_EventScript_1DC5DB - compare VAR_0x8008, 2 - call_if 1, PetalburgCity_EventScript_1DC5ED - compare VAR_0x8008, 3 - call_if 1, PetalburgCity_EventScript_1DC5FF - msgbox PetalburgCity_Text_1DC91B, 4 - applymovement 8, PetalburgCity_Movement_2725A8 - applymovement 255, PetalburgCity_Movement_2725A8 - waitmovement 0 - msgbox PetalburgCity_Text_1DC93E, 4 - closemessage - applymovement 8, PetalburgCity_Movement_1DC658 - waitmovement 0 - fadedefaultbgm - releaseall - end - -PetalburgCity_EventScript_1DC57F:: @ 81DC57F - applymovement 8, PetalburgCity_Movement_1DC615 - waitmovement 0 - applymovement 255, PetalburgCity_Movement_2725AA - waitmovement 0 - return - -PetalburgCity_EventScript_1DC594:: @ 81DC594 - applymovement 8, PetalburgCity_Movement_1DC61A - waitmovement 0 - return - -PetalburgCity_EventScript_1DC59F:: @ 81DC59F - applymovement 8, PetalburgCity_Movement_1DC61D - waitmovement 0 - applymovement 255, PetalburgCity_Movement_2725A6 - waitmovement 0 - return - -PetalburgCity_EventScript_1DC5B4:: @ 81DC5B4 - applymovement 8, PetalburgCity_Movement_1DC622 - waitmovement 0 - applymovement 255, PetalburgCity_Movement_2725A6 - waitmovement 0 - return - -PetalburgCity_EventScript_1DC5C9:: @ 81DC5C9 - applymovement 8, PetalburgCity_Movement_1DC628 - applymovement 255, PetalburgCity_Movement_1DC665 - waitmovement 0 - return - -PetalburgCity_EventScript_1DC5DB:: @ 81DC5DB - applymovement 8, PetalburgCity_Movement_1DC633 - applymovement 255, PetalburgCity_Movement_1DC66F - waitmovement 0 - return - -PetalburgCity_EventScript_1DC5ED:: @ 81DC5ED - applymovement 8, PetalburgCity_Movement_1DC641 - applymovement 255, PetalburgCity_Movement_1DC67C - waitmovement 0 - return - -PetalburgCity_EventScript_1DC5FF:: @ 81DC5FF - applymovement 8, PetalburgCity_Movement_1DC64C - applymovement 255, PetalburgCity_Movement_1DC686 - waitmovement 0 - return - -PetalburgCity_Movement_1DC611:: @ 81DC611 - delay_16 - delay_16 - delay_16 - step_end - -PetalburgCity_Movement_1DC615: @ 81DC615 - walk_right - walk_right - walk_right - walk_in_place_fastest_up - step_end - -PetalburgCity_Movement_1DC61A: @ 81DC61A - walk_right - walk_right - step_end - -PetalburgCity_Movement_1DC61D: @ 81DC61D - walk_right - walk_right - walk_right - walk_in_place_fastest_down - step_end - -PetalburgCity_Movement_1DC622: @ 81DC622 - walk_down - walk_right - walk_right - walk_right - walk_in_place_fastest_down - step_end - -PetalburgCity_Movement_1DC628: @ 81DC628 - 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 - 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 - 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 - 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 - 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 - walk_down - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_up - step_end - -PetalburgCity_Movement_1DC66F: @ 81DC66F - 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 - walk_up - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_up - step_end - -PetalburgCity_Movement_1DC686: @ 81DC686 - 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 - lockall - addobject 9 - setvar VAR_0x8008, 0 - setobjectxy 9, 13, 10 - goto PetalburgCity_EventScript_1DC6E9 - end - -PetalburgCity_EventScript_1DC6A7:: @ 81DC6A7 - lockall - addobject 9 - setvar VAR_0x8008, 1 - setobjectxy 9, 13, 11 - goto PetalburgCity_EventScript_1DC6E9 - end - -PetalburgCity_EventScript_1DC6BD:: @ 81DC6BD - lockall - addobject 9 - setvar VAR_0x8008, 2 - setobjectxy 9, 13, 12 - goto PetalburgCity_EventScript_1DC6E9 - end - -PetalburgCity_EventScript_1DC6D3:: @ 81DC6D3 - lockall - addobject 9 - setvar VAR_0x8008, 3 - setobjectxy 9, 13, 13 - goto PetalburgCity_EventScript_1DC6E9 - end - -PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9 - applymovement 9, PetalburgCity_Movement_1DC7D6 - waitmovement 0 - playse SE_PIN - applymovement 9, PetalburgCity_Movement_272598 - waitmovement 0 - applymovement 9, PetalburgCity_Movement_27259A - waitmovement 0 - applymovement 9, PetalburgCity_Movement_1DC7DB - waitmovement 0 - applymovement 255, PetalburgCity_Movement_2725A8 - waitmovement 0 - setvar VAR_0x40D1, 1 - msgbox PetalburgCity_Text_1DCB31, 4 - closemessage - applymovement 9, PetalburgCity_Movement_2725A8 - waitmovement 0 - delay 30 - msgbox PetalburgCity_Text_1DCB82, 4 - closemessage - applymovement 9, PetalburgCity_Movement_2725A4 - waitmovement 0 - delay 30 - msgbox PetalburgCity_Text_1DCC09, 4 - closemessage - compare VAR_0x8008, 0 - call_if 1, PetalburgCity_EventScript_1DC78E - compare VAR_0x8008, 1 - call_if 1, PetalburgCity_EventScript_1DC7A0 - compare VAR_0x8008, 2 - call_if 1, PetalburgCity_EventScript_1DC7B2 - compare VAR_0x8008, 3 - call_if 1, PetalburgCity_EventScript_1DC7C4 - setvar VAR_0x40C9, 1 - removeobject 9 - releaseall - end - -PetalburgCity_EventScript_1DC78E:: @ 81DC78E - applymovement 255, PetalburgCity_Movement_1DC7EE - applymovement 9, PetalburgCity_Movement_1DC7E0 - waitmovement 0 - return - -PetalburgCity_EventScript_1DC7A0:: @ 81DC7A0 - applymovement 255, PetalburgCity_Movement_1DC802 - applymovement 9, PetalburgCity_Movement_1DC7F5 - waitmovement 0 - return - -PetalburgCity_EventScript_1DC7B2:: @ 81DC7B2 - applymovement 255, PetalburgCity_Movement_1DC815 - applymovement 9, PetalburgCity_Movement_1DC808 - waitmovement 0 - return - -PetalburgCity_EventScript_1DC7C4:: @ 81DC7C4 - applymovement 255, PetalburgCity_Movement_1DC828 - applymovement 9, PetalburgCity_Movement_1DC81B - waitmovement 0 - return - -PetalburgCity_Movement_1DC7D6: @ 81DC7D6 - walk_left - walk_left - walk_left - walk_left - step_end - -PetalburgCity_Movement_1DC7DB: @ 81DC7DB - walk_left - walk_left - walk_left - walk_left - step_end - -PetalburgCity_Movement_1DC7E0: @ 81DC7E0 - 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 - delay_16 - walk_in_place_fastest_down - delay_16 - delay_16 - delay_8 - walk_in_place_fastest_left - step_end - -PetalburgCity_Movement_1DC7F5: @ 81DC7F5 - 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 - delay_16 - walk_in_place_fastest_down - delay_16 - delay_8 - walk_in_place_fastest_left - step_end - -PetalburgCity_Movement_1DC808: @ 81DC808 - 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 - delay_16 - walk_in_place_fastest_down - delay_16 - delay_8 - walk_in_place_fastest_left - step_end - -PetalburgCity_Movement_1DC81B: @ 81DC81B - 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 - delay_16 - walk_in_place_fastest_up - delay_16 - delay_8 - walk_in_place_fastest_left - step_end - -PetalburgCity_EventScript_1DC82E:: @ 81DC82E - msgbox PetalburgCity_Text_1DC881, 2 - end - -PetalburgCity_Text_1DC837: @ 81DC837 - .string "Where has our WALLY gone?\p" - .string "We have to leave for VERDANTURF TOWN\n" - .string "very soon…$" - -PetalburgCity_Text_1DC881: @ 81DC881 - .string "Hiya! Are you maybe…\n" - .string "A rookie TRAINER?\p" - .string "Do you know what POKéMON TRAINERS\n" - .string "do when they reach a new town?\p" - .string "They first check what kind of GYM\n" - .string "is in the town.$" - -PetalburgCity_Text_1DC91B: @ 81DC91B - .string "See? This is PETALBURG CITY’s GYM.$" - -PetalburgCity_Text_1DC93E: @ 81DC93E - .string "This is the GYM’s sign. Look for it\n" - .string "whenever you’re looking for a GYM.$" - -PetalburgCity_Text_1DC985: @ 81DC985 - .string "My face is reflected in the water.\p" - .string "It’s a shining grin full of hope…\p" - .string "Or it could be a look of somber silence\n" - .string "struggling with fear…\p" - .string "What do you see reflected in your face?$" - -PetalburgCity_Text_1DCA30: @ 81DCA30 - .string "Let’s say you have six POKéMON.\n" - .string "If you catch another one…\p" - .string "It is automatically sent to a STORAGE\n" - .string "BOX over a PC connection.$" - -PetalburgCity_Text_1DCAAA: @ 81DCAAA - .string "PETALBURG CITY POKéMON GYM\n" - .string "LEADER: NORMAN\l" - .string "“A man in pursuit of power!â€$" - -PetalburgCity_Text_1DCAF1: @ 81DCAF1 - .string "PETALBURG CITY\n" - .string "“Where people mingle with nature.â€$" - -PetalburgCity_Text_1DCB23: @ 81DCB23 - .string "WALLY’S HOUSE$" - -PetalburgCity_Text_1DCB31: @ 81DCB31 - .string "Excuse me!\p" - .string "Let me guess, from the way you’re\n" - .string "dressed, are you a POKéMON TRAINER?$" - -PetalburgCity_Text_1DCB82: @ 81DCB82 - .string "… … … … … …\p" - .string "Well, maybe not.\n" - .string "Your clothes aren’t all that dirty.\p" - .string "You’re either a rookie TRAINER,\n" - .string "or maybe you’re just an ordinary kid.$" - -PetalburgCity_Text_1DCC09: @ 81DCC09 - .string "I’m roaming the land in search of\n" - .string "talented TRAINERS.\p" - .string "I’m sorry to have taken your time.$" diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc deleted file mode 100644 index e95e434b5..000000000 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ /dev/null @@ -1,1703 +0,0 @@ -PetalburgCity_Gym_MapScripts:: @ 8204889 - map_script 1, PetalburgCity_Gym_MapScript1_20489E - map_script 3, PetalburgCity_Gym_MapScript1_20492D - map_script 4, PetalburgCity_Gym_MapScript2_20498B - map_script 2, PetalburgCity_Gym_MapScript2_20499A - .byte 0 - -PetalburgCity_Gym_MapScript1_20489E: @ 820489E - compare VAR_0x4085, 6 - goto_eq PetalburgCity_Gym_EventScript_2048B5 - compare VAR_0x4085, 7 - call_if 4, PetalburgCity_Gym_EventScript_2048FF - end - -PetalburgCity_Gym_EventScript_2048B5:: @ 82048B5 - setvar VAR_0x8005, 1 - call PetalburgCity_Gym_EventScript_20555E - checktrainerflag TRAINER_RANDALL - call_if 1, PetalburgCity_Gym_EventScript_20557F - checktrainerflag TRAINER_MARY - call_if 1, PetalburgCity_Gym_EventScript_2055A0 - checktrainerflag TRAINER_PARKER - call_if 1, PetalburgCity_Gym_EventScript_2055C1 - checktrainerflag TRAINER_ALEXIA - call_if 1, PetalburgCity_Gym_EventScript_2055E2 - checktrainerflag TRAINER_GEORGE - call_if 1, PetalburgCity_Gym_EventScript_205603 - checktrainerflag TRAINER_JODY - call_if 1, PetalburgCity_Gym_EventScript_205624 - checktrainerflag TRAINER_BERKE - call_if 1, PetalburgCity_Gym_EventScript_205645 - end - -PetalburgCity_Gym_EventScript_2048FF:: @ 82048FF - setvar VAR_0x8005, 1 - call PetalburgCity_Gym_EventScript_20555E - call PetalburgCity_Gym_EventScript_20557F - call PetalburgCity_Gym_EventScript_2055A0 - call PetalburgCity_Gym_EventScript_2055C1 - call PetalburgCity_Gym_EventScript_2055E2 - call PetalburgCity_Gym_EventScript_205603 - call PetalburgCity_Gym_EventScript_205624 - call PetalburgCity_Gym_EventScript_205645 - return - -PetalburgCity_Gym_MapScript1_20492D: @ 820492D - compare VAR_0x4085, 1 - call_if 1, PetalburgCity_Gym_EventScript_20494D - compare VAR_0x4085, 6 - call_if 0, PetalburgCity_Gym_EventScript_204955 - checkflag FLAG_SYS_GAME_CLEAR - call_if 1, PetalburgCity_Gym_EventScript_20495D - end - -PetalburgCity_Gym_EventScript_20494D:: @ 820494D - setobjectxyperm 10, 5, 108 - return - -PetalburgCity_Gym_EventScript_204955:: @ 8204955 - setobjectxyperm 1, 4, 107 - return - -PetalburgCity_Gym_EventScript_20495D:: @ 820495D - setorcopyvar 0x8015, 269 - specialvar VAR_RESULT, IsTrainerReadyForRematch - compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_204985 - compare VAR_0x4085, 8 - goto_eq PetalburgCity_Gym_EventScript_204985 - setobjectxyperm 1, 4, 107 - return - -PetalburgCity_Gym_EventScript_204985:: @ 8204985 - setvar VAR_0x4085, 8 - end - -PetalburgCity_Gym_MapScript2_20498B: @ 820498B - map_script_2 VAR_0x4085, 1, PetalburgCity_Gym_EventScript_204995 - .2byte 0 - -PetalburgCity_Gym_EventScript_204995:: @ 8204995 - turnobject 255, 2 - end - -PetalburgCity_Gym_MapScript2_20499A: @ 820499A - map_script_2 VAR_0x4085, 1, PetalburgCity_Gym_EventScript_2049A4 - .2byte 0 - -PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4 - lockall - msgbox PetalburgCity_Gym_Text_205B32, 4 - msgbox PetalburgCity_Gym_Text_205B4C, 4 - closemessage - applymovement 255, PetalburgCity_Gym_Movement_2725AA - applymovement 10, PetalburgCity_Gym_Movement_2049EC - waitmovement 0 - playse SE_KAIDAN - removeobject 10 - setflag FLAG_0x2D6 - delay 30 - applymovement 255, PetalburgCity_Gym_Movement_2725A6 - waitmovement 0 - msgbox PetalburgCity_Gym_Text_205C40, 4 - setvar VAR_0x4085, 2 - releaseall - end - -PetalburgCity_Gym_Movement_2049EC: @ 82049EC - walk_down - walk_down - walk_down - delay_16 - step_end - -PetalburgCity_Gym_EventScript_2049F1:: @ 82049F1 - lock - faceplayer - switch VAR_0x4085 - case 2, PetalburgCity_Gym_EventScript_204D4A - case 3, PetalburgCity_Gym_EventScript_204D54 - case 4, PetalburgCity_Gym_EventScript_204D5E - case 5, PetalburgCity_Gym_EventScript_204D68 - case 6, PetalburgCity_Gym_EventScript_204E3B - case 7, PetalburgCity_Gym_EventScript_204D80 - case 8, PetalburgCity_Gym_EventScript_204DB3 - msgbox PetalburgCity_Gym_Text_2057A2, 4 - closemessage - switch VAR_FACING - case 1, PetalburgCity_Gym_EventScript_204A80 - case 2, PetalburgCity_Gym_EventScript_204A8B - case 3, PetalburgCity_Gym_EventScript_204A96 - case 4, PetalburgCity_Gym_EventScript_204AA1 - end - -PetalburgCity_Gym_EventScript_204A80:: @ 8204A80 - setvar VAR_0x8008, 0 - goto PetalburgCity_Gym_EventScript_204AAC - end - -PetalburgCity_Gym_EventScript_204A8B:: @ 8204A8B - setvar VAR_0x8008, 1 - goto PetalburgCity_Gym_EventScript_204AAC - end - -PetalburgCity_Gym_EventScript_204A96:: @ 8204A96 - setvar VAR_0x8008, 2 - goto PetalburgCity_Gym_EventScript_204AAC - end - -PetalburgCity_Gym_EventScript_204AA1:: @ 8204AA1 - setvar VAR_0x8008, 3 - goto PetalburgCity_Gym_EventScript_204AAC - end - -PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC - addobject 10 - playse SE_DOOR - compare VAR_0x8008, 0 - call_if 1, PetalburgCity_Gym_EventScript_204C31 - compare VAR_0x8008, 1 - call_if 1, PetalburgCity_Gym_EventScript_204C43 - compare VAR_0x8008, 2 - call_if 1, PetalburgCity_Gym_EventScript_204C5F - compare VAR_0x8008, 3 - call_if 1, PetalburgCity_Gym_EventScript_204C5F - msgbox PetalburgCity_Gym_Text_2058B1, 4 - msgbox PetalburgCity_Gym_Text_2058DB, 4 - msgbox PetalburgCity_Gym_Text_205910, 4 - msgbox PetalburgCity_Gym_Text_2059D8, 4 - compare VAR_0x8008, 0 - call_if 1, PetalburgCity_Gym_EventScript_204CC7 - compare VAR_0x8008, 1 - call_if 1, PetalburgCity_Gym_EventScript_204CD2 - compare VAR_0x8008, 2 - call_if 1, PetalburgCity_Gym_EventScript_204CE4 - compare VAR_0x8008, 3 - call_if 1, PetalburgCity_Gym_EventScript_204CF6 - msgbox PetalburgCity_Gym_Text_2059E8, 4 - compare VAR_0x8008, 0 - call_if 1, PetalburgCity_Gym_EventScript_204D08 - compare VAR_0x8008, 1 - call_if 1, PetalburgCity_Gym_EventScript_204D13 - compare VAR_0x8008, 2 - call_if 1, PetalburgCity_Gym_EventScript_204D1E - compare VAR_0x8008, 3 - call_if 1, PetalburgCity_Gym_EventScript_204D29 - msgbox PetalburgCity_Gym_Text_205A46, 4 - msgbox PetalburgCity_Gym_Text_205A89, 4 - msgbox PetalburgCity_Gym_Text_205AF4, 4 - compare VAR_0x8008, 0 - call_if 1, PetalburgCity_Gym_EventScript_204D72 - compare VAR_0x8008, 1 - call_if 1, PetalburgCity_Gym_EventScript_204D73 - compare VAR_0x8008, 2 - call_if 1, PetalburgCity_Gym_EventScript_204D7E - compare VAR_0x8008, 3 - call_if 1, PetalburgCity_Gym_EventScript_204D7F - compare VAR_0x8008, 0 - call_if 1, PetalburgCity_Gym_EventScript_204D34 - compare VAR_0x8008, 1 - call_if 1, PetalburgCity_Gym_EventScript_204D3F - compare VAR_0x8008, 2 - call_if 1, PetalburgCity_Gym_EventScript_204D34 - compare VAR_0x8008, 3 - call_if 1, PetalburgCity_Gym_EventScript_204D34 - msgbox PetalburgCity_Gym_Text_205B0F, 4 - closemessage - setflag FLAG_SPECIAL_FLAG_0x4001 - playbgm MUS_TSURETEK, 0 - compare VAR_0x8008, 0 - call_if 1, PetalburgCity_Gym_EventScript_204C78 - compare VAR_0x8008, 1 - call_if 1, PetalburgCity_Gym_EventScript_204C91 - compare VAR_0x8008, 2 - call_if 1, PetalburgCity_Gym_EventScript_204CA3 - compare VAR_0x8008, 3 - call_if 1, PetalburgCity_Gym_EventScript_204CB5 - removeobject 10 - setflag FLAG_0x2D8 - setvar VAR_0x4085, 1 - setvar VAR_0x4057, 2 - clearflag FLAG_0x2D6 - clearflag FLAG_0x362 - setflag FLAG_0x379 - special InitBirchState - warp MAP_PETALBURG_CITY, 255, 15, 8 - waitstate - release - end - -PetalburgCity_Gym_EventScript_204C31:: @ 8204C31 - applymovement 1, PetalburgCity_Gym_Movement_2725AA - applymovement 10, PetalburgCity_Gym_Movement_2050EB - waitmovement 0 - return - -PetalburgCity_Gym_EventScript_204C43:: @ 8204C43 - applymovement 10, PetalburgCity_Gym_Movement_2050E1 - waitmovement 0 - applymovement 1, PetalburgCity_Gym_Movement_2725A8 - applymovement 255, PetalburgCity_Gym_Movement_2725A8 - waitmovement 0 - return - -PetalburgCity_Gym_EventScript_204C5F:: @ 8204C5F - applymovement 1, PetalburgCity_Gym_Movement_2725AA - applymovement 255, PetalburgCity_Gym_Movement_2725AA - applymovement 10, PetalburgCity_Gym_Movement_2050EB - waitmovement 0 - return - -PetalburgCity_Gym_EventScript_204C78:: @ 8204C78 - applymovement 1, PetalburgCity_Gym_Movement_2725AA - applymovement 10, PetalburgCity_Gym_Movement_205102 - applymovement 255, PetalburgCity_Gym_Movement_205111 - waitmovement 0 - return - -PetalburgCity_Gym_EventScript_204C91:: @ 8204C91 - applymovement 10, PetalburgCity_Gym_Movement_2050F2 - applymovement 255, PetalburgCity_Gym_Movement_205109 - waitmovement 0 - return - -PetalburgCity_Gym_EventScript_204CA3:: @ 8204CA3 - applymovement 10, PetalburgCity_Gym_Movement_205102 - applymovement 255, PetalburgCity_Gym_Movement_20511B - waitmovement 0 - return - -PetalburgCity_Gym_EventScript_204CB5:: @ 8204CB5 - applymovement 10, PetalburgCity_Gym_Movement_2050FA - applymovement 255, PetalburgCity_Gym_Movement_205123 - waitmovement 0 - return - -PetalburgCity_Gym_EventScript_204CC7:: @ 8204CC7 - applymovement 1, PetalburgCity_Gym_Movement_2725A6 - waitmovement 0 - return - -PetalburgCity_Gym_EventScript_204CD2:: @ 8204CD2 - applymovement 1, PetalburgCity_Gym_Movement_2725AA - applymovement 255, PetalburgCity_Gym_Movement_2725A6 - waitmovement 0 - return - -PetalburgCity_Gym_EventScript_204CE4:: @ 8204CE4 - applymovement 1, PetalburgCity_Gym_Movement_2725A8 - applymovement 255, PetalburgCity_Gym_Movement_2725A4 - waitmovement 0 - return - -PetalburgCity_Gym_EventScript_204CF6:: @ 8204CF6 - applymovement 1, PetalburgCity_Gym_Movement_2725A4 - applymovement 255, PetalburgCity_Gym_Movement_2725A8 - waitmovement 0 - return - -PetalburgCity_Gym_EventScript_204D08:: @ 8204D08 - applymovement 1, PetalburgCity_Gym_Movement_2725AA - waitmovement 0 - return - -PetalburgCity_Gym_EventScript_204D13:: @ 8204D13 - applymovement 1, PetalburgCity_Gym_Movement_2725A8 - waitmovement 0 - return - -PetalburgCity_Gym_EventScript_204D1E:: @ 8204D1E - applymovement 1, PetalburgCity_Gym_Movement_2725AA - waitmovement 0 - return - -PetalburgCity_Gym_EventScript_204D29:: @ 8204D29 - applymovement 1, PetalburgCity_Gym_Movement_2725AA - waitmovement 0 - return - -PetalburgCity_Gym_EventScript_204D34:: @ 8204D34 - applymovement 10, PetalburgCity_Gym_Movement_27259E - waitmovement 0 - return - -PetalburgCity_Gym_EventScript_204D3F:: @ 8204D3F - applymovement 10, PetalburgCity_Gym_Movement_2725AA - waitmovement 0 - return - -PetalburgCity_Gym_EventScript_204D4A:: @ 8204D4A - msgbox PetalburgCity_Gym_Text_205DB4, 4 - release - end - -PetalburgCity_Gym_EventScript_204D54:: @ 8204D54 - msgbox PetalburgCity_Gym_Text_205EAE, 4 - release - end - -PetalburgCity_Gym_EventScript_204D5E:: @ 8204D5E - msgbox PetalburgCity_Gym_Text_205F87, 4 - release - end - -PetalburgCity_Gym_EventScript_204D68:: @ 8204D68 - msgbox PetalburgCity_Gym_Text_205F87, 4 - release - end - -PetalburgCity_Gym_EventScript_204D72:: @ 8204D72 - return - -PetalburgCity_Gym_EventScript_204D73:: @ 8204D73 - applymovement 1, PetalburgCity_Gym_Movement_2725AA - waitmovement 0 - return - -PetalburgCity_Gym_EventScript_204D7E:: @ 8204D7E - return - -PetalburgCity_Gym_EventScript_204D7F:: @ 8204D7F - return - -PetalburgCity_Gym_EventScript_204D80:: @ 8204D80 - call PetalburgCity_Gym_EventScript_204DCE - compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_204E1D - checkflag FLAG_0x0A9 - goto_if 0, PetalburgCity_Gym_EventScript_204DAC - checkflag FLAG_SYS_GAME_CLEAR - goto_eq PetalburgCity_Gym_EventScript_20512D - msgbox PetalburgCity_Gym_Text_206417, 4 - release - end - -PetalburgCity_Gym_EventScript_204DAC:: @ 8204DAC - call PetalburgCity_Gym_EventScript_204ED2 - release - end - -PetalburgCity_Gym_EventScript_204DB3:: @ 8204DB3 - trainerbattle 7, TRAINER_NORMAN_1, 0, PetalburgCity_Gym_Text_2074A2, PetalburgCity_Gym_Text_2075CE, PetalburgCity_Gym_Text_20764A - msgbox PetalburgCity_Gym_Text_2075F7, 6 - end - -PetalburgCity_Gym_EventScript_204DCE:: @ 8204DCE - specialvar VAR_RESULT, IsEnigmaBerryValid - compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_204E17 - checkitem ITEM_ENIGMA_BERRY, 1 - compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_204E17 - checkpcitem ITEM_ENIGMA_BERRY, 1 - compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_204E17 - compare VAR_ENIGMA_BERRY_AVAILABLE, 0 - goto_eq PetalburgCity_Gym_EventScript_204E17 - msgbox PetalburgCity_Gym_Text_2A6D3D, 4 - setvar VAR_RESULT, 1 - return - -PetalburgCity_Gym_EventScript_204E17:: @ 8204E17 - setvar VAR_RESULT, 0 - return - -PetalburgCity_Gym_EventScript_204E1D:: @ 8204E1D - giveitem_std ITEM_ENIGMA_BERRY - compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_272054 - setvar VAR_ENIGMA_BERRY_AVAILABLE, 0 - release - end - -PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B - msgbox PetalburgCity_Gym_Text_205FE5, 4 - trainerbattle 3, TRAINER_NORMAN_1, 0, PetalburgCity_Gym_Text_206107 - message PetalburgCity_Gym_Text_206162 - waitmessage - call PetalburgCity_Gym_EventScript_27207E - msgbox PetalburgCity_Gym_Text_20618A, 4 - setflag FLAG_0x4F4 - setvar VAR_0x4085, 7 - setflag FLAG_BADGE05_GET - special sub_813B9A0 - call PetalburgCity_Gym_EventScript_2721F8 - setflag FLAG_SPRITEVIS_MAUVILLE_GYM_WATTSON - clearflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON - setvar VAR_0x8008, 5 - call PetalburgCity_Gym_EventScript_271F43 - clearflag FLAG_0x3AC - call PetalburgCity_Gym_EventScript_2048FF - special DrawWholeMapView - call PetalburgCity_Gym_EventScript_204ED2 - delay 30 - msgbox PetalburgCity_Gym_Text_2062FB, 4 - closemessage - delay 40 - playse SE_DOOR - delay 10 - addobject 11 - switch VAR_FACING - case 2, PetalburgCity_Gym_EventScript_204EF5 - case 3, PetalburgCity_Gym_EventScript_204F09 - case 4, PetalburgCity_Gym_EventScript_204EFF - end - -PetalburgCity_Gym_EventScript_204ED2:: @ 8204ED2 - giveitem_std ITEM_TM42 - compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_27205E - setflag FLAG_0x0A9 - msgbox PetalburgCity_Gym_Text_206254, 4 - return - -PetalburgCity_Gym_EventScript_204EF5:: @ 8204EF5 - setvar VAR_0x8008, 1 - goto PetalburgCity_Gym_EventScript_204F13 - -PetalburgCity_Gym_EventScript_204EFF:: @ 8204EFF - setvar VAR_0x8008, 2 - goto PetalburgCity_Gym_EventScript_204F13 - -PetalburgCity_Gym_EventScript_204F09:: @ 8204F09 - setvar VAR_0x8008, 3 - goto PetalburgCity_Gym_EventScript_204F13 - -PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 - applymovement 11, PetalburgCity_Gym_Movement_2050BB - waitmovement 0 - playse SE_PIN - applymovement 11, PetalburgCity_Gym_Movement_272598 - waitmovement 0 - applymovement 11, PetalburgCity_Gym_Movement_27259A - waitmovement 0 - delay 10 - compare VAR_0x8008, 1 - call_if 1, PetalburgCity_Gym_EventScript_204FED - compare VAR_0x8008, 2 - call_if 1, PetalburgCity_Gym_EventScript_205009 - compare VAR_0x8008, 3 - call_if 1, PetalburgCity_Gym_EventScript_205025 - msgbox PetalburgCity_Gym_Text_206377, 4 - closemessage - delay 20 - compare VAR_0x8008, 1 - call_if 1, PetalburgCity_Gym_EventScript_204FCC - compare VAR_0x8008, 2 - call_if 1, PetalburgCity_Gym_EventScript_204FD7 - compare VAR_0x8008, 3 - call_if 1, PetalburgCity_Gym_EventScript_204FE2 - msgbox PetalburgCity_Gym_Text_2063CA, 4 - closemessage - setflag FLAG_SPECIAL_FLAG_0x4001 - playbgm MUS_TSURETEK, 0 - compare VAR_0x8008, 1 - call_if 1, PetalburgCity_Gym_EventScript_205041 - compare VAR_0x8008, 2 - call_if 1, PetalburgCity_Gym_EventScript_20505A - compare VAR_0x8008, 3 - call_if 1, PetalburgCity_Gym_EventScript_20506C - removeobject 11 - setvar VAR_0x4057, 4 - clearflag FLAG_0x33E - warp MAP_PETALBURG_CITY, 255, 15, 8 - waitstate - release - end - -PetalburgCity_Gym_EventScript_204FCC:: @ 8204FCC - applymovement 11, PetalburgCity_Gym_Movement_2725A6 - waitmovement 0 - return - -PetalburgCity_Gym_EventScript_204FD7:: @ 8204FD7 - applymovement 11, PetalburgCity_Gym_Movement_2725A8 - waitmovement 0 - return - -PetalburgCity_Gym_EventScript_204FE2:: @ 8204FE2 - applymovement 11, PetalburgCity_Gym_Movement_2725A4 - waitmovement 0 - return - -PetalburgCity_Gym_EventScript_204FED:: @ 8204FED - applymovement 11, PetalburgCity_Gym_Movement_2050C3 - waitmovement 0 - applymovement 255, PetalburgCity_Gym_Movement_2725A4 - applymovement 1, PetalburgCity_Gym_Movement_2725A4 - waitmovement 0 - return - -PetalburgCity_Gym_EventScript_205009:: @ 8205009 - applymovement 11, PetalburgCity_Gym_Movement_2050CA - waitmovement 0 - applymovement 255, PetalburgCity_Gym_Movement_2725AA - applymovement 1, PetalburgCity_Gym_Movement_2725AA - waitmovement 0 - return - -PetalburgCity_Gym_EventScript_205025:: @ 8205025 - applymovement 11, PetalburgCity_Gym_Movement_2050D0 - waitmovement 0 - applymovement 255, PetalburgCity_Gym_Movement_2725AA - applymovement 1, PetalburgCity_Gym_Movement_2725AA - waitmovement 0 - return - -PetalburgCity_Gym_EventScript_205041:: @ 8205041 - applymovement 11, PetalburgCity_Gym_Movement_20507E - applymovement 1, PetalburgCity_Gym_Movement_2725AA - applymovement 255, PetalburgCity_Gym_Movement_2050A1 - waitmovement 0 - return - -PetalburgCity_Gym_EventScript_20505A:: @ 820505A - applymovement 11, PetalburgCity_Gym_Movement_205089 - applymovement 255, PetalburgCity_Gym_Movement_2050A9 - waitmovement 0 - return - -PetalburgCity_Gym_EventScript_20506C:: @ 820506C - applymovement 11, PetalburgCity_Gym_Movement_205094 - applymovement 255, PetalburgCity_Gym_Movement_2050B1 - waitmovement 0 - return - -PetalburgCity_Gym_Movement_20507E: @ 820507E - 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 - 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 - 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 - delay_16 - walk_down - walk_down - walk_left - walk_left - walk_down - walk_down - step_end - -PetalburgCity_Gym_Movement_2050A9: @ 82050A9 - delay_16 - walk_down - walk_down - walk_left - walk_down - walk_down - walk_down - step_end - -PetalburgCity_Gym_Movement_2050B1: @ 82050B1 - 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 - 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 - walk_right - walk_right - walk_up - walk_up - walk_up - walk_in_place_fastest_right - step_end - -PetalburgCity_Gym_Movement_2050CA: @ 82050CA - walk_right - walk_right - walk_up - walk_up - walk_up - step_end - -PetalburgCity_Gym_Movement_2050D0: @ 82050D0 - walk_right - walk_right - walk_up - walk_up - walk_right - walk_right - walk_up - step_end - -PetalburgCity_Gym_Movement_2050D8: @ 82050D8 - 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 - 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 - delay_16 - walk_up - delay_16 - delay_8 - walk_up - walk_up - step_end - -PetalburgCity_Gym_Movement_2050F2: @ 82050F2 - 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 - 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 - walk_down - walk_down - walk_down - walk_in_place_fastest_up - delay_16 - walk_in_place_down - step_end - -PetalburgCity_Gym_Movement_205109: @ 8205109 - delay_16 - delay_16 - delay_16 - walk_down - walk_down - walk_down - delay_8 - step_end - -PetalburgCity_Gym_Movement_205111: @ 8205111 - 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 - delay_16 - delay_16 - walk_down - walk_down - walk_down - walk_down - delay_8 - step_end - -PetalburgCity_Gym_Movement_205123: @ 8205123 - 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 - msgbox PetalburgCity_Gym_Text_2064C3, 4 - release - end - -PetalburgCity_Gym_EventScript_205137:: @ 8205137 - lockall - compare VAR_0x4085, 6 - goto_if 0, PetalburgCity_Gym_EventScript_20517D - setvar VAR_0x8008, 7 - setvar VAR_0x8009, 85 - msgbox PetalburgCity_Gym_Text_20721E, 5 - compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C - compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B - end - -PetalburgCity_Gym_EventScript_20516C:: @ 820516C - closemessage - delay 30 - warpdoor MAP_PETALBURG_CITY_GYM, 255, 32776, 32777 - waitstate - releaseall - end - -PetalburgCity_Gym_EventScript_20517B:: @ 820517B - releaseall - end - -PetalburgCity_Gym_EventScript_20517D:: @ 820517D - msgbox PetalburgCity_Gym_Text_2071F4, 4 - releaseall - end - -PetalburgCity_Gym_EventScript_205187:: @ 8205187 - lockall - compare VAR_0x4085, 6 - goto_if 0, PetalburgCity_Gym_EventScript_20517D - setvar VAR_0x8008, 1 - setvar VAR_0x8009, 98 - msgbox PetalburgCity_Gym_Text_207280, 5 - compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C - compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B - end - -PetalburgCity_Gym_EventScript_2051BC:: @ 82051BC - lockall - checktrainerflag TRAINER_RANDALL - goto_if 0, PetalburgCity_Gym_EventScript_20517D - setvar VAR_0x8008, 7 - setvar VAR_0x8009, 46 - msgbox PetalburgCity_Gym_Text_2072BB, 5 - compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C - compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B - end - -PetalburgCity_Gym_EventScript_2051EF:: @ 82051EF - lockall - checktrainerflag TRAINER_RANDALL - goto_if 0, PetalburgCity_Gym_EventScript_20517D - setvar VAR_0x8008, 1 - setvar VAR_0x8009, 59 - msgbox PetalburgCity_Gym_Text_2072F7, 5 - compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C - compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B - end - -PetalburgCity_Gym_EventScript_205222:: @ 8205222 - lockall - checktrainerflag TRAINER_MARY - goto_if 0, PetalburgCity_Gym_EventScript_20517D - setvar VAR_0x8008, 7 - setvar VAR_0x8009, 59 - msgbox PetalburgCity_Gym_Text_2072F7, 5 - compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C - compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B - end - -PetalburgCity_Gym_EventScript_205255:: @ 8205255 - lockall - checktrainerflag TRAINER_MARY - goto_if 0, PetalburgCity_Gym_EventScript_20517D - setvar VAR_0x8008, 1 - setvar VAR_0x8009, 72 - msgbox PetalburgCity_Gym_Text_207331, 5 - compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C - compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B - end - -PetalburgCity_Gym_EventScript_205288:: @ 8205288 - lockall - checktrainerflag TRAINER_PARKER - goto_if 0, PetalburgCity_Gym_EventScript_20517D - setvar VAR_0x8008, 1 - setvar VAR_0x8009, 20 - msgbox PetalburgCity_Gym_Text_20736C, 5 - compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C - compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B - end - -PetalburgCity_Gym_EventScript_2052BB:: @ 82052BB - lockall - checktrainerflag TRAINER_ALEXIA - goto_if 0, PetalburgCity_Gym_EventScript_20517D - setvar VAR_0x8008, 7 - setvar VAR_0x8009, 20 - msgbox PetalburgCity_Gym_Text_20736C, 5 - compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C - compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B - end - -PetalburgCity_Gym_EventScript_2052EE:: @ 82052EE - lockall - checktrainerflag TRAINER_ALEXIA - goto_if 0, PetalburgCity_Gym_EventScript_20517D - setvar VAR_0x8008, 1 - setvar VAR_0x8009, 33 - msgbox PetalburgCity_Gym_Text_2073A7, 5 - compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C - compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B - end - -PetalburgCity_Gym_EventScript_205321:: @ 8205321 - lockall - checktrainerflag TRAINER_GEORGE - goto_if 0, PetalburgCity_Gym_EventScript_20517D - setvar VAR_0x8008, 7 - setvar VAR_0x8009, 33 - msgbox PetalburgCity_Gym_Text_2073A7, 5 - compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C - compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B - end - -PetalburgCity_Gym_EventScript_205354:: @ 8205354 - lockall - checktrainerflag TRAINER_JODY - goto_if 0, PetalburgCity_Gym_EventScript_20517D - setvar VAR_0x8008, 1 - setvar VAR_0x8009, 7 - msgbox PetalburgCity_Gym_Text_2073E4, 5 - compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C - compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B - end - -PetalburgCity_Gym_EventScript_205387:: @ 8205387 - lockall - checktrainerflag TRAINER_BERKE - goto_if 0, PetalburgCity_Gym_EventScript_20517D - setvar VAR_0x8008, 7 - setvar VAR_0x8009, 7 - msgbox PetalburgCity_Gym_Text_2073E4, 5 - compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C - compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B - end - -PetalburgCity_Gym_EventScript_2053BA:: @ 82053BA - trainerbattle 2, TRAINER_RANDALL, 0, PetalburgCity_Gym_Text_20674F, PetalburgCity_Gym_Text_2067B9, PetalburgCity_Gym_EventScript_2053DE - checkflag FLAG_0x4F4 - goto_eq PetalburgCity_Gym_EventScript_2053ED - msgbox PetalburgCity_Gym_Text_2067D8, 6 - end - -PetalburgCity_Gym_EventScript_2053DE:: @ 82053DE - setvar VAR_0x8005, 0 - call PetalburgCity_Gym_EventScript_20557F - special DrawWholeMapView - release - end - -PetalburgCity_Gym_EventScript_2053ED:: @ 82053ED - msgbox PetalburgCity_Gym_Text_20685E, 2 - end - -PetalburgCity_Gym_EventScript_2053F6:: @ 82053F6 - trainerbattle 2, TRAINER_PARKER, 0, PetalburgCity_Gym_Text_2068FD, PetalburgCity_Gym_Text_20694F, PetalburgCity_Gym_EventScript_20541A - checkflag FLAG_0x4F4 - goto_eq PetalburgCity_Gym_EventScript_205429 - msgbox PetalburgCity_Gym_Text_206996, 6 - end - -PetalburgCity_Gym_EventScript_20541A:: @ 820541A - setvar VAR_0x8005, 0 - call PetalburgCity_Gym_EventScript_2055C1 - special DrawWholeMapView - release - end - -PetalburgCity_Gym_EventScript_205429:: @ 8205429 - msgbox PetalburgCity_Gym_Text_2069D9, 2 - end - -PetalburgCity_Gym_EventScript_205432:: @ 8205432 - trainerbattle 2, TRAINER_GEORGE, 0, PetalburgCity_Gym_Text_206A1B, PetalburgCity_Gym_Text_206AB8, PetalburgCity_Gym_EventScript_205456 - checkflag FLAG_0x4F4 - goto_eq PetalburgCity_Gym_EventScript_205465 - msgbox PetalburgCity_Gym_Text_206AE9, 6 - end - -PetalburgCity_Gym_EventScript_205456:: @ 8205456 - setvar VAR_0x8005, 0 - call PetalburgCity_Gym_EventScript_205603 - special DrawWholeMapView - release - end - -PetalburgCity_Gym_EventScript_205465:: @ 8205465 - msgbox PetalburgCity_Gym_Text_206BB1, 2 - end - -PetalburgCity_Gym_EventScript_20546E:: @ 820546E - trainerbattle 2, TRAINER_BERKE, 0, PetalburgCity_Gym_Text_206BF4, PetalburgCity_Gym_Text_206C7D, PetalburgCity_Gym_EventScript_205492 - checkflag FLAG_0x4F4 - goto_eq PetalburgCity_Gym_EventScript_2054A1 - msgbox PetalburgCity_Gym_Text_206C9F, 6 - end - -PetalburgCity_Gym_EventScript_205492:: @ 8205492 - setvar VAR_0x8005, 0 - call PetalburgCity_Gym_EventScript_205645 - special DrawWholeMapView - release - end - -PetalburgCity_Gym_EventScript_2054A1:: @ 82054A1 - msgbox PetalburgCity_Gym_Text_206D56, 2 - end - -PetalburgCity_Gym_EventScript_2054AA:: @ 82054AA - trainerbattle 2, TRAINER_MARY, 0, PetalburgCity_Gym_Text_206DB2, PetalburgCity_Gym_Text_206E0D, PetalburgCity_Gym_EventScript_2054CE - checkflag FLAG_0x4F4 - goto_eq PetalburgCity_Gym_EventScript_2054DD - msgbox PetalburgCity_Gym_Text_206E26, 6 - end - -PetalburgCity_Gym_EventScript_2054CE:: @ 82054CE - setvar VAR_0x8005, 0 - call PetalburgCity_Gym_EventScript_2055A0 - special DrawWholeMapView - release - end - -PetalburgCity_Gym_EventScript_2054DD:: @ 82054DD - msgbox PetalburgCity_Gym_Text_206ED8, 2 - end - -PetalburgCity_Gym_EventScript_2054E6:: @ 82054E6 - trainerbattle 2, TRAINER_ALEXIA, 0, PetalburgCity_Gym_Text_206F44, PetalburgCity_Gym_Text_206F82, PetalburgCity_Gym_EventScript_20550A - checkflag FLAG_0x4F4 - goto_eq PetalburgCity_Gym_EventScript_205519 - msgbox PetalburgCity_Gym_Text_206F9F, 6 - end - -PetalburgCity_Gym_EventScript_20550A:: @ 820550A - setvar VAR_0x8005, 0 - call PetalburgCity_Gym_EventScript_2055E2 - special DrawWholeMapView - release - end - -PetalburgCity_Gym_EventScript_205519:: @ 8205519 - msgbox PetalburgCity_Gym_Text_207069, 2 - end - -PetalburgCity_Gym_EventScript_205522:: @ 8205522 - trainerbattle 2, TRAINER_JODY, 0, PetalburgCity_Gym_Text_207088, PetalburgCity_Gym_Text_2070E6, PetalburgCity_Gym_EventScript_205546 - checkflag FLAG_0x4F4 - goto_eq PetalburgCity_Gym_EventScript_205555 - msgbox PetalburgCity_Gym_Text_2070FB, 6 - end - -PetalburgCity_Gym_EventScript_205546:: @ 8205546 - setvar VAR_0x8005, 0 - call PetalburgCity_Gym_EventScript_205624 - special DrawWholeMapView - release - end - -PetalburgCity_Gym_EventScript_205555:: @ 8205555 - msgbox PetalburgCity_Gym_Text_207170, 2 - end - -PetalburgCity_Gym_EventScript_20555E:: @ 820555E - setvar VAR_0x8004, 1 - compare VAR_0x8005, 0 - call_if 1, PetalburgCity_Gym_EventScript_205746 - compare VAR_0x8005, 1 - call_if 1, PetalburgCity_Gym_EventScript_20574B - call PetalburgCity_Gym_EventScript_205666 - return - -PetalburgCity_Gym_EventScript_20557F:: @ 820557F - setvar VAR_0x8004, 2 - compare VAR_0x8005, 0 - call_if 1, PetalburgCity_Gym_EventScript_205746 - compare VAR_0x8005, 1 - call_if 1, PetalburgCity_Gym_EventScript_20574B - call PetalburgCity_Gym_EventScript_20568B - return - -PetalburgCity_Gym_EventScript_2055A0:: @ 82055A0 - setvar VAR_0x8004, 3 - compare VAR_0x8005, 0 - call_if 1, PetalburgCity_Gym_EventScript_205746 - compare VAR_0x8005, 1 - call_if 1, PetalburgCity_Gym_EventScript_20574B - call PetalburgCity_Gym_EventScript_2056B0 - return - -PetalburgCity_Gym_EventScript_2055C1:: @ 82055C1 - setvar VAR_0x8004, 4 - compare VAR_0x8005, 0 - call_if 1, PetalburgCity_Gym_EventScript_205746 - compare VAR_0x8005, 1 - call_if 1, PetalburgCity_Gym_EventScript_20574B - call PetalburgCity_Gym_EventScript_2056D5 - return - -PetalburgCity_Gym_EventScript_2055E2:: @ 82055E2 - setvar VAR_0x8004, 5 - compare VAR_0x8005, 0 - call_if 1, PetalburgCity_Gym_EventScript_205746 - compare VAR_0x8005, 1 - call_if 1, PetalburgCity_Gym_EventScript_20574B - call PetalburgCity_Gym_EventScript_2056E8 - return - -PetalburgCity_Gym_EventScript_205603:: @ 8205603 - setvar VAR_0x8004, 6 - compare VAR_0x8005, 0 - call_if 1, PetalburgCity_Gym_EventScript_205746 - compare VAR_0x8005, 1 - call_if 1, PetalburgCity_Gym_EventScript_20574B - call PetalburgCity_Gym_EventScript_20570D - return - -PetalburgCity_Gym_EventScript_205624:: @ 8205624 - setvar VAR_0x8004, 7 - compare VAR_0x8005, 0 - call_if 1, PetalburgCity_Gym_EventScript_205746 - compare VAR_0x8005, 1 - call_if 1, PetalburgCity_Gym_EventScript_20574B - call PetalburgCity_Gym_EventScript_205720 - return - -PetalburgCity_Gym_EventScript_205645:: @ 8205645 - setvar VAR_0x8004, 8 - compare VAR_0x8005, 0 - call_if 1, PetalburgCity_Gym_EventScript_205746 - compare VAR_0x8005, 1 - call_if 1, PetalburgCity_Gym_EventScript_20574B - call PetalburgCity_Gym_EventScript_205733 - return - -PetalburgCity_Gym_EventScript_205666:: @ 8205666 - setmetatile 6, 85, 528, 0 - setmetatile 7, 85, 529, 0 - setmetatile 1, 98, 528, 0 - setmetatile 2, 98, 529, 0 - return - -PetalburgCity_Gym_EventScript_20568B:: @ 820568B - setmetatile 6, 46, 528, 0 - setmetatile 7, 46, 529, 0 - setmetatile 1, 59, 528, 0 - setmetatile 2, 59, 529, 0 - return - -PetalburgCity_Gym_EventScript_2056B0:: @ 82056B0 - setmetatile 6, 59, 528, 0 - setmetatile 7, 59, 529, 0 - setmetatile 1, 72, 528, 0 - setmetatile 2, 72, 529, 0 - return - -PetalburgCity_Gym_EventScript_2056D5:: @ 82056D5 - setmetatile 1, 20, 528, 0 - setmetatile 2, 20, 529, 0 - return - -PetalburgCity_Gym_EventScript_2056E8:: @ 82056E8 - setmetatile 6, 20, 528, 0 - setmetatile 7, 20, 529, 0 - setmetatile 1, 33, 528, 0 - setmetatile 2, 33, 529, 0 - return - -PetalburgCity_Gym_EventScript_20570D:: @ 820570D - setmetatile 6, 33, 528, 0 - setmetatile 7, 33, 529, 0 - return - -PetalburgCity_Gym_EventScript_205720:: @ 8205720 - setmetatile 1, 7, 528, 0 - setmetatile 2, 7, 529, 0 - return - -PetalburgCity_Gym_EventScript_205733:: @ 8205733 - setmetatile 6, 7, 528, 0 - setmetatile 7, 7, 529, 0 - return - -PetalburgCity_Gym_EventScript_205746:: @ 8205746 - special PetalburgGymSpecial1 - waitstate - return - -PetalburgCity_Gym_EventScript_20574B:: @ 820574B - special PetalburgGymSpecial2 - return - -PetalburgCity_Gym_EventScript_20574F:: @ 820574F - lock - faceplayer - checkflag FLAG_0x4F4 - goto_eq PetalburgCity_Gym_EventScript_205764 - msgbox PetalburgCity_Gym_Text_206542, 4 - release - end - -PetalburgCity_Gym_EventScript_205764:: @ 8205764 - msgbox PetalburgCity_Gym_Text_2066F3, 4 - release - end - -PetalburgCity_Gym_EventScript_20576E:: @ 820576E - lockall - checkflag FLAG_BADGE05_GET - goto_eq PetalburgCity_Gym_EventScript_20578E - goto PetalburgCity_Gym_EventScript_205798 - end - -PetalburgCity_Gym_EventScript_20577E:: @ 820577E - lockall - checkflag FLAG_BADGE05_GET - goto_eq PetalburgCity_Gym_EventScript_20578E - goto PetalburgCity_Gym_EventScript_205798 - end - -PetalburgCity_Gym_EventScript_20578E:: @ 820578E - msgbox PetalburgCity_Gym_Text_207467, 4 - releaseall - end - -PetalburgCity_Gym_EventScript_205798:: @ 8205798 - msgbox PetalburgCity_Gym_Text_20744C, 4 - releaseall - end - -PetalburgCity_Gym_Text_2057A2: @ 82057A2 - .string "DAD: Hm?\p" - .string "Well, if it isn’t {PLAYER}!\n" - .string "So you’re all finished moving in?\p" - .string "I’m surprised that you managed to\n" - .string "get here by yourself.\p" - .string "Oh, I see.\n" - .string "You’re with your POKéMON.\p" - .string "Hm… Then I guess you’re going to\n" - .string "become a TRAINER like me, {PLAYER}.\p" - .string "That’s great news!\n" - .string "I’ll be looking forward to it!$" - -PetalburgCity_Gym_Text_2058B1: @ 82058B1 - .string "Um… I…\n" - .string "I’d like to get a POKéMON, please…$" - -PetalburgCity_Gym_Text_2058DB: @ 82058DB - .string "DAD: Hm? You’re… Uh… Oh, right.\n" - .string "You’re WALLY, right?$" - -PetalburgCity_Gym_Text_205910: @ 8205910 - .string "WALLY: I’m going to go stay with my\n" - .string "relatives in VERDANTURF TOWN.\p" - .string "I thought I would be lonely by myself,\n" - .string "so I wanted to take a POKéMON along.\p" - .string "But I’ve never caught a POKéMON before.\n" - .string "I don’t know how…$" - -PetalburgCity_Gym_Text_2059D8: @ 82059D8 - .string "DAD: Hm. I see.$" - -PetalburgCity_Gym_Text_2059E8: @ 82059E8 - .string "DAD: {PLAYER}, you heard that,\n" - .string "right?\p" - .string "Go with WALLY and make sure that he\n" - .string "safely catches a POKéMON.$" - -PetalburgCity_Gym_Text_205A46: @ 8205A46 - .string "WALLY, here, I’ll loan you my POKéMON.\p" - .string "WALLY received a ZIGZAGOON!$" - -PetalburgCity_Gym_Text_205A89: @ 8205A89 - .string "WALLY: Oh, wow!\n" - .string "A POKéMON!\p" - .string "DAD: Hm. I’ll give you a POKé BALL, too.\n" - .string "Go for it!\p" - .string "WALLY received a POKé BALL!$" - -PetalburgCity_Gym_Text_205AF4: @ 8205AF4 - .string "WALLY: Oh, wow!\n" - .string "Thank you!$" - -PetalburgCity_Gym_Text_205B0F: @ 8205B0F - .string "{PLAYER}… Would you really come\n" - .string "with me?$" - -PetalburgCity_Gym_Text_205B32: @ 8205B32 - .string "DAD: So, did it work out?$" - -PetalburgCity_Gym_Text_205B4C: @ 8205B4C - .string "WALLY: Thank you, yes, it did.\n" - .string "Here’s your POKéMON back.\p" - .string "{PLAYER}, thank you for coming along\n" - .string "with me.\p" - .string "You two are why I was able to catch\n" - .string "my POKéMON.\p" - .string "I promise I’ll take really good\n" - .string "care of it.\p" - .string "Oh! My mom’s waiting for me,\n" - .string "so I have to go!\p" - .string "Bye, {PLAYER}!$" - -PetalburgCity_Gym_Text_205C40: @ 8205C40 - .string "DAD: Now…\p" - .string "{PLAYER}, if you want to become a\n" - .string "strong TRAINER, here’s my advice.\p" - .string "Head for RUSTBORO CITY beyond this\n" - .string "town.\p" - .string "There, you should challenge\n" - .string "the GYM LEADER, ROXANNE.\p" - .string "After her, go on to other POKéMON\n" - .string "GYMS and defeat their LEADERS.\p" - .string "Collect BADGES from them,\n" - .string "understood?\p" - .string "Of course, I’m a GYM LEADER, too.\n" - .string "We’ll battle one day, {PLAYER}.\p" - .string "But that’s only after you become\n" - .string "stronger.$" - -PetalburgCity_Gym_Text_205DB4: @ 8205DB4 - .string "DAD: Hm? Aren’t you going to the\n" - .string "POKéMON GYM in RUSTBORO CITY?\p" - .string "There’s no challenge for me to\n" - .string "battle a greenhorn TRAINER.\p" - .string "{PLAYER}, I want you to challenge me\n" - .string "when you become a lot stronger.\p" - .string "I’ll battle you, {PLAYER}, when you\n" - .string "can show me four GYM BADGES, okay?$" - -PetalburgCity_Gym_Text_205EAE: @ 8205EAE - .string "DAD: I see… So, you’ve beaten\n" - .string "the GYM LEADER in RUSTBORO CITY.\p" - .string "But there are many more TRAINERS\n" - .string "who are stronger than you, {PLAYER}.\p" - .string "Across the sea in DEWFORD TOWN is a\n" - .string "GYM LEADER named BRAWLY.\p" - .string "You should go challenge him.$" - -PetalburgCity_Gym_Text_205F87: @ 8205F87 - .string "DAD: Hm… {PLAYER}, you have gotten\n" - .string "stronger.\p" - .string "I can tell by the number of BADGES\n" - .string "that you’ve earned.$" - -PetalburgCity_Gym_Text_205FE5: @ 8205FE5 - .string "DAD: Hm…\n" - .string "So, you did get four GYM BADGES.\p" - .string "Fine, as I promised, we will have\n" - .string "a POKéMON battle.\p" - .string "{PLAYER}…\p" - .string "I’m so happy that I can have\n" - .string "a real battle with my own child.\p" - .string "But, a battle is a battle!\p" - .string "I will do everything in my power as\n" - .string "a GYM LEADER to win.\p" - .string "{PLAYER}, you’d better give it your\n" - .string "best shot, too!$" - -PetalburgCity_Gym_Text_206107: @ 8206107 - .string "…\p" - .string "I… I can’t…\p" - .string "I can’t believe it. {PLAYER}…\p" - .string "I lost to {PLAYER}?\p" - .string "But, rules are rules!\n" - .string "Here, take this.$" - -PetalburgCity_Gym_Text_206162: @ 8206162 - .string "{PLAYER} received the BALANCE BADGE\n" - .string "from DAD!$" - -PetalburgCity_Gym_Text_20618A: @ 820618A - .string "DAD: With that BADGE, the DEFENSE\n" - .string "of all your POKéMON will increase.\p" - .string "POKéMON that know the HM move SURF\n" - .string "will be able to travel over water.\p" - .string "This is my gift to you. {PLAYER}, I’m\n" - .string "sure you can use it correctly.$" - -PetalburgCity_Gym_Text_206254: @ 8206254 - .string "DAD: TM42 contains FACADE.\p" - .string "It doubles the power of moves if\n" - .string "the POKéMON is poisoned, paralyzed,\l" - .string "or burned.\p" - .string "It might be able to turn a bad\n" - .string "situation into an advantage.$" - -PetalburgCity_Gym_Text_2062FB: @ 82062FB - .string "DAD: As the GYM LEADER, I can’t\n" - .string "express how upset I am…\p" - .string "But as a father, it makes me both\n" - .string "happy and a little sad. It’s odd…$" - -PetalburgCity_Gym_Text_206377: @ 8206377 - .string "Ah, there you are, {PLAYER}{KUN}!\p" - .string "Please come with me.\n" - .string "I have something I want you to have.$" - -PetalburgCity_Gym_Text_2063CA: @ 82063CA - .string "NORMAN, you don’t mind, do you?\p" - .string "Let me borrow your {PLAYER}{KUN} for\n" - .string "a minute or two.$" - -PetalburgCity_Gym_Text_206417: @ 8206417 - .string "DAD: {PLAYER}, you should go visit\n" - .string "your mother every so often.\p" - .string "I’m going to stay here and redouble\n" - .string "my training.\p" - .string "It would bother me as a TRAINER to\n" - .string "not avenge my loss to you, {PLAYER}!$" - -PetalburgCity_Gym_Text_2064C3: @ 82064C3 - .string "DAD: {PLAYER}, how are things going?\p" - .string "The world of POKéMON is deep.\p" - .string "I honestly think that no amount of\n" - .string "training would ever be enough.$" - -PetalburgCity_Gym_Text_206542: @ 8206542 - .string "Hey, how’s it going, CHAMPION-\n" - .string "bound {PLAYER}?\p" - .string "The doors in this GYM open when you\n" - .string "beat the awaiting TRAINERS.\p" - .string "Whoops! The doors in this room are\n" - .string "already open, so don’t attack me!\p" - .string "The TRAINERS of PETALBURG GYM\n" - .string "use all kinds of items.\p" - .string "The door at the left leads to\n" - .string "the SPEED ROOM.\p" - .string "The door at the right leads to\n" - .string "the ACCURACY ROOM.\p" - .string "The room’s name will be on\n" - .string "the door, so choose carefully.\p" - .string "Once you’ve chosen the door…\n" - .string "Well, hey, go for it!$" - -PetalburgCity_Gym_Text_2066F3: @ 82066F3 - .string "{PLAYER}! Whoa! You’ve overcome even\n" - .string "your own father!\p" - .string "Like, whoa!\n" - .string "What a stunning turn of events!$" - -PetalburgCity_Gym_Text_20674F: @ 820674F - .string "The ability to attack before the\n" - .string "opponent…\p" - .string "Just that alone puts me at a great\n" - .string "advantage, don’t you agree?$" - -PetalburgCity_Gym_Text_2067B9: @ 82067B9 - .string "That was a magnificent battle!$" - -PetalburgCity_Gym_Text_2067D8: @ 82067D8 - .string "Go on to the next room where a new\n" - .string "challenge awaits you.\p" - .string "At the left is the CONFUSION ROOM.\p" - .string "The right door leads to the DEFENSE\n" - .string "ROOM.$" - -PetalburgCity_Gym_Text_20685E: @ 820685E - .string "Whomever you beat, and whomever you\n" - .string "may lose to, you never shirk from\l" - .string "training yourself and your POKéMON.\p" - .string "That’s what I think being a\n" - .string "GYM LEADER is all about.$" - -PetalburgCity_Gym_Text_2068FD: @ 82068FD - .string "This is the CONFUSION ROOM.\p" - .string "Let me see how well bonded you are\n" - .string "with your POKéMON!$" - -PetalburgCity_Gym_Text_20694F: @ 820694F - .string "I couldn’t confuse your team enough…\n" - .string "You share a strong bond together.$" - -PetalburgCity_Gym_Text_206996: @ 8206996 - .string "The next room is the STRENGTH ROOM.\n" - .string "Can you withstand brute force?$" - -PetalburgCity_Gym_Text_2069D9: @ 82069D9 - .string "After you beat our LEADER, the\n" - .string "training has become a lot tougher.$" - -PetalburgCity_Gym_Text_206A1B: @ 8206A1B - .string "Just when you think you’re going to\n" - .string "win, your opponent restores HP…\p" - .string "Can you just imagine how awful that\n" - .string "must feel?\p" - .string "I’ll show you exactly how awful it\n" - .string "feels!$" - -PetalburgCity_Gym_Text_206AB8: @ 8206AB8 - .string "I couldn’t restore HP enough…\n" - .string "What ATTACK power…$" - -PetalburgCity_Gym_Text_206AE9: @ 8206AE9 - .string "I should have expected no less from\n" - .string "our LEADER’s kid.\p" - .string "No, wait! A TRAINER’s abilities are\n" - .string "earned only through effort.\p" - .string "I lost because my own efforts\n" - .string "weren’t enough.\p" - .string "Go on! The ONE-HIT KO ROOM is next.$" - -PetalburgCity_Gym_Text_206BB1: @ 8206BB1 - .string "I’m going to keep training at GYMS.\n" - .string "One day, I’ll become a LEADER.$" - -PetalburgCity_Gym_Text_206BF4: @ 8206BF4 - .string "I’m not going to take it easy just\n" - .string "because you’re our LEADER’s kid.\p" - .string "I’ll show you how horrid it is for\n" - .string "a POKéMON to take a critical hit!$" - -PetalburgCity_Gym_Text_206C7D: @ 8206C7D - .string "Your power…\n" - .string "You’re the real deal.$" - -PetalburgCity_Gym_Text_206C9F: @ 8206C9F - .string "Your father really is strong.\n" - .string "He’s a TRAINER worth my respect.\p" - .string "And, I sense the same glow coming\n" - .string "from you as your father.\p" - .string "I hope that you’ll stage a terrific\n" - .string "battle with your father!$" - -PetalburgCity_Gym_Text_206D56: @ 8206D56 - .string "Since your dad became the LEADER,\n" - .string "the TRAINERS of PETALBURG CITY have\l" - .string "become a lot tougher.$" - -PetalburgCity_Gym_Text_206DB2: @ 8206DB2 - .string "Giggle…\n" - .string "This is the ACCURACY ROOM.\p" - .string "It’s pretty nasty when every attack\n" - .string "lands without fail.$" - -PetalburgCity_Gym_Text_206E0D: @ 8206E0D - .string "You were a cut above me…$" - -PetalburgCity_Gym_Text_206E26: @ 8206E26 - .string "There are some even stronger\n" - .string "TRAINERS waiting for you.\p" - .string "The left is the DEFENSE ROOM, and\n" - .string "the right is the RECOVERY ROOM.\p" - .string "Your POKéMON’s ATTACK power will be\n" - .string "on trial either way.$" - -PetalburgCity_Gym_Text_206ED8: @ 8206ED8 - .string "Do you know what we’re trying to\n" - .string "achieve as TRAINERS?\p" - .string "We’re striving to become soul mates\n" - .string "with our POKéMON.$" - -PetalburgCity_Gym_Text_206F44: @ 8206F44 - .string "The higher the DEFENSE, the more\n" - .string "reckless I can be in attack.$" - -PetalburgCity_Gym_Text_206F82: @ 8206F82 - .string "Our defenses weren’t enough…$" - -PetalburgCity_Gym_Text_206F9F: @ 8206F9F - .string "I think you’ve taught me a valuable\n" - .string "lesson here.\p" - .string "Now, go on! The left door goes to\n" - .string "the STRENGTH ROOM.\p" - .string "The right door opens to\n" - .string "the ONE-HIT KO ROOM.\p" - .string "Both of them have TRAINERS who are\n" - .string "skilled at offense.$" - -PetalburgCity_Gym_Text_207069: @ 8207069 - .string "Hi! Have you tried using SURF?$" - -PetalburgCity_Gym_Text_207088: @ 8207088 - .string "Our GYM LEADER told us to go all out\n" - .string "and beat you.\p" - .string "Even if you happen to be the\n" - .string "LEADER’s kid!$" - -PetalburgCity_Gym_Text_2070E6: @ 82070E6 - .string "But… I went all out!$" - -PetalburgCity_Gym_Text_2070FB: @ 82070FB - .string "The way you use your POKéMON…\n" - .string "It’s like your father’s style.\p" - .string "Go on through! The GYM LEADER, your\n" - .string "father, is waiting!$" - -PetalburgCity_Gym_Text_207170: @ 8207170 - .string "Sure, it’s fine to make your POKéMON\n" - .string "stronger.\p" - .string "But what decides the winner?\p" - .string "Why, it’s the feelings TRAINERS have\n" - .string "for their POKéMON.$" - -PetalburgCity_Gym_Text_2071F4: @ 82071F4 - .string "This door appears to be locked\n" - .string "right now…$" - -PetalburgCity_Gym_Text_20721E: @ 820721E - .string "“SPEED ROOM,†the sign says.\p" - .string "Do you want to go through?$" - -PetalburgCity_Gym_Text_207256: @ 8207256 - .string "This door appears to be locked\n" - .string "right now…$" - -PetalburgCity_Gym_Text_207280: @ 8207280 - .string "“ACCURACY ROOM,†the sign says.\p" - .string "Do you want to go through?$" - -PetalburgCity_Gym_Text_2072BB: @ 82072BB - .string "“CONFUSION ROOM,†the sign says.\p" - .string "Do you want to go through?$" - -PetalburgCity_Gym_Text_2072F7: @ 82072F7 - .string "“DEFENSE ROOM,†the sign says.\p" - .string "Do you want to go through?$" - -PetalburgCity_Gym_Text_207331: @ 8207331 - .string "“RECOVERY ROOM,†the sign says.\p" - .string "Do you want to go through?$" - -PetalburgCity_Gym_Text_20736C: @ 820736C - .string "“STRENGTH ROOM,†the sign says.\p" - .string "Do you want to go through?$" - -PetalburgCity_Gym_Text_2073A7: @ 82073A7 - .string "“ONE-HIT KO ROOM,†the sign says.\p" - .string "Do you want to go through?$" - -PetalburgCity_Gym_Text_2073E4: @ 82073E4 - .string "“GYM LEADER’S ROOM\p" - .string "“See for yourself what POKéMON await\n" - .string "you!†the sign says.\p" - .string "Do you want to go through?$" - -PetalburgCity_Gym_Text_20744C: @ 820744C - .string "PETALBURG CITY POKéMON GYM$" - -PetalburgCity_Gym_Text_207467: @ 8207467 - .string "PETALBURG CITY POKéMON GYM\p" - .string "NORMAN’S CERTIFIED TRAINERS:\n" - .string "{PLAYER}$" - -PetalburgCity_Gym_Text_2074A2: @ 82074A2 - .string "DAD: {PLAYER}…\n" - .string "I had a feeling that you would come.\p" - .string "I would never refuse to accept\n" - .string "a challenge from you.\p" - .string "You do understand, don’t you?\p" - .string "Inside a GYM, it doesn’t matter that\n" - .string "we are a parent and child.\p" - .string "…No, because we are parent and child,\n" - .string "we owe it to each other to do the best\l" - .string "we can. Isn’t that right, {PLAYER}?$" - -PetalburgCity_Gym_Text_2075CE: @ 82075CE - .string "Uh… Haha…\n" - .string "Maybe that was going too hard…$" - -PetalburgCity_Gym_Text_2075F7: @ 82075F7 - .string "DAD: {PLAYER}…\n" - .string "What is your dream?\p" - .string "My dream…\n" - .string "Hahaha…\l" - .string "It has already come true, actually.$" - -PetalburgCity_Gym_Text_20764A: @ 820764A - .string "DAD: {PLAYER}…\n" - .string "I had a feeling that you would come.\p" - .string "I would never refuse to accept\n" - .string "a challenge from you.\p" - .string "You do understand, don’t you?\p" - .string "Inside a GYM, it doesn’t matter that\n" - .string "we are a parent and child.\p" - .string "Hm? Wait a second, {PLAYER}.\p" - .string "Do you only have one POKéMON that is\n" - .string "capable of battle?\p" - .string "Sorry, but you’ll have to come back\n" - .string "with at least two POKéMON.$" - diff --git a/data/scripts/maps/PetalburgCity_House1.inc b/data/scripts/maps/PetalburgCity_House1.inc deleted file mode 100644 index f727ec8a1..000000000 --- a/data/scripts/maps/PetalburgCity_House1.inc +++ /dev/null @@ -1,28 +0,0 @@ -PetalburgCity_House1_MapScripts:: @ 8207799 - .byte 0 - -PetalburgCity_House1_EventScript_20779A:: @ 820779A - msgbox PetalburgCity_House1_Text_2077AC, 2 - end - -PetalburgCity_House1_EventScript_2077A3:: @ 82077A3 - msgbox PetalburgCity_House1_Text_2077FB, 2 - end - -PetalburgCity_House1_Text_2077AC: @ 82077AC - .string "Traveling is wonderful!\p" - .string "When I was young, I roamed the seas\n" - .string "and the mountains!$" - -PetalburgCity_House1_Text_2077FB: @ 82077FB - .string "Sigh…\p" - .string "I wish I could go on an adventure\n" - .string "with some POKéMON…\p" - .string "Crawl through some damp grass…\n" - .string "Climb rocky, rugged mountains…\p" - .string "Cross the raging seas…\n" - .string "Wander about in dark caves…\p" - .string "And, sometimes, even get a little\n" - .string "homesick…\p" - .string "It must be fabulous to travel!$" - diff --git a/data/scripts/maps/PetalburgCity_House2.inc b/data/scripts/maps/PetalburgCity_House2.inc deleted file mode 100644 index 44987b3d6..000000000 --- a/data/scripts/maps/PetalburgCity_House2.inc +++ /dev/null @@ -1,24 +0,0 @@ -PetalburgCity_House2_MapScripts:: @ 82078F2 - .byte 0 - -PetalburgCity_House2_EventScript_2078F3:: @ 82078F3 - msgbox PetalburgCity_House2_Text_207905, 2 - end - -PetalburgCity_House2_EventScript_2078FC:: @ 82078FC - msgbox PetalburgCity_House2_Text_207969, 2 - end - -PetalburgCity_House2_Text_207905: @ 8207905 - .string "NORMAN became our town’s new\n" - .string "GYM LEADER.\p" - .string "I think he called his family over from\n" - .string "somewhere far away.$" - -PetalburgCity_House2_Text_207969: @ 8207969 - .string "I battled NORMAN once, but, whew,\n" - .string "he was way too strong.\p" - .string "How would I put it?\p" - .string "I just got the feeling that he\n" - .string "lives for POKéMON.$" - diff --git a/data/scripts/maps/PetalburgCity_Mart.inc b/data/scripts/maps/PetalburgCity_Mart.inc deleted file mode 100644 index 665ad3bae..000000000 --- a/data/scripts/maps/PetalburgCity_Mart.inc +++ /dev/null @@ -1,87 +0,0 @@ -PetalburgCity_Mart_MapScripts:: @ 8207D68 - .byte 0 - -PetalburgCity_Mart_EventScript_207D69:: @ 8207D69 - lock - faceplayer - message gUnknown_08272A21 - waitmessage - checkflag FLAG_0x128 - goto_eq PetalburgCity_Mart_EventScript_207DA6 - pokemart PetalburgCity_Mart_Pokemart_207D8C - msgbox gUnknown_08272A3F, 4 - release - end - - .align 2 -PetalburgCity_Mart_Pokemart_207D8C: @ 8207D8C - .2byte ITEM_POKE_BALL - .2byte ITEM_POTION - .2byte ITEM_ANTIDOTE - .2byte ITEM_PARALYZE_HEAL - .2byte ITEM_AWAKENING - .2byte ITEM_ESCAPE_ROPE - .2byte ITEM_REPEL - .2byte ITEM_X_SPEED - .2byte ITEM_X_ATTACK - .2byte ITEM_X_DEFEND - .2byte ITEM_ORANGE_MAIL - .2byte ITEM_NONE - release - end - -PetalburgCity_Mart_EventScript_207DA6:: @ 8207DA6 - pokemart PetalburgCity_Mart_Pokemart_207DB8 - msgbox gUnknown_08272A3F, 4 - release - end - - .align 2 -PetalburgCity_Mart_Pokemart_207DB8: @ 8207DB8 - .2byte ITEM_POKE_BALL - .2byte ITEM_GREAT_BALL - .2byte ITEM_POTION - .2byte ITEM_SUPER_POTION - .2byte ITEM_ANTIDOTE - .2byte ITEM_PARALYZE_HEAL - .2byte ITEM_AWAKENING - .2byte ITEM_ESCAPE_ROPE - .2byte ITEM_REPEL - .2byte ITEM_X_SPEED - .2byte ITEM_X_ATTACK - .2byte ITEM_X_DEFEND - .2byte ITEM_ORANGE_MAIL - .2byte ITEM_NONE - release - end - -PetalburgCity_Mart_EventScript_207DD6:: @ 8207DD6 - msgbox PetalburgCity_Mart_Text_207DF1, 2 - end - -PetalburgCity_Mart_EventScript_207DDF:: @ 8207DDF - msgbox PetalburgCity_Mart_Text_207E60, 2 - end - -PetalburgCity_Mart_EventScript_207DE8:: @ 8207DE8 - msgbox PetalburgCity_Mart_Text_207EB0, 2 - end - -PetalburgCity_Mart_Text_207DF1: @ 8207DF1 - .string "Even if a POKéMON is weak now,\n" - .string "it will grow stronger.\p" - .string "The most important thing is love!\n" - .string "Love for your POKéMON!$" - -PetalburgCity_Mart_Text_207E60: @ 8207E60 - .string "Do you use REPEL?\n" - .string "It keeps POKéMON away, so it’s\l" - .string "useful when you’re in a hurry.$" - -PetalburgCity_Mart_Text_207EB0: @ 8207EB0 - .string "Do you have any ANTIDOTES with\n" - .string "you?\p" - .string "If you walk around with a poisoned\n" - .string "POKéMON, it will lose HP until it faints.\l" - .string "Take some ANTIDOTES with you.$" - diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc deleted file mode 100644 index f4a31854e..000000000 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ /dev/null @@ -1,98 +0,0 @@ -PetalburgCity_PokemonCenter_1F_MapScripts:: @ 82079E8 - map_script 3, PetalburgCity_PokemonCenter_1F_MapScript1_2079F3 - map_script 5, PetalburgCity_PokemonCenter_1F_MapScript1_277C30 - .byte 0 - -PetalburgCity_PokemonCenter_1F_MapScript1_2079F3: @ 82079F3 - setrespawn 3 - call PetalburgCity_PokemonCenter_1F_EventScript_2718DE - end - -PetalburgCity_PokemonCenter_1F_EventScript_2079FC:: @ 82079FC - setvar VAR_0x800B, 1 - call PetalburgCity_PokemonCenter_1F_EventScript_27191E - waitmessage - waitbuttonpress - release - end - -PetalburgCity_PokemonCenter_1F_EventScript_207A0A:: @ 8207A0A - msgbox PetalburgCity_PokemonCenter_1F_Text_207A76, 2 - end - -PetalburgCity_PokemonCenter_1F_EventScript_207A13:: @ 8207A13 - msgbox PetalburgCity_PokemonCenter_1F_Text_207AD6, 2 - end - -PetalburgCity_PokemonCenter_1F_EventScript_207A1C:: @ 8207A1C - lock - faceplayer - msgbox PetalburgCity_PokemonCenter_1F_Text_207B09, 4 - specialvar VAR_RESULT, IsStarterInParty - compare VAR_RESULT, 1 - goto_eq PetalburgCity_PokemonCenter_1F_EventScript_207A38 - release - end - -PetalburgCity_PokemonCenter_1F_EventScript_207A38:: @ 8207A38 - compare VAR_FIRST_POKE, 0 - call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A5B - compare VAR_FIRST_POKE, 1 - call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A64 - compare VAR_FIRST_POKE, 2 - call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A6D - release - end - -PetalburgCity_PokemonCenter_1F_EventScript_207A5B:: @ 8207A5B - msgbox PetalburgCity_PokemonCenter_1F_Text_207BB0, 4 - return - -PetalburgCity_PokemonCenter_1F_EventScript_207A64:: @ 8207A64 - msgbox PetalburgCity_PokemonCenter_1F_Text_207C35, 4 - return - -PetalburgCity_PokemonCenter_1F_EventScript_207A6D:: @ 8207A6D - msgbox PetalburgCity_PokemonCenter_1F_Text_207CB7, 4 - return - -PetalburgCity_PokemonCenter_1F_Text_207A76: @ 8207A76 - .string "That PC-based POKéMON Storage\n" - .string "System…\p" - .string "Whoever made it must be some kind\n" - .string "of a scientific wizard!$" - -PetalburgCity_PokemonCenter_1F_Text_207AD6: @ 8207AD6 - .string "When my POKéMON ate an\n" - .string "ORAN BERRY, it regained HP!$" - -PetalburgCity_PokemonCenter_1F_Text_207B09: @ 8207B09 - .string "There are many types of POKéMON.\p" - .string "All types have their strengths and\n" - .string "weaknesses against other types.\p" - .string "Depending on the types of POKéMON,\n" - .string "a battle could be easy or hard.$" - -PetalburgCity_PokemonCenter_1F_Text_207BB0: @ 8207BB0 - .string "For example, your TREECKO\n" - .string "is a GRASS type.\p" - .string "It’s strong against the WATER and\n" - .string "GROUND types.\p" - .string "But, it’s weak against FIRE-type\n" - .string "POKéMON.$" - -PetalburgCity_PokemonCenter_1F_Text_207C35: @ 8207C35 - .string "For example, your TORCHIC\n" - .string "is a FIRE type.\p" - .string "It’s strong against the GRASS and\n" - .string "BUG types.\p" - .string "But, it’s weak against WATER-type\n" - .string "POKéMON.$" - -PetalburgCity_PokemonCenter_1F_Text_207CB7: @ 8207CB7 - .string "For example, your MUDKIP\n" - .string "is a WATER type.\p" - .string "It’s strong against the FIRE type.\p" - .string "But, it’s weak against GRASS-type\n" - .string "and ELECTRIC-type POKéMON.$" - diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc deleted file mode 100644 index 38d01972a..000000000 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc +++ /dev/null @@ -1,19 +0,0 @@ -PetalburgCity_PokemonCenter_2F_MapScripts:: @ 8207D41 - map_script 2, PetalburgCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, PetalburgCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, PetalburgCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, PetalburgCity_PokemonCenter_2F_MapScript1_276ACF - .byte 0 - -PetalburgCity_PokemonCenter_2F_EventScript_207D56:: @ 8207D56 - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 - end - -PetalburgCity_PokemonCenter_2F_EventScript_207D5C:: @ 8207D5C - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 - end - -PetalburgCity_PokemonCenter_2F_EventScript_207D62:: @ 8207D62 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB - end - diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.inc b/data/scripts/maps/PetalburgCity_WallysHouse.inc deleted file mode 100644 index e64bd57b1..000000000 --- a/data/scripts/maps/PetalburgCity_WallysHouse.inc +++ /dev/null @@ -1,139 +0,0 @@ -PetalburgCity_WallysHouse_MapScripts:: @ 8204229 - map_script 2, PetalburgCity_WallysHouse_MapScript2_204247 - map_script 4, PetalburgCity_WallysHouse_MapScript2_204234 - .byte 0 - -PetalburgCity_WallysHouse_MapScript2_204234: @ 8204234 - map_script_2 VAR_0x4057, 4, PetalburgCity_WallysHouse_EventScript_20423E - .2byte 0 - -PetalburgCity_WallysHouse_EventScript_20423E:: @ 820423E - turnobject 255, 4 - turnobject 1, 3 - end - -PetalburgCity_WallysHouse_MapScript2_204247: @ 8204247 - map_script_2 VAR_0x4057, 4, PetalburgCity_WallysHouse_EventScript_204251 - .2byte 0 - -PetalburgCity_WallysHouse_EventScript_204251:: @ 8204251 - lockall - msgbox PetalburgCity_WallysHouse_Text_20446E, 4 - giveitem_std ITEM_HM03 - setflag FLAG_0x07A - msgbox PetalburgCity_WallysHouse_Text_20461A, 4 - setvar VAR_0x4057, 5 - releaseall - end - -PetalburgCity_WallysHouse_EventScript_204278:: @ 8204278 - lock - faceplayer - checkflag FLAG_0x07E - goto_eq PetalburgCity_WallysHouse_EventScript_2042AC - checkflag FLAG_0x07A - goto_eq PetalburgCity_WallysHouse_EventScript_2042A2 - checkflag FLAG_0x087 - goto_eq PetalburgCity_WallysHouse_EventScript_2042B6 - msgbox PetalburgCity_WallysHouse_Text_2042DF, 4 - setflag FLAG_0x087 - release - end - -PetalburgCity_WallysHouse_EventScript_2042A2:: @ 82042A2 - msgbox PetalburgCity_WallysHouse_Text_204661, 4 - release - end - -PetalburgCity_WallysHouse_EventScript_2042AC:: @ 82042AC - msgbox PetalburgCity_WallysHouse_Text_204698, 4 - release - end - -PetalburgCity_WallysHouse_EventScript_2042B6:: @ 82042B6 - msgbox PetalburgCity_WallysHouse_Text_20444D, 4 - release - end - -PetalburgCity_WallysHouse_EventScript_2042C0:: @ 82042C0 - lock - faceplayer - checkflag FLAG_0x07A - goto_eq PetalburgCity_WallysHouse_EventScript_2042D5 - msgbox PetalburgCity_WallysHouse_Text_204732, 4 - release - end - -PetalburgCity_WallysHouse_EventScript_2042D5:: @ 82042D5 - msgbox PetalburgCity_WallysHouse_Text_2047A7, 4 - release - end - -PetalburgCity_WallysHouse_Text_2042DF: @ 82042DF - .string "You’re…\n" - .string "Ah, you must be {PLAYER}{KUN}, right?\p" - .string "Thank you for playing with WALLY a\n" - .string "little while ago.\p" - .string "He’s been frail and sickly ever\n" - .string "since he was a baby.\p" - .string "We’ve sent him to stay with my relatives\n" - .string "in VERDANTURF TOWN for a while.\p" - .string "The air is a lot cleaner there\n" - .string "than it is here.\p" - .string "What’s that? Where’s WALLY?\n" - .string "He’s already left, our WALLY.\p" - .string "I wonder where he could have\n" - .string "gotten by now?$" - -PetalburgCity_WallysHouse_Text_20444D: @ 820444D - .string "I wonder how our WALLY is doing?$" - -PetalburgCity_WallysHouse_Text_20446E: @ 820446E - .string "{PLAYER}{KUN}! Please excuse us for\n" - .string "dragging you here this way.\p" - .string "But our WALLY’s become very healthy\n" - .string "since he went to VERDANTURF TOWN.\p" - .string "We owe it all to you!\p" - .string "When WALLY left town, you helped\n" - .string "him catch a POKéMON, right?\p" - .string "I think that made WALLY really\n" - .string "happy.\p" - .string "Actually, not just WALLY.\n" - .string "It made me, his father, happy too.\p" - .string "Happy that he’s gained such a great\n" - .string "friend as you.\p" - .string "This isn’t a bribe or anything, but\n" - .string "I’d really like you to have this.$" - -PetalburgCity_WallysHouse_Text_20461A: @ 820461A - .string "If your POKéMON can SURF, you’ll be\n" - .string "able to go to all sorts of places.$" - -PetalburgCity_WallysHouse_Text_204661: @ 8204661 - .string "WALLY’s coming home soon.\n" - .string "I’m looking forward to that.$" - -PetalburgCity_WallysHouse_Text_204698: @ 8204698 - .string "Oh? You met WALLY in\n" - .string "EVER GRANDE CITY?\p" - .string "Oh, {PLAYER}{KUN}, don’t be silly.\p" - .string "He may have gotten healthy, but he\n" - .string "can’t go somewhere far away like\l" - .string "that all by himself.$" - -PetalburgCity_WallysHouse_Text_204732: @ 8204732 - .string "WALLY was really happy when he told\n" - .string "us that he caught a POKéMON.\p" - .string "It’s been ages since I’ve seen him\n" - .string "smile like that.$" - -PetalburgCity_WallysHouse_Text_2047A7: @ 82047A7 - .string "I want you to keep this a secret\n" - .string "from my husband…\p" - .string "But our WALLY left VERDANTURF TOWN\n" - .string "without telling anyone.\p" - .string "You know, WALLY is frail, but\n" - .string "he’s surprisingly strong-willed.\p" - .string "I’m sure that he’ll come back safe\n" - .string "and sound one day!$" - diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc deleted file mode 100644 index 7c9a1ae49..000000000 --- a/data/scripts/maps/PetalburgWoods.inc +++ /dev/null @@ -1,486 +0,0 @@ -PetalburgWoods_MapScripts:: @ 822DFD6 - .byte 0 - -PetalburgWoods_EventScript_22DFD7:: @ 822DFD7 - lockall - call PetalburgWoods_EventScript_22E124 - applymovement 4, PetalburgWoods_Movement_22E1CB - waitmovement 0 - msgbox PetalburgWoods_Text_22E34F, 4 - closemessage - playbgm MUS_AQA_0, 0 - applymovement 3, PetalburgWoods_Movement_22E209 - waitmovement 0 - msgbox PetalburgWoods_Text_22E3AA, 4 - closemessage - applymovement 3, PetalburgWoods_Movement_22E1F6 - waitmovement 0 - applymovement 4, PetalburgWoods_Movement_2725A6 - waitmovement 0 - msgbox PetalburgWoods_Text_22E428, 4 - closemessage - applymovement 4, PetalburgWoods_Movement_22E1E4 - waitmovement 0 - msgbox PetalburgWoods_Text_22E457, 4 - closemessage - applymovement 3, PetalburgWoods_Movement_22E20E - waitmovement 0 - msgbox PetalburgWoods_Text_22E4A5, 4 - trainerbattle 3, TRAINER_GRUNT_8, 0, PetalburgWoods_Text_22E542 - applymovement 3, PetalburgWoods_Movement_22E1F9 - waitmovement 0 - call PetalburgWoods_EventScript_22E138 - applymovement 255, PetalburgWoods_Movement_22E1E0 - applymovement 4, PetalburgWoods_Movement_22E1C2 - waitmovement 0 - goto PetalburgWoods_EventScript_22E1A7 - end - -PetalburgWoods_EventScript_22E079:: @ 822E079 - lockall - call PetalburgWoods_EventScript_22E124 - applymovement 4, PetalburgWoods_Movement_22E1D0 - waitmovement 0 - applymovement 255, PetalburgWoods_Movement_2725A4 - waitmovement 0 - msgbox PetalburgWoods_Text_22E34F, 4 - closemessage - playbgm MUS_AQA_0, 0 - applymovement 3, PetalburgWoods_Movement_22E209 - waitmovement 0 - msgbox PetalburgWoods_Text_22E3AA, 4 - closemessage - applymovement 3, PetalburgWoods_Movement_22E205 - waitmovement 0 - applymovement 4, PetalburgWoods_Movement_2725A6 - waitmovement 0 - msgbox PetalburgWoods_Text_22E428, 4 - closemessage - applymovement 4, PetalburgWoods_Movement_22E1EA - waitmovement 0 - msgbox PetalburgWoods_Text_22E457, 4 - applymovement 255, PetalburgWoods_Movement_2725A6 - waitmovement 0 - msgbox PetalburgWoods_Text_22E4A5, 4 - trainerbattle 3, TRAINER_GRUNT_8, 0, PetalburgWoods_Text_22E542 - applymovement 3, PetalburgWoods_Movement_22E1F9 - waitmovement 0 - call PetalburgWoods_EventScript_22E138 - applymovement 255, PetalburgWoods_Movement_22E1E0 - applymovement 4, PetalburgWoods_Movement_22E1D7 - waitmovement 0 - goto PetalburgWoods_EventScript_22E1A7 - end - -PetalburgWoods_EventScript_22E124:: @ 822E124 - applymovement 4, PetalburgWoods_Movement_22E1B1 - waitmovement 0 - msgbox PetalburgWoods_Text_22E332, 4 - closemessage - return - -PetalburgWoods_EventScript_22E138:: @ 822E138 - msgbox PetalburgWoods_Text_22E563, 4 - closemessage - applymovement 3, PetalburgWoods_Movement_22E1FD - waitmovement 0 - removeobject 3 - applymovement 255, PetalburgWoods_Movement_2725AA - waitmovement 0 - msgbox PetalburgWoods_Text_22E63D, 4 - giveitem_std ITEM_GREAT_BALL - compare VAR_RESULT, 0 - goto_eq PetalburgWoods_EventScript_22E17D - goto PetalburgWoods_EventScript_22E18B - end - -PetalburgWoods_EventScript_22E17D:: @ 822E17D - msgbox PetalburgWoods_Text_22E741, 4 - goto PetalburgWoods_EventScript_22E18B - end - -PetalburgWoods_EventScript_22E18B:: @ 822E18B - msgbox PetalburgWoods_Text_22E6C7, 4 - applymovement 4, PetalburgWoods_Movement_22E1EE - waitmovement 0 - msgbox PetalburgWoods_Text_22E712, 4 - closemessage - return - -PetalburgWoods_EventScript_22E1A7:: @ 822E1A7 - removeobject 4 - setvar VAR_0x4098, 1 - releaseall - end - -PetalburgWoods_Movement_22E1B1: @ 822E1B1 - 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 - 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 - delay_16 - face_player - walk_down - walk_down - step_end - -PetalburgWoods_Movement_22E1D0: @ 822E1D0 - delay_16 - face_player - walk_down - walk_down - walk_down - walk_in_place_fastest_right - step_end - -PetalburgWoods_Movement_22E1D7: @ 822E1D7 - 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 - delay_16 - delay_16 - walk_in_place_fastest_up - step_end - -PetalburgWoods_Movement_22E1E4: @ 822E1E4 - walk_fast_right - walk_fast_down - walk_fast_down - walk_fast_left - walk_in_place_fastest_up - step_end - -PetalburgWoods_Movement_22E1EA: @ 822E1EA - walk_fast_down - walk_fast_right - walk_in_place_fastest_up - step_end - -PetalburgWoods_Movement_22E1EE: @ 822E1EE - walk_in_place_fastest_down - delay_16 - delay_16 - delay_16 - delay_16 - delay_16 - face_up - step_end - -PetalburgWoods_Movement_22E1F6: @ 822E1F6 - walk_fast_down - walk_fast_down - step_end - -PetalburgWoods_Movement_22E1F9: @ 822E1F9 - lock_facing_direction - walk_up - unlock_facing_direction - step_end - -PetalburgWoods_Movement_22E1FD: @ 822E1FD - 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 - walk_fast_down - walk_fast_down - walk_fast_down - step_end - -PetalburgWoods_Movement_22E209: @ 822E209 - walk_down - walk_down - delay_16 - delay_16 - step_end - -PetalburgWoods_Movement_22E20E: @ 822E20E - walk_down - step_end - -PetalburgWoods_EventScript_22E210:: @ 822E210 - msgbox PetalburgWoods_Text_22EA0C, 2 - end - -PetalburgWoods_EventScript_22E219:: @ 822E219 - msgbox PetalburgWoods_Text_22EA8B, 2 - end - -PetalburgWoods_EventScript_22E222:: @ 822E222 - lock - faceplayer - checkflag FLAG_0x129 - goto_eq PetalburgWoods_EventScript_22E251 - msgbox PetalburgWoods_Text_22EAFE, 4 - giveitem_std ITEM_MIRACLE_SEED - compare VAR_RESULT, 0 - goto_eq PetalburgWoods_EventScript_272054 - setflag FLAG_0x129 - release - end - -PetalburgWoods_EventScript_22E251:: @ 822E251 - msgbox PetalburgWoods_Text_22EB63, 4 - release - end - -PetalburgWoods_EventScript_22E25B:: @ 822E25B - msgbox PetalburgWoods_Text_22EC10, 3 - end - -PetalburgWoods_EventScript_22E264:: @ 822E264 - msgbox PetalburgWoods_Text_22ED07, 3 - end - -PetalburgWoods_EventScript_22E26D:: @ 822E26D - trainerbattle 0, TRAINER_LYLE, 0, PetalburgWoods_Text_22E77D, PetalburgWoods_Text_22E7C1 - msgbox PetalburgWoods_Text_22E7EF, 6 - end - -PetalburgWoods_EventScript_22E284:: @ 822E284 - trainerbattle 2, TRAINER_JAMES_1, 0, PetalburgWoods_Text_22E827, PetalburgWoods_Text_22E86B, PetalburgWoods_EventScript_22E2C5 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq PetalburgWoods_EventScript_22E31B - setvar VAR_0x8004, 621 - specialvar VAR_RESULT, sub_813B4E0 - compare VAR_RESULT, 0 - goto_eq PetalburgWoods_EventScript_22E2EF - msgbox PetalburgWoods_Text_22E889, 4 - release - end - -PetalburgWoods_EventScript_22E2C5:: @ 822E2C5 - special sub_80B4808 - waitmovement 0 - checkflag FLAG_HAS_MATCH_CALL - goto_eq PetalburgWoods_EventScript_22E2D6 - release - end - -PetalburgWoods_EventScript_22E2D6:: @ 822E2D6 - msgbox PetalburgWoods_Text_22E8C3, 4 - setvar VAR_0x8004, 621 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 621 - callstd 8 - release - end - -PetalburgWoods_EventScript_22E2EF:: @ 822E2EF - checkflag FLAG_HAS_MATCH_CALL - goto_eq PetalburgWoods_EventScript_22E302 - msgbox PetalburgWoods_Text_22E889, 4 - release - end - -PetalburgWoods_EventScript_22E302:: @ 822E302 - msgbox PetalburgWoods_Text_22E914, 4 - setvar VAR_0x8004, 621 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 621 - callstd 8 - release - end - -PetalburgWoods_EventScript_22E31B:: @ 822E31B - trainerbattle 5, TRAINER_JAMES_1, 0, PetalburgWoods_Text_22E966, PetalburgWoods_Text_22E998 - msgbox PetalburgWoods_Text_22E9B6, 6 - end - -PetalburgWoods_Text_22E332: @ 822E332 - .string "Hmmm…\n" - .string "Not a one to be found…$" - -PetalburgWoods_Text_22E34F: @ 822E34F - .string "Hello, have you seen any POKéMON\n" - .string "called SHROOMISH around here?\p" - .string "I really love that POKéMON.$" - -PetalburgWoods_Text_22E3AA: @ 822E3AA - .string "I was going to ambush you, but you\n" - .string "had to dawdle in PETALBURG WOODS\l" - .string "forever, didn’t you?\p" - .string "I got sick of waiting, so here I am!$" - -PetalburgWoods_Text_22E428: @ 822E428 - .string "You! DEVON RESEARCHER!\p" - .string "Hand over those papers!$" - -PetalburgWoods_Text_22E457: @ 822E457 - .string "Aiyeeeh!\p" - .string "You’re a POKéMON TRAINER, aren’t you?\n" - .string "You’ve got to help me, please!$" - -PetalburgWoods_Text_22E4A5: @ 822E4A5 - .string "Hunh? What do you think you’re doing?\n" - .string "What, you’re going to protect him?\p" - .string "No one who crosses TEAM AQUA\n" - .string "gets any mercy, not even a kid!\p" - .string "Come on and battle me!$" - -PetalburgWoods_Text_22E542: @ 822E542 - .string "You’re kidding me! You’re tough!$" - -PetalburgWoods_Text_22E563: @ 822E563 - .string "Grrr… You’ve got some nerve\n" - .string "meddling with TEAM AQUA!\l" - .string "Come on and battle me again!\p" - .string "I wish I could say that, but I’m out of\n" - .string "POKéMON…\p" - .string "And, hey, we of TEAM AQUA are also\n" - .string "after something in RUSTBORO.\p" - .string "I’ll let you go today!$" - -PetalburgWoods_Text_22E63D: @ 822E63D - .string "Whew…\n" - .string "That was awfully close!\p" - .string "Thanks to you, he didn’t rob me of\n" - .string "these important papers.\p" - .string "I know, I’ll give you a GREAT BALL as\n" - .string "my thanks!$" - -PetalburgWoods_Text_22E6C7: @ 822E6C7 - .string "Didn’t that TEAM AQUA thug say\n" - .string "they were after something in\l" - .string "RUSTBORO, too?$" - -PetalburgWoods_Text_22E712: @ 822E712 - .string "Uh-oh! It’s a crisis!\n" - .string "I can’t be wasting time!$" - -PetalburgWoods_Text_22E741: @ 822E741 - .string "You’re loaded with items.\n" - .string "I can’t give you this GREAT BALL.$" - -PetalburgWoods_Text_22E77D: @ 822E77D - .string "I caught a whole bunch of POKéMON!\p" - .string "Go, go, go!\n" - .string "My BUG POKéMON team!$" - -PetalburgWoods_Text_22E7C1: @ 822E7C1 - .string "I have all these POKéMON,\n" - .string "but I couldn’t win…$" - -PetalburgWoods_Text_22E7EF: @ 822E7EF - .string "I caught a bunch of POKéMON.\n" - .string "Now I’m out of POKé BALLS.$" - -PetalburgWoods_Text_22E827: @ 822E827 - .string "If you take BUG POKéMON to school,\n" - .string "you get to be instantly popular!$" - -PetalburgWoods_Text_22E86B: @ 822E86B - .string "I can’t be popular if I lose.$" - -PetalburgWoods_Text_22E889: @ 822E889 - .string "If you have a big BUG POKéMON,\n" - .string "people respect you for it.$" - -PetalburgWoods_Text_22E8C3: @ 822E8C3 - .string "I want a rematch when my BUG\n" - .string "POKéMON grow up!\p" - .string "I’m registering you in my POKéNAV!$" - -PetalburgWoods_Text_22E914: @ 822E914 - .string "I want a rematch when my BUG \n" - .string "POKéMON grow up!\p" - .string "I’m registering you in my POKéNAV!$" - -PetalburgWoods_Text_22E966: @ 822E966 - .string "My BUG POKéMON have grown.\n" - .string "I’ll be popular again.$" - -PetalburgWoods_Text_22E998: @ 822E998 - .string "I can’t be popular if I lose.$" - -PetalburgWoods_Text_22E9B6: @ 822E9B6 - .string "You get to be popular if you have\n" - .string "strong POKéMON, right?\l" - .string "So, I’ve been training hard.$" - -PetalburgWoods_Text_22EA0C: @ 822EA0C - .string "Yo, there!\n" - .string "Your POKéMON doing okay?\p" - .string "If your POKéMON are weak and you want\n" - .string "to avoid battles, you should stay out\l" - .string "of tall grass.$" - -PetalburgWoods_Text_22EA8B: @ 822EA8B - .string "Sometimes, there are things on the\n" - .string "ground even if you can’t see them.\p" - .string "That’s why I always check where I’m\n" - .string "walking.$" - -PetalburgWoods_Text_22EAFE: @ 822EAFE - .string "Oh, neat!\n" - .string "That’s the BADGE from RUSTBORO GYM!\p" - .string "You must be a TRAINER.\n" - .string "You should try using this item.$" - -PetalburgWoods_Text_22EB63: @ 822EB63 - .string "It’s a MIRACLE SEED.\n" - .string "If a POKéMON holds that item, its\l" - .string "GRASS-type moves become stronger.\p" - .string "Besides MIRACLE SEED, I think there are\n" - .string "other convenient items for POKéMON\l" - .string "to hold.$" - -PetalburgWoods_Text_22EC10: @ 822EC10 - .string "TRAINER TIPS\p" - .string "Any POKéMON that appears even once\n" - .string "in a battle is awarded EXP Points.\p" - .string "To raise a weak POKéMON, put it at the\n" - .string "left of the team list.\p" - .string "As soon as a battle starts, switch it\n" - .string "out. It will earn EXP Points without\l" - .string "being exposed to any harm.$" - -PetalburgWoods_Text_22ED07: @ 822ED07 - .string "TRAINER TIPS\p" - .string "In addition to Hit Points (HP), POKéMON\n" - .string "have Power Points (PP) that are used to\l" - .string "make moves during battle.\p" - .string "If a POKéMON runs out of PP, it must be\n" - .string "taken to a POKéMON CENTER.$" - diff --git a/data/scripts/maps/RecordCorner.inc b/data/scripts/maps/RecordCorner.inc deleted file mode 100644 index 4f342b860..000000000 --- a/data/scripts/maps/RecordCorner.inc +++ /dev/null @@ -1,3 +0,0 @@ -RecordCorner_MapScripts:: @ 823B77F - .byte 0 - diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc deleted file mode 100644 index 9593ae59e..000000000 --- a/data/scripts/maps/Route101.inc +++ /dev/null @@ -1,301 +0,0 @@ -Route101_MapScripts:: @ 81EBCBA - map_script 3, Route101_MapScript1_1EBCC5 - map_script 2, Route101_MapScript2_1EBCCB - .byte 0 - -Route101_MapScript1_1EBCC5: @ 81EBCC5 - call Route101_EventScript_2720AD - end - -Route101_MapScript2_1EBCCB: @ 81EBCCB - map_script_2 VAR_0x4060, 0, Route101_EventScript_1EBCD5 - .2byte 0 - -Route101_EventScript_1EBCD5:: @ 81EBCD5 - setflag FLAG_SPECIAL_FLAG_0x4000 - setvar VAR_0x4060, 1 - end - -Route101_EventScript_1EBCDE:: @ 81EBCDE - lockall - playbgm MUS_EVENT0, 1 - msgbox Route101_Text_1EBE8F, 4 - closemessage - setobjectxy 2, 0, 15 - setobjectxy 4, 0, 16 - applymovement 255, Route101_Movement_1EBDC2 - applymovement 2, Route101_Movement_1EBDE7 - applymovement 4, Route101_Movement_1EBDB5 - waitmovement 0 - applymovement 4, Route101_Movement_1EBD96 - applymovement 2, Route101_Movement_1EBDC8 - waitmovement 0 - applymovement 2, Route101_Movement_2725A8 - waitmovement 0 - applymovement 4, Route101_Movement_1EBDBD - applymovement 2, Route101_Movement_1EBDEF - waitmovement 0 - msgbox Route101_Text_1EBE9A, 4 - closemessage - setvar VAR_0x4060, 2 - releaseall - end - -Route101_EventScript_1EBD4E:: @ 81EBD4E - lockall - msgbox Route101_Text_1EBEDF, 4 - closemessage - applymovement 255, Route101_Movement_1EBD90 - waitmovement 0 - releaseall - end - -Route101_EventScript_1EBD64:: @ 81EBD64 - lockall - msgbox Route101_Text_1EBEDF, 4 - closemessage - applymovement 255, Route101_Movement_1EBD92 - waitmovement 0 - releaseall - end - -Route101_EventScript_1EBD7A:: @ 81EBD7A - lockall - msgbox Route101_Text_1EBEDF, 4 - closemessage - applymovement 255, Route101_Movement_1EBD94 - waitmovement 0 - releaseall - end - -Route101_Movement_1EBD90: @ 81EBD90 - walk_up - step_end - -Route101_Movement_1EBD92: @ 81EBD92 - walk_right - step_end - -Route101_Movement_1EBD94: @ 81EBD94 - walk_down - step_end - -Route101_Movement_1EBD96: @ 81EBD96 - 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 - 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 - 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 - walk_fast_up - walk_fast_up - walk_fast_up - walk_fast_up - walk_in_place_fastest_left - step_end - -Route101_Movement_1EBDC8: @ 81EBDC8 - 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 - 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 - 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 - walk_up - walk_up - step_end - -Route101_Movement_1EBDF7: @ 81EBDF7 - walk_up - walk_left - walk_up - step_end - -Route101_EventScript_1EBDFB:: @ 81EBDFB - msgbox Route101_Text_1EBFDD, 2 - end - -Route101_EventScript_1EBE04:: @ 81EBE04 - msgbox Route101_Text_1EC04A, 2 - end - -Route101_EventScript_1EBE0D:: @ 81EBE0D - msgbox Route101_Text_1EC0C8, 3 - end - -Route101_EventScript_1EBE16:: @ 81EBE16 - lock - faceplayer - setflag FLAG_SYS_POKEMON_GET - setflag FLAG_0x052 - fadescreen 1 - removeobject 4 - setobjectxy 255, 6, 13 - applymovement 255, Route101_Movement_2725A4 - waitmovement 0 - special ChooseStarter - waitstate - applymovement 2, Route101_Movement_1EBE8D - waitmovement 0 - msgbox Route101_Text_1EBF12, 4 - special HealPlayerParty - setflag FLAG_0x2D0 - clearflag FLAG_0x2D1 - setflag FLAG_0x2BC - setvar VAR_0x4084, 2 - setvar VAR_0x4060, 3 - clearflag FLAG_SPECIAL_FLAG_0x4000 - checkplayergender - compare VAR_RESULT, 0 - call_if 1, Route101_EventScript_1EBE85 - compare VAR_RESULT, 1 - call_if 1, Route101_EventScript_1EBE89 - warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 - waitstate - release - end - -Route101_EventScript_1EBE85:: @ 81EBE85 - setflag FLAG_0x2D2 - return - -Route101_EventScript_1EBE89:: @ 81EBE89 - setflag FLAG_0x2F8 - return - -Route101_Movement_1EBE8D: @ 81EBE8D - walk_right - step_end - -Route101_Text_1EBE8F: @ 81EBE8F - .string "H-help me!$" - -Route101_Text_1EBE9A: @ 81EBE9A - .string "Hello! You over there!\n" - .string "Please! Help!\p" - .string "In my BAG!\n" - .string "There’s a POKé BALL!$" - -Route101_Text_1EBEDF: @ 81EBEDF - .string "Wh-Where are you going?!\n" - .string "Don’t leave me like this!$" - -Route101_Text_1EBF12: @ 81EBF12 - .string "PROF. BIRCH: Whew…\p" - .string "I was in the tall grass studying wild\n" - .string "POKéMON when I was jumped.\p" - .string "You saved me.\n" - .string "Thanks a lot!\p" - .string "Oh?\p" - .string "Hi, you’re {PLAYER}{KUN}!\p" - .string "This is not the place to chat, so come\n" - .string "by my POKéMON LAB later, okay?$" - -Route101_Text_1EBFDD: @ 81EBFDD - .string "If POKéMON get tired, take them to\n" - .string "a POKéMON CENTER.\p" - .string "There’s a POKéMON CENTER in OLDALE\n" - .string "TOWN right close by.$" - -Route101_Text_1EC04A: @ 81EC04A - .string "Wild POKéMON will jump out at you in\n" - .string "tall grass.\p" - .string "If you want to catch POKéMON, you have\n" - .string "to go into the tall grass and search.$" - -Route101_Text_1EC0C8: @ 81EC0C8 - .string "ROUTE 101\n" - .string "{0x79} OLDALE TOWN$" - diff --git a/data/scripts/maps/Route102.inc b/data/scripts/maps/Route102.inc deleted file mode 100644 index cd817df35..000000000 --- a/data/scripts/maps/Route102.inc +++ /dev/null @@ -1,119 +0,0 @@ -Route102_MapScripts:: @ 81EC0E0 - .byte 0 - -Route102_EventScript_1EC0E1:: @ 81EC0E1 - msgbox Route102_Text_1EC2C0, 2 - end - -Route102_EventScript_1EC0EA:: @ 81EC0EA - msgbox Route102_Text_1EC35B, 3 - end - -Route102_EventScript_1EC0F3:: @ 81EC0F3 - msgbox Route102_Text_1EC373, 3 - end - -Route102_EventScript_1EC0FC:: @ 81EC0FC - msgbox Route102_Text_1EC32E, 2 - end - -Route102_EventScript_1EC105:: @ 81EC105 - trainerbattle 2, TRAINER_CALVIN_1, 0, Route102_Text_294513, Route102_Text_29457C, Route102_EventScript_1EC146 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route102_EventScript_1EC19C - setvar VAR_0x8004, 318 - specialvar VAR_RESULT, sub_813B4E0 - compare VAR_RESULT, 0 - goto_eq Route102_EventScript_1EC170 - msgbox Route102_Text_2945AC, 4 - release - end - -Route102_EventScript_1EC146:: @ 81EC146 - special sub_80B4808 - waitmovement 0 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route102_EventScript_1EC157 - release - end - -Route102_EventScript_1EC157:: @ 81EC157 - msgbox Route102_Text_294668, 4 - setvar VAR_0x8004, 318 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 318 - callstd 8 - release - end - -Route102_EventScript_1EC170:: @ 81EC170 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route102_EventScript_1EC183 - msgbox Route102_Text_2945AC, 4 - release - end - -Route102_EventScript_1EC183:: @ 81EC183 - msgbox Route102_Text_2945EB, 4 - setvar VAR_0x8004, 318 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 318 - callstd 8 - release - end - -Route102_EventScript_1EC19C:: @ 81EC19C - trainerbattle 5, TRAINER_CALVIN_1, 0, Route102_Text_2946AE, Route102_Text_29470C - msgbox Route102_Text_29473C, 6 - end - -Route102_EventScript_1EC1B3:: @ 81EC1B3 - trainerbattle 0, TRAINER_RICK, 0, Route102_Text_29480C, Route102_Text_294847 - msgbox Route102_Text_294859, 6 - end - -Route102_EventScript_1EC1CA:: @ 81EC1CA - trainerbattle 0, TRAINER_TIANA, 0, Route102_Text_29489E, Route102_Text_2948F3 - msgbox Route102_Text_294916, 6 - end - -Route102_EventScript_1EC1E1:: @ 81EC1E1 - trainerbattle 0, TRAINER_ALLEN, 0, Route102_Text_294775, Route102_Text_2947AA - msgbox Route102_Text_2947DB, 6 - end - -PetalburgCity_Text_1EC1F8: @ 81EC1F8 - .string "WALLY: {PLAYER}…\n" - .string "POKéMON hide in tall grass like this,\l" - .string "don’t they?\p" - .string "Please watch me and see if I can\n" - .string "catch one properly.\p" - .string "…Whoa!$" - -PetalburgCity_Text_1EC271: @ 81EC271 - .string "WALLY: I did it… It’s my…\n" - .string "My POKéMON!$" - -PetalburgCity_Text_1EC297: @ 81EC297 - .string "{PLAYER}, thank you!\n" - .string "Let’s go back to the GYM!$" - -Route102_Text_1EC2C0: @ 81EC2C0 - .string "I’m…not very tall, so I sink right\n" - .string "into tall grass.\p" - .string "The grass goes up my nose and…\n" - .string "Fwafwafwafwafwa…\p" - .string "Fwatchoo!$" - -Route102_Text_1EC32E: @ 81EC32E - .string "I’m going to catch a whole bunch of\n" - .string "POKéMON!$" - -Route102_Text_1EC35B: @ 81EC35B - .string "ROUTE 102\n" - .string "{0x7C} OLDALE TOWN$" - -Route102_Text_1EC373: @ 81EC373 - .string "ROUTE 102\n" - .string "{0x7B} PETALBURG CITY$" diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc deleted file mode 100644 index 8bf597902..000000000 --- a/data/scripts/maps/Route103.inc +++ /dev/null @@ -1,368 +0,0 @@ -Route103_MapScripts:: @ 81EC38E - map_script 3, Route103_MapScript1_1EC399 - map_script 1, Route103_MapScript1_1EC3A4 - .byte 0 - -Route103_MapScript1_1EC399: @ 81EC399 - call Route103_EventScript_271ED7 - call Route103_EventScript_2720AD - end - -Route103_MapScript1_1EC3A4: @ 81EC3A4 - checkflag FLAG_SYS_GAME_CLEAR - call_if 1, Route103_EventScript_1EC3AE - end - -Route103_EventScript_1EC3AE:: @ 81EC3AE - setmetatile 45, 5, 159, 1 - setmetatile 45, 6, 167, 0 - return - -Route103_EventScript_1EC3C1:: @ 81EC3C1 - lockall - checkplayergender - compare VAR_RESULT, 0 - goto_eq Route103_EventScript_1EC3DA - compare VAR_RESULT, 1 - goto_eq Route103_EventScript_1EC434 - end - -Route103_EventScript_1EC3DA:: @ 81EC3DA - msgbox Route103_Text_1EC7A6, 4 - closemessage - playbgm MUS_GIRL_SUP, 1 - applymovement 2, Route103_Movement_27259E - waitmovement 0 - applymovement 2, Route103_Movement_272598 - waitmovement 0 - applymovement 2, Route103_Movement_27259A - waitmovement 0 - msgbox Route103_Text_1EC7DE, 4 - switch VAR_FIRST_POKE - case 0, Route103_EventScript_1EC48E - case 1, Route103_EventScript_1EC49E - case 2, Route103_EventScript_1EC4AE - end - -Route103_EventScript_1EC434:: @ 81EC434 - msgbox Route103_Text_1EC989, 4 - closemessage - playbgm MUS_BOY_SUP, 1 - applymovement 2, Route103_Movement_27259E - waitmovement 0 - applymovement 2, Route103_Movement_272598 - waitmovement 0 - applymovement 2, Route103_Movement_27259A - waitmovement 0 - msgbox Route103_Text_1EC9CE, 4 - switch VAR_FIRST_POKE - case 0, Route103_EventScript_1EC4BE - case 1, Route103_EventScript_1EC4CE - case 2, Route103_EventScript_1EC4DE - end - -Route103_EventScript_1EC48E:: @ 81EC48E - trainerbattle 3, TRAINER_MAY_4, 0, Route103_Text_1EC881 - goto Route103_EventScript_1EC4EE - end - -Route103_EventScript_1EC49E:: @ 81EC49E - trainerbattle 3, TRAINER_MAY_7, 0, Route103_Text_1EC881 - goto Route103_EventScript_1EC4EE - end - -Route103_EventScript_1EC4AE:: @ 81EC4AE - trainerbattle 3, TRAINER_MAY_1, 0, Route103_Text_1EC881 - goto Route103_EventScript_1EC4EE - end - -Route103_EventScript_1EC4BE:: @ 81EC4BE - trainerbattle 3, TRAINER_BRENDAN_4, 0, Route103_Text_1ECA59 - goto Route103_EventScript_1EC4FC - end - -Route103_EventScript_1EC4CE:: @ 81EC4CE - trainerbattle 3, TRAINER_BRENDAN_7, 0, Route103_Text_1ECA59 - goto Route103_EventScript_1EC4FC - end - -Route103_EventScript_1EC4DE:: @ 81EC4DE - trainerbattle 3, TRAINER_BRENDAN_1, 0, Route103_Text_1ECA59 - goto Route103_EventScript_1EC4FC - end - -Route103_EventScript_1EC4EE:: @ 81EC4EE - msgbox Route103_Text_1EC8AE, 4 - goto Route103_EventScript_1EC50A - end - -Route103_EventScript_1EC4FC:: @ 81EC4FC - msgbox Route103_Text_1ECA79, 4 - goto Route103_EventScript_1EC50A - end - -Route103_EventScript_1EC50A:: @ 81EC50A - closemessage - switch VAR_FACING - case 1, Route103_EventScript_1EC585 - case 2, Route103_EventScript_1EC53D - case 3, Route103_EventScript_1EC561 - case 4, Route103_EventScript_1EC561 - end - -Route103_EventScript_1EC53D:: @ 81EC53D - applymovement 255, Route103_Movement_1EC5C8 - applymovement 2, Route103_Movement_1EC5BE - waitmovement 0 - playse SE_DANSA - applymovement 2, Route103_Movement_1EC5C1 - waitmovement 0 - goto Route103_EventScript_1EC5A2 - end - -Route103_EventScript_1EC561:: @ 81EC561 - applymovement 255, Route103_Movement_1EC5D6 - applymovement 2, Route103_Movement_1EC5CE - waitmovement 0 - playse SE_DANSA - applymovement 2, Route103_Movement_1EC5D0 - waitmovement 0 - goto Route103_EventScript_1EC5A2 - end - -Route103_EventScript_1EC585:: @ 81EC585 - applymovement 2, Route103_Movement_1EC5CE - waitmovement 0 - playse SE_DANSA - applymovement 2, Route103_Movement_1EC5D0 - waitmovement 0 - goto Route103_EventScript_1EC5A2 - end - -Route103_EventScript_1EC5A2:: @ 81EC5A2 - removeobject 2 - setvar VAR_0x4084, 4 - clearflag FLAG_0x379 - setflag FLAG_0x082 - setvar VAR_0x40C7, 1 - clearflag FLAG_0x3D3 - savebgm MUS_DUMMY - fadedefaultbgm - releaseall - end - -Route103_Movement_1EC5BE: @ 81EC5BE - walk_left - walk_down - step_end - -Route103_Movement_1EC5C1: @ 81EC5C1 - jump_2_down - delay_16 - walk_down - walk_down - walk_down - walk_down - step_end - -Route103_Movement_1EC5C8: @ 81EC5C8 - delay_16 - delay_4 - walk_in_place_fastest_left - delay_16 - walk_in_place_fastest_down - step_end - -Route103_Movement_1EC5CE: @ 81EC5CE - walk_down - step_end - -Route103_Movement_1EC5D0: @ 81EC5D0 - jump_2_down - delay_16 - walk_down - walk_down - walk_down - step_end - -Route103_Movement_1EC5D6: @ 81EC5D6 - delay_16 - walk_in_place_fastest_down - step_end - -Route103_EventScript_1EC5D9:: @ 81EC5D9 - msgbox Route103_Text_1ECB73, 2 - end - -Route103_EventScript_1EC5E2:: @ 81EC5E2 - msgbox Route103_Text_1ECBB5, 2 - end - -Route103_EventScript_1EC5EB:: @ 81EC5EB - msgbox Route103_Text_1ECC1A, 3 - end - -Route103_EventScript_1EC5F4:: @ 81EC5F4 - trainerbattle 0, TRAINER_DAISY, 0, Route103_Text_29495A, Route103_Text_29498F - msgbox Route103_Text_2949B4, 6 - end - -Route103_EventScript_1EC60B:: @ 81EC60B - trainerbattle 6, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_2949F9, Route103_Text_294A3D, Route103_Text_294AAE, Route103_EventScript_1EC63A - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route103_EventScript_1EC653 - msgbox Route103_Text_294A52, 6 - end - -Route103_EventScript_1EC63A:: @ 81EC63A - msgbox Route103_Text_294B8A, 4 - setvar VAR_0x8004, 481 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 481 - callstd 8 - release - end - -Route103_EventScript_1EC653:: @ 81EC653 - trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294C29, Route103_Text_294C6D, Route103_Text_294CEF - msgbox Route103_Text_294C93, 6 - end - -Route103_EventScript_1EC66E:: @ 81EC66E - trainerbattle 6, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294AFD, Route103_Text_294B22, Route103_Text_294BD0, Route103_EventScript_1EC69D - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route103_EventScript_1EC6B6 - msgbox Route103_Text_294B40, 6 - end - -Route103_EventScript_1EC69D:: @ 81EC69D - msgbox Route103_Text_294B8A, 4 - setvar VAR_0x8004, 481 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 481 - callstd 8 - release - end - -Route103_EventScript_1EC6B6:: @ 81EC6B6 - trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294D3E, Route103_Text_294D63, Route103_Text_294DDB - msgbox Route103_Text_294D89, 6 - end - -Route103_EventScript_1EC6D1:: @ 81EC6D1 - trainerbattle 0, TRAINER_ANDREW, 0, Route103_Text_294E34, Route103_Text_294E92 - msgbox Route103_Text_294EBB, 6 - end - -Route103_EventScript_1EC6E8:: @ 81EC6E8 - trainerbattle 2, TRAINER_MIGUEL_1, 0, Route103_Text_294EDF, Route103_Text_294F21, Route103_EventScript_1EC714 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route103_EventScript_1EC733 - msgbox Route103_Text_294F42, 4 - release - end - -Route103_EventScript_1EC714:: @ 81EC714 - special sub_80B4808 - waitmovement 0 - msgbox Route103_Text_294F7E, 4 - setvar VAR_0x8004, 293 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 293 - callstd 8 - release - end - -Route103_EventScript_1EC733:: @ 81EC733 - trainerbattle 5, TRAINER_MIGUEL_1, 0, Route103_Text_294FC3, Route103_Text_295006 - msgbox Route103_Text_29501E, 6 - end - -Route103_EventScript_1EC74A:: @ 81EC74A - trainerbattle 0, TRAINER_MARCOS, 0, Route103_Text_295206, Route103_Text_29522B - msgbox Route103_Text_295246, 6 - end - -Route103_EventScript_1EC761:: @ 81EC761 - trainerbattle 0, TRAINER_RHETT, 0, Route103_Text_295199, Route103_Text_2951C6 - msgbox Route103_Text_2951DE, 6 - end - -Route103_EventScript_1EC778:: @ 81EC778 - trainerbattle 0, TRAINER_PETE, 0, Route103_Text_295063, Route103_Text_295093 - msgbox Route103_Text_2950AA, 6 - end - -Route103_EventScript_1EC78F:: @ 81EC78F - trainerbattle 0, TRAINER_ISABELLE, 0, Route103_Text_295116, Route103_Text_295146 - msgbox Route103_Text_29514D, 6 - end - -Route103_Text_1EC7A6: @ 81EC7A6 - .string "MAY: Let’s see… The POKéMON found\n" - .string "on ROUTE 103 include…$" - -Route103_Text_1EC7DE: @ 81EC7DE - .string "Oh, hi, {PLAYER}{KUN}!\p" - .string "…Oh, I see, my dad gave you\n" - .string "a POKéMON as a gift.\p" - .string "Since we’re here, let’s have a quick\n" - .string "battle!\p" - .string "I’ll give you a taste of what being\n" - .string "a TRAINER is like.$" - -Route103_Text_1EC881: @ 81EC881 - .string "Wow! That’s great!\n" - .string "{PLAYER}{KUN}, you’re pretty good!$" - -Route103_Text_1EC8AE: @ 81EC8AE - .string "MAY: I think I know why my dad has\n" - .string "an eye out for you now.\p" - .string "I mean, you just got that POKéMON,\n" - .string "but it already likes you.\p" - .string "You might be able to befriend any\n" - .string "kind of POKéMON easily.\p" - .string "Well, it’s time to head back to\n" - .string "the LAB.$" - -Route103_Text_1EC989: @ 81EC989 - .string "BRENDAN: Okay, so it’s this one and\n" - .string "that one that live on ROUTE 103…$" - -Route103_Text_1EC9CE: @ 81EC9CE - .string "Hey, it’s {PLAYER}!\p" - .string "…Oh, yeah, Dad gave you a POKéMON.\p" - .string "Since we’re here, how about a little\n" - .string "battle?\p" - .string "I’ll teach you what being a TRAINER’s\n" - .string "about!$" - -Route103_Text_1ECA59: @ 81ECA59 - .string "Huh, {PLAYER}, you’re not too shabby.$" - -Route103_Text_1ECA79: @ 81ECA79 - .string "BRENDAN: I think I get it.\n" - .string "I think I know why my dad has his eye\l" - .string "out for you now.\p" - .string "Look, your POKéMON already likes you,\n" - .string "even though you just got it.\p" - .string "{PLAYER}, I get the feeling that you\n" - .string "could befriend any POKéMON with ease.\p" - .string "We should head back to the LAB.$" - -Route103_Text_1ECB73: @ 81ECB73 - .string "My POKéMON is staggeringly tired…\n" - .string "I should have brought a POTION…$" - -Route103_Text_1ECBB5: @ 81ECBB5 - .string "If you cross the sea from here,\n" - .string "it’ll be a shortcut to OLDALE TOWN.\p" - .string "Fufufu, that’s useful, isn’t it?$" - -Route103_Text_1ECC1A: @ 81ECC1A - .string "ROUTE 103\n" - .string "{0x7A} OLDALE TOWN$" - diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc deleted file mode 100644 index 83cfe5d92..000000000 --- a/data/scripts/maps/Route104.inc +++ /dev/null @@ -1,1227 +0,0 @@ -Route104_MapScripts:: @ 81ECC32 - map_script 2, Route104_MapScript2_1ECC3D - map_script 3, Route104_MapScript1_1ECC4E - .byte 0 - -Route104_MapScript2_1ECC3D: @ 81ECC3D - map_script_2 VAR_0x408E, 1, Route104_EventScript_1ECC47 - .2byte 0 - -Route104_EventScript_1ECC47:: @ 81ECC47 - lockall - goto Route104_EventScript_1ED099 - end - -Route104_MapScript1_1ECC4E: @ 81ECC4E - call Route104_EventScript_271ED7 - call Route104_EventScript_1ECC78 - call Route104_EventScript_1ECC5E - end - -Route104_EventScript_1ECC5E:: @ 81ECC5E - checkflag FLAG_0x07F - goto_if 0, Route104_EventScript_1ECC74 - checkflag FLAG_BADGE03_GET - goto_if 0, Route104_EventScript_1ECC74 - clearflag FLAG_0x38A - return - -Route104_EventScript_1ECC74:: @ 81ECC74 - setflag FLAG_0x38A - return - -Route104_EventScript_1ECC78:: @ 81ECC78 - compare VAR_0x408E, 1 - goto_if 4, Route104_EventScript_1ECC9D - checkflag FLAG_0x120 - goto_eq Route104_EventScript_1ECC9D - checkflag FLAG_0x07C - goto_if 0, Route104_EventScript_1ECC9D - setobjectxyperm 34, 17, 52 - return - -Route104_EventScript_1ECC9D:: @ 81ECC9D - return - -Route104_EventScript_1ECC9E:: @ 81ECC9E - lockall - setvar VAR_0x8008, 1 - applymovement 34, Route104_Movement_27259E - waitmovement 0 - goto Route104_EventScript_1ECD33 - -Route104_EventScript_1ECCB3:: @ 81ECCB3 - lockall - setflag FLAG_0x32E - setvar VAR_0x405A, 8 - setvar VAR_0x4063, 2 - applymovement 255, Route104_Movement_2725A6 - waitmovement 0 - delay 10 - addobject 34 - clearflag FLAG_0x2CF - applymovement 255, Route104_Movement_1ECF86 - waitmovement 0 - applymovement 34, Route104_Movement_1ECF8A - waitmovement 0 - delay 20 - setvar VAR_0x8008, 0 - call Route104_EventScript_1E0DD1 - playse SE_PIN - applymovement 34, Route104_Movement_272598 - waitmovement 0 - applymovement 34, Route104_Movement_27259A - waitmovement 0 - goto Route104_EventScript_1ECD33 - -Route104_EventScript_1ECD11:: @ 81ECD11 - checkplayergender - compare VAR_RESULT, 0 - goto_eq Route104_EventScript_1ECD29 - compare VAR_RESULT, 1 - goto_eq Route104_EventScript_1ECD2E - return - -Route104_EventScript_1ECD29:: @ 81ECD29 - playbgm MUS_GIRL_SUP, 1 - return - -Route104_EventScript_1ECD2E:: @ 81ECD2E - playbgm MUS_BOY_SUP, 1 - return - -Route104_EventScript_1ECD33:: @ 81ECD33 - checkplayergender - compare VAR_RESULT, 0 - goto_eq Route104_EventScript_1ECD4B - compare VAR_RESULT, 1 - goto_eq Route104_EventScript_1ECE6F - end - -Route104_EventScript_1ECD4B:: @ 81ECD4B - checkflag FLAG_0x07D - goto_eq Route104_EventScript_1ECE1C - checkflag FLAG_0x07C - goto_eq Route104_EventScript_1ECDD0 - setflag FLAG_0x07C - msgbox Route104_Text_1EDBFF, 4 - closemessage - delay 30 - playfanfare MUS_ME_TORE_EYE - msgbox Route104_Text_1EDC8F, 4 - waitfanfare - closemessage - delay 30 - setflag FLAG_0x0FD - applymovement 255, Route104_Movement_1ECDCD - applymovement 34, Route104_Movement_1ECDC8 - msgbox Route104_Text_1EDCB1, 4 - closemessage - waitmovement 0 - applymovement 34, Route104_Movement_1ECDCA - waitmovement 0 - moveobjectoffscreen 34 - msgbox Route104_Text_1EDCED, 5 - compare VAR_RESULT, 1 - goto_eq Route104_EventScript_1ECDED - msgbox Route104_Text_1EDD2A, 4 - call Route104_EventScript_1ECE31 - releaseall - end - -Route104_Movement_1ECDC8: @ 81ECDC8 - walk_slow_left - step_end - -Route104_Movement_1ECDCA: @ 81ECDCA - walk_down - face_right - step_end - -Route104_Movement_1ECDCD: @ 81ECDCD - delay_4 - walk_in_place_fastest_left - step_end - -Route104_EventScript_1ECDD0:: @ 81ECDD0 - msgbox Route104_Text_1EDD9F, 5 - compare VAR_RESULT, 1 - goto_eq Route104_EventScript_1ECDED - msgbox Route104_Text_1EDD2A, 4 - releaseall - end - -Route104_EventScript_1ECDED:: @ 81ECDED - msgbox Route104_Text_1EDDDB, 4 - switch VAR_FIRST_POKE - case 0, Route104_EventScript_1ECE36 - case 1, Route104_EventScript_1ECE49 - case 2, Route104_EventScript_1ECE5C - end - -Route104_EventScript_1ECE1C:: @ 81ECE1C - msgbox Route104_Text_1EDE3E, 4 - compare VAR_0x8008, 0 - call_if 1, Route104_EventScript_1ECE31 - releaseall - end - -Route104_EventScript_1ECE31:: @ 81ECE31 - savebgm MUS_DUMMY - fadedefaultbgm - return - -Route104_EventScript_1ECE36:: @ 81ECE36 - trainerbattle 3, TRAINER_MAY_14, 0, Route104_Text_1EDE18 - setflag FLAG_0x07D - goto Route104_EventScript_1ECE1C - end - -Route104_EventScript_1ECE49:: @ 81ECE49 - trainerbattle 3, TRAINER_MAY_15, 0, Route104_Text_1EDE18 - setflag FLAG_0x07D - goto Route104_EventScript_1ECE1C - end - -Route104_EventScript_1ECE5C:: @ 81ECE5C - trainerbattle 3, TRAINER_MAY_10, 0, Route104_Text_1EDE18 - setflag FLAG_0x07D - goto Route104_EventScript_1ECE1C - end - -Route104_EventScript_1ECE6F:: @ 81ECE6F - checkflag FLAG_0x07D - goto_eq Route104_EventScript_1ECF38 - checkflag FLAG_0x07C - goto_eq Route104_EventScript_1ECEEC - setflag FLAG_0x07C - msgbox Route104_Text_1EDF04, 4 - closemessage - delay 30 - playfanfare MUS_ME_TORE_EYE - msgbox Route104_Text_1EDFA0, 4 - waitfanfare - closemessage - delay 30 - setflag FLAG_0x0FD - applymovement 255, Route104_Movement_1ECDCD - applymovement 34, Route104_Movement_1ECDC8 - msgbox Route104_Text_1EDFC6, 4 - closemessage - waitmovement 0 - applymovement 34, Route104_Movement_1ECDCA - waitmovement 0 - moveobjectoffscreen 34 - msgbox Route104_Text_1EE009, 5 - compare VAR_RESULT, 1 - goto_eq Route104_EventScript_1ECF09 - msgbox Route104_Text_1EE04D, 4 - call Route104_EventScript_1ECE31 - releaseall - end - -Route104_EventScript_1ECEEC:: @ 81ECEEC - msgbox Route104_Text_1EE094, 5 - compare VAR_RESULT, 1 - goto_eq Route104_EventScript_1ECF09 - msgbox Route104_Text_1EE04D, 4 - releaseall - end - -Route104_EventScript_1ECF09:: @ 81ECF09 - msgbox Route104_Text_1EE0C7, 4 - switch VAR_FIRST_POKE - case 0, Route104_EventScript_1ECF4D - case 1, Route104_EventScript_1ECF60 - case 2, Route104_EventScript_1ECF73 - end - -Route104_EventScript_1ECF38:: @ 81ECF38 - msgbox Route104_Text_1EE120, 4 - compare VAR_0x8008, 0 - call_if 1, Route104_EventScript_1ECE31 - releaseall - end - -Route104_EventScript_1ECF4D:: @ 81ECF4D - trainerbattle 3, TRAINER_BRENDAN_10, 0, Route104_Text_1EE107 - setflag FLAG_0x07D - goto Route104_EventScript_1ECF38 - end - -Route104_EventScript_1ECF60:: @ 81ECF60 - trainerbattle 3, TRAINER_BRENDAN_12, 0, Route104_Text_1EE107 - setflag FLAG_0x07D - goto Route104_EventScript_1ECF38 - end - -Route104_EventScript_1ECF73:: @ 81ECF73 - trainerbattle 3, TRAINER_BRENDAN_11, 0, Route104_Text_1EE107 - setflag FLAG_0x07D - goto Route104_EventScript_1ECF38 - end - -Route104_Movement_1ECF86: @ 81ECF86 - lock_facing_direction - walk_down - unlock_facing_direction - step_end - -Route104_Movement_1ECF8A: @ 81ECF8A - walk_down - step_end - -Route104_EventScript_1ECF8C:: @ 81ECF8C - lock - faceplayer - checkflag FLAG_0x0F6 - goto_eq Route104_EventScript_1ECFC3 - msgbox Route104_Text_2A6D86, 4 - giveitem_std ITEM_CHESTO_BERRY - compare VAR_RESULT, 0 - goto_eq Route104_EventScript_272054 - setflag FLAG_0x0F6 - msgbox Route104_Text_2A6E32, 4 - release - end - -Route104_EventScript_1ECFC3:: @ 81ECFC3 - msgbox Route104_Text_2A6E32, 4 - release - end - -Route104_EventScript_1ECFCD:: @ 81ECFCD - lock - faceplayer - checkflag FLAG_0x117 - goto_eq Route104_EventScript_1ECFFC - msgbox Route104_Text_1ED96A, 4 - giveitem_std ITEM_WHITE_HERB - compare VAR_RESULT, 0 - goto_eq Route104_EventScript_272054 - setflag FLAG_0x117 - release - end - -Route104_EventScript_1ECFFC:: @ 81ECFFC - msgbox Route104_Text_1EDA0F, 4 - release - end - -Route104_EventScript_1ED006:: @ 81ED006 - msgbox Route104_Text_1ED5EC, 2 - end - -Route104_EventScript_1ED00F:: @ 81ED00F - msgbox Route104_Text_1ED662, 3 - end - -Route104_EventScript_1ED018:: @ 81ED018 - msgbox Route104_Text_1EDA8C, 3 - end - -Route104_EventScript_1ED021:: @ 81ED021 - msgbox Route104_Text_1EDAA1, 3 - end - -Route104_EventScript_1ED02A:: @ 81ED02A - msgbox Route104_Text_1EDABC, 3 - end - -Route104_EventScript_1ED033:: @ 81ED033 - msgbox Route104_Text_1EDAD6, 3 - end - -Route104_EventScript_1ED03C:: @ 81ED03C - msgbox Route104_Text_1EDAEF, 3 - end - -Route104_EventScript_1ED045:: @ 81ED045 - msgbox Route104_Text_1ED6A2, 2 - end - -Route104_EventScript_1ED04E:: @ 81ED04E - msgbox Route104_Text_1ED735, 2 - end - -Route104_EventScript_1ED057:: @ 81ED057 - lock - faceplayer - checkflag FLAG_0x106 - goto_eq Route104_EventScript_1ED086 - msgbox Route104_Text_1ED838, 4 - giveitem_std ITEM_TM09 - compare VAR_RESULT, 0 - goto_eq Route104_EventScript_272054 - setflag FLAG_0x106 - release - end - -Route104_EventScript_1ED086:: @ 81ED086 - msgbox Route104_Text_1ED8E7, 4 - release - end - -Route104_EventScript_1ED090:: @ 81ED090 - msgbox Route104_Text_1ED7A2, 2 - end - -Route104_EventScript_1ED099:: @ 81ED099 - 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, MAP_ROUTE104 - call Route104_EventScript_2720A0 - checkflag FLAG_0x132 - goto_eq Route104_EventScript_1ED0D9 - checkflag FLAG_0x132 - goto_if 0, Route104_EventScript_1ED0EF - end - -Route104_EventScript_1ED0D9:: @ 81ED0D9 - applymovement 7, Route104_Movement_1ED28C - applymovement 255, Route104_Movement_1ED28C - waitmovement 0 - goto Route104_EventScript_1ED139 - -Route104_EventScript_1ED0EF:: @ 81ED0EF - applymovement 7, Route104_Movement_1ED1C8 - applymovement 255, Route104_Movement_1ED1C8 - waitmovement 0 - pokenavcall Route104_Text_1EE336 - waitmessage - delay 30 - playfanfare MUS_ME_TORE_EYE - msgbox Route104_Text_1EE463, 4 - waitfanfare - closemessage - delay 30 - setflag FLAG_0x132 - applymovement 255, Route104_Movement_1ED22A - applymovement 7, Route104_Movement_1ED22A, MAP_ROUTE104 - waitmovement 7, MAP_ROUTE104 - waitmovement 0 - goto Route104_EventScript_1ED139 - -Route104_EventScript_1ED139:: @ 81ED139 - delay 50 - applymovement 255, Route104_Movement_1ED353 - waitmovement 0 - call Route104_EventScript_2720A8 - showobjectat 255, MAP_DEWFORD_TOWN - applymovement 255, Route104_Movement_1ED355 - waitmovement 0 - setobjectxyperm 2, 12, 8 - addobject 2 - setobjectpriority 2, MAP_DEWFORD_TOWN, 0 - clearflag FLAG_0x2E4 - applymovement 2, Route104_Movement_1ED35C - waitmovement 0 - addobject 4 - clearflag FLAG_0x2E7 - call Route104_EventScript_2720A8 - setflag FLAG_0x2E6 - hideobjectat 7, MAP_ROUTE104 - copyvar VAR_0x4096, VAR_0x8008 - resetobjectpriority 255, MAP_ROUTE104 - resetobjectpriority 2, MAP_DEWFORD_TOWN - moveobjectoffscreen 2 - setvar VAR_0x408E, 0 - checkflag FLAG_0x0BD - goto_if 0, Route104_EventScript_1ED1B4 - checkflag FLAG_0x0BD - goto_eq Route104_EventScript_1ED1BE - end - -Route104_EventScript_1ED1B4:: @ 81ED1B4 - msgbox Route104_Text_1E9AAF, 4 - releaseall - end - -Route104_EventScript_1ED1BE:: @ 81ED1BE - msgbox Route104_Text_1E9C1D, 4 - releaseall - end - -Route104_Movement_1ED1C8: @ 81ED1C8 - 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 - 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 - 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 - walk_left - walk_down - walk_down - step_end - -Route104_Movement_1ED353: @ 81ED353 - walk_down - step_end - -Route104_Movement_1ED355: @ 81ED355 - walk_down - walk_left - walk_in_place_fastest_right - step_end - -Route104_Movement_1ED359: @ 81ED359 - walk_down - walk_down - step_end - -Route104_Movement_1ED35C: @ 81ED35C - walk_down - walk_in_place_fastest_left - step_end - -Route104_EventScript_1ED35F:: @ 81ED35F - trainerbattle 0, TRAINER_IVAN, 0, Route104_Text_2954BD, Route104_Text_295509 - msgbox Route104_Text_29554E, 6 - end - -Route104_EventScript_1ED376:: @ 81ED376 - trainerbattle 0, TRAINER_BILLY, 0, Route104_Text_29558A, Route104_Text_2955B4 - msgbox Route104_Text_2955E8, 6 - end - -Route104_EventScript_1ED38D:: @ 81ED38D - trainerbattle 2, TRAINER_HALEY_1, 0, Route104_Text_29563A, Route104_Text_29566F, Route104_EventScript_1ED3CE - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route104_EventScript_1ED424 - setvar VAR_0x8004, 604 - specialvar VAR_RESULT, sub_813B4E0 - compare VAR_RESULT, 0 - goto_eq Route104_EventScript_1ED3F8 - msgbox Route104_Text_295689, 4 - release - end - -Route104_EventScript_1ED3CE:: @ 81ED3CE - special sub_80B4808 - waitmovement 0 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route104_EventScript_1ED3DF - release - end - -Route104_EventScript_1ED3DF:: @ 81ED3DF - msgbox Route104_Text_29576B, 4 - setvar VAR_0x8004, 604 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 604 - callstd 8 - release - end - -Route104_EventScript_1ED3F8:: @ 81ED3F8 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route104_EventScript_1ED40B - msgbox Route104_Text_295689, 4 - release - end - -Route104_EventScript_1ED40B:: @ 81ED40B - msgbox Route104_Text_2956FF, 4 - setvar VAR_0x8004, 604 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 604 - callstd 8 - release - end - -Route104_EventScript_1ED424:: @ 81ED424 - trainerbattle 5, TRAINER_HALEY_1, 0, Route104_Text_2957D7, Route104_Text_2957F0 - msgbox Route104_Text_29580C, 6 - end - -Route104_EventScript_1ED43B:: @ 81ED43B - trainerbattle 2, TRAINER_WINSTON_1, 0, Route104_Text_295870, Route104_Text_2958AD, Route104_EventScript_1ED47C - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route104_EventScript_1ED4D2 - setvar VAR_0x8004, 136 - specialvar VAR_RESULT, sub_813B4E0 - compare VAR_RESULT, 0 - goto_eq Route104_EventScript_1ED4A6 - msgbox Route104_Text_2958C1, 4 - release - end - -Route104_EventScript_1ED47C:: @ 81ED47C - special sub_80B4808 - waitmovement 0 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route104_EventScript_1ED48D - release - end - -Route104_EventScript_1ED48D:: @ 81ED48D - msgbox Route104_Text_29595A, 4 - setvar VAR_0x8004, 136 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 136 - callstd 8 - release - end - -Route104_EventScript_1ED4A6:: @ 81ED4A6 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route104_EventScript_1ED4B9 - msgbox Route104_Text_2958C1, 4 - release - end - -Route104_EventScript_1ED4B9:: @ 81ED4B9 - msgbox Route104_Text_2958F8, 4 - setvar VAR_0x8004, 136 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 136 - callstd 8 - release - end - -Route104_EventScript_1ED4D2:: @ 81ED4D2 - trainerbattle 5, TRAINER_WINSTON_1, 0, Route104_Text_2959BC, Route104_Text_2959FC - msgbox Route104_Text_295A1E, 6 - end - -Route104_EventScript_1ED4E9:: @ 81ED4E9 - trainerbattle 2, TRAINER_CINDY_1, 0, Route104_Text_295A7E, Route104_Text_295ABB, Route104_EventScript_1ED52A - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route104_EventScript_1ED580 - setvar VAR_0x8004, 114 - specialvar VAR_RESULT, sub_813B4E0 - compare VAR_RESULT, 0 - goto_eq Route104_EventScript_1ED554 - msgbox Route104_Text_295AC3, 4 - release - end - -Route104_EventScript_1ED52A:: @ 81ED52A - special sub_80B4808 - waitmovement 0 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route104_EventScript_1ED53B - release - end - -Route104_EventScript_1ED53B:: @ 81ED53B - msgbox Route104_Text_295B60, 4 - setvar VAR_0x8004, 114 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 114 - callstd 8 - release - end - -Route104_EventScript_1ED554:: @ 81ED554 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route104_EventScript_1ED567 - msgbox Route104_Text_295AC3, 4 - release - end - -Route104_EventScript_1ED567:: @ 81ED567 - msgbox Route104_Text_295B01, 4 - setvar VAR_0x8004, 114 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 114 - callstd 8 - release - end - -Route104_EventScript_1ED580:: @ 81ED580 - trainerbattle 5, TRAINER_CINDY_1, 0, Route104_Text_295BC8, Route104_Text_295BFA - msgbox Route104_Text_295C1F, 6 - end - -Route104_EventScript_1ED597:: @ 81ED597 - trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_2952BB, Route104_Text_2952E6, Route104_Text_295330 - special GetPlayerBigGuyGirlString - msgbox Route104_Text_2952FE, 4 - release - end - -Route104_EventScript_1ED5B6:: @ 81ED5B6 - trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_2953AF, Route104_Text_2953E1, Route104_Text_295449 - special GetPlayerBigGuyGirlString - msgbox Route104_Text_29540D, 4 - release - end - -Route104_EventScript_1ED5D5:: @ 81ED5D5 - trainerbattle 0, TRAINER_DARIAN, 0, Route104_Text_295C5D, Route104_Text_295CC9 - msgbox Route104_Text_295CD3, 6 - end - -Route104_Text_1ED5EC: @ 81ED5EC - .string "That seaside cottage is where\n" - .string "MR. BRINEY lives.\p" - .string "He was once a mighty sailor who never\n" - .string "feared the sea, however stormy.$" - -Route104_Text_1ED662: @ 81ED662 - .string "The sea, huh?\p" - .string "I wonder what it’s like at the bottom\n" - .string "of the sea?$" - -Route104_Text_1ED6A2: @ 81ED6A2 - .string "If you’re going to throw a POKé BALL,\n" - .string "weaken the wild POKéMON first.\p" - .string "It will be easier to catch if it’s been\n" - .string "poisoned, burned, or lulled to sleep.$" - -Route104_Text_1ED735: @ 81ED735 - .string "You’re a thief if you try to steal\n" - .string "someone else’s POKéMON.\p" - .string "You should throw POKé BALLS only at\n" - .string "wild POKéMON.$" - -Route104_Text_1ED7A2: @ 81ED7A2 - .string "Oh, no, I’m not a TRAINER.\p" - .string "But that’s right, if TRAINERS lock eyes,\n" - .string "it’s a challenge to battle.\p" - .string "If you don’t want to battle, stay out\n" - .string "of their sight.$" - -Route104_Text_1ED838: @ 81ED838 - .string "I like filling my mouth with seeds,\n" - .string "then spitting them out fast!\p" - .string "You can have this, so you try it out!\p" - .string "Use it on a POKéMON, and it will learn\n" - .string "a move for firing seeds rapidly.$" - -Route104_Text_1ED8E7: @ 81ED8E7 - .string "A word of advice!\p" - .string "A TM, TECHNICAL MACHINE, is good only\n" - .string "for one-time use.\p" - .string "Once you use it, it’s gone.\n" - .string "Think twice before using it!$" - -Route104_Text_1ED96A: @ 81ED96A - .string "This FLOWER SHOP started selling\n" - .string "saplings recently.\p" - .string "It made me so happy, I went overboard\n" - .string "shopping.\p" - .string "I don’t need this WHITE HERB anymore.\n" - .string "Would you take it, please?$" - -Route104_Text_1EDA0F: @ 81EDA0F - .string "This FLOWER SHOP started selling\n" - .string "saplings recently.\p" - .string "It made me so happy, I went overboard\n" - .string "shopping. Where should I put them?$" - -Route104_Text_1EDA8C: @ 81EDA8C - .string "MR. BRINEY’S COTTAGE$" - -Route104_Text_1EDAA1: @ 81EDAA1 - .string "ROUTE 1O4\n" - .string "{0x7C} PETALBURG CITY$" - -Route104_Text_1EDABC: @ 81EDABC - .string "ROUTE 1O4\n" - .string "{0x79} RUSTBORO CITY$" - -Route104_Text_1EDAD6: @ 81EDAD6 - .string "PRETTY PETAL FLOWER SHOP$" - -Route104_Text_1EDAEF: @ 81EDAEF - .string "TRAINER TIPS\p" - .string "In the HOENN region there are pairs\n" - .string "of TRAINERS who challenge others\l" - .string "for 2-on-2 POKéMON battles called\l" - .string "DOUBLE BATTLES.\p" - .string "In a DOUBLE BATTLE, the TRAINER must\n" - .string "send out two POKéMON, the one at the\l" - .string "left of the list and the top one.\l" - .string "Watch how POKéMON are lined up.$" - -Route104_Text_1EDBFF: @ 81EDBFF - .string "MAY: Oh, hi, {PLAYER}{KUN}!\p" - .string "DEVON upgraded your POKéNAV with\n" - .string "the MATCH CALL system, huh?\p" - .string "We should register each other so we\n" - .string "can get in contact anytime.$" - -Route104_Text_1EDC8F: @ 81EDC8F - .string "{PLAYER} registered MAY\n" - .string "in the POKéNAV.$" - -Route104_Text_1EDCB1: @ 81EDCB1 - .string "MAY: Oh, by the way, {PLAYER}{KUN},\n" - .string "how’s your POKéDEX coming along?$" - -Route104_Text_1EDCED: @ 81EDCED - .string "Mine’s looking pretty decent.\n" - .string "So…\l" - .string "How about a little battle?$" - -Route104_Text_1EDD2A: @ 81EDD2A - .string "MAY: Oh, what’s the matter?\p" - .string "Haven’t you caught or raised your\n" - .string "POKéMON very much?\p" - .string "That’s not very good for a TRAINER!$" - -Route104_Text_1EDD9F: @ 81EDD9F - .string "MAY: So, what do you think?\n" - .string "How about a little battle here?$" - -Route104_Text_1EDDDB: @ 81EDDDB - .string "MAY: You just became a TRAINER,\n" - .string "{PLAYER}{KUN}. I’m not going to lose!$" - -Route104_Text_1EDE18: @ 81EDE18 - .string "Yikes!\n" - .string "You’re better than I expected!$" - -Route104_Text_1EDE3E: @ 81EDE3E - .string "MAY: I can tell you’ve gotten pretty\n" - .string "good with the way you handle POKéMON.\p" - .string "But instead of only making them\n" - .string "battle, you should be like MR. BRINEY.\p" - .string "It’s important to become friends with\n" - .string "POKéMON, too.$" - -Route104_Text_1EDF04: @ 81EDF04 - .string "BRENDAN: Oh, hey, {PLAYER}!\p" - .string "Cool, you had DEVON install the MATCH\n" - .string "CALL system on your POKéNAV!\p" - .string "Let’s register each other in our\n" - .string "POKéNAVS so we can keep in touch.$" - -Route104_Text_1EDFA0: @ 81EDFA0 - .string "{PLAYER} registered BRENDAN\n" - .string "in the POKéNAV.$" - -Route104_Text_1EDFC6: @ 81EDFC6 - .string "BRENDAN: {PLAYER}, how’s your POKéDEX?\n" - .string "Have you filled in any pages yet?$" - -Route104_Text_1EE009: @ 81EE009 - .string "Me, I’m doing great!\p" - .string "Want to check out how good I am with\n" - .string "a battle?$" - -Route104_Text_1EE04D: @ 81EE04D - .string "BRENDAN: What’s the matter? Don’t have\n" - .string "any confidence in your POKéMON?$" - -Route104_Text_1EE094: @ 81EE094 - .string "BRENDAN: What’s up?\n" - .string "Want to have a battle with me?$" - -Route104_Text_1EE0C7: @ 81EE0C7 - .string "BRENDAN: I know you just became\n" - .string "a TRAINER, but I won’t go easy!$" - -Route104_Text_1EE107: @ 81EE107 - .string "Hmm…\n" - .string "You’re pretty good.$" - -Route104_Text_1EE120: @ 81EE120 - .string "BRENDAN: You’ve gotten pretty decent\n" - .string "at handling POKéMON.\p" - .string "But, you know, you shouldn’t just be\n" - .string "making POKéMON battle.\p" - .string "Like MR. BRINEY, it’s important to\n" - .string "become friends with your POKéMON.$" - diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc deleted file mode 100644 index 1721fa4a0..000000000 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ /dev/null @@ -1,166 +0,0 @@ -Route104_MrBrineysHouse_MapScripts:: @ 8229D2E - map_script 3, Route104_MrBrineysHouse_MapScript1_229D34 - .byte 0 - -Route104_MrBrineysHouse_MapScript1_229D34: @ 8229D34 - setflag FLAG_LANDMARK_MR_BRINEY_HOUSE - compare VAR_0x4090, 1 - call_if 1, Route104_MrBrineysHouse_EventScript_229D50 - checkflag FLAG_0x0BC - call_if 1, Route104_MrBrineysHouse_EventScript_229D4C - end - -Route104_MrBrineysHouse_EventScript_229D4C:: @ 8229D4C - setflag FLAG_0x32E - return - -Route104_MrBrineysHouse_EventScript_229D50:: @ 8229D50 - setobjectxyperm 1, 9, 3 - setobjectmovementtype 1, 50 - setobjectxyperm 2, 9, 6 - setobjectmovementtype 2, 51 - return - -Route104_MrBrineysHouse_EventScript_229D67:: @ 8229D67 - lock - faceplayer - checkflag FLAG_0x093 - call_if 0, Route104_MrBrineysHouse_EventScript_229D8A - checkflag FLAG_0x0BD - goto_if 0, Route104_MrBrineysHouse_EventScript_229DE1 - checkflag FLAG_0x095 - goto_if 0, Route104_MrBrineysHouse_EventScript_229DFA - goto Route104_MrBrineysHouse_EventScript_229DAE - end - -Route104_MrBrineysHouse_EventScript_229D8A:: @ 8229D8A - setflag FLAG_0x093 - msgbox Route104_MrBrineysHouse_Text_229E70, 4 - msgbox Route104_MrBrineysHouse_Text_229E9B, 5 - compare VAR_RESULT, 0 - goto_eq Route104_MrBrineysHouse_EventScript_229E13 - goto Route104_MrBrineysHouse_EventScript_229E27 - end - -Route104_MrBrineysHouse_EventScript_229DAE:: @ 8229DAE - message Route104_MrBrineysHouse_Text_22A268 - waitmessage - multichoicedefault 20, 8, 14, 1, 0 - switch VAR_RESULT - case 0, Route104_MrBrineysHouse_EventScript_229E27 - case 1, Route104_MrBrineysHouse_EventScript_229E1D - case 127, Route104_MrBrineysHouse_EventScript_229E1D - end - -Route104_MrBrineysHouse_EventScript_229DE1:: @ 8229DE1 - msgbox Route104_MrBrineysHouse_Text_22A0AD, 5 - compare VAR_RESULT, 0 - goto_eq Route104_MrBrineysHouse_EventScript_229E13 - goto Route104_MrBrineysHouse_EventScript_229E27 - end - -Route104_MrBrineysHouse_EventScript_229DFA:: @ 8229DFA - msgbox Route104_MrBrineysHouse_Text_22A18F, 5 - compare VAR_RESULT, 0 - goto_eq Route104_MrBrineysHouse_EventScript_229E13 - goto Route104_MrBrineysHouse_EventScript_229E27 - end - -Route104_MrBrineysHouse_EventScript_229E13:: @ 8229E13 - msgbox Route104_MrBrineysHouse_Text_22A041, 4 - release - end - -Route104_MrBrineysHouse_EventScript_229E1D:: @ 8229E1D - msgbox Route104_MrBrineysHouse_Text_22A2C3, 4 - release - end - -Route104_MrBrineysHouse_EventScript_229E27:: @ 8229E27 - msgbox Route104_MrBrineysHouse_Text_229FE9, 4 - call Route104_MrBrineysHouse_EventScript_271E95 - setvar VAR_0x408E, 1 - clearflag FLAG_0x2E2 - setflag FLAG_0x2E3 - setflag FLAG_0x371 - setvar VAR_0x405A, 8 - setvar VAR_0x4063, 2 - setflag FLAG_0x32E - setflag FLAG_0x2CF - warp MAP_ROUTE104, 255, 13, 51 - waitstate - releaseall - end - -Route104_MrBrineysHouse_EventScript_229E5D:: @ 8229E5D - lock - faceplayer - waitse - playmoncry SPECIES_WINGULL, 0 - msgbox Route104_MrBrineysHouse_Text_22A337, 4 - waitmoncry - release - end - -Route104_MrBrineysHouse_Text_229E70: @ 8229E70 - .string "MR. BRINEY: Hold on, lass!\n" - .string "Wait up, PEEKO!$" - -Route104_MrBrineysHouse_Text_229E9B: @ 8229E9B - .string "Hm? You’re {PLAYER}{KUN}!\n" - .string "You saved my darling PEEKO!\l" - .string "We owe so much to you!\p" - .string "What’s that?\n" - .string "You want to sail with me?\p" - .string "Hmhm…\p" - .string "You have a LETTER bound for DEWFORD\n" - .string "and a package for SLATEPORT, then?\p" - .string "Quite the busy life you must lead!\p" - .string "But, certainly, what you’re asking is\n" - .string "no problem at all.\p" - .string "You’ve come to the right man!\n" - .string "We’ll set sail for DEWFORD.$" - -Route104_MrBrineysHouse_Text_229FE9: @ 8229FE9 - .string "MR. BRINEY: DEWFORD it is, then!\p" - .string "Anchors aweigh!\n" - .string "PEEKO, we’re setting sail, my darling!$" - -Route104_MrBrineysHouse_Text_22A041: @ 822A041 - .string "MR. BRINEY: Is that so?\n" - .string "Your deliveries can wait?\p" - .string "You just go on and tell me whenever\n" - .string "you want to set sail!$" - -Route104_MrBrineysHouse_Text_22A0AD: @ 822A0AD - .string "MR. BRINEY: Ahoy!\n" - .string "I know exactly what you want to say!\p" - .string "You’re to deliver a LETTER to DEWFORD\n" - .string "and a package to SLATEPORT.\p" - .string "What you need me to do is no problem\n" - .string "at all--I’m the man for the job!\p" - .string "First, we’ll set sail for DEWFORD.$" - -Route104_MrBrineysHouse_Text_22A18F: @ 822A18F - .string "MR. BRINEY: Ahoy!\n" - .string "I know exactly what you want to say!\p" - .string "You’re to deliver a package to\n" - .string "CAPT. STERN in SLATEPORT.\p" - .string "What you need me to do is no problem\n" - .string "at all--I’m the man for the job!\p" - .string "First, we’ll set sail for DEWFORD.$" - -Route104_MrBrineysHouse_Text_22A268: @ 822A268 - .string "MR. BRINEY: Ahoy!\n" - .string "For you, I’ll go out to sea anytime!\p" - .string "Now, my friend, where are we bound?$" - -Route104_MrBrineysHouse_Text_22A2C3: @ 822A2C3 - .string "MR. BRINEY: Is that so?\n" - .string "Well, PEEKO owes her life to you.\p" - .string "You just go on and tell me whenever\n" - .string "you want to set sail!$" - -Route104_MrBrineysHouse_Text_22A337: @ 822A337 - .string "PEEKO: Pii piihyoro!$" - diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc deleted file mode 100644 index 5142a1282..000000000 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ /dev/null @@ -1,110 +0,0 @@ -Route104_PrettyPetalFlowerShop_MapScripts:: @ 822A34C - map_script 3, Route104_PrettyPetalFlowerShop_MapScript1_22A352 - .byte 0 - -Route104_PrettyPetalFlowerShop_MapScript1_22A352: @ 822A352 - setflag FLAG_LANDMARK_FLOWER_SHOP - checkflag FLAG_0x07F - goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_22A36B - checkflag FLAG_BADGE03_GET - goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_22A36B - setflag FLAG_0x001 - end - -Route104_PrettyPetalFlowerShop_EventScript_22A36B:: @ 822A36B - setobjectxyperm 1, 4, 6 - end - -Route104_PrettyPetalFlowerShop_EventScript_22A373:: @ 822A373 - lock - faceplayer - checkflag FLAG_0x001 - goto_eq Route104_PrettyPetalFlowerShop_EventScript_22A3E4 - msgbox Route104_PrettyPetalFlowerShop_Text_2A7686, 4 - checkflag FLAG_0x07F - goto_eq Route104_PrettyPetalFlowerShop_EventScript_22A3B2 - setflag FLAG_0x07F - msgbox Route104_PrettyPetalFlowerShop_Text_2A7706, 5 - compare VAR_RESULT, 1 - call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3D2 - compare VAR_RESULT, 0 - call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3DB - release - end - -Route104_PrettyPetalFlowerShop_EventScript_22A3B2:: @ 822A3B2 - msgbox Route104_PrettyPetalFlowerShop_Text_2A76D9, 5 - compare VAR_RESULT, 1 - call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3D2 - compare VAR_RESULT, 0 - call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3DB - release - end - -Route104_PrettyPetalFlowerShop_EventScript_22A3D2:: @ 822A3D2 - msgbox Route104_PrettyPetalFlowerShop_Text_2A775B, 4 - return - -Route104_PrettyPetalFlowerShop_EventScript_22A3DB:: @ 822A3DB - msgbox Route104_PrettyPetalFlowerShop_Text_2A78DF, 4 - return - -Route104_PrettyPetalFlowerShop_EventScript_22A3E4:: @ 822A3E4 - message gUnknown_08272A52 - waitmessage - pokemartdecoration2 Route104_PrettyPetalFlowerShop_Pokemart_22A3FC - msgbox gUnknown_08272A3F, 4 - release - end - - .align 2 -Route104_PrettyPetalFlowerShop_Pokemart_22A3FC: @ 822A3FC - .2byte ITEM_FULL_RESTORE - .2byte ITEM_MAX_POTION - .2byte ITEM_HYPER_POTION - .2byte ITEM_SUPER_POTION - .2byte ITEM_FULL_HEAL - .2byte ITEM_REVIVE - .2byte ITEM_NONE - release - end - -Route104_PrettyPetalFlowerShop_EventScript_22A40C:: @ 822A40C - lock - faceplayer - checkflag FLAG_0x05E - goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_22A421 - msgbox Route104_PrettyPetalFlowerShop_Text_2A79A6, 4 - release - end - -Route104_PrettyPetalFlowerShop_EventScript_22A421:: @ 822A421 - msgbox Route104_PrettyPetalFlowerShop_Text_2A7916, 4 - giveitem_std ITEM_WAILMER_PAIL - msgbox Route104_PrettyPetalFlowerShop_Text_2A79A6, 4 - setflag FLAG_0x05E - release - end - -Route104_PrettyPetalFlowerShop_EventScript_22A442:: @ 822A442 - lock - faceplayer - dodailyevents - checkflag FLAG_0x930 - goto_eq Route104_PrettyPetalFlowerShop_EventScript_22A482 - msgbox Route104_PrettyPetalFlowerShop_Text_2A7A98, 4 - random 8 - addvar VAR_RESULT, 133 - giveitem_std VAR_RESULT - compare VAR_RESULT, 0 - goto_eq Route104_PrettyPetalFlowerShop_EventScript_272054 - setflag FLAG_0x930 - msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, 4 - release - end - -Route104_PrettyPetalFlowerShop_EventScript_22A482:: @ 822A482 - msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, 4 - release - end - diff --git a/data/scripts/maps/Route104_Prototype.inc b/data/scripts/maps/Route104_Prototype.inc deleted file mode 100644 index d8274fffc..000000000 --- a/data/scripts/maps/Route104_Prototype.inc +++ /dev/null @@ -1,3 +0,0 @@ -Route104_Prototype_MapScripts:: @ 82693F2 - .byte 0 - diff --git a/data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc deleted file mode 100644 index bacbad7e9..000000000 --- a/data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc +++ /dev/null @@ -1,3 +0,0 @@ -Route104_PrototypePrettyPetalFlowerShop_MapScripts:: @ 82693F3 - .byte 0 - diff --git a/data/scripts/maps/Route105.inc b/data/scripts/maps/Route105.inc deleted file mode 100644 index 3cb6d9ae6..000000000 --- a/data/scripts/maps/Route105.inc +++ /dev/null @@ -1,107 +0,0 @@ -Route105_MapScripts:: @ 81EE1DB - map_script 1, Route105_MapScript1_1EE1EB - map_script 3, Route105_MapScript1_1EE21E - map_script 2, Route105_MapScript2_1EE240 - .byte 0 - -Route105_MapScript1_1EE1EB: @ 81EE1EB - checkflag FLAG_0x0E4 - call_if 0, Route105_EventScript_1EE20B - compare VAR_0x4037, 9 - call_if 1, Route105_EventScript_2739AB - compare VAR_0x4037, 10 - call_if 1, Route105_EventScript_273A18 - end - -Route105_EventScript_1EE20B:: @ 81EE20B - setmetatile 9, 19, 124, 1 - setmetatile 9, 20, 145, 1 - return - -Route105_MapScript1_1EE21E: @ 81EE21E - compare VAR_0x4039, 1 - call_if 1, Route105_EventScript_273D13 - compare VAR_0x4037, 9 - call_if 1, Route105_EventScript_273D17 - compare VAR_0x4037, 10 - call_if 1, Route105_EventScript_273D17 - end - -Route105_MapScript2_1EE240: @ 81EE240 - map_script_2 VAR_0x4039, 1, gUnknown_08273D1F - .2byte 0 - -Route105_EventScript_1EE24A:: @ 81EE24A - trainerbattle 0, TRAINER_FOSTER, 0, Route105_Text_295D0F, Route105_Text_295D62 - msgbox Route105_Text_295DAB, 6 - end - -Route105_EventScript_1EE261:: @ 81EE261 - trainerbattle 0, TRAINER_LUIS, 0, Route105_Text_295DF5, Route105_Text_295E66 - msgbox Route105_Text_295E72, 6 - end - -Route105_EventScript_1EE278:: @ 81EE278 - trainerbattle 0, TRAINER_DOMINIK, 0, Route105_Text_295EB7, Route105_Text_295EEA - msgbox Route105_Text_295F08, 6 - end - -Route105_EventScript_1EE28F:: @ 81EE28F - trainerbattle 0, TRAINER_BEVERLY, 0, Route105_Text_295F5C, Route105_Text_295FA0 - msgbox Route105_Text_295FAE, 6 - end - -Route105_EventScript_1EE2A6:: @ 81EE2A6 - trainerbattle 0, TRAINER_IMANI, 0, Route105_Text_296025, Route105_Text_296059 - msgbox Route105_Text_296076, 6 - end - -Route105_EventScript_1EE2BD:: @ 81EE2BD - trainerbattle 0, TRAINER_JOSUE, 0, Route105_Text_29626F, Route105_Text_2962CB - msgbox Route105_Text_2962EC, 6 - end - -Route105_EventScript_1EE2D4:: @ 81EE2D4 - trainerbattle 2, TRAINER_ANDRES_1, 0, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route105_EventScript_1EE31F - msgbox Route105_Text_2960FA, 4 - release - end - -Route105_EventScript_1EE300:: @ 81EE300 - special sub_80B4808 - waitmovement 0 - msgbox Route105_Text_296159, 4 - setvar VAR_0x8004, 737 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 737 - callstd 8 - release - end - -Route105_EventScript_1EE31F:: @ 81EE31F - trainerbattle 5, TRAINER_ANDRES_1, 0, Route105_Text_29619E, Route105_Text_2961DD - msgbox Route105_Text_2961FE, 6 - end - -Route104_Text_1EE336: @ 81EE336 - .string "… … … … … …\n" - .string "… … … … … Beep!\p" - .string "DAD: Oh, {PLAYER}?\p" - .string "… … … … … …\n" - .string "Where are you now?\l" - .string "It sounds windy wherever you are.\p" - .string "I just heard from DEVON’s MR. STONE\n" - .string "about your POKéNAV, so I decided\l" - .string "to give you a call.\p" - .string "It sounds like you’re doing fine,\n" - .string "so that’s fine with me.\p" - .string "You take care now.\p" - .string "… … … … … …\n" - .string "… … … … … Click!$" - -Route104_Text_1EE463: @ 81EE463 - .string "Registered DAD NORMAN\n" - .string "in the POKéNAV.$" diff --git a/data/scripts/maps/Route106.inc b/data/scripts/maps/Route106.inc deleted file mode 100644 index fdfff0587..000000000 --- a/data/scripts/maps/Route106.inc +++ /dev/null @@ -1,52 +0,0 @@ -Route106_MapScripts:: @ 81EE489 - .byte 0 - -Route106_EventScript_1EE48A:: @ 81EE48A - msgbox Route106_Text_1EE53A, 3 - end - -Route106_EventScript_1EE493:: @ 81EE493 - trainerbattle 0, TRAINER_DOUGLAS, 0, Route106_Text_2965BB, Route106_Text_2965FD - msgbox Route106_Text_296608, 6 - end - -Route106_EventScript_1EE4AA:: @ 81EE4AA - trainerbattle 0, TRAINER_KYLA, 0, Route106_Text_296628, Route106_Text_296674 - msgbox Route106_Text_29669E, 6 - end - -Route106_EventScript_1EE4C1:: @ 81EE4C1 - trainerbattle 2, TRAINER_ELLIOT_1, 0, Route106_Text_296327, Route106_Text_29635C, Route106_EventScript_1EE4ED - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route106_EventScript_1EE50C - msgbox Route106_Text_29638C, 4 - release - end - -Route106_EventScript_1EE4ED:: @ 81EE4ED - special sub_80B4808 - waitmovement 0 - msgbox Route106_Text_2963E3, 4 - setvar VAR_0x8004, 339 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 339 - callstd 8 - release - end - -Route106_EventScript_1EE50C:: @ 81EE50C - trainerbattle 5, TRAINER_ELLIOT_1, 0, Route106_Text_29642E, Route106_Text_296477 - msgbox Route106_Text_296493, 6 - end - -Route106_EventScript_1EE523:: @ 81EE523 - trainerbattle 0, TRAINER_NED, 0, Route106_Text_2964D4, Route106_Text_296553 - msgbox Route106_Text_296588, 6 - end - -Route106_Text_1EE53A: @ 81EE53A - .string "TRAINER TIPS\p" - .string "Advice on catching POKéMON with a ROD:\n" - .string "Press the A Button if you get a bite.$" - diff --git a/data/scripts/maps/Route107.inc b/data/scripts/maps/Route107.inc deleted file mode 100644 index 2c8364592..000000000 --- a/data/scripts/maps/Route107.inc +++ /dev/null @@ -1,58 +0,0 @@ -Route107_MapScripts:: @ 81EE594 - .byte 0 - -Route107_EventScript_1EE595:: @ 81EE595 - trainerbattle 0, TRAINER_DARRIN, 0, Route107_Text_2966E5, Route107_Text_29672F - msgbox Route107_Text_29675B, 6 - end - -Route107_EventScript_1EE5AC:: @ 81EE5AC - trainerbattle 2, TRAINER_TONY_1, 0, Route107_Text_2967AD, Route107_Text_2967D8, Route107_EventScript_1EE5D8 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route107_EventScript_1EE5F7 - msgbox Route107_Text_2967FF, 4 - release - end - -Route107_EventScript_1EE5D8:: @ 81EE5D8 - special sub_80B4808 - waitmovement 0 - msgbox Route107_Text_29685A, 4 - setvar VAR_0x8004, 155 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 155 - callstd 8 - release - end - -Route107_EventScript_1EE5F7:: @ 81EE5F7 - trainerbattle 5, TRAINER_TONY_1, 0, Route107_Text_296897, Route107_Text_2968D5 - msgbox Route107_Text_296923, 6 - end - -Route107_EventScript_1EE60E:: @ 81EE60E - trainerbattle 0, TRAINER_DENISE, 0, Route107_Text_296974, Route107_Text_29699E - msgbox Route107_Text_2969AB, 6 - end - -Route107_EventScript_1EE625:: @ 81EE625 - trainerbattle 0, TRAINER_BETH, 0, Route107_Text_2969E4, Route107_Text_296A17 - msgbox Route107_Text_296A35, 6 - end - -Route107_EventScript_1EE63C:: @ 81EE63C - trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_296A77, Route107_Text_296AA7, Route107_Text_296B1E - msgbox Route107_Text_296ADC, 6 - end - -Route107_EventScript_1EE657:: @ 81EE657 - trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_296B57, Route107_Text_296BB3, Route107_Text_296C34 - msgbox Route107_Text_296BE1, 6 - end - -Route107_EventScript_1EE672:: @ 81EE672 - trainerbattle 0, TRAINER_CAMRON, 0, Route107_Text_296C6F, Route107_Text_296CAD - msgbox Route107_Text_296CC0, 6 - end - diff --git a/data/scripts/maps/Route108.inc b/data/scripts/maps/Route108.inc deleted file mode 100644 index 25657c5a4..000000000 --- a/data/scripts/maps/Route108.inc +++ /dev/null @@ -1,53 +0,0 @@ -Route108_MapScripts:: @ 81EE689 - .byte 0 - -Route108_EventScript_1EE68A:: @ 81EE68A - trainerbattle 0, TRAINER_JEROME, 0, Route108_Text_296D10, Route108_Text_296D3C - msgbox Route108_Text_296D6E, 6 - end - -Route108_EventScript_1EE6A1:: @ 81EE6A1 - trainerbattle 0, TRAINER_MATTHEW, 0, Route108_Text_296DAF, Route108_Text_296DEA - msgbox Route108_Text_296E03, 6 - end - -Route108_EventScript_1EE6B8:: @ 81EE6B8 - trainerbattle 0, TRAINER_TARA, 0, Route108_Text_296E33, Route108_Text_296E71 - msgbox Route108_Text_296E7A, 6 - end - -Route108_EventScript_1EE6CF:: @ 81EE6CF - trainerbattle 0, TRAINER_MISSY, 0, Route108_Text_296EC7, Route108_Text_296EFC - msgbox Route108_Text_296F2A, 6 - end - -Route108_EventScript_1EE6E6:: @ 81EE6E6 - trainerbattle 0, TRAINER_CAROLINA, 0, Route108_Text_297094, Route108_Text_2970D7 - msgbox Route108_Text_2970F0, 6 - end - -Route108_EventScript_1EE6FD:: @ 81EE6FD - trainerbattle 2, TRAINER_CORY_1, 0, Route108_Text_296F5D, Route108_Text_296F93, Route108_EventScript_1EE729 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route108_EventScript_1EE748 - msgbox Route108_Text_296FB0, 4 - release - end - -Route108_EventScript_1EE729:: @ 81EE729 - special sub_80B4808 - waitmovement 0 - msgbox Route108_Text_296FD8, 4 - setvar VAR_0x8004, 740 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 740 - callstd 8 - release - end - -Route108_EventScript_1EE748:: @ 81EE748 - trainerbattle 5, TRAINER_CORY_1, 0, Route108_Text_297011, Route108_Text_297036 - msgbox Route108_Text_297059, 6 - end - diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc deleted file mode 100644 index 84f7b7c34..000000000 --- a/data/scripts/maps/Route109.inc +++ /dev/null @@ -1,573 +0,0 @@ -Route109_MapScripts:: @ 81EE75F - .byte 0 - -Route109_EventScript_1EE760:: @ 81EE760 - call Route109_EventScript_271E95 - setobjectpriority 2, MAP_ROUTE109, 0 - setobjectpriority 255, MAP_ROUTE109, 0 - applymovement 2, Route109_Movement_1EE90B - waitmovement 0 - removeobject 2 - switch VAR_FACING - case 1, Route109_EventScript_1EE7A5 - case 3, Route109_EventScript_1EE7C5 - case 4, Route109_EventScript_1EE7B5 - end - -Route109_EventScript_1EE7A5:: @ 81EE7A5 - applymovement 255, Route109_Movement_1EE8FD - waitmovement 0 - goto Route109_EventScript_1EE7D5 - end - -Route109_EventScript_1EE7B5:: @ 81EE7B5 - applymovement 255, Route109_Movement_1EE905 - waitmovement 0 - goto Route109_EventScript_1EE7D5 - end - -Route109_EventScript_1EE7C5:: @ 81EE7C5 - applymovement 255, Route109_Movement_1EE908 - waitmovement 0 - goto Route109_EventScript_1EE7D5 - end - -Route109_EventScript_1EE7D5:: @ 81EE7D5 - 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, MAP_DEWFORD_TOWN - applymovement 255, Route109_Movement_1EE900 - waitmovement 0 - addobject 4 - clearflag FLAG_0x2E7 - setobjectxyperm 2, 12, 8 - addobject 2 - setobjectpriority 2, MAP_DEWFORD_TOWN, 0 - applymovement 2, Route109_Movement_1EE90D - waitmovement 0 - clearflag FLAG_0x2E4 - setflag FLAG_0x2E8 - hideobjectat 1, MAP_ROUTE109 - msgbox Route109_Text_1E9C1D, 4 - closemessage - copyvar VAR_0x4096, VAR_0x8008 - resetobjectpriority 255, MAP_ROUTE109 - resetobjectpriority 2, MAP_DEWFORD_TOWN - moveobjectoffscreen 2 - release - end - -Route109_Movement_1EE84F: @ 81EE84F - 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 - walk_down - walk_down - step_end - -Route109_Movement_1EE900: @ 81EE900 - walk_down - walk_down - walk_left - walk_in_place_fastest_right - step_end - -Route109_Movement_1EE905: @ 81EE905 - walk_right - walk_down - step_end - -Route109_Movement_1EE908: @ 81EE908 - walk_left - walk_down - step_end - -Route109_Movement_1EE90B: @ 81EE90B - walk_down - step_end - -Route109_Movement_1EE90D: @ 81EE90D - walk_down - walk_in_place_fastest_left - step_end - -Route109_EventScript_1EE910:: @ 81EE910 - lock - faceplayer - checkflag FLAG_0x095 - goto_if 0, Route109_EventScript_1EE921 - goto Route109_EventScript_1EE93F - end - -Route109_EventScript_1EE921:: @ 81EE921 - message Route109_Text_1EEC96 - msgbox Route109_Text_1EEC96, 5 - compare VAR_RESULT, 0 - goto_eq Route109_EventScript_1EE981 - goto Route109_EventScript_1EE972 - end - -Route109_EventScript_1EE93F:: @ 81EE93F - message Route109_Text_1EEE17 - waitmessage - multichoicedefault 21, 8, 14, 1, 0 - switch VAR_RESULT - case 0, Route109_EventScript_1EE972 - case 1, Route109_EventScript_1EE98B - case 127, Route109_EventScript_1EE98B - end - -Route109_EventScript_1EE972:: @ 81EE972 - msgbox Route109_Text_1EED06, 4 - closemessage - goto Route109_EventScript_1EE760 - end - -Route109_EventScript_1EE981:: @ 81EE981 - msgbox Route109_Text_1EED5E, 4 - release - end - -Route109_EventScript_1EE98B:: @ 81EE98B - msgbox Route109_Text_1EEE72, 4 - release - end - -Route109_EventScript_1EE995:: @ 81EE995 - msgbox Route109_Text_1EEEB4, 2 - end - -Route109_EventScript_1EE99E:: @ 81EE99E - lock - faceplayer - msgbox Route109_Text_1EEFB0, 4 - closemessage - applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 - waitmovement 0 - release - end - -Route109_EventScript_1EE9B5:: @ 81EE9B5 - lock - faceplayer - special GetPlayerBigGuyGirlString - checkflag FLAG_0x118 - goto_eq Route109_EventScript_1EE9F2 - msgbox Route109_Text_1EEFDE, 4 - giveitem_std ITEM_SOFT_SAND - compare VAR_RESULT, 0 - goto_eq Route109_EventScript_272054 - closemessage - applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 - waitmovement 0 - setflag FLAG_0x118 - release - end - -Route109_EventScript_1EE9F2:: @ 81EE9F2 - msgbox Route109_Text_1EEFF1, 4 - applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 - waitmovement 0 - release - end - -Route109_EventScript_1EEA06:: @ 81EEA06 - msgbox Route109_Text_1EEF08, 2 - end - -Route109_EventScript_1EEA0F:: @ 81EEA0F - msgbox Route109_Text_1EF080, 2 - end - -Route109_EventScript_1EEA18:: @ 81EEA18 - lock - faceplayer - waitse - playmoncry SPECIES_ZIGZAGOON, 0 - msgbox Route109_Text_1EF173, 4 - waitmoncry - release - end - -Route109_EventScript_1EEA2B:: @ 81EEA2B - msgbox Route109_Text_1EF185, 3 - end - -Route109_EventScript_1EEA34:: @ 81EEA34 - msgbox Route109_Text_1EF1D5, 3 - end - -Route109_EventScript_1EEA3D:: @ 81EEA3D - trainerbattle 0, TRAINER_DAVID, 0, Route109_Text_297140, Route109_Text_29717D - msgbox Route109_Text_297191, 6 - end - -Route109_EventScript_1EEA54:: @ 81EEA54 - trainerbattle 0, TRAINER_ALICE, 0, Route109_Text_2971D1, Route109_Text_2971FD - msgbox Route109_Text_29720F, 6 - end - -Route109_EventScript_1EEA6B:: @ 81EEA6B - trainerbattle 0, TRAINER_HUEY, 0, Route109_Text_297235, Route109_Text_29727B - msgbox Route109_Text_29728C, 6 - end - -Route109_EventScript_1EEA82:: @ 81EEA82 - trainerbattle 0, TRAINER_EDMOND, 0, Route109_Text_2972B3, Route109_Text_2972CE - msgbox Route109_Text_2972ED, 6 - end - -Route109_EventScript_1EEA99:: @ 81EEA99 - trainerbattle 2, TRAINER_RICKY_1, 0, Route109_Text_29733B, Route109_Text_297379, Route109_EventScript_1EEAC5 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route109_EventScript_1EEAE4 - msgbox Route109_Text_297380, 4 - release - end - -Route109_EventScript_1EEAC5:: @ 81EEAC5 - special sub_80B4808 - waitmovement 0 - msgbox Route109_Text_2973C1, 4 - setvar VAR_0x8004, 64 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 64 - callstd 8 - release - end - -Route109_EventScript_1EEAE4:: @ 81EEAE4 - trainerbattle 5, TRAINER_RICKY_1, 0, Route109_Text_2973FF, Route109_Text_297437 - msgbox Route109_Text_297458, 6 - end - -Route109_EventScript_1EEAFB:: @ 81EEAFB - trainerbattle 2, TRAINER_LOLA_1, 0, Route109_Text_29749C, Route109_Text_2974CF, Route109_EventScript_1EEB27 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route109_EventScript_1EEB46 - msgbox Route109_Text_2974D6, 4 - release - end - -Route109_EventScript_1EEB27:: @ 81EEB27 - special sub_80B4808 - waitmovement 0 - msgbox Route109_Text_297520, 4 - setvar VAR_0x8004, 57 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 57 - callstd 8 - release - end - -Route109_EventScript_1EEB46:: @ 81EEB46 - trainerbattle 5, TRAINER_LOLA_1, 0, Route109_Text_297538, Route109_Text_297576 - msgbox Route109_Text_29757D, 6 - end - -Route109_EventScript_1EEB5D:: @ 81EEB5D - trainerbattle 0, TRAINER_AUSTINA, 0, Route109_Text_2975C0, Route109_Text_297601 - msgbox Route109_Text_29762A, 6 - end - -Route109_EventScript_1EEB74:: @ 81EEB74 - trainerbattle 0, TRAINER_GWEN, 0, Route109_Text_297667, Route109_Text_297691 - msgbox Route109_Text_2976A4, 6 - end - -Route109_EventScript_1EEB8B:: @ 81EEB8B - trainerbattle 0, TRAINER_CARTER, 0, Route109_Text_2976C5, Route109_Text_2976FC - msgbox Route109_Text_297715, 6 - end - -Route109_EventScript_1EEBA2:: @ 81EEBA2 - trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_297754, Route109_Text_2977B0, Route109_Text_29781D - msgbox Route109_Text_2977C7, 6 - end - -Route109_EventScript_1EEBBD:: @ 81EEBBD - trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_297872, Route109_Text_2978BD, Route109_Text_29792E - msgbox Route109_Text_2978F1, 6 - end - -Route109_EventScript_1EEBD8:: @ 81EEBD8 - trainerbattle 0, TRAINER_CHANDLER, 0, Route109_Text_29798A, Route109_Text_2979AE - msgbox Route109_Text_2979BF, 6 - end - -Route109_EventScript_1EEBEF:: @ 81EEBEF - trainerbattle 0, TRAINER_HAILEY, 0, Route109_Text_2979EC, Route109_Text_297A15 - msgbox Route109_Text_297A40, 6 - end - -Route109_EventScript_1EEC06:: @ 81EEC06 - trainerbattle 0, TRAINER_ELIJAH, 0, Route109_Text_297A82, Route109_Text_297AC7 - msgbox Route109_Text_297AE5, 6 - end - -DewfordTown_Text_1EEC1D: @ 81EEC1D - .string "MR. BRINEY: Ahoy!\n" - .string "We’ve made land in SLATEPORT!\p" - .string "I suppose you’re going to visit CAPT.\n" - .string "STERN and deliver the DEVON GOODS?$" - -Route109_Text_1EEC96: @ 81EEC96 - .string "MR. BRINEY: I thought you’re supposed\n" - .string "to deliver the DEVON GOODS.\p" - .string "Would you like to sail back to\n" - .string "DEWFORD, then?$" - -Route109_Text_1EED06: @ 81EED06 - .string "MR. BRINEY: DEWFORD it is, then!\p" - .string "Anchors aweigh!\n" - .string "PEEKO, we’re setting sail, my darling!$" - -Route109_Text_1EED5E: @ 81EED5E - .string "MR. BRINEY: Then you go on and deliver\n" - .string "the DEVON GOODS. I’ll be waiting.$" - -DewfordTown_Text_1EEDA7: @ 81EEDA7 - .string "MR. BRINEY: Ahoy! We’ve made land in\n" - .string "SLATEPORT!\p" - .string "You just go on and tell me whenever\n" - .string "you want to set sail again!$" - -Route109_Text_1EEE17: @ 81EEE17 - .string "MR. BRINEY: Ahoy!\n" - .string "For you, I’ll go out to sea anytime!\p" - .string "Now, my friend, where are we bound?$" - -Route109_Text_1EEE72: @ 81EEE72 - .string "MR. BRINEY: You just tell me whenever\n" - .string "you need to set sail again!$" - -Route109_Text_1EEEB4: @ 81EEEB4 - .string "Yo, TRAINERS!\n" - .string "Whether you’re hot to trot,\l" - .string "or cool cat not,\l" - .string "chill at my papa’s spot!$" - -Route109_Text_1EEF08: @ 81EEF08 - .string "Little kids can dart around so quickly…\p" - .string "You don’t dare take your eyes off them\n" - .string "for an instant. It’s very taxing.\p" - .string "Mine are with my POKéMON, so they\n" - .string "should be okay, but…$" - -Route109_Text_1EEFB0: @ 81EEFB0 - .string "Our sand castle’s taking a long time\n" - .string "to make.$" - -Route109_Text_1EEFDE: @ 81EEFDE - .string "You can have this!$" - -Route109_Text_1EEFF1: @ 81EEFF1 - .string "We’re going to get all the sand from\n" - .string "the beach and make a big castle!\p" - .string "And then we’re going to be a king and\n" - .string "queen.\p" - .string "We’ll let you be a servant.$" - -Route109_Text_1EF080: @ 81EF080 - .string "The water around these parts is clean.\p" - .string "But, I get my ZIGZAGOON to pick up\n" - .string "litter from the shoreline at times.\p" - .string "Dirty water becomes rain and joins our\n" - .string "rivers, which we drink from…\p" - .string "If we pollute the sea, it all comes\n" - .string "back to haunt us eventually.$" - -Route109_Text_1EF173: @ 81EF173 - .string "ZIGZAGOON: Guguu?$" - -Route109_Text_1EF185: @ 81EF185 - .string "SEASHORE HOUSE\p" - .string "“May hot battles rage on hot sands!\n" - .string "The place for hot TRAINERS!â€$" - -Route109_Text_1EF1D5: @ 81EF1D5 - .string "TRAINER TIPS\p" - .string "POKéMON at the same level may not\n" - .string "always have identical stats.\p" - .string "POKéMON raised by TRAINERS are said\n" - .string "to grow stronger than wild POKéMON.$" diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc deleted file mode 100644 index e70f91ca8..000000000 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ /dev/null @@ -1,196 +0,0 @@ -Route109_SeashoreHouse_MapScripts:: @ 82693F4 - map_script 3, Route109_SeashoreHouse_MapScript1_2693FA - .byte 0 - -Route109_SeashoreHouse_MapScript1_2693FA: @ 82693FA - setflag FLAG_LANDMARK_SEASHORE_HOUSE - end - -Route109_SeashoreHouse_EventScript_2693FE:: @ 82693FE - lock - faceplayer - checkflag FLAG_0x08C - goto_eq Route109_SeashoreHouse_EventScript_269460 - checkflag FLAG_0x08D - goto_eq Route109_SeashoreHouse_EventScript_269432 - checkflag FLAG_0x002 - goto_eq Route109_SeashoreHouse_EventScript_269428 - msgbox Route109_SeashoreHouse_Text_269555, 4 - setflag FLAG_0x002 - release - end - -Route109_SeashoreHouse_EventScript_269428:: @ 8269428 - msgbox Route109_SeashoreHouse_Text_269635, 4 - release - end - -Route109_SeashoreHouse_EventScript_269432:: @ 8269432 - msgbox Route109_SeashoreHouse_Text_269685, 4 - giveitem_std ITEM_SODA_POP, 6 - compare VAR_RESULT, 0 - goto_eq Route109_SeashoreHouse_EventScript_269456 - setflag FLAG_0x08C - release - end - -Route109_SeashoreHouse_EventScript_269456:: @ 8269456 - msgbox Route109_SeashoreHouse_Text_26973A, 4 - release - end - -Route109_SeashoreHouse_EventScript_269460:: @ 8269460 - showmoneybox 0, 0, 0 - msgbox Route109_SeashoreHouse_Text_26977E, 5 - compare VAR_RESULT, 1 - goto_eq Route109_SeashoreHouse_EventScript_269484 - msgbox Route109_SeashoreHouse_Text_2697EF, 4 - hidemoneybox - nop - nop - release - end - -Route109_SeashoreHouse_EventScript_269484:: @ 8269484 - checkmoney 0x12c, 0 - compare VAR_RESULT, 0 - goto_eq Route109_SeashoreHouse_EventScript_2694C8 - checkitemspace ITEM_SODA_POP, 1 - compare VAR_RESULT, 0 - goto_eq Route109_SeashoreHouse_EventScript_2694D5 - msgbox Route109_SeashoreHouse_Text_2697C8, 4 - takemoney 0x12c, 0 - updatemoneybox 0, 0 - nop - giveitem_std ITEM_SODA_POP - hidemoneybox - nop - nop - release - end - -Route109_SeashoreHouse_EventScript_2694C8:: @ 82694C8 - msgbox Route109_SeashoreHouse_Text_2697D5, 4 - hidemoneybox - nop - nop - release - end - -Route109_SeashoreHouse_EventScript_2694D5:: @ 82694D5 - msgbox gUnknown_08272AD0, 4 - hidemoneybox - nop - nop - release - end - -Route109_SeashoreHouse_EventScript_2694E2:: @ 82694E2 - trainerbattle 2, TRAINER_DWAYNE, 0, Route109_SeashoreHouse_Text_269803, Route109_SeashoreHouse_Text_269867, Route109_SeashoreHouse_EventScript_269533 - msgbox Route109_SeashoreHouse_Text_26989D, 6 - end - -Route109_SeashoreHouse_EventScript_2694FD:: @ 82694FD - trainerbattle 2, TRAINER_JOHANNA, 0, Route109_SeashoreHouse_Text_2698E3, Route109_SeashoreHouse_Text_269947, Route109_SeashoreHouse_EventScript_269533 - msgbox Route109_SeashoreHouse_Text_269953, 6 - end - -Route109_SeashoreHouse_EventScript_269518:: @ 8269518 - trainerbattle 2, TRAINER_SIMON, 0, Route109_SeashoreHouse_Text_269986, Route109_SeashoreHouse_Text_2699C5, Route109_SeashoreHouse_EventScript_269533 - msgbox Route109_SeashoreHouse_Text_2699DF, 6 - end - -Route109_SeashoreHouse_EventScript_269533:: @ 8269533 - checktrainerflag TRAINER_DWAYNE - goto_if 0, Route109_SeashoreHouse_EventScript_269553 - checktrainerflag TRAINER_JOHANNA - goto_if 0, Route109_SeashoreHouse_EventScript_269553 - checktrainerflag TRAINER_SIMON - goto_if 0, Route109_SeashoreHouse_EventScript_269553 - setflag FLAG_0x08D - release - end - -Route109_SeashoreHouse_EventScript_269553:: @ 8269553 - release - end - -Route109_SeashoreHouse_Text_269555: @ 8269555 - .string "I’m the owner of the SEASHORE HOUSE.\n" - .string "But you can call me MR. SEA!\p" - .string "What I love above all is to see hot\n" - .string "POKéMON battles.\p" - .string "Let me see that your heart burns hot!\p" - .string "If you can defeat all the TRAINERS\n" - .string "here, I’ll reward your efforts.$" - -Route109_SeashoreHouse_Text_269635: @ 8269635 - .string "Show me some hot matches!\p" - .string "I run this SEASHORE HOUSE just for\n" - .string "that reason alone!$" - -Route109_SeashoreHouse_Text_269685: @ 8269685 - .string "You’re scorching hot!\n" - .string "Those battles blazed!\l" - .string "I’m more than just satisfied!\p" - .string "As thanks for showing me your hot\n" - .string "streak, I want you to take these.\p" - .string "It’s half a dozen bottles of SODA POP!$" - -Route109_SeashoreHouse_Text_26973A: @ 826973A - .string "Oh, but hey, your BAG’s jammed full.\n" - .string "I’ll hang on to these for you.$" - -Route109_SeashoreHouse_Text_26977E: @ 826977E - .string "Want to buy some SODA POP?\n" - .string "POKéMON love it!\p" - .string "Just Â¥300 a bottle!\n" - .string "Buy some!$" - -Route109_SeashoreHouse_Text_2697C8: @ 82697C8 - .string "Here you go!$" - -Route109_SeashoreHouse_Text_2697D5: @ 82697D5 - .string "You don’t have the money.$" - -Route109_SeashoreHouse_Text_2697EF: @ 82697EF - .string "No?\n" - .string "That’s too bad.$" - -Route109_SeashoreHouse_Text_269803: @ 8269803 - .string "If you’re looking for a battle in the\n" - .string "SEASHORE HOUSE, you’ll find no\l" - .string "hotter TRAINER than me, matey!$" - -Route109_SeashoreHouse_Text_269867: @ 8269867 - .string "That was a hot battle!\n" - .string "I can accept that loss, matey!$" - -Route109_SeashoreHouse_Text_26989D: @ 826989D - .string "Whenever I’m in SLATEPORT, I enjoy\n" - .string "hot battles and ice-cold SODA POP!$" - -Route109_SeashoreHouse_Text_2698E3: @ 82698E3 - .string "Boring battles aren’t worth the effort.\p" - .string "Fiery hot battles are what toughen up\n" - .string "TRAINERS and POKéMON!$" - -Route109_SeashoreHouse_Text_269947: @ 8269947 - .string "That’s hot!$" - -Route109_SeashoreHouse_Text_269953: @ 8269953 - .string "Whew, I’m all thirsty.\n" - .string "Maybe I’ll have a SODA POP.$" - -Route109_SeashoreHouse_Text_269986: @ 8269986 - .string "I’m going to show you how great\n" - .string "my POKéMON are, but don’t cry!$" - -Route109_SeashoreHouse_Text_2699C5: @ 82699C5 - .string "…I lost, but I won’t cry…$" - -Route109_SeashoreHouse_Text_2699DF: @ 82699DF - .string "If one of my POKéMON knew the move\n" - .string "for carrying me across water on its\l" - .string "back, I could get rid of this inner tube.$" - diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc deleted file mode 100644 index 40d6a2e69..000000000 --- a/data/scripts/maps/Route110.inc +++ /dev/null @@ -1,1030 +0,0 @@ -Route110_MapScripts:: @ 81EF269 - map_script 5, Route110_MapScript1_1EF279 - map_script 3, Route110_MapScript1_1EF27D - map_script 2, Route110_MapScript2_1EF297 - .byte 0 - -Route110_MapScript1_1EF279: @ 81EF279 - special UpdateCyclingRoadState - end - -Route110_MapScript1_1EF27D: @ 81EF27D - call Route110_EventScript_271ED7 - call Route110_EventScript_271EFB - compare VAR_0x40A9, 1 - call_if 1, Route110_EventScript_1EF293 - end - -Route110_EventScript_1EF293:: @ 81EF293 - savebgm MUS_CYCLING - return - -Route110_MapScript2_1EF297: @ 81EF297 - map_script_2 VAR_0x40A9, 1, Route110_EventScript_1EF2A1 - .2byte 0 - -Route110_EventScript_1EF2A1:: @ 81EF2A1 - special Special_BeginCyclingRoadChallenge - setvar VAR_0x40A9, 2 - return - -Route110_EventScript_1EF2AA:: @ 81EF2AA - lock - faceplayer - msgbox Route110_Text_1EFB5D, 4 - applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 - waitmovement 0 - release - end - -Route110_EventScript_1EF2C0:: @ 81EF2C0 - lock - faceplayer - msgbox Route110_Text_1EFB93, 4 - applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 - waitmovement 0 - release - end - -Route110_EventScript_1EF2D6:: @ 81EF2D6 - lock - faceplayer - msgbox Route110_Text_1EFBCA, 4 - applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 - waitmovement 0 - release - end - -Route110_EventScript_1EF2EC:: @ 81EF2EC - lock - faceplayer - msgbox Route110_Text_1EFC0D, 4 - applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 - waitmovement 0 - release - end - -Route110_EventScript_1EF302:: @ 81EF302 - msgbox Route110_Text_1EFFC3, 2 - end - -Route110_EventScript_1EF30B:: @ 81EF30B - msgbox Route110_Text_1F0006, 2 - end - -Route110_EventScript_1EF314:: @ 81EF314 - msgbox Route110_Text_1F006A, 2 - end - -Route110_EventScript_1EF31D:: @ 81EF31D - msgbox Route110_Text_1F0261, 2 - end - -Route110_EventScript_1EF326:: @ 81EF326 - msgbox Route110_Text_1F02CA, 2 - end - -Route110_EventScript_1EF32F:: @ 81EF32F - msgbox Route110_Text_1F030E, 2 - end - -Route110_EventScript_1EF338:: @ 81EF338 - msgbox Route110_Text_1F0390, 2 - end - -Route110_EventScript_1EF341:: @ 81EF341 - msgbox Route110_Text_1F0812, 3 - end - -Route110_EventScript_1EF34A:: @ 81EF34A - msgbox Route110_Text_1F082D, 3 - end - -Route110_EventScript_1EF353:: @ 81EF353 - msgbox Route110_Text_1F0842, 3 - end - -Route110_EventScript_1EF35C:: @ 81EF35C - msgbox Route110_Text_1F08CD, 3 - end - -Route110_EventScript_1EF365:: @ 81EF365 - msgbox Route110_Text_1F08E3, 3 - end - -Route110_EventScript_1EF36E:: @ 81EF36E - msgbox Route110_Text_1F08F3, 3 - end - -Route110_EventScript_1EF377:: @ 81EF377 - msgbox Route110_Text_1F090D, 3 - end - -Route110_EventScript_1EF380:: @ 81EF380 - msgbox Route110_Text_1F0992, 3 - end - -Route110_EventScript_1EF389:: @ 81EF389 - msgbox Route110_Text_1F09DB, 3 - end - -Route110_EventScript_1EF392:: @ 81EF392 - lockall - specialvar VAR_RESULT, GetRecordedCyclingRoadResults - compare VAR_RESULT, 0 - goto_eq Route110_EventScript_1EF3AD - msgbox Route110_Text_1F0A1E, 4 - releaseall - end - -Route110_EventScript_1EF3AD:: @ 81EF3AD - msgbox Route110_Text_1F0A5E, 4 - releaseall - end - -Route110_EventScript_1EF3B7:: @ 81EF3B7 - lock - faceplayer - specialvar VAR_RESULT, GetPlayerAvatarBike - compare VAR_RESULT, 1 - goto_eq Route110_EventScript_1EF3E8 - compare VAR_0x40A9, 0 - goto_eq Route110_EventScript_1EF3DE - msgbox Route110_Text_1F06FB, 4 - release - end - -Route110_EventScript_1EF3DE:: @ 81EF3DE - msgbox Route110_Text_1F0661, 4 - release - end - -Route110_EventScript_1EF3E8:: @ 81EF3E8 - msgbox Route110_Text_1F0755, 4 - release - end - -Route110_EventScript_1EF3F2:: @ 81EF3F2 - trainerbattle 0, TRAINER_EDWARD, 0, Route110_Text_29802B, Route110_Text_298064 - msgbox Route110_Text_29808A, 6 - end - -Route110_EventScript_1EF409:: @ 81EF409 - trainerbattle 0, TRAINER_JACLYN, 0, Route110_Text_2980B9, Route110_Text_2980E5 - msgbox Route110_Text_2980F8, 6 - end - -Route110_EventScript_1EF420:: @ 81EF420 - trainerbattle 2, TRAINER_EDWIN_1, 0, Route110_Text_29815E, Route110_Text_29818F, Route110_EventScript_1EF44C - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route110_EventScript_1EF46B - msgbox Route110_Text_2981B3, 4 - release - end - -Route110_EventScript_1EF44C:: @ 81EF44C - special sub_80B4808 - waitmovement 0 - msgbox Route110_Text_298201, 4 - setvar VAR_0x8004, 512 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 512 - callstd 8 - release - end - -Route110_EventScript_1EF46B:: @ 81EF46B - trainerbattle 5, TRAINER_EDWIN_1, 0, Route110_Text_298232, Route110_Text_298288 - msgbox Route110_Text_2982A2, 6 - end - -Route110_EventScript_1EF482:: @ 81EF482 - trainerbattle 0, TRAINER_DALE, 0, Route110_Text_2982CC, Route110_Text_2982F5 - msgbox Route110_Text_298303, 6 - end - -Route110_EventScript_1EF499:: @ 81EF499 - trainerbattle 0, TRAINER_JACOB, 0, Route110_Text_297B3F, Route110_Text_297B77 - msgbox Route110_Text_297B8F, 6 - end - -Route110_EventScript_1EF4B0:: @ 81EF4B0 - trainerbattle 0, TRAINER_ANTHONY, 0, Route110_Text_297BE7, Route110_Text_297C0F - msgbox Route110_Text_297C1F, 6 - end - -Route110_EventScript_1EF4C7:: @ 81EF4C7 - trainerbattle 2, TRAINER_BENJAMIN_1, 0, Route110_Text_297C63, Route110_Text_297C8A, Route110_EventScript_1EF4F3 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route110_EventScript_1EF512 - msgbox Route110_Text_297CB4, 4 - release - end - -Route110_EventScript_1EF4F3:: @ 81EF4F3 - special sub_80B4808 - waitmovement 0 - msgbox Route110_Text_297CFE, 4 - setvar VAR_0x8004, 353 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 353 - callstd 8 - release - end - -Route110_EventScript_1EF512:: @ 81EF512 - trainerbattle 5, TRAINER_BENJAMIN_1, 0, Route110_Text_297D4B, Route110_Text_297D8E - msgbox Route110_Text_297DB0, 6 - end - -Route110_EventScript_1EF529:: @ 81EF529 - trainerbattle 0, TRAINER_JASMINE, 0, Route110_Text_297F93, Route110_Text_297FD0 - msgbox Route110_Text_297FF1, 6 - end - -Route110_EventScript_1EF540:: @ 81EF540 - trainerbattle 2, TRAINER_ABIGAIL_1, 0, Route110_Text_297DFA, Route110_Text_297E69, Route110_EventScript_1EF56C - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route110_EventScript_1EF58B - msgbox Route110_Text_297E88, 4 - release - end - -Route110_EventScript_1EF56C:: @ 81EF56C - special sub_80B4808 - waitmovement 0 - msgbox Route110_Text_297ECD, 4 - setvar VAR_0x8004, 358 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 358 - callstd 8 - release - end - -Route110_EventScript_1EF58B:: @ 81EF58B - trainerbattle 5, TRAINER_ABIGAIL_1, 0, Route110_Text_297F09, Route110_Text_297F37 - msgbox Route110_Text_297F58, 6 - end - -Route110_EventScript_1EF5A2:: @ 81EF5A2 - trainerbattle 2, TRAINER_ISABEL_1, 0, Route110_Text_298349, Route110_Text_298389, Route110_EventScript_1EF5CE - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route110_EventScript_1EF5ED - msgbox Route110_Text_2983A2, 4 - release - end - -Route110_EventScript_1EF5CE:: @ 81EF5CE - special sub_80B4808 - waitmovement 0 - msgbox Route110_Text_2983EE, 4 - setvar VAR_0x8004, 302 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 302 - callstd 8 - release - end - -Route110_EventScript_1EF5ED:: @ 81EF5ED - trainerbattle 5, TRAINER_ISABEL_1, 0, Route110_Text_298466, Route110_Text_2984AF - msgbox Route110_Text_2984C8, 6 - end - -Route110_EventScript_1EF604:: @ 81EF604 - trainerbattle 0, TRAINER_TIMMY, 0, Route110_Text_298525, Route110_Text_298559 - msgbox Route110_Text_298579, 6 - end - -Route110_EventScript_1EF61B:: @ 81EF61B - end - -Route110_EventScript_1EF61C:: @ 81EF61C - trainerbattle 0, TRAINER_KALEB, 0, Route110_Text_2986ED, Route110_Text_298735 - msgbox Route110_Text_298755, 6 - end - -Route110_EventScript_1EF633:: @ 81EF633 - trainerbattle 0, TRAINER_JOSEPH, 0, Route110_Text_298642, Route110_Text_298686 - msgbox Route110_Text_2986A9, 6 - end - -Route110_EventScript_1EF64A:: @ 81EF64A - trainerbattle 0, TRAINER_ALYSSA, 0, Route110_Text_2985AB, Route110_Text_2985F9 - msgbox Route110_Text_298612, 6 - end - -Route110_EventScript_1EF661:: @ 81EF661 - lockall - applymovement 21, Route110_Movement_2725A8 - waitmovement 0 - call Route110_EventScript_1EF673 - releaseall - end - -Route110_EventScript_1EF673:: @ 81EF673 - special FinishCyclingRoadChallenge - msgbox Route110_Text_1F03FF, 4 - switch VAR_RESULT - case 10, Route110_EventScript_1EF6FD - case 9, Route110_EventScript_1EF70B - case 8, Route110_EventScript_1EF70B - case 7, Route110_EventScript_1EF70B - case 6, Route110_EventScript_1EF719 - case 5, Route110_EventScript_1EF719 - case 4, Route110_EventScript_1EF719 - case 3, Route110_EventScript_1EF727 - case 2, Route110_EventScript_1EF727 - case 1, Route110_EventScript_1EF727 - case 0, Route110_EventScript_1EF735 - end - -Route110_EventScript_1EF6FD:: @ 81EF6FD - msgbox Route110_Text_1F0431, 4 - goto Route110_EventScript_1EF743 - end - -Route110_EventScript_1EF70B:: @ 81EF70B - msgbox Route110_Text_1F04A4, 4 - goto Route110_EventScript_1EF743 - end - -Route110_EventScript_1EF719:: @ 81EF719 - msgbox Route110_Text_1F0500, 4 - goto Route110_EventScript_1EF743 - end - -Route110_EventScript_1EF727:: @ 81EF727 - msgbox Route110_Text_1F0567, 4 - goto Route110_EventScript_1EF743 - end - -Route110_EventScript_1EF735:: @ 81EF735 - msgbox Route110_Text_1F05CE, 4 - goto Route110_EventScript_1EF743 - end - -Route110_EventScript_1EF743:: @ 81EF743 - setvar VAR_0x40A9, 3 - savebgm MUS_DUMMY - fadedefaultbgm - return - -Route110_EventScript_1EF74D:: @ 81EF74D - setvar VAR_0x8008, 1 - goto Route110_EventScript_1EF76E - end - -Route110_EventScript_1EF758:: @ 81EF758 - setvar VAR_0x8008, 2 - goto Route110_EventScript_1EF76E - end - -Route110_EventScript_1EF763:: @ 81EF763 - setvar VAR_0x8008, 3 - goto Route110_EventScript_1EF76E - end - -Route110_EventScript_1EF76E:: @ 81EF76E - lockall - checkplayergender - compare VAR_RESULT, 0 - call_if 1, Route110_EventScript_1EF7E1 - compare VAR_RESULT, 1 - call_if 1, Route110_EventScript_1EF7E6 - applymovement 28, Route110_Movement_2725AA - waitmovement 0 - applymovement 28, Route110_Movement_272598 - waitmovement 0 - applymovement 28, Route110_Movement_27259A - waitmovement 0 - delay 30 - compare VAR_0x8008, 1 - call_if 1, Route110_EventScript_1EF94E - compare VAR_0x8008, 2 - call_if 1, Route110_EventScript_1EF959 - compare VAR_0x8008, 3 - call_if 1, Route110_EventScript_1EF964 - checkplayergender - compare VAR_RESULT, 0 - goto_eq Route110_EventScript_1EF7EB - compare VAR_RESULT, 1 - goto_eq Route110_EventScript_1EF865 - releaseall - end - -Route110_EventScript_1EF7E1:: @ 81EF7E1 - playbgm MUS_GIRL_SUP, 1 - return - -Route110_EventScript_1EF7E6:: @ 81EF7E6 - playbgm MUS_BOY_SUP, 1 - return - -Route110_EventScript_1EF7EB:: @ 81EF7EB - msgbox Route110_Text_1EFC48, 4 - switch VAR_FIRST_POKE - case 0, Route110_EventScript_1EF81A - case 1, Route110_EventScript_1EF82A - case 2, Route110_EventScript_1EF83A - end - -Route110_EventScript_1EF81A:: @ 81EF81A - trainerbattle 3, TRAINER_MAY_5, 0, Route110_Text_1EFCCB - goto Route110_EventScript_1EF84A - end - -Route110_EventScript_1EF82A:: @ 81EF82A - trainerbattle 3, TRAINER_MAY_8, 0, Route110_Text_1EFCCB - goto Route110_EventScript_1EF84A - end - -Route110_EventScript_1EF83A:: @ 81EF83A - trainerbattle 3, TRAINER_MAY_2, 0, Route110_Text_1EFCCB - goto Route110_EventScript_1EF84A - end - -Route110_EventScript_1EF84A:: @ 81EF84A - msgbox Route110_Text_1EFCF1, 4 - call Route110_EventScript_1EF8DF - msgbox Route110_Text_1EFD58, 4 - goto Route110_EventScript_1EF8EC - end - -Route110_EventScript_1EF865:: @ 81EF865 - msgbox Route110_Text_1EFE3F, 4 - switch VAR_FIRST_POKE - case 0, Route110_EventScript_1EF894 - case 1, Route110_EventScript_1EF8A4 - case 2, Route110_EventScript_1EF8B4 - end - -Route110_EventScript_1EF894:: @ 81EF894 - trainerbattle 3, TRAINER_BRENDAN_5, 0, Route110_Text_1EFEB4 - goto Route110_EventScript_1EF8C4 - end - -Route110_EventScript_1EF8A4:: @ 81EF8A4 - trainerbattle 3, TRAINER_BRENDAN_8, 0, Route110_Text_1EFEB4 - goto Route110_EventScript_1EF8C4 - end - -Route110_EventScript_1EF8B4:: @ 81EF8B4 - trainerbattle 3, TRAINER_BRENDAN_2, 0, Route110_Text_1EFEB4 - goto Route110_EventScript_1EF8C4 - end - -Route110_EventScript_1EF8C4:: @ 81EF8C4 - msgbox Route110_Text_1EFECD, 4 - call Route110_EventScript_1EF8DF - msgbox Route110_Text_1EFF1C, 4 - goto Route110_EventScript_1EF8EC - end - -Route110_EventScript_1EF8DF:: @ 81EF8DF - giveitem_std ITEM_ITEMFINDER - return - -Route110_EventScript_1EF8EC:: @ 81EF8EC - closemessage - compare VAR_0x8008, 1 - call_if 1, Route110_EventScript_1EF990 - compare VAR_0x8008, 2 - call_if 1, Route110_EventScript_1EF998 - compare VAR_0x8008, 3 - call_if 1, Route110_EventScript_1EF9A0 - setobjectmovementtype 28, 10 - setobjectmovementtype 29, 10 - removeobject 28 - addobject 29 - delay 45 - compare VAR_0x8008, 1 - call_if 1, Route110_EventScript_1EF96F - compare VAR_0x8008, 2 - call_if 1, Route110_EventScript_1EF97A - compare VAR_0x8008, 3 - call_if 1, Route110_EventScript_1EF985 - removeobject 29 - setvar VAR_0x4069, 1 - savebgm MUS_DUMMY - fadedefaultbgm - releaseall - end - -Route110_EventScript_1EF94E:: @ 81EF94E - applymovement 28, Route110_Movement_1EF9A8 - waitmovement 0 - return - -Route110_EventScript_1EF959:: @ 81EF959 - applymovement 28, Route110_Movement_1EF9AC - waitmovement 0 - return - -Route110_EventScript_1EF964:: @ 81EF964 - applymovement 28, Route110_Movement_1EF9AE - waitmovement 0 - return - -Route110_EventScript_1EF96F:: @ 81EF96F - applymovement 29, Route110_Movement_1EF9B2 - waitmovement 0 - return - -Route110_EventScript_1EF97A:: @ 81EF97A - applymovement 29, Route110_Movement_1EF9BA - waitmovement 0 - return - -Route110_EventScript_1EF985:: @ 81EF985 - applymovement 29, Route110_Movement_1EF9C3 - waitmovement 0 - return - -Route110_EventScript_1EF990:: @ 81EF990 - setobjectxyperm 29, 33, 55 - return - -Route110_EventScript_1EF998:: @ 81EF998 - setobjectxyperm 29, 34, 55 - return - -Route110_EventScript_1EF9A0:: @ 81EF9A0 - setobjectxyperm 29, 35, 55 - return - -Route110_Movement_1EF9A8: @ 81EF9A8 - walk_down - walk_left - walk_in_place_fastest_down - step_end - -Route110_Movement_1EF9AC: @ 81EF9AC - walk_down - step_end - -Route110_Movement_1EF9AE: @ 81EF9AE - walk_down - walk_right - walk_in_place_fastest_down - step_end - -Route110_Movement_1EF9B2: @ 81EF9B2 - 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 - 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 - 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 - lockall - setvar VAR_0x8008, 1 - goto Route110_EventScript_1EF9F7 - -Route110_EventScript_1EF9D6:: @ 81EF9D6 - lockall - setvar VAR_0x8008, 2 - goto Route110_EventScript_1EF9F7 - -Route110_EventScript_1EF9E1:: @ 81EF9E1 - lockall - setvar VAR_0x8008, 3 - goto Route110_EventScript_1EF9F7 - -Route110_EventScript_1EF9EC:: @ 81EF9EC - lockall - setvar VAR_0x8008, 4 - goto Route110_EventScript_1EF9F7 - -Route110_EventScript_1EF9F7:: @ 81EF9F7 - addobject 36 - applymovement 36, Route110_Movement_1EFB30 - waitmovement 0 - playse SE_PIN - applymovement 36, Route110_Movement_272598 - waitmovement 0 - applymovement 36, Route110_Movement_27259A - waitmovement 0 - compare VAR_0x8008, 1 - call_if 1, Route110_EventScript_1EFAD8 - compare VAR_0x8008, 2 - call_if 1, Route110_EventScript_1EFAE3 - compare VAR_0x8008, 3 - call_if 1, Route110_EventScript_1EFAEE - compare VAR_0x8008, 4 - call_if 1, Route110_EventScript_1EFAF9 - msgbox Route110_Text_1F0AB5, 4 - closemessage - delay 20 - applymovement 36, Route110_Movement_2725A4 - waitmovement 0 - delay 10 - applymovement 36, Route110_Movement_2725A8 - waitmovement 0 - delay 20 - applymovement 36, Route110_Movement_2725AA - waitmovement 0 - delay 30 - msgbox Route110_Text_1F0AFF, 4 - closemessage - delay 30 - playfanfare MUS_ME_TORE_EYE - msgbox Route110_Text_1F0C0C, 4 - waitfanfare - closemessage - delay 30 - setflag FLAG_0x119 - msgbox Route110_Text_1F0C33, 4 - closemessage - compare VAR_0x8008, 1 - call_if 1, Route110_EventScript_1EFB04 - compare VAR_0x8008, 2 - call_if 1, Route110_EventScript_1EFB0F - compare VAR_0x8008, 3 - call_if 1, Route110_EventScript_1EFB1A - compare VAR_0x8008, 4 - call_if 1, Route110_EventScript_1EFB25 - removeobject 36 - setvar VAR_0x40DA, 2 - releaseall - end - -Route110_EventScript_1EFAD8:: @ 81EFAD8 - applymovement 36, Route110_Movement_1EFB34 - waitmovement 0 - return - -Route110_EventScript_1EFAE3:: @ 81EFAE3 - applymovement 36, Route110_Movement_1EFB39 - waitmovement 0 - return - -Route110_EventScript_1EFAEE:: @ 81EFAEE - applymovement 36, Route110_Movement_1EFB3D - waitmovement 0 - return - -Route110_EventScript_1EFAF9:: @ 81EFAF9 - applymovement 36, Route110_Movement_1EFB40 - waitmovement 0 - return - -Route110_EventScript_1EFB04:: @ 81EFB04 - applymovement 36, Route110_Movement_1EFB44 - waitmovement 0 - return - -Route110_EventScript_1EFB0F:: @ 81EFB0F - applymovement 36, Route110_Movement_1EFB4B - waitmovement 0 - return - -Route110_EventScript_1EFB1A:: @ 81EFB1A - applymovement 36, Route110_Movement_1EFB51 - waitmovement 0 - return - -Route110_EventScript_1EFB25:: @ 81EFB25 - applymovement 36, Route110_Movement_1EFB57 - waitmovement 0 - return - -Route110_Movement_1EFB30: @ 81EFB30 - walk_down - walk_down - walk_down - step_end - -Route110_Movement_1EFB34: @ 81EFB34 - walk_down - walk_left - walk_left - walk_down - step_end - -Route110_Movement_1EFB39: @ 81EFB39 - walk_down - walk_left - walk_down - step_end - -Route110_Movement_1EFB3D: @ 81EFB3D - walk_down - walk_down - step_end - -Route110_Movement_1EFB40: @ 81EFB40 - walk_down - walk_right - walk_down - step_end - -Route110_Movement_1EFB44: @ 81EFB44 - walk_up - walk_up - walk_right - walk_up - walk_up - walk_up - step_end - -Route110_Movement_1EFB4B: @ 81EFB4B - walk_up - walk_up - walk_up - walk_up - walk_up - step_end - -Route110_Movement_1EFB51: @ 81EFB51 - walk_up - walk_up - walk_up - walk_up - walk_up - step_end - -Route110_Movement_1EFB57: @ 81EFB57 - walk_up - walk_up - walk_up - walk_up - walk_up - step_end - -Route110_Text_1EFB5D: @ 81EFB5D - .string "TEAM AQUA’s activities…\n" - .string "We can’t talk about them yet.$" - -Route110_Text_1EFB93: @ 81EFB93 - .string "I want to get going to SLATEPORT and\n" - .string "kick up a ruckus!$" - -Route110_Text_1EFBCA: @ 81EFBCA - .string "This is my first job after joining\n" - .string "TEAM AQUA. It’s a little scary.$" - -Route110_Text_1EFC0D: @ 81EFC0D - .string "TEAM AQUA’s actions should bring\n" - .string "smiles to people’s faces!$" - -Route110_Text_1EFC48: @ 81EFC48 - .string "MAY: Hi, {PLAYER}{KUN}, long time no see!\p" - .string "While I was searching for other\n" - .string "POKéMON, my POKéMON grew stronger.\p" - .string "So…\n" - .string "How about a little battle?$" - -Route110_Text_1EFCCB: @ 81EFCCB - .string "Yikes!\n" - .string "You’re better than I expected!$" - -Route110_Text_1EFCF1: @ 81EFCF1 - .string "MAY: {PLAYER}{KUN}, you’ve been busy\n" - .string "training, too, haven’t you?\p" - .string "I think you deserve a reward!\n" - .string "This is from me!$" - -Route110_Text_1EFD58: @ 81EFD58 - .string "MAY: That’s an ITEMFINDER.\p" - .string "Try it out. If there is an item that’s\n" - .string "not visible, it emits a sound.\p" - .string "Okay, {PLAYER}{KUN}, let’s meet again!\p" - .string "I know it’s a little silly coming from\n" - .string "me, but I think you should train a lot\l" - .string "harder for the next time.$" - -Route110_Text_1EFE3F: @ 81EFE3F - .string "BRENDAN: Hey, {PLAYER}.\n" - .string "So this is where you were.\l" - .string "How’s it going?\p" - .string "Have you been raising your POKéMON?\n" - .string "I’ll check for you.$" - -Route110_Text_1EFEB4: @ 81EFEB4 - .string "Hmm…\n" - .string "You’re pretty good.$" - -Route110_Text_1EFECD: @ 81EFECD - .string "BRENDAN: {PLAYER}, you’ve trained\n" - .string "without me noticing…\p" - .string "Good enough!\n" - .string "Here, take this.$" - -Route110_Text_1EFF1C: @ 81EFF1C - .string "BRENDAN: That’s an ITEMFINDER.\p" - .string "Use it to root around for items that\n" - .string "aren’t visible.\p" - .string "If it senses something, it emits\n" - .string "a sound.\p" - .string "Anyway, I’m off to look for new\n" - .string "POKéMON.$" - -Route110_Text_1EFFC3: @ 81EFFC3 - .string "Wouldn’t it be great to ride a BIKE\n" - .string "at full speed on CYCLING ROAD?$" - -Route110_Text_1F0006: @ 81F0006 - .string "How do you like the way my raven-\n" - .string "colored hair streams behind me?\p" - .string "I grew my hair out just for that.$" - -Route110_Text_1F006A: @ 81F006A - .string "Oh, hey, you got that BIKE from RYDEL!\p" - .string "Oh, it’s glaringly obvious.\n" - .string "It says right on your bike…\p" - .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n" - .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p" - .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n" - .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p" - .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n" - .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p" - .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n" - .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p" - .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL…\n" - .string "That name’s everywhere.\p" - .string "You should ride it around all over\n" - .string "the place--it’s good advertising!$" - -Route110_Text_1F0261: @ 81F0261 - .string "The two roads, one above, one below…\p" - .string "A road each for people and POKéMON.\n" - .string "Perhaps that is right and fair.$" - -Route110_Text_1F02CA: @ 81F02CA - .string "I don’t have a BIKE, so I’ll take\n" - .string "a leisurely walk on the low road.$" - -Route110_Text_1F030E: @ 81F030E - .string "Learning techniques will make BIKE\n" - .string "riding even more fun.\p" - .string "There are some places that you can\n" - .string "reach only by using a BIKE technique.$" - -Route110_Text_1F0390: @ 81F0390 - .string "Which should I choose?\p" - .string "Make a beeline for MAUVILLE on\n" - .string "CYCLING ROAD, or take the low road\l" - .string "and look for POKéMON?$" - -Route110_Text_1F03FF: @ 81F03FF - .string "Number of collisions:\n" - .string "… … {STR_VAR_1}!\p" - .string "Total time:\n" - .string "… … {STR_VAR_2}!$" - -Route110_Text_1F0431: @ 81F0431 - .string "Bravo! Splendid showing!\p" - .string "Your love of cycling comes from deep\n" - .string "within your heart.\l" - .string "You’ve shaken me to my very soul!$" - -Route110_Text_1F04A4: @ 81F04A4 - .string "Your technique is remarkable.\p" - .string "I suggest you speed up a bit while\n" - .string "still avoiding collisions.$" - -Route110_Text_1F0500: @ 81F0500 - .string "I would consider you a work in\n" - .string "progress.\p" - .string "Still, I hope you don’t forget the\n" - .string "sheer pleasure of cycling.$" - -Route110_Text_1F0567: @ 81F0567 - .string "My word… Your cycling skills border\n" - .string "on terrifying.\p" - .string "Most certainly, you need much more\n" - .string "practice riding.$" - -Route110_Text_1F05CE: @ 81F05CE - .string "…I am aghast…\p" - .string "You’re perhaps not cut out for this\n" - .string "unfortunate cycling business.\p" - .string "You ought to give serious thought to\n" - .string "returning that BIKE to RYDEL.$" - -Route110_Text_1F0661: @ 81F0661 - .string "This is CYCLING ROAD.\p" - .string "If you were to ride from MAUVILLE to\n" - .string "SLATEPORT on a MACH BIKE, you would\l" - .string "be rated for the number of collisions\l" - .string "and your total time.$" - -Route110_Text_1F06FB: @ 81F06FB - .string "Regardless of the results, I count on\n" - .string "seeing more challenges from you.\l" - .string "Always aim higher!$" - -Route110_Text_1F0755: @ 81F0755 - .string "On this CYCLING ROAD, those riding\n" - .string "MACH BIKES are rated for their number\l" - .string "of collisions and their total times.\p" - .string "ACRO BIKES do not qualify for rating.\n" - .string "They are easy to turn, so it’s not fair.$" - -Route110_Text_1F0812: @ 81F0812 - .string "ROUTE 110\n" - .string "{0x7A} SLATEPORT CITY$" - -Route110_Text_1F082D: @ 81F082D - .string "SEASIDE CYCLING ROAD$" - -Route110_Text_1F0842: @ 81F0842 - .string "“TEAM AQUA was here!â€\p" - .string "Someone painted that onto this sign,\n" - .string "but then someone else painted over it.\p" - .string "“TEAM MAGMA rules!†is what it\n" - .string "says now.$" - -Route110_Text_1F08CD: @ 81F08CD - .string "ROUTE 110\n" - .string "{0x7B} ROUTE 103$" - -Route110_Text_1F08E3: @ 81F08E3 - .string "SEASIDE PARKING$" - -Route110_Text_1F08F3: @ 81F08F3 - .string "ROUTE 110\n" - .string "{0x79} MAUVILLE CITY$" - -Route110_Text_1F090D: @ 81F090D - .string "TRAINER TIPS\p" - .string "The foe can be made helpless by\n" - .string "paralyzing it or causing it to sleep.\p" - .string "It is an important technique for\n" - .string "POKéMON battles.$" - -Route110_Text_1F0992: @ 81F0992 - .string "TRAINER TIPS\p" - .string "The items in the BAG can be reorganized\n" - .string "by pressing SELECT.$" - -Route110_Text_1F09DB: @ 81F09DB - .string "“Three steps {0x7C} and two steps {0x79}\n" - .string "to reach the wondrous TRICK HOUSE.â€$" - -Route110_Text_1F0A1E: @ 81F0A1E - .string "THE BEST RECORD TO DATE…\p" - .string "No. of collisions: {STR_VAR_1}\p" - .string "Elapsed time: {STR_VAR_2}$" - -Route110_Text_1F0A5E: @ 81F0A5E - .string "THE BEST RECORD TO DATE…\p" - .string "No one seems to have taken the\n" - .string "challenge. There is no record…$" - -Route110_Text_1F0AB5: @ 81F0AB5 - .string "PROF. BIRCH: Oh, {PLAYER}{KUN}!\n" - .string "Imagine seeing you here!\p" - .string "And where might my {RIVAL} be?$" - -Route110_Text_1F0AFF: @ 81F0AFF - .string "Oh, I see!\n" - .string "You two are running separately.\l" - .string "Well, that’s fine.\p" - .string "Oh, yes, I heard that your POKéNAV\n" - .string "had the MATCH CALL system installed.\p" - .string "Well, then, I should register you in\n" - .string "my POKéNAV as well.\p" - .string "That way, even when we’re apart,\n" - .string "I can rate your POKéDEX anytime.\p" - .string "… … … … … …$" - -Route110_Text_1F0C0C: @ 81F0C0C - .string "Registered PROF. BIRCH\n" - .string "in the POKéNAV.$" - -Route110_Text_1F0C33: @ 81F0C33 - .string "PROF. BIRCH: {PLAYER}{KUN}…\p" - .string "Please keep an eye out for my {RIVAL}.\n" - .string "… … … … … …\p" - .string "Well, I had better get going.\n" - .string "See you again, {PLAYER}{KUN}!$" - diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc deleted file mode 100644 index 9579df56c..000000000 --- a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.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/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc deleted file mode 100644 index 499969d6e..000000000 --- a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.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/scripts/maps/Route110_TrickHouseCorridor.inc b/data/scripts/maps/Route110_TrickHouseCorridor.inc deleted file mode 100644 index cf520c81f..000000000 --- a/data/scripts/maps/Route110_TrickHouseCorridor.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route110_TrickHouseCorridor_MapScripts:: @ 826B903 - map_script 3, Route110_TrickHouseCorridor_MapScript1_26B909 - .byte 0 - -Route110_TrickHouseCorridor_MapScript1_26B909: @ 826B909 - setvar VAR_0x40B5, 1 - end - diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc deleted file mode 100644 index 4e15ddbe7..000000000 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ /dev/null @@ -1,369 +0,0 @@ -Route110_TrickHouseEnd_MapScripts:: @ 826ACAF - map_script 5, Route110_TrickHouseEnd_MapScript1_26ACC4 - map_script 3, Route110_TrickHouseEnd_MapScript1_26ACD0 - map_script 2, Route110_TrickHouseEnd_MapScript2_26ACF5 - map_script 4, Route110_TrickHouseEnd_MapScript2_26ACDE - .byte 0 - -Route110_TrickHouseEnd_MapScript1_26ACC4: @ 826ACC4 - compare VAR_TEMP_1, 1 - call_if 1, Route110_TrickHouseEnd_EventScript_26AD0D - end - -Route110_TrickHouseEnd_MapScript1_26ACD0: @ 826ACD0 - setvar VAR_TEMP_1, 0 - setvar VAR_TEMP_2, 0 - special SetTrickHouseEndRoomFlag - end - -Route110_TrickHouseEnd_MapScript2_26ACDE: @ 826ACDE - map_script_2 VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_26ACE8 - .2byte 0 - -Route110_TrickHouseEnd_EventScript_26ACE8:: @ 826ACE8 - addobject 1 - showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_END - turnobject 1, 4 - end - -Route110_TrickHouseEnd_MapScript2_26ACF5: @ 826ACF5 - map_script_2 VAR_TEMP_1, 0, Route110_TrickHouseEnd_EventScript_26ACFF - .2byte 0 - -Route110_TrickHouseEnd_EventScript_26ACFF:: @ 826ACFF - setvar VAR_TEMP_1, 1 - call Route110_TrickHouseEnd_EventScript_26AD0D - special DrawWholeMapView - end - -Route110_TrickHouseEnd_EventScript_26AD0D:: @ 826AD0D - setmetatile 10, 1, 539, 1 - return - -Route110_TrickHouseEnd_EventScript_26AD17:: @ 826AD17 - lock - faceplayer - msgbox Route110_TrickHouseEnd_Text_26B08D, 4 - setvar VAR_TEMP_2, 1 - switch VAR_0x4044 - case 0, Route110_TrickHouseEnd_EventScript_26AD84 - case 1, Route110_TrickHouseEnd_EventScript_26ADC0 - case 2, Route110_TrickHouseEnd_EventScript_26ADFC - case 3, Route110_TrickHouseEnd_EventScript_26AE38 - case 4, Route110_TrickHouseEnd_EventScript_26AE74 - case 5, Route110_TrickHouseEnd_EventScript_26AEB0 - case 6, Route110_TrickHouseEnd_EventScript_26AEEC - case 7, Route110_TrickHouseEnd_EventScript_26AF28 - end - -Route110_TrickHouseEnd_EventScript_26AD84:: @ 826AD84 - msgbox Route110_TrickHouseEnd_Text_26B0BC, 4 - msgbox Route110_TrickHouseEnd_Text_26B73D, 4 - setvar VAR_0x40C1, 0 - giveitem_std ITEM_RARE_CANDY - compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 - closemessage - call Route110_TrickHouseEnd_EventScript_26AFCF - release - end - -Route110_TrickHouseEnd_EventScript_26ADC0:: @ 826ADC0 - msgbox Route110_TrickHouseEnd_Text_26B13B, 4 - msgbox Route110_TrickHouseEnd_Text_26B73D, 4 - setvar VAR_0x40C1, 0 - giveitem_std ITEM_TIMER_BALL - compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 - closemessage - call Route110_TrickHouseEnd_EventScript_26AFCF - release - end - -Route110_TrickHouseEnd_EventScript_26ADFC:: @ 826ADFC - msgbox Route110_TrickHouseEnd_Text_26B1AD, 4 - msgbox Route110_TrickHouseEnd_Text_26B73D, 4 - setvar VAR_0x40C1, 0 - giveitem_std ITEM_HARD_STONE - compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 - closemessage - call Route110_TrickHouseEnd_EventScript_26AFCF - release - end - -Route110_TrickHouseEnd_EventScript_26AE38:: @ 826AE38 - msgbox Route110_TrickHouseEnd_Text_26B223, 4 - msgbox Route110_TrickHouseEnd_Text_26B73D, 4 - setvar VAR_0x40C1, 0 - giveitem_std ITEM_SMOKE_BALL - compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 - closemessage - call Route110_TrickHouseEnd_EventScript_26AFCF - release - end - -Route110_TrickHouseEnd_EventScript_26AE74:: @ 826AE74 - msgbox Route110_TrickHouseEnd_Text_26B293, 4 - msgbox Route110_TrickHouseEnd_Text_26B73D, 4 - setvar VAR_0x40C1, 0 - giveitem_std ITEM_TM12 - compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 - closemessage - call Route110_TrickHouseEnd_EventScript_26AFCF - release - end - -Route110_TrickHouseEnd_EventScript_26AEB0:: @ 826AEB0 - msgbox Route110_TrickHouseEnd_Text_26B315, 4 - msgbox Route110_TrickHouseEnd_Text_26B73D, 4 - setvar VAR_0x40C1, 0 - giveitem_std ITEM_MAGNET - compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 - closemessage - call Route110_TrickHouseEnd_EventScript_26AFCF - release - end - -Route110_TrickHouseEnd_EventScript_26AEEC:: @ 826AEEC - msgbox Route110_TrickHouseEnd_Text_26B365, 4 - msgbox Route110_TrickHouseEnd_Text_26B73D, 4 - setvar VAR_0x40C1, 0 - giveitem_std ITEM_PP_MAX - compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 - closemessage - call Route110_TrickHouseEnd_EventScript_26AFCF - release - end - -Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 - msgbox Route110_TrickHouseEnd_Text_26B3AB, 4 - closemessage - compare VAR_FACING, 1 - call_if 1, Route110_TrickHouseEnd_EventScript_26B015 - compare VAR_FACING, 2 - call_if 1, Route110_TrickHouseEnd_EventScript_26B020 - compare VAR_FACING, 3 - call_if 1, Route110_TrickHouseEnd_EventScript_26B02B - compare VAR_FACING, 4 - call_if 1, Route110_TrickHouseEnd_EventScript_26B036 - delay 30 - msgbox Route110_TrickHouseEnd_Text_26B3FA, 4 - closemessage - applymovement 1, Route110_TrickHouseEnd_Movement_27259E - waitmovement 0 - delay 30 - msgbox Route110_TrickHouseEnd_Text_26B485, 4 - setvar VAR_0x40C1, 0 - call Route110_TrickHouseEnd_EventScript_26AFA5 - compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_26B002 - msgbox Route110_TrickHouseEnd_Text_26B69A, 4 - call Route110_TrickHouseEnd_EventScript_26AFCF - special ResetTrickHouseEndRoomFlag - release - end - -Route110_TrickHouseEnd_EventScript_26AFA5:: @ 826AFA5 - multichoice 0, 0, 88, 1 - switch VAR_RESULT - case 0, Route110_TrickHouseEnd_EventScript_26AFBF - goto Route110_TrickHouseEnd_EventScript_26AFC7 - -Route110_TrickHouseEnd_EventScript_26AFBF:: @ 826AFBF - givedecoration_std 31 - return - -Route110_TrickHouseEnd_EventScript_26AFC7:: @ 826AFC7 - givedecoration_std 32 - return - -Route110_TrickHouseEnd_EventScript_26AFCF:: @ 826AFCF - applymovement 1, Route110_TrickHouseEnd_Movement_269E36 - waitmovement 0 - playse SE_W153 - applymovement 1, Route110_TrickHouseEnd_Movement_269E3F - waitmovement 0 - removeobject 1 - addvar VAR_0x4044, 1 - return - -Route110_TrickHouseEnd_EventScript_26AFEF:: @ 826AFEF - call Route110_TrickHouseEnd_EventScript_27205E - msgbox Route110_TrickHouseEnd_Text_26B760, 4 - setvar VAR_0x40C1, 1 - return - -Route110_TrickHouseEnd_EventScript_26B002:: @ 826B002 - call Route110_TrickHouseEnd_EventScript_272071 - msgbox Route110_TrickHouseEnd_Text_26B615, 4 - setvar VAR_0x40C1, 1 - return - -Route110_TrickHouseEnd_EventScript_26B015:: @ 826B015 - applymovement 1, Route110_TrickHouseEnd_Movement_2725AA - waitmovement 0 - return - -Route110_TrickHouseEnd_EventScript_26B020:: @ 826B020 - applymovement 1, Route110_TrickHouseEnd_Movement_2725A6 - waitmovement 0 - return - -Route110_TrickHouseEnd_EventScript_26B02B:: @ 826B02B - applymovement 1, Route110_TrickHouseEnd_Movement_2725A4 - waitmovement 0 - return - -Route110_TrickHouseEnd_EventScript_26B036:: @ 826B036 - applymovement 1, Route110_TrickHouseEnd_Movement_2725A8 - waitmovement 0 - return - -Route110_TrickHouseEnd_EventScript_26B041:: @ 826B041 - lockall - turnobject 1, 3 - playse SE_PIN - applymovement 1, Route110_TrickHouseEnd_Movement_272598 - waitmovement 0 - delay 20 - applymovement 1, Route110_TrickHouseEnd_Movement_26B08B - waitmovement 0 - playse SE_W153 - applymovement 255, Route110_TrickHouseEnd_Movement_2725AA - waitmovement 0 - msgbox Route110_TrickHouseEnd_Text_26B8BD, 4 - closemessage - applymovement 255, Route110_TrickHouseEnd_Movement_26B089 - waitmovement 0 - delay 4 - turnobject 1, 4 - releaseall - end - -Route110_TrickHouseEnd_Movement_26B089: @ 826B089 - walk_down - step_end - -Route110_TrickHouseEnd_Movement_26B08B: @ 826B08B - jump_in_place_left - step_end - -Route110_TrickHouseEnd_Text_26B08D: @ 826B08D - .string "Aak!\n" - .string "You’ve made it to me?\l" - .string "Hmmm… You’re sharp!$" - -Route110_TrickHouseEnd_Text_26B0BC: @ 826B0BC - .string "It took me all night to plant all those\n" - .string "trees…\p" - .string "You’re almost my equal in greatness by\n" - .string "one, two, three, four, five, six places!$" - -Route110_TrickHouseEnd_Text_26B13B: @ 826B13B - .string "It took me all night to make the maze…\p" - .string "You’re almost my equal in greatness by\n" - .string "one, two, three, four, five places!$" - -Route110_TrickHouseEnd_Text_26B1AD: @ 826B1AD - .string "It took me all night to prepare\n" - .string "the wall panels…\p" - .string "You’re almost my equal in greatness by\n" - .string "one, two, three, four places!$" - -Route110_TrickHouseEnd_Text_26B223: @ 826B223 - .string "It took me all night to shove in those\n" - .string "boulders…\p" - .string "You’re almost my equal in greatness by\n" - .string "one, two, three places!$" - -Route110_TrickHouseEnd_Text_26B293: @ 826B293 - .string "It took me all night to make MECHADOLLS\n" - .string "and another to think up the quiz…\p" - .string "You’re almost my equal in greatness by\n" - .string "one, two places!$" - -Route110_TrickHouseEnd_Text_26B315: @ 826B315 - .string "It took me all night to install\n" - .string "the doors…\p" - .string "You’re almost my equal in greatness!$" - -Route110_TrickHouseEnd_Text_26B365: @ 826B365 - .string "It took me all night setting up arrows…\p" - .string "You’re my equal in greatness!$" - -Route110_TrickHouseEnd_Text_26B3AB: @ 826B3AB - .string "It took me all night polishing floors…\p" - .string "You’re above me in greatness!\n" - .string "Possibly…$" - -Route110_TrickHouseEnd_Text_26B3FA: @ 826B3FA - .string "Wh-what should I do?\n" - .string "My fountain of ideas for tricks has\l" - .string "run dry…\p" - .string "Perhaps it is time I toured the country\n" - .string "on a quest to devise new tricks…$" - -Route110_TrickHouseEnd_Text_26B485: @ 826B485 - .string "I hate to admit defeat, but you have\n" - .string "bested me!\p" - .string "Still, you must have been reeled in by\n" - .string "my charisma for you to visit me again\l" - .string "and again. Yes, you must have!\p" - .string "But that has nothing to do with my\n" - .string "losing!\p" - .string "In recognition of the friendship\n" - .string "between you, the driven, and the genius\l" - .string "that is myself, I demand that you take\l" - .string "this keepsake!\p" - .string "Actually there are two--\n" - .string "a RED TENT and a BLUE TENT.\l" - .string "Which do you prefer?$" - -Route110_TrickHouseEnd_Text_26B615: @ 826B615 - .string "What? No room in your PC?\n" - .string "What am I to make of that?\p" - .string "I wish I could say that, but I am much\n" - .string "too kind and caring, so come back later!$" - -Route110_TrickHouseEnd_Text_26B69A: @ 826B69A - .string "… … … … … …\p" - .string "I am leaving on a journey of discovery.\n" - .string "A quest in search of new tricks.\p" - .string "I wish that you will one day visit and\n" - .string "entertain me again.\p" - .string "And now, farewell!$" - -Route110_TrickHouseEnd_Text_26B73D: @ 826B73D - .string "Fine!\n" - .string "You have earned this reward!$" - -Route110_TrickHouseEnd_Text_26B760: @ 826B760 - .string "What? Have you no room for this?\n" - .string "What manner of items do you carry?\p" - .string "But fine, since you’ve reached me,\n" - .string "your reward will be with me till later.$" - -Route110_TrickHouseEnd_Text_26B7EF: @ 826B7EF - .string "Scrub that smug smirk from your face!\n" - .string "It’s much too early to think you’ve won!\p" - .string "I’ll make new tricks to stump you, I will.\n" - .string "You may mock me only when you’re done.\p" - .string "Come back for the next exciting\n" - .string "installment!$" - -Route110_TrickHouseEnd_Text_26B8BD: @ 826B8BD - .string "Now, now! You’re ignoring me now?\n" - .string "Now that, I consider heartbreaking!$" - diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc deleted file mode 100644 index 859a28d6a..000000000 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ /dev/null @@ -1,901 +0,0 @@ -Route110_TrickHouseEntrance_MapScripts:: @ 8269A50 - map_script 3, Route110_TrickHouseEntrance_MapScript1_269A60 - map_script 2, Route110_TrickHouseEntrance_MapScript2_269CEE - map_script 4, Route110_TrickHouseEntrance_MapScript2_269BD3 - .byte 0 - -Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60 - setflag FLAG_LANDMARK_TRICK_HOUSE - compare VAR_0x40B5, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_269AF3 - compare VAR_0x40C1, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_269AD7 - compare VAR_0x40A6, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_269BB3 - compare VAR_0x40A7, 5 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B03 - compare VAR_0x40A7, 3 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B03 - compare VAR_0x40A7, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B03 - switch VAR_0x40A7 - case 0, Route110_TrickHouseEntrance_EventScript_269BBB - case 1, Route110_TrickHouseEntrance_EventScript_269BC1 - case 3, Route110_TrickHouseEntrance_EventScript_269BC7 - case 4, Route110_TrickHouseEntrance_EventScript_269BCD - end - -Route110_TrickHouseEntrance_EventScript_269AD7:: @ 8269AD7 - setvar VAR_0x40A5, 1 - compare VAR_0x4044, 8 - goto_eq Route110_TrickHouseEntrance_EventScript_269AED - setvar VAR_0x40A7, 2 - end - -Route110_TrickHouseEntrance_EventScript_269AED:: @ 8269AED - setvar VAR_0x40A7, 6 - end - -Route110_TrickHouseEntrance_EventScript_269AF3:: @ 8269AF3 - setvar VAR_0x40B5, 0 - setvar VAR_0x40A7, 5 - setvar VAR_0x40A5, 1 - end - -Route110_TrickHouseEntrance_EventScript_269B03:: @ 8269B03 - setvar VAR_0x40A7, 0 - compare VAR_0x4044, 1 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B61 - compare VAR_0x4044, 2 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B6B - compare VAR_0x4044, 3 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B75 - compare VAR_0x4044, 4 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B7F - compare VAR_0x4044, 5 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B89 - compare VAR_0x4044, 6 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B93 - compare VAR_0x4044, 7 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B9D - compare VAR_0x4044, 8 - call_if 1, Route110_TrickHouseEntrance_EventScript_269BA7 - return - -Route110_TrickHouseEntrance_EventScript_269B61:: @ 8269B61 - checkflag FLAG_BADGE03_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD - return - -Route110_TrickHouseEntrance_EventScript_269B6B:: @ 8269B6B - checkflag FLAG_BADGE04_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD - return - -Route110_TrickHouseEntrance_EventScript_269B75:: @ 8269B75 - checkflag FLAG_BADGE05_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD - return - -Route110_TrickHouseEntrance_EventScript_269B7F:: @ 8269B7F - checkflag FLAG_BADGE06_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD - return - -Route110_TrickHouseEntrance_EventScript_269B89:: @ 8269B89 - checkflag FLAG_BADGE07_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD - return - -Route110_TrickHouseEntrance_EventScript_269B93:: @ 8269B93 - checkflag FLAG_BADGE08_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD - return - -Route110_TrickHouseEntrance_EventScript_269B9D:: @ 8269B9D - checkflag FLAG_SYS_GAME_CLEAR - call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD - return - -Route110_TrickHouseEntrance_EventScript_269BA7:: @ 8269BA7 - setvar VAR_0x40A7, 4 - return - -Route110_TrickHouseEntrance_EventScript_269BAD:: @ 8269BAD - setvar VAR_0x40A7, 3 - return - -Route110_TrickHouseEntrance_EventScript_269BB3:: @ 8269BB3 - setobjectxyperm 1, 5, 2 - end - -Route110_TrickHouseEntrance_EventScript_269BBB:: @ 8269BBB - setvar VAR_0x40A5, 0 - end - -Route110_TrickHouseEntrance_EventScript_269BC1:: @ 8269BC1 - setvar VAR_0x40A5, 1 - end - -Route110_TrickHouseEntrance_EventScript_269BC7:: @ 8269BC7 - setvar VAR_0x40A5, 1 - end - -Route110_TrickHouseEntrance_EventScript_269BCD:: @ 8269BCD - setvar VAR_0x40A5, 1 - end - -Route110_TrickHouseEntrance_MapScript2_269BD3: @ 8269BD3 - map_script_2 VAR_0x40A6, 1, Route110_TrickHouseEntrance_EventScript_269C15 - map_script_2 VAR_0x40A7, 0, Route110_TrickHouseEntrance_EventScript_269C26 - map_script_2 VAR_0x40A7, 1, Route110_TrickHouseEntrance_EventScript_269CCC - map_script_2 VAR_0x40A7, 2, Route110_TrickHouseEntrance_EventScript_269CD0 - map_script_2 VAR_0x40A7, 3, Route110_TrickHouseEntrance_EventScript_269CD0 - map_script_2 VAR_0x40A7, 4, Route110_TrickHouseEntrance_EventScript_269CCC - map_script_2 VAR_0x40A7, 5, Route110_TrickHouseEntrance_EventScript_269CCC - map_script_2 VAR_0x40A7, 6, Route110_TrickHouseEntrance_EventScript_269CDF - .2byte 0 - -Route110_TrickHouseEntrance_EventScript_269C15:: @ 8269C15 - addobject 1 - showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - turnobject 1, 4 - turnobject 255, 3 - end - -Route110_TrickHouseEntrance_EventScript_269C26:: @ 8269C26 - addobject 1 - hideobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - switch VAR_0x4044 - case 0, Route110_TrickHouseEntrance_EventScript_269C8C - case 1, Route110_TrickHouseEntrance_EventScript_269C94 - case 2, Route110_TrickHouseEntrance_EventScript_269C9C - case 3, Route110_TrickHouseEntrance_EventScript_269CA4 - case 4, Route110_TrickHouseEntrance_EventScript_269CAC - case 5, Route110_TrickHouseEntrance_EventScript_269CB4 - case 6, Route110_TrickHouseEntrance_EventScript_269CBC - case 7, Route110_TrickHouseEntrance_EventScript_269CC4 - end - -Route110_TrickHouseEntrance_EventScript_269C8C:: @ 8269C8C - setobjectxy 1, 6, 3 - end - -Route110_TrickHouseEntrance_EventScript_269C94:: @ 8269C94 - setobjectxy 1, 11, 5 - end - -Route110_TrickHouseEntrance_EventScript_269C9C:: @ 8269C9C - setobjectxy 1, 9, 1 - end - -Route110_TrickHouseEntrance_EventScript_269CA4:: @ 8269CA4 - setobjectxy 1, 3, 1 - end - -Route110_TrickHouseEntrance_EventScript_269CAC:: @ 8269CAC - setobjectxy 1, 0, 5 - end - -Route110_TrickHouseEntrance_EventScript_269CB4:: @ 8269CB4 - setobjectxy 1, 11, 1 - end - -Route110_TrickHouseEntrance_EventScript_269CBC:: @ 8269CBC - setobjectxy 1, 8, 1 - end - -Route110_TrickHouseEntrance_EventScript_269CC4:: @ 8269CC4 - setobjectxy 1, 4, 4 - end - -Route110_TrickHouseEntrance_EventScript_269CCC:: @ 8269CCC - removeobject 1 - end - -Route110_TrickHouseEntrance_EventScript_269CD0:: @ 8269CD0 - addobject 1 - setobjectxy 1, 5, 2 - turnobject 1, 2 - end - -Route110_TrickHouseEntrance_EventScript_269CDF:: @ 8269CDF - addobject 1 - setobjectxy 1, 5, 2 - turnobject 1, 1 - end - -Route110_TrickHouseEntrance_MapScript2_269CEE: @ 8269CEE - map_script_2 VAR_0x40A6, 1, Route110_TrickHouseEntrance_EventScript_269CF8 - .2byte 0 - -Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8 - lockall - delay 20 - compare VAR_0x4044, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_269E48 - msgbox Route110_TrickHouseEntrance_Text_26A78C, 4 - closemessage - delay 20 - applymovement 1, Route110_TrickHouseEntrance_Movement_269E36 - waitmovement 0 - playse SE_W153 - applymovement 1, Route110_TrickHouseEntrance_Movement_269E3F - waitmovement 0 - removeobject 1 - setvar VAR_0x40A7, 1 - setvar VAR_0x40A6, 0 - releaseall - end - -Route110_TrickHouseEntrance_EventScript_269D39:: @ 8269D39 - releaseall - end - -Route110_TrickHouseEntrance_EventScript_269D3B:: @ 8269D3B - lockall - switch VAR_0x40A7 - case 0, Route110_TrickHouseEntrance_EventScript_269D6E - case 2, Route110_TrickHouseEntrance_EventScript_269E8F - case 3, Route110_TrickHouseEntrance_EventScript_269E51 - case 6, Route110_TrickHouseEntrance_EventScript_26A039 - end - -Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E - playse SE_PIN - applymovement 255, Route110_TrickHouseEntrance_Movement_272598 - waitmovement 0 - applymovement 255, Route110_TrickHouseEntrance_Movement_27259A - waitmovement 0 - compare VAR_0x4044, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_269DEE - compare VAR_0x4044, 1 - call_if 1, Route110_TrickHouseEntrance_EventScript_269DF7 - compare VAR_0x4044, 2 - call_if 1, Route110_TrickHouseEntrance_EventScript_269E00 - compare VAR_0x4044, 3 - call_if 1, Route110_TrickHouseEntrance_EventScript_269E09 - compare VAR_0x4044, 4 - call_if 1, Route110_TrickHouseEntrance_EventScript_269E12 - compare VAR_0x4044, 5 - call_if 1, Route110_TrickHouseEntrance_EventScript_269E1B - compare VAR_0x4044, 6 - call_if 1, Route110_TrickHouseEntrance_EventScript_269E24 - compare VAR_0x4044, 7 - call_if 1, Route110_TrickHouseEntrance_EventScript_269E2D - closemessage - setvar VAR_0x40A6, 1 - warpsilent MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2 - waitstate - releaseall - end - -Route110_TrickHouseEntrance_EventScript_269DEE:: @ 8269DEE - msgbox Route110_TrickHouseEntrance_Text_26A48A, 4 - return - -Route110_TrickHouseEntrance_EventScript_269DF7:: @ 8269DF7 - msgbox Route110_TrickHouseEntrance_Text_26A4DA, 4 - return - -Route110_TrickHouseEntrance_EventScript_269E00:: @ 8269E00 - msgbox Route110_TrickHouseEntrance_Text_26A529, 4 - return - -Route110_TrickHouseEntrance_EventScript_269E09:: @ 8269E09 - msgbox Route110_TrickHouseEntrance_Text_26A577, 4 - return - -Route110_TrickHouseEntrance_EventScript_269E12:: @ 8269E12 - msgbox Route110_TrickHouseEntrance_Text_26A5C8, 4 - return - -Route110_TrickHouseEntrance_EventScript_269E1B:: @ 8269E1B - msgbox Route110_TrickHouseEntrance_Text_26A616, 4 - return - -Route110_TrickHouseEntrance_EventScript_269E24:: @ 8269E24 - msgbox Route110_TrickHouseEntrance_Text_26A665, 4 - return - -Route110_TrickHouseEntrance_EventScript_269E2D:: @ 8269E2D - msgbox Route110_TrickHouseEntrance_Text_26A6B6, 4 - return - -Route110_TrickHouseEnd_Movement_269E36: @ 8269E36 -Route110_TrickHouseEntrance_Movement_269E36: @ 8269E36 - 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 - face_up - disable_anim - slide_up - slide_up - slide_up - slide_up - slide_up - slide_up - step_end - -Route110_TrickHouseEntrance_EventScript_269E48:: @ 8269E48 - msgbox Route110_TrickHouseEntrance_Text_26A709, 4 - return - -Route110_TrickHouseEntrance_EventScript_269E51:: @ 8269E51 - msgbox Route110_TrickHouseEntrance_Text_26A921, 4 - closemessage - applymovement 1, Route110_TrickHouseEntrance_Movement_27259E - waitmovement 0 - playse SE_PIN - applymovement 1, Route110_TrickHouseEntrance_Movement_272598 - waitmovement 0 - applymovement 1, Route110_TrickHouseEntrance_Movement_27259A - waitmovement 0 - msgbox Route110_TrickHouseEntrance_Text_26A9AF, 4 - applymovement 1, Route110_TrickHouseEntrance_Movement_2725A6 - waitmovement 0 - releaseall - end - -Route110_TrickHouseEntrance_EventScript_269E8F:: @ 8269E8F - applymovement 1, Route110_TrickHouseEntrance_Movement_27259E - waitmovement 0 - msgbox Route110_TrickHouseEntrance_Text_26AA82, 4 - compare VAR_0x4044, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_269EEF - compare VAR_0x4044, 2 - goto_eq Route110_TrickHouseEntrance_EventScript_269F1B - compare VAR_0x4044, 3 - goto_eq Route110_TrickHouseEntrance_EventScript_269F47 - compare VAR_0x4044, 4 - goto_eq Route110_TrickHouseEntrance_EventScript_269F73 - compare VAR_0x4044, 5 - goto_eq Route110_TrickHouseEntrance_EventScript_269F9F - compare VAR_0x4044, 6 - goto_eq Route110_TrickHouseEntrance_EventScript_269FCB - compare VAR_0x4044, 7 - goto_eq Route110_TrickHouseEntrance_EventScript_269FF7 - end - -Route110_TrickHouseEntrance_EventScript_269EEF:: @ 8269EEF - giveitem_std ITEM_RARE_CANDY - compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A023 - compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_27205E - msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 - releaseall - end - -Route110_TrickHouseEntrance_EventScript_269F1B:: @ 8269F1B - giveitem_std ITEM_TIMER_BALL - compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A023 - compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_27205E - msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 - releaseall - end - -Route110_TrickHouseEntrance_EventScript_269F47:: @ 8269F47 - giveitem_std ITEM_HARD_STONE - compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A023 - compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_27205E - msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 - releaseall - end - -Route110_TrickHouseEntrance_EventScript_269F73:: @ 8269F73 - giveitem_std ITEM_SMOKE_BALL - compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A023 - compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_27205E - msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 - releaseall - end - -Route110_TrickHouseEntrance_EventScript_269F9F:: @ 8269F9F - giveitem_std ITEM_TM12 - compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A023 - compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_27205E - msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 - releaseall - end - -Route110_TrickHouseEntrance_EventScript_269FCB:: @ 8269FCB - giveitem_std ITEM_MAGNET - compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A023 - compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_27205E - msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 - releaseall - end - -Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7 - giveitem_std ITEM_PP_MAX - compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A023 - compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_27205E - msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 - releaseall - end - -Route110_TrickHouseEntrance_EventScript_26A023:: @ 826A023 - setvar VAR_0x40C1, 0 - setvar VAR_0x40A7, 3 - applymovement 1, Route110_TrickHouseEntrance_Movement_2725A6 - waitmovement 0 - releaseall - end - -Route110_TrickHouseEntrance_EventScript_26A039:: @ 826A039 - applymovement 1, Route110_TrickHouseEntrance_Movement_27259E - waitmovement 0 - msgbox Route110_TrickHouseEntrance_Text_26AB2C, 4 - call Route110_TrickHouseEntrance_EventScript_26A070 - compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A09A - compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_272071 - msgbox Route110_TrickHouseEntrance_Text_26ABBD, 4 - releaseall - end - -Route110_TrickHouseEntrance_EventScript_26A070:: @ 826A070 - multichoice 0, 0, 88, 1 - switch VAR_RESULT - case 0, Route110_TrickHouseEntrance_EventScript_26A08A - goto Route110_TrickHouseEntrance_EventScript_26A092 - -Route110_TrickHouseEntrance_EventScript_26A08A:: @ 826A08A - givedecoration_std 31 - return - -Route110_TrickHouseEntrance_EventScript_26A092:: @ 826A092 - givedecoration_std 32 - return - -Route110_TrickHouseEntrance_EventScript_26A09A:: @ 826A09A - msgbox Route110_TrickHouseEntrance_Text_26ABAE, 4 - closemessage - applymovement 1, Route110_TrickHouseEntrance_Movement_26D632 - waitmovement 0 - applymovement 1, Route110_TrickHouseEntrance_Movement_269E36 - waitmovement 0 - playse SE_W153 - applymovement 1, Route110_TrickHouseEntrance_Movement_269E3F - waitmovement 0 - removeobject 1 - setvar VAR_0x40C1, 0 - setvar VAR_0x40A7, 5 - releaseall - end - -Route110_TrickHouseEntrance_EventScript_26A0D3:: @ 826A0D3 - lockall - switch VAR_0x40A7 - case 0, Route110_TrickHouseEntrance_EventScript_26A106 - case 1, Route110_TrickHouseEntrance_EventScript_26A110 - case 4, Route110_TrickHouseEntrance_EventScript_26A201 - case 5, Route110_TrickHouseEntrance_EventScript_26A20B - end - -Route110_TrickHouseEntrance_EventScript_26A106:: @ 826A106 - msgbox Route110_TrickHouseEntrance_Text_26A878, 4 - releaseall - end - -Route110_TrickHouseEntrance_EventScript_26A110:: @ 826A110 - msgbox Route110_TrickHouseEntrance_Text_26A887, 5 - closemessage - compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A126 - releaseall - end - -Route110_TrickHouseEntrance_EventScript_26A126:: @ 826A126 - setmetatile 5, 1, 537, 0 - special DrawWholeMapView - delay 20 - applymovement 255, Route110_TrickHouseEntrance_Movement_2725C9 - waitmovement 0 - applymovement 255, Route110_TrickHouseEntrance_Movement_26A1A7 - waitmovement 0 - switch VAR_0x4044 - case 0, Route110_TrickHouseEntrance_EventScript_26A1A9 - case 1, Route110_TrickHouseEntrance_EventScript_26A1B4 - case 2, Route110_TrickHouseEntrance_EventScript_26A1BF - case 3, Route110_TrickHouseEntrance_EventScript_26A1CA - case 4, Route110_TrickHouseEntrance_EventScript_26A1D5 - case 5, Route110_TrickHouseEntrance_EventScript_26A1E0 - case 6, Route110_TrickHouseEntrance_EventScript_26A1EB - case 7, Route110_TrickHouseEntrance_EventScript_26A1F6 - end - -Route110_TrickHouseEntrance_Movement_26A1A7: @ 826A1A7 - set_invisible - step_end - -Route110_TrickHouseEntrance_EventScript_26A1A9:: @ 826A1A9 - warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE1, 255, 0, 21 - waitstate - releaseall - end - -Route110_TrickHouseEntrance_EventScript_26A1B4:: @ 826A1B4 - warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE2, 255, 0, 21 - waitstate - releaseall - end - -Route110_TrickHouseEntrance_EventScript_26A1BF:: @ 826A1BF - warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE3, 255, 0, 21 - waitstate - releaseall - end - -Route110_TrickHouseEntrance_EventScript_26A1CA:: @ 826A1CA - warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE4, 255, 0, 21 - waitstate - releaseall - end - -Route110_TrickHouseEntrance_EventScript_26A1D5:: @ 826A1D5 - warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21 - waitstate - releaseall - end - -Route110_TrickHouseEntrance_EventScript_26A1E0:: @ 826A1E0 - warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE6, 255, 0, 21 - waitstate - releaseall - end - -Route110_TrickHouseEntrance_EventScript_26A1EB:: @ 826A1EB - warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 0, 21 - waitstate - releaseall - end - -Route110_TrickHouseEntrance_EventScript_26A1F6:: @ 826A1F6 - warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE8, 255, 0, 21 - waitstate - releaseall - end - -Route110_TrickHouseEntrance_EventScript_26A201:: @ 826A201 - msgbox Route110_TrickHouseEntrance_Text_26A8BD, 4 - releaseall - end - -Route110_TrickHouseEntrance_EventScript_26A20B:: @ 826A20B - compare VAR_0x4044, 8 - goto_eq Route110_TrickHouseEntrance_EventScript_26A220 - msgbox Route110_TrickHouseEntrance_Text_26A878, 4 - releaseall - end - -Route110_TrickHouseEntrance_EventScript_26A220:: @ 826A220 - msgbox Route110_TrickHouseEntrance_Text_26A8BD, 4 - releaseall - end - -Route110_TrickHouseEntrance_EventScript_26A22A:: @ 826A22A - lockall - switch VAR_0x4044 - case 0, Route110_TrickHouseEntrance_EventScript_26A289 - case 1, Route110_TrickHouseEntrance_EventScript_26A2B2 - case 2, Route110_TrickHouseEntrance_EventScript_26A2DB - case 3, Route110_TrickHouseEntrance_EventScript_26A304 - case 4, Route110_TrickHouseEntrance_EventScript_26A32D - case 5, Route110_TrickHouseEntrance_EventScript_26A356 - case 6, Route110_TrickHouseEntrance_EventScript_26A37F - case 7, Route110_TrickHouseEntrance_EventScript_26A3A8 - end - -Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289 - compare VAR_0x40AB, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle1_Text_26B98D, 4 - playse SE_PIN - setvar VAR_0x40AB, 2 - setmetatile 13, 1, 523, 0 - special DrawWholeMapView - releaseall - end - -Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2 - compare VAR_0x40AC, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle2_Text_26BCBA, 4 - playse SE_PIN - setvar VAR_0x40AC, 2 - setmetatile 13, 1, 523, 0 - special DrawWholeMapView - releaseall - end - -Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB - compare VAR_0x40AD, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle3_Text_26C609, 4 - playse SE_PIN - setvar VAR_0x40AD, 2 - setmetatile 13, 1, 523, 0 - special DrawWholeMapView - releaseall - end - -Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304 - compare VAR_0x40AE, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle4_Text_26C8C3, 4 - playse SE_PIN - setvar VAR_0x40AE, 2 - setmetatile 13, 1, 523, 0 - special DrawWholeMapView - releaseall - end - -Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D - compare VAR_0x40AF, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle5_Text_26D660, 4 - playse SE_PIN - setvar VAR_0x40AF, 2 - setmetatile 13, 1, 523, 0 - special DrawWholeMapView - releaseall - end - -Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356 - compare VAR_0x40B0, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle6_Text_26DE26, 4 - playse SE_PIN - setvar VAR_0x40B0, 2 - setmetatile 13, 1, 523, 0 - special DrawWholeMapView - releaseall - end - -Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F - compare VAR_0x40B1, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle7_EventScript_26E413, 4 - playse SE_PIN - setvar VAR_0x40B1, 2 - setmetatile 13, 1, 523, 0 - special DrawWholeMapView - releaseall - end - -Route110_TrickHouseEntrance_EventScript_26A3A8:: @ 826A3A8 - compare VAR_0x40B2, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle8_EventScript_26E864, 4 - playse SE_PIN - setvar VAR_0x40B2, 2 - setmetatile 13, 1, 523, 0 - special DrawWholeMapView - releaseall - end - -Route110_TrickHouseEntrance_EventScript_26A3D1:: @ 826A3D1 - msgbox Route110_TrickHouseEntrance_Text_26AC4F, 4 - releaseall - end - -Route110_TrickHousePuzzle1_EventScript_26A3DB:: @ 826A3DB -Route110_TrickHousePuzzle2_EventScript_26A3DB:: @ 826A3DB -Route110_TrickHousePuzzle3_EventScript_26A3DB:: @ 826A3DB -Route110_TrickHousePuzzle4_EventScript_26A3DB:: @ 826A3DB -Route110_TrickHousePuzzle5_EventScript_26A3DB:: @ 826A3DB -Route110_TrickHousePuzzle6_EventScript_26A3DB:: @ 826A3DB -Route110_TrickHousePuzzle7_EventScript_26A3DB:: @ 826A3DB -Route110_TrickHousePuzzle8_EventScript_26A3DB:: @ 826A3DB - msgbox Route110_TrickHousePuzzle1_Text_26AC2F, 4 - releaseall - end - -Route110_TrickHousePuzzle1_EventScript_26A3E5:: @ 826A3E5 -Route110_TrickHousePuzzle2_EventScript_26A3E5:: @ 826A3E5 -Route110_TrickHousePuzzle3_EventScript_26A3E5:: @ 826A3E5 -Route110_TrickHousePuzzle4_EventScript_26A3E5:: @ 826A3E5 -Route110_TrickHousePuzzle5_EventScript_26A3E5:: @ 826A3E5 -Route110_TrickHousePuzzle6_EventScript_26A3E5:: @ 826A3E5 -Route110_TrickHousePuzzle7_EventScript_26A3E5:: @ 826A3E5 -Route110_TrickHousePuzzle8_EventScript_26A3E5:: @ 826A3E5 - playfanfare MUS_FANFA4 - message Route110_TrickHousePuzzle1_Text_26ABE8 - waitfanfare - msgbox Route110_TrickHousePuzzle1_Text_26ABFB, 4 - releaseall - end - -Route110_TrickHouseEntrance_EventScript_26A3F8:: @ 826A3F8 - lockall - msgbox Route110_TrickHouseEntrance_Text_26A474, 4 - releaseall - compare VAR_0x4044, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_26A429 - compare VAR_0x4044, 1 - call_if 1, Route110_TrickHouseEntrance_EventScript_26A439 - compare VAR_0x4044, 2 - call_if 1, Route110_TrickHouseEntrance_EventScript_26A449 - setvar VAR_0x40A5, 1 - end - -Route110_TrickHouseEntrance_EventScript_26A429:: @ 826A429 - setvar VAR_0x8004, 6 - setvar VAR_0x8005, 3 - call Route110_TrickHouseEntrance_EventScript_26A459 - return - -Route110_TrickHouseEntrance_EventScript_26A439:: @ 826A439 - setvar VAR_0x8004, 11 - setvar VAR_0x8005, 5 - call Route110_TrickHouseEntrance_EventScript_26A459 - return - -Route110_TrickHouseEntrance_EventScript_26A449:: @ 826A449 - setvar VAR_0x8004, 9 - setvar VAR_0x8005, 2 - call Route110_TrickHouseEntrance_EventScript_26A459 - return - -Route110_TrickHouseEntrance_EventScript_26A459:: @ 826A459 - setvar VAR_0x8006, 0 - setfieldeffectargument 0, VAR_0x8004 - setfieldeffectargument 1, VAR_0x8005 - setfieldeffectargument 2, VAR_0x8006 - dofieldeffect 54 - waitfieldeffect 54 - delay 10 - return - -Route110_TrickHouseEntrance_Text_26A474: @ 826A474 - .string "You’re being watched…$" - -Route110_TrickHouseEntrance_Text_26A48A: @ 826A48A - .string "Hah? Grrr…\p" - .string "How did you know I concealed myself\n" - .string "beneath this desk? You’re sharp!$" - -Route110_TrickHouseEntrance_Text_26A4DA: @ 826A4DA - .string "Hah? Grrr…\p" - .string "How did you know I concealed myself\n" - .string "behind this tree? You’re sharp!$" - -Route110_TrickHouseEntrance_Text_26A529: @ 826A529 - .string "Hah? Grrr…\p" - .string "How did you know I concealed myself\n" - .string "in this dresser? You’re sharp!$" - -Route110_TrickHouseEntrance_Text_26A577: @ 826A577 - .string "Hah? Grrr…\p" - .string "How did you know I concealed myself\n" - .string "beyond this window? You’re sharp!$" - -Route110_TrickHouseEntrance_Text_26A5C8: @ 826A5C8 - .string "Hah? Grrr…\p" - .string "How did you know I concealed myself\n" - .string "in this planter? You’re sharp!$" - -Route110_TrickHouseEntrance_Text_26A616: @ 826A616 - .string "Hah? Grrr…\p" - .string "How did you know I concealed myself\n" - .string "in this cupboard? You’re sharp!$" - -Route110_TrickHouseEntrance_Text_26A665: @ 826A665 - .string "Hah? Grrr…\p" - .string "How did you know I concealed myself\n" - .string "behind this window? You’re sharp!$" - -Route110_TrickHouseEntrance_Text_26A6B6: @ 826A6B6 - .string "Hah? Grrr…\p" - .string "How did you know I concealed myself\n" - .string "beneath this cushion? You’re sharp!$" - -Route110_TrickHouseEntrance_Text_26A709: @ 826A709 - .string "Behold!\p" - .string "For I am the greatest living mystery\n" - .string "of a man in all of HOENN!\l" - .string "They call me…\p" - .string "The TRICK MASTER!\n" - .string "Wahahaha! Glad to meet you!$" - -Route110_TrickHouseEntrance_Text_26A78C: @ 826A78C - .string "You, you’ve come to challenge\n" - .string "my TRICK HOUSE, haven’t you?\p" - .string "That’s why you’re here, isn’t it?\n" - .string "Yes, it is!\p" - .string "Consider your challenge accepted!\p" - .string "Enter through the scroll there,\n" - .string "and let your challenge commence!\p" - .string "I shall be waiting in the back!$" - -Route110_TrickHouseEntrance_Text_26A878: @ 826A878 - .string "It’s a scroll.$" - -Route110_TrickHouseEntrance_Text_26A887: @ 826A887 - .string "There is a big hole behind the scroll!\p" - .string "Want to go in?$" - -Route110_TrickHouseEntrance_Text_26A8BD: @ 826A8BD - .string "There is a note affixed to the scroll…\p" - .string "“I am leaving on a journey.\n" - .string "Don’t look for me. TRICK MASTERâ€$" - -Route110_TrickHouseEntrance_Text_26A921: @ 826A921 - .string "For the next time, I’ll use this trick,\n" - .string "and that scheme, and those ruses…\p" - .string "Mufufufu… If I may say so, it’s\n" - .string "brilliantly difficult, even for me!$" - -Route110_TrickHouseEntrance_Text_26A9AF: @ 826A9AF - .string "Hah? What?!\n" - .string "Oh, it’s you!\p" - .string "I’m in the midst of devising new tricky\n" - .string "challenges!\p" - .string "It’s not too much to ask for a bit more\n" - .string "time for me to think, is it now?\l" - .string "You wouldn’t begrudge me that?\l" - .string "Come back in a little while!$" - -Route110_TrickHouseEntrance_Text_26AA82: @ 826AA82 - .string "Ah, it’s you! You’re here to accept the\n" - .string "reward from before, isn’t that right?\l" - .string "Yes, right I am!\p" - .string "Here!\n" - .string "I’ll give it to you now!$" - -Route110_TrickHouseEntrance_Text_26AB00: @ 826AB00 - .string "Hah?\n" - .string "Did you not come to claim your reward?$" - -Route110_TrickHouseEntrance_Text_26AB2C: @ 826AB2C - .string "MECHADOLL 5 I AM!\n" - .string "IF REWARD IS NOT TAKEN BY YOU,\l" - .string "THEN TRICK MASTER YOU CANNOT FOLLOW.\p" - .string "RED TENT OR BLUE TENT,\n" - .string "WHICH DO YOU PREFER?$" - -Route110_TrickHouseEntrance_Text_26ABAE: @ 826ABAE - .string "THEN FAREWELL.$" - -Route110_TrickHouseEntrance_Text_26ABBD: @ 826ABBD - .string "YOUR PC STATUS: FULL AGAIN.\n" - .string "MEAN, YOU ARE.$" - -Route110_TrickHousePuzzle1_Text_26ABE8: @ 826ABE8 - .string "{PLAYER} found a scroll.$" - -Route110_TrickHousePuzzle1_Text_26ABFB: @ 826ABFB - .string "{PLAYER} memorized the secret code\n" - .string "written on the scroll.$" - -Route110_TrickHousePuzzle1_Text_26AC2F: @ 826AC2F - .string "A secret code is written on it.$" - -Route110_TrickHouseEntrance_Text_26AC4F: @ 826AC4F - .string "The door is locked.\p" - .string "…On closer inspection, this is written\n" - .string "on it: “Write the secret code here.â€$" diff --git a/data/scripts/maps/Route110_TrickHousePuzzle1.inc b/data/scripts/maps/Route110_TrickHousePuzzle1.inc deleted file mode 100644 index 340a7e03c..000000000 --- a/data/scripts/maps/Route110_TrickHousePuzzle1.inc +++ /dev/null @@ -1,79 +0,0 @@ -Route110_TrickHousePuzzle1_MapScripts:: @ 826B90F - map_script 1, Route110_TrickHousePuzzle1_MapScript1_26B915 - .byte 0 - -Route110_TrickHousePuzzle1_MapScript1_26B915: @ 826B915 - compare VAR_0x40AB, 2 - goto_eq Route110_TrickHousePuzzle1_EventScript_26B921 - end - -Route110_TrickHousePuzzle1_EventScript_26B921:: @ 826B921 - setmetatile 13, 1, 523, 0 - end - -Route110_TrickHousePuzzle1_EventScript_26B92B:: @ 826B92B - lockall - compare VAR_0x40AB, 0 - goto_eq Route110_TrickHousePuzzle1_EventScript_26B93D - goto Route110_TrickHousePuzzle1_EventScript_26A3DB - end - -Route110_TrickHousePuzzle1_EventScript_26B93D:: @ 826B93D - setvar VAR_0x40AB, 1 - goto Route110_TrickHousePuzzle1_EventScript_26A3E5 - end - -Route110_TrickHousePuzzle1_EventScript_26B948:: @ 826B948 - trainerbattle 0, TRAINER_SALLY, 0, Route110_TrickHousePuzzle1_Text_26B9FB, Route110_TrickHousePuzzle1_Text_26BA3F - msgbox Route110_TrickHousePuzzle1_Text_26BA57, 6 - end - -Route110_TrickHousePuzzle1_EventScript_26B95F:: @ 826B95F - trainerbattle 0, TRAINER_EDDIE, 0, Route110_TrickHousePuzzle1_Text_26BA82, Route110_TrickHousePuzzle1_Text_26BAB0 - msgbox Route110_TrickHousePuzzle1_Text_26BAC3, 6 - end - -Route110_TrickHousePuzzle1_EventScript_26B976:: @ 826B976 - trainerbattle 0, TRAINER_ROBIN, 0, Route110_TrickHousePuzzle1_Text_26BB10, Route110_TrickHousePuzzle1_Text_26BB2E - msgbox Route110_TrickHousePuzzle1_Text_26BB52, 6 - end - -Route110_TrickHousePuzzle1_Text_26B98D:: @ 826B98D - .string "{PLAYER} wrote down the secret code\n" - .string "on the door.\p" - .string "“TRICK MASTER is fabulous.â€\n" - .string "… … … … … … … …\p" - .string "The lock clicked open!$" - -Route110_TrickHousePuzzle1_Text_26B9FB: @ 826B9FB - .string "I’ll hack and slash my way to victory\n" - .string "with the CUT we just learned!$" - -Route110_TrickHousePuzzle1_Text_26BA3F: @ 826BA3F - .string "Why are you so serious?$" - -Route110_TrickHousePuzzle1_Text_26BA57: @ 826BA57 - .string "I never get tired of hacking\n" - .string "and slashing!$" - -Route110_TrickHousePuzzle1_Text_26BA82: @ 826BA82 - .string "I wandered into this weird house\n" - .string "by accident…$" - -Route110_TrickHousePuzzle1_Text_26BAB0: @ 826BAB0 - .string "And now I’ve lost…$" - -Route110_TrickHousePuzzle1_Text_26BAC3: @ 826BAC3 - .string "I lost my way, I lost a battle, and I’m\n" - .string "now even more lost… I can’t get out…$" - -Route110_TrickHousePuzzle1_Text_26BB10: @ 826BB10 - .string "Just who is the TRICK MASTER?$" - -Route110_TrickHousePuzzle1_Text_26BB2E: @ 826BB2E - .string "I lost while I was lost in thought!$" - -Route110_TrickHousePuzzle1_Text_26BB52: @ 826BB52 - .string "You’re strong!\n" - .string "Just who are you?$" - diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc deleted file mode 100644 index b724b986d..000000000 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ /dev/null @@ -1,146 +0,0 @@ -Route110_TrickHousePuzzle2_MapScripts:: @ 826BB73 - map_script 5, Route110_TrickHousePuzzle2_MapScript1_26BB7E - map_script 3, Route110_TrickHousePuzzle2_MapScript1_26BBAB - .byte 0 - -Route110_TrickHousePuzzle2_MapScript1_26BB7E: @ 826BB7E - compare VAR_TEMP_1, 1 - call_if 1, Route110_TrickHousePuzzle2_EventScript_26BC29 - compare VAR_TEMP_2, 1 - call_if 1, Route110_TrickHousePuzzle2_EventScript_26BC3C - compare VAR_TEMP_3, 1 - call_if 1, Route110_TrickHousePuzzle2_EventScript_26BC4F - compare VAR_TEMP_4, 1 - call_if 1, Route110_TrickHousePuzzle2_EventScript_26BC62 - end - -Route110_TrickHousePuzzle2_MapScript1_26BBAB: @ 826BBAB - setvar VAR_TEMP_1, 0 - setvar VAR_TEMP_2, 0 - setvar VAR_TEMP_3, 0 - setvar VAR_TEMP_4, 0 - end - -Route110_TrickHousePuzzle2_EventScript_26BBC0:: @ 826BBC0 - lockall - compare VAR_0x40AC, 0 - goto_eq Route110_TrickHousePuzzle2_EventScript_26BBD2 - goto Route110_TrickHousePuzzle2_EventScript_26A3DB - end - -Route110_TrickHousePuzzle2_EventScript_26BBD2:: @ 826BBD2 - setvar VAR_0x40AC, 1 - goto Route110_TrickHousePuzzle2_EventScript_26A3E5 - end - -Route110_TrickHousePuzzle2_EventScript_26BBDD:: @ 826BBDD - lockall - setvar VAR_TEMP_1, 1 - playse SE_PIN - call Route110_TrickHousePuzzle2_EventScript_26BC29 - special DrawWholeMapView - releaseall - end - -Route110_TrickHousePuzzle2_EventScript_26BBF0:: @ 826BBF0 - lockall - setvar VAR_TEMP_2, 1 - playse SE_PIN - call Route110_TrickHousePuzzle2_EventScript_26BC3C - special DrawWholeMapView - releaseall - end - -Route110_TrickHousePuzzle2_EventScript_26BC03:: @ 826BC03 - lockall - setvar VAR_TEMP_3, 1 - playse SE_PIN - call Route110_TrickHousePuzzle2_EventScript_26BC4F - special DrawWholeMapView - releaseall - end - -Route110_TrickHousePuzzle2_EventScript_26BC16:: @ 826BC16 - lockall - setvar VAR_TEMP_4, 1 - playse SE_PIN - call Route110_TrickHousePuzzle2_EventScript_26BC62 - special DrawWholeMapView - releaseall - end - -Route110_TrickHousePuzzle2_EventScript_26BC29:: @ 826BC29 - setmetatile 11, 12, 601, 0 - setmetatile 1, 13, 618, 0 - return - -Route110_TrickHousePuzzle2_EventScript_26BC3C:: @ 826BC3C - setmetatile 0, 4, 601, 0 - setmetatile 5, 6, 618, 0 - return - -Route110_TrickHousePuzzle2_EventScript_26BC4F:: @ 826BC4F - setmetatile 14, 5, 601, 0 - setmetatile 7, 15, 618, 0 - return - -Route110_TrickHousePuzzle2_EventScript_26BC62:: @ 826BC62 - setmetatile 7, 11, 601, 0 - setmetatile 14, 12, 618, 0 - return - -Route110_TrickHousePuzzle2_EventScript_26BC75:: @ 826BC75 - trainerbattle 0, TRAINER_TED, 0, Route110_TrickHousePuzzle2_Text_26BD25, Route110_TrickHousePuzzle2_Text_26BD45 - msgbox Route110_TrickHousePuzzle2_Text_26BD70, 6 - end - -Route110_TrickHousePuzzle2_EventScript_26BC8C:: @ 826BC8C - trainerbattle 0, TRAINER_PAUL, 0, Route110_TrickHousePuzzle2_Text_26BD9E, Route110_TrickHousePuzzle2_Text_26BDCF - msgbox Route110_TrickHousePuzzle2_Text_26BDEC, 6 - end - -Route110_TrickHousePuzzle2_EventScript_26BCA3:: @ 826BCA3 - trainerbattle 0, TRAINER_GEORGIA, 0, Route110_TrickHousePuzzle2_Text_26BE31, Route110_TrickHousePuzzle2_Text_26BE77 - msgbox Route110_TrickHousePuzzle2_Text_26BE97, 6 - end - -Route110_TrickHousePuzzle2_Text_26BCBA: @ 826BCBA - .string "{PLAYER} wrote down the secret code\n" - .string "on the door.\p" - .string "“TRICK MASTER is smart.â€\n" - .string "… … … … … … … …\p" - .string "The lock clicked open!$" - -Route110_TrickHousePuzzle2_Text_26BD25: @ 826BD25 - .string "Which switch closes which hole?$" - -Route110_TrickHousePuzzle2_Text_26BD45: @ 826BD45 - .string "After that battle, I’m even more\n" - .string "confused!$" - -Route110_TrickHousePuzzle2_Text_26BD70: @ 826BD70 - .string "Can I get you to push all the buttons\n" - .string "for me?$" - -Route110_TrickHousePuzzle2_Text_26BD9E: @ 826BD9E - .string "Oh! You’re on your second TRICK HOUSE\n" - .string "challenge!$" - -Route110_TrickHousePuzzle2_Text_26BDCF: @ 826BDCF - .string "You’re good at battling too?$" - -Route110_TrickHousePuzzle2_Text_26BDEC: @ 826BDEC - .string "The TRICK MASTER rigged all the tricks\n" - .string "in this house all by himself.$" - -Route110_TrickHousePuzzle2_Text_26BE31: @ 826BE31 - .string "I want to make my own GYM one day.\n" - .string "So, I’m studying how to set traps.$" - -Route110_TrickHousePuzzle2_Text_26BE77: @ 826BE77 - .string "I didn’t study battling enough!$" - -Route110_TrickHousePuzzle2_Text_26BE97: @ 826BE97 - .string "You’re strong, aren’t you?\n" - .string "Maybe even enough to be a GYM LEADER!$" - diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc deleted file mode 100644 index 9956f9889..000000000 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ /dev/null @@ -1,360 +0,0 @@ -Route110_TrickHousePuzzle3_MapScripts:: @ 826BED8 - map_script 5, Route110_TrickHousePuzzle3_MapScript1_26BEE3 - map_script 3, Route110_TrickHousePuzzle3_MapScript1_26BEFF - .byte 0 - -Route110_TrickHousePuzzle3_MapScript1_26BEE3: @ 826BEE3 - call Route110_TrickHousePuzzle3_EventScript_26BF1E - compare VAR_TEMP_9, 0 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF97 - compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26C232 - end - -Route110_TrickHousePuzzle3_MapScript1_26BEFF: @ 826BEFF - setvar VAR_TEMP_1, 0 - setvar VAR_TEMP_2, 0 - setvar VAR_TEMP_3, 0 - setvar VAR_TEMP_4, 0 - setvar VAR_TEMP_8, 0 - setvar VAR_TEMP_9, 0 - end - -Route110_TrickHousePuzzle3_EventScript_26BF1E:: @ 826BF1E - setmetatile 4, 14, 600, 0 - setmetatile 3, 11, 600, 0 - setmetatile 12, 5, 600, 0 - setmetatile 8, 2, 600, 0 - compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF6F - compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF79 - compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF83 - compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF8D - return - -Route110_TrickHousePuzzle3_EventScript_26BF6F:: @ 826BF6F - setmetatile 4, 14, 601, 0 - return - -Route110_TrickHousePuzzle3_EventScript_26BF79:: @ 826BF79 - setmetatile 3, 11, 601, 0 - return - -Route110_TrickHousePuzzle3_EventScript_26BF83:: @ 826BF83 - setmetatile 12, 5, 601, 0 - return - -Route110_TrickHousePuzzle3_EventScript_26BF8D:: @ 826BF8D - setmetatile 8, 2, 601, 0 - return - -Route110_TrickHousePuzzle3_EventScript_26BF97:: @ 826BF97 - setmetatile 1, 6, 587, 0 - setmetatile 2, 6, 588, 0 - setmetatile 1, 7, 595, 0 - setmetatile 2, 7, 596, 0 - setmetatile 1, 9, 587, 0 - setmetatile 2, 9, 588, 0 - setmetatile 1, 10, 595, 0 - setmetatile 2, 10, 596, 0 - setmetatile 4, 15, 587, 0 - setmetatile 5, 15, 588, 0 - setmetatile 4, 16, 595, 0 - setmetatile 5, 16, 596, 0 - setmetatile 13, 9, 587, 0 - setmetatile 14, 9, 588, 0 - setmetatile 13, 10, 595, 0 - setmetatile 14, 10, 596, 0 - setmetatile 13, 15, 587, 0 - setmetatile 14, 15, 588, 0 - setmetatile 13, 16, 595, 0 - setmetatile 14, 16, 596, 0 - setmetatile 3, 7, 589, 1 - setmetatile 3, 8, 597, 0 - setmetatile 3, 13, 589, 1 - setmetatile 3, 14, 597, 0 - setmetatile 6, 4, 589, 1 - setmetatile 6, 5, 597, 0 - setmetatile 9, 16, 589, 1 - setmetatile 9, 17, 597, 0 - setmetatile 12, 7, 589, 1 - setmetatile 12, 8, 597, 0 - setmetatile 1, 3, 568, 0 - setmetatile 2, 3, 569, 0 - setmetatile 1, 4, 576, 1 - setmetatile 2, 4, 577, 1 - setmetatile 1, 12, 568, 0 - setmetatile 2, 12, 569, 0 - setmetatile 1, 13, 576, 1 - setmetatile 2, 13, 577, 1 - setmetatile 4, 6, 568, 0 - setmetatile 5, 6, 569, 0 - setmetatile 4, 7, 576, 1 - setmetatile 5, 7, 577, 1 - setmetatile 4, 12, 568, 0 - setmetatile 5, 12, 569, 0 - setmetatile 4, 13, 576, 1 - setmetatile 5, 13, 577, 1 - setmetatile 4, 18, 568, 0 - setmetatile 5, 18, 569, 0 - setmetatile 4, 19, 576, 1 - setmetatile 5, 19, 577, 1 - setmetatile 7, 9, 568, 0 - setmetatile 8, 9, 569, 0 - setmetatile 7, 10, 576, 1 - setmetatile 8, 10, 577, 1 - setmetatile 10, 6, 568, 0 - setmetatile 11, 6, 569, 0 - setmetatile 10, 7, 576, 1 - setmetatile 11, 7, 577, 1 - setmetatile 10, 12, 568, 0 - setmetatile 11, 12, 569, 0 - setmetatile 10, 13, 576, 1 - setmetatile 11, 13, 577, 1 - setmetatile 10, 18, 568, 0 - setmetatile 11, 18, 569, 0 - setmetatile 10, 19, 576, 1 - setmetatile 11, 19, 577, 1 - setmetatile 13, 3, 568, 0 - setmetatile 14, 3, 569, 0 - setmetatile 13, 4, 576, 1 - setmetatile 14, 4, 577, 1 - setmetatile 3, 16, 570, 1 - setmetatile 3, 17, 578, 1 - setmetatile 9, 4, 570, 1 - setmetatile 9, 5, 578, 1 - return - -Route110_TrickHousePuzzle3_EventScript_26C232:: @ 826C232 - setmetatile 1, 6, 571, 0 - setmetatile 2, 6, 572, 0 - setmetatile 1, 7, 579, 1 - setmetatile 2, 7, 580, 1 - setmetatile 1, 9, 571, 0 - setmetatile 2, 9, 572, 0 - setmetatile 1, 10, 579, 1 - setmetatile 2, 10, 580, 1 - setmetatile 4, 15, 571, 0 - setmetatile 5, 15, 572, 0 - setmetatile 4, 16, 579, 1 - setmetatile 5, 16, 580, 1 - setmetatile 13, 9, 571, 0 - setmetatile 14, 9, 572, 0 - setmetatile 13, 10, 579, 1 - setmetatile 14, 10, 580, 1 - setmetatile 13, 15, 571, 0 - setmetatile 14, 15, 572, 0 - setmetatile 13, 16, 579, 1 - setmetatile 14, 16, 580, 1 - setmetatile 3, 7, 573, 1 - setmetatile 3, 8, 581, 1 - setmetatile 3, 13, 573, 1 - setmetatile 3, 14, 581, 1 - setmetatile 6, 4, 573, 1 - setmetatile 6, 5, 581, 1 - setmetatile 9, 16, 573, 1 - setmetatile 9, 17, 581, 1 - setmetatile 12, 7, 573, 1 - setmetatile 12, 8, 581, 1 - setmetatile 1, 3, 584, 0 - setmetatile 2, 3, 585, 0 - setmetatile 1, 4, 592, 0 - setmetatile 2, 4, 593, 0 - setmetatile 1, 12, 584, 0 - setmetatile 2, 12, 585, 0 - setmetatile 1, 13, 592, 0 - setmetatile 2, 13, 593, 0 - setmetatile 4, 6, 584, 0 - setmetatile 5, 6, 585, 0 - setmetatile 4, 7, 592, 0 - setmetatile 5, 7, 593, 0 - setmetatile 4, 12, 584, 0 - setmetatile 5, 12, 585, 0 - setmetatile 4, 13, 592, 0 - setmetatile 5, 13, 593, 0 - setmetatile 4, 18, 584, 0 - setmetatile 5, 18, 585, 0 - setmetatile 4, 19, 592, 0 - setmetatile 5, 19, 593, 0 - setmetatile 7, 9, 584, 0 - setmetatile 8, 9, 585, 0 - setmetatile 7, 10, 592, 0 - setmetatile 8, 10, 593, 0 - setmetatile 10, 6, 584, 0 - setmetatile 11, 6, 585, 0 - setmetatile 10, 7, 592, 0 - setmetatile 11, 7, 593, 0 - setmetatile 10, 12, 584, 0 - setmetatile 11, 12, 585, 0 - setmetatile 10, 13, 592, 0 - setmetatile 11, 13, 593, 0 - setmetatile 10, 18, 584, 0 - setmetatile 11, 18, 585, 0 - setmetatile 10, 19, 592, 0 - setmetatile 11, 19, 593, 0 - setmetatile 13, 3, 584, 0 - setmetatile 14, 3, 585, 0 - setmetatile 13, 4, 592, 0 - setmetatile 14, 4, 593, 0 - setmetatile 3, 16, 586, 1 - setmetatile 3, 17, 594, 0 - setmetatile 9, 4, 586, 1 - setmetatile 9, 5, 594, 0 - return - -Route110_TrickHousePuzzle3_EventScript_26C4CD:: @ 826C4CD - lockall - setvar VAR_TEMP_8, 1 - goto Route110_TrickHousePuzzle3_EventScript_26C4FD - end - -Route110_TrickHousePuzzle3_EventScript_26C4D9:: @ 826C4D9 - lockall - setvar VAR_TEMP_8, 2 - goto Route110_TrickHousePuzzle3_EventScript_26C4FD - end - -Route110_TrickHousePuzzle3_EventScript_26C4E5:: @ 826C4E5 - lockall - setvar VAR_TEMP_8, 3 - goto Route110_TrickHousePuzzle3_EventScript_26C4FD - end - -Route110_TrickHousePuzzle3_EventScript_26C4F1:: @ 826C4F1 - lockall - setvar VAR_TEMP_8, 4 - goto Route110_TrickHousePuzzle3_EventScript_26C4FD - end - -Route110_TrickHousePuzzle3_EventScript_26C4FD:: @ 826C4FD - call Route110_TrickHousePuzzle3_EventScript_26C510 - playse SE_PIN - call Route110_TrickHousePuzzle3_EventScript_26BF1E - goto Route110_TrickHousePuzzle3_EventScript_26C569 - end - -Route110_TrickHousePuzzle3_EventScript_26C510:: @ 826C510 - setvar VAR_TEMP_1, 0 - setvar VAR_TEMP_2, 0 - setvar VAR_TEMP_3, 0 - setvar VAR_TEMP_4, 0 - compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26C551 - compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26C557 - compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26C55D - compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26C563 - return - -Route110_TrickHousePuzzle3_EventScript_26C551:: @ 826C551 - setvar VAR_TEMP_1, 1 - return - -Route110_TrickHousePuzzle3_EventScript_26C557:: @ 826C557 - setvar VAR_TEMP_2, 1 - return - -Route110_TrickHousePuzzle3_EventScript_26C55D:: @ 826C55D - setvar VAR_TEMP_3, 1 - return - -Route110_TrickHousePuzzle3_EventScript_26C563:: @ 826C563 - setvar VAR_TEMP_4, 1 - return - -Route110_TrickHousePuzzle3_EventScript_26C569:: @ 826C569 - compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF97 - compare VAR_TEMP_9, 0 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26C232 - special DrawWholeMapView - compare VAR_TEMP_9, 1 - goto_eq Route110_TrickHousePuzzle3_EventScript_26C599 - compare VAR_TEMP_9, 0 - goto_eq Route110_TrickHousePuzzle3_EventScript_26C5A0 - end - -Route110_TrickHousePuzzle3_EventScript_26C599:: @ 826C599 - setvar VAR_TEMP_9, 0 - releaseall - end - -Route110_TrickHousePuzzle3_EventScript_26C5A0:: @ 826C5A0 - setvar VAR_TEMP_9, 1 - releaseall - end - -Route110_TrickHousePuzzle3_EventScript_26C5A7:: @ 826C5A7 - lockall - compare VAR_0x40AD, 0 - goto_eq Route110_TrickHousePuzzle3_EventScript_26C5B9 - goto Route110_TrickHousePuzzle3_EventScript_26A3DB - end - -Route110_TrickHousePuzzle3_EventScript_26C5B9:: @ 826C5B9 - setvar VAR_0x40AD, 1 - goto Route110_TrickHousePuzzle3_EventScript_26A3E5 - end - -Route110_TrickHousePuzzle3_EventScript_26C5C4:: @ 826C5C4 - trainerbattle 0, TRAINER_JUSTIN, 0, Route110_TrickHousePuzzle3_Text_26C676, Route110_TrickHousePuzzle3_Text_26C69D - msgbox Route110_TrickHousePuzzle3_Text_26C6E6, 6 - end - -Route110_TrickHousePuzzle3_EventScript_26C5DB:: @ 826C5DB - trainerbattle 0, TRAINER_MARTHA, 0, Route110_TrickHousePuzzle3_Text_26C726, Route110_TrickHousePuzzle3_Text_26C763 - msgbox Route110_TrickHousePuzzle3_Text_26C776, 6 - end - -Route110_TrickHousePuzzle3_EventScript_26C5F2:: @ 826C5F2 - trainerbattle 0, TRAINER_ALAN, 0, Route110_TrickHousePuzzle3_Text_26C7AA, Route110_TrickHousePuzzle3_Text_26C7EC - msgbox Route110_TrickHousePuzzle3_Text_26C80C, 6 - end - -Route110_TrickHousePuzzle3_Text_26C609: @ 826C609 - .string "{PLAYER} wrote down the secret code\n" - .string "on the door.\p" - .string "“TRICK MASTER is coveted.â€\n" - .string "… … … … … … … …\p" - .string "The lock clicked open!$" - -Route110_TrickHousePuzzle3_Text_26C676: @ 826C676 - .string "I keep coming back to this same place!$" - -Route110_TrickHousePuzzle3_Text_26C69D: @ 826C69D - .string "I’m already having trouble, and then\n" - .string "you have to beat me? It’s not fair!$" - -Route110_TrickHousePuzzle3_Text_26C6E6: @ 826C6E6 - .string "It’s full of doors here!\n" - .string "It’s too small and dark in here! Help!$" - -Route110_TrickHousePuzzle3_Text_26C726: @ 826C726 - .string "I don’t know what’s going on here.\n" - .string "I’m starting to feel sad…$" - -Route110_TrickHousePuzzle3_Text_26C763: @ 826C763 - .string "You… You’re awful!$" - -Route110_TrickHousePuzzle3_Text_26C776: @ 826C776 - .string "I know I’m weak!\n" - .string "And, I have no sense of direction!$" - -Route110_TrickHousePuzzle3_Text_26C7AA: @ 826C7AA - .string "I don’t get it. What would anyone want\n" - .string "with a house this bizarre?$" - -Route110_TrickHousePuzzle3_Text_26C7EC: @ 826C7EC - .string "I don’t get it.\n" - .string "How did I lose?$" - -Route110_TrickHousePuzzle3_Text_26C80C: @ 826C80C - .string "I don’t get it.\n" - .string "How many traps are in this house?\p" - .string "You may be the one to solve that.$" - diff --git a/data/scripts/maps/Route110_TrickHousePuzzle4.inc b/data/scripts/maps/Route110_TrickHousePuzzle4.inc deleted file mode 100644 index 56b4b02fb..000000000 --- a/data/scripts/maps/Route110_TrickHousePuzzle4.inc +++ /dev/null @@ -1,71 +0,0 @@ -Route110_TrickHousePuzzle4_MapScripts:: @ 826C860 - .byte 0 - -Route110_TrickHousePuzzle4_EventScript_26C861:: @ 826C861 - lockall - compare VAR_0x40AE, 0 - goto_eq Route110_TrickHousePuzzle4_EventScript_26C873 - goto Route110_TrickHousePuzzle4_EventScript_26A3DB - end - -Route110_TrickHousePuzzle4_EventScript_26C873:: @ 826C873 - setvar VAR_0x40AE, 1 - goto Route110_TrickHousePuzzle4_EventScript_26A3E5 - end - -Route110_TrickHousePuzzle4_EventScript_26C87E:: @ 826C87E - trainerbattle 0, TRAINER_CORA, 0, Route110_TrickHousePuzzle4_Text_26C92D, Route110_TrickHousePuzzle4_Text_26C96E - msgbox Route110_TrickHousePuzzle4_Text_26C9A2, 6 - end - -Route110_TrickHousePuzzle4_EventScript_26C895:: @ 826C895 - trainerbattle 0, TRAINER_YUJI, 0, Route110_TrickHousePuzzle4_Text_26C9E4, Route110_TrickHousePuzzle4_Text_26CA20 - msgbox Route110_TrickHousePuzzle4_Text_26CA53, 6 - end - -Route110_TrickHousePuzzle4_EventScript_26C8AC:: @ 826C8AC - trainerbattle 0, TRAINER_PAULA, 0, Route110_TrickHousePuzzle4_Text_26CA9C, Route110_TrickHousePuzzle4_Text_26CACB - msgbox Route110_TrickHousePuzzle4_Text_26CAD1, 6 - end - -Route110_TrickHousePuzzle4_Text_26C8C3: @ 826C8C3 - .string "{PLAYER} wrote down the secret code\n" - .string "on the door.\p" - .string "“TRICK MASTER is cool.â€\n" - .string "… … … … … … … …\p" - .string "The lock clicked open!$" - -Route110_TrickHousePuzzle4_Text_26C92D: @ 826C92D - .string "It’s too much bother to think this out.\n" - .string "I only wanted to battle!$" - -Route110_TrickHousePuzzle4_Text_26C96E: @ 826C96E - .string "Even though I lost, I still like battling\n" - .string "the best!$" - -Route110_TrickHousePuzzle4_Text_26C9A2: @ 826C9A2 - .string "Wouldn’t you agree? You would go\n" - .string "anywhere if TRAINERS were there.$" - -Route110_TrickHousePuzzle4_Text_26C9E4: @ 826C9E4 - .string "Heh! Boulders like this, I can brush\n" - .string "aside with one finger!$" - -Route110_TrickHousePuzzle4_Text_26CA20: @ 826CA20 - .string "I can push boulders, but I can’t solve\n" - .string "the puzzle…$" - -Route110_TrickHousePuzzle4_Text_26CA53: @ 826CA53 - .string "It’s not good enough to be brawny…\n" - .string "You have to use your head. Be brainy!$" - -Route110_TrickHousePuzzle4_Text_26CA9C: @ 826CA9C - .string "The TRICK HOUSE is getting trickier,\n" - .string "isn’t it?$" - -Route110_TrickHousePuzzle4_Text_26CACB: @ 826CACB - .string "Aaak!$" - -Route110_TrickHousePuzzle4_Text_26CAD1: @ 826CAD1 - .string "Has anyone made it to the end?$" - diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc deleted file mode 100644 index 5afce1c88..000000000 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ /dev/null @@ -1,1091 +0,0 @@ -Route110_TrickHousePuzzle5_MapScripts:: @ 826CAF0 - map_script 3, Route110_TrickHousePuzzle5_MapScript1_26CAF6 - .byte 0 - -Route110_TrickHousePuzzle5_MapScript1_26CAF6: @ 826CAF6 - setvar VAR_TEMP_1, 0 - setvar VAR_TEMP_2, 0 - setvar VAR_TEMP_3, 0 - setvar VAR_TEMP_4, 0 - setvar VAR_TEMP_5, 0 - setvar VAR_TEMP_8, 0 - end - -Route110_TrickHousePuzzle5_EventScript_26CB15:: @ 826CB15 - lockall - compare VAR_0x40AF, 0 - goto_eq Route110_TrickHousePuzzle5_EventScript_26CB27 - goto Route110_TrickHousePuzzle5_EventScript_26A3DB - end - -Route110_TrickHousePuzzle5_EventScript_26CB27:: @ 826CB27 - setvar VAR_0x40AF, 1 - goto Route110_TrickHousePuzzle5_EventScript_26A3E5 - end - -Route110_TrickHousePuzzle5_EventScript_26CB32:: @ 826CB32 - lockall - applymovement 1, Route110_TrickHousePuzzle5_Movement_27259E - waitmovement 0 - compare VAR_TEMP_1, 1 - goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA - setvar VAR_TEMP_9, 0 - goto Route110_TrickHousePuzzle5_EventScript_26CCEB - end - -Route110_TrickHousePuzzle5_EventScript_26CB53:: @ 826CB53 - lockall - applymovement 2, Route110_TrickHousePuzzle5_Movement_27259E - waitmovement 0 - compare VAR_TEMP_2, 1 - goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA - setvar VAR_TEMP_9, 0 - goto Route110_TrickHousePuzzle5_EventScript_26CD6A - end - -Route110_TrickHousePuzzle5_EventScript_26CB74:: @ 826CB74 - lockall - applymovement 3, Route110_TrickHousePuzzle5_Movement_27259E - waitmovement 0 - compare VAR_TEMP_3, 1 - goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA - setvar VAR_TEMP_9, 0 - goto Route110_TrickHousePuzzle5_EventScript_26CDF4 - end - -Route110_TrickHousePuzzle5_EventScript_26CB95:: @ 826CB95 - lockall - applymovement 4, Route110_TrickHousePuzzle5_Movement_27259E - waitmovement 0 - compare VAR_TEMP_4, 1 - goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA - setvar VAR_TEMP_9, 0 - goto Route110_TrickHousePuzzle5_EventScript_26CE73 - end - -Route110_TrickHousePuzzle5_EventScript_26CBB6:: @ 826CBB6 - lockall - applymovement 5, Route110_TrickHousePuzzle5_Movement_27259E - waitmovement 0 - compare VAR_TEMP_5, 1 - goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA - setvar VAR_TEMP_9, 0 - goto Route110_TrickHousePuzzle5_EventScript_26CEF2 - end - -Route110_TrickHousePuzzle5_EventScript_26CBD7:: @ 826CBD7 - lockall - setvar VAR_TEMP_9, 0 - goto Route110_TrickHousePuzzle5_EventScript_26CCEB - end - -Route110_TrickHousePuzzle5_EventScript_26CBE3:: @ 826CBE3 - lockall - setvar VAR_TEMP_9, 1 - goto Route110_TrickHousePuzzle5_EventScript_26CCEB - end - -Route110_TrickHousePuzzle5_EventScript_26CBEF:: @ 826CBEF - lockall - setvar VAR_TEMP_9, 2 - goto Route110_TrickHousePuzzle5_EventScript_26CCEB - end - -Route110_TrickHousePuzzle5_EventScript_26CBFB:: @ 826CBFB - lockall - setvar VAR_TEMP_9, 3 - goto Route110_TrickHousePuzzle5_EventScript_26CCEB - end - -Route110_TrickHousePuzzle5_EventScript_26CC07:: @ 826CC07 - lockall - setvar VAR_TEMP_9, 4 - goto Route110_TrickHousePuzzle5_EventScript_26CCEB - end - -Route110_TrickHousePuzzle5_EventScript_26CC13:: @ 826CC13 - lockall - setvar VAR_TEMP_9, 0 - goto Route110_TrickHousePuzzle5_EventScript_26CD6A - end - -Route110_TrickHousePuzzle5_EventScript_26CC1F:: @ 826CC1F - lockall - setvar VAR_TEMP_9, 1 - goto Route110_TrickHousePuzzle5_EventScript_26CD6A - end - -Route110_TrickHousePuzzle5_EventScript_26CC2B:: @ 826CC2B - lockall - setvar VAR_TEMP_9, 2 - goto Route110_TrickHousePuzzle5_EventScript_26CD6A - end - -Route110_TrickHousePuzzle5_EventScript_26CC37:: @ 826CC37 - lockall - setvar VAR_TEMP_9, 3 - goto Route110_TrickHousePuzzle5_EventScript_26CD6A - end - -Route110_TrickHousePuzzle5_EventScript_26CC43:: @ 826CC43 - lockall - setvar VAR_TEMP_9, 4 - goto Route110_TrickHousePuzzle5_EventScript_26CD6A - end - -Route110_TrickHousePuzzle5_EventScript_26CC4F:: @ 826CC4F - lockall - setvar VAR_TEMP_9, 5 - goto Route110_TrickHousePuzzle5_EventScript_26CD6A - end - -Route110_TrickHousePuzzle5_EventScript_26CC5B:: @ 826CC5B - lockall - setvar VAR_TEMP_9, 0 - goto Route110_TrickHousePuzzle5_EventScript_26CDF4 - end - -Route110_TrickHousePuzzle5_EventScript_26CC67:: @ 826CC67 - lockall - setvar VAR_TEMP_9, 1 - goto Route110_TrickHousePuzzle5_EventScript_26CDF4 - end - -Route110_TrickHousePuzzle5_EventScript_26CC73:: @ 826CC73 - lockall - setvar VAR_TEMP_9, 2 - goto Route110_TrickHousePuzzle5_EventScript_26CDF4 - end - -Route110_TrickHousePuzzle5_EventScript_26CC7F:: @ 826CC7F - lockall - setvar VAR_TEMP_9, 3 - goto Route110_TrickHousePuzzle5_EventScript_26CDF4 - end - -Route110_TrickHousePuzzle5_EventScript_26CC8B:: @ 826CC8B - lockall - setvar VAR_TEMP_9, 4 - goto Route110_TrickHousePuzzle5_EventScript_26CDF4 - end - -Route110_TrickHousePuzzle5_EventScript_26CC97:: @ 826CC97 - lockall - setvar VAR_TEMP_9, 0 - goto Route110_TrickHousePuzzle5_EventScript_26CE73 - end - -Route110_TrickHousePuzzle5_EventScript_26CCA3:: @ 826CCA3 - lockall - setvar VAR_TEMP_9, 1 - goto Route110_TrickHousePuzzle5_EventScript_26CE73 - end - -Route110_TrickHousePuzzle5_EventScript_26CCAF:: @ 826CCAF - lockall - setvar VAR_TEMP_9, 2 - goto Route110_TrickHousePuzzle5_EventScript_26CE73 - end - -Route110_TrickHousePuzzle5_EventScript_26CCBB:: @ 826CCBB - lockall - setvar VAR_TEMP_9, 3 - goto Route110_TrickHousePuzzle5_EventScript_26CE73 - end - -Route110_TrickHousePuzzle5_EventScript_26CCC7:: @ 826CCC7 - lockall - setvar VAR_TEMP_9, 4 - goto Route110_TrickHousePuzzle5_EventScript_26CE73 - end - -Route110_TrickHousePuzzle5_EventScript_26CCD3:: @ 826CCD3 - lockall - setvar VAR_TEMP_9, 5 - goto Route110_TrickHousePuzzle5_EventScript_26CE73 - end - -Route110_TrickHousePuzzle5_EventScript_26CCDF:: @ 826CCDF - lockall - setvar VAR_TEMP_9, 0 - goto Route110_TrickHousePuzzle5_EventScript_26CEF2 - end - -Route110_TrickHousePuzzle5_EventScript_26CCEB:: @ 826CCEB - setvar VAR_TEMP_1, 1 - setvar VAR_TEMP_8, 1 - playse SE_PIN - applymovement 1, Route110_TrickHousePuzzle5_Movement_272598 - waitmovement 0 - applymovement 1, Route110_TrickHousePuzzle5_Movement_27259A - waitmovement 0 - compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1B4 - compare VAR_TEMP_9, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1EC - compare VAR_TEMP_9, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224 - compare VAR_TEMP_9, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C - msgbox Route110_TrickHousePuzzle5_Text_26D6CE, 4 - random 3 - switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_26CF45 - case 1, Route110_TrickHousePuzzle5_EventScript_26CF68 - case 2, Route110_TrickHousePuzzle5_EventScript_26CF8B - end - -Route110_TrickHousePuzzle5_EventScript_26CD6A:: @ 826CD6A - setvar VAR_TEMP_2, 1 - setvar VAR_TEMP_8, 2 - playse SE_PIN - applymovement 2, Route110_TrickHousePuzzle5_Movement_272598 - waitmovement 0 - applymovement 2, Route110_TrickHousePuzzle5_Movement_27259A - waitmovement 0 - compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D2CC - compare VAR_TEMP_9, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D304 - compare VAR_TEMP_9, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D33C - compare VAR_TEMP_9, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D374 - compare VAR_TEMP_9, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3AC - msgbox Route110_TrickHousePuzzle5_Text_26D8EA, 4 - random 3 - switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_26CFAE - case 1, Route110_TrickHousePuzzle5_EventScript_26CFD1 - case 2, Route110_TrickHousePuzzle5_EventScript_26CFF4 - end - -Route110_TrickHousePuzzle5_EventScript_26CDF4:: @ 826CDF4 - setvar VAR_TEMP_3, 1 - setvar VAR_TEMP_8, 3 - playse SE_PIN - applymovement 3, Route110_TrickHousePuzzle5_Movement_272598 - waitmovement 0 - applymovement 3, Route110_TrickHousePuzzle5_Movement_27259A - waitmovement 0 - compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1B4 - compare VAR_TEMP_9, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1EC - compare VAR_TEMP_9, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224 - compare VAR_TEMP_9, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C - msgbox Route110_TrickHousePuzzle5_Text_26DA1E, 4 - random 3 - switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_26D017 - case 1, Route110_TrickHousePuzzle5_EventScript_26D03A - case 2, Route110_TrickHousePuzzle5_EventScript_26D05D - end - -Route110_TrickHousePuzzle5_EventScript_26CE73:: @ 826CE73 - setvar VAR_TEMP_4, 1 - setvar VAR_TEMP_8, 4 - playse SE_PIN - applymovement 4, Route110_TrickHousePuzzle5_Movement_272598 - waitmovement 0 - applymovement 4, Route110_TrickHousePuzzle5_Movement_27259A - waitmovement 0 - compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1B4 - compare VAR_TEMP_9, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1EC - compare VAR_TEMP_9, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224 - compare VAR_TEMP_9, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C - msgbox Route110_TrickHousePuzzle5_Text_26DB4C, 4 - random 3 - switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_26D080 - case 1, Route110_TrickHousePuzzle5_EventScript_26D0A3 - case 2, Route110_TrickHousePuzzle5_EventScript_26D0C6 - end - -Route110_TrickHousePuzzle5_EventScript_26CEF2:: @ 826CEF2 - setvar VAR_TEMP_5, 1 - setvar VAR_TEMP_8, 5 - playse SE_PIN - applymovement 5, Route110_TrickHousePuzzle5_Movement_272598 - waitmovement 0 - applymovement 5, Route110_TrickHousePuzzle5_Movement_27259A - waitmovement 0 - msgbox Route110_TrickHousePuzzle5_Text_26DC78, 4 - random 3 - switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_26D0E9 - case 1, Route110_TrickHousePuzzle5_EventScript_26D10C - case 2, Route110_TrickHousePuzzle5_EventScript_26D12F - end - -Route110_TrickHousePuzzle5_EventScript_26CF45:: @ 826CF45 - msgbox Route110_TrickHousePuzzle5_Text_26D757, 4 - multichoice 0, 0, 25, 1 - switch VAR_RESULT - case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0 - goto Route110_TrickHousePuzzle5_EventScript_26D152 - end - -Route110_TrickHousePuzzle5_EventScript_26CF68:: @ 826CF68 - msgbox Route110_TrickHousePuzzle5_Text_26D7AA, 4 - multichoice 0, 0, 26, 1 - switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 - goto Route110_TrickHousePuzzle5_EventScript_26D152 - end - -Route110_TrickHousePuzzle5_EventScript_26CF8B:: @ 826CF8B - msgbox Route110_TrickHousePuzzle5_Text_26D7FC, 4 - multichoice 0, 0, 27, 1 - switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 - goto Route110_TrickHousePuzzle5_EventScript_26D152 - end - -Route110_TrickHousePuzzle5_EventScript_26CFAE:: @ 826CFAE - msgbox Route110_TrickHousePuzzle5_Text_26D940, 4 - multichoice 0, 0, 28, 1 - switch VAR_RESULT - case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0 - goto Route110_TrickHousePuzzle5_EventScript_26D152 - end - -Route110_TrickHousePuzzle5_EventScript_26CFD1:: @ 826CFD1 - msgbox Route110_TrickHousePuzzle5_Text_26D98C, 4 - multichoice 0, 0, 29, 1 - switch VAR_RESULT - case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0 - goto Route110_TrickHousePuzzle5_EventScript_26D152 - end - -Route110_TrickHousePuzzle5_EventScript_26CFF4:: @ 826CFF4 - msgbox Route110_TrickHousePuzzle5_Text_26D9CE, 4 - multichoice 0, 0, 30, 1 - switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 - goto Route110_TrickHousePuzzle5_EventScript_26D152 - end - -Route110_TrickHousePuzzle5_EventScript_26D017:: @ 826D017 - msgbox Route110_TrickHousePuzzle5_Text_26DA64, 4 - multichoice 0, 0, 31, 1 - switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 - goto Route110_TrickHousePuzzle5_EventScript_26D152 - end - -Route110_TrickHousePuzzle5_EventScript_26D03A:: @ 826D03A - msgbox Route110_TrickHousePuzzle5_Text_26DAAD, 4 - multichoice 0, 0, 32, 1 - switch VAR_RESULT - case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0 - goto Route110_TrickHousePuzzle5_EventScript_26D152 - end - -Route110_TrickHousePuzzle5_EventScript_26D05D:: @ 826D05D - msgbox Route110_TrickHousePuzzle5_Text_26DAFF, 4 - multichoice 0, 0, 33, 1 - switch VAR_RESULT - case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0 - goto Route110_TrickHousePuzzle5_EventScript_26D152 - end - -Route110_TrickHousePuzzle5_EventScript_26D080:: @ 826D080 - msgbox Route110_TrickHousePuzzle5_Text_26DB94, 4 - multichoice 0, 0, 34, 1 - switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 - goto Route110_TrickHousePuzzle5_EventScript_26D152 - end - -Route110_TrickHousePuzzle5_EventScript_26D0A3:: @ 826D0A3 - msgbox Route110_TrickHousePuzzle5_Text_26DBD7, 4 - multichoice 0, 0, 35, 1 - switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 - goto Route110_TrickHousePuzzle5_EventScript_26D152 - end - -Route110_TrickHousePuzzle5_EventScript_26D0C6:: @ 826D0C6 - msgbox Route110_TrickHousePuzzle5_Text_26DC2A, 4 - multichoice 0, 0, 36, 1 - switch VAR_RESULT - case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0 - goto Route110_TrickHousePuzzle5_EventScript_26D152 - end - -Route110_TrickHousePuzzle5_EventScript_26D0E9:: @ 826D0E9 - msgbox Route110_TrickHousePuzzle5_Text_26DCCB, 4 - multichoice 0, 0, 37, 1 - switch VAR_RESULT - case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0 - goto Route110_TrickHousePuzzle5_EventScript_26D152 - end - -Route110_TrickHousePuzzle5_EventScript_26D10C:: @ 826D10C - msgbox Route110_TrickHousePuzzle5_Text_26DD1B, 4 - multichoice 0, 0, 38, 1 - switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 - goto Route110_TrickHousePuzzle5_EventScript_26D152 - end - -Route110_TrickHousePuzzle5_EventScript_26D12F:: @ 826D12F - msgbox Route110_TrickHousePuzzle5_Text_26DD5F, 4 - multichoice 0, 0, 39, 1 - switch VAR_RESULT - case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0 - goto Route110_TrickHousePuzzle5_EventScript_26D152 - end - -Route110_TrickHousePuzzle5_EventScript_26D152:: @ 826D152 - waitse - playse SE_HAZURE - msgbox Route110_TrickHousePuzzle5_Text_26D883, 4 - applymovement 1, Route110_TrickHousePuzzle5_Movement_26D632 - applymovement 2, Route110_TrickHousePuzzle5_Movement_26D632 - applymovement 3, Route110_TrickHousePuzzle5_Movement_26D632 - applymovement 4, Route110_TrickHousePuzzle5_Movement_26D632 - applymovement 5, Route110_TrickHousePuzzle5_Movement_26D632 - msgbox Route110_TrickHousePuzzle5_Text_26D8A1, 4 - waitmovement 0 - msgbox Route110_TrickHousePuzzle5_Text_26D8C9, 4 - closemessage - warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21 - waitstate - releaseall - end - -Route110_TrickHousePuzzle5_EventScript_26D1A0:: @ 826D1A0 - waitse - playse SE_SEIKAI - goto Route110_TrickHousePuzzle5_EventScript_26D1AA - end - -Route110_TrickHousePuzzle5_EventScript_26D1AA:: @ 826D1AA - msgbox Route110_TrickHousePuzzle5_Text_26D84D, 4 - releaseall - end - -Route110_TrickHousePuzzle5_EventScript_26D1B4:: @ 826D1B4 - compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3E4 - compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3EF - compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3FA - compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D405 - compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D410 - return - -Route110_TrickHousePuzzle5_EventScript_26D1EC:: @ 826D1EC - compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D41B - compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D426 - compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D431 - compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D43C - compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D447 - return - -Route110_TrickHousePuzzle5_EventScript_26D224:: @ 826D224 - compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D452 - compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D45D - compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D468 - compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D473 - compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D47E - return - -Route110_TrickHousePuzzle5_EventScript_26D25C:: @ 826D25C - compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D489 - compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D494 - compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D49F - compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4AA - compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4B5 - return - -Route110_TrickHousePuzzle5_EventScript_26D294:: @ 826D294 - compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4C0 - compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4CB - compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4D6 - compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4E1 - compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4EC - return - -Route110_TrickHousePuzzle5_EventScript_26D2CC:: @ 826D2CC - compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4F7 - compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D502 - compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D50D - compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D518 - compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D523 - return - -Route110_TrickHousePuzzle5_EventScript_26D304:: @ 826D304 - compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D52E - compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D539 - compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D544 - compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D54F - compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D55A - return - -Route110_TrickHousePuzzle5_EventScript_26D33C:: @ 826D33C - compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D565 - compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D570 - compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D57B - compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D586 - compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D591 - return - -Route110_TrickHousePuzzle5_EventScript_26D374:: @ 826D374 - compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D59C - compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5A7 - compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5B2 - compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5BD - compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5C8 - return - -Route110_TrickHousePuzzle5_EventScript_26D3AC:: @ 826D3AC - compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5D3 - compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5DE - compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5E9 - compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5F4 - compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5FF - return - -Route110_TrickHousePuzzle5_EventScript_26D3E4:: @ 826D3E4 - applymovement 1, Route110_TrickHousePuzzle5_Movement_26D60A - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D3EF:: @ 826D3EF - applymovement 2, Route110_TrickHousePuzzle5_Movement_26D60A - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D3FA:: @ 826D3FA - applymovement 3, Route110_TrickHousePuzzle5_Movement_26D60A - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D405:: @ 826D405 - applymovement 4, Route110_TrickHousePuzzle5_Movement_26D60A - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D410:: @ 826D410 - applymovement 5, Route110_TrickHousePuzzle5_Movement_26D60A - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D41B:: @ 826D41B - applymovement 1, Route110_TrickHousePuzzle5_Movement_26D60C - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D426:: @ 826D426 - applymovement 2, Route110_TrickHousePuzzle5_Movement_26D60C - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D431:: @ 826D431 - applymovement 3, Route110_TrickHousePuzzle5_Movement_26D60C - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D43C:: @ 826D43C - applymovement 4, Route110_TrickHousePuzzle5_Movement_26D60C - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D447:: @ 826D447 - applymovement 5, Route110_TrickHousePuzzle5_Movement_26D60C - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D452:: @ 826D452 - applymovement 1, Route110_TrickHousePuzzle5_Movement_26D60F - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D45D:: @ 826D45D - applymovement 2, Route110_TrickHousePuzzle5_Movement_26D60F - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D468:: @ 826D468 - applymovement 3, Route110_TrickHousePuzzle5_Movement_26D60F - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D473:: @ 826D473 - applymovement 4, Route110_TrickHousePuzzle5_Movement_26D60F - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D47E:: @ 826D47E - applymovement 5, Route110_TrickHousePuzzle5_Movement_26D60F - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D489:: @ 826D489 - applymovement 1, Route110_TrickHousePuzzle5_Movement_26D613 - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D494:: @ 826D494 - applymovement 2, Route110_TrickHousePuzzle5_Movement_26D613 - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D49F:: @ 826D49F - applymovement 3, Route110_TrickHousePuzzle5_Movement_26D613 - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D4AA:: @ 826D4AA - applymovement 4, Route110_TrickHousePuzzle5_Movement_26D613 - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D4B5:: @ 826D4B5 - applymovement 5, Route110_TrickHousePuzzle5_Movement_26D613 - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D4C0:: @ 826D4C0 - applymovement 1, Movement_26D618 - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D4CB:: @ 826D4CB - applymovement 2, Movement_26D618 - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D4D6:: @ 826D4D6 - applymovement 3, Movement_26D618 - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D4E1:: @ 826D4E1 - applymovement 4, Movement_26D618 - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D4EC:: @ 826D4EC - applymovement 5, Movement_26D618 - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D4F7:: @ 826D4F7 - applymovement 1, Route110_TrickHousePuzzle5_Movement_26D61E - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D502:: @ 826D502 - applymovement 2, Route110_TrickHousePuzzle5_Movement_26D61E - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D50D:: @ 826D50D - applymovement 3, Route110_TrickHousePuzzle5_Movement_26D61E - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D518:: @ 826D518 - applymovement 4, Route110_TrickHousePuzzle5_Movement_26D61E - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D523:: @ 826D523 - applymovement 5, Route110_TrickHousePuzzle5_Movement_26D61E - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D52E:: @ 826D52E - applymovement 1, Route110_TrickHousePuzzle5_Movement_26D620 - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D539:: @ 826D539 - applymovement 2, Route110_TrickHousePuzzle5_Movement_26D620 - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D544:: @ 826D544 - applymovement 3, Route110_TrickHousePuzzle5_Movement_26D620 - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D54F:: @ 826D54F - applymovement 4, Route110_TrickHousePuzzle5_Movement_26D620 - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D55A:: @ 826D55A - applymovement 5, Route110_TrickHousePuzzle5_Movement_26D620 - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D565:: @ 826D565 - applymovement 1, Route110_TrickHousePuzzle5_Movement_26D623 - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D570:: @ 826D570 - applymovement 2, Route110_TrickHousePuzzle5_Movement_26D623 - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D57B:: @ 826D57B - applymovement 3, Route110_TrickHousePuzzle5_Movement_26D623 - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D586:: @ 826D586 - applymovement 4, Route110_TrickHousePuzzle5_Movement_26D623 - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D591:: @ 826D591 - applymovement 5, Route110_TrickHousePuzzle5_Movement_26D623 - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D59C:: @ 826D59C - applymovement 1, Route110_TrickHousePuzzle5_Movement_26D627 - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D5A7:: @ 826D5A7 - applymovement 2, Route110_TrickHousePuzzle5_Movement_26D627 - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D5B2:: @ 826D5B2 - applymovement 3, Route110_TrickHousePuzzle5_Movement_26D627 - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D5BD:: @ 826D5BD - applymovement 4, Route110_TrickHousePuzzle5_Movement_26D627 - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D5C8:: @ 826D5C8 - applymovement 5, Route110_TrickHousePuzzle5_Movement_26D627 - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D5D3:: @ 826D5D3 - applymovement 1, Route110_TrickHousePuzzle5_Movement_26D62C - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D5DE:: @ 826D5DE - applymovement 2, Route110_TrickHousePuzzle5_Movement_26D62C - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D5E9:: @ 826D5E9 - applymovement 3, Route110_TrickHousePuzzle5_Movement_26D62C - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D5F4:: @ 826D5F4 - applymovement 4, Route110_TrickHousePuzzle5_Movement_26D62C - waitmovement 0 - return - -Route110_TrickHousePuzzle5_EventScript_26D5FF:: @ 826D5FF - applymovement 5, Route110_TrickHousePuzzle5_Movement_26D62C - waitmovement 0 - return - -Route110_TrickHousePuzzle5_Movement_26D60A: @ 826D60A - walk_left - step_end - -Route110_TrickHousePuzzle5_Movement_26D60C: @ 826D60C - walk_left - walk_left - step_end - -Route110_TrickHousePuzzle5_Movement_26D60F: @ 826D60F - walk_left - walk_left - walk_left - step_end - -Route110_TrickHousePuzzle5_Movement_26D613: @ 826D613 - walk_left - walk_left - walk_left - walk_left - step_end - - -Movement_26D618: @ 826D618 - walk_left - walk_left - walk_left - walk_left - walk_left - step_end - -Route110_TrickHousePuzzle5_Movement_26D61E: @ 826D61E - walk_right - step_end - -Route110_TrickHousePuzzle5_Movement_26D620: @ 826D620 - walk_right - walk_right - step_end - -Route110_TrickHousePuzzle5_Movement_26D623: @ 826D623 - walk_right - walk_right - walk_right - step_end - -Route110_TrickHousePuzzle5_Movement_26D627: @ 826D627 - walk_right - walk_right - walk_right - walk_right - step_end - -Route110_TrickHousePuzzle5_Movement_26D62C: @ 826D62C - walk_right - walk_right - walk_right - walk_right - walk_right - step_end - -Route110_TrickHouseEntrance_Movement_26D632: @ 826D632 -Route110_TrickHousePuzzle5_Movement_26D632: @ 826D632 - 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 - .string "{PLAYER} wrote down the secret code\n" - .string "on the door.\p" - .string "“TRICK MASTER is a genius.â€\n" - .string "… … … … … … … …\p" - .string "The lock clicked open!$" - -Route110_TrickHousePuzzle5_Text_26D6CE: @ 826D6CE - .string "CLICKETY-CLACK…\n" - .string "MECHADOLL 1 AM I!\p" - .string "IF YOU ANSWER QUIZZES CORRECTLY,\n" - .string "THEN YOU WILL GO TO MECHADOLL 5.\l" - .string "THEN YOU CAN OBTAIN THE SECRET CODE.$" - -Route110_TrickHousePuzzle5_Text_26D757: @ 826D757 - .string "MECHADOLL 1 QUIZ.\p" - .string "One of these POKéMON is not found\n" - .string "on ROUTE 110. Which one is it?$" - -Route110_TrickHousePuzzle5_Text_26D7AA: @ 826D7AA - .string "MECHADOLL 1 QUIZ.\p" - .string "One of these POKéMON is not of the\n" - .string "WATER type. Which one is it?$" - -Route110_TrickHousePuzzle5_Text_26D7FC: @ 826D7FC - .string "MECHADOLL 1 QUIZ.\p" - .string "One of these POKéMON does not use\n" - .string "LEECH LIFE. Which one is it?$" - -Route110_TrickHousePuzzle5_Text_26D84D: @ 826D84D - .string "CONGRATULATIONS. CORRECT YOU ARE.\n" - .string "GO THROUGH. PLEASE.$" - -Route110_TrickHousePuzzle5_Text_26D883: @ 826D883 - .string "BZZZT. DISAPPOINTMENT.\n" - .string "ERROR.$" - -Route110_TrickHousePuzzle5_Text_26D8A1: @ 826D8A1 - .string "WAHAHAHAHA! WAHAHAHAHA!\n" - .string "CLICKETY-CLACK!$" - -Route110_TrickHousePuzzle5_Text_26D8C9: @ 826D8C9 - .string "YOUR NEXT CHALLENGE WE WAIT FOR.$" - -Route110_TrickHousePuzzle5_Text_26D8EA: @ 826D8EA - .string "CLICKETY-CLACK…\n" - .string "MECHADOLL 2 AM I!\p" - .string "MECHADOLL 1’S QUIZ DIFFICULTY LEVEL\n" - .string "IS SET TOO LOW.$" - -Route110_TrickHousePuzzle5_Text_26D940: @ 826D940 - .string "MECHADOLL 2 QUIZ.\p" - .string "Which of these POKéMON did WALLY\n" - .string "borrow from your father?$" - -Route110_TrickHousePuzzle5_Text_26D98C: @ 826D98C - .string "MECHADOLL 2 QUIZ.\p" - .string "Which of these POKéMON was chasing\n" - .string "PROF. BIRCH?$" - -Route110_TrickHousePuzzle5_Text_26D9CE: @ 826D9CE - .string "MECHADOLL 2 QUIZ.\p" - .string "Which of these POKéMON did TEAM AQUA\n" - .string "use in PETALBURG FOREST?$" - -Route110_TrickHousePuzzle5_Text_26DA1E: @ 826DA1E - .string "CLICKETY-CLACK…\n" - .string "MECHADOLL 3 AM I!\p" - .string "MATTERS OF MONEY ARE MY SOLE FOCUS.$" - -Route110_TrickHousePuzzle5_Text_26DA64: @ 826DA64 - .string "MECHADOLL 3 QUIZ.\p" - .string "Which costs more?\n" - .string "Three HARBOR MAILS or one BURN HEAL?$" - -Route110_TrickHousePuzzle5_Text_26DAAD: @ 826DAAD - .string "MECHADOLL 3 QUIZ.\p" - .string "Sell one GREAT BALL and buy\n" - .string "one POTION. How much money remains?$" - -Route110_TrickHousePuzzle5_Text_26DAFF: @ 826DAFF - .string "MECHADOLL 3 QUIZ.\p" - .string "Do one REPEL and SODA POP cost\n" - .string "more than one SUPER POTION?$" - -Route110_TrickHousePuzzle5_Text_26DB4C: @ 826DB4C - .string "CLICKETY-CLACK…\n" - .string "MECHADOLL 4 THAT IS ME!\p" - .string "MY QUIZ IS AN OBJECT OF BEAUTY.$" - -Route110_TrickHousePuzzle5_Text_26DB94: @ 826DB94 - .string "MECHADOLL 4 QUIZ.\p" - .string "In SEASHORE HOUSE, were there more men\n" - .string "or women?$" - -Route110_TrickHousePuzzle5_Text_26DBD7: @ 826DBD7 - .string "MECHADOLL 4 QUIZ.\p" - .string "In LAVARIDGE TOWN, were there more\n" - .string "elderly men or elderly women?$" - -Route110_TrickHousePuzzle5_Text_26DC2A: @ 826DC2A - .string "MECHADOLL 4 QUIZ.\p" - .string "In the TRAINER’S SCHOOL, how many\n" - .string "girl students were there?$" - -Route110_TrickHousePuzzle5_Text_26DC78: @ 826DC78 - .string "CLICKETY-CLACK…\n" - .string "MECHADOLL 5 AM I!\p" - .string "THE MASTER’S BEST AND PROUDEST\n" - .string "ACHIEVEMENT AM I.$" - -Route110_TrickHousePuzzle5_Text_26DCCB: @ 826DCCB - .string "MECHADOLL 5 QUIZ.\p" - .string "In SLATEPORT’s POKéMON FAN CLUB,\n" - .string "how many POKéMON were there?$" - -Route110_TrickHousePuzzle5_Text_26DD1B: @ 826DD1B - .string "MECHADOLL 5 QUIZ.\p" - .string "In FORTREE CITY, how many\n" - .string "tree houses were there?$" - -Route110_TrickHousePuzzle5_Text_26DD5F: @ 826DD5F - .string "MECHADOLL 5 QUIZ.\p" - .string "On the CYCLING ROAD, how many\n" - .string "TRIATHLETES were there?$" diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/scripts/maps/Route110_TrickHousePuzzle6.inc deleted file mode 100644 index 0f20aac1f..000000000 --- a/data/scripts/maps/Route110_TrickHousePuzzle6.inc +++ /dev/null @@ -1,87 +0,0 @@ -Route110_TrickHousePuzzle6_MapScripts:: @ 826DDA7 - map_script 3, Route110_TrickHousePuzzle6_MapScript1_26DDB2 - map_script 4, Route110_TrickHousePuzzle6_MapScript2_26DDB6 - .byte 0 - -Route110_TrickHousePuzzle6_MapScript1_26DDB2: @ 826DDB2 - special RotatingGate_InitPuzzle - end - -Route110_TrickHousePuzzle6_MapScript2_26DDB6: @ 826DDB6 - map_script_2 VAR_TEMP_0, 16384, Route110_TrickHousePuzzle6_EventScript_26DDC0 - .2byte 0 - -Route110_TrickHousePuzzle6_EventScript_26DDC0:: @ 826DDC0 - special RotatingGate_InitPuzzleAndGraphics - end - -Route110_TrickHousePuzzle6_EventScript_26DDC4:: @ 826DDC4 - lockall - compare VAR_0x40B0, 0 - goto_eq Route110_TrickHousePuzzle6_EventScript_26DDD6 - goto Route110_TrickHousePuzzle6_EventScript_26A3DB - end - -Route110_TrickHousePuzzle6_EventScript_26DDD6:: @ 826DDD6 - setvar VAR_0x40B0, 1 - goto Route110_TrickHousePuzzle6_EventScript_26A3E5 - end - -Route110_TrickHousePuzzle6_EventScript_26DDE1:: @ 826DDE1 - trainerbattle 0, TRAINER_SOPHIA, 0, Route110_TrickHousePuzzle6_Text_26DE93, Route110_TrickHousePuzzle6_Text_26DED2 - msgbox Route110_TrickHousePuzzle6_Text_26DEF3, 6 - end - -Route110_TrickHousePuzzle6_EventScript_26DDF8:: @ 826DDF8 - trainerbattle 0, TRAINER_BENNY, 0, Route110_TrickHousePuzzle6_Text_26DF55, Route110_TrickHousePuzzle6_Text_26DF8D - msgbox Route110_TrickHousePuzzle6_Text_26DFA0, 6 - end - -Route110_TrickHousePuzzle6_EventScript_26DE0F:: @ 826DE0F - trainerbattle 0, TRAINER_SEBASTIAN, 0, Route110_TrickHousePuzzle6_Text_26DFD7, Route110_TrickHousePuzzle6_Text_26E004 - msgbox Route110_TrickHousePuzzle6_Text_26E048, 6 - end - -Route110_TrickHousePuzzle6_Text_26DE26: @ 826DE26 - .string "{PLAYER} wrote down the secret code\n" - .string "on the door.\p" - .string "“TRICK MASTER is my life.â€\n" - .string "… … … … … … … …\p" - .string "The lock clicked open!$" - -Route110_TrickHousePuzzle6_Text_26DE93: @ 826DE93 - .string "When I heard there was a strange\n" - .string "house, I had to check it out.$" - -Route110_TrickHousePuzzle6_Text_26DED2: @ 826DED2 - .string "I’ve discovered a tough TRAINER!$" - -Route110_TrickHousePuzzle6_Text_26DEF3: @ 826DEF3 - .string "I’m sure having a good time checking\n" - .string "this place out.\p" - .string "It’s a challenge I’ve found worth\n" - .string "repeating!$" - -Route110_TrickHousePuzzle6_Text_26DF55: @ 826DF55 - .string "Maybe I could get my BIRD POKéMON\n" - .string "to fly over the wall…$" - -Route110_TrickHousePuzzle6_Text_26DF8D: @ 826DF8D - .string "Gwaaah! I blew it!$" - -Route110_TrickHousePuzzle6_Text_26DFA0: @ 826DFA0 - .string "Ehehehe… I guess I lost because\n" - .string "I was trying to cheat.$" - -Route110_TrickHousePuzzle6_Text_26DFD7: @ 826DFD7 - .string "I’m getting dizzy from these rotating\n" - .string "doors…$" - -Route110_TrickHousePuzzle6_Text_26E004: @ 826E004 - .string "Everything’s spinning around and\n" - .string "around. I can’t take this anymore…$" - -Route110_TrickHousePuzzle6_Text_26E048: @ 826E048 - .string "You don’t seem to be affected at all.\n" - .string "Or do you have your poker face on?$" - diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc deleted file mode 100644 index fdf734423..000000000 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ /dev/null @@ -1,411 +0,0 @@ -Route110_TrickHousePuzzle7_MapScripts:: @ 826E091 - map_script 5, Route110_TrickHousePuzzle7_MapScript1_26E0A6 - map_script 3, Route110_TrickHousePuzzle7_MapScript1_26E198 - map_script 1, Route110_TrickHousePuzzle7_MapScript1_26E1B4 - map_script 2, Route110_TrickHousePuzzle7_MapScript2_26E1C0 - .byte 0 - -Route110_TrickHousePuzzle7_MapScript1_26E0A6: @ 826E0A6 - call Route110_TrickHousePuzzle7_EventScript_26E0AC - end - -Route110_TrickHousePuzzle7_EventScript_26E0AC:: @ 826E0AC - checkflag FLAG_0x0C2 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E0DA - checkflag FLAG_0x0C3 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E0ED - checkflag FLAG_0x0C4 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E100 - checkflag FLAG_0x0C5 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E113 - checkflag FLAG_0x0C6 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E126 - return - -Route110_TrickHousePuzzle7_EventScript_26E0DA:: @ 826E0DA - setmetatile 13, 17, 610, 0 - setmetatile 12, 16, 575, 1 - return - -Route110_TrickHousePuzzle7_EventScript_26E0ED:: @ 826E0ED - setmetatile 12, 13, 610, 0 - setmetatile 12, 11, 575, 1 - return - -Route110_TrickHousePuzzle7_EventScript_26E100:: @ 826E100 - setmetatile 7, 12, 610, 0 - setmetatile 5, 10, 575, 1 - return - -Route110_TrickHousePuzzle7_EventScript_26E113:: @ 826E113 - setmetatile 6, 6, 636, 0 - setmetatile 4, 4, 575, 1 - return - -Route110_TrickHousePuzzle7_EventScript_26E126:: @ 826E126 - setmetatile 8, 4, 609, 0 - setmetatile 7, 5, 575, 1 - return - -Route110_TrickHousePuzzle7_EventScript_26E139:: @ 826E139 - setmetatile 13, 17, 611, 0 - setmetatile 12, 16, 574, 1 - return - -Route110_TrickHousePuzzle7_EventScript_26E14C:: @ 826E14C - setmetatile 12, 13, 609, 0 - setmetatile 12, 11, 574, 1 - return - -Route110_TrickHousePuzzle7_EventScript_26E15F:: @ 826E15F - setmetatile 7, 12, 611, 0 - setmetatile 5, 10, 574, 1 - return - -Route110_TrickHousePuzzle7_EventScript_26E172:: @ 826E172 - setmetatile 6, 6, 635, 0 - setmetatile 4, 4, 574, 1 - return - -Route110_TrickHousePuzzle7_EventScript_26E185:: @ 826E185 - setmetatile 8, 4, 608, 0 - setmetatile 7, 5, 574, 1 - return - -Route110_TrickHousePuzzle7_MapScript1_26E198: @ 826E198 - compare VAR_0x40B6, 1 - goto_eq Route110_TrickHousePuzzle7_EventScript_26E1B3 - clearflag FLAG_0x0C2 - clearflag FLAG_0x0C3 - clearflag FLAG_0x0C4 - clearflag FLAG_0x0C5 - clearflag FLAG_0x0C6 - end - -Route110_TrickHousePuzzle7_EventScript_26E1B3:: @ 826E1B3 - end - -Route110_TrickHousePuzzle7_MapScript1_26E1B4: @ 826E1B4 - compare VAR_0x40B6, 1 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E0AC - end - -Route110_TrickHousePuzzle7_MapScript2_26E1C0: @ 826E1C0 - map_script_2 VAR_0x40B6, 1, Route110_TrickHousePuzzle7_EventScript_26E1CA - .2byte 0 - -Route110_TrickHousePuzzle7_EventScript_26E1CA:: @ 826E1CA - setvar VAR_0x40B6, 0 - end - -Route110_TrickHousePuzzle7_EventScript_26E1D0:: @ 826E1D0 - lockall - compare VAR_0x40B1, 0 - goto_eq Route110_TrickHousePuzzle7_EventScript_26E1E2 - goto Route110_TrickHousePuzzle7_EventScript_26A3DB - end - -Route110_TrickHousePuzzle7_EventScript_26E1E2:: @ 826E1E2 - setvar VAR_0x40B1, 1 - goto Route110_TrickHousePuzzle7_EventScript_26A3E5 - end - -Route110_TrickHousePuzzle7_EventScript_26E1ED:: @ 826E1ED - lockall - setvar VAR_0x40B6, 1 - warpteleport MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 3, 19 - waitstate - releaseall - end - -Route110_TrickHousePuzzle7_EventScript_26E1FE:: @ 826E1FE - lockall - delay 32 - checkflag FLAG_0x0C2 - call_if 0, Route110_TrickHousePuzzle7_EventScript_26E0DA - checkflag FLAG_0x0C2 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E139 - special DrawWholeMapView - playse SE_TK_KASYA - checkflag FLAG_0x0C2 - goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E2E9 - checkflag FLAG_0x0C2 - goto_eq Route110_TrickHousePuzzle7_EventScript_26E2EE - end - -Route110_TrickHousePuzzle7_EventScript_26E22D:: @ 826E22D - lockall - delay 32 - checkflag FLAG_0x0C3 - call_if 0, Route110_TrickHousePuzzle7_EventScript_26E0ED - checkflag FLAG_0x0C3 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E14C - special DrawWholeMapView - playse SE_TK_KASYA - checkflag FLAG_0x0C3 - goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E2F3 - checkflag FLAG_0x0C3 - goto_eq Route110_TrickHousePuzzle7_EventScript_26E2F8 - end - -Route110_TrickHousePuzzle7_EventScript_26E25C:: @ 826E25C - lockall - delay 32 - checkflag FLAG_0x0C4 - call_if 0, Route110_TrickHousePuzzle7_EventScript_26E100 - checkflag FLAG_0x0C4 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E15F - special DrawWholeMapView - playse SE_TK_KASYA - checkflag FLAG_0x0C4 - goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E2FD - checkflag FLAG_0x0C4 - goto_eq Route110_TrickHousePuzzle7_EventScript_26E302 - end - -Route110_TrickHousePuzzle7_EventScript_26E28B:: @ 826E28B - lockall - delay 32 - checkflag FLAG_0x0C5 - call_if 0, Route110_TrickHousePuzzle7_EventScript_26E113 - checkflag FLAG_0x0C5 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E172 - special DrawWholeMapView - playse SE_TK_KASYA - checkflag FLAG_0x0C5 - goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E307 - checkflag FLAG_0x0C5 - goto_eq Route110_TrickHousePuzzle7_EventScript_26E30C - end - -Route110_TrickHousePuzzle7_EventScript_26E2BA:: @ 826E2BA - lockall - delay 32 - checkflag FLAG_0x0C6 - call_if 0, Route110_TrickHousePuzzle7_EventScript_26E126 - checkflag FLAG_0x0C6 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E185 - special DrawWholeMapView - playse SE_TK_KASYA - checkflag FLAG_0x0C6 - goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E311 - checkflag FLAG_0x0C6 - goto_eq Route110_TrickHousePuzzle7_EventScript_26E316 - end - -Route110_TrickHousePuzzle7_EventScript_26E2E9:: @ 826E2E9 - setflag FLAG_0x0C2 - releaseall - end - -Route110_TrickHousePuzzle7_EventScript_26E2EE:: @ 826E2EE - clearflag FLAG_0x0C2 - releaseall - end - -Route110_TrickHousePuzzle7_EventScript_26E2F3:: @ 826E2F3 - setflag FLAG_0x0C3 - releaseall - end - -Route110_TrickHousePuzzle7_EventScript_26E2F8:: @ 826E2F8 - clearflag FLAG_0x0C3 - releaseall - end - -Route110_TrickHousePuzzle7_EventScript_26E2FD:: @ 826E2FD - setflag FLAG_0x0C4 - releaseall - end - -Route110_TrickHousePuzzle7_EventScript_26E302:: @ 826E302 - clearflag FLAG_0x0C4 - releaseall - end - -Route110_TrickHousePuzzle7_EventScript_26E307:: @ 826E307 - setflag FLAG_0x0C5 - releaseall - end - -Route110_TrickHousePuzzle7_EventScript_26E30C:: @ 826E30C - clearflag FLAG_0x0C5 - releaseall - end - -Route110_TrickHousePuzzle7_EventScript_26E311:: @ 826E311 - setflag FLAG_0x0C6 - releaseall - end - -Route110_TrickHousePuzzle7_EventScript_26E316:: @ 826E316 - clearflag FLAG_0x0C6 - releaseall - end - -Route110_TrickHousePuzzle7_EventScript_26E31B:: @ 826E31B - playse SE_MU_PACHI - waitse - playse SE_TU_SAA - mossdeepgym3 1 - mossdeepgym1 0 - waitmovement 0 - mossdeepgym2 - waitmovement 0 - mossdeepgym4 - end - -Route110_TrickHousePuzzle7_EventScript_26E331:: @ 826E331 - playse SE_MU_PACHI - waitse - playse SE_TU_SAA - mossdeepgym3 1 - mossdeepgym1 1 - waitmovement 0 - mossdeepgym2 - waitmovement 0 - mossdeepgym4 - end - -Route110_TrickHousePuzzle7_EventScript_26E347:: @ 826E347 - playse SE_MU_PACHI - waitse - playse SE_TU_SAA - mossdeepgym3 1 - mossdeepgym1 2 - waitmovement 0 - mossdeepgym2 - waitmovement 0 - mossdeepgym4 - end - -Route110_TrickHousePuzzle7_EventScript_26E35D:: @ 826E35D - playse SE_MU_PACHI - waitse - playse SE_TU_SAA - mossdeepgym3 1 - mossdeepgym1 3 - waitmovement 0 - mossdeepgym2 - waitmovement 0 - mossdeepgym4 - end - -Route110_TrickHousePuzzle7_EventScript_26E373:: @ 826E373 - playse SE_MU_PACHI - waitse - playse SE_TU_SAA - mossdeepgym3 1 - mossdeepgym1 4 - waitmovement 0 - mossdeepgym2 - waitmovement 0 - mossdeepgym4 - end - -Route110_TrickHousePuzzle7_EventScript_26E389:: @ 826E389 - trainerbattle 0, TRAINER_JOSHUA, 0, Route110_TrickHousePuzzle7_Text_26E481, Route110_TrickHousePuzzle7_Text_26E4C1 - msgbox Route110_TrickHousePuzzle7_Text_26E4F4, 6 - end - -Route110_TrickHousePuzzle7_EventScript_26E3A0:: @ 826E3A0 - trainerbattle 0, TRAINER_PATRICIA, 0, Route110_TrickHousePuzzle7_Text_26E531, Route110_TrickHousePuzzle7_Text_26E564 - msgbox Route110_TrickHousePuzzle7_Text_26E57F, 6 - end - -Route110_TrickHousePuzzle7_EventScript_26E3B7:: @ 826E3B7 - trainerbattle 0, TRAINER_ALEXIS, 0, Route110_TrickHousePuzzle7_Text_26E5C0, Route110_TrickHousePuzzle7_Text_26E604 - msgbox Route110_TrickHousePuzzle7_Text_26E61E, 6 - end - -Route110_TrickHousePuzzle7_EventScript_26E3CE:: @ 826E3CE - trainerbattle 0, TRAINER_MARIELA, 0, Route110_TrickHousePuzzle7_Text_26E66B, Route110_TrickHousePuzzle7_Text_26E69C - msgbox Route110_TrickHousePuzzle7_Text_26E6BC, 6 - end - -Route110_TrickHousePuzzle7_EventScript_26E3E5:: @ 826E3E5 - trainerbattle 0, TRAINER_ALVARO, 0, Route110_TrickHousePuzzle7_Text_26E6DA, Route110_TrickHousePuzzle7_Text_26E700 - msgbox Route110_TrickHousePuzzle7_Text_26E722, 6 - end - -Route110_TrickHousePuzzle7_EventScript_26E3FC:: @ 826E3FC - trainerbattle 0, TRAINER_EVERETT, 0, Route110_TrickHousePuzzle7_Text_26E78D, Route110_TrickHousePuzzle7_Text_26E7AB - msgbox Route110_TrickHousePuzzle7_Text_26E7C4, 6 - end - -Route110_TrickHousePuzzle7_EventScript_26E413:: @ 826E413 - .string "{PLAYER} wrote down the secret code\n" - .string "on the door.\p" - .string "“TRICK MASTER is huggable.â€\n" - .string "… … … … … … … …\p" - .string "The lock clicked open!$" - -Route110_TrickHousePuzzle7_Text_26E481: @ 826E481 - .string "The TRICK MASTER always vanishes\n" - .string "like smoke. How does he do it?$" - -Route110_TrickHousePuzzle7_Text_26E4C1: @ 826E4C1 - .string "Aiyeeeh! You’re much too strong!\n" - .string "How do you do it?$" - -Route110_TrickHousePuzzle7_Text_26E4F4: @ 826E4F4 - .string "I wish I could appear and disappear as\n" - .string "if I were smoke, too.$" - -Route110_TrickHousePuzzle7_Text_26E531: @ 826E531 - .string "Going around the same spot…\n" - .string "It begets ill fortune…$" - -Route110_TrickHousePuzzle7_Text_26E564: @ 826E564 - .string "Defeated!\n" - .string "It’s a bad sign…$" - -Route110_TrickHousePuzzle7_Text_26E57F: @ 826E57F - .string "I’ve circled the same spot over ten\n" - .string "times now… It’s ill fortune…$" - -Route110_TrickHousePuzzle7_Text_26E5C0: @ 826E5C0 - .string "Whoever wins will get through here\n" - .string "first. That’s the feeling I get.$" - -Route110_TrickHousePuzzle7_Text_26E604: @ 826E604 - .string "Oh!\n" - .string "Well, go ahead, then!$" - -Route110_TrickHousePuzzle7_Text_26E61E: @ 826E61E - .string "You’re solving all the puzzles in the\n" - .string "TRICK HOUSE. That’s the feeling I get.$" - -Route110_TrickHousePuzzle7_Text_26E66B: @ 826E66B - .string "Nufufufu, here at last!\n" - .string "Let’s get right with it!$" - -Route110_TrickHousePuzzle7_Text_26E69C: @ 826E69C - .string "You’re so casual about winning!$" - -Route110_TrickHousePuzzle7_Text_26E6BC: @ 826E6BC - .string "Humph! I’m not upset!\n" - .string "Not me!$" - -Route110_TrickHousePuzzle7_Text_26E6DA: @ 826E6DA - .string "I ever so closely watched you coming!$" - -Route110_TrickHousePuzzle7_Text_26E700: @ 826E700 - .string "This outcome I didn’t see coming…$" - -Route110_TrickHousePuzzle7_Text_26E722: @ 826E722 - .string "Well, anyway, we both picked a weird\n" - .string "place to get acquainted.\p" - .string "As one weirdo to another,\n" - .string "let’s do our best!$" - -Route110_TrickHousePuzzle7_Text_26E78D: @ 826E78D - .string "It’s awfully cramped in here…$" - -Route110_TrickHousePuzzle7_Text_26E7AB: @ 826E7AB - .string "Oh, yes, strong you are.$" - -Route110_TrickHousePuzzle7_Text_26E7C4: @ 826E7C4 - .string "I was hoping to switch places with you\n" - .string "when I beat you, but…$" - diff --git a/data/scripts/maps/Route110_TrickHousePuzzle8.inc b/data/scripts/maps/Route110_TrickHousePuzzle8.inc deleted file mode 100644 index 369bc59a7..000000000 --- a/data/scripts/maps/Route110_TrickHousePuzzle8.inc +++ /dev/null @@ -1,72 +0,0 @@ -Route110_TrickHousePuzzle8_MapScripts:: @ 826E801 - .byte 0 - -Route110_TrickHousePuzzle8_EventScript_26E802:: @ 826E802 - lockall - compare VAR_0x40B2, 0 - goto_eq Route110_TrickHousePuzzle8_EventScript_26E814 - goto Route110_TrickHousePuzzle8_EventScript_26A3DB - end - -Route110_TrickHousePuzzle8_EventScript_26E814:: @ 826E814 - setvar VAR_0x40B2, 1 - goto Route110_TrickHousePuzzle8_EventScript_26A3E5 - end - -Route110_TrickHousePuzzle8_EventScript_26E81F:: @ 826E81F - trainerbattle 0, TRAINER_VINCENT, 0, Route110_TrickHousePuzzle8_Text_26E8CD, Route110_TrickHousePuzzle8_Text_26E8F6 - msgbox Route110_TrickHousePuzzle8_Text_26E918, 6 - end - -Route110_TrickHousePuzzle8_EventScript_26E836:: @ 826E836 - trainerbattle 0, TRAINER_KEIRA, 0, Route110_TrickHousePuzzle8_Text_26E954, Route110_TrickHousePuzzle8_Text_26E97F - msgbox Route110_TrickHousePuzzle8_Text_26E99F, 6 - end - -Route110_TrickHousePuzzle8_EventScript_26E84D:: @ 826E84D - trainerbattle 0, TRAINER_LEROY, 0, Route110_TrickHousePuzzle8_Text_26E9D7, Route110_TrickHousePuzzle8_Text_26EA14 - msgbox Route110_TrickHousePuzzle8_Text_26EA3F, 6 - end - -Route110_TrickHousePuzzle8_EventScript_26E864:: @ 826E864 - .string "{PLAYER} wrote down the secret code\n" - .string "on the door.\p" - .string "“TRICK MASTER I love.â€\n" - .string "… … … … … … … …\p" - .string "The lock clicked open!$" - -Route110_TrickHousePuzzle8_Text_26E8CD: @ 826E8CD - .string "Not many TRAINERS have made it\n" - .string "this far.$" - -Route110_TrickHousePuzzle8_Text_26E8F6: @ 826E8F6 - .string "That must mean you’re tough, too…$" - -Route110_TrickHousePuzzle8_Text_26E918: @ 826E918 - .string "You’ve beaten the POKéMON LEAGUE\n" - .string "CHAMPION? That’s too much!$" - -Route110_TrickHousePuzzle8_Text_26E954: @ 826E954 - .string "Consider yourself lucky to be\n" - .string "battling me!$" - -Route110_TrickHousePuzzle8_Text_26E97F: @ 826E97F - .string "This isn’t right!\n" - .string "I can’t lose!$" - -Route110_TrickHousePuzzle8_Text_26E99F: @ 826E99F - .string "It’s a miracle that you beat me.\n" - .string "You can brag about it.$" - -Route110_TrickHousePuzzle8_Text_26E9D7: @ 826E9D7 - .string "You’ve been slugging through the TRICK\n" - .string "HOUSE challenge, too.$" - -Route110_TrickHousePuzzle8_Text_26EA14: @ 826EA14 - .string "I see…\n" - .string "You possess an extraordinary style.$" - -Route110_TrickHousePuzzle8_Text_26EA3F: @ 826EA3F - .string "Seeing someone like you should please\n" - .string "the TRICK MASTER.$" - diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc deleted file mode 100644 index fcbf32c91..000000000 --- a/data/scripts/maps/Route111.inc +++ /dev/null @@ -1,756 +0,0 @@ -Route111_MapScripts:: @ 81F0CA7 - map_script 1, Route111_MapScript1_1F0CBC - map_script 3, Route111_MapScript1_1F0D87 - map_script 4, Route111_MapScript2_1F0E46 - map_script 2, Route111_MapScript2_1F0E56 - .byte 0 - -Route111_MapScript1_1F0CBC: @ 81F0CBC - checkflag FLAG_0x0E4 - call_if 0, Route111_EventScript_1F0CD1 - compare VAR_0x40CB, 1 - call_if 1, Route111_EventScript_1F0CE4 - end - -Route111_EventScript_1F0CD1:: @ 81F0CD1 - setmetatile 29, 86, 124, 1 - setmetatile 29, 87, 145, 1 - return - -Route111_EventScript_1F0CE4:: @ 81F0CE4 - setmetatile 18, 53, 984, 0 - setmetatile 19, 53, 985, 0 - setmetatile 20, 53, 986, 0 - setmetatile 18, 54, 992, 0 - setmetatile 19, 54, 993, 0 - setmetatile 20, 54, 994, 0 - setmetatile 18, 55, 1000, 0 - setmetatile 19, 55, 1001, 0 - setmetatile 20, 55, 1002, 0 - setmetatile 18, 56, 1008, 0 - setmetatile 19, 56, 1009, 0 - setmetatile 20, 56, 1010, 0 - setmetatile 18, 57, 987, 0 - setmetatile 19, 57, 988, 0 - setmetatile 20, 57, 989, 0 - setmetatile 18, 58, 995, 0 - setmetatile 19, 58, 996, 0 - setmetatile 20, 58, 997, 0 - return - -Route111_MapScript1_1F0D87: @ 81F0D87 - setvar VAR_0x40D6, 0 - special sub_81BE79C - checkflag FLAG_0x14E - call_if 0, Route111_EventScript_1F0E3C - compare VAR_0x40CB, 1 - call_if 1, Route111_EventScript_1F0DC2 - compare VAR_0x40CB, 2 - call_if 1, Route111_EventScript_1F0E40 - call Route111_EventScript_1F0DE6 - call Route111_EventScript_28CCC7 - checktrainerflag TRAINER_VICKY - goto_if 0, Route111_EventScript_1F0E26 - end - -Route111_EventScript_1F0DC2:: @ 81F0DC2 - checkplayergender - compare VAR_RESULT, 0 - goto_eq Route111_EventScript_1F0DDA - compare VAR_RESULT, 1 - goto_eq Route111_EventScript_1F0DE0 - return - -Route111_EventScript_1F0DDA:: @ 81F0DDA - setvar VAR_OBJ_GFX_ID_0, 100 - return - -Route111_EventScript_1F0DE0:: @ 81F0DE0 - setvar VAR_OBJ_GFX_ID_0, 105 - return - -Route111_EventScript_1F0DE6:: @ 81F0DE6 - getplayerxy VAR_TEMP_0, VAR_TEMP_1 - compare VAR_TEMP_1, 34 - goto_if 0, Route111_EventScript_1F0E25 - compare VAR_TEMP_1, 107 - goto_if 2, Route111_EventScript_1F0E25 - compare VAR_TEMP_1, 72 - goto_if 2, Route111_EventScript_1F0E22 - compare VAR_TEMP_0, 2000 - goto_if 2, Route111_EventScript_1F0E25 - compare VAR_TEMP_0, 8 - goto_if 0, Route111_EventScript_1F0E25 - -Route111_EventScript_1F0E22:: @ 81F0E22 - setweather 8 - -Route111_EventScript_1F0E25:: @ 81F0E25 - return - -Route111_EventScript_1F0E26:: @ 81F0E26 - clearflag FLAG_0x300 - setflag FLAG_0x301 - setflag FLAG_0x302 - setflag FLAG_0x303 - cleartrainerflag TRAINER_VICTOR - cleartrainerflag TRAINER_VICTORIA - cleartrainerflag TRAINER_VIVI - end - -Route111_EventScript_1F0E3C:: @ 81F0E3C - setmaplayoutindex 392 - return - -Route111_EventScript_1F0E40:: @ 81F0E40 - setvar VAR_0x40CB, 3 - return - -Route111_MapScript2_1F0E46: @ 81F0E46 - map_script_2 VAR_0x40CB, 1, Route111_EventScript_1F0E50 - .2byte 0 - -Route111_EventScript_1F0E50:: @ 81F0E50 - hideobjectat 255, MAP_LITTLEROOT_TOWN - end - -Route111_MapScript2_1F0E56: @ 81F0E56 - map_script_2 VAR_0x40CB, 1, Route111_EventScript_1F0E60 - .2byte 0 - -Route111_EventScript_1F0E60:: @ 81F0E60 - lockall - special sub_81BEB68 - waitstate - delay 24 - playse SE_RU_HYUU - addobject 45 - special sub_81BE7F4 - waitstate - showobjectat 255, MAP_LITTLEROOT_TOWN - removeobject 45 - delay 16 - turnobject 255, 2 - delay 16 - special sub_81BEB54 - waitstate - special sub_81BEB7C - waitstate - setvar VAR_0x40CB, 2 - clearflag FLAG_0x36A - checkflag FLAG_0x150 - goto_eq Route111_EventScript_1F0EA7 - msgbox Route111_Text_1F1C74, 4 - releaseall - end - -Route111_EventScript_1F0EA7:: @ 81F0EA7 - msgbox Route111_Text_1F1C9F, 4 - releaseall - end - -Route111_Movement_1F0EB1:: @ 81F0EB1 - 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 - lock - faceplayer - dodailyevents - checkflag FLAG_0x92C - goto_eq Route111_EventScript_1F0EF4 - msgbox Route111_Text_2A6EBD, 4 - giveitem_std ITEM_RAZZ_BERRY - compare VAR_RESULT, 0 - goto_eq Route111_EventScript_272054 - setflag FLAG_0x92C - special GetPlayerBigGuyGirlString - msgbox Route111_Text_2A6F3D, 4 - release - end - -Route111_EventScript_1F0EF4:: @ 81F0EF4 - msgbox Route111_Text_2A6F9A, 4 - release - end - -Route111_EventScript_1F0EFE:: @ 81F0EFE - lockall - setvar VAR_0x8004, 0 - goto Route111_EventScript_1F0F2E - end - -Route111_EventScript_1F0F0A:: @ 81F0F0A - lockall - setvar VAR_0x8004, 1 - goto Route111_EventScript_1F0F2E - end - -Route111_EventScript_1F0F16:: @ 81F0F16 - lockall - setvar VAR_0x8004, 2 - goto Route111_EventScript_1F0F2E - end - -Route111_EventScript_1F0F22:: @ 81F0F22 - lockall - setvar VAR_0x8004, 3 - goto Route111_EventScript_1F0F2E - end - -Route111_EventScript_1F0F2E:: @ 81F0F2E - checkitem ITEM_GO_GOGGLES, 1 - compare VAR_RESULT, 0 - goto_eq Route111_EventScript_1F0F45 - setvar VAR_TEMP_3, 1 - releaseall - end - -Route111_EventScript_1F0F45:: @ 81F0F45 - msgbox gUnknown_08272C5F, 4 - closemessage - compare VAR_0x8004, 0 - call_if 1, Route111_EventScript_1F0F7C - compare VAR_0x8004, 1 - call_if 1, Route111_EventScript_1F0F87 - compare VAR_0x8004, 2 - call_if 1, Route111_EventScript_1F0F92 - compare VAR_0x8004, 3 - call_if 1, Route111_EventScript_1F0F9D - releaseall - end - -Route111_EventScript_1F0F7C:: @ 81F0F7C - applymovement 255, Route111_Movement_1F0FA8 - waitmovement 0 - return - -Route111_EventScript_1F0F87:: @ 81F0F87 - applymovement 255, Route111_Movement_1F0FAA - waitmovement 0 - return - -Route111_EventScript_1F0F92:: @ 81F0F92 - applymovement 255, Route111_Movement_1F0FAC - waitmovement 0 - return - -Route111_EventScript_1F0F9D:: @ 81F0F9D - applymovement 255, Route111_Movement_1F0FAE - waitmovement 0 - return - -Route111_Movement_1F0FA8: @ 81F0FA8 - walk_up - step_end - -Route111_Movement_1F0FAA: @ 81F0FAA - walk_down - step_end - -Route111_Movement_1F0FAC: @ 81F0FAC - walk_left - step_end - -Route111_Movement_1F0FAE: @ 81F0FAE - walk_right - step_end - -Route111_EventScript_1F0FB0:: @ 81F0FB0 - setweather 2 - fadenewbgm MUS_DOORO_X1 - doweather - setvar VAR_TEMP_3, 0 - end - -Route111_EventScript_1F0FBD:: @ 81F0FBD - setweather 8 - fadenewbgm MUS_ASHROAD - doweather - end - -Route111_EventScript_1F0FC5:: @ 81F0FC5 - lock - faceplayer - setflag FLAG_LANDMARK_WINSTRATE_FAMILY - msgbox Route111_Text_1F1475, 5 - compare VAR_RESULT, 1 - goto_eq Route111_EventScript_1F0FE7 - msgbox Route111_Text_1F14F5, 4 - release - end - -Route111_EventScript_1F0FE7:: @ 81F0FE7 - msgbox Route111_Text_1F1523, 4 - trainerbattle 3, TRAINER_VICTOR, 0, Route111_Text_1F1542 - applymovement 1, Route111_Movement_2725A6 - waitmovement 0 - call Route111_EventScript_1F113C - msgbox Route111_Text_1F156F, 4 - closemessage - applymovement 1, Route111_Movement_1F114A - waitmovement 0 - removeobject 1 - call Route111_EventScript_1F1143 - applymovement 255, Route111_Movement_1F114F - waitmovement 0 - call Route111_EventScript_1F113C - addobject 2 - applymovement 2, Route111_Movement_1F114D - waitmovement 0 - call Route111_EventScript_1F1143 - msgbox Route111_Text_1F159D, 4 - trainerbattle 3, TRAINER_VICTORIA, 0, Route111_Text_1F1616 - applymovement 2, Route111_Movement_2725A6 - waitmovement 0 - call Route111_EventScript_1F113C - msgbox Route111_Text_1F1645, 4 - closemessage - applymovement 2, Route111_Movement_1F114A - waitmovement 0 - removeobject 2 - call Route111_EventScript_1F1143 - applymovement 255, Route111_Movement_1F114F - waitmovement 0 - call Route111_EventScript_1F113C - addobject 3 - applymovement 3, Route111_Movement_1F114D - waitmovement 0 - call Route111_EventScript_1F1143 - msgbox Route111_Text_1F167E, 4 - trainerbattle 3, TRAINER_VIVI, 0, Route111_Text_1F16C6 - applymovement 3, Route111_Movement_2725A6 - waitmovement 0 - call Route111_EventScript_1F113C - msgbox Route111_Text_1F16DC, 4 - closemessage - applymovement 3, Route111_Movement_1F114A - waitmovement 0 - removeobject 3 - call Route111_EventScript_1F1143 - applymovement 255, Route111_Movement_1F114F - waitmovement 0 - call Route111_EventScript_1F113C - addobject 4 - applymovement 4, Route111_Movement_1F114D - waitmovement 0 - call Route111_EventScript_1F1143 - msgbox Route111_Text_1F16FB, 4 - trainerbattle 3, TRAINER_VICKY, 0, Route111_Text_1F1756 - msgbox Route111_Text_1F1788, 4 - closemessage - applymovement 4, Route111_Movement_2725A6 - waitmovement 0 - call Route111_EventScript_1F113C - applymovement 4, Route111_Movement_1F114A - waitmovement 0 - removeobject 4 - call Route111_EventScript_1F1143 - release - end - -Route111_EventScript_1F113C:: @ 81F113C - opendoor 13, 113 - waitdooranim - return - -Route111_EventScript_1F1143:: @ 81F1143 - closedoor 13, 113 - waitdooranim - return - -Route111_Movement_1F114A: @ 81F114A - walk_in_place_fastest_up - walk_up - step_end - -Route111_Movement_1F114D: @ 81F114D - walk_down - step_end - -Route111_Movement_1F114F: @ 81F114F - delay_16 - delay_16 - delay_16 - step_end - -Route111_EventScript_1F1153:: @ 81F1153 - msgbox Route111_Text_1F18CE, 3 - end - -Route111_EventScript_1F115C:: @ 81F115C - msgbox Route111_Text_1F18E8, 3 - end - -Route111_EventScript_1F1165:: @ 81F1165 - msgbox Route111_Text_1F1921, 3 - end - -Route111_EventScript_1F116E:: @ 81F116E - msgbox Route111_Text_1F1937, 3 - end - -Route111_EventScript_1F1177:: @ 81F1177 - msgbox Route111_Text_1F194D, 3 - end - -Route111_EventScript_1F1180:: @ 81F1180 - msgbox Route111_Text_1F1987, 3 - end - -Route111_EventScript_1F1189:: @ 81F1189 - msgbox Route111_Text_1F17BA, 2 - end - -Route111_EventScript_1F1192:: @ 81F1192 - msgbox Route111_Text_1F186E, 2 - end - -Route111_EventScript_1F119B:: @ 81F119B - lock - faceplayer - compare VAR_0x40CB, 3 - goto_eq Route111_EventScript_1F11C6 - compare VAR_0x40CB, 2 - goto_eq Route111_EventScript_1F11D0 - checkflag FLAG_0x14E - goto_eq Route111_EventScript_1F11DA - msgbox Route111_Text_1F1A22, 4 - release - end - -Route111_EventScript_1F11C6:: @ 81F11C6 - msgbox Route111_Text_1F1C12, 4 - release - end - -Route111_EventScript_1F11D0:: @ 81F11D0 - msgbox Route111_Text_1F1B92, 4 - release - end - -Route111_EventScript_1F11DA:: @ 81F11DA - msgbox Route111_Text_1F1AC7, 4 - release - end - -Route111_EventScript_1F11E4:: @ 81F11E4 - lockall - applymovement 46, Route111_Movement_27259E - waitmovement 0 - msgbox Route111_Text_1F1CCA, 4 - closemessage - applymovement 46, Route111_Movement_2725A2 - waitmovement 0 - releaseall - end - -Route111_EventScript_1F1204:: @ 81F1204 - trainerbattle 0, TRAINER_DREW, 0, Route111_Text_29878E, Route111_Text_29880A - msgbox Route111_Text_298853, 6 - end - -Route111_EventScript_1F121B:: @ 81F121B - trainerbattle 0, TRAINER_HEIDI, 0, Route111_Text_2988A3, Route111_Text_298908 - msgbox Route111_Text_29891B, 6 - end - -Route111_EventScript_1F1232:: @ 81F1232 - trainerbattle 0, TRAINER_BEAU, 0, Route111_Text_29898E, Route111_Text_2989E6 - msgbox Route111_Text_298A03, 6 - end - -Route111_EventScript_1F1249:: @ 81F1249 - trainerbattle 0, TRAINER_BECKY, 0, Route111_Text_298A65, Route111_Text_298AAF - msgbox Route111_Text_298AC0, 6 - end - -Route111_EventScript_1F1260:: @ 81F1260 - trainerbattle 2, TRAINER_DUSTY_1, 0, Route111_Text_298B08, Route111_Text_298B53, Route111_EventScript_1F128C - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route111_EventScript_1F12AB - msgbox Route111_Text_298B9A, 4 - release - end - -Route111_EventScript_1F128C:: @ 81F128C - special sub_80B4808 - waitmovement 0 - msgbox Route111_Text_298C00, 4 - setvar VAR_0x8004, 44 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 44 - callstd 8 - release - end - -Route111_EventScript_1F12AB:: @ 81F12AB - trainerbattle 5, TRAINER_DUSTY_1, 0, Route111_Text_298C5F, Route111_Text_298CD2 - msgbox Route111_Text_298D0C, 6 - end - -Route111_EventScript_1F12C2:: @ 81F12C2 - trainerbattle 0, TRAINER_TRAVIS, 0, Route111_Text_298DA9, Route111_Text_298DD8 - msgbox Route111_Text_298DF1, 6 - end - -Route111_EventScript_1F12D9:: @ 81F12D9 - trainerbattle 0, TRAINER_IRENE, 0, Route111_Text_298E2F, Route111_Text_298E6E - msgbox Route111_Text_298E8C, 6 - end - -Route111_EventScript_1F12F0:: @ 81F12F0 - trainerbattle 0, TRAINER_DAISUKE, 0, Route111_Text_298EE6, Route111_Text_298F14 - msgbox Route111_Text_298F26, 6 - end - -Route111_EventScript_1F1307:: @ 81F1307 - trainerbattle 2, TRAINER_WILTON_1, 0, Route111_Text_298F79, Route111_Text_298FA9, Route111_EventScript_1F1333 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route111_EventScript_1F1352 - msgbox Route111_Text_298FD4, 4 - release - end - -Route111_EventScript_1F1333:: @ 81F1333 - special sub_80B4808 - waitmovement 0 - msgbox Route111_Text_29903D, 4 - setvar VAR_0x8004, 78 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 78 - callstd 8 - release - end - -Route111_EventScript_1F1352:: @ 81F1352 - trainerbattle 5, TRAINER_WILTON_1, 0, Route111_Text_29909B, Route111_Text_2990EE - msgbox Route111_Text_299102, 6 - end - -Route111_EventScript_1F1369:: @ 81F1369 - trainerbattle 2, TRAINER_BROOKE_1, 0, Route111_Text_299143, Route111_Text_299193, Route111_EventScript_1F1395 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route111_EventScript_1F13B4 - msgbox Route111_Text_2991C2, 4 - release - end - -Route111_EventScript_1F1395:: @ 81F1395 - special sub_80B4808 - waitmovement 0 - msgbox Route111_Text_29921D, 4 - setvar VAR_0x8004, 94 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 94 - callstd 8 - release - end - -Route111_EventScript_1F13B4:: @ 81F13B4 - trainerbattle 5, TRAINER_BROOKE_1, 0, Route111_Text_29925D, Route111_Text_2992D6 - msgbox Route111_Text_2992F5, 6 - end - -Route111_EventScript_1F13CB:: @ 81F13CB - trainerbattle 0, TRAINER_HAYDEN, 0, Route111_Text_299682, Route111_Text_2996BE - msgbox Route111_Text_2996C5, 6 - end - -Route111_EventScript_1F13E2:: @ 81F13E2 - trainerbattle 0, TRAINER_BIANCA, 0, Route111_Text_2996FE, Route111_Text_29973D - msgbox Route111_Text_29975D, 6 - end - -Route111_EventScript_1F13F9:: @ 81F13F9 - trainerbattle 0, TRAINER_TYRON, 0, Route111_Text_299524, Route111_Text_299549 - msgbox Route111_Text_299576, 6 - end - -Route111_EventScript_1F1410:: @ 81F1410 - trainerbattle 0, TRAINER_CELINA, 0, Route111_Text_2995F0, Route111_Text_299625 - msgbox Route111_Text_29964B, 6 - end - -Route111_EventScript_1F1427:: @ 81F1427 - trainerbattle 0, TRAINER_CELIA, 0, Route111_Text_29934B, Route111_Text_299384 - msgbox Route111_Text_2993A7, 6 - end - -Route111_EventScript_1F143E:: @ 81F143E - trainerbattle 0, TRAINER_BRYAN, 0, Route111_Text_299401, Route111_Text_299431 - msgbox Route111_Text_29945F, 6 - end - -Route111_EventScript_1F1455:: @ 81F1455 - trainerbattle 0, TRAINER_BRANDEN, 0, Route111_Text_299493, Route111_Text_2994C5 - msgbox Route111_Text_2994FB, 6 - end - -Route111_EventScript_1F146C:: @ 81F146C - msgbox Route111_Text_1F1D61, 3 - end - -Route111_Text_1F1475: @ 81F1475 - .string "Hello! I take it you’re a traveler.\p" - .string "How’s this? What do you say to taking\n" - .string "on our family of four in a series of\l" - .string "POKéMON battles?$" - -Route111_Text_1F14F5: @ 81F14F5 - .string "Is that so?\n" - .string "Drop in, if you change your mind!$" - -Route111_Text_1F1523: @ 81F1523 - .string "That’s the spirit! I like you!$" - -Route111_Text_1F1542: @ 81F1542 - .string "Aiyah!\n" - .string "You’re a lot tougher than I expected!$" - -Route111_Text_1F156F: @ 81F156F - .string "Hey, all!\n" - .string "I’ve found a pretty strong TRAINER!$" - -Route111_Text_1F159D: @ 81F159D - .string "Oh, my goodness! Aren’t you young?\p" - .string "You must be quite the TRAINER to beat\n" - .string "my husband, though.\p" - .string "It’s my turn to battle now!$" - -Route111_Text_1F1616: @ 81F1616 - .string "Oh, gosh!\n" - .string "I can’t get over how strong you are!$" - -Route111_Text_1F1645: @ 81F1645 - .string "There’s a strong TRAINER here!\n" - .string "This one’s really strong!$" - -Route111_Text_1F167E: @ 81F167E - .string "You’re stronger than Mommy? Wow!\p" - .string "But I’m strong, too!\n" - .string "Really! Honestly!$" - -Route111_Text_1F16C6: @ 81F16C6 - .string "Huh? Did I just lose?$" - -Route111_Text_1F16DC: @ 81F16DC - .string "This stinks…\p" - .string "…Snivel… Grandma!$" - -Route111_Text_1F16FB: @ 81F16FB - .string "How dare you make my granddaughter\n" - .string "cry!\p" - .string "For that, I’m going to smack you!\n" - .string "Prepare to lose!$" - -Route111_Text_1F1756: @ 81F1756 - .string "Kwah! You are strong…\n" - .string "My granddaughter was right…$" - -Route111_Text_1F1788: @ 81F1788 - .string "If you’re not in any hurry,\n" - .string "visit with us awhile.$" - -Route111_Text_1F17BA: @ 81F17BA - .string "If you don’t raise your POKéMON some\n" - .string "more, it could be tough to keep winning\l" - .string "up through the ranks.\p" - .string "I’ve heard the POKéMON LEAGUE’s\n" - .string "ELITE FOUR are far stronger than\l" - .string "any GYM LEADER.$" - -Route111_Text_1F186E: @ 81F186E - .string "I challenged the WINSTRATE family,\n" - .string "but four matches in a row is tough\l" - .string "going… They destroyed me.$" - -Route111_Text_1F18CE: @ 81F18CE - .string "ROUTE 111\n" - .string "{0x7A} MAUVILLE CITY$" - -Route111_Text_1F18E8: @ 81F18E8 - .string "“Our family’s hearts beat as one!â€\n" - .string "THE WINSTRATE’S HOUSE$" - -Route111_Text_1F1921: @ 81F1921 - .string "ROUTE 111\n" - .string "{0x7B} ROUTE 112$" - -Route111_Text_1F1937: @ 81F1937 - .string "ROUTE 111\n" - .string "{0x7B} ROUTE 113$" - -Route111_Text_1F194D: @ 81F194D - .string "OLD LADY’S REST STOP\n" - .string "“Come in and rest your tired bones.â€$" - -Route111_Text_1F1987: @ 81F1987 - .string "TRAINER TIPS\p" - .string "One of the indicators of a POKéMON’s\n" - .string "powerfulness is SP. ATK. It stands for\l" - .string "“SPECIAL ATTACK.â€\p" - .string "Likewise, SP. DEF stands for “SPECIAL\n" - .string "DEFENSE.â€$" - -Route111_Text_1F1A22: @ 81F1A22 - .string "There should be a tower made of sand\n" - .string "around here somewhere.\p" - .string "But for some reason, it can be seen\n" - .string "sometimes, and sometimes not.\p" - .string "That’s why I call it the MIRAGE TOWER.$" - -Route111_Text_1F1AC7: @ 81F1AC7 - .string "I see it!\n" - .string "The tower of sand!\p" - .string "The sand tower they called a mirage\n" - .string "is clearly visible!\p" - .string "But it looks so fragile…\n" - .string "It could crumble away anytime…\p" - .string "I want to go inside it, but I can’t\n" - .string "get my courage up for it…$" - -Route111_Text_1F1B92: @ 81F1B92 - .string "Whoa…\n" - .string "That was shocking.\p" - .string "Sand rained down in chunks all of\n" - .string "a sudden.\p" - .string "What was it like inside?\n" - .string "Were there sandy ghosts and such?$" - -Route111_Text_1F1C12: @ 81F1C12 - .string "Since I spoke to you, the tower of sand\n" - .string "hasn’t been seen.\p" - .string "Perhaps it really was\n" - .string "the MIRAGE TOWER…$" - -Route111_Text_1F1C74: @ 81F1C74 - .string "The CLAW FOSSIL disappeared into\n" - .string "the sand…$" - -Route111_Text_1F1C9F: @ 81F1C9F - .string "The ROOT FOSSIL disappeared into\n" - .string "the sand…$" - -Route111_Text_1F1CCA: @ 81F1CCA - .string "Oh, no!\p" - .string "My uncle in MAUVILLE told me to take\n" - .string "ROCK SMASH with me if I was going to\l" - .string "ROUTE 111!\p" - .string "My uncle? He lives across from\n" - .string "the bike shop in MAUVILLE.$" - -Route111_Text_1F1D61: @ 81F1D61 - .string "{0x7C} TRAINER HILL ENTRANCE\p" - .string "“Scale the heights, you hot-blooded\n" - .string "TRAINERS!â€$" - diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/scripts/maps/Route111_OldLadysRestStop.inc deleted file mode 100644 index 015a584f4..000000000 --- a/data/scripts/maps/Route111_OldLadysRestStop.inc +++ /dev/null @@ -1,54 +0,0 @@ -Route111_OldLadysRestStop_MapScripts:: @ 822A916 - map_script 3, Route111_OldLadysRestStop_MapScript1_22A91C - .byte 0 - -Route111_OldLadysRestStop_MapScript1_22A91C: @ 822A91C - setflag FLAG_LANDMARK_OLD_LADY_REST_SHOP - end - -Route111_OldLadysRestStop_EventScript_22A920:: @ 822A920 - lock - faceplayer - msgbox Route111_OldLadysRestStop_Text_22A978, 5 - compare VAR_RESULT, 1 - goto_eq Route111_OldLadysRestStop_EventScript_22A941 - compare VAR_RESULT, 0 - goto_eq Route111_OldLadysRestStop_EventScript_22A96E - end - -Route111_OldLadysRestStop_EventScript_22A941:: @ 822A941 - msgbox Route111_OldLadysRestStop_Text_22A9EC, 4 - closemessage - call Route111_OldLadysRestStop_EventScript_272083 - msgbox Route111_OldLadysRestStop_Text_22AA16, 5 - compare VAR_RESULT, 1 - goto_eq Route111_OldLadysRestStop_EventScript_22A941 - compare VAR_RESULT, 0 - goto_eq Route111_OldLadysRestStop_EventScript_22A96E - end - -Route111_OldLadysRestStop_EventScript_22A96E:: @ 822A96E - msgbox Route111_OldLadysRestStop_Text_22AA8F, 4 - release - end - -Route111_OldLadysRestStop_Text_22A978: @ 822A978 - .string "Oh, dear, dear.\n" - .string "Aren’t your POKéMON exhausted?\p" - .string "If you’d like, rest up here.\n" - .string "That’s a fine idea! You should do that.$" - -Route111_OldLadysRestStop_Text_22A9EC: @ 822A9EC - .string "That’s right.\n" - .string "Take your time and rest up!$" - -Route111_OldLadysRestStop_Text_22AA16: @ 822AA16 - .string "Oh, dear, dear.\n" - .string "Are your POKéMON still tired?\p" - .string "You should take another rest here.\n" - .string "That’s a fine idea. You should do that.$" - -Route111_OldLadysRestStop_Text_22AA8F: @ 822AA8F - .string "Is that so?\n" - .string "You don’t need to be shy about it.$" - diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc deleted file mode 100644 index 847119d2e..000000000 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ /dev/null @@ -1,105 +0,0 @@ -Route111_WinstrateFamilysHouse_MapScripts:: @ 822A48C - .byte 0 - -Route111_WinstrateFamilysHouse_EventScript_22A48D:: @ 822A48D - lock - faceplayer - setvar VAR_0x8008, 2 - msgbox Route111_WinstrateFamilysHouse_Text_22A539, 4 - goto Route111_WinstrateFamilysHouse_EventScript_22A52C - end - -Route111_WinstrateFamilysHouse_EventScript_22A4A2:: @ 822A4A2 - lock - faceplayer - setvar VAR_0x8008, 3 - checkflag FLAG_0x115 - goto_eq Route111_WinstrateFamilysHouse_EventScript_22A4DA - msgbox Route111_WinstrateFamilysHouse_Text_22A5F4, 4 - giveitem_std ITEM_MACHO_BRACE - compare VAR_RESULT, 0 - goto_eq Route111_WinstrateFamilysHouse_EventScript_272054 - setflag FLAG_0x115 - goto Route111_WinstrateFamilysHouse_EventScript_22A52C - end - -Route111_WinstrateFamilysHouse_EventScript_22A4DA:: @ 822A4DA - msgbox Route111_WinstrateFamilysHouse_Text_22A6B4, 4 - goto Route111_WinstrateFamilysHouse_EventScript_22A52C - end - -Route111_WinstrateFamilysHouse_EventScript_22A4E8:: @ 822A4E8 - lock - faceplayer - setvar VAR_0x8008, 1 - msgbox Route111_WinstrateFamilysHouse_Text_22A6F7, 4 - goto Route111_WinstrateFamilysHouse_EventScript_22A52C - end - -Route111_WinstrateFamilysHouse_EventScript_22A4FD:: @ 822A4FD - lock - faceplayer - setvar VAR_0x8008, 4 - checkflag FLAG_0x004 - goto_eq Route111_WinstrateFamilysHouse_EventScript_22A51E - msgbox Route111_WinstrateFamilysHouse_Text_22A780, 4 - setflag FLAG_0x004 - goto Route111_WinstrateFamilysHouse_EventScript_22A52C - end - -Route111_WinstrateFamilysHouse_EventScript_22A51E:: @ 822A51E - msgbox Route111_WinstrateFamilysHouse_Text_22A89B, 4 - goto Route111_WinstrateFamilysHouse_EventScript_22A52C - end - -Route111_WinstrateFamilysHouse_EventScript_22A52C:: @ 822A52C - closemessage - applymovement VAR_0x8008, Route111_WinstrateFamilysHouse_Movement_2725A2 - waitmovement 0 - release - end - -Route111_WinstrateFamilysHouse_Text_22A539: @ 822A539 - .string "You’re the first TRAINER I’ve seen who\n" - .string "deploys POKéMON so masterfully.\p" - .string "But, I should tell you--my son is\n" - .string "stronger than you.\p" - .string "He even took the POKéMON LEAGUE\n" - .string "challenge, I’ll have you know.$" - -Route111_WinstrateFamilysHouse_Text_22A5F4: @ 822A5F4 - .string "We use this MACHO BRACE to more\n" - .string "effectively strengthen our POKéMON\l" - .string "in training.\p" - .string "Since you’ve beaten all of us here,\n" - .string "I don’t know if you need it, but we\l" - .string "would like you to have our MACHO BRACE.$" - -Route111_WinstrateFamilysHouse_Text_22A6B4: @ 822A6B4 - .string "When it comes to POKéMON battles,\n" - .string "we tend to be pretty passionate.$" - -Route111_WinstrateFamilysHouse_Text_22A6F7: @ 822A6F7 - .string "Mommy is stronger than Daddy.\p" - .string "I’m stronger than Mommy.\p" - .string "And Grandma’s stronger than me!\p" - .string "But my big brother is even stronger\n" - .string "than Grandma.$" - -Route111_WinstrateFamilysHouse_Text_22A780: @ 822A780 - .string "There’s no question that you’re strong.\p" - .string "But if you were to battle my grandson,\n" - .string "you’d end up crying in frustration.\p" - .string "He’s much stronger than any TRAINER\n" - .string "our family knows.\p" - .string "He must be challenging the POKéMON\n" - .string "LEAGUE CHAMPION by now.\p" - .string "Knowing my grandson, he could be the\n" - .string "CHAMPION already!$" - -Route111_WinstrateFamilysHouse_Text_22A89B: @ 822A89B - .string "My grandson must be challenging the\n" - .string "POKéMON LEAGUE CHAMPION by now.\p" - .string "Knowing my grandson, he could be the\n" - .string "CHAMPION already!$" - diff --git a/data/scripts/maps/Route112.inc b/data/scripts/maps/Route112.inc deleted file mode 100644 index 0ad5ee47c..000000000 --- a/data/scripts/maps/Route112.inc +++ /dev/null @@ -1,146 +0,0 @@ -Route112_MapScripts:: @ 81F1DA8 - map_script 3, Route112_MapScript1_1F1DAE - .byte 0 - -Route112_MapScript1_1F1DAE: @ 81F1DAE - clearflag FLAG_0x09D - setvar VAR_0x40BD, 0 - end - -Route112_EventScript_1F1DB7:: @ 81F1DB7 - lockall - delay 40 - applymovement 1, Route112_Movement_2725A8 - waitmovement 0 - delay 20 - msgbox Route112_Text_1F1F3F, 4 - closemessage - applymovement 1, Route112_Movement_2725A2 - waitmovement 0 - delay 40 - applymovement 6, Route112_Movement_2725A4 - waitmovement 0 - delay 20 - msgbox Route112_Text_1F1F7A, 4 - closemessage - applymovement 6, Route112_Movement_2725A2 - waitmovement 0 - delay 40 - applymovement 1, Route112_Movement_2725A8 - waitmovement 0 - delay 20 - msgbox Route112_Text_1F1FBA, 4 - closemessage - applymovement 1, Route112_Movement_2725A2 - waitmovement 0 - delay 40 - applymovement 6, Route112_Movement_2725A4 - waitmovement 0 - delay 20 - msgbox Route112_Text_1F2003, 4 - closemessage - applymovement 6, Route112_Movement_2725A2 - waitmovement 0 - releaseall - end - -Route112_EventScript_1F1E46:: @ 81F1E46 - msgbox Route112_Text_1F20C1, 3 - end - -Route112_EventScript_1F1E4F:: @ 81F1E4F - msgbox Route112_Text_1F20ED, 3 - end - -Route112_EventScript_1F1E58:: @ 81F1E58 - msgbox Route112_Text_1F2138, 3 - end - -Route112_EventScript_1F1E61:: @ 81F1E61 - msgbox Route112_Text_1F204E, 2 - end - -Route112_EventScript_1F1E6A:: @ 81F1E6A - trainerbattle 0, TRAINER_BRICE, 0, Route112_Text_29978E, Route112_Text_2997CA - msgbox Route112_Text_2997DC, 6 - end - -Route112_EventScript_1F1E81:: @ 81F1E81 - trainerbattle 2, TRAINER_TRENT_1, 0, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route112_EventScript_1F1ECC - msgbox Route112_Text_299896, 4 - release - end - -Route112_EventScript_1F1EAD:: @ 81F1EAD - special sub_80B4808 - waitmovement 0 - msgbox Route112_Text_29993C, 4 - setvar VAR_0x8004, 627 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 627 - callstd 8 - release - end - -Route112_EventScript_1F1ECC:: @ 81F1ECC - trainerbattle 5, TRAINER_TRENT_1, 0, Route112_Text_2999BD, Route112_Text_2999F7 - msgbox Route112_Text_299A0F, 6 - end - -Route112_EventScript_1F1EE3:: @ 81F1EE3 - trainerbattle 0, TRAINER_LARRY, 0, Route112_Text_299A89, Route112_Text_299AAC - msgbox Route112_Text_299AB4, 6 - end - -Route112_EventScript_1F1EFA:: @ 81F1EFA - trainerbattle 0, TRAINER_CAROL, 0, Route112_Text_299AE4, Route112_Text_299B36 - msgbox Route112_Text_299B4C, 6 - end - -Route112_EventScript_1F1F11:: @ 81F1F11 - trainerbattle 0, TRAINER_BRYANT, 0, Route112_Text_299BAE, Route112_Text_299BDF - msgbox Route112_Text_299BFB, 6 - end - -Route112_EventScript_1F1F28:: @ 81F1F28 - trainerbattle 0, TRAINER_SHAYLA, 0, Route112_Text_299C34, Route112_Text_299C8F - msgbox Route112_Text_299CC6, 6 - end - -Route112_Text_1F1F3F: @ 81F1F3F - .string "Hey, man, is our leader really going\n" - .string "to awaken that thing?$" - -Route112_Text_1F1F7A: @ 81F1F7A - .string "Sounds like it, yeah. But I heard\n" - .string "we need a METEORITE to do it.$" - -Route112_Text_1F1FBA: @ 81F1FBA - .string "Oh, I get it now. That’s why the rest\n" - .string "of the crew went out to FALLARBOR.$" - -Route112_Text_1F2003: @ 81F2003 - .string "You got it. And until they come back,\n" - .string "we’re not to let anyone pass, right.$" - -Route112_Text_1F204E: @ 81F204E - .string "Eh, I’d like to get to MAUVILLE, but if\n" - .string "I went down these ledges, it’d be no\l" - .string "easy matter to get back to LAVARIDGE.$" - -Route112_Text_1F20C1: @ 81F20C1 - .string "MT. CHIMNEY CABLE CAR\n" - .string "“A short walk {0x79} way!â€$" - -Route112_Text_1F20ED: @ 81F20ED - .string "MT. CHIMNEY\p" - .string "“For LAVARIDGE TOWN or the summit,\n" - .string "please take the CABLE CAR.â€$" - -Route112_Text_1F2138: @ 81F2138 - .string "ROUTE 112\n" - .string "{0x7B} LAVARIDGE TOWN$" - diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc deleted file mode 100644 index 93e8ea759..000000000 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ /dev/null @@ -1,99 +0,0 @@ -Route112_CableCarStation_MapScripts:: @ 822AABE - map_script 3, Route112_CableCarStation_MapScript1_22AAC9 - map_script 2, Route112_CableCarStation_MapScript2_22AAE9 - .byte 0 - -Route112_CableCarStation_MapScript1_22AAC9: @ 822AAC9 - setescapewarp MAP_ROUTE112, 255, 28, 28 - compare VAR_0x40A3, 2 - call_if 1, Route112_CableCarStation_EventScript_22AADD - end - -Route112_CableCarStation_EventScript_22AADD:: @ 822AADD - setobjectxyperm 1, 7, 4 - setobjectmovementtype 1, 9 - return - -Route112_CableCarStation_MapScript2_22AAE9: @ 822AAE9 - map_script_2 VAR_0x40A3, 2, Route112_CableCarStation_EventScript_22AAF3 - .2byte 0 - -Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3 - lockall - applymovement 255, Route112_CableCarStation_Movement_22AB80 - applymovement 1, Route112_CableCarStation_Movement_22AB76 - waitmovement 0 - setvar VAR_0x40A3, 0 - setobjectxyperm 1, 6, 7 - setobjectmovementtype 1, 8 - releaseall - end - -Route112_CableCarStation_EventScript_22AB17:: @ 822AB17 - lock - faceplayer - msgbox Route112_CableCarStation_Text_22AB85, 5 - compare VAR_RESULT, 1 - goto_eq Route112_CableCarStation_EventScript_22AB38 - compare VAR_RESULT, 0 - goto_eq Route112_CableCarStation_EventScript_22AB67 - end - -Route112_CableCarStation_EventScript_22AB38:: @ 822AB38 - msgbox Route112_CableCarStation_Text_22ABC2, 4 - closemessage - applymovement 1, Route112_CableCarStation_Movement_22AB71 - applymovement 255, Route112_CableCarStation_Movement_22AB7B - waitmovement 0 - setvar VAR_0x8004, 0 - setvar VAR_0x40A3, 1 - incrementgamestat 48 - special CableCarWarp - special sub_814FC9C - waitstate - release - end - -Route112_CableCarStation_EventScript_22AB67:: @ 822AB67 - msgbox Route112_CableCarStation_Text_22ABD8, 4 - release - end - -Route112_CableCarStation_Movement_22AB71: @ 822AB71 - walk_up - walk_up - walk_right - walk_in_place_fastest_left - step_end - -Route112_CableCarStation_Movement_22AB76: @ 822AB76 - delay_16 - walk_left - walk_down - walk_down - step_end - -Route112_CableCarStation_Movement_22AB7B: @ 822AB7B - walk_up - walk_up - walk_up - delay_16 - step_end - -Route112_CableCarStation_Movement_22AB80: @ 822AB80 - walk_down - walk_down - walk_down - delay_16 - step_end - -Route112_CableCarStation_Text_22AB85: @ 822AB85 - .string "The CABLE CAR is ready to go up.\n" - .string "Would you like to be on it?$" - -Route112_CableCarStation_Text_22ABC2: @ 822ABC2 - .string "Please step this way.$" - -Route112_CableCarStation_Text_22ABD8: @ 822ABD8 - .string "Please ride with us another time.$" - diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc deleted file mode 100644 index 63dc6c47f..000000000 --- a/data/scripts/maps/Route113.inc +++ /dev/null @@ -1,176 +0,0 @@ -Route113_MapScripts:: @ 81F2153 - map_script 5, Route113_MapScript1_1F215E - map_script 3, Route113_MapScript1_1F2161 - .byte 0 - -Route113_MapScript1_1F215E: @ 81F215E - setstepcallback 1 - end - -Route113_MapScript1_1F2161: @ 81F2161 - clearflag FLAG_0x09D - call Route113_EventScript_1F216A - end - -Route113_EventScript_1F216A:: @ 81F216A - getplayerxy VAR_TEMP_0, VAR_TEMP_1 - compare VAR_TEMP_0, 19 - goto_if 0, Route113_EventScript_1F2189 - compare VAR_TEMP_0, 84 - goto_if 2, Route113_EventScript_1F2189 - setweather 7 - return - -Route113_EventScript_1F2189:: @ 81F2189 - return - -Route113_EventScript_1F218A:: @ 81F218A - msgbox Route113_Text_1F235B, 2 - end - -Route113_EventScript_1F2193:: @ 81F2193 - msgbox Route113_Text_1F23CA, 2 - end - -Route113_EventScript_1F219C:: @ 81F219C - msgbox Route113_Text_1F2440, 3 - end - -Route113_EventScript_1F21A5:: @ 81F21A5 - msgbox Route113_Text_1F2456, 3 - end - -Route113_EventScript_1F21AE:: @ 81F21AE - msgbox Route113_Text_1F24F8, 3 - end - -Route113_EventScript_1F21B7:: @ 81F21B7 - msgbox Route113_Text_1F2471, 3 - end - -Route113_EventScript_1F21C0:: @ 81F21C0 - trainerbattle 0, TRAINER_JAYLEN, 0, Route113_Text_299D3C, Route113_Text_299D68 - msgbox Route113_Text_299D7D, 6 - end - -Route113_EventScript_1F21D7:: @ 81F21D7 - trainerbattle 0, TRAINER_DILLON, 0, Route113_Text_299DE3, Route113_Text_299E1C - msgbox Route113_Text_299E38, 6 - end - -Route113_EventScript_1F21EE:: @ 81F21EE - trainerbattle 2, TRAINER_MADELINE_1, 0, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route113_EventScript_1F2239 - msgbox Route113_Text_299F15, 4 - release - end - -Route113_EventScript_1F221A:: @ 81F221A - special sub_80B4808 - waitmovement 0 - msgbox Route113_Text_299F49, 4 - setvar VAR_0x8004, 434 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 434 - callstd 8 - release - end - -Route113_EventScript_1F2239:: @ 81F2239 - trainerbattle 5, TRAINER_MADELINE_1, 0, Route113_Text_299F8A, Route113_Text_299FC9 - msgbox Route113_Text_299FD8, 6 - end - -Route113_EventScript_1F2250:: @ 81F2250 - trainerbattle 2, TRAINER_LAO_1, 0, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route113_EventScript_1F229B - msgbox Route113_Text_29A067, 4 - release - end - -Route113_EventScript_1F227C:: @ 81F227C - special sub_80B4808 - waitmovement 0 - msgbox Route113_Text_29A0A2, 4 - setvar VAR_0x8004, 419 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 419 - callstd 8 - release - end - -Route113_EventScript_1F229B:: @ 81F229B - trainerbattle 5, TRAINER_LAO_1, 0, Route113_Text_29A0E8, Route113_Text_29A11F - msgbox Route113_Text_29A13A, 6 - end - -Route113_EventScript_1F22B2:: @ 81F22B2 - trainerbattle 0, TRAINER_LUNG, 0, Route113_Text_29A192, Route113_Text_29A1C6 - msgbox Route113_Text_29A219, 6 - end - -Route113_EventScript_1F22C9:: @ 81F22C9 - trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_29A261, Route113_Text_29A29D, Route113_Text_29A31F - msgbox Route113_Text_29A2DE, 6 - end - -Route113_EventScript_1F22E4:: @ 81F22E4 - trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_29A35C, Route113_Text_29A397, Route113_Text_29A419 - msgbox Route113_Text_29A3DA, 6 - end - -Route113_EventScript_1F22FF:: @ 81F22FF - trainerbattle 0, TRAINER_SOPHIE, 0, Route113_Text_29A4BF, Route113_Text_29A508 - msgbox Route113_Text_29A529, 6 - end - -Route113_EventScript_1F2316:: @ 81F2316 - trainerbattle 0, TRAINER_COBY, 0, Route113_Text_29A453, Route113_Text_29A480 - msgbox Route113_Text_29A489, 6 - end - -Route113_EventScript_1F232D:: @ 81F232D - trainerbattle 0, TRAINER_LAWRENCE, 0, Route113_Text_29A566, Route113_Text_29A5A0 - msgbox Route113_Text_29A5BE, 6 - end - -Route113_EventScript_1F2344:: @ 81F2344 - trainerbattle 0, TRAINER_WYATT, 0, Route113_Text_29A5E4, Route113_Text_29A628 - msgbox Route113_Text_29A65D, 6 - end - -Route113_Text_1F235B: @ 81F235B - .string "Wahahaha! Today’s technology is a\n" - .string "wondrous thing!\p" - .string "Take this volcanic ash here.\n" - .string "It can be fashioned into glass.$" - -Route113_Text_1F23CA: @ 81F23CA - .string "It’s fun walking through the volcano’s\n" - .string "ashes on the ground and grass.\p" - .string "You can see where you walked--it’s\n" - .string "really neat!$" - -Route113_Text_1F2440: @ 81F2440 - .string "ROUTE 113\n" - .string "{0x7C} ROUTE 111$" - -Route113_Text_1F2456: @ 81F2456 - .string "ROUTE 113\n" - .string "{0x7B} FALLARBOR TOWN$" - -Route113_Text_1F2471: @ 81F2471 - .string "TRAINER TIPS\p" - .string "You may register one of the KEY ITEMS\n" - .string "in your BAG as SELECT.\p" - .string "Simply press SELECT to use\n" - .string "the registered item conveniently.$" - -Route113_Text_1F24F8: @ 81F24F8 - .string "GLASS WORKSHOP\n" - .string "“Turning Volcanic Ash into Glass Itemsâ€$" - diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc deleted file mode 100644 index 5ea100567..000000000 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ /dev/null @@ -1,397 +0,0 @@ -Route113_GlassWorkshop_MapScripts:: @ 826ED03 - map_script 3, Route113_GlassWorkshop_MapScript1_26ED09 - .byte 0 - -Route113_GlassWorkshop_MapScript1_26ED09: @ 826ED09 - setflag FLAG_LANDMARK_GLASS_WORKSHOP - compare VAR_0x40BE, 1 - call_if 1, Route113_GlassWorkshop_EventScript_26ED18 - end - -Route113_GlassWorkshop_EventScript_26ED18:: @ 826ED18 - setvar VAR_0x40BE, 2 - return - -Route113_GlassWorkshop_EventScript_26ED1E:: @ 826ED1E - lock - faceplayer - compare VAR_0x40BE, 10 - goto_if 4, Route113_GlassWorkshop_EventScript_26F090 - compare VAR_0x40BE, 2 - goto_eq Route113_GlassWorkshop_EventScript_26ED6E - compare VAR_0x40BE, 1 - goto_eq Route113_GlassWorkshop_EventScript_26ED64 - msgbox Route113_GlassWorkshop_Text_26F19D, 4 - giveitem_std ITEM_SOOT_SACK - setvar VAR_0x40BE, 1 - msgbox Route113_GlassWorkshop_Text_26F252, 4 - release - end - -Route113_GlassWorkshop_EventScript_26ED64:: @ 826ED64 - msgbox Route113_GlassWorkshop_Text_26F252, 4 - release - end - -Route113_GlassWorkshop_EventScript_26ED6E:: @ 826ED6E - checkitem ITEM_SOOT_SACK, 1 - compare VAR_RESULT, 0 - goto_eq Route113_GlassWorkshop_EventScript_26ED9D - msgbox Route113_GlassWorkshop_Text_26F312, 4 - compare VAR_ASH_GATHER_COUNT, 250 - goto_if 0, Route113_GlassWorkshop_EventScript_26EFD6 - message Route113_GlassWorkshop_Text_26F40A - waitmessage - goto Route113_GlassWorkshop_EventScript_26EDA7 - end - -Route113_GlassWorkshop_EventScript_26ED9D:: @ 826ED9D - msgbox Route113_GlassWorkshop_Text_26F772, 4 - release - end - -Route113_GlassWorkshop_EventScript_26EDA7:: @ 826EDA7 - setvar VAR_0x8009, 0 - setvar VAR_0x8004, 1 - special sub_813A128 - waitstate - switch VAR_RESULT - case 0, Route113_GlassWorkshop_EventScript_26EE1E - case 1, Route113_GlassWorkshop_EventScript_26EE5A - case 2, Route113_GlassWorkshop_EventScript_26EE96 - case 3, Route113_GlassWorkshop_EventScript_26EED2 - case 4, Route113_GlassWorkshop_EventScript_26EF0E - case 5, Route113_GlassWorkshop_EventScript_26EF4A - case 6, Route113_GlassWorkshop_EventScript_26EF8B - case 7, Route113_GlassWorkshop_EventScript_26EFCC - case 127, Route113_GlassWorkshop_EventScript_26EFCC - end - -Route113_GlassWorkshop_EventScript_26EE1E:: @ 826EE1E - setvar VAR_0x8008, 39 - bufferitemname 0, VAR_0x8008 - setvar VAR_0x800A, 250 - compare VAR_ASH_GATHER_COUNT, 250 - goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, 5 - compare VAR_RESULT, 0 - goto_eq Route113_GlassWorkshop_EventScript_26F003 - setvar VAR_0x40BE, 10 - subvar VAR_ASH_GATHER_COUNT, 250 - goto Route113_GlassWorkshop_EventScript_26F00F - end - -Route113_GlassWorkshop_EventScript_26EE5A:: @ 826EE5A - setvar VAR_0x8008, 40 - bufferitemname 0, VAR_0x8008 - setvar VAR_0x800A, 500 - compare VAR_ASH_GATHER_COUNT, 500 - goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, 5 - compare VAR_RESULT, 0 - goto_eq Route113_GlassWorkshop_EventScript_26F003 - setvar VAR_0x40BE, 11 - subvar VAR_ASH_GATHER_COUNT, 500 - goto Route113_GlassWorkshop_EventScript_26F00F - end - -Route113_GlassWorkshop_EventScript_26EE96:: @ 826EE96 - setvar VAR_0x8008, 41 - bufferitemname 0, VAR_0x8008 - setvar VAR_0x800A, 500 - compare VAR_ASH_GATHER_COUNT, 500 - goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, 5 - compare VAR_RESULT, 0 - goto_eq Route113_GlassWorkshop_EventScript_26F003 - setvar VAR_0x40BE, 12 - subvar VAR_ASH_GATHER_COUNT, 500 - goto Route113_GlassWorkshop_EventScript_26F00F - end - -Route113_GlassWorkshop_EventScript_26EED2:: @ 826EED2 - setvar VAR_0x8008, 43 - bufferitemname 0, VAR_0x8008 - setvar VAR_0x800A, 1000 - compare VAR_ASH_GATHER_COUNT, 1000 - goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, 5 - compare VAR_RESULT, 0 - goto_eq Route113_GlassWorkshop_EventScript_26F003 - setvar VAR_0x40BE, 13 - subvar VAR_ASH_GATHER_COUNT, 1000 - goto Route113_GlassWorkshop_EventScript_26F00F - end - -Route113_GlassWorkshop_EventScript_26EF0E:: @ 826EF0E - setvar VAR_0x8008, 42 - bufferitemname 0, VAR_0x8008 - setvar VAR_0x800A, 1000 - compare VAR_ASH_GATHER_COUNT, 1000 - goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, 5 - compare VAR_RESULT, 0 - goto_eq Route113_GlassWorkshop_EventScript_26F003 - setvar VAR_0x40BE, 14 - subvar VAR_ASH_GATHER_COUNT, 1000 - goto Route113_GlassWorkshop_EventScript_26F00F - end - -Route113_GlassWorkshop_EventScript_26EF4A:: @ 826EF4A - setvar VAR_0x8009, 1 - setvar VAR_0x8008, 13 - bufferdecorationname 0, VAR_0x8008 - setvar VAR_0x800A, 6000 - compare VAR_ASH_GATHER_COUNT, 6000 - goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, 5 - compare VAR_RESULT, 0 - goto_eq Route113_GlassWorkshop_EventScript_26F003 - setvar VAR_0x40BE, 15 - subvar VAR_ASH_GATHER_COUNT, 6000 - goto Route113_GlassWorkshop_EventScript_26F00F - end - -Route113_GlassWorkshop_EventScript_26EF8B:: @ 826EF8B - setvar VAR_0x8009, 1 - setvar VAR_0x8008, 6 - bufferdecorationname 0, VAR_0x8008 - setvar VAR_0x800A, 8000 - compare VAR_ASH_GATHER_COUNT, 8000 - goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, 5 - compare VAR_RESULT, 0 - goto_eq Route113_GlassWorkshop_EventScript_26F003 - setvar VAR_0x40BE, 16 - subvar VAR_ASH_GATHER_COUNT, 8000 - goto Route113_GlassWorkshop_EventScript_26F00F - end - -Route113_GlassWorkshop_EventScript_26EFCC:: @ 826EFCC - msgbox Route113_GlassWorkshop_Text_26F641, 4 - release - end - -Route113_GlassWorkshop_EventScript_26EFD6:: @ 826EFD6 - setvar VAR_0x800A, 250 - subvar VAR_0x800A, 16456 - buffernumberstring 0, VAR_0x800A - msgbox Route113_GlassWorkshop_Text_26F34E, 4 - release - end - -Route113_GlassWorkshop_EventScript_26EFEE:: @ 826EFEE - subvar VAR_0x800A, 16456 - buffernumberstring 1, VAR_0x800A - message Route113_GlassWorkshop_Text_26F543 - waitmessage - goto Route113_GlassWorkshop_EventScript_26EDA7 - end - -Route113_GlassWorkshop_EventScript_26F003:: @ 826F003 - message Route113_GlassWorkshop_Text_26F4B5 - waitmessage - goto Route113_GlassWorkshop_EventScript_26EDA7 - end - -Route113_GlassWorkshop_EventScript_26F00F:: @ 826F00F - msgbox Route113_GlassWorkshop_Text_26F4DA, 4 - closemessage - fadescreen 1 - playse SE_SELECT - delay 30 - fadescreen 0 - msgbox Route113_GlassWorkshop_Text_26F688, 4 - compare VAR_0x8009, 0 - call_if 1, Route113_GlassWorkshop_EventScript_26F047 - compare VAR_0x8009, 1 - call_if 1, Route113_GlassWorkshop_EventScript_26F05F - setvar VAR_0x40BE, 2 - release - end - -Route113_GlassWorkshop_EventScript_26F047:: @ 826F047 - giveitem_std VAR_0x8008 - compare VAR_RESULT, 0 - goto_eq Route113_GlassWorkshop_EventScript_26F072 - return - -Route113_GlassWorkshop_EventScript_26F05F:: @ 826F05F - givedecoration_std VAR_0x8008 - compare VAR_RESULT, 0 - goto_eq Route113_GlassWorkshop_EventScript_26F081 - return - -Route113_GlassWorkshop_EventScript_26F072:: @ 826F072 - call Route113_GlassWorkshop_EventScript_27205E - msgbox Route113_GlassWorkshop_Text_26F6B7, 4 - release - end - -Route113_GlassWorkshop_EventScript_26F081:: @ 826F081 - call Route113_GlassWorkshop_EventScript_272071 - msgbox Route113_GlassWorkshop_Text_26F715, 4 - release - end - -Route113_GlassWorkshop_EventScript_26F090:: @ 826F090 - switch VAR_0x40BE - case 10, Route113_GlassWorkshop_EventScript_26F0E3 - case 11, Route113_GlassWorkshop_EventScript_26F0F7 - case 12, Route113_GlassWorkshop_EventScript_26F10B - case 13, Route113_GlassWorkshop_EventScript_26F11F - case 14, Route113_GlassWorkshop_EventScript_26F133 - case 15, Route113_GlassWorkshop_EventScript_26F147 - case 16, Route113_GlassWorkshop_EventScript_26F15B - end - -Route113_GlassWorkshop_EventScript_26F0E3:: @ 826F0E3 - setvar VAR_0x8009, 0 - setvar VAR_0x8008, 39 - bufferitemname 0, VAR_0x8008 - goto Route113_GlassWorkshop_EventScript_26F16F - end - -Route113_GlassWorkshop_EventScript_26F0F7:: @ 826F0F7 - setvar VAR_0x8009, 0 - setvar VAR_0x8008, 40 - bufferitemname 0, VAR_0x8008 - goto Route113_GlassWorkshop_EventScript_26F16F - end - -Route113_GlassWorkshop_EventScript_26F10B:: @ 826F10B - setvar VAR_0x8009, 0 - setvar VAR_0x8008, 41 - bufferitemname 0, VAR_0x8008 - goto Route113_GlassWorkshop_EventScript_26F16F - end - -Route113_GlassWorkshop_EventScript_26F11F:: @ 826F11F - setvar VAR_0x8009, 0 - setvar VAR_0x8008, 43 - bufferitemname 0, VAR_0x8008 - goto Route113_GlassWorkshop_EventScript_26F16F - end - -Route113_GlassWorkshop_EventScript_26F133:: @ 826F133 - setvar VAR_0x8009, 0 - setvar VAR_0x8008, 42 - bufferitemname 0, VAR_0x8008 - goto Route113_GlassWorkshop_EventScript_26F16F - end - -Route113_GlassWorkshop_EventScript_26F147:: @ 826F147 - setvar VAR_0x8009, 1 - setvar VAR_0x8008, 13 - bufferdecorationname 0, 13 - goto Route113_GlassWorkshop_EventScript_26F16F - end - -Route113_GlassWorkshop_EventScript_26F15B:: @ 826F15B - setvar VAR_0x8009, 1 - setvar VAR_0x8008, 6 - bufferdecorationname 0, 6 - goto Route113_GlassWorkshop_EventScript_26F16F - end - -Route113_GlassWorkshop_EventScript_26F16F:: @ 826F16F - msgbox Route113_GlassWorkshop_Text_26F688, 4 - compare VAR_0x8009, 0 - call_if 1, Route113_GlassWorkshop_EventScript_26F047 - compare VAR_0x8009, 1 - call_if 1, Route113_GlassWorkshop_EventScript_26F05F - setvar VAR_0x40BE, 2 - release - end - -Route113_GlassWorkshop_EventScript_26F194:: @ 826F194 - msgbox Route113_GlassWorkshop_Text_26F7EC, 2 - end - -Route113_GlassWorkshop_Text_26F19D: @ 826F19D - .string "This area is covered in volcanic ash,\n" - .string "huff-puff!\p" - .string "I’m specially gifted, huff-puff.\p" - .string "I make glass out of volcanic ash\n" - .string "and make items, huff-puff.\p" - .string "Go collect ashes with this, huff-puff.$" - -Route113_GlassWorkshop_Text_26F252: @ 826F252 - .string "Just take that SOOT SACK and walk\n" - .string "through piles of ash, huff-puff.\p" - .string "And it will fill up with the volcanic ash,\n" - .string "huff-puff.\p" - .string "Once you think you’ve collected a good\n" - .string "amount, come see me, huff-puff.$" - -Route113_GlassWorkshop_Text_26F312: @ 826F312 - .string "Have you collected ashes, huff-puff?\n" - .string "Let me see, huff-puff.$" - -Route113_GlassWorkshop_Text_26F34E: @ 826F34E - .string "Hmmm…\n" - .string "There’s not enough ash here, huff-puff.\l" - .string "I can’t make glass with this, huff-puff.\p" - .string "Let’s see… {STR_VAR_1} is the number of steps\n" - .string "you’ll need to walk for me to make you\l" - .string "a BLUE FLUTE, huff-puff.$" - -Route113_GlassWorkshop_Text_26F40A: @ 826F40A - .string "Oh!\n" - .string "You’ve got a lot of ashes, huff-puff!\p" - .string "I’ll make you a glass item, huff-puff!\n" - .string "Which one would you like, huff-puff?$" - -Route113_GlassWorkshop_Text_26F480: @ 826F480 - .string "A {STR_VAR_1}, huff-puff?\n" - .string "Is that the one for you, huff-puff?$" - -Route113_GlassWorkshop_Text_26F4B5: @ 826F4B5 - .string "Which one would you like, huff-puff?$" - -Route113_GlassWorkshop_Text_26F4DA: @ 826F4DA - .string "A {STR_VAR_1} it is, then, huff-puff!\p" - .string "Okay! I’ll make it for you, huff-puff.\n" - .string "Just wait a little while, huff-puff.$" - -Route113_GlassWorkshop_Text_26F543: @ 826F543 - .string "A {STR_VAR_1}, huff-puff?\p" - .string "There’s not enough ash here to make\n" - .string "that, though, huff-puff.\p" - .string "Let’s see… {STR_VAR_2} is the number of steps\n" - .string "you’ll need to walk through volcanic ash\l" - .string "for me to make that item, huff-puff.\p" - .string "Which item would you rather have me\n" - .string "make instead, huff-puff?$" - -Route113_GlassWorkshop_Text_26F641: @ 826F641 - .string "You’ve collected all that ash, but you\n" - .string "don’t want anything, huff-puff?$" - -Route113_GlassWorkshop_Text_26F688: @ 826F688 - .string "Ah, I’ve finished your {STR_VAR_1}.\n" - .string "Take it, huff-puff.$" - -Route113_GlassWorkshop_Text_26F6B7: @ 826F6B7 - .string "Oh?\n" - .string "You’ve no room in your BAG, huff-puff.\p" - .string "I’ll hold on to it, so come back later,\n" - .string "huff-puff.$" - -Route113_GlassWorkshop_Text_26F715: @ 826F715 - .string "Oh?\n" - .string "You’ve no room in your PC, huff-puff?\p" - .string "I’ll hold on to it, so come back later,\n" - .string "huff-puff.$" - -Route113_GlassWorkshop_Text_26F772: @ 826F772 - .string "Hah? You haven’t got your SOOT SACK\n" - .string "with you, huff-puff.\p" - .string "You have to keep it with you to collect\n" - .string "volcanic ash, huff-puff.$" - -Route113_GlassWorkshop_Text_26F7EC: @ 826F7EC - .string "It’s fun to blow a glass flute while\n" - .string "my boss is talking.\p" - .string "Huff-huff! Puff-puff!$" - diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc deleted file mode 100644 index 9443d35bc..000000000 --- a/data/scripts/maps/Route114.inc +++ /dev/null @@ -1,219 +0,0 @@ -Route114_MapScripts:: @ 81F252F - map_script 3, Route114_MapScript1_1F253F - map_script 1, Route114_MapScript1_1F2561 - map_script 2, Route114_MapScript2_1F2578 - .byte 0 - -Route114_MapScript1_1F253F: @ 81F253F - compare VAR_0x4039, 1 - call_if 1, Route114_EventScript_273D13 - compare VAR_0x4037, 1 - call_if 1, Route114_EventScript_273D1B - compare VAR_0x4037, 2 - call_if 1, Route114_EventScript_273D1B - end - -Route114_MapScript1_1F2561: @ 81F2561 - compare VAR_0x4037, 1 - call_if 1, Route114_EventScript_273913 - compare VAR_0x4037, 2 - call_if 1, Route114_EventScript_273926 - end - -Route114_MapScript2_1F2578: @ 81F2578 - map_script_2 VAR_0x4039, 1, gUnknown_08273D1F - .2byte 0 - -Route114_EventScript_1F2582:: @ 81F2582 - lock - faceplayer - dodailyevents - checkflag FLAG_0x92B - goto_eq Route114_EventScript_1F25C7 - msgbox Route114_Text_2A6FCB, 4 - random 5 - addvar VAR_RESULT, 15 - addvar VAR_RESULT, 133 - giveitem_std VAR_RESULT - compare VAR_RESULT, 0 - goto_eq Route114_EventScript_272054 - setflag FLAG_0x92B - msgbox Route114_Text_2A7034, 4 - release - end - -Route114_EventScript_1F25C7:: @ 81F25C7 - msgbox Route114_Text_2A706E, 4 - release - end - -Route114_EventScript_1F25D1:: @ 81F25D1 - lock - faceplayer - checkflag FLAG_0x0E7 - goto_eq Route114_EventScript_1F2608 - msgbox Route114_Text_1F2809, 4 - giveitem_std ITEM_TM05 - compare VAR_RESULT, 0 - goto_eq Route114_EventScript_272054 - setflag FLAG_0x0E7 - msgbox Route114_Text_1F2872, 4 - release - end - -Route114_EventScript_1F2608:: @ 81F2608 - msgbox Route114_Text_1F2872, 4 - release - end - -Route114_EventScript_1F2612:: @ 81F2612 - lock - faceplayer - waitse - playmoncry SPECIES_POOCHYENA, 2 - msgbox Route114_Text_1F28A6, 4 - waitmoncry - release - end - -Route114_EventScript_1F2625:: @ 81F2625 - msgbox Route114_Text_1F28B3, 3 - end - -Route114_EventScript_1F262E:: @ 81F262E - msgbox Route114_Text_1F28DB, 3 - end - -Route114_EventScript_1F2637:: @ 81F2637 - msgbox Route114_Text_1F2910, 3 - end - -Route114_EventScript_1F2640:: @ 81F2640 - trainerbattle 0, TRAINER_LENNY, 0, Route114_Text_29A6B1, Route114_Text_29A707 - msgbox Route114_Text_29A715, 6 - end - -Route114_EventScript_1F2657:: @ 81F2657 - trainerbattle 0, TRAINER_LUCAS_1, 0, Route114_Text_29A777, Route114_Text_29A7B5 - msgbox Route114_Text_29A7D4, 6 - end - -Route114_EventScript_1F266E:: @ 81F266E - trainerbattle 0, TRAINER_SHANE, 0, Route114_Text_29A818, Route114_Text_29A88F - msgbox Route114_Text_29A89F, 6 - end - -Route114_EventScript_1F2685:: @ 81F2685 - trainerbattle 0, TRAINER_NANCY, 0, Route114_Text_29A8D9, Route114_Text_29A90E - msgbox Route114_Text_29A916, 6 - end - -Route114_EventScript_1F269C:: @ 81F269C - trainerbattle 2, TRAINER_STEVE_1, 0, Route114_Text_29A943, Route114_Text_29A973, Route114_EventScript_1F26C8 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route114_EventScript_1F26E7 - msgbox Route114_Text_29A981, 4 - release - end - -Route114_EventScript_1F26C8:: @ 81F26C8 - special sub_80B4808 - waitmovement 0 - msgbox Route114_Text_29A9F7, 4 - setvar VAR_0x8004, 143 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 143 - callstd 8 - release - end - -Route114_EventScript_1F26E7:: @ 81F26E7 - trainerbattle 5, TRAINER_STEVE_1, 0, Route114_Text_29AA3E, Route114_Text_29AA67 - msgbox Route114_Text_29AA94, 6 - end - -Route114_EventScript_1F26FE:: @ 81F26FE - trainerbattle 2, TRAINER_BERNIE_1, 0, Route114_Text_29AADB, Route114_Text_29AB1A, Route114_EventScript_1F272A - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route114_EventScript_1F2749 - msgbox Route114_Text_29AB36, 4 - release - end - -Route114_EventScript_1F272A:: @ 81F272A - special sub_80B4808 - waitmovement 0 - msgbox Route114_Text_29ABA6, 4 - setvar VAR_0x8004, 206 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 206 - callstd 8 - release - end - -Route114_EventScript_1F2749:: @ 81F2749 - trainerbattle 5, TRAINER_BERNIE_1, 0, Route114_Text_29ABDC, Route114_Text_29AC10 - msgbox Route114_Text_29AC43, 6 - end - -Route114_EventScript_1F2760:: @ 81F2760 - trainerbattle 0, TRAINER_CLAUDE, 0, Route114_Text_29ACB3, Route114_Text_29AD0A - msgbox Route114_Text_29AD2E, 6 - end - -Route114_EventScript_1F2777:: @ 81F2777 - trainerbattle 0, TRAINER_NOLAN, 0, Route114_Text_29ADA1, Route114_Text_29AE05 - msgbox Route114_Text_29AE3D, 6 - end - -Route114_EventScript_1F278E:: @ 81F278E - trainerbattle 4, TRAINER_TYRA_AND_IVY, 0, Route114_Text_29AE96, Route114_Text_29AEE7, Route114_Text_29AF3D - msgbox Route114_Text_29AF0B, 6 - end - -Route114_EventScript_1F27A9:: @ 81F27A9 - trainerbattle 4, TRAINER_TYRA_AND_IVY, 0, Route114_Text_29AF89, Route114_Text_29AFAC, Route114_Text_29B01B - msgbox Route114_Text_29AFCF, 6 - end - -Route114_EventScript_1F27C4:: @ 81F27C4 - trainerbattle 0, TRAINER_ANGELINA, 0, Route114_Text_29B16F, Route114_Text_29B19C - msgbox Route114_Text_29B1BC, 6 - end - -Route114_EventScript_1F27DB:: @ 81F27DB - trainerbattle 0, TRAINER_CHARLOTTE, 0, Route114_Text_29B0DB, Route114_Text_29B0FB - msgbox Route114_Text_29B11A, 6 - end - -Route114_EventScript_1F27F2:: @ 81F27F2 - trainerbattle 0, TRAINER_KAI, 0, Route114_Text_29B05D, Route114_Text_29B089 - msgbox Route114_Text_29B0B5, 6 - end - -Route114_Text_1F2809: @ 81F2809 - .string "All my POKéMON does is ROAR…\n" - .string "No one dares to come near me…\p" - .string "Sigh… If you would, please take\n" - .string "this TM away…$" - -Route114_Text_1F2872: @ 81F2872 - .string "TM05 contains ROAR.\n" - .string "A ROAR sends POKéMON scurrying.$" - -Route114_Text_1F28A6: @ 81F28A6 - .string "Bow! Bowwow!$" - -Route114_Text_1F28B3: @ 81F28B3 - .string "METEOR FALLS\n" - .string "RUSTBORO CITY THROUGH HERE$" - -Route114_Text_1F28DB: @ 81F28DB - .string "FOSSIL MANIAC’S HOUSE\n" - .string "“Fossils gratefully accepted!â€$" - -Route114_Text_1F2910: @ 81F2910 - .string "LANETTE’S HOUSE$" - diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/scripts/maps/Route114_FossilManiacsHouse.inc deleted file mode 100644 index f14c15f9e..000000000 --- a/data/scripts/maps/Route114_FossilManiacsHouse.inc +++ /dev/null @@ -1,56 +0,0 @@ -Route114_FossilManiacsHouse_MapScripts:: @ 822AD30 - map_script 3, Route114_FossilManiacsHouse_MapScript1_22AD36 - .byte 0 - -Route114_FossilManiacsHouse_MapScript1_22AD36: @ 822AD36 - setflag FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE - end - -Route114_FossilManiacsHouse_EventScript_22AD3A:: @ 822AD3A - lock - faceplayer - checkflag FLAG_0x105 - goto_eq Route114_FossilManiacsHouse_EventScript_22AD69 - msgbox Route114_FossilManiacsHouse_Text_22AD85, 4 - giveitem_std ITEM_TM28 - compare VAR_RESULT, 0 - goto_eq Route114_FossilManiacsHouse_EventScript_272054 - setflag FLAG_0x105 - release - end - -Route114_FossilManiacsHouse_EventScript_22AD69:: @ 822AD69 - msgbox Route114_FossilManiacsHouse_Text_22AE48, 4 - release - end - -Route114_FossilManiacsHouse_EventScript_22AD73:: @ 822AD73 - msgbox Route114_FossilManiacsHouse_Text_22AE92, 3 - end - -Route114_FossilManiacsHouse_EventScript_22AD7C:: @ 822AD7C - msgbox Route114_FossilManiacsHouse_Text_22AEC2, 3 - end - -Route114_FossilManiacsHouse_Text_22AD85: @ 822AD85 - .string "My big brother’s the FOSSIL MANIAC…\n" - .string "He’s a nice guy who loves FOSSILS…\p" - .string "He loves digging holes, too…\n" - .string "He dug this hole by himself…\p" - .string "You can have this, so you can DIG\n" - .string "holes just like my big brother…$" - -Route114_FossilManiacsHouse_Text_22AE48: @ 822AE48 - .string "If you make a POKéMON DIG inside a\n" - .string "cave, you’re returned to the entrance…$" - -Route114_FossilManiacsHouse_Text_22AE92: @ 822AE92 - .string "Rocks in peculiar shapes fill\n" - .string "the display case…$" - -Route114_FossilManiacsHouse_Text_22AEC2: @ 822AEC2 - .string "THE COMPOSITION OF STRATA…\n" - .string "HOW RAIN SHAPES THE LAND…\l" - .string "STONES, SOIL, AND ROCK…\p" - .string "It’s crammed with books.$" - diff --git a/data/scripts/maps/Route114_FossilManiacsTunnel.inc b/data/scripts/maps/Route114_FossilManiacsTunnel.inc deleted file mode 100644 index bc5a6d977..000000000 --- a/data/scripts/maps/Route114_FossilManiacsTunnel.inc +++ /dev/null @@ -1,96 +0,0 @@ -Route114_FossilManiacsTunnel_MapScripts:: @ 822AF28 - map_script 3, Route114_FossilManiacsTunnel_MapScript1_22AF33 - map_script 1, Route114_FossilManiacsTunnel_MapScript1_22AF49 - .byte 0 - -Route114_FossilManiacsTunnel_MapScript1_22AF33: @ 822AF33 - checkflag FLAG_SYS_GAME_CLEAR - call_if 1, Route114_FossilManiacsTunnel_EventScript_22AF3D - end - -Route114_FossilManiacsTunnel_EventScript_22AF3D:: @ 822AF3D - setobjectxyperm 1, 6, 5 - setobjectmovementtype 1, 8 - return - -Route114_FossilManiacsTunnel_MapScript1_22AF49: @ 822AF49 - checkflag FLAG_SYS_GAME_CLEAR - call_if 0, Route114_FossilManiacsTunnel_EventScript_22AF53 - end - -Route114_FossilManiacsTunnel_EventScript_22AF53:: @ 822AF53 - setmetatile 6, 1, 617, 1 - setmetatile 6, 2, 617, 1 - return - -Route114_FossilManiacsTunnel_EventScript_22AF66:: @ 822AF66 - lockall - applymovement 1, Route114_FossilManiacsTunnel_Movement_2725A6 - applymovement 255, Route114_FossilManiacsTunnel_Movement_2725AA - waitmovement 0 - msgbox Route114_FossilManiacsTunnel_Text_22B1F7, 4 - setvar VAR_0x40CC, 2 - releaseall - end - -Route114_FossilManiacsTunnel_EventScript_22AF87:: @ 822AF87 - lock - faceplayer - checkflag FLAG_0x10B - goto_eq Route114_FossilManiacsTunnel_EventScript_22AFC6 - checkitem ITEM_ROOT_FOSSIL, 1 - compare VAR_RESULT, 1 - goto_eq Route114_FossilManiacsTunnel_EventScript_22AFBC - checkitem ITEM_CLAW_FOSSIL, 1 - compare VAR_RESULT, 1 - goto_eq Route114_FossilManiacsTunnel_EventScript_22AFBC - msgbox Route114_FossilManiacsTunnel_Text_22AFD0, 4 - release - end - -Route114_FossilManiacsTunnel_EventScript_22AFBC:: @ 822AFBC - msgbox Route114_FossilManiacsTunnel_Text_22B0D6, 4 - release - end - -Route114_FossilManiacsTunnel_EventScript_22AFC6:: @ 822AFC6 - msgbox Route114_FossilManiacsTunnel_Text_22B1CC, 4 - release - end - -Route114_FossilManiacsTunnel_Text_22AFD0: @ 822AFD0 - .string "I’m the FOSSIL MANIAC…\n" - .string "I’m a nice guy who loves FOSSILS…\p" - .string "Do you want a FOSSIL?\p" - .string "But the FOSSILS around these parts all\n" - .string "belong to me… None for you…\p" - .string "If you can’t bear to go without\n" - .string "a FOSSIL, look in a desert where there\l" - .string "are boulders and sand that may hide\l" - .string "FOSSILS…$" - -Route114_FossilManiacsTunnel_Text_22B0D6: @ 822B0D6 - .string "You found a FOSSIL, didn’t you?\n" - .string "That’s so nice… It’s so dreamy…\p" - .string "What are you going to do with that\n" - .string "FOSSIL?\p" - .string "From what I’ve heard, DEVON is doing\n" - .string "research on reviving POKéMON from\l" - .string "FOSSILS…\p" - .string "I love my FOSSILS, so I would never\n" - .string "do anything like that…$" - -Route114_FossilManiacsTunnel_Text_22B1CC: @ 822B1CC - .string "FOSSILS are so… Wonderful…\n" - .string "It’s so dreamy…$" - -Route114_FossilManiacsTunnel_Text_22B1F7: @ 822B1F7 - .string "Oh…\n" - .string "It’s not safe that way…\p" - .string "I was digging away, you see…\n" - .string "When the whole wall collapsed…\p" - .string "I think there’s a giant cavern\n" - .string "underneath now…\p" - .string "But I’ve left it alone because I don’t\n" - .string "think there are any FOSSILS there…$" - diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc deleted file mode 100644 index 00bb4f226..000000000 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ /dev/null @@ -1,108 +0,0 @@ -Route114_LanettesHouse_MapScripts:: @ 822B2C8 - map_script 3, Route114_LanettesHouse_MapScript1_22B2CE - .byte 0 - -Route114_LanettesHouse_MapScript1_22B2CE: @ 822B2CE - setflag FLAG_LANDMARK_LANETTES_HOUSE - end - -Route114_LanettesHouse_EventScript_22B2D2:: @ 822B2D2 - lock - faceplayer - checkflag FLAG_0x083 - goto_eq Route114_LanettesHouse_EventScript_22B2FF - setflag FLAG_SYS_PC_LANETTE - msgbox Route114_LanettesHouse_Text_22B34E, 4 - givedecoration_std 99 - compare VAR_RESULT, 0 - goto_eq Route114_LanettesHouse_EventScript_272067 - setflag FLAG_0x083 - release - end - -Route114_LanettesHouse_EventScript_22B2FF:: @ 822B2FF - msgbox Route114_LanettesHouse_Text_22B407, 4 - release - end - -Route114_LanettesHouse_EventScript_22B309:: @ 822B309 - lockall - msgbox Route114_LanettesHouse_Text_22B485, 5 - compare VAR_RESULT, 1 - goto_eq Route114_LanettesHouse_EventScript_22B327 - msgbox Route114_LanettesHouse_Text_22B6E4, 4 - releaseall - end - -Route114_LanettesHouse_EventScript_22B327:: @ 822B327 - msgbox Route114_LanettesHouse_Text_22B53C, 5 - compare VAR_RESULT, 1 - call_if 1, Route114_LanettesHouse_EventScript_22B33C - releaseall - end - -Route114_LanettesHouse_EventScript_22B33C:: @ 822B33C - msgbox Route114_LanettesHouse_Text_22B5EF, 4 - return - -Route114_LanettesHouse_EventScript_22B345:: @ 822B345 - msgbox Route114_LanettesHouse_Text_22B6FC, 3 - end - -Route114_LanettesHouse_Text_22B34E: @ 822B34E - .string "LANETTE: Oh! {PLAYER}{KUN}!\p" - .string "I’m sorry everything is so cluttered…\n" - .string "When I get engrossed in research,\l" - .string "things end up this way…\p" - .string "This is embarrassing… Please keep\n" - .string "this a secret in exchange for this.$" - -Route114_LanettesHouse_Text_22B407: @ 822B407 - .string "May I offer advice about my POKéMON\n" - .string "Storage System?\p" - .string "You should organize your BOXES so you\n" - .string "can tell which POKéMON are in them.$" - -Route114_LanettesHouse_Text_22B485: @ 822B485 - .string "It’s LANETTE’s research notes.\n" - .string "There’s information about BOXES.\p" - .string "Design BOXES to hold 30 POKéMON each.\p" - .string "Each TRAINER should be able to store\n" - .string "420 POKéMON on the PC system.\p" - .string "Keep reading?$" - -Route114_LanettesHouse_Text_22B53C: @ 822B53C - .string "A marking system should be added to\n" - .string "make POKéMON easier to organize.\p" - .string "The name and wallpaper design of each\n" - .string "BOX will be made changeable to please\l" - .string "the stored POKéMON.\p" - .string "Keep reading?$" - -Route114_LanettesHouse_Text_22B5EF: @ 822B5EF - .string "When storing a POKéMON, it should be\n" - .string "sent to the BOX inspected last.\p" - .string "If that BOX is full, the received\n" - .string "POKéMON is stored in the next BOX.\p" - .string "In other words, when a BOX is examined,\n" - .string "it is automatically selected as the BOX\l" - .string "to which POKéMON are sent.$" - -Route114_LanettesHouse_Text_22B6E4: @ 822B6E4 - .string "{PLAYER} closed the notebook.$" - -Route114_LanettesHouse_Text_22B6FC: @ 822B6FC - .string "There’s an e-mail from someone on\n" - .string "the PC.\p" - .string "“… … … … … … …\p" - .string "“Your Storage System offers more\n" - .string "convenience than mine.\p" - .string "“It has a lot of user-friendly features\n" - .string "that make it fun and useful, too.\p" - .string "“It makes me proud that I played\n" - .string "a part in its development.\p" - .string "“Here’s hoping that you’ll continue\n" - .string "research in Storage Systems.\p" - .string "“From BILL\n" - .string "… … … … … … … …â€$" - diff --git a/data/scripts/maps/Route115.inc b/data/scripts/maps/Route115.inc deleted file mode 100644 index 2d4f7c2e3..000000000 --- a/data/scripts/maps/Route115.inc +++ /dev/null @@ -1,162 +0,0 @@ -Route115_MapScripts:: @ 81F2920 - map_script 1, Route115_MapScript1_1F2930 - map_script 3, Route115_MapScript1_1F2947 - map_script 2, Route115_MapScript2_1F2969 - .byte 0 - -Route115_MapScript1_1F2930: @ 81F2930 - compare VAR_0x4037, 3 - call_if 1, Route115_EventScript_273939 - compare VAR_0x4037, 4 - call_if 1, Route115_EventScript_27394C - end - -Route115_MapScript1_1F2947: @ 81F2947 - compare VAR_0x4039, 1 - call_if 1, Route115_EventScript_273D13 - compare VAR_0x4037, 3 - call_if 1, Route115_EventScript_273D1B - compare VAR_0x4037, 4 - call_if 1, Route115_EventScript_273D1B - end - -Route115_MapScript2_1F2969: @ 81F2969 - map_script_2 VAR_0x4039, 1, gUnknown_08273D1F - .2byte 0 - -Route115_EventScript_1F2973:: @ 81F2973 - msgbox Route115_Text_1F2B55, 2 - end - -Route115_EventScript_1F297C:: @ 81F297C - msgbox Route115_Text_1F2BC9, 3 - end - -Route115_EventScript_1F2985:: @ 81F2985 - msgbox Route115_Text_1F2BE3, 3 - end - -Route115_EventScript_1F298E:: @ 81F298E - trainerbattle 2, TRAINER_TIMOTHY_1, 0, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route115_EventScript_1F29D9 - msgbox Route115_Text_29B258, 4 - release - end - -Route115_EventScript_1F29BA:: @ 81F29BA - special sub_80B4808 - waitmovement 0 - msgbox Route115_Text_29B2B3, 4 - setvar VAR_0x8004, 307 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 307 - callstd 8 - release - end - -Route115_EventScript_1F29D9:: @ 81F29D9 - trainerbattle 5, TRAINER_TIMOTHY_1, 0, Route115_Text_29B32C, Route115_Text_29B372 - msgbox Route115_Text_29B385, 6 - end - -Route115_EventScript_1F29F0:: @ 81F29F0 - trainerbattle 0, TRAINER_KOICHI, 0, Route115_Text_29B3CC, Route115_Text_29B3ED - msgbox Route115_Text_29B3FF, 6 - end - -Route115_EventScript_1F2A07:: @ 81F2A07 - trainerbattle 2, TRAINER_NOB_1, 0, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route115_EventScript_1F2A52 - msgbox Route115_Text_29B49D, 4 - release - end - -Route115_EventScript_1F2A33:: @ 81F2A33 - special sub_80B4808 - waitmovement 0 - msgbox Route115_Text_29B50B, 4 - setvar VAR_0x8004, 183 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 183 - callstd 8 - release - end - -Route115_EventScript_1F2A52:: @ 81F2A52 - trainerbattle 5, TRAINER_NOB_1, 0, Route115_Text_29B547, Route115_Text_29B59D - msgbox Route115_Text_29B5B5, 6 - end - -Route115_EventScript_1F2A69:: @ 81F2A69 - trainerbattle 2, TRAINER_CYNDY_1, 0, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route115_EventScript_1F2AB4 - msgbox Route115_Text_29B647, 4 - release - end - -Route115_EventScript_1F2A95:: @ 81F2A95 - special sub_80B4808 - waitmovement 0 - msgbox Route115_Text_29B6AB, 4 - setvar VAR_0x8004, 427 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 427 - callstd 8 - release - end - -Route115_EventScript_1F2AB4:: @ 81F2AB4 - trainerbattle 5, TRAINER_CYNDY_1, 0, Route115_Text_29B6FA, Route115_Text_29B71A - msgbox Route115_Text_29B737, 6 - end - -Route115_EventScript_1F2ACB:: @ 81F2ACB - trainerbattle 0, TRAINER_HECTOR, 0, Route115_Text_29B78F, Route115_Text_29B7C5 - msgbox Route115_Text_29B7EA, 6 - end - -Route115_EventScript_1F2AE2:: @ 81F2AE2 - trainerbattle 0, TRAINER_KYRA, 0, Route115_Text_29B826, Route115_Text_29B85D - msgbox Route115_Text_29B869, 6 - end - -Route115_EventScript_1F2AF9:: @ 81F2AF9 - trainerbattle 0, TRAINER_JAIDEN, 0, Route115_Text_29B8C1, Route115_Text_29B8E8 - msgbox Route115_Text_29B904, 6 - end - -Route115_EventScript_1F2B10:: @ 81F2B10 - trainerbattle 0, TRAINER_ALIX, 0, Route115_Text_29B9CB, Route115_Text_29B9F6 - msgbox Route115_Text_29BA04, 6 - end - -Route115_EventScript_1F2B27:: @ 81F2B27 - trainerbattle 0, TRAINER_HELENE, 0, Route115_Text_29B92D, Route115_Text_29B958 - msgbox Route115_Text_29B971, 6 - end - -Route115_EventScript_1F2B3E:: @ 81F2B3E - trainerbattle 0, TRAINER_MARLENE, 0, Route115_Text_29BA2C, Route115_Text_29BA67 - msgbox Route115_Text_29BA87, 6 - end - -Route115_Text_1F2B55: @ 81F2B55 - .string "Exploring a cave isn’t like walking\n" - .string "on a road.\p" - .string "You never know when wild POKéMON will\n" - .string "appear. It’s full of suspense.$" - -Route115_Text_1F2BC9: @ 81F2BC9 - .string "ROUTE 115\n" - .string "{0x7A} RUSTBORO CITY$" - -Route115_Text_1F2BE3: @ 81F2BE3 - .string "METEOR FALLS\n" - .string "FALLARBOR TOWN THROUGH HERE$" - diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc deleted file mode 100644 index 68a32c3b5..000000000 --- a/data/scripts/maps/Route116.inc +++ /dev/null @@ -1,511 +0,0 @@ -Route116_MapScripts:: @ 81F2C0C - map_script 3, Route116_MapScript1_1F2C1C - map_script 1, Route116_MapScript1_1F2C4F - map_script 2, Route116_MapScript2_1F2C66 - .byte 0 - -Route116_MapScript1_1F2C1C: @ 81F2C1C - checkflag FLAG_0x08F - call_if 1, Route116_EventScript_1F2C47 - compare VAR_0x4039, 1 - call_if 1, Route116_EventScript_273D13 - compare VAR_0x4037, 5 - call_if 1, Route116_EventScript_273D1B - compare VAR_0x4037, 6 - call_if 1, Route116_EventScript_273D1B - end - -Route116_EventScript_1F2C47:: @ 81F2C47 - setobjectxyperm 21, 38, 10 - return - -Route116_MapScript1_1F2C4F: @ 81F2C4F - compare VAR_0x4037, 5 - call_if 1, Route116_EventScript_27395F - compare VAR_0x4037, 6 - call_if 1, Route116_EventScript_273972 - end - -Route116_MapScript2_1F2C66: @ 81F2C66 - map_script_2 VAR_0x4039, 1, gUnknown_08273D1F - .2byte 0 - -Route116_EventScript_1F2C70:: @ 81F2C70 - lock - faceplayer - checkflag FLAG_0x08F - goto_eq Route116_EventScript_1F2C8E - checkflag FLAG_0x08E - goto_eq Route116_EventScript_1F2C98 - msgbox Route116_Text_1F3140, 4 - release - end - -Route116_EventScript_1F2C8E:: @ 81F2C8E - msgbox Route116_Text_1F32C1, 4 - release - end - -Route116_EventScript_1F2C98:: @ 81F2C98 - msgbox Route116_Text_1F3166, 4 - release - end - -Route116_EventScript_1F2CA2:: @ 81F2CA2 - lock - faceplayer - checkflag FLAG_0x11F - goto_eq Route116_EventScript_1F2D2B - msgbox Route116_Text_1F3317, 4 - goto Route116_EventScript_1F2CBB - end - -Route116_EventScript_1F2CBB:: @ 81F2CBB - setflag FLAG_0x11F - giveitem_std ITEM_REPEAT_BALL - compare VAR_RESULT, 0 - goto_eq Route116_EventScript_1F2D39 - msgbox Route116_Text_1F3521, 4 - closemessage - compare VAR_FACING, 2 - call_if 1, Route116_EventScript_1F2D15 - compare VAR_FACING, 1 - call_if 1, Route116_EventScript_1F2D15 - compare VAR_FACING, 3 - call_if 1, Route116_EventScript_1F2D15 - compare VAR_FACING, 4 - call_if 1, Route116_EventScript_1F2D20 - removeobject VAR_LAST_TALKED - clearflag FLAG_0x3B5 - setflag FLAG_0x100 - release - end - -Route116_EventScript_1F2D15:: @ 81F2D15 - applymovement VAR_LAST_TALKED, Route116_Movement_1F2D43 - waitmovement 0 - return - -Route116_EventScript_1F2D20:: @ 81F2D20 - applymovement VAR_LAST_TALKED, Route116_Movement_1F2D4C - waitmovement 0 - return - -Route116_EventScript_1F2D2B:: @ 81F2D2B - msgbox Route116_Text_1F35CE, 4 - goto Route116_EventScript_1F2CBB - end - -Route116_EventScript_1F2D39:: @ 81F2D39 - msgbox Route116_Text_1F3593, 4 - release - end - -Route116_Movement_1F2D43: @ 81F2D43 - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - step_end - -Route116_Movement_1F2D4C: @ 81F2D4C - 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 - msgbox Route116_Text_1F379D, 3 - end - -Route116_EventScript_1F2D60:: @ 81F2D60 - msgbox Route116_Text_1F37B7, 3 - end - -Route116_EventScript_1F2D69:: @ 81F2D69 - msgbox Route116_Text_1F380F, 3 - end - -Route116_EventScript_1F2D72:: @ 81F2D72 - msgbox Route116_Text_1F3825, 3 - end - -Route116_EventScript_1F2D7B:: @ 81F2D7B - msgbox Route116_Text_1F38D4, 3 - end - -Route116_EventScript_1F2D84:: @ 81F2D84 - lock - faceplayer - msgbox Route116_Text_1F309D, 4 - setvar VAR_0x406F, 2 - release - end - -Route116_EventScript_1F2D95:: @ 81F2D95 - lockall - applymovement 11, Route116_Movement_2725A8 - applymovement 255, Route116_Movement_2725A4 - waitmovement 0 - msgbox Route116_Text_1F309D, 4 - setvar VAR_0x406F, 2 - releaseall - end - -Route116_EventScript_1F2DB6:: @ 81F2DB6 - lock - faceplayer - checkitem ITEM_BLACK_GLASSES, 1 - compare VAR_RESULT, 1 - goto_eq Route116_EventScript_1F2DF1 - specialvar VAR_RESULT, sub_8139634 - compare VAR_RESULT, 1 - goto_eq Route116_EventScript_1F2DE2 - msgbox Route116_Text_1F3657, 4 - release - end - -Route116_EventScript_1F2DE2:: @ 81F2DE2 - msgbox Route116_Text_1F3718, 4 - closemessage - goto Route116_EventScript_1F2E2A - end - -Route116_EventScript_1F2DF1:: @ 81F2DF1 - msgbox Route116_Text_1F3657, 4 - msgbox Route116_Text_1F3688, 4 - specialvar VAR_RESULT, sub_8139634 - compare VAR_RESULT, 1 - goto_eq Route116_EventScript_1F2E1B - msgbox Route116_Text_1F375E, 4 - release - end - -Route116_EventScript_1F2E1B:: @ 81F2E1B - msgbox Route116_Text_1F36B4, 4 - closemessage - goto Route116_EventScript_1F2E2A - end - -Route116_EventScript_1F2E2A:: @ 81F2E2A - delay 20 - compare VAR_FACING, 2 - call_if 1, Route116_EventScript_1F2E5E - compare VAR_FACING, 1 - call_if 1, Route116_EventScript_1F2E5E - compare VAR_FACING, 3 - call_if 1, Route116_EventScript_1F2E5E - compare VAR_FACING, 4 - call_if 1, Route116_EventScript_1F2E69 - removeobject VAR_LAST_TALKED - release - end - -Route116_EventScript_1F2E5E:: @ 81F2E5E - applymovement VAR_LAST_TALKED, Route116_Movement_1F2E74 - waitmovement 0 - return - -Route116_EventScript_1F2E69:: @ 81F2E69 - applymovement VAR_LAST_TALKED, Route116_Movement_1F2E7E - waitmovement 0 - return - -Route116_Movement_1F2E74: @ 81F2E74 - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - step_end - -Route116_Movement_1F2E7E: @ 81F2E7E - 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 - trainerbattle 0, TRAINER_JOEY, 0, Route116_Text_29BB79, Route116_Text_29BB9A - msgbox Route116_Text_29BBC6, 6 - end - -Route116_EventScript_1F2EA0:: @ 81F2EA0 - trainerbattle 0, TRAINER_JOSE, 0, Route116_Text_29BBFD, Route116_Text_29BC25 - msgbox Route116_Text_29BC42, 6 - end - -Route116_EventScript_1F2EB7:: @ 81F2EB7 - trainerbattle 2, TRAINER_JERRY_1, 0, Route116_Text_29BD0C, Route116_Text_29BD66, Route116_EventScript_1F2EF8 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route116_EventScript_1F2F4E - setvar VAR_0x8004, 273 - specialvar VAR_RESULT, sub_813B4E0 - compare VAR_RESULT, 0 - goto_eq Route116_EventScript_1F2F22 - msgbox Route116_Text_29BD92, 4 - release - end - -Route116_EventScript_1F2EF8:: @ 81F2EF8 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route116_EventScript_1F2F03 - release - end - -Route116_EventScript_1F2F03:: @ 81F2F03 - special sub_80B4808 - waitmovement 0 - msgbox Route116_Text_29BE71, 4 - setvar VAR_0x8004, 273 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 273 - callstd 8 - release - end - -Route116_EventScript_1F2F22:: @ 81F2F22 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route116_EventScript_1F2F35 - msgbox Route116_Text_29BD92, 4 - release - end - -Route116_EventScript_1F2F35:: @ 81F2F35 - msgbox Route116_Text_29BDEF, 4 - setvar VAR_0x8004, 273 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 273 - callstd 8 - release - end - -Route116_EventScript_1F2F4E:: @ 81F2F4E - trainerbattle 5, TRAINER_JERRY_1, 0, Route116_Text_29BEF3, Route116_Text_29BF4C - msgbox Route116_Text_29BF68, 6 - end - -Route116_EventScript_1F2F65:: @ 81F2F65 - trainerbattle 0, TRAINER_CLARK, 0, Route116_Text_29BACD, Route116_Text_29BB0F - msgbox Route116_Text_29BB31, 6 - end - -Route116_EventScript_1F2F7C:: @ 81F2F7C - trainerbattle 0, TRAINER_JANICE, 0, Route116_Text_29BC7F, Route116_Text_29BCB3 - msgbox Route116_Text_29BCCC, 6 - end - -Route116_EventScript_1F2F93:: @ 81F2F93 - trainerbattle 2, TRAINER_KAREN_1, 0, Route116_Text_29BFC5, Route116_Text_29BFFA, Route116_EventScript_1F2FD4 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route116_EventScript_1F302A - setvar VAR_0x8004, 280 - specialvar VAR_RESULT, sub_813B4E0 - compare VAR_RESULT, 0 - goto_eq Route116_EventScript_1F2FFE - msgbox Route116_Text_29C010, 4 - release - end - -Route116_EventScript_1F2FD4:: @ 81F2FD4 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route116_EventScript_1F2FDF - release - end - -Route116_EventScript_1F2FDF:: @ 81F2FDF - special sub_80B4808 - waitmovement 0 - msgbox Route116_Text_29C096, 4 - setvar VAR_0x8004, 280 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 280 - callstd 8 - release - end - -Route116_EventScript_1F2FFE:: @ 81F2FFE - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route116_EventScript_1F3011 - msgbox Route116_Text_29C010, 4 - release - end - -Route116_EventScript_1F3011:: @ 81F3011 - msgbox Route116_Text_29C052, 4 - setvar VAR_0x8004, 280 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 280 - callstd 8 - release - end - -Route116_EventScript_1F302A:: @ 81F302A - trainerbattle 5, TRAINER_KAREN_1, 0, Route116_Text_29C0DA, Route116_Text_29C11F - msgbox Route116_Text_29C13B, 6 - end - -Route116_EventScript_1F3041:: @ 81F3041 - trainerbattle 0, TRAINER_SARAH, 0, Route116_Text_29C173, Route116_Text_29C1B8 - msgbox Route116_Text_29C1EA, 6 - end - -Route116_EventScript_1F3058:: @ 81F3058 - trainerbattle 0, TRAINER_DAWSON, 0, Route116_Text_29C266, Route116_Text_29C2C2 - msgbox Route116_Text_29C2DD, 6 - end - -Route116_EventScript_1F306F:: @ 81F306F - trainerbattle 0, TRAINER_DEVAN, 0, Route116_Text_29C350, Route116_Text_29C365 - msgbox Route116_Text_29C380, 6 - end - -Route116_EventScript_1F3086:: @ 81F3086 - trainerbattle 0, TRAINER_JOHNSON, 0, Route116_Text_29C3C1, Route116_Text_29C3F7 - msgbox Route116_Text_29C418, 6 - end - -Route116_Text_1F309D: @ 81F309D - .string "Ohhh, what am I to do?\p" - .string "We were on our walk, PEEKO and I, when\n" - .string "we were jumped by an odd thug…\p" - .string "The scoundrel made off with my\n" - .string "darling PEEKO!\p" - .string "Wrrrooooooaaaar! PEEKO!$" - -Route116_Text_1F3140: @ 81F3140 - .string "Nnn… Roar!\p" - .string "I want to dig that tunnel!$" - -Route116_Text_1F3166: @ 81F3166 - .string "Nnn… Roar!\n" - .string "What’s going on?\p" - .string "I was digging the tunnel without any\n" - .string "tools when some goon ordered me out!\p" - .string "That tunnel’s filled with POKéMON\n" - .string "that react badly to loud noises.\l" - .string "They could cause an uproar.\p" - .string "That’s why we stopped using heavy\n" - .string "equipment for tunneling…\p" - .string "I’m worried that the goon will do\n" - .string "something stupid and startle the\l" - .string "POKéMON into an uproar.$" - -Route116_Text_1F32C1: @ 81F32C1 - .string "Nnn… Roar!\p" - .string "That goofy goon hightailed it out of\n" - .string "the tunnel! I can go back to digging!$" - -Route116_Text_1F3317: @ 81F3317 - .string "Oh! It’s you!\p" - .string "You’re that person who not only helped\n" - .string "me in PETALBURG WOODS, but also got\l" - .string "back my stolen package and then even\l" - .string "graciously delivered it to SLATEPORT!\p" - .string "CAPT. STERN informed us that the\n" - .string "package arrived, too!\p" - .string "I thank you very, very much!\p" - .string "Why, if I were a rain cloud, I would\n" - .string "shower you with gratitude and hail\l" - .string "you as a hero!\p" - .string "For you, the most wonderful TRAINER,\n" - .string "I bear good news!\p" - .string "Recently, our company developed\n" - .string "a new kind of POKé BALL.\p" - .string "As a token of our appreciation, this\n" - .string "is our gift to our wonderful TRAINER!$" - -Route116_Text_1F3521: @ 81F3521 - .string "Our new POKé BALL will be available\n" - .string "at the POKéMON MART in RUSTBORO.\p" - .string "Please do try it out!\n" - .string "Thank you and bye-bye!$" - -Route116_Text_1F3593: @ 81F3593 - .string "Your BAG is jam-packed.\n" - .string "I can’t give you this REPEAT BALL.$" - -Route116_Text_1F35CE: @ 81F35CE - .string "As a token of our appreciation for\n" - .string "your delivering our package, I have\l" - .string "a gift of a new kind of POKé BALL\l" - .string "for our most wonderful TRAINER!$" - -Route116_Text_1F3657: @ 81F3657 - .string "I dropped my glasses…\n" - .string "Can you help me find them?$" - -Route116_Text_1F3688: @ 81F3688 - .string "Those glasses!\n" - .string "May I see them for a second?$" - -Route116_Text_1F36B4: @ 81F36B4 - .string "Hmm…\n" - .string "These are BLACKGLASSES.\l" - .string "They’re not what I’m looking for…\p" - .string "Maybe my glasses aren’t around\n" - .string "here…$" - -Route116_Text_1F3718: @ 81F3718 - .string "Hmm…\n" - .string "I can’t find my glasses anywhere…\l" - .string "Maybe they’re not around here…$" - -Route116_Text_1F375E: @ 81F375E - .string "Hmm…\n" - .string "These are BLACKGLASSES.\l" - .string "They’re not what I’m looking for…$" - -Route116_Text_1F379D: @ 81F379D - .string "ROUTE 116\n" - .string "{0x7B} RUSTBORO CITY$" - -Route116_Text_1F37B7: @ 81F37B7 - .string "RUSTURF TUNNEL\n" - .string "“Linking RUSTBORO and VERDANTURF\p" - .string "“The tunnel project has been\n" - .string "canceled.â€$" - -Route116_Text_1F380F: @ 81F380F - .string "TUNNELER’S REST HOUSE$" - -Route116_Text_1F3825: @ 81F3825 - .string "TRAINER TIPS\p" - .string "If you want to stop a POKéMON from\n" - .string "evolving, press the B Button while it\l" - .string "is trying to evolve.\l" - .string "The startled POKéMON will stop.\p" - .string "This is called an evolution cancel.$" - -Route116_Text_1F38D4: @ 81F38D4 - .string "TRAINER TIPS\p" - .string "Your BAG has several POCKETS.\p" - .string "Items you obtain are automatically\n" - .string "placed in the appropriate POCKETS.\p" - .string "No TRAINER can afford to be without\n" - .string "a BAG of their own.$" - diff --git a/data/scripts/maps/Route116_TunnelersRestHouse.inc b/data/scripts/maps/Route116_TunnelersRestHouse.inc deleted file mode 100644 index f9dbbd3f2..000000000 --- a/data/scripts/maps/Route116_TunnelersRestHouse.inc +++ /dev/null @@ -1,63 +0,0 @@ -Route116_TunnelersRestHouse_MapScripts:: @ 822B850 - map_script 3, Route116_TunnelersRestHouse_MapScript1_22B856 - .byte 0 - -Route116_TunnelersRestHouse_MapScript1_22B856: @ 822B856 - setflag FLAG_LANDMARK_TUNNELERS_REST_HOUSE - end - -Route116_TunnelersRestHouse_EventScript_22B85A:: @ 822B85A - msgbox Route116_TunnelersRestHouse_Text_22B88B, 2 - end - -Route116_TunnelersRestHouse_EventScript_22B863:: @ 822B863 - msgbox Route116_TunnelersRestHouse_Text_22B99F, 2 - end - -Route116_TunnelersRestHouse_EventScript_22B86C:: @ 822B86C - lock - faceplayer - checkflag FLAG_0x0C7 - goto_eq Route116_TunnelersRestHouse_EventScript_22B881 - msgbox Route116_TunnelersRestHouse_Text_22BAAF, 4 - release - end - -Route116_TunnelersRestHouse_EventScript_22B881:: @ 822B881 - msgbox Route116_TunnelersRestHouse_Text_22BB3B, 4 - release - end - -Route116_TunnelersRestHouse_Text_22B88B: @ 822B88B - .string "That RUSTURF TUNNEL there…\p" - .string "At first, we had a huge work crew boring\n" - .string "through rock with the latest machinery.\l" - .string "But, we had to stop.\p" - .string "It turns out that we would have had\n" - .string "a negative effect on wild POKéMON in\l" - .string "the area.\p" - .string "So, we’ve got nothing to do but loll\n" - .string "around here doing nothing.$" - -Route116_TunnelersRestHouse_Text_22B99F: @ 822B99F - .string "There’s a man digging his way to\n" - .string "VERDANTURF all by his lonesome.\l" - .string "He’s desperate to get through.\p" - .string "He says that if he digs little by little\n" - .string "without using machines, he won’t\l" - .string "disturb POKéMON, and he’ll avoid\l" - .string "harming the natural environment.\p" - .string "I wonder if he made it through yet.$" - -Route116_TunnelersRestHouse_Text_22BAAF: @ 822BAAF - .string "To get to VERDANTURF without using\n" - .string "this TUNNEL, you’d have to cross the\l" - .string "sea to DEWFORD, sail on to SLATEPORT,\l" - .string "then travel through MAUVILLE.$" - -Route116_TunnelersRestHouse_Text_22BB3B: @ 822BB3B - .string "Did you hear? The TUNNEL to VERDANTURF\n" - .string "has gone through!\p" - .string "Sometimes, if you hope strongly enough,\n" - .string "dreams do come true.$" - diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc deleted file mode 100644 index 55a7b910e..000000000 --- a/data/scripts/maps/Route117.inc +++ /dev/null @@ -1,232 +0,0 @@ -Route117_MapScripts:: @ 81F397D - map_script 3, Route117_MapScript1_1F3983 - .byte 0 - -Route117_MapScript1_1F3983: @ 81F3983 - call Route117_EventScript_1F3989 - end - -Route117_EventScript_1F3989:: @ 81F3989 - checkflag FLAG_PENDING_DAYCARE_EGG - goto_if 0, Route117_EventScript_1F3999 - setobjectxyperm 3, 47, 6 - -Route117_EventScript_1F3999:: @ 81F3999 - return - -Route117_EventScript_1F399A:: @ 81F399A - msgbox Route117_Text_1F3CFD, 2 - end - -Route117_EventScript_1F39A3:: @ 81F39A3 - msgbox Route117_Text_1F3D41, 2 - end - -Route117_EventScript_1F39AC:: @ 81F39AC - msgbox Route117_Text_1F3C7C, 2 - end - -Route117_EventScript_1F39B5:: @ 81F39B5 - msgbox Route117_Text_1F3D58, 3 - end - -Route117_EventScript_1F39BE:: @ 81F39BE - msgbox Route117_Text_1F3D74, 3 - end - -Route117_EventScript_1F39C7:: @ 81F39C7 - msgbox Route117_Text_1F3D8E, 3 - end - -Route117_EventScript_1F39D0:: @ 81F39D0 - trainerbattle 2, TRAINER_ISAAC_1, 0, Route117_Text_29C43F, Route117_Text_29C47A, Route117_EventScript_1F39FC - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route117_EventScript_1F3A1B - msgbox Route117_Text_29C498, 4 - release - end - -Route117_EventScript_1F39FC:: @ 81F39FC - special sub_80B4808 - waitmovement 0 - msgbox Route117_Text_29C508, 4 - setvar VAR_0x8004, 538 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 538 - callstd 8 - release - end - -Route117_EventScript_1F3A1B:: @ 81F3A1B - trainerbattle 5, TRAINER_ISAAC_1, 0, Route117_Text_29C549, Route117_Text_29C58B - msgbox Route117_Text_29C5D0, 6 - end - -Route117_EventScript_1F3A32:: @ 81F3A32 - trainerbattle 2, TRAINER_LYDIA_1, 0, Route117_Text_29C612, Route117_Text_29C659, Route117_EventScript_1F3A5E - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route117_EventScript_1F3A7D - msgbox Route117_Text_29C679, 4 - release - end - -Route117_EventScript_1F3A5E:: @ 81F3A5E - special sub_80B4808 - waitmovement 0 - msgbox Route117_Text_29C6BC, 4 - setvar VAR_0x8004, 545 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 545 - callstd 8 - release - end - -Route117_EventScript_1F3A7D:: @ 81F3A7D - trainerbattle 5, TRAINER_LYDIA_1, 0, Route117_Text_29C6FD, Route117_Text_29C73E - msgbox Route117_Text_29C75A, 6 - end - -Route117_EventScript_1F3A94:: @ 81F3A94 - trainerbattle 2, TRAINER_DYLAN_1, 0, Route117_Text_29C7A5, Route117_Text_29C7EB, Route117_EventScript_1F3AC0 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route117_EventScript_1F3ADF - msgbox Route117_Text_29C800, 4 - release - end - -Route117_EventScript_1F3AC0:: @ 81F3AC0 - special sub_80B4808 - waitmovement 0 - msgbox Route117_Text_29C846, 4 - setvar VAR_0x8004, 364 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 364 - callstd 8 - release - end - -Route117_EventScript_1F3ADF:: @ 81F3ADF - trainerbattle 5, TRAINER_DYLAN_1, 0, Route117_Text_29C880, Route117_Text_29C8E3 - msgbox Route117_Text_29C8FE, 6 - end - -Route117_EventScript_1F3AF6:: @ 81F3AF6 - trainerbattle 2, TRAINER_MARIA_1, 0, Route117_Text_29C955, Route117_Text_29C9A6, Route117_EventScript_1F3B22 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route117_EventScript_1F3B41 - msgbox Route117_Text_29C9D0, 4 - release - end - -Route117_EventScript_1F3B22:: @ 81F3B22 - special sub_80B4808 - waitmovement 0 - msgbox Route117_Text_29CA32, 4 - setvar VAR_0x8004, 369 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 369 - callstd 8 - release - end - -Route117_EventScript_1F3B41:: @ 81F3B41 - trainerbattle 5, TRAINER_MARIA_1, 0, Route117_Text_29CA7C, Route117_Text_29CACC - msgbox Route117_Text_29CAF6, 6 - end - -Route117_EventScript_1F3B58:: @ 81F3B58 - trainerbattle 0, TRAINER_DEREK, 0, Route117_Text_29CB32, Route117_Text_29CB87 - msgbox Route117_Text_29CBAD, 6 - end - -Route117_EventScript_1F3B6F:: @ 81F3B6F - trainerbattle 6, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CC4A, Route117_Text_29CC8E, Route117_Text_29CD61, Route117_EventScript_1F3B9F - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route117_EventScript_1F3BB8 - msgbox Route117_Text_29CCCB, 4 - release - end - -Route117_EventScript_1F3B9F:: @ 81F3B9F - msgbox Route117_Text_29CD1D, 4 - setvar VAR_0x8004, 287 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 287 - callstd 8 - release - end - -Route117_EventScript_1F3BB8:: @ 81F3BB8 - trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CEB6, Route117_Text_29CEF6, Route117_Text_29CF6E - msgbox Route117_Text_29CF1C, 6 - end - -Route117_EventScript_1F3BD3:: @ 81F3BD3 - trainerbattle 6, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CD9D, Route117_Text_29CDE9, Route117_Text_29CE52, Route117_EventScript_1F3C03 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route117_EventScript_1F3C1C - msgbox Route117_Text_29CE17, 4 - release - end - -Route117_EventScript_1F3C03:: @ 81F3C03 - msgbox Route117_Text_29CD1D, 4 - setvar VAR_0x8004, 287 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 287 - callstd 8 - release - end - -Route117_EventScript_1F3C1C:: @ 81F3C1C - trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CFAA, Route117_Text_29CFED, Route117_Text_29D053 - msgbox Route117_Text_29CFFE, 6 - end - -Route117_EventScript_1F3C37:: @ 81F3C37 - trainerbattle 0, TRAINER_MELINA, 0, Route117_Text_29D0B7, Route117_Text_29D0F1 - msgbox Route117_Text_29D10E, 6 - end - -Route117_EventScript_1F3C4E:: @ 81F3C4E - trainerbattle 0, TRAINER_BRANDI, 0, Route117_Text_29D14B, Route117_Text_29D189 - msgbox Route117_Text_29D196, 6 - end - -Route117_EventScript_1F3C65:: @ 81F3C65 - trainerbattle 0, TRAINER_AISHA, 0, Route117_Text_29D1D1, Route117_Text_29D206 - msgbox Route117_Text_29D24C, 6 - end - -Route117_Text_1F3C7C: @ 81F3C7C - .string "I left my POKéMON at the DAY CARE.\p" - .string "When I got it back, it had a new move\n" - .string "that I didn’t teach it.\l" - .string "I was really, really surprised.$" - -Route117_Text_1F3CFD: @ 81F3CFD - .string "What do you think?\n" - .string "Aren’t these flowers pretty?\p" - .string "I planted them all!$" - -Route117_Text_1F3D41: @ 81F3D41 - .string "The air is tasty here!$" - -Route117_Text_1F3D58: @ 81F3D58 - .string "ROUTE 117\n" - .string "{0x7B} VERDANTURF TOWN$" - -Route117_Text_1F3D74: @ 81F3D74 - .string "ROUTE 117\n" - .string "{0x7C} MAUVILLE CITY$" - -Route117_Text_1F3D8E: @ 81F3D8E - .string "POKéMON DAY CARE\n" - .string "“Let us raise your POKéMON.â€$" - diff --git a/data/scripts/maps/Route117_PokemonDayCare.inc b/data/scripts/maps/Route117_PokemonDayCare.inc deleted file mode 100644 index b2e9ddfaa..000000000 --- a/data/scripts/maps/Route117_PokemonDayCare.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route117_PokemonDayCare_MapScripts:: @ 822BBB1 - map_script 3, Route117_PokemonDayCare_MapScript1_22BBB7 - .byte 0 - -Route117_PokemonDayCare_MapScript1_22BBB7: @ 822BBB7 - setflag FLAG_LANDMARK_POKEMON_DAYCARE - end - diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc deleted file mode 100644 index 818111b81..000000000 --- a/data/scripts/maps/Route118.inc +++ /dev/null @@ -1,318 +0,0 @@ -Route118_MapScripts:: @ 81F3DBC - map_script 3, Route118_MapScript1_1F3DCC - map_script 1, Route118_MapScript1_1F3DF3 - map_script 2, Route118_MapScript2_1F3E0A - .byte 0 - -Route118_MapScript1_1F3DCC: @ 81F3DCC - call Route118_EventScript_28CCC7 - compare VAR_0x4039, 1 - call_if 1, Route118_EventScript_273D13 - compare VAR_0x4037, 7 - call_if 1, Route118_EventScript_273D1B - compare VAR_0x4037, 8 - call_if 1, Route118_EventScript_273D1B - end - -Route118_MapScript1_1F3DF3: @ 81F3DF3 - compare VAR_0x4037, 7 - call_if 1, Route118_EventScript_273985 - compare VAR_0x4037, 8 - call_if 1, Route118_EventScript_273998 - end - -Route118_MapScript2_1F3E0A: @ 81F3E0A - map_script_2 VAR_0x4039, 1, gUnknown_08273D1F - .2byte 0 - -Route118_EventScript_1F3E14:: @ 81F3E14 - lock - faceplayer - checkflag FLAG_0x0E3 - goto_eq Route118_EventScript_1F3E69 - msgbox Route118_Text_1F427B, 5 - compare VAR_RESULT, 1 - goto_eq Route118_EventScript_1F3E3E - compare VAR_RESULT, 0 - goto_eq Route118_EventScript_1F3E5F - end - -Route118_EventScript_1F3E3E:: @ 81F3E3E - msgbox Route118_Text_1F42AF, 4 - giveitem_std ITEM_GOOD_ROD - setflag FLAG_0x0E3 - msgbox Route118_Text_1F42E7, 4 - release - end - -Route118_EventScript_1F3E5F:: @ 81F3E5F - msgbox Route118_Text_1F4319, 4 - release - end - -Route118_EventScript_1F3E69:: @ 81F3E69 - msgbox Route118_Text_1F4331, 4 - release - end - -Route118_EventScript_1F3E73:: @ 81F3E73 - msgbox Route118_Text_1F4367, 2 - end - -Route118_EventScript_1F3E7C:: @ 81F3E7C - msgbox Route118_Text_1F43F4, 3 - end - -Route118_EventScript_1F3E85:: @ 81F3E85 - msgbox Route118_Text_1F440E, 3 - end - -Route118_EventScript_1F3E8E:: @ 81F3E8E - lockall - setvar VAR_0x8008, 0 - applymovement 255, Route118_Movement_2725B2 - waitmovement 0 - applymovement 19, Route118_Movement_1F3F61 - waitmovement 0 - goto Route118_EventScript_1F3EE4 - end - -Route118_EventScript_1F3EAE:: @ 81F3EAE - lockall - setvar VAR_0x8008, 1 - applymovement 255, Route118_Movement_2725B2 - waitmovement 0 - goto Route118_EventScript_1F3EE4 - end - -Route118_EventScript_1F3EC4:: @ 81F3EC4 - lockall - setvar VAR_0x8008, 2 - applymovement 255, Route118_Movement_2725B2 - waitmovement 0 - applymovement 19, Route118_Movement_1F3F63 - waitmovement 0 - goto Route118_EventScript_1F3EE4 - end - -Route118_EventScript_1F3EE4:: @ 81F3EE4 - playse SE_DANSA - applymovement 19, Route118_Movement_1F3F65 - waitmovement 0 - delay 30 - msgbox Route118_Text_1F40BE, 4 - closemessage - compare VAR_0x8008, 0 - call_if 1, Route118_EventScript_1F3F28 - compare VAR_0x8008, 1 - call_if 1, Route118_EventScript_1F3F3A - compare VAR_0x8008, 2 - call_if 1, Route118_EventScript_1F3F4C - setvar VAR_0x4071, 1 - removeobject 19 - releaseall - end - -Route118_EventScript_1F3F28:: @ 81F3F28 - applymovement 255, Route118_Movement_1F3F5E - applymovement 19, Route118_Movement_1F3F69 - waitmovement 0 - return - -Route118_EventScript_1F3F3A:: @ 81F3F3A - applymovement 255, Route118_Movement_1F3F5E - applymovement 19, Route118_Movement_1F3F74 - waitmovement 0 - return - -Route118_EventScript_1F3F4C:: @ 81F3F4C - applymovement 255, Route118_Movement_1F3F5E - applymovement 19, Route118_Movement_1F3F7E - waitmovement 0 - return - -Route118_Movement_1F3F5E: @ 81F3F5E - delay_16 - walk_in_place_fastest_right - step_end - -Route118_Movement_1F3F61: @ 81F3F61 - walk_left - step_end - -Route118_Movement_1F3F63: @ 81F3F63 - walk_right - step_end - -Route118_Movement_1F3F65: @ 81F3F65 - jump_2_down - delay_16 - walk_down - step_end - -Route118_Movement_1F3F69: @ 81F3F69 - 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 - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - step_end - -Route118_Movement_1F3F7E: @ 81F3F7E - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - step_end - -Route118_EventScript_1F3F87:: @ 81F3F87 - trainerbattle 2, TRAINER_ROSE_1, 0, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route118_EventScript_1F3FD2 - msgbox Route118_Text_29D2FA, 4 - release - end - -Route118_EventScript_1F3FB3:: @ 81F3FB3 - special sub_80B4808 - waitmovement 0 - msgbox Route118_Text_29D343, 4 - setvar VAR_0x8004, 37 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 37 - callstd 8 - release - end - -Route118_EventScript_1F3FD2:: @ 81F3FD2 - trainerbattle 5, TRAINER_ROSE_1, 0, Route118_Text_29D382, Route118_Text_29D3AA - msgbox Route118_Text_29D3D9, 6 - end - -Route118_EventScript_1F3FE9:: @ 81F3FE9 - trainerbattle 0, TRAINER_BARNY, 0, Route118_Text_29D515, Route118_Text_29D55C - msgbox Route118_Text_29D587, 6 - end - -Route118_EventScript_1F4000:: @ 81F4000 - trainerbattle 0, TRAINER_WADE, 0, Route118_Text_29D5DF, Route118_Text_29D64C - msgbox Route118_Text_29D663, 6 - end - -Route118_EventScript_1F4017:: @ 81F4017 - trainerbattle 2, TRAINER_DALTON_1, 0, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route118_EventScript_1F4062 - msgbox Route118_Text_29D6D8, 4 - release - end - -Route118_EventScript_1F4043:: @ 81F4043 - special sub_80B4808 - waitmovement 0 - msgbox Route118_Text_29D74A, 4 - setvar VAR_0x8004, 196 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 196 - callstd 8 - release - end - -Route118_EventScript_1F4062:: @ 81F4062 - trainerbattle 5, TRAINER_DALTON_1, 0, Route118_Text_29D789, Route118_Text_29D7CA - msgbox Route118_Text_29D7D5, 6 - end - -Route118_EventScript_1F4079:: @ 81F4079 - trainerbattle 0, TRAINER_PERRY, 0, Route118_Text_29D41D, Route118_Text_29D45B - msgbox Route118_Text_29D46C, 6 - end - -Route118_EventScript_1F4090:: @ 81F4090 - trainerbattle 0, TRAINER_CHESTER, 0, Route118_Text_29D4A6, Route118_Text_29D4C4 - msgbox Route118_Text_29D4DA, 6 - end - -Route118_EventScript_1F40A7:: @ 81F40A7 - trainerbattle 0, TRAINER_DEANDRE, 0, Route118_Text_29D81B, Route118_Text_29D83C - msgbox Route118_Text_29D872, 6 - end - -Route118_Text_1F40BE: @ 81F40BE - .string "STEVEN: Hi, {PLAYER}{KUN}!\p" - .string "It’s me, STEVEN!\n" - .string "We met in the cave near DEWFORD.\p" - .string "Have you met many kinds of POKéMON\n" - .string "since I last saw you?\p" - .string "There are many, many kinds of POKéMON\n" - .string "in this wide world of ours.\p" - .string "If you wanted to raise only your\n" - .string "favorites, that’s fine.\p" - .string "Perhaps you find it more fun to raise\n" - .string "all sorts of POKéMON.\p" - .string "As a TRAINER of POKéMON,\n" - .string "what do you think?\p" - .string "Of course, it’s not any of my business.\p" - .string "It would be nice if we were to meet\n" - .string "again somewhere.$" - -Route118_Text_1F427B: @ 81F427B - .string "Hmm!\n" - .string "A GOOD ROD is really good!\p" - .string "Wouldn’t you agree?$" - -Route118_Text_1F42AF: @ 81F42AF - .string "Hmm!\n" - .string "We’re of identical minds!\p" - .string "Hmm!\n" - .string "Take this GOOD ROD!$" - -Route118_Text_1F42E7: @ 81F42E7 - .string "Wherever there’s water, try your luck\n" - .string "at fishing.$" - -Route118_Text_1F4319: @ 81F4319 - .string "Don’t you like to fish?$" - -Route118_Text_1F4331: @ 81F4331 - .string "Try catching all sorts of POKéMON\n" - .string "with your GOOD ROD.$" - -Route118_Text_1F4367: @ 81F4367 - .string "Even if there isn’t a boat, you can\n" - .string "cross rivers and the sea if you have\l" - .string "a POKéMON that knows SURF.\p" - .string "POKéMON can be counted on to do so\n" - .string "much!$" - -Route118_Text_1F43F4: @ 81F43F4 - .string "ROUTE 118\n" - .string "{0x7B} MAUVILLE CITY$" - -Route118_Text_1F440E: @ 81F440E - .string "ROUTE 118\n" - .string "{0x79} ROUTE 119$" - diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc deleted file mode 100644 index a4b6a5fb1..000000000 --- a/data/scripts/maps/Route119.inc +++ /dev/null @@ -1,637 +0,0 @@ -Route119_MapScripts:: @ 81F4424 - map_script 5, Route119_MapScript1_1F442F - map_script 3, Route119_MapScript1_1F444D - .byte 0 - -Route119_MapScript1_1F442F: @ 81F442F - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, Route119_EventScript_1F4439 - end - -Route119_EventScript_1F4439:: @ 81F4439 - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 7 - goto_if 5, Route119_EventScript_27374E - removeobject VAR_LAST_TALKED - return - -Route119_MapScript1_1F444D: @ 81F444D - call Route119_EventScript_271ED7 - call Route119_EventScript_271EFB - compare VAR_WEATHER_INSTITUTE_STATE, 1 - call_if 1, Route119_EventScript_1F4466 - special SetRoute119Weather - end - -Route119_EventScript_1F4466:: @ 81F4466 - setflag FLAG_0x37D - clearflag FLAG_0x37C - setvar VAR_WEATHER_INSTITUTE_STATE, 2 - return - -Route119_EventScript_1F4472:: @ 81F4472 - setvar VAR_TEMP_1, 1 - goto Route119_EventScript_1F4488 - end - -Route119_EventScript_1F447D:: @ 81F447D - setvar VAR_TEMP_1, 2 - goto Route119_EventScript_1F4488 - end - -Route119_EventScript_1F4488:: @ 81F4488 - lockall - addobject 25 - checkplayergender - compare VAR_RESULT, 0 - call_if 1, Route119_EventScript_1F4501 - compare VAR_RESULT, 1 - call_if 1, Route119_EventScript_1F4506 - delay 65 - compare VAR_TEMP_1, 1 - call_if 1, Route119_EventScript_1F46C6 - compare VAR_TEMP_1, 2 - call_if 1, Route119_EventScript_1F46D1 - applymovement 255, Route119_Movement_2725AA - waitmovement 0 - delay 30 - compare VAR_TEMP_1, 1 - call_if 1, Route119_EventScript_1F4700 - compare VAR_TEMP_1, 2 - call_if 1, Route119_EventScript_1F470F - removeobject 25 - addobject 16 - delay 30 - checkplayergender - compare VAR_RESULT, 0 - goto_eq Route119_EventScript_1F450B - compare VAR_RESULT, 1 - goto_eq Route119_EventScript_1F4585 - releaseall - end - -Route119_EventScript_1F4501:: @ 81F4501 - playbgm MUS_GIRL_SUP, 1 - return - -Route119_EventScript_1F4506:: @ 81F4506 - playbgm MUS_BOY_SUP, 1 - return - -Route119_EventScript_1F450B:: @ 81F450B - msgbox Route119_Text_1F49FD, 4 - switch VAR_FIRST_POKE - case 0, Route119_EventScript_1F453A - case 1, Route119_EventScript_1F454A - case 2, Route119_EventScript_1F455A - end - -Route119_EventScript_1F453A:: @ 81F453A - trainerbattle 3, TRAINER_MAY_6, 0, Route119_Text_1F4A98 - goto Route119_EventScript_1F456A - end - -Route119_EventScript_1F454A:: @ 81F454A - trainerbattle 3, TRAINER_MAY_9, 0, Route119_Text_1F4A98 - goto Route119_EventScript_1F456A - end - -Route119_EventScript_1F455A:: @ 81F455A - trainerbattle 3, TRAINER_MAY_3, 0, Route119_Text_1F4A98 - goto Route119_EventScript_1F456A - end - -Route119_EventScript_1F456A:: @ 81F456A - msgbox Route119_Text_1F4AF3, 4 - call Route119_EventScript_1F45FF - msgbox Route119_Text_1F4B56, 4 - goto Route119_EventScript_1F460F - end - -Route119_EventScript_1F4585:: @ 81F4585 - msgbox Route119_Text_1F4C9A, 4 - switch VAR_FIRST_POKE - case 0, Route119_EventScript_1F45B4 - case 1, Route119_EventScript_1F45C4 - case 2, Route119_EventScript_1F45D4 - end - -Route119_EventScript_1F45B4:: @ 81F45B4 - trainerbattle 3, TRAINER_BRENDAN_6, 0, Route119_Text_1F4D24 - goto Route119_EventScript_1F45E4 - end - -Route119_EventScript_1F45C4:: @ 81F45C4 - trainerbattle 3, TRAINER_BRENDAN_9, 0, Route119_Text_1F4D24 - goto Route119_EventScript_1F45E4 - end - -Route119_EventScript_1F45D4:: @ 81F45D4 - trainerbattle 3, TRAINER_BRENDAN_3, 0, Route119_Text_1F4D24 - goto Route119_EventScript_1F45E4 - end - -Route119_EventScript_1F45E4:: @ 81F45E4 - msgbox Route119_Text_1F4D4B, 4 - call Route119_EventScript_1F45FF - msgbox Route119_Text_1F4DB5, 4 - goto Route119_EventScript_1F460F - end - -Route119_EventScript_1F45FF:: @ 81F45FF - giveitem_std ITEM_HM02 - setflag FLAG_0x06E - return - -Route119_EventScript_1F460F:: @ 81F460F - closemessage - compare VAR_TEMP_1, 1 - call_if 1, Route119_EventScript_1F4700 - compare VAR_TEMP_1, 2 - call_if 1, Route119_EventScript_1F470F - removeobject 16 - addobject 25 - delay 30 - compare VAR_TEMP_1, 1 - call_if 1, Route119_EventScript_1F46DC - compare VAR_TEMP_1, 2 - call_if 1, Route119_EventScript_1F46EE - removeobject 25 - setvar VAR_0x4072, 1 - savebgm MUS_DUMMY - fadedefaultbgm - delay 60 - compare VAR_TEMP_1, 1 - call_if 1, Route119_EventScript_1F46A0 - compare VAR_TEMP_1, 2 - call_if 1, Route119_EventScript_1F46A8 - addobject 43 - applymovement 43, Route119_Movement_1F4752 - waitmovement 0 - addvar VAR_0x40D1, 1 - msgbox Route119_Text_1F4E60, 4 - closemessage - compare VAR_TEMP_1, 1 - call_if 1, Route119_EventScript_1F46B0 - compare VAR_TEMP_1, 2 - call_if 1, Route119_EventScript_1F46BB - removeobject 43 - releaseall - end - -Route119_EventScript_1F46A0:: @ 81F46A0 - setobjectxyperm 43, 27, 25 - return - -Route119_EventScript_1F46A8:: @ 81F46A8 - setobjectxyperm 43, 28, 25 - return - -Route119_EventScript_1F46B0:: @ 81F46B0 - applymovement 43, Route119_Movement_1F475A - waitmovement 0 - return - -Route119_EventScript_1F46BB:: @ 81F46BB - applymovement 43, Route119_Movement_1F4763 - waitmovement 0 - return - -Route119_EventScript_1F46C6:: @ 81F46C6 - applymovement 25, Route119_Movement_1F4728 - waitmovement 0 - return - -Route119_EventScript_1F46D1:: @ 81F46D1 - applymovement 25, Route119_Movement_1F4732 - waitmovement 0 - return - -Route119_EventScript_1F46DC:: @ 81F46DC - applymovement 255, Route119_Movement_1F471E - applymovement 25, Route119_Movement_1F473D - waitmovement 0 - return - -Route119_EventScript_1F46EE:: @ 81F46EE - applymovement 255, Route119_Movement_1F4723 - applymovement 25, Route119_Movement_1F4747 - waitmovement 0 - return - -Route119_EventScript_1F4700:: @ 81F4700 - setobjectxyperm 16, 25, 32 - setobjectxyperm 25, 25, 32 - return - -Route119_EventScript_1F470F:: @ 81F470F - setobjectxyperm 16, 26, 32 - setobjectxyperm 25, 26, 32 - return - -Route119_Movement_1F471E: @ 81F471E - delay_16 - walk_in_place_fastest_right - delay_8 - walk_in_place_fastest_up - step_end - -Route119_Movement_1F4723: @ 81F4723 - delay_16 - walk_in_place_fastest_left - delay_8 - walk_in_place_fastest_up - step_end - -Route119_Movement_1F4728: @ 81F4728 - 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 - 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 - 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 - 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 - walk_down - walk_down - walk_down - walk_down - walk_left - walk_left - walk_down - step_end - -Route119_Movement_1F475A: @ 81F475A - walk_up - walk_right - walk_right - walk_up - walk_up - walk_up - walk_up - walk_up - step_end - -Route119_Movement_1F4763: @ 81F4763 - walk_up - walk_right - walk_up - walk_up - walk_up - walk_up - walk_up - step_end - -Route119_EventScript_1F476B:: @ 81F476B - msgbox Route119_Text_1F5261, 2 - end - -Route119_EventScript_1F4774:: @ 81F4774 - msgbox Route119_Text_1F530E, 3 - end - -Route119_EventScript_1F477D:: @ 81F477D - msgbox Route119_Text_1F5327, 3 - end - -Route119_EventScript_1F4786:: @ 81F4786 - trainerbattle 0, TRAINER_BRENT, 0, Route119_Text_29D8C2, Route119_Text_29D8F0 - msgbox Route119_Text_29D902, 6 - end - -Route119_EventScript_1F479D:: @ 81F479D - trainerbattle 0, TRAINER_DONALD, 0, Route119_Text_29D941, Route119_Text_29D97C - msgbox Route119_Text_29D993, 6 - end - -Route119_EventScript_1F47B4:: @ 81F47B4 - trainerbattle 0, TRAINER_TAYLOR, 0, Route119_Text_29D9CD, Route119_Text_29DA14 - msgbox Route119_Text_29DA2C, 6 - end - -Route119_EventScript_1F47CB:: @ 81F47CB - trainerbattle 0, TRAINER_DOUG, 0, Route119_Text_29DA7D, Route119_Text_29DABC - msgbox Route119_Text_29DADB, 6 - end - -Route119_EventScript_1F47E2:: @ 81F47E2 - trainerbattle 0, TRAINER_GREG, 0, Route119_Text_29DB17, Route119_Text_29DB66 - msgbox Route119_Text_29DB7C, 6 - end - -Route119_EventScript_1F47F9:: @ 81F47F9 - trainerbattle 0, TRAINER_KENT, 0, Route119_Text_29DBC2, Route119_Text_29DC20 - msgbox Route119_Text_29DC2B, 6 - end - -Route119_EventScript_1F4810:: @ 81F4810 - trainerbattle 2, TRAINER_JACKSON_1, 0, Route119_Text_29DC4C, Route119_Text_29DC9F, Route119_EventScript_1F483C - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route119_EventScript_1F485B - msgbox Route119_Text_29DCC6, 4 - release - end - -Route119_EventScript_1F483C:: @ 81F483C - special sub_80B4808 - waitmovement 0 - msgbox Route119_Text_29DD1C, 4 - setvar VAR_0x8004, 552 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 552 - callstd 8 - release - end - -Route119_EventScript_1F485B:: @ 81F485B - trainerbattle 5, TRAINER_JACKSON_1, 0, Route119_Text_29DD62, Route119_Text_29DDA5 - msgbox Route119_Text_29DDBD, 6 - end - -Route119_EventScript_1F4872:: @ 81F4872 - trainerbattle 2, TRAINER_CATHERINE_1, 0, Route119_Text_29DE0F, Route119_Text_29DE5D, Route119_EventScript_1F489E - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route119_EventScript_1F48BD - msgbox Route119_Text_29DE88, 4 - release - end - -Route119_EventScript_1F489E:: @ 81F489E - special sub_80B4808 - waitmovement 0 - msgbox Route119_Text_29DEF7, 4 - setvar VAR_0x8004, 559 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 559 - callstd 8 - release - end - -Route119_EventScript_1F48BD:: @ 81F48BD - trainerbattle 5, TRAINER_CATHERINE_1, 0, Route119_Text_29DF6B, Route119_Text_29DF92 - msgbox Route119_Text_29DFAF, 6 - end - -Route119_EventScript_1F48D4:: @ 81F48D4 - trainerbattle 0, TRAINER_HUGH, 0, Route119_Text_29E007, Route119_Text_29E063 - msgbox Route119_Text_29E071, 6 - end - -Route119_EventScript_1F48EB:: @ 81F48EB - trainerbattle 0, TRAINER_PHIL, 0, Route119_Text_29E0A5, Route119_Text_29E0E1 - msgbox Route119_Text_29E0F6, 6 - end - -Route119_EventScript_1F4902:: @ 81F4902 - trainerbattle 0, TRAINER_YASU, 0, Route119_Text_29E134, Route119_Text_29E18D - msgbox Route119_Text_29E19D, 6 - end - -Route119_EventScript_1F4919:: @ 81F4919 - trainerbattle 0, TRAINER_TAKASHI, 0, Route119_Text_29E1F5, Route119_Text_29E22B - msgbox Route119_Text_29E245, 6 - end - -Route119_EventScript_1F4930:: @ 81F4930 - trainerbattle 0, TRAINER_HIDEO, 0, Route119_Text_29E26A, Route119_Text_29E288 - msgbox Route119_Text_29E2A3, 6 - end - -Route119_EventScript_1F4947:: @ 81F4947 - trainerbattle 0, TRAINER_CHRIS, 0, Route119_Text_29E30D, Route119_Text_29E372 - msgbox Route119_Text_29E3A2, 6 - end - -Route119_EventScript_1F495E:: @ 81F495E - trainerbattle 0, TRAINER_FABIAN, 0, Route119_Text_29E3FF, Route119_Text_29E44F - msgbox Route119_Text_29E492, 6 - end - -Route119_EventScript_1F4975:: @ 81F4975 - trainerbattle 0, TRAINER_DAYTON, 0, Route119_Text_29E4DF, Route119_Text_29E513 - msgbox Route119_Text_29E532, 6 - end - -Route119_EventScript_1F498C:: @ 81F498C - trainerbattle 0, TRAINER_RACHEL, 0, Route119_Text_29E56F, Route119_Text_29E5B1 - msgbox Route119_Text_29E5CB, 6 - end - -Route119_EventScript_1F49A3:: @ 81F49A3 - lock - faceplayer - msgbox Route119_Text_1F50EB, 4 - closemessage - applymovement VAR_LAST_TALKED, Route119_Movement_2725A2 - waitmovement 0 - release - end - -Route119_EventScript_1F49BA:: @ 81F49BA - lock - faceplayer - msgbox Route119_Text_1F5147, 4 - closemessage - applymovement VAR_LAST_TALKED, Route119_Movement_2725A2 - waitmovement 0 - release - end - -Route119_EventScript_1F49D1:: @ 81F49D1 - msgbox Route119_Text_1F51A2, 2 - end - -Route119_EventScript_1F49DA:: @ 81F49DA - msgbox Route119_Text_1F52B9, 2 - end - -Route119_EventScript_1F49E3:: @ 81F49E3 - msgbox Route119_Text_1F5339, 3 - end - -Route119_EventScript_1F49EC:: @ 81F49EC - lockall - pokenavcall Route119_Text_1F4FBA - waitmessage - clearflag FLAG_0x08A - addvar VAR_0x40D1, 1 - releaseall - end - -Route119_Text_1F49FD: @ 81F49FD - .string "MAY: {PLAYER}{KUN}!\n" - .string "Where were you? I was looking for you!\p" - .string "How much stronger have you gotten?\n" - .string "Let me check for you!\p" - .string "Ready with your POKéMON?\n" - .string "Of course you are! Go!$" - -Route119_Text_1F4A98: @ 81F4A98 - .string "Achah!\n" - .string "{PLAYER}{KUN}, you’re strong!\p" - .string "I was worried that you might be\n" - .string "struggling with your training.$" - -Route119_Text_1F4AF3: @ 81F4AF3 - .string "MAY: But I had absolutely nothing to\n" - .string "worry about! Keep it up!\p" - .string "And, here! I have a present for you.$" - -Route119_Text_1F4B56: @ 81F4B56 - .string "MAY: Use FLY, and your POKéMON will\n" - .string "instantly carry you to any town you’ve\l" - .string "already visited.\p" - .string "But, to use FLY, you have to get\n" - .string "the GYM BADGE from FORTREE CITY.\l" - .string "That’s important, so don’t forget.\p" - .string "You should FLY home and visit\n" - .string "LITTLEROOT for a change.\p" - .string "I bet your mom’s worried about you,\n" - .string "{PLAYER}{KUN}.\p" - .string "Well, let’s meet again somewhere!$" - -Route119_Text_1F4C9A: @ 81F4C9A - .string "BRENDAN: {PLAYER}! So this is where\n" - .string "you’ve been looking for POKéMON?\p" - .string "Let me see how good you got.\n" - .string "I’ll test you!\p" - .string "Now!\n" - .string "It’s a battle, so battle!$" - -Route119_Text_1F4D24: @ 81F4D24 - .string "Hmm…\n" - .string "You’ve gotten pretty darn decent.$" - -Route119_Text_1F4D4B: @ 81F4D4B - .string "BRENDAN: I’d say you’re good enough\n" - .string "to search for POKéMON anywhere.\p" - .string "Here, I’ll give you this.\n" - .string "Try it out.$" - -Route119_Text_1F4DB5: @ 81F4DB5 - .string "BRENDAN: Use FLY, and your POKéMON\n" - .string "instantly carries you to any town\l" - .string "you’ve already visited.\p" - .string "But you need the FORTREE GYM BADGE \n" - .string "to do that.\p" - .string "Anyway, I have to move along.$" - -Route119_Text_1F4E60: @ 81F4E60 - .string "SCOTT: Hahahah!\n" - .string "Way to go, {PLAYER}{KUN}!\p" - .string "I just passed by a TRAINER riding\n" - .string "a BIKE.\p" - .string "You just beat that TRAINER, didn’t you?\n" - .string "It was pretty obvious that you did.\p" - .string "The kid looked really upset with\n" - .string "a face all red from anger.\p" - .string "I sure seem to run into you often.\n" - .string "Are you off to FORTREE GYM next?\p" - .string "I expect that you’ll do well at the GYM.\n" - .string "Well, I’ll be seeing you!$" - - -Route119_Text_1F4FBA: @ 81F4FBA - .string "… … … … … …\n" - .string "… … … … … Beep!\p" - .string "SCOTT: Hiya, {PLAYER}{KUN}, it’s me!\p" - .string "Just as I thought, you won at\n" - .string "the FORTREE GYM.\p" - .string "Your strength…\n" - .string "Perhaps you really are the TRAINER\l" - .string "that I’ve been searching for.\p" - .string "Remember, you have a fan in me.\n" - .string "I’ll be cheering from the sidelines.\l" - .string "Keep up the great work!\p" - .string "… … … … … …\n" - .string "… … … … … Click!$" - -Route119_Text_1F50EB: @ 81F50EB - .string "We’re standing lookout here.\p" - .string "Hey, you! Stay away from the WEATHER\n" - .string "INSTITUTE. It’s not safe.$" - -Route119_Text_1F5147: @ 81F5147 - .string "Lookout duty is surprisingly boring.\p" - .string "Hey, you! Please don’t go near the\n" - .string "WEATHER INSTITUTE.$" - -Route119_Text_1F51A2: @ 81F51A2 - .string "I thought you FLY by catching a whole\n" - .string "flock of BIRD POKéMON, and then\l" - .string "hanging on to them somehow.\p" - .string "But it turns out there’s an HM move\n" - .string "called FLY!\p" - .string "I wish I’d known about that a long\n" - .string "time ago…$" - -Route119_Text_1F5261: @ 81F5261 - .string "Tch…\n" - .string "It’s a no-go…\p" - .string "The tall grass snares BIKE tires.\n" - .string "There’s no way you can cycle here.$" - -Route119_Text_1F52B9: @ 81F52B9 - .string "Can your POKéMON use its SECRET POWER\n" - .string "on a big pile of grass and make a\l" - .string "SECRET BASE?$" - -Route119_Text_1F530E: @ 81F530E - .string "ROUTE 119\n" - .string "{0x7C} FORTREE CITY$" - -Route119_Text_1F5327: @ 81F5327 - .string "WEATHER INSTITUTE$" - -Route119_Text_1F5339: @ 81F5339 - .string "TRAINER TIPS\p" - .string "Up to sixteen decorations and\n" - .string "furniture items can be placed in\l" - .string "a SECRET BASE.\p" - .string "Pick your favorite items and create\n" - .string "your very own SECRET BASE exactly the\l" - .string "way you want.$" diff --git a/data/scripts/maps/Route119_House.inc b/data/scripts/maps/Route119_House.inc deleted file mode 100644 index 5e633437d..000000000 --- a/data/scripts/maps/Route119_House.inc +++ /dev/null @@ -1,27 +0,0 @@ -Route119_House_MapScripts:: @ 8270965 - .byte 0 - -Route119_House_EventScript_270966:: @ 8270966 - msgbox Route119_House_Text_270982, 2 - end - -Route119_House_EventScript_27096F:: @ 827096F - lock - faceplayer - waitse - playmoncry SPECIES_WINGULL, 0 - msgbox Route119_House_Text_270A17, 4 - waitmoncry - release - end - -Route119_House_Text_270982: @ 8270982 - .string "I heard about a cave called the CAVE\n" - .string "OF ORIGIN.\p" - .string "People rumor that the spirits of\n" - .string "POKéMON are revived there. Could\l" - .string "something like that really happen?$" - -Route119_House_Text_270A17: @ 8270A17 - .string "WINGULL: Pihyoh!$" - diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/scripts/maps/Route119_WeatherInstitute_1F.inc deleted file mode 100644 index b008f52c0..000000000 --- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc +++ /dev/null @@ -1,139 +0,0 @@ -Route119_WeatherInstitute_1F_MapScripts:: @ 826FA86 - map_script 3, Route119_WeatherInstitute_1F_MapScript1_26FA8C - .byte 0 - -Route119_WeatherInstitute_1F_MapScript1_26FA8C: @ 826FA8C - compare VAR_WEATHER_INSTITUTE_STATE, 0 - call_if 1, Route119_WeatherInstitute_1F_EventScript_26FA98 - end - -Route119_WeatherInstitute_1F_EventScript_26FA98:: @ 826FA98 - setobjectxyperm 5, 0, 5 - setobjectmovementtype 5, 10 - return - -Route119_WeatherInstitute_1F_EventScript_26FAA4:: @ 826FAA4 - lock - faceplayer - special GetPlayerBigGuyGirlString - compare VAR_WEATHER_INSTITUTE_STATE, 0 - goto_eq Route119_WeatherInstitute_1F_EventScript_26FABE - msgbox Route119_WeatherInstitute_1F_Text_26FCE5, 4 - release - end - -Route119_WeatherInstitute_1F_EventScript_26FABE:: @ 826FABE - msgbox Route119_WeatherInstitute_1F_Text_26FCB7, 4 - release - end - -Route119_WeatherInstitute_1F_EventScript_26FAC8:: @ 826FAC8 - lock - faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, Route119_WeatherInstitute_1F_EventScript_26FB05 - setvar VAR_0x8004, 0 - checkflag FLAG_0x1BE - call_if 1, Route119_WeatherInstitute_1F_EventScript_26FAFF - checkflag FLAG_0x1BF - call_if 1, Route119_WeatherInstitute_1F_EventScript_26FAFF - compare VAR_0x8004, 2 - goto_eq Route119_WeatherInstitute_1F_EventScript_26FB05 - msgbox Route119_WeatherInstitute_1F_Text_26FDE8, 4 - release - end - -Route119_WeatherInstitute_1F_EventScript_26FAFF:: @ 826FAFF - addvar VAR_0x8004, 1 - return - -Route119_WeatherInstitute_1F_EventScript_26FB05:: @ 826FB05 - msgbox Route119_WeatherInstitute_1F_Text_26FD2E, 4 - release - end - -Route119_WeatherInstitute_1F_EventScript_26FB0F:: @ 826FB0F - msgbox Route119_WeatherInstitute_1F_Text_26FE94, 2 - end - -Route119_WeatherInstitute_1F_EventScript_26FB18:: @ 826FB18 - lockall - msgbox Route119_WeatherInstitute_1F_Text_26FEFC, 4 - closemessage - call Route119_WeatherInstitute_1F_EventScript_272083 - releaseall - end - -Route119_WeatherInstitute_1F_EventScript_26FB29:: @ 826FB29 - trainerbattle 0, TRAINER_GRUNT_11, 0, Route119_WeatherInstitute_1F_Text_26FB57, Route119_WeatherInstitute_1F_Text_26FBBB - msgbox Route119_WeatherInstitute_1F_Text_26FBD7, 6 - end - -Route119_WeatherInstitute_1F_EventScript_26FB40:: @ 826FB40 - trainerbattle 0, TRAINER_GRUNT_20, 0, Route119_WeatherInstitute_1F_Text_26FC34, Route119_WeatherInstitute_1F_Text_26FC52 - msgbox Route119_WeatherInstitute_1F_Text_26FC60, 6 - end - -Route119_WeatherInstitute_1F_Text_26FB57: @ 826FB57 - .string "The BOSS got interested in\n" - .string "the research they have going here,\l" - .string "so he sent us out.\p" - .string "You quit meddling!$" - -Route119_WeatherInstitute_1F_Text_26FBBB: @ 826FBBB - .string "Blast it…\n" - .string "Blasted by a kid…$" - -Route119_WeatherInstitute_1F_Text_26FBD7: @ 826FBD7 - .string "Our BOSS knows everything.\p" - .string "But I’m just a GRUNT. What would I know\n" - .string "about what he’s thinking?$" - -Route119_WeatherInstitute_1F_Text_26FC34: @ 826FC34 - .string "Huh?\n" - .string "What’s a kid doing here?$" - -Route119_WeatherInstitute_1F_Text_26FC52: @ 826FC52 - .string "Huh?\n" - .string "I lost?!$" - -Route119_WeatherInstitute_1F_Text_26FC60: @ 826FC60 - .string "Oh, no…\n" - .string "I’ll catch an earful for losing to a kid…\p" - .string "I should just take a nap in the bed…$" - -Route119_WeatherInstitute_1F_Text_26FCB7: @ 826FCB7 - .string "While I was sleeping, everyone went\n" - .string "upstairs!$" - -Route119_WeatherInstitute_1F_Text_26FCE5: @ 826FCE5 - .string "Wow, you’re really strong!\p" - .string "I wish I could be a POKéMON TRAINER\n" - .string "like you!$" - -Route119_WeatherInstitute_1F_Text_26FD2E: @ 826FD2E - .string "The PROFESSOR loves rain.\n" - .string "That’s a fact.\p" - .string "But if it keeps raining, people will be in\n" - .string "trouble. That’s another fact.\p" - .string "And thus, the PROFESSOR is studying\n" - .string "if the rain can be put to good use.$" - -Route119_WeatherInstitute_1F_Text_26FDE8: @ 826FDE8 - .string "On the 2nd floor of the INSTITUTE,\n" - .string "we study the weather patterns over\l" - .string "the HOENN region.\p" - .string "We’ve been noticing temporary and\n" - .string "isolated cases of droughts and\l" - .string "heavy rain lately…$" - -Route119_WeatherInstitute_1F_Text_26FE94: @ 826FE94 - .string "Hello!\n" - .string "We’ve been saved by your actions!\p" - .string "What I don’t understand is what on\n" - .string "earth the AQUAS were up to.$" - -Route119_WeatherInstitute_1F_Text_26FEFC: @ 826FEFC - .string "There’s a bed…\n" - .string "Let’s take a rest.$" - diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc deleted file mode 100644 index b2341bf3d..000000000 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ /dev/null @@ -1,339 +0,0 @@ -Route119_WeatherInstitute_2F_MapScripts:: @ 826FF1E - map_script 3, Route119_WeatherInstitute_2F_MapScript1_26FF24 - .byte 0 - -Route119_WeatherInstitute_2F_MapScript1_26FF24: @ 826FF24 - compare VAR_WEATHER_INSTITUTE_STATE, 0 - call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF44 - compare VAR_WEATHER_INSTITUTE_STATE, 1 - call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF50 - checkflag FLAG_SYS_GAME_CLEAR - call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF5C - end - -Route119_WeatherInstitute_2F_EventScript_26FF44:: @ 826FF44 - setobjectxyperm 5, 1, 6 - setobjectmovementtype 5, 10 - return - -Route119_WeatherInstitute_2F_EventScript_26FF50:: @ 826FF50 - setobjectxyperm 5, 4, 6 - setobjectmovementtype 5, 10 - return - -Route119_WeatherInstitute_2F_EventScript_26FF5C:: @ 826FF5C - setobjectxyperm 5, 2, 2 - setobjectmovementtype 5, 7 - return - -Route119_WeatherInstitute_2F_EventScript_26FF68:: @ 826FF68 - trainerbattle 0, TRAINER_GRUNT_37, 0, Route119_WeatherInstitute_2F_Text_270335, Route119_WeatherInstitute_2F_Text_27039F - msgbox Route119_WeatherInstitute_2F_Text_2703C0, 6 - end - -Route119_WeatherInstitute_2F_EventScript_26FF7F:: @ 826FF7F - trainerbattle 0, TRAINER_GRUNT_12, 0, Route119_WeatherInstitute_2F_Text_27019C, Route119_WeatherInstitute_2F_Text_270208 - msgbox Route119_WeatherInstitute_2F_Text_27022B, 6 - end - -Route119_WeatherInstitute_2F_EventScript_26FF96:: @ 826FF96 - trainerbattle 0, TRAINER_GRUNT_13, 0, Route119_WeatherInstitute_2F_Text_270292, Route119_WeatherInstitute_2F_Text_2702CE - msgbox Route119_WeatherInstitute_2F_Text_2702DA, 6 - end - -Route119_WeatherInstitute_2F_EventScript_26FFAD:: @ 826FFAD - trainerbattle 2, TRAINER_SHELLY_1, 0, Route119_WeatherInstitute_2F_Text_270409, Route119_WeatherInstitute_2F_Text_2704BD, Route119_WeatherInstitute_2F_EventScript_26FFC8 - msgbox Route119_WeatherInstitute_2F_Text_2704E4, 6 - end - -Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8 - msgbox Route119_WeatherInstitute_2F_Text_2704E4, 4 - closemessage - addobject 7 - applymovement 7, Route119_WeatherInstitute_2F_Movement_270170 - applymovement 255, Route119_WeatherInstitute_2F_Movement_27017C - waitmovement 0 - msgbox Route119_WeatherInstitute_2F_Text_270568, 4 - closemessage - playse SE_PIN - applymovement 3, Route119_WeatherInstitute_2F_Movement_272598 - waitmovement 0 - applymovement 3, Route119_WeatherInstitute_2F_Movement_27259A - waitmovement 0 - msgbox Route119_WeatherInstitute_2F_Text_2705DD, 4 - closemessage - setvar VAR_WEATHER_INSTITUTE_STATE, 1 - clearflag FLAG_0x37D - fadedefaultbgm - fadescreen 1 - setflag FLAG_0x37A - setflag FLAG_0x3E0 - removeobject 1 - removeobject 2 - removeobject 3 - removeobject 8 - removeobject 7 - applymovement 255, Route119_WeatherInstitute_2F_Movement_270184 - waitmovement 0 - fadescreen 0 - applymovement 5, Route119_WeatherInstitute_2F_Movement_270187 - waitmovement 0 - moveobjectoffscreen 5 - goto Route119_WeatherInstitute_2F_EventScript_27004D - end - -Route119_WeatherInstitute_2F_EventScript_27004D:: @ 827004D - msgbox Route119_WeatherInstitute_2F_Text_270650, 4 - setvar VAR_TEMP_1, 385 - givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0 - compare VAR_RESULT, 0 - goto_eq Route119_WeatherInstitute_2F_EventScript_270085 - compare VAR_RESULT, 1 - goto_eq Route119_WeatherInstitute_2F_EventScript_2700AD - goto Route119_WeatherInstitute_2F_EventScript_273811 - end - -Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085 - call Route119_WeatherInstitute_2F_EventScript_2700DB - msgbox gUnknown_08273374, 5 - compare VAR_RESULT, 0 - goto_eq Route119_WeatherInstitute_2F_EventScript_2700EA - call Route119_WeatherInstitute_2F_EventScript_27378B - call Route119_WeatherInstitute_2F_EventScript_2723DD - goto Route119_WeatherInstitute_2F_EventScript_2700EA - end - -Route119_WeatherInstitute_2F_EventScript_2700AD:: @ 82700AD - call Route119_WeatherInstitute_2F_EventScript_2700DB - msgbox gUnknown_08273374, 5 - compare VAR_RESULT, 0 - goto_eq Route119_WeatherInstitute_2F_EventScript_2700D0 - call Route119_WeatherInstitute_2F_EventScript_273797 - goto Route119_WeatherInstitute_2F_EventScript_2700D0 - end - -Route119_WeatherInstitute_2F_EventScript_2700D0:: @ 82700D0 - call Route119_WeatherInstitute_2F_EventScript_2737A0 - goto Route119_WeatherInstitute_2F_EventScript_2700EA - end - -Route119_WeatherInstitute_2F_EventScript_2700DB:: @ 82700DB - playfanfare MUS_FANFA4 - message Route119_WeatherInstitute_2F_Text_2706E8 - waitmessage - waitfanfare - bufferspeciesname 0, SPECIES_CASTFORM - return - -Route119_WeatherInstitute_2F_EventScript_2700EA:: @ 82700EA - msgbox Route119_WeatherInstitute_2F_Text_2706FE, 4 - setflag FLAG_0x097 - release - end - -Route119_WeatherInstitute_2F_EventScript_2700F7:: @ 82700F7 - checkflag FLAG_SYS_GAME_CLEAR - goto_eq Route119_WeatherInstitute_2F_EventScript_27010A - msgbox Route119_WeatherInstitute_2F_Text_27077E, 4 - release - end - -Route119_WeatherInstitute_2F_EventScript_27010A:: @ 827010A - setvar VAR_0x8004, 0 - checkflag FLAG_0x1BE - call_if 1, Route119_WeatherInstitute_2F_EventScript_270160 - checkflag FLAG_0x1BF - call_if 1, Route119_WeatherInstitute_2F_EventScript_270160 - compare VAR_0x8004, 2 - goto_eq Route119_WeatherInstitute_2F_EventScript_270166 - checkflag FLAG_0x002 - call_if 0, Route119_WeatherInstitute_2F_EventScript_270159 - specialvar VAR_RESULT, sub_813B374 - compare VAR_RESULT, 1 - goto_eq Route119_WeatherInstitute_2F_EventScript_27014F - msgbox Route119_WeatherInstitute_2F_Text_2707F1, 4 - release - end - -Route119_WeatherInstitute_2F_EventScript_27014F:: @ 827014F - msgbox Route119_WeatherInstitute_2F_Text_270873, 4 - release - end - -Route119_WeatherInstitute_2F_EventScript_270159:: @ 8270159 - special sub_813B2E4 - setflag FLAG_0x002 - return - -Route119_WeatherInstitute_2F_EventScript_270160:: @ 8270160 - addvar VAR_0x8004, 1 - return - -Route119_WeatherInstitute_2F_EventScript_270166:: @ 8270166 - msgbox Route119_WeatherInstitute_2F_Text_2708FC, 4 - release - end - -Route119_WeatherInstitute_2F_Movement_270170: @ 8270170 - 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 - 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 - slide_down - walk_in_place_fastest_left - step_end - -Route119_WeatherInstitute_2F_Movement_270187: @ 8270187 - walk_right - walk_right - walk_right - step_end - -Route119_WeatherInstitute_2F_EventScript_27018B:: @ 827018B - lock - faceplayer - checkflag FLAG_0x097 - goto_eq Route119_WeatherInstitute_2F_EventScript_2700F7 - goto Route119_WeatherInstitute_2F_EventScript_27004D - end - -Route119_WeatherInstitute_2F_Text_27019C: @ 827019C - .string "The INSTITUTE created a type of\n" - .string "POKéMON that has something to do with\l" - .string "the weather. We’re here to take them!$" - -Route119_WeatherInstitute_2F_Text_270208: @ 8270208 - .string "Our plan’s being spoiled by a kid?$" - -Route119_WeatherInstitute_2F_Text_27022B: @ 827022B - .string "If the POKéMON they made here can\n" - .string "control the weather freely, then we of\l" - .string "TEAM AQUA definitely need it!$" - -Route119_WeatherInstitute_2F_Text_270292: @ 8270292 - .string "We’re TEAM AQUA!\n" - .string "We appear wherever anything rare is\l" - .string "found!$" - -Route119_WeatherInstitute_2F_Text_2702CE: @ 82702CE - .string "You got me!$" - -Route119_WeatherInstitute_2F_Text_2702DA: @ 82702DA - .string "You don’t have any idea what we of\n" - .string "TEAM AQUA are working towards!\l" - .string "You stay out of our way!$" - -Route119_WeatherInstitute_2F_Text_270335: @ 8270335 - .string "Don’t tell me you’re looking for that\n" - .string "weather POKéMON, too?\p" - .string "That’s a no-no!\n" - .string "We were here to get it first!$" - -Route119_WeatherInstitute_2F_Text_27039F: @ 827039F - .string "Oh, will you look at my POKéMON?$" - -Route119_WeatherInstitute_2F_Text_2703C0: @ 82703C0 - .string "Humph, so what?\n" - .string "What we want…\p" - .string "What we really want isn’t here…\n" - .string "Ihihihihi…$" - -Route119_WeatherInstitute_2F_Text_270409: @ 8270409 - .string "Ahahahaha!\p" - .string "You’re going to meddle in TEAM AQUA’s\n" - .string "affairs?\p" - .string "You’re either absolutely fearless,\n" - .string "simply ignorant, or both!\p" - .string "You’re so cute, you’re disgusting!\n" - .string "I’ll put you down, kiddy!$" - -Route119_WeatherInstitute_2F_Text_2704BD: @ 82704BD - .string "Ahahahaha!\n" - .string "You’re disgustingly strong!$" - -Route119_WeatherInstitute_2F_Text_2704E4: @ 82704E4 - .string "It’s bad enough to have TEAM MAGMA\n" - .string "blunder about, but now there’s you!\p" - .string "What makes you want to sniff around\n" - .string "in our business, anyway?$" - -Route119_WeatherInstitute_2F_Text_270568: @ 8270568 - .string "We have a situation here!\p" - .string "A TEAM MAGMA mob just passed\n" - .string "the WEATHER INSTITUTE.\p" - .string "They appear to be headed for\n" - .string "MT. PYRE!$" - -Route119_WeatherInstitute_2F_Text_2705DD: @ 82705DD - .string "What?!\p" - .string "We can’t waste any more time here!\n" - .string "We have to hurry to MT. PYRE, too!\p" - .string "Ahahahaha!\n" - .string "TEAM MAGMA, just you wait!$" - -Route119_WeatherInstitute_2F_Text_270650: @ 8270650 - .string "Thanks!\n" - .string "Thanks to you, we’re safe!\p" - .string "It might be an odd way of thanking you,\n" - .string "but take this POKéMON.$" - -Route119_WeatherInstitute_2F_Text_2706B2: @ 82706B2 - .string "Hm? You don’t seem to have any room\n" - .string "for this POKéMON.$" - -Route119_WeatherInstitute_2F_Text_2706E8: @ 82706E8 - .string "{PLAYER} received CASTFORM!$" - -Route119_WeatherInstitute_2F_Text_2706FE: @ 82706FE - .string "That POKéMON changes shape according\n" - .string "to the weather conditions.\p" - .string "There’re plenty of them in the\n" - .string "INSTITUTE--go ahead and take it.$" - -Route119_WeatherInstitute_2F_Text_27077E: @ 827077E - .string "I’ve been researching rain for many\n" - .string "years, but it’s ridiculous to think that\l" - .string "humans can freely change the weather.$" - -Route119_WeatherInstitute_2F_Text_2707F1: @ 82707F1 - .string "I track weather patterns over\n" - .string "the HOENN region.\p" - .string "Presently, a drought has been recorded\n" - .string "in {STR_VAR_1}.\p" - .string "Could that mean, somewhere near\n" - .string "{STR_VAR_1}…$" - -Route119_WeatherInstitute_2F_Text_270873: @ 8270873 - .string "I track weather patterns over\n" - .string "the HOENN region.\p" - .string "Presently, heavy rainfall has been\n" - .string "recorded over {STR_VAR_1}.\p" - .string "Could that mean, somewhere near\n" - .string "{STR_VAR_1}…$" - -Route119_WeatherInstitute_2F_Text_2708FC: @ 82708FC - .string "Abnormal weather conditions are\n" - .string "no longer being reported.\p" - .string "The occasional rainfall is a blessing,\n" - .string "really.$" - diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc deleted file mode 100644 index 7d6876aeb..000000000 --- a/data/scripts/maps/Route120.inc +++ /dev/null @@ -1,466 +0,0 @@ -Route120_MapScripts:: @ 81F53EC - map_script 5, Route120_MapScript1_1F53FC - map_script 3, Route120_MapScript1_1F54CD - map_script 1, Route120_MapScript1_1F5474 - .byte 0 - -Route120_MapScript1_1F53FC: @ 81F53FC - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, Route120_EventScript_1F5406 - end - -Route120_EventScript_1F5406:: @ 81F5406 - compare VAR_0x8009, 0 - call_if 1, Route120_EventScript_1F5449 - compare VAR_0x8009, 1 - call_if 1, Route120_EventScript_1F5460 - compare VAR_0x8009, 2 - call_if 1, Route120_EventScript_1F5460 - compare VAR_0x8009, 3 - call_if 1, Route120_EventScript_1F5460 - compare VAR_0x8009, 4 - call_if 1, Route120_EventScript_1F5460 - compare VAR_0x8009, 5 - call_if 1, Route120_EventScript_1F5460 - return - -Route120_EventScript_1F5449:: @ 81F5449 - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 7 - goto_if 5, Route120_EventScript_27374E - removeobject 30 - removeobject 36 - return - -Route120_EventScript_1F5460:: @ 81F5460 - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 7 - goto_if 5, Route120_EventScript_27374E - removeobject VAR_LAST_TALKED - return - -Route120_MapScript1_1F5474: @ 81F5474 - checkflag FLAG_0x0E4 - call_if 0, Route120_EventScript_1F5490 - checkflag FLAG_0x11D - call_if 1, Route120_EventScript_1F54A3 - checkflag FLAG_0x11D - call_if 0, Route120_EventScript_1F54C8 - end - -Route120_EventScript_1F5490:: @ 81F5490 - setmetatile 7, 54, 124, 1 - setmetatile 7, 55, 145, 1 - return - -Route120_EventScript_1F54A3:: @ 81F54A3 - setmetatile 13, 15, 663, 0 - setmetatile 12, 16, 671, 0 - setmetatile 12, 17, 161, 0 - setmetatile 13, 17, 161, 0 - return - -Route120_EventScript_1F54C8:: @ 81F54C8 - setobjectmovementtype 36, 10 - return - -Route120_MapScript1_1F54CD: @ 81F54CD - call Route120_EventScript_28CCC7 - call Route120_EventScript_1F54D8 - end - -Route120_EventScript_1F54D8:: @ 81F54D8 - getplayerxy VAR_TEMP_0, VAR_TEMP_1 - compare VAR_TEMP_1, 14 - goto_if 3, Route120_EventScript_1F5503 - compare VAR_TEMP_1, 60 - goto_if 3, Route120_EventScript_1F5507 - compare VAR_TEMP_1, 61 - goto_if 4, Route120_EventScript_1F54FF - return - -Route120_EventScript_1F54FF:: @ 81F54FF - setweather 1 - return - -Route120_EventScript_1F5503:: @ 81F5503 - setweather 2 - return - -Route120_EventScript_1F5507:: @ 81F5507 - compare VAR_TEMP_0, 7 - goto_if 3, Route120_EventScript_1F5523 - compare VAR_TEMP_0, 19 - goto_if 3, Route120_EventScript_1F5503 - goto Route120_EventScript_1F5523 - end - -Route120_EventScript_1F5523:: @ 81F5523 - setweather 3 - return - -Route120_EventScript_1F5527:: @ 81F5527 - lock - faceplayer - dodailyevents - checkflag FLAG_0x92E - goto_eq Route120_EventScript_1F5625 - msgbox Route120_Text_2A70C7, 5 - compare VAR_RESULT, 1 - call_if 1, Route120_EventScript_1F562F - compare VAR_RESULT, 0 - call_if 1, Route120_EventScript_1F5638 - specialvar VAR_RESULT, GetPlayerTrainerIdOnesDigit - switch VAR_RESULT - case 0, Route120_EventScript_1F55CA - case 5, Route120_EventScript_1F55CA - case 1, Route120_EventScript_1F55D5 - case 6, Route120_EventScript_1F55D5 - case 2, Route120_EventScript_1F55E0 - case 7, Route120_EventScript_1F55E0 - case 3, Route120_EventScript_1F55EB - case 8, Route120_EventScript_1F55EB - case 4, Route120_EventScript_1F55F6 - case 9, Route120_EventScript_1F55F6 - end - -Route120_EventScript_1F55CA:: @ 81F55CA - setvar VAR_0x8004, 143 - goto Route120_EventScript_1F5601 - end - -Route120_EventScript_1F55D5:: @ 81F55D5 - setvar VAR_0x8004, 144 - goto Route120_EventScript_1F5601 - end - -Route120_EventScript_1F55E0:: @ 81F55E0 - setvar VAR_0x8004, 145 - goto Route120_EventScript_1F5601 - end - -Route120_EventScript_1F55EB:: @ 81F55EB - setvar VAR_0x8004, 146 - goto Route120_EventScript_1F5601 - end - -Route120_EventScript_1F55F6:: @ 81F55F6 - setvar VAR_0x8004, 147 - goto Route120_EventScript_1F5601 - end - -Route120_EventScript_1F5601:: @ 81F5601 - giveitem_std VAR_0x8004 - compare VAR_RESULT, 0 - goto_eq Route120_EventScript_272054 - setflag FLAG_0x92E - msgbox Route120_Text_2A71D5, 4 - release - end - -Route120_EventScript_1F5625:: @ 81F5625 - msgbox Route120_Text_2A7217, 4 - release - end - -Route120_EventScript_1F562F:: @ 81F562F - msgbox Route120_Text_2A7147, 4 - return - -Route120_EventScript_1F5638:: @ 81F5638 - msgbox Route120_Text_2A7183, 4 - return - -Route120_EventScript_1F5641:: @ 81F5641 - lock - faceplayer - checkflag FLAG_0x122 - goto_eq Route120_EventScript_1F5672 - msgbox Route120_Text_1F5998, 5 - compare VAR_RESULT, 0 - goto_eq Route120_EventScript_1F5665 - goto Route120_EventScript_1F568B - end - -Route120_EventScript_1F5665:: @ 81F5665 - msgbox Route120_Text_1F5AAC, 4 - setflag FLAG_0x122 - release - end - -Route120_EventScript_1F5672:: @ 81F5672 - msgbox Route120_Text_1F5ADE, 5 - compare VAR_RESULT, 0 - goto_eq Route120_EventScript_1F5665 - goto Route120_EventScript_1F568B - end - -Route120_EventScript_1F568B:: @ 81F568B - msgbox Route120_Text_1F5B0F, 4 - closemessage - compare VAR_FACING, 2 - call_if 1, Route120_EventScript_1F57A3 - compare VAR_FACING, 3 - call_if 1, Route120_EventScript_1F57AE - applymovement 31, Route120_Movement_2725A4 - waitmovement 0 - delay 20 - msgbox Route120_Text_1F5B43, 4 - closemessage - applymovement 30, Route120_Movement_2725A8 - waitmovement 0 - applymovement 30, Route120_Movement_2723C7 - waitmovement 0 - waitse - playmoncry SPECIES_KECLEON, 2 - delay 40 - waitmoncry - setwildbattle SPECIES_KECLEON, 30, ITEM_NONE - setvar VAR_0x8009, 0 - setflag FLAG_SYS_CTRL_OBJ_DELETE - dowildbattle - clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 1 - goto_eq Route120_EventScript_1F571C - compare VAR_RESULT, 4 - goto_eq Route120_EventScript_1F571C - compare VAR_RESULT, 5 - goto_eq Route120_EventScript_1F571C - goto Route120_EventScript_1F572C - end - -Route120_EventScript_1F571C:: @ 81F571C - fadescreenswapbuffers 1 - removeobject 30 - removeobject 36 - fadescreenswapbuffers 0 - goto Route120_EventScript_1F572C - end - -Route120_EventScript_1F572C:: @ 81F572C - applymovement 31, Route120_Movement_2725AA - applymovement 255, Route120_Movement_2725A6 - waitmovement 0 - msgbox Route120_Text_1F5BAF, 4 - giveitem_std ITEM_DEVON_SCOPE - setflag FLAG_0x11D - msgbox Route120_Text_1F5C7B, 4 - closemessage - applymovement 31, Route120_Movement_2725AA - waitmovement 0 - delay 50 - setfieldeffectargument 0, 1 - dofieldeffect 30 - delay 15 - removeobject 31 - waitfieldeffect 30 - setmetatile 13, 15, 663, 0 - setmetatile 12, 16, 671, 0 - setmetatile 12, 17, 161, 0 - setmetatile 13, 17, 161, 0 - special DrawWholeMapView - release - end - -Route120_EventScript_1F57A3:: @ 81F57A3 - applymovement 255, Route120_Movement_2725A4 - waitmovement 0 - return - -Route120_EventScript_1F57AE:: @ 81F57AE - applymovement 255, Route120_Movement_1F57B9 - waitmovement 0 - return - -Route120_Movement_1F57B9: @ 81F57B9 - walk_down - walk_left - step_end - -Route120_EventScript_1F57BC:: @ 81F57BC - msgbox Route120_Text_1F5D00, 2 - end - -Route120_EventScript_1F57C5:: @ 81F57C5 - msgbox Route120_Text_1F5DCB, 3 - end - -Route120_EventScript_1F57CE:: @ 81F57CE - msgbox Route120_Text_1F5DE4, 3 - end - -Route120_EventScript_1F57D7:: @ 81F57D7 - trainerbattle 0, TRAINER_COLIN, 0, Route120_Text_29E62D, Route120_Text_29E665 - msgbox Route120_Text_29E67A, 6 - end - -Route120_EventScript_1F57EE:: @ 81F57EE - trainerbattle 2, TRAINER_ROBERT_1, 0, Route120_Text_29E6E3, Route120_Text_29E70A, Route120_EventScript_1F581A - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route120_EventScript_1F5839 - msgbox Route120_Text_29E726, 4 - release - end - -Route120_EventScript_1F581A:: @ 81F581A - special sub_80B4808 - waitmovement 0 - msgbox Route120_Text_29E75D, 4 - setvar VAR_0x8004, 406 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 406 - callstd 8 - release - end - -Route120_EventScript_1F5839:: @ 81F5839 - trainerbattle 5, TRAINER_ROBERT_1, 0, Route120_Text_29E7AA, Route120_Text_29E7E1 - msgbox Route120_Text_29E804, 6 - end - -Route120_EventScript_1F5850:: @ 81F5850 - trainerbattle 0, TRAINER_LORENZO, 0, Route120_Text_29E843, Route120_Text_29E884 - msgbox Route120_Text_29E8C5, 6 - end - -Route120_EventScript_1F5867:: @ 81F5867 - trainerbattle 0, TRAINER_JENNA, 0, Route120_Text_29E91C, Route120_Text_29E980 - msgbox Route120_Text_29E996, 6 - end - -Route120_EventScript_1F587E:: @ 81F587E - trainerbattle 2, TRAINER_JEFFREY_1, 0, Route120_Text_29E9D7, Route120_Text_29E9FF, Route120_EventScript_1F58AA - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route120_EventScript_1F58C9 - msgbox Route120_Text_29EA08, 4 - release - end - -Route120_EventScript_1F58AA:: @ 81F58AA - special sub_80B4808 - waitmovement 0 - msgbox Route120_Text_29EA31, 4 - setvar VAR_0x8004, 226 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 226 - callstd 8 - release - end - -Route120_EventScript_1F58C9:: @ 81F58C9 - trainerbattle 5, TRAINER_JEFFREY_1, 0, Route120_Text_29EA61, Route120_Text_29EA8F - msgbox Route120_Text_29EAA9, 6 - end - -Route120_EventScript_1F58E0:: @ 81F58E0 - trainerbattle 0, TRAINER_JENNIFER, 0, Route120_Text_29EAEF, Route120_Text_29EB53 - msgbox Route120_Text_29EB6E, 6 - end - -Route120_EventScript_1F58F7:: @ 81F58F7 - trainerbattle 0, TRAINER_CHIP, 0, Route120_Text_29EBAF, Route120_Text_29EC25 - msgbox Route120_Text_29EC41, 6 - end - -Route120_EventScript_1F590E:: @ 81F590E - trainerbattle 0, TRAINER_CLARISSA, 0, Route120_Text_29ECA6, Route120_Text_29ECEF - msgbox Route120_Text_29ED19, 6 - end - -Route120_EventScript_1F5925:: @ 81F5925 - trainerbattle 0, TRAINER_ANGELICA, 0, Route120_Text_29ED71, Route120_Text_29EDD3 - msgbox Route120_Text_29EDF7, 6 - end - -Route120_EventScript_1F593C:: @ 81F593C - trainerbattle 0, TRAINER_KEIGO, 0, Route120_Text_29EE50, Route120_Text_29EE97 - msgbox Route120_Text_29EED4, 6 - end - -Route120_EventScript_1F5953:: @ 81F5953 - trainerbattle 0, TRAINER_RILEY, 0, Route120_Text_29EF08, Route120_Text_29EF63 - msgbox Route120_Text_29EF89, 6 - end - -Route120_EventScript_1F596A:: @ 81F596A - trainerbattle 0, TRAINER_LEONEL, 0, Route120_Text_29F04F, Route120_Text_29F080 - msgbox Route120_Text_29F0A1, 6 - end - -Route120_EventScript_1F5981:: @ 81F5981 - trainerbattle 0, TRAINER_CALLIE, 0, Route120_Text_29EFB1, Route120_Text_29EFE1 - msgbox Route120_Text_29F002, 6 - end - -Route120_Text_1F5998: @ 81F5998 - .string "STEVEN: Hm? {PLAYER}{KUN}, hi.\n" - .string "It’s been a while.\p" - .string "There’s something here that you can’t\n" - .string "see, right?\p" - .string "Now, if I were to use this device on\n" - .string "the invisible obstacle…\p" - .string "No, no. Rather than describing it,\n" - .string "I should just show you.\l" - .string "That would be more fun.\p" - .string "{PLAYER}{KUN}, are your POKéMON ready for\n" - .string "battle?$" - -Route120_Text_1F5AAC: @ 81F5AAC - .string "STEVEN: No?\p" - .string "I’ll wait here, so you can get ready.$" - -Route120_Text_1F5ADE: @ 81F5ADE - .string "STEVEN: {PLAYER}{KUN}, are your POKéMON\n" - .string "ready for battle?$" - -Route120_Text_1F5B0F: @ 81F5B0F - .string "STEVEN: {PLAYER}{KUN}, show me your true\n" - .string "power as a TRAINER!$" - -Route120_Text_1F5B43: @ 81F5B43 - .string "STEVEN used the DEVON SCOPE.\p" - .string "An invisible POKéMON became completely\n" - .string "visible!\p" - .string "The startled POKéMON attacked!$" - -Route120_Text_1F5BAF: @ 81F5BAF - .string "STEVEN: I see…\n" - .string "Your battle style is intriguing.\p" - .string "Your POKéMON have obviously grown\n" - .string "since I first met you in DEWFORD.\p" - .string "I’d like you to have this\n" - .string "DEVON SCOPE.\p" - .string "Who knows, there may be other\n" - .string "concealed POKéMON.$" - -Route120_Text_1F5C7B: @ 81F5C7B - .string "STEVEN: {PLAYER}{KUN}.\p" - .string "I enjoy seeing POKéMON and TRAINERS\n" - .string "who strive together.\p" - .string "I think you’re doing great.\p" - .string "Well, let’s meet again somewhere.$" - -Route119_Text_1F5D00: @ 81F5D00 -Route120_Text_1F5D00: @ 81F5D00 - .string "Something unseeable is in the way.$" - -Route119_Text_1F5D23: @ 81F5D23 - .string "Something unseeable is in the way.\p" - .string "Want to use the DEVON SCOPE?$" - -Route119_Text_1F5D63: @ 81F5D63 - .string "{PLAYER} used the DEVON SCOPE.\p" - .string "An invisible POKéMON became completely\n" - .string "visible!\p" - .string "The startled POKéMON attacked!$" - -Route120_Text_1F5DCB: @ 81F5DCB - .string "ROUTE 120\n" - .string "{0x7B} FORTREE CITY$" - -Route120_Text_1F5DE4: @ 81F5DE4 - .string "{0x7C} ROUTE 121\n" - .string "{0x7B} ROUTE 120$" diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc deleted file mode 100644 index f133ffe56..000000000 --- a/data/scripts/maps/Route121.inc +++ /dev/null @@ -1,200 +0,0 @@ -Route121_MapScripts:: @ 81F5DFC - .byte 0 - -Route121_EventScript_1F5DFD:: @ 81F5DFD - msgbox Route121_Text_1F607F, 2 - end - -Route121_EventScript_1F5E06:: @ 81F5E06 - msgbox Route121_Text_1F60D3, 3 - end - -Route121_EventScript_1F5E0F:: @ 81F5E0F - msgbox Route121_Text_1F611E, 3 - end - -Route121_EventScript_1F5E18:: @ 81F5E18 - lockall - playbgm MUS_AQA_0, 0 - applymovement 13, Route121_Movement_2725B8 - waitmovement 0 - msgbox Route121_Text_1F605A, 4 - closemessage - applymovement 12, Route121_Movement_1F5E59 - applymovement 13, Route121_Movement_1F5E62 - applymovement 14, Route121_Movement_1F5E6B - waitmovement 0 - fadedefaultbgm - removeobject 12 - removeobject 13 - removeobject 14 - setvar VAR_0x4074, 1 - releaseall - end - -Route121_Movement_1F5E59: @ 81F5E59 - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - step_end - -Route121_Movement_1F5E62: @ 81F5E62 - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - step_end - -Route121_Movement_1F5E6B: @ 81F5E6B - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - step_end - -Route121_EventScript_1F5E74:: @ 81F5E74 - trainerbattle 0, TRAINER_VANESSA, 0, Route121_Text_29F0EC, Route121_Text_29F11F - msgbox Route121_Text_29F138, 6 - end - -Route121_EventScript_1F5E8B:: @ 81F5E8B - trainerbattle 2, TRAINER_WALTER_1, 0, Route121_Text_29F199, Route121_Text_29F20D, Route121_EventScript_1F5EB7 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route121_EventScript_1F5ED6 - msgbox Route121_Text_29F21E, 4 - release - end - -Route121_EventScript_1F5EB7:: @ 81F5EB7 - special sub_80B4808 - waitmovement 0 - msgbox Route121_Text_29F25B, 4 - setvar VAR_0x8004, 254 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 254 - callstd 8 - release - end - -Route121_EventScript_1F5ED6:: @ 81F5ED6 - trainerbattle 5, TRAINER_WALTER_1, 0, Route121_Text_29F2A6, Route121_Text_29F31A - msgbox Route121_Text_29F32B, 6 - end - -Route121_EventScript_1F5EED:: @ 81F5EED - trainerbattle 0, TRAINER_TAMMY, 0, Route121_Text_29F381, Route121_Text_29F3B9 - msgbox Route121_Text_29F3C6, 6 - end - -Route121_EventScript_1F5F04:: @ 81F5F04 - trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_29F3FB, Route121_Text_29F43F, Route121_Text_29F4C9 - msgbox Route121_Text_29F476, 6 - end - -Route121_EventScript_1F5F1F:: @ 81F5F1F - trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_29F521, Route121_Text_29F564, Route121_Text_29F5CE - msgbox Route121_Text_29F582, 6 - end - -Route121_EventScript_1F5F3A:: @ 81F5F3A - trainerbattle 2, TRAINER_JESSICA_1, 0, Route121_Text_29F612, Route121_Text_29F641, Route121_EventScript_1F5F66 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route121_EventScript_1F5F85 - msgbox Route121_Text_29F66F, 4 - release - end - -Route121_EventScript_1F5F66:: @ 81F5F66 - special sub_80B4808 - waitmovement 0 - msgbox Route121_Text_29F69F, 4 - setvar VAR_0x8004, 127 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 127 - callstd 8 - release - end - -Route121_EventScript_1F5F85:: @ 81F5F85 - trainerbattle 5, TRAINER_JESSICA_1, 0, Route121_Text_29F6E4, Route121_Text_29F710 - msgbox Route121_Text_29F740, 6 - end - -Route121_EventScript_1F5F9C:: @ 81F5F9C - trainerbattle 0, TRAINER_CALE, 0, Route121_Text_29F91A, Route121_Text_29F97B - msgbox Route121_Text_29F9AE, 6 - end - -Route121_EventScript_1F5FB3:: @ 81F5FB3 - trainerbattle 0, TRAINER_MYLES, 0, Route121_Text_29FA1E, Route121_Text_29FA64 - msgbox Route121_Text_29FA73, 6 - end - -Route121_EventScript_1F5FCA:: @ 81F5FCA - trainerbattle 0, TRAINER_PAT, 0, Route121_Text_29FAA7, Route121_Text_29FAD8 - msgbox Route121_Text_29FAEA, 6 - end - -Route121_EventScript_1F5FE1:: @ 81F5FE1 - trainerbattle 0, TRAINER_MARCEL, 0, Route121_Text_29FB35, Route121_Text_29FB8C - msgbox Route121_Text_29FBA8, 6 - end - -Route121_EventScript_1F5FF8:: @ 81F5FF8 - trainerbattle 2, TRAINER_CRISTIN_1, 0, Route121_Text_29F770, Route121_Text_29F7C1, Route121_EventScript_1F6024 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route121_EventScript_1F6043 - msgbox Route121_Text_29F7D4, 4 - release - end - -Route121_EventScript_1F6024:: @ 81F6024 - special sub_80B4808 - waitmovement 0 - msgbox Route121_Text_29F80D, 4 - setvar VAR_0x8004, 767 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 767 - callstd 8 - release - end - -Route121_EventScript_1F6043:: @ 81F6043 - trainerbattle 5, TRAINER_CRISTIN_1, 0, Route121_Text_29F855, Route121_Text_29F8A8 - msgbox Route121_Text_29F8D0, 6 - end - -Route121_Text_1F605A: @ 81F605A - .string "Okay!\n" - .string "We’re to move out to MT. PYRE!$" - -Route121_Text_1F607F: @ 81F607F - .string "Ahead looms MT. PYRE…\p" - .string "It is a natural monument to the spirits \n" - .string "of departed POKéMON…$" - -Route121_Text_1F60D3: @ 81F60D3 - .string "MT. PYRE PIER\p" - .string "…The sign is old and worn out.\n" - .string "The words are barely legible…$" - -Route121_Text_1F611E: @ 81F611E - .string "“Filled with rare POKéMON!â€\n" - .string "SAFARI ZONE$" - diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc deleted file mode 100644 index 1973b0e9e..000000000 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ /dev/null @@ -1,142 +0,0 @@ -Route121_SafariZoneEntrance_MapScripts:: @ 822BBBB - map_script 2, Route121_SafariZoneEntrance_MapScript2_22BBC1 - .byte 0 - -Route121_SafariZoneEntrance_MapScript2_22BBC1: @ 822BBC1 - map_script_2 VAR_0x40A4, 1, Route121_SafariZoneEntrance_EventScript_22BBCB - .2byte 0 - -Route121_SafariZoneEntrance_EventScript_22BBCB:: @ 822BBCB - lockall - applymovement 255, Route121_SafariZoneEntrance_Movement_22BBDD - waitmovement 0 - setvar VAR_0x40A4, 0 - releaseall - end - -Route121_SafariZoneEntrance_Movement_22BBDD: @ 822BBDD - walk_up - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - step_end - -Route121_SafariZoneEntrance_EventScript_22BBE6:: @ 822BBE6 - msgbox Route121_SafariZoneEntrance_Text_2A4D12, 2 - end - -Route121_SafariZoneEntrance_EventScript_22BBEF:: @ 822BBEF - lock - faceplayer - msgbox Route121_SafariZoneEntrance_Text_2A4E46, 5 - compare VAR_RESULT, 1 - goto_eq Route121_SafariZoneEntrance_EventScript_22BC0E - msgbox Route121_SafariZoneEntrance_Text_2A4E7E, 4 - release - end - -Route121_SafariZoneEntrance_EventScript_22BC0E:: @ 822BC0E - msgbox Route121_SafariZoneEntrance_Text_2A4EA1, 4 - release - end - -Route121_SafariZoneEntrance_EventScript_22BC18:: @ 822BC18 - lockall - applymovement 255, Route121_SafariZoneEntrance_Movement_2725A6 - waitmovement 0 - showmoneybox 0, 0, 0 - msgbox Route121_SafariZoneEntrance_Text_2A4F74, 5 - compare VAR_RESULT, 1 - goto_eq Route121_SafariZoneEntrance_EventScript_22BC48 - msgbox Route121_SafariZoneEntrance_Text_2A4FD7, 4 - goto Route121_SafariZoneEntrance_EventScript_22BD06 - end - -Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48 - checkitem ITEM_POKEBLOCK_CASE, 1 - compare VAR_RESULT, 0 - goto_eq Route121_SafariZoneEntrance_EventScript_22BCEA - call Route121_SafariZoneEntrance_EventScript_22BCBF - checkmoney 0x1f4, 0 - compare VAR_RESULT, 0 - goto_eq Route121_SafariZoneEntrance_EventScript_22BCF8 - playse SE_REGI - msgbox Route121_SafariZoneEntrance_Text_2A501B, 4 - takemoney 0x1f4, 0 - updatemoneybox 0, 0 - nop - msgbox Route121_SafariZoneEntrance_Text_2A5036, 4 - playfanfare MUS_FANFA4 - message Route121_SafariZoneEntrance_Text_2A5052 - waitfanfare - msgbox Route121_SafariZoneEntrance_Text_2A506F, 4 - closemessage - hidemoneybox - nop - nop - applymovement 255, Route121_SafariZoneEntrance_Movement_22BD18 - waitmovement 0 - special EnterSafariMode - setvar VAR_0x40A4, 2 - clearflag FLAG_0x05D - warp MAP_SAFARI_ZONE_SOUTH, 255, 32, 33 - waitstate - end - -Route121_SafariZoneEntrance_EventScript_22BCBF:: @ 822BCBF - getpartysize - compare VAR_RESULT, 6 - goto_if 5, Route121_SafariZoneEntrance_EventScript_22BCE9 - specialvar VAR_RESULT, ScriptCheckFreePokemonStorageSpace - compare VAR_RESULT, 1 - goto_eq Route121_SafariZoneEntrance_EventScript_22BCE9 - msgbox Route121_SafariZoneEntrance_Text_2A50E5, 4 - goto Route121_SafariZoneEntrance_EventScript_22BD06 - end - -Route121_SafariZoneEntrance_EventScript_22BCE9:: @ 822BCE9 - return - -Route121_SafariZoneEntrance_EventScript_22BCEA:: @ 822BCEA - msgbox Route121_SafariZoneEntrance_Text_2A5105, 4 - goto Route121_SafariZoneEntrance_EventScript_22BD06 - end - -Route121_SafariZoneEntrance_EventScript_22BCF8:: @ 822BCF8 - msgbox Route121_SafariZoneEntrance_Text_2A4FF7, 4 - goto Route121_SafariZoneEntrance_EventScript_22BD06 - end - -Route121_SafariZoneEntrance_EventScript_22BD06:: @ 822BD06 - closemessage - hidemoneybox - nop - nop - applymovement 255, Route121_SafariZoneEntrance_Movement_22BD16 - waitmovement 0 - releaseall - end - -Route121_SafariZoneEntrance_Movement_22BD16: @ 822BD16 - walk_right - step_end - -Route121_SafariZoneEntrance_Movement_22BD18: @ 822BD18 - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_down - delay_16 - step_end - -Route121_SafariZoneEntrance_EventScript_22BD21:: @ 822BD21 - msgbox Route121_SafariZoneEntrance_Text_2A55BB, 3 - end - diff --git a/data/scripts/maps/Route122.inc b/data/scripts/maps/Route122.inc deleted file mode 100644 index 8fcfb4c09..000000000 --- a/data/scripts/maps/Route122.inc +++ /dev/null @@ -1,3 +0,0 @@ -Route122_MapScripts:: @ 81F6146 - .byte 0 - diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc deleted file mode 100644 index b622a931b..000000000 --- a/data/scripts/maps/Route123.inc +++ /dev/null @@ -1,213 +0,0 @@ -Route123_MapScripts:: @ 81F6147 - map_script 3, Route123_MapScript1_1F614D - .byte 0 - -Route123_MapScript1_1F614D: @ 81F614D - special SetRoute123Weather - end - -Route123_EventScript_1F6151:: @ 81F6151 - lock - faceplayer - checkflag FLAG_0x0E8 - goto_eq Route123_EventScript_1F61A0 - msgbox Route123_Text_1F641E, 4 - special IsGrassTypeInParty - compare VAR_RESULT, 0 - goto_eq Route123_EventScript_1F619E - msgbox Route123_Text_1F645D, 4 - giveitem_std ITEM_TM19 - compare VAR_RESULT, 0 - goto_eq Route123_EventScript_272054 - setflag FLAG_0x0E8 - msgbox Route123_Text_1F64CF, 4 - release - end - -Route123_EventScript_1F619E:: @ 81F619E - release - end - -Route123_EventScript_1F61A0:: @ 81F61A0 - msgbox Route123_Text_1F64CF, 4 - release - end - -Route123_EventScript_1F61AA:: @ 81F61AA - msgbox Route123_Text_1F6511, 3 - end - -Route123_EventScript_1F61B3:: @ 81F61B3 - msgbox Route123_Text_1F6529, 3 - end - -Route123_EventScript_1F61BC:: @ 81F61BC - msgbox Route123_Text_1F6557, 3 - end - -Route123_EventScript_1F61C5:: @ 81F61C5 - trainerbattle 0, TRAINER_WENDY, 0, Route123_Text_29FBEB, Route123_Text_29FC23 - msgbox Route123_Text_29FC42, 6 - end - -Route123_EventScript_1F61DC:: @ 81F61DC - trainerbattle 0, TRAINER_BRAXTON, 0, Route123_Text_29FC6F, Route123_Text_29FCD6 - msgbox Route123_Text_29FCF4, 6 - end - -Route123_EventScript_1F61F3:: @ 81F61F3 - trainerbattle 0, TRAINER_VIOLET, 0, Route123_Text_29FD1D, Route123_Text_29FD53 - msgbox Route123_Text_29FD7B, 6 - end - -Route123_EventScript_1F620A:: @ 81F620A - trainerbattle 2, TRAINER_CAMERON_1, 0, Route123_Text_29FDBA, Route123_Text_29FE1E, Route123_EventScript_1F6236 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route123_EventScript_1F6255 - msgbox Route123_Text_29FE2A, 4 - release - end - -Route123_EventScript_1F6236:: @ 81F6236 - special sub_80B4808 - waitmovement 0 - msgbox Route123_Text_29FE70, 4 - setvar VAR_0x8004, 238 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 238 - callstd 8 - release - end - -Route123_EventScript_1F6255:: @ 81F6255 - trainerbattle 5, TRAINER_CAMERON_1, 0, Route123_Text_29FED4, Route123_Text_29FF1B - msgbox Route123_Text_29FF27, 6 - end - -Route123_EventScript_1F626C:: @ 81F626C - trainerbattle 2, TRAINER_JACKI_1, 0, Route123_Text_29FF61, Route123_Text_29FFD8, Route123_EventScript_1F6298 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route123_EventScript_1F62B7 - msgbox Route123_Text_29FFE5, 4 - release - end - -Route123_EventScript_1F6298:: @ 81F6298 - special sub_80B4808 - waitmovement 0 - msgbox Route123_Text_2A0027, 4 - setvar VAR_0x8004, 249 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 249 - callstd 8 - release - end - -Route123_EventScript_1F62B7:: @ 81F62B7 - trainerbattle 5, TRAINER_JACKI_1, 0, Route123_Text_2A005E, Route123_Text_2A008D - msgbox Route123_Text_2A0099, 6 - end - -Route123_EventScript_1F62CE:: @ 81F62CE - trainerbattle 4, TRAINER_MIU_AND_YUKI, 0, Route123_Text_2A00D6, Route123_Text_2A0119, Route123_Text_2A016D - msgbox Route123_Text_2A012E, 6 - end - -Route123_EventScript_1F62E9:: @ 81F62E9 - trainerbattle 4, TRAINER_MIU_AND_YUKI, 0, Route123_Text_2A01A7, Route123_Text_2A01D8, Route123_Text_2A0224 - msgbox Route123_Text_2A01EE, 6 - end - -Route123_EventScript_1F6304:: @ 81F6304 - trainerbattle 0, TRAINER_KINDRA, 0, Route123_Text_2A025F, Route123_Text_2A02A6 - msgbox Route123_Text_2A02C1, 6 - end - -Route123_EventScript_1F631B:: @ 81F631B - trainerbattle 0, TRAINER_FREDRICK, 0, Route123_Text_2A060A, Route123_Text_2A0631 - msgbox Route123_Text_2A0672, 6 - end - -Route123_EventScript_1F6332:: @ 81F6332 - trainerbattle 0, TRAINER_ALBERTO, 0, Route123_Text_2A06AF, Route123_Text_2A0704 - msgbox Route123_Text_2A072B, 6 - end - -Route123_EventScript_1F6349:: @ 81F6349 - trainerbattle 0, TRAINER_ED, 0, Route123_Text_2A079B, Route123_Text_2A07F0 - msgbox Route123_Text_2A080D, 6 - end - -Route123_EventScript_1F6360:: @ 81F6360 - trainerbattle 0, TRAINER_KAYLEY, 0, Route123_Text_2A0902, Route123_Text_2A0943 - msgbox Route123_Text_2A096E, 6 - end - -Route123_EventScript_1F6377:: @ 81F6377 - trainerbattle 0, TRAINER_JONAS, 0, Route123_Text_2A0854, Route123_Text_2A088A - msgbox Route123_Text_2A08CA, 6 - end - -Route123_EventScript_1F638E:: @ 81F638E - trainerbattle 0, TRAINER_JAZMYN, 0, Route123_Text_2A054E, Route123_Text_2A0592 - msgbox Route123_Text_2A05AC, 6 - end - -Route123_EventScript_1F63A5:: @ 81F63A5 - trainerbattle 0, TRAINER_DAVIS, 0, Route123_Text_2A04C0, Route123_Text_2A04FE - msgbox Route123_Text_2A0512, 6 - end - -Route123_EventScript_1F63BC:: @ 81F63BC - trainerbattle 2, TRAINER_FERNANDO_1, 0, Route123_Text_2A0323, Route123_Text_2A035C, Route123_EventScript_1F63E8 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route123_EventScript_1F6407 - msgbox Route123_Text_2A0389, 4 - release - end - -Route123_EventScript_1F63E8:: @ 81F63E8 - special sub_80B4808 - waitmovement 0 - msgbox Route123_Text_2A03C1, 4 - setvar VAR_0x8004, 195 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 195 - callstd 8 - release - end - -Route123_EventScript_1F6407:: @ 81F6407 - trainerbattle 5, TRAINER_FERNANDO_1, 0, Route123_Text_2A03FB, Route123_Text_2A045A - msgbox Route123_Text_2A0487, 6 - end - -Route123_Text_1F641E: @ 81F641E - .string "I love GRASS-type POKéMON!\p" - .string "Do you have any GRASS-type POKéMON?$" - -Route123_Text_1F645D: @ 81F645D - .string "Oh?\p" - .string "You like GRASS-type POKéMON, too,\n" - .string "don’t you?\p" - .string "I’m so happy, you can have this!\n" - .string "It’s a token of our friendship.$" - -Route123_Text_1F64CF: @ 81F64CF - .string "I check trees with my GRASS-type\n" - .string "POKéMON. I’m like a tree doctor.$" - -Route123_Text_1F6511: @ 81F6511 - .string "{0x7C} ROUTE 123\n" - .string "{0x7B} ROUTE 118$" - -Route123_Text_1F6529: @ 81F6529 - .string "{0x79} MT. PYRE\n" - .string "“Forbidden to the faint of heart.â€$" - -Route123_Text_1F6557: @ 81F6557 - .string "BERRY MASTER’S HOUSE$" - diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc deleted file mode 100644 index 9e865ad6a..000000000 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ /dev/null @@ -1,153 +0,0 @@ -Route123_BerryMastersHouse_MapScripts:: @ 826F83B - map_script 3, Route123_BerryMastersHouse_MapScript1_26F841 - .byte 0 - -Route123_BerryMastersHouse_MapScript1_26F841: @ 826F841 - setflag FLAG_LANDMARK_BERRY_MASTERS_HOUSE - end - -Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 - lock - faceplayer - dodailyevents - checkflag FLAG_0x92D - goto_eq Route123_BerryMastersHouse_EventScript_26F8B6 - msgbox Route123_BerryMastersHouse_Text_2A7386, 4 - random 10 - addvar VAR_RESULT, 20 - addvar VAR_RESULT, 133 - giveitem_std VAR_RESULT - compare VAR_RESULT, 0 - goto_eq Route123_BerryMastersHouse_EventScript_272054 - setflag FLAG_0x92D - msgbox Route123_BerryMastersHouse_Text_2A7428, 4 - random 10 - addvar VAR_RESULT, 20 - addvar VAR_RESULT, 133 - giveitem_std VAR_RESULT - compare VAR_RESULT, 0 - goto_eq Route123_BerryMastersHouse_EventScript_272054 - msgbox Route123_BerryMastersHouse_Text_2A7445, 4 - release - end - -Route123_BerryMastersHouse_EventScript_26F8B6:: @ 826F8B6 - msgbox Route123_BerryMastersHouse_Text_2A749E, 4 - release - end - -Route123_BerryMastersHouse_EventScript_26F8C0:: @ 826F8C0 - lock - faceplayer - dodailyevents - checkflag FLAG_0x931 - goto_eq Route123_BerryMastersHouse_EventScript_26FA6F - msgbox Route123_BerryMastersHouse_Text_2A74E6, 4 - setvar VAR_0x8004, 13 - call Route123_BerryMastersHouse_EventScript_271E7C - lock - faceplayer - compare VAR_RESULT, 1 - goto_eq Route123_BerryMastersHouse_EventScript_26F909 - compare VAR_RESULT, 0 - goto_eq Route123_BerryMastersHouse_EventScript_26F8F7 - end - -Route123_BerryMastersHouse_EventScript_26F8F7:: @ 826F8F7 - msgbox Route123_BerryMastersHouse_Text_2A7682, 4 - msgbox Route123_BerryMastersHouse_Text_2A761B, 4 - release - end - -Route123_BerryMastersHouse_EventScript_26F909:: @ 826F909 - compare VAR_0x8004, 0 - goto_eq Route123_BerryMastersHouse_EventScript_26F94C - compare VAR_0x8004, 1 - goto_eq Route123_BerryMastersHouse_EventScript_26F97A - compare VAR_0x8004, 2 - goto_eq Route123_BerryMastersHouse_EventScript_26F9AB - compare VAR_0x8004, 3 - goto_eq Route123_BerryMastersHouse_EventScript_26F9DC - compare VAR_0x8004, 4 - goto_eq Route123_BerryMastersHouse_EventScript_26FA0D - compare VAR_0x8004, 5 - goto_eq Route123_BerryMastersHouse_EventScript_26FA3E - end - -Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C - msgbox Route123_BerryMastersHouse_Text_2A75D0, 4 - random 10 - addvar VAR_RESULT, 133 - giveitem_std VAR_RESULT - compare VAR_RESULT, 0 - goto_eq Route123_BerryMastersHouse_EventScript_272054 - goto Route123_BerryMastersHouse_EventScript_26FA79 - release - end - -Route123_BerryMastersHouse_EventScript_26F97A:: @ 826F97A - checkflag FLAG_0x0F8 - goto_eq Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, 4 - giveitem_std ITEM_SPELON_BERRY - compare VAR_RESULT, 0 - goto_eq Route123_BerryMastersHouse_EventScript_272054 - setflag FLAG_0x0F8 - goto Route123_BerryMastersHouse_EventScript_26FA79 - end - -Route123_BerryMastersHouse_EventScript_26F9AB:: @ 826F9AB - checkflag FLAG_0x0F9 - goto_eq Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, 4 - giveitem_std ITEM_PAMTRE_BERRY - compare VAR_RESULT, 0 - goto_eq Route123_BerryMastersHouse_EventScript_272054 - setflag FLAG_0x0F9 - goto Route123_BerryMastersHouse_EventScript_26FA79 - end - -Route123_BerryMastersHouse_EventScript_26F9DC:: @ 826F9DC - checkflag FLAG_0x0FA - goto_eq Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, 4 - giveitem_std ITEM_WATMEL_BERRY - compare VAR_RESULT, 0 - goto_eq Route123_BerryMastersHouse_EventScript_272054 - setflag FLAG_0x0FA - goto Route123_BerryMastersHouse_EventScript_26FA79 - end - -Route123_BerryMastersHouse_EventScript_26FA0D:: @ 826FA0D - checkflag FLAG_0x0FB - goto_eq Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, 4 - giveitem_std ITEM_DURIN_BERRY - compare VAR_RESULT, 0 - goto_eq Route123_BerryMastersHouse_EventScript_272054 - setflag FLAG_0x0FB - goto Route123_BerryMastersHouse_EventScript_26FA79 - end - -Route123_BerryMastersHouse_EventScript_26FA3E:: @ 826FA3E - checkflag FLAG_0x0FC - goto_eq Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, 4 - giveitem_std ITEM_BELUE_BERRY - compare VAR_RESULT, 0 - goto_eq Route123_BerryMastersHouse_EventScript_272054 - setflag FLAG_0x0FC - goto Route123_BerryMastersHouse_EventScript_26FA79 - end - -Route123_BerryMastersHouse_EventScript_26FA6F:: @ 826FA6F - msgbox Route123_BerryMastersHouse_Text_2A761B, 4 - release - end - -Route123_BerryMastersHouse_EventScript_26FA79:: @ 826FA79 - setflag FLAG_0x931 - msgbox Route123_BerryMastersHouse_Text_2A761B, 4 - release - end - diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc deleted file mode 100644 index b21e55417..000000000 --- a/data/scripts/maps/Route124.inc +++ /dev/null @@ -1,117 +0,0 @@ -Route124_MapScripts:: @ 81F656C - map_script 3, Route124_MapScript1_1F6572 - .byte 0 - -Route124_MapScript1_1F6572: @ 81F6572 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route124_EventScript_27207A - end - -Route124_EventScript_1F657C:: @ 81F657C - msgbox Route124_Text_1F6739, 3 - end - -Route124_EventScript_1F6585:: @ 81F6585 - trainerbattle 0, TRAINER_SPENCER, 0, Route124_Text_2A09B1, Route124_Text_2A0A02 - msgbox Route124_Text_2A0A20, 6 - end - -Route124_EventScript_1F659C:: @ 81F659C - trainerbattle 0, TRAINER_ROLAND, 0, Route124_Text_2A0A84, Route124_Text_2A0ACC - msgbox Route124_Text_2A0AD9, 6 - end - -Route124_EventScript_1F65B3:: @ 81F65B3 - trainerbattle 2, TRAINER_JENNY_1, 0, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route124_EventScript_1F65FE - msgbox Route124_Text_2A0B9A, 4 - release - end - -Route124_EventScript_1F65DF:: @ 81F65DF - special sub_80B4808 - waitmovement 0 - msgbox Route124_Text_2A0C14, 4 - setvar VAR_0x8004, 449 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 449 - callstd 8 - release - end - -Route124_EventScript_1F65FE:: @ 81F65FE - trainerbattle 5, TRAINER_JENNY_1, 0, Route124_Text_2A0C60, Route124_Text_2A0CA0 - msgbox Route124_Text_2A0CBE, 6 - end - -Route124_EventScript_1F6615:: @ 81F6615 - trainerbattle 0, TRAINER_GRACE, 0, Route124_Text_2A0D0A, Route124_Text_2A0D3D - msgbox Route124_Text_2A0D66, 6 - end - -Route124_EventScript_1F662C:: @ 81F662C - trainerbattle 0, TRAINER_CHAD, 0, Route124_Text_2A0DA0, Route124_Text_2A0DFF - msgbox Route124_Text_2A0E1E, 6 - end - -Route124_EventScript_1F6643:: @ 81F6643 - trainerbattle 6, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A0E87, Route124_Text_2A0EFE, Route124_Text_2A0F8C, Route124_EventScript_1F6673 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route124_EventScript_1F668C - msgbox Route124_Text_2A0F3A, 4 - release - end - -Route124_EventScript_1F6673:: @ 81F6673 - msgbox Route124_Text_2A109F, 4 - setvar VAR_0x8004, 687 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 687 - callstd 8 - release - end - -Route124_EventScript_1F668C:: @ 81F668C - trainerbattle 7, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A111E, Route124_Text_2A11B2, Route124_Text_2A1255 - msgbox Route124_Text_2A1203, 6 - end - -Route124_EventScript_1F66A7:: @ 81F66A7 - trainerbattle 6, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A0FD1, Route124_Text_2A1012, Route124_Text_2A10E5, Route124_EventScript_1F66D7 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route124_EventScript_1F66F0 - msgbox Route124_Text_2A103E, 4 - release - end - -Route124_EventScript_1F66D7:: @ 81F66D7 - msgbox Route124_Text_2A109F, 4 - setvar VAR_0x8004, 687 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 687 - callstd 8 - release - end - -Route124_EventScript_1F66F0:: @ 81F66F0 - trainerbattle 7, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A129A, Route124_Text_2A12DD, Route124_Text_2A1384 - msgbox Route124_Text_2A130F, 6 - end - -Route124_EventScript_1F670B:: @ 81F670B - trainerbattle 0, TRAINER_DECLAN, 0, Route124_Text_2A13BD, Route124_Text_2A142C - msgbox Route124_Text_2A144F, 6 - end - -Route124_EventScript_1F6722:: @ 81F6722 - trainerbattle 0, TRAINER_ISABELLA, 0, Route124_Text_2A148E, Route124_Text_2A14BC - msgbox Route124_Text_2A14ED, 6 - end - -Route124_Text_1F6739: @ 81F6739 - .string "HUNTER’S HOUSE$" - diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc deleted file mode 100644 index 0892b216a..000000000 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ /dev/null @@ -1,349 +0,0 @@ -Route124_DivingTreasureHuntersHouse_MapScripts:: @ 8270A28 - map_script 3, Route124_DivingTreasureHuntersHouse_MapScript1_270A2E - .byte 0 - -Route124_DivingTreasureHuntersHouse_MapScript1_270A2E: @ 8270A2E - setflag FLAG_LANDMARK_HUNTERS_HOUSE - end - -Route124_DivingTreasureHuntersHouse_EventScript_270A32:: @ 8270A32 - lock - faceplayer - checkflag FLAG_0x0D9 - goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270A4E - msgbox Route124_DivingTreasureHuntersHouse_Text_270F6C, 4 - setflag FLAG_0x0D9 - goto Route124_DivingTreasureHuntersHouse_EventScript_270A5C - end - -Route124_DivingTreasureHuntersHouse_EventScript_270A4E:: @ 8270A4E - msgbox Route124_DivingTreasureHuntersHouse_Text_270FE5, 4 - goto Route124_DivingTreasureHuntersHouse_EventScript_270A5C - end - -Route124_DivingTreasureHuntersHouse_EventScript_270A5C:: @ 8270A5C - call Route124_DivingTreasureHuntersHouse_EventScript_270A72 - compare VAR_TEMP_1, 0 - goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F57 - goto Route124_DivingTreasureHuntersHouse_EventScript_270AD0 - end - -Route124_DivingTreasureHuntersHouse_EventScript_270A72:: @ 8270A72 - setvar VAR_TEMP_1, 0 - checkitem ITEM_RED_SHARD, 1 - compare VAR_RESULT, 1 - call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_270AB8 - checkitem ITEM_YELLOW_SHARD, 1 - compare VAR_RESULT, 1 - call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_270ABE - checkitem ITEM_BLUE_SHARD, 1 - compare VAR_RESULT, 1 - call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_270AC4 - checkitem ITEM_GREEN_SHARD, 1 - compare VAR_RESULT, 1 - call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_270ACA - return - -Route124_DivingTreasureHuntersHouse_EventScript_270AB8:: @ 8270AB8 - addvar VAR_TEMP_1, 1 - return - -Route124_DivingTreasureHuntersHouse_EventScript_270ABE:: @ 8270ABE - addvar VAR_TEMP_1, 2 - return - -Route124_DivingTreasureHuntersHouse_EventScript_270AC4:: @ 8270AC4 - addvar VAR_TEMP_1, 4 - return - -Route124_DivingTreasureHuntersHouse_EventScript_270ACA:: @ 8270ACA - addvar VAR_TEMP_1, 8 - return - -Route124_DivingTreasureHuntersHouse_EventScript_270AD0:: @ 8270AD0 - msgbox Route124_DivingTreasureHuntersHouse_Text_271098, 4 - goto Route124_DivingTreasureHuntersHouse_EventScript_270ADE - end - -Route124_DivingTreasureHuntersHouse_EventScript_270ADE:: @ 8270ADE - message Route124_DivingTreasureHuntersHouse_Text_271117 - waitmessage - switch VAR_TEMP_1 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270B8F - case 2, Route124_DivingTreasureHuntersHouse_EventScript_270BB5 - case 3, Route124_DivingTreasureHuntersHouse_EventScript_270BDB - case 4, Route124_DivingTreasureHuntersHouse_EventScript_270C0C - case 5, Route124_DivingTreasureHuntersHouse_EventScript_270C32 - case 6, Route124_DivingTreasureHuntersHouse_EventScript_270C63 - case 7, Route124_DivingTreasureHuntersHouse_EventScript_270C94 - case 8, Route124_DivingTreasureHuntersHouse_EventScript_270CD0 - case 9, Route124_DivingTreasureHuntersHouse_EventScript_270CF6 - case 10, Route124_DivingTreasureHuntersHouse_EventScript_270D27 - case 11, Route124_DivingTreasureHuntersHouse_EventScript_270D58 - case 12, Route124_DivingTreasureHuntersHouse_EventScript_270D94 - case 13, Route124_DivingTreasureHuntersHouse_EventScript_270DC5 - case 14, Route124_DivingTreasureHuntersHouse_EventScript_270E01 - case 15, Route124_DivingTreasureHuntersHouse_EventScript_270E3D - end - -Route124_DivingTreasureHuntersHouse_EventScript_270B8F:: @ 8270B8F - multichoice 0, 0, 58, 0 - switch VAR_RESULT - case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270F4D - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D - end - -Route124_DivingTreasureHuntersHouse_EventScript_270BB5:: @ 8270BB5 - multichoice 0, 0, 59, 0 - switch VAR_RESULT - case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E93 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270F4D - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D - end - -Route124_DivingTreasureHuntersHouse_EventScript_270BDB:: @ 8270BDB - multichoice 0, 0, 60, 0 - switch VAR_RESULT - case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270E93 - case 2, Route124_DivingTreasureHuntersHouse_EventScript_270F4D - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D - end - -Route124_DivingTreasureHuntersHouse_EventScript_270C0C:: @ 8270C0C - multichoice 0, 0, 61, 0 - switch VAR_RESULT - case 0, Route124_DivingTreasureHuntersHouse_EventScript_270EA2 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270F4D - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D - end - -Route124_DivingTreasureHuntersHouse_EventScript_270C32:: @ 8270C32 - multichoice 0, 0, 62, 0 - switch VAR_RESULT - case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EA2 - case 2, Route124_DivingTreasureHuntersHouse_EventScript_270F4D - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D - end - -Route124_DivingTreasureHuntersHouse_EventScript_270C63:: @ 8270C63 - multichoice 0, 0, 63, 0 - switch VAR_RESULT - case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E93 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EA2 - case 2, Route124_DivingTreasureHuntersHouse_EventScript_270F4D - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D - end - -Route124_DivingTreasureHuntersHouse_EventScript_270C94:: @ 8270C94 - multichoice 0, 0, 64, 0 - switch VAR_RESULT - case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270E93 - case 2, Route124_DivingTreasureHuntersHouse_EventScript_270EA2 - case 3, Route124_DivingTreasureHuntersHouse_EventScript_270F4D - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D - end - -Route124_DivingTreasureHuntersHouse_EventScript_270CD0:: @ 8270CD0 - multichoice 0, 0, 65, 0 - switch VAR_RESULT - case 0, Route124_DivingTreasureHuntersHouse_EventScript_270EB1 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270F4D - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D - end - -Route124_DivingTreasureHuntersHouse_EventScript_270CF6:: @ 8270CF6 - multichoice 0, 0, 66, 0 - switch VAR_RESULT - case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EB1 - case 2, Route124_DivingTreasureHuntersHouse_EventScript_270F4D - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D - end - -Route124_DivingTreasureHuntersHouse_EventScript_270D27:: @ 8270D27 - multichoice 0, 0, 67, 0 - switch VAR_RESULT - case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E93 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EB1 - case 2, Route124_DivingTreasureHuntersHouse_EventScript_270F4D - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D - end - -Route124_DivingTreasureHuntersHouse_EventScript_270D58:: @ 8270D58 - multichoice 0, 0, 68, 0 - switch VAR_RESULT - case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270E93 - case 2, Route124_DivingTreasureHuntersHouse_EventScript_270EB1 - case 3, Route124_DivingTreasureHuntersHouse_EventScript_270F4D - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D - end - -Route124_DivingTreasureHuntersHouse_EventScript_270D94:: @ 8270D94 - multichoice 0, 0, 69, 0 - switch VAR_RESULT - case 0, Route124_DivingTreasureHuntersHouse_EventScript_270EA2 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EB1 - case 2, Route124_DivingTreasureHuntersHouse_EventScript_270F4D - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D - end - -Route124_DivingTreasureHuntersHouse_EventScript_270DC5:: @ 8270DC5 - multichoice 0, 0, 70, 0 - switch VAR_RESULT - case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EA2 - case 2, Route124_DivingTreasureHuntersHouse_EventScript_270EB1 - case 3, Route124_DivingTreasureHuntersHouse_EventScript_270F4D - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D - end - -Route124_DivingTreasureHuntersHouse_EventScript_270E01:: @ 8270E01 - multichoice 0, 0, 71, 0 - switch VAR_RESULT - case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E93 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EA2 - case 2, Route124_DivingTreasureHuntersHouse_EventScript_270EB1 - case 3, Route124_DivingTreasureHuntersHouse_EventScript_270F4D - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D - end - -Route124_DivingTreasureHuntersHouse_EventScript_270E3D:: @ 8270E3D - multichoice 0, 0, 72, 0 - switch VAR_RESULT - case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270E93 - case 2, Route124_DivingTreasureHuntersHouse_EventScript_270EA2 - case 3, Route124_DivingTreasureHuntersHouse_EventScript_270EB1 - case 4, Route124_DivingTreasureHuntersHouse_EventScript_270F4D - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D - end - -Route124_DivingTreasureHuntersHouse_EventScript_270E84:: @ 8270E84 - setvar VAR_0x8008, 48 - setvar VAR_0x8009, 95 - goto Route124_DivingTreasureHuntersHouse_EventScript_270EC0 - -Route124_DivingTreasureHuntersHouse_EventScript_270E93:: @ 8270E93 - setvar VAR_0x8008, 50 - setvar VAR_0x8009, 96 - goto Route124_DivingTreasureHuntersHouse_EventScript_270EC0 - -Route124_DivingTreasureHuntersHouse_EventScript_270EA2:: @ 8270EA2 - setvar VAR_0x8008, 49 - setvar VAR_0x8009, 97 - goto Route124_DivingTreasureHuntersHouse_EventScript_270EC0 - -Route124_DivingTreasureHuntersHouse_EventScript_270EB1:: @ 8270EB1 - setvar VAR_0x8008, 51 - setvar VAR_0x8009, 98 - goto Route124_DivingTreasureHuntersHouse_EventScript_270EC0 - -Route124_DivingTreasureHuntersHouse_EventScript_270EC0:: @ 8270EC0 - bufferitemname 0, VAR_0x8008 - bufferitemname 1, VAR_0x8009 - msgbox Route124_DivingTreasureHuntersHouse_Text_271132, 5 - compare VAR_RESULT, 0 - goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F4D - checkitemspace VAR_0x8009, 1 - compare VAR_RESULT, 1 - goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F01 - checkitem VAR_0x8008, 2 - compare VAR_RESULT, 0 - goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F01 - goto Route124_DivingTreasureHuntersHouse_EventScript_270F43 - end - -Route124_DivingTreasureHuntersHouse_EventScript_270F01:: @ 8270F01 - takeitem VAR_0x8008, 1 - giveitem_std VAR_0x8009 - msgbox Route124_DivingTreasureHuntersHouse_Text_271158, 4 - call Route124_DivingTreasureHuntersHouse_EventScript_270A72 - compare VAR_TEMP_1, 0 - goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F61 - msgbox Route124_DivingTreasureHuntersHouse_Text_27117B, 5 - compare VAR_RESULT, 1 - goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270ADE - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D - end - -Route124_DivingTreasureHuntersHouse_EventScript_270F43:: @ 8270F43 - msgbox Route124_DivingTreasureHuntersHouse_Text_2711A0, 4 - release - end - -Route124_DivingTreasureHuntersHouse_EventScript_270F4D:: @ 8270F4D - msgbox Route124_DivingTreasureHuntersHouse_Text_2711D8, 4 - release - end - -Route124_DivingTreasureHuntersHouse_EventScript_270F57:: @ 8270F57 - msgbox Route124_DivingTreasureHuntersHouse_Text_271027, 4 - release - end - -Route124_DivingTreasureHuntersHouse_EventScript_270F61:: @ 8270F61 - release - end - -Route124_DivingTreasureHuntersHouse_EventScript_270F63:: @ 8270F63 - msgbox Route124_DivingTreasureHuntersHouse_Text_271217, 3 - end - -Route124_DivingTreasureHuntersHouse_Text_270F6C: @ 8270F6C - .string "I’m the DIVING TREASURE HUNTER!\p" - .string "I’m the awesome dude who makes\n" - .string "deep-sea dives to gather treasures\l" - .string "resting at the bottom.$" - -Route124_DivingTreasureHuntersHouse_Text_270FE5: @ 8270FE5 - .string "Tell me, have you seen any SHARDS of\n" - .string "tools made in ancient times?$" - -Route124_DivingTreasureHuntersHouse_Text_271027: @ 8271027 - .string "You haven’t got any treasures\n" - .string "for me…\p" - .string "If you see any SHARDS, like the RED\n" - .string "SHARD, you’ve got to trade it with me!$" - -Route124_DivingTreasureHuntersHouse_Text_271098: @ 8271098 - .string "Oh, hey! That…\n" - .string "That’s a SHARD! I’m looking for those!\p" - .string "Oh, man, you’ve got to trade that\n" - .string "with me! I’ll give you something good!$" - -Route124_DivingTreasureHuntersHouse_Text_271117: @ 8271117 - .string "What do you want to trade?$" - -Route124_DivingTreasureHuntersHouse_Text_271132: @ 8271132 - .string "You’ll trade your {STR_VAR_1} for\n" - .string "my {STR_VAR_2}, then?$" - -Route124_DivingTreasureHuntersHouse_Text_271158: @ 8271158 - .string "It’s a done deal!\n" - .string "Use that wisely!$" - -Route124_DivingTreasureHuntersHouse_Text_27117B: @ 827117B - .string "Do you want to trade something else?$" - -Route124_DivingTreasureHuntersHouse_Text_2711A0: @ 82711A0 - .string "Whoops, your BAG’s full.\n" - .string "Get rid of some items, friend!$" - -Route124_DivingTreasureHuntersHouse_Text_2711D8: @ 82711D8 - .string "No? That’s a downer.\n" - .string "Well, if you change your mind, come back.$" - -Route124_DivingTreasureHuntersHouse_Text_271217: @ 8271217 - .string "{CLEAR_TO}{0x0a}Wanted item{CLEAR_TO}{0x7c}Trade item\n" - .string "{CLEAR_TO}{0x0f}RED SHARD{CLEAR_TO}{0x59}{0x7B}{0x7C}{CLEAR_TO}{0x7b}FIRE STONE{CLEAR_TO}{0xc8}\p" - .string "{CLEAR_TO}{0x0a}Wanted item{CLEAR_TO}{0x7c}Trade item\n" - .string "{CLEAR_TO}{0x06}YELLOW SHARD{CLEAR_TO}{0x59}{0x7B}{0x7C}{CLEAR_TO}{0x73}THUNDERSTONE{CLEAR_TO}{0xc8}\p" - .string "{CLEAR_TO}{0x0a}Wanted item{CLEAR_TO}{0x7c}Trade item\n" - .string "{CLEAR_TO}{0x0c}BLUE SHARD{CLEAR_TO}{0x59}{0x7B}{0x7C}{CLEAR_TO}{0x79}WATER STONE{CLEAR_TO}{0xc8}\p" - .string "{CLEAR_TO}{0x0a}Wanted item{CLEAR_TO}{0x7c}Trade item\n" - .string "{CLEAR_TO}{0x08}GREEN SHARD{CLEAR_TO}{0x59}{0x7B}{0x7C}{CLEAR_TO}{0x7b}LEAF STONE$" diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc deleted file mode 100644 index 2dda3fb2d..000000000 --- a/data/scripts/maps/Route125.inc +++ /dev/null @@ -1,93 +0,0 @@ -Route125_MapScripts:: @ 81F6748 - map_script 3, Route125_MapScript1_1F6758 - map_script 1, Route125_MapScript1_1F6783 - map_script 2, Route125_MapScript2_1F679A - .byte 0 - -Route125_MapScript1_1F6758: @ 81F6758 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route125_EventScript_27207A - compare VAR_0x4039, 1 - call_if 1, Route125_EventScript_273D13 - compare VAR_0x4037, 11 - call_if 1, Route125_EventScript_273D17 - compare VAR_0x4037, 12 - call_if 1, Route125_EventScript_273D17 - end - -Route125_MapScript1_1F6783: @ 81F6783 - compare VAR_0x4037, 11 - call_if 1, Route125_EventScript_273A85 - compare VAR_0x4037, 12 - call_if 1, Route125_EventScript_273AF2 - end - -Route125_MapScript2_1F679A: @ 81F679A - map_script_2 VAR_0x4039, 1, gUnknown_08273D1F - .2byte 0 - -Route125_EventScript_1F67A4:: @ 81F67A4 - trainerbattle 0, TRAINER_NOLEN, 0, Route125_Text_2A1527, Route125_Text_2A155A - msgbox Route125_Text_2A1567, 6 - end - -Route125_EventScript_1F67BB:: @ 81F67BB - trainerbattle 0, TRAINER_STAN, 0, Route125_Text_2A159F, Route125_Text_2A15C7 - msgbox Route125_Text_2A15D5, 6 - end - -Route125_EventScript_1F67D2:: @ 81F67D2 - trainerbattle 0, TRAINER_TANYA, 0, Route125_Text_2A1615, Route125_Text_2A164D - msgbox Route125_Text_2A165E, 6 - end - -Route125_EventScript_1F67E9:: @ 81F67E9 - trainerbattle 0, TRAINER_SHARON, 0, Route125_Text_2A1686, Route125_Text_2A16C5 - msgbox Route125_Text_2A16CE, 6 - end - -Route125_EventScript_1F6800:: @ 81F6800 - trainerbattle 2, TRAINER_ERNEST_1, 0, Route125_Text_2A16FC, Route125_Text_2A173A, Route125_EventScript_1F682C - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route125_EventScript_1F684B - msgbox Route125_Text_2A1755, 4 - release - end - -Route125_EventScript_1F682C:: @ 81F682C - special sub_80B4808 - waitmovement 0 - msgbox Route125_Text_2A17CF, 4 - setvar VAR_0x8004, 492 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 492 - callstd 8 - release - end - -Route125_EventScript_1F684B:: @ 81F684B - trainerbattle 5, TRAINER_ERNEST_1, 0, Route125_Text_2A180E, Route125_Text_2A1851 - msgbox Route125_Text_2A187A, 6 - end - -Route125_EventScript_1F6862:: @ 81F6862 - trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_2A192B, Route125_Text_2A1989, Route125_Text_2A19F8 - msgbox Route125_Text_2A19A6, 6 - end - -Route125_EventScript_1F687D:: @ 81F687D - trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_2A1A35, Route125_Text_2A1A71, Route125_Text_2A1AD9 - msgbox Route125_Text_2A1A92, 6 - end - -Route125_EventScript_1F6898:: @ 81F6898 - trainerbattle 0, TRAINER_PRESLEY, 0, Route125_Text_2A1B1A, Route125_Text_2A1B4E - msgbox Route125_Text_2A1B70, 6 - end - -Route125_EventScript_1F68AF:: @ 81F68AF - trainerbattle 0, TRAINER_AURON, 0, Route125_Text_2A1BCE, Route125_Text_2A1BFD - msgbox Route125_Text_2A1C2A, 6 - end - diff --git a/data/scripts/maps/Route126.inc b/data/scripts/maps/Route126.inc deleted file mode 100644 index 3ea9ba786..000000000 --- a/data/scripts/maps/Route126.inc +++ /dev/null @@ -1,69 +0,0 @@ -Route126_MapScripts:: @ 81F68C6 - map_script 3, Route126_MapScript1_1F68CC - .byte 0 - -Route126_MapScript1_1F68CC: @ 81F68CC - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route126_EventScript_27207A - end - -Route126_EventScript_1F68D6:: @ 81F68D6 - trainerbattle 0, TRAINER_BARRY, 0, Route126_Text_2A1C95, Route126_Text_2A1CC8 - msgbox Route126_Text_2A1CDD, 6 - end - -Route126_EventScript_1F68ED:: @ 81F68ED - trainerbattle 0, TRAINER_DEAN, 0, Route126_Text_2A1D2A, Route126_Text_2A1D63 - msgbox Route126_Text_2A1D72, 6 - end - -Route126_EventScript_1F6904:: @ 81F6904 - trainerbattle 0, TRAINER_NIKKI, 0, Route126_Text_2A1DAE, Route126_Text_2A1DC8 - msgbox Route126_Text_2A1E03, 6 - end - -Route126_EventScript_1F691B:: @ 81F691B - trainerbattle 0, TRAINER_BRENDA, 0, Route126_Text_2A1E3E, Route126_Text_2A1E63 - msgbox Route126_Text_2A1E70, 6 - end - -Route126_EventScript_1F6932:: @ 81F6932 - trainerbattle 0, TRAINER_LEONARDO, 0, Route126_Text_2A2063, Route126_Text_2A20C6 - msgbox Route126_Text_2A20F7, 6 - end - -Route126_EventScript_1F6949:: @ 81F6949 - trainerbattle 0, TRAINER_ISOBEL, 0, Route126_Text_2A216A, Route126_Text_2A21A3 - msgbox Route126_Text_2A21B8, 6 - end - -Route126_EventScript_1F6960:: @ 81F6960 - trainerbattle 0, TRAINER_SIENNA, 0, Route126_Text_2A21EF, Route126_Text_2A2216 - msgbox Route126_Text_2A222A, 6 - end - -Route126_EventScript_1F6977:: @ 81F6977 - trainerbattle 2, TRAINER_PABLO_1, 0, Route126_Text_2A1EA5, Route126_Text_2A1EE3, Route126_EventScript_1F69A3 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route126_EventScript_1F69C2 - msgbox Route126_Text_2A1F10, 4 - release - end - -Route126_EventScript_1F69A3:: @ 81F69A3 - special sub_80B4808 - waitmovement 0 - msgbox Route126_Text_2A1F5A, 4 - setvar VAR_0x8004, 377 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 377 - callstd 8 - release - end - -Route126_EventScript_1F69C2:: @ 81F69C2 - trainerbattle 5, TRAINER_PABLO_1, 0, Route126_Text_2A1F98, Route126_Text_2A1FD8 - msgbox Route126_Text_2A200C, 6 - end - diff --git a/data/scripts/maps/Route127.inc b/data/scripts/maps/Route127.inc deleted file mode 100644 index 12e5bf127..000000000 --- a/data/scripts/maps/Route127.inc +++ /dev/null @@ -1,88 +0,0 @@ -Route127_MapScripts:: @ 81F69D9 - map_script 3, Route127_MapScript1_1F69E9 - map_script 1, Route127_MapScript1_1F6A14 - map_script 2, Route127_MapScript2_1F6A2B - .byte 0 - -Route127_MapScript1_1F69E9: @ 81F69E9 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route127_EventScript_27207A - compare VAR_0x4039, 1 - call_if 1, Route127_EventScript_273D13 - compare VAR_0x4037, 13 - call_if 1, Route127_EventScript_273D17 - compare VAR_0x4037, 14 - call_if 1, Route127_EventScript_273D17 - end - -Route127_MapScript1_1F6A14: @ 81F6A14 - compare VAR_0x4037, 13 - call_if 1, Route127_EventScript_273B5F - compare VAR_0x4037, 14 - call_if 1, Route127_EventScript_273BCC - end - -Route127_MapScript2_1F6A2B: @ 81F6A2B - map_script_2 VAR_0x4039, 1, gUnknown_08273D1F - .2byte 0 - -Route127_EventScript_1F6A35:: @ 81F6A35 - trainerbattle 0, TRAINER_CAMDEN, 0, Route127_Text_2A225F, Route127_Text_2A2294 - msgbox Route127_Text_2A22A1, 6 - end - -Route127_EventScript_1F6A4C:: @ 81F6A4C - trainerbattle 0, TRAINER_DONNY, 0, Route127_Text_2A22DD, Route127_Text_2A2315 - msgbox Route127_Text_2A232C, 6 - end - -Route127_EventScript_1F6A63:: @ 81F6A63 - trainerbattle 0, TRAINER_JONAH, 0, Route127_Text_2A2381, Route127_Text_2A23E1 - msgbox Route127_Text_2A240C, 6 - end - -Route127_EventScript_1F6A7A:: @ 81F6A7A - trainerbattle 0, TRAINER_HENRY, 0, Route127_Text_2A2450, Route127_Text_2A2483 - msgbox Route127_Text_2A2494, 6 - end - -Route127_EventScript_1F6A91:: @ 81F6A91 - trainerbattle 0, TRAINER_ROGER, 0, Route127_Text_2A24C6, Route127_Text_2A250B - msgbox Route127_Text_2A2538, 6 - end - -Route127_EventScript_1F6AA8:: @ 81F6AA8 - trainerbattle 0, TRAINER_AIDAN, 0, Route127_Text_2A257A, Route127_Text_2A25C1 - msgbox Route127_Text_2A25D2, 6 - end - -Route127_EventScript_1F6ABF:: @ 81F6ABF - trainerbattle 0, TRAINER_ATHENA, 0, Route127_Text_2A27D0, Route127_Text_2A27FC - msgbox Route127_Text_2A2832, 6 - end - -Route127_EventScript_1F6AD6:: @ 81F6AD6 - trainerbattle 2, TRAINER_KOJI_1, 0, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route127_EventScript_1F6B21 - msgbox Route127_Text_2A26AC, 4 - release - end - -Route127_EventScript_1F6B02:: @ 81F6B02 - special sub_80B4808 - waitmovement 0 - msgbox Route127_Text_2A26EE, 4 - setvar VAR_0x8004, 672 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 672 - callstd 8 - release - end - -Route127_EventScript_1F6B21:: @ 81F6B21 - trainerbattle 5, TRAINER_KOJI_1, 0, Route127_Text_2A2734, Route127_Text_2A276B - msgbox Route127_Text_2A278E, 6 - end - diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc deleted file mode 100644 index 8e2742ff5..000000000 --- a/data/scripts/maps/Route128.inc +++ /dev/null @@ -1,311 +0,0 @@ -Route128_MapScripts:: @ 81F6B38 - map_script 3, Route128_MapScript1_1F6B43 - map_script 2, Route128_MapScript2_1F6B4D - .byte 0 - -Route128_MapScript1_1F6B43: @ 81F6B43 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route128_EventScript_27207A - end - -Route128_MapScript2_1F6B4D: @ 81F6B4D - map_script_2 VAR_0x407B, 1, Route128_EventScript_1F6B57 - .2byte 0 - -Route128_EventScript_1F6B57:: @ 81F6B57 - lockall - delay 20 - applymovement 4, Route128_Movement_1F6C89 - waitmovement 0 - msgbox Route128_Text_1F6DF5, 4 - closemessage - applymovement 4, Route128_Movement_1F6C91 - waitmovement 0 - msgbox Route128_Text_1F6E48, 4 - closemessage - applymovement 5, Route128_Movement_1F6CAD - waitmovement 0 - applymovement 4, Route128_Movement_2725A6 - waitmovement 0 - msgbox Route128_Text_1F6E5A, 4 - closemessage - applymovement 5, Route128_Movement_1F6CBB - waitmovement 0 - applymovement 255, Route128_Movement_2725A6 - waitmovement 0 - msgbox Route128_Text_1F6F1E, 4 - closemessage - applymovement 4, Route128_Movement_1F6C96 - applymovement 255, Route128_Movement_2725A4 - applymovement 5, Route128_Movement_1F6CA8 - waitmovement 0 - msgbox Route128_Text_1F704F, 4 - closemessage - delay 40 - applymovement 5, Route128_Movement_1F6CB0 - applymovement 4, Route128_Movement_1F6C9B - waitmovement 0 - removeobject 5 - removeobject 4 - delay 100 - setfieldeffectargument 0, 1 - dofieldeffect 30 - waitfieldeffect 30 - addobject 3 - applymovement 3, Route128_Movement_1F6C87 - waitmovement 0 - applymovement 255, Route128_Movement_2725A8 - waitmovement 0 - msgbox Route128_Text_1F70C9, 4 - closemessage - applymovement 3, Route128_Movement_1F6C85 - applymovement 255, Route128_Movement_2725A6 - waitmovement 0 - msgbox Route128_Text_1F70EA, 4 - applymovement 3, Route128_Movement_2725AA - waitmovement 0 - msgbox Route128_Text_1F721B, 4 - closemessage - applymovement 3, Route128_Movement_2725AA - waitmovement 0 - delay 50 - setfieldeffectargument 0, 1 - dofieldeffect 30 - delay 15 - removeobject 3 - waitfieldeffect 30 - clearflag FLAG_SPECIAL_FLAG_0x4000 - setvar VAR_0x407B, 2 - releaseall - end - -Route128_Movement_1F6C76: @ 81F6C76 - walk_fast_left - step_end - -Route128_Movement_1F6C78: @ 81F6C78 - 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 - walk_up - step_end - -Route128_Movement_1F6C87: @ 81F6C87 - walk_fast_left - step_end - -Route128_Movement_1F6C89: @ 81F6C89 - 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 - lock_facing_direction - walk_slow_up - delay_16 - unlock_facing_direction - step_end - -Route128_Movement_1F6C96: @ 81F6C96 - walk_fast_left - walk_fast_left - walk_fast_left - walk_in_place_fastest_right - step_end - -Route128_Movement_1F6C9B: @ 81F6C9B - 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 - walk_left - walk_left - delay_8 - delay_4 - step_end - -Route128_Movement_1F6CAD: @ 81F6CAD - walk_left - walk_in_place_fastest_down - step_end - -Route128_Movement_1F6CB0: @ 81F6CB0 - 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 - walk_right - walk_in_place_fastest_down - step_end - -Route128_EventScript_1F6CBE:: @ 81F6CBE - trainerbattle 2, TRAINER_ISAIAH_1, 0, Route128_Text_2A287F, Route128_Text_2A28AB, Route128_EventScript_1F6CEA - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route128_EventScript_1F6D09 - msgbox Route128_Text_2A28D7, 4 - release - end - -Route128_EventScript_1F6CEA:: @ 81F6CEA - special sub_80B4808 - waitmovement 0 - msgbox Route128_Text_2A2916, 4 - setvar VAR_0x8004, 376 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 376 - callstd 8 - release - end - -Route128_EventScript_1F6D09:: @ 81F6D09 - trainerbattle 5, TRAINER_ISAIAH_1, 0, Route128_Text_2A2975, Route128_Text_2A29B8 - msgbox Route128_Text_2A29DC, 6 - end - -Route128_EventScript_1F6D20:: @ 81F6D20 - trainerbattle 2, TRAINER_KATELYN_1, 0, Route128_Text_2A2A1F, Route128_Text_2A2A94, Route128_EventScript_1F6D4C - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq Route128_EventScript_1F6D6B - msgbox Route128_Text_2A2AB7, 4 - release - end - -Route128_EventScript_1F6D4C:: @ 81F6D4C - special sub_80B4808 - waitmovement 0 - msgbox Route128_Text_2A2AF9, 4 - setvar VAR_0x8004, 386 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 386 - callstd 8 - release - end - -Route128_EventScript_1F6D6B:: @ 81F6D6B - trainerbattle 5, TRAINER_KATELYN_1, 0, Route128_Text_2A2B41, Route128_Text_2A2BAB - msgbox Route128_Text_2A2BDD, 6 - end - -Route128_EventScript_1F6D82:: @ 81F6D82 - trainerbattle 0, TRAINER_ALEXA, 0, Route128_Text_2A2C1C, Route128_Text_2A2C79 - msgbox Route128_Text_2A2C95, 6 - end - -Route128_EventScript_1F6D99:: @ 81F6D99 - trainerbattle 0, TRAINER_RUBEN, 0, Route128_Text_2A2CD9, Route128_Text_2A2CFE - msgbox Route128_Text_2A2D0D, 6 - end - -Route128_EventScript_1F6DB0:: @ 81F6DB0 - trainerbattle 0, TRAINER_WAYNE, 0, Route128_Text_2A2D3D, Route128_Text_2A2DA9 - msgbox Route128_Text_2A2DBA, 6 - end - -Route128_EventScript_1F6DC7:: @ 81F6DC7 - trainerbattle 0, TRAINER_HARRISON, 0, Route128_Text_2A2E0F, Route128_Text_2A2E44 - msgbox Route128_Text_2A2E6C, 6 - end - -Route128_EventScript_1F6DDE:: @ 81F6DDE - trainerbattle 0, TRAINER_CARLEE, 0, Route128_Text_2A2EC8, Route128_Text_2A2EFA - msgbox Route128_Text_2A2F2F, 6 - end - -Route128_Text_1F6DF5: @ 81F6DF5 - .string "ARCHIE: What happened…\n" - .string "What is this wretched scene…\p" - .string "Did I…make a horrible mistake?$" - -Route128_Text_1F6E48: @ 81F6E48 - .string "I…\n" - .string "I only wanted…$" - -Route128_Text_1F6E5A: @ 81F6E5A - .string "MAXIE: Do you understand now,\n" - .string "ARCHIE?\p" - .string "Do you finally see how disastrous\n" - .string "your dream turned out to be?\p" - .string "We have to hurry! We have to do\n" - .string "something before the situation goes\l" - .string "completely out of control!$" - -Route128_Text_1F6F1E: @ 81F6F1E - .string "MAXIE: {PLAYER}, don’t say anything.\p" - .string "I know that I have no right to be\n" - .string "critical of ARCHIE…\p" - .string "But the way things are now, I doubt\n" - .string "that we humans will be capable of\l" - .string "doing anything about it.\p" - .string "But neither can we stand by and\n" - .string "just watch helplessly.\p" - .string "The responsibility for putting an end\n" - .string "to this falls to ARCHIE and me…$" - -Route128_Text_1F704F: @ 81F704F - .string "MAXIE: This defies belief…\p" - .string "Those super-ancient POKéMON…\p" - .string "Their power is unbelievable.\n" - .string "They’ve upset the balance of nature…$" - -Route128_Text_1F70C9: @ 81F70C9 - .string "STEVEN: {PLAYER}{KUN}!\n" - .string "What is happening?$" - -Route128_Text_1F70EA: @ 81F70EA - .string "This is terrible…\p" - .string "After the scorching heat wave ended,\n" - .string "this deluge began.\p" - .string "If this doesn’t stop, all of HOENN…\n" - .string "No, the whole world will drown.\p" - .string "This huge rain cloud is spreading\n" - .string "from above SOOTOPOLIS…\p" - .string "What in the world is taking place there?\p" - .string "There’s no point arguing here…\n" - .string "SOOTOPOLIS might provide answers…$" - -Route128_Text_1F721B: @ 81F721B - .string "{PLAYER}{KUN}…\n" - .string "I don’t know what you intend to do,\l" - .string "but don’t do anything reckless.\p" - .string "Okay.\n" - .string "I’m going to SOOTOPOLIS.$" - diff --git a/data/scripts/maps/Route129.inc b/data/scripts/maps/Route129.inc deleted file mode 100644 index 170d87e56..000000000 --- a/data/scripts/maps/Route129.inc +++ /dev/null @@ -1,58 +0,0 @@ -Route129_MapScripts:: @ 81F7284 - map_script 3, Route129_MapScript1_1F72AB - map_script 1, Route129_MapScript1_1F7294 - map_script 2, Route129_MapScript2_1F72E2 - .byte 0 - -Route129_MapScript1_1F7294: @ 81F7294 - compare VAR_0x4037, 15 - call_if 1, Route129_EventScript_273C39 - compare VAR_0x4037, 16 - call_if 1, Route129_EventScript_273CA6 - end - -Route129_MapScript1_1F72AB: @ 81F72AB - compare VAR_0x4039, 1 - call_if 1, Route129_EventScript_273D13 - compare VAR_0x405E, 4 - call_if 4, Route129_EventScript_1F72D8 - compare VAR_0x4037, 15 - call_if 1, Route129_EventScript_273D17 - compare VAR_0x4037, 16 - call_if 1, Route129_EventScript_273D17 - end - -Route129_EventScript_1F72D8:: @ 81F72D8 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route129_EventScript_27207A - return - -Route129_MapScript2_1F72E2: @ 81F72E2 - map_script_2 VAR_0x4039, 1, gUnknown_08273D1F - .2byte 0 - -Route129_EventScript_1F72EC:: @ 81F72EC - trainerbattle 0, TRAINER_CHASE, 0, Route129_Text_2A2F66, Route129_Text_2A2F9D - msgbox Route129_Text_2A2FB9, 6 - end - -Route129_EventScript_1F7303:: @ 81F7303 - trainerbattle 0, TRAINER_ALLISON, 0, Route129_Text_2A2FF2, Route129_Text_2A3034 - msgbox Route129_Text_2A3048, 6 - end - -Route129_EventScript_1F731A:: @ 81F731A - trainerbattle 0, TRAINER_REED, 0, Route129_Text_2A30CD, Route129_Text_2A30F1 - msgbox Route129_Text_2A3114, 6 - end - -Route129_EventScript_1F7331:: @ 81F7331 - trainerbattle 0, TRAINER_TISHA, 0, Route129_Text_2A314E, Route129_Text_2A317D - msgbox Route129_Text_2A31A6, 6 - end - -Route129_EventScript_1F7348:: @ 81F7348 - trainerbattle 0, TRAINER_CLARENCE, 0, Route129_Text_2A3204, Route129_Text_2A3239 - msgbox Route129_Text_2A3252, 6 - end - diff --git a/data/scripts/maps/Route130.inc b/data/scripts/maps/Route130.inc deleted file mode 100644 index 26278cf50..000000000 --- a/data/scripts/maps/Route130.inc +++ /dev/null @@ -1,52 +0,0 @@ -Route130_MapScripts:: @ 81F735F - map_script 3, Route130_MapScript1_1F7365 - .byte 0 - -Route130_MapScript1_1F7365: @ 81F7365 - compare VAR_0x405E, 4 - call_if 4, Route130_EventScript_1F73B5 - specialvar VAR_RESULT, IsMirageIslandPresent - compare VAR_RESULT, 1 - goto_eq Route130_EventScript_1F73B1 - setflag FLAG_0x011 - setflag FLAG_0x012 - setflag FLAG_0x013 - setflag FLAG_0x014 - setflag FLAG_0x015 - setflag FLAG_0x016 - setflag FLAG_0x017 - setflag FLAG_0x018 - setflag FLAG_0x019 - setflag FLAG_0x01A - setflag FLAG_0x01B - setflag FLAG_0x01C - setflag FLAG_0x01D - setflag FLAG_0x01E - setflag FLAG_0x01F - setmaplayoutindex 263 - end - -Route130_EventScript_1F73B1:: @ 81F73B1 - setmaplayoutindex 46 - end - -Route130_EventScript_1F73B5:: @ 81F73B5 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route130_EventScript_27207A - return - -Route130_EventScript_1F73BF:: @ 81F73BF - trainerbattle 0, TRAINER_RODNEY, 0, Route130_Text_2A328A, Route130_Text_2A32E6 - msgbox Route130_Text_2A3300, 6 - end - -Route130_EventScript_1F73D6:: @ 81F73D6 - trainerbattle 0, TRAINER_KATIE, 0, Route130_Text_2A3363, Route130_Text_2A33AC - msgbox Route130_Text_2A33F5, 6 - end - -Route130_EventScript_1F73ED:: @ 81F73ED - trainerbattle 0, TRAINER_SANTIAGO, 0, Route130_Text_2A343A, Route130_Text_2A346D - msgbox Route130_Text_2A3494, 6 - end - diff --git a/data/scripts/maps/Route131.inc b/data/scripts/maps/Route131.inc deleted file mode 100644 index 566cbef66..000000000 --- a/data/scripts/maps/Route131.inc +++ /dev/null @@ -1,59 +0,0 @@ -Route131_MapScripts:: @ 81F7404 - map_script 3, Route131_MapScript1_1F740A - .byte 0 - -Route131_MapScript1_1F740A: @ 81F740A - compare VAR_0x405E, 4 - call_if 4, Route131_EventScript_1F741F - call Route131_EventScript_1F741B - end - -Route131_EventScript_1F741B:: @ 81F741B - setmaplayoutindex 319 - return - -Route131_EventScript_1F741F:: @ 81F741F - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route131_EventScript_27207A - return - -Route131_EventScript_1F7429:: @ 81F7429 - trainerbattle 0, TRAINER_RICHARD, 0, Route131_Text_2A34C8, Route131_Text_2A350D - msgbox Route131_Text_2A353D, 6 - end - -Route131_EventScript_1F7440:: @ 81F7440 - trainerbattle 0, TRAINER_HERMAN, 0, Route131_Text_2A35C6, Route131_Text_2A3626 - msgbox Route131_Text_2A362D, 6 - end - -Route131_EventScript_1F7457:: @ 81F7457 - trainerbattle 0, TRAINER_SUSIE, 0, Route131_Text_2A367B, Route131_Text_2A36AB - msgbox Route131_Text_2A36D6, 6 - end - -Route131_EventScript_1F746E:: @ 81F746E - trainerbattle 0, TRAINER_KARA, 0, Route131_Text_2A3751, Route131_Text_2A378A - msgbox Route131_Text_2A379F, 6 - end - -Route131_EventScript_1F7485:: @ 81F7485 - trainerbattle 4, TRAINER_RELI_AND_IAN, 0, Route131_Text_2A37E9, Route131_Text_2A381F, Route131_Text_2A38B7 - msgbox Route131_Text_2A3855, 6 - end - -Route131_EventScript_1F74A0:: @ 81F74A0 - trainerbattle 4, TRAINER_RELI_AND_IAN, 0, Route131_Text_2A38F8, Route131_Text_2A3925, Route131_Text_2A39CD - msgbox Route131_Text_2A3960, 6 - end - -Route131_EventScript_1F74BB:: @ 81F74BB - trainerbattle 0, TRAINER_TALIA, 0, Route131_Text_2A39FE, Route131_Text_2A3A38 - msgbox Route131_Text_2A3A48, 6 - end - -Route131_EventScript_1F74D2:: @ 81F74D2 - trainerbattle 0, TRAINER_KEVIN, 0, Route131_Text_2A3AA0, Route131_Text_2A3AFC - msgbox Route131_Text_2A3B02, 6 - end - diff --git a/data/scripts/maps/Route132.inc b/data/scripts/maps/Route132.inc deleted file mode 100644 index a4ae6f716..000000000 --- a/data/scripts/maps/Route132.inc +++ /dev/null @@ -1,43 +0,0 @@ -Route132_MapScripts:: @ 81F74E9 - .byte 0 - -Route132_EventScript_1F74EA:: @ 81F74EA - trainerbattle 0, TRAINER_GILBERT, 0, Route132_Text_2A3B4C, Route132_Text_2A3BAC - msgbox Route132_Text_2A3BC0, 6 - end - -Route132_EventScript_1F7501:: @ 81F7501 - trainerbattle 0, TRAINER_DANA, 0, Route132_Text_2A3C04, Route132_Text_2A3C39 - msgbox Route132_Text_2A3C49, 6 - end - -Route132_EventScript_1F7518:: @ 81F7518 - trainerbattle 0, TRAINER_RONALD, 0, Route132_Text_2A3C7F, Route132_Text_2A3CAD - msgbox Route132_Text_2A3CC5, 6 - end - -Route132_EventScript_1F752F:: @ 81F752F - trainerbattle 0, TRAINER_KIYO, 0, Route132_Text_2A3D26, Route132_Text_2A3D6C - msgbox Route132_Text_2A3D8B, 6 - end - -Route132_EventScript_1F7546:: @ 81F7546 - trainerbattle 0, TRAINER_PAXTON, 0, Route132_Text_2A3F4F, Route132_Text_2A3FA8 - msgbox Route132_Text_2A3FE5, 6 - end - -Route132_EventScript_1F755D:: @ 81F755D - trainerbattle 0, TRAINER_DARCY, 0, Route132_Text_2A4026, Route132_Text_2A406E - msgbox Route132_Text_2A40A4, 6 - end - -Route132_EventScript_1F7574:: @ 81F7574 - trainerbattle 0, TRAINER_JONATHAN, 0, Route132_Text_2A3EAC, Route132_Text_2A3EDD - msgbox Route132_Text_2A3F03, 6 - end - -Route132_EventScript_1F758B:: @ 81F758B - trainerbattle 0, TRAINER_MAKAYLA, 0, Route132_Text_2A3DF0, Route132_Text_2A3E2C - msgbox Route132_Text_2A3E4E, 6 - end - diff --git a/data/scripts/maps/Route133.inc b/data/scripts/maps/Route133.inc deleted file mode 100644 index dc15a5d40..000000000 --- a/data/scripts/maps/Route133.inc +++ /dev/null @@ -1,38 +0,0 @@ -Route133_MapScripts:: @ 81F75A2 - .byte 0 - -Route133_EventScript_1F75A3:: @ 81F75A3 - trainerbattle 0, TRAINER_FRANKLIN, 0, Route133_Text_2A40F0, Route133_Text_2A413F - msgbox Route133_Text_2A4154, 6 - end - -Route133_EventScript_1F75BA:: @ 81F75BA - trainerbattle 0, TRAINER_DEBRA, 0, Route133_Text_2A41A8, Route133_Text_2A4200 - msgbox Route133_Text_2A420E, 6 - end - -Route133_EventScript_1F75D1:: @ 81F75D1 - trainerbattle 0, TRAINER_LINDA, 0, Route133_Text_2A4236, Route133_Text_2A4258 - msgbox Route133_Text_2A4264, 6 - end - -Route133_EventScript_1F75E8:: @ 81F75E8 - trainerbattle 0, TRAINER_WARREN, 0, Route133_Text_2A4290, Route133_Text_2A42E0 - msgbox Route133_Text_2A4304, 6 - end - -Route133_EventScript_1F75FF:: @ 81F75FF - trainerbattle 0, TRAINER_BECK, 0, Route133_Text_2A436A, Route133_Text_2A439C - msgbox Route133_Text_2A43B9, 6 - end - -Route133_EventScript_1F7616:: @ 81F7616 - trainerbattle 0, TRAINER_MOLLIE, 0, Route133_Text_2A4401, Route133_Text_2A443A - msgbox Route133_Text_2A4477, 6 - end - -Route133_EventScript_1F762D:: @ 81F762D - trainerbattle 0, TRAINER_CONOR, 0, Route133_Text_2A44BA, Route133_Text_2A4505 - msgbox Route133_Text_2A4527, 6 - end - diff --git a/data/scripts/maps/Route134.inc b/data/scripts/maps/Route134.inc deleted file mode 100644 index bdec88c42..000000000 --- a/data/scripts/maps/Route134.inc +++ /dev/null @@ -1,53 +0,0 @@ -Route134_MapScripts:: @ 81F7644 - map_script 5, Route134_MapScript1_1F764A - .byte 0 - -Route134_MapScript1_1F764A: @ 81F764A - setdivewarp MAP_UNDERWATER_ROUTE134, 255, 8, 6 - end - -Route134_EventScript_1F7653:: @ 81F7653 - trainerbattle 0, TRAINER_JACK, 0, Route134_Text_2A4571, Route134_Text_2A45BB - msgbox Route134_Text_2A45C5, 6 - end - -Route134_EventScript_1F766A:: @ 81F766A - trainerbattle 0, TRAINER_LAUREL, 0, Route134_Text_2A4609, Route134_Text_2A4643 - msgbox Route134_Text_2A464B, 6 - end - -Route134_EventScript_1F7681:: @ 81F7681 - trainerbattle 0, TRAINER_ALEX, 0, Route134_Text_2A4682, Route134_Text_2A46BE - msgbox Route134_Text_2A46D2, 6 - end - -Route134_EventScript_1F7698:: @ 81F7698 - trainerbattle 0, TRAINER_AARON, 0, Route134_Text_2A479E, Route134_Text_2A47E1 - msgbox Route134_Text_2A47FD, 6 - end - -Route134_EventScript_1F76AF:: @ 81F76AF - trainerbattle 0, TRAINER_HITOSHI, 0, Route134_Text_2A4709, Route134_Text_2A4745 - msgbox Route134_Text_2A475D, 6 - end - -Route134_EventScript_1F76C6:: @ 81F76C6 - trainerbattle 0, TRAINER_HUDSON, 0, Route134_Text_2A4A8F, Route134_Text_2A4AC1 - msgbox Route134_Text_2A4AD8, 6 - end - -Route134_EventScript_1F76DD:: @ 81F76DD - trainerbattle 0, TRAINER_REYNA, 0, Route134_Text_2A49E9, Route134_Text_2A4A10 - msgbox Route134_Text_2A4A34, 6 - end - -Route134_EventScript_1F76F4:: @ 81F76F4 - trainerbattle 0, TRAINER_MARLEY, 0, Route134_Text_2A4937, Route134_Text_2A496B - msgbox Route134_Text_2A49B1, 6 - end - -Route134_EventScript_1F770B:: @ 81F770B - trainerbattle 0, TRAINER_KELVIN, 0, Route134_Text_2A4875, Route134_Text_2A489B - msgbox Route134_Text_2A48BD, 6 - end - diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc deleted file mode 100644 index 6eb8d48bc..000000000 --- a/data/scripts/maps/RustboroCity.inc +++ /dev/null @@ -1,1310 +0,0 @@ -RustboroCity_MapScripts:: @ 81E06BD - map_script 3, RustboroCity_MapScript1_1E06C8 - map_script 2, RustboroCity_MapScript2_1E070B - .byte 0 - -RustboroCity_MapScript1_1E06C8: @ 81E06C8 - setflag FLAG_VISITED_RUSTBORO_CITY - call RustboroCity_EventScript_271ED7 - compare VAR_0x405A, 6 - call_if 1, RustboroCity_EventScript_1E0707 - getplayerxy VAR_TEMP_0, VAR_TEMP_1 - compare VAR_0x405A, 6 - goto_eq RustboroCity_EventScript_1E06EC - end - -RustboroCity_EventScript_1E06EC:: @ 81E06EC - compare VAR_TEMP_0, 11 - goto_eq RustboroCity_EventScript_1E06FF - setobjectxyperm 15, 12, 15 - end - -RustboroCity_EventScript_1E06FF:: @ 81E06FF - setobjectxyperm 15, 11, 15 - end - -RustboroCity_EventScript_1E0707:: @ 81E0707 - setflag FLAG_SPECIAL_FLAG_0x4000 - return - -RustboroCity_MapScript2_1E070B: @ 81E070B - map_script_2 VAR_0x405A, 6, RustboroCity_EventScript_1E0715 - .2byte 0 - -RustboroCity_EventScript_1E0715:: @ 81E0715 - lockall - setvar VAR_0x4063, 1 - applymovement 255, RustboroCity_Movement_1E0850 - waitmovement 0 - playse SE_KAIDAN - delay 10 - addobject 15 - applymovement 15, RustboroCity_Movement_1E0852 - waitmovement 0 - playse SE_PIN - applymovement 15, RustboroCity_Movement_272598 - waitmovement 0 - applymovement 15, RustboroCity_Movement_27259A - waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 - waitmovement 0 - applymovement 15, RustboroCity_Movement_1E084E - waitmovement 0 - msgbox RustboroCity_Text_1E22A5, 4 - closemessage - setflag FLAG_HAS_MATCH_CALL - applymovement 15, RustboroCity_Movement_2725A4 - waitmovement 0 - playse SE_TK_KASYA - delay 10 - playse SE_TK_KASYA - delay 10 - playse SE_TK_KASYA - delay 10 - playse SE_TK_KASYA - delay 20 - applymovement 15, RustboroCity_Movement_2725AA - waitmovement 0 - msgbox RustboroCity_Text_1E2331, 4 - closemessage - delay 20 - goto RustboroCity_EventScript_1E07BD - -RustboroCity_EventScript_1E07AC:: @ 81E07AC - msgbox RustboroCity_Text_1E2449, 4 - closemessage - delay 10 - goto RustboroCity_EventScript_1E07BD - -RustboroCity_EventScript_1E07BD:: @ 81E07BD - setflag FLAG_0x130 - special sp106_CreateStartMenu - waitstate - switch VAR_RESULT - case 0, RustboroCity_EventScript_1E07AC - case 1, RustboroCity_EventScript_1E07AC - case 2, RustboroCity_EventScript_1E07AC - case 4, RustboroCity_EventScript_1E07AC - case 5, RustboroCity_EventScript_1E07AC - case 6, RustboroCity_EventScript_1E07AC - case 7, RustboroCity_EventScript_1E07AC - case 127, RustboroCity_EventScript_1E07AC - special sub_81C72A4 - waitstate - delay 20 - msgbox RustboroCity_Text_1E2464, 4 - closemessage - applymovement 15, RustboroCity_Movement_1E085D - waitmovement 0 - playse SE_KAIDAN - removeobject 15 - setflag FLAG_0x34C - setvar VAR_0x405A, 7 - clearflag FLAG_SPECIAL_FLAG_0x4000 - releaseall - end - -RustboroCity_Movement_1E084E: @ 81E084E - walk_in_place_down - step_end - -RustboroCity_Movement_1E0850: @ 81E0850 - walk_down - step_end - -RustboroCity_Movement_1E0852: @ 81E0852 - walk_down - delay_16 - step_end - -RustboroCity_Movement_1E0855: @ 81E0855 - delay_16 - walk_left - walk_down - walk_down - walk_right - walk_in_place_fastest_up - delay_16 - step_end - -RustboroCity_Movement_1E085D: @ 81E085D - walk_up - step_end - -RustboroCity_EventScript_1E085F:: @ 81E085F - lock - faceplayer - checkflag FLAG_0x08E - goto_eq RustboroCity_EventScript_1E0874 - msgbox RustboroCity_Text_1E123F, 4 - release - end - -RustboroCity_EventScript_1E0874:: @ 81E0874 - msgbox RustboroCity_Text_1E12AC, 4 - release - end - -RustboroCity_EventScript_1E087E:: @ 81E087E - lock - faceplayer - msgbox RustboroCity_Text_1E1407, 4 - release - end - -RustboroCity_EventScript_1E088A:: @ 81E088A - msgbox RustboroCity_Text_1E1480, 2 - end - -RustboroCity_EventScript_1E0893:: @ 81E0893 - lock - faceplayer - checkflag FLAG_BADGE01_GET - goto_eq RustboroCity_EventScript_1E08A8 - msgbox RustboroCity_Text_1E130D, 4 - release - end - -RustboroCity_EventScript_1E08A8:: @ 81E08A8 - msgbox RustboroCity_Text_1E139E, 4 - release - end - -RustboroCity_EventScript_1E08B2:: @ 81E08B2 - lock - faceplayer - checkflag FLAG_0x0BC - goto_eq RustboroCity_EventScript_1E08C7 - msgbox RustboroCity_Text_1E1520, 4 - release - end - -RustboroCity_EventScript_1E08C7:: @ 81E08C7 - msgbox RustboroCity_Text_1E1589, 4 - release - end - -RustboroCity_EventScript_1E08D1:: @ 81E08D1 - msgbox RustboroCity_Text_1E1633, 2 - end - -RustboroCity_EventScript_1E08DA:: @ 81E08DA - msgbox RustboroCity_Text_1E1695, 3 - end - -RustboroCity_EventScript_1E08E3:: @ 81E08E3 - msgbox RustboroCity_Text_1E20A6, 3 - end - -RustboroCity_EventScript_1E08EC:: @ 81E08EC - msgbox RustboroCity_Text_1E2128, 3 - end - -RustboroCity_EventScript_1E08F5:: @ 81E08F5 - msgbox RustboroCity_Text_1E2167, 3 - end - -RustboroCity_EventScript_1E08FE:: @ 81E08FE - msgbox RustboroCity_Text_1E21B3, 3 - end - -RustboroCity_EventScript_1E0907:: @ 81E0907 - msgbox RustboroCity_Text_1E220B, 3 - end - -RustboroCity_EventScript_1E0910:: @ 81E0910 - msgbox RustboroCity_Text_1E2253, 3 - end - -RustboroCity_EventScript_1E0919:: @ 81E0919 - msgbox RustboroCity_Text_1E2296, 3 - end - -RustboroCity_EventScript_1E0922:: @ 81E0922 - lock - faceplayer - msgbox RustboroCity_Text_1E16F4, 4 - applymovement 7, RustboroCity_Movement_2725A2 - waitmovement 0 - release - end - -RustboroCity_EventScript_1E0938:: @ 81E0938 - lock - faceplayer - msgbox RustboroCity_Text_1E174B, 4 - applymovement 8, RustboroCity_Movement_2725A2 - waitmovement 0 - release - end - -RustboroCity_EventScript_1E094E:: @ 81E094E - lock - faceplayer - msgbox RustboroCity_Text_1E1789, 4 - release - end - -RustboroCity_EventScript_1E095A:: @ 81E095A - lockall - setobjectxyperm 9, 14, 21 - setobjectmovementtype 9, 10 - setvar VAR_0x8004, 0 - goto RustboroCity_EventScript_1E09CD - end - -RustboroCity_EventScript_1E0971:: @ 81E0971 - lockall - setobjectxyperm 9, 14, 21 - setobjectmovementtype 9, 10 - setvar VAR_0x8004, 1 - goto RustboroCity_EventScript_1E09CD - end - -RustboroCity_EventScript_1E0988:: @ 81E0988 - lockall - setobjectxyperm 9, 14, 21 - setobjectmovementtype 9, 10 - setvar VAR_0x8004, 2 - goto RustboroCity_EventScript_1E09CD - end - -RustboroCity_EventScript_1E099F:: @ 81E099F - lockall - setobjectxyperm 9, 14, 21 - setobjectmovementtype 9, 10 - setvar VAR_0x8004, 3 - goto RustboroCity_EventScript_1E09CD - end - -RustboroCity_EventScript_1E09B6:: @ 81E09B6 - lockall - setobjectxyperm 9, 14, 21 - setobjectmovementtype 9, 10 - setvar VAR_0x8004, 4 - goto RustboroCity_EventScript_1E09CD - end - -RustboroCity_EventScript_1E09CD:: @ 81E09CD - msgbox RustboroCity_Text_1E17FE, 4 - closemessage - playbgm MUS_AQA_0, 0 - addobject 10 - addobject 9 - applymovement 10, RustboroCity_Movement_1E0AA0 - waitmovement 0 - removeobject 10 - applymovement 9, RustboroCity_Movement_1E0AB1 - waitmovement 0 - msgbox RustboroCity_Text_1E1817, 4 - closemessage - applymovement 9, RustboroCity_Movement_1E0AB9 - waitmovement 0 - fadedefaultbgm - removeobject 9 - setobjectxyperm 9, 30, 10 - clearflag FLAG_0x2DC - setflag FLAG_0x08E - setvar VAR_0x405A, 2 - setvar VAR_0x409A, 2 - setvar VAR_0x406F, 1 - clearflag FLAG_0x37B - clearflag FLAG_0x370 - clearflag FLAG_0x36E - setflag FLAG_0x2E3 - setflag FLAG_0x371 - releaseall - end - -RustboroCity_EventScript_1E0A3B:: @ 81E0A3B - msgbox RustboroCity_Text_1E1904, 4 - return - -RustboroCity_EventScript_1E0A44:: @ 81E0A44 - msgbox RustboroCity_Text_1E194D, 4 - return - -RustboroCity_EventScript_1E0A4D:: @ 81E0A4D - applymovement 9, RustboroCity_Movement_1E0AC1 - waitmovement 0 - return - -RustboroCity_EventScript_1E0A58:: @ 81E0A58 - applymovement 9, RustboroCity_Movement_1E0AC5 - waitmovement 0 - return - -RustboroCity_EventScript_1E0A63:: @ 81E0A63 - applymovement 9, RustboroCity_Movement_1E0ACA - waitmovement 0 - return - -RustboroCity_EventScript_1E0A6E:: @ 81E0A6E - applymovement 9, RustboroCity_Movement_1E0ACF - waitmovement 0 - return - -RustboroCity_EventScript_1E0A79:: @ 81E0A79 - applymovement 9, RustboroCity_Movement_1E0AD5 - waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 - waitmovement 0 - return - -RustboroCity_Movement_1E0A8E: @ 81E0A8E - 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 - 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 - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_in_place_fastest_up - step_end - -RustboroCity_Movement_1E0AB9: @ 81E0AB9 - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - step_end - -RustboroCity_Movement_1E0AC1: @ 81E0AC1 - walk_down - walk_right - walk_right - step_end - -RustboroCity_Movement_1E0AC5: @ 81E0AC5 - walk_down - walk_down - walk_right - walk_right - step_end - -RustboroCity_Movement_1E0ACA: @ 81E0ACA - walk_down - walk_down - walk_right - walk_right - step_end - -RustboroCity_Movement_1E0ACF: @ 81E0ACF - walk_down - walk_down - walk_down - walk_right - walk_right - step_end - -RustboroCity_Movement_1E0AD5: @ 81E0AD5 - walk_down - walk_down - walk_down - walk_right - walk_right - walk_right - walk_in_place_fastest_down - step_end - -RustboroCity_EventScript_1E0ADD:: @ 81E0ADD - lock - faceplayer - checkflag FLAG_0x08F - goto_eq RustboroCity_EventScript_1E0AF2 - msgbox RustboroCity_Text_1E1904, 4 - release - end - -RustboroCity_EventScript_1E0AF2:: @ 81E0AF2 - waitse - setvar VAR_TEMP_1, 4 - goto RustboroCity_EventScript_1E0C5B - end - -RustboroCity_EventScript_1E0AFE:: @ 81E0AFE - lockall - setvar VAR_TEMP_1, 0 - goto RustboroCity_EventScript_1E0B2E - end - -RustboroCity_EventScript_1E0B0A:: @ 81E0B0A - lockall - setvar VAR_TEMP_1, 1 - goto RustboroCity_EventScript_1E0B2E - end - -RustboroCity_EventScript_1E0B16:: @ 81E0B16 - lockall - setvar VAR_TEMP_1, 2 - goto RustboroCity_EventScript_1E0B2E - end - -RustboroCity_EventScript_1E0B22:: @ 81E0B22 - lockall - setvar VAR_TEMP_1, 3 - goto RustboroCity_EventScript_1E0B2E - end - -RustboroCity_EventScript_1E0B2E:: @ 81E0B2E - compare VAR_TEMP_1, 0 - call_if 1, RustboroCity_EventScript_1E0B6F - compare VAR_TEMP_1, 1 - call_if 1, RustboroCity_EventScript_1E0B9B - compare VAR_TEMP_1, 2 - call_if 1, RustboroCity_EventScript_1E0BC7 - compare VAR_TEMP_1, 3 - call_if 1, RustboroCity_EventScript_1E0BF3 - setflag FLAG_0x09F - setvar VAR_0x405A, 3 - moveobjectoffscreen 9 - msgbox RustboroCity_Text_1E183E, 4 - releaseall - end - -RustboroCity_EventScript_1E0B6F:: @ 81E0B6F - applymovement 9, RustboroCity_Movement_2725A6 - waitmovement 0 - playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 - waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A - waitmovement 0 - applymovement 255, RustboroCity_Movement_2725AA - waitmovement 0 - return - -RustboroCity_EventScript_1E0B9B:: @ 81E0B9B - applymovement 9, RustboroCity_Movement_2725A4 - waitmovement 0 - playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 - waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A - waitmovement 0 - applymovement 255, RustboroCity_Movement_2725AC - waitmovement 0 - return - -RustboroCity_EventScript_1E0BC7:: @ 81E0BC7 - applymovement 9, RustboroCity_Movement_2725AA - waitmovement 0 - playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 - waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A - waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 - waitmovement 0 - return - -RustboroCity_EventScript_1E0BF3:: @ 81E0BF3 - applymovement 9, RustboroCity_Movement_2725AA - waitmovement 0 - playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 - waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A - waitmovement 0 - applymovement 9, RustboroCity_Movement_1E0C29 - waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 - waitmovement 0 - return - -RustboroCity_Movement_1E0C29: @ 81E0C29 - walk_down - step_end - -RustboroCity_EventScript_1E0C2B:: @ 81E0C2B - lockall - setvar VAR_TEMP_1, 0 - goto RustboroCity_EventScript_1E0C5B - end - -RustboroCity_EventScript_1E0C37:: @ 81E0C37 - lockall - setvar VAR_TEMP_1, 1 - goto RustboroCity_EventScript_1E0C5B - end - -RustboroCity_EventScript_1E0C43:: @ 81E0C43 - lockall - setvar VAR_TEMP_1, 2 - goto RustboroCity_EventScript_1E0C5B - end - -RustboroCity_EventScript_1E0C4F:: @ 81E0C4F - lockall - setvar VAR_TEMP_1, 3 - goto RustboroCity_EventScript_1E0C5B - end - -RustboroCity_EventScript_1E0C5B:: @ 81E0C5B - compare VAR_TEMP_1, 0 - call_if 1, RustboroCity_EventScript_1E0CDC - compare VAR_TEMP_1, 1 - call_if 1, RustboroCity_EventScript_1E0D08 - compare VAR_TEMP_1, 2 - call_if 1, RustboroCity_EventScript_1E0D34 - compare VAR_TEMP_1, 3 - call_if 1, RustboroCity_EventScript_1E0D60 - compare VAR_TEMP_1, 4 - call_if 1, RustboroCity_EventScript_1E0D96 - msgbox RustboroCity_Text_1E194D, 4 - giveitem_std ITEM_GREAT_BALL - compare VAR_RESULT, 0 - call_if 1, RustboroCity_EventScript_1E0CD3 - msgbox RustboroCity_Text_1E1A21, 4 - closemessage - setflag FLAG_0x090 - setflag FLAG_0x2DC - setvar VAR_0x405A, 5 - delay 30 - warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2 - waitstate - releaseall - end - -RustboroCity_EventScript_1E0CD3:: @ 81E0CD3 - msgbox RustboroCity_Text_1E19E5, 4 - return - -RustboroCity_EventScript_1E0CDC:: @ 81E0CDC - applymovement 9, RustboroCity_Movement_2725A6 - waitmovement 0 - playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 - waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A - waitmovement 0 - applymovement 255, RustboroCity_Movement_2725AA - waitmovement 0 - return - -RustboroCity_EventScript_1E0D08:: @ 81E0D08 - applymovement 9, RustboroCity_Movement_2725A8 - waitmovement 0 - playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 - waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A - waitmovement 0 - applymovement 255, RustboroCity_Movement_2725AE - waitmovement 0 - return - -RustboroCity_EventScript_1E0D34:: @ 81E0D34 - applymovement 9, RustboroCity_Movement_2725AA - waitmovement 0 - playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 - waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A - waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 - waitmovement 0 - return - -RustboroCity_EventScript_1E0D60:: @ 81E0D60 - applymovement 9, RustboroCity_Movement_2725AA - waitmovement 0 - playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 - waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A - waitmovement 0 - applymovement 9, RustboroCity_Movement_1E0C29 - waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 - waitmovement 0 - return - -RustboroCity_EventScript_1E0D96:: @ 81E0D96 - applymovement 9, RustboroCity_Movement_2725A4 - waitmovement 0 - playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 - waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A - waitmovement 0 - return - -RustboroCity_EventScript_1E0DB8:: @ 81E0DB8 - lockall - checkflag FLAG_0x120 - call_if 0, RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_27259E - waitmovement 0 - goto RustboroCity_EventScript_1E0FF3 - -Route104_EventScript_1E0DD1:: @ 81E0DD1 -RustboroCity_EventScript_1E0DD1:: @ 81E0DD1 - checkplayergender - compare VAR_RESULT, 0 - goto_eq RustboroCity_EventScript_1E0DE9 - compare VAR_RESULT, 1 - goto_eq RustboroCity_EventScript_1E0DEE - return - -RustboroCity_EventScript_1E0DE9:: @ 81E0DE9 - playbgm MUS_GIRL_SUP, 1 - return - -RustboroCity_EventScript_1E0DEE:: @ 81E0DEE - playbgm MUS_BOY_SUP, 1 - return - -RustboroCity_EventScript_1E0DF3:: @ 81E0DF3 - lockall - call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA - waitmovement 0 - playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 - waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A - waitmovement 0 - applymovement 14, RustboroCity_Movement_1E120E - waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 - waitmovement 0 - goto RustboroCity_EventScript_1E0FF3 - -RustboroCity_EventScript_1E0E33:: @ 81E0E33 - lockall - call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA - waitmovement 0 - playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 - waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A - waitmovement 0 - applymovement 14, RustboroCity_Movement_1E1215 - waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 - waitmovement 0 - goto RustboroCity_EventScript_1E0FF3 - -RustboroCity_EventScript_1E0E73:: @ 81E0E73 - lockall - call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA - waitmovement 0 - playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 - waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A - waitmovement 0 - applymovement 14, RustboroCity_Movement_1E121B - waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 - waitmovement 0 - goto RustboroCity_EventScript_1E0FF3 - -RustboroCity_EventScript_1E0EB3:: @ 81E0EB3 - lockall - call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA - waitmovement 0 - playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 - waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A - waitmovement 0 - applymovement 14, RustboroCity_Movement_1E1220 - waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 - waitmovement 0 - goto RustboroCity_EventScript_1E0FF3 - -RustboroCity_EventScript_1E0EF3:: @ 81E0EF3 - lockall - call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA - waitmovement 0 - playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 - waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A - waitmovement 0 - applymovement 14, RustboroCity_Movement_1E1224 - waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 - waitmovement 0 - goto RustboroCity_EventScript_1E0FF3 - -RustboroCity_EventScript_1E0F33:: @ 81E0F33 - lockall - call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA - waitmovement 0 - playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 - waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A - waitmovement 0 - applymovement 14, RustboroCity_Movement_1E1227 - waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 - waitmovement 0 - goto RustboroCity_EventScript_1E0FF3 - -RustboroCity_EventScript_1E0F73:: @ 81E0F73 - lockall - call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA - waitmovement 0 - playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 - waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A - waitmovement 0 - applymovement 14, RustboroCity_Movement_1E122B - waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 - waitmovement 0 - goto RustboroCity_EventScript_1E0FF3 - -RustboroCity_EventScript_1E0FB3:: @ 81E0FB3 - lockall - call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA - waitmovement 0 - playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 - waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A - waitmovement 0 - applymovement 14, RustboroCity_Movement_1E1230 - waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 - waitmovement 0 - goto RustboroCity_EventScript_1E0FF3 - -RustboroCity_EventScript_1E0FF3:: @ 81E0FF3 - checkplayergender - compare VAR_RESULT, 0 - goto_eq RustboroCity_EventScript_1E100B - compare VAR_RESULT, 1 - goto_eq RustboroCity_EventScript_1E1114 - end - -RustboroCity_EventScript_1E100B:: @ 81E100B - checkflag FLAG_0x0D3 - goto_eq RustboroCity_EventScript_1E10C1 - checkflag FLAG_0x120 - goto_eq RustboroCity_EventScript_1E1070 - setflag FLAG_0x120 - msgbox RustboroCity_Text_1E1A49, 4 - closemessage - delay 30 - playfanfare MUS_ME_TORE_EYE - msgbox RustboroCity_Text_1E1ADB, 4 - waitfanfare - closemessage - delay 30 - setflag FLAG_0x0FD - setvar VAR_0x405A, 8 - setvar VAR_0x4063, 2 - setvar VAR_0x8008, 0 - msgbox RustboroCity_Text_1E1AFA, 5 - compare VAR_RESULT, 1 - goto_eq RustboroCity_EventScript_1E1092 - msgbox RustboroCity_Text_1E1BD3, 4 - call RustboroCity_EventScript_1E10D6 - releaseall - end - -RustboroCity_EventScript_1E1070:: @ 81E1070 - setvar VAR_0x8008, 1 - msgbox RustboroCity_Text_1E1C48, 5 - compare VAR_RESULT, 1 - goto_eq RustboroCity_EventScript_1E1092 - msgbox RustboroCity_Text_1E1BD3, 4 - releaseall - end - -RustboroCity_EventScript_1E1092:: @ 81E1092 - msgbox RustboroCity_Text_1E1C84, 4 - switch VAR_FIRST_POKE - case 0, RustboroCity_EventScript_1E10DB - case 1, RustboroCity_EventScript_1E10EE - case 2, RustboroCity_EventScript_1E1101 - end - -RustboroCity_EventScript_1E10C1:: @ 81E10C1 - msgbox RustboroCity_Text_1E1CE7, 4 - compare VAR_0x8008, 0 - call_if 1, RustboroCity_EventScript_1E10D6 - releaseall - end - -RustboroCity_EventScript_1E10D6:: @ 81E10D6 - savebgm MUS_DUMMY - fadedefaultbgm - return - -RustboroCity_EventScript_1E10DB:: @ 81E10DB - trainerbattle 3, TRAINER_MAY_14, 0, RustboroCity_Text_1E1CC1 - setflag FLAG_0x0D3 - goto RustboroCity_EventScript_1E10C1 - end - -RustboroCity_EventScript_1E10EE:: @ 81E10EE - trainerbattle 3, TRAINER_MAY_15, 0, RustboroCity_Text_1E1CC1 - setflag FLAG_0x0D3 - goto RustboroCity_EventScript_1E10C1 - end - -RustboroCity_EventScript_1E1101:: @ 81E1101 - trainerbattle 3, TRAINER_MAY_10, 0, RustboroCity_Text_1E1CC1 - setflag FLAG_0x0D3 - goto RustboroCity_EventScript_1E10C1 - end - -RustboroCity_EventScript_1E1114:: @ 81E1114 - checkflag FLAG_0x0D3 - goto_eq RustboroCity_EventScript_1E11C0 - checkflag FLAG_0x120 - goto_eq RustboroCity_EventScript_1E1174 - setflag FLAG_0x120 - msgbox RustboroCity_Text_1E1D7D, 4 - closemessage - delay 30 - playfanfare MUS_ME_TORE_EYE - msgbox RustboroCity_Text_1E1E11, 4 - waitfanfare - closemessage - delay 30 - setflag FLAG_0x0FD - setvar VAR_0x405A, 8 - setvar VAR_0x4063, 2 - msgbox RustboroCity_Text_1E1E34, 5 - compare VAR_RESULT, 1 - goto_eq RustboroCity_EventScript_1E1191 - msgbox RustboroCity_Text_1E1F2F, 4 - call RustboroCity_EventScript_1E10D6 - releaseall - end - -RustboroCity_EventScript_1E1174:: @ 81E1174 - msgbox RustboroCity_Text_1E1F76, 5 - compare VAR_RESULT, 1 - goto_eq RustboroCity_EventScript_1E1191 - msgbox RustboroCity_Text_1E1F2F, 4 - releaseall - end - -RustboroCity_EventScript_1E1191:: @ 81E1191 - msgbox RustboroCity_Text_1E1FA9, 4 - switch VAR_FIRST_POKE - case 0, RustboroCity_EventScript_1E11D5 - case 1, RustboroCity_EventScript_1E11E8 - case 2, RustboroCity_EventScript_1E11FB - end - -RustboroCity_EventScript_1E11C0:: @ 81E11C0 - msgbox RustboroCity_Text_1E2002, 4 - compare VAR_0x8008, 0 - call_if 1, RustboroCity_EventScript_1E10D6 - releaseall - end - -RustboroCity_EventScript_1E11D5:: @ 81E11D5 - trainerbattle 3, TRAINER_BRENDAN_10, 0, RustboroCity_Text_1E1FE9 - setflag FLAG_0x0D3 - goto RustboroCity_EventScript_1E11C0 - end - -RustboroCity_EventScript_1E11E8:: @ 81E11E8 - trainerbattle 3, TRAINER_BRENDAN_12, 0, RustboroCity_Text_1E1FE9 - setflag FLAG_0x0D3 - goto RustboroCity_EventScript_1E11C0 - end - -RustboroCity_EventScript_1E11FB:: @ 81E11FB - trainerbattle 3, TRAINER_BRENDAN_11, 0, RustboroCity_Text_1E1FE9 - setflag FLAG_0x0D3 - goto RustboroCity_EventScript_1E11C0 - end - -RustboroCity_Movement_1E120E: @ 81E120E - walk_down - walk_left - walk_left - walk_left - walk_left - walk_down - step_end - -RustboroCity_Movement_1E1215: @ 81E1215 - walk_down - walk_left - walk_left - walk_left - walk_down - step_end - -RustboroCity_Movement_1E121B: @ 81E121B - walk_down - walk_left - walk_left - walk_down - step_end - -RustboroCity_Movement_1E1220: @ 81E1220 - walk_down - walk_left - walk_down - step_end - -RustboroCity_Movement_1E1224: @ 81E1224 - walk_down - walk_down - step_end - -RustboroCity_Movement_1E1227: @ 81E1227 - walk_down - walk_right - walk_down - step_end - -RustboroCity_Movement_1E122B: @ 81E122B - walk_down - walk_right - walk_right - walk_down - step_end - -RustboroCity_Movement_1E1230: @ 81E1230 - walk_down - walk_right - walk_right - walk_right - walk_down - step_end - -RustboroCity_EventScript_1E1236:: @ 81E1236 - msgbox RustboroCity_Text_1E249D, 2 - end - -RustboroCity_Text_1E123F: @ 81E123F - .string "The DEVON CORPORATION…\n" - .string "We all just shorten it to DEVON.\p" - .string "That company makes all sorts of\n" - .string "convenient products.$" - -RustboroCity_Text_1E12AC: @ 81E12AC - .string "Hm? A sneaky-looking man?\p" - .string "Come to think of it, yes, a shady-\n" - .string "looking guy went around the corner.$" - -RustboroCity_Text_1E130D: @ 81E130D - .string "Have you taken the POKéMON GYM\n" - .string "challenge?\p" - .string "When you get that shiny GYM BADGE\n" - .string "in hand, I guess TRAINERS begin to\l" - .string "realize what is required of them.$" - -RustboroCity_Text_1E139E: @ 81E139E - .string "Hey, that’s RUSTBORO’s GYM BADGE!\p" - .string "Out of all the POKéMON GYM BADGES,\n" - .string "RUSTBORO’s is the coolest, I’d say.$" - -RustboroCity_Text_1E1407: @ 81E1407 - .string "Oh? Who might you be?\n" - .string "You’re a new face around these parts.\p" - .string "Have you just transferred into the\n" - .string "POKéMON TRAINER’S SCHOOL?$" - -RustboroCity_Text_1E1480: @ 81E1480 - .string "I challenged the GYM LEADER, but…\p" - .string "It’s not going to be easy winning with\n" - .string "my FIRE-type POKéMON…\p" - .string "FIRE-type POKéMON don’t match up\n" - .string "well against ROCK-type POKéMON…$" - -RustboroCity_Text_1E1520: @ 81E1520 - .string "The old sailor MR. BRINEY lives in\n" - .string "a cottage by the sea.\p" - .string "He goes for walks in the tunnel every\n" - .string "so often.$" - -RustboroCity_Text_1E1589: @ 81E1589 - .string "The old sailor MR. BRINEY lives in\n" - .string "a cottage by the sea.\p" - .string "He said he was going shopping in\n" - .string "SLATEPORT for his pet, PEEKO.\p" - .string "That old sea dog, he must really love\n" - .string "that PEEKO.$" - -RustboroCity_Text_1E1633: @ 81E1633 - .string "Wow, you have POKéMON with you, too.\p" - .string "When I get bigger, I’m going to go\n" - .string "places with POKéMON, too.$" - -RustboroCity_Text_1E1695: @ 81E1695 - .string "POKéMON TRAINER’S SCHOOL!\p" - .string "If I go to this school, will I be able\n" - .string "to catch rare POKéMON easily?$" - -RustboroCity_Text_1E16F4: @ 81E16F4 - .string "If a POKéMON gains experience in\n" - .string "battles, it can sometimes change in\l" - .string "the way it looks.$" - -RustboroCity_Text_1E174B: @ 81E174B - .string "A POKéMON changes shape?\n" - .string "If one did that, I would be shocked!$" - -RustboroCity_Text_1E1789: @ 81E1789 - .string "A POKéMON you get in a trade from\n" - .string "someone grows fast.\p" - .string "But if you don’t have certain GYM\n" - .string "BADGES, it may not obey you…$" - -RustboroCity_Text_1E17FE: @ 81E17FE - .string "Get out!\n" - .string "Out of the way!$" - -RustboroCity_Text_1E1817: @ 81E1817 - .string "Wait! Pleeeaaase!\p" - .string "Don’t take my GOODS!$" - -RustboroCity_Text_1E183E: @ 81E183E - .string "Oh, it’s you!\p" - .string "You’re that fantastic TRAINER who\n" - .string "helped me in PETALBURG WOODS!\p" - .string "Help me! I was robbed by TEAM AQUA!\n" - .string "I have to get the DEVON GOODS back!\p" - .string "If I don’t…\n" - .string "I’m going to be in serious trouble.$" - -RustboroCity_Text_1E1904: @ 81E1904 - .string "That shady character, I think he took\n" - .string "off towards the tunnel over there.$" - -RustboroCity_Text_1E194D: @ 81E194D - .string "Oh! How did it go?\n" - .string "The DEVON GOODS?\p" - .string "You did!\n" - .string "You got them back!\p" - .string "You really are a great TRAINER!\p" - .string "I know! As my thanks, I’ll give you\n" - .string "another GREAT BALL!$" - -RustboroCity_Text_1E19E5: @ 81E19E5 - .string "You’re loaded with items.\n" - .string "I can’t give you this GREAT BALL.$" - -RustboroCity_Text_1E1A21: @ 81E1A21 - .string "Excuse me, please!\n" - .string "Please come with me!$" - -RustboroCity_Text_1E1A49: @ 81E1A49 - .string "MAY: Oh, hi, {PLAYER}{KUN}!\p" - .string "You had a MATCH CALL feature put\n" - .string "on your POKéNAV!\p" - .string "Let’s register each other so we can\n" - .string "contact one another anytime!\p" - .string "… … … … … …$" - -RustboroCity_Text_1E1ADB: @ 81E1ADB - .string "Registered MAY\n" - .string "in the POKéNAV.$" - -RustboroCity_Text_1E1AFA: @ 81E1AFA - .string "MAY: Oh, by the way, I passed\n" - .string "MR. BRINEY in PETALBURG WOODS.\p" - .string "I guess he’s on his way home to his\n" - .string "cottage by the sea.\p" - .string "How’s your POKéDEX coming along,\n" - .string "{PLAYER}{KUN}? Mine’s looking pretty decent!\p" - .string "So…\n" - .string "How about a little battle?$" - -RustboroCity_Text_1E1BD3: @ 81E1BD3 - .string "MAY: Oh, what’s the matter?\p" - .string "Haven’t you caught or raised your\n" - .string "POKéMON very much?\p" - .string "That’s not very good for a TRAINER!$" - -RustboroCity_Text_1E1C48: @ 81E1C48 - .string "MAY: So, what do you think?\n" - .string "How about a little battle here?$" - -RustboroCity_Text_1E1C84: @ 81E1C84 - .string "MAY: You just became a TRAINER,\n" - .string "{PLAYER}{KUN}. I’m not going to lose!$" - -RustboroCity_Text_1E1CC1: @ 81E1CC1 - .string "Yikes!\n" - .string "You’re better than I expected!$" - -RustboroCity_Text_1E1CE7: @ 81E1CE7 - .string "MAY: Oh, by the way, MR. BRINEY, who\n" - .string "I just passed…\p" - .string "{PLAYER}{KUN}, you just moved here so you\n" - .string "might not know this, but MR. BRINEY\l" - .string "was once a revered seafarer.$" - -RustboroCity_Text_1E1D7D: @ 81E1D7D - .string "BRENDAN: Oh, hey, {PLAYER}!\p" - .string "You had a MATCH CALL feature put\n" - .string "on your POKéNAV! Cool!\p" - .string "Let’s register each other so we can\n" - .string "get in touch anytime!\p" - .string "… … … … … …$" - -RustboroCity_Text_1E1E11: @ 81E1E11 - .string "Registered BRENDAN\n" - .string "in the POKéNAV.$" - -RustboroCity_Text_1E1E34: @ 81E1E34 - .string "BRENDAN: By the way, {PLAYER}, I walked\n" - .string "by MR. BRINEY in PETALBURG WOODS.\p" - .string "I bet he was on his way home to his\n" - .string "cottage by the sea.\p" - .string "{PLAYER}, how’s your POKéDEX?\n" - .string "Have you filled in any pages yet?\p" - .string "Mine rules.\p" - .string "Want to have a battle to test how\n" - .string "far you’ve progressed?$" - -RustboroCity_Text_1E1F2F: @ 81E1F2F - .string "BRENDAN: What’s the matter? Don’t have\n" - .string "any confidence in your POKéMON?$" - -RustboroCity_Text_1E1F76: @ 81E1F76 - .string "BRENDAN: What’s up?\n" - .string "Want to have a battle with me?$" - -RustboroCity_Text_1E1FA9: @ 81E1FA9 - .string "BRENDAN: I know you just became\n" - .string "a TRAINER, but I won’t go easy!$" - -RustboroCity_Text_1E1FE9: @ 81E1FE9 - .string "Hmm…\n" - .string "You’re pretty good.$" - -RustboroCity_Text_1E2002: @ 81E2002 - .string "BRENDAN: By the way, you know\n" - .string "MR. BRINEY? The guy I just passed?\p" - .string "I bet you didn’t know this, since you\n" - .string "just moved here, {PLAYER}, but\l" - .string "MR. BRINEY was once a great sailor.$" - -RustboroCity_Text_1E20A6: @ 81E20A6 - .string "“Timesaving tunnel nearing\n" - .string "completion!â€\p" - .string "…Is what it says on the sign, but\n" - .string "there’s also a big “X†splashed\l" - .string "across it in red paint…$" - -RustboroCity_Text_1E2128: @ 81E2128 - .string "DEVON CORPORATION\p" - .string "“For all your living needs, we make\n" - .string "it all.â€$" - -RustboroCity_Text_1E2167: @ 81E2167 - .string "RUSTBORO CITY POKéMON GYM\n" - .string "LEADER: ROXANNE\p" - .string "“The ROCK-loving honors student!â€$" - -RustboroCity_Text_1E21B3: @ 81E21B3 - .string "DEVON CORP. BRANCH OFFICE\p" - .string "“Access limited to DEVON employees\n" - .string "and authorized personnel.â€$" - -RustboroCity_Text_1E220B: @ 81E220B - .string "RUSTBORO CITY\p" - .string "“The city probing the integration of\n" - .string "nature and science.â€$" - -RustboroCity_Text_1E2253: @ 81E2253 - .string "POKéMON TRAINER’S SCHOOL\p" - .string "“We’ll teach you anything about\n" - .string "POKéMON!â€$" - -RustboroCity_Text_1E2296: @ 81E2296 - .string "CUTTER’S HOUSE$" - -RustboroCity_Text_1E22A5: @ 81E22A5 - .string "I’ve been developing an added feature\n" - .string "for the POKéNAV…\p" - .string "And it turned out great!\p" - .string "{PLAYER}, may I see that POKéNAV?\n" - .string "The one our PRESIDENT gave you?$" - -RustboroCity_Text_1E2331: @ 81E2331 - .string "There you go, {PLAYER}!\p" - .string "I added a new feature named\n" - .string "MATCH CALL to your POKéNAV.\p" - .string "Using the MATCH CALL feature,\n" - .string "you can chat with people who have\l" - .string "been registered in your POKéNAV.\p" - .string "{PLAYER}, our PRESIDENT STONE should\n" - .string "be registered in your POKéNAV.\p" - .string "Test it out.\n" - .string "Please give our PRESIDENT a call.$" - -RustboroCity_Text_1E2449: @ 81E2449 - .string "Please select the POKéNAV.$" - -RustboroCity_Text_1E2464: @ 81E2464 - .string "Okay, I’d better get back to work.\n" - .string "Please take care, {PLAYER}!$" - -RustboroCity_Text_1E249D: @ 81E249D - .string "Did you know this?\p" - .string "You can have a 2-on-2 battle even\n" - .string "if you’re not with another TRAINER.\p" - .string "If you catch the eyes of two TRAINERS\n" - .string "when you have two or more POKéMON,\l" - .string "they’ll both challenge you.\p" - .string "Don’t you think it’d be cool if you\n" - .string "could beat two TRAINERS by yourself?$" - diff --git a/data/scripts/maps/RustboroCity_CuttersHouse.inc b/data/scripts/maps/RustboroCity_CuttersHouse.inc deleted file mode 100644 index e5c7527f7..000000000 --- a/data/scripts/maps/RustboroCity_CuttersHouse.inc +++ /dev/null @@ -1,53 +0,0 @@ -RustboroCity_CuttersHouse_MapScripts:: @ 8215BD3 - .byte 0 - -RustboroCity_CuttersHouse_EventScript_215BD4:: @ 8215BD4 - lock - faceplayer - checkflag FLAG_0x089 - goto_eq RustboroCity_CuttersHouse_EventScript_215C00 - msgbox RustboroCity_CuttersHouse_Text_215C13, 4 - giveitem_std ITEM_HM01 - setflag FLAG_0x089 - msgbox RustboroCity_CuttersHouse_Text_215D33, 4 - release - end - -RustboroCity_CuttersHouse_EventScript_215C00:: @ 8215C00 - msgbox RustboroCity_CuttersHouse_Text_215D33, 4 - release - end - -RustboroCity_CuttersHouse_EventScript_215C0A:: @ 8215C0A - msgbox RustboroCity_CuttersHouse_Text_215E39, 2 - end - -RustboroCity_CuttersHouse_Text_215C13: @ 8215C13 - .string "That determined expression…\n" - .string "That limber way you move…\l" - .string "And your well-trained POKéMON…\p" - .string "You’re obviously a skilled TRAINER!\p" - .string "No, wait, don’t say a word.\n" - .string "I can tell just by looking at you.\p" - .string "I’m sure that you can put this\n" - .string "HIDDEN MACHINE to good use.\p" - .string "No need to be modest or shy.\n" - .string "Go on, take it!$" - -RustboroCity_CuttersHouse_Text_215D33: @ 8215D33 - .string "That HIDDEN MACHINE, or HM for\n" - .string "short, is CUT.\p" - .string "An HM move is one that can be used\n" - .string "by POKéMON outside of battle.\p" - .string "Any POKéMON that’s learned CUT can\n" - .string "chop down thin trees if the TRAINER\l" - .string "has earned the STONE BADGE.\p" - .string "And, unlike a TM, an HM can be used\n" - .string "more than once.$" - -RustboroCity_CuttersHouse_Text_215E39: @ 8215E39 - .string "When they were expanding the city of\n" - .string "RUSTBORO, my dad helped out.\p" - .string "He made his POKéMON use CUT to clear\n" - .string "the land of trees.$" - diff --git a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc deleted file mode 100644 index 97d7dcf78..000000000 --- a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc +++ /dev/null @@ -1,153 +0,0 @@ -RustboroCity_DevonCorp_1F_MapScripts:: @ 8211245 - map_script 3, RustboroCity_DevonCorp_1F_MapScript1_21124B - .byte 0 - -RustboroCity_DevonCorp_1F_MapScript1_21124B: @ 821124B - checkflag FLAG_0x090 - call_if 0, RustboroCity_DevonCorp_1F_EventScript_211255 - end - -RustboroCity_DevonCorp_1F_EventScript_211255:: @ 8211255 - setobjectxyperm 2, 14, 2 - setobjectmovementtype 2, 8 - return - -RustboroCity_DevonCorp_1F_EventScript_211261:: @ 8211261 - lock - faceplayer - checkflag FLAG_0x090 - goto_eq RustboroCity_DevonCorp_1F_EventScript_211289 - checkflag FLAG_0x08E - goto_eq RustboroCity_DevonCorp_1F_EventScript_21127F - msgbox RustboroCity_DevonCorp_1F_Text_2113D1, 4 - release - end - -RustboroCity_DevonCorp_1F_EventScript_21127F:: @ 821127F - msgbox RustboroCity_DevonCorp_1F_Text_211446, 4 - release - end - -RustboroCity_DevonCorp_1F_EventScript_211289:: @ 8211289 - msgbox RustboroCity_DevonCorp_1F_Text_2114DE, 4 - release - end - -RustboroCity_DevonCorp_1F_EventScript_211293:: @ 8211293 - lock - faceplayer - checkflag FLAG_0x090 - goto_eq RustboroCity_DevonCorp_1F_EventScript_2112BA - checkflag FLAG_0x08F - goto_eq RustboroCity_DevonCorp_1F_EventScript_2112C4 - checkflag FLAG_0x08E - goto_eq RustboroCity_DevonCorp_1F_EventScript_2112C4 - msgbox RustboroCity_DevonCorp_1F_Text_21151B, 4 - release - end - -RustboroCity_DevonCorp_1F_EventScript_2112BA:: @ 82112BA - msgbox RustboroCity_DevonCorp_1F_Text_211585, 4 - release - end - -RustboroCity_DevonCorp_1F_EventScript_2112C4:: @ 82112C4 - msgbox RustboroCity_DevonCorp_1F_Text_211558, 4 - release - end - -RustboroCity_DevonCorp_1F_EventScript_2112CE:: @ 82112CE - lock - faceplayer - checkflag FLAG_0x090 - goto_eq RustboroCity_DevonCorp_1F_EventScript_2112F5 - checkflag FLAG_0x08F - goto_eq RustboroCity_DevonCorp_1F_EventScript_2112FF - checkflag FLAG_0x08E - goto_eq RustboroCity_DevonCorp_1F_EventScript_2112FF - msgbox RustboroCity_DevonCorp_1F_Text_21131B, 4 - release - end - -RustboroCity_DevonCorp_1F_EventScript_2112F5:: @ 82112F5 - msgbox RustboroCity_DevonCorp_1F_Text_21131B, 4 - release - end - -RustboroCity_DevonCorp_1F_EventScript_2112FF:: @ 82112FF - msgbox RustboroCity_DevonCorp_1F_Text_21138B, 4 - release - end - -RustboroCity_DevonCorp_1F_EventScript_211309:: @ 8211309 - msgbox RustboroCity_DevonCorp_1F_Text_2115AC, 3 - end - -RustboroCity_DevonCorp_1F_EventScript_211312:: @ 8211312 - msgbox RustboroCity_DevonCorp_1F_Text_211722, 3 - end - -RustboroCity_DevonCorp_1F_Text_21131B: @ 821131B - .string "Hello and welcome to the DEVON\n" - .string "CORPORATION.\p" - .string "We’re proud producers of items and\n" - .string "medicine that enhance your life.$" - -RustboroCity_DevonCorp_1F_Text_21138B: @ 821138B - .string "One of our research staff stupidly\n" - .string "got robbed of an important parcel.$" - -RustboroCity_DevonCorp_1F_Text_2113D1: @ 82113D1 - .string "Hey, those RUNNING SHOES!\n" - .string "They’re one of our products!\p" - .string "It makes me happy when I see someone\n" - .string "using something we made.$" - -RustboroCity_DevonCorp_1F_Text_211446: @ 8211446 - .string "That stolen parcel…\p" - .string "Well, sure it’s important, but it’s not\n" - .string "anything that anyone can use.\p" - .string "In my estimation, that robber must not\n" - .string "have been very bright.$" - -RustboroCity_DevonCorp_1F_Text_2114DE: @ 82114DE - .string "It sounds like they’ve recovered\n" - .string "the ripped-off DEVON GOODS.$" - -RustboroCity_DevonCorp_1F_Text_21151B: @ 821151B - .string "I’m sorry, only authorized people\n" - .string "are allowed to enter here.$" - -RustboroCity_DevonCorp_1F_Text_211558: @ 8211558 - .string "It’s beyond stupid.\n" - .string "How could we get robbed?$" - -RustboroCity_DevonCorp_1F_Text_211585: @ 8211585 - .string "Hi, there!\n" - .string "You’re always welcome here!$" - -RustboroCity_DevonCorp_1F_Text_2115AC: @ 82115AC - .string "Samples of rocks and metal are\n" - .string "displayed in the glass case.\p" - .string "There’s a panel with some writing\n" - .string "on it…\p" - .string "“DEVON CORPORATION got its start as\n" - .string "a producer of stones from quarries.\p" - .string "“The company also produced iron from\n" - .string "filings in the sand.\p" - .string "“From that humble start as a producer\n" - .string "of raw materials, DEVON developed.\p" - .string "“DEVON is now a manufacturer of a wide\n" - .string "range of industrial products.â€$" - -RustboroCity_DevonCorp_1F_Text_211722: @ 8211722 - .string "Prototypes and test products fill\n" - .string "the glass display case.\p" - .string "There’s a panel with a description…\p" - .string "“In addition to industrial products,\n" - .string "DEVON now markets sundries and\l" - .string "pharmaceuticals for better lifestyles.\p" - .string "“Recently, DEVON has begun marketing\n" - .string "tools for POKéMON TRAINERS, including\l" - .string "POKé BALLS and POKéNAV systems.â€$" - diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc deleted file mode 100644 index 88f0c2e73..000000000 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ /dev/null @@ -1,407 +0,0 @@ -RustboroCity_DevonCorp_2F_MapScripts:: @ 8211857 - map_script 3, RustboroCity_DevonCorp_2F_MapScript1_21185D - .byte 0 - -RustboroCity_DevonCorp_2F_MapScript1_21185D: @ 821185D - compare VAR_0x40C4, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 - end - -RustboroCity_DevonCorp_2F_EventScript_211869:: @ 8211869 - setvar VAR_0x40C4, 2 - return - -RustboroCity_DevonCorp_2F_EventScript_21186F:: @ 821186F - lock - faceplayer - compare VAR_0x40C4, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 - msgbox RustboroCity_DevonCorp_2F_Text_211BFB, 4 - release - end - -RustboroCity_DevonCorp_2F_EventScript_211886:: @ 8211886 - lock - faceplayer - compare VAR_0x40C4, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 - checkflag FLAG_0x11F - goto_eq RustboroCity_DevonCorp_2F_EventScript_2118A6 - msgbox RustboroCity_DevonCorp_2F_Text_211C50, 4 - release - end - -RustboroCity_DevonCorp_2F_EventScript_2118A6:: @ 82118A6 - msgbox RustboroCity_DevonCorp_2F_Text_211C99, 4 - release - end - -RustboroCity_DevonCorp_2F_EventScript_2118B0:: @ 82118B0 - lock - faceplayer - compare VAR_0x40C4, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 - checkflag FLAG_0x0BC - goto_eq RustboroCity_DevonCorp_2F_EventScript_2118D0 - msgbox RustboroCity_DevonCorp_2F_Text_211D9F, 4 - release - end - -RustboroCity_DevonCorp_2F_EventScript_2118D0:: @ 82118D0 - msgbox RustboroCity_DevonCorp_2F_Text_211DF3, 4 - release - end - -RustboroCity_DevonCorp_2F_EventScript_2118DA:: @ 82118DA - lock - faceplayer - compare VAR_0x40C4, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 - msgbox RustboroCity_DevonCorp_2F_Text_211EE0, 4 - release - end - -RustboroCity_DevonCorp_2F_EventScript_2118F1:: @ 82118F1 - lock - faceplayer - compare VAR_0x40C4, 2 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211A03 - compare VAR_0x40C4, 1 - goto_eq RustboroCity_DevonCorp_2F_EventScript_2119F9 - msgbox RustboroCity_DevonCorp_2F_Text_211F48, 4 - checkitem ITEM_ROOT_FOSSIL, 1 - compare VAR_RESULT, 1 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211933 - checkitem ITEM_CLAW_FOSSIL, 1 - compare VAR_RESULT, 1 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211991 - release - end - -RustboroCity_DevonCorp_2F_EventScript_211933:: @ 8211933 - closemessage - playse SE_PIN - applymovement 5, RustboroCity_DevonCorp_2F_Movement_272598 - waitmovement 0 - applymovement 5, RustboroCity_DevonCorp_2F_Movement_27259A - waitmovement 0 - msgbox RustboroCity_DevonCorp_2F_Text_211FA6, 5 - compare VAR_RESULT, 0 - goto_eq RustboroCity_DevonCorp_2F_EventScript_2119EF - checkitem ITEM_CLAW_FOSSIL, 1 - compare VAR_RESULT, 1 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211B84 - goto RustboroCity_DevonCorp_2F_EventScript_211974 - end - -RustboroCity_DevonCorp_2F_EventScript_211974:: @ 8211974 - bufferitemname 0, ITEM_ROOT_FOSSIL - msgbox RustboroCity_DevonCorp_2F_Text_212153, 4 - takeitem ITEM_ROOT_FOSSIL, 1 - setvar VAR_0x40C4, 1 - setvar VAR_0x40C5, 1 - release - end - -RustboroCity_DevonCorp_2F_EventScript_211991:: @ 8211991 - closemessage - playse SE_PIN - applymovement 5, RustboroCity_DevonCorp_2F_Movement_272598 - waitmovement 0 - applymovement 5, RustboroCity_DevonCorp_2F_Movement_27259A - waitmovement 0 - msgbox RustboroCity_DevonCorp_2F_Text_211FA6, 5 - compare VAR_RESULT, 0 - goto_eq RustboroCity_DevonCorp_2F_EventScript_2119EF - checkitem ITEM_ROOT_FOSSIL, 1 - compare VAR_RESULT, 1 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211B84 - goto RustboroCity_DevonCorp_2F_EventScript_2119D2 - end - -RustboroCity_DevonCorp_2F_EventScript_2119D2:: @ 82119D2 - bufferitemname 0, ITEM_CLAW_FOSSIL - msgbox RustboroCity_DevonCorp_2F_Text_212153, 4 - takeitem ITEM_CLAW_FOSSIL, 1 - setvar VAR_0x40C4, 1 - setvar VAR_0x40C5, 2 - release - end - -RustboroCity_DevonCorp_2F_EventScript_2119EF:: @ 82119EF - msgbox RustboroCity_DevonCorp_2F_Text_212046, 4 - release - end - -RustboroCity_DevonCorp_2F_EventScript_2119F9:: @ 82119F9 - msgbox RustboroCity_DevonCorp_2F_Text_2121A2, 4 - release - end - -RustboroCity_DevonCorp_2F_EventScript_211A03:: @ 8211A03 - compare VAR_0x40C5, 1 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211A1A - compare VAR_0x40C5, 2 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211A2C - end - -RustboroCity_DevonCorp_2F_EventScript_211A1A:: @ 8211A1A - bufferspeciesname 1, SPECIES_LILEEP - msgbox RustboroCity_DevonCorp_2F_Text_212251, 4 - goto RustboroCity_DevonCorp_2F_EventScript_211A3E - end - -RustboroCity_DevonCorp_2F_EventScript_211A2C:: @ 8211A2C - bufferspeciesname 1, SPECIES_ANORITH - msgbox RustboroCity_DevonCorp_2F_Text_212251, 4 - goto RustboroCity_DevonCorp_2F_EventScript_211AE1 - end - -RustboroCity_DevonCorp_2F_EventScript_211A3E:: @ 8211A3E - setvar VAR_TEMP_1, 388 - givemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 - compare VAR_RESULT, 0 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211A6E - compare VAR_RESULT, 1 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211A96 - goto RustboroCity_DevonCorp_2F_EventScript_273811 - end - -RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E - call RustboroCity_DevonCorp_2F_EventScript_211AC4 - msgbox gUnknown_08273374, 5 - compare VAR_RESULT, 0 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211AD7 - call RustboroCity_DevonCorp_2F_EventScript_27378B - call RustboroCity_DevonCorp_2F_EventScript_2723DD - goto RustboroCity_DevonCorp_2F_EventScript_211AD7 - end - -RustboroCity_DevonCorp_2F_EventScript_211A96:: @ 8211A96 - call RustboroCity_DevonCorp_2F_EventScript_211AC4 - msgbox gUnknown_08273374, 5 - compare VAR_RESULT, 0 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211AB9 - call RustboroCity_DevonCorp_2F_EventScript_273797 - goto RustboroCity_DevonCorp_2F_EventScript_211AB9 - end - -RustboroCity_DevonCorp_2F_EventScript_211AB9:: @ 8211AB9 - call RustboroCity_DevonCorp_2F_EventScript_2737A0 - goto RustboroCity_DevonCorp_2F_EventScript_211AD7 - end - -RustboroCity_DevonCorp_2F_EventScript_211AC4:: @ 8211AC4 - bufferspeciesname 1, SPECIES_LILEEP - playfanfare MUS_FANFA4 - message RustboroCity_DevonCorp_2F_Text_2122CB - waitmessage - waitfanfare - bufferspeciesname 0, SPECIES_LILEEP - return - -RustboroCity_DevonCorp_2F_EventScript_211AD7:: @ 8211AD7 - setvar VAR_0x40C4, 0 - setflag FLAG_0x10B - release - end - -RustboroCity_DevonCorp_2F_EventScript_211AE1:: @ 8211AE1 - setvar VAR_TEMP_1, 390 - givemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 - compare VAR_RESULT, 0 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211B11 - compare VAR_RESULT, 1 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211B39 - goto RustboroCity_DevonCorp_2F_EventScript_273811 - end - -RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11 - call RustboroCity_DevonCorp_2F_EventScript_211B67 - msgbox gUnknown_08273374, 5 - compare VAR_RESULT, 0 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211B7A - call RustboroCity_DevonCorp_2F_EventScript_27378B - call RustboroCity_DevonCorp_2F_EventScript_2723DD - goto RustboroCity_DevonCorp_2F_EventScript_211B7A - end - -RustboroCity_DevonCorp_2F_EventScript_211B39:: @ 8211B39 - call RustboroCity_DevonCorp_2F_EventScript_211B67 - msgbox gUnknown_08273374, 5 - compare VAR_RESULT, 0 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211B5C - call RustboroCity_DevonCorp_2F_EventScript_273797 - goto RustboroCity_DevonCorp_2F_EventScript_211B5C - end - -RustboroCity_DevonCorp_2F_EventScript_211B5C:: @ 8211B5C - call RustboroCity_DevonCorp_2F_EventScript_2737A0 - goto RustboroCity_DevonCorp_2F_EventScript_211B7A - end - -RustboroCity_DevonCorp_2F_EventScript_211B67:: @ 8211B67 - bufferspeciesname 1, SPECIES_ANORITH - playfanfare MUS_FANFA4 - message RustboroCity_DevonCorp_2F_Text_2122CB - waitmessage - waitfanfare - bufferspeciesname 0, SPECIES_ANORITH - return - -RustboroCity_DevonCorp_2F_EventScript_211B7A:: @ 8211B7A - setvar VAR_0x40C4, 0 - setflag FLAG_0x10B - release - end - -RustboroCity_DevonCorp_2F_EventScript_211B84:: @ 8211B84 - message RustboroCity_DevonCorp_2F_Text_212092 - waitmessage - multichoice 17, 6, 93, 0 - switch VAR_RESULT - case 0, RustboroCity_DevonCorp_2F_EventScript_211BC1 - case 1, RustboroCity_DevonCorp_2F_EventScript_211BC7 - case 2, RustboroCity_DevonCorp_2F_EventScript_211BCD - case 127, RustboroCity_DevonCorp_2F_EventScript_211BCD - end - -RustboroCity_DevonCorp_2F_EventScript_211BC1:: @ 8211BC1 - goto RustboroCity_DevonCorp_2F_EventScript_2119D2 - end - -RustboroCity_DevonCorp_2F_EventScript_211BC7:: @ 8211BC7 - goto RustboroCity_DevonCorp_2F_EventScript_211974 - end - -RustboroCity_DevonCorp_2F_EventScript_211BCD:: @ 8211BCD - release - end - -RustboroCity_DevonCorp_2F_EventScript_211BCF:: @ 8211BCF - lock - faceplayer - compare VAR_0x40C4, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 - compare VAR_0x405A, 6 - goto_if 4, RustboroCity_DevonCorp_2F_EventScript_211BF1 - msgbox RustboroCity_DevonCorp_2F_Text_212338, 4 - release - end - -RustboroCity_DevonCorp_2F_EventScript_211BF1:: @ 8211BF1 - msgbox RustboroCity_DevonCorp_2F_Text_212386, 4 - release - end - -RustboroCity_DevonCorp_2F_Text_211BFB: @ 8211BFB - .string "We’re developing a device for talking\n" - .string "with POKéMON.\p" - .string "But we haven’t had much success…$" - -RustboroCity_DevonCorp_2F_Text_211C50: @ 8211C50 - .string "I’m developing new kinds of\n" - .string "POKé BALLS…\p" - .string "But I haven’t made much headway…$" - -RustboroCity_DevonCorp_2F_Text_211C99: @ 8211C99 - .string "We finally made new kinds of\n" - .string "POKé BALLS!\p" - .string "The REPEAT BALL makes it easier to\n" - .string "catch POKéMON you’ve caught before.\p" - .string "The TIMER BALL gets better at catching\n" - .string "POKéMON the longer a battle runs.\p" - .string "Both are proudly developed by\n" - .string "the DEVON CORPORATION.\p" - .string "Please give them a try!$" - -RustboroCity_DevonCorp_2F_Text_211D9F: @ 8211D9F - .string "I made the POKéNAV!\p" - .string "As an engineer, I feel blessed to have\n" - .string "made something so great!$" - -RustboroCity_DevonCorp_2F_Text_211DF3: @ 8211DF3 - .string "Oh, wow!\n" - .string "That’s a POKéNAV!\p" - .string "It came about as a result of our\n" - .string "PRESIDENT’s desire to learn about\l" - .string "the feelings of POKéMON.\p" - .string "Would you like me to describe its\n" - .string "features in detail?\p" - .string "No, no. I think you’ll find out just by\n" - .string "trying the POKéNAV out.$" - -RustboroCity_DevonCorp_2F_Text_211EE0: @ 8211EE0 - .string "I’m trying to develop a device that\n" - .string "visually reproduces the dreams of\l" - .string "POKéMON…\p" - .string "But it’s not going well.$" - -RustboroCity_DevonCorp_2F_Text_211F48: @ 8211F48 - .string "I’ve been trying to develop a device\n" - .string "that resurrects POKéMON from fossils…\p" - .string "And, it’s working!$" - -RustboroCity_DevonCorp_2F_Text_211FA6: @ 8211FA6 - .string "Wait! That thing you have there…\n" - .string "Is that a POKéMON fossil?\p" - .string "Would you like to bring that POKéMON\n" - .string "back to life?\p" - .string "I can with my newly developed\n" - .string "FOSSIL REGENERATOR.$" - -RustboroCity_DevonCorp_2F_Text_212046: @ 8212046 - .string "Oh, is that so?\p" - .string "DEVON’s technological expertise\n" - .string "is outstanding, I tell you.$" - -RustboroCity_DevonCorp_2F_Text_212092: @ 8212092 - .string "Oh, now that’s a surprise!\n" - .string "You have not one, but two, fossils?\p" - .string "Unfortunately, my machine can only\n" - .string "regenerate one POKéMON at a time.\p" - .string "Would you like to pick one of your\n" - .string "fossils for regeneration?$" - -RustboroCity_DevonCorp_2F_Text_212153: @ 8212153 - .string "Excellent!\n" - .string "Let’s do this right away.\p" - .string "{PLAYER} handed the {STR_VAR_1} to\n" - .string "the DEVON RESEARCHER.$" - -RustboroCity_DevonCorp_2F_Text_2121A2: @ 82121A2 - .string "The FOSSIL REGENERATOR, which I made,\n" - .string "is incredible.\p" - .string "But it has one drawback--it takes\n" - .string "a long time to work.\p" - .string "So, uh… How about you go for a stroll\n" - .string "and look around for a while?$" - -RustboroCity_DevonCorp_2F_Text_212251: @ 8212251 - .string "Thanks for waiting!\p" - .string "Your fossilized POKéMON has been\n" - .string "brought back to life!\p" - .string "The fossil was an ancient POKéMON.\n" - .string "{STR_VAR_2}, it was!$" - -RustboroCity_DevonCorp_2F_Text_2122CB: @ 82122CB - .string "{PLAYER} received {STR_VAR_2} from\n" - .string "the DEVON RESEARCHER.$" - -RustboroCity_DevonCorp_2F_Text_2122F5: @ 82122F5 - .string "Uh-oh, you’ve got too many POKéMON.\n" - .string "You have no room for this one.$" - -RustboroCity_DevonCorp_2F_Text_212338: @ 8212338 - .string "I’m trying to develop a new feature\n" - .string "for the POKéNAV…\p" - .string "But it’s not going well.$" - -RustboroCity_DevonCorp_2F_Text_212386: @ 8212386 - .string "Well, now what shall I work on\n" - .string "developing next?\p" - .string "Our company allows us to make our\n" - .string "inspirations into reality.\p" - .string "One couldn’t ask for a better\n" - .string "environment as an engineer.$" - diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc deleted file mode 100644 index ffc2614cb..000000000 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ /dev/null @@ -1,311 +0,0 @@ -RustboroCity_DevonCorp_3F_MapScripts:: @ 821242D - map_script 3, RustboroCity_DevonCorp_3F_MapScript1_21243D - map_script 4, RustboroCity_DevonCorp_3F_MapScript2_212455 - map_script 2, RustboroCity_DevonCorp_3F_MapScript2_212464 - .byte 0 - -RustboroCity_DevonCorp_3F_MapScript1_21243D: @ 821243D - compare VAR_0x408F, 0 - call_if 1, RustboroCity_DevonCorp_3F_EventScript_212449 - end - -RustboroCity_DevonCorp_3F_EventScript_212449:: @ 8212449 - setobjectxyperm 2, 3, 2 - setobjectmovementtype 2, 9 - return - -RustboroCity_DevonCorp_3F_MapScript2_212455: @ 8212455 - map_script_2 VAR_0x408F, 0, RustboroCity_DevonCorp_3F_EventScript_21245F - .2byte 0 - -RustboroCity_DevonCorp_3F_EventScript_21245F:: @ 821245F - turnobject 255, 4 - end - -RustboroCity_DevonCorp_3F_MapScript2_212464: @ 8212464 - map_script_2 VAR_0x408F, 0, RustboroCity_DevonCorp_3F_EventScript_21246E - .2byte 0 - -RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E - lockall - msgbox RustboroCity_DevonCorp_3F_Text_212C37, 4 - closemessage - applymovement 2, RustboroCity_DevonCorp_3F_Movement_212546 - waitmovement 0 - delay 80 - applymovement 2, RustboroCity_DevonCorp_3F_Movement_21254F - waitmovement 0 - msgbox RustboroCity_DevonCorp_3F_Text_212DE8, 4 - closemessage - playbgm MUS_TSURETEK, 0 - applymovement 2, RustboroCity_DevonCorp_3F_Movement_212534 - applymovement 255, RustboroCity_DevonCorp_3F_Movement_212558 - waitmovement 0 - msgbox RustboroCity_DevonCorp_3F_Text_212E2F, 4 - closemessage - fadedefaultbgm - applymovement 2, RustboroCity_DevonCorp_3F_Movement_212543 - applymovement 255, RustboroCity_DevonCorp_3F_Movement_212566 - waitmovement 0 - msgbox RustboroCity_DevonCorp_3F_Text_212609, 4 - giveitem_std ITEM_LETTER - msgbox RustboroCity_DevonCorp_3F_Text_21277C, 4 - playfanfare MUS_FANFA4 - message RustboroCity_DevonCorp_3F_Text_212820 - waitfanfare - setflag FLAG_SYS_POKENAV_GET - setflag FLAG_0x0BC - setflag FLAG_0x3E7 - msgbox RustboroCity_DevonCorp_3F_Text_212837, 4 - closemessage - call RustboroCity_DevonCorp_3F_EventScript_272083 - msgbox RustboroCity_DevonCorp_3F_Text_2129D2, 4 - setflag FLAG_0x37E - clearflag FLAG_0x327 - clearflag FLAG_0x3D7 - clearflag FLAG_0x2E3 - clearflag FLAG_0x371 - setvar VAR_0x4096, 1 - clearflag FLAG_0x32E - setvar VAR_0x408F, 1 - setvar VAR_0x405A, 6 - releaseall - end - -RustboroCity_DevonCorp_3F_Movement_21252F: @ 821252F - walk_up - walk_up - walk_up - walk_in_place_fastest_left - step_end - -RustboroCity_DevonCorp_3F_Movement_212534: @ 8212534 - 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 - delay_16 - walk_in_place_fastest_down - step_end - -RustboroCity_DevonCorp_3F_Movement_212546: @ 8212546 - walk_right - walk_right - walk_right - walk_down - walk_right - walk_right - walk_right - walk_right - step_end - -RustboroCity_DevonCorp_3F_Movement_21254F: @ 821254F - walk_left - walk_left - walk_left - walk_left - walk_up - walk_left - walk_left - walk_left - step_end - -RustboroCity_DevonCorp_3F_Movement_212558: @ 8212558 - 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 - delay_16 - delay_16 - walk_down - walk_down - walk_in_place_fastest_right - step_end - -RustboroCity_DevonCorp_3F_EventScript_21256C:: @ 821256C - lock - faceplayer - checkflag FLAG_0x110 - goto_eq RustboroCity_DevonCorp_3F_EventScript_2125CC - checkflag FLAG_0x0BD - goto_eq RustboroCity_DevonCorp_3F_EventScript_212595 - msgbox RustboroCity_DevonCorp_3F_Text_212A09, 4 - closemessage - applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 - waitmovement 0 - release - end - -RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595 - msgbox RustboroCity_DevonCorp_3F_Text_212A29, 4 - giveitem_std ITEM_EXP_SHARE - compare VAR_RESULT, 0 - goto_eq RustboroCity_DevonCorp_3F_EventScript_272054 - setflag FLAG_0x110 - msgbox RustboroCity_DevonCorp_3F_Text_212A9E, 4 - closemessage - applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 - waitmovement 0 - release - end - -RustboroCity_DevonCorp_3F_EventScript_2125CC:: @ 82125CC - msgbox RustboroCity_DevonCorp_3F_Text_212B78, 4 - closemessage - applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 - waitmovement 0 - release - end - -RustboroCity_DevonCorp_3F_EventScript_2125E1:: @ 82125E1 - lock - faceplayer - checkflag FLAG_0x100 - goto_eq RustboroCity_DevonCorp_3F_EventScript_2125F6 - msgbox RustboroCity_DevonCorp_3F_Text_212E41, 4 - release - end - -RustboroCity_DevonCorp_3F_EventScript_2125F6:: @ 82125F6 - msgbox RustboroCity_DevonCorp_3F_Text_212E88, 4 - release - end - -RustboroCity_DevonCorp_3F_EventScript_212600:: @ 8212600 - msgbox RustboroCity_DevonCorp_3F_Text_212EE9, 3 - end - -RustboroCity_DevonCorp_3F_Text_212609: @ 8212609 - .string "I’m MR. STONE, the PRESIDENT of\n" - .string "the DEVON CORPORATION.\p" - .string "I’d just got word about you!\p" - .string "You saved our staff not just once,\n" - .string "but twice!\p" - .string "I have a favor to ask of an amazing\n" - .string "person like you.\p" - .string "I understand that you’re delivering\n" - .string "a package to SLATEPORT’s SHIPYARD.\p" - .string "Well, on the way, could you stop off in\n" - .string "DEWFORD TOWN?\p" - .string "I was hoping that you’d deliver a\n" - .string "LETTER to STEVEN in DEWFORD.$" - -RustboroCity_DevonCorp_3F_Text_21277C: @ 821277C - .string "MR. STONE: Now, you should know that\n" - .string "I am a great PRESIDENT.\p" - .string "So, I’d never be so cheap as to ask\n" - .string "a favor for nothing in return.\p" - .string "That’s why I want you to have this!$" - -RustboroCity_DevonCorp_3F_Text_212820: @ 8212820 - .string "{PLAYER} received a POKéNAV.$" - -RustboroCity_DevonCorp_3F_Text_212837: @ 8212837 - .string "MR. STONE: That device…\p" - .string "It’s a POKéMON NAVIGATOR, or POKéNAV\n" - .string "for short.\p" - .string "It’s an indispensable tool for any\n" - .string "TRAINER on an adventure.\p" - .string "It has a map of the HOENN region.\p" - .string "You can check the locations of\n" - .string "DEWFORD and SLATEPORT easily!\p" - .string "By the way, I’ve heard that sinister\n" - .string "criminals--MAGMA and AQUA, I believe--\l" - .string "have been making trouble far and wide.\p" - .string "I think it would be best if you rested\n" - .string "up before you go on your way.$" - -RustboroCity_DevonCorp_3F_Text_2129D2: @ 82129D2 - .string "MR. STONE: Well, then, {PLAYER}{KUN},\n" - .string "go with caution and care!$" - -RustboroCity_DevonCorp_3F_Text_212A09: @ 8212A09 - .string "MR. STONE: I’m counting on you!$" - -RustboroCity_DevonCorp_3F_Text_212A29: @ 8212A29 - .string "MR. STONE: You delivered my LETTER?\n" - .string "Thank you kindly!\p" - .string "This is my way of thanking you.\n" - .string "It should help you, a TRAINER.$" - -RustboroCity_DevonCorp_3F_Text_212A9E: @ 8212A9E - .string "MR. STONE: A POKéMON holding that\n" - .string "EXP. SHARE will be given some of the\l" - .string "EXP Points from battle.\p" - .string "It will get EXP Points even if it didn’t\n" - .string "actually battle.\p" - .string "I would say EXP. SHARE is quite useful\n" - .string "for raising weak POKéMON.$" - -RustboroCity_DevonCorp_3F_Text_212B78: @ 8212B78 - .string "MR. STONE: Since my youth, I’ve immersed\n" - .string "myself in work.\p" - .string "Consequently, I’m not familiar with\n" - .string "trends and that sort of thing.\p" - .string "But do young people all want to be\n" - .string "TRAINERS in the POKéMON LEAGUE?$" - -RustboroCity_DevonCorp_3F_Text_212C37: @ 8212C37 - .string "This is the DEVON CORPORATION’s\n" - .string "third floor.\p" - .string "Our PRESIDENT’s OFFICE is on\n" - .string "this floor.\p" - .string "Anyway, I can’t tell you how much I’m\n" - .string "grateful for what you’ve done.\p" - .string "Um… By the way, that parcel\n" - .string "you got back for us…\p" - .string "Could I get you to deliver that to\n" - .string "the SHIPYARD in SLATEPORT?\p" - .string "It would be awful if those robbers\n" - .string "tried to take it again.\p" - .string "Uh… Hehehe, so, uh, could I count\n" - .string "on you to do that for me?\p" - .string "Oh, that’s right.\n" - .string "Could you wait here a second?$" - -RustboroCity_DevonCorp_3F_Text_212DE8: @ 8212DE8 - .string "Our PRESIDENT would like to have\n" - .string "a word with you.\p" - .string "Please come with me.$" - -RustboroCity_DevonCorp_3F_Text_212E2F: @ 8212E2F - .string "Please, go ahead.$" - -RustboroCity_DevonCorp_3F_Text_212E41: @ 8212E41 - .string "If you visit the SHIPYARD in SLATEPORT,\n" - .string "you should go see CAPT. STERN.$" - -RustboroCity_DevonCorp_3F_Text_212E88: @ 8212E88 - .string "DEVON’s new products, the REPEAT BALL\n" - .string "and TIMER BALL, have become hugely\l" - .string "popular among TRAINERS.$" - -RustboroCity_DevonCorp_3F_Text_212EE9: @ 8212EE9 - .string "It’s a collection of rare rocks and\n" - .string "stones assembled by the PRESIDENT.$" - diff --git a/data/scripts/maps/RustboroCity_Flat1_1F.inc b/data/scripts/maps/RustboroCity_Flat1_1F.inc deleted file mode 100644 index 947ea14d3..000000000 --- a/data/scripts/maps/RustboroCity_Flat1_1F.inc +++ /dev/null @@ -1,18 +0,0 @@ -RustboroCity_Flat1_1F_MapScripts:: @ 82150CD - .byte 0 - -RustboroCity_Flat1_1F_EventScript_2150CE:: @ 82150CE - msgbox RustboroCity_Flat1_1F_Text_2150E0, 2 - end - -RustboroCity_Flat1_1F_EventScript_2150D7:: @ 82150D7 - msgbox RustboroCity_Flat1_1F_Text_215115, 2 - end - -RustboroCity_Flat1_1F_Text_2150E0: @ 82150E0 - .string "Every POKéMON has a special ability\n" - .string "that it can use.$" - -RustboroCity_Flat1_1F_Text_215115: @ 8215115 - .string "POKéMON are such strange creatures.$" - diff --git a/data/scripts/maps/RustboroCity_Flat1_2F.inc b/data/scripts/maps/RustboroCity_Flat1_2F.inc deleted file mode 100644 index 425d61f52..000000000 --- a/data/scripts/maps/RustboroCity_Flat1_2F.inc +++ /dev/null @@ -1,184 +0,0 @@ -RustboroCity_Flat1_2F_MapScripts:: @ 8215139 - .byte 0 - -RustboroCity_Flat1_2F_EventScript_21513A:: @ 821513A - lock - faceplayer - specialvar VAR_RESULT, TryBufferWaldaPhrase - compare VAR_RESULT, 0 - goto_eq RustboroCity_Flat1_2F_EventScript_21518D - compare VAR_RESULT, 1 - goto_eq RustboroCity_Flat1_2F_EventScript_2151AD - -RustboroCity_Flat1_2F_EventScript_215157:: @ 8215157 - special DoWaldaNamingScreen - waitstate - compare VAR_0x8004, 1 - goto_eq RustboroCity_Flat1_2F_EventScript_2151D7 - compare VAR_0x8004, 2 - goto_eq RustboroCity_Flat1_2F_EventScript_2151E1 - specialvar VAR_RESULT, TryGetWallpaperWithWaldaPhrase - compare VAR_RESULT, 1 - goto_eq RustboroCity_Flat1_2F_EventScript_2151F8 - compare VAR_RESULT, 0 - goto_eq RustboroCity_Flat1_2F_EventScript_215221 - end - -RustboroCity_Flat1_2F_EventScript_21518D:: @ 821518D - msgbox RustboroCity_Flat1_2F_Text_2152FA, 5 - compare VAR_RESULT, 0 - goto_eq RustboroCity_Flat1_2F_EventScript_2151CD - msgbox RustboroCity_Flat1_2F_Text_2154AD, 4 - goto RustboroCity_Flat1_2F_EventScript_215157 - -RustboroCity_Flat1_2F_EventScript_2151AD:: @ 82151AD - msgbox RustboroCity_Flat1_2F_Text_215448, 5 - compare VAR_RESULT, 0 - goto_eq RustboroCity_Flat1_2F_EventScript_2151CD - msgbox RustboroCity_Flat1_2F_Text_2154AD, 4 - goto RustboroCity_Flat1_2F_EventScript_215157 - -RustboroCity_Flat1_2F_EventScript_2151CD:: @ 82151CD - msgbox RustboroCity_Flat1_2F_Text_2154E7, 4 - release - end - -RustboroCity_Flat1_2F_EventScript_2151D7:: @ 82151D7 - msgbox RustboroCity_Flat1_2F_Text_2156E3, 4 - release - end - -RustboroCity_Flat1_2F_EventScript_2151E1:: @ 82151E1 - msgbox RustboroCity_Flat1_2F_Text_21561E, 4 - call RustboroCity_Flat1_2F_EventScript_215238 - msgbox RustboroCity_Flat1_2F_Text_215699, 4 - release - end - -RustboroCity_Flat1_2F_EventScript_2151F8:: @ 82151F8 - msgbox RustboroCity_Flat1_2F_Text_215535, 4 - call RustboroCity_Flat1_2F_EventScript_215238 - msgbox RustboroCity_Flat1_2F_Text_215565, 4 - applymovement 6, RustboroCity_Flat1_2F_Movement_27259E - waitmovement 0 - msgbox RustboroCity_Flat1_2F_Text_215792, 4 - release - end - -RustboroCity_Flat1_2F_EventScript_215221:: @ 8215221 - msgbox RustboroCity_Flat1_2F_Text_2155A4, 4 - call RustboroCity_Flat1_2F_EventScript_215238 - msgbox RustboroCity_Flat1_2F_Text_2155D4, 4 - release - end - -RustboroCity_Flat1_2F_EventScript_215238:: @ 8215238 - turnobject 6, 4 - return - -RustboroCity_Flat1_2F_EventScript_21523D:: @ 821523D - msgbox RustboroCity_Flat1_2F_Text_21524F, 2 - end - -RustboroCity_Flat1_2F_EventScript_215246:: @ 8215246 - msgbox RustboroCity_Flat1_2F_Text_215923, 3 - end - -RustboroCity_Flat1_2F_Text_21524F: @ 821524F - .string "Oh, it’s so hard every day…\p" - .string "What’s hard?\n" - .string "You need to ask?\p" - .string "It’s trying to figure out what to\n" - .string "make for meals every day.\p" - .string "It really isn’t easy coming up with\n" - .string "meals every day.$" - -RustboroCity_Flat1_2F_Text_2152FA: @ 82152FA - .string "Oh, hello!\n" - .string "Welcome to the PEPPER household.\p" - .string "I have a question for you.\n" - .string "Have you ever baby-sat?\p" - .string "You see, I’m a new father, so raising\n" - .string "a child is all new to me.\p" - .string "And I have a problem. My daughter\n" - .string "WALDA doesn’t laugh enough.\p" - .string "I think she’d laugh for me if I told\n" - .string "her something funny.\p" - .string "Do you know of a funny word or\n" - .string "phrase you can tell me?$" - -RustboroCity_Flat1_2F_Text_215448: @ 8215448 - .string "I’ve been saying “{STR_VAR_1}â€\n" - .string "to amuse her lately.\p" - .string "Do you know of a better word or\n" - .string "a phrase that might work?$" - -RustboroCity_Flat1_2F_Text_2154AD: @ 82154AD - .string "Oh, that’s wonderful.\n" - .string "So, let’s hear it, your suggestion.$" - -RustboroCity_Flat1_2F_Text_2154E7: @ 82154E7 - .string "Oh, is that right?\p" - .string "Well, if you come up with a good\n" - .string "suggestion, I’m all ears.$" - -RustboroCity_Flat1_2F_Text_215535: @ 8215535 - .string "Ah, I see.\n" - .string "Well, let’s give it a try, shall we?$" - -RustboroCity_Flat1_2F_Text_215565: @ 8215565 - .string "{STR_VAR_1}.\n" - .string "{STR_VAR_1}.\p" - .string "Oh, yes! She’s laughing!\n" - .string "Oh, I am as delighted as she!$" - -RustboroCity_Flat1_2F_Text_2155A4: @ 82155A4 - .string "Ah, I see.\n" - .string "Well, let’s give it a try, shall we?$" - -RustboroCity_Flat1_2F_Text_2155D4: @ 82155D4 - .string "{STR_VAR_1}.\n" - .string "{STR_VAR_1}.\p" - .string "Hmmm… She’s not smiling at all.\n" - .string "Maybe WALDA is one serious child…$" - -RustboroCity_Flat1_2F_Text_21561E: @ 821561E - .string "Oh, so you don’t know any good words.\n" - .string "I’d better think for myself, then.\p" - .string "Hmm…\n" - .string "How about “{STR_VAR_1}â€?\l" - .string "Let’s see if that will work.$" - -RustboroCity_Flat1_2F_Text_215699: @ 8215699 - .string "{STR_VAR_1}.\n" - .string "{STR_VAR_1}.\p" - .string "Hmmm… She’s not smiling at all.\n" - .string "Maybe WALDA is one serious child…$" - -RustboroCity_Flat1_2F_Text_2156E3: @ 82156E3 - .string "Oh, so you don’t know any good words.\n" - .string "I guess I’ll try to amuse her with\l" - .string "the saying I used before.\p" - .string "Anyways, if you have a good suggestion,\n" - .string "don’t hesitate in telling me, okay?$" - -RustboroCity_Flat1_2F_Text_215792: @ 8215792 - .string "Thank you!\p" - .string "Thanks to you, my darling WALDA\n" - .string "laughed for me!\p" - .string "Actually, I may not look all that\n" - .string "special, but I’m one of DEVON\l" - .string "CORPORATION’s top researchers.\p" - .string "So, how about I do something in return\n" - .string "for you?\p" - .string "I know, I’ll add some new wallpaper\n" - .string "patterns for the BOXES in the PC\l" - .string "POKéMON Storage System.\p" - .string "In the wallpaper pattern menu,\n" - .string "select “FRIENDS.â€\p" - .string "That will give you access to the new\n" - .string "wallpaper patterns.$" - -RustboroCity_Flat1_2F_Text_215923: @ 8215923 - .string "It’s a POKéMON plush DOLL!$" - diff --git a/data/scripts/maps/RustboroCity_Flat2_1F.inc b/data/scripts/maps/RustboroCity_Flat2_1F.inc deleted file mode 100644 index fbb174a29..000000000 --- a/data/scripts/maps/RustboroCity_Flat2_1F.inc +++ /dev/null @@ -1,24 +0,0 @@ -RustboroCity_Flat2_1F_MapScripts:: @ 8215F76 - .byte 0 - -RustboroCity_Flat2_1F_EventScript_215F77:: @ 8215F77 - msgbox RustboroCity_Flat2_1F_Text_215F93, 2 - end - -RustboroCity_Flat2_1F_EventScript_215F80:: @ 8215F80 - lock - faceplayer - waitse - playmoncry SPECIES_SKITTY, 0 - msgbox RustboroCity_Flat2_1F_Text_215FC6, 4 - waitmoncry - release - end - -RustboroCity_Flat2_1F_Text_215F93: @ 8215F93 - .string "DEVON CORPORATION’s workers live in\n" - .string "this building.$" - -RustboroCity_Flat2_1F_Text_215FC6: @ 8215FC6 - .string "SKITTY: Gyaaaah!$" - diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.inc b/data/scripts/maps/RustboroCity_Flat2_2F.inc deleted file mode 100644 index e623aa485..000000000 --- a/data/scripts/maps/RustboroCity_Flat2_2F.inc +++ /dev/null @@ -1,39 +0,0 @@ -RustboroCity_Flat2_2F_MapScripts:: @ 8215FD7 - .byte 0 - -RustboroCity_Flat2_2F_EventScript_215FD8:: @ 8215FD8 - msgbox RustboroCity_Flat2_2F_Text_21601A, 2 - end - -RustboroCity_Flat2_2F_EventScript_215FE1:: @ 8215FE1 - lock - faceplayer - checkflag FLAG_0x0D5 - goto_eq RustboroCity_Flat2_2F_EventScript_216010 - msgbox RustboroCity_Flat2_2F_Text_21605A, 4 - giveitem_std ITEM_PREMIER_BALL - compare VAR_RESULT, 0 - goto_eq RustboroCity_Flat2_2F_EventScript_272054 - setflag FLAG_0x0D5 - release - end - -RustboroCity_Flat2_2F_EventScript_216010:: @ 8216010 - msgbox RustboroCity_Flat2_2F_Text_2160BD, 4 - release - end - -RustboroCity_Flat2_2F_Text_21601A: @ 821601A - .string "Way back in the old days, DEVON was just\n" - .string "a teeny, tiny company.$" - -RustboroCity_Flat2_2F_Text_21605A: @ 821605A - .string "My daddy’s working at the CORPORATION.\p" - .string "My daddy made this!\n" - .string "But I can’t use it, so you can have it.$" - -RustboroCity_Flat2_2F_Text_2160BD: @ 82160BD - .string "My daddy’s working at the CORPORATION.\p" - .string "When I grow up, I’m going to work for\n" - .string "DEVON, too.$" - diff --git a/data/scripts/maps/RustboroCity_Flat2_3F.inc b/data/scripts/maps/RustboroCity_Flat2_3F.inc deleted file mode 100644 index 6a267c336..000000000 --- a/data/scripts/maps/RustboroCity_Flat2_3F.inc +++ /dev/null @@ -1,19 +0,0 @@ -RustboroCity_Flat2_3F_MapScripts:: @ 8216116 - .byte 0 - -RustboroCity_Flat2_3F_EventScript_216117:: @ 8216117 - msgbox RustboroCity_Flat2_3F_Text_216129, 2 - end - -RustboroCity_Flat2_3F_EventScript_216120:: @ 8216120 - msgbox RustboroCity_Flat2_3F_Text_216159, 2 - end - -RustboroCity_Flat2_3F_Text_216129: @ 8216129 - .string "DEVON’s PRESIDENT likes to collect\n" - .string "rare stones.$" - -RustboroCity_Flat2_3F_Text_216159: @ 8216159 - .string "I think the PRESIDENT’s son also\n" - .string "collects rare stones.$" - diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc deleted file mode 100644 index 1d722b7de..000000000 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ /dev/null @@ -1,291 +0,0 @@ -RustboroCity_Gym_MapScripts:: @ 8212F30 - .byte 0 - -RustboroCity_Gym_EventScript_212F31:: @ 8212F31 - trainerbattle 1, TRAINER_ROXANNE_1, 0, RustboroCity_Gym_Text_21362A, RustboroCity_Gym_Text_21370B, RustboroCity_Gym_EventScript_212F66 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq RustboroCity_Gym_EventScript_212FC8 - checkflag FLAG_0x0A5 - goto_if 0, RustboroCity_Gym_EventScript_212FA4 - msgbox RustboroCity_Gym_Text_2139A7, 4 - release - end - -RustboroCity_Gym_EventScript_212F66:: @ 8212F66 - message RustboroCity_Gym_Text_2137EC - waitmessage - call RustboroCity_Gym_EventScript_27207E - msgbox RustboroCity_Gym_Text_213816, 4 - setflag FLAG_0x4F0 - setflag FLAG_BADGE01_GET - setvar VAR_0x405A, 1 - addvar VAR_0x4085, 1 - setvar VAR_0x8008, 1 - call RustboroCity_Gym_EventScript_271F43 - compare VAR_0x4085, 6 - call_if 1, RustboroCity_Gym_EventScript_271E84 - goto RustboroCity_Gym_EventScript_212FA4 - end - -RustboroCity_Gym_EventScript_212FA4:: @ 8212FA4 - giveitem_std ITEM_TM39 - compare VAR_RESULT, 0 - goto_eq RustboroCity_Gym_EventScript_272054 - setflag FLAG_0x0A5 - msgbox RustboroCity_Gym_Text_2138B1, 4 - release - end - -RustboroCity_Gym_EventScript_212FC8:: @ 8212FC8 - trainerbattle 7, TRAINER_ROXANNE_1, 0, RustboroCity_Gym_Text_213C2F, RustboroCity_Gym_Text_213CF9, RustboroCity_Gym_Text_213D93 - msgbox RustboroCity_Gym_Text_213D12, 6 - end - -RustboroCity_Gym_EventScript_212FE3:: @ 8212FE3 - trainerbattle 0, TRAINER_JOSH, 0, RustboroCity_Gym_Text_2133E9, RustboroCity_Gym_Text_21342D - msgbox RustboroCity_Gym_Text_213447, 6 - end - -RustboroCity_Gym_EventScript_212FFA:: @ 8212FFA - trainerbattle 0, TRAINER_TOMMY, 0, RustboroCity_Gym_Text_213486, RustboroCity_Gym_Text_2134C6 - msgbox RustboroCity_Gym_Text_2134E6, 6 - end - -RustboroCity_Gym_EventScript_213011:: @ 8213011 - trainerbattle 0, TRAINER_MARC, 0, RustboroCity_Gym_Text_213533, RustboroCity_Gym_Text_213589 - msgbox RustboroCity_Gym_Text_2135C0, 6 - end - -RustboroCity_Gym_EventScript_213028:: @ 8213028 - lock - faceplayer - checkflag FLAG_0x4F0 - goto_eq RustboroCity_Gym_EventScript_21303D - msgbox RustboroCity_Gym_Text_21309D, 4 - release - end - -RustboroCity_Gym_EventScript_21303D:: @ 821303D - msgbox RustboroCity_Gym_Text_2132E2, 4 - release - end - -RustboroCity_Gym_EventScript_213047:: @ 8213047 - lockall - checkflag FLAG_BADGE01_GET - goto_eq RustboroCity_Gym_EventScript_213067 - goto RustboroCity_Gym_EventScript_213071 - end - -RustboroCity_Gym_EventScript_213057:: @ 8213057 - lockall - checkflag FLAG_BADGE01_GET - goto_eq RustboroCity_Gym_EventScript_213067 - goto RustboroCity_Gym_EventScript_213071 - end - -RustboroCity_Gym_EventScript_213067:: @ 8213067 - msgbox RustboroCity_Gym_Text_213A3B, 4 - releaseall - end - -RustboroCity_Gym_EventScript_213071:: @ 8213071 - msgbox RustboroCity_Gym_Text_213A21, 4 - releaseall - end - -RustboroCity_Gym_EventScript_21307B:: @ 821307B - lockall - pokenavcall RustboroCity_Gym_Text_213A76 - waitmessage - delay 30 - playfanfare MUS_ME_TORE_EYE - msgbox RustboroCity_Gym_Text_213C01, 4 - waitfanfare - closemessage - delay 30 - setflag FLAG_0x1D3 - clearflag FLAG_0x080 - releaseall - end - -RustboroCity_Gym_Text_21309D: @ 821309D - .string "Yo, how’s it going?\p" - .string "Listen, my friend!\n" - .string "Would you like to become the CHAMPION?\p" - .string "I’m no TRAINER, not me, but I can\n" - .string "sure give you winning advice.\p" - .string "That’s settled, then! We’ll aim for the\n" - .string "POKéMON CHAMPIONSHIP together!\p" - .string "It’s your job as a TRAINER to collect\n" - .string "GYM BADGES, am I right?\p" - .string "But GYM LEADERS aren’t pushovers!\p" - .string "And that’s where I come in!\n" - .string "I’m here to provide expert advice!\p" - .string "ROXANNE, the GYM LEADER, is a user\n" - .string "of ROCK-type POKéMON.\p" - .string "The ROCK type is very durable, but\n" - .string "it can’t stand WATER-type and\l" - .string "GRASS-type moves.\p" - .string "Come see me afterwards, if you beat\n" - .string "the GYM LEADER.\p" - .string "Well, go for it!$" - -RustboroCity_Gym_Text_2132E2: @ 82132E2 - .string "Whoa! What a breathtaking victory!\n" - .string "My cheering must’ve worked!\p" - .string "Great!\n" - .string "Check your TRAINER CARD.\p" - .string "The STONE BADGE you got should be\n" - .string "properly recorded on it.\p" - .string "In other words…\p" - .string "You’ve climbed the first step on\n" - .string "the stairs to the CHAMPIONSHIP!\p" - .string "That’s got to feel awesome!$" - -RustboroCity_Gym_Text_2133E9: @ 82133E9 - .string "Don’t take us GYM TRAINERS lightly!\n" - .string "I’ll show you why we’re better!$" - -RustboroCity_Gym_Text_21342D: @ 821342D - .string "You were too good for me…$" - -RustboroCity_Gym_Text_213447: @ 8213447 - .string "You haven’t seen anything of the ROCK\n" - .string "type’s terrifying power!$" - -RustboroCity_Gym_Text_213486: @ 8213486 - .string "If you can’t beat me, you won’t stand\n" - .string "a chance against ROXANNE!$" - -RustboroCity_Gym_Text_2134C6: @ 82134C6 - .string "Wow! You’ve got some potential!$" - -RustboroCity_Gym_Text_2134E6: @ 82134E6 - .string "ROXANNE is stronger than me by\n" - .string "several times.\p" - .string "You’d better be on your guard!$" - -RustboroCity_Gym_Text_213533: @ 8213533 - .string "We might be in the middle of town,\n" - .string "but so what?\p" - .string "My ROCK POKéMON need room to\n" - .string "rampage!$" - -RustboroCity_Gym_Text_213589: @ 8213589 - .string "Oh, man oh man!\n" - .string "Our challenger is one feisty customer!$" - -RustboroCity_Gym_Text_2135C0: @ 82135C0 - .string "I have to hand it to our LEADER.\p" - .string "It took smarts and sense for her to\n" - .string "pick the ROCK type at her young age.$" - -RustboroCity_Gym_Text_21362A: @ 821362A - .string "Hello, I am ROXANNE, the RUSTBORO\n" - .string "POKéMON GYM LEADER.\p" - .string "I became a GYM LEADER so that I might\n" - .string "apply what I learned at the POKéMON\l" - .string "TRAINER’S SCHOOL in battle.\p" - .string "Would you kindly demonstrate how you\n" - .string "battle, and with which POKéMON?$" - -RustboroCity_Gym_Text_21370B: @ 821370B - .string "So…\n" - .string "I lost…\p" - .string "It seems that I still have much more\n" - .string "to learn…\p" - .string "I understand.\p" - .string "The POKéMON LEAGUE’s rules state\n" - .string "that TRAINERS are to be given this\l" - .string "if they defeat a GYM LEADER.\p" - .string "Please accept the official POKéMON\n" - .string "LEAGUE STONE BADGE.$" - -RustboroCity_Gym_Text_2137EC: @ 82137EC - .string "{PLAYER} received the STONE BADGE\n" - .string "from ROXANNE.$" - -RustboroCity_Gym_Text_213816: @ 8213816 - .string "The STONE BADGE heightens the ATTACK\n" - .string "power of your POKéMON.\p" - .string "It also enables them to use the HM move\n" - .string "CUT outside of battle.\p" - .string "Please take this with you, too.$" - -RustboroCity_Gym_Text_2138B1: @ 82138B1 - .string "That TECHNICAL MACHINE, TM39,\n" - .string "contains ROCK TOMB.\p" - .string "It not only inflicts damage by dropping\n" - .string "rocks, it also lowers SPEED.\p" - .string "If you use a TM, it instantly teaches\n" - .string "the move to a POKéMON.\p" - .string "Remember, a TM can be used only once,\n" - .string "so think before you use it.$" - -RustboroCity_Gym_Text_2139A7: @ 82139A7 - .string "Since you are so strong, you should\n" - .string "challenge other GYM LEADERS.\p" - .string "By battling many TRAINERS, you should\n" - .string "learn many things.$" - -RustboroCity_Gym_Text_213A21: @ 8213A21 - .string "RUSTBORO CITY POKéMON GYM$" - -RustboroCity_Gym_Text_213A3B: @ 8213A3B - .string "RUSTBORO CITY POKéMON GYM\p" - .string "ROXANNE’S CERTIFIED TRAINERS:\n" - .string "{PLAYER}$" - - -RustboroCity_Gym_Text_213A76: @ 8213A76 - .string "… … … … … …\n" - .string "… … … … … Beep!\p" - .string "ROXANNE: Oh, hello, {PLAYER}?\n" - .string "This is ROXANNE of RUSTBORO CITY.\p" - .string "I heard from BRAWLY that you’re\n" - .string "moving up through the ranks of\l" - .string "TRAINERS at an incredible clip.\p" - .string "Well, I’d rather not think that\n" - .string "I can’t beat you.\p" - .string "I promise, I will shape up my GYM\n" - .string "so that you may challenge us again.\p" - .string "I hope you’ll be looking forward to\n" - .string "that occasion as much as me!\p" - .string "… … … … … …\n" - .string "… … … … … Click!$" - -RustboroCity_Gym_Text_213C01: @ 8213C01 - .string "Registered GYM LEADER ROXANNE\n" - .string "in the POKéNAV.$" - -RustboroCity_Gym_Text_213C2F: @ 8213C2F - .string "ROXANNE: I’m so glad to see you again.\n" - .string "I’m ROXANNE, the GYM LEADER here.\p" - .string "I’m sure we’ve both experienced many\n" - .string "battles since we last met.\p" - .string "I would like to see how much better\n" - .string "we’ve become. Let us battle!$" - -RustboroCity_Gym_Text_213CF9: @ 8213CF9 - .string "Grr…\n" - .string "Again, I have lost…$" - -RustboroCity_Gym_Text_213D12: @ 8213D12 - .string "ROXANNE: I still have much to learn\n" - .string "when it comes to battling POKéMON.\p" - .string "That awareness makes me love battling\n" - .string "all that much more!$" - -RustboroCity_Gym_Text_213D93: @ 8213D93 - .string "ROXANNE: I’m so glad to see you again.\n" - .string "I’m ROXANNE, the GYM LEADER here.\p" - .string "I’m sure we’ve both experienced many\n" - .string "battles since we last met.\p" - .string "I would like to see how much better\n" - .string "we’ve become…\p" - .string "Oh, no…\n" - .string "You only have one POKéMON with you?\p" - .string "Please return with at least one more\n" - .string "POKéMON.$" diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc deleted file mode 100644 index d63536c55..000000000 --- a/data/scripts/maps/RustboroCity_House1.inc +++ /dev/null @@ -1,85 +0,0 @@ -RustboroCity_House1_MapScripts:: @ 821593E - .byte 0 - -RustboroCity_House1_EventScript_21593F:: @ 821593F - lock - faceplayer - checkflag FLAG_0x099 - goto_eq RustboroCity_House1_EventScript_2159D5 - setvar VAR_0x8008, 0 - copyvar VAR_0x8004, VAR_0x8008 - specialvar VAR_RESULT, sub_807E73C - copyvar VAR_0x8009, VAR_RESULT - msgbox RustboroCity_House1_Text_2159E8, 5 - compare VAR_RESULT, 0 - goto_eq RustboroCity_House1_EventScript_2159BD - special sub_81B94B0 - waitstate - copyvar VAR_0x800A, VAR_0x8004 - compare VAR_0x8004, 255 - goto_eq RustboroCity_House1_EventScript_2159BD - copyvar VAR_0x8005, VAR_0x800A - specialvar VAR_RESULT, sub_807E9D4 - copyvar VAR_0x800B, VAR_RESULT - compare VAR_RESULT, VAR_0x8009 - goto_if 5, RustboroCity_House1_EventScript_2159C7 - copyvar VAR_0x8004, VAR_0x8008 - copyvar VAR_0x8005, VAR_0x800A - special sub_807EA10 - special sub_807F0E4 - waitstate - msgbox RustboroCity_House1_Text_215A77, 4 - setflag FLAG_0x099 - release - end - -RustboroCity_House1_EventScript_2159BD:: @ 82159BD - msgbox RustboroCity_House1_Text_215ACE, 4 - release - end - -RustboroCity_House1_EventScript_2159C7:: @ 82159C7 - bufferspeciesname 0, VAR_0x8009 - msgbox RustboroCity_House1_Text_215A9D, 4 - release - end - -RustboroCity_House1_EventScript_2159D5:: @ 82159D5 - msgbox RustboroCity_House1_Text_215B17, 4 - release - end - -RustboroCity_House1_EventScript_2159DF:: @ 82159DF - msgbox RustboroCity_House1_Text_215B57, 2 - end - -RustboroCity_House1_Text_2159E8: @ 82159E8 - .string "Huh? My POKéMON is cute?\n" - .string "Sure, I knew that.\p" - .string "But if you really want, I’m willing\n" - .string "to trade it to you.\p" - .string "I’ll trade you my {STR_VAR_2} for\n" - .string "a {STR_VAR_1} if you want.$" - -RustboroCity_House1_Text_215A77: @ 8215A77 - .string "Eheheh…\n" - .string "Please be good to my POKéMON.$" - -RustboroCity_House1_Text_215A9D: @ 8215A9D - .string "Huh? That doesn’t look anything like\n" - .string "a {STR_VAR_1} to me.$" - -RustboroCity_House1_Text_215ACE: @ 8215ACE - .string "Oh, if you don’t want to, that’s okay.\n" - .string "But my POKéMON is cute, you know…$" - -RustboroCity_House1_Text_215B17: @ 8215B17 - .string "Any POKéMON can be cute if you raise\n" - .string "it with care and kindness.$" - -RustboroCity_House1_Text_215B57: @ 8215B57 - .string "In all sorts of places, there are all\n" - .string "sorts of POKéMON and people.\p" - .string "I find that fascinating, so I go to all\n" - .string "sorts of places.$" - diff --git a/data/scripts/maps/RustboroCity_House2.inc b/data/scripts/maps/RustboroCity_House2.inc deleted file mode 100644 index fd71dc016..000000000 --- a/data/scripts/maps/RustboroCity_House2.inc +++ /dev/null @@ -1,21 +0,0 @@ -RustboroCity_House2_MapScripts:: @ 8215EB3 - .byte 0 - -RustboroCity_House2_EventScript_215EB4:: @ 8215EB4 - msgbox RustboroCity_House2_Text_215EC6, 2 - end - -RustboroCity_House2_EventScript_215EBD:: @ 8215EBD - msgbox RustboroCity_House2_Text_215F21, 2 - end - -RustboroCity_House2_Text_215EC6: @ 8215EC6 - .string "The TRAINER’S SCHOOL is excellent.\p" - .string "If you study there, you could even\n" - .string "become a GYM LEADER.$" - -RustboroCity_House2_Text_215F21: @ 8215F21 - .string "ROXANNE, the GYM LEADER, really knows\n" - .string "a lot about POKéMON.\p" - .string "She’s really strong, too!$" - diff --git a/data/scripts/maps/RustboroCity_House3.inc b/data/scripts/maps/RustboroCity_House3.inc deleted file mode 100644 index 87d278099..000000000 --- a/data/scripts/maps/RustboroCity_House3.inc +++ /dev/null @@ -1,36 +0,0 @@ -RustboroCity_House3_MapScripts:: @ 8216190 - .byte 0 - -RustboroCity_House3_EventScript_216191:: @ 8216191 - msgbox RustboroCity_House3_Text_2161B6, 2 - end - -RustboroCity_House3_EventScript_21619A:: @ 821619A - msgbox RustboroCity_House3_Text_21622A, 2 - end - -RustboroCity_House3_EventScript_2161A3:: @ 82161A3 - lock - faceplayer - waitse - playmoncry SPECIES_PIKACHU, 0 - msgbox RustboroCity_House3_Text_2162AB, 4 - waitmoncry - release - end - -RustboroCity_House3_Text_2161B6: @ 82161B6 - .string "For my own POKéMON, I give them\n" - .string "perfectly suited nicknames!\p" - .string "It’s my expression of, uh…\n" - .string "originality, yes, that’s it!$" - -RustboroCity_House3_Text_21622A: @ 821622A - .string "But giving the name PEKACHU to\n" - .string "a PIKACHU? It seems pointless.\p" - .string "I suppose it is good to use a name\n" - .string "that’s easy to understand, but…$" - -RustboroCity_House3_Text_2162AB: @ 82162AB - .string "PEKACHU: Peka!$" - diff --git a/data/scripts/maps/RustboroCity_Mart.inc b/data/scripts/maps/RustboroCity_Mart.inc deleted file mode 100644 index daa445a0e..000000000 --- a/data/scripts/maps/RustboroCity_Mart.inc +++ /dev/null @@ -1,89 +0,0 @@ -RustboroCity_Mart_MapScripts:: @ 8214F05 - .byte 0 - -RustboroCity_Mart_EventScript_214F06:: @ 8214F06 - lock - faceplayer - message gUnknown_08272A21 - waitmessage - checkflag FLAG_0x11F - goto_if 0, RustboroCity_Mart_EventScript_214F21 - checkflag FLAG_0x11F - goto_eq RustboroCity_Mart_EventScript_214F48 - end - -RustboroCity_Mart_EventScript_214F21:: @ 8214F21 - pokemart RustboroCity_Mart_Pokemart_214F30 - msgbox gUnknown_08272A3F, 4 - release - end - -RustboroCity_Mart_Pokemart_214F30: @ 8214F30 - .2byte ITEM_POKE_BALL - .2byte ITEM_POTION - .2byte ITEM_SUPER_POTION - .2byte ITEM_ANTIDOTE - .2byte ITEM_PARALYZE_HEAL - .2byte ITEM_ESCAPE_ROPE - .2byte ITEM_REPEL - .2byte ITEM_X_SPEED - .2byte ITEM_X_ATTACK - .2byte ITEM_X_DEFEND - .2byte ITEM_NONE - release - end - -RustboroCity_Mart_EventScript_214F48:: @ 8214F48 - pokemart RustboroCity_Mart_Pokemart_214F58 - msgbox gUnknown_08272A3F, 4 - release - end - - .align 2 -RustboroCity_Mart_Pokemart_214F58: @ 8214F58 - .2byte ITEM_POKE_BALL - .2byte ITEM_TIMER_BALL - .2byte ITEM_REPEAT_BALL - .2byte ITEM_POTION - .2byte ITEM_SUPER_POTION - .2byte ITEM_ANTIDOTE - .2byte ITEM_PARALYZE_HEAL - .2byte ITEM_ESCAPE_ROPE - .2byte ITEM_REPEL - .2byte ITEM_X_SPEED - .2byte ITEM_X_ATTACK - .2byte ITEM_X_DEFEND - .2byte ITEM_NONE - release - end - -RustboroCity_Mart_EventScript_214F74:: @ 8214F74 - msgbox RustboroCity_Mart_Text_214F8F, 2 - end - -RustboroCity_Mart_EventScript_214F7D:: @ 8214F7D - msgbox RustboroCity_Mart_Text_214FF1, 2 - end - -RustboroCity_Mart_EventScript_214F86:: @ 8214F86 - msgbox RustboroCity_Mart_Text_21505C, 2 - end - -RustboroCity_Mart_Text_214F8F: @ 8214F8F - .string "I’m buying some PARLYZ HEALS and\n" - .string "ANTIDOTES.\p" - .string "Just in case I run into SHROOMISH\n" - .string "in PETALBURG WOODS.$" - -RustboroCity_Mart_Text_214FF1: @ 8214FF1 - .string "My POKéMON evolved.\n" - .string "It has a lot of HP now.\p" - .string "I should buy SUPER POTIONS for it\n" - .string "instead of ordinary POTIONS.$" - -RustboroCity_Mart_Text_21505C: @ 821505C - .string "I’m getting an ESCAPE ROPE just in\n" - .string "case I get lost in a cave.\p" - .string "I just need to use it to get back to\n" - .string "the entrance.$" - diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc deleted file mode 100644 index a9156d5aa..000000000 --- a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc +++ /dev/null @@ -1,47 +0,0 @@ -RustboroCity_PokemonCenter_1F_MapScripts:: @ 8214D62 - map_script 3, RustboroCity_PokemonCenter_1F_MapScript1_214D6D - map_script 5, RustboroCity_PokemonCenter_1F_MapScript1_277C30 - .byte 0 - -RustboroCity_PokemonCenter_1F_MapScript1_214D6D: @ 8214D6D - setrespawn 6 - call RustboroCity_PokemonCenter_1F_EventScript_2718DE - end - -RustboroCity_PokemonCenter_1F_EventScript_214D76:: @ 8214D76 - setvar VAR_0x800B, 1 - call RustboroCity_PokemonCenter_1F_EventScript_27191E - waitmessage - waitbuttonpress - release - end - -RustboroCity_PokemonCenter_1F_EventScript_214D84:: @ 8214D84 - msgbox RustboroCity_PokemonCenter_1F_Text_214D9F, 2 - end - -RustboroCity_PokemonCenter_1F_EventScript_214D8D:: @ 8214D8D - msgbox RustboroCity_PokemonCenter_1F_Text_214E13, 2 - end - -RustboroCity_PokemonCenter_1F_EventScript_214D96:: @ 8214D96 - msgbox RustboroCity_PokemonCenter_1F_Text_214E81, 2 - end - -RustboroCity_PokemonCenter_1F_Text_214D9F: @ 8214D9F - .string "My POKéMON has a NAIVE nature, and my\n" - .string "friend’s has a JOLLY nature.\p" - .string "It’s fascinating how POKéMON have\n" - .string "personalities!$" - -RustboroCity_PokemonCenter_1F_Text_214E13: @ 8214E13 - .string "Just like people, there are male and\n" - .string "female POKéMON.\p" - .string "But no one seems to have any idea how\n" - .string "they’re different.$" - -RustboroCity_PokemonCenter_1F_Text_214E81: @ 8214E81 - .string "The man next door gave me an HM!\p" - .string "I used it to teach my POKéMON how to\n" - .string "CUT down skinny trees.$" - diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_2F.inc b/data/scripts/maps/RustboroCity_PokemonCenter_2F.inc deleted file mode 100644 index a1bdeba5b..000000000 --- a/data/scripts/maps/RustboroCity_PokemonCenter_2F.inc +++ /dev/null @@ -1,19 +0,0 @@ -RustboroCity_PokemonCenter_2F_MapScripts:: @ 8214EDE - map_script 2, RustboroCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, RustboroCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, RustboroCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, RustboroCity_PokemonCenter_2F_MapScript1_276ACF - .byte 0 - -RustboroCity_PokemonCenter_2F_EventScript_214EF3:: @ 8214EF3 - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 - end - -RustboroCity_PokemonCenter_2F_EventScript_214EF9:: @ 8214EF9 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 - end - -RustboroCity_PokemonCenter_2F_EventScript_214EFF:: @ 8214EFF - call OldaleTown_PokemonCenter_2F_EventScript_2771DB - end - diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc deleted file mode 100644 index f5030facd..000000000 --- a/data/scripts/maps/RustboroCity_PokemonSchool.inc +++ /dev/null @@ -1,359 +0,0 @@ -RustboroCity_PokemonSchool_MapScripts:: @ 8213EA8 - .byte 0 - -RustboroCity_PokemonSchool_EventScript_213EA9:: @ 8213EA9 - lockall - msgbox RustboroCity_PokemonSchool_Text_2140B2, 4 - goto RustboroCity_PokemonSchool_EventScript_213EB8 - end - -RustboroCity_PokemonSchool_EventScript_213EB8:: @ 8213EB8 - message RustboroCity_PokemonSchool_Text_2140F9 - waitmessage - multichoicegrid 8, 1, 13, 3, 0 - switch VAR_RESULT - case 0, RustboroCity_PokemonSchool_EventScript_213F17 - case 1, RustboroCity_PokemonSchool_EventScript_213F25 - case 2, RustboroCity_PokemonSchool_EventScript_213F33 - case 3, RustboroCity_PokemonSchool_EventScript_213F41 - case 4, RustboroCity_PokemonSchool_EventScript_213F4F - case 5, RustboroCity_PokemonSchool_EventScript_213F5D - case 127, RustboroCity_PokemonSchool_EventScript_213F5D - end - -RustboroCity_PokemonSchool_EventScript_213F17:: @ 8213F17 - msgbox RustboroCity_PokemonSchool_Text_21411A, 4 - goto RustboroCity_PokemonSchool_EventScript_213EB8 - end - -RustboroCity_PokemonSchool_EventScript_213F25:: @ 8213F25 - msgbox RustboroCity_PokemonSchool_Text_2141D8, 4 - goto RustboroCity_PokemonSchool_EventScript_213EB8 - end - -RustboroCity_PokemonSchool_EventScript_213F33:: @ 8213F33 - msgbox RustboroCity_PokemonSchool_Text_21427D, 4 - goto RustboroCity_PokemonSchool_EventScript_213EB8 - end - -RustboroCity_PokemonSchool_EventScript_213F41:: @ 8213F41 - msgbox RustboroCity_PokemonSchool_Text_214336, 4 - goto RustboroCity_PokemonSchool_EventScript_213EB8 - end - -RustboroCity_PokemonSchool_EventScript_213F4F:: @ 8213F4F - msgbox RustboroCity_PokemonSchool_Text_2143B8, 4 - goto RustboroCity_PokemonSchool_EventScript_213EB8 - end - -RustboroCity_PokemonSchool_EventScript_213F5D:: @ 8213F5D - releaseall - end - -RustboroCity_PokemonSchool_EventScript_213F5F:: @ 8213F5F - msgbox RustboroCity_PokemonSchool_Text_21459F, 2 - end - -RustboroCity_PokemonSchool_EventScript_213F68:: @ 8213F68 - msgbox RustboroCity_PokemonSchool_Text_2145CD, 2 - end - -RustboroCity_PokemonSchool_EventScript_213F71:: @ 8213F71 - msgbox RustboroCity_PokemonSchool_Text_214604, 2 - end - -RustboroCity_PokemonSchool_EventScript_213F7A:: @ 8213F7A - msgbox RustboroCity_PokemonSchool_Text_214669, 2 - end - -RustboroCity_PokemonSchool_EventScript_213F83:: @ 8213F83 - msgbox RustboroCity_PokemonSchool_Text_214719, 2 - end - -RustboroCity_PokemonSchool_EventScript_213F8C:: @ 8213F8C - msgbox RustboroCity_PokemonSchool_Text_2147A2, 3 - end - -RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95 - lock - faceplayer - checkflag FLAG_0x113 - goto_eq RustboroCity_PokemonSchool_EventScript_213FFB - compare VAR_FACING, 4 - call_if 1, RustboroCity_PokemonSchool_EventScript_213FE5 - compare VAR_FACING, 3 - call_if 1, RustboroCity_PokemonSchool_EventScript_213FF0 - msgbox RustboroCity_PokemonSchool_Text_214433, 4 - giveitem_std ITEM_QUICK_CLAW - compare VAR_RESULT, 0 - goto_eq RustboroCity_PokemonSchool_EventScript_272054 - closemessage - applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA - waitmovement 0 - setflag FLAG_0x113 - release - end - -RustboroCity_PokemonSchool_EventScript_213FE5:: @ 8213FE5 - applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_214027 - waitmovement 0 - return - -RustboroCity_PokemonSchool_EventScript_213FF0:: @ 8213FF0 - applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_214010 - waitmovement 0 - return - -RustboroCity_PokemonSchool_EventScript_213FFB:: @ 8213FFB - msgbox RustboroCity_PokemonSchool_Text_2144C8, 4 - closemessage - applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA - waitmovement 0 - release - end - -RustboroCity_PokemonSchool_Movement_214010: @ 8214010 - 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 - 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 - lock - faceplayer - checkflag FLAG_0x1CB - goto_eq RustboroCity_PokemonSchool_EventScript_2140A8 - checkflag FLAG_0x136 - goto_eq RustboroCity_PokemonSchool_EventScript_21406F - checkflag FLAG_BADGE01_GET - goto_eq RustboroCity_PokemonSchool_EventScript_214082 - msgbox RustboroCity_PokemonSchool_Text_2148C0, 4 - addvar VAR_0x40D1, 1 - setflag FLAG_0x136 - release - end - -RustboroCity_PokemonSchool_EventScript_21406F:: @ 821406F - checkflag FLAG_BADGE01_GET - goto_eq RustboroCity_PokemonSchool_EventScript_214090 - msgbox RustboroCity_PokemonSchool_Text_214A5F, 4 - release - end - -RustboroCity_PokemonSchool_EventScript_214082:: @ 8214082 - msgbox RustboroCity_PokemonSchool_Text_214B8A, 4 - goto RustboroCity_PokemonSchool_EventScript_21409E - end - -RustboroCity_PokemonSchool_EventScript_214090:: @ 8214090 - msgbox RustboroCity_PokemonSchool_Text_214AB6, 4 - goto RustboroCity_PokemonSchool_EventScript_21409E - end - -RustboroCity_PokemonSchool_EventScript_21409E:: @ 821409E - addvar VAR_0x40D1, 1 - setflag FLAG_0x1CB - release - end - -RustboroCity_PokemonSchool_EventScript_2140A8:: @ 82140A8 - msgbox RustboroCity_PokemonSchool_Text_214A5F, 4 - release - end - -RustboroCity_PokemonSchool_Text_2140B2: @ 82140B2 - .string "The blackboard lists status changes\n" - .string "that may affect POKéMON in battle.$" - -RustboroCity_PokemonSchool_Text_2140F9: @ 82140F9 - .string "Which topic do you want to read?$" - -RustboroCity_PokemonSchool_Text_21411A: @ 821411A - .string "If a POKéMON is poisoned, it will\n" - .string "steadily lose HP.\p" - .string "The effects of poison remain after\n" - .string "a battle.\p" - .string "A poisoned POKéMON’s HP will drop\n" - .string "while it is traveling.\p" - .string "Heal a poisoning using an ANTIDOTE.$" - -RustboroCity_PokemonSchool_Text_2141D8: @ 82141D8 - .string "If a POKéMON becomes paralyzed,\n" - .string "its SPEED drops.\p" - .string "It may also not be able to move while\n" - .string "it is in battle.\p" - .string "Paralysis remains after battle.\n" - .string "Cure it using a PARLYZ HEAL.$" - -RustboroCity_PokemonSchool_Text_21427D: @ 821427D - .string "If a POKéMON falls asleep, it will be\n" - .string "unable to attack.\p" - .string "A POKéMON may wake up on its own,\n" - .string "but if a battle ends while it is\l" - .string "sleeping, it will stay asleep.\p" - .string "Wake it up using an AWAKENING.$" - -RustboroCity_PokemonSchool_Text_214336: @ 8214336 - .string "A burn reduces ATTACK power, and it\n" - .string "steadily reduces the victim’s HP.\p" - .string "A burn lingers after battle.\n" - .string "Cure a burn using a BURN HEAL.$" - -RustboroCity_PokemonSchool_Text_2143B8: @ 82143B8 - .string "If a POKéMON is frozen, it becomes\n" - .string "completely helpless.\p" - .string "It will remain frozen after battle.\n" - .string "Thaw it out using an ICE HEAL.$" - -RustboroCity_PokemonSchool_Text_214433: @ 8214433 - .string "Students who don’t study get a little\n" - .string "taste of my QUICK CLAW.\p" - .string "Whether or not you are a good student \n" - .string "will be evident from the way you use\l" - .string "this item.$" - -RustboroCity_PokemonSchool_Text_2144C8: @ 82144C8 - .string "A POKéMON holding the QUICK CLAW will\n" - .string "occasionally speed up and get to move\l" - .string "before its opponent.\p" - .string "There are many other items that are\n" - .string "meant to be held by POKéMON.\p" - .string "Just those alone will give you many\n" - .string "topics to study!$" - -RustboroCity_PokemonSchool_Text_21459F: @ 821459F - .string "I’m trading POKéMON with my friend\n" - .string "right now.$" - -RustboroCity_PokemonSchool_Text_2145CD: @ 82145CD - .string "I always wanted a SEEDOT, and\n" - .string "I’m finally getting one!$" - -RustboroCity_PokemonSchool_Text_214604: @ 8214604 - .string "POKéMON can hold items, but they\n" - .string "don’t know what to do with man-made\l" - .string "items like POTION and ANTIDOTE.$" - -RustboroCity_PokemonSchool_Text_214669: @ 8214669 - .string "You know how some POKéMON moves can\n" - .string "confuse a POKéMON?\p" - .string "A confused POKéMON will sometimes\n" - .string "attack itself without meaning to.\p" - .string "But once it leaves battle, it will\n" - .string "return to normal.$" - -RustboroCity_PokemonSchool_Text_214719: @ 8214719 - .string "A POKéMON holding a BERRY will heal\n" - .string "itself…\p" - .string "There are many kinds of items that\n" - .string "POKéMON can hold…\p" - .string "Boy, it sure is hard taking notes\n" - .string "down…$" - -RustboroCity_PokemonSchool_Text_2147A2: @ 82147A2 - .string "It’s this student’s notebook…\p" - .string "POKéMON are to be caught using\n" - .string "POKé BALLS.\p" - .string "Up to six POKéMON can accompany\n" - .string "a TRAINER.\p" - .string "A TRAINER is someone who catches\n" - .string "POKéMON, raises them, and battles\l" - .string "with them.\p" - .string "A TRAINER’s mission is to defeat\n" - .string "the strong TRAINERS who await\l" - .string "challengers in POKéMON GYMS.$" - -RustboroCity_PokemonSchool_Text_2148C0: @ 82148C0 - .string "Hello? Didn’t we meet before?\n" - .string "I think back in PETALBURG CITY.\p" - .string "Let me introduce myself.\n" - .string "My name’s SCOTT.\p" - .string "I’ve been traveling everywhere in\n" - .string "search of outstanding TRAINERS.\p" - .string "More specifically, I’m looking for\n" - .string "POKéMON battle experts.\p" - .string "So, what brings you to this SCHOOL?\n" - .string "Are you a TRAINER, too?\p" - .string "The first thing you should do is to\n" - .string "have a POKéMON learn the move CUT.\p" - .string "If I remember correctly, someone in\n" - .string "this town has CUT.$" - -RustboroCity_PokemonSchool_Text_214A5F: @ 8214A5F - .string "SCOTT: Hmm…\p" - .string "The talent levels of the students here\n" - .string "are unknown. The potential’s there.$" - -RustboroCity_PokemonSchool_Text_214AB6: @ 8214AB6 - .string "SCOTT: Oh, what’s that?\p" - .string "It’s a STONE BADGE, isn’t it?\n" - .string "That’s pretty impressive, I’d say.\p" - .string "But, you know, I would’ve loved to see\n" - .string "you in battle.\p" - .string "It’s hard to tell what you’re like as\n" - .string "a TRAINER from a LEAGUE BADGE.$" - -RustboroCity_PokemonSchool_Text_214B8A: @ 8214B8A - .string "Hello? Didn’t we meet before?\n" - .string "I think back in PETALBURG CITY.\p" - .string "Let me introduce myself.\n" - .string "My name’s SCOTT.\p" - .string "I’ve been traveling everywhere in\n" - .string "search of outstanding TRAINERS.\p" - .string "More specifically, I’m looking for\n" - .string "POKéMON battle experts.\p" - .string "Oh, what’s that?\n" - .string "It’s a STONE BADGE, isn’t it?\p" - .string "That’s pretty impressive, I’d say, for\n" - .string "a starting TRAINER like yourself.\p" - .string "But, you know, I would’ve loved to see\n" - .string "you in battle.\p" - .string "It’s hard to tell what you’re like as\n" - .string "a TRAINER from a LEAGUE BADGE.$" - diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc deleted file mode 100644 index 5e42be78d..000000000 --- a/data/scripts/maps/RusturfTunnel.inc +++ /dev/null @@ -1,539 +0,0 @@ -RusturfTunnel_MapScripts:: @ 822CE27 - map_script 3, RusturfTunnel_MapScript1_22CE44 - map_script 2, RusturfTunnel_MapScript2_22CE32 - .byte 0 - -RusturfTunnel_MapScript2_22CE32: @ 822CE32 - map_script_2 VAR_0x409A, 4, RusturfTunnel_EventScript_22CEAE - map_script_2 VAR_0x409A, 5, RusturfTunnel_EventScript_22CEAE - .2byte 0 - -RusturfTunnel_MapScript1_22CE44: @ 822CE44 - compare VAR_0x409A, 2 - call_if 1, RusturfTunnel_EventScript_22CE50 - end - -RusturfTunnel_EventScript_22CE50:: @ 822CE50 - setobjectxyperm 7, 13, 4 - setobjectxyperm 6, 13, 5 - return - -RusturfTunnel_EventScript_22CE5F:: @ 822CE5F - lock - faceplayer - msgbox RusturfTunnel_Text_22D7A3, 4 - closemessage - applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2 - waitmovement 0 - release - end - -RusturfTunnel_EventScript_22CE76:: @ 822CE76 - lock - faceplayer - checkflag FLAG_0x001 - goto_eq RusturfTunnel_EventScript_22CE99 - setflag FLAG_0x001 - msgbox RusturfTunnel_Text_22D510, 4 - closemessage - applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2 - waitmovement 0 - release - end - -RusturfTunnel_EventScript_22CE99:: @ 822CE99 - msgbox RusturfTunnel_Text_22D5F3, 4 - closemessage - applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2 - waitmovement 0 - release - end - -RusturfTunnel_EventScript_22CEAE:: @ 822CEAE - lockall - compare VAR_TEMP_1, 1 - call_if 1, RusturfTunnel_EventScript_22CFA7 - compare VAR_TEMP_1, 2 - call_if 1, RusturfTunnel_EventScript_22CFBC - compare VAR_TEMP_1, 3 - call_if 1, RusturfTunnel_EventScript_22CFC7 - call RusturfTunnel_EventScript_22CFFF - msgbox RusturfTunnel_Text_22D65C, 4 - compare VAR_TEMP_1, 2 - call_if 1, RusturfTunnel_EventScript_22CFC8 - compare VAR_TEMP_1, 3 - call_if 1, RusturfTunnel_EventScript_22CFC8 - giveitem_std ITEM_HM04 - setflag FLAG_0x06A - msgbox RusturfTunnel_Text_22D6D2, 4 - closemessage - compare VAR_TEMP_1, 1 - call_if 1, RusturfTunnel_EventScript_22CF5D - compare VAR_TEMP_1, 2 - call_if 1, RusturfTunnel_EventScript_22CF6F - compare VAR_TEMP_1, 3 - call_if 1, RusturfTunnel_EventScript_22CF8B - msgbox RusturfTunnel_Text_22D745, 4 - closemessage - compare VAR_TEMP_1, 1 - call_if 1, RusturfTunnel_EventScript_22CFD4 - compare VAR_TEMP_1, 2 - call_if 1, RusturfTunnel_EventScript_22CFE6 - compare VAR_TEMP_1, 3 - call_if 1, RusturfTunnel_EventScript_22CFE6 - call RusturfTunnel_EventScript_272216 - releaseall - end - -RusturfTunnel_EventScript_22CF5D:: @ 822CF5D - applymovement 255, RusturfTunnel_Movement_22D042 - applymovement 1, RusturfTunnel_Movement_22D067 - waitmovement 0 - return - -RusturfTunnel_EventScript_22CF6F:: @ 822CF6F - applymovement 255, RusturfTunnel_Movement_22D045 - applymovement 1, RusturfTunnel_Movement_22D06C - waitmovement 0 - applymovement 10, RusturfTunnel_Movement_2725AA - waitmovement 0 - return - -RusturfTunnel_EventScript_22CF8B:: @ 822CF8B - applymovement 255, RusturfTunnel_Movement_22D045 - applymovement 1, RusturfTunnel_Movement_22D06C - waitmovement 0 - applymovement 10, RusturfTunnel_Movement_2725AA - waitmovement 0 - return - -RusturfTunnel_EventScript_22CFA7:: @ 822CFA7 - applymovement 1, RusturfTunnel_Movement_2725A6 - waitmovement 0 - applymovement 255, RusturfTunnel_Movement_2725AA - waitmovement 0 - return - -RusturfTunnel_EventScript_22CFBC:: @ 822CFBC - applymovement 1, RusturfTunnel_Movement_22D048 - waitmovement 0 - return - -RusturfTunnel_EventScript_22CFC7:: @ 822CFC7 - return - -RusturfTunnel_EventScript_22CFC8:: @ 822CFC8 - closemessage - applymovement 1, RusturfTunnel_Movement_22D065 - waitmovement 0 - return - -RusturfTunnel_EventScript_22CFD4:: @ 822CFD4 - applymovement 10, RusturfTunnel_Movement_22D017 - applymovement 1, RusturfTunnel_Movement_22D04B - waitmovement 0 - return - -RusturfTunnel_EventScript_22CFE6:: @ 822CFE6 - applymovement 255, RusturfTunnel_Movement_22D02F - applymovement 10, RusturfTunnel_Movement_22D023 - applymovement 1, RusturfTunnel_Movement_22D058 - waitmovement 0 - return - -RusturfTunnel_EventScript_22CFFF:: @ 822CFFF - playse SE_PIN - applymovement 1, RusturfTunnel_Movement_272598 - waitmovement 0 - applymovement 1, RusturfTunnel_Movement_27259A - waitmovement 0 - return - -RusturfTunnel_Movement_22D017: @ 822D017 - 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 - 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 - delay_8 - walk_in_place_fastest_up - delay_16 - delay_16 - walk_in_place_fastest_right - step_end - -RusturfTunnel_Movement_22D035: @ 822D035 - walk_left - walk_in_place_fastest_right - step_end - -RusturfTunnel_Movement_22D038: @ 822D038 - walk_down - walk_in_place_fastest_up - delay_8 - walk_in_place_fastest_right - step_end - -RusturfTunnel_Movement_22D03D: @ 822D03D - walk_up - walk_in_place_fastest_down - delay_8 - walk_in_place_fastest_right - step_end - -RusturfTunnel_Movement_22D042: @ 822D042 - walk_left - walk_in_place_fastest_right - step_end - -RusturfTunnel_Movement_22D045: @ 822D045 - walk_right - walk_in_place_fastest_left - step_end - -RusturfTunnel_Movement_22D048: @ 822D048 - walk_up - walk_in_place_fastest_right - step_end - -RusturfTunnel_Movement_22D04B: @ 822D04B - 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 - 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 - walk_right - step_end - -RusturfTunnel_Movement_22D067: @ 822D067 - walk_in_place_fast_up - walk_in_place_fast_up - walk_fast_up - walk_fast_right - step_end - -RusturfTunnel_Movement_22D06C: @ 822D06C - walk_in_place_fast_right - walk_in_place_fast_right - walk_fast_right - walk_in_place_fastest_up - step_end - -RusturfTunnel_EventScript_22D071:: @ 822D071 - setvar VAR_TEMP_1, 1 - end - -RusturfTunnel_EventScript_22D077:: @ 822D077 - setvar VAR_TEMP_1, 2 - end - -RusturfTunnel_EventScript_22D07D:: @ 822D07D - setvar VAR_TEMP_1, 3 - end - -RusturfTunnel_EventScript_22D083:: @ 822D083 - lockall - msgbox RusturfTunnel_Text_22D1C8, 4 - closemessage - applymovement 6, RusturfTunnel_Movement_22D0AB - applymovement 7, RusturfTunnel_Movement_22D0AB - waitmovement 0 - moveobjectoffscreen 6 - moveobjectoffscreen 7 - setvar VAR_0x409A, 3 - releaseall - end - -RusturfTunnel_Movement_22D0AB: @ 822D0AB - lock_facing_direction - walk_right - unlock_facing_direction - step_end - -RusturfTunnel_EventScript_22D0AF:: @ 822D0AF - lock - faceplayer - waitse - playmoncry SPECIES_WINGULL, 0 - msgbox RusturfTunnel_Text_22D1F7, 4 - waitmoncry - release - end - -RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 - lock - faceplayer - playbgm MUS_AQA_0, 0 - msgbox RusturfTunnel_Text_22D20A, 4 - trainerbattle 3, TRAINER_GRUNT_10, 0, RusturfTunnel_Text_22D2B0 - msgbox RusturfTunnel_Text_22D2E1, 4 - giveitem_std ITEM_DEVON_GOODS - closemessage - applymovement 255, RusturfTunnel_Movement_22D178 - applymovement 6, RusturfTunnel_Movement_22D181 - waitmovement 0 - removeobject 6 - delay 50 - addobject 5 - applymovement 5, RusturfTunnel_Movement_22D18B - waitmovement 0 - applymovement 255, RusturfTunnel_Movement_22D17E - applymovement 5, RusturfTunnel_Movement_22D1A4 - waitmovement 0 - msgbox RusturfTunnel_Text_22D395, 4 - applymovement 5, RusturfTunnel_Movement_27259E - waitmovement 0 - message RusturfTunnel_Text_22D3BA - waitmessage - waitse - playmoncry SPECIES_WINGULL, 0 - waitbuttonpress - waitmoncry - closemessage - applymovement 255, RusturfTunnel_Movement_22D19F - applymovement 5, RusturfTunnel_Movement_22D193 - applymovement 7, RusturfTunnel_Movement_22D1A7 - waitmovement 0 - removeobject 5 - removeobject 7 - clearflag FLAG_0x08E - setflag FLAG_0x08F - setvar VAR_0x405A, 4 - setvar VAR_0x4090, 1 - setflag FLAG_0x37B - release - end - -RusturfTunnel_Movement_22D178: @ 822D178 - face_down - lock_facing_direction - walk_up - unlock_facing_direction - walk_in_place_fastest_left - step_end - -RusturfTunnel_Movement_22D17E: @ 822D17E - walk_down - walk_in_place_fastest_up - step_end - -RusturfTunnel_Movement_22D181: @ 822D181 - 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 - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - step_end - -RusturfTunnel_Movement_22D193: @ 822D193 - 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 - delay_16 - delay_8 - delay_4 - walk_in_place_fastest_left - step_end - -RusturfTunnel_Movement_22D1A4: @ 822D1A4 - delay_16 - walk_right - step_end - -RusturfTunnel_Movement_22D1A7: @ 822D1A7 - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - step_end - -RusturfTunnel_EventScript_22D1B1:: @ 822D1B1 - trainerbattle 0, TRAINER_MIKE_2, 0, RusturfTunnel_Text_22D84D, RusturfTunnel_Text_22D8DB - msgbox RusturfTunnel_Text_22D8F9, 6 - end - -RusturfTunnel_Text_22D1C8: @ 822D1C8 - .string "What, are you coming?\n" - .string "Come and get some, then!$" - -RusturfTunnel_Text_22D1F7: @ 822D1F7 - .string "PEEKO: Pii pihyoh!$" - -RusturfTunnel_Text_22D20A: @ 822D20A - .string "Grah, keelhaul it all!\p" - .string "That hostage POKéMON turned out to\n" - .string "be worthless!\p" - .string "And to think I made a getaway…\n" - .string "In this tunnel to nowhere!\p" - .string "Hey! You!\n" - .string "So you want to battle me?$" - -RusturfTunnel_Text_22D2B0: @ 822D2B0 - .string "Urrrggh! My career in crime comes to\n" - .string "a dead end!$" - -RusturfTunnel_Text_22D2E1: @ 822D2E1 - .string "This is plain not right…\p" - .string "The BOSS told me this would be a\n" - .string "slick-and-easy job to pull.\p" - .string "All I had to do was steal some package\n" - .string "from DEVON.\p" - .string "Tch!\n" - .string "You want it back that badly, take it!$" - -RusturfTunnel_Text_22D395: @ 822D395 - .string "PEEKO!\n" - .string "Am I glad to see you’re safe!$" - -RusturfTunnel_Text_22D3BA: @ 822D3BA - .string "PEEKO owes her life to you!\p" - .string "They call me MR. BRINEY.\n" - .string "And, you are?\p" - .string "… … … … … … … …\n" - .string "… … … … … … … …\p" - .string "Ah, so you are {PLAYER}{KUN}!\n" - .string "I sincerely thank you!\p" - .string "Now, if there’s anything that troubles\n" - .string "you, don’t hesitate to tell me!\p" - .string "You can usually find me in my cottage\n" - .string "by the sea near PETALBURG WOODS.\p" - .string "Come, PEEKO, we should make our way\n" - .string "home.\p" - .string "PEEKO: Pihyoh!$" - -RusturfTunnel_Text_22D510: @ 822D510 - .string "… …\p" - .string "Why can’t they keep digging?\n" - .string "Is the bedrock too hard?\p" - .string "My beloved awaits me in VERDANTURF\n" - .string "TOWN just beyond here…\p" - .string "If RUSTBORO and VERDANTURF were\n" - .string "joined by this tunnel, I could visit\l" - .string "her every day…\p" - .string "But this…\n" - .string "What am I to do?$" - -RusturfTunnel_Text_22D5F3: @ 822D5F3 - .string "To get from RUSTBORO to VERDANTURF,\n" - .string "you need to go to DEWFORD, then pass\l" - .string "through SLATEPORT and MAUVILLE…$" - -RusturfTunnel_Text_22D65C: @ 822D65C - .string "Wow! You shattered that boulder\n" - .string "blocking the way.\p" - .string "To show you how much I appreciate it,\n" - .string "I’d like you to have this HM.$" - -RusturfTunnel_Text_22D6D2: @ 822D6D2 - .string "That HM contains STRENGTH.\p" - .string "If a muscular POKéMON were to learn\n" - .string "that, it would be able to move even\l" - .string "large boulders.$" - -RusturfTunnel_Text_22D745: @ 822D745 - .string "WANDA!\n" - .string "Now I can see you anytime!\p" - .string "WANDA: That’s…wonderful.\p" - .string "Please, take some rest at my home.$" - -RusturfTunnel_Text_22D7A3: @ 822D7A3 - .string "On the other side of this rock…\n" - .string "My boyfriend is there.\p" - .string "He… He’s not just digging the tunnel\n" - .string "to come see me.\p" - .string "He works his hands raw and rough\n" - .string "for the benefit of everyone.$" - -RusturfTunnel_Text_22D84D: @ 822D84D - .string "What do you call a wild man up in the\n" - .string "mountains? A mountain man, right?\p" - .string "So why don’t they call a POKéMON in\n" - .string "the mountains a mountain POKéMON?$" - -RusturfTunnel_Text_22D8DB: @ 822D8DB - .string "My POKéMON…\n" - .string "Ran out of power…$" - -RusturfTunnel_Text_22D8F9: @ 822D8F9 - .string "They halted development here to\n" - .string "protect POKéMON, right?\l" - .string "There’s a feel-good story!$" - diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc deleted file mode 100644 index 2e1b4cfa4..000000000 --- a/data/scripts/maps/SSTidalCorridor.inc +++ /dev/null @@ -1,356 +0,0 @@ -SSTidalCorridor_MapScripts:: @ 823BFCF - map_script 2, SSTidalCorridor_MapScript2_23BFD5 - .byte 0 - -SSTidalCorridor_MapScript2_23BFD5: @ 823BFD5 - map_script_2 VAR_0x40D4, 0, SSTidalCorridor_EventScript_23C219 - map_script_2 VAR_PORTHOLE, 1, SSTidalCorridor_EventScript_23BFFF - map_script_2 VAR_PORTHOLE, 5, SSTidalCorridor_EventScript_23C015 - map_script_2 VAR_PORTHOLE, 9, SSTidalCorridor_EventScript_23C067 - map_script_2 VAR_PORTHOLE, 10, SSTidalCorridor_EventScript_23C07D - .2byte 0 - -SSTidalCorridor_EventScript_23BFFF:: @ 823BFFF - special SetSSTidalFlag - setvar VAR_PORTHOLE, 2 - lockall - playse SE_PINPON - msgbox SSTidalCorridor_Text_23C462, 4 - releaseall - end - -SSTidalCorridor_EventScript_23C015:: @ 823C015 - setvar VAR_PORTHOLE, 6 - lockall - playse SE_PINPON - msgbox SSTidalCorridor_Text_23C4E3, 4 - releaseall - end - -SSTidalRooms_EventScript_23C028:: @ 823C028 - special SetSSTidalFlag - setvar VAR_PORTHOLE, 7 - playse SE_PINPON - msgbox SSTidalRooms_Text_23C462, 4 - return - -SSTidalRooms_EventScript_23C03C:: @ 823C03C - special ResetSSTidalFlag - setvar VAR_PORTHOLE, 4 - playse SE_PINPON - msgbox SSTidalRooms_Text_23C553, 4 - return - -SSTidalCorridor_EventScript_23C050:: @ 823C050 - compare VAR_PORTHOLE, 2 - goto_eq SSTidalCorridor_EventScript_23C067 - compare VAR_PORTHOLE, 7 - goto_eq SSTidalCorridor_EventScript_23C07D - end - -SSTidalCorridor_EventScript_23C067:: @ 823C067 - special ResetSSTidalFlag - setvar VAR_PORTHOLE, 3 - lockall - playse SE_PINPON - msgbox SSTidalCorridor_Text_23C4E3, 4 - releaseall - end - -SSTidalCorridor_EventScript_23C07D:: @ 823C07D - special ResetSSTidalFlag - setvar VAR_PORTHOLE, 8 - lockall - playse SE_PINPON - msgbox SSTidalCorridor_Text_23C50F, 4 - releaseall - end - -SSTidalRooms_EventScript_23C093:: @ 823C093 - special ResetSSTidalFlag - setvar VAR_PORTHOLE, 8 - playse SE_PINPON - msgbox SSTidalRooms_Text_23C50F, 4 - return - -SSTidalRooms_EventScript_23C0A7:: @ 823C0A7 - switch VAR_PORTHOLE - case 2, SSTidalRooms_EventScript_23C03C - case 3, SSTidalRooms_EventScript_23C03C - case 6, SSTidalRooms_EventScript_23C028 - case 7, SSTidalRooms_EventScript_23C093 - return - -SSTidalCorridor_EventScript_23C0D9:: @ 823C0D9 - msgbox SSTidalCorridor_Text_23C6EC, 2 - end - -SSTidalCorridor_EventScript_23C0E2:: @ 823C0E2 - lock - faceplayer - waitse - playmoncry SPECIES_WINGULL, 0 - msgbox SSTidalCorridor_Text_23C7E1, 4 - waitmoncry - release - end - -SSTidalCorridor_EventScript_23C0F5:: @ 823C0F5 - msgbox SSTidalCorridor_Text_23C7F8, 3 - end - -SSTidalCorridor_EventScript_23C0FE:: @ 823C0FE - msgbox SSTidalCorridor_Text_23C800, 3 - end - -SSTidalCorridor_EventScript_23C107:: @ 823C107 - msgbox SSTidalCorridor_Text_23C808, 3 - end - -SSTidalCorridor_EventScript_23C110:: @ 823C110 - msgbox SSTidalCorridor_Text_23C810, 3 - end - -SSTidalCorridor_EventScript_23C119:: @ 823C119 - lock - faceplayer - compare VAR_PORTHOLE, 4 - goto_eq SSTidalCorridor_EventScript_23C13B - compare VAR_PORTHOLE, 8 - goto_eq SSTidalCorridor_EventScript_23C15A - msgbox SSTidalCorridor_Text_23C596, 4 - release - end - -SSTidalCorridor_EventScript_23C13B:: @ 823C13B - setrespawn 8 - msgbox SSTidalCorridor_Text_23C64F, 4 - checkflag FLAG_0x104 - call_if 1, SSTidalCorridor_EventScript_23C179 - warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 - waitstate - release - end - -SSTidalCorridor_EventScript_23C15A:: @ 823C15A - setrespawn 4 - msgbox SSTidalCorridor_Text_23C64F, 4 - checkflag FLAG_0x104 - call_if 1, SSTidalCorridor_EventScript_23C179 - warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 - waitstate - release - end - -SSTidalCorridor_EventScript_23C179:: @ 823C179 - setflag FLAG_0x3B7 - return - -SSTidalCorridor_EventScript_23C17D:: @ 823C17D - lockall - compare VAR_PORTHOLE, 2 - goto_eq SSTidalCorridor_EventScript_23C19E - compare VAR_PORTHOLE, 7 - goto_eq SSTidalCorridor_EventScript_23C19E - msgbox SSTidalCorridor_Text_23C6C3, 4 - releaseall - end - -SSTidalCorridor_EventScript_23C19E:: @ 823C19E - special sub_80FB7A4 - waitstate - end - -SSTidalCorridor_EventScript_23C1A3:: @ 823C1A3 - lock - faceplayer - checkflag FLAG_0x0F7 - goto_eq SSTidalCorridor_EventScript_23C1BD - call SSTidalCorridor_EventScript_23C1C7 - msgbox SSTidalCorridor_Text_23C65E, 4 - release - end - -SSTidalCorridor_EventScript_23C1BD:: @ 823C1BD - msgbox SSTidalCorridor_Text_23C6B0, 4 - release - end - -SSTidalCorridor_EventScript_23C1C7:: @ 823C1C7 - checktrainerflag TRAINER_PHILLIP - goto_if 0, SSTidalCorridor_EventScript_23C218 - checktrainerflag TRAINER_LEONARD - goto_if 0, SSTidalCorridor_EventScript_23C218 - checktrainerflag TRAINER_COLTON - goto_if 0, SSTidalCorridor_EventScript_23C218 - checktrainerflag TRAINER_MICAH - goto_if 0, SSTidalCorridor_EventScript_23C218 - checktrainerflag TRAINER_THOMAS - goto_if 0, SSTidalCorridor_EventScript_23C218 - checktrainerflag TRAINER_LEA_AND_JED - goto_if 0, SSTidalCorridor_EventScript_23C218 - checktrainerflag TRAINER_GARRET - goto_if 0, SSTidalCorridor_EventScript_23C218 - checktrainerflag TRAINER_NAOMI - goto_if 0, SSTidalCorridor_EventScript_23C218 - setflag FLAG_0x0F7 - goto SSTidalCorridor_EventScript_23C1BD - return - -SSTidalCorridor_EventScript_23C218:: @ 823C218 - return - -SSTidalCorridor_EventScript_23C219:: @ 823C219 - lockall - applymovement 5, SSTidalCorridor_Movement_23C26D - waitmovement 0 - applymovement 255, SSTidalCorridor_Movement_2725A8 - waitmovement 0 - msgbox SSTidalCorridor_Text_23C28F, 4 - closemessage - applymovement 255, SSTidalCorridor_Movement_23C27D - applymovement 1, SSTidalCorridor_Movement_23C284 - applymovement 5, SSTidalCorridor_Movement_23C275 - waitmovement 0 - playse SE_KAIDAN - waitse - removeobject 5 - applymovement 1, SSTidalCorridor_Movement_23C28B - waitmovement 0 - delay 30 - setflag FLAG_0x1D0 - setvar VAR_0x40D4, 1 - releaseall - end - -SSTidalCorridor_Movement_23C26D: @ 823C26D - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - step_end - -SSTidalCorridor_Movement_23C275: @ 823C275 - walk_in_place_fastest_down - delay_16 - delay_16 - delay_16 - delay_16 - walk_down - walk_left - step_end - -SSTidalCorridor_Movement_23C27D: @ 823C27D - delay_16 - delay_16 - delay_16 - delay_16 - delay_8 - walk_in_place_fastest_down - step_end - -SSTidalCorridor_Movement_23C284: @ 823C284 - delay_16 - walk_right - walk_right - walk_in_place_fastest_up - delay_16 - walk_in_place_fastest_left - step_end - -SSTidalCorridor_Movement_23C28B: @ 823C28B - walk_left - walk_left - walk_in_place_fastest_up - step_end - -SSTidalCorridor_Text_23C28F: @ 823C28F - .string "SCOTT: Well, hi, hi!\n" - .string "{PLAYER}{KUN}, {PLAYER}{KUN}!\p" - .string "Something’s come up, so I have to\n" - .string "disembark, but am I glad to see you!\p" - .string "Congratulations, LEAGUE CHAMPION!\p" - .string "There’s a place I’d like to invite\n" - .string "someone like you.\p" - .string "It’s the…\n" - .string "BATTLE FRONTIER!\p" - .string "What’s the place like?\n" - .string "You’ll understand when you see it!\p" - .string "I’ve spoken with the ship’s CAPTAIN\n" - .string "about this.\p" - .string "The next time you take a ferry,\n" - .string "you should be able to sail to\l" - .string "the BATTLE FRONTIER.\p" - .string "Okay, {PLAYER}{KUN}, I’ll be waiting for you\n" - .string "at the BATTLE FRONTIER!$" - -SSTidalCorridor_Text_23C462: @ 823C462 -SSTidalRooms_Text_23C462: @ 823C462 - .string "This ferry is built to plow through\n" - .string "fast-running currents.\p" - .string "We hope you enjoy your voyage with us.\n" - .string "Feel free to explore the ship.$" - -SSTidalCorridor_Text_23C4E3: @ 823C4E3 - .string "We hope you enjoy your voyage on\n" - .string "our ferry.$" - -SSTidalCorridor_Text_23C50F: @ 823C50F -SSTidalRooms_Text_23C50F: @ 823C50F - .string "We have made land in SLATEPORT CITY.\n" - .string "Thank you for sailing with us.$" - -SSTidalRooms_Text_23C553: @ 823C553 - .string "We have made land in LILYCOVE CITY.\n" - .string "Thank you for sailing with us.$" - -SSTidalCorridor_Text_23C596: @ 823C596 - .string "It’ll be some time before we make land,\n" - .string "I reckon.\p" - .string "You can rest up in your cabin if you’d\n" - .string "like. Your cabin’s No. 2.\p" - .string "The bed in there is soft and plushy.\n" - .string "I can attest to how comfy it is!$" - -SSTidalCorridor_Text_23C64F: @ 823C64F - .string "We’ve arrived!$" - -SSTidalCorridor_Text_23C65E: @ 823C65E - .string "Go visit other cabins.\n" - .string "TRAINERS bored of the boat trip will\l" - .string "be itching to battle.$" - -SSTidalCorridor_Text_23C6B0: @ 823C6B0 - .string "Enjoy your cruise!$" - -SSTidalCorridor_Text_23C6C3: @ 823C6C3 - .string "The horizon spreads beyond\n" - .string "the porthole.$" - -SSTidalCorridor_Text_23C6EC: @ 823C6EC - .string "MR. BRINEY: Welcome aboard, {PLAYER}{KUN}!\p" - .string "They made me honorary captain of\n" - .string "the S.S. TIDAL!\p" - .string "You can call me CAPTAIN BRINEY now!\p" - .string "You know, I retired once before,\n" - .string "but when I saw this majestic ship…\p" - .string "Let me just say, it stirred my sleeping\n" - .string "soul as a sailor!$" - -SSTidalCorridor_Text_23C7E1: @ 823C7E1 - .string "PEEKO: Pihyo pihyohyo…$" - -SSTidalCorridor_Text_23C7F8: @ 823C7F8 - .string "Cabin 1$" - -SSTidalCorridor_Text_23C800: @ 823C800 - .string "Cabin 2$" - -SSTidalCorridor_Text_23C808: @ 823C808 - .string "Cabin 3$" - -SSTidalCorridor_Text_23C810: @ 823C810 - .string "Cabin 4$" diff --git a/data/scripts/maps/SSTidalLowerDeck.inc b/data/scripts/maps/SSTidalLowerDeck.inc deleted file mode 100644 index 2ad1ed580..000000000 --- a/data/scripts/maps/SSTidalLowerDeck.inc +++ /dev/null @@ -1,39 +0,0 @@ -SSTidalLowerDeck_MapScripts:: @ 823C818 - .byte 0 - -SSTidalLowerDeck_EventScript_23C819:: @ 823C819 - trainerbattle 0, TRAINER_PHILLIP, 0, SSTidalLowerDeck_Text_23C847, SSTidalLowerDeck_Text_23C8A0 - msgbox SSTidalLowerDeck_Text_23C8B4, 6 - end - -SSTidalLowerDeck_EventScript_23C830:: @ 823C830 - trainerbattle 0, TRAINER_LEONARD, 0, SSTidalLowerDeck_Text_23C917, SSTidalLowerDeck_Text_23C97D - msgbox SSTidalLowerDeck_Text_23C98E, 6 - end - -SSTidalLowerDeck_Text_23C847: @ 823C847 - .string "Arrrgh! I’m fed up and dog-tired of\n" - .string "cleaning this huge place!\p" - .string "Let’s have a quick battle!$" - -SSTidalLowerDeck_Text_23C8A0: @ 823C8A0 - .string "Little bro, I lost!$" - -SSTidalLowerDeck_Text_23C8B4: @ 823C8B4 - .string "We’re the CLEANUP BROTHERS!\p" - .string "The old one dumps the detergent,\n" - .string "and the young one does the scrubbing!$" - -SSTidalLowerDeck_Text_23C917: @ 823C917 - .string "This is the bottom of the ship’s hull.\n" - .string "There’s plenty of room.\l" - .string "It’ll be alright for a POKéMON battle.$" - -SSTidalLowerDeck_Text_23C97D: @ 823C97D - .string "Big bro, I lost!$" - -SSTidalLowerDeck_Text_23C98E: @ 823C98E - .string "We’re the CLEANUP BROTHERS!\p" - .string "The old one dumps the detergent,\n" - .string "and the young one does the scrubbing!$" - diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/scripts/maps/SSTidalRooms.inc deleted file mode 100644 index 39c453e98..000000000 --- a/data/scripts/maps/SSTidalRooms.inc +++ /dev/null @@ -1,177 +0,0 @@ -SSTidalRooms_MapScripts:: @ 823C9F1 - .byte 0 - -SSTidalRooms_EventScript_23C9F2:: @ 823C9F2 - lock - faceplayer - checkflag FLAG_0x104 - goto_eq SSTidalRooms_EventScript_23CA29 - msgbox SSTidalRooms_Text_23D098, 4 - giveitem_std ITEM_TM49 - compare VAR_RESULT, 0 - goto_eq SSTidalRooms_EventScript_272054 - setflag FLAG_0x104 - msgbox SSTidalRooms_Text_23D145, 4 - release - end - -SSTidalRooms_EventScript_23CA29:: @ 823CA29 - msgbox SSTidalRooms_Text_23D145, 4 - release - end - -SSTidalRooms_EventScript_23CA33:: @ 823CA33 - lockall - msgbox SSTidalRooms_Text_23CAF2, 4 - closemessage - call SSTidalRooms_EventScript_272083 - call SSTidalRooms_EventScript_23C0A7 - releaseall - end - -SSTidalRooms_EventScript_23CA49:: @ 823CA49 - trainerbattle 0, TRAINER_COLTON, 0, SSTidalRooms_Text_23CB14, SSTidalRooms_Text_23CB58 - msgbox SSTidalRooms_Text_23CB75, 6 - end - -SSTidalRooms_EventScript_23CA60:: @ 823CA60 - trainerbattle 0, TRAINER_MICAH, 0, SSTidalRooms_Text_23CBEB, SSTidalRooms_Text_23CC04 - msgbox SSTidalRooms_Text_23CC26, 6 - end - -SSTidalRooms_EventScript_23CA77:: @ 823CA77 - trainerbattle 0, TRAINER_THOMAS, 0, SSTidalRooms_Text_23CC68, SSTidalRooms_Text_23CC8A - msgbox SSTidalRooms_Text_23CCBB, 6 - end - -SSTidalRooms_EventScript_23CA8E:: @ 823CA8E - trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_23CD04, SSTidalRooms_Text_23CD54, SSTidalRooms_Text_23CDC6 - msgbox SSTidalRooms_Text_23CD5F, 6 - end - -SSTidalRooms_EventScript_23CAA9:: @ 823CAA9 - trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_23CE04, SSTidalRooms_Text_23CE4B, SSTidalRooms_Text_23CEB0 - msgbox SSTidalRooms_Text_23CE59, 6 - end - -SSTidalRooms_EventScript_23CAC4:: @ 823CAC4 - trainerbattle 0, TRAINER_GARRET, 0, SSTidalRooms_Text_23CEEE, SSTidalRooms_Text_23CF36 - msgbox SSTidalRooms_Text_23CF45, 6 - end - -SSTidalRooms_EventScript_23CADB:: @ 823CADB - trainerbattle 0, TRAINER_NAOMI, 0, SSTidalRooms_Text_23CF97, SSTidalRooms_Text_23CFF4 - msgbox SSTidalRooms_Text_23D013, 6 - end - -SSTidalRooms_Text_23CAF2: @ 823CAF2 - .string "There’s a bed…\n" - .string "Let’s take a rest.$" - -SSTidalRooms_Text_23CB14: @ 823CB14 - .string "I often sail to LILYCOVE CITY.\p" - .string "I enjoy attending CONTESTS,\n" - .string "you see.$" - -SSTidalRooms_Text_23CB58: @ 823CB58 - .string "That was an enjoyable match!$" - -SSTidalRooms_Text_23CB75: @ 823CB75 - .string "I get so excited imagining what kinds\n" - .string "of POKéMON I’ll get to see in the next\l" - .string "CONTEST. The anticipation of it thrills!$" - -SSTidalRooms_Text_23CBEB: @ 823CBEB - .string "Are your friends strong?$" - -SSTidalRooms_Text_23CC04: @ 823CC04 - .string "Your friends are, indeed, strong.$" - -SSTidalRooms_Text_23CC26: @ 823CC26 - .string "Friends need not be human.\n" - .string "For me, POKéMON are treasured friends!$" - -SSTidalRooms_Text_23CC68: @ 823CC68 - .string "Child…\n" - .string "Did you knock on the door?$" - -SSTidalRooms_Text_23CC8A: @ 823CC8A - .string "A loss is to be accepted without haste\n" - .string "or panic.$" - -SSTidalRooms_Text_23CCBB: @ 823CCBB - .string "To be never ruffled in any situation is\n" - .string "the GENTLEMAN’s code of conduct.$" - -SSTidalRooms_Text_23CD04: @ 823CD04 - .string "JED: I feel a little shy about this, but…\n" - .string "We’ll show you our lovey-dovey power!$" - -SSTidalRooms_Text_23CD54: @ 823CD54 - .string "JED: Sigh…$" - -SSTidalRooms_Text_23CD5F: @ 823CD5F - .string "JED: It’s the first time that our lovey-\n" - .string "dovey power couldn’t prevail!\l" - .string "You must be an awesome TRAINER!$" - -SSTidalRooms_Text_23CDC6: @ 823CDC6 - .string "JED: You only have one POKéMON?\n" - .string "Isn’t that just too lonesome?$" - -SSTidalRooms_Text_23CE04: @ 823CE04 - .string "LEA: I feel a little silly, but…\n" - .string "We’ll show you our lovey-dovey power!$" - -SSTidalRooms_Text_23CE4B: @ 823CE4B - .string "LEA: Oh, boo!$" - -SSTidalRooms_Text_23CE59: @ 823CE59 - .string "LEA: I can’t believe it!\n" - .string "Our lovey-dovey power failed…\l" - .string "You must be an awesome TRAINER!$" - -SSTidalRooms_Text_23CEB0: @ 823CEB0 - .string "LEA: I wanted to battle…\n" - .string "But you don’t even have two POKéMON…$" - -SSTidalRooms_Text_23CEEE: @ 823CEEE - .string "Ah, you’ve come just in time.\p" - .string "I’m bored, you see.\n" - .string "You may entertain me.$" - -SSTidalRooms_Text_23CF36: @ 823CF36 - .string "…That will do.$" - -SSTidalRooms_Text_23CF45: @ 823CF45 - .string "Perhaps I shall get Father to acquire\n" - .string "a yacht for me.\l" - .string "A yacht for me and POKéMON!$" - -SSTidalRooms_Text_23CF97: @ 823CF97 - .string "Oh, you’re such an adorable TRAINER.\n" - .string "Would you like to have tea?\l" - .string "Or would you rather battle?$" - -SSTidalRooms_Text_23CFF4: @ 823CFF4 - .string "I see.\n" - .string "You’re the active sort.$" - -SSTidalRooms_Text_23D013: @ 823D013 - .string "A world cruise on a luxury liner has its\n" - .string "charms, I must say…\p" - .string "But, I will admit there is an appealing\n" - .string "side to touring HOENN by ferry.$" - -SSTidalRooms_Text_23D098: @ 823D098 - .string "Uh… Hi! I… I’m not acting suspicious!\n" - .string "Uh… You can have this! For free!\p" - .string "It… Honestly, I didn’t SNATCH it from\n" - .string "someone! I’d never do such a thing!\l" - .string "It’s clean! You can use it!$" - -SSTidalRooms_Text_23D145: @ 823D145 - .string "SNATCH steals the beneficial effects\n" - .string "of certain moves before they can be\l" - .string "used by a foe or ally.$" - diff --git a/data/scripts/maps/SafariZone_North.inc b/data/scripts/maps/SafariZone_North.inc deleted file mode 100644 index a96b6b95d..000000000 --- a/data/scripts/maps/SafariZone_North.inc +++ /dev/null @@ -1,11 +0,0 @@ -SafariZone_North_MapScripts:: @ 823D253 - .byte 0 - -SafariZone_North_EventScript_23D254:: @ 823D254 - msgbox SafariZone_North_Text_2A5489, 2 - end - -SafariZone_North_EventScript_23D25D:: @ 823D25D - msgbox SafariZone_North_Text_2A54F0, 2 - end - diff --git a/data/scripts/maps/SafariZone_Northeast.inc b/data/scripts/maps/SafariZone_Northeast.inc deleted file mode 100644 index 207e2a584..000000000 --- a/data/scripts/maps/SafariZone_Northeast.inc +++ /dev/null @@ -1,3 +0,0 @@ -SafariZone_Northeast_MapScripts:: @ 8242C02 - .byte 0 - diff --git a/data/scripts/maps/SafariZone_Northwest.inc b/data/scripts/maps/SafariZone_Northwest.inc deleted file mode 100644 index 34e510237..000000000 --- a/data/scripts/maps/SafariZone_Northwest.inc +++ /dev/null @@ -1,7 +0,0 @@ -SafariZone_Northwest_MapScripts:: @ 823D249 - .byte 0 - -SafariZone_Northwest_EventScript_23D24A:: @ 823D24A - msgbox SafariZone_Northwest_Text_2A542C, 2 - end - diff --git a/data/scripts/maps/SafariZone_RestHouse.inc b/data/scripts/maps/SafariZone_RestHouse.inc deleted file mode 100644 index 22657eeb1..000000000 --- a/data/scripts/maps/SafariZone_RestHouse.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_RestHouse_MapScripts:: @ 8242BE6 - .byte 0 - -SafariZone_RestHouse_EventScript_242BE7:: @ 8242BE7 - msgbox SafariZone_RestHouse_Text_2A5639, 2 - end - -SafariZone_RestHouse_EventScript_242BF0:: @ 8242BF0 - msgbox SafariZone_RestHouse_Text_2A56E1, 2 - end - -SafariZone_RestHouse_EventScript_242BF9:: @ 8242BF9 - msgbox SafariZone_RestHouse_Text_2A5764, 2 - end - diff --git a/data/scripts/maps/SafariZone_South.inc b/data/scripts/maps/SafariZone_South.inc deleted file mode 100644 index 19f51b873..000000000 --- a/data/scripts/maps/SafariZone_South.inc +++ /dev/null @@ -1,154 +0,0 @@ -SafariZone_South_MapScripts:: @ 823D279 - map_script 3, SafariZone_South_MapScript1_23D2B1 - map_script 2, SafariZone_South_MapScript2_23D284 - .byte 0 - -SafariZone_South_MapScript2_23D284: @ 823D284 - map_script_2 VAR_0x40A4, 2, SafariZone_South_EventScript_23D28E - .2byte 0 - -SafariZone_South_EventScript_23D28E:: @ 823D28E - lockall - applymovement 255, SafariZone_South_Movement_23D2C5 - waitmovement 0 - applymovement 1, SafariZone_South_Movement_23D2C7 - waitmovement 0 - setobjectxyperm 1, 32, 34 - setvar VAR_0x40A4, 0 - releaseall - end - -SafariZone_South_MapScript1_23D2B1: @ 823D2B1 - compare VAR_0x40A4, 2 - call_if 1, SafariZone_South_EventScript_23D2BD - end - -SafariZone_South_EventScript_23D2BD:: @ 823D2BD - setobjectxyperm 1, 31, 34 - return - -SafariZone_South_Movement_23D2C5: @ 823D2C5 - walk_down - step_end - -SafariZone_South_Movement_23D2C7: @ 823D2C7 - walk_right - walk_in_place_fastest_down - step_end - -SafariZone_South_EventScript_23D2CA:: @ 823D2CA - msgbox SafariZone_South_Text_2A52EF, 2 - end - -SafariZone_South_EventScript_23D2D3:: @ 823D2D3 - msgbox SafariZone_South_Text_2A533B, 2 - end - -SafariZone_South_EventScript_23D2DC:: @ 823D2DC - msgbox SafariZone_South_Text_2A553E, 2 - end - -SafariZone_South_EventScript_23D2E5:: @ 823D2E5 - lock - faceplayer - checkflag FLAG_0x05D - goto_if 0, SafariZone_South_EventScript_23D30D - msgbox SafariZone_South_Text_2A51D4, 5 - compare VAR_RESULT, 1 - goto_eq SafariZone_South_EventScript_23D31A - msgbox SafariZone_South_Text_2A521A, 4 - release - end - -SafariZone_South_EventScript_23D30D:: @ 823D30D - setflag FLAG_0x05D - msgbox SafariZone_South_Text_2A52AB, 4 - release - end - -SafariZone_South_EventScript_23D31A:: @ 823D31A - msgbox SafariZone_South_Text_2A5248, 4 - closemessage - switch VAR_FACING - case 2, SafariZone_South_EventScript_23D33F - case 4, SafariZone_South_EventScript_23D359 - end - -SafariZone_South_EventScript_23D33F:: @ 823D33F - applymovement 1, SafariZone_South_Movement_23D38A - waitmovement 0 - applymovement 255, SafariZone_South_Movement_23D385 - waitmovement 0 - goto SafariZone_South_EventScript_23D373 - end - -SafariZone_South_EventScript_23D359:: @ 823D359 - applymovement 1, SafariZone_South_Movement_23D38D - waitmovement 0 - applymovement 255, SafariZone_South_Movement_23D387 - waitmovement 0 - goto SafariZone_South_EventScript_23D373 - end - -SafariZone_South_EventScript_23D373:: @ 823D373 - setvar VAR_0x40A4, 1 - special ExitSafariMode - warpdoor MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 - waitstate - end - -SafariZone_South_Movement_23D385: @ 823D385 - walk_up - step_end - -SafariZone_South_Movement_23D387: @ 823D387 - walk_right - walk_in_place_fastest_up - step_end - -SafariZone_South_Movement_23D38A: @ 823D38A - walk_left - walk_in_place_fastest_right - step_end - -SafariZone_South_Movement_23D38D: @ 823D38D - walk_down - walk_in_place_fastest_up - step_end - -SafariZone_South_EventScript_23D390:: @ 823D390 - msgbox SafariZone_South_Text_2A57EE, 2 - end - -SafariZone_Southeast_EventScript_23D399:: @ 823D399 - msgbox SafariZone_Southeast_Text_2A582D, 2 - end - -SafariZone_South_EventScript_23D3A2:: @ 823D3A2 - msgbox SafariZone_South_Text_2A5887, 2 - end - -SafariZone_Southeast_EventScript_23D3AB:: @ 823D3AB - msgbox SafariZone_Southeast_Text_2A58C6, 2 - end - -SafariZone_Southeast_EventScript_23D3B4:: @ 823D3B4 - msgbox SafariZone_Southeast_Text_2A58FD, 2 - end - -SafariZone_Southeast_EventScript_23D3BD:: @ 823D3BD - msgbox SafariZone_Southeast_Text_2A5960, 2 - end - -SafariZone_Northeast_EventScript_23D3C6:: @ 823D3C6 - msgbox SafariZone_Northeast_Text_2A59A4, 2 - end - -SafariZone_Northeast_EventScript_23D3CF:: @ 823D3CF - msgbox SafariZone_Northeast_Text_2A5A09, 2 - end - -SafariZone_Northeast_EventScript_23D3D8:: @ 823D3D8 - msgbox SafariZone_Northeast_Text_2A5A44, 2 - end - diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc deleted file mode 100644 index f88cd22fb..000000000 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ /dev/null @@ -1,3 +0,0 @@ -SafariZone_Southeast_MapScripts:: @ 8242C03 - .byte 0 - diff --git a/data/scripts/maps/SafariZone_Southwest.inc b/data/scripts/maps/SafariZone_Southwest.inc deleted file mode 100644 index d2e75eb1b..000000000 --- a/data/scripts/maps/SafariZone_Southwest.inc +++ /dev/null @@ -1,11 +0,0 @@ -SafariZone_Southwest_MapScripts:: @ 823D266 - .byte 0 - -SafariZone_Southwest_EventScript_23D267:: @ 823D267 - msgbox SafariZone_Southwest_Text_2A53B7, 2 - end - -SafariZone_Southwest_EventScript_23D270:: @ 823D270 - msgbox SafariZone_Southwest_Text_2A5613, 3 - end - diff --git a/data/scripts/maps/ScorchedSlab.inc b/data/scripts/maps/ScorchedSlab.inc deleted file mode 100644 index f83724ec5..000000000 --- a/data/scripts/maps/ScorchedSlab.inc +++ /dev/null @@ -1,8 +0,0 @@ -ScorchedSlab_MapScripts:: @ 8239291 - map_script 3, ScorchedSlab_MapScript1_239297 - .byte 0 - -ScorchedSlab_MapScript1_239297: @ 8239297 - setflag FLAG_LANDMARK_SCORCHED_SLAB - end - diff --git a/data/scripts/maps/SeafloorCavern_Entrance.inc b/data/scripts/maps/SeafloorCavern_Entrance.inc deleted file mode 100644 index 9eb71d5e3..000000000 --- a/data/scripts/maps/SeafloorCavern_Entrance.inc +++ /dev/null @@ -1,93 +0,0 @@ -SeafloorCavern_Entrance_MapScripts:: @ 823446E - map_script 5, SeafloorCavern_Entrance_MapScript1_234474 - .byte 0 - -SeafloorCavern_Entrance_MapScript1_234474: @ 8234474 - setdivewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5 - setescapewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5 - end - -SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 - lockall - compare VAR_0x40D9, 1 - goto_eq SeafloorCavern_Entrance_EventScript_2344ED - waitse - playse SE_PIN - applymovement 1, SeafloorCavern_Entrance_Movement_272598 - waitmovement 0 - applymovement 1, SeafloorCavern_Entrance_Movement_27259A - waitmovement 0 - delay 20 - compare VAR_FACING, 3 - call_if 1, SeafloorCavern_Entrance_EventScript_23452E - compare VAR_FACING, 4 - call_if 1, SeafloorCavern_Entrance_EventScript_234523 - compare VAR_FACING, 2 - call_if 1, SeafloorCavern_Entrance_EventScript_234539 - delay 30 - setvar VAR_0x40D9, 1 - moveobjectoffscreen 1 - msgbox SeafloorCavern_Entrance_Text_234544, 4 - closemessage - applymovement 1, SeafloorCavern_Entrance_Movement_2725A6 - waitmovement 0 - releaseall - end - -SeafloorCavern_Entrance_EventScript_2344ED:: @ 82344ED - compare VAR_FACING, 3 - call_if 1, SeafloorCavern_Entrance_EventScript_23452E - compare VAR_FACING, 4 - call_if 1, SeafloorCavern_Entrance_EventScript_234523 - compare VAR_FACING, 2 - call_if 1, SeafloorCavern_Entrance_EventScript_234539 - msgbox SeafloorCavern_Entrance_Text_2346C8, 4 - closemessage - applymovement 1, SeafloorCavern_Entrance_Movement_2725A6 - waitmovement 0 - releaseall - end - -SeafloorCavern_Entrance_EventScript_234523:: @ 8234523 - applymovement 1, SeafloorCavern_Entrance_Movement_2725A4 - waitmovement 0 - return - -SeafloorCavern_Entrance_EventScript_23452E:: @ 823452E - applymovement 1, SeafloorCavern_Entrance_Movement_2725A8 - waitmovement 0 - return - -SeafloorCavern_Entrance_EventScript_234539:: @ 8234539 - applymovement 1, SeafloorCavern_Entrance_Movement_2725AA - waitmovement 0 - return - -SeafloorCavern_Entrance_Text_234544: @ 8234544 - .string "Hey!\n" - .string "I remember your face!\p" - .string "If you’re here, it must mean that\n" - .string "you’re about to mess with us again!\p" - .string "A punk like you, do you really think\n" - .string "you can take on TEAM AQUA?\p" - .string "I’d say you’re too early by about\n" - .string "a trillion years!\p" - .string "You’re a perfect fit for the likes of\n" - .string "TEAM MAGMA!\p" - .string "Speaking of TEAM MAGMA, I hear they\n" - .string "were spotted near MOSSDEEP.\p" - .string "That bunch of goons, they sure don’t\n" - .string "look good near the sea!$" - -SeafloorCavern_Entrance_Text_2346C8: @ 82346C8 - .string "A punk like you, do you really think\n" - .string "you can take on TEAM AQUA?\p" - .string "I’d say you’re too early by about\n" - .string "a trillion years!\p" - .string "You’re a perfect fit for the likes of\n" - .string "TEAM MAGMA!\p" - .string "Speaking of TEAM MAGMA, I hear they\n" - .string "were spotted near MOSSDEEP.\p" - .string "That bunch of goons, they sure don’t\n" - .string "look good near the sea!$" - diff --git a/data/scripts/maps/SeafloorCavern_Room1.inc b/data/scripts/maps/SeafloorCavern_Room1.inc deleted file mode 100644 index d3308fca2..000000000 --- a/data/scripts/maps/SeafloorCavern_Room1.inc +++ /dev/null @@ -1,36 +0,0 @@ -SeafloorCavern_Room1_MapScripts:: @ 82347EB - .byte 0 - -SeafloorCavern_Room1_EventScript_2347EC:: @ 82347EC - trainerbattle 0, TRAINER_GRUNT_5, 0, SeafloorCavern_Room1_Text_23481A, SeafloorCavern_Room1_Text_23484A - msgbox SeafloorCavern_Room1_Text_23485D, 6 - end - -SeafloorCavern_Room1_EventScript_234803:: @ 8234803 - trainerbattle 0, TRAINER_GRUNT_6, 0, SeafloorCavern_Room1_Text_234898, SeafloorCavern_Room1_Text_2348CD - msgbox SeafloorCavern_Room1_Text_2348E3, 6 - end - -SeafloorCavern_Room1_Text_23481A: @ 823481A - .string "We don’t need a kid around!\n" - .string "Go on home already!$" - -SeafloorCavern_Room1_Text_23484A: @ 823484A - .string "I want to go home…$" - -SeafloorCavern_Room1_Text_23485D: @ 823485D - .string "I want to get a promotion so I can\n" - .string "boss around the GRUNTS…$" - -SeafloorCavern_Room1_Text_234898: @ 8234898 - .string "That submarine… It’s tiny inside.\n" - .string "I’m sore all over!$" - -SeafloorCavern_Room1_Text_2348CD: @ 82348CD - .string "Losing makes me sore!$" - -SeafloorCavern_Room1_Text_2348E3: @ 82348E3 - .string "That submarine we jacked, man,\n" - .string "it’s brutal as a ride.\l" - .string "It’s way too tight in there!$" - diff --git a/data/scripts/maps/SeafloorCavern_Room2.inc b/data/scripts/maps/SeafloorCavern_Room2.inc deleted file mode 100644 index 15201dac0..000000000 --- a/data/scripts/maps/SeafloorCavern_Room2.inc +++ /dev/null @@ -1,3 +0,0 @@ -SeafloorCavern_Room2_MapScripts:: @ 8234936 - .byte 0 - diff --git a/data/scripts/maps/SeafloorCavern_Room3.inc b/data/scripts/maps/SeafloorCavern_Room3.inc deleted file mode 100644 index f57d58e22..000000000 --- a/data/scripts/maps/SeafloorCavern_Room3.inc +++ /dev/null @@ -1,58 +0,0 @@ -SeafloorCavern_Room3_MapScripts:: @ 8234937 - .byte 0 - -SeafloorCavern_Room3_EventScript_234938:: @ 8234938 - trainerbattle 0, TRAINER_SHELLY_2, 0, SeafloorCavern_Room3_Text_234966, SeafloorCavern_Room3_Text_234A79 - msgbox SeafloorCavern_Room3_Text_234A8A, 6 - end - -SeafloorCavern_Room3_EventScript_23494F:: @ 823494F - trainerbattle 0, TRAINER_GRUNT_27, 0, SeafloorCavern_Room3_Text_234B3A, SeafloorCavern_Room3_Text_234BFE - msgbox SeafloorCavern_Room3_Text_234C04, 6 - end - -SeafloorCavern_Room3_Text_234966: @ 8234966 - .string "Ahahahaha!\p" - .string "How did you manage to get here without\n" - .string "a submarine?\l" - .string "What an impressive child!\p" - .string "But… It won’t do to have you\n" - .string "meddling about here.\p" - .string "And, I do want payback for what\n" - .string "happened at the WEATHER INSTITUTE…\p" - .string "I’m going to give you a little taste\n" - .string "of pain! Resign yourself to it!$" - -SeafloorCavern_Room3_Text_234A79: @ 8234A79 - .string "Ahahahaha!\p" - .string "Ouch!$" - -SeafloorCavern_Room3_Text_234A8A: @ 8234A8A - .string "Ahahahaha!\n" - .string "You’re so darn strong.\p" - .string "It’s terribly disappointing that you’re\n" - .string "not a TEAM AQUA member.\p" - .string "You could have enjoyed the fabulous\n" - .string "world our BOSS has promised as\l" - .string "one of us…$" - -SeafloorCavern_Room3_Text_234B3A: @ 8234B3A - .string "For our dream to become real, we need\n" - .string "the power of POKéMON.\p" - .string "But meddlers like you use the power of\n" - .string "POKéMON to mess with us even at\l" - .string "a place like this!\p" - .string "Life just doesn’t work the way we\n" - .string "need it to!$" - -SeafloorCavern_Room3_Text_234BFE: @ 8234BFE - .string "Gwah!$" - -SeafloorCavern_Room3_Text_234C04: @ 8234C04 - .string "You know, we don’t dare question\n" - .string "the motives of our leader.\p" - .string "But here you are, just some punk,\n" - .string "going up against our BOSS.\p" - .string "Maybe…\n" - .string "You must be something…$" - diff --git a/data/scripts/maps/SeafloorCavern_Room4.inc b/data/scripts/maps/SeafloorCavern_Room4.inc deleted file mode 100644 index e509013d6..000000000 --- a/data/scripts/maps/SeafloorCavern_Room4.inc +++ /dev/null @@ -1,36 +0,0 @@ -SeafloorCavern_Room4_MapScripts:: @ 8234C9B - .byte 0 - -SeafloorCavern_Room4_EventScript_234C9C:: @ 8234C9C - trainerbattle 0, TRAINER_GRUNT_7, 0, SeafloorCavern_Room4_Text_234CCA, SeafloorCavern_Room4_Text_234CF3 - msgbox SeafloorCavern_Room4_Text_234CFC, 6 - end - -SeafloorCavern_Room4_EventScript_234CB3:: @ 8234CB3 - trainerbattle 0, TRAINER_GRUNT_9, 0, SeafloorCavern_Room4_Text_234D3A, SeafloorCavern_Room4_Text_234D68 - msgbox SeafloorCavern_Room4_Text_234D79, 6 - end - -SeafloorCavern_Room4_Text_234CCA: @ 8234CCA - .string "Who are you?\n" - .string "Where did you come in from?$" - -SeafloorCavern_Room4_Text_234CF3: @ 8234CF3 - .string "Lost it…$" - -SeafloorCavern_Room4_Text_234CFC: @ 8234CFC - .string "I can’t find the way out!\p" - .string "I’m not afraid. Don’t get me wrong!$" - -SeafloorCavern_Room4_Text_234D3A: @ 8234D3A - .string "Who are you?\n" - .string "Where do you think you’re going?$" - -SeafloorCavern_Room4_Text_234D68: @ 8234D68 - .string "I failed to win!$" - -SeafloorCavern_Room4_Text_234D79: @ 8234D79 - .string "My partner forgot the map in that\n" - .string "submarine!\p" - .string "How’s that for being useless?$" - diff --git a/data/scripts/maps/SeafloorCavern_Room5.inc b/data/scripts/maps/SeafloorCavern_Room5.inc deleted file mode 100644 index e1c68db6e..000000000 --- a/data/scripts/maps/SeafloorCavern_Room5.inc +++ /dev/null @@ -1,3 +0,0 @@ -SeafloorCavern_Room5_MapScripts:: @ 8234DC4 - .byte 0 - diff --git a/data/scripts/maps/SeafloorCavern_Room6.inc b/data/scripts/maps/SeafloorCavern_Room6.inc deleted file mode 100644 index ae8cf02fa..000000000 --- a/data/scripts/maps/SeafloorCavern_Room6.inc +++ /dev/null @@ -1,3 +0,0 @@ -SeafloorCavern_Room6_MapScripts:: @ 8234DC5 - .byte 0 - diff --git a/data/scripts/maps/SeafloorCavern_Room7.inc b/data/scripts/maps/SeafloorCavern_Room7.inc deleted file mode 100644 index e91cf6193..000000000 --- a/data/scripts/maps/SeafloorCavern_Room7.inc +++ /dev/null @@ -1,3 +0,0 @@ -SeafloorCavern_Room7_MapScripts:: @ 8234DC6 - .byte 0 - diff --git a/data/scripts/maps/SeafloorCavern_Room8.inc b/data/scripts/maps/SeafloorCavern_Room8.inc deleted file mode 100644 index 471cafd17..000000000 --- a/data/scripts/maps/SeafloorCavern_Room8.inc +++ /dev/null @@ -1,3 +0,0 @@ -SeafloorCavern_Room8_MapScripts:: @ 8234DC7 - .byte 0 - diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc deleted file mode 100644 index cbfbccfe4..000000000 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ /dev/null @@ -1,323 +0,0 @@ -SeafloorCavern_Room9_MapScripts:: @ 8234DC8 - .byte 0 - -SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 - lockall - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 4 - setvar VAR_0x8007, 5 - applymovement 255, SeafloorCavern_Room9_Movement_2725A6 - waitmovement 0 - applymovement 255, SeafloorCavern_Room9_Movement_23505C - waitmovement 0 - playbgm MUS_AQA_0, 0 - msgbox SeafloorCavern_Room9_Text_23505F, 4 - closemessage - addobject VAR_0x8004 - applymovement 255, SeafloorCavern_Room9_Movement_2725A4 - waitmovement 0 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23502A - waitmovement 0 - msgbox SeafloorCavern_Room9_Text_23507C, 4 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A6 - waitmovement 0 - msgbox SeafloorCavern_Room9_Text_2350A6, 4 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_27259E - waitmovement 0 - msgbox SeafloorCavern_Room9_Text_23512C, 4 - trainerbattle 3, TRAINER_ARCHIE, 0, SeafloorCavern_Room9_Text_2351BC - msgbox SeafloorCavern_Room9_Text_2351E5, 4 - setweather 0 - doweather - special sub_80B05B4 - waitstate - msgbox SeafloorCavern_Room9_Text_235279, 4 - special WaitWeather - waitstate - setvar VAR_RESULT, 1 - playse SE_W197 - setfieldeffectargument 0, 16 - setfieldeffectargument 1, 42 - setfieldeffectargument 2, 0 - dofieldeffect 54 - waitfieldeffect 54 - closemessage - setvar VAR_RESULT, 0 - playfanfare MUS_ME_TAMA - playse SE_TAMA - special sub_80B0534 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A6 - applymovement 255, SeafloorCavern_Room9_Movement_2725A6 - waitmovement 0 - delay 150 - removeobject 7 - addobject 1 - waitstate - delay 60 - applymovement 1, SeafloorCavern_Room9_Movement_235040 - waitmovement 0 - special sub_80B058C - waitstate - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 5 - special sub_8139560 - waitstate - applymovement 1, SeafloorCavern_Room9_Movement_23504B - waitmovement 0 - removeobject 1 - delay 4 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 5 - special sub_8139560 - waitstate - delay 30 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 4 - setvar VAR_0x8007, 5 - msgbox SeafloorCavern_Room9_Text_2352A7, 4 - playse SE_PC_LOGIN - applymovement 255, SeafloorCavern_Room9_Movement_2725A4 - waitmovement 0 - msgbox SeafloorCavern_Room9_Text_2352F6, 4 - closemessage - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_235035 - waitmovement 0 - msgbox SeafloorCavern_Room9_Text_23532B, 4 - closemessage - playse SE_PC_OFF - delay 20 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725AA - waitmovement 0 - msgbox SeafloorCavern_Room9_Text_23546F, 4 - closemessage - addobject VAR_0x8005 - addobject VAR_0x8006 - addobject VAR_0x8007 - applymovement VAR_0x8007, SeafloorCavern_Room9_Movement_235057 - applymovement VAR_0x8006, SeafloorCavern_Room9_Movement_235057 - applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_23504E - waitmovement 0 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A4 - waitmovement 0 - msgbox SeafloorCavern_Room9_Text_2354F0, 4 - playse SE_PIN - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_272598 - waitmovement 0 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_27259A - waitmovement 0 - msgbox SeafloorCavern_Room9_Text_2355C2, 4 - msgbox SeafloorCavern_Room9_Text_235692, 4 - closemessage - applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_235054 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23503A - waitmovement 0 - msgbox SeafloorCavern_Room9_Text_235723, 4 - setvar VAR_0x407B, 1 - setvar VAR_0x405E, 1 - clearflag FLAG_0x3CD - clearflag FLAG_0x33A - clearflag FLAG_0x33B - clearflag FLAG_0x356 - clearflag FLAG_0x3E6 - clearflag FLAG_0x3E5 - setflag FLAG_0x347 - setflag FLAG_LEGENDARIES_IN_SOOTOPOLIS - clearflag FLAG_0x3B0 - clearflag FLAG_0x3B1 - setflag FLAG_SYS_WEATHER_CTRL - setflag FLAG_0x081 - setflag FLAG_0x3C7 - setvar VAR_0x40C6, 2 - setvar VAR_0x40A2, 1 - setflag FLAG_0x33C - setflag FLAG_0x33D - setflag FLAG_0x33F - setflag FLAG_0x35B - setflag FLAG_0x3B2 - setflag FLAG_SPECIAL_FLAG_0x4000 - warp MAP_ROUTE128, 255, 38, 22 - waitstate - releaseall - end - -SeafloorCavern_Room9_Movement_23502A: @ 823502A - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - step_end - -SeafloorCavern_Room9_Movement_235032: @ 8235032 - walk_left - walk_left - step_end - -SeafloorCavern_Room9_Movement_235035: @ 8235035 - walk_left - delay_16 - step_end - -SeafloorCavern_Room9_Movement_235038: @ 8235038 - walk_right - step_end - -SeafloorCavern_Room9_Movement_23503A: @ 823503A - face_up - lock_facing_direction - walk_down - unlock_facing_direction - walk_in_place_fastest_right - step_end - -SeafloorCavern_Room9_Movement_235040: @ 8235040 - 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 - slide_up - slide_up - step_end - -SeafloorCavern_Room9_Movement_23504E: @ 823504E - walk_fast_right - walk_fast_right - walk_fast_right - walk_fast_right - walk_fast_right - step_end - -SeafloorCavern_Room9_Movement_235054: @ 8235054 - walk_right - walk_right - step_end - -SeafloorCavern_Room9_Movement_235057: @ 8235057 - walk_fast_right - walk_fast_right - walk_fast_right - walk_fast_right - step_end - -SeafloorCavern_Room9_Movement_23505C: @ 823505C - delay_16 - delay_16 - step_end - -SeafloorCavern_Room9_Text_23505F: @ 823505F - .string "ARCHIE: Hold it right there.$" - -SeafloorCavern_Room9_Text_23507C: @ 823507C - .string "ARCHIE: Fufufu…\n" - .string "So it was you, after all.$" - -SeafloorCavern_Room9_Text_2350A6: @ 82350A6 - .string "ARCHIE: Behold!\p" - .string "See how beautiful it is, the sleeping\n" - .string "form of the ancient POKéMON KYOGRE!\p" - .string "I have waited so long for this day to\n" - .string "come…$" - -SeafloorCavern_Room9_Text_23512C: @ 823512C - .string "ARCHIE: It surprises me, how you’ve\n" - .string "managed to chase me here.\p" - .string "But that’s all over now.\p" - .string "For the realization of my dream,\n" - .string "you must disappear now!$" - -SeafloorCavern_Room9_Text_2351BC: @ 82351BC - .string "What?!\n" - .string "I lost to a mere child like you?!$" - -SeafloorCavern_Room9_Text_2351E5: @ 82351E5 - .string "ARCHIE: Fufufu…\p" - .string "I commend you. I must recognize that\n" - .string "you are truly gifted.\p" - .string "But!\n" - .string "I have this in my possession!\p" - .string "With this RED ORB, I can make KYOGRE…$" - -SeafloorCavern_Room9_Text_235279: @ 8235279 - .string "The RED ORB suddenly began shining\n" - .string "by itself!$" - -SeafloorCavern_Room9_Text_2352A7: @ 82352A7 - .string "ARCHIE: What?!\p" - .string "I didn’t do anything.\n" - .string "Why did the RED ORB…\p" - .string "Where did KYOGRE go?$" - -SeafloorCavern_Room9_Text_2352F6: @ 82352F6 - .string "ARCHIE: Hm? It’s a message from our\n" - .string "members outside…$" - -SeafloorCavern_Room9_Text_23532B: @ 823532B - .string "ARCHIE: Yes, what is it?\p" - .string "Hm…\n" - .string "It’s raining heavily?\p" - .string "Good… That should have happened.\n" - .string "That is why we awakened KYOGRE,\l" - .string "to realize TEAM AQUA’s vision of\l" - .string "expanding the sea.\p" - .string "What?!\p" - .string "It’s raining far harder than we\n" - .string "envisioned? You’re in danger?\p" - .string "That can’t be…\n" - .string "That’s just not possible…\p" - .string "Hold your position and monitor\n" - .string "the situation!$" - -SeafloorCavern_Room9_Text_23546F: @ 823546F - .string "ARCHIE: There’s something wrong…\p" - .string "The RED ORB is supposed to awaken\n" - .string "and control KYOGRE…\p" - .string "But… Why?\n" - .string "Why did KYOGRE disappear?\p" - .string "Why?!$" - -SeafloorCavern_Room9_Text_2354F0: @ 82354F0 - .string "MAXIE: What have you wrought?\p" - .string "ARCHIE… You’ve finally awoken KYOGRE,\n" - .string "haven’t you?\p" - .string "What will happen to the world if this\n" - .string "downpour continues for all eternity?\p" - .string "The world’s landmass will drown in\n" - .string "the deepening sea…$" - -SeafloorCavern_Room9_Text_2355C2: @ 82355C2 - .string "ARCHIE: W-what?!\n" - .string "Don’t get all high and mighty with me!\p" - .string "Wasn’t it you, TEAM MAGMA, that\n" - .string "infuriated GROUDON?\p" - .string "So long as I have this RED ORB,\n" - .string "I should be able to control KYOGRE…\p" - .string "I should be able to control it…$" - -SeafloorCavern_Room9_Text_235692: @ 8235692 - .string "MAXIE: We don’t have the time to\n" - .string "argue about it here!\p" - .string "Get outside and see for yourself!\p" - .string "See if what you’ve wrought is the\n" - .string "world that we desired!$" - -SeafloorCavern_Room9_Text_235723: @ 8235723 - .string "MAXIE: {PLAYER}, come on, you have\n" - .string "to get out of here, too!$" - diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc deleted file mode 100644 index 9cd3727bb..000000000 --- a/data/scripts/maps/SealedChamber_InnerRoom.inc +++ /dev/null @@ -1,89 +0,0 @@ -SealedChamber_InnerRoom_MapScripts:: @ 82391F7 - .byte 0 - -SealedChamber_InnerRoom_EventScript_2391F8:: @ 82391F8 - lockall - braillemessage SealedChamber_InnerRoom_Braille_2A6B99 - waitbuttonpress - hidebox2 - checkflag FLAG_0x0E4 - goto_eq SealedChamber_InnerRoom_EventScript_239253 - specialvar VAR_RESULT, CheckRelicanthWailord - compare VAR_RESULT, 0 - goto_eq SealedChamber_InnerRoom_EventScript_239253 - fadeoutbgm 0 - playse SE_TRACK_MOVE - special DoSealedChamberShakingEffect1 - waitstate - delay 40 - special DoSealedChamberShakingEffect2 - waitstate - playse SE_DOOR - delay 40 - special DoSealedChamberShakingEffect2 - waitstate - playse SE_DOOR - delay 40 - special DoSealedChamberShakingEffect2 - waitstate - playse SE_DOOR - delay 40 - msgbox gUnknown_0827301B, 4 - closemessage - fadeinbgm 0 - setflag FLAG_0x0E4 - releaseall - end - -SealedChamber_InnerRoom_EventScript_239253:: @ 8239253 - releaseall - end - -SealedChamber_InnerRoom_EventScript_239255:: @ 8239255 - lockall - braillemessage SealedChamber_InnerRoom_Braille_2A6BCA - waitbuttonpress - hidebox2 - releaseall - end - -SealedChamber_InnerRoom_EventScript_23925F:: @ 823925F - lockall - braillemessage SealedChamber_InnerRoom_Braille_2A6BEC - waitbuttonpress - hidebox2 - releaseall - end - -SealedChamber_InnerRoom_EventScript_239269:: @ 8239269 - lockall - braillemessage SealedChamber_InnerRoom_Braille_2A6C0D - waitbuttonpress - hidebox2 - releaseall - end - -SealedChamber_InnerRoom_EventScript_239273:: @ 8239273 - lockall - braillemessage SealedChamber_InnerRoom_Braille_2A6C34 - waitbuttonpress - hidebox2 - releaseall - end - -SealedChamber_InnerRoom_EventScript_23927D:: @ 823927D - lockall - braillemessage SealedChamber_InnerRoom_Braille_2A6C48 - waitbuttonpress - hidebox2 - releaseall - end - -SealedChamber_InnerRoom_EventScript_239287:: @ 8239287 - lockall - braillemessage SealedChamber_InnerRoom_Braille_2A6C73 - waitbuttonpress - hidebox2 - releaseall - end - diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc deleted file mode 100644 index e9e79d1e9..000000000 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ /dev/null @@ -1,132 +0,0 @@ -SealedChamber_OuterRoom_MapScripts:: @ 8239106 - map_script 5, SealedChamber_OuterRoom_MapScript1_239116 - map_script 3, SealedChamber_OuterRoom_MapScript1_239127 - map_script 1, SealedChamber_OuterRoom_MapScript1_23912B - .byte 0 - -SealedChamber_OuterRoom_MapScript1_239116: @ 8239116 - setdivewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44 - setescapewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44 - end - -SealedChamber_OuterRoom_MapScript1_239127: @ 8239127 - setflag FLAG_LANDMARK_SEALED_CHAMBER - end - -SealedChamber_OuterRoom_MapScript1_23912B: @ 823912B - checkflag FLAG_SYS_BRAILLE_DIG - call_if 0, SealedChamber_OuterRoom_EventScript_239135 - end - -SealedChamber_OuterRoom_EventScript_239135:: @ 8239135 - setmetatile 9, 1, 553, 1 - setmetatile 10, 1, 553, 1 - setmetatile 11, 1, 553, 1 - setmetatile 9, 2, 565, 1 - setmetatile 10, 2, 565, 1 - setmetatile 11, 2, 565, 1 - return - -SealedChamber_OuterRoom_EventScript_23916C:: @ 823916C - lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B27 - waitbuttonpress - hidebox2 - releaseall - end - -SealedChamber_OuterRoom_EventScript_239176:: @ 8239176 - lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B31 - waitbuttonpress - hidebox2 - releaseall - end - -SealedChamber_OuterRoom_EventScript_239180:: @ 8239180 - lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B3B - waitbuttonpress - hidebox2 - releaseall - end - -SealedChamber_OuterRoom_EventScript_23918A:: @ 823918A - lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B45 - waitbuttonpress - hidebox2 - releaseall - end - -SealedChamber_OuterRoom_EventScript_239194:: @ 8239194 - lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B4F - waitbuttonpress - hidebox2 - releaseall - end - -SealedChamber_OuterRoom_EventScript_23919E:: @ 823919E - lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B59 - waitbuttonpress - hidebox2 - releaseall - end - -SealedChamber_OuterRoom_EventScript_2391A8:: @ 82391A8 - lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B63 - waitbuttonpress - hidebox2 - releaseall - end - -SealedChamber_OuterRoom_EventScript_2391B2:: @ 82391B2 - lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B6E - waitbuttonpress - hidebox2 - releaseall - end - -SealedChamber_OuterRoom_EventScript_2391BC:: @ 82391BC - lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B76 - waitbuttonpress - hidebox2 - releaseall - end - -SealedChamber_OuterRoom_EventScript_2391C6:: @ 82391C6 - lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B81 - waitbuttonpress - hidebox2 - releaseall - end - -SealedChamber_OuterRoom_EventScript_2391D0:: @ 82391D0 - lockall - checkflag FLAG_SYS_BRAILLE_DIG - goto_eq SealedChamber_OuterRoom_EventScript_2391E3 - braillemessage SealedChamber_OuterRoom_Braille_2A6B89 - waitbuttonpress - hidebox2 - releaseall - end - -SealedChamber_OuterRoom_EventScript_2391E3:: @ 82391E3 - msgbox gUnknown_0827304E, 4 - releaseall - end - -SealedChamber_OuterRoom_EventScript_2391ED:: @ 82391ED - lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B89 - waitbuttonpress - hidebox2 - releaseall - end - diff --git a/data/scripts/maps/SecretBase_BlueCave1.inc b/data/scripts/maps/SecretBase_BlueCave1.inc deleted file mode 100644 index a7f979bde..000000000 --- a/data/scripts/maps/SecretBase_BlueCave1.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BlueCave1_MapScripts:: @ 823B483 diff --git a/data/scripts/maps/SecretBase_BlueCave2.inc b/data/scripts/maps/SecretBase_BlueCave2.inc deleted file mode 100644 index cb4ad3565..000000000 --- a/data/scripts/maps/SecretBase_BlueCave2.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BlueCave2_MapScripts:: @ 823B483 diff --git a/data/scripts/maps/SecretBase_BlueCave3.inc b/data/scripts/maps/SecretBase_BlueCave3.inc deleted file mode 100644 index f49ff6dc1..000000000 --- a/data/scripts/maps/SecretBase_BlueCave3.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BlueCave3_MapScripts:: @ 823B483 diff --git a/data/scripts/maps/SecretBase_BlueCave4.inc b/data/scripts/maps/SecretBase_BlueCave4.inc deleted file mode 100644 index faa808545..000000000 --- a/data/scripts/maps/SecretBase_BlueCave4.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BlueCave4_MapScripts:: @ 823B483 diff --git a/data/scripts/maps/SecretBase_BrownCave1.inc b/data/scripts/maps/SecretBase_BrownCave1.inc deleted file mode 100644 index 9d2925611..000000000 --- a/data/scripts/maps/SecretBase_BrownCave1.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BrownCave1_MapScripts:: @ 823B483 diff --git a/data/scripts/maps/SecretBase_BrownCave2.inc b/data/scripts/maps/SecretBase_BrownCave2.inc deleted file mode 100644 index e9c497fac..000000000 --- a/data/scripts/maps/SecretBase_BrownCave2.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BrownCave2_MapScripts:: @ 823B483 diff --git a/data/scripts/maps/SecretBase_BrownCave3.inc b/data/scripts/maps/SecretBase_BrownCave3.inc deleted file mode 100644 index 284262d91..000000000 --- a/data/scripts/maps/SecretBase_BrownCave3.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BrownCave3_MapScripts:: @ 823B483 diff --git a/data/scripts/maps/SecretBase_BrownCave4.inc b/data/scripts/maps/SecretBase_BrownCave4.inc deleted file mode 100644 index 84f685508..000000000 --- a/data/scripts/maps/SecretBase_BrownCave4.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BrownCave4_MapScripts:: @ 823B483 diff --git a/data/scripts/maps/SecretBase_RedCave1.inc b/data/scripts/maps/SecretBase_RedCave1.inc deleted file mode 100644 index f9c55a2b5..000000000 --- a/data/scripts/maps/SecretBase_RedCave1.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_RedCave1_MapScripts:: @ 823B483 diff --git a/data/scripts/maps/SecretBase_RedCave2.inc b/data/scripts/maps/SecretBase_RedCave2.inc deleted file mode 100644 index e7e0c7ba5..000000000 --- a/data/scripts/maps/SecretBase_RedCave2.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_RedCave2_MapScripts:: @ 823B483 diff --git a/data/scripts/maps/SecretBase_RedCave3.inc b/data/scripts/maps/SecretBase_RedCave3.inc deleted file mode 100644 index 512f7f92a..000000000 --- a/data/scripts/maps/SecretBase_RedCave3.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_RedCave3_MapScripts:: @ 823B483 diff --git a/data/scripts/maps/SecretBase_RedCave4.inc b/data/scripts/maps/SecretBase_RedCave4.inc deleted file mode 100644 index 98e79f89f..000000000 --- a/data/scripts/maps/SecretBase_RedCave4.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_RedCave4_MapScripts:: @ 823B483 diff --git a/data/scripts/maps/SecretBase_Shrub1.inc b/data/scripts/maps/SecretBase_Shrub1.inc deleted file mode 100644 index 24b8685a0..000000000 --- a/data/scripts/maps/SecretBase_Shrub1.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Shrub1_MapScripts:: @ 823B483 diff --git a/data/scripts/maps/SecretBase_Shrub2.inc b/data/scripts/maps/SecretBase_Shrub2.inc deleted file mode 100644 index dad94f46d..000000000 --- a/data/scripts/maps/SecretBase_Shrub2.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Shrub2_MapScripts:: @ 823B483 diff --git a/data/scripts/maps/SecretBase_Shrub3.inc b/data/scripts/maps/SecretBase_Shrub3.inc deleted file mode 100644 index 22c67c939..000000000 --- a/data/scripts/maps/SecretBase_Shrub3.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Shrub3_MapScripts:: @ 823B483 diff --git a/data/scripts/maps/SecretBase_Shrub4.inc b/data/scripts/maps/SecretBase_Shrub4.inc deleted file mode 100644 index 1a9952232..000000000 --- a/data/scripts/maps/SecretBase_Shrub4.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Shrub4_MapScripts:: @ 823B483 diff --git a/data/scripts/maps/SecretBase_Tree1.inc b/data/scripts/maps/SecretBase_Tree1.inc deleted file mode 100644 index 7e7704d6a..000000000 --- a/data/scripts/maps/SecretBase_Tree1.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Tree1_MapScripts:: @ 823B483 diff --git a/data/scripts/maps/SecretBase_Tree2.inc b/data/scripts/maps/SecretBase_Tree2.inc deleted file mode 100644 index b30a6ec74..000000000 --- a/data/scripts/maps/SecretBase_Tree2.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Tree2_MapScripts:: @ 823B483 diff --git a/data/scripts/maps/SecretBase_Tree3.inc b/data/scripts/maps/SecretBase_Tree3.inc deleted file mode 100644 index 9512bbb80..000000000 --- a/data/scripts/maps/SecretBase_Tree3.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Tree3_MapScripts:: @ 823B483 diff --git a/data/scripts/maps/SecretBase_Tree4.inc b/data/scripts/maps/SecretBase_Tree4.inc deleted file mode 100644 index 62f41627f..000000000 --- a/data/scripts/maps/SecretBase_Tree4.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Tree4_MapScripts:: @ 823B483 diff --git a/data/scripts/maps/SecretBase_YellowCave1.inc b/data/scripts/maps/SecretBase_YellowCave1.inc deleted file mode 100644 index fa56be0eb..000000000 --- a/data/scripts/maps/SecretBase_YellowCave1.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_YellowCave1_MapScripts:: @ 823B483 diff --git a/data/scripts/maps/SecretBase_YellowCave2.inc b/data/scripts/maps/SecretBase_YellowCave2.inc deleted file mode 100644 index 86c3c876f..000000000 --- a/data/scripts/maps/SecretBase_YellowCave2.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_YellowCave2_MapScripts:: @ 823B483 diff --git a/data/scripts/maps/SecretBase_YellowCave3.inc b/data/scripts/maps/SecretBase_YellowCave3.inc deleted file mode 100644 index 26311e6c5..000000000 --- a/data/scripts/maps/SecretBase_YellowCave3.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_YellowCave3_MapScripts:: @ 823B483 diff --git a/data/scripts/maps/SecretBase_YellowCave4.inc b/data/scripts/maps/SecretBase_YellowCave4.inc deleted file mode 100644 index 32da39388..000000000 --- a/data/scripts/maps/SecretBase_YellowCave4.inc +++ /dev/null @@ -1,24 +0,0 @@ -SecretBase_YellowCave4_MapScripts:: @ 823B483 - map_script 4, SecretBase_RedCave1_MapScript2_23B498 - map_script 3, SecretBase_RedCave1_MapScript1_23B4A2 - map_script 2, SecretBase_RedCave1_MapScript2_23B4AE - map_script 5, SecretBase_RedCave1_MapScript1_23B4B8 - .byte 0 - -SecretBase_RedCave1_MapScript2_23B498: @ 823B498 - map_script_2 VAR_0x4089, 0, EventScript_275D0C - .2byte 0 - -SecretBase_RedCave1_MapScript1_23B4A2: @ 823B4A2 - call SecretBase_RedCave1_EventScript_275CE1 - special sub_80E95D4 - special sub_80EB1AC - end - -SecretBase_RedCave1_MapScript2_23B4AE: @ 823B4AE - map_script_2 VAR_0x4097, 0, SecretBase_RedCave1_EventScript_275B81 - .2byte 0 - -SecretBase_RedCave1_MapScript1_23B4B8: @ 823B4B8 - setstepcallback 6 - end diff --git a/data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc deleted file mode 100644 index d2a93f8e9..000000000 --- a/data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc +++ /dev/null @@ -1,3 +0,0 @@ -ShoalCave_HighTideEntranceRoom_MapScripts:: @ 82372AB - .byte 0 - diff --git a/data/scripts/maps/ShoalCave_HighTideInnerRoom.inc b/data/scripts/maps/ShoalCave_HighTideInnerRoom.inc deleted file mode 100644 index 6045f80a6..000000000 --- a/data/scripts/maps/ShoalCave_HighTideInnerRoom.inc +++ /dev/null @@ -1,3 +0,0 @@ -ShoalCave_HighTideInnerRoom_MapScripts:: @ 82372AC - .byte 0 - diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc deleted file mode 100644 index f57a27c1d..000000000 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ /dev/null @@ -1,103 +0,0 @@ -ShoalCave_LowTideEntranceRoom_MapScripts:: @ 8236DBA - map_script 3, ShoalCave_LowTideEntranceRoom_MapScript1_236DC0 - .byte 0 - -ShoalCave_LowTideEntranceRoom_MapScript1_236DC0: @ 8236DC0 - special UpdateShoalTideFlag - checkflag FLAG_SYS_SHOAL_TIDE - goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236DD1 - goto ShoalCave_LowTideEntranceRoom_EventScript_236DD5 - -ShoalCave_LowTideEntranceRoom_EventScript_236DD1:: @ 8236DD1 - setmaplayoutindex 168 - end - -ShoalCave_LowTideEntranceRoom_EventScript_236DD5:: @ 8236DD5 - setmaplayoutindex 164 - end - -ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9 - lock - faceplayer - dodailyevents - checkflag FLAG_SYS_SHOAL_ITEM - call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_236ED9 - checkitem ITEM_SHOAL_SALT, 4 - compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B - checkitem ITEM_SHOAL_SHELL, 4 - compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B - msgbox ShoalCave_LowTideEntranceRoom_Text_2A7F37, 5 - compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236ECF - checkitemspace ITEM_SHELL_BELL, 1 - compare VAR_RESULT, 0 - call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_236E69 - compare VAR_RESULT, 2 - goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E91 - msgbox ShoalCave_LowTideEntranceRoom_Text_2A7FAC, 4 - takeitem ITEM_SHOAL_SALT, 4 - takeitem ITEM_SHOAL_SHELL, 4 - giveitem_std ITEM_SHELL_BELL - compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideEntranceRoom_EventScript_272054 - msgbox ShoalCave_LowTideEntranceRoom_Text_2A8012, 4 - setflag FLAG_0x002 - release - end - -ShoalCave_LowTideEntranceRoom_EventScript_236E69:: @ 8236E69 - checkitem ITEM_SHOAL_SALT, 5 - compare VAR_RESULT, 1 - goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E7A - return - -ShoalCave_LowTideEntranceRoom_EventScript_236E7A:: @ 8236E7A - checkitem ITEM_SHOAL_SHELL, 5 - compare VAR_RESULT, 1 - goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E8B - return - -ShoalCave_LowTideEntranceRoom_EventScript_236E8B:: @ 8236E8B - setvar VAR_RESULT, 2 - return - -ShoalCave_LowTideEntranceRoom_EventScript_236E91:: @ 8236E91 - msgbox ShoalCave_LowTideEntranceRoom_Text_2A80F5, 4 - release - end - -ShoalCave_LowTideEntranceRoom_EventScript_236E9B:: @ 8236E9B - checkitem ITEM_SHOAL_SALT, 1 - compare VAR_RESULT, 1 - goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236EC5 - checkitem ITEM_SHOAL_SHELL, 1 - compare VAR_RESULT, 1 - goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236EC5 - msgbox ShoalCave_LowTideEntranceRoom_Text_2A7E0E, 4 - release - end - -ShoalCave_LowTideEntranceRoom_EventScript_236EC5:: @ 8236EC5 - msgbox ShoalCave_LowTideEntranceRoom_Text_2A7EB3, 4 - release - end - -ShoalCave_LowTideEntranceRoom_EventScript_236ECF:: @ 8236ECF - msgbox ShoalCave_LowTideEntranceRoom_Text_2A80C6, 4 - release - end - -ShoalCave_LowTideEntranceRoom_EventScript_236ED9:: @ 8236ED9 - clearflag FLAG_0x3B8 - clearflag FLAG_0x3B9 - clearflag FLAG_0x3BA - clearflag FLAG_0x3BB - clearflag FLAG_0x3BC - clearflag FLAG_0x3BD - clearflag FLAG_0x3BE - clearflag FLAG_0x3BF - clearflag FLAG_SYS_SHOAL_ITEM - return - diff --git a/data/scripts/maps/ShoalCave_LowTideIceRoom.inc b/data/scripts/maps/ShoalCave_LowTideIceRoom.inc deleted file mode 100644 index 3f7a5cce8..000000000 --- a/data/scripts/maps/ShoalCave_LowTideIceRoom.inc +++ /dev/null @@ -1,3 +0,0 @@ -ShoalCave_LowTideIceRoom_MapScripts:: @ 82396A1 - .byte 0 - diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc deleted file mode 100644 index 94505a96d..000000000 --- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc +++ /dev/null @@ -1,158 +0,0 @@ -ShoalCave_LowTideInnerRoom_MapScripts:: @ 8236EF5 - map_script 1, ShoalCave_LowTideInnerRoom_MapScript1_236F16 - map_script 3, ShoalCave_LowTideInnerRoom_MapScript1_236F00 - .byte 0 - -ShoalCave_LowTideInnerRoom_MapScript1_236F00: @ 8236F00 - checkflag FLAG_SYS_SHOAL_TIDE - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236F0E - goto ShoalCave_LowTideInnerRoom_EventScript_236F12 - -ShoalCave_LowTideInnerRoom_EventScript_236F0E:: @ 8236F0E - setmaplayoutindex 169 - end - -ShoalCave_LowTideInnerRoom_EventScript_236F12:: @ 8236F12 - setmaplayoutindex 165 - end - -ShoalCave_LowTideInnerRoom_MapScript1_236F16: @ 8236F16 - call ShoalCave_LowTideInnerRoom_EventScript_236F1C - end - -ShoalCave_LowTideInnerRoom_EventScript_236F1C:: @ 8236F1C - checkflag FLAG_0x3B8 - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236F3D - checkflag FLAG_SYS_SHOAL_TIDE - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236F3D - setmetatile 31, 8, 856, 1 - goto ShoalCave_LowTideInnerRoom_EventScript_236F3D - end - -ShoalCave_LowTideInnerRoom_EventScript_236F3D:: @ 8236F3D - checkflag FLAG_0x3B9 - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236F5E - checkflag FLAG_SYS_SHOAL_TIDE - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236F5E - setmetatile 14, 26, 856, 1 - goto ShoalCave_LowTideInnerRoom_EventScript_236F5E - end - -ShoalCave_LowTideInnerRoom_EventScript_236F5E:: @ 8236F5E - checkflag FLAG_0x3BC - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236F76 - setmetatile 41, 20, 857, 1 - goto ShoalCave_LowTideInnerRoom_EventScript_236F76 - end - -ShoalCave_LowTideInnerRoom_EventScript_236F76:: @ 8236F76 - checkflag FLAG_0x3BD - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236F8E - setmetatile 41, 10, 857, 1 - goto ShoalCave_LowTideInnerRoom_EventScript_236F8E - end - -ShoalCave_LowTideInnerRoom_EventScript_236F8E:: @ 8236F8E - checkflag FLAG_0x3BE - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FA6 - setmetatile 6, 9, 857, 1 - goto ShoalCave_LowTideInnerRoom_EventScript_236FA6 - end - -ShoalCave_LowTideInnerRoom_EventScript_236FA6:: @ 8236FA6 - checkflag FLAG_0x3BF - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FB9 - setmetatile 16, 13, 857, 1 - return - -ShoalCave_LowTideInnerRoom_EventScript_236FB9:: @ 8236FB9 - return - -ShoalCave_LowTideInnerRoom_EventScript_236FBA:: @ 8236FBA - lockall - checkflag FLAG_0x3BC - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FEC - giveitem_std ITEM_SHOAL_SHELL - compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 - setmetatile 41, 20, 859, 0 - special DrawWholeMapView - setflag FLAG_0x3BC - releaseall - end - -ShoalCave_LowTideInnerRoom_EventScript_236FEC:: @ 8236FEC - msgbox ShoalCave_LowTideInnerRoom_Text_2A81A8, 4 - releaseall - end - -ShoalCave_LowTideInnerRoom_EventScript_236FF6:: @ 8236FF6 - lockall - checkflag FLAG_0x3BD - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FEC - giveitem_std ITEM_SHOAL_SHELL - compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 - setmetatile 41, 10, 859, 0 - special DrawWholeMapView - setflag FLAG_0x3BD - releaseall - end - -ShoalCave_LowTideInnerRoom_EventScript_237028:: @ 8237028 - lockall - checkflag FLAG_0x3BE - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FEC - giveitem_std ITEM_SHOAL_SHELL - compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 - setmetatile 6, 9, 859, 0 - special DrawWholeMapView - setflag FLAG_0x3BE - releaseall - end - -ShoalCave_LowTideInnerRoom_EventScript_23705A:: @ 823705A - lockall - checkflag FLAG_0x3BF - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FEC - giveitem_std ITEM_SHOAL_SHELL - compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 - setmetatile 16, 13, 859, 0 - special DrawWholeMapView - setflag FLAG_0x3BF - releaseall - end - -ShoalCave_LowTideInnerRoom_EventScript_23708C:: @ 823708C - lockall - checkflag FLAG_0x3B8 - goto_eq ShoalCave_LowTideInnerRoom_EventScript_2370BE - giveitem_std ITEM_SHOAL_SALT - compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 - setmetatile 31, 8, 858, 0 - special DrawWholeMapView - setflag FLAG_0x3B8 - releaseall - end - -ShoalCave_LowTideInnerRoom_EventScript_2370BE:: @ 82370BE - msgbox ShoalCave_LowTideInnerRoom_Text_2A8169, 4 - releaseall - end - -ShoalCave_LowTideInnerRoom_EventScript_2370C8:: @ 82370C8 - lockall - checkflag FLAG_0x3B9 - goto_eq ShoalCave_LowTideInnerRoom_EventScript_2370BE - giveitem_std ITEM_SHOAL_SALT - compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 - setmetatile 14, 26, 858, 0 - special DrawWholeMapView - setflag FLAG_0x3B9 - releaseall - end - diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc deleted file mode 100644 index 9883bf3da..000000000 --- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc +++ /dev/null @@ -1,63 +0,0 @@ -ShoalCave_LowTideLowerRoom_MapScripts:: @ 8237156 - map_script 1, ShoalCave_LowTideLowerRoom_MapScript1_23715C - .byte 0 - -ShoalCave_LowTideLowerRoom_MapScript1_23715C: @ 823715C - call ShoalCave_LowTideLowerRoom_EventScript_237162 - end - -ShoalCave_LowTideLowerRoom_EventScript_237162:: @ 8237162 - checkflag FLAG_0x3BB - goto_eq ShoalCave_LowTideLowerRoom_EventScript_237175 - setmetatile 18, 2, 856, 1 - return - -ShoalCave_LowTideLowerRoom_EventScript_237175:: @ 8237175 - return - -ShoalCave_LowTideLowerRoom_EventScript_237176:: @ 8237176 - lockall - checkflag FLAG_0x3BB - goto_eq ShoalCave_LowTideLowerRoom_EventScript_2371A8 - giveitem_std ITEM_SHOAL_SALT - compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideLowerRoom_EventScript_272054 - setmetatile 18, 2, 858, 0 - special DrawWholeMapView - setflag FLAG_0x3BB - releaseall - end - -ShoalCave_LowTideLowerRoom_EventScript_2371A8:: @ 82371A8 - msgbox ShoalCave_LowTideLowerRoom_Text_2A8169, 4 - releaseall - end - -ShoalCave_LowTideLowerRoom_EventScript_2371B2:: @ 82371B2 - lock - faceplayer - checkflag FLAG_0x11B - goto_eq ShoalCave_LowTideLowerRoom_EventScript_2371E1 - msgbox ShoalCave_LowTideLowerRoom_Text_2371EB, 4 - giveitem_std ITEM_FOCUS_BAND - compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideLowerRoom_EventScript_272054 - setflag FLAG_0x11B - release - end - -ShoalCave_LowTideLowerRoom_EventScript_2371E1:: @ 82371E1 - msgbox ShoalCave_LowTideLowerRoom_Text_23728D, 4 - release - end - -ShoalCave_LowTideLowerRoom_Text_2371EB: @ 82371EB - .string "The penetrating cold around these\n" - .string "parts is an impediment to training.\p" - .string "But with focus, one can overcome!\p" - .string "With this FOCUS BAND, buckle down and\n" - .string "withstand the cold!$" - -ShoalCave_LowTideLowerRoom_Text_23728D: @ 823728D - .string "Everything starts with focus!$" - diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc deleted file mode 100644 index e8c87bd98..000000000 --- a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc +++ /dev/null @@ -1,35 +0,0 @@ -ShoalCave_LowTideStairsRoom_MapScripts:: @ 82370FA - map_script 1, ShoalCave_LowTideStairsRoom_MapScript1_237100 - .byte 0 - -ShoalCave_LowTideStairsRoom_MapScript1_237100: @ 8237100 - call ShoalCave_LowTideStairsRoom_EventScript_237106 - end - -ShoalCave_LowTideStairsRoom_EventScript_237106:: @ 8237106 - checkflag FLAG_0x3BA - goto_eq ShoalCave_LowTideStairsRoom_EventScript_237119 - setmetatile 11, 11, 856, 1 - return - -ShoalCave_LowTideStairsRoom_EventScript_237119:: @ 8237119 - return - -ShoalCave_LowTideStairsRoom_EventScript_23711A:: @ 823711A - lockall - checkflag FLAG_0x3BA - goto_eq ShoalCave_LowTideStairsRoom_EventScript_23714C - giveitem_std ITEM_SHOAL_SALT - compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideStairsRoom_EventScript_272054 - setmetatile 11, 11, 858, 0 - special DrawWholeMapView - setflag FLAG_0x3BA - releaseall - end - -ShoalCave_LowTideStairsRoom_EventScript_23714C:: @ 823714C - msgbox ShoalCave_LowTideStairsRoom_Text_2A8169, 4 - releaseall - end - diff --git a/data/scripts/maps/SingleBattleColosseum.inc b/data/scripts/maps/SingleBattleColosseum.inc deleted file mode 100644 index 06ed3ef16..000000000 --- a/data/scripts/maps/SingleBattleColosseum.inc +++ /dev/null @@ -1,3 +0,0 @@ -SingleBattleColosseum_MapScripts:: @ 823B77D - .byte 0 - diff --git a/data/scripts/maps/SkyPillar_1F.inc b/data/scripts/maps/SkyPillar_1F.inc deleted file mode 100644 index 6afc5aa64..000000000 --- a/data/scripts/maps/SkyPillar_1F.inc +++ /dev/null @@ -1,13 +0,0 @@ -SkyPillar_1F_MapScripts:: @ 8239615 - map_script 3, SkyPillar_1F_MapScript1_23961B - .byte 0 - -SkyPillar_1F_MapScript1_23961B: @ 823961B - compare VAR_0x40CA, 2 - call_if 0, SkyPillar_1F_EventScript_239627 - end - -SkyPillar_1F_EventScript_239627:: @ 8239627 - setmaplayoutindex 433 - return - diff --git a/data/scripts/maps/SkyPillar_2F.inc b/data/scripts/maps/SkyPillar_2F.inc deleted file mode 100644 index c15f1f8c4..000000000 --- a/data/scripts/maps/SkyPillar_2F.inc +++ /dev/null @@ -1,21 +0,0 @@ -SkyPillar_2F_MapScripts:: @ 823962B - map_script 2, SkyPillar_2F_MapScript2_2A8327 - map_script 3, SkyPillar_2F_MapScript1_23963B - map_script 5, SkyPillar_2F_MapScript1_239650 - .byte 0 - -SkyPillar_2F_MapScript1_23963B: @ 823963B - compare VAR_0x40CA, 2 - call_if 0, SkyPillar_2F_EventScript_23964C - copyvar VAR_ICE_STEP_COUNT, 0x1 - end - -SkyPillar_2F_EventScript_23964C:: @ 823964C - setmaplayoutindex 434 - return - -SkyPillar_2F_MapScript1_239650: @ 8239650 - setstepcallback 7 - setholewarp MAP_SKY_PILLAR_1F, 255, 0, 0 - end - diff --git a/data/scripts/maps/SkyPillar_3F.inc b/data/scripts/maps/SkyPillar_3F.inc deleted file mode 100644 index 0ddae05b2..000000000 --- a/data/scripts/maps/SkyPillar_3F.inc +++ /dev/null @@ -1,13 +0,0 @@ -SkyPillar_3F_MapScripts:: @ 823965B - map_script 3, SkyPillar_3F_MapScript1_239661 - .byte 0 - -SkyPillar_3F_MapScript1_239661: @ 8239661 - compare VAR_0x40CA, 2 - call_if 0, SkyPillar_3F_EventScript_23966D - end - -SkyPillar_3F_EventScript_23966D:: @ 823966D - setmaplayoutindex 435 - return - diff --git a/data/scripts/maps/SkyPillar_4F.inc b/data/scripts/maps/SkyPillar_4F.inc deleted file mode 100644 index 3884864d7..000000000 --- a/data/scripts/maps/SkyPillar_4F.inc +++ /dev/null @@ -1,21 +0,0 @@ -SkyPillar_4F_MapScripts:: @ 8239671 - map_script 2, SkyPillar_4F_MapScript2_2A8327 - map_script 3, SkyPillar_4F_MapScript1_239681 - map_script 5, SkyPillar_4F_MapScript1_239696 - .byte 0 - -SkyPillar_4F_MapScript1_239681: @ 8239681 - compare VAR_0x40CA, 2 - call_if 0, SkyPillar_4F_EventScript_239692 - copyvar VAR_ICE_STEP_COUNT, 0x1 - end - -SkyPillar_4F_EventScript_239692:: @ 8239692 - setmaplayoutindex 436 - return - -SkyPillar_4F_MapScript1_239696: @ 8239696 - setstepcallback 7 - setholewarp MAP_SKY_PILLAR_3F, 255, 0, 0 - end - diff --git a/data/scripts/maps/SkyPillar_5F.inc b/data/scripts/maps/SkyPillar_5F.inc deleted file mode 100644 index 8e08fb2bd..000000000 --- a/data/scripts/maps/SkyPillar_5F.inc +++ /dev/null @@ -1,13 +0,0 @@ -SkyPillar_5F_MapScripts:: @ 82396A2 - map_script 3, SkyPillar_5F_MapScript1_2396A8 - .byte 0 - -SkyPillar_5F_MapScript1_2396A8: @ 82396A8 - compare VAR_0x40CA, 2 - call_if 0, SkyPillar_5F_EventScript_2396B4 - return - -SkyPillar_5F_EventScript_2396B4:: @ 82396B4 - setmaplayoutindex 437 - return - diff --git a/data/scripts/maps/SkyPillar_Entrance.inc b/data/scripts/maps/SkyPillar_Entrance.inc deleted file mode 100644 index 09ee9eae2..000000000 --- a/data/scripts/maps/SkyPillar_Entrance.inc +++ /dev/null @@ -1,8 +0,0 @@ -SkyPillar_Entrance_MapScripts:: @ 823929E - map_script 3, SkyPillar_Entrance_MapScript1_2392A4 - .byte 0 - -SkyPillar_Entrance_MapScript1_2392A4: @ 82392A4 - setflag FLAG_LANDMARK_SKY_PILLAR - end - diff --git a/data/scripts/maps/SkyPillar_Outside.inc b/data/scripts/maps/SkyPillar_Outside.inc deleted file mode 100644 index e9fbf4ad6..000000000 --- a/data/scripts/maps/SkyPillar_Outside.inc +++ /dev/null @@ -1,174 +0,0 @@ -SkyPillar_Outside_MapScripts:: @ 82392A8 - map_script 3, SkyPillar_Outside_MapScript1_2392B8 - map_script 1, SkyPillar_Outside_MapScript1_2392DD - map_script 2, SkyPillar_Outside_MapScript2_2392FA - .byte 0 - -SkyPillar_Outside_MapScript1_2392B8: @ 82392B8 - compare VAR_0x405E, 3 - call_if 1, SkyPillar_Outside_EventScript_2392CF - compare VAR_0x405E, 4 - call_if 4, SkyPillar_Outside_EventScript_2392D3 - end - -SkyPillar_Outside_EventScript_2392CF:: @ 82392CF - setflag FLAG_SPECIAL_FLAG_0x4000 - return - -SkyPillar_Outside_EventScript_2392D3:: @ 82392D3 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, SkyPillar_Outside_EventScript_27207A - return - -SkyPillar_Outside_MapScript1_2392DD: @ 82392DD - checkflag FLAG_0x137 - call_if 1, SkyPillar_Outside_EventScript_2392E7 - end - -SkyPillar_Outside_EventScript_2392E7:: @ 82392E7 - setmetatile 14, 4, 682, 0 - setmetatile 14, 5, 690, 0 - return - -SkyPillar_Outside_MapScript2_2392FA: @ 82392FA - map_script_2 VAR_0x405E, 3, SkyPillar_Outside_EventScript_239304 - .2byte 0 - -SkyPillar_Outside_EventScript_239304:: @ 8239304 - lockall - applymovement 1, SkyPillar_Outside_Movement_2393D3 - waitmovement 0 - applymovement 255, SkyPillar_Outside_Movement_2725A4 - waitmovement 0 - msgbox SkyPillar_Outside_Text_239416, 4 - closemessage - delay 30 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 3 - special sub_8139560 - waitstate - delay 40 - msgbox SkyPillar_Outside_Text_2394BC, 4 - closemessage - applymovement 255, SkyPillar_Outside_Movement_2393EB - applymovement 1, SkyPillar_Outside_Movement_2393DE - waitmovement 0 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 20 - setvar VAR_0x8007, 5 - special sub_8139560 - waitstate - delay 20 - applymovement 1, SkyPillar_Outside_Movement_2725A4 - waitmovement 0 - delay 10 - applymovement 1, SkyPillar_Outside_Movement_2725A8 - waitmovement 0 - delay 20 - applymovement 1, SkyPillar_Outside_Movement_2725AA - waitmovement 0 - delay 30 - msgbox SkyPillar_Outside_Text_23950C, 4 - closemessage - setflag FLAG_SYS_WEATHER_CTRL - setweather 15 - doweather - special WaitWeather - waitstate - delay 30 - msgbox SkyPillar_Outside_Text_23953A, 4 - closemessage - playse SE_KAIDAN - fadescreenswapbuffers 1 - clearflag FLAG_SPECIAL_FLAG_0x4000 - setvar VAR_0x405E, 4 - removeobject 1 - clearflag FLAG_0x330 - fadescreenswapbuffers 0 - releaseall - end - -SkyPillar_Outside_Movement_2393D3: @ 82393D3 - 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 - 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 - 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 - end - -SkyPillar_Outside_EventScript_2393F9:: @ 82393F9 - msgbox SkyPillar_Outside_Text_239402, 3 - end - -SkyPillar_Outside_Text_239402: @ 8239402 - .string "The door is closed.$" - -SkyPillar_Outside_Text_239416: @ 8239416 - .string "WALLACE: Oh, my, I’m terribly sorry!\p" - .string "In my haste, I didn’t notice that\n" - .string "I’d left you behind!\p" - .string "I’ve opened the locked door of\n" - .string "the SKY PILLAR.\p" - .string "{PLAYER}{KUN}, let’s be on our way!$" - -SkyPillar_Outside_Text_2394BC: @ 82394BC - .string "WALLACE: It’s an earthquake!\p" - .string "There’s not a moment to waste!\n" - .string "We’ve got to hurry!$" - -SkyPillar_Outside_Text_23950C: @ 823950C - .string "WALLACE: Hmm…\n" - .string "The situation is getting worse…$" - -SkyPillar_Outside_Text_23953A: @ 823953A - .string "WALLACE: This isn’t good…\p" - .string "The weather distortion is spreading\n" - .string "even here…\p" - .string "{PLAYER}{KUN}.\p" - .string "RAYQUAZA should be farther up\n" - .string "from here.\p" - .string "I’m worried about SOOTOPOLIS.\n" - .string "I’ve got to go back.\p" - .string "Everything is in your hands now.\n" - .string "Don’t fail us!$" diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc deleted file mode 100644 index 334acc8ac..000000000 --- a/data/scripts/maps/SkyPillar_Top.inc +++ /dev/null @@ -1,189 +0,0 @@ -SkyPillar_Top_MapScripts:: @ 82396B8 - map_script 5, SkyPillar_Top_MapScript1_2396C8 - map_script 3, SkyPillar_Top_MapScript1_2396E6 - map_script 4, SkyPillar_Top_MapScript2_239713 - .byte 0 - -SkyPillar_Top_MapScript1_2396C8: @ 82396C8 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, SkyPillar_Top_EventScript_2396D2 - end - -SkyPillar_Top_EventScript_2396D2:: @ 82396D2 - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 7 - goto_if 5, SkyPillar_Top_EventScript_27374E - removeobject VAR_LAST_TALKED - return - -SkyPillar_Top_MapScript1_2396E6: @ 82396E6 - compare VAR_0x40CA, 2 - call_if 0, SkyPillar_Top_EventScript_2396FD - compare VAR_0x40CA, 2 - call_if 4, SkyPillar_Top_EventScript_239705 - end - -SkyPillar_Top_EventScript_2396FD:: @ 82396FD - setmaplayoutindex 438 - setobjectmovementtype 1, 8 - return - -SkyPillar_Top_EventScript_239705:: @ 8239705 - checkflag FLAG_0x1C0 - call_if 0, SkyPillar_Top_EventScript_23970F - return - -SkyPillar_Top_EventScript_23970F:: @ 823970F - clearflag FLAG_0x050 - return - -SkyPillar_Top_MapScript2_239713: @ 8239713 - map_script_2 VAR_0x40CA, 0, SkyPillar_Top_EventScript_23971D - .2byte 0 - -SkyPillar_Top_EventScript_23971D:: @ 823971D - turnobject 1, 1 - end - -SkyPillar_Top_EventScript_239722:: @ 8239722 - lockall - waitse - playmoncry SPECIES_RAYQUAZA, 2 - delay 40 - waitmoncry - setwildbattle SPECIES_RAYQUAZA, 70, ITEM_NONE - setflag FLAG_SYS_CTRL_OBJ_DELETE - special BattleSetup_StartLegendaryBattle - waitstate - clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 1 - goto_eq SkyPillar_Top_EventScript_239768 - compare VAR_RESULT, 4 - goto_eq SkyPillar_Top_EventScript_239771 - compare VAR_RESULT, 5 - goto_eq SkyPillar_Top_EventScript_239771 - setflag FLAG_0x1C0 - releaseall - end - -SkyPillar_Top_EventScript_239768:: @ 8239768 - setflag FLAG_0x1C0 - goto SkyPillar_Top_EventScript_23977C - end - -SkyPillar_Top_EventScript_239771:: @ 8239771 - setvar VAR_0x8004, 406 - goto SkyPillar_Top_EventScript_239785 - end - -SkyPillar_Top_EventScript_23977C:: @ 823977C - fadescreenswapbuffers 1 - removeobject VAR_LAST_TALKED - fadescreenswapbuffers 0 - releaseall - end - -SkyPillar_Top_EventScript_239785:: @ 8239785 - fadescreenswapbuffers 1 - removeobject VAR_LAST_TALKED - fadescreenswapbuffers 0 - bufferspeciesname 0, VAR_0x8004 - msgbox gUnknown_08273204, 4 - releaseall - end - -SkyPillar_Top_EventScript_23979A:: @ 823979A - lockall - fadeoutbgm 1 - applymovement 255, SkyPillar_Top_Movement_2725B2 - waitmovement 0 - special SpawnScriptEventObject - applymovement 127, SkyPillar_Top_Movement_239858 - waitmovement 0 - special RemoveScriptEventObject - applymovement 1, SkyPillar_Top_Movement_23983A - waitmovement 0 - waitse - playmoncry SPECIES_RAYQUAZA, 2 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 3 - special sub_8139560 - waitstate - waitse - playmoncry SPECIES_RAYQUAZA, 2 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 5 - special sub_8139560 - waitstate - waitmoncry - applymovement 1, SkyPillar_Top_Movement_23984B - waitmovement 0 - removeobject 1 - msgbox SkyPillar_Top_Text_239860, 4 - closemessage - delay 20 - fadeinbgm 1 - special SpawnScriptEventObject - applymovement 127, SkyPillar_Top_Movement_23985C - waitmovement 0 - special RemoveScriptEventObject - setvar VAR_0x405E, 5 - setvar VAR_0x40CA, 1 - setvar VAR_0x40D7, 1 - releaseall - end - -SkyPillar_Top_Movement_23983A: @ 823983A - 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 - 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 - walk_slow_up - walk_slow_up - walk_slow_up - step_end - -SkyPillar_Top_Movement_23985C: @ 823985C - walk_slow_down - walk_slow_down - walk_slow_down - step_end - -SkyPillar_Top_Text_239860: @ 8239860 - .string "The awakened RAYQUAZA flew off…$" - diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc deleted file mode 100644 index 9a5e41b15..000000000 --- a/data/scripts/maps/SlateportCity.inc +++ /dev/null @@ -1,1383 +0,0 @@ -SlateportCity_MapScripts:: @ 81DCC61 - map_script 3, SlateportCity_MapScript1_1DCC6C - map_script 2, SlateportCity_MapScript2_1DCD12 - .byte 0 - -SlateportCity_MapScript1_1DCC6C: @ 81DCC6C - setvar VAR_0x40AA, 0 - call SlateportCity_EventScript_1DCC8D - compare VAR_0x4058, 1 - call_if 1, SlateportCity_EventScript_1DCC99 - compare VAR_0x40D2, 1 - call_if 1, SlateportCity_EventScript_1DCCE7 - end - -SlateportCity_EventScript_1DCC8D:: @ 81DCC8D - setflag FLAG_VISITED_SLATEPORT_CITY - setvar VAR_0x4086, 0 - setflag FLAG_0x323 - return - -SlateportCity_EventScript_1DCC99:: @ 81DCC99 - setobjectxyperm 11, 28, 13 - setobjectxyperm 7, 25, 13 - setobjectxyperm 3, 25, 14 - setobjectxyperm 6, 27, 16 - setobjectxyperm 8, 28, 16 - setobjectxyperm 1, 29, 16 - setobjectxyperm 2, 31, 14 - setobjectmovementtype 11, 8 - setobjectmovementtype 7, 18 - setobjectmovementtype 3, 16 - setobjectmovementtype 6, 7 - setobjectmovementtype 8, 7 - setobjectmovementtype 1, 7 - setobjectmovementtype 2, 9 - return - -SlateportCity_EventScript_1DCCE7:: @ 81DCCE7 - setflag FLAG_SPECIAL_FLAG_0x4000 - getplayerxy VAR_0x8004, VAR_0x8005 - compare VAR_0x8004, 30 - goto_eq SlateportCity_EventScript_1DCD06 - setobjectxyperm 35, 23, 27 - setobjectmovementtype 35, 10 - return - -SlateportCity_EventScript_1DCD06:: @ 81DCD06 - setobjectxyperm 35, 22, 27 - setobjectmovementtype 35, 10 - return - -SlateportCity_MapScript2_1DCD12: @ 81DCD12 - map_script_2 VAR_0x40D2, 1, SlateportCity_EventScript_1DCD1C - .2byte 0 - -SlateportCity_EventScript_1DCD1C:: @ 81DCD1C - lockall - addobject 35 - applymovement 255, SlateportCity_Movement_1DCDA8 - applymovement 35, SlateportCity_Movement_1DCDAC - waitmovement 0 - msgbox SlateportCity_Text_1DF032, 4 - closemessage - applymovement 35, SlateportCity_Movement_2725A4 - waitmovement 0 - delay 60 - msgbox SlateportCity_Text_1DF0FE, 4 - applymovement 35, SlateportCity_Movement_2725A8 - waitmovement 0 - msgbox SlateportCity_Text_1DF12B, 4 - closemessage - delay 30 - playfanfare MUS_ME_TORE_EYE - msgbox SlateportCity_Text_1DF1A6, 4 - waitfanfare - closemessage - delay 30 - setflag FLAG_0x0D7 - msgbox SlateportCity_Text_1DF1D3, 4 - closemessage - applymovement 35, SlateportCity_Movement_1DCDB4 - waitmovement 0 - removeobject 35 - setobjectxyperm 35, 10, 12 - setobjectmovementtype 35, 8 - clearflag FLAG_SPECIAL_FLAG_0x4000 - setvar VAR_0x40D2, 2 - addvar VAR_0x40D1, 1 - releaseall - end - -SlateportCity_Movement_1DCDA8: @ 81DCDA8 - delay_16 - delay_8 - walk_in_place_fastest_left - step_end - -SlateportCity_Movement_1DCDAC: @ 81DCDAC - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - step_end - -SlateportCity_Movement_1DCDB4: @ 81DCDB4 - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - step_end - -SlateportCity_EventScript_1DCDBD:: @ 81DCDBD - lock - faceplayer - message SlateportCity_Text_1DD64A - waitmessage - pokemart SlateportCity_Pokemart_1DCDD4 - msgbox gUnknown_08272A3F, 4 - release - end - -SlateportCity_Pokemart_1DCDD4: @ 81DCDD4 - .2byte ITEM_PROTEIN - .2byte ITEM_IRON - .2byte ITEM_CARBOS - .2byte ITEM_ZINC - .2byte ITEM_CALCIUM - .2byte ITEM_HP_UP - .2byte ITEM_NONE - release - end - -SlateportCity_EventScript_1DCDE4:: @ 81DCDE4 - lock - faceplayer - bufferleadmonspeciesname 0 - msgbox SlateportCity_Text_1DD68A, 4 - specialvar VAR_RESULT, LeadMonHasEffortRibbon - compare VAR_RESULT, 1 - call_if 1, SlateportCity_EventScript_1DCE38 - specialvar VAR_RESULT, Special_AreLeadMonEVsMaxedOut - compare VAR_RESULT, 0 - call_if 1, SlateportCity_EventScript_1DCE2E - msgbox SlateportCity_Text_1DD697, 4 - playfanfare MUS_FANFA4 - message SlateportCity_Text_1DD6E3 - waitfanfare - msgbox SlateportCity_Text_1DD702, 4 - special GiveLeadMonEffortRibbon - release - end - -SlateportCity_EventScript_1DCE2E:: @ 81DCE2E - msgbox SlateportCity_Text_1DD722, 4 - release - end - -SlateportCity_EventScript_1DCE38:: @ 81DCE38 - msgbox SlateportCity_Text_1DD77B, 4 - release - end - -SlateportCity_EventScript_1DCE42:: @ 81DCE42 - lock - faceplayer - compare VAR_0x4058, 1 - call_if 1, SlateportCity_EventScript_1DCE59 - msgbox SlateportCity_Text_1DD81A, 4 - release - end - -SlateportCity_EventScript_1DCE59:: @ 81DCE59 - msgbox SlateportCity_Text_1DE3E2, 4 - release - end - -SlateportCity_EventScript_1DCE63:: @ 81DCE63 - lock - faceplayer - compare VAR_0x4058, 1 - call_if 1, SlateportCity_EventScript_1DCE7A - msgbox SlateportCity_Text_1DD8A6, 4 - release - end - -SlateportCity_EventScript_1DCE7A:: @ 81DCE7A - msgbox SlateportCity_Text_1DE28E, 4 - release - end - -SlateportCity_EventScript_1DCE84:: @ 81DCE84 - lock - faceplayer - compare VAR_0x4058, 1 - call_if 1, SlateportCity_EventScript_1DCEA4 - checkflag FLAG_0x060 - goto_eq SlateportCity_EventScript_1DCEAE - msgbox SlateportCity_Text_1DD93D, 4 - release - end - -SlateportCity_EventScript_1DCEA4:: @ 81DCEA4 - msgbox SlateportCity_Text_1DE30C, 4 - release - end - -SlateportCity_EventScript_1DCEAE:: @ 81DCEAE - msgbox SlateportCity_Text_1DD999, 4 - release - end - -SlateportCity_EventScript_1DCEB8:: @ 81DCEB8 - lock - faceplayer - compare VAR_0x4058, 1 - call_if 1, SlateportCity_EventScript_1DCECF - msgbox SlateportCity_Text_1DDA34, 4 - release - end - -SlateportCity_EventScript_1DCECF:: @ 81DCECF - msgbox SlateportCity_Text_1DE376, 4 - release - end - -SlateportCity_EventScript_1DCED9:: @ 81DCED9 - compare VAR_0x4058, 1 - goto_eq SlateportCity_EventScript_1DCEED - msgbox SlateportCity_Text_1DDA9A, 2 - end - -SlateportCity_EventScript_1DCEED:: @ 81DCEED - msgbox SlateportCity_Text_1DE43D, 3 - end - -SlateportCity_EventScript_1DCEF6:: @ 81DCEF6 - lock - faceplayer - compare VAR_0x4058, 1 - call_if 1, SlateportCity_EventScript_1DCF0D - msgbox SlateportCity_Text_1DDB21, 4 - release - end - -SlateportCity_EventScript_1DCF0D:: @ 81DCF0D - msgbox SlateportCity_Text_1DE460, 4 - release - end - -SlateportCity_EventScript_1DCF17:: @ 81DCF17 - lock - faceplayer - checkflag FLAG_0x094 - goto_eq SlateportCity_EventScript_1DCF2C - msgbox SlateportCity_Text_1DDBAC, 4 - release - end - -SlateportCity_EventScript_1DCF2C:: @ 81DCF2C - msgbox SlateportCity_Text_1DDBD5, 4 - release - end - -SlateportCity_EventScript_1DCF36:: @ 81DCF36 - msgbox SlateportCity_Text_1DE8BC, 3 - end - -SlateportCity_EventScript_1DCF3F:: @ 81DCF3F - lockall - checkflag FLAG_SYS_GAME_CLEAR - goto_eq SlateportCity_EventScript_1DCF66 - checkflag FLAG_BADGE07_GET - goto_eq SlateportCity_EventScript_1DCF5C - msgbox SlateportCity_Text_1DE8F8, 4 - releaseall - end - -SlateportCity_EventScript_1DCF5C:: @ 81DCF5C - msgbox SlateportCity_Text_1DE940, 4 - releaseall - end - -SlateportCity_EventScript_1DCF66:: @ 81DCF66 - msgbox SlateportCity_Text_1DE9AA, 4 - releaseall - end - -SlateportCity_EventScript_1DCF70:: @ 81DCF70 - msgbox SlateportCity_Text_1DEA0B, 3 - end - -SlateportCity_EventScript_1DCF79:: @ 81DCF79 - msgbox SlateportCity_Text_1DEA3B, 3 - end - -SlateportCity_EventScript_1DCF82:: @ 81DCF82 - msgbox SlateportCity_Text_1DEA6F, 3 - end - -SlateportCity_EventScript_1DCF8B:: @ 81DCF8B - msgbox SlateportCity_Text_1DEAAF, 3 - end - -SlateportCity_EventScript_1DCF94:: @ 81DCF94 - lockall - checkflag FLAG_SYS_GAME_CLEAR - goto_eq SlateportCity_EventScript_1DCFA8 - msgbox SlateportCity_Text_1DEAE3, 4 - releaseall - end - -SlateportCity_EventScript_1DCFA8:: @ 81DCFA8 - msgbox SlateportCity_Text_1DEB5A, 4 - releaseall - end - -SlateportCity_EventScript_1DCFB2:: @ 81DCFB2 - msgbox SlateportCity_Text_1DEBA0, 3 - end - -SlateportCity_EventScript_1DCFBB:: @ 81DCFBB - lock - faceplayer - compare VAR_0x4058, 1 - call_if 1, SlateportCity_EventScript_1DCFD2 - msgbox SlateportCity_Text_1DE10E, 4 - release - end - -SlateportCity_EventScript_1DCFD2:: @ 81DCFD2 - msgbox SlateportCity_Text_1DE10E, 4 - release - end - -SlateportCity_EventScript_1DCFDC:: @ 81DCFDC - msgbox SlateportCity_Text_1DE16C, 2 - end - -SlateportCity_EventScript_1DCFE5:: @ 81DCFE5 - msgbox SlateportCity_Text_1DDFF7, 2 - end - -SlateportCity_EventScript_1DCFEE:: @ 81DCFEE - msgbox SlateportCity_Text_1DE04B, 2 - end - -SlateportCity_EventScript_1DCFF7:: @ 81DCFF7 - msgbox SlateportCity_Text_1DE0D2, 2 - end - -SlateportCity_EventScript_1DD000:: @ 81DD000 - msgbox SlateportCity_Text_1DE1EC, 2 - end - -SlateportCity_EventScript_1DD009:: @ 81DD009 - lock - faceplayer - msgbox SlateportCity_Text_1DDC4F, 4 - closemessage - applymovement 5, SlateportCity_Movement_2725A2 - waitmovement 0 - release - end - -SlateportCity_EventScript_1DD020:: @ 81DD020 - lock - faceplayer - msgbox SlateportCity_Text_1DDC8A, 4 - closemessage - applymovement 18, SlateportCity_Movement_2725A2 - waitmovement 0 - release - end - -SlateportCity_EventScript_1DD037:: @ 81DD037 - lock - faceplayer - msgbox SlateportCity_Text_1DDCD5, 4 - closemessage - applymovement 19, SlateportCity_Movement_2725A2 - waitmovement 0 - release - end - -SlateportCity_EventScript_1DD04E:: @ 81DD04E - lock - faceplayer - msgbox SlateportCity_Text_1DDD18, 4 - closemessage - applymovement 26, SlateportCity_Movement_2725A2 - waitmovement 0 - release - end - -SlateportCity_EventScript_1DD065:: @ 81DD065 - lock - faceplayer - msgbox SlateportCity_Text_1DDD7D, 4 - closemessage - applymovement 27, SlateportCity_Movement_2725A2 - waitmovement 0 - release - end - -SlateportCity_EventScript_1DD07C:: @ 81DD07C - lock - faceplayer - msgbox SlateportCity_Text_1DDDC0, 4 - closemessage - applymovement 28, SlateportCity_Movement_2725A2 - waitmovement 0 - release - end - -SlateportCity_EventScript_1DD093:: @ 81DD093 - lock - faceplayer - msgbox SlateportCity_Text_1DDDDF, 4 - closemessage - applymovement 29, SlateportCity_Movement_2725A2 - waitmovement 0 - release - end - -SlateportCity_EventScript_1DD0AA:: @ 81DD0AA - lock - faceplayer - msgbox SlateportCity_Text_1DDE2F, 4 - closemessage - applymovement 30, SlateportCity_Movement_2725A2 - waitmovement 0 - release - end - -SlateportCity_EventScript_1DD0C1:: @ 81DD0C1 - lock - faceplayer - playse SE_PIN - applymovement 31, SlateportCity_Movement_272598 - waitmovement 0 - applymovement 31, SlateportCity_Movement_27259A - waitmovement 0 - msgbox SlateportCity_Text_1DDE6E, 4 - closemessage - applymovement 31, SlateportCity_Movement_2725A2 - waitmovement 0 - applymovement 31, SlateportCity_Movement_1DD147 - waitmovement 0 - applymovement 31, SlateportCity_Movement_27259E - waitmovement 0 - msgbox SlateportCity_Text_1DDE86, 4 - closemessage - applymovement 31, SlateportCity_Movement_2725A2 - waitmovement 0 - applymovement 31, SlateportCity_Movement_1DD147 - waitmovement 0 - msgbox SlateportCity_Text_1DDEB8, 4 - closemessage - applymovement 31, SlateportCity_Movement_27259E - waitmovement 0 - applymovement 31, SlateportCity_Movement_1DD147 - waitmovement 0 - applymovement 31, SlateportCity_Movement_2725A2 - waitmovement 0 - release - end - -SlateportCity_Movement_1DD147: @ 81DD147 - delay_16 - delay_16 - step_end - -SlateportCity_EventScript_1DD14A:: @ 81DD14A - msgbox SlateportCity_Text_1DDF32, 3 - end - -SlateportCity_EventScript_1DD153:: @ 81DD153 - lock - faceplayer - msgbox SlateportCity_Text_1DDF8D, 4 - closemessage - applymovement 33, SlateportCity_Movement_2725A2 - waitmovement 0 - release - end - -SlateportCity_EventScript_1DD16A:: @ 81DD16A - lock - faceplayer - message gUnknown_08272A21 - waitmessage - pokemartdecoration SlateportCity_PokemartDecor_1DD184 - msgbox gUnknown_08272A3F, 4 - release - end - - .align 2 -SlateportCity_PokemartDecor_1DD184: @ 81DD184 - .2byte 95 - .2byte 78 - .2byte 96 - .2byte 0 - release - end - -SlateportCity_EventScript_1DD18E:: @ 81DD18E - msgbox gUnknown_08272E30, 4 - release - end - -SlateportCity_EventScript_1DD198:: @ 81DD198 - lock - faceplayer - checkflag FLAG_0x060 - goto_if 0, SlateportCity_EventScript_1DD18E - message gUnknown_08272A21 - waitmessage - pokemartdecoration SlateportCity_PokemartDecor_1DD1B8 - msgbox gUnknown_08272A3F, 4 - release - end - -SlateportCity_PokemartDecor_1DD1B8: @ 81DD1B8 - .2byte 25 - .2byte 27 - .2byte 26 - .2byte 28 - .2byte 29 - .2byte 30 - .2byte 51 - .2byte 52 - .2byte 53 - .2byte 54 - .2byte 55 - .2byte 56 - .2byte 57 - .2byte 58 - .2byte 0 - release - end - -SlateportCity_EventScript_1DD1D8:: @ 81DD1D8 - lock - faceplayer - message gUnknown_08272A21 - waitmessage - pokemart SlateportCity_Pokemart_1DD1F0 - msgbox gUnknown_08272A3F, 4 - release - end - - .align 2 -SlateportCity_Pokemart_1DD1F0: @ 81DD1F0 - .2byte ITEM_TM10 - .2byte ITEM_TM43 - .2byte ITEM_NONE - release - end - -SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 - lockall - msgbox SlateportCity_Text_1DE502, 4 - msgbox SlateportCity_Text_1DE54A, 4 - closemessage - applymovement 10, SlateportCity_Movement_2725A8 - waitmovement 0 - delay 10 - applymovement 9, SlateportCity_Movement_2725AA - waitmovement 0 - delay 25 - applymovement 11, SlateportCity_Movement_1DD33C - applymovement 255, SlateportCity_Movement_1DD34A - applymovement 10, SlateportCity_Movement_1DD319 - applymovement 9, SlateportCity_Movement_1DD326 - waitmovement 0 - removeobject 10 - removeobject 9 - msgbox SlateportCity_Text_1DE5F7, 4 - applymovement 11, SlateportCity_Movement_2725A6 - waitmovement 0 - msgbox SlateportCity_Text_1DE64F, 4 - playbgm MUS_AQA_0, 0 - msgbox SlateportCity_Text_1DE724, 4 - applymovement 6, SlateportCity_Movement_2725A4 - applymovement 1, SlateportCity_Movement_2725A4 - applymovement 7, SlateportCity_Movement_1DD309 - applymovement 3, SlateportCity_Movement_272596 - applymovement 2, SlateportCity_Movement_1DD311 - waitmovement 0 - applymovement 11, SlateportCity_Movement_2725AA - waitmovement 0 - msgbox SlateportCity_Text_1DE7F7, 4 - playse SE_PIN - applymovement 11, SlateportCity_Movement_272598 - waitmovement 0 - applymovement 11, SlateportCity_Movement_27259A - waitmovement 0 - applymovement 11, SlateportCity_Movement_2725A6 - waitmovement 0 - msgbox SlateportCity_Text_1DE860, 4 - msgbox SlateportCity_Text_1DE8A0, 4 - closemessage - applymovement 11, SlateportCity_Movement_1DD337 - applymovement 255, SlateportCity_Movement_1DD344 - waitmovement 0 - removeobject 11 - clearflag FLAG_0x349 - clearflag FLAG_0x350 - clearflag FLAG_0x34D - clearflag FLAG_0x34E - setvar VAR_0x4058, 2 - warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14 - waitstate - releaseall - end - -SlateportCity_Movement_1DD309: @ 81DD309 - 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 - 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 - 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 - 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 - walk_down - walk_in_place_fastest_up - step_end - -SlateportCity_Movement_1DD337: @ 81DD337 - walk_right - walk_up - walk_up - set_invisible - step_end - -SlateportCity_Movement_1DD33C: @ 81DD33C - delay_16 - delay_16 - delay_16 - delay_16 - delay_16 - walk_down - walk_left - step_end - -SlateportCity_Movement_1DD344: @ 81DD344 - walk_in_place_fastest_right - delay_16 - delay_16 - walk_right - walk_up - step_end - -SlateportCity_Movement_1DD34A: @ 81DD34A - 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 - msgbox SlateportCity_Text_1DE491, 3 - end - -SlateportCity_EventScript_1DD35C:: @ 81DD35C - msgbox SlateportCity_Text_1DE4C4, 3 - end - -SlateportCity_EventScript_1DD365:: @ 81DD365 - msgbox SlateportCity_Text_1DD7AD, 2 - end - -SlateportCity_EventScript_1DD36E:: @ 81DD36E - lock - faceplayer - checkflag FLAG_0x151 - goto_eq SlateportCity_EventScript_1DD39A - msgbox SlateportCity_Text_1DEBCE, 4 - giveitem_std ITEM_POWDER_JAR - setflag FLAG_0x151 - msgbox SlateportCity_Text_1DED27, 4 - release - end - -SlateportCity_EventScript_1DD39A:: @ 81DD39A - setvar VAR_0x8004, 1 - specialvar VAR_RESULT, sub_80246D4 - compare VAR_RESULT, 0 - goto_eq SlateportCity_EventScript_1DD3C0 - msgbox SlateportCity_Text_1DEE40, 4 - special sub_80248B0 - goto SlateportCity_EventScript_1DD3CA - end - -SlateportCity_EventScript_1DD3C0:: @ 81DD3C0 - msgbox SlateportCity_Text_1DED27, 4 - release - end - -SlateportCity_EventScript_1DD3CA:: @ 81DD3CA - message SlateportCity_Text_1DEE67 - waitmessage - setvar VAR_0x8004, 7 - special sub_813A128 - waitstate - switch VAR_RESULT - case 0, SlateportCity_EventScript_1DD46E - case 1, SlateportCity_EventScript_1DD482 - case 2, SlateportCity_EventScript_1DD496 - case 3, SlateportCity_EventScript_1DD4AA - case 4, SlateportCity_EventScript_1DD4BE - case 5, SlateportCity_EventScript_1DD4D2 - case 6, SlateportCity_EventScript_1DD4E6 - case 7, SlateportCity_EventScript_1DD4FA - case 8, SlateportCity_EventScript_1DD50E - case 9, SlateportCity_EventScript_1DD522 - case 10, SlateportCity_EventScript_1DD536 - case 11, SlateportCity_EventScript_1DD54A - case 127, SlateportCity_EventScript_1DD54A - end - -SlateportCity_EventScript_1DD46E:: @ 81DD46E - bufferitemname 0, ITEM_ENERGY_POWDER - setvar VAR_0x8008, 30 - setvar VAR_0x8009, 50 - goto SlateportCity_EventScript_1DD557 - end - -SlateportCity_EventScript_1DD482:: @ 81DD482 - bufferitemname 0, ITEM_ENERGY_ROOT - setvar VAR_0x8008, 31 - setvar VAR_0x8009, 80 - goto SlateportCity_EventScript_1DD557 - end - -SlateportCity_EventScript_1DD496:: @ 81DD496 - bufferitemname 0, ITEM_HEAL_POWDER - setvar VAR_0x8008, 32 - setvar VAR_0x8009, 50 - goto SlateportCity_EventScript_1DD557 - end - -SlateportCity_EventScript_1DD4AA:: @ 81DD4AA - bufferitemname 0, ITEM_REVIVAL_HERB - setvar VAR_0x8008, 33 - setvar VAR_0x8009, 300 - goto SlateportCity_EventScript_1DD557 - end - -SlateportCity_EventScript_1DD4BE:: @ 81DD4BE - bufferitemname 0, ITEM_PROTEIN - setvar VAR_0x8008, 64 - setvar VAR_0x8009, 1000 - goto SlateportCity_EventScript_1DD557 - end - -SlateportCity_EventScript_1DD4D2:: @ 81DD4D2 - bufferitemname 0, ITEM_IRON - setvar VAR_0x8008, 65 - setvar VAR_0x8009, 1000 - goto SlateportCity_EventScript_1DD557 - end - -SlateportCity_EventScript_1DD4E6:: @ 81DD4E6 - bufferitemname 0, ITEM_CARBOS - setvar VAR_0x8008, 66 - setvar VAR_0x8009, 1000 - goto SlateportCity_EventScript_1DD557 - end - -SlateportCity_EventScript_1DD4FA:: @ 81DD4FA - bufferitemname 0, ITEM_CALCIUM - setvar VAR_0x8008, 67 - setvar VAR_0x8009, 1000 - goto SlateportCity_EventScript_1DD557 - end - -SlateportCity_EventScript_1DD50E:: @ 81DD50E - bufferitemname 0, ITEM_ZINC - setvar VAR_0x8008, 70 - setvar VAR_0x8009, 1000 - goto SlateportCity_EventScript_1DD557 - end - -SlateportCity_EventScript_1DD522:: @ 81DD522 - bufferitemname 0, ITEM_HP_UP - setvar VAR_0x8008, 63 - setvar VAR_0x8009, 1000 - goto SlateportCity_EventScript_1DD557 - end - -SlateportCity_EventScript_1DD536:: @ 81DD536 - bufferitemname 0, ITEM_PP_UP - setvar VAR_0x8008, 69 - setvar VAR_0x8009, 3000 - goto SlateportCity_EventScript_1DD557 - end - -SlateportCity_EventScript_1DD54A:: @ 81DD54A - msgbox SlateportCity_Text_1DEFBC, 4 - special sub_8024918 - release - end - -SlateportCity_EventScript_1DD557:: @ 81DD557 - msgbox SlateportCity_Text_1DEE90, 5 - compare VAR_RESULT, 0 - goto_eq SlateportCity_EventScript_1DD3CA - copyvar VAR_0x8004, VAR_0x8009 - specialvar VAR_RESULT, sub_80246D4 - compare VAR_RESULT, 0 - goto_eq SlateportCity_EventScript_1DD5CE - giveitem_std VAR_0x8008 - compare VAR_RESULT, 0 - goto_eq SlateportCity_EventScript_1DD5C1 - copyvar VAR_0x8004, VAR_0x8009 - special sub_802477C - special sub_802488C - msgbox SlateportCity_Text_1DEEF7, 5 - compare VAR_RESULT, 1 - goto_eq SlateportCity_EventScript_1DD3CA - msgbox SlateportCity_Text_1DEF79, 4 - special sub_8024918 - release - end - -SlateportCity_EventScript_1DD5C1:: @ 81DD5C1 - msgbox gUnknown_08272A89, 4 - special sub_8024918 - release - end - -SlateportCity_EventScript_1DD5CE:: @ 81DD5CE - msgbox SlateportCity_Text_1DEEC9, 4 - goto SlateportCity_EventScript_1DD3CA - end - -SlateportCity_EventScript_1DD5DC:: @ 81DD5DC - lockall - applymovement 255, SlateportCity_Movement_2725B2 - waitmovement 0 - opendoor 10, 12 - waitdooranim - addobject 35 - applymovement 255, SlateportCity_Movement_1DD630 - applymovement 35, SlateportCity_Movement_1DD637 - waitmovement 0 - closedoor 10, 12 - waitdooranim - msgbox SlateportCity_Text_1DF28C, 4 - closemessage - applymovement 255, SlateportCity_Movement_1DD634 - applymovement 35, SlateportCity_Movement_1DD63A - waitmovement 0 - removeobject 35 - addvar VAR_0x40D1, 1 - setvar VAR_0x40D2, 3 - releaseall - end - -SlateportCity_Movement_1DD630: @ 81DD630 - lock_facing_direction - walk_down - unlock_facing_direction - step_end - -SlateportCity_Movement_1DD634: @ 81DD634 - delay_16 - walk_in_place_fastest_right - step_end - -SlateportCity_Movement_1DD637: @ 81DD637 - delay_8 - walk_down - step_end - -SlateportCity_Movement_1DD63A: @ 81DD63A - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - step_end - -SlateportCity_EventScript_1DD643:: @ 81DD643 - lockall - special sub_80224D0 - waitstate - releaseall - end - -SlateportCity_Text_1DD64A: @ 81DD64A - .string "I’m the ENERGY GURU! I’ll go for it and\n" - .string "sell you what you need!$" - -SlateportCity_Text_1DD68A: @ 81DD68A - .string "Oh?\n" - .string "Your {STR_VAR_1}…$" - -SlateportCity_Text_1DD697: @ 81DD697 - .string "Went for it stupendously!\p" - .string "As its reward, please give it this\n" - .string "EFFORT RIBBON.$" - -SlateportCity_Text_1DD6E3: @ 81DD6E3 - .string "{PLAYER} received the EFFORT RIBBON.$" - -SlateportCity_Text_1DD702: @ 81DD702 - .string "{PLAYER} put the EFFORT RIBBON\n" - .string "on {STR_VAR_1}.$" - -SlateportCity_Text_1DD722: @ 81DD722 - .string "You have to go for it a little harder.\p" - .string "If you do, I’ll give your POKéMON\n" - .string "something nice.$" - -SlateportCity_Text_1DD77B: @ 81DD77B - .string "Oh! Your {STR_VAR_1}, that EFFORT\n" - .string "RIBBON looks good on it!$" - -SlateportCity_Text_1DD7AD: @ 81DD7AD - .string "The light of the lighthouse reaches\n" - .string "dozens of miles away.\p" - .string "I wonder if it doesn’t startle POKéMON\n" - .string "in the sea.$" - -SlateportCity_Text_1DD81A: @ 81DD81A - .string "Ooh, look at this!\p" - .string "The seaweed you can get around these\n" - .string "parts is fresh and full of life.\p" - .string "Why, it looks like it can even rear up\n" - .string "and attack!$" - -SlateportCity_Text_1DD8A6: @ 81DD8A6 - .string "Where the water is clean, the fruits\n" - .string "of bountiful harvest gather.\p" - .string "And where people gather, a market\n" - .string "soon starts.\p" - .string "That is how a town is born and grows.$" - -SlateportCity_Text_1DD93D: @ 81DD93D - .string "Shopping where you can breathe the\n" - .string "scent of the ocean…\p" - .string "SLATEPORT is such a wonderful place!$" - -SlateportCity_Text_1DD999: @ 81DD999 - .string "If you put DOLLS or CUSHIONS on\n" - .string "the floor, they’ll get dirty.\p" - .string "I’m going to buy some BRICKS so my\n" - .string "DOLLS and CUSHIONS won’t get dirty\l" - .string "when I leave them out.$" - -SlateportCity_Text_1DDA34: @ 81DDA34 - .string "Wroooar! I’m going to compete in\n" - .string "the BATTLE TENT, too!\p" - .string "But before that, I need to catch\n" - .string "some POKéMON!$" - -SlateportCity_Text_1DDA9A: @ 81DDA9A - .string "Whew… I’m just bushed…\p" - .string "I hiked over from MAUVILLE CITY.\n" - .string "But, boy, this city’s huge.\p" - .string "If I’d known this, I would’ve ridden\n" - .string "my BIKE here.$" - -SlateportCity_Text_1DDB21: @ 81DDB21 - .string "STERN, the fellow who built the\n" - .string "MUSEUM, also happens to be the leader\l" - .string "of an undersea exploration team.\p" - .string "So, everyone calls him CAPT. STERN.$" - -SlateportCity_Text_1DDBAC: @ 81DDBAC - .string "What is that over there?\n" - .string "That long line…$" - -SlateportCity_Text_1DDBD5: @ 81DDBD5 - .string "When I was a child, I visited\n" - .string "the MUSEUM often.\p" - .string "I used to dream about the mysteries of\n" - .string "the sea after seeing the exhibits.$" - -SlateportCity_Text_1DDC4F: @ 81DDC4F - .string "Hey, there! Quit pushing!\n" - .string "This is the line, can’t you see?$" - -SlateportCity_Text_1DDC8A: @ 81DDC8A - .string "TEAM AQUA has a policy of\n" - .string "assembling and dispersing at\l" - .string "the operation site.$" - -SlateportCity_Text_1DDCD5: @ 81DDCD5 - .string "Our BOSS is brilliant.\p" - .string "What would he want to do with\n" - .string "a MUSEUM now?$" - -SlateportCity_Text_1DDD18: @ 81DDD18 - .string "What’s the new scheme, I wonder?\p" - .string "Our BOSS is scary when he’s mad, so\n" - .string "I’d better not screw things up…$" - -SlateportCity_Text_1DDD7D: @ 81DDD7D - .string "If there’s something we need in\n" - .string "the MUSEUM, we should take it all!$" - -SlateportCity_Text_1DDDC0: @ 81DDDC0 - .string "Hey, you there!\n" - .string "Don’t butt in!$" - -SlateportCity_Text_1DDDDF: @ 81DDDDF - .string "A long line, huh?\p" - .string "It reminds me of the times I lined up to\n" - .string "buy smash-hit games…$" - -SlateportCity_Text_1DDE2F: @ 81DDE2F - .string "Why are we even lining up and paying?\n" - .string "We should just march in!$" - -SlateportCity_Text_1DDE6E: @ 81DDE6E - .string "What?\n" - .string "What do you want?$" - -SlateportCity_Text_1DDE86: @ 81DDE86 - .string "You want to read this sign?\n" - .string "I’ll read it for you!$" - -SlateportCity_Text_1DDEB8: @ 81DDEB8 - .string "Let’s see…\p" - .string "Um… I think it says something like\n" - .string "“the life in the sea is endless.â€\p" - .string "Yup, I’m pretty sure that’s what\n" - .string "it says.$" - -SlateportCity_Text_1DDF32: @ 81DDF32 - .string "Grumble…\p" - .string "I should’ve brought my Game Boy\n" - .string "Advance so I wouldn’t get bored in line…\p" - .string "Grumble…$" - -SlateportCity_Text_1DDF8D: @ 81DDF8D - .string "When this operation’s over, I’ll take\n" - .string "you to a hot spring spa!\p" - .string "That’s what our leader said.\n" - .string "I can’t wait!$" - -SlateportCity_Text_1DDFF7: @ 81DDFF7 - .string "The sea is just so vast…\p" - .string "Could the sea have been made by\n" - .string "the tears shed by POKéMON?$" - -SlateportCity_Text_1DE04B: @ 81DE04B - .string "Do you know what they do with old\n" - .string "ships that become too creaky to sail?\p" - .string "They sink them in the sea so they\n" - .string "become habitats for POKéMON.$" - -SlateportCity_Text_1DE0D2: @ 81DE0D2 - .string "Whenever I visit here, I get carried\n" - .string "away and buy too much.$" - -SlateportCity_Text_1DE10E: @ 81DE10E - .string "If you want to change your POKéMON’s\n" - .string "nickname, you’ll have to get the NAME\l" - .string "RATER to help you.$" - -SlateportCity_Text_1DE16C: @ 81DE16C - .string "Any POKéMON you get in a trade,\n" - .string "you can’t change its nickname.\p" - .string "The original TRAINER’s love for that\n" - .string "POKéMON is in the nickname.$" - -SlateportCity_Text_1DE1EC: @ 81DE1EC - .string "Recently, a BATTLE TENT was built\n" - .string "in SLATEPORT.\p" - .string "GYMS are fun, but the BATTLE TENT’s\n" - .string "awesome in its own way.\p" - .string "You should go find tough POKéMON\n" - .string "for the BATTLE TENT!$" - -SlateportCity_Text_1DE28E: @ 81DE28E - .string "I was hoping that it was a famous star\n" - .string "so I could get an autograph.\p" - .string "But who’s that being interviewed?\n" - .string "Isn’t that CAPT. STERN?$" - -SlateportCity_Text_1DE30C: @ 81DE30C - .string "That lady interviewer is so cool\n" - .string "and pretty.\p" - .string "When I grow up, I’m going to be\n" - .string "an international journalist!$" - -SlateportCity_Text_1DE376: @ 81DE376 - .string "CAPT. STERN says they discovered\n" - .string "something at the bottom of the sea.\p" - .string "I wonder what it is?\n" - .string "What could it be?$" - -SlateportCity_Text_1DE3E2: @ 81DE3E2 - .string "What’s going on here?\p" - .string "Did the good CAPTAIN come back with\n" - .string "a big fish from the ocean floor?$" - -SlateportCity_Text_1DE43D: @ 81DE43D - .string "Hey! Are you watching?\n" - .string "Am I on TV?$" - -SlateportCity_Text_1DE460: @ 81DE460 - .string "A TV interview! Here!\n" - .string "The CAPTAIN’s a celebrity!$" - -SlateportCity_Text_1DE491: @ 81DE491 - .string "TY: Okay, CAPT. STERN, a big smile\n" - .string "for the camera!$" - -SlateportCity_Text_1DE4C4: @ 81DE4C4 - .string "GABBY: I see, I see. You’ve had a most\n" - .string "invaluable experience…$" - -SlateportCity_Text_1DE502: @ 81DE502 - .string "CAPT. STERN: Yes, indeed. We intend to\n" - .string "move ahead with our exploration.$" - -SlateportCity_Text_1DE54A: @ 81DE54A - .string "GABBY: That’s wonderful, CAPT. STERN!\n" - .string "Thank you for taking the time from\l" - .string "your busy schedule to talk to us.\p" - .string "We hope we can interview you again\n" - .string "with news of more discoveries!$" - -SlateportCity_Text_1DE5F7: @ 81DE5F7 - .string "CAPT. STERN: Whew…\p" - .string "That was my first time to be filmed for\n" - .string "TV. That was nerve-wracking.$" - -SlateportCity_Text_1DE64F: @ 81DE64F - .string "Oh! {PLAYER}{KUN}!\n" - .string "You’re looking great!\p" - .string "We made a huge discovery on our last\n" - .string "seafloor exploration.\p" - .string "We found an underwater cavern on\n" - .string "ROUTE 128.\p" - .string "We think it’s the habitat of a POKéMON\n" - .string "that’s said to have been long extinct.$" - -SlateportCity_Text_1DE724: @ 81DE724 - .string "Fufufu…\n" - .string "CAPT. STERN, I presume.\p" - .string "We of TEAM AQUA will assume\n" - .string "control of your submarine!\p" - .string "Your objections are meaningless!\n" - .string "We expect your total cooperation!\p" - .string "Fufufu…\n" - .string "Just watch and learn what TEAM\l" - .string "AQUA has planned!$" - -SlateportCity_Text_1DE7F7: @ 81DE7F7 - .string "CAPT. STERN: What was that all about?\p" - .string "It sounded like someone using\n" - .string "a megaphone…\p" - .string "Where did it come from?$" - -SlateportCity_Text_1DE860: @ 81DE860 - .string "It’s from the HARBOR!\p" - .string "The submarine!\n" - .string "They’re trying to take it!$" - -SlateportCity_Text_1DE8A0: @ 81DE8A0 - .string "{PLAYER}{KUN}!\n" - .string "Please, come with me!$" - -SlateportCity_Text_1DE8BC: @ 81DE8BC - .string "BATTLE TENT SLATEPORT SITE\n" - .string "“Find it! The ultimate POKéMON!â€$" - -SlateportCity_Text_1DE8F8: @ 81DE8F8 - .string "STERN’S SHIPYARD\p" - .string "“Wanted: A sailor capable of sailing\n" - .string "in all currents.â€$" - -SlateportCity_Text_1DE940: @ 81DE940 - .string "STERN’S SHIPYARD\p" - .string "“The ferry S.S. TIDAL nears\n" - .string "completion for serving the ports of\l" - .string "SLATEPORT and LILYCOVE.â€$" - -SlateportCity_Text_1DE9AA: @ 81DE9AA - .string "STERN’S SHIPYARD\p" - .string "“Boarding of the SLATEPORT-LILYCOVE\n" - .string "ferry S.S. TIDAL is handled at the\l" - .string "HARBOR.â€$" - -SlateportCity_Text_1DEA0B: @ 81DEA0B - .string "POKéMON FAN CLUB\n" - .string "“Calling all fans of POKéMON!â€$" - -SlateportCity_Text_1DEA3B: @ 81DEA3B - .string "“The endless sea sustains\n" - .string "all life.â€\p" - .string "OCEANIC MUSEUM$" - -SlateportCity_Text_1DEA6F: @ 81DEA6F - .string "SLATEPORT CITY\p" - .string "“The port where people and POKéMON\n" - .string "cross paths.â€$" - -SlateportCity_Text_1DEAAF: @ 81DEAAF - .string "SLATEPORT MARKET\n" - .string "“Unique items found nowhere else!â€$" - -SlateportCity_Text_1DEAE3: @ 81DEAE3 - .string "SLATEPORT HARBOR\p" - .string "“The ferry S.S. TIDAL is under\n" - .string "construction in the SHIPYARD.\p" - .string "“Service is scheduled to begin\n" - .string "shortly.â€$" - -SlateportCity_Text_1DEB5A: @ 81DEB5A - .string "SLATEPORT HARBOR\p" - .string "“Enjoy a delightful cruise on\n" - .string "the ferry S.S. TIDAL.â€$" - -SlateportCity_Text_1DEBA0: @ 81DEBA0 - .string "NAME RATER’S HOUSE\n" - .string "“POKéMON nicknames rated.â€$" - -SlateportCity_Text_1DEBCE: @ 81DEBCE - .string "If a wild POKéMON gets hurt, it heals\n" - .string "itself by chewing on BERRIES.\p" - .string "Did you know that?\p" - .string "Somebody saw that and got the idea\n" - .string "of making medicine from BERRIES.\p" - .string "Did you know that?\p" - .string "To turn BERRIES into medicine,\n" - .string "they must be crushed into powder.\p" - .string "Did you know that?\p" - .string "You seem to have an interest\n" - .string "in BERRIES!\p" - .string "I’ve got something good for someone\n" - .string "like you.$" - -SlateportCity_Text_1DED27: @ 81DED27 - .string "I recently had machines installed at\n" - .string "POKéMON CENTERS for crushing BERRIES.\p" - .string "The BERRY CRUSH machines are at\n" - .string "the DIRECT CORNER upstairs.\p" - .string "Did you know?\p" - .string "Could you make BERRY POWDER for\n" - .string "me using those machines?\p" - .string "I can make you all sorts of medicine\n" - .string "if you bring me lots of BERRY POWDER.$" - -SlateportCity_Text_1DEE40: @ 81DEE40 - .string "Have you brought me some\n" - .string "BERRY POWDER?$" - -SlateportCity_Text_1DEE67: @ 81DEE67 - .string "What would you like to exchange\n" - .string "it with?$" - -SlateportCity_Text_1DEE90: @ 81DEE90 - .string "Okay, you want to exchange your\n" - .string "BERRY POWDER for one {STR_VAR_1}?$" - -SlateportCity_Text_1DEEC9: @ 81DEEC9 - .string "Oh, dear. You don’t have enough\n" - .string "BERRY POWDER.$" - -SlateportCity_Text_1DEEF7: @ 81DEEF7 - .string "This is fine BERRY POWDER.\n" - .string "It will make excellent medicine.\p" - .string "Would you like to trade more of your\n" - .string "BERRY POWDER for something else?$" - -SlateportCity_Text_1DEF79: @ 81DEF79 - .string "Okay! When you get some more\n" - .string "BERRY POWDER, bring it to me, please!$" - -SlateportCity_Text_1DEFBC: @ 81DEFBC - .string "Come back if you’d like to trade your\n" - .string "BERRY POWDER for some medicine.\p" - .string "I’m always running a bazaar here.\p" - .string "Did you know?$" - -SlateportCity_Text_1DF032: @ 81DF032 - .string "SCOTT: Huh?\n" - .string "I’m sure I met you somewhere before.\p" - .string "Have I introduced myself to you?\n" - .string "If not, my name’s SCOTT.\p" - .string "I just saw TEAM AQUA run away from\n" - .string "here like they were stung.\p" - .string "Let me guess--you drove them away?$" - -SlateportCity_Text_1DF0FE: @ 81DF0FE - .string "SCOTT: Hmm…\n" - .string "Maybe, just maybe, this TRAINER…$" - -SlateportCity_Text_1DF12B: @ 81DF12B - .string "SCOTT: All right! I think you’re going\n" - .string "to become a good friend.\p" - .string "So, let’s register each other in our\n" - .string "POKéNAVS.\p" - .string "… … … … … …$" - -SlateportCity_Text_1DF1A6: @ 81DF1A6 - .string "Registered this SCOTT person\n" - .string "in the POKéNAV.$" - -SlateportCity_Text_1DF1D3: @ 81DF1D3 - .string "SCOTT: What I’d like to do is tag along\n" - .string "with you, but I do want to keep an eye\l" - .string "on the talents of other people, too.\p" - .string "So, I’ll be off to roam other towns\n" - .string "a bit more.\p" - .string "Be seeing you, {PLAYER}{KUN}!$" - -SlateportCity_Text_1DF28C: @ 81DF28C - .string "SCOTT: Oh, hey!\n" - .string "If it isn’t {PLAYER}{KUN}!\p" - .string "{PLAYER}{KUN}, let me guess--you’re going\n" - .string "to take the BATTLE TENT challenge?\p" - .string "Yeah! That’s a good idea!\n" - .string "That’s a really great idea!\p" - .string "After all, a tough TRAINER is\n" - .string "the perfect fit for the BATTLE TENT!\p" - .string "Give it your best effort!$" - diff --git a/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc b/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc deleted file mode 100644 index 150cc425b..000000000 --- a/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc +++ /dev/null @@ -1,115 +0,0 @@ -SlateportCity_BattleTentBattleRoom_MapScripts:: @ 8209960 - map_script 3, SlateportCity_BattleTentBattleRoom_MapScript1_209970 - map_script 4, SlateportCity_BattleTentBattleRoom_MapScript2_20999A - map_script 2, SlateportCity_BattleTentBattleRoom_MapScript2_2099B4 - .byte 0 - -SlateportCity_BattleTentBattleRoom_MapScript1_209970: @ 8209970 - call SlateportCity_BattleTentBattleRoom_EventScript_209976 - end - -SlateportCity_BattleTentBattleRoom_EventScript_209976:: @ 8209976 - checkplayergender - compare VAR_RESULT, 0 - goto_eq SlateportCity_BattleTentBattleRoom_EventScript_20998E - compare VAR_RESULT, 1 - goto_eq SlateportCity_BattleTentBattleRoom_EventScript_209994 - return - -SlateportCity_BattleTentBattleRoom_EventScript_20998E:: @ 820998E - setvar VAR_OBJ_GFX_ID_1, 100 - return - -SlateportCity_BattleTentBattleRoom_EventScript_209994:: @ 8209994 - setvar VAR_OBJ_GFX_ID_1, 105 - return - -SlateportCity_BattleTentBattleRoom_MapScript2_20999A: @ 820999A - map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentBattleRoom_EventScript_2099A4 - .2byte 0 - -SlateportCity_BattleTentBattleRoom_EventScript_2099A4:: @ 82099A4 - setvar VAR_TEMP_1, 1 - hideobjectat 255, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM - hideobjectat 2, MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM - end - -SlateportCity_BattleTentBattleRoom_MapScript2_2099B4: @ 82099B4 - map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentBattleRoom_EventScript_2099BE - .2byte 0 - -SlateportCity_BattleTentBattleRoom_EventScript_2099BE:: @ 82099BE - applymovement 3, SlateportCity_BattleTentBattleRoom_Movement_209A99 - waitmovement 0 - setvar VAR_0x8004, 11 - special sub_81A5E74 - setobjectxyperm 2, 5, 1 - removeobject 2 - addobject 2 - applymovement 2, SlateportCity_BattleTentBattleRoom_Movement_209A9E - waitmovement 0 - setvar VAR_0x8004, 4 - special sub_81B99B4 - lockall - msgbox 0x2021fc4, 4 - waitmessage - closemessage - special HealPlayerParty - setvar VAR_0x8004, 6 - setvar VAR_0x8005, 0 - special sub_8163AC4 - waitstate - switch VAR_RESULT - case 1, SlateportCity_BattleTentBattleRoom_EventScript_209A39 - -SlateportCity_BattleTentCorridor_EventScript_209A1B:: @ 8209A1B - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 4 - special sub_81A1780 - special LoadPlayerParty - warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6 - waitstate - -SlateportCity_BattleTentBattleRoom_EventScript_209A39:: @ 8209A39 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special sub_81A1780 - addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 - switch VAR_RESULT - case 3, SlateportCity_BattleTentBattleRoom_EventScript_209A7B -@ case 3, SlateportCity_BattleTentCorridor_EventScript_209A7B - setvar VAR_0x8006, 1 - warp MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 3 - waitstate - -SlateportCity_BattleTentBattleRoom_EventScript_209A7B:: @ 8209A7B -SlateportCity_BattleTentCorridor_EventScript_209A7B:: @ 8209A7B - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 3 - special sub_81A1780 - special LoadPlayerParty - warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6 - waitstate -@ forced stop - -SlateportCity_BattleTentBattleRoom_Movement_209A99: @ 8209A99 - walk_up - walk_up - walk_up - walk_in_place_fastest_right - step_end - -SlateportCity_BattleTentBattleRoom_Movement_209A9E: @ 8209A9E - 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 deleted file mode 100644 index 0a9eb6cf5..000000000 --- a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc +++ /dev/null @@ -1,280 +0,0 @@ -SlateportCity_BattleTentCorridor_MapScripts:: @ 8208E26 - map_script 2, SlateportCity_BattleTentCorridor_MapScript2_208E5B - map_script 4, SlateportCity_BattleTentCorridor_MapScript2_208E31 - .byte 0 - -SlateportCity_BattleTentCorridor_MapScript2_208E31: @ 8208E31 - map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentCorridor_EventScript_208E3B - .2byte 0 - -SlateportCity_BattleTentCorridor_EventScript_208E3B:: @ 8208E3B - setvar VAR_TEMP_1, 1 - compare VAR_0x8006, 1 - goto_if 5, SlateportCity_BattleTentCorridor_EventScript_208E56 - setobjectxy 1, 2, 2 - turnobject 1, 1 - -SlateportCity_BattleTentCorridor_EventScript_208E56:: @ 8208E56 - turnobject 255, 2 - end - -SlateportCity_BattleTentCorridor_MapScript2_208E5B: @ 8208E5B - map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentCorridor_EventScript_208E65 - .2byte 0 - -SlateportCity_BattleTentCorridor_EventScript_208E65:: @ 8208E65 - compare VAR_0x8006, 1 - goto_eq SlateportCity_BattleTentCorridor_EventScript_208EEE - setvar VAR_TEMP_0, 1 - applymovement 1, SlateportCity_BattleTentCorridor_Movement_209062 - applymovement 255, SlateportCity_BattleTentCorridor_Movement_209059 - waitmovement 0 - compare VAR_0x8006, 2 - goto_eq SlateportCity_BattleTentCorridor_EventScript_209044 - setvar VAR_0x8004, 9 - special sub_81B9D08 - setvar VAR_0x8004, 8 - special sub_81B9D08 - msgbox SlateportCity_BattleTentCorridor_Text_25A1C8, 4 - fadescreen 1 - setvar VAR_0x8004, 6 - special sub_81B9D08 - waitstate - -SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4 - msgbox SlateportCity_BattleTentCorridor_Text_25AB96, 4 - closemessage - applymovement 1, SlateportCity_BattleTentCorridor_Movement_2725A6 - waitmovement 0 - opendoor 2, 1 - waitdooranim - applymovement 1, SlateportCity_BattleTentCorridor_Movement_209068 - applymovement 255, SlateportCity_BattleTentCorridor_Movement_20905E - waitmovement 0 - closedoor 2, 1 - waitdooranim - warp MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM, 255, 4, 4 - waitstate - end - -SlateportCity_BattleTentCorridor_EventScript_208EEE:: @ 8208EEE - setvar VAR_0x8004, 9 - special sub_81A5E74 - setvar VAR_0x8004, 16 - special sub_81A5E74 - msgbox SlateportCity_BattleTentCorridor_Text_25A22D, 4 - playfanfare MUS_ME_ASA - waitfanfare - special HealPlayerParty - -SlateportCity_BattleTentCorridor_EventScript_208F0D:: @ 8208F0D - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special sub_81A1780 - compare VAR_RESULT, 1 - call_if 1, SlateportCity_BattleTentCorridor_EventScript_209014 - compare VAR_RESULT, 2 - call_if 1, SlateportCity_BattleTentCorridor_EventScript_20901B - multichoice 20, 6, 104, 1 - switch VAR_RESULT - case 0, SlateportCity_BattleTentCorridor_EventScript_208FBB - case 1, SlateportCity_BattleTentCorridor_EventScript_208F5B - case 2, SlateportCity_BattleTentCorridor_EventScript_208F89 - -SlateportCity_BattleTentCorridor_EventScript_208F5B:: @ 8208F5B - msgbox SlateportCity_BattleTentCorridor_Text_25A350, 5 - switch VAR_RESULT - case 0, SlateportCity_BattleTentCorridor_EventScript_208F0D - case 1, SlateportCity_BattleTentCorridor_EventScript_209022 - case 127, SlateportCity_BattleTentCorridor_EventScript_208F0D - -SlateportCity_BattleTentCorridor_EventScript_208F89:: @ 8208F89 - message SlateportCity_BattleTentCorridor_Text_25A37A - waitmessage - multichoicedefault 20, 8, 94, 1, 0 - switch VAR_RESULT - case 1, SlateportCity_BattleTentCorridor_EventScript_208F0D - case 0, SlateportCity_BattleTentCorridor_EventScript_209A1B - case 127, SlateportCity_BattleTentCorridor_EventScript_208F0D - -SlateportCity_BattleTentCorridor_EventScript_208FBB:: @ 8208FBB - setvar VAR_0x8004, 8 - special sub_81B9D08 - msgbox SlateportCity_BattleTentCorridor_Text_25AB2E, 5 - switch VAR_RESULT - case 0, SlateportCity_BattleTentCorridor_EventScript_208EB4 - case 1, SlateportCity_BattleTentCorridor_EventScript_208FF1 - case 127, SlateportCity_BattleTentCorridor_EventScript_208EB4 - -SlateportCity_BattleTentCorridor_EventScript_208FF1:: @ 8208FF1 - fadescreen 1 - setvar VAR_0x8004, 7 - special sub_81B9D08 - waitstate - compare VAR_RESULT, 1 - goto_eq SlateportCity_BattleTentCorridor_EventScript_208EB4 - msgbox SlateportCity_BattleTentCorridor_Text_25AB6C, 4 - goto SlateportCity_BattleTentCorridor_EventScript_208EB4 - -SlateportCity_BattleTentCorridor_EventScript_209014:: @ 8209014 - message SlateportCity_BattleTentCorridor_Text_25A263 - waitmessage - return - -SlateportCity_BattleTentCorridor_EventScript_20901B:: @ 820901B - message SlateportCity_BattleTentCorridor_Text_25A289 - waitmessage - return - -SlateportCity_BattleTentCorridor_EventScript_209022:: @ 8209022 - message SlateportCity_BattleTentCorridor_Text_25ABAE - waitmessage - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 2 - special sub_81B9D08 - playse SE_SAVE - waitse - fadescreen 1 - setvar VAR_0x8004, 4 - special sub_81A1780 - end - -SlateportCity_BattleTentCorridor_EventScript_209044:: @ 8209044 - special SavePlayerParty - setvar VAR_0x8004, 10 - setvar VAR_0x8005, 0 - special sub_81A5E74 - goto SlateportCity_BattleTentCorridor_EventScript_208F0D - -SlateportCity_BattleTentCorridor_Movement_209059: @ 8209059 - walk_up - walk_up - walk_up - walk_up - step_end - -SlateportCity_BattleTentCorridor_Movement_20905E: @ 820905E - walk_up - walk_up - set_invisible - step_end - -SlateportCity_BattleTentCorridor_Movement_209062: @ 8209062 - walk_up - walk_up - walk_up - walk_up - walk_in_place_fastest_down - step_end - -SlateportCity_BattleTentCorridor_Movement_209068: @ 8209068 - walk_up - set_invisible - step_end - -SlateportCity_BattleTentCorridor_Text_20906B: @ 820906B - .string "Want a tasty little bit of advice\n" - .string "for CONTESTS?\p" - .string "Using a certain move after another\n" - .string "certain kind of move sometimes gets\l" - .string "you extra attention.\p" - .string "If you know what you’re doing,\n" - .string "you can score big in appeal.\p" - .string "Of course, your opponents might try\n" - .string "disrupting your POKéMON’s showing.$" - -SlateportCity_BattleTentCorridor_Text_20917A: @ 820917A - .string "My papa, he’s a CONTEST JUDGE.\p" - .string "I wonder what I should be when I\n" - .string "grow up, a JUDGE or a GYM LEADER?$" - -SlateportCity_BattleTentCorridor_Text_2091DC: @ 82091DC - .string "Hey, man, I’m like majorly cheesed,\n" - .string "you know. Like, you know, I just\l" - .string "wanted to know why my POKéMON\l" - .string "never won, you know, like, hey?\p" - .string "So, like, I gave the JUDGE my two\n" - .string "cents, you know, they’re free.\p" - .string "And he wouldn’t hear me out, like, hey!\n" - .string "So, like, total bummer, man!\p" - .string "Hey, like, you! Zip it, you know?\n" - .string "Just, you know, take this!$" - -SlateportCity_BattleTentCorridor_Text_209322: @ 8209322 - .string "That’s, like, TM41, you know?\n" - .string "Hey, it’s TORMENT, you hearing me?\p" - .string "Like, it won’t let the other guy\n" - .string "use the same move twice in a row, see?\p" - .string "Hey, now, you listen here, like,\n" - .string "I’m not laying a torment on you!$" - -SlateportCity_BattleTentCorridor_Text_2093ED: @ 82093ED - .string "MC: Oh, my, my!\n" - .string "Now isn’t that a dandy of a POKéMON?\p" - .string "Please! Do step right up and take\n" - .string "part in our splendid CONTESTS!\p" - .string "You’ll do well! I’m sure of it!\n" - .string "My eyes have never failed me!$" - -SlateportCity_BattleTentCorridor_Text_2094A1: @ 82094A1 - .string "JUDGE: Well, hello there!\n" - .string "I see that you’re a TRAINER!\p" - .string "Then, it just wouldn’t do for you\n" - .string "to miss a POKéMON CONTEST!\p" - .string "Get a CONTEST PASS in VERDANTURF\n" - .string "CITY and enter anytime!$" - -SlateportCity_BattleTentCorridor_Text_20954E: @ 820954E - .string "It’s appeal time!\n" - .string "What should I lead with?$" - -SlateportCity_BattleTentCorridor_Text_209579: @ 8209579 - .string "They didn’t pay much attention to\n" - .string "my POKéMON’s appeal…\p" - .string "Humph, that JUDGE, he doesn’t know\n" - .string "a good thing when he sees it.$" - -SlateportCity_BattleTentCorridor_Text_2095F1: @ 82095F1 - .string "Oh, hi! You must be a serious fan to get\n" - .string "this close to the action.\p" - .string "I’ll reward your enthusiasm with\n" - .string "this sage advice.\p" - .string "If a move goes over really well,\n" - .string "the audience will get excited.\p" - .string "The POKéMON that makes its appeal\n" - .string "right when everyone’s excited…\p" - .string "Well, you’d think something good has\n" - .string "to happen!$" - -SlateportCity_BattleTentCorridor_Text_209718: @ 8209718 - .string "I can’t do this! I’m more freaked out\n" - .string "than my POKéMON.\p" - .string "I’m shivering and my heart is racing!$" - -SlateportCity_BattleTentCorridor_Text_209775: @ 8209775 - .string "A battle and a CONTEST aren’t the\n" - .string "same, but they are alike, too.\p" - .string "You need to work hard and believe\n" - .string "in the POKéMON you’ve raised.$" - -SlateportCity_BattleTentCorridor_Text_2097F6: @ 82097F6 - .string "That POKéMON looks like it’s on top\n" - .string "of its game, huh?\p" - .string "A POKéMON that does good in the\n" - .string "secondary judging seems to be more\l" - .string "relaxed when it’s doing appeals.$" - -SlateportCity_BattleTentCorridor_Text_209890: @ 8209890 - .string "Will you look at that sorry sight?\p" - .string "Heh, my POKéMON’s absolutely better\n" - .string "than that lot!$" - -SlateportCity_BattleTentCorridor_Text_2098E6: @ 82098E6 - .string "Don’t you get the urge to move with\n" - .string "POKéMON if they’re putting on an\l" - .string "energetic appeal?$" - -SlateportCity_BattleTentCorridor_Text_20993D: @ 820993D - .string "POKéMON CONTESTS\n" - .string "HYPER RANK STAGE!$" - diff --git a/data/scripts/maps/SlateportCity_BattleTentLobby.inc b/data/scripts/maps/SlateportCity_BattleTentLobby.inc deleted file mode 100644 index fc66d7387..000000000 --- a/data/scripts/maps/SlateportCity_BattleTentLobby.inc +++ /dev/null @@ -1,357 +0,0 @@ -SlateportCity_BattleTentLobby_MapScripts:: @ 8208730 - map_script 2, SlateportCity_BattleTentLobby_MapScript2_20874F - map_script 4, SlateportCity_BattleTentLobby_MapScript2_20873B - .byte 0 - -SlateportCity_BattleTentLobby_MapScript2_20873B: @ 820873B - map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentLobby_EventScript_208745 - .2byte 0 - -SlateportCity_BattleTentLobby_EventScript_208745:: @ 8208745 - setvar VAR_TEMP_1, 1 - turnobject 255, 2 - end - -SlateportCity_BattleTentLobby_MapScript2_20874F: @ 820874F - map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentLobby_EventScript_208779 - map_script_2 VAR_TEMP_0, 1, SlateportCity_BattleTentLobby_EventScript_208782 - map_script_2 VAR_TEMP_0, 2, SlateportCity_BattleTentLobby_EventScript_208871 - map_script_2 VAR_TEMP_0, 3, SlateportCity_BattleTentLobby_EventScript_2087B7 - map_script_2 VAR_TEMP_0, 4, SlateportCity_BattleTentLobby_EventScript_208837 - .2byte 0 - -SlateportCity_BattleTentLobby_EventScript_208779:: @ 8208779 - setvar VAR_0x8004, 0 - special sub_81A1780 - end - -SlateportCity_BattleTentLobby_EventScript_208782:: @ 8208782 - lockall - msgbox SlateportCity_BattleTentLobby_Text_2C5DFA, 4 - closemessage - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_TEMP_0, 255 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 0 - special sub_81A1780 - releaseall - end - -SlateportCity_BattleTentLobby_EventScript_2087B7:: @ 82087B7 - lockall - message SlateportCity_BattleTentLobby_Text_2C5C6F - waitmessage - setvar VAR_0x8004, 4 - special sub_81B9D08 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 0 - special sub_81B9D08 - playse SE_SAVE - waitse - -SlateportCity_BattleTentLobby_EventScript_2087E9:: @ 82087E9 - msgbox SlateportCity_BattleTentLobby_Text_2C5D14, 4 - setvar VAR_0x8004, 5 - special sub_81B9D08 - switch VAR_RESULT - case 0, SlateportCity_BattleTentLobby_EventScript_20882A - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special sub_81A1780 - message SlateportCity_BattleTentLobby_Text_23F68C - waitmessage - playfanfare MUS_FANFA4 - waitfanfare - goto SlateportCity_BattleTentLobby_EventScript_208861 - -SlateportCity_BattleTentLobby_EventScript_20882A:: @ 820882A - msgbox SlateportCity_BattleTentLobby_Text_2C5D52, 4 - goto SlateportCity_BattleTentLobby_EventScript_208861 - -SlateportCity_BattleTentLobby_EventScript_208837:: @ 8208837 - lockall - message SlateportCity_BattleTentLobby_Text_2C5BA2 - waitmessage - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 0 - special sub_81B9D08 - playse SE_SAVE - waitse - -SlateportCity_BattleTentLobby_EventScript_208861:: @ 8208861 - msgbox SlateportCity_BattleTentLobby_Text_2C5AA5, 4 - closemessage - setvar VAR_TEMP_0, 255 - releaseall - end - -SlateportCity_BattleTentLobby_EventScript_208871:: @ 8208871 - lockall - message SlateportCity_BattleTentLobby_Text_2C5DA7 - waitmessage - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 1 - special sub_81B9D08 - playse SE_SAVE - waitse - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_TEMP_0, 255 - setvar VAR_0x8006, 2 - goto SlateportCity_BattleTentLobby_EventScript_2089AC - -SlateportCity_BattleTentLobby_EventScript_2088AA:: @ 82088AA - lock - faceplayer - setvar VAR_0x8004, 1 - special sub_81B9D08 - compare VAR_RESULT, 0 - goto_if 5, SlateportCity_BattleTentLobby_EventScript_2087E9 - special SavePlayerParty - msgbox SlateportCity_BattleTentLobby_Text_2C5810, 4 - -SlateportCity_BattleTentLobby_EventScript_2088CA:: @ 82088CA - message SlateportCity_BattleTentLobby_Text_2C586A - waitmessage - multichoice 17, 6, 23, 0 - switch VAR_RESULT - case 0, SlateportCity_BattleTentLobby_EventScript_208906 - case 1, SlateportCity_BattleTentLobby_EventScript_208A07 - case 2, SlateportCity_BattleTentLobby_EventScript_208A2E - case 127, SlateportCity_BattleTentLobby_EventScript_208A2E - -SlateportCity_BattleTentLobby_EventScript_208906:: @ 8208906 - setvar VAR_FRONTIER_FACILITY, 4 - setvar VAR_0x40CE, 0 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 2 - special sub_81A1780 - msgbox SlateportCity_BattleTentLobby_Text_2C5B06, 5 - switch VAR_RESULT - case 0, SlateportCity_BattleTentLobby_EventScript_208A2B - case 1, SlateportCity_BattleTentLobby_EventScript_208950 - case 127, SlateportCity_BattleTentLobby_EventScript_208A2B - -SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950 - setvar VAR_TEMP_0, 0 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 4 - special sub_81A1780 - setvar VAR_0x8004, 0 - special sub_81B9D08 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 1 - special sub_81A1780 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 0 - special sub_81A1780 - closemessage - delay 2 - call SlateportCity_BattleTentLobby_EventScript_27134F - setvar VAR_TEMP_0, 255 - compare VAR_RESULT, 0 - goto_eq SlateportCity_BattleTentLobby_EventScript_208A14 - setvar VAR_0x8006, 0 - -SlateportCity_BattleTentLobby_EventScript_2089AC:: @ 82089AC - msgbox SlateportCity_BattleTentLobby_Text_2C5B8C, 4 - closemessage - call SlateportCity_BattleTentLobby_EventScript_2089C9 - warp MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 7 - setvar VAR_TEMP_0, 0 - waitstate - end - -SlateportCity_BattleTentLobby_EventScript_2089C9:: @ 82089C9 - applymovement 1, SlateportCity_BattleTentLobby_Movement_2089F8 - applymovement 255, SlateportCity_BattleTentLobby_Movement_2089FF - waitmovement 0 - opendoor 6, 1 - waitdooranim - applymovement 1, SlateportCity_BattleTentLobby_Movement_2089FC - applymovement 255, SlateportCity_BattleTentLobby_Movement_208A03 - waitmovement 0 - closedoor 6, 1 - waitdooranim - return - -SlateportCity_BattleTentLobby_Movement_2089F8: @ 82089F8 - walk_up - walk_up - walk_up - step_end - -SlateportCity_BattleTentLobby_Movement_2089FC: @ 82089FC - walk_up - set_invisible - step_end - -SlateportCity_BattleTentLobby_Movement_2089FF: @ 82089FF - walk_up - walk_up - walk_up - step_end - -SlateportCity_BattleTentLobby_Movement_208A03: @ 8208A03 - walk_up - walk_up - set_invisible - step_end - -SlateportCity_BattleTentLobby_EventScript_208A07:: @ 8208A07 - msgbox SlateportCity_BattleTentLobby_Text_2C589C, 4 - goto SlateportCity_BattleTentLobby_EventScript_2088CA - -SlateportCity_BattleTentLobby_EventScript_208A14:: @ 8208A14 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special sub_81A1780 - goto SlateportCity_BattleTentLobby_EventScript_208A2E - -SlateportCity_BattleTentLobby_EventScript_208A2B:: @ 8208A2B - special LoadPlayerParty - -SlateportCity_BattleTentLobby_EventScript_208A2E:: @ 8208A2E - msgbox SlateportCity_BattleTentLobby_Text_2C5AA5, 4 - release - end - -SlateportCity_BattleTentLobby_Movement_208A38:: @ 8208A38 - walk_up - walk_up - walk_up - set_invisible - step_end - -SlateportCity_BattleTentLobby_EventScript_208A3D:: @ 8208A3D - lock - faceplayer - checkflag FLAG_0x109 - goto_eq SlateportCity_BattleTentLobby_EventScript_208A74 - msgbox SlateportCity_BattleTentLobby_Text_208B4E, 4 - giveitem_std ITEM_TM41 - compare VAR_RESULT, 0 - goto_eq SlateportCity_BattleTentLobby_EventScript_272054 - setflag FLAG_0x109 - msgbox SlateportCity_BattleTentLobby_Text_208C5C, 4 - release - end - -SlateportCity_BattleTentLobby_EventScript_208A74:: @ 8208A74 - msgbox SlateportCity_BattleTentLobby_Text_208C5C, 4 - release - end - -SlateportCity_BattleTentLobby_EventScript_208A7E:: @ 8208A7E - msgbox SlateportCity_BattleTentLobby_Text_208D27, 2 - end - -SlateportCity_BattleTentLobby_EventScript_208A87:: @ 8208A87 - msgbox SlateportCity_BattleTentLobby_Text_208DA6, 2 - end - -SlateportCity_BattleTentLobby_EventScript_208A90:: @ 8208A90 - msgbox SlateportCity_BattleTentLobby_Text_208DF1, 2 - end - -SlateportCity_BattleTentLobby_EventScript_208A99:: @ 8208A99 - lockall - msgbox SlateportCity_BattleTentLobby_Text_259721, 4 - goto SlateportCity_BattleTentLobby_EventScript_208AA8 - end - -SlateportCity_BattleTentLobby_EventScript_208AA8:: @ 8208AA8 - message SlateportCity_BattleTentLobby_Text_259743 - waitmessage - multichoice 17, 0, 111, 0 - switch VAR_RESULT - case 0, SlateportCity_BattleTentLobby_EventScript_208B06 - case 1, SlateportCity_BattleTentLobby_EventScript_208B14 - case 2, SlateportCity_BattleTentLobby_EventScript_208B22 - case 3, SlateportCity_BattleTentLobby_EventScript_208B30 - case 4, SlateportCity_BattleTentLobby_EventScript_208B3E - case 5, SlateportCity_BattleTentLobby_EventScript_208B4C - case 127, SlateportCity_BattleTentLobby_EventScript_208B4C - end - -SlateportCity_BattleTentLobby_EventScript_208B06:: @ 8208B06 - msgbox SlateportCity_BattleTentLobby_Text_2C5F08, 4 - goto SlateportCity_BattleTentLobby_EventScript_208AA8 - end - -SlateportCity_BattleTentLobby_EventScript_208B14:: @ 8208B14 - msgbox SlateportCity_BattleTentLobby_Text_2C5F9D, 4 - goto SlateportCity_BattleTentLobby_EventScript_208AA8 - end - -SlateportCity_BattleTentLobby_EventScript_208B22:: @ 8208B22 - msgbox SlateportCity_BattleTentLobby_Text_2C6020, 4 - goto SlateportCity_BattleTentLobby_EventScript_208AA8 - end - -SlateportCity_BattleTentLobby_EventScript_208B30:: @ 8208B30 - msgbox SlateportCity_BattleTentLobby_Text_2C60C0, 4 - goto SlateportCity_BattleTentLobby_EventScript_208AA8 - end - -SlateportCity_BattleTentLobby_EventScript_208B3E:: @ 8208B3E - msgbox SlateportCity_BattleTentLobby_Text_2C61FE, 4 - goto SlateportCity_BattleTentLobby_EventScript_208AA8 - end - -SlateportCity_BattleTentLobby_EventScript_208B4C:: @ 8208B4C - releaseall - end - -SlateportCity_BattleTentLobby_Text_208B4E: @ 8208B4E - .string "So, like, I couldn’t find myself any\n" - .string "POKéMON that were, like, for me.\p" - .string "So, I figured, like, hey, I should file\n" - .string "a complaint to the guy there?\p" - .string "And he wouldn’t hear me out, like, hey!\n" - .string "So, like, total bummer, man!\p" - .string "Hey, like, you! Zip it, you know?\n" - .string "Just, you know, take this!$" - -SlateportCity_BattleTentLobby_Text_208C5C: @ 8208C5C - .string "That’s, like, TM41, you know?\n" - .string "Hey, it’s TORMENT, you hearing me?\p" - .string "Like, it won’t let the other guy\n" - .string "use the same move twice in a row, see?\p" - .string "Hey, now, you listen here, like,\n" - .string "I’m not laying a torment on you!$" - -SlateportCity_BattleTentLobby_Text_208D27: @ 8208D27 - .string "I don’t really like BUG POKéMON,\n" - .string "but maybe I’ll try using some for\l" - .string "a change of pace.\p" - .string "Who knows, I might even get to like\n" - .string "them!$" - -SlateportCity_BattleTentLobby_Text_208DA6: @ 8208DA6 - .string "You can battle all you want here even\n" - .string "if you don’t have any tough POKéMON.$" - -SlateportCity_BattleTentLobby_Text_208DF1: @ 8208DF1 - .string "Wouldn’t it be nice if they had more of\n" - .string "a selection?$" - diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc deleted file mode 100644 index e1f373bb2..000000000 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ /dev/null @@ -1,567 +0,0 @@ -SlateportCity_Harbor_MapScripts:: @ 820C97D - map_script 3, SlateportCity_Harbor_MapScript1_20C983 - .byte 0 - -SlateportCity_Harbor_MapScript1_20C983: @ 820C983 - setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13 - setvar VAR_TEMP_1, 0 - compare VAR_0x40A0, 1 - call_if 1, SlateportCity_Harbor_EventScript_20C9A9 - checkflag FLAG_SYS_GAME_CLEAR - call_if 1, SlateportCity_Harbor_EventScript_20C9A5 - end - -SlateportCity_Harbor_EventScript_20C9A5:: @ 820C9A5 - clearflag FLAG_0x35C - return - -SlateportCity_Harbor_EventScript_20C9A9:: @ 820C9A9 - savebgm MUS_AQA_0 - setobjectxyperm 4, 12, 13 - setobjectmovementtype 4, 9 - setflag FLAG_0x389 - return - -SlateportCity_Harbor_EventScript_20C9BB:: @ 820C9BB - lockall - setvar VAR_0x8008, 0 - goto SlateportCity_Harbor_EventScript_20C9F5 - end - -SlateportCity_Harbor_EventScript_20C9C7:: @ 820C9C7 - lockall - setvar VAR_0x8008, 1 - goto SlateportCity_Harbor_EventScript_20C9F5 - end - -SlateportCity_Harbor_EventScript_20C9D3:: @ 820C9D3 - lockall - setvar VAR_0x8008, 2 - goto SlateportCity_Harbor_EventScript_20C9F5 - end - -SlateportCity_Harbor_EventScript_20C9DF:: @ 820C9DF - lockall - setvar VAR_0x8008, 3 - applymovement 255, SlateportCity_Harbor_Movement_20CAEF - waitmovement 0 - goto SlateportCity_Harbor_EventScript_20C9F5 - end - -SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 - applymovement 7, SlateportCity_Harbor_Movement_2725AA - waitmovement 0 - applymovement 6, SlateportCity_Harbor_Movement_2725AA - applymovement 255, SlateportCity_Harbor_Movement_2725A6 - waitmovement 0 - msgbox SlateportCity_Harbor_Text_20D291, 4 - closemessage - applymovement 6, SlateportCity_Harbor_Movement_20CAC8 - applymovement 7, SlateportCity_Harbor_Movement_20CAC8 - applymovement 8, SlateportCity_Harbor_Movement_20CAD2 - waitmovement 0 - removeobject 6 - removeobject 7 - removeobject 8 - setvar VAR_0x40A0, 2 - setflag FLAG_0x061 - setflag FLAG_0x313 - compare VAR_0x8008, 0 - call_if 1, SlateportCity_Harbor_EventScript_20CA89 - compare VAR_0x8008, 1 - call_if 1, SlateportCity_Harbor_EventScript_20CA9E - compare VAR_0x8008, 2 - call_if 1, SlateportCity_Harbor_EventScript_20CAB3 - compare VAR_0x8008, 3 - call_if 1, SlateportCity_Harbor_EventScript_20CAB3 - msgbox SlateportCity_Harbor_Text_20D35A, 4 - closemessage - setflag FLAG_0x335 - setflag FLAG_0x336 - moveobjectoffscreen 4 - setobjectmovementtype 4, 10 - releaseall - end - -SlateportCity_Harbor_EventScript_20CA89:: @ 820CA89 - applymovement 4, SlateportCity_Harbor_Movement_20CAE0 - waitmovement 0 - applymovement 255, SlateportCity_Harbor_Movement_2725AA - waitmovement 0 - return - -SlateportCity_Harbor_EventScript_20CA9E:: @ 820CA9E - applymovement 4, SlateportCity_Harbor_Movement_20CAE6 - waitmovement 0 - applymovement 255, SlateportCity_Harbor_Movement_2725A8 - waitmovement 0 - return - -SlateportCity_Harbor_EventScript_20CAB3:: @ 820CAB3 - applymovement 4, SlateportCity_Harbor_Movement_20CAEB - waitmovement 0 - applymovement 255, SlateportCity_Harbor_Movement_2725A8 - waitmovement 0 - return - -SlateportCity_Harbor_Movement_20CAC8: @ 820CAC8 - delay_16 - delay_16 - jump_up - set_invisible - step_end - -SlateportCity_Harbor_Movement_20CACD: @ 820CACD - delay_16 - delay_16 - jump_up - set_invisible - step_end - -SlateportCity_Harbor_Movement_20CAD2: @ 820CAD2 - 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 - walk_left - walk_left - walk_left - walk_left - walk_up - step_end - -SlateportCity_Harbor_Movement_20CAE6: @ 820CAE6 - walk_left - walk_left - walk_up - walk_left - step_end - -SlateportCity_Harbor_Movement_20CAEB: @ 820CAEB - walk_left - walk_left - walk_left - step_end - -SlateportCity_Harbor_Movement_20CAEF: @ 820CAEF - walk_up - step_end - -SlateportCity_Harbor_EventScript_20CAF1:: @ 820CAF1 - lock - faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_eq SlateportCity_Harbor_EventScript_20CB06 - msgbox SlateportCity_Harbor_Text_20CE20, 4 - release - end - -SlateportCity_Harbor_EventScript_20CB06:: @ 820CB06 - msgbox SlateportCity_Harbor_Text_20CE87, 4 - message SlateportCity_Harbor_Text_20CF1C - waitmessage - goto SlateportCity_Harbor_EventScript_20CB1A - end - -SlateportCity_Harbor_EventScript_20CB1A:: @ 820CB1A - checkflag FLAG_0x1D0 - goto_eq SlateportCity_Harbor_EventScript_20CB50 - multichoicedefault 18, 8, 56, 2, 0 - switch VAR_RESULT - case 0, SlateportCity_Harbor_EventScript_20CB92 - case 1, SlateportCity_Harbor_EventScript_20CC2D - case 127, SlateportCity_Harbor_EventScript_20CC2D - end - -SlateportCity_Harbor_EventScript_20CB50:: @ 820CB50 - multichoicedefault 17, 6, 52, 2, 0 - switch VAR_RESULT - case 0, SlateportCity_Harbor_EventScript_20CB92 - case 1, SlateportCity_Harbor_EventScript_20CBBA - case 2, SlateportCity_Harbor_EventScript_20CC2D - case 127, SlateportCity_Harbor_EventScript_20CC2D - end - -SlateportCity_Harbor_EventScript_20CB88:: @ 820CB88 - msgbox SlateportCity_Harbor_Text_20CEC1, 4 - release - end - -SlateportCity_Harbor_EventScript_20CB92:: @ 820CB92 - msgbox SlateportCity_Harbor_Text_20CF93, 5 - compare VAR_RESULT, 0 - goto_eq SlateportCity_Harbor_EventScript_20CBDD - setvar VAR_PORTHOLE, 1 - call SlateportCity_Harbor_EventScript_20CBE9 - warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 - waitstate - release - end - -SlateportCity_Harbor_EventScript_20CBBA:: @ 820CBBA - msgbox SlateportCity_Harbor_Text_20CFAE, 5 - compare VAR_RESULT, 0 - goto_eq SlateportCity_Harbor_EventScript_20CBDD - call SlateportCity_Harbor_EventScript_20CBE9 - warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 - waitstate - release - end - -SlateportCity_Harbor_EventScript_20CBDD:: @ 820CBDD - message SlateportCity_Harbor_Text_20CFFA - waitmessage - goto SlateportCity_Harbor_EventScript_20CB1A - end - -SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9 - msgbox SlateportCity_Harbor_Text_20CFCB, 4 - closemessage - applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_2725A6 - waitmovement 0 - delay 30 - 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, MAP_PETALBURG_CITY - setvar VAR_0x8004, 5 - call SlateportCity_Harbor_EventScript_2721E2 - return - -SlateportCity_Harbor_EventScript_20CC2D:: @ 820CC2D - msgbox SlateportCity_Harbor_Text_20CF71, 4 - release - end - -SlateportCity_Harbor_EventScript_20CC37:: @ 820CC37 - applymovement 255, SlateportCity_Harbor_Movement_20CC4D - waitmovement 0 - return - -SlateportCity_Harbor_EventScript_20CC42:: @ 820CC42 - applymovement 255, SlateportCity_Harbor_Movement_20CC50 - waitmovement 0 - return - -SlateportCity_Harbor_Movement_20CC4D: @ 820CC4D - walk_right - walk_in_place_fastest_up - step_end - -SlateportCity_Harbor_Movement_20CC50: @ 820CC50 - walk_up - step_end - -SlateportCity_Harbor_EventScript_20CC52:: @ 820CC52 - lock - faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SlateportCity_Harbor_EventScript_20CC89 - setvar VAR_0x8004, 0 - checkflag FLAG_0x1BE - call_if 1, SlateportCity_Harbor_EventScript_20CC93 - checkflag FLAG_0x1BF - call_if 1, SlateportCity_Harbor_EventScript_20CC93 - compare VAR_0x8004, 2 - goto_eq SlateportCity_Harbor_EventScript_20CC89 - msgbox SlateportCity_Harbor_Text_20D08E, 4 - release - end - -SlateportCity_Harbor_EventScript_20CC89:: @ 820CC89 - msgbox SlateportCity_Harbor_Text_20D01C, 4 - release - end - -SlateportCity_Harbor_EventScript_20CC93:: @ 820CC93 - addvar VAR_0x8004, 1 - return - -SlateportCity_Harbor_EventScript_20CC99:: @ 820CC99 - msgbox SlateportCity_Harbor_Text_20D194, 2 - end - -SlateportCity_Harbor_EventScript_20CCA2:: @ 820CCA2 - lock - faceplayer - checkflag FLAG_BADGE07_GET - goto_eq SlateportCity_Harbor_EventScript_20CD00 - checkflag FLAG_0x10F - goto_eq SlateportCity_Harbor_EventScript_20CCF6 - checkflag FLAG_0x070 - goto_eq SlateportCity_Harbor_EventScript_20CCE9 - compare VAR_0x40A0, 2 - goto_eq SlateportCity_Harbor_EventScript_20CCDF - msgbox SlateportCity_Harbor_Text_20D232, 4 - closemessage - applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_2725A2 - waitmovement 0 - release - end - -SlateportCity_Harbor_EventScript_20CCDF:: @ 820CCDF - msgbox SlateportCity_Harbor_Text_20D35A, 4 - release - end - -SlateportCity_Harbor_EventScript_20CCE9:: @ 820CCE9 - setflag FLAG_0x10F - msgbox SlateportCity_Harbor_Text_20D42B, 4 - release - end - -SlateportCity_Harbor_EventScript_20CCF6:: @ 820CCF6 - msgbox SlateportCity_Harbor_Text_20D58A, 4 - release - end - -SlateportCity_Harbor_EventScript_20CD00:: @ 820CD00 - compare VAR_TEMP_1, 1 - goto_eq SlateportCity_Harbor_EventScript_20CE11 - checkitem ITEM_SCANNER, 1 - compare VAR_RESULT, 1 - goto_eq SlateportCity_Harbor_EventScript_20CD38 - checkflag FLAG_SYS_GAME_CLEAR - goto_eq SlateportCity_Harbor_EventScript_20CD2E - msgbox SlateportCity_Harbor_Text_20D65C, 4 - release - end - -SlateportCity_Harbor_EventScript_20CD2E:: @ 820CD2E - msgbox SlateportCity_Harbor_Text_20D6CB, 4 - release - end - -SlateportCity_Harbor_EventScript_20CD38:: @ 820CD38 - message SlateportCity_Harbor_Text_20D76C - waitmessage - goto SlateportCity_Harbor_EventScript_20CD44 - end - -SlateportCity_Harbor_EventScript_20CD44:: @ 820CD44 - multichoice 0, 0, 46, 0 - switch VAR_RESULT - case 0, SlateportCity_Harbor_EventScript_20CD7B - case 1, SlateportCity_Harbor_EventScript_20CDBB - case 2, SlateportCity_Harbor_EventScript_20CDFB - case 127, SlateportCity_Harbor_EventScript_20CDFB - end - -SlateportCity_Harbor_EventScript_20CD7B:: @ 820CD7B - msgbox SlateportCity_Harbor_Text_20D8BC, 5 - compare VAR_RESULT, 0 - goto_eq SlateportCity_Harbor_EventScript_20CE05 - giveitem_std ITEM_DEEP_SEA_TOOTH - compare VAR_RESULT, 0 - goto_eq SlateportCity_Harbor_EventScript_272054 - takeitem ITEM_SCANNER, 1 - msgbox SlateportCity_Harbor_Text_20D94A, 4 - setflag FLAG_0x126 - goto SlateportCity_Harbor_EventScript_20CE11 - end - -SlateportCity_Harbor_EventScript_20CDBB:: @ 820CDBB - msgbox SlateportCity_Harbor_Text_20D8F1, 5 - compare VAR_RESULT, 0 - goto_eq SlateportCity_Harbor_EventScript_20CE05 - giveitem_std ITEM_DEEP_SEA_SCALE - compare VAR_RESULT, 0 - goto_eq SlateportCity_Harbor_EventScript_272054 - takeitem ITEM_SCANNER, 1 - msgbox SlateportCity_Harbor_Text_20D94A, 4 - setflag FLAG_0x126 - goto SlateportCity_Harbor_EventScript_20CE11 - end - -SlateportCity_Harbor_EventScript_20CDFB:: @ 820CDFB - msgbox SlateportCity_Harbor_Text_20D841, 4 - release - end - -SlateportCity_Harbor_EventScript_20CE05:: @ 820CE05 - message SlateportCity_Harbor_Text_20D926 - waitmessage - goto SlateportCity_Harbor_EventScript_20CD44 - end - -SlateportCity_Harbor_EventScript_20CE11:: @ 820CE11 - setvar VAR_TEMP_1, 1 - msgbox SlateportCity_Harbor_Text_20D970, 4 - release - end - -SlateportCity_Harbor_Text_20CE20: @ 820CE20 - .string "I beg your pardon?\n" - .string "You’re looking for a ship?\p" - .string "I’m sorry, the ferry service isn’t\n" - .string "available at present…$" - -SlateportCity_Harbor_Text_20CE87: @ 820CE87 - .string "Hello, are you here for the ferry?\n" - .string "May I see your TICKET?$" - - -SlateportCity_Harbor_Text_20CEC1: @ 820CEC1 - .string "{PLAYER} doesn’t have the TICKET…\p" - .string "I’m terribly sorry.\p" - .string "You must have a TICKET to board\n" - .string "the ferry.$" - -SlateportCity_Harbor_Text_20CF1C: @ 820CF1C - .string "{PLAYER} flashed the TICKET.\p" - .string "Perfect! That’s all you need!\p" - .string "And where would you like to go?$" - -SlateportCity_Harbor_Text_20CF71: @ 820CF71 - .string "Please sail with us another time!$" - -SlateportCity_Harbor_Text_20CF93: @ 820CF93 - .string "LILYCOVE CITY it is, then!$" - -SlateportCity_Harbor_Text_20CFAE: @ 820CFAE - .string "BATTLE FRONTIER it is, then!$" - -SlateportCity_Harbor_Text_20CFCB: @ 820CFCB - .string "Please board the ferry and wait for\n" - .string "departure.$" - -SlateportCity_Harbor_Text_20CFFA: @ 820CFFA - .string "Then, where would you like to go?$" - -SlateportCity_Harbor_Text_20D01C: @ 820D01C - .string "A journey to the bottom of the sea…\n" - .string "I wonder what it’d be like?\p" - .string "I’d love to go deep underwater like\n" - .string "that someday.$" - -SlateportCity_Harbor_Text_20D08E: @ 820D08E - .string "For a ship to sail safely, we need to\n" - .string "know about the weather!\p" - .string "Speaking of weather, I heard something\n" - .string "from a guy at the WEATHER INSTITUTE.\p" - .string "He was saying abnormal weather has\n" - .string "been reported all over the place!\p" - .string "You should visit the WEATHER INSTITUTE\n" - .string "and ask around!$" - -SlateportCity_Harbor_Text_20D194: @ 820D194 - .string "I wanted to go with CAPT. STERN on\n" - .string "the ocean floor exploration.\p" - .string "But the sub’s too small for me.\p" - .string "If I squeezed in, there wouldn’t be\n" - .string "any room for the CAPTAIN…$" - -SlateportCity_Harbor_Text_20D232: @ 820D232 - .string "CAPT. STERN: Those thugs…\p" - .string "They’re the same lot who tried to rob\n" - .string "the DEVON GOODS at the MUSEUM.$" - -SlateportCity_Harbor_Text_20D291: @ 820D291 - .string "ARCHIE: Oh?\n" - .string "Not you again…\p" - .string "You are tenacious to track us here,\n" - .string "that much I will give you.\p" - .string "But now…\n" - .string "No one can stop us! No one!\p" - .string "Or, will you follow us back to our\n" - .string "HIDEOUT in LILYCOVE CITY?\p" - .string "Fwahahahaha…$" - -SlateportCity_Harbor_Text_20D35A: @ 820D35A - .string "CAPT. STERN: Why…\p" - .string "Why would TEAM AQUA steal my\n" - .string "SUBMARINE EXPLORER 1?\p" - .string "They can’t be after the slumbering\n" - .string "POKéMON at the bottom of the sea…\p" - .string "But even if I were to chase them,\n" - .string "I don’t stand a chance against them…$" - -SlateportCity_Harbor_Text_20D42B: @ 820D42B - .string "CAPT. STERN: Oh, {PLAYER}{KUN}…\p" - .string "Okay… So TEAM AQUA left before you\n" - .string "could stop them…\p" - .string "Oh, no, don’t blame yourself.\n" - .string "You’re not responsible for this.\p" - .string "Trying to catch a submarine…\n" - .string "It’s impossible for most people.\p" - .string "You would need a POKéMON that knows\n" - .string "how to DIVE…\p" - .string "Perhaps if you went out to\n" - .string "MOSSDEEP CITY…\p" - .string "A lot of divers live out there, so\n" - .string "someone might teach you…$" - -SlateportCity_Harbor_Text_20D58A: @ 820D58A - .string "CAPT. STERN: Trying to catch a\n" - .string "submarine… It’s impossible.\p" - .string "You would need a POKéMON that knows\n" - .string "how to DIVE…\p" - .string "Perhaps if you went out to\n" - .string "MOSSDEEP CITY…\p" - .string "A lot of divers live out there, so\n" - .string "someone might teach you…$" - -SlateportCity_Harbor_Text_20D65C: @ 820D65C - .string "CAPT. STERN: Oh, yes.\n" - .string "MR. BRINEY came to our SHIPYARD.\p" - .string "It won’t be long now before we finish\n" - .string "making the ferry!$" - -SlateportCity_Harbor_Text_20D6CB: @ 820D6CB - .string "CAPT. STERN: {PLAYER}{KUN}!\p" - .string "We finally finished making the ferry\n" - .string "S.S. TIDAL!\p" - .string "We couldn’t have done it without\n" - .string "your friend MR. BRINEY.\p" - .string "Please go for a short cruise on it!$" - -SlateportCity_Harbor_Text_20D76C: @ 820D76C - .string "CAPT. STERN: Oh?\n" - .string "{PLAYER}{KUN}, that item you have…\p" - .string "That’s a SCANNER! That would sure\n" - .string "help us on our explorations.\p" - .string "{PLAYER}{KUN}, would you trade your\n" - .string "SCANNER for something?\p" - .string "Like, say, a DEEPSEATOOTH or\n" - .string "a DEEPSEASCALE that I have?$" - -SlateportCity_Harbor_Text_20D841: @ 820D841 - .string "CAPT. STERN: Are you certain?\n" - .string "It’s useless to you, {PLAYER}{KUN}…\p" - .string "Well, okay, then. If you want to trade\n" - .string "your SCANNER, let me know.$" - -SlateportCity_Harbor_Text_20D8BC: @ 820D8BC - .string "CAPT. STERN: So you’ll trade it for\n" - .string "my DEEPSEATOOTH?$" - -SlateportCity_Harbor_Text_20D8F1: @ 820D8F1 - .string "CAPT. STERN: So you’ll trade it for\n" - .string "my DEEPSEASCALE?$" - -SlateportCity_Harbor_Text_20D926: @ 820D926 - .string "CAPT. STERN: Which one do you want?$" - -SlateportCity_Harbor_Text_20D94A: @ 820D94A - .string "{PLAYER} handed the SCANNER to\n" - .string "CAPT. STERN.$" - -SlateportCity_Harbor_Text_20D970: @ 820D970 - .string "CAPT. STERN: Thanks, {PLAYER}{KUN}!\n" - .string "This will help our research a lot!$" - diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc deleted file mode 100644 index 8ecc859f7..000000000 --- a/data/scripts/maps/SlateportCity_House1.inc +++ /dev/null @@ -1,121 +0,0 @@ -SlateportCity_House1_MapScripts:: @ 8209AA4 - .byte 0 - -SlateportCity_House1_EventScript_209AA5:: @ 8209AA5 - lock - faceplayer - msgbox SlateportCity_House1_Text_209B8E, 5 - compare VAR_RESULT, 1 - goto_eq SlateportCity_House1_EventScript_209AC6 - compare VAR_RESULT, 0 - goto_eq SlateportCity_House1_EventScript_209AE9 - end - -SlateportCity_House1_EventScript_209AC6:: @ 8209AC6 - msgbox SlateportCity_House1_Text_209BFF, 4 - special sub_81B94B0 - waitstate - compare VAR_0x8004, 255 - goto_if 5, SlateportCity_House1_EventScript_209AF3 - compare VAR_0x8004, 255 - goto_eq SlateportCity_House1_EventScript_209AE9 - end - -SlateportCity_House1_EventScript_209AE9:: @ 8209AE9 - msgbox SlateportCity_House1_Text_209D42, 4 - release - end - -SlateportCity_House1_EventScript_209AF3:: @ 8209AF3 - specialvar VAR_RESULT, ScriptGetPartyMonSpecies - compare VAR_RESULT, 412 - goto_eq SlateportCity_House1_EventScript_209B46 - special TV_CopyNicknameToStringVar1AndEnsureTerminated - special TV_CheckMonOTIDEqualsPlayerID - compare VAR_RESULT, 1 - goto_eq SlateportCity_House1_EventScript_209B50 - specialvar VAR_RESULT, sub_8139770 - special TV_CopyNicknameToStringVar1AndEnsureTerminated - compare VAR_RESULT, 1 - goto_eq SlateportCity_House1_EventScript_209B50 - msgbox SlateportCity_House1_Text_209C2B, 5 - compare VAR_RESULT, 1 - goto_eq SlateportCity_House1_EventScript_209B5A - compare VAR_RESULT, 0 - goto_eq SlateportCity_House1_EventScript_209AE9 - end - -SlateportCity_House1_EventScript_209B46:: @ 8209B46 - msgbox SlateportCity_House1_Text_209E74, 4 - release - end - -SlateportCity_House1_EventScript_209B50:: @ 8209B50 - msgbox SlateportCity_House1_Text_209DF0, 4 - release - end - -SlateportCity_House1_EventScript_209B5A:: @ 8209B5A - msgbox SlateportCity_House1_Text_209CA4, 4 - call SlateportCity_House1_EventScript_2723DD - specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicnkameChanged - special TV_CopyNicknameToStringVar1AndEnsureTerminated - compare VAR_RESULT, 1 - goto_eq SlateportCity_House1_EventScript_209B84 - msgbox SlateportCity_House1_Text_209D5E, 4 - release - end - -SlateportCity_House1_EventScript_209B84:: @ 8209B84 - msgbox SlateportCity_House1_Text_209CD4, 4 - release - end - -SlateportCity_House1_Text_209B8E: @ 8209B8E - .string "Hi, hi! I’m the NAME RATER!\n" - .string "I’m the fortune-teller of names!\p" - .string "I shall be pleased to rate your\n" - .string "POKéMON’s nickname.$" - -SlateportCity_House1_Text_209BFF: @ 8209BFF - .string "Which POKéMON’s nickname should\n" - .string "I critique?$" - -SlateportCity_House1_Text_209C2B: @ 8209C2B - .string "Hmmm… {STR_VAR_1}, is it? That is\n" - .string "quite a fine name you bestowed.\p" - .string "But! What say you, if I were to\n" - .string "suggest a slightly better name?$" - -SlateportCity_House1_Text_209CA4: @ 8209CA4 - .string "Ah, good. Then, what shall the new\n" - .string "nickname be?$" - -SlateportCity_House1_Text_209CD4: @ 8209CD4 - .string "Done! From now on, this POKéMON\n" - .string "shall be known as {STR_VAR_1}!\p" - .string "It is a better name than before!\n" - .string "How fortunate for you!$" - -SlateportCity_House1_Text_209D42: @ 8209D42 - .string "I see.\n" - .string "Do come visit again.$" - -SlateportCity_House1_Text_209D5E: @ 8209D5E - .string "Done! From now on, this POKéMON\n" - .string "shall be known as {STR_VAR_1}!\p" - .string "It looks no different from before,\n" - .string "and yet, this is vastly superior!\p" - .string "How fortunate for you!$" - -SlateportCity_House1_Text_209DF0: @ 8209DF0 - .string "Hmmm… {STR_VAR_1} it is!\p" - .string "This is a magnificent nickname!\n" - .string "It is impeccably beyond reproach!\p" - .string "You’ll do well to cherish your\n" - .string "{STR_VAR_1} now and beyond.$" - -SlateportCity_House1_Text_209E74: @ 8209E74 - .string "Now, now.\n" - .string "That is merely an EGG!$" - diff --git a/data/scripts/maps/SlateportCity_House2.inc b/data/scripts/maps/SlateportCity_House2.inc deleted file mode 100644 index 28a05ed38..000000000 --- a/data/scripts/maps/SlateportCity_House2.inc +++ /dev/null @@ -1,23 +0,0 @@ -SlateportCity_House2_MapScripts:: @ 820D9AE - .byte 0 - -SlateportCity_House2_EventScript_20D9AF:: @ 820D9AF - msgbox SlateportCity_House2_Text_20D9C1, 2 - end - -SlateportCity_House2_EventScript_20D9B8:: @ 820D9B8 - msgbox SlateportCity_House2_Text_20DA59, 2 - end - -SlateportCity_House2_Text_20D9C1: @ 820D9C1 - .string "My POKéMON has a HASTY nature.\p" - .string "It has higher SPEED compared to\n" - .string "my other POKéMON.\p" - .string "Maybe their nature has something to\n" - .string "do with the stat gains of POKéMON.$" - -SlateportCity_House2_Text_20DA59: @ 820DA59 - .string "You’re a TRAINER, aren’t you?\p" - .string "Since you came to SLATEPORT CITY,\n" - .string "you must be going to the BATTLE TENT.$" - diff --git a/data/scripts/maps/SlateportCity_Mart.inc b/data/scripts/maps/SlateportCity_Mart.inc deleted file mode 100644 index da217f809..000000000 --- a/data/scripts/maps/SlateportCity_Mart.inc +++ /dev/null @@ -1,47 +0,0 @@ -SlateportCity_Mart_MapScripts:: @ 820DC48 - .byte 0 - -SlateportCity_Mart_EventScript_20DC49:: @ 820DC49 - lock - faceplayer - message gUnknown_08272A21 - waitmessage - pokemart SlateportCity_Mart_Pokemart_20DC60 - msgbox gUnknown_08272A3F, 4 - release - end - -SlateportCity_Mart_Pokemart_20DC60: @ 820DC60 - .2byte ITEM_POKE_BALL - .2byte ITEM_GREAT_BALL - .2byte ITEM_POTION - .2byte ITEM_SUPER_POTION - .2byte ITEM_ANTIDOTE - .2byte ITEM_PARALYZE_HEAL - .2byte ITEM_ESCAPE_ROPE - .2byte ITEM_REPEL - .2byte ITEM_HARBOR_MAIL - .2byte ITEM_NONE - release - end - -SlateportCity_Mart_EventScript_20DC76:: @ 820DC76 - msgbox SlateportCity_Mart_Text_20DC88, 2 - end - -SlateportCity_Mart_EventScript_20DC7F:: @ 820DC7F - msgbox SlateportCity_Mart_Text_20DCF8, 2 - end - -SlateportCity_Mart_Text_20DC88: @ 820DC88 - .string "The MARKET does have some interesting\n" - .string "merchandise.\p" - .string "But there are some items you can only\n" - .string "get at a POKéMON MART.$" - -SlateportCity_Mart_Text_20DCF8: @ 820DCF8 - .string "A GREAT BALL is better than a POKé BALL\n" - .string "at catching POKéMON.\p" - .string "With this, I should be able to get that\n" - .string "elusive POKéMON…$" - diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc deleted file mode 100644 index 4464ee582..000000000 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ /dev/null @@ -1,395 +0,0 @@ -SlateportCity_OceanicMuseum_1F_MapScripts:: @ 820AD95 - .byte 0 - -SlateportCity_OceanicMuseum_1F_EventScript_20AD96:: @ 820AD96 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, 2 - end - -SlateportCity_OceanicMuseum_1F_EventScript_20AD9F:: @ 820AD9F - lockall - applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_2725A4 - waitmovement 0 - goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1 - end - -SlateportCity_OceanicMuseum_1F_EventScript_20ADB0:: @ 820ADB0 - lockall - applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_2725A8 - waitmovement 0 - goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1 - end - -SlateportCity_OceanicMuseum_1F_EventScript_20ADC1:: @ 820ADC1 - showmoneybox 0, 0, 0 - msgbox SlateportCity_OceanicMuseum_1F_Text_20AFD5, 5 - compare VAR_RESULT, 1 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20ADE8 - closemessage - hidemoneybox - nop - nop - applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_20AE4B - waitmovement 0 - releaseall - end - -SlateportCity_OceanicMuseum_1F_EventScript_20ADE8:: @ 820ADE8 - checkmoney 0x32, 0 - compare VAR_RESULT, 0 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AE18 - playse SE_REGI - takemoney 0x32, 0 - updatemoneybox 0, 0 - nop - msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, 4 - setvar VAR_0x40AA, 1 - hidemoneybox - nop - nop - releaseall - end - -SlateportCity_OceanicMuseum_1F_EventScript_20AE18:: @ 820AE18 - checkflag FLAG_0x095 - goto_if 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE39 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B03D, 4 - closemessage - hidemoneybox - nop - nop - applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_20AE4B - waitmovement 0 - releaseall - end - -SlateportCity_OceanicMuseum_1F_EventScript_20AE39:: @ 820AE39 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B075, 4 - setvar VAR_0x40AA, 1 - hidemoneybox - nop - nop - releaseall - end - -SlateportCity_OceanicMuseum_1F_Movement_20AE4B: @ 820AE4B - walk_down - step_end - -SlateportCity_OceanicMuseum_1F_EventScript_20AE4D:: @ 820AE4D - msgbox SlateportCity_OceanicMuseum_1F_Text_20B0E8, 2 - end - -SlateportCity_OceanicMuseum_1F_EventScript_20AE56:: @ 820AE56 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B112, 2 - end - -SlateportCity_OceanicMuseum_1F_EventScript_20AE5F:: @ 820AE5F - msgbox SlateportCity_OceanicMuseum_1F_Text_20B165, 2 - end - -SlateportCity_OceanicMuseum_1F_EventScript_20AE68:: @ 820AE68 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B19C, 3 - end - -SlateportCity_OceanicMuseum_1F_EventScript_20AE71:: @ 820AE71 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B1D4, 2 - end - -SlateportCity_OceanicMuseum_1F_EventScript_20AE7A:: @ 820AE7A - msgbox SlateportCity_OceanicMuseum_1F_Text_20B218, 2 - end - -SlateportCity_OceanicMuseum_1F_EventScript_20AE83:: @ 820AE83 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B4CF, 3 - end - -SlateportCity_OceanicMuseum_1F_EventScript_20AE8C:: @ 820AE8C - msgbox SlateportCity_OceanicMuseum_1F_Text_20B547, 3 - end - -SlateportCity_OceanicMuseum_1F_EventScript_20AE95:: @ 820AE95 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B5CA, 3 - end - -SlateportCity_OceanicMuseum_1F_EventScript_20AE9E:: @ 820AE9E - msgbox SlateportCity_OceanicMuseum_1F_Text_20B699, 3 - end - -SlateportCity_OceanicMuseum_1F_EventScript_20AEA7:: @ 820AEA7 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B74B, 3 - end - -SlateportCity_OceanicMuseum_1F_EventScript_20AEB0:: @ 820AEB0 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B81F, 3 - end - -SlateportCity_OceanicMuseum_1F_EventScript_20AEB9:: @ 820AEB9 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B912, 3 - end - -SlateportCity_OceanicMuseum_1F_EventScript_20AEC2:: @ 820AEC2 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B9C0, 3 - end - -SlateportCity_OceanicMuseum_1F_EventScript_20AECB:: @ 820AECB - msgbox SlateportCity_OceanicMuseum_1F_Text_20BA9C, 3 - end - -SlateportCity_OceanicMuseum_1F_EventScript_20AED4:: @ 820AED4 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B25F, 2 - end - -SlateportCity_OceanicMuseum_1F_EventScript_20AEDD:: @ 820AEDD - msgbox SlateportCity_OceanicMuseum_1F_Text_20B2A2, 2 - end - -SlateportCity_OceanicMuseum_1F_EventScript_20AEE6:: @ 820AEE6 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B302, 2 - end - -SlateportCity_OceanicMuseum_1F_EventScript_20AEEF:: @ 820AEEF - msgbox SlateportCity_OceanicMuseum_1F_Text_20B369, 2 - end - -SlateportCity_OceanicMuseum_1F_EventScript_20AEF8:: @ 820AEF8 - lock - faceplayer - delay 8 - playse SE_PIN - applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_272598 - waitmovement 0 - applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_27259A - waitmovement 0 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B3AB, 4 - giveitem_std ITEM_TM46 - compare VAR_RESULT, 0 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AFB5 - setflag FLAG_0x10D - msgbox SlateportCity_OceanicMuseum_1F_Text_20B449, 4 - closemessage - compare VAR_FACING, 2 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF6C - compare VAR_FACING, 1 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF83 - compare VAR_FACING, 3 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93 - compare VAR_FACING, 4 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93 - end - -SlateportCity_OceanicMuseum_1F_EventScript_20AF6C:: @ 820AF6C - applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_20AFBF - applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_20AFCE - waitmovement 0 - goto SlateportCity_OceanicMuseum_1F_EventScript_20AFAA - end - -SlateportCity_OceanicMuseum_1F_EventScript_20AF83:: @ 820AF83 - applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_20AFC7 - waitmovement 0 - goto SlateportCity_OceanicMuseum_1F_EventScript_20AFAA - end - -SlateportCity_OceanicMuseum_1F_EventScript_20AF93:: @ 820AF93 - applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_20AFC4 - applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_20AFC7 - waitmovement 0 - goto SlateportCity_OceanicMuseum_1F_EventScript_20AFAA - end - -SlateportCity_OceanicMuseum_1F_EventScript_20AFAA:: @ 820AFAA - setflag FLAG_0x3C5 - playse SE_KAIDAN - removeobject 13 - release - end - -SlateportCity_OceanicMuseum_1F_EventScript_20AFB5:: @ 820AFB5 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B49B, 4 - release - end - -SlateportCity_OceanicMuseum_1F_Movement_20AFBF: @ 820AFBF - delay_16 - delay_8 - delay_4 - walk_in_place_fastest_down - step_end - -SlateportCity_OceanicMuseum_1F_Movement_20AFC4: @ 820AFC4 - delay_16 - walk_in_place_fastest_down - step_end - -SlateportCity_OceanicMuseum_1F_Movement_20AFC7: @ 820AFC7 - face_down - walk_fast_down - walk_fast_down - walk_fast_down - walk_fast_down - delay_8 - step_end - -SlateportCity_OceanicMuseum_1F_Movement_20AFCE: @ 820AFCE - 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 - .string "Welcome to the OCEANIC MUSEUM.\p" - .string "The entrance fee is Â¥50.\n" - .string "Would you like to enter?$" - -SlateportCity_OceanicMuseum_1F_Text_20B026: @ 820B026 - .string "Please enjoy yourself.$" - -SlateportCity_OceanicMuseum_1F_Text_20B03D: @ 820B03D - .string "Oh? I’m sorry, but you don’t seem to\n" - .string "have enough money.$" - -SlateportCity_OceanicMuseum_1F_Text_20B075: @ 820B075 - .string "Oh? You’re with that group that\n" - .string "went in earlier?\p" - .string "You’re the only one who’s late.\n" - .string "You’d better go catch up to them!$" - -SlateportCity_OceanicMuseum_1F_Text_20B0E8: @ 820B0E8 - .string "We, TEAM AQUA, exist for the good\n" - .string "of all!$" - -SlateportCity_OceanicMuseum_1F_Text_20B112: @ 820B112 - .string "We were told to assemble here,\n" - .string "so we did, but…\p" - .string "Our BOSS, the linchpin, isn’t here.$" - -SlateportCity_OceanicMuseum_1F_Text_20B165: @ 820B165 - .string "If I ripped off the stuff here,\n" - .string "would it make me rich?$" - -SlateportCity_OceanicMuseum_1F_Text_20B19C: @ 820B19C - .string "What I learn here, I can put to use on\n" - .string "nefarious deeds…$" - -SlateportCity_OceanicMuseum_1F_Text_20B1D4: @ 820B1D4 - .string "If our goons didn’t bungle things\n" - .string "in RUSTBORO, we wouldn’t be here!$" - -SlateportCity_OceanicMuseum_1F_Text_20B218: @ 820B218 - .string "I didn’t have Â¥50, so it took a long\n" - .string "time getting by the receptionist.$" - -SlateportCity_OceanicMuseum_1F_Text_20B25F: @ 820B25F - .string "I want to learn about the sea and\n" - .string "use that knowledge for battling.$" - -SlateportCity_OceanicMuseum_1F_Text_20B2A2: @ 820B2A2 - .string "I get all giddy and gooey when\n" - .string "I see the sea!\p" - .string "For me, CAPT. STERN is the number\n" - .string "one role model!$" - -SlateportCity_OceanicMuseum_1F_Text_20B302: @ 820B302 - .string "The sea is vast without end, and\n" - .string "infinitely deep…\p" - .string "There must be many POKéMON that\n" - .string "we don’t know about.$" - -SlateportCity_OceanicMuseum_1F_Text_20B369: @ 820B369 - .string "I want a sea POKéMON.\p" - .string "I think it would feel cool and nice\n" - .string "to hug.$" - -SlateportCity_OceanicMuseum_1F_Text_20B3AB: @ 820B3AB - .string "Aiyeeeh!\n" - .string "What are you doing here?\p" - .string "Me? I’m the TEAM AQUA member\n" - .string "you thumped before, remember?\l" - .string "Back in RUSTURF TUNNEL?\p" - .string "Here, take this!\n" - .string "You have to forgive me!$" - -SlateportCity_OceanicMuseum_1F_Text_20B449: @ 820B449 - .string "That TM, it suits you more than it\n" - .string "does me.\p" - .string "Hope I never see you again!\n" - .string "Wahahaha!$" - -SlateportCity_OceanicMuseum_1F_Text_20B49B: @ 820B49B - .string "Awww, come on!\n" - .string "You have to take this and let me go!$" - -SlateportCity_OceanicMuseum_1F_Text_20B4CF: @ 820B4CF - .string "A blue fluid is spiraling inside\n" - .string "a glass vessel.\p" - .string "“This is an experiment to create a\n" - .string "WHIRLPOOL artificially using wind.â€$" - -SlateportCity_OceanicMuseum_1F_Text_20B547: @ 820B547 - .string "A red ball is bobbing up and down\n" - .string "inside a glass vessel.\p" - .string "“This is an experiment simulating a\n" - .string "WATERFALL using the ball’s buoyancy.â€$" - -SlateportCity_OceanicMuseum_1F_Text_20B5CA: @ 820B5CA - .string "It’s a sample of soil from the ocean\n" - .string "floor.\p" - .string "“Over many years, the remains of\n" - .string "life-forms settle at the bottom of\l" - .string "the sea, making sedimentary layers.\p" - .string "“By analyzing these layers, the\n" - .string "ancient past is revealed.â€$" - -SlateportCity_OceanicMuseum_1F_Text_20B699: @ 820B699 - .string "It’s a sample of beach sand.\p" - .string "“Stones from mountains are washed\n" - .string "down by rivers where they are\l" - .string "chipped and ground down.\p" - .string "“They are reduced to grains and end\n" - .string "up as sand on beaches.â€$" - -SlateportCity_OceanicMuseum_1F_Text_20B74B: @ 820B74B - .string "“OCEANIC MINIFACT 1\n" - .string "Why is seawater blue?\p" - .string "“Light is composed of many colors.\p" - .string "“When light passes through water,\n" - .string "most kinds of light lose color.\p" - .string "“However, blue light retains its\n" - .string "color, making the sea appear blue.â€$" - -SlateportCity_OceanicMuseum_1F_Text_20B81F: @ 820B81F - .string "“OCEANIC MINIFACT 2\n" - .string "Why is the sea salty?\p" - .string "“Seawater contains dissolved salt in\n" - .string "the form of sodium and chlorine ions.\p" - .string "“These ions leech out of rocks\n" - .string "and are carried out to sea by rain.\p" - .string "“The concentration of dissolved salt\n" - .string "makes the sea salty.â€$" - -SlateportCity_OceanicMuseum_1F_Text_20B912: @ 820B912 - .string "“OCEANIC MINIFACT 3\n" - .string "Which is bigger? The sea or land?\p" - .string "“The sea covers about 70% of\n" - .string "the planet, and the rest is land.\p" - .string "“The sea is therefore more than twice\n" - .string "the size of land.â€$" - -SlateportCity_OceanicMuseum_1F_Text_20B9C0: @ 820B9C0 - .string "It’s a fossil with wavy ridges on it.\p" - .string "“Soil on the ocean floor gets scoured\n" - .string "by the tide.\p" - .string "“The flowing seawater marks the soil\n" - .string "with small ridges and valleys.\p" - .string "“If this soil becomes fossilized, it is\n" - .string "called a ripple mark.â€$" - -SlateportCity_OceanicMuseum_1F_Text_20BA9C: @ 820BA9C - .string "A strange machine is rotating under\n" - .string "a glass dome.\p" - .string "Maybe it’s for measuring the depth\n" - .string "of something…$" - diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc deleted file mode 100644 index 4172c47ef..000000000 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ /dev/null @@ -1,441 +0,0 @@ -SlateportCity_OceanicMuseum_2F_MapScripts:: @ 820BAFF - .byte 0 - -SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 - lock - faceplayer - msgbox SlateportCity_OceanicMuseum_2F_Text_20BD8D, 4 - closemessage - playbgm MUS_AQA_0, 1 - addobject 3 - applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE4 - waitmovement 0 - addobject 4 - applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCF3 - waitmovement 0 - applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE8 - applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCF5 - waitmovement 0 - compare VAR_FACING, 1 - call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC92 - compare VAR_FACING, 4 - call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC92 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BE40, 4 - compare VAR_FACING, 4 - call_if 5, SlateportCity_OceanicMuseum_2F_EventScript_20BC9D - msgbox SlateportCity_OceanicMuseum_2F_Text_20BE69, 4 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BE93, 4 - closemessage - applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCE2 - waitmovement 0 - compare VAR_FACING, 1 - call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BCA8 - compare VAR_FACING, 3 - call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BCB3 - trainerbattle 3, TRAINER_GRUNT_14, 0, SlateportCity_OceanicMuseum_2F_Text_20BEE2 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BEFA, 4 - closemessage - applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCEF - waitmovement 0 - applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE2 - waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BF35, 4 - trainerbattle 3, TRAINER_GRUNT_15, 0, SlateportCity_OceanicMuseum_2F_Text_20BF66 - applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCEF - waitmovement 0 - applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_2725AA - applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_2725A6 - waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BF7A, 4 - closemessage - delay 35 - addobject 2 - applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_20BCD8 - applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCFE - waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BFF2, 4 - closemessage - applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_20BCD6 - waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C059, 4 - closemessage - savebgm MUS_DUMMY - fadedefaultbgm - fadescreen 1 - removeobject 2 - removeobject 3 - removeobject 4 - fadescreen 0 - delay 30 - setflag FLAG_0x373 - applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_2725A8 - waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C2BE, 4 - setvar VAR_0x8004, 269 - call SlateportCity_OceanicMuseum_2F_EventScript_2723E4 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C36C, 4 - closemessage - fadescreen 1 - playfanfare MUS_ME_ASA - waitfanfare - special HealPlayerParty - removeobject 1 - setflag FLAG_0x384 - compare VAR_0x40DA, 0 - call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC8C - setflag FLAG_0x095 - clearflag FLAG_0x3B3 - setflag FLAG_0x3B5 - setvar VAR_0x40D2, 1 - fadescreen 0 - release - end - -SlateportCity_OceanicMuseum_2F_EventScript_20BC8C:: @ 820BC8C - setvar VAR_0x40DA, 1 - return - -SlateportCity_OceanicMuseum_2F_EventScript_20BC92:: @ 820BC92 - applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_2725A4 - waitmovement 0 - return - -SlateportCity_OceanicMuseum_2F_EventScript_20BC9D:: @ 820BC9D - applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_2725A4 - waitmovement 0 - return - -SlateportCity_OceanicMuseum_2F_EventScript_20BCA8:: @ 820BCA8 - applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_20BCBE - waitmovement 0 - return - -SlateportCity_OceanicMuseum_2F_EventScript_20BCB3:: @ 820BCB3 - applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_20BCC2 - waitmovement 0 - return - -SlateportCity_OceanicMuseum_2F_Movement_20BCBE: @ 820BCBE - walk_left - walk_down - walk_in_place_fastest_left - step_end - -SlateportCity_OceanicMuseum_2F_Movement_20BCC2: @ 820BCC2 - walk_up - walk_left - walk_left - walk_down - walk_in_place_fastest_left - step_end - -SlateportCity_OceanicMuseum_2F_Movement_20BCC8: @ 820BCC8 - 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 - walk_right - step_end - -SlateportCity_OceanicMuseum_2F_Movement_20BCD8: @ 820BCD8 - 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 - walk_right - step_end - -SlateportCity_OceanicMuseum_2F_Movement_20BCE4: @ 820BCE4 - walk_down - walk_right - walk_in_place_fastest_down - step_end - -SlateportCity_OceanicMuseum_2F_Movement_20BCE8: @ 820BCE8 - walk_down - walk_down - walk_down - walk_right - walk_right - walk_right - step_end - -SlateportCity_OceanicMuseum_2F_Movement_20BCEF: @ 820BCEF - lock_facing_direction - walk_left - unlock_facing_direction - step_end - -SlateportCity_OceanicMuseum_2F_Movement_20BCF3: @ 820BCF3 - walk_down - step_end - -SlateportCity_OceanicMuseum_2F_Movement_20BCF5: @ 820BCF5 - walk_down - walk_down - walk_down - walk_down - walk_right - walk_right - walk_right - walk_right - step_end - -SlateportCity_OceanicMuseum_2F_Movement_20BCFE: @ 820BCFE - 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 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C4F9, 3 - end - -SlateportCity_OceanicMuseum_2F_EventScript_20BD13:: @ 820BD13 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C566, 3 - end - -SlateportCity_OceanicMuseum_2F_EventScript_20BD1C:: @ 820BD1C - msgbox SlateportCity_OceanicMuseum_2F_Text_20C5C6, 3 - end - -SlateportCity_OceanicMuseum_2F_EventScript_20BD25:: @ 820BD25 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C6C7, 3 - end - -SlateportCity_OceanicMuseum_2F_EventScript_20BD2E:: @ 820BD2E - msgbox SlateportCity_OceanicMuseum_2F_Text_20C72F, 3 - end - -SlateportCity_OceanicMuseum_2F_EventScript_20BD37:: @ 820BD37 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C7C1, 3 - end - -SlateportCity_OceanicMuseum_2F_EventScript_20BD40:: @ 820BD40 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C82F, 3 - end - -SlateportCity_OceanicMuseum_2F_EventScript_20BD49:: @ 820BD49 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C88B, 3 - end - -SlateportCity_OceanicMuseum_2F_EventScript_20BD52:: @ 820BD52 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C8E8, 3 - end - -SlateportCity_OceanicMuseum_2F_EventScript_20BD5B:: @ 820BD5B - msgbox SlateportCity_OceanicMuseum_2F_Text_20C93A, 3 - end - -SlateportCity_OceanicMuseum_2F_EventScript_20BD64:: @ 820BD64 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C43F, 2 - end - -SlateportCity_OceanicMuseum_2F_EventScript_20BD6D:: @ 820BD6D - msgbox SlateportCity_OceanicMuseum_2F_Text_20C495, 2 - end - -SlateportCity_OceanicMuseum_2F_EventScript_20BD76:: @ 820BD76 - lock - faceplayer - msgbox SlateportCity_OceanicMuseum_2F_Text_20C4C2, 4 - closemessage - applymovement VAR_LAST_TALKED, SlateportCity_OceanicMuseum_2F_Movement_2725A2 - waitmovement 0 - release - end - -SlateportCity_OceanicMuseum_2F_Text_20BD8D: @ 820BD8D - .string "Yes? If you’re looking for STERN,\n" - .string "that would be me.\p" - .string "Ah! Those must be the parts I ordered\n" - .string "from MR. STONE of DEVON.\p" - .string "Thank you! That’s great!\n" - .string "We can prepare for our expedition now.$" - -SlateportCity_OceanicMuseum_2F_Text_20BE40: @ 820BE40 - .string "Hehehe, hold it!\n" - .string "We’ll take those parts!$" - -SlateportCity_OceanicMuseum_2F_Text_20BE69: @ 820BE69 - .string "CAPT. STERN: Wh-what?\n" - .string "Who are you people?$" - -SlateportCity_OceanicMuseum_2F_Text_20BE93: @ 820BE93 - .string "We’re TEAM AQUA!\p" - .string "Our BOSS wants those parts!\n" - .string "Shut your yap and fork them over!$" - -SlateportCity_OceanicMuseum_2F_Text_20BEE2: @ 820BEE2 - .string "Awaaaah!\n" - .string "A kid beat me!$" - -SlateportCity_OceanicMuseum_2F_Text_20BEFA: @ 820BEFA - .string "Oh, man, what a disaster…\n" - .string "The BOSS is going to be furious…$" - -SlateportCity_OceanicMuseum_2F_Text_20BF35: @ 820BF35 - .string "Humph, sniveling wimp!\n" - .string "Let me take care of this!$" - -SlateportCity_OceanicMuseum_2F_Text_20BF66: @ 820BF66 - .string "What?!\n" - .string "I lost, too!$" - -SlateportCity_OceanicMuseum_2F_Text_20BF7A: @ 820BF7A - .string "Now what? If we don’t get the parts,\n" - .string "we’re in for it!\p" - .string "Arrgh, I didn’t count on being meddled\n" - .string "with by some meddling kid!$" - -SlateportCity_OceanicMuseum_2F_Text_20BFF2: @ 820BFF2 - .string "I came to see what was taking so\n" - .string "long to snatch some parts, and you\l" - .string "simps are held up by a mere child?$" - -SlateportCity_OceanicMuseum_2F_Text_20C059: @ 820C059 - .string "We are TEAM AQUA,\n" - .string "and we love the sea!\p" - .string "And I am TEAM AQUA’s leader,\n" - .string "ARCHIE!\p" - .string "What makes you interfere with us?\p" - .string "…No! You can’t be!\n" - .string "You’re not one of TEAM MAGMA?\p" - .string "Wait, that can’t be right.\n" - .string "You’re not dressed for the part.\p" - .string "… … … … … …\n" - .string "… … … … … …\p" - .string "POKéMON, people… All life depends on\n" - .string "the sea.\p" - .string "So, TEAM AQUA is dedicated to\n" - .string "the expansion of the sea.\p" - .string "Don’t you agree? What we are doing\n" - .string "is a magnificent undertaking.\p" - .string "Ah, fine…\n" - .string "You’re still too young to understand\l" - .string "our noble objective.\p" - .string "But, I warn you, don’t even consider\n" - .string "interfering with our plans again.\p" - .string "The consequences will cost you\n" - .string "dearly!\p" - .string "And don’t you forget it!$" - -SlateportCity_OceanicMuseum_2F_Text_20C2BE: @ 820C2BE - .string "CAPT. STERN: You’re…\n" - .string "Ah, okay, you’re {PLAYER}{KUN}…\p" - .string "Anyway, that was a tense situation!\n" - .string "Thank you for saving us!\p" - .string "Oh, yes, I almost forgot that you\n" - .string "even brought the parts from DEVON!$" - -SlateportCity_OceanicMuseum_2F_Text_20C36C: @ 820C36C - .string "CAPT. STERN: Whoops!\n" - .string "There’s no time to lose!\p" - .string "We have to set out on our ocean-floor\n" - .string "expedition really soon.\p" - .string "Thanks again, but now I’ve got\n" - .string "to go!\p" - .string "Feel free to wander around and check\n" - .string "out our facilities, though.$" - -SlateportCity_OceanicMuseum_2F_Text_20C43F: @ 820C43F - .string "I saw a model of a ship here.\p" - .string "It reminded me of the ABANDONED SHIP\n" - .string "near DEWFORD TOWN…$" - -SlateportCity_OceanicMuseum_2F_Text_20C495: @ 820C495 - .string "Don’t you dare run around inside\n" - .string "the MUSEUM!$" - -SlateportCity_OceanicMuseum_2F_Text_20C4C2: @ 820C4C2 - .string "Wow, the submarine’s awesome!\n" - .string "I want to go for a ride!$" - -SlateportCity_OceanicMuseum_2F_Text_20C4F9: @ 820C4F9 - .string "“WATER QUALITY SAMPLE 1,†the\n" - .string "label says.\p" - .string "The sea is all connected, but the\n" - .string "water seems to differ by region.$" - -SlateportCity_OceanicMuseum_2F_Text_20C566: @ 820C566 - .string "“WATER QUALITY SAMPLE 2,†the\n" - .string "label says.\p" - .string "Does the saltiness of seawater differ\n" - .string "by region, too?$" - -SlateportCity_OceanicMuseum_2F_Text_20C5C6: @ 820C5C6 - .string "A rubber ball is expanding and\n" - .string "shrinking.\p" - .string "“In the sea, the weight of water itself\n" - .string "exerts pressure.\p" - .string "“In shallow water, the pressure is not\n" - .string "very heavy.\p" - .string "“However, in extremely deep water,\n" - .string "the pressure can reach even tens of\l" - .string "thousands of tons on a small area.â€$" - -SlateportCity_OceanicMuseum_2F_Text_20C6C7: @ 820C6C7 - .string "“MODEL OF HOENN REGIONâ€\p" - .string "It’s a miniature diorama of the\n" - .string "HOENN region.\p" - .string "Where is LITTLEROOT TOWN on this?$" - -SlateportCity_OceanicMuseum_2F_Text_20C72F: @ 820C72F - .string "It’s a display on the flow of seawater.\p" - .string "“Near the bottom of the sea, water\n" - .string "flows due to differences in such\l" - .string "factors as temperature and salinity.â€$" - -SlateportCity_OceanicMuseum_2F_Text_20C7C1: @ 820C7C1 - .string "It’s a display on the flow of seawater.\p" - .string "“Toward the surface, seawater flows\n" - .string "as currents driven by the winds.â€$" - -SlateportCity_OceanicMuseum_2F_Text_20C82F: @ 820C82F - .string "“THE FERRY S.S. TIDAL\p" - .string "“A scale replica of the ship under\n" - .string "construction at STERN’S SHIPYARD.â€$" - -SlateportCity_OceanicMuseum_2F_Text_20C88B: @ 820C88B - .string "“SUBMARINE EXPLORER 1\p" - .string "“A replica of the high-performance\n" - .string "ocean floor exploration submarine.â€$" - -SlateportCity_OceanicMuseum_2F_Text_20C8E8: @ 820C8E8 - .string "“SUBMERSIBLE POD\p" - .string "“A replica of a compact, unmanned\n" - .string "pod for seafloor exploration.â€$" - -SlateportCity_OceanicMuseum_2F_Text_20C93A: @ 820C93A - .string "“S.S. ANNE\p" - .string "“A replica of the luxury liner that\n" - .string "circles the globe.â€$" - diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc b/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc deleted file mode 100644 index 404804c57..000000000 --- a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc +++ /dev/null @@ -1,40 +0,0 @@ -SlateportCity_PokemonCenter_1F_MapScripts:: @ 820DABF - map_script 3, SlateportCity_PokemonCenter_1F_MapScript1_20DACA - map_script 5, SlateportCity_PokemonCenter_1F_MapScript1_277C30 - .byte 0 - -SlateportCity_PokemonCenter_1F_MapScript1_20DACA: @ 820DACA - setrespawn 4 - call SlateportCity_PokemonCenter_1F_EventScript_2718DE - end - -SlateportCity_PokemonCenter_1F_EventScript_20DAD3:: @ 820DAD3 - setvar VAR_0x800B, 1 - call SlateportCity_PokemonCenter_1F_EventScript_27191E - waitmessage - waitbuttonpress - release - end - -SlateportCity_PokemonCenter_1F_EventScript_20DAE1:: @ 820DAE1 - msgbox SlateportCity_PokemonCenter_1F_Text_20DAF3, 2 - end - -SlateportCity_PokemonCenter_1F_EventScript_20DAEA:: @ 820DAEA - msgbox SlateportCity_PokemonCenter_1F_Text_20DBBC, 2 - end - -SlateportCity_PokemonCenter_1F_Text_20DAF3: @ 820DAF3 - .string "Want a tip for battling?\p" - .string "I’d say it’s raising different kinds\n" - .string "of POKéMON in a balanced manner.\p" - .string "It’s no good to make just one\n" - .string "POKéMON strong.\p" - .string "If it has a type disadvantage,\n" - .string "it might not stand a chance.$" - -SlateportCity_PokemonCenter_1F_Text_20DBBC: @ 820DBBC - .string "I trade POKéMON with my friends.\p" - .string "If a traded POKéMON is holding an\n" - .string "item, it makes me twice as happy!$" - diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_2F.inc b/data/scripts/maps/SlateportCity_PokemonCenter_2F.inc deleted file mode 100644 index 3138f20d6..000000000 --- a/data/scripts/maps/SlateportCity_PokemonCenter_2F.inc +++ /dev/null @@ -1,19 +0,0 @@ -SlateportCity_PokemonCenter_2F_MapScripts:: @ 820DC21 - map_script 2, SlateportCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, SlateportCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, SlateportCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, SlateportCity_PokemonCenter_2F_MapScript1_276ACF - .byte 0 - -SlateportCity_PokemonCenter_2F_EventScript_20DC36:: @ 820DC36 - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 - end - -SlateportCity_PokemonCenter_2F_EventScript_20DC3C:: @ 820DC3C - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 - end - -SlateportCity_PokemonCenter_2F_EventScript_20DC42:: @ 820DC42 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB - end - diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc deleted file mode 100644 index 307f42af5..000000000 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ /dev/null @@ -1,428 +0,0 @@ -SlateportCity_PokemonFanClub_MapScripts:: @ 8209E95 - .byte 0 - -SlateportCity_PokemonFanClub_EventScript_209E96:: @ 8209E96 - lock - faceplayer - checkflag FLAG_0x155 - goto_if 0, SlateportCity_PokemonFanClub_EventScript_20A152 - checkflag FLAG_0x156 - call_if 0, SlateportCity_PokemonFanClub_EventScript_20A172 - switch VAR_0x40B7 - case 0, SlateportCity_PokemonFanClub_EventScript_209ED2 - case 1, SlateportCity_PokemonFanClub_EventScript_209EE5 - case 2, SlateportCity_PokemonFanClub_EventScript_209F3B - release - end - -SlateportCity_PokemonFanClub_EventScript_209ED2:: @ 8209ED2 - setvar VAR_0x40B7, 1 - msgbox SlateportCity_PokemonFanClub_Text_20A445, 4 - goto SlateportCity_PokemonFanClub_EventScript_209F45 - end - -SlateportCity_PokemonFanClub_EventScript_209EE5:: @ 8209EE5 - setvar VAR_TEMP_2, 0 - checkflag FLAG_0x0CC - call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0 - checkflag FLAG_0x0CB - call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0 - checkflag FLAG_0x0CA - call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0 - checkflag FLAG_0x0C9 - call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0 - checkflag FLAG_0x0C8 - call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0 - compare VAR_TEMP_2, 5 - call_if 1, SlateportCity_PokemonFanClub_EventScript_209FCA - compare VAR_0x40B7, 2 - goto_eq SlateportCity_PokemonFanClub_EventScript_209F3B - msgbox SlateportCity_PokemonFanClub_Text_20A62A, 4 - goto SlateportCity_PokemonFanClub_EventScript_209F45 - end - -SlateportCity_PokemonFanClub_EventScript_209F3B:: @ 8209F3B - msgbox SlateportCity_PokemonFanClub_Text_20A9E1, 4 - release - end - -SlateportCity_PokemonFanClub_EventScript_209F45:: @ 8209F45 - msgbox SlateportCity_PokemonFanClub_Text_20A65F, 4 - setvar VAR_TEMP_1, 0 - checkflag FLAG_0x0CC - call_if 0, SlateportCity_PokemonFanClub_EventScript_20A13B - checkflag FLAG_0x0CB - call_if 0, SlateportCity_PokemonFanClub_EventScript_20A124 - checkflag FLAG_0x0CA - call_if 0, SlateportCity_PokemonFanClub_EventScript_20A10D - checkflag FLAG_0x0C9 - call_if 0, SlateportCity_PokemonFanClub_EventScript_20A0F6 - checkflag FLAG_0x0C8 - call_if 0, SlateportCity_PokemonFanClub_EventScript_20A0DF - bufferleadmonspeciesname 0 - switch VAR_TEMP_1 - case 0, SlateportCity_PokemonFanClub_EventScript_209FD6 - case 1, SlateportCity_PokemonFanClub_EventScript_209FE0 - case 2, SlateportCity_PokemonFanClub_EventScript_20A011 - case 3, SlateportCity_PokemonFanClub_EventScript_20A042 - case 4, SlateportCity_PokemonFanClub_EventScript_20A073 - case 5, SlateportCity_PokemonFanClub_EventScript_20A0A4 - release - end - -SlateportCity_PokemonFanClub_EventScript_209FCA:: @ 8209FCA - setvar VAR_0x40B7, 2 - return - -SlateportCity_PokemonFanClub_EventScript_209FD0:: @ 8209FD0 - addvar VAR_TEMP_2, 1 - return - -SlateportCity_PokemonFanClub_EventScript_209FD6:: @ 8209FD6 - msgbox SlateportCity_PokemonFanClub_Text_20A66E, 4 - release - end - -SlateportCity_PokemonFanClub_EventScript_209FE0:: @ 8209FE0 - checkitemspace ITEM_RED_SCARF, 1 - compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 - msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 - setflag FLAG_0x0C8 - giveitem_std ITEM_RED_SCARF - msgbox SlateportCity_PokemonFanClub_Text_20A827, 4 - release - end - -SlateportCity_PokemonFanClub_EventScript_20A011:: @ 820A011 - checkitemspace ITEM_BLUE_SCARF, 1 - compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 - msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 - setflag FLAG_0x0C9 - giveitem_std ITEM_BLUE_SCARF - msgbox SlateportCity_PokemonFanClub_Text_20A880, 4 - release - end - -SlateportCity_PokemonFanClub_EventScript_20A042:: @ 820A042 - checkitemspace ITEM_PINK_SCARF, 1 - compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 - msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 - setflag FLAG_0x0CA - giveitem_std ITEM_PINK_SCARF - msgbox SlateportCity_PokemonFanClub_Text_20A8D7, 4 - release - end - -SlateportCity_PokemonFanClub_EventScript_20A073:: @ 820A073 - checkitemspace ITEM_GREEN_SCARF, 1 - compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 - msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 - setflag FLAG_0x0CB - giveitem_std ITEM_GREEN_SCARF - msgbox SlateportCity_PokemonFanClub_Text_20A933, 4 - release - end - -SlateportCity_PokemonFanClub_EventScript_20A0A4:: @ 820A0A4 - checkitemspace ITEM_YELLOW_SCARF, 1 - compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 - msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 - setflag FLAG_0x0CC - giveitem_std ITEM_YELLOW_SCARF - msgbox SlateportCity_PokemonFanClub_Text_20A984, 4 - release - end - -SlateportCity_PokemonFanClub_EventScript_20A0D5:: @ 820A0D5 - msgbox SlateportCity_PokemonFanClub_Text_20A719, 4 - release - end - -SlateportCity_PokemonFanClub_EventScript_20A0DF:: @ 820A0DF - specialvar VAR_RESULT, CheckLeadMonCool - compare VAR_RESULT, 1 - call_if 1, SlateportCity_PokemonFanClub_EventScript_20A0F0 - return - -SlateportCity_PokemonFanClub_EventScript_20A0F0:: @ 820A0F0 - setvar VAR_TEMP_1, 1 - return - -SlateportCity_PokemonFanClub_EventScript_20A0F6:: @ 820A0F6 - specialvar VAR_RESULT, CheckLeadMonBeauty - compare VAR_RESULT, 1 - call_if 1, SlateportCity_PokemonFanClub_EventScript_20A107 - return - -SlateportCity_PokemonFanClub_EventScript_20A107:: @ 820A107 - setvar VAR_TEMP_1, 2 - return - -SlateportCity_PokemonFanClub_EventScript_20A10D:: @ 820A10D - specialvar VAR_RESULT, CheckLeadMonCute - compare VAR_RESULT, 1 - call_if 1, SlateportCity_PokemonFanClub_EventScript_20A11E - return - -SlateportCity_PokemonFanClub_EventScript_20A11E:: @ 820A11E - setvar VAR_TEMP_1, 3 - return - -SlateportCity_PokemonFanClub_EventScript_20A124:: @ 820A124 - specialvar VAR_RESULT, CheckLeadMonSmart - compare VAR_RESULT, 1 - call_if 1, SlateportCity_PokemonFanClub_EventScript_20A135 - return - -SlateportCity_PokemonFanClub_EventScript_20A135:: @ 820A135 - setvar VAR_TEMP_1, 4 - return - -SlateportCity_PokemonFanClub_EventScript_20A13B:: @ 820A13B - specialvar VAR_RESULT, CheckLeadMonTough - compare VAR_RESULT, 1 - call_if 1, SlateportCity_PokemonFanClub_EventScript_20A14C - return - -SlateportCity_PokemonFanClub_EventScript_20A14C:: @ 820A14C - setvar VAR_TEMP_1, 5 - return - -SlateportCity_PokemonFanClub_EventScript_20A152:: @ 820A152 - checkflag FLAG_0x156 - goto_eq SlateportCity_PokemonFanClub_EventScript_20A168 - msgbox SlateportCity_PokemonFanClub_Text_20A233, 4 - setflag FLAG_0x156 - release - end - -SlateportCity_PokemonFanClub_EventScript_20A168:: @ 820A168 - msgbox SlateportCity_PokemonFanClub_Text_20A3EE, 4 - release - end - -SlateportCity_PokemonFanClub_EventScript_20A172:: @ 820A172 - msgbox SlateportCity_PokemonFanClub_Text_20A233, 4 - setflag FLAG_0x156 - return - -SlateportCity_PokemonFanClub_EventScript_20A17E:: @ 820A17E - lock - faceplayer - checkflag FLAG_0x116 - goto_eq SlateportCity_PokemonFanClub_EventScript_20A1DE - msgbox SlateportCity_PokemonFanClub_Text_20AA77, 4 - specialvar VAR_RESULT, GetLeadMonFriendshipScore - compare VAR_RESULT, 4 - goto_if 4, SlateportCity_PokemonFanClub_EventScript_20A1A3 - release - end - -SlateportCity_PokemonFanClub_EventScript_20A1A3:: @ 820A1A3 - playse SE_PIN - applymovement VAR_LAST_TALKED, SlateportCity_PokemonFanClub_Movement_272598 - waitmovement 0 - applymovement VAR_LAST_TALKED, SlateportCity_PokemonFanClub_Movement_27259A - waitmovement 0 - msgbox SlateportCity_PokemonFanClub_Text_20AB63, 4 - giveitem_std ITEM_SOOTHE_BELL - compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_272054 - setflag FLAG_0x116 - release - end - -SlateportCity_PokemonFanClub_EventScript_20A1DE:: @ 820A1DE - msgbox SlateportCity_PokemonFanClub_Text_20ABC4, 4 - release - end - -SlateportCity_PokemonFanClub_EventScript_20A1E8:: @ 820A1E8 - msgbox SlateportCity_PokemonFanClub_Text_20AC47, 2 - end - -SlateportCity_PokemonFanClub_EventScript_20A1F1:: @ 820A1F1 - msgbox SlateportCity_PokemonFanClub_Text_20ACF9, 2 - end - -SlateportCity_PokemonFanClub_EventScript_20A1FA:: @ 820A1FA - lock - faceplayer - waitse - playmoncry SPECIES_SKITTY, 0 - msgbox SlateportCity_PokemonFanClub_Text_20AD5A, 4 - waitmoncry - release - end - -SlateportCity_PokemonFanClub_EventScript_20A20D:: @ 820A20D - lock - faceplayer - waitse - playmoncry SPECIES_ZIGZAGOON, 0 - msgbox SlateportCity_PokemonFanClub_Text_20AD6E, 4 - waitmoncry - release - end - -SlateportCity_PokemonFanClub_EventScript_20A220:: @ 820A220 - lock - faceplayer - waitse - playmoncry SPECIES_AZUMARILL, 0 - msgbox SlateportCity_PokemonFanClub_Text_20AD80, 4 - waitmoncry - release - end - -SlateportCity_PokemonFanClub_Text_20A233: @ 820A233 - .string "Er-hem! I am the CHAIRMAN of the\n" - .string "POKéMON FAN CLUB!\p" - .string "Being the CHAIRMAN, I am naturally\n" - .string "the most important!\p" - .string "No one can best me when it comes\n" - .string "to raising POKéMON. No one!\p" - .string "Well, let me tell you about\n" - .string "POKéMON CONTESTS.\p" - .string "They’re events where one can show off\n" - .string "POKéMON for the world to see!\p" - .string "However, they’re held in far-off towns,\n" - .string "so I cannot participate often enough.\p" - .string "That is why we gather here to show\n" - .string "off our POKéMON, and have others\l" - .string "show us theirs.$" - -SlateportCity_PokemonFanClub_Text_20A3EE: @ 820A3EE - .string "The POKéMON of a TRAINER who has\n" - .string "entered a POKéMON CONTEST…\l" - .string "That, I would like to see.$" - -SlateportCity_PokemonFanClub_Text_20A445: @ 820A445 - .string "Er-hem! I see you’ve participated in\n" - .string "a POKéMON CONTEST!\p" - .string "Please! Allow me to examine how you\n" - .string "have raised your POKéMON.\p" - .string "It delights me no end to see POKéMON\n" - .string "raised by other TRAINERS.\p" - .string "The happy expressions of POKéMON\n" - .string "raised with proper care…\p" - .string "The kindly eyes of the TRAINER that\n" - .string "nurtured and raised the POKéMON…\p" - .string "The very thought fills my heart to\n" - .string "overwhelming with joy.\p" - .string "Oh! I do beg your pardon!\n" - .string "Forgive me for prattling on so!\p" - .string "Please! Allow me to examine how much\n" - .string "your POKéMON has grown!$" - -SlateportCity_PokemonFanClub_Text_20A62A: @ 820A62A - .string "How is your POKéMON growing?\n" - .string "Allow me to examine it.$" - -SlateportCity_PokemonFanClub_Text_20A65F: @ 820A65F - .string "Hm, hm…\n" - .string "I see…$" - -SlateportCity_PokemonFanClub_Text_20A66E: @ 820A66E - .string "Hmmm… It’s not bad, but it’s not\n" - .string "good, either…\p" - .string "You, the TRAINER, must put more\n" - .string "effort into raising this POKéMON!\p" - .string "For instance, may I suggest that\n" - .string "you give it more {POKEBLOCK}S?$" - -SlateportCity_PokemonFanClub_Text_20A719: @ 820A719 - .string "Oh, my…\p" - .string "Your POKéMON is growing quite well,\n" - .string "so you deserve a reward.\p" - .string "Unfortunately, you have no space for\n" - .string "this in your BAG.$" - -SlateportCity_PokemonFanClub_Text_20A795: @ 820A795 - .string "Your {STR_VAR_1}, it is growing in\n" - .string "a most impressive manner!\l" - .string "It is one fine specimen!\p" - .string "But! If you were to give it this,\n" - .string "it would grow even better! Indeed!$" - -SlateportCity_PokemonFanClub_Text_20A827: @ 820A827 - .string "Let a POKéMON hold that RED SCARF.\p" - .string "Everyone will recognize the coolness\n" - .string "of that POKéMON!$" - -SlateportCity_PokemonFanClub_Text_20A880: @ 820A880 - .string "Let a POKéMON hold that BLUE SCARF.\p" - .string "Its beauty will be accentuated much\n" - .string "more than now!$" - -SlateportCity_PokemonFanClub_Text_20A8D7: @ 820A8D7 - .string "Let a POKéMON hold that PINK SCARF.\p" - .string "It will draw out the cuteness of\n" - .string "the POKéMON some more!$" - -SlateportCity_PokemonFanClub_Text_20A933: @ 820A933 - .string "Let a POKéMON hold that GREEN SCARF.\p" - .string "That will enhance the\n" - .string "smartness of POKéMON!$" - -SlateportCity_PokemonFanClub_Text_20A984: @ 820A984 - .string "Let a POKéMON hold that YELLOW SCARF.\p" - .string "It will bolster your POKéMON’s\n" - .string "toughness so much more!$" - -SlateportCity_PokemonFanClub_Text_20A9E1: @ 820A9E1 - .string "I’m sorry, but I’ve nothing else to\n" - .string "give you! None at all!\p" - .string "After all, you’re blessed with the gift\n" - .string "of raising POKéMON without resorting\l" - .string "to any items!$" - -SlateportCity_PokemonFanClub_Text_20AA77: @ 820AA77 - .string "I love seeing POKéMON that love\n" - .string "their TRAINERS.\p" - .string "POKéMON are very sensitive to\n" - .string "the feelings of their TRAINERS.\p" - .string "If you treat your POKéMON with love\n" - .string "and care, they’ll love you back.\p" - .string "When your POKéMON grow to love you,\n" - .string "please come show me.$" - -SlateportCity_PokemonFanClub_Text_20AB63: @ 820AB63 - .string "Your POKéMON really adores you.\p" - .string "For you, a most compassionate\n" - .string "TRAINER, a gift from the FAN CLUB!$" - -SlateportCity_PokemonFanClub_Text_20ABC4: @ 820ABC4 - .string "POKéMON are very sensitive to\n" - .string "the feelings of their TRAINERS.\p" - .string "If you treat your POKéMON with love\n" - .string "and care, they’ll love you back.$" - -SlateportCity_PokemonFanClub_Text_20AC47: @ 820AC47 - .string "If you keep letting a POKéMON faint\n" - .string "in battle, it’ll come to resent it.\p" - .string "Soon, it will become less trusting\n" - .string "of the TRAINER.\p" - .string "In other words, it certainly won’t\n" - .string "like you very much.$" - -SlateportCity_PokemonFanClub_Text_20ACF9: @ 820ACF9 - .string "Do POKéMON enjoy having items used\n" - .string "on them?\p" - .string "Mine acted really happy when I gave\n" - .string "it some PROTEIN.$" - -SlateportCity_PokemonFanClub_Text_20AD5A: @ 820AD5A - .string "SKITTY: Fffnyaaaah…$" - -SlateportCity_PokemonFanClub_Text_20AD6E: @ 820AD6E - .string "ZIGZAGOON: Kyuuu…$" - -SlateportCity_PokemonFanClub_Text_20AD80: @ 820AD80 - .string "AZUMARILL: Marimari?$" - diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc deleted file mode 100644 index 8197eb873..000000000 --- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc +++ /dev/null @@ -1,145 +0,0 @@ -SlateportCity_SternsShipyard_1F_MapScripts:: @ 8207F3F - .byte 0 - -SlateportCity_SternsShipyard_1F_EventScript_207F40:: @ 8207F40 - lockall - checkflag FLAG_SYS_GAME_CLEAR - goto_eq SlateportCity_SternsShipyard_1F_EventScript_207F92 - checkflag FLAG_BADGE07_GET - goto_eq SlateportCity_SternsShipyard_1F_EventScript_207FA6 - checkflag FLAG_0x095 - goto_eq SlateportCity_SternsShipyard_1F_EventScript_207FD9 - checkflag FLAG_0x094 - goto_eq SlateportCity_SternsShipyard_1F_EventScript_207FBA - msgbox SlateportCity_SternsShipyard_1F_Text_208008, 4 - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E - waitmovement 0 - msgbox SlateportCity_SternsShipyard_1F_Text_2080A5, 4 - closemessage - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_2725A2 - waitmovement 0 - setflag FLAG_0x094 - setflag FLAG_0x372 - releaseall - end - -SlateportCity_SternsShipyard_1F_EventScript_207F92:: @ 8207F92 - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E - waitmovement 0 - msgbox SlateportCity_SternsShipyard_1F_Text_208323, 4 - releaseall - end - -SlateportCity_SternsShipyard_1F_EventScript_207FA6:: @ 8207FA6 - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E - waitmovement 0 - msgbox SlateportCity_SternsShipyard_1F_Text_2082A8, 4 - releaseall - end - -SlateportCity_SternsShipyard_1F_EventScript_207FBA:: @ 8207FBA - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E - waitmovement 0 - msgbox SlateportCity_SternsShipyard_1F_Text_2081A5, 4 - closemessage - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_2725A2 - waitmovement 0 - releaseall - end - -SlateportCity_SternsShipyard_1F_EventScript_207FD9:: @ 8207FD9 - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E - waitmovement 0 - msgbox SlateportCity_SternsShipyard_1F_Text_208213, 4 - releaseall - end - -SlateportCity_SternsShipyard_1F_EventScript_207FED:: @ 8207FED - msgbox SlateportCity_SternsShipyard_1F_Text_208558, 2 - end - -SlateportCity_SternsShipyard_1F_EventScript_207FF6:: @ 8207FF6 - msgbox SlateportCity_SternsShipyard_1F_Text_2085FF, 2 - end - -SlateportCity_SternsShipyard_1F_EventScript_207FFF:: @ 8207FFF - msgbox SlateportCity_SternsShipyard_1F_Text_2083EE, 2 - end - -SlateportCity_SternsShipyard_1F_Text_208008: @ 8208008 - .string "Umm… If this goes here, and that\n" - .string "goes over there…\p" - .string "Then where does this thing go?\n" - .string "And what about that doohickey?\p" - .string "Aaargh! I can’t make heads or tails\n" - .string "of this!$" - -SlateportCity_SternsShipyard_1F_Text_2080A5: @ 82080A5 - .string "Hm?\n" - .string "Hi, I’m DOCK.\p" - .string "CAPT. STERN commissioned me to\n" - .string "design a ferry.\p" - .string "Oh! That there…\n" - .string "Are they DEVON GOODS?\p" - .string "But, hmm…\n" - .string "This won’t do…\p" - .string "CAPT. STERN went off somewhere.\n" - .string "He said he had some work to do.\p" - .string "Could I get you to go find CAPT.\n" - .string "STERN and deliver that to him?$" - -SlateportCity_SternsShipyard_1F_Text_2081A5: @ 82081A5 - .string "DOCK: Where could CAPT. STERN have\n" - .string "gone off to?\p" - .string "Could you go find CAPT. STERN and\n" - .string "deliver that parcel to him?$" - -SlateportCity_SternsShipyard_1F_Text_208213: @ 8208213 - .string "DOCK: Shipbuilding is an art.\p" - .string "A lot of things can’t be figured out\n" - .string "just by calculating.\p" - .string "I really could use advice from a veteran\n" - .string "who knows the seas…$" - -SlateportCity_SternsShipyard_1F_Text_2082A8: @ 82082A8 - .string "DOCK: Hi! MR. BRINEY’s joined us to\n" - .string "lend us his help.\p" - .string "Thanks to the veteran sailor, the\n" - .string "ferry is steadily coming together.$" - -SlateportCity_SternsShipyard_1F_Text_208323: @ 8208323 - .string "DOCK: The ferry is finally ready!\p" - .string "The new S.S. TIDAL is truly a marvel\n" - .string "of technology!\p" - .string "But, I get the feeling that we can\n" - .string "make something even better.\p" - .string "You know, there’s never an end to\n" - .string "technology’s march.$" - -SlateportCity_SternsShipyard_1F_Text_2083EE: @ 82083EE - .string "MR. BRINEY: Ah, {PLAYER}{KUN}!\n" - .string "It’s been too long!\p" - .string "Aye, since I met you, this old sea dog’s\n" - .string "been feeling frisky!\p" - .string "So I’ve decided to help DOCK make\n" - .string "a ferry.\p" - .string "Aye, after all, a ferry would be able\n" - .string "to carry a lot of people.\p" - .string "But, you know, that DOCK is really\n" - .string "something special.\p" - .string "With his knack for technology and\n" - .string "my experience, I’m sure that we can\l" - .string "build one great ship, aye!$" - -SlateportCity_SternsShipyard_1F_Text_208558: @ 8208558 - .string "The seasons, the weather, where\n" - .string "the moon sits in the sky…\p" - .string "These and other conditions make\n" - .string "the sea change its expression.\p" - .string "That’s right!\n" - .string "The sea is like a living thing!$" - -SlateportCity_SternsShipyard_1F_Text_2085FF: @ 82085FF - .string "I get seasick real easily.\n" - .string "So I get to help out here instead.$" - diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_2F.inc b/data/scripts/maps/SlateportCity_SternsShipyard_2F.inc deleted file mode 100644 index a599ac9b8..000000000 --- a/data/scripts/maps/SlateportCity_SternsShipyard_2F.inc +++ /dev/null @@ -1,22 +0,0 @@ -SlateportCity_SternsShipyard_2F_MapScripts:: @ 820863D - .byte 0 - -SlateportCity_SternsShipyard_2F_EventScript_20863E:: @ 820863E - msgbox SlateportCity_SternsShipyard_2F_Text_208650, 2 - end - -SlateportCity_SternsShipyard_2F_EventScript_208647:: @ 8208647 - msgbox SlateportCity_SternsShipyard_2F_Text_2086BA, 2 - end - -SlateportCity_SternsShipyard_2F_Text_208650: @ 8208650 - .string "Designing a large ship is more like\n" - .string "making a big building than putting\l" - .string "together a transportation vehicle.$" - -SlateportCity_SternsShipyard_2F_Text_2086BA: @ 82086BA - .string "Don’t you think it’s strange that\n" - .string "a ship made of heavy iron floats?\p" - .string "It floats because of a principle\n" - .string "called buoyancy.$" - diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc deleted file mode 100644 index 5de8c7d12..000000000 --- a/data/scripts/maps/SootopolisCity.inc +++ /dev/null @@ -1,1784 +0,0 @@ -SootopolisCity_MapScripts:: @ 81E565C - map_script 1, SootopolisCity_MapScript1_1E5676 - map_script 3, SootopolisCity_MapScript1_1E56EF - map_script 5, SootopolisCity_MapScript1_1E590B - map_script 2, SootopolisCity_MapScript2_1E5914 - map_script 4, SootopolisCity_MapScript2_1E58DB - .byte 0 - -SootopolisCity_MapScript1_1E5676: @ 81E5676 - checkflag FLAG_0x09E - call_if 0, SootopolisCity_EventScript_1E56E5 - checkflag FLAG_0x081 - goto_if 0, SootopolisCity_EventScript_1E5692 - checkflag FLAG_0x09E - call_if 0, SootopolisCity_EventScript_1E5693 - end - -SootopolisCity_EventScript_1E5692:: @ 81E5692 - end - -SootopolisCity_EventScript_1E5693:: @ 81E5693 - setmetatile 9, 6, 584, 1 - setmetatile 9, 17, 584, 1 - setmetatile 9, 26, 584, 1 - setmetatile 44, 17, 584, 1 - setmetatile 8, 35, 584, 1 - setmetatile 53, 28, 584, 1 - setmetatile 45, 6, 584, 1 - setmetatile 48, 25, 584, 1 - setmetatile 51, 36, 584, 1 - return - -SootopolisCity_EventScript_1E56E5:: @ 81E56E5 - setmetatile 31, 32, 592, 1 - return - -SootopolisCity_MapScript1_1E56EF: @ 81E56EF - setflag FLAG_VISITED_SOOTOPOLIS_CITY - compare VAR_0x405E, 1 - call_if 1, SootopolisCity_EventScript_1E5781 - compare VAR_0x40CA, 1 - call_if 1, SootopolisCity_EventScript_1E5781 - call SootopolisCity_EventScript_1E5805 - call SootopolisCity_EventScript_1E57B2 - compare VAR_0x405E, 1 - call_if 1, SootopolisCity_EventScript_1E5785 - compare VAR_0x405E, 2 - call_if 1, SootopolisCity_EventScript_1E5785 - compare VAR_0x405E, 3 - call_if 1, SootopolisCity_EventScript_1E5785 - compare VAR_0x405E, 4 - call_if 1, SootopolisCity_EventScript_1E5785 - compare VAR_0x405E, 5 - call_if 1, SootopolisCity_EventScript_1E5785 - compare VAR_0x405E, 2 - call_if 1, SootopolisCity_EventScript_1E5842 - compare VAR_0x405E, 3 - call_if 1, SootopolisCity_EventScript_1E5842 - compare VAR_0x405E, 4 - call_if 1, SootopolisCity_EventScript_1E585B - compare VAR_0x405E, 5 - call_if 1, SootopolisCity_EventScript_1E5871 - compare VAR_0x405E, 6 - call_if 1, SootopolisCity_EventScript_1E58D3 - end - -SootopolisCity_EventScript_1E5781:: @ 81E5781 - setflag FLAG_SPECIAL_FLAG_0x4000 - return - -SootopolisCity_EventScript_1E5785:: @ 81E5785 - setobjectxyperm 3, 13, 48 - setobjectxyperm 5, 46, 32 - setobjectxyperm 4, 48, 41 - setobjectxyperm 8, 45, 43 - setobjectmovementtype 3, 7 - setobjectmovementtype 5, 9 - setobjectmovementtype 4, 9 - setobjectmovementtype 8, 9 - return - -SootopolisCity_EventScript_1E57B2:: @ 81E57B2 - compare VAR_0x405E, 0 - goto_eq SootopolisCity_EventScript_1E5800 - compare VAR_0x405E, 6 - goto_if 4, SootopolisCity_EventScript_1E5800 - compare VAR_0x405E, 1 - goto_eq SootopolisCity_EventScript_1E5801 - compare VAR_0x405E, 2 - goto_eq SootopolisCity_EventScript_1E5801 - compare VAR_0x405E, 3 - goto_eq SootopolisCity_EventScript_1E5801 - compare VAR_0x405E, 4 - goto_eq SootopolisCity_EventScript_1E5801 - compare VAR_0x40CA, 1 - goto_if 3, SootopolisCity_EventScript_1E5801 - return - -SootopolisCity_EventScript_1E5800:: @ 81E5800 - return - -SootopolisCity_EventScript_1E5801:: @ 81E5801 - setmaplayoutindex 357 - return - -SootopolisCity_EventScript_1E5805:: @ 81E5805 - compare VAR_0x405E, 0 - goto_eq SootopolisCity_EventScript_1E583D - compare VAR_0x405E, 6 - goto_if 4, SootopolisCity_EventScript_1E583D - compare VAR_0x405E, 1 - goto_eq SootopolisCity_EventScript_1E583E - compare VAR_0x40CA, 1 - goto_eq SootopolisCity_EventScript_1E583E - compare VAR_0x40CA, 1 - goto_if 3, SootopolisCity_EventScript_27207A - return - -SootopolisCity_EventScript_1E583D:: @ 81E583D - return - -SootopolisCity_EventScript_1E583E:: @ 81E583E - setweather 13 - return - -SootopolisCity_EventScript_1E5842:: @ 81E5842 - checkflag FLAG_0x133 - goto_eq SootopolisCity_EventScript_1E584C - return - -SootopolisCity_EventScript_1E584C:: @ 81E584C - setobjectxyperm 1, 30, 18 - setobjectxyperm 7, 32, 18 - return - -SootopolisCity_EventScript_1E585B:: @ 81E585B - setobjectxyperm 1, 30, 18 - setobjectxyperm 18, 31, 18 - setobjectxyperm 7, 32, 18 - end - -SootopolisCity_EventScript_1E5871:: @ 81E5871 - setobjectxyperm 1, 31, 18 - setobjectxyperm 7, 29, 33 - setobjectxyperm 16, 33, 35 - setobjectxyperm 17, 34, 35 - compare VAR_0x40D8, 0 - call_if 1, SootopolisCity_EventScript_1E58AF - compare VAR_0x40D8, 1 - call_if 1, SootopolisCity_EventScript_1E58BB - compare VAR_0x40D8, 2 - call_if 1, SootopolisCity_EventScript_1E58C7 - return - -SootopolisCity_EventScript_1E58AF:: @ 81E58AF - setobjectxyperm 18, 31, 33 - setobjectmovementtype 18, 8 - return - -SootopolisCity_EventScript_1E58BB:: @ 81E58BB - setobjectxyperm 18, 32, 33 - setobjectmovementtype 18, 8 - return - -SootopolisCity_EventScript_1E58C7:: @ 81E58C7 - setobjectxyperm 18, 30, 33 - setobjectmovementtype 18, 8 - return - -SootopolisCity_EventScript_1E58D3:: @ 81E58D3 - setobjectxyperm 1, 31, 18 - return - -SootopolisCity_MapScript2_1E58DB: @ 81E58DB - map_script_2 VAR_0x405E, 5, SootopolisCity_EventScript_1E58E5 - .2byte 0 - -SootopolisCity_EventScript_1E58E5:: @ 81E58E5 - compare VAR_0x40CA, 1 - call_if 1, SootopolisCity_EventScript_1E58FC - compare VAR_0x40CA, 2 - call_if 1, SootopolisCity_EventScript_1E5901 - end - -SootopolisCity_EventScript_1E58FC:: @ 81E58FC - turnobject 255, 2 - return - -SootopolisCity_EventScript_1E5901:: @ 81E5901 - turnobject 255, 2 - setvar VAR_0x40CA, 3 - return - -SootopolisCity_MapScript1_1E590B: @ 81E590B - setdivewarp MAP_UNDERWATER_SOOTOPOLIS_CITY, 255, 9, 6 - end - -SootopolisCity_MapScript2_1E5914: @ 81E5914 - map_script_2 VAR_0x405E, 1, SootopolisCity_EventScript_1E5926 - map_script_2 VAR_0x40CA, 1, SootopolisCity_EventScript_1E5BFE - .2byte 0 - -SootopolisCity_EventScript_1E5926:: @ 81E5926 - lockall - special StorePlayerCoordsInVars - compare VAR_0x8004, 43 - goto_if 5, SootopolisCity_EventScript_1E5A82 - compare VAR_0x8005, 32 - goto_if 5, SootopolisCity_EventScript_1E5A82 - goto SootopolisCity_EventScript_1E5946 - end - -SootopolisCity_EventScript_1E5946:: @ 81E5946 - delay 60 - special SpawnScriptEventObject - applymovement 127, SootopolisCity_Movement_1E5A68 - waitmovement 0 - special RemoveScriptEventObject - delay 60 - fadescreenspeed 1, 8 - setweather 15 - doweather - setvar VAR_0x8004, 0 - special sub_813B7D8 - waitstate - applymovement 10, SootopolisCity_Movement_2725A4 - applymovement 9, SootopolisCity_Movement_2725A8 - waitmovement 0 - delay 60 - waitse - playmoncry SPECIES_KYOGRE, 2 - applymovement 10, SootopolisCity_Movement_1E5BB8 - applymovement 9, SootopolisCity_Movement_1E5BE5 - waitmovement 0 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 5 - special sub_8139560 - waitstate - applymovement 10, SootopolisCity_Movement_1E5BCF - applymovement 9, SootopolisCity_Movement_1E5BF0 - waitmovement 0 - waitse - playmoncry SPECIES_GROUDON, 2 - applymovement 10, SootopolisCity_Movement_1E5BC2 - applymovement 9, SootopolisCity_Movement_1E5BDD - waitmovement 0 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 5 - special sub_8139560 - waitstate - applymovement 10, SootopolisCity_Movement_1E5BCF - applymovement 9, SootopolisCity_Movement_1E5BF0 - waitmovement 0 - waitse - playmoncry SPECIES_KYOGRE, 2 - applymovement 10, SootopolisCity_Movement_1E5BB8 - applymovement 9, SootopolisCity_Movement_1E5BE5 - waitmovement 0 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 5 - special sub_8139560 - waitstate - applymovement 10, SootopolisCity_Movement_1E5BCF - applymovement 9, SootopolisCity_Movement_1E5BF0 - waitmovement 0 - special SpawnScriptEventObject - applymovement 10, SootopolisCity_Movement_1E5BD6 - applymovement 9, SootopolisCity_Movement_1E5BF7 - applymovement 127, SootopolisCity_Movement_1E5A75 - waitmovement 0 - special RemoveScriptEventObject - setvar VAR_0x405E, 2 - clearflag FLAG_SPECIAL_FLAG_0x4000 - releaseall - end - -SootopolisCity_Movement_1E5A68: @ 81E5A68 - 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 - 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 - delay 60 - special SpawnScriptEventObject - applymovement 127, SootopolisCity_Movement_1E5BA4 - waitmovement 0 - special RemoveScriptEventObject - delay 60 - fadescreenspeed 1, 8 - setweather 15 - doweather - setvar VAR_0x8004, 0 - special sub_813B7D8 - waitstate - applymovement 10, SootopolisCity_Movement_2725A4 - applymovement 9, SootopolisCity_Movement_2725A8 - waitmovement 0 - delay 60 - waitse - playmoncry SPECIES_KYOGRE, 2 - applymovement 10, SootopolisCity_Movement_1E5BB8 - applymovement 9, SootopolisCity_Movement_1E5BE5 - waitmovement 0 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 5 - special sub_8139560 - waitstate - applymovement 10, SootopolisCity_Movement_1E5BCF - applymovement 9, SootopolisCity_Movement_1E5BF0 - waitmovement 0 - waitse - playmoncry SPECIES_GROUDON, 2 - applymovement 10, SootopolisCity_Movement_1E5BC2 - applymovement 9, SootopolisCity_Movement_1E5BDD - waitmovement 0 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 5 - special sub_8139560 - waitstate - applymovement 10, SootopolisCity_Movement_1E5BCF - applymovement 9, SootopolisCity_Movement_1E5BF0 - waitmovement 0 - waitse - playmoncry SPECIES_KYOGRE, 2 - applymovement 10, SootopolisCity_Movement_1E5BB8 - applymovement 9, SootopolisCity_Movement_1E5BE5 - waitmovement 0 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 5 - special sub_8139560 - waitstate - applymovement 10, SootopolisCity_Movement_1E5BCF - applymovement 9, SootopolisCity_Movement_1E5BF0 - waitmovement 0 - special SpawnScriptEventObject - applymovement 10, SootopolisCity_Movement_1E5BD6 - applymovement 9, SootopolisCity_Movement_1E5BF7 - applymovement 127, SootopolisCity_Movement_1E5BAE - waitmovement 0 - special RemoveScriptEventObject - setvar VAR_0x405E, 2 - clearflag FLAG_SPECIAL_FLAG_0x4000 - releaseall - end - -SootopolisCity_Movement_1E5BA4: @ 81E5BA4 - 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 - 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 - 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 - 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 - lock_facing_direction - walk_right - delay_16 - delay_16 - delay_16 - unlock_facing_direction - step_end - -SootopolisCity_Movement_1E5BD6: @ 81E5BD6 - 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 - 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 - 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 - lock_facing_direction - walk_left - delay_16 - delay_16 - delay_16 - unlock_facing_direction - step_end - -SootopolisCity_Movement_1E5BF7: @ 81E5BF7 - 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 - lockall - special StorePlayerCoordsInVars - compare VAR_0x8004, 43 - goto_if 5, SootopolisCity_EventScript_1E5CCE - compare VAR_0x8005, 32 - goto_if 5, SootopolisCity_EventScript_1E5CCE - goto SootopolisCity_EventScript_1E5C1E - end - -SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E - delay 60 - special SpawnScriptEventObject - applymovement 127, SootopolisCity_Movement_1E5A68 - waitmovement 0 - special RemoveScriptEventObject - delay 60 - fadescreenspeed 1, 8 - call SootopolisCity_EventScript_1E5D82 - removeobject 9 - removeobject 10 - addobject 11 - setvar VAR_0x8004, 1 - special sub_813B7D8 - waitstate - playse SE_T_KAMI - special SpawnScriptEventObject - applymovement 127, SootopolisCity_Movement_1E5E63 - waitmovement 0 - waitse - playmoncry SPECIES_RAYQUAZA, 2 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 3 - special sub_8139560 - waitstate - waitse - playmoncry SPECIES_RAYQUAZA, 2 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 5 - special sub_8139560 - waitstate - waitmoncry - setweather 0 - doweather - applymovement 11, SootopolisCity_Movement_1E5E5B - waitmovement 0 - removeobject 11 - special WaitWeather - waitstate - clearflag FLAG_SYS_WEATHER_CTRL - setvar VAR_0x40CA, 3 - clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS - fadenewbgm MUS_RUNECITY - delay 120 - clearflag FLAG_SPECIAL_FLAG_0x4000 - warp8 MAP_SOOTOPOLIS_CITY, 255, 43, 32 - waitstate - end - -SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE - delay 60 - special SpawnScriptEventObject - applymovement 127, SootopolisCity_Movement_1E5BA4 - waitmovement 0 - special RemoveScriptEventObject - delay 60 - fadescreenspeed 1, 8 - call SootopolisCity_EventScript_1E5D82 - removeobject 9 - removeobject 10 - addobject 11 - setvar VAR_0x8004, 1 - special sub_813B7D8 - waitstate - special SpawnScriptEventObject - applymovement 127, SootopolisCity_Movement_1E5E63 - applymovement 255, SootopolisCity_Movement_1E5E68 - waitmovement 0 - waitse - playmoncry SPECIES_RAYQUAZA, 2 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 3 - special sub_8139560 - waitstate - waitse - playmoncry SPECIES_RAYQUAZA, 2 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 5 - special sub_8139560 - waitstate - waitmoncry - setweather 0 - doweather - applymovement 11, SootopolisCity_Movement_1E5E5B - waitmovement 0 - removeobject 11 - special WaitWeather - waitstate - clearflag FLAG_SYS_WEATHER_CTRL - setvar VAR_0x40CA, 2 - clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS - fadenewbgm MUS_NAMINORI - delay 120 - clearflag FLAG_SPECIAL_FLAG_0x4000 - warp8 MAP_SOOTOPOLIS_CITY, 255, 29, 53 - waitstate - end - -SootopolisCity_EventScript_1E5D82:: @ 81E5D82 - setmetatile 27, 43, 656, 0 - setmetatile 28, 43, 656, 0 - setmetatile 29, 43, 656, 0 - setmetatile 30, 43, 656, 0 - setmetatile 27, 44, 656, 0 - setmetatile 28, 44, 656, 0 - setmetatile 29, 44, 656, 0 - setmetatile 30, 44, 656, 0 - setmetatile 27, 45, 656, 0 - setmetatile 28, 45, 656, 0 - setmetatile 29, 45, 656, 0 - setmetatile 30, 45, 656, 0 - setmetatile 32, 43, 656, 0 - setmetatile 33, 43, 656, 0 - setmetatile 34, 43, 656, 0 - setmetatile 35, 43, 656, 0 - setmetatile 32, 44, 656, 0 - setmetatile 33, 44, 656, 0 - setmetatile 34, 44, 656, 0 - setmetatile 35, 44, 656, 0 - setmetatile 32, 45, 656, 0 - setmetatile 33, 45, 656, 0 - setmetatile 34, 45, 656, 0 - setmetatile 35, 45, 656, 0 - return - -SootopolisCity_Movement_1E5E5B: @ 81E5E5B - 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 - walk_up - walk_up - walk_up - walk_up - step_end - -SootopolisCity_Movement_1E5E68: @ 81E5E68 - walk_up - walk_up - walk_up - walk_up - step_end - -SootopolisCity_Movement_1E5E6D: @ 81E5E6D - walk_down - walk_down - walk_down - walk_down - step_end - -SootopolisCity_Movement_1E5E72: @ 81E5E72 - 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 - 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 - lock - faceplayer - compare VAR_0x405E, 6 - goto_if 4, SootopolisCity_EventScript_1E5EC4 - compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E5ECE - compare VAR_0x405E, 2 - goto_if 4, SootopolisCity_EventScript_1E5EBA - msgbox SootopolisCity_Text_1E6D77, 4 - release - end - -SootopolisCity_EventScript_1E5EBA:: @ 81E5EBA - msgbox SootopolisCity_Text_1E6DFE, 4 - release - end - -SootopolisCity_EventScript_1E5EC4:: @ 81E5EC4 - msgbox SootopolisCity_Text_1E6F38, 4 - release - end - -SootopolisCity_EventScript_1E5ECE:: @ 81E5ECE - msgbox SootopolisCity_Text_1E6ED4, 4 - release - end - -SootopolisCity_EventScript_1E5ED8:: @ 81E5ED8 - lock - faceplayer - compare VAR_0x405E, 1 - goto_if 3, SootopolisCity_EventScript_1E5F1B - compare VAR_0x405E, 6 - goto_if 4, SootopolisCity_EventScript_1E5F1B - compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E5F10 - msgbox SootopolisCity_Text_1E6BFF, 4 - closemessage - applymovement 3, SootopolisCity_Movement_2725A2 - waitmovement 0 - release - end - -SootopolisCity_EventScript_1E5F10:: @ 81E5F10 - msgbox SootopolisCity_Text_1E6C53, 4 - closemessage - release - end - -SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B - dodailyevents - special GetPlayerBigGuyGirlString - checkflag FLAG_0x932 - goto_eq SootopolisCity_EventScript_1E5FBB - msgbox SootopolisCity_Text_2A7BB0, 4 - random 10 - addvar VAR_RESULT, 20 - addvar VAR_RESULT, 133 - giveitem_std VAR_RESULT - compare VAR_RESULT, 0 - goto_eq SootopolisCity_EventScript_272054 - setflag FLAG_0x932 - msgbox SootopolisCity_Text_2A7C7C, 4 - random 2 - compare VAR_RESULT, 0 - goto_eq SootopolisCity_EventScript_1E5F79 - compare VAR_RESULT, 1 - goto_eq SootopolisCity_EventScript_1E5F9A - end - -SootopolisCity_EventScript_1E5F79:: @ 81E5F79 - giveitem_std ITEM_FIGY_BERRY - compare VAR_RESULT, 0 - goto_eq SootopolisCity_EventScript_272054 - msgbox SootopolisCity_Text_2A7CB7, 4 - release - end - -SootopolisCity_EventScript_1E5F9A:: @ 81E5F9A - giveitem_std ITEM_IAPAPA_BERRY - compare VAR_RESULT, 0 - goto_eq SootopolisCity_EventScript_272054 - msgbox SootopolisCity_Text_2A7CB7, 4 - release - end - -SootopolisCity_EventScript_1E5FBB:: @ 81E5FBB - msgbox SootopolisCity_Text_2A7CEC, 5 - compare VAR_RESULT, 1 - goto_eq SootopolisCity_EventScript_1E5FD8 - msgbox SootopolisCity_Text_2A7DD2, 4 - release - end - -SootopolisCity_EventScript_1E5FD8:: @ 81E5FD8 - msgbox SootopolisCity_Text_2A7D80, 4 - release - end - -SootopolisCity_EventScript_1E5FE2:: @ 81E5FE2 - lockall - applymovement 2, SootopolisCity_Movement_27259E - waitmovement 0 - compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E600D - msgbox SootopolisCity_Text_1E71A1, 4 - closemessage - applymovement 2, SootopolisCity_Movement_2725A2 - waitmovement 0 - releaseall - end - -SootopolisCity_EventScript_1E600D:: @ 81E600D - msgbox SootopolisCity_Text_1E728C, 4 - releaseall - end - -SootopolisCity_EventScript_1E6017:: @ 81E6017 - lock - faceplayer - compare VAR_0x405E, 6 - goto_if 4, SootopolisCity_EventScript_1E602E - msgbox SootopolisCity_Text_1E6CCA, 4 - release - end - -SootopolisCity_EventScript_1E602E:: @ 81E602E - msgbox SootopolisCity_Text_1E6D57, 4 - release - end - -SootopolisCity_EventScript_1E6038:: @ 81E6038 - lock - faceplayer - compare VAR_0x405E, 6 - goto_if 4, SootopolisCity_EventScript_1E607A - compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E6084 - compare VAR_0x405E, 2 - goto_if 4, SootopolisCity_EventScript_1E6065 - msgbox SootopolisCity_Text_1E6F90, 4 - release - end - -SootopolisCity_EventScript_1E6065:: @ 81E6065 - msgbox SootopolisCity_Text_1E7078, 4 - closemessage - applymovement 8, SootopolisCity_Movement_2725A2 - waitmovement 0 - release - end - -SootopolisCity_EventScript_1E607A:: @ 81E607A - msgbox SootopolisCity_Text_1E710B, 4 - release - end - -SootopolisCity_EventScript_1E6084:: @ 81E6084 - msgbox SootopolisCity_Text_1E70D4, 4 - release - end - -SootopolisCity_EventScript_1E608E:: @ 81E608E - lockall - applymovement 4, SootopolisCity_Movement_27259E - waitmovement 0 - compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E60D9 - compare VAR_0x405E, 6 - goto_if 4, SootopolisCity_EventScript_1E60CF - compare VAR_0x405E, 1 - goto_if 3, SootopolisCity_EventScript_1E60CF - msgbox SootopolisCity_Text_1E690B, 4 - closemessage - applymovement 4, SootopolisCity_Movement_2725A2 - waitmovement 0 - release - end - -SootopolisCity_EventScript_1E60CF:: @ 81E60CF - msgbox SootopolisCity_Text_1E68A1, 4 - release - end - -SootopolisCity_EventScript_1E60D9:: @ 81E60D9 - msgbox SootopolisCity_Text_1E6920, 4 - release - end - -SootopolisCity_EventScript_1E60E3:: @ 81E60E3 - lockall - applymovement 5, SootopolisCity_Movement_27259E - waitmovement 0 - compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E612D - checkflag FLAG_SYS_GAME_CLEAR - goto_eq SootopolisCity_EventScript_1E6137 - compare VAR_0x405E, 6 - goto_if 4, SootopolisCity_EventScript_1E6141 - compare VAR_0x405E, 1 - goto_if 3, SootopolisCity_EventScript_1E6141 - msgbox SootopolisCity_Text_1E6692, 4 - closemessage - applymovement 5, SootopolisCity_Movement_2725A2 - waitmovement 0 - release - end - -SootopolisCity_EventScript_1E612D:: @ 81E612D - msgbox SootopolisCity_Text_1E6750, 4 - release - end - -SootopolisCity_EventScript_1E6137:: @ 81E6137 - msgbox SootopolisCity_Text_1E677F, 4 - release - end - -SootopolisCity_EventScript_1E6141:: @ 81E6141 - msgbox SootopolisCity_Text_1E6618, 4 - release - end - -SootopolisCity_EventScript_1E614B:: @ 81E614B - msgbox SootopolisCity_Text_1E656F, 3 - end - -SootopolisCity_EventScript_1E6154:: @ 81E6154 - msgbox SootopolisCity_Text_1E65C8, 3 - end - -SootopolisCity_EventScript_1E615D:: @ 81E615D - msgbox SootopolisCity_Text_1E6604, 3 - end - -SootopolisCity_EventScript_1E6166:: @ 81E6166 - lockall - applymovement 7, SootopolisCity_Movement_27259E - waitmovement 0 - checkflag FLAG_0x133 - call_if 0, SootopolisCity_EventScript_1E61CC - compare VAR_0x405E, 2 - goto_eq SootopolisCity_EventScript_1E61AE - compare VAR_0x405E, 3 - goto_eq SootopolisCity_EventScript_1E61C2 - compare VAR_0x405E, 4 - goto_eq SootopolisCity_EventScript_1E61C2 - checkflag FLAG_0x09E - goto_eq SootopolisCity_EventScript_1E61B8 - msgbox SootopolisCity_Text_1E78E5, 4 - releaseall - end - -SootopolisCity_EventScript_1E61AE:: @ 81E61AE - msgbox SootopolisCity_Text_1E7866, 4 - releaseall - end - -SootopolisCity_EventScript_1E61B8:: @ 81E61B8 - msgbox SootopolisCity_Text_1E794B, 4 - releaseall - end - -SootopolisCity_EventScript_1E61C2:: @ 81E61C2 - msgbox SootopolisCity_Text_1E789A, 4 - releaseall - end - -SootopolisCity_EventScript_1E61CC:: @ 81E61CC - msgbox SootopolisCity_Text_1E75CB, 4 - closemessage - compare VAR_FACING, 3 - call_if 1, SootopolisCity_EventScript_1E6243 - compare VAR_FACING, 2 - call_if 1, SootopolisCity_EventScript_1E6255 - msgbox SootopolisCity_Text_1E7737, 4 - closemessage - applymovement 7, SootopolisCity_Movement_1E62D4 - applymovement 255, SootopolisCity_Movement_1E630E - waitmovement 0 - delay 120 - applymovement 1, SootopolisCity_Movement_1E6341 - waitmovement 0 - applymovement 7, SootopolisCity_Movement_1E6344 - applymovement 255, SootopolisCity_Movement_1E634F - waitmovement 0 - msgbox SootopolisCity_Text_1E77F0, 4 - closemessage - setflag FLAG_0x133 - applymovement 255, SootopolisCity_Movement_1E635A - waitmovement 0 - warp MAP_CAVE_OF_ORIGIN_ENTRANCE, 255, 9, 20 - waitstate - end - -SootopolisCity_EventScript_1E6243:: @ 81E6243 - applymovement 7, SootopolisCity_Movement_1E6267 - applymovement 255, SootopolisCity_Movement_1E628C - waitmovement 0 - return - -SootopolisCity_EventScript_1E6255:: @ 81E6255 - applymovement 7, SootopolisCity_Movement_1E6267 - applymovement 255, SootopolisCity_Movement_1E62B0 - waitmovement 0 - return - -SootopolisCity_Movement_1E6267: @ 81E6267 - 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 - 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 - 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 - 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 - 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 - walk_slow_left - walk_in_place_fastest_right - step_end - -SootopolisCity_Movement_1E6344: @ 81E6344 - 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 - 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 - walk_up - walk_up - step_end - -SootopolisCity_EventScript_1E635D:: @ 81E635D - lockall - applymovement 15, SootopolisCity_Movement_27259E - waitmovement 0 - compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E6388 - msgbox SootopolisCity_Text_1E67DC, 4 - closemessage - applymovement 15, SootopolisCity_Movement_2725A2 - waitmovement 0 - releaseall - end - -SootopolisCity_EventScript_1E6388:: @ 81E6388 - msgbox SootopolisCity_Text_1E6853, 4 - closemessage - releaseall - end - -SootopolisCity_EventScript_1E6393:: @ 81E6393 - lockall - compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E63C7 - msgbox SootopolisCity_Text_1E6936, 4 - closemessage - applymovement 14, SootopolisCity_Movement_27259E - waitmovement 0 - msgbox SootopolisCity_Text_1E696C, 4 - closemessage - applymovement 14, SootopolisCity_Movement_2725A2 - waitmovement 0 - releaseall - end - -SootopolisCity_EventScript_1E63C7:: @ 81E63C7 - applymovement 14, SootopolisCity_Movement_27259E - waitmovement 0 - msgbox SootopolisCity_Text_1E69B8, 4 - releaseall - end - -SootopolisCity_EventScript_1E63DB:: @ 81E63DB - lockall - applymovement 13, SootopolisCity_Movement_27259E - waitmovement 0 - compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E6406 - msgbox SootopolisCity_Text_1E6C7C, 4 - closemessage - applymovement 13, SootopolisCity_Movement_2725A2 - waitmovement 0 - releaseall - end - -SootopolisCity_EventScript_1E6406:: @ 81E6406 - msgbox SootopolisCity_Text_1E6CA6, 4 - closemessage - releaseall - end - -SootopolisCity_EventScript_1E6411:: @ 81E6411 - lockall - applymovement 12, SootopolisCity_Movement_27259E - waitmovement 0 - compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E643C - msgbox SootopolisCity_Text_1E6A50, 4 - closemessage - applymovement 12, SootopolisCity_Movement_2725A2 - waitmovement 0 - releaseall - end - -SootopolisCity_EventScript_1E643C:: @ 81E643C - msgbox SootopolisCity_Text_1E6B2A, 4 - releaseall - end - -SootopolisCity_EventScript_1E6446:: @ 81E6446 - lock - faceplayer - compare VAR_0x405E, 4 - goto_eq SootopolisCity_EventScript_1E64D8 - checkflag FLAG_0x138 - goto_eq SootopolisCity_EventScript_1E64E2 - checkflag FLAG_0x09E - goto_eq SootopolisCity_EventScript_1E646F - msgbox SootopolisCity_Text_1E7A3E, 4 - release - end - -SootopolisCity_EventScript_1E646F:: @ 81E646F - msgbox SootopolisCity_Text_1E7ACF, 4 - giveitem_std ITEM_HM07 - setflag FLAG_0x138 - msgbox SootopolisCity_Text_1E7B86, 4 - closemessage - compare VAR_FACING, 2 - call_if 1, SootopolisCity_EventScript_1E64B2 - compare VAR_FACING, 4 - call_if 1, SootopolisCity_EventScript_1E64B2 - compare VAR_FACING, 3 - call_if 1, SootopolisCity_EventScript_1E64C5 - release - end - -SootopolisCity_EventScript_1E64B2:: @ 81E64B2 - applymovement 18, SootopolisCity_Movement_1E64EC - waitmovement 0 - moveobjectoffscreen 18 - setvar VAR_0x40D8, 1 - return - -SootopolisCity_EventScript_1E64C5:: @ 81E64C5 - applymovement 18, SootopolisCity_Movement_1E64EF - waitmovement 0 - moveobjectoffscreen 18 - setvar VAR_0x40D8, 2 - return - -SootopolisCity_EventScript_1E64D8:: @ 81E64D8 - msgbox SootopolisCity_Text_1E79C8, 4 - release - end - -SootopolisCity_EventScript_1E64E2:: @ 81E64E2 - msgbox SootopolisCity_Text_1E7CBC, 4 - release - end - -SootopolisCity_Movement_1E64EC: @ 81E64EC - walk_right - walk_in_place_fastest_down - step_end - -SootopolisCity_Movement_1E64EF: @ 81E64EF - walk_left - walk_in_place_fastest_down - step_end - -SootopolisCity_EventScript_1E64F2:: @ 81E64F2 - lockall - compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E6509 - msgbox SootopolisCity_Text_1E72DB, 4 - closemessage - releaseall - end - -SootopolisCity_EventScript_1E6509:: @ 81E6509 - msgbox SootopolisCity_Text_1E737E, 4 - setflag FLAG_0x135 - checkflag FLAG_0x134 - goto_eq SootopolisCity_EventScript_1E654C - releaseall - end - -SootopolisCity_EventScript_1E651F:: @ 81E651F - lockall - compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E6536 - msgbox SootopolisCity_Text_1E7460, 4 - closemessage - releaseall - end - -SootopolisCity_EventScript_1E6536:: @ 81E6536 - msgbox SootopolisCity_Text_1E74F6, 4 - setflag FLAG_0x134 - checkflag FLAG_0x135 - goto_eq SootopolisCity_EventScript_1E654C - releaseall - end - -SootopolisCity_EventScript_1E654C:: @ 81E654C - setflag FLAG_0x33B - setflag FLAG_0x33A - setflag FLAG_0x09E - clearflag FLAG_0x358 - clearflag FLAG_0x394 - setvar VAR_0x40B9, 2 - warpsilent MAP_SOOTOPOLIS_CITY, 255, 31, 34 - waitstate - releaseall - end - -SootopolisCity_Movement_1E656B:: @ 81E656B - levitate - step_end - -SootopolisCity_Movement_1E656D:: @ 81E656D - destroy_extra_task - step_end - -SootopolisCity_Text_1E656F: @ 81E656F - .string "SOOTOPOLIS CITY POKéMON GYM\n" - .string "LEADER: JUAN\p" - .string "“The GYM LEADER with the beauty\n" - .string "of pure water!â€$" - -SootopolisCity_Text_1E65C8: @ 81E65C8 - .string "SOOTOPOLIS CITY\p" - .string "“The mystical city where history\n" - .string "slumbers.â€$" - - -SootopolisCity_Text_1E6604: @ 81E6604 - .string "The door is closed.$" - -SootopolisCity_Text_1E6618: @ 81E6618 - .string "Diving in the sea. Climbing up and\n" - .string "down stairs all the time…\p" - .string "If you live in this town, you end up\n" - .string "getting physically fit.$" - -SootopolisCity_Text_1E6692: @ 81E6692 - .string "These giant POKéMON suddenly appeared\n" - .string "in the middle of the city!\p" - .string "And, I’ve never seen them before!\p" - .string "Why are they smashing into each\n" - .string "other like that?\p" - .string "Why can’t they be friends, those\n" - .string "POKéMON?$" - -SootopolisCity_Text_1E6750: @ 81E6750 - .string "What? What? What?\n" - .string "What is that green POKéMON?!$" - -SootopolisCity_Text_1E677F: @ 81E677F - .string "GROUDON and KYOGRE…\n" - .string "Where did they go?\p" - .string "Will they cause droughts or downpours\n" - .string "somewhere else?$" - -SootopolisCity_Text_1E67DC: @ 81E67DC - .string "I just get this sense somehow that\n" - .string "the two POKéMON aren’t angry.\p" - .string "I think… They probably can’t control\n" - .string "their own power…$" - -SootopolisCity_Text_1E6853: @ 81E6853 - .string "That flying POKéMON came down from\n" - .string "the sky and stopped the rampaging\l" - .string "POKéMON…$" - -SootopolisCity_Text_1E68A1: @ 81E68A1 - .string "I… I’ve never been out of this city.\p" - .string "I wonder what the world is like on\n" - .string "the other side of this round sky?$" - -SootopolisCity_Text_1E690B: @ 81E690B - .string "Wow!\n" - .string "This is wicked!$" - -SootopolisCity_Text_1E6920: @ 81E6920 - .string "Wow!\n" - .string "That was wicked!$" - -SootopolisCity_Text_1E6936: @ 81E6936 - .string "Go for it, red POKéMON!\n" - .string "Don’t back off, blue POKéMON!$" - -SootopolisCity_Text_1E696C: @ 81E696C - .string "… … … … … …\p" - .string "Hi, do you know the names of those\n" - .string "POKéMON fighting over there?$" - -SootopolisCity_Text_1E69B8: @ 81E69B8 - .string "I was wondering which one would win,\n" - .string "the red one or the blue one, but, oh no,\l" - .string "it’s the green one that settles things!\p" - .string "Talk about a huge turn of events!$" - -SootopolisCity_Text_1E6A50: @ 81E6A50 - .string "There’s an ancient legend that claims\n" - .string "the land and sea were shaped by\l" - .string "a colossal battle between POKéMON.\p" - .string "Well, I’m seeing that happen with\n" - .string "my very own eyes!\p" - .string "Whoa! I never expected to be\n" - .string "witness to something this huge!$" - -SootopolisCity_Text_1E6B2A: @ 81E6B2A - .string "There’s an ancient legend that claims\n" - .string "the land and sea were shaped by\l" - .string "a colossal battle between POKéMON.\p" - .string "Well, I saw that happen with\n" - .string "my very own eyes!\p" - .string "Whoa! I never expected to be\n" - .string "witness to something this huge!$" - -SootopolisCity_Text_1E6BFF: @ 81E6BFF - .string "A big POKéMON is fighting with\n" - .string "another big POKéMON!\p" - .string "Please, someone make them stop!$" - -SootopolisCity_Text_1E6C53: @ 81E6C53 - .string "A pretty POKéMON came down from\n" - .string "the sky…$" - -SootopolisCity_Text_1E6C7C: @ 81E6C7C - .string "Oh, no!\n" - .string "SOOTOPOLIS CITY will get wrecked!$" - -SootopolisCity_Text_1E6CA6: @ 81E6CA6 - .string "SOOTOPOLIS CITY didn’t get wrecked!$" - -SootopolisCity_Text_1E6CCA: @ 81E6CCA - .string "Hm!\n" - .string "You’ve come all the way to SOOTOPOLIS?\l" - .string "You’re no ordinary tourist.\p" - .string "But I suppose that doesn’t make you\n" - .string "an extraordinary tourist, either.$" - -SootopolisCity_Text_1E6D57: @ 81E6D57 - .string "The city has regained its calm…$" - -SootopolisCity_Text_1E6D77: @ 81E6D77 - .string "Who might you be?\p" - .string "This is the CAVE OF ORIGIN.\p" - .string "The spirits of POKéMON, becalmed at\n" - .string "MT. PYRE, are said to be revived here.\p" - .string "Please leave.$" - -SootopolisCity_Text_1E6DFE: @ 81E6DFE - .string "A person with a strong will and\n" - .string "superior talent…\p" - .string "A TRAINER who has knowledge and\n" - .string "experience of many kinds of POKéMON…\p" - .string "If such a person were to appear, I was\n" - .string "instructed by WALLACE to lead that\l" - .string "TRAINER to this CAVE.$" - -SootopolisCity_Text_1E6ED4: @ 81E6ED4 - .string "Oh, my…\p" - .string "The clash between the two awakened\n" - .string "POKéMON was quelled by the awakening\l" - .string "of a third POKéMON…$" - -SootopolisCity_Text_1E6F38: @ 81E6F38 - .string "This is the CAVE OF ORIGIN…\p" - .string "With the passing of the crisis,\n" - .string "the cave, too, shall sleep…$" - -SootopolisCity_Text_1E6F90: @ 81E6F90 - .string "SOOTOPOLIS sprang up as a town in\n" - .string "the crater of a volcano.\p" - .string "If you look up at the sky, the lip of\n" - .string "the crater is also visible.\l" - .string "So, all you see is the sky in a circle.\p" - .string "But that’s what makes the sky above\n" - .string "SOOTOPOLIS the most beautiful.$" - -SootopolisCity_Text_1E7078: @ 81E7078 - .string "When two POKéMON that gigantic\n" - .string "are fighting that savagely, there’s\l" - .string "not much that we can do.$" - -SootopolisCity_Text_1E70D4: @ 81E70D4 - .string "When that third POKéMON flew down,\n" - .string "I feared the worst.$" - -SootopolisCity_Text_1E710B: @ 81E710B - .string "A circle of a night sky framed by\n" - .string "the crater of a volcano…\p" - .string "And in that ring, stars flicker and\n" - .string "blink as if they were alive…\l" - .string "It’s my favorite scenery.$" - -SootopolisCity_Text_1E71A1: @ 81E71A1 - .string "The weather was clear this morning,\n" - .string "but…\p" - .string "All of a sudden, dark clouds brewed up,\n" - .string "rain started falling in sheets, and\l" - .string "there was thunder and lightning, too.\p" - .string "The weather just went completely\n" - .string "wild!\p" - .string "Is all of this because of those\n" - .string "POKéMON?$" - -SootopolisCity_Text_1E728C: @ 81E728C - .string "Oh?\p" - .string "It was you who brought that flying\n" - .string "POKéMON here?\p" - .string "Well, aren’t you amazing!$" - -SootopolisCity_Text_1E72DB: @ 81E72DB - .string "MAXIE: G… GROUDON…\n" - .string "Please! Stop what you’re doing!\p" - .string "I know the extent of your power now!\p" - .string "If you keep going, all HOENN, not just\n" - .string "SOOTOPOLIS, will be utterly ruined!$" - -SootopolisCity_Text_1E737E: @ 81E737E - .string "MAXIE: So the super-ancient POKéMON\n" - .string "weren’t only GROUDON and KYOGRE…\p" - .string "After all our fruitless scheming and\n" - .string "frantic efforts, that one POKéMON’s\l" - .string "simple action puts everything right\l" - .string "again as if nothing had happened…\p" - .string "Fu…\n" - .string "Fuhahaha…$" - -SootopolisCity_Text_1E7460: @ 81E7460 - .string "ARCHIE: KYOGRE! What’s wrong?!\n" - .string "Look over here! It’s the RED ORB!\l" - .string "Calm down! KYOGRE!\p" - .string "… … … … … …\n" - .string "… … … … … …\p" - .string "It’s no good!\n" - .string "It’s not responding at all!$" - -SootopolisCity_Text_1E74F6: @ 81E74F6 - .string "ARCHIE: KYOGRE and GROUDON both\n" - .string "flew off to who knows where.\p" - .string "The weather in HOENN has returned\n" - .string "to its normal state…\p" - .string "Haha…\n" - .string "Hahaha…\p" - .string "Maybe what we were trying to do was\n" - .string "something small, even meaningless,\l" - .string "to POKéMON…$" - -SootopolisCity_Text_1E75CB: @ 81E75CB - .string "STEVEN: Those POKéMON fighting…\n" - .string "GROUDON… And KYOGRE…\p" - .string "The two super-ancient POKéMON\n" - .string "were awakened from a long sleep…\p" - .string "And now they are smashing each other\n" - .string "with their uncontrollable energy…\p" - .string "…{PLAYER}{KUN}.\p" - .string "You being here now I’ll take to mean\n" - .string "that you’re prepared to become\l" - .string "involved in this crisis.\p" - .string "Well, then, there’s someone that\n" - .string "I’d like you to meet.\p" - .string "Come with me, please.$" - -SootopolisCity_Text_1E7737: @ 81E7737 - .string "STEVEN: Listen, {PLAYER}{KUN}.\p" - .string "Does seeing GROUDON and KYOGRE make\n" - .string "you think POKéMON are to be feared?\p" - .string "But that’s not true.\n" - .string "POKéMON are really more…\p" - .string "…Why am I asking you this?\n" - .string "You already know.$" - -SootopolisCity_Text_1E77F0: @ 81E77F0 - .string "STEVEN: Okay, here we are!\p" - .string "Inside here you’ll find someone named\n" - .string "WALLACE.\p" - .string "I think you have what’s needed to\n" - .string "help him…$" - -SootopolisCity_Text_1E7866: @ 81E7866 - .string "STEVEN: I think you have what’s\n" - .string "needed to help him…$" - -SootopolisCity_Text_1E789A: @ 81E789A - .string "STEVEN: The SKY PILLAR…\p" - .string "I’ve never been there.\n" - .string "I wonder where it could be?$" - -SootopolisCity_Text_1E78E5: @ 81E78E5 - .string "STEVEN: So that’s RAYQUAZA…\p" - .string "It’s incredible how the two rampaging\n" - .string "POKéMON would flee from it in fear…$" - -SootopolisCity_Text_1E794B: @ 81E794B - .string "STEVEN: It looks like both MAXIE and\n" - .string "ARCHIE have gone away somewhere.\p" - .string "Perhaps they’ve gone to MT. PYRE to\n" - .string "return those ORBS…$" - -SootopolisCity_Text_1E79C8: @ 81E79C8 - .string "WALLACE: Oh?\n" - .string "{PLAYER}{KUN}?\p" - .string "Haven’t you scaled the SKY PILLAR\n" - .string "yet?\p" - .string "I’m sure that you can make it to\n" - .string "the top of the SKY PILLAR…$" - -SootopolisCity_Text_1E7A3E: @ 81E7A3E - .string "WALLACE: {PLAYER}{KUN}…\p" - .string "The leaders of TEAM MAGMA and AQUA,\n" - .string "I don’t think they meant harm.\p" - .string "It wouldn’t hurt to hear what they\n" - .string "have to say for themselves.$" - -SootopolisCity_Text_1E7ACF: @ 81E7ACF - .string "WALLACE: {PLAYER}{KUN}…\n" - .string "My eyes didn’t deceive me.\p" - .string "Thanks to your help, SOOTOPOLIS…\n" - .string "No, all of HOENN was saved.\p" - .string "On behalf of the people, I thank you.\p" - .string "This is a gift from me.\n" - .string "Please accept it.$" - -SootopolisCity_Text_1E7B86: @ 81E7B86 - .string "That HIDDEN MACHINE contains\n" - .string "WATERFALL.\p" - .string "If you have the RAIN BADGE, a POKéMON\n" - .string "that has learned that HM move can\l" - .string "force its way up waterfalls.\p" - .string "And where does one get the RAIN BADGE?\n" - .string "You know, don’t you?\p" - .string "That’s right! You have to beat\n" - .string "the SOOTOPOLIS GYM LEADER.\p" - .string "When you’re all set to go, step through\n" - .string "that door.$" - -SootopolisCity_Text_1E7CBC: @ 81E7CBC - .string "WALLACE: I’m sure that you will be\n" - .string "dazzled by my mentor’s breathtakingly\l" - .string "elegant battle style.$" diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc deleted file mode 100644 index af661890f..000000000 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ /dev/null @@ -1,329 +0,0 @@ -SootopolisCity_Gym_1F_MapScripts:: @ 8224E4C - map_script 2, SootopolisCity_Gym_1F_MapScript2_224ECB - map_script 5, SootopolisCity_Gym_1F_MapScript1_224E67 - map_script 1, SootopolisCity_Gym_1F_MapScript1_224E6A - map_script 3, SootopolisCity_Gym_1F_MapScript1_224E61 - .byte 0 - -SootopolisCity_Gym_1F_MapScript1_224E61: @ 8224E61 - setvar VAR_ICE_STEP_COUNT, 1 - end - -SootopolisCity_Gym_1F_MapScript1_224E67: @ 8224E67 - setstepcallback 4 - end - -SootopolisCity_Gym_1F_MapScript1_224E6A: @ 8224E6A - call SootopolisCity_Gym_1F_EventScript_224E73 - special SetSootopolisGymCrackedIceMetatiles - end - -SootopolisCity_Gym_1F_EventScript_224E73:: @ 8224E73 - compare VAR_ICE_STEP_COUNT, 8 - goto_if 0, SootopolisCity_Gym_1F_EventScript_224ECA - compare VAR_ICE_STEP_COUNT, 28 - goto_if 0, SootopolisCity_Gym_1F_EventScript_224EB8 - compare VAR_ICE_STEP_COUNT, 67 - goto_if 0, SootopolisCity_Gym_1F_EventScript_224EA6 - setmetatile 8, 4, 519, 0 - setmetatile 8, 5, 519, 0 - -SootopolisCity_Gym_1F_EventScript_224EA6:: @ 8224EA6 - setmetatile 8, 10, 519, 0 - setmetatile 8, 11, 519, 0 - -SootopolisCity_Gym_1F_EventScript_224EB8:: @ 8224EB8 - setmetatile 8, 15, 519, 0 - setmetatile 8, 16, 519, 0 - -SootopolisCity_Gym_1F_EventScript_224ECA:: @ 8224ECA - return - -SootopolisCity_Gym_1F_MapScript2_224ECB: @ 8224ECB - map_script_2 VAR_ICE_STEP_COUNT, 8, SootopolisCity_Gym_1F_EventScript_224EED - map_script_2 VAR_ICE_STEP_COUNT, 28, SootopolisCity_Gym_1F_EventScript_224F01 - map_script_2 VAR_ICE_STEP_COUNT, 67, SootopolisCity_Gym_1F_EventScript_224F15 - map_script_2 VAR_ICE_STEP_COUNT, 0, SootopolisCity_Gym_1F_EventScript_224F29 - .2byte 0 - -SootopolisCity_Gym_1F_EventScript_224EED:: @ 8224EED - addvar VAR_ICE_STEP_COUNT, 1 - delay 40 - playse SE_RU_GASHIN - call SootopolisCity_Gym_1F_EventScript_224E73 - special DrawWholeMapView - end - -SootopolisCity_Gym_1F_EventScript_224F01:: @ 8224F01 - addvar VAR_ICE_STEP_COUNT, 1 - delay 40 - playse SE_RU_GASHIN - call SootopolisCity_Gym_1F_EventScript_224E73 - special DrawWholeMapView - end - -SootopolisCity_Gym_1F_EventScript_224F15:: @ 8224F15 - addvar VAR_ICE_STEP_COUNT, 1 - delay 40 - playse SE_RU_GASHIN - call SootopolisCity_Gym_1F_EventScript_224E73 - special DrawWholeMapView - end - -SootopolisCity_Gym_1F_EventScript_224F29:: @ 8224F29 - lockall - delay 20 - applymovement 255, SootopolisCity_Gym_1F_Movement_224F42 - waitmovement 0 - playse SE_RU_HYUU - delay 60 - warphole MAP_SOOTOPOLIS_CITY_GYM_B1F - waitstate - end - -SootopolisCity_Gym_1F_Movement_224F42: @ 8224F42 - set_invisible - step_end - -SootopolisCity_Gym_1F_EventScript_224F44:: @ 8224F44 - trainerbattle 1, TRAINER_JUAN_1, 0, SootopolisCity_Gym_1F_Text_225268, SootopolisCity_Gym_1F_Text_225432, SootopolisCity_Gym_1F_EventScript_224F82 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq SootopolisCity_Gym_1F_EventScript_225025 - checkflag FLAG_0x0AC - goto_if 0, SootopolisCity_Gym_1F_EventScript_224FF7 - checkflag FLAG_BADGE06_GET - goto_if 0, SootopolisCity_Gym_1F_EventScript_22501B - msgbox SootopolisCity_Gym_1F_Text_225778, 4 - release - end - -SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 - message SootopolisCity_Gym_1F_Text_225598 - waitmessage - call SootopolisCity_Gym_1F_EventScript_27207E - msgbox SootopolisCity_Gym_1F_Text_2255BE, 4 - setflag FLAG_0x4F7 - setflag FLAG_BADGE08_GET - setflag FLAG_0x356 - setflag FLAG_0x3CD - setflag FLAG_0x330 - setvar VAR_0x405E, 6 - clearflag FLAG_0x347 - setvar VAR_0x8008, 8 - call SootopolisCity_Gym_1F_EventScript_271F43 - call SootopolisCity_Gym_1F_EventScript_224FD4 - closemessage - delay 30 - playfanfare MUS_ME_TORE_EYE - msgbox SootopolisCity_Gym_1F_Text_22574D, 4 - waitfanfare - closemessage - delay 30 - setflag FLAG_0x1D9 - release - end - -SootopolisCity_Gym_1F_EventScript_224FD4:: @ 8224FD4 - giveitem_std ITEM_TM03 - compare VAR_RESULT, 0 - goto_eq SootopolisCity_Gym_1F_EventScript_27205E - msgbox SootopolisCity_Gym_1F_Text_2256C1, 4 - setflag FLAG_0x0AC - return - -SootopolisCity_Gym_1F_EventScript_224FF7:: @ 8224FF7 - giveitem_std ITEM_TM03 - compare VAR_RESULT, 0 - goto_eq SootopolisCity_Gym_1F_EventScript_272054 - msgbox SootopolisCity_Gym_1F_Text_2256C1, 4 - setflag FLAG_0x0AC - release - end - -SootopolisCity_Gym_1F_EventScript_22501B:: @ 822501B - msgbox SootopolisCity_Gym_1F_Text_225865, 4 - release - end - -SootopolisCity_Gym_1F_EventScript_225025:: @ 8225025 - trainerbattle 7, TRAINER_JUAN_1, 0, SootopolisCity_Gym_1F_Text_225950, SootopolisCity_Gym_1F_Text_225A2E, SootopolisCity_Gym_1F_Text_225B48 - msgbox SootopolisCity_Gym_1F_Text_225A67, 6 - end - -SootopolisCity_Gym_1F_EventScript_225040:: @ 8225040 - lock - faceplayer - checkflag FLAG_0x4F7 - goto_eq SootopolisCity_Gym_1F_EventScript_225055 - msgbox SootopolisCity_Gym_1F_Text_225093, 4 - release - end - -SootopolisCity_Gym_1F_EventScript_225055:: @ 8225055 - msgbox SootopolisCity_Gym_1F_Text_2251AF, 4 - release - end - -SootopolisCity_Gym_1F_EventScript_22505F:: @ 822505F - lockall - checkflag FLAG_BADGE08_GET - goto_eq SootopolisCity_Gym_1F_EventScript_22507F - goto SootopolisCity_Gym_1F_EventScript_225089 - end - -SootopolisCity_Gym_1F_EventScript_22506F:: @ 822506F - lockall - checkflag FLAG_BADGE08_GET - goto_eq SootopolisCity_Gym_1F_EventScript_22507F - goto SootopolisCity_Gym_1F_EventScript_225089 - end - -SootopolisCity_Gym_1F_EventScript_22507F:: @ 822507F - msgbox SootopolisCity_Gym_1F_Text_225916, 4 - releaseall - end - -SootopolisCity_Gym_1F_EventScript_225089:: @ 8225089 - msgbox SootopolisCity_Gym_1F_Text_2258FA, 4 - releaseall - end - -SootopolisCity_Gym_1F_Text_225093: @ 8225093 - .string "Yo! How’s it going, CHAMPION-\n" - .string "bound {PLAYER}?\p" - .string "SOOTOPOLIS’s GYM LEADER JUAN is\n" - .string "a master of WATER-type POKéMON.\p" - .string "And, to get to JUAN, an icy floor\n" - .string "will hamper your progress…\p" - .string "Listen, I’m sorry, but that’s all the\n" - .string "advice that I have for you.\p" - .string "The rest of the way, you have to\n" - .string "go for it yourself!$" - -SootopolisCity_Gym_1F_Text_2251AF: @ 82251AF - .string "Yow! You’ve beaten even JUAN, who\n" - .string "was supposedly the best in all HOENN!\p" - .string "Okay! Check out your TRAINER CARD.\p" - .string "If you’ve gotten all the BADGES, you’re\n" - .string "set for the POKéMON LEAGUE challenge!$" - -SootopolisCity_Gym_1F_Text_225268: @ 8225268 - .string "Let me ask you.\n" - .string "Did you know?\l" - .string "Ah, I should not be so coy.\p" - .string "It was I who taught WALLACE everything\n" - .string "there is to know about POKéMON.\p" - .string "Once, I had given up my position as\n" - .string "the GYM LEADER.\p" - .string "In my place, I had entrusted WALLACE\n" - .string "with the GYM.\p" - .string "However, a compelling reason arose for\n" - .string "me to make a comeback.\p" - .string "Ah, but enough chatter.\n" - .string "Let us begin our match, shall we?\p" - .string "Please, you shall bear witness to\n" - .string "our artistry.\p" - .string "A grand illusion of water sculpted\n" - .string "by POKéMON and myself!$" - -SootopolisCity_Gym_1F_Text_225432: @ 8225432 - .string "Ahahaha, excellent!\n" - .string "Very well, you are the winner.\p" - .string "From you, I sense the brilliant shine\n" - .string "of skill that will overcome all.\p" - .string "However, compared with me or even\n" - .string "WALLACE, you are lacking in elegance.\p" - .string "Perhaps I should make you a loan\n" - .string "of my outfit?\p" - .string "… … … … … …\n" - .string "… … … … … …\p" - .string "Hahaha, I merely jest!\p" - .string "Rather than my clothes, I shall reward\n" - .string "you with this, the RAIN BADGE!$" - -SootopolisCity_Gym_1F_Text_225598: @ 8225598 - .string "{PLAYER} received the RAIN BADGE\n" - .string "from JUAN.$" - -SootopolisCity_Gym_1F_Text_2255BE: @ 82255BE - .string "Having the RAIN BADGE shall assure you\n" - .string "the full obedience of all your POKéMON\l" - .string "to your every command.\p" - .string "The RAIN BADGE also allows the use\n" - .string "of the HM move WATERFALL to scale\l" - .string "walls of cascading water.\p" - .string "And, so that you never forget the\n" - .string "battle we shared, take this…$" - -SootopolisCity_Gym_1F_Text_2256C1: @ 82256C1 - .string "The TECHNICAL MACHINE I handed you\n" - .string "contains WATER PULSE.\p" - .string "In use, it will occasionally confuse\n" - .string "the target with ultrasonic waves.\p" - .string "… … … … … …$" - -SootopolisCity_Gym_1F_Text_22574D: @ 822574D - .string "Registered GYM LEADER JUAN\n" - .string "in the POKéNAV.$" - -SootopolisCity_Gym_1F_Text_225778: @ 8225778 - .string "The TRAINERS who have gathered all\n" - .string "the GYM BADGES of HOENN should make\l" - .string "way to the ultimate destination.\p" - .string "The POKéMON LEAGUE.\p" - .string "Travel to the easternmost reaches\n" - .string "of HOENN, to the island EVER GRANDE.\p" - .string "There, you shall find the POKéMON\n" - .string "LEAGUE.$" - -SootopolisCity_Gym_1F_Text_225865: @ 8225865 - .string "There remains but one BADGE to\n" - .string "obtain in HOENN.\p" - .string "If you wish to challenge the POKéMON\n" - .string "LEAGUE, you must obtain the last\l" - .string "BADGE from the GYM in FORTREE.$" - -SootopolisCity_Gym_1F_Text_2258FA: @ 82258FA - .string "SOOTOPOLIS CITY POKéMON GYM$" - -SootopolisCity_Gym_1F_Text_225916: @ 8225916 - .string "SOOTOPOLIS CITY POKéMON GYM\p" - .string "JUAN’S CERTIFIED TRAINERS:\n" - .string "{PLAYER}$" - -SootopolisCity_Gym_1F_Text_225950: @ 8225950 - .string "JUAN: Ah, this GYM had returned to its\n" - .string "usual state of serenity…\p" - .string "But our young typhoon has returned\n" - .string "to put us to the test again!\p" - .string "Well, my friend, most certainly!\p" - .string "I shall be delighted to dance with you\n" - .string "as often as you wish!$" - -SootopolisCity_Gym_1F_Text_225A2E: @ 8225A2E - .string "Ahahaha, you are the winner!\n" - .string "You have defeated me again!$" - -SootopolisCity_Gym_1F_Text_225A67: @ 8225A67 - .string "JUAN: If I told you to become my\n" - .string "apprentice, you will refuse, I am sure.\p" - .string "I would like to make a gift of my coat\n" - .string "to you.\p" - .string "But again, you will refuse.\n" - .string "I imagine that to be so.\p" - .string "And that, my friend, is a certain sign\n" - .string "of nobility!$" - -SootopolisCity_Gym_1F_Text_225B48: @ 8225B48 - .string "JUAN: Ah, this GYM had returned to its\n" - .string "usual state of serenity…\p" - .string "But our young typhoon has returned\n" - .string "to put us to the test again!\p" - .string "Well, my friend, most certainly!\n" - .string "I shall be delighted to dance with you…\p" - .string "Ah, no, no, no.\n" - .string "You have with you but one POKéMON.\p" - .string "I wish that you would return with\n" - .string "two, perhaps more, POKéMON, please.$" - diff --git a/data/scripts/maps/SootopolisCity_Gym_B1F.inc b/data/scripts/maps/SootopolisCity_Gym_B1F.inc deleted file mode 100644 index 8aaa604e2..000000000 --- a/data/scripts/maps/SootopolisCity_Gym_B1F.inc +++ /dev/null @@ -1,183 +0,0 @@ -SootopolisCity_Gym_B1F_MapScripts:: @ 8225C8A - .byte 0 - -SootopolisCity_Gym_B1F_EventScript_225C8B:: @ 8225C8B - trainerbattle 0, TRAINER_ANDREA, 0, SootopolisCity_Gym_B1F_Text_225D71, SootopolisCity_Gym_B1F_Text_225DB6 - msgbox SootopolisCity_Gym_B1F_Text_225DCF, 6 - end - -SootopolisCity_Gym_B1F_EventScript_225CA2:: @ 8225CA2 - trainerbattle 0, TRAINER_CRISSY, 0, SootopolisCity_Gym_B1F_Text_225E04, SootopolisCity_Gym_B1F_Text_225E60 - msgbox SootopolisCity_Gym_B1F_Text_225E90, 6 - end - -SootopolisCity_Gym_B1F_EventScript_225CB9:: @ 8225CB9 - trainerbattle 0, TRAINER_BRIANNA, 0, SootopolisCity_Gym_B1F_Text_22646E, SootopolisCity_Gym_B1F_Text_226495 - msgbox SootopolisCity_Gym_B1F_Text_2264BC, 6 - end - -SootopolisCity_Gym_B1F_EventScript_225CD0:: @ 8225CD0 - trainerbattle 0, TRAINER_CONNIE, 0, SootopolisCity_Gym_B1F_Text_225FBE, SootopolisCity_Gym_B1F_Text_225FEB - msgbox SootopolisCity_Gym_B1F_Text_225FFE, 6 - end - -SootopolisCity_Gym_B1F_EventScript_225CE7:: @ 8225CE7 - trainerbattle 0, TRAINER_BRIDGET, 0, SootopolisCity_Gym_B1F_Text_226061, SootopolisCity_Gym_B1F_Text_2260B6 - msgbox SootopolisCity_Gym_B1F_Text_2260D1, 6 - end - -SootopolisCity_Gym_B1F_EventScript_225CFE:: @ 8225CFE - trainerbattle 0, TRAINER_OLIVIA, 0, SootopolisCity_Gym_B1F_Text_226164, SootopolisCity_Gym_B1F_Text_2261A7 - msgbox SootopolisCity_Gym_B1F_Text_2261B5, 6 - end - -SootopolisCity_Gym_B1F_EventScript_225D15:: @ 8225D15 - trainerbattle 0, TRAINER_TIFFANY, 0, SootopolisCity_Gym_B1F_Text_2261F7, SootopolisCity_Gym_B1F_Text_226274 - msgbox SootopolisCity_Gym_B1F_Text_226286, 6 - end - -SootopolisCity_Gym_B1F_EventScript_225D2C:: @ 8225D2C - trainerbattle 0, TRAINER_BETHANY, 0, SootopolisCity_Gym_B1F_Text_2262F3, SootopolisCity_Gym_B1F_Text_22633B - msgbox SootopolisCity_Gym_B1F_Text_226341, 6 - end - -SootopolisCity_Gym_B1F_EventScript_225D43:: @ 8225D43 - trainerbattle 0, TRAINER_ANNIKA, 0, SootopolisCity_Gym_B1F_Text_226388, SootopolisCity_Gym_B1F_Text_2263BD - msgbox SootopolisCity_Gym_B1F_Text_2263F4, 6 - end - -SootopolisCity_Gym_B1F_EventScript_225D5A:: @ 8225D5A - trainerbattle 0, TRAINER_DAPHNE, 0, SootopolisCity_Gym_B1F_Text_225ED6, SootopolisCity_Gym_B1F_Text_225F35 - msgbox SootopolisCity_Gym_B1F_Text_225F67, 6 - end - -SootopolisCity_Gym_B1F_Text_225D71: @ 8225D71 - .string "I’ll show you the sublime techniques\n" - .string "I learned from our LEADER JUAN!$" - -SootopolisCity_Gym_B1F_Text_225DB6: @ 8225DB6 - .string "Please forgive me, JUAN…$" - -SootopolisCity_Gym_B1F_Text_225DCF: @ 8225DCF - .string "Watch what happens if you crack all\n" - .string "the floor tiles.$" - -SootopolisCity_Gym_B1F_Text_225E04: @ 8225E04 - .string "You came all the way here, but you won’t\n" - .string "get to see JUAN.\p" - .string "Not if you lose to me, you won’t!$" - -SootopolisCity_Gym_B1F_Text_225E60: @ 8225E60 - .string "You’re strong!\n" - .string "I was fooled by your cute looks!$" - -SootopolisCity_Gym_B1F_Text_225E90: @ 8225E90 - .string "You might be good enough to avoid\n" - .string "being wiped out in one hit by JUAN.$" - -SootopolisCity_Gym_B1F_Text_225ED6: @ 8225ED6 - .string "The sight of JUAN conducting\n" - .string "a battle…\p" - .string "The very beauty of it compelled me to\n" - .string "become a TRAINER.$" - -SootopolisCity_Gym_B1F_Text_225F35: @ 8225F35 - .string "You battled with more beauty than\n" - .string "I could muster…$" - -SootopolisCity_Gym_B1F_Text_225F67: @ 8225F67 - .string "The grace you bring to battle is\n" - .string "fabulous.\p" - .string "Oh… I’m so fortunate to have found\n" - .string "POKéMON.$" - -SootopolisCity_Gym_B1F_Text_225FBE: @ 8225FBE - .string "I should teach you how harsh battles\n" - .string "can be.$" - -SootopolisCity_Gym_B1F_Text_225FEB: @ 8225FEB - .string "Oh.\n" - .string "You’re strong.$" - -SootopolisCity_Gym_B1F_Text_225FFE: @ 8225FFE - .string "I’ll tell you something good.\p" - .string "If you want to reach JUAN, you\n" - .string "need to walk on each floor tile once.$" - -SootopolisCity_Gym_B1F_Text_226061: @ 8226061 - .string "The POKéMON GYM of the highest level\n" - .string "in the HOENN region…\p" - .string "That’s the SOOTOPOLIS GYM.$" - -SootopolisCity_Gym_B1F_Text_2260B6: @ 82260B6 - .string "What a high level you are!$" - -SootopolisCity_Gym_B1F_Text_2260D1: @ 82260D1 - .string "Rather than being satisfied by being\n" - .string "in a strong GYM, I imagine training in\l" - .string "other places will make you stronger.\l" - .string "But above all, it looks more fun.$" - -SootopolisCity_Gym_B1F_Text_226164: @ 8226164 - .string "I train my POKéMON together with\n" - .string "JUAN.\p" - .string "Don’t think I’m a pushover.$" - -SootopolisCity_Gym_B1F_Text_2261A7: @ 82261A7 - .string "I was beaten…$" - -SootopolisCity_Gym_B1F_Text_2261B5: @ 82261B5 - .string "I think you have potential.\n" - .string "Why don’t you stay and train with us?$" - -SootopolisCity_Gym_B1F_Text_2261F7: @ 82261F7 - .string "A graceful glide across the ice while\n" - .string "crossing no lines…\p" - .string "A TRAINER putting on that performance\n" - .string "would be elegantly beautiful!$" - -SootopolisCity_Gym_B1F_Text_226274: @ 8226274 - .string "Well, excuse me?!$" - -SootopolisCity_Gym_B1F_Text_226286: @ 8226286 - .string "This is really obvious, but how strong\n" - .string "you are as a TRAINER has nothing to do\l" - .string "with how young or old you are.$" - -SootopolisCity_Gym_B1F_Text_2262F3: @ 82262F3 - .string "When I’m with my POKéMON, the time\n" - .string "flies by before you can say, “Oops!â€$" - -SootopolisCity_Gym_B1F_Text_22633B: @ 822633B - .string "Oops!$" - -SootopolisCity_Gym_B1F_Text_226341: @ 8226341 - .string "I wish I could forget about lost causes\n" - .string "before I can manage an “Oops!â€$" - -SootopolisCity_Gym_B1F_Text_226388: @ 8226388 - .string "I can battle with really rare POKéMON\n" - .string "if you’d like.$" - -SootopolisCity_Gym_B1F_Text_2263BD: @ 82263BD - .string "Oh, there now! Did you have a good look\n" - .string "at my POKéMON?$" - -SootopolisCity_Gym_B1F_Text_2263F4: @ 82263F4 - .string "I came to this GYM because JUAN\n" - .string "praised me for my darling POKéMON.\p" - .string "Oh, if only I’d met JUAN years ago\n" - .string "when I was younger…$" - -SootopolisCity_Gym_B1F_Text_22646E: @ 822646E - .string "Giggle…\n" - .string "Your grim look is so charming.$" - -SootopolisCity_Gym_B1F_Text_226495: @ 8226495 - .string "Oh, dear.\n" - .string "I went much too easy on you.$" - -SootopolisCity_Gym_B1F_Text_2264BC: @ 82264BC - .string "You couldn’t lay a finger on JUAN,\n" - .string "I’m sure. Giggle…$" - diff --git a/data/scripts/maps/SootopolisCity_House1.inc b/data/scripts/maps/SootopolisCity_House1.inc deleted file mode 100644 index 7c898a0b2..000000000 --- a/data/scripts/maps/SootopolisCity_House1.inc +++ /dev/null @@ -1,45 +0,0 @@ -SootopolisCity_House1_MapScripts:: @ 822694C - .byte 0 - -SootopolisCity_House1_EventScript_22694D:: @ 822694D - lock - faceplayer - checkflag FLAG_0x079 - goto_eq SootopolisCity_House1_EventScript_226984 - msgbox SootopolisCity_House1_Text_2269A1, 4 - giveitem_std ITEM_TM31 - compare VAR_RESULT, 0 - goto_eq SootopolisCity_House1_EventScript_272054 - setflag FLAG_0x079 - msgbox SootopolisCity_House1_Text_226A13, 4 - release - end - -SootopolisCity_House1_EventScript_226984:: @ 8226984 - msgbox SootopolisCity_House1_Text_226A13, 4 - release - end - -SootopolisCity_House1_EventScript_22698E:: @ 822698E - lock - faceplayer - waitse - playmoncry SPECIES_KECLEON, 0 - msgbox SootopolisCity_House1_Text_226A60, 4 - waitmoncry - release - end - -SootopolisCity_House1_Text_2269A1: @ 82269A1 - .string "For thirty years I’ve remained in\n" - .string "SOOTOPOLIS honing my skills.\p" - .string "I developed a shattering TM.\n" - .string "I bequeath it to you!$" - -SootopolisCity_House1_Text_226A13: @ 8226A13 - .string "TM31 contains BRICK BREAK! It’s a move\n" - .string "so horrible that I can’t describe it.$" - -SootopolisCity_House1_Text_226A60: @ 8226A60 - .string "KECLEON: Puu puhyaah.$" - diff --git a/data/scripts/maps/SootopolisCity_House2.inc b/data/scripts/maps/SootopolisCity_House2.inc deleted file mode 100644 index 82270ca56..000000000 --- a/data/scripts/maps/SootopolisCity_House2.inc +++ /dev/null @@ -1,36 +0,0 @@ -SootopolisCity_House2_MapScripts:: @ 8226A76 - .byte 0 - -SootopolisCity_House2_EventScript_226A77:: @ 8226A77 - lock - faceplayer - msgbox SootopolisCity_House2_Text_226AAB, 5 - compare VAR_RESULT, 1 - call_if 1, SootopolisCity_House2_EventScript_226A99 - compare VAR_RESULT, 0 - call_if 1, SootopolisCity_House2_EventScript_226AA2 - release - end - -SootopolisCity_House2_EventScript_226A99:: @ 8226A99 - msgbox SootopolisCity_House2_Text_226AF1, 4 - return - -SootopolisCity_House2_EventScript_226AA2:: @ 8226AA2 - msgbox SootopolisCity_House2_Text_226B41, 4 - return - -SootopolisCity_House2_Text_226AAB: @ 8226AAB - .string "MT. PYRE…\p" - .string "At its peak are two orbs placed side\n" - .string "by side. Did you know?$" - -SootopolisCity_House2_Text_226AF1: @ 8226AF1 - .string "Yes, two orbs side by side…\p" - .string "The sight of them together…\n" - .string "It is somehow soothing…$" - -SootopolisCity_House2_Text_226B41: @ 8226B41 - .string "Is that so?\n" - .string "Perhaps you ought to visit and see…$" - diff --git a/data/scripts/maps/SootopolisCity_House3.inc b/data/scripts/maps/SootopolisCity_House3.inc deleted file mode 100644 index 415f90642..000000000 --- a/data/scripts/maps/SootopolisCity_House3.inc +++ /dev/null @@ -1,43 +0,0 @@ -SootopolisCity_House3_MapScripts:: @ 8226B71 - .byte 0 - -SootopolisCity_House3_EventScript_226B72:: @ 8226B72 - lock - faceplayer - msgbox SootopolisCity_House3_Text_226BA4, 5 - compare VAR_RESULT, 1 - goto_eq SootopolisCity_House3_EventScript_226B91 - msgbox SootopolisCity_House3_Text_226C44, 4 - release - end - -SootopolisCity_House3_EventScript_226B91:: @ 8226B91 - msgbox SootopolisCity_House3_Text_226C20, 4 - release - end - -SootopolisCity_House3_EventScript_226B9B:: @ 8226B9B - msgbox SootopolisCity_House3_Text_226C9C, 2 - end - -SootopolisCity_House3_Text_226BA4: @ 8226BA4 - .string "You’re a POKéMON TRAINER, aren’t you?\p" - .string "SOOTOPOLIS’s JUAN has many fans.\n" - .string "Even more than his student WALLACE!\p" - .string "Do you have any?$" - -SootopolisCity_House3_Text_226C20: @ 8226C20 - .string "Oh, then you must be pretty strong.$" - -SootopolisCity_House3_Text_226C44: @ 8226C44 - .string "Oh, dear…\n" - .string "That’s a little lonesome.\p" - .string "Try working a little harder to get\n" - .string "a fan following.$" - -SootopolisCity_House3_Text_226C9C: @ 8226C9C - .string "Dedicated fans come over from even\n" - .string "outside of HOENN.\p" - .string "It was really wild when I went to the\n" - .string "TRAINER FAN CLUB in LILYCOVE.$" - diff --git a/data/scripts/maps/SootopolisCity_House4.inc b/data/scripts/maps/SootopolisCity_House4.inc deleted file mode 100644 index e34e6991d..000000000 --- a/data/scripts/maps/SootopolisCity_House4.inc +++ /dev/null @@ -1,39 +0,0 @@ -SootopolisCity_House4_MapScripts:: @ 8226D15 - .byte 0 - -SootopolisCity_House4_EventScript_226D16:: @ 8226D16 - msgbox SootopolisCity_House4_Text_226D3B, 2 - end - -SootopolisCity_House4_EventScript_226D1F:: @ 8226D1F - msgbox SootopolisCity_House4_Text_226DEA, 2 - end - -SootopolisCity_House4_EventScript_226D28:: @ 8226D28 - lock - faceplayer - waitse - playmoncry SPECIES_AZUMARILL, 0 - msgbox SootopolisCity_House4_Text_226E7F, 4 - waitmoncry - release - end - -SootopolisCity_House4_Text_226D3B: @ 8226D3B - .string "Listen up, and I’ll tell you something\n" - .string "good.\p" - .string "There’s supposed to be an ancient\n" - .string "ruin in the sea around here.\p" - .string "There could be treasures just waiting\n" - .string "to be discovered down there.$" - -SootopolisCity_House4_Text_226DEA: @ 8226DEA - .string "Ancient treasures…\p" - .string "It would be nice if they existed, but\n" - .string "even if they didn’t, it would be so\l" - .string "beautiful to take an underwater\l" - .string "stroll with my POKéMON.$" - -SootopolisCity_House4_Text_226E7F: @ 8226E7F - .string "AZUMARILL: Marurii.$" - diff --git a/data/scripts/maps/SootopolisCity_House5.inc b/data/scripts/maps/SootopolisCity_House5.inc deleted file mode 100644 index 51da02de1..000000000 --- a/data/scripts/maps/SootopolisCity_House5.inc +++ /dev/null @@ -1,20 +0,0 @@ -SootopolisCity_House5_MapScripts:: @ 8226E93 - .byte 0 - -SootopolisCity_House5_EventScript_226E94:: @ 8226E94 - msgbox SootopolisCity_House5_Text_226EA6, 2 - end - -SootopolisCity_House5_EventScript_226E9D:: @ 8226E9D - msgbox SootopolisCity_House5_Text_226F35, 2 - end - -SootopolisCity_House5_Text_226EA6: @ 8226EA6 - .string "There appears to be some connection\n" - .string "between SOOTOPOLIS and MT. PYRE.\p" - .string "My friends and I did some research on\n" - .string "it at the lab where I used to work.$" - -SootopolisCity_House5_Text_226F35: @ 8226F35 - .string "My big brother used to study the sea.$" - diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/scripts/maps/SootopolisCity_House6.inc deleted file mode 100644 index 38c8456a3..000000000 --- a/data/scripts/maps/SootopolisCity_House6.inc +++ /dev/null @@ -1,56 +0,0 @@ -SootopolisCity_House6_MapScripts:: @ 8226F5B - .byte 0 - -SootopolisCity_House6_EventScript_226F5C:: @ 8226F5C - lock - faceplayer - checkflag FLAG_0x0F5 - goto_eq SootopolisCity_House6_EventScript_226FA3 - msgbox SootopolisCity_House6_Text_226FC3, 5 - compare VAR_RESULT, 0 - call_if 1, SootopolisCity_House6_EventScript_226F99 - msgbox SootopolisCity_House6_Text_227034, 4 - givedecoration_std 117 - compare VAR_RESULT, 0 - goto_eq SootopolisCity_House6_EventScript_226FAD - setflag FLAG_0x0F5 - release - end - -SootopolisCity_House6_EventScript_226F99:: @ 8226F99 - msgbox SootopolisCity_House6_Text_22708F, 4 - release - end - -SootopolisCity_House6_EventScript_226FA3:: @ 8226FA3 - msgbox SootopolisCity_House6_Text_2270B7, 4 - release - end - -SootopolisCity_House6_EventScript_226FAD:: @ 8226FAD - bufferdecorationname 1, 117 - msgbox gUnknown_08272B1A, 4 - msgbox SootopolisCity_House6_Text_22704A, 4 - release - end - -SootopolisCity_House6_Text_226FC3: @ 8226FC3 - .string "Hello! You’re our first guest in\n" - .string "a good while.\p" - .string "You’ve brightened up my day, so I’ll\n" - .string "give you a big WAILMER DOLL.$" - -SootopolisCity_House6_Text_227034: @ 8227034 - .string "Take good care of it!$" - -SootopolisCity_House6_Text_22704A: @ 822704A - .string "Oh, you want it, but not right now?\n" - .string "Okay, then I’ll hold it for you.$" - -SootopolisCity_House6_Text_22708F: @ 822708F - .string "Are you sure?\n" - .string "You don’t want this DOLL?$" - -SootopolisCity_House6_Text_2270B7: @ 82270B7 - .string "I love plush DOLLS!$" - diff --git a/data/scripts/maps/SootopolisCity_House7.inc b/data/scripts/maps/SootopolisCity_House7.inc deleted file mode 100644 index 9df9cde0b..000000000 --- a/data/scripts/maps/SootopolisCity_House7.inc +++ /dev/null @@ -1,26 +0,0 @@ -SootopolisCity_House7_MapScripts:: @ 82270CB - .byte 0 - -SootopolisCity_House7_EventScript_2270CC:: @ 82270CC - msgbox SootopolisCity_House7_Text_2270DE, 2 - end - -SootopolisCity_House7_EventScript_2270D5:: @ 82270D5 - msgbox SootopolisCity_House7_Text_227190, 2 - end - -SootopolisCity_House7_Text_2270DE: @ 82270DE - .string "An underwater volcano erupted and\n" - .string "forced itself up from the depths.\p" - .string "Its crater emerged from the sea and\n" - .string "became filled with rainwater.\p" - .string "That’s how SOOTOPOLIS CITY came into\n" - .string "being.$" - -SootopolisCity_House7_Text_227190: @ 8227190 - .string "The cave that links SOOTOPOLIS and\n" - .string "the outside world…\p" - .string "It seems as if the cave was made to\n" - .string "keep something from getting out.\p" - .string "Or am I just imagining things?$" - diff --git a/data/scripts/maps/SootopolisCity_LotadAndSeedotHouse.inc b/data/scripts/maps/SootopolisCity_LotadAndSeedotHouse.inc deleted file mode 100644 index 26a322b89..000000000 --- a/data/scripts/maps/SootopolisCity_LotadAndSeedotHouse.inc +++ /dev/null @@ -1,210 +0,0 @@ -SootopolisCity_LotadAndSeedotHouse_MapScripts:: @ 822722A - .byte 0 - -SootopolisCity_LotadAndSeedotHouse_EventScript_22722B:: @ 822722B - special GetSeedotSizeRecordInfo - lock - faceplayer - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227369, 4 - special sub_81B94B0 - waitstate - copyvar VAR_RESULT, VAR_0x8004 - compare VAR_RESULT, 255 - goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227272 - special CompareSeedotSize - compare VAR_RESULT, 1 - goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_22727C - compare VAR_RESULT, 2 - goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227286 - compare VAR_RESULT, 3 - goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227290 - release - end - -SootopolisCity_LotadAndSeedotHouse_EventScript_227272:: @ 8227272 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_2275BC, 4 - release - end - -SootopolisCity_LotadAndSeedotHouse_EventScript_22727C:: @ 822727C - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227584, 4 - release - end - -SootopolisCity_LotadAndSeedotHouse_EventScript_227286:: @ 8227286 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227544, 4 - release - end - -SootopolisCity_LotadAndSeedotHouse_EventScript_227290:: @ 8227290 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227480, 4 - giveitem_std ITEM_ELIXIR - compare VAR_RESULT, 0 - goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_2272B2 - closemessage - release - end - -SootopolisCity_LotadAndSeedotHouse_EventScript_2272B2:: @ 82272B2 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227524, 4 - release - end - -SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC:: @ 82272BC - special GetLotadSizeRecordInfo - lock - faceplayer - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227676, 4 - special sub_81B94B0 - waitstate - copyvar VAR_RESULT, VAR_0x8004 - compare VAR_RESULT, 255 - goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227303 - special CompareLotadSize - compare VAR_RESULT, 1 - goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_22730D - compare VAR_RESULT, 2 - goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227317 - compare VAR_RESULT, 3 - goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227321 - release - end - -SootopolisCity_LotadAndSeedotHouse_EventScript_227303:: @ 8227303 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227896, 4 - release - end - -SootopolisCity_LotadAndSeedotHouse_EventScript_22730D:: @ 822730D - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227867, 4 - release - end - -SootopolisCity_LotadAndSeedotHouse_EventScript_227317:: @ 8227317 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_22782A, 4 - release - end - -SootopolisCity_LotadAndSeedotHouse_EventScript_227321:: @ 8227321 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_22776C, 4 - giveitem_std ITEM_ELIXIR - compare VAR_RESULT, 0 - goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227343 - closemessage - release - end - -SootopolisCity_LotadAndSeedotHouse_EventScript_227343:: @ 8227343 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_22780A, 4 - release - end - -SootopolisCity_LotadAndSeedotHouse_EventScript_22734D:: @ 822734D - special GetSeedotSizeRecordInfo - lockall - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227617, 4 - releaseall - end - -SootopolisCity_LotadAndSeedotHouse_EventScript_22735B:: @ 822735B - special GetLotadSizeRecordInfo - lockall - msgbox SootopolisCity_LotadAndSeedotHouse_Text_2278F2, 4 - releaseall - end - -SootopolisCity_LotadAndSeedotHouse_Text_227369: @ 8227369 - .string "Do you know the POKéMON SEEDOT?\n" - .string "It’s hardly ever seen in SOOTOPOLIS.\p" - .string "Anyway, I love big SEEDOT.\n" - .string "The bigger the better.\p" - .string "But my younger brother, he says that\n" - .string "LOTAD is bigger.\p" - .string "That’s silly.\n" - .string "SEEDOT has to be bigger than that!\p" - .string "Huh? Do you have a SEEDOT with you?\n" - .string "P-p-please, show me!$" - -SootopolisCity_LotadAndSeedotHouse_Text_227480: @ 8227480 - .string "{STR_VAR_2} inches!\n" - .string "Oh, my gosh, this is a big one!\p" - .string "It might even beat the big LOTAD\n" - .string "my younger brother saw!\p" - .string "Thanks for showing me.\n" - .string "This is my thanks!$" - -SootopolisCity_LotadAndSeedotHouse_Text_22750E: @ 822750E - .string "{PLAYER} received a POTION.$" - -SootopolisCity_LotadAndSeedotHouse_Text_227524: @ 8227524 - .string "Hunh?\n" - .string "Your BAG is crammed full.$" - -SootopolisCity_LotadAndSeedotHouse_Text_227544: @ 8227544 - .string "{STR_VAR_2} inches, is it?\p" - .string "Hmm… I’ve seen a bigger SEEDOT\n" - .string "than this one.$" - -SootopolisCity_LotadAndSeedotHouse_Text_227584: @ 8227584 - .string "Oh, now this is quite something…\n" - .string "But it’s not a SEEDOT!$" - -SootopolisCity_LotadAndSeedotHouse_Text_2275BC: @ 82275BC - .string "You don’t have a big SEEDOT?\n" - .string "That’s too bad…\p" - .string "If you get a big SEEDOT, please\n" - .string "come show me.$" - -SootopolisCity_LotadAndSeedotHouse_Text_227617: @ 8227617 - .string "The biggest SEEDOT in history!\n" - .string "{STR_VAR_2}’s {STR_VAR_3}-inch giant!\p" - .string "A SEEDOT bigger than a LOTAD\n" - .string "always wanted!$" - -SootopolisCity_LotadAndSeedotHouse_Text_227676: @ 8227676 - .string "Do you know the POKéMON LOTAD?\n" - .string "It’s rarely seen in SOOTOPOLIS.\p" - .string "I love, I mean love, big LOTAD!\p" - .string "My big brother says that SEEDOT is\n" - .string "bigger.\p" - .string "But that’s wrong! Everyone knows that\n" - .string "LOTAD is a lot bigger.\p" - .string "Hunh? Do you have a LOTAD?\n" - .string "P-p-please show me!$" - -SootopolisCity_LotadAndSeedotHouse_Text_22776C: @ 822776C - .string "{STR_VAR_2} inches!\n" - .string "Wow, that is big!\p" - .string "It might be even bigger than the huge\n" - .string "SEEDOT my big brother saw.\p" - .string "Thanks for showing me!\n" - .string "This is my thanks!$" - -SootopolisCity_LotadAndSeedotHouse_Text_2277F4: @ 82277F4 - .string "{PLAYER} received a POTION.$" - -SootopolisCity_LotadAndSeedotHouse_Text_22780A: @ 822780A - .string "Hunh?\n" - .string "Your BAG is crammed full.$" - -SootopolisCity_LotadAndSeedotHouse_Text_22782A: @ 822782A - .string "{STR_VAR_2} inches?\p" - .string "Hmm… I’ve seen a bigger LOTAD\n" - .string "than this one here.$" - -SootopolisCity_LotadAndSeedotHouse_Text_227867: @ 8227867 - .string "Well, isn’t this something!\n" - .string "But it’s no LOTAD!$" - -SootopolisCity_LotadAndSeedotHouse_Text_227896: @ 8227896 - .string "Don’t you have a big LOTAD?\n" - .string "How disappointing…\p" - .string "If you get a big LOTAD, please\n" - .string "come show me!$" - -SootopolisCity_LotadAndSeedotHouse_Text_2278F2: @ 82278F2 - .string "The biggest LOTAD in history!\n" - .string "{STR_VAR_2}’s {STR_VAR_3}-inch colossus!\p" - .string "A LOTAD bigger than a SEEDOT\n" - .string "always wanted!$" - diff --git a/data/scripts/maps/SootopolisCity_Mart.inc b/data/scripts/maps/SootopolisCity_Mart.inc deleted file mode 100644 index 26ab5497c..000000000 --- a/data/scripts/maps/SootopolisCity_Mart.inc +++ /dev/null @@ -1,80 +0,0 @@ -SootopolisCity_Mart_MapScripts:: @ 8226794 - .byte 0 - -SootopolisCity_Mart_EventScript_226795:: @ 8226795 - lock - faceplayer - message gUnknown_08272A21 - waitmessage - pokemart SootopolisCity_Mart_Pokemart_2267AC - msgbox gUnknown_08272A3F, 4 - release - end - -SootopolisCity_Mart_Pokemart_2267AC: @ 82267AC - .2byte ITEM_ULTRA_BALL - .2byte ITEM_HYPER_POTION - .2byte ITEM_MAX_POTION - .2byte ITEM_FULL_HEAL - .2byte ITEM_REVIVE - .2byte ITEM_MAX_REPEL - .2byte ITEM_X_ATTACK - .2byte ITEM_X_DEFEND - .2byte ITEM_SHADOW_MAIL - .2byte ITEM_NONE - release - end - -SootopolisCity_Mart_EventScript_2267C2:: @ 82267C2 - lock - faceplayer - compare VAR_0x40CA, 2 - goto_if 4, SootopolisCity_Mart_EventScript_2267E2 - checkflag FLAG_0x081 - goto_if 0, SootopolisCity_Mart_EventScript_2267E2 - msgbox SootopolisCity_Mart_Text_22685D, 4 - release - end - -SootopolisCity_Mart_EventScript_2267E2:: @ 82267E2 - msgbox SootopolisCity_Mart_Text_226816, 4 - release - end - -SootopolisCity_Mart_EventScript_2267EC:: @ 82267EC - lock - faceplayer - compare VAR_0x40CA, 2 - goto_if 4, SootopolisCity_Mart_EventScript_22680C - checkflag FLAG_0x081 - goto_if 0, SootopolisCity_Mart_EventScript_22680C - msgbox SootopolisCity_Mart_Text_226928, 4 - release - end - -SootopolisCity_Mart_EventScript_22680C:: @ 822680C - msgbox SootopolisCity_Mart_Text_2268AF, 4 - release - end - -SootopolisCity_Mart_Text_226816: @ 8226816 - .string "PP UP is great!\p" - .string "It raises the POWER POINTS, the PP,\n" - .string "of a POKéMON move.$" - -SootopolisCity_Mart_Text_22685D: @ 822685D - .string "What…\n" - .string "What is happening?\p" - .string "I really want to know, but it’s too\n" - .string "scary to go outside.$" - -SootopolisCity_Mart_Text_2268AF: @ 82268AF - .string "Do you know FULL RESTORE?\p" - .string "Full restoration of HP!\n" - .string "Eradication of all status problems!\p" - .string "It’s truly an item of your dreams!$" - -SootopolisCity_Mart_Text_226928: @ 8226928 - .string "This weather…\n" - .string "Did something awaken?$" - diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc deleted file mode 100644 index cdcf5866c..000000000 --- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc +++ /dev/null @@ -1,241 +0,0 @@ -SootopolisCity_MysteryEventsHouse_1F_MapScripts:: @ 8227953 - map_script 3, SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E - map_script 2, SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D - .byte 0 - -SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E - setvar VAR_0x8004, 16 - special sub_81A1780 - compare VAR_RESULT, 0 - call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D - compare VAR_0x40C0, 0 - call_if 5, SootopolisCity_MysteryEventsHouse_1F_EventScript_227991 - end - -SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D:: @ 822797D - setvar VAR_TEMP_1, 1 - setobjectxyperm 1, 3, 2 - setobjectmovementtype 1, 8 - setmaplayoutindex 441 - return - -SootopolisCity_MysteryEventsHouse_1F_EventScript_227991:: @ 8227991 - setobjectxyperm 1, 2, 2 - setobjectmovementtype 1, 10 - return - -SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D: @ 822799D - map_script_2 VAR_0x40C0, 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7 - map_script_2 VAR_0x40C0, 2, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7 - map_script_2 VAR_0x40C0, 3, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7 - .2byte 0 - -SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7 - lockall - applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_227A1F - waitmovement 0 - applymovement 1, SootopolisCity_MysteryEventsHouse_1F_Movement_227A21 - waitmovement 0 - moveobjectoffscreen 1 - applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6 - waitmovement 0 - compare VAR_0x40C0, 1 - call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04 - compare VAR_0x40C0, 2 - call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A0D - compare VAR_0x40C0, 3 - call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16 - special LoadPlayerParty - setvar VAR_0x40C0, 0 - releaseall - end - -SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04:: @ 8227A04 - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227DB8, 4 - return - -SootopolisCity_MysteryEventsHouse_1F_EventScript_227A0D:: @ 8227A0D - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227E03, 4 - return - -SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16:: @ 8227A16 - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D5B, 4 - return - -SootopolisCity_MysteryEventsHouse_1F_Movement_227A1F: @ 8227A1F - walk_down - step_end - -SootopolisCity_MysteryEventsHouse_1F_Movement_227A21: @ 8227A21 - walk_right - walk_in_place_fastest_down - step_end - -SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24:: @ 8227A24 - lock - faceplayer - setvar VAR_0x8004, 16 - special sub_81A1780 - compare VAR_RESULT, 1 - goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E - compare VAR_TEMP_1, 1 - goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58 - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227B46, 4 - release - end - -SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E:: @ 8227A4E - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227B46, 4 - release - end - -SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58 - special SavePlayerParty - special sub_8139238 - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227BFC, 5 - compare VAR_RESULT, 0 - goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 - call SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF - compare VAR_RESULT, 0 - goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227CEB, 5 - compare VAR_RESULT, 0 - goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 - special LoadPlayerParty - call SootopolisCity_MysteryEventsHouse_1F_EventScript_27134F - compare VAR_RESULT, 0 - goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 - special SavePlayerParty - special sub_80F94E8 - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D21, 4 - closemessage - compare VAR_FACING, 2 - call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227AFE - compare VAR_FACING, 4 - call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227B10 - compare VAR_FACING, 3 - call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22 - warp MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F, 255, 3, 1 - waitstate - release - end - -SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2:: @ 8227AE2 - special LoadPlayerParty - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C44, 4 - release - end - -SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF:: @ 8227AEF - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C84, 4 - fadescreen 1 - special sub_80F9438 - waitstate - return - -SootopolisCity_MysteryEventsHouse_1F_EventScript_227AFE:: @ 8227AFE - applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_227B40 - applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_227B34 - waitmovement 0 - return - -SootopolisCity_MysteryEventsHouse_1F_EventScript_227B10:: @ 8227B10 - applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_227B43 - applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_227B38 - waitmovement 0 - return - -SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22:: @ 8227B22 - applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_227B40 - applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_227B3C - waitmovement 0 - return - -SootopolisCity_MysteryEventsHouse_1F_Movement_227B34: @ 8227B34 - delay_16 - walk_up - walk_up - step_end - -SootopolisCity_MysteryEventsHouse_1F_Movement_227B38: @ 8227B38 - delay_16 - walk_right - walk_up - step_end - -SootopolisCity_MysteryEventsHouse_1F_Movement_227B3C: @ 8227B3C - delay_16 - walk_left - walk_up - step_end - -SootopolisCity_MysteryEventsHouse_1F_Movement_227B40: @ 8227B40 - walk_left - walk_in_place_fastest_right - step_end - -SootopolisCity_MysteryEventsHouse_1F_Movement_227B43: @ 8227B43 - walk_right - walk_in_place_fastest_left - step_end - -SootopolisCity_MysteryEventsHouse_1F_Text_227B46: @ 8227B46 - .string "When I was young, I traveled the world\n" - .string "as a POKéMON TRAINER.\p" - .string "Now that I’ve become an old buzzard,\n" - .string "my only amusement is watching young\l" - .string "TRAINERS battle.$" - -SootopolisCity_MysteryEventsHouse_1F_Text_227BDD: @ 8227BDD - .string "The door appears to be locked.$" - -SootopolisCity_MysteryEventsHouse_1F_Text_227BFC: @ 8227BFC - .string "A TRAINER named {STR_VAR_1}\n" - .string "is visiting my home.\p" - .string "Would you like to challenge\n" - .string "{STR_VAR_1}?$" - -SootopolisCity_MysteryEventsHouse_1F_Text_227C44: @ 8227C44 - .string "You won’t battle? I’m disappointed\n" - .string "that I can’t see you battle…$" - -SootopolisCity_MysteryEventsHouse_1F_Text_227C84: @ 8227C84 - .string "Oh, good, good!\p" - .string "But my house isn’t all that sturdy.\p" - .string "Could I ask you to keep it down to\n" - .string "a 3-on-3 match?$" - -SootopolisCity_MysteryEventsHouse_1F_Text_227CEB: @ 8227CEB - .string "Before you two battle, you should\n" - .string "save your progress.$" - -SootopolisCity_MysteryEventsHouse_1F_Text_227D21: @ 8227D21 - .string "I hope to see a good match!$" - -SootopolisCity_MysteryEventsHouse_1F_Text_227D3D: @ 8227D3D - .string "{STR_VAR_1}$" - -SootopolisCity_MysteryEventsHouse_B1F_Text_227D40: @ 8227D40 - .string "The match ended up a draw.$" - -SootopolisCity_MysteryEventsHouse_1F_Text_227D5B: @ 8227D5B - .string "So, it became a standoff.\p" - .string "It was a brilliant match in which\n" - .string "neither side conceded a step!$" - -SootopolisCity_MysteryEventsHouse_1F_Text_227DB5: @ 8227DB5 - .string "{STR_VAR_1}$" - -SootopolisCity_MysteryEventsHouse_1F_Text_227DB8: @ 8227DB8 - .string "That was superlative!\p" - .string "Why, it was like seeing myself in\n" - .string "my youth again!$" - -SootopolisCity_MysteryEventsHouse_1F_Text_227E00: @ 8227E00 - .string "{STR_VAR_1}$" - -SootopolisCity_MysteryEventsHouse_1F_Text_227E03: @ 8227E03 - .string "Ah, too bad for you!\p" - .string "But it was a good match.\n" - .string "I hope you can win next time.$" - diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc deleted file mode 100644 index b29ef99a5..000000000 --- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc +++ /dev/null @@ -1,78 +0,0 @@ -SootopolisCity_MysteryEventsHouse_B1F_MapScripts:: @ 8227E4F - map_script 3, SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A - map_script 2, SootopolisCity_MysteryEventsHouse_B1F_MapScript2_227E5E - .byte 0 - -SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A: @ 8227E5A - special sub_8162794 - end - -SootopolisCity_MysteryEventsHouse_B1F_MapScript2_227E5E: @ 8227E5E - map_script_2 VAR_TEMP_1, 0, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68 - .2byte 0 - -SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68 - lockall - applymovement 255, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF3 - waitmovement 0 - special sub_8165360 - msgbox 0x2021fc4, 4 - closemessage - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - special sub_8163AC4 - waitstate - compare VAR_RESULT, 3 - call_if 1, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF - compare VAR_RESULT, 1 - call_if 1, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EDD - compare VAR_RESULT, 2 - call_if 1, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8 - closemessage - special HealPlayerParty - applymovement 255, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF9 - waitmovement 0 - special LoadPlayerParty - setvar VAR_TEMP_1, 1 - warp MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F, 255, 3, 1 - waitstate - releaseall - end - -SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF:: @ 8227ECF - setvar VAR_0x40C0, 3 - msgbox SootopolisCity_MysteryEventsHouse_B1F_Text_227D40, 4 - return - -SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EDD:: @ 8227EDD - setvar VAR_0x40C0, 1 - special ShowFieldMessageStringVar4 - waitmessage - waitbuttonpress - return - -SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8:: @ 8227EE8 - setvar VAR_0x40C0, 2 - special ShowFieldMessageStringVar4 - waitmessage - waitbuttonpress - return - -SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF3: @ 8227EF3 - walk_down - walk_down - walk_down - walk_right - walk_right - step_end - -SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF9: @ 8227EF9 - walk_left - walk_left - walk_up - walk_up - walk_up - walk_up - delay_8 - step_end - diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc deleted file mode 100644 index fcb1b5863..000000000 --- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc +++ /dev/null @@ -1,74 +0,0 @@ -SootopolisCity_PokemonCenter_1F_MapScripts:: @ 82264F1 - map_script 3, SootopolisCity_PokemonCenter_1F_MapScript1_2264FC - map_script 5, SootopolisCity_PokemonCenter_1F_MapScript1_277C30 - .byte 0 - -SootopolisCity_PokemonCenter_1F_MapScript1_2264FC: @ 82264FC - setrespawn 10 - end - -SootopolisCity_PokemonCenter_1F_EventScript_226500:: @ 8226500 - setvar VAR_0x800B, 1 - call SootopolisCity_PokemonCenter_1F_EventScript_27191E - waitmessage - waitbuttonpress - release - end - -SootopolisCity_PokemonCenter_1F_EventScript_22650E:: @ 822650E - lock - faceplayer - compare VAR_0x40CA, 2 - goto_if 4, SootopolisCity_PokemonCenter_1F_EventScript_22652E - checkflag FLAG_0x081 - goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_22652E - msgbox SootopolisCity_PokemonCenter_1F_Text_22664B, 4 - release - end - -SootopolisCity_PokemonCenter_1F_EventScript_22652E:: @ 822652E - msgbox SootopolisCity_PokemonCenter_1F_Text_226562, 4 - release - end - -SootopolisCity_PokemonCenter_1F_EventScript_226538:: @ 8226538 - lock - faceplayer - compare VAR_0x40CA, 2 - goto_if 4, SootopolisCity_PokemonCenter_1F_EventScript_226558 - checkflag FLAG_0x081 - goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_226558 - msgbox SootopolisCity_PokemonCenter_1F_Text_22672F, 4 - release - end - -SootopolisCity_PokemonCenter_1F_EventScript_226558:: @ 8226558 - msgbox SootopolisCity_PokemonCenter_1F_Text_2266B9, 4 - release - end - -SootopolisCity_PokemonCenter_1F_Text_226562: @ 8226562 - .string "WALLACE is rumored to be the toughest\n" - .string "TRAINER in the whole HOENN region.\p" - .string "This town’s GYM is led by the TRAINER\n" - .string "who taught WALLACE.\p" - .string "But the ELITE FOUR… They’re said to be\n" - .string "even stronger than WALLACE’s mentor.\p" - .string "How strong could they be?$" - -SootopolisCity_PokemonCenter_1F_Text_22664B: @ 822664B - .string "Everyone in town has taken refuge\n" - .string "and won’t come out of their homes.\p" - .string "Even I would rather not venture\n" - .string "outside.$" - -SootopolisCity_PokemonCenter_1F_Text_2266B9: @ 82266B9 - .string "Whenever, wherever, and whatever\n" - .string "happens, I will always be friends with\l" - .string "POKéMON.\p" - .string "Because it’s fun to be with POKéMON!$" - -SootopolisCity_PokemonCenter_1F_Text_22672F: @ 822672F - .string "Aren’t POKéMON our friends?\p" - .string "Why are they going wild this way?$" - diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc b/data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc deleted file mode 100644 index 43d8a9d2f..000000000 --- a/data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc +++ /dev/null @@ -1,19 +0,0 @@ -SootopolisCity_PokemonCenter_2F_MapScripts:: @ 822676D - map_script 2, SootopolisCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, SootopolisCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, SootopolisCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, SootopolisCity_PokemonCenter_2F_MapScript1_276ACF - .byte 0 - -SootopolisCity_PokemonCenter_2F_EventScript_226782:: @ 8226782 - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 - end - -SootopolisCity_PokemonCenter_2F_EventScript_226788:: @ 8226788 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 - end - -SootopolisCity_PokemonCenter_2F_EventScript_22678E:: @ 822678E - call OldaleTown_PokemonCenter_2F_EventScript_2771DB - end - diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc deleted file mode 100644 index d303e0614..000000000 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ /dev/null @@ -1,55 +0,0 @@ -SouthernIsland_Exterior_MapScripts:: @ 82429C8 - map_script 3, SouthernIsland_Exterior_MapScript1_2429CE - .byte 0 - -SouthernIsland_Exterior_MapScript1_2429CE: @ 82429CE - setflag FLAG_LANDMARK_SOUTHERN_ISLAND - end - -SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2 - lock - faceplayer - msgbox SouthernIsland_Exterior_Text_2A69F1, 5 - compare VAR_RESULT, 0 - goto_eq SouthernIsland_Exterior_EventScript_242A17 - msgbox SouthernIsland_Exterior_Text_2A6A5D, 4 - closemessage - applymovement VAR_LAST_TALKED, SouthernIsland_Exterior_Movement_2725AA - waitmovement 0 - delay 30 - hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR - setvar VAR_0x8004, 2 - call SouthernIsland_Exterior_EventScript_272250 - warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 - waitstate - release - end - -SouthernIsland_Exterior_EventScript_242A17:: @ 8242A17 - msgbox SouthernIsland_Exterior_Text_2A6A82, 4 - release - end - -BattleFrontier_OutsideWest_EventScript_242A21:: @ 8242A21 - applymovement 255, BattleFrontier_OutsideWest_Movement_242A37 - waitmovement 0 - return - -BattleFrontier_OutsideWest_EventScript_242A2C:: @ 8242A2C - applymovement 255, BattleFrontier_OutsideWest_Movement_242A39 - waitmovement 0 - return - -BattleFrontier_OutsideWest_Movement_242A37: @ 8242A37 - walk_down - step_end - -BattleFrontier_OutsideWest_Movement_242A39: @ 8242A39 - walk_left - walk_in_place_fastest_down - step_end - -SouthernIsland_Exterior_EventScript_242A3C:: @ 8242A3C - msgbox SouthernIsland_Exterior_Text_2A6AD5, 3 - end - diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc deleted file mode 100644 index 432667cc9..000000000 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ /dev/null @@ -1,167 +0,0 @@ -SouthernIsland_Interior_MapScripts:: @ 8242A45 - map_script 5, SouthernIsland_Interior_MapScript1_242A50 - map_script 3, SouthernIsland_Interior_MapScript1_242A6E - .byte 0 - -SouthernIsland_Interior_MapScript1_242A50: @ 8242A50 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, SouthernIsland_Interior_EventScript_242A5A - end - -SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 7 - goto_if 5, SouthernIsland_Interior_EventScript_27374E - removeobject 2 - return - -SouthernIsland_Interior_MapScript1_242A6E: @ 8242A6E - compare VAR_0x40D5, 0 - call_if 1, SouthernIsland_Interior_EventScript_242A8A - compare VAR_0x40D5, 0 - call_if 5, SouthernIsland_Interior_EventScript_242A95 - call SouthernIsland_Interior_EventScript_242AA0 - end - -SouthernIsland_Interior_EventScript_242A8A:: @ 8242A8A - setvar VAR_OBJ_GFX_ID_1, 188 - setvar VAR_TEMP_4, 408 - return - -SouthernIsland_Interior_EventScript_242A95:: @ 8242A95 - setvar VAR_OBJ_GFX_ID_1, 187 - setvar VAR_TEMP_4, 407 - return - -SouthernIsland_Interior_EventScript_242AA0:: @ 8242AA0 - checkplayergender - compare VAR_RESULT, 0 - goto_eq SouthernIsland_Interior_EventScript_242AB8 - compare VAR_RESULT, 1 - goto_eq SouthernIsland_Interior_EventScript_242ABE - end - -SouthernIsland_Interior_EventScript_242AB8:: @ 8242AB8 - setvar VAR_OBJ_GFX_ID_0, 100 - return - -SouthernIsland_Interior_EventScript_242ABE:: @ 8242ABE - setvar VAR_OBJ_GFX_ID_0, 105 - return - -SouthernIsland_Interior_EventScript_242AC4:: @ 8242AC4 - lockall - setvar VAR_0x8008, 12 - goto SouthernIsland_Interior_EventScript_242AD0 - end - -SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 - checkflag FLAG_0x002 - goto_eq SouthernIsland_Interior_EventScript_242B9A - checkflag FLAG_0x1C8 - goto_eq SouthernIsland_Interior_EventScript_242B9A - checkflag FLAG_0x1C9 - goto_eq SouthernIsland_Interior_EventScript_242B9A - checkflag FLAG_SYS_HAS_EON_TICKET - goto_if 0, SouthernIsland_Interior_EventScript_242B9A - setflag FLAG_0x0CE - setflag FLAG_0x002 - special SpawnScriptEventObject - applymovement 127, SouthernIsland_Interior_Movement_242BCA - waitmovement 0 - delay 50 - waitse - playmoncry VAR_TEMP_4, 0 - delay 30 - waitmoncry - addobject 2 - delay 30 - applymovement 127, SouthernIsland_Interior_Movement_242BCE - applymovement 2, SouthernIsland_Interior_Movement_242BDA - waitmovement 0 - delay 50 - special RemoveScriptEventObject - setvar VAR_LAST_TALKED, 2 - compare VAR_0x40D5, 0 - call_if 1, SouthernIsland_Interior_EventScript_242BA4 - compare VAR_0x40D5, 0 - call_if 5, SouthernIsland_Interior_EventScript_242BB7 - setflag FLAG_SYS_CTRL_OBJ_DELETE - special BattleSetup_StartLatiBattle - waitstate - clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 1 - goto_eq SouthernIsland_Interior_EventScript_242B81 - compare VAR_RESULT, 4 - goto_eq SouthernIsland_Interior_EventScript_242B8F - compare VAR_RESULT, 5 - goto_eq SouthernIsland_Interior_EventScript_242B8F - setflag FLAG_0x1C9 - releaseall - end - -SouthernIsland_Interior_EventScript_242B81:: @ 8242B81 - setflag FLAG_0x1C8 - copyvar VAR_0x8004, VAR_TEMP_4 - goto SouthernIsland_Interior_EventScript_273776 - end - -SouthernIsland_Interior_EventScript_242B8F:: @ 8242B8F - copyvar VAR_0x8004, VAR_TEMP_4 - goto SouthernIsland_Interior_EventScript_273776 - end - -SouthernIsland_Interior_EventScript_242B9A:: @ 8242B9A - msgbox SouthernIsland_Interior_Text_2A6AA1, 4 - releaseall - end - -SouthernIsland_Interior_EventScript_242BA4:: @ 8242BA4 - setvar VAR_0x8004, 408 - setvar VAR_0x8005, 50 - setvar VAR_0x8006, 191 - special CreateObedientEnemyMon - return - -SouthernIsland_Interior_EventScript_242BB7:: @ 8242BB7 - setvar VAR_0x8004, 407 - setvar VAR_0x8005, 50 - setvar VAR_0x8006, 191 - special CreateObedientEnemyMon - return - -SouthernIsland_Interior_Movement_242BCA: @ 8242BCA - walk_up - walk_up - walk_up - step_end - -SouthernIsland_Interior_Movement_242BCE: @ 8242BCE - 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 - 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 deleted file mode 100644 index 5152f85cf..000000000 --- a/data/scripts/maps/TerraCave_End.inc +++ /dev/null @@ -1,78 +0,0 @@ -TerraCave_End_MapScripts:: @ 823B0B0 - map_script 5, TerraCave_End_MapScript1_23B0BB - map_script 3, TerraCave_End_MapScript1_23B0D9 - .byte 0 - -TerraCave_End_MapScript1_23B0BB: @ 823B0BB - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, TerraCave_End_EventScript_23B0C5 - end - -TerraCave_End_EventScript_23B0C5:: @ 823B0C5 - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 7 - goto_if 5, TerraCave_End_EventScript_27374E - removeobject 1 - return - -TerraCave_End_MapScript1_23B0D9: @ 823B0D9 - checkflag FLAG_0x1BF - call_if 0, TerraCave_End_EventScript_23B0E3 - end - -TerraCave_End_EventScript_23B0E3:: @ 823B0E3 - clearflag FLAG_0x30F - setvar VAR_TEMP_1, 1 - return - -TerraCave_End_EventScript_23B0EC:: @ 823B0EC - lockall - applymovement 255, TerraCave_End_Movement_2725B2 - waitmovement 0 - applymovement 1, TerraCave_End_Movement_23B16E - waitmovement 0 - waitse - playmoncry SPECIES_GROUDON, 2 - delay 40 - waitmoncry - setvar VAR_LAST_TALKED, 1 - setwildbattle SPECIES_GROUDON, 70, ITEM_NONE - setflag FLAG_SYS_CTRL_OBJ_DELETE - special BattleSetup_StartLegendaryBattle - waitstate - clearflag FLAG_SYS_CTRL_OBJ_DELETE - setvar VAR_TEMP_1, 0 - specialvar VAR_RESULT, sub_8138B80 - compare VAR_RESULT, 1 - goto_eq TerraCave_End_EventScript_23B155 - compare VAR_RESULT, 4 - goto_eq TerraCave_End_EventScript_23B163 - compare VAR_RESULT, 5 - goto_eq TerraCave_End_EventScript_23B163 - setvar VAR_0x4039, 1 - setflag FLAG_0x1BF - releaseall - end - -TerraCave_End_EventScript_23B155:: @ 823B155 - setvar VAR_0x4039, 1 - setflag FLAG_0x1BF - goto TerraCave_End_EventScript_27376D - end - -TerraCave_End_EventScript_23B163:: @ 823B163 - setvar VAR_0x8004, 405 - goto TerraCave_End_EventScript_273776 - end - -TerraCave_End_Movement_23B16E: @ 823B16E - 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/TerraCave_Entrance.inc b/data/scripts/maps/TerraCave_Entrance.inc deleted file mode 100644 index 1762265ea..000000000 --- a/data/scripts/maps/TerraCave_Entrance.inc +++ /dev/null @@ -1,8 +0,0 @@ -TerraCave_Entrance_MapScripts:: @ 823B0A6 - map_script 3, TerraCave_Entrance_MapScript1_23B0AC - .byte 0 - -TerraCave_Entrance_MapScript1_23B0AC: @ 823B0AC - setflag FLAG_0x8DA - end - diff --git a/data/scripts/maps/TradeCenter.inc b/data/scripts/maps/TradeCenter.inc deleted file mode 100644 index e0e0e7d1e..000000000 --- a/data/scripts/maps/TradeCenter.inc +++ /dev/null @@ -1,3 +0,0 @@ -TradeCenter_MapScripts:: @ 823B77E - .byte 0 - diff --git a/data/scripts/maps/TrainerHill_1F.inc b/data/scripts/maps/TrainerHill_1F.inc deleted file mode 100644 index 465a6d781..000000000 --- a/data/scripts/maps/TrainerHill_1F.inc +++ /dev/null @@ -1,6 +0,0 @@ -TrainerHill_1F_MapScripts:: @ 8268F71 - map_script 5, TrainerHill_1F_MapScript1_2C8336 - map_script 4, TrainerHill_1F_MapScript2_2C8372 - map_script 2, TrainerHill_1F_MapScript2_2C8381 - .byte 0 - diff --git a/data/scripts/maps/TrainerHill_2F.inc b/data/scripts/maps/TrainerHill_2F.inc deleted file mode 100644 index ca8eeff72..000000000 --- a/data/scripts/maps/TrainerHill_2F.inc +++ /dev/null @@ -1,6 +0,0 @@ -TrainerHill_2F_MapScripts:: @ 8268F81 - map_script 5, TrainerHill_2F_MapScript1_2C8336 - map_script 4, TrainerHill_2F_MapScript2_2C8372 - map_script 2, TrainerHill_2F_MapScript2_2C8381 - .byte 0 - diff --git a/data/scripts/maps/TrainerHill_3F.inc b/data/scripts/maps/TrainerHill_3F.inc deleted file mode 100644 index 921a8d808..000000000 --- a/data/scripts/maps/TrainerHill_3F.inc +++ /dev/null @@ -1,5 +0,0 @@ -TrainerHill_3F_MapScripts:: @ 8268F91 - map_script 5, TrainerHill_3F_MapScript1_2C8336 - map_script 2, TrainerHill_3F_MapScript2_2C8381 - .byte 0 - diff --git a/data/scripts/maps/TrainerHill_4F.inc b/data/scripts/maps/TrainerHill_4F.inc deleted file mode 100644 index 0f710152c..000000000 --- a/data/scripts/maps/TrainerHill_4F.inc +++ /dev/null @@ -1,5 +0,0 @@ -TrainerHill_4F_MapScripts:: @ 8268F9C - map_script 5, TrainerHill_4F_MapScript1_2C8336 - map_script 2, TrainerHill_4F_MapScript2_2C8381 - .byte 0 - diff --git a/data/scripts/maps/TrainerHill_Elevator.inc b/data/scripts/maps/TrainerHill_Elevator.inc deleted file mode 100644 index ac2d5c8a7..000000000 --- a/data/scripts/maps/TrainerHill_Elevator.inc +++ /dev/null @@ -1,87 +0,0 @@ -TrainerHill_Elevator_MapScripts:: @ 826934F - map_script 2, TrainerHill_Elevator_MapScript2_269355 - .byte 0 - -TrainerHill_Elevator_MapScript2_269355: @ 8269355 - map_script_2 VAR_TEMP_4, 0, TrainerHill_Elevator_EventScript_269375 - .2byte 0 - -TrainerHill_Elevator_EventScript_26935F:: @ 826935F - end - -TrainerHill_Elevator_EventScript_269360:: @ 8269360 - applymovement 255, TrainerHill_Elevator_Movement_2693EB - waitmovement 0 - releaseall - warp MAP_TRAINER_HILL_ROOF, 255, 15, 5 - waitstate - end - -TrainerHill_Elevator_EventScript_269375:: @ 8269375 - applymovement 255, TrainerHill_Elevator_Movement_2693E4 - waitmovement 0 - applymovement 1, TrainerHill_Elevator_Movement_2693EE - waitmovement 0 - lockall - msgbox TrainerHill_Elevator_Text_268F3E, 5 - compare VAR_RESULT, 0 - goto_eq TrainerHill_Elevator_EventScript_269360 - releaseall - applymovement 1, TrainerHill_Elevator_Movement_2693F0 - waitmovement 0 - applymovement 255, TrainerHill_Elevator_Movement_2693DF - waitmovement 0 - call TrainerHill_Elevator_EventScript_2693D9 - delay 25 - applymovement 255, TrainerHill_Elevator_Movement_2693E7 - waitmovement 0 - warp MAP_TRAINER_HILL_ENTRANCE, 255, 17, 8 - waitstate - end - -TrainerHill_Elevator_EventScript_2693CE:: @ 82693CE - goto TrainerHill_Elevator_EventScript_2693D4 - end - -TrainerHill_Elevator_EventScript_2693D4:: @ 82693D4 - special sub_8139C10 - releaseall - end - -TrainerHill_Elevator_EventScript_2693D9:: @ 82693D9 - waitse - special sub_8139A78 - waitstate - return - -TrainerHill_Elevator_Movement_2693DF: @ 82693DF - walk_up - walk_up - walk_right - face_down - step_end - -TrainerHill_Elevator_Movement_2693E4: @ 82693E4 - delay_16 - walk_left - step_end - -TrainerHill_Elevator_Movement_2693E7: @ 82693E7 - delay_16 - walk_down - walk_down - step_end - -TrainerHill_Elevator_Movement_2693EB: @ 82693EB - face_down - delay_16 - step_end - -TrainerHill_Elevator_Movement_2693EE: @ 82693EE - face_right - step_end - -TrainerHill_Elevator_Movement_2693F0: @ 82693F0 - face_down - step_end - diff --git a/data/scripts/maps/TrainerHill_Entrance.inc b/data/scripts/maps/TrainerHill_Entrance.inc deleted file mode 100644 index 84543ff2b..000000000 --- a/data/scripts/maps/TrainerHill_Entrance.inc +++ /dev/null @@ -1,476 +0,0 @@ -TrainerHill_Entrance_MapScripts:: @ 82680AC - map_script 5, TrainerHill_Entrance_MapScript1_2680D0 - map_script 7, TrainerHill_Entrance_MapScript1_26811B - map_script 3, TrainerHill_Entrance_MapScript1_2680C6 - map_script 1, TrainerHill_Entrance_MapScript1_268128 - map_script 2, TrainerHill_Entrance_MapScript2_26813E - .byte 0 - -TrainerHill_Entrance_MapScript1_2680C6: @ 82680C6 - setflag FLAG_LANDMARK_TRAINER_HILL - getplayerxy VAR_TEMP_D, VAR_RESULT - end - -TrainerHill_Entrance_MapScript1_2680CF: @ 82680CF - end - -TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0 - setvar VAR_0x8004, 4 - special sp194_trainer_tower - setvar VAR_TEMP_0, 0 - setvar VAR_0x8004, 9 - special sp194_trainer_tower - compare VAR_RESULT, 0 - goto_eq TrainerHill_Entrance_EventScript_2680FF - setobjectxy 255, 9, 6 - applymovement 255, TrainerHill_Entrance_Movement_26837F - end - -TrainerHill_Entrance_EventScript_2680FF:: @ 82680FF - setvar VAR_0x8004, 16 - special sp194_trainer_tower - compare VAR_RESULT, 1 - goto_eq TrainerHill_Entrance_EventScript_26811A - applymovement 255, TrainerHill_Entrance_Movement_26837F - end - -TrainerHill_Entrance_EventScript_26811A:: @ 826811A - end - -TrainerHill_Entrance_MapScript1_26811B: @ 826811B - addobject 2 - addobject 1 - addobject 5 - addobject 4 - end - -TrainerHill_Entrance_MapScript1_268128: @ 8268128 - compare VAR_TEMP_D, 17 - call_if 1, TrainerHill_Entrance_EventScript_268134 - end - -TrainerHill_Entrance_EventScript_268134:: @ 8268134 - setmetatile 17, 10, 775, 0 - return - -TrainerHill_Entrance_MapScript2_26813E: @ 826813E - map_script_2 VAR_TEMP_0, 0, TrainerHill_Entrance_EventScript_268182 - map_script_2 VAR_TEMP_D, 17, TrainerHill_Entrance_EventScript_268160 - map_script_2 VAR_TEMP_5, 1, TrainerHill_Entrance_EventScript_268229 - map_script_2 VAR_TEMP_1, 1, TrainerHill_Entrance_EventScript_2C83DF - .2byte 0 - -TrainerHill_Entrance_EventScript_268160:: @ 8268160 - lockall - applymovement 255, TrainerHill_Entrance_Movement_268385 - waitmovement 0 - setmetatile 17, 10, 820, 1 - special DrawWholeMapView - playse SE_TK_KASYA - waitse - setvar VAR_TEMP_D, 0 - releaseall - end - -TrainerHill_Entrance_EventScript_268182:: @ 8268182 - setvar VAR_TEMP_0, 1 - setvar VAR_0x8004, 6 - special sp194_trainer_tower - switch VAR_RESULT - case 0, TrainerHill_Entrance_EventScript_2681B5 - case 1, TrainerHill_Entrance_EventScript_2681CA - case 2, TrainerHill_Entrance_EventScript_2681EE - -TrainerHill_Entrance_EventScript_2681B5:: @ 82681B5 - lockall - applymovement 255, TrainerHill_Entrance_Movement_26837F - msgbox TrainerHill_Entrance_Text_268689, 4 - goto TrainerHill_Entrance_EventScript_2681DA - -TrainerHill_Entrance_EventScript_2681CA:: @ 82681CA - lockall - applymovement 255, TrainerHill_Entrance_Movement_26837F - msgbox TrainerHill_Entrance_Text_268712, 4 - -TrainerHill_Entrance_EventScript_2681DA:: @ 82681DA - closemessage - applymovement 255, TrainerHill_Entrance_Movement_268381 - waitmovement 0 - setvar VAR_0x40D6, 0 - special HealPlayerParty - releaseall - -TrainerHill_Entrance_EventScript_2681EE:: @ 82681EE - end - -TrainerHill_Entrance_EventScript_2681EF:: @ 82681EF - setvar VAR_0x800B, 2 - call TrainerHill_Entrance_EventScript_27191E - waitmessage - waitbuttonpress - release - end - -TrainerHill_Entrance_EventScript_2681FD:: @ 82681FD - lock - faceplayer - setvar VAR_0x8004, 10 - special sp194_trainer_tower - compare VAR_RESULT, 0 - goto_eq TrainerHill_Entrance_EventScript_26821F - msgbox TrainerHill_Entrance_Text_2686F4, 4 - goto TrainerHill_Entrance_EventScript_268227 - -TrainerHill_Entrance_EventScript_26821F:: @ 826821F - msgbox TrainerHill_Entrance_Text_2687AC, 4 - -TrainerHill_Entrance_EventScript_268227:: @ 8268227 - release - end - -TrainerHill_Entrance_EventScript_268229:: @ 8268229 - lockall - applymovement 255, TrainerHill_Entrance_Movement_26837F - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, TrainerHill_Entrance_EventScript_26836A - msgbox TrainerHill_Entrance_Text_2684C6, 4 - setvar VAR_0x8004, 13 - special sp194_trainer_tower - compare VAR_RESULT, 0 - call_if 1, TrainerHill_Entrance_EventScript_26832E - setvar VAR_0x8004, 8 - special sp194_trainer_tower - compare VAR_RESULT, 1 - goto_eq TrainerHill_Entrance_EventScript_268275 - msgbox TrainerHill_Entrance_Text_268564, 4 - goto TrainerHill_Entrance_EventScript_26827D - -TrainerHill_Entrance_EventScript_268275:: @ 8268275 - msgbox TrainerHill_Entrance_Text_26859E, 4 - -TrainerHill_Entrance_EventScript_26827D:: @ 826827D - message TrainerHill_Entrance_Text_2685F8 - waitmessage - multichoice 15, 6, 17, 0 - switch VAR_RESULT - case 0, TrainerHill_Entrance_EventScript_2682C8 - case 1, TrainerHill_Entrance_EventScript_268314 - case 2, TrainerHill_Entrance_EventScript_2682BA - case 127, TrainerHill_Entrance_EventScript_268314 - end - -TrainerHill_Entrance_EventScript_2682BA:: @ 82682BA - msgbox TrainerHill_Entrance_Text_2687C3, 4 - goto TrainerHill_Entrance_EventScript_26827D - end - -TrainerHill_Entrance_EventScript_2682C8:: @ 82682C8 - multichoice 13, 2, 113, 0 - switch VAR_RESULT - case 4, TrainerHill_Entrance_EventScript_268314 - case 127, TrainerHill_Entrance_EventScript_268314 - setvar VAR_0x8004, 17 - copyvar VAR_0x8005, VAR_RESULT - special sp194_trainer_tower - setvar VAR_0x40D6, 1 - setvar VAR_TEMP_5, 0 - special HealPlayerParty - msgbox TrainerHill_Entrance_Text_26862A, 4 - setvar VAR_0x8004, 0 - special sp194_trainer_tower - releaseall - end - -TrainerHill_Entrance_EventScript_268314:: @ 8268314 - setvar VAR_TEMP_5, 0 - msgbox TrainerHill_Entrance_Text_26866F, 4 - closemessage - applymovement 255, TrainerHill_Entrance_Movement_268381 - waitmovement 0 - releaseall - end - -TrainerHill_Entrance_EventScript_26832E:: @ 826832E - msgbox TrainerHill_Entrance_Text_26851C, 4 - setvar VAR_0x8004, 14 - special sp194_trainer_tower - setvar VAR_TEMP_5, 1 - call TrainerHill_Entrance_EventScript_27134F - compare VAR_RESULT, 0 - goto_eq TrainerHill_Entrance_EventScript_26835C - setvar VAR_0x8004, 14 - special sp194_trainer_tower - return - -TrainerHill_Entrance_EventScript_26835C:: @ 826835C - setvar VAR_0x8004, 15 - special sp194_trainer_tower - goto TrainerHill_Entrance_EventScript_268314 - end - -TrainerHill_Entrance_EventScript_26836A:: @ 826836A - msgbox TrainerHill_Entrance_Text_268430, 4 - closemessage - applymovement 255, TrainerHill_Entrance_Movement_268381 - waitmovement 0 - releaseall - end - -TrainerHill_Entrance_Movement_26837F: @ 826837F - face_right - step_end - -TrainerHill_Entrance_Movement_268381: @ 8268381 - walk_down - step_end - -TrainerHill_Entrance_Movement_268383: @ 8268383 - face_up - step_end - -TrainerHill_Entrance_Movement_268385: @ 8268385 - walk_down - walk_down - step_end - -TrainerHill_Entrance_EventScript_268388:: @ 8268388 - lockall - fadescreen 1 - special ShowTrainerHillRecords - waitstate - releaseall - end - -TrainerHill_Entrance_EventScript_268391:: @ 8268391 - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, TrainerHill_Entrance_EventScript_2683A3 - msgbox TrainerHill_Entrance_Text_268D5A, 2 - end - -TrainerHill_Entrance_EventScript_2683A3:: @ 82683A3 - msgbox TrainerHill_Entrance_Text_268DDA, 2 - end - -TrainerHill_Entrance_EventScript_2683AC:: @ 82683AC - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, TrainerHill_Entrance_EventScript_2683BE - msgbox TrainerHill_Entrance_Text_268E6A, 2 - end - -TrainerHill_Entrance_EventScript_2683BE:: @ 82683BE - msgbox TrainerHill_Entrance_Text_268EDC, 2 - end - -TrainerHill_Entrance_EventScript_2683C7:: @ 82683C7 - lock - faceplayer - message gUnknown_08272A21 - waitmessage - checkflag FLAG_SYS_GAME_CLEAR - goto_eq TrainerHill_Entrance_EventScript_268402 - pokemart TrainerHill_Entrance_Pokemart_2683E8 - msgbox gUnknown_08272A3F, 4 - release - end - - .align 2 -TrainerHill_Entrance_Pokemart_2683E8: @ 82683E8 - .2byte ITEM_SUPER_POTION - .2byte ITEM_ANTIDOTE - .2byte ITEM_PARALYZE_HEAL - .2byte ITEM_AWAKENING - .2byte ITEM_X_SPEED - .2byte ITEM_X_SPECIAL - .2byte ITEM_X_ATTACK - .2byte ITEM_X_DEFEND - .2byte ITEM_DIRE_HIT - .2byte ITEM_GUARD_SPEC - .2byte ITEM_X_ACCURACY - .2byte ITEM_NONE - release - end - -TrainerHill_Entrance_EventScript_268402:: @ 8268402 - pokemart TrainerHill_Entrance_Pokemart_268414 - msgbox gUnknown_08272A3F, 4 - release - end - - .align 2 -TrainerHill_Entrance_Pokemart_268414: @ 8268414 - .2byte ITEM_HYPER_POTION - .2byte ITEM_MAX_POTION - .2byte ITEM_FULL_RESTORE - .2byte ITEM_FULL_HEAL - .2byte ITEM_REVIVE - .2byte ITEM_X_SPEED - .2byte ITEM_X_SPECIAL - .2byte ITEM_X_ATTACK - .2byte ITEM_X_DEFEND - .2byte ITEM_DIRE_HIT - .2byte ITEM_GUARD_SPEC - .2byte ITEM_X_ACCURACY - .2byte ITEM_NONE - release - end - -TrainerHill_Entrance_Text_268430: @ 8268430 - .string "This is the TRAINER HILL where\n" - .string "you may enjoy tag battles with many\l" - .string "TRAINERS.\p" - .string "Unfortunately, we’re still getting\n" - .string "things ready. Please come back later!$" - -TrainerHill_Entrance_Text_2684C6: @ 82684C6 - .string "Welcome!\p" - .string "This is the TRAINER HILL where\n" - .string "you may enjoy tag battles with many\l" - .string "TRAINERS!$" - -TrainerHill_Entrance_Text_26851C: @ 826851C - .string "Is this your first visit here?\p" - .string "Before you enter, please save\n" - .string "your game.$" - -TrainerHill_Entrance_Text_268564: @ 8268564 - .string "Let’s see…\n" - .string "The TRAINERS here now are…\p" - .string "Up to floor no. {STR_VAR_1}.$" - -TrainerHill_Entrance_Text_26859E: @ 826859E - .string "Let’s see…\n" - .string "The TRAINERS here now are…\p" - .string "There appear to be TRAINERS gathered\n" - .string "in every room.$" - -TrainerHill_Entrance_Text_2685F8: @ 82685F8 - .string "Would you like to challenge the\n" - .string "waiting TRAINERS?$" - -TrainerHill_Entrance_Text_26862A: @ 826862A - .string "I will time your progress.\n" - .string "Best of luck!\p" - .string "On your marks…\p" - .string "Get set…\p" - .string "Go!$" - -TrainerHill_Entrance_Text_26866F: @ 826866F - .string "Please do visit us again!$" - -TrainerHill_Entrance_Text_268689: @ 8268689 - .string "That was too bad.\p" - .string "I think you put in a tremendous\n" - .string "effort in your battling.\p" - .string "Please come back and try again!$" - -TrainerHill_Entrance_Text_2686F4: @ 82686F4 - .string "I hope you give it your best.$" - -TrainerHill_Entrance_Text_268712: @ 8268712 - .string "When the TRAINERS switch places,\n" - .string "the movement can be hectic.\p" - .string "To avoid the stampede, we moved\n" - .string "the reception counter here.\p" - .string "I’m sorry for the inconvenience.$" - -TrainerHill_Entrance_Text_2687AC: @ 82687AC - .string "Thank you for playing!$" - -TrainerHill_Entrance_Text_2687C3: @ 82687C3 - .string "Here at the TRAINER HILL, we conduct\n" - .string "an event called the Time Attack.\p" - .string "It is a race that measures how long\n" - .string "you take to reach our owner on\l" - .string "the rooftop from this counter.\p" - .string "The fastest times are posted on\n" - .string "the Time Board--try competing with\l" - .string "your friends.\p" - .string "In TRAINER battles along the way,\n" - .string "neither Exp. Points nor money will\l" - .string "be awarded.$" - -TrainerHill_Entrance_Text_26890D: @ 826890D - .string "Oh, I’m sorry, but you appear to have\n" - .string "only one POKéMON with you.\p" - .string "You will need at least two POKéMON\n" - .string "to enter this event.$" - -TrainerHill_Roof_Text_268986: @ 8268986 - .string "Hm! Hm!\p" - .string "You finally came!\n" - .string "Yes, you have arrived!\p" - .string "Wait! Don’t say it!\n" - .string "I know why you came all the way\l" - .string "here by yourself!\p" - .string "You wanted to see me, the owner\n" - .string "of the TRAINER HILL, because…\p" - .string "You want to form a tag team with me!\n" - .string "Wa-hoo!\p" - .string "…Uh?\n" - .string "That’s not it?\p" - .string "Anyway, I watched you on your way up.\n" - .string "Marvelous battling! Bravo, indeed!$" - -TrainerHill_Roof_Text_268AC5: @ 8268AC5 - .string "For a marvelous someone like you,\n" - .string "I have the most marvelous gift!$" - -TrainerHill_Roof_Text_268B07: @ 8268B07 - .string "Oh, no, full up with things!\n" - .string "You’ll be back later for this!$" - -TrainerHill_Roof_Text_268B43: @ 8268B43 - .string "Oh, hold on here! Did you possibly get\n" - .string "here marvelously quickly?\p" - .string "How splendid! You needn’t have\n" - .string "hurried so to see me!\p" - .string "That is so delightful. I’ll have the Time\n" - .string "Board at the reception updated!$" - -TrainerHill_Roof_Text_268C03: @ 8268C03 - .string "But, oh…\n" - .string "You weren’t very quick getting here.$" - -TrainerHill_Roof_Text_268C31: @ 8268C31 - .string "Perhaps it would please me more if you\n" - .string "arrived zippier next time.\p" - .string "Then, I should be pleased to form\n" - .string "a tag team with you!\p" - .string "Until we meet again, amigo!$" - -TrainerHill_Roof_Text_268CC6: @ 8268CC6 - .string "I had the TRAINER HILL built for but\n" - .string "one reason and one only!\p" - .string "To find the most suitable partner\n" - .string "with whom I may form a tag team!$" - -TrainerHill_Entrance_Text_268D47: @ 8268D47 - .string "{STR_VAR_1} min. {STR_VAR_2}.{STR_VAR_3} sec.$" - -TrainerHill_Entrance_Text_268D5A: @ 8268D5A - .string "Who knows what sort of TRAINERS\n" - .string "and POKéMON combos are ahead?\p" - .string "All I know is that I’ll knock aside\n" - .string "anyone that stands in my way!$" - -TrainerHill_Entrance_Text_268DDA: @ 8268DDA - .string "I heard tough TRAINERS come to this\n" - .string "TRAINER HILL from all over.\p" - .string "I can’t wait to test the waters!\p" - .string "I’ll knock aside anyone that stands\n" - .string "in my way!$" - -TrainerHill_Entrance_Text_268E6A: @ 8268E6A - .string "Do you see the Time Board over there?\p" - .string "My friends and I are trying to see who\n" - .string "can reach the top in the least time.$" - -TrainerHill_Entrance_Text_268EDC: @ 8268EDC - .string "Do you know when they’re opening\n" - .string "this place up?\p" - .string "I’m waiting here to be the first\n" - .string "challenger ever!$" - -TrainerHill_Elevator_Text_268F3E: @ 8268F3E - .string "Would you like to return to\n" - .string "the reception counter?$" diff --git a/data/scripts/maps/TrainerHill_Roof.inc b/data/scripts/maps/TrainerHill_Roof.inc deleted file mode 100644 index bdec2f7aa..000000000 --- a/data/scripts/maps/TrainerHill_Roof.inc +++ /dev/null @@ -1,70 +0,0 @@ -TrainerHill_Roof_MapScripts:: @ 8268FA7 - map_script 5, TrainerHill_Roof_MapScript1_2C8336 - map_script 2, TrainerHill_Roof_MapScript2_2C8381 - .byte 0 - -TrainerHill_Roof_EventScript_268FB2:: @ 8268FB2 - setvar VAR_0x8004, 12 - special sp194_trainer_tower - lock - faceplayer - setvar VAR_0x8004, 1 - special sp194_trainer_tower - switch VAR_RESULT - case 0, TrainerHill_Roof_EventScript_268FEA - case 1, TrainerHill_Roof_EventScript_268FF2 - case 2, TrainerHill_Roof_EventScript_2690A8 - -TrainerHill_Roof_EventScript_268FEA:: @ 8268FEA - msgbox TrainerHill_Roof_Text_268986, 4 - -TrainerHill_Roof_EventScript_268FF2:: @ 8268FF2 - setvar VAR_0x8004, 2 - special sp194_trainer_tower - switch VAR_RESULT - case 0, TrainerHill_Roof_EventScript_269020 - case 1, TrainerHill_Roof_EventScript_269037 - case 2, TrainerHill_Roof_EventScript_269054 - -TrainerHill_Roof_EventScript_269020:: @ 8269020 - msgbox TrainerHill_Roof_Text_268AC5, 4 - playfanfare MUS_FANFA1 - message gUnknown_08272A78 - waitfanfare - waitmessage - goto TrainerHill_Roof_EventScript_269054 - -TrainerHill_Roof_EventScript_269037:: @ 8269037 - msgbox TrainerHill_Roof_Text_268AC5, 4 - msgbox gUnknown_08272A89, 4 - msgbox TrainerHill_Roof_Text_268B07, 4 - goto TrainerHill_Roof_EventScript_269054 - -TrainerHill_Roof_EventScript_269054:: @ 8269054 - setvar VAR_0x8004, 3 - special sp194_trainer_tower - switch VAR_RESULT - case 0, TrainerHill_Roof_EventScript_269082 - case 1, TrainerHill_Roof_EventScript_269090 - case 2, TrainerHill_Roof_EventScript_26909E - -TrainerHill_Roof_EventScript_269082:: @ 8269082 - msgbox TrainerHill_Roof_Text_268B43, 4 - goto TrainerHill_Roof_EventScript_26909E - end - -TrainerHill_Roof_EventScript_269090:: @ 8269090 - msgbox TrainerHill_Roof_Text_268C03, 4 - goto TrainerHill_Roof_EventScript_26909E - end - -TrainerHill_Roof_EventScript_26909E:: @ 826909E - msgbox TrainerHill_Roof_Text_268C31, 4 - release - end - -TrainerHill_Roof_EventScript_2690A8:: @ 82690A8 - msgbox TrainerHill_Roof_Text_268C31, 4 - release - end - diff --git a/data/scripts/maps/Underwater1.inc b/data/scripts/maps/Underwater1.inc deleted file mode 100644 index 107a038a8..000000000 --- a/data/scripts/maps/Underwater1.inc +++ /dev/null @@ -1,3 +0,0 @@ -Underwater1_MapScripts:: @ 81F7722 - .byte 0 - diff --git a/data/scripts/maps/Underwater2.inc b/data/scripts/maps/Underwater2.inc deleted file mode 100644 index 80c854c63..000000000 --- a/data/scripts/maps/Underwater2.inc +++ /dev/null @@ -1,3 +0,0 @@ -Underwater2_MapScripts:: @ 81F7723 - .byte 0 - diff --git a/data/scripts/maps/Underwater3.inc b/data/scripts/maps/Underwater3.inc deleted file mode 100644 index 463f7a0ff..000000000 --- a/data/scripts/maps/Underwater3.inc +++ /dev/null @@ -1,8 +0,0 @@ -Underwater3_MapScripts:: @ 81F7724 - map_script 5, Underwater3_MapScript1_1F772A - .byte 0 - -Underwater3_MapScript1_1F772A: @ 81F772A - call Underwater3_EventScript_274223 - end - diff --git a/data/scripts/maps/Underwater4.inc b/data/scripts/maps/Underwater4.inc deleted file mode 100644 index 295c27356..000000000 --- a/data/scripts/maps/Underwater4.inc +++ /dev/null @@ -1,3 +0,0 @@ -Underwater4_MapScripts:: @ 81F7730 - .byte 0 - diff --git a/data/scripts/maps/Underwater5.inc b/data/scripts/maps/Underwater5.inc deleted file mode 100644 index 9d0cc373c..000000000 --- a/data/scripts/maps/Underwater5.inc +++ /dev/null @@ -1,8 +0,0 @@ -Underwater5_MapScripts:: @ 81F7731 - map_script 5, Underwater5_MapScript1_1F7737 - .byte 0 - -Underwater5_MapScript1_1F7737: @ 81F7737 - call Underwater5_EventScript_274223 - end - diff --git a/data/scripts/maps/Underwater6.inc b/data/scripts/maps/Underwater6.inc deleted file mode 100644 index 047628c9c..000000000 --- a/data/scripts/maps/Underwater6.inc +++ /dev/null @@ -1,8 +0,0 @@ -Underwater6_MapScripts:: @ 81F773D - map_script 5, Underwater6_MapScript1_1F7743 - .byte 0 - -Underwater6_MapScript1_1F7743: @ 81F7743 - call Underwater6_EventScript_274223 - end - diff --git a/data/scripts/maps/Underwater7.inc b/data/scripts/maps/Underwater7.inc deleted file mode 100644 index dd757f98a..000000000 --- a/data/scripts/maps/Underwater7.inc +++ /dev/null @@ -1,8 +0,0 @@ -Underwater7_MapScripts:: @ 81F7749 - map_script 5, Underwater7_MapScript1_1F774F - .byte 0 - -Underwater7_MapScript1_1F774F: @ 81F774F - call Underwater7_EventScript_274223 - end - diff --git a/data/scripts/maps/Underwater_MarineCave.inc b/data/scripts/maps/Underwater_MarineCave.inc deleted file mode 100644 index ac96e3a9b..000000000 --- a/data/scripts/maps/Underwater_MarineCave.inc +++ /dev/null @@ -1,13 +0,0 @@ -Underwater_MarineCave_MapScripts:: @ 823AFB8 - map_script 5, Underwater_MarineCave_MapScript1_23AFC7 - map_script 3, Underwater_MarineCave_MapScript1_23AFC3 - .byte 0 - -Underwater_MarineCave_MapScript1_23AFC3: @ 823AFC3 - setflag FLAG_0x8D9 - end - -Underwater_MarineCave_MapScript1_23AFC7: @ 823AFC7 - 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 deleted file mode 100644 index 786de1757..000000000 --- a/data/scripts/maps/Underwater_Route134.inc +++ /dev/null @@ -1,8 +0,0 @@ -Underwater_Route134_MapScripts:: @ 82390B5 - map_script 5, Underwater_Route134_MapScript1_2390BB - .byte 0 - -Underwater_Route134_MapScript1_2390BB: @ 82390BB - setdivewarp MAP_ROUTE134, 255, 60, 31 - end - diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc deleted file mode 100644 index 128cb31c0..000000000 --- a/data/scripts/maps/Underwater_SeafloorCavern.inc +++ /dev/null @@ -1,52 +0,0 @@ -Underwater_SeafloorCavern_MapScripts:: @ 823433B - map_script 5, Underwater_SeafloorCavern_MapScript1_2343D3 - map_script 3, Underwater_SeafloorCavern_MapScript1_23434B - map_script 1, Underwater_SeafloorCavern_MapScript1_23435C - .byte 0 - -Underwater_SeafloorCavern_MapScript1_23434B: @ 823434B - setflag FLAG_LANDMARK_SEAFLOOR_CAVERN - checkflag FLAG_0x081 - goto_eq Underwater_SeafloorCavern_EventScript_234358 - end - -Underwater_SeafloorCavern_EventScript_234358:: @ 8234358 - setflag FLAG_0x3D4 - end - -Underwater_SeafloorCavern_MapScript1_23435C: @ 823435C - checkflag FLAG_0x081 - call_if 1, Underwater_SeafloorCavern_EventScript_234366 - end - -Underwater_SeafloorCavern_EventScript_234366:: @ 8234366 - setmetatile 5, 3, 542, 1 - setmetatile 6, 3, 542, 1 - setmetatile 7, 3, 542, 1 - setmetatile 8, 3, 542, 1 - setmetatile 5, 4, 552, 0 - setmetatile 6, 4, 552, 0 - setmetatile 7, 4, 552, 0 - setmetatile 8, 4, 552, 0 - setmetatile 5, 5, 552, 0 - setmetatile 6, 5, 552, 0 - setmetatile 7, 5, 552, 0 - setmetatile 8, 5, 552, 0 - return - -Underwater_SeafloorCavern_MapScript1_2343D3: @ 82343D3 - setdivewarp MAP_SEAFLOOR_CAVERN_ENTRANCE, 255, 10, 17 - end - -Underwater_SeafloorCavern_EventScript_2343DC:: @ 82343DC - msgbox Underwater_SeafloorCavern_Text_2343E5, 3 - end - -Underwater_SeafloorCavern_Text_2343E5: @ 82343E5 - .string "“SUBMARINE EXPLORER 1†is painted\n" - .string "on the hull.\p" - .string "This is the submarine TEAM AQUA\n" - .string "stole in SLATEPORT!\p" - .string "TEAM AQUA must have gone\n" - .string "ashore here.$" - diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc deleted file mode 100644 index 7ac032c5f..000000000 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ /dev/null @@ -1,28 +0,0 @@ -Underwater_SealedChamber_MapScripts:: @ 82390C4 - map_script 6, Underwater_SealedChamber_MapScript1_2390CA - .byte 0 - -Underwater_SealedChamber_MapScript1_2390CA: @ 82390CA - getplayerxy VAR_0x8004, VAR_0x8005 - compare VAR_0x8004, 12 - goto_if 5, Underwater_SealedChamber_EventScript_2390EA - compare VAR_0x8005, 44 - goto_if 5, Underwater_SealedChamber_EventScript_2390EA - goto Underwater_SealedChamber_EventScript_2390F3 - -Underwater_SealedChamber_EventScript_2390EA:: @ 82390EA - setdivewarp MAP_ROUTE134, 255, 60, 31 - end - -Underwater_SealedChamber_EventScript_2390F3:: @ 82390F3 - setdivewarp MAP_SEALED_CHAMBER_OUTER_ROOM, 255, 10, 19 - end - -Underwater_SealedChamber_EventScript_2390FC:: @ 82390FC - lockall - braillemessage Underwater_SealedChamber_Braille_2A6B15 - waitbuttonpress - hidebox2 - releaseall - end - diff --git a/data/scripts/maps/Underwater_SootopolisCity.inc b/data/scripts/maps/Underwater_SootopolisCity.inc deleted file mode 100644 index cbeefcb1d..000000000 --- a/data/scripts/maps/Underwater_SootopolisCity.inc +++ /dev/null @@ -1,8 +0,0 @@ -Underwater_SootopolisCity_MapScripts:: @ 822D94C - map_script 5, Underwater_SootopolisCity_MapScript1_22D952 - .byte 0 - -Underwater_SootopolisCity_MapScript1_22D952: @ 822D952 - setdivewarp MAP_SOOTOPOLIS_CITY, 255, 29, 53 - end - diff --git a/data/scripts/maps/UnionRoom.inc b/data/scripts/maps/UnionRoom.inc deleted file mode 100644 index 250b4b402..000000000 --- a/data/scripts/maps/UnionRoom.inc +++ /dev/null @@ -1,107 +0,0 @@ -UnionRoom_MapScripts:: @ 823D1A6 - map_script 5, UnionRoom_MapScript1_23D1B1 - map_script 3, UnionRoom_MapScript1_23D1E5 - .byte 0 - -UnionRoom_MapScript1_23D1B1: @ 823D1B1 - setflag FLAG_0x2BF - setflag FLAG_0x2C0 - setflag FLAG_0x2C1 - setflag FLAG_0x2C2 - setflag FLAG_0x2C3 - setflag FLAG_0x2C4 - setflag FLAG_0x2C5 - setflag FLAG_0x2C6 - removeobject 9 - removeobject 8 - removeobject 7 - removeobject 2 - removeobject 6 - removeobject 5 - removeobject 4 - removeobject 3 - special UnionRoomSpecial - end - -UnionRoom_MapScript1_23D1E5: @ 823D1E5 - end - -UnionRoom_EventScript_23D1E6:: @ 823D1E6 - lock - faceplayer - setvar VAR_RESULT, 1 - waitstate - release - end - -UnionRoom_EventScript_23D1F0:: @ 823D1F0 - lock - faceplayer - setvar VAR_RESULT, 2 - waitstate - release - end - -UnionRoom_EventScript_23D1FA:: @ 823D1FA - lock - faceplayer - setvar VAR_RESULT, 3 - waitstate - release - end - -UnionRoom_EventScript_23D204:: @ 823D204 - lock - faceplayer - setvar VAR_RESULT, 4 - waitstate - release - end - -UnionRoom_EventScript_23D20E:: @ 823D20E - lock - faceplayer - setvar VAR_RESULT, 5 - waitstate - release - end - -UnionRoom_EventScript_23D218:: @ 823D218 - lock - faceplayer - setvar VAR_RESULT, 6 - waitstate - release - end - -UnionRoom_EventScript_23D222:: @ 823D222 - lock - faceplayer - setvar VAR_RESULT, 7 - waitstate - release - end - -UnionRoom_EventScript_23D22C:: @ 823D22C - lock - faceplayer - setvar VAR_RESULT, 8 - waitstate - release - end - -UnionRoom_EventScript_23D236:: @ 823D236 - lock - faceplayer - setvar VAR_RESULT, 9 - waitstate - release - end - -UnionRoom_EventScript_23D240:: @ 823D240 - lockall - setvar VAR_RESULT, 10 - waitstate - releaseall - end - diff --git a/data/scripts/maps/UnknownMap_25_29.inc b/data/scripts/maps/UnknownMap_25_29.inc deleted file mode 100644 index 575e7a898..000000000 --- a/data/scripts/maps/UnknownMap_25_29.inc +++ /dev/null @@ -1 +0,0 @@ -UnknownMap_25_29_MapScripts:: @ 823B781 diff --git a/data/scripts/maps/UnknownMap_25_30.inc b/data/scripts/maps/UnknownMap_25_30.inc deleted file mode 100644 index dbc73166d..000000000 --- a/data/scripts/maps/UnknownMap_25_30.inc +++ /dev/null @@ -1 +0,0 @@ -UnknownMap_25_30_MapScripts:: @ 823B781 diff --git a/data/scripts/maps/UnknownMap_25_31.inc b/data/scripts/maps/UnknownMap_25_31.inc deleted file mode 100644 index cacda4d1f..000000000 --- a/data/scripts/maps/UnknownMap_25_31.inc +++ /dev/null @@ -1 +0,0 @@ -UnknownMap_25_31_MapScripts:: @ 823B781 diff --git a/data/scripts/maps/UnknownMap_25_32.inc b/data/scripts/maps/UnknownMap_25_32.inc deleted file mode 100644 index e34f454e7..000000000 --- a/data/scripts/maps/UnknownMap_25_32.inc +++ /dev/null @@ -1 +0,0 @@ -UnknownMap_25_32_MapScripts:: @ 823B781 diff --git a/data/scripts/maps/UnknownMap_25_33.inc b/data/scripts/maps/UnknownMap_25_33.inc deleted file mode 100644 index 086d2d32c..000000000 --- a/data/scripts/maps/UnknownMap_25_33.inc +++ /dev/null @@ -1 +0,0 @@ -UnknownMap_25_33_MapScripts:: @ 823B781 diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc deleted file mode 100644 index eb6bf8da4..000000000 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ /dev/null @@ -1,458 +0,0 @@ -UnknownMap_25_34_MapScripts:: @ 823B781 - map_script 4, LinkContestRoom1_MapScript2_23B81F - map_script 2, LinkContestRoom1_MapScript2_23B815 - map_script 3, LinkContestRoom1_MapScript1_23B79F - map_script 5, LinkContestRoom1_MapScript1_23B803 - map_script 7, LinkContestRoom1_MapScript1_23B79B - .byte 0 - -LinkContestRoom1_MapScript1_23B79B: @ 823B79B - special sub_80F8B94 - end - -LinkContestRoom1_MapScript1_23B79F: @ 823B79F - call LinkContestRoom1_EventScript_23B7AF - setvar VAR_TEMP_0, 1 - call LinkContestRoom1_EventScript_23B842 - end - -LinkContestRoom1_EventScript_23B7AF:: @ 823B7AF - call LinkContestRoom1_EventScript_27A133 - special sub_80F8FA0 - compare VAR_RESULT, 0 - call_if 1, LinkContestRoom1_EventScript_23B7EF - compare VAR_RESULT, 1 - call_if 1, LinkContestRoom1_EventScript_23B7F3 - compare VAR_RESULT, 2 - call_if 1, LinkContestRoom1_EventScript_23B7F7 - compare VAR_RESULT, 3 - call_if 1, LinkContestRoom1_EventScript_23B7FB - compare VAR_RESULT, 4 - call_if 1, LinkContestRoom1_EventScript_23B7FF - return - -LinkContestRoom1_EventScript_23B7EF:: @ 823B7EF - savebgm MUS_TEST1 - return - -LinkContestRoom1_EventScript_23B7F3:: @ 823B7F3 - savebgm MUS_TEST2 - return - -LinkContestRoom1_EventScript_23B7F7:: @ 823B7F7 - savebgm MUS_TEST3 - return - -LinkContestRoom1_EventScript_23B7FB:: @ 823B7FB - savebgm MUS_TEST4 - return - -LinkContestRoom1_EventScript_23B7FF:: @ 823B7FF - savebgm MUS_CONTEST0 - return - -LinkContestRoom1_MapScript1_23B803: @ 823B803 - compare VAR_TEMP_9, 1 - call_if 1, LinkContestRoom1_EventScript_23B80F - end - -LinkContestRoom1_EventScript_23B80F:: @ 823B80F - call LinkContestRoom1_EventScript_23BB2B - return - -LinkContestRoom1_MapScript2_23B815: @ 823B815 - map_script_2 VAR_0x4086, 1, LinkContestRoom1_EventScript_23B829 - .2byte 0 - -LinkContestRoom1_MapScript2_23B81F: @ 823B81F - map_script_2 VAR_0x4086, 1, LinkContestRoom1_EventScript_23B834 - .2byte 0 - -LinkContestRoom1_EventScript_23B829:: @ 823B829 - call LinkContestRoom1_EventScript_279F97 - call LinkContestRoom1_EventScript_23BE44 - end - -LinkContestRoom1_EventScript_23B834:: @ 823B834 - special sub_80F8B94 - hideobjectat 255, MAP_LITTLEROOT_TOWN - call LinkContestRoom1_EventScript_23BB2B - end - -LinkContestRoom1_EventScript_23B842:: @ 823B842 - call LinkContestRoom1_EventScript_23B8F8 - call LinkContestRoom1_EventScript_23B858 - compare VAR_TEMP_0, 8 - goto_if 0, LinkContestRoom1_EventScript_23B842 - return - -LinkContestRoom1_EventScript_23B858:: @ 823B858 - switch VAR_TEMP_0 - case 1, LinkContestRoom1_EventScript_23B8AB - case 2, LinkContestRoom1_EventScript_23B8B6 - case 3, LinkContestRoom1_EventScript_23B8C1 - case 4, LinkContestRoom1_EventScript_23B8CC - case 5, LinkContestRoom1_EventScript_23B8D7 - case 6, LinkContestRoom1_EventScript_23B8E2 - case 7, LinkContestRoom1_EventScript_23B8ED - end - -LinkContestRoom1_EventScript_23B8AB:: @ 823B8AB - copyvar VAR_OBJ_GFX_ID_4, VAR_TEMP_1 - addvar VAR_TEMP_0, 1 - return - -LinkContestRoom1_EventScript_23B8B6:: @ 823B8B6 - copyvar VAR_OBJ_GFX_ID_5, VAR_TEMP_1 - addvar VAR_TEMP_0, 1 - return - -LinkContestRoom1_EventScript_23B8C1:: @ 823B8C1 - copyvar VAR_OBJ_GFX_ID_6, VAR_TEMP_1 - addvar VAR_TEMP_0, 1 - return - -LinkContestRoom1_EventScript_23B8CC:: @ 823B8CC - copyvar VAR_OBJ_GFX_ID_7, VAR_TEMP_1 - addvar VAR_TEMP_0, 1 - return - -LinkContestRoom1_EventScript_23B8D7:: @ 823B8D7 - copyvar VAR_OBJ_GFX_ID_8, VAR_TEMP_1 - addvar VAR_TEMP_0, 1 - return - -LinkContestRoom1_EventScript_23B8E2:: @ 823B8E2 - copyvar VAR_OBJ_GFX_ID_9, VAR_TEMP_1 - addvar VAR_TEMP_0, 1 - return - -LinkContestRoom1_EventScript_23B8ED:: @ 823B8ED - copyvar VAR_OBJ_GFX_ID_A, VAR_TEMP_1 - addvar VAR_TEMP_0, 1 - return - -LinkContestRoom1_EventScript_23B8F8:: @ 823B8F8 - setvar VAR_RESULT, 32 - special sub_80F8FE8 - addvar VAR_RESULT, 1 - switch VAR_RESULT - case 1, LinkContestRoom1_EventScript_23BA6B - case 2, LinkContestRoom1_EventScript_23BA71 - case 3, LinkContestRoom1_EventScript_23BA77 - case 4, LinkContestRoom1_EventScript_23BA7D - case 5, LinkContestRoom1_EventScript_23BA83 - case 6, LinkContestRoom1_EventScript_23BA89 - case 7, LinkContestRoom1_EventScript_23BA8F - case 8, LinkContestRoom1_EventScript_23BA95 - case 9, LinkContestRoom1_EventScript_23BA9B - case 10, LinkContestRoom1_EventScript_23BAA1 - case 11, LinkContestRoom1_EventScript_23BAA7 - case 12, LinkContestRoom1_EventScript_23BAAD - case 13, LinkContestRoom1_EventScript_23BAB3 - case 14, LinkContestRoom1_EventScript_23BAB9 - case 15, LinkContestRoom1_EventScript_23BABF - case 16, LinkContestRoom1_EventScript_23BAC5 - case 17, LinkContestRoom1_EventScript_23BACB - case 18, LinkContestRoom1_EventScript_23BAD1 - case 19, LinkContestRoom1_EventScript_23BAD7 - case 20, LinkContestRoom1_EventScript_23BADD - case 21, LinkContestRoom1_EventScript_23BAE3 - case 22, LinkContestRoom1_EventScript_23BAE9 - case 23, LinkContestRoom1_EventScript_23BAEF - case 24, LinkContestRoom1_EventScript_23BAF5 - case 25, LinkContestRoom1_EventScript_23BAFB - case 26, LinkContestRoom1_EventScript_23BB01 - case 27, LinkContestRoom1_EventScript_23BB07 - case 28, LinkContestRoom1_EventScript_23BB0D - case 29, LinkContestRoom1_EventScript_23BB13 - case 30, LinkContestRoom1_EventScript_23BB19 - case 31, LinkContestRoom1_EventScript_23BB1F - case 32, LinkContestRoom1_EventScript_23BB25 - end - -LinkContestRoom1_EventScript_23BA6B:: @ 823BA6B - setvar VAR_TEMP_1, 5 - return - -LinkContestRoom1_EventScript_23BA71:: @ 823BA71 - setvar VAR_TEMP_1, 6 - return - -LinkContestRoom1_EventScript_23BA77:: @ 823BA77 - setvar VAR_TEMP_1, 7 - return - -LinkContestRoom1_EventScript_23BA7D:: @ 823BA7D - setvar VAR_TEMP_1, 8 - return - -LinkContestRoom1_EventScript_23BA83:: @ 823BA83 - setvar VAR_TEMP_1, 10 - return - -LinkContestRoom1_EventScript_23BA89:: @ 823BA89 - setvar VAR_TEMP_1, 11 - return - -LinkContestRoom1_EventScript_23BA8F:: @ 823BA8F - setvar VAR_TEMP_1, 12 - return - -LinkContestRoom1_EventScript_23BA95:: @ 823BA95 - setvar VAR_TEMP_1, 13 - return - -LinkContestRoom1_EventScript_23BA9B:: @ 823BA9B - setvar VAR_TEMP_1, 14 - return - -LinkContestRoom1_EventScript_23BAA1:: @ 823BAA1 - setvar VAR_TEMP_1, 15 - return - -LinkContestRoom1_EventScript_23BAA7:: @ 823BAA7 - setvar VAR_TEMP_1, 17 - return - -LinkContestRoom1_EventScript_23BAAD:: @ 823BAAD - setvar VAR_TEMP_1, 18 - return - -LinkContestRoom1_EventScript_23BAB3:: @ 823BAB3 - setvar VAR_TEMP_1, 19 - return - -LinkContestRoom1_EventScript_23BAB9:: @ 823BAB9 - setvar VAR_TEMP_1, 20 - return - -LinkContestRoom1_EventScript_23BABF:: @ 823BABF - setvar VAR_TEMP_1, 21 - return - -LinkContestRoom1_EventScript_23BAC5:: @ 823BAC5 - setvar VAR_TEMP_1, 22 - return - -LinkContestRoom1_EventScript_23BACB:: @ 823BACB - setvar VAR_TEMP_1, 25 - return - -LinkContestRoom1_EventScript_23BAD1:: @ 823BAD1 - setvar VAR_TEMP_1, 26 - return - -LinkContestRoom1_EventScript_23BAD7:: @ 823BAD7 - setvar VAR_TEMP_1, 27 - return - -LinkContestRoom1_EventScript_23BADD:: @ 823BADD - setvar VAR_TEMP_1, 47 - return - -LinkContestRoom1_EventScript_23BAE3:: @ 823BAE3 - setvar VAR_TEMP_1, 30 - return - -LinkContestRoom1_EventScript_23BAE9:: @ 823BAE9 - setvar VAR_TEMP_1, 31 - return - -LinkContestRoom1_EventScript_23BAEF:: @ 823BAEF - setvar VAR_TEMP_1, 32 - return - -LinkContestRoom1_EventScript_23BAF5:: @ 823BAF5 - setvar VAR_TEMP_1, 33 - return - -LinkContestRoom1_EventScript_23BAFB:: @ 823BAFB - setvar VAR_TEMP_1, 34 - return - -LinkContestRoom1_EventScript_23BB01:: @ 823BB01 - setvar VAR_TEMP_1, 35 - return - -LinkContestRoom1_EventScript_23BB07:: @ 823BB07 - setvar VAR_TEMP_1, 36 - return - -LinkContestRoom1_EventScript_23BB0D:: @ 823BB0D - setvar VAR_TEMP_1, 37 - return - -LinkContestRoom1_EventScript_23BB13:: @ 823BB13 - setvar VAR_TEMP_1, 38 - return - -LinkContestRoom1_EventScript_23BB19:: @ 823BB19 - setvar VAR_TEMP_1, 44 - return - -LinkContestRoom1_EventScript_23BB1F:: @ 823BB1F - setvar VAR_TEMP_1, 45 - return - -LinkContestRoom1_EventScript_23BB25:: @ 823BB25 - setvar VAR_TEMP_1, 46 - return - -LinkContestRoom1_EventScript_23BB2B:: @ 823BB2B - specialvar VAR_RESULT, sub_80F9160 - compare VAR_RESULT, 1 - goto_eq LinkContestRoom1_EventScript_23BD86 - switch VAR_0x4088 - case 1, LinkContestRoom1_EventScript_23BB78 - case 2, LinkContestRoom1_EventScript_23BB8B - case 3, LinkContestRoom1_EventScript_23BBE6 - case 4, LinkContestRoom1_EventScript_23BC92 - case 5, LinkContestRoom1_EventScript_23BC92 - return - -LinkContestRoom1_EventScript_23BB78:: @ 823BB78 - createvobject 5, 20, 3, 2, 3, 1 - createvobject 46, 24, 11, 2, 3, 1 - return - -LinkContestRoom1_EventScript_23BB8B:: @ 823BB8B - createvobject 45, 0, 2, 3, 3, 4 - createvobject 66, 1, 2, 4, 3, 4 - createvobject 55, 2, 2, 7, 3, 4 - createvobject 46, 3, 2, 8, 3, 4 - createvobject 5, 10, 12, 3, 3, 3 - createvobject 20, 11, 12, 4, 3, 3 - createvobject 24, 12, 12, 7, 3, 3 - createvobject 12, 13, 12, 8, 3, 3 - createvobject 47, 20, 3, 2, 3, 1 - createvobject 46, 24, 11, 2, 3, 1 - return - -LinkContestRoom1_EventScript_23BBE6:: @ 823BBE6 - createvobject 45, 0, 2, 3, 3, 4 - createvobject 66, 1, 2, 4, 3, 4 - createvobject 55, 2, 2, 7, 3, 4 - createvobject 48, 3, 2, 8, 3, 4 - createvobject 5, 10, 12, 3, 3, 3 - createvobject 20, 11, 12, 4, 3, 3 - createvobject 24, 12, 12, 7, 3, 3 - createvobject 45, 13, 12, 8, 3, 3 - createvobject 22, 20, 3, 2, 3, 1 - createvobject 23, 20, 6, 2, 3, 1 - createvobject 34, 20, 7, 2, 3, 1 - createvobject 46, 24, 8, 2, 3, 1 - createvobject 48, 24, 11, 2, 3, 1 - createvobject 11, 25, 3, 9, 3, 2 - createvobject 35, 26, 4, 9, 3, 2 - createvobject 17, 27, 5, 9, 3, 2 - createvobject 40, 28, 9, 9, 3, 2 - createvobject 38, 29, 10, 9, 3, 2 - createvobject 83, 30, 11, 9, 3, 2 - return - -LinkContestRoom1_EventScript_23BC92:: @ 823BC92 - createvobject 45, 0, 2, 3, 3, 4 - createvobject 66, 1, 2, 4, 3, 4 - createvobject 55, 2, 2, 7, 3, 4 - createvobject 12, 3, 2, 8, 3, 4 - createvobject 39, 4, 1, 3, 3, 4 - createvobject 34, 6, 1, 5, 3, 4 - createvobject 26, 7, 1, 6, 3, 4 - createvobject 48, 9, 1, 8, 3, 4 - createvobject 5, 10, 12, 3, 3, 3 - createvobject 20, 11, 12, 4, 3, 3 - createvobject 24, 12, 12, 7, 3, 3 - createvobject 45, 13, 12, 8, 3, 3 - createvobject 50, 14, 13, 3, 3, 3 - createvobject 52, 15, 13, 4, 3, 3 - createvobject 65, 17, 13, 6, 3, 3 - createvobject 83, 18, 13, 7, 3, 3 - createvobject 116, 19, 13, 8, 3, 3 - createvobject 25, 20, 3, 2, 3, 1 - createvobject 31, 21, 6, 2, 3, 1 - createvobject 33, 22, 7, 2, 3, 1 - createvobject 46, 24, 11, 2, 3, 1 - createvobject 49, 25, 3, 9, 3, 2 - createvobject 35, 26, 4, 9, 3, 2 - createvobject 48, 27, 5, 9, 3, 2 - createvobject 40, 28, 9, 9, 3, 2 - createvobject 38, 29, 10, 9, 3, 2 - createvobject 83, 30, 11, 9, 3, 2 - return - -LinkContestRoom1_EventScript_23BD86:: @ 823BD86 - createvobject 45, 0, 2, 3, 3, 4 - createvobject 66, 1, 2, 4, 3, 4 - createvobject 55, 2, 2, 7, 3, 4 - createvobject 12, 3, 2, 8, 3, 4 - createvobject 39, 4, 1, 3, 3, 4 - createvobject 34, 6, 1, 5, 3, 4 - createvobject 26, 7, 1, 6, 3, 4 - createvobject 48, 9, 1, 8, 3, 4 - createvobject 5, 10, 12, 3, 3, 3 - createvobject 20, 11, 12, 4, 3, 3 - createvobject 24, 12, 12, 7, 3, 3 - createvobject 45, 13, 12, 8, 3, 3 - createvobject 50, 14, 13, 3, 3, 3 - createvobject 52, 15, 13, 4, 3, 3 - createvobject 65, 17, 13, 6, 3, 3 - createvobject 83, 18, 13, 7, 3, 3 - createvobject 116, 19, 13, 8, 3, 3 - createvobject 25, 20, 3, 2, 3, 1 - createvobject 31, 21, 6, 2, 3, 1 - createvobject 33, 22, 7, 2, 3, 1 - createvobject 46, 24, 11, 2, 3, 1 - return - -LinkContestRoom1_EventScript_23BE44:: @ 823BE44 - special sub_80F9154 - switch VAR_0x4088 - case 1, LinkContestRoom1_EventScript_23BE84 - case 2, LinkContestRoom1_EventScript_23BE8E - case 3, LinkContestRoom1_EventScript_23BE98 - case 4, LinkContestRoom1_EventScript_23BEA2 - case 5, LinkContestRoom1_EventScript_23BEAC - return - -LinkContestRoom1_EventScript_23BE84:: @ 823BE84 - warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 - waitstate - end - -LinkContestRoom1_EventScript_23BE8E:: @ 823BE8E - warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 - waitstate - end - -LinkContestRoom1_EventScript_23BE98:: @ 823BE98 - warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 - waitstate - end - -LinkContestRoom1_EventScript_23BEA2:: @ 823BEA2 - warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 - waitstate - end - -LinkContestRoom1_EventScript_23BEAC:: @ 823BEAC - warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 15, 4 - waitstate - end - -LilycoveCity_ContestLobby_EventScript_23BEB6:: @ 823BEB6 - checkplayergender - compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_23BECE - compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_23BED4 - return - -LilycoveCity_ContestLobby_EventScript_23BECE:: @ 823BECE - setvar VAR_OBJ_GFX_ID_3, 100 - return - -LilycoveCity_ContestLobby_EventScript_23BED4:: @ 823BED4 - setvar VAR_OBJ_GFX_ID_3, 105 - return - diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/scripts/maps/VerdanturfTown.inc deleted file mode 100644 index 2987a9a59..000000000 --- a/data/scripts/maps/VerdanturfTown.inc +++ /dev/null @@ -1,127 +0,0 @@ -VerdanturfTown_MapScripts:: @ 81EB566 - map_script 3, VerdanturfTown_MapScript1_1EB56C - .byte 0 - -VerdanturfTown_MapScript1_1EB56C: @ 81EB56C - setflag FLAG_VISITED_VERDANTURF_TOWN - setvar VAR_0x4086, 0 - end - -VerdanturfTown_EventScript_1EB575:: @ 81EB575 - lock - faceplayer - checkflag FLAG_0x0C7 - goto_eq VerdanturfTown_EventScript_1EB594 - msgbox VerdanturfTown_Text_1EB5FD, 4 - applymovement 2, VerdanturfTown_Movement_2725A2 - waitmovement 0 - release - end - -VerdanturfTown_EventScript_1EB594:: @ 81EB594 - msgbox VerdanturfTown_Text_1EB6E0, 4 - applymovement 2, VerdanturfTown_Movement_2725A2 - waitmovement 0 - release - end - -VerdanturfTown_EventScript_1EB5A8:: @ 81EB5A8 - msgbox VerdanturfTown_Text_1EB736, 2 - end - -VerdanturfTown_EventScript_1EB5B1:: @ 81EB5B1 - msgbox VerdanturfTown_Text_1EB7E2, 2 - end - -VerdanturfTown_EventScript_1EB5BA:: @ 81EB5BA - lock - faceplayer - checkflag FLAG_0x0C7 - goto_eq VerdanturfTown_EventScript_1EB5CF - msgbox VerdanturfTown_Text_1EB854, 4 - release - end - -VerdanturfTown_EventScript_1EB5CF:: @ 81EB5CF - msgbox VerdanturfTown_Text_1EB935, 4 - release - end - -VerdanturfTown_EventScript_1EB5D9:: @ 81EB5D9 - msgbox VerdanturfTown_Text_1EB9C4, 3 - end - -VerdanturfTown_EventScript_1EB5E2:: @ 81EB5E2 - msgbox VerdanturfTown_Text_1EBA11, 3 - end - -VerdanturfTown_EventScript_1EB5EB:: @ 81EB5EB - msgbox VerdanturfTown_Text_1EBA1F, 3 - end - -VerdanturfTown_EventScript_1EB5F4:: @ 81EB5F4 - msgbox VerdanturfTown_Text_1EBA59, 3 - end - -VerdanturfTown_Text_1EB5FD: @ 81EB5FD - .string "My papa told me.\p" - .string "He says this tunnel is full of\n" - .string "timid POKéMON.\p" - .string "They get all scared of loud noise and\n" - .string "make a big uproar.\p" - .string "So they had to stop the big tunnel\n" - .string "project.\p" - .string "But there’s one man. He’s trying to dig\n" - .string "the tunnel by himself!$" - -VerdanturfTown_Text_1EB6E0: @ 81EB6E0 - .string "There was a man who dug a tunnel for\n" - .string "a lady he loved.\p" - .string "I don’t really get it, but hey!$" - -VerdanturfTown_Text_1EB736: @ 81EB736 - .string "The way the winds blow, volcanic ash\n" - .string "is never blown in this direction.\p" - .string "The air is clean and delicious here.\n" - .string "Living here should do wonders for even\l" - .string "frail and sickly people.$" - -VerdanturfTown_Text_1EB7E2: @ 81EB7E2 - .string "My POKéMON and I, we’ve been riding\n" - .string "a hot winning streak.\p" - .string "So I decided to make my BATTLE TENT\n" - .string "debut in this town.$" - -VerdanturfTown_Text_1EB854: @ 81EB854 - .string "Did you see the cave next to the\n" - .string "POKéMON MART?\p" - .string "There’s a guy in there who’s trying to\n" - .string "bust up boulders so he can bust out\l" - .string "through to the other side.\p" - .string "It’d be great if we could go through…\n" - .string "It’ll make it easy to visit RUSTBORO.$" - -VerdanturfTown_Text_1EB935: @ 81EB935 - .string "That cave next to the POKéMON MART\n" - .string "is now a tunnel to the other side.\p" - .string "It’s great--it’s easy to go shop for\n" - .string "new DEVON products in RUSTBORO now.$" - -VerdanturfTown_Text_1EB9C4: @ 81EB9C4 - .string "VERDANTURF TOWN\p" - .string "“The windswept highlands with the\n" - .string "sweet fragrance of grass.â€$" - -VerdanturfTown_Text_1EBA11: @ 81EBA11 - .string "WANDA’S HOUSE$" - -VerdanturfTown_Text_1EBA1F: @ 81EBA1F - .string "BATTLE TENT VERDANTURF SITE\n" - .string "“Feast Your Eyes on Battles!â€$" - -VerdanturfTown_Text_1EBA59: @ 81EBA59 - .string "RUSTURF TUNNEL\n" - .string "“Linking RUSTBORO and VERDANTURF\p" - .string "“The tunnel project has been\n" - .string "canceled.â€$" - diff --git a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc b/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc deleted file mode 100644 index b7f687cdf..000000000 --- a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc +++ /dev/null @@ -1,200 +0,0 @@ -VerdanturfTown_BattleTentBattleRoom_MapScripts:: @ 82022FA - map_script 3, VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A - map_script 2, VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E - map_script 4, VerdanturfTown_BattleTentBattleRoom_MapScript2_202541 - .byte 0 - -VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A: @ 820230A - call VerdanturfTown_BattleTentBattleRoom_EventScript_202310 - end - -VerdanturfTown_BattleTentBattleRoom_EventScript_202310:: @ 8202310 - checkplayergender - compare VAR_RESULT, 0 - goto_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202328 - compare VAR_RESULT, 1 - goto_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202333 - return - -VerdanturfTown_BattleTentBattleRoom_EventScript_202328:: @ 8202328 - setvar VAR_OBJ_GFX_ID_1, 100 - setvar VAR_OBJ_GFX_ID_0, 100 - return - -VerdanturfTown_BattleTentBattleRoom_EventScript_202333:: @ 8202333 - setvar VAR_OBJ_GFX_ID_1, 105 - setvar VAR_OBJ_GFX_ID_0, 105 - return - -VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E: @ 820233E - map_script_2 VAR_TEMP_0, 0, VerdanturfTown_BattleTentBattleRoom_EventScript_202348 - .2byte 0 - -VerdanturfTown_BattleTentBattleRoom_EventScript_202348:: @ 8202348 - showobjectat 1, MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM - applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_202575 - waitmovement 0 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special sub_81A1780 - compare VAR_RESULT, 0 - goto_if 5, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C - -VerdanturfTown_BattleTentBattleRoom_EventScript_20236F:: @ 820236F - setvar VAR_0x8004, 3 - special sub_8161F74 - addobject 2 - applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_20257B - waitmovement 0 - setvar VAR_0x8004, 4 - special sub_81B99B4 - msgbox 0x2021fc4, 4 - waitmessage - call VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7 - switch VAR_RESULT - case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8 - -VerdanturfTown_BattleTentBattleRoom_EventScript_2023AA:: @ 82023AA - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 4 - special sub_81A1780 - special LoadPlayerParty - warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 - waitstate - -VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special sub_81A1780 - addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 - switch VAR_RESULT - case 3, VerdanturfTown_BattleTentBattleRoom_EventScript_202501 - applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_202581 - waitmovement 0 - removeobject 2 - applymovement 3, VerdanturfTown_BattleTentBattleRoom_Movement_2725AA - applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_2725A6 - waitmovement 0 - msgbox VerdanturfTown_BattleTentBattleRoom_Text_24FF00, 4 - special LoadPlayerParty - special SavePlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 - special sub_81A1780 - playfanfare MUS_ME_ASA - waitfanfare - special HealPlayerParty - -VerdanturfTown_BattleTentBattleRoom_EventScript_20243C:: @ 820243C - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special sub_81A1780 - compare VAR_RESULT, 1 - call_if 1, VerdanturfTown_BattleTentBattleRoom_EventScript_202565 - compare VAR_RESULT, 2 - call_if 1, VerdanturfTown_BattleTentBattleRoom_EventScript_20256C - multichoice 20, 6, 104, 1 - switch VAR_RESULT - case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_2024EA - case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_20248A - case 2, VerdanturfTown_BattleTentBattleRoom_EventScript_2024B8 - -VerdanturfTown_BattleTentBattleRoom_EventScript_20248A:: @ 820248A - msgbox VerdanturfTown_BattleTentBattleRoom_Text_250030, 5 - switch VAR_RESULT - case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C - case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_20251F - case 127, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C - -VerdanturfTown_BattleTentBattleRoom_EventScript_2024B8:: @ 82024B8 - message VerdanturfTown_BattleTentBattleRoom_Text_25005A - waitmessage - multichoicedefault 20, 8, 94, 1, 0 - switch VAR_RESULT - case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C - case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_2023AA - case 127, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C - -VerdanturfTown_BattleTentBattleRoom_EventScript_2024EA:: @ 82024EA - applymovement 3, VerdanturfTown_BattleTentBattleRoom_Movement_2725A8 - applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_2725A8 - waitmovement 0 - closemessage - goto VerdanturfTown_BattleTentBattleRoom_EventScript_20236F - -VerdanturfTown_BattleTentBattleRoom_EventScript_202501:: @ 8202501 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 3 - special sub_81A1780 - special LoadPlayerParty - warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 - waitstate - -VerdanturfTown_BattleTentBattleRoom_EventScript_20251F:: @ 820251F - message VerdanturfTown_BattleTentBattleRoom_Text_25007E - waitmessage - setvar VAR_0x8004, 5 - setvar VAR_0x8005, 2 - special sub_81B99B4 - playse SE_SAVE - waitse - fadescreen 1 - setvar VAR_0x8004, 4 - special sub_81A1780 - end - -VerdanturfTown_BattleTentBattleRoom_MapScript2_202541: @ 8202541 - map_script_2 VAR_TEMP_1, 0, VerdanturfTown_BattleTentBattleRoom_EventScript_20254B - .2byte 0 - -VerdanturfTown_BattleTentBattleRoom_EventScript_20254B:: @ 820254B - 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 - removeobject 2 - end - -VerdanturfTown_BattleTentBattleRoom_EventScript_202565:: @ 8202565 - message VerdanturfTown_BattleTentBattleRoom_Text_24FF28 - waitmessage - return - -VerdanturfTown_BattleTentBattleRoom_EventScript_20256C:: @ 820256C - message VerdanturfTown_BattleTentBattleRoom_Text_24FF54 - waitmessage - return - -VerdanturfTown_BattleTentBattleRoom_Movement_202573: @ 8202573 - set_invisible - step_end - -VerdanturfTown_BattleTentBattleRoom_Movement_202575: @ 8202575 - set_visible - walk_up - walk_up - walk_up - face_right - step_end - -VerdanturfTown_BattleTentBattleRoom_Movement_20257B: @ 820257B - walk_down - walk_down - walk_down - walk_down - face_left - step_end - -VerdanturfTown_BattleTentBattleRoom_Movement_202581: @ 8202581 - 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 deleted file mode 100644 index a4c2e502c..000000000 --- a/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc +++ /dev/null @@ -1,69 +0,0 @@ -VerdanturfTown_BattleTentCorridor_MapScripts:: @ 820208A - map_script 2, VerdanturfTown_BattleTentCorridor_MapScript2_202090 - .byte 0 - -VerdanturfTown_BattleTentCorridor_MapScript2_202090: @ 8202090 - map_script_2 VAR_TEMP_0, 0, VerdanturfTown_BattleTentCorridor_EventScript_20209A - .2byte 0 - -VerdanturfTown_BattleTentCorridor_EventScript_20209A:: @ 820209A - lockall - setvar VAR_TEMP_0, 1 - applymovement 1, VerdanturfTown_BattleTentCorridor_Movement_2020DE - applymovement 255, VerdanturfTown_BattleTentCorridor_Movement_2020DE - waitmovement 0 - opendoor 2, 1 - waitdooranim - applymovement 1, VerdanturfTown_BattleTentCorridor_Movement_2020E4 - applymovement 255, VerdanturfTown_BattleTentCorridor_Movement_2020E3 - waitmovement 0 - closedoor 2, 1 - waitdooranim - setvar VAR_0x8006, 0 - warp MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM, 255, 6, 5 - waitstate - releaseall - end - -VerdanturfTown_BattleTentCorridor_Movement_2020DE: @ 82020DE - walk_up - walk_up - walk_up - walk_up - step_end - -VerdanturfTown_BattleTentCorridor_Movement_2020E3: @ 82020E3 - walk_up - -VerdanturfTown_BattleTentCorridor_Movement_2020E4: @ 82020E4 - walk_up - set_invisible - step_end - -VerdanturfTown_BattleTentCorridor_Text_2020E7: @ 82020E7 - .string "Which CONTEST are you entering?\n" - .string "Want a piece of advice?\p" - .string "In any CONTEST, for example, a CUTE\n" - .string "CONTEST, I don’t think they judge you\l" - .string "only on cuteness in the first round.\p" - .string "You need to work out ways for raising\n" - .string "POKéMON better.$" - -VerdanturfTown_BattleTentCorridor_Text_2021C4: @ 82021C4 - .string "I raised my POKéMON to be cute.\p" - .string "I found out you can put POKéMON in\n" - .string "a CONTEST for cuteness!\p" - .string "I’m so glad I raised my POKéMON with\n" - .string "loving care…$" - -VerdanturfTown_BattleTentCorridor_Text_202251: @ 8202251 - .string "My POKéMON rules!\p" - .string "It’s cool, tough yet beautiful, cute,\n" - .string "and smart. It’s complete!\p" - .string "I may as well go for wins in every\n" - .string "single CONTEST.$" - -VerdanturfTown_BattleTentCorridor_Text_2022D6: @ 82022D6 - .string "POKéMON CONTESTS\n" - .string "NORMAL RANK STAGE!$" - diff --git a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc b/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc deleted file mode 100644 index 26f0680a0..000000000 --- a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc +++ /dev/null @@ -1,439 +0,0 @@ -VerdanturfTown_BattleTentLobby_MapScripts:: @ 82016D0 - map_script 2, VerdanturfTown_BattleTentLobby_MapScript2_2016EF - map_script 4, VerdanturfTown_BattleTentLobby_MapScript2_2016DB - .byte 0 - -VerdanturfTown_BattleTentLobby_MapScript2_2016DB: @ 82016DB - map_script_2 VAR_TEMP_1, 0, VerdanturfTown_BattleTentLobby_EventScript_2016E5 - .2byte 0 - -VerdanturfTown_BattleTentLobby_EventScript_2016E5:: @ 82016E5 - setvar VAR_TEMP_1, 1 - turnobject 255, 2 - end - -VerdanturfTown_BattleTentLobby_MapScript2_2016EF: @ 82016EF - map_script_2 VAR_TEMP_0, 0, VerdanturfTown_BattleTentLobby_EventScript_201719 - map_script_2 VAR_TEMP_0, 1, VerdanturfTown_BattleTentLobby_EventScript_201722 - map_script_2 VAR_TEMP_0, 2, VerdanturfTown_BattleTentLobby_EventScript_201837 - map_script_2 VAR_TEMP_0, 3, VerdanturfTown_BattleTentLobby_EventScript_201757 - map_script_2 VAR_TEMP_0, 4, VerdanturfTown_BattleTentLobby_EventScript_2017FD - .2byte 0 - -VerdanturfTown_BattleTentLobby_EventScript_201719:: @ 8201719 - setvar VAR_0x8004, 0 - special sub_81A1780 - end - -VerdanturfTown_BattleTentLobby_EventScript_201722:: @ 8201722 - lockall - msgbox VerdanturfTown_BattleTentLobby_Text_24E636, 4 - closemessage - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_TEMP_0, 255 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 0 - special sub_81A1780 - releaseall - end - -VerdanturfTown_BattleTentLobby_EventScript_201757:: @ 8201757 - lockall - msgbox VerdanturfTown_BattleTentLobby_Text_2C5731, 4 - message VerdanturfTown_BattleTentLobby_Text_2C5791 - waitmessage - setvar VAR_0x8004, 6 - special sub_81B99B4 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_0x8004, 5 - setvar VAR_0x8005, 0 - special sub_81B99B4 - playse SE_SAVE - waitse - -VerdanturfTown_BattleTentLobby_EventScript_201791:: @ 8201791 - msgbox VerdanturfTown_BattleTentLobby_Text_2C57CD, 4 - setvar VAR_0x8004, 7 - special sub_81B99B4 - switch VAR_RESULT - case 0, VerdanturfTown_BattleTentLobby_EventScript_2017DD - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special sub_81A1780 - message VerdanturfTown_BattleTentLobby_Text_24A554 - waitmessage - playfanfare MUS_FANFA4 - waitfanfare - msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, 4 - closemessage - setvar VAR_TEMP_0, 255 - releaseall - end - -VerdanturfTown_BattleTentLobby_EventScript_2017DD:: @ 82017DD - msgbox VerdanturfTown_BattleTentLobby_Text_24E57B, 4 - waitmessage - closemessage - setvar VAR_TEMP_0, 255 - releaseall - end - -VerdanturfTown_BattleTentLobby_EventScript_2017EE:: @ 82017EE - lockall - msgbox VerdanturfTown_BattleTentLobby_Text_2C5731, 4 - goto VerdanturfTown_BattleTentLobby_EventScript_201791 - end - -VerdanturfTown_BattleTentLobby_EventScript_2017FD:: @ 82017FD - lockall - message VerdanturfTown_BattleTentLobby_Text_2C56B8 - waitmessage - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_0x8004, 5 - setvar VAR_0x8005, 0 - special sub_81B99B4 - playse SE_SAVE - waitse - msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, 4 - closemessage - setvar VAR_TEMP_0, 255 - releaseall - end - -VerdanturfTown_BattleTentLobby_EventScript_201837:: @ 8201837 - lockall - msgbox VerdanturfTown_BattleTentLobby_Text_24E5D8, 4 - message VerdanturfTown_BattleTentLobby_Text_24E5F6 - waitmessage - setvar VAR_0x8004, 5 - setvar VAR_0x8005, 1 - special sub_81B99B4 - playse SE_SAVE - waitse - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 0 - special sub_81A1780 - setvar VAR_TEMP_0, 255 - goto VerdanturfTown_BattleTentLobby_EventScript_2019AE - -VerdanturfTown_BattleTentLobby_EventScript_201873:: @ 8201873 - lock - faceplayer - setvar VAR_0x8004, 1 - special sub_81B99B4 - compare VAR_RESULT, 0 - goto_if 5, VerdanturfTown_BattleTentLobby_EventScript_2017EE - special SavePlayerParty - msgbox VerdanturfTown_BattleTentLobby_Text_2C50C3, 4 - -VerdanturfTown_BattleTentLobby_EventScript_201893:: @ 8201893 - message VerdanturfTown_BattleTentLobby_Text_2C5129 - waitmessage - multichoice 17, 6, 23, 0 - switch VAR_RESULT - case 0, VerdanturfTown_BattleTentLobby_EventScript_2018CF - case 1, VerdanturfTown_BattleTentLobby_EventScript_2019DB - case 2, VerdanturfTown_BattleTentLobby_EventScript_201A37 - case 127, VerdanturfTown_BattleTentLobby_EventScript_201A37 - -VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF - setvar VAR_FRONTIER_FACILITY, 2 - setvar VAR_0x40CE, 0 - setvar VAR_RESULT, 2 - setvar VAR_0x8004, 15 - special sub_81A1780 - compare VAR_0x8004, 1 - goto_eq VerdanturfTown_BattleTentLobby_EventScript_2019E8 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 2 - special sub_81A1780 - msgbox VerdanturfTown_BattleTentLobby_Text_2C5633, 4 - fadescreen 1 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 3 - special sub_80F9490 - waitstate - compare VAR_RESULT, 0 - goto_eq VerdanturfTown_BattleTentLobby_EventScript_201A34 - msgbox VerdanturfTown_BattleTentLobby_Text_2C5662, 5 - switch VAR_RESULT - case 0, VerdanturfTown_BattleTentLobby_EventScript_201A34 - case 1, VerdanturfTown_BattleTentLobby_EventScript_201954 - case 127, VerdanturfTown_BattleTentLobby_EventScript_201A34 - -VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954 - setvar VAR_TEMP_0, 0 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 4 - special sub_81A1780 - setvar VAR_0x8004, 0 - special sub_81B99B4 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 1 - special sub_81A1780 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 0 - special sub_81A1780 - special LoadPlayerParty - closemessage - delay 2 - call VerdanturfTown_BattleTentLobby_EventScript_27134F - setvar VAR_TEMP_0, 255 - compare VAR_RESULT, 0 - goto_eq VerdanturfTown_BattleTentLobby_EventScript_201A1D - -VerdanturfTown_BattleTentLobby_EventScript_2019AE:: @ 82019AE - special SavePlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 - special sub_81A1780 - msgbox VerdanturfTown_BattleTentLobby_Text_2C56A2, 4 - closemessage - call VerdanturfTown_BattleTentLobby_EventScript_201A41 - warp MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7 - setvar VAR_TEMP_0, 0 - waitstate - end - -VerdanturfTown_BattleTentLobby_EventScript_2019DB:: @ 82019DB - msgbox VerdanturfTown_BattleTentLobby_Text_2C5163, 4 - goto VerdanturfTown_BattleTentLobby_EventScript_201893 - -VerdanturfTown_BattleTentLobby_EventScript_2019E8:: @ 82019E8 - switch VAR_RESULT - case 0, VerdanturfTown_BattleTentLobby_EventScript_201A03 - case 1, VerdanturfTown_BattleTentLobby_EventScript_201A10 - -VerdanturfTown_BattleTentLobby_EventScript_201A03:: @ 8201A03 - msgbox VerdanturfTown_BattleTentLobby_Text_2C543D, 4 - goto VerdanturfTown_BattleTentLobby_EventScript_201A3F - -VerdanturfTown_BattleTentLobby_EventScript_201A10:: @ 8201A10 - msgbox VerdanturfTown_BattleTentLobby_Text_2C5538, 4 - goto VerdanturfTown_BattleTentLobby_EventScript_201A3F - -VerdanturfTown_BattleTentLobby_EventScript_201A1D:: @ 8201A1D - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special sub_81A1780 - goto VerdanturfTown_BattleTentLobby_EventScript_201A37 - -VerdanturfTown_BattleTentLobby_EventScript_201A34:: @ 8201A34 - special LoadPlayerParty - -VerdanturfTown_BattleTentLobby_EventScript_201A37:: @ 8201A37 - msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, 4 - -VerdanturfTown_BattleTentLobby_EventScript_201A3F:: @ 8201A3F - release - end - -VerdanturfTown_BattleTentLobby_EventScript_201A41:: @ 8201A41 - applymovement 1, VerdanturfTown_BattleTentLobby_Movement_201A70 - applymovement 255, VerdanturfTown_BattleTentLobby_Movement_201A70 - waitmovement 0 - opendoor 6, 1 - waitdooranim - applymovement 1, VerdanturfTown_BattleTentLobby_Movement_201A74 - applymovement 255, VerdanturfTown_BattleTentLobby_Movement_201A77 - waitmovement 0 - closedoor 6, 1 - waitdooranim - return - -VerdanturfTown_BattleTentLobby_Movement_201A70: @ 8201A70 - walk_up - walk_up - walk_up - step_end - -VerdanturfTown_BattleTentLobby_Movement_201A74: @ 8201A74 - walk_up - set_invisible - step_end - -VerdanturfTown_BattleTentLobby_Movement_201A77: @ 8201A77 - walk_up - walk_up - set_invisible - step_end - -VerdanturfTown_BattleTentLobby_EventScript_201A7B:: @ 8201A7B - lock - faceplayer - checkflag FLAG_0x0EB - goto_eq VerdanturfTown_BattleTentLobby_EventScript_201AB2 - msgbox VerdanturfTown_BattleTentLobby_Text_201D9E, 4 - giveitem_std ITEM_TM45 - compare VAR_RESULT, 0 - goto_eq VerdanturfTown_BattleTentLobby_EventScript_272054 - setflag FLAG_0x0EB - msgbox VerdanturfTown_BattleTentLobby_Text_201E43, 4 - release - end - -VerdanturfTown_BattleTentLobby_EventScript_201AB2:: @ 8201AB2 - msgbox VerdanturfTown_BattleTentLobby_Text_201E43, 4 - release - end - -VerdanturfTown_BattleTentLobby_EventScript_201ABC:: @ 8201ABC - msgbox VerdanturfTown_BattleTentLobby_Text_201EB1, 2 - end - -VerdanturfTown_BattleTentLobby_EventScript_201AC5:: @ 8201AC5 - lock - msgbox VerdanturfTown_BattleTentLobby_Text_201BD4, 4 - release - end - -VerdanturfTown_BattleTentLobby_EventScript_201AD0:: @ 8201AD0 - lock - faceplayer - checkflag FLAG_0x1CC - goto_eq VerdanturfTown_BattleTentLobby_EventScript_201AED - msgbox VerdanturfTown_BattleTentLobby_Text_201F3F, 4 - addvar VAR_0x40D1, 1 - setflag FLAG_0x1CC - release - end - -VerdanturfTown_BattleTentLobby_EventScript_201AED:: @ 8201AED - msgbox VerdanturfTown_BattleTentLobby_Text_202025, 4 - release - end - -VerdanturfTown_BattleTentLobby_EventScript_201AF7:: @ 8201AF7 - lock - msgbox VerdanturfTown_BattleTentLobby_Text_201D11, 4 - release - end - -VerdanturfTown_BattleTentLobby_EventScript_201B02:: @ 8201B02 - lockall - msgbox VerdanturfTown_BattleTentLobby_Text_2C6878, 4 - goto VerdanturfTown_BattleTentLobby_EventScript_201B11 - end - -VerdanturfTown_BattleTentLobby_EventScript_201B11:: @ 8201B11 - message VerdanturfTown_BattleTentLobby_Text_24EF88 - waitmessage - setvar VAR_0x8004, 12 - special sub_813A128 - waitstate - switch VAR_RESULT - case 0, VerdanturfTown_BattleTentLobby_EventScript_201B7E - case 1, VerdanturfTown_BattleTentLobby_EventScript_201B8C - case 2, VerdanturfTown_BattleTentLobby_EventScript_201B9A - case 3, VerdanturfTown_BattleTentLobby_EventScript_201BA8 - case 4, VerdanturfTown_BattleTentLobby_EventScript_201BB6 - case 5, VerdanturfTown_BattleTentLobby_EventScript_201BC4 - case 6, VerdanturfTown_BattleTentLobby_EventScript_201BD2 - case 127, VerdanturfTown_BattleTentLobby_EventScript_201BD2 - end - -VerdanturfTown_BattleTentLobby_EventScript_201B7E:: @ 8201B7E - msgbox VerdanturfTown_BattleTentLobby_Text_2C67CD, 4 - goto VerdanturfTown_BattleTentLobby_EventScript_201B11 - end - -VerdanturfTown_BattleTentLobby_EventScript_201B8C:: @ 8201B8C - msgbox VerdanturfTown_BattleTentLobby_Text_24EFAB, 4 - goto VerdanturfTown_BattleTentLobby_EventScript_201B11 - end - -VerdanturfTown_BattleTentLobby_EventScript_201B9A:: @ 8201B9A - msgbox VerdanturfTown_BattleTentLobby_Text_24F049, 4 - goto VerdanturfTown_BattleTentLobby_EventScript_201B11 - end - -VerdanturfTown_BattleTentLobby_EventScript_201BA8:: @ 8201BA8 - msgbox VerdanturfTown_BattleTentLobby_Text_24F190, 4 - goto VerdanturfTown_BattleTentLobby_EventScript_201B11 - end - -VerdanturfTown_BattleTentLobby_EventScript_201BB6:: @ 8201BB6 - msgbox VerdanturfTown_BattleTentLobby_Text_24F2E8, 4 - goto VerdanturfTown_BattleTentLobby_EventScript_201B11 - end - -VerdanturfTown_BattleTentLobby_EventScript_201BC4:: @ 8201BC4 - msgbox VerdanturfTown_BattleTentLobby_Text_24F3F4, 4 - goto VerdanturfTown_BattleTentLobby_EventScript_201B11 - end - -VerdanturfTown_BattleTentLobby_EventScript_201BD2:: @ 8201BD2 - releaseall - end - -VerdanturfTown_BattleTentLobby_Text_201BD4: @ 8201BD4 - .string "If it doesn’t like a certain move,\n" - .string "a POKéMON will be reluctant to use it.\p" - .string "It doesn’t matter how strong it is,\n" - .string "either.\p" - .string "For example, a POKéMON with a GENTLE\n" - .string "nature probably won’t enjoy hurting\l" - .string "its opponents.\p" - .string "If it can’t seem to live up to its\n" - .string "potential, it’s probably failing at\l" - .string "using a disliked move against its will.$" - -VerdanturfTown_BattleTentLobby_Text_201D11: @ 8201D11 - .string "My big sister is gentle usually.\n" - .string "But when she gets angry,\l" - .string "she’s really, really scary!\p" - .string "I bet a gentle POKéMON will be scary\n" - .string "if it gets angry!$" - -VerdanturfTown_BattleTentLobby_Text_201D9E: @ 8201D9E - .string "My feelings toward my POKéMON…\n" - .string "The attraction runs deep…\p" - .string "Oh, hi, you didn’t see that, did you?\n" - .string "Well, it doesn’t matter.\p" - .string "How would you like this TM for\n" - .string "your POKéMON?$" - -VerdanturfTown_BattleTentLobby_Text_201E43: @ 8201E43 - .string "My feelings toward my POKéMON…\n" - .string "I’m sure the attraction is mutual!\p" - .string "They battle exactly the way I want\n" - .string "them to!$" - -VerdanturfTown_BattleTentLobby_Text_201EB1: @ 8201EB1 - .string "What kind of moves have you taught\n" - .string "your POKéMON?\p" - .string "I think you would give yourself\n" - .string "an advantage if they knew how to\l" - .string "heal or protect themselves.$" - -VerdanturfTown_BattleTentLobby_Text_201F3F: @ 8201F3F - .string "SCOTT: Hey there, {PLAYER}{KUN}!\n" - .string "I thought I might see you here.\p" - .string "A BATTLE TENT’s a place where\n" - .string "you can meet tough TRAINERS.\p" - .string "It doesn’t matter what the rules are,\n" - .string "or how battles are waged, either.\p" - .string "{PLAYER}{KUN}, I expect you to do\n" - .string "the best you can!$" - -VerdanturfTown_BattleTentLobby_Text_202025: @ 8202025 - .string "SCOTT: I visit here regularly in hopes\n" - .string "of seeing tough TRAINERS in action\l" - .string "in whatever the situation.$" - diff --git a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc deleted file mode 100644 index 28030d869..000000000 --- a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc +++ /dev/null @@ -1,104 +0,0 @@ -VerdanturfTown_FriendshipRatersHouse_MapScripts:: @ 8203030 - .byte 0 - -VerdanturfTown_FriendshipRatersHouse_EventScript_203031:: @ 8203031 - lock - faceplayer - msgbox VerdanturfTown_FriendshipRatersHouse_Text_2030ED, 4 - specialvar VAR_RESULT, GetLeadMonFriendshipScore - switch VAR_RESULT - case 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203094 - case 1, VerdanturfTown_FriendshipRatersHouse_EventScript_20309E - case 2, VerdanturfTown_FriendshipRatersHouse_EventScript_2030A8 - case 3, VerdanturfTown_FriendshipRatersHouse_EventScript_2030B2 - case 4, VerdanturfTown_FriendshipRatersHouse_EventScript_2030BC - case 5, VerdanturfTown_FriendshipRatersHouse_EventScript_2030C6 - case 6, VerdanturfTown_FriendshipRatersHouse_EventScript_2030D0 - release - end - -VerdanturfTown_FriendshipRatersHouse_EventScript_203094:: @ 8203094 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_2032DF, 4 - release - end - -VerdanturfTown_FriendshipRatersHouse_EventScript_20309E:: @ 820309E - msgbox VerdanturfTown_FriendshipRatersHouse_Text_203288, 4 - release - end - -VerdanturfTown_FriendshipRatersHouse_EventScript_2030A8:: @ 82030A8 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_203249, 4 - release - end - -VerdanturfTown_FriendshipRatersHouse_EventScript_2030B2:: @ 82030B2 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_203213, 4 - release - end - -VerdanturfTown_FriendshipRatersHouse_EventScript_2030BC:: @ 82030BC - msgbox VerdanturfTown_FriendshipRatersHouse_Text_2031D1, 4 - release - end - -VerdanturfTown_FriendshipRatersHouse_EventScript_2030C6:: @ 82030C6 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_203192, 4 - release - end - -VerdanturfTown_FriendshipRatersHouse_EventScript_2030D0:: @ 82030D0 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_203141, 4 - release - end - -VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA:: @ 82030DA - lock - faceplayer - waitse - playmoncry SPECIES_PIKACHU, 0 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_20334A, 4 - waitmoncry - release - end - -VerdanturfTown_FriendshipRatersHouse_Text_2030ED: @ 82030ED - .string "Let me see your POKéMON.\n" - .string "I’ll check to see how much it likes you.\p" - .string "Oh.\n" - .string "Your POKéMON…$" - -VerdanturfTown_FriendshipRatersHouse_Text_203141: @ 8203141 - .string "It adores you.\n" - .string "It can’t possibly love you any more.\l" - .string "I even feel happy seeing it.$" - -VerdanturfTown_FriendshipRatersHouse_Text_203192: @ 8203192 - .string "It seems to be very happy.\n" - .string "It obviously likes you a whole lot.$" - -VerdanturfTown_FriendshipRatersHouse_Text_2031D1: @ 82031D1 - .string "It likes you quite a lot.\n" - .string "It seems to want to be babied a little.$" - -VerdanturfTown_FriendshipRatersHouse_Text_203213: @ 8203213 - .string "It’s getting used to you.\n" - .string "It seems to believe in you.$" - -VerdanturfTown_FriendshipRatersHouse_Text_203249: @ 8203249 - .string "It’s not very used to you yet.\n" - .string "It neither loves nor hates you.$" - -VerdanturfTown_FriendshipRatersHouse_Text_203288: @ 8203288 - .string "It’s very wary.\n" - .string "It has scary viciousness in its eyes.\l" - .string "It doesn’t like you much at all.$" - -VerdanturfTown_FriendshipRatersHouse_Text_2032DF: @ 82032DF - .string "This is a little hard for me to say…\p" - .string "Your POKéMON simply detests you.\n" - .string "Doesn’t that make you uncomfortable?$" - -VerdanturfTown_FriendshipRatersHouse_Text_20334A: @ 820334A - .string "PIKACHU: Pika pika!$" - diff --git a/data/scripts/maps/VerdanturfTown_House.inc b/data/scripts/maps/VerdanturfTown_House.inc deleted file mode 100644 index ce48fd662..000000000 --- a/data/scripts/maps/VerdanturfTown_House.inc +++ /dev/null @@ -1,25 +0,0 @@ -VerdanturfTown_House_MapScripts:: @ 820335E - .byte 0 - -VerdanturfTown_House_EventScript_20335F:: @ 820335F - msgbox VerdanturfTown_House_Text_203371, 2 - end - -VerdanturfTown_House_EventScript_203368:: @ 8203368 - msgbox VerdanturfTown_House_Text_2033EE, 2 - end - -VerdanturfTown_House_Text_203371: @ 8203371 - .string "Far away, deep in EVER GRANDE CITY,\n" - .string "is the POKéMON LEAGUE.\p" - .string "The TRAINERS who gather there are\n" - .string "all frighteningly well skilled.$" - -VerdanturfTown_House_Text_2033EE: @ 82033EE - .string "In the POKéMON LEAGUE, I think the\n" - .string "rules say that you have to battle the\l" - .string "ELITE FOUR all in a row.\p" - .string "If you lose to any of them, you have\n" - .string "to begin your challenge again from the\l" - .string "first one.$" - diff --git a/data/scripts/maps/VerdanturfTown_Mart.inc b/data/scripts/maps/VerdanturfTown_Mart.inc deleted file mode 100644 index 96daf2c84..000000000 --- a/data/scripts/maps/VerdanturfTown_Mart.inc +++ /dev/null @@ -1,60 +0,0 @@ -VerdanturfTown_Mart_MapScripts:: @ 8202586 - .byte 0 - -VerdanturfTown_Mart_EventScript_202587:: @ 8202587 - lock - faceplayer - message gUnknown_08272A21 - waitmessage - pokemart VerdanturfTown_Mart_Pokemart_2025A0 - msgbox gUnknown_08272A3F, 4 - release - end - - .align 2 -VerdanturfTown_Mart_Pokemart_2025A0: @ 82025A0 - .2byte ITEM_GREAT_BALL - .2byte ITEM_NEST_BALL - .2byte ITEM_SUPER_POTION - .2byte ITEM_ANTIDOTE - .2byte ITEM_PARALYZE_HEAL - .2byte ITEM_AWAKENING - .2byte ITEM_BURN_HEAL - .2byte ITEM_ICE_HEAL - .2byte ITEM_REPEL - .2byte ITEM_X_SPECIAL - .2byte ITEM_FLUFFY_TAIL - .2byte ITEM_NONE - release - end - -VerdanturfTown_Mart_EventScript_2025BA:: @ 82025BA - msgbox VerdanturfTown_Mart_Text_2025D5, 2 - end - -VerdanturfTown_Mart_EventScript_2025C3:: @ 82025C3 - msgbox VerdanturfTown_Mart_Text_20264C, 2 - end - -VerdanturfTown_Mart_EventScript_2025CC:: @ 82025CC - msgbox VerdanturfTown_Mart_Text_2026C9, 2 - end - -VerdanturfTown_Mart_Text_2025D5: @ 82025D5 - .string "For any POKéMON match, X SPECIAL\n" - .string "is crucial.\p" - .string "It jacks up the power of some moves\n" - .string "even though it’s only for one battle.$" - -VerdanturfTown_Mart_Text_20264C: @ 820264C - .string "They don’t seem to sell any winning\n" - .string "strategy guides for the BATTLE TENT…\p" - .string "It seems one must rely on one’s\n" - .string "own wits after all…$" - -VerdanturfTown_Mart_Text_2026C9: @ 82026C9 - .string "The NEST BALL works better on\n" - .string "weakened POKéMON.\p" - .string "VERDANTURF is the only place you can\n" - .string "buy it.$" - diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc deleted file mode 100644 index 73c7fe1f3..000000000 --- a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc +++ /dev/null @@ -1,42 +0,0 @@ -VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8202726 - map_script 3, VerdanturfTown_PokemonCenter_1F_MapScript1_202731 - map_script 5, VerdanturfTown_PokemonCenter_1F_MapScript1_277C30 - .byte 0 - -VerdanturfTown_PokemonCenter_1F_MapScript1_202731: @ 8202731 - setrespawn 18 - call VerdanturfTown_PokemonCenter_1F_EventScript_2718DE - end - -VerdanturfTown_PokemonCenter_1F_EventScript_20273A:: @ 820273A - setvar VAR_0x800B, 1 - call VerdanturfTown_PokemonCenter_1F_EventScript_27191E - waitmessage - waitbuttonpress - release - end - -VerdanturfTown_PokemonCenter_1F_EventScript_202748:: @ 8202748 - msgbox VerdanturfTown_PokemonCenter_1F_Text_20275A, 2 - end - -VerdanturfTown_PokemonCenter_1F_EventScript_202751:: @ 8202751 - msgbox VerdanturfTown_PokemonCenter_1F_Text_20280B, 2 - end - -VerdanturfTown_PokemonCenter_1F_Text_20275A: @ 820275A - .string "You can’t consider yourself a real\n" - .string "TRAINER if you don’t have faith\l" - .string "in your POKéMON.\p" - .string "Only those people who can believe\n" - .string "in their battling POKéMON can win\l" - .string "through to the very end.$" - -VerdanturfTown_PokemonCenter_1F_Text_20280B: @ 820280B - .string "The reason why anyone would visit\n" - .string "VERDANTURF…\p" - .string "It’s the BATTLE TENT. It goes without\n" - .string "saying.\p" - .string "Or is there somebody here that you\n" - .string "came to see?$" - diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc b/data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc deleted file mode 100644 index 9e93a628e..000000000 --- a/data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc +++ /dev/null @@ -1,19 +0,0 @@ -VerdanturfTown_PokemonCenter_2F_MapScripts:: @ 8202897 - map_script 2, VerdanturfTown_PokemonCenter_2F_MapScript2_276C3B - map_script 4, VerdanturfTown_PokemonCenter_2F_MapScript2_276B6C - map_script 1, VerdanturfTown_PokemonCenter_2F_MapScript1_276BBE - map_script 3, VerdanturfTown_PokemonCenter_2F_MapScript1_276ACF - .byte 0 - -VerdanturfTown_PokemonCenter_2F_EventScript_2028AC:: @ 82028AC - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 - end - -VerdanturfTown_PokemonCenter_2F_EventScript_2028B2:: @ 82028B2 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 - end - -VerdanturfTown_PokemonCenter_2F_EventScript_2028B8:: @ 82028B8 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB - end - diff --git a/data/scripts/maps/VerdanturfTown_WandasHouse.inc b/data/scripts/maps/VerdanturfTown_WandasHouse.inc deleted file mode 100644 index fabff6420..000000000 --- a/data/scripts/maps/VerdanturfTown_WandasHouse.inc +++ /dev/null @@ -1,176 +0,0 @@ -VerdanturfTown_WandasHouse_MapScripts:: @ 82028BE - .byte 0 - -VerdanturfTown_WandasHouse_EventScript_2028BF:: @ 82028BF - lock - faceplayer - checkflag FLAG_0x0C1 - goto_eq VerdanturfTown_WandasHouse_EventScript_2028D7 - msgbox VerdanturfTown_WandasHouse_Text_202993, 4 - setflag FLAG_0x0C1 - release - end - -VerdanturfTown_WandasHouse_EventScript_2028D7:: @ 82028D7 - msgbox VerdanturfTown_WandasHouse_Text_202ABE, 4 - release - end - -VerdanturfTown_WandasHouse_EventScript_2028E1:: @ 82028E1 - lock - faceplayer - checkflag FLAG_0x07E - goto_eq VerdanturfTown_WandasHouse_EventScript_202909 - checkflag FLAG_0x4F3 - goto_eq VerdanturfTown_WandasHouse_EventScript_2028FF - msgbox VerdanturfTown_WandasHouse_Text_202B37, 4 - release - end - -VerdanturfTown_WandasHouse_EventScript_2028FF:: @ 82028FF - msgbox VerdanturfTown_WandasHouse_Text_202C20, 4 - release - end - -VerdanturfTown_WandasHouse_EventScript_202909:: @ 8202909 - msgbox VerdanturfTown_WandasHouse_Text_202C4E, 4 - release - end - -VerdanturfTown_WandasHouse_EventScript_202913:: @ 8202913 - msgbox VerdanturfTown_WandasHouse_Text_202E00, 2 - end - -VerdanturfTown_WandasHouse_EventScript_20291C:: @ 820291C - lock - faceplayer - checkflag FLAG_0x4F3 - goto_eq VerdanturfTown_WandasHouse_EventScript_202944 - checkflag FLAG_0x0BE - goto_eq VerdanturfTown_WandasHouse_EventScript_20293A - msgbox VerdanturfTown_WandasHouse_Text_202D91, 4 - release - end - -VerdanturfTown_WandasHouse_EventScript_20293A:: @ 820293A - msgbox VerdanturfTown_WandasHouse_Text_202CCF, 4 - release - end - -VerdanturfTown_WandasHouse_EventScript_202944:: @ 8202944 - msgbox VerdanturfTown_WandasHouse_Text_202D91, 4 - release - end - -VerdanturfTown_WandasHouse_EventScript_20294E:: @ 820294E - lock - faceplayer - checkflag FLAG_0x07E - goto_eq VerdanturfTown_WandasHouse_EventScript_202989 - checkflag FLAG_0x4F3 - goto_eq VerdanturfTown_WandasHouse_EventScript_20297F - checkflag FLAG_0x0C7 - goto_eq VerdanturfTown_WandasHouse_EventScript_202975 - msgbox VerdanturfTown_WandasHouse_Text_202E47, 4 - release - end - -VerdanturfTown_WandasHouse_EventScript_202975:: @ 8202975 - msgbox VerdanturfTown_WandasHouse_Text_202F19, 4 - release - end - -VerdanturfTown_WandasHouse_EventScript_20297F:: @ 820297F - msgbox VerdanturfTown_WandasHouse_Text_202F73, 4 - release - end - -VerdanturfTown_WandasHouse_EventScript_202989:: @ 8202989 - msgbox VerdanturfTown_WandasHouse_Text_202FDB, 4 - release - end - -VerdanturfTown_WandasHouse_Text_202993: @ 8202993 - .string "WALLY: I lost to you, {PLAYER}, but I’m\n" - .string "not feeling down anymore.\p" - .string "Because I have a new purpose in life.\n" - .string "Together with my RALTS, I’m going\l" - .string "to challenge POKéMON GYMS and become\l" - .string "a great TRAINER.\p" - .string "Please watch me, {PLAYER}.\n" - .string "I’m going to be stronger than you.\p" - .string "When I do, I’m going to challenge you\n" - .string "to another battle.$" - -VerdanturfTown_WandasHouse_Text_202ABE: @ 8202ABE - .string "WALLY: Please watch me, {PLAYER}.\n" - .string "I’m going to get stronger than you.\p" - .string "When I do, I’m going to challenge you\n" - .string "to another battle.$" - -VerdanturfTown_WandasHouse_Text_202B37: @ 8202B37 - .string "UNCLE: Oh! {PLAYER}{KUN}!\n" - .string "WALLY’s next door.\p" - .string "But, boy, there’s something I have to\n" - .string "tell you.\p" - .string "This natural environment is doing\n" - .string "wonders for WALLY’s health.\p" - .string "Maybe it’s not just the environment.\n" - .string "It could be POKéMON that are giving\l" - .string "the boy hope.$" - -VerdanturfTown_WandasHouse_Text_202C20: @ 8202C20 - .string "WALLY’s gone away…\n" - .string "He slipped off on his own…$" - -VerdanturfTown_WandasHouse_Text_202C4E: @ 8202C4E - .string "UNCLE: Is that right?\n" - .string "WALLY’s gone away that far all by\l" - .string "himself…\p" - .string "Well, I have to give him credit--he is\n" - .string "my little brother’s son.$" - -VerdanturfTown_WandasHouse_Text_202CCF: @ 8202CCF - .string "WANDA: You are?\n" - .string "Oh, right, I get it!\p" - .string "You’re the {PLAYER} who WALLY was\n" - .string "telling me about.\p" - .string "I’m WALLY’s cousin.\n" - .string "Glad to meet you!\p" - .string "I think WALLY’s become a lot more lively\n" - .string "and healthy since he came here.$" - -VerdanturfTown_WandasHouse_Text_202D91: @ 8202D91 - .string "WANDA: Don’t worry about WALLY.\n" - .string "He’ll be just fine.\p" - .string "I know my little cousin, and he has\n" - .string "POKéMON with him, too.$" - -VerdanturfTown_WandasHouse_Text_202E00: @ 8202E00 - .string "Thanks to you, I can see my girlfriend\n" - .string "every day.\l" - .string "Happy? You bet I am!$" - -VerdanturfTown_WandasHouse_Text_202E47: @ 8202E47 - .string "My daughter’s boyfriend is a very\n" - .string "driven and passionate sort of person.\p" - .string "He’s been digging a tunnel nonstop\n" - .string "just so he can see my daughter.\p" - .string "My daughter’s a little concerned,\n" - .string "so she goes out to the tunnel a lot.$" - -VerdanturfTown_WandasHouse_Text_202F19: @ 8202F19 - .string "It’s amazing. My daughter’s boyfriend\n" - .string "was digging the tunnel by hand!\p" - .string "It’s so incredible!$" - -VerdanturfTown_WandasHouse_Text_202F73: @ 8202F73 - .string "If anything were to happen to WALLY,\n" - .string "I would never be able to look his\l" - .string "parents in PETALBURG in the eye…$" - -VerdanturfTown_WandasHouse_Text_202FDB: @ 8202FDB - .string "WALLY was in EVER GRANDE?\p" - .string "His parents in PETALBURG would be\n" - .string "astonished to hear that!$" - diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc deleted file mode 100644 index 2ed1c6baf..000000000 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ /dev/null @@ -1,220 +0,0 @@ -VictoryRoad_1F_MapScripts:: @ 8235D7A - map_script 3, VictoryRoad_1F_MapScript1_235D80 - .byte 0 - -VictoryRoad_1F_MapScript1_235D80: @ 8235D80 - compare VAR_0x40C3, 1 - call_if 1, VictoryRoad_1F_EventScript_235D97 - compare VAR_0x40C3, 2 - call_if 1, VictoryRoad_1F_EventScript_235DA3 - end - -VictoryRoad_1F_EventScript_235D97:: @ 8235D97 - setobjectxyperm 4, 2, 24 - setobjectmovementtype 4, 8 - return - -VictoryRoad_1F_EventScript_235DA3:: @ 8235DA3 - setobjectxyperm 4, 3, 24 - setobjectmovementtype 4, 8 - return - -VictoryRoad_1F_EventScript_235DAF:: @ 8235DAF - lockall - setvar VAR_0x8008, 1 - addobject 4 - applymovement 4, VictoryRoad_1F_Movement_235E15 - waitmovement 0 - goto VictoryRoad_1F_EventScript_235DE1 - end - -VictoryRoad_1F_EventScript_235DC8:: @ 8235DC8 - lockall - setvar VAR_0x8008, 2 - addobject 4 - applymovement 4, VictoryRoad_1F_Movement_235E21 - waitmovement 0 - goto VictoryRoad_1F_EventScript_235DE1 - end - -VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1 - applymovement 255, VictoryRoad_1F_Movement_2725AA - waitmovement 0 - msgbox VictoryRoad_1F_Text_235EE6, 4 - trainerbattle 3, TRAINER_WALLY_1, 0, VictoryRoad_1F_Text_235FFC - msgbox VictoryRoad_1F_Text_236020, 4 - clearflag FLAG_0x35A - moveobjectoffscreen 4 - setflag FLAG_0x07E - copyvar VAR_0x40C3, VAR_0x8008 - releaseall - end - -VictoryRoad_1F_Movement_235E15: @ 8235E15 - 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 - 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 - msgbox VictoryRoad_1F_Text_236020, 2 - end - -VictoryRoad_1F_EventScript_235E35:: @ 8235E35 - trainerbattle 0, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_eq VictoryRoad_1F_EventScript_235E5C - msgbox VictoryRoad_1F_Text_2360FE, 6 - end - -VictoryRoad_1F_EventScript_235E5C:: @ 8235E5C - trainerbattle 5, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA - msgbox VictoryRoad_1F_Text_2360FE, 6 - end - -VictoryRoad_1F_EventScript_235E73:: @ 8235E73 - trainerbattle 0, TRAINER_EDGAR, 0, VictoryRoad_1F_Text_236184, VictoryRoad_1F_Text_2361CB - msgbox VictoryRoad_1F_Text_2361E5, 6 - end - -VictoryRoad_1F_EventScript_235E8A:: @ 8235E8A - trainerbattle 0, TRAINER_ALBERT, 0, VictoryRoad_1F_Text_236248, VictoryRoad_1F_Text_236290 - msgbox VictoryRoad_1F_Text_2362A4, 6 - end - -VictoryRoad_1F_EventScript_235EA1:: @ 8235EA1 - trainerbattle 0, TRAINER_HOPE, 0, VictoryRoad_1F_Text_2362EE, VictoryRoad_1F_Text_236336 - msgbox VictoryRoad_1F_Text_236356, 6 - end - -VictoryRoad_1F_EventScript_235EB8:: @ 8235EB8 - trainerbattle 0, TRAINER_QUINCY, 0, VictoryRoad_1F_Text_236390, VictoryRoad_1F_Text_2363C4 - msgbox VictoryRoad_1F_Text_2363D5, 6 - end - -VictoryRoad_1F_EventScript_235ECF:: @ 8235ECF - trainerbattle 0, TRAINER_KATELYNN, 0, VictoryRoad_1F_Text_236468, VictoryRoad_1F_Text_2364A7 - msgbox VictoryRoad_1F_Text_2364BB, 6 - end - -VictoryRoad_1F_Text_235EE6: @ 8235EE6 - .string "WALLY: Hi! {PLAYER}!\p" - .string "I bet you’re surprised to see me here!\p" - .string "I made it all the way here, and it’s\n" - .string "all thanks to you!\p" - .string "{PLAYER}, losing to you that time\n" - .string "made me stronger!\p" - .string "But I’m not going to lose anymore!\p" - .string "I’m going to win! For the POKéMON who\n" - .string "gave me courage and strength!\p" - .string "Okay… Here I come!$" - -VictoryRoad_1F_Text_235FFC: @ 8235FFC - .string "Wow!\n" - .string "{PLAYER}, you are strong, after all!$" - -VictoryRoad_1F_Text_236020: @ 8236020 - .string "WALLY: I couldn’t beat you today,\n" - .string "{PLAYER}, but one of these days, I’ll\l" - .string "catch up to you!$" - -VictoryRoad_1F_Text_236073: @ 8236073 - .string "WALLY: Hi! {PLAYER}!\p" - .string "I’ve gotten stronger since that last\n" - .string "time! I wanted to show you, {PLAYER}!\p" - .string "Okay… Here I come!$" - -VictoryRoad_1F_Text_2360DA: @ 82360DA - .string "Wow!\n" - .string "{PLAYER}, you are strong, after all!$" - -VictoryRoad_1F_Text_2360FE: @ 82360FE - .string "WALLY: I couldn’t beat you this time,\n" - .string "too… But one of these days, {PLAYER},\l" - .string "I’m going to catch up to you…\p" - .string "And challenge the POKéMON LEAGUE!$" - -VictoryRoad_1F_Text_236184: @ 8236184 - .string "I’ve made it this far a couple times,\n" - .string "but the last stretch is so long…$" - -VictoryRoad_1F_Text_2361CB: @ 82361CB - .string "My dream ends here again…$" - -VictoryRoad_1F_Text_2361E5: @ 82361E5 - .string "You’ve made it this far. Keep the\n" - .string "momentum going and become the\l" - .string "CHAMPION! If anyone can, it’s you!$" - -VictoryRoad_1F_Text_236248: @ 8236248 - .string "I didn’t come all this way to lose now.\n" - .string "That possibility doesn’t exist!$" - -VictoryRoad_1F_Text_236290: @ 8236290 - .string "Impossible…\n" - .string "I lost?$" - -VictoryRoad_1F_Text_2362A4: @ 82362A4 - .string "I lost here…\p" - .string "That means I lack the qualifications\n" - .string "to become the CHAMPION…$" - -VictoryRoad_1F_Text_2362EE: @ 82362EE - .string "This seemingly infinite and harsh road\n" - .string "lives up to its name of VICTORY.$" - -VictoryRoad_1F_Text_236336: @ 8236336 - .string "Your battle style is fantastic…$" - -VictoryRoad_1F_Text_236356: @ 8236356 - .string "You seem to have the potential for\n" - .string "becoming the CHAMPION.$" - -VictoryRoad_1F_Text_236390: @ 8236390 - .string "What is the VICTORY ROAD?\n" - .string "I’ll tell you if you win!$" - -VictoryRoad_1F_Text_2363C4: @ 82363C4 - .string "Okay!\n" - .string "Well done!$" - -VictoryRoad_1F_Text_2363D5: @ 82363D5 - .string "Getting through here safely--that’s\n" - .string "the final test for any TRAINER aiming\l" - .string "to become the POKéMON CHAMPION.\p" - .string "That’s why it’s called the VICTORY\n" - .string "ROAD.$" - -VictoryRoad_1F_Text_236468: @ 8236468 - .string "I have nothing to say to anyone\n" - .string "that’s come this far. Come on!$" - -VictoryRoad_1F_Text_2364A7: @ 82364A7 - .string "This is a disgrace…$" - -VictoryRoad_1F_Text_2364BB: @ 82364BB - .string "Humph, go right on ahead.\n" - .string "See if I care.$" - diff --git a/data/scripts/maps/VictoryRoad_B1F.inc b/data/scripts/maps/VictoryRoad_B1F.inc deleted file mode 100644 index 376fda7d5..000000000 --- a/data/scripts/maps/VictoryRoad_B1F.inc +++ /dev/null @@ -1,91 +0,0 @@ -VictoryRoad_B1F_MapScripts:: @ 82364E4 - .byte 0 - -VictoryRoad_B1F_EventScript_2364E5:: @ 82364E5 - trainerbattle 0, TRAINER_SAMUEL, 0, VictoryRoad_B1F_Text_236558, VictoryRoad_B1F_Text_2365AD - msgbox VictoryRoad_B1F_Text_2365C4, 6 - end - -VictoryRoad_B1F_EventScript_2364FC:: @ 82364FC - trainerbattle 0, TRAINER_SHANNON, 0, VictoryRoad_B1F_Text_2365FD, VictoryRoad_B1F_Text_23664D - msgbox VictoryRoad_B1F_Text_236678, 6 - end - -VictoryRoad_B1F_EventScript_236513:: @ 8236513 - trainerbattle 0, TRAINER_MICHELLE, 0, VictoryRoad_B1F_Text_2366C2, VictoryRoad_B1F_Text_23670B - msgbox VictoryRoad_B1F_Text_23671B, 6 - end - -VictoryRoad_B1F_EventScript_23652A:: @ 823652A - trainerbattle 0, TRAINER_MITCHELL, 0, VictoryRoad_B1F_Text_236757, VictoryRoad_B1F_Text_236780 - msgbox VictoryRoad_B1F_Text_2367A7, 6 - end - -VictoryRoad_B1F_EventScript_236541:: @ 8236541 - trainerbattle 0, TRAINER_HALLE, 0, VictoryRoad_B1F_Text_2367FD, VictoryRoad_B1F_Text_23683B - msgbox VictoryRoad_B1F_Text_23684C, 6 - end - -VictoryRoad_B1F_Text_236558: @ 8236558 - .string "The thought that I’m getting closer to\n" - .string "the POKéMON LEAGUE…\p" - .string "I’m getting stage fright…$" - -VictoryRoad_B1F_Text_2365AD: @ 82365AD - .string "I couldn’t do a thing…$" - -VictoryRoad_B1F_Text_2365C4: @ 82365C4 - .string "The POKéMON LEAGUE became distant\n" - .string "again… What a letdown…$" - -VictoryRoad_B1F_Text_2365FD: @ 82365FD - .string "To win your way through the POKéMON\n" - .string "LEAGUE, you need the trust of your\l" - .string "POKéMON.$" - -VictoryRoad_B1F_Text_23664D: @ 823664D - .string "Your relationship is based on\n" - .string "solid trust.$" - -VictoryRoad_B1F_Text_236678: @ 8236678 - .string "By being together all the time, trust\n" - .string "grows between POKéMON and TRAINERS.$" - -VictoryRoad_B1F_Text_2366C2: @ 82366C2 - .string "This isn’t the goal. It’s only a place\n" - .string "on the way to the POKéMON LEAGUE.$" - -VictoryRoad_B1F_Text_23670B: @ 823670B - .string "That’s the way!$" - -VictoryRoad_B1F_Text_23671B: @ 823671B - .string "You’ll do fine, for sure!\n" - .string "Your POKéMON are all eager to go!$" - -VictoryRoad_B1F_Text_236757: @ 8236757 - .string "My POKéMON are cosmically\n" - .string "awe inspiring!$" - -VictoryRoad_B1F_Text_236780: @ 8236780 - .string "I’ve never met anyone like you before.$" - -VictoryRoad_B1F_Text_2367A7: @ 82367A7 - .string "Even outside of battle, I sense\n" - .string "incredible power emanating from you\l" - .string "and your POKéMON.$" - -VictoryRoad_B1F_Text_2367FD: @ 82367FD - .string "Okay, no need to get your back up!\n" - .string "Relax, let’s take it easy!$" - -VictoryRoad_B1F_Text_23683B: @ 823683B - .string "Whoa!\n" - .string "Wonderful!$" - -VictoryRoad_B1F_Text_23684C: @ 823684C - .string "Sure, this is VICTORY ROAD.\p" - .string "But it’s not all that different from\n" - .string "the path you’ve taken so far.\p" - .string "Try to enjoy things the rest of\n" - .string "the way!$" - diff --git a/data/scripts/maps/VictoryRoad_B2F.inc b/data/scripts/maps/VictoryRoad_B2F.inc deleted file mode 100644 index 15deea104..000000000 --- a/data/scripts/maps/VictoryRoad_B2F.inc +++ /dev/null @@ -1,108 +0,0 @@ -VictoryRoad_B2F_MapScripts:: @ 82368D4 - .byte 0 - -VictoryRoad_B2F_EventScript_2368D5:: @ 82368D5 - trainerbattle 0, TRAINER_VITO, 0, VictoryRoad_B2F_Text_23695F, VictoryRoad_B2F_Text_2369B3 - msgbox VictoryRoad_B2F_Text_2369DE, 6 - end - -VictoryRoad_B2F_EventScript_2368EC:: @ 82368EC - trainerbattle 0, TRAINER_OWEN, 0, VictoryRoad_B2F_Text_236A4C, VictoryRoad_B2F_Text_236A92 - msgbox VictoryRoad_B2F_Text_236AAE, 6 - end - -VictoryRoad_B2F_EventScript_236903:: @ 8236903 - trainerbattle 0, TRAINER_CAROLINE, 0, VictoryRoad_B2F_Text_236AF0, VictoryRoad_B2F_Text_236B14 - msgbox VictoryRoad_B2F_Text_236B2F, 6 - end - -VictoryRoad_B2F_EventScript_23691A:: @ 823691A - trainerbattle 0, TRAINER_JULIE, 0, VictoryRoad_B2F_Text_236B88, VictoryRoad_B2F_Text_236C0A - msgbox VictoryRoad_B2F_Text_236C21, 6 - end - -VictoryRoad_B2F_EventScript_236931:: @ 8236931 - trainerbattle 0, TRAINER_FELIX, 0, VictoryRoad_B2F_Text_236C67, VictoryRoad_B2F_Text_236CAB - msgbox VictoryRoad_B2F_Text_236CBA, 6 - end - -VictoryRoad_B2F_EventScript_236948:: @ 8236948 - trainerbattle 0, TRAINER_DIANNE, 0, VictoryRoad_B2F_Text_236D27, VictoryRoad_B2F_Text_236D6E - msgbox VictoryRoad_B2F_Text_236D8C, 6 - end - -VictoryRoad_B2F_Text_23695F: @ 823695F - .string "I trained together with my whole family,\n" - .string "every one of us!\l" - .string "I’m not losing to anyone!$" - -VictoryRoad_B2F_Text_2369B3: @ 82369B3 - .string "Better than my family?!\n" - .string "Is that possible?!$" - -VictoryRoad_B2F_Text_2369DE: @ 82369DE - .string "I was better than everyone in my\n" - .string "family. I’ve never lost before…\p" - .string "I’ve lost my confidence…\n" - .string "Maybe I’ll go home…$" - -VictoryRoad_B2F_Text_236A4C: @ 8236A4C - .string "I’d heard that there was a tough\n" - .string "little kid around. Do they mean you?$" - -VictoryRoad_B2F_Text_236A92: @ 8236A92 - .string "The little shrimp is tough!$" - -VictoryRoad_B2F_Text_236AAE: @ 8236AAE - .string "The rumors I heard, that tough little\n" - .string "kid is from PETALBURG CITY.$" - -VictoryRoad_B2F_Text_236AF0: @ 8236AF0 - .string "You must be getting a little tired.$" - -VictoryRoad_B2F_Text_236B14: @ 8236B14 - .string "No signs of tiring at all!$" - -VictoryRoad_B2F_Text_236B2F: @ 8236B2F - .string "VICTORY ROAD and the POKéMON LEAGUE\n" - .string "are long and grueling challenges.\l" - .string "Beware of fatigue!$" - -VictoryRoad_B2F_Text_236B88: @ 8236B88 - .string "You shouldn’t get complacent just\n" - .string "because you have a lot of GYM BADGES.\p" - .string "There’s always going to be someone\n" - .string "who’s better than you!$" - -VictoryRoad_B2F_Text_236C0A: @ 8236C0A - .string "You’re better than me!$" - -VictoryRoad_B2F_Text_236C21: @ 8236C21 - .string "Gaze on your collected BADGES and\n" - .string "remember the TRAINERS you’ve faced.$" - -VictoryRoad_B2F_Text_236C67: @ 8236C67 - .string "I’ve come this far, but the tension’s\n" - .string "giving me awful stomach pain…$" - -VictoryRoad_B2F_Text_236CAB: @ 8236CAB - .string "Ooh…\n" - .string "It hurts…$" - -VictoryRoad_B2F_Text_236CBA: @ 8236CBA - .string "I can’t help getting all tense knowing\n" - .string "that I’m nearing the POKéMON LEAGUE.\p" - .string "It’s all I can do to feign calm.$" - -VictoryRoad_B2F_Text_236D27: @ 8236D27 - .string "The elite among the elite gather in\n" - .string "this cave.\p" - .string "How are you finding it?$" - -VictoryRoad_B2F_Text_236D6E: @ 8236D6E - .string "Not rattled in the least bit!$" - -VictoryRoad_B2F_Text_236D8C: @ 8236D8C - .string "You do have guts! I like that!\n" - .string "Keep it going!$" - -- cgit v1.2.3 From ed8b006e67cdf5427177108b32c009a217b12b37 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:41:51 -0500 Subject: 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 b2b454278..a58a3d2d2 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 cf3cac646..3f94138fb 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 01218493a..05ffb2edc 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 7b38f9ddc..5b2944a2b 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 d26184270..d27dae2ba 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 81f181cf3..805922d5c 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 a81f10b0d..6869d7084 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 ad2cdfa30..0510b9f31 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 d7063bd89..8629bec2b 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 d9c3078da..3cc40ac9d 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 245c88327..2561bceb7 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 96f63ee3e..f3cb58069 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 1782e9af8..b2109bb82 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 1e4116053..657ffd86a 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 800b7c0cd..1fa1c08f8 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 f16787fc9..0dcccfdab 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 d6f4e24a5..93b82b3cb 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 aaa05bcc8..d05931dba 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 2219a720b..d32a8940e 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 862672e19..6beacf0a2 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) -- cgit v1.2.3 From 5e00c0bfcf54271b392dd1b83a901c7d623ce704 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:42:01 -0500 Subject: Fix map constants --- data/event_scripts.s | 4 +- data/map_events.s | 4 +- .../CaveOfOrigin_UnusedRubySapphireMap1/events.inc | 2 +- .../CaveOfOrigin_UnusedRubySapphireMap2/events.inc | 4 +- .../CaveOfOrigin_UnusedRubySapphireMap3/events.inc | 2 +- data/maps/EverGrandeCity_ChampionsRoom/events.inc | 2 +- data/maps/EverGrandeCity_DrakesRoom/events.inc | 4 +- data/maps/EverGrandeCity_GlaciasRoom/events.inc | 4 +- data/maps/EverGrandeCity_PhoebesRoom/events.inc | 4 +- .../EverGrandeCity_PokemonLeague_1F/events.inc | 4 +- data/maps/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 4ad0ad60d..0336c0c97 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 aca9978e4..4fcfb5979 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 c9eeaff22..049c263da 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 c8e9bbeeb..5af05a471 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 953eef558..a17416bd3 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 6226fe527..c97236e41 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 56eda4374..90c9af1c4 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 c8d85fd98..5490ed006 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 c9b5ef7fd..296fe3240 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 536dbf934..ff2ca71c2 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 1823af7cd..af4c5de98 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 c982ededf..a38375d8e 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 ed1750f79..000000000 --- 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 a2d6a37a5..000000000 --- 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 9579df56c..000000000 --- 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 5ad30e6c1..000000000 --- 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 1720a77a2..000000000 --- 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 499969d6e..000000000 --- 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 000000000..adb59f580 --- /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 000000000..35a466e1e --- /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 000000000..cbb5070a2 --- /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 000000000..5def6e102 --- /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 000000000..2529d7366 --- /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 000000000..9f99cf44f --- /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 f7fc7be89..77f9c4441 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 58d2cc66c..b4be3ab0c 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 f6096e1c5..bcb778422 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 6beacf0a2..82ef74213 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, -- cgit v1.2.3 From 91ee3221b3a4885d155ad2cca16b7678062ad18a Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:42:34 -0500 Subject: Formatting --- .../AbandonedShip_CaptainsOffice/layout.inc | 3 +- data/layouts/AbandonedShip_Corridors_1F/layout.inc | 3 +- .../layouts/AbandonedShip_Corridors_B1F/layout.inc | 3 +- data/layouts/AbandonedShip_Deck/layout.inc | 3 +- .../AbandonedShip_HiddenFloorCorridors/layout.inc | 3 +- .../AbandonedShip_HiddenFloorRooms/layout.inc | 3 +- data/layouts/AbandonedShip_Room_B1F/layout.inc | 3 +- data/layouts/AbandonedShip_Rooms2_1F/layout.inc | 3 +- data/layouts/AbandonedShip_Rooms2_B1F/layout.inc | 3 +- data/layouts/AbandonedShip_Rooms_1F/layout.inc | 3 +- data/layouts/AbandonedShip_Rooms_B1F/layout.inc | 3 +- data/layouts/AbandonedShip_Underwater1/layout.inc | 3 +- data/layouts/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 +- data/layouts/AquaHideout_UnusedRubyMap1/layout.inc | 3 +- data/layouts/AquaHideout_UnusedRubyMap2/layout.inc | 3 +- data/layouts/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 +- .../BattleFrontier_BattleArenaCorridor/layout.inc | 3 +- .../BattleFrontier_BattleArenaLobby/layout.inc | 3 +- .../BattleFrontier_BattleDomeBattleRoom/layout.inc | 3 +- .../BattleFrontier_BattleDomeCorridor/layout.inc | 3 +- .../BattleFrontier_BattleDomeLobby/layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../BattleFrontier_BattleFactoryLobby/layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../BattleFrontier_BattlePalaceCorridor/layout.inc | 3 +- .../BattleFrontier_BattlePalaceLobby/layout.inc | 3 +- .../BattleFrontier_BattlePikeCorridor/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 +- .../BattleFrontier_BattlePyramidLobby/layout.inc | 3 +- .../BattleFrontier_BattlePyramidTop/layout.inc | 3 +- .../layout.inc | 3 +- .../BattleFrontier_BattleTowerCorridor/layout.inc | 3 +- .../BattleFrontier_BattleTowerCorridor2/layout.inc | 3 +- .../BattleFrontier_BattleTowerLobby/layout.inc | 3 +- .../layout.inc | 3 +- data/layouts/BattleFrontier_Lounge1/layout.inc | 3 +- data/layouts/BattleFrontier_Lounge2/layout.inc | 3 +- data/layouts/BattleFrontier_OutsideEast/layout.inc | 3 +- data/layouts/BattleFrontier_OutsideWest/layout.inc | 3 +- data/layouts/BattleFrontier_RankingHall/layout.inc | 3 +- .../BattleFrontier_ReceptionGate/layout.inc | 3 +- data/layouts/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 +- .../CaveOfOrigin_UnusedRubySapphireMap1/layout.inc | 3 +- .../CaveOfOrigin_UnusedRubySapphireMap2/layout.inc | 3 +- .../CaveOfOrigin_UnusedRubySapphireMap3/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 +- data/layouts/EverGrandeCity_DrakesRoom/layout.inc | 3 +- data/layouts/EverGrandeCity_GlaciasRoom/layout.inc | 3 +- data/layouts/EverGrandeCity_Hall4/layout.inc | 3 +- data/layouts/EverGrandeCity_HallOfFame/layout.inc | 3 +- data/layouts/EverGrandeCity_PhoebesRoom/layout.inc | 3 +- .../EverGrandeCity_PokemonLeague_1F/layout.inc | 3 +- data/layouts/EverGrandeCity_ShortHall/layout.inc | 3 +- data/layouts/EverGrandeCity_SidneysRoom/layout.inc | 3 +- data/layouts/FallarborTown/layout.inc | 3 +- .../FallarborTown_LeftoverRSContestHall/layout.inc | 3 +- .../layout.inc | 3 +- data/layouts/FarawayIsland_Entrance/layout.inc | 3 +- data/layouts/FarawayIsland_Interior/layout.inc | 3 +- data/layouts/FieryPath/layout.inc | 3 +- data/layouts/FortreeCity/layout.inc | 3 +- data/layouts/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 +- data/layouts/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 +- data/layouts/LavaridgeTown_HerbShop/layout.inc | 3 +- .../LavaridgeTown_PokemonCenter_1F/layout.inc | 3 +- data/layouts/LilycoveCity/layout.inc | 3 +- data/layouts/LilycoveCity_ContestHall/layout.inc | 3 +- data/layouts/LilycoveCity_ContestLobby/layout.inc | 3 +- .../LilycoveCity_CoveLilyMotel_1F/layout.inc | 3 +- .../LilycoveCity_CoveLilyMotel_2F/layout.inc | 3 +- .../layout.inc | 3 +- .../LilycoveCity_DepartmentStoreRooftop/layout.inc | 3 +- .../LilycoveCity_DepartmentStore_1F/layout.inc | 3 +- .../LilycoveCity_DepartmentStore_2F/layout.inc | 3 +- .../LilycoveCity_DepartmentStore_3F/layout.inc | 3 +- .../LilycoveCity_DepartmentStore_4F/layout.inc | 3 +- .../LilycoveCity_DepartmentStore_5F/layout.inc | 3 +- data/layouts/LilycoveCity_House2/layout.inc | 3 +- .../LilycoveCity_LilycoveMuseum_1F/layout.inc | 3 +- .../LilycoveCity_LilycoveMuseum_2F/layout.inc | 3 +- .../LilycoveCity_PokemonTrainerFanClub/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 +- .../LittlerootTown_BrendansHouse_1F/layout.inc | 3 +- .../LittlerootTown_BrendansHouse_2F/layout.inc | 3 +- .../layouts/LittlerootTown_MaysHouse_1F/layout.inc | 3 +- .../layouts/LittlerootTown_MaysHouse_2F/layout.inc | 3 +- .../LittlerootTown_ProfessorBirchsLab/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 +- data/layouts/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 +- data/layouts/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 +- data/layouts/MossdeepCity_GameCorner_1F/layout.inc | 3 +- .../layouts/MossdeepCity_GameCorner_B1F/layout.inc | 3 +- data/layouts/MossdeepCity_Gym/layout.inc | 3 +- .../layouts/MossdeepCity_SpaceCenter_1F/layout.inc | 3 +- .../layouts/MossdeepCity_SpaceCenter_2F/layout.inc | 3 +- data/layouts/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 +- data/layouts/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 +- data/layouts/Route109_SeashoreHouse/layout.inc | 3 +- data/layouts/Route110/layout.inc | 3 +- .../Route110_SeasideCyclingRoadEntrance/layout.inc | 3 +- .../layouts/Route110_TrickHouseCorridor/layout.inc | 3 +- data/layouts/Route110_TrickHouseEnd/layout.inc | 3 +- .../layouts/Route110_TrickHouseEntrance/layout.inc | 3 +- data/layouts/Route110_TrickHousePuzzle1/layout.inc | 3 +- data/layouts/Route110_TrickHousePuzzle2/layout.inc | 3 +- data/layouts/Route110_TrickHousePuzzle3/layout.inc | 3 +- data/layouts/Route110_TrickHousePuzzle4/layout.inc | 3 +- data/layouts/Route110_TrickHousePuzzle5/layout.inc | 3 +- data/layouts/Route110_TrickHousePuzzle6/layout.inc | 3 +- data/layouts/Route110_TrickHousePuzzle7/layout.inc | 3 +- data/layouts/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 +- .../layouts/Route114_FossilManiacsHouse/layout.inc | 3 +- .../Route114_FossilManiacsTunnel/layout.inc | 3 +- data/layouts/Route114_LanettesHouse/layout.inc | 3 +- data/layouts/Route115/layout.inc | 3 +- data/layouts/Route116/layout.inc | 3 +- .../layouts/Route116_TunnelersRestHouse/layout.inc | 3 +- data/layouts/Route117/layout.inc | 3 +- data/layouts/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 +- .../layouts/Route121_SafariZoneEntrance/layout.inc | 3 +- data/layouts/Route122/layout.inc | 3 +- data/layouts/Route123/layout.inc | 3 +- data/layouts/Route124/layout.inc | 3 +- .../Route124_DivingTreasureHuntersHouse/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 +- data/layouts/RustboroCity_CuttersHouse/layout.inc | 3 +- data/layouts/RustboroCity_DevonCorp_1F/layout.inc | 3 +- data/layouts/RustboroCity_DevonCorp_2F/layout.inc | 3 +- data/layouts/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 +- data/layouts/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 +- data/layouts/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 +- data/layouts/SealedChamber_InnerRoom/layout.inc | 3 +- data/layouts/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 +- data/layouts/SecretBase_YellowCave1/layout.inc | 3 +- data/layouts/SecretBase_YellowCave2/layout.inc | 3 +- data/layouts/SecretBase_YellowCave3/layout.inc | 3 +- data/layouts/SecretBase_YellowCave4/layout.inc | 3 +- .../ShoalCave_HighTideEntranceRoom/layout.inc | 3 +- .../layouts/ShoalCave_HighTideInnerRoom/layout.inc | 3 +- .../ShoalCave_LowTideEntranceRoom/layout.inc | 3 +- data/layouts/ShoalCave_LowTideIceRoom/layout.inc | 3 +- data/layouts/ShoalCave_LowTideInnerRoom/layout.inc | 3 +- data/layouts/ShoalCave_LowTideLowerRoom/layout.inc | 3 +- .../layouts/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 +- .../SlateportCity_SternsShipyard_1F/layout.inc | 3 +- .../SlateportCity_SternsShipyard_2F/layout.inc | 3 +- data/layouts/SootopolisCity/layout.inc | 3 +- data/layouts/SootopolisCity_Gym_1F/layout.inc | 3 +- data/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 +- .../SootopolisCity_LotadAndSeedotHouse/layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- data/layouts/SouthernIsland_Exterior/layout.inc | 3 +- data/layouts/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 +- data/layouts/Underwater_SeafloorCavern/layout.inc | 3 +- data/layouts/Underwater_SealedChamber/layout.inc | 3 +- data/layouts/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 +- .../VerdanturfTown_BattleTentBattleRoom/layout.inc | 3 +- data/layouts/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 8a123be4c..d9e122ef2 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 f3704b1cc..d5fd22578 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 131caed67..7299aa6f8 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 81b598fb4..7f0baaaec 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 1f7d3117a..0ee7aa755 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 d7b36dd8b..bf2f758d7 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 62c4127f8..fdd5b395d 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 26789691e..d15652cc0 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 35b92addd..d99e43f47 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 0109a26f0..63e4a716a 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 40ef7680a..ab688d668 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 5619d0dba..8fa1b1485 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 1d123c8c7..feea82d16 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 e69cc1dd0..9f03e7d87 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 7aabb07cc..ad173f936 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 645be578f..5508a668b 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 10cfd2d9b..0889e548a 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 188e51fcc..9e335e5d9 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 643993a22..05862b275 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 6fdf6b31c..e9e08ab97 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 070fb2bac..44b35666f 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 7a5d63690..b32eef422 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 97e409473..2640303e3 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 b101dbdda..374af9ffa 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 6b0f61b5f..89f799d84 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 c984be1fb..8961ed778 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 bda4799ec..305fcc0d9 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 3ed732898..a4991ae0c 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 f4354caf0..7f3c93b82 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 d9127802a..2553e7098 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 4ac7a79df..8c0fe2ce5 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 35b8a1dec..21ba6a015 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 2071dd54a..cc0a33611 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 f458fb9c2..fc4fc49bc 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 2a570bbd7..3d9acc3c4 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 b76b87cb5..2d16216c5 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 08c904db8..f9a1dad7b 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 7dd3dcbaa..1d6d21778 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 a1bd10dd3..3a5cd3538 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 c860deb93..466ad0ff4 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 1ad2a90cc..1c7fb35d4 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 b60e07361..ce17a0bf6 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 d4f99085b..d7a082d13 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 8a991e45d..a65e7928b 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 2097173cc..a9e779ddb 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 ecdceec7f..28575776a 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 e96259589..4657c37a3 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 8738d81e1..3d498239a 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 c54c38812..56335aa23 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 9e822f0f9..7dba3777c 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 dc3733bc0..790ff3bcd 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 dbd77c420..df5615873 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 cc22cc8d7..c25b3b2a0 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 1f8df21ae..b735b4994 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 e79db8ee7..ddaf20446 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 0644d4b2b..a506e554f 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 03639f203..d7615e693 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 11beca5e5..3dd4aeaa5 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 913d636d1..f08737109 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 103f35b31..fe710cc40 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 c831af0a8..6aa5b7aa9 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 fb1da5213..4da41f9e9 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 b8b7ce24f..c298ee6f4 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 f6f61cd5f..87ce53274 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 3774ce871..bcaeb89b0 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 cd5f16b0e..bb469b3c8 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 bc3ac3005..df88b710f 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 1794f72b3..2869d9ac2 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 49150f493..2ba8e8124 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 8385b6f3a..190bddf10 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 a63f1dc34..199f66ace 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 6f145fe96..351b04227 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 ec69a1b54..653ad161b 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 29c5444f9..24090c671 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 cc2895943..67187b9bf 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 97be7fdb4..4f9a8e626 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 21f6c94fd..9abcdefa4 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 a740ae2f9..a3216370f 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 0fe3899ae..17dc4f0fb 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 c2727063f..1113f89f2 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 d82ecddd0..616af1655 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 41158462c..5850f15c9 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 3e6375d3e..11e230ce3 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 dfaf8b8a6..294bf786a 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 5caa1b9e5..c3a05f75f 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 6290452c0..cbc5c052a 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 6c4bff886..4d6e7571a 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 3871e181e..9a17a128e 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 077262836..28ccdc43c 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 89eb39936..bbada5bdc 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 59e88cd47..bd9cd03ae 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 9641fb2bf..61d112c1e 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 e12d3c259..16c02fbaa 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 c92ee599d..dad4c7ef3 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 1cd96a760..9c140d49d 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 17031e546..bcd610d8c 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 169d5fda7..464fc8998 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 f7442adde..deaa4429d 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 dc2847ed0..b02d5c312 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 da1a3de82..d84e6449f 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 b880ee439..2159c894d 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 f43fdae6b..86ffa16a1 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 f8ba2bf1a..7f0894903 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 70d1a079f..66acc546b 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 c30723a04..3ad232728 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 4a1c6c36b..c7d6bef91 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 bf8cbdbf4..787dd53c9 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 7fff04df1..c129ae715 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 e273287de..02564b36a 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 e4727cf75..6460a35b5 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 81994276b..da7f1e73e 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 dd9962fde..214846c22 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 5ab659b9a..3aa0898bf 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 641310f75..009fd12f5 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 dcdafcd4e..a57b238be 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 90d63c5bb..7ffd04b00 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 ea6147343..5ee4fade4 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 ab5f0e032..e95b8ec9d 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 0d1c9a699..b93f24df4 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 357e6022f..35566d8d1 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 2fe4bee46..6e2de11f4 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 caeca73a8..b06b3d427 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 bdb047feb..7fb8d2c9b 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 dc93f12a8..d1ddf8686 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 25d870e68..5a3035b72 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 7a1c43284..7fc86dca4 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 6aefbf605..5620551b8 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 48d0bbe58..662955430 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 e881e9d58..36f4cb826 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 1fa258cba..9b80d7f90 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 bf107dca9..c59e12e49 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 e0ba92bbf..e38d63815 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 fedb7a91e..ed4bd81e4 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 e0ce089f7..61e6e27ee 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 8ca1d160f..20cf4389f 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 3c6c30cdc..b275834f7 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 c65508e1a..82a294c48 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 53d452438..899e934bd 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 61a5db9c2..d40483308 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 441cfc474..d3b5d9420 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 54ede95cd..e5b01c8fd 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 a16342425..5d7aa93eb 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 26806016a..b4585ca03 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 6b5a98fe4..ade5e4bf5 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 a7926872f..de51e7fd6 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 3a0215859..0dab4095c 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 0cc19b039..aea446410 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 3a3a624bd..9b30c7c08 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 38af49829..e71fe2df3 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 d09439edd..2dd66ab96 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 c969be1ac..c53cad723 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 61b03a2ce..883918f37 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 38f1e42cd..72a9d9f4e 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 39349840a..33db4b56d 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 5f8254576..8193ac695 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 0ccddcca8..092c7d20b 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 f626ecfb0..5235f4d98 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 42d1365c3..88b81a289 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 c0770b8f6..0b6134dbd 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 77d07033f..d0be539a0 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 2721bb6ff..b50c7f015 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 9d16b20b0..b9f0d27d7 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 47a492f52..01507909c 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 cf1310587..d88fb50fd 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 6e7215914..c2199b2f2 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 6f108d198..2c4662a49 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 6508e73bf..4042b9653 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 32db60101..d7f8c547c 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 f69952dce..256338b89 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 b6c9248c6..219c182d7 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 33c232059..5233e09ab 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 ba7785c3e..7a8c17da2 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 4814becf8..f0d358a35 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 9403c9df6..307f7205e 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 1fdaf921e..290fca78e 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 3fea20553..ba7a0e487 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 ac91e848e..2e3fcaf2e 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 c424edf3b..a4f385d8f 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 b7ee944cc..982edc975 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 992e7d174..1baf70a09 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 e4bb92d74..be36cc758 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 601dd9de2..ec4971bc4 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 2bcd9806d..c12de3a15 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 babf2a5c7..518f7c943 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 b5d392dc7..881cf9498 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 e03619423..2c2fb717d 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 b51e18362..ec5dd2a57 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 fbdfa6fdd..a65212a40 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 c5fc2f570..759e68891 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 4d406accc..6e370a7fa 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 29aede186..0db92aee9 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 f0afefe3b..29a3b1ad7 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 bd7fd82d5..2402e815c 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 cbf534f69..8d6ca1200 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 ceaa1bea9..24ed0f7b1 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 5bd0eab59..65a8fcf59 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 fed3f9ae2..222c6eb80 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 0fe9f6982..31b5288d5 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 2f81759d7..1b5997dba 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 4f30ac9e1..58e932eb7 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 899aa8eed..6f15bd276 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 043a977de..5c96a8cef 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 d9a12b71d..6dcedcb20 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 b3fc825cf..c2c4fa95e 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 0f7956e5e..ab5d9c867 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 34ff05e39..a7fc73d22 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 a50a32690..8fbd6e51f 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 6e99e9bf4..50698cc76 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 78e3edee4..bbd81cac7 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 d7dbe6a62..096142c6d 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 7d266cfba..9709ca1ea 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 a87de7036..4ba791f23 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 16f9402ca..b5dcf58b2 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 deb111059..a10daa3cd 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 c458140a9..bae16b88f 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 974b95baf..36fe1002f 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 6ee24ef31..840e17f7e 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 4d299d407..bf1335f84 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 cc2aba89a..3cb812de7 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 ab18faa0d..ed258b2a7 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 54193c343..e42ecf340 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 eaf962db2..194d44fce 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 eaf00808e..fe3bac066 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 58a000d70..9a9418e46 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 039901d0a..3474f3335 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 0510c9028..a46ffc18c 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 eb70f55c9..b2b2c4f19 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 4156bc9a4..ce78ef9cc 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 ff43ced2e..ea255b383 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 9de501c61..ea305b2a7 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 10fd278b3..1ec7171cf 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 f6d4864bf..fa41585e9 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 316c1fc1b..9ec997b48 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 1539ae91d..24e5a9321 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 4f804ef53..abf78f62d 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 8f9c4d9ee..fe6ee4d26 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 ee2b6b47f..dd9474aee 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 ec9636627..97f3abe24 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 d8aadf110..546876ab0 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 59bc2d06c..65caaa734 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 384a84032..a03cf9a71 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 3524e092d..581b41a43 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 06f105c71..5e06ac31e 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 b11da0a1d..398c17951 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 8d9e88b7e..1612ec41b 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 139cefadc..3520b503f 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 911ecfcb0..2966c06c5 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 22aae208c..72a0c428c 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 a6a438986..0c1d76b58 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 1391ce296..071f9e1b6 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 314090849..f915e572a 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 90a891b57..c2392ff01 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 e1f2354c1..be9689ae3 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 1a5121474..9d6c3c969 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 54471a0e0..232cc41f8 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 4faea6ce6..1bd42eafc 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 75b7f0d98..25e133f28 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 0589c2d1b..403881bfe 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 a78bd28de..cb87f8414 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 0f288c2c5..66502fb15 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 35ae95d37..9637beea5 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 476ebf4fa..4f0948f7b 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 a58e60aee..f9e9255a0 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 0e39c4d35..4d2c9744a 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 f28d1b4dc..38ad9e97e 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 39f70e4e4..7f0baac20 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 db9093ba9..0c76c2b7b 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 e2c9abffc..d27ed902a 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 2179d7208..263571235 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 7c894c943..f0d4e13b7 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 b7f2e3e3c..859d025a5 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 637bd29b6..767330aff 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 09265d811..16624fa02 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 926213af4..9b7d6af1d 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 30a1053bf..41db11cb4 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 0762566a8..7fae261cc 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 3838b85bc..afaa7fb58 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 c380a9ca1..5ff11108b 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 46c4ea9dc..9eeca6cc9 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 e1451aff6..00c45dcc2 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 a0df17833..0c86dede9 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 6662b05c9..dbf6b388e 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 f6331ab38..34d581ae5 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 2d265b6c8..64c555be5 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 fc61a4201..b904524a6 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 b80a34322..aa6e3ebdf 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 55c38f906..8e44c97b7 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 c099b5f9a..ffcba8d17 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 5e938f7d6..77775b4e0 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 cd9b907fb..8c064171b 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 80f658fcd..b1b90daee 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 f88e3a80b..27893f2fb 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 470baa66e..2c4eb3977 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 feb5b0fc0..7a063b922 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 8180f0a4d..bcc034ecd 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 ece1a572e..807da09a1 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 8cd255d8c..e44aac53c 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 f539c2ced..c6986540f 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 903a6c9e0..026e4a7c7 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 469e25617..09d8bd482 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 7cb238719..4176cb370 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 6431c6c01..ec83ba5b0 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 450efcd07..e55309b46 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 559736b9f..1236d4d4b 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 e9f30c74c..897d873ab 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 eaed336bc..1d6ce495b 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 6deb54493..7f7cf0570 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 c0dfdcedc..89f4e6a79 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 58ce10cdf..070842a9f 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 f4ff113ff..6c984109d 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 69218f64b..c48b00dba 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 d18506d6b..f729d0b1b 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 6e953c06e..784b9bbb9 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 1a0477b68..8f3d826c7 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 115db570b..a5039da8f 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 3de6298e2..7a064d5f0 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 b966d00ef..bc6afaf29 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 7e3110f48..ec138440a 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 7a3228832..8c2b48661 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 a1921a475..0ac8bee1b 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 81509d18c..d0e5ed45f 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 e1bec323a..9044fd6d1 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 52d595212..7cfb9573b 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 4fa22e613..5ad1bf526 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 65566a482..6094a3832 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 f9dcde880..a4664d509 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 667a744ad..7999395d8 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 39a079d2b..6a3cc123b 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 890c1c3b5..665f44709 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 835028c64..2bcc9f58a 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 cd1fe6119..e94376c3b 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 721df1201..449f1a11f 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 71a2495ad..139a82050 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 45889b449..73e6e41a6 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 ca1106b26..95b122220 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 28a4ecbcc..66716a404 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 6f869a74e..20d4c3e01 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 d34c182c3..7fa3aa823 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 fc5813858..0ae872e08 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 005af813a..f42d88920 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 5dfaa435c..b7a11df5a 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 43df2d495..a52425e15 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 22fde10c6..2d323b9e0 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 c471d40ed..0a1eee113 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 3dea1135c..6d7a51575 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 090a783c4..f66fc9723 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 364c026b2..79cc82e8c 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 4195e34d8..62dbff40e 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 59ec3c3c7..f42855de8 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 e0f3550ed..235f04935 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 2ce0b5280..368fcd518 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 0bf2ad939..32ac95143 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 35b7b61d1..055abf133 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 dbef0083e..3f3bb5bc1 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 ed0d1dedd..1313bd196 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 ae4184ea9..5eb9df563 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 f9e7f24a4..646c6f95f 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 5cc1b1276..dfa184764 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 957e23320..f921eb5fc 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 0072fe2c5..7a6998987 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 789c78b67..44f9a559f 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 5ffddafa6..00d5840c6 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 fe76a83e8..01a969a3a 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 91a877c38..400a29cbd 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 ce7a15e5e..4c6a6eeef 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 a97138cd5..7eb90fb71 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 5c37828ef..1ad9cc41c 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 ffa3c5ad1..9007d584b 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 3d1fa421c..540f4306c 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 1a0e7b418..152563eb6 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 127128a2e..0b846950e 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 951b90582..1bb92b933 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 e5747d2e9..4a62cd3f5 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 3ac1a6a82..b4d9a35d2 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 42ba6309b..0865a8e5b 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 8b0a09650..19d50ef44 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 59d257c62..5e0297e7a 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 0cb5fee4a..2009cd49e 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 25ac09eb9..f67b54bf1 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 2b9f74cc7..280517f41 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 8664a3c90..eed0b0120 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 0fc549f46..896f43e0d 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 bfa1aeb35..9477dceda 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 f2b61dfbc..8e027bbd2 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 ab8892c86..ac6350d47 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 b1238bc1f..c365b6b8f 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 ed46c9f5b..9e22e4e40 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 cef2c5d76..6394eec54 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 c6f8b9742..247af44bd 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 e910152e4..5c2670b11 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 c51bbeb35..52a3a7851 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 a4bcf2043..1534564a4 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 5d610efb1..5bce06a6b 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 a6f924c18..5baf5dde8 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 22d42167e..4a1b0aa02 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 2c7e821a9..0c2a065a5 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 0f3b5504d..41e954b4e 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 603919b42..f1695ec66 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 3e565369a..f19bd682d 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 fd157b999..e351524e1 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 9cc060b76..fd01ddc10 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 5651df7df..80ad93127 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 b79c2d34b..16d4e400c 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 36aee8b80..c6541b3ea 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 c233955f1..e566a93b7 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 bc2c238f3..ce1a438eb 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 352db474d..179e0d881 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 c0edd37eb..907ec6266 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 b421cf662..c56046ef1 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 d8bc1cfb0..49e32dbc7 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 dddd408cc..3cbe67299 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 34c5282d5..7449536bf 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 0ddc0f858..23880a79c 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 0b3cc1697..e42bfcdd9 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 ea5e6288d..39d7bb18a 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 d9951db4d..a180340f8 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 36421f503..ce6a4c819 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 ca018989b..535c4a6e9 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 babdb2c61..22191c61c 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 f4b882fde..0106c666a 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 f1a0e90ea..671127587 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 8239461fc..b44036239 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 6916f61ae..4593a8ba4 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 6e0116512..6b73bfdce 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 3f7a2770d..a394c8ef3 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 fe7f90b16..cabe0b25b 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 a501c6cc6..73ed49c79 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 52a6a8acf..250528be0 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 314a94b88..465b92dc8 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 30eb032e4..bb7002a20 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 3423735c3..5937a2195 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 20fbdc9c8..3dcbc7986 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 2efcab4e0..0ffe4c0b7 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 4d27276dc..3f8113a6f 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 3dea1f9af..6001d8fe7 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 2f329b930..ce58c0798 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 89d82169c..21fca6953 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 8791f34bb..ae5d1a7cf 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 9ef50f743..31e0fede3 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 fed9804fe..9ce7223e1 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 77a9542f9..23c500cbe 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 3f94138fb..bd67fb6f9 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 -- cgit v1.2.3 From 272b98da6c5174db3f7f2d05ed765fc4cdefc2c6 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 28 Jun 2018 21:06:32 +0200 Subject: 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 083107c08..73fcbeac1 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 6e2b1e55a..782d8ae31 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 901669715..e52874f57 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 058833fa9..a9d305ec8 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 8020d7c5c..1fbaa9536 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 2651407fb..20a6cf1b8 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 c5f5f48d7..61e2935b7 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 b917d2cb3..2d93811f1 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 0a53c2893..aa98b179d 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 f5987c0ce..be9609e62 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 83dac5436..414e084ee 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 63dc989be..86775f50e 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 17ed1c24f..6a70200b6 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 9d213fc6b..4b44116dd 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 d1836c092..b6a96b6fd 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 3cdd952ef..bc69e2624 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 05c7b9e1f..5399ccbf0 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 1c60e22ef..4da941ab0 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 f5e031cb9..6a30ed487 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 9afbc7f40..a0d812a94 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 c26e5ac11..fb77ab4c4 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 172ec6659..b9a7f546a 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 ab5c38f3a..c0c098b38 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) -- cgit v1.2.3 From 30c85a5128b2b68049ce7b62d8beb64adad26b64 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 30 Jun 2018 14:12:17 +0200 Subject: 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 73fcbeac1..c03d78df7 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 a9d305ec8..4956ffc13 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 f3d7a8e0e..5a09067ad 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 a0d812a94..a846f5769 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 896b2197e..41b36ae13 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 fb77ab4c4..ecba9f934 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; -- cgit v1.2.3 From 5434db2fc6f4e7ebd8cb6bc76115d5c3b6b5807e Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 30 Jun 2018 14:22:09 +0200 Subject: 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 85640e8e5..64eba1658 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))); } -- cgit v1.2.3 From cdacc2771426a8e4ec5ccc5d7ba0d8d7c4224c36 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 30 Jun 2018 14:26:33 +0200 Subject: 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 bdc9b7868..c2f5e7731 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 fb5aa5e95..ae7b557d8 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); -- cgit v1.2.3 From 97712ec931febe390861f2234e26a66f15c9c295 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 30 Jun 2018 14:52:13 +0200 Subject: 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 64eba1658..68d7c5e83 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))); } -- cgit v1.2.3 From bfc64c9689d4518c64ba15cd7d52b9a6149fd218 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 30 Jun 2018 15:35:54 +0200 Subject: 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 20a6cf1b8..0169dde7c 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 f792ff7b0..cccbae841 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 a846f5769..487e11993 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 41b36ae13..9dcd4aaf1 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 ccc36b7c2..b11083929 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 e5d97be30..cd0490a1b 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 35277fe87..91fcf8c46 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 78b615407..0ed22c1e1 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 7ea9bef79..4dff894f8 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" -- cgit v1.2.3 From 2d0be91217e0ea16f298bb823e954a4d6f6ff63b Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 30 Jun 2018 18:55:34 +0200 Subject: 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 02bfe8b3b..e377c1b2b 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 788061f2b..c3b82a836 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 ce2490579..1fbf2a2e1 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 4895e9643..c5dd727f4 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 414e084ee..c37423a72 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 86775f50e..d30d34930 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 6a70200b6..d7878678a 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 5399ccbf0..f66a1d773 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 487e11993..dfe99e003 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 9dcd4aaf1..d2ac6da8c 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 ecba9f934..9c48b083c 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 b11083929..b2655f731 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 800b7c0cd..a4d62feca 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 eb48ab15a..3a4265895 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 4456e450c..4d5240bc7 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); -- cgit v1.2.3 From d2e47323fe988e430af782c2c10b8e41e7a131b3 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 1 Jul 2018 11:15:42 +0200 Subject: 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 e377c1b2b..586cc8f05 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 c3b82a836..1e07bdb9c 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 1b4863046..2db1c5728 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 17a44ecbc..de32e9775 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 0169dde7c..6e941191f 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 0b5590011..0531966df 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 4e2c4056c..4ad54c86f 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 5a09067ad..b3f9d919a 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 000000000..4145805c4 --- /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 a1a4ed50a..c820a1114 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 f3a3acb90..85c02e3da 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 a017b6975..eb695e4ab 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 6489fe07f..00a6f7fdb 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 2efd76afc..3a1e989d2 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 37028821a..f928243d0 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 8b1fa258d..81c88a15e 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 131598985..e82d22576 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 be9609e62..a88c4a076 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 c37423a72..2af17d32e 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 4b44116dd..1fd1deebf 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 4da941ab0..01ad750db 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 47af1b9dd..8f17d488e 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 6a30ed487..a6032adc3 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 dfe99e003..34558ab38 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 d2ac6da8c..7d442ea98 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 9c48b083c..bacaf2bac 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 cd0490a1b..6f9ee414e 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 b9a7f546a..5d2ec62a9 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 a4d62feca..7d685062f 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 3a4265895..e36716feb 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) -- cgit v1.2.3 From c556358e47f7af50ba9b04fc1d7b359512c25b03 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 1 Jul 2018 15:28:57 +0200 Subject: 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 327a80d75..453ecb04c 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 450a235d5..ba1fa1c29 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 e52874f57..ff848df08 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 18a0cec88..1d4173c4c 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 0d7353938..061e338cd 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 de32e9775..87ca0b881 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 f928243d0..f36284f12 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 18963f955..d786dacd1 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 b2cf62138..9867c14e4 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 2af17d32e..1eaa9da18 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 26c2cae98..ef45b60cd 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 d7878678a..cd3a94692 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 1fd1deebf..affcb09ab 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 b6a96b6fd..4f224bc67 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 bc69e2624..f7be76c9b 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 f66a1d773..f024c29c0 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 076a4d342..5e659a2e8 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 9bec15750..591c299d7 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 00e6236fe..1e89650d3 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 84f00418c..7079375f8 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 d3fdbd355..7ce7affcc 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 d06da3e9e..80c1ab784 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 4d5240bc7..60580ef2d 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; -- cgit v1.2.3 From e6d67c7c2299a0c6fa7ec79fa1427c4a1277a6f7 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 1 Jul 2018 15:45:47 +0200 Subject: 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 ef45b60cd..992d8656c 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); } } -- cgit v1.2.3 From f79ac26ce36197ddf98ab18b6699c76039ec68db Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Thu, 5 Jul 2018 20:33:07 -0700 Subject: 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 629df57fe..96c3b3ca2 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 c2f5e7731..9de954e80 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 ae7b557d8..74eb100bc 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 6c7439622..78cbbe2de 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; -- cgit v1.2.3 From 1c48e585747de0a2273c4b3eb4be114d5214b8a2 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 7 Jul 2018 14:24:19 +0200 Subject: 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 cccbae841..147bfa501 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 4ca5cb7df..294499c8b 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 2566b51b7..07a2017b4 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 7d442ea98..32097fd76 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 2561bceb7..f57c4b48f 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 30710d08a..c94f29910 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 d6fedf892..68ec1daf0 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]; -- cgit v1.2.3 From 008d961b2a3d2d145f9ff8e7515cfb4f5e04128c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 7 Jul 2018 19:57:09 +0200 Subject: 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 6e90fa3c3..017f1dc54 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 6e941191f..fba5fb460 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 61e2935b7..8ba45fad1 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 2cf17f1e4..fd52f8d4d 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 f36284f12..a60ad66be 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 992d8656c..8f69dab06 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 c841aaa03..1ce5d3099 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 591c299d7..fe6e62c5d 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 bacaf2bac..eb6feb2a0 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 5d2ec62a9..6e3fc3e7f 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 80c1ab784..5406cfee9 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])) -- cgit v1.2.3 From ee3d505b585c5d0a8b6a8a68b8ab787d04bdc33a Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 7 Jul 2018 21:14:41 +0200 Subject: 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 fe6e62c5d..88422574f 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; -- cgit v1.2.3 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: 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 0642c771e..e18d8fdd8 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 f7a51e75f..37e0515bd 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) -- cgit v1.2.3 From d675b7578cff2352796c27d3e6fc882090c9ce21 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 10 Jul 2018 18:04:41 -0500 Subject: Move movement type constants into include/constants/event_object_movement_constants.h --- .../constants/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 000000000..2a80f9a09 --- /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 8a1749b0b..99243e45f 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 35b04ea1e..953851108 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 -- cgit v1.2.3 From 8ffd7a70fc6d059f04a0588d2956d4f02f7eeb5d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 10 Jul 2018 18:04:51 -0500 Subject: Use movement type constants in object_event macros --- data/map_events.s | 1 + data/maps/AbandonedShip_CaptainsOffice/events.inc | 4 +- data/maps/AbandonedShip_Corridors_1F/events.inc | 4 +- data/maps/AbandonedShip_Corridors_B1F/events.inc | 4 +- .../maps/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 ++--- .../BattleFrontier_BattleArenaCorridor/events.inc | 2 +- .../BattleFrontier_BattleArenaLobby/events.inc | 10 +-- .../BattleFrontier_BattleDomeBattleRoom/events.inc | 30 +++---- .../BattleFrontier_BattleDomeCorridor/events.inc | 2 +- .../maps/BattleFrontier_BattleDomeLobby/events.inc | 12 +-- .../events.inc | 2 +- .../events.inc | 16 ++-- .../BattleFrontier_BattleFactoryLobby/events.inc | 12 +-- .../events.inc | 2 +- .../events.inc | 10 +-- .../BattleFrontier_BattlePalaceCorridor/events.inc | 14 ++-- .../BattleFrontier_BattlePalaceLobby/events.inc | 12 +-- .../BattleFrontier_BattlePikeCorridor/events.inc | 2 +- .../maps/BattleFrontier_BattlePikeLobby/events.inc | 8 +- .../events.inc | 4 +- .../events.inc | 2 +- .../events.inc | 4 +- .../events.inc | 18 ++--- .../events.inc | 32 ++++---- .../BattleFrontier_BattlePyramidLobby/events.inc | 8 +- .../BattleFrontier_BattlePyramidTop/events.inc | 4 +- .../events.inc | 6 +- .../events.inc | 12 +-- .../BattleFrontier_BattleTowerCorridor/events.inc | 2 +- .../BattleFrontier_BattleTowerCorridor2/events.inc | 8 +- .../BattleFrontier_BattleTowerElevator/events.inc | 2 +- .../BattleFrontier_BattleTowerLobby/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 +- data/maps/BattleFrontier_OutsideEast/events.inc | 52 ++++++------ data/maps/BattleFrontier_OutsideWest/events.inc | 48 +++++------ .../BattleFrontier_PokemonCenter_1F/events.inc | 10 +-- .../BattleFrontier_PokemonCenter_2F/events.inc | 8 +- data/maps/BattleFrontier_RankingHall/events.inc | 6 +- data/maps/BattleFrontier_ReceptionGate/events.inc | 10 +-- data/maps/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 +- data/maps/DewfordTown_PokemonCenter_1F/events.inc | 6 +- data/maps/DewfordTown_PokemonCenter_2F/events.inc | 8 +- data/maps/EverGrandeCity_ChampionsRoom/events.inc | 6 +- data/maps/EverGrandeCity_DrakesRoom/events.inc | 2 +- data/maps/EverGrandeCity_GlaciasRoom/events.inc | 2 +- data/maps/EverGrandeCity_HallOfFame/events.inc | 2 +- data/maps/EverGrandeCity_PhoebesRoom/events.inc | 2 +- .../EverGrandeCity_PokemonCenter_1F/events.inc | 8 +- .../EverGrandeCity_PokemonCenter_2F/events.inc | 8 +- .../EverGrandeCity_PokemonLeague_1F/events.inc | 8 +- .../EverGrandeCity_PokemonLeague_2F/events.inc | 8 +- data/maps/EverGrandeCity_SidneysRoom/events.inc | 2 +- data/maps/FallarborTown/events.inc | 8 +- .../FallarborTown_BattleTentBattleRoom/events.inc | 6 +- .../FallarborTown_BattleTentCorridor/events.inc | 2 +- data/maps/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 +-- .../maps/FallarborTown_PokemonCenter_1F/events.inc | 8 +- .../maps/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 ++-- data/maps/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 +- data/maps/FortreeCity_PokemonCenter_1F/events.inc | 8 +- data/maps/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 +- .../maps/LavaridgeTown_PokemonCenter_1F/events.inc | 8 +- .../maps/LavaridgeTown_PokemonCenter_2F/events.inc | 8 +- data/maps/LilycoveCity/events.inc | 44 +++++------ data/maps/LilycoveCity_ContestHall/events.inc | 64 +++++++-------- data/maps/LilycoveCity_ContestLobby/events.inc | 50 ++++++------ data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc | 2 +- data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc | 14 ++-- .../events.inc | 2 +- .../LilycoveCity_DepartmentStoreRooftop/events.inc | 8 +- .../LilycoveCity_DepartmentStore_1F/events.inc | 12 +-- .../LilycoveCity_DepartmentStore_2F/events.inc | 10 +-- .../LilycoveCity_DepartmentStore_3F/events.inc | 10 +-- .../LilycoveCity_DepartmentStore_4F/events.inc | 10 +-- .../LilycoveCity_DepartmentStore_5F/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 +- .../maps/LilycoveCity_LilycoveMuseum_1F/events.inc | 20 ++--- .../maps/LilycoveCity_LilycoveMuseum_2F/events.inc | 8 +- .../maps/LilycoveCity_MoveDeletersHouse/events.inc | 2 +- data/maps/LilycoveCity_PokemonCenter_1F/events.inc | 10 +-- data/maps/LilycoveCity_PokemonCenter_2F/events.inc | 8 +- .../LilycoveCity_PokemonTrainerFanClub/events.inc | 18 ++--- data/maps/LinkContestRoom1/events.inc | 30 +++---- data/maps/LittlerootTown/events.inc | 16 ++-- .../LittlerootTown_BrendansHouse_1F/events.inc | 14 ++-- .../LittlerootTown_BrendansHouse_2F/events.inc | 32 ++++---- data/maps/LittlerootTown_MaysHouse_1F/events.inc | 14 ++-- data/maps/LittlerootTown_MaysHouse_2F/events.inc | 32 ++++---- .../LittlerootTown_ProfessorBirchsLab/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 +- data/maps/MauvilleCity_PokemonCenter_1F/events.inc | 10 +-- data/maps/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 ++++---- data/maps/MossdeepCity_GameCorner_1F/events.inc | 4 +- data/maps/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 +- data/maps/MossdeepCity_PokemonCenter_1F/events.inc | 6 +- data/maps/MossdeepCity_PokemonCenter_2F/events.inc | 10 +-- data/maps/MossdeepCity_SpaceCenter_1F/events.inc | 22 +++--- data/maps/MossdeepCity_SpaceCenter_2F/events.inc | 18 ++--- data/maps/MossdeepCity_StevensHouse/events.inc | 6 +- data/maps/MtChimney/events.inc | 60 +++++++------- data/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 +- data/maps/OldaleTown_PokemonCenter_1F/events.inc | 8 +- data/maps/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 +- .../PacifidlogTown_PokemonCenter_1F/events.inc | 10 +-- .../PacifidlogTown_PokemonCenter_2F/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 +- .../maps/PetalburgCity_PokemonCenter_1F/events.inc | 10 +-- .../maps/PetalburgCity_PokemonCenter_2F/events.inc | 8 +- data/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 +- .../maps/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 +- data/maps/Route110_TrickHouseEntrance/events.inc | 2 +- data/maps/Route110_TrickHousePuzzle1/events.inc | 30 +++---- data/maps/Route110_TrickHousePuzzle2/events.inc | 10 +-- data/maps/Route110_TrickHousePuzzle3/events.inc | 14 ++-- data/maps/Route110_TrickHousePuzzle4/events.inc | 28 +++---- data/maps/Route110_TrickHousePuzzle5/events.inc | 10 +-- data/maps/Route110_TrickHousePuzzle6/events.inc | 8 +- data/maps/Route110_TrickHousePuzzle7/events.inc | 18 ++--- data/maps/Route110_TrickHousePuzzle8/events.inc | 8 +- data/maps/Route111/events.inc | 92 +++++++++++----------- data/maps/Route111_OldLadysRestStop/events.inc | 2 +- .../maps/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 ++++++------- data/maps/Route114_FossilManiacsHouse/events.inc | 2 +- data/maps/Route114_FossilManiacsTunnel/events.inc | 2 +- data/maps/Route114_LanettesHouse/events.inc | 2 +- data/maps/Route115/events.inc | 46 +++++------ data/maps/Route116/events.inc | 56 ++++++------- data/maps/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 ++-- data/maps/Route119_WeatherInstitute_1F/events.inc | 10 +-- data/maps/Route119_WeatherInstitute_2F/events.inc | 16 ++-- data/maps/Route120/events.inc | 88 ++++++++++----------- data/maps/Route121/events.inc | 58 +++++++------- data/maps/Route121_SafariZoneEntrance/events.inc | 6 +- data/maps/Route123/events.inc | 86 ++++++++++---------- data/maps/Route123_BerryMastersHouse/events.inc | 4 +- data/maps/Route124/events.inc | 24 +++--- .../Route124_DivingTreasureHuntersHouse/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 ++++---- data/maps/RustboroCity_CuttersHouse/events.inc | 4 +- data/maps/RustboroCity_DevonCorp_1F/events.inc | 6 +- data/maps/RustboroCity_DevonCorp_2F/events.inc | 12 +-- data/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 +- data/maps/RustboroCity_PokemonCenter_1F/events.inc | 8 +- data/maps/RustboroCity_PokemonCenter_2F/events.inc | 8 +- data/maps/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 +++---- data/maps/ShoalCave_LowTideEntranceRoom/events.inc | 4 +- data/maps/ShoalCave_LowTideIceRoom/events.inc | 4 +- data/maps/ShoalCave_LowTideInnerRoom/events.inc | 2 +- data/maps/ShoalCave_LowTideLowerRoom/events.inc | 4 +- data/maps/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 ++++++++-------- .../SlateportCity_BattleTentBattleRoom/events.inc | 6 +- .../SlateportCity_BattleTentCorridor/events.inc | 2 +- data/maps/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 +- .../maps/SlateportCity_OceanicMuseum_1F/events.inc | 28 +++---- .../maps/SlateportCity_OceanicMuseum_2F/events.inc | 14 ++-- .../maps/SlateportCity_PokemonCenter_1F/events.inc | 6 +- .../maps/SlateportCity_PokemonCenter_2F/events.inc | 8 +- data/maps/SlateportCity_PokemonFanClub/events.inc | 18 ++--- .../SlateportCity_SternsShipyard_1F/events.inc | 8 +- .../SlateportCity_SternsShipyard_2F/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 +- .../SootopolisCity_LotadAndSeedotHouse/events.inc | 4 +- data/maps/SootopolisCity_Mart/events.inc | 6 +- .../events.inc | 2 +- .../events.inc | 2 +- .../SootopolisCity_PokemonCenter_1F/events.inc | 8 +- .../SootopolisCity_PokemonCenter_2F/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 +- data/maps/Underwater_SeafloorCavern/events.inc | 8 +- data/maps/UnionRoom/events.inc | 18 ++--- data/maps/VerdanturfTown/events.inc | 8 +- .../VerdanturfTown_BattleTentBattleRoom/events.inc | 6 +- .../VerdanturfTown_BattleTentCorridor/events.inc | 2 +- .../maps/VerdanturfTown_BattleTentLobby/events.inc | 12 +-- .../events.inc | 4 +- data/maps/VerdanturfTown_House/events.inc | 4 +- data/maps/VerdanturfTown_Mart/events.inc | 8 +- .../VerdanturfTown_PokemonCenter_1F/events.inc | 8 +- .../VerdanturfTown_PokemonCenter_2F/events.inc | 8 +- data/maps/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 4fcfb5979..d268cba63 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 e7e48568c..dfe6d84e0 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 f0e276032..665350915 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 d1ee69499..d3b72825e 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 e352635a5..3c9cb9a0d 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 1f1cab59a..f3a1d3327 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 7dfb4d059..50debde1b 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 40e4600af..05d48a618 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 072892b0a..3b6fc136e 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 50bc7c0ee..97a8aa246 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 4950be4ac..8008e9d5c 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 7d0befd16..ab7c49b30 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 31108fa9c..bbada49f8 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 eca22f5f7..628ff1158 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 edd7429a3..7f7405a55 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 a0b96c316..4294d60dd 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 ce6eeb952..1a8216287 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 03a2cb14d..bfe28c339 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 d0343228b..4b8e0de0d 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 2500a826b..d33a3103c 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 8a8d5448e..6bce917a0 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 9c6eb2649..4cd125033 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 7f2133ac5..559199b29 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 2ea1fbd41..264c7d731 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 13de4c539..dd7b4029d 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 b8ffbfc6d..d341250de 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 bc1d5a525..4c84a209f 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 f6baf26f6..bf06dcf34 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 56da378cb..c53e0f875 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 67ceaaae6..8734e4dc8 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 45d3da103..5fddc6f37 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 80c1fc3bf..07c2866a1 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 9cff20517..3ce444a53 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 7a23ba892..a04f0cf4e 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 7a8c584ac..2945034bc 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 f7d22a5ed..3e66eec7d 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 28b5f5c61..dd3722945 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc @@ -1,8 +1,8 @@ BattleFrontier_BattlePyramidLobby_EventObjects: @ 853C598 - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 7, 12, 4, 8, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0 - object_event 2, EVENT_OBJ_GFX_HEX_MANIAC, 0, 14, 13, 4, 9, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 15, 4, 2, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0 - object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 16, 4, 2, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0 + object_event 1, EVENT_OBJ_GFX_HIKER, 0, 7, 12, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0 + object_event 2, EVENT_OBJ_GFX_HEX_MANIAC, 0, 14, 13, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 15, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0 + object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 16, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0 BattleFrontier_BattlePyramidLobby_MapWarps: @ 853C5F8 warp_def 7, 17, 4, 3, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/BattleFrontier_BattlePyramidTop/events.inc b/data/maps/BattleFrontier_BattlePyramidTop/events.inc index f724f4f9f..a42052d96 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 0bc8d0434..55aed13a4 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 f97d8ad0c..505a903da 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 23f3377f3..ae3ca2575 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 9dce5da52..8f6a1e2f0 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 321fc90e3..671d6d434 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 86e159b63..ef38d131b 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 0c730f37d..533e6af8b 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 b6c6ecdd0..1303c3c33 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 0616573bd..cc32ddf42 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 dbaa20fe1..75f04250c 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 613adfae2..c0dfbcf3e 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 0224ae0a9..798deb1c2 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 092be452b..24d7958ec 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 c5490d6c9..901ac6641 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 116cc007f..92d27d765 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 6500ab66a..6598e0229 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 669945b99..3ca67e038 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 37fa6e7bd..7d25049fd 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 643e26e2e..b2315873c 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 ba07ed15c..cf0215573 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 bb5bb6119..4d0b88090 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 239c372c6..ba9d3a30f 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 34db359fc..c29718501 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 6e3de083c..3f4dcff86 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 677499152..bd6b45b82 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 1133979ee..67f235026 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 95fdb77bc..1f38240c5 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 3b19c7f09..f44a6e14c 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 17f6aab60..472178c56 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 6ae39b52f..3363f6d43 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 788c5e40c..2891e92df 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 780fab9ed..f095c3972 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 569059af5..265b9b1b6 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 ae3c4f88e..b697a7d02 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 0389ee141..6210faa6f 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 db27c6c64..cad871e8d 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 12ac8ffe7..af56598c3 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 c63fabee3..48b98a361 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 f2332f18b..50d0addf2 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 38d398b5b..84bb566c2 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 86f4d43cb..4093e4086 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 f5c38358d..8b8fe4660 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 72a2c6210..bd1b79bc0 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 b7ccd35b0..01a258600 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 05fb939a0..76215c65a 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 c96b4c95e..77a6ab889 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 11f5d5a92..26ebf4501 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 e12a02a3c..7c494b698 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 849bb0244..72a8dc305 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 8aec9176b..9c03f4ce4 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 aad05249c..2e43a2239 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 9c739974b..f9d67ecbf 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 c97236e41..b09221dca 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 90c9af1c4..4f61f50ea 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 5490ed006..63dfbc0df 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 50fc7fbdc..ad5f088c5 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 296fe3240..abaa81622 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 1f7e26046..7e90c35c7 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 98671f414..08dbeb5c6 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 ff2ca71c2..c04a0f30d 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 a09e8ed31..18d45eef9 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 af4c5de98..a1446aef8 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 91a98cc28..b6c3400c6 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 c4e35ebbb..f3c8838e6 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 471ca66a3..4af82f353 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 570287ae3..cdcc4c792 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 5c2323b74..8f16a7869 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 342e2e60b..1b4e1c96e 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 6d7188c6a..f2ec25c13 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 368190914..fffc618eb 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 9162a2822..563b6bc50 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 8af15533b..e8b94c460 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 c2cd25b40..b9242b5be 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 37fecaf5e..3b3985325 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 c943e230d..2b21594a1 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 fe85e94d6..22abe3103 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 234c10b0c..8abef75e8 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 99d34626c..35ed2acaf 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 2d78b2774..43bc1fdfc 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 54ac6ed6a..23ae10688 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 1bddf3416..c038066e4 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 d6c03578e..0c716961a 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 115b04ccd..5335df01d 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 4b681b5cb..e63b6eabb 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 7a7f666b2..43e74e0d7 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 83368e186..bba8bbe40 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 90b0f498e..4b4a08870 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 d7ce41812..bcc0a5a4e 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 49e808cda..43cc6e444 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 5dafdf1fd..104df23d2 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 d7807a725..c02d93dde 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 fe193cd97..ce6eb77bd 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 cf32b8377..755e606b0 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 cc35053f0..8560ee3a8 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 eabf8e51d..cccd9cb14 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 dd5ffdbe9..8a80c4f75 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 17809fc45..85a9d859e 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 0206eefd7..a5537f9ca 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 767f01713..1586553f2 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 3191e7533..e55b08e7b 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 343249c2d..421a2c094 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 dd5655beb..c7477af3c 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 d7c31c837..27448106f 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 7ccbc4aec..5595da718 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 631eba91b..c0869f319 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 bdeda0bd9..adafc5b61 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 aca7598ec..8492376e2 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 17a6db615..3ebc7c803 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 1747ece5a..11fd1c403 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 93ef37b4b..7042a1483 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 5e6d0d94a..8fe1ec45e 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 f2b9b130a..9b56742a2 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 73d21e9ce..6a157a1ad 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 d268037ba..d5768e01c 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 7e5276102..e4839eb5c 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 4f582bdef..89f48e9f3 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 e85c296d3..6e447bf9c 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 47b39c6ee..7a66d580c 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 ba1e74e65..968a61b1d 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 784b388ae..a1be3924f 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 dce57df3d..42b4949a2 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 ec8e4cf6e..910dd36ab 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 228e56e4d..be478e45c 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 c1bdfe3fb..c87a35486 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 23b8cc3e5..fd257b17d 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 cd08fbad8..df0022c99 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 a6649c9b6..fbcc38a03 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 6822c20e8..34eeeb750 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 a5f1dd43c..037f0538a 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 a4596ce5c..41e5112f7 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 1274e2373..2fa18eade 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 32f835efc..723c9e914 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 5567bf9cf..277dcf530 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 b2f157f57..0f3ff3529 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 27ea129c3..d2bd79078 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 3f96b5652..2ced1f4fd 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 1865c3b84..435099c47 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 14903539b..0d3014ab1 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 c8318005c..cc393513d 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 b4c0d19df..c1ee85909 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 a956f16d8..8c30b75b7 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 08c8db444..c1b2b0053 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 2590e33b9..1d759b438 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 f8e04f5ea..3ac497bbc 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 f67840783..5e96dcfd3 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 adab7d3e4..4000ead3e 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 c3a0c4990..d445b3cca 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 977559950..21535add7 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 0436851c5..4cab5be37 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 8e2c9e1c4..85dafb869 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 ff920f86d..09225365d 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 e12b4873d..d62e54f92 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 7b215a83a..b9574637a 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 d288400b5..c95cdf5cf 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 42face3c4..603d7f3d8 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 7146d30b8..58ca66fd2 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 e383463af..8245f1fc2 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 a7832fb09..00e7a12fc 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 86ba58946..b38d1bf8d 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 e40e79e10..374808598 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 96d8fe7d8..048bd5ffd 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 d8314e6e5..9fb1f674a 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 7e56185b2..ed26d83cb 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 c5d5af15a..e13367153 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 fa5a8f3bb..fe1d4fcf8 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 bf143934e..b1e7373da 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 0ee8e7d15..521c71e72 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 bb7e1a913..a8002de8f 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 19385b3d5..491ca7997 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 80bf46c2e..179a6a538 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 d5b24c06f..6c334ac0c 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 bf0d1af77..ed9caf9f3 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 e39075d8b..73c0a59cf 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 03a9b773f..e1fffe025 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 1f00209b2..607c0902a 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 badd884f9..ec247fd67 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 2df3aaafd..35107f3f0 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 fec170ae9..49a39c162 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 2ffdc5fa1..b5a299572 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 dc7c1e7df..6f7253a2b 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 794f1965c..805c1db6e 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 b7bc6ab08..1ba9ea124 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 cf853c8ac..4933604d4 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 2feeb8949..a57b07c26 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 f850fa482..73adf3718 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 bb102baab..ba50faea9 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 b25b155ea..fe8490c9c 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 41d54e9fc..8e1134f86 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 77ca4c832..4bc239ea6 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 450533014..fae916c73 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 635ba86a7..bdf1aae10 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 e5f8dd4f1..bcd3dc6e9 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 febb80ad6..f039b7694 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 66b8caa67..8040086f8 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 1aa279980..1b961ee74 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 29fe0e02e..f33ff0918 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 2df386d2c..e3cfe95cc 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 dcd3b071f..4688eefe6 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 7d1a863cb..17f9001e2 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 3dc327c6a..88d99918d 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 e7a4ec6e6..509ed0094 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 7d2ff52f4..d83875c10 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 563d61579..cc43ca814 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 da904f8ef..aaab1e751 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 7970c14ba..b5e297f72 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 82b674f9e..969166de9 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 fc30a195c..a51e09b59 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 e4bf74177..ab858ae13 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 315b5614e..52a60261a 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 9eccc2286..6410f02fc 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 025daad04..3d622f106 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 bbe9cf73b..cf7addcc8 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 8fdbaad5f..22807fcec 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 f748e2ff9..b67e98384 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 0a0b448c4..a83027178 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 1d847897d..66527a7ae 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 140b92a21..9c12bd582 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 a38375d8e..4cb99b121 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 adb59f580..4af135a6d 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 5def6e102..3e9c99d55 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 12659457a..8348be5cb 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 30a6892df..d1083bb7f 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 05824aa38..38186f217 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 a7259e3b3..2fa2f4bbc 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 2f95cf052..986384ad4 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 b0dd3abf6..97022a3e0 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 8da7daf11..0401ef544 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 7fc098f2c..75d64270b 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 e72aa929a..1d4373f25 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 eacc9e940..efeb449ff 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 cea2db8d5..b6aee76ac 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 5ade76ba3..16f480460 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 0fe5b5df4..e2c0a2fa5 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 0e218cd78..7cf199eee 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 77f37d72c..2fe084697 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 25287a747..23469ff17 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 1d5104e1c..352f1fabb 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 3e48c5721..1f25b59ca 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 c947d9d8f..65864133e 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 99edadee1..ca6142852 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 352bb2037..a6ecd2e7f 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 37d886e7f..29a77c6ce 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 16afe4482..e2ba1ad15 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 8d133ab6d..896949ae8 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 f84ef6212..9747679ad 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 05220bdc9..a1a8e3673 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 5e732890d..f49f07faa 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 bd10dc05b..c21f105e5 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 05d426fe5..ebae9a0fc 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 ee9f42ac5..c69d053ff 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 4196be41b..d3389f615 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 a19a70f33..fd79c716d 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 17ddae47f..7cafdc402 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 2d8351534..8ac15b503 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 0fc1b015b..7fafbb76a 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 3f4725870..c848f341b 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 2dc839783..3e4ab2780 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 606138e38..5294f6d71 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 b767e512d..cb13b81fa 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 cf87bb74e..0c3180a79 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 b7c378a96..8f5fffa71 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 c34f6eb16..c4b1710fa 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 7c1425ebe..c127ec5e3 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 ad1429553..227e359b6 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 2bb2c5cbc..1c321a6cb 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 19ff5ccc8..7d62fb306 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 6adfce330..ba1ac2ac0 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 5a2d57417..03339b081 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 b71bdb875..4c70edf34 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 db9b6f56d..6657c9305 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 c6d4048c4..260d64a0d 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 31a3d1de6..f10c94780 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 8db3c085c..0c655b814 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 1f2ae85fd..d52b495eb 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 647e7a437..13ebbbc0d 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 392f5b1fa..16c79649a 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 9914eed3c..559c6e6e0 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 4a67fdc47..71d03ddb1 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 193c41685..8d6971796 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 1d2b2d0b7..2fc0284a9 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 3a4e5e15e..5c5ab205e 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 07234fc2e..2fc6a6233 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 038d13bf7..683ed5ff7 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 e2945f435..597eace15 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 d1ec1adb9..f1f9fe356 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/events.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ RustboroCity_PokemonCenter_2F_EventObjects: @ 8530780 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_276B03, 702 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_276B03, 702 RustboroCity_PokemonCenter_2F_MapWarps: @ 85307E0 warp_def 1, 6, 4, 2, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F diff --git a/data/maps/RustboroCity_PokemonSchool/events.inc b/data/maps/RustboroCity_PokemonSchool/events.inc index 2deabdb5c..0fdcca3c8 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 e294e200e..c56a5b5ee 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 8f0b1de77..22827aca3 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 969830d37..9722e1df1 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 a9900294c..0e038f0f9 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 88b41669b..1057b4ecd 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 e71ba4dd5..38f59ff13 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 8e5b242b9..c43db4125 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 0607ffcc7..5a54de961 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 46173d11a..01a016f02 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 af2da0575..f7f38f7af 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 ccd775dd2..886958342 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 588b7a9ae..5bbe88c20 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 e27362f00..11a8211de 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 261314b9b..2c8e51e30 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 01f6f3ba5..82f924121 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 300db40c5..9a1399705 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 6b6df78f2..e67cb0d5b 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 97787ebbf..f0c69175b 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 42dcf9faa..d69b12f7e 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 ac3337bed..659ca8b03 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 2905764cf..606999612 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 8202b7a42..0991d03e2 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 733b674b7..e0bd13a3b 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 afd1622b8..15266e18b 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 e4fffab49..8c2771f4e 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 29e90b592..f5e168e36 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 3322b9d5a..c41147bc6 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 310033947..40d00597e 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 eba992586..1b5f202cf 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 c6f534965..d84f297a2 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 dda054b44..f288371e8 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 54e33dc3d..9090f940e 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 acdac9692..aa886a0aa 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 a370d2e72..1acb5d0a1 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 942be3617..7902f3fc7 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 a027b266b..c6d5f32f5 100644 --- a/data/maps/SecretBase_Shrub4/events.inc +++ b/data/maps/SecretBase_Shrub4/events.inc @@ -1,19 +1,19 @@ SecretBase_Shrub4_EventObjects: @ 8539BC0 - object_event 1, 255, 0, 9, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 9, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 SecretBase_Shrub4_MapWarps: @ 8539D28 warp_def 11, 8, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Tree1/events.inc b/data/maps/SecretBase_Tree1/events.inc index 3379e8ecb..593fb5dbb 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 e330951cf..189911755 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 b4a8c2eb3..b2d950a40 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 4c57fcdfd..a1d7f7b50 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 e7f4ed7ce..9b394350c 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 84aabf3d4..a958fcb53 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 2e1d61708..2decabcee 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 07ac363ac..535ca8e4c 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 1f4a008e3..614c009c1 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 57922e322..5f4fe1dac 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 f1d894264..5743c8c22 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 d3d656452..8b0cc9b40 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 875f337a5..b9e6955ae 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 4ef0de89f..6971d4217 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 4fb4cc010..386ea0b35 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 26bccf67f..79973b316 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 b8480dfb6..3b72a57f3 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 ce13a5899..6c28d5fc5 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 b56b50a0e..4fe072b50 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 0ceca119b..d0875ba78 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 af274e22f..5f6e2617f 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 493bb2922..713ff1dd5 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 42d0e3660..daa627c06 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 d6391598e..da5f668e0 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 cfe385a3c..aca75a698 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 dc0c8a8d9..9c695f745 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 f59413aba..32328d255 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 f59512311..e20e593cb 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 92974f5b4..d6a0ac4e1 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 b231f9816..19886500f 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 450f40fe7..f34a52726 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 96aaefd9c..b7d481ac3 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 925acc34b..ee78e053a 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 1ed20fc94..9f747bc4a 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 4ddbd23ea..38885d648 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 213fe39d3..a8885190e 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 0feca97cb..9f5cc781e 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 1f14ba6e9..d9948d5be 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 566631c02..321de8b64 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 a85356317..4ca7e5745 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 65b0cf9dd..76a198f6e 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 84e642bac..8d0512952 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 0c32cb482..32fc081d2 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 bf06c2cd9..4eb796671 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 21ea255a4..39b3366c5 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 9bca02a56..4ca22d1f8 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 8498f9de2..f9e4626ea 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 69cddf603..d204708db 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 c31a5568b..55bfeb614 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 61edb1e28..b47a00441 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 89e5eac90..a2156ff48 100644 --- a/data/maps/TradeCenter/events.inc +++ b/data/maps/TradeCenter/events.inc @@ -1,5 +1,5 @@ TradeCenter_EventObjects: @ 8539DA0 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 6, 3, 9, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0 TradeCenter_MapWarps: @ 8539DB8 warp_def 5, 8, 3, 127, MAP_NONE diff --git a/data/maps/TrainerHill_Elevator/events.inc b/data/maps/TrainerHill_Elevator/events.inc index 7af4c5425..0125c9936 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 4b974ce9b..8cb0b43b9 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 c322d7e96..eeab57317 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 a22465ca0..fbad57bc8 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 1a50ea7d8..3396b5b8b 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 c844cfa1a..0a871136f 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 6276192b3..616c0db5e 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 4fa836d58..c66173836 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 570e600fe..4b9b254a8 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 fd5fa0292..fa3e09561 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 49b8d47ee..5de382052 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 804f39647..5bdbce786 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 77bd6748c..3faee7bda 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 40cbe6aec..6aa0d681a 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 cfa46e102..e55967bd7 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 d5fa881dc..0c94c31a2 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 26d67171d..f96b0d4bc 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 a25c76c81..ca7719bd7 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 -- cgit v1.2.3 From 7d375972ba0e5a8a17fecbd223dd6de6e87b6090 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 11 Jul 2018 11:12:26 -0500 Subject: Sync bg_event macros with pokeruby --- asm/macros/map.inc | 29 ++++-- data/map_events.s | 3 + data/maps/AbandonedShip_Corridors_B1F/events.inc | 2 +- .../AbandonedShip_HiddenFloorCorridors/events.inc | 8 +- .../maps/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 +- .../BattleFrontier_BattleArenaLobby/events.inc | 4 +- .../maps/BattleFrontier_BattleDomeLobby/events.inc | 8 +- .../BattleFrontier_BattleFactoryLobby/events.inc | 6 +- .../BattleFrontier_BattlePalaceLobby/events.inc | 6 +- .../maps/BattleFrontier_BattlePikeLobby/events.inc | 4 +- .../events.inc | 14 +-- .../events.inc | 14 +-- .../events.inc | 18 ++-- .../BattleFrontier_BattlePyramidLobby/events.inc | 4 +- .../BattleFrontier_BattlePyramidTop/events.inc | 2 +- .../BattleFrontier_BattleTowerLobby/events.inc | 10 +- data/maps/BattleFrontier_OutsideEast/events.inc | 16 +-- data/maps/BattleFrontier_OutsideWest/events.inc | 10 +- data/maps/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 +-- data/maps/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 +-- data/maps/LilycoveCity_ContestLobby/events.inc | 24 ++--- data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc | 2 +- .../LilycoveCity_DepartmentStoreRooftop/events.inc | 4 +- .../LilycoveCity_DepartmentStore_1F/events.inc | 2 +- .../maps/LilycoveCity_LilycoveMuseum_1F/events.inc | 32 +++--- .../maps/LilycoveCity_LilycoveMuseum_2F/events.inc | 24 ++--- data/maps/LittlerootTown/events.inc | 26 ++--- .../LittlerootTown_BrendansHouse_1F/events.inc | 8 +- .../LittlerootTown_BrendansHouse_2F/events.inc | 8 +- data/maps/LittlerootTown_MaysHouse_1F/events.inc | 8 +- data/maps/LittlerootTown_MaysHouse_2F/events.inc | 8 +- .../LittlerootTown_ProfessorBirchsLab/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 +++---- data/maps/MossdeepCity_GameCorner_1F/events.inc | 6 +- data/maps/MossdeepCity_Gym/events.inc | 22 ++--- data/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 +- data/maps/Route110_TrickHouseEntrance/events.inc | 10 +- data/maps/Route110_TrickHousePuzzle1/events.inc | 2 +- data/maps/Route110_TrickHousePuzzle2/events.inc | 10 +- data/maps/Route110_TrickHousePuzzle3/events.inc | 10 +- data/maps/Route110_TrickHousePuzzle4/events.inc | 2 +- data/maps/Route110_TrickHousePuzzle5/events.inc | 46 ++++----- data/maps/Route110_TrickHousePuzzle6/events.inc | 2 +- data/maps/Route110_TrickHousePuzzle7/events.inc | 10 +- data/maps/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 ++--- data/maps/Route114_FossilManiacsHouse/events.inc | 8 +- data/maps/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 ++++++++-------- data/maps/Route119_WeatherInstitute_1F/events.inc | 8 +- data/maps/Route120/events.inc | 66 ++++++------- data/maps/Route121/events.inc | 28 +++--- data/maps/Route121_SafariZoneEntrance/events.inc | 4 +- data/maps/Route123/events.inc | 66 ++++++------- data/maps/Route124/events.inc | 2 +- .../Route124_DivingTreasureHuntersHouse/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 ++++++------ data/maps/RustboroCity_DevonCorp_1F/events.inc | 4 +- data/maps/RustboroCity_DevonCorp_3F/events.inc | 4 +- data/maps/RustboroCity_Gym/events.inc | 4 +- data/maps/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 +++++------ data/maps/ShoalCave_LowTideInnerRoom/events.inc | 12 +-- data/maps/ShoalCave_LowTideLowerRoom/events.inc | 2 +- data/maps/ShoalCave_LowTideStairsRoom/events.inc | 2 +- data/maps/SingleBattleColosseum/events.inc | 4 +- data/maps/SkyPillar_Top/events.inc | 2 +- data/maps/SlateportCity/events.inc | 28 +++--- data/maps/SlateportCity_BattleTentLobby/events.inc | 2 +- data/maps/SlateportCity_Harbor/events.inc | 8 +- .../maps/SlateportCity_OceanicMuseum_1F/events.inc | 30 +++--- .../maps/SlateportCity_OceanicMuseum_2F/events.inc | 42 ++++---- data/maps/SootopolisCity/events.inc | 12 +-- data/maps/SootopolisCity_Gym_1F/events.inc | 4 +- .../SootopolisCity_LotadAndSeedotHouse/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 +-- .../maps/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 69b3629f6..23806b4cc 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 d268cba63..1d4813b73 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 d3b72825e..34bc41cf0 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 fd5cb4ac8..54453b729 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 3c9cb9a0d..07dd3558b 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 8008e9d5c..207744c30 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 628ff1158..09846d401 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 4294d60dd..5b47d72a5 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 4b8e0de0d..20233160e 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 4cd125033..c24a47301 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 dd7b4029d..063f49813 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 c53e0f875..5dae24a71 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 5fddc6f37..1020cef3c 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 07c2866a1..580873720 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 20e6cb085..61cb8ede4 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 a04f0cf4e..dbc3584a6 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 dd3722945..521577c4c 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc @@ -8,8 +8,8 @@ BattleFrontier_BattlePyramidLobby_MapWarps: @ 853C5F8 warp_def 7, 17, 4, 3, MAP_BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_BattlePyramidLobby_MapBGEvents: @ 853C600 - bg_event 5, 12, 0, 1, 0, BattleFrontier_BattlePyramidLobby_EventScript_250D42 - bg_event 1, 12, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E95 + bg_event 5, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePyramidLobby_EventScript_250D42 + bg_event 1, 12, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePyramidLobby_EventScript_250E95 BattleFrontier_BattlePyramidLobby_MapEvents:: @ 853C618 map_events BattleFrontier_BattlePyramidLobby_EventObjects, BattleFrontier_BattlePyramidLobby_MapWarps, 0x0, BattleFrontier_BattlePyramidLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattlePyramidTop/events.inc b/data/maps/BattleFrontier_BattlePyramidTop/events.inc index a42052d96..fbf4941ca 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 ef38d131b..73bdeeb2b 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 7d25049fd..526c53971 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 b2315873c..8095b6d6c 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 ba9d3a30f..33069e0ca 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 01a258600..036127ca8 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 77a6ab889..fadd3b282 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 26ebf4501..a4c45c2cb 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 7c494b698..cd6fb5e8f 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 f28e9e3e1..ffea67228 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 b8ca9eea4..e6bc7a10a 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 b6c3400c6..fae6f714e 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 cdcc4c792..cdf9c79b9 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 e8b94c460..6c2a8ebe3 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 2b21594a1..914c4901c 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 8abef75e8..5cc222c4e 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 bcc0a5a4e..e128b40b2 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 104df23d2..f8dbe9ad7 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 c02d93dde..01283e146 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 ce6eb77bd..b1028c978 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 755e606b0..184bed05e 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 8560ee3a8..d8aa6daa4 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 421a2c094..240de9cd4 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 c7477af3c..751bc0fc7 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 27448106f..67f644529 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 5595da718..66fd112c4 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 8492376e2..279772204 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 3ebc7c803..b2771391b 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 7a66d580c..f24ede1b9 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 968a61b1d..d88bae478 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 fd257b17d..b6e7c3cf9 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 df0022c99..57538339f 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 fbcc38a03..815acaa82 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 34eeeb750..fda8175bb 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 037f0538a..6d541e1e3 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 41e5112f7..df992a2e3 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 0d3014ab1..8569e33ec 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 cc393513d..5b2d9927c 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 c1ee85909..7befd0f73 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 8c30b75b7..79b436489 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 c1b2b0053..cb126faef 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 21535add7..068f9a356 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 4cab5be37..1e8e1f093 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 c95cdf5cf..0413b1be4 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 603d7f3d8..4186ec9ca 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 8245f1fc2..a6511d2c1 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 521c71e72..66e00b1f4 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 a8002de8f..03806a854 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 ec247fd67..16fd3530f 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 35107f3f0..669625c41 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 6f7253a2b..ef781a838 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 29f46af20..4c333f6b3 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 805c1db6e..af8f10f99 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 1ba9ea124..8c637b2bf 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 8e1134f86..a601c8381 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 f33ff0918..b3fd71d2c 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 e3cfe95cc..209c789a0 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 aaab1e751..e0bfbc630 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 b5e297f72..8e1916a5a 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 969166de9..d43253baa 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 a51e09b59..58a0bf64b 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 ab858ae13..6581eb582 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 52a60261a..497ec2dec 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 cf7addcc8..aa9b9b420 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 22807fcec..11541f2bf 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 a83027178..e18cf16d0 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 66527a7ae..f74e1ceab 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 4cb99b121..6e6d17d9a 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 4af135a6d..ee7f5ef17 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 3e9c99d55..8d10ce499 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 8348be5cb..44539d4cc 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 d1083bb7f..5255e5acf 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 38186f217..ae6de093d 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 2fa2f4bbc..0e8d3607b 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 986384ad4..38063f98d 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 97022a3e0..f5406539f 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 0401ef544..f91d26f4d 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 75d64270b..df3ef829a 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 1d4373f25..62a52420b 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 efeb449ff..a5d4c0f8a 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 b6aee76ac..cd11e1ef2 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 7cf199eee..d61286928 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 23469ff17..7af1afea7 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 1f25b59ca..70cabb8c5 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 65864133e..0a707820e 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 ca6142852..ba3798f7b 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 a6ecd2e7f..47bd391fb 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 29a77c6ce..36888bd7a 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 e2ba1ad15..d81cf31ee 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 9747679ad..ffdb9984f 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 f49f07faa..b24e21f44 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 c21f105e5..587b60904 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 c69d053ff..01a93f7e6 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 fd79c716d..97ae62fe6 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 7cafdc402..03f86df42 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 8ac15b503..658be476f 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 7fafbb76a..3f17c6c3d 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 3e4ab2780..30ff07ee9 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 5294f6d71..f76468efe 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 cb13b81fa..b8ced006c 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 8f5fffa71..6a7c07b9b 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 c4b1710fa..02d28acfd 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 4c70edf34..4471d06e0 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 260d64a0d..baef1be49 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 0c655b814..164391cf6 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 8d6971796..0d1f57cdd 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 0fdcca3c8..84548b44a 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 c56a5b5ee..d0d56e6fa 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 22827aca3..8494f36e5 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 9722e1df1..be32d9ad4 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 0e038f0f9..5ef669f48 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 38f59ff13..a3d1ad0a3 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 f7f38f7af..3ba71ee8e 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 886958342..468a0013d 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 659ca8b03..2fb2d069b 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 dd331570e..ddd6c15ec 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 0181f3193..3cd1b9714 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 5743c8c22..543a7d02b 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 8b0cc9b40..dabb85971 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 b9e6955ae..b6af468c5 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 6971d4217..c0bcde1ba 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 79973b316..9271dd4d3 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 3b72a57f3..8b74573b7 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 d0875ba78..c5c60ba6d 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 5f6e2617f..ba5f25d98 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 aca75a698..256b2ee1c 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 9c695f745..7b407d5d2 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 b7d481ac3..7361ccc21 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 ee78e053a..36d8d7b27 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 8d0512952..07c18bae5 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 d204708db..14dc7169b 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 55bfeb614..b65134679 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 b47a00441..aa23659eb 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 a2156ff48..e1f2e2bea 100644 --- a/data/maps/TradeCenter/events.inc +++ b/data/maps/TradeCenter/events.inc @@ -6,8 +6,8 @@ TradeCenter_MapWarps: @ 8539DB8 warp_def 6, 8, 3, 127, MAP_NONE TradeCenter_MapCoordEvents: @ 8539DC8 - coord_event 4, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773F5 - coord_event 7, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773FF + coord_event 4, 5, 3, VAR_TEMP_0, 0, gUnknown_082773F5 + coord_event 7, 5, 3, VAR_TEMP_0, 0, gUnknown_082773FF TradeCenter_MapEvents:: @ 8539DE8 map_events TradeCenter_EventObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0 diff --git a/data/maps/TrainerHill_Entrance/events.inc b/data/maps/TrainerHill_Entrance/events.inc index 8cb0b43b9..ae11a879e 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 08cf19a4c..102a5f6e7 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 416e9fe86..ca98f25ac 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 ba8ed9508..0a5dc773d 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 5f8b99b64..7799e0ad6 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 350cca5d6..e0bb19642 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 0a871136f..f87467d19 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 4b9b254a8..1c4bafba9 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 0c94c31a2..3df6ff6b0 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 ca7719bd7..bcd5747f7 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 000000000..a915bc509 --- /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 000000000..0f51054a8 --- /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 6bdfe1c54..9031338dd 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 93b82b3cb..b2fd54eb8 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 ++) -- cgit v1.2.3 From d5eb94330a9c626aaf72b5e5d44f7aaf1da0d00c Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 12 Jul 2018 21:47:04 -0500 Subject: Use region map section constants in map headers --- data/maps.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 +- data/maps/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 91c108c7a..8a0c2d43a 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 0348798fc..a07a66947 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 2ce374617..118d91860 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 e8d5fc419..6b743af3a 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 cac71c430..da8f1f124 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 c03eba0b8..e83f9a020 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 efa3a0bb9..b6b48d652 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 e2021ea85..3282054cb 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 227bf3e8f..4d5eead34 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 55d228f47..ddac73f8e 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 62991d12e..304180955 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 7838b8875..b9be9d667 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 cc9db3443..e73f1c5d9 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 87650f5b2..cb7f00a6f 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 2361bf769..1c390ec99 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 5e958c6bd..5cce523f9 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 afbba5738..31085dd4c 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 079c18ee9..984d16740 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 8089a1634..230c2b7d0 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 a643b729e..c2dc76096 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 bb82dba18..cc01983a9 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 1fa34aab4..8adc7f2ba 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 a8d91737e..33d974804 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 a82cd93f6..8ff225a8e 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 7a8afda58..927137cf0 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 5312dd0fe..332363738 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 3f5e0ff4e..541613f53 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 3edfad730..6ddf3fb45 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 133115e33..25c5d684f 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 26813d1f1..be93189ab 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 e25a62ce8..592300353 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 f3050926a..c672d86cd 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 7da242183..1fa0645a3 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 eb6e06a0f..766e9689b 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 b03d993fa..696e41601 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 4b62687e7..18ddced68 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 8104eadfc..cc723eb42 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 a2b84a22c..955b0be42 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 96d249ab9..e75761bed 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 58a662bb3..e5ea8a3ef 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 5dde0fc15..8111043c6 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 1d8848d23..2395feb52 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 b1178e0a0..f6b0e6351 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 069dc6f76..fca127f5f 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 f2eccb9f4..a5eda44ef 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 ed68e86c7..06fd632f8 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePyramidLobby: @ 84853F8 .4byte 0x0 .2byte MUS_PYRAMID .2byte 360 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePyramidTop/header.inc b/data/maps/BattleFrontier_BattlePyramidTop/header.inc index 9e9508e7e..140a5d4e8 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 32b789720..fdf167b9f 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 a9eb2b2c5..157a9f0ae 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 361e6be03..de71a7dc6 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 ccdcb013f..1ba6d43c9 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 112c7f938..d3e6216d2 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 6e0e3b470..db62f0be3 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 cc55ae591..5a25ffafa 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 44acc4b6a..21e01eb7d 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 69a6dba30..ad875cc4e 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 3a18ce347..8ce5169d7 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 e052e6ce6..11f40472b 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 a6fa1470f..743ccd512 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 ec6cfb105..b6192f8a9 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 5124822a8..96843d502 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 46fe25e2d..9a320a4bf 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 24e7b3005..999ba6ce0 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 1067fc70c..2285a9e3f 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 f9dc82cba..0f49f1e4b 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 319ecec6a..bbef1d1c7 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 22e3ff616..2b39d2cf6 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 361c58a04..740141748 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 340ba9597..8036032e3 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 8f395bae4..236698cd2 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 f0e0be773..b7468a9d2 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 7ed6b181b..dc3deeb48 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 9eb6ef754..8d65a6fa6 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 3f07295ae..c3bf3376d 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 978c4f466..c001abc53 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 09a7e4703..e96d7cac7 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 e99531da8..440eac549 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 13c23c24b..f467dfd7d 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 a12b6016e..00c45e577 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 486c74bc0..27a33d4b0 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 a73718125..1507f0518 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 eac3cb1c7..98c08a116 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 a1d5585c8..39cc4061a 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 1c67b55e7..b4b1a281d 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 9dcea14fa..407cf0024 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 0429cbb0b..37d8c75cb 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 ea4627aa5..f264ace73 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 069bbc99c..04a62dd6b 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 e9dc265f5..e3b8a21f3 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 0fa252cc5..c25c0d82b 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 629806ad6..b5eacd7d9 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 b3e4dea97..5cda3da60 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 1edd4c6c2..762fb4115 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 6b046b61a..bd77221f6 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 819afc08f..a5597e4e9 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 8f076bf77..009a279e1 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 2a420d703..9d4bec918 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 7c6638aed..c6fb45581 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 fcb55ee29..24866ee7a 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 31af0f14d..dfa5daf1f 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 c317b12bb..94c735b59 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 6d285c437..c27122bc5 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 99d29f69c..e7b628503 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 4d6a71785..90ec683d7 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 d8275de59..05949ab05 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 890d8b79f..7ba0b694b 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 e239ed146..1e3591b8a 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 0a4878176..0de64f823 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 dbc20fd80..2c6ad7097 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 4dacefc77..eba002828 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 0c160c76e..7c932e333 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 da2ef5259..ff5999475 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 da0b96380..4051a8722 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 0c541bd58..1f6ade600 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 786b7c598..22bb385c3 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 2e7bef16d..267f341d5 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 613b47446..1eb362f60 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 63539b7a1..3bfe680e5 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 d99e18907..e81864220 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 61d0b857a..59e523449 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 3855eb87a..a2f5ebef3 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 c26b91f29..caece3a22 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 be81ffe6e..17a58396f 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 5f2023a71..adf2570af 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 ba86df464..60d07ff5b 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 443a4dc27..e07cc4ee8 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 17cadef2b..5e50c8271 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 6e8aa3ef3..ee3d1bb7a 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 515518d9a..ea7d76a36 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 2c67be178..a2e45e006 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 5d7879d64..1b2e2300a 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 dd29fcc26..2ac52de61 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 c02896935..5ebac1143 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 b091e166f..98c24b211 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 4ebde8a93..918a988b2 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 eb241b368..21b280322 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 06dd18e1c..9c933f5bb 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 62461784f..a339e9dde 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 54297f446..45f8e2e05 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 71002c7da..cdd8de330 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 6513cde1e..3017bae96 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 18cb7b971..1dd682c08 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 ae2b8e0e8..920f961bf 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 adb7a7bde..197901ce7 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 3d29c272a..af8cc27b7 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 6ab42f082..244eff08e 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 95935c283..0d1aeea5a 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 0644d8cb7..2c1514b75 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 c77ea5934..e3a316015 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 6ff291c29..14fe2e7e2 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 f6fc90e4e..6bab46582 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 12cc74b5f..ff1e483e0 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 30cde2e9c..e7fb510f7 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 66d732921..1f591e8f2 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 c9ef33f92..bb34945c5 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 aa8a822f5..f9e56baea 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 72d8699f1..a01610eaf 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 b3444dc0f..ae10ecf37 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 596b0e189..1fb9fc917 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 1ec7fa26e..eb3ad0011 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 d0b17f863..29ec0ca38 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 ddd0d6284..6cbc84c1b 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 ed380598b..7881cf288 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 200e1b7bb..3e3a5810f 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 b5135b1ff..3e490a6cd 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 3a96f4c3b..991117c67 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 2ad060976..af11b9d99 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 e4ebc314a..dd79bf744 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 bb8cd73f7..48e90e355 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 9bc54b809..3a098b37c 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 cf1448ab8..a1af1c59f 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 abaf3ad3f..4f8b71c7a 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 3d884a5d2..903bcd845 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 3d184d345..f78304998 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 1a818490e..49bd9d333 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 9632ffa39..331b40645 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 3721b4432..1b5c0ed32 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 c5adc0fb1..cb282a135 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 19e61cf16..3bc705498 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 782efd3d0..2dd859134 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 7db9bcb62..df902a25b 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 0e23469c1..f429787fa 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 bf648b5da..09869a0a5 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 dcd7be859..bcb120e6b 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 2afb7ae00..298bbad57 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 97f0cdcae..3c60ff649 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 9c0dfdc65..6be3dba3f 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 42c2f3fdb..d929ef742 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 f1487f334..cc2a56e79 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 04010b50c..dbc6effd6 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 d5a87bae9..f4b411a06 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 0153a3f27..39a81acd1 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 1e72c91b5..821cacc0b 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 20e9e3f5a..711c8b381 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 8cd5eaf79..18b6d4d61 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 6158ed3cb..c82b22bc3 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 1a685fe55..261502089 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 410522097..5032b25a6 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 407408bf3..fefbbfb8d 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 228b197eb..52ad4945e 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 d070dd32a..14d6eeff6 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 24ed48ff5..8e27ddbae 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 45b5a40e6..b32ba1b05 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 8e3cf5a5f..41c7c1a86 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 17212c4f6..1affd1213 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 6e83a33bd..bd14b94bf 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 8b7ecd54d..2ad55f408 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 11a71f8c6..24dd5d97d 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 aa6430475..21aa7c991 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 db4371175..719e88b1f 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 4acd48c6d..0ab38aa38 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 3130c2d35..6e029f786 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 5bb682b98..b2b2e21ce 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 d29063e86..aaefbba0a 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 1b1371370..6cc631f65 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 a96c5648e..f225660d0 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 11402d3d5..ea434e50b 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 81c6276d2..b820706f5 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 22b3aaeb6..002031a7a 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 cd0717add..a9cf03b39 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 e449c3a37..0c983da36 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 def0a15c9..c26f56dea 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 7c1351ea6..fc49e37a9 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 fc5af866a..2c7c774d3 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 9b886677e..75074e91f 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 623b5f970..14e89db1c 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 321271f78..2ce3b8eaa 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 64dedcba6..8b7112431 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 b3cf19738..72e0f38ab 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 d54538b4e..8e56d6f53 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 33acf2e51..d5f7f5db9 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 586c976e7..80bc3bc38 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 5ee83f3ce..2277dd173 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 a6659fafb..59c6ea2c8 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 abfb64ee8..ea035f4be 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 3a7fce680..e1418859b 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 83a907bda..070effff6 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 bbdfaeb44..8d060e401 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 efd224564..7c1e49a99 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 17b7673c7..9e903d5b6 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 d4a35c4c6..4f3687bf2 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 8bf9f015a..28721a757 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 9360976d4..a0be9d599 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 193120ca8..7e756e8f5 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 3c390f962..b9c9f38c5 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 013d84e84..aba767d32 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 55f9d512b..10b8c44de 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 9a9b308de..1d982d11f 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 84d942a9e..ccd6e4de4 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 4f8237761..2d6f6cdc1 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 027de3f91..6146db29c 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 41ae68722..0a0601117 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 a45886c16..f1014f5e8 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 2ab0c76ba..e638b9306 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 d8a17e85f..db7bbbb92 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 0a77e6406..27c228fe8 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 a3cbed38a..5cf41ad24 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 6aed92500..b82c99552 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 bb96b7e3d..2b1826572 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 48ed319eb..19fc50327 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 cc8d2446b..2a302f904 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 a01250cab..4122b51cc 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 a6dab9d20..d6da1a2c9 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 c7243f452..f74ca0cdd 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 4d1535615..464e1d3ec 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 c7484c59f..ebc18196d 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 824ef267d..d259d7af2 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 7782ca0f4..12cc5aed7 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 c022d9d0b..6455c8555 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 147f003d0..212457f72 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 3eda8df5e..637ac378e 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 3d8ae1db5..16fb5aca0 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 6039540cc..f593d5769 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 75753041f..f7a265561 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 043acab8d..09fb145c8 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 d51331b61..dd942886a 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 9b9df67fd..21e6fc1f9 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 3244c01b8..3e4d88784 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 b78d36a2a..95d820a95 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 571dcd9ce..79c591b4a 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 fb60530a6..5222263f1 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 7beed0a39..3774ccf3e 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 671c7d28e..b8789b249 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 d11ea93d2..6fdc148e3 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 00724203f..dc78b95ac 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 248c6d2ae..fab1f946c 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 739f19b74..6d3a477be 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 6aeb5deef..7f9655153 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 9595c1372..8471a0f01 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 7742f8bfe..d7b062ba2 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 af57b7bab..6dc976d05 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 1528ab624..46f83636f 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 4e207706d..b6a064a8e 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 096f4a704..b7f1ad818 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 7235504fa..aa3a7dd19 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 ef027d1c6..34a1ef764 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 22da93b7a..8a3b38d62 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 1a8825bc1..e59af7c13 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 f431118c1..4d600499c 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 c6335b13f..14b8c1801 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 e23012fb4..b95129158 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 50f1b7b08..6c60ccfbe 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 61217a576..24cc091e9 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 f7538b723..3b34c3e70 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 93f4bd835..51dfac9e3 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 a27885664..2c61323b5 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 2c4cea90d..eb982f2de 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 c9482cf31..b4e577678 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 cec1ace27..68ae187ba 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 d6d394209..55bd7dbd0 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 35a466e1e..a271dba58 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 2529d7366..811184bd9 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 99a4a694a..07a795f3a 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 0b38de121..0ed34b2d1 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 842b2f32d..5a90430fd 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 ef5388364..c5620a2ce 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 d54eb7752..202a75774 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 3bcf40de1..2ad32f43f 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 85df95a1a..40b394a27 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 2402f4cc5..9bb6f40b9 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 946ad91f4..fa3bc610a 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 5de9d6400..8a9f6e6cd 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 750270dea..8023f4478 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 89feae870..a65a8c849 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 c2c055af6..2f827017f 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 4cf6ca023..909277b85 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 397c0060a..24589a71e 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 72667053d..dff57293e 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 87d56215e..3ed0f5455 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 e9424580a..5298c41c2 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 cda0036b3..d717c1235 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 efe6a1b76..01ac3e4dd 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 c20e1b2d3..b3794190b 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 9a5763394..031ae74b6 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 97156442e..56cbab012 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 919dffa6f..8fef8f257 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 ac319327f..8dad76407 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 897d37afb..02804667c 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 f690fa432..ea69af862 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 3bf779b27..ad90e8f55 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 cb61c3a38..af32f0bde 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 754b0c245..8f966eaf4 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 fac499e3f..7d324311e 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 69a351082..d2a09b1b7 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 9b8d641d9..1fa502a2b 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 4a05c76fe..588540fd4 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 56a07a3fa..9bb2b86fc 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 591501de1..d5bbaccf4 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 7d7a4590f..e3fa357dd 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 f1466f9e7..89b03ed88 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 811fb3ec7..2ad541e81 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 a7501cddc..d68c93985 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 4e67b3cb6..30691d270 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 13e741159..c00086a0b 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 fa3ee0200..c242fe898 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 08acd71f2..6ced2f320 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 53abdbebe..4128e5dec 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 47b4b613c..105e4316c 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 b13a344fc..0151fefde 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 b4fe2bc0d..77392dae8 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 e8bc66e6f..0233c4b1b 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 20f6dd90a..b4bc18251 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 adce7ef75..f26674d87 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 5423772bf..b1e738b79 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 9e270b9fc..56dc26994 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 f3954aed0..65046644f 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 c0bbdebd1..7a5968b18 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 4f424b853..e9754f54f 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 49e5c1481..a07f7fba9 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 4080980a0..66e8b9e0e 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 d4ad99dbc..8a7884e58 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 90918421f..70e622e46 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 8aef6fe28..f5297aaa2 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 c921d3a5e..e668e6327 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 6f4d6c02d..bd075650e 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 73b5d4a0b..f03668a60 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 cb82a6500..58a9f6075 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 3db96f00d..f482ba044 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 74f264702..48e731a3e 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ RustboroCity_PokemonCenter_2F: @ 84833EC .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc index 3d68afc48..6948dc366 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 d4f1fdad5..998208e80 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 046eedc85..a33e236dd 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 3e2f5bacb..2c627ad0b 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 c5f0aaa00..935427cae 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 d7ad06ffa..5452be556 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 58685eafe..9e8be1352 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 81718dc65..b3c98ee11 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 92488b12d..b56865835 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 3ffd068c2..9780b80d9 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 438d3ea7f..17d73acf8 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 5cff316ae..5c82a2c3a 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 543f83ebb..23aab68fe 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 3e26232dc..32e0cbb75 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 29a75081f..4dd67bdb3 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 749b4b9ee..bec8fc16a 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 4ef0565be..3e6b0f5c8 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 0edd39d4a..a45bb4f6a 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 013f447dc..831c85394 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 9bbb14463..5e39909fc 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 d4b0db267..fa9e72804 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 903e25a14..8248b89f7 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 0d43deb23..2fb1a3b70 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 4a26587bc..5e2b0c363 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 fd5fe39f3..1fabd6be1 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 4e987702c..4783af7a7 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 ed22bbb04..208a27ae8 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 412d1f4af..0bdfe5f0f 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 542df3954..490214803 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 aceddbfda..ad8dc034c 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 de95374ba..2e10374ec 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 8535b1e89..213364166 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 d73f38257..2dc17b4e0 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 1cb6c4f5e..70dcb91af 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 744e8b24e..23f96fb4e 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 c153e74c6..68e302a71 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 be475a7ad..faf3fd44b 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 6ab9f9d94..2a98c0dd7 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 760781e47..b3ccb0446 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 cef2a4597..7e408128e 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 12fa26c3c..ea2c263bb 100644 --- a/data/maps/SecretBase_Shrub4/header.inc +++ b/data/maps/SecretBase_Shrub4/header.inc @@ -5,7 +5,7 @@ SecretBase_Shrub4: @ 8484D14 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 220 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc index c5b5a2aed..e3951f3c1 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 ddea5c0bc..23e8da9b9 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 630dbb6e3..61378b8a3 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 bc6f84664..b5f601189 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 9a6ae5438..1eee3cfed 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 da1949abe..27d5a0ecc 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 8bfeff0f5..f2e986b1c 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 baf6b7d89..292672976 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 2f3f34b43..3c02b2433 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 673bc6bec..b58e12335 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 c742d2b8c..c34c87a10 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 6571068ce..69aa8114e 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 b6de02c7d..9fea56a0f 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 719a92c3e..3dc8cae94 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 74d0ec94f..5123f9a80 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 54d003c27..9100eb6de 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 3a47df473..7f55c68fb 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 a1cc8fb8f..2be149c00 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 81ac3046d..e54ede745 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 10a68ddc2..9823646f4 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 bb38a2d5d..f72124743 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 8031521e9..8efd8c542 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 38bb57bae..24a7a4e2b 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 3836ab067..1f99a1cb8 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 7ac123723..e617b0a91 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 4c8c94753..c76e6230b 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 7ea7cca9e..ddc1bfcef 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 1a809a567..767410cbb 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 7f214b54c..8ec8c294b 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 4f7bc3f98..8f221fcc7 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 12389ed44..bc4fc03ce 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 e13692bba..569969de3 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 4b0224075..88c4e349b 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 7d4272d09..e300ced6a 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 8d1e8cc17..2b3d99694 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 7bf64b603..6070cab3c 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 87a6c0c5b..34a3f1916 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 c04b411f1..d4b8e9aea 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 e3b36f4ed..894aabb9a 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 74469da7c..0b48dbca0 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 4200a7ed8..663a64800 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 6265830e9..11bb3b502 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 2551aedc1..5eaa8d470 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 24e7a778a..36daf5bb2 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 97ae23fb7..dfe26c5ea 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 d39499132..1275ccf91 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 d6de286cf..0d634d549 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 36460f147..9f151e737 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 383ab24b5..7dac9a029 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 792b5ae31..d0fa71556 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 ac4ae5ea0..f1fc07ae2 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 2e5ea1f84..7828f6bbb 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 c3ffec414..5ebbff88b 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 83485cbf1..537ab1709 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 ba2bb5c0d..76493dcfa 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 d0d35fea1..82948348b 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 1a080af1e..be575d25b 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 900f5930f..94a871f6a 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 02c5edb91..81c405cdf 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 55afa79f3..92d6c14a7 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -5,7 +5,7 @@ TradeCenter: @ 8484D4C .4byte 0x0 .2byte MUS_RAINBOW .2byte 222 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/TrainerHill_1F/header.inc b/data/maps/TrainerHill_1F/header.inc index e5fd3b576..fba54fabd 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 712c99cec..d47e960ed 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 92bbd40a1..60f981e3d 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 5de769778..6b7edf22b 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 13912579d..dd5daa4e2 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 f37950d98..60422a940 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 3527f447f..c6c3e626c 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 d63ca8815..6d3603bf5 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 a2754c69e..03230042b 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 8329304a8..203cf8b3c 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 f4f3e8c4b..b5de8aa07 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 043a6997e..e6a846303 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 1be09d6a1..0aadca37d 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 4ededa296..388c3510f 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 54bffb710..4aca9a734 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 f08f506a1..5715c5e90 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 6415ac787..b39773d23 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 a72666d12..8ca54e9fb 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 ef9ee1612..661c4d105 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 b79ae81a2..55566ceef 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 4c8edd31c..79438a8d4 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 46465019e..f5a6fde39 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 13e428cfd..cf5318be0 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 8244c3802..538798a4c 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 b4da8dd48..c4d384729 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 bb1ce881c..3d08bf4ba 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 047ba12ad..aa176dbfd 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 1eef21301..bcdd211ee 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 9b8f62260..e704df2f0 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 4d1e0ca9e..7c7bc244c 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 51f3dadbd..a83a7f2fe 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 e6571b7f0..ebc8d2083 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 6f69b3aac..90b1e7e0a 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 b6c5177ce..5a8e1183f 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 ee657d77b..0de25d4fa 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 cb727234e..7f9a923ec 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 35ff7bd3b..7e13504a5 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 b9edeeb17..107eb524f 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 b6c80a656..3c9453154 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 -- cgit v1.2.3 From d53e8137cd1e14c7fd5435562a979bb6bd83d20e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 12 Jul 2018 22:15:35 -0500 Subject: Use weather constants in map headers --- data/maps.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 +- data/maps/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 8a0c2d43a..59a6b4930 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 a07a66947..149f27655 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 118d91860..a0971779c 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 6b743af3a..12cb7e697 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 da8f1f124..f6616f885 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 e83f9a020..f375e0bee 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 b6b48d652..0ef17861a 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 3282054cb..5dc438acd 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 4d5eead34..e4bf89911 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 ddac73f8e..fa713bf29 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 304180955..d552a8cac 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 b9be9d667..7b121a2d2 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 e73f1c5d9..0176f1637 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 cb7f00a6f..7ca32edb8 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 1c390ec99..344bdaf8c 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 5cce523f9..afc0f475c 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 31085dd4c..7590ebce5 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 984d16740..51ec82492 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 230c2b7d0..0d903e1cf 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 c2dc76096..242f32e61 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 cc01983a9..ebc999cf4 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 8adc7f2ba..f9d571c8e 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 33d974804..b801c08af 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 8ff225a8e..8e106ea1c 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 927137cf0..d20c65c2e 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 332363738..ba4431464 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 541613f53..112fb86bd 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 6ddf3fb45..19d194169 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 25c5d684f..72caf9523 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 be93189ab..0d607e671 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 592300353..db09e9b41 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 c672d86cd..27e2c8952 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 1fa0645a3..b9fb23a03 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 766e9689b..e1fa2d524 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 696e41601..701647467 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 18ddced68..d867a0daf 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 cc723eb42..3b53c9397 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 955b0be42..0f93684c3 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 e75761bed..d6fe6e340 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 e5ea8a3ef..f4fde68ad 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 8111043c6..4274d8eee 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 2395feb52..15b65af63 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 f6b0e6351..b744f348f 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 fca127f5f..289c02455 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 a5eda44ef..a0face861 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 06fd632f8..9fa6b7fa3 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattlePyramidLobby: @ 84853F8 .2byte 360 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePyramidTop/header.inc b/data/maps/BattleFrontier_BattlePyramidTop/header.inc index 140a5d4e8..970aadfbe 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 fdf167b9f..18d60521c 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 157a9f0ae..6606a9be7 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 de71a7dc6..13b0ebbf3 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 1ba6d43c9..1a6e40299 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 d3e6216d2..380a5400e 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 db62f0be3..5d9252fbb 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 5a25ffafa..9bcd28c75 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 21e01eb7d..25e88a5df 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 ad875cc4e..71b933474 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 8ce5169d7..2f4b74d7e 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 11f40472b..6fea64a15 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 743ccd512..f38db8f29 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 b6192f8a9..78f103166 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 96843d502..871e16cc2 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 9a320a4bf..620e79304 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 999ba6ce0..37b608edf 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 2285a9e3f..b356e7d7a 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 0f49f1e4b..3db684e8f 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 bbef1d1c7..2c1d3754e 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 2b39d2cf6..283c3744a 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 740141748..44442a28c 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 8036032e3..2e91cbfaf 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 236698cd2..f009f93e5 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 b7468a9d2..11cf24022 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 dc3deeb48..ef8c315d9 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 8d65a6fa6..41f1523cf 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 c3bf3376d..2938d5280 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 c001abc53..ae838f26d 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 e96d7cac7..e893cfbcb 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 440eac549..397c7c27c 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 f467dfd7d..3d9e1c2c5 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 00c45e577..af3df7eba 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 27a33d4b0..2fb732618 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 1507f0518..8f95706d3 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 98c08a116..8d0ffdaae 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 39cc4061a..268f24cb1 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 b4b1a281d..b4d09580f 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 407cf0024..7d43feff0 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 37d8c75cb..c67e86abe 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 f264ace73..3026d44bd 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 04a62dd6b..5bda31250 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 e3b8a21f3..f0ea9a70a 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 c25c0d82b..2b4464937 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 b5eacd7d9..46cac3433 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 5cda3da60..a19256b39 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 762fb4115..155670bf0 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 bd77221f6..12d34ac46 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 a5597e4e9..9edfd72a8 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 009a279e1..7e63a9023 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 9d4bec918..d3f41bd72 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 c6fb45581..fb1270636 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 24866ee7a..de821f116 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 dfa5daf1f..934a5a039 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 94c735b59..46352ccc6 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 c27122bc5..0d7070cae 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 e7b628503..8a22a27f8 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 90ec683d7..cd54f5fe0 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 05949ab05..8d4de2924 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 7ba0b694b..7401e4f2f 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 1e3591b8a..3cbf3d3b7 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 0de64f823..87ee3f9b6 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 2c6ad7097..b8170952e 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 eba002828..2b993b9a6 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 7c932e333..9d7a836fe 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 ff5999475..d22707542 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 4051a8722..80867002f 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 1f6ade600..1d1ac9edd 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 22bb385c3..6918cc2f1 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 267f341d5..b852e1c8e 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 1eb362f60..d43b97fbc 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 3bfe680e5..3ee23fe99 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 e81864220..17d01bfae 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 59e523449..217647a56 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 a2f5ebef3..875c190f5 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 caece3a22..77be7ebaa 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 17a58396f..0781e0c30 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 adf2570af..6e5950e85 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 60d07ff5b..6702e2f9d 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 e07cc4ee8..b801201f3 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 5e50c8271..b30fdf515 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 ee3d1bb7a..7c9be5b8f 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 ea7d76a36..0e1402710 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 a2e45e006..f00757c91 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 1b2e2300a..539a797f1 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 2ac52de61..a5b52d076 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 5ebac1143..bdf2ec584 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 98c24b211..7e20bffff 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 918a988b2..dadd55e02 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 21b280322..459db5bd5 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 9c933f5bb..013caf4d2 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 a339e9dde..b631de024 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 45f8e2e05..477706e68 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 cdd8de330..15182d88f 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 3017bae96..29dbe8c13 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 1dd682c08..0a67a7b51 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 920f961bf..02819535e 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 197901ce7..ab03878eb 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 af8cc27b7..df957dc4d 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 244eff08e..183cece4a 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 0d1aeea5a..452fd1e2f 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 2c1514b75..159d49277 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 e3a316015..438f3bd0a 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 14fe2e7e2..6d097c21d 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 6bab46582..326269407 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 ff1e483e0..9ddad2758 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 e7fb510f7..1257c09c0 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 1f591e8f2..fc90b501f 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 bb34945c5..db621e67d 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 f9e56baea..b8f607e15 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 a01610eaf..f06a48f72 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 ae10ecf37..42a463624 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 1fb9fc917..7149858a8 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 eb3ad0011..f372e381c 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 29ec0ca38..1cd935b55 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 6cbc84c1b..ee9660ebf 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 7881cf288..166d86828 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 3e3a5810f..9b8f05106 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 3e490a6cd..23e99c981 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 991117c67..ffd3d4021 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 af11b9d99..695b5560d 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 dd79bf744..34beb40f7 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 48e90e355..5c49de2eb 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 3a098b37c..c298bc024 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 a1af1c59f..32c178628 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 4f8b71c7a..a28edee35 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 903bcd845..e29bdfbc5 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 f78304998..0ffeffd03 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 49bd9d333..fc2868a9c 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 331b40645..66c3636cf 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 1b5c0ed32..292c61623 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 cb282a135..9bdff8e90 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 3bc705498..1adc065dd 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 2dd859134..92bc0e9d9 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 df902a25b..1ae72be25 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 f429787fa..2137aecc9 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 09869a0a5..ecff7b16f 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 bcb120e6b..8b35b2629 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 298bbad57..b8e3e1822 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 3c60ff649..5b1e2d8f3 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 6be3dba3f..6a4190ca7 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 d929ef742..bf95bb2ef 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 cc2a56e79..231f31001 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 dbc6effd6..5fb0a6eab 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 f4b411a06..69eff71f7 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 39a81acd1..7b5fa7375 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 821cacc0b..56b925c2a 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 711c8b381..496d3cf83 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 18b6d4d61..7ba2b7e0e 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 c82b22bc3..65e781626 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 261502089..50bf554d7 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 5032b25a6..376c2f232 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 fefbbfb8d..bc8816d1c 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 52ad4945e..412756e49 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 14d6eeff6..d0ae8c4e1 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 8e27ddbae..f27df336c 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 b32ba1b05..778899830 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 41c7c1a86..da43bbc46 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 1affd1213..6432ee987 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 bd14b94bf..a6a3db192 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 2ad55f408..942859e0c 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 24dd5d97d..20e6b5a09 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 21aa7c991..e10fa76c8 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 719e88b1f..b5f6b9175 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 0ab38aa38..fe7b14fcc 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 6e029f786..082ff6045 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 b2b2e21ce..ddc901f44 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 aaefbba0a..e4981b277 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 6cc631f65..2b012f5b8 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 f225660d0..e2b352406 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 ea434e50b..a90a21049 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 b820706f5..df6a9ee01 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 002031a7a..cf9796360 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 a9cf03b39..90bc41a90 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 0c983da36..4a984edea 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 c26f56dea..c3c126d56 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 fc49e37a9..c0b51c174 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 2c7c774d3..eba304363 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 75074e91f..b04ffb872 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 14e89db1c..d0b115b37 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 2ce3b8eaa..df190975c 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 8b7112431..0843eb3f4 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 72e0f38ab..b844bd961 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 8e56d6f53..6e47ed443 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 d5f7f5db9..dbd201c2e 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 80bc3bc38..72dc8a409 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 2277dd173..e39eb8183 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 59c6ea2c8..022761465 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 ea035f4be..c38fc57eb 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 e1418859b..53fb8a06a 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 070effff6..43b5f92cf 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 8d060e401..29c068992 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 7c1e49a99..3de6d823e 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 9e903d5b6..88306a7de 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 4f3687bf2..0afddfb49 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 28721a757..8ccabb8c8 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 a0be9d599..22a41d25c 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 7e756e8f5..47f92d2c8 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 b9c9f38c5..ceaceca41 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 aba767d32..c5e7576cf 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 10b8c44de..29597bceb 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 1d982d11f..2f8d472d2 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 ccd6e4de4..ee2eeb102 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 2d6f6cdc1..8b11f8d93 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 6146db29c..0b56cba11 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 0a0601117..a674e3849 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 f1014f5e8..34359e5b8 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 e638b9306..2be325bad 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 db7bbbb92..c38950b20 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 27c228fe8..65af6ccd8 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 5cf41ad24..fd08b39ea 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 b82c99552..9b22ca051 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 2b1826572..4301b5f93 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 19fc50327..a45e05795 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 2a302f904..5509d0cde 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 4122b51cc..ed9234f34 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 d6da1a2c9..73aab8ad6 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 f74ca0cdd..9e60e032f 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 464e1d3ec..3a1c8254d 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 ebc18196d..41a342eb3 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 d259d7af2..db13a9adf 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 12cc5aed7..e6e140696 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 6455c8555..be297090a 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 212457f72..08df71885 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 637ac378e..87628d4cf 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 16fb5aca0..de8566823 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 f593d5769..0accc508b 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 f7a265561..2d6cffcfa 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 09fb145c8..d2bc44d39 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 dd942886a..2a0988475 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 21e6fc1f9..b1399a1b0 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 3e4d88784..f903637a3 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 95d820a95..90098ec2c 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 79c591b4a..a1433fbbc 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 5222263f1..28d0fd8a5 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 3774ccf3e..adbd42c6a 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 b8789b249..b30fb80d3 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 6fdc148e3..6d95c3b6e 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 dc78b95ac..9cc1d0470 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 fab1f946c..bd94ab120 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 6d3a477be..661552e20 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 7f9655153..00e26fe1a 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 8471a0f01..1a643f7e2 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 d7b062ba2..85d8331a1 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 6dc976d05..336958088 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 46f83636f..7b1e01861 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 b6a064a8e..68c746b58 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 b7f1ad818..bda2a3ab5 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 aa3a7dd19..4d4583acf 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 34a1ef764..0c76acfbc 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 8a3b38d62..33e22d3bd 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 e59af7c13..22f0976d3 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 4d600499c..02019604d 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 14b8c1801..e67afc46c 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 b95129158..caf3f3f86 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 6c60ccfbe..ca694df00 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 24cc091e9..87a794524 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 3b34c3e70..a55cb3ede 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 51dfac9e3..df51d4222 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 2c61323b5..09a47a2ae 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 eb982f2de..3b55160d8 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 b4e577678..30f3501a5 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 68ae187ba..c9cbe2d23 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 55bd7dbd0..92157a59d 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 a271dba58..3105a321d 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 811184bd9..45260d6c4 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 07a795f3a..815a6a9e1 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 0ed34b2d1..86e923bb4 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 5a90430fd..7eb37293a 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 c5620a2ce..1b8a7249b 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 202a75774..1832db9ee 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 2ad32f43f..b4f7a2ac8 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 40b394a27..5c33fa74a 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 9bb6f40b9..049a1b49b 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 fa3bc610a..e312c1439 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 8a9f6e6cd..d962c50ea 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 8023f4478..ce6caf06e 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 a65a8c849..df43dd19c 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 2f827017f..05d4e14f1 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 909277b85..79e7c76de 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 24589a71e..01bf8a437 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 dff57293e..8a650439d 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 3ed0f5455..bbcb77d41 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 5298c41c2..77ecfd002 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 d717c1235..ab90821ee 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 01ac3e4dd..459238ffd 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 b3794190b..47fabca3b 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 031ae74b6..437aaef75 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 56cbab012..aa91043b6 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 8fef8f257..ec37ba464 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 8dad76407..566e0bf10 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 02804667c..3ed11a3ee 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 ea69af862..53e20cb54 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 ad90e8f55..47fa71638 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 af32f0bde..e5c3e5d54 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 8f966eaf4..ee5c6ee43 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 7d324311e..a9e533460 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 d2a09b1b7..6b339317d 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 1fa502a2b..75419c711 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 588540fd4..9c441064f 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 9bb2b86fc..6fa3b0308 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 d5bbaccf4..37d9a7a14 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 e3fa357dd..f7d134894 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 89b03ed88..7516de239 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 2ad541e81..6f4f3c540 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 d68c93985..fd405a128 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 30691d270..3e4affa65 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 c00086a0b..ae2dae20f 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 c242fe898..c92a963c7 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 6ced2f320..b4f08635f 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 4128e5dec..c16a9c91f 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 105e4316c..2787d369b 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 0151fefde..eeb09e0ea 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 77392dae8..672f4d3f7 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 0233c4b1b..bd7ab0e10 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 b4bc18251..623db96b5 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 f26674d87..3aed4b2f2 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 b1e738b79..742a590e2 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 56dc26994..28b4a1d1c 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 65046644f..f1bf1cd83 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 7a5968b18..2bf6129fe 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 e9754f54f..792d6a87c 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 a07f7fba9..50fbdf6d0 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 66e8b9e0e..271127402 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 8a7884e58..f8bb6826d 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 70e622e46..9fec8f298 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 f5297aaa2..fbac65351 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 e668e6327..7db64f8f9 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 bd075650e..db3ef40f4 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 f03668a60..08d31197b 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 58a9f6075..d7126406e 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 f482ba044..67070920e 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 48e731a3e..15e8537df 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ RustboroCity_PokemonCenter_2F: @ 84833EC .2byte 62 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc index 6948dc366..13138b65e 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 998208e80..e87800965 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 a33e236dd..6e66b473c 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 2c627ad0b..1c7e1d01c 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 935427cae..c02176a9b 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 5452be556..745e608a2 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 9e8be1352..e25a8497b 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 b3c98ee11..01b7e8198 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 b56865835..e6739ff66 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 9780b80d9..e60f44f9e 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 17d73acf8..5da814cff 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 5c82a2c3a..25115a13a 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 23aab68fe..51666baf3 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 32e0cbb75..68bb92066 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 4dd67bdb3..56bfc32cd 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 bec8fc16a..bfb164520 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 3e6b0f5c8..c49f283e1 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 a45bb4f6a..e440157e1 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 831c85394..3cfd1b9d0 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 5e39909fc..e336955eb 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 fa9e72804..9f8c89f6f 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 8248b89f7..f701d53f2 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 2fb1a3b70..8345ee188 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 5e2b0c363..1061ce4c1 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 1fabd6be1..66d278fab 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 4783af7a7..ebf5eea00 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 208a27ae8..69d2cf860 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 0bdfe5f0f..40a99dcdc 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 490214803..1b22ee18e 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 ad8dc034c..79c7f3e8d 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 2e10374ec..030ceea85 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 213364166..2bdb4838e 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 2dc17b4e0..e3137603a 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 70dcb91af..f2f0a00fc 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 23f96fb4e..4d11b7da3 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 68e302a71..b935650d6 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 faf3fd44b..b5240755e 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 2a98c0dd7..cb9140852 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 b3ccb0446..5b14ac5ac 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 7e408128e..725cbd9dc 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 ea2c263bb..7dc3af57e 100644 --- a/data/maps/SecretBase_Shrub4/header.inc +++ b/data/maps/SecretBase_Shrub4/header.inc @@ -7,7 +7,7 @@ SecretBase_Shrub4: @ 8484D14 .2byte 220 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc index e3951f3c1..1ca8f4374 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 23e8da9b9..880f0dd90 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 61378b8a3..3cf6fef74 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 b5f601189..2688c2eca 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 1eee3cfed..b6d42f0a2 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 27d5a0ecc..08253975a 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 f2e986b1c..0c1464cd9 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 292672976..b20409781 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 3c02b2433..b263badba 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 b58e12335..386cf2b50 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 c34c87a10..9f1423424 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 69aa8114e..f280c6879 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 9fea56a0f..bcb536380 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 3dc8cae94..9fde2f89d 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 5123f9a80..d111213f4 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 9100eb6de..c3542e15f 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 7f55c68fb..d634f1006 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 2be149c00..0379980bb 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 e54ede745..da58b47e5 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 9823646f4..54c9432b5 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 f72124743..84c7a9ae8 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 8efd8c542..52a71aefc 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 24a7a4e2b..50bc46b24 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 1f99a1cb8..578341f9c 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 e617b0a91..e6ee88487 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 c76e6230b..7d4879fc7 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 ddc1bfcef..177c05db8 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 767410cbb..562905e49 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 8ec8c294b..6cc9cda8e 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 8f221fcc7..102784c6f 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 bc4fc03ce..60faa1552 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 569969de3..8fd2113cb 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 88c4e349b..9cb13d8cf 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 e300ced6a..69e244a91 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 2b3d99694..085db4d85 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 6070cab3c..c2bbb5097 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 34a3f1916..33796df81 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 d4b8e9aea..73b7c113d 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 894aabb9a..f3bc5fde2 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 0b48dbca0..ccc9c1671 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 663a64800..2d51a6b91 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 11bb3b502..420ee8f53 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 5eaa8d470..d60dd358f 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 36daf5bb2..817b67693 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 dfe26c5ea..a5225747b 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 1275ccf91..2e2697d4d 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 0d634d549..0ec392f92 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 9f151e737..97d0a73e9 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 7dac9a029..9318e6ebe 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 d0fa71556..96d0ea1d1 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 f1fc07ae2..982ac6fa4 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 7828f6bbb..0fd0fbf5e 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 5ebbff88b..660f26ae2 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 537ab1709..f39608216 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 76493dcfa..0844847c8 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 82948348b..e72b6f310 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 be575d25b..42bb8497d 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 94a871f6a..bda560677 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 81c405cdf..e38dc2fa8 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 92d6c14a7..4b2c0f840 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -7,7 +7,7 @@ TradeCenter: @ 8484D4C .2byte 222 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/TrainerHill_1F/header.inc b/data/maps/TrainerHill_1F/header.inc index fba54fabd..41fddfeed 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 d47e960ed..740afdba7 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 60f981e3d..79597b686 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 6b7edf22b..8286c131a 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 dd5daa4e2..c6ed43e08 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 60422a940..a45f77c99 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 c6c3e626c..e6000a2d5 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 6d3603bf5..3ce516a3d 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 03230042b..1109fd52a 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 203cf8b3c..c132e8e84 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 b5de8aa07..ec0818b57 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 e6a846303..ba247e68d 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 0aadca37d..259f04eec 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 388c3510f..f04015ba8 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 4aca9a734..51980c78c 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 5715c5e90..6c746e8f1 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 b39773d23..e5efbacf7 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 8ca54e9fb..d6f2c2202 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 661c4d105..94b039292 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 55566ceef..ff4220697 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 79438a8d4..7ce8ad751 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 f5a6fde39..5735bdc9d 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 cf5318be0..be7d4d933 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 538798a4c..2040ed5c7 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 c4d384729..038e5d760 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 3d08bf4ba..c59bd0b7f 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 aa176dbfd..c7bd8ee44 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 bcdd211ee..22d20c23d 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 e704df2f0..0c24a5cd8 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 7c7bc244c..3afb04c31 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 a83a7f2fe..a60b166fc 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 ebc8d2083..91e9b1179 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 90b1e7e0a..c1c661654 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 5a8e1183f..d4524d031 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 0de25d4fa..77113ff7f 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 7f9a923ec..26752c39d 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 7e13504a5..a7159f5e1 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 107eb524f..5aa5b120e 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 3c9453154..95e0537a4 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 -- cgit v1.2.3 From 546819bc722b706a1c49a3d323b3b36d03fa612a Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 12 Jul 2018 22:39:38 -0500 Subject: Use map type constants in map headers --- data/maps.s | 2 ++ 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 +- .../AbandonedShip_HiddenFloorCorridors/header.inc | 2 +- .../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 +- .../header.inc | 2 +- .../BattleFrontier_BattleArenaCorridor/header.inc | 2 +- .../BattleFrontier_BattleArenaLobby/header.inc | 2 +- .../BattleFrontier_BattleDomeBattleRoom/header.inc | 2 +- .../BattleFrontier_BattleDomeCorridor/header.inc | 2 +- .../maps/BattleFrontier_BattleDomeLobby/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../BattleFrontier_BattleFactoryLobby/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../BattleFrontier_BattlePalaceCorridor/header.inc | 2 +- .../BattleFrontier_BattlePalaceLobby/header.inc | 2 +- .../BattleFrontier_BattlePikeCorridor/header.inc | 2 +- .../maps/BattleFrontier_BattlePikeLobby/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../BattleFrontier_BattlePyramidLobby/header.inc | 2 +- .../BattleFrontier_BattlePyramidTop/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../BattleFrontier_BattleTowerCorridor/header.inc | 2 +- .../BattleFrontier_BattleTowerCorridor2/header.inc | 2 +- .../BattleFrontier_BattleTowerElevator/header.inc | 2 +- .../BattleFrontier_BattleTowerLobby/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 +- data/maps/BattleFrontier_OutsideEast/header.inc | 2 +- data/maps/BattleFrontier_OutsideWest/header.inc | 2 +- .../BattleFrontier_PokemonCenter_1F/header.inc | 2 +- .../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 +- .../CaveOfOrigin_UnusedRubySapphireMap1/header.inc | 2 +- .../CaveOfOrigin_UnusedRubySapphireMap2/header.inc | 2 +- .../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 +- .../EverGrandeCity_PokemonCenter_1F/header.inc | 2 +- .../EverGrandeCity_PokemonCenter_2F/header.inc | 2 +- .../EverGrandeCity_PokemonLeague_1F/header.inc | 2 +- .../EverGrandeCity_PokemonLeague_2F/header.inc | 2 +- data/maps/EverGrandeCity_SidneysRoom/header.inc | 2 +- data/maps/FallarborTown/header.inc | 2 +- .../FallarborTown_BattleTentBattleRoom/header.inc | 2 +- .../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 +- .../maps/FallarborTown_PokemonCenter_1F/header.inc | 2 +- .../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 +- .../maps/LavaridgeTown_PokemonCenter_1F/header.inc | 2 +- .../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 +- .../header.inc | 2 +- .../LilycoveCity_DepartmentStoreRooftop/header.inc | 2 +- .../LilycoveCity_DepartmentStore_1F/header.inc | 2 +- .../LilycoveCity_DepartmentStore_2F/header.inc | 2 +- .../LilycoveCity_DepartmentStore_3F/header.inc | 2 +- .../LilycoveCity_DepartmentStore_4F/header.inc | 2 +- .../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 +- .../maps/LilycoveCity_LilycoveMuseum_1F/header.inc | 2 +- .../maps/LilycoveCity_LilycoveMuseum_2F/header.inc | 2 +- .../maps/LilycoveCity_MoveDeletersHouse/header.inc | 2 +- data/maps/LilycoveCity_PokemonCenter_1F/header.inc | 2 +- data/maps/LilycoveCity_PokemonCenter_2F/header.inc | 2 +- .../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 +- .../LittlerootTown_BrendansHouse_1F/header.inc | 2 +- .../LittlerootTown_BrendansHouse_2F/header.inc | 2 +- data/maps/LittlerootTown_MaysHouse_1F/header.inc | 2 +- data/maps/LittlerootTown_MaysHouse_2F/header.inc | 2 +- .../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 +- .../PacifidlogTown_PokemonCenter_1F/header.inc | 2 +- .../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 +- .../maps/PetalburgCity_PokemonCenter_1F/header.inc | 2 +- .../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 +- .../maps/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 +- 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 +- .../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 +- .../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 +- .../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 +- .../SlateportCity_BattleTentBattleRoom/header.inc | 2 +- .../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 +- .../maps/SlateportCity_OceanicMuseum_1F/header.inc | 2 +- .../maps/SlateportCity_OceanicMuseum_2F/header.inc | 2 +- .../maps/SlateportCity_PokemonCenter_1F/header.inc | 2 +- .../maps/SlateportCity_PokemonCenter_2F/header.inc | 2 +- data/maps/SlateportCity_PokemonFanClub/header.inc | 2 +- .../SlateportCity_SternsShipyard_1F/header.inc | 2 +- .../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 +- .../SootopolisCity_LotadAndSeedotHouse/header.inc | 2 +- data/maps/SootopolisCity_Mart/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../SootopolisCity_PokemonCenter_1F/header.inc | 2 +- .../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 +- .../VerdanturfTown_BattleTentBattleRoom/header.inc | 2 +- .../VerdanturfTown_BattleTentCorridor/header.inc | 2 +- .../maps/VerdanturfTown_BattleTentLobby/header.inc | 2 +- .../header.inc | 2 +- data/maps/VerdanturfTown_House/header.inc | 2 +- data/maps/VerdanturfTown_Mart/header.inc | 2 +- .../VerdanturfTown_PokemonCenter_1F/header.inc | 2 +- .../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 +- 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 59a6b4930..56d957139 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 149f27655..53c7196e1 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 a0971779c..75347beab 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 12cb7e697..91ea7b76d 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 f6616f885..4197ef0c0 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 f375e0bee..b075158dd 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 0ef17861a..dc18c55af 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 5dc438acd..ce9393462 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 e4bf89911..338e9a37a 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 fa713bf29..5482655a8 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 d552a8cac..7cbf2f30f 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 7b121a2d2..d75870116 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 0176f1637..ce2267768 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 7ca32edb8..afb2287a7 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 344bdaf8c..3abc6981f 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 afc0f475c..c1e109537 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 7590ebce5..1b5dd0498 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 51ec82492..14bf999a6 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 0d903e1cf..9a096ac9b 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 242f32e61..07dc3be28 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 ebc999cf4..4b50fff53 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 f9d571c8e..1b0a82f3a 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 b801c08af..493cf5c7c 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 8e106ea1c..3f7bd293a 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 d20c65c2e..60b61c3cd 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 ba4431464..4519b0de2 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 112fb86bd..cf75d18c9 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 19d194169..5c6c65fb9 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 72caf9523..ed349c8d7 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 0d607e671..8866c0263 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 db09e9b41..99986cc7c 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 27e2c8952..d9896fd35 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 b9fb23a03..511a09c34 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 e1fa2d524..539ca0e3f 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 701647467..e4b551740 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 d867a0daf..73e7dc952 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 3b53c9397..975ed4666 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 0f93684c3..c3b4f41b8 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 d6fe6e340..d05767d81 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 f4fde68ad..544bb93d4 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 4274d8eee..de239780e 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 15b65af63..3d7ce40b9 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 b744f348f..9c6d367d3 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 289c02455..3718fd37c 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 a0face861..239a543b0 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 9fa6b7fa3..a64b37179 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattlePyramidLobby: @ 84853F8 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePyramidTop/header.inc b/data/maps/BattleFrontier_BattlePyramidTop/header.inc index 970aadfbe..9b46bf7f7 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 18d60521c..aef5c1ea1 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 6606a9be7..539bec694 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 13b0ebbf3..b5430947f 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 1a6e40299..074e02cc2 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 380a5400e..f46a0f1c6 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 5d9252fbb..9820be7ae 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 9bcd28c75..01c9169ee 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 25e88a5df..e8c45b3ec 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 71b933474..8858adcce 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 2f4b74d7e..430161a6f 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 6fea64a15..b2d44e55e 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 f38db8f29..231ce3b88 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 78f103166..b4a9c780b 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 871e16cc2..9cea5c401 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 620e79304..60fb1edd2 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 37b608edf..952b6aa26 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 b356e7d7a..2d8befefd 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 3db684e8f..23698cbbf 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 2c1d3754e..886b04095 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 283c3744a..a830633ea 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 44442a28c..c868da343 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 2e91cbfaf..2bb632ee8 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 f009f93e5..38c514351 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 11cf24022..8f4d0593b 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 ef8c315d9..0e1f79120 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 41f1523cf..cf619b3cb 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 2938d5280..7640e62ce 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 ae838f26d..7739ac463 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 e893cfbcb..b44ef03a3 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 397c7c27c..1983fce44 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 3d9e1c2c5..c371d05a7 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 af3df7eba..cfa836e3e 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 2fb732618..398ed89e8 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 8f95706d3..50a3db9be 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 8d0ffdaae..b5340bb16 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 268f24cb1..9e24c67b7 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 b4d09580f..e9e78332c 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 7d43feff0..1b300f4c1 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 c67e86abe..67df053a2 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 3026d44bd..09576c40e 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 5bda31250..e29dd83bd 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 f0ea9a70a..a3278a8b6 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 2b4464937..740f0d818 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 46cac3433..64a8ea5d4 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 a19256b39..046c31854 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 155670bf0..feb17e90a 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 12d34ac46..17a6e8a32 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 9edfd72a8..b8da3b166 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 7e63a9023..05820c0cb 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 d3f41bd72..6190cf6b0 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 fb1270636..f3f4e41f0 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 de821f116..169388379 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 934a5a039..a62bfe31e 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 46352ccc6..2ba5bbcc9 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 0d7070cae..487b763e8 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 8a22a27f8..95243a6ee 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 cd54f5fe0..5223c36e0 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 8d4de2924..b8bfdbd79 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 7401e4f2f..16da61699 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 3cbf3d3b7..6b091b199 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 87ee3f9b6..e3ffc75f6 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 b8170952e..1c766c26f 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 2b993b9a6..3af5f5a8e 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 9d7a836fe..f87bc28bd 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 d22707542..19fc74ed7 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 80867002f..7058f7bef 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 1d1ac9edd..ba5428b3d 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 6918cc2f1..190433735 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 b852e1c8e..dcfbeecf4 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 d43b97fbc..b04226413 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 3ee23fe99..dea51de86 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 17d01bfae..e58c53baa 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 217647a56..5aca74ce1 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 875c190f5..8cd3539dc 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 77be7ebaa..c28bc8e50 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 0781e0c30..b884c6f66 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 6e5950e85..efa4dde92 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 6702e2f9d..d1f0ece92 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 b801201f3..fbc36a3f4 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 b30fdf515..9041fd2b2 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 7c9be5b8f..2b29e7d43 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 0e1402710..0c09089a1 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 f00757c91..c345b977e 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 539a797f1..11d0f1a46 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 a5b52d076..9b194f674 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 bdf2ec584..3a0705883 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 7e20bffff..6dfafd2c8 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 dadd55e02..fbfeee27b 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 459db5bd5..4e462da1a 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 013caf4d2..44e9ef8a4 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 b631de024..f8d160d20 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 477706e68..4b2f639d5 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 15182d88f..98f72f1ef 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 29dbe8c13..7b5f8ce27 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 0a67a7b51..6cab5d440 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 02819535e..0f2db8658 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 ab03878eb..e13260f57 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 df957dc4d..d99b48f59 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 183cece4a..9ed11de6f 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 452fd1e2f..da4c70c4b 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 159d49277..9f355ad81 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 438f3bd0a..3c878c0c8 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 6d097c21d..39408decf 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 326269407..99ca54b04 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 9ddad2758..4c0def95d 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 1257c09c0..b2a4a50fd 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 fc90b501f..d04d827c9 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 db621e67d..f7858be91 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 b8f607e15..1d8c56290 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 f06a48f72..f6a4df95d 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 42a463624..1504e0176 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 7149858a8..f52965272 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 f372e381c..f4565d25a 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 1cd935b55..d31f692c2 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 ee9660ebf..aff7cb64e 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 166d86828..258501718 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 9b8f05106..dd38adbb8 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 23e99c981..a7375dbd7 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 ffd3d4021..92a3c5ed9 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 695b5560d..136b923e0 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 34beb40f7..fd868ce9d 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 5c49de2eb..fd946aee7 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 c298bc024..7f343e860 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 32c178628..2019489b4 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 a28edee35..addb803f0 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 e29bdfbc5..c5dde2721 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 0ffeffd03..1a6c27a93 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 fc2868a9c..73fd14e04 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 66c3636cf..d265ea010 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 292c61623..1a92a6d69 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 9bdff8e90..b47d700a9 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 1adc065dd..9c167f300 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 92bc0e9d9..6e0b34fac 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 1ae72be25..070ae9aef 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 2137aecc9..bdbb5aefa 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 ecff7b16f..772e57cba 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 8b35b2629..b416ddd62 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 b8e3e1822..73c459674 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 5b1e2d8f3..bf12c6d30 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 6a4190ca7..675a02398 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 bf95bb2ef..da5e9ff58 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 231f31001..153d55b34 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 5fb0a6eab..df9a5b47a 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 69eff71f7..364acb64a 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 7b5fa7375..d4d1703f2 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 56b925c2a..23c59b082 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 496d3cf83..dfba805be 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 7ba2b7e0e..3969b46fd 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 65e781626..c9bdce2a1 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 50bf554d7..8fdac83d2 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 376c2f232..9512d1734 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 bc8816d1c..39a0710f5 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 412756e49..436103ffe 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 d0ae8c4e1..b0bcd92c2 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 f27df336c..a4fe7b936 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 778899830..50a1a2b99 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 da43bbc46..044d54304 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 6432ee987..a95f2c7dd 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 a6a3db192..c2101da80 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 942859e0c..cc9a7102c 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 20e6b5a09..c1626ba7f 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 e10fa76c8..9a9de6ebf 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 b5f6b9175..43691b589 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 fe7b14fcc..8c4628462 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 082ff6045..bb00f8dd0 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 ddc901f44..665e25cdd 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 e4981b277..6ebef36e5 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 2b012f5b8..d21e63777 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 e2b352406..c7d028628 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 a90a21049..e6079dade 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 df6a9ee01..100c19b4e 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 cf9796360..e01833b40 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 90bc41a90..46b167ead 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 4a984edea..375fef35d 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 c3c126d56..8f3f40f4b 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 c0b51c174..ad4079d0c 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 eba304363..5756307eb 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 b04ffb872..c7e781b7a 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 d0b115b37..c431f8b06 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 df190975c..af4198c83 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 0843eb3f4..31cb2aa2a 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 b844bd961..d89be9872 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 6e47ed443..02b2489fd 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 dbd201c2e..c86b1f8af 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 72dc8a409..4086c0142 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 e39eb8183..aef070228 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 022761465..32c2bbc28 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 c38fc57eb..c5eb7515e 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 53fb8a06a..ec580ec8e 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 43b5f92cf..446d6f540 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 29c068992..17173424b 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 3de6d823e..864d0a0c8 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 88306a7de..bb38876c8 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 0afddfb49..2ed8817a6 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 8ccabb8c8..115479a97 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 22a41d25c..ed554cb5f 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 47f92d2c8..1f1829279 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 ceaceca41..b665007db 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 c5e7576cf..b453b7691 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 29597bceb..67185120a 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 2f8d472d2..4f92661da 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 ee2eeb102..ddf383ee2 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 8b11f8d93..2585dc958 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 0b56cba11..5f6e48b82 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 a674e3849..2e256ec77 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 34359e5b8..c5c1ee394 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 2be325bad..40f8cf0c9 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 c38950b20..7c9f16d60 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 65af6ccd8..ef679ae6b 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 fd08b39ea..27ca1b317 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 9b22ca051..2dd586587 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 4301b5f93..b8a2123d5 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 a45e05795..9073b1b64 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 5509d0cde..d795e2bb9 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 ed9234f34..ec7ea4968 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 73aab8ad6..8a145ad64 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 9e60e032f..f798d56df 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 3a1c8254d..43b9d951d 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 41a342eb3..c409781be 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 db13a9adf..a2f627a1c 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 e6e140696..bce8a899f 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 be297090a..02a05c79e 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 08df71885..706a21563 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 87628d4cf..a3740f48a 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 de8566823..074c45320 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 0accc508b..f188a6559 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 2d6cffcfa..6e942e50c 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 d2bc44d39..bbc85e7cb 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 2a0988475..3f01beee4 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 b1399a1b0..99356ce57 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 f903637a3..34c15d53f 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 90098ec2c..33449542f 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 a1433fbbc..c095f6827 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 28d0fd8a5..5aa498141 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 adbd42c6a..9530591f6 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 b30fb80d3..915d053cb 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 6d95c3b6e..15b0044c3 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 9cc1d0470..72331ab8d 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 bd94ab120..2b8520a7b 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 661552e20..b6604647f 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 00e26fe1a..c80452182 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 1a643f7e2..61b9b16ca 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 85d8331a1..92cabd5a3 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 336958088..1a3e764bb 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 7b1e01861..73dbb7aa4 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 68c746b58..033e19488 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 bda2a3ab5..387032076 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 4d4583acf..98573d9a4 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 0c76acfbc..feb3aa440 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 33e22d3bd..6102e69a0 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 22f0976d3..6c99d4df2 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 02019604d..1c09ae166 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 e67afc46c..5dab30f42 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 caf3f3f86..f1f273c73 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 ca694df00..99284e566 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 87a794524..4bb9351d8 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 a55cb3ede..040e26110 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 df51d4222..69ab66b03 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 09a47a2ae..399096d16 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 3b55160d8..a59ddf761 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 30f3501a5..2262cadfa 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 c9cbe2d23..93deeb8a9 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 92157a59d..dd66f9f3d 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 3105a321d..0a5259894 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 45260d6c4..a36613213 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 815a6a9e1..af28f5ed0 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 86e923bb4..9b0436a68 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 7eb37293a..f86f11b92 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 1b8a7249b..cdb272aa7 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 1832db9ee..946da22a8 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 b4f7a2ac8..0686eef43 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 5c33fa74a..05bde230f 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 049a1b49b..de723c302 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 e312c1439..e5a2864de 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 d962c50ea..5b884a138 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 ce6caf06e..def3cab3d 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 df43dd19c..3ae44b79a 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 05d4e14f1..b58e0f3df 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 79e7c76de..43ce6de6d 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 01bf8a437..040d0d084 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 8a650439d..05b88a15b 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 bbcb77d41..7cd391478 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 77ecfd002..3cbad800b 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 ab90821ee..99cda55b5 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 459238ffd..43749207d 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 47fabca3b..4892f1077 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 437aaef75..2b6ef1e78 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 aa91043b6..4490ad646 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 ec37ba464..675ba4568 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 566e0bf10..d18ac8e84 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 3ed11a3ee..70104035a 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 53e20cb54..72ba07c3a 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 47fa71638..ca2da8524 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 e5c3e5d54..9e37cfdf4 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 ee5c6ee43..50eb5482b 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 a9e533460..f5a73c34c 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 6b339317d..effe5f066 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 75419c711..767568015 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 9c441064f..6a106d24d 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 6fa3b0308..665eacd57 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 37d9a7a14..e2554ed2a 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 f7d134894..5b662b8f5 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 7516de239..7ae6169d6 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 6f4f3c540..217befb9c 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 fd405a128..74d666591 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 3e4affa65..f093b492c 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 ae2dae20f..dd713fc55 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 c92a963c7..76ebe06c3 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 b4f08635f..5de5e3d91 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 c16a9c91f..936c951be 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 2787d369b..99d1b8aa3 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 eeb09e0ea..cf3b18e0b 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 672f4d3f7..46587bf7d 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 bd7ab0e10..9f1aad37d 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 623db96b5..cdd43da73 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 3aed4b2f2..c0edf38c9 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 742a590e2..26b4cc1ff 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 28b4a1d1c..855ceb419 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 f1bf1cd83..0200f56d2 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 2bf6129fe..e212f3dcc 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 792d6a87c..e861278db 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 50fbdf6d0..960813992 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 271127402..1c048f61c 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 f8bb6826d..326a374f5 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 9fec8f298..a9914830c 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 fbac65351..a31aeeb8b 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 7db64f8f9..9ee33359f 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 db3ef40f4..f96697756 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 08d31197b..aa479cb3f 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 d7126406e..046285567 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 67070920e..ca5fc513d 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 15e8537df..7c2467234 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ RustboroCity_PokemonCenter_2F: @ 84833EC .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc index 13138b65e..4c7ca3897 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 e87800965..6bf405b3b 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 6e66b473c..1d892094c 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 1c7e1d01c..1e2c5b58d 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 c02176a9b..6f2facdcd 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 745e608a2..cbf7fae30 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 e25a8497b..5630e462a 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 01b7e8198..526111c90 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 e6739ff66..87e506ac1 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 e60f44f9e..160cfea7d 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 5da814cff..f87a4db6a 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 25115a13a..28bd8c761 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 51666baf3..eb61455fa 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 68bb92066..dc62eba0c 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 56bfc32cd..dd0a2db3c 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 bfb164520..09be291c2 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 c49f283e1..ff514a631 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 e440157e1..130f198aa 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 3cfd1b9d0..594520629 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 e336955eb..24c8fde98 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 9f8c89f6f..b2c247ab9 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 f701d53f2..6bab8f16b 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 8345ee188..b50127ffc 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 1061ce4c1..f61e4d1f9 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 66d278fab..dd214cba6 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 ebf5eea00..bfce09669 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 69d2cf860..33555b1b1 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 40a99dcdc..0f48e009d 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 1b22ee18e..c43be047e 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 79c7f3e8d..b423185f2 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 030ceea85..e51a43f13 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 2bdb4838e..5b9fe83e4 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 e3137603a..fc821510f 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 f2f0a00fc..2bb11dac2 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 4d11b7da3..f0e5d976a 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 b935650d6..b62553c88 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 b5240755e..1b7a86f06 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 cb9140852..604f32e19 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 5b14ac5ac..2454dd2ad 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 725cbd9dc..9a0f7e8d7 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 7dc3af57e..4cfdf043b 100644 --- a/data/maps/SecretBase_Shrub4/header.inc +++ b/data/maps/SecretBase_Shrub4/header.inc @@ -8,7 +8,7 @@ SecretBase_Shrub4: @ 8484D14 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc index 1ca8f4374..dc2c07918 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 880f0dd90..7a35c5466 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 3cf6fef74..bffa571d5 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 2688c2eca..55f3f56f1 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 b6d42f0a2..69287b49f 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 08253975a..98b4739e0 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 0c1464cd9..681dc7c43 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 b20409781..edfe53d6e 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 b263badba..5d136baee 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 386cf2b50..867de3f37 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 9f1423424..005e502ad 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 f280c6879..df62a5cfb 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 bcb536380..9caf4d5c3 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 9fde2f89d..9b2a56e23 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 d111213f4..674ce7f6d 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 c3542e15f..f89fe0450 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 d634f1006..1358d164c 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 0379980bb..b861a2ab4 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 da58b47e5..68903b8a2 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 54c9432b5..f74d33ce8 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 84c7a9ae8..40c2fbe72 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 52a71aefc..5ef569e65 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 50bc46b24..e61123f1c 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 578341f9c..919534fc2 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 e6ee88487..adbda2e3a 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 7d4879fc7..3f5e5809a 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 177c05db8..6721bdef1 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 562905e49..46b5d595e 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 6cc9cda8e..22b61d048 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 102784c6f..d61584a37 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 60faa1552..3e2e6434d 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 8fd2113cb..36c3dfb57 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 9cb13d8cf..fa4366df6 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 69e244a91..dc3f5a245 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 085db4d85..abafe50fd 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 c2bbb5097..343c20512 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 33796df81..fcbe42d2c 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 73b7c113d..1d054f587 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 f3bc5fde2..9be63a0bb 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 ccc9c1671..a7d0d04d5 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 2d51a6b91..aaaeb85ed 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 420ee8f53..f2e9e2b4d 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 d60dd358f..e72841363 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 817b67693..555c1c7a1 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 a5225747b..da684a632 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 2e2697d4d..badfcc201 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 0ec392f92..bf52a354f 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 97d0a73e9..82decfbba 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 9318e6ebe..27afdc4ee 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 96d0ea1d1..573b465ba 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 982ac6fa4..66400ad1d 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 0fd0fbf5e..b9b717298 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 660f26ae2..0630ba749 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 f39608216..d50ba8f01 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 0844847c8..380f346a6 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 e72b6f310..f7498c070 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 42bb8497d..eb5e1d572 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 bda560677..b84a1a071 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 e38dc2fa8..69f541f7c 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 4b2c0f840..497a3219d 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -8,7 +8,7 @@ TradeCenter: @ 8484D4C .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/TrainerHill_1F/header.inc b/data/maps/TrainerHill_1F/header.inc index 41fddfeed..fae6fccae 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 740afdba7..7cb9d5e67 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 79597b686..f9834ed5f 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 8286c131a..59c339112 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 c6ed43e08..ca48bb823 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 a45f77c99..91b6cf345 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 e6000a2d5..f70f69aa0 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 3ce516a3d..d62735bb8 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 1109fd52a..bc71590ea 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 c132e8e84..83fbe6155 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 ec0818b57..2f826994b 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 ba247e68d..9cdd79bf7 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 259f04eec..2da188f55 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 f04015ba8..d9e75b02b 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 51980c78c..f8de0fb73 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 6c746e8f1..42c890ef6 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 e5efbacf7..96c31fa88 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 d6f2c2202..b2fa29ceb 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 94b039292..35d0891ad 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 ff4220697..436c39614 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 7ce8ad751..cdeeb4207 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 5735bdc9d..5648f0715 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 be7d4d933..6e87bdc75 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 2040ed5c7..d899a6e51 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 038e5d760..bd048756d 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 c59bd0b7f..33b51a404 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 c7bd8ee44..16a1a3e2a 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 22d20c23d..8c70d2cba 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 0c24a5cd8..bcd2185ab 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 3afb04c31..fe779c062 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 a60b166fc..015f71d0c 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 91e9b1179..599b1f59a 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 c1c661654..315a42e56 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 d4524d031..5d17e03b9 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 77113ff7f..0f881653d 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 26752c39d..69eae1a16 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 a7159f5e1..81e866d49 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 5aa5b120e..341350a7a 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 95e0537a4..cd3451af7 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 000000000..504575859 --- /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 5b2944a2b..4bec8e0c7 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 d4bfd297a..0af311631 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 c8440a35f..16612e24d 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 87110b87b..6ffd479f7 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 d4cb25e6c..9cbc8dc52 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 78cbbe2de..cc146fc94 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 b2fd54eb8..2e127dd84 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); -- cgit v1.2.3 From 94650495c669f673c59f4912b805b51360c0797a Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 12 Jul 2018 22:45:41 -0500 Subject: Use map battle scene constants in map headers --- data/maps/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 +- data/maps/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 53c7196e1..21573c079 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 75347beab..0ffb5d1f7 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 91ea7b76d..5e4eb1dd6 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 4197ef0c0..a9f8945d9 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 b075158dd..6645c9d96 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 dc18c55af..5cc5bf0ad 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 ce9393462..4e6212d01 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 338e9a37a..8e004365e 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 5482655a8..2f64a6315 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 7cbf2f30f..9ee2f40bc 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 d75870116..d6f656e3b 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 ce2267768..82fbdc0e9 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 afb2287a7..c26d65df0 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 3abc6981f..4796b37ff 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 c1e109537..a314ad3ba 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 1b5dd0498..c632eb204 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 14bf999a6..ba017fb56 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 9a096ac9b..ea15240b9 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 07dc3be28..455941160 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 4b50fff53..b4e2e712e 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 1b0a82f3a..7abe192b6 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 493cf5c7c..a69128ee7 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 3f7bd293a..aba179fc6 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 60b61c3cd..8332c4236 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 4519b0de2..2ed587f6e 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 cf75d18c9..5c02e0c8a 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 5c6c65fb9..3f1eb25b2 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 ed349c8d7..940ba24e6 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 8866c0263..5d1a7eb82 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 99986cc7c..e35435b27 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 d9896fd35..cef72bc09 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 511a09c34..d56a2a23d 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 539ca0e3f..3dc5d23cc 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 e4b551740..d63d3b268 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 73e7dc952..ff8af8ca8 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 975ed4666..060013cce 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 c3b4f41b8..574d0cbab 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 d05767d81..239c31721 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 544bb93d4..dcb088c27 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 de239780e..1ee69c077 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 3d7ce40b9..68ca30546 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 9c6d367d3..5e0afedb5 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 3718fd37c..ccaa1cbca 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 239a543b0..a92f009dd 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 a64b37179..6da314304 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattlePyramidLobby: @ 84853F8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePyramidTop/header.inc b/data/maps/BattleFrontier_BattlePyramidTop/header.inc index 9b46bf7f7..28de39cad 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 aef5c1ea1..797022beb 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 539bec694..90ae26c25 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 b5430947f..bd2d38b37 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 074e02cc2..94e46b196 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 f46a0f1c6..fa1e08faf 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 9820be7ae..e16e2a700 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 01c9169ee..727322b94 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 e8c45b3ec..a4cf64a78 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 8858adcce..c363d54bf 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 430161a6f..e5649a369 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 b2d44e55e..a9da9677c 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 231ce3b88..7f1142f2d 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 b4a9c780b..e07dd297f 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 9cea5c401..22797d04e 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 60fb1edd2..5494c964f 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 952b6aa26..5248720c7 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 2d8befefd..4b3e7f79a 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 23698cbbf..a30a148c2 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 886b04095..a42ac30ff 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 a830633ea..a136e803d 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 c868da343..4cd607aef 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 2bb632ee8..6fcb187ed 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 38c514351..88f806e83 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 8f4d0593b..0fbbb55e3 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 0e1f79120..bcbc06c90 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 cf619b3cb..24255ea1a 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 7640e62ce..21e15dc82 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 7739ac463..fae10152a 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 b44ef03a3..17e05fc19 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 1983fce44..9a1543a33 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 c371d05a7..78d3cf7f4 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 cfa836e3e..de960bab0 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 398ed89e8..96b2beb37 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 50a3db9be..37901889f 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 b5340bb16..c188ecb86 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 9e24c67b7..11e6c7b98 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 e9e78332c..2f5746143 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 1b300f4c1..5926a9d2a 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 67df053a2..e65db912d 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 09576c40e..f8f97b671 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 e29dd83bd..dabad3a71 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 a3278a8b6..f2493d738 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 740f0d818..384d08bd7 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 64a8ea5d4..d8dab3bea 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 046c31854..d42f912da 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 feb17e90a..b8edb52bc 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 17a6e8a32..8d0f83892 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 b8da3b166..00e07549e 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 05820c0cb..16e2ce55a 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 6190cf6b0..c4f3a05c7 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 f3f4e41f0..c905fd606 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 169388379..4463cc40e 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 a62bfe31e..1ba44b49d 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 2ba5bbcc9..219c70fc3 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 487b763e8..248b7a990 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 95243a6ee..6813134f9 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 5223c36e0..43485dcad 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 b8bfdbd79..6bfc00393 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 16da61699..2bebe5d12 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 6b091b199..03ab762db 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 e3ffc75f6..fedc35c76 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 1c766c26f..dd23d11ef 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 3af5f5a8e..b055ba8b1 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 f87bc28bd..a80a688e0 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 19fc74ed7..18a9d90dc 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 7058f7bef..1aeb8e6a2 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 ba5428b3d..dd82e6b56 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 190433735..c575b2f08 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 dcfbeecf4..64bcaec0d 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 b04226413..46af6f51e 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 dea51de86..163663bb9 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 e58c53baa..c6a86baa5 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 5aca74ce1..61370c18d 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 8cd3539dc..ce3356a95 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 c28bc8e50..0c2053b8b 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 b884c6f66..81dbad44a 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 efa4dde92..4e9484d11 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 d1f0ece92..416d700d0 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 fbc36a3f4..aa182e2ed 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 9041fd2b2..c8c22eacf 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 2b29e7d43..3119638bf 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 0c09089a1..65df98a81 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 c345b977e..5308b4e09 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 11d0f1a46..e06051d7e 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 9b194f674..b45ac71c3 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 3a0705883..3c9f51bc1 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 6dfafd2c8..3f671fb6c 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 fbfeee27b..651b37488 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 4e462da1a..54a45633d 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 44e9ef8a4..1c106b8f5 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 f8d160d20..1e20a0227 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 4b2f639d5..f2d53219a 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 98f72f1ef..efc5f06be 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 7b5f8ce27..c4d07f46b 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 6cab5d440..5179187be 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 0f2db8658..9f2b78dd4 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 e13260f57..ccfc5bd09 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 d99b48f59..4a754207b 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 9ed11de6f..beb7fdb83 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 da4c70c4b..0eb017bc4 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 9f355ad81..78df1ff83 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 3c878c0c8..51f499ee4 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 39408decf..a56a3e4d0 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 99ca54b04..797760e91 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 4c0def95d..006896453 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 b2a4a50fd..6ea20174c 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 d04d827c9..579c1dd3e 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 f7858be91..418632b28 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 1d8c56290..9a350db79 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 f6a4df95d..30683052b 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 1504e0176..e657a688a 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 f52965272..3d40c93cf 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 f4565d25a..dafbfaccd 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 d31f692c2..2049fd74c 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 aff7cb64e..6aba3e416 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 258501718..a2737b05b 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 dd38adbb8..112a6e8d7 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 a7375dbd7..0c8cc574d 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 92a3c5ed9..cd6ded7d6 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 136b923e0..bae2b837d 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 fd868ce9d..88ca3ece3 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 fd946aee7..1753be637 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 7f343e860..c9b0870fa 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 2019489b4..62d836d56 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 addb803f0..7f970b463 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 c5dde2721..4cc0a8061 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 1a6c27a93..988b7fa4c 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 73fd14e04..41f01234c 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 d265ea010..656e60bf3 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 1a92a6d69..0d6faebe8 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 b47d700a9..641859ac6 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 9c167f300..6a0ddfebc 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 6e0b34fac..c040d7715 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 070ae9aef..e9c27fd81 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 bdbb5aefa..78102855c 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 772e57cba..0384e495f 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 b416ddd62..9aa0c9cc7 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 73c459674..342ed7d0b 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 bf12c6d30..ff29d7e87 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 675a02398..025e5971e 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 da5e9ff58..7c145d0e4 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 153d55b34..939d56426 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 df9a5b47a..db13d6def 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 364acb64a..6224e7a50 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 d4d1703f2..ec7eb66ce 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 23c59b082..7681d9a83 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 dfba805be..9e5d0c807 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 3969b46fd..3e55729a8 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 c9bdce2a1..851f56278 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 8fdac83d2..d8118281f 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 9512d1734..1de48fb62 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 39a0710f5..b37419278 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 436103ffe..d5347ed25 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 b0bcd92c2..45cda066b 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 a4fe7b936..347ec1897 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 50a1a2b99..f11c5eadd 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 044d54304..36bff96d6 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 a95f2c7dd..9feb17fe2 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 c2101da80..f6aadf1ff 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 cc9a7102c..baa4f18d5 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 c1626ba7f..45fd23da0 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 9a9de6ebf..736b491db 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 43691b589..6a29041cc 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 8c4628462..3fc04798e 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 bb00f8dd0..3722f4565 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 665e25cdd..659176f80 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 6ebef36e5..462fdc47d 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 d21e63777..abf0e85c5 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 c7d028628..a0d074121 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 e6079dade..078998891 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 100c19b4e..dabf884b4 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 e01833b40..7236159f3 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 46b167ead..584ed3f7f 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 375fef35d..03f762758 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 8f3f40f4b..3930ca2ba 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 ad4079d0c..505e671eb 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 5756307eb..f5196d035 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 c7e781b7a..302f13d7e 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 c431f8b06..86e796c52 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 af4198c83..1b325fc9a 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 31cb2aa2a..25b8f5558 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 d89be9872..718ed1f1a 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 02b2489fd..53aeb0a29 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 c86b1f8af..41cbc6a7a 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 4086c0142..659c7e133 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 aef070228..75f151c51 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 32c2bbc28..5a98563b8 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 c5eb7515e..a0dd1e050 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 ec580ec8e..7f6c20a66 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 446d6f540..68da46965 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 17173424b..04bfa4a45 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 864d0a0c8..e12bfbacb 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 bb38876c8..241f3dff3 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 2ed8817a6..a542638a7 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 115479a97..b09729f81 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 ed554cb5f..bee0a548f 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 1f1829279..d17d64262 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 b665007db..a783fc7c3 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 b453b7691..b9b2575e8 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 67185120a..d1a65792f 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 4f92661da..59e9a3f59 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 ddf383ee2..0711b5b81 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 2585dc958..fd5b2c0f3 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 5f6e48b82..7827fe4cb 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 2e256ec77..465297482 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 c5c1ee394..7ee2eee47 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 40f8cf0c9..3f4199195 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 7c9f16d60..189c26969 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 ef679ae6b..378b7bbd2 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 27ca1b317..7ad3e736a 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 2dd586587..60cec1da8 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 b8a2123d5..08b2d975b 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 9073b1b64..8182f1c41 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 d795e2bb9..a0ec2bdc2 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 ec7ea4968..582fd9cbc 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 8a145ad64..53c0fdaed 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 f798d56df..79b1dbafb 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 43b9d951d..9c0a7b1c0 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 c409781be..3fa05854e 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 a2f627a1c..62fed7dc3 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 bce8a899f..723329d92 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 02a05c79e..33501a678 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 706a21563..092cf841f 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 a3740f48a..3f8d3192e 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 074c45320..8d94687a6 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 f188a6559..934cb22b0 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 6e942e50c..55a6fd8a3 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 bbc85e7cb..4727f0da9 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 3f01beee4..cdd572a95 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 99356ce57..24cf90aab 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 34c15d53f..5b572682b 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 33449542f..511692df1 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 c095f6827..04d685323 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 5aa498141..48f461797 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 9530591f6..a1edad163 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 915d053cb..850b4864b 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 15b0044c3..b30133654 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 72331ab8d..db6f8b3df 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 2b8520a7b..4dae59652 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 b6604647f..e32063894 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 c80452182..85bc3e460 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 61b9b16ca..f7f16748f 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 92cabd5a3..624c8b6a1 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 1a3e764bb..2a05feb29 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 73dbb7aa4..473e3c736 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 033e19488..91ee3622b 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 387032076..94b5bdfd1 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 98573d9a4..9029f306f 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 feb3aa440..64836245f 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 6102e69a0..dc2b3240a 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 6c99d4df2..c7510701e 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 1c09ae166..df6f0d34a 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 5dab30f42..139efeb74 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 f1f273c73..cd34cd3f4 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 99284e566..ea0b1390a 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 4bb9351d8..fce17ef00 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 040e26110..59ea4f3df 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 69ab66b03..9292cae39 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 399096d16..e038ea705 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 a59ddf761..a6314172f 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 2262cadfa..489ea8789 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 93deeb8a9..1f6f067ca 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 dd66f9f3d..c1dd03789 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 0a5259894..d98361dd3 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 a36613213..24baeb042 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 af28f5ed0..9d9cf23ed 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 9b0436a68..3ea5a8eb8 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 f86f11b92..8e202e650 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 cdb272aa7..593b807ce 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 946da22a8..e632dbca9 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 0686eef43..77e2e4a38 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 05bde230f..9ad6159f3 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 de723c302..910638d82 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 e5a2864de..ab6c752cb 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 5b884a138..68a7098fb 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 def3cab3d..a330e3c1f 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 3ae44b79a..449498ed4 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 b58e0f3df..70bbe3777 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 43ce6de6d..dea0352e6 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 040d0d084..5961e48c2 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 05b88a15b..8e1dbc807 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 7cd391478..e1b082712 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 3cbad800b..9f31f510f 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 99cda55b5..c0920ada9 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 43749207d..a1ad307e4 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 4892f1077..250695671 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 2b6ef1e78..8ba9dd58c 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 4490ad646..5da7c8990 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 675ba4568..d0f4bfedf 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 d18ac8e84..ce7de5c71 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 70104035a..c720839de 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 72ba07c3a..d8fb67ce9 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 ca2da8524..826281c09 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 9e37cfdf4..cb9b211d9 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 50eb5482b..e06dc3147 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 f5a73c34c..ce15e7ea7 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 effe5f066..eb8d25cd0 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 767568015..a3b062bca 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 6a106d24d..5f744afaf 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 665eacd57..3617aa5b0 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 e2554ed2a..7e6dc55c2 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 5b662b8f5..9eba6be87 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 7ae6169d6..009b6fa98 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 217befb9c..43aab1b68 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 74d666591..777edeff2 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 f093b492c..8cf6f8531 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 dd713fc55..3e489dffd 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 76ebe06c3..950e11df7 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 5de5e3d91..6065e257c 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 936c951be..1bc9ac5f0 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 99d1b8aa3..bff8b4e40 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 cf3b18e0b..3e6bf34b3 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 46587bf7d..4e292a92b 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 9f1aad37d..26428b3dc 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 cdd43da73..d1df504ed 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 c0edf38c9..6e7bb70d4 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 26b4cc1ff..40742887b 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 855ceb419..d86b8537c 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 0200f56d2..b0da75514 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 e212f3dcc..21a33d5b8 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 e861278db..b2a4da317 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 960813992..5a9a5a133 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 1c048f61c..8df565936 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 326a374f5..92161bb4d 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 a9914830c..fafca84e7 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 a31aeeb8b..8c07e3637 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 9ee33359f..94ae5e1e4 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 f96697756..51a6f7984 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 aa479cb3f..89e62cf50 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 046285567..766c1cb0c 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 ca5fc513d..17f717230 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 7c2467234..e7a1999cc 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ RustboroCity_PokemonCenter_2F: @ 84833EC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc index 4c7ca3897..909e85c69 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 6bf405b3b..4dc4e2797 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 1d892094c..9c1f2bab2 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 1e2c5b58d..6db9d2415 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 6f2facdcd..a5788a49f 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 cbf7fae30..3e667fafc 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 5630e462a..734254611 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 526111c90..786316fcd 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 87e506ac1..1f02725b0 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 160cfea7d..5c60a541b 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 f87a4db6a..54f2c505a 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 28bd8c761..332d2f9a4 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 eb61455fa..1de3fd413 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 dc62eba0c..417467ac5 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 dd0a2db3c..e259b065b 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 09be291c2..6331b3b18 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 ff514a631..a91ef42ef 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 130f198aa..7385a41fb 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 594520629..aa2b0dc56 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 24c8fde98..2f76c9b8f 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 b2c247ab9..3640bb597 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 6bab8f16b..66e6523f0 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 b50127ffc..2f08ec83a 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 f61e4d1f9..541842c26 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 dd214cba6..5fa6728d8 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 bfce09669..f75acd84a 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 33555b1b1..6b80b45bb 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 0f48e009d..19a4afdfd 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 c43be047e..3a51deec4 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 b423185f2..7a79eab3e 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 e51a43f13..5f0e61f8c 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 5b9fe83e4..bd88bf1d3 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 fc821510f..8183eee67 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 2bb11dac2..774e8471e 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 f0e5d976a..2137748af 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 b62553c88..04b0ae23a 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 1b7a86f06..94c8605a0 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 604f32e19..85e94f158 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 2454dd2ad..7beeb3d8b 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 9a0f7e8d7..18b1f132a 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 4cfdf043b..72c5724f6 100644 --- a/data/maps/SecretBase_Shrub4/header.inc +++ b/data/maps/SecretBase_Shrub4/header.inc @@ -11,5 +11,5 @@ SecretBase_Shrub4: @ 8484D14 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc index dc2c07918..a9a341696 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 7a35c5466..86898ed15 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 bffa571d5..6ef940796 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 55f3f56f1..2a2523a07 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 69287b49f..d15eacc36 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 98b4739e0..a1afc748a 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 681dc7c43..798754531 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 edfe53d6e..89921f1d4 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 5d136baee..507ad7054 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 867de3f37..1d334424b 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 005e502ad..98614de64 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 df62a5cfb..05b77a442 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 9caf4d5c3..b1ab8a459 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 9b2a56e23..0c8380b79 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 674ce7f6d..8a977c94e 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 f89fe0450..fe4b69f96 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 1358d164c..842ec79cd 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 b861a2ab4..e018869b9 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 68903b8a2..e3b2c3c40 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 f74d33ce8..23addaa76 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 40c2fbe72..46830945d 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 5ef569e65..bafe1880a 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 e61123f1c..5e7ff153c 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 919534fc2..d4afb6ad1 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 adbda2e3a..335a1a094 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 3f5e5809a..0b6c6bd39 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 6721bdef1..926a367ee 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 46b5d595e..d4689afde 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 22b61d048..5a31901a3 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 d61584a37..06e2689cd 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 3e2e6434d..5612c6df0 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 36c3dfb57..764b8e9b5 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 fa4366df6..40b265c1d 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 dc3f5a245..857443db1 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 abafe50fd..0c4696d86 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 343c20512..8026aaf41 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 fcbe42d2c..90b17f14a 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 1d054f587..48d184517 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 9be63a0bb..b868e843a 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 a7d0d04d5..e635b6f80 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 aaaeb85ed..8b5c93c0d 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 f2e9e2b4d..84caedcf8 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 e72841363..0b4eae619 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 555c1c7a1..a0d8b4fb4 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 da684a632..015f6fe6c 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 badfcc201..21c8c9235 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 bf52a354f..60fa216ca 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 82decfbba..112aa8a6d 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 27afdc4ee..a01616419 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 573b465ba..b89221bac 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 66400ad1d..4bdd9ef8d 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 b9b717298..be2d37eb6 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 0630ba749..6635dc3d7 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 d50ba8f01..c66b725fd 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 380f346a6..3a2844f4e 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 f7498c070..f6153e13f 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 eb5e1d572..e674840cf 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 b84a1a071..b69a9b501 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 69f541f7c..88ef9d3ef 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 497a3219d..947cdbde2 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -11,5 +11,5 @@ TradeCenter: @ 8484D4C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TrainerHill_1F/header.inc b/data/maps/TrainerHill_1F/header.inc index fae6fccae..b21e67e69 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 7cb9d5e67..e2a02834e 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 f9834ed5f..c7513cc96 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 59c339112..f25ce4e97 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 ca48bb823..0d4e95af3 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 91b6cf345..8e8eb4b91 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 f70f69aa0..d4d431dc5 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 d62735bb8..bf5589117 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 bc71590ea..5bd5b037b 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 83fbe6155..064a732a5 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 2f826994b..7752479de 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 9cdd79bf7..dda2f54b1 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 2da188f55..17769c331 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 d9e75b02b..f5bc3bfa3 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 f8de0fb73..7232ba916 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 42c890ef6..71332ec78 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 96c31fa88..bc2efc58e 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 b2fa29ceb..0c6e94575 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 35d0891ad..c4f55b1ef 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 436c39614..29608287d 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 cdeeb4207..3241622ac 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 5648f0715..c1188df54 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 6e87bdc75..68eb31bc6 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 d899a6e51..c8d16cd09 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 bd048756d..45f9543df 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 33b51a404..0b612b27c 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 16a1a3e2a..e07566710 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 8c70d2cba..30daf14ca 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 bcd2185ab..e75e2f003 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 fe779c062..5852d60f4 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 015f71d0c..dfb4b0d05 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 599b1f59a..7f223d09a 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 315a42e56..4846b25e3 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 5d17e03b9..9ae2edb7f 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 0f881653d..a2a5a929e 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 69eae1a16..1887b7880 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 81e866d49..56b800a29 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 341350a7a..6650653ef 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 cd3451af7..c89256b33 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 -- cgit v1.2.3 From 731d6d59bc624e0350b3396f135a35f6c9bdc4f8 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sun, 15 Jul 2018 04:23:38 -0700 Subject: 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 +- .../BattleFrontier_BattleTowerLobby/scripts.inc | 2 +- data/maps/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 eb423cf4c..1d8753fa0 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 3db508001..75aa161e5 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 a33bd11b6..109f1a32e 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 e53685c28..1179b9866 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 5c1e6c1b0..ff370a552 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 5988eb732..b02f3e58a 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 d758aa314..12ed6341d 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 ecba5a627..23f5d8d2a 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 f906304ca..cec26643d 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 b498da70d..a51b5d628 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 fc475c2e3..6ff7e927f 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 b96fb8ca9..c39aa8a17 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 a346edeef..ed5343618 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 478d61656..1cd2ff74a 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 a4609ab54..9d37c58ed 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 bcc7dcd1b..2d7e09958 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 f02ffbe66..adf02ddd0 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 9c4b46ae2..bd8d0cd0c 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 dfbac56fa..1020b1c80 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 8a1749b0b..4458f9347 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 03fe505b5..6498c6a99 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 5b3cd26ca..afc5008e6 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 d8b526b61..d38980213 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 a1259d327..d14fa1fcd 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 4723b66e1..f972d09cc 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 2566b51b7..7038149e9 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 2ac13fab7..20eab57c8 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 d4bfd297a..d4a2c61b2 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 9fc0c68ea..7f14d5926 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 09776f150..9f83ebcf0 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 ca7b2fd44..20716c679 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 ace481c26..24d598f4a 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 a148f998f..c06005b17 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 811aba128..89fee825e 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 41729eec9..d1d92cb50 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 2edb14748..575d6b285 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 a755f4f44..fb4bf6817 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 ca2037d2f..266ea8250 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 5a6aa2b40..c73d91521 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 0510b9f31..b21d51278 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 289e0e043..599ceec72 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 1ed38c67e..575050ca5 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 35b04ea1e..8095c23ba 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 74eac32de..1d350c83a 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 b7d677c90..34b6089df 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 83df30d05..e6b20f807 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 e18d8fdd8..b45e1f4db 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 acdb6cae0..ca9a5bb13 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 de7de8269..933d9835f 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 8fddc7045..625b52de3 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 3490424af..91a5eba53 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 758ce3b3d..578636d40 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 dedfcc3be..2f21dbe52 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 8a7671c5b..68f31584b 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 de9a216a6..fc0c0c24e 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 48be0633f..ba18b45ab 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 216c9e2c5..36f2c8293 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 db92d56a8..463e821e5 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 74dc11973..0cbbba4dd 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 25b9ccd53..4783f73c0 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 a9360d49a..eb8d0e060 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 0dcccfdab..5176d4996 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 9bd462b60..416a8da9d 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 4e3fceb10..57ae9cffa 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 93b82b3cb..ea2b3b614 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 37cafc0ff..7e343e031 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 480edbcb7..14592dac1 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 f7c68f549..0fc00c9b9 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 c3b9f7197..54bae6055 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 15a0482dc..8a2c01192 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 feaddc8ce..20692bb7c 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 c8898d08f..72c33100f 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 f15bbbc27..9b96d416c 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; } -- cgit v1.2.3 From bf0178238a179b298f465b64a4f23ff43db48fc9 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 16 Jul 2018 20:47:30 +0200 Subject: 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 fba5fb460..3843bc5e6 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 8ba45fad1..ff5a629af 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 eb695e4ab..43ea6d0b6 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 6498c6a99..01d8c311e 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 e82d22576..74247f8a2 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 843d241ce..6ab19e368 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 cd3a94692..601b8dcc1 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 a6032adc3..278edb6f4 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 32097fd76..4f5190dec 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 eb31c22dc..87244ff5a 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 6e3fc3e7f..c739c648c 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 91fcf8c46..b7ed1f713 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 5406cfee9..bb2959eda 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) -- cgit v1.2.3 From 118fa3afcee68deb3eeb2bc876a9afd02a45677c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 16 Jul 2018 22:00:27 +0200 Subject: 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 3843bc5e6..bd7ba4b35 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 87244ff5a..3af03a5e0 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 bb2959eda..c572ee10e 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) { -- cgit v1.2.3